about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/git/.cirrus.yml15
-rw-r--r--third_party/git/.editorconfig2
-rw-r--r--third_party/git/.gitignore3
-rw-r--r--third_party/git/.mailmap6
-rw-r--r--third_party/git/.tsan-suppressions6
-rw-r--r--third_party/git/CODE_OF_CONDUCT.md93
-rw-r--r--third_party/git/Documentation/CodingGuidelines4
-rw-r--r--third_party/git/Documentation/Makefile8
-rw-r--r--third_party/git/Documentation/MyFirstContribution.txt101
-rw-r--r--third_party/git/Documentation/MyFirstObjectWalk.txt905
-rw-r--r--third_party/git/Documentation/RelNotes/1.5.0.txt4
-rw-r--r--third_party/git/Documentation/RelNotes/1.6.2.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.6.3.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.6.4.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.6.5.4.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.6.5.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.6.6.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.7.0.2.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.7.10.4.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.7.12.3.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.7.5.3.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.8.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.8.4.1.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/1.8.4.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.1.3.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.10.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.10.2.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.11.1.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.12.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.13.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.13.3.txt4
-rw-r--r--third_party/git/Documentation/RelNotes/2.14.0.txt4
-rw-r--r--third_party/git/Documentation/RelNotes/2.14.6.txt54
-rw-r--r--third_party/git/Documentation/RelNotes/2.15.4.txt11
-rw-r--r--third_party/git/Documentation/RelNotes/2.16.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.16.3.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.16.6.txt8
-rw-r--r--third_party/git/Documentation/RelNotes/2.17.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.17.3.txt12
-rw-r--r--third_party/git/Documentation/RelNotes/2.17.4.txt16
-rw-r--r--third_party/git/Documentation/RelNotes/2.17.5.txt22
-rw-r--r--third_party/git/Documentation/RelNotes/2.18.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.18.2.txt8
-rw-r--r--third_party/git/Documentation/RelNotes/2.18.3.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.18.4.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.19.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.19.3.txt8
-rw-r--r--third_party/git/Documentation/RelNotes/2.19.4.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.19.5.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.20.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.20.2.txt18
-rw-r--r--third_party/git/Documentation/RelNotes/2.20.3.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.20.4.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.21.1.txt12
-rw-r--r--third_party/git/Documentation/RelNotes/2.21.2.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.21.3.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.22.2.txt8
-rw-r--r--third_party/git/Documentation/RelNotes/2.22.3.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.22.4.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.23.1.txt8
-rw-r--r--third_party/git/Documentation/RelNotes/2.23.2.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.23.3.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.24.0.txt398
-rw-r--r--third_party/git/Documentation/RelNotes/2.24.1.txt8
-rw-r--r--third_party/git/Documentation/RelNotes/2.24.2.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.24.3.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.25.0.txt370
-rw-r--r--third_party/git/Documentation/RelNotes/2.25.1.txt55
-rw-r--r--third_party/git/Documentation/RelNotes/2.25.2.txt60
-rw-r--r--third_party/git/Documentation/RelNotes/2.25.3.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.25.4.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.26.0.txt341
-rw-r--r--third_party/git/Documentation/RelNotes/2.26.1.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.26.2.txt5
-rw-r--r--third_party/git/Documentation/RelNotes/2.3.3.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.3.7.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.4.3.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.5.0.txt3
-rw-r--r--third_party/git/Documentation/RelNotes/2.7.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.7.1.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.7.3.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.8.0.txt4
-rw-r--r--third_party/git/Documentation/RelNotes/2.8.3.txt4
-rw-r--r--third_party/git/Documentation/RelNotes/2.9.0.txt2
-rw-r--r--third_party/git/Documentation/RelNotes/2.9.3.txt2
-rw-r--r--third_party/git/Documentation/SubmittingPatches20
-rw-r--r--third_party/git/Documentation/asciidoc.conf6
-rw-r--r--third_party/git/Documentation/asciidoctor-extensions.rb24
-rw-r--r--third_party/git/Documentation/config.txt92
-rw-r--r--third_party/git/Documentation/config/add.txt5
-rw-r--r--third_party/git/Documentation/config/advice.txt9
-rw-r--r--third_party/git/Documentation/config/branch.txt7
-rw-r--r--third_party/git/Documentation/config/core.txt33
-rw-r--r--third_party/git/Documentation/config/diff.txt2
-rw-r--r--third_party/git/Documentation/config/feature.txt37
-rw-r--r--third_party/git/Documentation/config/fetch.txt23
-rw-r--r--third_party/git/Documentation/config/format.txt27
-rw-r--r--third_party/git/Documentation/config/gc.txt2
-rw-r--r--third_party/git/Documentation/config/gpg.txt15
-rw-r--r--third_party/git/Documentation/config/http.txt12
-rw-r--r--third_party/git/Documentation/config/index.txt1
-rw-r--r--third_party/git/Documentation/config/pack.txt10
-rw-r--r--third_party/git/Documentation/config/protocol.txt9
-rw-r--r--third_party/git/Documentation/config/pull.txt7
-rw-r--r--third_party/git/Documentation/config/push.txt9
-rw-r--r--third_party/git/Documentation/config/rebase.txt6
-rw-r--r--third_party/git/Documentation/config/remote.txt8
-rw-r--r--third_party/git/Documentation/config/submodule.txt4
-rw-r--r--third_party/git/Documentation/config/tag.txt2
-rw-r--r--third_party/git/Documentation/config/trace2.txt6
-rw-r--r--third_party/git/Documentation/config/user.txt7
-rw-r--r--third_party/git/Documentation/diff-format.txt2
-rw-r--r--third_party/git/Documentation/diff-generate-patch.txt32
-rw-r--r--third_party/git/Documentation/diff-options.txt8
-rwxr-xr-xthird_party/git/Documentation/doc-diff19
-rw-r--r--third_party/git/Documentation/fetch-options.txt29
-rw-r--r--third_party/git/Documentation/git-add.txt16
-rw-r--r--third_party/git/Documentation/git-am.txt14
-rw-r--r--third_party/git/Documentation/git-bisect-lk2009.txt6
-rw-r--r--third_party/git/Documentation/git-bisect.txt2
-rw-r--r--third_party/git/Documentation/git-bundle.txt58
-rw-r--r--third_party/git/Documentation/git-check-attr.txt2
-rw-r--r--third_party/git/Documentation/git-check-ignore.txt14
-rw-r--r--third_party/git/Documentation/git-checkout.txt50
-rw-r--r--third_party/git/Documentation/git-clean.txt16
-rw-r--r--third_party/git/Documentation/git-clone.txt12
-rw-r--r--third_party/git/Documentation/git-commit-graph.txt24
-rw-r--r--third_party/git/Documentation/git-commit-tree.txt22
-rw-r--r--third_party/git/Documentation/git-commit.txt77
-rw-r--r--third_party/git/Documentation/git-config.txt71
-rw-r--r--third_party/git/Documentation/git-credential.txt3
-rw-r--r--third_party/git/Documentation/git-cvsserver.txt2
-rw-r--r--third_party/git/Documentation/git-diff.txt2
-rw-r--r--third_party/git/Documentation/git-fast-export.txt25
-rw-r--r--third_party/git/Documentation/git-fast-import.txt40
-rw-r--r--third_party/git/Documentation/git-filter-branch.txt282
-rw-r--r--third_party/git/Documentation/git-format-patch.txt51
-rw-r--r--third_party/git/Documentation/git-gc.txt17
-rw-r--r--third_party/git/Documentation/git-grep.txt35
-rw-r--r--third_party/git/Documentation/git-gui.txt10
-rw-r--r--third_party/git/Documentation/git-log.txt8
-rw-r--r--third_party/git/Documentation/git-ls-remote.txt36
-rw-r--r--third_party/git/Documentation/git-merge-base.txt98
-rw-r--r--third_party/git/Documentation/git-merge-index.txt26
-rw-r--r--third_party/git/Documentation/git-merge.txt2
-rw-r--r--third_party/git/Documentation/git-multi-pack-index.txt6
-rw-r--r--third_party/git/Documentation/git-notes.txt6
-rw-r--r--third_party/git/Documentation/git-range-diff.txt8
-rw-r--r--third_party/git/Documentation/git-read-tree.txt2
-rw-r--r--third_party/git/Documentation/git-rebase.txt219
-rw-r--r--third_party/git/Documentation/git-receive-pack.txt52
-rw-r--r--third_party/git/Documentation/git-replace.txt10
-rw-r--r--third_party/git/Documentation/git-reset.txt48
-rw-r--r--third_party/git/Documentation/git-restore.txt26
-rw-r--r--third_party/git/Documentation/git-rev-list.txt54
-rw-r--r--third_party/git/Documentation/git-rev-parse.txt10
-rw-r--r--third_party/git/Documentation/git-rm.txt61
-rw-r--r--third_party/git/Documentation/git-send-email.txt12
-rw-r--r--third_party/git/Documentation/git-shortlog.txt3
-rw-r--r--third_party/git/Documentation/git-sparse-checkout.txt207
-rw-r--r--third_party/git/Documentation/git-stash.txt147
-rw-r--r--third_party/git/Documentation/git-status.txt18
-rw-r--r--third_party/git/Documentation/git-submodule.txt25
-rw-r--r--third_party/git/Documentation/git-svn.txt13
-rw-r--r--third_party/git/Documentation/git-tag.txt2
-rw-r--r--third_party/git/Documentation/git-update-index.txt24
-rw-r--r--third_party/git/Documentation/git.txt57
-rw-r--r--third_party/git/Documentation/gitattributes.txt10
-rw-r--r--third_party/git/Documentation/gitcli.txt15
-rw-r--r--third_party/git/Documentation/gitcore-tutorial.txt2
-rw-r--r--third_party/git/Documentation/gitcredentials.txt94
-rw-r--r--third_party/git/Documentation/githooks.txt45
-rw-r--r--third_party/git/Documentation/gitk.txt8
-rw-r--r--third_party/git/Documentation/gitmodules.txt26
-rw-r--r--third_party/git/Documentation/gitremote-helpers.txt15
-rw-r--r--third_party/git/Documentation/gitrepository-layout.txt12
-rw-r--r--third_party/git/Documentation/gitsubmodules.txt2
-rw-r--r--third_party/git/Documentation/gitweb.conf.txt6
-rw-r--r--third_party/git/Documentation/howto/separating-topic-branches.txt2
-rw-r--r--third_party/git/Documentation/manpage-bold-literal.xsl3
-rw-r--r--third_party/git/Documentation/manpage.xsl3
-rw-r--r--third_party/git/Documentation/merge-options.txt34
-rw-r--r--third_party/git/Documentation/merge-strategies.txt2
-rw-r--r--third_party/git/Documentation/pretty-formats.txt38
-rw-r--r--third_party/git/Documentation/pretty-options.txt10
-rw-r--r--third_party/git/Documentation/rev-list-options.txt33
-rw-r--r--third_party/git/Documentation/technical/api-allocation-growing.txt39
-rw-r--r--third_party/git/Documentation/technical/api-argv-array.txt65
-rw-r--r--third_party/git/Documentation/technical/api-config.txt319
-rw-r--r--third_party/git/Documentation/technical/api-credentials.txt271
-rw-r--r--third_party/git/Documentation/technical/api-diff.txt174
-rw-r--r--third_party/git/Documentation/technical/api-directory-listing.txt130
-rw-r--r--third_party/git/Documentation/technical/api-gitattributes.txt154
-rw-r--r--third_party/git/Documentation/technical/api-grep.txt8
-rw-r--r--third_party/git/Documentation/technical/api-history-graph.txt173
-rw-r--r--third_party/git/Documentation/technical/api-merge.txt72
-rw-r--r--third_party/git/Documentation/technical/api-object-access.txt15
-rw-r--r--third_party/git/Documentation/technical/api-oid-array.txt90
-rw-r--r--third_party/git/Documentation/technical/api-quote.txt10
-rw-r--r--third_party/git/Documentation/technical/api-ref-iteration.txt78
-rw-r--r--third_party/git/Documentation/technical/api-remote.txt127
-rw-r--r--third_party/git/Documentation/technical/api-revision-walking.txt72
-rw-r--r--third_party/git/Documentation/technical/api-run-command.txt264
-rw-r--r--third_party/git/Documentation/technical/api-setup.txt47
-rw-r--r--third_party/git/Documentation/technical/api-sigchain.txt41
-rw-r--r--third_party/git/Documentation/technical/api-submodule-config.txt66
-rw-r--r--third_party/git/Documentation/technical/api-trace.txt140
-rw-r--r--third_party/git/Documentation/technical/api-trace2.txt282
-rw-r--r--third_party/git/Documentation/technical/api-tree-walking.txt147
-rw-r--r--third_party/git/Documentation/technical/api-xdiff-interface.txt7
-rw-r--r--third_party/git/Documentation/technical/bundle-format.txt48
-rw-r--r--third_party/git/Documentation/technical/commit-graph.txt22
-rw-r--r--third_party/git/Documentation/technical/hash-function-transition.txt18
-rw-r--r--third_party/git/Documentation/technical/index-format.txt4
-rw-r--r--third_party/git/Documentation/technical/multi-pack-index.txt6
-rw-r--r--third_party/git/Documentation/technical/pack-format.txt5
-rw-r--r--third_party/git/Documentation/technical/pack-protocol.txt2
-rw-r--r--third_party/git/Documentation/technical/partial-clone.txt129
-rw-r--r--third_party/git/Documentation/technical/protocol-v2.txt2
-rw-r--r--third_party/git/Documentation/technical/racy-git.txt2
-rw-r--r--third_party/git/Documentation/technical/rerere.txt2
-rw-r--r--third_party/git/Documentation/trace2-target-values.txt4
-rw-r--r--third_party/git/Documentation/urls.txt3
-rw-r--r--third_party/git/Documentation/user-manual.txt381
-rwxr-xr-xthird_party/git/GIT-VERSION-GEN2
-rw-r--r--third_party/git/INSTALL6
-rw-r--r--third_party/git/Makefile80
-rw-r--r--third_party/git/README.md2
l---------third_party/git/RelNotes2
-rw-r--r--third_party/git/add-interactive.c1176
-rw-r--r--third_party/git/add-interactive.h41
-rw-r--r--third_party/git/add-patch.c1683
-rw-r--r--third_party/git/advice.c6
-rw-r--r--third_party/git/advice.h3
-rw-r--r--third_party/git/apply.c78
-rw-r--r--third_party/git/apply.h1
-rw-r--r--third_party/git/archive-tar.c20
-rw-r--r--third_party/git/archive-zip.c36
-rw-r--r--third_party/git/argv-array.c2
-rw-r--r--third_party/git/argv-array.h62
-rw-r--r--third_party/git/attr.c37
-rw-r--r--third_party/git/attr.h141
-rw-r--r--third_party/git/azure-pipelines.yml201
-rw-r--r--third_party/git/banned.h2
-rw-r--r--third_party/git/bisect.c137
-rw-r--r--third_party/git/bisect.h29
-rw-r--r--third_party/git/blame.c27
-rw-r--r--third_party/git/blame.h4
-rw-r--r--third_party/git/builtin.h1
-rw-r--r--third_party/git/builtin/add.c112
-rw-r--r--third_party/git/builtin/am.c119
-rw-r--r--third_party/git/builtin/bisect--helper.c134
-rw-r--r--third_party/git/builtin/blame.c40
-rw-r--r--third_party/git/builtin/branch.c2
-rw-r--r--third_party/git/builtin/bundle.c217
-rw-r--r--third_party/git/builtin/cat-file.c7
-rw-r--r--third_party/git/builtin/check-ignore.c37
-rw-r--r--third_party/git/builtin/checkout.c137
-rw-r--r--third_party/git/builtin/clean.c27
-rw-r--r--third_party/git/builtin/clone.c61
-rw-r--r--third_party/git/builtin/commit-graph.c135
-rw-r--r--third_party/git/builtin/commit.c67
-rw-r--r--third_party/git/builtin/config.c46
-rw-r--r--third_party/git/builtin/describe.c46
-rw-r--r--third_party/git/builtin/difftool.c56
-rw-r--r--third_party/git/builtin/fast-export.c88
-rw-r--r--third_party/git/builtin/fetch.c344
-rw-r--r--third_party/git/builtin/fmt-merge-msg.c9
-rw-r--r--third_party/git/builtin/fsck.c126
-rw-r--r--third_party/git/builtin/gc.c19
-rw-r--r--third_party/git/builtin/grep.c111
-rw-r--r--third_party/git/builtin/index-pack.c26
-rw-r--r--third_party/git/builtin/log.c210
-rw-r--r--third_party/git/builtin/ls-files.c8
-rw-r--r--third_party/git/builtin/merge-recursive.c4
-rw-r--r--third_party/git/builtin/merge-tree.c5
-rw-r--r--third_party/git/builtin/merge.c40
-rw-r--r--third_party/git/builtin/mktag.c7
-rw-r--r--third_party/git/builtin/multi-pack-index.c18
-rw-r--r--third_party/git/builtin/name-rev.c289
-rw-r--r--third_party/git/builtin/notes.c6
-rw-r--r--third_party/git/builtin/pack-objects.c336
-rw-r--r--third_party/git/builtin/patch-id.c16
-rw-r--r--third_party/git/builtin/pull.c48
-rw-r--r--third_party/git/builtin/push.c80
-rw-r--r--third_party/git/builtin/range-diff.c7
-rw-r--r--third_party/git/builtin/read-tree.c2
-rw-r--r--third_party/git/builtin/rebase.c414
-rw-r--r--third_party/git/builtin/receive-pack.c86
-rw-r--r--third_party/git/builtin/reflog.c9
-rw-r--r--third_party/git/builtin/remote.c192
-rw-r--r--third_party/git/builtin/repack.c14
-rw-r--r--third_party/git/builtin/replace.c12
-rw-r--r--third_party/git/builtin/reset.c27
-rw-r--r--third_party/git/builtin/rev-list.c126
-rw-r--r--third_party/git/builtin/rev-parse.c18
-rw-r--r--third_party/git/builtin/rm.c28
-rw-r--r--third_party/git/builtin/show-branch.c2
-rw-r--r--third_party/git/builtin/show-index.c13
-rw-r--r--third_party/git/builtin/sparse-checkout.c631
-rw-r--r--third_party/git/builtin/stash.c133
-rw-r--r--third_party/git/builtin/submodule--helper.c78
-rw-r--r--third_party/git/builtin/unpack-objects.c6
-rw-r--r--third_party/git/builtin/update-index.c12
-rw-r--r--third_party/git/builtin/worktree.c16
-rw-r--r--third_party/git/bulk-checkin.c2
-rw-r--r--third_party/git/bundle.c13
-rw-r--r--third_party/git/bundle.h3
-rw-r--r--third_party/git/cache-tree.c103
-rw-r--r--third_party/git/cache-tree.h3
-rw-r--r--third_party/git/cache.h128
-rwxr-xr-xthird_party/git/ci/install-dependencies.sh16
-rwxr-xr-xthird_party/git/ci/lib.sh12
-rwxr-xr-xthird_party/git/ci/run-build-and-tests.sh1
-rwxr-xr-xthird_party/git/ci/run-static-analysis.sh3
-rwxr-xr-xthird_party/git/ci/test-documentation.sh3
-rw-r--r--third_party/git/color.c75
-rw-r--r--third_party/git/column.c13
-rw-r--r--third_party/git/combine-diff.c2
-rw-r--r--third_party/git/command-list.txt2
-rw-r--r--third_party/git/commit-graph.c242
-rw-r--r--third_party/git/commit-graph.h34
-rw-r--r--third_party/git/commit-reach.c1
-rw-r--r--third_party/git/commit.c76
-rw-r--r--third_party/git/commit.h14
-rw-r--r--third_party/git/common-main.c8
-rw-r--r--third_party/git/compat/mingw.c409
-rw-r--r--third_party/git/compat/mingw.h39
-rw-r--r--third_party/git/compat/nedmalloc/malloc.c.h12
-rw-r--r--third_party/git/compat/obstack.h8
-rw-r--r--third_party/git/compat/poll/poll.c31
-rw-r--r--third_party/git/compat/regex/regcomp.c2
-rw-r--r--third_party/git/compat/regex/regex.h7
-rw-r--r--third_party/git/compat/regex/regex_internal.c2
-rw-r--r--third_party/git/compat/regex/regexec.c4
-rw-r--r--third_party/git/compat/terminal.c249
-rw-r--r--third_party/git/compat/terminal.h3
-rw-r--r--third_party/git/compat/vcbuild/find_vs_env.bat2
-rwxr-xr-xthird_party/git/compat/vcbuild/scripts/clink.pl52
-rw-r--r--third_party/git/compat/win32/path-utils.c24
-rw-r--r--third_party/git/compat/win32/path-utils.h10
-rw-r--r--third_party/git/compat/win32/pthread.h8
-rw-r--r--third_party/git/compat/winansi.c14
-rw-r--r--third_party/git/config.c107
-rw-r--r--third_party/git/config.h356
-rw-r--r--third_party/git/config.mak.dev1
-rw-r--r--third_party/git/config.mak.uname22
-rw-r--r--third_party/git/configure.ac51
-rw-r--r--third_party/git/connect.c6
-rw-r--r--third_party/git/connected.c28
-rw-r--r--third_party/git/connected.h11
-rw-r--r--third_party/git/contrib/buildsystems/Generators/Vcxproj.pm18
-rwxr-xr-xthird_party/git/contrib/buildsystems/engine.pl4
-rw-r--r--third_party/git/contrib/coccinelle/commit.cocci2
-rw-r--r--third_party/git/contrib/coccinelle/hashmap.cocci16
-rw-r--r--third_party/git/contrib/coccinelle/object_id.cocci32
-rw-r--r--third_party/git/contrib/completion/git-completion.bash468
-rw-r--r--third_party/git/contrib/completion/git-completion.zsh5
-rw-r--r--third_party/git/contrib/completion/git-prompt.sh6
-rw-r--r--third_party/git/contrib/credential/netrc/.gitignore1
-rw-r--r--third_party/git/contrib/credential/netrc/Makefile26
-rwxr-xr-xthird_party/git/contrib/credential/netrc/git-credential-netrc.perl (renamed from third_party/git/contrib/credential/netrc/git-credential-netrc)2
-rw-r--r--third_party/git/contrib/diff-highlight/DiffHighlight.pm2
-rwxr-xr-xthird_party/git/contrib/hg-to-git/hg-to-git.py50
-rwxr-xr-xthird_party/git/contrib/hooks/multimail/git_multimail.py8
-rwxr-xr-xthird_party/git/contrib/hooks/multimail/post-receive.example2
-rwxr-xr-xthird_party/git/contrib/hooks/post-receive-email2
-rwxr-xr-xthird_party/git/contrib/hooks/update-paranoid2
-rw-r--r--third_party/git/contrib/mw-to-git/.perlcriticrc2
-rwxr-xr-xthird_party/git/contrib/mw-to-git/git-remote-mediawiki.perl2
-rw-r--r--third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php2
-rwxr-xr-xthird_party/git/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh2
-rwxr-xr-xthird_party/git/contrib/mw-to-git/t/test-gitmw-lib.sh2
-rw-r--r--third_party/git/contrib/svn-fe/svn-fe.txt4
-rwxr-xr-xthird_party/git/contrib/svn-fe/svnrdump_sim.py4
-rw-r--r--third_party/git/convert.c49
-rw-r--r--third_party/git/convert.h6
-rw-r--r--third_party/git/credential-store.c9
-rw-r--r--third_party/git/credential.c142
-rw-r--r--third_party/git/credential.h162
-rw-r--r--third_party/git/csum-file.h9
-rw-r--r--third_party/git/daemon.c4
-rw-r--r--third_party/git/date.c45
-rw-r--r--third_party/git/diff-delta.c2
-rw-r--r--third_party/git/diff.c148
-rw-r--r--third_party/git/diff.h148
-rw-r--r--third_party/git/diffcore-break.c12
-rw-r--r--third_party/git/diffcore-rename.c21
-rw-r--r--third_party/git/diffcore.h32
-rw-r--r--third_party/git/dir.c842
-rw-r--r--third_party/git/dir.h234
-rw-r--r--third_party/git/environment.c5
-rw-r--r--third_party/git/ewah/bitmap.c21
-rw-r--r--third_party/git/ewah/ewok.h2
-rw-r--r--third_party/git/fast-import.c142
-rw-r--r--third_party/git/fetch-negotiator.c25
-rw-r--r--third_party/git/fetch-negotiator.h5
-rw-r--r--third_party/git/fetch-object.c40
-rw-r--r--third_party/git/fetch-object.h9
-rw-r--r--third_party/git/fetch-pack.c161
-rw-r--r--third_party/git/fsck.c548
-rw-r--r--third_party/git/fsck.h39
-rw-r--r--third_party/git/fsmonitor.c174
-rwxr-xr-xthird_party/git/git-add--interactive.perl10
-rw-r--r--third_party/git/git-compat-util.h77
-rwxr-xr-xthird_party/git/git-cvsimport.perl2
-rwxr-xr-xthird_party/git/git-filter-branch.sh14
-rw-r--r--third_party/git/git-gui/README.md174
-rwxr-xr-xthird_party/git/git-gui/git-gui--askpass5
-rwxr-xr-xthird_party/git/git-gui/git-gui.sh235
-rw-r--r--third_party/git/git-gui/lib/blame.tcl24
-rw-r--r--third_party/git/git-gui/lib/branch.tcl2
-rw-r--r--third_party/git/git-gui/lib/checkout_op.tcl21
-rw-r--r--third_party/git/git-gui/lib/choose_repository.tcl120
-rw-r--r--third_party/git/git-gui/lib/chord.tcl158
-rw-r--r--third_party/git/git-gui/lib/commit.tcl4
-rw-r--r--third_party/git/git-gui/lib/console.tcl2
-rw-r--r--third_party/git/git-gui/lib/diff.tcl129
-rw-r--r--third_party/git/git-gui/lib/index.tcl533
-rw-r--r--third_party/git/git-gui/lib/merge.tcl14
-rw-r--r--third_party/git/git-gui/lib/status_bar.tcl231
-rw-r--r--third_party/git/git-gui/po/de.po3388
-rw-r--r--third_party/git/git-gui/po/git-gui.pot2506
-rw-r--r--third_party/git/git-gui/po/glossary/de.po315
-rw-r--r--third_party/git/git-gui/po/glossary/git-gui-glossary.pot250
-rw-r--r--third_party/git/git-gui/po/glossary/git-gui-glossary.txt101
-rw-r--r--third_party/git/git-gui/po/ja.po9
-rwxr-xr-xthird_party/git/git-legacy-stash.sh7
-rwxr-xr-xthird_party/git/git-p4.py278
-rwxr-xr-xthird_party/git/git-send-email.perl2
-rwxr-xr-xthird_party/git/git-submodule.sh82
-rwxr-xr-xthird_party/git/git-svn.perl9
-rw-r--r--third_party/git/git.c6
-rwxr-xr-xthird_party/git/gitk-git/gitk64
-rw-r--r--third_party/git/gitk-git/po/zh_cn.po1367
-rwxr-xr-xthird_party/git/gitweb/gitweb.perl53
-rw-r--r--third_party/git/gitweb/static/js/blame_incremental.js2
-rw-r--r--third_party/git/gpg-interface.c135
-rw-r--r--third_party/git/gpg-interface.h10
-rw-r--r--third_party/git/graph.c664
-rw-r--r--third_party/git/graph.h121
-rw-r--r--third_party/git/grep.c275
-rw-r--r--third_party/git/grep.h40
-rw-r--r--third_party/git/hashmap.c60
-rw-r--r--third_party/git/hashmap.h178
-rw-r--r--third_party/git/help.c5
-rw-r--r--third_party/git/help.h2
-rw-r--r--third_party/git/hex.c10
-rw-r--r--third_party/git/http-push.c8
-rw-r--r--third_party/git/http.c30
-rw-r--r--third_party/git/http.h4
-rw-r--r--third_party/git/kwset.h4
-rw-r--r--third_party/git/line-log.c71
-rw-r--r--third_party/git/list-objects-filter-options.c324
-rw-r--r--third_party/git/list-objects-filter-options.h62
-rw-r--r--third_party/git/list-objects-filter.c382
-rw-r--r--third_party/git/list-objects-filter.h40
-rw-r--r--third_party/git/list-objects.c59
-rw-r--r--third_party/git/ll-merge.c19
-rw-r--r--third_party/git/ll-merge.h74
-rw-r--r--third_party/git/log-tree.c12
-rw-r--r--third_party/git/mailinfo.c68
-rw-r--r--third_party/git/merge-recursive.c956
-rw-r--r--third_party/git/merge-recursive.h164
-rw-r--r--third_party/git/midx.c84
-rw-r--r--third_party/git/midx.h10
-rw-r--r--third_party/git/name-hash.c61
-rw-r--r--third_party/git/notes-utils.c2
-rw-r--r--third_party/git/notes.c69
-rw-r--r--third_party/git/notes.h26
-rw-r--r--third_party/git/object-store.h75
-rw-r--r--third_party/git/object.c20
-rw-r--r--third_party/git/object.h5
-rw-r--r--third_party/git/oidmap.c20
-rw-r--r--third_party/git/oidmap.h6
-rw-r--r--third_party/git/pack-bitmap-write.c2
-rw-r--r--third_party/git/pack-bitmap.c486
-rw-r--r--third_party/git/pack-bitmap.h17
-rw-r--r--third_party/git/pack-check.c32
-rw-r--r--third_party/git/pack-objects.c31
-rw-r--r--third_party/git/pack-objects.h27
-rw-r--r--third_party/git/pack-write.c8
-rw-r--r--third_party/git/packfile.c198
-rw-r--r--third_party/git/packfile.h20
-rw-r--r--third_party/git/parse-options-cb.c41
-rw-r--r--third_party/git/parse-options.c32
-rw-r--r--third_party/git/parse-options.h34
-rw-r--r--third_party/git/patch-ids.c18
-rw-r--r--third_party/git/path.c265
-rw-r--r--third_party/git/path.h3
-rw-r--r--third_party/git/pathspec.c47
-rw-r--r--third_party/git/pathspec.h45
-rw-r--r--third_party/git/perl/Git.pm2
-rw-r--r--third_party/git/perl/Git/SVN.pm4
-rw-r--r--third_party/git/pkt-line.h2
-rw-r--r--third_party/git/po/TEAMS9
-rw-r--r--third_party/git/po/bg.po8839
-rw-r--r--third_party/git/po/ca.po8540
-rw-r--r--third_party/git/po/de.po8942
-rw-r--r--third_party/git/po/es.po9049
-rw-r--r--third_party/git/po/fr.po8759
-rw-r--r--third_party/git/po/git.pot8447
-rw-r--r--third_party/git/po/it.po8960
-rw-r--r--third_party/git/po/sv.po9162
-rw-r--r--third_party/git/po/tr.po24563
-rw-r--r--third_party/git/po/vi.po8934
-rw-r--r--third_party/git/po/zh_CN.po8693
-rw-r--r--third_party/git/po/zh_TW.po24120
-rw-r--r--third_party/git/pretty.c65
-rw-r--r--third_party/git/progress.c76
-rw-r--r--third_party/git/promisor-remote.c265
-rw-r--r--third_party/git/promisor-remote.h33
-rw-r--r--third_party/git/protocol.c11
-rw-r--r--third_party/git/quote.c26
-rw-r--r--third_party/git/quote.h1
-rw-r--r--third_party/git/range-diff.c34
-rw-r--r--third_party/git/range-diff.h6
-rw-r--r--third_party/git/reachable.c4
-rw-r--r--third_party/git/read-cache.c75
-rw-r--r--third_party/git/rebase-interactive.c95
-rw-r--r--third_party/git/rebase-interactive.h7
-rw-r--r--third_party/git/rebase.c35
-rw-r--r--third_party/git/rebase.h15
-rw-r--r--third_party/git/ref-filter.c53
-rw-r--r--third_party/git/refs.c25
-rw-r--r--third_party/git/refs.h51
-rw-r--r--third_party/git/refs/files-backend.c7
-rw-r--r--third_party/git/refs/packed-backend.c23
-rw-r--r--third_party/git/refs/refs-internal.h2
-rw-r--r--third_party/git/refspec.h16
-rw-r--r--third_party/git/remote-curl.c37
-rw-r--r--third_party/git/remote.c35
-rw-r--r--third_party/git/remote.h62
-rw-r--r--third_party/git/replace-object.c11
-rw-r--r--third_party/git/replace-object.h7
-rw-r--r--third_party/git/repo-settings.c68
-rw-r--r--third_party/git/repository.c4
-rw-r--r--third_party/git/repository.h36
-rw-r--r--third_party/git/rerere.c10
-rw-r--r--third_party/git/revision.c88
-rw-r--r--third_party/git/revision.h65
-rw-r--r--third_party/git/run-command.c6
-rw-r--r--third_party/git/run-command.h250
-rw-r--r--third_party/git/send-pack.c13
-rw-r--r--third_party/git/sequencer.c566
-rw-r--r--third_party/git/sequencer.h17
-rw-r--r--third_party/git/server-info.c2
-rw-r--r--third_party/git/setup.c45
-rw-r--r--third_party/git/sha1-array.c2
-rw-r--r--third_party/git/sha1-array.h80
-rw-r--r--third_party/git/sha1-file.c178
-rw-r--r--third_party/git/sha1-lookup.c12
-rw-r--r--third_party/git/sha1-name.c87
-rw-r--r--third_party/git/sha1dc/sha1.c4
-rw-r--r--third_party/git/sha1dc_git.c2
-rw-r--r--third_party/git/shallow.c5
-rw-r--r--third_party/git/shell.c4
-rw-r--r--third_party/git/sigchain.h45
-rw-r--r--third_party/git/stable-qsort.c (renamed from third_party/git/compat/qsort.c)6
-rw-r--r--third_party/git/strbuf.c58
-rw-r--r--third_party/git/strbuf.h36
-rw-r--r--third_party/git/streaming.c28
-rw-r--r--third_party/git/streaming.h4
-rw-r--r--third_party/git/string-list.h8
-rw-r--r--third_party/git/sub-process.c20
-rw-r--r--third_party/git/sub-process.h6
-rw-r--r--third_party/git/submodule-config.c88
-rw-r--r--third_party/git/submodule-config.h40
-rw-r--r--third_party/git/submodule.c106
-rw-r--r--third_party/git/submodule.h5
-rw-r--r--third_party/git/t/README17
-rwxr-xr-xthird_party/git/t/check-non-portable-shell.pl2
-rw-r--r--third_party/git/t/gitweb-lib.sh7
-rw-r--r--third_party/git/t/helper/.gitignore9
-rw-r--r--third_party/git/t/helper/test-config.c18
-rw-r--r--third_party/git/t/helper/test-date.c27
-rw-r--r--third_party/git/t/helper/test-drop-caches.c11
-rw-r--r--third_party/git/t/helper/test-dump-fsmonitor.c2
-rw-r--r--third_party/git/t/helper/test-hashmap.c50
-rw-r--r--third_party/git/t/helper/test-lazy-init-name-hash.c12
-rw-r--r--third_party/git/t/helper/test-parse-options.c2
-rw-r--r--third_party/git/t/helper/test-parse-pathspec-file.c33
-rw-r--r--third_party/git/t/helper/test-path-utils.c113
-rw-r--r--third_party/git/t/helper/test-progress.c81
-rw-r--r--third_party/git/t/helper/test-read-cache.c5
-rw-r--r--third_party/git/t/helper/test-read-graph.c53
-rw-r--r--third_party/git/t/helper/test-run-command.c335
-rw-r--r--third_party/git/t/helper/test-tool.c3
-rw-r--r--third_party/git/t/helper/test-tool.h3
-rw-r--r--third_party/git/t/helper/test-windows-named-pipe.c2
-rw-r--r--third_party/git/t/lib-bash.sh6
-rwxr-xr-xthird_party/git/t/lib-credential.sh2
-rw-r--r--third_party/git/t/lib-git-daemon.sh2
-rw-r--r--third_party/git/t/lib-git-p4.sh2
-rw-r--r--third_party/git/t/lib-git-svn.sh4
-rw-r--r--third_party/git/t/lib-httpd.sh4
-rw-r--r--third_party/git/t/lib-httpd/apache.conf6
-rw-r--r--third_party/git/t/lib-httpd/apply-one-time-perl.sh27
-rw-r--r--third_party/git/t/lib-httpd/apply-one-time-sed.sh22
-rwxr-xr-xthird_party/git/t/lib-log-graph.sh28
-rw-r--r--third_party/git/t/lib-pack.sh35
-rw-r--r--third_party/git/t/lib-rebase.sh37
-rw-r--r--third_party/git/t/oid-info/hash-info9
-rwxr-xr-xthird_party/git/t/perf/aggregate.perl21
-rwxr-xr-xthird_party/git/t/perf/bisect_regression2
-rwxr-xr-xthird_party/git/t/perf/p5303-many-packs.sh19
-rwxr-xr-xthird_party/git/t/perf/p5310-pack-bitmaps.sh22
-rwxr-xr-xthird_party/git/t/perf/p5601-clone-reference.sh (renamed from third_party/git/t/perf/p5600-clone-reference.sh)0
-rw-r--r--third_party/git/t/perf/perf-lib.sh4
-rwxr-xr-xthird_party/git/t/t0000-basic.sh123
-rwxr-xr-xthird_party/git/t/t0003-attributes.sh47
-rwxr-xr-xthird_party/git/t/t0008-ignores.sh39
-rwxr-xr-xthird_party/git/t/t0014-alias.sh7
-rwxr-xr-xthird_party/git/t/t0020-crlf.sh18
-rwxr-xr-xthird_party/git/t/t0021-conversion.sh8
-rwxr-xr-xthird_party/git/t/t0027-auto-crlf.sh2
-rwxr-xr-xthird_party/git/t/t0028-working-tree-encoding.sh45
-rwxr-xr-xthird_party/git/t/t0040-parse-options.sh29
-rwxr-xr-xthird_party/git/t/t0050-filesystem.sh20
-rwxr-xr-xthird_party/git/t/t0060-path-utils.sh45
-rwxr-xr-xthird_party/git/t/t0061-run-command.sh25
-rwxr-xr-xthird_party/git/t/t0067-parse_pathspec_file.sh108
-rwxr-xr-xthird_party/git/t/t0090-cache-tree.sh5
-rwxr-xr-xthird_party/git/t/t0211-trace2-perf.sh4
-rwxr-xr-xthird_party/git/t/t0212-trace2-event.sh19
-rwxr-xr-xthird_party/git/t/t0300-credentials.sh279
-rwxr-xr-xthird_party/git/t/t0410-partial-clone.sh93
-rwxr-xr-xthird_party/git/t/t0500-progress-display.sh286
-rwxr-xr-xthird_party/git/t/t1011-read-tree-sparse-checkout.sh3
-rwxr-xr-xthird_party/git/t/t1014-read-tree-confusing.sh1
-rwxr-xr-xthird_party/git/t/t1050-large.sh16
-rwxr-xr-xthird_party/git/t/t1091-sparse-checkout-builtin.sh524
-rwxr-xr-xthird_party/git/t/t1300-config.sh255
-rwxr-xr-xthird_party/git/t/t1305-config-include.sh2
-rwxr-xr-xthird_party/git/t/t1306-xdg-files.sh8
-rwxr-xr-xthird_party/git/t/t1307-config-blob.sh2
-rwxr-xr-xthird_party/git/t/t1308-config-set.sh26
-rwxr-xr-xthird_party/git/t/t1309-early-config.sh9
-rwxr-xr-xthird_party/git/t/t1400-update-ref.sh62
-rwxr-xr-xthird_party/git/t/t1404-update-ref-errors.sh64
-rwxr-xr-xthird_party/git/t/t1406-submodule-ref-store.sh2
-rwxr-xr-xthird_party/git/t/t1409-avoid-packing-refs.sh16
-rwxr-xr-xthird_party/git/t/t1410-reflog.sh4
-rwxr-xr-xthird_party/git/t/t1414-reflog-walk.sh3
-rwxr-xr-xthird_party/git/t/t1450-fsck.sh20
-rwxr-xr-xthird_party/git/t/t1500-rev-parse.sh25
-rwxr-xr-xthird_party/git/t/t1501-work-tree.sh2
-rwxr-xr-xthird_party/git/t/t1506-rev-parse-diagnosis.sh79
-rwxr-xr-xthird_party/git/t/t1507-rev-parse-upstream.sh116
-rwxr-xr-xthird_party/git/t/t1512-rev-parse-disambiguation.sh4
-rwxr-xr-xthird_party/git/t/t1600-index.sh35
-rwxr-xr-xthird_party/git/t/t2018-checkout-branch.sh75
-rwxr-xr-xthird_party/git/t/t2022-checkout-paths.sh11
-rwxr-xr-xthird_party/git/t/t2024-checkout-dwim.sh28
-rwxr-xr-xthird_party/git/t/t2026-checkout-pathspec-file.sh163
-rwxr-xr-xthird_party/git/t/t2070-restore.sh28
-rwxr-xr-xthird_party/git/t/t2072-restore-pathspec-file.sh164
-rwxr-xr-xthird_party/git/t/t2107-update-index-basic.sh1
-rwxr-xr-xthird_party/git/t/t2400-worktree-add.sh37
-rwxr-xr-xthird_party/git/t/t2402-worktree-list.sh6
-rwxr-xr-xthird_party/git/t/t2405-worktree-submodule.sh90
-rwxr-xr-xthird_party/git/t/t3005-ls-files-relative.sh12
-rwxr-xr-xthird_party/git/t/t3007-ls-files-recurse-submodules.sh1
-rwxr-xr-xthird_party/git/t/t3008-ls-files-lazy-init-name-hash.sh2
-rwxr-xr-xthird_party/git/t/t3011-common-prefixes-and-directory-traversal.sh209
-rwxr-xr-xthird_party/git/t/t3030-merge-recursive.sh39
-rwxr-xr-xthird_party/git/t/t3035-merge-sparse.sh4
-rwxr-xr-xthird_party/git/t/t3060-ls-files-with-tree.sh4
-rwxr-xr-xthird_party/git/t/t3201-branch-contains.sh8
-rwxr-xr-xthird_party/git/t/t3206-range-diff.sh537
-rw-r--r--third_party/git/t/t3206/history.export31
-rwxr-xr-xthird_party/git/t/t3210-pack-refs.sh2
-rwxr-xr-xthird_party/git/t/t3301-notes.sh400
-rwxr-xr-xthird_party/git/t/t3305-notes-fanout.sh117
-rwxr-xr-xthird_party/git/t/t3306-notes-prune.sh45
-rwxr-xr-xthird_party/git/t/t3308-notes-merge.sh83
-rwxr-xr-xthird_party/git/t/t3309-notes-merge-auto-resolve.sh228
-rwxr-xr-xthird_party/git/t/t3310-notes-merge-manual-resolve.sh106
-rwxr-xr-xthird_party/git/t/t3311-notes-merge-fanout.sh60
-rwxr-xr-xthird_party/git/t/t3400-rebase.sh102
-rwxr-xr-xthird_party/git/t/t3401-rebase-and-am-rename.sh4
-rwxr-xr-xthird_party/git/t/t3403-rebase-skip.sh32
-rwxr-xr-xthird_party/git/t/t3404-rebase-interactive.sh790
-rwxr-xr-xthird_party/git/t/t3406-rebase-message.sh19
-rwxr-xr-xthird_party/git/t/t3407-rebase-abort.sh6
-rwxr-xr-xthird_party/git/t/t3415-rebase-autosquash.sh153
-rwxr-xr-xthird_party/git/t/t3416-rebase-onto-threedots.sh57
-rwxr-xr-xthird_party/git/t/t3418-rebase-continue.sh14
-rwxr-xr-xthird_party/git/t/t3419-rebase-patch-id.sh5
-rwxr-xr-xthird_party/git/t/t3420-rebase-autostash.sh34
-rwxr-xr-xthird_party/git/t/t3421-rebase-topology-linear.sh79
-rwxr-xr-xthird_party/git/t/t3422-rebase-incompatible-options.sh10
-rwxr-xr-xthird_party/git/t/t3424-rebase-empty.sh134
-rwxr-xr-xthird_party/git/t/t3425-rebase-topology-merges.sh8
-rwxr-xr-xthird_party/git/t/t3427-rebase-subtree.sh160
-rwxr-xr-xthird_party/git/t/t3429-rebase-edit-todo.sh53
-rwxr-xr-xthird_party/git/t/t3430-rebase-merges.sh81
-rwxr-xr-xthird_party/git/t/t3431-rebase-fork-point.sh57
-rwxr-xr-xthird_party/git/t/t3432-rebase-fast-forward.sh123
-rwxr-xr-xthird_party/git/t/t3433-rebase-across-mode-change.sh48
-rwxr-xr-xthird_party/git/t/t3434-rebase-i18n.sh84
-rw-r--r--third_party/git/t/t3434/ISO8859-1.txt3
-rw-r--r--third_party/git/t/t3434/eucJP.txt4
-rwxr-xr-xthird_party/git/t/t3501-revert-cherry-pick.sh4
-rwxr-xr-xthird_party/git/t/t3504-cherry-pick-rerere.sh6
-rwxr-xr-xthird_party/git/t/t3506-cherry-pick-ff.sh8
-rwxr-xr-xthird_party/git/t/t3507-cherry-pick-conflict.sh28
-rwxr-xr-xthird_party/git/t/t3508-cherry-pick-many-commits.sh2
-rwxr-xr-xthird_party/git/t/t3600-rm.sh25
-rwxr-xr-xthird_party/git/t/t3601-rm-pathspec-file.sh79
-rwxr-xr-xthird_party/git/t/t3700-add.sh4
-rwxr-xr-xthird_party/git/t/t3701-add-interactive.sh181
-rwxr-xr-xthird_party/git/t/t3704-add-pathspec-file.sh159
-rwxr-xr-xthird_party/git/t/t3800-mktag.sh49
-rwxr-xr-xthird_party/git/t/t3900-i18n-commit.sh37
-rwxr-xr-xthird_party/git/t/t3903-stash.sh71
-rwxr-xr-xthird_party/git/t/t3905-stash-include-untracked.sh4
-rwxr-xr-xthird_party/git/t/t3906-stash-submodule.sh42
-rwxr-xr-xthird_party/git/t/t3908-stash-in-worktree.sh27
-rwxr-xr-xthird_party/git/t/t3909-stash-pathspec-file.sh100
-rwxr-xr-xthird_party/git/t/t4000-diff-format.sh2
-rwxr-xr-xthird_party/git/t/t4002-diff-basic.sh367
-rwxr-xr-xthird_party/git/t/t4009-diff-rename-4.sh19
-rwxr-xr-xthird_party/git/t/t4010-diff-pathspec.sh20
-rwxr-xr-xthird_party/git/t/t4011-diff-symlink.sh40
-rwxr-xr-xthird_party/git/t/t4013-diff-various.sh47
-rwxr-xr-xthird_party/git/t/t4014-format-patch.sh1059
-rwxr-xr-xthird_party/git/t/t4015-diff-whitespace.sh213
-rwxr-xr-xthird_party/git/t/t4018-diff-funcname.sh3
-rw-r--r--third_party/git/t/t4018/dts-labels9
-rw-r--r--third_party/git/t/t4018/dts-node-unitless8
-rw-r--r--third_party/git/t/t4018/dts-nodes8
-rw-r--r--third_party/git/t/t4018/dts-nodes-boolean-prop9
-rw-r--r--third_party/git/t/t4018/dts-nodes-comment18
-rw-r--r--third_party/git/t/t4018/dts-nodes-comment28
-rw-r--r--third_party/git/t/t4018/dts-nodes-multiline-prop13
-rw-r--r--third_party/git/t/t4018/dts-reference9
-rw-r--r--third_party/git/t/t4018/dts-root5
-rw-r--r--third_party/git/t/t4018/dts-root-comment8
-rw-r--r--third_party/git/t/t4018/elixir-do-not-pick-end5
-rw-r--r--third_party/git/t/t4018/elixir-ex-unit-test6
-rw-r--r--third_party/git/t/t4018/elixir-function5
-rw-r--r--third_party/git/t/t4018/elixir-macro5
-rw-r--r--third_party/git/t/t4018/elixir-module9
-rw-r--r--third_party/git/t/t4018/elixir-module-func8
-rw-r--r--third_party/git/t/t4018/elixir-nested-module9
-rw-r--r--third_party/git/t/t4018/elixir-private-function5
-rw-r--r--third_party/git/t/t4018/elixir-protocol6
-rw-r--r--third_party/git/t/t4018/elixir-protocol-implementation5
-rw-r--r--third_party/git/t/t4018/python-async-def4
-rw-r--r--third_party/git/t/t4018/python-class4
-rw-r--r--third_party/git/t/t4018/python-def4
-rw-r--r--third_party/git/t/t4018/python-indented-async-def7
-rw-r--r--third_party/git/t/t4018/python-indented-class5
-rw-r--r--third_party/git/t/t4018/python-indented-def7
-rwxr-xr-xthird_party/git/t/t4026-color.sh12
-rwxr-xr-xthird_party/git/t/t4027-diff-submodule.sh16
-rwxr-xr-xthird_party/git/t/t4034-diff-words.sh94
-rw-r--r--third_party/git/t/t4034/dts/expect37
-rw-r--r--third_party/git/t/t4034/dts/post32
-rw-r--r--third_party/git/t/t4034/dts/pre32
-rwxr-xr-xthird_party/git/t/t4038-diff-combined.sh23
-rwxr-xr-xthird_party/git/t/t4039-diff-assume-unchanged.sh3
-rwxr-xr-xthird_party/git/t/t4041-diff-submodule-option.sh20
-rwxr-xr-xthird_party/git/t/t4044-diff-index-unique-abbrev.sh46
-rwxr-xr-xthird_party/git/t/t4045-diff-relative.sh2
-rwxr-xr-xthird_party/git/t/t4048-diff-combined-binary.sh58
-rwxr-xr-xthird_party/git/t/t4054-diff-bogus-tree.sh3
-rwxr-xr-xthird_party/git/t/t4057-diff-combined-paths.sh2
-rwxr-xr-xthird_party/git/t/t4060-diff-submodule-option-diff-format.sh126
-rwxr-xr-xthird_party/git/t/t4066-diff-emit-delay.sh10
-rwxr-xr-xthird_party/git/t/t4067-diff-partial-clone.sh31
-rw-r--r--third_party/git/t/t4100/t-apply-1.patch4
-rw-r--r--third_party/git/t/t4100/t-apply-3.patch2
-rw-r--r--third_party/git/t/t4100/t-apply-5.patch4
-rw-r--r--third_party/git/t/t4100/t-apply-7.patch2
-rwxr-xr-xthird_party/git/t/t4108-apply-threeway.sh55
-rwxr-xr-xthird_party/git/t/t4117-apply-reject.sh6
-rwxr-xr-xthird_party/git/t/t4124-apply-ws-rule.sh10
-rwxr-xr-xthird_party/git/t/t4134-apply-submodule.sh5
-rwxr-xr-xthird_party/git/t/t4138-apply-ws-expansion.sh16
-rwxr-xr-xthird_party/git/t/t4150-am.sh72
-rwxr-xr-xthird_party/git/t/t4200-rerere.sh3
-rwxr-xr-xthird_party/git/t/t4202-log.sh244
-rwxr-xr-xthird_party/git/t/t4203-mailmap.sh122
-rwxr-xr-xthird_party/git/t/t4204-patch-id.sh2
-rwxr-xr-xthird_party/git/t/t4205-log-pretty-formats.sh81
-rwxr-xr-xthird_party/git/t/t4210-log-i18n.sh41
-rwxr-xr-xthird_party/git/t/t4211-line-log.sh85
-rw-r--r--third_party/git/t/t4211/sha1/expect.beginning-of-file (renamed from third_party/git/t/t4211/expect.beginning-of-file)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.end-of-file (renamed from third_party/git/t/t4211/expect.end-of-file)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.move-support-f (renamed from third_party/git/t/t4211/expect.move-support-f)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.multiple (renamed from third_party/git/t/t4211/expect.multiple)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.multiple-overlapping (renamed from third_party/git/t/t4211/expect.multiple-overlapping)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.multiple-superset (renamed from third_party/git/t/t4211/expect.multiple-superset)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main (renamed from third_party/git/t/t4211/expect.parallel-change-f-to-main)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.simple-f (renamed from third_party/git/t/t4211/expect.simple-f)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.simple-f-to-main (renamed from third_party/git/t/t4211/expect.simple-f-to-main)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.simple-main (renamed from third_party/git/t/t4211/expect.simple-main)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.simple-main-to-end (renamed from third_party/git/t/t4211/expect.simple-main-to-end)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.two-ranges (renamed from third_party/git/t/t4211/expect.two-ranges)0
-rw-r--r--third_party/git/t/t4211/sha1/expect.vanishes-early (renamed from third_party/git/t/t4211/expect.vanishes-early)0
-rw-r--r--third_party/git/t/t4211/sha256/expect.beginning-of-file43
-rw-r--r--third_party/git/t/t4211/sha256/expect.end-of-file62
-rw-r--r--third_party/git/t/t4211/sha256/expect.move-support-f80
-rw-r--r--third_party/git/t/t4211/sha256/expect.multiple104
-rw-r--r--third_party/git/t/t4211/sha256/expect.multiple-overlapping187
-rw-r--r--third_party/git/t/t4211/sha256/expect.multiple-superset187
-rw-r--r--third_party/git/t/t4211/sha256/expect.parallel-change-f-to-main160
-rw-r--r--third_party/git/t/t4211/sha256/expect.simple-f59
-rw-r--r--third_party/git/t/t4211/sha256/expect.simple-f-to-main100
-rw-r--r--third_party/git/t/t4211/sha256/expect.simple-main68
-rw-r--r--third_party/git/t/t4211/sha256/expect.simple-main-to-end70
-rw-r--r--third_party/git/t/t4211/sha256/expect.two-ranges102
-rw-r--r--third_party/git/t/t4211/sha256/expect.vanishes-early39
-rwxr-xr-xthird_party/git/t/t4213-log-tabexpand.sh2
-rwxr-xr-xthird_party/git/t/t4214-log-graph-octopus.sh339
-rwxr-xr-xthird_party/git/t/t4215-log-skewed-merges.sh373
-rwxr-xr-xthird_party/git/t/t4256-am-format-flowed.sh2
-rwxr-xr-xthird_party/git/t/t4300-merge-tree.sh188
-rwxr-xr-xthird_party/git/t/t5004-archive-corner-cases.sh19
-rwxr-xr-xthird_party/git/t/t5100-mailinfo.sh15
-rwxr-xr-xthird_party/git/t/t5150-request-pull.sh8
-rwxr-xr-xthird_party/git/t/t5302-pack-index.sh21
-rwxr-xr-xthird_party/git/t/t5307-pack-missing-commit.sh4
-rwxr-xr-xthird_party/git/t/t5309-pack-delta-cycles.sh18
-rwxr-xr-xthird_party/git/t/t5310-pack-bitmaps.sh36
-rwxr-xr-xthird_party/git/t/t5313-pack-bounds-checks.sh19
-rwxr-xr-xthird_party/git/t/t5314-pack-cycle-detection.sh2
-rwxr-xr-xthird_party/git/t/t5317-pack-objects-filter-objects.sh34
-rwxr-xr-xthird_party/git/t/t5318-commit-graph.sh101
-rwxr-xr-xthird_party/git/t/t5319-multi-pack-index.sh95
-rwxr-xr-xthird_party/git/t/t5321-pack-large-objects.sh4
-rwxr-xr-xthird_party/git/t/t5324-split-commit-graph.sh19
-rwxr-xr-xthird_party/git/t/t5400-send-pack.sh2
-rwxr-xr-xthird_party/git/t/t5407-post-rewrite-hook.sh16
-rwxr-xr-xthird_party/git/t/t5409-colorize-remote-messages.sh3
-rwxr-xr-xthird_party/git/t/t5500-fetch-pack.sh77
-rwxr-xr-xthird_party/git/t/t5504-fetch-receive-strict.sh17
-rwxr-xr-xthird_party/git/t/t5505-remote.sh88
-rwxr-xr-xthird_party/git/t/t5509-fetch-push-namespaces.sh13
-rwxr-xr-xthird_party/git/t/t5510-fetch.sh110
-rwxr-xr-xthird_party/git/t/t5512-ls-remote.sh29
-rwxr-xr-xthird_party/git/t/t5514-fetch-multiple.sh11
-rwxr-xr-xthird_party/git/t/t5515-fetch-merge-logic.sh63
-rwxr-xr-xthird_party/git/t/t5516-fetch-push.sh23
-rwxr-xr-xthird_party/git/t/t5517-push-mirror.sh10
-rwxr-xr-xthird_party/git/t/t5520-pull.sh366
-rwxr-xr-xthird_party/git/t/t5528-push-default.sh2
-rwxr-xr-xthird_party/git/t/t5530-upload-pack-error.sh26
-rwxr-xr-xthird_party/git/t/t5535-fetch-push-symref.sh2
-rwxr-xr-xthird_party/git/t/t5537-fetch-shallow.sh21
-rwxr-xr-xthird_party/git/t/t5539-fetch-http-shallow.sh2
-rwxr-xr-xthird_party/git/t/t5540-http-push-webdav.sh6
-rwxr-xr-xthird_party/git/t/t5541-http-push-smart.sh50
-rwxr-xr-xthird_party/git/t/t5545-push-options.sh5
-rwxr-xr-xthird_party/git/t/t5550-http-fetch-dumb.sh16
-rwxr-xr-xthird_party/git/t/t5551-http-fetch-smart.sh12
-rwxr-xr-xthird_party/git/t/t5552-skipping-fetch-negotiator.sh41
-rwxr-xr-xthird_party/git/t/t5553-set-upstream.sh178
-rwxr-xr-xthird_party/git/t/t5562-http-backend-content-length.sh2
-rwxr-xr-xthird_party/git/t/t5573-pull-verify-signatures.sh64
-rwxr-xr-xthird_party/git/t/t5580-unc-paths.sh (renamed from third_party/git/t/t5580-clone-push-unc.sh)14
-rwxr-xr-xthird_party/git/t/t5601-clone.sh11
-rwxr-xr-xthird_party/git/t/t5604-clone-reference.sh5
-rwxr-xr-xthird_party/git/t/t5607-clone-bundle.sh13
-rwxr-xr-xthird_party/git/t/t5608-clone-2gb.sh2
-rwxr-xr-xthird_party/git/t/t5616-partial-clone.sh219
-rwxr-xr-xthird_party/git/t/t5617-clone-submodules-remote.sh13
-rwxr-xr-xthird_party/git/t/t5700-protocol-v1.sh6
-rwxr-xr-xthird_party/git/t/t5702-protocol-v2.sh50
-rwxr-xr-xthird_party/git/t/t5703-upload-pack-ref-in-want.sh250
-rwxr-xr-xthird_party/git/t/t5801-remote-helpers.sh1
-rwxr-xr-xthird_party/git/t/t6000-rev-list-misc.sh33
-rwxr-xr-xthird_party/git/t/t6006-rev-list-format.sh37
-rwxr-xr-xthird_party/git/t/t6011-rev-list-with-bad-commit.sh2
-rwxr-xr-xthird_party/git/t/t6016-rev-list-graph-simplify-history.sh30
-rwxr-xr-xthird_party/git/t/t6019-rev-list-ancestry-path.sh4
-rwxr-xr-xthird_party/git/t/t6020-merge-df.sh55
-rwxr-xr-xthird_party/git/t/t6021-merge-criss-cross.sh137
-rwxr-xr-xthird_party/git/t/t6022-merge-rename.sh393
-rwxr-xr-xthird_party/git/t/t6023-merge-file.sh568
-rwxr-xr-xthird_party/git/t/t6024-recursive-merge.sh135
-rwxr-xr-xthird_party/git/t/t6025-merge-symlinks.sh95
-rwxr-xr-xthird_party/git/t/t6026-merge-attr.sh46
-rwxr-xr-xthird_party/git/t/t6030-bisect-porcelain.sh2
-rwxr-xr-xthird_party/git/t/t6034-merge-rename-nocruft.sh122
-rwxr-xr-xthird_party/git/t/t6035-merge-dir-to-symlink.sh28
-rwxr-xr-xthird_party/git/t/t6036-recursive-corner-cases.sh51
-rwxr-xr-xthird_party/git/t/t6042-merge-rename-corner-cases.sh111
-rwxr-xr-xthird_party/git/t/t6043-merge-rename-directories.sh574
-rwxr-xr-xthird_party/git/t/t6046-merge-skip-unneeded-updates.sh217
-rwxr-xr-xthird_party/git/t/t6047-diff3-conflict-markers.sh211
-rwxr-xr-xthird_party/git/t/t6102-rev-list-unexpected-objects.sh2
-rwxr-xr-xthird_party/git/t/t6112-rev-list-filters-objects.sh194
-rwxr-xr-xthird_party/git/t/t6113-rev-list-bitmap-filters.sh56
-rwxr-xr-xthird_party/git/t/t6120-describe.sh138
-rwxr-xr-xthird_party/git/t/t6130-pathspec-noglob.sh1
-rwxr-xr-xthird_party/git/t/t6136-pathspec-in-bare.sh38
-rwxr-xr-xthird_party/git/t/t6300-for-each-ref.sh19
-rwxr-xr-xthird_party/git/t/t6500-gc.sh6
-rwxr-xr-xthird_party/git/t/t6501-freshen-objects.sh6
-rwxr-xr-xthird_party/git/t/t7004-tag.sh9
-rwxr-xr-xthird_party/git/t/t7008-filter-branch-null-sha1.sh (renamed from third_party/git/t/t7009-filter-branch-null-sha1.sh)0
-rwxr-xr-xthird_party/git/t/t7012-skip-worktree-writing.sh15
-rwxr-xr-xthird_party/git/t/t7030-verify-tag.sh38
-rwxr-xr-xthird_party/git/t/t7061-wtstatus-ignore.sh9
-rwxr-xr-xthird_party/git/t/t7105-reset-patch.sh21
-rwxr-xr-xthird_party/git/t/t7107-reset-pathspec-file.sh173
-rwxr-xr-xthird_party/git/t/t7300-clean.sh73
-rwxr-xr-xthird_party/git/t/t7400-submodule-basic.sh64
-rwxr-xr-xthird_party/git/t/t7406-submodule-update.sh33
-rwxr-xr-xthird_party/git/t/t7410-submodule-checkout-to.sh77
-rwxr-xr-xthird_party/git/t/t7415-submodule-names.sh57
-rwxr-xr-xthird_party/git/t/t7416-submodule-dash-url.sh157
-rwxr-xr-xthird_party/git/t/t7417-submodule-path-url.sh17
-rwxr-xr-xthird_party/git/t/t7419-submodule-set-branch.sh6
-rwxr-xr-xthird_party/git/t/t7420-submodule-set-url.sh55
-rwxr-xr-xthird_party/git/t/t7500-commit-template-squash-signoff.sh9
-rwxr-xr-xthird_party/git/t/t7501-commit-basic-functionality.sh83
-rwxr-xr-xthird_party/git/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh281
-rwxr-xr-xthird_party/git/t/t7503-pre-commit-hook.sh139
-rwxr-xr-xthird_party/git/t/t7505-prepare-commit-msg-hook.sh8
-rw-r--r--third_party/git/t/t7505/expected-rebase-i3
-rwxr-xr-xthird_party/git/t/t7508-status.sh2
-rwxr-xr-xthird_party/git/t/t7510-signed-commit.sh39
-rwxr-xr-xthird_party/git/t/t7512-status-help.sh18
-rwxr-xr-xthird_party/git/t/t7513-interpret-trailers.sh2
-rwxr-xr-xthird_party/git/t/t7519-status-fsmonitor.sh37
-rwxr-xr-xthird_party/git/t/t7519/fsmonitor-all1
-rwxr-xr-xthird_party/git/t/t7519/fsmonitor-all-v221
-rwxr-xr-xthird_party/git/t/t7519/fsmonitor-env24
-rwxr-xr-xthird_party/git/t/t7519/fsmonitor-watchman16
-rwxr-xr-xthird_party/git/t/t7519/fsmonitor-watchman-v2173
-rwxr-xr-xthird_party/git/t/t7526-commit-pathspec-file.sh164
-rwxr-xr-xthird_party/git/t/t7612-merge-verify-signatures.sh22
-rwxr-xr-xthird_party/git/t/t7700-repack.sh172
-rwxr-xr-xthird_party/git/t/t7800-difftool.sh5
-rwxr-xr-xthird_party/git/t/t7811-grep-open.sh1
-rwxr-xr-xthird_party/git/t/t7812-grep-icase-non-ascii.sh31
-rwxr-xr-xthird_party/git/t/t7814-grep-recurse-submodules.sh32
-rwxr-xr-xthird_party/git/t/t7815-grep-binary.sh (renamed from third_party/git/t/t7008-grep-binary.sh)101
-rwxr-xr-xthird_party/git/t/t7816-grep-binary-pattern.sh127
-rwxr-xr-xthird_party/git/t/t8003-blame-corner-cases.sh1
-rwxr-xr-xthird_party/git/t/t9001-send-email.sh8
-rwxr-xr-xthird_party/git/t/t9010-svn-fe.sh4
-rwxr-xr-xthird_party/git/t/t9106-git-svn-commit-diff-clobber.sh3
-rwxr-xr-xthird_party/git/t/t9116-git-svn-log.sh12
-rwxr-xr-xthird_party/git/t/t9300-fast-import.sh132
-rwxr-xr-xthird_party/git/t/t9301-fast-import-notes.sh2
-rwxr-xr-xthird_party/git/t/t9350-fast-export.sh71
-rwxr-xr-xthird_party/git/t/t9502-gitweb-standalone-parse-output.sh7
-rwxr-xr-xthird_party/git/t/t9800-git-p4-basic.sh1
-rwxr-xr-xthird_party/git/t/t9809-git-p4-client-view.sh2
-rwxr-xr-xthird_party/git/t/t9810-git-p4-rcs.sh1
-rwxr-xr-xthird_party/git/t/t9902-completion.sh145
-rwxr-xr-xthird_party/git/t/t9903-bash-prompt.sh8
-rw-r--r--third_party/git/t/test-lib-functions.sh88
-rw-r--r--third_party/git/t/test-lib.sh82
-rw-r--r--third_party/git/tag.c28
-rw-r--r--third_party/git/tag.h1
-rw-r--r--third_party/git/tar.h5
-rwxr-xr-xthird_party/git/templates/hooks--fsmonitor-watchman.sample167
-rwxr-xr-xthird_party/git/templates/hooks--pre-commit.sample2
-rwxr-xr-xthird_party/git/templates/hooks--pre-merge-commit.sample13
-rwxr-xr-xthird_party/git/templates/hooks--update.sample10
-rw-r--r--third_party/git/trace.c2
-rw-r--r--third_party/git/trace.h133
-rw-r--r--third_party/git/trace2.h124
-rw-r--r--third_party/git/trace2/tr2_dst.c120
-rw-r--r--third_party/git/trace2/tr2_dst.h1
-rw-r--r--third_party/git/trace2/tr2_sid.c2
-rw-r--r--third_party/git/trace2/tr2_sysenv.c3
-rw-r--r--third_party/git/trace2/tr2_sysenv.h2
-rw-r--r--third_party/git/trace2/tr2_tgt_event.c36
-rw-r--r--third_party/git/trace2/tr2_tgt_normal.c37
-rw-r--r--third_party/git/trace2/tr2_tgt_perf.c108
-rw-r--r--third_party/git/transport-helper.c58
-rw-r--r--third_party/git/transport-internal.h6
-rw-r--r--third_party/git/transport.c35
-rw-r--r--third_party/git/transport.h3
-rw-r--r--third_party/git/tree-walk.c80
-rw-r--r--third_party/git/tree-walk.h142
-rw-r--r--third_party/git/tree.c18
-rw-r--r--third_party/git/unicode-width.h43
-rw-r--r--third_party/git/unpack-trees.c269
-rw-r--r--third_party/git/unpack-trees.h9
-rw-r--r--third_party/git/upload-pack.c18
-rw-r--r--third_party/git/url.c8
-rw-r--r--third_party/git/url.h8
-rw-r--r--third_party/git/urlmatch.c4
-rw-r--r--third_party/git/urlmatch.h9
-rw-r--r--third_party/git/usage.c20
-rw-r--r--third_party/git/userdiff.c24
-rw-r--r--third_party/git/utf8.c15
-rw-r--r--third_party/git/walker.c17
-rw-r--r--third_party/git/walker.h1
-rw-r--r--third_party/git/worktree.c21
-rw-r--r--third_party/git/worktree.h20
-rw-r--r--third_party/git/wrapper.c84
-rw-r--r--third_party/git/wt-status.c6
-rw-r--r--third_party/git/wt-status.h2
-rw-r--r--third_party/git/xdiff-interface.c12
-rw-r--r--third_party/git/xdiff-interface.h2
-rw-r--r--third_party/git/xdiff/xdiffi.c99
-rw-r--r--third_party/git/xdiff/xemit.c17
1006 files changed, 146045 insertions, 57858 deletions
diff --git a/third_party/git/.cirrus.yml b/third_party/git/.cirrus.yml
new file mode 100644
index 000000000000..c2f5fe385af1
--- /dev/null
+++ b/third_party/git/.cirrus.yml
@@ -0,0 +1,15 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+
+freebsd_12_task:
+  freebsd_instance:
+    image: freebsd-12-1-release-amd64
+  install_script:
+    pkg install -y gettext gmake perl5
+  create_user_script:
+    - pw useradd git
+    - chown -R git:git .
+  build_script:
+    - su git -c gmake
+  test_script:
+    - su git -c 'gmake test'
diff --git a/third_party/git/.editorconfig b/third_party/git/.editorconfig
index 42cdc4bbfb05..f9d819623d83 100644
--- a/third_party/git/.editorconfig
+++ b/third_party/git/.editorconfig
@@ -4,7 +4,7 @@ insert_final_newline = true
 
 # The settings for C (*.c and *.h) files are mirrored in .clang-format.  Keep
 # them in sync.
-[*.{c,h,sh,perl,pl,pm}]
+[*.{c,h,sh,perl,pl,pm,txt}]
 indent_style = tab
 tab_width = 8
 
diff --git a/third_party/git/.gitignore b/third_party/git/.gitignore
index 521d8f4fb421..aebe7c0908f1 100644
--- a/third_party/git/.gitignore
+++ b/third_party/git/.gitignore
@@ -158,6 +158,7 @@
 /git-show-branch
 /git-show-index
 /git-show-ref
+/git-sparse-checkout
 /git-stage
 /git-stash
 /git-status
@@ -216,6 +217,7 @@
 /tags
 /TAGS
 /cscope*
+*.hcc
 *.obj
 *.lib
 *.res
@@ -231,7 +233,6 @@
 *.ipdb
 *.dll
 .vs/
-*.manifest
 Debug/
 Release/
 /UpgradeLog*.htm
diff --git a/third_party/git/.mailmap b/third_party/git/.mailmap
index 9a5ff0475373..bde7aba756ea 100644
--- a/third_party/git/.mailmap
+++ b/third_party/git/.mailmap
@@ -18,6 +18,7 @@ Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru>
 Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
+Andrey Mazo <ahippo@yandex.com> Mazo, Andrey <amazo@checkvideo.com>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
 Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
 Amos Waterland <apw@debian.org> <apw@us.ibm.com>
@@ -30,6 +31,7 @@ Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
 Brandon Williams <bwilliams.eng@gmail.com> <bmwill@google.com>
 brian m. carlson <sandals@crustytoothpaste.net>
 brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx>
+brian m. carlson <sandals@crustytoothpaste.net> <bk2204@github.com>
 Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
 Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
 Cheng Renquan <crquan@gmail.com>
@@ -58,7 +60,9 @@ David S. Miller <davem@davemloft.net>
 David Turner <novalis@novalis.org> <dturner@twopensource.com>
 David Turner <novalis@novalis.org> <dturner@twosigma.com>
 Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
+Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
 Deskin Miller <deskinm@umich.edu>
+ฤoร n Trแบงn Cรดng Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
 Dirk Sรผsserott <newsletter@dirk.my1.cc>
 Eric Blake <eblake@redhat.com> <ebb9@byu.net>
 Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
@@ -107,6 +111,7 @@ Jim Meyering <jim@meyering.net> <meyering@redhat.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Joachim Jablon <joachim.jablon@people-doc.com> <ewjoachim@gmail.com>
 Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
+Johannes Schindelin <Johannes.Schindelin@gmx.de> Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
 Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
 Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
 Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
@@ -285,6 +290,7 @@ William Pursell <bill.pursell@gmail.com>
 YONETANI Tomokazu <y0n3t4n1@gmail.com> <qhwt+git@les.ath.cx>
 YONETANI Tomokazu <y0n3t4n1@gmail.com> <y0netan1@dragonflybsd.org>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
+Yi-Jyun Pan <pan93412@gmail.com>
 # the two anonymous contributors are different persons:
 anonymous <linux@horizon.com>
 anonymous <linux@horizon.net>
diff --git a/third_party/git/.tsan-suppressions b/third_party/git/.tsan-suppressions
index 8c85014a0a93..5ba86d68459e 100644
--- a/third_party/git/.tsan-suppressions
+++ b/third_party/git/.tsan-suppressions
@@ -8,3 +8,9 @@
 # in practice it (hopefully!) doesn't matter.
 race:^want_color$
 race:^transfer_debug$
+
+# A boolean value, which tells whether the replace_map has been initialized or
+# not, is read racily with an update. As this variable is written to only once,
+# and it's OK if the value change right after reading it, this shouldn't be a
+# problem.
+race:^lookup_replace_object$
diff --git a/third_party/git/CODE_OF_CONDUCT.md b/third_party/git/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000000..fc4645d5c08b
--- /dev/null
+++ b/third_party/git/CODE_OF_CONDUCT.md
@@ -0,0 +1,93 @@
+# Git Code of Conduct
+
+This code of conduct outlines our expectations for participants within
+the Git community, as well as steps for reporting unacceptable behavior.
+We are committed to providing a welcoming and inspiring community for
+all and expect our code of conduct to be honored. Anyone who violates
+this code of conduct may be banned from the community.
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age,
+body size, disability, ethnicity, sex characteristics, gender identity and
+expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies
+when an individual is representing the project or its community in public
+spaces. Examples of representing a project or community include using an
+official project e-mail address, posting via an official social media account,
+or acting as an appointed representative at an online or offline event.
+Representation of a project may be further defined and clarified by project
+maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at git@sfconservancy.org. All
+complaints will be reviewed and investigated and will result in a response
+that is deemed necessary and appropriate to the circumstances. The project
+team is obligated to maintain confidentiality with regard to the reporter of
+an incident. Further details of specific enforcement policies may be posted
+separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+The project leadership team can be contacted by email as a whole at
+git@sfconservancy.org, or individually:
+
+  - ร†var Arnfjรถrรฐ Bjarmason <avarab@gmail.com>
+  - Christian Couder <christian.couder@gmail.com>
+  - Jeff King <peff@peff.net>
+  - Junio C Hamano <gitster@pobox.com>
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/third_party/git/Documentation/CodingGuidelines b/third_party/git/Documentation/CodingGuidelines
index f45db5b72740..ed4e443a3cd9 100644
--- a/third_party/git/Documentation/CodingGuidelines
+++ b/third_party/git/Documentation/CodingGuidelines
@@ -75,7 +75,7 @@ For shell scripts specifically (not exhaustive):
 
  - If you want to find out if a command is available on the user's
    $PATH, you should use 'type <command>', instead of 'which <command>'.
-   The output of 'which' is not machine parseable and its exit code
+   The output of 'which' is not machine parsable and its exit code
    is not reliable across platforms.
 
  - We use POSIX compliant parameter substitutions and avoid bashisms;
@@ -203,7 +203,7 @@ For C programs:
    . since early 2012 with e1327023ea, we have been using an enum
      definition whose last element is followed by a comma.  This, like
      an array initializer that ends with a trailing comma, can be used
-     to reduce the patch noise when adding a new identifer at the end.
+     to reduce the patch noise when adding a new identifier at the end.
 
    . since mid 2017 with cbc0f81d, we have been using designated
      initializers for struct (e.g. "struct t v = { .val = 'a' };").
diff --git a/third_party/git/Documentation/Makefile b/third_party/git/Documentation/Makefile
index 76f2ecfc1b1a..8fe829cc1b83 100644
--- a/third_party/git/Documentation/Makefile
+++ b/third_party/git/Documentation/Makefile
@@ -77,6 +77,7 @@ API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technica
 SP_ARTICLES += $(API_DOCS)
 
 TECH_DOCS += MyFirstContribution
+TECH_DOCS += MyFirstObjectWalk
 TECH_DOCS += SubmittingPatches
 TECH_DOCS += technical/hash-function-transition
 TECH_DOCS += technical/http-protocol
@@ -123,7 +124,8 @@ ASCIIDOC_HTML = xhtml11
 ASCIIDOC_DOCBOOK = docbook
 ASCIIDOC_CONF = -f asciidoc.conf
 ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
-		-agit_version=$(GIT_VERSION)
+		-amanversion=$(GIT_VERSION) \
+		-amanmanual='Git Manual' -amansource='Git'
 TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
 TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
 MANPAGE_XSL = manpage-normal.xsl
@@ -197,11 +199,13 @@ ifdef USE_ASCIIDOCTOR
 ASCIIDOC = asciidoctor
 ASCIIDOC_CONF =
 ASCIIDOC_HTML = xhtml5
-ASCIIDOC_DOCBOOK = docbook45
+ASCIIDOC_DOCBOOK = docbook5
 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
 ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
 DBLATEX_COMMON =
+XMLTO_EXTRA += --skip-validation
+XMLTO_EXTRA += -x manpage.xsl
 endif
 
 SHELL_PATH ?= $(SHELL)
diff --git a/third_party/git/Documentation/MyFirstContribution.txt b/third_party/git/Documentation/MyFirstContribution.txt
index f8670379c0cf..427274df4d92 100644
--- a/third_party/git/Documentation/MyFirstContribution.txt
+++ b/third_party/git/Documentation/MyFirstContribution.txt
@@ -23,6 +23,42 @@ useful additional context:
 - `Documentation/SubmittingPatches`
 - `Documentation/howto/new-command.txt`
 
+[[getting-help]]
+=== Getting Help
+
+If you get stuck, you can seek help in the following places.
+
+==== git@vger.kernel.org
+
+This is the main Git project mailing list where code reviews, version
+announcements, design discussions, and more take place. Those interested in
+contributing are welcome to post questions here. The Git list requires
+plain-text-only emails and prefers inline and bottom-posting when replying to
+mail; you will be CC'd in all replies to you. Optionally, you can subscribe to
+the list by sending an email to majordomo@vger.kernel.org with "subscribe git"
+in the body. The https://lore.kernel.org/git[archive] of this mailing list is
+available to view in a browser.
+
+==== https://groups.google.com/forum/#!forum/git-mentoring[git-mentoring@googlegroups.com]
+
+This mailing list is targeted to new contributors and was created as a place to
+post questions and receive answers outside of the public eye of the main list.
+Veteran contributors who are especially interested in helping mentor newcomers
+are present on the list. In order to avoid search indexers, group membership is
+required to view messages; anyone can join and no approval is required.
+
+==== https://webchat.freenode.net/#git-devel[#git-devel] on Freenode
+
+This IRC channel is for conversations between Git contributors. If someone is
+currently online and knows the answer to your question, you can receive help
+in real time. Otherwise, you can read the
+https://colabti.org/irclogger/irclogger_logs/git-devel[scrollback] to see
+whether someone answered you. IRC does not allow offline private messaging, so
+if you try to private message someone and then log out of IRC, they cannot
+respond to you. It's better to ask your questions in the channel so that you
+can be answered if you disconnect and so that others can learn from the
+conversation.
+
 [[getting-started]]
 == Getting Started
 
@@ -38,6 +74,26 @@ $ git clone https://github.com/git/git git
 $ cd git
 ----
 
+[[dependencies]]
+=== Installing Dependencies
+
+To build Git from source, you need to have a handful of dependencies installed
+on your system. For a hint of what's needed, you can take a look at
+`INSTALL`, paying close attention to the section about Git's dependencies on
+external programs and libraries. That document mentions a way to "test-drive"
+our freshly built Git without installing; that's the method we'll be using in
+this tutorial.
+
+Make sure that your environment has everything you need by building your brand
+new clone of Git from the above step:
+
+----
+$ make
+----
+
+NOTE: The Git build is parallelizable. `-j#` is not included above but you can
+use it as you prefer, here and elsewhere.
+
 [[identify-problem]]
 === Identify Problem to Solve
 
@@ -97,8 +153,8 @@ int cmd_psuh(int argc, const char **argv, const char *prefix)
 ----
 
 We'll also need to add the declaration of psuh; open up `builtin.h`, find the
-declaration for `cmd_push`, and add a new line for `psuh` immediately before it,
-in order to keep the declarations sorted:
+declaration for `cmd_pull`, and add a new line for `psuh` immediately before it,
+in order to keep the declarations alphabetically sorted:
 
 ----
 int cmd_psuh(int argc, const char **argv, const char *prefix);
@@ -123,7 +179,7 @@ int cmd_psuh(int argc, const char **argv, const char *prefix)
 }
 ----
 
-Let's try to build it.  Open `Makefile`, find where `builtin/push.o` is added
+Let's try to build it.  Open `Makefile`, find where `builtin/pull.o` is added
 to `BUILTIN_OBJS`, and add `builtin/psuh.o` in the same way next to it in
 alphabetical order. Once you've done so, move to the top-level directory and
 build simply with `make`. Also add the `DEVELOPER=1` variable to turn on
@@ -138,9 +194,6 @@ NOTE: When you are developing the Git project, it's preferred that you use the
 `DEVELOPER` flag; if there's some reason it doesn't work for you, you can turn
 it off, but it's a good idea to mention the problem to the mailing list.
 
-NOTE: The Git build is parallelizable. `-j#` is not included above but you can
-use it as you prefer, here and elsewhere.
-
 Great, now your new command builds happily on its own. But nobody invokes it.
 Let's change that.
 
@@ -149,7 +202,7 @@ a `cmd_struct` to the `commands[]` array. `struct cmd_struct` takes a string
 with the command name, a function pointer to the command implementation, and a
 setup option flag. For now, let's keep mimicking `push`. Find the line where
 `cmd_push` is registered, copy it, and modify it for `cmd_psuh`, placing the new
-line in alphabetical order.
+line in alphabetical order (immediately before `cmd_pull`).
 
 The options are documented in `builtin.h` under "Adding a new built-in." Since
 we hope to print some data about the user's current workspace context later,
@@ -167,7 +220,7 @@ Check it out! You've got a command! Nice work! Let's commit this.
 
 `git status` reveals modified `Makefile`, `builtin.h`, and `git.c` as well as
 untracked `builtin/psuh.c` and `git-psuh`. First, let's take care of the binary,
-which should be ignored. Open `.gitignore` in your editor, find `/git-push`, and
+which should be ignored. Open `.gitignore` in your editor, find `/git-pull`, and
 add an entry for your new command in alphabetical order:
 
 ----
@@ -534,6 +587,28 @@ you want to pass as a parameter something which would usually be interpreted as
 a flag.) `parse_options()` will terminate parsing when it reaches `--` and give
 you the rest of the options afterwards, untouched.
 
+Now that you have a usage hint, you can teach Git how to show it in the general
+command list shown by `git help git` or `git help -a`, which is generated from
+`command-list.txt`. Find the line for 'git-pull' so you can add your 'git-psuh'
+line above it in alphabetical order. Now, we can add some attributes about the
+command which impacts where it shows up in the aforementioned help commands. The
+top of `command-list.txt` shares some information about what each attribute
+means; in those help pages, the commands are sorted according to these
+attributes. `git psuh` is user-facing, or porcelain - so we will mark it as
+"mainporcelain". For "mainporcelain" commands, the comments at the top of
+`command-list.txt` indicate we can also optionally add an attribute from another
+list; since `git psuh` shows some information about the user's workspace but
+doesn't modify anything, let's mark it as "info". Make sure to keep your
+attributes in the same style as the rest of `command-list.txt` using spaces to
+align and delineate them:
+
+----
+git-prune-packed                        plumbingmanipulators
+git-psuh                                mainporcelain		info
+git-pull                                mainporcelain           remote
+git-push                                mainporcelain           remote
+----
+
 Build again. Now, when you run with `-h`, you should see your usage printed and
 your command terminated before anything else interesting happens. Great!
 
@@ -746,6 +821,14 @@ will automatically run your PRs through the CI even without the permission given
 but you will not be able to `/submit` your changes until someone allows you to
 use the tool.
 
+NOTE: You can typically find someone who can `/allow` you on GitGitGadget by
+either examining recent pull requests where someone has been granted `/allow`
+(https://github.com/gitgitgadget/git/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+%22%2Fallow%22[Search:
+is:pr is:open "/allow"]), in which case both the author and the person who
+granted the `/allow` can now `/allow` you, or by inquiring on the
+https://webchat.freenode.net/#git-devel[#git-devel] IRC channel on Freenode
+linking your pull request and asking for someone to `/allow` you.
+
 If the CI fails, you can update your changes with `git rebase -i` and push your
 branch again:
 
@@ -970,7 +1053,7 @@ reviewers the changes you've made that may not be as visible.
 You will also need to go and find the Message-Id of your previous cover letter.
 You can either note it when you send the first series, from the output of `git
 send-email`, or you can look it up on the
-https://public-inbox.org/git[mailing list]. Find your cover letter in the
+https://lore.kernel.org/git[mailing list]. Find your cover letter in the
 archives, click on it, then click "permalink" or "raw" to reveal the Message-Id
 header. It should match:
 
diff --git a/third_party/git/Documentation/MyFirstObjectWalk.txt b/third_party/git/Documentation/MyFirstObjectWalk.txt
new file mode 100644
index 000000000000..aa828dfdc44a
--- /dev/null
+++ b/third_party/git/Documentation/MyFirstObjectWalk.txt
@@ -0,0 +1,905 @@
+= My First Object Walk
+
+== What's an Object Walk?
+
+The object walk is a key concept in Git - this is the process that underpins
+operations like object transfer and fsck. Beginning from a given commit, the
+list of objects is found by walking parent relationships between commits (commit
+X based on commit W) and containment relationships between objects (tree Y is
+contained within commit X, and blob Z is located within tree Y, giving our
+working tree for commit X something like `y/z.txt`).
+
+A related concept is the revision walk, which is focused on commit objects and
+their parent relationships and does not delve into other object types. The
+revision walk is used for operations like `git log`.
+
+=== Related Reading
+
+- `Documentation/user-manual.txt` under "Hacking Git" contains some coverage of
+  the revision walker in its various incarnations.
+- `revision.h`
+- https://eagain.net/articles/git-for-computer-scientists/[Git for Computer Scientists]
+  gives a good overview of the types of objects in Git and what your object
+  walk is really describing.
+
+== Setting Up
+
+Create a new branch from `master`.
+
+----
+git checkout -b revwalk origin/master
+----
+
+We'll put our fiddling into a new command. For fun, let's name it `git walken`.
+Open up a new file `builtin/walken.c` and set up the command handler:
+
+----
+/*
+ * "git walken"
+ *
+ * Part of the "My First Object Walk" tutorial.
+ */
+
+#include "builtin.h"
+
+int cmd_walken(int argc, const char **argv, const char *prefix)
+{
+	trace_printf(_("cmd_walken incoming...\n"));
+	return 0;
+}
+----
+
+NOTE: `trace_printf()` differs from `printf()` in that it can be turned on or
+off at runtime. For the purposes of this tutorial, we will write `walken` as
+though it is intended for use as a "plumbing" command: that is, a command which
+is used primarily in scripts, rather than interactively by humans (a "porcelain"
+command). So we will send our debug output to `trace_printf()` instead. When
+running, enable trace output by setting the environment variable `GIT_TRACE`.
+
+Add usage text and `-h` handling, like all subcommands should consistently do
+(our test suite will notice and complain if you fail to do so).
+
+----
+int cmd_walken(int argc, const char **argv, const char *prefix)
+{
+	const char * const walken_usage[] = {
+		N_("git walken"),
+		NULL,
+	}
+	struct option options[] = {
+		OPT_END()
+	};
+
+	argc = parse_options(argc, argv, prefix, options, walken_usage, 0);
+
+	...
+}
+----
+
+Also add the relevant line in `builtin.h` near `cmd_whatchanged()`:
+
+----
+int cmd_walken(int argc, const char **argv, const char *prefix);
+----
+
+Include the command in `git.c` in `commands[]` near the entry for `whatchanged`,
+maintaining alphabetical ordering:
+
+----
+{ "walken", cmd_walken, RUN_SETUP },
+----
+
+Add it to the `Makefile` near the line for `builtin/worktree.o`:
+
+----
+BUILTIN_OBJS += builtin/walken.o
+----
+
+Build and test out your command, without forgetting to ensure the `DEVELOPER`
+flag is set, and with `GIT_TRACE` enabled so the debug output can be seen:
+
+----
+$ echo DEVELOPER=1 >>config.mak
+$ make
+$ GIT_TRACE=1 ./bin-wrappers/git walken
+----
+
+NOTE: For a more exhaustive overview of the new command process, take a look at
+`Documentation/MyFirstContribution.txt`.
+
+NOTE: A reference implementation can be found at
+https://github.com/nasamuffin/git/tree/revwalk.
+
+=== `struct rev_cmdline_info`
+
+The definition of `struct rev_cmdline_info` can be found in `revision.h`.
+
+This struct is contained within the `rev_info` struct and is used to reflect
+parameters provided by the user over the CLI.
+
+`nr` represents the number of `rev_cmdline_entry` present in the array.
+
+`alloc` is used by the `ALLOC_GROW` macro. Check `cache.h` - this variable is
+used to track the allocated size of the list.
+
+Per entry, we find:
+
+`item` is the object provided upon which to base the object walk. Items in Git
+can be blobs, trees, commits, or tags. (See `Documentation/gittutorial-2.txt`.)
+
+`name` is the object ID (OID) of the object - a hex string you may be familiar
+with from using Git to organize your source in the past. Check the tutorial
+mentioned above towards the top for a discussion of where the OID can come
+from.
+
+`whence` indicates some information about what to do with the parents of the
+specified object. We'll explore this flag more later on; take a look at
+`Documentation/revisions.txt` to get an idea of what could set the `whence`
+value.
+
+`flags` are used to hint the beginning of the revision walk and are the first
+block under the `#include`s in `revision.h`. The most likely ones to be set in
+the `rev_cmdline_info` are `UNINTERESTING` and `BOTTOM`, but these same flags
+can be used during the walk, as well.
+
+=== `struct rev_info`
+
+This one is quite a bit longer, and many fields are only used during the walk
+by `revision.c` - not configuration options. Most of the configurable flags in
+`struct rev_info` have a mirror in `Documentation/rev-list-options.txt`. It's a
+good idea to take some time and read through that document.
+
+== Basic Commit Walk
+
+First, let's see if we can replicate the output of `git log --oneline`. We'll
+refer back to the implementation frequently to discover norms when performing
+an object walk of our own.
+
+To do so, we'll first find all the commits, in order, which preceded the current
+commit. We'll extract the name and subject of the commit from each.
+
+Ideally, we will also be able to find out which ones are currently at the tip of
+various branches.
+
+=== Setting Up
+
+Preparing for your object walk has some distinct stages.
+
+1. Perform default setup for this mode, and others which may be invoked.
+2. Check configuration files for relevant settings.
+3. Set up the `rev_info` struct.
+4. Tweak the initialized `rev_info` to suit the current walk.
+5. Prepare the `rev_info` for the walk.
+6. Iterate over the objects, processing each one.
+
+==== Default Setups
+
+Before examining configuration files which may modify command behavior, set up
+default state for switches or options your command may have. If your command
+utilizes other Git components, ask them to set up their default states as well.
+For instance, `git log` takes advantage of `grep` and `diff` functionality, so
+its `init_log_defaults()` sets its own state (`decoration_style`) and asks
+`grep` and `diff` to initialize themselves by calling each of their
+initialization functions.
+
+For our first example within `git walken`, we don't intend to use any other
+components within Git, and we don't have any configuration to do.  However, we
+may want to add some later, so for now, we can add an empty placeholder. Create
+a new function in `builtin/walken.c`:
+
+----
+static void init_walken_defaults(void)
+{
+	/*
+	 * We don't actually need the same components `git log` does; leave this
+	 * empty for now.
+	 */
+}
+----
+
+Make sure to add a line invoking it inside of `cmd_walken()`.
+
+----
+int cmd_walken(int argc, const char **argv, const char *prefix)
+{
+	init_walken_defaults();
+}
+----
+
+==== Configuring From `.gitconfig`
+
+Next, we should have a look at any relevant configuration settings (i.e.,
+settings readable and settable from `git config`). This is done by providing a
+callback to `git_config()`; within that callback, you can also invoke methods
+from other components you may need that need to intercept these options. Your
+callback will be invoked once per each configuration value which Git knows about
+(global, local, worktree, etc.).
+
+Similarly to the default values, we don't have anything to do here yet
+ourselves; however, we should call `git_default_config()` if we aren't calling
+any other existing config callbacks.
+
+Add a new function to `builtin/walken.c`:
+
+----
+static int git_walken_config(const char *var, const char *value, void *cb)
+{
+	/*
+	 * For now, we don't have any custom configuration, so fall back to
+	 * the default config.
+	 */
+	return git_default_config(var, value, cb);
+}
+----
+
+Make sure to invoke `git_config()` with it in your `cmd_walken()`:
+
+----
+int cmd_walken(int argc, const char **argv, const char *prefix)
+{
+	...
+
+	git_config(git_walken_config, NULL);
+
+	...
+}
+----
+
+==== Setting Up `rev_info`
+
+Now that we've gathered external configuration and options, it's time to
+initialize the `rev_info` object which we will use to perform the walk. This is
+typically done by calling `repo_init_revisions()` with the repository you intend
+to target, as well as the `prefix` argument of `cmd_walken` and your `rev_info`
+struct.
+
+Add the `struct rev_info` and the `repo_init_revisions()` call:
+----
+int cmd_walken(int argc, const char **argv, const char *prefix)
+{
+	/* This can go wherever you like in your declarations.*/
+	struct rev_info rev;
+	...
+
+	/* This should go after the git_config() call. */
+	repo_init_revisions(the_repository, &rev, prefix);
+
+	...
+}
+----
+
+==== Tweaking `rev_info` For the Walk
+
+We're getting close, but we're still not quite ready to go. Now that `rev` is
+initialized, we can modify it to fit our needs. This is usually done within a
+helper for clarity, so let's add one:
+
+----
+static void final_rev_info_setup(struct rev_info *rev)
+{
+	/*
+	 * We want to mimic the appearance of `git log --oneline`, so let's
+	 * force oneline format.
+	 */
+	get_commit_format("oneline", rev);
+
+	/* Start our object walk at HEAD. */
+	add_head_to_pending(rev);
+}
+----
+
+[NOTE]
+====
+Instead of using the shorthand `add_head_to_pending()`, you could do
+something like this:
+----
+	struct setup_revision_opt opt;
+
+	memset(&opt, 0, sizeof(opt));
+	opt.def = "HEAD";
+	opt.revarg_opt = REVARG_COMMITTISH;
+	setup_revisions(argc, argv, rev, &opt);
+----
+Using a `setup_revision_opt` gives you finer control over your walk's starting
+point.
+====
+
+Then let's invoke `final_rev_info_setup()` after the call to
+`repo_init_revisions()`:
+
+----
+int cmd_walken(int argc, const char **argv, const char *prefix)
+{
+	...
+
+	final_rev_info_setup(&rev);
+
+	...
+}
+----
+
+Later, we may wish to add more arguments to `final_rev_info_setup()`. But for
+now, this is all we need.
+
+==== Preparing `rev_info` For the Walk
+
+Now that `rev` is all initialized and configured, we've got one more setup step
+before we get rolling. We can do this in a helper, which will both prepare the
+`rev_info` for the walk, and perform the walk itself. Let's start the helper
+with the call to `prepare_revision_walk()`, which can return an error without
+dying on its own:
+
+----
+static void walken_commit_walk(struct rev_info *rev)
+{
+	if (prepare_revision_walk(rev))
+		die(_("revision walk setup failed"));
+}
+----
+
+NOTE: `die()` prints to `stderr` and exits the program. Since it will print to
+`stderr` it's likely to be seen by a human, so we will localize it.
+
+==== Performing the Walk!
+
+Finally! We are ready to begin the walk itself. Now we can see that `rev_info`
+can also be used as an iterator; we move to the next item in the walk by using
+`get_revision()` repeatedly. Add the listed variable declarations at the top and
+the walk loop below the `prepare_revision_walk()` call within your
+`walken_commit_walk()`:
+
+----
+static void walken_commit_walk(struct rev_info *rev)
+{
+	struct commit *commit;
+	struct strbuf prettybuf = STRBUF_INIT;
+
+	...
+
+	while ((commit = get_revision(rev))) {
+		if (!commit)
+			continue;
+
+		strbuf_reset(&prettybuf);
+		pp_commit_easy(CMIT_FMT_ONELINE, commit, &prettybuf);
+		puts(prettybuf.buf);
+	}
+	strbuf_release(&prettybuf);
+}
+----
+
+NOTE: `puts()` prints a `char*` to `stdout`. Since this is the part of the
+command we expect to be machine-parsed, we're sending it directly to stdout.
+
+Give it a shot.
+
+----
+$ make
+$ ./bin-wrappers/git walken
+----
+
+You should see all of the subject lines of all the commits in
+your tree's history, in order, ending with the initial commit, "Initial revision
+of "git", the information manager from hell". Congratulations! You've written
+your first revision walk. You can play with printing some additional fields
+from each commit if you're curious; have a look at the functions available in
+`commit.h`.
+
+=== Adding a Filter
+
+Next, let's try to filter the commits we see based on their author. This is
+equivalent to running `git log --author=<pattern>`. We can add a filter by
+modifying `rev_info.grep_filter`, which is a `struct grep_opt`.
+
+First some setup. Add `init_grep_defaults()` to `init_walken_defaults()` and add
+`grep_config()` to `git_walken_config()`:
+
+----
+static void init_walken_defaults(void)
+{
+	init_grep_defaults(the_repository);
+}
+
+...
+
+static int git_walken_config(const char *var, const char *value, void *cb)
+{
+	grep_config(var, value, cb);
+	return git_default_config(var, value, cb);
+}
+----
+
+Next, we can modify the `grep_filter`. This is done with convenience functions
+found in `grep.h`. For fun, we're filtering to only commits from folks using a
+`gmail.com` email address - a not-very-precise guess at who may be working on
+Git as a hobby. Since we're checking the author, which is a specific line in the
+header, we'll use the `append_header_grep_pattern()` helper. We can use
+the `enum grep_header_field` to indicate which part of the commit header we want
+to search.
+
+In `final_rev_info_setup()`, add your filter line:
+
+----
+static void final_rev_info_setup(int argc, const char **argv,
+		const char *prefix, struct rev_info *rev)
+{
+	...
+
+	append_header_grep_pattern(&rev->grep_filter, GREP_HEADER_AUTHOR,
+		"gmail");
+	compile_grep_patterns(&rev->grep_filter);
+
+	...
+}
+----
+
+`append_header_grep_pattern()` adds your new "gmail" pattern to `rev_info`, but
+it won't work unless we compile it with `compile_grep_patterns()`.
+
+NOTE: If you are using `setup_revisions()` (for example, if you are passing a
+`setup_revision_opt` instead of using `add_head_to_pending()`), you don't need
+to call `compile_grep_patterns()` because `setup_revisions()` calls it for you.
+
+NOTE: We could add the same filter via the `append_grep_pattern()` helper if we
+wanted to, but `append_header_grep_pattern()` adds the `enum grep_context` and
+`enum grep_pat_token` for us.
+
+=== Changing the Order
+
+There are a few ways that we can change the order of the commits during a
+revision walk. Firstly, we can use the `enum rev_sort_order` to choose from some
+typical orderings.
+
+`topo_order` is the same as `git log --topo-order`: we avoid showing a parent
+before all of its children have been shown, and we avoid mixing commits which
+are in different lines of history. (`git help log`'s section on `--topo-order`
+has a very nice diagram to illustrate this.)
+
+Let's see what happens when we run with `REV_SORT_BY_COMMIT_DATE` as opposed to
+`REV_SORT_BY_AUTHOR_DATE`. Add the following:
+
+----
+static void final_rev_info_setup(int argc, const char **argv,
+		const char *prefix, struct rev_info *rev)
+{
+	...
+
+	rev->topo_order = 1;
+	rev->sort_order = REV_SORT_BY_COMMIT_DATE;
+
+	...
+}
+----
+
+Let's output this into a file so we can easily diff it with the walk sorted by
+author date.
+
+----
+$ make
+$ ./bin-wrappers/git walken > commit-date.txt
+----
+
+Then, let's sort by author date and run it again.
+
+----
+static void final_rev_info_setup(int argc, const char **argv,
+		const char *prefix, struct rev_info *rev)
+{
+	...
+
+	rev->topo_order = 1;
+	rev->sort_order = REV_SORT_BY_AUTHOR_DATE;
+
+	...
+}
+----
+
+----
+$ make
+$ ./bin-wrappers/git walken > author-date.txt
+----
+
+Finally, compare the two. This is a little less helpful without object names or
+dates, but hopefully we get the idea.
+
+----
+$ diff -u commit-date.txt author-date.txt
+----
+
+This display indicates that commits can be reordered after they're written, for
+example with `git rebase`.
+
+Let's try one more reordering of commits. `rev_info` exposes a `reverse` flag.
+Set that flag somewhere inside of `final_rev_info_setup()`:
+
+----
+static void final_rev_info_setup(int argc, const char **argv, const char *prefix,
+		struct rev_info *rev)
+{
+	...
+
+	rev->reverse = 1;
+
+	...
+}
+----
+
+Run your walk again and note the difference in order. (If you remove the grep
+pattern, you should see the last commit this call gives you as your current
+HEAD.)
+
+== Basic Object Walk
+
+So far we've been walking only commits. But Git has more types of objects than
+that! Let's see if we can walk _all_ objects, and find out some information
+about each one.
+
+We can base our work on an example. `git pack-objects` prepares all kinds of
+objects for packing into a bitmap or packfile. The work we are interested in
+resides in `builtins/pack-objects.c:get_object_list()`; examination of that
+function shows that the all-object walk is being performed by
+`traverse_commit_list()` or `traverse_commit_list_filtered()`. Those two
+functions reside in `list-objects.c`; examining the source shows that, despite
+the name, these functions traverse all kinds of objects. Let's have a look at
+the arguments to `traverse_commit_list_filtered()`, which are a superset of the
+arguments to the unfiltered version.
+
+- `struct list_objects_filter_options *filter_options`: This is a struct which
+  stores a filter-spec as outlined in `Documentation/rev-list-options.txt`.
+- `struct rev_info *revs`: This is the `rev_info` used for the walk.
+- `show_commit_fn show_commit`: A callback which will be used to handle each
+  individual commit object.
+- `show_object_fn show_object`: A callback which will be used to handle each
+  non-commit object (so each blob, tree, or tag).
+- `void *show_data`: A context buffer which is passed in turn to `show_commit`
+  and `show_object`.
+- `struct oidset *omitted`: A linked-list of object IDs which the provided
+  filter caused to be omitted.
+
+It looks like this `traverse_commit_list_filtered()` uses callbacks we provide
+instead of needing us to call it repeatedly ourselves. Cool! Let's add the
+callbacks first.
+
+For the sake of this tutorial, we'll simply keep track of how many of each kind
+of object we find. At file scope in `builtin/walken.c` add the following
+tracking variables:
+
+----
+static int commit_count;
+static int tag_count;
+static int blob_count;
+static int tree_count;
+----
+
+Commits are handled by a different callback than other objects; let's do that
+one first:
+
+----
+static void walken_show_commit(struct commit *cmt, void *buf)
+{
+	commit_count++;
+}
+----
+
+The `cmt` argument is fairly self-explanatory. But it's worth mentioning that
+the `buf` argument is actually the context buffer that we can provide to the
+traversal calls - `show_data`, which we mentioned a moment ago.
+
+Since we have the `struct commit` object, we can look at all the same parts that
+we looked at in our earlier commit-only walk. For the sake of this tutorial,
+though, we'll just increment the commit counter and move on.
+
+The callback for non-commits is a little different, as we'll need to check
+which kind of object we're dealing with:
+
+----
+static void walken_show_object(struct object *obj, const char *str, void *buf)
+{
+	switch (obj->type) {
+	case OBJ_TREE:
+		tree_count++;
+		break;
+	case OBJ_BLOB:
+		blob_count++;
+		break;
+	case OBJ_TAG:
+		tag_count++;
+		break;
+	case OBJ_COMMIT:
+		BUG("unexpected commit object in walken_show_object\n");
+	default:
+		BUG("unexpected object type %s in walken_show_object\n",
+			type_name(obj->type));
+	}
+}
+----
+
+Again, `obj` is fairly self-explanatory, and we can guess that `buf` is the same
+context pointer that `walken_show_commit()` receives: the `show_data` argument
+to `traverse_commit_list()` and `traverse_commit_list_filtered()`. Finally,
+`str` contains the name of the object, which ends up being something like
+`foo.txt` (blob), `bar/baz` (tree), or `v1.2.3` (tag).
+
+To help assure us that we aren't double-counting commits, we'll include some
+complaining if a commit object is routed through our non-commit callback; we'll
+also complain if we see an invalid object type. Since those two cases should be
+unreachable, and would only change in the event of a semantic change to the Git
+codebase, we complain by using `BUG()` - which is a signal to a developer that
+the change they made caused unintended consequences, and the rest of the
+codebase needs to be updated to understand that change. `BUG()` is not intended
+to be seen by the public, so it is not localized.
+
+Our main object walk implementation is substantially different from our commit
+walk implementation, so let's make a new function to perform the object walk. We
+can perform setup which is applicable to all objects here, too, to keep separate
+from setup which is applicable to commit-only walks.
+
+We'll start by enabling all types of objects in the `struct rev_info`.  We'll
+also turn on `tree_blobs_in_commit_order`, which means that we will walk a
+commit's tree and everything it points to immediately after we find each commit,
+as opposed to waiting for the end and walking through all trees after the commit
+history has been discovered. With the appropriate settings configured, we are
+ready to call `prepare_revision_walk()`.
+
+----
+static void walken_object_walk(struct rev_info *rev)
+{
+	rev->tree_objects = 1;
+	rev->blob_objects = 1;
+	rev->tag_objects = 1;
+	rev->tree_blobs_in_commit_order = 1;
+
+	if (prepare_revision_walk(rev))
+		die(_("revision walk setup failed"));
+
+	commit_count = 0;
+	tag_count = 0;
+	blob_count = 0;
+	tree_count = 0;
+----
+
+Let's start by calling just the unfiltered walk and reporting our counts.
+Complete your implementation of `walken_object_walk()`:
+
+----
+	traverse_commit_list(rev, walken_show_commit, walken_show_object, NULL);
+
+	printf("commits %d\nblobs %d\ntags %d\ntrees %d\n", commit_count,
+		blob_count, tag_count, tree_count);
+}
+----
+
+NOTE: This output is intended to be machine-parsed. Therefore, we are not
+sending it to `trace_printf()`, and we are not localizing it - we need scripts
+to be able to count on the formatting to be exactly the way it is shown here.
+If we were intending this output to be read by humans, we would need to localize
+it with `_()`.
+
+Finally, we'll ask `cmd_walken()` to use the object walk instead. Discussing
+command line options is out of scope for this tutorial, so we'll just hardcode
+a branch we can change at compile time. Where you call `final_rev_info_setup()`
+and `walken_commit_walk()`, instead branch like so:
+
+----
+	if (1) {
+		add_head_to_pending(&rev);
+		walken_object_walk(&rev);
+	} else {
+		final_rev_info_setup(argc, argv, prefix, &rev);
+		walken_commit_walk(&rev);
+	}
+----
+
+NOTE: For simplicity, we've avoided all the filters and sorts we applied in
+`final_rev_info_setup()` and simply added `HEAD` to our pending queue. If you
+want, you can certainly use the filters we added before by moving
+`final_rev_info_setup()` out of the conditional and removing the call to
+`add_head_to_pending()`.
+
+Now we can try to run our command! It should take noticeably longer than the
+commit walk, but an examination of the output will give you an idea why. Your
+output should look similar to this example, but with different counts:
+
+----
+Object walk completed. Found 55733 commits, 100274 blobs, 0 tags, and 104210 trees.
+----
+
+This makes sense. We have more trees than commits because the Git project has
+lots of subdirectories which can change, plus at least one tree per commit. We
+have no tags because we started on a commit (`HEAD`) and while tags can point to
+commits, commits can't point to tags.
+
+NOTE: You will have different counts when you run this yourself! The number of
+objects grows along with the Git project.
+
+=== Adding a Filter
+
+There are a handful of filters that we can apply to the object walk laid out in
+`Documentation/rev-list-options.txt`. These filters are typically useful for
+operations such as creating packfiles or performing a partial clone. They are
+defined in `list-objects-filter-options.h`. For the purposes of this tutorial we
+will use the "tree:1" filter, which causes the walk to omit all trees and blobs
+which are not directly referenced by commits reachable from the commit in
+`pending` when the walk begins. (`pending` is the list of objects which need to
+be traversed during a walk; you can imagine a breadth-first tree traversal to
+help understand. In our case, that means we omit trees and blobs not directly
+referenced by `HEAD` or `HEAD`'s history, because we begin the walk with only
+`HEAD` in the `pending` list.)
+
+First, we'll need to `#include "list-objects-filter-options.h`" and set up the
+`struct list_objects_filter_options` at the top of the function.
+
+----
+static void walken_object_walk(struct rev_info *rev)
+{
+	struct list_objects_filter_options filter_options = {};
+
+	...
+----
+
+For now, we are not going to track the omitted objects, so we'll replace those
+parameters with `NULL`. For the sake of simplicity, we'll add a simple
+build-time branch to use our filter or not. Replace the line calling
+`traverse_commit_list()` with the following, which will remind us which kind of
+walk we've just performed:
+
+----
+	if (0) {
+		/* Unfiltered: */
+		trace_printf(_("Unfiltered object walk.\n"));
+		traverse_commit_list(rev, walken_show_commit,
+				walken_show_object, NULL);
+	} else {
+		trace_printf(
+			_("Filtered object walk with filterspec 'tree:1'.\n"));
+		parse_list_objects_filter(&filter_options, "tree:1");
+
+		traverse_commit_list_filtered(&filter_options, rev,
+			walken_show_commit, walken_show_object, NULL, NULL);
+	}
+----
+
+`struct list_objects_filter_options` is usually built directly from a command
+line argument, so the module provides an easy way to build one from a string.
+Even though we aren't taking user input right now, we can still build one with
+a hardcoded string using `parse_list_objects_filter()`.
+
+With the filter spec "tree:1", we are expecting to see _only_ the root tree for
+each commit; therefore, the tree object count should be less than or equal to
+the number of commits. (For an example of why that's true: `git commit --revert`
+points to the same tree object as its grandparent.)
+
+=== Counting Omitted Objects
+
+We also have the capability to enumerate all objects which were omitted by a
+filter, like with `git log --filter=<spec> --filter-print-omitted`. Asking
+`traverse_commit_list_filtered()` to populate the `omitted` list means that our
+object walk does not perform any better than an unfiltered object walk; all
+reachable objects are walked in order to populate the list.
+
+First, add the `struct oidset` and related items we will use to iterate it:
+
+----
+static void walken_object_walk(
+	...
+
+	struct oidset omitted;
+	struct oidset_iter oit;
+	struct object_id *oid = NULL;
+	int omitted_count = 0;
+	oidset_init(&omitted, 0);
+
+	...
+----
+
+Modify the call to `traverse_commit_list_filtered()` to include your `omitted`
+object:
+
+----
+	...
+
+		traverse_commit_list_filtered(&filter_options, rev,
+			walken_show_commit, walken_show_object, NULL, &omitted);
+
+	...
+----
+
+Then, after your traversal, the `oidset` traversal is pretty straightforward.
+Count all the objects within and modify the print statement:
+
+----
+	/* Count the omitted objects. */
+	oidset_iter_init(&omitted, &oit);
+
+	while ((oid = oidset_iter_next(&oit)))
+		omitted_count++;
+
+	printf("commits %d\nblobs %d\ntags %d\ntrees%d\nomitted %d\n",
+		commit_count, blob_count, tag_count, tree_count, omitted_count);
+----
+
+By running your walk with and without the filter, you should find that the total
+object count in each case is identical. You can also time each invocation of
+the `walken` subcommand, with and without `omitted` being passed in, to confirm
+to yourself the runtime impact of tracking all omitted objects.
+
+=== Changing the Order
+
+Finally, let's demonstrate that you can also reorder walks of all objects, not
+just walks of commits. First, we'll make our handlers chattier - modify
+`walken_show_commit()` and `walken_show_object()` to print the object as they
+go:
+
+----
+static void walken_show_commit(struct commit *cmt, void *buf)
+{
+	trace_printf("commit: %s\n", oid_to_hex(&cmt->object.oid));
+	commit_count++;
+}
+
+static void walken_show_object(struct object *obj, const char *str, void *buf)
+{
+	trace_printf("%s: %s\n", type_name(obj->type), oid_to_hex(&obj->oid));
+
+	...
+}
+----
+
+NOTE: Since we will be examining this output directly as humans, we'll use
+`trace_printf()` here. Additionally, since this change introduces a significant
+number of printed lines, using `trace_printf()` will allow us to easily silence
+those lines without having to recompile.
+
+(Leave the counter increment logic in place.)
+
+With only that change, run again (but save yourself some scrollback):
+
+----
+$ GIT_TRACE=1 ./bin-wrappers/git walken | head -n 10
+----
+
+Take a look at the top commit with `git show` and the object ID you printed; it
+should be the same as the output of `git show HEAD`.
+
+Next, let's change a setting on our `struct rev_info` within
+`walken_object_walk()`. Find where you're changing the other settings on `rev`,
+such as `rev->tree_objects` and `rev->tree_blobs_in_commit_order`, and add the
+`reverse` setting at the bottom:
+
+----
+	...
+
+	rev->tree_objects = 1;
+	rev->blob_objects = 1;
+	rev->tag_objects = 1;
+	rev->tree_blobs_in_commit_order = 1;
+	rev->reverse = 1;
+
+	...
+----
+
+Now, run again, but this time, let's grab the last handful of objects instead
+of the first handful:
+
+----
+$ make
+$ GIT_TRACE=1 ./bin-wrappers git walken | tail -n 10
+----
+
+The last commit object given should have the same OID as the one we saw at the
+top before, and running `git show <oid>` with that OID should give you again
+the same results as `git show HEAD`. Furthermore, if you run and examine the
+first ten lines again (with `head` instead of `tail` like we did before applying
+the `reverse` setting), you should see that now the first commit printed is the
+initial commit, `e83c5163`.
+
+== Wrapping Up
+
+Let's review. In this tutorial, we:
+
+- Built a commit walk from the ground up
+- Enabled a grep filter for that commit walk
+- Changed the sort order of that filtered commit walk
+- Built an object walk (tags, commits, trees, and blobs) from the ground up
+- Learned how to add a filter-spec to an object walk
+- Changed the display order of the filtered object walk
diff --git a/third_party/git/Documentation/RelNotes/1.5.0.txt b/third_party/git/Documentation/RelNotes/1.5.0.txt
index daf4bdb0d7bb..d6d42f318358 100644
--- a/third_party/git/Documentation/RelNotes/1.5.0.txt
+++ b/third_party/git/Documentation/RelNotes/1.5.0.txt
@@ -251,7 +251,7 @@ Updates in v1.5.0 since v1.4.4 series
    the repository when that happens.
 
 
-* Crufts removal
+* Cruft removal
 
  - We used to say "old commits are retrievable using reflog and
    'master@{yesterday}' syntax as long as you haven't run
@@ -379,7 +379,7 @@ Updates in v1.5.0 since v1.4.4 series
  - The value of i18n.commitencoding in the originating
    repository is recorded in the commit object on the "encoding"
    header, if it is not UTF-8.  git-log and friends notice this,
-   and reencodes the message to the log output encoding when
+   and re-encodes the message to the log output encoding when
    displaying, if they are different.  The log output encoding
    is determined by "git log --encoding=<encoding>",
    i18n.logoutputencoding configuration, or i18n.commitencoding
diff --git a/third_party/git/Documentation/RelNotes/1.6.2.txt b/third_party/git/Documentation/RelNotes/1.6.2.txt
index ad060f4f8900..980adfb31546 100644
--- a/third_party/git/Documentation/RelNotes/1.6.2.txt
+++ b/third_party/git/Documentation/RelNotes/1.6.2.txt
@@ -11,7 +11,7 @@ push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
   http://git.or.cz/gitwiki/GitFaq#non-bare
-  http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+  https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the
 transition plan.
diff --git a/third_party/git/Documentation/RelNotes/1.6.3.txt b/third_party/git/Documentation/RelNotes/1.6.3.txt
index 418c685cf832..4bcff945e019 100644
--- a/third_party/git/Documentation/RelNotes/1.6.3.txt
+++ b/third_party/git/Documentation/RelNotes/1.6.3.txt
@@ -11,7 +11,7 @@ push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
   http://git.or.cz/gitwiki/GitFaq#non-bare
-  http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+  https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the
 transition plan.
diff --git a/third_party/git/Documentation/RelNotes/1.6.4.txt b/third_party/git/Documentation/RelNotes/1.6.4.txt
index 7a904419f781..a2a34b43a75d 100644
--- a/third_party/git/Documentation/RelNotes/1.6.4.txt
+++ b/third_party/git/Documentation/RelNotes/1.6.4.txt
@@ -11,7 +11,7 @@ push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
   http://git.or.cz/gitwiki/GitFaq#non-bare
-  http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+  https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the
 transition plan.
diff --git a/third_party/git/Documentation/RelNotes/1.6.5.4.txt b/third_party/git/Documentation/RelNotes/1.6.5.4.txt
index d3a2a3e71243..344333de66e5 100644
--- a/third_party/git/Documentation/RelNotes/1.6.5.4.txt
+++ b/third_party/git/Documentation/RelNotes/1.6.5.4.txt
@@ -10,7 +10,7 @@ Fixes since v1.6.5.3
 
  * "git prune-packed" gave progress output even when its standard error is
    not connected to a terminal; this caused cron jobs that run it to
-   produce crufts.
+   produce cruft.
 
  * "git pack-objects --all-progress" is an option to ask progress output
    from write-object phase _if_ progress output were to be produced, and
diff --git a/third_party/git/Documentation/RelNotes/1.6.5.txt b/third_party/git/Documentation/RelNotes/1.6.5.txt
index ee141c19add2..6c7f7da7eb9a 100644
--- a/third_party/git/Documentation/RelNotes/1.6.5.txt
+++ b/third_party/git/Documentation/RelNotes/1.6.5.txt
@@ -22,7 +22,7 @@ push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
   http://git.or.cz/gitwiki/GitFaq#non-bare
-  http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+  https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the
 transition plan.
diff --git a/third_party/git/Documentation/RelNotes/1.6.6.txt b/third_party/git/Documentation/RelNotes/1.6.6.txt
index c50b59c4957a..3ed1e0143374 100644
--- a/third_party/git/Documentation/RelNotes/1.6.6.txt
+++ b/third_party/git/Documentation/RelNotes/1.6.6.txt
@@ -64,7 +64,7 @@ users will fare this time.
    Please refer to:
 
    http://git.or.cz/gitwiki/GitFaq#non-bare
-   http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+   https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
    for more details on the reason why this change is needed and the
    transition process that already took place so far.
diff --git a/third_party/git/Documentation/RelNotes/1.7.0.2.txt b/third_party/git/Documentation/RelNotes/1.7.0.2.txt
index fcb46ca6a4ec..73ed2b527843 100644
--- a/third_party/git/Documentation/RelNotes/1.7.0.2.txt
+++ b/third_party/git/Documentation/RelNotes/1.7.0.2.txt
@@ -34,7 +34,7 @@ Fixes since v1.7.0.1
  * "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series
    to speed up scanning of large working tree.
 
- * "gitweb" did not diagnose parsing errors properly while reading tis configuration
+ * "gitweb" did not diagnose parsing errors properly while reading its configuration
    file.
 
 And other minor fixes and documentation updates.
diff --git a/third_party/git/Documentation/RelNotes/1.7.10.4.txt b/third_party/git/Documentation/RelNotes/1.7.10.4.txt
index 326670df6e6b..57597f2bf35d 100644
--- a/third_party/git/Documentation/RelNotes/1.7.10.4.txt
+++ b/third_party/git/Documentation/RelNotes/1.7.10.4.txt
@@ -7,7 +7,7 @@ Fixes since v1.7.10.3
  * The message file for Swedish translation has been updated a bit.
 
  * A name taken from mailmap was copied into an internal buffer
-   incorrectly and could overun the buffer if it is too long.
+   incorrectly and could overrun the buffer if it is too long.
 
  * A malformed commit object that has a header line chomped in the
    middle could kill git with a NULL pointer dereference.
diff --git a/third_party/git/Documentation/RelNotes/1.7.12.3.txt b/third_party/git/Documentation/RelNotes/1.7.12.3.txt
index ecda427a35ef..4b822976b8ad 100644
--- a/third_party/git/Documentation/RelNotes/1.7.12.3.txt
+++ b/third_party/git/Documentation/RelNotes/1.7.12.3.txt
@@ -25,7 +25,7 @@ Fixes since v1.7.12.2
    its Accept-Encoding header.
 
  * "git receive-pack" (the counterpart to "git push") did not give
-   progress output while processing objects it received to the puser
+   progress output while processing objects it received to the user
    when run over the smart-http protocol.
 
  * "git status" honored the ignore=dirty settings in .gitmodules but
diff --git a/third_party/git/Documentation/RelNotes/1.7.5.3.txt b/third_party/git/Documentation/RelNotes/1.7.5.3.txt
index 9c03353af2e9..1d24edcf2fa6 100644
--- a/third_party/git/Documentation/RelNotes/1.7.5.3.txt
+++ b/third_party/git/Documentation/RelNotes/1.7.5.3.txt
@@ -22,7 +22,7 @@ Fixes since v1.7.5.2
  * "git log --stdin path" with an input that has additional pathspec
    used to corrupt memory.
 
- * "git send-pack" (hence "git push") over smalt-HTTP protocol could
+ * "git send-pack" (hence "git push") over smart-HTTP protocol could
    deadlock when the client side pack-object died early.
 
  * Compressed tarball gitweb generates used to be made with the timestamp
diff --git a/third_party/git/Documentation/RelNotes/1.8.0.txt b/third_party/git/Documentation/RelNotes/1.8.0.txt
index 43883c14f08a..63d6e4afa4df 100644
--- a/third_party/git/Documentation/RelNotes/1.8.0.txt
+++ b/third_party/git/Documentation/RelNotes/1.8.0.txt
@@ -233,7 +233,7 @@ to them for details).
    together, misdetected branches.
 
  * "git receive-pack" (the counterpart to "git push") did not give
-   progress output while processing objects it received to the puser
+   progress output while processing objects it received to the user
    when run over the smart-http protocol.
 
  * When you misspell the command name you give to the "exec" action in
diff --git a/third_party/git/Documentation/RelNotes/1.8.4.1.txt b/third_party/git/Documentation/RelNotes/1.8.4.1.txt
index 96090ef599d3..c257beb114c9 100644
--- a/third_party/git/Documentation/RelNotes/1.8.4.1.txt
+++ b/third_party/git/Documentation/RelNotes/1.8.4.1.txt
@@ -15,7 +15,7 @@ Fixes since v1.8.4
    in 1.8.4-rc1).
 
  * "git rebase -i" and other scripted commands were feeding a
-   random, data dependant error message to 'echo' and expecting it
+   random, data dependent error message to 'echo' and expecting it
    to come out literally.
 
  * Setting the "submodule.<name>.path" variable to the empty
diff --git a/third_party/git/Documentation/RelNotes/1.8.4.txt b/third_party/git/Documentation/RelNotes/1.8.4.txt
index 02f681b71051..255e185af6fc 100644
--- a/third_party/git/Documentation/RelNotes/1.8.4.txt
+++ b/third_party/git/Documentation/RelNotes/1.8.4.txt
@@ -58,7 +58,7 @@ Foreign interfaces, subsystems and ports.
    credential helper interface from Git.pm.
 
  * Update build for Cygwin 1.[57].  Torsten Bรถgershausen reports that
-   this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
+   this is fine with Cygwin 1.7 (cf. <51A606A0.5060101@web.de>) so let's try moving it
    ahead.
 
  * The credential helper to talk to keychain on OS X (in contrib/) has
diff --git a/third_party/git/Documentation/RelNotes/2.1.3.txt b/third_party/git/Documentation/RelNotes/2.1.3.txt
index acc9ebb886ea..0dfb17c4fc6f 100644
--- a/third_party/git/Documentation/RelNotes/2.1.3.txt
+++ b/third_party/git/Documentation/RelNotes/2.1.3.txt
@@ -13,7 +13,7 @@ Git v2.1.3 Release Notes
    they are new enough to support the `--output` option.
 
  * "git pack-objects" forgot to disable the codepath to generate
-   object recheability bitmap when it needs to split the resulting
+   object reachability bitmap when it needs to split the resulting
    pack.
 
  * "gitweb" used deprecated CGI::startfrom, which was removed from
diff --git a/third_party/git/Documentation/RelNotes/2.10.0.txt b/third_party/git/Documentation/RelNotes/2.10.0.txt
index f4da28ab6690..3792b7d03d5f 100644
--- a/third_party/git/Documentation/RelNotes/2.10.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.10.0.txt
@@ -478,7 +478,7 @@ notes for details).
  * One part of "git am" had an oddball helper function that called
    stuff from outside "his" as opposed to calling what we have "ours",
    which was not gender-neutral and also inconsistent with the rest of
-   the system where outside stuff is usuall called "theirs" in
+   the system where outside stuff is usually called "theirs" in
    contrast to "ours".
 
  * "git blame file" allowed the lineage of lines in the uncommitted,
diff --git a/third_party/git/Documentation/RelNotes/2.10.2.txt b/third_party/git/Documentation/RelNotes/2.10.2.txt
index c4d4397023de..abbd331508a5 100644
--- a/third_party/git/Documentation/RelNotes/2.10.2.txt
+++ b/third_party/git/Documentation/RelNotes/2.10.2.txt
@@ -86,7 +86,7 @@ Fixes since v2.10.1
    by refusing to check out a branch that is already checked out in
    another worktree.  However, this also prevented checking out a
    branch, which is designated as the primary branch of a bare
-   reopsitory, in a worktree that is connected to the bare
+   repository, in a worktree that is connected to the bare
    repository.  The check has been corrected to allow it.
 
  * "git rebase" immediately after "git clone" failed to find the fork
diff --git a/third_party/git/Documentation/RelNotes/2.11.1.txt b/third_party/git/Documentation/RelNotes/2.11.1.txt
index 9cd14c8197f9..7d35cf186dbf 100644
--- a/third_party/git/Documentation/RelNotes/2.11.1.txt
+++ b/third_party/git/Documentation/RelNotes/2.11.1.txt
@@ -104,7 +104,7 @@ Fixes since v2.11
    "git difftool --dir-diff" from a subdirectory never worked. This
    has been fixed.
 
- * "git p4" that tracks multile p4 paths imported a single changelist
+ * "git p4" that tracks multiple p4 paths imported a single changelist
    that touches files in these multiple paths as one commit, followed
    by many empty commits.  This has been fixed.
 
diff --git a/third_party/git/Documentation/RelNotes/2.12.0.txt b/third_party/git/Documentation/RelNotes/2.12.0.txt
index ef8b97da9b84..d2f6a836146d 100644
--- a/third_party/git/Documentation/RelNotes/2.12.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.12.0.txt
@@ -315,7 +315,7 @@ notes for details).
    "git difftool --dir-diff" from a subdirectory never worked. This
    has been fixed.
 
- * "git p4" that tracks multile p4 paths imported a single changelist
+ * "git p4" that tracks multiple p4 paths imported a single changelist
    that touches files in these multiple paths as one commit, followed
    by many empty commits.  This has been fixed.
 
diff --git a/third_party/git/Documentation/RelNotes/2.13.0.txt b/third_party/git/Documentation/RelNotes/2.13.0.txt
index aa99d4b3cef0..2a47b4cb0cd4 100644
--- a/third_party/git/Documentation/RelNotes/2.13.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.13.0.txt
@@ -177,7 +177,7 @@ UI, Workflows & Features
    been changed to enable "--decorate".
 
  * The output from "git status --short" has been extended to show
-   various kinds of dirtyness in submodules differently; instead of to
+   various kinds of dirtiness in submodules differently; instead of to
    "M" for modified, 'm' and '?' can be shown to signal changes only
    to the working tree of the submodule but not the commit that is
    checked out.
diff --git a/third_party/git/Documentation/RelNotes/2.13.3.txt b/third_party/git/Documentation/RelNotes/2.13.3.txt
index 5d76ad53106b..384e4de26526 100644
--- a/third_party/git/Documentation/RelNotes/2.13.3.txt
+++ b/third_party/git/Documentation/RelNotes/2.13.3.txt
@@ -25,7 +25,7 @@ Fixes since v2.13.2
  * The code to pick up and execute command alias definition from the
    configuration used to switch to the top of the working tree and
    then come back when the expanded alias was executed, which was
-   unnecessarilyl complex.  Attempt to simplify the logic by using the
+   unnecessarily complex.  Attempt to simplify the logic by using the
    early-config mechanism that does not chdir around.
 
  * "git add -p" were updated in 2.12 timeframe to cope with custom
@@ -35,7 +35,7 @@ Fixes since v2.13.2
  * Fix a recent regression to "git rebase -i" and add tests that would
    have caught it and others.
 
- * An unaligned 32-bit access in pack-bitmap code ahs been corrected.
+ * An unaligned 32-bit access in pack-bitmap code has been corrected.
 
  * Tighten error checks for invalid "git apply" input.
 
diff --git a/third_party/git/Documentation/RelNotes/2.14.0.txt b/third_party/git/Documentation/RelNotes/2.14.0.txt
index 4246c68ff51e..2711a2529dad 100644
--- a/third_party/git/Documentation/RelNotes/2.14.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.14.0.txt
@@ -141,7 +141,7 @@ Performance, Internal Implementation, Development Support etc.
  * Some platforms have ulong that is smaller than time_t, and our
    historical use of ulong for timestamp would mean they cannot
    represent some timestamp that the platform allows.  Invent a
-   separate and dedicated timestamp_t (so that we can distingiuish
+   separate and dedicated timestamp_t (so that we can distinguish
    timestamps and a vanilla ulongs, which along is already a good
    move), and then declare uintmax_t is the type to be used as the
    timestamp_t.
@@ -442,7 +442,7 @@ notes for details).
  * The code to pick up and execute command alias definition from the
    configuration used to switch to the top of the working tree and
    then come back when the expanded alias was executed, which was
-   unnecessarilyl complex.  Attempt to simplify the logic by using the
+   unnecessarily complex.  Attempt to simplify the logic by using the
    early-config mechanism that does not chdir around.
 
  * Fix configuration codepath to pay proper attention to commondir
diff --git a/third_party/git/Documentation/RelNotes/2.14.6.txt b/third_party/git/Documentation/RelNotes/2.14.6.txt
new file mode 100644
index 000000000000..72b7af679917
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.14.6.txt
@@ -0,0 +1,54 @@
+Git v2.14.6 Release Notes
+=========================
+
+This release addresses the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387.
+
+Fixes since v2.14.5
+-------------------
+
+ * CVE-2019-1348:
+   The --export-marks option of git fast-import is exposed also via
+   the in-stream command feature export-marks=... and it allows
+   overwriting arbitrary paths.
+
+ * CVE-2019-1349:
+   When submodules are cloned recursively, under certain circumstances
+   Git could be fooled into using the same Git directory twice. We now
+   require the directory to be empty.
+
+ * CVE-2019-1350:
+   Incorrect quoting of command-line arguments allowed remote code
+   execution during a recursive clone in conjunction with SSH URLs.
+
+ * CVE-2019-1351:
+   While the only permitted drive letters for physical drives on
+   Windows are letters of the US-English alphabet, this restriction
+   does not apply to virtual drives assigned via subst <letter>:
+   <path>. Git mistook such paths for relative paths, allowing writing
+   outside of the worktree while cloning.
+
+ * CVE-2019-1352:
+   Git was unaware of NTFS Alternate Data Streams, allowing files
+   inside the .git/ directory to be overwritten during a clone.
+
+ * CVE-2019-1353:
+   When running Git in the Windows Subsystem for Linux (also known as
+   "WSL") while accessing a working directory on a regular Windows
+   drive, none of the NTFS protections were active.
+
+ * CVE-2019-1354:
+   Filenames on Linux/Unix can contain backslashes. On Windows,
+   backslashes are directory separators. Git did not use to refuse to
+   write out tracked files with such filenames.
+
+ * CVE-2019-1387:
+   Recursive clones are currently affected by a vulnerability that is
+   caused by too-lax validation of submodule names, allowing very
+   targeted attacks via remote code execution in recursive clones.
+
+Credit for finding these vulnerabilities goes to Microsoft Security
+Response Center, in particular to Nicolas Joly. The `fast-import`
+fixes were provided by Jeff King, the other fixes by Johannes
+Schindelin with help from Garima Singh.
diff --git a/third_party/git/Documentation/RelNotes/2.15.4.txt b/third_party/git/Documentation/RelNotes/2.15.4.txt
new file mode 100644
index 000000000000..dc241cba349f
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.15.4.txt
@@ -0,0 +1,11 @@
+Git v2.15.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6 to address
+the security issues CVE-2019-1348, CVE-2019-1349, CVE-2019-1350,
+CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, and
+CVE-2019-1387; see the release notes for that version for details.
+
+In conjunction with a vulnerability that was fixed in v2.20.2,
+`.gitmodules` is no longer allowed to contain entries of the form
+`submodule.<name>.update=!command`.
diff --git a/third_party/git/Documentation/RelNotes/2.16.0.txt b/third_party/git/Documentation/RelNotes/2.16.0.txt
index 0c81c5915fdb..b474781ed827 100644
--- a/third_party/git/Documentation/RelNotes/2.16.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.16.0.txt
@@ -407,7 +407,7 @@ Fixes since v2.15
    (merge eef3df5a93 bw/pathspec-match-submodule-boundary later to maint).
 
  * Amending commits in git-gui broke the author name that is non-ascii
-   due to incorrect enconding conversion.
+   due to incorrect encoding conversion.
 
  * Recent update to the submodule configuration code broke "diff-tree"
    by accidentally stopping to read from the index upfront.
diff --git a/third_party/git/Documentation/RelNotes/2.16.3.txt b/third_party/git/Documentation/RelNotes/2.16.3.txt
index 64a0bcb0d251..f0121a8f2d31 100644
--- a/third_party/git/Documentation/RelNotes/2.16.3.txt
+++ b/third_party/git/Documentation/RelNotes/2.16.3.txt
@@ -24,7 +24,7 @@ Fixes since v2.16.2
 
  * The http tracing code, often used to debug connection issues,
    learned to redact potentially sensitive information from its output
-   so that it can be more safely sharable.
+   so that it can be more safely shareable.
 
  * Crash fix for a corner case where an error codepath tried to unlock
    what it did not acquire lock on.
diff --git a/third_party/git/Documentation/RelNotes/2.16.6.txt b/third_party/git/Documentation/RelNotes/2.16.6.txt
new file mode 100644
index 000000000000..438306e60bf3
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.16.6.txt
@@ -0,0 +1,8 @@
+Git v2.16.6 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6 and in
+v2.15.4 addressing the security issues CVE-2019-1348, CVE-2019-1349,
+CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353,
+CVE-2019-1354, and CVE-2019-1387; see the release notes for those
+versions for details.
diff --git a/third_party/git/Documentation/RelNotes/2.17.0.txt b/third_party/git/Documentation/RelNotes/2.17.0.txt
index c2cf891f71ad..8b17c260336c 100644
--- a/third_party/git/Documentation/RelNotes/2.17.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.17.0.txt
@@ -216,7 +216,7 @@ Fixes since v2.16
 
  * The http tracing code, often used to debug connection issues,
    learned to redact potentially sensitive information from its output
-   so that it can be more safely sharable.
+   so that it can be more safely shareable.
    (merge 8ba18e6fa4 jt/http-redact-cookies later to maint).
 
  * Crash fix for a corner case where an error codepath tried to unlock
diff --git a/third_party/git/Documentation/RelNotes/2.17.3.txt b/third_party/git/Documentation/RelNotes/2.17.3.txt
new file mode 100644
index 000000000000..5a46c94271c8
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.17.3.txt
@@ -0,0 +1,12 @@
+Git v2.17.3 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6 and in
+v2.15.4 addressing the security issues CVE-2019-1348, CVE-2019-1349,
+CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353,
+CVE-2019-1354, and CVE-2019-1387; see the release notes for those
+versions for details.
+
+In addition, `git fsck` was taught to identify `.gitmodules` entries
+of the form `submodule.<name>.update=!command`, which have been
+disallowed in v2.15.4.
diff --git a/third_party/git/Documentation/RelNotes/2.17.4.txt b/third_party/git/Documentation/RelNotes/2.17.4.txt
new file mode 100644
index 000000000000..7d794ca01af2
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.17.4.txt
@@ -0,0 +1,16 @@
+Git v2.17.4 Release Notes
+=========================
+
+This release is to address the security issue: CVE-2020-5260
+
+Fixes since v2.17.3
+-------------------
+
+ * With a crafted URL that contains a newline in it, the credential
+   helper machinery can be fooled to give credential information for
+   a wrong host.  The attack has been made impossible by forbidding
+   a newline character in any value passed via the credential
+   protocol.
+
+Credit for finding the vulnerability goes to Felix Wilhelm of Google
+Project Zero.
diff --git a/third_party/git/Documentation/RelNotes/2.17.5.txt b/third_party/git/Documentation/RelNotes/2.17.5.txt
new file mode 100644
index 000000000000..2abb821a7397
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.17.5.txt
@@ -0,0 +1,22 @@
+Git v2.17.5 Release Notes
+=========================
+
+This release is to address a security issue: CVE-2020-11008
+
+Fixes since v2.17.4
+-------------------
+
+ * With a crafted URL that contains a newline or empty host, or lacks
+   a scheme, the credential helper machinery can be fooled into
+   providing credential information that is not appropriate for the
+   protocol in use and host being contacted.
+
+   Unlike the vulnerability CVE-2020-5260 fixed in v2.17.4, the
+   credentials are not for a host of the attacker's choosing; instead,
+   they are for some unspecified host (based on how the configured
+   credential helper handles an absent "host" parameter).
+
+   The attack has been made impossible by refusing to work with
+   under-specified credential patterns.
+
+Credit for finding the vulnerability goes to Carlo Arenas.
diff --git a/third_party/git/Documentation/RelNotes/2.18.0.txt b/third_party/git/Documentation/RelNotes/2.18.0.txt
index 3ea280cf68e5..6c8a0e97c1a7 100644
--- a/third_party/git/Documentation/RelNotes/2.18.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.18.0.txt
@@ -179,7 +179,7 @@ Performance, Internal Implementation, Development Support etc.
    (merge 00a3da2a13 nd/remove-ignore-env-field later to maint).
 
  * Code to find the length to uniquely abbreviate object names based
-   on packfile content, which is a relatively recent addtion, has been
+   on packfile content, which is a relatively recent addition, has been
    optimized to use the same fan-out table.
 
  * The mechanism to use parse-options API to automate the command line
diff --git a/third_party/git/Documentation/RelNotes/2.18.2.txt b/third_party/git/Documentation/RelNotes/2.18.2.txt
new file mode 100644
index 000000000000..98b168aade52
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.18.2.txt
@@ -0,0 +1,8 @@
+Git v2.18.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4
+and in v2.17.3, addressing the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387; see the release notes
+for those versions for details.
diff --git a/third_party/git/Documentation/RelNotes/2.18.3.txt b/third_party/git/Documentation/RelNotes/2.18.3.txt
new file mode 100644
index 000000000000..25143f0cec58
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.18.3.txt
@@ -0,0 +1,5 @@
+Git v2.18.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.18.4.txt b/third_party/git/Documentation/RelNotes/2.18.4.txt
new file mode 100644
index 000000000000..e8ef858a00a7
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.18.4.txt
@@ -0,0 +1,5 @@
+Git v2.18.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.19.0.txt b/third_party/git/Documentation/RelNotes/2.19.0.txt
index a06ccf6e2a26..891c79b9cb2b 100644
--- a/third_party/git/Documentation/RelNotes/2.19.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.19.0.txt
@@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.
  * The conversion to pass "the_repository" and then "a_repository"
    throughout the object access API continues.
 
- * Continuing with the idea to programatically enumerate various
+ * Continuing with the idea to programmatically enumerate various
    pieces of data required for command line completion, teach the
    codebase to report the list of configuration variables
    subcommands care about to help complete them.
diff --git a/third_party/git/Documentation/RelNotes/2.19.3.txt b/third_party/git/Documentation/RelNotes/2.19.3.txt
new file mode 100644
index 000000000000..92d7f89de68b
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.19.3.txt
@@ -0,0 +1,8 @@
+Git v2.19.3 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4
+and in v2.17.3, addressing the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387; see the release notes
+for those versions for details.
diff --git a/third_party/git/Documentation/RelNotes/2.19.4.txt b/third_party/git/Documentation/RelNotes/2.19.4.txt
new file mode 100644
index 000000000000..35d0ae561b6f
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.19.4.txt
@@ -0,0 +1,5 @@
+Git v2.19.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.19.5.txt b/third_party/git/Documentation/RelNotes/2.19.5.txt
new file mode 100644
index 000000000000..18a4dcbfd6a7
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.19.5.txt
@@ -0,0 +1,5 @@
+Git v2.19.5 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.20.0.txt b/third_party/git/Documentation/RelNotes/2.20.0.txt
index e71fe3dee13e..3dd7e6e1fcf9 100644
--- a/third_party/git/Documentation/RelNotes/2.20.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.20.0.txt
@@ -119,7 +119,7 @@ UI, Workflows & Features
    alias expansion.
 
  * The documentation of "git gc" has been updated to mention that it
-   is no longer limited to "pruning away crufts" but also updates
+   is no longer limited to "pruning away cruft" but also updates
    ancillary files like commit-graph as a part of repository
    optimization.
 
diff --git a/third_party/git/Documentation/RelNotes/2.20.2.txt b/third_party/git/Documentation/RelNotes/2.20.2.txt
new file mode 100644
index 000000000000..8e680cb9fbf4
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.20.2.txt
@@ -0,0 +1,18 @@
+Git v2.20.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4
+and in v2.17.3, addressing the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387; see the release notes
+for those versions for details.
+
+The change to disallow `submodule.<name>.update=!command` entries in
+`.gitmodules` which was introduced v2.15.4 (and for which v2.17.3
+added explicit fsck checks) fixes the vulnerability in v2.20.x where a
+recursive clone followed by a submodule update could execute code
+contained within the repository without the user explicitly having
+asked for that (CVE-2019-19604).
+
+Credit for finding this vulnerability goes to Joern Schneeweisz,
+credit for the fixes goes to Jonathan Nieder.
diff --git a/third_party/git/Documentation/RelNotes/2.20.3.txt b/third_party/git/Documentation/RelNotes/2.20.3.txt
new file mode 100644
index 000000000000..f6eccd103b69
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.20.3.txt
@@ -0,0 +1,5 @@
+Git v2.20.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.20.4.txt b/third_party/git/Documentation/RelNotes/2.20.4.txt
new file mode 100644
index 000000000000..5a9e24e4709c
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.20.4.txt
@@ -0,0 +1,5 @@
+Git v2.20.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.21.1.txt b/third_party/git/Documentation/RelNotes/2.21.1.txt
new file mode 100644
index 000000000000..b7594151e4c8
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.21.1.txt
@@ -0,0 +1,12 @@
+Git v2.21.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4,
+v2.17.3 and in v2.20.2, addressing the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and CVE-2019-19604;
+see the release notes for those versions for details.
+
+Additionally, this version also includes a couple of fixes for the
+Windows-specific quoting of command-line arguments when Git executes
+a Unix shell on Windows.
diff --git a/third_party/git/Documentation/RelNotes/2.21.2.txt b/third_party/git/Documentation/RelNotes/2.21.2.txt
new file mode 100644
index 000000000000..a0fb83bb5341
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.21.2.txt
@@ -0,0 +1,5 @@
+Git v2.21.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.21.3.txt b/third_party/git/Documentation/RelNotes/2.21.3.txt
new file mode 100644
index 000000000000..2ca0aa5c62af
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.21.3.txt
@@ -0,0 +1,5 @@
+Git v2.21.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.22.2.txt b/third_party/git/Documentation/RelNotes/2.22.2.txt
new file mode 100644
index 000000000000..940a23f0d961
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.22.2.txt
@@ -0,0 +1,8 @@
+Git v2.22.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4,
+v2.17.3, v2.20.2 and in v2.21.1, addressing the security issues
+CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
+CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and
+CVE-2019-19604; see the release notes for those versions for details.
diff --git a/third_party/git/Documentation/RelNotes/2.22.3.txt b/third_party/git/Documentation/RelNotes/2.22.3.txt
new file mode 100644
index 000000000000..57296f6d173f
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.22.3.txt
@@ -0,0 +1,5 @@
+Git v2.22.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.22.4.txt b/third_party/git/Documentation/RelNotes/2.22.4.txt
new file mode 100644
index 000000000000..8b5f3e3f3740
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.22.4.txt
@@ -0,0 +1,5 @@
+Git v2.22.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.23.1.txt b/third_party/git/Documentation/RelNotes/2.23.1.txt
new file mode 100644
index 000000000000..2083b492ce50
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.23.1.txt
@@ -0,0 +1,8 @@
+Git v2.23.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4,
+v2.17.3, v2.20.2 and in v2.21.1, addressing the security issues
+CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
+CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and
+CVE-2019-19604; see the release notes for those versions for details.
diff --git a/third_party/git/Documentation/RelNotes/2.23.2.txt b/third_party/git/Documentation/RelNotes/2.23.2.txt
new file mode 100644
index 000000000000..b697cbe0e31a
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.23.2.txt
@@ -0,0 +1,5 @@
+Git v2.23.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.23.3.txt b/third_party/git/Documentation/RelNotes/2.23.3.txt
new file mode 100644
index 000000000000..2e35490137b7
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.23.3.txt
@@ -0,0 +1,5 @@
+Git v2.23.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.24.0.txt b/third_party/git/Documentation/RelNotes/2.24.0.txt
new file mode 100644
index 000000000000..bde154124cb8
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.24.0.txt
@@ -0,0 +1,398 @@
+Git 2.24 Release Notes
+======================
+
+Updates since v2.23
+-------------------
+
+Backward compatibility note
+
+ * "filter-branch" is showing its age and alternatives are available.
+   From this release, we started to discourage its use and hint
+   people about filter-repo.
+
+UI, Workflows & Features
+
+ * We now have an active interim maintainer for the Git-Gui part of
+   the system.  Praise and thank Pratyush Yadav for volunteering.
+
+ * The command line parser learned "--end-of-options" notation; the
+   standard convention for scripters to have hardcoded set of options
+   first on the command line, and force the command to treat end-user
+   input as non-options, has been to use "--" as the delimiter, but
+   that would not work for commands that use "--" as a delimiter
+   between revs and pathspec.
+
+ * A mechanism to affect the default setting for a (related) group of
+   configuration variables is introduced.
+
+ * "git fetch" learned "--set-upstream" option to help those who first
+   clone from their private fork they intend to push to, add the true
+   upstream via "git remote add" and then "git fetch" from it.
+
+ * Device-tree files learned their own userdiff patterns.
+   (merge 3c81760bc6 sb/userdiff-dts later to maint).
+
+ * "git rebase --rebase-merges" learned to drive different merge
+   strategies and pass strategy specific options to them.
+
+ * A new "pre-merge-commit" hook has been introduced.
+
+ * Command line completion updates for "git -c var.name=val" have been
+   added.
+
+ * The lazy clone machinery has been taught that there can be more
+   than one promisor remote and consult them in order when downloading
+   missing objects on demand.
+
+ * The list-objects-filter API (used to create a sparse/lazy clone)
+   learned to take a combined filter specification.
+
+ * The documentation and tests for "git format-patch" have been
+   cleaned up.
+
+ * On Windows, the root level of UNC share is now allowed to be used
+   just like any other directory.
+
+ * The command line completion support (in contrib/) learned about the
+   "--skip" option of "git revert" and "git cherry-pick".
+
+ * "git rebase --keep-base <upstream>" tries to find the original base
+   of the topic being rebased and rebase on top of that same base,
+   which is useful when running the "git rebase -i" (and its limited
+   variant "git rebase -x").
+
+   The command also has learned to fast-forward in more cases where it
+   can instead of replaying to recreate identical commits.
+
+ * A configuration variable tells "git fetch" to write the commit
+   graph after finishing.
+
+ * "git add -i" has been taught to show the total number of hunks and
+   the hunks that has been processed so far when showing prompts.
+
+ * "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching
+   submodules, but this did not apply to "git fetch --multiple" that
+   fetches from multiple remote repositories.  It now does.
+
+ * The installation instruction for zsh completion script (in
+   contrib/) has been a bit improved.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The code to write commit-graph over given commit object names has
+   been made a bit more robust.
+
+ * The first line of verbose output from each test piece now carries
+   the test name and number to help scanning with eyeballs.
+
+ * Further clean-up of the initialization code.
+
+ * xmalloc() used to have a mechanism to ditch memory and address
+   space resources as the last resort upon seeing an allocation
+   failure from the underlying malloc(), which made the code complex
+   and thread-unsafe with dubious benefit, as major memory resource
+   users already do limit their uses with various other mechanisms.
+   It has been simplified away.
+
+ * Unnecessary full-tree diff in "git log -L" machinery has been
+   optimized away.
+
+ * The http transport lacked some optimization the native transports
+   learned to avoid unnecessary ref advertisement, which has been
+   corrected.
+
+ * Preparation for SHA-256 upgrade continues in the test department.
+   (merge 0c37c41d13 bc/hash-independent-tests-part-5 later to maint).
+
+ * The memory ownership model of the "git fast-import" got
+   straightened out.
+
+ * Output from trace2 subsystem is formatted more prettily now.
+
+ * The internal code originally invented for ".gitignore" processing
+   got reshuffled and renamed to make it less tied to "excluding" and
+   stress more that it is about "matching", as it has been reused for
+   things like sparse checkout specification that want to check if a
+   path is "included".
+
+ * "git stash" learned to write refreshed index back to disk.
+
+ * Coccinelle checks are done on more source files than before now.
+
+ * The cache-tree code has been taught to be less aggressive in
+   attempting to see if a tree object it computed already exists in
+   the repository.
+
+ * The code to parse and use the commit-graph file has been made more
+   robust against corrupted input.
+
+ * The hg-to-git script (in contrib/) has been updated to work with
+   Python 3.
+
+ * Update the way build artifacts in t/helper/ directory are ignored.
+
+ * Preparation for SHA-256 upgrade continues.
+
+ * "git log --graph" for an octopus merge is sometimes colored
+   incorrectly, which is demonstrated and documented but not yet
+   fixed.
+
+ * The trace2 output, when sending them to files in a designated
+   directory, can populate the directory with too many files; a
+   mechanism is introduced to set the maximum number of files and
+   discard further logs when the maximum is reached.
+
+ * We have adopted a Code-of-conduct document.
+   (merge 3f9ef874a7 jk/coc later to maint).
+
+
+Fixes since v2.23
+-----------------
+
+ * "git grep --recurse-submodules" that looks at the working tree
+   files looked at the contents in the index in submodules, instead of
+   files in the working tree.
+   (merge 6a289d45c0 mt/grep-submodules-working-tree later to maint).
+
+ * Codepaths to walk tree objects have been audited for integer
+   overflows and hardened.
+   (merge 5aa02f9868 jk/tree-walk-overflow later to maint).
+
+ * "git pack-refs" can lose refs that are created while running, which
+   is getting corrected.
+   (merge a613d4f817 sc/pack-refs-deletion-racefix later to maint).
+
+ * "git checkout" and "git restore" to re-populate the index from a
+   tree-ish (typically HEAD) did not work correctly for a path that
+   was removed and then added again with the intent-to-add bit, when
+   the corresponding working tree file was empty.  This has been
+   corrected.
+
+ * Compilation fix.
+   (merge 70597e8386 rs/nedalloc-fixlets later to maint).
+
+ * "git gui" learned to call the clean-up procedure before exiting.
+   (merge 0d88f3d2c5 py/git-gui-do-quit later to maint).
+
+ * We promoted the "indent heuristics" that decides where to split
+   diff hunks from experimental to the default a few years ago, but
+   some stale documentation still marked it as experimental, which has
+   been corrected.
+   (merge 64e5e1fba1 sg/diff-indent-heuristic-non-experimental later to maint).
+
+ * Fix a mismerge that happened in 2.22 timeframe.
+   (merge acb7da05ac en/checkout-mismerge-fix later to maint).
+
+ * "git archive" recorded incorrect length in extended pax header in
+   some corner cases, which has been corrected.
+   (merge 71d41ff651 rs/pax-extended-header-length-fix later to maint).
+
+ * On-demand object fetching in lazy clone incorrectly tried to fetch
+   commits from submodule projects, while still working in the
+   superproject, which has been corrected.
+   (merge a63694f523 jt/diff-lazy-fetch-submodule-fix later to maint).
+
+ * Prepare get_short_oid() codepath to be thread-safe.
+   (merge 7cfcb16b0e rs/sort-oid-array-thread-safe later to maint).
+
+ * "for-each-ref" and friends that show refs did not protect themselves
+   against ancient tags that did not record tagger names when asked to
+   show "%(taggername)", which have been corrected.
+   (merge 8b3f33ef11 mp/for-each-ref-missing-name-or-email later to maint).
+
+ * The "git am" based backend of "git rebase" ignored the result of
+   updating ".gitattributes" done in one step when replaying
+   subsequent steps.
+   (merge 2c65d90f75 bc/reread-attributes-during-rebase later to maint).
+
+ * Tell cURL library to use the same malloc() implementation, with the
+   xmalloc() wrapper, as the rest of the system, for consistency.
+   (merge 93b980e58f cb/curl-use-xmalloc later to maint).
+
+ * Build fix to adjust .gitignore to unignore a path that we started to track.
+   (merge aac6ff7b5b js/visual-studio later to maint).
+
+ * A few implementation fixes in the notes API.
+   (merge 60fe477a0b mh/notes-duplicate-entries later to maint).
+
+ * Fix an earlier regression to "git push --all" which should have
+   been forbidden when the target remote repository is set to be a
+   mirror.
+   (merge 8e4c8af058 tg/push-all-in-mirror-forbidden later to maint).
+
+ * Fix an earlier regression in the test suite, which mistakenly
+   stopped running HTTPD tests.
+   (merge 3960290675 sg/git-test-boolean later to maint).
+
+ * "git rebase --autostash <upstream> <branch>", when <branch> is
+   different from the current branch, incorrectly moved the tip of the
+   current branch, which has been corrected.
+   (merge bf1e28e0ad bw/rebase-autostash-keep-current-branch later to maint).
+
+ * Update support for Asciidoctor documentation toolchain.
+   (merge 83b0b8953e ma/asciidoctor-refmiscinfo later to maint).
+
+ * Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0
+   no longer works with the older one.
+   (merge f6461b82b9 bc/doc-use-docbook-5 later to maint).
+
+ * The markup used in user-manual has been updated to work better with
+   asciidoctor.
+   (merge c4d2f6143a ma/user-manual-markup-update later to maint).
+
+ * Make sure the grep machinery does not abort when seeing a payload
+   that is not UTF-8 even when JIT is not in use with PCRE1.
+   (merge ad7c543e3b cb/skip-utf8-check-with-pcre1 later to maint).
+
+ * The name of the blob object that stores the filter specification
+   for sparse cloning/fetching was interpreted in a wrong place in the
+   code, causing Git to abort.
+
+ * "git log --decorate-refs-exclude=<pattern>" was incorrectly
+   overruled when the "--simplify-by-decoration" option is used, which
+   has been corrected.
+   (merge 0cc7380d88 rs/simplify-by-deco-with-deco-refs-exclude later to maint).
+
+ * The "upload-pack" (the counterpart of "git fetch") needs to disable
+   commit-graph when responding to a shallow clone/fetch request, but
+   the way this was done made Git panic, which has been corrected.
+
+ * The object traversal machinery has been optimized not to load tree
+   objects when we are only interested in commit history.
+   (merge 72ed80c784 jk/list-objects-optim-wo-trees later to maint).
+
+ * The object name parser for "Nth parent" syntax has been made more
+   robust against integer overflows.
+   (merge 59fa5f5a25 rs/nth-parent-parse later to maint).
+
+ * The code used in following tags in "git fetch" has been optimized.
+   (merge b7e2d8bca5 ms/fetch-follow-tag-optim later to maint).
+
+ * Regression fix for progress output.
+   (merge 2bb74b53a4 sg/progress-fix later to maint).
+
+ * A bug in merge-recursive code that triggers when a branch with a
+   symbolic link is merged with a branch that replaces it with a
+   directory has been fixed.
+   (merge 83e3ad3b12 jt/merge-recursive-symlink-is-not-a-dir-in-way later to maint).
+
+ * The rename detection logic sorts a list of rename source candidates
+   by similarity to pick the best candidate, which means that a tie
+   between sources with the same similarity is broken by the original
+   location in the original candidate list (which is sorted by path).
+   Force the sorting by similarity done with a stable sort, which is
+   not promised by system supplied qsort(3), to ensure consistent
+   results across platforms.
+   (merge 2049b8dc65 js/diff-rename-force-stable-sort later to maint).
+
+ * The code to skip "UTF" and "UTF-" prefix, when computing an advice
+   message, did not work correctly when the prefix was "UTF", which
+   has been fixed.
+   (merge b181676ce9 rs/convert-fix-utf-without-dash later to maint).
+
+ * The author names taken from SVN repositories may have extra leading
+   or trailing whitespaces, which are now munged away.
+   (merge 4ddd4bddb1 tk/git-svn-trim-author-name later to maint).
+
+ * "git rebase -i" showed a wrong HEAD while "reword" open the editor.
+   (merge b0a3186140 pw/rebase-i-show-HEAD-to-reword later to maint).
+
+ * A few simplification and bugfixes to PCRE interface.
+   (merge c581e4a749 ab/pcre-jit-fixes later to maint).
+
+ * PCRE fixes.
+   (merge ff61681b46 cb/pcre1-cleanup later to maint).
+
+ * "git range-diff" segfaulted when diff.noprefix configuration was
+   used, as it blindly expected the patch it internally generates to
+   have the standard a/ and b/ prefixes.  The command now forces the
+   internal patch to be built without any prefix, not to be affected
+   by any end-user configuration.
+   (merge 937b76ed49 js/range-diff-noprefix later to maint).
+
+ * "git stash apply" in a subdirectory of a secondary worktree failed
+   to access the worktree correctly, which has been corrected.
+   (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).
+
+ * The merge-recursive machinery is one of the most complex parts of
+   the system that accumulated cruft over time.  This large series
+   cleans up the implementation quite a bit.
+   (merge b657047719 en/merge-recursive-cleanup later to maint).
+
+ * Pretty-printed command line formatter (used in e.g. reporting the
+   command being run by the tracing API) had a bug that lost an
+   argument that is an empty string, which has been corrected.
+   (merge ce2d7ed2fd gs/sq-quote-buf-pretty later to maint).
+
+ * "git range-diff" failed to handle mode-only change, which has been
+   corrected.
+   (merge 2b6a9b13ca tg/range-diff-output-update later to maint).
+
+ * Dev support update.
+   (merge 4f3c1dc5d6 dl/allow-running-cocci-verbosely later to maint).
+
+ * "git format-patch -o <outdir>" did an equivalent of "mkdir <outdir>"
+   not "mkdir -p <outdir>", which was corrected.
+
+ * "git stash save" lost local changes to submodules, which has been
+   corrected.
+   (merge 556895d0c8 jj/stash-reset-only-toplevel later to maint).
+
+ * The atomic push over smart HTTP transport did not work, which has
+   been corrected.
+   (merge 6f1194246a bc/smart-http-atomic-push later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge d1387d3895 en/fast-import-merge-doc later to maint).
+   (merge 1c24a54ea4 bm/repository-layout-typofix later to maint).
+   (merge 415b770b88 ds/midx-expire-repack later to maint).
+   (merge 19800bdc3f nd/diff-parseopt later to maint).
+   (merge 58166c2e9d tg/t0021-racefix later to maint).
+   (merge 7027f508c7 dl/compat-cleanup later to maint).
+   (merge e770fbfeff jc/test-cleanup later to maint).
+   (merge 1fd881d404 rs/trace2-dst-warning later to maint).
+   (merge 7e92756751 mh/http-urlmatch-cleanup later to maint).
+   (merge 9784f97321 mh/release-commit-memory-fix later to maint).
+   (merge 60d198d022 tb/banned-vsprintf-namefix later to maint).
+   (merge 80e3658647 rs/help-unknown-ref-does-not-return later to maint).
+   (merge 0a8bc7068f dt/remote-helper-doc-re-lock-option later to maint).
+   (merge 27fd1e4ea7 en/merge-options-ff-and-friends later to maint).
+   (merge 502c386ff9 sg/clean-nested-repo-with-ignored later to maint).
+   (merge 26e3d1cbea am/mailmap-andrey-mazo later to maint).
+   (merge 47b27c96fa ss/get-time-cleanup later to maint).
+   (merge dd2e50a84e jk/commit-graph-cleanup later to maint).
+   (merge 4fd39c76e6 cs/pretty-formats-doc-typofix later to maint).
+   (merge 40e747e89d dl/submodule-set-branch later to maint).
+   (merge 689a146c91 rs/commit-graph-use-list-count later to maint).
+   (merge 0eb7c37a8a js/doc-patch-text later to maint).
+   (merge 4b3aa170d1 rs/nth-switch-code-simplification later to maint).
+   (merge 0d4304c124 ah/doc-submodule-ignore-submodules later to maint).
+   (merge af78249463 cc/svn-fe-py-shebang later to maint).
+   (merge 7bd97d6dff rs/alias-use-copy-array later to maint).
+   (merge c46ebc2496 sg/travis-help-debug later to maint).
+   (merge 24c681794f ps/my-first-contribution-alphasort later to maint).
+   (merge 75b2c15435 cb/do-not-use-test-cmp-with-a later to maint).
+   (merge cda0d497e3 bw/submodule-helper-usage-fix later to maint).
+   (merge fe0ed5d5e9 am/visual-studio-config-fix later to maint).
+   (merge 2e09c01232 sg/name-rev-cutoff-underflow-fix later to maint).
+   (merge ddb3c856f3 as/shallow-slab-use-fix later to maint).
+   (merge 71f4960b91 js/mingw-spawn-with-spaces-in-path later to maint).
+   (merge 53d687bf5f ah/cleanups later to maint).
+   (merge f537485fa5 rs/test-remove-useless-debugging-cat later to maint).
+   (merge 11a3d3aadd dl/rev-list-doc-cleanup later to maint).
+   (merge d928a8388a am/t0028-utf16-tests later to maint).
+   (merge b05b40930e dl/t0000-skip-test-test later to maint).
+   (merge 03d3b1297c js/xdiffi-comment-updates later to maint).
+   (merge 57d8f4b4c7 js/doc-stash-save later to maint).
+   (merge 8c1cfd58e3 ta/t1308-typofix later to maint).
+   (merge fa364ad790 bb/utf8-wcwidth-cleanup later to maint).
+   (merge 68b69211b2 bb/compat-util-comment-fix later to maint).
+   (merge 5cc6a4be11 rs/http-push-simplify later to maint).
+   (merge a81e42d235 rs/column-use-utf8-strnwidth later to maint).
+   (merge 062a309d36 rs/remote-curl-use-argv-array later to maint).
+   (merge 3b3c79f6c9 nr/diff-highlight-indent-fix later to maint).
+   (merge 3444ec2eb2 wb/fsmonitor-bitmap-fix later to maint).
+   (merge 10da030ab7 cb/pcre2-chartables-leakfix later to maint).
+   (merge 60e6569a12 js/mingw-needs-hiding-fix later to maint).
+   (merge 52bd3e4657 rl/gitweb-blame-prev-fix later to maint).
diff --git a/third_party/git/Documentation/RelNotes/2.24.1.txt b/third_party/git/Documentation/RelNotes/2.24.1.txt
new file mode 100644
index 000000000000..18104850fe4e
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.24.1.txt
@@ -0,0 +1,8 @@
+Git v2.24.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4,
+v2.17.3, v2.20.2 and in v2.21.1, addressing the security issues
+CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
+CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and
+CVE-2019-19604; see the release notes for those versions for details.
diff --git a/third_party/git/Documentation/RelNotes/2.24.2.txt b/third_party/git/Documentation/RelNotes/2.24.2.txt
new file mode 100644
index 000000000000..0049f65503eb
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.24.2.txt
@@ -0,0 +1,5 @@
+Git v2.24.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.24.3.txt b/third_party/git/Documentation/RelNotes/2.24.3.txt
new file mode 100644
index 000000000000..5302e0f73b50
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.24.3.txt
@@ -0,0 +1,5 @@
+Git v2.24.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.25.0.txt b/third_party/git/Documentation/RelNotes/2.25.0.txt
new file mode 100644
index 000000000000..91ceb3492707
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.25.0.txt
@@ -0,0 +1,370 @@
+Git 2.25 Release Notes
+======================
+
+Updates since v2.24
+-------------------
+
+Backward compatibility notes
+
+
+UI, Workflows & Features
+
+ * A tutorial on object enumeration has been added.
+
+ * The branch description ("git branch --edit-description") has been
+   used to fill the body of the cover letters by the format-patch
+   command; this has been enhanced so that the subject can also be
+   filled.
+
+ * "git rebase --preserve-merges" has been marked as deprecated; this
+   release stops advertising it in the "git rebase -h" output.
+
+ * The code to generate multi-pack index learned to show (or not to
+   show) progress indicators.
+
+ * "git apply --3way" learned to honor merge.conflictStyle
+   configuration variable, like merges would.
+
+ * The custom format for "git log --format=<format>" learned the l/L
+   placeholder that is similar to e/E that fills in the e-mail
+   address, but only the local part on the left side of '@'.
+
+ * Documentation pages for "git shortlog" now list commit limiting
+   options explicitly.
+
+ * The patterns to detect function boundary for Elixir language has
+   been added.
+
+ * The completion script (in contrib/) learned that the "--onto"
+   option of "git rebase" can take its argument as the value of the
+   option.
+
+ * The userdiff machinery has been taught that "async def" is another
+   way to begin a "function" in Python.
+
+ * "git range-diff" learned to take the "--notes=<ref>" and the
+   "--no-notes" options to control the commit notes included in the
+   log message that gets compared.
+
+ * "git rev-parse --show-toplevel" run outside of any working tree did
+   not error out, which has been corrected.
+
+ * A few commands learned to take the pathspec from the standard input
+   or a named file, instead of taking it as the command line
+   arguments, with the "--pathspec-from-file" option.
+
+ * "git submodule" learned a subcommand "set-url".
+
+ * "git log" family learned "--pretty=reference" that gives the name
+   of a commit in the format that is often used to refer to it in log
+   messages.
+
+ * The interaction between "git clone --recurse-submodules" and
+   alternate object store was ill-designed.  The documentation and
+   code have been taught to make more clear recommendations when the
+   users see failures.
+
+ * Management of sparsely checked-out working tree has gained a
+   dedicated "sparse-checkout" command.
+
+ * Miscellaneous small UX improvements on "git-p4".
+
+ * "git sparse-checkout list" subcommand learned to give its output in
+   a more concise form when the "cone" mode is in effect.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Debugging support for lazy cloning has been a bit improved.
+
+ * Move the definition of a set of bitmask constants from 0ctal
+   literal to (1U<<count) notation.
+
+ * Test updates to prepare for SHA-2 transition continues.
+
+ * Crufty code and logic accumulated over time around the object
+   parsing and low-level object access used in "git fsck" have been
+   cleaned up.
+
+ * The implementation of "git log --graph" got refactored and then its
+   output got simplified.
+
+ * Follow recent push to move API docs from Documentation/ to header
+   files and update config.h
+
+ * "git bundle" has been taught to use the parse options API.  "git
+   bundle verify" learned "--quiet" and "git bundle create" learned
+   options to control the progress output.
+
+ * Handling of commit objects that use non UTF-8 encoding during
+   "rebase -i" has been improved.
+
+ * The beginning of rewriting "git add -i" in C.
+
+ * A label used in the todo list that are generated by "git rebase
+   --rebase-merges" is used as a part of a refname; the logic to come
+   up with the label has been tightened to avoid names that cannot be
+   used as such.
+
+ * The logic to avoid duplicate label names generated by "git rebase
+   --rebase-merges" forgot that the machinery itself uses "onto" as a
+   label name, which must be avoided by auto-generated labels, which
+   has been corrected.
+
+ * We have had compatibility fallback macro definitions for "PRIuMAX",
+   "PRIu32", etc. but did not for "PRIdMAX", while the code used the
+   last one apparently without any hiccup reported recently.  The
+   fallback macro definitions for these <inttypes.h> macros that must
+   appear in C99 systems have been removed.
+
+ * Recently we have declared that GIT_TEST_* variables take the
+   usual boolean values (it used to be that some used "non-empty
+   means true" and taking GIT_TEST_VAR=YesPlease as true); make
+   sure we notice and fail when non-bool strings are given to
+   these variables.
+
+ * Users of oneway_merge() (like "reset --hard") learned to take
+   advantage of fsmonitor to avoid unnecessary lstat(2) calls.
+
+ * Performance tweak on "git push" into a repository with many refs
+   that point at objects we have never heard of.
+
+ * PerfTest fix to avoid stale result mixed up with the latest round
+   of test results.
+
+ * Hide lower-level verify_signed-buffer() API as a pure helper to
+   implement the public check_signature() function, in order to
+   encourage new callers to use the correct and more strict
+   validation.
+
+ * Unnecessary reading of state variables back from the disk during
+   sequencer operation has been reduced.
+
+ * The code has been made to avoid gmtime() and localtime() and prefer
+   their reentrant counterparts.
+
+ * In a repository with many packfiles, the cost of the procedure that
+   avoids registering the same packfile twice was unnecessarily high
+   by using an inefficient search algorithm, which has been corrected.
+
+ * Redo "git name-rev" to avoid recursive calls.
+
+ * FreeBSD CI support via Cirrus-CI has been added.
+
+
+Fixes since v2.24
+-----------------
+
+ * "rebase -i" ceased to run post-commit hook by mistake in an earlier
+   update, which has been corrected.
+
+ * "git notes copy $original" ought to copy the notes attached to the
+   original object to HEAD, but a mistaken tightening to command line
+   parameter validation made earlier disabled that feature by mistake.
+
+ * When all files from some subdirectory were renamed to the root
+   directory, the directory rename heuristics would fail to detect that
+   as a rename/merge of the subdirectory to the root directory, which has
+   been corrected.
+
+ * Code clean-up and a bugfix in the logic used to tell worktree local
+   and repository global refs apart.
+   (merge f45f88b2e4 sg/dir-trie-fixes later to maint).
+
+ * "git stash save" in a working tree that is sparsely checked out
+   mistakenly removed paths that are outside the area of interest.
+   (merge 4a58c3d7f7 js/update-index-ignore-removal-for-skip-worktree later to maint).
+
+ * "git rev-parse --git-path HEAD.lock" did not give the right path
+   when run in a secondary worktree.
+   (merge 76a53d640f js/git-path-head-dot-lock-fix later to maint).
+
+ * "git merge --no-commit" needs "--no-ff" if you do not want to move
+   HEAD, which has been corrected in the manual page for "git bisect".
+   (merge 8dd327b246 ma/bisect-doc-sample-update later to maint).
+
+ * "git worktree add" internally calls "reset --hard" that should not
+   descend into submodules, even when submodule.recurse configuration
+   is set, but it was affected.  This has been corrected.
+   (merge 4782cf2ab6 pb/no-recursive-reset-hard-in-worktree-add later to maint).
+
+ * Messages from die() etc. can be mixed up from multiple processes
+   without even line buffering on Windows, which has been worked
+   around.
+   (merge 116d1fa6c6 js/vreportf-wo-buffering later to maint).
+
+ * HTTP transport had possible allocator/deallocator mismatch, which
+   has been corrected.
+
+ * The watchman integration for fsmonitor was racy, which has been
+   corrected to be more conservative.
+   (merge dd0b61f577 kw/fsmonitor-watchman-fix later to maint).
+
+ * Fetching from multiple remotes into the same repository in parallel
+   had a bad interaction with the recent change to (optionally) update
+   the commit-graph after a fetch job finishes, as these parallel
+   fetches compete with each other.  Which has been corrected.
+
+ * Recent update to "git stash pop" made the command empty the index
+   when run with the "--quiet" option, which has been corrected.
+
+ * "git fetch" codepath had a big "do not lazily fetch missing objects
+   when I ask if something exists" switch.  This has been corrected by
+   marking the "does this thing exist?" calls with "if not please do not
+   lazily fetch it" flag.
+
+ * Test update to avoid wasted cycles.
+   (merge e0316695ec sg/skip-skipped-prereq later to maint).
+
+ * Error handling after "git push" finishes sending the packdata and
+   waits for the response to the remote side has been improved.
+   (merge ad7a403268 jk/send-pack-remote-failure later to maint).
+
+ * Some codepaths in "gitweb" that forgot to escape URLs generated
+   based on end-user input have been corrected.
+   (merge a376e37b2c jk/gitweb-anti-xss later to maint).
+
+ * CI jobs for macOS has been made less chatty when updating perforce
+   package used during testing.
+   (merge 0dbc4a0edf jc/azure-ci-osx-fix-fix later to maint).
+
+ * "git unpack-objects" used to show progress based only on the number
+   of received and unpacked objects, which stalled when it has to
+   handle an unusually large object.  It now shows the throughput as
+   well.
+   (merge bae60ba7e9 sg/unpack-progress-throughput later to maint).
+
+ * The sequencer machinery compared the HEAD and the state it is
+   attempting to commit to decide if the result would be a no-op
+   commit, even when amending a commit, which was incorrect, and
+   has been corrected.
+
+ * The code to parse GPG output used to assume incorrectly that the
+   finterprint for the primary key would always be present for a valid
+   signature, which has been corrected.
+   (merge 67a6ea6300 hi/gpg-optional-pkfp-fix later to maint).
+
+ * "git submodule status" and "git submodule status --cached" show
+   different things, but the documentation did not cover them
+   correctly, which has been corrected.
+   (merge 8d483c8408 mg/doc-submodule-status-cached later to maint).
+
+ * "git reset --patch $object" without any pathspec should allow a
+   tree object to be given, but incorrectly required a committish,
+   which has been corrected.
+
+ * "git submodule status" that is run from a subdirectory of the
+   superproject did not work well, which has been corrected.
+   (merge 1f3aea22c7 mg/submodule-status-from-a-subdirectory later to maint).
+
+ * The revision walking machinery uses resources like per-object flag
+   bits that need to be reset before a new iteration of walking
+   begins, but the resources related to topological walk were not
+   cleared correctly, which has been corrected.
+   (merge 0aa0c2b2ec mh/clear-topo-walk-upon-reset later to maint).
+
+ * TravisCI update.
+   (merge 176441bfb5 sg/osx-force-gcc-9 later to maint).
+
+ * While running "revert" or "cherry-pick --edit" for multiple
+   commits, a recent regression incorrectly detected "nothing to
+   commit, working tree clean", instead of replaying the commits,
+   which has been corrected.
+   (merge befd4f6a81 sg/assume-no-todo-update-in-cherry-pick later to maint).
+
+ * Work around a issue where a FD that is left open when spawning a
+   child process and is kept open in the child can interfere with the
+   operation in the parent process on Windows.
+
+ * One kind of progress messages were always given during commit-graph
+   generation, instead of following the "if it takes more than two
+   seconds, show progress" pattern, which has been corrected.
+
+ * "git rebase" did not work well when format.useAutoBase
+   configuration variable is set, which has been corrected.
+
+ * The "diff" machinery learned not to lose added/removed blank lines
+   in the context when --ignore-blank-lines and --function-context are
+   used at the same time.
+   (merge 0bb313a552 rs/xdiff-ignore-ws-w-func-context later to maint).
+
+ * The test on "fast-import" used to get stuck when "fast-import" died
+   in the middle.
+   (merge 0d9b0d7885 sg/t9300-robustify later to maint).
+
+ * "git format-patch" can take a set of configured format.notes values
+   to specify which notes refs to use in the log message part of the
+   output.  The behaviour of this was not consistent with multiple
+   --notes command line options, which has been corrected.
+   (merge e0f9095aaa dl/format-patch-notes-config-fixup later to maint).
+
+ * "git p4" used to ignore lfs.storage configuration variable, which
+   has been corrected.
+   (merge ea94b16fb8 rb/p4-lfs later to maint).
+
+ * Assorted fixes to the directory traversal API.
+   (merge 6836d2fe06 en/fill-directory-fixes later to maint).
+
+ * Forbid pathnames that the platform's filesystem cannot represent on
+   MinGW.
+   (merge 4dc42c6c18 js/mingw-reserved-filenames later to maint).
+
+ * "git rebase --signoff" stopped working when the command was written
+   in C, which has been corrected.
+   (merge 4fe7e43c53 en/rebase-signoff-fix later to maint).
+
+ * An earlier update to Git for Windows declared that a tree object is
+   invalid if it has a path component with backslash in it, which was
+   overly strict, which has been corrected.  The only protection the
+   Windows users need is to prevent such path (or any path that their
+   filesystem cannot check out) from entering the index.
+   (merge 224c7d70fa js/mingw-loosen-overstrict-tree-entry-checks later to maint).
+
+ * The code to write split commit-graph file(s) upon fetching computed
+   bogus value for the parameter used in splitting the resulting
+   files, which has been corrected.
+   (merge 63020f175f ds/commit-graph-set-size-mult later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge 80736d7c5e jc/am-show-current-patch-docfix later to maint).
+   (merge 8b656572ca sg/commit-graph-usage-fix later to maint).
+   (merge 6c02042139 mr/clone-dir-exists-to-path-exists later to maint).
+   (merge 44ae131e38 sg/blame-indent-heuristics-is-now-the-default later to maint).
+   (merge 0115e5d929 dl/doc-diff-no-index-implies-exit-code later to maint).
+   (merge 270de6acbe en/t6024-style later to maint).
+   (merge 14c4776d75 ns/test-desc-typofix later to maint).
+   (merge 68d40f30c4 dj/typofix-merge-strat later to maint).
+   (merge f66e0401ab jk/optim-in-pack-idx-conversion later to maint).
+   (merge 169bed7421 rs/parse-options-dup-null-fix later to maint).
+   (merge 51bd6be32d rs/use-copy-array-in-mingw-shell-command-preparation later to maint).
+   (merge b018719927 ma/t7004 later to maint).
+   (merge 932757b0cc ar/install-doc-update-cmds-needing-the-shell later to maint).
+   (merge 46efd28be1 ep/guard-kset-tar-headers later to maint).
+   (merge 9e5afdf997 ec/fetch-mark-common-refs-trace2 later to maint).
+   (merge f0e58b3fe8 pb/submodule-update-fetches later to maint).
+   (merge 2a02262078 dl/t5520-cleanup later to maint).
+   (merge a4fb016ba1 js/pkt-line-h-typofix later to maint).
+   (merge 54a7a64613 rs/simplify-prepare-cmd later to maint).
+   (merge 3eae30e464 jk/lore-is-the-archive later to maint).
+   (merge 14b7664df8 dl/lore-is-the-archive later to maint).
+   (merge 0e40a73a4c po/bundle-doc-clonable later to maint).
+   (merge e714b898c6 as/t7812-missing-redirects-fix later to maint).
+   (merge 528d9e6d01 jk/perf-wo-git-dot-pm later to maint).
+   (merge fc42f20e24 sg/test-squelch-noise-in-commit-bulk later to maint).
+   (merge c64368e3a2 bc/t9001-zsh-in-posix-emulation-mode later to maint).
+   (merge 11de8dd7ef dr/branch-usage-casefix later to maint).
+   (merge e05e8cf074 rs/archive-zip-code-cleanup later to maint).
+   (merge 147ee35558 rs/commit-export-env-simplify later to maint).
+   (merge 4507ecc771 rs/patch-id-use-oid-to-hex later to maint).
+   (merge 51a0a4ed95 mr/bisect-use-after-free later to maint).
+   (merge cc2bd5c45d pb/submodule-doc-xref later to maint).
+   (merge df5be01669 ja/doc-markup-cleanup later to maint).
+   (merge 7c5cea7242 mr/bisect-save-pointer-to-const-string later to maint).
+   (merge 20a67e8ce9 js/use-test-tool-on-path later to maint).
+   (merge 4e61b2214d ew/packfile-syscall-optim later to maint).
+   (merge ace0f86c7f pb/clarify-line-log-doc later to maint).
+   (merge 763a59e71c en/merge-recursive-oid-eq-simplify later to maint).
+   (merge 4e2c4c0d4f do/gitweb-typofix-in-comments later to maint).
+   (merge 421c0ffb02 jb/doc-multi-pack-idx-fix later to maint).
+   (merge f8740c586b pm/am-in-body-header-doc-update later to maint).
+   (merge 5814d44d9b tm/doc-submodule-absorb-fix later to maint).
diff --git a/third_party/git/Documentation/RelNotes/2.25.1.txt b/third_party/git/Documentation/RelNotes/2.25.1.txt
new file mode 100644
index 000000000000..cd869b02bbbc
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.25.1.txt
@@ -0,0 +1,55 @@
+Git 2.25.1 Release Notes
+========================
+
+Fixes since v2.25
+-----------------
+
+ * "git commit" gives output similar to "git status" when there is
+   nothing to commit, but without honoring the advise.statusHints
+   configuration variable, which has been corrected.
+
+ * has_object_file() said "no" given an object registered to the
+   system via pretend_object_file(), making it inconsistent with
+   read_object_file(), causing lazy fetch to attempt fetching an
+   empty tree from promisor remotes.
+
+ * The code that tries to skip over the entries for the paths in a
+   single directory using the cache-tree was not careful enough
+   against corrupt index file.
+
+ * Complete an update to tutorial that encourages "git switch" over
+   "git checkout" that was done only half-way.
+
+ * Reduce unnecessary round-trip when running "ls-remote" over the
+   stateless RPC mechanism.
+
+ * "git restore --staged" did not correctly update the cache-tree
+   structure, resulting in bogus trees to be written afterwards, which
+   has been corrected.
+
+ * The code recently added to move to the entry beyond the ones in the
+   same directory in the index in the sparse-cone mode did not count
+   the number of entries to skip over incorrectly, which has been
+   corrected.
+
+ * Work around test breakages caused by custom regex engine used in
+   libasan, when address sanitizer is used with more recent versions
+   of gcc and clang.
+
+ * "git fetch --refmap=" option has got a better documentation.
+
+ * Corner case bugs in "git clean" that stems from a (necessarily for
+   performance reasons) awkward calling convention in the directory
+   enumeration API has been corrected.
+
+ * "git grep --no-index" should not get affected by the contents of
+   the .gitmodules file but when "--recurse-submodules" is given or
+   the "submodule.recurse" variable is set, it did.  Now these
+   settings are ignored in the "--no-index" mode.
+
+ * Technical details of the bundle format has been documented.
+
+ * Unhelpful warning messages during documentation build have been
+   squelched.
+
+Also contains various documentation updates, code clean-ups and minor fixups.
diff --git a/third_party/git/Documentation/RelNotes/2.25.2.txt b/third_party/git/Documentation/RelNotes/2.25.2.txt
new file mode 100644
index 000000000000..303c53a17fdc
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.25.2.txt
@@ -0,0 +1,60 @@
+Git 2.25.2 Release Notes
+========================
+
+Fixes since v2.25.1
+-------------------
+
+ * Minor bugfixes to "git add -i" that has recently been rewritten in C.
+
+ * An earlier update to show the location of working tree in the error
+   message did not consider the possibility that a git command may be
+   run in a bare repository, which has been corrected.
+
+ * The "--recurse-submodules" option of various subcommands did not
+   work well when run in an alternate worktree, which has been
+   corrected.
+
+ * Running "git rm" on a submodule failed unnecessarily when
+   .gitmodules is only cache-dirty, which has been corrected.
+
+ * "git rebase -i" identifies existing commits in its todo file with
+   their abbreviated object name, which could become ambigous as it
+   goes to create new commits, and has a mechanism to avoid ambiguity
+   in the main part of its execution.  A few other cases however were
+   not covered by the protection against ambiguity, which has been
+   corrected.
+
+ * The index-pack code now diagnoses a bad input packstream that
+   records the same object twice when it is used as delta base; the
+   code used to declare a software bug when encountering such an
+   input, but it is an input error.
+
+ * The code to automatically shrink the fan-out in the notes tree had
+   an off-by-one bug, which has been killed.
+
+ * "git check-ignore" did not work when the given path is explicitly
+   marked as not ignored with a negative entry in the .gitignore file.
+
+ * The merge-recursive machinery failed to refresh the cache entry for
+   a merge result in a couple of places, resulting in an unnecessary
+   merge failure, which has been fixed.
+
+ * Fix for a bug revealed by a recent change to make the protocol v2
+   the default.
+
+ * "git merge signed-tag" while lacking the public key started to say
+   "No signature", which was utterly wrong.  This regression has been
+   reverted.
+
+ * MinGW's poll() emulation has been improved.
+
+ * "git show" and others gave an object name in raw format in its
+   error output, which has been corrected to give it in hex.
+
+ * Both "git ls-remote -h" and "git grep -h" give short usage help,
+   like any other Git subcommand, but it is not unreasonable to expect
+   that the former would behave the same as "git ls-remote --head"
+   (there is no other sensible behaviour for the latter).  The
+   documentation has been updated in an attempt to clarify this.
+
+Also contains various documentation updates, code clean-ups and minor fixups.
diff --git a/third_party/git/Documentation/RelNotes/2.25.3.txt b/third_party/git/Documentation/RelNotes/2.25.3.txt
new file mode 100644
index 000000000000..15f7f21f1002
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.25.3.txt
@@ -0,0 +1,5 @@
+Git v2.25.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.25.4.txt b/third_party/git/Documentation/RelNotes/2.25.4.txt
new file mode 100644
index 000000000000..0dbb5daeec3e
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.25.4.txt
@@ -0,0 +1,5 @@
+Git v2.25.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.26.0.txt b/third_party/git/Documentation/RelNotes/2.26.0.txt
new file mode 100644
index 000000000000..3a7a734c2694
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.26.0.txt
@@ -0,0 +1,341 @@
+Git 2.26 Release Notes
+======================
+
+Updates since v2.25
+-------------------
+
+Backward compatibility notes
+
+ * "git rebase" uses a different backend that is based on the 'merge'
+   machinery by default.  There are a few known differences in the
+   behaviour from the traditional machinery based on patch+apply.
+
+   If your workflow is negatively affected by this change, please
+   report it to git@vger.kernel.org so that we can take a look into
+   it.  After doing so, you can set the 'rebase.backend' configuration
+   variable to 'apply', in order to use the old default behaviour in
+   the meantime.
+
+
+UI, Workflows & Features
+
+ * Sample credential helper for using .netrc has been updated to work
+   out of the box.
+
+ * gpg.minTrustLevel configuration variable has been introduced to
+   tell various signature verification codepaths the required minimum
+   trust level.
+
+ * The command line completion (in contrib/) learned to complete
+   subcommands and arguments to "git worktree".
+
+ * Disambiguation logic to tell revisions and pathspec apart has been
+   tweaked so that backslash-escaped glob special characters do not
+   count in the "wildcards are pathspec" rule.
+
+ * One effect of specifying where the GIT_DIR is (either with the
+   environment variable, or with the "git --git-dir=<where> cmd"
+   option) is to disable the repository discovery.  This has been
+   placed a bit more stress in the documentation, as new users often
+   get confused.
+
+ * Two help messages given when "git add" notices the user gave it
+   nothing to add have been updated to use advise() API.
+
+ * A new version of fsmonitor-watchman hook has been introduced, to
+   avoid races.
+
+ * "git config" learned to show in which "scope", in addition to in
+   which file, each config setting comes from.
+
+ * The basic 7 colors learned the brighter counterparts
+   (e.g. "brightred").
+
+ * "git sparse-checkout" learned a new "add" subcommand.
+
+ * A configuration element used for credential subsystem can now use
+   wildcard pattern to specify for which set of URLs the entry
+   applies.
+
+ * "git clone --recurse-submodules --single-branch" now uses the same
+   single-branch option when cloning the submodules.
+
+ * "git rm" and "git stash" learns the new "--pathspec-from-file"
+   option.
+
+ * "git am --show-current-patch" is a way to show the piece of e-mail
+   for the stopped step, which is not suitable to directly feed "git
+   apply" (it is designed to be a good "git am" input).  It learned a
+   new option to show only the patch part.
+
+ * Handling of conflicting renames in merge-recursive have further
+   been made consistent with how existing codepaths try to mimic what
+   is done to add/add conflicts.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Tell .editorconfig that in this project, *.txt files are indented
+   with tabs.
+
+ * The test-lint machinery knew to check "VAR=VAL shell_function"
+   construct, but did not check "VAR= shell_function", which has been
+   corrected.
+
+ * Replace "git config --bool" calls with "git config --type=bool" in
+   sample templates.
+
+ * The effort to move "git-add--interactive" to C continues.
+
+ * Improve error message generation for "git submodule add".
+
+ * Preparation of test scripts for the day when the object names will
+   use SHA-256 continues.
+
+ * Warn programmers about pretend_object_file() that allows the code
+   to tentatively use in-core objects.
+
+ * The way "git pack-objects" reuses objects stored in existing pack
+   to generate its result has been improved.
+
+ * The transport protocol version 2 becomes the default one.
+
+ * Traditionally, we avoided threaded grep while searching in objects
+   (as opposed to files in the working tree) as accesses to the object
+   layer is not thread-safe.  This limitation is getting lifted.
+
+ * "git rebase -i" (and friends) used to unnecessarily check out the
+   tip of the branch to be rebased, which has been corrected.
+
+ * A low-level API function get_oid(), that accepts various ways to
+   name an object, used to issue end-user facing error messages
+   without l10n, which has been updated to be translatable.
+
+ * Unneeded connectivity check is now disabled in a partial clone when
+   fetching into it.
+
+ * Some rough edges in the sparse-checkout feature, especially around
+   the cone mode, have been cleaned up.
+
+ * The diff-* plumbing family of subcommands now pay attention to the
+   diff.wsErrorHighlight configuration, which has been ignored before;
+   this allows "git add -p" to also show the whitespace problems to
+   the end user.
+
+ * Some codepaths were given a repository instance as a parameter to
+   work in the repository, but passed the_repository instance to its
+   callees, which has been cleaned up (somewhat).
+
+ * Memory footprint and performance of "git name-rev" has been
+   improved.
+
+ * The object reachability bitmap machinery and the partial cloning
+   machinery were not prepared to work well together, because some
+   object-filtering criteria that partial clones use inherently rely
+   on object traversal, but the bitmap machinery is an optimization
+   to bypass that object traversal.  There however are some cases
+   where they can work together, and they were taught about them.
+
+ * "git rebase" has learned to use the merge backend (i.e. the
+   machinery that drives "rebase -i") by default, while allowing
+   "--apply" option to use the "apply" backend (e.g. the moral
+   equivalent of "format-patch piped to am").  The rebase.backend
+   configuration variable can be set to customize.
+
+ * Underlying machinery of "git bisect--helper" is being refactored
+   into pieces that are more easily reused.
+
+
+Fixes since v2.25
+-----------------
+
+ * "git commit" gives output similar to "git status" when there is
+   nothing to commit, but without honoring the advise.statusHints
+   configuration variable, which has been corrected.
+
+ * has_object_file() said "no" given an object registered to the
+   system via pretend_object_file(), making it inconsistent with
+   read_object_file(), causing lazy fetch to attempt fetching an
+   empty tree from promisor remotes.
+
+ * Complete an update to tutorial that encourages "git switch" over
+   "git checkout" that was done only half-way.
+
+ * C pedantry ;-) fix.
+
+ * The code that tries to skip over the entries for the paths in a
+   single directory using the cache-tree was not careful enough
+   against corrupt index file.
+
+ * Reduce unnecessary round-trip when running "ls-remote" over the
+   stateless RPC mechanism.
+
+ * "git restore --staged" did not correctly update the cache-tree
+   structure, resulting in bogus trees to be written afterwards, which
+   has been corrected.
+
+ * The code recently added to move to the entry beyond the ones in the
+   same directory in the index in the sparse-cone mode did not count
+   the number of entries to skip over incorrectly, which has been
+   corrected.
+
+ * Rendering by "git log --graph" of ancestry lines leading to a merge
+   commit were made suboptimal to waste vertical space a bit with a
+   recent update, which has been corrected.
+
+ * Work around test breakages caused by custom regex engine used in
+   libasan, when address sanitizer is used with more recent versions
+   of gcc and clang.
+
+ * Minor bugfixes to "git add -i" that has recently been rewritten in C.
+
+ * "git fetch --refmap=" option has got a better documentation.
+
+ * "git checkout X" did not correctly fail when X is not a local
+   branch but could name more than one remote-tracking branches
+   (i.e. to be dwimmed as the starting point to create a corresponding
+   local branch), which has been corrected.
+   (merge fa74180d08 am/checkout-file-and-ref-ref-ambiguity later to maint).
+
+ * Corner case bugs in "git clean" that stems from a (necessarily for
+   performance reasons) awkward calling convention in the directory
+   enumeration API has been corrected.
+
+ * A fetch that is told to recursively fetch updates in submodules
+   inevitably produces reams of output, and it becomes hard to spot
+   error messages.  The command has been taught to enumerate
+   submodules that had errors at the end of the operation.
+   (merge 0222540827 es/fetch-show-failed-submodules-atend later to maint).
+
+ * The "--recurse-submodules" option of various subcommands did not
+   work well when run in an alternate worktree, which has been
+   corrected.
+
+ * Futureproofing a test not to depend on the current implementation
+   detail.
+
+ * Running "git rm" on a submodule failed unnecessarily when
+   .gitmodules is only cache-dirty, which has been corrected.
+
+ * C pedantry ;-) fix.
+
+ * "git grep --no-index" should not get affected by the contents of
+   the .gitmodules file but when "--recurse-submodules" is given or
+   the "submodule.recurse" variable is set, it did.  Now these
+   settings are ignored in the "--no-index" mode.
+
+ * Technical details of the bundle format has been documented.
+
+ * Unhelpful warning messages during documentation build have been squelched.
+
+ * "git rebase -i" identifies existing commits in its todo file with
+   their abbreviated object name, which could become ambiguous as it
+   goes to create new commits, and has a mechanism to avoid ambiguity
+   in the main part of its execution.  A few other cases however were
+   not covered by the protection against ambiguity, which has been
+   corrected.
+
+ * Allow the rebase.missingCommitsCheck configuration to kick in when
+   "rebase --edit-todo" and "rebase --continue" restarts the procedure.
+   (merge 5a5445d878 ag/edit-todo-drop-check later to maint).
+
+ * The way "git submodule status" reports an initialized but not yet
+   populated submodule has not been reimplemented correctly when a
+   part of the "git submodule" command was rewritten in C, which has
+   been corrected.
+   (merge f38c92452d pk/status-of-uncloned-submodule later to maint).
+
+ * The code to automatically shrink the fan-out in the notes tree had
+   an off-by-one bug, which has been killed.
+
+ * The index-pack code now diagnoses a bad input packstream that
+   records the same object twice when it is used as delta base; the
+   code used to declare a software bug when encountering such an
+   input, but it is an input error.
+
+
+ * The code to compute the commit-graph has been taught to use a more
+   robust way to tell if two object directories refer to the same
+   thing.
+   (merge a7df60cac8 tb/commit-graph-object-dir later to maint).
+
+ * "git remote rename X Y" needs to adjust configuration variables
+   (e.g. branch.<name>.remote) whose value used to be X to Y.
+   branch.<name>.pushRemote is now also updated.
+
+ * Update to doc-diff.
+
+ * Doc markup fix.
+
+ * "git check-ignore" did not work when the given path is explicitly
+   marked as not ignored with a negative entry in the .gitignore file.
+
+ * The merge-recursive machinery failed to refresh the cache entry for
+   a merge result in a couple of places, resulting in an unnecessary
+   merge failure, which has been fixed.
+
+ * Fix for a bug revealed by a recent change to make the protocol v2
+   the default.
+
+ * In rare cases "git worktree add <path>" could think that <path>
+   was already a registered worktree even when it wasn't and refuse
+   to add the new worktree. This has been corrected.
+   (merge bb69b3b009 es/worktree-avoid-duplication-fix later to maint).
+
+ * "git push" should stop from updating a branch that is checked out
+   when receive.denyCurrentBranch configuration is set, but it failed
+   to pay attention to checkouts in secondary worktrees.  This has
+   been corrected.
+   (merge 4d864895a2 hv/receive-denycurrent-everywhere later to maint).
+
+ * "git rebase BASE BRANCH" rebased/updated the tip of BRANCH and
+   checked it out, even when the BRANCH is checked out in a different
+   worktree.  This has been corrected.
+   (merge b5cabb4a96 es/do-not-let-rebase-switch-to-protected-branch later to maint).
+
+ * "git describe" in a repository with multiple root commits sometimes
+   gave up looking for the best tag to describe a given commit with
+   too early, which has been adjusted.
+
+ * "git merge signed-tag" while lacking the public key started to say
+   "No signature", which was utterly wrong.  This regression has been
+   reverted.
+
+ * MinGW's poll() emulation has been improved.
+
+ * "git show" and others gave an object name in raw format in its
+   error output, which has been corrected to give it in hex.
+
+ * "git fetch" over HTTP walker protocol did not show any progress
+   output.  We inherently do not know how much work remains, but still
+   we can show something not to bore users.
+   (merge 7655b4119d rs/show-progress-in-dumb-http-fetch later to maint).
+
+ * Both "git ls-remote -h" and "git grep -h" give short usage help,
+   like any other Git subcommand, but it is not unreasonable to expect
+   that the former would behave the same as "git ls-remote --head"
+   (there is no other sensible behaviour for the latter).  The
+   documentation has been updated in an attempt to clarify this.
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge d0d0a357a1 am/update-pathspec-f-f-tests later to maint).
+   (merge f94f7bd00d am/test-pathspec-f-f-error-cases later to maint).
+   (merge c513a958b6 ss/t6025-modernize later to maint).
+   (merge b441717256 dl/test-must-fail-fixes later to maint).
+   (merge d031049da3 mt/sparse-checkout-doc-update later to maint).
+   (merge 145136a95a jc/skip-prefix later to maint).
+   (merge 5290d45134 jk/alloc-cleanups later to maint).
+   (merge 7a9f8ca805 rs/parse-options-concat-dup later to maint).
+   (merge 517b60564e rs/strbuf-insertstr later to maint).
+   (merge f696a2b1c8 jk/mailinfo-cleanup later to maint).
+   (merge de26f02db1 js/test-avoid-pipe later to maint).
+   (merge a2dc43414c es/doc-mentoring later to maint).
+   (merge 02bbbe9df9 es/worktree-cleanup later to maint).
+   (merge 2ce6d075fa rs/micro-cleanups later to maint).
+   (merge 27f182b3fc rs/blame-typefix-for-fingerprint later to maint).
+   (merge 3c29e21eb0 ma/test-cleanup later to maint).
+   (merge 240fc04f81 ag/rebase-remove-redundant-code later to maint).
+   (merge d68ce906c7 rs/commit-graph-code-simplification later to maint).
+   (merge a51d9e8f07 rj/t1050-use-test-path-is-file later to maint).
+   (merge fd0bc17557 kk/complete-diff-color-moved later to maint).
+   (merge 65bf820d0e en/test-cleanup later to maint).
diff --git a/third_party/git/Documentation/RelNotes/2.26.1.txt b/third_party/git/Documentation/RelNotes/2.26.1.txt
new file mode 100644
index 000000000000..1b4ecb3fdc54
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.26.1.txt
@@ -0,0 +1,5 @@
+Git v2.26.1 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.26.2.txt b/third_party/git/Documentation/RelNotes/2.26.2.txt
new file mode 100644
index 000000000000..d434d0c695e4
--- /dev/null
+++ b/third_party/git/Documentation/RelNotes/2.26.2.txt
@@ -0,0 +1,5 @@
+Git v2.26.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/third_party/git/Documentation/RelNotes/2.3.3.txt b/third_party/git/Documentation/RelNotes/2.3.3.txt
index 5ef12644c229..850dc68edef0 100644
--- a/third_party/git/Documentation/RelNotes/2.3.3.txt
+++ b/third_party/git/Documentation/RelNotes/2.3.3.txt
@@ -12,7 +12,7 @@ Fixes since v2.3.2
  * Description given by "grep -h" for its --exclude-standard option
    was phrased poorly.
 
- * Documentaton for "git remote add" mentioned "--tags" and
+ * Documentation for "git remote add" mentioned "--tags" and
    "--no-tags" and it was not clear that fetch from the remote in
    the future will use the default behaviour when neither is given
    to override it.
diff --git a/third_party/git/Documentation/RelNotes/2.3.7.txt b/third_party/git/Documentation/RelNotes/2.3.7.txt
index fc95812cb3f0..576918408161 100644
--- a/third_party/git/Documentation/RelNotes/2.3.7.txt
+++ b/third_party/git/Documentation/RelNotes/2.3.7.txt
@@ -4,7 +4,7 @@ Git v2.3.7 Release Notes
 Fixes since v2.3.6
 ------------------
 
- * An earlier update to the parser that disects a URL broke an
+ * An earlier update to the parser that dissects a URL broke an
    address, followed by a colon, followed by an empty string (instead
    of the port number), e.g. ssh://example.com:/path/to/repo.
 
diff --git a/third_party/git/Documentation/RelNotes/2.4.3.txt b/third_party/git/Documentation/RelNotes/2.4.3.txt
index 914d2c186000..422e930aa2b2 100644
--- a/third_party/git/Documentation/RelNotes/2.4.3.txt
+++ b/third_party/git/Documentation/RelNotes/2.4.3.txt
@@ -66,7 +66,7 @@ Fixes since v2.4.3
  * Some time ago, "git blame" (incorrectly) lost the convert_to_git()
    call when synthesizing a fake "tip" commit that represents the
    state in the working tree, which broke folks who record the history
-   with LF line ending to make their project portabile across
+   with LF line ending to make their project portable across
    platforms while terminating lines in their working tree files with
    CRLF for their platform.
 
diff --git a/third_party/git/Documentation/RelNotes/2.5.0.txt b/third_party/git/Documentation/RelNotes/2.5.0.txt
index 87044504c524..84723f912a9c 100644
--- a/third_party/git/Documentation/RelNotes/2.5.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.5.0.txt
@@ -172,7 +172,8 @@ Performance, Internal Implementation, Development Support etc.
    incorrect patch text to "git apply".  Add tests to demonstrate
    this.
 
-   I have a slight suspicion that this may be $gmane/87202 coming back
+   I have a slight suspicion that this may be
+   cf. <7vtzf77wjp.fsf@gitster.siamese.dyndns.org> coming back
    and biting us (I seem to have said "let's run with this and see
    what happens" back then).
 
diff --git a/third_party/git/Documentation/RelNotes/2.7.0.txt b/third_party/git/Documentation/RelNotes/2.7.0.txt
index 563dadc57e84..e3cbf3a73c46 100644
--- a/third_party/git/Documentation/RelNotes/2.7.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.7.0.txt
@@ -40,7 +40,7 @@ UI, Workflows & Features
 
  * "git interpret-trailers" can now run outside of a Git repository.
 
- * "git p4" learned to reencode the pathname it uses to communicate
+ * "git p4" learned to re-encode the pathname it uses to communicate
    with the p4 depot with a new option.
 
  * Give progress meter to "git filter-branch".
diff --git a/third_party/git/Documentation/RelNotes/2.7.1.txt b/third_party/git/Documentation/RelNotes/2.7.1.txt
index 6553d69e332c..6323feaf6497 100644
--- a/third_party/git/Documentation/RelNotes/2.7.1.txt
+++ b/third_party/git/Documentation/RelNotes/2.7.1.txt
@@ -10,7 +10,7 @@ Fixes since v2.7
    setting GIT_WORK_TREE environment themselves.
 
  * The "exclude_list" structure has the usual "alloc, nr" pair of
-   fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
+   fields to be used by ALLOC_GROW(), but clear_pattern_list() forgot
    to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
    array.
 
diff --git a/third_party/git/Documentation/RelNotes/2.7.3.txt b/third_party/git/Documentation/RelNotes/2.7.3.txt
index 6adf038915e8..f618d71efd3e 100644
--- a/third_party/git/Documentation/RelNotes/2.7.3.txt
+++ b/third_party/git/Documentation/RelNotes/2.7.3.txt
@@ -20,7 +20,7 @@ Fixes since v2.7.2
    tests.
 
  * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
-   rev, i.e. the object named by the the pathname with wildcard
+   rev, i.e. the object named by the pathname with wildcard
    characters in a tree object.
 
  * "git rev-parse --git-common-dir" used in the worktree feature
diff --git a/third_party/git/Documentation/RelNotes/2.8.0.txt b/third_party/git/Documentation/RelNotes/2.8.0.txt
index 25079710fa28..27320b6a9f37 100644
--- a/third_party/git/Documentation/RelNotes/2.8.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.8.0.txt
@@ -189,7 +189,7 @@ Performance, Internal Implementation, Development Support etc.
  * Some calls to strcpy(3) triggers a false warning from static
    analyzers that are less intelligent than humans, and reducing the
    number of these false hits helps us notice real issues.  A few
-   calls to strcpy(3) in a couple of protrams that are already safe
+   calls to strcpy(3) in a couple of programs that are already safe
    has been rewritten to avoid false warnings.
 
  * The "name_path" API was an attempt to reduce the need to construct
@@ -270,7 +270,7 @@ notes for details).
    setting GIT_WORK_TREE environment themselves.
 
  * The "exclude_list" structure has the usual "alloc, nr" pair of
-   fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
+   fields to be used by ALLOC_GROW(), but clear_pattern_list() forgot
    to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
    array.
 
diff --git a/third_party/git/Documentation/RelNotes/2.8.3.txt b/third_party/git/Documentation/RelNotes/2.8.3.txt
index fedd9968e5e3..a63825ed87e6 100644
--- a/third_party/git/Documentation/RelNotes/2.8.3.txt
+++ b/third_party/git/Documentation/RelNotes/2.8.3.txt
@@ -55,8 +55,8 @@ Fixes since v2.8.2
    This is necessary to use Git on Windows shared directories, and is
    already enabled for the MinGW and plain Windows builds.  It also
    has been used in Cygwin packaged versions of Git for quite a while.
-   See http://thread.gmane.org/gmane.comp.version-control.git/291853
-   and http://thread.gmane.org/gmane.comp.version-control.git/275680.
+   See https://lore.kernel.org/git/20160419091055.GF2345@dinwoodie.org/
+   and https://lore.kernel.org/git/20150811100527.GW14466@dinwoodie.org/.
 
  * "git replace -e" did not honour "core.editor" configuration.
 
diff --git a/third_party/git/Documentation/RelNotes/2.9.0.txt b/third_party/git/Documentation/RelNotes/2.9.0.txt
index b61d36712fa7..991640119ae6 100644
--- a/third_party/git/Documentation/RelNotes/2.9.0.txt
+++ b/third_party/git/Documentation/RelNotes/2.9.0.txt
@@ -368,7 +368,7 @@ notes for details).
    This is necessary to use Git on Windows shared directories, and is
    already enabled for the MinGW and plain Windows builds.  It also
    has been used in Cygwin packaged versions of Git for quite a while.
-   See http://thread.gmane.org/gmane.comp.version-control.git/291853
+   See https://lore.kernel.org/git/20160419091055.GF2345@dinwoodie.org/
 
  * "merge-octopus" strategy did not ensure that the index is clean
    when merge begins.
diff --git a/third_party/git/Documentation/RelNotes/2.9.3.txt b/third_party/git/Documentation/RelNotes/2.9.3.txt
index 695b86f612fa..305e08062b1b 100644
--- a/third_party/git/Documentation/RelNotes/2.9.3.txt
+++ b/third_party/git/Documentation/RelNotes/2.9.3.txt
@@ -36,7 +36,7 @@ Fixes since v2.9.2
  * One part of "git am" had an oddball helper function that called
    stuff from outside "his" as opposed to calling what we have "ours",
    which was not gender-neutral and also inconsistent with the rest of
-   the system where outside stuff is usuall called "theirs" in
+   the system where outside stuff is usually called "theirs" in
    contrast to "ours".
 
  * The test framework learned a new helper test_match_signal to
diff --git a/third_party/git/Documentation/SubmittingPatches b/third_party/git/Documentation/SubmittingPatches
index 6d589e118c17..4515cab5193d 100644
--- a/third_party/git/Documentation/SubmittingPatches
+++ b/third_party/git/Documentation/SubmittingPatches
@@ -142,19 +142,25 @@ archive, summarize the relevant points of the discussion.
 
 [[commit-reference]]
 If you want to reference a previous commit in the history of a stable
-branch, use the format "abbreviated sha1 (subject, date)",
-with the subject enclosed in a pair of double-quotes, like this:
+branch, use the format "abbreviated hash (subject, date)", like this:
 
 ....
-	Commit f86a374 ("pack-bitmap.c: fix a memleak", 2015-03-30)
+	Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30)
 	noticed that ...
 ....
 
 The "Copy commit summary" command of gitk can be used to obtain this
-format, or this invocation of `git show`:
+format (with the subject enclosed in a pair of double-quotes), or this
+invocation of `git show`:
 
 ....
-	git show -s --date=short --pretty='format:%h ("%s", %ad)' <commit>
+	git show -s --pretty=reference <commit>
+....
+
+or, on an older version of Git without support for --pretty=reference:
+
+....
+	git show -s --date=short --pretty='format:%h (%s, %ad)' <commit>
 ....
 
 [[git-tools]]
@@ -372,9 +378,9 @@ such as "Thanks-to:", "Based-on-patch-by:", or "Mentored-by:".
 Some parts of the system have dedicated maintainers with their own
 repositories.
 
-- `git-gui/` comes from git-gui project, maintained by Pat Thoyts:
+- `git-gui/` comes from git-gui project, maintained by Pratyush Yadav:
 
-	git://repo.or.cz/git-gui.git
+	https://github.com/prati0100/git-gui.git
 
 - `gitk-git/` comes from Paul Mackerras's gitk project:
 
diff --git a/third_party/git/Documentation/asciidoc.conf b/third_party/git/Documentation/asciidoc.conf
index 2c16c536ba83..8fc4b67081a6 100644
--- a/third_party/git/Documentation/asciidoc.conf
+++ b/third_party/git/Documentation/asciidoc.conf
@@ -78,9 +78,9 @@ template::[header-declarations]
 <refmeta>
 <refentrytitle>{mantitle}</refentrytitle>
 <manvolnum>{manvolnum}</manvolnum>
-<refmiscinfo class="source">Git</refmiscinfo>
-<refmiscinfo class="version">{git_version}</refmiscinfo>
-<refmiscinfo class="manual">Git Manual</refmiscinfo>
+<refmiscinfo class="source">{mansource}</refmiscinfo>
+<refmiscinfo class="version">{manversion}</refmiscinfo>
+<refmiscinfo class="manual">{manmanual}</refmiscinfo>
 </refmeta>
 <refnamediv>
   <refname>{manname}</refname>
diff --git a/third_party/git/Documentation/asciidoctor-extensions.rb b/third_party/git/Documentation/asciidoctor-extensions.rb
index 0089e0cfb80d..d906a008039c 100644
--- a/third_party/git/Documentation/asciidoctor-extensions.rb
+++ b/third_party/git/Documentation/asciidoctor-extensions.rb
@@ -9,8 +9,11 @@ module Git
       named :chrome
 
       def process(parent, target, attrs)
-        if parent.document.basebackend? 'html'
-          prefix = parent.document.attr('git-relative-html-prefix')
+        prefix = parent.document.attr('git-relative-html-prefix')
+        if parent.document.doctype == 'book'
+          "<ulink url=\"#{prefix}#{target}.html\">" \
+          "#{target}(#{attrs[1]})</ulink>"
+        elsif parent.document.basebackend? 'html'
           %(<a href="#{prefix}#{target}.html">#{target}(#{attrs[1]})</a>)
         elsif parent.document.basebackend? 'docbook'
           "<citerefentry>\n" \
@@ -20,9 +23,26 @@ module Git
         end
       end
     end
+
+    class DocumentPostProcessor < Asciidoctor::Extensions::Postprocessor
+      def process document, output
+        if document.basebackend? 'docbook'
+          mansource = document.attributes['mansource']
+          manversion = document.attributes['manversion']
+          manmanual = document.attributes['manmanual']
+          new_tags = "" \
+            "<refmiscinfo class=\"source\">#{mansource}</refmiscinfo>\n" \
+            "<refmiscinfo class=\"version\">#{manversion}</refmiscinfo>\n" \
+            "<refmiscinfo class=\"manual\">#{manmanual}</refmiscinfo>\n"
+          output = output.sub(/<\/refmeta>/, new_tags + "</refmeta>")
+        end
+        output
+      end
+    end
   end
 end
 
 Asciidoctor::Extensions.register do
   inline_macro Git::Documentation::LinkGitProcessor, :linkgit
+  postprocessor Git::Documentation::DocumentPostProcessor
 end
diff --git a/third_party/git/Documentation/config.txt b/third_party/git/Documentation/config.txt
index e3f5bc3396d0..08b13ba72be5 100644
--- a/third_party/git/Documentation/config.txt
+++ b/third_party/git/Documentation/config.txt
@@ -142,7 +142,7 @@ refer to linkgit:gitignore[5] for details. For convenience:
 
 `gitdir/i`::
 	This is the same as `gitdir` except that matching is done
-	case-insensitively (e.g. on case-insensitive file sytems)
+	case-insensitively (e.g. on case-insensitive file systems)
 
 `onbranch`::
 	The data that follows the keyword `onbranch:` is taken to be a
@@ -178,47 +178,49 @@ to either specify only the realpath version, or both versions.
 Example
 ~~~~~~~
 
-	# Core variables
-	[core]
-		; Don't trust file modes
-		filemode = false
-
-	# Our diff algorithm
-	[diff]
-		external = /usr/local/bin/diff-wrapper
-		renames = true
-
-	[branch "devel"]
-		remote = origin
-		merge = refs/heads/devel
-
-	# Proxy settings
-	[core]
-		gitProxy="ssh" for "kernel.org"
-		gitProxy=default-proxy ; for the rest
-
-	[include]
-		path = /path/to/foo.inc ; include by absolute path
-		path = foo.inc ; find "foo.inc" relative to the current file
-		path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory
-
-	; include if $GIT_DIR is /path/to/foo/.git
-	[includeIf "gitdir:/path/to/foo/.git"]
-		path = /path/to/foo.inc
-
-	; include for all repositories inside /path/to/group
-	[includeIf "gitdir:/path/to/group/"]
-		path = /path/to/foo.inc
-
-	; include for all repositories inside $HOME/to/group
-	[includeIf "gitdir:~/to/group/"]
-		path = /path/to/foo.inc
-
-	; relative paths are always relative to the including
-	; file (if the condition is true); their location is not
-	; affected by the condition
-	[includeIf "gitdir:/path/to/group/"]
-		path = foo.inc
+----
+# Core variables
+[core]
+	; Don't trust file modes
+	filemode = false
+
+# Our diff algorithm
+[diff]
+	external = /usr/local/bin/diff-wrapper
+	renames = true
+
+[branch "devel"]
+	remote = origin
+	merge = refs/heads/devel
+
+# Proxy settings
+[core]
+	gitProxy="ssh" for "kernel.org"
+	gitProxy=default-proxy ; for the rest
+
+[include]
+	path = /path/to/foo.inc ; include by absolute path
+	path = foo.inc ; find "foo.inc" relative to the current file
+	path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory
+
+; include if $GIT_DIR is /path/to/foo/.git
+[includeIf "gitdir:/path/to/foo/.git"]
+	path = /path/to/foo.inc
+
+; include for all repositories inside /path/to/group
+[includeIf "gitdir:/path/to/group/"]
+	path = /path/to/foo.inc
+
+; include for all repositories inside $HOME/to/group
+[includeIf "gitdir:~/to/group/"]
+	path = /path/to/foo.inc
+
+; relative paths are always relative to the including
+; file (if the condition is true); their location is not
+; affected by the condition
+[includeIf "gitdir:/path/to/group/"]
+	path = foo.inc
+----
 
 	; include only if we are in a worktree where foo-branch is
 	; currently checked out
@@ -261,7 +263,9 @@ color::
 +
 The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
 `blue`, `magenta`, `cyan` and `white`.  The first color given is the
-foreground; the second is the background.
+foreground; the second is the background.  All the basic colors except
+`normal` have a bright variant that can be speficied by prefixing the
+color with `bright`, like `brightred`.
 +
 Colors may also be given as numbers between 0 and 255; these use ANSI
 256-color mode (but note that not all terminals may support this).  If
@@ -345,6 +349,8 @@ include::config/difftool.txt[]
 
 include::config/fastimport.txt[]
 
+include::config/feature.txt[]
+
 include::config/fetch.txt[]
 
 include::config/format.txt[]
diff --git a/third_party/git/Documentation/config/add.txt b/third_party/git/Documentation/config/add.txt
index 4d753f006ec1..c9f748f81cb1 100644
--- a/third_party/git/Documentation/config/add.txt
+++ b/third_party/git/Documentation/config/add.txt
@@ -5,3 +5,8 @@ add.ignore-errors (deprecated)::
 	option of linkgit:git-add[1].  `add.ignore-errors` is deprecated,
 	as it does not follow the usual naming convention for configuration
 	variables.
+
+add.interactive.useBuiltin::
+	[EXPERIMENTAL] Set to `true` to use the experimental built-in
+	implementation of the interactive version of linkgit:git-add[1]
+	instead of the Perl script version. Is `false` by default.
diff --git a/third_party/git/Documentation/config/advice.txt b/third_party/git/Documentation/config/advice.txt
index 6aaa36020298..bdd37c3eaa32 100644
--- a/third_party/git/Documentation/config/advice.txt
+++ b/third_party/git/Documentation/config/advice.txt
@@ -107,4 +107,13 @@ advice.*::
 		editor input from the user.
 	nestedTag::
 		Advice shown if a user attempts to recursively tag a tag object.
+	submoduleAlternateErrorStrategyDie::
+		Advice shown when a submodule.alternateErrorStrategy option
+		configured to "die" causes a fatal error.
+	addIgnoredFile::
+		Advice shown if a user attempts to add an ignored file to
+		the index.
+	addEmptyPathspec::
+		Advice shown if a user runs the add command without providing
+		the pathspec parameter.
 --
diff --git a/third_party/git/Documentation/config/branch.txt b/third_party/git/Documentation/config/branch.txt
index a592d522a744..cc5f3249fc58 100644
--- a/third_party/git/Documentation/config/branch.txt
+++ b/third_party/git/Documentation/config/branch.txt
@@ -81,15 +81,16 @@ branch.<name>.rebase::
 	"git pull" is run. See "pull.rebase" for doing this in a non
 	branch-specific manner.
 +
-When `merges`, pass the `--rebase-merges` option to 'git rebase'
+When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
 so that the local merge commits are included in the rebase (see
 linkgit:git-rebase[1] for details).
 +
-When `preserve` (deprecated in favor of `merges`), also pass
+When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
 `--preserve-merges` along to 'git rebase' so that locally committed merge
 commits will not be flattened by running 'git pull'.
 +
-When the value is `interactive`, the rebase is run in interactive mode.
+When the value is `interactive` (or just 'i'), the rebase is run in interactive
+mode.
 +
 *NOTE*: this is a possibly dangerous operation; do *not* use
 it unless you understand the implications (see linkgit:git-rebase[1]
diff --git a/third_party/git/Documentation/config/core.txt b/third_party/git/Documentation/config/core.txt
index 75538d27e7e0..74619a9c03bb 100644
--- a/third_party/git/Documentation/config/core.txt
+++ b/third_party/git/Documentation/config/core.txt
@@ -68,6 +68,17 @@ core.fsmonitor::
 	avoiding unnecessary processing of files that have not changed.
 	See the "fsmonitor-watchman" section of linkgit:githooks[5].
 
+core.fsmonitorHookVersion::
+	Sets the version of hook that is to be used when calling fsmonitor.
+	There are currently versions 1 and 2. When this is not set,
+	version 2 will be tried first and if it fails then version 1
+	will be tried. Version 1 uses a timestamp as input to determine
+	which files have changes since that time but some monitors
+	like watchman have race conditions when used with a timestamp.
+	Version 2 uses an opaque string so that the monitor can return
+	something that can be used to determine what files have changed
+	without race conditions.
+
 core.trustctime::
 	If false, the ctime differences between the index and the
 	working tree are ignored; useful when the inode change time
@@ -86,7 +97,9 @@ core.untrackedCache::
 	it will automatically be removed, if set to `false`. Before
 	setting it to `true`, you should check that mtime is working
 	properly on your system.
-	See linkgit:git-update-index[1]. `keep` by default.
+	See linkgit:git-update-index[1]. `keep` by default, unless
+	`feature.manyFiles` is enabled which sets this setting to
+	`true` by default.
 
 core.checkStat::
 	When missing or is set to `default`, many fields in the stat
@@ -557,6 +570,12 @@ core.unsetenvvars::
 	Defaults to `PERL5LIB` to account for the fact that Git for
 	Windows insists on using its own Perl interpreter.
 
+core.restrictinheritedhandles::
+	Windows-only: override whether spawned processes inherit only standard
+	file handles (`stdin`, `stdout` and `stderr`) or all handles. Can be
+	`auto`, `true` or `false`. Defaults to `auto`, which means `true` on
+	Windows 7 and later, and `false` on older Windows versions.
+
 core.createObject::
 	You can set this to 'link', in which case a hardlink followed by
 	a delete of the source are used to make sure that object creation
@@ -577,7 +596,7 @@ the `GIT_NOTES_REF` environment variable.  See linkgit:git-notes[1].
 
 core.commitGraph::
 	If true, then git will read the commit-graph file (if it exists)
-	to parse the graph structure of commits. Defaults to false. See
+	to parse the graph structure of commits. Defaults to true. See
 	linkgit:git-commit-graph[1] for more information.
 
 core.useReplaceRefs::
@@ -591,8 +610,14 @@ core.multiPackIndex::
 	multi-pack-index design document].
 
 core.sparseCheckout::
-	Enable "sparse checkout" feature. See section "Sparse checkout" in
-	linkgit:git-read-tree[1] for more information.
+	Enable "sparse checkout" feature. See linkgit:git-sparse-checkout[1]
+	for more information.
+
+core.sparseCheckoutCone::
+	Enables the "cone mode" of the sparse checkout feature. When the
+	sparse-checkout file contains a limited set of patterns, then this
+	mode provides significant performance advantages. See
+	linkgit:git-sparse-checkout[1] for more information.
 
 core.abbrev::
 	Set the length object names are abbreviated to.  If
diff --git a/third_party/git/Documentation/config/diff.txt b/third_party/git/Documentation/config/diff.txt
index 5afb5a2cbc69..ff09f1cf737c 100644
--- a/third_party/git/Documentation/config/diff.txt
+++ b/third_party/git/Documentation/config/diff.txt
@@ -189,7 +189,7 @@ diff.guitool::
 include::../mergetools-diff.txt[]
 
 diff.indentHeuristic::
-	Set this option to `true` to enable experimental heuristics
+	Set this option to `false` to disable the default heuristics
 	that shift diff hunk boundaries to make patches easier to read.
 
 diff.algorithm::
diff --git a/third_party/git/Documentation/config/feature.txt b/third_party/git/Documentation/config/feature.txt
new file mode 100644
index 000000000000..875f8c8a66f3
--- /dev/null
+++ b/third_party/git/Documentation/config/feature.txt
@@ -0,0 +1,37 @@
+feature.*::
+	The config settings that start with `feature.` modify the defaults of
+	a group of other config settings. These groups are created by the Git
+	developer community as recommended defaults and are subject to change.
+	In particular, new config options may be added with different defaults.
+
+feature.experimental::
+	Enable config options that are new to Git, and are being considered for
+	future defaults. Config settings included here may be added or removed
+	with each release, including minor version updates. These settings may
+	have unintended interactions since they are so new. Please enable this
+	setting if you are interested in providing feedback on experimental
+	features. The new default values are:
++
+* `pack.useSparse=true` uses a new algorithm when constructing a pack-file
+which can improve `git push` performance in repos with many files.
++
+* `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by
+skipping more commits at a time, reducing the number of round trips.
++
+* `fetch.writeCommitGraph=true` writes a commit-graph after every `git fetch`
+command that downloads a pack-file from a remote. Using the `--split` option,
+most executions will create a very small commit-graph file on top of the
+existing commit-graph file(s). Occasionally, these files will merge and the
+write may take longer. Having an updated commit-graph file helps performance
+of many Git commands, including `git merge-base`, `git push -f`, and
+`git log --graph`.
+
+feature.manyFiles::
+	Enable config options that optimize for repos with many files in the
+	working directory. With many files, commands such as `git status` and
+	`git checkout` may be slow and these new defaults improve performance:
++
+* `index.version=4` enables path-prefix compression in the index.
++
+* `core.untrackedCache=true` enables the untracked cache. This setting assumes
+that mtime is working on your machine.
diff --git a/third_party/git/Documentation/config/fetch.txt b/third_party/git/Documentation/config/fetch.txt
index ba890b5884fc..f11940280fe3 100644
--- a/third_party/git/Documentation/config/fetch.txt
+++ b/third_party/git/Documentation/config/fetch.txt
@@ -59,7 +59,8 @@ fetch.negotiationAlgorithm::
 	effort to converge faster, but may result in a larger-than-necessary
 	packfile; The default is "default" which instructs Git to use the default algorithm
 	that never skips commits (unless the server has acknowledged it or one
-	of its descendants).
+	of its descendants). If `feature.experimental` is enabled, then this
+	setting defaults to "skipping".
 	Unknown values will cause 'git fetch' to error out.
 +
 See also the `--negotiation-tip` option for linkgit:git-fetch[1].
@@ -68,3 +69,23 @@ fetch.showForcedUpdates::
 	Set to false to enable `--no-show-forced-updates` in
 	linkgit:git-fetch[1] and linkgit:git-pull[1] commands.
 	Defaults to true.
+
+fetch.parallel::
+	Specifies the maximal number of fetch operations to be run in parallel
+	at a time (submodules, or remotes when the `--multiple` option of
+	linkgit:git-fetch[1] is in effect).
++
+A value of 0 will give some reasonable default. If unset, it defaults to 1.
++
+For submodules, this setting can be overridden using the `submodule.fetchJobs`
+config setting.
+
+fetch.writeCommitGraph::
+	Set to true to write a commit-graph after every `git fetch` command
+	that downloads a pack-file from a remote. Using the `--split` option,
+	most executions will create a very small commit-graph file on top of
+	the existing commit-graph file(s). Occasionally, these files will
+	merge and the write may take longer. Having an updated commit-graph
+	file helps performance of many Git commands, including `git merge-base`,
+	`git push -f`, and `git log --graph`. Defaults to false, unless
+	`feature.experimental` is true.
diff --git a/third_party/git/Documentation/config/format.txt b/third_party/git/Documentation/config/format.txt
index 414a5a8a9d7d..45c7bd5a8ff8 100644
--- a/third_party/git/Documentation/config/format.txt
+++ b/third_party/git/Documentation/config/format.txt
@@ -36,6 +36,12 @@ format.subjectPrefix::
 	The default for format-patch is to output files with the '[PATCH]'
 	subject prefix. Use this variable to change that prefix.
 
+format.coverFromDescription::
+	The default mode for format-patch to determine which parts of
+	the cover letter will be populated using the branch's
+	description. See the `--cover-from-description` option in
+	linkgit:git-format-patch[1].
+
 format.signature::
 	The default for format-patch is to output a signature containing
 	the Git version number. Use this variable to change that default.
@@ -77,10 +83,11 @@ format.coverLetter::
 	A boolean that controls whether to generate a cover-letter when
 	format-patch is invoked, but in addition can be set to "auto", to
 	generate a cover-letter only when there's more than one patch.
+	Default is false.
 
 format.outputDirectory::
 	Set a custom directory to store the resulting files instead of the
-	current working directory.
+	current working directory. All directory components will be created.
 
 format.useAutoBase::
 	A boolean value which lets you enable the `--base=auto` option of
@@ -99,4 +106,20 @@ If one wishes to use the ref `ref/notes/true`, please use that literal
 instead.
 +
 This configuration can be specified multiple times in order to allow
-multiple notes refs to be included.
+multiple notes refs to be included. In that case, it will behave
+similarly to multiple `--[no-]notes[=]` options passed in. That is, a
+value of `true` will show the default notes, a value of `<ref>` will
+also show notes from that notes ref and a value of `false` will negate
+previous configurations and not show notes.
++
+For example,
++
+------------
+[format]
+	notes = true
+	notes = foo
+	notes = false
+	notes = bar
+------------
++
+will only show notes from `refs/notes/bar`.
diff --git a/third_party/git/Documentation/config/gc.txt b/third_party/git/Documentation/config/gc.txt
index 02b92b18b5c2..00ea0a678ee2 100644
--- a/third_party/git/Documentation/config/gc.txt
+++ b/third_party/git/Documentation/config/gc.txt
@@ -63,7 +63,7 @@ gc.writeCommitGraph::
 	If true, then gc will rewrite the commit-graph file when
 	linkgit:git-gc[1] is run. When using `git gc --auto`
 	the commit-graph will be updated if housekeeping is
-	required. Default is false. See linkgit:git-commit-graph[1]
+	required. Default is true. See linkgit:git-commit-graph[1]
 	for details.
 
 gc.logExpiry::
diff --git a/third_party/git/Documentation/config/gpg.txt b/third_party/git/Documentation/config/gpg.txt
index cce2c8924598..d94025cb3684 100644
--- a/third_party/git/Documentation/config/gpg.txt
+++ b/third_party/git/Documentation/config/gpg.txt
@@ -18,3 +18,18 @@ gpg.<format>.program::
 	chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
 	be used as a legacy synonym for `gpg.openpgp.program`. The default
 	value for `gpg.x509.program` is "gpgsm".
+
+gpg.minTrustLevel::
+	Specifies a minimum trust level for signature verification.  If
+	this option is unset, then signature verification for merge
+	operations require a key with at least `marginal` trust.  Other
+	operations that perform signature verification require a key
+	with at least `undefined` trust.  Setting this option overrides
+	the required trust-level for all operations.  Supported values,
+	in increasing order of significance:
++
+* `undefined`
+* `never`
+* `marginal`
+* `fully`
+* `ultimate`
diff --git a/third_party/git/Documentation/config/http.txt b/third_party/git/Documentation/config/http.txt
index 5a32f5b0a5a9..e806033aab86 100644
--- a/third_party/git/Documentation/config/http.txt
+++ b/third_party/git/Documentation/config/http.txt
@@ -71,7 +71,7 @@ http.saveCookies::
 http.version::
 	Use the specified HTTP protocol version when communicating with a server.
 	If you want to force the default. The available and default version depend
-	on libcurl. Actually the possible values of
+	on libcurl. Currently the possible values of
 	this option are:
 
 	- HTTP/2
@@ -84,7 +84,7 @@ http.sslVersion::
 	particular configuration of the crypto library in use. Internally
 	this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl
 	documentation for more details on the format of this option and
-	for the ssl version supported. Actually the possible values of
+	for the ssl version supported. Currently the possible values of
 	this option are:
 
 	- sslv2
@@ -199,6 +199,14 @@ http.postBuffer::
 	Transfer-Encoding: chunked is used to avoid creating a
 	massive pack file locally.  Default is 1 MiB, which is
 	sufficient for most requests.
++
+Note that raising this limit is only effective for disabling chunked
+transfer encoding and therefore should be used only where the remote
+server or a proxy only supports HTTP/1.0 or is noncompliant with the
+HTTP standard.  Raising this is not, in general, an effective solution
+for most push problems, but can increase memory consumption
+significantly since the entire buffer is allocated even for small
+pushes.
 
 http.lowSpeedLimit, http.lowSpeedTime::
 	If the HTTP transfer speed is less than 'http.lowSpeedLimit'
diff --git a/third_party/git/Documentation/config/index.txt b/third_party/git/Documentation/config/index.txt
index f18150304106..7cb50b37e98d 100644
--- a/third_party/git/Documentation/config/index.txt
+++ b/third_party/git/Documentation/config/index.txt
@@ -24,3 +24,4 @@ index.threads::
 index.version::
 	Specify the version with which new index files should be
 	initialized.  This does not affect existing repositories.
+	If `feature.manyFiles` is enabled, then the default is 4.
diff --git a/third_party/git/Documentation/config/pack.txt b/third_party/git/Documentation/config/pack.txt
index 9cdcfa732478..0dac5805816f 100644
--- a/third_party/git/Documentation/config/pack.txt
+++ b/third_party/git/Documentation/config/pack.txt
@@ -27,6 +27,13 @@ Note that changing the compression level will not automatically recompress
 all existing objects. You can force recompression by passing the -F option
 to linkgit:git-repack[1].
 
+pack.allowPackReuse::
+	When true, and when reachability bitmaps are enabled,
+	pack-objects will try to send parts of the bitmapped packfile
+	verbatim. This can reduce memory and CPU usage to serve fetches,
+	but might result in sending a slightly larger pack. Defaults to
+	true.
+
 pack.island::
 	An extended regular expression configuring a set of delta
 	islands. See "DELTA ISLANDS" in linkgit:git-pack-objects[1]
@@ -112,7 +119,8 @@ pack.useSparse::
 	objects. This can have significant performance benefits when
 	computing a pack to send a small change. However, it is possible
 	that extra objects are added to the pack-file if the included
-	commits contain certain types of direct renames.
+	commits contain certain types of direct renames. Default is `false`
+	unless `feature.experimental` is enabled.
 
 pack.writeBitmaps (deprecated)::
 	This is a deprecated synonym for `repack.writeBitmaps`.
diff --git a/third_party/git/Documentation/config/protocol.txt b/third_party/git/Documentation/config/protocol.txt
index bfccc074913e..756591d77b08 100644
--- a/third_party/git/Documentation/config/protocol.txt
+++ b/third_party/git/Documentation/config/protocol.txt
@@ -45,11 +45,10 @@ The protocol names currently used by git are:
 --
 
 protocol.version::
-	Experimental. If set, clients will attempt to communicate with a
-	server using the specified protocol version.  If unset, no
-	attempt will be made by the client to communicate using a
-	particular protocol version, this results in protocol version 0
-	being used.
+	If set, clients will attempt to communicate with a server
+	using the specified protocol version.  If the server does
+	not support it, communication falls back to version 0.
+	If unset, the default is `2`.
 	Supported versions:
 +
 --
diff --git a/third_party/git/Documentation/config/pull.txt b/third_party/git/Documentation/config/pull.txt
index b87cab31b39c..540483060956 100644
--- a/third_party/git/Documentation/config/pull.txt
+++ b/third_party/git/Documentation/config/pull.txt
@@ -14,15 +14,16 @@ pull.rebase::
 	pull" is run. See "branch.<name>.rebase" for setting this on a
 	per-branch basis.
 +
-When `merges`, pass the `--rebase-merges` option to 'git rebase'
+When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
 so that the local merge commits are included in the rebase (see
 linkgit:git-rebase[1] for details).
 +
-When `preserve` (deprecated in favor of `merges`), also pass
+When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
 `--preserve-merges` along to 'git rebase' so that locally committed merge
 commits will not be flattened by running 'git pull'.
 +
-When the value is `interactive`, the rebase is run in interactive mode.
+When the value is `interactive` (or just 'i'), the rebase is run in interactive
+mode.
 +
 *NOTE*: this is a possibly dangerous operation; do *not* use
 it unless you understand the implications (see linkgit:git-rebase[1]
diff --git a/third_party/git/Documentation/config/push.txt b/third_party/git/Documentation/config/push.txt
index 0a0e000569d8..0a7aa322a9be 100644
--- a/third_party/git/Documentation/config/push.txt
+++ b/third_party/git/Documentation/config/push.txt
@@ -1,6 +1,7 @@
 push.default::
 	Defines the action `git push` should take if no refspec is
-	explicitly given.  Different values are well-suited for
+	given (whether from the command-line, config, or elsewhere).
+	Different values are well-suited for
 	specific workflows; for instance, in a purely central workflow
 	(i.e. the fetch source is equal to the push destination),
 	`upstream` is probably what you want.  Possible values are:
@@ -8,7 +9,7 @@ push.default::
 --
 
 * `nothing` - do not push anything (error out) unless a refspec is
-  explicitly given. This is primarily meant for people who want to
+  given. This is primarily meant for people who want to
   avoid mistakes by always being explicit.
 
 * `current` - push the current branch to update a branch with the same
@@ -79,7 +80,7 @@ higher priority configuration file (e.g. `.git/config` in a
 repository) to clear the values inherited from a lower priority
 configuration files (e.g. `$HOME/.gitconfig`).
 +
---
+----
 
 Example:
 
@@ -96,7 +97,7 @@ repo/.git/config
 
 This will result in only b (a and c are cleared).
 
---
+----
 
 push.recurseSubmodules::
 	Make sure all submodule commits used by the revisions to be pushed
diff --git a/third_party/git/Documentation/config/rebase.txt b/third_party/git/Documentation/config/rebase.txt
index d98e32d812e7..7f7a07d22f86 100644
--- a/third_party/git/Documentation/config/rebase.txt
+++ b/third_party/git/Documentation/config/rebase.txt
@@ -5,6 +5,12 @@ rebase.useBuiltin::
 	is always used. Setting this will emit a warning, to alert any
 	remaining users that setting this now does nothing.
 
+rebase.backend::
+	Default backend to use for rebasing.  Possible choices are
+	'apply' or 'merge'.  In the future, if the merge backend gains
+	all remaining capabilities of the apply backend, this setting
+	may become unused.
+
 rebase.stat::
 	Whether to show a diffstat of what changed upstream since the last
 	rebase. False by default.
diff --git a/third_party/git/Documentation/config/remote.txt b/third_party/git/Documentation/config/remote.txt
index 6c4cad83a2c9..a8e6437a9035 100644
--- a/third_party/git/Documentation/config/remote.txt
+++ b/third_party/git/Documentation/config/remote.txt
@@ -76,3 +76,11 @@ remote.<name>.pruneTags::
 +
 See also `remote.<name>.prune` and the PRUNING section of
 linkgit:git-fetch[1].
+
+remote.<name>.promisor::
+	When set to true, this remote will be used to fetch promisor
+	objects.
+
+remote.<name>.partialclonefilter::
+	The filter that will be applied when fetching from this
+	promisor remote.
diff --git a/third_party/git/Documentation/config/submodule.txt b/third_party/git/Documentation/config/submodule.txt
index 0a1293b05135..b33177151c5f 100644
--- a/third_party/git/Documentation/config/submodule.txt
+++ b/third_party/git/Documentation/config/submodule.txt
@@ -79,4 +79,6 @@ submodule.alternateLocation::
 submodule.alternateErrorStrategy::
 	Specifies how to treat errors with the alternates for a submodule
 	as computed via `submodule.alternateLocation`. Possible values are
-	`ignore`, `info`, `die`. Default is `die`.
+	`ignore`, `info`, `die`. Default is `die`. Note that if set to `ignore`
+	or `info`, and if there is an error with the computed alternate, the
+	clone proceeds as if no alternate was specified.
diff --git a/third_party/git/Documentation/config/tag.txt b/third_party/git/Documentation/config/tag.txt
index ef5adb3f420d..6d9110d84ce7 100644
--- a/third_party/git/Documentation/config/tag.txt
+++ b/third_party/git/Documentation/config/tag.txt
@@ -13,7 +13,7 @@ tag.gpgSign::
 	Use of this option when running in an automated script can
 	result in a large number of tags being signed. It is therefore
 	convenient to use an agent to avoid typing your gpg passphrase
-	several times. Note that this option doesn't affects tag signing
+	several times. Note that this option doesn't affect tag signing
 	behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options.
 
 tar.umask::
diff --git a/third_party/git/Documentation/config/trace2.txt b/third_party/git/Documentation/config/trace2.txt
index 2edbfb02fe5b..4ce0b9a6d17f 100644
--- a/third_party/git/Documentation/config/trace2.txt
+++ b/third_party/git/Documentation/config/trace2.txt
@@ -54,3 +54,9 @@ trace2.destinationDebug::
 	By default, these errors are suppressed and tracing is
 	silently disabled.  May be overridden by the
 	`GIT_TRACE2_DST_DEBUG` environment variable.
+
+trace2.maxFiles::
+	Integer.  When writing trace files to a target directory, do not
+	write additional traces if we would exceed this many files. Instead,
+	write a sentinel file that will block further tracing to this
+	directory. Defaults to 0, which disables this check.
diff --git a/third_party/git/Documentation/config/user.txt b/third_party/git/Documentation/config/user.txt
index 0557cbbceb81..59aec7c3aed3 100644
--- a/third_party/git/Documentation/config/user.txt
+++ b/third_party/git/Documentation/config/user.txt
@@ -13,7 +13,12 @@ committer.email::
 	Also, all of these can be overridden by the `GIT_AUTHOR_NAME`,
 	`GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,
 	`GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.
-	See linkgit:git-commit-tree[1] for more information.
++
+Note that the `name` forms of these variables conventionally refer to
+some form of a personal name.  See linkgit:git-commit[1] and the
+environment variables section of linkgit:git[1] for more information on
+these settings and the `credential.username` option if you're looking
+for authentication credentials instead.
 
 user.useConfigOnly::
 	Instruct Git to avoid trying to guess defaults for `user.email`
diff --git a/third_party/git/Documentation/diff-format.txt b/third_party/git/Documentation/diff-format.txt
index 4d846d73463c..fbbd410a8418 100644
--- a/third_party/git/Documentation/diff-format.txt
+++ b/third_party/git/Documentation/diff-format.txt
@@ -61,7 +61,7 @@ Possible status letters are:
 - R: renaming of a file
 - T: change in the type of the file
 - U: file is unmerged (you must complete the merge before it can
-be committed)
+  be committed)
 - X: "unknown" change type (most probably a bug, please report it)
 
 Status letters C and R are always followed by a score (denoting the
diff --git a/third_party/git/Documentation/diff-generate-patch.txt b/third_party/git/Documentation/diff-generate-patch.txt
index f10ca410ad8a..e8ed6470fb3a 100644
--- a/third_party/git/Documentation/diff-generate-patch.txt
+++ b/third_party/git/Documentation/diff-generate-patch.txt
@@ -1,11 +1,15 @@
-Generating patches with -p
---------------------------
-
-When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
-with a `-p` option, "git diff" without the `--raw` option, or
-"git log" with the "-p" option, they
-do not produce the output described above; instead they produce a
-patch file.  You can customize the creation of such patches via the
+Generating patch text with -p
+-----------------------------
+
+Running
+linkgit:git-diff[1],
+linkgit:git-log[1],
+linkgit:git-show[1],
+linkgit:git-diff-index[1],
+linkgit:git-diff-tree[1], or
+linkgit:git-diff-files[1]
+with the `-p` option produces patch text.
+You can customize the creation of patch text via the
 `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables.
 
 What the -p option produces is slightly different from the traditional
@@ -49,7 +53,7 @@ similarity index value of 100% is thus reserved for two equal
 files, while 100% dissimilarity means that no line from the old
 file made it into the new one.
 +
-The index line includes the SHA-1 checksum before and after the change.
+The index line includes the blob object names before and after the change.
 The <mode> is included if the file mode does not change; otherwise,
 separate lines indicate the old and the new mode.
 
@@ -70,7 +74,7 @@ separate lines indicate the old and the new mode.
       rename to a
 
 
-combined diff format
+Combined diff format
 --------------------
 
 Any diff-generating command can take the `-c` or `--cc` option to
@@ -80,7 +84,7 @@ linkgit:git-show[1]. Note also that you can give the `-m` option to any
 of these commands to force generation of diffs with individual parents
 of a merge.
 
-A 'combined diff' format looks like this:
+A "combined diff" format looks like this:
 
 ------------
 diff --combined describe.c
@@ -113,11 +117,11 @@ index fabadb8,cc95eb0..4866510
 ------------
 
 1.   It is preceded with a "git diff" header, that looks like
-     this (when `-c` option is used):
+     this (when the `-c` option is used):
 
        diff --combined file
 +
-or like this (when `--cc` option is used):
+or like this (when the `--cc` option is used):
 
        diff --cc file
 
@@ -160,7 +164,7 @@ parents.
 4.   Chunk header format is modified to prevent people from
      accidentally feeding it to `patch -p1`. Combined diff format
      was created for review of merge commit changes, and was not
-     meant for apply. The change is similar to the change in the
+     meant to be applied. The change is similar to the change in the
      extended 'index' header:
 
        @@@ <from-file-range> <from-file-range> <to-file-range> @@@
diff --git a/third_party/git/Documentation/diff-options.txt b/third_party/git/Documentation/diff-options.txt
index 09faee3b44db..bb31f0c42b3f 100644
--- a/third_party/git/Documentation/diff-options.txt
+++ b/third_party/git/Documentation/diff-options.txt
@@ -567,13 +567,13 @@ To illustrate the difference between `-S<regex> --pickaxe-regex` and
 file:
 +
 ----
-+    return !regexec(regexp, two->ptr, 1, &regmatch, 0);
++    return frotz(nitfol, two->ptr, 1, 0);
 ...
--    hit = !regexec(regexp, mf2.ptr, 1, &regmatch, 0);
+-    hit = frotz(nitfol, mf2.ptr, 1, 0);
 ----
 +
-While `git log -G"regexec\(regexp"` will show this commit, `git log
--S"regexec\(regexp" --pickaxe-regex` will not (because the number of
+While `git log -G"frotz\(nitfol"` will show this commit, `git log
+-S"frotz\(nitfol" --pickaxe-regex` will not (because the number of
 occurrences of that string did not change).
 +
 Unless `--text` is supplied patches of binary files without a textconv
diff --git a/third_party/git/Documentation/doc-diff b/third_party/git/Documentation/doc-diff
index 3355be479812..1694300e50bf 100755
--- a/third_party/git/Documentation/doc-diff
+++ b/third_party/git/Documentation/doc-diff
@@ -21,7 +21,7 @@ asciidoc		use asciidoc with both commits
 to-asciidoc		use asciidoc with the 'to'-commit
 to-asciidoctor		use asciidoctor with the 'to'-commit
 asciidoctor		use asciidoctor with both commits
-cut-header-footer	cut away header and footer
+cut-footer		cut away footer
 "
 SUBDIRECTORY_OK=1
 . "$(git --exec-path)/git-sh-setup"
@@ -31,7 +31,7 @@ force=
 clean=
 from_program=
 to_program=
-cut_header_footer=
+cut_footer=
 while test $# -gt 0
 do
 	case "$1" in
@@ -55,8 +55,8 @@ do
 	--asciidoc)
 		from_program=-asciidoc
 		to_program=-asciidoc ;;
-	--cut-header-footer)
-		cut_header_footer=-cut-header-footer ;;
+	--cut-footer)
+		cut_footer=-cut-footer ;;
 	--)
 		shift; break ;;
 	*)
@@ -118,8 +118,8 @@ construct_makemanflags () {
 from_makemanflags=$(construct_makemanflags "$from_program") &&
 to_makemanflags=$(construct_makemanflags "$to_program") &&
 
-from_dir=$from_oid$from_program$cut_header_footer &&
-to_dir=$to_oid$to_program$cut_header_footer &&
+from_dir=$from_oid$from_program$cut_footer &&
+to_dir=$to_oid$to_program$cut_footer &&
 
 # generate_render_makefile <srcdir> <dstdir>
 generate_render_makefile () {
@@ -127,7 +127,7 @@ generate_render_makefile () {
 	while read src
 	do
 		dst=$2/${src#$1/}
-		printf 'all:: %s\n' "$dst"
+		printf 'all: %s\n' "$dst"
 		printf '%s: %s\n' "$dst" "$src"
 		printf '\t@echo >&2 "  RENDER $(notdir $@)" && \\\n'
 		printf '\tmkdir -p $(dir $@) && \\\n'
@@ -169,12 +169,11 @@ render_tree () {
 		make -j$parallel -f - &&
 		mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname"
 
-		if test "$cut_header_footer" = "-cut-header-footer"
+		if test "$cut_footer" = "-cut-footer"
 		then
 			for f in $(find "$tmp/rendered/$dname" -type f)
 			do
-				tail -n +3 "$f" | head -n -2 |
-				sed -e '1{/^$/d}' -e '${/^$/d}' >"$f+" &&
+				head -n -2 "$f" | sed -e '${/^$/d}' >"$f+" &&
 				mv "$f+" "$f" ||
 				return 1
 			done
diff --git a/third_party/git/Documentation/fetch-options.txt b/third_party/git/Documentation/fetch-options.txt
index 3c9b4f9e0951..a115a1ae0e97 100644
--- a/third_party/git/Documentation/fetch-options.txt
+++ b/third_party/git/Documentation/fetch-options.txt
@@ -92,6 +92,10 @@ ifndef::git-pull[]
 	Run `git gc --auto` at the end to perform garbage collection
 	if needed. This is enabled by default.
 
+--[no-]write-commit-graph::
+	Write a commit-graph after fetching. This overrides the config
+	setting `fetch.writeCommitGraph`.
+
 -p::
 --prune::
 	Before fetching, remove any remote-tracking references that no
@@ -135,7 +139,10 @@ ifndef::git-pull[]
 	specified refspec (can be given more than once) to map the
 	refs to remote-tracking branches, instead of the values of
 	`remote.*.fetch` configuration variables for the remote
-	repository.  See section on "Configured Remote-tracking
+	repository.  Providing an empty `<refspec>` to the
+	`--refmap` option causes Git to ignore the configured
+	refspecs and rely entirely on the refspecs supplied as
+	command-line arguments. See section on "Configured Remote-tracking
 	Branches" for details.
 
 -t::
@@ -160,15 +167,27 @@ ifndef::git-pull[]
 
 -j::
 --jobs=<n>::
-	Number of parallel children to be used for fetching submodules.
-	Each will fetch from different submodules, such that fetching many
-	submodules will be faster. By default submodules will be fetched
-	one at a time.
+	Number of parallel children to be used for all forms of fetching.
++
+If the `--multiple` option was specified, the different remotes will be fetched
+in parallel. If multiple submodules are fetched, they will be fetched in
+parallel. To control them independently, use the config settings
+`fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1]).
++
+Typically, parallel recursive and multi-remote fetches will be faster. By
+default fetches are performed sequentially, not in parallel.
 
 --no-recurse-submodules::
 	Disable recursive fetching of submodules (this has the same effect as
 	using the `--recurse-submodules=no` option).
 
+--set-upstream::
+	If the remote is fetched successfully, pull and add upstream
+	(tracking) reference, used by argument-less
+	linkgit:git-pull[1] and other commands. For more information,
+	see `branch.<name>.merge` and `branch.<name>.remote` in
+	linkgit:git-config[1].
+
 --submodule-prefix=<path>::
 	Prepend <path> to paths printed in informative messages
 	such as "Fetching submodule foo".  This option is used
diff --git a/third_party/git/Documentation/git-add.txt b/third_party/git/Documentation/git-add.txt
index 8b0e4c7fa8c5..be5e3ac54b85 100644
--- a/third_party/git/Documentation/git-add.txt
+++ b/third_party/git/Documentation/git-add.txt
@@ -11,7 +11,8 @@ SYNOPSIS
 'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
 	  [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
 	  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
-	  [--chmod=(+|-)x] [--] [<pathspec>...]
+	  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
+	  [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
@@ -187,6 +188,19 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
 	bit is only changed in the index, the files on disk are left
 	unchanged.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
 \--::
 	This option can be used to separate command-line options from
 	the list of files, (useful when filenames might be mistaken
diff --git a/third_party/git/Documentation/git-am.txt b/third_party/git/Documentation/git-am.txt
index fc3b993c3338..ab5754e05d16 100644
--- a/third_party/git/Documentation/git-am.txt
+++ b/third_party/git/Documentation/git-am.txt
@@ -16,7 +16,7 @@ SYNOPSIS
 	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
 	 [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
 	 [(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort | --quit | --show-current-patch)
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
 
 DESCRIPTION
 -----------
@@ -176,9 +176,11 @@ default.   You can use `--no-utf8` to override this.
 	Abort the patching operation but keep HEAD and the index
 	untouched.
 
---show-current-patch::
-	Show the patch being applied when "git am" is stopped because
-	of conflicts.
+--show-current-patch[=(diff|raw)]::
+	Show the message at which `git am` has stopped due to
+	conflicts.  If `raw` is specified, show the raw contents of
+	the e-mail message; if `diff`, show the diff portion only.
+	Defaults to `raw`.
 
 DISCUSSION
 ----------
@@ -190,8 +192,8 @@ the commit, after stripping common prefix "[PATCH <anything>]".
 The "Subject: " line is supposed to concisely describe what the
 commit is about in one line of text.
 
-"From: " and "Subject: " lines starting the body override the respective
-commit author name and title values taken from the headers.
+"From: ", "Date: ", and "Subject: " lines starting the body override the
+respective commit author name and title values taken from the headers.
 
 The commit message is formed by the title taken from the
 "Subject: ", a blank line and the body of the message up to
diff --git a/third_party/git/Documentation/git-bisect-lk2009.txt b/third_party/git/Documentation/git-bisect-lk2009.txt
index e99925184d03..3ba49e85b7ff 100644
--- a/third_party/git/Documentation/git-bisect-lk2009.txt
+++ b/third_party/git/Documentation/git-bisect-lk2009.txt
@@ -158,7 +158,7 @@ Test suites are very nice. But when they are used alone, they are
 supposed to be used so that all the tests are checked after each
 commit. This means that they are not very efficient, because many
 tests are run for no interesting result, and they suffer from
-combinational explosion.
+combinatorial explosion.
 
 In fact the problem is that big software often has many different
 configuration options and that each test case should pass for each
@@ -1350,9 +1350,9 @@ References
 - [[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/report02-3.pdf['The Economic Impacts of Inadequate Infratructure for Software Testing'.  Nist Planning Report 02-3], see Executive Summary and Chapter 8.
 - [[[2]]] http://www.oracle.com/technetwork/java/codeconvtoc-136057.html['Code Conventions for the Java Programming Language'. Sun Microsystems.]
 - [[[3]]] https://en.wikipedia.org/wiki/Software_maintenance['Software maintenance'. Wikipedia.]
-- [[[4]]] https://public-inbox.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox.net/[Junio C Hamano. 'Automated bisect success story'.]
+- [[[4]]] https://lore.kernel.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox.net/[Junio C Hamano. 'Automated bisect success story'.]
 - [[[5]]] https://lwn.net/Articles/317154/[Christian Couder. 'Fully automated bisecting with "git bisect run"'. LWN.net.]
 - [[[6]]] https://lwn.net/Articles/277872/[Jonathan Corbet. 'Bisection divides users and developers'. LWN.net.]
-- [[[7]]] http://marc.info/?l=linux-kernel&m=119702753411680&w=2[Ingo Molnar. 'Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha'. Linux-kernel mailing list.]
+- [[[7]]] https://lore.kernel.org/lkml/20071207113734.GA14598@elte.hu/[Ingo Molnar. 'Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha'. Linux-kernel mailing list.]
 - [[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html[Junio C Hamano and the git-list. 'git-bisect(1) Manual Page'. Linux Kernel Archives.]
 - [[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]
diff --git a/third_party/git/Documentation/git-bisect.txt b/third_party/git/Documentation/git-bisect.txt
index 4b45d837a7e7..7586c5a8437e 100644
--- a/third_party/git/Documentation/git-bisect.txt
+++ b/third_party/git/Documentation/git-bisect.txt
@@ -413,7 +413,7 @@ $ cat ~/test.sh
 
 # tweak the working tree by merging the hot-fix branch
 # and then attempt a build
-if	git merge --no-commit hot-fix &&
+if	git merge --no-commit --no-ff hot-fix &&
 	make
 then
 	# run project specific test and report its status
diff --git a/third_party/git/Documentation/git-bundle.txt b/third_party/git/Documentation/git-bundle.txt
index 7d6c9dcd177b..d34b0964be17 100644
--- a/third_party/git/Documentation/git-bundle.txt
+++ b/third_party/git/Documentation/git-bundle.txt
@@ -9,8 +9,8 @@ git-bundle - Move objects and refs by archive
 SYNOPSIS
 --------
 [verse]
-'git bundle' create <file> <git-rev-list-args>
-'git bundle' verify <file>
+'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <file> <git-rev-list-args>
+'git bundle' verify [-q | --quiet] <file>
 'git bundle' list-heads <file> [<refname>...]
 'git bundle' unbundle <file> [<refname>...]
 
@@ -20,11 +20,14 @@ DESCRIPTION
 Some workflows require that one or more branches of development on one
 machine be replicated on another machine, but the two machines cannot
 be directly connected, and therefore the interactive Git protocols (git,
-ssh, http) cannot be used.  This command provides support for
-'git fetch' and 'git pull' to operate by packaging objects and references
-in an archive at the originating machine, then importing those into
-another repository using 'git fetch' and 'git pull'
-after moving the archive by some means (e.g., by sneakernet).  As no
+ssh, http) cannot be used.
+
+The 'git bundle' command packages objects and references in an archive
+at the originating machine, which can then be imported into another
+repository using 'git fetch', 'git pull', or 'git clone',
+after moving the archive by some means (e.g., by sneakernet).
+
+As no
 direct connection between the repositories exists, the user must specify a
 basis for the bundle that is held by the destination repository: the
 bundle assumes that all objects in the basis are already in the
@@ -33,9 +36,11 @@ destination repository.
 OPTIONS
 -------
 
-create <file>::
+create [options] <file> <git-rev-list-args>::
 	Used to create a bundle named 'file'.  This requires the
-	'git-rev-list-args' arguments to define the bundle contents.
+	'<git-rev-list-args>' arguments to define the bundle contents.
+	'options' contains the options specific to the 'git bundle create'
+	subcommand.
 
 verify <file>::
 	Used to check that a bundle file is valid and will apply
@@ -75,6 +80,33 @@ unbundle <file>::
 	necessarily everything in the pack (in this case, 'git bundle' acts
 	like 'git fetch-pack').
 
+--progress::
+	Progress status is reported on the standard error stream
+	by default when it is attached to a terminal, unless -q
+	is specified. This flag forces progress status even if
+	the standard error stream is not directed to a terminal.
+
+--all-progress::
+	When --stdout is specified then progress report is
+	displayed during the object count and compression phases
+	but inhibited during the write-out phase. The reason is
+	that in some cases the output stream is directly linked
+	to another command which may wish to display progress
+	status of its own as it processes incoming pack data.
+	This flag is like --progress except that it forces progress
+	report for the write-out phase as well even if --stdout is
+	used.
+
+--all-progress-implied::
+	This is used to imply --all-progress whenever progress display
+	is activated.  Unlike --all-progress this flag doesn't actually
+	force any progress display by itself.
+
+-q::
+--quiet::
+	This flag makes the command not to report its progress
+	on the standard error stream.
+
 SPECIFYING REFERENCES
 ---------------------
 
@@ -92,6 +124,14 @@ It is okay to err on the side of caution, causing the bundle file
 to contain objects already in the destination, as these are ignored
 when unpacking at the destination.
 
+`git clone` can use any bundle created without negative refspecs
+(e.g., `new`, but not `old..new`).
+If you want to match `git clone --mirror`, which would include your
+refs such as `refs/remotes/*`, use `--all`.
+If you want to provide the same set of refs that a clone directly
+from the source repository would get, use `--branches --tags` for
+the `<git-rev-list-args>`.
+
 EXAMPLES
 --------
 
diff --git a/third_party/git/Documentation/git-check-attr.txt b/third_party/git/Documentation/git-check-attr.txt
index 3c0578217ba7..84f41a8e8259 100644
--- a/third_party/git/Documentation/git-check-attr.txt
+++ b/third_party/git/Documentation/git-check-attr.txt
@@ -32,7 +32,7 @@ OPTIONS
 	instead of from the command-line.
 
 -z::
-	The output format is modified to be machine-parseable.
+	The output format is modified to be machine-parsable.
 	If `--stdin` is also given, input paths are separated
 	with a NUL character instead of a linefeed character.
 
diff --git a/third_party/git/Documentation/git-check-ignore.txt b/third_party/git/Documentation/git-check-ignore.txt
index 8b42cb3fb20a..0c3924a63d2f 100644
--- a/third_party/git/Documentation/git-check-ignore.txt
+++ b/third_party/git/Documentation/git-check-ignore.txt
@@ -30,16 +30,22 @@ OPTIONS
 	valid with a single pathname.
 
 -v, --verbose::
-	Also output details about the matching pattern (if any)
-	for each given pathname. For precedence rules within and
-	between exclude sources, see linkgit:gitignore[5].
+	Instead of printing the paths that are excluded, for each path
+	that matches an exclude pattern, print the exclude pattern
+	together with the path.  (Matching an exclude pattern usually
+	means the path is excluded, but if the pattern begins with '!'
+	then it is a negated pattern and matching it means the path is
+	NOT excluded.)
++
+For precedence rules within and between exclude sources, see
+linkgit:gitignore[5].
 
 --stdin::
 	Read pathnames from the standard input, one per line,
 	instead of from the command-line.
 
 -z::
-	The output format is modified to be machine-parseable (see
+	The output format is modified to be machine-parsable (see
 	below).  If `--stdin` is also given, input paths are separated
 	with a NUL character instead of a linefeed character.
 
diff --git a/third_party/git/Documentation/git-checkout.txt b/third_party/git/Documentation/git-checkout.txt
index cf3cac0a2b51..c8fb995fa74e 100644
--- a/third_party/git/Documentation/git-checkout.txt
+++ b/third_party/git/Documentation/git-checkout.txt
@@ -12,14 +12,14 @@ SYNOPSIS
 'git checkout' [-q] [-f] [-m] --detach [<branch>]
 'git checkout' [-q] [-f] [-m] [--detach] <commit>
 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
-'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
-'git checkout' [<tree-ish>] [--] <pathspec>...
-'git checkout' (-p|--patch) [<tree-ish>] [--] [<paths>...]
+'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...
+'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]
+'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
 Updates files in the working tree to match the version in the index
-or the specified tree.  If no paths are given, 'git checkout' will
+or the specified tree.  If no pathspec was given, 'git checkout' will
 also update `HEAD` to set the specified branch as the current
 branch.
 
@@ -79,13 +79,14 @@ be used to detach `HEAD` at the tip of the branch (`git checkout
 +
 Omitting `<branch>` detaches `HEAD` at the tip of the current branch.
 
-'git checkout' [<tree-ish>] [--] <pathspec>...::
+'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...::
+'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]::
 
-	Overwrite paths in the working tree by replacing with the
-	contents in the index or in the `<tree-ish>` (most often a
-	commit).  When a `<tree-ish>` is given, the paths that
-	match the `<pathspec>` are updated both in the index and in
-	the working tree.
+	Overwrite the contents of the files that match the pathspec.
+	When the `<tree-ish>` (most often a commit) is not given,
+	overwrite working tree with the contents in the index.
+	When the `<tree-ish>` is given, overwrite both the index and
+	the working tree with the contents at the `<tree-ish>`.
 +
 The index may contain unmerged entries because of a previous failed merge.
 By default, if you try to check out such an entry from the index, the
@@ -96,12 +97,10 @@ using `--ours` or `--theirs`.  With `-m`, changes made to the working tree
 file can be discarded to re-create the original conflicted merge result.
 
 'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]::
-	This is similar to the "check out paths to the working tree
-	from either the index or from a tree-ish" mode described
-	above, but lets you use the interactive interface to show
-	the "diff" output and choose which hunks to use in the
-	result.  See below for the description of `--patch` option.
-
+	This is similar to the previous mode, but lets you use the
+	interactive interface to show the "diff" output and choose which
+	hunks to use in the result.  See below for the description of
+	`--patch` option.
 
 OPTIONS
 -------
@@ -309,6 +308,19 @@ Note that this option uses the no overlay mode by default (see also
 	working tree, but not in `<tree-ish>` are removed, to make them
 	match `<tree-ish>` exactly.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
 <branch>::
 	Branch to checkout; if it refers to a branch (i.e., a name that,
 	when prepended with "refs/heads/", is a valid ref), then that
@@ -339,7 +351,13 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 	Tree to checkout from (when paths are given). If not specified,
 	the index will be used.
 
+\--::
+	Do not interpret any more arguments as options.
 
+<pathspec>...::
+	Limits the paths affected by the operation.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 
 DETACHED HEAD
 -------------
diff --git a/third_party/git/Documentation/git-clean.txt b/third_party/git/Documentation/git-clean.txt
index 0028ff12d1da..a7f309dff5a3 100644
--- a/third_party/git/Documentation/git-clean.txt
+++ b/third_party/git/Documentation/git-clean.txt
@@ -26,18 +26,20 @@ are affected.
 OPTIONS
 -------
 -d::
-	Remove untracked directories in addition to untracked files.
-	If an untracked directory is managed by a different Git
-	repository, it is not removed by default.  Use -f option twice
-	if you really want to remove such a directory.
+	Normally, when no <path> is specified, git clean will not
+	recurse into untracked directories to avoid removing too much.
+	Specify -d to have it recurse into such directories as well.
+	If any paths are specified, -d is irrelevant; all untracked
+	files matching the specified paths (with exceptions for nested
+	git directories mentioned under `--force`) will be removed.
 
 -f::
 --force::
 	If the Git configuration variable clean.requireForce is not set
 	to false, 'git clean' will refuse to delete files or directories
-	unless given -f, -n or -i. Git will refuse to delete directories
-	with .git sub directory or file unless a second -f
-	is given.
+	unless given -f or -i.  Git will refuse to modify untracked
+	nested git repositories (directories with a .git subdirectory)
+	unless a second -f is given.
 
 -i::
 --interactive::
diff --git a/third_party/git/Documentation/git-clone.txt b/third_party/git/Documentation/git-clone.txt
index 34011c2940ad..bf24f1813adc 100644
--- a/third_party/git/Documentation/git-clone.txt
+++ b/third_party/git/Documentation/git-clone.txt
@@ -15,7 +15,7 @@ SYNOPSIS
 	  [--dissociate] [--separate-git-dir <git dir>]
 	  [--depth <depth>] [--[no-]single-branch] [--no-tags]
 	  [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
-	  [--[no-]remote-submodules] [--jobs <n>] [--] <repository>
+	  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <repository>
 	  [<directory>]
 
 DESCRIPTION
@@ -156,6 +156,12 @@ objects from the source repository into a pack in the cloned repository.
 	used, neither remote-tracking branches nor the related
 	configuration variables are created.
 
+--sparse::
+	Initialize the sparse-checkout file so the working
+	directory starts with only the files in the root
+	of the repository. The sparse-checkout file can be
+	modified to grow the working directory as needed.
+
 --mirror::
 	Set up a mirror of the source repository.  This implies `--bare`.
 	Compared to `--bare`, `--mirror` not only maps local branches of the
@@ -262,9 +268,9 @@ or `--mirror` is given)
 	All submodules which are cloned will be shallow with a depth of 1.
 
 --[no-]remote-submodules::
-	All submodules which are cloned will use the status of the submoduleโ€™s
+	All submodules which are cloned will use the status of the submodule's
 	remote-tracking branch to update the submodule, rather than the
-	superprojectโ€™s recorded SHA-1. Equivalent to passing `--remote` to
+	superproject's recorded SHA-1. Equivalent to passing `--remote` to
 	`git submodule update`.
 
 --separate-git-dir=<git dir>::
diff --git a/third_party/git/Documentation/git-commit-graph.txt b/third_party/git/Documentation/git-commit-graph.txt
index eb5e7865f0ef..28d1fee50530 100644
--- a/third_party/git/Documentation/git-commit-graph.txt
+++ b/third_party/git/Documentation/git-commit-graph.txt
@@ -9,9 +9,8 @@ git-commit-graph - Write and verify Git commit-graph files
 SYNOPSIS
 --------
 [verse]
-'git commit-graph read' [--object-dir <dir>]
-'git commit-graph verify' [--object-dir <dir>] [--shallow]
-'git commit-graph write' <options> [--object-dir <dir>]
+'git commit-graph verify' [--object-dir <dir>] [--shallow] [--[no-]progress]
+'git commit-graph write' <options> [--object-dir <dir>] [--[no-]progress]
 
 
 DESCRIPTION
@@ -27,8 +26,14 @@ OPTIONS
 	file. This parameter exists to specify the location of an alternate
 	that only has the objects directory, not a full `.git` directory. The
 	commit-graph file is expected to be in the `<dir>/info` directory and
-	the packfiles are expected to be in `<dir>/pack`.
+	the packfiles are expected to be in `<dir>/pack`. If the directory
+	could not be made into an absolute path, or does not match any known
+	object directory, `git commit-graph ...` will exit with non-zero
+	status.
 
+--[no-]progress::
+	Turn progress on/off explicitly. If neither is specified, progress is
+	shown if standard error is connected to a terminal.
 
 COMMANDS
 --------
@@ -71,11 +76,6 @@ Finally, if `--expire-time=<datetime>` is not specified, let `datetime`
 be the current time. After writing the split commit-graph, delete all
 unused commit-graph whose modified times are older than `datetime`.
 
-'read'::
-
-Read the commit-graph file and output basic details about it.
-Used for debugging purposes.
-
 'verify'::
 
 Read the commit-graph file and verify its contents against the object
@@ -115,12 +115,6 @@ $ git show-ref -s | git commit-graph write --stdin-commits
 $ git rev-parse HEAD | git commit-graph write --stdin-commits --append
 ------------------------------------------------
 
-* Read basic information from the commit-graph file.
-+
-------------------------------------------------
-$ git commit-graph read
-------------------------------------------------
-
 
 GIT
 ---
diff --git a/third_party/git/Documentation/git-commit-tree.txt b/third_party/git/Documentation/git-commit-tree.txt
index 4b90b9c12a4a..ec15ee8d6fad 100644
--- a/third_party/git/Documentation/git-commit-tree.txt
+++ b/third_party/git/Documentation/git-commit-tree.txt
@@ -69,7 +69,6 @@ OPTIONS
 	Do not GPG-sign commit, to countermand a `--gpg-sign` option
 	given earlier on the command line.
 
-
 Commit Information
 ------------------
 
@@ -79,26 +78,6 @@ A commit encapsulates:
 - author name, email and date
 - committer name and email and the commit time.
 
-While parent object ids are provided on the command line, author and
-committer information is taken from the following environment variables,
-if set:
-
-	GIT_AUTHOR_NAME
-	GIT_AUTHOR_EMAIL
-	GIT_AUTHOR_DATE
-	GIT_COMMITTER_NAME
-	GIT_COMMITTER_EMAIL
-	GIT_COMMITTER_DATE
-
-(nb "<", ">" and "\n"s are stripped)
-
-In case (some of) these environment variables are not set, the information
-is taken from the configuration items user.name and user.email, or, if not
-present, the environment variable EMAIL, or, if that is not set,
-system user name and the hostname used for outgoing mail (taken
-from `/etc/mailname` and falling back to the fully qualified hostname when
-that file does not exist).
-
 A commit comment is read from stdin. If a changelog
 entry is not provided via "<" redirection, 'git commit-tree' will just wait
 for one to be entered and terminated with ^D.
@@ -117,6 +96,7 @@ FILES
 SEE ALSO
 --------
 linkgit:git-write-tree[1]
+linkgit:git-commit[1]
 
 GIT
 ---
diff --git a/third_party/git/Documentation/git-commit.txt b/third_party/git/Documentation/git-commit.txt
index 76281932847b..13f653989f32 100644
--- a/third_party/git/Documentation/git-commit.txt
+++ b/third_party/git/Documentation/git-commit.txt
@@ -13,7 +13,8 @@ SYNOPSIS
 	   [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
 	   [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
 	   [--date=<date>] [--cleanup=<mode>] [--[no-]status]
-	   [-i | -o] [-S[<keyid>]] [--] [<file>...]
+	   [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]
+	   [-S[<keyid>]] [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
@@ -278,22 +279,37 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
 	already been staged. If used together with `--allow-empty`
 	paths are also not required, and an empty commit will be created.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
 -u[<mode>]::
 --untracked-files[=<mode>]::
 	Show untracked files.
 +
+--
 The mode parameter is optional (defaults to 'all'), and is used to
 specify the handling of untracked files; when -u is not used, the
 default is 'normal', i.e. show untracked files and directories.
-+
+
 The possible options are:
-+
+
 	- 'no'     - Show no untracked files
 	- 'normal' - Shows untracked files and directories
 	- 'all'    - Also shows individual files in untracked directories.
-+
+
 The default can be changed using the status.showUntrackedFiles
 configuration variable documented in linkgit:git-config[1].
+--
 
 -v::
 --verbose::
@@ -343,15 +359,13 @@ changes to tracked files.
 \--::
 	Do not interpret any more arguments as options.
 
-<file>...::
-	When files are given on the command line, the command
-	commits the contents of the named files, without
-	recording the changes already staged.  The contents of
-	these files are also staged for the next commit on top
-	of what have been staged before.
-
-:git-commit: 1
-include::date-formats.txt[]
+<pathspec>...::
+	When pathspec is given on the command line, commit the contents of
+	the files that match the pathspec without recording the changes
+	already added to the index. The contents of these files are also
+	staged for the next commit on top of what have been staged before.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 
 EXAMPLES
 --------
@@ -446,6 +460,43 @@ alter the order the changes are committed, because the merge
 should be recorded as a single commit.  In fact, the command
 refuses to run when given pathnames (but see `-i` option).
 
+COMMIT INFORMATION
+------------------
+
+Author and committer information is taken from the following environment
+variables, if set:
+
+	GIT_AUTHOR_NAME
+	GIT_AUTHOR_EMAIL
+	GIT_AUTHOR_DATE
+	GIT_COMMITTER_NAME
+	GIT_COMMITTER_EMAIL
+	GIT_COMMITTER_DATE
+
+(nb "<", ">" and "\n"s are stripped)
+
+The author and committer names are by convention some form of a personal name
+(that is, the name by which other humans refer to you), although Git does not
+enforce or require any particular form. Arbitrary Unicode may be used, subject
+to the constraints listed above. This name has no effect on authentication; for
+that, see the `credential.username` variable in linkgit:git-config[1].
+
+In case (some of) these environment variables are not set, the information
+is taken from the configuration items `user.name` and `user.email`, or, if not
+present, the environment variable EMAIL, or, if that is not set,
+system user name and the hostname used for outgoing mail (taken
+from `/etc/mailname` and falling back to the fully qualified hostname when
+that file does not exist).
+
+The `author.name` and `committer.name` and their corresponding email options
+override `user.name` and `user.email` if set and are overridden themselves by
+the environment variables.
+
+The typical usage is to set just the `user.name` and `user.email` variables;
+the other options are provided for more complex use cases.
+
+:git-commit: 1
+include::date-formats.txt[]
 
 DISCUSSION
 ----------
diff --git a/third_party/git/Documentation/git-config.txt b/third_party/git/Documentation/git-config.txt
index ff9310f9588a..7573160f2153 100644
--- a/third_party/git/Documentation/git-config.txt
+++ b/third_party/git/Documentation/git-config.txt
@@ -9,18 +9,18 @@ git-config - Get and set repository or global options
 SYNOPSIS
 --------
 [verse]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]
 'git config' [<file-option>] [--type=<type>] --add name value
 'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]
 'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL
 'git config' [<file-option>] --unset name [value_regex]
 'git config' [<file-option>] --unset-all name [value_regex]
 'git config' [<file-option>] --rename-section old_name new_name
 'git config' [<file-option>] --remove-section name
-'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list
+'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
 'git config' [<file-option>] --get-color name [default]
 'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
 'git config' [<file-option>] -e | --edit
@@ -222,6 +222,11 @@ Valid `<type>`'s include:
 	the actual origin (config file path, ref, or blob id if
 	applicable).
 
+--show-scope::
+	Similar to `--show-origin` in that it augments the output of
+	all queried config options with the scope of that value
+	(local, global, system, command).
+
 --get-colorbool name [stdout-is-tty]::
 
 	Find the color setting for `name` (e.g. `color.diff`) and output
@@ -339,33 +344,35 @@ EXAMPLES
 
 Given a .git/config like this:
 
-	#
-	# This is the config file, and
-	# a '#' or ';' character indicates
-	# a comment
-	#
-
-	; core variables
-	[core]
-		; Don't trust file modes
-		filemode = false
-
-	; Our diff algorithm
-	[diff]
-		external = /usr/local/bin/diff-wrapper
-		renames = true
-
-	; Proxy settings
-	[core]
-		gitproxy=proxy-command for kernel.org
-		gitproxy=default-proxy ; for all the rest
-
-	; HTTP
-	[http]
-		sslVerify
-	[http "https://weak.example.com"]
-		sslVerify = false
-		cookieFile = /tmp/cookie.txt
+------------
+#
+# This is the config file, and
+# a '#' or ';' character indicates
+# a comment
+#
+
+; core variables
+[core]
+	; Don't trust file modes
+	filemode = false
+
+; Our diff algorithm
+[diff]
+	external = /usr/local/bin/diff-wrapper
+	renames = true
+
+; Proxy settings
+[core]
+	gitproxy=proxy-command for kernel.org
+	gitproxy=default-proxy ; for all the rest
+
+; HTTP
+[http]
+	sslVerify
+[http "https://weak.example.com"]
+	sslVerify = false
+	cookieFile = /tmp/cookie.txt
+------------
 
 you can set the filemode to true with
 
diff --git a/third_party/git/Documentation/git-credential.txt b/third_party/git/Documentation/git-credential.txt
index b21144037311..6f0c7ca80f73 100644
--- a/third_party/git/Documentation/git-credential.txt
+++ b/third_party/git/Documentation/git-credential.txt
@@ -19,8 +19,7 @@ from system-specific helpers, as well as prompting the user for
 usernames and passwords. The git-credential command exposes this
 interface to scripts which may want to retrieve, store, or prompt for
 credentials in the same manner as Git. The design of this scriptable
-interface models the internal C API; see
-link:technical/api-credentials.html[the Git credential API] for more
+interface models the internal C API; see credential.h for more
 background on the concepts.
 
 git-credential takes an "action" option on the command-line (one of
diff --git a/third_party/git/Documentation/git-cvsserver.txt b/third_party/git/Documentation/git-cvsserver.txt
index 79e22b1f3a13..1b1c71ad9d26 100644
--- a/third_party/git/Documentation/git-cvsserver.txt
+++ b/third_party/git/Documentation/git-cvsserver.txt
@@ -294,7 +294,7 @@ In `dbDriver` and `dbUser` you can use the following variables:
 	Git directory name
 %g::
 	Git directory name, where all characters except for
-	alpha-numeric ones, `.`, and `-` are replaced with
+	alphanumeric ones, `.`, and `-` are replaced with
 	`_` (this should make it easier to use the directory
 	name in a filename if wanted)
 %m::
diff --git a/third_party/git/Documentation/git-diff.txt b/third_party/git/Documentation/git-diff.txt
index 72179d993cb9..37781cf17554 100644
--- a/third_party/git/Documentation/git-diff.txt
+++ b/third_party/git/Documentation/git-diff.txt
@@ -36,7 +36,7 @@ two blob objects, or changes between two files on disk.
 	running the command in a working tree controlled by Git and
 	at least one of the paths points outside the working tree,
 	or when running the command outside a working tree
-	controlled by Git.
+	controlled by Git. This form implies `--exit-code`.
 
 'git diff' [<options>] --cached [<commit>] [--] [<path>...]::
 
diff --git a/third_party/git/Documentation/git-fast-export.txt b/third_party/git/Documentation/git-fast-export.txt
index cc940eb9ada3..e8950de3ba40 100644
--- a/third_party/git/Documentation/git-fast-export.txt
+++ b/third_party/git/Documentation/git-fast-export.txt
@@ -17,9 +17,9 @@ This program dumps the given revisions in a form suitable to be piped
 into 'git fast-import'.
 
 You can use it as a human-readable bundle replacement (see
-linkgit:git-bundle[1]), or as a kind of an interactive
-'git filter-branch'.
-
+linkgit:git-bundle[1]), or as a format that can be edited before being
+fed to 'git fast-import' in order to do history rewrites (an ability
+relied on by tools like 'git filter-repo').
 
 OPTIONS
 -------
@@ -75,11 +75,20 @@ produced incorrect results if you gave these options.
 	Before processing any input, load the marks specified in
 	<file>.  The input file must exist, must be readable, and
 	must use the same format as produced by --export-marks.
+
+--mark-tags::
+	In addition to labelling blobs and commits with mark ids, also
+	label tags.  This is useful in conjunction with
+	`--export-marks` and `--import-marks`, and is also useful (and
+	necessary) for exporting of nested tags.  It does not hurt
+	other cases and would be the default, but many fast-import
+	frontends are not prepared to accept tags with mark
+	identifiers.
 +
-Any commits that have already been marked will not be exported again.
-If the backend uses a similar --import-marks file, this allows for
-incremental bidirectional exporting of the repository by keeping the
-marks the same across runs.
+Any commits (or tags) that have already been marked will not be
+exported again.  If the backend uses a similar --import-marks file,
+this allows for incremental bidirectional exporting of the repository
+by keeping the marks the same across runs.
 
 --fake-missing-tagger::
 	Some old repositories have tags without a tagger.  The
@@ -133,7 +142,7 @@ marks the same across runs.
 	Specify how to handle `encoding` header in commit objects.  When
 	asking to 'abort' (which is the default), this program will die
 	when encountering such a commit object.  With 'yes', the commit
-	message will be reencoded into UTF-8.  With 'no', the original
+	message will be re-encoded into UTF-8.  With 'no', the original
 	encoding will be preserved.
 
 --refspec::
diff --git a/third_party/git/Documentation/git-fast-import.txt b/third_party/git/Documentation/git-fast-import.txt
index fad327aecc1b..7889f9594054 100644
--- a/third_party/git/Documentation/git-fast-import.txt
+++ b/third_party/git/Documentation/git-fast-import.txt
@@ -51,6 +51,21 @@ OPTIONS
 	memory used by fast-import during this run.  Showing this output
 	is currently the default, but can be disabled with --quiet.
 
+--allow-unsafe-features::
+	Many command-line options can be provided as part of the
+	fast-import stream itself by using the `feature` or `option`
+	commands. However, some of these options are unsafe (e.g.,
+	allowing fast-import to access the filesystem outside of the
+	repository). These options are disabled by default, but can be
+	allowed by providing this option on the command line.  This
+	currently impacts only the `export-marks`, `import-marks`, and
+	`import-marks-if-exists` feature commands.
++
+	Only enable this option if you trust the program generating the
+	fast-import stream! This option is enabled automatically for
+	remote-helpers that use the `import` capability, as they are
+	already trusted to run their own code.
+
 Options for Frontends
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -337,6 +352,13 @@ and control the current import process.  More detailed discussion
 	`commit` command.  This command is optional and is not
 	needed to perform an import.
 
+`alias`::
+	Record that a mark refers to a given object without first
+	creating any new object.  Using --import-marks and referring
+	to missing marks will cause fast-import to fail, so aliases
+	can provide a way to set otherwise pruned commits to a valid
+	value (e.g. the nearest non-pruned ancestor).
+
 `checkpoint`::
 	Forces fast-import to close the current packfile, generate its
 	unique SHA-1 checksum and index, and start a new packfile.
@@ -391,7 +413,7 @@ change to the project.
 	('encoding' SP <encoding>)?
 	data
 	('from' SP <commit-ish> LF)?
-	('merge' SP <commit-ish> LF)?
+	('merge' SP <commit-ish> LF)*
 	(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
 	LF?
 ....
@@ -774,6 +796,7 @@ lightweight (non-annotated) tags see the `reset` command below.
 
 ....
 	'tag' SP <name> LF
+	mark?
 	'from' SP <commit-ish> LF
 	original-oid?
 	'tagger' (SP <name>)? SP LT <email> GT SP <when> LF
@@ -913,6 +936,21 @@ a data chunk which does not have an LF as its last byte.
 +
 The `LF` after `<delim> LF` is optional (it used to be required).
 
+`alias`
+~~~~~~~
+Record that a mark refers to a given object without first creating any
+new object.
+
+....
+	'alias' LF
+	mark
+	'to' SP <commit-ish> LF
+	LF?
+....
+
+For a detailed description of `<commit-ish>` see above under `from`.
+
+
 `checkpoint`
 ~~~~~~~~~~~~
 Forces fast-import to close the current packfile, start a new one, and to
diff --git a/third_party/git/Documentation/git-filter-branch.txt b/third_party/git/Documentation/git-filter-branch.txt
index 6b53dd7e06a2..40ba4aa3e65b 100644
--- a/third_party/git/Documentation/git-filter-branch.txt
+++ b/third_party/git/Documentation/git-filter-branch.txt
@@ -16,6 +16,19 @@ SYNOPSIS
 	[--original <namespace>] [-d <directory>] [-f | --force]
 	[--state-branch <branch>] [--] [<rev-list options>...]
 
+WARNING
+-------
+'git filter-branch' has a plethora of pitfalls that can produce non-obvious
+manglings of the intended history rewrite (and can leave you with little
+time to investigate such problems since it has such abysmal performance).
+These safety and performance issues cannot be backward compatibly fixed and
+as such, its use is not recommended.  Please use an alternative history
+filtering tool such as https://github.com/newren/git-filter-repo/[git
+filter-repo].  If you still need to use 'git filter-branch', please
+carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land
+mines of filter-branch, and then vigilantly avoid as many of the hazards
+listed there as reasonably possible.
+
 DESCRIPTION
 -----------
 Lets you rewrite Git revision history by rewriting the branches mentioned
@@ -445,36 +458,245 @@ warned.
   (or if your git-gc is not new enough to support arguments to
   `--prune`, use `git repack -ad; git prune` instead).
 
-NOTES
------
-
-git-filter-branch allows you to make complex shell-scripted rewrites
-of your Git history, but you probably don't need this flexibility if
-you're simply _removing unwanted data_ like large files or passwords.
-For those operations you may want to consider
-http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner],
-a JVM-based alternative to git-filter-branch, typically at least
-10-50x faster for those use-cases, and with quite different
-characteristics:
-
-* Any particular version of a file is cleaned exactly _once_. The BFG,
-  unlike git-filter-branch, does not give you the opportunity to
-  handle a file differently based on where or when it was committed
-  within your history. This constraint gives the core performance
-  benefit of The BFG, and is well-suited to the task of cleansing bad
-  data - you don't care _where_ the bad data is, you just want it
-  _gone_.
-
-* By default The BFG takes full advantage of multi-core machines,
-  cleansing commit file-trees in parallel. git-filter-branch cleans
-  commits sequentially (i.e. in a single-threaded manner), though it
-  _is_ possible to write filters that include their own parallelism,
-  in the scripts executed against each commit.
-
-* The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options]
-  are much more restrictive than git-filter branch, and dedicated just
-  to the tasks of removing unwanted data- e.g:
-  `--strip-blobs-bigger-than 1M`.
+[[PERFORMANCE]]
+PERFORMANCE
+-----------
+
+The performance of git-filter-branch is glacially slow; its design makes it
+impossible for a backward-compatible implementation to ever be fast:
+
+* In editing files, git-filter-branch by design checks out each and
+  every commit as it existed in the original repo.  If your repo has
+  `10^5` files and `10^5` commits, but each commit only modifies five
+  files, then git-filter-branch will make you do `10^10` modifications,
+  despite only having (at most) `5*10^5` unique blobs.
+
+* If you try and cheat and try to make git-filter-branch only work on
+  files modified in a commit, then two things happen
+
+  ** you run into problems with deletions whenever the user is simply
+     trying to rename files (because attempting to delete files that
+     don't exist looks like a no-op; it takes some chicanery to remap
+     deletes across file renames when the renames happen via arbitrary
+     user-provided shell)
+
+  ** even if you succeed at the map-deletes-for-renames chicanery, you
+     still technically violate backward compatibility because users
+     are allowed to filter files in ways that depend upon topology of
+     commits instead of filtering solely based on file contents or
+     names (though this has not been observed in the wild).
+
+* Even if you don't need to edit files but only want to e.g. rename or
+  remove some and thus can avoid checking out each file (i.e. you can
+  use --index-filter), you still are passing shell snippets for your
+  filters.  This means that for every commit, you have to have a
+  prepared git repo where those filters can be run.  That's a
+  significant setup.
+
+* Further, several additional files are created or updated per commit
+  by git-filter-branch.  Some of these are for supporting the
+  convenience functions provided by git-filter-branch (such as map()),
+  while others are for keeping track of internal state (but could have
+  also been accessed by user filters; one of git-filter-branch's
+  regression tests does so).  This essentially amounts to using the
+  filesystem as an IPC mechanism between git-filter-branch and the
+  user-provided filters.  Disks tend to be a slow IPC mechanism, and
+  writing these files also effectively represents a forced
+  synchronization point between separate processes that we hit with
+  every commit.
+
+* The user-provided shell commands will likely involve a pipeline of
+  commands, resulting in the creation of many processes per commit.
+  Creating and running another process takes a widely varying amount
+  of time between operating systems, but on any platform it is very
+  slow relative to invoking a function.
+
+* git-filter-branch itself is written in shell, which is kind of slow.
+  This is the one performance issue that could be backward-compatibly
+  fixed, but compared to the above problems that are intrinsic to the
+  design of git-filter-branch, the language of the tool itself is a
+  relatively minor issue.
+
+  ** Side note: Unfortunately, people tend to fixate on the
+     written-in-shell aspect and periodically ask if git-filter-branch
+     could be rewritten in another language to fix the performance
+     issues.  Not only does that ignore the bigger intrinsic problems
+     with the design, it'd help less than you'd expect: if
+     git-filter-branch itself were not shell, then the convenience
+     functions (map(), skip_commit(), etc) and the `--setup` argument
+     could no longer be executed once at the beginning of the program
+     but would instead need to be prepended to every user filter (and
+     thus re-executed with every commit).
+
+The https://github.com/newren/git-filter-repo/[git filter-repo] tool is
+an alternative to git-filter-branch which does not suffer from these
+performance problems or the safety problems (mentioned below). For those
+with existing tooling which relies upon git-filter-branch, 'git
+repo-filter' also provides
+https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely],
+a drop-in git-filter-branch replacement (with a few caveats).  While
+filter-lamely suffers from all the same safety issues as
+git-filter-branch, it at least ameliorates the performance issues a
+little.
+
+[[SAFETY]]
+SAFETY
+------
+
+git-filter-branch is riddled with gotchas resulting in various ways to
+easily corrupt repos or end up with a mess worse than what you started
+with:
+
+* Someone can have a set of "working and tested filters" which they
+  document or provide to a coworker, who then runs them on a different
+  OS where the same commands are not working/tested (some examples in
+  the git-filter-branch manpage are also affected by this).
+  BSD vs. GNU userland differences can really bite.  If lucky, error
+  messages are spewed.  But just as likely, the commands either don't
+  do the filtering requested, or silently corrupt by making some
+  unwanted change.  The unwanted change may only affect a few commits,
+  so it's not necessarily obvious either.  (The fact that problems
+  won't necessarily be obvious means they are likely to go unnoticed
+  until the rewritten history is in use for quite a while, at which
+  point it's really hard to justify another flag-day for another
+  rewrite.)
+
+* Filenames with spaces are often mishandled by shell snippets since
+  they cause problems for shell pipelines.  Not everyone is familiar
+  with find -print0, xargs -0, git-ls-files -z, etc.  Even people who
+  are familiar with these may assume such flags are not relevant
+  because someone else renamed any such files in their repo back
+  before the person doing the filtering joined the project.  And
+  often, even those familiar with handling arguments with spaces may
+  not do so just because they aren't in the mindset of thinking about
+  everything that could possibly go wrong.
+
+* Non-ascii filenames can be silently removed despite being in a
+  desired directory.  Keeping only wanted paths is often done using
+  pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`.
+  ls-files will only quote filenames if needed, so folks may not
+  notice that one of the files didn't match the regex (at least not
+  until it's much too late).  Yes, someone who knows about
+  core.quotePath can avoid this (unless they have other special
+  characters like \t, \n, or "), and people who use ls-files -z with
+  something other than grep can avoid this, but that doesn't mean they
+  will.
+
+* Similarly, when moving files around, one can find that filenames
+  with non-ascii or special characters end up in a different
+  directory, one that includes a double quote character.  (This is
+  technically the same issue as above with quoting, but perhaps an
+  interesting different way that it can and has manifested as a
+  problem.)
+
+* It's far too easy to accidentally mix up old and new history.  It's
+  still possible with any tool, but git-filter-branch almost
+  invites it.  If lucky, the only downside is users getting frustrated
+  that they don't know how to shrink their repo and remove the old
+  stuff.  If unlucky, they merge old and new history and end up with
+  multiple "copies" of each commit, some of which have unwanted or
+  sensitive files and others which don't.  This comes about in
+  multiple different ways:
+
+  ** the default to only doing a partial history rewrite ('--all' is not
+     the default and few examples show it)
+
+  ** the fact that there's no automatic post-run cleanup
+
+  ** the fact that --tag-name-filter (when used to rename tags) doesn't
+     remove the old tags but just adds new ones with the new name
+
+  ** the fact that little educational information is provided to inform
+     users of the ramifications of a rewrite and how to avoid mixing old
+     and new history.  For example, this man page discusses how users
+     need to understand that they need to rebase their changes for all
+     their branches on top of new history (or delete and reclone), but
+     that's only one of multiple concerns to consider.  See the
+     "DISCUSSION" section of the git filter-repo manual page for more
+     details.
+
+* Annotated tags can be accidentally converted to lightweight tags,
+  due to either of two issues:
+
+  ** Someone can do a history rewrite, realize they messed up, restore
+     from the backups in refs/original/, and then redo their
+     git-filter-branch command.  (The backup in refs/original/ is not a
+     real backup; it dereferences tags first.)
+
+  ** Running git-filter-branch with either --tags or --all in your
+     <rev-list options>.  In order to retain annotated tags as
+     annotated, you must use --tag-name-filter (and must not have
+     restored from refs/original/ in a previously botched rewrite).
+
+* Any commit messages that specify an encoding will become corrupted
+  by the rewrite; git-filter-branch ignores the encoding, takes the
+  original bytes, and feeds it to commit-tree without telling it the
+  proper encoding.  (This happens whether or not --msg-filter is
+  used.)
+
+* Commit messages (even if they are all UTF-8) by default become
+  corrupted due to not being updated -- any references to other commit
+  hashes in commit messages will now refer to no-longer-extant
+  commits.
+
+* There are no facilities for helping users find what unwanted crud
+  they should delete, which means they are much more likely to have
+  incomplete or partial cleanups that sometimes result in confusion
+  and people wasting time trying to understand.  (For example, folks
+  tend to just look for big files to delete instead of big directories
+  or extensions, and once they do so, then sometime later folks using
+  the new repository who are going through history will notice a build
+  artifact directory that has some files but not others, or a cache of
+  dependencies (node_modules or similar) which couldn't have ever been
+  functional since it's missing some files.)
+
+* If --prune-empty isn't specified, then the filtering process can
+  create hoards of confusing empty commits
+
+* If --prune-empty is specified, then intentionally placed empty
+  commits from before the filtering operation are also pruned instead
+  of just pruning commits that became empty due to filtering rules.
+
+* If --prune-empty is specified, sometimes empty commits are missed
+  and left around anyway (a somewhat rare bug, but it happens...)
+
+* A minor issue, but users who have a goal to update all names and
+  emails in a repository may be led to --env-filter which will only
+  update authors and committers, missing taggers.
+
+* If the user provides a --tag-name-filter that maps multiple tags to
+  the same name, no warning or error is provided; git-filter-branch
+  simply overwrites each tag in some undocumented pre-defined order
+  resulting in only one tag at the end.  (A git-filter-branch
+  regression test requires this surprising behavior.)
+
+Also, the poor performance of git-filter-branch often leads to safety
+issues:
+
+* Coming up with the correct shell snippet to do the filtering you
+  want is sometimes difficult unless you're just doing a trivial
+  modification such as deleting a couple files.  Unfortunately, people
+  often learn if the snippet is right or wrong by trying it out, but
+  the rightness or wrongness can vary depending on special
+  circumstances (spaces in filenames, non-ascii filenames, funny
+  author names or emails, invalid timezones, presence of grafts or
+  replace objects, etc.), meaning they may have to wait a long time,
+  hit an error, then restart.  The performance of git-filter-branch is
+  so bad that this cycle is painful, reducing the time available to
+  carefully re-check (to say nothing about what it does to the
+  patience of the person doing the rewrite even if they do technically
+  have more time available).  This problem is extra compounded because
+  errors from broken filters may not be shown for a long time and/or
+  get lost in a sea of output.  Even worse, broken filters often just
+  result in silent incorrect rewrites.
+
+* To top it all off, even when users finally find working commands,
+  they naturally want to share them.  But they may be unaware that
+  their repo didn't have some special cases that someone else's does.
+  So, when someone else with a different repository runs the same
+  commands, they get hit by the problems above.  Or, the user just
+  runs commands that really were vetted for special cases, but they
+  run it on a different OS where it doesn't work, as noted above.
 
 GIT
 ---
diff --git a/third_party/git/Documentation/git-format-patch.txt b/third_party/git/Documentation/git-format-patch.txt
index b9b97e63aec5..0d4f8951bbb1 100644
--- a/third_party/git/Documentation/git-format-patch.txt
+++ b/third_party/git/Documentation/git-format-patch.txt
@@ -17,9 +17,10 @@ SYNOPSIS
 		   [--signature-file=<file>]
 		   [-n | --numbered | -N | --no-numbered]
 		   [--start-number <n>] [--numbered-files]
-		   [--in-reply-to=Message-Id] [--suffix=.<sfx>]
+		   [--in-reply-to=<message id>] [--suffix=.<sfx>]
 		   [--ignore-if-in-upstream]
-		   [--rfc] [--subject-prefix=Subject-Prefix]
+		   [--cover-from-description=<mode>]
+		   [--rfc] [--subject-prefix=<subject prefix>]
 		   [(--reroll-count|-v) <n>]
 		   [--to=<email>] [--cc=<email>]
 		   [--[no-]cover-letter] [--quiet]
@@ -66,7 +67,8 @@ they are created in the current working directory. The default path
 can be set with the `format.outputDirectory` configuration option.
 The `-o` option takes precedence over `format.outputDirectory`.
 To store patches in the current working directory even when
-`format.outputDirectory` points elsewhere, use `-o .`.
+`format.outputDirectory` points elsewhere, use `-o .`. All directory
+components will be created.
 
 By default, the subject of a single patch is "[PATCH] " followed by
 the concatenation of lines from the commit message up to the first blank
@@ -159,9 +161,9 @@ Beware that the default for 'git send-email' is to thread emails
 itself.  If you want `git format-patch` to take care of threading, you
 will want to ensure that threading is disabled for `git send-email`.
 
---in-reply-to=Message-Id::
+--in-reply-to=<message id>::
 	Make the first mail (or all the mails with `--no-thread`) appear as a
-	reply to the given Message-Id, which avoids breaking threads to
+	reply to the given <message id>, which avoids breaking threads to
 	provide a new patch series.
 
 --ignore-if-in-upstream::
@@ -171,9 +173,29 @@ will want to ensure that threading is disabled for `git send-email`.
 	patches being generated, and any patch that matches is
 	ignored.
 
---subject-prefix=<Subject-Prefix>::
+--cover-from-description=<mode>::
+	Controls which parts of the cover letter will be automatically
+	populated using the branch's description.
++
+If `<mode>` is `message` or `default`, the cover letter subject will be
+populated with placeholder text. The body of the cover letter will be
+populated with the branch's description. This is the default mode when
+no configuration nor command line option is specified.
++
+If `<mode>` is `subject`, the first paragraph of the branch description will
+populate the cover letter subject. The remainder of the description will
+populate the body of the cover letter.
++
+If `<mode>` is `auto`, if the first paragraph of the branch description
+is greater than 100 bytes, then the mode will be `message`, otherwise
+`subject` will be used.
++
+If `<mode>` is `none`, both the cover letter subject and body will be
+populated with placeholder text.
+
+--subject-prefix=<subject prefix>::
 	Instead of the standard '[PATCH]' prefix in the subject
-	line, instead use '[<Subject-Prefix>]'. This
+	line, instead use '[<subject prefix>]'. This
 	allows for useful naming of a patch series, and can be
 	combined with the `--numbered` option.
 
@@ -311,10 +333,12 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
   Output an all-zero hash in each patch's From header instead
   of the hash of the commit.
 
---base=<commit>::
+--[no-]base[=<commit>]::
 	Record the base tree information to identify the state the
 	patch series applies to.  See the BASE TREE INFORMATION section
-	below for details.
+	below for details. If <commit> is "auto", a base commit is
+	automatically chosen. The `--no-base` option overrides a
+	`format.useAutoBase` configuration.
 
 --root::
 	Treat the revision argument as a <revision range>, even if it
@@ -330,8 +354,9 @@ CONFIGURATION
 -------------
 You can specify extra mail header lines to be added to each message,
 defaults for the subject prefix and file suffix, number patches when
-outputting more than one patch, add "To" or "Cc:" headers, configure
-attachments, and sign off patches with configuration variables.
+outputting more than one patch, add "To:" or "Cc:" headers, configure
+attachments, change the patch output directory, and sign off patches
+with configuration variables.
 
 ------------
 [format]
@@ -343,7 +368,9 @@ attachments, and sign off patches with configuration variables.
 	cc = <email>
 	attach [ = mime-boundary-string ]
 	signOff = true
-	coverletter = auto
+	outputDirectory = <directory>
+	coverLetter = auto
+	coverFromDescription = auto
 ------------
 
 
diff --git a/third_party/git/Documentation/git-gc.txt b/third_party/git/Documentation/git-gc.txt
index 247f765604b0..0c114ad1ca26 100644
--- a/third_party/git/Documentation/git-gc.txt
+++ b/third_party/git/Documentation/git-gc.txt
@@ -115,15 +115,14 @@ NOTES
 -----
 
 'git gc' tries very hard not to delete objects that are referenced
-anywhere in your repository. In
-particular, it will keep not only objects referenced by your current set
-of branches and tags, but also objects referenced by the index,
-remote-tracking branches, refs saved by 'git filter-branch' in
-refs/original/, reflogs (which may reference commits in branches
-that were later amended or rewound), and anything else in the refs/* namespace.
-If you are expecting some objects to be deleted and they aren't, check
-all of those locations and decide whether it makes sense in your case to
-remove those references.
+anywhere in your repository. In particular, it will keep not only
+objects referenced by your current set of branches and tags, but also
+objects referenced by the index, remote-tracking branches, notes saved
+by 'git notes' under refs/notes/, reflogs (which may reference commits
+in branches that were later amended or rewound), and anything else in
+the refs/* namespace.  If you are expecting some objects to be deleted
+and they aren't, check all of those locations and decide whether it
+makes sense in your case to remove those references.
 
 On the other hand, when 'git gc' runs concurrently with another process,
 there is a risk of it deleting an object that the other process is using
diff --git a/third_party/git/Documentation/git-grep.txt b/third_party/git/Documentation/git-grep.txt
index 2d27969057fd..ddb6acc0257e 100644
--- a/third_party/git/Documentation/git-grep.txt
+++ b/third_party/git/Documentation/git-grep.txt
@@ -59,8 +59,8 @@ grep.extendedRegexp::
 	other than 'default'.
 
 grep.threads::
-	Number of grep worker threads to use.  If unset (or set to 0),
-	8 threads are used by default (for now).
+	Number of grep worker threads to use. If unset (or set to 0), Git will
+	use as many threads as the number of logical cores available.
 
 grep.fullName::
 	If set to true, enable `--full-name` option by default.
@@ -96,7 +96,8 @@ OPTIONS
 	Recursively search in each submodule that has been initialized and
 	checked out in the repository.  When used in combination with the
 	<tree> option the prefix of all submodule output will be the name of
-	the parent project's <tree> object.
+	the parent project's <tree> object. This option has no effect
+	if `--no-index` is given.
 
 -a::
 --text::
@@ -271,6 +272,23 @@ providing this option will cause it to die.
 
 -f <file>::
 	Read patterns from <file>, one per line.
++
+Passing the pattern via <file> allows for providing a search pattern
+containing a \0.
++
+Not all pattern types support patterns containing \0. Git will error
+out if a given pattern type can't support such a pattern. The
+`--perl-regexp` pattern type when compiled against the PCRE v2 backend
+has the widest support for these types of patterns.
++
+In versions of Git before 2.23.0 patterns containing \0 would be
+silently considered fixed. This was never documented, there were also
+odd and undocumented interactions between e.g. non-ASCII patterns
+containing \0 and `--ignore-case`.
++
+In future versions we may learn to support patterns containing \0 for
+more search backends, until then we'll die when the pattern type in
+question doesn't support them.
 
 -e::
 	The next parameter is the pattern. This option has to be
@@ -330,6 +348,17 @@ EXAMPLES
 `git grep solution -- :^Documentation`::
 	Looks for `solution`, excluding files in `Documentation`.
 
+NOTES ON THREADS
+----------------
+
+The `--threads` option (and the grep.threads configuration) will be ignored when
+`--open-files-in-pager` is used, forcing a single-threaded execution.
+
+When grepping the object store (with `--cached` or giving tree objects), running
+with multiple threads might perform slower than single threaded if `--textconv`
+is given and there're too many text conversions. So if you experience low
+performance in this case, it might be desirable to use `--threads=1`.
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/third_party/git/Documentation/git-gui.txt b/third_party/git/Documentation/git-gui.txt
index 5f93f8003d1d..c9d7e96214f4 100644
--- a/third_party/git/Documentation/git-gui.txt
+++ b/third_party/git/Documentation/git-gui.txt
@@ -112,15 +112,9 @@ Other
 versions are distributed as part of the Git suite for the convenience
 of end users.
 
-A 'git gui' development repository can be obtained from:
+The official repository of the 'git gui' project can be found at:
 
-  git clone git://repo.or.cz/git-gui.git
-
-or
-
-  git clone http://repo.or.cz/r/git-gui.git
-
-or browsed online at http://repo.or.cz/w/git-gui.git/[].
+  https://github.com/prati0100/git-gui.git/
 
 GIT
 ---
diff --git a/third_party/git/Documentation/git-log.txt b/third_party/git/Documentation/git-log.txt
index b406bc4c48f4..bed09bb09e52 100644
--- a/third_party/git/Documentation/git-log.txt
+++ b/third_party/git/Documentation/git-log.txt
@@ -76,8 +76,12 @@ produced by `--stat`, etc.
 	(or the function name regex <funcname>) within the <file>.  You may
 	not give any pathspec limiters.  This is currently limited to
 	a walk starting from a single revision, i.e., you may only
-	give zero or one positive revision arguments.
-	You can specify this option more than once.
+	give zero or one positive revision arguments, and
+	<start> and <end> (or <funcname>) must exist in the starting revision.
+	You can specify this option more than once. Implies `--patch`.
+	Patch output can be suppressed using `--no-patch`, but other diff formats
+	(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
+	`--name-only`, `--name-status`, `--check`) are not currently implemented.
 +
 include::line-range-format.txt[]
 
diff --git a/third_party/git/Documentation/git-ls-remote.txt b/third_party/git/Documentation/git-ls-remote.txt
index 0b057cbb100c..0a5c8b7d493e 100644
--- a/third_party/git/Documentation/git-ls-remote.txt
+++ b/third_party/git/Documentation/git-ls-remote.txt
@@ -28,7 +28,9 @@ OPTIONS
 	Limit to only refs/heads and refs/tags, respectively.
 	These options are _not_ mutually exclusive; when given
 	both, references stored in refs/heads and refs/tags are
-	displayed.
+	displayed.  Note that `git ls-remote -h` used without
+	anything else on the command line gives help, consistent
+	with other git subcommands.
 
 --refs::
 	Do not show peeled tags or pseudorefs like `HEAD` in the output.
@@ -92,21 +94,23 @@ OPTIONS
 EXAMPLES
 --------
 
-	$ git ls-remote --tags ./.
-	d6602ec5194c87b0fc87103ca4d67251c76f233a	refs/tags/v0.99
-	f25a265a342aed6041ab0cc484224d9ca54b6f41	refs/tags/v0.99.1
-	7ceca275d047c90c0c7d5afb13ab97efdf51bd6e	refs/tags/v0.99.3
-	c5db5456ae3b0873fc659c19fafdde22313cc441	refs/tags/v0.99.2
-	0918385dbd9656cab0d1d81ba7453d49bbc16250	refs/tags/junio-gpg-pub
-	$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
-	5fe978a5381f1fbad26a80e682ddd2a401966740	refs/heads/master
-	c781a84b5204fb294c9ccc79f8b3baceeb32c061	refs/heads/pu
-	$ git remote add korg http://www.kernel.org/pub/scm/git/git.git
-	$ git ls-remote --tags korg v\*
-	d6602ec5194c87b0fc87103ca4d67251c76f233a	refs/tags/v0.99
-	f25a265a342aed6041ab0cc484224d9ca54b6f41	refs/tags/v0.99.1
-	c5db5456ae3b0873fc659c19fafdde22313cc441	refs/tags/v0.99.2
-	7ceca275d047c90c0c7d5afb13ab97efdf51bd6e	refs/tags/v0.99.3
+----
+$ git ls-remote --tags ./.
+d6602ec5194c87b0fc87103ca4d67251c76f233a	refs/tags/v0.99
+f25a265a342aed6041ab0cc484224d9ca54b6f41	refs/tags/v0.99.1
+7ceca275d047c90c0c7d5afb13ab97efdf51bd6e	refs/tags/v0.99.3
+c5db5456ae3b0873fc659c19fafdde22313cc441	refs/tags/v0.99.2
+0918385dbd9656cab0d1d81ba7453d49bbc16250	refs/tags/junio-gpg-pub
+$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
+5fe978a5381f1fbad26a80e682ddd2a401966740	refs/heads/master
+c781a84b5204fb294c9ccc79f8b3baceeb32c061	refs/heads/pu
+$ git remote add korg http://www.kernel.org/pub/scm/git/git.git
+$ git ls-remote --tags korg v\*
+d6602ec5194c87b0fc87103ca4d67251c76f233a	refs/tags/v0.99
+f25a265a342aed6041ab0cc484224d9ca54b6f41	refs/tags/v0.99.1
+c5db5456ae3b0873fc659c19fafdde22313cc441	refs/tags/v0.99.2
+7ceca275d047c90c0c7d5afb13ab97efdf51bd6e	refs/tags/v0.99.3
+----
 
 SEE ALSO
 --------
diff --git a/third_party/git/Documentation/git-merge-base.txt b/third_party/git/Documentation/git-merge-base.txt
index 261d5c116454..2d944e0851f6 100644
--- a/third_party/git/Documentation/git-merge-base.txt
+++ b/third_party/git/Documentation/git-merge-base.txt
@@ -80,9 +80,11 @@ which is reachable from both 'A' and 'B' through the parent relationship.
 
 For example, with this topology:
 
-	         o---o---o---B
-	        /
-	---o---1---o---o---o---A
+....
+	 o---o---o---B
+	/
+---o---1---o---o---o---A
+....
 
 the merge base between 'A' and 'B' is '1'.
 
@@ -90,21 +92,25 @@ Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the
 merge base between 'A' and a hypothetical commit 'M', which is a merge
 between 'B' and 'C'.  For example, with this topology:
 
-	       o---o---o---o---C
-	      /
-	     /   o---o---o---B
-	    /   /
-	---2---1---o---o---o---A
+....
+       o---o---o---o---C
+      /
+     /   o---o---o---B
+    /   /
+---2---1---o---o---o---A
+....
 
 the result of `git merge-base A B C` is '1'.  This is because the
 equivalent topology with a merge commit 'M' between 'B' and 'C' is:
 
 
-	       o---o---o---o---o
-	      /                 \
-	     /   o---o---o---o---M
-	    /   /
-	---2---1---o---o---o---A
+....
+       o---o---o---o---o
+      /                 \
+     /   o---o---o---o---M
+    /   /
+---2---1---o---o---o---A
+....
 
 and the result of `git merge-base A M` is '1'.  Commit '2' is also a
 common ancestor between 'A' and 'M', but '1' is a better common ancestor,
@@ -116,11 +122,13 @@ the best common ancestor of all commits.
 When the history involves criss-cross merges, there can be more than one
 'best' common ancestor for two commits.  For example, with this topology:
 
-	---1---o---A
-	    \ /
-	     X
-	    / \
-	---2---o---o---B
+....
+---1---o---A
+    \ /
+     X
+    / \
+---2---o---o---B
+....
 
 both '1' and '2' are merge-bases of A and B.  Neither one is better than
 the other (both are 'best' merge bases).  When the `--all` option is not given,
@@ -131,18 +139,22 @@ and B is (or at least used to be) to compute the merge base between
 A and B, and check if it is the same as A, in which case, A is an
 ancestor of B.  You will see this idiom used often in older scripts.
 
-	A=$(git rev-parse --verify A)
-	if test "$A" = "$(git merge-base A B)"
-	then
-		... A is an ancestor of B ...
-	fi
+....
+A=$(git rev-parse --verify A)
+if test "$A" = "$(git merge-base A B)"
+then
+	... A is an ancestor of B ...
+fi
+....
 
 In modern git, you can say this in a more direct way:
 
-	if git merge-base --is-ancestor A B
-	then
-		... A is an ancestor of B ...
-	fi
+....
+if git merge-base --is-ancestor A B
+then
+	... A is an ancestor of B ...
+fi
+....
 
 instead.
 
@@ -154,13 +166,15 @@ topic origin/master`, the history of remote-tracking branch
 `origin/master` may have been rewound and rebuilt, leading to a
 history of this shape:
 
-	                 o---B2
-	                /
-	---o---o---B1--o---o---o---B (origin/master)
-	        \
-	         B0
-	          \
-	           D0---D1---D (topic)
+....
+		 o---B2
+		/
+---o---o---B1--o---o---o---B (origin/master)
+	\
+	 B0
+	  \
+	   D0---D1---D (topic)
+....
 
 where `origin/master` used to point at commits B0, B1, B2 and now it
 points at B, and your `topic` branch was started on top of it back
@@ -193,13 +207,15 @@ will find B0, and
 will replay D0, D1 and D on top of B to create a new history of this
 shape:
 
-			 o---B2
-			/
-	---o---o---B1--o---o---o---B (origin/master)
-		\                   \
-		 B0                  D0'--D1'--D' (topic - updated)
-		  \
-		   D0---D1---D (topic - old)
+....
+		 o---B2
+		/
+---o---o---B1--o---o---o---B (origin/master)
+	\                   \
+	 B0                  D0'--D1'--D' (topic - updated)
+	  \
+	   D0---D1---D (topic - old)
+....
 
 A caveat is that older reflog entries in your repository may be
 expired by `git gc`.  If B0 no longer appears in the reflog of the
diff --git a/third_party/git/Documentation/git-merge-index.txt b/third_party/git/Documentation/git-merge-index.txt
index 02676fb39197..2ab84a91e538 100644
--- a/third_party/git/Documentation/git-merge-index.txt
+++ b/third_party/git/Documentation/git-merge-index.txt
@@ -54,20 +54,24 @@ original is first. But the argument order to the 3-way merge program
 
 Examples:
 
-  torvalds@ppc970:~/merge-test> git merge-index cat MM
-  This is MM from the original tree.			# original
-  This is modified MM in the branch A.			# merge1
-  This is modified MM in the branch B.			# merge2
-  This is modified MM in the branch B.			# current contents
+----
+torvalds@ppc970:~/merge-test> git merge-index cat MM
+This is MM from the original tree.		# original
+This is modified MM in the branch A.		# merge1
+This is modified MM in the branch B.		# merge2
+This is modified MM in the branch B.		# current contents
+----
 
 or
 
-  torvalds@ppc970:~/merge-test> git merge-index cat AA MM
-  cat: : No such file or directory
-  This is added AA in the branch A.
-  This is added AA in the branch B.
-  This is added AA in the branch B.
-  fatal: merge program failed
+----
+torvalds@ppc970:~/merge-test> git merge-index cat AA MM
+cat: : No such file or directory
+This is added AA in the branch A.
+This is added AA in the branch B.
+This is added AA in the branch B.
+fatal: merge program failed
+----
 
 where the latter example shows how 'git merge-index' will stop trying to
 merge once anything has returned an error (i.e., `cat` returned an error
diff --git a/third_party/git/Documentation/git-merge.txt b/third_party/git/Documentation/git-merge.txt
index 01fd52dc7063..092529c619e2 100644
--- a/third_party/git/Documentation/git-merge.txt
+++ b/third_party/git/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
-	[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
+	[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
 	[--[no-]allow-unrelated-histories]
 	[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
 'git merge' (--continue | --abort | --quit)
diff --git a/third_party/git/Documentation/git-multi-pack-index.txt b/third_party/git/Documentation/git-multi-pack-index.txt
index 233b2b786271..642d9ac5b723 100644
--- a/third_party/git/Documentation/git-multi-pack-index.txt
+++ b/third_party/git/Documentation/git-multi-pack-index.txt
@@ -9,7 +9,7 @@ git-multi-pack-index - Write and verify multi-pack-indexes
 SYNOPSIS
 --------
 [verse]
-'git multi-pack-index' [--object-dir=<dir>] <subcommand>
+'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress] <subcommand>
 
 DESCRIPTION
 -----------
@@ -23,6 +23,10 @@ OPTIONS
 	`<dir>/packs/multi-pack-index` for the current MIDX file, and
 	`<dir>/packs` for the pack-files to index.
 
+--[no-]progress::
+	Turn progress on/off explicitly. If neither is specified, progress is
+	shown if standard error is connected to a terminal.
+
 The following subcommands are available:
 
 write::
diff --git a/third_party/git/Documentation/git-notes.txt b/third_party/git/Documentation/git-notes.txt
index f56a5a91975d..ced2e8280ef5 100644
--- a/third_party/git/Documentation/git-notes.txt
+++ b/third_party/git/Documentation/git-notes.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 [verse]
 'git notes' [list [<object>]]
 'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
-'git notes' copy [-f] ( --stdin | <from-object> <to-object> )
+'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )
 'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
 'git notes' edit [--allow-empty] [<object>]
 'git notes' show [<object>]
@@ -68,8 +68,8 @@ add::
 	subcommand).
 
 copy::
-	Copy the notes for the first object onto the second object.
-	Abort if the second object already has notes, or if the first
+	Copy the notes for the first object onto the second object (defaults to
+	HEAD). Abort if the second object already has notes, or if the first
 	object has none (use -f to overwrite existing notes to the
 	second object). This subcommand is equivalent to:
 	`git notes add [-f] -C $(git notes list <from-object>) <to-object>`
diff --git a/third_party/git/Documentation/git-range-diff.txt b/third_party/git/Documentation/git-range-diff.txt
index 8a6ea2c6c5c7..9701c1e5fdd5 100644
--- a/third_party/git/Documentation/git-range-diff.txt
+++ b/third_party/git/Documentation/git-range-diff.txt
@@ -57,6 +57,10 @@ to revert to color all lines according to the outer diff markers
 	See the ``Algorithm`` section below for an explanation why this is
 	needed.
 
+--[no-]notes[=<ref>]::
+	This flag is passed to the `git log` program
+	(see linkgit:git-log[1]) that generates the patches.
+
 <range1> <range2>::
 	Compare the commits specified by the two ranges, where
 	`<range1>` is considered an older version of `<range2>`.
@@ -75,7 +79,7 @@ to revert to color all lines according to the outer diff markers
 linkgit:git-diff[1]), most notably the `--color=[<when>]` and
 `--no-color` options. These options are used when generating the "diff
 between patches", i.e. to compare the author, commit message and diff of
-corresponding old/new commits. There is currently no means to tweak the
+corresponding old/new commits. There is currently no means to tweak most of the
 diff options passed to `git log` when generating those patches.
 
 OUTPUT STABILITY
@@ -242,7 +246,7 @@ corresponding.
 
 The overall time needed to compute this algorithm is the time needed to
 compute n+m commit diffs and then n*m diffs of patches, plus the time
-needed to compute the least-cost assigment between n and m diffs. Git
+needed to compute the least-cost assignment between n and m diffs. Git
 uses an implementation of the Jonker-Volgenant algorithm to solve the
 assignment problem, which has cubic runtime complexity. The matching
 found in this case will look like this:
diff --git a/third_party/git/Documentation/git-read-tree.txt b/third_party/git/Documentation/git-read-tree.txt
index d27184260856..da33f84f33d2 100644
--- a/third_party/git/Documentation/git-read-tree.txt
+++ b/third_party/git/Documentation/git-read-tree.txt
@@ -436,7 +436,7 @@ support.
 SEE ALSO
 --------
 linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
-linkgit:gitignore[5]
+linkgit:gitignore[5]; linkgit:git-sparse-checkout[1];
 
 GIT
 ---
diff --git a/third_party/git/Documentation/git-rebase.txt b/third_party/git/Documentation/git-rebase.txt
index 6156609cf714..f7a6033607fa 100644
--- a/third_party/git/Documentation/git-rebase.txt
+++ b/third_party/git/Documentation/git-rebase.txt
@@ -8,8 +8,8 @@ git-rebase - Reapply commits on top of another base tip
 SYNOPSIS
 --------
 [verse]
-'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
-	[<upstream> [<branch>]]
+'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]
+	[--onto <newbase> | --keep-base] [<upstream> [<branch>]]
 'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
 	--root [<branch>]
 'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)
@@ -217,6 +217,24 @@ As a special case, you may use "A\...B" as a shortcut for the
 merge base of A and B if there is exactly one merge base. You can
 leave out at most one of A and B, in which case it defaults to HEAD.
 
+--keep-base::
+	Set the starting point at which to create the new commits to the
+	merge base of <upstream> <branch>. Running
+	'git rebase --keep-base <upstream> <branch>' is equivalent to
+	running 'git rebase --onto <upstream>... <upstream>'.
++
+This option is useful in the case where one is developing a feature on
+top of an upstream branch. While the feature is being worked on, the
+upstream branch may advance and it may not be the best idea to keep
+rebasing on top of the upstream but to keep the base commit as-is.
++
+Although both this option and --fork-point find the merge base between
+<upstream> and <branch>, this option uses the merge base as the _starting
+point_ on which new commits will be created, whereas --fork-point uses
+the merge base to determine the _set of commits_ which will be rebased.
++
+See also INCOMPATIBLE OPTIONS below.
+
 <upstream>::
 	Upstream branch to compare against.  May be any valid commit,
 	not just an existing branch name. Defaults to the configured
@@ -240,16 +258,45 @@ leave out at most one of A and B, in which case it defaults to HEAD.
 	original branch. The index and working tree are also left
 	unchanged as a result.
 
---keep-empty::
-	Keep the commits that do not change anything from its
-	parents in the result.
+--apply:
+	Use applying strategies to rebase (calling `git-am`
+	internally).  This option may become a no-op in the future
+	once the merge backend handles everything the apply one does.
 +
 See also INCOMPATIBLE OPTIONS below.
 
+--empty={drop,keep,ask}::
+	How to handle commits that are not empty to start and are not
+	clean cherry-picks of any upstream commit, but which become
+	empty after rebasing (because they contain a subset of already
+	upstream changes).  With drop (the default), commits that
+	become empty are dropped.  With keep, such commits are kept.
+	With ask (implied by --interactive), the rebase will halt when
+	an empty commit is applied allowing you to choose whether to
+	drop it, edit files more, or just commit the empty changes.
+	Other options, like --exec, will use the default of drop unless
+	-i/--interactive is explicitly specified.
++
+Note that commits which start empty are kept, and commits which are
+clean cherry-picks (as determined by `git log --cherry-mark ...`) are
+always dropped.
++
+See also INCOMPATIBLE OPTIONS below.
+
+--keep-empty::
+	No-op.  Rebasing commits that started empty (had no change
+	relative to their parent) used to fail and this option would
+	override that behavior, allowing commits with empty changes to
+	be rebased.  Now commits with no changes do not cause rebasing
+	to halt.
++
+See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below.
+
 --allow-empty-message::
-	By default, rebasing commits with an empty message will fail.
-	This option overrides that behavior, allowing commits with empty
-	messages to be rebased.
+	No-op.  Rebasing commits with an empty message used to fail
+	and this option would override that behavior, allowing commits
+	with empty messages to be rebased.  Now commits with an empty
+	message do not cause rebasing to halt.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -268,7 +315,7 @@ See also INCOMPATIBLE OPTIONS below.
 --merge::
 	Use merging strategies to rebase.  When the recursive (default) merge
 	strategy is used, this allows rebase to be aware of renames on the
-	upstream side.
+	upstream side.  This is the default.
 +
 Note that a rebase merge works by replaying each commit from the working
 branch on top of the <upstream> branch.  Because of this, when a merge
@@ -338,7 +385,7 @@ See also INCOMPATIBLE OPTIONS below.
 	Ensure at least <n> lines of surrounding context match before
 	and after each change.  When fewer lines of surrounding
 	context exist they all must match.  By default no context is
-	ever ignored.
+	ever ignored.  Implies --apply.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -369,11 +416,16 @@ ends up being empty, the <upstream> will be used as a fallback.
 +
 If either <upstream> or --root is given on the command line, then the
 default is `--no-fork-point`, otherwise the default is `--fork-point`.
++
+If your branch was based on <upstream> but <upstream> was rewound and
+your branch contains commits which were dropped, this option can be used
+with `--keep-base` in order to drop those commits from your branch.
 
 --ignore-whitespace::
 --whitespace=<option>::
-	These flag are passed to the 'git apply' program
+	These flags are passed to the 'git apply' program
 	(see linkgit:git-apply[1]) that applies the patch.
+	Implies --apply.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -421,8 +473,8 @@ the `rebase-cousins` mode is turned on, such commits are instead rebased
 onto `<upstream>` (or `<onto>`, if specified).
 +
 The `--rebase-merges` mode is similar in spirit to the deprecated
-`--preserve-merges`, but in contrast to that option works well in interactive
-rebases: commits can be reordered, inserted and dropped at will.
+`--preserve-merges` but works with interactive rebases,
+where commits can be reordered, inserted and dropped at will.
 +
 It is currently only possible to recreate the merge commits using the
 `recursive` merge strategy; Different merge strategies can be used only via
@@ -517,10 +569,11 @@ INCOMPATIBLE OPTIONS
 
 The following options:
 
+ * --apply
  * --committer-date-is-author-date
  * --ignore-date
- * --whitespace
  * --ignore-whitespace
+ * --whitespace
  * -C
 
 are incompatible with the following options:
@@ -535,6 +588,7 @@ are incompatible with the following options:
  * --interactive
  * --exec
  * --keep-empty
+ * --empty=
  * --edit-todo
  * --root when used in combination with --onto
 
@@ -543,33 +597,137 @@ In addition, the following pairs of options are incompatible:
  * --preserve-merges and --interactive
  * --preserve-merges and --signoff
  * --preserve-merges and --rebase-merges
- * --rebase-merges and --strategy
- * --rebase-merges and --strategy-option
+ * --preserve-merges and --empty=
+ * --keep-base and --onto
+ * --keep-base and --root
 
 BEHAVIORAL DIFFERENCES
 -----------------------
 
-There are some subtle differences how the backends behave.
+git rebase has two primary backends: apply and merge.  (The apply
+backend used to known as the 'am' backend, but the name led to
+confusion as it looks like a verb instead of a noun.  Also, the merge
+backend used to be known as the interactive backend, but it is now
+used for non-interactive cases as well.  Both were renamed based on
+lower-level functionality that underpinned each.) There are some
+subtle differences in how these two backends behave:
 
 Empty commits
 ~~~~~~~~~~~~~
 
-The am backend drops any "empty" commits, regardless of whether the
-commit started empty (had no changes relative to its parent to
-start with) or ended empty (all changes were already applied
-upstream in other commits).
+The apply backend unfortunately drops intentionally empty commits, i.e.
+commits that started empty, though these are rare in practice.  It
+also drops commits that become empty and has no option for controlling
+this behavior.
 
-The interactive backend drops commits by default that
-started empty and halts if it hits a commit that ended up empty.
-The `--keep-empty` option exists for the interactive backend to allow
-it to keep commits that started empty.
+The merge backend keeps intentionally empty commits.  Similar to the
+apply backend, by default the merge backend drops commits that become
+empty unless -i/--interactive is specified (in which case it stops and
+asks the user what to do).  The merge backend also has an
+--empty={drop,keep,ask} option for changing the behavior of handling
+commits that become empty.
 
 Directory rename detection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Directory rename heuristics are enabled in the merge and interactive
-backends.  Due to the lack of accurate tree information, directory
-rename detection is disabled in the am backend.
+Due to the lack of accurate tree information (arising from
+constructing fake ancestors with the limited information available in
+patches), directory rename detection is disabled in the apply backend.
+Disabled directory rename detection means that if one side of history
+renames a directory and the other adds new files to the old directory,
+then the new files will be left behind in the old directory without
+any warning at the time of rebasing that you may want to move these
+files into the new directory.
+
+Directory rename detection works with the merge backend to provide you
+warnings in such cases.
+
+Context
+~~~~~~~
+
+The apply backend works by creating a sequence of patches (by calling
+`format-patch` internally), and then applying the patches in sequence
+(calling `am` internally).  Patches are composed of multiple hunks,
+each with line numbers, a context region, and the actual changes.  The
+line numbers have to be taken with some fuzz, since the other side
+will likely have inserted or deleted lines earlier in the file.  The
+context region is meant to help find how to adjust the line numbers in
+order to apply the changes to the right lines.  However, if multiple
+areas of the code have the same surrounding lines of context, the
+wrong one can be picked.  There are real-world cases where this has
+caused commits to be reapplied incorrectly with no conflicts reported.
+Setting diff.context to a larger value may prevent such types of
+problems, but increases the chance of spurious conflicts (since it
+will require more lines of matching context to apply).
+
+The merge backend works with a full copy of each relevant file,
+insulating it from these types of problems.
+
+Labelling of conflicts markers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When there are content conflicts, the merge machinery tries to
+annotate each side's conflict markers with the commits where the
+content came from.  Since the apply backend drops the original
+information about the rebased commits and their parents (and instead
+generates new fake commits based off limited information in the
+generated patches), those commits cannot be identified; instead it has
+to fall back to a commit summary.  Also, when merge.conflictStyle is
+set to diff3, the apply backend will use "constructed merge base" to
+label the content from the merge base, and thus provide no information
+about the merge base commit whatsoever.
+
+The merge backend works with the full commits on both sides of history
+and thus has no such limitations.
+
+Hooks
+~~~~~
+
+The apply backend has not traditionally called the post-commit hook,
+while the merge backend has.  However, this was by accident of
+implementation rather than by design.  Both backends should have the
+same behavior, though it is not clear which one is correct.
+
+Interruptability
+~~~~~~~~~~~~~~~~
+
+The apply backend has safety problems with an ill-timed interrupt; if
+the user presses Ctrl-C at the wrong time to try to abort the rebase,
+the rebase can enter a state where it cannot be aborted with a
+subsequent `git rebase --abort`.  The merge backend does not appear to
+suffer from the same shortcoming.  (See
+https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for
+details.)
+
+Commit Rewording
+~~~~~~~~~~~~~~~~
+
+When a conflict occurs while rebasing, rebase stops and asks the user
+to resolve.  Since the user may need to make notable changes while
+resolving conflicts, after conflicts are resolved and the user has run
+`git rebase --continue`, the rebase should open an editor and ask the
+user to update the commit message.  The merge backend does this, while
+the apply backend blindly applies the original commit message.
+
+Miscellaneous differences
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There are a few more behavioral differences that most folks would
+probably consider inconsequential but which are mentioned for
+completeness:
+
+* Reflog: The two backends will use different wording when describing
+  the changes made in the reflog, though both will make use of the
+  word "rebase".
+
+* Progress, informational, and error messages: The two backends
+  provide slightly different progress and informational messages.
+  Also, the apply backend writes error messages (such as "Your files
+  would be overwritten...") to stdout, while the merge backend writes
+  them to stderr.
+
+* State directories: The two backends keep their state in different
+  directories under .git/
 
 include::merge-strategies.txt[]
 
@@ -832,7 +990,8 @@ Hard case: The changes are not the same.::
 	This happens if the 'subsystem' rebase had conflicts, or used
 	`--interactive` to omit, edit, squash, or fixup commits; or
 	if the upstream used one of `commit --amend`, `reset`, or
-	`filter-branch`.
+	a full history rewriting command like
+	https://github.com/newren/git-filter-repo[`filter-repo`].
 
 
 The easy case
@@ -870,7 +1029,7 @@ NOTE: While an "easy case recovery" sometimes appears to be successful
       --interactive` will be **resurrected**!
 
 The idea is to manually tell 'git rebase' "where the old 'subsystem'
-ended and your 'topic' began", that is, what the old merge-base
+ended and your 'topic' began", that is, what the old merge base
 between them was.  You will have to find a way to name the last commit
 of the old 'subsystem', for example:
 
diff --git a/third_party/git/Documentation/git-receive-pack.txt b/third_party/git/Documentation/git-receive-pack.txt
index dedf97efbb22..25702ed73072 100644
--- a/third_party/git/Documentation/git-receive-pack.txt
+++ b/third_party/git/Documentation/git-receive-pack.txt
@@ -165,29 +165,31 @@ ref listing the commits pushed to the repository, and logs the push
 certificates of signed pushes with good signatures to a logger
 service:
 
-	#!/bin/sh
-	# mail out commit update information.
-	while read oval nval ref
-	do
-		if expr "$oval" : '0*$' >/dev/null
-		then
-			echo "Created a new ref, with the following commits:"
-			git rev-list --pretty "$nval"
-		else
-			echo "New commits:"
-			git rev-list --pretty "$nval" "^$oval"
-		fi |
-		mail -s "Changes to ref $ref" commit-list@mydomain
-	done
-	# log signed push certificate, if any
-	if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G
+----
+#!/bin/sh
+# mail out commit update information.
+while read oval nval ref
+do
+	if expr "$oval" : '0*$' >/dev/null
 	then
-		(
-			echo expected nonce is ${GIT_PUSH_NONCE}
-			git cat-file blob ${GIT_PUSH_CERT}
-		) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain
-	fi
-	exit 0
+		echo "Created a new ref, with the following commits:"
+		git rev-list --pretty "$nval"
+	else
+		echo "New commits:"
+		git rev-list --pretty "$nval" "^$oval"
+	fi |
+	mail -s "Changes to ref $ref" commit-list@mydomain
+done
+# log signed push certificate, if any
+if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G
+then
+	(
+		echo expected nonce is ${GIT_PUSH_NONCE}
+		git cat-file blob ${GIT_PUSH_CERT}
+	) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain
+fi
+exit 0
+----
 
 The exit code from this hook invocation is ignored, however a
 non-zero exit code will generate an error message.
@@ -212,8 +214,10 @@ anyway.
 This hook can be used, for example, to run `git update-server-info`
 if the repository is packed and is served via a dumb transport.
 
-	#!/bin/sh
-	exec git update-server-info
+----
+#!/bin/sh
+exec git update-server-info
+----
 
 
 QUARANTINE ENVIRONMENT
diff --git a/third_party/git/Documentation/git-replace.txt b/third_party/git/Documentation/git-replace.txt
index 246dc9943c22..f271d758c382 100644
--- a/third_party/git/Documentation/git-replace.txt
+++ b/third_party/git/Documentation/git-replace.txt
@@ -123,10 +123,10 @@ The following format are available:
 CREATING REPLACEMENT OBJECTS
 ----------------------------
 
-linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and
-linkgit:git-rebase[1], among other git commands, can be used to create
-replacement objects from existing objects. The `--edit` option can
-also be used with 'git replace' to create a replacement object by
+linkgit:git-hash-object[1], linkgit:git-rebase[1], and
+https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to
+create replacement objects from existing objects. The `--edit` option
+can also be used with 'git replace' to create a replacement object by
 editing an existing object.
 
 If you want to replace many blobs, trees or commits that are part of a
@@ -148,13 +148,13 @@ pending objects.
 SEE ALSO
 --------
 linkgit:git-hash-object[1]
-linkgit:git-filter-branch[1]
 linkgit:git-rebase[1]
 linkgit:git-tag[1]
 linkgit:git-branch[1]
 linkgit:git-commit[1]
 linkgit:git-var[1]
 linkgit:git[1]
+https://github.com/newren/git-filter-repo[git-filter-repo]
 
 GIT
 ---
diff --git a/third_party/git/Documentation/git-reset.txt b/third_party/git/Documentation/git-reset.txt
index 97e0544d9e1e..932080c55d2c 100644
--- a/third_party/git/Documentation/git-reset.txt
+++ b/third_party/git/Documentation/git-reset.txt
@@ -8,34 +8,36 @@ git-reset - Reset current HEAD to the specified state
 SYNOPSIS
 --------
 [verse]
-'git reset' [-q] [<tree-ish>] [--] <paths>...
-'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]
+'git reset' [-q] [<tree-ish>] [--] <pathspec>...
+'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]
+'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]
 'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]
 
 DESCRIPTION
 -----------
-In the first and second form, copy entries from `<tree-ish>` to the index.
-In the third form, set the current branch head (`HEAD`) to `<commit>`,
+In the first three forms, copy entries from `<tree-ish>` to the index.
+In the last form, set the current branch head (`HEAD`) to `<commit>`,
 optionally modifying index and working tree to match.
 The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms.
 
-'git reset' [-q] [<tree-ish>] [--] <paths>...::
-	This form resets the index entries for all `<paths>` to their
-	state at `<tree-ish>`.  (It does not affect the working tree or
-	the current branch.)
+'git reset' [-q] [<tree-ish>] [--] <pathspec>...::
+'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]::
+	These forms reset the index entries for all paths that match the
+	`<pathspec>` to their state at `<tree-ish>`.  (It does not affect
+	the working tree or the current branch.)
 +
-This means that `git reset <paths>` is the opposite of `git add
-<paths>`. This command is equivalent to
-`git restore [--source=<tree-ish>] --staged <paths>...`.
+This means that `git reset <pathspec>` is the opposite of `git add
+<pathspec>`. This command is equivalent to
+`git restore [--source=<tree-ish>] --staged <pathspec>...`.
 +
-After running `git reset <paths>` to update the index entry, you can
+After running `git reset <pathspec>` to update the index entry, you can
 use linkgit:git-restore[1] to check the contents out of the index to
 the working tree. Alternatively, using linkgit:git-restore[1]
 and specifying a commit with `--source`, you
 can copy the contents of a path out of a commit to the index and to the
 working tree in one go.
 
-'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]::
+'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]::
 	Interactively select hunks in the difference between the index
 	and `<tree-ish>` (defaults to `HEAD`).  The chosen hunks are applied
 	in reverse to the index.
@@ -101,6 +103,26 @@ OPTIONS
 	`reset.quiet` config option. `--quiet` and `--no-quiet` will
 	override the default behavior.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
+\--::
+	Do not interpret any more arguments as options.
+
+<pathspec>...::
+	Limits the paths affected by the operation.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 
 EXAMPLES
 --------
diff --git a/third_party/git/Documentation/git-restore.txt b/third_party/git/Documentation/git-restore.txt
index 1ab2e40ea938..5bf60d494341 100644
--- a/third_party/git/Documentation/git-restore.txt
+++ b/third_party/git/Documentation/git-restore.txt
@@ -8,8 +8,9 @@ git-restore - Restore working tree files
 SYNOPSIS
 --------
 [verse]
-'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>...
-'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...]
+'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...
+'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]
+'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
@@ -113,6 +114,27 @@ in linkgit:git-checkout[1] for details.
 	appear in the `--source` tree are removed, to make them match
 	`<tree>` exactly. The default is no-overlay mode.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
+\--::
+	Do not interpret any more arguments as options.
+
+<pathspec>...::
+	Limits the paths affected by the operation.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
+
 EXAMPLES
 --------
 
diff --git a/third_party/git/Documentation/git-rev-list.txt b/third_party/git/Documentation/git-rev-list.txt
index 9392760b2541..025c91143656 100644
--- a/third_party/git/Documentation/git-rev-list.txt
+++ b/third_party/git/Documentation/git-rev-list.txt
@@ -9,59 +9,7 @@ git-rev-list - Lists commit objects in reverse chronological order
 SYNOPSIS
 --------
 [verse]
-'git rev-list' [ --max-count=<number> ]
-	     [ --skip=<number> ]
-	     [ --max-age=<timestamp> ]
-	     [ --min-age=<timestamp> ]
-	     [ --sparse ]
-	     [ --merges ]
-	     [ --no-merges ]
-	     [ --min-parents=<number> ]
-	     [ --no-min-parents ]
-	     [ --max-parents=<number> ]
-	     [ --no-max-parents ]
-	     [ --first-parent ]
-	     [ --remove-empty ]
-	     [ --full-history ]
-	     [ --not ]
-	     [ --all ]
-	     [ --branches[=<pattern>] ]
-	     [ --tags[=<pattern>] ]
-	     [ --remotes[=<pattern>] ]
-	     [ --glob=<glob-pattern> ]
-	     [ --ignore-missing ]
-	     [ --stdin ]
-	     [ --quiet ]
-	     [ --topo-order ]
-	     [ --parents ]
-	     [ --timestamp ]
-	     [ --left-right ]
-	     [ --left-only ]
-	     [ --right-only ]
-	     [ --cherry-mark ]
-	     [ --cherry-pick ]
-	     [ --encoding=<encoding> ]
-	     [ --(author|committer|grep)=<pattern> ]
-	     [ --regexp-ignore-case | -i ]
-	     [ --extended-regexp | -E ]
-	     [ --fixed-strings | -F ]
-	     [ --date=<format>]
-	     [ [ --objects | --objects-edge | --objects-edge-aggressive ]
-	       [ --unpacked ]
-	       [ --object-names | --no-object-names ]
-	       [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]
-	     [ --missing=<missing-action> ]
-	     [ --pretty | --header ]
-	     [ --bisect ]
-	     [ --bisect-vars ]
-	     [ --bisect-all ]
-	     [ --merge ]
-	     [ --reverse ]
-	     [ --walk-reflogs ]
-	     [ --no-walk ] [ --do-walk ]
-	     [ --count ]
-	     [ --use-bitmap-index ]
-	     <commit>... [ \-- <paths>... ]
+'git rev-list' [<options>] <commit>... [[--] <path>...]
 
 DESCRIPTION
 -----------
diff --git a/third_party/git/Documentation/git-rev-parse.txt b/third_party/git/Documentation/git-rev-parse.txt
index e72d332b8316..19b12b6d43ce 100644
--- a/third_party/git/Documentation/git-rev-parse.txt
+++ b/third_party/git/Documentation/git-rev-parse.txt
@@ -262,7 +262,8 @@ print a message to stderr and exit with nonzero status.
 	directory.
 
 --show-toplevel::
-	Show the absolute path of the top-level directory.
+	Show the absolute path of the top-level directory of the working
+	tree. If there is no working tree, report an error.
 
 --show-superproject-working-tree::
 	Show the absolute path of the root of the superproject's
@@ -274,6 +275,13 @@ print a message to stderr and exit with nonzero status.
 	Show the path to the shared index file in split index mode, or
 	empty if not in split-index mode.
 
+--show-object-format[=(storage|input|output)]::
+	Show the object format (hash algorithm) used for the repository
+	for storage inside the `.git` directory, input, or output. For
+	input, multiple algorithms may be printed, space-separated.
+	If not specified, the default is "storage".
+
+
 Other Options
 ~~~~~~~~~~~~~
 
diff --git a/third_party/git/Documentation/git-rm.txt b/third_party/git/Documentation/git-rm.txt
index b5c46223c44b..ab750367fdef 100644
--- a/third_party/git/Documentation/git-rm.txt
+++ b/third_party/git/Documentation/git-rm.txt
@@ -8,16 +8,18 @@ git-rm - Remove files from the working tree and from the index
 SYNOPSIS
 --------
 [verse]
-'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
+'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]
+	  [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]
+	  [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
-Remove files from the index, or from the working tree and the index.
-`git rm` will not remove a file from just your working directory.
-(There is no option to remove a file only from the working tree
-and yet keep it in the index; use `/bin/rm` if you want to do that.)
-The files being removed have to be identical to the tip of the branch,
-and no updates to their contents can be staged in the index,
+Remove files matching pathspec from the index, or from the working tree
+and the index. `git rm` will not remove a file from just your working
+directory. (There is no option to remove a file only from the working
+tree and yet keep it in the index; use `/bin/rm` if you want to do
+that.) The files being removed have to be identical to the tip of the
+branch, and no updates to their contents can be staged in the index,
 though that default behavior can be overridden with the `-f` option.
 When `--cached` is given, the staged content has to
 match either the tip of the branch or the file on disk,
@@ -26,15 +28,20 @@ allowing the file to be removed from just the index.
 
 OPTIONS
 -------
-<file>...::
-	Files to remove.  Fileglobs (e.g. `*.c`) can be given to
-	remove all matching files.  If you want Git to expand
-	file glob characters, you may need to shell-escape them.
-	A leading directory name
-	(e.g. `dir` to remove `dir/file1` and `dir/file2`) can be
-	given to remove all files in the directory, and recursively
-	all sub-directories,
-	but this requires the `-r` option to be explicitly given.
+<pathspec>...::
+	Files to remove.  A leading directory name (e.g. `dir` to remove
+	`dir/file1` and `dir/file2`) can be given to remove all files in
+	the directory, and recursively all sub-directories, but this
+	requires the `-r` option to be explicitly given.
++
+The command removes only the paths that are known to Git.
++
+File globbing matches across directory boundaries.  Thus, given two
+directories `d` and `d2`, there is a difference between using
+`git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all
+of directory `d2`.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 
 -f::
 --force::
@@ -68,19 +75,19 @@ OPTIONS
 	`git rm` normally outputs one line (in the form of an `rm` command)
 	for each file removed. This option suppresses that output.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
 
-DISCUSSION
-----------
-
-The <file> list given to the command can be exact pathnames,
-file glob patterns, or leading directory names.  The command
-removes only the paths that are known to Git.  Giving the name of
-a file that you have not told Git about does not remove that file.
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
 
-File globbing matches across directory boundaries.  Thus, given
-two directories `d` and `d2`, there is a difference between
-using `git rm 'd*'` and `git rm 'd/*'`, as the former will
-also remove all of directory `d2`.
 
 REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM
 --------------------------------------------------------
diff --git a/third_party/git/Documentation/git-send-email.txt b/third_party/git/Documentation/git-send-email.txt
index d93e5d0f58f0..0a69810147e4 100644
--- a/third_party/git/Documentation/git-send-email.txt
+++ b/third_party/git/Documentation/git-send-email.txt
@@ -486,11 +486,13 @@ Use gmail as the smtp server
 To use 'git send-email' to send your patches through the GMail SMTP server,
 edit ~/.gitconfig to specify your account settings:
 
-	[sendemail]
-		smtpEncryption = tls
-		smtpServer = smtp.gmail.com
-		smtpUser = yourname@gmail.com
-		smtpServerPort = 587
+----
+[sendemail]
+	smtpEncryption = tls
+	smtpServer = smtp.gmail.com
+	smtpUser = yourname@gmail.com
+	smtpServerPort = 587
+----
 
 If you have multifactor authentication setup on your gmail account, you will
 need to generate an app-specific password for use with 'git send-email'. Visit
diff --git a/third_party/git/Documentation/git-shortlog.txt b/third_party/git/Documentation/git-shortlog.txt
index bc80905a8a06..a72ea7f7bafa 100644
--- a/third_party/git/Documentation/git-shortlog.txt
+++ b/third_party/git/Documentation/git-shortlog.txt
@@ -76,6 +76,9 @@ them.
 Paths may need to be prefixed with `--` to separate them from
 options or the revision range, when confusion arises.
 
+:git-shortlog: 1
+include::rev-list-options.txt[]
+
 MAPPING AUTHORS
 ---------------
 
diff --git a/third_party/git/Documentation/git-sparse-checkout.txt b/third_party/git/Documentation/git-sparse-checkout.txt
new file mode 100644
index 000000000000..c0342e53938a
--- /dev/null
+++ b/third_party/git/Documentation/git-sparse-checkout.txt
@@ -0,0 +1,207 @@
+git-sparse-checkout(1)
+======================
+
+NAME
+----
+git-sparse-checkout - Initialize and modify the sparse-checkout
+configuration, which reduces the checkout to a set of paths
+given by a list of patterns.
+
+
+SYNOPSIS
+--------
+[verse]
+'git sparse-checkout <subcommand> [options]'
+
+
+DESCRIPTION
+-----------
+
+Initialize and modify the sparse-checkout configuration, which reduces
+the checkout to a set of paths given by a list of patterns.
+
+THIS COMMAND IS EXPERIMENTAL. ITS BEHAVIOR, AND THE BEHAVIOR OF OTHER
+COMMANDS IN THE PRESENCE OF SPARSE-CHECKOUTS, WILL LIKELY CHANGE IN
+THE FUTURE.
+
+
+COMMANDS
+--------
+'list'::
+	Describe the patterns in the sparse-checkout file.
+
+'init'::
+	Enable the `core.sparseCheckout` setting. If the
+	sparse-checkout file does not exist, then populate it with
+	patterns that match every file in the root directory and
+	no other directories, then will remove all directories tracked
+	by Git. Add patterns to the sparse-checkout file to
+	repopulate the working directory.
++
+To avoid interfering with other worktrees, it first enables the
+`extensions.worktreeConfig` setting and makes sure to set the
+`core.sparseCheckout` setting in the worktree-specific config file.
++
+When `--cone` is provided, the `core.sparseCheckoutCone` setting is
+also set, allowing for better performance with a limited set of
+patterns (see 'CONE PATTERN SET' below).
+
+'set'::
+	Write a set of patterns to the sparse-checkout file, as given as
+	a list of arguments following the 'set' subcommand. Update the
+	working directory to match the new patterns. Enable the
+	core.sparseCheckout config setting if it is not already enabled.
++
+When the `--stdin` option is provided, the patterns are read from
+standard in as a newline-delimited list instead of from the arguments.
++
+When `core.sparseCheckoutCone` is enabled, the input list is considered a
+list of directories instead of sparse-checkout patterns. The command writes
+patterns to the sparse-checkout file to include all files contained in those
+directories (recursively) as well as files that are siblings of ancestor
+directories. The input format matches the output of `git ls-tree --name-only`.
+This includes interpreting pathnames that begin with a double quote (") as
+C-style quoted strings.
+
+'add'::
+	Update the sparse-checkout file to include additional patterns.
+	By default, these patterns are read from the command-line arguments,
+	but they can be read from stdin using the `--stdin` option. When
+	`core.sparseCheckoutCone` is enabled, the given patterns are interpreted
+	as directory names as in the 'set' subcommand.
+
+'disable'::
+	Disable the `core.sparseCheckout` config setting, and restore the
+	working directory to include all files. Leaves the sparse-checkout
+	file intact so a later 'git sparse-checkout init' command may
+	return the working directory to the same state.
+
+SPARSE CHECKOUT
+---------------
+
+"Sparse checkout" allows populating the working directory sparsely.
+It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
+Git whether a file in the working directory is worth looking at. If
+the skip-worktree bit is set, then the file is ignored in the working
+directory. Git will not populate the contents of those files, which
+makes a sparse checkout helpful when working in a repository with many
+files, but only a few are important to the current user.
+
+The `$GIT_DIR/info/sparse-checkout` file is used to define the
+skip-worktree reference bitmap. When Git updates the working
+directory, it updates the skip-worktree bits in the index based
+on this file. The files matching the patterns in the file will
+appear in the working directory, and the rest will not.
+
+To enable the sparse-checkout feature, run `git sparse-checkout init` to
+initialize a simple sparse-checkout file and enable the `core.sparseCheckout`
+config setting. Then, run `git sparse-checkout set` to modify the patterns in
+the sparse-checkout file.
+
+To repopulate the working directory with all files, use the
+`git sparse-checkout disable` command.
+
+
+FULL PATTERN SET
+----------------
+
+By default, the sparse-checkout file uses the same syntax as `.gitignore`
+files.
+
+While `$GIT_DIR/info/sparse-checkout` is usually used to specify what
+files are included, you can also specify what files are _not_ included,
+using negative patterns. For example, to remove the file `unwanted`:
+
+----------------
+/*
+!unwanted
+----------------
+
+
+CONE PATTERN SET
+----------------
+
+The full pattern set allows for arbitrary pattern matches and complicated
+inclusion/exclusion rules. These can result in O(N*M) pattern matches when
+updating the index, where N is the number of patterns and M is the number
+of paths in the index. To combat this performance issue, a more restricted
+pattern set is allowed when `core.sparseCheckoutCone` is enabled.
+
+The accepted patterns in the cone pattern set are:
+
+1. *Recursive:* All paths inside a directory are included.
+
+2. *Parent:* All files immediately inside a directory are included.
+
+In addition to the above two patterns, we also expect that all files in the
+root directory are included. If a recursive pattern is added, then all
+leading directories are added as parent patterns.
+
+By default, when running `git sparse-checkout init`, the root directory is
+added as a parent pattern. At this point, the sparse-checkout file contains
+the following patterns:
+
+----------------
+/*
+!/*/
+----------------
+
+This says "include everything in root, but nothing two levels below root."
+
+When in cone mode, the `git sparse-checkout set` subcommand takes a list of
+directories instead of a list of sparse-checkout patterns. In this mode,
+the command `git sparse-checkout set A/B/C` sets the directory `A/B/C` as
+a recursive pattern, the directories `A` and `A/B` are added as parent
+patterns. The resulting sparse-checkout file is now
+
+----------------
+/*
+!/*/
+/A/
+!/A/*/
+/A/B/
+!/A/B/*/
+/A/B/C/
+----------------
+
+Here, order matters, so the negative patterns are overridden by the positive
+patterns that appear lower in the file.
+
+If `core.sparseCheckoutCone=true`, then Git will parse the sparse-checkout file
+expecting patterns of these types. Git will warn if the patterns do not match.
+If the patterns do match the expected format, then Git will use faster hash-
+based algorithms to compute inclusion in the sparse-checkout.
+
+In the cone mode case, the `git sparse-checkout list` subcommand will list the
+directories that define the recursive patterns. For the example sparse-checkout
+file above, the output is as follows:
+
+--------------------------
+$ git sparse-checkout list
+A/B/C
+--------------------------
+
+If `core.ignoreCase=true`, then the pattern-matching algorithm will use a
+case-insensitive check. This corrects for case mismatched filenames in the
+'git sparse-checkout set' command to reflect the expected cone in the working
+directory.
+
+
+SUBMODULES
+----------
+
+If your repository contains one or more submodules, then those submodules will
+appear based on which you initialized with the `git submodule` command. If
+your sparse-checkout patterns exclude an initialized submodule, then that
+submodule will still appear in your working directory.
+
+
+SEE ALSO
+--------
+
+linkgit:git-read-tree[1]
+linkgit:gitignore[5]
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/third_party/git/Documentation/git-stash.txt b/third_party/git/Documentation/git-stash.txt
index 8fbe12c66c82..31f1beb65baf 100644
--- a/third_party/git/Documentation/git-stash.txt
+++ b/third_party/git/Documentation/git-stash.txt
@@ -15,6 +15,7 @@ SYNOPSIS
 'git stash' branch <branchname> [<stash>]
 'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
 	     [-u|--include-untracked] [-a|--all] [-m|--message <message>]
+	     [--pathspec-from-file=<file> [--pathspec-file-nul]]
 	     [--] [<pathspec>...]]
 'git stash' clear
 'git stash' create [<message>]
@@ -43,10 +44,10 @@ created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}`
 is also possible). Stashes may also be referenced by specifying just the
 stash index (e.g. the integer `n` is equivalent to `stash@{n}`).
 
-OPTIONS
--------
+COMMANDS
+--------
 
-push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]::
+push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]::
 
 	Save your local modifications to a new 'stash entry' and roll them
 	back to HEAD (in the working tree and in the index).
@@ -56,39 +57,15 @@ push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q
 For quickly making a snapshot, you can omit "push".  In this mode,
 non-option arguments are not allowed to prevent a misspelled
 subcommand from making an unwanted stash entry.  The two exceptions to this
-are `stash -p` which acts as alias for `stash push -p` and pathspecs,
+are `stash -p` which acts as alias for `stash push -p` and pathspec elements,
 which are allowed after a double hyphen `--` for disambiguation.
-+
-When pathspec is given to 'git stash push', the new stash entry records the
-modified states only for the files that match the pathspec.  The index
-entries and working tree files are then rolled back to the state in
-HEAD only for these files, too, leaving files that do not match the
-pathspec intact.
-+
-If the `--keep-index` option is used, all changes already added to the
-index are left intact.
-+
-If the `--include-untracked` option is used, all untracked files are also
-stashed and then cleaned up with `git clean`, leaving the working directory
-in a very clean state. If the `--all` option is used instead then the
-ignored files are stashed and cleaned in addition to the untracked files.
-+
-With `--patch`, you can interactively select hunks from the diff
-between HEAD and the working tree to be stashed.  The stash entry is
-constructed such that its index state is the same as the index state
-of your repository, and its worktree contains only the changes you
-selected interactively.  The selected changes are then rolled back
-from your worktree. See the ``Interactive Mode'' section of
-linkgit:git-add[1] to learn how to operate the `--patch` mode.
-+
-The `--patch` option implies `--keep-index`.  You can use
-`--no-keep-index` to override this.
 
 save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
 
 	This option is deprecated in favour of 'git stash push'.  It
-	differs from "stash push" in that it cannot take pathspecs,
-	and any non-option arguments form the message.
+	differs from "stash push" in that it cannot take pathspec.
+	Instead, all non-option arguments are concatenated to form the stash
+	message.
 
 list [<options>]::
 
@@ -110,7 +87,7 @@ show [<options>] [<stash>]::
 
 	Show the changes recorded in the stash entry as a diff between the
 	stashed contents and the commit back when the stash entry was first
-	created. When no `<stash>` is given, it shows the latest one.
+	created.
 	By default, the command shows the diffstat, but it will accept any
 	format known to 'git diff' (e.g., `git stash show -p stash@{1}`
 	to view the second most recent entry in patch form).
@@ -127,14 +104,6 @@ pop [--index] [-q|--quiet] [<stash>]::
 Applying the state can fail with conflicts; in this case, it is not
 removed from the stash list. You need to resolve the conflicts by hand
 and call `git stash drop` manually afterwards.
-+
-If the `--index` option is used, then tries to reinstate not only the working
-tree's changes, but also the index's ones. However, this can fail, when you
-have conflicts (which are stored in the index, where you therefore can no
-longer apply the changes as they were originally).
-+
-When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must
-be a reference of the form `stash@{<revision>}`.
 
 apply [--index] [-q|--quiet] [<stash>]::
 
@@ -148,8 +117,7 @@ branch <branchname> [<stash>]::
 	the commit at which the `<stash>` was originally created, applies the
 	changes recorded in `<stash>` to the new working tree and index.
 	If that succeeds, and `<stash>` is a reference of the form
-	`stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>`
-	is given, applies the latest one.
+	`stash@{<revision>}`, it then drops the `<stash>`.
 +
 This is useful if the branch on which you ran `git stash push` has
 changed enough that `git stash apply` fails due to conflicts. Since
@@ -165,9 +133,6 @@ clear::
 drop [-q|--quiet] [<stash>]::
 
 	Remove a single stash entry from the list of stash entries.
-	When no `<stash>` is given, it removes the latest one.
-	i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash
-	log reference of the form `stash@{<revision>}`.
 
 create::
 
@@ -184,6 +149,98 @@ store::
 	reflog.  This is intended to be useful for scripts.  It is
 	probably not the command you want to use; see "push" above.
 
+OPTIONS
+-------
+-a::
+--all::
+	This option is only valid for `push` and `save` commands.
++
+All ignored and untracked files are also stashed and then cleaned
+up with `git clean`.
+
+-u::
+--include-untracked::
+	This option is only valid for `push` and `save` commands.
++
+All untracked files are also stashed and then cleaned up with
+`git clean`.
+
+--index::
+	This option is only valid for `pop` and `apply` commands.
++
+Tries to reinstate not only the working tree's changes, but also
+the index's ones. However, this can fail, when you have conflicts
+(which are stored in the index, where you therefore can no longer
+apply the changes as they were originally).
+
+-k::
+--keep-index::
+--no-keep-index::
+	This option is only valid for `push` and `save` commands.
++
+All changes already added to the index are left intact.
+
+-p::
+--patch::
+	This option is only valid for `push` and `save` commands.
++
+Interactively select hunks from the diff between HEAD and the
+working tree to be stashed.  The stash entry is constructed such
+that its index state is the same as the index state of your
+repository, and its worktree contains only the changes you selected
+interactively.  The selected changes are then rolled back from your
+worktree. See the ``Interactive Mode'' section of linkgit:git-add[1]
+to learn how to operate the `--patch` mode.
++
+The `--patch` option implies `--keep-index`.  You can use
+`--no-keep-index` to override this.
+
+--pathspec-from-file=<file>::
+	This option is only valid for `push` command.
++
+Pathspec is passed in `<file>` instead of commandline args. If
+`<file>` is exactly `-` then standard input is used. Pathspec
+elements are separated by LF or CR/LF. Pathspec elements can be
+quoted as explained for the configuration variable `core.quotePath`
+(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	This option is only valid for `push` command.
++
+Only meaningful with `--pathspec-from-file`. Pathspec elements are
+separated with NUL character and all other characters are taken
+literally (including newlines and quotes).
+
+-q::
+--quiet::
+	This option is only valid for `apply`, `drop`, `pop`, `push`,
+	`save`, `store` commands.
++
+Quiet, suppress feedback messages.
+
+\--::
+	This option is only valid for `push` command.
++
+Separates pathspec from options for disambiguation purposes.
+
+<pathspec>...::
+	This option is only valid for `push` command.
++
+The new stash entry records the modified states only for the files
+that match the pathspec.  The index entries and working tree files
+are then rolled back to the state in HEAD only for these files,
+too, leaving files that do not match the pathspec intact.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
+
+<stash>::
+	This option is only valid for `apply`, `branch`, `drop`, `pop`,
+	`show` commands.
++
+A reference of the form `stash@{<revision>}`. When no `<stash>` is
+given, the latest stash is assumed (that is, `stash@{0}`).
+
 DISCUSSION
 ----------
 
diff --git a/third_party/git/Documentation/git-status.txt b/third_party/git/Documentation/git-status.txt
index d4e8f24f0c86..7731b45f078e 100644
--- a/third_party/git/Documentation/git-status.txt
+++ b/third_party/git/Documentation/git-status.txt
@@ -59,16 +59,17 @@ This is optional and defaults to the original version 'v1' format.
 --untracked-files[=<mode>]::
 	Show untracked files.
 +
+--
 The mode parameter is used to specify the handling of untracked files.
 It is optional: it defaults to 'all', and if specified, it must be
 stuck to the option (e.g. `-uno`, but not `-u no`).
-+
+
 The possible options are:
-+
+
 	- 'no'     - Show no untracked files.
 	- 'normal' - Shows untracked files and directories.
 	- 'all'    - Also shows individual files in untracked directories.
-+
+
 When `-u` option is not used, untracked files and directories are
 shown (i.e. the same as specifying `normal`), to help you avoid
 forgetting to add newly created files.  Because it takes extra work
@@ -78,9 +79,10 @@ Consider enabling untracked cache and split index if supported (see
 `git update-index --untracked-cache` and `git update-index
 --split-index`), Otherwise you can use `no` to have `git status`
 return more quickly without showing untracked files.
-+
+
 The default can be changed using the status.showUntrackedFiles
 configuration variable documented in linkgit:git-config[1].
+--
 
 --ignore-submodules[=<when>]::
 	Ignore changes to submodules when looking for changes. <when> can be
@@ -100,11 +102,12 @@ configuration variable documented in linkgit:git-config[1].
 --ignored[=<mode>]::
 	Show ignored files as well.
 +
+--
 The mode parameter is used to specify the handling of ignored files.
 It is optional: it defaults to 'traditional'.
-+
+
 The possible options are:
-+
+
 	- 'traditional' - Shows ignored files and directories, unless
 			  --untracked-files=all is specified, in which case
 			  individual files in ignored directories are
@@ -112,12 +115,13 @@ The possible options are:
 	- 'no'	        - Show no ignored files.
 	- 'matching'    - Shows ignored files and directories matching an
 			  ignore pattern.
-+
+
 When 'matching' mode is specified, paths that explicitly match an
 ignored pattern are shown. If a directory matches an ignore pattern,
 then it is shown, but not paths contained in the ignored directory. If
 a directory does not match an ignore pattern, but all contents are
 ignored, then the directory is not shown, but all contents are shown.
+--
 
 -z::
 	Terminate entries with NUL, instead of LF.  This implies
diff --git a/third_party/git/Documentation/git-submodule.txt b/third_party/git/Documentation/git-submodule.txt
index 0ed5c24dc1ce..c9ed2bf3d5c5 100644
--- a/third_party/git/Documentation/git-submodule.txt
+++ b/third_party/git/Documentation/git-submodule.txt
@@ -16,6 +16,7 @@ SYNOPSIS
 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)
 'git submodule' [--quiet] update [<options>] [--] [<path>...]
 'git submodule' [--quiet] set-branch [<options>] [--] <path>
+'git submodule' [--quiet] set-url [--] <path> <newurl>
 'git submodule' [--quiet] summary [<options>] [--] [<path>...]
 'git submodule' [--quiet] foreach [--recursive] <command>
 'git submodule' [--quiet] sync [--recursive] [--] [<path>...]
@@ -80,6 +81,9 @@ status [--cached] [--recursive] [--] [<path>...]::
 	does not match the SHA-1 found in the index of the containing
 	repository and `U` if the submodule has merge conflicts.
 +
+If `--cached` is specified, this command will instead print the SHA-1
+recorded in the superproject for each submodule.
++
 If `--recursive` is specified, this command will recurse into nested
 submodules, and show their status as well.
 +
@@ -129,11 +133,12 @@ If you really want to remove a submodule from the repository and commit
 that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal
 options.
 
-update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]::
+update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]::
 +
 --
 Update the registered submodules to match what the superproject
-expects by cloning missing submodules and updating the working tree of
+expects by cloning missing submodules, fetching missing commits
+in submodules and updating the working tree of
 the submodules. The "updating" can be done in several ways depending
 on command line options and the value of `submodule.<name>.update`
 configuration variable. The command line option takes precedence over
@@ -173,12 +178,18 @@ submodule with the `--init` option.
 If `--recursive` is specified, this command will recurse into the
 registered submodules, and update any nested submodules within.
 --
-set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>::
+set-branch (-b|--branch) <branch> [--] <path>::
+set-branch (-d|--default) [--] <path>::
 	Sets the default remote tracking branch for the submodule. The
 	`--branch` option allows the remote branch to be specified. The
 	`--default` option removes the submodule.<name>.branch configuration
 	key, which causes the tracking branch to default to 'master'.
 
+set-url [--] <path> <newurl>::
+	Sets the URL of the specified submodule to <newurl>. Then, it will
+	automatically synchronize the submodule's new remote URL
+	configuration.
+
 summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]::
 	Show commit summary between the given commit (defaults to HEAD) and
 	working tree/index. For a submodule in question, a series of commits
@@ -218,7 +229,7 @@ As an example, the command below will show the path and currently
 checked out commit for each submodule:
 +
 --------------
-git submodule foreach 'echo $path `git rev-parse HEAD`'
+git submodule foreach 'echo $sm_path `git rev-parse HEAD`'
 --------------
 
 sync [--recursive] [--] [<path>...]::
@@ -237,7 +248,7 @@ registered submodules, and sync any nested submodules within.
 
 absorbgitdirs::
 	If a git directory of a submodule is inside the submodule,
-	move the git directory of the submodule into its superprojects
+	move the git directory of the submodule into its superproject's
 	`$GIT_DIR/modules` path and then connect the git directory and
 	its working directory by setting the `core.worktree` and adding
 	a .git file pointing to the git directory embedded in the
@@ -419,6 +430,10 @@ options carefully.
 	Clone new submodules in parallel with as many jobs.
 	Defaults to the `submodule.fetchJobs` option.
 
+--[no-]single-branch::
+	This option is only valid for the update command.
+	Clone only one branch during update: HEAD or one specified by --branch.
+
 <path>...::
 	Paths to submodule(s). When specified this will restrict the command
 	to only operate on the submodules found at the specified paths.
diff --git a/third_party/git/Documentation/git-svn.txt b/third_party/git/Documentation/git-svn.txt
index 30711625fdec..6624a14fbd70 100644
--- a/third_party/git/Documentation/git-svn.txt
+++ b/third_party/git/Documentation/git-svn.txt
@@ -677,7 +677,8 @@ config key: svn.authorsProg
 -s<strategy>::
 --strategy=<strategy>::
 -p::
---preserve-merges::
+--rebase-merges::
+--preserve-merges (DEPRECATED)::
 	These are only used with the 'dcommit' and 'rebase' commands.
 +
 Passed directly to 'git rebase' when using 'dcommit' if a
@@ -769,11 +770,11 @@ option for (hopefully) obvious reasons.
 +
 This option is NOT recommended as it makes it difficult to track down
 old references to SVN revision numbers in existing documentation, bug
-reports and archives.  If you plan to eventually migrate from SVN to Git
-and are certain about dropping SVN history, consider
-linkgit:git-filter-branch[1] instead.  filter-branch also allows
-reformatting of metadata for ease-of-reading and rewriting authorship
-info for non-"svn.authorsFile" users.
+reports, and archives.  If you plan to eventually migrate from SVN to
+Git and are certain about dropping SVN history, consider
+https://github.com/newren/git-filter-repo[git-filter-repo] instead.
+filter-repo also allows reformatting of metadata for ease-of-reading
+and rewriting authorship info for non-"svn.authorsFile" users.
 
 svn.useSvmProps::
 svn-remote.<name>.useSvmProps::
diff --git a/third_party/git/Documentation/git-tag.txt b/third_party/git/Documentation/git-tag.txt
index 2e5599a67f86..f6d979178028 100644
--- a/third_party/git/Documentation/git-tag.txt
+++ b/third_party/git/Documentation/git-tag.txt
@@ -65,7 +65,7 @@ OPTIONS
 --sign::
 	Make a GPG-signed tag, using the default e-mail address's key.
 	The default behavior of tag GPG-signing is controlled by `tag.gpgSign`
-	configuration variable if it exists, or disabled oder otherwise.
+	configuration variable if it exists, or disabled otherwise.
 	See linkgit:git-config[1].
 
 --no-sign::
diff --git a/third_party/git/Documentation/git-update-index.txt b/third_party/git/Documentation/git-update-index.txt
index 1c4d146a41ce..1489cb09a099 100644
--- a/third_party/git/Documentation/git-update-index.txt
+++ b/third_party/git/Documentation/git-update-index.txt
@@ -16,6 +16,7 @@ SYNOPSIS
 	     [--chmod=(+|-)x]
 	     [--[no-]assume-unchanged]
 	     [--[no-]skip-worktree]
+	     [--[no-]ignore-skip-worktree-entries]
 	     [--[no-]fsmonitor-valid]
 	     [--ignore-submodules]
 	     [--[no-]split-index]
@@ -113,6 +114,11 @@ you will need to handle the situation manually.
 	set and unset the "skip-worktree" bit for the paths. See
 	section "Skip-worktree bit" below for more information.
 
+
+--[no-]ignore-skip-worktree-entries::
+	Do not remove skip-worktree (AKA "index-only") entries even when
+	the `--remove` option was specified.
+
 --[no-]fsmonitor-valid::
 	When one of these flags is specified, the object name recorded
 	for the paths are not updated. Instead, these options
@@ -426,7 +432,7 @@ specified by the splitIndex.sharedIndexExpire config variable (see
 linkgit:git-config[1]).
 
 To avoid deleting a shared index file that is still used, its
-modification time is updated to the current time everytime a new split
+modification time is updated to the current time every time a new split
 index based on the shared index file is either created or read from.
 
 UNTRACKED CACHE
@@ -543,6 +549,22 @@ The untracked cache extension can be enabled by the
 `core.untrackedCache` configuration variable (see
 linkgit:git-config[1]).
 
+NOTES
+-----
+
+Users often try to use the assume-unchanged and skip-worktree bits
+to tell Git to ignore changes to files that are tracked.  This does not
+work as expected, since Git may still check working tree files against
+the index when performing certain operations.  In general, Git does not
+provide a way to ignore changes to tracked files, so alternate solutions
+are recommended.
+
+For example, if the file you want to change is some sort of config file,
+the repository can include a sample config file that can then be copied
+into the ignored name and modified.  The repository can even include a
+script to treat the sample file as a template, modifying and copying it
+automatically.
+
 SEE ALSO
 --------
 linkgit:git-config[1],
diff --git a/third_party/git/Documentation/git.txt b/third_party/git/Documentation/git.txt
index 9b82564d1aa9..b0672bd8065f 100644
--- a/third_party/git/Documentation/git.txt
+++ b/third_party/git/Documentation/git.txt
@@ -110,9 +110,23 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config
 	Do not pipe Git output into a pager.
 
 --git-dir=<path>::
-	Set the path to the repository. This can also be controlled by
-	setting the `GIT_DIR` environment variable. It can be an absolute
-	path or relative path to current working directory.
+	Set the path to the repository (".git" directory). This can also be
+	controlled by setting the `GIT_DIR` environment variable. It can be
+	an absolute path or relative path to current working directory.
++
+Specifying the location of the ".git" directory using this
+option (or `GIT_DIR` environment variable) turns off the
+repository discovery that tries to find a directory with
+".git" subdirectory (which is how the repository and the
+top-level of the working tree are discovered), and tells Git
+that you are at the top level of the working tree.  If you
+are not at the top-level directory of the working tree, you
+should tell Git where the top-level of the working tree is,
+with the `--work-tree=<path>` option (or `GIT_WORK_TREE`
+environment variable)
++
+If you just want to run git as if it was started in `<path>` then use
+`git -C <path>`.
 
 --work-tree=<path>::
 	Set the path to the working tree. It can be an absolute path
@@ -271,8 +285,8 @@ In general, the interrogate commands do not touch the files in
 the working tree.
 
 
-Synching repositories
-~~~~~~~~~~~~~~~~~~~~~
+Syncing repositories
+~~~~~~~~~~~~~~~~~~~~
 
 include::cmds-synchingrepositories.txt[]
 
@@ -482,13 +496,36 @@ double-quotes and respecting backslash escapes. E.g., the value
 Git Commits
 ~~~~~~~~~~~
 `GIT_AUTHOR_NAME`::
+	The human-readable name used in the author identity when creating commit or
+	tag objects, or when writing reflogs. Overrides the `user.name` and
+	`author.name` configuration settings.
+
 `GIT_AUTHOR_EMAIL`::
+	The email address used in the author identity when creating commit or
+	tag objects, or when writing reflogs. Overrides the `user.email` and
+	`author.email` configuration settings.
+
 `GIT_AUTHOR_DATE`::
+	The date used for the author identity when creating commit or tag objects, or
+	when writing reflogs. See linkgit:git-commit[1] for valid formats.
+
 `GIT_COMMITTER_NAME`::
+	The human-readable name used in the committer identity when creating commit or
+	tag objects, or when writing reflogs. Overrides the `user.name` and
+	`committer.name` configuration settings.
+
 `GIT_COMMITTER_EMAIL`::
+	The email address used in the author identity when creating commit or
+	tag objects, or when writing reflogs. Overrides the `user.email` and
+	`committer.email` configuration settings.
+
 `GIT_COMMITTER_DATE`::
-'EMAIL'::
-	see linkgit:git-commit-tree[1]
+	The date used for the committer identity when creating commit or tag objects, or
+	when writing reflogs. See linkgit:git-commit[1] for valid formats.
+
+`EMAIL`::
+	The email address used in the author and committer identities if no other
+	relevant environment variable or configuration setting has been set.
 
 Git Diffs
 ~~~~~~~~~
@@ -544,6 +581,10 @@ other
 	a pager.  See also the `core.pager` option in
 	linkgit:git-config[1].
 
+`GIT_PROGRESS_DELAY`::
+	A number controlling how many seconds to delay before showing
+	optional progress indicators. Defaults to 2.
+
 `GIT_EDITOR`::
 	This environment variable overrides `$EDITOR` and `$VISUAL`.
 	It is used by several Git commands when, on interactive mode,
@@ -928,7 +969,7 @@ Reporting Bugs
 Report bugs to the Git mailing list <git@vger.kernel.org> where the
 development and maintenance is primarily done.  You do not have to be
 subscribed to the list to send a message there.  See the list archive
-at https://public-inbox.org/git for previous bug reports and other
+at https://lore.kernel.org/git for previous bug reports and other
 discussions.
 
 Issues which are security relevant should be disclosed privately to
diff --git a/third_party/git/Documentation/gitattributes.txt b/third_party/git/Documentation/gitattributes.txt
index fb1d188d440c..508fe713c4cf 100644
--- a/third_party/git/Documentation/gitattributes.txt
+++ b/third_party/git/Documentation/gitattributes.txt
@@ -293,10 +293,10 @@ web front ends do not visualize the contents of these files by default.
 
 In these cases you can tell Git the encoding of a file in the working
 directory with the `working-tree-encoding` attribute. If a file with this
-attribute is added to Git, then Git reencodes the content from the
+attribute is added to Git, then Git re-encodes the content from the
 specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded
 content in its internal data structure (called "the index"). On checkout
-the content is reencoded back to the specified encoding.
+the content is re-encoded back to the specified encoding.
 
 Please note that using the `working-tree-encoding` attribute may have a
 number of pitfalls:
@@ -498,7 +498,7 @@ command. This is achieved by using the long-running process protocol
 When Git encounters the first file that needs to be cleaned or smudged,
 it starts the filter and performs the handshake. In the handshake, the
 welcome message sent by Git is "git-filter-client", only version 2 is
-suppported, and the supported capabilities are "clean", "smudge", and
+supported, and the supported capabilities are "clean", "smudge", and
 "delay".
 
 Afterwards Git sends a list of "key=value" pairs terminated with
@@ -810,6 +810,10 @@ patterns are available:
 
 - `css` suitable for cascading style sheets.
 
+- `dts` suitable for devicetree (DTS) files.
+
+- `elixir` suitable for source code in the Elixir language.
+
 - `fortran` suitable for source code in the Fortran language.
 
 - `fountain` suitable for Fountain documents.
diff --git a/third_party/git/Documentation/gitcli.txt b/third_party/git/Documentation/gitcli.txt
index 1ed3ca33b7a9..92e4ba6a2fa9 100644
--- a/third_party/git/Documentation/gitcli.txt
+++ b/third_party/git/Documentation/gitcli.txt
@@ -37,6 +37,12 @@ arguments.  Here are the rules:
    file called HEAD in your work tree, `git diff HEAD` is ambiguous, and
    you have to say either `git diff HEAD --` or `git diff -- HEAD` to
    disambiguate.
+
+ * Because `--` disambiguates revisions and paths in some commands, it
+   cannot be used for those commands to separate options and revisions.
+   You can use `--end-of-options` for this (it also works for commands
+   that do not distinguish between revisions in paths, in which case it
+   is simply an alias for `--`).
 +
 When writing a script that is expected to handle random user-input, it is
 a good practice to make it explicit which arguments are which by placing
@@ -120,6 +126,11 @@ usage: git describe [<options>] <commit-ish>*
     --long                always use long format
     --abbrev[=<n>]        use <n> digits to display SHA-1s
 ---------------------------------------------
++
+Note that some subcommand (e.g. `git grep`) may behave differently
+when there are things on the command line other than `-h`, but `git
+subcmd -h` without anything else on the command line is meant to
+consistently give the usage.
 
 --help-all::
 	Some Git commands take options that are only used for plumbing or that
@@ -205,8 +216,8 @@ only affects the files in the working tree, but with
 entries, and with `--cached`, it modifies only the index
 entries.
 
-See also http://marc.info/?l=git&m=116563135620359 and
-http://marc.info/?l=git&m=119150393620273 for further
+See also https://lore.kernel.org/git/7v64clg5u9.fsf@assigned-by-dhcp.cox.net/ and
+https://lore.kernel.org/git/7vy7ej9g38.fsf@gitster.siamese.dyndns.org/ for further
 information.
 
 Some other commands that also work on files in the working tree and/or
diff --git a/third_party/git/Documentation/gitcore-tutorial.txt b/third_party/git/Documentation/gitcore-tutorial.txt
index f880d21dfb52..c0b95256cc8c 100644
--- a/third_party/git/Documentation/gitcore-tutorial.txt
+++ b/third_party/git/Documentation/gitcore-tutorial.txt
@@ -751,7 +751,7 @@ to it.
 ================================================
 If you make the decision to start your new branch at some
 other point in the history than the current `HEAD`, you can do so by
-just telling 'git checkout' what the base of the checkout would be.
+just telling 'git switch' what the base of the checkout would be.
 In other words, if you have an earlier tag or branch, you'd just do
 
 ------------
diff --git a/third_party/git/Documentation/gitcredentials.txt b/third_party/git/Documentation/gitcredentials.txt
index adc759612de9..1814d2d23c18 100644
--- a/third_party/git/Documentation/gitcredentials.txt
+++ b/third_party/git/Documentation/gitcredentials.txt
@@ -131,7 +131,9 @@ context would not match:
 because the hostnames differ. Nor would it match `foo.example.com`; Git
 compares hostnames exactly, without considering whether two hosts are part of
 the same domain. Likewise, a config entry for `http://example.com` would not
-match: Git compares the protocols exactly.
+match: Git compares the protocols exactly.  However, you may use wildcards in
+the domain name and other pattern matching techniques as with the `http.<url>.*`
+options.
 
 If the "pattern" URL does include a path component, then this too must match
 exactly: the context `https://example.com/bar/baz.git` will match a config
@@ -186,8 +188,94 @@ CUSTOM HELPERS
 --------------
 
 You can write your own custom helpers to interface with any system in
-which you keep credentials. See the documentation for Git's
-link:technical/api-credentials.html[credentials API] for details.
+which you keep credentials.
+
+Credential helpers are programs executed by Git to fetch or save
+credentials from and to long-term storage (where "long-term" is simply
+longer than a single Git process; e.g., credentials may be stored
+in-memory for a few minutes, or indefinitely on disk).
+
+Each helper is specified by a single string in the configuration
+variable `credential.helper` (and others, see linkgit:git-config[1]).
+The string is transformed by Git into a command to be executed using
+these rules:
+
+  1. If the helper string begins with "!", it is considered a shell
+     snippet, and everything after the "!" becomes the command.
+
+  2. Otherwise, if the helper string begins with an absolute path, the
+     verbatim helper string becomes the command.
+
+  3. Otherwise, the string "git credential-" is prepended to the helper
+     string, and the result becomes the command.
+
+The resulting command then has an "operation" argument appended to it
+(see below for details), and the result is executed by the shell.
+
+Here are some example specifications:
+
+----------------------------------------------------
+# run "git credential-foo"
+foo
+
+# same as above, but pass an argument to the helper
+foo --bar=baz
+
+# the arguments are parsed by the shell, so use shell
+# quoting if necessary
+foo --bar="whitespace arg"
+
+# you can also use an absolute path, which will not use the git wrapper
+/path/to/my/helper --with-arguments
+
+# or you can specify your own shell snippet
+!f() { echo "password=`cat $HOME/.secret`"; }; f
+----------------------------------------------------
+
+Generally speaking, rule (3) above is the simplest for users to specify.
+Authors of credential helpers should make an effort to assist their
+users by naming their program "git-credential-$NAME", and putting it in
+the `$PATH` or `$GIT_EXEC_PATH` during installation, which will allow a
+user to enable it with `git config credential.helper $NAME`.
+
+When a helper is executed, it will have one "operation" argument
+appended to its command line, which is one of:
+
+`get`::
+
+	Return a matching credential, if any exists.
+
+`store`::
+
+	Store the credential, if applicable to the helper.
+
+`erase`::
+
+	Remove a matching credential, if any, from the helper's storage.
+
+The details of the credential will be provided on the helper's stdin
+stream. The exact format is the same as the input/output format of the
+`git credential` plumbing command (see the section `INPUT/OUTPUT
+FORMAT` in linkgit:git-credential[1] for a detailed specification).
+
+For a `get` operation, the helper should produce a list of attributes on
+stdout in the same format (see linkgit:git-credential[1] for common
+attributes). A helper is free to produce a subset, or even no values at
+all if it has nothing useful to provide. Any provided attributes will
+overwrite those already known about by Git.  If a helper outputs a
+`quit` attribute with a value of `true` or `1`, no further helpers will
+be consulted, nor will the user be prompted (if no credential has been
+provided, the operation will then fail).
+
+For a `store` or `erase` operation, the helper's output is ignored.
+If it fails to perform the requested operation, it may complain to
+stderr to inform the user. If it does not support the requested
+operation (e.g., a read-only store), it should silently ignore the
+request.
+
+If a helper receives any other operation, it should silently ignore the
+request. This leaves room for future operations to be added (older
+helpers will just ignore the new requests).
 
 GIT
 ---
diff --git a/third_party/git/Documentation/githooks.txt b/third_party/git/Documentation/githooks.txt
index 82cd573776ce..3dccab537587 100644
--- a/third_party/git/Documentation/githooks.txt
+++ b/third_party/git/Documentation/githooks.txt
@@ -103,6 +103,28 @@ The default 'pre-commit' hook, when enabled--and with the
 `hooks.allownonascii` config option unset or set to false--prevents
 the use of non-ASCII filenames.
 
+pre-merge-commit
+~~~~~~~~~~~~~~~~
+
+This hook is invoked by linkgit:git-merge[1], and can be bypassed
+with the `--no-verify` option.  It takes no parameters, and is
+invoked after the merge has been carried out successfully and before
+obtaining the proposed commit log message to
+make a commit.  Exiting with a non-zero status from this script
+causes the `git merge` command to abort before creating a commit.
+
+The default 'pre-merge-commit' hook, when enabled, runs the
+'pre-commit' hook, if the latter is enabled.
+
+This hook is invoked with the environment variable
+`GIT_EDITOR=:` if the command will not bring up an editor
+to modify the commit message.
+
+If the merge cannot be carried out automatically, the conflicts
+need to be resolved and the result committed separately (see
+linkgit:git-merge[1]). At that point, this hook will not be executed,
+but the 'pre-commit' hook will, if it is enabled.
+
 prepare-commit-msg
 ~~~~~~~~~~~~~~~~~~
 
@@ -425,10 +447,12 @@ post-rewrite
 
 This hook is invoked by commands that rewrite commits
 (linkgit:git-commit[1] when called with `--amend` and
-linkgit:git-rebase[1]; currently `git filter-branch` does 'not' call
-it!).  Its first argument denotes the command it was invoked by:
-currently one of `amend` or `rebase`.  Further command-dependent
-arguments may be passed in the future.
+linkgit:git-rebase[1]; however, full-history (re)writing tools like
+linkgit:git-fast-import[1] or
+https://github.com/newren/git-filter-repo[git-filter-repo] typically
+do not call it!).  Its first argument denotes the command it was
+invoked by: currently one of `amend` or `rebase`.  Further
+command-dependent arguments may be passed in the future.
 
 The hook receives a list of the rewritten commits on stdin, in the
 format
@@ -466,9 +490,16 @@ fsmonitor-watchman
 ~~~~~~~~~~~~~~~~~~
 
 This hook is invoked when the configuration option `core.fsmonitor` is
-set to `.git/hooks/fsmonitor-watchman`.  It takes two arguments, a version
-(currently 1) and the time in elapsed nanoseconds since midnight,
-January 1, 1970.
+set to `.git/hooks/fsmonitor-watchman` or `.git/hooks/fsmonitor-watchmanv2`
+depending on the version of the hook to use.
+
+Version 1 takes two arguments, a version (1) and the time in elapsed
+nanoseconds since midnight, January 1, 1970.
+
+Version 2 takes two arguments, a version (2) and a token that is used
+for identifying changes since the token. For watchman this would be
+a clock id. This version must output to stdout the new token followed
+by a NUL before the list of files.
 
 The hook should output to stdout the list of all files in the working
 directory that may have changed since the requested time.  The logic
diff --git a/third_party/git/Documentation/gitk.txt b/third_party/git/Documentation/gitk.txt
index 1eabb0aaf3ae..c653ebb6a80c 100644
--- a/third_party/git/Documentation/gitk.txt
+++ b/third_party/git/Documentation/gitk.txt
@@ -105,8 +105,12 @@ linkgit:git-rev-list[1] for a complete list.
 	(or the function name regex <funcname>) within the <file>.  You may
 	not give any pathspec limiters.  This is currently limited to
 	a walk starting from a single revision, i.e., you may only
-	give zero or one positive revision arguments.
-	You can specify this option more than once.
+	give zero or one positive revision arguments, and
+	<start> and <end> (or <funcname>) must exist in the starting revision.
+	You can specify this option more than once. Implies `--patch`.
+	Patch output can be suppressed using `--no-patch`, but other diff formats
+	(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
+	`--name-only`, `--name-status`, `--check`) are not currently implemented.
 +
 *Note:* gitk (unlike linkgit:git-log[1]) currently only understands
 this option if you specify it "glued together" with its argument.  Do
diff --git a/third_party/git/Documentation/gitmodules.txt b/third_party/git/Documentation/gitmodules.txt
index a66e95b70c36..67275fd187f0 100644
--- a/third_party/git/Documentation/gitmodules.txt
+++ b/third_party/git/Documentation/gitmodules.txt
@@ -44,9 +44,8 @@ submodule.<name>.update::
 	submodule init` to initialize the configuration variable of
 	the same name. Allowed values here are 'checkout', 'rebase',
 	'merge' or 'none'. See description of 'update' command in
-	linkgit:git-submodule[1] for their meaning. Note that the
-	'!command' form is intentionally ignored here for security
-	reasons.
+	linkgit:git-submodule[1] for their meaning. For security
+	reasons, the '!command' form is not accepted here.
 
 submodule.<name>.branch::
 	A remote branch name for tracking updates in the upstream submodule.
@@ -81,7 +80,7 @@ submodule.<name>.ignore::
 	    Committed differences and modifications to tracked files will show
 	    up.
 
-	none;; No modifiations to submodules are ignored, all of committed
+	none;; No modifications to submodules are ignored, all of committed
 	    differences, and modifications to tracked and untracked files are
 	    shown. This is the default option.
 
@@ -90,7 +89,7 @@ of the superproject, the setting there will override the one found in
 .gitmodules.
 
 Both settings can be overridden on the command line by using the
-"--ignore-submodule" option. The 'git submodule' commands are not
+"--ignore-submodules" option. The 'git submodule' commands are not
 affected by this setting.
 --
 
@@ -105,14 +104,15 @@ EXAMPLES
 
 Consider the following .gitmodules file:
 
-	[submodule "libfoo"]
-		path = include/foo
-		url = git://foo.com/git/lib.git
-
-	[submodule "libbar"]
-		path = include/bar
-		url = git://bar.com/git/lib.git
+----
+[submodule "libfoo"]
+	path = include/foo
+	url = git://foo.com/git/lib.git
 
+[submodule "libbar"]
+	path = include/bar
+	url = git://bar.com/git/lib.git
+----
 
 This defines two submodules, `libfoo` and `libbar`. These are expected to
 be checked out in the paths `include/foo` and `include/bar`, and for both
@@ -120,7 +120,7 @@ submodules a URL is specified which can be used for cloning the submodules.
 
 SEE ALSO
 --------
-linkgit:git-submodule[1] linkgit:git-config[1]
+linkgit:git-submodule[1], linkgit:gitsubmodules[7], linkgit:git-config[1]
 
 GIT
 ---
diff --git a/third_party/git/Documentation/gitremote-helpers.txt b/third_party/git/Documentation/gitremote-helpers.txt
index 43f80c806838..f48a031dc346 100644
--- a/third_party/git/Documentation/gitremote-helpers.txt
+++ b/third_party/git/Documentation/gitremote-helpers.txt
@@ -297,9 +297,13 @@ Supported if the helper has the "option" capability.
 	same batch are complete. Only objects which were reported
 	in the output of 'list' with a sha1 may be fetched this way.
 +
-Optionally may output a 'lock <file>' line indicating a file under
-GIT_DIR/objects/pack which is keeping a pack until refs can be
-suitably updated.
+Optionally may output a 'lock <file>' line indicating the full path of
+a file under `$GIT_DIR/objects/pack` which is keeping a pack until
+refs can be suitably updated.  The path must end with `.keep`. This is
+a mechanism to name a <pack,idx,keep> tuple by giving only the keep
+component.  The kept pack will not be deleted by a concurrent repack,
+even though its objects may not be referenced until the fetch completes.
+The `.keep` file will be deleted at the conclusion of the fetch.
 +
 If option 'check-connectivity' is requested, the helper must output
 'connectivity-ok' if the clone is self-contained and connected.
@@ -505,6 +509,11 @@ set by Git if the remote helper has the 'option' capability.
 	Indicate that only the objects wanted need to be fetched, not
 	their dependents.
 
+'option atomic' {'true'|'false'}::
+	When pushing, request the remote server to update refs in a single atomic
+	transaction.  If successful, all refs will be updated, or none will.  If the
+	remote side does not support this capability, the push will fail.
+
 SEE ALSO
 --------
 linkgit:git-remote[1]
diff --git a/third_party/git/Documentation/gitrepository-layout.txt b/third_party/git/Documentation/gitrepository-layout.txt
index 216b11ee88f4..1a2ef4c15055 100644
--- a/third_party/git/Documentation/gitrepository-layout.txt
+++ b/third_party/git/Documentation/gitrepository-layout.txt
@@ -59,7 +59,7 @@ objects/[0-9a-f][0-9a-f]::
 	here are often called 'unpacked' (or 'loose') objects.
 
 objects/pack::
-	Packs (files that store many object in compressed form,
+	Packs (files that store many objects in compressed form,
 	along with index files to allow them to be randomly
 	accessed) are found in this directory.
 
@@ -96,9 +96,9 @@ refs::
 	directory.  The 'git prune' command knows to preserve
 	objects reachable from refs found in this directory and
 	its subdirectories.
-	This directory is ignored (except refs/bisect and
-	refs/worktree) if $GIT_COMMON_DIR is set and
-	"$GIT_COMMON_DIR/refs" will be used instead.
+	This directory is ignored (except refs/bisect,
+	refs/rewritten and refs/worktree) if $GIT_COMMON_DIR is
+	set and "$GIT_COMMON_DIR/refs" will be used instead.
 
 refs/heads/`name`::
 	records tip-of-the-tree commit objects of branch `name`
@@ -240,8 +240,8 @@ remotes::
 logs::
 	Records of changes made to refs are stored in this directory.
 	See linkgit:git-update-ref[1] for more information. This
-	directory is ignored if $GIT_COMMON_DIR is set and
-	"$GIT_COMMON_DIR/logs" will be used instead.
+	directory is ignored (except logs/HEAD) if $GIT_COMMON_DIR is
+	set and "$GIT_COMMON_DIR/logs" will be used instead.
 
 logs/refs/heads/`name`::
 	Records all changes made to the branch tip named `name`.
diff --git a/third_party/git/Documentation/gitsubmodules.txt b/third_party/git/Documentation/gitsubmodules.txt
index 0a890205b8b5..c476f891b5ce 100644
--- a/third_party/git/Documentation/gitsubmodules.txt
+++ b/third_party/git/Documentation/gitsubmodules.txt
@@ -3,7 +3,7 @@ gitsubmodules(7)
 
 NAME
 ----
-gitsubmodules - mounting one repository inside another
+gitsubmodules - Mounting one repository inside another
 
 SYNOPSIS
 --------
diff --git a/third_party/git/Documentation/gitweb.conf.txt b/third_party/git/Documentation/gitweb.conf.txt
index 35317e71c870..7963a79ba98b 100644
--- a/third_party/git/Documentation/gitweb.conf.txt
+++ b/third_party/git/Documentation/gitweb.conf.txt
@@ -786,9 +786,9 @@ forks::
 	subdirectories of project root (basename) to be forks of existing
 	projects.  For each project +$projname.git+, projects in the
 	+$projname/+ directory and its subdirectories will not be
-	shown in the main projects list.  Instead, a \'\+' mark is shown
-	next to +$projname+, which links to a "forks" view that lists all
-	the forks (all projects in +$projname/+ subdirectory).  Additionally
+	shown in the main projects list.  Instead, a \'+' mark is shown
+	next to `$projname`, which links to a "forks" view that lists all
+	the forks (all projects in `$projname/` subdirectory).  Additionally
 	a "forks" view for a project is linked from project summary page.
 +
 If the project list is taken from a file (+$projects_list+ points to a
diff --git a/third_party/git/Documentation/howto/separating-topic-branches.txt b/third_party/git/Documentation/howto/separating-topic-branches.txt
index bd1027433bb7..81be0d611501 100644
--- a/third_party/git/Documentation/howto/separating-topic-branches.txt
+++ b/third_party/git/Documentation/howto/separating-topic-branches.txt
@@ -81,7 +81,7 @@ After I am done, I'd try a pretend-merge between "topicA" and
               o---o---o---o---o---o
 
 The last diff better not to show anything other than cleanups
-for crufts.  Then I can finally clean things up:
+for cruft.  Then I can finally clean things up:
 
         $ git branch -D topic
         $ git reset --hard HEAD^ ;# nuke pretend merge
diff --git a/third_party/git/Documentation/manpage-bold-literal.xsl b/third_party/git/Documentation/manpage-bold-literal.xsl
index 608eb5df6281..94d6c1b54565 100644
--- a/third_party/git/Documentation/manpage-bold-literal.xsl
+++ b/third_party/git/Documentation/manpage-bold-literal.xsl
@@ -1,12 +1,13 @@
 <!-- manpage-bold-literal.xsl:
      special formatting for manpages rendered from asciidoc+docbook -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:d="http://docbook.org/ns/docbook"
 		version="1.0">
 
 <!-- render literal text as bold (instead of plain or monospace);
      this makes literal text easier to distinguish in manpages
      viewed on a tty -->
-<xsl:template match="literal">
+<xsl:template match="literal|d:literal">
 	<xsl:value-of select="$git.docbook.backslash"/>
 	<xsl:text>fB</xsl:text>
 	<xsl:apply-templates/>
diff --git a/third_party/git/Documentation/manpage.xsl b/third_party/git/Documentation/manpage.xsl
new file mode 100644
index 000000000000..ef64bab17a6f
--- /dev/null
+++ b/third_party/git/Documentation/manpage.xsl
@@ -0,0 +1,3 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl" />
+</xsl:stylesheet>
diff --git a/third_party/git/Documentation/merge-options.txt b/third_party/git/Documentation/merge-options.txt
index 79a00d2a4abd..40dc4f5e8c6e 100644
--- a/third_party/git/Documentation/merge-options.txt
+++ b/third_party/git/Documentation/merge-options.txt
@@ -34,26 +34,30 @@ set to `no` at the beginning of them.
 
 --cleanup=<mode>::
 	This option determines how the merge message will be cleaned up before
-	commiting. See linkgit:git-commit[1] for more details. In addition, if
+	committing. See linkgit:git-commit[1] for more details. In addition, if
 	the '<mode>' is given a value of `scissors`, scissors will be appended
 	to `MERGE_MSG` before being passed on to the commit machinery in the
 	case of a merge conflict.
 
 --ff::
-	When the merge resolves as a fast-forward, only update the branch
-	pointer, without creating a merge commit.  This is the default
-	behavior.
-
 --no-ff::
-	Create a merge commit even when the merge resolves as a
-	fast-forward.  This is the default behaviour when merging an
-	annotated (and possibly signed) tag that is not stored in
-	its natural place in 'refs/tags/' hierarchy.
-
 --ff-only::
-	Refuse to merge and exit with a non-zero status unless the
-	current `HEAD` is already up to date or the merge can be
-	resolved as a fast-forward.
+	Specifies how a merge is handled when the merged-in history is
+	already a descendant of the current history.  `--ff` is the
+	default unless merging an annotated (and possibly signed) tag
+	that is not stored in its natural place in the `refs/tags/`
+	hierarchy, in which case `--no-ff` is assumed.
++
+With `--ff`, when possible resolve the merge as a fast-forward (only
+update the branch pointer to match the merged branch; do not create a
+merge commit).  When not possible (when the merged-in history is not a
+descendant of the current history), create a merge commit.
++
+With `--no-ff`, create a merge commit in all cases, even when the merge
+could instead be resolved as a fast-forward.
++
+With `--ff-only`, resolve the merge as a fast-forward when possible.
+When not possible, refuse to merge and exit with a non-zero status.
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
@@ -105,6 +109,10 @@ option can be used to override --squash.
 +
 With --squash, --commit is not allowed, and will fail.
 
+--no-verify::
+	This option bypasses the pre-merge and commit-msg hooks.
+	See also linkgit:githooks[5].
+
 -s <strategy>::
 --strategy=<strategy>::
 	Use the given merge strategy; can be supplied more than
diff --git a/third_party/git/Documentation/merge-strategies.txt b/third_party/git/Documentation/merge-strategies.txt
index aa66cbe41eaf..2912de706bf3 100644
--- a/third_party/git/Documentation/merge-strategies.txt
+++ b/third_party/git/Documentation/merge-strategies.txt
@@ -32,7 +32,7 @@ The 'recursive' strategy can take the following options:
 ours;;
 	This option forces conflicting hunks to be auto-resolved cleanly by
 	favoring 'our' version.  Changes from the other tree that do not
-	conflict with our side are reflected to the merge result.
+	conflict with our side are reflected in the merge result.
 	For a binary file, the entire contents are taken from our side.
 +
 This should not be confused with the 'ours' merge strategy, which does not
diff --git a/third_party/git/Documentation/pretty-formats.txt b/third_party/git/Documentation/pretty-formats.txt
index 079598307a38..a4b6f4918631 100644
--- a/third_party/git/Documentation/pretty-formats.txt
+++ b/third_party/git/Documentation/pretty-formats.txt
@@ -4,7 +4,7 @@ PRETTY FORMATS
 If the commit is a merge, and if the pretty-format
 is not 'oneline', 'email' or 'raw', an additional line is
 inserted before the 'Author:' line.  This line begins with
-"Merge: " and the sha1s of ancestral commits are printed,
+"Merge: " and the hashes of ancestral commits are printed,
 separated by spaces.  Note that the listed commits may not
 necessarily be the list of the *direct* parent commits if you
 have limited your view of history: for example, if you are
@@ -20,20 +20,20 @@ built-in formats:
 
 * 'oneline'
 
-	  <sha1> <title line>
+	  <hash> <title line>
 +
 This is designed to be as compact as possible.
 
 * 'short'
 
-	  commit <sha1>
+	  commit <hash>
 	  Author: <author>
 
 	      <title line>
 
 * 'medium'
 
-	  commit <sha1>
+	  commit <hash>
 	  Author: <author>
 	  Date:   <author date>
 
@@ -43,7 +43,7 @@ This is designed to be as compact as possible.
 
 * 'full'
 
-	  commit <sha1>
+	  commit <hash>
 	  Author: <author>
 	  Commit: <committer>
 
@@ -53,7 +53,7 @@ This is designed to be as compact as possible.
 
 * 'fuller'
 
-	  commit <sha1>
+	  commit <hash>
 	  Author:     <author>
 	  AuthorDate: <author date>
 	  Commit:     <committer>
@@ -63,9 +63,20 @@ This is designed to be as compact as possible.
 
 	       <full commit message>
 
+* 'reference'
+
+	  <abbrev hash> (<title line>, <short author date>)
++
+This format is used to refer to another commit in a commit message and
+is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`.  By default,
+the date is formatted with `--date=short` unless another `--date` option
+is explicitly specified.  As with any `format:` with format
+placeholders, its output is not affected by other options like
+`--decorate` and `--walk-reflogs`.
+
 * 'email'
 
-	  From <sha1> <date>
+	  From <hash> <date>
 	  From: <author>
 	  Date: <author date>
 	  Subject: [PATCH] <title line>
@@ -75,7 +86,7 @@ This is designed to be as compact as possible.
 * 'raw'
 +
 The 'raw' format shows the entire commit exactly as
-stored in the commit object.  Notably, the SHA-1s are
+stored in the commit object.  Notably, the hashes are
 displayed in full, regardless of whether --abbrev or
 --no-abbrev are used, and 'parents' information show the
 true parent commits, without taking grafts or history
@@ -163,24 +174,32 @@ The placeholders are:
 '%ae':: author email
 '%aE':: author email (respecting .mailmap, see linkgit:git-shortlog[1]
 	or linkgit:git-blame[1])
+'%al':: author email local-part (the part before the '@' sign)
+'%aL':: author local-part (see '%al') respecting .mailmap, see
+	linkgit:git-shortlog[1] or linkgit:git-blame[1])
 '%ad':: author date (format respects --date= option)
 '%aD':: author date, RFC2822 style
 '%ar':: author date, relative
 '%at':: author date, UNIX timestamp
 '%ai':: author date, ISO 8601-like format
 '%aI':: author date, strict ISO 8601 format
+'%as':: author date, short format (`YYYY-MM-DD`)
 '%cn':: committer name
 '%cN':: committer name (respecting .mailmap, see
 	linkgit:git-shortlog[1] or linkgit:git-blame[1])
 '%ce':: committer email
 '%cE':: committer email (respecting .mailmap, see
 	linkgit:git-shortlog[1] or linkgit:git-blame[1])
+'%cl':: author email local-part (the part before the '@' sign)
+'%cL':: author local-part (see '%cl') respecting .mailmap, see
+	linkgit:git-shortlog[1] or linkgit:git-blame[1])
 '%cd':: committer date (format respects --date= option)
 '%cD':: committer date, RFC2822 style
 '%cr':: committer date, relative
 '%ct':: committer date, UNIX timestamp
 '%ci':: committer date, ISO 8601-like format
 '%cI':: committer date, strict ISO 8601 format
+'%cs':: committer date, short format (`YYYY-MM-DD`)
 '%d':: ref names, like the --decorate option of linkgit:git-log[1]
 '%D':: ref names without the " (", ")" wrapping.
 '%S':: ref name given on the command line by which the commit was reached
@@ -207,8 +226,9 @@ endif::git-rev-list[]
 '%GF':: show the fingerprint of the key used to sign a signed commit
 '%GP':: show the fingerprint of the primary key whose subkey was used
 	to sign a signed commit
+'%GT':: show the trust level for the key used to sign a signed commit
 '%gD':: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2
-	minutes ago`}; the format follows the rules described for the
+	minutes ago}`; the format follows the rules described for the
 	`-g` option. The portion before the `@` is the refname as
 	given on the command line (so `git log -g refs/heads/master`
 	would yield `refs/heads/master@{0}`).
diff --git a/third_party/git/Documentation/pretty-options.txt b/third_party/git/Documentation/pretty-options.txt
index e44fc8f7388d..7a6da6db780e 100644
--- a/third_party/git/Documentation/pretty-options.txt
+++ b/third_party/git/Documentation/pretty-options.txt
@@ -3,7 +3,7 @@
 
 	Pretty-print the contents of the commit logs in a given format,
 	where '<format>' can be one of 'oneline', 'short', 'medium',
-	'full', 'fuller', 'email', 'raw', 'format:<string>'
+	'full', 'fuller', 'reference', 'email', 'raw', 'format:<string>'
 	and 'tformat:<string>'.  When '<format>' is none of the above,
 	and has '%placeholder' in it, it acts as if
 	'--pretty=tformat:<format>' were given.
@@ -57,7 +57,7 @@ message by 4 spaces (i.e.  'medium', which is the default, 'full',
 and 'fuller').
 
 ifndef::git-rev-list[]
---notes[=<treeish>]::
+--notes[=<ref>]::
 	Show the notes (see linkgit:git-notes[1]) that annotate the
 	commit, when showing the commit log message.  This is the default
 	for `git log`, `git show` and `git whatchanged` commands when
@@ -68,8 +68,8 @@ By default, the notes shown are from the notes refs listed in the
 `core.notesRef` and `notes.displayRef` variables (or corresponding
 environment overrides). See linkgit:git-config[1] for more details.
 +
-With an optional '<treeish>' argument, use the treeish to find the notes
-to display.  The treeish can specify the full refname when it begins
+With an optional '<ref>' argument, use the ref to find the notes
+to display.  The ref can specify the full refname when it begins
 with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise
 `refs/notes/` is prefixed to form a full name of the ref.
 +
@@ -85,7 +85,7 @@ being displayed. Examples: "--notes=foo" will show only notes from
 	"--notes --notes=foo --no-notes --notes=bar" will only show notes
 	from "refs/notes/bar".
 
---show-notes[=<treeish>]::
+--show-notes[=<ref>]::
 --[no-]standard-notes::
 	These options are deprecated. Use the above --notes/--no-notes
 	options instead.
diff --git a/third_party/git/Documentation/rev-list-options.txt b/third_party/git/Documentation/rev-list-options.txt
index fa4e70f51143..0d49eb448ffd 100644
--- a/third_party/git/Documentation/rev-list-options.txt
+++ b/third_party/git/Documentation/rev-list-options.txt
@@ -58,7 +58,7 @@ endif::git-rev-list[]
 	`--all-match`).
 ifndef::git-rev-list[]
 +
-When `--show-notes` is in effect, the message from the notes is
+When `--notes` is in effect, the message from the notes is
 matched as if it were part of the log message.
 endif::git-rev-list[]
 
@@ -269,7 +269,7 @@ list.
 	exclude (that is, '{caret}commit', 'commit1..commit2',
 	and 'commit1\...commit2' notations cannot be used).
 +
-With `--pretty` format other than `oneline` (for obvious reasons),
+With `--pretty` format other than `oneline` and `reference` (for obvious reasons),
 this causes the output to have two extra lines of information
 taken from the reflog.  The reflog designator in the output may be shown
 as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the
@@ -293,6 +293,8 @@ Under `--pretty=oneline`, the commit message is
 prefixed with this information on the same line.
 This option cannot be combined with `--reverse`.
 See also linkgit:git-reflog[1].
++
+Under `--pretty=reference`, this information will not be shown at all.
 
 --merge::
 	After a failed merge, show refs that touch files having a
@@ -579,6 +581,7 @@ above) if (1) they are referenced by tags, or (2) they change the
 contents of the paths given on the command line.  All other
 commits are marked as TREESAME (subject to be simplified away).
 
+ifndef::git-shortlog[]
 ifdef::git-rev-list[]
 Bisection Helpers
 ~~~~~~~~~~~~~~~~~
@@ -634,8 +637,9 @@ This option can be used along with `--bisect-vars`, in this case,
 after all the sorted commit objects, there will be the same text as if
 `--bisect-vars` had been used alone.
 endif::git-rev-list[]
+endif::git-shortlog[]
 
-
+ifndef::git-shortlog[]
 Commit Ordering
 ~~~~~~~~~~~~~~~
 
@@ -677,7 +681,9 @@ together.
 	Output the commits chosen to be shown (see Commit Limiting
 	section above) in reverse order. Cannot be combined with
 	`--walk-reflogs`.
+endif::git-shortlog[]
 
+ifndef::git-shortlog[]
 Object Traversal
 ~~~~~~~~~~~~~~~~
 
@@ -756,6 +762,22 @@ explicitly-given commit or tree.
 Note that the form '--filter=sparse:path=<path>' that wants to read
 from an arbitrary path on the filesystem has been dropped for security
 reasons.
++
+Multiple '--filter=' flags can be specified to combine filters. Only
+objects which are accepted by every filter are included.
++
+The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be
+used to combined several filters, but this is harder than just repeating
+the '--filter' flag and is usually not necessary. Filters are joined by
+'{plus}' and individual filters are %-encoded (i.e. URL-encoded).
+Besides the '{plus}' and '%' characters, the following characters are
+reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+&#39;&#96;+
+as well as all characters with ASCII code &lt;= `0x20`, which includes
+space and newline.
++
+Other arbitrary characters can also be encoded. For instance,
+'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are
+equivalent.
 
 --no-filter::
 	Turn off any previous `--filter=` argument.
@@ -801,7 +823,9 @@ endif::git-rev-list[]
 
 --do-walk::
 	Overrides a previous `--no-walk`.
+endif::git-shortlog[]
 
+ifndef::git-shortlog[]
 Commit Formatting
 ~~~~~~~~~~~~~~~~~
 
@@ -960,7 +984,9 @@ ifdef::git-rev-list[]
 	counts and print the count for equivalent commits separated
 	by a tab.
 endif::git-rev-list[]
+endif::git-shortlog[]
 
+ifndef::git-shortlog[]
 ifndef::git-rev-list[]
 Diff Formatting
 ~~~~~~~~~~~~~~~
@@ -1003,3 +1029,4 @@ options may be given. See linkgit:git-diff-files[1] for more options.
 -t::
 	Show the tree objects in the diff output. This implies `-r`.
 endif::git-rev-list[]
+endif::git-shortlog[]
diff --git a/third_party/git/Documentation/technical/api-allocation-growing.txt b/third_party/git/Documentation/technical/api-allocation-growing.txt
deleted file mode 100644
index 5a59b548448f..000000000000
--- a/third_party/git/Documentation/technical/api-allocation-growing.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-allocation growing API
-======================
-
-Dynamically growing an array using realloc() is error prone and boring.
-
-Define your array with:
-
-* a pointer (`item`) that points at the array, initialized to `NULL`
-  (although please name the variable based on its contents, not on its
-  type);
-
-* an integer variable (`alloc`) that keeps track of how big the current
-  allocation is, initialized to `0`;
-
-* another integer variable (`nr`) to keep track of how many elements the
-  array currently has, initialized to `0`.
-
-Then before adding `n`th element to the item, call `ALLOC_GROW(item, n,
-alloc)`.  This ensures that the array can hold at least `n` elements by
-calling `realloc(3)` and adjusting `alloc` variable.
-
-------------
-sometype *item;
-size_t nr;
-size_t alloc
-
-for (i = 0; i < nr; i++)
-	if (we like item[i] already)
-		return;
-
-/* we did not like any existing one, so add one */
-ALLOC_GROW(item, nr + 1, alloc);
-item[nr++] = value you like;
-------------
-
-You are responsible for updating the `nr` variable.
-
-If you need to specify the number of elements to allocate explicitly
-then use the macro `REALLOC_ARRAY(item, alloc)` instead of `ALLOC_GROW`.
diff --git a/third_party/git/Documentation/technical/api-argv-array.txt b/third_party/git/Documentation/technical/api-argv-array.txt
deleted file mode 100644
index 870c8edbfb1d..000000000000
--- a/third_party/git/Documentation/technical/api-argv-array.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-argv-array API
-==============
-
-The argv-array API allows one to dynamically build and store
-NULL-terminated lists.  An argv-array maintains the invariant that the
-`argv` member always points to a non-NULL array, and that the array is
-always NULL-terminated at the element pointed to by `argv[argc]`. This
-makes the result suitable for passing to functions expecting to receive
-argv from main(), or the link:api-run-command.html[run-command API].
-
-The string-list API (documented in string-list.h) is similar, but cannot be
-used for these purposes; instead of storing a straight string pointer,
-it contains an item structure with a `util` field that is not compatible
-with the traditional argv interface.
-
-Each `argv_array` manages its own memory. Any strings pushed into the
-array are duplicated, and all memory is freed by argv_array_clear().
-
-Data Structures
----------------
-
-`struct argv_array`::
-
-	A single array. This should be initialized by assignment from
-	`ARGV_ARRAY_INIT`, or by calling `argv_array_init`. The `argv`
-	member contains the actual array; the `argc` member contains the
-	number of elements in the array, not including the terminating
-	NULL.
-
-Functions
----------
-
-`argv_array_init`::
-	Initialize an array. This is no different than assigning from
-	`ARGV_ARRAY_INIT`.
-
-`argv_array_push`::
-	Push a copy of a string onto the end of the array.
-
-`argv_array_pushl`::
-	Push a list of strings onto the end of the array. The arguments
-	should be a list of `const char *` strings, terminated by a NULL
-	argument.
-
-`argv_array_pushf`::
-	Format a string and push it onto the end of the array. This is a
-	convenience wrapper combining `strbuf_addf` and `argv_array_push`.
-
-`argv_array_pushv`::
-	Push a null-terminated array of strings onto the end of the array.
-
-`argv_array_pop`::
-	Remove the final element from the array. If there are no
-	elements in the array, do nothing.
-
-`argv_array_clear`::
-	Free all memory associated with the array and return it to the
-	initial, empty state.
-
-`argv_array_detach`::
-	Disconnect the `argv` member from the `argv_array` struct and
-	return it. The caller is responsible for freeing the memory used
-	by the array, and by the strings it references. After detaching,
-	the `argv_array` is in a reinitialized state and can be pushed
-	into again.
diff --git a/third_party/git/Documentation/technical/api-config.txt b/third_party/git/Documentation/technical/api-config.txt
deleted file mode 100644
index 7d20716c32a4..000000000000
--- a/third_party/git/Documentation/technical/api-config.txt
+++ /dev/null
@@ -1,319 +0,0 @@
-config API
-==========
-
-The config API gives callers a way to access Git configuration files
-(and files which have the same syntax). See linkgit:git-config[1] for a
-discussion of the config file syntax.
-
-General Usage
--------------
-
-Config files are parsed linearly, and each variable found is passed to a
-caller-provided callback function. The callback function is responsible
-for any actions to be taken on the config option, and is free to ignore
-some options. It is not uncommon for the configuration to be parsed
-several times during the run of a Git program, with different callbacks
-picking out different variables useful to themselves.
-
-A config callback function takes three parameters:
-
-- the name of the parsed variable. This is in canonical "flat" form: the
-  section, subsection, and variable segments will be separated by dots,
-  and the section and variable segments will be all lowercase. E.g.,
-  `core.ignorecase`, `diff.SomeType.textconv`.
-
-- the value of the found variable, as a string. If the variable had no
-  value specified, the value will be NULL (typically this means it
-  should be interpreted as boolean true).
-
-- a void pointer passed in by the caller of the config API; this can
-  contain callback-specific data
-
-A config callback should return 0 for success, or -1 if the variable
-could not be parsed properly.
-
-Basic Config Querying
----------------------
-
-Most programs will simply want to look up variables in all config files
-that Git knows about, using the normal precedence rules. To do this,
-call `git_config` with a callback function and void data pointer.
-
-`git_config` will read all config sources in order of increasing
-priority. Thus a callback should typically overwrite previously-seen
-entries with new ones (e.g., if both the user-wide `~/.gitconfig` and
-repo-specific `.git/config` contain `color.ui`, the config machinery
-will first feed the user-wide one to the callback, and then the
-repo-specific one; by overwriting, the higher-priority repo-specific
-value is left at the end).
-
-The `config_with_options` function lets the caller examine config
-while adjusting some of the default behavior of `git_config`. It should
-almost never be used by "regular" Git code that is looking up
-configuration variables. It is intended for advanced callers like
-`git-config`, which are intentionally tweaking the normal config-lookup
-process. It takes two extra parameters:
-
-`config_source`::
-If this parameter is non-NULL, it specifies the source to parse for
-configuration, rather than looking in the usual files. See `struct
-git_config_source` in `config.h` for details. Regular `git_config` defaults
-to `NULL`.
-
-`opts`::
-Specify options to adjust the behavior of parsing config files. See `struct
-config_options` in `config.h` for details. As an example: regular `git_config`
-sets `opts.respect_includes` to `1` by default.
-
-Reading Specific Files
-----------------------
-
-To read a specific file in git-config format, use
-`git_config_from_file`. This takes the same callback and data parameters
-as `git_config`.
-
-Querying For Specific Variables
--------------------------------
-
-For programs wanting to query for specific variables in a non-callback
-manner, the config API provides two functions `git_config_get_value`
-and `git_config_get_value_multi`. They both read values from an internal
-cache generated previously from reading the config files.
-
-`int git_config_get_value(const char *key, const char **value)`::
-
-	Finds the highest-priority value for the configuration variable `key`,
-	stores the pointer to it in `value` and returns 0. When the
-	configuration variable `key` is not found, returns 1 without touching
-	`value`. The caller should not free or modify `value`, as it is owned
-	by the cache.
-
-`const struct string_list *git_config_get_value_multi(const char *key)`::
-
-	Finds and returns the value list, sorted in order of increasing priority
-	for the configuration variable `key`. When the configuration variable
-	`key` is not found, returns NULL. The caller should not free or modify
-	the returned pointer, as it is owned by the cache.
-
-`void git_config_clear(void)`::
-
-	Resets and invalidates the config cache.
-
-The config API also provides type specific API functions which do conversion
-as well as retrieval for the queried variable, including:
-
-`int git_config_get_int(const char *key, int *dest)`::
-
-	Finds and parses the value to an integer for the configuration variable
-	`key`. Dies on error; otherwise, stores the value of the parsed integer in
-	`dest` and returns 0. When the configuration variable `key` is not found,
-	returns 1 without touching `dest`.
-
-`int git_config_get_ulong(const char *key, unsigned long *dest)`::
-
-	Similar to `git_config_get_int` but for unsigned longs.
-
-`int git_config_get_bool(const char *key, int *dest)`::
-
-	Finds and parses the value into a boolean value, for the configuration
-	variable `key` respecting keywords like "true" and "false". Integer
-	values are converted into true/false values (when they are non-zero or
-	zero, respectively). Other values cause a die(). If parsing is successful,
-	stores the value of the parsed result in `dest` and returns 0. When the
-	configuration variable `key` is not found, returns 1 without touching
-	`dest`.
-
-`int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest)`::
-
-	Similar to `git_config_get_bool`, except that integers are copied as-is,
-	and `is_bool` flag is unset.
-
-`int git_config_get_maybe_bool(const char *key, int *dest)`::
-
-	Similar to `git_config_get_bool`, except that it returns -1 on error
-	rather than dying.
-
-`int git_config_get_string_const(const char *key, const char **dest)`::
-
-	Allocates and copies the retrieved string into the `dest` parameter for
-	the configuration variable `key`; if NULL string is given, prints an
-	error message and returns -1. When the configuration variable `key` is
-	not found, returns 1 without touching `dest`.
-
-`int git_config_get_string(const char *key, char **dest)`::
-
-	Similar to `git_config_get_string_const`, except that retrieved value
-	copied into the `dest` parameter is a mutable string.
-
-`int git_config_get_pathname(const char *key, const char **dest)`::
-
-	Similar to `git_config_get_string`, but expands `~` or `~user` into
-	the user's home directory when found at the beginning of the path.
-
-`git_die_config(const char *key, const char *err, ...)`::
-
-	First prints the error message specified by the caller in `err` and then
-	dies printing the line number and the file name of the highest priority
-	value for the configuration variable `key`.
-
-`void git_die_config_linenr(const char *key, const char *filename, int linenr)`::
-
-	Helper function which formats the die error message according to the
-	parameters entered. Used by `git_die_config()`. It can be used by callers
-	handling `git_config_get_value_multi()` to print the correct error message
-	for the desired value.
-
-See test-config.c for usage examples.
-
-Value Parsing Helpers
----------------------
-
-To aid in parsing string values, the config API provides callbacks with
-a number of helper functions, including:
-
-`git_config_int`::
-Parse the string to an integer, including unit factors. Dies on error;
-otherwise, returns the parsed result.
-
-`git_config_ulong`::
-Identical to `git_config_int`, but for unsigned longs.
-
-`git_config_bool`::
-Parse a string into a boolean value, respecting keywords like "true" and
-"false". Integer values are converted into true/false values (when they
-are non-zero or zero, respectively). Other values cause a die(). If
-parsing is successful, the return value is the result.
-
-`git_config_bool_or_int`::
-Same as `git_config_bool`, except that integers are returned as-is, and
-an `is_bool` flag is unset.
-
-`git_parse_maybe_bool`::
-Same as `git_config_bool`, except that it returns -1 on error rather
-than dying.
-
-`git_config_string`::
-Allocates and copies the value string into the `dest` parameter; if no
-string is given, prints an error message and returns -1.
-
-`git_config_pathname`::
-Similar to `git_config_string`, but expands `~` or `~user` into the
-user's home directory when found at the beginning of the path.
-
-Include Directives
-------------------
-
-By default, the config parser does not respect include directives.
-However, a caller can use the special `git_config_include` wrapper
-callback to support them. To do so, you simply wrap your "real" callback
-function and data pointer in a `struct config_include_data`, and pass
-the wrapper to the regular config-reading functions. For example:
-
--------------------------------------------
-int read_file_with_include(const char *file, config_fn_t fn, void *data)
-{
-	struct config_include_data inc = CONFIG_INCLUDE_INIT;
-	inc.fn = fn;
-	inc.data = data;
-	return git_config_from_file(git_config_include, file, &inc);
-}
--------------------------------------------
-
-`git_config` respects includes automatically. The lower-level
-`git_config_from_file` does not.
-
-Custom Configsets
------------------
-
-A `config_set` can be used to construct an in-memory cache for
-config-like files that the caller specifies (i.e., files like `.gitmodules`,
-`~/.gitconfig` etc.). For example,
-
-----------------------------------------
-struct config_set gm_config;
-git_configset_init(&gm_config);
-int b;
-/* we add config files to the config_set */
-git_configset_add_file(&gm_config, ".gitmodules");
-git_configset_add_file(&gm_config, ".gitmodules_alt");
-
-if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
-	/* hack hack hack */
-}
-
-/* when we are done with the configset */
-git_configset_clear(&gm_config);
-----------------------------------------
-
-Configset API provides functions for the above mentioned work flow, including:
-
-`void git_configset_init(struct config_set *cs)`::
-
-	Initializes the config_set `cs`.
-
-`int git_configset_add_file(struct config_set *cs, const char *filename)`::
-
-	Parses the file and adds the variable-value pairs to the `config_set`,
-	dies if there is an error in parsing the file. Returns 0 on success, or
-	-1 if the file does not exist or is inaccessible. The user has to decide
-	if he wants to free the incomplete configset or continue using it when
-	the function returns -1.
-
-`int git_configset_get_value(struct config_set *cs, const char *key, const char **value)`::
-
-	Finds the highest-priority value for the configuration variable `key`
-	and config set `cs`, stores the pointer to it in `value` and returns 0.
-	When the configuration variable `key` is not found, returns 1 without
-	touching `value`. The caller should not free or modify `value`, as it
-	is owned by the cache.
-
-`const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key)`::
-
-	Finds and returns the value list, sorted in order of increasing priority
-	for the configuration variable `key` and config set `cs`. When the
-	configuration variable `key` is not found, returns NULL. The caller
-	should not free or modify the returned pointer, as it is owned by the cache.
-
-`void git_configset_clear(struct config_set *cs)`::
-
-	Clears `config_set` structure, removes all saved variable-value pairs.
-
-In addition to above functions, the `config_set` API provides type specific
-functions in the vein of `git_config_get_int` and family but with an extra
-parameter, pointer to struct `config_set`.
-They all behave similarly to the `git_config_get*()` family described in
-"Querying For Specific Variables" above.
-
-Writing Config Files
---------------------
-
-Git gives multiple entry points in the Config API to write config values to
-files namely `git_config_set_in_file` and `git_config_set`, which write to
-a specific config file or to `.git/config` respectively. They both take a
-key/value pair as parameter.
-In the end they both call `git_config_set_multivar_in_file` which takes four
-parameters:
-
-- the name of the file, as a string, to which key/value pairs will be written.
-
-- the name of key, as a string. This is in canonical "flat" form: the section,
-  subsection, and variable segments will be separated by dots, and the section
-  and variable segments will be all lowercase.
-  E.g., `core.ignorecase`, `diff.SomeType.textconv`.
-
-- the value of the variable, as a string. If value is equal to NULL, it will
-  remove the matching key from the config file.
-
-- the value regex, as a string. It will disregard key/value pairs where value
-  does not match.
-
-- a multi_replace value, as an int. If value is equal to zero, nothing or only
-  one matching key/value is replaced, else all matching key/values (regardless
-  how many) are removed, before the new pair is written.
-
-It returns 0 on success.
-
-Also, there are functions `git_config_rename_section` and
-`git_config_rename_section_in_file` with parameters `old_name` and `new_name`
-for renaming or removing sections in the config files. If NULL is passed
-through `new_name` parameter, the section will be removed from the config file.
diff --git a/third_party/git/Documentation/technical/api-credentials.txt b/third_party/git/Documentation/technical/api-credentials.txt
deleted file mode 100644
index 75368f26ca28..000000000000
--- a/third_party/git/Documentation/technical/api-credentials.txt
+++ /dev/null
@@ -1,271 +0,0 @@
-credentials API
-===============
-
-The credentials API provides an abstracted way of gathering username and
-password credentials from the user (even though credentials in the wider
-world can take many forms, in this document the word "credential" always
-refers to a username and password pair).
-
-This document describes two interfaces: the C API that the credential
-subsystem provides to the rest of Git, and the protocol that Git uses to
-communicate with system-specific "credential helpers". If you are
-writing Git code that wants to look up or prompt for credentials, see
-the section "C API" below. If you want to write your own helper, see
-the section on "Credential Helpers" below.
-
-Typical setup
--------------
-
-------------
-+-----------------------+
-| Git code (C)          |--- to server requiring --->
-|                       |        authentication
-|.......................|
-| C credential API      |--- prompt ---> User
-+-----------------------+
-	^      |
-	| pipe |
-	|      v
-+-----------------------+
-| Git credential helper |
-+-----------------------+
-------------
-
-The Git code (typically a remote-helper) will call the C API to obtain
-credential data like a login/password pair (credential_fill). The
-API will itself call a remote helper (e.g. "git credential-cache" or
-"git credential-store") that may retrieve credential data from a
-store. If the credential helper cannot find the information, the C API
-will prompt the user. Then, the caller of the API takes care of
-contacting the server, and does the actual authentication.
-
-C API
------
-
-The credential C API is meant to be called by Git code which needs to
-acquire or store a credential. It is centered around an object
-representing a single credential and provides three basic operations:
-fill (acquire credentials by calling helpers and/or prompting the user),
-approve (mark a credential as successfully used so that it can be stored
-for later use), and reject (mark a credential as unsuccessful so that it
-can be erased from any persistent storage).
-
-Data Structures
-~~~~~~~~~~~~~~~
-
-`struct credential`::
-
-	This struct represents a single username/password combination
-	along with any associated context. All string fields should be
-	heap-allocated (or NULL if they are not known or not applicable).
-	The meaning of the individual context fields is the same as
-	their counterparts in the helper protocol; see the section below
-	for a description of each field.
-+
-The `helpers` member of the struct is a `string_list` of helpers.  Each
-string specifies an external helper which will be run, in order, to
-either acquire or store credentials. See the section on credential
-helpers below. This list is filled-in by the API functions
-according to the corresponding configuration variables before
-consulting helpers, so there usually is no need for a caller to
-modify the helpers field at all.
-+
-This struct should always be initialized with `CREDENTIAL_INIT` or
-`credential_init`.
-
-
-Functions
-~~~~~~~~~
-
-`credential_init`::
-
-	Initialize a credential structure, setting all fields to empty.
-
-`credential_clear`::
-
-	Free any resources associated with the credential structure,
-	returning it to a pristine initialized state.
-
-`credential_fill`::
-
-	Instruct the credential subsystem to fill the username and
-	password fields of the passed credential struct by first
-	consulting helpers, then asking the user. After this function
-	returns, the username and password fields of the credential are
-	guaranteed to be non-NULL. If an error occurs, the function will
-	die().
-
-`credential_reject`::
-
-	Inform the credential subsystem that the provided credentials
-	have been rejected. This will cause the credential subsystem to
-	notify any helpers of the rejection (which allows them, for
-	example, to purge the invalid credentials from storage).  It
-	will also free() the username and password fields of the
-	credential and set them to NULL (readying the credential for
-	another call to `credential_fill`). Any errors from helpers are
-	ignored.
-
-`credential_approve`::
-
-	Inform the credential subsystem that the provided credentials
-	were successfully used for authentication.  This will cause the
-	credential subsystem to notify any helpers of the approval, so
-	that they may store the result to be used again.  Any errors
-	from helpers are ignored.
-
-`credential_from_url`::
-
-	Parse a URL into broken-down credential fields.
-
-Example
-~~~~~~~
-
-The example below shows how the functions of the credential API could be
-used to login to a fictitious "foo" service on a remote host:
-
------------------------------------------------------------------------
-int foo_login(struct foo_connection *f)
-{
-	int status;
-	/*
-	 * Create a credential with some context; we don't yet know the
-	 * username or password.
-	 */
-
-	struct credential c = CREDENTIAL_INIT;
-	c.protocol = xstrdup("foo");
-	c.host = xstrdup(f->hostname);
-
-	/*
-	 * Fill in the username and password fields by contacting
-	 * helpers and/or asking the user. The function will die if it
-	 * fails.
-	 */
-	credential_fill(&c);
-
-	/*
-	 * Otherwise, we have a username and password. Try to use it.
-	 */
-	status = send_foo_login(f, c.username, c.password);
-	switch (status) {
-	case FOO_OK:
-		/* It worked. Store the credential for later use. */
-		credential_accept(&c);
-		break;
-	case FOO_BAD_LOGIN:
-		/* Erase the credential from storage so we don't try it
-		 * again. */
-		credential_reject(&c);
-		break;
-	default:
-		/*
-		 * Some other error occurred. We don't know if the
-		 * credential is good or bad, so report nothing to the
-		 * credential subsystem.
-		 */
-	}
-
-	/* Free any associated resources. */
-	credential_clear(&c);
-
-	return status;
-}
------------------------------------------------------------------------
-
-
-Credential Helpers
-------------------
-
-Credential helpers are programs executed by Git to fetch or save
-credentials from and to long-term storage (where "long-term" is simply
-longer than a single Git process; e.g., credentials may be stored
-in-memory for a few minutes, or indefinitely on disk).
-
-Each helper is specified by a single string in the configuration
-variable `credential.helper` (and others, see linkgit:git-config[1]).
-The string is transformed by Git into a command to be executed using
-these rules:
-
-  1. If the helper string begins with "!", it is considered a shell
-     snippet, and everything after the "!" becomes the command.
-
-  2. Otherwise, if the helper string begins with an absolute path, the
-     verbatim helper string becomes the command.
-
-  3. Otherwise, the string "git credential-" is prepended to the helper
-     string, and the result becomes the command.
-
-The resulting command then has an "operation" argument appended to it
-(see below for details), and the result is executed by the shell.
-
-Here are some example specifications:
-
-----------------------------------------------------
-# run "git credential-foo"
-foo
-
-# same as above, but pass an argument to the helper
-foo --bar=baz
-
-# the arguments are parsed by the shell, so use shell
-# quoting if necessary
-foo --bar="whitespace arg"
-
-# you can also use an absolute path, which will not use the git wrapper
-/path/to/my/helper --with-arguments
-
-# or you can specify your own shell snippet
-!f() { echo "password=`cat $HOME/.secret`"; }; f
-----------------------------------------------------
-
-Generally speaking, rule (3) above is the simplest for users to specify.
-Authors of credential helpers should make an effort to assist their
-users by naming their program "git-credential-$NAME", and putting it in
-the $PATH or $GIT_EXEC_PATH during installation, which will allow a user
-to enable it with `git config credential.helper $NAME`.
-
-When a helper is executed, it will have one "operation" argument
-appended to its command line, which is one of:
-
-`get`::
-
-	Return a matching credential, if any exists.
-
-`store`::
-
-	Store the credential, if applicable to the helper.
-
-`erase`::
-
-	Remove a matching credential, if any, from the helper's storage.
-
-The details of the credential will be provided on the helper's stdin
-stream. The exact format is the same as the input/output format of the
-`git credential` plumbing command (see the section `INPUT/OUTPUT
-FORMAT` in linkgit:git-credential[1] for a detailed specification).
-
-For a `get` operation, the helper should produce a list of attributes
-on stdout in the same format. A helper is free to produce a subset, or
-even no values at all if it has nothing useful to provide. Any provided
-attributes will overwrite those already known about by Git.  If a helper
-outputs a `quit` attribute with a value of `true` or `1`, no further
-helpers will be consulted, nor will the user be prompted (if no
-credential has been provided, the operation will then fail).
-
-For a `store` or `erase` operation, the helper's output is ignored.
-If it fails to perform the requested operation, it may complain to
-stderr to inform the user. If it does not support the requested
-operation (e.g., a read-only store), it should silently ignore the
-request.
-
-If a helper receives any other operation, it should silently ignore the
-request. This leaves room for future operations to be added (older
-helpers will just ignore the new requests).
-
-See also
---------
-
-linkgit:gitcredentials[7]
-
-linkgit:git-config[1] (See configuration variables `credential.*`)
diff --git a/third_party/git/Documentation/technical/api-diff.txt b/third_party/git/Documentation/technical/api-diff.txt
deleted file mode 100644
index 30fc0e9c93b2..000000000000
--- a/third_party/git/Documentation/technical/api-diff.txt
+++ /dev/null
@@ -1,174 +0,0 @@
-diff API
-========
-
-The diff API is for programs that compare two sets of files (e.g. two
-trees, one tree and the index) and present the found difference in
-various ways.  The calling program is responsible for feeding the API
-pairs of files, one from the "old" set and the corresponding one from
-"new" set, that are different.  The library called through this API is
-called diffcore, and is responsible for two things.
-
-* finding total rewrites (`-B`), renames (`-M`) and copies (`-C`), and
-  changes that touch a string (`-S`), as specified by the caller.
-
-* outputting the differences in various formats, as specified by the
-  caller.
-
-Calling sequence
-----------------
-
-* Prepare `struct diff_options` to record the set of diff options, and
-  then call `repo_diff_setup()` to initialize this structure.  This
-  sets up the vanilla default.
-
-* Fill in the options structure to specify desired output format, rename
-  detection, etc.  `diff_opt_parse()` can be used to parse options given
-  from the command line in a way consistent with existing git-diff
-  family of programs.
-
-* Call `diff_setup_done()`; this inspects the options set up so far for
-  internal consistency and make necessary tweaking to it (e.g. if
-  textual patch output was asked, recursive behaviour is turned on);
-  the callback set_default in diff_options can be used to tweak this more.
-
-* As you find different pairs of files, call `diff_change()` to feed
-  modified files, `diff_addremove()` to feed created or deleted files,
-  or `diff_unmerge()` to feed a file whose state is 'unmerged' to the
-  API.  These are thin wrappers to a lower-level `diff_queue()` function
-  that is flexible enough to record any of these kinds of changes.
-
-* Once you finish feeding the pairs of files, call `diffcore_std()`.
-  This will tell the diffcore library to go ahead and do its work.
-
-* Calling `diff_flush()` will produce the output.
-
-
-Data structures
----------------
-
-* `struct diff_filespec`
-
-This is the internal representation for a single file (blob).  It
-records the blob object name (if known -- for a work tree file it
-typically is a NUL SHA-1), filemode and pathname.  This is what the
-`diff_addremove()`, `diff_change()` and `diff_unmerge()` synthesize and
-feed `diff_queue()` function with.
-
-* `struct diff_filepair`
-
-This records a pair of `struct diff_filespec`; the filespec for a file
-in the "old" set (i.e. preimage) is called `one`, and the filespec for a
-file in the "new" set (i.e. postimage) is called `two`.  A change that
-represents file creation has NULL in `one`, and file deletion has NULL
-in `two`.
-
-A `filepair` starts pointing at `one` and `two` that are from the same
-filename, but `diffcore_std()` can break pairs and match component
-filespecs with other filespecs from a different filepair to form new
-filepair.  This is called 'rename detection'.
-
-* `struct diff_queue`
-
-This is a collection of filepairs.  Notable members are:
-
-`queue`::
-
-	An array of pointers to `struct diff_filepair`.  This
-	dynamically grows as you add filepairs;
-
-`alloc`::
-
-	The allocated size of the `queue` array;
-
-`nr`::
-
-	The number of elements in the `queue` array.
-
-
-* `struct diff_options`
-
-This describes the set of options the calling program wants to affect
-the operation of diffcore library with.
-
-Notable members are:
-
-`output_format`::
-	The output format used when `diff_flush()` is run.
-
-`context`::
-	Number of context lines to generate in patch output.
-
-`break_opt`, `detect_rename`, `rename-score`, `rename_limit`::
-	Affects the way detection logic for complete rewrites, renames
-	and copies.
-
-`abbrev`::
-	Number of hexdigits to abbreviate raw format output to.
-
-`pickaxe`::
-	A constant string (can and typically does contain newlines to
-	look for a block of text, not just a single line) to filter out
-	the filepairs that do not change the number of strings contained
-	in its preimage and postimage of the diff_queue.
-
-`flags`::
-	This is mostly a collection of boolean options that affects the
-	operation, but some do not have anything to do with the diffcore
-	library.
-
-`touched_flags`::
-	Records whether a flag has been changed due to user request
-	(rather than just set/unset by default).
-
-`set_default`::
-	Callback which allows tweaking the options in diff_setup_done().
-
-BINARY, TEXT;;
-	Affects the way how a file that is seemingly binary is treated.
-
-FULL_INDEX;;
-	Tells the patch output format not to use abbreviated object
-	names on the "index" lines.
-
-FIND_COPIES_HARDER;;
-	Tells the diffcore library that the caller is feeding unchanged
-	filepairs to allow copies from unmodified files be detected.
-
-COLOR_DIFF;;
-	Output should be colored.
-
-COLOR_DIFF_WORDS;;
-	Output is a colored word-diff.
-
-NO_INDEX;;
-	Tells diff-files that the input is not tracked files but files
-	in random locations on the filesystem.
-
-ALLOW_EXTERNAL;;
-	Tells output routine that it is Ok to call user specified patch
-	output routine.  Plumbing disables this to ensure stable output.
-
-QUIET;;
-	Do not show any output.
-
-REVERSE_DIFF;;
-	Tells the library that the calling program is feeding the
-	filepairs reversed; `one` is two, and `two` is one.
-
-EXIT_WITH_STATUS;;
-	For communication between the calling program and the options
-	parser; tell the calling program to signal the presence of
-	difference using program exit code.
-
-HAS_CHANGES;;
-	Internal; used for optimization to see if there is any change.
-
-SILENT_ON_REMOVE;;
-	Affects if diff-files shows removed files.
-
-RECURSIVE, TREE_IN_RECURSIVE;;
-	Tells if tree traversal done by tree-diff should recursively
-	descend into a tree object pair that are different in preimage
-	and postimage set.
-
-(JC)
diff --git a/third_party/git/Documentation/technical/api-directory-listing.txt b/third_party/git/Documentation/technical/api-directory-listing.txt
deleted file mode 100644
index 5abb8e8b1fdb..000000000000
--- a/third_party/git/Documentation/technical/api-directory-listing.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-directory listing API
-=====================
-
-The directory listing API is used to enumerate paths in the work tree,
-optionally taking `.git/info/exclude` and `.gitignore` files per
-directory into account.
-
-Data structure
---------------
-
-`struct dir_struct` structure is used to pass directory traversal
-options to the library and to record the paths discovered.  A single
-`struct dir_struct` is used regardless of whether or not the traversal
-recursively descends into subdirectories.
-
-The notable options are:
-
-`exclude_per_dir`::
-
-	The name of the file to be read in each directory for excluded
-	files (typically `.gitignore`).
-
-`flags`::
-
-	A bit-field of options:
-
-`DIR_SHOW_IGNORED`:::
-
-	Return just ignored files in `entries[]`, not untracked
-	files. This flag is mutually exclusive with
-	`DIR_SHOW_IGNORED_TOO`.
-
-`DIR_SHOW_IGNORED_TOO`:::
-
-	Similar to `DIR_SHOW_IGNORED`, but return ignored files in
-	`ignored[]` in addition to untracked files in
-	`entries[]`. This flag is mutually exclusive with
-	`DIR_SHOW_IGNORED`.
-
-`DIR_KEEP_UNTRACKED_CONTENTS`:::
-
-	Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is set, the
-	untracked contents of untracked directories are also returned in
-	`entries[]`.
-
-`DIR_SHOW_IGNORED_TOO_MODE_MATCHING`:::
-
-	Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if
-	this is set, returns ignored files and directories that match
-	an exclude pattern. If a directory matches an exclude pattern,
-	then the directory is returned and the contained paths are
-	not. A directory that does not match an exclude pattern will
-	not be returned even if all of its contents are ignored. In
-	this case, the contents are returned as individual entries.
-+
-If this is set, files and directories that explicitly match an ignore
-pattern are reported. Implicitly ignored directories (directories that
-do not match an ignore pattern, but whose contents are all ignored)
-are not reported, instead all of the contents are reported.
-
-`DIR_COLLECT_IGNORED`:::
-
-	Special mode for git-add. Return ignored files in `ignored[]` and
-	untracked files in `entries[]`. Only returns ignored files that match
-	pathspec exactly (no wildcards). Does not recurse into ignored
-	directories.
-
-`DIR_SHOW_OTHER_DIRECTORIES`:::
-
-	Include a directory that is not tracked.
-
-`DIR_HIDE_EMPTY_DIRECTORIES`:::
-
-	Do not include a directory that is not tracked and is empty.
-
-`DIR_NO_GITLINKS`:::
-
-	If set, recurse into a directory that looks like a Git
-	directory.  Otherwise it is shown as a directory.
-
-The result of the enumeration is left in these fields:
-
-`entries[]`::
-
-	An array of `struct dir_entry`, each element of which describes
-	a path.
-
-`nr`::
-
-	The number of members in `entries[]` array.
-
-`alloc`::
-
-	Internal use; keeps track of allocation of `entries[]` array.
-
-`ignored[]`::
-
-	An array of `struct dir_entry`, used for ignored paths with the
-	`DIR_SHOW_IGNORED_TOO` and `DIR_COLLECT_IGNORED` flags.
-
-`ignored_nr`::
-
-	The number of members in `ignored[]` array.
-
-Calling sequence
-----------------
-
-Note: index may be looked at for .gitignore files that are CE_SKIP_WORKTREE
-marked. If you to exclude files, make sure you have loaded index first.
-
-* Prepare `struct dir_struct dir` and clear it with `memset(&dir, 0,
-  sizeof(dir))`.
-
-* To add single exclude pattern, call `add_exclude_list()` and then
-  `add_exclude()`.
-
-* To add patterns from a file (e.g. `.git/info/exclude`), call
-  `add_excludes_from_file()` , and/or set `dir.exclude_per_dir`.  A
-  short-hand function `setup_standard_excludes()` can be used to set
-  up the standard set of exclude settings.
-
-* Set options described in the Data Structure section above.
-
-* Call `read_directory()`.
-
-* Use `dir.entries[]`.
-
-* Call `clear_directory()` when none of the contained elements are no longer in use.
-
-(JC)
diff --git a/third_party/git/Documentation/technical/api-gitattributes.txt b/third_party/git/Documentation/technical/api-gitattributes.txt
deleted file mode 100644
index 45f0df600fab..000000000000
--- a/third_party/git/Documentation/technical/api-gitattributes.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-gitattributes API
-=================
-
-gitattributes mechanism gives a uniform way to associate various
-attributes to set of paths.
-
-
-Data Structure
---------------
-
-`struct git_attr`::
-
-	An attribute is an opaque object that is identified by its name.
-	Pass the name to `git_attr()` function to obtain the object of
-	this type.  The internal representation of this structure is
-	of no interest to the calling programs.  The name of the
-	attribute can be retrieved by calling `git_attr_name()`.
-
-`struct attr_check_item`::
-
-	This structure represents one attribute and its value.
-
-`struct attr_check`::
-
-	This structure represents a collection of `attr_check_item`.
-	It is passed to `git_check_attr()` function, specifying the
-	attributes to check, and receives their values.
-
-
-Attribute Values
-----------------
-
-An attribute for a path can be in one of four states: Set, Unset,
-Unspecified or set to a string, and `.value` member of `struct
-attr_check_item` records it.  There are three macros to check these:
-
-`ATTR_TRUE()`::
-
-	Returns true if the attribute is Set for the path.
-
-`ATTR_FALSE()`::
-
-	Returns true if the attribute is Unset for the path.
-
-`ATTR_UNSET()`::
-
-	Returns true if the attribute is Unspecified for the path.
-
-If none of the above returns true, `.value` member points at a string
-value of the attribute for the path.
-
-
-Querying Specific Attributes
-----------------------------
-
-* Prepare `struct attr_check` using attr_check_initl()
-  function, enumerating the names of attributes whose values you are
-  interested in, terminated with a NULL pointer.  Alternatively, an
-  empty `struct attr_check` can be prepared by calling
-  `attr_check_alloc()` function and then attributes you want to
-  ask about can be added to it with `attr_check_append()`
-  function.
-
-* Call `git_check_attr()` to check the attributes for the path.
-
-* Inspect `attr_check` structure to see how each of the
-  attribute in the array is defined for the path.
-
-
-Example
--------
-
-To see how attributes "crlf" and "ident" are set for different paths.
-
-. Prepare a `struct attr_check` with two elements (because
-  we are checking two attributes):
-
-------------
-static struct attr_check *check;
-static void setup_check(void)
-{
-	if (check)
-		return; /* already done */
-	check = attr_check_initl("crlf", "ident", NULL);
-}
-------------
-
-. Call `git_check_attr()` with the prepared `struct attr_check`:
-
-------------
-	const char *path;
-
-	setup_check();
-	git_check_attr(path, check);
-------------
-
-. Act on `.value` member of the result, left in `check->items[]`:
-
-------------
-	const char *value = check->items[0].value;
-
-	if (ATTR_TRUE(value)) {
-		The attribute is Set, by listing only the name of the
-		attribute in the gitattributes file for the path.
-	} else if (ATTR_FALSE(value)) {
-		The attribute is Unset, by listing the name of the
-		attribute prefixed with a dash - for the path.
-	} else if (ATTR_UNSET(value)) {
-		The attribute is neither set nor unset for the path.
-	} else if (!strcmp(value, "input")) {
-		If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is
-		true, the value is a string set in the gitattributes
-		file for the path by saying "attr=value".
-	} else if (... other check using value as string ...) {
-		...
-	}
-------------
-
-To see how attributes in argv[] are set for different paths, only
-the first step in the above would be different.
-
-------------
-static struct attr_check *check;
-static void setup_check(const char **argv)
-{
-	check = attr_check_alloc();
-	while (*argv) {
-		struct git_attr *attr = git_attr(*argv);
-		attr_check_append(check, attr);
-		argv++;
-	}
-}
-------------
-
-
-Querying All Attributes
------------------------
-
-To get the values of all attributes associated with a file:
-
-* Prepare an empty `attr_check` structure by calling
-  `attr_check_alloc()`.
-
-* Call `git_all_attrs()`, which populates the `attr_check`
-  with the attributes attached to the path.
-
-* Iterate over the `attr_check.items[]` array to examine
-  the attribute names and values.  The name of the attribute
-  described by an `attr_check.items[]` object can be retrieved via
-  `git_attr_name(check->items[i].attr)`.  (Please note that no items
-  will be returned for unset attributes, so `ATTR_UNSET()` will return
-  false for all returned `attr_check.items[]` objects.)
-
-* Free the `attr_check` struct by calling `attr_check_free()`.
diff --git a/third_party/git/Documentation/technical/api-grep.txt b/third_party/git/Documentation/technical/api-grep.txt
deleted file mode 100644
index a69cc8964d58..000000000000
--- a/third_party/git/Documentation/technical/api-grep.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-grep API
-========
-
-Talk about <grep.h>, things like:
-
-* grep_buffer()
-
-(JC)
diff --git a/third_party/git/Documentation/technical/api-history-graph.txt b/third_party/git/Documentation/technical/api-history-graph.txt
deleted file mode 100644
index d0d1707c8c88..000000000000
--- a/third_party/git/Documentation/technical/api-history-graph.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-history graph API
-=================
-
-The graph API is used to draw a text-based representation of the commit
-history.  The API generates the graph in a line-by-line fashion.
-
-Functions
----------
-
-Core functions:
-
-* `graph_init()` creates a new `struct git_graph`
-
-* `graph_update()` moves the graph to a new commit.
-
-* `graph_next_line()` outputs the next line of the graph into a strbuf.  It
-  does not add a terminating newline.
-
-* `graph_padding_line()` outputs a line of vertical padding in the graph.  It
-  is similar to `graph_next_line()`, but is guaranteed to never print the line
-  containing the current commit.  Where `graph_next_line()` would print the
-  commit line next, `graph_padding_line()` prints a line that simply extends
-  all branch lines downwards one row, leaving their positions unchanged.
-
-* `graph_is_commit_finished()` determines if the graph has output all lines
-  necessary for the current commit.  If `graph_update()` is called before all
-  lines for the current commit have been printed, the next call to
-  `graph_next_line()` will output an ellipsis, to indicate that a portion of
-  the graph was omitted.
-
-The following utility functions are wrappers around `graph_next_line()` and
-`graph_is_commit_finished()`.  They always print the output to stdout.
-They can all be called with a NULL graph argument, in which case no graph
-output will be printed.
-
-* `graph_show_commit()` calls `graph_next_line()` and
-  `graph_is_commit_finished()` until one of them return non-zero.  This prints
-  all graph lines up to, and including, the line containing this commit.
-  Output is printed to stdout.  The last line printed does not contain a
-  terminating newline.
-
-* `graph_show_oneline()` calls `graph_next_line()` and prints the result to
-  stdout.  The line printed does not contain a terminating newline.
-
-* `graph_show_padding()` calls `graph_padding_line()` and prints the result to
-  stdout.  The line printed does not contain a terminating newline.
-
-* `graph_show_remainder()` calls `graph_next_line()` until
-  `graph_is_commit_finished()` returns non-zero.  Output is printed to stdout.
-  The last line printed does not contain a terminating newline.  Returns 1 if
-  output was printed, and 0 if no output was necessary.
-
-* `graph_show_strbuf()` prints the specified strbuf to stdout, prefixing all
-  lines but the first with a graph line.  The caller is responsible for
-  ensuring graph output for the first line has already been printed to stdout.
-  (This can be done with `graph_show_commit()` or `graph_show_oneline()`.)  If
-  a NULL graph is supplied, the strbuf is printed as-is.
-
-* `graph_show_commit_msg()` is similar to `graph_show_strbuf()`, but it also
-  prints the remainder of the graph, if more lines are needed after the strbuf
-  ends.  It is better than directly calling `graph_show_strbuf()` followed by
-  `graph_show_remainder()` since it properly handles buffers that do not end in
-  a terminating newline.  The output printed by `graph_show_commit_msg()` will
-  end in a newline if and only if the strbuf ends in a newline.
-
-Data structure
---------------
-`struct git_graph` is an opaque data type used to store the current graph
-state.
-
-Calling sequence
-----------------
-
-* Create a `struct git_graph` by calling `graph_init()`.  When using the
-  revision walking API, this is done automatically by `setup_revisions()` if
-  the '--graph' option is supplied.
-
-* Use the revision walking API to walk through a group of contiguous commits.
-  The `get_revision()` function automatically calls `graph_update()` each time
-  it is invoked.
-
-* For each commit, call `graph_next_line()` repeatedly, until
-  `graph_is_commit_finished()` returns non-zero.  Each call to
-  `graph_next_line()` will output a single line of the graph.  The resulting
-  lines will not contain any newlines.  `graph_next_line()` returns 1 if the
-  resulting line contains the current commit, or 0 if this is merely a line
-  needed to adjust the graph before or after the current commit.  This return
-  value can be used to determine where to print the commit summary information
-  alongside the graph output.
-
-Limitations
------------
-
-* `graph_update()` must be called with commits in topological order.  It should
-  not be called on a commit if it has already been invoked with an ancestor of
-  that commit, or the graph output will be incorrect.
-
-* `graph_update()` must be called on a contiguous group of commits.  If
-  `graph_update()` is called on a particular commit, it should later be called
-  on all parents of that commit.  Parents must not be skipped, or the graph
-  output will appear incorrect.
-+
-`graph_update()` may be used on a pruned set of commits only if the parent list
-has been rewritten so as to include only ancestors from the pruned set.
-
-* The graph API does not currently support reverse commit ordering.  In
-  order to implement reverse ordering, the graphing API needs an
-  (efficient) mechanism to find the children of a commit.
-
-Sample usage
-------------
-
-------------
-struct commit *commit;
-struct git_graph *graph = graph_init(opts);
-
-while ((commit = get_revision(opts)) != NULL) {
-	while (!graph_is_commit_finished(graph))
-	{
-		struct strbuf sb;
-		int is_commit_line;
-
-		strbuf_init(&sb, 0);
-		is_commit_line = graph_next_line(graph, &sb);
-		fputs(sb.buf, stdout);
-
-		if (is_commit_line)
-			log_tree_commit(opts, commit);
-		else
-			putchar(opts->diffopt.line_termination);
-	}
-}
-------------
-
-Sample output
--------------
-
-The following is an example of the output from the graph API.  This output does
-not include any commit summary information--callers are responsible for
-outputting that information, if desired.
-
-------------
-*
-*
-*
-|\
-* |
-| | *
-| \ \
-|  \ \
-*-. \ \
-|\ \ \ \
-| | * | |
-| | | | | *
-| | | | | *
-| | | | | *
-| | | | | |\
-| | | | | | *
-| * | | | | |
-| | | | | *  \
-| | | | | |\  |
-| | | | * | | |
-| | | | * | | |
-* | | | | | | |
-| |/ / / / / /
-|/| / / / / /
-* | | | | | |
-|/ / / / / /
-* | | | | |
-| | | | | *
-| | | | |/
-| | | | *
-------------
diff --git a/third_party/git/Documentation/technical/api-merge.txt b/third_party/git/Documentation/technical/api-merge.txt
index 9dc1bed768a4..487d4d83fff2 100644
--- a/third_party/git/Documentation/technical/api-merge.txt
+++ b/third_party/git/Documentation/technical/api-merge.txt
@@ -28,77 +28,9 @@ and `diff.c` for examples.
 
 * `struct ll_merge_options`
 
-This describes the set of options the calling program wants to affect
-the operation of a low-level (single file) merge.  Some options:
-
-`virtual_ancestor`::
-	Behave as though this were part of a merge between common
-	ancestors in a recursive merge.
-	If a helper program is specified by the
-	`[merge "<driver>"] recursive` configuration, it will
-	be used (see linkgit:gitattributes[5]).
-
-`variant`::
-	Resolve local conflicts automatically in favor
-	of one side or the other (as in 'git merge-file'
-	`--ours`/`--theirs`/`--union`).  Can be `0`,
-	`XDL_MERGE_FAVOR_OURS`, `XDL_MERGE_FAVOR_THEIRS`, or
-	`XDL_MERGE_FAVOR_UNION`.
-
-`renormalize`::
-	Resmudge and clean the "base", "theirs" and "ours" files
-	before merging.  Use this when the merge is likely to have
-	overlapped with a change in smudge/clean or end-of-line
-	normalization rules.
+Check ll-merge.h for details.
 
 Low-level (single file) merge
 -----------------------------
 
-`ll_merge`::
-
-	Perform a three-way single-file merge in core.  This is
-	a thin wrapper around `xdl_merge` that takes the path and
-	any merge backend specified in `.gitattributes` or
-	`.git/info/attributes` into account.  Returns 0 for a
-	clean merge.
-
-Calling sequence:
-
-* Prepare a `struct ll_merge_options` to record options.
-  If you have no special requests, skip this and pass `NULL`
-  as the `opts` parameter to use the default options.
-
-* Allocate an mmbuffer_t variable for the result.
-
-* Allocate and fill variables with the file's original content
-  and two modified versions (using `read_mmfile`, for example).
-
-* Call `ll_merge()`.
-
-* Read the merged content from `result_buf.ptr` and `result_buf.size`.
-
-* Release buffers when finished.  A simple
-  `free(ancestor.ptr); free(ours.ptr); free(theirs.ptr);
-  free(result_buf.ptr);` will do.
-
-If the modifications do not merge cleanly, `ll_merge` will return a
-nonzero value and `result_buf` will generally include a description of
-the conflict bracketed by markers such as the traditional `<<<<<<<`
-and `>>>>>>>`.
-
-The `ancestor_label`, `our_label`, and `their_label` parameters are
-used to label the different sides of a conflict if the merge driver
-supports this.
-
-Everything else
----------------
-
-Talk about <merge-recursive.h> and merge_file():
-
- - merge_trees() to merge with rename detection
- - merge_recursive() for ancestor consolidation
- - try_merge_command() for other strategies
- - conflict format
- - merge options
-
-(Daniel, Miklos, Stephan, JC)
+Check ll-merge.h for details.
diff --git a/third_party/git/Documentation/technical/api-object-access.txt b/third_party/git/Documentation/technical/api-object-access.txt
deleted file mode 100644
index 5b29622d00ea..000000000000
--- a/third_party/git/Documentation/technical/api-object-access.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-object access API
-=================
-
-Talk about <sha1-file.c> and <object.h> family, things like
-
-* read_sha1_file()
-* read_object_with_reference()
-* has_sha1_file()
-* write_sha1_file()
-* pretend_object_file()
-* lookup_{object,commit,tag,blob,tree}
-* parse_{object,commit,tag,blob,tree}
-* Use of object flags
-
-(JC, Shawn, Daniel, Dscho, Linus)
diff --git a/third_party/git/Documentation/technical/api-oid-array.txt b/third_party/git/Documentation/technical/api-oid-array.txt
deleted file mode 100644
index c97428c2c349..000000000000
--- a/third_party/git/Documentation/technical/api-oid-array.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-oid-array API
-==============
-
-The oid-array API provides storage and manipulation of sets of object
-identifiers. The emphasis is on storage and processing efficiency,
-making them suitable for large lists. Note that the ordering of items is
-not preserved over some operations.
-
-Data Structures
----------------
-
-`struct oid_array`::
-
-	A single array of object IDs. This should be initialized by
-	assignment from `OID_ARRAY_INIT`.  The `oid` member contains
-	the actual data. The `nr` member contains the number of items in
-	the set.  The `alloc` and `sorted` members are used internally,
-	and should not be needed by API callers.
-
-Functions
----------
-
-`oid_array_append`::
-	Add an item to the set. The object ID will be placed at the end of
-	the array (but note that some operations below may lose this
-	ordering).
-
-`oid_array_lookup`::
-	Perform a binary search of the array for a specific object ID.
-	If found, returns the offset (in number of elements) of the
-	object ID. If not found, returns a negative integer. If the array
-	is not sorted, this function has the side effect of sorting it.
-
-`oid_array_clear`::
-	Free all memory associated with the array and return it to the
-	initial, empty state.
-
-`oid_array_for_each`::
-	Iterate over each element of the list, executing the callback
-	function for each one. Does not sort the list, so any custom
-	hash order is retained. If the callback returns a non-zero
-	value, the iteration ends immediately and the callback's
-	return is propagated; otherwise, 0 is returned.
-
-`oid_array_for_each_unique`::
-	Iterate over each unique element of the list in sorted order,
-	but otherwise behave like `oid_array_for_each`. If the array
-	is not sorted, this function has the side effect of sorting
-	it.
-
-`oid_array_filter`::
-	Apply the callback function `want` to each entry in the array,
-	retaining only the entries for which the function returns true.
-	Preserve the order of the entries that are retained.
-
-Examples
---------
-
------------------------------------------
-int print_callback(const struct object_id *oid,
-		    void *data)
-{
-	printf("%s\n", oid_to_hex(oid));
-	return 0; /* always continue */
-}
-
-void some_func(void)
-{
-	struct sha1_array hashes = OID_ARRAY_INIT;
-	struct object_id oid;
-
-	/* Read objects into our set */
-	while (read_object_from_stdin(oid.hash))
-		oid_array_append(&hashes, &oid);
-
-	/* Check if some objects are in our set */
-	while (read_object_from_stdin(oid.hash)) {
-		if (oid_array_lookup(&hashes, &oid) >= 0)
-			printf("it's in there!\n");
-
-	/*
-	 * Print the unique set of objects. We could also have
-	 * avoided adding duplicate objects in the first place,
-	 * but we would end up re-sorting the array repeatedly.
-	 * Instead, this will sort once and then skip duplicates
-	 * in linear time.
-	 */
-	oid_array_for_each_unique(&hashes, print_callback, NULL);
-}
------------------------------------------
diff --git a/third_party/git/Documentation/technical/api-quote.txt b/third_party/git/Documentation/technical/api-quote.txt
deleted file mode 100644
index e8a1bce94e05..000000000000
--- a/third_party/git/Documentation/technical/api-quote.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-quote API
-=========
-
-Talk about <quote.h>, things like
-
-* sq_quote and unquote
-* c_style quote and unquote
-* quoting for foreign languages
-
-(JC)
diff --git a/third_party/git/Documentation/technical/api-ref-iteration.txt b/third_party/git/Documentation/technical/api-ref-iteration.txt
deleted file mode 100644
index ad9d019ff9b4..000000000000
--- a/third_party/git/Documentation/technical/api-ref-iteration.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-ref iteration API
-=================
-
-
-Iteration of refs is done by using an iterate function which will call a
-callback function for every ref. The callback function has this
-signature:
-
-	int handle_one_ref(const char *refname, const struct object_id *oid,
-			   int flags, void *cb_data);
-
-There are different kinds of iterate functions which all take a
-callback of this type. The callback is then called for each found ref
-until the callback returns nonzero. The returned value is then also
-returned by the iterate function.
-
-Iteration functions
--------------------
-
-* `head_ref()` just iterates the head ref.
-
-* `for_each_ref()` iterates all refs.
-
-* `for_each_ref_in()` iterates all refs which have a defined prefix and
-  strips that prefix from the passed variable refname.
-
-* `for_each_tag_ref()`, `for_each_branch_ref()`, `for_each_remote_ref()`,
-  `for_each_replace_ref()` iterate refs from the respective area.
-
-* `for_each_glob_ref()` iterates all refs that match the specified glob
-  pattern.
-
-* `for_each_glob_ref_in()` the previous and `for_each_ref_in()` combined.
-
-* Use `refs_` API for accessing submodules. The submodule ref store could
-  be obtained with `get_submodule_ref_store()`.
-
-* `for_each_rawref()` can be used to learn about broken ref and symref.
-
-* `for_each_reflog()` iterates each reflog file.
-
-Submodules
-----------
-
-If you want to iterate the refs of a submodule you first need to add the
-submodules object database. You can do this by a code-snippet like
-this:
-
-	const char *path = "path/to/submodule"
-	if (add_submodule_odb(path))
-		die("Error submodule '%s' not populated.", path);
-
-`add_submodule_odb()` will return zero on success. If you
-do not do this you will get an error for each ref that it does not point
-to a valid object.
-
-Note: As a side-effect of this you cannot safely assume that all
-objects you lookup are available in superproject. All submodule objects
-will be available the same way as the superprojects objects.
-
-Example:
---------
-
-----
-static int handle_remote_ref(const char *refname,
-		const unsigned char *sha1, int flags, void *cb_data)
-{
-	struct strbuf *output = cb_data;
-	strbuf_addf(output, "%s\n", refname);
-	return 0;
-}
-
-...
-
-	struct strbuf output = STRBUF_INIT;
-	for_each_remote_ref(handle_remote_ref, &output);
-	printf("%s", output.buf);
-----
diff --git a/third_party/git/Documentation/technical/api-remote.txt b/third_party/git/Documentation/technical/api-remote.txt
deleted file mode 100644
index f10941b2e816..000000000000
--- a/third_party/git/Documentation/technical/api-remote.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-Remotes configuration API
-=========================
-
-The API in remote.h gives access to the configuration related to
-remotes. It handles all three configuration mechanisms historically
-and currently used by Git, and presents the information in a uniform
-fashion. Note that the code also handles plain URLs without any
-configuration, giving them just the default information.
-
-struct remote
--------------
-
-`name`::
-
-	The user's nickname for the remote
-
-`url`::
-
-	An array of all of the url_nr URLs configured for the remote
-
-`pushurl`::
-
-	An array of all of the pushurl_nr push URLs configured for the remote
-
-`push`::
-
-	 An array of refspecs configured for pushing, with
-	 push_refspec being the literal strings, and push_refspec_nr
-	 being the quantity.
-
-`fetch`::
-
-	An array of refspecs configured for fetching, with
-	fetch_refspec being the literal strings, and fetch_refspec_nr
-	being the quantity.
-
-`fetch_tags`::
-
-	The setting for whether to fetch tags (as a separate rule from
-	the configured refspecs); -1 means never to fetch tags, 0
-	means to auto-follow tags based on the default heuristic, 1
-	means to always auto-follow tags, and 2 means to fetch all
-	tags.
-
-`receivepack`, `uploadpack`::
-
-	The configured helper programs to run on the remote side, for
-	Git-native protocols.
-
-`http_proxy`::
-
-	The proxy to use for curl (http, https, ftp, etc.) URLs.
-
-`http_proxy_authmethod`::
-
-	The method used for authenticating against `http_proxy`.
-
-struct remotes can be found by name with remote_get(), and iterated
-through with for_each_remote(). remote_get(NULL) will return the
-default remote, given the current branch and configuration.
-
-struct refspec
---------------
-
-A struct refspec holds the parsed interpretation of a refspec.  If it
-will force updates (starts with a '+'), force is true.  If it is a
-pattern (sides end with '*') pattern is true.  src and dest are the
-two sides (including '*' characters if present); if there is only one
-side, it is src, and dst is NULL; if sides exist but are empty (i.e.,
-the refspec either starts or ends with ':'), the corresponding side is
-"".
-
-An array of strings can be parsed into an array of struct refspecs
-using parse_fetch_refspec() or parse_push_refspec().
-
-remote_find_tracking(), given a remote and a struct refspec with
-either src or dst filled out, will fill out the other such that the
-result is in the "fetch" specification for the remote (note that this
-evaluates patterns and returns a single result).
-
-struct branch
--------------
-
-Note that this may end up moving to branch.h
-
-struct branch holds the configuration for a branch. It can be looked
-up with branch_get(name) for "refs/heads/{name}", or with
-branch_get(NULL) for HEAD.
-
-It contains:
-
-`name`::
-
-	The short name of the branch.
-
-`refname`::
-
-	The full path for the branch ref.
-
-`remote_name`::
-
-	The name of the remote listed in the configuration.
-
-`merge_name`::
-
-	An array of the "merge" lines in the configuration.
-
-`merge`::
-
-	An array of the struct refspecs used for the merge lines. That
-	is, merge[i]->dst is a local tracking ref which should be
-	merged into this branch by default.
-
-`merge_nr`::
-
-	The number of merge configurations
-
-branch_has_merge_config() returns true if the given branch has merge
-configuration given.
-
-Other stuff
------------
-
-There is other stuff in remote.h that is related, in general, to the
-process of interacting with remotes.
-
-(Daniel Barkalow)
diff --git a/third_party/git/Documentation/technical/api-revision-walking.txt b/third_party/git/Documentation/technical/api-revision-walking.txt
deleted file mode 100644
index 03f9ea6ac4ba..000000000000
--- a/third_party/git/Documentation/technical/api-revision-walking.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-revision walking API
-====================
-
-The revision walking API offers functions to build a list of revisions
-and then iterate over that list.
-
-Calling sequence
-----------------
-
-The walking API has a given calling sequence: first you need to
-initialize a rev_info structure, then add revisions to control what kind
-of revision list do you want to get, finally you can iterate over the
-revision list.
-
-Functions
----------
-
-`repo_init_revisions`::
-
-	Initialize a rev_info structure with default values. The third
-	parameter may be NULL or can be prefix path, and then the `.prefix`
-	variable will be set to it. This is typically the first function you
-	want to call when you want to deal with a revision list. After calling
-	this function, you are free to customize options, like set
-	`.ignore_merges` to 0 if you don't want to ignore merges, and so on. See
-	`revision.h` for a complete list of available options.
-
-`add_pending_object`::
-
-	This function can be used if you want to add commit objects as revision
-	information. You can use the `UNINTERESTING` object flag to indicate if
-	you want to include or exclude the given commit (and commits reachable
-	from the given commit) from the revision list.
-+
-NOTE: If you have the commits as a string list then you probably want to
-use setup_revisions(), instead of parsing each string and using this
-function.
-
-`setup_revisions`::
-
-	Parse revision information, filling in the `rev_info` structure, and
-	removing the used arguments from the argument list. Returns the number
-	of arguments left that weren't recognized, which are also moved to the
-	head of the argument list. The last parameter is used in case no
-	parameter given by the first two arguments.
-
-`prepare_revision_walk`::
-
-	Prepares the rev_info structure for a walk. You should check if it
-	returns any error (non-zero return code) and if it does not, you can
-	start using get_revision() to do the iteration.
-
-`get_revision`::
-
-	Takes a pointer to a `rev_info` structure and iterates over it,
-	returning a `struct commit *` each time you call it. The end of the
-	revision list is indicated by returning a NULL pointer.
-
-`reset_revision_walk`::
-
-	Reset the flags used by the revision walking api. You can use
-	this to do multiple sequential revision walks.
-
-Data structures
----------------
-
-Talk about <revision.h>, things like:
-
-* two diff_options, one for path limiting, another for output;
-* remaining functions;
-
-(Linus, JC, Dscho)
diff --git a/third_party/git/Documentation/technical/api-run-command.txt b/third_party/git/Documentation/technical/api-run-command.txt
deleted file mode 100644
index 8bf3e37f5375..000000000000
--- a/third_party/git/Documentation/technical/api-run-command.txt
+++ /dev/null
@@ -1,264 +0,0 @@
-run-command API
-===============
-
-The run-command API offers a versatile tool to run sub-processes with
-redirected input and output as well as with a modified environment
-and an alternate current directory.
-
-A similar API offers the capability to run a function asynchronously,
-which is primarily used to capture the output that the function
-produces in the caller in order to process it.
-
-
-Functions
----------
-
-`child_process_init`::
-
-	Initialize a struct child_process variable.
-
-`start_command`::
-
-	Start a sub-process. Takes a pointer to a `struct child_process`
-	that specifies the details and returns pipe FDs (if requested).
-	See below for details.
-
-`finish_command`::
-
-	Wait for the completion of a sub-process that was started with
-	start_command().
-
-`run_command`::
-
-	A convenience function that encapsulates a sequence of
-	start_command() followed by finish_command(). Takes a pointer
-	to a `struct child_process` that specifies the details.
-
-`run_command_v_opt`, `run_command_v_opt_cd_env`::
-
-	Convenience functions that encapsulate a sequence of
-	start_command() followed by finish_command(). The argument argv
-	specifies the program and its arguments. The argument opt is zero
-	or more of the flags `RUN_COMMAND_NO_STDIN`, `RUN_GIT_CMD`,
-	`RUN_COMMAND_STDOUT_TO_STDERR`, or `RUN_SILENT_EXEC_FAILURE`
-	that correspond to the members .no_stdin, .git_cmd,
-	.stdout_to_stderr, .silent_exec_failure of `struct child_process`.
-	The argument dir corresponds the member .dir. The argument env
-	corresponds to the member .env.
-
-`child_process_clear`::
-
-	Release the memory associated with the struct child_process.
-	Most users of the run-command API don't need to call this
-	function explicitly because `start_command` invokes it on
-	failure and `finish_command` calls it automatically already.
-
-The functions above do the following:
-
-. If a system call failed, errno is set and -1 is returned. A diagnostic
-  is printed.
-
-. If the program was not found, then -1 is returned and errno is set to
-  ENOENT; a diagnostic is printed only if .silent_exec_failure is 0.
-
-. Otherwise, the program is run. If it terminates regularly, its exit
-  code is returned. No diagnostic is printed, even if the exit code is
-  non-zero.
-
-. If the program terminated due to a signal, then the return value is the
-  signal number + 128, ie. the same value that a POSIX shell's $? would
-  report.  A diagnostic is printed.
-
-
-`start_async`::
-
-	Run a function asynchronously. Takes a pointer to a `struct
-	async` that specifies the details and returns a set of pipe FDs
-	for communication with the function. See below for details.
-
-`finish_async`::
-
-	Wait for the completion of an asynchronous function that was
-	started with start_async().
-
-`run_hook`::
-
-	Run a hook.
-	The first argument is a pathname to an index file, or NULL
-	if the hook uses the default index file or no index is needed.
-	The second argument is the name of the hook.
-	The further arguments correspond to the hook arguments.
-	The last argument has to be NULL to terminate the arguments list.
-	If the hook does not exist or is not executable, the return
-	value will be zero.
-	If it is executable, the hook will be executed and the exit
-	status of the hook is returned.
-	On execution, .stdout_to_stderr and .no_stdin will be set.
-	(See below.)
-
-
-Data structures
----------------
-
-* `struct child_process`
-
-This describes the arguments, redirections, and environment of a
-command to run in a sub-process.
-
-The caller:
-
-1. allocates and clears (using child_process_init() or
-   CHILD_PROCESS_INIT) a struct child_process variable;
-2. initializes the members;
-3. calls start_command();
-4. processes the data;
-5. closes file descriptors (if necessary; see below);
-6. calls finish_command().
-
-The .argv member is set up as an array of string pointers (NULL
-terminated), of which .argv[0] is the program name to run (usually
-without a path). If the command to run is a git command, set argv[0] to
-the command name without the 'git-' prefix and set .git_cmd = 1.
-
-Note that the ownership of the memory pointed to by .argv stays with the
-caller, but it should survive until `finish_command` completes. If the
-.argv member is NULL, `start_command` will point it at the .args
-`argv_array` (so you may use one or the other, but you must use exactly
-one). The memory in .args will be cleaned up automatically during
-`finish_command` (or during `start_command` when it is unsuccessful).
-
-The members .in, .out, .err are used to redirect stdin, stdout,
-stderr as follows:
-
-. Specify 0 to request no special redirection. No new file descriptor
-  is allocated. The child process simply inherits the channel from the
-  parent.
-
-. Specify -1 to have a pipe allocated; start_command() replaces -1
-  by the pipe FD in the following way:
-
-	.in: Returns the writable pipe end into which the caller writes;
-		the readable end of the pipe becomes the child's stdin.
-
-	.out, .err: Returns the readable pipe end from which the caller
-		reads; the writable end of the pipe end becomes child's
-		stdout/stderr.
-
-  The caller of start_command() must close the so returned FDs
-  after it has completed reading from/writing to it!
-
-. Specify a file descriptor > 0 to be used by the child:
-
-	.in: The FD must be readable; it becomes child's stdin.
-	.out: The FD must be writable; it becomes child's stdout.
-	.err: The FD must be writable; it becomes child's stderr.
-
-  The specified FD is closed by start_command(), even if it fails to
-  run the sub-process!
-
-. Special forms of redirection are available by setting these members
-  to 1:
-
-	.no_stdin, .no_stdout, .no_stderr: The respective channel is
-		redirected to /dev/null.
-
-	.stdout_to_stderr: stdout of the child is redirected to its
-		stderr. This happens after stderr is itself redirected.
-		So stdout will follow stderr to wherever it is
-		redirected.
-
-To modify the environment of the sub-process, specify an array of
-string pointers (NULL terminated) in .env:
-
-. If the string is of the form "VAR=value", i.e. it contains '='
-  the variable is added to the child process's environment.
-
-. If the string does not contain '=', it names an environment
-  variable that will be removed from the child process's environment.
-
-If the .env member is NULL, `start_command` will point it at the
-.env_array `argv_array` (so you may use one or the other, but not both).
-The memory in .env_array will be cleaned up automatically during
-`finish_command` (or during `start_command` when it is unsuccessful).
-
-To specify a new initial working directory for the sub-process,
-specify it in the .dir member.
-
-If the program cannot be found, the functions return -1 and set
-errno to ENOENT. Normally, an error message is printed, but if
-.silent_exec_failure is set to 1, no message is printed for this
-special error condition.
-
-
-* `struct async`
-
-This describes a function to run asynchronously, whose purpose is
-to produce output that the caller reads.
-
-The caller:
-
-1. allocates and clears (memset(&asy, 0, sizeof(asy));) a
-   struct async variable;
-2. initializes .proc and .data;
-3. calls start_async();
-4. processes communicates with proc through .in and .out;
-5. closes .in and .out;
-6. calls finish_async().
-
-The members .in, .out are used to provide a set of fd's for
-communication between the caller and the callee as follows:
-
-. Specify 0 to have no file descriptor passed.  The callee will
-  receive -1 in the corresponding argument.
-
-. Specify < 0 to have a pipe allocated; start_async() replaces
-  with the pipe FD in the following way:
-
-	.in: Returns the writable pipe end into which the caller
-	writes; the readable end of the pipe becomes the function's
-	in argument.
-
-	.out: Returns the readable pipe end from which the caller
-	reads; the writable end of the pipe becomes the function's
-	out argument.
-
-  The caller of start_async() must close the returned FDs after it
-  has completed reading from/writing from them.
-
-. Specify a file descriptor > 0 to be used by the function:
-
-	.in: The FD must be readable; it becomes the function's in.
-	.out: The FD must be writable; it becomes the function's out.
-
-  The specified FD is closed by start_async(), even if it fails to
-  run the function.
-
-The function pointer in .proc has the following signature:
-
-	int proc(int in, int out, void *data);
-
-. in, out specifies a set of file descriptors to which the function
-  must read/write the data that it needs/produces.  The function
-  *must* close these descriptors before it returns.  A descriptor
-  may be -1 if the caller did not configure a descriptor for that
-  direction.
-
-. data is the value that the caller has specified in the .data member
-  of struct async.
-
-. The return value of the function is 0 on success and non-zero
-  on failure. If the function indicates failure, finish_async() will
-  report failure as well.
-
-
-There are serious restrictions on what the asynchronous function can do
-because this facility is implemented by a thread in the same address
-space on most platforms (when pthreads is available), but by a pipe to
-a forked process otherwise:
-
-. It cannot change the program's state (global variables, environment,
-  etc.) in a way that the caller notices; in other words, .in and .out
-  are the only communication channels to the caller.
-
-. It must not change the program's state that the caller of the
-  facility also uses.
diff --git a/third_party/git/Documentation/technical/api-setup.txt b/third_party/git/Documentation/technical/api-setup.txt
deleted file mode 100644
index eb1fa9853ef6..000000000000
--- a/third_party/git/Documentation/technical/api-setup.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-setup API
-=========
-
-Talk about
-
-* setup_git_directory()
-* setup_git_directory_gently()
-* is_inside_git_dir()
-* is_inside_work_tree()
-* setup_work_tree()
-
-(Dscho)
-
-Pathspec
---------
-
-See glossary-context.txt for the syntax of pathspec. In memory, a
-pathspec set is represented by "struct pathspec" and is prepared by
-parse_pathspec(). This function takes several arguments:
-
-- magic_mask specifies what features that are NOT supported by the
-  following code. If a user attempts to use such a feature,
-  parse_pathspec() can reject it early.
-
-- flags specifies other things that the caller wants parse_pathspec to
-  perform.
-
-- prefix and args come from cmd_* functions
-
-parse_pathspec() helps catch unsupported features and reject them
-politely. At a lower level, different pathspec-related functions may
-not support the same set of features. Such pathspec-sensitive
-functions are guarded with GUARD_PATHSPEC(), which will die in an
-unfriendly way when an unsupported feature is requested.
-
-The command designers are supposed to make sure that GUARD_PATHSPEC()
-never dies. They have to make sure all unsupported features are caught
-by parse_pathspec(), not by GUARD_PATHSPEC. grepping GUARD_PATHSPEC()
-should give the designers all pathspec-sensitive codepaths and what
-features they support.
-
-A similar process is applied when a new pathspec magic is added. The
-designer lifts the GUARD_PATHSPEC restriction in the functions that
-support the new magic. At the same time (s)he has to make sure this
-new feature will be caught at parse_pathspec() in commands that cannot
-handle the new magic in some cases. grepping parse_pathspec() should
-help.
diff --git a/third_party/git/Documentation/technical/api-sigchain.txt b/third_party/git/Documentation/technical/api-sigchain.txt
deleted file mode 100644
index 9e1189ef01df..000000000000
--- a/third_party/git/Documentation/technical/api-sigchain.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-sigchain API
-============
-
-Code often wants to set a signal handler to clean up temporary files or
-other work-in-progress when we die unexpectedly. For multiple pieces of
-code to do this without conflicting, each piece of code must remember
-the old value of the handler and restore it either when:
-
-  1. The work-in-progress is finished, and the handler is no longer
-     necessary. The handler should revert to the original behavior
-     (either another handler, SIG_DFL, or SIG_IGN).
-
-  2. The signal is received. We should then do our cleanup, then chain
-     to the next handler (or die if it is SIG_DFL).
-
-Sigchain is a tiny library for keeping a stack of handlers. Your handler
-and installation code should look something like:
-
-------------------------------------------
-  void clean_foo_on_signal(int sig)
-  {
-	  clean_foo();
-	  sigchain_pop(sig);
-	  raise(sig);
-  }
-
-  void other_func()
-  {
-	  sigchain_push_common(clean_foo_on_signal);
-	  mess_up_foo();
-	  clean_foo();
-  }
-------------------------------------------
-
-Handlers are given the typedef of sigchain_fun. This is the same type
-that is given to signal() or sigaction(). It is perfectly reasonable to
-push SIG_DFL or SIG_IGN onto the stack.
-
-You can sigchain_push and sigchain_pop individual signals. For
-convenience, sigchain_push_common will push the handler onto the stack
-for many common signals.
diff --git a/third_party/git/Documentation/technical/api-submodule-config.txt b/third_party/git/Documentation/technical/api-submodule-config.txt
deleted file mode 100644
index fb060893931f..000000000000
--- a/third_party/git/Documentation/technical/api-submodule-config.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-submodule config cache API
-==========================
-
-The submodule config cache API allows to read submodule
-configurations/information from specified revisions. Internally
-information is lazily read into a cache that is used to avoid
-unnecessary parsing of the same .gitmodules files. Lookups can be done by
-submodule path or name.
-
-Usage
------
-
-To initialize the cache with configurations from the worktree the caller
-typically first calls `gitmodules_config()` to read values from the
-worktree .gitmodules and then to overlay the local git config values
-`parse_submodule_config_option()` from the config parsing
-infrastructure.
-
-The caller can look up information about submodules by using the
-`submodule_from_path()` or `submodule_from_name()` functions. They return
-a `struct submodule` which contains the values. The API automatically
-initializes and allocates the needed infrastructure on-demand. If the
-caller does only want to lookup values from revisions the initialization
-can be skipped.
-
-If the internal cache might grow too big or when the caller is done with
-the API, all internally cached values can be freed with submodule_free().
-
-Data Structures
----------------
-
-`struct submodule`::
-
-	This structure is used to return the information about one
-	submodule for a certain revision. It is returned by the lookup
-	functions.
-
-Functions
----------
-
-`void submodule_free(struct repository *r)`::
-
-	Use these to free the internally cached values.
-
-`int parse_submodule_config_option(const char *var, const char *value)`::
-
-	Can be passed to the config parsing infrastructure to parse
-	local (worktree) submodule configurations.
-
-`const struct submodule *submodule_from_path(const unsigned char *treeish_name, const char *path)`::
-
-	Given a tree-ish in the superproject and a path, return the
-	submodule that is bound at the path in the named tree.
-
-`const struct submodule *submodule_from_name(const unsigned char *treeish_name, const char *name)`::
-
-	The same as above but lookup by name.
-
-Whenever a submodule configuration is parsed in `parse_submodule_config_option`
-via e.g. `gitmodules_config()`, it will overwrite the null_sha1 entry.
-So in the normal case, when HEAD:.gitmodules is parsed first and then overlayed
-with the repository configuration, the null_sha1 entry contains the local
-configuration of a submodule (e.g. consolidated values from local git
-configuration and the .gitmodules file in the worktree).
-
-For an example usage see test-submodule-config.c.
diff --git a/third_party/git/Documentation/technical/api-trace.txt b/third_party/git/Documentation/technical/api-trace.txt
deleted file mode 100644
index fadb5979c48b..000000000000
--- a/third_party/git/Documentation/technical/api-trace.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-trace API
-=========
-
-The trace API can be used to print debug messages to stderr or a file. Trace
-code is inactive unless explicitly enabled by setting `GIT_TRACE*` environment
-variables.
-
-The trace implementation automatically adds `timestamp file:line ... \n` to
-all trace messages. E.g.:
-
-------------
-23:59:59.123456 git.c:312               trace: built-in: git 'foo'
-00:00:00.000001 builtin/foo.c:99        foo: some message
-------------
-
-Data Structures
----------------
-
-`struct trace_key`::
-
-	Defines a trace key (or category). The default (for API functions that
-	don't take a key) is `GIT_TRACE`.
-+
-E.g. to define a trace key controlled by environment variable `GIT_TRACE_FOO`:
-+
-------------
-static struct trace_key trace_foo = TRACE_KEY_INIT(FOO);
-
-static void trace_print_foo(const char *message)
-{
-	trace_printf_key(&trace_foo, "%s", message);
-}
-------------
-+
-Note: don't use `const` as the trace implementation stores internal state in
-the `trace_key` structure.
-
-Functions
----------
-
-`int trace_want(struct trace_key *key)`::
-
-	Checks whether the trace key is enabled. Used to prevent expensive
-	string formatting before calling one of the printing APIs.
-
-`void trace_disable(struct trace_key *key)`::
-
-	Disables tracing for the specified key, even if the environment
-	variable was set.
-
-`void trace_printf(const char *format, ...)`::
-`void trace_printf_key(struct trace_key *key, const char *format, ...)`::
-
-	Prints a formatted message, similar to printf.
-
-`void trace_argv_printf(const char **argv, const char *format, ...)``::
-
-	Prints a formatted message, followed by a quoted list of arguments.
-
-`void trace_strbuf(struct trace_key *key, const struct strbuf *data)`::
-
-	Prints the strbuf, without additional formatting (i.e. doesn't
-	choke on `%` or even `\0`).
-
-`uint64_t getnanotime(void)`::
-
-	Returns nanoseconds since the epoch (01/01/1970), typically used
-	for performance measurements.
-+
-Currently there are high precision timer implementations for Linux (using
-`clock_gettime(CLOCK_MONOTONIC)`) and Windows (`QueryPerformanceCounter`).
-Other platforms use `gettimeofday` as time source.
-
-`void trace_performance(uint64_t nanos, const char *format, ...)`::
-`void trace_performance_since(uint64_t start, const char *format, ...)`::
-
-	Prints the elapsed time (in nanoseconds), or elapsed time since
-	`start`, followed by a formatted message. Enabled via environment
-	variable `GIT_TRACE_PERFORMANCE`. Used for manual profiling, e.g.:
-+
-------------
-uint64_t start = getnanotime();
-/* code section to measure */
-trace_performance_since(start, "foobar");
-------------
-+
-------------
-uint64_t t = 0;
-for (;;) {
-	/* ignore */
-	t -= getnanotime();
-	/* code section to measure */
-	t += getnanotime();
-	/* ignore */
-}
-trace_performance(t, "frotz");
-------------
-
-Bugs & Caveats
---------------
-
-GIT_TRACE_* environment variables can be used to tell Git to show
-trace output to its standard error stream. Git can often spawn a pager
-internally to run its subcommand and send its standard output and
-standard error to it.
-
-Because GIT_TRACE_PERFORMANCE trace is generated only at the very end
-of the program with atexit(), which happens after the pager exits, it
-would not work well if you send its log to the standard error output
-and let Git spawn the pager at the same time.
-
-As a work around, you can for example use '--no-pager', or set
-GIT_TRACE_PERFORMANCE to another file descriptor which is redirected
-to stderr, or set GIT_TRACE_PERFORMANCE to a file specified by its
-absolute path.
-
-For example instead of the following command which by default may not
-print any performance information:
-
-------------
-GIT_TRACE_PERFORMANCE=2 git log -1
-------------
-
-you may want to use:
-
-------------
-GIT_TRACE_PERFORMANCE=2 git --no-pager log -1
-------------
-
-or:
-
-------------
-GIT_TRACE_PERFORMANCE=3 3>&2 git log -1
-------------
-
-or:
-
-------------
-GIT_TRACE_PERFORMANCE=/path/to/log/file git log -1
-------------
diff --git a/third_party/git/Documentation/technical/api-trace2.txt b/third_party/git/Documentation/technical/api-trace2.txt
index 71eb081fed25..4f07ceadcb3f 100644
--- a/third_party/git/Documentation/technical/api-trace2.txt
+++ b/third_party/git/Documentation/technical/api-trace2.txt
@@ -128,7 +128,7 @@ yields
 
 ------------
 $ cat ~/log.event
-{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"1","exe":"2.20.1.155.g426c96fcdb"}
+{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"2","exe":"2.20.1.155.g426c96fcdb"}
 {"event":"start","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]}
 {"event":"cmd_name","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"}
 {"event":"exit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0}
@@ -142,10 +142,9 @@ system or global config value to one of the following:
 
 include::../trace2-target-values.txt[]
 
-If the target already exists and is a directory, the traces will be
-written to files (one per process) underneath the given directory. They
-will be named according to the last component of the SID (optionally
-followed by a counter to avoid filename collisions).
+When trace files are written to a target directory, they will be named according
+to the last component of the SID (optionally followed by a counter to avoid
+filename collisions).
 
 == Trace2 API
 
@@ -179,7 +178,7 @@ describe the simplified forms.
 
 == Public API
 
-All Trace2 API functions send a messsage to all of the active
+All Trace2 API functions send a message to all of the active
 Trace2 Targets.  This section describes the set of available
 messages.
 
@@ -189,261 +188,36 @@ purposes.
 === Basic Command Messages
 
 These are concerned with the lifetime of the overall git process.
-
-`void trace2_initialize_clock()`::
-
-	Initialize the Trace2 start clock and nothing else.  This should
-	be called at the very top of main() to capture the process start
-	time and reduce startup order dependencies.
-
-`void trace2_initialize()`::
-
-	Determines if any Trace2 Targets should be enabled and
-	initializes the Trace2 facility.  This includes setting up the
-	Trace2 thread local storage (TLS).
-+
-This function emits a "version" message containing the version of git
-and the Trace2 protocol.
-+
-This function should be called from `main()` as early as possible in
-the life of the process after essential process initialization.
-
-`int trace2_is_enabled()`::
-
-	Returns 1 if Trace2 is enabled (at least one target is
-	active).
-
-`void trace2_cmd_start(int argc, const char **argv)`::
-
-	Emits a "start" message containing the process command line
-	arguments.
-
-`int trace2_cmd_exit(int exit_code)`::
-
-	Emits an "exit" message containing the process exit-code and
-	elapsed time.
-+
-Returns the exit-code.
-
-`void trace2_cmd_error(const char *fmt, va_list ap)`::
-
-	Emits an "error" message containing a formatted error message.
-
-`void trace2_cmd_path(const char *pathname)`::
-
-	Emits a "cmd_path" message with the full pathname of the
-	current process.
+e.g: `void trace2_initialize_clock()`, `void trace2_initialize()`,
+`int trace2_is_enabled()`, `void trace2_cmd_start(int argc, const char **argv)`.
 
 === Command Detail Messages
 
 These are concerned with describing the specific Git command
 after the command line, config, and environment are inspected.
-
-`void trace2_cmd_name(const char *name)`::
-
-	Emits a "cmd_name" message with the canonical name of the
-	command, for example "status" or "checkout".
-
-`void trace2_cmd_mode(const char *mode)`::
-
-	Emits a "cmd_mode" message with a qualifier name to further
-	describe the current git command.
-+
-This message is intended to be used with git commands having multiple
-major modes.  For example, a "checkout" command can checkout a new
-branch or it can checkout a single file, so the checkout code could
-emit a cmd_mode message of "branch" or "file".
-
-`void trace2_cmd_alias(const char *alias, const char **argv_expansion)`::
-
-	Emits an "alias" message containing the alias used and the
-	argument expansion.
-
-`void trace2_def_param(const char *parameter, const char *value)`::
-
-	Emits a "def_param" message containing a key/value pair.
-+
-This message is intended to report some global aspect of the current
-command, such as a configuration setting or command line switch that
-significantly affects program performance or behavior, such as
-`core.abbrev`, `status.showUntrackedFiles`, or `--no-ahead-behind`.
-
-`void trace2_cmd_list_config()`::
-
-	Emits a "def_param" messages for "important" configuration
-	settings.
-+
-The environment variable `GIT_TRACE2_CONFIG_PARAMS` or the `trace2.configParams`
-config value can be set to a
-list of patterns of important configuration settings, for example:
-`core.*,remote.*.url`.  This function will iterate over all config
-settings and emit a "def_param" message for each match.
-
-`void trace2_cmd_set_config(const char *key, const char *value)`::
-
-	Emits a "def_param" message for a new or updated key/value
-	pair IF `key` is considered important.
-+
-This is used to hook into `git_config_set()` and catch any
-configuration changes and update a value previously reported by
-`trace2_cmd_list_config()`.
-
-`void trace2_def_repo(struct repository *repo)`::
-
-	Registers a repository with the Trace2 layer.  Assigns a
-	unique "repo-id" to `repo->trace2_repo_id`.
-+
-Emits a "worktree" messages containing the repo-id and the worktree
-pathname.
-+
-Region and data messages (described later) may refer to this repo-id.
-+
-The main/top-level repository will have repo-id value 1 (aka "r1").
-+
-The repo-id field is in anticipation of future in-proc submodule
-repositories.
+e.g: `void trace2_cmd_name(const char *name)`,
+`void trace2_cmd_mode(const char *mode)`.
 
 === Child Process Messages
 
 These are concerned with the various spawned child processes,
 including shell scripts, git commands, editors, pagers, and hooks.
 
-`void trace2_child_start(struct child_process *cmd)`::
-
-	Emits a "child_start" message containing the "child-id",
-	"child-argv", and "child-classification".
-+
-Before calling this, set `cmd->trace2_child_class` to a name
-describing the type of child process, for example "editor".
-+
-This function assigns a unique "child-id" to `cmd->trace2_child_id`.
-This field is used later during the "child_exit" message to associate
-it with the "child_start" message.
-+
-This function should be called before spawning the child process.
-
-`void trace2_child_exit(struct child_proess *cmd, int child_exit_code)`::
-
-	Emits a "child_exit" message containing the "child-id",
-	the child's elapsed time and exit-code.
-+
-The reported elapsed time includes the process creation overhead and
-time spend waiting for it to exit, so it may be slightly longer than
-the time reported by the child itself.
-+
-This function should be called after reaping the child process.
-
-`int trace2_exec(const char *exe, const char **argv)`::
-
-	Emits a "exec" message containing the "exec-id" and the
-	argv of the new process.
-+
-This function should be called before calling one of the `exec()`
-variants, such as `execvp()`.
-+
-This function returns a unique "exec-id".  This value is used later
-if the exec() fails and a "exec-result" message is necessary.
-
-`void trace2_exec_result(int exec_id, int error_code)`::
-
-	Emits a "exec_result" message containing the "exec-id"
-	and the error code.
-+
-On Unix-based systems, `exec()` does not return if successful.
-This message is used to indicate that the `exec()` failed and
-that the current program is continuing.
+e.g: `void trace2_child_start(struct child_process *cmd)`.
 
 === Git Thread Messages
 
 These messages are concerned with Git thread usage.
 
-`void trace2_thread_start(const char *thread_name)`::
-
-	Emits a "thread_start" message.
-+
-The `thread_name` field should be a descriptive name, such as the
-unique name of the thread-proc.  A unique "thread-id" will be added
-to the name to uniquely identify thread instances.
-+
-Region and data messages (described later) may refer to this thread
-name.
-+
-This function must be called by the thread-proc of the new thread
-(so that TLS data is properly initialized) and not by the caller
-of `pthread_create()`.
-
-`void trace2_thread_exit()`::
-
-	Emits a "thread_exit" message containing the thread name
-	and the thread elapsed time.
-+
-This function must be called by the thread-proc before it returns
-(so that the coorect TLS data is used and cleaned up.  It should
-not be called by the caller of `pthread_join()`.
+e.g: `void trace2_thread_start(const char *thread_name)`.
 
 === Region and Data Messages
 
 These are concerned with recording performance data
-over regions or spans of code.
-
-`void trace2_region_enter(const char *category, const char *label, const struct repository *repo)`::
-
-`void trace2_region_enter_printf(const char *category, const char *label, const struct repository *repo, const char *fmt, ...)`::
-
-`void trace2_region_enter_printf_va(const char *category, const char *label, const struct repository *repo, const char *fmt, va_list ap)`::
-
-	Emits a thread-relative "region_enter" message with optional
-	printf string.
-+
-This function pushes a new region nesting stack level on the current
-thread and starts a clock for the new stack frame.
-+
-The `category` field is an arbitrary category name used to classify
-regions by feature area, such as "status" or "index".  At this time
-it is only just printed along with the rest of the message.  It may
-be used in the future to filter messages.
-+
-The `label` field is an arbitrary label used to describe the activity
-being started, such as "read_recursive" or "do_read_index".
-+
-The `repo` field, if set, will be used to get the "repo-id", so that
-recursive oerations can be attributed to the correct repository.
-
-`void trace2_region_leave(const char *category, const char *label, const struct repository *repo)`::
-
-`void trace2_region_leave_printf(const char *category, const char *label, const struct repository *repo, const char *fmt, ...)`::
-
-`void trace2_region_leave_printf_va(const char *category, const char *label, const struct repository *repo, const char *fmt, va_list ap)`::
-
-	Emits a thread-relative "region_leave" message with optional
-	printf string.
-+
-This function pops the region nesting stack on the current thread
-and reports the elapsed time of the stack frame.
-+
-The `category`, `label`, and `repo` fields are the same as above.
-The `category` and `label` do not need to match the correpsonding
-"region_enter" message, but it makes the data stream easier to
-understand.
-
-`void trace2_data_string(const char *category, const struct repository *repo, const char *key, const char * value)`::
-
-`void trace2_data_intmax(const char *category, const struct repository *repo, const char *key, intmax value)`::
-
-`void trace2_data_json(const char *category, const struct repository *repo, const char *key, const struct json_writer *jw)`::
+over regions or spans of code. e.g:
+`void trace2_region_enter(const char *category, const char *label, const struct repository *repo)`.
 
-	Emits a region- and thread-relative "data" or "data_json" message.
-+
-This is a key/value pair message containing information about the
-current thread, region stack, and repository.  This could be used
-to print the number of files in a directory during a multi-threaded
-recursive tree walk.
-
-`void trace2_printf(const char *fmt, ...)`::
-
-`void trace2_printf_va(const char *fmt, va_list ap)`::
-
-	Emits a region- and thread-relative "printf" message.
+Refer to trace2.h for details about all trace2 functions.
 
 == Trace2 Target Formats
 
@@ -605,17 +379,35 @@ only present on the "start" and "atexit" events.
 ==== Event-Specific Key/Value Pairs
 
 `"version"`::
-	This event gives the version of the executable and the EVENT format.
+	This event gives the version of the executable and the EVENT format. It
+	should always be the first event in a trace session. The EVENT format
+	version will be incremented if new event types are added, if existing
+	fields are removed, or if there are significant changes in
+	interpretation of existing events or fields. Smaller changes, such as
+	adding a new field to an existing event, will not require an increment
+	to the EVENT format version.
 +
 ------------
 {
 	"event":"version",
 	...
-	"evt":"1",		       # EVENT format version
+	"evt":"2",		       # EVENT format version
 	"exe":"2.20.1.155.g426c96fcdb" # git version
 }
 ------------
 
+`"discard"`::
+	This event is written to the git-trace2-discard sentinel file if there
+	are too many files in the target trace directory (see the
+	trace2.maxFiles config option).
++
+------------
+{
+	"event":"discard",
+	...
+}
+------------
+
 `"start"`::
 	This event contains the complete argv received by main().
 +
@@ -799,7 +591,7 @@ with "?".
 Note that the session-id of the child process is not available to
 the current/spawning process, so the child's PID is reported here as
 a hint for post-processing.  (But it is only a hint because the child
-proces may be a shell script which doesn't have a session-id.)
+process may be a shell script which doesn't have a session-id.)
 +
 Note that the `t_rel` field contains the observed run time in seconds
 for the child process (starting before the fork/exec/spawn and
@@ -1159,7 +951,7 @@ d0 | main                     | atexit       |     |  0.028809 |           |
 +
 Regions may be nested.  This causes messages to be indented in the
 PERF target, for example.
-Elapsed times are relative to the start of the correpsonding nesting
+Elapsed times are relative to the start of the corresponding nesting
 level as expected.  For example, if we add region message to:
 +
 ----------------
@@ -1354,7 +1146,7 @@ d0 | main                     | atexit       |     |  0.030027 |           |
 In this example, the preload region took 0.009122 seconds.  The 7 threads
 took between 0.006069 and 0.008947 seconds to work on their portion of
 the index.  Thread "th01" worked on 508 items at offset 0.  Thread "th02"
-worked on 508 items at offset 2032.  Thread "th04" worked on 508 itemts
+worked on 508 items at offset 2032.  Thread "th04" worked on 508 items
 at offset 508.
 +
 This example also shows that thread names are assigned in a racy manner
diff --git a/third_party/git/Documentation/technical/api-tree-walking.txt b/third_party/git/Documentation/technical/api-tree-walking.txt
deleted file mode 100644
index bde18622a874..000000000000
--- a/third_party/git/Documentation/technical/api-tree-walking.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-tree walking API
-================
-
-The tree walking API is used to traverse and inspect trees.
-
-Data Structures
----------------
-
-`struct name_entry`::
-
-	An entry in a tree. Each entry has a sha1 identifier, pathname, and
-	mode.
-
-`struct tree_desc`::
-
-	A semi-opaque data structure used to maintain the current state of the
-	walk.
-+
-* `buffer` is a pointer into the memory representation of the tree. It always
-points at the current entry being visited.
-
-* `size` counts the number of bytes left in the `buffer`.
-
-* `entry` points to the current entry being visited.
-
-`struct traverse_info`::
-
-	A structure used to maintain the state of a traversal.
-+
-* `prev` points to the traverse_info which was used to descend into the
-current tree. If this is the top-level tree `prev` will point to
-a dummy traverse_info.
-
-* `name` is the entry for the current tree (if the tree is a subtree).
-
-* `pathlen` is the length of the full path for the current tree.
-
-* `conflicts` can be used by callbacks to maintain directory-file conflicts.
-
-* `fn` is a callback called for each entry in the tree. See Traversing for more
-information.
-
-* `data` can be anything the `fn` callback would want to use.
-
-* `show_all_errors` tells whether to stop at the first error or not.
-
-Initializing
-------------
-
-`init_tree_desc`::
-
-	Initialize a `tree_desc` and decode its first entry. The buffer and
-	size parameters are assumed to be the same as the buffer and size
-	members of `struct tree`.
-
-`fill_tree_descriptor`::
-
-	Initialize a `tree_desc` and decode its first entry given the
-	object ID of a tree. Returns the `buffer` member if the latter
-	is a valid tree identifier and NULL otherwise.
-
-`setup_traverse_info`::
-
-	Initialize a `traverse_info` given the pathname of the tree to start
-	traversing from. The `base` argument is assumed to be the `path`
-	member of the `name_entry` being recursed into unless the tree is a
-	top-level tree in which case the empty string ("") is used.
-
-Walking
--------
-
-`tree_entry`::
-
-	Visit the next entry in a tree. Returns 1 when there are more entries
-	left to visit and 0 when all entries have been visited. This is
-	commonly used in the test of a while loop.
-
-`tree_entry_len`::
-
-	Calculate the length of a tree entry's pathname. This utilizes the
-	memory structure of a tree entry to avoid the overhead of using a
-	generic strlen().
-
-`update_tree_entry`::
-
-	Walk to the next entry in a tree. This is commonly used in conjunction
-	with `tree_entry_extract` to inspect the current entry.
-
-`tree_entry_extract`::
-
-	Decode the entry currently being visited (the one pointed to by
-	`tree_desc's` `entry` member) and return the sha1 of the entry. The
-	`pathp` and `modep` arguments are set to the entry's pathname and mode
-	respectively.
-
-`get_tree_entry`::
-
-	Find an entry in a tree given a pathname and the sha1 of a tree to
-	search. Returns 0 if the entry is found and -1 otherwise. The third
-	and fourth parameters are set to the entry's sha1 and mode
-	respectively.
-
-Traversing
-----------
-
-`traverse_trees`::
-
-	Traverse `n` number of trees in parallel. The `fn` callback member of
-	`traverse_info` is called once for each tree entry.
-
-`traverse_callback_t`::
-	The arguments passed to the traverse callback are as follows:
-+
-* `n` counts the number of trees being traversed.
-
-* `mask` has its nth bit set if something exists in the nth entry.
-
-* `dirmask` has its nth bit set if the nth tree's entry is a directory.
-
-* `entry` is an array of size `n` where the nth entry is from the nth tree.
-
-* `info` maintains the state of the traversal.
-
-+
-Returning a negative value will terminate the traversal. Otherwise the
-return value is treated as an update mask. If the nth bit is set the nth tree
-will be updated and if the bit is not set the nth tree entry will be the
-same in the next callback invocation.
-
-`make_traverse_path`::
-
-	Generate the full pathname of a tree entry based from the root of the
-	traversal. For example, if the traversal has recursed into another
-	tree named "bar" the pathname of an entry "baz" in the "bar"
-	tree would be "bar/baz".
-
-`traverse_path_len`::
-
-	Calculate the length of a pathname returned by `make_traverse_path`.
-	This utilizes the memory structure of a tree entry to avoid the
-	overhead of using a generic strlen().
-
-Authors
--------
-
-Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds
-<torvalds@linux-foundation.org>
diff --git a/third_party/git/Documentation/technical/api-xdiff-interface.txt b/third_party/git/Documentation/technical/api-xdiff-interface.txt
deleted file mode 100644
index 6296ecad1d65..000000000000
--- a/third_party/git/Documentation/technical/api-xdiff-interface.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-xdiff interface API
-===================
-
-Talk about our calling convention to xdiff library, including
-xdiff_emit_consume_fn.
-
-(Dscho, JC)
diff --git a/third_party/git/Documentation/technical/bundle-format.txt b/third_party/git/Documentation/technical/bundle-format.txt
new file mode 100644
index 000000000000..0e828151a502
--- /dev/null
+++ b/third_party/git/Documentation/technical/bundle-format.txt
@@ -0,0 +1,48 @@
+= Git bundle v2 format
+
+The Git bundle format is a format that represents both refs and Git objects.
+
+== Format
+
+We will use ABNF notation to define the Git bundle format. See
+protocol-common.txt for the details.
+
+----
+bundle    = signature *prerequisite *reference LF pack
+signature = "# v2 git bundle" LF
+
+prerequisite = "-" obj-id SP comment LF
+comment      = *CHAR
+reference    = obj-id SP refname LF
+
+pack         = ... ; packfile
+----
+
+== Semantics
+
+A Git bundle consists of three parts.
+
+* "Prerequisites" lists the objects that are NOT included in the bundle and the
+  reader of the bundle MUST already have, in order to use the data in the
+  bundle. The objects stored in the bundle may refer to prerequisite objects and
+  anything reachable from them (e.g. a tree object in the bundle can reference
+  a blob that is reachable from a prerequisite) and/or expressed as a delta
+  against prerequisite objects.
+
+* "References" record the tips of the history graph, iow, what the reader of the
+  bundle CAN "git fetch" from it.
+
+* "Pack" is the pack data stream "git fetch" would send, if you fetch from a
+  repository that has the references recorded in the "References" above into a
+  repository that has references pointing at the objects listed in
+  "Prerequisites" above.
+
+In the bundle format, there can be a comment following a prerequisite obj-id.
+This is a comment and it has no specific meaning. The writer of the bundle MAY
+put any string here. The reader of the bundle MUST ignore the comment.
+
+=== Note on the shallow clone and a Git bundle
+
+Note that the prerequisites does not represent a shallow-clone boundary. The
+semantics of the prerequisites and the shallow-clone boundaries are different,
+and the Git bundle v2 format cannot represent a shallow clone repository.
diff --git a/third_party/git/Documentation/technical/commit-graph.txt b/third_party/git/Documentation/technical/commit-graph.txt
index 729fbcb32f87..808fa30b99f2 100644
--- a/third_party/git/Documentation/technical/commit-graph.txt
+++ b/third_party/git/Documentation/technical/commit-graph.txt
@@ -22,11 +22,11 @@ as "commit-graph" either in the .git/objects/info directory or in the info
 directory of an alternate.
 
 The commit-graph file stores the commit graph structure along with some
-extra metadata to speed up graph walks. By listing commit OIDs in lexi-
-cographic order, we can identify an integer position for each commit and
-refer to the parents of a commit using those integer positions. We use
-binary search to find initial commits and then use the integer positions
-for fast lookups during the walk.
+extra metadata to speed up graph walks. By listing commit OIDs in
+lexicographic order, we can identify an integer position for each commit
+and refer to the parents of a commit using those integer positions. We
+use binary search to find initial commits and then use the integer
+positions for fast lookups during the walk.
 
 A consumer may load the following info for a commit from the graph:
 
@@ -85,7 +85,7 @@ have generation number represented by the macro GENERATION_NUMBER_ZERO = 0.
 Since the commit-graph file is closed under reachability, we can guarantee
 the following weaker condition on all commits:
 
-    If A and B are commits with generation numbers N amd M, respectively,
+    If A and B are commits with generation numbers N and M, respectively,
     and N < M, then A cannot reach B.
 
 Note how the strict inequality differs from the inequality when we have
@@ -323,14 +323,14 @@ Related Links
 [0] https://bugs.chromium.org/p/git/issues/detail?id=8
     Chromium work item for: Serialized Commit Graph
 
-[1] https://public-inbox.org/git/20110713070517.GC18566@sigill.intra.peff.net/
+[1] https://lore.kernel.org/git/20110713070517.GC18566@sigill.intra.peff.net/
     An abandoned patch that introduced generation numbers.
 
-[2] https://public-inbox.org/git/20170908033403.q7e6dj7benasrjes@sigill.intra.peff.net/
+[2] https://lore.kernel.org/git/20170908033403.q7e6dj7benasrjes@sigill.intra.peff.net/
     Discussion about generation numbers on commits and how they interact
     with fsck.
 
-[3] https://public-inbox.org/git/20170908034739.4op3w4f2ma5s65ku@sigill.intra.peff.net/
+[3] https://lore.kernel.org/git/20170908034739.4op3w4f2ma5s65ku@sigill.intra.peff.net/
     More discussion about generation numbers and not storing them inside
     commit objects. A valuable quote:
 
@@ -342,9 +342,9 @@ Related Links
      commit objects (i.e., packv4 or something like the "metapacks" I
      proposed a few years ago)."
 
-[4] https://public-inbox.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u
+[4] https://lore.kernel.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u
     A patch to remove the ahead-behind calculation from 'status'.
 
-[5] https://public-inbox.org/git/f27db281-abad-5043-6d71-cbb083b1c877@gmail.com/
+[5] https://lore.kernel.org/git/f27db281-abad-5043-6d71-cbb083b1c877@gmail.com/
     A discussion of a "two-dimensional graph position" that can allow reading
     multiple commit-graph chains at the same time.
diff --git a/third_party/git/Documentation/technical/hash-function-transition.txt b/third_party/git/Documentation/technical/hash-function-transition.txt
index 2ae8fa470ada..5b2db3be1ecc 100644
--- a/third_party/git/Documentation/technical/hash-function-transition.txt
+++ b/third_party/git/Documentation/technical/hash-function-transition.txt
@@ -531,7 +531,7 @@ Until Git protocol gains SHA-256 support, using SHA-256 based storage
 on public-facing Git servers is strongly discouraged. Once Git
 protocol gains SHA-256 support, SHA-256 based servers are likely not
 to support SHA-1 compatibility, to avoid what may be a very expensive
-hash reencode during clone and to encourage peers to modernize.
+hash re-encode during clone and to encourage peers to modernize.
 
 The design described here allows fetches by SHA-1 clients of a
 personal SHA-256 repository because it's not much more difficult than
@@ -602,7 +602,7 @@ git --output-format=sha1 log abac87a^{sha1}..f787cac^{sha256}
 
 Choice of Hash
 --------------
-In early 2005, around the time that Git was written,  Xiaoyun Wang,
+In early 2005, around the time that Git was written, Xiaoyun Wang,
 Yiqun Lisa Yin, and Hongbo Yu announced an attack finding SHA-1
 collisions in 2^69 operations. In August they published details.
 Luckily, no practical demonstrations of a collision in full SHA-1 were
@@ -730,7 +730,7 @@ adoption.
 
 Using hash functions in parallel
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-(e.g. https://public-inbox.org/git/22708.8913.864049.452252@chiark.greenend.org.uk/ )
+(e.g. https://lore.kernel.org/git/22708.8913.864049.452252@chiark.greenend.org.uk/ )
 Objects newly created would be addressed by the new hash, but inside
 such an object (e.g. commit) it is still possible to address objects
 using the old hash function.
@@ -783,7 +783,7 @@ bmwill@google.com, jonathantanmy@google.com, jrnieder@gmail.com,
 sbeller@google.com
 
 Initial version sent to
-http://public-inbox.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com
+http://lore.kernel.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com
 
 2017-03-03 jrnieder@gmail.com
 Incorporated suggestions from jonathantanmy and sbeller:
@@ -820,8 +820,8 @@ Later history:
  edits. This document history is no longer being maintained as it
  would now be superfluous to the commit log
 
-[1] http://public-inbox.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/
-[2] http://public-inbox.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/
-[3] http://public-inbox.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/
-[4] http://public-inbox.org/git/20170304224936.rqqtkdvfjgyezsht@genre.crustytoothpaste.net
-[5] https://public-inbox.org/git/CAJo=hJtoX9=AyLHHpUJS7fueV9ciZ_MNpnEPHUz8Whui6g9F0A@mail.gmail.com/
+[1] http://lore.kernel.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/
+[2] http://lore.kernel.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/
+[3] http://lore.kernel.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/
+[4] http://lore.kernel.org/git/20170304224936.rqqtkdvfjgyezsht@genre.crustytoothpaste.net
+[5] https://lore.kernel.org/git/CAJo=hJtoX9=AyLHHpUJS7fueV9ciZ_MNpnEPHUz8Whui6g9F0A@mail.gmail.com/
diff --git a/third_party/git/Documentation/technical/index-format.txt b/third_party/git/Documentation/technical/index-format.txt
index 7c4d67aa6a7f..faa25c5c527e 100644
--- a/third_party/git/Documentation/technical/index-format.txt
+++ b/third_party/git/Documentation/technical/index-format.txt
@@ -318,7 +318,7 @@ The remaining data of each directory block is grouped by type:
 == End of Index Entry
 
   The End of Index Entry (EOIE) is used to locate the end of the variable
-  length index entries and the begining of the extensions. Code can take
+  length index entries and the beginning of the extensions. Code can take
   advantage of this to quickly locate the index extensions without having
   to parse through all of the index entries.
 
@@ -351,7 +351,7 @@ The remaining data of each directory block is grouped by type:
 
   - A number of index offset entries each consisting of:
 
-    - 32-bit offset from the begining of the file to the first cache entry
+    - 32-bit offset from the beginning of the file to the first cache entry
 	in this block of entries.
 
     - 32-bit count of cache entries in this block
diff --git a/third_party/git/Documentation/technical/multi-pack-index.txt b/third_party/git/Documentation/technical/multi-pack-index.txt
index d7e57639f70d..4e7631437a58 100644
--- a/third_party/git/Documentation/technical/multi-pack-index.txt
+++ b/third_party/git/Documentation/technical/multi-pack-index.txt
@@ -36,7 +36,7 @@ Design Details
   directory of an alternate. It refers only to packfiles in that
   same directory.
 
-- The pack.multiIndex config setting must be on to consume MIDX files.
+- The core.multiPackIndex config setting must be on to consume MIDX files.
 
 - The file format includes parameters for the object ID hash
   function, so a future change of hash algorithm does not require
@@ -102,8 +102,8 @@ Related Links
 [0] https://bugs.chromium.org/p/git/issues/detail?id=6
     Chromium work item for: Multi-Pack Index (MIDX)
 
-[1] https://public-inbox.org/git/20180107181459.222909-1-dstolee@microsoft.com/
+[1] https://lore.kernel.org/git/20180107181459.222909-1-dstolee@microsoft.com/
     An earlier RFC for the multi-pack-index feature
 
-[2] https://public-inbox.org/git/alpine.DEB.2.20.1803091557510.23109@alexmv-linux/
+[2] https://lore.kernel.org/git/alpine.DEB.2.20.1803091557510.23109@alexmv-linux/
     Git Merge 2018 Contributor's summit notes (includes discussion of MIDX)
diff --git a/third_party/git/Documentation/technical/pack-format.txt b/third_party/git/Documentation/technical/pack-format.txt
index cab5bdd2ff0f..d3a142c65202 100644
--- a/third_party/git/Documentation/technical/pack-format.txt
+++ b/third_party/git/Documentation/technical/pack-format.txt
@@ -315,10 +315,11 @@ CHUNK DATA:
 	    Stores two 4-byte values for every object.
 	    1: The pack-int-id for the pack storing this object.
 	    2: The offset within the pack.
-		If all offsets are less than 2^31, then the large offset chunk
+		If all offsets are less than 2^32, then the large offset chunk
 		will not exist and offsets are stored as in IDX v1.
 		If there is at least one offset value larger than 2^32-1, then
-		the large offset chunk must exist. If the large offset chunk
+		the large offset chunk must exist, and offsets larger than
+		2^31-1 must be stored in it instead. If the large offset chunk
 		exists and the 31st bit is on, then removing that bit reveals
 		the row in the large offsets containing the 8-byte offset of
 		this object.
diff --git a/third_party/git/Documentation/technical/pack-protocol.txt b/third_party/git/Documentation/technical/pack-protocol.txt
index c73e72de0e9c..d5ce4eea8a19 100644
--- a/third_party/git/Documentation/technical/pack-protocol.txt
+++ b/third_party/git/Documentation/technical/pack-protocol.txt
@@ -644,7 +644,7 @@ update was successful, or 'ng [refname] [error]' if the update was not.
   command-ok        = PKT-LINE("ok" SP refname)
   command-fail      = PKT-LINE("ng" SP refname SP error-msg)
 
-  error-msg         = 1*(OCTECT) ; where not "ok"
+  error-msg         = 1*(OCTET) ; where not "ok"
 ----
 
 Updates can be unsuccessful for a number of reasons.  The reference can have
diff --git a/third_party/git/Documentation/technical/partial-clone.txt b/third_party/git/Documentation/technical/partial-clone.txt
index 896c7b387886..b9e17e7a2878 100644
--- a/third_party/git/Documentation/technical/partial-clone.txt
+++ b/third_party/git/Documentation/technical/partial-clone.txt
@@ -30,12 +30,20 @@ advance* during clone and fetch operations and thereby reduce download
 times and disk usage.  Missing objects can later be "demand fetched"
 if/when needed.
 
+A remote that can later provide the missing objects is called a
+promisor remote, as it promises to send the objects when
+requested. Initially Git supported only one promisor remote, the origin
+remote from which the user cloned and that was configured in the
+"extensions.partialClone" config option. Later support for more than
+one promisor remote has been implemented.
+
 Use of partial clone requires that the user be online and the origin
-remote be available for on-demand fetching of missing objects.  This may
-or may not be problematic for the user.  For example, if the user can
-stay within the pre-selected subset of the source tree, they may not
-encounter any missing objects.  Alternatively, the user could try to
-pre-fetch various objects if they know that they are going offline.
+remote or other promisor remotes be available for on-demand fetching
+of missing objects.  This may or may not be problematic for the user.
+For example, if the user can stay within the pre-selected subset of
+the source tree, they may not encounter any missing objects.
+Alternatively, the user could try to pre-fetch various objects if they
+know that they are going offline.
 
 
 Non-Goals
@@ -100,18 +108,18 @@ or commits that reference missing trees.
 Handling Missing Objects
 ------------------------
 
-- An object may be missing due to a partial clone or fetch, or missing due
-  to repository corruption.  To differentiate these cases, the local
-  repository specially indicates such filtered packfiles obtained from the
-  promisor remote as "promisor packfiles".
+- An object may be missing due to a partial clone or fetch, or missing
+  due to repository corruption.  To differentiate these cases, the
+  local repository specially indicates such filtered packfiles
+  obtained from promisor remotes as "promisor packfiles".
 +
 These promisor packfiles consist of a "<name>.promisor" file with
 arbitrary contents (like the "<name>.keep" files), in addition to
 their "<name>.pack" and "<name>.idx" files.
 
 - The local repository considers a "promisor object" to be an object that
-  it knows (to the best of its ability) that the promisor remote has promised
-  that it has, either because the local repository has that object in one of
+  it knows (to the best of its ability) that promisor remotes have promised
+  that they have, either because the local repository has that object in one of
   its promisor packfiles, or because another promisor object refers to it.
 +
 When Git encounters a missing object, Git can see if it is a promisor object
@@ -123,12 +131,12 @@ expensive-to-modify list of missing objects.[a]
 - Since almost all Git code currently expects any referenced object to be
   present locally and because we do not want to force every command to do
   a dry-run first, a fallback mechanism is added to allow Git to attempt
-  to dynamically fetch missing objects from the promisor remote.
+  to dynamically fetch missing objects from promisor remotes.
 +
 When the normal object lookup fails to find an object, Git invokes
-fetch-object to try to get the object from the server and then retry
-the object lookup.  This allows objects to be "faulted in" without
-complicated prediction algorithms.
+promisor_remote_get_direct() to try to get the object from a promisor
+remote and then retry the object lookup.  This allows objects to be
+"faulted in" without complicated prediction algorithms.
 +
 For efficiency reasons, no check as to whether the missing object is
 actually a promisor object is performed.
@@ -157,8 +165,7 @@ and prefetch those objects in bulk.
 +
 We are not happy with this global variable and would like to remove it,
 but that requires significant refactoring of the object code to pass an
-additional flag.  We hope that concurrent efforts to add an ODB API can
-encompass this.
+additional flag.
 
 
 Fetching Missing Objects
@@ -182,21 +189,63 @@ has been updated to not use any object flags when the corresponding argument
   though they are not necessary.
 
 
+Using many promisor remotes
+---------------------------
+
+Many promisor remotes can be configured and used.
+
+This allows for example a user to have multiple geographically-close
+cache servers for fetching missing blobs while continuing to do
+filtered `git-fetch` commands from the central server.
+
+When fetching objects, promisor remotes are tried one after the other
+until all the objects have been fetched.
+
+Remotes that are considered "promisor" remotes are those specified by
+the following configuration variables:
+
+- `extensions.partialClone = <name>`
+
+- `remote.<name>.promisor = true`
+
+- `remote.<name>.partialCloneFilter = ...`
+
+Only one promisor remote can be configured using the
+`extensions.partialClone` config variable. This promisor remote will
+be the last one tried when fetching objects.
+
+We decided to make it the last one we try, because it is likely that
+someone using many promisor remotes is doing so because the other
+promisor remotes are better for some reason (maybe they are closer or
+faster for some kind of objects) than the origin, and the origin is
+likely to be the remote specified by extensions.partialClone.
+
+This justification is not very strong, but one choice had to be made,
+and anyway the long term plan should be to make the order somehow
+fully configurable.
+
+For now though the other promisor remotes will be tried in the order
+they appear in the config file.
+
 Current Limitations
 -------------------
 
-- The remote used for a partial clone (or the first partial fetch
-  following a regular clone) is marked as the "promisor remote".
+- It is not possible to specify the order in which the promisor
+  remotes are tried in other ways than the order in which they appear
+  in the config file.
 +
-We are currently limited to a single promisor remote and only that
-remote may be used for subsequent partial fetches.
+It is also not possible to specify an order to be used when fetching
+from one remote and a different order when fetching from another
+remote.
+
+- It is not possible to push only specific objects to a promisor
+  remote.
 +
-We accept this limitation because we believe initial users of this
-feature will be using it on repositories with a strong single central
-server.
+It is not possible to push at the same time to multiple promisor
+remote in a specific order.
 
-- Dynamic object fetching will only ask the promisor remote for missing
-  objects.  We assume that the promisor remote has a complete view of the
+- Dynamic object fetching will only ask promisor remotes for missing
+  objects.  We assume that promisor remotes have a complete view of the
   repository and can satisfy all such requests.
 
 - Repack essentially treats promisor and non-promisor packfiles as 2
@@ -218,15 +267,17 @@ server.
 Future Work
 -----------
 
-- Allow more than one promisor remote and define a strategy for fetching
-  missing objects from specific promisor remotes or of iterating over the
-  set of promisor remotes until a missing object is found.
+- Improve the way to specify the order in which promisor remotes are
+  tried.
 +
-A user might want to have multiple geographically-close cache servers
-for fetching missing blobs while continuing to do filtered `git-fetch`
-commands from the central server, for example.
+For example this could allow to specify explicitly something like:
+"When fetching from this remote, I want to use these promisor remotes
+in this order, though, when pushing or fetching to that remote, I want
+to use those promisor remotes in that order."
+
+- Allow pushing to promisor remotes.
 +
-Or the user might want to work in a triangular work flow with multiple
+The user might want to work in a triangular work flow with multiple
 promisor remotes that each have an incomplete view of the repository.
 
 - Allow repack to work on promisor packfiles (while keeping them distinct
@@ -299,26 +350,26 @@ Related Links
 [0] https://crbug.com/git/2
     Bug#2: Partial Clone
 
-[1] https://public-inbox.org/git/20170113155253.1644-1-benpeart@microsoft.com/ +
+[1] https://lore.kernel.org/git/20170113155253.1644-1-benpeart@microsoft.com/ +
     Subject: [RFC] Add support for downloading blobs on demand +
     Date: Fri, 13 Jan 2017 10:52:53 -0500
 
-[2] https://public-inbox.org/git/cover.1506714999.git.jonathantanmy@google.com/ +
+[2] https://lore.kernel.org/git/cover.1506714999.git.jonathantanmy@google.com/ +
     Subject: [PATCH 00/18] Partial clone (from clone to lazy fetch in 18 patches) +
     Date: Fri, 29 Sep 2017 13:11:36 -0700
 
-[3] https://public-inbox.org/git/20170426221346.25337-1-jonathantanmy@google.com/ +
+[3] https://lore.kernel.org/git/20170426221346.25337-1-jonathantanmy@google.com/ +
     Subject: Proposal for missing blob support in Git repos +
     Date: Wed, 26 Apr 2017 15:13:46 -0700
 
-[4] https://public-inbox.org/git/1488999039-37631-1-git-send-email-git@jeffhostetler.com/ +
+[4] https://lore.kernel.org/git/1488999039-37631-1-git-send-email-git@jeffhostetler.com/ +
     Subject: [PATCH 00/10] RFC Partial Clone and Fetch +
     Date: Wed,  8 Mar 2017 18:50:29 +0000
 
-[5] https://public-inbox.org/git/20170505152802.6724-1-benpeart@microsoft.com/ +
+[5] https://lore.kernel.org/git/20170505152802.6724-1-benpeart@microsoft.com/ +
     Subject: [PATCH v7 00/10] refactor the filter process code into a reusable module +
     Date: Fri,  5 May 2017 11:27:52 -0400
 
-[6] https://public-inbox.org/git/20170714132651.170708-1-benpeart@microsoft.com/ +
+[6] https://lore.kernel.org/git/20170714132651.170708-1-benpeart@microsoft.com/ +
     Subject: [RFC/PATCH v2 0/1] Add support for downloading blobs on demand +
     Date: Fri, 14 Jul 2017 09:26:50 -0400
diff --git a/third_party/git/Documentation/technical/protocol-v2.txt b/third_party/git/Documentation/technical/protocol-v2.txt
index 40f91f6b1ee1..7e3766cafb39 100644
--- a/third_party/git/Documentation/technical/protocol-v2.txt
+++ b/third_party/git/Documentation/technical/protocol-v2.txt
@@ -252,7 +252,7 @@ A `fetch` request can take the following arguments:
     ofs-delta
 	Indicate that the client understands PACKv2 with delta referring
 	to its base by position in pack rather than by an oid.  That is,
-	they can read OBJ_OFS_DELTA (ake type 6) in a packfile.
+	they can read OBJ_OFS_DELTA (aka type 6) in a packfile.
 
 If the 'shallow' feature is advertised the following arguments can be
 included in the clients request as well as the potential addition of the
diff --git a/third_party/git/Documentation/technical/racy-git.txt b/third_party/git/Documentation/technical/racy-git.txt
index 4a8be4d144cf..ceda4bbfda4d 100644
--- a/third_party/git/Documentation/technical/racy-git.txt
+++ b/third_party/git/Documentation/technical/racy-git.txt
@@ -51,7 +51,7 @@ of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
 only fixes the issue for file systems with exactly 1 ns or 1 s
 resolution. Other file systems are still broken in current Linux
 kernels (e.g. CEPH, CIFS, NTFS, UDF), see
-https://lkml.org/lkml/2015/6/9/714
+https://lore.kernel.org/lkml/5577240D.7020309@gmail.com/
 
 Racy Git
 --------
diff --git a/third_party/git/Documentation/technical/rerere.txt b/third_party/git/Documentation/technical/rerere.txt
index aa22d7ace893..af5f9fc24f93 100644
--- a/third_party/git/Documentation/technical/rerere.txt
+++ b/third_party/git/Documentation/technical/rerere.txt
@@ -117,7 +117,7 @@ early A became C or B, a late X became Y or Z".  We can see there are
 4 combinations of ("B or C", "C or B") x ("X or Y", "Y or X").
 
 By sorting, the conflict is given its canonical name, namely, "an
-early part became B or C, a late part becames X or Y", and whenever
+early part became B or C, a late part became X or Y", and whenever
 any of these four patterns appear, and we can get to the same conflict
 and resolution that we saw earlier.
 
diff --git a/third_party/git/Documentation/trace2-target-values.txt b/third_party/git/Documentation/trace2-target-values.txt
index 27d3c64e6655..3985b6d3c295 100644
--- a/third_party/git/Documentation/trace2-target-values.txt
+++ b/third_party/git/Documentation/trace2-target-values.txt
@@ -2,7 +2,9 @@
 * `0` or `false` - Disables the target.
 * `1` or `true` - Writes to `STDERR`.
 * `[2-9]` - Writes to the already opened file descriptor.
-* `<absolute-pathname>` - Writes to the file in append mode.
+* `<absolute-pathname>` - Writes to the file in append mode. If the target
+already exists and is a directory, the traces will be written to files (one
+per process) underneath the given directory.
 * `af_unix:[<socket_type>:]<absolute-pathname>` - Write to a
 Unix DomainSocket (on platforms that support them).  Socket
 type can be either `stream` or `dgram`; if omitted Git will
diff --git a/third_party/git/Documentation/urls.txt b/third_party/git/Documentation/urls.txt
index bc354fe2dce5..1c229d758152 100644
--- a/third_party/git/Documentation/urls.txt
+++ b/third_party/git/Documentation/urls.txt
@@ -53,6 +53,9 @@ These two syntaxes are mostly equivalent, except the former implies
 --local option.
 endif::git-clone[]
 
+'git clone', 'git fetch' and 'git pull', but not 'git push', will also
+accept a suitable bundle file. See linkgit:git-bundle[1].
+
 When Git doesn't know how to handle a certain transport protocol, it
 attempts to use the 'remote-<transport>' remote helper, if one
 exists. To explicitly request a remote helper, the following syntax
diff --git a/third_party/git/Documentation/user-manual.txt b/third_party/git/Documentation/user-manual.txt
index 8bce75b2cf2b..833652983fa6 100644
--- a/third_party/git/Documentation/user-manual.txt
+++ b/third_party/git/Documentation/user-manual.txt
@@ -1,5 +1,4 @@
-Git User Manual
-===============
+= Git User Manual
 
 Git is a fast distributed revision control system.
 
@@ -41,12 +40,10 @@ complete.
 
 
 [[repositories-and-branches]]
-Repositories and Branches
-=========================
+== Repositories and Branches
 
 [[how-to-get-a-git-repository]]
-How to get a Git repository
----------------------------
+=== How to get a Git repository
 
 It will be useful to have a Git repository to experiment with as you
 read this manual.
@@ -73,8 +70,7 @@ top-level directory named `.git`, which contains all the information
 about the history of the project.
 
 [[how-to-check-out]]
-How to check out a different version of a project
--------------------------------------------------
+=== How to check out a different version of a project
 
 Git is best thought of as a tool for storing the history of a collection
 of files.  It stores the history as a compressed collection of
@@ -151,8 +147,7 @@ with no way to find the history it used to point to; so use this command
 carefully.
 
 [[understanding-commits]]
-Understanding History: Commits
-------------------------------
+=== Understanding History: Commits
 
 Every change in the history of a project is represented by a commit.
 The linkgit:git-show[1] command shows the most recent commit on the
@@ -202,8 +197,7 @@ history, including file data and directory contents, is stored in an object
 with a name that is a hash of its contents.
 
 [[understanding-reachability]]
-Understanding history: commits, parents, and reachability
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Understanding history: commits, parents, and reachability
 
 Every commit (except the very first commit in a project) also has a
 parent commit which shows what happened before this commit.
@@ -227,8 +221,7 @@ that Y is a descendant of X, or that there is a chain of parents
 leading from commit Y to commit X.
 
 [[history-diagrams]]
-Understanding history: History diagrams
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Understanding history: History diagrams
 
 We will sometimes represent Git history using diagrams like the one
 below.  Commits are shown as "o", and the links between them with
@@ -247,8 +240,7 @@ If we need to talk about a particular commit, the character "o" may
 be replaced with another letter or number.
 
 [[what-is-a-branch]]
-Understanding history: What is a branch?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Understanding history: What is a branch?
 
 When we need to be precise, we will use the word "branch" to mean a line
 of development, and "branch head" (or just "head") to mean a reference
@@ -261,8 +253,7 @@ However, when no confusion will result, we often just use the term
 "branch" both for branches and for branch heads.
 
 [[manipulating-branches]]
-Manipulating branches
----------------------
+=== Manipulating branches
 
 Creating, deleting, and modifying branches is quick and easy; here's
 a summary of the commands:
@@ -299,8 +290,7 @@ ref: refs/heads/master
 ------------------------------------------------
 
 [[detached-head]]
-Examining an old version without creating a new branch
-------------------------------------------------------
+=== Examining an old version without creating a new branch
 
 The `git switch` command normally expects a branch head, but will also
 accept an arbitrary commit when invoked with --detach; for example,
@@ -340,8 +330,7 @@ make up a name for the new branch.   You can still create a new branch
 (or tag) for this version later if you decide to.
 
 [[examining-remote-branches]]
-Examining branches from a remote repository
--------------------------------------------
+=== Examining branches from a remote repository
 
 The "master" branch that was created at the time you cloned is a copy
 of the HEAD in the repository that you cloned from.  That repository
@@ -383,8 +372,7 @@ Note that the name "origin" is just the name that Git uses by default
 to refer to the repository that you cloned from.
 
 [[how-git-stores-references]]
-Naming branches, tags, and other references
--------------------------------------------
+=== Naming branches, tags, and other references
 
 Branches, remote-tracking branches, and tags are all references to
 commits.  All references are named with a slash-separated path name
@@ -413,8 +401,7 @@ references with the same shorthand name, see the "SPECIFYING
 REVISIONS" section of linkgit:gitrevisions[7].
 
 [[Updating-a-repository-With-git-fetch]]
-Updating a repository with git fetch
-------------------------------------
+=== Updating a repository with git fetch
 
 After you clone a repository and commit a few changes of your own, you
 may wish to check the original repository for updates.
@@ -425,8 +412,7 @@ repository.  It will not touch any of your own branches--not even the
 "master" branch that was created for you on clone.
 
 [[fetching-branches]]
-Fetching branches from other repositories
------------------------------------------
+=== Fetching branches from other repositories
 
 You can also track branches from repositories other than the one you
 cloned from, using linkgit:git-remote[1]:
@@ -474,8 +460,7 @@ text editor.  (See the "CONFIGURATION FILE" section of
 linkgit:git-config[1] for details.)
 
 [[exploring-git-history]]
-Exploring Git history
-=====================
+== Exploring Git history
 
 Git is best thought of as a tool for storing the history of a
 collection of files.  It does this by storing compressed snapshots of
@@ -489,8 +474,7 @@ We start with one specialized tool that is useful for finding the
 commit that introduced a bug into a project.
 
 [[using-bisect]]
-How to use bisect to find a regression
---------------------------------------
+=== How to use bisect to find a regression
 
 Suppose version 2.6.18 of your project worked, but the version at
 "master" crashes.  Sometimes the best way to find the cause of such a
@@ -572,8 +556,7 @@ linkgit:git-bisect[1] for more information about this and other `git
 bisect` features.
 
 [[naming-commits]]
-Naming commits
---------------
+=== Naming commits
 
 We have seen several ways of naming commits already:
 
@@ -637,8 +620,7 @@ e05db0fd4f31dde7005f075a84f96b360d05984b
 -------------------------------------------------
 
 [[creating-tags]]
-Creating tags
--------------
+=== Creating tags
 
 We can also create a tag to refer to a particular commit; after
 running
@@ -655,8 +637,7 @@ should create a tag object instead; see the linkgit:git-tag[1] man page
 for details.
 
 [[browsing-revisions]]
-Browsing revisions
-------------------
+=== Browsing revisions
 
 The linkgit:git-log[1] command can show lists of commits.  On its
 own, it shows all commits reachable from the parent commit; but you
@@ -697,8 +678,7 @@ multiple independent lines of development, the particular order that
 commits are listed in may be somewhat arbitrary.
 
 [[generating-diffs]]
-Generating diffs
-----------------
+=== Generating diffs
 
 You can generate diffs between any two versions using
 linkgit:git-diff[1]:
@@ -726,8 +706,7 @@ will generate a file with a patch for each commit reachable from test
 but not from master.
 
 [[viewing-old-file-versions]]
-Viewing old file versions
--------------------------
+=== Viewing old file versions
 
 You can always view an old version of a file by just checking out the
 correct revision first.  But sometimes it is more convenient to be
@@ -742,12 +721,10 @@ Before the colon may be anything that names a commit, and after it
 may be any path to a file tracked by Git.
 
 [[history-examples]]
-Examples
---------
+=== Examples
 
 [[counting-commits-on-a-branch]]
-Counting the number of commits on a branch
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Counting the number of commits on a branch
 
 Suppose you want to know how many commits you've made on `mybranch`
 since it diverged from `origin`:
@@ -765,8 +742,7 @@ $ git rev-list origin..mybranch | wc -l
 -------------------------------------------------
 
 [[checking-for-equal-branches]]
-Check whether two branches point at the same history
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Check whether two branches point at the same history
 
 Suppose you want to check whether two branches point at the same point
 in history.
@@ -798,8 +774,7 @@ $ git log origin...master
 will return no commits when the two branches are equal.
 
 [[finding-tagged-descendants]]
-Find first tagged version including a given fix
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Find first tagged version including a given fix
 
 Suppose you know that the commit e05db0fd fixed a certain problem.
 You'd like to find the earliest tagged release that contains that
@@ -883,8 +858,7 @@ shows that e05db0fd is reachable from itself, from v1.5.0-rc1,
 and from v1.5.0-rc2, and not from v1.5.0-rc0.
 
 [[showing-commits-unique-to-a-branch]]
-Showing commits unique to a given branch
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Showing commits unique to a given branch
 
 Suppose you would like to see all the commits reachable from the branch
 head named `master` but not from any other head in your repository.
@@ -931,8 +905,7 @@ $ gitk $( git show-ref --heads ) --not  $( git show-ref --tags )
 syntax such as `--not`.)
 
 [[making-a-release]]
-Creating a changelog and tarball for a software release
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Creating a changelog and tarball for a software release
 
 The linkgit:git-archive[1] command can create a tar or zip archive from
 any version of a project; for example:
@@ -983,8 +956,7 @@ and then he just cut-and-pastes the output commands after verifying that
 they look OK.
 
 [[Finding-commits-With-given-Content]]
-Finding commits referencing a file with given content
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Finding commits referencing a file with given content
 
 Somebody hands you a copy of a file, and asks which commits modified a
 file such that it contained the given content either before or after the
@@ -1000,12 +972,10 @@ student.  The linkgit:git-log[1], linkgit:git-diff-tree[1], and
 linkgit:git-hash-object[1] man pages may prove helpful.
 
 [[Developing-With-git]]
-Developing with Git
-===================
+== Developing with Git
 
 [[telling-git-your-name]]
-Telling Git your name
----------------------
+=== Telling Git your name
 
 Before creating any commits, you should introduce yourself to Git.
 The easiest way to do so is to use linkgit:git-config[1]:
@@ -1030,8 +1000,7 @@ also edit it with your favorite editor.
 
 
 [[creating-a-new-repository]]
-Creating a new repository
--------------------------
+=== Creating a new repository
 
 Creating a new repository from scratch is very easy:
 
@@ -1052,8 +1021,7 @@ $ git commit
 -------------------------------------------------
 
 [[how-to-make-a-commit]]
-How to make a commit
---------------------
+=== How to make a commit
 
 Creating a new commit takes three steps:
 
@@ -1148,8 +1116,7 @@ for inclusion in the index (by right-clicking on the diff hunk and
 choosing "Stage Hunk For Commit").
 
 [[creating-good-commit-messages]]
-Creating good commit messages
------------------------------
+=== Creating good commit messages
 
 Though not required, it's a good idea to begin the commit message
 with a single short (less than 50 character) line summarizing the
@@ -1162,8 +1129,7 @@ rest of the commit in the body.
 
 
 [[ignoring-files]]
-Ignoring files
---------------
+=== Ignoring files
 
 A project will often generate files that you do 'not' want to track with Git.
 This typically includes files generated by a build process or temporary
@@ -1205,8 +1171,7 @@ Some Git commands can also take exclude patterns directly on the
 command line.  See linkgit:gitignore[5] for the details.
 
 [[how-to-merge]]
-How to merge
-------------
+=== How to merge
 
 You can rejoin two diverging branches of development using
 linkgit:git-merge[1]:
@@ -1254,8 +1219,7 @@ has two parents, one pointing to the top of the current branch, and
 one to the top of the other branch.
 
 [[resolving-a-merge]]
-Resolving a merge
------------------
+=== Resolving a merge
 
 When a merge isn't resolved automatically, Git leaves the index and
 the working tree in a special state that gives you all the
@@ -1297,8 +1261,7 @@ The above is all you need to know to resolve a simple merge.  But Git
 also provides more information to help resolve conflicts:
 
 [[conflict-resolution]]
-Getting conflict-resolution help during a merge
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Getting conflict-resolution help during a merge
 
 All of the changes that Git was able to merge automatically are
 already added to the index file, so linkgit:git-diff[1] shows only
@@ -1401,8 +1364,7 @@ the different stages of that file will be "collapsed", after which
 `git diff` will (by default) no longer show diffs for that file.
 
 [[undoing-a-merge]]
-Undoing a merge
----------------
+=== Undoing a merge
 
 If you get stuck and decide to just give up and throw the whole mess
 away, you can always return to the pre-merge state with
@@ -1423,8 +1385,7 @@ itself have been merged into another branch, as doing so may confuse
 further merges.
 
 [[fast-forwards]]
-Fast-forward merges
--------------------
+=== Fast-forward merges
 
 There is one special case not mentioned above, which is treated
 differently.  Normally, a merge results in a merge commit, with two
@@ -1438,8 +1399,7 @@ to point at the head of the merged-in branch, without any new commits being
 created.
 
 [[fixing-mistakes]]
-Fixing mistakes
----------------
+=== Fixing mistakes
 
 If you've messed up the working tree, but haven't yet committed your
 mistake, you can return the entire working tree to the last committed
@@ -1463,8 +1423,7 @@ fundamentally different ways to fix the problem:
 	a branch that has had its history changed.
 
 [[reverting-a-commit]]
-Fixing a mistake with a new commit
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Fixing a mistake with a new commit
 
 Creating a new commit that reverts an earlier change is very easy;
 just pass the linkgit:git-revert[1] command a reference to the bad
@@ -1490,8 +1449,7 @@ conflicts manually, just as in the case of <<resolving-a-merge,
 resolving a merge>>.
 
 [[fixing-a-mistake-by-rewriting-history]]
-Fixing a mistake by rewriting history
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Fixing a mistake by rewriting history
 
 If the problematic commit is the most recent commit, and you have not
 yet made that commit public, then you may just
@@ -1518,8 +1476,7 @@ this is an advanced topic to be left for
 <<cleaning-up-history,another chapter>>.
 
 [[checkout-of-path]]
-Checking out an old version of a file
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Checking out an old version of a file
 
 In the process of undoing a previous bad change, you may find it
 useful to check out an older version of a particular file using
@@ -1543,8 +1500,7 @@ $ git show HEAD^:path/to/file
 which will display the given version of the file.
 
 [[interrupted-work]]
-Temporarily setting aside work in progress
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Temporarily setting aside work in progress
 
 While you are in the middle of working on something complicated, you
 find an unrelated but obvious and trivial bug.  You would like to fix it
@@ -1575,8 +1531,7 @@ $ git stash pop
 
 
 [[ensuring-good-performance]]
-Ensuring good performance
--------------------------
+=== Ensuring good performance
 
 On large repositories, Git depends on compression to keep the history
 information from taking up too much space on disk or in memory.  Some
@@ -1587,12 +1542,10 @@ to avoid automatic compression kicking in when it is not convenient.
 
 
 [[ensuring-reliability]]
-Ensuring reliability
---------------------
+=== Ensuring reliability
 
 [[checking-for-corruption]]
-Checking the repository for corruption
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Checking the repository for corruption
 
 The linkgit:git-fsck[1] command runs a number of self-consistency checks
 on the repository, and reports on any problems.  This may take some
@@ -1618,12 +1571,10 @@ You can run `git fsck --no-dangling` to suppress these messages, and still
 view real errors.
 
 [[recovering-lost-changes]]
-Recovering lost changes
-~~~~~~~~~~~~~~~~~~~~~~~
+==== Recovering lost changes
 
 [[reflogs]]
-Reflogs
-^^^^^^^
+===== Reflogs
 
 Say you modify a branch with <<fixing-mistakes,`git reset --hard`>>,
 and then realize that the branch was the only reference you had to
@@ -1670,8 +1621,7 @@ same project, the reflog history is not shared: it tells you only about
 how the branches in your local repository have changed over time.
 
 [[dangling-object-recovery]]
-Examining dangling objects
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+===== Examining dangling objects
 
 In some situations the reflog may not be able to save you.  For example,
 suppose you delete a branch, then realize you need the history it
@@ -1715,12 +1665,10 @@ dangling objects can arise in other situations.
 
 
 [[sharing-development]]
-Sharing development with others
-===============================
+== Sharing development with others
 
 [[getting-updates-With-git-pull]]
-Getting updates with git pull
------------------------------
+=== Getting updates with git pull
 
 After you clone a repository and commit a few changes of your own, you
 may wish to check the original repository for updates and merge them
@@ -1783,8 +1731,7 @@ $ git merge branch
 are roughly equivalent.
 
 [[submitting-patches]]
-Submitting patches to a project
--------------------------------
+=== Submitting patches to a project
 
 If you just have a few changes, the simplest way to submit them may
 just be to send them as patches in email:
@@ -1812,8 +1759,7 @@ Consult the mailing list for your project first to determine
 their requirements for submitting patches.
 
 [[importing-patches]]
-Importing patches to a project
-------------------------------
+=== Importing patches to a project
 
 Git also provides a tool called linkgit:git-am[1] (am stands for
 "apply mailbox"), for importing such an emailed series of patches.
@@ -1845,8 +1791,7 @@ the original mailbox, with authorship and commit log message each
 taken from the message containing each patch.
 
 [[public-repositories]]
-Public Git repositories
------------------------
+=== Public Git repositories
 
 Another way to submit changes to a project is to tell the maintainer
 of that project to pull the changes from your repository using
@@ -1886,21 +1831,22 @@ pull from that repository.  So the flow of changes, in a situation
 where there is one other developer with a public repository, looks
 like this:
 
-                        you push
-  your personal repo ------------------> your public repo
-	^                                     |
-	|                                     |
-	| you pull                            | they pull
-	|                                     |
-	|                                     |
-        |               they push             V
-  their public repo <------------------- their repo
+....
+		      you push
+your personal repo ------------------> your public repo
+      ^                                     |
+      |                                     |
+      | you pull                            | they pull
+      |                                     |
+      |                                     |
+      |               they push             V
+their public repo <------------------- their repo
+....
 
 We explain how to do this in the following sections.
 
 [[setting-up-a-public-repository]]
-Setting up a public repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Setting up a public repository
 
 Assume your personal repository is in the directory `~/proj`.  We
 first create a new clone of the repository and tell `git daemon` that it
@@ -1920,8 +1866,7 @@ public repository.  You can use scp, rsync, or whatever is most
 convenient.
 
 [[exporting-via-git]]
-Exporting a Git repository via the Git protocol
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Exporting a Git repository via the Git protocol
 
 This is the preferred method.
 
@@ -1942,8 +1887,7 @@ linkgit:git-daemon[1] man page for details.  (See especially the
 examples section.)
 
 [[exporting-via-http]]
-Exporting a git repository via HTTP
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Exporting a git repository via HTTP
 
 The Git protocol gives better performance and reliability, but on a
 host with a web server set up, HTTP exports may be simpler to set up.
@@ -1975,8 +1919,7 @@ for a slightly more sophisticated setup using WebDAV which also
 allows pushing over HTTP.)
 
 [[pushing-changes-to-a-public-repository]]
-Pushing changes to a public repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Pushing changes to a public repository
 
 Note that the two techniques outlined above (exporting via
 <<exporting-via-http,http>> or <<exporting-via-git,git>>) allow other
@@ -2035,8 +1978,7 @@ See the explanations of the `remote.<name>.url`,
 linkgit:git-config[1] for details.
 
 [[forcing-push]]
-What to do when a push fails
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== What to do when a push fails
 
 If a push would not result in a <<fast-forwards,fast-forward>> of the
 remote branch, then it will fail with an error like:
@@ -2090,8 +2032,7 @@ pull, or by a fetch followed by a rebase; see the
 linkgit:gitcvs-migration[7] for more.
 
 [[setting-up-a-shared-repository]]
-Setting up a shared repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Setting up a shared repository
 
 Another way to collaborate is by using a model similar to that
 commonly used in CVS, where several developers with special rights
@@ -2121,8 +2062,7 @@ advantages over the central shared repository:
 	  "out".
 
 [[setting-up-gitweb]]
-Allowing web browsing of a repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Allowing web browsing of a repository
 
 The gitweb cgi script provides users an easy way to browse your
 project's revisions, file contents and logs without having to install
@@ -2138,8 +2078,7 @@ linkgit:gitweb[1] for instructions on details setting up a permanent
 installation with a CGI or Perl capable server.
 
 [[how-to-get-a-git-repository-with-minimal-history]]
-How to get a Git repository with minimal history
-------------------------------------------------
+=== How to get a Git repository with minimal history
 
 A <<def_shallow_clone,shallow clone>>, with its truncated
 history, is useful when one is interested only in recent history
@@ -2158,12 +2097,10 @@ have to result in huge conflicts.  This limitation may make such
 a repository unsuitable to be used in merge based workflows.
 
 [[sharing-development-examples]]
-Examples
---------
+=== Examples
 
 [[maintaining-topic-branches]]
-Maintaining topic branches for a Linux subsystem maintainer
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Maintaining topic branches for a Linux subsystem maintainer
 
 This describes how Tony Luck uses Git in his role as maintainer of the
 IA64 architecture for the Linux kernel.
@@ -2459,8 +2396,7 @@ done
 
 
 [[cleaning-up-history]]
-Rewriting history and maintaining patch series
-==============================================
+== Rewriting history and maintaining patch series
 
 Normally commits are only added to a project, never taken away or
 replaced.  Git is designed with this assumption, and violating it will
@@ -2470,8 +2406,7 @@ However, there is a situation in which it can be useful to violate this
 assumption.
 
 [[patch-series]]
-Creating the perfect patch series
----------------------------------
+=== Creating the perfect patch series
 
 Suppose you are a contributor to a large project, and you want to add a
 complicated feature, and to present it to the other developers in a way
@@ -2503,8 +2438,7 @@ use them, and then explain some of the problems that can arise because
 you are rewriting history.
 
 [[using-git-rebase]]
-Keeping a patch series up to date using git rebase
---------------------------------------------------
+=== Keeping a patch series up to date using git rebase
 
 Suppose that you create a branch `mywork` on a remote-tracking branch
 `origin`, and create some commits on top of it:
@@ -2591,8 +2525,7 @@ the rebase.  See <<interactive-rebase>> for details, and
 <<reordering-patch-series>> for alternatives.
 
 [[rewriting-one-commit]]
-Rewriting a single commit
--------------------------
+=== Rewriting a single commit
 
 We saw in <<fixing-a-mistake-by-rewriting-history>> that you can replace the
 most recent commit using
@@ -2610,8 +2543,7 @@ If you need to amend commits from deeper in your history, you can
 use <<interactive-rebase,interactive rebase's `edit` instruction>>.
 
 [[reordering-patch-series]]
-Reordering or selecting from a patch series
--------------------------------------------
+=== Reordering or selecting from a patch series
 
 Sometimes you want to edit a commit deeper in your history.  One
 approach is to use `git format-patch` to create a series of patches
@@ -2630,8 +2562,7 @@ $ git am *.patch
 -------------------------------------------------
 
 [[interactive-rebase]]
-Using interactive rebases
--------------------------
+=== Using interactive rebases
 
 You can also edit a patch series with an interactive rebase.  This is
 the same as <<reordering-patch-series,reordering a patch series using
@@ -2688,16 +2619,14 @@ For a more detailed discussion of the procedure and additional tips,
 see the "INTERACTIVE MODE" section of linkgit:git-rebase[1].
 
 [[patch-series-tools]]
-Other tools
------------
+=== Other tools
 
 There are numerous other tools, such as StGit, which exist for the
 purpose of maintaining a patch series.  These are outside of the scope of
 this manual.
 
 [[problems-With-rewriting-history]]
-Problems with rewriting history
--------------------------------
+=== Problems with rewriting history
 
 The primary problem with rewriting the history of a branch has to do
 with merging.  Suppose somebody fetches your branch and merges it into
@@ -2745,8 +2674,7 @@ For true distributed development that supports proper merging,
 published branches should never be rewritten.
 
 [[bisect-merges]]
-Why bisecting merge commits can be harder than bisecting linear history
------------------------------------------------------------------------
+=== Why bisecting merge commits can be harder than bisecting linear history
 
 The linkgit:git-bisect[1] command correctly handles history that
 includes merge commits.  However, when the commit that it finds is a
@@ -2811,12 +2739,10 @@ linear by rebasing against the latest upstream version before
 publishing.
 
 [[advanced-branch-management]]
-Advanced branch management
-==========================
+== Advanced branch management
 
 [[fetching-individual-branches]]
-Fetching individual branches
-----------------------------
+=== Fetching individual branches
 
 Instead of using linkgit:git-remote[1], you can also choose just
 to update one branch at a time, and to store it locally under an
@@ -2844,8 +2770,7 @@ already have a branch named example-master, it will attempt to
 master branch.  In more detail:
 
 [[fetch-fast-forwards]]
-git fetch and fast-forwards
----------------------------
+=== git fetch and fast-forwards
 
 In the previous example, when updating an existing branch, `git fetch`
 checks to make sure that the most recent commit on the remote
@@ -2882,8 +2807,7 @@ unless you've already created a reference of your own pointing to
 them.
 
 [[forcing-fetch]]
-Forcing git fetch to do non-fast-forward updates
-------------------------------------------------
+=== Forcing git fetch to do non-fast-forward updates
 
 If git fetch fails because the new head of a branch is not a
 descendant of the old head, you may force the update with:
@@ -2903,8 +2827,7 @@ Be aware that commits that the old version of example/master pointed at
 may be lost, as we saw in the previous section.
 
 [[remote-branch-configuration]]
-Configuring remote-tracking branches
-------------------------------------
+=== Configuring remote-tracking branches
 
 We saw above that `origin` is just a shortcut to refer to the
 repository that you originally cloned from.  This information is
@@ -2955,8 +2878,7 @@ the refspec syntax.
 
 
 [[git-concepts]]
-Git concepts
-============
+== Git concepts
 
 Git is built on a small number of simple but powerful ideas.  While it
 is possible to get things done without understanding them, you will find
@@ -2966,8 +2888,7 @@ We start with the most important, the  <<def_object_database,object
 database>> and the <<def_index,index>>.
 
 [[the-object-database]]
-The Object Database
--------------------
+=== The Object Database
 
 
 We already saw in <<understanding-commits>> that all commits are stored
@@ -3011,8 +2932,7 @@ There are four different types of objects: "blob", "tree", "commit", and
 The object types in some more detail:
 
 [[commit-object]]
-Commit Object
-~~~~~~~~~~~~~
+==== Commit Object
 
 The "commit" object links a physical state of a tree with a description
 of how we got there and why.  Use the `--pretty=raw` option to
@@ -3064,8 +2984,7 @@ commit whose parent is normally the current HEAD, and whose tree is
 taken from the content currently stored in the index.
 
 [[tree-object]]
-Tree Object
-~~~~~~~~~~~
+==== Tree Object
 
 The ever-versatile linkgit:git-show[1] command can also be used to
 examine tree objects, but linkgit:git-ls-tree[1] will give you more
@@ -3104,8 +3023,7 @@ Note that the files all have mode 644 or 755: Git actually only pays
 attention to the executable bit.
 
 [[blob-object]]
-Blob Object
-~~~~~~~~~~~
+==== Blob Object
 
 You can use linkgit:git-show[1] to examine the contents of a blob; take,
 for example, the blob in the entry for `COPYING` from the tree above:
@@ -3134,8 +3052,7 @@ sometimes be useful for browsing the contents of a tree that is not
 currently checked out.
 
 [[trust]]
-Trust
-~~~~~
+==== Trust
 
 If you receive the SHA-1 name of a blob from one source, and its contents
 from another (possibly untrusted) source, you can still trust that those
@@ -3164,8 +3081,7 @@ like GPG/PGP.
 To assist in this, Git also provides the tag object...
 
 [[tag-object]]
-Tag Object
-~~~~~~~~~~
+==== Tag Object
 
 A tag object contains an object, object type, tag name, the name of the
 person ("tagger") who created the tag, and a message, which may contain
@@ -3194,8 +3110,7 @@ objects.  (Note that linkgit:git-tag[1] can also be used to create
 references whose names begin with `refs/tags/`).
 
 [[pack-files]]
-How Git stores objects efficiently: pack files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== How Git stores objects efficiently: pack files
 
 Newly created objects are initially created in a file named after the
 object's SHA-1 hash (stored in `.git/objects`).
@@ -3253,8 +3168,7 @@ The linkgit:git-gc[1] command performs packing, pruning, and more for
 you, so is normally the only high-level command you need.
 
 [[dangling-objects]]
-Dangling objects
-~~~~~~~~~~~~~~~~
+==== Dangling objects
 
 The linkgit:git-fsck[1] command will sometimes complain about dangling
 objects.  They are not a problem.
@@ -3334,8 +3248,7 @@ don't want to do that while the filesystem is mounted.
 accesses to a repository but you might receive confusing or scary messages.)
 
 [[recovering-from-repository-corruption]]
-Recovering from repository corruption
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Recovering from repository corruption
 
 By design, Git treats data trusted to it with caution.  However, even in
 the absence of bugs in Git itself, it is still possible that hardware or
@@ -3452,8 +3365,7 @@ whole thing. It's up to you--Git does *have* a lot of information, it is
 just missing one particular blob version.
 
 [[the-index]]
-The index
----------
+=== The index
 
 The index is a binary file (generally kept in `.git/index`) containing a
 sorted list of path names, each with permissions and the SHA-1 of a blob
@@ -3511,8 +3423,7 @@ If you blow the index away entirely, you generally haven't lost any
 information as long as you have the name of the tree that it described.
 
 [[submodules]]
-Submodules
-==========
+== Submodules
 
 Large projects are often composed of smaller, self-contained modules.  For
 example, an embedded Linux distribution's source tree would include every
@@ -3698,8 +3609,8 @@ $ git push
 You have to run `git submodule update` after `git pull` if you want to update
 submodules, too.
 
-Pitfalls with submodules
-------------------------
+[[pitfalls-with-submodules]]
+=== Pitfalls with submodules
 
 Always publish the submodule change before publishing the change to the
 superproject that references it. If you forget to publish the submodule change,
@@ -3768,8 +3679,7 @@ submodule update` will not overwrite them.  Instead, you get the usual
 warning about not being able switch from a dirty branch.
 
 [[low-level-operations]]
-Low-level Git operations
-========================
+== Low-level Git operations
 
 Many of the higher-level commands were originally implemented as shell
 scripts using a smaller core of low-level Git commands.  These can still
@@ -3777,8 +3687,7 @@ be useful when doing unusual things with Git, or just as a way to
 understand its inner workings.
 
 [[object-manipulation]]
-Object access and manipulation
-------------------------------
+=== Object access and manipulation
 
 The linkgit:git-cat-file[1] command can show the contents of any object,
 though the higher-level linkgit:git-show[1] is usually more useful.
@@ -3795,8 +3704,7 @@ verified by linkgit:git-verify-tag[1], though it is normally simpler to
 use linkgit:git-tag[1] for both.
 
 [[the-workflow]]
-The Workflow
-------------
+=== The Workflow
 
 High-level operations such as linkgit:git-commit[1] and
 linkgit:git-restore[1] work by moving data
@@ -3811,8 +3719,7 @@ the database or the working directory. Thus there are four main
 combinations:
 
 [[working-directory-to-index]]
-working directory -> index
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== working directory -> index
 
 The linkgit:git-update-index[1] command updates the index with
 information from the working directory.  You generally update the
@@ -3848,8 +3755,7 @@ The previously introduced linkgit:git-add[1] is just a wrapper for
 linkgit:git-update-index[1].
 
 [[index-to-object-database]]
-index -> object database
-~~~~~~~~~~~~~~~~~~~~~~~~
+==== index -> object database
 
 You write your current index file to a "tree" object with the program
 
@@ -3864,8 +3770,7 @@ use that tree to re-generate the index at any time by going in the
 other direction:
 
 [[object-database-to-index]]
-object database -> index
-~~~~~~~~~~~~~~~~~~~~~~~~
+==== object database -> index
 
 You read a "tree" file from the object database, and use that to
 populate (and overwrite--don't do this if your index contains any
@@ -3881,8 +3786,7 @@ earlier. However, that is only your 'index' file: your working
 directory contents have not been modified.
 
 [[index-to-working-directory]]
-index -> working directory
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== index -> working directory
 
 You update your working directory from the index by "checking out"
 files. This is not a very common operation, since normally you'd just
@@ -3911,8 +3815,7 @@ Finally, there are a few odds and ends which are not purely moving
 from one representation to the other:
 
 [[tying-it-all-together]]
-Tying it all together
-~~~~~~~~~~~~~~~~~~~~~
+==== Tying it all together
 
 To commit a tree you have instantiated with `git write-tree`, you'd
 create a "commit" object that refers to that tree and the history
@@ -3986,8 +3889,7 @@ Here is a picture that illustrates how various pieces fit together:
 
 
 [[examining-the-data]]
-Examining the data
-------------------
+=== Examining the data
 
 You can examine the data represented in the object database and the
 index with various helper tools. For every object, you can use
@@ -4022,8 +3924,7 @@ $ git cat-file commit HEAD
 to see what the top commit was.
 
 [[merging-multiple-trees]]
-Merging multiple trees
-----------------------
+=== Merging multiple trees
 
 Git can help you perform a three-way merge, which can in turn be
 used for a many-way merge by repeating the merge procedure several
@@ -4073,8 +3974,7 @@ index file, and you can just write the result out with
 
 
 [[merging-multiple-trees-2]]
-Merging multiple trees, continued
----------------------------------
+=== Merging multiple trees, continued
 
 Sadly, many merges aren't trivial. If there are files that have
 been added, moved or removed, or if both branches have modified the
@@ -4144,15 +4044,13 @@ $ git merge-index git-merge-one-file hello.c
 and that is what higher level `git merge -s resolve` is implemented with.
 
 [[hacking-git]]
-Hacking Git
-===========
+== Hacking Git
 
 This chapter covers internal details of the Git implementation which
 probably only Git developers need to understand.
 
 [[object-details]]
-Object storage format
----------------------
+=== Object storage format
 
 All objects have a statically determined "type" which identifies the
 format of the object (i.e. how it is used, and how it can refer to other
@@ -4182,8 +4080,7 @@ of all objects, and verifies their internal consistency (in addition
 to just verifying their superficial consistency through the hash).
 
 [[birdview-on-the-source-code]]
-A birds-eye view of Git's source code
--------------------------------------
+=== A birds-eye view of Git's source code
 
 It is not always easy for new developers to find their way through Git's
 source code.  This section gives you a little guidance to show where to
@@ -4392,25 +4289,22 @@ You see, Git is actually the best tool to find out about the source of Git
 itself!
 
 [[glossary]]
-Git Glossary
-============
+== Git Glossary
 
 [[git-explained]]
-Git explained
--------------
+=== Git explained
 
 include::glossary-content.txt[]
 
 [[git-quick-start]]
-Appendix A: Git Quick Reference
-===============================
+[appendix]
+== Git Quick Reference
 
 This is a quick summary of the major commands; the previous chapters
 explain how these work in more detail.
 
 [[quick-creating-a-new-repository]]
-Creating a new repository
--------------------------
+=== Creating a new repository
 
 From a tarball:
 
@@ -4431,8 +4325,7 @@ $ cd project
 -----------------------------------------------
 
 [[managing-branches]]
-Managing branches
------------------
+=== Managing branches
 
 -----------------------------------------------
 $ git branch			# list all local branches in this repo
@@ -4496,8 +4389,7 @@ $ git branch -r			# list all remote branches
 
 
 [[exploring-history]]
-Exploring history
------------------
+=== Exploring history
 
 -----------------------------------------------
 $ gitk			    # visualize and browse history
@@ -4532,8 +4424,7 @@ $ git bisect bad		# if this revision is bad.
 -----------------------------------------------
 
 [[making-changes]]
-Making changes
---------------
+=== Making changes
 
 Make sure Git knows who to blame:
 
@@ -4563,8 +4454,7 @@ $ git commit -a	   # use latest content of all tracked files
 -----------------------------------------------
 
 [[merging]]
-Merging
--------
+=== Merging
 
 -----------------------------------------------
 $ git merge test   # merge branch "test" into the current branch
@@ -4574,8 +4464,7 @@ $ git pull . test  # equivalent to git merge test
 -----------------------------------------------
 
 [[sharing-your-changes]]
-Sharing your changes
---------------------
+=== Sharing your changes
 
 Importing or exporting patches:
 
@@ -4620,8 +4509,7 @@ $ git push example test
 -----------------------------------------------
 
 [[repository-maintenance]]
-Repository maintenance
-----------------------
+=== Repository maintenance
 
 Check for corruption:
 
@@ -4637,12 +4525,11 @@ $ git gc
 
 
 [[todo]]
-Appendix B: Notes and todo list for this manual
-===============================================
+[appendix]
+== Notes and todo list for this manual
 
 [[todo-list]]
-Todo list
----------
+=== Todo list
 
 This is a work in progress.
 
@@ -4687,5 +4574,5 @@ Write a chapter on using plumbing and writing scripts.
 Alternates, clone -reference, etc.
 
 More on recovery from repository corruption.  See:
-	http://marc.info/?l=git&m=117263864820799&w=2
-	http://marc.info/?l=git&m=117147855503798&w=2
+	https://lore.kernel.org/git/Pine.LNX.4.64.0702272039540.12485@woody.linux-foundation.org/
+	https://lore.kernel.org/git/Pine.LNX.4.64.0702141033400.3604@woody.linux-foundation.org/
diff --git a/third_party/git/GIT-VERSION-GEN b/third_party/git/GIT-VERSION-GEN
index a1539a7ce682..dafe6d036aae 100755
--- a/third_party/git/GIT-VERSION-GEN
+++ b/third_party/git/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.23.0
+DEF_VER=v2.26.2
 
 LF='
 '
diff --git a/third_party/git/INSTALL b/third_party/git/INSTALL
index c39006e8e7e5..22c364f34f57 100644
--- a/third_party/git/INSTALL
+++ b/third_party/git/INSTALL
@@ -109,15 +109,15 @@ Issues of note:
 
  - Git is reasonably self-sufficient, but does depend on a few external
    programs and libraries.  Git can be used without most of them by adding
-   the approriate "NO_<LIBRARY>=YesPlease" to the make command line or
+   the appropriate "NO_<LIBRARY>=YesPlease" to the make command line or
    config.mak file.
 
 	- "zlib", the compression library. Git won't build without it.
 
 	- "ssh" is used to push and pull over the net.
 
-	- A POSIX-compliant shell is required to run many scripts needed
-	  for everyday use (e.g. "bisect", "pull").
+	- A POSIX-compliant shell is required to run some scripts needed
+	  for everyday use (e.g. "bisect", "request-pull").
 
 	- "Perl" version 5.8 or later is needed to use some of the
 	  features (e.g. preparing a partial commit using "git add -i/-p",
diff --git a/third_party/git/Makefile b/third_party/git/Makefile
index f9255344ae50..9804a0758b24 100644
--- a/third_party/git/Makefile
+++ b/third_party/git/Makefile
@@ -34,13 +34,8 @@ all::
 # library. Support for version 1 will likely be removed in some future
 # release of Git, as upstream has all but abandoned it.
 #
-# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if the PCRE v1
-# library is compiled without --enable-jit. We will auto-detect
-# whether the version of the PCRE v1 library in use has JIT support at
-# all, but we unfortunately can't auto-detect whether JIT support
-# hasn't been compiled in in an otherwise JIT-supporting version. If
-# you have link-time errors about a missing `pcre_jit_exec` define
-# this, or recompile PCRE v1 with --enable-jit.
+# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if you want to
+# disable JIT even if supported by your library.
 #
 # Define LIBPCREDIR=/foo/bar if your PCRE header and library files are
 # in /foo/bar/include and /foo/bar/lib directories. Which version of
@@ -486,7 +481,7 @@ all::
 #
 # When DEVELOPER is set, DEVOPTS can be used to control compiler
 # options.  This variable contains keywords separated by
-# whitespace. The following keywords are are recognized:
+# whitespace. The following keywords are recognized:
 #
 #    no-error:
 #
@@ -598,6 +593,7 @@ SCRIPT_SH =
 SCRIPT_LIB =
 TEST_BUILTINS_OBJS =
 TEST_PROGRAMS_NEED_X =
+THIRD_PARTY_SOURCES =
 
 # Having this variable in your environment would break pipelines because
 # you cause "cd" to echo its destination to stdout.  It can also take
@@ -725,11 +721,14 @@ TEST_BUILTINS_OBJS += test-mktemp.o
 TEST_BUILTINS_OBJS += test-oidmap.o
 TEST_BUILTINS_OBJS += test-online-cpus.o
 TEST_BUILTINS_OBJS += test-parse-options.o
+TEST_BUILTINS_OBJS += test-parse-pathspec-file.o
 TEST_BUILTINS_OBJS += test-path-utils.o
 TEST_BUILTINS_OBJS += test-pkt-line.o
 TEST_BUILTINS_OBJS += test-prio-queue.o
+TEST_BUILTINS_OBJS += test-progress.o
 TEST_BUILTINS_OBJS += test-reach.o
 TEST_BUILTINS_OBJS += test-read-cache.o
+TEST_BUILTINS_OBJS += test-read-graph.o
 TEST_BUILTINS_OBJS += test-read-midx.o
 TEST_BUILTINS_OBJS += test-ref-store.o
 TEST_BUILTINS_OBJS += test-regex.o
@@ -818,14 +817,16 @@ VCSSVN_LIB = vcs-svn/lib.a
 
 GENERATED_H += command-list.h
 
-LIB_H := $(sort $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
+LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
 	$(FIND) . \
 	-name .git -prune -o \
 	-name t -prune -o \
 	-name Documentation -prune -o \
-	-name '*.h' -print))
+	-name '*.h' -print)))
 
 LIB_OBJS += abspath.o
+LIB_OBJS += add-interactive.o
+LIB_OBJS += add-patch.o
 LIB_OBJS += advice.o
 LIB_OBJS += alias.o
 LIB_OBJS += alloc.o
@@ -884,7 +885,6 @@ LIB_OBJS += ewah/ewah_io.o
 LIB_OBJS += ewah/ewah_rlw.o
 LIB_OBJS += exec-cmd.o
 LIB_OBJS += fetch-negotiator.o
-LIB_OBJS += fetch-object.o
 LIB_OBJS += fetch-pack.o
 LIB_OBJS += fsck.o
 LIB_OBJS += fsmonitor.o
@@ -948,12 +948,14 @@ LIB_OBJS += preload-index.o
 LIB_OBJS += pretty.o
 LIB_OBJS += prio-queue.o
 LIB_OBJS += progress.o
+LIB_OBJS += promisor-remote.o
 LIB_OBJS += prompt.o
 LIB_OBJS += protocol.o
 LIB_OBJS += quote.o
 LIB_OBJS += range-diff.o
 LIB_OBJS += reachable.o
 LIB_OBJS += read-cache.o
+LIB_OBJS += rebase.o
 LIB_OBJS += rebase-interactive.o
 LIB_OBJS += reflog-walk.o
 LIB_OBJS += refs.o
@@ -965,6 +967,7 @@ LIB_OBJS += refspec.o
 LIB_OBJS += ref-filter.o
 LIB_OBJS += remote.o
 LIB_OBJS += replace-object.o
+LIB_OBJS += repo-settings.o
 LIB_OBJS += repository.o
 LIB_OBJS += rerere.o
 LIB_OBJS += resolve-undo.o
@@ -983,6 +986,7 @@ LIB_OBJS += shallow.o
 LIB_OBJS += sideband.o
 LIB_OBJS += sigchain.o
 LIB_OBJS += split-index.o
+LIB_OBJS += stable-qsort.o
 LIB_OBJS += strbuf.o
 LIB_OBJS += streaming.o
 LIB_OBJS += string-list.o
@@ -1126,6 +1130,7 @@ BUILTIN_OBJS += builtin/shortlog.o
 BUILTIN_OBJS += builtin/show-branch.o
 BUILTIN_OBJS += builtin/show-index.o
 BUILTIN_OBJS += builtin/show-ref.o
+BUILTIN_OBJS += builtin/sparse-checkout.o
 BUILTIN_OBJS += builtin/stash.o
 BUILTIN_OBJS += builtin/stripspace.o
 BUILTIN_OBJS += builtin/submodule--helper.o
@@ -1145,6 +1150,20 @@ BUILTIN_OBJS += builtin/verify-tag.o
 BUILTIN_OBJS += builtin/worktree.o
 BUILTIN_OBJS += builtin/write-tree.o
 
+# THIRD_PARTY_SOURCES is a list of patterns compatible with the
+# $(filter) and $(filter-out) family of functions. They specify source
+# files which are taken from some third-party source where we want to be
+# less strict about issues such as coding style so we don't diverge from
+# upstream unnecessarily (making merging in future changes easier).
+THIRD_PARTY_SOURCES += compat/inet_ntop.c
+THIRD_PARTY_SOURCES += compat/inet_pton.c
+THIRD_PARTY_SOURCES += compat/nedmalloc/%
+THIRD_PARTY_SOURCES += compat/obstack.%
+THIRD_PARTY_SOURCES += compat/poll/%
+THIRD_PARTY_SOURCES += compat/regex/%
+THIRD_PARTY_SOURCES += sha1collisiondetection/%
+THIRD_PARTY_SOURCES += sha1dc/%
+
 GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB)
 EXTLIBS =
 
@@ -1203,6 +1222,9 @@ endif
 ifneq ($(filter leak,$(SANITIZERS)),)
 BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
 endif
+ifneq ($(filter address,$(SANITIZERS)),)
+NO_REGEX = NeededForASAN
+endif
 endif
 
 ifndef sysconfdir
@@ -1714,7 +1736,6 @@ ifdef NO_GETPAGESIZE
 endif
 ifdef INTERNAL_QSORT
 	COMPAT_CFLAGS += -DINTERNAL_QSORT
-	COMPAT_OBJS += compat/qsort.o
 endif
 ifdef HAVE_ISO_QSORT_S
 	COMPAT_CFLAGS += -DHAVE_ISO_QSORT_S
@@ -1871,8 +1892,9 @@ ifndef V
 	QUIET_MSGFMT   = @echo '   ' MSGFMT $@;
 	QUIET_GCOV     = @echo '   ' GCOV $@;
 	QUIET_SP       = @echo '   ' SP $<;
-	QUIET_HDR      = @echo '   ' HDR $<;
+	QUIET_HDR      = @echo '   ' HDR $(<:hcc=h);
 	QUIET_RC       = @echo '   ' RC $@;
+	QUIET_SPATCH   = @echo '   ' SPATCH $<;
 	QUIET_SUBDIR0  = +@subdir=
 	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
 			 $(MAKE) $(PRINT_DIR) -C $$subdir
@@ -2599,6 +2621,7 @@ FIND_SOURCE_FILES = ( \
 		-o \( -name 'trash*' -type d -prune \) \
 		-o \( -name '*.[hcS]' -type f -print \) \
 		-o \( -name '*.sh' -type f -print \) \
+		| sed -e 's|^\./||' \
 	)
 
 $(ETAGS_TARGET): FORCE
@@ -2763,16 +2786,20 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
 .PHONY: sparse $(SP_OBJ)
 sparse: $(SP_OBJ)
 
-GEN_HDRS := command-list.h unicode-width.h
-EXCEPT_HDRS := $(GEN_HDRS) compat/% xdiff/%
+EXCEPT_HDRS := command-list.h unicode-width.h compat/% xdiff/%
 ifndef GCRYPT_SHA256
 	EXCEPT_HDRS += sha256/gcrypt.h
 endif
-CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(patsubst ./%,%,$(LIB_H)))
+CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(LIB_H))
 HCO = $(patsubst %.h,%.hco,$(CHK_HDRS))
+HCC = $(HCO:hco=hcc)
 
-$(HCO): %.hco: %.h FORCE
-	$(QUIET_HDR)$(CC) -include git-compat-util.h -I. -o /dev/null -c -xc $<
+%.hcc: %.h
+	@echo '#include "git-compat-util.h"' >$@
+	@echo '#include "$<"' >>$@
+
+$(HCO): %.hco: %.hcc FORCE
+	$(QUIET_HDR)$(CC) $(ALL_CFLAGS) -o /dev/null -c -xc $<
 
 .PHONY: hdr-check $(HCO)
 hdr-check: $(HCO)
@@ -2791,15 +2818,11 @@ check: command-list.h
 		exit 1; \
 	fi
 
-C_SOURCES = $(patsubst %.o,%.c,$(C_OBJ))
-ifdef DC_SHA1_SUBMODULE
-COCCI_SOURCES = $(filter-out sha1collisiondetection/%,$(C_SOURCES))
-else
-COCCI_SOURCES = $(filter-out sha1dc/%,$(C_SOURCES))
-endif
+FOUND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES)))
+COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES))
 
 %.cocci.patch: %.cocci $(COCCI_SOURCES)
-	@echo '    ' SPATCH $<; \
+	$(QUIET_SPATCH) \
 	if test $(SPATCH_BATCH_SIZE) = 0; then \
 		limit=; \
 	else \
@@ -3028,6 +3051,10 @@ rpm::
 	@false
 .PHONY: rpm
 
+ifneq ($(INCLUDE_DLLS_IN_ARTIFACTS),)
+OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll)
+endif
+
 artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \
 		GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \
 		$(MOFILES)
@@ -3081,9 +3108,10 @@ clean: profile-clean coverage-clean cocciclean
 	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
 	$(RM) $(TEST_PROGRAMS)
 	$(RM) $(FUZZ_PROGRAMS)
+	$(RM) $(HCC)
 	$(RM) -r bin-wrappers $(dep_dirs)
 	$(RM) -r po/build/
-	$(RM) *.pyc *.pyo */*.pyc */*.pyo command-list.h $(ETAGS_TARGET) tags cscope*
+	$(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope*
 	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
 	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
 	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
diff --git a/third_party/git/README.md b/third_party/git/README.md
index e1d2b82209bb..9d4564c8aa19 100644
--- a/third_party/git/README.md
+++ b/third_party/git/README.md
@@ -35,7 +35,7 @@ requests, comments and patches to git@vger.kernel.org (read
 [Documentation/SubmittingPatches][] for instructions on patch submission).
 To subscribe to the list, send an email with just "subscribe git" in
 the body to majordomo@vger.kernel.org. The mailing list archives are
-available at <https://public-inbox.org/git/>,
+available at <https://lore.kernel.org/git/>,
 <http://marc.info/?l=git> and other archival sites.
 
 Issues which are security relevant should be disclosed privately to
diff --git a/third_party/git/RelNotes b/third_party/git/RelNotes
index 248d137c43b1..3427be681896 120000
--- a/third_party/git/RelNotes
+++ b/third_party/git/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.23.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.26.2.txt
\ No newline at end of file
diff --git a/third_party/git/add-interactive.c b/third_party/git/add-interactive.c
new file mode 100644
index 000000000000..4a9bf85cac03
--- /dev/null
+++ b/third_party/git/add-interactive.c
@@ -0,0 +1,1176 @@
+#include "cache.h"
+#include "add-interactive.h"
+#include "color.h"
+#include "config.h"
+#include "diffcore.h"
+#include "revision.h"
+#include "refs.h"
+#include "string-list.h"
+#include "lockfile.h"
+#include "dir.h"
+#include "run-command.h"
+
+static void init_color(struct repository *r, struct add_i_state *s,
+		       const char *slot_name, char *dst,
+		       const char *default_color)
+{
+	char *key = xstrfmt("color.interactive.%s", slot_name);
+	const char *value;
+
+	if (!s->use_color)
+		dst[0] = '\0';
+	else if (repo_config_get_value(r, key, &value) ||
+		 color_parse(value, dst))
+		strlcpy(dst, default_color, COLOR_MAXLEN);
+
+	free(key);
+}
+
+void init_add_i_state(struct add_i_state *s, struct repository *r)
+{
+	const char *value;
+
+	s->r = r;
+
+	if (repo_config_get_value(r, "color.interactive", &value))
+		s->use_color = -1;
+	else
+		s->use_color =
+			git_config_colorbool("color.interactive", value);
+	s->use_color = want_color(s->use_color);
+
+	init_color(r, s, "header", s->header_color, GIT_COLOR_BOLD);
+	init_color(r, s, "help", s->help_color, GIT_COLOR_BOLD_RED);
+	init_color(r, s, "prompt", s->prompt_color, GIT_COLOR_BOLD_BLUE);
+	init_color(r, s, "error", s->error_color, GIT_COLOR_BOLD_RED);
+	init_color(r, s, "reset", s->reset_color, GIT_COLOR_RESET);
+	init_color(r, s, "fraginfo", s->fraginfo_color,
+		   diff_get_color(s->use_color, DIFF_FRAGINFO));
+	init_color(r, s, "context", s->context_color,
+		diff_get_color(s->use_color, DIFF_CONTEXT));
+	init_color(r, s, "old", s->file_old_color,
+		diff_get_color(s->use_color, DIFF_FILE_OLD));
+	init_color(r, s, "new", s->file_new_color,
+		diff_get_color(s->use_color, DIFF_FILE_NEW));
+
+	FREE_AND_NULL(s->interactive_diff_filter);
+	git_config_get_string("interactive.difffilter",
+			      &s->interactive_diff_filter);
+
+	FREE_AND_NULL(s->interactive_diff_algorithm);
+	git_config_get_string("diff.algorithm",
+			      &s->interactive_diff_algorithm);
+
+	git_config_get_bool("interactive.singlekey", &s->use_single_key);
+}
+
+void clear_add_i_state(struct add_i_state *s)
+{
+	FREE_AND_NULL(s->interactive_diff_filter);
+	FREE_AND_NULL(s->interactive_diff_algorithm);
+	memset(s, 0, sizeof(*s));
+	s->use_color = -1;
+}
+
+/*
+ * A "prefix item list" is a list of items that are identified by a string, and
+ * a unique prefix (if any) is determined for each item.
+ *
+ * It is implemented in the form of a pair of `string_list`s, the first one
+ * duplicating the strings, with the `util` field pointing at a structure whose
+ * first field must be `size_t prefix_length`.
+ *
+ * That `prefix_length` field will be computed by `find_unique_prefixes()`; It
+ * will be set to zero if no valid, unique prefix could be found.
+ *
+ * The second `string_list` is called `sorted` and does _not_ duplicate the
+ * strings but simply reuses the first one's, with the `util` field pointing at
+ * the `string_item_list` of the first `string_list`. It  will be populated and
+ * sorted by `find_unique_prefixes()`.
+ */
+struct prefix_item_list {
+	struct string_list items;
+	struct string_list sorted;
+	int *selected; /* for multi-selections */
+	size_t min_length, max_length;
+};
+#define PREFIX_ITEM_LIST_INIT \
+	{ STRING_LIST_INIT_DUP, STRING_LIST_INIT_NODUP, NULL, 1, 4 }
+
+static void prefix_item_list_clear(struct prefix_item_list *list)
+{
+	string_list_clear(&list->items, 1);
+	string_list_clear(&list->sorted, 0);
+	FREE_AND_NULL(list->selected);
+}
+
+static void extend_prefix_length(struct string_list_item *p,
+				 const char *other_string, size_t max_length)
+{
+	size_t *len = p->util;
+
+	if (!*len || memcmp(p->string, other_string, *len))
+		return;
+
+	for (;;) {
+		char c = p->string[*len];
+
+		/*
+		 * Is `p` a strict prefix of `other`? Or have we exhausted the
+		 * maximal length of the prefix? Or is the current character a
+		 * multi-byte UTF-8 one? If so, there is no valid, unique
+		 * prefix.
+		 */
+		if (!c || ++*len > max_length || !isascii(c)) {
+			*len = 0;
+			break;
+		}
+
+		if (c != other_string[*len - 1])
+			break;
+	}
+}
+
+static void find_unique_prefixes(struct prefix_item_list *list)
+{
+	size_t i;
+
+	if (list->sorted.nr == list->items.nr)
+		return;
+
+	string_list_clear(&list->sorted, 0);
+	/* Avoid reallocating incrementally */
+	list->sorted.items = xmalloc(st_mult(sizeof(*list->sorted.items),
+					     list->items.nr));
+	list->sorted.nr = list->sorted.alloc = list->items.nr;
+
+	for (i = 0; i < list->items.nr; i++) {
+		list->sorted.items[i].string = list->items.items[i].string;
+		list->sorted.items[i].util = list->items.items + i;
+	}
+
+	string_list_sort(&list->sorted);
+
+	for (i = 0; i < list->sorted.nr; i++) {
+		struct string_list_item *sorted_item = list->sorted.items + i;
+		struct string_list_item *item = sorted_item->util;
+		size_t *len = item->util;
+
+		*len = 0;
+		while (*len < list->min_length) {
+			char c = item->string[(*len)++];
+
+			if (!c || !isascii(c)) {
+				*len = 0;
+				break;
+			}
+		}
+
+		if (i > 0)
+			extend_prefix_length(item, sorted_item[-1].string,
+					     list->max_length);
+		if (i + 1 < list->sorted.nr)
+			extend_prefix_length(item, sorted_item[1].string,
+					     list->max_length);
+	}
+}
+
+static ssize_t find_unique(const char *string, struct prefix_item_list *list)
+{
+	int index = string_list_find_insert_index(&list->sorted, string, 1);
+	struct string_list_item *item;
+
+	if (list->items.nr != list->sorted.nr)
+		BUG("prefix_item_list in inconsistent state (%"PRIuMAX
+		    " vs %"PRIuMAX")",
+		    (uintmax_t)list->items.nr, (uintmax_t)list->sorted.nr);
+
+	if (index < 0)
+		item = list->sorted.items[-1 - index].util;
+	else if (index > 0 &&
+		 starts_with(list->sorted.items[index - 1].string, string))
+		return -1;
+	else if (index + 1 < list->sorted.nr &&
+		 starts_with(list->sorted.items[index + 1].string, string))
+		return -1;
+	else if (index < list->sorted.nr)
+		item = list->sorted.items[index].util;
+	else
+		return -1;
+	return item - list->items.items;
+}
+
+struct list_options {
+	int columns;
+	const char *header;
+	void (*print_item)(int i, int selected, struct string_list_item *item,
+			   void *print_item_data);
+	void *print_item_data;
+};
+
+static void list(struct add_i_state *s, struct string_list *list, int *selected,
+		 struct list_options *opts)
+{
+	int i, last_lf = 0;
+
+	if (!list->nr)
+		return;
+
+	if (opts->header)
+		color_fprintf_ln(stdout, s->header_color,
+				 "%s", opts->header);
+
+	for (i = 0; i < list->nr; i++) {
+		opts->print_item(i, selected ? selected[i] : 0, list->items + i,
+				 opts->print_item_data);
+
+		if ((opts->columns) && ((i + 1) % (opts->columns))) {
+			putchar('\t');
+			last_lf = 0;
+		}
+		else {
+			putchar('\n');
+			last_lf = 1;
+		}
+	}
+
+	if (!last_lf)
+		putchar('\n');
+}
+struct list_and_choose_options {
+	struct list_options list_opts;
+
+	const char *prompt;
+	enum {
+		SINGLETON = (1<<0),
+		IMMEDIATE = (1<<1),
+	} flags;
+	void (*print_help)(struct add_i_state *s);
+};
+
+#define LIST_AND_CHOOSE_ERROR (-1)
+#define LIST_AND_CHOOSE_QUIT  (-2)
+
+/*
+ * Returns the selected index in singleton mode, the number of selected items
+ * otherwise.
+ *
+ * If an error occurred, returns `LIST_AND_CHOOSE_ERROR`. Upon EOF,
+ * `LIST_AND_CHOOSE_QUIT` is returned.
+ */
+static ssize_t list_and_choose(struct add_i_state *s,
+			       struct prefix_item_list *items,
+			       struct list_and_choose_options *opts)
+{
+	int singleton = opts->flags & SINGLETON;
+	int immediate = opts->flags & IMMEDIATE;
+
+	struct strbuf input = STRBUF_INIT;
+	ssize_t res = singleton ? LIST_AND_CHOOSE_ERROR : 0;
+
+	if (!singleton) {
+		free(items->selected);
+		CALLOC_ARRAY(items->selected, items->items.nr);
+	}
+
+	if (singleton && !immediate)
+		BUG("singleton requires immediate");
+
+	find_unique_prefixes(items);
+
+	for (;;) {
+		char *p;
+
+		strbuf_reset(&input);
+
+		list(s, &items->items, items->selected, &opts->list_opts);
+
+		color_fprintf(stdout, s->prompt_color, "%s", opts->prompt);
+		fputs(singleton ? "> " : ">> ", stdout);
+		fflush(stdout);
+
+		if (strbuf_getline(&input, stdin) == EOF) {
+			putchar('\n');
+			if (immediate)
+				res = LIST_AND_CHOOSE_QUIT;
+			break;
+		}
+		strbuf_trim(&input);
+
+		if (!input.len)
+			break;
+
+		if (!strcmp(input.buf, "?")) {
+			opts->print_help(s);
+			continue;
+		}
+
+		p = input.buf;
+		for (;;) {
+			size_t sep = strcspn(p, " \t\r\n,");
+			int choose = 1;
+			/* `from` is inclusive, `to` is exclusive */
+			ssize_t from = -1, to = -1;
+
+			if (!sep) {
+				if (!*p)
+					break;
+				p++;
+				continue;
+			}
+
+			/* Input that begins with '-'; de-select */
+			if (*p == '-') {
+				choose = 0;
+				p++;
+				sep--;
+			}
+
+			if (sep == 1 && *p == '*') {
+				from = 0;
+				to = items->items.nr;
+			} else if (isdigit(*p)) {
+				char *endp;
+				/*
+				 * A range can be specified like 5-7 or 5-.
+				 *
+				 * Note: `from` is 0-based while the user input
+				 * is 1-based, hence we have to decrement by
+				 * one. We do not have to decrement `to` even
+				 * if it is 0-based because it is an exclusive
+				 * boundary.
+				 */
+				from = strtoul(p, &endp, 10) - 1;
+				if (endp == p + sep)
+					to = from + 1;
+				else if (*endp == '-') {
+					if (isdigit(*(++endp)))
+						to = strtoul(endp, &endp, 10);
+					else
+						to = items->items.nr;
+					/* extra characters after the range? */
+					if (endp != p + sep)
+						from = -1;
+				}
+			}
+
+			if (p[sep])
+				p[sep++] = '\0';
+			if (from < 0) {
+				from = find_unique(p, items);
+				if (from >= 0)
+					to = from + 1;
+			}
+
+			if (from < 0 || from >= items->items.nr ||
+			    (singleton && from + 1 != to)) {
+				color_fprintf_ln(stdout, s->error_color,
+						 _("Huh (%s)?"), p);
+				break;
+			} else if (singleton) {
+				res = from;
+				break;
+			}
+
+			if (to > items->items.nr)
+				to = items->items.nr;
+
+			for (; from < to; from++)
+				if (items->selected[from] != choose) {
+					items->selected[from] = choose;
+					res += choose ? +1 : -1;
+				}
+
+			p += sep;
+		}
+
+		if ((immediate && res != LIST_AND_CHOOSE_ERROR) ||
+		    !strcmp(input.buf, "*"))
+			break;
+	}
+
+	strbuf_release(&input);
+	return res;
+}
+
+struct adddel {
+	uintmax_t add, del;
+	unsigned seen:1, unmerged:1, binary:1;
+};
+
+struct file_item {
+	size_t prefix_length;
+	struct adddel index, worktree;
+};
+
+static void add_file_item(struct string_list *files, const char *name)
+{
+	struct file_item *item = xcalloc(sizeof(*item), 1);
+
+	string_list_append(files, name)->util = item;
+}
+
+struct pathname_entry {
+	struct hashmap_entry ent;
+	const char *name;
+	struct file_item *item;
+};
+
+static int pathname_entry_cmp(const void *unused_cmp_data,
+			      const struct hashmap_entry *he1,
+			      const struct hashmap_entry *he2,
+			      const void *name)
+{
+	const struct pathname_entry *e1 =
+		container_of(he1, const struct pathname_entry, ent);
+	const struct pathname_entry *e2 =
+		container_of(he2, const struct pathname_entry, ent);
+
+	return strcmp(e1->name, name ? (const char *)name : e2->name);
+}
+
+struct collection_status {
+	enum { FROM_WORKTREE = 0, FROM_INDEX = 1 } mode;
+
+	const char *reference;
+
+	unsigned skip_unseen:1;
+	size_t unmerged_count, binary_count;
+	struct string_list *files;
+	struct hashmap file_map;
+};
+
+static void collect_changes_cb(struct diff_queue_struct *q,
+			       struct diff_options *options,
+			       void *data)
+{
+	struct collection_status *s = data;
+	struct diffstat_t stat = { 0 };
+	int i;
+
+	if (!q->nr)
+		return;
+
+	compute_diffstat(options, &stat, q);
+
+	for (i = 0; i < stat.nr; i++) {
+		const char *name = stat.files[i]->name;
+		int hash = strhash(name);
+		struct pathname_entry *entry;
+		struct file_item *file_item;
+		struct adddel *adddel, *other_adddel;
+
+		entry = hashmap_get_entry_from_hash(&s->file_map, hash, name,
+						    struct pathname_entry, ent);
+		if (!entry) {
+			if (s->skip_unseen)
+				continue;
+
+			add_file_item(s->files, name);
+
+			entry = xcalloc(sizeof(*entry), 1);
+			hashmap_entry_init(&entry->ent, hash);
+			entry->name = s->files->items[s->files->nr - 1].string;
+			entry->item = s->files->items[s->files->nr - 1].util;
+			hashmap_add(&s->file_map, &entry->ent);
+		}
+
+		file_item = entry->item;
+		adddel = s->mode == FROM_INDEX ?
+			&file_item->index : &file_item->worktree;
+		other_adddel = s->mode == FROM_INDEX ?
+			&file_item->worktree : &file_item->index;
+		adddel->seen = 1;
+		adddel->add = stat.files[i]->added;
+		adddel->del = stat.files[i]->deleted;
+		if (stat.files[i]->is_binary) {
+			if (!other_adddel->binary)
+				s->binary_count++;
+			adddel->binary = 1;
+		}
+		if (stat.files[i]->is_unmerged) {
+			if (!other_adddel->unmerged)
+				s->unmerged_count++;
+			adddel->unmerged = 1;
+		}
+	}
+	free_diffstat_info(&stat);
+}
+
+enum modified_files_filter {
+	NO_FILTER = 0,
+	WORKTREE_ONLY = 1,
+	INDEX_ONLY = 2,
+};
+
+static int get_modified_files(struct repository *r,
+			      enum modified_files_filter filter,
+			      struct prefix_item_list *files,
+			      const struct pathspec *ps,
+			      size_t *unmerged_count,
+			      size_t *binary_count)
+{
+	struct object_id head_oid;
+	int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
+					     &head_oid, NULL);
+	struct collection_status s = { 0 };
+	int i;
+
+	if (discard_index(r->index) < 0 ||
+	    repo_read_index_preload(r, ps, 0) < 0)
+		return error(_("could not read index"));
+
+	prefix_item_list_clear(files);
+	s.files = &files->items;
+	hashmap_init(&s.file_map, pathname_entry_cmp, NULL, 0);
+
+	for (i = 0; i < 2; i++) {
+		struct rev_info rev;
+		struct setup_revision_opt opt = { 0 };
+
+		if (filter == INDEX_ONLY)
+			s.mode = (i == 0) ? FROM_INDEX : FROM_WORKTREE;
+		else
+			s.mode = (i == 0) ? FROM_WORKTREE : FROM_INDEX;
+		s.skip_unseen = filter && i;
+
+		opt.def = is_initial ?
+			empty_tree_oid_hex() : oid_to_hex(&head_oid);
+
+		init_revisions(&rev, NULL);
+		setup_revisions(0, NULL, &rev, &opt);
+
+		rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
+		rev.diffopt.format_callback = collect_changes_cb;
+		rev.diffopt.format_callback_data = &s;
+
+		if (ps)
+			copy_pathspec(&rev.prune_data, ps);
+
+		if (s.mode == FROM_INDEX)
+			run_diff_index(&rev, 1);
+		else {
+			rev.diffopt.flags.ignore_dirty_submodules = 1;
+			run_diff_files(&rev, 0);
+		}
+
+		if (ps)
+			clear_pathspec(&rev.prune_data);
+	}
+	hashmap_free_entries(&s.file_map, struct pathname_entry, ent);
+	if (unmerged_count)
+		*unmerged_count = s.unmerged_count;
+	if (binary_count)
+		*binary_count = s.binary_count;
+
+	/* While the diffs are ordered already, we ran *two* diffs... */
+	string_list_sort(&files->items);
+
+	return 0;
+}
+
+static void render_adddel(struct strbuf *buf,
+				struct adddel *ad, const char *no_changes)
+{
+	if (ad->binary)
+		strbuf_addstr(buf, _("binary"));
+	else if (ad->seen)
+		strbuf_addf(buf, "+%"PRIuMAX"/-%"PRIuMAX,
+			    (uintmax_t)ad->add, (uintmax_t)ad->del);
+	else
+		strbuf_addstr(buf, no_changes);
+}
+
+/* filters out prefixes which have special meaning to list_and_choose() */
+static int is_valid_prefix(const char *prefix, size_t prefix_len)
+{
+	return prefix_len && prefix &&
+		/*
+		 * We expect `prefix` to be NUL terminated, therefore this
+		 * `strcspn()` call is okay, even if it might do much more
+		 * work than strictly necessary.
+		 */
+		strcspn(prefix, " \t\r\n,") >= prefix_len &&	/* separators */
+		*prefix != '-' &&				/* deselection */
+		!isdigit(*prefix) &&				/* selection */
+		(prefix_len != 1 ||
+		 (*prefix != '*' &&				/* "all" wildcard */
+		  *prefix != '?'));				/* prompt help */
+}
+
+struct print_file_item_data {
+	const char *modified_fmt, *color, *reset;
+	struct strbuf buf, name, index, worktree;
+	unsigned only_names:1;
+};
+
+static void print_file_item(int i, int selected, struct string_list_item *item,
+			    void *print_file_item_data)
+{
+	struct file_item *c = item->util;
+	struct print_file_item_data *d = print_file_item_data;
+	const char *highlighted = NULL;
+
+	strbuf_reset(&d->index);
+	strbuf_reset(&d->worktree);
+	strbuf_reset(&d->buf);
+
+	/* Format the item with the prefix highlighted. */
+	if (c->prefix_length > 0 &&
+	    is_valid_prefix(item->string, c->prefix_length)) {
+		strbuf_reset(&d->name);
+		strbuf_addf(&d->name, "%s%.*s%s%s", d->color,
+			    (int)c->prefix_length, item->string, d->reset,
+			    item->string + c->prefix_length);
+		highlighted = d->name.buf;
+	}
+
+	if (d->only_names) {
+		printf("%c%2d: %s", selected ? '*' : ' ', i + 1,
+		       highlighted ? highlighted : item->string);
+		return;
+	}
+
+	render_adddel(&d->worktree, &c->worktree, _("nothing"));
+	render_adddel(&d->index, &c->index, _("unchanged"));
+
+	strbuf_addf(&d->buf, d->modified_fmt, d->index.buf, d->worktree.buf,
+		    highlighted ? highlighted : item->string);
+
+	printf("%c%2d: %s", selected ? '*' : ' ', i + 1, d->buf.buf);
+}
+
+static int run_status(struct add_i_state *s, const struct pathspec *ps,
+		      struct prefix_item_list *files,
+		      struct list_and_choose_options *opts)
+{
+	if (get_modified_files(s->r, NO_FILTER, files, ps, NULL, NULL) < 0)
+		return -1;
+
+	list(s, &files->items, NULL, &opts->list_opts);
+	putchar('\n');
+
+	return 0;
+}
+
+static int run_update(struct add_i_state *s, const struct pathspec *ps,
+		      struct prefix_item_list *files,
+		      struct list_and_choose_options *opts)
+{
+	int res = 0, fd;
+	size_t count, i;
+	struct lock_file index_lock;
+
+	if (get_modified_files(s->r, WORKTREE_ONLY, files, ps, NULL, NULL) < 0)
+		return -1;
+
+	if (!files->items.nr) {
+		putchar('\n');
+		return 0;
+	}
+
+	opts->prompt = N_("Update");
+	count = list_and_choose(s, files, opts);
+	if (count <= 0) {
+		putchar('\n');
+		return 0;
+	}
+
+	fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
+	if (fd < 0) {
+		putchar('\n');
+		return -1;
+	}
+
+	for (i = 0; i < files->items.nr; i++) {
+		const char *name = files->items.items[i].string;
+		if (files->selected[i] &&
+		    add_file_to_index(s->r->index, name, 0) < 0) {
+			res = error(_("could not stage '%s'"), name);
+			break;
+		}
+	}
+
+	if (!res && write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0)
+		res = error(_("could not write index"));
+
+	if (!res)
+		printf(Q_("updated %d path\n",
+			  "updated %d paths\n", count), (int)count);
+
+	putchar('\n');
+	return res;
+}
+
+static void revert_from_diff(struct diff_queue_struct *q,
+			     struct diff_options *opt, void *data)
+{
+	int i, add_flags = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
+
+	for (i = 0; i < q->nr; i++) {
+		struct diff_filespec *one = q->queue[i]->one;
+		struct cache_entry *ce;
+
+		if (!(one->mode && !is_null_oid(&one->oid))) {
+			remove_file_from_index(opt->repo->index, one->path);
+			printf(_("note: %s is untracked now.\n"), one->path);
+		} else {
+			ce = make_cache_entry(opt->repo->index, one->mode,
+					      &one->oid, one->path, 0, 0);
+			if (!ce)
+				die(_("make_cache_entry failed for path '%s'"),
+				    one->path);
+			add_index_entry(opt->repo->index, ce, add_flags);
+		}
+	}
+}
+
+static int run_revert(struct add_i_state *s, const struct pathspec *ps,
+		      struct prefix_item_list *files,
+		      struct list_and_choose_options *opts)
+{
+	int res = 0, fd;
+	size_t count, i, j;
+
+	struct object_id oid;
+	int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid,
+					     NULL);
+	struct lock_file index_lock;
+	const char **paths;
+	struct tree *tree;
+	struct diff_options diffopt = { NULL };
+
+	if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0)
+		return -1;
+
+	if (!files->items.nr) {
+		putchar('\n');
+		return 0;
+	}
+
+	opts->prompt = N_("Revert");
+	count = list_and_choose(s, files, opts);
+	if (count <= 0)
+		goto finish_revert;
+
+	fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
+	if (fd < 0) {
+		res = -1;
+		goto finish_revert;
+	}
+
+	if (is_initial)
+		oidcpy(&oid, s->r->hash_algo->empty_tree);
+	else {
+		tree = parse_tree_indirect(&oid);
+		if (!tree) {
+			res = error(_("Could not parse HEAD^{tree}"));
+			goto finish_revert;
+		}
+		oidcpy(&oid, &tree->object.oid);
+	}
+
+	ALLOC_ARRAY(paths, count + 1);
+	for (i = j = 0; i < files->items.nr; i++)
+		if (files->selected[i])
+			paths[j++] = files->items.items[i].string;
+	paths[j] = NULL;
+
+	parse_pathspec(&diffopt.pathspec, 0,
+		       PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH,
+		       NULL, paths);
+
+	diffopt.output_format = DIFF_FORMAT_CALLBACK;
+	diffopt.format_callback = revert_from_diff;
+	diffopt.flags.override_submodule_config = 1;
+	diffopt.repo = s->r;
+
+	if (do_diff_cache(&oid, &diffopt))
+		res = -1;
+	else {
+		diffcore_std(&diffopt);
+		diff_flush(&diffopt);
+	}
+	free(paths);
+	clear_pathspec(&diffopt.pathspec);
+
+	if (!res && write_locked_index(s->r->index, &index_lock,
+				       COMMIT_LOCK) < 0)
+		res = -1;
+	else
+		res = repo_refresh_and_write_index(s->r, REFRESH_QUIET, 0, 1,
+						   NULL, NULL, NULL);
+
+	if (!res)
+		printf(Q_("reverted %d path\n",
+			  "reverted %d paths\n", count), (int)count);
+
+finish_revert:
+	putchar('\n');
+	return res;
+}
+
+static int get_untracked_files(struct repository *r,
+			       struct prefix_item_list *files,
+			       const struct pathspec *ps)
+{
+	struct dir_struct dir = { 0 };
+	size_t i;
+	struct strbuf buf = STRBUF_INIT;
+
+	if (repo_read_index(r) < 0)
+		return error(_("could not read index"));
+
+	prefix_item_list_clear(files);
+	setup_standard_excludes(&dir);
+	add_pattern_list(&dir, EXC_CMDL, "--exclude option");
+	fill_directory(&dir, r->index, ps);
+
+	for (i = 0; i < dir.nr; i++) {
+		struct dir_entry *ent = dir.entries[i];
+
+		if (index_name_is_other(r->index, ent->name, ent->len)) {
+			strbuf_reset(&buf);
+			strbuf_add(&buf, ent->name, ent->len);
+			add_file_item(&files->items, buf.buf);
+		}
+	}
+
+	strbuf_release(&buf);
+	return 0;
+}
+
+static int run_add_untracked(struct add_i_state *s, const struct pathspec *ps,
+		      struct prefix_item_list *files,
+		      struct list_and_choose_options *opts)
+{
+	struct print_file_item_data *d = opts->list_opts.print_item_data;
+	int res = 0, fd;
+	size_t count, i;
+	struct lock_file index_lock;
+
+	if (get_untracked_files(s->r, files, ps) < 0)
+		return -1;
+
+	if (!files->items.nr) {
+		printf(_("No untracked files.\n"));
+		goto finish_add_untracked;
+	}
+
+	opts->prompt = N_("Add untracked");
+	d->only_names = 1;
+	count = list_and_choose(s, files, opts);
+	d->only_names = 0;
+	if (count <= 0)
+		goto finish_add_untracked;
+
+	fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
+	if (fd < 0) {
+		res = -1;
+		goto finish_add_untracked;
+	}
+
+	for (i = 0; i < files->items.nr; i++) {
+		const char *name = files->items.items[i].string;
+		if (files->selected[i] &&
+		    add_file_to_index(s->r->index, name, 0) < 0) {
+			res = error(_("could not stage '%s'"), name);
+			break;
+		}
+	}
+
+	if (!res &&
+	    write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0)
+		res = error(_("could not write index"));
+
+	if (!res)
+		printf(Q_("added %d path\n",
+			  "added %d paths\n", count), (int)count);
+
+finish_add_untracked:
+	putchar('\n');
+	return res;
+}
+
+static int run_patch(struct add_i_state *s, const struct pathspec *ps,
+		     struct prefix_item_list *files,
+		     struct list_and_choose_options *opts)
+{
+	int res = 0;
+	ssize_t count, i, j;
+	size_t unmerged_count = 0, binary_count = 0;
+
+	if (get_modified_files(s->r, WORKTREE_ONLY, files, ps,
+			       &unmerged_count, &binary_count) < 0)
+		return -1;
+
+	if (unmerged_count || binary_count) {
+		for (i = j = 0; i < files->items.nr; i++) {
+			struct file_item *item = files->items.items[i].util;
+
+			if (item->index.binary || item->worktree.binary) {
+				free(item);
+				free(files->items.items[i].string);
+			} else if (item->index.unmerged ||
+				 item->worktree.unmerged) {
+				color_fprintf_ln(stderr, s->error_color,
+						 _("ignoring unmerged: %s"),
+						 files->items.items[i].string);
+				free(item);
+				free(files->items.items[i].string);
+			} else
+				files->items.items[j++] = files->items.items[i];
+		}
+		files->items.nr = j;
+	}
+
+	if (!files->items.nr) {
+		if (binary_count)
+			fprintf(stderr, _("Only binary files changed.\n"));
+		else
+			fprintf(stderr, _("No changes.\n"));
+		return 0;
+	}
+
+	opts->prompt = N_("Patch update");
+	count = list_and_choose(s, files, opts);
+	if (count > 0) {
+		struct argv_array args = ARGV_ARRAY_INIT;
+		struct pathspec ps_selected = { 0 };
+
+		for (i = 0; i < files->items.nr; i++)
+			if (files->selected[i])
+				argv_array_push(&args,
+						files->items.items[i].string);
+		parse_pathspec(&ps_selected,
+			       PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
+			       PATHSPEC_LITERAL_PATH, "", args.argv);
+		res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected);
+		argv_array_clear(&args);
+		clear_pathspec(&ps_selected);
+	}
+
+	return res;
+}
+
+static int run_diff(struct add_i_state *s, const struct pathspec *ps,
+		    struct prefix_item_list *files,
+		    struct list_and_choose_options *opts)
+{
+	int res = 0;
+	ssize_t count, i;
+
+	struct object_id oid;
+	int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid,
+					     NULL);
+	if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0)
+		return -1;
+
+	if (!files->items.nr) {
+		putchar('\n');
+		return 0;
+	}
+
+	opts->prompt = N_("Review diff");
+	opts->flags = IMMEDIATE;
+	count = list_and_choose(s, files, opts);
+	opts->flags = 0;
+	if (count > 0) {
+		struct argv_array args = ARGV_ARRAY_INIT;
+
+		argv_array_pushl(&args, "git", "diff", "-p", "--cached",
+				 oid_to_hex(!is_initial ? &oid :
+					    s->r->hash_algo->empty_tree),
+				 "--", NULL);
+		for (i = 0; i < files->items.nr; i++)
+			if (files->selected[i])
+				argv_array_push(&args,
+						files->items.items[i].string);
+		res = run_command_v_opt(args.argv, 0);
+		argv_array_clear(&args);
+	}
+
+	putchar('\n');
+	return res;
+}
+
+static int run_help(struct add_i_state *s, const struct pathspec *unused_ps,
+		    struct prefix_item_list *unused_files,
+		    struct list_and_choose_options *unused_opts)
+{
+	color_fprintf_ln(stdout, s->help_color, "status        - %s",
+			 _("show paths with changes"));
+	color_fprintf_ln(stdout, s->help_color, "update        - %s",
+			 _("add working tree state to the staged set of changes"));
+	color_fprintf_ln(stdout, s->help_color, "revert        - %s",
+			 _("revert staged set of changes back to the HEAD version"));
+	color_fprintf_ln(stdout, s->help_color, "patch         - %s",
+			 _("pick hunks and update selectively"));
+	color_fprintf_ln(stdout, s->help_color, "diff          - %s",
+			 _("view diff between HEAD and index"));
+	color_fprintf_ln(stdout, s->help_color, "add untracked - %s",
+			 _("add contents of untracked files to the staged set of changes"));
+
+	return 0;
+}
+
+static void choose_prompt_help(struct add_i_state *s)
+{
+	color_fprintf_ln(stdout, s->help_color, "%s",
+			 _("Prompt help:"));
+	color_fprintf_ln(stdout, s->help_color, "1          - %s",
+			 _("select a single item"));
+	color_fprintf_ln(stdout, s->help_color, "3-5        - %s",
+			 _("select a range of items"));
+	color_fprintf_ln(stdout, s->help_color, "2-3,6-9    - %s",
+			 _("select multiple ranges"));
+	color_fprintf_ln(stdout, s->help_color, "foo        - %s",
+			 _("select item based on unique prefix"));
+	color_fprintf_ln(stdout, s->help_color, "-...       - %s",
+			 _("unselect specified items"));
+	color_fprintf_ln(stdout, s->help_color, "*          - %s",
+			 _("choose all items"));
+	color_fprintf_ln(stdout, s->help_color, "           - %s",
+			 _("(empty) finish selecting"));
+}
+
+typedef int (*command_t)(struct add_i_state *s, const struct pathspec *ps,
+			 struct prefix_item_list *files,
+			 struct list_and_choose_options *opts);
+
+struct command_item {
+	size_t prefix_length;
+	command_t command;
+};
+
+struct print_command_item_data {
+	const char *color, *reset;
+};
+
+static void print_command_item(int i, int selected,
+			       struct string_list_item *item,
+			       void *print_command_item_data)
+{
+	struct print_command_item_data *d = print_command_item_data;
+	struct command_item *util = item->util;
+
+	if (!util->prefix_length ||
+	    !is_valid_prefix(item->string, util->prefix_length))
+		printf(" %2d: %s", i + 1, item->string);
+	else
+		printf(" %2d: %s%.*s%s%s", i + 1,
+		       d->color, (int)util->prefix_length, item->string,
+		       d->reset, item->string + util->prefix_length);
+}
+
+static void command_prompt_help(struct add_i_state *s)
+{
+	const char *help_color = s->help_color;
+	color_fprintf_ln(stdout, help_color, "%s", _("Prompt help:"));
+	color_fprintf_ln(stdout, help_color, "1          - %s",
+			 _("select a numbered item"));
+	color_fprintf_ln(stdout, help_color, "foo        - %s",
+			 _("select item based on unique prefix"));
+	color_fprintf_ln(stdout, help_color, "           - %s",
+			 _("(empty) select nothing"));
+}
+
+int run_add_i(struct repository *r, const struct pathspec *ps)
+{
+	struct add_i_state s = { NULL };
+	struct print_command_item_data data = { "[", "]" };
+	struct list_and_choose_options main_loop_opts = {
+		{ 4, N_("*** Commands ***"), print_command_item, &data },
+		N_("What now"), SINGLETON | IMMEDIATE, command_prompt_help
+	};
+	struct {
+		const char *string;
+		command_t command;
+	} command_list[] = {
+		{ "status", run_status },
+		{ "update", run_update },
+		{ "revert", run_revert },
+		{ "add untracked", run_add_untracked },
+		{ "patch", run_patch },
+		{ "diff", run_diff },
+		{ "quit", NULL },
+		{ "help", run_help },
+	};
+	struct prefix_item_list commands = PREFIX_ITEM_LIST_INIT;
+
+	struct print_file_item_data print_file_item_data = {
+		"%12s %12s %s", NULL, NULL,
+		STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
+	};
+	struct list_and_choose_options opts = {
+		{ 0, NULL, print_file_item, &print_file_item_data },
+		NULL, 0, choose_prompt_help
+	};
+	struct strbuf header = STRBUF_INIT;
+	struct prefix_item_list files = PREFIX_ITEM_LIST_INIT;
+	ssize_t i;
+	int res = 0;
+
+	for (i = 0; i < ARRAY_SIZE(command_list); i++) {
+		struct command_item *util = xcalloc(sizeof(*util), 1);
+		util->command = command_list[i].command;
+		string_list_append(&commands.items, command_list[i].string)
+			->util = util;
+	}
+
+	init_add_i_state(&s, r);
+
+	/*
+	 * When color was asked for, use the prompt color for
+	 * highlighting, otherwise use square brackets.
+	 */
+	if (s.use_color) {
+		data.color = s.prompt_color;
+		data.reset = s.reset_color;
+	}
+	print_file_item_data.color = data.color;
+	print_file_item_data.reset = data.reset;
+
+	strbuf_addstr(&header, "      ");
+	strbuf_addf(&header, print_file_item_data.modified_fmt,
+		    _("staged"), _("unstaged"), _("path"));
+	opts.list_opts.header = header.buf;
+
+	if (discard_index(r->index) < 0 ||
+	    repo_read_index(r) < 0 ||
+	    repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
+					 NULL, NULL, NULL) < 0)
+		warning(_("could not refresh index"));
+
+	res = run_status(&s, ps, &files, &opts);
+
+	for (;;) {
+		struct command_item *util;
+
+		i = list_and_choose(&s, &commands, &main_loop_opts);
+		if (i < 0 || i >= commands.items.nr)
+			util = NULL;
+		else
+			util = commands.items.items[i].util;
+
+		if (i == LIST_AND_CHOOSE_QUIT || (util && !util->command)) {
+			printf(_("Bye.\n"));
+			res = 0;
+			break;
+		}
+
+		if (util)
+			res = util->command(&s, ps, &files, &opts);
+	}
+
+	prefix_item_list_clear(&files);
+	strbuf_release(&print_file_item_data.buf);
+	strbuf_release(&print_file_item_data.name);
+	strbuf_release(&print_file_item_data.index);
+	strbuf_release(&print_file_item_data.worktree);
+	strbuf_release(&header);
+	prefix_item_list_clear(&commands);
+	clear_add_i_state(&s);
+
+	return res;
+}
diff --git a/third_party/git/add-interactive.h b/third_party/git/add-interactive.h
new file mode 100644
index 000000000000..693f125e8e4b
--- /dev/null
+++ b/third_party/git/add-interactive.h
@@ -0,0 +1,41 @@
+#ifndef ADD_INTERACTIVE_H
+#define ADD_INTERACTIVE_H
+
+#include "color.h"
+
+struct add_i_state {
+	struct repository *r;
+	int use_color;
+	char header_color[COLOR_MAXLEN];
+	char help_color[COLOR_MAXLEN];
+	char prompt_color[COLOR_MAXLEN];
+	char error_color[COLOR_MAXLEN];
+	char reset_color[COLOR_MAXLEN];
+	char fraginfo_color[COLOR_MAXLEN];
+	char context_color[COLOR_MAXLEN];
+	char file_old_color[COLOR_MAXLEN];
+	char file_new_color[COLOR_MAXLEN];
+
+	int use_single_key;
+	char *interactive_diff_filter, *interactive_diff_algorithm;
+};
+
+void init_add_i_state(struct add_i_state *s, struct repository *r);
+void clear_add_i_state(struct add_i_state *s);
+
+struct repository;
+struct pathspec;
+int run_add_i(struct repository *r, const struct pathspec *ps);
+
+enum add_p_mode {
+	ADD_P_ADD,
+	ADD_P_STASH,
+	ADD_P_RESET,
+	ADD_P_CHECKOUT,
+	ADD_P_WORKTREE,
+};
+
+int run_add_p(struct repository *r, enum add_p_mode mode,
+	      const char *revision, const struct pathspec *ps);
+
+#endif
diff --git a/third_party/git/add-patch.c b/third_party/git/add-patch.c
new file mode 100644
index 000000000000..d8dafa8168dc
--- /dev/null
+++ b/third_party/git/add-patch.c
@@ -0,0 +1,1683 @@
+#include "cache.h"
+#include "add-interactive.h"
+#include "strbuf.h"
+#include "run-command.h"
+#include "argv-array.h"
+#include "pathspec.h"
+#include "color.h"
+#include "diff.h"
+#include "compat/terminal.h"
+
+enum prompt_mode_type {
+	PROMPT_MODE_CHANGE = 0, PROMPT_DELETION, PROMPT_HUNK,
+	PROMPT_MODE_MAX, /* must be last */
+};
+
+struct patch_mode {
+	/*
+	 * The magic constant 4 is chosen such that all patch modes
+	 * provide enough space for three command-line arguments followed by a
+	 * trailing `NULL`.
+	 */
+	const char *diff_cmd[4], *apply_args[4], *apply_check_args[4];
+	unsigned is_reverse:1, index_only:1, apply_for_checkout:1;
+	const char *prompt_mode[PROMPT_MODE_MAX];
+	const char *edit_hunk_hint, *help_patch_text;
+};
+
+static struct patch_mode patch_mode_add = {
+	.diff_cmd = { "diff-files", NULL },
+	.apply_args = { "--cached", NULL },
+	.apply_check_args = { "--cached", NULL },
+	.prompt_mode = {
+		N_("Stage mode change [y,n,q,a,d%s,?]? "),
+		N_("Stage deletion [y,n,q,a,d%s,?]? "),
+		N_("Stage this hunk [y,n,q,a,d%s,?]? ")
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for staging."),
+	.help_patch_text =
+		N_("y - stage this hunk\n"
+		   "n - do not stage this hunk\n"
+		   "q - quit; do not stage this hunk or any of the remaining "
+			"ones\n"
+		   "a - stage this hunk and all later hunks in the file\n"
+		   "d - do not stage this hunk or any of the later hunks in "
+			"the file\n")
+};
+
+static struct patch_mode patch_mode_stash = {
+	.diff_cmd = { "diff-index", "HEAD", NULL },
+	.apply_args = { "--cached", NULL },
+	.apply_check_args = { "--cached", NULL },
+	.prompt_mode = {
+		N_("Stash mode change [y,n,q,a,d%s,?]? "),
+		N_("Stash deletion [y,n,q,a,d%s,?]? "),
+		N_("Stash this hunk [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for stashing."),
+	.help_patch_text =
+		N_("y - stash this hunk\n"
+		   "n - do not stash this hunk\n"
+		   "q - quit; do not stash this hunk or any of the remaining "
+			"ones\n"
+		   "a - stash this hunk and all later hunks in the file\n"
+		   "d - do not stash this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_reset_head = {
+	.diff_cmd = { "diff-index", "--cached", NULL },
+	.apply_args = { "-R", "--cached", NULL },
+	.apply_check_args = { "-R", "--cached", NULL },
+	.is_reverse = 1,
+	.index_only = 1,
+	.prompt_mode = {
+		N_("Unstage mode change [y,n,q,a,d%s,?]? "),
+		N_("Unstage deletion [y,n,q,a,d%s,?]? "),
+		N_("Unstage this hunk [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for unstaging."),
+	.help_patch_text =
+		N_("y - unstage this hunk\n"
+		   "n - do not unstage this hunk\n"
+		   "q - quit; do not unstage this hunk or any of the remaining "
+			"ones\n"
+		   "a - unstage this hunk and all later hunks in the file\n"
+		   "d - do not unstage this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_reset_nothead = {
+	.diff_cmd = { "diff-index", "-R", "--cached", NULL },
+	.apply_args = { "--cached", NULL },
+	.apply_check_args = { "--cached", NULL },
+	.index_only = 1,
+	.prompt_mode = {
+		N_("Apply mode change to index [y,n,q,a,d%s,?]? "),
+		N_("Apply deletion to index [y,n,q,a,d%s,?]? "),
+		N_("Apply this hunk to index [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for applying."),
+	.help_patch_text =
+		N_("y - apply this hunk to index\n"
+		   "n - do not apply this hunk to index\n"
+		   "q - quit; do not apply this hunk or any of the remaining "
+			"ones\n"
+		   "a - apply this hunk and all later hunks in the file\n"
+		   "d - do not apply this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_checkout_index = {
+	.diff_cmd = { "diff-files", NULL },
+	.apply_args = { "-R", NULL },
+	.apply_check_args = { "-R", NULL },
+	.is_reverse = 1,
+	.prompt_mode = {
+		N_("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for discarding."),
+	.help_patch_text =
+		N_("y - discard this hunk from worktree\n"
+		   "n - do not discard this hunk from worktree\n"
+		   "q - quit; do not discard this hunk or any of the remaining "
+			"ones\n"
+		   "a - discard this hunk and all later hunks in the file\n"
+		   "d - do not discard this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_checkout_head = {
+	.diff_cmd = { "diff-index", NULL },
+	.apply_for_checkout = 1,
+	.apply_check_args = { "-R", NULL },
+	.is_reverse = 1,
+	.prompt_mode = {
+		N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for discarding."),
+	.help_patch_text =
+		N_("y - discard this hunk from index and worktree\n"
+		   "n - do not discard this hunk from index and worktree\n"
+		   "q - quit; do not discard this hunk or any of the remaining "
+			"ones\n"
+		   "a - discard this hunk and all later hunks in the file\n"
+		   "d - do not discard this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_checkout_nothead = {
+	.diff_cmd = { "diff-index", "-R", NULL },
+	.apply_for_checkout = 1,
+	.apply_check_args = { NULL },
+	.prompt_mode = {
+		N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for applying."),
+	.help_patch_text =
+		N_("y - apply this hunk to index and worktree\n"
+		   "n - do not apply this hunk to index and worktree\n"
+		   "q - quit; do not apply this hunk or any of the remaining "
+			"ones\n"
+		   "a - apply this hunk and all later hunks in the file\n"
+		   "d - do not apply this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_worktree_head = {
+	.diff_cmd = { "diff-index", NULL },
+	.apply_args = { "-R", NULL },
+	.apply_check_args = { "-R", NULL },
+	.is_reverse = 1,
+	.prompt_mode = {
+		N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for discarding."),
+	.help_patch_text =
+		N_("y - discard this hunk from worktree\n"
+		   "n - do not discard this hunk from worktree\n"
+		   "q - quit; do not discard this hunk or any of the remaining "
+			"ones\n"
+		   "a - discard this hunk and all later hunks in the file\n"
+		   "d - do not discard this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_worktree_nothead = {
+	.diff_cmd = { "diff-index", "-R", NULL },
+	.apply_args = { NULL },
+	.apply_check_args = { NULL },
+	.prompt_mode = {
+		N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for applying."),
+	.help_patch_text =
+		N_("y - apply this hunk to worktree\n"
+		   "n - do not apply this hunk to worktree\n"
+		   "q - quit; do not apply this hunk or any of the remaining "
+			"ones\n"
+		   "a - apply this hunk and all later hunks in the file\n"
+		   "d - do not apply this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+struct hunk_header {
+	unsigned long old_offset, old_count, new_offset, new_count;
+	/*
+	 * Start/end offsets to the extra text after the second `@@` in the
+	 * hunk header, e.g. the function signature. This is expected to
+	 * include the newline.
+	 */
+	size_t extra_start, extra_end, colored_extra_start, colored_extra_end;
+};
+
+struct hunk {
+	size_t start, end, colored_start, colored_end, splittable_into;
+	ssize_t delta;
+	enum { UNDECIDED_HUNK = 0, SKIP_HUNK, USE_HUNK } use;
+	struct hunk_header header;
+};
+
+struct add_p_state {
+	struct add_i_state s;
+	struct strbuf answer, buf;
+
+	/* parsed diff */
+	struct strbuf plain, colored;
+	struct file_diff {
+		struct hunk head;
+		struct hunk *hunk;
+		size_t hunk_nr, hunk_alloc;
+		unsigned deleted:1, mode_change:1,binary:1;
+	} *file_diff;
+	size_t file_diff_nr;
+
+	/* patch mode */
+	struct patch_mode *mode;
+	const char *revision;
+};
+
+static void err(struct add_p_state *s, const char *fmt, ...)
+{
+	va_list args;
+
+	va_start(args, fmt);
+	fputs(s->s.error_color, stderr);
+	vfprintf(stderr, fmt, args);
+	fputs(s->s.reset_color, stderr);
+	fputc('\n', stderr);
+	va_end(args);
+}
+
+static void setup_child_process(struct add_p_state *s,
+				struct child_process *cp, ...)
+{
+	va_list ap;
+	const char *arg;
+
+	va_start(ap, cp);
+	while ((arg = va_arg(ap, const char *)))
+		argv_array_push(&cp->args, arg);
+	va_end(ap);
+
+	cp->git_cmd = 1;
+	argv_array_pushf(&cp->env_array,
+			 INDEX_ENVIRONMENT "=%s", s->s.r->index_file);
+}
+
+static int parse_range(const char **p,
+		       unsigned long *offset, unsigned long *count)
+{
+	char *pend;
+
+	*offset = strtoul(*p, &pend, 10);
+	if (pend == *p)
+		return -1;
+	if (*pend != ',') {
+		*count = 1;
+		*p = pend;
+		return 0;
+	}
+	*count = strtoul(pend + 1, (char **)p, 10);
+	return *p == pend + 1 ? -1 : 0;
+}
+
+static int parse_hunk_header(struct add_p_state *s, struct hunk *hunk)
+{
+	struct hunk_header *header = &hunk->header;
+	const char *line = s->plain.buf + hunk->start, *p = line;
+	char *eol = memchr(p, '\n', s->plain.len - hunk->start);
+
+	if (!eol)
+		eol = s->plain.buf + s->plain.len;
+
+	if (!skip_prefix(p, "@@ -", &p) ||
+	    parse_range(&p, &header->old_offset, &header->old_count) < 0 ||
+	    !skip_prefix(p, " +", &p) ||
+	    parse_range(&p, &header->new_offset, &header->new_count) < 0 ||
+	    !skip_prefix(p, " @@", &p))
+		return error(_("could not parse hunk header '%.*s'"),
+			     (int)(eol - line), line);
+
+	hunk->start = eol - s->plain.buf + (*eol == '\n');
+	header->extra_start = p - s->plain.buf;
+	header->extra_end = hunk->start;
+
+	if (!s->colored.len) {
+		header->colored_extra_start = header->colored_extra_end = 0;
+		return 0;
+	}
+
+	/* Now find the extra text in the colored diff */
+	line = s->colored.buf + hunk->colored_start;
+	eol = memchr(line, '\n', s->colored.len - hunk->colored_start);
+	if (!eol)
+		eol = s->colored.buf + s->colored.len;
+	p = memmem(line, eol - line, "@@ -", 4);
+	if (!p)
+		return error(_("could not parse colored hunk header '%.*s'"),
+			     (int)(eol - line), line);
+	p = memmem(p + 4, eol - p - 4, " @@", 3);
+	if (!p)
+		return error(_("could not parse colored hunk header '%.*s'"),
+			     (int)(eol - line), line);
+	hunk->colored_start = eol - s->colored.buf + (*eol == '\n');
+	header->colored_extra_start = p + 3 - s->colored.buf;
+	header->colored_extra_end = hunk->colored_start;
+
+	return 0;
+}
+
+static int is_octal(const char *p, size_t len)
+{
+	if (!len)
+		return 0;
+
+	while (len--)
+		if (*p < '0' || *(p++) > '7')
+			return 0;
+	return 1;
+}
+
+static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
+{
+	struct argv_array args = ARGV_ARRAY_INIT;
+	const char *diff_algorithm = s->s.interactive_diff_algorithm;
+	struct strbuf *plain = &s->plain, *colored = NULL;
+	struct child_process cp = CHILD_PROCESS_INIT;
+	char *p, *pend, *colored_p = NULL, *colored_pend = NULL, marker = '\0';
+	size_t file_diff_alloc = 0, i, color_arg_index;
+	struct file_diff *file_diff = NULL;
+	struct hunk *hunk = NULL;
+	int res;
+
+	argv_array_pushv(&args, s->mode->diff_cmd);
+	if (diff_algorithm)
+		argv_array_pushf(&args, "--diff-algorithm=%s", diff_algorithm);
+	if (s->revision) {
+		struct object_id oid;
+		argv_array_push(&args,
+				/* could be on an unborn branch */
+				!strcmp("HEAD", s->revision) &&
+				get_oid("HEAD", &oid) ?
+				empty_tree_oid_hex() : s->revision);
+	}
+	color_arg_index = args.argc;
+	/* Use `--no-color` explicitly, just in case `diff.color = always`. */
+	argv_array_pushl(&args, "--no-color", "-p", "--", NULL);
+	for (i = 0; i < ps->nr; i++)
+		argv_array_push(&args, ps->items[i].original);
+
+	setup_child_process(s, &cp, NULL);
+	cp.argv = args.argv;
+	res = capture_command(&cp, plain, 0);
+	if (res) {
+		argv_array_clear(&args);
+		return error(_("could not parse diff"));
+	}
+	if (!plain->len) {
+		argv_array_clear(&args);
+		return 0;
+	}
+	strbuf_complete_line(plain);
+
+	if (want_color_fd(1, -1)) {
+		struct child_process colored_cp = CHILD_PROCESS_INIT;
+		const char *diff_filter = s->s.interactive_diff_filter;
+
+		setup_child_process(s, &colored_cp, NULL);
+		xsnprintf((char *)args.argv[color_arg_index], 8, "--color");
+		colored_cp.argv = args.argv;
+		colored = &s->colored;
+		res = capture_command(&colored_cp, colored, 0);
+		argv_array_clear(&args);
+		if (res)
+			return error(_("could not parse colored diff"));
+
+		if (diff_filter) {
+			struct child_process filter_cp = CHILD_PROCESS_INIT;
+
+			setup_child_process(s, &filter_cp,
+					    diff_filter, NULL);
+			filter_cp.git_cmd = 0;
+			filter_cp.use_shell = 1;
+			strbuf_reset(&s->buf);
+			if (pipe_command(&filter_cp,
+					 colored->buf, colored->len,
+					 &s->buf, colored->len,
+					 NULL, 0) < 0)
+				return error(_("failed to run '%s'"),
+					     diff_filter);
+			strbuf_swap(colored, &s->buf);
+		}
+
+		strbuf_complete_line(colored);
+		colored_p = colored->buf;
+		colored_pend = colored_p + colored->len;
+	}
+	argv_array_clear(&args);
+
+	/* parse files and hunks */
+	p = plain->buf;
+	pend = p + plain->len;
+	while (p != pend) {
+		char *eol = memchr(p, '\n', pend - p);
+		const char *deleted = NULL, *mode_change = NULL;
+
+		if (!eol)
+			eol = pend;
+
+		if (starts_with(p, "diff ")) {
+			s->file_diff_nr++;
+			ALLOC_GROW(s->file_diff, s->file_diff_nr,
+				   file_diff_alloc);
+			file_diff = s->file_diff + s->file_diff_nr - 1;
+			memset(file_diff, 0, sizeof(*file_diff));
+			hunk = &file_diff->head;
+			hunk->start = p - plain->buf;
+			if (colored_p)
+				hunk->colored_start = colored_p - colored->buf;
+			marker = '\0';
+		} else if (p == plain->buf)
+			BUG("diff starts with unexpected line:\n"
+			    "%.*s\n", (int)(eol - p), p);
+		else if (file_diff->deleted)
+			; /* keep the rest of the file in a single "hunk" */
+		else if (starts_with(p, "@@ ") ||
+			 (hunk == &file_diff->head &&
+			  skip_prefix(p, "deleted file", &deleted))) {
+			if (marker == '-' || marker == '+')
+				/*
+				 * Should not happen; previous hunk did not end
+				 * in a context line? Handle it anyway.
+				 */
+				hunk->splittable_into++;
+
+			file_diff->hunk_nr++;
+			ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr,
+				   file_diff->hunk_alloc);
+			hunk = file_diff->hunk + file_diff->hunk_nr - 1;
+			memset(hunk, 0, sizeof(*hunk));
+
+			hunk->start = p - plain->buf;
+			if (colored)
+				hunk->colored_start = colored_p - colored->buf;
+
+			if (deleted)
+				file_diff->deleted = 1;
+			else if (parse_hunk_header(s, hunk) < 0)
+				return -1;
+
+			/*
+			 * Start counting into how many hunks this one can be
+			 * split
+			 */
+			marker = *p;
+		} else if (hunk == &file_diff->head &&
+			   skip_prefix(p, "old mode ", &mode_change) &&
+			   is_octal(mode_change, eol - mode_change)) {
+			if (file_diff->mode_change)
+				BUG("double mode change?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+			if (file_diff->hunk_nr++)
+				BUG("mode change in the middle?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+
+			/*
+			 * Do *not* change `hunk`: the mode change pseudo-hunk
+			 * is _part of_ the header "hunk".
+			 */
+			file_diff->mode_change = 1;
+			ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr,
+				   file_diff->hunk_alloc);
+			memset(file_diff->hunk, 0, sizeof(struct hunk));
+			file_diff->hunk->start = p - plain->buf;
+			if (colored_p)
+				file_diff->hunk->colored_start =
+					colored_p - colored->buf;
+		} else if (hunk == &file_diff->head &&
+			   skip_prefix(p, "new mode ", &mode_change) &&
+			   is_octal(mode_change, eol - mode_change)) {
+
+			/*
+			 * Extend the "mode change" pseudo-hunk to include also
+			 * the "new mode" line.
+			 */
+			if (!file_diff->mode_change)
+				BUG("'new mode' without 'old mode'?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+			if (file_diff->hunk_nr != 1)
+				BUG("mode change in the middle?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+			if (p - plain->buf != file_diff->hunk->end)
+				BUG("'new mode' does not immediately follow "
+				    "'old mode'?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+		} else if (hunk == &file_diff->head &&
+			   starts_with(p, "Binary files "))
+			file_diff->binary = 1;
+
+		if (file_diff->deleted && file_diff->mode_change)
+			BUG("diff contains delete *and* a mode change?!?\n%.*s",
+			    (int)(eol - (plain->buf + file_diff->head.start)),
+			    plain->buf + file_diff->head.start);
+
+		if ((marker == '-' || marker == '+') && *p == ' ')
+			hunk->splittable_into++;
+		if (marker && *p != '\\')
+			marker = *p;
+
+		p = eol == pend ? pend : eol + 1;
+		hunk->end = p - plain->buf;
+
+		if (colored) {
+			char *colored_eol = memchr(colored_p, '\n',
+						   colored_pend - colored_p);
+			if (colored_eol)
+				colored_p = colored_eol + 1;
+			else if (p != pend)
+				/* colored shorter than non-colored? */
+				goto mismatched_output;
+			else
+				colored_p = colored_pend;
+
+			hunk->colored_end = colored_p - colored->buf;
+		}
+
+		if (mode_change) {
+			if (file_diff->hunk_nr != 1)
+				BUG("mode change in hunk #%d???",
+				    (int)file_diff->hunk_nr);
+			/* Adjust the end of the "mode change" pseudo-hunk */
+			file_diff->hunk->end = hunk->end;
+			if (colored)
+				file_diff->hunk->colored_end = hunk->colored_end;
+		}
+	}
+
+	if (marker == '-' || marker == '+')
+		/*
+		 * Last hunk ended in non-context line (i.e. it appended lines
+		 * to the file, so there are no trailing context lines).
+		 */
+		hunk->splittable_into++;
+
+	/* non-colored shorter than colored? */
+	if (colored_p != colored_pend) {
+mismatched_output:
+		error(_("mismatched output from interactive.diffFilter"));
+		advise(_("Your filter must maintain a one-to-one correspondence\n"
+			 "between its input and output lines."));
+		return -1;
+	}
+
+	return 0;
+}
+
+static size_t find_next_line(struct strbuf *sb, size_t offset)
+{
+	char *eol;
+
+	if (offset >= sb->len)
+		BUG("looking for next line beyond buffer (%d >= %d)\n%s",
+		    (int)offset, (int)sb->len, sb->buf);
+
+	eol = memchr(sb->buf + offset, '\n', sb->len - offset);
+	if (!eol)
+		return sb->len;
+	return eol - sb->buf + 1;
+}
+
+static void render_hunk(struct add_p_state *s, struct hunk *hunk,
+			ssize_t delta, int colored, struct strbuf *out)
+{
+	struct hunk_header *header = &hunk->header;
+
+	if (hunk->header.old_offset != 0 || hunk->header.new_offset != 0) {
+		/*
+		 * Generate the hunk header dynamically, except for special
+		 * hunks (such as the diff header).
+		 */
+		const char *p;
+		size_t len;
+		unsigned long old_offset = header->old_offset;
+		unsigned long new_offset = header->new_offset;
+
+		if (!colored) {
+			p = s->plain.buf + header->extra_start;
+			len = header->extra_end - header->extra_start;
+		} else {
+			strbuf_addstr(out, s->s.fraginfo_color);
+			p = s->colored.buf + header->colored_extra_start;
+			len = header->colored_extra_end
+				- header->colored_extra_start;
+		}
+
+		if (s->mode->is_reverse)
+			old_offset -= delta;
+		else
+			new_offset += delta;
+
+		strbuf_addf(out, "@@ -%lu,%lu +%lu,%lu @@",
+			    old_offset, header->old_count,
+			    new_offset, header->new_count);
+		if (len)
+			strbuf_add(out, p, len);
+		else if (colored)
+			strbuf_addf(out, "%s\n", GIT_COLOR_RESET);
+		else
+			strbuf_addch(out, '\n');
+	}
+
+	if (colored)
+		strbuf_add(out, s->colored.buf + hunk->colored_start,
+			   hunk->colored_end - hunk->colored_start);
+	else
+		strbuf_add(out, s->plain.buf + hunk->start,
+			   hunk->end - hunk->start);
+}
+
+static void render_diff_header(struct add_p_state *s,
+			       struct file_diff *file_diff, int colored,
+			       struct strbuf *out)
+{
+	/*
+	 * If there was a mode change, the first hunk is a pseudo hunk that
+	 * corresponds to the mode line in the header. If the user did not want
+	 * to stage that "hunk", we actually have to cut it out from the header.
+	 */
+	int skip_mode_change =
+		file_diff->mode_change && file_diff->hunk->use != USE_HUNK;
+	struct hunk *head = &file_diff->head, *first = file_diff->hunk;
+
+	if (!skip_mode_change) {
+		render_hunk(s, head, 0, colored, out);
+		return;
+	}
+
+	if (colored) {
+		const char *p = s->colored.buf;
+
+		strbuf_add(out, p + head->colored_start,
+			    first->colored_start - head->colored_start);
+		strbuf_add(out, p + first->colored_end,
+			    head->colored_end - first->colored_end);
+	} else {
+		const char *p = s->plain.buf;
+
+		strbuf_add(out, p + head->start, first->start - head->start);
+		strbuf_add(out, p + first->end, head->end - first->end);
+	}
+}
+
+/* Coalesce hunks again that were split */
+static int merge_hunks(struct add_p_state *s, struct file_diff *file_diff,
+		       size_t *hunk_index, int use_all, struct hunk *merged)
+{
+	size_t i = *hunk_index, delta;
+	struct hunk *hunk = file_diff->hunk + i;
+	/* `header` corresponds to the merged hunk */
+	struct hunk_header *header = &merged->header, *next;
+
+	if (!use_all && hunk->use != USE_HUNK)
+		return 0;
+
+	*merged = *hunk;
+	/* We simply skip the colored part (if any) when merging hunks */
+	merged->colored_start = merged->colored_end = 0;
+
+	for (; i + 1 < file_diff->hunk_nr; i++) {
+		hunk++;
+		next = &hunk->header;
+
+		/*
+		 * Stop merging hunks when:
+		 *
+		 * - the hunk is not selected for use, or
+		 * - the hunk does not overlap with the already-merged hunk(s)
+		 */
+		if ((!use_all && hunk->use != USE_HUNK) ||
+		    header->new_offset >= next->new_offset + merged->delta ||
+		    header->new_offset + header->new_count
+		    < next->new_offset + merged->delta)
+			break;
+
+		/*
+		 * If the hunks were not edited, and overlap, we can simply
+		 * extend the line range.
+		 */
+		if (merged->start < hunk->start && merged->end > hunk->start) {
+			merged->end = hunk->end;
+			merged->colored_end = hunk->colored_end;
+			delta = 0;
+		} else {
+			const char *plain = s->plain.buf;
+			size_t  overlapping_line_count = header->new_offset
+				+ header->new_count - merged->delta
+				- next->new_offset;
+			size_t overlap_end = hunk->start;
+			size_t overlap_start = overlap_end;
+			size_t overlap_next, len, j;
+
+			/*
+			 * One of the hunks was edited: the modified hunk was
+			 * appended to the strbuf `s->plain`.
+			 *
+			 * Let's ensure that at least the last context line of
+			 * the first hunk overlaps with the corresponding line
+			 * of the second hunk, and then merge.
+			 */
+			for (j = 0; j < overlapping_line_count; j++) {
+				overlap_next = find_next_line(&s->plain,
+							      overlap_end);
+
+				if (overlap_next > hunk->end)
+					BUG("failed to find %d context lines "
+					    "in:\n%.*s",
+					    (int)overlapping_line_count,
+					    (int)(hunk->end - hunk->start),
+					    plain + hunk->start);
+
+				if (plain[overlap_end] != ' ')
+					return error(_("expected context line "
+						       "#%d in\n%.*s"),
+						     (int)(j + 1),
+						     (int)(hunk->end
+							   - hunk->start),
+						     plain + hunk->start);
+
+				overlap_start = overlap_end;
+				overlap_end = overlap_next;
+			}
+			len = overlap_end - overlap_start;
+
+			if (len > merged->end - merged->start ||
+			    memcmp(plain + merged->end - len,
+				   plain + overlap_start, len))
+				return error(_("hunks do not overlap:\n%.*s\n"
+					       "\tdoes not end with:\n%.*s"),
+					     (int)(merged->end - merged->start),
+					     plain + merged->start,
+					     (int)len, plain + overlap_start);
+
+			/*
+			 * Since the start-end ranges are not adjacent, we
+			 * cannot simply take the union of the ranges. To
+			 * address that, we temporarily append the union of the
+			 * lines to the `plain` strbuf.
+			 */
+			if (merged->end != s->plain.len) {
+				size_t start = s->plain.len;
+
+				strbuf_add(&s->plain, plain + merged->start,
+					   merged->end - merged->start);
+				plain = s->plain.buf;
+				merged->start = start;
+				merged->end = s->plain.len;
+			}
+
+			strbuf_add(&s->plain,
+				   plain + overlap_end,
+				   hunk->end - overlap_end);
+			merged->end = s->plain.len;
+			merged->splittable_into += hunk->splittable_into;
+			delta = merged->delta;
+			merged->delta += hunk->delta;
+		}
+
+		header->old_count = next->old_offset + next->old_count
+			- header->old_offset;
+		header->new_count = next->new_offset + delta
+			+ next->new_count - header->new_offset;
+	}
+
+	if (i == *hunk_index)
+		return 0;
+
+	*hunk_index = i;
+	return 1;
+}
+
+static void reassemble_patch(struct add_p_state *s,
+			     struct file_diff *file_diff, int use_all,
+			     struct strbuf *out)
+{
+	struct hunk *hunk;
+	size_t save_len = s->plain.len, i;
+	ssize_t delta = 0;
+
+	render_diff_header(s, file_diff, 0, out);
+
+	for (i = file_diff->mode_change; i < file_diff->hunk_nr; i++) {
+		struct hunk merged = { 0 };
+
+		hunk = file_diff->hunk + i;
+		if (!use_all && hunk->use != USE_HUNK)
+			delta += hunk->header.old_count
+				- hunk->header.new_count;
+		else {
+			/* merge overlapping hunks into a temporary hunk */
+			if (merge_hunks(s, file_diff, &i, use_all, &merged))
+				hunk = &merged;
+
+			render_hunk(s, hunk, delta, 0, out);
+
+			/*
+			 * In case `merge_hunks()` used `plain` as a scratch
+			 * pad (this happens when an edited hunk had to be
+			 * coalesced with another hunk).
+			 */
+			strbuf_setlen(&s->plain, save_len);
+
+			delta += hunk->delta;
+		}
+	}
+}
+
+static int split_hunk(struct add_p_state *s, struct file_diff *file_diff,
+		       size_t hunk_index)
+{
+	int colored = !!s->colored.len, first = 1;
+	struct hunk *hunk = file_diff->hunk + hunk_index;
+	size_t splittable_into;
+	size_t end, colored_end, current, colored_current = 0, context_line_count;
+	struct hunk_header remaining, *header;
+	char marker, ch;
+
+	if (hunk_index >= file_diff->hunk_nr)
+		BUG("invalid hunk index: %d (must be >= 0 and < %d)",
+		    (int)hunk_index, (int)file_diff->hunk_nr);
+
+	if (hunk->splittable_into < 2)
+		return 0;
+	splittable_into = hunk->splittable_into;
+
+	end = hunk->end;
+	colored_end = hunk->colored_end;
+
+	remaining = hunk->header;
+
+	file_diff->hunk_nr += splittable_into - 1;
+	ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr, file_diff->hunk_alloc);
+	if (hunk_index + splittable_into < file_diff->hunk_nr)
+		memmove(file_diff->hunk + hunk_index + splittable_into,
+			file_diff->hunk + hunk_index + 1,
+			(file_diff->hunk_nr - hunk_index - splittable_into)
+			* sizeof(*hunk));
+	hunk = file_diff->hunk + hunk_index;
+	hunk->splittable_into = 1;
+	memset(hunk + 1, 0, (splittable_into - 1) * sizeof(*hunk));
+
+	header = &hunk->header;
+	header->old_count = header->new_count = 0;
+
+	current = hunk->start;
+	if (colored)
+		colored_current = hunk->colored_start;
+	marker = '\0';
+	context_line_count = 0;
+
+	while (splittable_into > 1) {
+		ch = s->plain.buf[current];
+
+		if (!ch)
+			BUG("buffer overrun while splitting hunks");
+
+		/*
+		 * Is this the first context line after a chain of +/- lines?
+		 * Then record the start of the next split hunk.
+		 */
+		if ((marker == '-' || marker == '+') && ch == ' ') {
+			first = 0;
+			hunk[1].start = current;
+			if (colored)
+				hunk[1].colored_start = colored_current;
+			context_line_count = 0;
+		}
+
+		/*
+		 * Was the previous line a +/- one? Alternatively, is this the
+		 * first line (and not a +/- one)?
+		 *
+		 * Then just increment the appropriate counter and continue
+		 * with the next line.
+		 */
+		if (marker != ' ' || (ch != '-' && ch != '+')) {
+next_hunk_line:
+			/* Comment lines are attached to the previous line */
+			if (ch == '\\')
+				ch = marker ? marker : ' ';
+
+			/* current hunk not done yet */
+			if (ch == ' ')
+				context_line_count++;
+			else if (ch == '-')
+				header->old_count++;
+			else if (ch == '+')
+				header->new_count++;
+			else
+				BUG("unhandled diff marker: '%c'", ch);
+			marker = ch;
+			current = find_next_line(&s->plain, current);
+			if (colored)
+				colored_current =
+					find_next_line(&s->colored,
+						       colored_current);
+			continue;
+		}
+
+		/*
+		 * We got us the start of a new hunk!
+		 *
+		 * This is a context line, so it is shared with the previous
+		 * hunk, if any.
+		 */
+
+		if (first) {
+			if (header->old_count || header->new_count)
+				BUG("counts are off: %d/%d",
+				    (int)header->old_count,
+				    (int)header->new_count);
+
+			header->old_count = context_line_count;
+			header->new_count = context_line_count;
+			context_line_count = 0;
+			first = 0;
+			goto next_hunk_line;
+		}
+
+		remaining.old_offset += header->old_count;
+		remaining.old_count -= header->old_count;
+		remaining.new_offset += header->new_count;
+		remaining.new_count -= header->new_count;
+
+		/* initialize next hunk header's offsets */
+		hunk[1].header.old_offset =
+			header->old_offset + header->old_count;
+		hunk[1].header.new_offset =
+			header->new_offset + header->new_count;
+
+		/* add one split hunk */
+		header->old_count += context_line_count;
+		header->new_count += context_line_count;
+
+		hunk->end = current;
+		if (colored)
+			hunk->colored_end = colored_current;
+
+		hunk++;
+		hunk->splittable_into = 1;
+		hunk->use = hunk[-1].use;
+		header = &hunk->header;
+
+		header->old_count = header->new_count = context_line_count;
+		context_line_count = 0;
+
+		splittable_into--;
+		marker = ch;
+	}
+
+	/* last hunk simply gets the rest */
+	if (header->old_offset != remaining.old_offset)
+		BUG("miscounted old_offset: %lu != %lu",
+		    header->old_offset, remaining.old_offset);
+	if (header->new_offset != remaining.new_offset)
+		BUG("miscounted new_offset: %lu != %lu",
+		    header->new_offset, remaining.new_offset);
+	header->old_count = remaining.old_count;
+	header->new_count = remaining.new_count;
+	hunk->end = end;
+	if (colored)
+		hunk->colored_end = colored_end;
+
+	return 0;
+}
+
+static void recolor_hunk(struct add_p_state *s, struct hunk *hunk)
+{
+	const char *plain = s->plain.buf;
+	size_t current, eol, next;
+
+	if (!s->colored.len)
+		return;
+
+	hunk->colored_start = s->colored.len;
+	for (current = hunk->start; current < hunk->end; ) {
+		for (eol = current; eol < hunk->end; eol++)
+			if (plain[eol] == '\n')
+				break;
+		next = eol + (eol < hunk->end);
+		if (eol > current && plain[eol - 1] == '\r')
+			eol--;
+
+		strbuf_addstr(&s->colored,
+			      plain[current] == '-' ?
+			      s->s.file_old_color :
+			      plain[current] == '+' ?
+			      s->s.file_new_color :
+			      s->s.context_color);
+		strbuf_add(&s->colored, plain + current, eol - current);
+		strbuf_addstr(&s->colored, GIT_COLOR_RESET);
+		if (next > eol)
+			strbuf_add(&s->colored, plain + eol, next - eol);
+		current = next;
+	}
+	hunk->colored_end = s->colored.len;
+}
+
+static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk)
+{
+	size_t i;
+
+	strbuf_reset(&s->buf);
+	strbuf_commented_addf(&s->buf, _("Manual hunk edit mode -- see bottom for "
+				      "a quick guide.\n"));
+	render_hunk(s, hunk, 0, 0, &s->buf);
+	strbuf_commented_addf(&s->buf,
+			      _("---\n"
+				"To remove '%c' lines, make them ' ' lines "
+				"(context).\n"
+				"To remove '%c' lines, delete them.\n"
+				"Lines starting with %c will be removed.\n"),
+			      s->mode->is_reverse ? '+' : '-',
+			      s->mode->is_reverse ? '-' : '+',
+			      comment_line_char);
+	strbuf_commented_addf(&s->buf, "%s", _(s->mode->edit_hunk_hint));
+	/*
+	 * TRANSLATORS: 'it' refers to the patch mentioned in the previous
+	 * messages.
+	 */
+	strbuf_commented_addf(&s->buf,
+			      _("If it does not apply cleanly, you will be "
+				"given an opportunity to\n"
+				"edit again.  If all lines of the hunk are "
+				"removed, then the edit is\n"
+				"aborted and the hunk is left unchanged.\n"));
+
+	if (strbuf_edit_interactively(&s->buf, "addp-hunk-edit.diff", NULL) < 0)
+		return -1;
+
+	/* strip out commented lines */
+	hunk->start = s->plain.len;
+	for (i = 0; i < s->buf.len; ) {
+		size_t next = find_next_line(&s->buf, i);
+
+		if (s->buf.buf[i] != comment_line_char)
+			strbuf_add(&s->plain, s->buf.buf + i, next - i);
+		i = next;
+	}
+
+	hunk->end = s->plain.len;
+	if (hunk->end == hunk->start)
+		/* The user aborted editing by deleting everything */
+		return 0;
+
+	recolor_hunk(s, hunk);
+
+	/*
+	 * If the hunk header is intact, parse it, otherwise simply use the
+	 * hunk header prior to editing (which will adjust `hunk->start` to
+	 * skip the hunk header).
+	 */
+	if (s->plain.buf[hunk->start] == '@' &&
+	    parse_hunk_header(s, hunk) < 0)
+		return error(_("could not parse hunk header"));
+
+	return 1;
+}
+
+static ssize_t recount_edited_hunk(struct add_p_state *s, struct hunk *hunk,
+				   size_t orig_old_count, size_t orig_new_count)
+{
+	struct hunk_header *header = &hunk->header;
+	size_t i;
+
+	header->old_count = header->new_count = 0;
+	for (i = hunk->start; i < hunk->end; ) {
+		switch (s->plain.buf[i]) {
+		case '-':
+			header->old_count++;
+			break;
+		case '+':
+			header->new_count++;
+			break;
+		case ' ': case '\r': case '\n':
+			header->old_count++;
+			header->new_count++;
+			break;
+		}
+
+		i = find_next_line(&s->plain, i);
+	}
+
+	return orig_old_count - orig_new_count
+		- header->old_count + header->new_count;
+}
+
+static int run_apply_check(struct add_p_state *s,
+			   struct file_diff *file_diff)
+{
+	struct child_process cp = CHILD_PROCESS_INIT;
+
+	strbuf_reset(&s->buf);
+	reassemble_patch(s, file_diff, 1, &s->buf);
+
+	setup_child_process(s, &cp,
+			    "apply", "--check", NULL);
+	argv_array_pushv(&cp.args, s->mode->apply_check_args);
+	if (pipe_command(&cp, s->buf.buf, s->buf.len, NULL, 0, NULL, 0))
+		return error(_("'git apply --cached' failed"));
+
+	return 0;
+}
+
+static int read_single_character(struct add_p_state *s)
+{
+	if (s->s.use_single_key) {
+		int res = read_key_without_echo(&s->answer);
+		printf("%s\n", res == EOF ? "" : s->answer.buf);
+		return res;
+	}
+
+	if (strbuf_getline(&s->answer, stdin) == EOF)
+		return EOF;
+	strbuf_trim_trailing_newline(&s->answer);
+	return 0;
+}
+
+static int prompt_yesno(struct add_p_state *s, const char *prompt)
+{
+	for (;;) {
+		color_fprintf(stdout, s->s.prompt_color, "%s", _(prompt));
+		fflush(stdout);
+		if (read_single_character(s) == EOF)
+			return -1;
+		switch (tolower(s->answer.buf[0])) {
+		case 'n': return 0;
+		case 'y': return 1;
+		}
+	}
+}
+
+static int edit_hunk_loop(struct add_p_state *s,
+			  struct file_diff *file_diff, struct hunk *hunk)
+{
+	size_t plain_len = s->plain.len, colored_len = s->colored.len;
+	struct hunk backup;
+
+	backup = *hunk;
+
+	for (;;) {
+		int res = edit_hunk_manually(s, hunk);
+		if (res == 0) {
+			/* abandonded */
+			*hunk = backup;
+			return -1;
+		}
+
+		if (res > 0) {
+			hunk->delta +=
+				recount_edited_hunk(s, hunk,
+						    backup.header.old_count,
+						    backup.header.new_count);
+			if (!run_apply_check(s, file_diff))
+				return 0;
+		}
+
+		/* Drop edits (they were appended to s->plain) */
+		strbuf_setlen(&s->plain, plain_len);
+		strbuf_setlen(&s->colored, colored_len);
+		*hunk = backup;
+
+		/*
+		 * TRANSLATORS: do not translate [y/n]
+		 * The program will only accept that input at this point.
+		 * Consider translating (saying "no" discards!) as
+		 * (saying "n" for "no" discards!) if the translation
+		 * of the word "no" does not start with n.
+		 */
+		res = prompt_yesno(s, _("Your edited hunk does not apply. "
+					"Edit again (saying \"no\" discards!) "
+					"[y/n]? "));
+		if (res < 1)
+			return -1;
+	}
+}
+
+static int apply_for_checkout(struct add_p_state *s, struct strbuf *diff,
+			      int is_reverse)
+{
+	const char *reverse = is_reverse ? "-R" : NULL;
+	struct child_process check_index = CHILD_PROCESS_INIT;
+	struct child_process check_worktree = CHILD_PROCESS_INIT;
+	struct child_process apply_index = CHILD_PROCESS_INIT;
+	struct child_process apply_worktree = CHILD_PROCESS_INIT;
+	int applies_index, applies_worktree;
+
+	setup_child_process(s, &check_index,
+			    "apply", "--cached", "--check", reverse, NULL);
+	applies_index = !pipe_command(&check_index, diff->buf, diff->len,
+				      NULL, 0, NULL, 0);
+
+	setup_child_process(s, &check_worktree,
+			    "apply", "--check", reverse, NULL);
+	applies_worktree = !pipe_command(&check_worktree, diff->buf, diff->len,
+					 NULL, 0, NULL, 0);
+
+	if (applies_worktree && applies_index) {
+		setup_child_process(s, &apply_index,
+				    "apply", "--cached", reverse, NULL);
+		pipe_command(&apply_index, diff->buf, diff->len,
+			     NULL, 0, NULL, 0);
+
+		setup_child_process(s, &apply_worktree,
+				    "apply", reverse, NULL);
+		pipe_command(&apply_worktree, diff->buf, diff->len,
+			     NULL, 0, NULL, 0);
+
+		return 1;
+	}
+
+	if (!applies_index) {
+		err(s, _("The selected hunks do not apply to the index!"));
+		if (prompt_yesno(s, _("Apply them to the worktree "
+					  "anyway? ")) > 0) {
+			setup_child_process(s, &apply_worktree,
+					    "apply", reverse, NULL);
+			return pipe_command(&apply_worktree, diff->buf,
+					    diff->len, NULL, 0, NULL, 0);
+		}
+		err(s, _("Nothing was applied.\n"));
+	} else
+		/* As a last resort, show the diff to the user */
+		fwrite(diff->buf, diff->len, 1, stderr);
+
+	return 0;
+}
+
+#define SUMMARY_HEADER_WIDTH 20
+#define SUMMARY_LINE_WIDTH 80
+static void summarize_hunk(struct add_p_state *s, struct hunk *hunk,
+			   struct strbuf *out)
+{
+	struct hunk_header *header = &hunk->header;
+	struct strbuf *plain = &s->plain;
+	size_t len = out->len, i;
+
+	strbuf_addf(out, " -%lu,%lu +%lu,%lu ",
+		    header->old_offset, header->old_count,
+		    header->new_offset, header->new_count);
+	if (out->len - len < SUMMARY_HEADER_WIDTH)
+		strbuf_addchars(out, ' ',
+				SUMMARY_HEADER_WIDTH + len - out->len);
+	for (i = hunk->start; i < hunk->end; i = find_next_line(plain, i))
+		if (plain->buf[i] != ' ')
+			break;
+	if (i < hunk->end)
+		strbuf_add(out, plain->buf + i, find_next_line(plain, i) - i);
+	if (out->len - len > SUMMARY_LINE_WIDTH)
+		strbuf_setlen(out, len + SUMMARY_LINE_WIDTH);
+	strbuf_complete_line(out);
+}
+
+#define DISPLAY_HUNKS_LINES 20
+static size_t display_hunks(struct add_p_state *s,
+			    struct file_diff *file_diff, size_t start_index)
+{
+	size_t end_index = start_index + DISPLAY_HUNKS_LINES;
+
+	if (end_index > file_diff->hunk_nr)
+		end_index = file_diff->hunk_nr;
+
+	while (start_index < end_index) {
+		struct hunk *hunk = file_diff->hunk + start_index++;
+
+		strbuf_reset(&s->buf);
+		strbuf_addf(&s->buf, "%c%2d: ", hunk->use == USE_HUNK ? '+'
+			    : hunk->use == SKIP_HUNK ? '-' : ' ',
+			    (int)start_index);
+		summarize_hunk(s, hunk, &s->buf);
+		fputs(s->buf.buf, stdout);
+	}
+
+	return end_index;
+}
+
+static const char help_patch_remainder[] =
+N_("j - leave this hunk undecided, see next undecided hunk\n"
+   "J - leave this hunk undecided, see next hunk\n"
+   "k - leave this hunk undecided, see previous undecided hunk\n"
+   "K - leave this hunk undecided, see previous hunk\n"
+   "g - select a hunk to go to\n"
+   "/ - search for a hunk matching the given regex\n"
+   "s - split the current hunk into smaller hunks\n"
+   "e - manually edit the current hunk\n"
+   "? - print help\n");
+
+static int patch_update_file(struct add_p_state *s,
+			     struct file_diff *file_diff)
+{
+	size_t hunk_index = 0;
+	ssize_t i, undecided_previous, undecided_next;
+	struct hunk *hunk;
+	char ch;
+	struct child_process cp = CHILD_PROCESS_INIT;
+	int colored = !!s->colored.len, quit = 0;
+	enum prompt_mode_type prompt_mode_type;
+
+	if (!file_diff->hunk_nr)
+		return 0;
+
+	strbuf_reset(&s->buf);
+	render_diff_header(s, file_diff, colored, &s->buf);
+	fputs(s->buf.buf, stdout);
+	for (;;) {
+		if (hunk_index >= file_diff->hunk_nr)
+			hunk_index = 0;
+		hunk = file_diff->hunk + hunk_index;
+
+		undecided_previous = -1;
+		for (i = hunk_index - 1; i >= 0; i--)
+			if (file_diff->hunk[i].use == UNDECIDED_HUNK) {
+				undecided_previous = i;
+				break;
+			}
+
+		undecided_next = -1;
+		for (i = hunk_index + 1; i < file_diff->hunk_nr; i++)
+			if (file_diff->hunk[i].use == UNDECIDED_HUNK) {
+				undecided_next = i;
+				break;
+			}
+
+		/* Everything decided? */
+		if (undecided_previous < 0 && undecided_next < 0 &&
+		    hunk->use != UNDECIDED_HUNK)
+			break;
+
+		strbuf_reset(&s->buf);
+		render_hunk(s, hunk, 0, colored, &s->buf);
+		fputs(s->buf.buf, stdout);
+
+		strbuf_reset(&s->buf);
+		if (undecided_previous >= 0)
+			strbuf_addstr(&s->buf, ",k");
+		if (hunk_index)
+			strbuf_addstr(&s->buf, ",K");
+		if (undecided_next >= 0)
+			strbuf_addstr(&s->buf, ",j");
+		if (hunk_index + 1 < file_diff->hunk_nr)
+			strbuf_addstr(&s->buf, ",J");
+		if (file_diff->hunk_nr > 1)
+			strbuf_addstr(&s->buf, ",g,/");
+		if (hunk->splittable_into > 1)
+			strbuf_addstr(&s->buf, ",s");
+		if (hunk_index + 1 > file_diff->mode_change &&
+		    !file_diff->deleted)
+			strbuf_addstr(&s->buf, ",e");
+
+		if (file_diff->deleted)
+			prompt_mode_type = PROMPT_DELETION;
+		else if (file_diff->mode_change && !hunk_index)
+			prompt_mode_type = PROMPT_MODE_CHANGE;
+		else
+			prompt_mode_type = PROMPT_HUNK;
+
+		color_fprintf(stdout, s->s.prompt_color,
+			      "(%"PRIuMAX"/%"PRIuMAX") ",
+			      (uintmax_t)hunk_index + 1,
+			      (uintmax_t)file_diff->hunk_nr);
+		color_fprintf(stdout, s->s.prompt_color,
+			      _(s->mode->prompt_mode[prompt_mode_type]),
+			      s->buf.buf);
+		fflush(stdout);
+		if (read_single_character(s) == EOF)
+			break;
+
+		if (!s->answer.len)
+			continue;
+		ch = tolower(s->answer.buf[0]);
+		if (ch == 'y') {
+			hunk->use = USE_HUNK;
+soft_increment:
+			hunk_index = undecided_next < 0 ?
+				file_diff->hunk_nr : undecided_next;
+		} else if (ch == 'n') {
+			hunk->use = SKIP_HUNK;
+			goto soft_increment;
+		} else if (ch == 'a') {
+			for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
+				hunk = file_diff->hunk + hunk_index;
+				if (hunk->use == UNDECIDED_HUNK)
+					hunk->use = USE_HUNK;
+			}
+		} else if (ch == 'd' || ch == 'q') {
+			for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
+				hunk = file_diff->hunk + hunk_index;
+				if (hunk->use == UNDECIDED_HUNK)
+					hunk->use = SKIP_HUNK;
+			}
+			if (ch == 'q') {
+				quit = 1;
+				break;
+			}
+		} else if (s->answer.buf[0] == 'K') {
+			if (hunk_index)
+				hunk_index--;
+			else
+				err(s, _("No previous hunk"));
+		} else if (s->answer.buf[0] == 'J') {
+			if (hunk_index + 1 < file_diff->hunk_nr)
+				hunk_index++;
+			else
+				err(s, _("No next hunk"));
+		} else if (s->answer.buf[0] == 'k') {
+			if (undecided_previous >= 0)
+				hunk_index = undecided_previous;
+			else
+				err(s, _("No previous hunk"));
+		} else if (s->answer.buf[0] == 'j') {
+			if (undecided_next >= 0)
+				hunk_index = undecided_next;
+			else
+				err(s, _("No next hunk"));
+		} else if (s->answer.buf[0] == 'g') {
+			char *pend;
+			unsigned long response;
+
+			if (file_diff->hunk_nr < 2) {
+				err(s, _("No other hunks to goto"));
+				continue;
+			}
+			strbuf_remove(&s->answer, 0, 1);
+			strbuf_trim(&s->answer);
+			i = hunk_index - DISPLAY_HUNKS_LINES / 2;
+			if (i < file_diff->mode_change)
+				i = file_diff->mode_change;
+			while (s->answer.len == 0) {
+				i = display_hunks(s, file_diff, i);
+				printf("%s", i < file_diff->hunk_nr ?
+				       _("go to which hunk (<ret> to see "
+					 "more)? ") : _("go to which hunk? "));
+				fflush(stdout);
+				if (strbuf_getline(&s->answer,
+						   stdin) == EOF)
+					break;
+				strbuf_trim_trailing_newline(&s->answer);
+			}
+
+			strbuf_trim(&s->answer);
+			response = strtoul(s->answer.buf, &pend, 10);
+			if (*pend || pend == s->answer.buf)
+				err(s, _("Invalid number: '%s'"),
+				    s->answer.buf);
+			else if (0 < response && response <= file_diff->hunk_nr)
+				hunk_index = response - 1;
+			else
+				err(s, Q_("Sorry, only %d hunk available.",
+					  "Sorry, only %d hunks available.",
+					  file_diff->hunk_nr),
+				    (int)file_diff->hunk_nr);
+		} else if (s->answer.buf[0] == '/') {
+			regex_t regex;
+			int ret;
+
+			if (file_diff->hunk_nr < 2) {
+				err(s, _("No other hunks to search"));
+				continue;
+			}
+			strbuf_remove(&s->answer, 0, 1);
+			strbuf_trim_trailing_newline(&s->answer);
+			if (s->answer.len == 0) {
+				printf("%s", _("search for regex? "));
+				fflush(stdout);
+				if (strbuf_getline(&s->answer,
+						   stdin) == EOF)
+					break;
+				strbuf_trim_trailing_newline(&s->answer);
+				if (s->answer.len == 0)
+					continue;
+			}
+			ret = regcomp(&regex, s->answer.buf,
+				      REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
+			if (ret) {
+				char errbuf[1024];
+
+				regerror(ret, &regex, errbuf, sizeof(errbuf));
+				err(s, _("Malformed search regexp %s: %s"),
+				    s->answer.buf, errbuf);
+				continue;
+			}
+			i = hunk_index;
+			for (;;) {
+				/* render the hunk into a scratch buffer */
+				render_hunk(s, file_diff->hunk + i, 0, 0,
+					    &s->buf);
+				if (regexec(&regex, s->buf.buf, 0, NULL, 0)
+				    != REG_NOMATCH)
+					break;
+				i++;
+				if (i == file_diff->hunk_nr)
+					i = 0;
+				if (i != hunk_index)
+					continue;
+				err(s, _("No hunk matches the given pattern"));
+				break;
+			}
+			hunk_index = i;
+		} else if (s->answer.buf[0] == 's') {
+			size_t splittable_into = hunk->splittable_into;
+			if (splittable_into < 2)
+				err(s, _("Sorry, cannot split this hunk"));
+			else if (!split_hunk(s, file_diff,
+					     hunk - file_diff->hunk))
+				color_fprintf_ln(stdout, s->s.header_color,
+						 _("Split into %d hunks."),
+						 (int)splittable_into);
+		} else if (s->answer.buf[0] == 'e') {
+			if (hunk_index + 1 == file_diff->mode_change)
+				err(s, _("Sorry, cannot edit this hunk"));
+			else if (edit_hunk_loop(s, file_diff, hunk) >= 0) {
+				hunk->use = USE_HUNK;
+				goto soft_increment;
+			}
+		} else {
+			const char *p = _(help_patch_remainder), *eol = p;
+
+			color_fprintf(stdout, s->s.help_color, "%s",
+				      _(s->mode->help_patch_text));
+
+			/*
+			 * Show only those lines of the remainder that are
+			 * actually applicable with the current hunk.
+			 */
+			for (; *p; p = eol + (*eol == '\n')) {
+				eol = strchrnul(p, '\n');
+
+				/*
+				 * `s->buf` still contains the part of the
+				 * commands shown in the prompt that are not
+				 * always available.
+				 */
+				if (*p != '?' && !strchr(s->buf.buf, *p))
+					continue;
+
+				color_fprintf_ln(stdout, s->s.help_color,
+						 "%.*s", (int)(eol - p), p);
+			}
+		}
+	}
+
+	/* Any hunk to be used? */
+	for (i = 0; i < file_diff->hunk_nr; i++)
+		if (file_diff->hunk[i].use == USE_HUNK)
+			break;
+
+	if (i < file_diff->hunk_nr) {
+		/* At least one hunk selected: apply */
+		strbuf_reset(&s->buf);
+		reassemble_patch(s, file_diff, 0, &s->buf);
+
+		discard_index(s->s.r->index);
+		if (s->mode->apply_for_checkout)
+			apply_for_checkout(s, &s->buf,
+					   s->mode->is_reverse);
+		else {
+			setup_child_process(s, &cp, "apply", NULL);
+			argv_array_pushv(&cp.args, s->mode->apply_args);
+			if (pipe_command(&cp, s->buf.buf, s->buf.len,
+					 NULL, 0, NULL, 0))
+				error(_("'git apply' failed"));
+		}
+		if (!repo_read_index(s->s.r))
+			repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0,
+						     1, NULL, NULL, NULL);
+	}
+
+	putchar('\n');
+	return quit;
+}
+
+int run_add_p(struct repository *r, enum add_p_mode mode,
+	      const char *revision, const struct pathspec *ps)
+{
+	struct add_p_state s = {
+		{ r }, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
+	};
+	size_t i, binary_count = 0;
+
+	init_add_i_state(&s.s, r);
+
+	if (mode == ADD_P_STASH)
+		s.mode = &patch_mode_stash;
+	else if (mode == ADD_P_RESET) {
+		if (!revision || !strcmp(revision, "HEAD"))
+			s.mode = &patch_mode_reset_head;
+		else
+			s.mode = &patch_mode_reset_nothead;
+	} else if (mode == ADD_P_CHECKOUT) {
+		if (!revision)
+			s.mode = &patch_mode_checkout_index;
+		else if (!strcmp(revision, "HEAD"))
+			s.mode = &patch_mode_checkout_head;
+		else
+			s.mode = &patch_mode_checkout_nothead;
+	} else if (mode == ADD_P_WORKTREE) {
+		if (!revision)
+			s.mode = &patch_mode_checkout_index;
+		else if (!strcmp(revision, "HEAD"))
+			s.mode = &patch_mode_worktree_head;
+		else
+			s.mode = &patch_mode_worktree_nothead;
+	} else
+		s.mode = &patch_mode_add;
+	s.revision = revision;
+
+	if (discard_index(r->index) < 0 || repo_read_index(r) < 0 ||
+	    (!s.mode->index_only &&
+	     repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
+					  NULL, NULL, NULL) < 0) ||
+	    parse_diff(&s, ps) < 0) {
+		strbuf_release(&s.plain);
+		strbuf_release(&s.colored);
+		clear_add_i_state(&s.s);
+		return -1;
+	}
+
+	for (i = 0; i < s.file_diff_nr; i++)
+		if (s.file_diff[i].binary && !s.file_diff[i].hunk_nr)
+			binary_count++;
+		else if (patch_update_file(&s, s.file_diff + i))
+			break;
+
+	if (s.file_diff_nr == 0)
+		fprintf(stderr, _("No changes.\n"));
+	else if (binary_count == s.file_diff_nr)
+		fprintf(stderr, _("Only binary files changed.\n"));
+
+	strbuf_release(&s.answer);
+	strbuf_release(&s.buf);
+	strbuf_release(&s.plain);
+	strbuf_release(&s.colored);
+	clear_add_i_state(&s.s);
+	return 0;
+}
diff --git a/third_party/git/advice.c b/third_party/git/advice.c
index 3ee0ee2d8fbb..97f3f981b4b4 100644
--- a/third_party/git/advice.c
+++ b/third_party/git/advice.c
@@ -30,6 +30,9 @@ int advice_waiting_for_editor = 1;
 int advice_graft_file_deprecated = 1;
 int advice_checkout_ambiguous_remote_branch_name = 1;
 int advice_nested_tag = 1;
+int advice_submodule_alternate_error_strategy_die = 1;
+int advice_add_ignored_file = 1;
+int advice_add_empty_pathspec = 1;
 
 static int advice_use_color = -1;
 static char advice_colors[][COLOR_MAXLEN] = {
@@ -89,6 +92,9 @@ static struct {
 	{ "graftFileDeprecated", &advice_graft_file_deprecated },
 	{ "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
 	{ "nestedTag", &advice_nested_tag },
+	{ "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die },
+	{ "addIgnoredFile", &advice_add_ignored_file },
+	{ "addEmptyPathspec", &advice_add_empty_pathspec },
 
 	/* make this an alias for backward compatibility */
 	{ "pushNonFastForward", &advice_push_update_rejected }
diff --git a/third_party/git/advice.h b/third_party/git/advice.h
index d0154048431c..0e6e58d9f8f7 100644
--- a/third_party/git/advice.h
+++ b/third_party/git/advice.h
@@ -30,6 +30,9 @@ extern int advice_waiting_for_editor;
 extern int advice_graft_file_deprecated;
 extern int advice_checkout_ambiguous_remote_branch_name;
 extern int advice_nested_tag;
+extern int advice_submodule_alternate_error_strategy_die;
+extern int advice_add_ignored_file;
+extern int advice_add_empty_pathspec;
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))
diff --git a/third_party/git/apply.c b/third_party/git/apply.c
index cde95369bb3f..bdc008fae2ad 100644
--- a/third_party/git/apply.c
+++ b/third_party/git/apply.c
@@ -32,7 +32,7 @@ static void git_apply_config(void)
 {
 	git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
 	git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
-	git_config(git_default_config, NULL);
+	git_config(git_xmerge_config, NULL);
 }
 
 static int parse_whitespace_option(struct apply_state *state, const char *option)
@@ -450,7 +450,7 @@ static char *find_name_gnu(struct strbuf *root,
 
 	/*
 	 * Proposed "new-style" GNU patch/diff format; see
-	 * https://public-inbox.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/
+	 * https://lore.kernel.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/
 	 */
 	if (unquote_c_style(&name, line, NULL)) {
 		strbuf_release(&name);
@@ -1361,11 +1361,32 @@ int parse_git_diff_header(struct strbuf *root,
 			if (check_header_line(*linenr, patch))
 				return -1;
 			if (res > 0)
-				return offset;
+				goto done;
 			break;
 		}
 	}
 
+done:
+	if (!patch->old_name && !patch->new_name) {
+		if (!patch->def_name) {
+			error(Q_("git diff header lacks filename information when removing "
+				 "%d leading pathname component (line %d)",
+				 "git diff header lacks filename information when removing "
+				 "%d leading pathname components (line %d)",
+				 parse_hdr_state.p_value),
+			      parse_hdr_state.p_value, *linenr);
+			return -128;
+		}
+		patch->old_name = xstrdup(patch->def_name);
+		patch->new_name = xstrdup(patch->def_name);
+	}
+	if ((!patch->new_name && !patch->is_delete) ||
+	    (!patch->old_name && !patch->is_new)) {
+		error(_("git diff header lacks filename information "
+			"(line %d)"), *linenr);
+		return -128;
+	}
+	patch->is_toplevel_relative = 1;
 	return offset;
 }
 
@@ -1546,26 +1567,6 @@ static int find_header(struct apply_state *state,
 				return -128;
 			if (git_hdr_len <= len)
 				continue;
-			if (!patch->old_name && !patch->new_name) {
-				if (!patch->def_name) {
-					error(Q_("git diff header lacks filename information when removing "
-							"%d leading pathname component (line %d)",
-							"git diff header lacks filename information when removing "
-							"%d leading pathname components (line %d)",
-							state->p_value),
-						     state->p_value, state->linenr);
-					return -128;
-				}
-				patch->old_name = xstrdup(patch->def_name);
-				patch->new_name = xstrdup(patch->def_name);
-			}
-			if ((!patch->new_name && !patch->is_delete) ||
-			    (!patch->old_name && !patch->is_new)) {
-				error(_("git diff header lacks filename information "
-					     "(line %d)"), state->linenr);
-				return -128;
-			}
-			patch->is_toplevel_relative = 1;
 			*hdrsize = git_hdr_len;
 			return offset;
 		}
@@ -2661,6 +2662,16 @@ static int find_pos(struct apply_state *state,
 	int backwards_lno, forwards_lno, current_lno;
 
 	/*
+	 * When running with --allow-overlap, it is possible that a hunk is
+	 * seen that pretends to start at the beginning (but no longer does),
+	 * and that *still* needs to match the end. So trust `match_end` more
+	 * than `match_beginning`.
+	 */
+	if (state->allow_overlap && match_beginning && match_end &&
+	    img->nr - preimage->nr != 0)
+		match_beginning = 0;
+
+	/*
 	 * If match_beginning or match_end is specified, there is no
 	 * point starting from a wrong line that will never match and
 	 * wander around and wait for a match at the specified end.
@@ -3146,7 +3157,8 @@ static int apply_binary(struct apply_state *state,
 		 * See if the old one matches what the patch
 		 * applies to.
 		 */
-		hash_object_file(img->buf, img->len, blob_type, &oid);
+		hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
+				 &oid);
 		if (strcmp(oid_to_hex(&oid), patch->old_oid_prefix))
 			return error(_("the patch applies to '%s' (%s), "
 				       "which does not match the "
@@ -3191,7 +3203,8 @@ static int apply_binary(struct apply_state *state,
 				     name);
 
 		/* verify that the result matches */
-		hash_object_file(img->buf, img->len, blob_type, &oid);
+		hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
+				 &oid);
 		if (strcmp(oid_to_hex(&oid), patch->new_oid_prefix))
 			return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
 				name, patch->new_oid_prefix, oid_to_hex(&oid));
@@ -4182,8 +4195,8 @@ static void show_rename_copy(struct patch *p)
 		old_name = slash_old + 1;
 		new_name = slash_new + 1;
 	}
-	/* p->old_name thru old_name is the common prefix, and old_name and new_name
-	 * through the end of names are renames
+	/* p->old_name through old_name is the common prefix, and old_name and
+	 * new_name through the end of names are renames
 	 */
 	if (old_name != p->old_name)
 		printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
@@ -4643,6 +4656,7 @@ static int apply_patch(struct apply_state *state,
 	struct patch *list = NULL, **listp = &list;
 	int skipped_patch = 0;
 	int res = 0;
+	int flush_attributes = 0;
 
 	state->patch_input_file = filename;
 	if (read_patch_file(&buf, fd) < 0)
@@ -4670,6 +4684,14 @@ static int apply_patch(struct apply_state *state,
 			patch_stats(state, patch);
 			*listp = patch;
 			listp = &patch->next;
+
+			if ((patch->new_name &&
+			     ends_with_path_components(patch->new_name,
+						       GITATTRIBUTES_FILE)) ||
+			    (patch->old_name &&
+			     ends_with_path_components(patch->old_name,
+						       GITATTRIBUTES_FILE)))
+				flush_attributes = 1;
 		}
 		else {
 			if (state->apply_verbosity > verbosity_normal)
@@ -4746,6 +4768,8 @@ static int apply_patch(struct apply_state *state,
 	if (state->summary && state->apply_verbosity > verbosity_silent)
 		summary_patch_list(list);
 
+	if (flush_attributes)
+		reset_parsed_attributes();
 end:
 	free_patch_list(list);
 	strbuf_release(&buf);
diff --git a/third_party/git/apply.h b/third_party/git/apply.h
index a7951934352c..da3d95fa5098 100644
--- a/third_party/git/apply.h
+++ b/third_party/git/apply.h
@@ -1,6 +1,7 @@
 #ifndef APPLY_H
 #define APPLY_H
 
+#include "hash.h"
 #include "lockfile.h"
 #include "string-list.h"
 
diff --git a/third_party/git/archive-tar.c b/third_party/git/archive-tar.c
index 3e53aac1e652..5a77701a15c2 100644
--- a/third_party/git/archive-tar.c
+++ b/third_party/git/archive-tar.c
@@ -112,7 +112,7 @@ static void write_trailer(void)
  * queues up writes, so that all our write(2) calls write exactly one
  * full block; pads writes to RECORDSIZE
  */
-static int stream_blocked(const struct object_id *oid)
+static int stream_blocked(struct repository *r, const struct object_id *oid)
 {
 	struct git_istream *st;
 	enum object_type type;
@@ -120,7 +120,7 @@ static int stream_blocked(const struct object_id *oid)
 	char buf[BLOCKSIZE];
 	ssize_t readlen;
 
-	st = open_istream(oid, &type, &sz, NULL);
+	st = open_istream(r, oid, &type, &sz, NULL);
 	if (!st)
 		return error(_("cannot stream blob %s"), oid_to_hex(oid));
 	for (;;) {
@@ -142,19 +142,25 @@ static int stream_blocked(const struct object_id *oid)
  * string and appends it to a struct strbuf.
  */
 static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
-				     const char *value, unsigned int valuelen)
+				     const char *value, size_t valuelen)
 {
-	int len, tmp;
+	size_t orig_len = sb->len;
+	size_t len, tmp;
 
 	/* "%u %s=%s\n" */
 	len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1;
-	for (tmp = len; tmp > 9; tmp /= 10)
+	for (tmp = 1; len / 10 >= tmp; tmp *= 10)
 		len++;
 
 	strbuf_grow(sb, len);
-	strbuf_addf(sb, "%u %s=", len, keyword);
+	strbuf_addf(sb, "%"PRIuMAX" %s=", (uintmax_t)len, keyword);
 	strbuf_add(sb, value, valuelen);
 	strbuf_addch(sb, '\n');
+
+	if (len != sb->len - orig_len)
+		BUG("pax extended header length miscalculated as %"PRIuMAX
+		    ", should be %"PRIuMAX,
+		    (uintmax_t)len, (uintmax_t)(sb->len - orig_len));
 }
 
 /*
@@ -318,7 +324,7 @@ static int write_tar_entry(struct archiver_args *args,
 		if (buffer)
 			write_blocked(buffer, size);
 		else
-			err = stream_blocked(oid);
+			err = stream_blocked(args->repo, oid);
 	}
 	free(buffer);
 	return err;
diff --git a/third_party/git/archive-zip.c b/third_party/git/archive-zip.c
index 4d66b5be6e88..e9f426298b6d 100644
--- a/third_party/git/archive-zip.c
+++ b/third_party/git/archive-zip.c
@@ -24,6 +24,11 @@ static unsigned int max_creator_version;
 #define ZIP_STREAM	(1 <<  3)
 #define ZIP_UTF8	(1 << 11)
 
+enum zip_method {
+	ZIP_METHOD_STORE = 0,
+	ZIP_METHOD_DEFLATE = 8
+};
+
 struct zip_local_header {
 	unsigned char magic[4];
 	unsigned char version[2];
@@ -291,7 +296,7 @@ static int write_zip_entry(struct archiver_args *args,
 	unsigned long attr2;
 	unsigned long compressed_size;
 	unsigned long crc;
-	int method;
+	enum zip_method method;
 	unsigned char *out;
 	void *deflated = NULL;
 	void *buffer;
@@ -320,7 +325,7 @@ static int write_zip_entry(struct archiver_args *args,
 	}
 
 	if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
-		method = 0;
+		method = ZIP_METHOD_STORE;
 		attr2 = 16;
 		out = NULL;
 		size = 0;
@@ -330,17 +335,18 @@ static int write_zip_entry(struct archiver_args *args,
 		enum object_type type = oid_object_info(args->repo, oid,
 							&size);
 
-		method = 0;
+		method = ZIP_METHOD_STORE;
 		attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :
 			(mode & 0111) ? ((mode) << 16) : 0;
 		if (S_ISLNK(mode) || (mode & 0111))
 			creator_version = 0x0317;
 		if (S_ISREG(mode) && args->compression_level != 0 && size > 0)
-			method = 8;
+			method = ZIP_METHOD_DEFLATE;
 
 		if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
 		    size > big_file_threshold) {
-			stream = open_istream(oid, &type, &size, NULL);
+			stream = open_istream(args->repo, oid, &type, &size,
+					      NULL);
 			if (!stream)
 				return error(_("cannot stream blob %s"),
 					     oid_to_hex(oid));
@@ -358,7 +364,7 @@ static int write_zip_entry(struct archiver_args *args,
 						    buffer, size);
 			out = buffer;
 		}
-		compressed_size = (method == 0) ? size : 0;
+		compressed_size = (method == ZIP_METHOD_STORE) ? size : 0;
 	} else {
 		return error(_("unsupported file mode: 0%o (SHA1: %s)"), mode,
 				oid_to_hex(oid));
@@ -367,13 +373,13 @@ static int write_zip_entry(struct archiver_args *args,
 	if (creator_version > max_creator_version)
 		max_creator_version = creator_version;
 
-	if (buffer && method == 8) {
+	if (buffer && method == ZIP_METHOD_DEFLATE) {
 		out = deflated = zlib_deflate_raw(buffer, size,
 						  args->compression_level,
 						  &compressed_size);
 		if (!out || compressed_size >= size) {
 			out = buffer;
-			method = 0;
+			method = ZIP_METHOD_STORE;
 			compressed_size = size;
 		}
 	}
@@ -420,7 +426,7 @@ static int write_zip_entry(struct archiver_args *args,
 		zip_offset += ZIP64_EXTRA_SIZE;
 	}
 
-	if (stream && method == 0) {
+	if (stream && method == ZIP_METHOD_STORE) {
 		unsigned char buf[STREAM_BUFFER_SIZE];
 		ssize_t readlen;
 
@@ -443,7 +449,7 @@ static int write_zip_entry(struct archiver_args *args,
 		zip_offset += compressed_size;
 
 		write_zip_data_desc(size, compressed_size, crc);
-	} else if (stream && method == 8) {
+	} else if (stream && method == ZIP_METHOD_DEFLATE) {
 		unsigned char buf[STREAM_BUFFER_SIZE];
 		ssize_t readlen;
 		git_zstream zstream;
@@ -603,18 +609,18 @@ static void write_zip_trailer(const struct object_id *oid)
 static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time)
 {
 	time_t time;
-	struct tm *t;
+	struct tm tm;
 
 	if (date_overflows(*timestamp))
 		die(_("timestamp too large for this system: %"PRItime),
 		    *timestamp);
 	time = (time_t)*timestamp;
-	t = localtime(&time);
+	localtime_r(&time, &tm);
 	*timestamp = time;
 
-	*dos_date = t->tm_mday + (t->tm_mon + 1) * 32 +
-	            (t->tm_year + 1900 - 1980) * 512;
-	*dos_time = t->tm_sec / 2 + t->tm_min * 32 + t->tm_hour * 2048;
+	*dos_date = tm.tm_mday + (tm.tm_mon + 1) * 32 +
+		    (tm.tm_year + 1900 - 1980) * 512;
+	*dos_time = tm.tm_sec / 2 + tm.tm_min * 32 + tm.tm_hour * 2048;
 }
 
 static int archive_zip_config(const char *var, const char *value, void *data)
diff --git a/third_party/git/argv-array.c b/third_party/git/argv-array.c
index f352ea9357d9..61ef8c0dfd1a 100644
--- a/third_party/git/argv-array.c
+++ b/third_party/git/argv-array.c
@@ -46,7 +46,7 @@ void argv_array_pushl(struct argv_array *array, ...)
 	const char *arg;
 
 	va_start(ap, array);
-	while((arg = va_arg(ap, const char *)))
+	while ((arg = va_arg(ap, const char *)))
 		argv_array_push(array, arg);
 	va_end(ap);
 }
diff --git a/third_party/git/argv-array.h b/third_party/git/argv-array.h
index a39ba43f57ce..a7d3b107077a 100644
--- a/third_party/git/argv-array.h
+++ b/third_party/git/argv-array.h
@@ -1,8 +1,32 @@
 #ifndef ARGV_ARRAY_H
 #define ARGV_ARRAY_H
 
+/**
+ * The argv-array API allows one to dynamically build and store
+ * NULL-terminated lists.  An argv-array maintains the invariant that the
+ * `argv` member always points to a non-NULL array, and that the array is
+ * always NULL-terminated at the element pointed to by `argv[argc]`. This
+ * makes the result suitable for passing to functions expecting to receive
+ * argv from main().
+ *
+ * The string-list API (documented in string-list.h) is similar, but cannot be
+ * used for these purposes; instead of storing a straight string pointer,
+ * it contains an item structure with a `util` field that is not compatible
+ * with the traditional argv interface.
+ *
+ * Each `argv_array` manages its own memory. Any strings pushed into the
+ * array are duplicated, and all memory is freed by argv_array_clear().
+ */
+
 extern const char *empty_argv[];
 
+/**
+ * A single array. This should be initialized by assignment from
+ * `ARGV_ARRAY_INIT`, or by calling `argv_array_init`. The `argv`
+ * member contains the actual array; the `argc` member contains the
+ * number of elements in the array, not including the terminating
+ * NULL.
+ */
 struct argv_array {
 	const char **argv;
 	int argc;
@@ -11,17 +35,55 @@ struct argv_array {
 
 #define ARGV_ARRAY_INIT { empty_argv, 0, 0 }
 
+/**
+ * Initialize an array. This is no different than assigning from
+ * `ARGV_ARRAY_INIT`.
+ */
 void argv_array_init(struct argv_array *);
+
+/* Push a copy of a string onto the end of the array. */
 const char *argv_array_push(struct argv_array *, const char *);
+
+/**
+ * Format a string and push it onto the end of the array. This is a
+ * convenience wrapper combining `strbuf_addf` and `argv_array_push`.
+ */
 __attribute__((format (printf,2,3)))
 const char *argv_array_pushf(struct argv_array *, const char *fmt, ...);
+
+/**
+ * Push a list of strings onto the end of the array. The arguments
+ * should be a list of `const char *` strings, terminated by a NULL
+ * argument.
+ */
 LAST_ARG_MUST_BE_NULL
 void argv_array_pushl(struct argv_array *, ...);
+
+/* Push a null-terminated array of strings onto the end of the array. */
 void argv_array_pushv(struct argv_array *, const char **);
+
+/**
+ * Remove the final element from the array. If there are no
+ * elements in the array, do nothing.
+ */
 void argv_array_pop(struct argv_array *);
+
 /* Splits by whitespace; does not handle quoted arguments! */
 void argv_array_split(struct argv_array *, const char *);
+
+/**
+ * Free all memory associated with the array and return it to the
+ * initial, empty state.
+ */
 void argv_array_clear(struct argv_array *);
+
+/**
+ * Disconnect the `argv` member from the `argv_array` struct and
+ * return it. The caller is responsible for freeing the memory used
+ * by the array, and by the strings it references. After detaching,
+ * the `argv_array` is in a reinitialized state and can be pushed
+ * into again.
+ */
 const char **argv_array_detach(struct argv_array *);
 
 #endif /* ARGV_ARRAY_H */
diff --git a/third_party/git/attr.c b/third_party/git/attr.c
index 93dc16b59cd6..a826b2ef1fab 100644
--- a/third_party/git/attr.c
+++ b/third_party/git/attr.c
@@ -1,7 +1,6 @@
 /*
  * Handle git attributes.  See gitattributes(5) for a description of
- * the file syntax, and Documentation/technical/api-gitattributes.txt
- * for a description of the API.
+ * the file syntax, and attr.h for a description of the API.
  *
  * One basic design decision here is that we are not going to support
  * an insanely large number of attributes.
@@ -62,7 +61,7 @@ static struct attr_hashmap g_attr_hashmap;
 
 /* The container for objects stored in "struct attr_hashmap" */
 struct attr_hash_entry {
-	struct hashmap_entry ent; /* must be the first member! */
+	struct hashmap_entry ent;
 	const char *key; /* the key; memory should be owned by value */
 	size_t keylen; /* length of the key */
 	void *value; /* the stored value */
@@ -70,12 +69,14 @@ struct attr_hash_entry {
 
 /* attr_hashmap comparison function */
 static int attr_hash_entry_cmp(const void *unused_cmp_data,
-			       const void *entry,
-			       const void *entry_or_key,
+			       const struct hashmap_entry *eptr,
+			       const struct hashmap_entry *entry_or_key,
 			       const void *unused_keydata)
 {
-	const struct attr_hash_entry *a = entry;
-	const struct attr_hash_entry *b = entry_or_key;
+	const struct attr_hash_entry *a, *b;
+
+	a = container_of(eptr, const struct attr_hash_entry, ent);
+	b = container_of(entry_or_key, const struct attr_hash_entry, ent);
 	return (a->keylen != b->keylen) || strncmp(a->key, b->key, a->keylen);
 }
 
@@ -98,10 +99,10 @@ static void *attr_hashmap_get(struct attr_hashmap *map,
 	if (!map->map.tablesize)
 		attr_hashmap_init(map);
 
-	hashmap_entry_init(&k, memhash(key, keylen));
+	hashmap_entry_init(&k.ent, memhash(key, keylen));
 	k.key = key;
 	k.keylen = keylen;
-	e = hashmap_get(&map->map, &k, NULL);
+	e = hashmap_get_entry(&map->map, &k, ent, NULL);
 
 	return e ? e->value : NULL;
 }
@@ -117,12 +118,12 @@ static void attr_hashmap_add(struct attr_hashmap *map,
 		attr_hashmap_init(map);
 
 	e = xmalloc(sizeof(struct attr_hash_entry));
-	hashmap_entry_init(e, memhash(key, keylen));
+	hashmap_entry_init(&e->ent, memhash(key, keylen));
 	e->key = key;
 	e->keylen = keylen;
 	e->value = value;
 
-	hashmap_add(&map->map, e);
+	hashmap_add(&map->map, &e->ent);
 }
 
 struct all_attrs_item {
@@ -161,12 +162,12 @@ static void all_attrs_init(struct attr_hashmap *map, struct attr_check *check)
 	if (size != check->all_attrs_nr) {
 		struct attr_hash_entry *e;
 		struct hashmap_iter iter;
-		hashmap_iter_init(&map->map, &iter);
 
 		REALLOC_ARRAY(check->all_attrs, size);
 		check->all_attrs_nr = size;
 
-		while ((e = hashmap_iter_next(&iter))) {
+		hashmap_for_each_entry(&map->map, &iter, e,
+					ent /* member name */) {
 			const struct git_attr *a = e->value;
 			check->all_attrs[a->attr_nr].attr = a;
 		}
@@ -259,7 +260,7 @@ struct pattern {
 	const char *pattern;
 	int patternlen;
 	int nowildcardlen;
-	unsigned flags;		/* EXC_FLAG_* */
+	unsigned flags;		/* PATTERN_FLAG_* */
 };
 
 /*
@@ -400,11 +401,11 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
 		char *p = (char *)&(res->state[num_attr]);
 		memcpy(p, name, namelen);
 		res->u.pat.pattern = p;
-		parse_exclude_pattern(&res->u.pat.pattern,
+		parse_path_pattern(&res->u.pat.pattern,
 				      &res->u.pat.patternlen,
 				      &res->u.pat.flags,
 				      &res->u.pat.nowildcardlen);
-		if (res->u.pat.flags & EXC_FLAG_NEGATIVE) {
+		if (res->u.pat.flags & PATTERN_FLAG_NEGATIVE) {
 			warning(_("Negative patterns are ignored in git attributes\n"
 				  "Use '\\!' for literal leading exclamation."));
 			goto fail_return;
@@ -991,10 +992,10 @@ static int path_matches(const char *pathname, int pathlen,
 	int prefix = pat->nowildcardlen;
 	int isdir = (pathlen && pathname[pathlen - 1] == '/');
 
-	if ((pat->flags & EXC_FLAG_MUSTBEDIR) && !isdir)
+	if ((pat->flags & PATTERN_FLAG_MUSTBEDIR) && !isdir)
 		return 0;
 
-	if (pat->flags & EXC_FLAG_NODIR) {
+	if (pat->flags & PATTERN_FLAG_NODIR) {
 		return match_basename(pathname + basename_offset,
 				      pathlen - basename_offset - isdir,
 				      pattern, prefix,
diff --git a/third_party/git/attr.h b/third_party/git/attr.h
index b0378bfe5fea..404548f028a8 100644
--- a/third_party/git/attr.h
+++ b/third_party/git/attr.h
@@ -1,9 +1,121 @@
 #ifndef ATTR_H
 #define ATTR_H
 
+/**
+ * gitattributes mechanism gives a uniform way to associate various attributes
+ * to set of paths.
+ *
+ *
+ * Querying Specific Attributes
+ * ----------------------------
+ *
+ * - Prepare `struct attr_check` using attr_check_initl() function, enumerating
+ *   the names of attributes whose values you are interested in, terminated with
+ *   a NULL pointer.  Alternatively, an empty `struct attr_check` can be
+ *   prepared by calling `attr_check_alloc()` function and then attributes you
+ *   want to ask about can be added to it with `attr_check_append()` function.
+ *
+ * - Call `git_check_attr()` to check the attributes for the path.
+ *
+ * - Inspect `attr_check` structure to see how each of the attribute in the
+ *   array is defined for the path.
+ *
+ *
+ * Example
+ * -------
+ *
+ * To see how attributes "crlf" and "ident" are set for different paths.
+ *
+ * - Prepare a `struct attr_check` with two elements (because we are checking
+ *   two attributes):
+ *
+ * ------------
+ * static struct attr_check *check;
+ * static void setup_check(void)
+ * {
+ * 	if (check)
+ * 		return; // already done
+ * check = attr_check_initl("crlf", "ident", NULL);
+ * }
+ * ------------
+ *
+ * - Call `git_check_attr()` with the prepared `struct attr_check`:
+ *
+ * ------------
+ * const char *path;
+ *
+ * setup_check();
+ * git_check_attr(path, check);
+ * ------------
+ *
+ * - Act on `.value` member of the result, left in `check->items[]`:
+ *
+ * ------------
+ * const char *value = check->items[0].value;
+ *
+ * if (ATTR_TRUE(value)) {
+ * The attribute is Set, by listing only the name of the
+ * attribute in the gitattributes file for the path.
+ * } else if (ATTR_FALSE(value)) {
+ * The attribute is Unset, by listing the name of the
+ *         attribute prefixed with a dash - for the path.
+ * } else if (ATTR_UNSET(value)) {
+ * The attribute is neither set nor unset for the path.
+ * } else if (!strcmp(value, "input")) {
+ * If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is
+ *         true, the value is a string set in the gitattributes
+ * file for the path by saying "attr=value".
+ * } else if (... other check using value as string ...) {
+ * ...
+ * }
+ * ------------
+ *
+ * To see how attributes in argv[] are set for different paths, only
+ * the first step in the above would be different.
+ *
+ * ------------
+ * static struct attr_check *check;
+ * static void setup_check(const char **argv)
+ * {
+ *     check = attr_check_alloc();
+ *     while (*argv) {
+ *         struct git_attr *attr = git_attr(*argv);
+ *         attr_check_append(check, attr);
+ *         argv++;
+ *     }
+ * }
+ * ------------
+ *
+ *
+ * Querying All Attributes
+ * -----------------------
+ *
+ * To get the values of all attributes associated with a file:
+ *
+ * - Prepare an empty `attr_check` structure by calling `attr_check_alloc()`.
+ *
+ * - Call `git_all_attrs()`, which populates the `attr_check` with the
+ * attributes attached to the path.
+ *
+ * - Iterate over the `attr_check.items[]` array to examine the attribute
+ * names and values. The name of the attribute described by an
+ * `attr_check.items[]` object can be retrieved via
+ * `git_attr_name(check->items[i].attr)`. (Please note that no items will be
+ * returned for unset attributes, so `ATTR_UNSET()` will return false for all
+ * returned `attr_check.items[]` objects.)
+ *
+ * - Free the `attr_check` struct by calling `attr_check_free()`.
+ */
+
 struct index_state;
 
-/* An attribute is a pointer to this opaque structure */
+/**
+ * An attribute is an opaque object that is identified by its name. Pass the
+ * name to `git_attr()` function to obtain the object of this type.
+ * The internal representation of this structure is of no interest to the
+ * calling programs. The name of the attribute can be retrieved by calling
+ * `git_attr_name()`.
+ */
 struct git_attr;
 
 /* opaque structures used internally for attribute collection */
@@ -21,21 +133,36 @@ const struct git_attr *git_attr(const char *);
 extern const char git_attr__true[];
 extern const char git_attr__false[];
 
-/* For public to check git_attr_check results */
+/**
+ * Attribute Values
+ * ----------------
+ *
+ * An attribute for a path can be in one of four states: Set, Unset, Unspecified
+ * or set to a string, and `.value` member of `struct attr_check_item` records
+ * it. The three macros check these, if none of them returns true, `.value`
+ * member points at a string value of the attribute for the path.
+ */
+
+/* Returns true if the attribute is Set for the path. */
 #define ATTR_TRUE(v) ((v) == git_attr__true)
+
+/* Returns true if the attribute is Unset for the path. */
 #define ATTR_FALSE(v) ((v) == git_attr__false)
+
+/* Returns true if the attribute is Unspecified for the path. */
 #define ATTR_UNSET(v) ((v) == NULL)
 
-/*
- * Send one or more git_attr_check to git_check_attrs(), and
- * each 'value' member tells what its value is.
- * Unset one is returned as NULL.
- */
+/* This structure represents one attribute and its value. */
 struct attr_check_item {
 	const struct git_attr *attr;
 	const char *value;
 };
 
+/**
+ * This structure represents a collection of `attr_check_item`. It is passed to
+ * `git_check_attr()` function, specifying the attributes to check, and
+ * receives their values.
+ */
 struct attr_check {
 	int nr;
 	int alloc;
diff --git a/third_party/git/azure-pipelines.yml b/third_party/git/azure-pipelines.yml
index c329b7218bb3..675c3a43c9cc 100644
--- a/third_party/git/azure-pipelines.yml
+++ b/third_party/git/azure-pipelines.yml
@@ -1,12 +1,12 @@
-resources:
-- repo: self
-  fetchDepth: 1
+variables:
+  Agent.Source.Git.ShallowFetchDepth: 1
 
 jobs:
 - job: windows_build
   displayName: Windows Build
   condition: succeeded()
-  pool: Hosted
+  pool:
+    vmImage: windows-latest
   timeoutInMinutes: 240
   steps:
   - powershell: |
@@ -62,7 +62,8 @@ jobs:
   displayName: Windows Test
   dependsOn: windows_build
   condition: succeeded()
-  pool: Hosted
+  pool:
+    vmImage: windows-latest
   timeoutInMinutes: 240
   strategy:
     parallel: 10
@@ -131,10 +132,173 @@ jobs:
       PathtoPublish: t/failed-test-artifacts
       ArtifactName: failed-test-artifacts
 
+- job: vs_build
+  displayName: Visual Studio Build
+  condition: succeeded()
+  pool:
+    vmImage: windows-latest
+  timeoutInMinutes: 240
+  steps:
+  - powershell: |
+      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
+        net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
+        cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
+      }
+    displayName: 'Mount test-cache'
+    env:
+      GITFILESHAREPWD: $(gitfileshare.pwd)
+  - powershell: |
+      $urlbase = "https://dev.azure.com/git-for-windows/git/_apis/build/builds"
+      $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=22&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id
+      $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[1].resource.downloadUrl
+      (New-Object Net.WebClient).DownloadFile($downloadUrl,"git-sdk-64-minimal.zip")
+      Expand-Archive git-sdk-64-minimal.zip -DestinationPath . -Force
+      Remove-Item git-sdk-64-minimal.zip
+
+      # Let Git ignore the SDK and the test-cache
+      "/git-sdk-64-minimal/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude"
+    displayName: 'Download git-sdk-64-minimal'
+  - powershell: |
+      & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
+        make NDEBUG=1 DEVELOPER=1 vcxproj
+      "@
+      if (!$?) { exit(1) }
+    displayName: Generate Visual Studio Solution
+    env:
+      HOME: $(Build.SourcesDirectory)
+      MSYSTEM: MINGW64
+      DEVELOPER: 1
+      NO_PERL: 1
+      GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
+  - powershell: |
+      $urlbase = "https://dev.azure.com/git/git/_apis/build/builds"
+      $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=9&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id
+      $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[0].resource.downloadUrl
+      (New-Object Net.WebClient).DownloadFile($downloadUrl, "compat.zip")
+      Expand-Archive compat.zip -DestinationPath . -Force
+      Remove-Item compat.zip
+    displayName: 'Download vcpkg artifacts'
+  - task: MSBuild@1
+    inputs:
+      solution: git.sln
+      platform: x64
+      configuration: Release
+      maximumCpuCount: 4
+      msbuildArguments: /p:PlatformToolset=v142
+  - powershell: |
+      & compat\vcbuild\vcpkg_copy_dlls.bat release
+      if (!$?) { exit(1) }
+      & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
+        mkdir -p artifacts &&
+        eval \"`$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts | grep ^tar)\"
+      "@
+      if (!$?) { exit(1) }
+    displayName: Bundle artifact tar
+    env:
+      HOME: $(Build.SourcesDirectory)
+      MSYSTEM: MINGW64
+      DEVELOPER: 1
+      NO_PERL: 1
+      MSVC: 1
+      VCPKG_ROOT: $(Build.SourcesDirectory)\compat\vcbuild\vcpkg
+  - powershell: |
+      $tag = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-tag.txt").content
+      $version = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-version.txt").content
+      $url = "https://github.com/git-for-windows/git/releases/download/${tag}/PortableGit-${version}-64-bit.7z.exe"
+      (New-Object Net.WebClient).DownloadFile($url,"PortableGit.exe")
+      & .\PortableGit.exe -y -oartifacts\PortableGit
+      # Wait until it is unpacked
+      while (-not @(Remove-Item -ErrorAction SilentlyContinue PortableGit.exe; $?)) { sleep 1 }
+    displayName: Download & extract portable Git
+  - task: PublishPipelineArtifact@0
+    displayName: 'Publish Pipeline Artifact: MSVC test artifacts'
+    inputs:
+      artifactName: 'vs-artifacts'
+      targetPath: '$(Build.SourcesDirectory)\artifacts'
+  - powershell: |
+      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
+        cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
+      }
+    displayName: 'Unmount test-cache'
+    condition: true
+    env:
+      GITFILESHAREPWD: $(gitfileshare.pwd)
+
+- job: vs_test
+  displayName: Visual Studio Test
+  dependsOn: vs_build
+  condition: succeeded()
+  pool:
+    vmImage: windows-latest
+  timeoutInMinutes: 240
+  strategy:
+    parallel: 10
+  steps:
+  - powershell: |
+      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
+        net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
+        cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
+      }
+    displayName: 'Mount test-cache'
+    env:
+      GITFILESHAREPWD: $(gitfileshare.pwd)
+  - task: DownloadPipelineArtifact@0
+    displayName: 'Download Pipeline Artifact: VS test artifacts'
+    inputs:
+      artifactName: 'vs-artifacts'
+      targetPath: '$(Build.SourcesDirectory)'
+  - powershell: |
+      & PortableGit\git-cmd.exe --command=usr\bin\bash.exe -lc @"
+        test -f artifacts.tar.gz || {
+          echo No test artifacts found\; skipping >&2
+          exit 0
+        }
+        tar xf artifacts.tar.gz || exit 1
+
+        # Let Git ignore the SDK and the test-cache
+        printf '%s\n' /PortableGit/ /test-cache/ >>.git/info/exclude
+
+        cd t &&
+        PATH=\"`$PWD/helper:`$PATH\" &&
+        test-tool.exe run-command testsuite --jobs=10 -V -x --write-junit-xml \
+                `$(test-tool.exe path-utils slice-tests \
+                        `$SYSTEM_JOBPOSITIONINPHASE `$SYSTEM_TOTALJOBSINPHASE t[0-9]*.sh)
+      "@
+      if (!$?) { exit(1) }
+    displayName: 'Test (parallel)'
+    env:
+      HOME: $(Build.SourcesDirectory)
+      MSYSTEM: MINGW64
+      NO_SVN_TESTS: 1
+      GIT_TEST_SKIP_REBASE_P: 1
+  - powershell: |
+      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
+        cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
+      }
+    displayName: 'Unmount test-cache'
+    condition: true
+    env:
+      GITFILESHAREPWD: $(gitfileshare.pwd)
+  - task: PublishTestResults@2
+    displayName: 'Publish Test Results **/TEST-*.xml'
+    inputs:
+      mergeTestResults: true
+      testRunTitle: 'vs'
+      platform: Windows
+      publishRunAttachments: false
+    condition: succeededOrFailed()
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish trash directories of failed tests'
+    condition: failed()
+    inputs:
+      PathtoPublish: t/failed-test-artifacts
+      ArtifactName: failed-vs-test-artifacts
+
 - job: linux_clang
   displayName: linux-clang
   condition: succeeded()
-  pool: Hosted Ubuntu 1604
+  pool:
+    vmImage: ubuntu-latest
   steps:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
@@ -172,7 +336,8 @@ jobs:
 - job: linux_gcc
   displayName: linux-gcc
   condition: succeeded()
-  pool: Hosted Ubuntu 1604
+  pool:
+    vmImage: ubuntu-latest
   steps:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
@@ -209,7 +374,8 @@ jobs:
 - job: osx_clang
   displayName: osx-clang
   condition: succeeded()
-  pool: Hosted macOS
+  pool:
+    vmImage: macOS-latest
   steps:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
@@ -244,7 +410,8 @@ jobs:
 - job: osx_gcc
   displayName: osx-gcc
   condition: succeeded()
-  pool: Hosted macOS
+  pool:
+    vmImage: macOS-latest
   steps:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
@@ -277,7 +444,8 @@ jobs:
 - job: gettext_poison
   displayName: GETTEXT_POISON
   condition: succeeded()
-  pool: Hosted Ubuntu 1604
+  pool:
+    vmImage: ubuntu-latest
   steps:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
@@ -314,7 +482,8 @@ jobs:
 - job: linux32
   displayName: Linux32
   condition: succeeded()
-  pool: Hosted Ubuntu 1604
+  pool:
+    vmImage: ubuntu-latest
   steps:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
@@ -348,13 +517,14 @@ jobs:
 - job: static_analysis
   displayName: StaticAnalysis
   condition: succeeded()
-  pool: Hosted Ubuntu 1604
+  pool:
+    vmImage: ubuntu-latest
   steps:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
 
        sudo apt-get update &&
-       sudo apt-get install -y coccinelle &&
+       sudo apt-get install -y coccinelle libcurl4-openssl-dev libssl-dev libexpat-dev gettext &&
 
        export jobname=StaticAnalysis &&
 
@@ -368,13 +538,14 @@ jobs:
 - job: documentation
   displayName: Documentation
   condition: succeeded()
-  pool: Hosted Ubuntu 1604
+  pool:
+    vmImage: ubuntu-latest
   steps:
   - bash: |
        test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
 
        sudo apt-get update &&
-       sudo apt-get install -y asciidoc xmlto asciidoctor &&
+       sudo apt-get install -y asciidoc xmlto asciidoctor docbook-xsl-ns &&
 
        export ALREADY_HAVE_ASCIIDOCTOR=yes. &&
        export jobname=Documentation &&
diff --git a/third_party/git/banned.h b/third_party/git/banned.h
index 447af24807f4..60a18d44033b 100644
--- a/third_party/git/banned.h
+++ b/third_party/git/banned.h
@@ -26,7 +26,7 @@
 #define vsprintf(...) BANNED(vsprintf)
 #else
 #define sprintf(buf,fmt,arg) BANNED(sprintf)
-#define vsprintf(buf,fmt,arg) BANNED(sprintf)
+#define vsprintf(buf,fmt,arg) BANNED(vsprintf)
 #endif
 
 #endif /* BANNED_H */
diff --git a/third_party/git/bisect.c b/third_party/git/bisect.c
index e87ac29a51be..9154f810f76a 100644
--- a/third_party/git/bisect.c
+++ b/third_party/git/bisect.c
@@ -572,7 +572,7 @@ static int sqrti(int val)
 {
 	float d, x = val;
 
-	if (val == 0)
+	if (!val)
 		return 0;
 
 	do {
@@ -661,11 +661,11 @@ static void bisect_common(struct rev_info *revs)
 		mark_edges_uninteresting(revs, NULL, 0);
 }
 
-static void exit_if_skipped_commits(struct commit_list *tried,
+static enum bisect_error error_if_skipped_commits(struct commit_list *tried,
 				    const struct object_id *bad)
 {
 	if (!tried)
-		return;
+		return BISECT_OK;
 
 	printf("There are only 'skip'ped commits left to test.\n"
 	       "The first %s commit could be any of:\n", term_bad);
@@ -676,7 +676,8 @@ static void exit_if_skipped_commits(struct commit_list *tried,
 	if (bad)
 		printf("%s\n", oid_to_hex(bad));
 	printf(_("We cannot bisect more!\n"));
-	exit(2);
+
+	return BISECT_ONLY_SKIPPED_LEFT;
 }
 
 static int is_expected_rev(const struct object_id *oid)
@@ -703,11 +704,12 @@ static int is_expected_rev(const struct object_id *oid)
 	return res;
 }
 
-static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
+static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
 {
 	char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
+	enum bisect_error res = BISECT_OK;
 
-	memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
+	memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), the_hash_algo->hexsz + 1);
 	update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
 
 	argv_checkout[2] = bisect_rev_hex;
@@ -715,14 +717,24 @@ static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
 		update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
 			   UPDATE_REFS_DIE_ON_ERR);
 	} else {
-		int res;
 		res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
 		if (res)
-			exit(res);
+			/*
+			 * Errors in `run_command()` itself, signaled by res < 0,
+			 * and errors in the child process, signaled by res > 0
+			 * can both be treated as regular BISECT_FAILURE (-1).
+			 */
+			return -abs(res);
 	}
 
 	argv_show_branch[1] = bisect_rev_hex;
-	return run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
+	res = run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
+	/*
+	 * Errors in `run_command()` itself, signaled by res < 0,
+	 * and errors in the child process, signaled by res > 0
+	 * can both be treated as regular BISECT_FAILURE (-1).
+	 */
+	return -abs(res);
 }
 
 static struct commit *get_commit_reference(struct repository *r,
@@ -749,7 +761,7 @@ static struct commit **get_bad_and_good_commits(struct repository *r,
 	return rev;
 }
 
-static void handle_bad_merge_base(void)
+static enum bisect_error handle_bad_merge_base(void)
 {
 	if (is_expected_rev(current_bad_oid)) {
 		char *bad_hex = oid_to_hex(current_bad_oid);
@@ -770,14 +782,14 @@ static void handle_bad_merge_base(void)
 				"between %s and [%s].\n"),
 				bad_hex, term_bad, term_good, bad_hex, good_hex);
 		}
-		exit(3);
+		return BISECT_MERGE_BASE_CHECK;
 	}
 
 	fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n"
 		"git bisect cannot work properly in this case.\n"
 		"Maybe you mistook %s and %s revs?\n"),
 		term_good, term_bad, term_good, term_bad);
-	exit(1);
+	return BISECT_FAILED;
 }
 
 static void handle_skipped_merge_base(const struct object_id *mb)
@@ -799,13 +811,18 @@ static void handle_skipped_merge_base(const struct object_id *mb)
  * "check_merge_bases" checks that merge bases are not "bad" (or "new").
  *
  * - If one is "bad" (or "new"), it means the user assumed something wrong
- * and we must exit with a non 0 error code.
+ * and we must return error with a non 0 error code.
  * - If one is "good" (or "old"), that's good, we have nothing to do.
  * - If one is "skipped", we can't know but we should warn.
  * - If we don't know, we should check it out and ask the user to test.
+ * - If a merge base must be tested, on success return
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition
+ * for early success, this will be converted back to 0 in
+ * check_good_are_ancestors_of_bad().
  */
-static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
+static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
 {
+	enum bisect_error res = BISECT_OK;
 	struct commit_list *result;
 
 	result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
@@ -813,18 +830,24 @@ static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
 	for (; result; result = result->next) {
 		const struct object_id *mb = &result->item->object.oid;
 		if (oideq(mb, current_bad_oid)) {
-			handle_bad_merge_base();
+			res = handle_bad_merge_base();
+			break;
 		} else if (0 <= oid_array_lookup(&good_revs, mb)) {
 			continue;
 		} else if (0 <= oid_array_lookup(&skipped_revs, mb)) {
 			handle_skipped_merge_base(mb);
 		} else {
 			printf(_("Bisecting: a merge base must be tested\n"));
-			exit(bisect_checkout(mb, no_checkout));
+			res = bisect_checkout(mb, no_checkout);
+			if (!res)
+				/* indicate early success */
+				res = BISECT_INTERNAL_SUCCESS_MERGE_BASE;
+			break;
 		}
 	}
 
 	free_commit_list(result);
+	return res;
 }
 
 static int check_ancestors(struct repository *r, int rev_nr,
@@ -850,43 +873,58 @@ static int check_ancestors(struct repository *r, int rev_nr,
  *
  * If that's not the case, we need to check the merge bases.
  * If a merge base must be tested by the user, its source code will be
- * checked out to be tested by the user and we will exit.
+ * checked out to be tested by the user and we will return.
  */
-static void check_good_are_ancestors_of_bad(struct repository *r,
+
+static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r,
 					    const char *prefix,
 					    int no_checkout)
 {
-	char *filename = git_pathdup("BISECT_ANCESTORS_OK");
+	char *filename;
 	struct stat st;
 	int fd, rev_nr;
+	enum bisect_error res = BISECT_OK;
 	struct commit **rev;
 
 	if (!current_bad_oid)
-		die(_("a %s revision is needed"), term_bad);
+		return error(_("a %s revision is needed"), term_bad);
+
+	filename = git_pathdup("BISECT_ANCESTORS_OK");
 
 	/* Check if file BISECT_ANCESTORS_OK exists. */
 	if (!stat(filename, &st) && S_ISREG(st.st_mode))
 		goto done;
 
 	/* Bisecting with no good rev is ok. */
-	if (good_revs.nr == 0)
+	if (!good_revs.nr)
 		goto done;
 
 	/* Check if all good revs are ancestor of the bad rev. */
+
 	rev = get_bad_and_good_commits(r, &rev_nr);
 	if (check_ancestors(r, rev_nr, rev, prefix))
-		check_merge_bases(rev_nr, rev, no_checkout);
+		res = check_merge_bases(rev_nr, rev, no_checkout);
 	free(rev);
 
-	/* Create file BISECT_ANCESTORS_OK. */
-	fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
-	if (fd < 0)
-		warning_errno(_("could not create file '%s'"),
-			      filename);
-	else
-		close(fd);
+	if (!res) {
+		/* Create file BISECT_ANCESTORS_OK. */
+		fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
+		if (fd < 0)
+			/*
+			 * BISECT_ANCESTORS_OK file is not absolutely necessary,
+			 * the bisection process will continue at the next
+			 * bisection step.
+			 * So, just signal with a warning that something
+			 * might be wrong.
+			 */
+			warning_errno(_("could not create file '%s'"),
+				filename);
+		else
+			close(fd);
+	}
  done:
 	free(filename);
+	return res;
 }
 
 /*
@@ -938,18 +976,19 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
 }
 
 /*
- * We use the convention that exiting with an exit code 10 means that
+ * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means
  * the bisection process finished successfully.
- * In this case the calling shell script should exit 0.
- *
+ * In this case the calling function or command should not turn a
+ * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code.
  * If no_checkout is non-zero, the bisection process does not
  * checkout the trial commit but instead simply updates BISECT_HEAD.
  */
-int bisect_next_all(struct repository *r, const char *prefix, int no_checkout)
+enum bisect_error bisect_next_all(struct repository *r, const char *prefix, int no_checkout)
 {
 	struct rev_info revs;
 	struct commit_list *tried;
 	int reaches = 0, all = 0, nr, steps;
+	enum bisect_error res = BISECT_OK;
 	struct object_id *bisect_rev;
 	char *steps_msg;
 
@@ -957,7 +996,9 @@ int bisect_next_all(struct repository *r, const char *prefix, int no_checkout)
 	if (read_bisect_refs())
 		die(_("reading bisect refs failed"));
 
-	check_good_are_ancestors_of_bad(r, prefix, no_checkout);
+	res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
+	if (res)
+		return res;
 
 	bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1);
 	revs.limited = 1;
@@ -969,33 +1010,45 @@ int bisect_next_all(struct repository *r, const char *prefix, int no_checkout)
 
 	if (!revs.commits) {
 		/*
-		 * We should exit here only if the "bad"
+		 * We should return error here only if the "bad"
 		 * commit is also a "skip" commit.
 		 */
-		exit_if_skipped_commits(tried, NULL);
-
+		res = error_if_skipped_commits(tried, NULL);
+		if (res < 0)
+			return res;
 		printf(_("%s was both %s and %s\n"),
 		       oid_to_hex(current_bad_oid),
 		       term_good,
 		       term_bad);
-		exit(1);
+
+		return BISECT_FAILED;
 	}
 
 	if (!all) {
 		fprintf(stderr, _("No testable commit found.\n"
 			"Maybe you started with bad path parameters?\n"));
-		exit(4);
+
+		return BISECT_NO_TESTABLE_COMMIT;
 	}
 
 	bisect_rev = &revs.commits->item->object.oid;
 
 	if (oideq(bisect_rev, current_bad_oid)) {
-		exit_if_skipped_commits(tried, current_bad_oid);
+		res = error_if_skipped_commits(tried, current_bad_oid);
+		if (res)
+			return res;
 		printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
 			term_bad);
+
 		show_diff_tree(r, prefix, revs.commits->item);
-		/* This means the bisection process succeeded. */
-		exit(10);
+		/*
+		 * This means the bisection process succeeded.
+		 * Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10)
+		 * so that the call chain can simply check
+		 * for negative return values for early returns up
+		 * until the cmd_bisect__helper() caller.
+		 */
+		return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
 	}
 
 	nr = all - reaches - 1;
diff --git a/third_party/git/bisect.h b/third_party/git/bisect.h
index 4e69a11ea8f3..8bad8d839154 100644
--- a/third_party/git/bisect.h
+++ b/third_party/git/bisect.h
@@ -31,7 +31,34 @@ struct rev_list_info {
 	const char *header_prefix;
 };
 
-int bisect_next_all(struct repository *r,
+/*
+ * enum bisect_error represents the following return codes:
+ * BISECT_OK: success code. Internally, it means that next
+ * commit has been found (and possibly checked out) and it
+ * should be tested.
+ * BISECT_FAILED error code: default error code.
+ * BISECT_ONLY_SKIPPED_LEFT error code: only skipped
+ * commits left to be tested.
+ * BISECT_MERGE_BASE_CHECK error code: merge base check failed.
+ * BISECT_NO_TESTABLE_COMMIT error code: no testable commit found.
+ * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND early success code:
+ * first term_bad commit found.
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE early success
+ * code: found merge base that should be tested.
+ * Early success codes BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND and
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE should be only internal codes.
+ */
+enum bisect_error {
+	BISECT_OK = 0,
+	BISECT_FAILED = -1,
+	BISECT_ONLY_SKIPPED_LEFT = -2,
+	BISECT_MERGE_BASE_CHECK = -3,
+	BISECT_NO_TESTABLE_COMMIT = -4,
+	BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND = -10,
+	BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
+};
+
+enum bisect_error bisect_next_all(struct repository *r,
 		    const char *prefix,
 		    int no_checkout);
 
diff --git a/third_party/git/blame.c b/third_party/git/blame.c
index 36a2e7ef119d..29770e5c81c0 100644
--- a/third_party/git/blame.c
+++ b/third_party/git/blame.c
@@ -144,7 +144,7 @@ static void append_merge_parents(struct repository *r,
 
 	while (!strbuf_getwholeline_fd(&line, merge_head, '\n')) {
 		struct object_id oid;
-		if (line.len < GIT_SHA1_HEXSZ || get_oid_hex(line.buf, &oid))
+		if (get_oid_hex(line.buf, &oid))
 			die("unknown line in '%s': %s",
 			    git_path_merge_head(r), line.buf);
 		tail = append_parent(r, tail, &oid);
@@ -417,14 +417,15 @@ static void get_fingerprint(struct fingerprint *result,
 		/* Ignore whitespace pairs */
 		if (hash == 0)
 			continue;
-		hashmap_entry_init(entry, hash);
+		hashmap_entry_init(&entry->entry, hash);
 
-		found_entry = hashmap_get(&result->map, entry, NULL);
+		found_entry = hashmap_get_entry(&result->map, entry,
+						/* member name */ entry, NULL);
 		if (found_entry) {
 			found_entry->count += 1;
 		} else {
 			entry->count = 1;
-			hashmap_add(&result->map, entry);
+			hashmap_add(&result->map, &entry->entry);
 			++entry;
 		}
 	}
@@ -432,7 +433,7 @@ static void get_fingerprint(struct fingerprint *result,
 
 static void free_fingerprint(struct fingerprint *f)
 {
-	hashmap_free(&f->map, 0);
+	hashmap_free(&f->map);
 	free(f->entries);
 }
 
@@ -449,10 +450,10 @@ static int fingerprint_similarity(struct fingerprint *a, struct fingerprint *b)
 	struct hashmap_iter iter;
 	const struct fingerprint_entry *entry_a, *entry_b;
 
-	hashmap_iter_init(&b->map, &iter);
-
-	while ((entry_b = hashmap_iter_next(&iter))) {
-		if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) {
+	hashmap_for_each_entry(&b->map, &iter, entry_b,
+				entry /* member name */) {
+		entry_a = hashmap_get_entry(&a->map, entry_b, entry, NULL);
+		if (entry_a) {
 			intersection += entry_a->count < entry_b->count ?
 					entry_a->count : entry_b->count;
 		}
@@ -470,10 +471,12 @@ static void fingerprint_subtract(struct fingerprint *a, struct fingerprint *b)
 
 	hashmap_iter_init(&b->map, &iter);
 
-	while ((entry_b = hashmap_iter_next(&iter))) {
-		if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) {
+	hashmap_for_each_entry(&b->map, &iter, entry_b,
+				entry /* member name */) {
+		entry_a = hashmap_get_entry(&a->map, entry_b, entry, NULL);
+		if (entry_a) {
 			if (entry_a->count <= entry_b->count)
-				hashmap_remove(&a->map, entry_b, NULL);
+				hashmap_remove(&a->map, &entry_b->entry, NULL);
 			else
 				entry_a->count -= entry_b->count;
 		}
diff --git a/third_party/git/blame.h b/third_party/git/blame.h
index 4a9e1270b036..089b181ff27b 100644
--- a/third_party/git/blame.h
+++ b/third_party/git/blame.h
@@ -16,6 +16,8 @@
 #define BLAME_DEFAULT_MOVE_SCORE	20
 #define BLAME_DEFAULT_COPY_SCORE	40
 
+struct fingerprint;
+
 /*
  * One blob in a commit that is being suspected
  */
@@ -52,7 +54,7 @@ struct blame_origin {
 	struct blame_entry *suspects;
 	mmfile_t file;
 	int num_lines;
-	void *fingerprints;
+	struct fingerprint *fingerprints;
 	struct object_id blob_oid;
 	unsigned short mode;
 	/* guilty gets set when shipping any suspects to the final
diff --git a/third_party/git/builtin.h b/third_party/git/builtin.h
index 5cf5df69f72f..2b25a80cde37 100644
--- a/third_party/git/builtin.h
+++ b/third_party/git/builtin.h
@@ -225,6 +225,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix);
 int cmd_show(int argc, const char **argv, const char *prefix);
 int cmd_show_branch(int argc, const char **argv, const char *prefix);
 int cmd_show_index(int argc, const char **argv, const char *prefix);
+int cmd_sparse_checkout(int argc, const char **argv, const char *prefix);
 int cmd_status(int argc, const char **argv, const char *prefix);
 int cmd_stash(int argc, const char **argv, const char *prefix);
 int cmd_stripspace(int argc, const char **argv, const char *prefix);
diff --git a/third_party/git/builtin/add.c b/third_party/git/builtin/add.c
index dd18e5c9b670..18a0881ecf95 100644
--- a/third_party/git/builtin/add.c
+++ b/third_party/git/builtin/add.c
@@ -20,6 +20,7 @@
 #include "bulk-checkin.h"
 #include "argv-array.h"
 #include "submodule.h"
+#include "add-interactive.h"
 
 static const char * const builtin_add_usage[] = {
 	N_("git add [<options>] [--] <pathspec>..."),
@@ -28,6 +29,9 @@ static const char * const builtin_add_usage[] = {
 static int patch_interactive, add_interactive, edit_interactive;
 static int take_worktree_changes;
 static int add_renormalize;
+static int pathspec_file_nul;
+static const char *pathspec_from_file;
+static int legacy_stash_p; /* support for the scripted `git stash` */
 
 struct update_callback_data {
 	int flags;
@@ -185,6 +189,34 @@ int run_add_interactive(const char *revision, const char *patch_mode,
 {
 	int status, i;
 	struct argv_array argv = ARGV_ARRAY_INIT;
+	int use_builtin_add_i =
+		git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1);
+
+	if (use_builtin_add_i < 0)
+		git_config_get_bool("add.interactive.usebuiltin",
+				    &use_builtin_add_i);
+
+	if (use_builtin_add_i == 1) {
+		enum add_p_mode mode;
+
+		if (!patch_mode)
+			return !!run_add_i(the_repository, pathspec);
+
+		if (!strcmp(patch_mode, "--patch"))
+			mode = ADD_P_ADD;
+		else if (!strcmp(patch_mode, "--patch=stash"))
+			mode = ADD_P_STASH;
+		else if (!strcmp(patch_mode, "--patch=reset"))
+			mode = ADD_P_RESET;
+		else if (!strcmp(patch_mode, "--patch=checkout"))
+			mode = ADD_P_CHECKOUT;
+		else if (!strcmp(patch_mode, "--patch=worktree"))
+			mode = ADD_P_WORKTREE;
+		else
+			die("'%s' not supported", patch_mode);
+
+		return !!run_add_p(the_repository, mode, revision, pathspec);
+	}
 
 	argv_array_push(&argv, "add--interactive");
 	if (patch_mode)
@@ -309,6 +341,10 @@ static struct option builtin_add_options[] = {
 		   N_("override the executable bit of the listed files")),
 	OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo,
 			N_("warn when adding an embedded repository")),
+	OPT_HIDDEN_BOOL(0, "legacy-stash-p", &legacy_stash_p,
+			N_("backend for `git stash -p`")),
+	OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+	OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 	OPT_END(),
 };
 
@@ -319,6 +355,7 @@ static int add_config(const char *var, const char *value, void *cb)
 		ignore_add_errors = git_config_bool(var, value);
 		return 0;
 	}
+
 	return git_default_config(var, value, cb);
 }
 
@@ -369,7 +406,10 @@ static int add_files(struct dir_struct *dir, int flags)
 		fprintf(stderr, _(ignore_error));
 		for (i = 0; i < dir->ignored_nr; i++)
 			fprintf(stderr, "%s\n", dir->ignored[i]->name);
-		fprintf(stderr, _("Use -f if you really want to add them.\n"));
+		if (advice_add_ignored_file)
+			advise(_("Use -f if you really want to add them.\n"
+				"Turn this message off by running\n"
+				"\"git config advice.addIgnoredFile false\""));
 		exit_status = 1;
 	}
 
@@ -402,11 +442,28 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 			  builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
 	if (patch_interactive)
 		add_interactive = 1;
-	if (add_interactive)
+	if (add_interactive) {
+		if (pathspec_from_file)
+			die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
 		exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive));
+	}
+	if (legacy_stash_p) {
+		struct pathspec pathspec;
+
+		parse_pathspec(&pathspec, 0,
+			PATHSPEC_PREFER_FULL |
+			PATHSPEC_SYMLINK_LEADING_PATH |
+			PATHSPEC_PREFIX_ORIGIN,
+			prefix, argv);
+
+		return run_add_interactive(NULL, "--patch=stash", &pathspec);
+	}
 
-	if (edit_interactive)
+	if (edit_interactive) {
+		if (pathspec_from_file)
+			die(_("--pathspec-from-file is incompatible with --edit"));
 		return(edit_patch(argc, argv, prefix));
+	}
 	argc--;
 	argv++;
 
@@ -418,10 +475,6 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	if (addremove && take_worktree_changes)
 		die(_("-A and -u are mutually incompatible"));
 
-	if (!take_worktree_changes && addremove_explicit < 0 && argc)
-		/* Turn "git add pathspec..." to "git add -A pathspec..." */
-		addremove = 1;
-
 	if (!show_only && ignore_missing)
 		die(_("Option --ignore-missing can only be used together with --dry-run"));
 
@@ -434,19 +487,6 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 
 	hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
 
-	flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
-		 (show_only ? ADD_CACHE_PRETEND : 0) |
-		 (intent_to_add ? ADD_CACHE_INTENT : 0) |
-		 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
-		 (!(addremove || take_worktree_changes)
-		  ? ADD_CACHE_IGNORE_REMOVAL : 0));
-
-	if (require_pathspec && argc == 0) {
-		fprintf(stderr, _("Nothing specified, nothing added.\n"));
-		fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
-		return 0;
-	}
-
 	/*
 	 * Check the "pathspec '%s' did not match any files" block
 	 * below before enabling new magic.
@@ -456,6 +496,38 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		       PATHSPEC_SYMLINK_LEADING_PATH,
 		       prefix, argv);
 
+	if (pathspec_from_file) {
+		if (pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		parse_pathspec_file(&pathspec, PATHSPEC_ATTR,
+				    PATHSPEC_PREFER_FULL |
+				    PATHSPEC_SYMLINK_LEADING_PATH,
+				    prefix, pathspec_from_file, pathspec_file_nul);
+	} else if (pathspec_file_nul) {
+		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+	}
+
+	if (require_pathspec && pathspec.nr == 0) {
+		fprintf(stderr, _("Nothing specified, nothing added.\n"));
+		if (advice_add_empty_pathspec)
+			advise( _("Maybe you wanted to say 'git add .'?\n"
+				"Turn this message off by running\n"
+				"\"git config advice.addEmptyPathspec false\""));
+		return 0;
+	}
+
+	if (!take_worktree_changes && addremove_explicit < 0 && pathspec.nr)
+		/* Turn "git add pathspec..." to "git add -A pathspec..." */
+		addremove = 1;
+
+	flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
+		 (show_only ? ADD_CACHE_PRETEND : 0) |
+		 (intent_to_add ? ADD_CACHE_INTENT : 0) |
+		 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
+		 (!(addremove || take_worktree_changes)
+		  ? ADD_CACHE_IGNORE_REMOVAL : 0));
+
 	if (read_cache_preload(&pathspec) < 0)
 		die(_("index file corrupt"));
 
diff --git a/third_party/git/builtin/am.c b/third_party/git/builtin/am.c
index 1aea657a7f0b..e3dfd93c258f 100644
--- a/third_party/git/builtin/am.c
+++ b/third_party/git/builtin/am.c
@@ -24,7 +24,6 @@
 #include "sequencer.h"
 #include "revision.h"
 #include "merge-recursive.h"
-#include "revision.h"
 #include "log-tree.h"
 #include "notes-utils.h"
 #include "rerere.h"
@@ -82,6 +81,11 @@ enum signoff_type {
 	SIGNOFF_EXPLICIT /* --signoff was set on the command-line */
 };
 
+enum show_patch_type {
+	SHOW_PATCH_RAW = 0,
+	SHOW_PATCH_DIFF = 1,
+};
+
 struct am_state {
 	/* state directory path */
 	char *dir;
@@ -1072,19 +1076,6 @@ static const char *msgnum(const struct am_state *state)
 }
 
 /**
- * Refresh and write index.
- */
-static void refresh_and_write_cache(void)
-{
-	struct lock_file lock_file = LOCK_INIT;
-
-	hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
-	refresh_cache(REFRESH_QUIET);
-	if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
-		die(_("unable to write index file"));
-}
-
-/**
  * Dies with a user-friendly message on how to proceed after resolving the
  * problem. This message can be overridden with state->resolvemsg.
  */
@@ -1272,7 +1263,9 @@ static void get_commit_info(struct am_state *state, struct commit *commit)
 	buffer = logmsg_reencode(commit, NULL, get_commit_output_encoding());
 
 	ident_line = find_commit_header(buffer, "author", &ident_len);
-
+	if (!ident_line)
+		die(_("missing author line in commit %s"),
+		      oid_to_hex(&commit->object.oid));
 	if (split_ident_line(&id, ident_line, ident_len) < 0)
 		die(_("invalid ident line: %.*s"), (int)ident_len, ident_line);
 
@@ -1538,7 +1531,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
 	o.branch1 = "HEAD";
 	their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg);
 	o.branch2 = their_tree_name;
-	o.detect_directory_renames = 0;
+	o.detect_directory_renames = MERGE_DIRECTORY_RENAMES_NONE;
 
 	if (state->quiet)
 		o.verbosity = 0;
@@ -1703,7 +1696,8 @@ static void am_run(struct am_state *state, int resume)
 
 	unlink(am_path(state, "dirtyindex"));
 
-	refresh_and_write_cache();
+	if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0)
+		die(_("unable to write index file"));
 
 	if (repo_index_has_changes(the_repository, NULL, &sb)) {
 		write_state_bool(state, "dirtyindex", 1);
@@ -1774,7 +1768,7 @@ static void am_run(struct am_state *state, int resume)
 				linelen(state->msg), state->msg);
 
 			if (advice_amworkdir)
-				advise(_("Use 'git am --show-current-patch' to see the failed patch"));
+				advise(_("Use 'git am --show-current-patch=diff' to see the failed patch"));
 
 			die_user_resolve(state);
 		}
@@ -2072,7 +2066,7 @@ static void am_abort(struct am_state *state)
 	am_destroy(state);
 }
 
-static int show_patch(struct am_state *state)
+static int show_patch(struct am_state *state, enum show_patch_type sub_mode)
 {
 	struct strbuf sb = STRBUF_INIT;
 	const char *patch_path;
@@ -2089,7 +2083,17 @@ static int show_patch(struct am_state *state)
 		return ret;
 	}
 
-	patch_path = am_path(state, msgnum(state));
+	switch (sub_mode) {
+	case SHOW_PATCH_RAW:
+		patch_path = am_path(state, msgnum(state));
+		break;
+	case SHOW_PATCH_DIFF:
+		patch_path = am_path(state, "patch");
+		break;
+	default:
+		BUG("invalid mode for --show-current-patch");
+	}
+
 	len = strbuf_read_file(&sb, patch_path, 0);
 	if (len < 0)
 		die_errno(_("failed to read '%s'"), patch_path);
@@ -2129,7 +2133,7 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int
 	return 0;
 }
 
-enum resume_mode {
+enum resume_type {
 	RESUME_FALSE = 0,
 	RESUME_APPLY,
 	RESUME_RESOLVED,
@@ -2139,6 +2143,45 @@ enum resume_mode {
 	RESUME_SHOW_PATCH
 };
 
+struct resume_mode {
+	enum resume_type mode;
+	enum show_patch_type sub_mode;
+};
+
+static int parse_opt_show_current_patch(const struct option *opt, const char *arg, int unset)
+{
+	int *opt_value = opt->value;
+	struct resume_mode *resume = container_of(opt_value, struct resume_mode, mode);
+
+	/*
+	 * Please update $__git_showcurrentpatch in git-completion.bash
+	 * when you add new options
+	 */
+	const char *valid_modes[] = {
+		[SHOW_PATCH_DIFF] = "diff",
+		[SHOW_PATCH_RAW] = "raw"
+	};
+	int new_value = SHOW_PATCH_RAW;
+
+	if (arg) {
+		for (new_value = 0; new_value < ARRAY_SIZE(valid_modes); new_value++) {
+			if (!strcmp(arg, valid_modes[new_value]))
+				break;
+		}
+		if (new_value >= ARRAY_SIZE(valid_modes))
+			return error(_("Invalid value for --show-current-patch: %s"), arg);
+	}
+
+	if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode)
+		return error(_("--show-current-patch=%s is incompatible with "
+			       "--show-current-patch=%s"),
+			     arg, valid_modes[resume->sub_mode]);
+
+	resume->mode = RESUME_SHOW_PATCH;
+	resume->sub_mode = new_value;
+	return 0;
+}
+
 static int git_am_config(const char *k, const char *v, void *cb)
 {
 	int status;
@@ -2156,7 +2199,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 	int binary = -1;
 	int keep_cr = -1;
 	int patch_format = PATCH_FORMAT_UNKNOWN;
-	enum resume_mode resume = RESUME_FALSE;
+	struct resume_mode resume = { .mode = RESUME_FALSE };
 	int in_progress;
 	int ret = 0;
 
@@ -2225,24 +2268,26 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 			PARSE_OPT_NOARG),
 		OPT_STRING(0, "resolvemsg", &state.resolvemsg, NULL,
 			N_("override error message when patch failure occurs")),
-		OPT_CMDMODE(0, "continue", &resume,
+		OPT_CMDMODE(0, "continue", &resume.mode,
 			N_("continue applying patches after resolving a conflict"),
 			RESUME_RESOLVED),
-		OPT_CMDMODE('r', "resolved", &resume,
+		OPT_CMDMODE('r', "resolved", &resume.mode,
 			N_("synonyms for --continue"),
 			RESUME_RESOLVED),
-		OPT_CMDMODE(0, "skip", &resume,
+		OPT_CMDMODE(0, "skip", &resume.mode,
 			N_("skip the current patch"),
 			RESUME_SKIP),
-		OPT_CMDMODE(0, "abort", &resume,
+		OPT_CMDMODE(0, "abort", &resume.mode,
 			N_("restore the original branch and abort the patching operation."),
 			RESUME_ABORT),
-		OPT_CMDMODE(0, "quit", &resume,
+		OPT_CMDMODE(0, "quit", &resume.mode,
 			N_("abort the patching operation but keep HEAD where it is."),
 			RESUME_QUIT),
-		OPT_CMDMODE(0, "show-current-patch", &resume,
-			N_("show the patch being applied."),
-			RESUME_SHOW_PATCH),
+		{ OPTION_CALLBACK, 0, "show-current-patch", &resume.mode,
+		  "(diff|raw)",
+		  N_("show the patch being applied"),
+		  PARSE_OPT_CMDMODE | PARSE_OPT_OPTARG | PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
+		  parse_opt_show_current_patch, RESUME_SHOW_PATCH },
 		OPT_BOOL(0, "committer-date-is-author-date",
 			&state.committer_date_is_author_date,
 			N_("lie about committer date")),
@@ -2292,12 +2337,12 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		 *    intend to feed us a patch but wanted to continue
 		 *    unattended.
 		 */
-		if (argc || (resume == RESUME_FALSE && !isatty(0)))
+		if (argc || (resume.mode == RESUME_FALSE && !isatty(0)))
 			die(_("previous rebase directory %s still exists but mbox given."),
 				state.dir);
 
-		if (resume == RESUME_FALSE)
-			resume = RESUME_APPLY;
+		if (resume.mode == RESUME_FALSE)
+			resume.mode = RESUME_APPLY;
 
 		if (state.signoff == SIGNOFF_EXPLICIT)
 			am_append_signoff(&state);
@@ -2311,7 +2356,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		 * stray directories.
 		 */
 		if (file_exists(state.dir) && !state.rebasing) {
-			if (resume == RESUME_ABORT || resume == RESUME_QUIT) {
+			if (resume.mode == RESUME_ABORT || resume.mode == RESUME_QUIT) {
 				am_destroy(&state);
 				am_state_release(&state);
 				return 0;
@@ -2322,7 +2367,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 				state.dir);
 		}
 
-		if (resume)
+		if (resume.mode)
 			die(_("Resolve operation not in progress, we are not resuming."));
 
 		for (i = 0; i < argc; i++) {
@@ -2340,7 +2385,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		argv_array_clear(&paths);
 	}
 
-	switch (resume) {
+	switch (resume.mode) {
 	case RESUME_FALSE:
 		am_run(&state, 0);
 		break;
@@ -2361,7 +2406,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		am_destroy(&state);
 		break;
 	case RESUME_SHOW_PATCH:
-		ret = show_patch(&state);
+		ret = show_patch(&state, resume.sub_mode);
 		break;
 	default:
 		BUG("invalid resume value");
diff --git a/third_party/git/builtin/bisect--helper.c b/third_party/git/builtin/bisect--helper.c
index 1fbe156e67a4..c1c40b516df7 100644
--- a/third_party/git/builtin/bisect--helper.c
+++ b/third_party/git/builtin/bisect--helper.c
@@ -52,8 +52,8 @@ static void set_terms(struct bisect_terms *terms, const char *bad,
 	terms->term_bad = xstrdup(bad);
 }
 
-static const char *vocab_bad = "bad|new";
-static const char *vocab_good = "good|old";
+static const char vocab_bad[] = "bad|new";
+static const char vocab_good[] = "good|old";
 
 /*
  * Check whether the string `term` belongs to the set of strings
@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
 
 		argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
 		if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+			error(_("could not check out original"
+				" HEAD '%s'. Try 'git bisect"
+				" reset <commit>'."), branch.buf);
 			strbuf_release(&branch);
 			argv_array_clear(&argv);
-			return error(_("could not check out original"
-				       " HEAD '%s'. Try 'git bisect"
-				       " reset <commit>'."), branch.buf);
+			return -1;
 		}
 		argv_array_clear(&argv);
 	}
@@ -205,31 +206,31 @@ static int bisect_write(const char *state, const char *rev,
 	struct object_id oid;
 	struct commit *commit;
 	FILE *fp = NULL;
-	int retval = 0;
+	int res = 0;
 
 	if (!strcmp(state, terms->term_bad)) {
 		strbuf_addf(&tag, "refs/bisect/%s", state);
 	} else if (one_of(state, terms->term_good, "skip", NULL)) {
 		strbuf_addf(&tag, "refs/bisect/%s-%s", state, rev);
 	} else {
-		retval = error(_("Bad bisect_write argument: %s"), state);
+		res = error(_("Bad bisect_write argument: %s"), state);
 		goto finish;
 	}
 
 	if (get_oid(rev, &oid)) {
-		retval = error(_("couldn't get the oid of the rev '%s'"), rev);
+		res = error(_("couldn't get the oid of the rev '%s'"), rev);
 		goto finish;
 	}
 
 	if (update_ref(NULL, tag.buf, &oid, NULL, 0,
 		       UPDATE_REFS_MSG_ON_ERR)) {
-		retval = -1;
+		res = -1;
 		goto finish;
 	}
 
 	fp = fopen(git_path_bisect_log(), "a");
 	if (!fp) {
-		retval = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log());
+		res = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log());
 		goto finish;
 	}
 
@@ -243,7 +244,7 @@ finish:
 	if (fp)
 		fclose(fp);
 	strbuf_release(&tag);
-	return retval;
+	return res;
 }
 
 static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
@@ -281,35 +282,23 @@ static int mark_good(const char *refname, const struct object_id *oid,
 	return 1;
 }
 
-static const char *need_bad_and_good_revision_warning =
+static const char need_bad_and_good_revision_warning[] =
 	N_("You need to give me at least one %s and %s revision.\n"
 	   "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
 
-static const char *need_bisect_start_warning =
+static const char need_bisect_start_warning[] =
 	N_("You need to start by \"git bisect start\".\n"
 	   "You then need to give me at least one %s and %s revision.\n"
 	   "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
 
-static int bisect_next_check(const struct bisect_terms *terms,
-			     const char *current_term)
+static int decide_next(const struct bisect_terms *terms,
+		       const char *current_term, int missing_good,
+		       int missing_bad)
 {
-	int missing_good = 1, missing_bad = 1, retval = 0;
-	const char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
-	const char *good_glob = xstrfmt("%s-*", terms->term_good);
-
-	if (ref_exists(bad_ref))
-		missing_bad = 0;
-
-	for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
-			     (void *) &missing_good);
-
 	if (!missing_good && !missing_bad)
-		goto finish;
-
-	if (!current_term) {
-		retval = -1;
-		goto finish;
-	}
+		return 0;
+	if (!current_term)
+		return -1;
 
 	if (missing_good && !missing_bad &&
 	    !strcmp(current_term, terms->term_good)) {
@@ -320,7 +309,7 @@ static int bisect_next_check(const struct bisect_terms *terms,
 		 */
 		warning(_("bisecting only with a %s commit"), terms->term_bad);
 		if (!isatty(0))
-			goto finish;
+			return 0;
 		/*
 		 * TRANSLATORS: Make sure to include [Y] and [n] in your
 		 * translation. The program will only accept English input
@@ -328,21 +317,35 @@ static int bisect_next_check(const struct bisect_terms *terms,
 		 */
 		yesno = git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO);
 		if (starts_with(yesno, "N") || starts_with(yesno, "n"))
-			retval = -1;
-		goto finish;
-	}
-	if (!is_empty_or_missing_file(git_path_bisect_start())) {
-		retval = error(_(need_bad_and_good_revision_warning),
-			       vocab_bad, vocab_good, vocab_bad, vocab_good);
-	} else {
-		retval = error(_(need_bisect_start_warning),
-			       vocab_good, vocab_bad, vocab_good, vocab_bad);
+			return -1;
+		return 0;
 	}
 
-finish:
-	free((void *) good_glob);
-	free((void *) bad_ref);
-	return retval;
+	if (!is_empty_or_missing_file(git_path_bisect_start()))
+		return error(_(need_bad_and_good_revision_warning),
+			     vocab_bad, vocab_good, vocab_bad, vocab_good);
+	else
+		return error(_(need_bisect_start_warning),
+			     vocab_good, vocab_bad, vocab_good, vocab_bad);
+}
+
+static int bisect_next_check(const struct bisect_terms *terms,
+			     const char *current_term)
+{
+	int missing_good = 1, missing_bad = 1;
+	char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
+	char *good_glob = xstrfmt("%s-*", terms->term_good);
+
+	if (ref_exists(bad_ref))
+		missing_bad = 0;
+
+	for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
+			     (void *) &missing_good);
+
+	free(good_glob);
+	free(bad_ref);
+
+	return decide_next(terms, current_term, missing_good, missing_bad);
 }
 
 static int get_terms(struct bisect_terms *terms)
@@ -396,7 +399,7 @@ static int bisect_terms(struct bisect_terms *terms, const char *option)
 
 static int bisect_append_log_quoted(const char **argv)
 {
-	int retval = 0;
+	int res = 0;
 	FILE *fp = fopen(git_path_bisect_log(), "a");
 	struct strbuf orig_args = STRBUF_INIT;
 
@@ -404,25 +407,25 @@ static int bisect_append_log_quoted(const char **argv)
 		return -1;
 
 	if (fprintf(fp, "git bisect start") < 1) {
-		retval = -1;
+		res = -1;
 		goto finish;
 	}
 
 	sq_quote_argv(&orig_args, argv);
 	if (fprintf(fp, "%s\n", orig_args.buf) < 1)
-		retval = -1;
+		res = -1;
 
 finish:
 	fclose(fp);
 	strbuf_release(&orig_args);
-	return retval;
+	return res;
 }
 
 static int bisect_start(struct bisect_terms *terms, int no_checkout,
 			const char **argv, int argc)
 {
 	int i, has_double_dash = 0, must_write_terms = 0, bad_seen = 0;
-	int flags, pathspec_pos, retval = 0;
+	int flags, pathspec_pos, res = 0;
 	struct string_list revs = STRING_LIST_INIT_DUP;
 	struct string_list states = STRING_LIST_INIT_DUP;
 	struct strbuf start_head = STRBUF_INIT;
@@ -523,7 +526,7 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 			argv_array_pushl(&argv, "checkout", start_head.buf,
 					 "--", NULL);
 			if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
-				retval = error(_("checking out '%s' failed."
+				res = error(_("checking out '%s' failed."
 						 " Try 'git bisect start "
 						 "<valid-branch>'."),
 					       start_head.buf);
@@ -571,12 +574,12 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 
 	if (no_checkout) {
 		if (get_oid(start_head.buf, &oid) < 0) {
-			retval = error(_("invalid ref: '%s'"), start_head.buf);
+			res = error(_("invalid ref: '%s'"), start_head.buf);
 			goto finish;
 		}
 		if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0,
 			       UPDATE_REFS_MSG_ON_ERR)) {
-			retval = -1;
+			res = -1;
 			goto finish;
 		}
 	}
@@ -588,26 +591,26 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 	for (i = 0; i < states.nr; i++)
 		if (bisect_write(states.items[i].string,
 				 revs.items[i].string, terms, 1)) {
-			retval = -1;
+			res = -1;
 			goto finish;
 		}
 
 	if (must_write_terms && write_terms(terms->term_bad,
 					    terms->term_good)) {
-		retval = -1;
+		res = -1;
 		goto finish;
 	}
 
-	retval = bisect_append_log_quoted(argv);
-	if (retval)
-		retval = -1;
+	res = bisect_append_log_quoted(argv);
+	if (res)
+		res = -1;
 
 finish:
 	string_list_clear(&revs, 0);
 	string_list_clear(&states, 0);
 	strbuf_release(&start_head);
 	strbuf_release(&bisect_names);
-	return retval;
+	return res;
 }
 
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
@@ -663,7 +666,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 
 	switch (cmdmode) {
 	case NEXT_ALL:
-		return bisect_next_all(the_repository, prefix, no_checkout);
+		res = bisect_next_all(the_repository, prefix, no_checkout);
+		break;
 	case WRITE_TERMS:
 		if (argc != 2)
 			return error(_("--write-terms requires two arguments"));
@@ -710,5 +714,13 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 		return error("BUG: unknown subcommand '%d'", cmdmode);
 	}
 	free_terms(&terms);
-	return !!res;
+
+	/*
+	 * Handle early success
+	 * From check_merge_bases > check_good_are_ancestors_of_bad > bisect_next_all
+	 */
+	if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE)
+		res = BISECT_OK;
+
+	return abs(res);
 }
diff --git a/third_party/git/builtin/blame.c b/third_party/git/builtin/blame.c
index 7ebd51ae4d2e..edd4bf7e3bb3 100644
--- a/third_party/git/builtin/blame.c
+++ b/third_party/git/builtin/blame.c
@@ -26,7 +26,6 @@
 #include "progress.h"
 #include "object-store.h"
 #include "blame.h"
-#include "string-list.h"
 #include "refs.h"
 
 static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
@@ -320,18 +319,18 @@ static const char *format_time(timestamp_t time, const char *tz_str,
 	return time_buf.buf;
 }
 
-#define OUTPUT_ANNOTATE_COMPAT	001
-#define OUTPUT_LONG_OBJECT_NAME	002
-#define OUTPUT_RAW_TIMESTAMP	004
-#define OUTPUT_PORCELAIN	010
-#define OUTPUT_SHOW_NAME	020
-#define OUTPUT_SHOW_NUMBER	040
-#define OUTPUT_SHOW_SCORE	0100
-#define OUTPUT_NO_AUTHOR	0200
-#define OUTPUT_SHOW_EMAIL	0400
-#define OUTPUT_LINE_PORCELAIN	01000
-#define OUTPUT_COLOR_LINE	02000
-#define OUTPUT_SHOW_AGE_WITH_COLOR	04000
+#define OUTPUT_ANNOTATE_COMPAT      (1U<<0)
+#define OUTPUT_LONG_OBJECT_NAME     (1U<<1)
+#define OUTPUT_RAW_TIMESTAMP        (1U<<2)
+#define OUTPUT_PORCELAIN            (1U<<3)
+#define OUTPUT_SHOW_NAME            (1U<<4)
+#define OUTPUT_SHOW_NUMBER          (1U<<5)
+#define OUTPUT_SHOW_SCORE           (1U<<6)
+#define OUTPUT_NO_AUTHOR            (1U<<7)
+#define OUTPUT_SHOW_EMAIL           (1U<<8)
+#define OUTPUT_LINE_PORCELAIN       (1U<<9)
+#define OUTPUT_COLOR_LINE           (1U<<10)
+#define OUTPUT_SHOW_AGE_WITH_COLOR  (1U<<11)
 
 static void emit_porcelain_details(struct blame_origin *suspect, int repeat)
 {
@@ -460,7 +459,7 @@ static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int
 
 	for (cnt = 0; cnt < ent->num_lines; cnt++) {
 		char ch;
-		int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? GIT_SHA1_HEXSZ : abbrev;
+		int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? the_hash_algo->hexsz : abbrev;
 
 		if (opt & OUTPUT_COLOR_LINE) {
 			if (cnt > 0) {
@@ -862,14 +861,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 		OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("Ignore revisions from <file>")),
 		OPT_BIT(0, "color-lines", &output_option, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE),
 		OPT_BIT(0, "color-by-age", &output_option, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR),
-
-		/*
-		 * The following two options are parsed by parse_revision_opt()
-		 * and are only included here to get included in the "-h"
-		 * output:
-		 */
-		{ OPTION_LOWLEVEL_CALLBACK, 0, "indent-heuristic", NULL, NULL, N_("Use an experimental heuristic to improve diffs"), PARSE_OPT_NOARG, NULL, 0, parse_opt_unknown_cb },
-
 		OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL),
 		OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")),
 		OPT_STRING(0, "contents", &contents_from, N_("file"), N_("Use <file>'s contents as the final image")),
@@ -885,6 +876,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 	struct range_set ranges;
 	unsigned int range_i;
 	long anchor;
+	const int hexsz = the_hash_algo->hexsz;
 
 	setup_default_color_by_age();
 	git_config(git_blame_config, &output_option);
@@ -931,11 +923,11 @@ parse_done:
 	} else if (show_progress < 0)
 		show_progress = isatty(2);
 
-	if (0 < abbrev && abbrev < GIT_SHA1_HEXSZ)
+	if (0 < abbrev && abbrev < hexsz)
 		/* one more abbrev length is needed for the boundary commit */
 		abbrev++;
 	else if (!abbrev)
-		abbrev = GIT_SHA1_HEXSZ;
+		abbrev = hexsz;
 
 	if (revs_file && read_ancestry(revs_file))
 		die_errno("reading graft file '%s' failed", revs_file);
diff --git a/third_party/git/builtin/branch.c b/third_party/git/builtin/branch.c
index 2ef214632f02..d8297f80ffc7 100644
--- a/third_party/git/builtin/branch.c
+++ b/third_party/git/builtin/branch.c
@@ -624,7 +624,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		OPT_SET_INT_F(0, "set-upstream", &track, N_("do not use"),
 			BRANCH_TRACK_OVERRIDE, PARSE_OPT_HIDDEN),
 		OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
-		OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("Unset the upstream info")),
+		OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("unset the upstream info")),
 		OPT__COLOR(&branch_use_color, N_("use colored output")),
 		OPT_SET_INT('r', "remotes",     &filter.kind, N_("act on remote-tracking branches"),
 			FILTER_REFS_REMOTES),
diff --git a/third_party/git/builtin/bundle.c b/third_party/git/builtin/bundle.c
index 1ea4bfdfc198..f049d27a1440 100644
--- a/third_party/git/builtin/bundle.c
+++ b/third_party/git/builtin/bundle.c
@@ -1,4 +1,6 @@
 #include "builtin.h"
+#include "argv-array.h"
+#include "parse-options.h"
 #include "cache.h"
 #include "bundle.h"
 
@@ -9,59 +11,184 @@
  * bundle supporting "fetch", "pull", and "ls-remote".
  */
 
-static const char builtin_bundle_usage[] =
-  "git bundle create <file> <git-rev-list args>\n"
-  "   or: git bundle verify <file>\n"
-  "   or: git bundle list-heads <file> [<refname>...]\n"
-  "   or: git bundle unbundle <file> [<refname>...]";
+static const char * const builtin_bundle_usage[] = {
+  N_("git bundle create [<options>] <file> <git-rev-list args>"),
+  N_("git bundle verify [<options>] <file>"),
+  N_("git bundle list-heads <file> [<refname>...]"),
+  N_("git bundle unbundle <file> [<refname>...]"),
+  NULL
+};
 
-int cmd_bundle(int argc, const char **argv, const char *prefix)
-{
+static const char * const builtin_bundle_create_usage[] = {
+  N_("git bundle create [<options>] <file> <git-rev-list args>"),
+  NULL
+};
+
+static const char * const builtin_bundle_verify_usage[] = {
+  N_("git bundle verify [<options>] <file>"),
+  NULL
+};
+
+static const char * const builtin_bundle_list_heads_usage[] = {
+  N_("git bundle list-heads <file> [<refname>...]"),
+  NULL
+};
+
+static const char * const builtin_bundle_unbundle_usage[] = {
+  N_("git bundle unbundle <file> [<refname>...]"),
+  NULL
+};
+
+static int verbose;
+
+static int parse_options_cmd_bundle(int argc,
+		const char **argv,
+		const char* prefix,
+		const char * const usagestr[],
+		const struct option options[],
+		const char **bundle_file) {
+	int newargc;
+	newargc = parse_options(argc, argv, NULL, options, usagestr,
+			     PARSE_OPT_STOP_AT_NON_OPTION);
+	if (argc < 1)
+		usage_with_options(usagestr, options);
+	*bundle_file = prefix_filename(prefix, argv[0]);
+	return newargc;
+}
+
+static int cmd_bundle_create(int argc, const char **argv, const char *prefix) {
+	int all_progress_implied = 0;
+	int progress = isatty(STDERR_FILENO);
+	struct argv_array pack_opts;
+
+	struct option options[] = {
+		OPT_SET_INT('q', "quiet", &progress,
+			    N_("do not show progress meter"), 0),
+		OPT_SET_INT(0, "progress", &progress,
+			    N_("show progress meter"), 1),
+		OPT_SET_INT(0, "all-progress", &progress,
+			    N_("show progress meter during object writing phase"), 2),
+		OPT_BOOL(0, "all-progress-implied",
+			 &all_progress_implied,
+			 N_("similar to --all-progress when progress meter is shown")),
+		OPT_END()
+	};
+	const char* bundle_file;
+
+	argc = parse_options_cmd_bundle(argc, argv, prefix,
+			builtin_bundle_create_usage, options, &bundle_file);
+	/* bundle internals use argv[1] as further parameters */
+
+	argv_array_init(&pack_opts);
+	if (progress == 0)
+		argv_array_push(&pack_opts, "--quiet");
+	else if (progress == 1)
+		argv_array_push(&pack_opts, "--progress");
+	else if (progress == 2)
+		argv_array_push(&pack_opts, "--all-progress");
+	if (progress && all_progress_implied)
+		argv_array_push(&pack_opts, "--all-progress-implied");
+
+	if (!startup_info->have_repository)
+		die(_("Need a repository to create a bundle."));
+	return !!create_bundle(the_repository, bundle_file, argc, argv, &pack_opts);
+}
+
+static int cmd_bundle_verify(int argc, const char **argv, const char *prefix) {
 	struct bundle_header header;
-	const char *cmd, *bundle_file;
 	int bundle_fd = -1;
+	int quiet = 0;
 
-	if (argc < 3)
-		usage(builtin_bundle_usage);
+	struct option options[] = {
+		OPT_BOOL('q', "quiet", &quiet,
+			    N_("do not show bundle details")),
+		OPT_END()
+	};
+	const char* bundle_file;
 
-	cmd = argv[1];
-	bundle_file = prefix_filename(prefix, argv[2]);
-	argc -= 2;
-	argv += 2;
+	argc = parse_options_cmd_bundle(argc, argv, prefix,
+			builtin_bundle_verify_usage, options, &bundle_file);
+	/* bundle internals use argv[1] as further parameters */
 
 	memset(&header, 0, sizeof(header));
-	if (strcmp(cmd, "create") && (bundle_fd =
-				read_bundle_header(bundle_file, &header)) < 0)
+	if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0)
+		return 1;
+	close(bundle_fd);
+	if (verify_bundle(the_repository, &header, !quiet))
 		return 1;
+	fprintf(stderr, _("%s is okay\n"), bundle_file);
+	return 0;
+}
 
-	if (!strcmp(cmd, "verify")) {
-		close(bundle_fd);
-		if (argc != 1) {
-			usage(builtin_bundle_usage);
-			return 1;
-		}
-		if (verify_bundle(the_repository, &header, 1))
-			return 1;
-		fprintf(stderr, _("%s is okay\n"), bundle_file);
-		return 0;
-	}
-	if (!strcmp(cmd, "list-heads")) {
-		close(bundle_fd);
-		return !!list_bundle_refs(&header, argc, argv);
+static int cmd_bundle_list_heads(int argc, const char **argv, const char *prefix) {
+	struct bundle_header header;
+	int bundle_fd = -1;
+
+	struct option options[] = {
+		OPT_END()
+	};
+	const char* bundle_file;
+
+	argc = parse_options_cmd_bundle(argc, argv, prefix,
+			builtin_bundle_list_heads_usage, options, &bundle_file);
+	/* bundle internals use argv[1] as further parameters */
+
+	memset(&header, 0, sizeof(header));
+	if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0)
+		return 1;
+	close(bundle_fd);
+	return !!list_bundle_refs(&header, argc, argv);
+}
+
+static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix) {
+	struct bundle_header header;
+	int bundle_fd = -1;
+
+	struct option options[] = {
+		OPT_END()
+	};
+	const char* bundle_file;
+
+	argc = parse_options_cmd_bundle(argc, argv, prefix,
+			builtin_bundle_unbundle_usage, options, &bundle_file);
+	/* bundle internals use argv[1] as further parameters */
+
+	memset(&header, 0, sizeof(header));
+	if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0)
+		return 1;
+	if (!startup_info->have_repository)
+		die(_("Need a repository to unbundle."));
+	return !!unbundle(the_repository, &header, bundle_fd, 0) ||
+		list_bundle_refs(&header, argc, argv);
+}
+
+int cmd_bundle(int argc, const char **argv, const char *prefix)
+{
+	struct option options[] = {
+		OPT__VERBOSE(&verbose, N_("be verbose; must be placed before a subcommand")),
+		OPT_END()
+	};
+	int result;
+
+	argc = parse_options(argc, argv, prefix, options, builtin_bundle_usage,
+		PARSE_OPT_STOP_AT_NON_OPTION);
+
+	packet_trace_identity("bundle");
+
+	if (argc < 2)
+		usage_with_options(builtin_bundle_usage, options);
+
+	else if (!strcmp(argv[0], "create"))
+		result = cmd_bundle_create(argc, argv, prefix);
+	else if (!strcmp(argv[0], "verify"))
+		result = cmd_bundle_verify(argc, argv, prefix);
+	else if (!strcmp(argv[0], "list-heads"))
+		result = cmd_bundle_list_heads(argc, argv, prefix);
+	else if (!strcmp(argv[0], "unbundle"))
+		result = cmd_bundle_unbundle(argc, argv, prefix);
+	else {
+		error(_("Unknown subcommand: %s"), argv[0]);
+		usage_with_options(builtin_bundle_usage, options);
 	}
-	if (!strcmp(cmd, "create")) {
-		if (argc < 2) {
-			usage(builtin_bundle_usage);
-			return 1;
-		}
-		if (!startup_info->have_repository)
-			die(_("Need a repository to create a bundle."));
-		return !!create_bundle(the_repository, bundle_file, argc, argv);
-	} else if (!strcmp(cmd, "unbundle")) {
-		if (!startup_info->have_repository)
-			die(_("Need a repository to unbundle."));
-		return !!unbundle(the_repository, &header, bundle_fd, 0) ||
-			list_bundle_refs(&header, argc, argv);
-	} else
-		usage(builtin_bundle_usage);
+	return result ? 1 : 0;
 }
diff --git a/third_party/git/builtin/cat-file.c b/third_party/git/builtin/cat-file.c
index 995d47c85aad..272f9fc6d7cb 100644
--- a/third_party/git/builtin/cat-file.c
+++ b/third_party/git/builtin/cat-file.c
@@ -15,6 +15,7 @@
 #include "sha1-array.h"
 #include "packfile.h"
 #include "object-store.h"
+#include "promisor-remote.h"
 
 struct batch_options {
 	int enabled;
@@ -261,7 +262,7 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len,
 			strbuf_addstr(sb, data->rest);
 	} else if (is_atom("deltabase", atom, len)) {
 		if (data->mark_query)
-			data->info.delta_base_sha1 = data->delta_base_oid.hash;
+			data->info.delta_base_oid = &data->delta_base_oid;
 		else
 			strbuf_addstr(sb,
 				      oid_to_hex(&data->delta_base_oid));
@@ -524,8 +525,8 @@ static int batch_objects(struct batch_options *opt)
 	if (opt->all_objects) {
 		struct object_cb_data cb;
 
-		if (repository_format_partial_clone)
-			warning("This repository has extensions.partialClone set. Some objects may not be loaded.");
+		if (has_promisor_remote())
+			warning("This repository uses promisor remotes. Some objects may not be loaded.");
 
 		cb.opt = opt;
 		cb.expand = &data;
diff --git a/third_party/git/builtin/check-ignore.c b/third_party/git/builtin/check-ignore.c
index 599097304b77..ea5d0ae3a6a6 100644
--- a/third_party/git/builtin/check-ignore.c
+++ b/third_party/git/builtin/check-ignore.c
@@ -32,19 +32,19 @@ static const struct option check_ignore_options[] = {
 	OPT_END()
 };
 
-static void output_exclude(const char *path, struct exclude *exclude)
+static void output_pattern(const char *path, struct path_pattern *pattern)
 {
-	char *bang  = (exclude && exclude->flags & EXC_FLAG_NEGATIVE)  ? "!" : "";
-	char *slash = (exclude && exclude->flags & EXC_FLAG_MUSTBEDIR) ? "/" : "";
+	char *bang  = (pattern && pattern->flags & PATTERN_FLAG_NEGATIVE)  ? "!" : "";
+	char *slash = (pattern && pattern->flags & PATTERN_FLAG_MUSTBEDIR) ? "/" : "";
 	if (!nul_term_line) {
 		if (!verbose) {
 			write_name_quoted(path, stdout, '\n');
 		} else {
-			if (exclude) {
-				quote_c_style(exclude->el->src, NULL, stdout, 0);
+			if (pattern) {
+				quote_c_style(pattern->pl->src, NULL, stdout, 0);
 				printf(":%d:%s%s%s\t",
-				       exclude->srcpos,
-				       bang, exclude->pattern, slash);
+				       pattern->srcpos,
+				       bang, pattern->pattern, slash);
 			}
 			else {
 				printf("::\t");
@@ -56,11 +56,11 @@ static void output_exclude(const char *path, struct exclude *exclude)
 		if (!verbose) {
 			printf("%s%c", path, '\0');
 		} else {
-			if (exclude)
+			if (pattern)
 				printf("%s%c%d%c%s%s%s%c%s%c",
-				       exclude->el->src, '\0',
-				       exclude->srcpos, '\0',
-				       bang, exclude->pattern, slash, '\0',
+				       pattern->pl->src, '\0',
+				       pattern->srcpos, '\0',
+				       bang, pattern->pattern, slash, '\0',
 				       path, '\0');
 			else
 				printf("%c%c%c%s%c", '\0', '\0', '\0', path, '\0');
@@ -74,7 +74,7 @@ static int check_ignore(struct dir_struct *dir,
 	const char *full_path;
 	char *seen;
 	int num_ignored = 0, i;
-	struct exclude *exclude;
+	struct path_pattern *pattern;
 	struct pathspec pathspec;
 
 	if (!argc) {
@@ -103,15 +103,18 @@ static int check_ignore(struct dir_struct *dir,
 	seen = find_pathspecs_matching_against_index(&pathspec, &the_index);
 	for (i = 0; i < pathspec.nr; i++) {
 		full_path = pathspec.items[i].match;
-		exclude = NULL;
+		pattern = NULL;
 		if (!seen[i]) {
 			int dtype = DT_UNKNOWN;
-			exclude = last_exclude_matching(dir, &the_index,
+			pattern = last_matching_pattern(dir, &the_index,
 							full_path, &dtype);
+			if (!verbose && pattern &&
+			    pattern->flags & PATTERN_FLAG_NEGATIVE)
+				pattern = NULL;
 		}
-		if (!quiet && (exclude || show_non_matching))
-			output_exclude(pathspec.items[i].original, exclude);
-		if (exclude)
+		if (!quiet && (pattern || show_non_matching))
+			output_pattern(pathspec.items[i].original, pattern);
+		if (pattern)
 			num_ignored++;
 	}
 	free(seen);
diff --git a/third_party/git/builtin/checkout.c b/third_party/git/builtin/checkout.c
index 6123f732a2c8..d6773818b803 100644
--- a/third_party/git/builtin/checkout.c
+++ b/third_party/git/builtin/checkout.c
@@ -70,6 +70,8 @@ struct checkout_opts {
 	int checkout_worktree;
 	const char *ignore_unmerged_opt;
 	int ignore_unmerged;
+	int pathspec_file_nul;
+	const char *pathspec_from_file;
 
 	const char *new_branch;
 	const char *new_branch_force;
@@ -126,6 +128,7 @@ static int update_some(const struct object_id *oid, struct strbuf *base,
 	if (pos >= 0) {
 		struct cache_entry *old = active_cache[pos];
 		if (ce->ce_mode == old->ce_mode &&
+		    !ce_intent_to_add(old) &&
 		    oideq(&ce->oid, &old->oid)) {
 			old->ce_flags |= CE_UPDATE;
 			discard_cache_entry(ce);
@@ -521,6 +524,8 @@ static int checkout_paths(const struct checkout_opts *opts,
 	/* Now we are committed to check them out */
 	if (opts->checkout_worktree)
 		errs |= checkout_worktree(opts);
+	else
+		remove_marked_cache_entries(&the_index, 1);
 
 	/*
 	 * Allow updating the index when checking out from the index.
@@ -708,11 +713,11 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			 * give up or do a real merge, depending on
 			 * whether the merge flag was used.
 			 */
-			struct tree *result;
 			struct tree *work;
 			struct tree *old_tree;
 			struct merge_options o;
 			struct strbuf sb = STRBUF_INIT;
+			struct strbuf old_commit_shortname = STRBUF_INIT;
 
 			if (!opts->merge)
 				return 1;
@@ -730,13 +735,6 @@ static int merge_working_tree(const struct checkout_opts *opts,
 				      "the following files:\n%s"), sb.buf);
 			strbuf_release(&sb);
 
-			if (repo_index_has_changes(the_repository,
-						   get_commit_tree(old_branch_info->commit),
-						   &sb))
-				warning(_("staged changes in the following files may be lost: %s"),
-					sb.buf);
-			strbuf_release(&sb);
-
 			/* Do more real merge */
 
 			/*
@@ -760,7 +758,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			 */
 			init_merge_options(&o, the_repository);
 			o.verbosity = 0;
-			work = write_tree_from_memory(&o);
+			work = write_in_core_index_as_tree(the_repository);
 
 			ret = reset_tree(new_tree,
 					 opts, 1,
@@ -768,19 +766,25 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			if (ret)
 				return ret;
 			o.ancestor = old_branch_info->name;
+			if (old_branch_info->name == NULL) {
+				strbuf_add_unique_abbrev(&old_commit_shortname,
+							 &old_branch_info->commit->object.oid,
+							 DEFAULT_ABBREV);
+				o.ancestor = old_commit_shortname.buf;
+			}
 			o.branch1 = new_branch_info->name;
 			o.branch2 = "local";
 			ret = merge_trees(&o,
 					  new_tree,
 					  work,
-					  old_tree,
-					  &result);
+					  old_tree);
 			if (ret < 0)
 				exit(128);
 			ret = reset_tree(new_tree,
 					 opts, 0,
 					 writeout_error);
 			strbuf_release(&o.obuf);
+			strbuf_release(&old_commit_shortname);
 			if (ret)
 				return ret;
 		}
@@ -861,7 +865,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 		strbuf_addf(&msg, "checkout: moving from %s to %s",
 			old_desc ? old_desc : "(invalid)", new_branch_info->name);
 	else
-		strbuf_insert(&msg, 0, reflog_msg, strlen(reflog_msg));
+		strbuf_insertstr(&msg, 0, reflog_msg);
 
 	if (!strcmp(new_branch_info->name, "HEAD") && !new_branch_info->path && !opts->force_detach) {
 		/* Nothing to do. */
@@ -1113,12 +1117,43 @@ static void setup_new_branch_info_and_source_tree(
 	}
 }
 
+static const char *parse_remote_branch(const char *arg,
+				       struct object_id *rev,
+				       int could_be_checkout_paths)
+{
+	int num_matches = 0;
+	const char *remote = unique_tracking_name(arg, rev, &num_matches);
+
+	if (remote && could_be_checkout_paths) {
+		die(_("'%s' could be both a local file and a tracking branch.\n"
+			"Please use -- (and optionally --no-guess) to disambiguate"),
+		    arg);
+	}
+
+	if (!remote && num_matches > 1) {
+	    if (advice_checkout_ambiguous_remote_branch_name) {
+		    advise(_("If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+			     "you can do so by fully qualifying the name with the --track option:\n"
+			     "\n"
+			     "    git checkout --track origin/<name>\n"
+			     "\n"
+			     "If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+			     "one remote, e.g. the 'origin' remote, consider setting\n"
+			     "checkout.defaultRemote=origin in your config."));
+	    }
+
+	    die(_("'%s' matched multiple (%d) remote tracking branches"),
+		arg, num_matches);
+	}
+
+	return remote;
+}
+
 static int parse_branchname_arg(int argc, const char **argv,
 				int dwim_new_local_branch_ok,
 				struct branch_info *new_branch_info,
 				struct checkout_opts *opts,
-				struct object_id *rev,
-				int *dwim_remotes_matched)
+				struct object_id *rev)
 {
 	const char **new_branch = &opts->new_branch;
 	int argcount = 0;
@@ -1223,13 +1258,9 @@ static int parse_branchname_arg(int argc, const char **argv,
 			recover_with_dwim = 0;
 
 		if (recover_with_dwim) {
-			const char *remote = unique_tracking_name(arg, rev,
-								  dwim_remotes_matched);
+			const char *remote = parse_remote_branch(arg, rev,
+								 could_be_checkout_paths);
 			if (remote) {
-				if (could_be_checkout_paths)
-					die(_("'%s' could be both a local file and a tracking branch.\n"
-					      "Please use -- (and optionally --no-guess) to disambiguate"),
-					    arg);
 				*new_branch = arg;
 				arg = remote;
 				/* DWIMmed to create local branch, case (3).(b) */
@@ -1480,6 +1511,8 @@ static struct option *add_checkout_path_options(struct checkout_opts *opts,
 		OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")),
 		OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree,
 			 N_("do not limit pathspecs to sparse entries only")),
+		OPT_PATHSPEC_FROM_FILE(&opts->pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&opts->pathspec_file_nul),
 		OPT_END()
 	};
 	struct option *newopts = parse_options_concat(prevopts, options);
@@ -1492,7 +1525,6 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 			 const char * const usagestr[])
 {
 	struct branch_info new_branch_info;
-	int dwim_remotes_matched = 0;
 	int parseopt_flags = 0;
 
 	memset(&new_branch_info, 0, sizeof(new_branch_info));
@@ -1600,8 +1632,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 			opts->track == BRANCH_TRACK_UNSPECIFIED &&
 			!opts->new_branch;
 		int n = parse_branchname_arg(argc, argv, dwim_ok,
-					     &new_branch_info, opts, &rev,
-					     &dwim_remotes_matched);
+					     &new_branch_info, opts, &rev);
 		argv += n;
 		argc -= n;
 	} else if (!opts->accept_ref && opts->from_treeish) {
@@ -1618,10 +1649,6 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 			die(_("reference is not a tree: %s"), opts->from_treeish);
 	}
 
-	if (opts->accept_pathspec && !opts->empty_pathspec_ok && !argc &&
-	    !opts->patch_mode)	/* patch mode is special */
-		die(_("you must specify path(s) to restore"));
-
 	if (argc) {
 		parse_pathspec(&opts->pathspec, 0,
 			       opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
@@ -1641,10 +1668,33 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 		if (opts->force_detach)
 			die(_("git checkout: --detach does not take a path argument '%s'"),
 			    argv[0]);
+	}
 
+	if (opts->pathspec_from_file) {
+		if (opts->pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		if (opts->force_detach)
+			die(_("--pathspec-from-file is incompatible with --detach"));
+
+		if (opts->patch_mode)
+			die(_("--pathspec-from-file is incompatible with --patch"));
+
+		parse_pathspec_file(&opts->pathspec, 0,
+				    0,
+				    prefix, opts->pathspec_from_file, opts->pathspec_file_nul);
+	} else if (opts->pathspec_file_nul) {
+		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+	}
+
+	if (opts->pathspec.nr) {
 		if (1 < !!opts->writeout_stage + !!opts->force + !!opts->merge)
 			die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 			      "checking out of the index."));
+	} else {
+		if (opts->accept_pathspec && !opts->empty_pathspec_ok &&
+		    !opts->patch_mode)	/* patch mode is special */
+			die(_("you must specify path(s) to restore"));
 	}
 
 	if (opts->new_branch) {
@@ -1659,28 +1709,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 	}
 
 	UNLEAK(opts);
-	if (opts->patch_mode || opts->pathspec.nr) {
-		int ret = checkout_paths(opts, new_branch_info.name);
-		if (ret && dwim_remotes_matched > 1 &&
-		    advice_checkout_ambiguous_remote_branch_name)
-			advise(_("'%s' matched more than one remote tracking branch.\n"
-				 "We found %d remotes with a reference that matched. So we fell back\n"
-				 "on trying to resolve the argument as a path, but failed there too!\n"
-				 "\n"
-				 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-				 "you can do so by fully qualifying the name with the --track option:\n"
-				 "\n"
-				 "    git checkout --track origin/<name>\n"
-				 "\n"
-				 "If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-				 "one remote, e.g. the 'origin' remote, consider setting\n"
-				 "checkout.defaultRemote=origin in your config."),
-			       argv[0],
-			       dwim_remotes_matched);
-		return ret;
-	} else {
+	if (opts->patch_mode || opts->pathspec.nr)
+		return checkout_paths(opts, new_branch_info.name);
+	else
 		return checkout_branch(opts, &new_branch_info);
-	}
 }
 
 int cmd_checkout(int argc, const char **argv, const char *prefix)
@@ -1714,6 +1746,15 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 	opts.checkout_index = -2;    /* default on */
 	opts.checkout_worktree = -2; /* default on */
 
+	if (argc == 3 && !strcmp(argv[1], "-b")) {
+		/*
+		 * User ran 'git checkout -b <branch>' and expects
+		 * the same behavior as 'git switch -c <branch>'.
+		 */
+		opts.switch_branch_doing_nothing_is_ok = 0;
+		opts.only_merge_on_switching_branches = 1;
+	}
+
 	options = parse_options_dup(checkout_options);
 	options = add_common_options(&opts, options);
 	options = add_common_switch_branch_options(&opts, options);
diff --git a/third_party/git/builtin/clean.c b/third_party/git/builtin/clean.c
index d5579da716e0..5abf087e7c49 100644
--- a/third_party/git/builtin/clean.c
+++ b/third_party/git/builtin/clean.c
@@ -158,7 +158,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 
 	*dir_gone = 1;
 
-	if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) && is_nonbare_repository_dir(path)) {
+	if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
+	    is_nonbare_repository_dir(path)) {
 		if (!quiet) {
 			quote_path_relative(path->buf, prefix, &quoted);
 			printf(dry_run ?  _(msg_would_skip_git_dir) : _(msg_skip_git_dir),
@@ -648,7 +649,7 @@ static int filter_by_patterns_cmd(void)
 	struct strbuf confirm = STRBUF_INIT;
 	struct strbuf **ignore_list;
 	struct string_list_item *item;
-	struct exclude_list *el;
+	struct pattern_list *pl;
 	int changed = -1, i;
 
 	for (;;) {
@@ -671,7 +672,7 @@ static int filter_by_patterns_cmd(void)
 			break;
 
 		memset(&dir, 0, sizeof(dir));
-		el = add_exclude_list(&dir, EXC_CMDL, "manual exclude");
+		pl = add_pattern_list(&dir, EXC_CMDL, "manual exclude");
 		ignore_list = strbuf_split_max(&confirm, ' ', 0);
 
 		for (i = 0; ignore_list[i]; i++) {
@@ -679,7 +680,7 @@ static int filter_by_patterns_cmd(void)
 			if (!ignore_list[i]->len)
 				continue;
 
-			add_exclude(ignore_list[i]->buf, "", 0, el, -(i+1));
+			add_pattern(ignore_list[i]->buf, "", 0, pl, -(i+1));
 		}
 
 		changed = 0;
@@ -901,7 +902,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	struct pathspec pathspec;
 	struct strbuf buf = STRBUF_INIT;
 	struct string_list exclude_list = STRING_LIST_INIT_NODUP;
-	struct exclude_list *el;
+	struct pattern_list *pl;
 	struct string_list_item *item;
 	const char *qname;
 	struct option options[] = {
@@ -946,9 +947,19 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 
 	if (force > 1)
 		rm_flags = 0;
+	else
+		dir.flags |= DIR_SKIP_NESTED_GIT;
 
 	dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
 
+	if (argc) {
+		/*
+		 * Remaining args implies pathspecs specified, and we should
+		 * recurse within those.
+		 */
+		remove_directories = 1;
+	}
+
 	if (remove_directories)
 		dir.flags |= DIR_SHOW_IGNORED_TOO | DIR_KEEP_UNTRACKED_CONTENTS;
 
@@ -958,9 +969,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	if (!ignored)
 		setup_standard_excludes(&dir);
 
-	el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
+	pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option");
 	for (i = 0; i < exclude_list.nr; i++)
-		add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1));
+		add_pattern(exclude_list.items[i].string, "", 0, pl, -(i+1));
 
 	parse_pathspec(&pathspec, 0,
 		       PATHSPEC_PREFER_CWD,
@@ -1007,6 +1018,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	for_each_string_list_item(item, &del_list) {
 		struct stat st;
 
+		strbuf_reset(&abs_path);
 		if (prefix)
 			strbuf_addstr(&abs_path, prefix);
 
@@ -1040,7 +1052,6 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 				printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname);
 			}
 		}
-		strbuf_reset(&abs_path);
 	}
 
 	strbuf_release(&abs_path);
diff --git a/third_party/git/builtin/clone.c b/third_party/git/builtin/clone.c
index f665b28ccccf..1ad26f4d8c81 100644
--- a/third_party/git/builtin/clone.c
+++ b/third_party/git/builtin/clone.c
@@ -32,7 +32,6 @@
 #include "connected.h"
 #include "packfile.h"
 #include "list-objects-filter-options.h"
-#include "object-store.h"
 
 /*
  * Overall FIXMEs:
@@ -60,6 +59,7 @@ static const char *real_git_dir;
 static char *option_upload_pack = "git-upload-pack";
 static int option_verbosity;
 static int option_progress = -1;
+static int option_sparse_checkout;
 static enum transport_family family;
 static struct string_list option_config = STRING_LIST_INIT_NODUP;
 static struct string_list option_required_reference = STRING_LIST_INIT_NODUP;
@@ -147,6 +147,8 @@ static struct option builtin_clone_options[] = {
 	OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
 	OPT_BOOL(0, "remote-submodules", &option_remote_submodules,
 		    N_("any cloned submodules will use their remote-tracking branch")),
+	OPT_BOOL(0, "sparse", &option_sparse_checkout,
+		    N_("initialize sparse-checkout file to include only files at root")),
 	OPT_END()
 };
 
@@ -671,7 +673,7 @@ static void update_remote_refs(const struct ref *refs,
 			       const char *msg,
 			       struct transport *transport,
 			       int check_connectivity,
-			       int check_refs_only)
+			       int check_refs_are_promisor_objects_only)
 {
 	const struct ref *rm = mapped_refs;
 
@@ -680,7 +682,8 @@ static void update_remote_refs(const struct ref *refs,
 
 		opt.transport = transport;
 		opt.progress = transport->progress;
-		opt.check_refs_only = !!check_refs_only;
+		opt.check_refs_are_promisor_objects_only =
+			!!check_refs_are_promisor_objects_only;
 
 		if (check_connected(iterate_ref_map, &rm, &opt))
 			die(_("remote did not send all necessary objects"));
@@ -734,6 +737,27 @@ static void update_head(const struct ref *our, const struct ref *remote,
 	}
 }
 
+static int git_sparse_checkout_init(const char *repo)
+{
+	struct argv_array argv = ARGV_ARRAY_INIT;
+	int result = 0;
+	argv_array_pushl(&argv, "-C", repo, "sparse-checkout", "init", NULL);
+
+	/*
+	 * We must apply the setting in the current process
+	 * for the later checkout to use the sparse-checkout file.
+	 */
+	core_apply_sparse_checkout = 1;
+
+	if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+		error(_("failed to initialize sparse-checkout"));
+		result = 1;
+	}
+
+	argv_array_clear(&argv);
+	return result;
+}
+
 static int checkout(int submodule_progress)
 {
 	struct object_id oid;
@@ -785,12 +809,12 @@ static int checkout(int submodule_progress)
 	if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
 		die(_("unable to write new index file"));
 
-	err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1),
+	err |= run_hook_le(NULL, "post-checkout", oid_to_hex(&null_oid),
 			   oid_to_hex(&oid), "1", NULL);
 
 	if (!err && (option_recurse_submodules.nr > 0)) {
 		struct argv_array args = ARGV_ARRAY_INIT;
-		argv_array_pushl(&args, "submodule", "update", "--init", "--recursive", NULL);
+		argv_array_pushl(&args, "submodule", "update", "--require-init", "--recursive", NULL);
 
 		if (option_shallow_submodules == 1)
 			argv_array_push(&args, "--depth=1");
@@ -809,6 +833,11 @@ static int checkout(int submodule_progress)
 			argv_array_push(&args, "--no-fetch");
 		}
 
+		if (option_single_branch >= 0)
+			argv_array_push(&args, option_single_branch ?
+					       "--single-branch" :
+					       "--no-single-branch");
+
 		err = run_command_v_opt(args.argv, RUN_GIT_CMD);
 		argv_array_clear(&args);
 	}
@@ -900,7 +929,7 @@ static void dissociate_from_references(void)
 	free(alternates);
 }
 
-static int dir_exists(const char *path)
+static int path_exists(const char *path)
 {
 	struct stat sb;
 	return !stat(path, &sb);
@@ -928,8 +957,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
 	struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
 
-	fetch_if_missing = 0;
-
 	packet_trace_identity("clone");
 	argc = parse_options(argc, argv, prefix, builtin_clone_options,
 			     builtin_clone_usage, 0);
@@ -982,7 +1009,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		dir = guess_dir_name(repo_name, is_bundle, option_bare);
 	strip_trailing_slashes(dir);
 
-	dest_exists = dir_exists(dir);
+	dest_exists = path_exists(dir);
 	if (dest_exists && !is_empty_dir(dir))
 		die(_("destination path '%s' already exists and is not "
 			"an empty directory."), dir);
@@ -993,7 +1020,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		work_tree = NULL;
 	else {
 		work_tree = getenv("GIT_WORK_TREE");
-		if (work_tree && dir_exists(work_tree))
+		if (work_tree && path_exists(work_tree))
 			die(_("working tree '%s' already exists."), work_tree);
 	}
 
@@ -1021,7 +1048,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	}
 
 	if (real_git_dir) {
-		if (dir_exists(real_git_dir))
+		if (path_exists(real_git_dir))
 			junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL;
 		junk_git_dir = real_git_dir;
 	} else {
@@ -1107,6 +1134,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	if (option_required_reference.nr || option_optional_reference.nr)
 		setup_reference();
 
+	if (option_sparse_checkout && git_sparse_checkout_init(dir))
+		return 1;
+
 	remote = remote_get(option_origin);
 
 	strbuf_addf(&default_refspec, "+%s*:%s*", src_ref_prefix,
@@ -1160,13 +1190,11 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		transport->server_options = &server_options;
 
 	if (filter_options.choice) {
-		struct strbuf expanded_filter_spec = STRBUF_INIT;
-		expand_list_objects_filter_spec(&filter_options,
-						&expanded_filter_spec);
+		const char *spec =
+			expand_list_objects_filter_spec(&filter_options);
 		transport_set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
-				     expanded_filter_spec.buf);
+				     spec);
 		transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
-		strbuf_release(&expanded_filter_spec);
 	}
 
 	if (transport->smart_options && !deepen && !filter_options.choice)
@@ -1268,7 +1296,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	}
 
 	junk_mode = JUNK_LEAVE_REPO;
-	fetch_if_missing = 1;
 	err = checkout(submodule_progress);
 
 	strbuf_release(&reflog_msg);
diff --git a/third_party/git/builtin/commit-graph.c b/third_party/git/builtin/commit-graph.c
index 38027b83d9d8..4a70b33fb5f1 100644
--- a/third_party/git/builtin/commit-graph.c
+++ b/third_party/git/builtin/commit-graph.c
@@ -8,25 +8,18 @@
 #include "object-store.h"
 
 static char const * const builtin_commit_graph_usage[] = {
-	N_("git commit-graph [--object-dir <objdir>]"),
-	N_("git commit-graph read [--object-dir <objdir>]"),
-	N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"),
-	N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"),
+	N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
+	N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
 	NULL
 };
 
 static const char * const builtin_commit_graph_verify_usage[] = {
-	N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"),
-	NULL
-};
-
-static const char * const builtin_commit_graph_read_usage[] = {
-	N_("git commit-graph read [--object-dir <objdir>]"),
+	N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
 	NULL
 };
 
 static const char * const builtin_commit_graph_write_usage[] = {
-	N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"),
+	N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
 	NULL
 };
 
@@ -38,11 +31,32 @@ static struct opts_commit_graph {
 	int append;
 	int split;
 	int shallow;
+	int progress;
 } opts;
 
+static struct object_directory *find_odb(struct repository *r,
+					 const char *obj_dir)
+{
+	struct object_directory *odb;
+	char *obj_dir_real = real_pathdup(obj_dir, 1);
+
+	prepare_alt_odb(r);
+	for (odb = r->objects->odb; odb; odb = odb->next) {
+		if (!strcmp(obj_dir_real, real_path(odb->path)))
+			break;
+	}
+
+	free(obj_dir_real);
+
+	if (!odb)
+		die(_("could not find object directory matching %s"), obj_dir);
+	return odb;
+}
+
 static int graph_verify(int argc, const char **argv)
 {
 	struct commit_graph *graph = NULL;
+	struct object_directory *odb = NULL;
 	char *graph_name;
 	int open_ok;
 	int fd;
@@ -55,9 +69,13 @@ static int graph_verify(int argc, const char **argv)
 			   N_("The object directory to store the graph")),
 		OPT_BOOL(0, "shallow", &opts.shallow,
 			 N_("if the commit-graph is split, only verify the tip file")),
+		OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
 		OPT_END(),
 	};
 
+	trace2_cmd_mode("verify");
+
+	opts.progress = isatty(2);
 	argc = parse_options(argc, argv, NULL,
 			     builtin_commit_graph_verify_options,
 			     builtin_commit_graph_verify_usage, 0);
@@ -66,8 +84,11 @@ static int graph_verify(int argc, const char **argv)
 		opts.obj_dir = get_object_directory();
 	if (opts.shallow)
 		flags |= COMMIT_GRAPH_VERIFY_SHALLOW;
+	if (opts.progress)
+		flags |= COMMIT_GRAPH_WRITE_PROGRESS;
 
-	graph_name = get_commit_graph_filename(opts.obj_dir);
+	odb = find_odb(the_repository, opts.obj_dir);
+	graph_name = get_commit_graph_filename(odb);
 	open_ok = open_commit_graph(graph_name, &fd, &st);
 	if (!open_ok && errno != ENOENT)
 		die_errno(_("Could not open commit-graph '%s'"), graph_name);
@@ -75,9 +96,9 @@ static int graph_verify(int argc, const char **argv)
 	FREE_AND_NULL(graph_name);
 
 	if (open_ok)
-		graph = load_commit_graph_one_fd_st(fd, &st);
-	 else
-		graph = read_commit_graph_one(the_repository, opts.obj_dir);
+		graph = load_commit_graph_one_fd_st(fd, &st, odb);
+	else
+		graph = read_commit_graph_one(the_repository, odb);
 
 	/* Return failure if open_ok predicted success */
 	if (!graph)
@@ -87,64 +108,6 @@ static int graph_verify(int argc, const char **argv)
 	return verify_commit_graph(the_repository, graph, flags);
 }
 
-static int graph_read(int argc, const char **argv)
-{
-	struct commit_graph *graph = NULL;
-	char *graph_name;
-	int open_ok;
-	int fd;
-	struct stat st;
-
-	static struct option builtin_commit_graph_read_options[] = {
-		OPT_STRING(0, "object-dir", &opts.obj_dir,
-			N_("dir"),
-			N_("The object directory to store the graph")),
-		OPT_END(),
-	};
-
-	argc = parse_options(argc, argv, NULL,
-			     builtin_commit_graph_read_options,
-			     builtin_commit_graph_read_usage, 0);
-
-	if (!opts.obj_dir)
-		opts.obj_dir = get_object_directory();
-
-	graph_name = get_commit_graph_filename(opts.obj_dir);
-
-	open_ok = open_commit_graph(graph_name, &fd, &st);
-	if (!open_ok)
-		die_errno(_("Could not open commit-graph '%s'"), graph_name);
-
-	graph = load_commit_graph_one_fd_st(fd, &st);
-	if (!graph)
-		return 1;
-
-	FREE_AND_NULL(graph_name);
-
-	printf("header: %08x %d %d %d %d\n",
-		ntohl(*(uint32_t*)graph->data),
-		*(unsigned char*)(graph->data + 4),
-		*(unsigned char*)(graph->data + 5),
-		*(unsigned char*)(graph->data + 6),
-		*(unsigned char*)(graph->data + 7));
-	printf("num_commits: %u\n", graph->num_commits);
-	printf("chunks:");
-
-	if (graph->chunk_oid_fanout)
-		printf(" oid_fanout");
-	if (graph->chunk_oid_lookup)
-		printf(" oid_lookup");
-	if (graph->chunk_commit_data)
-		printf(" commit_metadata");
-	if (graph->chunk_extra_edges)
-		printf(" extra_edges");
-	printf("\n");
-
-	UNLEAK(graph);
-
-	return 0;
-}
-
 extern int read_replace_refs;
 static struct split_commit_graph_opts split_opts;
 
@@ -152,9 +115,10 @@ static int graph_write(int argc, const char **argv)
 {
 	struct string_list *pack_indexes = NULL;
 	struct string_list *commit_hex = NULL;
+	struct object_directory *odb = NULL;
 	struct string_list lines;
 	int result = 0;
-	unsigned int flags = COMMIT_GRAPH_PROGRESS;
+	enum commit_graph_write_flags flags = 0;
 
 	static struct option builtin_commit_graph_write_options[] = {
 		OPT_STRING(0, "object-dir", &opts.obj_dir,
@@ -168,6 +132,7 @@ static int graph_write(int argc, const char **argv)
 			N_("start walk at commits listed by stdin")),
 		OPT_BOOL(0, "append", &opts.append,
 			N_("include all commits already in the commit-graph file")),
+		OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
 		OPT_BOOL(0, "split", &opts.split,
 			N_("allow writing an incremental commit-graph file")),
 		OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
@@ -179,10 +144,13 @@ static int graph_write(int argc, const char **argv)
 		OPT_END(),
 	};
 
+	opts.progress = isatty(2);
 	split_opts.size_multiple = 2;
 	split_opts.max_commits = 0;
 	split_opts.expire_time = 0;
 
+	trace2_cmd_mode("write");
+
 	argc = parse_options(argc, argv, NULL,
 			     builtin_commit_graph_write_options,
 			     builtin_commit_graph_write_usage, 0);
@@ -192,14 +160,17 @@ static int graph_write(int argc, const char **argv)
 	if (!opts.obj_dir)
 		opts.obj_dir = get_object_directory();
 	if (opts.append)
-		flags |= COMMIT_GRAPH_APPEND;
+		flags |= COMMIT_GRAPH_WRITE_APPEND;
 	if (opts.split)
-		flags |= COMMIT_GRAPH_SPLIT;
+		flags |= COMMIT_GRAPH_WRITE_SPLIT;
+	if (opts.progress)
+		flags |= COMMIT_GRAPH_WRITE_PROGRESS;
 
 	read_replace_refs = 0;
+	odb = find_odb(the_repository, opts.obj_dir);
 
 	if (opts.reachable) {
-		if (write_commit_graph_reachable(opts.obj_dir, flags, &split_opts))
+		if (write_commit_graph_reachable(odb, flags, &split_opts))
 			return 1;
 		return 0;
 	}
@@ -213,13 +184,15 @@ static int graph_write(int argc, const char **argv)
 
 		if (opts.stdin_packs)
 			pack_indexes = &lines;
-		if (opts.stdin_commits)
+		if (opts.stdin_commits) {
 			commit_hex = &lines;
+			flags |= COMMIT_GRAPH_WRITE_CHECK_OIDS;
+		}
 
 		UNLEAK(buf);
 	}
 
-	if (write_commit_graph(opts.obj_dir,
+	if (write_commit_graph(odb,
 			       pack_indexes,
 			       commit_hex,
 			       flags,
@@ -249,9 +222,9 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix)
 			     builtin_commit_graph_usage,
 			     PARSE_OPT_STOP_AT_NON_OPTION);
 
+	save_commit_buffer = 0;
+
 	if (argc > 0) {
-		if (!strcmp(argv[0], "read"))
-			return graph_read(argc, argv);
 		if (!strcmp(argv[0], "verify"))
 			return graph_verify(argc, argv);
 		if (!strcmp(argv[0], "write"))
diff --git a/third_party/git/builtin/commit.c b/third_party/git/builtin/commit.c
index ae7aaf6dc683..7ba33a3bec48 100644
--- a/third_party/git/builtin/commit.c
+++ b/third_party/git/builtin/commit.c
@@ -107,9 +107,9 @@ static int all, also, interactive, patch_interactive, only, amend, signoff;
 static int edit_flag = -1; /* unspecified */
 static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
 static int config_commit_verbose = -1; /* unspecified */
-static int no_post_rewrite, allow_empty_message;
+static int no_post_rewrite, allow_empty_message, pathspec_file_nul;
 static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg;
-static char *sign_commit;
+static char *sign_commit, *pathspec_from_file;
 
 /*
  * The default commit message cleanup mode will remove the lines
@@ -343,11 +343,31 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 		       PATHSPEC_PREFER_FULL,
 		       prefix, argv);
 
+	if (pathspec_from_file) {
+		if (interactive)
+			die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
+
+		if (all)
+			die(_("--pathspec-from-file with -a does not make sense"));
+
+		if (pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		parse_pathspec_file(&pathspec, 0,
+				    PATHSPEC_PREFER_FULL,
+				    prefix, pathspec_from_file, pathspec_file_nul);
+	} else if (pathspec_file_nul) {
+		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+	}
+
+	if (!pathspec.nr && (also || (only && !amend && !allow_empty)))
+		die(_("No paths with --include/--only does not make sense."));
+
 	if (read_cache_preload(&pathspec) < 0)
 		die(_("index file corrupt"));
 
 	if (interactive) {
-		char *old_index_env = NULL;
+		char *old_index_env = NULL, *old_repo_index_file;
 		hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
 
 		refresh_cache_or_die(refresh_flags);
@@ -355,12 +375,16 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 		if (write_locked_index(&the_index, &index_lock, 0))
 			die(_("unable to create temporary index"));
 
+		old_repo_index_file = the_repository->index_file;
+		the_repository->index_file =
+			(char *)get_lock_file_path(&index_lock);
 		old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
-		setenv(INDEX_ENVIRONMENT, get_lock_file_path(&index_lock), 1);
+		setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
 
 		if (interactive_add(argc, argv, prefix, patch_interactive) != 0)
 			die(_("interactive add failed"));
 
+		the_repository->index_file = old_repo_index_file;
 		if (old_index_env && *old_index_env)
 			setenv(INDEX_ENVIRONMENT, old_index_env, 1);
 		else
@@ -510,7 +534,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
 	s->nowarn = nowarn;
 	s->is_initial = get_oid(s->reference, &oid) ? 1 : 0;
 	if (!s->is_initial)
-		hashcpy(s->sha1_commit, oid.hash);
+		oidcpy(&s->oid_commit, &oid);
 	s->status_format = status_format;
 	s->ignore_submodule_arg = ignore_submodule_arg;
 
@@ -537,7 +561,7 @@ static void export_one(const char *var, const char *s, const char *e, int hack)
 	struct strbuf buf = STRBUF_INIT;
 	if (hack)
 		strbuf_addch(&buf, hack);
-	strbuf_addf(&buf, "%.*s", (int)(e - s), s);
+	strbuf_add(&buf, s, e - s);
 	setenv(var, buf.buf, 1);
 	strbuf_release(&buf);
 }
@@ -944,6 +968,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	 */
 	if (!committable && whence != FROM_MERGE && !allow_empty &&
 	    !(amend && is_a_merge(current_head))) {
+		s->hints = advice_status_hints;
 		s->display_comment_prefix = old_display_comment_prefix;
 		run_status(stdout, index_file, prefix, 0, s);
 		if (amend)
@@ -1198,8 +1223,6 @@ static int parse_and_validate_options(int argc, const char *argv[],
 
 	if (also + only + all + interactive > 1)
 		die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
-	if (argc == 0 && (also || (only && !amend && !allow_empty)))
-		die(_("No paths with --include/--only does not make sense."));
 	cleanup_mode = get_cleanup_mode(cleanup_arg, use_editor);
 
 	handle_untracked_files_arg(s);
@@ -1406,7 +1429,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 
 	s.is_initial = get_oid(s.reference, &oid) ? 1 : 0;
 	if (!s.is_initial)
-		hashcpy(s.sha1_commit, oid.hash);
+		oidcpy(&s.oid_commit, &oid);
 
 	s.ignore_submodule_arg = ignore_submodule_arg;
 	s.status_format = status_format;
@@ -1463,28 +1486,6 @@ static int git_commit_config(const char *k, const char *v, void *cb)
 	return git_status_config(k, v, s);
 }
 
-int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...)
-{
-	struct argv_array hook_env = ARGV_ARRAY_INIT;
-	va_list args;
-	int ret;
-
-	argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file);
-
-	/*
-	 * Let the hook know that no editor will be launched.
-	 */
-	if (!editor_is_used)
-		argv_array_push(&hook_env, "GIT_EDITOR=:");
-
-	va_start(args, name);
-	ret = run_hook_ve(hook_env.argv,name, args);
-	va_end(args);
-	argv_array_clear(&hook_env);
-
-	return ret;
-}
-
 int cmd_commit(int argc, const char **argv, const char *prefix)
 {
 	const char *argv_gc_auto[] = {"gc", "--auto", NULL};
@@ -1535,6 +1536,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "amend", &amend, N_("amend previous commit")),
 		OPT_BOOL(0, "no-post-rewrite", &no_post_rewrite, N_("bypass post-rewrite hook")),
 		{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, N_("mode"), N_("show untracked files, optional modes: all, normal, no. (Default: all)"), PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
+		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 		/* end commit contents options */
 
 		OPT_HIDDEN_BOOL(0, "allow-empty", &allow_empty,
@@ -1690,7 +1693,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		      "not exceeded, and then \"git restore --staged :/\" to recover."));
 
 	if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
-	    write_commit_graph_reachable(get_object_directory(), 0, NULL))
+	    write_commit_graph_reachable(the_repository->objects->odb, 0, NULL))
 		return 1;
 
 	repo_rerere(the_repository, 0);
diff --git a/third_party/git/builtin/config.c b/third_party/git/builtin/config.c
index 98d65bc0ad4f..ee4aef6a3555 100644
--- a/third_party/git/builtin/config.c
+++ b/third_party/git/builtin/config.c
@@ -29,10 +29,11 @@ static int use_worktree_config;
 static struct git_config_source given_config_source;
 static int actions, type;
 static char *default_value;
-static int end_null;
+static int end_nul;
 static int respect_includes_opt = -1;
 static struct config_options config_options;
 static int show_origin;
+static int show_scope;
 
 #define ACTION_GET (1<<0)
 #define ACTION_GET_ALL (1<<1)
@@ -151,10 +152,11 @@ static struct option builtin_config_options[] = {
 	OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH),
 	OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE),
 	OPT_GROUP(N_("Other")),
-	OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")),
+	OPT_BOOL('z', "null", &end_nul, N_("terminate values with NUL byte")),
 	OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),
 	OPT_BOOL(0, "includes", &respect_includes_opt, N_("respect include directives on lookup")),
 	OPT_BOOL(0, "show-origin", &show_origin, N_("show origin of config (file, standard input, blob, command line)")),
+	OPT_BOOL(0, "show-scope", &show_scope, N_("show scope of config (worktree, local, global, system, command)")),
 	OPT_STRING(0, "default", &default_value, N_("value"), N_("with --get, use default value when missing entry")),
 	OPT_END(),
 };
@@ -178,22 +180,34 @@ static void check_argc(int argc, int min, int max)
 
 static void show_config_origin(struct strbuf *buf)
 {
-	const char term = end_null ? '\0' : '\t';
+	const char term = end_nul ? '\0' : '\t';
 
 	strbuf_addstr(buf, current_config_origin_type());
 	strbuf_addch(buf, ':');
-	if (end_null)
+	if (end_nul)
 		strbuf_addstr(buf, current_config_name());
 	else
 		quote_c_style(current_config_name(), buf, NULL, 0);
 	strbuf_addch(buf, term);
 }
 
+static void show_config_scope(struct strbuf *buf)
+{
+	const char term = end_nul ? '\0' : '\t';
+	const char *scope = config_scope_name(current_config_scope());
+
+	strbuf_addstr(buf, N_(scope));
+	strbuf_addch(buf, term);
+}
+
 static int show_all_config(const char *key_, const char *value_, void *cb)
 {
-	if (show_origin) {
+	if (show_origin || show_scope) {
 		struct strbuf buf = STRBUF_INIT;
-		show_config_origin(&buf);
+		if (show_scope)
+			show_config_scope(&buf);
+		if (show_origin)
+			show_config_origin(&buf);
 		/* Use fwrite as "buf" can contain \0's if "end_null" is set. */
 		fwrite(buf.buf, 1, buf.len, stdout);
 		strbuf_release(&buf);
@@ -213,6 +227,8 @@ struct strbuf_list {
 
 static int format_config(struct strbuf *buf, const char *key_, const char *value_)
 {
+	if (show_scope)
+		show_config_scope(buf);
 	if (show_origin)
 		show_config_origin(buf);
 	if (show_keys)
@@ -622,6 +638,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 			!strcmp(given_config_source.file, "-")) {
 		given_config_source.file = NULL;
 		given_config_source.use_stdin = 1;
+		given_config_source.scope = CONFIG_SCOPE_COMMAND;
 	}
 
 	if (use_global_config) {
@@ -637,6 +654,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 			 */
 			die(_("$HOME not set"));
 
+		given_config_source.scope = CONFIG_SCOPE_GLOBAL;
+
 		if (access_or_warn(user_config, R_OK, 0) &&
 		    xdg_config && !access_or_warn(xdg_config, R_OK, 0)) {
 			given_config_source.file = xdg_config;
@@ -646,11 +665,13 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 			free(xdg_config);
 		}
 	}
-	else if (use_system_config)
+	else if (use_system_config) {
 		given_config_source.file = git_etc_gitconfig();
-	else if (use_local_config)
+		given_config_source.scope = CONFIG_SCOPE_SYSTEM;
+	} else if (use_local_config) {
 		given_config_source.file = git_pathdup("config");
-	else if (use_worktree_config) {
+		given_config_source.scope = CONFIG_SCOPE_LOCAL;
+	} else if (use_worktree_config) {
 		struct worktree **worktrees = get_worktrees(0);
 		if (repository_format_worktree_config)
 			given_config_source.file = git_pathdup("config.worktree");
@@ -662,13 +683,18 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 			      "section in \"git help worktree\" for details"));
 		else
 			given_config_source.file = git_pathdup("config");
+		given_config_source.scope = CONFIG_SCOPE_LOCAL;
 		free_worktrees(worktrees);
 	} else if (given_config_source.file) {
 		if (!is_absolute_path(given_config_source.file) && prefix)
 			given_config_source.file =
 				prefix_filename(prefix, given_config_source.file);
+		given_config_source.scope = CONFIG_SCOPE_COMMAND;
+	} else if (given_config_source.blob) {
+		given_config_source.scope = CONFIG_SCOPE_COMMAND;
 	}
 
+
 	if (respect_includes_opt == -1)
 		config_options.respect_includes = !given_config_source.file;
 	else
@@ -678,7 +704,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		config_options.git_dir = get_git_dir();
 	}
 
-	if (end_null) {
+	if (end_nul) {
 		term = '\0';
 		delim = '\n';
 		key_delim = '\n';
diff --git a/third_party/git/builtin/describe.c b/third_party/git/builtin/describe.c
index 200154297d5e..420f4c6401b6 100644
--- a/third_party/git/builtin/describe.c
+++ b/third_party/git/builtin/describe.c
@@ -15,7 +15,6 @@
 #include "argv-array.h"
 #include "run-command.h"
 #include "object-store.h"
-#include "revision.h"
 #include "list-objects.h"
 #include "commit-slab.h"
 
@@ -64,19 +63,22 @@ static const char *prio_names[] = {
 };
 
 static int commit_name_neq(const void *unused_cmp_data,
-			   const void *entry,
-			   const void *entry_or_key,
+			   const struct hashmap_entry *eptr,
+			   const struct hashmap_entry *entry_or_key,
 			   const void *peeled)
 {
-	const struct commit_name *cn1 = entry;
-	const struct commit_name *cn2 = entry_or_key;
+	const struct commit_name *cn1, *cn2;
+
+	cn1 = container_of(eptr, const struct commit_name, entry);
+	cn2 = container_of(entry_or_key, const struct commit_name, entry);
 
 	return !oideq(&cn1->peeled, peeled ? peeled : &cn2->peeled);
 }
 
 static inline struct commit_name *find_commit_name(const struct object_id *peeled)
 {
-	return hashmap_get_from_hash(&names, oidhash(peeled), peeled);
+	return hashmap_get_entry_from_hash(&names, oidhash(peeled), peeled,
+						struct commit_name, entry);
 }
 
 static int replace_name(struct commit_name *e,
@@ -123,8 +125,8 @@ static void add_to_known_names(const char *path,
 		if (!e) {
 			e = xmalloc(sizeof(struct commit_name));
 			oidcpy(&e->peeled, peeled);
-			hashmap_entry_init(e, oidhash(peeled));
-			hashmap_add(&names, e);
+			hashmap_entry_init(&e->entry, oidhash(peeled));
+			hashmap_add(&names, &e->entry);
 			e->path = NULL;
 		}
 		e->tag = tag;
@@ -313,7 +315,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
 		 */
 		append_name(n, dst);
 		if (longformat)
-			append_suffix(0, n->tag ? &n->tag->tagged->oid : oid, dst);
+			append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst);
 		if (suffix)
 			strbuf_addstr(dst, suffix);
 		return;
@@ -330,8 +332,8 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
 		struct commit_name *n;
 
 		init_commit_names(&commit_names);
-		n = hashmap_iter_first(&names, &iter);
-		for (; n; n = hashmap_iter_next(&iter)) {
+		hashmap_for_each_entry(&names, &iter, n,
+					entry /* member name */) {
 			c = lookup_commit_reference_gently(the_repository,
 							   &n->peeled, 1);
 			if (c)
@@ -374,11 +376,25 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
 			if (!(c->object.flags & t->flag_within))
 				t->depth++;
 		}
+		/* Stop if last remaining path already covered by best candidate(s) */
 		if (annotated_cnt && !list) {
-			if (debug)
-				fprintf(stderr, _("finished search at %s\n"),
-					oid_to_hex(&c->object.oid));
-			break;
+			int best_depth = INT_MAX;
+			unsigned best_within = 0;
+			for (cur_match = 0; cur_match < match_cnt; cur_match++) {
+				struct possible_tag *t = &all_matches[cur_match];
+				if (t->depth < best_depth) {
+					best_depth = t->depth;
+					best_within = t->flag_within;
+				} else if (t->depth == best_depth) {
+					best_within |= t->flag_within;
+				}
+			}
+			if ((c->object.flags & best_within) == best_within) {
+				if (debug)
+					fprintf(stderr, _("finished search at %s\n"),
+						oid_to_hex(&c->object.oid));
+				break;
+			}
 		}
 		while (parents) {
 			struct commit *p = parents->item;
diff --git a/third_party/git/builtin/difftool.c b/third_party/git/builtin/difftool.c
index 16eb8b70ea33..c280e682b2ae 100644
--- a/third_party/git/builtin/difftool.c
+++ b/third_party/git/builtin/difftool.c
@@ -125,12 +125,15 @@ struct working_tree_entry {
 };
 
 static int working_tree_entry_cmp(const void *unused_cmp_data,
-				  const void *entry,
-				  const void *entry_or_key,
+				  const struct hashmap_entry *eptr,
+				  const struct hashmap_entry *entry_or_key,
 				  const void *unused_keydata)
 {
-	const struct working_tree_entry *a = entry;
-	const struct working_tree_entry *b = entry_or_key;
+	const struct working_tree_entry *a, *b;
+
+	a = container_of(eptr, const struct working_tree_entry, entry);
+	b = container_of(entry_or_key, const struct working_tree_entry, entry);
+
 	return strcmp(a->path, b->path);
 }
 
@@ -145,12 +148,14 @@ struct pair_entry {
 };
 
 static int pair_cmp(const void *unused_cmp_data,
-		    const void *entry,
-		    const void *entry_or_key,
+		    const struct hashmap_entry *eptr,
+		    const struct hashmap_entry *entry_or_key,
 		    const void *unused_keydata)
 {
-	const struct pair_entry *a = entry;
-	const struct pair_entry *b = entry_or_key;
+	const struct pair_entry *a, *b;
+
+	a = container_of(eptr, const struct pair_entry, entry);
+	b = container_of(entry_or_key, const struct pair_entry, entry);
 
 	return strcmp(a->path, b->path);
 }
@@ -161,14 +166,14 @@ static void add_left_or_right(struct hashmap *map, const char *path,
 	struct pair_entry *e, *existing;
 
 	FLEX_ALLOC_STR(e, path, path);
-	hashmap_entry_init(e, strhash(path));
-	existing = hashmap_get(map, e, NULL);
+	hashmap_entry_init(&e->entry, strhash(path));
+	existing = hashmap_get_entry(map, e, entry, NULL);
 	if (existing) {
 		free(e);
 		e = existing;
 	} else {
 		e->left[0] = e->right[0] = '\0';
-		hashmap_add(map, e);
+		hashmap_add(map, &e->entry);
 	}
 	strlcpy(is_right ? e->right : e->left, content, PATH_MAX);
 }
@@ -179,12 +184,14 @@ struct path_entry {
 };
 
 static int path_entry_cmp(const void *unused_cmp_data,
-			  const void *entry,
-			  const void *entry_or_key,
+			  const struct hashmap_entry *eptr,
+			  const struct hashmap_entry *entry_or_key,
 			  const void *key)
 {
-	const struct path_entry *a = entry;
-	const struct path_entry *b = entry_or_key;
+	const struct path_entry *a, *b;
+
+	a = container_of(eptr, const struct path_entry, entry);
+	b = container_of(entry_or_key, const struct path_entry, entry);
 
 	return strcmp(a->path, key ? key : b->path);
 }
@@ -234,8 +241,8 @@ static void changed_files(struct hashmap *result, const char *index_path,
 	while (!strbuf_getline_nul(&buf, fp)) {
 		struct path_entry *entry;
 		FLEX_ALLOC_STR(entry, path, buf.buf);
-		hashmap_entry_init(entry, strhash(buf.buf));
-		hashmap_add(result, entry);
+		hashmap_entry_init(&entry->entry, strhash(buf.buf));
+		hashmap_add(result, &entry->entry);
 	}
 	fclose(fp);
 	if (finish_command(&diff_files))
@@ -461,12 +468,13 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 
 			/* Avoid duplicate working_tree entries */
 			FLEX_ALLOC_STR(entry, path, dst_path);
-			hashmap_entry_init(entry, strhash(dst_path));
-			if (hashmap_get(&working_tree_dups, entry, NULL)) {
+			hashmap_entry_init(&entry->entry, strhash(dst_path));
+			if (hashmap_get(&working_tree_dups, &entry->entry,
+					NULL)) {
 				free(entry);
 				continue;
 			}
-			hashmap_add(&working_tree_dups, entry);
+			hashmap_add(&working_tree_dups, &entry->entry);
 
 			if (!use_wt_file(workdir, dst_path, &roid)) {
 				if (checkout_path(rmode, &roid, dst_path,
@@ -530,8 +538,8 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	 * temporary file to both the left and right directories to show the
 	 * change in the recorded SHA1 for the submodule.
 	 */
-	hashmap_iter_init(&submodules, &iter);
-	while ((entry = hashmap_iter_next(&iter))) {
+	hashmap_for_each_entry(&submodules, &iter, entry,
+				entry /* member name */) {
 		if (*entry->left) {
 			add_path(&ldir, ldir_len, entry->path);
 			ensure_leading_directories(ldir.buf);
@@ -549,8 +557,8 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	 * shows only the link itself, not the contents of the link target.
 	 * This loop replicates that behavior.
 	 */
-	hashmap_iter_init(&symlinks2, &iter);
-	while ((entry = hashmap_iter_next(&iter))) {
+	hashmap_for_each_entry(&symlinks2, &iter, entry,
+				entry /* member name */) {
 		if (*entry->left) {
 			add_path(&ldir, ldir_len, entry->path);
 			ensure_leading_directories(ldir.buf);
diff --git a/third_party/git/builtin/fast-export.c b/third_party/git/builtin/fast-export.c
index f541f55d333b..85868162eec9 100644
--- a/third_party/git/builtin/fast-export.c
+++ b/third_party/git/builtin/fast-export.c
@@ -40,6 +40,7 @@ static int no_data;
 static int full_tree;
 static int reference_excluded_commits;
 static int show_original_ids;
+static int mark_tags;
 static struct string_list extra_refs = STRING_LIST_INIT_NODUP;
 static struct string_list tag_refs = STRING_LIST_INIT_NODUP;
 static struct refspec refspecs = REFSPEC_INIT_FETCH;
@@ -126,10 +127,15 @@ struct anonymized_entry {
 };
 
 static int anonymized_entry_cmp(const void *unused_cmp_data,
-				const void *va, const void *vb,
+				const struct hashmap_entry *eptr,
+				const struct hashmap_entry *entry_or_key,
 				const void *unused_keydata)
 {
-	const struct anonymized_entry *a = va, *b = vb;
+	const struct anonymized_entry *a, *b;
+
+	a = container_of(eptr, const struct anonymized_entry, hash);
+	b = container_of(entry_or_key, const struct anonymized_entry, hash);
+
 	return a->orig_len != b->orig_len ||
 		memcmp(a->orig, b->orig, a->orig_len);
 }
@@ -148,10 +154,10 @@ static const void *anonymize_mem(struct hashmap *map,
 	if (!map->cmpfn)
 		hashmap_init(map, anonymized_entry_cmp, NULL, 0);
 
-	hashmap_entry_init(&key, memhash(orig, *len));
+	hashmap_entry_init(&key.hash, memhash(orig, *len));
 	key.orig = orig;
 	key.orig_len = *len;
-	ret = hashmap_get(map, &key, NULL);
+	ret = hashmap_get_entry(map, &key, hash, NULL);
 
 	if (!ret) {
 		ret = xmalloc(sizeof(*ret));
@@ -160,7 +166,7 @@ static const void *anonymize_mem(struct hashmap *map,
 		ret->orig_len = *len;
 		ret->anon = generate(orig, len);
 		ret->anon_len = *len;
-		hashmap_put(map, ret);
+		hashmap_put(map, &ret->hash);
 	}
 
 	*len = ret->anon_len;
@@ -287,7 +293,8 @@ static void export_blob(const struct object_id *oid)
 		buf = read_object_file(oid, &type, &size);
 		if (!buf)
 			die("could not read blob %s", oid_to_hex(oid));
-		if (check_object_signature(oid, buf, size, type_name(type)) < 0)
+		if (check_object_signature(the_repository, oid, buf, size,
+					   type_name(type)) < 0)
 			die("oid mismatch in blob %s", oid_to_hex(oid));
 		object = parse_object_buffer(the_repository, oid, type,
 					     size, buf, &eaten);
@@ -842,25 +849,39 @@ static void handle_tag(const char *name, struct tag *tag)
 			free(buf);
 			return;
 		case REWRITE:
-			if (tagged->type != OBJ_COMMIT) {
-				die("tag %s tags unexported %s!",
-				    oid_to_hex(&tag->object.oid),
-				    type_name(tagged->type));
-			}
-			p = rewrite_commit((struct commit *)tagged);
-			if (!p) {
-				printf("reset %s\nfrom %s\n\n",
-				       name, oid_to_hex(&null_oid));
-				free(buf);
-				return;
+			if (tagged->type == OBJ_TAG && !mark_tags) {
+				die(_("Error: Cannot export nested tags unless --mark-tags is specified."));
+			} else if (tagged->type == OBJ_COMMIT) {
+				p = rewrite_commit((struct commit *)tagged);
+				if (!p) {
+					printf("reset %s\nfrom %s\n\n",
+					       name, oid_to_hex(&null_oid));
+					free(buf);
+					return;
+				}
+				tagged_mark = get_object_mark(&p->object);
+			} else {
+				/* tagged->type is either OBJ_BLOB or OBJ_TAG */
+				tagged_mark = get_object_mark(tagged);
 			}
-			tagged_mark = get_object_mark(&p->object);
 		}
 	}
 
-	if (starts_with(name, "refs/tags/"))
-		name += 10;
-	printf("tag %s\nfrom :%d\n", name, tagged_mark);
+	if (tagged->type == OBJ_TAG) {
+		printf("reset %s\nfrom %s\n\n",
+		       name, oid_to_hex(&null_oid));
+	}
+	skip_prefix(name, "refs/tags/", &name);
+	printf("tag %s\n", name);
+	if (mark_tags) {
+		mark_next_object(&tag->object);
+		printf("mark :%"PRIu32"\n", last_idnum);
+	}
+	if (tagged_mark)
+		printf("from :%d\n", tagged_mark);
+	else
+		printf("from %s\n", oid_to_hex(&tagged->oid));
+
 	if (show_original_ids)
 		printf("original-oid %s\n", oid_to_hex(&tag->object.oid));
 	printf("%.*s%sdata %d\n%.*s\n",
@@ -1047,11 +1068,16 @@ static void export_marks(char *file)
 		error("Unable to write marks file %s.", file);
 }
 
-static void import_marks(char *input_file)
+static void import_marks(char *input_file, int check_exists)
 {
 	char line[512];
-	FILE *f = xfopen(input_file, "r");
+	FILE *f;
+	struct stat sb;
+
+	if (check_exists && stat(input_file, &sb))
+		return;
 
+	f = xfopen(input_file, "r");
 	while (fgets(line, sizeof(line), f)) {
 		uint32_t mark;
 		char *line_end, *mark_end;
@@ -1115,7 +1141,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 	struct rev_info revs;
 	struct object_array commits = OBJECT_ARRAY_INIT;
 	struct commit *commit;
-	char *export_filename = NULL, *import_filename = NULL;
+	char *export_filename = NULL,
+	     *import_filename = NULL,
+	     *import_filename_if_exists = NULL;
 	uint32_t lastimportid;
 	struct string_list refspecs_list = STRING_LIST_INIT_NODUP;
 	struct string_list paths_of_changed_objects = STRING_LIST_INIT_DUP;
@@ -1135,6 +1163,10 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 			     N_("Dump marks to this file")),
 		OPT_STRING(0, "import-marks", &import_filename, N_("file"),
 			     N_("Import marks from this file")),
+		OPT_STRING(0, "import-marks-if-exists",
+			     &import_filename_if_exists,
+			     N_("file"),
+			     N_("Import marks from this file if it exists")),
 		OPT_BOOL(0, "fake-missing-tagger", &fake_missing_tagger,
 			 N_("Fake a tagger when tags lack one")),
 		OPT_BOOL(0, "full-tree", &full_tree,
@@ -1149,6 +1181,8 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 			 &reference_excluded_commits, N_("Reference parents which are not in fast-export stream by object id")),
 		OPT_BOOL(0, "show-original-ids", &show_original_ids,
 			    N_("Show original object ids of blobs/commits")),
+		OPT_BOOL(0, "mark-tags", &mark_tags,
+			    N_("Label tags with mark ids")),
 
 		OPT_END()
 	};
@@ -1182,8 +1216,12 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 	if (use_done_feature)
 		printf("feature done\n");
 
+	if (import_filename && import_filename_if_exists)
+		die(_("Cannot pass both --import-marks and --import-marks-if-exists"));
 	if (import_filename)
-		import_marks(import_filename);
+		import_marks(import_filename, 0);
+	else if (import_filename_if_exists)
+		import_marks(import_filename_if_exists, 1);
 	lastimportid = last_idnum;
 
 	if (import_filename && revs.prune_data.nr)
diff --git a/third_party/git/builtin/fetch.c b/third_party/git/builtin/fetch.c
index 717dd14e8961..bf6bab80fab9 100644
--- a/third_party/git/builtin/fetch.c
+++ b/third_party/git/builtin/fetch.c
@@ -7,6 +7,7 @@
 #include "refs.h"
 #include "refspec.h"
 #include "object-store.h"
+#include "oidset.h"
 #include "commit.h"
 #include "builtin.h"
 #include "string-list.h"
@@ -23,6 +24,9 @@
 #include "packfile.h"
 #include "list-objects-filter-options.h"
 #include "commit-reach.h"
+#include "branch.h"
+#include "promisor-remote.h"
+#include "commit-graph.h"
 
 #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
 
@@ -50,11 +54,13 @@ static int fetch_prune_tags_config = -1; /* unspecified */
 static int prune_tags = -1; /* unspecified */
 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
 
-static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
+static int all, append, dry_run, force, keep, multiple, update_head_ok;
+static int verbosity, deepen_relative, set_upstream;
 static int progress = -1;
 static int enable_auto_gc = 1;
 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
-static int max_children = 1;
+static int max_jobs = -1, submodule_fetch_jobs_config = -1;
+static int fetch_parallel_config = 1;
 static enum transport_family family;
 static const char *depth;
 static const char *deepen_since;
@@ -71,6 +77,7 @@ static struct refspec refmap = REFSPEC_INIT_FETCH;
 static struct list_objects_filter_options filter_options;
 static struct string_list server_options = STRING_LIST_INIT_DUP;
 static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
+static int fetch_write_commit_graph = -1;
 
 static int git_fetch_config(const char *k, const char *v, void *cb)
 {
@@ -96,13 +103,20 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
 	}
 
 	if (!strcmp(k, "submodule.fetchjobs")) {
-		max_children = parse_submodule_fetchjobs(k, v);
+		submodule_fetch_jobs_config = parse_submodule_fetchjobs(k, v);
 		return 0;
 	} else if (!strcmp(k, "fetch.recursesubmodules")) {
 		recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
 		return 0;
 	}
 
+	if (!strcmp(k, "fetch.parallel")) {
+		fetch_parallel_config = git_config_int(k, v);
+		if (fetch_parallel_config < 0)
+			die(_("fetch.parallel cannot be negative"));
+		return 0;
+	}
+
 	return git_default_config(k, v, cb);
 }
 
@@ -123,6 +137,8 @@ static struct option builtin_fetch_options[] = {
 	OPT__VERBOSITY(&verbosity),
 	OPT_BOOL(0, "all", &all,
 		 N_("fetch from all remotes")),
+	OPT_BOOL(0, "set-upstream", &set_upstream,
+		 N_("set upstream for git pull/fetch")),
 	OPT_BOOL('a', "append", &append,
 		 N_("append to .git/FETCH_HEAD instead of overwriting")),
 	OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
@@ -134,7 +150,7 @@ static struct option builtin_fetch_options[] = {
 		    N_("fetch all tags and associated objects"), TAGS_SET),
 	OPT_SET_INT('n', NULL, &tags,
 		    N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
-	OPT_INTEGER('j', "jobs", &max_children,
+	OPT_INTEGER('j', "jobs", &max_jobs,
 		    N_("number of submodules fetched in parallel")),
 	OPT_BOOL('p', "prune", &prune,
 		 N_("prune remote-tracking branches no longer on remote")),
@@ -183,6 +199,8 @@ static struct option builtin_fetch_options[] = {
 		 N_("run 'gc --auto' after fetching")),
 	OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates,
 		 N_("check for forced-updates on all updated branches")),
+	OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph,
+		 N_("write the commit-graph after fetching")),
 	OPT_END()
 };
 
@@ -239,32 +257,31 @@ static void add_merge_config(struct ref **head,
 	}
 }
 
-static int will_fetch(struct ref **head, const unsigned char *sha1)
+static void create_fetch_oidset(struct ref **head, struct oidset *out)
 {
 	struct ref *rm = *head;
 	while (rm) {
-		if (hasheq(rm->old_oid.hash, sha1))
-			return 1;
+		oidset_insert(out, &rm->old_oid);
 		rm = rm->next;
 	}
-	return 0;
 }
 
 struct refname_hash_entry {
-	struct hashmap_entry ent; /* must be the first member */
+	struct hashmap_entry ent;
 	struct object_id oid;
 	int ignore;
 	char refname[FLEX_ARRAY];
 };
 
 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data,
-				  const void *e1_,
-				  const void *e2_,
+				  const struct hashmap_entry *eptr,
+				  const struct hashmap_entry *entry_or_key,
 				  const void *keydata)
 {
-	const struct refname_hash_entry *e1 = e1_;
-	const struct refname_hash_entry *e2 = e2_;
+	const struct refname_hash_entry *e1, *e2;
 
+	e1 = container_of(eptr, const struct refname_hash_entry, ent);
+	e2 = container_of(entry_or_key, const struct refname_hash_entry, ent);
 	return strcmp(e1->refname, keydata ? keydata : e2->refname);
 }
 
@@ -276,9 +293,9 @@ static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
 	size_t len = strlen(refname);
 
 	FLEX_ALLOC_MEM(ent, refname, refname, len);
-	hashmap_entry_init(ent, strhash(refname));
+	hashmap_entry_init(&ent->ent, strhash(refname));
 	oidcpy(&ent->oid, oid);
-	hashmap_add(map, ent);
+	hashmap_add(map, &ent->ent);
 	return ent;
 }
 
@@ -313,13 +330,16 @@ static void find_non_local_tags(const struct ref *refs,
 {
 	struct hashmap existing_refs;
 	struct hashmap remote_refs;
+	struct oidset fetch_oids = OIDSET_INIT;
 	struct string_list remote_refs_list = STRING_LIST_INIT_NODUP;
 	struct string_list_item *remote_ref_item;
 	const struct ref *ref;
 	struct refname_hash_entry *item = NULL;
+	const int quick_flags = OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT;
 
 	refname_hash_init(&existing_refs);
 	refname_hash_init(&remote_refs);
+	create_fetch_oidset(head, &fetch_oids);
 
 	for_each_ref(add_one_refname, &existing_refs);
 	for (ref = refs; ref; ref = ref->next) {
@@ -334,11 +354,10 @@ static void find_non_local_tags(const struct ref *refs,
 		 */
 		if (ends_with(ref->name, "^{}")) {
 			if (item &&
-			    !has_object_file_with_flags(&ref->old_oid,
-							OBJECT_INFO_QUICK) &&
-			    !will_fetch(head, ref->old_oid.hash) &&
-			    !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
-			    !will_fetch(head, item->oid.hash))
+			    !has_object_file_with_flags(&ref->old_oid, quick_flags) &&
+			    !oidset_contains(&fetch_oids, &ref->old_oid) &&
+			    !has_object_file_with_flags(&item->oid, quick_flags) &&
+			    !oidset_contains(&fetch_oids, &item->oid))
 				clear_item(item);
 			item = NULL;
 			continue;
@@ -351,8 +370,8 @@ static void find_non_local_tags(const struct ref *refs,
 		 * fetch.
 		 */
 		if (item &&
-		    !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
-		    !will_fetch(head, item->oid.hash))
+		    !has_object_file_with_flags(&item->oid, quick_flags) &&
+		    !oidset_contains(&fetch_oids, &item->oid))
 			clear_item(item);
 
 		item = NULL;
@@ -365,15 +384,15 @@ static void find_non_local_tags(const struct ref *refs,
 		item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
 		string_list_insert(&remote_refs_list, ref->name);
 	}
-	hashmap_free(&existing_refs, 1);
+	hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent);
 
 	/*
 	 * We may have a final lightweight tag that needs to be
 	 * checked to see if it needs fetching.
 	 */
 	if (item &&
-	    !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
-	    !will_fetch(head, item->oid.hash))
+	    !has_object_file_with_flags(&item->oid, quick_flags) &&
+	    !oidset_contains(&fetch_oids, &item->oid))
 		clear_item(item);
 
 	/*
@@ -383,8 +402,10 @@ static void find_non_local_tags(const struct ref *refs,
 	for_each_string_list_item(remote_ref_item, &remote_refs_list) {
 		const char *refname = remote_ref_item->string;
 		struct ref *rm;
+		unsigned int hash = strhash(refname);
 
-		item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname);
+		item = hashmap_get_entry_from_hash(&remote_refs, hash, refname,
+					struct refname_hash_entry, ent);
 		if (!item)
 			BUG("unseen remote ref?");
 
@@ -398,8 +419,9 @@ static void find_non_local_tags(const struct ref *refs,
 		**tail = rm;
 		*tail = &rm->next;
 	}
-	hashmap_free(&remote_refs, 1);
+	hashmap_free_entries(&remote_refs, struct refname_hash_entry, ent);
 	string_list_clear(&remote_refs_list, 0);
+	oidset_clear(&fetch_oids);
 }
 
 static struct ref *get_ref_map(struct remote *remote,
@@ -516,17 +538,18 @@ static struct ref *get_ref_map(struct remote *remote,
 		if (rm->peer_ref) {
 			const char *refname = rm->peer_ref->name;
 			struct refname_hash_entry *peer_item;
+			unsigned int hash = strhash(refname);
 
-			peer_item = hashmap_get_from_hash(&existing_refs,
-							  strhash(refname),
-							  refname);
+			peer_item = hashmap_get_entry_from_hash(&existing_refs,
+						hash, refname,
+						struct refname_hash_entry, ent);
 			if (peer_item) {
 				struct object_id *old_oid = &peer_item->oid;
 				oidcpy(&rm->peer_ref->old_oid, old_oid);
 			}
 		}
 	}
-	hashmap_free(&existing_refs, 1);
+	hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent);
 
 	return ref_map;
 }
@@ -883,8 +906,17 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 		url = xstrdup("foreign");
 
 	if (!connectivity_checked) {
+		struct check_connected_options opt = CHECK_CONNECTED_INIT;
+
+		if (filter_options.choice)
+			/*
+			 * Since a filter is specified, objects indirectly
+			 * referenced by refs are allowed to be absent.
+			 */
+			opt.check_refs_are_promisor_objects_only = 1;
+
 		rm = ref_map;
-		if (check_connected(iterate_ref_map, &rm, NULL)) {
+		if (check_connected(iterate_ref_map, &rm, &opt)) {
 			rc = error(_("%s did not send all necessary objects\n"), url);
 			goto abort;
 		}
@@ -934,18 +966,12 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 				kind = "";
 				what = "";
 			}
-			else if (starts_with(rm->name, "refs/heads/")) {
+			else if (skip_prefix(rm->name, "refs/heads/", &what))
 				kind = "branch";
-				what = rm->name + 11;
-			}
-			else if (starts_with(rm->name, "refs/tags/")) {
+			else if (skip_prefix(rm->name, "refs/tags/", &what))
 				kind = "tag";
-				what = rm->name + 10;
-			}
-			else if (starts_with(rm->name, "refs/remotes/")) {
+			else if (skip_prefix(rm->name, "refs/remotes/", &what))
 				kind = "remote-tracking branch";
-				what = rm->name + 13;
-			}
 			else {
 				kind = "";
 				what = rm->name;
@@ -1054,7 +1080,8 @@ static int check_exist_and_connected(struct ref *ref_map)
 	 * we need all direct targets to exist.
 	 */
 	for (r = rm; r; r = r->next) {
-		if (!has_object_file(&r->old_oid))
+		if (!has_object_file_with_flags(&r->old_oid,
+						OBJECT_INFO_SKIP_FETCH_OBJECT))
 			return -1;
 	}
 
@@ -1065,8 +1092,11 @@ static int check_exist_and_connected(struct ref *ref_map)
 static int fetch_refs(struct transport *transport, struct ref *ref_map)
 {
 	int ret = check_exist_and_connected(ref_map);
-	if (ret)
+	if (ret) {
+		trace2_region_enter("fetch", "fetch_refs", the_repository);
 		ret = transport_fetch_refs(transport, ref_map);
+		trace2_region_leave("fetch", "fetch_refs", the_repository);
+	}
 	if (!ret)
 		/*
 		 * Keep the new pack's ".keep" file around to allow the caller
@@ -1082,11 +1112,14 @@ static int consume_refs(struct transport *transport, struct ref *ref_map)
 {
 	int connectivity_checked = transport->smart_options
 		? transport->smart_options->connectivity_checked : 0;
-	int ret = store_updated_refs(transport->url,
-				     transport->remote->name,
-				     connectivity_checked,
-				     ref_map);
+	int ret;
+	trace2_region_enter("fetch", "consume_refs", the_repository);
+	ret = store_updated_refs(transport->url,
+				 transport->remote->name,
+				 connectivity_checked,
+				 ref_map);
 	transport_unlock_pack(transport);
+	trace2_region_leave("fetch", "consume_refs", the_repository);
 	return ret;
 }
 
@@ -1238,13 +1271,10 @@ static struct transport *prepare_transport(struct remote *remote, int deepen)
 	if (update_shallow)
 		set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
 	if (filter_options.choice) {
-		struct strbuf expanded_filter_spec = STRBUF_INIT;
-		expand_list_objects_filter_spec(&filter_options,
-						&expanded_filter_spec);
-		set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
-			   expanded_filter_spec.buf);
+		const char *spec =
+			expand_list_objects_filter_spec(&filter_options);
+		set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec);
 		set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
-		strbuf_release(&expanded_filter_spec);
 	}
 	if (negotiation_tip.nr) {
 		if (transport->smart_options)
@@ -1334,9 +1364,11 @@ static int do_fetch(struct transport *transport,
 			argv_array_push(&ref_prefixes, "refs/tags/");
 	}
 
-	if (must_list_refs)
+	if (must_list_refs) {
+		trace2_region_enter("fetch", "remote_refs", the_repository);
 		remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
-	else
+		trace2_region_leave("fetch", "remote_refs", the_repository);
+	} else
 		remote_refs = NULL;
 
 	argv_array_clear(&ref_prefixes);
@@ -1367,6 +1399,51 @@ static int do_fetch(struct transport *transport,
 		retcode = 1;
 		goto cleanup;
 	}
+
+	if (set_upstream) {
+		struct branch *branch = branch_get("HEAD");
+		struct ref *rm;
+		struct ref *source_ref = NULL;
+
+		/*
+		 * We're setting the upstream configuration for the
+		 * current branch. The relevant upstream is the
+		 * fetched branch that is meant to be merged with the
+		 * current one, i.e. the one fetched to FETCH_HEAD.
+		 *
+		 * When there are several such branches, consider the
+		 * request ambiguous and err on the safe side by doing
+		 * nothing and just emit a warning.
+		 */
+		for (rm = ref_map; rm; rm = rm->next) {
+			if (!rm->peer_ref) {
+				if (source_ref) {
+					warning(_("multiple branches detected, incompatible with --set-upstream"));
+					goto skip;
+				} else {
+					source_ref = rm;
+				}
+			}
+		}
+		if (source_ref) {
+			if (!strcmp(source_ref->name, "HEAD") ||
+			    starts_with(source_ref->name, "refs/heads/"))
+				install_branch_config(0,
+						      branch->name,
+						      transport->remote->name,
+						      source_ref->name);
+			else if (starts_with(source_ref->name, "refs/remotes/"))
+				warning(_("not setting upstream for a remote remote-tracking branch"));
+			else if (starts_with(source_ref->name, "refs/tags/"))
+				warning(_("not setting upstream for a remote tag"));
+			else
+				warning(_("unknown branch type"));
+		} else {
+			warning(_("no source branch found.\n"
+				"you need to specify exactly one branch with the --set-upstream option."));
+		}
+	}
+ skip:
 	free_refs(ref_map);
 
 	/* if neither --no-tags nor --tags was specified, do automated tag
@@ -1463,7 +1540,62 @@ static void add_options_to_argv(struct argv_array *argv)
 
 }
 
-static int fetch_multiple(struct string_list *list)
+/* Fetch multiple remotes in parallel */
+
+struct parallel_fetch_state {
+	const char **argv;
+	struct string_list *remotes;
+	int next, result;
+};
+
+static int fetch_next_remote(struct child_process *cp, struct strbuf *out,
+			     void *cb, void **task_cb)
+{
+	struct parallel_fetch_state *state = cb;
+	char *remote;
+
+	if (state->next < 0 || state->next >= state->remotes->nr)
+		return 0;
+
+	remote = state->remotes->items[state->next++].string;
+	*task_cb = remote;
+
+	argv_array_pushv(&cp->args, state->argv);
+	argv_array_push(&cp->args, remote);
+	cp->git_cmd = 1;
+
+	if (verbosity >= 0)
+		printf(_("Fetching %s\n"), remote);
+
+	return 1;
+}
+
+static int fetch_failed_to_start(struct strbuf *out, void *cb, void *task_cb)
+{
+	struct parallel_fetch_state *state = cb;
+	const char *remote = task_cb;
+
+	state->result = error(_("Could not fetch %s"), remote);
+
+	return 0;
+}
+
+static int fetch_finished(int result, struct strbuf *out,
+			  void *cb, void *task_cb)
+{
+	struct parallel_fetch_state *state = cb;
+	const char *remote = task_cb;
+
+	if (result) {
+		strbuf_addf(out, _("could not fetch '%s' (exit code: %d)\n"),
+			    remote, result);
+		state->result = -1;
+	}
+
+	return 0;
+}
+
+static int fetch_multiple(struct string_list *list, int max_children)
 {
 	int i, result = 0;
 	struct argv_array argv = ARGV_ARRAY_INIT;
@@ -1474,23 +1606,38 @@ static int fetch_multiple(struct string_list *list)
 			return errcode;
 	}
 
-	argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL);
+	argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc",
+			"--no-write-commit-graph", NULL);
 	add_options_to_argv(&argv);
 
-	for (i = 0; i < list->nr; i++) {
-		const char *name = list->items[i].string;
-		argv_array_push(&argv, name);
-		if (verbosity >= 0)
-			printf(_("Fetching %s\n"), name);
-		if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
-			error(_("Could not fetch %s"), name);
-			result = 1;
+	if (max_children != 1 && list->nr != 1) {
+		struct parallel_fetch_state state = { argv.argv, list, 0, 0 };
+
+		argv_array_push(&argv, "--end-of-options");
+		result = run_processes_parallel_tr2(max_children,
+						    &fetch_next_remote,
+						    &fetch_failed_to_start,
+						    &fetch_finished,
+						    &state,
+						    "fetch", "parallel/fetch");
+
+		if (!result)
+			result = state.result;
+	} else
+		for (i = 0; i < list->nr; i++) {
+			const char *name = list->items[i].string;
+			argv_array_push(&argv, name);
+			if (verbosity >= 0)
+				printf(_("Fetching %s\n"), name);
+			if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+				error(_("Could not fetch %s"), name);
+				result = 1;
+			}
+			argv_array_pop(&argv);
 		}
-		argv_array_pop(&argv);
-	}
 
 	argv_array_clear(&argv);
-	return result;
+	return !!result;
 }
 
 /*
@@ -1510,37 +1657,27 @@ static inline void fetch_one_setup_partial(struct remote *remote)
 	 * If no prior partial clone/fetch and the current fetch DID NOT
 	 * request a partial-fetch, do a normal fetch.
 	 */
-	if (!repository_format_partial_clone && !filter_options.choice)
+	if (!has_promisor_remote() && !filter_options.choice)
 		return;
 
 	/*
-	 * If this is the FIRST partial-fetch request, we enable partial
-	 * on this repo and remember the given filter-spec as the default
-	 * for subsequent fetches to this remote.
+	 * If this is a partial-fetch request, we enable partial on
+	 * this repo if not already enabled and remember the given
+	 * filter-spec as the default for subsequent fetches to this
+	 * remote.
 	 */
-	if (!repository_format_partial_clone && filter_options.choice) {
+	if (filter_options.choice) {
 		partial_clone_register(remote->name, &filter_options);
 		return;
 	}
 
 	/*
-	 * We are currently limited to only ONE promisor remote and only
-	 * allow partial-fetches from the promisor remote.
-	 */
-	if (strcmp(remote->name, repository_format_partial_clone)) {
-		if (filter_options.choice)
-			die(_("--filter can only be used with the remote "
-			      "configured in extensions.partialClone"));
-		return;
-	}
-
-	/*
 	 * Do a partial-fetch from the promisor remote using either the
 	 * explicitly given filter-spec or inherit the filter-spec from
 	 * the config.
 	 */
 	if (!filter_options.choice)
-		partial_clone_get_default_filter_spec(&filter_options);
+		partial_clone_get_default_filter_spec(&filter_options, remote->name);
 	return;
 }
 
@@ -1626,14 +1763,13 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 
 	packet_trace_identity("fetch");
 
-	fetch_if_missing = 0;
-
 	/* Record the command line for the reflog */
 	strbuf_addstr(&default_rla, "fetch");
 	for (i = 1; i < argc; i++)
 		strbuf_addf(&default_rla, " %s", argv[i]);
 
-	fetch_config_from_gitmodules(&max_children, &recurse_submodules);
+	fetch_config_from_gitmodules(&submodule_fetch_jobs_config,
+				     &recurse_submodules);
 	git_config(git_fetch_config, NULL);
 
 	argc = parse_options(argc, argv, prefix,
@@ -1661,7 +1797,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	if (depth || deepen_since || deepen_not.nr)
 		deepen = 1;
 
-	if (filter_options.choice && !repository_format_partial_clone)
+	if (filter_options.choice && !has_promisor_remote())
 		die("--filter can only be used when extensions.partialClone is set");
 
 	if (all) {
@@ -1695,19 +1831,31 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	}
 
 	if (remote) {
-		if (filter_options.choice || repository_format_partial_clone)
+		if (filter_options.choice || has_promisor_remote())
 			fetch_one_setup_partial(remote);
 		result = fetch_one(remote, argc, argv, prune_tags_ok);
 	} else {
+		int max_children = max_jobs;
+
 		if (filter_options.choice)
 			die(_("--filter can only be used with the remote "
 			      "configured in extensions.partialclone"));
+
+		if (max_children < 0)
+			max_children = fetch_parallel_config;
+
 		/* TODO should this also die if we have a previous partial-clone? */
-		result = fetch_multiple(&list);
+		result = fetch_multiple(&list, max_children);
 	}
 
 	if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
 		struct argv_array options = ARGV_ARRAY_INIT;
+		int max_children = max_jobs;
+
+		if (max_children < 0)
+			max_children = submodule_fetch_jobs_config;
+		if (max_children < 0)
+			max_children = fetch_parallel_config;
 
 		add_options_to_argv(&options);
 		result = fetch_populated_submodules(the_repository,
@@ -1722,6 +1870,20 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 
 	string_list_clear(&list, 0);
 
+	prepare_repo_settings(the_repository);
+	if (fetch_write_commit_graph > 0 ||
+	    (fetch_write_commit_graph < 0 &&
+	     the_repository->settings.fetch_write_commit_graph)) {
+		int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT;
+
+		if (progress)
+			commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS;
+
+		write_commit_graph_reachable(the_repository->objects->odb,
+					     commit_graph_flags,
+					     NULL);
+	}
+
 	close_object_store(the_repository->objects);
 
 	if (enable_auto_gc) {
diff --git a/third_party/git/builtin/fmt-merge-msg.c b/third_party/git/builtin/fmt-merge-msg.c
index a4615587fd79..736f666f644c 100644
--- a/third_party/git/builtin/fmt-merge-msg.c
+++ b/third_party/git/builtin/fmt-merge-msg.c
@@ -106,7 +106,7 @@ static int handle_line(char *line, struct merge_parents *merge_parents)
 	int i, len = strlen(line);
 	struct origin_data *origin_data;
 	char *src;
-	const char *origin;
+	const char *origin, *tag_name;
 	struct src_data *src_data;
 	struct string_list_item *item;
 	int pulling_head = 0;
@@ -162,14 +162,13 @@ static int handle_line(char *line, struct merge_parents *merge_parents)
 	if (pulling_head) {
 		origin = src;
 		src_data->head_status |= 1;
-	} else if (starts_with(line, "branch ")) {
+	} else if (skip_prefix(line, "branch ", &origin)) {
 		origin_data->is_local_branch = 1;
-		origin = line + 7;
 		string_list_append(&src_data->branch, origin);
 		src_data->head_status |= 2;
-	} else if (starts_with(line, "tag ")) {
+	} else if (skip_prefix(line, "tag ", &tag_name)) {
 		origin = line;
-		string_list_append(&src_data->tag, origin + 4);
+		string_list_append(&src_data->tag, tag_name);
 		src_data->head_status |= 2;
 	} else if (skip_prefix(line, "remote-tracking branch ", &origin)) {
 		string_list_append(&src_data->r_branch, origin);
diff --git a/third_party/git/builtin/fsck.c b/third_party/git/builtin/fsck.c
index 18403a94fa42..8d13794b1412 100644
--- a/third_party/git/builtin/fsck.c
+++ b/third_party/git/builtin/fsck.c
@@ -50,40 +50,20 @@ static int name_objects;
 #define ERROR_REFS 010
 #define ERROR_COMMIT_GRAPH 020
 
-static const char *describe_object(struct object *obj)
+static const char *describe_object(const struct object_id *oid)
 {
-	static struct strbuf bufs[] = {
-		STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
-	};
-	static int b = 0;
-	struct strbuf *buf;
-	char *name = NULL;
-
-	if (name_objects)
-		name = lookup_decoration(fsck_walk_options.object_names, obj);
-
-	buf = bufs + b;
-	b = (b + 1) % ARRAY_SIZE(bufs);
-	strbuf_reset(buf);
-	strbuf_addstr(buf, oid_to_hex(&obj->oid));
-	if (name)
-		strbuf_addf(buf, " (%s)", name);
-
-	return buf->buf;
+	return fsck_describe_object(&fsck_walk_options, oid);
 }
 
-static const char *printable_type(struct object *obj)
+static const char *printable_type(const struct object_id *oid,
+				  enum object_type type)
 {
 	const char *ret;
 
-	if (obj->type == OBJ_NONE) {
-		enum object_type type = oid_object_info(the_repository,
-							&obj->oid, NULL);
-		if (type > 0)
-			object_as_type(the_repository, obj, type, 0);
-	}
+	if (type == OBJ_NONE)
+		type = oid_object_info(the_repository, oid, NULL);
 
-	ret = type_name(obj->type);
+	ret = type_name(type);
 	if (!ret)
 		ret = _("unknown");
 
@@ -118,26 +98,32 @@ static int objerror(struct object *obj, const char *err)
 	errors_found |= ERROR_OBJECT;
 	/* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */
 	fprintf_ln(stderr, _("error in %s %s: %s"),
-		   printable_type(obj), describe_object(obj), err);
+		   printable_type(&obj->oid, obj->type),
+		   describe_object(&obj->oid), err);
 	return -1;
 }
 
 static int fsck_error_func(struct fsck_options *o,
-	struct object *obj, int type, const char *message)
+			   const struct object_id *oid,
+			   enum object_type object_type,
+			   int msg_type, const char *message)
 {
-	switch (type) {
+	switch (msg_type) {
 	case FSCK_WARN:
 		/* TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> */
 		fprintf_ln(stderr, _("warning in %s %s: %s"),
-			   printable_type(obj), describe_object(obj), message);
+			   printable_type(oid, object_type),
+			   describe_object(oid), message);
 		return 0;
 	case FSCK_ERROR:
 		/* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */
 		fprintf_ln(stderr, _("error in %s %s: %s"),
-			   printable_type(obj), describe_object(obj), message);
+			   printable_type(oid, object_type),
+			   describe_object(oid), message);
 		return 1;
 	default:
-		BUG("%d (FSCK_IGNORE?) should never trigger this callback", type);
+		BUG("%d (FSCK_IGNORE?) should never trigger this callback",
+		    msg_type);
 	}
 }
 
@@ -155,7 +141,8 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
 	if (!obj) {
 		/* ... these references to parent->fld are safe here */
 		printf_ln(_("broken link from %7s %s"),
-			  printable_type(parent), describe_object(parent));
+			  printable_type(&parent->oid, parent->type),
+			  describe_object(&parent->oid));
 		printf_ln(_("broken link from %7s %s"),
 			  (type == OBJ_ANY ? _("unknown") : type_name(type)),
 			  _("unknown"));
@@ -183,10 +170,10 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
 		if (parent && !has_object_file(&obj->oid)) {
 			printf_ln(_("broken link from %7s %s\n"
 				    "              to %7s %s"),
-				  printable_type(parent),
-				  describe_object(parent),
-				  printable_type(obj),
-				  describe_object(obj));
+				  printable_type(&parent->oid, parent->type),
+				  describe_object(&parent->oid),
+				  printable_type(&obj->oid, obj->type),
+				  describe_object(&obj->oid));
 			errors_found |= ERROR_REACHABLE;
 		}
 		return 1;
@@ -292,8 +279,9 @@ static void check_reachable_object(struct object *obj)
 			return;
 		if (has_object_pack(&obj->oid))
 			return; /* it is in pack - forget about it */
-		printf_ln(_("missing %s %s"), printable_type(obj),
-			  describe_object(obj));
+		printf_ln(_("missing %s %s"),
+			  printable_type(&obj->oid, obj->type),
+			  describe_object(&obj->oid));
 		errors_found |= ERROR_REACHABLE;
 		return;
 	}
@@ -318,8 +306,9 @@ static void check_unreachable_object(struct object *obj)
 	 * since this is something that is prunable.
 	 */
 	if (show_unreachable) {
-		printf_ln(_("unreachable %s %s"), printable_type(obj),
-			  describe_object(obj));
+		printf_ln(_("unreachable %s %s"),
+			  printable_type(&obj->oid, obj->type),
+			  describe_object(&obj->oid));
 		return;
 	}
 
@@ -337,12 +326,13 @@ static void check_unreachable_object(struct object *obj)
 	 */
 	if (!(obj->flags & USED)) {
 		if (show_dangling)
-			printf_ln(_("dangling %s %s"), printable_type(obj),
-				  describe_object(obj));
+			printf_ln(_("dangling %s %s"),
+				  printable_type(&obj->oid, obj->type),
+				  describe_object(&obj->oid));
 		if (write_lost_and_found) {
 			char *filename = git_pathdup("lost-found/%s/%s",
 				obj->type == OBJ_COMMIT ? "commit" : "other",
-				describe_object(obj));
+				describe_object(&obj->oid));
 			FILE *f;
 
 			if (safe_create_leading_directories_const(filename)) {
@@ -355,7 +345,7 @@ static void check_unreachable_object(struct object *obj)
 				if (stream_blob_to_fd(fileno(f), &obj->oid, NULL, 1))
 					die_errno(_("could not write '%s'"), filename);
 			} else
-				fprintf(f, "%s\n", describe_object(obj));
+				fprintf(f, "%s\n", describe_object(&obj->oid));
 			if (fclose(f))
 				die_errno(_("could not finish '%s'"),
 					  filename);
@@ -374,7 +364,7 @@ static void check_unreachable_object(struct object *obj)
 static void check_object(struct object *obj)
 {
 	if (verbose)
-		fprintf_ln(stderr, _("Checking %s"), describe_object(obj));
+		fprintf_ln(stderr, _("Checking %s"), describe_object(&obj->oid));
 
 	if (obj->flags & REACHABLE)
 		check_reachable_object(obj);
@@ -432,7 +422,8 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
 
 	if (verbose)
 		fprintf_ln(stderr, _("Checking %s %s"),
-			   printable_type(obj), describe_object(obj));
+			   printable_type(&obj->oid, obj->type),
+			   describe_object(&obj->oid));
 
 	if (fsck_walk(obj, NULL, &fsck_obj_options))
 		objerror(obj, _("broken links"));
@@ -445,7 +436,7 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
 
 		if (!commit->parents && show_root)
 			printf_ln(_("root %s"),
-				  describe_object(&commit->object));
+				  describe_object(&commit->object.oid));
 	}
 
 	if (obj->type == OBJ_TAG) {
@@ -453,10 +444,10 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
 
 		if (show_tags && tag->tagged) {
 			printf_ln(_("tagged %s %s (%s) in %s"),
-				  printable_type(tag->tagged),
-				  describe_object(tag->tagged),
+				  printable_type(&tag->tagged->oid, tag->tagged->type),
+				  describe_object(&tag->tagged->oid),
 				  tag->tag,
-				  describe_object(&tag->object));
+				  describe_object(&tag->object.oid));
 		}
 	}
 
@@ -499,10 +490,10 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid,
 	if (!is_null_oid(oid)) {
 		obj = lookup_object(the_repository, oid);
 		if (obj && (obj->flags & HAS_OBJ)) {
-			if (timestamp && name_objects)
-				add_decoration(fsck_walk_options.object_names,
-					obj,
-					xstrfmt("%s@{%"PRItime"}", refname, timestamp));
+			if (timestamp)
+				fsck_put_object_name(&fsck_walk_options, oid,
+						     "%s@{%"PRItime"}",
+						     refname, timestamp);
 			obj->flags |= USED;
 			mark_object_reachable(obj);
 		} else if (!is_promisor_object(oid)) {
@@ -566,9 +557,8 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
 	}
 	default_refs++;
 	obj->flags |= USED;
-	if (name_objects)
-		add_decoration(fsck_walk_options.object_names,
-			obj, xstrdup(refname));
+	fsck_put_object_name(&fsck_walk_options,
+			     oid, "%s", refname);
 	mark_object_reachable(obj);
 
 	return 0;
@@ -742,9 +732,7 @@ static int fsck_cache_tree(struct cache_tree *it)
 			return 1;
 		}
 		obj->flags |= USED;
-		if (name_objects)
-			add_decoration(fsck_walk_options.object_names,
-				obj, xstrdup(":"));
+		fsck_put_object_name(&fsck_walk_options, &it->oid, ":");
 		mark_object_reachable(obj);
 		if (obj->type != OBJ_TREE)
 			err |= objerror(obj, _("non-tree in cache-tree"));
@@ -830,8 +818,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 	}
 
 	if (name_objects)
-		fsck_walk_options.object_names =
-			xcalloc(1, sizeof(struct decoration));
+		fsck_enable_object_names(&fsck_walk_options);
 
 	git_config(fsck_config, NULL);
 
@@ -890,9 +877,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 			}
 
 			obj->flags |= USED;
-			if (name_objects)
-				add_decoration(fsck_walk_options.object_names,
-					obj, xstrdup(arg));
+			fsck_put_object_name(&fsck_walk_options, &oid,
+					     "%s", arg);
 			mark_object_reachable(obj);
 			continue;
 		}
@@ -928,10 +914,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 				continue;
 			obj = &blob->object;
 			obj->flags |= USED;
-			if (name_objects)
-				add_decoration(fsck_walk_options.object_names,
-					obj,
-					xstrfmt(":%s", active_cache[i]->name));
+			fsck_put_object_name(&fsck_walk_options, &obj->oid,
+					     ":%s", active_cache[i]->name);
 			mark_object_reachable(obj);
 		}
 		if (active_cache_tree)
diff --git a/third_party/git/builtin/gc.c b/third_party/git/builtin/gc.c
index c18efadda53e..8e0b9cf41b3d 100644
--- a/third_party/git/builtin/gc.c
+++ b/third_party/git/builtin/gc.c
@@ -27,6 +27,7 @@
 #include "pack-objects.h"
 #include "blob.h"
 #include "tree.h"
+#include "promisor-remote.h"
 
 #define FAILED_RUN "failed to run %s"
 
@@ -41,7 +42,6 @@ static int aggressive_depth = 50;
 static int aggressive_window = 250;
 static int gc_auto_threshold = 6700;
 static int gc_auto_pack_limit = 50;
-static int gc_write_commit_graph;
 static int detach_auto = 1;
 static timestamp_t gc_log_expire_time;
 static const char *gc_log_expire = "1.day.ago";
@@ -148,7 +148,6 @@ static void gc_config(void)
 	git_config_get_int("gc.aggressivedepth", &aggressive_depth);
 	git_config_get_int("gc.auto", &gc_auto_threshold);
 	git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
-	git_config_get_bool("gc.writecommitgraph", &gc_write_commit_graph);
 	git_config_get_bool("gc.autodetach", &detach_auto);
 	git_config_get_expiry("gc.pruneexpire", &prune_expire);
 	git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire);
@@ -459,7 +458,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
 /*
  * Returns 0 if there was no previous error and gc can proceed, 1 if
  * gc should not proceed due to an error in the last run. Prints a
- * message and returns -1 if an error occured while reading gc.log
+ * message and returns -1 if an error occurred while reading gc.log
  */
 static int report_last_gc_error(void)
 {
@@ -602,7 +601,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 		if (detach_auto) {
 			int ret = report_last_gc_error();
 			if (ret < 0)
-				/* an I/O error occured, already reported */
+				/* an I/O error occurred, already reported */
 				exit(128);
 			if (ret == 1)
 				/* Last gc --auto failed. Skip this one. */
@@ -661,7 +660,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 			argv_array_push(&prune, prune_expire);
 			if (quiet)
 				argv_array_push(&prune, "--no-progress");
-			if (repository_format_partial_clone)
+			if (has_promisor_remote())
 				argv_array_push(&prune,
 						"--exclude-promisor-objects");
 			if (run_command_v_opt(prune.argv, RUN_GIT_CMD))
@@ -685,11 +684,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 		clean_pack_garbage();
 	}
 
-	if (gc_write_commit_graph &&
-	    write_commit_graph_reachable(get_object_directory(),
-					 !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0,
-					 NULL))
-		return 1;
+	prepare_repo_settings(the_repository);
+	if (the_repository->settings.gc_write_commit_graph == 1)
+		write_commit_graph_reachable(the_repository->objects->odb,
+					     !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
+					     NULL);
 
 	if (auto_gc && too_many_loose_objects())
 		warning(_("There are too many unreachable loose objects; "
diff --git a/third_party/git/builtin/grep.c b/third_party/git/builtin/grep.c
index 560051784ef7..99e26850907b 100644
--- a/third_party/git/builtin/grep.c
+++ b/third_party/git/builtin/grep.c
@@ -24,6 +24,7 @@
 #include "submodule.h"
 #include "submodule-config.h"
 #include "object-store.h"
+#include "packfile.h"
 
 static char const * const grep_usage[] = {
 	N_("git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"),
@@ -32,7 +33,6 @@ static char const * const grep_usage[] = {
 
 static int recurse_submodules;
 
-#define GREP_NUM_THREADS_DEFAULT 8
 static int num_threads;
 
 static pthread_t *threads;
@@ -91,8 +91,11 @@ static pthread_cond_t cond_result;
 
 static int skip_first_line;
 
-static void add_work(struct grep_opt *opt, const struct grep_source *gs)
+static void add_work(struct grep_opt *opt, struct grep_source *gs)
 {
+	if (opt->binary != GREP_BINARY_TEXT)
+		grep_source_load_driver(gs, opt->repo->index);
+
 	grep_lock();
 
 	while ((todo_end+1) % ARRAY_SIZE(todo) == todo_done) {
@@ -100,9 +103,6 @@ static void add_work(struct grep_opt *opt, const struct grep_source *gs)
 	}
 
 	todo[todo_end].source = *gs;
-	if (opt->binary != GREP_BINARY_TEXT)
-		grep_source_load_driver(&todo[todo_end].source,
-					opt->repo->index);
 	todo[todo_end].done = 0;
 	strbuf_reset(&todo[todo_end].out);
 	todo_end = (todo_end + 1) % ARRAY_SIZE(todo);
@@ -200,12 +200,12 @@ static void start_threads(struct grep_opt *opt)
 	int i;
 
 	pthread_mutex_init(&grep_mutex, NULL);
-	pthread_mutex_init(&grep_read_mutex, NULL);
 	pthread_mutex_init(&grep_attr_mutex, NULL);
 	pthread_cond_init(&cond_add, NULL);
 	pthread_cond_init(&cond_write, NULL);
 	pthread_cond_init(&cond_result, NULL);
 	grep_use_locks = 1;
+	enable_obj_read_lock();
 
 	for (i = 0; i < ARRAY_SIZE(todo); i++) {
 		strbuf_init(&todo[i].out, 0);
@@ -257,12 +257,12 @@ static int wait_all(void)
 	free(threads);
 
 	pthread_mutex_destroy(&grep_mutex);
-	pthread_mutex_destroy(&grep_read_mutex);
 	pthread_mutex_destroy(&grep_attr_mutex);
 	pthread_cond_destroy(&cond_add);
 	pthread_cond_destroy(&cond_write);
 	pthread_cond_destroy(&cond_result);
 	grep_use_locks = 0;
+	disable_obj_read_lock();
 
 	return hit;
 }
@@ -295,16 +295,6 @@ static int grep_cmd_config(const char *var, const char *value, void *cb)
 	return st;
 }
 
-static void *lock_and_read_oid_file(const struct object_id *oid, enum object_type *type, unsigned long *size)
-{
-	void *data;
-
-	grep_read_lock();
-	data = read_object_file(oid, type, size);
-	grep_read_unlock();
-	return data;
-}
-
 static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
 		     const char *filename, int tree_name_len,
 		     const char *path)
@@ -403,34 +393,32 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 static int grep_submodule(struct grep_opt *opt,
 			  const struct pathspec *pathspec,
 			  const struct object_id *oid,
-			  const char *filename, const char *path)
+			  const char *filename, const char *path, int cached)
 {
 	struct repository subrepo;
 	struct repository *superproject = opt->repo;
-	const struct submodule *sub = submodule_from_path(superproject,
-							  &null_oid, path);
+	const struct submodule *sub;
 	struct grep_opt subopt;
 	int hit;
 
-	/*
-	 * NEEDSWORK: submodules functions need to be protected because they
-	 * access the object store via config_from_gitmodules(): the latter
-	 * uses get_oid() which, for now, relies on the global the_repository
-	 * object.
-	 */
-	grep_read_lock();
+	sub = submodule_from_path(superproject, &null_oid, path);
 
-	if (!is_submodule_active(superproject, path)) {
-		grep_read_unlock();
+	if (!is_submodule_active(superproject, path))
 		return 0;
-	}
 
-	if (repo_submodule_init(&subrepo, superproject, sub)) {
-		grep_read_unlock();
+	if (repo_submodule_init(&subrepo, superproject, sub))
 		return 0;
-	}
 
-	repo_read_gitmodules(&subrepo);
+	/*
+	 * NEEDSWORK: repo_read_gitmodules() might call
+	 * add_to_alternates_memory() via config_from_gitmodules(). This
+	 * operation causes a race condition with concurrent object readings
+	 * performed by the worker threads. That's why we need obj_read_lock()
+	 * here. It should be removed once it's no longer necessary to add the
+	 * subrepo's odbs to the in-memory alternates list.
+	 */
+	obj_read_lock();
+	repo_read_gitmodules(&subrepo, 0);
 
 	/*
 	 * NEEDSWORK: This adds the submodule's object directory to the list of
@@ -443,7 +431,7 @@ static int grep_submodule(struct grep_opt *opt,
 	 * object.
 	 */
 	add_to_alternates_memory(subrepo.objects->odb->path);
-	grep_read_unlock();
+	obj_read_unlock();
 
 	memcpy(&subopt, opt, sizeof(subopt));
 	subopt.repo = &subrepo;
@@ -455,14 +443,12 @@ static int grep_submodule(struct grep_opt *opt,
 		unsigned long size;
 		struct strbuf base = STRBUF_INIT;
 
+		obj_read_lock();
 		object = parse_object_or_die(oid, oid_to_hex(oid));
-
-		grep_read_lock();
+		obj_read_unlock();
 		data = read_object_with_reference(&subrepo,
 						  &object->oid, tree_type,
 						  &size, NULL);
-		grep_read_unlock();
-
 		if (!data)
 			die(_("unable to read tree (%s)"), oid_to_hex(&object->oid));
 
@@ -475,7 +461,7 @@ static int grep_submodule(struct grep_opt *opt,
 		strbuf_release(&base);
 		free(data);
 	} else {
-		hit = grep_cache(&subopt, pathspec, 1);
+		hit = grep_cache(&subopt, pathspec, cached);
 	}
 
 	repo_clear(&subrepo);
@@ -523,7 +509,8 @@ static int grep_cache(struct grep_opt *opt,
 			}
 		} else if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
 			   submodule_path_match(repo->index, pathspec, name.buf, NULL)) {
-			hit |= grep_submodule(opt, pathspec, NULL, ce->name, ce->name);
+			hit |= grep_submodule(opt, pathspec, NULL, ce->name,
+					      ce->name, cached);
 		} else {
 			continue;
 		}
@@ -586,7 +573,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 			void *data;
 			unsigned long size;
 
-			data = lock_and_read_oid_file(&entry.oid, &type, &size);
+			data = read_object_file(&entry.oid, &type, &size);
 			if (!data)
 				die(_("unable to read tree (%s)"),
 				    oid_to_hex(&entry.oid));
@@ -598,7 +585,8 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 			free(data);
 		} else if (recurse_submodules && S_ISGITLINK(entry.mode)) {
 			hit |= grep_submodule(opt, pathspec, &entry.oid,
-					      base->buf, base->buf + tn_len);
+					      base->buf, base->buf + tn_len,
+					      1); /* ignored */
 		}
 
 		strbuf_setlen(base, old_baselen);
@@ -623,12 +611,9 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
 		struct strbuf base;
 		int hit, len;
 
-		grep_read_lock();
 		data = read_object_with_reference(opt->repo,
 						  &obj->oid, tree_type,
 						  &size, NULL);
-		grep_read_unlock();
-
 		if (!data)
 			die(_("unable to read tree (%s)"), oid_to_hex(&obj->oid));
 
@@ -657,13 +642,18 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
 
 	for (i = 0; i < nr; i++) {
 		struct object *real_obj;
+
+		obj_read_lock();
 		real_obj = deref_tag(opt->repo, list->objects[i].item,
 				     NULL, 0);
+		obj_read_unlock();
 
 		/* load the gitmodules file for this rev */
 		if (recurse_submodules) {
 			submodule_free(opt->repo);
+			obj_read_lock();
 			gitmodules_config_oid(&real_obj->oid);
+			obj_read_unlock();
 		}
 		if (grep_object(opt, pathspec, real_obj, list->objects[i].name,
 				list->objects[i].path)) {
@@ -956,6 +946,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			/* die the same way as if we did it at the beginning */
 			setup_git_directory();
 	}
+	/* Ignore --recurse-submodules if --no-index is given or implied */
+	if (!use_index)
+		recurse_submodules = 0;
 
 	/*
 	 * skip a -- separator; we know it cannot be
@@ -1060,7 +1053,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	pathspec.recursive = 1;
 	pathspec.recurse_submodules = !!recurse_submodules;
 
-	if (list.nr || cached || show_in_pager) {
+	if (recurse_submodules && untracked)
+		die(_("--untracked not supported with --recurse-submodules"));
+
+	if (show_in_pager) {
 		if (num_threads > 1)
 			warning(_("invalid option combination, ignoring --threads"));
 		num_threads = 1;
@@ -1070,7 +1066,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	} else if (num_threads < 0)
 		die(_("invalid number of threads specified (%d)"), num_threads);
 	else if (num_threads == 0)
-		num_threads = HAVE_THREADS ? GREP_NUM_THREADS_DEFAULT : 1;
+		num_threads = HAVE_THREADS ? online_cpus() : 1;
 
 	if (num_threads > 1) {
 		if (!HAVE_THREADS)
@@ -1079,6 +1075,17 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		    && (opt.pre_context || opt.post_context ||
 			opt.file_break || opt.funcbody))
 			skip_first_line = 1;
+
+		/*
+		 * Pre-read gitmodules (if not read already) and force eager
+		 * initialization of packed_git to prevent racy lazy
+		 * reading/initialization once worker threads are started.
+		 */
+		if (recurse_submodules)
+			repo_read_gitmodules(the_repository, 1);
+		if (startup_info->have_repository)
+			(void)get_packed_git(the_repository);
+
 		start_threads(&opt);
 	} else {
 		/*
@@ -1108,14 +1115,11 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			strbuf_addf(&buf, "+/%s%s",
 					strcmp("less", pager) ? "" : "*",
 					opt.pattern_list->pattern);
-			string_list_append(&path_list, buf.buf);
-			strbuf_detach(&buf, NULL);
+			string_list_append(&path_list,
+					   strbuf_detach(&buf, NULL));
 		}
 	}
 
-	if (recurse_submodules && (!use_index || untracked))
-		die(_("option not supported with --recurse-submodules"));
-
 	if (!show_in_pager && !opt.status_only)
 		setup_pager();
 
@@ -1145,5 +1149,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		run_pager(&opt, prefix);
 	clear_pathspec(&pathspec);
 	free_grep_patterns(&opt);
+	grep_destroy();
 	return !hit;
 }
diff --git a/third_party/git/builtin/index-pack.c b/third_party/git/builtin/index-pack.c
index 0d55f73b0b44..d967d188a307 100644
--- a/third_party/git/builtin/index-pack.c
+++ b/third_party/git/builtin/index-pack.c
@@ -14,7 +14,7 @@
 #include "thread-utils.h"
 #include "packfile.h"
 #include "object-store.h"
-#include "fetch-object.h"
+#include "promisor-remote.h"
 
 static const char index_pack_usage[] =
 "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
@@ -757,7 +757,8 @@ static int check_collison(struct object_entry *entry)
 
 	memset(&data, 0, sizeof(data));
 	data.entry = entry;
-	data.st = open_istream(&entry->idx.oid, &type, &size, NULL);
+	data.st = open_istream(the_repository, &entry->idx.oid, &type, &size,
+			       NULL);
 	if (!data.st)
 		return -1;
 	if (size != entry->size || type != entry->type)
@@ -948,7 +949,7 @@ static void resolve_delta(struct object_entry *delta_obj,
 	free(delta_data);
 	if (!result->data)
 		bad_object(delta_obj->idx.offset, _("failed to apply delta"));
-	hash_object_file(result->data, result->size,
+	hash_object_file(the_hash_algo, result->data, result->size,
 			 type_name(delta_obj->real_type), &delta_obj->idx.oid);
 	sha1_object(result->data, NULL, result->size, delta_obj->real_type,
 		    &delta_obj->idx.oid);
@@ -1003,7 +1004,9 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base,
 
 		if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA,
 					   base->obj->real_type))
-			BUG("child->real_type != OBJ_REF_DELTA");
+			die("REF_DELTA at offset %"PRIuMAX" already resolved (duplicate base %s?)",
+			    (uintmax_t)child->idx.offset,
+			    oid_to_hex(&base->obj->idx.oid));
 
 		resolve_delta(child, base, result);
 		if (base->ref_first == base->ref_last && base->ofs_last == -1)
@@ -1352,7 +1355,7 @@ static void fix_unresolved_deltas(struct hashfile *f)
 		sorted_by_pos[i] = &ref_deltas[i];
 	QSORT(sorted_by_pos, nr_ref_deltas, delta_pos_compare);
 
-	if (repository_format_partial_clone) {
+	if (has_promisor_remote()) {
 		/*
 		 * Prefetch the delta bases.
 		 */
@@ -1366,8 +1369,8 @@ static void fix_unresolved_deltas(struct hashfile *f)
 			oid_array_append(&to_fetch, &d->oid);
 		}
 		if (to_fetch.nr)
-			fetch_objects(repository_format_partial_clone,
-				      to_fetch.oid, to_fetch.nr);
+			promisor_remote_get_direct(the_repository,
+						   to_fetch.oid, to_fetch.nr);
 		oid_array_clear(&to_fetch);
 	}
 
@@ -1383,8 +1386,9 @@ static void fix_unresolved_deltas(struct hashfile *f)
 		if (!base_obj->data)
 			continue;
 
-		if (check_object_signature(&d->oid, base_obj->data,
-				base_obj->size, type_name(type)))
+		if (check_object_signature(the_repository, &d->oid,
+					   base_obj->data, base_obj->size,
+					   type_name(type)))
 			die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
 		base_obj->obj = append_obj_to_pack(f, d->oid.hash,
 					base_obj->data, base_obj->size, type);
@@ -1490,11 +1494,11 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 	}
 
 	if (!from_stdin) {
-		printf("%s\n", sha1_to_hex(hash));
+		printf("%s\n", hash_to_hex(hash));
 	} else {
 		struct strbuf buf = STRBUF_INIT;
 
-		strbuf_addf(&buf, "%s\t%s\n", report, sha1_to_hex(hash));
+		strbuf_addf(&buf, "%s\t%s\n", report, hash_to_hex(hash));
 		write_or_die(1, buf.buf, buf.len);
 		strbuf_release(&buf);
 
diff --git a/third_party/git/builtin/log.c b/third_party/git/builtin/log.c
index 44b10b341541..83a4a6188e22 100644
--- a/third_party/git/builtin/log.c
+++ b/third_party/git/builtin/log.c
@@ -37,6 +37,7 @@
 #include "range-diff.h"
 
 #define MAIL_DEFAULT_WRAP 72
+#define COVER_FROM_AUTO_MAX_SUBJECT_LEN 100
 
 /* Set a default date-time format for git log ("log.date" config variable) */
 static const char *default_date_mode = NULL;
@@ -207,7 +208,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
 		rev->show_notes = 1;
 	if (rev->show_notes)
-		init_display_notes(&rev->notes_opt);
+		load_display_notes(&rev->notes_opt);
 
 	if ((rev->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
 	    rev->diffopt.filter || rev->diffopt.flags.follow_renames)
@@ -627,6 +628,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 			break;
 		case OBJ_TAG: {
 			struct tag *t = (struct tag *)o;
+			struct object_id *oid = get_tagged_oid(t);
 
 			if (rev.shown_one)
 				putchar('\n');
@@ -638,10 +640,10 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 			rev.shown_one = 1;
 			if (ret)
 				break;
-			o = parse_object(the_repository, &t->tagged->oid);
+			o = parse_object(the_repository, oid);
 			if (!o)
 				ret = error(_("could not read object %s"),
-					    oid_to_hex(&t->tagged->oid));
+					    oid_to_hex(oid));
 			objects[i].item = o;
 			i--;
 			break;
@@ -764,28 +766,56 @@ static void add_header(const char *value)
 	item->string[len] = '\0';
 }
 
-#define THREAD_SHALLOW 1
-#define THREAD_DEEP 2
-static int thread;
+enum cover_setting {
+	COVER_UNSET,
+	COVER_OFF,
+	COVER_ON,
+	COVER_AUTO
+};
+
+enum thread_level {
+	THREAD_UNSET,
+	THREAD_SHALLOW,
+	THREAD_DEEP
+};
+
+enum cover_from_description {
+	COVER_FROM_NONE,
+	COVER_FROM_MESSAGE,
+	COVER_FROM_SUBJECT,
+	COVER_FROM_AUTO
+};
+
+static enum thread_level thread;
 static int do_signoff;
 static int base_auto;
 static char *from;
 static const char *signature = git_version_string;
 static const char *signature_file;
-static int config_cover_letter;
+static enum cover_setting config_cover_letter;
 static const char *config_output_directory;
+static enum cover_from_description cover_from_description_mode = COVER_FROM_MESSAGE;
+static int show_notes;
+static struct display_notes_opt notes_opt;
 
-enum {
-	COVER_UNSET,
-	COVER_OFF,
-	COVER_ON,
-	COVER_AUTO
-};
+static enum cover_from_description parse_cover_from_description(const char *arg)
+{
+	if (!arg || !strcmp(arg, "default"))
+		return COVER_FROM_MESSAGE;
+	else if (!strcmp(arg, "none"))
+		return COVER_FROM_NONE;
+	else if (!strcmp(arg, "message"))
+		return COVER_FROM_MESSAGE;
+	else if (!strcmp(arg, "subject"))
+		return COVER_FROM_SUBJECT;
+	else if (!strcmp(arg, "auto"))
+		return COVER_FROM_AUTO;
+	else
+		die(_("%s: invalid cover from description mode"), arg);
+}
 
 static int git_format_config(const char *var, const char *value, void *cb)
 {
-	struct rev_info *rev = cb;
-
 	if (!strcmp(var, "format.headers")) {
 		if (!value)
 			die(_("format.headers without value"));
@@ -835,7 +865,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
 			thread = THREAD_SHALLOW;
 			return 0;
 		}
-		thread = git_config_bool(var, value) && THREAD_SHALLOW;
+		thread = git_config_bool(var, value) ? THREAD_SHALLOW : THREAD_UNSET;
 		return 0;
 	}
 	if (!strcmp(var, "format.signoff")) {
@@ -872,19 +902,17 @@ static int git_format_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 	if (!strcmp(var, "format.notes")) {
-		struct strbuf buf = STRBUF_INIT;
 		int b = git_parse_maybe_bool(value);
-		if (!b)
-			return 0;
-		rev->show_notes = 1;
-		if (b < 0) {
-			strbuf_addstr(&buf, value);
-			expand_notes_ref(&buf);
-			string_list_append(&rev->notes_opt.extra_notes_refs,
-					strbuf_detach(&buf, NULL));
-		} else {
-			rev->notes_opt.use_default_notes = 1;
-		}
+		if (b < 0)
+			enable_ref_display_notes(&notes_opt, &show_notes, value);
+		else if (b)
+			enable_default_display_notes(&notes_opt, &show_notes);
+		else
+			disable_display_notes(&notes_opt, &show_notes);
+		return 0;
+	}
+	if (!strcmp(var, "format.coverfromdescription")) {
+		cover_from_description_mode = parse_cover_from_description(value);
 		return 0;
 	}
 
@@ -993,20 +1021,6 @@ static void print_signature(FILE *file)
 	putc('\n', file);
 }
 
-static void add_branch_description(struct strbuf *buf, const char *branch_name)
-{
-	struct strbuf desc = STRBUF_INIT;
-	if (!branch_name || !*branch_name)
-		return;
-	read_branch_desc(&desc, branch_name);
-	if (desc.len) {
-		strbuf_addch(buf, '\n');
-		strbuf_addbuf(buf, &desc);
-		strbuf_addch(buf, '\n');
-	}
-	strbuf_release(&desc);
-}
-
 static char *find_branch_name(struct rev_info *rev)
 {
 	int i, positive = -1;
@@ -1053,6 +1067,63 @@ static void show_diffstat(struct rev_info *rev,
 	fprintf(rev->diffopt.file, "\n");
 }
 
+static void prepare_cover_text(struct pretty_print_context *pp,
+			       const char *branch_name,
+			       struct strbuf *sb,
+			       const char *encoding,
+			       int need_8bit_cte)
+{
+	const char *subject = "*** SUBJECT HERE ***";
+	const char *body = "*** BLURB HERE ***";
+	struct strbuf description_sb = STRBUF_INIT;
+	struct strbuf subject_sb = STRBUF_INIT;
+
+	if (cover_from_description_mode == COVER_FROM_NONE)
+		goto do_pp;
+
+	if (branch_name && *branch_name)
+		read_branch_desc(&description_sb, branch_name);
+	if (!description_sb.len)
+		goto do_pp;
+
+	if (cover_from_description_mode == COVER_FROM_SUBJECT ||
+			cover_from_description_mode == COVER_FROM_AUTO)
+		body = format_subject(&subject_sb, description_sb.buf, " ");
+
+	if (cover_from_description_mode == COVER_FROM_MESSAGE ||
+			(cover_from_description_mode == COVER_FROM_AUTO &&
+			 subject_sb.len > COVER_FROM_AUTO_MAX_SUBJECT_LEN))
+		body = description_sb.buf;
+	else
+		subject = subject_sb.buf;
+
+do_pp:
+	pp_title_line(pp, &subject, sb, encoding, need_8bit_cte);
+	pp_remainder(pp, &body, sb, 0);
+
+	strbuf_release(&description_sb);
+	strbuf_release(&subject_sb);
+}
+
+static int get_notes_refs(struct string_list_item *item, void *arg)
+{
+	argv_array_pushf(arg, "--notes=%s", item->string);
+	return 0;
+}
+
+static void get_notes_args(struct argv_array *arg, struct rev_info *rev)
+{
+	if (!rev->show_notes) {
+		argv_array_push(arg, "--no-notes");
+	} else if (rev->notes_opt.use_default_notes > 0 ||
+		   (rev->notes_opt.use_default_notes == -1 &&
+		    !rev->notes_opt.extra_notes_refs.nr)) {
+		argv_array_push(arg, "--notes");
+	} else {
+		for_each_string_list(&rev->notes_opt.extra_notes_refs, get_notes_refs, arg);
+	}
+}
+
 static void make_cover_letter(struct rev_info *rev, int use_stdout,
 			      struct commit *origin,
 			      int nr, struct commit **list,
@@ -1060,8 +1131,6 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 			      int quiet)
 {
 	const char *committer;
-	const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
-	const char *msg;
 	struct shortlog log;
 	struct strbuf sb = STRBUF_INIT;
 	int i;
@@ -1091,15 +1160,12 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 	if (!branch_name)
 		branch_name = find_branch_name(rev);
 
-	msg = body;
 	pp.fmt = CMIT_FMT_EMAIL;
 	pp.date_mode.type = DATE_RFC2822;
 	pp.rev = rev;
 	pp.print_email_subject = 1;
 	pp_user_info(&pp, NULL, &sb, committer, encoding);
-	pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
-	pp_remainder(&pp, &msg, &sb, 0);
-	add_branch_description(&sb, branch_name);
+	prepare_cover_text(&pp, branch_name, &sb, encoding, need_8bit_cte);
 	fprintf(rev->diffopt.file, "%s\n", sb.buf);
 
 	strbuf_release(&sb);
@@ -1130,13 +1196,16 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 		 * can be added later if deemed desirable.
 		 */
 		struct diff_options opts;
+		struct argv_array other_arg = ARGV_ARRAY_INIT;
 		diff_setup(&opts);
 		opts.file = rev->diffopt.file;
 		opts.use_color = rev->diffopt.use_color;
 		diff_setup_done(&opts);
 		fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title);
+		get_notes_args(&other_arg, rev);
 		show_range_diff(rev->rdiff1, rev->rdiff2,
-				rev->creation_factor, 1, &opts);
+				rev->creation_factor, 1, &opts, &other_arg);
+		argv_array_clear(&other_arg);
 	}
 }
 
@@ -1248,9 +1317,9 @@ static int output_directory_callback(const struct option *opt, const char *arg,
 
 static int thread_callback(const struct option *opt, const char *arg, int unset)
 {
-	int *thread = (int *)opt->value;
+	enum thread_level *thread = (enum thread_level *)opt->value;
 	if (unset)
-		*thread = 0;
+		*thread = THREAD_UNSET;
 	else if (!arg || !strcmp(arg, "shallow"))
 		*thread = THREAD_SHALLOW;
 	else if (!strcmp(arg, "deep"))
@@ -1297,7 +1366,7 @@ static int header_callback(const struct option *opt, const char *arg, int unset)
 		string_list_clear(&extra_to, 0);
 		string_list_clear(&extra_cc, 0);
 	} else {
-	    add_header(arg);
+		add_header(arg);
 	}
 	return 0;
 }
@@ -1353,7 +1422,7 @@ static struct commit *get_base_commit(const char *base_commit,
 		base = lookup_commit_reference_by_name(base_commit);
 		if (!base)
 			die(_("unknown commit %s"), base_commit);
-	} else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) {
+	} else if ((base_commit && !strcmp(base_commit, "auto"))) {
 		struct branch *curr_branch = branch_get(NULL);
 		const char *upstream = branch_get_upstream(curr_branch, NULL);
 		if (upstream) {
@@ -1541,6 +1610,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	int use_patch_format = 0;
 	int quiet = 0;
 	int reroll_count = -1;
+	char *cover_from_description_arg = NULL;
 	char *branch_name = NULL;
 	char *base_commit = NULL;
 	struct base_tree_info bases;
@@ -1577,6 +1647,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		{ OPTION_CALLBACK, 0, "rfc", &rev, NULL,
 			    N_("Use [RFC PATCH] instead of [PATCH]"),
 			    PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback },
+		OPT_STRING(0, "cover-from-description", &cover_from_description_arg,
+			    N_("cover-from-description-mode"),
+			    N_("generate parts of a cover letter based on a branch's description")),
 		{ OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"),
 			    N_("Use [<prefix>] instead of [PATCH]"),
 			    PARSE_OPT_NONEG, subject_prefix_callback },
@@ -1640,8 +1713,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	extra_to.strdup_strings = 1;
 	extra_cc.strdup_strings = 1;
 	init_log_defaults();
+	init_display_notes(&notes_opt);
+	git_config(git_format_config, NULL);
 	repo_init_revisions(the_repository, &rev, prefix);
-	git_config(git_format_config, &rev);
+	rev.show_notes = show_notes;
+	memcpy(&rev.notes_opt, &notes_opt, sizeof(notes_opt));
 	rev.commit_format = CMIT_FMT_EMAIL;
 	rev.expand_tabs_in_log_default = 0;
 	rev.verbose_header = 1;
@@ -1653,6 +1729,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	s_r_opt.def = "HEAD";
 	s_r_opt.revarg_opt = REVARG_COMMITTISH;
 
+	if (base_auto)
+		base_commit = "auto";
+
 	if (default_attach) {
 		rev.mime_boundary = default_attach;
 		rev.no_inline = 1;
@@ -1668,6 +1747,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			     PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
 			     PARSE_OPT_KEEP_DASHDASH);
 
+	if (cover_from_description_arg)
+		cover_from_description_mode = parse_cover_from_description(cover_from_description_arg);
+
 	if (0 < reroll_count) {
 		struct strbuf sprefix = STRBUF_INIT;
 		strbuf_addf(&sprefix, "%s v%d",
@@ -1754,7 +1836,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		rev.diffopt.flags.binary = 1;
 
 	if (rev.show_notes)
-		init_display_notes(&rev.notes_opt);
+		load_display_notes(&rev.notes_opt);
 
 	if (!output_directory && !use_stdout)
 		output_directory = config_output_directory;
@@ -1765,10 +1847,26 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		setup_pager();
 
 	if (output_directory) {
+		int saved;
 		if (rev.diffopt.use_color != GIT_COLOR_ALWAYS)
 			rev.diffopt.use_color = GIT_COLOR_NEVER;
 		if (use_stdout)
 			die(_("standard output, or directory, which one?"));
+		/*
+		 * We consider <outdir> as 'outside of gitdir', therefore avoid
+		 * applying adjust_shared_perm in s-c-l-d.
+		 */
+		saved = get_shared_repository();
+		set_shared_repository(0);
+		switch (safe_create_leading_directories_const(output_directory)) {
+		case SCLD_OK:
+		case SCLD_EXISTS:
+			break;
+		default:
+			die(_("could not create leading directories "
+			      "of '%s'"), output_directory);
+		}
+		set_shared_repository(saved);
 		if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
 			die_errno(_("could not create directory '%s'"),
 				  output_directory);
@@ -1897,7 +1995,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	}
 
 	memset(&bases, 0, sizeof(bases));
-	if (base_commit || base_auto) {
+	if (base_commit) {
 		struct commit *base = get_base_commit(base_commit, list, nr);
 		reset_revision_walk();
 		clear_object_flags(UNINTERESTING);
diff --git a/third_party/git/builtin/ls-files.c b/third_party/git/builtin/ls-files.c
index 670e8fb93c93..f069a028cea1 100644
--- a/third_party/git/builtin/ls-files.c
+++ b/third_party/git/builtin/ls-files.c
@@ -492,7 +492,7 @@ static int option_parse_exclude_from(const struct option *opt,
 	BUG_ON_OPT_NEG(unset);
 
 	exc_given = 1;
-	add_excludes_from_file(dir, arg);
+	add_patterns_from_file(dir, arg);
 
 	return 0;
 }
@@ -516,7 +516,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 	int require_work_tree = 0, show_tag = 0, i;
 	const char *max_prefix;
 	struct dir_struct dir;
-	struct exclude_list *el;
+	struct pattern_list *pl;
 	struct string_list exclude_list = STRING_LIST_INIT_NODUP;
 	struct option builtin_ls_files_options[] = {
 		/* Think twice before adding "--nul" synonym to this */
@@ -594,9 +594,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 
 	argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
 			ls_files_usage, 0);
-	el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
+	pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option");
 	for (i = 0; i < exclude_list.nr; i++) {
-		add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args);
+		add_pattern(exclude_list.items[i].string, "", 0, pl, --exclude_args);
 	}
 	if (show_tag || show_valid_bit || show_fsmonitor_bit) {
 		tag_cached = "H ";
diff --git a/third_party/git/builtin/merge-recursive.c b/third_party/git/builtin/merge-recursive.c
index 5b910e351e4d..a4bfd8fc51d6 100644
--- a/third_party/git/builtin/merge-recursive.c
+++ b/third_party/git/builtin/merge-recursive.c
@@ -1,3 +1,4 @@
+#include "cache.h"
 #include "builtin.h"
 #include "commit.h"
 #include "tag.h"
@@ -63,6 +64,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
 	if (argc - i != 3) /* "--" "<head>" "<remote>" */
 		die(_("not handling anything other than two heads merge."));
 
+	if (repo_read_index_unmerged(the_repository))
+		die_resolve_conflict("merge");
+
 	o.branch1 = argv[++i];
 	o.branch2 = argv[++i];
 
diff --git a/third_party/git/builtin/merge-tree.c b/third_party/git/builtin/merge-tree.c
index 97b54caeb900..e72714a5a87d 100644
--- a/third_party/git/builtin/merge-tree.c
+++ b/third_party/git/builtin/merge-tree.c
@@ -180,8 +180,9 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru
 
 static char *traverse_path(const struct traverse_info *info, const struct name_entry *n)
 {
-	char *path = xmallocz(traverse_path_len(info, n) + the_hash_algo->rawsz);
-	return make_traverse_path(path, info, n);
+	struct strbuf buf = STRBUF_INIT;
+	strbuf_make_traverse_path(&buf, info, n->path, n->pathlen);
+	return strbuf_detach(&buf, NULL);
 }
 
 static void resolve(const struct traverse_info *info, struct name_entry *ours, struct name_entry *result)
diff --git a/third_party/git/builtin/merge.c b/third_party/git/builtin/merge.c
index e2ccbc44e204..d127d2225f89 100644
--- a/third_party/git/builtin/merge.c
+++ b/third_party/git/builtin/merge.c
@@ -62,6 +62,7 @@ static int show_diffstat = 1, shortlog_len = -1, squash;
 static int option_commit = -1;
 static int option_edit = -1;
 static int allow_trivial = 1, have_message, verify_signatures;
+static int check_trust_level = 1;
 static int overwrite_ignore = 1;
 static struct strbuf merge_msg = STRBUF_INIT;
 static struct strategy **use_strategies;
@@ -81,7 +82,7 @@ static int show_progress = -1;
 static int default_to_upstream = 1;
 static int signoff;
 static const char *sign_commit;
-static int verify_msg = 1;
+static int no_verify;
 
 static struct strategy all_strategy[] = {
 	{ "recursive",  DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -287,7 +288,7 @@ static struct option builtin_merge_options[] = {
 	  N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
 	OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
 	OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
-	OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
+	OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-merge-commit and commit-msg hooks")),
 	OPT_END()
 };
 
@@ -631,6 +632,8 @@ static int git_merge_config(const char *k, const char *v, void *cb)
 	} else if (!strcmp(k, "commit.gpgsign")) {
 		sign_commit = git_config_bool(k, v) ? "" : NULL;
 		return 0;
+	} else if (!strcmp(k, "gpg.mintrustlevel")) {
+		check_trust_level = 0;
 	}
 
 	status = fmt_merge_msg_config(k, v, cb);
@@ -688,16 +691,13 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 			      struct commit_list *remoteheads,
 			      struct commit *head)
 {
-	struct lock_file lock = LOCK_INIT;
 	const char *head_arg = "HEAD";
 
-	hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
-	refresh_cache(REFRESH_QUIET);
-	if (write_locked_index(&the_index, &lock,
-			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
+	if (refresh_and_write_cache(REFRESH_QUIET, SKIP_IF_UNCHANGED, 0) < 0)
 		return error(_("Unable to write index."));
 
 	if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
+		struct lock_file lock = LOCK_INIT;
 		int clean, x;
 		struct commit *result;
 		struct commit_list *reversed = NULL;
@@ -816,6 +816,18 @@ static void write_merge_heads(struct commit_list *);
 static void prepare_to_commit(struct commit_list *remoteheads)
 {
 	struct strbuf msg = STRBUF_INIT;
+	const char *index_file = get_index_file();
+
+	if (!no_verify && run_commit_hook(0 < option_edit, index_file, "pre-merge-commit", NULL))
+		abort_commit(remoteheads, NULL);
+	/*
+	 * Re-read the index as pre-merge-commit hook could have updated it,
+	 * and write it out as a tree.  We must do this before we invoke
+	 * the editor and after we invoke run_status above.
+	 */
+	if (find_hook("pre-merge-commit"))
+		discard_cache();
+	read_cache_from(index_file);
 	strbuf_addbuf(&msg, &merge_msg);
 	if (squash)
 		BUG("the control must not reach here under --squash");
@@ -842,7 +854,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
 			abort_commit(remoteheads, NULL);
 	}
 
-	if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
+	if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(),
 					  "commit-msg",
 					  git_path_merge_msg(the_repository), NULL))
 		abort_commit(remoteheads, NULL);
@@ -860,12 +872,8 @@ static int merge_trivial(struct commit *head, struct commit_list *remoteheads)
 {
 	struct object_id result_tree, result_commit;
 	struct commit_list *parents, **pptr = &parents;
-	struct lock_file lock = LOCK_INIT;
 
-	hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
-	refresh_cache(REFRESH_QUIET);
-	if (write_locked_index(&the_index, &lock,
-			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
+	if (refresh_and_write_cache(REFRESH_QUIET, SKIP_IF_UNCHANGED, 0) < 0)
 		return error(_("Unable to write index."));
 
 	write_tree_trivial(&result_tree);
@@ -1392,7 +1400,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 			die(_("Can merge only exactly one commit into empty head"));
 
 		if (verify_signatures)
-			verify_merge_signature(remoteheads->item, verbosity);
+			verify_merge_signature(remoteheads->item, verbosity,
+					       check_trust_level);
 
 		remote_head_oid = &remoteheads->item->object.oid;
 		read_empty(remote_head_oid, 0);
@@ -1415,7 +1424,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 
 	if (verify_signatures) {
 		for (p = remoteheads; p; p = p->next) {
-			verify_merge_signature(p->item, verbosity);
+			verify_merge_signature(p->item, verbosity,
+					       check_trust_level);
 		}
 	}
 
diff --git a/third_party/git/builtin/mktag.c b/third_party/git/builtin/mktag.c
index 6fb7dc8578d6..4982d3a93efb 100644
--- a/third_party/git/builtin/mktag.c
+++ b/third_party/git/builtin/mktag.c
@@ -29,8 +29,11 @@ static int verify_object(const struct object_id *oid, const char *expected_type)
 	const struct object_id *repl = lookup_replace_object(the_repository, oid);
 
 	if (buffer) {
-		if (type == type_from_string(expected_type))
-			ret = check_object_signature(repl, buffer, size, expected_type);
+		if (type == type_from_string(expected_type)) {
+			ret = check_object_signature(the_repository, repl,
+						     buffer, size,
+						     expected_type);
+		}
 		free(buffer);
 	}
 	return ret;
diff --git a/third_party/git/builtin/multi-pack-index.c b/third_party/git/builtin/multi-pack-index.c
index b1ea1a6aa177..5bf88cd2a8e2 100644
--- a/third_party/git/builtin/multi-pack-index.c
+++ b/third_party/git/builtin/multi-pack-index.c
@@ -6,21 +6,25 @@
 #include "trace2.h"
 
 static char const * const builtin_multi_pack_index_usage[] = {
-	N_("git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --batch-size=<size>)"),
+	N_("git multi-pack-index [<options>] (write|verify|expire|repack --batch-size=<size>)"),
 	NULL
 };
 
 static struct opts_multi_pack_index {
 	const char *object_dir;
 	unsigned long batch_size;
+	int progress;
 } opts;
 
 int cmd_multi_pack_index(int argc, const char **argv,
 			 const char *prefix)
 {
+	unsigned flags = 0;
+
 	static struct option builtin_multi_pack_index_options[] = {
 		OPT_FILENAME(0, "object-dir", &opts.object_dir,
 		  N_("object directory containing set of packfile and pack-index pairs")),
+		OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
 		OPT_MAGNITUDE(0, "batch-size", &opts.batch_size,
 		  N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")),
 		OPT_END(),
@@ -28,12 +32,15 @@ int cmd_multi_pack_index(int argc, const char **argv,
 
 	git_config(git_default_config, NULL);
 
+	opts.progress = isatty(2);
 	argc = parse_options(argc, argv, prefix,
 			     builtin_multi_pack_index_options,
 			     builtin_multi_pack_index_usage, 0);
 
 	if (!opts.object_dir)
 		opts.object_dir = get_object_directory();
+	if (opts.progress)
+		flags |= MIDX_PROGRESS;
 
 	if (argc == 0)
 		usage_with_options(builtin_multi_pack_index_usage,
@@ -47,16 +54,17 @@ int cmd_multi_pack_index(int argc, const char **argv,
 	trace2_cmd_mode(argv[0]);
 
 	if (!strcmp(argv[0], "repack"))
-		return midx_repack(the_repository, opts.object_dir, (size_t)opts.batch_size);
+		return midx_repack(the_repository, opts.object_dir,
+			(size_t)opts.batch_size, flags);
 	if (opts.batch_size)
 		die(_("--batch-size option is only for 'repack' subcommand"));
 
 	if (!strcmp(argv[0], "write"))
-		return write_midx_file(opts.object_dir);
+		return write_midx_file(opts.object_dir, flags);
 	if (!strcmp(argv[0], "verify"))
-		return verify_midx_file(the_repository, opts.object_dir);
+		return verify_midx_file(the_repository, opts.object_dir, flags);
 	if (!strcmp(argv[0], "expire"))
-		return expire_midx_packs(the_repository, opts.object_dir);
+		return expire_midx_packs(the_repository, opts.object_dir, flags);
 
 	die(_("unrecognized subcommand: %s"), argv[0]);
 }
diff --git a/third_party/git/builtin/name-rev.c b/third_party/git/builtin/name-rev.c
index c785fe16bade..a9dcd25e4647 100644
--- a/third_party/git/builtin/name-rev.c
+++ b/third_party/git/builtin/name-rev.c
@@ -6,20 +6,25 @@
 #include "tag.h"
 #include "refs.h"
 #include "parse-options.h"
+#include "prio-queue.h"
 #include "sha1-lookup.h"
 #include "commit-slab.h"
 
-#define CUTOFF_DATE_SLOP 86400 /* one day */
+/*
+ * One day.  See the 'name a rev shortly after epoch' test in t6120 when
+ * changing this value
+ */
+#define CUTOFF_DATE_SLOP 86400
 
-typedef struct rev_name {
-	const char *tip_name;
+struct rev_name {
+	char *tip_name;
 	timestamp_t taggerdate;
 	int generation;
 	int distance;
 	int from_tag;
-} rev_name;
+};
 
-define_commit_slab(commit_rev_name, struct rev_name *);
+define_commit_slab(commit_rev_name, struct rev_name);
 
 static timestamp_t cutoff = TIME_MAX;
 static struct commit_rev_name rev_names;
@@ -27,16 +32,16 @@ static struct commit_rev_name rev_names;
 /* How many generations are maximally preferred over _one_ merge traversal? */
 #define MERGE_TRAVERSAL_WEIGHT 65535
 
-static struct rev_name *get_commit_rev_name(struct commit *commit)
+static int is_valid_rev_name(const struct rev_name *name)
 {
-	struct rev_name **slot = commit_rev_name_peek(&rev_names, commit);
-
-	return slot ? *slot : NULL;
+	return name && (name->generation || name->tip_name);
 }
 
-static void set_commit_rev_name(struct commit *commit, struct rev_name *name)
+static struct rev_name *get_commit_rev_name(const struct commit *commit)
 {
-	*commit_rev_name_at(&rev_names, commit) = name;
+	struct rev_name *name = commit_rev_name_peek(&rev_names, commit);
+
+	return is_valid_rev_name(name) ? name : NULL;
 }
 
 static int is_better_name(struct rev_name *name,
@@ -75,68 +80,135 @@ static int is_better_name(struct rev_name *name,
 	return 0;
 }
 
-static void name_rev(struct commit *commit,
-		const char *tip_name, timestamp_t taggerdate,
-		int generation, int distance, int from_tag,
-		int deref)
+static struct rev_name *create_or_update_name(struct commit *commit,
+					      timestamp_t taggerdate,
+					      int generation, int distance,
+					      int from_tag)
 {
-	struct rev_name *name = get_commit_rev_name(commit);
-	struct commit_list *parents;
-	int parent_number = 1;
-	char *to_free = NULL;
-
-	parse_commit(commit);
+	struct rev_name *name = commit_rev_name_at(&rev_names, commit);
+
+	if (is_valid_rev_name(name)) {
+		if (!is_better_name(name, taggerdate, distance, from_tag))
+			return NULL;
+
+		/*
+		 * This string might still be shared with ancestors
+		 * (generation > 0).  We can release it here regardless,
+		 * because the new name that has just won will be better
+		 * for them as well, so name_rev() will replace these
+		 * stale pointers when it processes the parents.
+		 */
+		if (!name->generation)
+			free(name->tip_name);
+	}
 
-	if (commit->date < cutoff)
-		return;
+	name->taggerdate = taggerdate;
+	name->generation = generation;
+	name->distance = distance;
+	name->from_tag = from_tag;
 
-	if (deref) {
-		tip_name = to_free = xstrfmt("%s^0", tip_name);
+	return name;
+}
 
-		if (generation)
-			die("generation: %d, but deref?", generation);
+static char *get_parent_name(const struct rev_name *name, int parent_number)
+{
+	struct strbuf sb = STRBUF_INIT;
+	size_t len;
+
+	strip_suffix(name->tip_name, "^0", &len);
+	if (name->generation > 0) {
+		strbuf_grow(&sb, len +
+			    1 + decimal_width(name->generation) +
+			    1 + decimal_width(parent_number));
+		strbuf_addf(&sb, "%.*s~%d^%d", (int)len, name->tip_name,
+			    name->generation, parent_number);
+	} else {
+		strbuf_grow(&sb, len +
+			    1 + decimal_width(parent_number));
+		strbuf_addf(&sb, "%.*s^%d", (int)len, name->tip_name,
+			    parent_number);
 	}
+	return strbuf_detach(&sb, NULL);
+}
 
-	if (name == NULL) {
-		name = xmalloc(sizeof(rev_name));
-		set_commit_rev_name(commit, name);
-		goto copy_data;
-	} else if (is_better_name(name, taggerdate, distance, from_tag)) {
-copy_data:
-		name->tip_name = tip_name;
-		name->taggerdate = taggerdate;
-		name->generation = generation;
-		name->distance = distance;
-		name->from_tag = from_tag;
-	} else {
-		free(to_free);
+static void name_rev(struct commit *start_commit,
+		const char *tip_name, timestamp_t taggerdate,
+		int from_tag, int deref)
+{
+	struct prio_queue queue;
+	struct commit *commit;
+	struct commit **parents_to_queue = NULL;
+	size_t parents_to_queue_nr, parents_to_queue_alloc = 0;
+	struct rev_name *start_name;
+
+	parse_commit(start_commit);
+	if (start_commit->date < cutoff)
 		return;
-	}
 
-	for (parents = commit->parents;
-			parents;
-			parents = parents->next, parent_number++) {
-		if (parent_number > 1) {
-			size_t len;
-			char *new_name;
-
-			strip_suffix(tip_name, "^0", &len);
-			if (generation > 0)
-				new_name = xstrfmt("%.*s~%d^%d", (int)len, tip_name,
-						   generation, parent_number);
-			else
-				new_name = xstrfmt("%.*s^%d", (int)len, tip_name,
-						   parent_number);
-
-			name_rev(parents->item, new_name, taggerdate, 0,
-				 distance + MERGE_TRAVERSAL_WEIGHT,
-				 from_tag, 0);
-		} else {
-			name_rev(parents->item, tip_name, taggerdate,
-				 generation + 1, distance + 1,
-				 from_tag, 0);
+	start_name = create_or_update_name(start_commit, taggerdate, 0, 0,
+					   from_tag);
+	if (!start_name)
+		return;
+	if (deref)
+		start_name->tip_name = xstrfmt("%s^0", tip_name);
+	else
+		start_name->tip_name = xstrdup(tip_name);
+
+	memset(&queue, 0, sizeof(queue)); /* Use the prio_queue as LIFO */
+	prio_queue_put(&queue, start_commit);
+
+	while ((commit = prio_queue_get(&queue))) {
+		struct rev_name *name = get_commit_rev_name(commit);
+		struct commit_list *parents;
+		int parent_number = 1;
+
+		parents_to_queue_nr = 0;
+
+		for (parents = commit->parents;
+				parents;
+				parents = parents->next, parent_number++) {
+			struct commit *parent = parents->item;
+			struct rev_name *parent_name;
+			int generation, distance;
+
+			parse_commit(parent);
+			if (parent->date < cutoff)
+				continue;
+
+			if (parent_number > 1) {
+				generation = 0;
+				distance = name->distance + MERGE_TRAVERSAL_WEIGHT;
+			} else {
+				generation = name->generation + 1;
+				distance = name->distance + 1;
+			}
+
+			parent_name = create_or_update_name(parent, taggerdate,
+							    generation,
+							    distance, from_tag);
+			if (parent_name) {
+				if (parent_number > 1)
+					parent_name->tip_name =
+						get_parent_name(name,
+								parent_number);
+				else
+					parent_name->tip_name = name->tip_name;
+				ALLOC_GROW(parents_to_queue,
+					   parents_to_queue_nr + 1,
+					   parents_to_queue_alloc);
+				parents_to_queue[parents_to_queue_nr] = parent;
+				parents_to_queue_nr++;
+			}
 		}
+
+		/* The first parent must come out first from the prio_queue */
+		while (parents_to_queue_nr)
+			prio_queue_put(&queue,
+				       parents_to_queue[--parents_to_queue_nr]);
 	}
+
+	clear_prio_queue(&queue);
+	free(parents_to_queue);
 }
 
 static int subpath_matches(const char *path, const char *filter)
@@ -157,10 +229,10 @@ static const char *name_ref_abbrev(const char *refname, int shorten_unambiguous)
 {
 	if (shorten_unambiguous)
 		refname = shorten_unambiguous_ref(refname, 0);
-	else if (starts_with(refname, "refs/heads/"))
-		refname = refname + 11;
-	else if (starts_with(refname, "refs/"))
-		refname = refname + 5;
+	else if (skip_prefix(refname, "refs/heads/", &refname))
+		; /* refname already advanced */
+	else
+		skip_prefix(refname, "refs/", &refname);
 	return refname;
 }
 
@@ -175,6 +247,10 @@ static struct tip_table {
 	struct tip_table_entry {
 		struct object_id oid;
 		const char *refname;
+		struct commit *commit;
+		timestamp_t taggerdate;
+		unsigned int from_tag:1;
+		unsigned int deref:1;
 	} *table;
 	int nr;
 	int alloc;
@@ -182,13 +258,18 @@ static struct tip_table {
 } tip_table;
 
 static void add_to_tip_table(const struct object_id *oid, const char *refname,
-			     int shorten_unambiguous)
+			     int shorten_unambiguous, struct commit *commit,
+			     timestamp_t taggerdate, int from_tag, int deref)
 {
 	refname = name_ref_abbrev(refname, shorten_unambiguous);
 
 	ALLOC_GROW(tip_table.table, tip_table.nr + 1, tip_table.alloc);
 	oidcpy(&tip_table.table[tip_table.nr].oid, oid);
 	tip_table.table[tip_table.nr].refname = xstrdup(refname);
+	tip_table.table[tip_table.nr].commit = commit;
+	tip_table.table[tip_table.nr].taggerdate = taggerdate;
+	tip_table.table[tip_table.nr].from_tag = from_tag;
+	tip_table.table[tip_table.nr].deref = deref;
 	tip_table.nr++;
 	tip_table.sorted = 0;
 }
@@ -199,12 +280,30 @@ static int tipcmp(const void *a_, const void *b_)
 	return oidcmp(&a->oid, &b->oid);
 }
 
+static int cmp_by_tag_and_age(const void *a_, const void *b_)
+{
+	const struct tip_table_entry *a = a_, *b = b_;
+	int cmp;
+
+	/* Prefer tags. */
+	cmp = b->from_tag - a->from_tag;
+	if (cmp)
+		return cmp;
+
+	/* Older is better. */
+	if (a->taggerdate < b->taggerdate)
+		return -1;
+	return a->taggerdate != b->taggerdate;
+}
+
 static int name_ref(const char *path, const struct object_id *oid, int flags, void *cb_data)
 {
 	struct object *o = parse_object(the_repository, oid);
 	struct name_ref_data *data = cb_data;
 	int can_abbreviate_output = data->tags_only && data->name_only;
 	int deref = 0;
+	int from_tag = 0;
+	struct commit *commit = NULL;
 	timestamp_t taggerdate = TIME_MAX;
 
 	if (data->tags_only && !starts_with(path, "refs/tags/"))
@@ -253,8 +352,6 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo
 			return 0;
 	}
 
-	add_to_tip_table(oid, path, can_abbreviate_output);
-
 	while (o && o->type == OBJ_TAG) {
 		struct tag *t = (struct tag *) o;
 		if (!t->tagged)
@@ -264,18 +361,35 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo
 		taggerdate = t->date;
 	}
 	if (o && o->type == OBJ_COMMIT) {
-		struct commit *commit = (struct commit *)o;
-		int from_tag = starts_with(path, "refs/tags/");
-
+		commit = (struct commit *)o;
+		from_tag = starts_with(path, "refs/tags/");
 		if (taggerdate == TIME_MAX)
-			taggerdate = ((struct commit *)o)->date;
-		path = name_ref_abbrev(path, can_abbreviate_output);
-		name_rev(commit, xstrdup(path), taggerdate, 0, 0,
-			 from_tag, deref);
+			taggerdate = commit->date;
 	}
+
+	add_to_tip_table(oid, path, can_abbreviate_output, commit, taggerdate,
+			 from_tag, deref);
 	return 0;
 }
 
+static void name_tips(void)
+{
+	int i;
+
+	/*
+	 * Try to set better names first, so that worse ones spread
+	 * less.
+	 */
+	QSORT(tip_table.table, tip_table.nr, cmp_by_tag_and_age);
+	for (i = 0; i < tip_table.nr; i++) {
+		struct tip_table_entry *e = &tip_table.table[i];
+		if (e->commit) {
+			name_rev(e->commit, e->refname, e->taggerdate,
+				 e->from_tag, e->deref);
+		}
+	}
+}
+
 static const unsigned char *nth_tip_table_ent(size_t ix, void *table_)
 {
 	struct tip_table_entry *table = table_;
@@ -305,11 +419,11 @@ static const char *get_exact_ref_match(const struct object *o)
 static const char *get_rev_name(const struct object *o, struct strbuf *buf)
 {
 	struct rev_name *n;
-	struct commit *c;
+	const struct commit *c;
 
 	if (o->type != OBJ_COMMIT)
 		return get_exact_ref_match(o);
-	c = (struct commit *) o;
+	c = (const struct commit *) o;
 	n = get_commit_rev_name(c);
 	if (!n)
 		return NULL;
@@ -317,11 +431,10 @@ static const char *get_rev_name(const struct object *o, struct strbuf *buf)
 	if (!n->generation)
 		return n->tip_name;
 	else {
-		int len = strlen(n->tip_name);
-		if (len > 2 && !strcmp(n->tip_name + len - 2, "^0"))
-			len -= 2;
 		strbuf_reset(buf);
-		strbuf_addf(buf, "%.*s~%d", len, n->tip_name, n->generation);
+		strbuf_addstr(buf, n->tip_name);
+		strbuf_strip_suffix(buf, "^0");
+		strbuf_addf(buf, "~%d", n->generation);
 		return buf->buf;
 	}
 }
@@ -481,9 +594,15 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
 		add_object_array(object, *argv, &revs);
 	}
 
-	if (cutoff)
-		cutoff = cutoff - CUTOFF_DATE_SLOP;
+	if (cutoff) {
+		/* check for undeflow */
+		if (cutoff > TIME_MIN + CUTOFF_DATE_SLOP)
+			cutoff = cutoff - CUTOFF_DATE_SLOP;
+		else
+			cutoff = TIME_MIN;
+	}
 	for_each_ref(name_ref, &data);
+	name_tips();
 
 	if (transform_stdin) {
 		char buffer[2048];
diff --git a/third_party/git/builtin/notes.c b/third_party/git/builtin/notes.c
index 02e97f55c5a0..35e468ea2d2f 100644
--- a/third_party/git/builtin/notes.c
+++ b/third_party/git/builtin/notes.c
@@ -513,7 +513,7 @@ static int copy(int argc, const char **argv, const char *prefix)
 		}
 	}
 
-	if (argc < 2) {
+	if (argc < 1) {
 		error(_("too few parameters"));
 		usage_with_options(git_notes_copy_usage, options);
 	}
@@ -622,7 +622,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
 
 		strbuf_grow(&d.buf, size + 1);
 		if (d.buf.len && prev_buf && size)
-			strbuf_insert(&d.buf, 0, "\n", 1);
+			strbuf_insertstr(&d.buf, 0, "\n");
 		if (prev_buf && size)
 			strbuf_insert(&d.buf, 0, prev_buf, size);
 		free(prev_buf);
@@ -745,7 +745,7 @@ static int merge_commit(struct notes_merge_options *o)
 	memset(&pretty_ctx, 0, sizeof(pretty_ctx));
 	format_commit_message(partial, "%s", &msg, &pretty_ctx);
 	strbuf_trim(&msg);
-	strbuf_insert(&msg, 0, "notes: ", 7);
+	strbuf_insertstr(&msg, 0, "notes: ");
 	update_ref(msg.buf, o->local_ref, &oid,
 		   is_null_oid(&parent_oid) ? NULL : &parent_oid,
 		   0, UPDATE_REFS_DIE_ON_ERR);
diff --git a/third_party/git/builtin/pack-objects.c b/third_party/git/builtin/pack-objects.c
index 76ce9069467e..02aa6ee4808a 100644
--- a/third_party/git/builtin/pack-objects.c
+++ b/third_party/git/builtin/pack-objects.c
@@ -92,10 +92,11 @@ static struct progress *progress_state;
 
 static struct packed_git *reuse_packfile;
 static uint32_t reuse_packfile_objects;
-static off_t reuse_packfile_offset;
+static struct bitmap *reuse_packfile_bitmap;
 
 static int use_bitmap_index_default = 1;
 static int use_bitmap_index = -1;
+static int allow_pack_reuse = 1;
 static enum {
 	WRITE_BITMAP_FALSE = 0,
 	WRITE_BITMAP_QUIET,
@@ -163,7 +164,7 @@ static void *get_delta(struct object_entry *entry)
 	delta_buf = diff_delta(base_buf, base_size,
 			       buf, size, &delta_size, 0);
 	/*
-	 * We succesfully computed this delta once but dropped it for
+	 * We successfully computed this delta once but dropped it for
 	 * memory reasons. Something is very wrong if this time we
 	 * recompute and create a different delta.
 	 */
@@ -303,7 +304,8 @@ static unsigned long write_no_reuse_object(struct hashfile *f, struct object_ent
 	if (!usable_delta) {
 		if (oe_type(entry) == OBJ_BLOB &&
 		    oe_size_greater_than(&to_pack, entry, big_file_threshold) &&
-		    (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL)
+		    (st = open_istream(the_repository, &entry->idx.oid, &type,
+				       &size, NULL)) != NULL)
 			buf = NULL;
 		else {
 			buf = read_object_file(&entry->idx.oid, &type, &size);
@@ -610,12 +612,12 @@ static int mark_tagged(const char *path, const struct object_id *oid, int flag,
 		       void *cb_data)
 {
 	struct object_id peeled;
-	struct object_entry *entry = packlist_find(&to_pack, oid, NULL);
+	struct object_entry *entry = packlist_find(&to_pack, oid);
 
 	if (entry)
 		entry->tagged = 1;
 	if (!peel_ref(path, &peeled)) {
-		entry = packlist_find(&to_pack, &peeled, NULL);
+		entry = packlist_find(&to_pack, &peeled);
 		if (entry)
 			entry->tagged = 1;
 	}
@@ -784,57 +786,186 @@ static struct object_entry **compute_write_order(void)
 	return wo;
 }
 
-static off_t write_reused_pack(struct hashfile *f)
+
+/*
+ * A reused set of objects. All objects in a chunk have the same
+ * relative position in the original packfile and the generated
+ * packfile.
+ */
+
+static struct reused_chunk {
+	/* The offset of the first object of this chunk in the original
+	 * packfile. */
+	off_t original;
+	/* The offset of the first object of this chunk in the generated
+	 * packfile minus "original". */
+	off_t difference;
+} *reused_chunks;
+static int reused_chunks_nr;
+static int reused_chunks_alloc;
+
+static void record_reused_object(off_t where, off_t offset)
 {
-	unsigned char buffer[8192];
-	off_t to_write, total;
-	int fd;
+	if (reused_chunks_nr && reused_chunks[reused_chunks_nr-1].difference == offset)
+		return;
 
-	if (!is_pack_valid(reuse_packfile))
-		die(_("packfile is invalid: %s"), reuse_packfile->pack_name);
+	ALLOC_GROW(reused_chunks, reused_chunks_nr + 1,
+		   reused_chunks_alloc);
+	reused_chunks[reused_chunks_nr].original = where;
+	reused_chunks[reused_chunks_nr].difference = offset;
+	reused_chunks_nr++;
+}
 
-	fd = git_open(reuse_packfile->pack_name);
-	if (fd < 0)
-		die_errno(_("unable to open packfile for reuse: %s"),
-			  reuse_packfile->pack_name);
+/*
+ * Binary search to find the chunk that "where" is in. Note
+ * that we're not looking for an exact match, just the first
+ * chunk that contains it (which implicitly ends at the start
+ * of the next chunk.
+ */
+static off_t find_reused_offset(off_t where)
+{
+	int lo = 0, hi = reused_chunks_nr;
+	while (lo < hi) {
+		int mi = lo + ((hi - lo) / 2);
+		if (where == reused_chunks[mi].original)
+			return reused_chunks[mi].difference;
+		if (where < reused_chunks[mi].original)
+			hi = mi;
+		else
+			lo = mi + 1;
+	}
 
-	if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1)
-		die_errno(_("unable to seek in reused packfile"));
+	/*
+	 * The first chunk starts at zero, so we can't have gone below
+	 * there.
+	 */
+	assert(lo);
+	return reused_chunks[lo-1].difference;
+}
 
-	if (reuse_packfile_offset < 0)
-		reuse_packfile_offset = reuse_packfile->pack_size - the_hash_algo->rawsz;
+static void write_reused_pack_one(size_t pos, struct hashfile *out,
+				  struct pack_window **w_curs)
+{
+	off_t offset, next, cur;
+	enum object_type type;
+	unsigned long size;
 
-	total = to_write = reuse_packfile_offset - sizeof(struct pack_header);
+	offset = reuse_packfile->revindex[pos].offset;
+	next = reuse_packfile->revindex[pos + 1].offset;
 
-	while (to_write) {
-		int read_pack = xread(fd, buffer, sizeof(buffer));
+	record_reused_object(offset, offset - hashfile_total(out));
 
-		if (read_pack <= 0)
-			die_errno(_("unable to read from reused packfile"));
+	cur = offset;
+	type = unpack_object_header(reuse_packfile, w_curs, &cur, &size);
+	assert(type >= 0);
 
-		if (read_pack > to_write)
-			read_pack = to_write;
+	if (type == OBJ_OFS_DELTA) {
+		off_t base_offset;
+		off_t fixup;
 
-		hashwrite(f, buffer, read_pack);
-		to_write -= read_pack;
+		unsigned char header[MAX_PACK_OBJECT_HEADER];
+		unsigned len;
+
+		base_offset = get_delta_base(reuse_packfile, w_curs, &cur, type, offset);
+		assert(base_offset != 0);
+
+		/* Convert to REF_DELTA if we must... */
+		if (!allow_ofs_delta) {
+			int base_pos = find_revindex_position(reuse_packfile, base_offset);
+			struct object_id base_oid;
+
+			nth_packed_object_id(&base_oid, reuse_packfile,
+					     reuse_packfile->revindex[base_pos].nr);
+
+			len = encode_in_pack_object_header(header, sizeof(header),
+							   OBJ_REF_DELTA, size);
+			hashwrite(out, header, len);
+			hashwrite(out, base_oid.hash, 20);
+			copy_pack_data(out, reuse_packfile, w_curs, cur, next - cur);
+			return;
+		}
+
+		/* Otherwise see if we need to rewrite the offset... */
+		fixup = find_reused_offset(offset) -
+			find_reused_offset(base_offset);
+		if (fixup) {
+			unsigned char ofs_header[10];
+			unsigned i, ofs_len;
+			off_t ofs = offset - base_offset - fixup;
+
+			len = encode_in_pack_object_header(header, sizeof(header),
+							   OBJ_OFS_DELTA, size);
+
+			i = sizeof(ofs_header) - 1;
+			ofs_header[i] = ofs & 127;
+			while (ofs >>= 7)
+				ofs_header[--i] = 128 | (--ofs & 127);
+
+			ofs_len = sizeof(ofs_header) - i;
+
+			hashwrite(out, header, len);
+			hashwrite(out, ofs_header + sizeof(ofs_header) - ofs_len, ofs_len);
+			copy_pack_data(out, reuse_packfile, w_curs, cur, next - cur);
+			return;
+		}
+
+		/* ...otherwise we have no fixup, and can write it verbatim */
+	}
+
+	copy_pack_data(out, reuse_packfile, w_curs, offset, next - offset);
+}
+
+static size_t write_reused_pack_verbatim(struct hashfile *out,
+					 struct pack_window **w_curs)
+{
+	size_t pos = 0;
+
+	while (pos < reuse_packfile_bitmap->word_alloc &&
+			reuse_packfile_bitmap->words[pos] == (eword_t)~0)
+		pos++;
+
+	if (pos) {
+		off_t to_write;
+
+		written = (pos * BITS_IN_EWORD);
+		to_write = reuse_packfile->revindex[written].offset
+			- sizeof(struct pack_header);
+
+		/* We're recording one chunk, not one object. */
+		record_reused_object(sizeof(struct pack_header), 0);
+		hashflush(out);
+		copy_pack_data(out, reuse_packfile, w_curs,
+			sizeof(struct pack_header), to_write);
 
-		/*
-		 * We don't know the actual number of objects written,
-		 * only how many bytes written, how many bytes total, and
-		 * how many objects total. So we can fake it by pretending all
-		 * objects we are writing are the same size. This gives us a
-		 * smooth progress meter, and at the end it matches the true
-		 * answer.
-		 */
-		written = reuse_packfile_objects *
-				(((double)(total - to_write)) / total);
 		display_progress(progress_state, written);
 	}
+	return pos;
+}
+
+static void write_reused_pack(struct hashfile *f)
+{
+	size_t i = 0;
+	uint32_t offset;
+	struct pack_window *w_curs = NULL;
+
+	if (allow_ofs_delta)
+		i = write_reused_pack_verbatim(f, &w_curs);
+
+	for (; i < reuse_packfile_bitmap->word_alloc; ++i) {
+		eword_t word = reuse_packfile_bitmap->words[i];
+		size_t pos = (i * BITS_IN_EWORD);
+
+		for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
+			if ((word >> offset) == 0)
+				break;
+
+			offset += ewah_bit_ctz64(word >> offset);
+			write_reused_pack_one(pos + offset, f, &w_curs);
+			display_progress(progress_state, ++written);
+		}
+	}
 
-	close(fd);
-	written = reuse_packfile_objects;
-	display_progress(progress_state, written);
-	return reuse_packfile_offset - sizeof(struct pack_header);
+	unuse_pack(&w_curs);
 }
 
 static const char no_split_warning[] = N_(
@@ -867,11 +998,9 @@ static void write_pack_file(void)
 		offset = write_pack_header(f, nr_remaining);
 
 		if (reuse_packfile) {
-			off_t packfile_size;
 			assert(pack_to_stdout);
-
-			packfile_size = write_reused_pack(f);
-			offset += packfile_size;
+			write_reused_pack(f);
+			offset = hashfile_total(f);
 		}
 
 		nr_written = 0;
@@ -996,12 +1125,15 @@ static int no_try_delta(const char *path)
  * few lines later when we want to add the new entry.
  */
 static int have_duplicate_entry(const struct object_id *oid,
-				int exclude,
-				uint32_t *index_pos)
+				int exclude)
 {
 	struct object_entry *entry;
 
-	entry = packlist_find(&to_pack, oid, index_pos);
+	if (reuse_packfile_bitmap &&
+	    bitmap_walk_contains(bitmap_git, reuse_packfile_bitmap, oid))
+		return 1;
+
+	entry = packlist_find(&to_pack, oid);
 	if (!entry)
 		return 0;
 
@@ -1141,13 +1273,12 @@ static void create_object_entry(const struct object_id *oid,
 				uint32_t hash,
 				int exclude,
 				int no_try_delta,
-				uint32_t index_pos,
 				struct packed_git *found_pack,
 				off_t found_offset)
 {
 	struct object_entry *entry;
 
-	entry = packlist_alloc(&to_pack, oid->hash, index_pos);
+	entry = packlist_alloc(&to_pack, oid);
 	entry->hash = hash;
 	oe_set_type(entry, type);
 	if (exclude)
@@ -1171,11 +1302,10 @@ static int add_object_entry(const struct object_id *oid, enum object_type type,
 {
 	struct packed_git *found_pack = NULL;
 	off_t found_offset = 0;
-	uint32_t index_pos;
 
 	display_progress(progress_state, ++nr_seen);
 
-	if (have_duplicate_entry(oid, exclude, &index_pos))
+	if (have_duplicate_entry(oid, exclude))
 		return 0;
 
 	if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) {
@@ -1190,7 +1320,7 @@ static int add_object_entry(const struct object_id *oid, enum object_type type,
 
 	create_object_entry(oid, type, pack_name_hash(name),
 			    exclude, name && no_try_delta(name),
-			    index_pos, found_pack, found_offset);
+			    found_pack, found_offset);
 	return 1;
 }
 
@@ -1199,17 +1329,15 @@ static int add_object_entry_from_bitmap(const struct object_id *oid,
 					int flags, uint32_t name_hash,
 					struct packed_git *pack, off_t offset)
 {
-	uint32_t index_pos;
-
 	display_progress(progress_state, ++nr_seen);
 
-	if (have_duplicate_entry(oid, 0, &index_pos))
+	if (have_duplicate_entry(oid, 0))
 		return 0;
 
 	if (!want_object_in_pack(oid, 0, &pack, &offset))
 		return 0;
 
-	create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset);
+	create_object_entry(oid, type, name_hash, 0, 0, pack, offset);
 	return 1;
 }
 
@@ -1491,23 +1619,17 @@ static void cleanup_preferred_base(void)
  * deltify other objects against, in order to avoid
  * circular deltas.
  */
-static int can_reuse_delta(const unsigned char *base_sha1,
+static int can_reuse_delta(const struct object_id *base_oid,
 			   struct object_entry *delta,
 			   struct object_entry **base_out)
 {
 	struct object_entry *base;
-	struct object_id base_oid;
-
-	if (!base_sha1)
-		return 0;
-
-	oidread(&base_oid, base_sha1);
 
 	/*
 	 * First see if we're already sending the base (or it's explicitly in
 	 * our "excluded" list).
 	 */
-	base = packlist_find(&to_pack, &base_oid, NULL);
+	base = packlist_find(&to_pack, base_oid);
 	if (base) {
 		if (!in_same_island(&delta->idx.oid, &base->idx.oid))
 			return 0;
@@ -1520,9 +1642,9 @@ static int can_reuse_delta(const unsigned char *base_sha1,
 	 * even if it was buried too deep in history to make it into the
 	 * packing list.
 	 */
-	if (thin && bitmap_has_oid_in_uninteresting(bitmap_git, &base_oid)) {
+	if (thin && bitmap_has_oid_in_uninteresting(bitmap_git, base_oid)) {
 		if (use_delta_islands) {
-			if (!in_same_island(&delta->idx.oid, &base_oid))
+			if (!in_same_island(&delta->idx.oid, base_oid))
 				return 0;
 		}
 		*base_out = NULL;
@@ -1539,7 +1661,8 @@ static void check_object(struct object_entry *entry)
 	if (IN_PACK(entry)) {
 		struct packed_git *p = IN_PACK(entry);
 		struct pack_window *w_curs = NULL;
-		const unsigned char *base_ref = NULL;
+		int have_base = 0;
+		struct object_id base_ref;
 		struct object_entry *base_entry;
 		unsigned long used, used_0;
 		unsigned long avail;
@@ -1580,9 +1703,13 @@ static void check_object(struct object_entry *entry)
 			unuse_pack(&w_curs);
 			return;
 		case OBJ_REF_DELTA:
-			if (reuse_delta && !entry->preferred_base)
-				base_ref = use_pack(p, &w_curs,
-						entry->in_pack_offset + used, NULL);
+			if (reuse_delta && !entry->preferred_base) {
+				oidread(&base_ref,
+					use_pack(p, &w_curs,
+						 entry->in_pack_offset + used,
+						 NULL));
+				have_base = 1;
+			}
 			entry->in_pack_header_size = used + the_hash_algo->rawsz;
 			break;
 		case OBJ_OFS_DELTA:
@@ -1612,13 +1739,15 @@ static void check_object(struct object_entry *entry)
 				revidx = find_pack_revindex(p, ofs);
 				if (!revidx)
 					goto give_up;
-				base_ref = nth_packed_object_sha1(p, revidx->nr);
+				if (!nth_packed_object_id(&base_ref, p, revidx->nr))
+					have_base = 1;
 			}
 			entry->in_pack_header_size = used + used_0;
 			break;
 		}
 
-		if (can_reuse_delta(base_ref, entry, &base_entry)) {
+		if (have_base &&
+		    can_reuse_delta(&base_ref, entry, &base_entry)) {
 			oe_set_type(entry, entry->in_pack_type);
 			SET_SIZE(entry, in_pack_size); /* delta size */
 			SET_DELTA_SIZE(entry, in_pack_size);
@@ -1628,7 +1757,7 @@ static void check_object(struct object_entry *entry)
 				entry->delta_sibling_idx = base_entry->delta_child_idx;
 				SET_DELTA_CHILD(base_entry, entry);
 			} else {
-				SET_DELTA_EXT(entry, base_ref);
+				SET_DELTA_EXT(entry, &base_ref);
 			}
 
 			unuse_pack(&w_curs);
@@ -2342,15 +2471,6 @@ static void find_deltas(struct object_entry **list, unsigned *list_size,
 	free(array);
 }
 
-static void try_to_free_from_threads(size_t size)
-{
-	packing_data_lock(&to_pack);
-	release_pack_memory(size);
-	packing_data_unlock(&to_pack);
-}
-
-static try_to_free_t old_try_to_free_routine;
-
 /*
  * The main object list is split into smaller lists, each is handed to
  * one worker.
@@ -2391,12 +2511,10 @@ static void init_threaded_search(void)
 	pthread_mutex_init(&cache_mutex, NULL);
 	pthread_mutex_init(&progress_mutex, NULL);
 	pthread_cond_init(&progress_cond, NULL);
-	old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
 }
 
 static void cleanup_threaded_search(void)
 {
-	set_try_to_free_routine(old_try_to_free_routine);
 	pthread_cond_destroy(&progress_cond);
 	pthread_mutex_destroy(&cache_mutex);
 	pthread_mutex_destroy(&progress_mutex);
@@ -2568,6 +2686,13 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size,
 	free(p);
 }
 
+static int obj_is_packed(const struct object_id *oid)
+{
+	return packlist_find(&to_pack, oid) ||
+		(reuse_packfile_bitmap &&
+		 bitmap_walk_contains(bitmap_git, reuse_packfile_bitmap, oid));
+}
+
 static void add_tag_chain(const struct object_id *oid)
 {
 	struct tag *tag;
@@ -2579,7 +2704,7 @@ static void add_tag_chain(const struct object_id *oid)
 	 * it was included via bitmaps, we would not have parsed it
 	 * previously).
 	 */
-	if (packlist_find(&to_pack, oid, NULL))
+	if (obj_is_packed(oid))
 		return;
 
 	tag = lookup_tag(the_repository, oid);
@@ -2603,7 +2728,7 @@ static int add_ref_tag(const char *path, const struct object_id *oid, int flag,
 
 	if (starts_with(path, "refs/tags/") && /* is a tag? */
 	    !peel_ref(path, &peeled)    && /* peelable? */
-	    packlist_find(&to_pack, &peeled, NULL))      /* object packed? */
+	    obj_is_packed(&peeled)) /* object packed? */
 		add_tag_chain(oid);
 	return 0;
 }
@@ -2671,6 +2796,7 @@ static void prepare_pack(int window, int depth)
 
 	if (nr_deltas && n > 1) {
 		unsigned nr_done = 0;
+
 		if (progress)
 			progress_state = start_progress(_("Compressing objects"),
 							nr_deltas);
@@ -2715,8 +2841,8 @@ static int git_pack_config(const char *k, const char *v, void *cb)
 		use_bitmap_index_default = git_config_bool(k, v);
 		return 0;
 	}
-	if (!strcmp(k, "pack.usesparse")) {
-		sparse = git_config_bool(k, v);
+	if (!strcmp(k, "pack.allowpackreuse")) {
+		allow_pack_reuse = git_config_bool(k, v);
 		return 0;
 	}
 	if (!strcmp(k, "pack.threads")) {
@@ -2803,7 +2929,7 @@ static void show_object(struct object *obj, const char *name, void *data)
 		for (p = strchr(name, '/'); p; p = strchr(p + 1, '/'))
 			depth++;
 
-		ent = packlist_find(&to_pack, &obj->oid, NULL);
+		ent = packlist_find(&to_pack, &obj->oid);
 		if (ent && depth > oe_tree_depth(&to_pack, ent))
 			oe_set_tree_depth(&to_pack, ent, depth);
 	}
@@ -2929,7 +3055,7 @@ static void add_objects_in_unpacked_packs(void)
 			   in_pack.alloc);
 
 		for (i = 0; i < p->num_objects; i++) {
-			nth_packed_object_oid(&oid, p, i);
+			nth_packed_object_id(&oid, p, i);
 			o = lookup_unknown_object(&oid);
 			if (!(o->flags & OBJECT_ADDED))
 				mark_in_pack_object(o, p, &in_pack);
@@ -3033,8 +3159,8 @@ static void loosen_unused_packed_objects(void)
 			die(_("cannot open pack index"));
 
 		for (i = 0; i < p->num_objects; i++) {
-			nth_packed_object_oid(&oid, p, i);
-			if (!packlist_find(&to_pack, &oid, NULL) &&
+			nth_packed_object_id(&oid, p, i);
+			if (!packlist_find(&to_pack, &oid) &&
 			    !has_sha1_pack_kept_or_nonlocal(&oid) &&
 			    !loosened_object_can_be_discarded(&oid, p->mtime))
 				if (force_object_loose(&oid, p->mtime))
@@ -3050,8 +3176,8 @@ static void loosen_unused_packed_objects(void)
  */
 static int pack_options_allow_reuse(void)
 {
-	return pack_to_stdout &&
-	       allow_ofs_delta &&
+	return allow_pack_reuse &&
+	       pack_to_stdout &&
 	       !ignore_packed_keep_on_disk &&
 	       !ignore_packed_keep_in_core &&
 	       (!local || !have_non_local_packs) &&
@@ -3060,7 +3186,7 @@ static int pack_options_allow_reuse(void)
 
 static int get_object_list_from_bitmap(struct rev_info *revs)
 {
-	if (!(bitmap_git = prepare_bitmap_walk(revs)))
+	if (!(bitmap_git = prepare_bitmap_walk(revs, &filter_options)))
 		return -1;
 
 	if (pack_options_allow_reuse() &&
@@ -3068,13 +3194,14 @@ static int get_object_list_from_bitmap(struct rev_info *revs)
 			bitmap_git,
 			&reuse_packfile,
 			&reuse_packfile_objects,
-			&reuse_packfile_offset)) {
+			&reuse_packfile_bitmap)) {
 		assert(reuse_packfile_objects);
 		nr_result += reuse_packfile_objects;
 		display_progress(progress_state, nr_result);
 	}
 
-	traverse_bitmap_commit_list(bitmap_git, &add_object_entry_from_bitmap);
+	traverse_bitmap_commit_list(bitmap_git, revs,
+				    &add_object_entry_from_bitmap);
 	return 0;
 }
 
@@ -3343,6 +3470,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	read_replace_refs = 0;
 
 	sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0);
+	prepare_repo_settings(the_repository);
+	if (!sparse && the_repository->settings.pack_use_sparse != -1)
+		sparse = the_repository->settings.pack_use_sparse;
+
 	reset_pack_idx_option(&pack_idx_opts);
 	git_config(git_pack_config, NULL);
 
@@ -3434,7 +3565,6 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	if (filter_options.choice) {
 		if (!pack_to_stdout)
 			die(_("cannot use --filter without --stdout"));
-		use_bitmap_index = 0;
 	}
 
 	/*
@@ -3525,7 +3655,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	if (progress)
 		fprintf_ln(stderr,
 			   _("Total %"PRIu32" (delta %"PRIu32"),"
-			     " reused %"PRIu32" (delta %"PRIu32")"),
-			   written, written_delta, reused, reused_delta);
+			     " reused %"PRIu32" (delta %"PRIu32"),"
+			     " pack-reused %"PRIu32),
+			   written, written_delta, reused, reused_delta,
+			   reuse_packfile_objects);
 	return 0;
 }
diff --git a/third_party/git/builtin/patch-id.c b/third_party/git/builtin/patch-id.c
index bd28b80b2d0f..822ffff51fbd 100644
--- a/third_party/git/builtin/patch-id.c
+++ b/third_party/git/builtin/patch-id.c
@@ -1,16 +1,12 @@
+#include "cache.h"
 #include "builtin.h"
 #include "config.h"
 #include "diff.h"
 
 static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result)
 {
-	char name[50];
-
-	if (!patchlen)
-		return;
-
-	memcpy(name, oid_to_hex(id), GIT_SHA1_HEXSZ + 1);
-	printf("%s %s\n", oid_to_hex(result), name);
+	if (patchlen)
+		printf("%s %s\n", oid_to_hex(result), oid_to_hex(id));
 }
 
 static int remove_space(char *line)
@@ -60,9 +56,9 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
 {
 	int patchlen = 0, found_next = 0;
 	int before = -1, after = -1;
-	git_SHA_CTX ctx;
+	git_hash_ctx ctx;
 
-	git_SHA1_Init(&ctx);
+	the_hash_algo->init_fn(&ctx);
 	oidclr(result);
 
 	while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) {
@@ -122,7 +118,7 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
 		/* Compute the sha without whitespace */
 		len = remove_space(line);
 		patchlen += len;
-		git_SHA1_Update(&ctx, line, len);
+		the_hash_algo->update_fn(&ctx, line, len);
 	}
 
 	if (!found_next)
diff --git a/third_party/git/builtin/pull.c b/third_party/git/builtin/pull.c
index f1eaf6e6edb1..3e624d1e0085 100644
--- a/third_party/git/builtin/pull.c
+++ b/third_party/git/builtin/pull.c
@@ -15,6 +15,7 @@
 #include "sha1-array.h"
 #include "remote.h"
 #include "dir.h"
+#include "rebase.h"
 #include "refs.h"
 #include "refspec.h"
 #include "revision.h"
@@ -26,15 +27,6 @@
 #include "commit-reach.h"
 #include "sequencer.h"
 
-enum rebase_type {
-	REBASE_INVALID = -1,
-	REBASE_FALSE = 0,
-	REBASE_TRUE,
-	REBASE_PRESERVE,
-	REBASE_MERGES,
-	REBASE_INTERACTIVE
-};
-
 /**
  * Parses the value of --rebase. If value is a false value, returns
  * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is
@@ -45,22 +37,9 @@ enum rebase_type {
 static enum rebase_type parse_config_rebase(const char *key, const char *value,
 		int fatal)
 {
-	int v = git_parse_maybe_bool(value);
-
-	if (!v)
-		return REBASE_FALSE;
-	else if (v > 0)
-		return REBASE_TRUE;
-	else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
-		return REBASE_PRESERVE;
-	else if (!strcmp(value, "merges") || !strcmp(value, "m"))
-		return REBASE_MERGES;
-	else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
-		return REBASE_INTERACTIVE;
-	/*
-	 * Please update _git_config() in git-completion.bash when you
-	 * add new rebase modes.
-	 */
+	enum rebase_type v = rebase_parse_value(value);
+	if (v != REBASE_INVALID)
+		return v;
 
 	if (fatal)
 		die(_("Invalid value for %s: %s"), key, value);
@@ -107,6 +86,7 @@ static char *opt_ff;
 static char *opt_verify_signatures;
 static int opt_autostash = -1;
 static int config_autostash;
+static int check_trust_level = 1;
 static struct argv_array opt_strategies = ARGV_ARRAY_INIT;
 static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT;
 static char *opt_gpg_sign;
@@ -129,6 +109,7 @@ static char *opt_refmap;
 static char *opt_ipv4;
 static char *opt_ipv6;
 static int opt_show_forced_updates = -1;
+static char *set_upstream;
 
 static struct option pull_options[] = {
 	/* Shared options */
@@ -243,6 +224,9 @@ static struct option pull_options[] = {
 		PARSE_OPT_NOARG),
 	OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates,
 		 N_("check for forced-updates on all updated branches")),
+	OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL,
+		N_("set upstream for git pull/fetch"),
+		PARSE_OPT_NOARG),
 
 	OPT_END()
 };
@@ -351,6 +335,8 @@ static enum rebase_type config_get_rebase(void)
  */
 static int git_pull_config(const char *var, const char *value, void *cb)
 {
+	int status;
+
 	if (!strcmp(var, "rebase.autostash")) {
 		config_autostash = git_config_bool(var, value);
 		return 0;
@@ -358,7 +344,14 @@ static int git_pull_config(const char *var, const char *value, void *cb)
 		recurse_submodules = git_config_bool(var, value) ?
 			RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
 		return 0;
+	} else if (!strcmp(var, "gpg.mintrustlevel")) {
+		check_trust_level = 0;
 	}
+
+	status = git_gpg_config(var, value, cb);
+	if (status)
+		return status;
+
 	return git_default_config(var, value, cb);
 }
 
@@ -556,6 +549,8 @@ static int run_fetch(const char *repo, const char **refspecs)
 		argv_array_push(&args, "--show-forced-updates");
 	else if (opt_show_forced_updates == 0)
 		argv_array_push(&args, "--no-show-forced-updates");
+	if (set_upstream)
+		argv_array_push(&args, set_upstream);
 
 	if (repo) {
 		argv_array_push(&args, repo);
@@ -581,7 +576,8 @@ static int pull_into_void(const struct object_id *merge_head,
 			die(_("unable to access commit %s"),
 			    oid_to_hex(merge_head));
 
-		verify_merge_signature(commit, opt_verbosity);
+		verify_merge_signature(commit, opt_verbosity,
+				       check_trust_level);
 	}
 
 	/*
diff --git a/third_party/git/builtin/push.c b/third_party/git/builtin/push.c
index 021dd3b1e489..6dbf0f0bb713 100644
--- a/third_party/git/builtin/push.c
+++ b/third_party/git/builtin/push.c
@@ -64,6 +64,7 @@ static struct string_list push_options_config = STRING_LIST_INIT_DUP;
 static const char *map_refspec(const char *ref,
 			       struct remote *remote, struct ref *local_refs)
 {
+	const char *branch_name;
 	struct ref *matched = NULL;
 
 	/* Does "ref" uniquely name our ref? */
@@ -84,8 +85,8 @@ static const char *map_refspec(const char *ref,
 	}
 
 	if (push_default == PUSH_DEFAULT_UPSTREAM &&
-	    starts_with(matched->name, "refs/heads/")) {
-		struct branch *branch = branch_get(matched->name + 11);
+	    skip_prefix(matched->name, "refs/heads/", &branch_name)) {
+		struct branch *branch = branch_get(branch_name);
 		if (branch->merge_nr == 1 && branch->merge[0]->src) {
 			struct strbuf buf = STRBUF_INIT;
 			strbuf_addf(&buf, "%s:%s",
@@ -143,8 +144,8 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p)
 	return remote->url_nr;
 }
 
-static NORETURN int die_push_simple(struct branch *branch,
-				    struct remote *remote)
+static NORETURN void die_push_simple(struct branch *branch,
+				     struct remote *remote)
 {
 	/*
 	 * There's no point in using shorten_unambiguous_ref here,
@@ -357,8 +358,10 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
 
 	if (verbosity > 0)
 		fprintf(stderr, _("Pushing to %s\n"), transport->url);
+	trace2_region_enter("push", "transport_push", the_repository);
 	err = transport_push(the_repository, transport,
 			     rs, flags, &reject_reasons);
+	trace2_region_leave("push", "transport_push", the_repository);
 	if (err != 0) {
 		fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR));
 		error(_("failed to push some refs to '%s'"), transport->url);
@@ -385,30 +388,14 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
 }
 
 static int do_push(const char *repo, int flags,
-		   const struct string_list *push_options)
+		   const struct string_list *push_options,
+		   struct remote *remote)
 {
 	int i, errs;
-	struct remote *remote = pushremote_get(repo);
 	const char **url;
 	int url_nr;
 	struct refspec *push_refspec = &rs;
 
-	if (!remote) {
-		if (repo)
-			die(_("bad repository '%s'"), repo);
-		die(_("No configured push destination.\n"
-		    "Either specify the URL from the command-line or configure a remote repository using\n"
-		    "\n"
-		    "    git remote add <name> <url>\n"
-		    "\n"
-		    "and then push using the remote name\n"
-		    "\n"
-		    "    git push <name>\n"));
-	}
-
-	if (remote->mirror)
-		flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
-
 	if (push_options->nr)
 		flags |= TRANSPORT_PUSH_OPTIONS;
 
@@ -548,6 +535,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 	struct string_list push_options_cmdline = STRING_LIST_INIT_DUP;
 	struct string_list *push_options;
 	const struct string_list_item *item;
+	struct remote *remote;
 
 	struct option options[] = {
 		OPT__VERBOSITY(&verbosity),
@@ -602,20 +590,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 		die(_("--delete is incompatible with --all, --mirror and --tags"));
 	if (deleterefs && argc < 2)
 		die(_("--delete doesn't make sense without any refs"));
-	if (flags & TRANSPORT_PUSH_ALL) {
-		if (tags)
-			die(_("--all and --tags are incompatible"));
-		if (argc >= 2)
-			die(_("--all can't be combined with refspecs"));
-	}
-	if (flags & TRANSPORT_PUSH_MIRROR) {
-		if (tags)
-			die(_("--mirror and --tags are incompatible"));
-		if (argc >= 2)
-			die(_("--mirror can't be combined with refspecs"));
-	}
-	if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
-		die(_("--all and --mirror are incompatible"));
 
 	if (recurse_submodules == RECURSE_SUBMODULES_CHECK)
 		flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK;
@@ -632,11 +606,43 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 		set_refspecs(argv + 1, argc - 1, repo);
 	}
 
+	remote = pushremote_get(repo);
+	if (!remote) {
+		if (repo)
+			die(_("bad repository '%s'"), repo);
+		die(_("No configured push destination.\n"
+		    "Either specify the URL from the command-line or configure a remote repository using\n"
+		    "\n"
+		    "    git remote add <name> <url>\n"
+		    "\n"
+		    "and then push using the remote name\n"
+		    "\n"
+		    "    git push <name>\n"));
+	}
+
+	if (remote->mirror)
+		flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
+
+	if (flags & TRANSPORT_PUSH_ALL) {
+		if (tags)
+			die(_("--all and --tags are incompatible"));
+		if (argc >= 2)
+			die(_("--all can't be combined with refspecs"));
+	}
+	if (flags & TRANSPORT_PUSH_MIRROR) {
+		if (tags)
+			die(_("--mirror and --tags are incompatible"));
+		if (argc >= 2)
+			die(_("--mirror can't be combined with refspecs"));
+	}
+	if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
+		die(_("--all and --mirror are incompatible"));
+
 	for_each_string_list_item(item, push_options)
 		if (strchr(item->string, '\n'))
 			die(_("push options must not have new line characters"));
 
-	rc = do_push(repo, flags, push_options);
+	rc = do_push(repo, flags, push_options, remote);
 	string_list_clear(&push_options_cmdline, 0);
 	string_list_clear(&push_options_config, 0);
 	if (rc == -1)
diff --git a/third_party/git/builtin/range-diff.c b/third_party/git/builtin/range-diff.c
index 9202e7554476..d8a467062990 100644
--- a/third_party/git/builtin/range-diff.c
+++ b/third_party/git/builtin/range-diff.c
@@ -15,12 +15,16 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
 {
 	int creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
 	struct diff_options diffopt = { NULL };
+	struct argv_array other_arg = ARGV_ARRAY_INIT;
 	int simple_color = -1;
 	struct option range_diff_options[] = {
 		OPT_INTEGER(0, "creation-factor", &creation_factor,
 			    N_("Percentage by which creation is weighted")),
 		OPT_BOOL(0, "no-dual-color", &simple_color,
 			    N_("use simple diff colors")),
+		OPT_PASSTHRU_ARGV(0, "notes", &other_arg,
+				  N_("notes"), N_("passed to 'git log'"),
+				  PARSE_OPT_OPTARG),
 		OPT_END()
 	};
 	struct option *options;
@@ -78,8 +82,9 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
 	FREE_AND_NULL(options);
 
 	res = show_range_diff(range1.buf, range2.buf, creation_factor,
-			      simple_color < 1, &diffopt);
+			      simple_color < 1, &diffopt, &other_arg);
 
+	argv_array_clear(&other_arg);
 	strbuf_release(&range1);
 	strbuf_release(&range2);
 
diff --git a/third_party/git/builtin/read-tree.c b/third_party/git/builtin/read-tree.c
index ca5e655d2f8b..af7424b94c8e 100644
--- a/third_party/git/builtin/read-tree.c
+++ b/third_party/git/builtin/read-tree.c
@@ -185,7 +185,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
 
 	if (opts.reset || opts.merge || opts.prefix) {
 		if (read_cache_unmerged() && (opts.prefix || opts.merge))
-			die("You need to resolve your current index first");
+			die(_("You need to resolve your current index first"));
 		stage = opts.merge = 1;
 	}
 	resolve_undo_clear();
diff --git a/third_party/git/builtin/rebase.c b/third_party/git/builtin/rebase.c
index 670096c065f5..bff53d5d167e 100644
--- a/third_party/git/builtin/rebase.c
+++ b/third_party/git/builtin/rebase.c
@@ -29,8 +29,8 @@
 #include "rebase-interactive.h"
 
 static char const * const builtin_rebase_usage[] = {
-	N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
-		"[<upstream>] [<branch>]"),
+	N_("git rebase [-i] [options] [--exec <cmd>] "
+		"[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"),
 	N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
 		"--root [<branch>]"),
 	N_("git rebase --continue | --abort | --skip | --edit-todo"),
@@ -44,14 +44,22 @@ static GIT_PATH_FUNC(merge_dir, "rebase-merge")
 
 enum rebase_type {
 	REBASE_UNSPECIFIED = -1,
-	REBASE_AM,
+	REBASE_APPLY,
 	REBASE_MERGE,
-	REBASE_INTERACTIVE,
 	REBASE_PRESERVE_MERGES
 };
 
+enum empty_type {
+	EMPTY_UNSPECIFIED = -1,
+	EMPTY_DROP,
+	EMPTY_KEEP,
+	EMPTY_ASK
+};
+
 struct rebase_options {
 	enum rebase_type type;
+	enum empty_type empty;
+	const char *default_backend;
 	const char *state_dir;
 	struct commit *upstream;
 	const char *upstream_name;
@@ -62,7 +70,7 @@ struct rebase_options {
 	const char *onto_name;
 	const char *revisions;
 	const char *switch_to;
-	int root;
+	int root, root_with_onto;
 	struct object_id *squash_onto;
 	struct commit *restrict_revision;
 	int dont_finish_rebase;
@@ -77,7 +85,6 @@ struct rebase_options {
 	const char *action;
 	int signoff;
 	int allow_rerere_autoupdate;
-	int keep_empty;
 	int autosquash;
 	char *gpg_sign_opt;
 	int autostash;
@@ -92,6 +99,8 @@ struct rebase_options {
 
 #define REBASE_OPTIONS_INIT {			  	\
 		.type = REBASE_UNSPECIFIED,	  	\
+		.empty = EMPTY_UNSPECIFIED,	  	\
+		.default_backend = "merge",	  	\
 		.flags = REBASE_NO_QUIET, 		\
 		.git_am_opts = ARGV_ARRAY_INIT,		\
 		.git_format_patch_opt = STRBUF_INIT	\
@@ -110,6 +119,9 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 		replay.allow_rerere_auto = opts->allow_rerere_autoupdate;
 	replay.allow_empty = 1;
 	replay.allow_empty_message = opts->allow_empty_message;
+	replay.drop_redundant_commits = (opts->empty == EMPTY_DROP);
+	replay.keep_redundant_commits = (opts->empty == EMPTY_KEEP);
+	replay.quiet = !(opts->flags & REBASE_NO_QUIET);
 	replay.verbose = opts->flags & REBASE_VERBOSE;
 	replay.reschedule_failed_exec = opts->reschedule_failed_exec;
 	replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
@@ -117,6 +129,11 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 	if (opts->strategy_opts)
 		parse_strategy_opts(&replay, opts->strategy_opts);
 
+	if (opts->squash_onto) {
+		oidcpy(&replay.squash_onto, opts->squash_onto);
+		replay.have_squash_onto = 1;
+	}
+
 	return replay;
 }
 
@@ -241,21 +258,17 @@ static int edit_todo_file(unsigned flags)
 }
 
 static int get_revision_ranges(struct commit *upstream, struct commit *onto,
-			       const char **head_hash,
+			       struct object_id *orig_head, const char **head_hash,
 			       char **revisions, char **shortrevisions)
 {
 	struct commit *base_rev = upstream ? upstream : onto;
 	const char *shorthead;
-	struct object_id orig_head;
 
-	if (get_oid("HEAD", &orig_head))
-		return error(_("no HEAD?"));
-
-	*head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ);
+	*head_hash = find_unique_abbrev(orig_head, GIT_MAX_HEXSZ);
 	*revisions = xstrfmt("%s...%s", oid_to_hex(&base_rev->object.oid),
 						   *head_hash);
 
-	shorthead = find_unique_abbrev(&orig_head, DEFAULT_ABBREV);
+	shorthead = find_unique_abbrev(orig_head, DEFAULT_ABBREV);
 
 	if (upstream) {
 		const char *shortrev;
@@ -309,12 +322,8 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
 	struct replay_opts replay = get_replay_opts(opts);
 	struct string_list commands = STRING_LIST_INIT_DUP;
 
-	if (prepare_branch_to_be_rebased(the_repository, &replay,
-					 opts->switch_to))
-		return -1;
-
-	if (get_revision_ranges(opts->upstream, opts->onto, &head_hash,
-				&revisions, &shortrevisions))
+	if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head,
+				&head_hash, &revisions, &shortrevisions))
 		return -1;
 
 	if (init_basic_state(&replay,
@@ -332,8 +341,8 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
 
 	argv_array_pushl(&make_script_args, "", revisions, NULL);
 	if (opts->restrict_revision)
-		argv_array_push(&make_script_args,
-				oid_to_hex(&opts->restrict_revision->object.oid));
+		argv_array_pushf(&make_script_args, "^%s",
+				 oid_to_hex(&opts->restrict_revision->object.oid));
 
 	ret = sequencer_make_script(the_repository, &todo_list.buf,
 				    make_script_args.argc, make_script_args.argv,
@@ -362,7 +371,7 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
 	return ret;
 }
 
-static int run_rebase_interactive(struct rebase_options *opts,
+static int run_sequencer_rebase(struct rebase_options *opts,
 				  enum action command)
 {
 	unsigned flags = 0;
@@ -370,10 +379,10 @@ static int run_rebase_interactive(struct rebase_options *opts,
 
 	git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
 
-	flags |= opts->keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
 	flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
 	flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
 	flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
+	flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0;
 	flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
 
 	switch (command) {
@@ -433,6 +442,21 @@ static int run_rebase_interactive(struct rebase_options *opts,
 	return ret;
 }
 
+static int parse_opt_keep_empty(const struct option *opt, const char *arg,
+				int unset)
+{
+	struct rebase_options *opts = opt->value;
+
+	BUG_ON_OPT_ARG(arg);
+
+	/*
+	 * If we ever want to remap --keep-empty to --empty=keep, insert:
+	 * 	opts->empty = unset ? EMPTY_UNSPECIFIED : EMPTY_KEEP;
+	 */
+	opts->type = REBASE_MERGE;
+	return 0;
+}
+
 static const char * const builtin_rebase_interactive_usage[] = {
 	N_("git rebase--interactive [<options>]"),
 	NULL
@@ -446,9 +470,13 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
 	struct option options[] = {
 		OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
 			   REBASE_FORCE),
-		OPT_BOOL(0, "keep-empty", &opts.keep_empty, N_("keep empty commits")),
-		OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
-			 N_("allow commits with empty messages")),
+		{ OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
+			N_("(DEPRECATED) keep empty commits"),
+			PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
+			parse_opt_keep_empty },
+		OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message,
+			   N_("allow commits with empty messages"),
+			   PARSE_OPT_HIDDEN),
 		OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")),
 		OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins,
 			 N_("keep original branch points of cousins")),
@@ -518,28 +546,26 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
 		warning(_("--[no-]rebase-cousins has no effect without "
 			  "--rebase-merges"));
 
-	return !!run_rebase_interactive(&opts, command);
+	return !!run_sequencer_rebase(&opts, command);
 }
 
-static int is_interactive(struct rebase_options *opts)
+static int is_merge(struct rebase_options *opts)
 {
-	return opts->type == REBASE_INTERACTIVE ||
+	return opts->type == REBASE_MERGE ||
 		opts->type == REBASE_PRESERVE_MERGES;
 }
 
-static void imply_interactive(struct rebase_options *opts, const char *option)
+static void imply_merge(struct rebase_options *opts, const char *option)
 {
 	switch (opts->type) {
-	case REBASE_AM:
+	case REBASE_APPLY:
 		die(_("%s requires an interactive rebase"), option);
 		break;
-	case REBASE_INTERACTIVE:
+	case REBASE_MERGE:
 	case REBASE_PRESERVE_MERGES:
 		break;
-	case REBASE_MERGE:
-		/* we now implement --merge via --interactive */
 	default:
-		opts->type = REBASE_INTERACTIVE; /* implied */
+		opts->type = REBASE_MERGE; /* implied */
 		break;
 	}
 }
@@ -665,8 +691,8 @@ static int rebase_write_basic_state(struct rebase_options *opts)
 		   opts->onto ? oid_to_hex(&opts->onto->object.oid) : "");
 	write_file(state_dir_path("orig-head", opts), "%s",
 		   oid_to_hex(&opts->orig_head));
-	write_file(state_dir_path("quiet", opts), "%s",
-		   opts->flags & REBASE_NO_QUIET ? "" : "t");
+	if (!(opts->flags & REBASE_NO_QUIET))
+		write_file(state_dir_path("quiet", opts), "%s", "");
 	if (opts->flags & REBASE_VERBOSE)
 		write_file(state_dir_path("verbose", opts), "%s", "");
 	if (opts->strategy)
@@ -684,7 +710,7 @@ static int rebase_write_basic_state(struct rebase_options *opts)
 		write_file(state_dir_path("gpg_sign_opt", opts), "%s",
 			   opts->gpg_sign_opt);
 	if (opts->signoff)
-		write_file(state_dir_path("strategy", opts), "--signoff");
+		write_file(state_dir_path("signoff", opts), "--signoff");
 
 	return 0;
 }
@@ -748,7 +774,7 @@ static int finish_rebase(struct rebase_options *opts)
 	 * user should see them.
 	 */
 	run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
-	if (opts->type == REBASE_INTERACTIVE) {
+	if (opts->type == REBASE_MERGE) {
 		struct replay_opts replay = REPLAY_OPTS_INIT;
 
 		replay.action = REPLAY_INTERACTIVE_REBASE;
@@ -1011,7 +1037,8 @@ static int run_am(struct rebase_options *opts)
 	argv_array_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
 			 "--full-index", "--cherry-pick", "--right-only",
 			 "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
-			 "--no-cover-letter", "--pretty=mboxrd", "--topo-order", NULL);
+			 "--no-cover-letter", "--pretty=mboxrd", "--topo-order",
+			 "--no-base", NULL);
 	if (opts->git_format_patch_opt.len)
 		argv_array_split(&format_patch.args,
 				 opts->git_format_patch_opt.buf);
@@ -1080,8 +1107,8 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 	int status;
 	const char *backend, *backend_func;
 
-	if (opts->type == REBASE_INTERACTIVE) {
-		/* Run builtin interactive rebase */
+	if (opts->type == REBASE_MERGE) {
+		/* Run sequencer-based rebase */
 		setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1);
 		if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
 			setenv("GIT_SEQUENCE_EDITOR", ":", 1);
@@ -1094,11 +1121,11 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 			opts->gpg_sign_opt = tmp;
 		}
 
-		status = run_rebase_interactive(opts, action);
+		status = run_sequencer_rebase(opts, action);
 		goto finished_rebase;
 	}
 
-	if (opts->type == REBASE_AM) {
+	if (opts->type == REBASE_APPLY) {
 		status = run_am(opts);
 		goto finished_rebase;
 	}
@@ -1118,8 +1145,6 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 	add_var(&script_snippet, "revisions", opts->revisions);
 	add_var(&script_snippet, "restrict_revision", opts->restrict_revision ?
 		oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
-	add_var(&script_snippet, "GIT_QUIET",
-		opts->flags & REBASE_NO_QUIET ? "" : "t");
 	sq_quote_argv_pretty(&buf, opts->git_am_opts.argv);
 	add_var(&script_snippet, "git_am_opt", buf.buf);
 	strbuf_release(&buf);
@@ -1137,7 +1162,6 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 		opts->allow_rerere_autoupdate ?
 			opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
 			"--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
-	add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
 	add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
 	add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
 	add_var(&script_snippet, "cmd", opts->cmd);
@@ -1155,7 +1179,7 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 	add_var(&script_snippet, "git_format_patch_opt",
 		opts->git_format_patch_opt.buf);
 
-	if (is_interactive(opts) &&
+	if (is_merge(opts) &&
 	    !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
 		strbuf_addstr(&script_snippet,
 			      "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
@@ -1180,8 +1204,8 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 finished_rebase:
 	if (opts->dont_finish_rebase)
 		; /* do nothing */
-	else if (opts->type == REBASE_INTERACTIVE)
-		; /* interactive rebase cleans up after itself */
+	else if (opts->type == REBASE_MERGE)
+		; /* merge backend cleans up after itself */
 	else if (status == 0) {
 		if (!file_exists(state_dir_path("stopped-sha", opts)))
 			finish_rebase(opts);
@@ -1239,6 +1263,10 @@ static int rebase_config(const char *var, const char *value, void *data)
 		return 0;
 	}
 
+	if (!strcmp(var, "rebase.backend")) {
+		return git_config_string(&opts->default_backend, var, value);
+	}
+
 	return git_default_config(var, value, data);
 }
 
@@ -1260,28 +1288,60 @@ static int is_linear_history(struct commit *from, struct commit *to)
 	return 1;
 }
 
-static int can_fast_forward(struct commit *onto, struct object_id *head_oid,
-			    struct object_id *merge_base)
+static int can_fast_forward(struct commit *onto, struct commit *upstream,
+			    struct commit *restrict_revision,
+			    struct object_id *head_oid, struct object_id *merge_base)
 {
 	struct commit *head = lookup_commit(the_repository, head_oid);
-	struct commit_list *merge_bases;
-	int res;
+	struct commit_list *merge_bases = NULL;
+	int res = 0;
 
 	if (!head)
-		return 0;
+		goto done;
 
 	merge_bases = get_merge_bases(onto, head);
-	if (merge_bases && !merge_bases->next) {
-		oidcpy(merge_base, &merge_bases->item->object.oid);
-		res = oideq(merge_base, &onto->object.oid);
-	} else {
+	if (!merge_bases || merge_bases->next) {
 		oidcpy(merge_base, &null_oid);
-		res = 0;
+		goto done;
 	}
+
+	oidcpy(merge_base, &merge_bases->item->object.oid);
+	if (!oideq(merge_base, &onto->object.oid))
+		goto done;
+
+	if (restrict_revision && !oideq(&restrict_revision->object.oid, merge_base))
+		goto done;
+
+	if (!upstream)
+		goto done;
+
+	free_commit_list(merge_bases);
+	merge_bases = get_merge_bases(upstream, head);
+	if (!merge_bases || merge_bases->next)
+		goto done;
+
+	if (!oideq(&onto->object.oid, &merge_bases->item->object.oid))
+		goto done;
+
+	res = 1;
+
+done:
 	free_commit_list(merge_bases);
 	return res && is_linear_history(onto, head);
 }
 
+static int parse_opt_am(const struct option *opt, const char *arg, int unset)
+{
+	struct rebase_options *opts = opt->value;
+
+	BUG_ON_OPT_NEG(unset);
+	BUG_ON_OPT_ARG(arg);
+
+	opts->type = REBASE_APPLY;
+
+	return 0;
+}
+
 /* -i followed by -m is still -i */
 static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
 {
@@ -1290,7 +1350,7 @@ static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
 	BUG_ON_OPT_NEG(unset);
 	BUG_ON_OPT_ARG(arg);
 
-	if (!is_interactive(opts))
+	if (!is_merge(opts))
 		opts->type = REBASE_MERGE;
 
 	return 0;
@@ -1305,12 +1365,35 @@ static int parse_opt_interactive(const struct option *opt, const char *arg,
 	BUG_ON_OPT_NEG(unset);
 	BUG_ON_OPT_ARG(arg);
 
-	opts->type = REBASE_INTERACTIVE;
+	opts->type = REBASE_MERGE;
 	opts->flags |= REBASE_INTERACTIVE_EXPLICIT;
 
 	return 0;
 }
 
+static enum empty_type parse_empty_value(const char *value)
+{
+	if (!strcasecmp(value, "drop"))
+		return EMPTY_DROP;
+	else if (!strcasecmp(value, "keep"))
+		return EMPTY_KEEP;
+	else if (!strcasecmp(value, "ask"))
+		return EMPTY_ASK;
+
+	die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value);
+}
+
+static int parse_opt_empty(const struct option *opt, const char *arg, int unset)
+{
+	struct rebase_options *options = opt->value;
+	enum empty_type value = parse_empty_value(arg);
+
+	BUG_ON_OPT_NEG(unset);
+
+	options->empty = value;
+	return 0;
+}
+
 static void NORETURN error_on_missing_default_upstream(void)
 {
 	struct branch *current_branch = branch_get(NULL);
@@ -1346,14 +1429,14 @@ static void set_reflog_action(struct rebase_options *options)
 	const char *env;
 	struct strbuf buf = STRBUF_INIT;
 
-	if (!is_interactive(options))
+	if (!is_merge(options))
 		return;
 
 	env = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
 	if (env && strcmp("rebase", env))
 		return; /* only override it if it is "rebase" */
 
-	strbuf_addf(&buf, "rebase -i (%s)", options->action);
+	strbuf_addf(&buf, "rebase (%s)", options->action);
 	setenv(GIT_REFLOG_ACTION_ENVIRONMENT, buf.buf, 1);
 	strbuf_release(&buf);
 }
@@ -1376,6 +1459,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	struct rebase_options options = REBASE_OPTIONS_INIT;
 	const char *branch_name;
 	int ret, flags, total_argc, in_progress = 0;
+	int keep_base = 0;
 	int ok_to_skip_pre_rebase = 0;
 	struct strbuf msg = STRBUF_INIT;
 	struct strbuf revisions = STRBUF_INIT;
@@ -1390,15 +1474,18 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	struct object_id squash_onto;
 	char *squash_onto_name = NULL;
 	int reschedule_failed_exec = -1;
+	int allow_preemptive_ff = 1;
 	struct option builtin_rebase_options[] = {
 		OPT_STRING(0, "onto", &options.onto_name,
 			   N_("revision"),
 			   N_("rebase onto given branch instead of upstream")),
+		OPT_BOOL(0, "keep-base", &keep_base,
+			 N_("use the merge-base of upstream and branch as the current base")),
 		OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase,
 			 N_("allow pre-rebase hook to run")),
 		OPT_NEGBIT('q', "quiet", &options.flags,
 			   N_("be quiet. implies --no-stat"),
-			   REBASE_NO_QUIET| REBASE_VERBOSE | REBASE_DIFFSTAT),
+			   REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
 		OPT_BIT('v', "verbose", &options.flags,
 			N_("display a diffstat of what changed upstream"),
 			REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
@@ -1439,6 +1526,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		OPT_CMDMODE(0, "show-current-patch", &action,
 			    N_("show the patch file being applied or merged"),
 			    ACTION_SHOW_CURRENT_PATCH),
+		{ OPTION_CALLBACK, 0, "apply", &options, NULL,
+			N_("use apply strategies to rebase"),
+			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
+			parse_opt_am },
 		{ OPTION_CALLBACK, 'm', "merge", &options, NULL,
 			N_("use merging strategies to rebase"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
@@ -1447,12 +1538,18 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			N_("let the user edit the list of commits to rebase"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 			parse_opt_interactive },
-		OPT_SET_INT('p', "preserve-merges", &options.type,
-			    N_("(DEPRECATED) try to recreate merges instead of "
-			       "ignoring them"), REBASE_PRESERVE_MERGES),
+		OPT_SET_INT_F('p', "preserve-merges", &options.type,
+			      N_("(DEPRECATED) try to recreate merges instead of "
+				 "ignoring them"),
+			      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
 		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
-		OPT_BOOL('k', "keep-empty", &options.keep_empty,
-			 N_("preserve empty commits during rebase")),
+		OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
+			       N_("how to handle commits that become empty"),
+			       PARSE_OPT_NONEG, parse_opt_empty),
+		{ OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
+			N_("(DEPRECATED) keep empty commits"),
+			PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
+			parse_opt_keep_empty },
 		OPT_BOOL(0, "autosquash", &options.autosquash,
 			 N_("move commits that begin with "
 			    "squash!/fixup! under -i")),
@@ -1464,9 +1561,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
 				N_("add exec lines after each commit of the "
 				   "editable list")),
-		OPT_BOOL(0, "allow-empty-message",
-			 &options.allow_empty_message,
-			 N_("allow rebasing commits with empty messages")),
+		OPT_BOOL_F(0, "allow-empty-message",
+			   &options.allow_empty_message,
+			   N_("allow rebasing commits with empty messages"),
+			   PARSE_OPT_HIDDEN),
 		{OPTION_STRING, 'r', "rebase-merges", &rebase_merges,
 			N_("mode"),
 			N_("try to rebase merges instead of skipping them"),
@@ -1506,7 +1604,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		die(_("It looks like 'git am' is in progress. Cannot rebase."));
 
 	if (is_directory(apply_dir())) {
-		options.type = REBASE_AM;
+		options.type = REBASE_APPLY;
 		options.state_dir = apply_dir();
 	} else if (is_directory(merge_dir())) {
 		strbuf_reset(&buf);
@@ -1518,7 +1616,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			strbuf_reset(&buf);
 			strbuf_addf(&buf, "%s/interactive", merge_dir());
 			if(file_exists(buf.buf)) {
-				options.type = REBASE_INTERACTIVE;
+				options.type = REBASE_MERGE;
 				options.flags |= REBASE_INTERACTIVE_EXPLICIT;
 			} else
 				options.type = REBASE_MERGE;
@@ -1547,16 +1645,23 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		warning(_("git rebase --preserve-merges is deprecated. "
 			  "Use --rebase-merges instead."));
 
+	if (keep_base) {
+		if (options.onto_name)
+			die(_("cannot combine '--keep-base' with '--onto'"));
+		if (options.root)
+			die(_("cannot combine '--keep-base' with '--root'"));
+	}
+
 	if (action != ACTION_NONE && !in_progress)
 		die(_("No rebase in progress?"));
 	setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
 
-	if (action == ACTION_EDIT_TODO && !is_interactive(&options))
+	if (action == ACTION_EDIT_TODO && !is_merge(&options))
 		die(_("The --edit-todo action can only be used during "
 		      "interactive rebase."));
 
 	if (trace2_is_enabled()) {
-		if (is_interactive(&options))
+		if (is_merge(&options))
 			trace2_cmd_mode("interactive");
 		else if (exec.nr)
 			trace2_cmd_mode("interactive-exec");
@@ -1632,7 +1737,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		goto cleanup;
 	}
 	case ACTION_QUIT: {
-		if (options.type == REBASE_INTERACTIVE) {
+		if (options.type == REBASE_MERGE) {
 			struct replay_opts replay = REPLAY_OPTS_INIT;
 
 			replay.action = REPLAY_INTERACTIVE_REBASE;
@@ -1681,13 +1786,20 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		    state_dir_base, cmd_live_rebase, buf.buf);
 	}
 
+	if ((options.flags & REBASE_INTERACTIVE_EXPLICIT) ||
+	    (action != ACTION_NONE) ||
+	    (exec.nr > 0) ||
+	    options.autosquash) {
+		allow_preemptive_ff = 0;
+	}
+
 	for (i = 0; i < options.git_am_opts.argc; i++) {
 		const char *option = options.git_am_opts.argv[i], *p;
 		if (!strcmp(option, "--committer-date-is-author-date") ||
 		    !strcmp(option, "--ignore-date") ||
 		    !strcmp(option, "--whitespace=fix") ||
 		    !strcmp(option, "--whitespace=strip"))
-			options.flags |= REBASE_FORCE;
+			allow_preemptive_ff = 0;
 		else if (skip_prefix(option, "-C", &p)) {
 			while (*p)
 				if (!isdigit(*(p++)))
@@ -1707,8 +1819,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	if (!(options.flags & REBASE_NO_QUIET))
 		argv_array_push(&options.git_am_opts, "-q");
 
-	if (options.keep_empty)
-		imply_interactive(&options, "--keep-empty");
+	if (options.empty != EMPTY_UNSPECIFIED)
+		imply_merge(&options, "--empty");
 
 	if (gpg_sign) {
 		free(options.gpg_sign_opt);
@@ -1718,7 +1830,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	if (exec.nr) {
 		int i;
 
-		imply_interactive(&options, "--exec");
+		imply_merge(&options, "--exec");
 
 		strbuf_reset(&buf);
 		for (i = 0; i < exec.nr; i++)
@@ -1734,7 +1846,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		else if (strcmp("no-rebase-cousins", rebase_merges))
 			die(_("Unknown mode: %s"), rebase_merges);
 		options.rebase_merges = 1;
-		imply_interactive(&options, "--rebase-merges");
+		imply_merge(&options, "--rebase-merges");
 	}
 
 	if (strategy_options.nr) {
@@ -1753,10 +1865,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	if (options.strategy) {
 		options.strategy = xstrdup(options.strategy);
 		switch (options.type) {
-		case REBASE_AM:
+		case REBASE_APPLY:
 			die(_("--strategy requires --merge or --interactive"));
 		case REBASE_MERGE:
-		case REBASE_INTERACTIVE:
 		case REBASE_PRESERVE_MERGES:
 			/* compatible */
 			break;
@@ -1769,47 +1880,65 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	}
 
 	if (options.type == REBASE_MERGE)
-		imply_interactive(&options, "--merge");
+		imply_merge(&options, "--merge");
 
 	if (options.root && !options.onto_name)
-		imply_interactive(&options, "--root without --onto");
+		imply_merge(&options, "--root without --onto");
 
 	if (isatty(2) && options.flags & REBASE_NO_QUIET)
 		strbuf_addstr(&options.git_format_patch_opt, " --progress");
 
+	if (options.git_am_opts.argc || options.type == REBASE_APPLY) {
+		/* all am options except -q are compatible only with --apply */
+		for (i = options.git_am_opts.argc - 1; i >= 0; i--)
+			if (strcmp(options.git_am_opts.argv[i], "-q"))
+				break;
+
+		if (i >= 0) {
+			if (is_merge(&options))
+				die(_("cannot combine apply options with "
+				      "merge options"));
+			else
+				options.type = REBASE_APPLY;
+		}
+	}
+
+	if (options.type == REBASE_UNSPECIFIED) {
+		if (!strcmp(options.default_backend, "merge"))
+			imply_merge(&options, "--merge");
+		else if (!strcmp(options.default_backend, "apply"))
+			options.type = REBASE_APPLY;
+		else
+			die(_("Unknown rebase backend: %s"),
+			    options.default_backend);
+	}
+
 	switch (options.type) {
 	case REBASE_MERGE:
-	case REBASE_INTERACTIVE:
 	case REBASE_PRESERVE_MERGES:
 		options.state_dir = merge_dir();
 		break;
-	case REBASE_AM:
+	case REBASE_APPLY:
 		options.state_dir = apply_dir();
 		break;
 	default:
-		/* the default rebase backend is `--am` */
-		options.type = REBASE_AM;
-		options.state_dir = apply_dir();
-		break;
+		BUG("options.type was just set above; should be unreachable.");
 	}
 
-	if (reschedule_failed_exec > 0 && !is_interactive(&options))
+	if (options.empty == EMPTY_UNSPECIFIED) {
+		if (options.flags & REBASE_INTERACTIVE_EXPLICIT)
+			options.empty = EMPTY_ASK;
+		else if (exec.nr > 0)
+			options.empty = EMPTY_KEEP;
+		else
+			options.empty = EMPTY_DROP;
+	}
+	if (reschedule_failed_exec > 0 && !is_merge(&options))
 		die(_("--reschedule-failed-exec requires "
 		      "--exec or --interactive"));
 	if (reschedule_failed_exec >= 0)
 		options.reschedule_failed_exec = reschedule_failed_exec;
 
-	if (options.git_am_opts.argc) {
-		/* all am options except -q are compatible only with --am */
-		for (i = options.git_am_opts.argc - 1; i >= 0; i--)
-			if (strcmp(options.git_am_opts.argv[i], "-q"))
-				break;
-
-		if (is_interactive(&options) && i >= 0)
-			die(_("cannot combine am options with either "
-			      "interactive or merge options"));
-	}
-
 	if (options.signoff) {
 		if (options.type == REBASE_PRESERVE_MERGES)
 			die("cannot combine '--signoff' with "
@@ -1833,15 +1962,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			      "'--reschedule-failed-exec'"));
 	}
 
-	if (options.rebase_merges) {
-		if (strategy_options.nr)
-			die(_("cannot combine '--rebase-merges' with "
-			      "'--strategy-option'"));
-		if (options.strategy)
-			die(_("cannot combine '--rebase-merges' with "
-			      "'--strategy'"));
-	}
-
 	if (!options.root) {
 		if (argc < 1) {
 			struct branch *branch;
@@ -1872,7 +1992,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			options.squash_onto = &squash_onto;
 			options.onto_name = squash_onto_name =
 				xstrdup(oid_to_hex(&squash_onto));
-		}
+		} else
+			options.root_with_onto = 1;
+
 		options.upstream_name = NULL;
 		options.upstream = NULL;
 		if (argc > 1)
@@ -1882,12 +2004,22 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	}
 
 	/* Make sure the branch to rebase onto is valid. */
-	if (!options.onto_name)
+	if (keep_base) {
+		strbuf_reset(&buf);
+		strbuf_addstr(&buf, options.upstream_name);
+		strbuf_addstr(&buf, "...");
+		options.onto_name = xstrdup(buf.buf);
+	} else if (!options.onto_name)
 		options.onto_name = options.upstream_name;
 	if (strstr(options.onto_name, "...")) {
-		if (get_oid_mb(options.onto_name, &merge_base) < 0)
-			die(_("'%s': need exactly one merge base"),
-			    options.onto_name);
+		if (get_oid_mb(options.onto_name, &merge_base) < 0) {
+			if (keep_base)
+				die(_("'%s': need exactly one merge base with branch"),
+				    options.upstream_name);
+			else
+				die(_("'%s': need exactly one merge base"),
+				    options.onto_name);
+		}
 		options.onto = lookup_commit_or_die(&merge_base,
 						    options.onto_name);
 	} else {
@@ -1912,10 +2044,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		/* Is it a local branch? */
 		strbuf_reset(&buf);
 		strbuf_addf(&buf, "refs/heads/%s", branch_name);
-		if (!read_ref(buf.buf, &options.orig_head))
+		if (!read_ref(buf.buf, &options.orig_head)) {
+			die_if_checked_out(buf.buf, 1);
 			options.head_name = xstrdup(buf.buf);
 		/* If not is it a valid ref (branch or commit)? */
-		else if (!get_oid(branch_name, &options.orig_head))
+		} else if (!get_oid(branch_name, &options.orig_head))
 			options.head_name = NULL;
 		else
 			die(_("fatal: no such branch/commit '%s'"),
@@ -1968,9 +2101,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 				state_dir_path("autostash", &options);
 			struct child_process stash = CHILD_PROCESS_INIT;
 			struct object_id oid;
-			struct commit *head =
-				lookup_commit_reference(the_repository,
-							&options.orig_head);
 
 			argv_array_pushl(&stash.args,
 					 "stash", "create", "autostash", NULL);
@@ -1991,17 +2121,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 				    options.state_dir);
 			write_file(autostash, "%s", oid_to_hex(&oid));
 			printf(_("Created autostash: %s\n"), buf.buf);
-			if (reset_head(&head->object.oid, "reset --hard",
+			if (reset_head(NULL, "reset --hard",
 				       NULL, RESET_HEAD_HARD, NULL, NULL) < 0)
 				die(_("could not reset --hard"));
-			printf(_("HEAD is now at %s"),
-			       find_unique_abbrev(&head->object.oid,
-						  DEFAULT_ABBREV));
-			strbuf_reset(&buf);
-			pp_commit_easy(CMIT_FMT_ONELINE, head, &buf);
-			if (buf.len > 0)
-				printf(" %s", buf.buf);
-			putchar('\n');
 
 			if (discard_index(the_repository->index) < 0 ||
 				repo_read_index(the_repository) < 0)
@@ -2022,31 +2144,25 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 	/*
 	 * Check if we are already based on onto with linear history,
-	 * but this should be done only when upstream and onto are the same
-	 * and if this is not an interactive rebase.
+	 * in which case we could fast-forward without replacing the commits
+	 * with new commits recreated by replaying their changes.
+	 *
+	 * Note that can_fast_forward() initializes merge_base, so we have to
+	 * call it before checking allow_preemptive_ff.
 	 */
-	if (can_fast_forward(options.onto, &options.orig_head, &merge_base) &&
-	    !is_interactive(&options) && !options.restrict_revision &&
-	    options.upstream &&
-	    !oidcmp(&options.upstream->object.oid, &options.onto->object.oid)) {
+	if (can_fast_forward(options.onto, options.upstream, options.restrict_revision,
+		    &options.orig_head, &merge_base) &&
+	    allow_preemptive_ff) {
 		int flag;
 
 		if (!(options.flags & REBASE_FORCE)) {
 			/* Lazily switch to the target branch if needed... */
 			if (options.switch_to) {
-				struct object_id oid;
-
-				if (get_oid(options.switch_to, &oid) < 0) {
-					ret = !!error(_("could not parse '%s'"),
-						      options.switch_to);
-					goto cleanup;
-				}
-
 				strbuf_reset(&buf);
 				strbuf_addf(&buf, "%s: checkout %s",
 					    getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
 					    options.switch_to);
-				if (reset_head(&oid, "checkout",
+				if (reset_head(&options.orig_head, "checkout",
 					       options.head_name,
 					       RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
 					       NULL, buf.buf) < 0) {
@@ -2111,7 +2227,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		diff_flush(&opts);
 	}
 
-	if (is_interactive(&options))
+	if (is_merge(&options))
 		goto run_rebase;
 
 	/* Detach HEAD and reset the tree */
diff --git a/third_party/git/builtin/receive-pack.c b/third_party/git/builtin/receive-pack.c
index dcf385511f07..2cc18bbffdcf 100644
--- a/third_party/git/builtin/receive-pack.c
+++ b/third_party/git/builtin/receive-pack.c
@@ -27,6 +27,7 @@
 #include "object-store.h"
 #include "protocol.h"
 #include "commit-reach.h"
+#include "worktree.h"
 
 static const char * const receive_pack_usage[] = {
 	N_("git receive-pack <git-dir>"),
@@ -417,24 +418,22 @@ static int copy_to_sideband(int in, int out, void *arg)
 	return 0;
 }
 
-#define HMAC_BLOCK_SIZE 64
-
-static void hmac_sha1(unsigned char *out,
+static void hmac(unsigned char *out,
 		      const char *key_in, size_t key_len,
 		      const char *text, size_t text_len)
 {
-	unsigned char key[HMAC_BLOCK_SIZE];
-	unsigned char k_ipad[HMAC_BLOCK_SIZE];
-	unsigned char k_opad[HMAC_BLOCK_SIZE];
+	unsigned char key[GIT_MAX_BLKSZ];
+	unsigned char k_ipad[GIT_MAX_BLKSZ];
+	unsigned char k_opad[GIT_MAX_BLKSZ];
 	int i;
-	git_SHA_CTX ctx;
+	git_hash_ctx ctx;
 
 	/* RFC 2104 2. (1) */
-	memset(key, '\0', HMAC_BLOCK_SIZE);
-	if (HMAC_BLOCK_SIZE < key_len) {
-		git_SHA1_Init(&ctx);
-		git_SHA1_Update(&ctx, key_in, key_len);
-		git_SHA1_Final(key, &ctx);
+	memset(key, '\0', GIT_MAX_BLKSZ);
+	if (the_hash_algo->blksz < key_len) {
+		the_hash_algo->init_fn(&ctx);
+		the_hash_algo->update_fn(&ctx, key_in, key_len);
+		the_hash_algo->final_fn(key, &ctx);
 	} else {
 		memcpy(key, key_in, key_len);
 	}
@@ -446,29 +445,29 @@ static void hmac_sha1(unsigned char *out,
 	}
 
 	/* RFC 2104 2. (3) & (4) */
-	git_SHA1_Init(&ctx);
-	git_SHA1_Update(&ctx, k_ipad, sizeof(k_ipad));
-	git_SHA1_Update(&ctx, text, text_len);
-	git_SHA1_Final(out, &ctx);
+	the_hash_algo->init_fn(&ctx);
+	the_hash_algo->update_fn(&ctx, k_ipad, sizeof(k_ipad));
+	the_hash_algo->update_fn(&ctx, text, text_len);
+	the_hash_algo->final_fn(out, &ctx);
 
 	/* RFC 2104 2. (6) & (7) */
-	git_SHA1_Init(&ctx);
-	git_SHA1_Update(&ctx, k_opad, sizeof(k_opad));
-	git_SHA1_Update(&ctx, out, GIT_SHA1_RAWSZ);
-	git_SHA1_Final(out, &ctx);
+	the_hash_algo->init_fn(&ctx);
+	the_hash_algo->update_fn(&ctx, k_opad, sizeof(k_opad));
+	the_hash_algo->update_fn(&ctx, out, the_hash_algo->rawsz);
+	the_hash_algo->final_fn(out, &ctx);
 }
 
 static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp)
 {
 	struct strbuf buf = STRBUF_INIT;
-	unsigned char sha1[GIT_SHA1_RAWSZ];
+	unsigned char hash[GIT_MAX_RAWSZ];
 
 	strbuf_addf(&buf, "%s:%"PRItime, path, stamp);
-	hmac_sha1(sha1, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
+	hmac(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
 	strbuf_release(&buf);
 
 	/* RFC 2104 5. HMAC-SHA1-80 */
-	strbuf_addf(&buf, "%"PRItime"-%.*s", stamp, GIT_SHA1_HEXSZ, sha1_to_hex(sha1));
+	strbuf_addf(&buf, "%"PRItime"-%.*s", stamp, (int)the_hash_algo->hexsz, hash_to_hex(hash));
 	return strbuf_detach(&buf, NULL);
 }
 
@@ -818,16 +817,6 @@ static int run_update_hook(struct command *cmd)
 	return finish_command(&proc);
 }
 
-static int is_ref_checked_out(const char *ref)
-{
-	if (is_bare_repository())
-		return 0;
-
-	if (!head_name)
-		return 0;
-	return !strcmp(head_name, ref);
-}
-
 static char *refuse_unconfigured_deny_msg =
 	N_("By default, updating the current branch in a non-bare repository\n"
 	   "is denied, because it will make the index and work tree inconsistent\n"
@@ -970,7 +959,7 @@ static const char *push_to_deploy(unsigned char *sha1,
 	if (run_command(&child))
 		return "Working directory has staged changes";
 
-	read_tree[3] = sha1_to_hex(sha1);
+	read_tree[3] = hash_to_hex(sha1);
 	child_process_init(&child);
 	child.argv = read_tree;
 	child.env = env->argv;
@@ -987,28 +976,38 @@ static const char *push_to_deploy(unsigned char *sha1,
 
 static const char *push_to_checkout_hook = "push-to-checkout";
 
-static const char *push_to_checkout(unsigned char *sha1,
+static const char *push_to_checkout(unsigned char *hash,
 				    struct argv_array *env,
 				    const char *work_tree)
 {
 	argv_array_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree));
 	if (run_hook_le(env->argv, push_to_checkout_hook,
-			sha1_to_hex(sha1), NULL))
+			hash_to_hex(hash), NULL))
 		return "push-to-checkout hook declined";
 	else
 		return NULL;
 }
 
-static const char *update_worktree(unsigned char *sha1)
+static const char *update_worktree(unsigned char *sha1, const struct worktree *worktree)
 {
-	const char *retval;
-	const char *work_tree = git_work_tree_cfg ? git_work_tree_cfg : "..";
+	const char *retval, *work_tree, *git_dir = NULL;
 	struct argv_array env = ARGV_ARRAY_INIT;
 
+	if (worktree && worktree->path)
+		work_tree = worktree->path;
+	else if (git_work_tree_cfg)
+		work_tree = git_work_tree_cfg;
+	else
+		work_tree = "..";
+
 	if (is_bare_repository())
 		return "denyCurrentBranch = updateInstead needs a worktree";
+	if (worktree)
+		git_dir = get_worktree_git_dir(worktree);
+	if (!git_dir)
+		git_dir = get_git_dir();
 
-	argv_array_pushf(&env, "GIT_DIR=%s", absolute_path(get_git_dir()));
+	argv_array_pushf(&env, "GIT_DIR=%s", absolute_path(git_dir));
 
 	if (!find_hook(push_to_checkout_hook))
 		retval = push_to_deploy(sha1, &env, work_tree);
@@ -1028,6 +1027,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 	struct object_id *old_oid = &cmd->old_oid;
 	struct object_id *new_oid = &cmd->new_oid;
 	int do_update_worktree = 0;
+	const struct worktree *worktree = is_bare_repository() ? NULL : find_shared_symref("HEAD", name);
 
 	/* only refs/... are allowed */
 	if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) {
@@ -1039,7 +1039,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 	free(namespaced_name);
 	namespaced_name = strbuf_detach(&namespaced_name_buf, NULL);
 
-	if (is_ref_checked_out(namespaced_name)) {
+	if (worktree) {
 		switch (deny_current_branch) {
 		case DENY_IGNORE:
 			break;
@@ -1071,7 +1071,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 			return "deletion prohibited";
 		}
 
-		if (head_name && !strcmp(namespaced_name, head_name)) {
+		if (worktree || (head_name && !strcmp(namespaced_name, head_name))) {
 			switch (deny_delete_current) {
 			case DENY_IGNORE:
 				break;
@@ -1120,7 +1120,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 	}
 
 	if (do_update_worktree) {
-		ret = update_worktree(new_oid->hash);
+		ret = update_worktree(new_oid->hash, find_shared_symref("HEAD", name));
 		if (ret)
 			return ret;
 	}
diff --git a/third_party/git/builtin/reflog.c b/third_party/git/builtin/reflog.c
index 4d3430900d06..81dfd563c0d9 100644
--- a/third_party/git/builtin/reflog.c
+++ b/third_party/git/builtin/reflog.c
@@ -560,15 +560,16 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
+
 		if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
 			flags |= EXPIRE_REFLOGS_DRY_RUN;
-		else if (starts_with(arg, "--expire=")) {
-			if (parse_expiry_date(arg + 9, &cb.cmd.expire_total))
+		else if (skip_prefix(arg, "--expire=", &arg)) {
+			if (parse_expiry_date(arg, &cb.cmd.expire_total))
 				die(_("'%s' is not a valid timestamp"), arg);
 			explicit_expiry |= EXPIRE_TOTAL;
 		}
-		else if (starts_with(arg, "--expire-unreachable=")) {
-			if (parse_expiry_date(arg + 21, &cb.cmd.expire_unreachable))
+		else if (skip_prefix(arg, "--expire-unreachable=", &arg)) {
+			if (parse_expiry_date(arg, &cb.cmd.expire_unreachable))
 				die(_("'%s' is not a valid timestamp"), arg);
 			explicit_expiry |= EXPIRE_UNREACH;
 		}
diff --git a/third_party/git/builtin/remote.c b/third_party/git/builtin/remote.c
index 5591cef77543..555d4c896c5f 100644
--- a/third_party/git/builtin/remote.c
+++ b/third_party/git/builtin/remote.c
@@ -6,6 +6,7 @@
 #include "string-list.h"
 #include "strbuf.h"
 #include "run-command.h"
+#include "rebase.h"
 #include "refs.h"
 #include "refspec.h"
 #include "object-store.h"
@@ -248,9 +249,8 @@ static int add(int argc, const char **argv)
 struct branch_info {
 	char *remote_name;
 	struct string_list merge;
-	enum {
-		NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE, REBASE_MERGES
-	} rebase;
+	enum rebase_type rebase;
+	char *push_remote_name;
 };
 
 static struct string_list branch_list = STRING_LIST_INIT_NODUP;
@@ -264,59 +264,69 @@ static const char *abbrev_ref(const char *name, const char *prefix)
 
 static int config_read_branches(const char *key, const char *value, void *cb)
 {
-	if (starts_with(key, "branch.")) {
-		const char *orig_key = key;
-		char *name;
-		struct string_list_item *item;
-		struct branch_info *info;
-		enum { REMOTE, MERGE, REBASE } type;
-		size_t key_len;
-
-		key += 7;
-		if (strip_suffix(key, ".remote", &key_len)) {
-			name = xmemdupz(key, key_len);
-			type = REMOTE;
-		} else if (strip_suffix(key, ".merge", &key_len)) {
-			name = xmemdupz(key, key_len);
-			type = MERGE;
-		} else if (strip_suffix(key, ".rebase", &key_len)) {
-			name = xmemdupz(key, key_len);
-			type = REBASE;
-		} else
-			return 0;
+	const char *orig_key = key;
+	char *name;
+	struct string_list_item *item;
+	struct branch_info *info;
+	enum { REMOTE, MERGE, REBASE, PUSH_REMOTE } type;
+	size_t key_len;
 
-		item = string_list_insert(&branch_list, name);
+	if (!starts_with(key, "branch."))
+		return 0;
 
-		if (!item->util)
-			item->util = xcalloc(1, sizeof(struct branch_info));
-		info = item->util;
-		if (type == REMOTE) {
-			if (info->remote_name)
-				warning(_("more than one %s"), orig_key);
-			info->remote_name = xstrdup(value);
-		} else if (type == MERGE) {
-			char *space = strchr(value, ' ');
-			value = abbrev_branch(value);
-			while (space) {
-				char *merge;
-				merge = xstrndup(value, space - value);
-				string_list_append(&info->merge, merge);
-				value = abbrev_branch(space + 1);
-				space = strchr(value, ' ');
-			}
-			string_list_append(&info->merge, xstrdup(value));
-		} else {
-			int v = git_parse_maybe_bool(value);
-			if (v >= 0)
-				info->rebase = v;
-			else if (!strcmp(value, "preserve"))
-				info->rebase = NORMAL_REBASE;
-			else if (!strcmp(value, "merges"))
-				info->rebase = REBASE_MERGES;
-			else if (!strcmp(value, "interactive"))
-				info->rebase = INTERACTIVE_REBASE;
+	key += strlen("branch.");
+	if (strip_suffix(key, ".remote", &key_len))
+		type = REMOTE;
+	else if (strip_suffix(key, ".merge", &key_len))
+		type = MERGE;
+	else if (strip_suffix(key, ".rebase", &key_len))
+		type = REBASE;
+	else if (strip_suffix(key, ".pushremote", &key_len))
+		type = PUSH_REMOTE;
+	else
+		return 0;
+	name = xmemdupz(key, key_len);
+
+	item = string_list_insert(&branch_list, name);
+
+	if (!item->util)
+		item->util = xcalloc(1, sizeof(struct branch_info));
+	info = item->util;
+	switch (type) {
+	case REMOTE:
+		if (info->remote_name)
+			warning(_("more than one %s"), orig_key);
+		info->remote_name = xstrdup(value);
+		break;
+	case MERGE: {
+		char *space = strchr(value, ' ');
+		value = abbrev_branch(value);
+		while (space) {
+			char *merge;
+			merge = xstrndup(value, space - value);
+			string_list_append(&info->merge, merge);
+			value = abbrev_branch(space + 1);
+			space = strchr(value, ' ');
 		}
+		string_list_append(&info->merge, xstrdup(value));
+		break;
+	}
+	case REBASE:
+		/*
+		 * Consider invalid values as false and check the
+		 * truth value with >= REBASE_TRUE.
+		 */
+		info->rebase = rebase_parse_value(value);
+		break;
+	case PUSH_REMOTE:
+		if (info->push_remote_name)
+			warning(_("more than one %s"), orig_key);
+		info->push_remote_name = xstrdup(value);
+		break;
+	default:
+		BUG("unexpected type=%d", type);
 	}
+
 	return 0;
 }
 
@@ -605,6 +615,56 @@ static int migrate_file(struct remote *remote)
 	return 0;
 }
 
+struct push_default_info
+{
+	const char *old_name;
+	enum config_scope scope;
+	struct strbuf origin;
+	int linenr;
+};
+
+static int config_read_push_default(const char *key, const char *value,
+	void *cb)
+{
+	struct push_default_info* info = cb;
+	if (strcmp(key, "remote.pushdefault") ||
+	    !value || strcmp(value, info->old_name))
+		return 0;
+
+	info->scope = current_config_scope();
+	strbuf_reset(&info->origin);
+	strbuf_addstr(&info->origin, current_config_name());
+	info->linenr = current_config_line();
+
+	return 0;
+}
+
+static void handle_push_default(const char* old_name, const char* new_name)
+{
+	struct push_default_info push_default = {
+		old_name, CONFIG_SCOPE_UNKNOWN, STRBUF_INIT, -1 };
+	git_config(config_read_push_default, &push_default);
+	if (push_default.scope >= CONFIG_SCOPE_COMMAND)
+		; /* pass */
+	else if (push_default.scope >= CONFIG_SCOPE_LOCAL) {
+		int result = git_config_set_gently("remote.pushDefault",
+						   new_name);
+		if (new_name && result && result != CONFIG_NOTHING_SET)
+			die(_("could not set '%s'"), "remote.pushDefault");
+		else if (!new_name && result && result != CONFIG_NOTHING_SET)
+			die(_("could not unset '%s'"), "remote.pushDefault");
+	} else if (push_default.scope >= CONFIG_SCOPE_SYSTEM) {
+		/* warn */
+		warning(_("The %s configuration remote.pushDefault in:\n"
+			  "\t%s:%d\n"
+			  "now names the non-existent remote '%s'"),
+			config_scope_name(push_default.scope),
+			push_default.origin.buf, push_default.linenr,
+			old_name);
+	}
+}
+
+
 static int mv(int argc, const char **argv)
 {
 	struct option options[] = {
@@ -680,6 +740,11 @@ static int mv(int argc, const char **argv)
 			strbuf_addf(&buf, "branch.%s.remote", item->string);
 			git_config_set(buf.buf, rename.new_name);
 		}
+		if (info->push_remote_name && !strcmp(info->push_remote_name, rename.old_name)) {
+			strbuf_reset(&buf);
+			strbuf_addf(&buf, "branch.%s.pushremote", item->string);
+			git_config_set(buf.buf, rename.new_name);
+		}
 	}
 
 	if (!refspec_updated)
@@ -693,9 +758,8 @@ static int mv(int argc, const char **argv)
 	for (i = 0; i < remote_branches.nr; i++) {
 		struct string_list_item *item = remote_branches.items + i;
 		int flag = 0;
-		struct object_id oid;
 
-		read_ref_full(item->string, RESOLVE_REF_READING, &oid, &flag);
+		read_ref_full(item->string, RESOLVE_REF_READING, NULL, &flag);
 		if (!(flag & REF_ISSYMREF))
 			continue;
 		if (delete_ref(NULL, item->string, NULL, REF_NO_DEREF))
@@ -736,6 +800,9 @@ static int mv(int argc, const char **argv)
 			die(_("creating '%s' failed"), buf.buf);
 	}
 	string_list_clear(&remote_branches, 1);
+
+	handle_push_default(rename.old_name, rename.new_name);
+
 	return 0;
 }
 
@@ -782,6 +849,13 @@ static int rm(int argc, const char **argv)
 					die(_("could not unset '%s'"), buf.buf);
 			}
 		}
+		if (info->push_remote_name && !strcmp(info->push_remote_name, remote->name)) {
+			strbuf_reset(&buf);
+			strbuf_addf(&buf, "branch.%s.pushremote", item->string);
+			result = git_config_set_gently(buf.buf, NULL);
+			if (result && result != CONFIG_NOTHING_SET)
+				die(_("could not unset '%s'"), buf.buf);
+		}
 	}
 
 	/*
@@ -814,6 +888,8 @@ static int rm(int argc, const char **argv)
 		strbuf_addf(&buf, "remote.%s", remote->name);
 		if (git_config_rename_section(buf.buf, NULL) < 1)
 			return error(_("Could not remove config section '%s'"), buf.buf);
+
+		handle_push_default(remote->name, NULL);
 	}
 
 	return result;
@@ -944,7 +1020,7 @@ static int add_local_to_show_info(struct string_list_item *branch_item, void *cb
 		return 0;
 	if ((n = strlen(branch_item->string)) > show_info->width)
 		show_info->width = n;
-	if (branch_info->rebase)
+	if (branch_info->rebase >= REBASE_TRUE)
 		show_info->any_rebase = 1;
 
 	item = string_list_insert(show_info->list, branch_item->string);
@@ -961,16 +1037,16 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data)
 	int width = show_info->width + 4;
 	int i;
 
-	if (branch_info->rebase && branch_info->merge.nr > 1) {
+	if (branch_info->rebase >= REBASE_TRUE && branch_info->merge.nr > 1) {
 		error(_("invalid branch.%s.merge; cannot rebase onto > 1 branch"),
 			item->string);
 		return 0;
 	}
 
 	printf("    %-*s ", show_info->width, item->string);
-	if (branch_info->rebase) {
+	if (branch_info->rebase >= REBASE_TRUE) {
 		const char *msg;
-		if (branch_info->rebase == INTERACTIVE_REBASE)
+		if (branch_info->rebase == REBASE_INTERACTIVE)
 			msg = _("rebases interactively onto remote %s");
 		else if (branch_info->rebase == REBASE_MERGES)
 			msg = _("rebases interactively (with merges) onto "
diff --git a/third_party/git/builtin/repack.c b/third_party/git/builtin/repack.c
index 632c0c0a7942..0781763b06e8 100644
--- a/third_party/git/builtin/repack.c
+++ b/third_party/git/builtin/repack.c
@@ -11,6 +11,7 @@
 #include "midx.h"
 #include "packfile.h"
 #include "object-store.h"
+#include "promisor-remote.h"
 
 static int delta_base_offset = 1;
 static int pack_kept_objects = -1;
@@ -190,7 +191,7 @@ static int write_oid(const struct object_id *oid, struct packed_git *pack,
 			die(_("could not start pack-objects to repack promisor objects"));
 	}
 
-	xwrite(cmd->in, oid_to_hex(oid), GIT_SHA1_HEXSZ);
+	xwrite(cmd->in, oid_to_hex(oid), the_hash_algo->hexsz);
 	xwrite(cmd->in, "\n", 1);
 	return 0;
 }
@@ -232,6 +233,13 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
 		/*
 		 * pack-objects creates the .pack and .idx files, but not the
 		 * .promisor file. Create the .promisor file, which is empty.
+		 *
+		 * NEEDSWORK: fetch-pack sometimes generates non-empty
+		 * .promisor files containing the ref names and associated
+		 * hashes at the point of generation of the corresponding
+		 * packfile, but this would not preserve their contents. Maybe
+		 * concatenate the contents of all .promisor files instead of
+		 * just creating a new empty file.
 		 */
 		promisor_name = mkpathdup("%s-%s.promisor", packtmp,
 					  line.buf);
@@ -361,7 +369,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	argv_array_push(&cmd.args, "--all");
 	argv_array_push(&cmd.args, "--reflog");
 	argv_array_push(&cmd.args, "--indexed-objects");
-	if (repository_format_partial_clone)
+	if (has_promisor_remote())
 		argv_array_push(&cmd.args, "--exclude-promisor-objects");
 	if (write_bitmaps > 0)
 		argv_array_push(&cmd.args, "--write-bitmap-index");
@@ -561,7 +569,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	remove_temporary_files();
 
 	if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0))
-		write_midx_file(get_object_directory());
+		write_midx_file(get_object_directory(), 0);
 
 	string_list_clear(&names, 0);
 	string_list_clear(&rollback, 0);
diff --git a/third_party/git/builtin/replace.c b/third_party/git/builtin/replace.c
index 644b21ca8d57..b36d17a657f3 100644
--- a/third_party/git/builtin/replace.c
+++ b/third_party/git/builtin/replace.c
@@ -272,7 +272,7 @@ static int import_object(struct object_id *oid, enum object_type type,
 			return error(_("unable to spawn mktree"));
 		}
 
-		if (strbuf_read(&result, cmd.out, 41) < 0) {
+		if (strbuf_read(&result, cmd.out, the_hash_algo->hexsz + 1) < 0) {
 			error_errno(_("unable to read from mktree"));
 			close(fd);
 			close(cmd.out);
@@ -358,14 +358,15 @@ static int replace_parents(struct strbuf *buf, int argc, const char **argv)
 	struct strbuf new_parents = STRBUF_INIT;
 	const char *parent_start, *parent_end;
 	int i;
+	const unsigned hexsz = the_hash_algo->hexsz;
 
 	/* find existing parents */
 	parent_start = buf->buf;
-	parent_start += GIT_SHA1_HEXSZ + 6; /* "tree " + "hex sha1" + "\n" */
+	parent_start += hexsz + 6; /* "tree " + "hex sha1" + "\n" */
 	parent_end = parent_start;
 
 	while (starts_with(parent_end, "parent "))
-		parent_end += 48; /* "parent " + "hex sha1" + "\n" */
+		parent_end += hexsz + 8; /* "parent " + "hex sha1" + "\n" */
 
 	/* prepare new parents */
 	for (i = 0; i < argc; i++) {
@@ -408,7 +409,8 @@ static int check_one_mergetag(struct commit *commit,
 	struct tag *tag;
 	int i;
 
-	hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &tag_oid);
+	hash_object_file(the_hash_algo, extra->value, extra->len,
+			 type_name(OBJ_TAG), &tag_oid);
 	tag = lookup_tag(the_repository, &tag_oid);
 	if (!tag)
 		return error(_("bad mergetag in commit '%s'"), ref);
@@ -421,7 +423,7 @@ static int check_one_mergetag(struct commit *commit,
 		if (get_oid(mergetag_data->argv[i], &oid) < 0)
 			return error(_("not a valid object name: '%s'"),
 				     mergetag_data->argv[i]);
-		if (oideq(&tag->tagged->oid, &oid))
+		if (oideq(get_tagged_oid(tag), &oid))
 			return 0; /* found */
 	}
 
diff --git a/third_party/git/builtin/reset.c b/third_party/git/builtin/reset.c
index fdd572168b51..18228c312ea0 100644
--- a/third_party/git/builtin/reset.c
+++ b/third_party/git/builtin/reset.c
@@ -30,8 +30,9 @@
 
 static const char * const git_reset_usage[] = {
 	N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
-	N_("git reset [-q] [<tree-ish>] [--] <paths>..."),
-	N_("git reset --patch [<tree-ish>] [--] [<paths>...]"),
+	N_("git reset [-q] [<tree-ish>] [--] <pathspec>..."),
+	N_("git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"),
+	N_("git reset --patch [<tree-ish>] [--] [<pathspec>...]"),
 	NULL
 };
 
@@ -284,8 +285,8 @@ static int git_reset_config(const char *var, const char *value, void *cb)
 int cmd_reset(int argc, const char **argv, const char *prefix)
 {
 	int reset_type = NONE, update_ref_status = 0, quiet = 0;
-	int patch_mode = 0, unborn;
-	const char *rev;
+	int patch_mode = 0, pathspec_file_nul = 0, unborn;
+	const char *rev, *pathspec_from_file = NULL;
 	struct object_id oid;
 	struct pathspec pathspec;
 	int intent_to_add = 0;
@@ -306,6 +307,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 		OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
 		OPT_BOOL('N', "intent-to-add", &intent_to_add,
 				N_("record only the fact that removed paths will be added later")),
+		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 		OPT_END()
 	};
 
@@ -316,11 +319,25 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 						PARSE_OPT_KEEP_DASHDASH);
 	parse_args(&pathspec, argv, prefix, patch_mode, &rev);
 
+	if (pathspec_from_file) {
+		if (patch_mode)
+			die(_("--pathspec-from-file is incompatible with --patch"));
+
+		if (pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		parse_pathspec_file(&pathspec, 0,
+				    PATHSPEC_PREFER_FULL,
+				    prefix, pathspec_from_file, pathspec_file_nul);
+	} else if (pathspec_file_nul) {
+		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+	}
+
 	unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
 	if (unborn) {
 		/* reset on unborn branch: treat as reset to empty tree */
 		oidcpy(&oid, the_hash_algo->empty_tree);
-	} else if (!pathspec.nr) {
+	} else if (!pathspec.nr && !patch_mode) {
 		struct commit *commit;
 		if (get_oid_committish(rev, &oid))
 			die(_("Failed to resolve '%s' as a valid revision."), rev);
diff --git a/third_party/git/builtin/rev-list.c b/third_party/git/builtin/rev-list.c
index 301ccb970bb3..f520111eda09 100644
--- a/third_party/git/builtin/rev-list.c
+++ b/third_party/git/builtin/rev-list.c
@@ -18,7 +18,6 @@
 #include "reflog-walk.h"
 #include "oidset.h"
 #include "packfile.h"
-#include "object-store.h"
 
 static const char rev_list_usage[] =
 "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
@@ -254,11 +253,26 @@ static int finish_object(struct object *obj, const char *name, void *cb_data)
 static void show_object(struct object *obj, const char *name, void *cb_data)
 {
 	struct rev_list_info *info = cb_data;
+	struct rev_info *revs = info->revs;
+
 	if (finish_object(obj, name, cb_data))
 		return;
 	display_progress(progress, ++progress_counter);
 	if (info->flags & REV_LIST_QUIET)
 		return;
+
+	if (revs->count) {
+		/*
+		 * The object count is always accumulated in the .count_right
+		 * field for traversal that is not a left-right traversal,
+		 * and cmd_rev_list() made sure that a .count request that
+		 * wants to count non-commit objects, which is handled by
+		 * the show_object() callback, does not ask for .left_right.
+		 */
+		revs->count_right++;
+		return;
+	}
+
 	if (arg_show_object_names)
 		show_object_with_name(stdout, obj, name);
 	else
@@ -365,6 +379,79 @@ static inline int parse_missing_action_value(const char *value)
 	return 0;
 }
 
+static int try_bitmap_count(struct rev_info *revs,
+			    struct list_objects_filter_options *filter)
+{
+	uint32_t commit_count = 0,
+		 tag_count = 0,
+		 tree_count = 0,
+		 blob_count = 0;
+	int max_count;
+	struct bitmap_index *bitmap_git;
+
+	/* This function only handles counting, not general traversal. */
+	if (!revs->count)
+		return -1;
+
+	/*
+	 * A bitmap result can't know left/right, etc, because we don't
+	 * actually traverse.
+	 */
+	if (revs->left_right || revs->cherry_mark)
+		return -1;
+
+	/*
+	 * If we're counting reachable objects, we can't handle a max count of
+	 * commits to traverse, since we don't know which objects go with which
+	 * commit.
+	 */
+	if (revs->max_count >= 0 &&
+	    (revs->tag_objects || revs->tree_objects || revs->blob_objects))
+		return -1;
+
+	/*
+	 * This must be saved before doing any walking, since the revision
+	 * machinery will count it down to zero while traversing.
+	 */
+	max_count = revs->max_count;
+
+	bitmap_git = prepare_bitmap_walk(revs, filter);
+	if (!bitmap_git)
+		return -1;
+
+	count_bitmap_commit_list(bitmap_git, &commit_count,
+				 revs->tree_objects ? &tree_count : NULL,
+				 revs->blob_objects ? &blob_count : NULL,
+				 revs->tag_objects ? &tag_count : NULL);
+	if (max_count >= 0 && max_count < commit_count)
+		commit_count = max_count;
+
+	printf("%d\n", commit_count + tree_count + blob_count + tag_count);
+	free_bitmap_index(bitmap_git);
+	return 0;
+}
+
+static int try_bitmap_traversal(struct rev_info *revs,
+				struct list_objects_filter_options *filter)
+{
+	struct bitmap_index *bitmap_git;
+
+	/*
+	 * We can't use a bitmap result with a traversal limit, since the set
+	 * of commits we'd get would be essentially random.
+	 */
+	if (revs->max_count >= 0)
+		return -1;
+
+	bitmap_git = prepare_bitmap_walk(revs, filter);
+	if (!bitmap_git)
+		return -1;
+
+	traverse_bitmap_commit_list(bitmap_git, revs, &show_object_fast);
+	free_bitmap_index(bitmap_git);
+	return 0;
+}
+
 int cmd_rev_list(int argc, const char **argv, const char *prefix)
 {
 	struct rev_info revs;
@@ -471,10 +558,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 			parse_list_objects_filter(&filter_options, arg);
 			if (filter_options.choice && !revs.blob_objects)
 				die(_("object filtering requires --objects"));
-			if (filter_options.choice == LOFC_SPARSE_OID &&
-			    !filter_options.sparse_oid_value)
-				die(_("invalid sparse value '%s'"),
-				    filter_options.filter_spec);
 			continue;
 		}
 		if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {
@@ -526,8 +609,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	if (revs.show_notes)
 		die(_("rev-list does not support display of notes"));
 
-	if (filter_options.choice && use_bitmap_index)
-		die(_("cannot combine --use-bitmap-index with object filtering"));
+	if (revs.count &&
+	    (revs.tag_objects || revs.tree_objects || revs.blob_objects) &&
+	    (revs.left_right || revs.cherry_mark))
+		die(_("marked counting is incompatible with --objects"));
 
 	save_commit_buffer = (revs.verbose_header ||
 			      revs.grep_filter.pattern_list ||
@@ -538,28 +623,11 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	if (show_progress)
 		progress = start_delayed_progress(show_progress, 0);
 
-	if (use_bitmap_index && !revs.prune) {
-		if (revs.count && !revs.left_right && !revs.cherry_mark) {
-			uint32_t commit_count;
-			int max_count = revs.max_count;
-			struct bitmap_index *bitmap_git;
-			if ((bitmap_git = prepare_bitmap_walk(&revs))) {
-				count_bitmap_commit_list(bitmap_git, &commit_count, NULL, NULL, NULL);
-				if (max_count >= 0 && max_count < commit_count)
-					commit_count = max_count;
-				printf("%d\n", commit_count);
-				free_bitmap_index(bitmap_git);
-				return 0;
-			}
-		} else if (revs.max_count < 0 &&
-			   revs.tag_objects && revs.tree_objects && revs.blob_objects) {
-			struct bitmap_index *bitmap_git;
-			if ((bitmap_git = prepare_bitmap_walk(&revs))) {
-				traverse_bitmap_commit_list(bitmap_git, &show_object_fast);
-				free_bitmap_index(bitmap_git);
-				return 0;
-			}
-		}
+	if (use_bitmap_index) {
+		if (!try_bitmap_count(&revs, &filter_options))
+			return 0;
+		if (!try_bitmap_traversal(&revs, &filter_options))
+			return 0;
 	}
 
 	if (prepare_revision_walk(&revs))
diff --git a/third_party/git/builtin/rev-parse.c b/third_party/git/builtin/rev-parse.c
index f8bbe6d47ec3..7a00da820355 100644
--- a/third_party/git/builtin/rev-parse.c
+++ b/third_party/git/builtin/rev-parse.c
@@ -593,6 +593,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 	const char *name = NULL;
 	struct object_context unused;
 	struct strbuf buf = STRBUF_INIT;
+	const int hexsz = the_hash_algo->hexsz;
 
 	if (argc > 1 && !strcmp("--parseopt", argv[1]))
 		return cmd_parseopt(argc - 1, argv + 1, prefix);
@@ -730,8 +731,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 				abbrev = strtoul(arg, NULL, 10);
 				if (abbrev < MINIMUM_ABBREV)
 					abbrev = MINIMUM_ABBREV;
-				else if (40 <= abbrev)
-					abbrev = 40;
+				else if (hexsz <= abbrev)
+					abbrev = hexsz;
 				continue;
 			}
 			if (!strcmp(arg, "--sq")) {
@@ -802,6 +803,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 				const char *work_tree = get_git_work_tree();
 				if (work_tree)
 					puts(work_tree);
+				else
+					die("this operation must be run in a work tree");
 				continue;
 			}
 			if (!strcmp(arg, "--show-superproject-working-tree")) {
@@ -918,6 +921,17 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 				show_datestring("--min-age=", arg);
 				continue;
 			}
+			if (opt_with_value(arg, "--show-object-format", &arg)) {
+				const char *val = arg ? arg : "storage";
+
+				if (strcmp(val, "storage") &&
+				    strcmp(val, "input") &&
+				    strcmp(val, "output"))
+					die("unknown mode for --show-object-format: %s",
+					    arg);
+				puts(the_hash_algo->name);
+				continue;
+			}
 			if (show_flag(arg) && verify)
 				die_no_single_rev(quiet);
 			continue;
diff --git a/third_party/git/builtin/rm.c b/third_party/git/builtin/rm.c
index 19ce95a901bc..4858631e0f02 100644
--- a/third_party/git/builtin/rm.c
+++ b/third_party/git/builtin/rm.c
@@ -235,7 +235,8 @@ static int check_local_mod(struct object_id *head, int index_only)
 }
 
 static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;
-static int ignore_unmatch = 0;
+static int ignore_unmatch = 0, pathspec_file_nul;
+static char *pathspec_from_file;
 
 static struct option builtin_rm_options[] = {
 	OPT__DRY_RUN(&show_only, N_("dry run")),
@@ -245,6 +246,8 @@ static struct option builtin_rm_options[] = {
 	OPT_BOOL('r', NULL,             &recursive,  N_("allow recursive removal")),
 	OPT_BOOL( 0 , "ignore-unmatch", &ignore_unmatch,
 				N_("exit with a zero status even if nothing matched")),
+	OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+	OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 	OPT_END(),
 };
 
@@ -259,8 +262,24 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 
 	argc = parse_options(argc, argv, prefix, builtin_rm_options,
 			     builtin_rm_usage, 0);
-	if (!argc)
-		usage_with_options(builtin_rm_usage, builtin_rm_options);
+
+	parse_pathspec(&pathspec, 0,
+		       PATHSPEC_PREFER_CWD,
+		       prefix, argv);
+
+	if (pathspec_from_file) {
+		if (pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		parse_pathspec_file(&pathspec, 0,
+				    PATHSPEC_PREFER_CWD,
+				    prefix, pathspec_from_file, pathspec_file_nul);
+	} else if (pathspec_file_nul) {
+		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+	}
+
+	if (!pathspec.nr)
+		die(_("No pathspec was given. Which files should I remove?"));
 
 	if (!index_only)
 		setup_work_tree();
@@ -270,9 +289,6 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 	if (read_cache() < 0)
 		die(_("index file corrupt"));
 
-	parse_pathspec(&pathspec, 0,
-		       PATHSPEC_PREFER_CWD,
-		       prefix, argv);
 	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &pathspec, NULL, NULL);
 
 	seen = xcalloc(pathspec.nr, 1);
diff --git a/third_party/git/builtin/show-branch.c b/third_party/git/builtin/show-branch.c
index 35d7f51c236d..8c90cbb18f07 100644
--- a/third_party/git/builtin/show-branch.c
+++ b/third_party/git/builtin/show-branch.c
@@ -536,7 +536,7 @@ static void append_one_rev(const char *av)
 		append_ref(av, &revkey, 0);
 		return;
 	}
-	if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
+	if (strpbrk(av, "*?[")) {
 		/* glob style match */
 		int saved_matches = ref_name_cnt;
 
diff --git a/third_party/git/builtin/show-index.c b/third_party/git/builtin/show-index.c
index a6e678809efe..0826f6a5a2c2 100644
--- a/third_party/git/builtin/show-index.c
+++ b/third_party/git/builtin/show-index.c
@@ -11,6 +11,7 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
 	unsigned nr;
 	unsigned int version;
 	static unsigned int top_index[256];
+	const unsigned hashsz = the_hash_algo->rawsz;
 
 	if (argc != 1)
 		usage(show_index_usage);
@@ -36,23 +37,23 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
 	}
 	if (version == 1) {
 		for (i = 0; i < nr; i++) {
-			unsigned int offset, entry[6];
+			unsigned int offset, entry[(GIT_MAX_RAWSZ + 4) / sizeof(unsigned int)];
 
-			if (fread(entry, 4 + 20, 1, stdin) != 1)
+			if (fread(entry, 4 + hashsz, 1, stdin) != 1)
 				die("unable to read entry %u/%u", i, nr);
 			offset = ntohl(entry[0]);
-			printf("%u %s\n", offset, sha1_to_hex((void *)(entry+1)));
+			printf("%u %s\n", offset, hash_to_hex((void *)(entry+1)));
 		}
 	} else {
 		unsigned off64_nr = 0;
 		struct {
-			unsigned char sha1[20];
+			struct object_id oid;
 			uint32_t crc;
 			uint32_t off;
 		} *entries;
 		ALLOC_ARRAY(entries, nr);
 		for (i = 0; i < nr; i++)
-			if (fread(entries[i].sha1, 20, 1, stdin) != 1)
+			if (fread(entries[i].oid.hash, hashsz, 1, stdin) != 1)
 				die("unable to read sha1 %u/%u", i, nr);
 		for (i = 0; i < nr; i++)
 			if (fread(&entries[i].crc, 4, 1, stdin) != 1)
@@ -77,7 +78,7 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
 			}
 			printf("%" PRIuMAX " %s (%08"PRIx32")\n",
 			       (uintmax_t) offset,
-			       sha1_to_hex(entries[i].sha1),
+			       oid_to_hex(&entries[i].oid),
 			       ntohl(entries[i].crc));
 		}
 		free(entries);
diff --git a/third_party/git/builtin/sparse-checkout.c b/third_party/git/builtin/sparse-checkout.c
new file mode 100644
index 000000000000..740da4b6d54a
--- /dev/null
+++ b/third_party/git/builtin/sparse-checkout.c
@@ -0,0 +1,631 @@
+#include "builtin.h"
+#include "config.h"
+#include "dir.h"
+#include "parse-options.h"
+#include "pathspec.h"
+#include "repository.h"
+#include "run-command.h"
+#include "strbuf.h"
+#include "string-list.h"
+#include "cache.h"
+#include "cache-tree.h"
+#include "lockfile.h"
+#include "resolve-undo.h"
+#include "unpack-trees.h"
+#include "wt-status.h"
+#include "quote.h"
+
+static const char *empty_base = "";
+
+static char const * const builtin_sparse_checkout_usage[] = {
+	N_("git sparse-checkout (init|list|set|add|disable) <options>"),
+	NULL
+};
+
+static char *get_sparse_checkout_filename(void)
+{
+	return git_pathdup("info/sparse-checkout");
+}
+
+static void write_patterns_to_file(FILE *fp, struct pattern_list *pl)
+{
+	int i;
+
+	for (i = 0; i < pl->nr; i++) {
+		struct path_pattern *p = pl->patterns[i];
+
+		if (p->flags & PATTERN_FLAG_NEGATIVE)
+			fprintf(fp, "!");
+
+		fprintf(fp, "%s", p->pattern);
+
+		if (p->flags & PATTERN_FLAG_MUSTBEDIR)
+			fprintf(fp, "/");
+
+		fprintf(fp, "\n");
+	}
+}
+
+static int sparse_checkout_list(int argc, const char **argv)
+{
+	struct pattern_list pl;
+	char *sparse_filename;
+	int res;
+
+	memset(&pl, 0, sizeof(pl));
+
+	pl.use_cone_patterns = core_sparse_checkout_cone;
+
+	sparse_filename = get_sparse_checkout_filename();
+	res = add_patterns_from_file_to_list(sparse_filename, "", 0, &pl, NULL);
+	free(sparse_filename);
+
+	if (res < 0) {
+		warning(_("this worktree is not sparse (sparse-checkout file may not exist)"));
+		return 0;
+	}
+
+	if (pl.use_cone_patterns) {
+		int i;
+		struct pattern_entry *pe;
+		struct hashmap_iter iter;
+		struct string_list sl = STRING_LIST_INIT_DUP;
+
+		hashmap_for_each_entry(&pl.recursive_hashmap, &iter, pe, ent) {
+			/* pe->pattern starts with "/", skip it */
+			string_list_insert(&sl, pe->pattern + 1);
+		}
+
+		string_list_sort(&sl);
+
+		for (i = 0; i < sl.nr; i++) {
+			quote_c_style(sl.items[i].string, NULL, stdout, 0);
+			printf("\n");
+		}
+
+		return 0;
+	}
+
+	write_patterns_to_file(stdout, &pl);
+	clear_pattern_list(&pl);
+
+	return 0;
+}
+
+static int update_working_directory(struct pattern_list *pl)
+{
+	int result = 0;
+	struct unpack_trees_options o;
+	struct lock_file lock_file = LOCK_INIT;
+	struct object_id oid;
+	struct tree *tree;
+	struct tree_desc t;
+	struct repository *r = the_repository;
+
+	if (repo_read_index_unmerged(r))
+		die(_("you need to resolve your current index first"));
+
+	if (get_oid("HEAD", &oid))
+		return 0;
+
+	tree = parse_tree_indirect(&oid);
+	parse_tree(tree);
+	init_tree_desc(&t, tree->buffer, tree->size);
+
+	memset(&o, 0, sizeof(o));
+	o.verbose_update = isatty(2);
+	o.merge = 1;
+	o.update = 1;
+	o.fn = oneway_merge;
+	o.head_idx = -1;
+	o.src_index = r->index;
+	o.dst_index = r->index;
+	o.skip_sparse_checkout = 0;
+	o.pl = pl;
+	o.keep_pattern_list = !!pl;
+
+	resolve_undo_clear_index(r->index);
+	setup_work_tree();
+
+	cache_tree_free(&r->index->cache_tree);
+
+	repo_hold_locked_index(r, &lock_file, LOCK_DIE_ON_ERROR);
+
+	core_apply_sparse_checkout = 1;
+	result = unpack_trees(1, &t, &o);
+
+	if (!result) {
+		prime_cache_tree(r, r->index, tree);
+		write_locked_index(r->index, &lock_file, COMMIT_LOCK);
+	} else
+		rollback_lock_file(&lock_file);
+
+	return result;
+}
+
+static char *escaped_pattern(char *pattern)
+{
+	char *p = pattern;
+	struct strbuf final = STRBUF_INIT;
+
+	while (*p) {
+		if (is_glob_special(*p))
+			strbuf_addch(&final, '\\');
+
+		strbuf_addch(&final, *p);
+		p++;
+	}
+
+	return strbuf_detach(&final, NULL);
+}
+
+static void write_cone_to_file(FILE *fp, struct pattern_list *pl)
+{
+	int i;
+	struct pattern_entry *pe;
+	struct hashmap_iter iter;
+	struct string_list sl = STRING_LIST_INIT_DUP;
+	struct strbuf parent_pattern = STRBUF_INIT;
+
+	hashmap_for_each_entry(&pl->parent_hashmap, &iter, pe, ent) {
+		if (hashmap_get_entry(&pl->recursive_hashmap, pe, ent, NULL))
+			continue;
+
+		if (!hashmap_contains_parent(&pl->recursive_hashmap,
+					     pe->pattern,
+					     &parent_pattern))
+			string_list_insert(&sl, pe->pattern);
+	}
+
+	string_list_sort(&sl);
+	string_list_remove_duplicates(&sl, 0);
+
+	fprintf(fp, "/*\n!/*/\n");
+
+	for (i = 0; i < sl.nr; i++) {
+		char *pattern = escaped_pattern(sl.items[i].string);
+
+		if (strlen(pattern))
+			fprintf(fp, "%s/\n!%s/*/\n", pattern, pattern);
+		free(pattern);
+	}
+
+	string_list_clear(&sl, 0);
+
+	hashmap_for_each_entry(&pl->recursive_hashmap, &iter, pe, ent) {
+		if (!hashmap_contains_parent(&pl->recursive_hashmap,
+					     pe->pattern,
+					     &parent_pattern))
+			string_list_insert(&sl, pe->pattern);
+	}
+
+	strbuf_release(&parent_pattern);
+
+	string_list_sort(&sl);
+	string_list_remove_duplicates(&sl, 0);
+
+	for (i = 0; i < sl.nr; i++) {
+		char *pattern = escaped_pattern(sl.items[i].string);
+		fprintf(fp, "%s/\n", pattern);
+		free(pattern);
+	}
+}
+
+static int write_patterns_and_update(struct pattern_list *pl)
+{
+	char *sparse_filename;
+	FILE *fp;
+	int fd;
+	struct lock_file lk = LOCK_INIT;
+	int result;
+
+	sparse_filename = get_sparse_checkout_filename();
+
+	if (safe_create_leading_directories(sparse_filename))
+		die(_("failed to create directory for sparse-checkout file"));
+
+	fd = hold_lock_file_for_update(&lk, sparse_filename,
+				      LOCK_DIE_ON_ERROR);
+
+	result = update_working_directory(pl);
+	if (result) {
+		rollback_lock_file(&lk);
+		free(sparse_filename);
+		clear_pattern_list(pl);
+		update_working_directory(NULL);
+		return result;
+	}
+
+	fp = xfdopen(fd, "w");
+
+	if (core_sparse_checkout_cone)
+		write_cone_to_file(fp, pl);
+	else
+		write_patterns_to_file(fp, pl);
+
+	fflush(fp);
+	commit_lock_file(&lk);
+
+	free(sparse_filename);
+	clear_pattern_list(pl);
+
+	return 0;
+}
+
+enum sparse_checkout_mode {
+	MODE_NO_PATTERNS = 0,
+	MODE_ALL_PATTERNS = 1,
+	MODE_CONE_PATTERNS = 2,
+};
+
+static int set_config(enum sparse_checkout_mode mode)
+{
+	const char *config_path;
+
+	if (git_config_set_gently("extensions.worktreeConfig", "true")) {
+		error(_("failed to set extensions.worktreeConfig setting"));
+		return 1;
+	}
+
+	config_path = git_path("config.worktree");
+	git_config_set_in_file_gently(config_path,
+				      "core.sparseCheckout",
+				      mode ? "true" : NULL);
+
+	git_config_set_in_file_gently(config_path,
+				      "core.sparseCheckoutCone",
+				      mode == MODE_CONE_PATTERNS ? "true" : NULL);
+
+	return 0;
+}
+
+static char const * const builtin_sparse_checkout_init_usage[] = {
+	N_("git sparse-checkout init [--cone]"),
+	NULL
+};
+
+static struct sparse_checkout_init_opts {
+	int cone_mode;
+} init_opts;
+
+static int sparse_checkout_init(int argc, const char **argv)
+{
+	struct pattern_list pl;
+	char *sparse_filename;
+	int res;
+	struct object_id oid;
+	int mode;
+	struct strbuf pattern = STRBUF_INIT;
+
+	static struct option builtin_sparse_checkout_init_options[] = {
+		OPT_BOOL(0, "cone", &init_opts.cone_mode,
+			 N_("initialize the sparse-checkout in cone mode")),
+		OPT_END(),
+	};
+
+	repo_read_index(the_repository);
+	require_clean_work_tree(the_repository,
+				N_("initialize sparse-checkout"), NULL, 1, 0);
+
+	argc = parse_options(argc, argv, NULL,
+			     builtin_sparse_checkout_init_options,
+			     builtin_sparse_checkout_init_usage, 0);
+
+	if (init_opts.cone_mode) {
+		mode = MODE_CONE_PATTERNS;
+		core_sparse_checkout_cone = 1;
+	} else
+		mode = MODE_ALL_PATTERNS;
+
+	if (set_config(mode))
+		return 1;
+
+	memset(&pl, 0, sizeof(pl));
+
+	sparse_filename = get_sparse_checkout_filename();
+	res = add_patterns_from_file_to_list(sparse_filename, "", 0, &pl, NULL);
+
+	/* If we already have a sparse-checkout file, use it. */
+	if (res >= 0) {
+		free(sparse_filename);
+		core_apply_sparse_checkout = 1;
+		return update_working_directory(NULL);
+	}
+
+	if (get_oid("HEAD", &oid)) {
+		FILE *fp;
+
+		/* assume we are in a fresh repo, but update the sparse-checkout file */
+		fp = xfopen(sparse_filename, "w");
+		if (!fp)
+			die(_("failed to open '%s'"), sparse_filename);
+
+		free(sparse_filename);
+		fprintf(fp, "/*\n!/*/\n");
+		fclose(fp);
+		return 0;
+	}
+
+	strbuf_addstr(&pattern, "/*");
+	add_pattern(strbuf_detach(&pattern, NULL), empty_base, 0, &pl, 0);
+	strbuf_addstr(&pattern, "!/*/");
+	add_pattern(strbuf_detach(&pattern, NULL), empty_base, 0, &pl, 0);
+
+	return write_patterns_and_update(&pl);
+}
+
+static void insert_recursive_pattern(struct pattern_list *pl, struct strbuf *path)
+{
+	struct pattern_entry *e = xmalloc(sizeof(*e));
+	e->patternlen = path->len;
+	e->pattern = strbuf_detach(path, NULL);
+	hashmap_entry_init(&e->ent,
+			   ignore_case ?
+			   strihash(e->pattern) :
+			   strhash(e->pattern));
+
+	hashmap_add(&pl->recursive_hashmap, &e->ent);
+
+	while (e->patternlen) {
+		char *slash = strrchr(e->pattern, '/');
+		char *oldpattern = e->pattern;
+		size_t newlen;
+
+		if (slash == e->pattern)
+			break;
+
+		newlen = slash - e->pattern;
+		e = xmalloc(sizeof(struct pattern_entry));
+		e->patternlen = newlen;
+		e->pattern = xstrndup(oldpattern, newlen);
+		hashmap_entry_init(&e->ent,
+				   ignore_case ?
+				   strihash(e->pattern) :
+				   strhash(e->pattern));
+
+		if (!hashmap_get_entry(&pl->parent_hashmap, e, ent, NULL))
+			hashmap_add(&pl->parent_hashmap, &e->ent);
+	}
+}
+
+static void strbuf_to_cone_pattern(struct strbuf *line, struct pattern_list *pl)
+{
+	strbuf_trim(line);
+
+	strbuf_trim_trailing_dir_sep(line);
+
+	if (strbuf_normalize_path(line))
+		die(_("could not normalize path %s"), line->buf);
+
+	if (!line->len)
+		return;
+
+	if (line->buf[0] != '/')
+		strbuf_insertstr(line, 0, "/");
+
+	insert_recursive_pattern(pl, line);
+}
+
+static char const * const builtin_sparse_checkout_set_usage[] = {
+	N_("git sparse-checkout (set|add) (--stdin | <patterns>)"),
+	NULL
+};
+
+static struct sparse_checkout_set_opts {
+	int use_stdin;
+} set_opts;
+
+static void add_patterns_from_input(struct pattern_list *pl,
+				    int argc, const char **argv)
+{
+	int i;
+	if (core_sparse_checkout_cone) {
+		struct strbuf line = STRBUF_INIT;
+
+		hashmap_init(&pl->recursive_hashmap, pl_hashmap_cmp, NULL, 0);
+		hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0);
+		pl->use_cone_patterns = 1;
+
+		if (set_opts.use_stdin) {
+			struct strbuf unquoted = STRBUF_INIT;
+			while (!strbuf_getline(&line, stdin)) {
+				if (line.buf[0] == '"') {
+					strbuf_reset(&unquoted);
+					if (unquote_c_style(&unquoted, line.buf, NULL))
+						die(_("unable to unquote C-style string '%s'"),
+						line.buf);
+
+					strbuf_swap(&unquoted, &line);
+				}
+
+				strbuf_to_cone_pattern(&line, pl);
+			}
+
+			strbuf_release(&unquoted);
+		} else {
+			for (i = 0; i < argc; i++) {
+				strbuf_setlen(&line, 0);
+				strbuf_addstr(&line, argv[i]);
+				strbuf_to_cone_pattern(&line, pl);
+			}
+		}
+	} else {
+		if (set_opts.use_stdin) {
+			struct strbuf line = STRBUF_INIT;
+
+			while (!strbuf_getline(&line, stdin)) {
+				size_t len;
+				char *buf = strbuf_detach(&line, &len);
+				add_pattern(buf, empty_base, 0, pl, 0);
+			}
+		} else {
+			for (i = 0; i < argc; i++)
+				add_pattern(argv[i], empty_base, 0, pl, 0);
+		}
+	}
+}
+
+enum modify_type {
+	REPLACE,
+	ADD,
+};
+
+static void add_patterns_cone_mode(int argc, const char **argv,
+				   struct pattern_list *pl)
+{
+	struct strbuf buffer = STRBUF_INIT;
+	struct pattern_entry *pe;
+	struct hashmap_iter iter;
+	struct pattern_list existing;
+	char *sparse_filename = get_sparse_checkout_filename();
+
+	add_patterns_from_input(pl, argc, argv);
+
+	memset(&existing, 0, sizeof(existing));
+	existing.use_cone_patterns = core_sparse_checkout_cone;
+
+	if (add_patterns_from_file_to_list(sparse_filename, "", 0,
+					   &existing, NULL))
+		die(_("unable to load existing sparse-checkout patterns"));
+	free(sparse_filename);
+
+	hashmap_for_each_entry(&existing.recursive_hashmap, &iter, pe, ent) {
+		if (!hashmap_contains_parent(&pl->recursive_hashmap,
+					pe->pattern, &buffer) ||
+		    !hashmap_contains_parent(&pl->parent_hashmap,
+					pe->pattern, &buffer)) {
+			strbuf_reset(&buffer);
+			strbuf_addstr(&buffer, pe->pattern);
+			insert_recursive_pattern(pl, &buffer);
+		}
+	}
+
+	clear_pattern_list(&existing);
+	strbuf_release(&buffer);
+}
+
+static void add_patterns_literal(int argc, const char **argv,
+				 struct pattern_list *pl)
+{
+	char *sparse_filename = get_sparse_checkout_filename();
+	if (add_patterns_from_file_to_list(sparse_filename, "", 0,
+					   pl, NULL))
+		die(_("unable to load existing sparse-checkout patterns"));
+	free(sparse_filename);
+	add_patterns_from_input(pl, argc, argv);
+}
+
+static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
+{
+	int result;
+	int changed_config = 0;
+	struct pattern_list pl;
+	memset(&pl, 0, sizeof(pl));
+
+	switch (m) {
+	case ADD:
+		if (core_sparse_checkout_cone)
+			add_patterns_cone_mode(argc, argv, &pl);
+		else
+			add_patterns_literal(argc, argv, &pl);
+		break;
+
+	case REPLACE:
+		add_patterns_from_input(&pl, argc, argv);
+		break;
+	}
+
+	if (!core_apply_sparse_checkout) {
+		set_config(MODE_ALL_PATTERNS);
+		core_apply_sparse_checkout = 1;
+		changed_config = 1;
+	}
+
+	result = write_patterns_and_update(&pl);
+
+	if (result && changed_config)
+		set_config(MODE_NO_PATTERNS);
+
+	clear_pattern_list(&pl);
+	return result;
+}
+
+static int sparse_checkout_set(int argc, const char **argv, const char *prefix,
+			       enum modify_type m)
+{
+	static struct option builtin_sparse_checkout_set_options[] = {
+		OPT_BOOL(0, "stdin", &set_opts.use_stdin,
+			 N_("read patterns from standard in")),
+		OPT_END(),
+	};
+
+	repo_read_index(the_repository);
+	require_clean_work_tree(the_repository,
+				N_("set sparse-checkout patterns"), NULL, 1, 0);
+
+	argc = parse_options(argc, argv, prefix,
+			     builtin_sparse_checkout_set_options,
+			     builtin_sparse_checkout_set_usage,
+			     PARSE_OPT_KEEP_UNKNOWN);
+
+	return modify_pattern_list(argc, argv, m);
+}
+
+static int sparse_checkout_disable(int argc, const char **argv)
+{
+	struct pattern_list pl;
+	struct strbuf match_all = STRBUF_INIT;
+
+	repo_read_index(the_repository);
+	require_clean_work_tree(the_repository,
+				N_("disable sparse-checkout"), NULL, 1, 0);
+
+	memset(&pl, 0, sizeof(pl));
+	hashmap_init(&pl.recursive_hashmap, pl_hashmap_cmp, NULL, 0);
+	hashmap_init(&pl.parent_hashmap, pl_hashmap_cmp, NULL, 0);
+	pl.use_cone_patterns = 0;
+	core_apply_sparse_checkout = 1;
+
+	strbuf_addstr(&match_all, "/*");
+	add_pattern(strbuf_detach(&match_all, NULL), empty_base, 0, &pl, 0);
+
+	if (update_working_directory(&pl))
+		die(_("error while refreshing working directory"));
+
+	clear_pattern_list(&pl);
+	return set_config(MODE_NO_PATTERNS);
+}
+
+int cmd_sparse_checkout(int argc, const char **argv, const char *prefix)
+{
+	static struct option builtin_sparse_checkout_options[] = {
+		OPT_END(),
+	};
+
+	if (argc == 2 && !strcmp(argv[1], "-h"))
+		usage_with_options(builtin_sparse_checkout_usage,
+				   builtin_sparse_checkout_options);
+
+	argc = parse_options(argc, argv, prefix,
+			     builtin_sparse_checkout_options,
+			     builtin_sparse_checkout_usage,
+			     PARSE_OPT_STOP_AT_NON_OPTION);
+
+	git_config(git_default_config, NULL);
+
+	if (argc > 0) {
+		if (!strcmp(argv[0], "list"))
+			return sparse_checkout_list(argc, argv);
+		if (!strcmp(argv[0], "init"))
+			return sparse_checkout_init(argc, argv);
+		if (!strcmp(argv[0], "set"))
+			return sparse_checkout_set(argc, argv, prefix, REPLACE);
+		if (!strcmp(argv[0], "add"))
+			return sparse_checkout_set(argc, argv, prefix, ADD);
+		if (!strcmp(argv[0], "disable"))
+			return sparse_checkout_disable(argc, argv);
+	}
+
+	usage_with_options(builtin_sparse_checkout_usage,
+			   builtin_sparse_checkout_options);
+}
diff --git a/third_party/git/builtin/stash.c b/third_party/git/builtin/stash.c
index b5a301f24d7a..78af6ce56431 100644
--- a/third_party/git/builtin/stash.c
+++ b/third_party/git/builtin/stash.c
@@ -27,6 +27,7 @@ static const char * const git_stash_usage[] = {
 	N_("git stash clear"),
 	N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 	   "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+	   "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 	   "          [--] [<pathspec>...]]"),
 	N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 	   "          [-u|--include-untracked] [-a|--all] [<message>]"),
@@ -396,7 +397,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 	const struct object_id *bases[1];
 
 	read_cache_preload(NULL);
-	if (refresh_cache(REFRESH_QUIET))
+	if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
 		return -1;
 
 	if (write_cache_as_tree(&c_tree, 0, NULL))
@@ -427,6 +428,8 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 				return error(_("could not save index tree"));
 
 			reset_head();
+			discard_cache();
+			read_cache();
 		}
 	}
 
@@ -481,13 +484,12 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 		if (ret)
 			return -1;
 
+		/* read back the result of update_index() back from the disk */
 		discard_cache();
+		read_cache();
 	}
 
-	if (quiet) {
-		if (refresh_cache(REFRESH_QUIET))
-			warning("could not refresh index");
-	} else {
+	if (!quiet) {
 		struct child_process cp = CHILD_PROCESS_INIT;
 
 		/*
@@ -497,6 +499,10 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 		 */
 		cp.git_cmd = 1;
 		cp.dir = prefix;
+		argv_array_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s",
+				 absolute_path(get_git_work_tree()));
+		argv_array_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s",
+				 absolute_path(get_git_dir()));
 		argv_array_push(&cp.args, "status");
 		run_command(&cp);
 	}
@@ -993,9 +999,9 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps,
 {
 	int ret = 0;
 	struct child_process cp_read_tree = CHILD_PROCESS_INIT;
-	struct child_process cp_add_i = CHILD_PROCESS_INIT;
 	struct child_process cp_diff_tree = CHILD_PROCESS_INIT;
 	struct index_state istate = { NULL };
+	char *old_index_env = NULL, *old_repo_index_file;
 
 	remove_path(stash_index_path.buf);
 
@@ -1009,16 +1015,19 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps,
 	}
 
 	/* Find out what the user wants. */
-	cp_add_i.git_cmd = 1;
-	argv_array_pushl(&cp_add_i.args, "add--interactive", "--patch=stash",
-			 "--", NULL);
-	add_pathspecs(&cp_add_i.args, ps);
-	argv_array_pushf(&cp_add_i.env_array, "GIT_INDEX_FILE=%s",
-			 stash_index_path.buf);
-	if (run_command(&cp_add_i)) {
-		ret = -1;
-		goto done;
-	}
+	old_repo_index_file = the_repository->index_file;
+	the_repository->index_file = stash_index_path.buf;
+	old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
+	setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
+
+	ret = run_add_interactive(NULL, "--patch=stash", ps);
+
+	the_repository->index_file = old_repo_index_file;
+	if (old_index_env && *old_index_env)
+		setenv(INDEX_ENVIRONMENT, old_index_env, 1);
+	else
+		unsetenv(INDEX_ENVIRONMENT);
+	FREE_AND_NULL(old_index_env);
 
 	/* State of the working tree. */
 	if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
@@ -1082,8 +1091,9 @@ static int stash_working_tree(struct stash_info *info, const struct pathspec *ps
 	}
 
 	cp_upd_index.git_cmd = 1;
-	argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
-			 "--remove", "--stdin", NULL);
+	argv_array_pushl(&cp_upd_index.args, "update-index",
+			 "--ignore-skip-worktree-entries",
+			 "-z", "--add", "--remove", "--stdin", NULL);
 	argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
 			 stash_index_path.buf);
 
@@ -1129,7 +1139,10 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b
 	prepare_fallback_ident("git stash", "git@stash");
 
 	read_cache_preload(NULL);
-	refresh_cache(REFRESH_QUIET);
+	if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0) {
+		ret = -1;
+		goto done;
+	}
 
 	if (get_oid("HEAD", &info->b_commit)) {
 		if (!quiet)
@@ -1290,7 +1303,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 		free(ps_matched);
 	}
 
-	if (refresh_cache(REFRESH_QUIET)) {
+	if (refresh_and_write_cache(REFRESH_QUIET, 0, 0)) {
 		ret = -1;
 		goto done;
 	}
@@ -1383,7 +1396,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 			struct child_process cp = CHILD_PROCESS_INIT;
 			cp.git_cmd = 1;
 			argv_array_pushl(&cp.args, "reset", "--hard", "-q",
-					 NULL);
+					 "--no-recurse-submodules", NULL);
 			if (run_command(&cp)) {
 				ret = -1;
 				goto done;
@@ -1439,13 +1452,17 @@ done:
 	return ret;
 }
 
-static int push_stash(int argc, const char **argv, const char *prefix)
+static int push_stash(int argc, const char **argv, const char *prefix,
+		      int push_assumed)
 {
+	int force_assume = 0;
 	int keep_index = -1;
 	int patch_mode = 0;
 	int include_untracked = 0;
 	int quiet = 0;
+	int pathspec_file_nul = 0;
 	const char *stash_msg = NULL;
+	const char *pathspec_from_file = NULL;
 	struct pathspec ps;
 	struct option options[] = {
 		OPT_BOOL('k', "keep-index", &keep_index,
@@ -1459,16 +1476,45 @@ static int push_stash(int argc, const char **argv, const char *prefix)
 			    N_("include ignore files"), 2),
 		OPT_STRING('m', "message", &stash_msg, N_("message"),
 			   N_("stash message")),
+		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 		OPT_END()
 	};
 
-	if (argc)
+	if (argc) {
+		force_assume = !strcmp(argv[0], "-p");
 		argc = parse_options(argc, argv, prefix, options,
 				     git_stash_push_usage,
-				     0);
+				     PARSE_OPT_KEEP_DASHDASH);
+	}
+
+	if (argc) {
+		if (!strcmp(argv[0], "--")) {
+			argc--;
+			argv++;
+		} else if (push_assumed && !force_assume) {
+			die("subcommand wasn't specified; 'push' can't be assumed due to unexpected token '%s'",
+			    argv[0]);
+		}
+	}
 
 	parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
 		       prefix, argv);
+
+	if (pathspec_from_file) {
+		if (patch_mode)
+			die(_("--pathspec-from-file is incompatible with --patch"));
+
+		if (ps.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		parse_pathspec_file(&ps, 0,
+				    PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
+				    prefix, pathspec_from_file, pathspec_file_nul);
+	} else if (pathspec_file_nul) {
+		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+	}
+
 	return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
 			     include_untracked);
 }
@@ -1538,7 +1584,6 @@ static int use_builtin_stash(void)
 
 int cmd_stash(int argc, const char **argv, const char *prefix)
 {
-	int i = -1;
 	pid_t pid = getpid();
 	const char *index_file;
 	struct argv_array args = ARGV_ARRAY_INIT;
@@ -1571,7 +1616,7 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
 		    (uintmax_t)pid);
 
 	if (!argc)
-		return !!push_stash(0, NULL, prefix);
+		return !!push_stash(0, NULL, prefix, 0);
 	else if (!strcmp(argv[0], "apply"))
 		return !!apply_stash(argc, argv, prefix);
 	else if (!strcmp(argv[0], "clear"))
@@ -1591,45 +1636,15 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
 	else if (!strcmp(argv[0], "create"))
 		return !!create_stash(argc, argv, prefix);
 	else if (!strcmp(argv[0], "push"))
-		return !!push_stash(argc, argv, prefix);
+		return !!push_stash(argc, argv, prefix, 0);
 	else if (!strcmp(argv[0], "save"))
 		return !!save_stash(argc, argv, prefix);
 	else if (*argv[0] != '-')
 		usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
 			      git_stash_usage, options);
 
-	if (strcmp(argv[0], "-p")) {
-		while (++i < argc && strcmp(argv[i], "--")) {
-			/*
-			 * `akpqu` is a string which contains all short options,
-			 * except `-m` which is verified separately.
-			 */
-			if ((strlen(argv[i]) == 2) && *argv[i] == '-' &&
-			    strchr("akpqu", argv[i][1]))
-				continue;
-
-			if (!strcmp(argv[i], "--all") ||
-			    !strcmp(argv[i], "--keep-index") ||
-			    !strcmp(argv[i], "--no-keep-index") ||
-			    !strcmp(argv[i], "--patch") ||
-			    !strcmp(argv[i], "--quiet") ||
-			    !strcmp(argv[i], "--include-untracked"))
-				continue;
-
-			/*
-			 * `-m` and `--message=` are verified separately because
-			 * they need to be immediately followed by a string
-			 * (i.e.`-m"foobar"` or `--message="foobar"`).
-			 */
-			if (starts_with(argv[i], "-m") ||
-			    starts_with(argv[i], "--message="))
-				continue;
-
-			usage_with_options(git_stash_usage, options);
-		}
-	}
-
+	/* Assume 'stash push' */
 	argv_array_push(&args, "push");
 	argv_array_pushv(&args, argv);
-	return !!push_stash(args.argc, args.argv, prefix);
+	return !!push_stash(args.argc, args.argv, prefix, 1);
 }
diff --git a/third_party/git/builtin/submodule--helper.c b/third_party/git/builtin/submodule--helper.c
index 909e77e802d3..86a608eec114 100644
--- a/third_party/git/builtin/submodule--helper.c
+++ b/third_party/git/builtin/submodule--helper.c
@@ -19,6 +19,8 @@
 #include "diffcore.h"
 #include "diff.h"
 #include "object-store.h"
+#include "dir.h"
+#include "advice.h"
 
 #define OPT_QUIET (1 << 0)
 #define OPT_CACHED (1 << 1)
@@ -424,7 +426,7 @@ static int module_list(int argc, const char **argv, const char *prefix)
 		const struct cache_entry *ce = list.entries[i];
 
 		if (ce_stage(ce))
-			printf("%06o %s U\t", ce->ce_mode, sha1_to_hex(null_sha1));
+			printf("%06o %s U\t", ce->ce_mode, oid_to_hex(&null_oid));
 		else
 			printf("%06o %s %d\t", ce->ce_mode,
 			       oid_to_hex(&ce->oid), ce_stage(ce));
@@ -780,6 +782,8 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 	struct argv_array diff_files_args = ARGV_ARRAY_INIT;
 	struct rev_info rev;
 	int diff_files_result;
+	struct strbuf buf = STRBUF_INIT;
+	const char *git_dir;
 
 	if (!submodule_from_path(the_repository, &null_oid, path))
 		die(_("no submodule mapping found in .gitmodules for path '%s'"),
@@ -792,17 +796,26 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 		goto cleanup;
 	}
 
-	if (!is_submodule_active(the_repository, path)) {
+	strbuf_addf(&buf, "%s/.git", path);
+	git_dir = read_gitfile(buf.buf);
+	if (!git_dir)
+		git_dir = buf.buf;
+
+	if (!is_submodule_active(the_repository, path) ||
+	    !is_git_directory(git_dir)) {
 		print_status(flags, '-', path, ce_oid, displaypath);
+		strbuf_release(&buf);
 		goto cleanup;
 	}
+	strbuf_release(&buf);
 
 	argv_array_pushl(&diff_files_args, "diff-files",
 			 "--ignore-submodules=dirty", "--quiet", "--",
 			 path, NULL);
 
 	git_config(git_diff_basic_config, NULL);
-	repo_init_revisions(the_repository, &rev, prefix);
+
+	repo_init_revisions(the_repository, &rev, NULL);
 	rev.abbrev = 0;
 	diff_files_args.argc = setup_revisions(diff_files_args.argc,
 					       diff_files_args.argv,
@@ -1222,7 +1235,7 @@ static int module_deinit(int argc, const char **argv, const char *prefix)
 
 static int clone_submodule(const char *path, const char *gitdir, const char *url,
 			   const char *depth, struct string_list *reference, int dissociate,
-			   int quiet, int progress)
+			   int quiet, int progress, int single_branch)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 
@@ -1244,6 +1257,10 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url
 		argv_array_push(&cp.args, "--dissociate");
 	if (gitdir && *gitdir)
 		argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
+	if (single_branch >= 0)
+		argv_array_push(&cp.args, single_branch ?
+					  "--single-branch" :
+					  "--no-single-branch");
 
 	argv_array_push(&cp.args, "--");
 	argv_array_push(&cp.args, url);
@@ -1268,6 +1285,13 @@ struct submodule_alternate_setup {
 #define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
 	SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
 
+static const char alternate_error_advice[] = N_(
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+);
+
 static int add_possible_reference_from_superproject(
 		struct object_directory *odb, void *sas_cb)
 {
@@ -1299,6 +1323,8 @@ static int add_possible_reference_from_superproject(
 		} else {
 			switch (sas->error_mode) {
 			case SUBMODULE_ALTERNATE_ERROR_DIE:
+				if (advice_submodule_alternate_error_strategy_die)
+					advise(_(alternate_error_advice));
 				die(_("submodule '%s' cannot add alternate: %s"),
 				    sas->submodule_name, err.buf);
 			case SUBMODULE_ALTERNATE_ERROR_INFO:
@@ -1359,8 +1385,9 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 	char *p, *path = NULL, *sm_gitdir;
 	struct strbuf sb = STRBUF_INIT;
 	struct string_list reference = STRING_LIST_INIT_NODUP;
-	int dissociate = 0;
+	int dissociate = 0, require_init = 0;
 	char *sm_alternate = NULL, *error_strategy = NULL;
+	int single_branch = -1;
 
 	struct option module_clone_options[] = {
 		OPT_STRING(0, "prefix", &prefix,
@@ -1386,12 +1413,17 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 		OPT__QUIET(&quiet, "Suppress output for cloning a submodule"),
 		OPT_BOOL(0, "progress", &progress,
 			   N_("force cloning progress")),
+		OPT_BOOL(0, "require-init", &require_init,
+			   N_("disallow cloning into non-empty directory")),
+		OPT_BOOL(0, "single-branch", &single_branch,
+			 N_("clone only one branch, HEAD or --branch")),
 		OPT_END()
 	};
 
 	const char *const git_submodule_helper_usage[] = {
 		N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
 		   "[--reference <repository>] [--name <name>] [--depth <depth>] "
+		   "[--single-branch] "
 		   "--url <url> --path <path>"),
 		NULL
 	};
@@ -1413,6 +1445,10 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 	} else
 		path = xstrdup(path);
 
+	if (validate_submodule_git_dir(sm_gitdir, name) < 0)
+		die(_("refusing to create/use '%s' in another submodule's "
+			"git dir"), sm_gitdir);
+
 	if (!file_exists(sm_gitdir)) {
 		if (safe_create_leading_directories_const(sm_gitdir) < 0)
 			die(_("could not create directory '%s'"), sm_gitdir);
@@ -1420,10 +1456,12 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 		prepare_possible_alternates(name, &reference);
 
 		if (clone_submodule(path, sm_gitdir, url, depth, &reference, dissociate,
-				    quiet, progress))
+				    quiet, progress, single_branch))
 			die(_("clone of '%s' into submodule path '%s' failed"),
 			    url, path);
 	} else {
+		if (require_init && !access(path, X_OK) && !is_empty_dir(path))
+			die(_("directory not empty: '%s'"), path);
 		if (safe_create_leading_directories_const(path) < 0)
 			die(_("could not create directory '%s'"), path);
 		strbuf_addf(&sb, "%s/index", sm_gitdir);
@@ -1478,6 +1516,8 @@ static void determine_submodule_update_strategy(struct repository *r,
 			die(_("Invalid update mode '%s' configured for submodule path '%s'"),
 				val, path);
 	} else if (sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
+		if (sub->update_strategy.type == SM_UPDATE_COMMAND)
+			BUG("how did we read update = !command from .gitmodules?");
 		out->type = sub->update_strategy.type;
 		out->command = sub->update_strategy.command;
 	} else
@@ -1536,9 +1576,11 @@ struct submodule_update_clone {
 	int recommend_shallow;
 	struct string_list references;
 	int dissociate;
+	unsigned require_init;
 	const char *depth;
 	const char *recursive_prefix;
 	const char *prefix;
+	int single_branch;
 
 	/* to be consumed by git-submodule.sh */
 	struct update_clone_data *update_clone;
@@ -1553,10 +1595,14 @@ struct submodule_update_clone {
 
 	int max_jobs;
 };
-#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
-	SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, \
-	NULL, NULL, NULL, \
-	NULL, 0, 0, 0, NULL, 0, 0, 1}
+#define SUBMODULE_UPDATE_CLONE_INIT { \
+	.list = MODULE_LIST_INIT, \
+	.update = SUBMODULE_UPDATE_STRATEGY_INIT, \
+	.recommend_shallow = -1, \
+	.references = STRING_LIST_INIT_DUP, \
+	.single_branch = -1, \
+	.max_jobs = 1, \
+}
 
 
 static void next_submodule_warn_missing(struct submodule_update_clone *suc,
@@ -1681,6 +1727,8 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 		argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL);
 	if (suc->recommend_shallow && sub->recommend_shallow == 1)
 		argv_array_push(&child->args, "--depth=1");
+	if (suc->require_init)
+		argv_array_push(&child->args, "--require-init");
 	argv_array_pushl(&child->args, "--path", sub->path, NULL);
 	argv_array_pushl(&child->args, "--name", sub->name, NULL);
 	argv_array_pushl(&child->args, "--url", url, NULL);
@@ -1693,6 +1741,10 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 		argv_array_push(&child->args, "--dissociate");
 	if (suc->depth)
 		argv_array_push(&child->args, suc->depth);
+	if (suc->single_branch >= 0)
+		argv_array_push(&child->args, suc->single_branch ?
+					      "--single-branch" :
+					      "--no-single-branch");
 
 cleanup:
 	strbuf_reset(&displaypath_sb);
@@ -1870,11 +1922,15 @@ static int update_clone(int argc, const char **argv, const char *prefix)
 		OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
 		OPT_BOOL(0, "progress", &suc.progress,
 			    N_("force cloning progress")),
+		OPT_BOOL(0, "require-init", &suc.require_init,
+			   N_("disallow cloning into non-empty directory")),
+		OPT_BOOL(0, "single-branch", &suc.single_branch,
+			 N_("clone only one branch, HEAD or --branch")),
 		OPT_END()
 	};
 
 	const char *const git_submodule_helper_usage[] = {
-		N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"),
+		N_("git submodule--helper update-clone [--prefix=<path>] [<path>...]"),
 		NULL
 	};
 	suc.prefix = prefix;
diff --git a/third_party/git/builtin/unpack-objects.c b/third_party/git/builtin/unpack-objects.c
index a87a4bfd2c55..dd4a75e030d2 100644
--- a/third_party/git/builtin/unpack-objects.c
+++ b/third_party/git/builtin/unpack-objects.c
@@ -24,6 +24,7 @@ static off_t consumed_bytes;
 static off_t max_input_size;
 static git_hash_ctx ctx;
 static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
+static struct progress *progress;
 
 /*
  * When running under --strict mode, objects whose reachability are
@@ -92,6 +93,7 @@ static void use(int bytes)
 	consumed_bytes += bytes;
 	if (max_input_size && consumed_bytes > max_input_size)
 		die(_("pack exceeds maximum allowed size"));
+	display_throughput(progress, consumed_bytes);
 }
 
 static void *get_data(unsigned long size)
@@ -263,7 +265,8 @@ static void write_object(unsigned nr, enum object_type type,
 	} else {
 		struct object *obj;
 		int eaten;
-		hash_object_file(buf, size, type_name(type), &obj_list[nr].oid);
+		hash_object_file(the_hash_algo, buf, size, type_name(type),
+				 &obj_list[nr].oid);
 		added_object(nr, type, buf, size);
 		obj = parse_object_buffer(the_repository, &obj_list[nr].oid,
 					  type, size, buf,
@@ -484,7 +487,6 @@ static void unpack_one(unsigned nr)
 static void unpack_all(void)
 {
 	int i;
-	struct progress *progress = NULL;
 	struct pack_header *hdr = fill(sizeof(struct pack_header));
 
 	nr_objects = ntohl(hdr->hdr_entries);
diff --git a/third_party/git/builtin/update-index.c b/third_party/git/builtin/update-index.c
index dff2f4b83720..d527b8f10668 100644
--- a/third_party/git/builtin/update-index.c
+++ b/third_party/git/builtin/update-index.c
@@ -35,6 +35,7 @@ static int verbose;
 static int mark_valid_only;
 static int mark_skip_worktree_only;
 static int mark_fsmonitor_only;
+static int ignore_skip_worktree_entries;
 #define MARK_FLAG 1
 #define UNMARK_FLAG 2
 static struct strbuf mtime_dir = STRBUF_INIT;
@@ -381,7 +382,8 @@ static int process_path(const char *path, struct stat *st, int stat_errno)
 		 * so updating it does not make sense.
 		 * On the other hand, removing it from index should work
 		 */
-		if (allow_remove && remove_file_from_cache(path))
+		if (!ignore_skip_worktree_entries && allow_remove &&
+		    remove_file_from_cache(path))
 			return error("%s: cannot remove from the index", path);
 		return 0;
 	}
@@ -966,6 +968,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 	struct parse_opt_ctx_t ctx;
 	strbuf_getline_fn getline_fn;
 	int parseopt_state = PARSE_OPT_UNKNOWN;
+	struct repository *r = the_repository;
 	struct option options[] = {
 		OPT_BIT('q', NULL, &refresh_args.flags,
 			N_("continue refresh even when index needs update"),
@@ -1013,6 +1016,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 		{OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
 			N_("clear skip-worktree bit"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
+		OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries,
+			 N_("do not touch index-only entries")),
 		OPT_SET_INT(0, "info-only", &info_only,
 			N_("add to index only; do not add content to object database"), 1),
 		OPT_SET_INT(0, "force-remove", &force_remove,
@@ -1180,11 +1185,12 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 		remove_split_index(&the_index);
 	}
 
+	prepare_repo_settings(r);
 	switch (untracked_cache) {
 	case UC_UNSPECIFIED:
 		break;
 	case UC_DISABLE:
-		if (git_config_get_untracked_cache() == 1)
+		if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
 			warning(_("core.untrackedCache is set to true; "
 				  "remove or change it, if you really want to "
 				  "disable the untracked cache"));
@@ -1196,7 +1202,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 		return !test_if_untracked_cache_is_supported();
 	case UC_ENABLE:
 	case UC_FORCE:
-		if (git_config_get_untracked_cache() == 0)
+		if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE)
 			warning(_("core.untrackedCache is set to false; "
 				  "remove or change it, if you really want to "
 				  "enable the untracked cache"));
diff --git a/third_party/git/builtin/worktree.c b/third_party/git/builtin/worktree.c
index a5bb02b2076a..24f22800f38c 100644
--- a/third_party/git/builtin/worktree.c
+++ b/third_party/git/builtin/worktree.c
@@ -10,7 +10,6 @@
 #include "run-command.h"
 #include "sigchain.h"
 #include "submodule.h"
-#include "refs.h"
 #include "utf8.h"
 #include "worktree.h"
 
@@ -235,14 +234,7 @@ static void validate_worktree_add(const char *path, const struct add_opts *opts)
 		die(_("'%s' already exists"), path);
 
 	worktrees = get_worktrees(0);
-	/*
-	 * find_worktree()'s suffix matching may undesirably find the main
-	 * rather than a linked worktree (for instance, when the basenames
-	 * of the main worktree and the one being created are the same).
-	 * We're only interested in linked worktrees, so skip the main
-	 * worktree with +1.
-	 */
-	wt = find_worktree(worktrees + 1, NULL, path);
+	wt = find_worktree_by_path(worktrees, path);
 	if (!wt)
 		goto done;
 
@@ -350,7 +342,7 @@ static int add_worktree(const char *path, const char *refname,
 	 */
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
-	write_file(sb.buf, "%s", sha1_to_hex(null_sha1));
+	write_file(sb.buf, "%s", oid_to_hex(&null_oid));
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
 	write_file(sb.buf, "../..");
@@ -377,7 +369,7 @@ static int add_worktree(const char *path, const char *refname,
 	if (opts->checkout) {
 		cp.argv = NULL;
 		argv_array_clear(&cp.args);
-		argv_array_pushl(&cp.args, "reset", "--hard", NULL);
+		argv_array_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
 		if (opts->quiet)
 			argv_array_push(&cp.args, "--quiet");
 		cp.env = child_env.argv;
@@ -880,7 +872,7 @@ static void check_clean_worktree(struct worktree *wt,
 			  original_path);
 	ret = xread(cp.out, buf, sizeof(buf));
 	if (ret)
-		die(_("'%s' is dirty, use --force to delete it"),
+		die(_("'%s' contains modified or untracked files, use --force to delete it"),
 		    original_path);
 	close(cp.out);
 	ret = finish_command(&cp);
diff --git a/third_party/git/bulk-checkin.c b/third_party/git/bulk-checkin.c
index 39ee7d6107c1..583aacb9e36b 100644
--- a/third_party/git/bulk-checkin.c
+++ b/third_party/git/bulk-checkin.c
@@ -197,7 +197,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
 	git_hash_ctx ctx;
 	unsigned char obuf[16384];
 	unsigned header_len;
-	struct hashfile_checkpoint checkpoint;
+	struct hashfile_checkpoint checkpoint = {0};
 	struct pack_idx_entry *idx = NULL;
 
 	seekback = lseek(fd, 0, SEEK_CUR);
diff --git a/third_party/git/bundle.c b/third_party/git/bundle.c
index b5d21cd80f1c..99439e07a106 100644
--- a/third_party/git/bundle.c
+++ b/third_party/git/bundle.c
@@ -249,15 +249,16 @@ out:
 
 
 /* Write the pack data to bundle_fd */
-static int write_pack_data(int bundle_fd, struct rev_info *revs)
+static int write_pack_data(int bundle_fd, struct rev_info *revs, struct argv_array *pack_options)
 {
 	struct child_process pack_objects = CHILD_PROCESS_INIT;
 	int i;
 
 	argv_array_pushl(&pack_objects.args,
-			 "pack-objects", "--all-progress-implied",
+			 "pack-objects",
 			 "--stdout", "--thin", "--delta-base-offset",
 			 NULL);
+	argv_array_pushv(&pack_objects.args, pack_options->argv);
 	pack_objects.in = -1;
 	pack_objects.out = bundle_fd;
 	pack_objects.git_cmd = 1;
@@ -282,7 +283,7 @@ static int write_pack_data(int bundle_fd, struct rev_info *revs)
 		struct object *object = revs->pending.objects[i].item;
 		if (object->flags & UNINTERESTING)
 			write_or_die(pack_objects.in, "^", 1);
-		write_or_die(pack_objects.in, oid_to_hex(&object->oid), GIT_SHA1_HEXSZ);
+		write_or_die(pack_objects.in, oid_to_hex(&object->oid), the_hash_algo->hexsz);
 		write_or_die(pack_objects.in, "\n", 1);
 	}
 	close(pack_objects.in);
@@ -414,7 +415,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
 		}
 
 		ref_count++;
-		write_or_die(bundle_fd, oid_to_hex(&e->item->oid), 40);
+		write_or_die(bundle_fd, oid_to_hex(&e->item->oid), the_hash_algo->hexsz);
 		write_or_die(bundle_fd, " ", 1);
 		write_or_die(bundle_fd, display_ref, strlen(display_ref));
 		write_or_die(bundle_fd, "\n", 1);
@@ -428,7 +429,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
 }
 
 int create_bundle(struct repository *r, const char *path,
-		  int argc, const char **argv)
+		  int argc, const char **argv, struct argv_array *pack_options)
 {
 	struct lock_file lock = LOCK_INIT;
 	int bundle_fd = -1;
@@ -470,7 +471,7 @@ int create_bundle(struct repository *r, const char *path,
 		goto err;
 
 	/* write pack */
-	if (write_pack_data(bundle_fd, &revs))
+	if (write_pack_data(bundle_fd, &revs, pack_options))
 		goto err;
 
 	if (!bundle_to_stdout) {
diff --git a/third_party/git/bundle.h b/third_party/git/bundle.h
index 37c37d7f653c..ceab0c747578 100644
--- a/third_party/git/bundle.h
+++ b/third_party/git/bundle.h
@@ -1,6 +1,7 @@
 #ifndef BUNDLE_H
 #define BUNDLE_H
 
+#include "argv-array.h"
 #include "cache.h"
 
 struct ref_list {
@@ -19,7 +20,7 @@ struct bundle_header {
 int is_bundle(const char *path, int quiet);
 int read_bundle_header(const char *path, struct bundle_header *header);
 int create_bundle(struct repository *r, const char *path,
-		  int argc, const char **argv);
+		  int argc, const char **argv, struct argv_array *pack_options);
 int verify_bundle(struct repository *r, struct bundle_header *header, int verbose);
 #define BUNDLE_VERBOSE 1
 int unbundle(struct repository *r, struct bundle_header *header,
diff --git a/third_party/git/cache-tree.c b/third_party/git/cache-tree.c
index 706ffcf1883a..a537a806c16e 100644
--- a/third_party/git/cache-tree.c
+++ b/third_party/git/cache-tree.c
@@ -5,6 +5,7 @@
 #include "cache-tree.h"
 #include "object-store.h"
 #include "replace-object.h"
+#include "promisor-remote.h"
 
 #ifndef DEBUG_CACHE_TREE
 #define DEBUG_CACHE_TREE 0
@@ -357,7 +358,7 @@ static int update_one(struct cache_tree *it,
 		}
 
 		ce_missing_ok = mode == S_IFGITLINK || missing_ok ||
-			(repository_format_partial_clone &&
+			(has_promisor_remote() &&
 			 ce_skip_worktree(ce));
 		if (is_null_oid(oid) ||
 		    (!ce_missing_ok && !has_object_file(oid))) {
@@ -406,13 +407,15 @@ static int update_one(struct cache_tree *it,
 
 	if (repair) {
 		struct object_id oid;
-		hash_object_file(buffer.buf, buffer.len, tree_type, &oid);
-		if (has_object_file(&oid))
+		hash_object_file(the_hash_algo, buffer.buf, buffer.len,
+				 tree_type, &oid);
+		if (has_object_file_with_flags(&oid, OBJECT_INFO_SKIP_FETCH_OBJECT))
 			oidcpy(&it->oid, &oid);
 		else
 			to_invalidate = 1;
 	} else if (dryrun) {
-		hash_object_file(buffer.buf, buffer.len, tree_type, &it->oid);
+		hash_object_file(the_hash_algo, buffer.buf, buffer.len,
+				 tree_type, &it->oid);
 	} else if (write_object_file(buffer.buf, buffer.len, tree_type,
 				     &it->oid)) {
 		strbuf_release(&buffer);
@@ -608,11 +611,66 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat
 	return it;
 }
 
+static int write_index_as_tree_internal(struct object_id *oid,
+					struct index_state *index_state,
+					int cache_tree_valid,
+					int flags,
+					const char *prefix)
+{
+	if (flags & WRITE_TREE_IGNORE_CACHE_TREE) {
+		cache_tree_free(&index_state->cache_tree);
+		cache_tree_valid = 0;
+	}
+
+	if (!index_state->cache_tree)
+		index_state->cache_tree = cache_tree();
+
+	if (!cache_tree_valid && cache_tree_update(index_state, flags) < 0)
+		return WRITE_TREE_UNMERGED_INDEX;
+
+	if (prefix) {
+		struct cache_tree *subtree;
+		subtree = cache_tree_find(index_state->cache_tree, prefix);
+		if (!subtree)
+			return WRITE_TREE_PREFIX_ERROR;
+		oidcpy(oid, &subtree->oid);
+	}
+	else
+		oidcpy(oid, &index_state->cache_tree->oid);
+
+	return 0;
+}
+
+struct tree* write_in_core_index_as_tree(struct repository *repo) {
+	struct object_id o;
+	int was_valid, ret;
+
+	struct index_state *index_state	= repo->index;
+	was_valid = index_state->cache_tree &&
+		    cache_tree_fully_valid(index_state->cache_tree);
+
+	ret = write_index_as_tree_internal(&o, index_state, was_valid, 0, NULL);
+	if (ret == WRITE_TREE_UNMERGED_INDEX) {
+		int i;
+		fprintf(stderr, "BUG: There are unmerged index entries:\n");
+		for (i = 0; i < index_state->cache_nr; i++) {
+			const struct cache_entry *ce = index_state->cache[i];
+			if (ce_stage(ce))
+				fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
+					(int)ce_namelen(ce), ce->name);
+		}
+		BUG("unmerged index entries when writing inmemory index");
+	}
+
+	return lookup_tree(repo, &index_state->cache_tree->oid);
+}
+
+
 int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix)
 {
 	int entries, was_valid;
 	struct lock_file lock_file = LOCK_INIT;
-	int ret = 0;
+	int ret;
 
 	hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR);
 
@@ -621,18 +679,14 @@ int write_index_as_tree(struct object_id *oid, struct index_state *index_state,
 		ret = WRITE_TREE_UNREADABLE_INDEX;
 		goto out;
 	}
-	if (flags & WRITE_TREE_IGNORE_CACHE_TREE)
-		cache_tree_free(&index_state->cache_tree);
 
-	if (!index_state->cache_tree)
-		index_state->cache_tree = cache_tree();
+	was_valid = !(flags & WRITE_TREE_IGNORE_CACHE_TREE) &&
+		    index_state->cache_tree &&
+		    cache_tree_fully_valid(index_state->cache_tree);
 
-	was_valid = cache_tree_fully_valid(index_state->cache_tree);
-	if (!was_valid) {
-		if (cache_tree_update(index_state, flags) < 0) {
-			ret = WRITE_TREE_UNMERGED_INDEX;
-			goto out;
-		}
+	ret = write_index_as_tree_internal(oid, index_state, was_valid, flags,
+					   prefix);
+	if (!ret && !was_valid) {
 		write_locked_index(index_state, &lock_file, COMMIT_LOCK);
 		/* Not being able to write is fine -- we are only interested
 		 * in updating the cache-tree part, and if the next caller
@@ -642,18 +696,6 @@ int write_index_as_tree(struct object_id *oid, struct index_state *index_state,
 		 */
 	}
 
-	if (prefix) {
-		struct cache_tree *subtree;
-		subtree = cache_tree_find(index_state->cache_tree, prefix);
-		if (!subtree) {
-			ret = WRITE_TREE_PREFIX_ERROR;
-			goto out;
-		}
-		oidcpy(oid, &subtree->oid);
-	}
-	else
-		oidcpy(oid, &index_state->cache_tree->oid);
-
 out:
 	rollback_lock_file(&lock_file);
 	return ret;
@@ -713,7 +755,7 @@ static struct cache_tree *find_cache_tree_from_traversal(struct cache_tree *root
 	if (!info->prev)
 		return root;
 	our_parent = find_cache_tree_from_traversal(root, info->prev);
-	return cache_tree_find(our_parent, info->name.path);
+	return cache_tree_find(our_parent, info->name);
 }
 
 int cache_tree_matches_traversal(struct cache_tree *root,
@@ -786,9 +828,10 @@ static void verify_one(struct repository *r,
 			i++;
 		}
 		strbuf_addf(&tree_buf, "%o %.*s%c", mode, entlen, name, '\0');
-		strbuf_add(&tree_buf, oid->hash, the_hash_algo->rawsz);
+		strbuf_add(&tree_buf, oid->hash, r->hash_algo->rawsz);
 	}
-	hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid);
+	hash_object_file(r->hash_algo, tree_buf.buf, tree_buf.len, tree_type,
+			 &new_oid);
 	if (!oideq(&new_oid, &it->oid))
 		BUG("cache-tree for path %.*s does not match. "
 		    "Expected %s got %s", len, path->buf,
diff --git a/third_party/git/cache-tree.h b/third_party/git/cache-tree.h
index 757bbc48bca1..639bfa5340e7 100644
--- a/third_party/git/cache-tree.h
+++ b/third_party/git/cache-tree.h
@@ -34,7 +34,7 @@ int cache_tree_fully_valid(struct cache_tree *);
 int cache_tree_update(struct index_state *, int);
 void cache_tree_verify(struct repository *, struct index_state *);
 
-/* bitmasks to write_cache_as_tree flags */
+/* bitmasks to write_index_as_tree flags */
 #define WRITE_TREE_MISSING_OK 1
 #define WRITE_TREE_IGNORE_CACHE_TREE 2
 #define WRITE_TREE_DRY_RUN 4
@@ -46,6 +46,7 @@ void cache_tree_verify(struct repository *, struct index_state *);
 #define WRITE_TREE_UNMERGED_INDEX (-2)
 #define WRITE_TREE_PREFIX_ERROR (-3)
 
+struct tree* write_in_core_index_as_tree(struct repository *repo);
 int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix);
 void prime_cache_tree(struct repository *, struct index_state *, struct tree *);
 
diff --git a/third_party/git/cache.h b/third_party/git/cache.h
index 023e8af41236..5c309b46c281 100644
--- a/third_party/git/cache.h
+++ b/third_party/git/cache.h
@@ -304,6 +304,7 @@ static inline unsigned int canon_mode(unsigned int mode)
 
 struct split_index;
 struct untracked_cache;
+struct progress;
 
 struct index_state {
 	struct cache_entry **cache;
@@ -323,9 +324,10 @@ struct index_state {
 	struct hashmap dir_hash;
 	struct object_id oid;
 	struct untracked_cache *untracked;
-	uint64_t fsmonitor_last_update;
+	char *fsmonitor_last_update;
 	struct ewah_bitmap *fsmonitor_dirty;
 	struct mem_pool *ce_mem_pool;
+	struct progress *progress;
 };
 
 /* Name hashing */
@@ -414,6 +416,7 @@ extern struct index_state the_index;
 #define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags))
 #define chmod_cache_entry(ce, flip) chmod_index_entry(&the_index, (ce), (flip))
 #define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL, NULL)
+#define refresh_and_write_cache(refresh_flags, write_flags, gentle) repo_refresh_and_write_index(the_repository, (refresh_flags), (write_flags), (gentle), NULL, NULL, NULL)
 #define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options))
 #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))
 #define cache_dir_exists(name, namelen) index_dir_exists(&the_index, (name), (namelen))
@@ -631,10 +634,46 @@ int daemonize(void);
 
 #define alloc_nr(x) (((x)+16)*3/2)
 
-/*
- * Realloc the buffer pointed at by variable 'x' so that it can hold
- * at least 'nr' entries; the number of entries currently allocated
- * is 'alloc', using the standard growing factor alloc_nr() macro.
+/**
+ * Dynamically growing an array using realloc() is error prone and boring.
+ *
+ * Define your array with:
+ *
+ * - a pointer (`item`) that points at the array, initialized to `NULL`
+ *   (although please name the variable based on its contents, not on its
+ *   type);
+ *
+ * - an integer variable (`alloc`) that keeps track of how big the current
+ *   allocation is, initialized to `0`;
+ *
+ * - another integer variable (`nr`) to keep track of how many elements the
+ *   array currently has, initialized to `0`.
+ *
+ * Then before adding `n`th element to the item, call `ALLOC_GROW(item, n,
+ * alloc)`.  This ensures that the array can hold at least `n` elements by
+ * calling `realloc(3)` and adjusting `alloc` variable.
+ *
+ * ------------
+ * sometype *item;
+ * size_t nr;
+ * size_t alloc
+ *
+ * for (i = 0; i < nr; i++)
+ * 	if (we like item[i] already)
+ * 		return;
+ *
+ * // we did not like any existing one, so add one
+ * ALLOC_GROW(item, nr + 1, alloc);
+ * item[nr++] = value you like;
+ * ------------
+ *
+ * You are responsible for updating the `nr` variable.
+ *
+ * If you need to specify the number of elements to allocate explicitly
+ * then use the macro `REALLOC_ARRAY(item, alloc)` instead of `ALLOC_GROW`.
+ *
+ * Consider using ALLOC_GROW_BY instead of ALLOC_GROW as it has some
+ * added niceties.
  *
  * DO NOT USE any expression with side-effect for 'x', 'nr', or 'alloc'.
  */
@@ -649,6 +688,25 @@ int daemonize(void);
 		} \
 	} while (0)
 
+/*
+ * Similar to ALLOC_GROW but handles updating of the nr value and
+ * zeroing the bytes of the newly-grown array elements.
+ *
+ * DO NOT USE any expression with side-effect for any of the
+ * arguments.
+ */
+#define ALLOC_GROW_BY(x, nr, increase, alloc) \
+	do { \
+		if (increase) { \
+			size_t new_nr = nr + (increase); \
+			if (new_nr < nr) \
+				BUG("negative growth in ALLOC_GROW_BY"); \
+			ALLOC_GROW(x, new_nr, alloc); \
+			memset((x) + nr, 0, sizeof(*(x)) * (increase)); \
+			nr = new_nr; \
+		} \
+	} while (0)
+
 /* Initialize and use the cache information */
 struct lock_file;
 void preload_index(struct index_state *index,
@@ -725,6 +783,19 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na
  */
 int index_name_pos(const struct index_state *, const char *name, int namelen);
 
+/*
+ * Some functions return the negative complement of an insert position when a
+ * precise match was not found but a position was found where the entry would
+ * need to be inserted. This helper protects that logic from any integer
+ * underflow.
+ */
+static inline int index_pos_to_insert_pos(uintmax_t pos)
+{
+	if (pos > INT_MAX)
+		die("overflow: -1 - %"PRIuMAX, pos);
+	return -1 - (int)pos;
+}
+
 #define ADD_CACHE_OK_TO_ADD 1		/* Ok to add */
 #define ADD_CACHE_OK_TO_REPLACE 2	/* Ok to replace file/directory */
 #define ADD_CACHE_SKIP_DFCHECK 4	/* Ok to skip DF conflict checks */
@@ -812,6 +883,23 @@ void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, st
 #define REFRESH_IN_PORCELAIN	0x0020	/* user friendly output, not "needs update" */
 #define REFRESH_PROGRESS	0x0040  /* show progress bar if stderr is tty */
 int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg);
+/*
+ * Refresh the index and write it to disk.
+ *
+ * 'refresh_flags' is passed directly to 'refresh_index()', while
+ * 'COMMIT_LOCK | write_flags' is passed to 'write_locked_index()', so
+ * the lockfile is always either committed or rolled back.
+ *
+ * If 'gentle' is passed, errors locking the index are ignored.
+ *
+ * Return 1 if refreshing the index returns an error, -1 if writing
+ * the index to disk fails, 0 on success.
+ *
+ * Note that if refreshing the index returns an error, we still write
+ * out the index (unless locking fails).
+ */
+int repo_refresh_and_write_index(struct repository*, unsigned int refresh_flags, unsigned int write_flags, int gentle, const struct pathspec *, char *seen, const char *header_msg);
+
 struct cache_entry *refresh_cache_entry(struct index_state *, struct cache_entry *, unsigned int);
 
 void set_alternate_index_output(const char *);
@@ -865,12 +953,14 @@ extern char *git_replace_ref_base;
 
 extern int fsync_object_files;
 extern int core_preload_index;
-extern int core_apply_sparse_checkout;
 extern int precomposed_unicode;
 extern int protect_hfs;
 extern int protect_ntfs;
 extern const char *core_fsmonitor;
 
+extern int core_apply_sparse_checkout;
+extern int core_sparse_checkout_cone;
+
 /*
  * Include broken refs in all ref iterations, which will
  * generally choke dangerous operations rather than letting
@@ -937,8 +1027,6 @@ extern int grafts_replace_parents;
 #define GIT_REPO_VERSION 0
 #define GIT_REPO_VERSION_READ 1
 extern int repository_format_precious_objects;
-extern char *repository_format_partial_clone;
-extern const char *core_partial_clone_filter_default;
 extern int repository_format_worktree_config;
 
 /*
@@ -1029,7 +1117,6 @@ const char *repo_find_unique_abbrev(struct repository *r, const struct object_id
 int repo_find_unique_abbrev_r(struct repository *r, char *hex, const struct object_id *oid, int len);
 #define find_unique_abbrev_r(hex, oid, len) repo_find_unique_abbrev_r(the_repository, hex, oid, len)
 
-extern const unsigned char null_sha1[GIT_MAX_RAWSZ];
 extern const struct object_id null_oid;
 
 static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
@@ -1064,14 +1151,9 @@ static inline int oideq(const struct object_id *oid1, const struct object_id *oi
 	return hasheq(oid1->hash, oid2->hash);
 }
 
-static inline int is_null_sha1(const unsigned char *sha1)
-{
-	return hasheq(sha1, null_sha1);
-}
-
 static inline int is_null_oid(const struct object_id *oid)
 {
-	return hasheq(oid->hash, null_sha1);
+	return oideq(oid, &null_oid);
 }
 
 static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
@@ -1281,7 +1363,8 @@ int git_open_cloexec(const char *name, int flags);
 int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
 int parse_loose_header(const char *hdr, unsigned long *sizep);
 
-int check_object_signature(const struct object_id *oid, void *buf, unsigned long size, const char *type);
+int check_object_signature(struct repository *r, const struct object_id *oid,
+			   void *buf, unsigned long size, const char *type);
 
 int finalize_object_file(const char *tmpfile, const char *filename);
 
@@ -1406,7 +1489,8 @@ int get_oid_hex(const char *hex, struct object_id *sha1);
 int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
 
 /*
- * Convert a binary hash to its hex equivalent. The `_r` variant is reentrant,
+ * Convert a binary hash in "unsigned char []" or an object name in
+ * "struct object_id *" to its hex equivalent. The `_r` variant is reentrant,
  * and writes the NUL-terminated output to the buffer `out`, which must be at
  * least `GIT_MAX_HEXSZ + 1` bytes, and returns a pointer to out for
  * convenience.
@@ -1414,13 +1498,12 @@ int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
  * The non-`_r` variant returns a static buffer, but uses a ring of 4
  * buffers, making it safe to make multiple calls for a single statement, like:
  *
- *   printf("%s -> %s", sha1_to_hex(one), sha1_to_hex(two));
+ *   printf("%s -> %s", hash_to_hex(one), hash_to_hex(two));
+ *   printf("%s -> %s", oid_to_hex(one), oid_to_hex(two));
  */
 char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash, const struct git_hash_algo *);
-char *sha1_to_hex_r(char *out, const unsigned char *sha1);
 char *oid_to_hex_r(char *out, const struct object_id *oid);
 char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *);	/* static buffer result! */
-char *sha1_to_hex(const unsigned char *sha1);						/* same static buffer */
 char *hash_to_hex(const unsigned char *hash);						/* same static buffer */
 char *oid_to_hex(const struct object_id *oid);						/* same static buffer */
 
@@ -1517,8 +1600,7 @@ struct date_mode {
 struct date_mode *date_mode_from_type(enum date_mode_type type);
 
 const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode);
-void show_date_relative(timestamp_t time, const struct timeval *now,
-			struct strbuf *timebuf);
+void show_date_relative(timestamp_t time, struct strbuf *timebuf);
 void show_date_human(timestamp_t time, int tz, const struct timeval *now,
 			struct strbuf *timebuf);
 int parse_date(const char *date, struct strbuf *out);
@@ -1527,7 +1609,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp);
 void datestamp(struct strbuf *out);
 #define approxidate(s) approxidate_careful((s), NULL)
 timestamp_t approxidate_careful(const char *, int *);
-timestamp_t approxidate_relative(const char *date, const struct timeval *now);
+timestamp_t approxidate_relative(const char *date);
 void parse_date_format(const char *format, struct date_mode *mode);
 int date_overflows(timestamp_t date);
 
diff --git a/third_party/git/ci/install-dependencies.sh b/third_party/git/ci/install-dependencies.sh
index 8cc72503cb76..497fd32ca837 100755
--- a/third_party/git/ci/install-dependencies.sh
+++ b/third_party/git/ci/install-dependencies.sh
@@ -40,20 +40,30 @@ osx-clang|osx-gcc)
 	test -z "$BREW_INSTALL_PACKAGES" ||
 	brew install $BREW_INSTALL_PACKAGES
 	brew link --force gettext
+	brew cask install --no-quarantine perforce || {
+		# Update the definitions and try again
+		cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask &&
+		git -C "$cask_repo" pull --no-stat &&
+		brew cask install --no-quarantine perforce
+	} ||
 	brew install caskroom/cask/perforce
 	case "$jobname" in
 	osx-gcc)
-		brew link gcc@8
+		brew install gcc@9
+		# Just in case the image is updated to contain gcc@9
+		# pre-installed but not linked.
+		brew link gcc@9
 		;;
 	esac
 	;;
 StaticAnalysis)
 	sudo apt-get -q update
-	sudo apt-get -q -y install coccinelle
+	sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
+		libexpat-dev gettext
 	;;
 Documentation)
 	sudo apt-get -q update
-	sudo apt-get -q -y install asciidoc xmlto
+	sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns
 
 	test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
 	gem install --version 1.5.8 asciidoctor
diff --git a/third_party/git/ci/lib.sh b/third_party/git/ci/lib.sh
index 44db2d5cbb22..a90d0dc0fd2a 100755
--- a/third_party/git/ci/lib.sh
+++ b/third_party/git/ci/lib.sh
@@ -34,6 +34,11 @@ save_good_tree () {
 # successfully before (e.g. because the branch got rebased, changing only
 # the commit messages).
 skip_good_tree () {
+	if test "$TRAVIS_DEBUG_MODE" = true
+	then
+		return
+	fi
+
 	if ! good_tree_info="$(grep "^$(git rev-parse $CI_COMMIT^{tree}) " "$good_trees_file")"
 	then
 		# Haven't seen this tree yet, or no cached good trees file yet.
@@ -126,7 +131,6 @@ then
 		echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1"
 	}
 
-	BREW_INSTALL_PACKAGES=gcc@8
 	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
 	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
 	MAKEFLAGS="$MAKEFLAGS --jobs=10"
@@ -151,7 +155,7 @@ fi
 
 export DEVELOPER=1
 export DEFAULT_TEST_TARGET=prove
-export GIT_TEST_CLONE_2GB=YesPlease
+export GIT_TEST_CLONE_2GB=true
 
 case "$jobname" in
 linux-clang|linux-gcc)
@@ -160,7 +164,7 @@ linux-clang|linux-gcc)
 		export CC=gcc-8
 	fi
 
-	export GIT_TEST_HTTPD=YesPlease
+	export GIT_TEST_HTTPD=true
 
 	# The Linux build installs the defined dependency versions below.
 	# The OS X build installs much more recent versions, whichever
@@ -177,7 +181,7 @@ linux-clang|linux-gcc)
 osx-clang|osx-gcc)
 	if [ "$jobname" = osx-gcc ]
 	then
-		export CC=gcc-8
+		export CC=gcc-9
 	fi
 
 	# t9810 occasionally fails on Travis CI OS X
diff --git a/third_party/git/ci/run-build-and-tests.sh b/third_party/git/ci/run-build-and-tests.sh
index ff0ef7f08e75..4df54c4efea8 100755
--- a/third_party/git/ci/run-build-and-tests.sh
+++ b/third_party/git/ci/run-build-and-tests.sh
@@ -20,6 +20,7 @@ linux-gcc)
 	export GIT_TEST_OE_DELTA_SIZE=5
 	export GIT_TEST_COMMIT_GRAPH=1
 	export GIT_TEST_MULTI_PACK_INDEX=1
+	export GIT_TEST_ADD_I_USE_BUILTIN=1
 	make test
 	;;
 linux-gcc-4.8)
diff --git a/third_party/git/ci/run-static-analysis.sh b/third_party/git/ci/run-static-analysis.sh
index a19aa7ebbc09..65bcebda41a0 100755
--- a/third_party/git/ci/run-static-analysis.sh
+++ b/third_party/git/ci/run-static-analysis.sh
@@ -26,4 +26,7 @@ then
 	exit 1
 fi
 
+make hdr-check ||
+exit 1
+
 save_good_tree
diff --git a/third_party/git/ci/test-documentation.sh b/third_party/git/ci/test-documentation.sh
index d49089832de0..de41888430a2 100755
--- a/third_party/git/ci/test-documentation.sh
+++ b/third_party/git/ci/test-documentation.sh
@@ -7,7 +7,10 @@
 
 filter_log () {
 	sed -e '/^GIT_VERSION = /d' \
+	    -e "/constant Gem::ConfigMap is deprecated/d" \
 	    -e '/^    \* new asciidoc flags$/d' \
+	    -e '/stripped namespace before processing/d' \
+	    -e '/Attributed.*IDs for element/d' \
 	    "$1"
 }
 
diff --git a/third_party/git/color.c b/third_party/git/color.c
index ebb222ec3323..64f52a4f93a2 100644
--- a/third_party/git/color.c
+++ b/third_party/git/color.c
@@ -24,6 +24,14 @@ const char *column_colors_ansi[] = {
 	GIT_COLOR_RESET,
 };
 
+enum {
+	COLOR_BACKGROUND_OFFSET = 10,
+	COLOR_FOREGROUND_ANSI = 30,
+	COLOR_FOREGROUND_RGB = 38,
+	COLOR_FOREGROUND_256 = 38,
+	COLOR_FOREGROUND_BRIGHT_ANSI = 90,
+};
+
 /* Ignore the RESET at the end when giving the size */
 const int column_colors_ansi_max = ARRAY_SIZE(column_colors_ansi) - 1;
 
@@ -61,15 +69,38 @@ static int get_hex_color(const char *in, unsigned char *out)
 	return 0;
 }
 
-static int parse_color(struct color *out, const char *name, int len)
+/*
+ * If an ANSI color is recognized in "name", fill "out" and return 0.
+ * Otherwise, leave out unchanged and return -1.
+ */
+static int parse_ansi_color(struct color *out, const char *name, int len)
 {
 	/* Positions in array must match ANSI color codes */
 	static const char * const color_names[] = {
 		"black", "red", "green", "yellow",
 		"blue", "magenta", "cyan", "white"
 	};
-	char *end;
 	int i;
+	int color_offset = COLOR_FOREGROUND_ANSI;
+
+	if (strncasecmp(name, "bright", 6) == 0) {
+		color_offset = COLOR_FOREGROUND_BRIGHT_ANSI;
+		name += 6;
+		len -= 6;
+	}
+	for (i = 0; i < ARRAY_SIZE(color_names); i++) {
+		if (match_word(name, len, color_names[i])) {
+			out->type = COLOR_ANSI;
+			out->value = i + color_offset;
+			return 0;
+		}
+	}
+	return -1;
+}
+
+static int parse_color(struct color *out, const char *name, int len)
+{
+	char *end;
 	long val;
 
 	/* First try the special word "normal"... */
@@ -89,12 +120,8 @@ static int parse_color(struct color *out, const char *name, int len)
 	}
 
 	/* Then pick from our human-readable color names... */
-	for (i = 0; i < ARRAY_SIZE(color_names); i++) {
-		if (match_word(name, len, color_names[i])) {
-			out->type = COLOR_ANSI;
-			out->value = i;
-			return 0;
-		}
+	if (parse_ansi_color(out, name, len) == 0) {
+		return 0;
 	}
 
 	/* And finally try a literal 256-color-mode number */
@@ -109,10 +136,15 @@ static int parse_color(struct color *out, const char *name, int len)
 		else if (val < 0) {
 			out->type = COLOR_NORMAL;
 			return 0;
-		/* Rewrite low numbers as more-portable standard colors. */
+		/* Rewrite 0-7 as more-portable standard colors. */
 		} else if (val < 8) {
 			out->type = COLOR_ANSI;
-			out->value = val;
+			out->value = val + COLOR_FOREGROUND_ANSI;
+			return 0;
+		/* Rewrite 8-15 as more-portable aixterm colors. */
+		} else if (val < 16) {
+			out->type = COLOR_ANSI;
+			out->value = val - 8 + COLOR_FOREGROUND_BRIGHT_ANSI;
 			return 0;
 		} else if (val < 256) {
 			out->type = COLOR_256;
@@ -166,23 +198,26 @@ int color_parse(const char *value, char *dst)
  * already have the ANSI escape code in it. "out" should have enough
  * space in it to fit any color.
  */
-static char *color_output(char *out, int len, const struct color *c, char type)
+static char *color_output(char *out, int len, const struct color *c, int background)
 {
+	int offset = 0;
+
+	if (background)
+		offset = COLOR_BACKGROUND_OFFSET;
 	switch (c->type) {
 	case COLOR_UNSPECIFIED:
 	case COLOR_NORMAL:
 		break;
 	case COLOR_ANSI:
-		if (len < 2)
-			BUG("color parsing ran out of space");
-		*out++ = type;
-		*out++ = '0' + c->value;
+		out += xsnprintf(out, len, "%d", c->value + offset);
 		break;
 	case COLOR_256:
-		out += xsnprintf(out, len, "%c8;5;%d", type, c->value);
+		out += xsnprintf(out, len, "%d;5;%d", COLOR_FOREGROUND_256 + offset,
+				 c->value);
 		break;
 	case COLOR_RGB:
-		out += xsnprintf(out, len, "%c8;2;%d;%d;%d", type,
+		out += xsnprintf(out, len, "%d;2;%d;%d;%d",
+				 COLOR_FOREGROUND_RGB + offset,
 				 c->red, c->green, c->blue);
 		break;
 	}
@@ -279,14 +314,12 @@ int color_parse_mem(const char *value, int value_len, char *dst)
 		if (!color_empty(&fg)) {
 			if (sep++)
 				OUT(';');
-			/* foreground colors are all in the 3x range */
-			dst = color_output(dst, end - dst, &fg, '3');
+			dst = color_output(dst, end - dst, &fg, 0);
 		}
 		if (!color_empty(&bg)) {
 			if (sep++)
 				OUT(';');
-			/* background colors are all in the 4x range */
-			dst = color_output(dst, end - dst, &bg, '4');
+			dst = color_output(dst, end - dst, &bg, 1);
 		}
 		OUT('m');
 	}
diff --git a/third_party/git/column.c b/third_party/git/column.c
index 7a17c14b822f..4a38eed32260 100644
--- a/third_party/git/column.c
+++ b/third_party/git/column.c
@@ -23,18 +23,7 @@ struct column_data {
 /* return length of 's' in letters, ANSI escapes stripped */
 static int item_length(const char *s)
 {
-	int len, i = 0;
-	struct strbuf str = STRBUF_INIT;
-
-	strbuf_addstr(&str, s);
-	while ((s = strstr(str.buf + i, "\033[")) != NULL) {
-		int len = strspn(s + 2, "0123456789;");
-		i = s - str.buf;
-		strbuf_remove(&str, i, len + 3); /* \033[<len><func char> */
-	}
-	len = utf8_strwidth(str.buf);
-	strbuf_release(&str);
-	return len;
+	return utf8_strnwidth(s, -1, 1);
 }
 
 /*
diff --git a/third_party/git/combine-diff.c b/third_party/git/combine-diff.c
index 3e49f3bda84b..d5c4d839dcf2 100644
--- a/third_party/git/combine-diff.c
+++ b/third_party/git/combine-diff.c
@@ -930,7 +930,7 @@ static void show_combined_header(struct combine_diff_path *elem,
 				 int show_file_header)
 {
 	struct diff_options *opt = &rev->diffopt;
-	int abbrev = opt->flags.full_index ? GIT_SHA1_HEXSZ : DEFAULT_ABBREV;
+	int abbrev = opt->flags.full_index ? the_hash_algo->hexsz : DEFAULT_ABBREV;
 	const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/";
 	const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/";
 	const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO);
diff --git a/third_party/git/command-list.txt b/third_party/git/command-list.txt
index a9ac72bef487..208789465588 100644
--- a/third_party/git/command-list.txt
+++ b/third_party/git/command-list.txt
@@ -166,6 +166,7 @@ git-show-index                          plumbinginterrogators
 git-show-ref                            plumbinginterrogators
 git-sh-i18n                             purehelpers
 git-sh-setup                            purehelpers
+git-sparse-checkout                     mainporcelain           worktree
 git-stash                               mainporcelain
 git-stage                                                               complete
 git-status                              mainporcelain           info
@@ -203,6 +204,7 @@ gitmodules                              guide
 gitnamespaces                           guide
 gitrepository-layout                    guide
 gitrevisions                            guide
+gitsubmodules                           guide
 gittutorial-2                           guide
 gittutorial                             guide
 gitworkflows                            guide
diff --git a/third_party/git/commit-graph.c b/third_party/git/commit-graph.c
index fe954ab5f845..f013a84e294b 100644
--- a/third_party/git/commit-graph.c
+++ b/third_party/git/commit-graph.c
@@ -41,30 +41,24 @@
 #define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * GRAPH_CHUNKLOOKUP_WIDTH \
 			+ GRAPH_FANOUT_SIZE + the_hash_algo->rawsz)
 
-char *get_commit_graph_filename(const char *obj_dir)
+/* Remember to update object flag allocation in object.h */
+#define REACHABLE       (1u<<15)
+
+char *get_commit_graph_filename(struct object_directory *odb)
 {
-	char *filename = xstrfmt("%s/info/commit-graph", obj_dir);
-	char *normalized = xmalloc(strlen(filename) + 1);
-	normalize_path_copy(normalized, filename);
-	free(filename);
-	return normalized;
+	return xstrfmt("%s/info/commit-graph", odb->path);
 }
 
-static char *get_split_graph_filename(const char *obj_dir,
+static char *get_split_graph_filename(struct object_directory *odb,
 				      const char *oid_hex)
 {
-	char *filename = xstrfmt("%s/info/commit-graphs/graph-%s.graph",
-				 obj_dir,
-				 oid_hex);
-	char *normalized = xmalloc(strlen(filename) + 1);
-	normalize_path_copy(normalized, filename);
-	free(filename);
-	return normalized;
+	return xstrfmt("%s/info/commit-graphs/graph-%s.graph", odb->path,
+		       oid_hex);
 }
 
-static char *get_chain_filename(const char *obj_dir)
+static char *get_chain_filename(struct object_directory *odb)
 {
-	return xstrfmt("%s/info/commit-graphs/commit-graph-chain", obj_dir);
+	return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb->path);
 }
 
 static uint8_t oid_version(void)
@@ -114,7 +108,8 @@ int open_commit_graph(const char *graph_file, int *fd, struct stat *st)
 	return 1;
 }
 
-struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st)
+struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st,
+						 struct object_directory *odb)
 {
 	void *graph_map;
 	size_t graph_size;
@@ -130,7 +125,9 @@ struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st)
 	graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	ret = parse_commit_graph(graph_map, fd, graph_size);
 
-	if (!ret) {
+	if (ret)
+		ret->odb = odb;
+	else {
 		munmap(graph_map, graph_size);
 		close(fd);
 	}
@@ -305,7 +302,8 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd,
 	return graph;
 }
 
-static struct commit_graph *load_commit_graph_one(const char *graph_file)
+static struct commit_graph *load_commit_graph_one(const char *graph_file,
+						  struct object_directory *odb)
 {
 
 	struct stat st;
@@ -316,7 +314,7 @@ static struct commit_graph *load_commit_graph_one(const char *graph_file)
 	if (!open_ok)
 		return NULL;
 
-	g = load_commit_graph_one_fd_st(fd, &st);
+	g = load_commit_graph_one_fd_st(fd, &st, odb);
 
 	if (g)
 		g->filename = xstrdup(graph_file);
@@ -324,15 +322,13 @@ static struct commit_graph *load_commit_graph_one(const char *graph_file)
 	return g;
 }
 
-static struct commit_graph *load_commit_graph_v1(struct repository *r, const char *obj_dir)
+static struct commit_graph *load_commit_graph_v1(struct repository *r,
+						 struct object_directory *odb)
 {
-	char *graph_name = get_commit_graph_filename(obj_dir);
-	struct commit_graph *g = load_commit_graph_one(graph_name);
+	char *graph_name = get_commit_graph_filename(odb);
+	struct commit_graph *g = load_commit_graph_one(graph_name, odb);
 	free(graph_name);
 
-	if (g)
-		g->obj_dir = obj_dir;
-
 	return g;
 }
 
@@ -369,14 +365,15 @@ static int add_graph_to_chain(struct commit_graph *g,
 	return 1;
 }
 
-static struct commit_graph *load_commit_graph_chain(struct repository *r, const char *obj_dir)
+static struct commit_graph *load_commit_graph_chain(struct repository *r,
+						    struct object_directory *odb)
 {
 	struct commit_graph *graph_chain = NULL;
 	struct strbuf line = STRBUF_INIT;
 	struct stat st;
 	struct object_id *oids;
 	int i = 0, valid = 1, count;
-	char *chain_name = get_chain_filename(obj_dir);
+	char *chain_name = get_chain_filename(odb);
 	FILE *fp;
 	int stat_res;
 
@@ -409,14 +406,12 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, const
 
 		valid = 0;
 		for (odb = r->objects->odb; odb; odb = odb->next) {
-			char *graph_name = get_split_graph_filename(odb->path, line.buf);
-			struct commit_graph *g = load_commit_graph_one(graph_name);
+			char *graph_name = get_split_graph_filename(odb, line.buf);
+			struct commit_graph *g = load_commit_graph_one(graph_name, odb);
 
 			free(graph_name);
 
 			if (g) {
-				g->obj_dir = odb->path;
-
 				if (add_graph_to_chain(g, graph_chain, oids, i)) {
 					graph_chain = g;
 					valid = 1;
@@ -439,47 +434,56 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, const
 	return graph_chain;
 }
 
-struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir)
+struct commit_graph *read_commit_graph_one(struct repository *r,
+					   struct object_directory *odb)
 {
-	struct commit_graph *g = load_commit_graph_v1(r, obj_dir);
+	struct commit_graph *g = load_commit_graph_v1(r, odb);
 
 	if (!g)
-		g = load_commit_graph_chain(r, obj_dir);
+		g = load_commit_graph_chain(r, odb);
 
 	return g;
 }
 
-static void prepare_commit_graph_one(struct repository *r, const char *obj_dir)
+static void prepare_commit_graph_one(struct repository *r,
+				     struct object_directory *odb)
 {
 
 	if (r->objects->commit_graph)
 		return;
 
-	r->objects->commit_graph = read_commit_graph_one(r, obj_dir);
+	r->objects->commit_graph = read_commit_graph_one(r, odb);
 }
 
 /*
  * Return 1 if commit_graph is non-NULL, and 0 otherwise.
  *
- * On the first invocation, this function attemps to load the commit
+ * On the first invocation, this function attempts to load the commit
  * graph if the_repository is configured to have one.
  */
 static int prepare_commit_graph(struct repository *r)
 {
 	struct object_directory *odb;
-	int config_value;
 
-	if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
-		die("dying as requested by the '%s' variable on commit-graph load!",
-		    GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD);
+	/*
+	 * This must come before the "already attempted?" check below, because
+	 * we want to disable even an already-loaded graph file.
+	 */
+	if (r->commit_graph_disabled)
+		return 0;
 
 	if (r->objects->commit_graph_attempted)
 		return !!r->objects->commit_graph;
 	r->objects->commit_graph_attempted = 1;
 
+	if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
+		die("dying as requested by the '%s' variable on commit-graph load!",
+		    GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD);
+
+	prepare_repo_settings(r);
+
 	if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
-	    (repo_config_get_bool(r, "core.commitgraph", &config_value) ||
-	    !config_value))
+	    r->settings.core_commit_graph != 1)
 		/*
 		 * This repository is not configured to use commit graphs, so
 		 * do not load one. (But report commit_graph_attempted anyway
@@ -495,7 +499,7 @@ static int prepare_commit_graph(struct repository *r)
 	for (odb = r->objects->odb;
 	     !r->objects->commit_graph && odb;
 	     odb = odb->next)
-		prepare_commit_graph_one(r, odb->path);
+		prepare_commit_graph_one(r, odb);
 	return !!r->objects->commit_graph;
 }
 
@@ -762,7 +766,7 @@ struct packed_oid_list {
 
 struct write_commit_graph_context {
 	struct repository *r;
-	char *obj_dir;
+	struct object_directory *odb;
 	char *graph_name;
 	struct packed_oid_list oids;
 	struct packed_commit_list commits;
@@ -783,7 +787,8 @@ struct write_commit_graph_context {
 
 	unsigned append:1,
 		 report_progress:1,
-		 split:1;
+		 split:1,
+		 check_oids:1;
 
 	const struct split_commit_graph_opts *split_opts;
 };
@@ -838,12 +843,16 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len,
 
 	while (list < last) {
 		struct commit_list *parent;
+		struct object_id *tree;
 		int edge_value;
 		uint32_t packedDate[2];
 		display_progress(ctx->progress, ++ctx->progress_cnt);
 
-		parse_commit_no_graph(*list);
-		hashwrite(f, get_commit_tree_oid(*list)->hash, hash_len);
+		if (parse_commit_no_graph(*list))
+			die(_("unable to parse commit %s"),
+				oid_to_hex(&(*list)->object.oid));
+		tree = get_commit_tree_oid(*list);
+		hashwrite(f, tree->hash, hash_len);
 
 		parent = (*list)->parents;
 
@@ -1015,11 +1024,11 @@ static void add_missing_parents(struct write_commit_graph_context *ctx, struct c
 {
 	struct commit_list *parent;
 	for (parent = commit->parents; parent; parent = parent->next) {
-		if (!(parent->item->object.flags & UNINTERESTING)) {
+		if (!(parent->item->object.flags & REACHABLE)) {
 			ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
 			oidcpy(&ctx->oids.list[ctx->oids.nr], &(parent->item->object.oid));
 			ctx->oids.nr++;
-			parent->item->object.flags |= UNINTERESTING;
+			parent->item->object.flags |= REACHABLE;
 		}
 	}
 }
@@ -1037,7 +1046,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
 		display_progress(ctx->progress, i + 1);
 		commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
 		if (commit)
-			commit->object.flags |= UNINTERESTING;
+			commit->object.flags |= REACHABLE;
 	}
 	stop_progress(&ctx->progress);
 
@@ -1049,7 +1058,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
 	if (ctx->report_progress)
 		ctx->progress = start_delayed_progress(
 					_("Expanding reachable commits in commit graph"),
-					ctx->oids.nr);
+					0);
 	for (i = 0; i < ctx->oids.nr; i++) {
 		display_progress(ctx->progress, i + 1);
 		commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
@@ -1074,7 +1083,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
 		commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
 
 		if (commit)
-			commit->object.flags &= ~UNINTERESTING;
+			commit->object.flags &= ~REACHABLE;
 	}
 	stop_progress(&ctx->progress);
 }
@@ -1085,7 +1094,7 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx)
 	struct commit_list *list = NULL;
 
 	if (ctx->report_progress)
-		ctx->progress = start_progress(
+		ctx->progress = start_delayed_progress(
 					_("Computing commit graph generation numbers"),
 					ctx->commits.nr);
 	for (i = 0; i < ctx->commits.nr; i++) {
@@ -1134,14 +1143,15 @@ static int add_ref_to_list(const char *refname,
 	return 0;
 }
 
-int write_commit_graph_reachable(const char *obj_dir, unsigned int flags,
+int write_commit_graph_reachable(struct object_directory *odb,
+				 enum commit_graph_write_flags flags,
 				 const struct split_commit_graph_opts *split_opts)
 {
 	struct string_list list = STRING_LIST_INIT_DUP;
 	int result;
 
 	for_each_ref(add_ref_to_list, &list);
-	result = write_commit_graph(obj_dir, NULL, &list,
+	result = write_commit_graph(odb, NULL, &list,
 				    flags, split_opts);
 
 	string_list_clear(&list, 0);
@@ -1156,7 +1166,7 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
 	struct strbuf packname = STRBUF_INIT;
 	int dirlen;
 
-	strbuf_addf(&packname, "%s/pack/", ctx->obj_dir);
+	strbuf_addf(&packname, "%s/pack/", ctx->odb->path);
 	dirlen = packname.len;
 	if (ctx->report_progress) {
 		strbuf_addf(&progress_title,
@@ -1193,8 +1203,8 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
 	return 0;
 }
 
-static void fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
-				      struct string_list *commit_hex)
+static int fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
+				     struct string_list *commit_hex)
 {
 	uint32_t i;
 	struct strbuf progress_title = STRBUF_INIT;
@@ -1215,20 +1225,21 @@ static void fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
 		struct commit *result;
 
 		display_progress(ctx->progress, i + 1);
-		if (commit_hex->items[i].string &&
-		    parse_oid_hex(commit_hex->items[i].string, &oid, &end))
-			continue;
-
-		result = lookup_commit_reference_gently(ctx->r, &oid, 1);
-
-		if (result) {
+		if (!parse_oid_hex(commit_hex->items[i].string, &oid, &end) &&
+		    (result = lookup_commit_reference_gently(ctx->r, &oid, 1))) {
 			ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
 			oidcpy(&ctx->oids.list[ctx->oids.nr], &(result->object.oid));
 			ctx->oids.nr++;
+		} else if (ctx->check_oids) {
+			error(_("invalid commit object id: %s"),
+			    commit_hex->items[i].string);
+			return -1;
 		}
 	}
 	stop_progress(&ctx->progress);
 	strbuf_release(&progress_title);
+
+	return 0;
 }
 
 static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)
@@ -1276,7 +1287,6 @@ static uint32_t count_distinct_commits(struct write_commit_graph_context *ctx)
 static void copy_oids_to_commits(struct write_commit_graph_context *ctx)
 {
 	uint32_t i;
-	struct commit_list *parent;
 
 	ctx->num_extra_edges = 0;
 	if (ctx->report_progress)
@@ -1284,7 +1294,8 @@ static void copy_oids_to_commits(struct write_commit_graph_context *ctx)
 			_("Finding extra edges in commit graph"),
 			ctx->oids.nr);
 	for (i = 0; i < ctx->oids.nr; i++) {
-		int num_parents = 0;
+		unsigned int num_parents;
+
 		display_progress(ctx->progress, i + 1);
 		if (i > 0 && oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i]))
 			continue;
@@ -1298,10 +1309,7 @@ static void copy_oids_to_commits(struct write_commit_graph_context *ctx)
 
 		parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]);
 
-		for (parent = ctx->commits.list[ctx->commits.nr]->parents;
-		     parent; parent = parent->next)
-			num_parents++;
-
+		num_parents = commit_list_count(ctx->commits.list[ctx->commits.nr]->parents);
 		if (num_parents > 2)
 			ctx->num_extra_edges += num_parents - 1;
 
@@ -1354,10 +1362,10 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 
 		strbuf_addf(&tmp_file,
 			    "%s/info/commit-graphs/tmp_graph_XXXXXX",
-			    ctx->obj_dir);
+			    ctx->odb->path);
 		ctx->graph_name = strbuf_detach(&tmp_file, NULL);
 	} else {
-		ctx->graph_name = get_commit_graph_filename(ctx->obj_dir);
+		ctx->graph_name = get_commit_graph_filename(ctx->odb);
 	}
 
 	if (safe_create_leading_directories(ctx->graph_name)) {
@@ -1368,7 +1376,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 	}
 
 	if (ctx->split) {
-		char *lock_name = get_chain_filename(ctx->obj_dir);
+		char *lock_name = get_chain_filename(ctx->odb);
 
 		hold_lock_file_for_update(&lk, lock_name, LOCK_DIE_ON_ERROR);
 
@@ -1456,7 +1464,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 
 	if (ctx->split && ctx->base_graph_name && ctx->num_commit_graphs_after > 1) {
 		char *new_base_hash = xstrdup(oid_to_hex(&ctx->new_base_graph->oid));
-		char *new_base_name = get_split_graph_filename(ctx->new_base_graph->obj_dir, new_base_hash);
+		char *new_base_name = get_split_graph_filename(ctx->new_base_graph->odb, new_base_hash);
 
 		free(ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 2]);
 		free(ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 2]);
@@ -1492,12 +1500,12 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 				}
 			}
 		} else {
-			char *graph_name = get_commit_graph_filename(ctx->obj_dir);
+			char *graph_name = get_commit_graph_filename(ctx->odb);
 			unlink(graph_name);
 		}
 
 		ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1] = xstrdup(oid_to_hex(&file_hash));
-		final_graph_name = get_split_graph_filename(ctx->obj_dir,
+		final_graph_name = get_split_graph_filename(ctx->odb,
 					ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1]);
 		ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 1] = final_graph_name;
 
@@ -1519,8 +1527,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 
 static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
 {
-	struct commit_graph *g = ctx->r->objects->commit_graph;
-	uint32_t num_commits = ctx->commits.nr;
+	struct commit_graph *g;
+	uint32_t num_commits;
 	uint32_t i;
 
 	int max_commits = 0;
@@ -1528,15 +1536,18 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
 
 	if (ctx->split_opts) {
 		max_commits = ctx->split_opts->max_commits;
-		size_mult = ctx->split_opts->size_multiple;
+
+		if (ctx->split_opts->size_multiple)
+			size_mult = ctx->split_opts->size_multiple;
 	}
 
 	g = ctx->r->objects->commit_graph;
+	num_commits = ctx->commits.nr;
 	ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1;
 
 	while (g && (g->num_commits <= size_mult * num_commits ||
 		    (max_commits && num_commits > max_commits))) {
-		if (strcmp(g->obj_dir, ctx->obj_dir))
+		if (g->odb != ctx->odb)
 			break;
 
 		num_commits += g->num_commits;
@@ -1548,10 +1559,10 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
 	ctx->new_base_graph = g;
 
 	if (ctx->num_commit_graphs_after == 2) {
-		char *old_graph_name = get_commit_graph_filename(g->obj_dir);
+		char *old_graph_name = get_commit_graph_filename(g->odb);
 
 		if (!strcmp(g->filename, old_graph_name) &&
-		    strcmp(g->obj_dir, ctx->obj_dir)) {
+		    g->odb != ctx->odb) {
 			ctx->num_commit_graphs_after = 1;
 			ctx->new_base_graph = NULL;
 		}
@@ -1613,8 +1624,7 @@ static int commit_compare(const void *_a, const void *_b)
 
 static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx)
 {
-	uint32_t i, num_parents;
-	struct commit_list *parent;
+	uint32_t i;
 
 	if (ctx->report_progress)
 		ctx->progress = start_delayed_progress(
@@ -1632,10 +1642,9 @@ static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx)
 			die(_("unexpected duplicate commit id %s"),
 			    oid_to_hex(&ctx->commits.list[i]->object.oid));
 		} else {
-			num_parents = 0;
-			for (parent = ctx->commits.list[i]->parents; parent; parent = parent->next)
-				num_parents++;
+			unsigned int num_parents;
 
+			num_parents = commit_list_count(ctx->commits.list[i]->parents);
 			if (num_parents > 2)
 				ctx->num_extra_edges += num_parents - 1;
 		}
@@ -1648,19 +1657,15 @@ static void merge_commit_graphs(struct write_commit_graph_context *ctx)
 {
 	struct commit_graph *g = ctx->r->objects->commit_graph;
 	uint32_t current_graph_number = ctx->num_commit_graphs_before;
-	struct strbuf progress_title = STRBUF_INIT;
 
 	while (g && current_graph_number >= ctx->num_commit_graphs_after) {
 		current_graph_number--;
 
-		if (ctx->report_progress) {
-			strbuf_addstr(&progress_title, _("Merging commit-graph"));
-			ctx->progress = start_delayed_progress(progress_title.buf, 0);
-		}
+		if (ctx->report_progress)
+			ctx->progress = start_delayed_progress(_("Merging commit-graph"), 0);
 
 		merge_commit_graph(ctx, g);
 		stop_progress(&ctx->progress);
-		strbuf_release(&progress_title);
 
 		g = g->base_graph;
 	}
@@ -1704,13 +1709,13 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
 	if (ctx->split_opts && ctx->split_opts->expire_time)
 		expire_time -= ctx->split_opts->expire_time;
 	if (!ctx->split) {
-		char *chain_file_name = get_chain_filename(ctx->obj_dir);
+		char *chain_file_name = get_chain_filename(ctx->odb);
 		unlink(chain_file_name);
 		free(chain_file_name);
 		ctx->num_commit_graphs_after = 0;
 	}
 
-	strbuf_addstr(&path, ctx->obj_dir);
+	strbuf_addstr(&path, ctx->odb->path);
 	strbuf_addstr(&path, "/info/commit-graphs");
 	dir = opendir(path.buf);
 
@@ -1749,15 +1754,14 @@ out:
 	strbuf_release(&path);
 }
 
-int write_commit_graph(const char *obj_dir,
+int write_commit_graph(struct object_directory *odb,
 		       struct string_list *pack_indexes,
 		       struct string_list *commit_hex,
-		       unsigned int flags,
+		       enum commit_graph_write_flags flags,
 		       const struct split_commit_graph_opts *split_opts)
 {
 	struct write_commit_graph_context *ctx;
 	uint32_t i, count_distinct = 0;
-	size_t len;
 	int res = 0;
 
 	if (!commit_graph_compatible(the_repository))
@@ -1765,17 +1769,11 @@ int write_commit_graph(const char *obj_dir,
 
 	ctx = xcalloc(1, sizeof(struct write_commit_graph_context));
 	ctx->r = the_repository;
-
-	/* normalize object dir with no trailing slash */
-	ctx->obj_dir = xmallocz(strlen(obj_dir) + 1);
-	normalize_path_copy(ctx->obj_dir, obj_dir);
-	len = strlen(ctx->obj_dir);
-	if (len && ctx->obj_dir[len - 1] == '/')
-		ctx->obj_dir[len - 1] = 0;
-
-	ctx->append = flags & COMMIT_GRAPH_APPEND ? 1 : 0;
-	ctx->report_progress = flags & COMMIT_GRAPH_PROGRESS ? 1 : 0;
-	ctx->split = flags & COMMIT_GRAPH_SPLIT ? 1 : 0;
+	ctx->odb = odb;
+	ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0;
+	ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0;
+	ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0;
+	ctx->check_oids = flags & COMMIT_GRAPH_WRITE_CHECK_OIDS ? 1 : 0;
 	ctx->split_opts = split_opts;
 
 	if (ctx->split) {
@@ -1808,7 +1806,7 @@ int write_commit_graph(const char *obj_dir,
 		ctx->oids.alloc = split_opts->max_commits;
 
 	if (ctx->append) {
-		prepare_commit_graph_one(ctx->r, ctx->obj_dir);
+		prepare_commit_graph_one(ctx->r, ctx->odb);
 		if (ctx->r->objects->commit_graph)
 			ctx->oids.alloc += ctx->r->objects->commit_graph->num_commits;
 	}
@@ -1830,8 +1828,10 @@ int write_commit_graph(const char *obj_dir,
 			goto cleanup;
 	}
 
-	if (commit_hex)
-		fill_oids_from_commit_hex(ctx, commit_hex);
+	if (commit_hex) {
+		if ((res = fill_oids_from_commit_hex(ctx, commit_hex)))
+			goto cleanup;
+	}
 
 	if (!pack_indexes && !commit_hex)
 		fill_oids_from_all_packs(ctx);
@@ -1880,7 +1880,6 @@ cleanup:
 	free(ctx->graph_name);
 	free(ctx->commits.list);
 	free(ctx->oids.list);
-	free(ctx->obj_dir);
 
 	if (ctx->commit_graph_filenames_after) {
 		for (i = 0; i < ctx->num_commit_graphs_after; i++) {
@@ -1986,8 +1985,10 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 	if (verify_commit_graph_error & ~VERIFY_COMMIT_GRAPH_ERROR_HASH)
 		return verify_commit_graph_error;
 
-	progress = start_progress(_("Verifying commits in commit graph"),
-				  g->num_commits);
+	if (flags & COMMIT_GRAPH_WRITE_PROGRESS)
+		progress = start_progress(_("Verifying commits in commit graph"),
+					g->num_commits);
+
 	for (i = 0; i < g->num_commits; i++) {
 		struct commit *graph_commit, *odb_commit;
 		struct commit_list *graph_parents, *odb_parents;
@@ -2095,3 +2096,8 @@ void free_commit_graph(struct commit_graph *g)
 	free(g->filename);
 	free(g);
 }
+
+void disable_commit_graph(struct repository *r)
+{
+	r->commit_graph_disabled = 1;
+}
diff --git a/third_party/git/commit-graph.h b/third_party/git/commit-graph.h
index df9a3b20e4ab..e87a6f636000 100644
--- a/third_party/git/commit-graph.h
+++ b/third_party/git/commit-graph.h
@@ -5,13 +5,14 @@
 #include "repository.h"
 #include "string-list.h"
 #include "cache.h"
+#include "object-store.h"
 
 #define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH"
 #define GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD "GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD"
 
 struct commit;
 
-char *get_commit_graph_filename(const char *obj_dir);
+char *get_commit_graph_filename(struct object_directory *odb);
 int open_commit_graph(const char *graph_file, int *fd, struct stat *st);
 
 /*
@@ -48,7 +49,7 @@ struct commit_graph {
 	uint32_t num_commits;
 	struct object_id oid;
 	char *filename;
-	const char *obj_dir;
+	struct object_directory *odb;
 
 	uint32_t num_commits_in_base;
 	struct commit_graph *base_graph;
@@ -60,8 +61,10 @@ struct commit_graph {
 	const unsigned char *chunk_base_graphs;
 };
 
-struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st);
-struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir);
+struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st,
+						 struct object_directory *odb);
+struct commit_graph *read_commit_graph_one(struct repository *r,
+					   struct object_directory *odb);
 struct commit_graph *parse_commit_graph(void *graph_map, int fd,
 					size_t graph_size);
 
@@ -71,9 +74,13 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd,
  */
 int generation_numbers_enabled(struct repository *r);
 
-#define COMMIT_GRAPH_APPEND     (1 << 0)
-#define COMMIT_GRAPH_PROGRESS   (1 << 1)
-#define COMMIT_GRAPH_SPLIT      (1 << 2)
+enum commit_graph_write_flags {
+	COMMIT_GRAPH_WRITE_APPEND     = (1 << 0),
+	COMMIT_GRAPH_WRITE_PROGRESS   = (1 << 1),
+	COMMIT_GRAPH_WRITE_SPLIT      = (1 << 2),
+	/* Make sure that each OID in the input is a valid commit OID. */
+	COMMIT_GRAPH_WRITE_CHECK_OIDS = (1 << 3)
+};
 
 struct split_commit_graph_opts {
 	int size_multiple;
@@ -87,12 +94,13 @@ struct split_commit_graph_opts {
  * is not compatible with the commit-graph feature, then the
  * methods will return 0 without writing a commit-graph.
  */
-int write_commit_graph_reachable(const char *obj_dir, unsigned int flags,
+int write_commit_graph_reachable(struct object_directory *odb,
+				 enum commit_graph_write_flags flags,
 				 const struct split_commit_graph_opts *split_opts);
-int write_commit_graph(const char *obj_dir,
+int write_commit_graph(struct object_directory *odb,
 		       struct string_list *pack_indexes,
 		       struct string_list *commit_hex,
-		       unsigned int flags,
+		       enum commit_graph_write_flags flags,
 		       const struct split_commit_graph_opts *split_opts);
 
 #define COMMIT_GRAPH_VERIFY_SHALLOW	(1 << 0)
@@ -102,4 +110,10 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 void close_commit_graph(struct raw_object_store *);
 void free_commit_graph(struct commit_graph *);
 
+/*
+ * Disable further use of the commit graph in this process when parsing a
+ * "struct commit".
+ */
+void disable_commit_graph(struct repository *r);
+
 #endif
diff --git a/third_party/git/commit-reach.c b/third_party/git/commit-reach.c
index 3ea174788a4f..4ca7e706a18e 100644
--- a/third_party/git/commit-reach.c
+++ b/third_party/git/commit-reach.c
@@ -10,7 +10,6 @@
 #include "commit-reach.h"
 
 /* Remember to update object flag allocation in object.h */
-#define REACHABLE       (1u<<15)
 #define PARENT1		(1u<<16)
 #define PARENT2		(1u<<17)
 #define STALE		(1u<<18)
diff --git a/third_party/git/commit.c b/third_party/git/commit.c
index a98de16e3d57..a6cfa41a4e31 100644
--- a/third_party/git/commit.c
+++ b/third_party/git/commit.c
@@ -19,6 +19,7 @@
 #include "advice.h"
 #include "refs.h"
 #include "commit-reach.h"
+#include "run-command.h"
 
 static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
 
@@ -358,14 +359,15 @@ struct tree *repo_get_commit_tree(struct repository *r,
 
 struct object_id *get_commit_tree_oid(const struct commit *commit)
 {
-	return &get_commit_tree(commit)->object.oid;
+	struct tree *tree = get_commit_tree(commit);
+	return tree ? &tree->object.oid : NULL;
 }
 
 void release_commit_memory(struct parsed_object_pool *pool, struct commit *c)
 {
 	set_commit_tree(c, NULL);
-	c->index = 0;
 	free_commit_buffer(pool, c);
+	c->index = 0;
 	free_commit_list(c->parents);
 
 	c->object.parsed = 0;
@@ -400,10 +402,22 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 	struct commit_graft *graft;
 	const int tree_entry_len = the_hash_algo->hexsz + 5;
 	const int parent_entry_len = the_hash_algo->hexsz + 7;
+	struct tree *tree;
 
 	if (item->object.parsed)
 		return 0;
-	item->object.parsed = 1;
+
+	if (item->parents) {
+		/*
+		 * Presumably this is leftover from an earlier failed parse;
+		 * clear it out in preparation for us re-parsing (we'll hit the
+		 * same error, but that's good, since it lets our caller know
+		 * the result cannot be trusted.
+		 */
+		free_commit_list(item->parents);
+		item->parents = NULL;
+	}
+
 	tail += size;
 	if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
 			bufptr[tree_entry_len] != '\n')
@@ -411,7 +425,12 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 	if (get_oid_hex(bufptr + 5, &parent) < 0)
 		return error("bad tree pointer in commit %s",
 			     oid_to_hex(&item->object.oid));
-	set_commit_tree(item, lookup_tree(r, &parent));
+	tree = lookup_tree(r, &parent);
+	if (!tree)
+		return error("bad tree pointer %s in commit %s",
+			     oid_to_hex(&parent),
+			     oid_to_hex(&item->object.oid));
+	set_commit_tree(item, tree);
 	bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
 	pptr = &item->parents;
 
@@ -431,8 +450,11 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 		if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
 			continue;
 		new_parent = lookup_commit(r, &parent);
-		if (new_parent)
-			pptr = &commit_list_insert(new_parent, pptr)->next;
+		if (!new_parent)
+			return error("bad parent %s in commit %s",
+				     oid_to_hex(&parent),
+				     oid_to_hex(&item->object.oid));
+		pptr = &commit_list_insert(new_parent, pptr)->next;
 	}
 	if (graft) {
 		int i;
@@ -441,7 +463,9 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 			new_parent = lookup_commit(r,
 						   &graft->parent[i]);
 			if (!new_parent)
-				continue;
+				return error("bad graft parent %s in commit %s",
+					     oid_to_hex(&graft->parent[i]),
+					     oid_to_hex(&item->object.oid));
 			pptr = &commit_list_insert(new_parent, pptr)->next;
 		}
 	}
@@ -450,6 +474,7 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 	if (check_graph)
 		load_commit_graph_info(r, item);
 
+	item->object.parsed = 1;
 	return 0;
 }
 
@@ -968,7 +993,7 @@ static int do_sign_commit(struct strbuf *buf, const char *keyid)
 			strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
 			inspos += gpg_sig_header_len;
 		}
-		strbuf_insert(buf, inspos++, " ", 1);
+		strbuf_insertstr(buf, inspos++, " ");
 		strbuf_insert(buf, inspos, bol, len);
 		inspos += len;
 		copypos += len;
@@ -1111,21 +1136,23 @@ int check_commit_signature(const struct commit *commit, struct signature_check *
 	return ret;
 }
 
-void verify_merge_signature(struct commit *commit, int verbosity)
+void verify_merge_signature(struct commit *commit, int verbosity,
+			    int check_trust)
 {
 	char hex[GIT_MAX_HEXSZ + 1];
 	struct signature_check signature_check;
+	int ret;
 	memset(&signature_check, 0, sizeof(signature_check));
 
-	check_commit_signature(commit, &signature_check);
+	ret = check_commit_signature(commit, &signature_check);
 
 	find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);
 	switch (signature_check.result) {
 	case 'G':
+		if (ret || (check_trust && signature_check.trust_level < TRUST_MARGINAL))
+			die(_("Commit %s has an untrusted GPG signature, "
+			      "allegedly by %s."), hex, signature_check.signer);
 		break;
-	case 'U':
-		die(_("Commit %s has an untrusted GPG signature, "
-		      "allegedly by %s."), hex, signature_check.signer);
 	case 'B':
 		die(_("Commit %s has a bad GPG signature "
 		      "allegedly by %s."), hex, signature_check.signer);
@@ -1580,3 +1607,26 @@ size_t ignore_non_trailer(const char *buf, size_t len)
 	}
 	return boc ? len - boc : len - cutoff;
 }
+
+int run_commit_hook(int editor_is_used, const char *index_file,
+		    const char *name, ...)
+{
+	struct argv_array hook_env = ARGV_ARRAY_INIT;
+	va_list args;
+	int ret;
+
+	argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file);
+
+	/*
+	 * Let the hook know that no editor will be launched.
+	 */
+	if (!editor_is_used)
+		argv_array_push(&hook_env, "GIT_EDITOR=:");
+
+	va_start(args, name);
+	ret = run_hook_ve(hook_env.argv,name, args);
+	va_end(args);
+	argv_array_clear(&hook_env);
+
+	return ret;
+}
diff --git a/third_party/git/commit.h b/third_party/git/commit.h
index f5295ca7f3ef..008a0fa4a01d 100644
--- a/third_party/git/commit.h
+++ b/third_party/git/commit.h
@@ -132,7 +132,7 @@ const void *repo_get_commit_buffer(struct repository *r,
 #endif
 
 /*
- * Tell the commit subsytem that we are done with a particular commit buffer.
+ * Tell the commit subsystem that we are done with a particular commit buffer.
  * The commit and buffer should be the input and return value, respectively,
  * from an earlier call to get_commit_buffer.  The buffer may or may not be
  * freed by this call; callers should not access the memory afterwards.
@@ -383,8 +383,18 @@ int compare_commits_by_author_date(const void *a_, const void *b_, void *unused)
  * Verify a single commit with check_commit_signature() and die() if it is not
  * a good signature. This isn't really suitable for general use, but is a
  * helper to implement consistent logic for pull/merge --verify-signatures.
+ *
+ * The check_trust parameter is meant for backward-compatibility.  The GPG
+ * interface verifies key trust with a default trust level that is below the
+ * default trust level for merge operations.  Its value should be non-zero if
+ * the user hasn't set a minimum trust level explicitly in their configuration.
+ *
+ * If the user has set a minimum trust level, then that value should be obeyed
+ * and check_trust should be zero, even if the configured trust level is below
+ * the default trust level for merges.
  */
-void verify_merge_signature(struct commit *commit, int verbose);
+void verify_merge_signature(struct commit *commit, int verbose,
+			    int check_trust);
 
 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
 int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
diff --git a/third_party/git/common-main.c b/third_party/git/common-main.c
index 582a7b18869f..71e21dd20a3b 100644
--- a/third_party/git/common-main.c
+++ b/third_party/git/common-main.c
@@ -39,16 +39,16 @@ int main(int argc, const char **argv)
 
 	git_resolve_executable_dir(argv[0]);
 
-	trace2_initialize();
-	trace2_cmd_start(argv);
-	trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
-
 	git_setup_gettext();
 
 	initialize_the_repository();
 
 	attr_start();
 
+	trace2_initialize();
+	trace2_cmd_start(argv);
+	trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
+
 	result = cmd_main(argc, argv);
 
 	trace2_cmd_exit(result);
diff --git a/third_party/git/compat/mingw.c b/third_party/git/compat/mingw.c
index 738f0a826a51..d14065d60ec4 100644
--- a/third_party/git/compat/mingw.c
+++ b/third_party/git/compat/mingw.c
@@ -13,6 +13,19 @@
 
 static const int delay[] = { 0, 1, 10, 20, 40 };
 
+void open_in_gdb(void)
+{
+	static struct child_process cp = CHILD_PROCESS_INIT;
+	extern char *_pgmptr;
+
+	argv_array_pushl(&cp.args, "mintty", "gdb", NULL);
+	argv_array_pushf(&cp.args, "--pid=%d", getpid());
+	cp.clean_on_exit = 1;
+	if (start_command(&cp) < 0)
+		die_errno("Could not start gdb");
+	sleep(1);
+}
+
 int err_win_to_posix(DWORD winerr)
 {
 	int error = ENOSYS;
@@ -114,6 +127,7 @@ int err_win_to_posix(DWORD winerr)
 	case ERROR_SHARING_BUFFER_EXCEEDED: error = ENFILE; break;
 	case ERROR_SHARING_VIOLATION: error = EACCES; break;
 	case ERROR_STACK_OVERFLOW: error = ENOMEM; break;
+	case ERROR_SUCCESS: BUG("err_win_to_posix() called without an error!");
 	case ERROR_SWAPERROR: error = ENOENT; break;
 	case ERROR_TOO_MANY_MODULES: error = EMFILE; break;
 	case ERROR_TOO_MANY_OPEN_FILES: error = EMFILE; break;
@@ -212,6 +226,7 @@ enum hide_dotfiles_type {
 	HIDE_DOTFILES_DOTGITONLY
 };
 
+static int core_restrict_inherited_handles = -1;
 static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
 static char *unset_environment_variables;
 
@@ -231,6 +246,15 @@ int mingw_core_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "core.restrictinheritedhandles")) {
+		if (value && !strcasecmp(value, "auto"))
+			core_restrict_inherited_handles = -1;
+		else
+			core_restrict_inherited_handles =
+				git_config_bool(var, value);
+		return 0;
+	}
+
 	return 0;
 }
 
@@ -363,6 +387,8 @@ static inline int needs_hiding(const char *path)
 			/* ignore trailing slashes */
 			if (*path)
 				basename = path;
+			else
+				break;
 		}
 
 	if (hide_dotfiles == HIDE_DOTFILES_TRUE)
@@ -390,6 +416,12 @@ int mingw_mkdir(const char *path, int mode)
 {
 	int ret;
 	wchar_t wpath[MAX_PATH];
+
+	if (!is_valid_win32_path(path, 0)) {
+		errno = EINVAL;
+		return -1;
+	}
+
 	if (xutftowcs_path(wpath, path) < 0)
 		return -1;
 	ret = _wmkdir(wpath);
@@ -463,7 +495,7 @@ int mingw_open (const char *filename, int oflags, ...)
 	typedef int (*open_fn_t)(wchar_t const *wfilename, int oflags, ...);
 	va_list args;
 	unsigned mode;
-	int fd;
+	int fd, create = (oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL);
 	wchar_t wfilename[MAX_PATH];
 	open_fn_t open_fn;
 
@@ -471,16 +503,21 @@ int mingw_open (const char *filename, int oflags, ...)
 	mode = va_arg(args, int);
 	va_end(args);
 
-	if (filename && !strcmp(filename, "/dev/null"))
-		filename = "nul";
+	if (!is_valid_win32_path(filename, !create)) {
+		errno = create ? EINVAL : ENOENT;
+		return -1;
+	}
 
 	if ((oflags & O_APPEND) && !is_local_named_pipe_path(filename))
 		open_fn = mingw_open_append;
 	else
 		open_fn = _wopen;
 
-	if (xutftowcs_path(wfilename, filename) < 0)
+	if (filename && !strcmp(filename, "/dev/null"))
+		wcscpy(wfilename, L"nul");
+	else if (xutftowcs_path(wfilename, filename) < 0)
 		return -1;
+
 	fd = open_fn(wfilename, oflags, mode);
 
 	if (fd < 0 && (oflags & O_ACCMODE) != O_RDONLY && errno == EACCES) {
@@ -538,10 +575,17 @@ FILE *mingw_fopen (const char *filename, const char *otype)
 	FILE *file;
 	wchar_t wfilename[MAX_PATH], wotype[4];
 	if (filename && !strcmp(filename, "/dev/null"))
-		filename = "nul";
-	if (xutftowcs_path(wfilename, filename) < 0 ||
-		xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
+		wcscpy(wfilename, L"nul");
+	else if (!is_valid_win32_path(filename, 1)) {
+		int create = otype && strchr(otype, 'w');
+		errno = create ? EINVAL : ENOENT;
+		return NULL;
+	} else if (xutftowcs_path(wfilename, filename) < 0)
+		return NULL;
+
+	if (xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
 		return NULL;
+
 	if (hide && !access(filename, F_OK) && set_hidden_flag(wfilename, 0)) {
 		error("could not unhide %s", filename);
 		return NULL;
@@ -560,10 +604,17 @@ FILE *mingw_freopen (const char *filename, const char *otype, FILE *stream)
 	FILE *file;
 	wchar_t wfilename[MAX_PATH], wotype[4];
 	if (filename && !strcmp(filename, "/dev/null"))
-		filename = "nul";
-	if (xutftowcs_path(wfilename, filename) < 0 ||
-		xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
+		wcscpy(wfilename, L"nul");
+	else if (!is_valid_win32_path(filename, 1)) {
+		int create = otype && strchr(otype, 'w');
+		errno = create ? EINVAL : ENOENT;
+		return NULL;
+	} else if (xutftowcs_path(wfilename, filename) < 0)
+		return NULL;
+
+	if (xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
 		return NULL;
+
 	if (hide && !access(filename, F_OK) && set_hidden_flag(wfilename, 0)) {
 		error("could not unhide %s", filename);
 		return NULL;
@@ -984,16 +1035,16 @@ int pipe(int filedes[2])
 
 struct tm *gmtime_r(const time_t *timep, struct tm *result)
 {
-	/* gmtime() in MSVCRT.DLL is thread-safe, but not reentrant */
-	memcpy(result, gmtime(timep), sizeof(struct tm));
-	return result;
+	if (gmtime_s(result, timep) == 0)
+		return result;
+	return NULL;
 }
 
 struct tm *localtime_r(const time_t *timep, struct tm *result)
 {
-	/* localtime() in MSVCRT.DLL is thread-safe, but not reentrant */
-	memcpy(result, localtime(timep), sizeof(struct tm));
-	return result;
+	if (localtime_s(result, timep) == 0)
+		return result;
+	return NULL;
 }
 
 char *mingw_getcwd(char *pointer, int len)
@@ -1052,7 +1103,7 @@ static const char *quote_arg_msvc(const char *arg)
 				p++;
 				len++;
 			}
-			if (*p == '"')
+			if (*p == '"' || !*p)
 				n += count*2 + 1;
 			continue;
 		}
@@ -1074,16 +1125,19 @@ static const char *quote_arg_msvc(const char *arg)
 				count++;
 				*d++ = *arg++;
 			}
-			if (*arg == '"') {
+			if (*arg == '"' || !*arg) {
 				while (count-- > 0)
 					*d++ = '\\';
+				/* don't escape the surrounding end quote */
+				if (!*arg)
+					break;
 				*d++ = '\\';
 			}
 		}
 		*d++ = *arg++;
 	}
 	*d++ = '"';
-	*d++ = 0;
+	*d++ = '\0';
 	return q;
 }
 
@@ -1096,13 +1150,14 @@ static const char *quote_arg_msys2(const char *arg)
 
 	for (p = arg; *p; p++) {
 		int ws = isspace(*p);
-		if (!ws && *p != '\\' && *p != '"' && *p != '{')
+		if (!ws && *p != '\\' && *p != '"' && *p != '{' && *p != '\'' &&
+		    *p != '?' && *p != '*' && *p != '~')
 			continue;
 		if (!buf.len)
 			strbuf_addch(&buf, '"');
 		if (p != p2)
 			strbuf_add(&buf, p2, p - p2);
-		if (!ws && *p != '{')
+		if (*p == '\\' || *p == '"')
 			strbuf_addch(&buf, '\\');
 		p2 = p;
 	}
@@ -1112,7 +1167,7 @@ static const char *quote_arg_msys2(const char *arg)
 	else if (!buf.len)
 		return arg;
 	else
-		strbuf_add(&buf, p2, p - p2),
+		strbuf_add(&buf, p2, p - p2);
 
 	strbuf_addch(&buf, '"');
 	return strbuf_detach(&buf, 0);
@@ -1161,14 +1216,21 @@ static char *lookup_prog(const char *dir, int dirlen, const char *cmd,
 			 int isexe, int exe_only)
 {
 	char path[MAX_PATH];
+	wchar_t wpath[MAX_PATH];
 	snprintf(path, sizeof(path), "%.*s\\%s.exe", dirlen, dir, cmd);
 
-	if (!isexe && access(path, F_OK) == 0)
+	if (xutftowcs_path(wpath, path) < 0)
+		return NULL;
+
+	if (!isexe && _waccess(wpath, F_OK) == 0)
 		return xstrdup(path);
-	path[strlen(path)-4] = '\0';
-	if ((!exe_only || isexe) && access(path, F_OK) == 0)
-		if (!(GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY))
+	wpath[wcslen(wpath)-4] = '\0';
+	if ((!exe_only || isexe) && _waccess(wpath, F_OK) == 0) {
+		if (!(GetFileAttributesW(wpath) & FILE_ATTRIBUTE_DIRECTORY)) {
+			path[strlen(path)-4] = '\0';
 			return xstrdup(path);
+		}
+	}
 	return NULL;
 }
 
@@ -1183,7 +1245,7 @@ static char *path_lookup(const char *cmd, int exe_only)
 	int len = strlen(cmd);
 	int isexe = len >= 4 && !strcasecmp(cmd+len-4, ".exe");
 
-	if (strchr(cmd, '/') || strchr(cmd, '\\'))
+	if (strpbrk(cmd, "/\\"))
 		return xstrdup(cmd);
 
 	path = mingw_getenv("PATH");
@@ -1229,11 +1291,6 @@ static int wenvcmp(const void *a, const void *b)
 	return _wcsnicmp(p, q, p_len);
 }
 
-/* We need a stable sort to convert the environment between UTF-16 <-> UTF-8 */
-#ifndef INTERNAL_QSORT
-#include "qsort.c"
-#endif
-
 /*
  * Build an environment block combining the inherited environment
  * merged with the given list of settings.
@@ -1265,15 +1322,15 @@ static wchar_t *make_environment_block(char **deltaenv)
 		}
 
 		ALLOC_ARRAY(result, size);
-		memcpy(result, wenv, size * sizeof(*wenv));
+		COPY_ARRAY(result, wenv, size);
 		FreeEnvironmentStringsW(wenv);
 		return result;
 	}
 
 	/*
 	 * If there is a deltaenv, let's accumulate all keys into `array`,
-	 * sort them using the stable git_qsort() and then copy, skipping
-	 * duplicate keys
+	 * sort them using the stable git_stable_qsort() and then copy,
+	 * skipping duplicate keys
 	 */
 	for (p = wenv; p && *p; ) {
 		ALLOC_GROW(array, nr + 1, alloc);
@@ -1296,7 +1353,7 @@ static wchar_t *make_environment_block(char **deltaenv)
 		p += wlen + 1;
 	}
 
-	git_qsort(array, nr, sizeof(*array), wenvcmp);
+	git_stable_qsort(array, nr, sizeof(*array), wenvcmp);
 	ALLOC_ARRAY(result, size + delta_size);
 
 	for (p = result, i = 0; i < nr; i++) {
@@ -1309,7 +1366,7 @@ static wchar_t *make_environment_block(char **deltaenv)
 			continue;
 
 		size = wcslen(array[i]) + 1;
-		memcpy(p, array[i], size * sizeof(*p));
+		COPY_ARRAY(p, array[i], size);
 		p += size;
 	}
 	*p = L'\0';
@@ -1367,7 +1424,10 @@ static inline int match_last_path_component(const char *path, size_t *len,
 
 static int is_msys2_sh(const char *cmd)
 {
-	if (cmd && !strcmp(cmd, "sh")) {
+	if (!cmd)
+		return 0;
+
+	if (!strcmp(cmd, "sh")) {
 		static int ret = -1;
 		char *p;
 
@@ -1387,6 +1447,16 @@ static int is_msys2_sh(const char *cmd)
 		}
 		return ret;
 	}
+
+	if (ends_with(cmd, "\\sh.exe")) {
+		static char *sh;
+
+		if (!sh)
+			sh = path_lookup("sh", 0);
+
+		return !fspathcmp(cmd, sh);
+	}
+
 	return 0;
 }
 
@@ -1394,15 +1464,34 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 			      const char *dir,
 			      int prepend_cmd, int fhin, int fhout, int fherr)
 {
-	STARTUPINFOW si;
+	static int restrict_handle_inheritance = -1;
+	STARTUPINFOEXW si;
 	PROCESS_INFORMATION pi;
+	LPPROC_THREAD_ATTRIBUTE_LIST attr_list = NULL;
+	HANDLE stdhandles[3];
+	DWORD stdhandles_count = 0;
+	SIZE_T size;
 	struct strbuf args;
 	wchar_t wcmd[MAX_PATH], wdir[MAX_PATH], *wargs, *wenvblk = NULL;
 	unsigned flags = CREATE_UNICODE_ENVIRONMENT;
 	BOOL ret;
 	HANDLE cons;
 	const char *(*quote_arg)(const char *arg) =
-		is_msys2_sh(*argv) ? quote_arg_msys2 : quote_arg_msvc;
+		is_msys2_sh(cmd ? cmd : *argv) ?
+		quote_arg_msys2 : quote_arg_msvc;
+
+	/* Make sure to override previous errors, if any */
+	errno = 0;
+
+	if (restrict_handle_inheritance < 0)
+		restrict_handle_inheritance = core_restrict_inherited_handles;
+	/*
+	 * The following code to restrict which handles are inherited seems
+	 * to work properly only on Windows 7 and later, so let's disable it
+	 * on Windows Vista and 2008.
+	 */
+	if (restrict_handle_inheritance < 0)
+		restrict_handle_inheritance = GetVersion() >> 16 >= 7601;
 
 	do_unset_environment_variables();
 
@@ -1431,11 +1520,23 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 		CloseHandle(cons);
 	}
 	memset(&si, 0, sizeof(si));
-	si.cb = sizeof(si);
-	si.dwFlags = STARTF_USESTDHANDLES;
-	si.hStdInput = winansi_get_osfhandle(fhin);
-	si.hStdOutput = winansi_get_osfhandle(fhout);
-	si.hStdError = winansi_get_osfhandle(fherr);
+	si.StartupInfo.cb = sizeof(si);
+	si.StartupInfo.hStdInput = winansi_get_osfhandle(fhin);
+	si.StartupInfo.hStdOutput = winansi_get_osfhandle(fhout);
+	si.StartupInfo.hStdError = winansi_get_osfhandle(fherr);
+
+	/* The list of handles cannot contain duplicates */
+	if (si.StartupInfo.hStdInput != INVALID_HANDLE_VALUE)
+		stdhandles[stdhandles_count++] = si.StartupInfo.hStdInput;
+	if (si.StartupInfo.hStdOutput != INVALID_HANDLE_VALUE &&
+	    si.StartupInfo.hStdOutput != si.StartupInfo.hStdInput)
+		stdhandles[stdhandles_count++] = si.StartupInfo.hStdOutput;
+	if (si.StartupInfo.hStdError != INVALID_HANDLE_VALUE &&
+	    si.StartupInfo.hStdError != si.StartupInfo.hStdInput &&
+	    si.StartupInfo.hStdError != si.StartupInfo.hStdOutput)
+		stdhandles[stdhandles_count++] = si.StartupInfo.hStdError;
+	if (stdhandles_count)
+		si.StartupInfo.dwFlags |= STARTF_USESTDHANDLES;
 
 	if (*argv && !strcmp(cmd, *argv))
 		wcmd[0] = L'\0';
@@ -1468,16 +1569,98 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 	wenvblk = make_environment_block(deltaenv);
 
 	memset(&pi, 0, sizeof(pi));
-	ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, TRUE,
-		flags, wenvblk, dir ? wdir : NULL, &si, &pi);
+	if (restrict_handle_inheritance && stdhandles_count &&
+	    (InitializeProcThreadAttributeList(NULL, 1, 0, &size) ||
+	     GetLastError() == ERROR_INSUFFICIENT_BUFFER) &&
+	    (attr_list = (LPPROC_THREAD_ATTRIBUTE_LIST)
+			(HeapAlloc(GetProcessHeap(), 0, size))) &&
+	    InitializeProcThreadAttributeList(attr_list, 1, 0, &size) &&
+	    UpdateProcThreadAttribute(attr_list, 0,
+				      PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
+				      stdhandles,
+				      stdhandles_count * sizeof(HANDLE),
+				      NULL, NULL)) {
+		si.lpAttributeList = attr_list;
+		flags |= EXTENDED_STARTUPINFO_PRESENT;
+	}
+
+	ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL,
+			     stdhandles_count ? TRUE : FALSE,
+			     flags, wenvblk, dir ? wdir : NULL,
+			     &si.StartupInfo, &pi);
+
+	/*
+	 * On Windows 2008 R2, it seems that specifying certain types of handles
+	 * (such as FILE_TYPE_CHAR or FILE_TYPE_PIPE) will always produce an
+	 * error. Rather than playing finicky and fragile games, let's just try
+	 * to detect this situation and simply try again without restricting any
+	 * handle inheritance. This is still better than failing to create
+	 * processes.
+	 */
+	if (!ret && restrict_handle_inheritance && stdhandles_count) {
+		DWORD err = GetLastError();
+		struct strbuf buf = STRBUF_INIT;
+
+		if (err != ERROR_NO_SYSTEM_RESOURCES &&
+		    /*
+		     * On Windows 7 and earlier, handles on pipes and character
+		     * devices are inherited automatically, and cannot be
+		     * specified in the thread handle list. Rather than trying
+		     * to catch each and every corner case (and running the
+		     * chance of *still* forgetting a few), let's just fall
+		     * back to creating the process without trying to limit the
+		     * handle inheritance.
+		     */
+		    !(err == ERROR_INVALID_PARAMETER &&
+		      GetVersion() >> 16 < 9200) &&
+		    !getenv("SUPPRESS_HANDLE_INHERITANCE_WARNING")) {
+			DWORD fl = 0;
+			int i;
+
+			setenv("SUPPRESS_HANDLE_INHERITANCE_WARNING", "1", 1);
+
+			for (i = 0; i < stdhandles_count; i++) {
+				HANDLE h = stdhandles[i];
+				strbuf_addf(&buf, "handle #%d: %p (type %lx, "
+					    "handle info (%d) %lx\n", i, h,
+					    GetFileType(h),
+					    GetHandleInformation(h, &fl),
+					    fl);
+			}
+			strbuf_addstr(&buf, "\nThis is a bug; please report it "
+				      "at\nhttps://github.com/git-for-windows/"
+				      "git/issues/new\n\n"
+				      "To suppress this warning, please set "
+				      "the environment variable\n\n"
+				      "\tSUPPRESS_HANDLE_INHERITANCE_WARNING=1"
+				      "\n");
+		}
+		restrict_handle_inheritance = 0;
+		flags &= ~EXTENDED_STARTUPINFO_PRESENT;
+		ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL,
+				     TRUE, flags, wenvblk, dir ? wdir : NULL,
+				     &si.StartupInfo, &pi);
+		if (!ret)
+			errno = err_win_to_posix(GetLastError());
+		if (ret && buf.len) {
+			warning("failed to restrict file handles (%ld)\n\n%s",
+				err, buf.buf);
+		}
+		strbuf_release(&buf);
+	} else if (!ret)
+		errno = err_win_to_posix(GetLastError());
+
+	if (si.lpAttributeList)
+		DeleteProcThreadAttributeList(si.lpAttributeList);
+	if (attr_list)
+		HeapFree(GetProcessHeap(), 0, attr_list);
 
 	free(wenvblk);
 	free(wargs);
 
-	if (!ret) {
-		errno = ENOENT;
+	if (!ret)
 		return -1;
-	}
+
 	CloseHandle(pi.hThread);
 
 	/*
@@ -1562,7 +1745,7 @@ static int try_shell_exec(const char *cmd, char *const *argv)
 		while (argv[argc]) argc++;
 		ALLOC_ARRAY(argv2, argc + 1);
 		argv2[0] = (char *)cmd;	/* full path to the script file */
-		memcpy(&argv2[1], &argv[1], sizeof(*argv) * argc);
+		COPY_ARRAY(&argv2[1], &argv[1], argc);
 		exec_id = trace2_exec(prog, argv2);
 		pid = mingw_spawnv(prog, argv2, 1);
 		if (pid >= 0) {
@@ -1663,6 +1846,8 @@ char *mingw_getenv(const char *name)
 	if (!w_key)
 		die("Out of memory, (tried to allocate %u wchar_t's)", len_key);
 	xutftowcs(w_key, name, len_key);
+	/* GetEnvironmentVariableW() only sets the last error upon failure */
+	SetLastError(ERROR_SUCCESS);
 	len_value = GetEnvironmentVariableW(w_key, w_value, ARRAY_SIZE(w_value));
 	if (!len_value && GetLastError() == ERROR_ENVVAR_NOT_FOUND) {
 		free(w_key);
@@ -2361,6 +2546,128 @@ static void setup_windows_environment(void)
 	}
 }
 
+int is_valid_win32_path(const char *path, int allow_literal_nul)
+{
+	const char *p = path;
+	int preceding_space_or_period = 0, i = 0, periods = 0;
+
+	if (!protect_ntfs)
+		return 1;
+
+	skip_dos_drive_prefix((char **)&path);
+	goto segment_start;
+
+	for (;;) {
+		char c = *(path++);
+		switch (c) {
+		case '\0':
+		case '/': case '\\':
+			/* cannot end in ` ` or `.`, except for `.` and `..` */
+			if (preceding_space_or_period &&
+			    (i != periods || periods > 2))
+				return 0;
+			if (!c)
+				return 1;
+
+			i = periods = preceding_space_or_period = 0;
+
+segment_start:
+			switch (*path) {
+			case 'a': case 'A': /* AUX */
+				if (((c = path[++i]) != 'u' && c != 'U') ||
+				    ((c = path[++i]) != 'x' && c != 'X')) {
+not_a_reserved_name:
+					path += i;
+					continue;
+				}
+				break;
+			case 'c': case 'C': /* COM<N>, CON, CONIN$, CONOUT$ */
+				if ((c = path[++i]) != 'o' && c != 'O')
+					goto not_a_reserved_name;
+				c = path[++i];
+				if (c == 'm' || c == 'M') { /* COM<N> */
+					if (!isdigit(path[++i]))
+						goto not_a_reserved_name;
+				} else if (c == 'n' || c == 'N') { /* CON */
+					c = path[i + 1];
+					if ((c == 'i' || c == 'I') &&
+					    ((c = path[i + 2]) == 'n' ||
+					     c == 'N') &&
+					    path[i + 3] == '$')
+						i += 3; /* CONIN$ */
+					else if ((c == 'o' || c == 'O') &&
+						 ((c = path[i + 2]) == 'u' ||
+						  c == 'U') &&
+						 ((c = path[i + 3]) == 't' ||
+						  c == 'T') &&
+						 path[i + 4] == '$')
+						i += 4; /* CONOUT$ */
+				} else
+					goto not_a_reserved_name;
+				break;
+			case 'l': case 'L': /* LPT<N> */
+				if (((c = path[++i]) != 'p' && c != 'P') ||
+				    ((c = path[++i]) != 't' && c != 'T') ||
+				    !isdigit(path[++i]))
+					goto not_a_reserved_name;
+				break;
+			case 'n': case 'N': /* NUL */
+				if (((c = path[++i]) != 'u' && c != 'U') ||
+				    ((c = path[++i]) != 'l' && c != 'L') ||
+				    (allow_literal_nul &&
+				     !path[i + 1] && p == path))
+					goto not_a_reserved_name;
+				break;
+			case 'p': case 'P': /* PRN */
+				if (((c = path[++i]) != 'r' && c != 'R') ||
+				    ((c = path[++i]) != 'n' && c != 'N'))
+					goto not_a_reserved_name;
+				break;
+			default:
+				continue;
+			}
+
+			/*
+			 * So far, this looks like a reserved name. Let's see
+			 * whether it actually is one: trailing spaces, a file
+			 * extension, or an NTFS Alternate Data Stream do not
+			 * matter, the name is still reserved if any of those
+			 * follow immediately after the actual name.
+			 */
+			i++;
+			if (path[i] == ' ') {
+				preceding_space_or_period = 1;
+				while (path[++i] == ' ')
+					; /* skip all spaces */
+			}
+
+			c = path[i];
+			if (c && c != '.' && c != ':' && c != '/' && c != '\\')
+				goto not_a_reserved_name;
+
+			/* contains reserved name */
+			return 0;
+		case '.':
+			periods++;
+			/* fallthru */
+		case ' ':
+			preceding_space_or_period = 1;
+			i++;
+			continue;
+		case ':': /* DOS drive prefix was already skipped */
+		case '<': case '>': case '"': case '|': case '?': case '*':
+			/* illegal character */
+			return 0;
+		default:
+			if (c > '\0' && c < '\x20')
+				/* illegal character */
+				return 0;
+		}
+		preceding_space_or_period = 0;
+		i++;
+	}
+}
+
 #if !defined(_MSC_VER)
 /*
  * Disable MSVCRT command line wildcard expansion (__getmainargs called from
diff --git a/third_party/git/compat/mingw.h b/third_party/git/compat/mingw.h
index a03e40e6e2a6..e6fe810ba98f 100644
--- a/third_party/git/compat/mingw.h
+++ b/third_party/git/compat/mingw.h
@@ -11,7 +11,7 @@ typedef _sigset_t sigset_t;
 #undef _POSIX_THREAD_SAFE_FUNCTIONS
 #endif
 
-extern int mingw_core_config(const char *var, const char *value, void *cb);
+int mingw_core_config(const char *var, const char *value, void *cb);
 #define platform_core_config mingw_core_config
 
 /*
@@ -443,7 +443,7 @@ static inline void convert_slashes(char *path)
 			*path = '/';
 }
 #define PATH_SEP ';'
-extern char *mingw_query_user_email(void);
+char *mingw_query_user_email(void);
 #define query_user_email mingw_query_user_email
 #if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
 #define PRIuMAX "I64u"
@@ -453,6 +453,27 @@ extern char *mingw_query_user_email(void);
 #endif
 
 /**
+ * Verifies that the given path is a valid one on Windows.
+ *
+ * In particular, path segments are disallowed which
+ *
+ * - end in a period or a space (except the special directories `.` and `..`).
+ *
+ * - contain any of the reserved characters, e.g. `:`, `;`, `*`, etc
+ *
+ * - correspond to reserved names (such as `AUX`, `PRN`, etc)
+ *
+ * The `allow_literal_nul` parameter controls whether the path `NUL` should
+ * be considered valid (this makes sense e.g. before opening files, as it is
+ * perfectly legitimate to open `NUL` on Windows, just as it is to open
+ * `/dev/null` on Unix/Linux).
+ *
+ * Returns 1 upon success, otherwise 0.
+ */
+int is_valid_win32_path(const char *path, int allow_literal_nul);
+#define is_valid_path(path) is_valid_win32_path(path, 0)
+
+/**
  * Converts UTF-8 encoded string to UTF-16LE.
  *
  * To support repositories with legacy-encoded file names, invalid UTF-8 bytes
@@ -558,7 +579,7 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen);
 
 /*
  * A critical section used in the implementation of the spawn
- * functions (mingw_spawnv[p]e()) and waitpid(). Intialised in
+ * functions (mingw_spawnv[p]e()) and waitpid(). Initialised in
  * the replacement main() macro below.
  */
 extern CRITICAL_SECTION pinfo_cs;
@@ -578,6 +599,16 @@ int wmain(int argc, const wchar_t **w_argv);
 int main(int argc, const char **argv);
 
 /*
+ * For debugging: if a problem occurs, say, in a Git process that is spawned
+ * from another Git process which in turn is spawned from yet another Git
+ * process, it can be quite daunting to figure out what is going on.
+ *
+ * Call this function to open a new MinTTY (this assumes you are in Git for
+ * Windows' SDK) with a GDB that attaches to the current process right away.
+ */
+extern void open_in_gdb(void);
+
+/*
  * Used by Pthread API implementation for Windows
  */
-extern int err_win_to_posix(DWORD winerr);
+int err_win_to_posix(DWORD winerr);
diff --git a/third_party/git/compat/nedmalloc/malloc.c.h b/third_party/git/compat/nedmalloc/malloc.c.h
index b833ff9225e7..814845d4b33f 100644
--- a/third_party/git/compat/nedmalloc/malloc.c.h
+++ b/third_party/git/compat/nedmalloc/malloc.c.h
@@ -1564,7 +1564,7 @@ static FORCEINLINE void* win32direct_mmap(size_t size) {
   return (ptr != 0)? ptr: MFAIL;
 }
 
-/* This function supports releasing coalesed segments */
+/* This function supports releasing coalesced segments */
 static FORCEINLINE int win32munmap(void* ptr, size_t size) {
   MEMORY_BASIC_INFORMATION minfo;
   char* cptr = (char*)ptr;
@@ -1655,7 +1655,7 @@ static FORCEINLINE int win32munmap(void* ptr, size_t size) {
     #define CALL_MREMAP(addr, osz, nsz, mv)     MFAIL
 #endif /* HAVE_MMAP && HAVE_MREMAP */
 
-/* mstate bit set if continguous morecore disabled or failed */
+/* mstate bit set if contiguous morecore disabled or failed */
 #define USE_NONCONTIGUOUS_BIT (4U)
 
 /* segment bit set in create_mspace_with_base */
@@ -1755,10 +1755,10 @@ static FORCEINLINE void pthread_release_lock (MLOCK_T *sl) {
   assert(sl->l != 0);
   assert(sl->threadid == CURRENT_THREAD);
   if (--sl->c == 0) {
-    sl->threadid = 0;
     volatile unsigned int* lp = &sl->l;
     int prev = 0;
     int ret;
+    sl->threadid = 0;
     __asm__ __volatile__ ("lock; xchgl %0, %1"
 			  : "=r" (ret)
 			  : "m" (*(lp)), "0"(prev)
@@ -2485,7 +2485,7 @@ typedef struct malloc_segment* msegmentptr;
 
   Trim support
     Fields holding the amount of unused topmost memory that should trigger
-    timming, and a counter to force periodic scanning to release unused
+    timing, and a counter to force periodic scanning to release unused
     non-topmost segments.
 
   Locking
@@ -3066,7 +3066,7 @@ static int init_mparams(void) {
 #if !ONLY_MSPACES
     /* Set up lock for main malloc area */
     gm->mflags = mparams.default_mflags;
-    INITIAL_LOCK(&gm->mutex);
+    (void)INITIAL_LOCK(&gm->mutex);
 #endif
 
 #if (FOOTERS && !INSECURE)
@@ -5017,7 +5017,7 @@ static mstate init_user_mstate(char* tbase, size_t tsize) {
   mchunkptr msp = align_as_chunk(tbase);
   mstate m = (mstate)(chunk2mem(msp));
   memset(m, 0, msize);
-  INITIAL_LOCK(&m->mutex);
+  (void)INITIAL_LOCK(&m->mutex);
   msp->head = (msize|PINUSE_BIT|CINUSE_BIT);
   m->seg.base = m->least_addr = tbase;
   m->seg.size = m->footprint = m->max_footprint = tsize;
diff --git a/third_party/git/compat/obstack.h b/third_party/git/compat/obstack.h
index ae36ed6a669d..f90a46d9b956 100644
--- a/third_party/git/compat/obstack.h
+++ b/third_party/git/compat/obstack.h
@@ -79,7 +79,7 @@ change its address during its lifetime.
 When the chars burst over a chunk boundary, we allocate a larger
 chunk, and then copy the partly formed object from the end of the old
 chunk to the beginning of the new larger chunk.  We then carry on
-accreting characters to the end of the object as we normally would.
+accrediting characters to the end of the object as we normally would.
 
 A special macro is provided to add a single char at a time to a
 growing object.  This allows the use of register variables, which
@@ -135,8 +135,10 @@ extern "C" {
    alignment relative to 0.  */
 
 #define __PTR_ALIGN(B, P, A)						    \
-  __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \
-		P, A)
+  (sizeof (PTR_INT_TYPE) < sizeof(void *) ?                                 \
+   __BPTR_ALIGN((B), (P), (A)) :                                            \
+   (void *)__BPTR_ALIGN((PTR_INT_TYPE)(void *)0, (PTR_INT_TYPE)(P), (A))            \
+  )
 
 #include <string.h>
 
diff --git a/third_party/git/compat/poll/poll.c b/third_party/git/compat/poll/poll.c
index 0e95dd493c94..afa6d245846a 100644
--- a/third_party/git/compat/poll/poll.c
+++ b/third_party/git/compat/poll/poll.c
@@ -139,22 +139,10 @@ win32_compute_revents (HANDLE h, int *p_sought)
   INPUT_RECORD *irbuffer;
   DWORD avail, nbuffer;
   BOOL bRet;
-  IO_STATUS_BLOCK iosb;
-  FILE_PIPE_LOCAL_INFORMATION fpli;
-  static PNtQueryInformationFile NtQueryInformationFile;
-  static BOOL once_only;
 
   switch (GetFileType (h))
     {
     case FILE_TYPE_PIPE:
-      if (!once_only)
-	{
-	  NtQueryInformationFile = (PNtQueryInformationFile)(void (*)(void))
-	    GetProcAddress (GetModuleHandleW (L"ntdll.dll"),
-			    "NtQueryInformationFile");
-	  once_only = TRUE;
-	}
-
       happened = 0;
       if (PeekNamedPipe (h, NULL, 0, NULL, &avail, NULL) != 0)
 	{
@@ -166,22 +154,9 @@ win32_compute_revents (HANDLE h, int *p_sought)
 
       else
 	{
-	  /* It was the write-end of the pipe.  Check if it is writable.
-	     If NtQueryInformationFile fails, optimistically assume the pipe is
-	     writable.  This could happen on Win9x, where NtQueryInformationFile
-	     is not available, or if we inherit a pipe that doesn't permit
-	     FILE_READ_ATTRIBUTES access on the write end (I think this should
-	     not happen since WinXP SP2; WINE seems fine too).  Otherwise,
-	     ensure that enough space is available for atomic writes.  */
-	  memset (&iosb, 0, sizeof (iosb));
-	  memset (&fpli, 0, sizeof (fpli));
-
-	  if (!NtQueryInformationFile
-	      || NtQueryInformationFile (h, &iosb, &fpli, sizeof (fpli),
-					 FilePipeLocalInformation)
-	      || fpli.WriteQuotaAvailable >= PIPE_BUF
-	      || (fpli.OutboundQuota < PIPE_BUF &&
-		  fpli.WriteQuotaAvailable == fpli.OutboundQuota))
+	  /* It was the write-end of the pipe. Unfortunately there is no
+	     reliable way of knowing if it can be written without blocking.
+	     Just say that it's all good. */
 	    happened |= *p_sought & (POLLOUT | POLLWRNORM | POLLWRBAND);
 	}
       return happened;
diff --git a/third_party/git/compat/regex/regcomp.c b/third_party/git/compat/regex/regcomp.c
index c0d838834ad8..d1bc09e49b66 100644
--- a/third_party/git/compat/regex/regcomp.c
+++ b/third_party/git/compat/regex/regcomp.c
@@ -3462,7 +3462,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
 	/* This isn't a valid character.  */
 	return REG_ECOLLATE;
 
-      /* Build single byte matcing table for this equivalence class.  */
+      /* Build single byte matching table for this equivalence class.  */
       char_buf[1] = (unsigned char) '\0';
       len = weights[idx1 & 0xffffff];
       for (ch = 0; ch < SBC_MAX; ++ch)
diff --git a/third_party/git/compat/regex/regex.h b/third_party/git/compat/regex/regex.h
index 4d81358a83d0..2d3412860d4d 100644
--- a/third_party/git/compat/regex/regex.h
+++ b/third_party/git/compat/regex/regex.h
@@ -41,6 +41,11 @@
 extern "C" {
 #endif
 
+#define regcomp git_regcomp
+#define regexec git_regexec
+#define regerror git_regerror
+#define regfree git_regfree
+
 /* The following two types have to be signed and unsigned integer type
    wide enough to hold a value of a pointer.  For most ANSI compilers
    ptrdiff_t and size_t should be likely OK.  Still size of these two
@@ -322,7 +327,7 @@ typedef enum
   /* POSIX regcomp return error codes.  (In the order listed in the
      standard.)  */
   REG_BADPAT,		/* Invalid pattern.  */
-  REG_ECOLLATE,		/* Inalid collating element.  */
+  REG_ECOLLATE,		/* Invalid collating element.  */
   REG_ECTYPE,		/* Invalid character class name.  */
   REG_EESCAPE,		/* Trailing backslash.  */
   REG_ESUBREG,		/* Invalid back reference.  */
diff --git a/third_party/git/compat/regex/regex_internal.c b/third_party/git/compat/regex/regex_internal.c
index 59bf151336c2..ec51cf34461e 100644
--- a/third_party/git/compat/regex/regex_internal.c
+++ b/third_party/git/compat/regex/regex_internal.c
@@ -1616,7 +1616,7 @@ free_state (re_dfastate_t *state)
   re_free (state);
 }
 
-/* Create the new state which is independ of contexts.
+/* Create the new state which is independent of contexts.
    Return the new state if succeeded, otherwise return NULL.  */
 
 static re_dfastate_t *
diff --git a/third_party/git/compat/regex/regexec.c b/third_party/git/compat/regex/regexec.c
index 1b5d89fd5ed1..49358ae475c1 100644
--- a/third_party/git/compat/regex/regexec.c
+++ b/third_party/git/compat/regex/regexec.c
@@ -2420,7 +2420,7 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
 /* From the node set CUR_NODES, pick up the nodes whose types are
    OP_OPEN_SUBEXP and which have corresponding back references in the regular
    expression. And register them to use them later for evaluating the
-   correspoding back references.  */
+   corresponding back references.  */
 
 static reg_errcode_t
 internal_function
@@ -3347,7 +3347,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
   dests_node = dests_alloc->dests_node;
   dests_ch = dests_alloc->dests_ch;
 
-  /* Initialize transiton table.  */
+  /* Initialize transition table.  */
   state->word_trtable = state->trtable = NULL;
 
   /* At first, group all nodes belonging to `state' into several
diff --git a/third_party/git/compat/terminal.c b/third_party/git/compat/terminal.c
index fa13ee672db3..35bca03d1470 100644
--- a/third_party/git/compat/terminal.c
+++ b/third_party/git/compat/terminal.c
@@ -2,6 +2,9 @@
 #include "compat/terminal.h"
 #include "sigchain.h"
 #include "strbuf.h"
+#include "run-command.h"
+#include "string-list.h"
+#include "hashmap.h"
 
 #if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE)
 
@@ -32,7 +35,7 @@ static void restore_term(void)
 	term_fd = -1;
 }
 
-static int disable_echo(void)
+static int disable_bits(tcflag_t bits)
 {
 	struct termios t;
 
@@ -43,7 +46,7 @@ static int disable_echo(void)
 	old_term = t;
 	sigchain_push_common(restore_term_on_signal);
 
-	t.c_lflag &= ~ECHO;
+	t.c_lflag &= ~bits;
 	if (!tcsetattr(term_fd, TCSAFLUSH, &t))
 		return 0;
 
@@ -53,17 +56,44 @@ error:
 	return -1;
 }
 
+static int disable_echo(void)
+{
+	return disable_bits(ECHO);
+}
+
+static int enable_non_canonical(void)
+{
+	return disable_bits(ICANON | ECHO);
+}
+
 #elif defined(GIT_WINDOWS_NATIVE)
 
 #define INPUT_PATH "CONIN$"
 #define OUTPUT_PATH "CONOUT$"
 #define FORCE_TEXT "t"
 
+static int use_stty = 1;
+static struct string_list stty_restore = STRING_LIST_INIT_DUP;
 static HANDLE hconin = INVALID_HANDLE_VALUE;
 static DWORD cmode;
 
 static void restore_term(void)
 {
+	if (use_stty) {
+		int i;
+		struct child_process cp = CHILD_PROCESS_INIT;
+
+		if (stty_restore.nr == 0)
+			return;
+
+		argv_array_push(&cp.args, "stty");
+		for (i = 0; i < stty_restore.nr; i++)
+			argv_array_push(&cp.args, stty_restore.items[i].string);
+		run_command(&cp);
+		string_list_clear(&stty_restore, 0);
+		return;
+	}
+
 	if (hconin == INVALID_HANDLE_VALUE)
 		return;
 
@@ -72,8 +102,39 @@ static void restore_term(void)
 	hconin = INVALID_HANDLE_VALUE;
 }
 
-static int disable_echo(void)
+static int disable_bits(DWORD bits)
 {
+	if (use_stty) {
+		struct child_process cp = CHILD_PROCESS_INIT;
+
+		argv_array_push(&cp.args, "stty");
+
+		if (bits & ENABLE_LINE_INPUT) {
+			string_list_append(&stty_restore, "icanon");
+			argv_array_push(&cp.args, "-icanon");
+		}
+
+		if (bits & ENABLE_ECHO_INPUT) {
+			string_list_append(&stty_restore, "echo");
+			argv_array_push(&cp.args, "-echo");
+		}
+
+		if (bits & ENABLE_PROCESSED_INPUT) {
+			string_list_append(&stty_restore, "-ignbrk");
+			string_list_append(&stty_restore, "intr");
+			string_list_append(&stty_restore, "^c");
+			argv_array_push(&cp.args, "ignbrk");
+			argv_array_push(&cp.args, "intr");
+			argv_array_push(&cp.args, "");
+		}
+
+		if (run_command(&cp) == 0)
+			return 0;
+
+		/* `stty` could not be executed; access the Console directly */
+		use_stty = 0;
+	}
+
 	hconin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE,
 	    FILE_SHARE_READ, NULL, OPEN_EXISTING,
 	    FILE_ATTRIBUTE_NORMAL, NULL);
@@ -82,7 +143,7 @@ static int disable_echo(void)
 
 	GetConsoleMode(hconin, &cmode);
 	sigchain_push_common(restore_term_on_signal);
-	if (!SetConsoleMode(hconin, cmode & (~ENABLE_ECHO_INPUT))) {
+	if (!SetConsoleMode(hconin, cmode & ~bits)) {
 		CloseHandle(hconin);
 		hconin = INVALID_HANDLE_VALUE;
 		return -1;
@@ -91,6 +152,47 @@ static int disable_echo(void)
 	return 0;
 }
 
+static int disable_echo(void)
+{
+	return disable_bits(ENABLE_ECHO_INPUT);
+}
+
+static int enable_non_canonical(void)
+{
+	return disable_bits(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
+}
+
+/*
+ * Override `getchar()`, as the default implementation does not use
+ * `ReadFile()`.
+ *
+ * This poses a problem when we want to see whether the standard
+ * input has more characters, as the default of Git for Windows is to start the
+ * Bash in a MinTTY, which uses a named pipe to emulate a pty, in which case
+ * our `poll()` emulation calls `PeekNamedPipe()`, which seems to require
+ * `ReadFile()` to be called first to work properly (it only reports 0
+ * available bytes, otherwise).
+ *
+ * So let's just override `getchar()` with a version backed by `ReadFile()` and
+ * go our merry ways from here.
+ */
+static int mingw_getchar(void)
+{
+	DWORD read = 0;
+	unsigned char ch;
+
+	if (!ReadFile(GetStdHandle(STD_INPUT_HANDLE), &ch, 1, &read, NULL))
+		return EOF;
+
+	if (!read) {
+		error("Unexpected 0 read");
+		return EOF;
+	}
+
+	return ch;
+}
+#define getchar mingw_getchar
+
 #endif
 
 #ifndef FORCE_TEXT
@@ -137,6 +239,126 @@ char *git_terminal_prompt(const char *prompt, int echo)
 	return buf.buf;
 }
 
+/*
+ * The `is_known_escape_sequence()` function returns 1 if the passed string
+ * corresponds to an Escape sequence that the terminal capabilities contains.
+ *
+ * To avoid depending on ncurses or other platform-specific libraries, we rely
+ * on the presence of the `infocmp` executable to do the job for us (failing
+ * silently if the program is not available or refused to run).
+ */
+struct escape_sequence_entry {
+	struct hashmap_entry entry;
+	char sequence[FLEX_ARRAY];
+};
+
+static int sequence_entry_cmp(const void *hashmap_cmp_fn_data,
+			      const struct escape_sequence_entry *e1,
+			      const struct escape_sequence_entry *e2,
+			      const void *keydata)
+{
+	return strcmp(e1->sequence, keydata ? keydata : e2->sequence);
+}
+
+static int is_known_escape_sequence(const char *sequence)
+{
+	static struct hashmap sequences;
+	static int initialized;
+
+	if (!initialized) {
+		struct child_process cp = CHILD_PROCESS_INIT;
+		struct strbuf buf = STRBUF_INIT;
+		char *p, *eol;
+
+		hashmap_init(&sequences, (hashmap_cmp_fn)sequence_entry_cmp,
+			     NULL, 0);
+
+		argv_array_pushl(&cp.args, "infocmp", "-L", "-1", NULL);
+		if (pipe_command(&cp, NULL, 0, &buf, 0, NULL, 0))
+			strbuf_setlen(&buf, 0);
+
+		for (eol = p = buf.buf; *p; p = eol + 1) {
+			p = strchr(p, '=');
+			if (!p)
+				break;
+			p++;
+			eol = strchrnul(p, '\n');
+
+			if (starts_with(p, "\\E")) {
+				char *comma = memchr(p, ',', eol - p);
+				struct escape_sequence_entry *e;
+
+				p[0] = '^';
+				p[1] = '[';
+				FLEX_ALLOC_MEM(e, sequence, p, comma - p);
+				hashmap_entry_init(&e->entry,
+						   strhash(e->sequence));
+				hashmap_add(&sequences, &e->entry);
+			}
+			if (!*eol)
+				break;
+		}
+		initialized = 1;
+	}
+
+	return !!hashmap_get_from_hash(&sequences, strhash(sequence), sequence);
+}
+
+int read_key_without_echo(struct strbuf *buf)
+{
+	static int warning_displayed;
+	int ch;
+
+	if (warning_displayed || enable_non_canonical() < 0) {
+		if (!warning_displayed) {
+			warning("reading single keystrokes not supported on "
+				"this platform; reading line instead");
+			warning_displayed = 1;
+		}
+
+		return strbuf_getline(buf, stdin);
+	}
+
+	strbuf_reset(buf);
+	ch = getchar();
+	if (ch == EOF) {
+		restore_term();
+		return EOF;
+	}
+	strbuf_addch(buf, ch);
+
+	if (ch == '\033' /* ESC */) {
+		/*
+		 * We are most likely looking at an Escape sequence. Let's try
+		 * to read more bytes, waiting at most half a second, assuming
+		 * that the sequence is complete if we did not receive any byte
+		 * within that time.
+		 *
+		 * Start by replacing the Escape byte with ^[ */
+		strbuf_splice(buf, buf->len - 1, 1, "^[", 2);
+
+		/*
+		 * Query the terminal capabilities once about all the Escape
+		 * sequences it knows about, so that we can avoid waiting for
+		 * half a second when we know that the sequence is complete.
+		 */
+		while (!is_known_escape_sequence(buf->buf)) {
+			struct pollfd pfd = { .fd = 0, .events = POLLIN };
+
+			if (poll(&pfd, 1, 500) < 1)
+				break;
+
+			ch = getchar();
+			if (ch == EOF)
+				return 0;
+			strbuf_addch(buf, ch);
+		}
+	}
+
+	restore_term();
+	return 0;
+}
+
 #else
 
 char *git_terminal_prompt(const char *prompt, int echo)
@@ -144,4 +366,23 @@ char *git_terminal_prompt(const char *prompt, int echo)
 	return getpass(prompt);
 }
 
+int read_key_without_echo(struct strbuf *buf)
+{
+	static int warning_displayed;
+	const char *res;
+
+	if (!warning_displayed) {
+		warning("reading single keystrokes not supported on this "
+			"platform; reading line instead");
+		warning_displayed = 1;
+	}
+
+	res = getpass("");
+	strbuf_reset(buf);
+	if (!res)
+		return EOF;
+	strbuf_addstr(buf, res);
+	return 0;
+}
+
 #endif
diff --git a/third_party/git/compat/terminal.h b/third_party/git/compat/terminal.h
index 97db7cd69d65..a9d52b8464e2 100644
--- a/third_party/git/compat/terminal.h
+++ b/third_party/git/compat/terminal.h
@@ -3,4 +3,7 @@
 
 char *git_terminal_prompt(const char *prompt, int echo);
 
+/* Read a single keystroke, without echoing it to the terminal */
+int read_key_without_echo(struct strbuf *buf);
+
 #endif /* COMPAT_TERMINAL_H */
diff --git a/third_party/git/compat/vcbuild/find_vs_env.bat b/third_party/git/compat/vcbuild/find_vs_env.bat
index 40194dd2309b..b35d264c0e6b 100644
--- a/third_party/git/compat/vcbuild/find_vs_env.bat
+++ b/third_party/git/compat/vcbuild/find_vs_env.bat
@@ -18,7 +18,7 @@ REM and MAKE, we must blend these two different worlds.  This script
 REM attempts to do that.
 REM ================================================================
 REM This BAT file starts in a plain (non-developer) command prompt,
-REM searches for the "best" commmand prompt setup script, installs
+REM searches for the "best" command prompt setup script, installs
 REM it into the current CMD process, and exports the various MSVC
 REM environment variables for use by MAKE.
 REM
diff --git a/third_party/git/compat/vcbuild/scripts/clink.pl b/third_party/git/compat/vcbuild/scripts/clink.pl
index c7b021bfac7a..d9f71b7cbb71 100755
--- a/third_party/git/compat/vcbuild/scripts/clink.pl
+++ b/third_party/git/compat/vcbuild/scripts/clink.pl
@@ -45,9 +45,9 @@ while (@ARGV) {
 	} elsif ("$arg" eq "-liconv") {
 		push(@args, "libiconv.lib");
 	} elsif ("$arg" eq "-lcrypto") {
-		push(@args, "libeay32.lib");
+		push(@args, "libcrypto.lib");
 	} elsif ("$arg" eq "-lssl") {
-		push(@args, "ssleay32.lib");
+		push(@args, "libssl.lib");
 	} elsif ("$arg" eq "-lcurl") {
 		my $lib = "";
 		# Newer vcpkg definitions call this libcurl_imp.lib; Do we
@@ -68,8 +68,54 @@ while (@ARGV) {
 	} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
 		$arg =~ s/^-L/-LIBPATH:/;
 		push(@lflags, $arg);
-	} elsif ("$arg" =~ /^-R/) {
+	} elsif ("$arg" =~ /^-[Rl]/) {
 		# eat
+	} elsif ("$arg" eq "-Werror") {
+		push(@cflags, "-WX");
+	} elsif ("$arg" eq "-Wall") {
+		# cl.exe understands -Wall, but it is really overzealous
+		push(@cflags, "-W4");
+		# disable the "signed/unsigned mismatch" warnings; our source code violates that
+		push(@cflags, "-wd4018");
+		push(@cflags, "-wd4245");
+		push(@cflags, "-wd4389");
+		# disable the "unreferenced formal parameter" warning; our source code violates that
+		push(@cflags, "-wd4100");
+		# disable the "conditional expression is constant" warning; our source code violates that
+		push(@cflags, "-wd4127");
+		# disable the "const object should be initialized" warning; these warnings affect only objects that are `static`
+		push(@cflags, "-wd4132");
+		# disable the "function/data pointer conversion in expression" warning; our source code violates that
+		push(@cflags, "-wd4152");
+		# disable the "non-constant aggregate initializer" warning; our source code violates that
+		push(@cflags, "-wd4204");
+		# disable the "cannot be initialized using address of automatic variable" warning; our source code violates that
+		push(@cflags, "-wd4221");
+		# disable the "possible loss of data" warnings; our source code violates that
+		push(@cflags, "-wd4244");
+		push(@cflags, "-wd4267");
+		# disable the "array is too small to include a terminating null character" warning; we ab-use strings to initialize OIDs
+		push(@cflags, "-wd4295");
+		# disable the "'<<': result of 32-bit shift implicitly converted to 64 bits" warning; our source code violates that
+		push(@cflags, "-wd4334");
+		# disable the "declaration hides previous local declaration" warning; our source code violates that
+		push(@cflags, "-wd4456");
+		# disable the "declaration hides function parameter" warning; our source code violates that
+		push(@cflags, "-wd4457");
+		# disable the "declaration hides global declaration" warning; our source code violates that
+		push(@cflags, "-wd4459");
+		# disable the "potentially uninitialized local variable '<name>' used" warning; our source code violates that
+		push(@cflags, "-wd4701");
+		# disable the "unreachable code" warning; our source code violates that
+		push(@cflags, "-wd4702");
+		# disable the "potentially uninitialized local pointer variable used" warning; our source code violates that
+		push(@cflags, "-wd4703");
+		# disable the "assignment within conditional expression" warning; our source code violates that
+		push(@cflags, "-wd4706");
+		# disable the "'inet_ntoa': Use inet_ntop() or InetNtop() instead" warning; our source code violates that
+		push(@cflags, "-wd4996");
+	} elsif ("$arg" =~ /^-W[a-z]/) {
+		# let's ignore those
 	} else {
 		push(@args, $arg);
 	}
diff --git a/third_party/git/compat/win32/path-utils.c b/third_party/git/compat/win32/path-utils.c
index d9d3641de857..ebf2f12eb666 100644
--- a/third_party/git/compat/win32/path-utils.c
+++ b/third_party/git/compat/win32/path-utils.c
@@ -1,5 +1,29 @@
 #include "../../git-compat-util.h"
 
+int win32_has_dos_drive_prefix(const char *path)
+{
+	int i;
+
+	/*
+	 * Does it start with an ASCII letter (i.e. highest bit not set),
+	 * followed by a colon?
+	 */
+	if (!(0x80 & (unsigned char)*path))
+		return *path && path[1] == ':' ? 2 : 0;
+
+	/*
+	 * While drive letters must be letters of the English alphabet, it is
+	 * possible to assign virtually _any_ Unicode character via `subst` as
+	 * a drive letter to "virtual drives". Even `1`, or `รค`. Or fun stuff
+	 * like this:
+	 *
+	 *      subst ึ: %USERPROFILE%\Desktop
+	 */
+	for (i = 1; i < 4 && (0x80 & (unsigned char)path[i]); i++)
+		; /* skip first UTF-8 character */
+	return path[i] == ':' ? i + 1 : 0;
+}
+
 int win32_skip_dos_drive_prefix(char **path)
 {
 	int ret = has_dos_drive_prefix(*path);
diff --git a/third_party/git/compat/win32/path-utils.h b/third_party/git/compat/win32/path-utils.h
index 0f70d439204f..f2e70872cd20 100644
--- a/third_party/git/compat/win32/path-utils.h
+++ b/third_party/git/compat/win32/path-utils.h
@@ -1,5 +1,9 @@
-#define has_dos_drive_prefix(path) \
-	(isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
+#ifndef WIN32_PATH_UTILS_H
+#define WIN32_PATH_UTILS_H
+
+int win32_has_dos_drive_prefix(const char *path);
+#define has_dos_drive_prefix win32_has_dos_drive_prefix
+
 int win32_skip_dos_drive_prefix(char **path);
 #define skip_dos_drive_prefix win32_skip_dos_drive_prefix
 static inline int win32_is_dir_sep(int c)
@@ -18,3 +22,5 @@ static inline char *win32_find_last_dir_sep(const char *path)
 #define find_last_dir_sep win32_find_last_dir_sep
 int win32_offset_1st_component(const char *path);
 #define offset_1st_component win32_offset_1st_component
+
+#endif
diff --git a/third_party/git/compat/win32/pthread.h b/third_party/git/compat/win32/pthread.h
index c6cb8dd21900..737983d00bae 100644
--- a/third_party/git/compat/win32/pthread.h
+++ b/third_party/git/compat/win32/pthread.h
@@ -50,8 +50,8 @@ typedef struct {
 	DWORD tid;
 } pthread_t;
 
-extern int pthread_create(pthread_t *thread, const void *unused,
-			  void *(*start_routine)(void*), void *arg);
+int pthread_create(pthread_t *thread, const void *unused,
+		   void *(*start_routine)(void*), void *arg);
 
 /*
  * To avoid the need of copying a struct, we use small macro wrapper to pass
@@ -59,10 +59,10 @@ extern int pthread_create(pthread_t *thread, const void *unused,
  */
 #define pthread_join(a, b) win32_pthread_join(&(a), (b))
 
-extern int win32_pthread_join(pthread_t *thread, void **value_ptr);
+int win32_pthread_join(pthread_t *thread, void **value_ptr);
 
 #define pthread_equal(t1, t2) ((t1).tid == (t2).tid)
-extern pthread_t pthread_self(void);
+pthread_t pthread_self(void);
 
 static inline void NORETURN pthread_exit(void *ret)
 {
diff --git a/third_party/git/compat/winansi.c b/third_party/git/compat/winansi.c
index cacd82c833a6..c27b20a79d91 100644
--- a/third_party/git/compat/winansi.c
+++ b/third_party/git/compat/winansi.c
@@ -546,7 +546,7 @@ static HANDLE swap_osfhnd(int fd, HANDLE new_handle)
 typedef struct _OBJECT_NAME_INFORMATION
 {
 	UNICODE_STRING Name;
-	WCHAR NameBuffer[0];
+	WCHAR NameBuffer[FLEX_ARRAY];
 } OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION;
 
 #define ObjectNameInformation 1
@@ -662,10 +662,20 @@ void winansi_init(void)
  */
 HANDLE winansi_get_osfhandle(int fd)
 {
+	HANDLE ret;
+
 	if (fd == 1 && (fd_is_interactive[1] & FD_SWAPPED))
 		return hconsole1;
 	if (fd == 2 && (fd_is_interactive[2] & FD_SWAPPED))
 		return hconsole2;
 
-	return (HANDLE)_get_osfhandle(fd);
+	ret = (HANDLE)_get_osfhandle(fd);
+
+	/*
+	 * There are obviously circumstances under which _get_osfhandle()
+	 * returns (HANDLE)-2. This is not documented anywhere, but that is so
+	 * clearly an invalid handle value that we can just work around this
+	 * and return the correct value for invalid handles.
+	 */
+	return ret == (HANDLE)-2 ? INVALID_HANDLE_VALUE : ret;
 }
diff --git a/third_party/git/config.c b/third_party/git/config.c
index 3900e4947be9..d17d2bd9dcde 100644
--- a/third_party/git/config.c
+++ b/third_party/git/config.c
@@ -204,7 +204,7 @@ static int prepare_include_condition_pattern(struct strbuf *pat)
 		strbuf_splice(pat, 0, 1, path.buf, slash - path.buf);
 		prefix = slash - path.buf + 1 /* slash */;
 	} else if (!is_absolute_path(pat->buf))
-		strbuf_insert(pat, 0, "**/", 3);
+		strbuf_insertstr(pat, 0, "**/");
 
 	add_trailing_starstar_for_dir(pat);
 
@@ -275,7 +275,7 @@ static int include_by_branch(const char *cond, size_t cond_len)
 	int flags;
 	int ret;
 	struct strbuf pattern = STRBUF_INIT;
-	const char *refname = !the_repository || !the_repository->gitdir ?
+	const char *refname = !the_repository->gitdir ?
 		NULL : resolve_ref_unsafe("HEAD", 0, NULL, &flags);
 	const char *shortname;
 
@@ -1204,7 +1204,7 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
 			default_abbrev = -1;
 		else {
 			int abbrev = git_config_int(var, value);
-			if (abbrev < minimum_abbrev || abbrev > 40)
+			if (abbrev < minimum_abbrev || abbrev > the_hash_algo->hexsz)
 				return error(_("abbrev length out of range: %d"), abbrev);
 			default_abbrev = abbrev;
 		}
@@ -1364,6 +1364,11 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "core.sparsecheckoutcone")) {
+		core_sparse_checkout_cone = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (!strcmp(var, "core.precomposeunicode")) {
 		precomposed_unicode = git_config_bool(var, value);
 		return 0;
@@ -1379,11 +1384,6 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
-	if (!strcmp(var, "core.partialclonefilter")) {
-		return git_config_string(&core_partial_clone_filter_default,
-					 var, value);
-	}
-
 	if (!strcmp(var, "core.usereplacerefs")) {
 		read_replace_refs = git_config_bool(var, value);
 		return 0;
@@ -1702,6 +1702,7 @@ static int do_git_config_sequence(const struct config_options *opts,
 	char *xdg_config = xdg_config_home("config");
 	char *user_config = expand_user_path("~/.gitconfig", 0);
 	char *repo_config;
+	enum config_scope prev_parsing_scope = current_parsing_scope;
 
 	if (opts->commondir)
 		repo_config = mkpathdup("%s/config", opts->commondir);
@@ -1724,15 +1725,12 @@ static int do_git_config_sequence(const struct config_options *opts,
 	if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK))
 		ret += git_config_from_file(fn, user_config, data);
 
-	current_parsing_scope = CONFIG_SCOPE_REPO;
+	current_parsing_scope = CONFIG_SCOPE_LOCAL;
 	if (!opts->ignore_repo && repo_config &&
 	    !access_or_die(repo_config, R_OK, 0))
 		ret += git_config_from_file(fn, repo_config, data);
 
-	/*
-	 * Note: this should have a new scope, CONFIG_SCOPE_WORKTREE.
-	 * But let's not complicate things before it's actually needed.
-	 */
+	current_parsing_scope = CONFIG_SCOPE_WORKTREE;
 	if (!opts->ignore_worktree && repository_format_worktree_config) {
 		char *path = git_pathdup("config.worktree");
 		if (!access_or_die(path, R_OK, 0))
@@ -1740,11 +1738,11 @@ static int do_git_config_sequence(const struct config_options *opts,
 		free(path);
 	}
 
-	current_parsing_scope = CONFIG_SCOPE_CMDLINE;
+	current_parsing_scope = CONFIG_SCOPE_COMMAND;
 	if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0)
 		die(_("unable to parse command-line config"));
 
-	current_parsing_scope = CONFIG_SCOPE_UNKNOWN;
+	current_parsing_scope = prev_parsing_scope;
 	free(xdg_config);
 	free(user_config);
 	free(repo_config);
@@ -1765,6 +1763,9 @@ int config_with_options(config_fn_t fn, void *data,
 		data = &inc;
 	}
 
+	if (config_source)
+		current_parsing_scope = config_source->scope;
+
 	/*
 	 * If we have a specific filename, use it. Otherwise, follow the
 	 * regular lookup sequence.
@@ -1861,9 +1862,9 @@ static struct config_set_element *configset_find_element(struct config_set *cs,
 	if (git_config_parse_key(key, &normalized_key, NULL))
 		return NULL;
 
-	hashmap_entry_init(&k, strhash(normalized_key));
+	hashmap_entry_init(&k.ent, strhash(normalized_key));
 	k.key = normalized_key;
-	found_entry = hashmap_get(&cs->config_hash, &k, NULL);
+	found_entry = hashmap_get_entry(&cs->config_hash, &k, ent, NULL);
 	free(normalized_key);
 	return found_entry;
 }
@@ -1882,10 +1883,10 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
 	 */
 	if (!e) {
 		e = xmalloc(sizeof(*e));
-		hashmap_entry_init(e, strhash(key));
+		hashmap_entry_init(&e->ent, strhash(key));
 		e->key = xstrdup(key);
 		string_list_init(&e->value_list, 1);
-		hashmap_add(&cs->config_hash, e);
+		hashmap_add(&cs->config_hash, &e->ent);
 	}
 	si = string_list_append_nodup(&e->value_list, xstrdup_or_null(value));
 
@@ -1913,12 +1914,14 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
 }
 
 static int config_set_element_cmp(const void *unused_cmp_data,
-				  const void *entry,
-				  const void *entry_or_key,
+				  const struct hashmap_entry *eptr,
+				  const struct hashmap_entry *entry_or_key,
 				  const void *unused_keydata)
 {
-	const struct config_set_element *e1 = entry;
-	const struct config_set_element *e2 = entry_or_key;
+	const struct config_set_element *e1, *e2;
+
+	e1 = container_of(eptr, const struct config_set_element, ent);
+	e2 = container_of(entry_or_key, const struct config_set_element, ent);
 
 	return strcmp(e1->key, e2->key);
 }
@@ -1939,12 +1942,12 @@ void git_configset_clear(struct config_set *cs)
 	if (!cs->hash_initialized)
 		return;
 
-	hashmap_iter_init(&cs->config_hash, &iter);
-	while ((entry = hashmap_iter_next(&iter))) {
+	hashmap_for_each_entry(&cs->config_hash, &iter, entry,
+				ent /* member name */) {
 		free(entry->key);
 		string_list_clear(&entry->value_list, 1);
 	}
-	hashmap_free(&cs->config_hash, 1);
+	hashmap_free_entries(&cs->config_hash, struct config_set_element, ent);
 	cs->hash_initialized = 0;
 	free(cs->list.items);
 	cs->list.nr = 0;
@@ -2288,30 +2291,6 @@ int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestam
 	return -1; /* thing exists but cannot be parsed */
 }
 
-int git_config_get_untracked_cache(void)
-{
-	int val = -1;
-	const char *v;
-
-	/* Hack for test programs like test-dump-untracked-cache */
-	if (ignore_untracked_cache_config)
-		return -1;
-
-	if (!git_config_get_maybe_bool("core.untrackedcache", &val))
-		return val;
-
-	if (!git_config_get_value("core.untrackedcache", &v)) {
-		if (!strcasecmp(v, "keep"))
-			return -1;
-
-		error(_("unknown core.untrackedCache value '%s'; "
-			"using 'keep' default value"), v);
-		return -1;
-	}
-
-	return -1; /* default value */
-}
-
 int git_config_get_split_index(void)
 {
 	int val;
@@ -3319,6 +3298,26 @@ const char *current_config_origin_type(void)
 	}
 }
 
+const char *config_scope_name(enum config_scope scope)
+{
+	switch (scope) {
+	case CONFIG_SCOPE_SYSTEM:
+		return "system";
+	case CONFIG_SCOPE_GLOBAL:
+		return "global";
+	case CONFIG_SCOPE_LOCAL:
+		return "local";
+	case CONFIG_SCOPE_WORKTREE:
+		return "worktree";
+	case CONFIG_SCOPE_COMMAND:
+		return "command";
+	case CONFIG_SCOPE_SUBMODULE:
+		return "submodule";
+	default:
+		return "unknown";
+	}
+}
+
 const char *current_config_name(void)
 {
 	const char *name;
@@ -3339,6 +3338,14 @@ enum config_scope current_config_scope(void)
 		return current_parsing_scope;
 }
 
+int current_config_line(void)
+{
+	if (current_config_kvi)
+		return current_config_kvi->linenr;
+	else
+		return cf->linenr;
+}
+
 int lookup_config(const char **mapping, int nr_mapping, const char *var)
 {
 	int i;
diff --git a/third_party/git/config.h b/third_party/git/config.h
index f0ed464004da..9b3773f77826 100644
--- a/third_party/git/config.h
+++ b/third_party/git/config.h
@@ -4,6 +4,22 @@
 #include "hashmap.h"
 #include "string-list.h"
 
+
+/**
+ * The config API gives callers a way to access Git configuration files
+ * (and files which have the same syntax).
+ *
+ * General Usage
+ * -------------
+ *
+ * Config files are parsed linearly, and each variable found is passed to a
+ * caller-provided callback function. The callback function is responsible
+ * for any actions to be taken on the config option, and is free to ignore
+ * some options. It is not uncommon for the configuration to be parsed
+ * several times during the run of a Git program, with different callbacks
+ * picking out different variables useful to themselves.
+ */
+
 struct object_id;
 
 /* git_config_parse_key() returns these negated: */
@@ -19,10 +35,22 @@ struct object_id;
 
 #define CONFIG_REGEX_NONE ((void *)1)
 
+enum config_scope {
+	CONFIG_SCOPE_UNKNOWN = 0,
+	CONFIG_SCOPE_SYSTEM,
+	CONFIG_SCOPE_GLOBAL,
+	CONFIG_SCOPE_LOCAL,
+	CONFIG_SCOPE_WORKTREE,
+	CONFIG_SCOPE_COMMAND,
+	CONFIG_SCOPE_SUBMODULE,
+};
+const char *config_scope_name(enum config_scope scope);
+
 struct git_config_source {
 	unsigned int use_stdin:1;
 	const char *file;
 	const char *blob;
+	enum config_scope scope;
 };
 
 enum config_origin_type {
@@ -71,9 +99,34 @@ struct config_options {
 	} error_action;
 };
 
+/**
+ * A config callback function takes three parameters:
+ *
+ * - the name of the parsed variable. This is in canonical "flat" form: the
+ *   section, subsection, and variable segments will be separated by dots,
+ *   and the section and variable segments will be all lowercase. E.g.,
+ *   `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the found variable, as a string. If the variable had no
+ *   value specified, the value will be NULL (typically this means it
+ *   should be interpreted as boolean true).
+ *
+ * - a void pointer passed in by the caller of the config API; this can
+ *   contain callback-specific data
+ *
+ * A config callback should return 0 for success, or -1 if the variable
+ * could not be parsed properly.
+ */
 typedef int (*config_fn_t)(const char *, const char *, void *);
+
 int git_default_config(const char *, const char *, void *);
+
+/**
+ * Read a specific file in git-config format.
+ * This function takes the same callback and data parameters as `git_config`.
+ */
 int git_config_from_file(config_fn_t fn, const char *, void *);
+
 int git_config_from_file_with_options(config_fn_t fn, const char *,
 				      void *,
 				      const struct config_options *);
@@ -88,34 +141,157 @@ void git_config_push_parameter(const char *text);
 int git_config_from_parameters(config_fn_t fn, void *data);
 void read_early_config(config_fn_t cb, void *data);
 void read_very_early_config(config_fn_t cb, void *data);
+
+/**
+ * Most programs will simply want to look up variables in all config files
+ * that Git knows about, using the normal precedence rules. To do this,
+ * call `git_config` with a callback function and void data pointer.
+ *
+ * `git_config` will read all config sources in order of increasing
+ * priority. Thus a callback should typically overwrite previously-seen
+ * entries with new ones (e.g., if both the user-wide `~/.gitconfig` and
+ * repo-specific `.git/config` contain `color.ui`, the config machinery
+ * will first feed the user-wide one to the callback, and then the
+ * repo-specific one; by overwriting, the higher-priority repo-specific
+ * value is left at the end).
+ */
 void git_config(config_fn_t fn, void *);
+
+/**
+ * Lets the caller examine config while adjusting some of the default
+ * behavior of `git_config`. It should almost never be used by "regular"
+ * Git code that is looking up configuration variables.
+ * It is intended for advanced callers like `git-config`, which are
+ * intentionally tweaking the normal config-lookup process.
+ * It takes two extra parameters:
+ *
+ * - `config_source`
+ * If this parameter is non-NULL, it specifies the source to parse for
+ * configuration, rather than looking in the usual files. See `struct
+ * git_config_source` in `config.h` for details. Regular `git_config` defaults
+ * to `NULL`.
+ *
+ * - `opts`
+ * Specify options to adjust the behavior of parsing config files. See `struct
+ * config_options` in `config.h` for details. As an example: regular `git_config`
+ * sets `opts.respect_includes` to `1` by default.
+ */
 int config_with_options(config_fn_t fn, void *,
 			struct git_config_source *config_source,
 			const struct config_options *opts);
+
+/**
+ * Value Parsing Helpers
+ * ---------------------
+ *
+ * The following helper functions aid in parsing string values
+ */
+
 int git_parse_ssize_t(const char *, ssize_t *);
 int git_parse_ulong(const char *, unsigned long *);
+
+/**
+ * Same as `git_config_bool`, except that it returns -1 on error rather
+ * than dying.
+ */
 int git_parse_maybe_bool(const char *);
+
+/**
+ * Parse the string to an integer, including unit factors. Dies on error;
+ * otherwise, returns the parsed result.
+ */
 int git_config_int(const char *, const char *);
+
 int64_t git_config_int64(const char *, const char *);
+
+/**
+ * Identical to `git_config_int`, but for unsigned longs.
+ */
 unsigned long git_config_ulong(const char *, const char *);
+
 ssize_t git_config_ssize_t(const char *, const char *);
+
+/**
+ * Same as `git_config_bool`, except that integers are returned as-is, and
+ * an `is_bool` flag is unset.
+ */
 int git_config_bool_or_int(const char *, const char *, int *);
+
+/**
+ * Parse a string into a boolean value, respecting keywords like "true" and
+ * "false". Integer values are converted into true/false values (when they
+ * are non-zero or zero, respectively). Other values cause a die(). If
+ * parsing is successful, the return value is the result.
+ */
 int git_config_bool(const char *, const char *);
+
+/**
+ * Allocates and copies the value string into the `dest` parameter; if no
+ * string is given, prints an error message and returns -1.
+ */
 int git_config_string(const char **, const char *, const char *);
+
+/**
+ * Similar to `git_config_string`, but expands `~` or `~user` into the
+ * user's home directory when found at the beginning of the path.
+ */
 int git_config_pathname(const char **, const char *, const char *);
+
 int git_config_expiry_date(timestamp_t *, const char *, const char *);
 int git_config_color(char *, const char *, const char *);
 int git_config_set_in_file_gently(const char *, const char *, const char *);
+
+/**
+ * write config values to a specific config file, takes a key/value pair as
+ * parameter.
+ */
 void git_config_set_in_file(const char *, const char *, const char *);
+
 int git_config_set_gently(const char *, const char *);
+
+/**
+ * write config values to `.git/config`, takes a key/value pair as parameter.
+ */
 void git_config_set(const char *, const char *);
+
 int git_config_parse_key(const char *, char **, int *);
 int git_config_key_is_valid(const char *key);
 int git_config_set_multivar_gently(const char *, const char *, const char *, int);
 void git_config_set_multivar(const char *, const char *, const char *, int);
 int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int);
+
+/**
+ * takes four parameters:
+ *
+ * - the name of the file, as a string, to which key/value pairs will be written.
+ *
+ * - the name of key, as a string. This is in canonical "flat" form: the section,
+ *   subsection, and variable segments will be separated by dots, and the section
+ *   and variable segments will be all lowercase.
+ *   E.g., `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the variable, as a string. If value is equal to NULL, it will
+ *   remove the matching key from the config file.
+ *
+ * - the value regex, as a string. It will disregard key/value pairs where value
+ *   does not match.
+ *
+ * - a multi_replace value, as an int. If value is equal to zero, nothing or only
+ *   one matching key/value is replaced, else all matching key/values (regardless
+ *   how many) are removed, before the new pair is written.
+ *
+ * It returns 0 on success.
+ */
 void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
+
+/**
+ * rename or remove sections in the config file
+ * parameters `old_name` and `new_name`
+ * If NULL is passed through `new_name` parameter,
+ * the section will be removed from the config file.
+ */
 int git_config_rename_section(const char *, const char *);
+
 int git_config_rename_section_in_file(const char *, const char *, const char *);
 int git_config_copy_section(const char *, const char *);
 int git_config_copy_section_in_file(const char *, const char *, const char *);
@@ -130,18 +306,35 @@ int config_error_nonbool(const char *);
 
 int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
 
-enum config_scope {
-	CONFIG_SCOPE_UNKNOWN = 0,
-	CONFIG_SCOPE_SYSTEM,
-	CONFIG_SCOPE_GLOBAL,
-	CONFIG_SCOPE_REPO,
-	CONFIG_SCOPE_CMDLINE,
-};
-
 enum config_scope current_config_scope(void);
 const char *current_config_origin_type(void);
 const char *current_config_name(void);
+int current_config_line(void);
 
+/**
+ * Include Directives
+ * ------------------
+ *
+ * By default, the config parser does not respect include directives.
+ * However, a caller can use the special `git_config_include` wrapper
+ * callback to support them. To do so, you simply wrap your "real" callback
+ * function and data pointer in a `struct config_include_data`, and pass
+ * the wrapper to the regular config-reading functions. For example:
+ *
+ * -------------------------------------------
+ * int read_file_with_include(const char *file, config_fn_t fn, void *data)
+ * {
+ * struct config_include_data inc = CONFIG_INCLUDE_INIT;
+ * inc.fn = fn;
+ * inc.data = data;
+ * return git_config_from_file(git_config_include, file, &inc);
+ * }
+ * -------------------------------------------
+ *
+ * `git_config` respects includes automatically. The lower-level
+ * `git_config_from_file` does not.
+ *
+ */
 struct config_include_data {
 	int depth;
 	config_fn_t fn;
@@ -169,6 +362,33 @@ int parse_config_key(const char *var,
 		     const char **subsection, int *subsection_len,
 		     const char **key);
 
+/**
+ * Custom Configsets
+ * -----------------
+ *
+ * A `config_set` can be used to construct an in-memory cache for
+ * config-like files that the caller specifies (i.e., files like `.gitmodules`,
+ * `~/.gitconfig` etc.). For example,
+ *
+ * ----------------------------------------
+ * struct config_set gm_config;
+ * git_configset_init(&gm_config);
+ * int b;
+ * //we add config files to the config_set
+ * git_configset_add_file(&gm_config, ".gitmodules");
+ * git_configset_add_file(&gm_config, ".gitmodules_alt");
+ *
+ * if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
+ * //hack hack hack
+ * }
+ *
+ * when we are done with the configset:
+ * git_configset_clear(&gm_config);
+ * ----------------------------------------
+ *
+ * Configset API provides functions for the above mentioned work flow
+ */
+
 struct config_set_element {
 	struct hashmap_entry ent;
 	char *key;
@@ -197,16 +417,47 @@ struct config_set {
 	struct configset_list list;
 };
 
+/**
+ * Initializes the config_set `cs`.
+ */
 void git_configset_init(struct config_set *cs);
+
+/**
+ * Parses the file and adds the variable-value pairs to the `config_set`,
+ * dies if there is an error in parsing the file. Returns 0 on success, or
+ * -1 if the file does not exist or is inaccessible. The user has to decide
+ * if he wants to free the incomplete configset or continue using it when
+ * the function returns -1.
+ */
 int git_configset_add_file(struct config_set *cs, const char *filename);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key` and config set `cs`. When the
+ * configuration variable `key` is not found, returns NULL. The caller
+ * should not free or modify the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
+
+/**
+ * Clears `config_set` structure, removes all saved variable-value pairs.
+ */
 void git_configset_clear(struct config_set *cs);
 
 /*
  * These functions return 1 if not found, and 0 if found, leaving the found
  * value in the 'dest' pointer.
  */
+
+/*
+ * Finds the highest-priority value for the configuration variable `key`
+ * and config set `cs`, stores the pointer to it in `value` and returns 0.
+ * When the configuration variable `key` is not found, returns 1 without
+ * touching `value`. The caller should not free or modify `value`, as it
+ * is owned by the cache.
+ */
 int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
+
 int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
 int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
 int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
@@ -240,17 +491,94 @@ int repo_config_get_maybe_bool(struct repository *repo,
 int repo_config_get_pathname(struct repository *repo,
 			     const char *key, const char **dest);
 
+/**
+ * Querying For Specific Variables
+ * -------------------------------
+ *
+ * For programs wanting to query for specific variables in a non-callback
+ * manner, the config API provides two functions `git_config_get_value`
+ * and `git_config_get_value_multi`. They both read values from an internal
+ * cache generated previously from reading the config files.
+ */
+
+/**
+ * Finds the highest-priority value for the configuration variable `key`,
+ * stores the pointer to it in `value` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `value`. The caller should not free or modify `value`, as it is owned
+ * by the cache.
+ */
 int git_config_get_value(const char *key, const char **value);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key`. When the configuration variable
+ * `key` is not found, returns NULL. The caller should not free or modify
+ * the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_config_get_value_multi(const char *key);
+
+/**
+ * Resets and invalidates the config cache.
+ */
 void git_config_clear(void);
+
+/**
+ * Allocates and copies the retrieved string into the `dest` parameter for
+ * the configuration variable `key`; if NULL string is given, prints an
+ * error message and returns -1. When the configuration variable `key` is
+ * not found, returns 1 without touching `dest`.
+ */
 int git_config_get_string_const(const char *key, const char **dest);
+
+/**
+ * Similar to `git_config_get_string_const`, except that retrieved value
+ * copied into the `dest` parameter is a mutable string.
+ */
 int git_config_get_string(const char *key, char **dest);
+
+/**
+ * Finds and parses the value to an integer for the configuration variable
+ * `key`. Dies on error; otherwise, stores the value of the parsed integer in
+ * `dest` and returns 0. When the configuration variable `key` is not found,
+ * returns 1 without touching `dest`.
+ */
 int git_config_get_int(const char *key, int *dest);
+
+/**
+ * Similar to `git_config_get_int` but for unsigned longs.
+ */
 int git_config_get_ulong(const char *key, unsigned long *dest);
+
+/**
+ * Finds and parses the value into a boolean value, for the configuration
+ * variable `key` respecting keywords like "true" and "false". Integer
+ * values are converted into true/false values (when they are non-zero or
+ * zero, respectively). Other values cause a die(). If parsing is successful,
+ * stores the value of the parsed result in `dest` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `dest`.
+ */
 int git_config_get_bool(const char *key, int *dest);
+
+/**
+ * Similar to `git_config_get_bool`, except that integers are copied as-is,
+ * and `is_bool` flag is unset.
+ */
 int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest);
+
+/**
+ * Similar to `git_config_get_bool`, except that it returns -1 on error
+ * rather than dying.
+ */
 int git_config_get_maybe_bool(const char *key, int *dest);
+
+/**
+ * Similar to `git_config_get_string`, but expands `~` or `~user` into
+ * the user's home directory when found at the beginning of the path.
+ */
 int git_config_get_pathname(const char *key, const char **dest);
+
 int git_config_get_index_threads(int *dest);
 int git_config_get_untracked_cache(void);
 int git_config_get_split_index(void);
@@ -270,7 +598,19 @@ struct key_value_info {
 	enum config_scope scope;
 };
 
+/**
+ * First prints the error message specified by the caller in `err` and then
+ * dies printing the line number and the file name of the highest priority
+ * value for the configuration variable `key`.
+ */
 NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
+
+/**
+ * Helper function which formats the die error message according to the
+ * parameters entered. Used by `git_die_config()`. It can be used by callers
+ * handling `git_config_get_value_multi()` to print the correct error message
+ * for the desired value.
+ */
 NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
 
 #define LOOKUP_CONFIG(mapping, var) \
diff --git a/third_party/git/config.mak.dev b/third_party/git/config.mak.dev
index bf1f3fcdeed3..89b218d11a53 100644
--- a/third_party/git/config.mak.dev
+++ b/third_party/git/config.mak.dev
@@ -9,7 +9,6 @@ endif
 DEVELOPER_CFLAGS += -Wall
 DEVELOPER_CFLAGS += -Wdeclaration-after-statement
 DEVELOPER_CFLAGS += -Wformat-security
-DEVELOPER_CFLAGS += -Wno-format-zero-length
 DEVELOPER_CFLAGS += -Wold-style-definition
 DEVELOPER_CFLAGS += -Woverflow
 DEVELOPER_CFLAGS += -Wpointer-arith
diff --git a/third_party/git/config.mak.uname b/third_party/git/config.mak.uname
index db7f06b95fda..0ab8e0093839 100644
--- a/third_party/git/config.mak.uname
+++ b/third_party/git/config.mak.uname
@@ -454,7 +454,6 @@ ifneq ($(USE_MSVC_CRTDBG),)
 	# Optionally enable memory leak reporting.
 	BASIC_CFLAGS += -DUSE_MSVC_CRTDBG
 endif
-	BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
 	# Always give "-Zi" to the compiler and "-debug" to linker (even in
 	# release mode) to force a PDB to be generated (like RelWithDebInfo).
 	BASIC_CFLAGS += -Zi
@@ -616,7 +615,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 		compat/win32/path-utils.o \
 		compat/win32/pthread.o compat/win32/syslog.o \
 		compat/win32/dirent.o
-	BASIC_CFLAGS += -DWIN32 -DPROTECT_NTFS_DEFAULT=1
+	BASIC_CFLAGS += -DWIN32
 	EXTLIBS += -lws2_32
 	GITLIBS += git.res
 	PTHREAD_LIBS =
@@ -703,20 +702,24 @@ vcxproj:
 	perl contrib/buildsystems/generate -g Vcxproj
 	git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
 
-	# Generate the LinkOrCopyBuiltins.targets file
+	# Generate the LinkOrCopyBuiltins.targets and LinkOrCopyRemoteHttp.targets file
 	(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
 	 echo '  <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
 	 for name in $(BUILT_INS);\
 	 do \
 	   echo '    <Copy SourceFiles="$$(OutDir)\git.exe" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
 	 done && \
+	 echo '  </Target>' && \
+	 echo '</Project>') >git/LinkOrCopyBuiltins.targets
+	(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
+	 echo '  <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
 	 for name in $(REMOTE_CURL_ALIASES); \
 	 do \
 	   echo '    <Copy SourceFiles="$$(OutDir)\'"$(REMOTE_CURL_PRIMARY)"'" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
 	 done && \
 	 echo '  </Target>' && \
-	 echo '</Project>') >git/LinkOrCopyBuiltins.targets
-	git add -f git/LinkOrCopyBuiltins.targets
+	 echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
+	git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
 
 	# Add command-list.h
 	$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h
@@ -724,11 +727,10 @@ vcxproj:
 
 	# Add scripts
 	rm -f perl/perl.mak
-	$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 \
-		$(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
+	$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(SCRIPT_LIB) $(SCRIPTS)
 	# Strip out the sane tool path, needed only for building
 	sed -i '/^git_broken_path_fix ".*/d' git-sh-setup
-	git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
+	git add -f $(SCRIPT_LIB) $(SCRIPTS)
 
 	# Add Perl module
 	$(MAKE) $(LIB_PERL_GEN)
@@ -758,6 +760,10 @@ vcxproj:
 	$(MAKE) -C templates
 	git add -f templates/boilerplates.made templates/blt/
 
+	# Add the translated messages
+	make MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(MOFILES)
+	git add -f $(MOFILES)
+
 	# Add build options
 	$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 GIT-BUILD-OPTIONS
 	git add -f GIT-BUILD-OPTIONS
diff --git a/third_party/git/configure.ac b/third_party/git/configure.ac
index a43b47640233..66aedb9288fe 100644
--- a/third_party/git/configure.ac
+++ b/third_party/git/configure.ac
@@ -85,7 +85,7 @@ AC_DEFUN([GIT_PARSE_WITH],
 
 # GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT)
 # -----------------------------------------------------
-# Set VAR to the value specied by --with-WITHNAME.
+# Set VAR to the value specified by --with-WITHNAME.
 # No verification of arguments is performed, but warnings are issued
 # if either 'yes' or 'no' is specified.
 # HELP_TEXT is presented when --help is called.
@@ -844,12 +844,61 @@ AC_MSG_CHECKING([for old iconv()])
 AC_COMPILE_IFELSE([OLDICONVTEST_SRC],
 	[AC_MSG_RESULT([no])],
 	[AC_MSG_RESULT([yes])
+	AC_DEFINE(HAVE_OLD_ICONV, 1)
 	OLD_ICONV=UnfortunatelyYes])
 
 GIT_UNSTASH_FLAGS($ICONVDIR)
 
 GIT_CONF_SUBST([OLD_ICONV])
 
+#
+# Define ICONV_OMITS_BOM if you are on a system which
+# iconv omits bom for utf-{16,32}
+if test -z "$NO_ICONV"; then
+AC_CACHE_CHECK([whether iconv omits bom for utf-16 and utf-32],
+ [ac_cv_iconv_omits_bom],
+[
+old_LIBS="$LIBS"
+if test -n "$NEEDS_LIBICONV"; then
+	LIBS="$LIBS -liconv"
+fi
+
+AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+	#include <iconv.h>
+	#ifdef HAVE_OLD_ICONV
+	typedef const char *iconv_ibp;
+	#else
+	typedef char *iconv_ibp;
+	#endif
+	],
+	[[
+	int v;
+	iconv_t conv;
+	char in[] = "a"; iconv_ibp pin = in;
+	char out[20] = ""; char *pout = out;
+	size_t isz = sizeof in;
+	size_t osz = sizeof out;
+
+	conv = iconv_open("UTF-16", "UTF-8");
+	iconv(conv, &pin, &isz, &pout, &osz);
+	iconv_close(conv);
+	v = (unsigned char)(out[0]) + (unsigned char)(out[1]);
+	return v != 0xfe + 0xff;
+	]])],
+	[ac_cv_iconv_omits_bom=no],
+	[ac_cv_iconv_omits_bom=yes])
+
+LIBS="$old_LIBS"
+])
+if test "x$ac_cv_iconv_omits_bom" = xyes; then
+	ICONV_OMITS_BOM=Yes
+else
+	ICONV_OMITS_BOM=
+fi
+GIT_CONF_SUBST([ICONV_OMITS_BOM])
+fi
+
 ## Checks for typedefs, structures, and compiler characteristics.
 AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics])
 #
diff --git a/third_party/git/connect.c b/third_party/git/connect.c
index 2778481264d0..b6451ab5e890 100644
--- a/third_party/git/connect.c
+++ b/third_party/git/connect.c
@@ -511,7 +511,7 @@ int url_is_local_not_ssh(const char *url)
 	const char *colon = strchr(url, ':');
 	const char *slash = strchr(url, '/');
 	return !colon || (slash && slash < colon) ||
-		has_dos_drive_prefix(url);
+		(has_dos_drive_prefix(url) && is_valid_path(url));
 }
 
 static const char *prot_name(enum protocol protocol)
@@ -915,6 +915,10 @@ static enum protocol parse_connect_url(const char *url_orig, char **ret_host,
 
 	if (protocol == PROTO_LOCAL)
 		path = end;
+	else if (protocol == PROTO_FILE && *host != '/' &&
+		 !has_dos_drive_prefix(host) &&
+		 offset_1st_component(host - 2) > 1)
+		path = host - 2; /* include the leading "//" */
 	else if (protocol == PROTO_FILE && has_dos_drive_prefix(end))
 		path = end; /* "file://$(pwd)" may be "file://C:/projects/repo" */
 	else
diff --git a/third_party/git/connected.c b/third_party/git/connected.c
index cd9b324afa5a..7e9bd1bc622e 100644
--- a/third_party/git/connected.c
+++ b/third_party/git/connected.c
@@ -5,6 +5,7 @@
 #include "connected.h"
 #include "transport.h"
 #include "packfile.h"
+#include "promisor-remote.h"
 
 /*
  * If we feed all the commits we want to verify to this command
@@ -28,6 +29,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 	struct packed_git *new_pack = NULL;
 	struct transport *transport;
 	size_t base_len;
+	const unsigned hexsz = the_hash_algo->hexsz;
 
 	if (!opt)
 		opt = &defaults;
@@ -50,18 +52,28 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 		strbuf_release(&idx_file);
 	}
 
-	if (opt->check_refs_only) {
+	if (opt->check_refs_are_promisor_objects_only) {
 		/*
 		 * For partial clones, we don't want to have to do a regular
 		 * connectivity check because we have to enumerate and exclude
 		 * all promisor objects (slow), and then the connectivity check
 		 * itself becomes a no-op because in a partial clone every
 		 * object is a promisor object. Instead, just make sure we
-		 * received the objects pointed to by each wanted ref.
+		 * received, in a promisor packfile, the objects pointed to by
+		 * each wanted ref.
 		 */
 		do {
-			if (!repo_has_object_file(the_repository, &oid))
-				return 1;
+			struct packed_git *p;
+
+			for (p = get_all_packs(the_repository); p; p = p->next) {
+				if (!p->pack_promisor)
+					continue;
+				if (find_pack_entry_one(oid.hash, p))
+					goto promisor_pack_found;
+			}
+			return 1;
+promisor_pack_found:
+			;
 		} while (!fn(cb_data, &oid));
 		return 0;
 	}
@@ -73,7 +85,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 	argv_array_push(&rev_list.args,"rev-list");
 	argv_array_push(&rev_list.args, "--objects");
 	argv_array_push(&rev_list.args, "--stdin");
-	if (repository_format_partial_clone)
+	if (has_promisor_remote())
 		argv_array_push(&rev_list.args, "--exclude-promisor-objects");
 	if (!opt->is_deepening_fetch) {
 		argv_array_push(&rev_list.args, "--not");
@@ -99,7 +111,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 
 	sigchain_push(SIGPIPE, SIG_IGN);
 
-	commit[GIT_SHA1_HEXSZ] = '\n';
+	commit[hexsz] = '\n';
 	do {
 		/*
 		 * If index-pack already checked that:
@@ -112,8 +124,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 		if (new_pack && find_pack_entry_one(oid.hash, new_pack))
 			continue;
 
-		memcpy(commit, oid_to_hex(&oid), GIT_SHA1_HEXSZ);
-		if (write_in_full(rev_list.in, commit, GIT_SHA1_HEXSZ + 1) < 0) {
+		memcpy(commit, oid_to_hex(&oid), hexsz);
+		if (write_in_full(rev_list.in, commit, hexsz + 1) < 0) {
 			if (errno != EPIPE && errno != EINVAL)
 				error_errno(_("failed write to rev-list"));
 			err = -1;
diff --git a/third_party/git/connected.h b/third_party/git/connected.h
index ce2e7d8f2e53..eba5c261bac1 100644
--- a/third_party/git/connected.h
+++ b/third_party/git/connected.h
@@ -48,12 +48,13 @@ struct check_connected_options {
 	unsigned is_deepening_fetch : 1;
 
 	/*
-	 * If non-zero, only check the top-level objects referenced by the
-	 * wanted refs (passed in as cb_data). This is useful for partial
-	 * clones, where enumerating and excluding all promisor objects is very
-	 * slow and the commit-walk itself becomes a no-op.
+	 * If non-zero, only check that the top-level objects referenced by the
+	 * wanted refs (passed in as cb_data) are promisor objects. This is
+	 * useful for partial clones, where enumerating and excluding all
+	 * promisor objects is very slow and the commit-walk itself becomes a
+	 * no-op.
 	 */
-	unsigned check_refs_only : 1;
+	unsigned check_refs_are_promisor_objects_only : 1;
 };
 
 #define CHECK_CONNECTED_INIT { 0 }
diff --git a/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm b/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm
index 576ccabe1dbd..5c666f9ac03b 100644
--- a/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm
@@ -79,7 +79,8 @@ sub createProject {
     if (!$static_library) {
       $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
       $libs_debug = $libs_release;
-      $libs_debug =~ s/zlib\.lib/zlibd\.lib/;
+      $libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
+      $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
     }
 
     $defines =~ s/-D//g;
@@ -119,13 +120,13 @@ sub createProject {
     <VCPKGArch Condition="'\$(Platform)'=='Win32'">x86-windows</VCPKGArch>
     <VCPKGArch Condition="'\$(Platform)'!='Win32'">x64-windows</VCPKGArch>
     <VCPKGArchDirectory>$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)</VCPKGArchDirectory>
-    <VCPKGBinDirectory Condition="'\(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\bin</VCPKGBinDirectory>
-    <VCPKGLibDirectory Condition="'\(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\lib</VCPKGLibDirectory>
-    <VCPKGBinDirectory Condition="'\(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\bin</VCPKGBinDirectory>
-    <VCPKGLibDirectory Condition="'\(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\lib</VCPKGLibDirectory>
+    <VCPKGBinDirectory Condition="'\$(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\bin</VCPKGBinDirectory>
+    <VCPKGLibDirectory Condition="'\$(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\lib</VCPKGLibDirectory>
+    <VCPKGBinDirectory Condition="'\$(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\bin</VCPKGBinDirectory>
+    <VCPKGLibDirectory Condition="'\$(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\lib</VCPKGLibDirectory>
     <VCPKGIncludeDirectory>\$(VCPKGArchDirectory)\\include</VCPKGIncludeDirectory>
-    <VCPKGLibs Condition="'\(Configuration)'=='Debug'">$libs_debug</VCPKGLibs>
-    <VCPKGLibs Condition="'\(Configuration)'!='Debug'">$libs_release</VCPKGLibs>
+    <VCPKGLibs Condition="'\$(Configuration)'=='Debug'">$libs_debug</VCPKGLibs>
+    <VCPKGLibs Condition="'\$(Configuration)'!='Debug'">$libs_release</VCPKGLibs>
   </PropertyGroup>
   <Import Project="\$(VCTargetsPath)\\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'\$(Configuration)'=='Debug'" Label="Configuration">
@@ -277,6 +278,9 @@ EOM
     if ($target eq 'git') {
       print F "  <Import Project=\"LinkOrCopyBuiltins.targets\" />\n";
     }
+    if ($target eq 'git-remote-http') {
+      print F "  <Import Project=\"LinkOrCopyRemoteHttp.targets\" />\n";
+    }
     print F << "EOM";
 </Project>
 EOM
diff --git a/third_party/git/contrib/buildsystems/engine.pl b/third_party/git/contrib/buildsystems/engine.pl
index fba8a3f056a0..070978506ad5 100755
--- a/third_party/git/contrib/buildsystems/engine.pl
+++ b/third_party/git/contrib/buildsystems/engine.pl
@@ -343,9 +343,9 @@ sub handleLinkLine
         } elsif ("$part" eq "-lz") {
             push(@libs, "zlib.lib");
         } elsif ("$part" eq "-lcrypto") {
-            push(@libs, "libeay32.lib");
+            push(@libs, "libcrypto.lib");
         } elsif ("$part" eq "-lssl") {
-            push(@libs, "ssleay32.lib");
+            push(@libs, "libssl.lib");
         } elsif ("$part" eq "-lcurl") {
             push(@libs, "libcurl.lib");
         } elsif ("$part" eq "-lexpat") {
diff --git a/third_party/git/contrib/coccinelle/commit.cocci b/third_party/git/contrib/coccinelle/commit.cocci
index d03453341e84..778e4704f6a2 100644
--- a/third_party/git/contrib/coccinelle/commit.cocci
+++ b/third_party/git/contrib/coccinelle/commit.cocci
@@ -20,7 +20,7 @@ expression s;
 + set_commit_tree(c, s)
   ...>}
 
-// These excluded functions must access c->maybe_tree direcly.
+// These excluded functions must access c->maybe_tree directly.
 // Note that if c->maybe_tree is written somewhere outside of these
 // functions, then the recommended transformation will be bogus with
 // repo_get_commit_tree() on the LHS.
diff --git a/third_party/git/contrib/coccinelle/hashmap.cocci b/third_party/git/contrib/coccinelle/hashmap.cocci
new file mode 100644
index 000000000000..d69e120ccffc
--- /dev/null
+++ b/third_party/git/contrib/coccinelle/hashmap.cocci
@@ -0,0 +1,16 @@
+@ hashmap_entry_init_usage @
+expression E;
+struct hashmap_entry HME;
+@@
+- HME.hash = E;
++ hashmap_entry_init(&HME, E);
+
+@@
+identifier f !~ "^hashmap_entry_init$";
+expression E;
+struct hashmap_entry *HMEP;
+@@
+  f(...) {<...
+- HMEP->hash = E;
++ hashmap_entry_init(HMEP, E);
+  ...>}
diff --git a/third_party/git/contrib/coccinelle/object_id.cocci b/third_party/git/contrib/coccinelle/object_id.cocci
index 3e536a9834b6..ddf4f22bd722 100644
--- a/third_party/git/contrib/coccinelle/object_id.cocci
+++ b/third_party/git/contrib/coccinelle/object_id.cocci
@@ -13,38 +13,6 @@ struct object_id *OIDPTR;
 @@
 struct object_id OID;
 @@
-- sha1_to_hex(OID.hash)
-+ oid_to_hex(&OID)
-
-@@
-identifier f != oid_to_hex;
-struct object_id *OIDPTR;
-@@
-  f(...) {<...
-- sha1_to_hex(OIDPTR->hash)
-+ oid_to_hex(OIDPTR)
-  ...>}
-
-@@
-expression E;
-struct object_id OID;
-@@
-- sha1_to_hex_r(E, OID.hash)
-+ oid_to_hex_r(E, &OID)
-
-@@
-identifier f != oid_to_hex_r;
-expression E;
-struct object_id *OIDPTR;
-@@
-   f(...) {<...
-- sha1_to_hex_r(E, OIDPTR->hash)
-+ oid_to_hex_r(E, OIDPTR)
-  ...>}
-
-@@
-struct object_id OID;
-@@
 - hashclr(OID.hash)
 + oidclr(&OID)
 
diff --git a/third_party/git/contrib/completion/git-completion.bash b/third_party/git/contrib/completion/git-completion.bash
index e087c4bf0085..c21786f2fd00 100644
--- a/third_party/git/contrib/completion/git-completion.bash
+++ b/third_party/git/contrib/completion/git-completion.bash
@@ -340,7 +340,7 @@ __gitcomp ()
 			c="$c${4-}"
 			if [[ $c == "$cur_"* ]]; then
 				case $c in
-				--*=*|*.) ;;
+				--*=|*.) ;;
 				*) c="$c " ;;
 				esac
 				COMPREPLY[i++]="${2-}$c"
@@ -360,7 +360,7 @@ __gitcomp ()
 			c="$c${4-}"
 			if [[ $c == "$cur_"* ]]; then
 				case $c in
-				--*=*|*.) ;;
+				*=|*.) ;;
 				*) c="$c " ;;
 				esac
 				COMPREPLY[i++]="${2-}$c"
@@ -524,7 +524,7 @@ __git_index_files ()
 			# Even when a directory name itself does not contain
 			# any special characters, it will still be quoted if
 			# any of its (stripped) trailing path components do.
-			# Because of this we may have seen the same direcory
+			# Because of this we may have seen the same directory
 			# both quoted and unquoted.
 			if (p in paths)
 				# We have seen the same directory unquoted,
@@ -550,7 +550,7 @@ __git_index_files ()
 						 esc_idx, 1)
 			} else if (esc == "n") {
 				# Uh-oh, a newline character.
-				# We cant reliably put a pathname
+				# We cannot reliably put a pathname
 				# containing a newline into COMPREPLY,
 				# and the newline would create a mess.
 				# Skip this path.
@@ -565,7 +565,7 @@ __git_index_files ()
 			}
 		}
 		# Drop closing double quote, if there is one.
-		# (There isnt any if this is a directory, as it was
+		# (There is not any if this is a directory, as it was
 		# already stripped with the trailing path components.)
 		if (substr(p, length(p), 1) == "\"")
 			out = out substr(p, 1, length(p) - 1)
@@ -1069,15 +1069,32 @@ __git_aliased_command ()
 	done
 }
 
-# __git_find_on_cmdline requires 1 argument
+# Check whether one of the given words is present on the command line,
+# and print the first word found.
+#
+# Usage: __git_find_on_cmdline [<option>]... "<wordlist>"
+# --show-idx: Optionally show the index of the found word in the $words array.
 __git_find_on_cmdline ()
 {
-	local word subcommand c=1
+	local word c=1 show_idx
+
+	while test $# -gt 1; do
+		case "$1" in
+		--show-idx)	show_idx=y ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+	local wordlist="$1"
+
 	while [ $c -lt $cword ]; do
-		word="${words[c]}"
-		for subcommand in $1; do
-			if [ "$subcommand" = "$word" ]; then
-				echo "$subcommand"
+		for word in $wordlist; do
+			if [ "$word" = "${words[c]}" ]; then
+				if [ -n "$show_idx" ]; then
+					echo "$c $word"
+				else
+					echo "$word"
+				fi
 				return
 			fi
 		done
@@ -1180,6 +1197,7 @@ __git_count_arguments ()
 
 __git_whitespacelist="nowarn warn error error-all fix"
 __git_patchformat="mbox stgit stgit-series hg mboxrd"
+__git_showcurrentpatch="diff raw"
 __git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
 
 _git_am ()
@@ -1198,6 +1216,10 @@ _git_am ()
 		__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
 		return
 		;;
+	--show-current-patch=*)
+		__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin am "" \
 			"$__git_am_inprogress_options"
@@ -1250,10 +1272,7 @@ _git_archive ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--format= --list --verbose
-			--prefix= --remote= --exec= --output
-			"
+		__gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes"
 		return
 		;;
 	esac
@@ -1361,7 +1380,9 @@ _git_checkout ()
 	esac
 }
 
-__git_cherry_pick_inprogress_options="--continue --quit --abort"
+__git_sequencer_inprogress_options="--continue --quit --abort --skip"
+
+__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
 
 _git_cherry_pick ()
 {
@@ -1399,7 +1420,18 @@ _git_clean ()
 
 _git_clone ()
 {
+	case "$prev" in
+	-c|--config)
+		__git_complete_config_variable_name_and_value
+		return
+		;;
+	esac
 	case "$cur" in
+	--config=*)
+		__git_complete_config_variable_name_and_value \
+			--cur="${cur##--config=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin clone
 		return
@@ -1460,9 +1492,16 @@ __git_diff_algorithms="myers minimal patience histogram"
 
 __git_diff_submodule_formats="diff log short"
 
+__git_color_moved_opts="no default plain blocks zebra dimmed-zebra"
+
+__git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change
+			ignore-all-space allow-indentation-change"
+
 __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
+			--color-moved --color-moved= --no-color-moved
+			--color-moved-ws= --no-color-moved-ws
 			--full-index --binary --abbrev --diff-filter=
 			--find-copies-harder --ignore-cr-at-eol
 			--text --ignore-space-at-eol --ignore-space-change
@@ -1476,6 +1515,8 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
 			--submodule --submodule= --ignore-submodules
+			--indent-heuristic --no-indent-heuristic
+			--textconv --no-textconv
 "
 
 _git_diff ()
@@ -1491,6 +1532,14 @@ _git_diff ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--color-moved=*)
+		__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
+		return
+		;;
+	--color-moved-ws=*)
+		__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
+		return
+		;;
 	--*)
 		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
 			--base --ours --theirs --no-index
@@ -1737,7 +1786,7 @@ __git_log_shortlog_options="
 	--all-match --invert-grep
 "
 
-__git_log_pretty_formats="oneline short medium full fuller email raw format: mboxrd"
+__git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
 __git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
 
 _git_log ()
@@ -1784,6 +1833,10 @@ _git_log ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--no-walk=*)
+		__gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
+		return
+		;;
 	--*)
 		__gitcomp "
 			$__git_log_common_options
@@ -1791,16 +1844,19 @@ _git_log ()
 			$__git_log_gitk_options
 			--root --topo-order --date-order --reverse
 			--follow --full-diff
-			--abbrev-commit --abbrev=
+			--abbrev-commit --no-abbrev-commit --abbrev=
 			--relative-date --date=
 			--pretty= --format= --oneline
 			--show-signature
 			--cherry-mark
 			--cherry-pick
 			--graph
-			--decorate --decorate=
+			--decorate --decorate= --no-decorate
 			--walk-reflogs
+			--no-walk --no-walk= --do-walk
 			--parents --children
+			--expand-tabs --expand-tabs= --no-expand-tabs
+			--patch
 			$merge
 			$__git_diff_common_options
 			--pickaxe-all --pickaxe-regex
@@ -2004,15 +2060,18 @@ _git_range_diff ()
 	__git_complete_revlist
 }
 
+__git_rebase_inprogress_options="--continue --skip --abort --quit --show-current-patch"
+__git_rebase_interactive_inprogress_options="$__git_rebase_inprogress_options --edit-todo"
+
 _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch"
+		__gitcomp "$__git_rebase_interactive_inprogress_options"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "--continue --skip --abort --quit --show-current-patch"
+		__gitcomp "$__git_rebase_inprogress_options"
 		return
 	fi
 	__git_complete_strategy && return
@@ -2021,20 +2080,13 @@ _git_rebase ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--onto=*)
+		__git_complete_refs --cur="${cur##--onto=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--onto --merge --strategy --interactive
-			--rebase-merges --preserve-merges --stat --no-stat
-			--committer-date-is-author-date --ignore-date
-			--ignore-whitespace --whitespace=
-			--autosquash --no-autosquash
-			--fork-point --no-fork-point
-			--autostash --no-autostash
-			--verify --no-verify
-			--keep-empty --root --force-rebase --no-ff
-			--rerere-autoupdate
-			--exec
-			"
+		__gitcomp_builtin rebase "" \
+			"$__git_rebase_interactive_inprogress_options"
 
 		return
 	esac
@@ -2225,181 +2277,282 @@ __git_config_vars=
 __git_compute_config_vars ()
 {
 	test -n "$__git_config_vars" ||
-	__git_config_vars="$(git help --config-for-completion | sort | uniq)"
+	__git_config_vars="$(git help --config-for-completion | sort -u)"
 }
 
-_git_config ()
+# Completes possible values of various configuration variables.
+#
+# Usage: __git_complete_config_variable_value [<option>]...
+# --varname=<word>: The name of the configuration variable whose value is
+#                   to be completed.  Defaults to the previous word on the
+#                   command line.
+# --cur=<word>: The current value to be completed.  Defaults to the current
+#               word to be completed.
+__git_complete_config_variable_value ()
 {
-	local varname
+	local varname="$prev" cur_="$cur"
+
+	while test $# != 0; do
+		case "$1" in
+		--varname=*)	varname="${1##--varname=}" ;;
+		--cur=*)	cur_="${1##--cur=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
 
 	if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
-		varname="${prev,,}"
+		varname="${varname,,}"
 	else
-		varname="$(echo "$prev" |tr A-Z a-z)"
+		varname="$(echo "$varname" |tr A-Z a-z)"
 	fi
 
 	case "$varname" in
 	branch.*.remote|branch.*.pushremote)
-		__gitcomp_nl "$(__git_remotes)"
+		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
 		return
 		;;
 	branch.*.merge)
-		__git_complete_refs
+		__git_complete_refs --cur="$cur_"
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true merges preserve interactive"
+		__gitcomp "false true merges preserve interactive" "" "$cur_"
 		return
 		;;
 	remote.pushdefault)
-		__gitcomp_nl "$(__git_remotes)"
+		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
 		return
 		;;
 	remote.*.fetch)
-		local remote="${prev#remote.}"
+		local remote="${varname#remote.}"
 		remote="${remote%.fetch}"
-		if [ -z "$cur" ]; then
+		if [ -z "$cur_" ]; then
 			__gitcomp_nl "refs/heads/" "" "" ""
 			return
 		fi
-		__gitcomp_nl "$(__git_refs_remotes "$remote")"
+		__gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_"
 		return
 		;;
 	remote.*.push)
-		local remote="${prev#remote.}"
+		local remote="${varname#remote.}"
 		remote="${remote%.push}"
 		__gitcomp_nl "$(__git for-each-ref \
-			--format='%(refname):%(refname)' refs/heads)"
+			--format='%(refname):%(refname)' refs/heads)" "" "$cur_"
 		return
 		;;
 	pull.twohead|pull.octopus)
 		__git_compute_merge_strategies
-		__gitcomp "$__git_merge_strategies"
-		return
-		;;
-	color.branch|color.diff|color.interactive|\
-	color.showbranch|color.status|color.ui)
-		__gitcomp "always never auto"
+		__gitcomp "$__git_merge_strategies" "" "$cur_"
 		return
 		;;
 	color.pager)
-		__gitcomp "false true"
+		__gitcomp "false true" "" "$cur_"
 		return
 		;;
 	color.*.*)
 		__gitcomp "
 			normal black red green yellow blue magenta cyan white
 			bold dim ul blink reverse
-			"
+			" "" "$cur_"
+		return
+		;;
+	color.*)
+		__gitcomp "false true always never auto" "" "$cur_"
 		return
 		;;
 	diff.submodule)
-		__gitcomp "$__git_diff_submodule_formats"
+		__gitcomp "$__git_diff_submodule_formats" "" "$cur_"
 		return
 		;;
 	help.format)
-		__gitcomp "man info web html"
+		__gitcomp "man info web html" "" "$cur_"
 		return
 		;;
 	log.date)
-		__gitcomp "$__git_log_date_formats"
+		__gitcomp "$__git_log_date_formats" "" "$cur_"
 		return
 		;;
 	sendemail.aliasfiletype)
-		__gitcomp "mutt mailrc pine elm gnus"
+		__gitcomp "mutt mailrc pine elm gnus" "" "$cur_"
 		return
 		;;
 	sendemail.confirm)
-		__gitcomp "$__git_send_email_confirm_options"
+		__gitcomp "$__git_send_email_confirm_options" "" "$cur_"
 		return
 		;;
 	sendemail.suppresscc)
-		__gitcomp "$__git_send_email_suppresscc_options"
+		__gitcomp "$__git_send_email_suppresscc_options" "" "$cur_"
 		return
 		;;
 	sendemail.transferencoding)
-		__gitcomp "7bit 8bit quoted-printable base64"
-		return
-		;;
-	--get|--get-all|--unset|--unset-all)
-		__gitcomp_nl "$(__git_config_get_set_variables)"
+		__gitcomp "7bit 8bit quoted-printable base64" "" "$cur_"
 		return
 		;;
 	*.*)
 		return
 		;;
 	esac
-	case "$cur" in
-	--*)
-		__gitcomp_builtin config
-		return
-		;;
+}
+
+# Completes configuration sections, subsections, variable names.
+#
+# Usage: __git_complete_config_variable_name [<option>]...
+# --cur=<word>: The current configuration section/variable name to be
+#               completed.  Defaults to the current word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each fully completed
+#                 configuration variable name (but not to sections or
+#                 subsections) instead of the default space.
+__git_complete_config_variable_name ()
+{
+	local cur_="$cur" sfx
+
+	while test $# != 0; do
+		case "$1" in
+		--cur=*)	cur_="${1##--cur=}" ;;
+		--sfx=*)	sfx="${1##--sfx=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	case "$cur_" in
 	branch.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	branch.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur%.*}."
+		cur_="${cur#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
+		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	guitool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
 		__gitcomp "
 			argPrompt cmd confirm needsFile noConsole noRescan
 			prompt revPrompt revUnmerged title
-			" "$pfx" "$cur_"
+			" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	difftool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	man.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	mergetool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	pager.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_"
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
 		__gitcomp "
 			url proxy fetch push mirror skipDefaultUpdate
 			receivepack uploadpack tagOpt pushurl
-			" "$pfx" "$cur_"
+			" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
+		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	url.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	*.*)
 		__git_compute_config_vars
-		__gitcomp "$__git_config_vars"
+		__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
 		;;
 	*)
 		__git_compute_config_vars
-		__gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
+		__gitcomp "$(echo "$__git_config_vars" |
+				awk -F . '{
+					sections[$1] = 1
+				}
+				END {
+					for (s in sections)
+						print s "."
+				}
+				')" "" "$cur_"
+		;;
+	esac
+}
+
+# Completes '='-separated configuration sections/variable names and values
+# for 'git -c section.name=value'.
+#
+# Usage: __git_complete_config_variable_name_and_value [<option>]...
+# --cur=<word>: The current configuration section/variable name/value to be
+#               completed. Defaults to the current word to be completed.
+__git_complete_config_variable_name_and_value ()
+{
+	local cur_="$cur"
+
+	while test $# != 0; do
+		case "$1" in
+		--cur=*)	cur_="${1##--cur=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	case "$cur_" in
+	*=*)
+		__git_complete_config_variable_value \
+			--varname="${cur_%%=*}" --cur="${cur_#*=}"
+		;;
+	*)
+		__git_complete_config_variable_name --cur="$cur_" --sfx='='
+		;;
+	esac
+}
+
+_git_config ()
+{
+	case "$prev" in
+	--get|--get-all|--unset|--unset-all)
+		__gitcomp_nl "$(__git_config_get_set_variables)"
+		return
+		;;
+	*.*)
+		__git_complete_config_variable_value
+		return
+		;;
+	esac
+	case "$cur" in
+	--*)
+		__gitcomp_builtin config
+		;;
+	*)
+		__git_complete_config_variable_name
+		;;
 	esac
 }
 
@@ -2512,7 +2665,7 @@ _git_restore ()
 	esac
 }
 
-__git_revert_inprogress_options="--continue --quit --abort"
+__git_revert_inprogress_options=$__git_sequencer_inprogress_options
 
 _git_revert ()
 {
@@ -2580,8 +2733,9 @@ _git_show ()
 		return
 		;;
 	--*)
-		__gitcomp "--pretty= --format= --abbrev-commit --oneline
-			--show-signature
+		__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
+			--oneline --show-signature --patch
+			--expand-tabs --expand-tabs= --no-expand-tabs
 			$__git_diff_common_options
 			"
 		return
@@ -2601,6 +2755,27 @@ _git_show_branch ()
 	__git_complete_revlist
 }
 
+_git_sparse_checkout ()
+{
+	local subcommands="list init set disable"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	init,--*)
+		__gitcomp "--cone"
+		;;
+	set,--*)
+		__gitcomp "--stdin"
+		;;
+	*)
+		;;
+	esac
+}
+
 _git_stash ()
 {
 	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
@@ -2666,7 +2841,7 @@ _git_submodule ()
 {
 	__git_has_doubledash && return
 
-	local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs"
+	local subcommands="add status init deinit update set-branch set-url summary foreach sync absorbgitdirs"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
@@ -2730,6 +2905,7 @@ _git_svn ()
 			--log-window-size= --no-checkout --quiet
 			--repack-flags --use-log-author --localtime
 			--add-author-from
+			--recursive
 			--ignore-paths= --include-paths= $remote_opts
 			"
 		local init_opts="
@@ -2851,33 +3027,83 @@ _git_whatchanged ()
 	_git_log
 }
 
+__git_complete_worktree_paths ()
+{
+	local IFS=$'\n'
+	__gitcomp_nl "$(git worktree list --porcelain |
+		# Skip the first entry: it's the path of the main worktree,
+		# which can't be moved, removed, locked, etc.
+		sed -n -e '2,$ s/^worktree //p')"
+}
+
 _git_worktree ()
 {
 	local subcommands="add list lock move prune remove unlock"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
+	local subcommand subcommand_idx
+
+	subcommand="$(__git_find_on_cmdline --show-idx "$subcommands")"
+	subcommand_idx="${subcommand% *}"
+	subcommand="${subcommand#* }"
+
+	case "$subcommand,$cur" in
+	,*)
 		__gitcomp "$subcommands"
-	else
-		case "$subcommand,$cur" in
-		add,--*)
-			__gitcomp_builtin worktree_add
-			;;
-		list,--*)
-			__gitcomp_builtin worktree_list
-			;;
-		lock,--*)
-			__gitcomp_builtin worktree_lock
-			;;
-		prune,--*)
-			__gitcomp_builtin worktree_prune
-			;;
-		remove,--*)
-			__gitcomp "--force"
+		;;
+	*,--*)
+		__gitcomp_builtin worktree_$subcommand
+		;;
+	add,*)	# usage: git worktree add [<options>] <path> [<commit-ish>]
+		# Here we are not completing an --option, it's either the
+		# path or a ref.
+		case "$prev" in
+		-b|-B)	# Complete refs for branch to be created/reseted.
+			__git_complete_refs
 			;;
-		*)
+		-*)	# The previous word is an -o|--option without an
+			# unstuck argument: have to complete the path for
+			# the new worktree, so don't list anything, but let
+			# Bash fall back to filename completion.
+			;;
+		*)	# The previous word is not an --option, so it must
+			# be either the 'add' subcommand, the unstuck
+			# argument of an option (e.g. branch for -b|-B), or
+			# the path for the new worktree.
+			if [ $cword -eq $((subcommand_idx+1)) ]; then
+				# Right after the 'add' subcommand: have to
+				# complete the path, so fall back to Bash
+				# filename completion.
+				:
+			else
+				case "${words[cword-2]}" in
+				-b|-B)	# After '-b <branch>': have to
+					# complete the path, so fall back
+					# to Bash filename completion.
+					;;
+				*)	# After the path: have to complete
+					# the ref to be checked out.
+					__git_complete_refs
+					;;
+				esac
+			fi
 			;;
 		esac
-	fi
+		;;
+	lock,*|remove,*|unlock,*)
+		__git_complete_worktree_paths
+		;;
+	move,*)
+		if [ $cword -eq $((subcommand_idx+1)) ]; then
+			# The first parameter must be an existing working
+			# tree to be moved.
+			__git_complete_worktree_paths
+		else
+			# The second parameter is the destination: it could
+			# be any path, so don't list anything, but let Bash
+			# fall back to filename completion.
+			:
+		fi
+		;;
+	esac
 }
 
 __git_complete_common () {
@@ -2956,7 +3182,11 @@ __git_main ()
 			# Bash filename completion
 			return
 			;;
-		-c|--namespace)
+		-c)
+			__git_complete_config_variable_name_and_value
+			return
+			;;
+		--namespace)
 			# we don't support completing these options' arguments
 			return
 			;;
diff --git a/third_party/git/contrib/completion/git-completion.zsh b/third_party/git/contrib/completion/git-completion.zsh
index 886bf95d1f59..eef4eff53dff 100644
--- a/third_party/git/contrib/completion/git-completion.zsh
+++ b/third_party/git/contrib/completion/git-completion.zsh
@@ -11,8 +11,9 @@
 #
 #  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
 #
-# The recommended way to install this script is to copy to '~/.zsh/_git', and
-# then add the following to your ~/.zshrc file:
+# The recommended way to install this script is to make a copy of it in
+# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following
+# to your ~/.zshrc file:
 #
 #  fpath=(~/.zsh $fpath)
 
diff --git a/third_party/git/contrib/completion/git-prompt.sh b/third_party/git/contrib/completion/git-prompt.sh
index 1d510cd47bef..014cd7c3cfcc 100644
--- a/third_party/git/contrib/completion/git-prompt.sh
+++ b/third_party/git/contrib/completion/git-prompt.sh
@@ -429,11 +429,7 @@ __git_ps1 ()
 		__git_eread "$g/rebase-merge/head-name" b
 		__git_eread "$g/rebase-merge/msgnum" step
 		__git_eread "$g/rebase-merge/end" total
-		if [ -f "$g/rebase-merge/interactive" ]; then
-			r="|REBASE-i"
-		else
-			r="|REBASE-m"
-		fi
+		r="|REBASE"
 	else
 		if [ -d "$g/rebase-apply" ]; then
 			__git_eread "$g/rebase-apply/next" step
diff --git a/third_party/git/contrib/credential/netrc/.gitignore b/third_party/git/contrib/credential/netrc/.gitignore
new file mode 100644
index 000000000000..d41cdde84b6a
--- /dev/null
+++ b/third_party/git/contrib/credential/netrc/.gitignore
@@ -0,0 +1 @@
+git-credential-netrc
diff --git a/third_party/git/contrib/credential/netrc/Makefile b/third_party/git/contrib/credential/netrc/Makefile
index 6174e3bb8382..c284fb8ac490 100644
--- a/third_party/git/contrib/credential/netrc/Makefile
+++ b/third_party/git/contrib/credential/netrc/Makefile
@@ -1,8 +1,30 @@
 # The default target of this Makefile is...
 all::
 
-test:
+SCRIPT_PERL = git-credential-netrc.perl
+GIT_ROOT_DIR = ../../..
+HERE = contrib/credential/netrc
+
+SCRIPT_PERL_FULL = $(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
+
+all:: build
+
+build:
+	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+                build-perl-script
+
+install: build
+	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+                install-perl-script
+
+clean:
+	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+                clean-perl-script
+
+test: build
 	./t-git-credential-netrc.sh
 
-testverbose:
+testverbose: build
 	./t-git-credential-netrc.sh -d -v
+
+.PHONY: all build install clean test testverbose
diff --git a/third_party/git/contrib/credential/netrc/git-credential-netrc b/third_party/git/contrib/credential/netrc/git-credential-netrc.perl
index ebfc123ec641..bc57cc65884b 100755
--- a/third_party/git/contrib/credential/netrc/git-credential-netrc
+++ b/third_party/git/contrib/credential/netrc/git-credential-netrc.perl
@@ -423,7 +423,7 @@ sub load_config {
 	# load settings from git config
 	my $options = shift;
 	# set from command argument, gpg.program option, or default to gpg
-	$options->{'gpg'} //= Git->repository()->config('gpg.program')
+	$options->{'gpg'} //= Git::config('gpg.program')
 	                  // 'gpg';
 	log_verbose("using $options{'gpg'} for GPG operations");
 }
diff --git a/third_party/git/contrib/diff-highlight/DiffHighlight.pm b/third_party/git/contrib/diff-highlight/DiffHighlight.pm
index 7440aa1c4638..e2589922a659 100644
--- a/third_party/git/contrib/diff-highlight/DiffHighlight.pm
+++ b/third_party/git/contrib/diff-highlight/DiffHighlight.pm
@@ -72,7 +72,7 @@ sub handle_line {
 	      (?:$COLOR?\|$COLOR?[ ])* # zero or more trailing "|"
 	                         [ ]*  # trailing whitespace for merges
 	    /x) {
-	        my $graph_prefix = $&;
+		my $graph_prefix = $&;
 
 		# We must flush before setting graph indent, since the
 		# new commit may be indented differently from what we
diff --git a/third_party/git/contrib/hg-to-git/hg-to-git.py b/third_party/git/contrib/hg-to-git/hg-to-git.py
index de3f81667ed9..7eb1b24cc7a1 100755
--- a/third_party/git/contrib/hg-to-git/hg-to-git.py
+++ b/third_party/git/contrib/hg-to-git/hg-to-git.py
@@ -42,7 +42,7 @@ hgnewcsets = 0
 
 def usage():
 
-        print """\
+        print("""\
 %s: [OPTIONS] <hgprj>
 
 options:
@@ -54,7 +54,7 @@ options:
 
 required:
     hgprj:  name of the HG project to import (directory)
-""" % sys.argv[0]
+""" % sys.argv[0])
 
 #------------------------------------------------------------------------------
 
@@ -104,22 +104,22 @@ os.chdir(hgprj)
 if state:
     if os.path.exists(state):
         if verbose:
-            print 'State does exist, reading'
+            print('State does exist, reading')
         f = open(state, 'r')
         hgvers = pickle.load(f)
     else:
-        print 'State does not exist, first run'
+        print('State does not exist, first run')
 
 sock = os.popen('hg tip --template "{rev}"')
 tip = sock.read()
 if sock.close():
     sys.exit(1)
 if verbose:
-    print 'tip is', tip
+    print('tip is', tip)
 
 # Calculate the branches
 if verbose:
-    print 'analysing the branches...'
+    print('analysing the branches...')
 hgchildren["0"] = ()
 hgparents["0"] = (None, None)
 hgbranch["0"] = "master"
@@ -154,15 +154,15 @@ for cset in range(1, int(tip) + 1):
         else:
             hgbranch[str(cset)] = "branch-" + str(cset)
 
-if not hgvers.has_key("0"):
-    print 'creating repository'
+if "0" not in hgvers:
+    print('creating repository')
     os.system('git init')
 
 # loop through every hg changeset
 for cset in range(int(tip) + 1):
 
     # incremental, already seen
-    if hgvers.has_key(str(cset)):
+    if str(cset) in hgvers:
         continue
     hgnewcsets += 1
 
@@ -180,27 +180,27 @@ for cset in range(int(tip) + 1):
     os.write(fdcomment, csetcomment)
     os.close(fdcomment)
 
-    print '-----------------------------------------'
-    print 'cset:', cset
-    print 'branch:', hgbranch[str(cset)]
-    print 'user:', user
-    print 'date:', date
-    print 'comment:', csetcomment
+    print('-----------------------------------------')
+    print('cset:', cset)
+    print('branch:', hgbranch[str(cset)])
+    print('user:', user)
+    print('date:', date)
+    print('comment:', csetcomment)
     if parent:
-	print 'parent:', parent
+        print('parent:', parent)
     if mparent:
-        print 'mparent:', mparent
+        print('mparent:', mparent)
     if tag:
-        print 'tag:', tag
-    print '-----------------------------------------'
+        print('tag:', tag)
+    print('-----------------------------------------')
 
     # checkout the parent if necessary
     if cset != 0:
         if hgbranch[str(cset)] == "branch-" + str(cset):
-            print 'creating new branch', hgbranch[str(cset)]
+            print('creating new branch', hgbranch[str(cset)])
             os.system('git checkout -b %s %s' % (hgbranch[str(cset)], hgvers[parent]))
         else:
-            print 'checking out branch', hgbranch[str(cset)]
+            print('checking out branch', hgbranch[str(cset)])
             os.system('git checkout %s' % hgbranch[str(cset)])
 
     # merge
@@ -209,7 +209,7 @@ for cset in range(int(tip) + 1):
             otherbranch = hgbranch[mparent]
         else:
             otherbranch = hgbranch[parent]
-        print 'merging', otherbranch, 'into', hgbranch[str(cset)]
+        print('merging', otherbranch, 'into', hgbranch[str(cset)])
         os.system(getgitenv(user, date) + 'git merge --no-commit -s ours "" %s %s' % (hgbranch[str(cset)], otherbranch))
 
     # remove everything except .git and .hg directories
@@ -233,12 +233,12 @@ for cset in range(int(tip) + 1):
 
     # delete branch if not used anymore...
     if mparent and len(hgchildren[str(cset)]):
-        print "Deleting unused branch:", otherbranch
+        print("Deleting unused branch:", otherbranch)
         os.system('git branch -d %s' % otherbranch)
 
     # retrieve and record the version
     vvv = os.popen('git show --quiet --pretty=format:%H').read()
-    print 'record', cset, '->', vvv
+    print('record', cset, '->', vvv)
     hgvers[str(cset)] = vvv
 
 if hgnewcsets >= opt_nrepack and opt_nrepack != -1:
@@ -247,7 +247,7 @@ if hgnewcsets >= opt_nrepack and opt_nrepack != -1:
 # write the state for incrementals
 if state:
     if verbose:
-        print 'Writing state'
+        print('Writing state')
     f = open(state, 'w')
     pickle.dump(hgvers, f)
 
diff --git a/third_party/git/contrib/hooks/multimail/git_multimail.py b/third_party/git/contrib/hooks/multimail/git_multimail.py
index 8823399e7522..f563be82fc7e 100755
--- a/third_party/git/contrib/hooks/multimail/git_multimail.py
+++ b/third_party/git/contrib/hooks/multimail/git_multimail.py
@@ -95,7 +95,7 @@ if PYTHON3:
     unicode = str
 
     def write_str(f, msg):
-        # Try outputing with the default encoding. If it fails,
+        # Try outputting with the default encoding. If it fails,
         # try UTF-8.
         try:
             f.buffer.write(msg.encode(sys.getdefaultencoding()))
@@ -2129,7 +2129,7 @@ class SMTPMailer(Mailer):
                 # equivalent to
                 #     self.smtp.ehlo()
                 #     self.smtp.starttls()
-                # with acces to the ssl layer
+                # with access to the ssl layer
                 self.smtp.ehlo()
                 if not self.smtp.has_extn("starttls"):
                     raise smtplib.SMTPException("STARTTLS extension not supported by server")
@@ -2148,7 +2148,7 @@ class SMTPMailer(Mailer):
                         cert_reqs=ssl.CERT_NONE
                         )
                     self.environment.get_logger().error(
-                        '*** Warning, the server certificat is not verified (smtp) ***\n'
+                        '*** Warning, the server certificate is not verified (smtp) ***\n'
                         '***          set the option smtpCACerts                   ***\n'
                         )
                 if not hasattr(self.smtp.sock, "read"):
@@ -3189,7 +3189,7 @@ class ProjectdescEnvironmentMixin(Environment):
         self.COMPUTED_KEYS += ['projectdesc']
 
     def get_projectdesc(self):
-        """Return a one-line descripition of the project."""
+        """Return a one-line description of the project."""
 
         git_dir = get_git_dir()
         try:
diff --git a/third_party/git/contrib/hooks/multimail/post-receive.example b/third_party/git/contrib/hooks/multimail/post-receive.example
index b9bb11834e1f..0f98c5a23db1 100755
--- a/third_party/git/contrib/hooks/multimail/post-receive.example
+++ b/third_party/git/contrib/hooks/multimail/post-receive.example
@@ -56,7 +56,7 @@ config = git_multimail.Config('multimailhook')
 
 # Set some Git configuration variables. Equivalent to passing var=val
 # to "git -c var=val" each time git is called, or to adding the
-# configuration in .git/config (must come before instanciating the
+# configuration in .git/config (must come before instantiating the
 # environment) :
 #git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html')
 #git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com'))
diff --git a/third_party/git/contrib/hooks/post-receive-email b/third_party/git/contrib/hooks/post-receive-email
index 8747b84334f3..ff565eb3d881 100755
--- a/third_party/git/contrib/hooks/post-receive-email
+++ b/third_party/git/contrib/hooks/post-receive-email
@@ -329,7 +329,7 @@ generate_update_branch_email()
 	#
 	#  git rev-parse --not --all | grep -v $(git rev-parse $refname)
 	#
-	# Get's us to something pretty safe (apart from the small time
+	# Gets us to something pretty safe (apart from the small time
 	# between refname being read, and git rev-parse running - for that,
 	# I give up)
 	#
diff --git a/third_party/git/contrib/hooks/update-paranoid b/third_party/git/contrib/hooks/update-paranoid
index d18b317b2f01..0092d67b8a47 100755
--- a/third_party/git/contrib/hooks/update-paranoid
+++ b/third_party/git/contrib/hooks/update-paranoid
@@ -49,7 +49,7 @@ opcode.
 Repository sections are matched on the basename of the repository
 (after removing the .git suffix).
 
-The opcode abbrevations are:
+The opcode abbreviations are:
 
   C: create new ref
   D: delete existing ref
diff --git a/third_party/git/contrib/mw-to-git/.perlcriticrc b/third_party/git/contrib/mw-to-git/.perlcriticrc
index 158958d36357..b7333267adad 100644
--- a/third_party/git/contrib/mw-to-git/.perlcriticrc
+++ b/third_party/git/contrib/mw-to-git/.perlcriticrc
@@ -14,7 +14,7 @@
 
 # This rule states that each system call should have its return value checked
 # The problem is that it includes the print call. Checking every print call's
-# return value would be harmful to the code readabilty.
+# return value would be harmful to the code readability.
 # This configuration keeps all default function but print.
 [InputOutput::RequireCheckedSyscalls]
 functions = open say close
diff --git a/third_party/git/contrib/mw-to-git/git-remote-mediawiki.perl b/third_party/git/contrib/mw-to-git/git-remote-mediawiki.perl
index af9cbc9d0f7b..d8ff2e69c498 100755
--- a/third_party/git/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/third_party/git/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -79,7 +79,7 @@ chomp($export_media);
 $export_media = !($export_media eq 'false');
 
 my $wiki_login = run_git("config --get remote.${remotename}.mwLogin");
-# Note: mwPassword is discourraged. Use the credential system instead.
+# Note: mwPassword is discouraged. Use the credential system instead.
 my $wiki_passwd = run_git("config --get remote.${remotename}.mwPassword");
 my $wiki_domain = run_git("config --get remote.${remotename}.mwDomain");
 chomp($wiki_login);
diff --git a/third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php b/third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php
index 0f3f4e018a05..b033849800bc 100644
--- a/third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php
+++ b/third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php
@@ -24,7 +24,7 @@ $url = 'http://localhost:'.$port.'/wiki/mw-config/index.php';
 $db_dir = urlencode($tmp);
 $tmp_cookie = tempnam($tmp, "COOKIE_");
 /*
- * Fetchs a page with cURL.
+ * Fetches a page with cURL.
  */
 function get($page_name = "") {
 	$curl = curl_init();
diff --git a/third_party/git/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh b/third_party/git/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
index cfbfe7ddf622..9106833578e0 100755
--- a/third_party/git/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
+++ b/third_party/git/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
@@ -143,7 +143,7 @@ test_expect_success 'Git clone works with one specific page cloned ' '
 test_expect_success 'Git clone works with multiple specific page cloned ' '
 	wiki_reset &&
 	wiki_editpage foo "I will be there" false &&
-	wiki_editpage bar "I will not disapear" false &&
+	wiki_editpage bar "I will not disappear" false &&
 	wiki_editpage namnam "I be erased" false &&
 	wiki_editpage nyancat "nyan nyan nyan you will not erase me" false &&
 	wiki_delete_page namnam &&
diff --git a/third_party/git/contrib/mw-to-git/t/test-gitmw-lib.sh b/third_party/git/contrib/mw-to-git/t/test-gitmw-lib.sh
index 6546294f159e..3948a0028283 100755
--- a/third_party/git/contrib/mw-to-git/t/test-gitmw-lib.sh
+++ b/third_party/git/contrib/mw-to-git/t/test-gitmw-lib.sh
@@ -279,7 +279,7 @@ start_lighttpd () {
 	"$LIGHTTPD_DIR"/lighttpd -f "$WEB"/lighttpd.conf
 
 	if test $? -ne 0 ; then
-		echo "Could not execute http deamon lighttpd"
+		echo "Could not execute http daemon lighttpd"
 		exit 1
 	fi
 }
diff --git a/third_party/git/contrib/svn-fe/svn-fe.txt b/third_party/git/contrib/svn-fe/svn-fe.txt
index a3425f4770c5..19333fc8dff3 100644
--- a/third_party/git/contrib/svn-fe/svn-fe.txt
+++ b/third_party/git/contrib/svn-fe/svn-fe.txt
@@ -56,7 +56,7 @@ line.  This line has the form `git-svn-id: URL@REVNO UUID`.
 
 The resulting repository will generally require further processing
 to put each project in its own repository and to separate the history
-of each branch.  The 'git filter-branch --subdirectory-filter' command
+of each branch.  The 'git filter-repo --subdirectory-filter' command
 may be useful for this purpose.
 
 BUGS
@@ -67,5 +67,5 @@ The exit status does not reflect whether an error was detected.
 
 SEE ALSO
 --------
-git-svn(1), svn2git(1), svk(1), git-filter-branch(1), git-fast-import(1),
+git-svn(1), svn2git(1), svk(1), git-filter-repo(1), git-fast-import(1),
 https://svn.apache.org/repos/asf/subversion/trunk/notes/dump-load-format.txt
diff --git a/third_party/git/contrib/svn-fe/svnrdump_sim.py b/third_party/git/contrib/svn-fe/svnrdump_sim.py
index 11ac6f692733..8a3cee617524 100755
--- a/third_party/git/contrib/svn-fe/svnrdump_sim.py
+++ b/third_party/git/contrib/svn-fe/svnrdump_sim.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 """
 Simulates svnrdump by replaying an existing dump from a file, taking care
 of the specified revision range.
@@ -54,7 +54,7 @@ if __name__ == "__main__":
         print("usage: %s dump URL -rLOWER:UPPER")
         sys.exit(1)
     if not sys.argv[1] == 'dump':
-        raise NotImplementedError('only "dump" is suppported.')
+        raise NotImplementedError('only "dump" is supported.')
     url = sys.argv[2]
     r = ('0', 'HEAD')
     if len(sys.argv) == 4 and sys.argv[3][0:2] == '-r':
diff --git a/third_party/git/convert.c b/third_party/git/convert.c
index 94ff83764922..5ead3ce678bb 100644
--- a/third_party/git/convert.c
+++ b/third_party/git/convert.c
@@ -8,6 +8,7 @@
 #include "pkt-line.h"
 #include "sub-process.h"
 #include "utf8.h"
+#include "ll-merge.h"
 
 /*
  * convert.c - convert a file when checking it out and checking it in.
@@ -269,8 +270,12 @@ static int will_convert_lf_to_crlf(struct text_stat *stats,
 static int validate_encoding(const char *path, const char *enc,
 		      const char *data, size_t len, int die_on_error)
 {
+	const char *stripped;
+
 	/* We only check for UTF here as UTF?? can be an alias for UTF-?? */
-	if (istarts_with(enc, "UTF")) {
+	if (skip_iprefix(enc, "UTF", &stripped)) {
+		skip_prefix(stripped, "-", &stripped);
+
 		/*
 		 * Check for detectable errors in UTF encodings
 		 */
@@ -284,15 +289,10 @@ static int validate_encoding(const char *path, const char *enc,
 			 */
 			const char *advise_msg = _(
 				"The file '%s' contains a byte order "
-				"mark (BOM). Please use UTF-%s as "
+				"mark (BOM). Please use UTF-%.*s as "
 				"working-tree-encoding.");
-			const char *stripped = NULL;
-			char *upper = xstrdup_toupper(enc);
-			upper[strlen(upper)-2] = '\0';
-			if (!skip_prefix(upper, "UTF-", &stripped))
-				skip_prefix(stripped, "UTF", &stripped);
-			advise(advise_msg, path, stripped);
-			free(upper);
+			int stripped_len = strlen(stripped) - strlen("BE");
+			advise(advise_msg, path, stripped_len, stripped);
 			if (die_on_error)
 				die(error_msg, path, enc);
 			else {
@@ -307,12 +307,7 @@ static int validate_encoding(const char *path, const char *enc,
 				"mark (BOM). Please use UTF-%sBE or UTF-%sLE "
 				"(depending on the byte order) as "
 				"working-tree-encoding.");
-			const char *stripped = NULL;
-			char *upper = xstrdup_toupper(enc);
-			if (!skip_prefix(upper, "UTF-", &stripped))
-				skip_prefix(stripped, "UTF", &stripped);
 			advise(advise_msg, path, stripped, stripped);
-			free(upper);
 			if (die_on_error)
 				die(error_msg, path, enc);
 			else {
@@ -417,7 +412,7 @@ static int encode_to_git(const char *path, const char *src, size_t src_len,
 	if (!dst) {
 		/*
 		 * We could add the blob "as-is" to Git. However, on checkout
-		 * we would try to reencode to the original encoding. This
+		 * we would try to re-encode to the original encoding. This
 		 * would fail and we would leave the user with a messed-up
 		 * working tree. Let's try to avoid this by screaming loud.
 		 */
@@ -1151,7 +1146,7 @@ static int ident_to_worktree(const char *src, size_t len,
 	/* are we "faking" in place editing ? */
 	if (src == buf->buf)
 		to_free = strbuf_detach(buf, NULL);
-	hash_object_file(src, len, "blob", &oid);
+	hash_object_file(the_hash_algo, src, len, "blob", &oid);
 
 	strbuf_grow(buf, len + cnt * (the_hash_algo->hexsz + 3));
 	for (;;) {
@@ -1293,10 +1288,11 @@ struct conv_attrs {
 	const char *working_tree_encoding; /* Supported encoding or default encoding if NULL */
 };
 
+static struct attr_check *check;
+
 static void convert_attrs(const struct index_state *istate,
 			  struct conv_attrs *ca, const char *path)
 {
-	static struct attr_check *check;
 	struct attr_check_item *ccheck = NULL;
 
 	if (!check) {
@@ -1339,6 +1335,23 @@ static void convert_attrs(const struct index_state *istate,
 		ca->crlf_action = CRLF_AUTO_INPUT;
 }
 
+void reset_parsed_attributes(void)
+{
+	struct convert_driver *drv, *next;
+
+	attr_check_free(check);
+	check = NULL;
+	reset_merge_attributes();
+
+	for (drv = user_convert; drv; drv = next) {
+		next = drv->next;
+		free((void *)drv->name);
+		free(drv);
+	}
+	user_convert = NULL;
+	user_convert_tail = NULL;
+}
+
 int would_convert_to_git_filter_fd(const struct index_state *istate, const char *path)
 {
 	struct conv_attrs ca;
@@ -1927,7 +1940,7 @@ static struct stream_filter *ident_filter(const struct object_id *oid)
  * the contents cannot be filtered without reading the whole thing
  * in-core.
  *
- * Note that you would be crazy to set CRLF, smuge/clean or ident to a
+ * Note that you would be crazy to set CRLF, smudge/clean or ident to a
  * large binary blob you would want us not to slurp into the memory!
  */
 struct stream_filter *get_stream_filter(const struct index_state *istate,
diff --git a/third_party/git/convert.h b/third_party/git/convert.h
index 831559f10d44..3710969d43d6 100644
--- a/third_party/git/convert.h
+++ b/third_party/git/convert.h
@@ -94,6 +94,12 @@ void convert_to_git_filter_fd(const struct index_state *istate,
 int would_convert_to_git_filter_fd(const struct index_state *istate,
 				   const char *path);
 
+/*
+ * Reset the internal list of attributes used by convert_to_git and
+ * convert_to_working_tree.
+ */
+void reset_parsed_attributes(void);
+
 /*****************************************************************
  *
  * Streaming conversion support
diff --git a/third_party/git/credential-store.c b/third_party/git/credential-store.c
index ac295420dd0d..c010497cb21d 100644
--- a/third_party/git/credential-store.c
+++ b/third_party/git/credential-store.c
@@ -72,15 +72,16 @@ static void store_credential_file(const char *fn, struct credential *c)
 	struct strbuf buf = STRBUF_INIT;
 
 	strbuf_addf(&buf, "%s://", c->protocol);
-	strbuf_addstr_urlencode(&buf, c->username, 1);
+	strbuf_addstr_urlencode(&buf, c->username, is_rfc3986_unreserved);
 	strbuf_addch(&buf, ':');
-	strbuf_addstr_urlencode(&buf, c->password, 1);
+	strbuf_addstr_urlencode(&buf, c->password, is_rfc3986_unreserved);
 	strbuf_addch(&buf, '@');
 	if (c->host)
-		strbuf_addstr_urlencode(&buf, c->host, 1);
+		strbuf_addstr_urlencode(&buf, c->host, is_rfc3986_unreserved);
 	if (c->path) {
 		strbuf_addch(&buf, '/');
-		strbuf_addstr_urlencode(&buf, c->path, 0);
+		strbuf_addstr_urlencode(&buf, c->path,
+					is_rfc3986_reserved_or_unreserved);
 	}
 
 	rewrite_credential_file(fn, c, &buf);
diff --git a/third_party/git/credential.c b/third_party/git/credential.c
index 62be651b03b5..108d9e183a5d 100644
--- a/third_party/git/credential.c
+++ b/third_party/git/credential.c
@@ -6,6 +6,7 @@
 #include "url.h"
 #include "prompt.h"
 #include "sigchain.h"
+#include "urlmatch.h"
 
 void credential_init(struct credential *c)
 {
@@ -40,7 +41,7 @@ static int credential_config_callback(const char *var, const char *value,
 				      void *data)
 {
 	struct credential *c = data;
-	const char *key, *dot;
+	const char *key;
 
 	if (!skip_prefix(var, "credential.", &key))
 		return 0;
@@ -48,31 +49,16 @@ static int credential_config_callback(const char *var, const char *value,
 	if (!value)
 		return config_error_nonbool(var);
 
-	dot = strrchr(key, '.');
-	if (dot) {
-		struct credential want = CREDENTIAL_INIT;
-		char *url = xmemdupz(key, dot - key);
-		int matched;
-
-		credential_from_url(&want, url);
-		matched = credential_match(&want, c);
-
-		credential_clear(&want);
-		free(url);
-
-		if (!matched)
-			return 0;
-		key = dot + 1;
-	}
-
 	if (!strcmp(key, "helper")) {
 		if (*value)
 			string_list_append(&c->helpers, value);
 		else
 			string_list_clear(&c->helpers, 0);
 	} else if (!strcmp(key, "username")) {
-		if (!c->username)
+		if (!c->username_from_proto) {
+			free(c->username);
 			c->username = xstrdup(value);
+		}
 	}
 	else if (!strcmp(key, "usehttppath"))
 		c->use_http_path = git_config_bool(var, value);
@@ -87,11 +73,43 @@ static int proto_is_http(const char *s)
 	return !strcmp(s, "https") || !strcmp(s, "http");
 }
 
+static void credential_describe(struct credential *c, struct strbuf *out);
+static void credential_format(struct credential *c, struct strbuf *out);
+
+static int select_all(const struct urlmatch_item *a,
+		      const struct urlmatch_item *b)
+{
+	return 0;
+}
+
 static void credential_apply_config(struct credential *c)
 {
+	char *normalized_url;
+	struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+	struct strbuf url = STRBUF_INIT;
+
+	if (!c->host)
+		die(_("refusing to work with credential missing host field"));
+	if (!c->protocol)
+		die(_("refusing to work with credential missing protocol field"));
+
 	if (c->configured)
 		return;
-	git_config(credential_config_callback, c);
+
+	config.section = "credential";
+	config.key = NULL;
+	config.collect_fn = credential_config_callback;
+	config.cascade_fn = NULL;
+	config.select_fn = select_all;
+	config.cb = c;
+
+	credential_format(c, &url);
+	normalized_url = url_normalize(url.buf, &config.url);
+
+	git_config(urlmatch_config_entry, &config);
+	free(normalized_url);
+	strbuf_release(&url);
+
 	c->configured = 1;
 
 	if (!c->use_http_path && proto_is_http(c->protocol)) {
@@ -112,6 +130,23 @@ static void credential_describe(struct credential *c, struct strbuf *out)
 		strbuf_addf(out, "/%s", c->path);
 }
 
+static void credential_format(struct credential *c, struct strbuf *out)
+{
+	if (!c->protocol)
+		return;
+	strbuf_addf(out, "%s://", c->protocol);
+	if (c->username && *c->username) {
+		strbuf_add_percentencode(out, c->username);
+		strbuf_addch(out, '@');
+	}
+	if (c->host)
+		strbuf_addstr(out, c->host);
+	if (c->path) {
+		strbuf_addch(out, '/');
+		strbuf_add_percentencode(out, c->path);
+	}
+}
+
 static char *credential_ask_one(const char *what, struct credential *c,
 				int flags)
 {
@@ -163,6 +198,7 @@ int credential_read(struct credential *c, FILE *fp)
 		if (!strcmp(key, "username")) {
 			free(c->username);
 			c->username = xstrdup(value);
+			c->username_from_proto = 1;
 		} else if (!strcmp(key, "password")) {
 			free(c->password);
 			c->password = xstrdup(value);
@@ -191,20 +227,25 @@ int credential_read(struct credential *c, FILE *fp)
 	return 0;
 }
 
-static void credential_write_item(FILE *fp, const char *key, const char *value)
+static void credential_write_item(FILE *fp, const char *key, const char *value,
+				  int required)
 {
+	if (!value && required)
+		BUG("credential value for %s is missing", key);
 	if (!value)
 		return;
+	if (strchr(value, '\n'))
+		die("credential value for %s contains newline", key);
 	fprintf(fp, "%s=%s\n", key, value);
 }
 
 void credential_write(const struct credential *c, FILE *fp)
 {
-	credential_write_item(fp, "protocol", c->protocol);
-	credential_write_item(fp, "host", c->host);
-	credential_write_item(fp, "path", c->path);
-	credential_write_item(fp, "username", c->username);
-	credential_write_item(fp, "password", c->password);
+	credential_write_item(fp, "protocol", c->protocol, 1);
+	credential_write_item(fp, "host", c->host, 1);
+	credential_write_item(fp, "path", c->path, 0);
+	credential_write_item(fp, "username", c->username, 0);
+	credential_write_item(fp, "password", c->password, 0);
 }
 
 static int run_credential_helper(struct credential *c,
@@ -322,7 +363,22 @@ void credential_reject(struct credential *c)
 	c->approved = 0;
 }
 
-void credential_from_url(struct credential *c, const char *url)
+static int check_url_component(const char *url, int quiet,
+			       const char *name, const char *value)
+{
+	if (!value)
+		return 0;
+	if (!strchr(value, '\n'))
+		return 0;
+
+	if (!quiet)
+		warning(_("url contains a newline in its %s component: %s"),
+			name, url);
+	return -1;
+}
+
+int credential_from_url_gently(struct credential *c, const char *url,
+			       int quiet)
 {
 	const char *at, *colon, *cp, *slash, *host, *proto_end;
 
@@ -335,8 +391,11 @@ void credential_from_url(struct credential *c, const char *url)
 	 *   (3) proto://<user>:<pass>@<host>/...
 	 */
 	proto_end = strstr(url, "://");
-	if (!proto_end)
-		return;
+	if (!proto_end || proto_end == url) {
+		if (!quiet)
+			warning(_("url has no scheme: %s"), url);
+		return -1;
+	}
 	cp = proto_end + 3;
 	at = strchr(cp, '@');
 	colon = strchr(cp, ':');
@@ -349,18 +408,20 @@ void credential_from_url(struct credential *c, const char *url)
 	else if (!colon || at <= colon) {
 		/* Case (2) */
 		c->username = url_decode_mem(cp, at - cp);
+		if (c->username && *c->username)
+			c->username_from_proto = 1;
 		host = at + 1;
 	} else {
 		/* Case (3) */
 		c->username = url_decode_mem(cp, colon - cp);
+		if (c->username && *c->username)
+			c->username_from_proto = 1;
 		c->password = url_decode_mem(colon + 1, at - (colon + 1));
 		host = at + 1;
 	}
 
-	if (proto_end - url > 0)
-		c->protocol = xmemdupz(url, proto_end - url);
-	if (slash - host > 0)
-		c->host = url_decode_mem(host, slash - host);
+	c->protocol = xmemdupz(url, proto_end - url);
+	c->host = url_decode_mem(host, slash - host);
 	/* Trim leading and trailing slashes from path */
 	while (*slash == '/')
 		slash++;
@@ -371,4 +432,19 @@ void credential_from_url(struct credential *c, const char *url)
 		while (p > c->path && *p == '/')
 			*p-- = '\0';
 	}
+
+	if (check_url_component(url, quiet, "username", c->username) < 0 ||
+	    check_url_component(url, quiet, "password", c->password) < 0 ||
+	    check_url_component(url, quiet, "protocol", c->protocol) < 0 ||
+	    check_url_component(url, quiet, "host", c->host) < 0 ||
+	    check_url_component(url, quiet, "path", c->path) < 0)
+		return -1;
+
+	return 0;
+}
+
+void credential_from_url(struct credential *c, const char *url)
+{
+	if (credential_from_url_gently(c, url, 0) < 0)
+		die(_("credential url cannot be parsed: %s"), url);
 }
diff --git a/third_party/git/credential.h b/third_party/git/credential.h
index 6b0cd16be2b9..d99ec42b2a8c 100644
--- a/third_party/git/credential.h
+++ b/third_party/git/credential.h
@@ -3,12 +3,123 @@
 
 #include "string-list.h"
 
+/**
+ * The credentials API provides an abstracted way of gathering username and
+ * password credentials from the user.
+ *
+ * Typical setup
+ * -------------
+ *
+ * ------------
+ * +-----------------------+
+ * | Git code (C)          |--- to server requiring --->
+ * |                       |        authentication
+ * |.......................|
+ * | C credential API      |--- prompt ---> User
+ * +-----------------------+
+ * 	^      |
+ * 	| pipe |
+ * 	|      v
+ * +-----------------------+
+ * | Git credential helper |
+ * +-----------------------+
+ * ------------
+ *
+ * The Git code (typically a remote-helper) will call the C API to obtain
+ * credential data like a login/password pair (credential_fill). The
+ * API will itself call a remote helper (e.g. "git credential-cache" or
+ * "git credential-store") that may retrieve credential data from a
+ * store. If the credential helper cannot find the information, the C API
+ * will prompt the user. Then, the caller of the API takes care of
+ * contacting the server, and does the actual authentication.
+ *
+ * C API
+ * -----
+ *
+ * The credential C API is meant to be called by Git code which needs to
+ * acquire or store a credential. It is centered around an object
+ * representing a single credential and provides three basic operations:
+ * fill (acquire credentials by calling helpers and/or prompting the user),
+ * approve (mark a credential as successfully used so that it can be stored
+ * for later use), and reject (mark a credential as unsuccessful so that it
+ * can be erased from any persistent storage).
+ *
+ * Example
+ * ~~~~~~~
+ *
+ * The example below shows how the functions of the credential API could be
+ * used to login to a fictitious "foo" service on a remote host:
+ *
+ * -----------------------------------------------------------------------
+ * int foo_login(struct foo_connection *f)
+ * {
+ * 	int status;
+ * 	// Create a credential with some context; we don't yet know the
+ * 	// username or password.
+ *
+ * struct credential c = CREDENTIAL_INIT;
+ * c.protocol = xstrdup("foo");
+ * c.host = xstrdup(f->hostname);
+ *
+ * // Fill in the username and password fields by contacting
+ * // helpers and/or asking the user. The function will die if it
+ * // fails.
+ * credential_fill(&c);
+ *
+ * // Otherwise, we have a username and password. Try to use it.
+ *
+ * status = send_foo_login(f, c.username, c.password);
+ * switch (status) {
+ * case FOO_OK:
+ * // It worked. Store the credential for later use.
+ * credential_accept(&c);
+ * break;
+ * case FOO_BAD_LOGIN:
+ * // Erase the credential from storage so we don't try it again.
+ * credential_reject(&c);
+ * break;
+ * default:
+ * // Some other error occurred. We don't know if the
+ * // credential is good or bad, so report nothing to the
+ * // credential subsystem.
+ * }
+ *
+ * // Free any associated resources.
+ * credential_clear(&c);
+ *
+ * return status;
+ * }
+ * -----------------------------------------------------------------------
+ */
+
+
+/**
+ * This struct represents a single username/password combination
+ * along with any associated context. All string fields should be
+ * heap-allocated (or NULL if they are not known or not applicable).
+ * The meaning of the individual context fields is the same as
+ * their counterparts in the helper protocol.
+ *
+ * This struct should always be initialized with `CREDENTIAL_INIT` or
+ * `credential_init`.
+ */
 struct credential {
+
+	/**
+	 * A `string_list` of helpers. Each string specifies an external
+	 * helper which will be run, in order, to either acquire or store
+	 * credentials. This list is filled-in by the API functions
+	 * according to the corresponding configuration variables before
+	 * consulting helpers, so there usually is no need for a caller to
+	 * modify the helpers field at all.
+	 */
 	struct string_list helpers;
+
 	unsigned approved:1,
 		 configured:1,
 		 quit:1,
-		 use_http_path:1;
+		 use_http_path:1,
+		 username_from_proto:1;
 
 	char *username;
 	char *password;
@@ -19,16 +130,65 @@ struct credential {
 
 #define CREDENTIAL_INIT { STRING_LIST_INIT_DUP }
 
+/* Initialize a credential structure, setting all fields to empty. */
 void credential_init(struct credential *);
+
+/**
+ * Free any resources associated with the credential structure, returning
+ * it to a pristine initialized state.
+ */
 void credential_clear(struct credential *);
 
+/**
+ * Instruct the credential subsystem to fill the username and
+ * password fields of the passed credential struct by first
+ * consulting helpers, then asking the user. After this function
+ * returns, the username and password fields of the credential are
+ * guaranteed to be non-NULL. If an error occurs, the function will
+ * die().
+ */
 void credential_fill(struct credential *);
+
+/**
+ * Inform the credential subsystem that the provided credentials
+ * were successfully used for authentication.  This will cause the
+ * credential subsystem to notify any helpers of the approval, so
+ * that they may store the result to be used again.  Any errors
+ * from helpers are ignored.
+ */
 void credential_approve(struct credential *);
+
+/**
+ * Inform the credential subsystem that the provided credentials
+ * have been rejected. This will cause the credential subsystem to
+ * notify any helpers of the rejection (which allows them, for
+ * example, to purge the invalid credentials from storage). It
+ * will also free() the username and password fields of the
+ * credential and set them to NULL (readying the credential for
+ * another call to `credential_fill`). Any errors from helpers are
+ * ignored.
+ */
 void credential_reject(struct credential *);
 
 int credential_read(struct credential *, FILE *);
 void credential_write(const struct credential *, FILE *);
+
+/*
+ * Parse a url into a credential struct, replacing any existing contents.
+ *
+ * If the url can't be parsed (e.g., a missing "proto://" component), the
+ * resulting credential will be empty but we'll still return success from the
+ * "gently" form.
+ *
+ * If we encounter a component which cannot be represented as a credential
+ * value (e.g., because it contains a newline), the "gently" form will return
+ * an error but leave the broken state in the credential object for further
+ * examination.  The non-gentle form will issue a warning to stderr and return
+ * an empty credential.
+ */
 void credential_from_url(struct credential *, const char *url);
+int credential_from_url_gently(struct credential *, const char *url, int quiet);
+
 int credential_match(const struct credential *have,
 		     const struct credential *want);
 
diff --git a/third_party/git/csum-file.h b/third_party/git/csum-file.h
index a98b1eee53f4..f9cbd317fbbc 100644
--- a/third_party/git/csum-file.h
+++ b/third_party/git/csum-file.h
@@ -42,6 +42,15 @@ void hashflush(struct hashfile *f);
 void crc32_begin(struct hashfile *);
 uint32_t crc32_end(struct hashfile *);
 
+/*
+ * Returns the total number of bytes fed to the hashfile so far (including ones
+ * that have not been written out to the descriptor yet).
+ */
+static inline off_t hashfile_total(struct hashfile *f)
+{
+	return f->total + f->offset;
+}
+
 static inline void hashwrite_u8(struct hashfile *f, uint8_t data)
 {
 	hashwrite(f, &data, sizeof(data));
diff --git a/third_party/git/daemon.c b/third_party/git/daemon.c
index 9d2e0d20ef30..fd669ed3b427 100644
--- a/third_party/git/daemon.c
+++ b/third_party/git/daemon.c
@@ -598,7 +598,7 @@ static void canonicalize_client(struct strbuf *out, const char *in)
  * Read the host as supplied by the client connection.
  *
  * Returns a pointer to the character after the NUL byte terminating the host
- * arguemnt, or 'extra_args' if there is no host arguemnt.
+ * argument, or 'extra_args' if there is no host argument.
  */
 static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen)
 {
@@ -652,7 +652,7 @@ static void parse_extra_args(struct hostinfo *hi, struct argv_array *env,
 		 * service that will be run.
 		 *
 		 * If there ends up being a particular arg in the future that
-		 * git-daemon needs to parse specificly (like the 'host' arg)
+		 * git-daemon needs to parse specifically (like the 'host' arg)
 		 * then it can be parsed here and not added to 'git_protocol'.
 		 */
 		if (*arg) {
diff --git a/third_party/git/date.c b/third_party/git/date.c
index 06340a77f319..0355c0676bda 100644
--- a/third_party/git/date.c
+++ b/third_party/git/date.c
@@ -64,16 +64,16 @@ static time_t gm_time_t(timestamp_t time, int tz)
  * thing, which means that tz -0100 is passed in as the integer -100,
  * even though it means "sixty minutes off"
  */
-static struct tm *time_to_tm(timestamp_t time, int tz)
+static struct tm *time_to_tm(timestamp_t time, int tz, struct tm *tm)
 {
 	time_t t = gm_time_t(time, tz);
-	return gmtime(&t);
+	return gmtime_r(&t, tm);
 }
 
-static struct tm *time_to_tm_local(timestamp_t time)
+static struct tm *time_to_tm_local(timestamp_t time, struct tm *tm)
 {
 	time_t t = time;
-	return localtime(&t);
+	return localtime_r(&t, tm);
 }
 
 /*
@@ -128,16 +128,17 @@ static void get_time(struct timeval *now)
 		gettimeofday(now, NULL);
 }
 
-void show_date_relative(timestamp_t time,
-			const struct timeval *now,
-			struct strbuf *timebuf)
+void show_date_relative(timestamp_t time, struct strbuf *timebuf)
 {
+	struct timeval now;
 	timestamp_t diff;
-	if (now->tv_sec < time) {
+
+	get_time(&now);
+	if (now.tv_sec < time) {
 		strbuf_addstr(timebuf, _("in the future"));
 		return;
 	}
-	diff = now->tv_sec - time;
+	diff = now.tv_sec - time;
 	if (diff < 90) {
 		strbuf_addf(timebuf,
 			 Q_("%"PRItime" second ago", "%"PRItime" seconds ago", diff), diff);
@@ -240,9 +241,7 @@ static void show_date_normal(struct strbuf *buf, timestamp_t time, struct tm *tm
 
 	/* Show "today" times as just relative times */
 	if (hide.wday) {
-		struct timeval now;
-		get_time(&now);
-		show_date_relative(time, &now, buf);
+		show_date_relative(time, buf);
 		return;
 	}
 
@@ -284,6 +283,7 @@ static void show_date_normal(struct strbuf *buf, timestamp_t time, struct tm *tm
 const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
 {
 	struct tm *tm;
+	struct tm tmbuf = { 0 };
 	struct tm human_tm = { 0 };
 	int human_tz = -1;
 	static struct strbuf timebuf = STRBUF_INIT;
@@ -313,20 +313,17 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
 	}
 
 	if (mode->type == DATE_RELATIVE) {
-		struct timeval now;
-
 		strbuf_reset(&timebuf);
-		get_time(&now);
-		show_date_relative(time, &now, &timebuf);
+		show_date_relative(time, &timebuf);
 		return timebuf.buf;
 	}
 
 	if (mode->local)
-		tm = time_to_tm_local(time);
+		tm = time_to_tm_local(time, &tmbuf);
 	else
-		tm = time_to_tm(time, tz);
+		tm = time_to_tm(time, tz, &tmbuf);
 	if (!tm) {
-		tm = time_to_tm(0, 0);
+		tm = time_to_tm(0, 0, &tmbuf);
 		tz = 0;
 	}
 
@@ -980,10 +977,11 @@ void datestamp(struct strbuf *out)
 {
 	time_t now;
 	int offset;
+	struct tm tm = { 0 };
 
 	time(&now);
 
-	offset = tm_to_time_t(localtime(&now)) - now;
+	offset = tm_to_time_t(localtime_r(&now, &tm)) - now;
 	offset /= 60;
 
 	date_string(now, offset, out);
@@ -1305,15 +1303,18 @@ static timestamp_t approxidate_str(const char *date,
 	return (timestamp_t)update_tm(&tm, &now, 0);
 }
 
-timestamp_t approxidate_relative(const char *date, const struct timeval *tv)
+timestamp_t approxidate_relative(const char *date)
 {
+	struct timeval tv;
 	timestamp_t timestamp;
 	int offset;
 	int errors = 0;
 
 	if (!parse_date_basic(date, &timestamp, &offset))
 		return timestamp;
-	return approxidate_str(date, tv, &errors);
+
+	get_time(&tv);
+	return approxidate_str(date, (const struct timeval *) &tv, &errors);
 }
 
 timestamp_t approxidate_careful(const char *date, int *error_ret)
diff --git a/third_party/git/diff-delta.c b/third_party/git/diff-delta.c
index e49643353bf5..77fea08dfb04 100644
--- a/third_party/git/diff-delta.c
+++ b/third_party/git/diff-delta.c
@@ -326,6 +326,8 @@ create_delta(const struct delta_index *index,
 	const unsigned char *ref_data, *ref_top, *data, *top;
 	unsigned char *out;
 
+	*delta_size = 0;
+
 	if (!trg_buf || !trg_size)
 		return NULL;
 
diff --git a/third_party/git/diff.c b/third_party/git/diff.c
index efe42b341ae1..f2cfbf2214a2 100644
--- a/third_party/git/diff.c
+++ b/third_party/git/diff.c
@@ -25,7 +25,7 @@
 #include "packfile.h"
 #include "parse-options.h"
 #include "help.h"
-#include "fetch-object.h"
+#include "promisor-remote.h"
 
 #ifdef NO_FAST_WORKING_DIRECTORY
 #define FAST_WORKING_DIRECTORY 0
@@ -414,14 +414,6 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
-	if (!strcmp(var, "diff.wserrorhighlight")) {
-		int val = parse_ws_error_highlight(value);
-		if (val < 0)
-			return -1;
-		ws_error_highlight_default = val;
-		return 0;
-	}
-
 	if (git_color_config(var, value, cb) < 0)
 		return -1;
 
@@ -450,6 +442,14 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 		return color_parse(value, diff_colors[slot]);
 	}
 
+	if (!strcmp(var, "diff.wserrorhighlight")) {
+		int val = parse_ws_error_highlight(value);
+		if (val < 0)
+			return -1;
+		ws_error_highlight_default = val;
+		return 0;
+	}
+
 	/* like GNU diff's --suppress-blank-empty option  */
 	if (!strcmp(var, "diff.suppressblankempty") ||
 			/* for backwards compatibility */
@@ -933,16 +933,18 @@ static int cmp_in_block_with_wsd(const struct diff_options *o,
 }
 
 static int moved_entry_cmp(const void *hashmap_cmp_fn_data,
-			   const void *entry,
-			   const void *entry_or_key,
+			   const struct hashmap_entry *eptr,
+			   const struct hashmap_entry *entry_or_key,
 			   const void *keydata)
 {
 	const struct diff_options *diffopt = hashmap_cmp_fn_data;
-	const struct moved_entry *a = entry;
-	const struct moved_entry *b = entry_or_key;
+	const struct moved_entry *a, *b;
 	unsigned flags = diffopt->color_moved_ws_handling
 			 & XDF_WHITESPACE_FLAGS;
 
+	a = container_of(eptr, const struct moved_entry, ent);
+	b = container_of(entry_or_key, const struct moved_entry, ent);
+
 	if (diffopt->color_moved_ws_handling &
 	    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
 		/*
@@ -964,8 +966,9 @@ static struct moved_entry *prepare_entry(struct diff_options *o,
 	struct moved_entry *ret = xmalloc(sizeof(*ret));
 	struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no];
 	unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS;
+	unsigned int hash = xdiff_hash_string(l->line, l->len, flags);
 
-	ret->ent.hash = xdiff_hash_string(l->line, l->len, flags);
+	hashmap_entry_init(&ret->ent, hash);
 	ret->es = l;
 	ret->next_line = NULL;
 
@@ -1002,7 +1005,7 @@ static void add_lines_to_move_detection(struct diff_options *o,
 		if (prev_line && prev_line->es->s == o->emitted_symbols->buf[n].s)
 			prev_line->next_line = key;
 
-		hashmap_add(hm, key);
+		hashmap_add(hm, &key->ent);
 		prev_line = key;
 	}
 }
@@ -1018,7 +1021,7 @@ static void pmb_advance_or_null(struct diff_options *o,
 		struct moved_entry *prev = pmb[i].match;
 		struct moved_entry *cur = (prev && prev->next_line) ?
 				prev->next_line : NULL;
-		if (cur && !hm->cmpfn(o, cur, match, NULL)) {
+		if (cur && !hm->cmpfn(o, &cur->ent, &match->ent, NULL)) {
 			pmb[i].match = cur;
 		} else {
 			pmb[i].match = NULL;
@@ -1035,7 +1038,7 @@ static void pmb_advance_or_null_multi_match(struct diff_options *o,
 	int i;
 	char *got_match = xcalloc(1, pmb_nr);
 
-	for (; match; match = hashmap_get_next(hm, match)) {
+	hashmap_for_each_entry_from(hm, match, ent) {
 		for (i = 0; i < pmb_nr; i++) {
 			struct moved_entry *prev = pmb[i].match;
 			struct moved_entry *cur = (prev && prev->next_line) ?
@@ -1143,13 +1146,13 @@ static void mark_color_as_moved(struct diff_options *o,
 		case DIFF_SYMBOL_PLUS:
 			hm = del_lines;
 			key = prepare_entry(o, n);
-			match = hashmap_get(hm, key, NULL);
+			match = hashmap_get_entry(hm, key, ent, NULL);
 			free(key);
 			break;
 		case DIFF_SYMBOL_MINUS:
 			hm = add_lines;
 			key = prepare_entry(o, n);
-			match = hashmap_get(hm, key, NULL);
+			match = hashmap_get_entry(hm, key, ent, NULL);
 			free(key);
 			break;
 		default:
@@ -1188,7 +1191,7 @@ static void mark_color_as_moved(struct diff_options *o,
 			 * The current line is the start of a new block.
 			 * Setup the set of potential blocks.
 			 */
-			for (; match; match = hashmap_get_next(hm, match)) {
+			hashmap_for_each_entry_from(hm, match, ent) {
 				ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
 				if (o->color_moved_ws_handling &
 				    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) {
@@ -2492,22 +2495,6 @@ static void pprint_rename(struct strbuf *name, const char *a, const char *b)
 	}
 }
 
-struct diffstat_t {
-	int nr;
-	int alloc;
-	struct diffstat_file {
-		char *from_name;
-		char *name;
-		char *print_name;
-		const char *comments;
-		unsigned is_unmerged:1;
-		unsigned is_binary:1;
-		unsigned is_renamed:1;
-		unsigned is_interesting:1;
-		uintmax_t added, deleted;
-	} **files;
-};
-
 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
 					  const char *name_a,
 					  const char *name_b)
@@ -2548,7 +2535,7 @@ static int scale_linear(int it, int width, int max_change)
 	/*
 	 * make sure that at least one '-' or '+' is printed if
 	 * there is any change to this path. The easiest way is to
-	 * scale linearly as if the alloted width is one column shorter
+	 * scale linearly as if the allotted width is one column shorter
 	 * than it is, and then add 1 to the result.
 	 */
 	return 1 + (it * (width - 1) / max_change);
@@ -3154,7 +3141,7 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
 	gather_dirstat(options, &dir, changed, "", 0);
 }
 
-static void free_diffstat_info(struct diffstat_t *diffstat)
+void free_diffstat_info(struct diffstat_t *diffstat)
 {
 	int i;
 	for (i = 0; i < diffstat->nr; i++) {
@@ -3193,7 +3180,7 @@ static int is_conflict_marker(const char *line, int marker_size, unsigned long l
 	for (cnt = 1; cnt < marker_size; cnt++)
 		if (line[cnt] != firstchar)
 			return 0;
-	/* line[1] thru line[marker_size-1] are same as firstchar */
+	/* line[1] through line[marker_size-1] are same as firstchar */
 	if (len < marker_size + 1 || !isspace(line[marker_size]))
 		return 0;
 	return 1;
@@ -4037,7 +4024,7 @@ int diff_populate_filespec(struct repository *r,
 				return 0;
 			}
 		}
-		s->data = read_object_file(&s->oid, &type, &s->size);
+		s->data = repo_read_object_file(r, &s->oid, &type, &s->size);
 		if (!s->data)
 			die("unable to read %s", oid_to_hex(&s->oid));
 		s->should_free = 1;
@@ -5978,7 +5965,7 @@ static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
 }
 
 struct patch_id_t {
-	git_SHA_CTX *ctx;
+	git_hash_ctx *ctx;
 	int patchlen;
 };
 
@@ -5995,16 +5982,16 @@ static int remove_space(char *line, int len)
 	return dst - line;
 }
 
-void flush_one_hunk(struct object_id *result, git_SHA_CTX *ctx)
+void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx)
 {
 	unsigned char hash[GIT_MAX_RAWSZ];
 	unsigned short carry = 0;
 	int i;
 
-	git_SHA1_Final(hash, ctx);
-	git_SHA1_Init(ctx);
+	the_hash_algo->final_fn(hash, ctx);
+	the_hash_algo->init_fn(ctx);
 	/* 20-byte sum, with carry */
-	for (i = 0; i < GIT_SHA1_RAWSZ; ++i) {
+	for (i = 0; i < the_hash_algo->rawsz; ++i) {
 		carry += result->hash[i] + hash[i];
 		result->hash[i] = carry;
 		carry >>= 8;
@@ -6018,21 +6005,21 @@ static void patch_id_consume(void *priv, char *line, unsigned long len)
 
 	new_len = remove_space(line, len);
 
-	git_SHA1_Update(data->ctx, line, new_len);
+	the_hash_algo->update_fn(data->ctx, line, new_len);
 	data->patchlen += new_len;
 }
 
-static void patch_id_add_string(git_SHA_CTX *ctx, const char *str)
+static void patch_id_add_string(git_hash_ctx *ctx, const char *str)
 {
-	git_SHA1_Update(ctx, str, strlen(str));
+	the_hash_algo->update_fn(ctx, str, strlen(str));
 }
 
-static void patch_id_add_mode(git_SHA_CTX *ctx, unsigned mode)
+static void patch_id_add_mode(git_hash_ctx *ctx, unsigned mode)
 {
 	/* large enough for 2^32 in octal */
 	char buf[12];
 	int len = xsnprintf(buf, sizeof(buf), "%06o", mode);
-	git_SHA1_Update(ctx, buf, len);
+	the_hash_algo->update_fn(ctx, buf, len);
 }
 
 /* returns 0 upon success, and writes result into oid */
@@ -6040,10 +6027,10 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
 {
 	struct diff_queue_struct *q = &diff_queued_diff;
 	int i;
-	git_SHA_CTX ctx;
+	git_hash_ctx ctx;
 	struct patch_id_t data;
 
-	git_SHA1_Init(&ctx);
+	the_hash_algo->init_fn(&ctx);
 	memset(&data, 0, sizeof(struct patch_id_t));
 	data.ctx = &ctx;
 	oidclr(oid);
@@ -6076,27 +6063,27 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
 		len2 = remove_space(p->two->path, strlen(p->two->path));
 		patch_id_add_string(&ctx, "diff--git");
 		patch_id_add_string(&ctx, "a/");
-		git_SHA1_Update(&ctx, p->one->path, len1);
+		the_hash_algo->update_fn(&ctx, p->one->path, len1);
 		patch_id_add_string(&ctx, "b/");
-		git_SHA1_Update(&ctx, p->two->path, len2);
+		the_hash_algo->update_fn(&ctx, p->two->path, len2);
 
 		if (p->one->mode == 0) {
 			patch_id_add_string(&ctx, "newfilemode");
 			patch_id_add_mode(&ctx, p->two->mode);
 			patch_id_add_string(&ctx, "---/dev/null");
 			patch_id_add_string(&ctx, "+++b/");
-			git_SHA1_Update(&ctx, p->two->path, len2);
+			the_hash_algo->update_fn(&ctx, p->two->path, len2);
 		} else if (p->two->mode == 0) {
 			patch_id_add_string(&ctx, "deletedfilemode");
 			patch_id_add_mode(&ctx, p->one->mode);
 			patch_id_add_string(&ctx, "---a/");
-			git_SHA1_Update(&ctx, p->one->path, len1);
+			the_hash_algo->update_fn(&ctx, p->one->path, len1);
 			patch_id_add_string(&ctx, "+++/dev/null");
 		} else {
 			patch_id_add_string(&ctx, "---a/");
-			git_SHA1_Update(&ctx, p->one->path, len1);
+			the_hash_algo->update_fn(&ctx, p->one->path, len1);
 			patch_id_add_string(&ctx, "+++b/");
-			git_SHA1_Update(&ctx, p->two->path, len2);
+			the_hash_algo->update_fn(&ctx, p->two->path, len2);
 		}
 
 		if (diff_header_only)
@@ -6108,10 +6095,10 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
 
 		if (diff_filespec_is_binary(options->repo, p->one) ||
 		    diff_filespec_is_binary(options->repo, p->two)) {
-			git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid),
-					GIT_SHA1_HEXSZ);
-			git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid),
-					GIT_SHA1_HEXSZ);
+			the_hash_algo->update_fn(&ctx, oid_to_hex(&p->one->oid),
+					the_hash_algo->hexsz);
+			the_hash_algo->update_fn(&ctx, oid_to_hex(&p->two->oid),
+					the_hash_algo->hexsz);
 			continue;
 		}
 
@@ -6128,7 +6115,7 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
 	}
 
 	if (!stable)
-		git_SHA1_Final(oid->hash, &ctx);
+		the_hash_algo->final_fn(oid->hash, &ctx);
 
 	return 0;
 }
@@ -6230,8 +6217,10 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
 			if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
 				dim_moved_lines(o);
 
-			hashmap_free(&add_lines, 1);
-			hashmap_free(&del_lines, 1);
+			hashmap_free_entries(&add_lines, struct moved_entry,
+						ent);
+			hashmap_free_entries(&del_lines, struct moved_entry,
+						ent);
 		}
 
 		for (i = 0; i < esm.nr; i++)
@@ -6278,12 +6267,7 @@ void diff_flush(struct diff_options *options)
 	    dirstat_by_line) {
 		struct diffstat_t diffstat;
 
-		memset(&diffstat, 0, sizeof(struct diffstat_t));
-		for (i = 0; i < q->nr; i++) {
-			struct diff_filepair *p = q->queue[i];
-			if (check_pair_status(p))
-				diff_flush_stat(p, options, &diffstat);
-		}
+		compute_diffstat(options, &diffstat, q);
 		if (output_format & DIFF_FORMAT_NUMSTAT)
 			show_numstat(&diffstat, options);
 		if (output_format & DIFF_FORMAT_DIFFSTAT)
@@ -6512,6 +6496,7 @@ static void add_if_missing(struct repository *r,
 			   const struct diff_filespec *filespec)
 {
 	if (filespec && filespec->oid_valid &&
+	    !S_ISGITLINK(filespec->mode) &&
 	    oid_object_info_extended(r, &filespec->oid, NULL,
 				     OBJECT_INFO_FOR_PREFETCH))
 		oid_array_append(to_fetch, &filespec->oid);
@@ -6519,8 +6504,7 @@ static void add_if_missing(struct repository *r,
 
 void diffcore_std(struct diff_options *options)
 {
-	if (options->repo == the_repository &&
-	    repository_format_partial_clone) {
+	if (options->repo == the_repository && has_promisor_remote()) {
 		/*
 		 * Prefetch the diff pairs that are about to be flushed.
 		 */
@@ -6537,8 +6521,8 @@ void diffcore_std(struct diff_options *options)
 			/*
 			 * NEEDSWORK: Consider deduplicating the OIDs sent.
 			 */
-			fetch_objects(repository_format_partial_clone,
-				      to_fetch.oid, to_fetch.nr);
+			promisor_remote_get_direct(options->repo,
+						   to_fetch.oid, to_fetch.nr);
 		oid_array_clear(&to_fetch);
 	}
 
@@ -6616,6 +6600,20 @@ static int is_submodule_ignored(const char *path, struct diff_options *options)
 	return ignored;
 }
 
+void compute_diffstat(struct diff_options *options,
+		      struct diffstat_t *diffstat,
+		      struct diff_queue_struct *q)
+{
+	int i;
+
+	memset(diffstat, 0, sizeof(struct diffstat_t));
+	for (i = 0; i < q->nr; i++) {
+		struct diff_filepair *p = q->queue[i];
+		if (check_pair_status(p))
+			diff_flush_stat(p, options, diffstat);
+	}
+}
+
 void diff_addremove(struct diff_options *options,
 		    int addremove, unsigned mode,
 		    const struct object_id *oid,
diff --git a/third_party/git/diff.h b/third_party/git/diff.h
index c2c30568101d..6febe7e3656a 100644
--- a/third_party/git/diff.h
+++ b/third_party/git/diff.h
@@ -9,6 +9,49 @@
 #include "object.h"
 #include "oidset.h"
 
+/**
+ * The diff API is for programs that compare two sets of files (e.g. two trees,
+ * one tree and the index) and present the found difference in various ways.
+ * The calling program is responsible for feeding the API pairs of files, one
+ * from the "old" set and the corresponding one from "new" set, that are
+ * different.
+ * The library called through this API is called diffcore, and is responsible
+ * for two things.
+ *
+ * - finding total rewrites (`-B`), renames (`-M`) and copies (`-C`), and
+ * changes that touch a string (`-S`), as specified by the caller.
+ *
+ * - outputting the differences in various formats, as specified by the caller.
+ *
+ * Calling sequence
+ * ----------------
+ *
+ * - Prepare `struct diff_options` to record the set of diff options, and then
+ * call `repo_diff_setup()` to initialize this structure.  This sets up the
+ * vanilla default.
+ *
+ * - Fill in the options structure to specify desired output format, rename
+ * detection, etc.  `diff_opt_parse()` can be used to parse options given
+ * from the command line in a way consistent with existing git-diff family
+ * of programs.
+ *
+ * - Call `diff_setup_done()`; this inspects the options set up so far for
+ * internal consistency and make necessary tweaking to it (e.g. if textual
+ * patch output was asked, recursive behaviour is turned on); the callback
+ * set_default in diff_options can be used to tweak this more.
+ *
+ * - As you find different pairs of files, call `diff_change()` to feed
+ * modified files, `diff_addremove()` to feed created or deleted files, or
+ * `diff_unmerge()` to feed a file whose state is 'unmerged' to the API.
+ * These are thin wrappers to a lower-level `diff_queue()` function that is
+ * flexible enough to record any of these kinds of changes.
+ *
+ * - Once you finish feeding the pairs of files, call `diffcore_std()`.
+ * This will tell the diffcore library to go ahead and do its work.
+ *
+ * - Calling `diff_flush()` will produce the output.
+ */
+
 struct combine_diff_path;
 struct commit;
 struct diff_filespec;
@@ -65,21 +108,66 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
 
 #define DIFF_FLAGS_INIT { 0 }
 struct diff_flags {
+
+	/**
+	 * Tells if tree traversal done by tree-diff should recursively descend
+	 * into a tree object pair that are different in preimage and postimage set.
+	 */
 	unsigned recursive;
 	unsigned tree_in_recursive;
+
+	/* Affects the way how a file that is seemingly binary is treated. */
 	unsigned binary;
 	unsigned text;
+
+	/**
+	 * Tells the patch output format not to use abbreviated object names on the
+	 * "index" lines.
+	 */
 	unsigned full_index;
+
+	/* Affects if diff-files shows removed files. */
 	unsigned silent_on_remove;
+
+	/**
+	 * Tells the diffcore library that the caller is feeding unchanged
+	 * filepairs to allow copies from unmodified files be detected.
+	 */
 	unsigned find_copies_harder;
+
 	unsigned follow_renames;
 	unsigned rename_empty;
+
+	/* Internal; used for optimization to see if there is any change. */
 	unsigned has_changes;
+
 	unsigned quick;
+
+	/**
+	 * Tells diff-files that the input is not tracked files but files in random
+	 * locations on the filesystem.
+	 */
 	unsigned no_index;
+
+	/**
+	 * Tells output routine that it is Ok to call user specified patch output
+	 * routine.  Plumbing disables this to ensure stable output.
+	 */
 	unsigned allow_external;
+
+	/**
+	 * For communication between the calling program and the options parser;
+	 * tell the calling program to signal the presence of difference using
+	 * program exit code.
+	 */
 	unsigned exit_with_status;
+
+	/**
+	 * Tells the library that the calling program is feeding the filepairs
+	 * reversed; `one` is two, and `two` is one.
+	 */
 	unsigned reverse_diff;
+
 	unsigned check_failed;
 	unsigned relative_name;
 	unsigned ignore_submodules;
@@ -131,36 +219,72 @@ enum diff_submodule_format {
 	DIFF_SUBMODULE_INLINE_DIFF
 };
 
+/**
+ * the set of options the calling program wants to affect the operation of
+ * diffcore library with.
+ */
 struct diff_options {
 	const char *orderfile;
+
+	/**
+	 * A constant string (can and typically does contain newlines to look for
+	 * a block of text, not just a single line) to filter out the filepairs
+	 * that do not change the number of strings contained in its preimage and
+	 * postimage of the diff_queue.
+	 */
 	const char *pickaxe;
+
 	const char *single_follow;
 	const char *a_prefix, *b_prefix;
 	const char *line_prefix;
 	size_t line_prefix_length;
+
+	/**
+	 * collection of boolean options that affects the operation, but some do
+	 * not have anything to do with the diffcore library.
+	 */
 	struct diff_flags flags;
 
 	/* diff-filter bits */
 	unsigned int filter;
 
 	int use_color;
+
+	/* Number of context lines to generate in patch output. */
 	int context;
+
 	int interhunkcontext;
+
+	/* Affects the way detection logic for complete rewrites, renames and
+	 * copies.
+	 */
 	int break_opt;
 	int detect_rename;
+
 	int irreversible_delete;
 	int skip_stat_unmatch;
 	int line_termination;
+
+	/* The output format used when `diff_flush()` is run. */
 	int output_format;
+
 	unsigned pickaxe_opts;
+
+	/* Affects the way detection logic for complete rewrites, renames and
+	 * copies.
+	 */
 	int rename_score;
 	int rename_limit;
+
 	int needed_rename_limit;
 	int degraded_cc_to_c;
 	int show_rename_progress;
 	int dirstat_permille;
 	int setup;
+
+	/* Number of hexdigits to abbreviate raw format output to. */
 	int abbrev;
+
 	int ita_invisible_in_index;
 /* white-space error highlighting */
 #define WSEH_NEW (1<<12)
@@ -192,6 +316,7 @@ struct diff_options {
 	/* to support internal diff recursion by --follow hack*/
 	int found_follow;
 
+	/* Callback which allows tweaking the options in diff_setup_done(). */
 	void (*set_default)(struct diff_options *);
 
 	FILE *file;
@@ -245,6 +370,22 @@ void diff_emit_submodule_error(struct diff_options *o, const char *err);
 void diff_emit_submodule_pipethrough(struct diff_options *o,
 				     const char *line, int len);
 
+struct diffstat_t {
+	int nr;
+	int alloc;
+	struct diffstat_file {
+		char *from_name;
+		char *name;
+		char *print_name;
+		const char *comments;
+		unsigned is_unmerged:1;
+		unsigned is_binary:1;
+		unsigned is_renamed:1;
+		unsigned is_interesting:1;
+		uintmax_t added, deleted;
+	} **files;
+};
+
 enum color_diff {
 	DIFF_RESET = 0,
 	DIFF_CONTEXT = 1,
@@ -270,6 +411,7 @@ enum color_diff {
 	DIFF_FILE_OLD_BOLD = 21,
 	DIFF_FILE_NEW_BOLD = 22,
 };
+
 const char *diff_get_color(int diff_use_color, enum color_diff ix);
 #define diff_get_color_opt(o, ix) \
 	diff_get_color((o)->use_color, ix)
@@ -334,6 +476,10 @@ void diff_change(struct diff_options *,
 
 struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
 
+void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat,
+		      struct diff_queue_struct *q);
+void free_diffstat_info(struct diffstat_t *diffstat);
+
 #define DIFF_SETUP_REVERSE      	1
 #define DIFF_SETUP_USE_SIZE_CACHE	4
 
@@ -438,7 +584,7 @@ int run_diff_index(struct rev_info *revs, int cached);
 
 int do_diff_cache(const struct object_id *, struct diff_options *);
 int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
-void flush_one_hunk(struct object_id *, git_SHA_CTX *);
+void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx);
 
 int diff_result_code(struct diff_options *, int);
 
diff --git a/third_party/git/diffcore-break.c b/third_party/git/diffcore-break.c
index 875aefd3febf..9d20a6a6fc1d 100644
--- a/third_party/git/diffcore-break.c
+++ b/third_party/git/diffcore-break.c
@@ -286,17 +286,17 @@ void diffcore_merge_broken(void)
 					/* Peer survived.  Merge them */
 					merge_broken(p, pp, &outq);
 					q->queue[j] = NULL;
-					break;
+					goto next;
 				}
 			}
-			if (q->nr <= j)
-				/* The peer did not survive, so we keep
-				 * it in the output.
-				 */
-				diff_q(&outq, p);
+			/* The peer did not survive, so we keep
+			 * it in the output.
+			 */
+			diff_q(&outq, p);
 		}
 		else
 			diff_q(&outq, p);
+next:;
 	}
 	free(q->queue);
 	*q = outq;
diff --git a/third_party/git/diffcore-rename.c b/third_party/git/diffcore-rename.c
index 9624864858dc..e189f407af3a 100644
--- a/third_party/git/diffcore-rename.c
+++ b/third_party/git/diffcore-rename.c
@@ -263,8 +263,8 @@ static unsigned int hash_filespec(struct repository *r,
 	if (!filespec->oid_valid) {
 		if (diff_populate_filespec(r, filespec, 0))
 			return 0;
-		hash_object_file(filespec->data, filespec->size, "blob",
-				 &filespec->oid);
+		hash_object_file(r->hash_algo, filespec->data, filespec->size,
+				 "blob", &filespec->oid);
 	}
 	return oidhash(&filespec->oid);
 }
@@ -274,18 +274,17 @@ static int find_identical_files(struct hashmap *srcs,
 				struct diff_options *options)
 {
 	int renames = 0;
-
 	struct diff_filespec *target = rename_dst[dst_index].two;
 	struct file_similarity *p, *best = NULL;
 	int i = 100, best_score = -1;
+	unsigned int hash = hash_filespec(options->repo, target);
 
 	/*
 	 * Find the best source match for specified destination.
 	 */
-	p = hashmap_get_from_hash(srcs,
-				  hash_filespec(options->repo, target),
-				  NULL);
-	for (; p; p = hashmap_get_next(srcs, p)) {
+	p = hashmap_get_entry_from_hash(srcs, hash, NULL,
+					struct file_similarity, entry);
+	hashmap_for_each_entry_from(srcs, p, entry) {
 		int score;
 		struct diff_filespec *source = p->filespec;
 
@@ -329,8 +328,8 @@ static void insert_file_table(struct repository *r,
 	entry->index = index;
 	entry->filespec = filespec;
 
-	hashmap_entry_init(entry, hash_filespec(r, filespec));
-	hashmap_add(table, entry);
+	hashmap_entry_init(&entry->entry, hash_filespec(r, filespec));
+	hashmap_add(table, &entry->entry);
 }
 
 /*
@@ -359,7 +358,7 @@ static int find_exact_renames(struct diff_options *options)
 		renames += find_identical_files(&file_table, i, options);
 
 	/* Free the hash data structure and entries */
-	hashmap_free(&file_table, 1);
+	hashmap_free_entries(&file_table, struct file_similarity, entry);
 
 	return renames;
 }
@@ -585,7 +584,7 @@ void diffcore_rename(struct diff_options *options)
 	stop_progress(&progress);
 
 	/* cost matrix sorted by most to least similar pair */
-	QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
+	STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
 
 	rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
 	if (detect_rename == DIFF_DETECT_COPY)
diff --git a/third_party/git/diffcore.h b/third_party/git/diffcore.h
index b651061c0e3a..7c07347e42b5 100644
--- a/third_party/git/diffcore.h
+++ b/third_party/git/diffcore.h
@@ -28,6 +28,12 @@ struct userdiff_driver;
 
 #define MINIMUM_BREAK_SIZE     400 /* do not break a file smaller than this */
 
+/**
+ * the internal representation for a single file (blob).  It records the blob
+ * object name (if known -- for a work tree file it typically is a NUL SHA-1),
+ * filemode and pathname.  This is what the `diff_addremove()`, `diff_change()`
+ * and `diff_unmerge()` synthesize and feed `diff_queue()` function with.
+ */
 struct diff_filespec {
 	struct object_id oid;
 	char *path;
@@ -66,6 +72,17 @@ void diff_free_filespec_data(struct diff_filespec *);
 void diff_free_filespec_blob(struct diff_filespec *);
 int diff_filespec_is_binary(struct repository *, struct diff_filespec *);
 
+/**
+ * This records a pair of `struct diff_filespec`; the filespec for a file in
+ * the "old" set (i.e. preimage) is called `one`, and the filespec for a file
+ * in the "new" set (i.e. postimage) is called `two`.  A change that represents
+ * file creation has NULL in `one`, and file deletion has NULL in `two`.
+ *
+ * A `filepair` starts pointing at `one` and `two` that are from the same
+ * filename, but `diffcore_std()` can break pairs and match component filespecs
+ * with other filespecs from a different filepair to form new filepair. This is
+ * called 'rename detection'.
+ */
 struct diff_filepair {
 	struct diff_filespec *one;
 	struct diff_filespec *two;
@@ -77,6 +94,7 @@ struct diff_filepair {
 	unsigned done_skip_stat_unmatch : 1;
 	unsigned skip_stat_unmatch_result : 1;
 };
+
 #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)
 
 #define DIFF_PAIR_RENAME(p) ((p)->renamed_pair)
@@ -94,11 +112,25 @@ void diff_free_filepair(struct diff_filepair *);
 
 int diff_unmodified_pair(struct diff_filepair *);
 
+/**
+ * This is a collection of filepairs.  Notable members are:
+ *
+ * - `queue`:
+ * An array of pointers to `struct diff_filepair`. This dynamically grows as
+ * you add filepairs;
+ *
+ * - `alloc`:
+ * The allocated size of the `queue` array;
+ *
+ * - `nr`:
+ * The number of elements in the `queue` array.
+ */
 struct diff_queue_struct {
 	struct diff_filepair **queue;
 	int alloc;
 	int nr;
 };
+
 #define DIFF_QUEUE_CLEAR(q) \
 	do { \
 		(q)->queue = NULL; \
diff --git a/third_party/git/dir.c b/third_party/git/dir.c
index d021c908e5d1..0ffb1b330245 100644
--- a/third_party/git/dir.c
+++ b/third_party/git/dir.c
@@ -2,8 +2,6 @@
  * This handles recursive filename detection with exclude
  * files, index knowledge etc..
  *
- * See Documentation/technical/api-directory-listing.txt
- *
  * Copyright (C) Linus Torvalds, 2005-2006
  *		 Junio Hamano, 2005-2006
  */
@@ -43,7 +41,8 @@ struct cached_dir {
 	int nr_files;
 	int nr_dirs;
 
-	struct dirent *de;
+	const char *d_name;
+	int d_type;
 	const char *file;
 	struct untracked_cache_dir *ucd;
 };
@@ -52,8 +51,8 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 	struct index_state *istate, const char *path, int len,
 	struct untracked_cache_dir *untracked,
 	int check_only, int stop_at_first_file, const struct pathspec *pathspec);
-static int get_dtype(struct dirent *de, struct index_state *istate,
-		     const char *path, int len);
+static int resolve_dtype(int dtype, struct index_state *istate,
+			 const char *path, int len);
 
 int count_slashes(const char *s)
 {
@@ -139,7 +138,7 @@ static size_t common_prefix_len(const struct pathspec *pathspec)
 	 * ":(icase)path" is treated as a pathspec full of
 	 * wildcard. In other words, only prefix is considered common
 	 * prefix. If the pathspec is abc/foo abc/bar, running in
-	 * subdir xyz, the common prefix is still xyz, not xuz/abc as
+	 * subdir xyz, the common prefix is still xyz, not xyz/abc as
 	 * in non-:(icase).
 	 */
 	GUARD_PATHSPEC(pathspec,
@@ -273,19 +272,30 @@ static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat,
 
 #define DO_MATCH_EXCLUDE   (1<<0)
 #define DO_MATCH_DIRECTORY (1<<1)
-#define DO_MATCH_SUBMODULE (1<<2)
+#define DO_MATCH_LEADING_PATHSPEC (1<<2)
 
 /*
- * Does 'match' match the given name?
- * A match is found if
+ * Does the given pathspec match the given name?  A match is found if
+ *
+ * (1) the pathspec string is leading directory of 'name' ("RECURSIVELY"), or
+ * (2) the pathspec string has a leading part matching 'name' ("LEADING"), or
+ * (3) the pathspec string is a wildcard and matches 'name' ("WILDCARD"), or
+ * (4) the pathspec string is exactly the same as 'name' ("EXACT").
  *
- * (1) the 'match' string is leading directory of 'name', or
- * (2) the 'match' string is a wildcard and matches 'name', or
- * (3) the 'match' string is exactly the same as 'name'.
+ * Return value tells which case it was (1-4), or 0 when there is no match.
  *
- * and the return value tells which case it was.
+ * It may be instructive to look at a small table of concrete examples
+ * to understand the differences between 1, 2, and 4:
  *
- * It returns 0 when there is no match.
+ *                              Pathspecs
+ *                |    a/b    |   a/b/    |   a/b/c
+ *          ------+-----------+-----------+------------
+ *          a/b   |  EXACT    |  EXACT[1] | LEADING[2]
+ *  Names   a/b/  | RECURSIVE |   EXACT   | LEADING[2]
+ *          a/b/c | RECURSIVE | RECURSIVE |   EXACT
+ *
+ * [1] Only if DO_MATCH_DIRECTORY is passed; otherwise, this is NOT a match.
+ * [2] Only if DO_MATCH_LEADING_PATHSPEC is passed; otherwise, not a match.
  */
 static int match_pathspec_item(const struct index_state *istate,
 			       const struct pathspec_item *item, int prefix,
@@ -353,21 +363,29 @@ static int match_pathspec_item(const struct index_state *istate,
 			 item->nowildcard_len - prefix))
 		return MATCHED_FNMATCH;
 
-	/* Perform checks to see if "name" is a super set of the pathspec */
-	if (flags & DO_MATCH_SUBMODULE) {
+	/* Perform checks to see if "name" is a leading string of the pathspec */
+	if (flags & DO_MATCH_LEADING_PATHSPEC) {
 		/* name is a literal prefix of the pathspec */
+		int offset = name[namelen-1] == '/' ? 1 : 0;
 		if ((namelen < matchlen) &&
-		    (match[namelen] == '/') &&
+		    (match[namelen-offset] == '/') &&
 		    !ps_strncmp(item, match, name, namelen))
-			return MATCHED_RECURSIVELY;
+			return MATCHED_RECURSIVELY_LEADING_PATHSPEC;
 
-		/* name" doesn't match up to the first wild character */
+		/* name doesn't match up to the first wild character */
 		if (item->nowildcard_len < item->len &&
 		    ps_strncmp(item, match, name,
 			       item->nowildcard_len - prefix))
 			return 0;
 
 		/*
+		 * name has no wildcard, and it didn't match as a leading
+		 * pathspec so return.
+		 */
+		if (item->nowildcard_len == item->len)
+			return 0;
+
+		/*
 		 * Here is where we would perform a wildmatch to check if
 		 * "name" can be matched as a directory (or a prefix) against
 		 * the pathspec.  Since wildmatch doesn't have this capability
@@ -376,7 +394,7 @@ static int match_pathspec_item(const struct index_state *istate,
 		 * The submodules themselves will be able to perform more
 		 * accurate matching to determine if the pathspec matches.
 		 */
-		return MATCHED_RECURSIVELY;
+		return MATCHED_RECURSIVELY_LEADING_PATHSPEC;
 	}
 
 	return 0;
@@ -497,7 +515,7 @@ int submodule_path_match(const struct index_state *istate,
 					strlen(submodule_name),
 					0, seen,
 					DO_MATCH_DIRECTORY |
-					DO_MATCH_SUBMODULE);
+					DO_MATCH_LEADING_PATHSPEC);
 	return matched;
 }
 
@@ -561,7 +579,7 @@ int no_wildcard(const char *string)
 	return string[simple_length(string)] == '\0';
 }
 
-void parse_exclude_pattern(const char **pattern,
+void parse_path_pattern(const char **pattern,
 			   int *patternlen,
 			   unsigned *flags,
 			   int *nowildcardlen)
@@ -571,20 +589,20 @@ void parse_exclude_pattern(const char **pattern,
 
 	*flags = 0;
 	if (*p == '!') {
-		*flags |= EXC_FLAG_NEGATIVE;
+		*flags |= PATTERN_FLAG_NEGATIVE;
 		p++;
 	}
 	len = strlen(p);
 	if (len && p[len - 1] == '/') {
 		len--;
-		*flags |= EXC_FLAG_MUSTBEDIR;
+		*flags |= PATTERN_FLAG_MUSTBEDIR;
 	}
 	for (i = 0; i < len; i++) {
 		if (p[i] == '/')
 			break;
 	}
 	if (i == len)
-		*flags |= EXC_FLAG_NODIR;
+		*flags |= PATTERN_FLAG_NODIR;
 	*nowildcardlen = simple_length(p);
 	/*
 	 * we should have excluded the trailing slash from 'p' too,
@@ -594,35 +612,261 @@ void parse_exclude_pattern(const char **pattern,
 	if (*nowildcardlen > len)
 		*nowildcardlen = len;
 	if (*p == '*' && no_wildcard(p + 1))
-		*flags |= EXC_FLAG_ENDSWITH;
+		*flags |= PATTERN_FLAG_ENDSWITH;
 	*pattern = p;
 	*patternlen = len;
 }
 
-void add_exclude(const char *string, const char *base,
-		 int baselen, struct exclude_list *el, int srcpos)
+int pl_hashmap_cmp(const void *unused_cmp_data,
+		   const struct hashmap_entry *a,
+		   const struct hashmap_entry *b,
+		   const void *key)
 {
-	struct exclude *x;
+	const struct pattern_entry *ee1 =
+			container_of(a, struct pattern_entry, ent);
+	const struct pattern_entry *ee2 =
+			container_of(b, struct pattern_entry, ent);
+
+	size_t min_len = ee1->patternlen <= ee2->patternlen
+			 ? ee1->patternlen
+			 : ee2->patternlen;
+
+	if (ignore_case)
+		return strncasecmp(ee1->pattern, ee2->pattern, min_len);
+	return strncmp(ee1->pattern, ee2->pattern, min_len);
+}
+
+static char *dup_and_filter_pattern(const char *pattern)
+{
+	char *set, *read;
+	size_t count  = 0;
+	char *result = xstrdup(pattern);
+
+	set = result;
+	read = result;
+
+	while (*read) {
+		/* skip escape characters (once) */
+		if (*read == '\\')
+			read++;
+
+		*set = *read;
+
+		set++;
+		read++;
+		count++;
+	}
+	*set = 0;
+
+	if (count > 2 &&
+	    *(set - 1) == '*' &&
+	    *(set - 2) == '/')
+		*(set - 2) = 0;
+
+	return result;
+}
+
+static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern *given)
+{
+	struct pattern_entry *translated;
+	char *truncated;
+	char *data = NULL;
+	const char *prev, *cur, *next;
+
+	if (!pl->use_cone_patterns)
+		return;
+
+	if (given->flags & PATTERN_FLAG_NEGATIVE &&
+	    given->flags & PATTERN_FLAG_MUSTBEDIR &&
+	    !strcmp(given->pattern, "/*")) {
+		pl->full_cone = 0;
+		return;
+	}
+
+	if (!given->flags && !strcmp(given->pattern, "/*")) {
+		pl->full_cone = 1;
+		return;
+	}
+
+	if (given->patternlen < 2 ||
+	    *given->pattern == '*' ||
+	    strstr(given->pattern, "**")) {
+		/* Not a cone pattern. */
+		warning(_("unrecognized pattern: '%s'"), given->pattern);
+		goto clear_hashmaps;
+	}
+
+	prev = given->pattern;
+	cur = given->pattern + 1;
+	next = given->pattern + 2;
+
+	while (*cur) {
+		/* Watch for glob characters '*', '\', '[', '?' */
+		if (!is_glob_special(*cur))
+			goto increment;
+
+		/* But only if *prev != '\\' */
+		if (*prev == '\\')
+			goto increment;
+
+		/* But allow the initial '\' */
+		if (*cur == '\\' &&
+		    is_glob_special(*next))
+			goto increment;
+
+		/* But a trailing '/' then '*' is fine */
+		if (*prev == '/' &&
+		    *cur == '*' &&
+		    *next == 0)
+			goto increment;
+
+		/* Not a cone pattern. */
+		warning(_("unrecognized pattern: '%s'"), given->pattern);
+		goto clear_hashmaps;
+
+	increment:
+		prev++;
+		cur++;
+		next++;
+	}
+
+	if (given->patternlen > 2 &&
+	    !strcmp(given->pattern + given->patternlen - 2, "/*")) {
+		if (!(given->flags & PATTERN_FLAG_NEGATIVE)) {
+			/* Not a cone pattern. */
+			warning(_("unrecognized pattern: '%s'"), given->pattern);
+			goto clear_hashmaps;
+		}
+
+		truncated = dup_and_filter_pattern(given->pattern);
+
+		translated = xmalloc(sizeof(struct pattern_entry));
+		translated->pattern = truncated;
+		translated->patternlen = given->patternlen - 2;
+		hashmap_entry_init(&translated->ent,
+				   ignore_case ?
+				   strihash(translated->pattern) :
+				   strhash(translated->pattern));
+
+		if (!hashmap_get_entry(&pl->recursive_hashmap,
+				       translated, ent, NULL)) {
+			/* We did not see the "parent" included */
+			warning(_("unrecognized negative pattern: '%s'"),
+				given->pattern);
+			free(truncated);
+			free(translated);
+			goto clear_hashmaps;
+		}
+
+		hashmap_add(&pl->parent_hashmap, &translated->ent);
+		hashmap_remove(&pl->recursive_hashmap, &translated->ent, &data);
+		free(data);
+		return;
+	}
+
+	if (given->flags & PATTERN_FLAG_NEGATIVE) {
+		warning(_("unrecognized negative pattern: '%s'"),
+			given->pattern);
+		goto clear_hashmaps;
+	}
+
+	translated = xmalloc(sizeof(struct pattern_entry));
+
+	translated->pattern = dup_and_filter_pattern(given->pattern);
+	translated->patternlen = given->patternlen;
+	hashmap_entry_init(&translated->ent,
+			   ignore_case ?
+			   strihash(translated->pattern) :
+			   strhash(translated->pattern));
+
+	hashmap_add(&pl->recursive_hashmap, &translated->ent);
+
+	if (hashmap_get_entry(&pl->parent_hashmap, translated, ent, NULL)) {
+		/* we already included this at the parent level */
+		warning(_("your sparse-checkout file may have issues: pattern '%s' is repeated"),
+			given->pattern);
+		hashmap_remove(&pl->parent_hashmap, &translated->ent, &data);
+		free(data);
+		free(translated);
+	}
+
+	return;
+
+clear_hashmaps:
+	warning(_("disabling cone pattern matching"));
+	hashmap_free_entries(&pl->parent_hashmap, struct pattern_entry, ent);
+	hashmap_free_entries(&pl->recursive_hashmap, struct pattern_entry, ent);
+	pl->use_cone_patterns = 0;
+}
+
+static int hashmap_contains_path(struct hashmap *map,
+				 struct strbuf *pattern)
+{
+	struct pattern_entry p;
+
+	/* Check straight mapping */
+	p.pattern = pattern->buf;
+	p.patternlen = pattern->len;
+	hashmap_entry_init(&p.ent,
+			   ignore_case ?
+			   strihash(p.pattern) :
+			   strhash(p.pattern));
+	return !!hashmap_get_entry(map, &p, ent, NULL);
+}
+
+int hashmap_contains_parent(struct hashmap *map,
+			    const char *path,
+			    struct strbuf *buffer)
+{
+	char *slash_pos;
+
+	strbuf_setlen(buffer, 0);
+
+	if (path[0] != '/')
+		strbuf_addch(buffer, '/');
+
+	strbuf_addstr(buffer, path);
+
+	slash_pos = strrchr(buffer->buf, '/');
+
+	while (slash_pos > buffer->buf) {
+		strbuf_setlen(buffer, slash_pos - buffer->buf);
+
+		if (hashmap_contains_path(map, buffer))
+			return 1;
+
+		slash_pos = strrchr(buffer->buf, '/');
+	}
+
+	return 0;
+}
+
+void add_pattern(const char *string, const char *base,
+		 int baselen, struct pattern_list *pl, int srcpos)
+{
+	struct path_pattern *pattern;
 	int patternlen;
 	unsigned flags;
 	int nowildcardlen;
 
-	parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen);
-	if (flags & EXC_FLAG_MUSTBEDIR) {
-		FLEXPTR_ALLOC_MEM(x, pattern, string, patternlen);
+	parse_path_pattern(&string, &patternlen, &flags, &nowildcardlen);
+	if (flags & PATTERN_FLAG_MUSTBEDIR) {
+		FLEXPTR_ALLOC_MEM(pattern, pattern, string, patternlen);
 	} else {
-		x = xmalloc(sizeof(*x));
-		x->pattern = string;
+		pattern = xmalloc(sizeof(*pattern));
+		pattern->pattern = string;
 	}
-	x->patternlen = patternlen;
-	x->nowildcardlen = nowildcardlen;
-	x->base = base;
-	x->baselen = baselen;
-	x->flags = flags;
-	x->srcpos = srcpos;
-	ALLOC_GROW(el->excludes, el->nr + 1, el->alloc);
-	el->excludes[el->nr++] = x;
-	x->el = el;
+	pattern->patternlen = patternlen;
+	pattern->nowildcardlen = nowildcardlen;
+	pattern->base = base;
+	pattern->baselen = baselen;
+	pattern->flags = flags;
+	pattern->srcpos = srcpos;
+	ALLOC_GROW(pl->patterns, pl->nr + 1, pl->alloc);
+	pl->patterns[pl->nr++] = pattern;
+	pattern->pl = pl;
+
+	add_pattern_to_hashsets(pl, pattern);
 }
 
 static int read_skip_worktree_file_from_index(const struct index_state *istate,
@@ -643,19 +887,19 @@ static int read_skip_worktree_file_from_index(const struct index_state *istate,
 }
 
 /*
- * Frees memory within el which was allocated for exclude patterns and
- * the file buffer.  Does not free el itself.
+ * Frees memory within pl which was allocated for exclude patterns and
+ * the file buffer.  Does not free pl itself.
  */
-void clear_exclude_list(struct exclude_list *el)
+void clear_pattern_list(struct pattern_list *pl)
 {
 	int i;
 
-	for (i = 0; i < el->nr; i++)
-		free(el->excludes[i]);
-	free(el->excludes);
-	free(el->filebuf);
+	for (i = 0; i < pl->nr; i++)
+		free(pl->patterns[i]);
+	free(pl->patterns);
+	free(pl->filebuf);
 
-	memset(el, 0, sizeof(*el));
+	memset(pl, 0, sizeof(*pl));
 }
 
 static void trim_trailing_spaces(char *buf)
@@ -762,21 +1006,21 @@ static void invalidate_directory(struct untracked_cache *uc,
 		dir->dirs[i]->recurse = 0;
 }
 
-static int add_excludes_from_buffer(char *buf, size_t size,
+static int add_patterns_from_buffer(char *buf, size_t size,
 				    const char *base, int baselen,
-				    struct exclude_list *el);
+				    struct pattern_list *pl);
 
 /*
  * Given a file with name "fname", read it (either from disk, or from
  * an index if 'istate' is non-null), parse it and store the
- * exclude rules in "el".
+ * exclude rules in "pl".
  *
  * If "ss" is not NULL, compute SHA-1 of the exclude file and fill
- * stat data from disk (only valid if add_excludes returns zero). If
+ * stat data from disk (only valid if add_patterns returns zero). If
  * ss_valid is non-zero, "ss" must contain good value as input.
  */
-static int add_excludes(const char *fname, const char *base, int baselen,
-			struct exclude_list *el, struct index_state *istate,
+static int add_patterns(const char *fname, const char *base, int baselen,
+			struct pattern_list *pl, struct index_state *istate,
 			struct oid_stat *oid_stat)
 {
 	struct stat st;
@@ -830,28 +1074,31 @@ static int add_excludes(const char *fname, const char *base, int baselen,
 				oidcpy(&oid_stat->oid,
 				       &istate->cache[pos]->oid);
 			else
-				hash_object_file(buf, size, "blob",
-						 &oid_stat->oid);
+				hash_object_file(the_hash_algo, buf, size,
+						 "blob", &oid_stat->oid);
 			fill_stat_data(&oid_stat->stat, &st);
 			oid_stat->valid = 1;
 		}
 	}
 
-	add_excludes_from_buffer(buf, size, base, baselen, el);
+	add_patterns_from_buffer(buf, size, base, baselen, pl);
 	return 0;
 }
 
-static int add_excludes_from_buffer(char *buf, size_t size,
+static int add_patterns_from_buffer(char *buf, size_t size,
 				    const char *base, int baselen,
-				    struct exclude_list *el)
+				    struct pattern_list *pl)
 {
 	int i, lineno = 1;
 	char *entry;
 
-	el->filebuf = buf;
+	hashmap_init(&pl->recursive_hashmap, pl_hashmap_cmp, NULL, 0);
+	hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0);
+
+	pl->filebuf = buf;
 
 	if (skip_utf8_bom(&buf, size))
-		size -= buf - el->filebuf;
+		size -= buf - pl->filebuf;
 
 	entry = buf;
 
@@ -860,7 +1107,7 @@ static int add_excludes_from_buffer(char *buf, size_t size,
 			if (entry != buf + i && entry[0] != '#') {
 				buf[i - (i && buf[i-1] == '\r')] = 0;
 				trim_trailing_spaces(entry);
-				add_exclude(entry, base, baselen, el, lineno);
+				add_pattern(entry, base, baselen, pl, lineno);
 			}
 			lineno++;
 			entry = buf + i + 1;
@@ -869,17 +1116,17 @@ static int add_excludes_from_buffer(char *buf, size_t size,
 	return 0;
 }
 
-int add_excludes_from_file_to_list(const char *fname, const char *base,
-				   int baselen, struct exclude_list *el,
+int add_patterns_from_file_to_list(const char *fname, const char *base,
+				   int baselen, struct pattern_list *pl,
 				   struct index_state *istate)
 {
-	return add_excludes(fname, base, baselen, el, istate, NULL);
+	return add_patterns(fname, base, baselen, pl, istate, NULL);
 }
 
-int add_excludes_from_blob_to_list(
+int add_patterns_from_blob_to_list(
 	struct object_id *oid,
 	const char *base, int baselen,
-	struct exclude_list *el)
+	struct pattern_list *pl)
 {
 	char *buf;
 	size_t size;
@@ -889,31 +1136,31 @@ int add_excludes_from_blob_to_list(
 	if (r != 1)
 		return r;
 
-	add_excludes_from_buffer(buf, size, base, baselen, el);
+	add_patterns_from_buffer(buf, size, base, baselen, pl);
 	return 0;
 }
 
-struct exclude_list *add_exclude_list(struct dir_struct *dir,
+struct pattern_list *add_pattern_list(struct dir_struct *dir,
 				      int group_type, const char *src)
 {
-	struct exclude_list *el;
+	struct pattern_list *pl;
 	struct exclude_list_group *group;
 
 	group = &dir->exclude_list_group[group_type];
-	ALLOC_GROW(group->el, group->nr + 1, group->alloc);
-	el = &group->el[group->nr++];
-	memset(el, 0, sizeof(*el));
-	el->src = src;
-	return el;
+	ALLOC_GROW(group->pl, group->nr + 1, group->alloc);
+	pl = &group->pl[group->nr++];
+	memset(pl, 0, sizeof(*pl));
+	pl->src = src;
+	return pl;
 }
 
 /*
  * Used to set up core.excludesfile and .git/info/exclude lists.
  */
-static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname,
+static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname,
 				     struct oid_stat *oid_stat)
 {
-	struct exclude_list *el;
+	struct pattern_list *pl;
 	/*
 	 * catch setup_standard_excludes() that's called before
 	 * dir->untracked is assigned. That function behaves
@@ -921,15 +1168,15 @@ static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname,
 	 */
 	if (!dir->untracked)
 		dir->unmanaged_exclude_files++;
-	el = add_exclude_list(dir, EXC_FILE, fname);
-	if (add_excludes(fname, "", 0, el, NULL, oid_stat) < 0)
+	pl = add_pattern_list(dir, EXC_FILE, fname);
+	if (add_patterns(fname, "", 0, pl, NULL, oid_stat) < 0)
 		die(_("cannot use %s as an exclude file"), fname);
 }
 
-void add_excludes_from_file(struct dir_struct *dir, const char *fname)
+void add_patterns_from_file(struct dir_struct *dir, const char *fname)
 {
 	dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */
-	add_excludes_from_file_1(dir, fname, NULL);
+	add_patterns_from_file_1(dir, fname, NULL);
 }
 
 int match_basename(const char *basename, int basenamelen,
@@ -940,7 +1187,7 @@ int match_basename(const char *basename, int basenamelen,
 		if (patternlen == basenamelen &&
 		    !fspathncmp(pattern, basename, basenamelen))
 			return 1;
-	} else if (flags & EXC_FLAG_ENDSWITH) {
+	} else if (flags & PATTERN_FLAG_ENDSWITH) {
 		/* "*literal" matching against "fooliteral" */
 		if (patternlen - 1 <= basenamelen &&
 		    !fspathncmp(pattern + 1,
@@ -1021,85 +1268,138 @@ int match_pathname(const char *pathname, int pathlen,
  * any, determines the fate.  Returns the exclude_list element which
  * matched, or NULL for undecided.
  */
-static struct exclude *last_exclude_matching_from_list(const char *pathname,
+static struct path_pattern *last_matching_pattern_from_list(const char *pathname,
 						       int pathlen,
 						       const char *basename,
 						       int *dtype,
-						       struct exclude_list *el,
+						       struct pattern_list *pl,
 						       struct index_state *istate)
 {
-	struct exclude *exc = NULL; /* undecided */
+	struct path_pattern *res = NULL; /* undecided */
 	int i;
 
-	if (!el->nr)
+	if (!pl->nr)
 		return NULL;	/* undefined */
 
-	for (i = el->nr - 1; 0 <= i; i--) {
-		struct exclude *x = el->excludes[i];
-		const char *exclude = x->pattern;
-		int prefix = x->nowildcardlen;
+	for (i = pl->nr - 1; 0 <= i; i--) {
+		struct path_pattern *pattern = pl->patterns[i];
+		const char *exclude = pattern->pattern;
+		int prefix = pattern->nowildcardlen;
 
-		if (x->flags & EXC_FLAG_MUSTBEDIR) {
-			if (*dtype == DT_UNKNOWN)
-				*dtype = get_dtype(NULL, istate, pathname, pathlen);
+		if (pattern->flags & PATTERN_FLAG_MUSTBEDIR) {
+			*dtype = resolve_dtype(*dtype, istate, pathname, pathlen);
 			if (*dtype != DT_DIR)
 				continue;
 		}
 
-		if (x->flags & EXC_FLAG_NODIR) {
+		if (pattern->flags & PATTERN_FLAG_NODIR) {
 			if (match_basename(basename,
 					   pathlen - (basename - pathname),
-					   exclude, prefix, x->patternlen,
-					   x->flags)) {
-				exc = x;
+					   exclude, prefix, pattern->patternlen,
+					   pattern->flags)) {
+				res = pattern;
 				break;
 			}
 			continue;
 		}
 
-		assert(x->baselen == 0 || x->base[x->baselen - 1] == '/');
+		assert(pattern->baselen == 0 ||
+		       pattern->base[pattern->baselen - 1] == '/');
 		if (match_pathname(pathname, pathlen,
-				   x->base, x->baselen ? x->baselen - 1 : 0,
-				   exclude, prefix, x->patternlen, x->flags)) {
-			exc = x;
+				   pattern->base,
+				   pattern->baselen ? pattern->baselen - 1 : 0,
+				   exclude, prefix, pattern->patternlen,
+				   pattern->flags)) {
+			res = pattern;
 			break;
 		}
 	}
-	return exc;
+	return res;
 }
 
 /*
- * Scan the list and let the last match determine the fate.
- * Return 1 for exclude, 0 for include and -1 for undecided.
+ * Scan the list of patterns to determine if the ordered list
+ * of patterns matches on 'pathname'.
+ *
+ * Return 1 for a match, 0 for not matched and -1 for undecided.
  */
-int is_excluded_from_list(const char *pathname,
-			  int pathlen, const char *basename, int *dtype,
-			  struct exclude_list *el, struct index_state *istate)
-{
-	struct exclude *exclude;
-	exclude = last_exclude_matching_from_list(pathname, pathlen, basename,
-						  dtype, el, istate);
-	if (exclude)
-		return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
-	return -1; /* undecided */
+enum pattern_match_result path_matches_pattern_list(
+				const char *pathname, int pathlen,
+				const char *basename, int *dtype,
+				struct pattern_list *pl,
+				struct index_state *istate)
+{
+	struct path_pattern *pattern;
+	struct strbuf parent_pathname = STRBUF_INIT;
+	int result = NOT_MATCHED;
+	const char *slash_pos;
+
+	if (!pl->use_cone_patterns) {
+		pattern = last_matching_pattern_from_list(pathname, pathlen, basename,
+							dtype, pl, istate);
+		if (pattern) {
+			if (pattern->flags & PATTERN_FLAG_NEGATIVE)
+				return NOT_MATCHED;
+			else
+				return MATCHED;
+		}
+
+		return UNDECIDED;
+	}
+
+	if (pl->full_cone)
+		return MATCHED;
+
+	strbuf_addch(&parent_pathname, '/');
+	strbuf_add(&parent_pathname, pathname, pathlen);
+
+	if (hashmap_contains_path(&pl->recursive_hashmap,
+				  &parent_pathname)) {
+		result = MATCHED_RECURSIVE;
+		goto done;
+	}
+
+	slash_pos = strrchr(parent_pathname.buf, '/');
+
+	if (slash_pos == parent_pathname.buf) {
+		/* include every file in root */
+		result = MATCHED;
+		goto done;
+	}
+
+	strbuf_setlen(&parent_pathname, slash_pos - parent_pathname.buf);
+
+	if (hashmap_contains_path(&pl->parent_hashmap, &parent_pathname)) {
+		result = MATCHED;
+		goto done;
+	}
+
+	if (hashmap_contains_parent(&pl->recursive_hashmap,
+				    pathname,
+				    &parent_pathname))
+		result = MATCHED_RECURSIVE;
+
+done:
+	strbuf_release(&parent_pathname);
+	return result;
 }
 
-static struct exclude *last_exclude_matching_from_lists(struct dir_struct *dir,
-							struct index_state *istate,
-		const char *pathname, int pathlen, const char *basename,
-		int *dtype_p)
+static struct path_pattern *last_matching_pattern_from_lists(
+		struct dir_struct *dir, struct index_state *istate,
+		const char *pathname, int pathlen,
+		const char *basename, int *dtype_p)
 {
 	int i, j;
 	struct exclude_list_group *group;
-	struct exclude *exclude;
+	struct path_pattern *pattern;
 	for (i = EXC_CMDL; i <= EXC_FILE; i++) {
 		group = &dir->exclude_list_group[i];
 		for (j = group->nr - 1; j >= 0; j--) {
-			exclude = last_exclude_matching_from_list(
+			pattern = last_matching_pattern_from_list(
 				pathname, pathlen, basename, dtype_p,
-				&group->el[j], istate);
-			if (exclude)
-				return exclude;
+				&group->pl[j], istate);
+			if (pattern)
+				return pattern;
 		}
 	}
 	return NULL;
@@ -1114,7 +1414,7 @@ static void prep_exclude(struct dir_struct *dir,
 			 const char *base, int baselen)
 {
 	struct exclude_list_group *group;
-	struct exclude_list *el;
+	struct pattern_list *pl;
 	struct exclude_stack *stk = NULL;
 	struct untracked_cache_dir *untracked;
 	int current;
@@ -1130,17 +1430,17 @@ static void prep_exclude(struct dir_struct *dir,
 		if (stk->baselen <= baselen &&
 		    !strncmp(dir->basebuf.buf, base, stk->baselen))
 			break;
-		el = &group->el[dir->exclude_stack->exclude_ix];
+		pl = &group->pl[dir->exclude_stack->exclude_ix];
 		dir->exclude_stack = stk->prev;
-		dir->exclude = NULL;
-		free((char *)el->src); /* see strbuf_detach() below */
-		clear_exclude_list(el);
+		dir->pattern = NULL;
+		free((char *)pl->src); /* see strbuf_detach() below */
+		clear_pattern_list(pl);
 		free(stk);
 		group->nr--;
 	}
 
 	/* Skip traversing into sub directories if the parent is excluded */
-	if (dir->exclude)
+	if (dir->pattern)
 		return;
 
 	/*
@@ -1181,7 +1481,7 @@ static void prep_exclude(struct dir_struct *dir,
 		stk->baselen = cp - base;
 		stk->exclude_ix = group->nr;
 		stk->ucd = untracked;
-		el = add_exclude_list(dir, EXC_DIRS, NULL);
+		pl = add_pattern_list(dir, EXC_DIRS, NULL);
 		strbuf_add(&dir->basebuf, base + current, stk->baselen - current);
 		assert(stk->baselen == dir->basebuf.len);
 
@@ -1189,15 +1489,15 @@ static void prep_exclude(struct dir_struct *dir,
 		if (stk->baselen) {
 			int dt = DT_DIR;
 			dir->basebuf.buf[stk->baselen - 1] = 0;
-			dir->exclude = last_exclude_matching_from_lists(dir,
+			dir->pattern = last_matching_pattern_from_lists(dir,
 									istate,
 				dir->basebuf.buf, stk->baselen - 1,
 				dir->basebuf.buf + current, &dt);
 			dir->basebuf.buf[stk->baselen - 1] = '/';
-			if (dir->exclude &&
-			    dir->exclude->flags & EXC_FLAG_NEGATIVE)
-				dir->exclude = NULL;
-			if (dir->exclude) {
+			if (dir->pattern &&
+			    dir->pattern->flags & PATTERN_FLAG_NEGATIVE)
+				dir->pattern = NULL;
+			if (dir->pattern) {
 				dir->exclude_stack = stk;
 				return;
 			}
@@ -1223,30 +1523,30 @@ static void prep_exclude(struct dir_struct *dir,
 			/*
 			 * dir->basebuf gets reused by the traversal, but we
 			 * need fname to remain unchanged to ensure the src
-			 * member of each struct exclude correctly
+			 * member of each struct path_pattern correctly
 			 * back-references its source file.  Other invocations
-			 * of add_exclude_list provide stable strings, so we
+			 * of add_pattern_list provide stable strings, so we
 			 * strbuf_detach() and free() here in the caller.
 			 */
 			struct strbuf sb = STRBUF_INIT;
 			strbuf_addbuf(&sb, &dir->basebuf);
 			strbuf_addstr(&sb, dir->exclude_per_dir);
-			el->src = strbuf_detach(&sb, NULL);
-			add_excludes(el->src, el->src, stk->baselen, el, istate,
+			pl->src = strbuf_detach(&sb, NULL);
+			add_patterns(pl->src, pl->src, stk->baselen, pl, istate,
 				     untracked ? &oid_stat : NULL);
 		}
 		/*
 		 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
 		 * will first be called in valid_cached_dir() then maybe many
-		 * times more in last_exclude_matching(). When the cache is
-		 * used, last_exclude_matching() will not be called and
+		 * times more in last_matching_pattern(). When the cache is
+		 * used, last_matching_pattern() will not be called and
 		 * reading .gitignore content will be a waste.
 		 *
 		 * So when it's called by valid_cached_dir() and we can get
 		 * .gitignore SHA-1 from the index (i.e. .gitignore is not
 		 * modified on work tree), we could delay reading the
 		 * .gitignore content until we absolutely need it in
-		 * last_exclude_matching(). Be careful about ignore rule
+		 * last_matching_pattern(). Be careful about ignore rule
 		 * order, though, if you do that.
 		 */
 		if (untracked &&
@@ -1266,7 +1566,7 @@ static void prep_exclude(struct dir_struct *dir,
  * Returns the exclude_list element which matched, or NULL for
  * undecided.
  */
-struct exclude *last_exclude_matching(struct dir_struct *dir,
+struct path_pattern *last_matching_pattern(struct dir_struct *dir,
 				      struct index_state *istate,
 				      const char *pathname,
 				      int *dtype_p)
@@ -1277,10 +1577,10 @@ struct exclude *last_exclude_matching(struct dir_struct *dir,
 
 	prep_exclude(dir, istate, pathname, basename-pathname);
 
-	if (dir->exclude)
-		return dir->exclude;
+	if (dir->pattern)
+		return dir->pattern;
 
-	return last_exclude_matching_from_lists(dir, istate, pathname, pathlen,
+	return last_matching_pattern_from_lists(dir, istate, pathname, pathlen,
 			basename, dtype_p);
 }
 
@@ -1292,10 +1592,10 @@ struct exclude *last_exclude_matching(struct dir_struct *dir,
 int is_excluded(struct dir_struct *dir, struct index_state *istate,
 		const char *pathname, int *dtype_p)
 {
-	struct exclude *exclude =
-		last_exclude_matching(dir, istate, pathname, dtype_p);
-	if (exclude)
-		return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
+	struct path_pattern *pattern =
+		last_matching_pattern(dir, istate, pathname, dtype_p);
+	if (pattern)
+		return pattern->flags & PATTERN_FLAG_NEGATIVE ? 0 : 1;
 	return 0;
 }
 
@@ -1430,6 +1730,8 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
 	const char *dirname, int len, int baselen, int exclude,
 	const struct pathspec *pathspec)
 {
+	int nested_repo = 0;
+
 	/* The "len-1" is to strip the final '/' */
 	switch (directory_exists_in_index(istate, dirname, len-1)) {
 	case index_directory:
@@ -1439,6 +1741,17 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
 		return path_none;
 
 	case index_nonexistent:
+		if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
+		    !(dir->flags & DIR_NO_GITLINKS)) {
+			struct strbuf sb = STRBUF_INIT;
+			strbuf_addstr(&sb, dirname);
+			nested_repo = is_nonbare_repository_dir(&sb);
+			strbuf_release(&sb);
+		}
+		if (nested_repo)
+			return ((dir->flags & DIR_SKIP_NESTED_GIT) ? path_none :
+				(exclude ? path_excluded : path_untracked));
+
 		if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES)
 			break;
 		if (exclude &&
@@ -1465,13 +1778,6 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
 
 			return path_none;
 		}
-		if (!(dir->flags & DIR_NO_GITLINKS)) {
-			struct strbuf sb = STRBUF_INIT;
-			strbuf_addstr(&sb, dirname);
-			if (is_nonbare_repository_dir(&sb))
-				return exclude ? path_excluded : path_untracked;
-			strbuf_release(&sb);
-		}
 		return path_recurse;
 	}
 
@@ -1607,10 +1913,9 @@ static int get_index_dtype(struct index_state *istate,
 	return DT_UNKNOWN;
 }
 
-static int get_dtype(struct dirent *de, struct index_state *istate,
-		     const char *path, int len)
+static int resolve_dtype(int dtype, struct index_state *istate,
+			 const char *path, int len)
 {
-	int dtype = de ? DTYPE(de) : DT_UNKNOWN;
 	struct stat st;
 
 	if (dtype != DT_UNKNOWN)
@@ -1635,14 +1940,13 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
 					  struct strbuf *path,
 					  int baselen,
 					  const struct pathspec *pathspec,
-					  int dtype, struct dirent *de)
+					  int dtype)
 {
 	int exclude;
 	int has_path_in_index = !!index_file_exists(istate, path->buf, path->len, ignore_case);
 	enum path_treatment path_treatment;
 
-	if (dtype == DT_UNKNOWN)
-		dtype = get_dtype(de, istate, path->buf, path->len);
+	dtype = resolve_dtype(dtype, istate, path->buf, path->len);
 
 	/* Always exclude indexed files */
 	if (dtype != DT_DIR && has_path_in_index)
@@ -1750,21 +2054,18 @@ static enum path_treatment treat_path(struct dir_struct *dir,
 				      int baselen,
 				      const struct pathspec *pathspec)
 {
-	int dtype;
-	struct dirent *de = cdir->de;
-
-	if (!de)
+	if (!cdir->d_name)
 		return treat_path_fast(dir, untracked, cdir, istate, path,
 				       baselen, pathspec);
-	if (is_dot_or_dotdot(de->d_name) || !fspathcmp(de->d_name, ".git"))
+	if (is_dot_or_dotdot(cdir->d_name) || !fspathcmp(cdir->d_name, ".git"))
 		return path_none;
 	strbuf_setlen(path, baselen);
-	strbuf_addstr(path, de->d_name);
+	strbuf_addstr(path, cdir->d_name);
 	if (simplify_away(path->buf, path->len, pathspec))
 		return path_none;
 
-	dtype = DTYPE(de);
-	return treat_one_path(dir, untracked, istate, path, baselen, pathspec, dtype, de);
+	return treat_one_path(dir, untracked, istate, path, baselen, pathspec,
+			      cdir->d_type);
 }
 
 static void add_untracked(struct untracked_cache_dir *dir, const char *name)
@@ -1808,7 +2109,7 @@ static int valid_cached_dir(struct dir_struct *dir,
 
 	/*
 	 * prep_exclude will be called eventually on this directory,
-	 * but it's called much later in last_exclude_matching(). We
+	 * but it's called much later in last_matching_pattern(). We
 	 * need it now to determine the validity of the cache for this
 	 * path. The next calls will be nearly no-op, the way
 	 * prep_exclude() is designed.
@@ -1852,10 +2153,17 @@ static int open_cached_dir(struct cached_dir *cdir,
 
 static int read_cached_dir(struct cached_dir *cdir)
 {
+	struct dirent *de;
+
 	if (cdir->fdir) {
-		cdir->de = readdir(cdir->fdir);
-		if (!cdir->de)
+		de = readdir(cdir->fdir);
+		if (!de) {
+			cdir->d_name = NULL;
+			cdir->d_type = DT_UNKNOWN;
 			return -1;
+		}
+		cdir->d_name = de->d_name;
+		cdir->d_type = DTYPE(de);
 		return 0;
 	}
 	while (cdir->nr_dirs < cdir->untracked->dirs_nr) {
@@ -1891,6 +2199,40 @@ static void close_cached_dir(struct cached_dir *cdir)
 	}
 }
 
+static void add_path_to_appropriate_result_list(struct dir_struct *dir,
+	struct untracked_cache_dir *untracked,
+	struct cached_dir *cdir,
+	struct index_state *istate,
+	struct strbuf *path,
+	int baselen,
+	const struct pathspec *pathspec,
+	enum path_treatment state)
+{
+	/* add the path to the appropriate result list */
+	switch (state) {
+	case path_excluded:
+		if (dir->flags & DIR_SHOW_IGNORED)
+			dir_add_name(dir, istate, path->buf, path->len);
+		else if ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
+			((dir->flags & DIR_COLLECT_IGNORED) &&
+			exclude_matches_pathspec(path->buf, path->len,
+						 pathspec)))
+			dir_add_ignored(dir, istate, path->buf, path->len);
+		break;
+
+	case path_untracked:
+		if (dir->flags & DIR_SHOW_IGNORED)
+			break;
+		dir_add_name(dir, istate, path->buf, path->len);
+		if (cdir->fdir)
+			add_untracked(untracked, path->buf + baselen);
+		break;
+
+	default:
+		break;
+	}
+}
+
 /*
  * Read a directory tree. We currently ignore anything but
  * directories, regular files and symlinks. That's because git
@@ -1915,6 +2257,15 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 	struct untracked_cache_dir *untracked, int check_only,
 	int stop_at_first_file, const struct pathspec *pathspec)
 {
+	/*
+	 * WARNING WARNING WARNING:
+	 *
+	 * Any updates to the traversal logic here may need corresponding
+	 * updates in treat_leading_path().  See the commit message for the
+	 * commit adding this warning as well as the commit preceding it
+	 * for details.
+	 */
+
 	struct cached_dir cdir;
 	enum path_treatment state, subdir_state, dir_state = path_none;
 	struct strbuf path = STRBUF_INIT;
@@ -1938,8 +2289,11 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 		/* recurse into subdir if instructed by treat_path */
 		if ((state == path_recurse) ||
 			((state == path_untracked) &&
-			 (dir->flags & DIR_SHOW_IGNORED_TOO) &&
-			 (get_dtype(cdir.de, istate, path.buf, path.len) == DT_DIR))) {
+			 (resolve_dtype(cdir.d_type, istate, path.buf, path.len) == DT_DIR) &&
+			 ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
+			  (pathspec &&
+			   do_match_pathspec(istate, pathspec, path.buf, path.len,
+					     baselen, NULL, DO_MATCH_LEADING_PATHSPEC) == MATCHED_RECURSIVELY_LEADING_PATHSPEC)))) {
 			struct untracked_cache_dir *ud;
 			ud = lookup_untracked(dir->untracked, untracked,
 					      path.buf + baselen,
@@ -1950,6 +2304,12 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 							 check_only, stop_at_first_file, pathspec);
 			if (subdir_state > dir_state)
 				dir_state = subdir_state;
+
+			if (pathspec &&
+			    !match_pathspec(istate, pathspec, path.buf, path.len,
+					    0 /* prefix */, NULL,
+					    0 /* do NOT special case dirs */))
+				state = path_none;
 		}
 
 		if (check_only) {
@@ -1985,29 +2345,9 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 			continue;
 		}
 
-		/* add the path to the appropriate result list */
-		switch (state) {
-		case path_excluded:
-			if (dir->flags & DIR_SHOW_IGNORED)
-				dir_add_name(dir, istate, path.buf, path.len);
-			else if ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
-				((dir->flags & DIR_COLLECT_IGNORED) &&
-				exclude_matches_pathspec(path.buf, path.len,
-							 pathspec)))
-				dir_add_ignored(dir, istate, path.buf, path.len);
-			break;
-
-		case path_untracked:
-			if (dir->flags & DIR_SHOW_IGNORED)
-				break;
-			dir_add_name(dir, istate, path.buf, path.len);
-			if (cdir.fdir)
-				add_untracked(untracked, path.buf + baselen);
-			break;
-
-		default:
-			break;
-		}
+		add_path_to_appropriate_result_list(dir, untracked, &cdir,
+						    istate, &path, baselen,
+						    pathspec, state);
 	}
 	close_cached_dir(&cdir);
  out:
@@ -2037,41 +2377,95 @@ static int treat_leading_path(struct dir_struct *dir,
 			      const char *path, int len,
 			      const struct pathspec *pathspec)
 {
+	/*
+	 * WARNING WARNING WARNING:
+	 *
+	 * Any updates to the traversal logic here may need corresponding
+	 * updates in read_directory_recursive().  See 777b420347 (dir:
+	 * synchronize treat_leading_path() and read_directory_recursive(),
+	 * 2019-12-19) and its parent commit for details.
+	 */
+
 	struct strbuf sb = STRBUF_INIT;
-	int baselen, rc = 0;
+	struct strbuf subdir = STRBUF_INIT;
+	int prevlen, baselen;
 	const char *cp;
-	int old_flags = dir->flags;
+	struct cached_dir cdir;
+	enum path_treatment state = path_none;
+
+	/*
+	 * For each directory component of path, we are going to check whether
+	 * that path is relevant given the pathspec.  For example, if path is
+	 *    foo/bar/baz/
+	 * then we will ask treat_path() whether we should go into foo, then
+	 * whether we should go into bar, then whether baz is relevant.
+	 * Checking each is important because e.g. if path is
+	 *    .git/info/
+	 * then we need to check .git to know we shouldn't traverse it.
+	 * If the return from treat_path() is:
+	 *    * path_none, for any path, we return false.
+	 *    * path_recurse, for all path components, we return true
+	 *    * <anything else> for some intermediate component, we make sure
+	 *        to add that path to the relevant list but return false
+	 *        signifying that we shouldn't recurse into it.
+	 */
 
 	while (len && path[len - 1] == '/')
 		len--;
 	if (!len)
 		return 1;
+
+	memset(&cdir, 0, sizeof(cdir));
+	cdir.d_type = DT_DIR;
 	baselen = 0;
-	dir->flags &= ~DIR_SHOW_OTHER_DIRECTORIES;
+	prevlen = 0;
 	while (1) {
-		cp = path + baselen + !!baselen;
+		prevlen = baselen + !!baselen;
+		cp = path + prevlen;
 		cp = memchr(cp, '/', path + len - cp);
 		if (!cp)
 			baselen = len;
 		else
 			baselen = cp - path;
-		strbuf_setlen(&sb, 0);
+		strbuf_reset(&sb);
 		strbuf_add(&sb, path, baselen);
 		if (!is_directory(sb.buf))
 			break;
-		if (simplify_away(sb.buf, sb.len, pathspec))
-			break;
-		if (treat_one_path(dir, NULL, istate, &sb, baselen, pathspec,
-				   DT_DIR, NULL) == path_none)
+		strbuf_reset(&sb);
+		strbuf_add(&sb, path, prevlen);
+		strbuf_reset(&subdir);
+		strbuf_add(&subdir, path+prevlen, baselen-prevlen);
+		cdir.d_name = subdir.buf;
+		state = treat_path(dir, NULL, &cdir, istate, &sb, prevlen,
+				    pathspec);
+		if (state == path_untracked &&
+		    resolve_dtype(cdir.d_type, istate, sb.buf, sb.len) == DT_DIR &&
+		    (dir->flags & DIR_SHOW_IGNORED_TOO ||
+		     do_match_pathspec(istate, pathspec, sb.buf, sb.len,
+				       baselen, NULL, DO_MATCH_LEADING_PATHSPEC) == MATCHED_RECURSIVELY_LEADING_PATHSPEC)) {
+			if (!match_pathspec(istate, pathspec, sb.buf, sb.len,
+					    0 /* prefix */, NULL,
+					    0 /* do NOT special case dirs */))
+				state = path_none;
+			add_path_to_appropriate_result_list(dir, NULL, &cdir,
+							    istate,
+							    &sb, baselen,
+							    pathspec, state);
+			state = path_recurse;
+		}
+
+		if (state != path_recurse)
 			break; /* do not recurse into it */
-		if (len <= baselen) {
-			rc = 1;
+		if (len <= baselen)
 			break; /* finished checking */
-		}
 	}
+	add_path_to_appropriate_result_list(dir, NULL, &cdir, istate,
+					    &sb, baselen, pathspec,
+					    state);
+
+	strbuf_release(&subdir);
 	strbuf_release(&sb);
-	dir->flags = old_flags;
-	return rc;
+	return state == path_recurse;
 }
 
 static const char *get_ident_string(void)
@@ -2446,7 +2840,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
 				 * wanted anyway
 				 */
 				continue;
-			/* fall thru */
+			/* fall through */
 		} else if (S_ISDIR(st.st_mode)) {
 			if (!remove_dir_recurse(path, flag, &kept_down))
 				continue; /* happy */
@@ -2488,14 +2882,14 @@ void setup_standard_excludes(struct dir_struct *dir)
 	if (!excludes_file)
 		excludes_file = xdg_config_home("ignore");
 	if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
-		add_excludes_from_file_1(dir, excludes_file,
+		add_patterns_from_file_1(dir, excludes_file,
 					 dir->untracked ? &dir->ss_excludes_file : NULL);
 
 	/* per repository user preference */
 	if (startup_info->have_repository) {
 		const char *path = git_path_info_exclude();
 		if (!access_or_warn(path, R_OK, 0))
-			add_excludes_from_file_1(dir, path,
+			add_patterns_from_file_1(dir, path,
 						 dir->untracked ? &dir->ss_info_exclude : NULL);
 	}
 }
@@ -2527,18 +2921,18 @@ void clear_directory(struct dir_struct *dir)
 {
 	int i, j;
 	struct exclude_list_group *group;
-	struct exclude_list *el;
+	struct pattern_list *pl;
 	struct exclude_stack *stk;
 
 	for (i = EXC_CMDL; i <= EXC_FILE; i++) {
 		group = &dir->exclude_list_group[i];
 		for (j = 0; j < group->nr; j++) {
-			el = &group->el[j];
+			pl = &group->pl[j];
 			if (i == EXC_DIRS)
-				free((char *)el->src);
-			clear_exclude_list(el);
+				free((char *)pl->src);
+			clear_pattern_list(pl);
 		}
-		free(group->el);
+		free(group->pl);
 	}
 
 	stk = dir->exclude_stack;
diff --git a/third_party/git/dir.h b/third_party/git/dir.h
index 680079bbe324..5855c065a610 100644
--- a/third_party/git/dir.h
+++ b/third_party/git/dir.h
@@ -1,34 +1,68 @@
 #ifndef DIR_H
 #define DIR_H
 
-/* See Documentation/technical/api-directory-listing.txt */
-
 #include "cache.h"
+#include "hashmap.h"
 #include "strbuf.h"
 
+/**
+ * The directory listing API is used to enumerate paths in the work tree,
+ * optionally taking `.git/info/exclude` and `.gitignore` files per directory
+ * into account.
+ */
+
+/**
+ * Calling sequence
+ * ----------------
+ *
+ * Note: The index may be checked for .gitignore files that are
+ * CE_SKIP_WORKTREE marked. If you want to exclude files, make sure you have
+ * loaded the index first.
+ *
+ * - Prepare `struct dir_struct dir` and clear it with `memset(&dir, 0,
+ * sizeof(dir))`.
+ *
+ * - To add single exclude pattern, call `add_pattern_list()` and then
+ *   `add_pattern()`.
+ *
+ * - To add patterns from a file (e.g. `.git/info/exclude`), call
+ *   `add_patterns_from_file()` , and/or set `dir.exclude_per_dir`.  A
+ *   short-hand function `setup_standard_excludes()` can be used to set
+ *   up the standard set of exclude settings.
+ *
+ * - Set options described in the Data Structure section above.
+ *
+ * - Call `read_directory()`.
+ *
+ * - Use `dir.entries[]`.
+ *
+ * - Call `clear_directory()` when none of the contained elements are no longer in use.
+ *
+ */
+
 struct dir_entry {
 	unsigned int len;
 	char name[FLEX_ARRAY]; /* more */
 };
 
-#define EXC_FLAG_NODIR 1
-#define EXC_FLAG_ENDSWITH 4
-#define EXC_FLAG_MUSTBEDIR 8
-#define EXC_FLAG_NEGATIVE 16
+#define PATTERN_FLAG_NODIR 1
+#define PATTERN_FLAG_ENDSWITH 4
+#define PATTERN_FLAG_MUSTBEDIR 8
+#define PATTERN_FLAG_NEGATIVE 16
 
-struct exclude {
+struct path_pattern {
 	/*
-	 * This allows callers of last_exclude_matching() etc.
+	 * This allows callers of last_matching_pattern() etc.
 	 * to determine the origin of the matching pattern.
 	 */
-	struct exclude_list *el;
+	struct pattern_list *pl;
 
 	const char *pattern;
 	int patternlen;
 	int nowildcardlen;
 	const char *base;
 	int baselen;
-	unsigned flags;		/* EXC_FLAG_* */
+	unsigned flags;		/* PATTERN_FLAG_* */
 
 	/*
 	 * Counting starts from 1 for line numbers in ignore files,
@@ -37,6 +71,13 @@ struct exclude {
 	int srcpos;
 };
 
+/* used for hashmaps for cone patterns */
+struct pattern_entry {
+	struct hashmap_entry ent;
+	char *pattern;
+	size_t patternlen;
+};
+
 /*
  * Each excludes file will be parsed into a fresh exclude_list which
  * is appended to the relevant exclude_list_group (either EXC_DIRS or
@@ -44,7 +85,7 @@ struct exclude {
  * can also be used to represent the list of --exclude values passed
  * via CLI args.
  */
-struct exclude_list {
+struct pattern_list {
 	int nr;
 	int alloc;
 
@@ -54,7 +95,27 @@ struct exclude_list {
 	/* origin of list, e.g. path to filename, or descriptive string */
 	const char *src;
 
-	struct exclude **excludes;
+	struct path_pattern **patterns;
+
+	/*
+	 * While scanning the excludes, we attempt to match the patterns
+	 * with a more restricted set that allows us to use hashsets for
+	 * matching logic, which is faster than the linear lookup in the
+	 * excludes array above. If non-zero, that check succeeded.
+	 */
+	unsigned use_cone_patterns;
+	unsigned full_cone;
+
+	/*
+	 * Stores paths where everything starting with those paths
+	 * is included.
+	 */
+	struct hashmap recursive_hashmap;
+
+	/*
+	 * Used to check single-level parents of blobs.
+	 */
+	struct hashmap parent_hashmap;
 };
 
 /*
@@ -72,7 +133,7 @@ struct exclude_stack {
 
 struct exclude_list_group {
 	int nr, alloc;
-	struct exclude_list *el;
+	struct pattern_list *pl;
 };
 
 struct oid_stat {
@@ -144,24 +205,101 @@ struct untracked_cache {
 	unsigned int use_fsmonitor : 1;
 };
 
+/**
+ * structure is used to pass directory traversal options to the library and to
+ * record the paths discovered. A single `struct dir_struct` is used regardless
+ * of whether or not the traversal recursively descends into subdirectories.
+ */
 struct dir_struct {
-	int nr, alloc;
-	int ignored_nr, ignored_alloc;
+
+	/* The number of members in `entries[]` array. */
+	int nr;
+
+	/* Internal use; keeps track of allocation of `entries[]` array.*/
+	int alloc;
+
+	/* The number of members in `ignored[]` array. */
+	int ignored_nr;
+
+	int ignored_alloc;
+
+	/* bit-field of options */
 	enum {
+
+		/**
+		 * Return just ignored files in `entries[]`, not untracked files.
+		 * This flag is mutually exclusive with `DIR_SHOW_IGNORED_TOO`.
+		 */
 		DIR_SHOW_IGNORED = 1<<0,
+
+		/* Include a directory that is not tracked. */
 		DIR_SHOW_OTHER_DIRECTORIES = 1<<1,
+
+		/* Do not include a directory that is not tracked and is empty. */
 		DIR_HIDE_EMPTY_DIRECTORIES = 1<<2,
+
+		/**
+		 * If set, recurse into a directory that looks like a Git directory.
+		 * Otherwise it is shown as a directory.
+		 */
 		DIR_NO_GITLINKS = 1<<3,
+
+		/**
+		 * Special mode for git-add. Return ignored files in `ignored[]` and
+		 * untracked files in `entries[]`. Only returns ignored files that match
+		 * pathspec exactly (no wildcards). Does not recurse into ignored
+		 * directories.
+		 */
 		DIR_COLLECT_IGNORED = 1<<4,
+
+		/**
+		 * Similar to `DIR_SHOW_IGNORED`, but return ignored files in
+		 * `ignored[]` in addition to untracked files in `entries[]`.
+		 * This flag is mutually exclusive with `DIR_SHOW_IGNORED`.
+		 */
 		DIR_SHOW_IGNORED_TOO = 1<<5,
+
 		DIR_COLLECT_KILLED_ONLY = 1<<6,
+
+		/**
+		 * Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is
+		 * set, the untracked contents of untracked directories are also
+		 * returned in `entries[]`.
+		 */
 		DIR_KEEP_UNTRACKED_CONTENTS = 1<<7,
-		DIR_SHOW_IGNORED_TOO_MODE_MATCHING = 1<<8
+
+		/**
+		 * Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is
+		 * set, returns ignored files and directories that match an exclude
+		 * pattern. If a directory matches an exclude pattern, then the
+		 * directory is returned and the contained paths are not. A directory
+		 * that does not match an exclude pattern will not be returned even if
+		 * all of its contents are ignored. In this case, the contents are
+		 * returned as individual entries.
+		 *
+		 * If this is set, files and directories that explicitly match an ignore
+		 * pattern are reported. Implicitly ignored directories (directories that
+		 * do not match an ignore pattern, but whose contents are all ignored)
+		 * are not reported, instead all of the contents are reported.
+		 */
+		DIR_SHOW_IGNORED_TOO_MODE_MATCHING = 1<<8,
+
+		DIR_SKIP_NESTED_GIT = 1<<9
 	} flags;
+
+	/* An array of `struct dir_entry`, each element of which describes a path. */
 	struct dir_entry **entries;
+
+	/**
+	 * used for ignored paths with the `DIR_SHOW_IGNORED_TOO` and
+	 * `DIR_COLLECT_IGNORED` flags.
+	 */
 	struct dir_entry **ignored;
 
-	/* Exclude info */
+	/**
+	 * The name of the file to be read in each directory for excluded files
+	 * (typically `.gitignore`).
+	 */
 	const char *exclude_per_dir;
 
 	/*
@@ -191,7 +329,7 @@ struct dir_struct {
 	 * matching exclude struct if the directory is excluded.
 	 */
 	struct exclude_stack *exclude_stack;
-	struct exclude *exclude;
+	struct path_pattern *pattern;
 	struct strbuf basebuf;
 
 	/* Enable untracked file cache if set */
@@ -211,8 +349,9 @@ int count_slashes(const char *s);
  * when populating the seen[] array.
  */
 #define MATCHED_RECURSIVELY 1
-#define MATCHED_FNMATCH 2
-#define MATCHED_EXACTLY 3
+#define MATCHED_RECURSIVELY_LEADING_PATHSPEC 2
+#define MATCHED_FNMATCH 3
+#define MATCHED_EXACTLY 4
 int simple_length(const char *match);
 int no_wildcard(const char *string);
 char *common_prefix(const struct pathspec *pathspec);
@@ -230,10 +369,24 @@ int read_directory(struct dir_struct *, struct index_state *istate,
 		   const char *path, int len,
 		   const struct pathspec *pathspec);
 
-int is_excluded_from_list(const char *pathname, int pathlen,
-			  const char *basename, int *dtype,
-			  struct exclude_list *el,
-			  struct index_state *istate);
+enum pattern_match_result {
+	UNDECIDED = -1,
+	NOT_MATCHED = 0,
+	MATCHED = 1,
+	MATCHED_RECURSIVE = 2,
+};
+
+/*
+ * Scan the list of patterns to determine if the ordered list
+ * of patterns matches on 'pathname'.
+ *
+ * Return 1 for a match, 0 for not matched and -1 for undecided.
+ */
+enum pattern_match_result path_matches_pattern_list(const char *pathname,
+				int pathlen,
+				const char *basename, int *dtype,
+				struct pattern_list *pl,
+				struct index_state *istate);
 struct dir_entry *dir_add_ignored(struct dir_struct *dir,
 				  struct index_state *istate,
 				  const char *pathname, int len);
@@ -248,26 +401,33 @@ int match_pathname(const char *, int,
 		   const char *, int,
 		   const char *, int, int, unsigned);
 
-struct exclude *last_exclude_matching(struct dir_struct *dir,
-				      struct index_state *istate,
-				      const char *name, int *dtype);
+struct path_pattern *last_matching_pattern(struct dir_struct *dir,
+					   struct index_state *istate,
+					   const char *name, int *dtype);
 
 int is_excluded(struct dir_struct *dir,
 		struct index_state *istate,
 		const char *name, int *dtype);
 
-struct exclude_list *add_exclude_list(struct dir_struct *dir,
+int pl_hashmap_cmp(const void *unused_cmp_data,
+		   const struct hashmap_entry *a,
+		   const struct hashmap_entry *b,
+		   const void *key);
+int hashmap_contains_parent(struct hashmap *map,
+			    const char *path,
+			    struct strbuf *buffer);
+struct pattern_list *add_pattern_list(struct dir_struct *dir,
 				      int group_type, const char *src);
-int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen,
-				   struct exclude_list *el, struct  index_state *istate);
-void add_excludes_from_file(struct dir_struct *, const char *fname);
-int add_excludes_from_blob_to_list(struct object_id *oid,
+int add_patterns_from_file_to_list(const char *fname, const char *base, int baselen,
+				   struct pattern_list *pl, struct  index_state *istate);
+void add_patterns_from_file(struct dir_struct *, const char *fname);
+int add_patterns_from_blob_to_list(struct object_id *oid,
 				   const char *base, int baselen,
-				   struct exclude_list *el);
-void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen);
-void add_exclude(const char *string, const char *base,
-		 int baselen, struct exclude_list *el, int srcpos);
-void clear_exclude_list(struct exclude_list *el);
+				   struct pattern_list *pl);
+void parse_path_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen);
+void add_pattern(const char *string, const char *base,
+		 int baselen, struct pattern_list *pl, int srcpos);
+void clear_pattern_list(struct pattern_list *pl);
 void clear_directory(struct dir_struct *dir);
 
 int repo_file_exists(struct repository *repo, const char *path);
diff --git a/third_party/git/environment.c b/third_party/git/environment.c
index 89af47cb8504..e72a02d0d577 100644
--- a/third_party/git/environment.c
+++ b/third_party/git/environment.c
@@ -31,8 +31,6 @@ int warn_ambiguous_refs = 1;
 int warn_on_object_refname_ambiguity = 1;
 int ref_paranoia = -1;
 int repository_format_precious_objects;
-char *repository_format_partial_clone;
-const char *core_partial_clone_filter_default;
 int repository_format_worktree_config;
 const char *git_commit_encoding;
 const char *git_log_output_encoding;
@@ -69,6 +67,7 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
 char *notes_ref_name;
 int grafts_replace_parents = 1;
 int core_apply_sparse_checkout;
+int core_sparse_checkout_cone;
 int merge_log_config = -1;
 int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
 unsigned long pack_size_limit_cfg;
@@ -80,7 +79,7 @@ enum log_refs_config log_all_ref_updates = LOG_REFS_UNSET;
 int protect_hfs = PROTECT_HFS_DEFAULT;
 
 #ifndef PROTECT_NTFS_DEFAULT
-#define PROTECT_NTFS_DEFAULT 0
+#define PROTECT_NTFS_DEFAULT 1
 #endif
 int protect_ntfs = PROTECT_NTFS_DEFAULT;
 const char *core_fsmonitor;
diff --git a/third_party/git/ewah/bitmap.c b/third_party/git/ewah/bitmap.c
index 52f1178db4ce..d8cec585af97 100644
--- a/third_party/git/ewah/bitmap.c
+++ b/third_party/git/ewah/bitmap.c
@@ -22,21 +22,26 @@
 #define EWAH_MASK(x) ((eword_t)1 << (x % BITS_IN_EWORD))
 #define EWAH_BLOCK(x) (x / BITS_IN_EWORD)
 
-struct bitmap *bitmap_new(void)
+struct bitmap *bitmap_word_alloc(size_t word_alloc)
 {
 	struct bitmap *bitmap = xmalloc(sizeof(struct bitmap));
-	bitmap->words = xcalloc(32, sizeof(eword_t));
-	bitmap->word_alloc = 32;
+	bitmap->words = xcalloc(word_alloc, sizeof(eword_t));
+	bitmap->word_alloc = word_alloc;
 	return bitmap;
 }
 
+struct bitmap *bitmap_new(void)
+{
+	return bitmap_word_alloc(32);
+}
+
 void bitmap_set(struct bitmap *self, size_t pos)
 {
 	size_t block = EWAH_BLOCK(pos);
 
 	if (block >= self->word_alloc) {
 		size_t old_size = self->word_alloc;
-		self->word_alloc = block * 2;
+		self->word_alloc = block ? block * 2 : 1;
 		REALLOC_ARRAY(self->words, self->word_alloc);
 		memset(self->words + old_size, 0x0,
 			(self->word_alloc - old_size) * sizeof(eword_t));
@@ -45,6 +50,14 @@ void bitmap_set(struct bitmap *self, size_t pos)
 	self->words[block] |= EWAH_MASK(pos);
 }
 
+void bitmap_unset(struct bitmap *self, size_t pos)
+{
+	size_t block = EWAH_BLOCK(pos);
+
+	if (block < self->word_alloc)
+		self->words[block] &= ~EWAH_MASK(pos);
+}
+
 int bitmap_get(struct bitmap *self, size_t pos)
 {
 	size_t block = EWAH_BLOCK(pos);
diff --git a/third_party/git/ewah/ewok.h b/third_party/git/ewah/ewok.h
index 84b2a29faa0c..011852bef179 100644
--- a/third_party/git/ewah/ewok.h
+++ b/third_party/git/ewah/ewok.h
@@ -172,7 +172,9 @@ struct bitmap {
 };
 
 struct bitmap *bitmap_new(void);
+struct bitmap *bitmap_word_alloc(size_t word_alloc);
 void bitmap_set(struct bitmap *self, size_t pos);
+void bitmap_unset(struct bitmap *self, size_t pos);
 int bitmap_get(struct bitmap *self, size_t pos);
 void bitmap_reset(struct bitmap *self);
 void bitmap_free(struct bitmap *self);
diff --git a/third_party/git/fast-import.c b/third_party/git/fast-import.c
index b44d6a467ef1..b8b65a801cc1 100644
--- a/third_party/git/fast-import.c
+++ b/third_party/git/fast-import.c
@@ -217,6 +217,7 @@ static uintmax_t next_mark;
 static struct strbuf new_data = STRBUF_INIT;
 static int seen_data_command;
 static int require_explicit_termination;
+static int allow_unsafe_features;
 
 /* Signal handling */
 static volatile sig_atomic_t checkpoint_requested;
@@ -1682,6 +1683,12 @@ static void dump_marks(void)
 	if (!export_marks_file || (import_marks_file && !import_marks_file_done))
 		return;
 
+	if (safe_create_leading_directories_const(export_marks_file)) {
+		failure |= error_errno("unable to create leading directories of %s",
+				       export_marks_file);
+		return;
+	}
+
 	if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) {
 		failure |= error_errno("Unable to write marks file %s",
 				       export_marks_file);
@@ -1763,7 +1770,6 @@ static int read_next_command(void)
 		} else {
 			struct recent_command *rc;
 
-			strbuf_detach(&command_buf, NULL);
 			stdin_eof = strbuf_getline_lf(&command_buf, stdin);
 			if (stdin_eof)
 				return EOF;
@@ -1784,7 +1790,7 @@ static int read_next_command(void)
 				free(rc->buf);
 			}
 
-			rc->buf = command_buf.buf;
+			rc->buf = xstrdup(command_buf.buf);
 			rc->prev = cmd_tail;
 			rc->next = cmd_hist.prev;
 			rc->prev->next = rc;
@@ -1833,7 +1839,6 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
 		char *term = xstrdup(data);
 		size_t term_len = command_buf.len - (data - command_buf.buf);
 
-		strbuf_detach(&command_buf, NULL);
 		for (;;) {
 			if (strbuf_getline_lf(&command_buf, stdin) == EOF)
 				die("EOF in data (terminator '%s' not found)", term);
@@ -2491,18 +2496,14 @@ static void parse_from_existing(struct branch *b)
 	}
 }
 
-static int parse_from(struct branch *b)
+static int parse_objectish(struct branch *b, const char *objectish)
 {
-	const char *from;
 	struct branch *s;
 	struct object_id oid;
 
-	if (!skip_prefix(command_buf.buf, "from ", &from))
-		return 0;
-
 	oidcpy(&oid, &b->branch_tree.versions[1].oid);
 
-	s = lookup_branch(from);
+	s = lookup_branch(objectish);
 	if (b == s)
 		die("Can't create a branch from itself: %s", b->name);
 	else if (s) {
@@ -2510,8 +2511,8 @@ static int parse_from(struct branch *b)
 		oidcpy(&b->oid, &s->oid);
 		oidcpy(&b->branch_tree.versions[0].oid, t);
 		oidcpy(&b->branch_tree.versions[1].oid, t);
-	} else if (*from == ':') {
-		uintmax_t idnum = parse_mark_ref_eol(from);
+	} else if (*objectish == ':') {
+		uintmax_t idnum = parse_mark_ref_eol(objectish);
 		struct object_entry *oe = find_mark(idnum);
 		if (oe->type != OBJ_COMMIT)
 			die("Mark :%" PRIuMAX " not a commit", idnum);
@@ -2525,13 +2526,13 @@ static int parse_from(struct branch *b)
 			} else
 				parse_from_existing(b);
 		}
-	} else if (!get_oid(from, &b->oid)) {
+	} else if (!get_oid(objectish, &b->oid)) {
 		parse_from_existing(b);
 		if (is_null_oid(&b->oid))
 			b->delete = 1;
 	}
 	else
-		die("Invalid ref name or SHA1 expression: %s", from);
+		die("Invalid ref name or SHA1 expression: %s", objectish);
 
 	if (b->branch_tree.tree && !oideq(&oid, &b->branch_tree.versions[1].oid)) {
 		release_tree_content_recursive(b->branch_tree.tree);
@@ -2542,6 +2543,26 @@ static int parse_from(struct branch *b)
 	return 1;
 }
 
+static int parse_from(struct branch *b)
+{
+	const char *from;
+
+	if (!skip_prefix(command_buf.buf, "from ", &from))
+		return 0;
+
+	return parse_objectish(b, from);
+}
+
+static int parse_objectish_with_prefix(struct branch *b, const char *prefix)
+{
+	const char *base;
+
+	if (!skip_prefix(command_buf.buf, prefix, &base))
+		return 0;
+
+	return parse_objectish(b, base);
+}
+
 static struct hash_list *parse_merge(unsigned int *count)
 {
 	struct hash_list *list = NULL, **tail = &list, *n;
@@ -2588,7 +2609,7 @@ static void parse_new_commit(const char *arg)
 	struct branch *b;
 	char *author = NULL;
 	char *committer = NULL;
-	const char *encoding = NULL;
+	char *encoding = NULL;
 	struct hash_list *merge_list = NULL;
 	unsigned int merge_count;
 	unsigned char prev_fanout, new_fanout;
@@ -2611,8 +2632,10 @@ static void parse_new_commit(const char *arg)
 	}
 	if (!committer)
 		die("Expected committer but didn't get one");
-	if (skip_prefix(command_buf.buf, "encoding ", &encoding))
+	if (skip_prefix(command_buf.buf, "encoding ", &v)) {
+		encoding = xstrdup(v);
 		read_next_command();
+	}
 	parse_data(&msg, 0, NULL);
 	read_next_command();
 	parse_from(b);
@@ -2686,6 +2709,7 @@ static void parse_new_commit(const char *arg)
 	strbuf_addbuf(&new_data, &msg);
 	free(author);
 	free(committer);
+	free(encoding);
 
 	if (!store_object(OBJ_COMMIT, &new_data, NULL, &b->oid, next_mark))
 		b->pack_id = pack_id;
@@ -2713,6 +2737,7 @@ static void parse_new_tag(const char *arg)
 		first_tag = t;
 	last_tag = t;
 	read_next_command();
+	parse_mark();
 
 	/* from ... */
 	if (!skip_prefix(command_buf.buf, "from ", &from))
@@ -2769,7 +2794,7 @@ static void parse_new_tag(const char *arg)
 	strbuf_addbuf(&new_data, &msg);
 	free(tagger);
 
-	if (store_object(OBJ_TAG, &new_data, NULL, &t->oid, 0))
+	if (store_object(OBJ_TAG, &new_data, NULL, &t->oid, next_mark))
 		t->pack_id = MAX_PACK_ID;
 	else
 		t->pack_id = pack_id;
@@ -2778,6 +2803,7 @@ static void parse_new_tag(const char *arg)
 static void parse_reset_branch(const char *arg)
 {
 	struct branch *b;
+	const char *tag_name;
 
 	b = lookup_branch(arg);
 	if (b) {
@@ -2793,6 +2819,32 @@ static void parse_reset_branch(const char *arg)
 		b = new_branch(arg);
 	read_next_command();
 	parse_from(b);
+	if (b->delete && skip_prefix(b->name, "refs/tags/", &tag_name)) {
+		/*
+		 * Elsewhere, we call dump_branches() before dump_tags(),
+		 * and dump_branches() will handle ref deletions first, so
+		 * in order to make sure the deletion actually takes effect,
+		 * we need to remove the tag from our list of tags to update.
+		 *
+		 * NEEDSWORK: replace list of tags with hashmap for faster
+		 * deletion?
+		 */
+		struct tag *t, *prev = NULL;
+		for (t = first_tag; t; t = t->next_tag) {
+			if (!strcmp(t->name, tag_name))
+				break;
+			prev = t;
+		}
+		if (t) {
+			if (prev)
+				prev->next_tag = t->next_tag;
+			else
+				first_tag = t->next_tag;
+			if (!t->next_tag)
+				last_tag = prev;
+			/* There is no mem_pool_free(t) function to call. */
+		}
+	}
 	if (command_buf.len > 0)
 		unread_command_buf = 1;
 }
@@ -3059,6 +3111,28 @@ static void parse_progress(void)
 	skip_optional_lf();
 }
 
+static void parse_alias(void)
+{
+	struct object_entry *e;
+	struct branch b;
+
+	skip_optional_lf();
+	read_next_command();
+
+	/* mark ... */
+	parse_mark();
+	if (!next_mark)
+		die(_("Expected 'mark' command, got %s"), command_buf.buf);
+
+	/* to ... */
+	memset(&b, 0, sizeof(b));
+	if (!parse_objectish_with_prefix(&b, "to "))
+		die(_("Expected 'to' command, got %s"), command_buf.buf);
+	e = find_object(&b.oid);
+	assert(e);
+	insert_mark(next_mark, e);
+}
+
 static char* make_fast_import_path(const char *path)
 {
 	if (!relative_marks_paths || is_absolute_path(path))
@@ -3079,7 +3153,6 @@ static void option_import_marks(const char *marks,
 	}
 
 	import_marks_file = make_fast_import_path(marks);
-	safe_create_leading_directories_const(import_marks_file);
 	import_marks_file_from_stream = from_stream;
 	import_marks_file_ignore_missing = ignore_missing;
 }
@@ -3120,7 +3193,6 @@ static void option_active_branches(const char *branches)
 static void option_export_marks(const char *marks)
 {
 	export_marks_file = make_fast_import_path(marks);
-	safe_create_leading_directories_const(export_marks_file);
 }
 
 static void option_cat_blob_fd(const char *fd)
@@ -3163,10 +3235,12 @@ static int parse_one_option(const char *option)
 		option_active_branches(option);
 	} else if (skip_prefix(option, "export-pack-edges=", &option)) {
 		option_export_pack_edges(option);
-	} else if (starts_with(option, "quiet")) {
+	} else if (!strcmp(option, "quiet")) {
 		show_stats = 0;
-	} else if (starts_with(option, "stats")) {
+	} else if (!strcmp(option, "stats")) {
 		show_stats = 1;
+	} else if (!strcmp(option, "allow-unsafe-features")) {
+		; /* already handled during early option parsing */
 	} else {
 		return 0;
 	}
@@ -3174,6 +3248,13 @@ static int parse_one_option(const char *option)
 	return 1;
 }
 
+static void check_unsafe_feature(const char *feature, int from_stream)
+{
+	if (from_stream && !allow_unsafe_features)
+		die(_("feature '%s' forbidden in input without --allow-unsafe-features"),
+		    feature);
+}
+
 static int parse_one_feature(const char *feature, int from_stream)
 {
 	const char *arg;
@@ -3181,11 +3262,16 @@ static int parse_one_feature(const char *feature, int from_stream)
 	if (skip_prefix(feature, "date-format=", &arg)) {
 		option_date_format(arg);
 	} else if (skip_prefix(feature, "import-marks=", &arg)) {
+		check_unsafe_feature("import-marks", from_stream);
 		option_import_marks(arg, from_stream, 0);
 	} else if (skip_prefix(feature, "import-marks-if-exists=", &arg)) {
+		check_unsafe_feature("import-marks-if-exists", from_stream);
 		option_import_marks(arg, from_stream, 1);
 	} else if (skip_prefix(feature, "export-marks=", &arg)) {
+		check_unsafe_feature(feature, from_stream);
 		option_export_marks(arg);
+	} else if (!strcmp(feature, "alias")) {
+		; /* Don't die - this feature is supported */
 	} else if (!strcmp(feature, "get-mark")) {
 		; /* Don't die - this feature is supported */
 	} else if (!strcmp(feature, "cat-blob")) {
@@ -3311,6 +3397,20 @@ int cmd_main(int argc, const char **argv)
 	avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
 	marks = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
 
+	/*
+	 * We don't parse most options until after we've seen the set of
+	 * "feature" lines at the start of the stream (which allows the command
+	 * line to override stream data). But we must do an early parse of any
+	 * command-line options that impact how we interpret the feature lines.
+	 */
+	for (i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+		if (*arg != '-' || !strcmp(arg, "--"))
+			break;
+		if (!strcmp(arg, "--allow-unsafe-features"))
+			allow_unsafe_features = 1;
+	}
+
 	global_argc = argc;
 	global_argv = argv;
 
@@ -3342,6 +3442,8 @@ int cmd_main(int argc, const char **argv)
 			parse_checkpoint();
 		else if (!strcmp("done", command_buf.buf))
 			break;
+		else if (!strcmp("alias", command_buf.buf))
+			parse_alias();
 		else if (starts_with(command_buf.buf, "progress "))
 			parse_progress();
 		else if (skip_prefix(command_buf.buf, "feature ", &v))
diff --git a/third_party/git/fetch-negotiator.c b/third_party/git/fetch-negotiator.c
index d6d685cba012..0a1357dc9d55 100644
--- a/third_party/git/fetch-negotiator.c
+++ b/third_party/git/fetch-negotiator.c
@@ -2,19 +2,20 @@
 #include "fetch-negotiator.h"
 #include "negotiator/default.h"
 #include "negotiator/skipping.h"
+#include "repository.h"
 
-void fetch_negotiator_init(struct fetch_negotiator *negotiator,
-			   const char *algorithm)
+void fetch_negotiator_init(struct repository *r,
+			   struct fetch_negotiator *negotiator)
 {
-	if (algorithm) {
-		if (!strcmp(algorithm, "skipping")) {
-			skipping_negotiator_init(negotiator);
-			return;
-		} else if (!strcmp(algorithm, "default")) {
-			/* Fall through to default initialization */
-		} else {
-			die("unknown fetch negotiation algorithm '%s'", algorithm);
-		}
+	prepare_repo_settings(r);
+	switch(r->settings.fetch_negotiation_algorithm) {
+	case FETCH_NEGOTIATION_SKIPPING:
+		skipping_negotiator_init(negotiator);
+		return;
+
+	case FETCH_NEGOTIATION_DEFAULT:
+	default:
+		default_negotiator_init(negotiator);
+		return;
 	}
-	default_negotiator_init(negotiator);
 }
diff --git a/third_party/git/fetch-negotiator.h b/third_party/git/fetch-negotiator.h
index 9e3967ce6626..ea78868504bd 100644
--- a/third_party/git/fetch-negotiator.h
+++ b/third_party/git/fetch-negotiator.h
@@ -2,6 +2,7 @@
 #define FETCH_NEGOTIATOR_H
 
 struct commit;
+struct repository;
 
 /*
  * An object that supplies the information needed to negotiate the contents of
@@ -52,7 +53,7 @@ struct fetch_negotiator {
 	void *data;
 };
 
-void fetch_negotiator_init(struct fetch_negotiator *negotiator,
-			   const char *algorithm);
+void fetch_negotiator_init(struct repository *r,
+			   struct fetch_negotiator *negotiator);
 
 #endif
diff --git a/third_party/git/fetch-object.c b/third_party/git/fetch-object.c
deleted file mode 100644
index 42665488008b..000000000000
--- a/third_party/git/fetch-object.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "cache.h"
-#include "packfile.h"
-#include "pkt-line.h"
-#include "strbuf.h"
-#include "transport.h"
-#include "fetch-object.h"
-
-static void fetch_refs(const char *remote_name, struct ref *ref)
-{
-	struct remote *remote;
-	struct transport *transport;
-	int original_fetch_if_missing = fetch_if_missing;
-
-	fetch_if_missing = 0;
-	remote = remote_get(remote_name);
-	if (!remote->url[0])
-		die(_("Remote with no URL"));
-	transport = transport_get(remote, remote->url[0]);
-
-	transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
-	transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1");
-	transport_fetch_refs(transport, ref);
-	fetch_if_missing = original_fetch_if_missing;
-}
-
-void fetch_objects(const char *remote_name, const struct object_id *oids,
-		   int oid_nr)
-{
-	struct ref *ref = NULL;
-	int i;
-
-	for (i = 0; i < oid_nr; i++) {
-		struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i]));
-		oidcpy(&new_ref->old_oid, &oids[i]);
-		new_ref->exact_oid = 1;
-		new_ref->next = ref;
-		ref = new_ref;
-	}
-	fetch_refs(remote_name, ref);
-}
diff --git a/third_party/git/fetch-object.h b/third_party/git/fetch-object.h
deleted file mode 100644
index d6444caa5ac1..000000000000
--- a/third_party/git/fetch-object.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef FETCH_OBJECT_H
-#define FETCH_OBJECT_H
-
-struct object_id;
-
-void fetch_objects(const char *remote_name, const struct object_id *oids,
-		   int oid_nr);
-
-#endif
diff --git a/third_party/git/fetch-pack.c b/third_party/git/fetch-pack.c
index 65be043f2afa..1734a573b010 100644
--- a/third_party/git/fetch-pack.c
+++ b/third_party/git/fetch-pack.c
@@ -36,7 +36,6 @@ static int agent_supported;
 static int server_supports_filtering;
 static struct lock_file shallow_lock;
 static const char *alternate_shallow_file;
-static char *negotiation_algorithm;
 static struct strbuf fsck_msg_types = STRBUF_INIT;
 
 /* Remember to update object flag allocation in object.h */
@@ -168,16 +167,16 @@ static enum ack_type get_ack(struct packet_reader *reader,
 	if (!strcmp(reader->line, "NAK"))
 		return NAK;
 	if (skip_prefix(reader->line, "ACK ", &arg)) {
-		if (!get_oid_hex(arg, result_oid)) {
-			arg += 40;
-			len -= arg - reader->line;
+		const char *p;
+		if (!parse_oid_hex(arg, result_oid, &p)) {
+			len -= p - reader->line;
 			if (len < 1)
 				return ACK;
-			if (strstr(arg, "continue"))
+			if (strstr(p, "continue"))
 				return ACK_continue;
-			if (strstr(arg, "common"))
+			if (strstr(p, "common"))
 				return ACK_common;
-			if (strstr(arg, "ready"))
+			if (strstr(p, "ready"))
 				return ACK_ready;
 			return ACK;
 		}
@@ -339,12 +338,9 @@ static int find_common(struct fetch_negotiator *negotiator,
 		}
 	}
 	if (server_supports_filtering && args->filter_options.choice) {
-		struct strbuf expanded_filter_spec = STRBUF_INIT;
-		expand_list_objects_filter_spec(&args->filter_options,
-						&expanded_filter_spec);
-		packet_buf_write(&req_buf, "filter %s",
-				 expanded_filter_spec.buf);
-		strbuf_release(&expanded_filter_spec);
+		const char *spec =
+			expand_list_objects_filter_spec(&args->filter_options);
+		packet_buf_write(&req_buf, "filter %s", spec);
 	}
 	packet_buf_flush(&req_buf);
 	state_len = req_buf.len;
@@ -386,6 +382,7 @@ static int find_common(struct fetch_negotiator *negotiator,
 		state_len = 0;
 	}
 
+	trace2_region_enter("fetch-pack", "negotiation_v0_v1", the_repository);
 	flushes = 0;
 	retval = -1;
 	if (args->no_dependents)
@@ -470,6 +467,7 @@ static int find_common(struct fetch_negotiator *negotiator,
 		}
 	}
 done:
+	trace2_region_leave("fetch-pack", "negotiation_v0_v1", the_repository);
 	if (!got_ready || !no_done) {
 		packet_buf_write(&req_buf, "done\n");
 		send_request(args, fd[1], &req_buf);
@@ -671,17 +669,20 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 
 	save_commit_buffer = 0;
 
+	trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
 	for (ref = *refs; ref; ref = ref->next) {
 		struct object *o;
 
 		if (!has_object_file_with_flags(&ref->old_oid,
-						OBJECT_INFO_QUICK))
+						OBJECT_INFO_QUICK |
+							OBJECT_INFO_SKIP_FETCH_OBJECT))
 			continue;
 		o = parse_object(the_repository, &ref->old_oid);
 		if (!o)
 			continue;
 
-		/* We already have it -- which may mean that we were
+		/*
+		 * We already have it -- which may mean that we were
 		 * in sync with the other side at some time after
 		 * that (it is OK if we guess wrong here).
 		 */
@@ -691,7 +692,13 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 				cutoff = commit->date;
 		}
 	}
+	trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
 
+	/*
+	 * This block marks all local refs as COMPLETE, and then recursively marks all
+	 * parents of those refs as COMPLETE.
+	 */
+	trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL);
 	if (!args->deepen) {
 		for_each_ref(mark_complete_oid, NULL);
 		for_each_cached_alternate(NULL, mark_alternate_complete);
@@ -699,11 +706,13 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 		if (cutoff)
 			mark_recent_complete_commits(args, cutoff);
 	}
+	trace2_region_leave("fetch-pack", "mark_complete_local_refs", NULL);
 
 	/*
 	 * Mark all complete remote refs as common refs.
 	 * Don't mark them common yet; the server has to be told so first.
 	 */
+	trace2_region_enter("fetch-pack", "mark_common_remote_refs", NULL);
 	for (ref = *refs; ref; ref = ref->next) {
 		struct object *o = deref_tag(the_repository,
 					     lookup_object(the_repository,
@@ -716,6 +725,7 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 		negotiator->known_common(negotiator,
 					 (struct commit *)o);
 	}
+	trace2_region_leave("fetch-pack", "mark_common_remote_refs", NULL);
 
 	save_commit_buffer = old_save_commit_buffer;
 }
@@ -758,8 +768,33 @@ static int sideband_demux(int in, int out, void *data)
 	return ret;
 }
 
+static void write_promisor_file(const char *keep_name,
+				struct ref **sought, int nr_sought)
+{
+	struct strbuf promisor_name = STRBUF_INIT;
+	int suffix_stripped;
+	FILE *output;
+	int i;
+
+	strbuf_addstr(&promisor_name, keep_name);
+	suffix_stripped = strbuf_strip_suffix(&promisor_name, ".keep");
+	if (!suffix_stripped)
+		BUG("name of pack lockfile should end with .keep (was '%s')",
+		    keep_name);
+	strbuf_addstr(&promisor_name, ".promisor");
+
+	output = xfopen(promisor_name.buf, "w");
+	for (i = 0; i < nr_sought; i++)
+		fprintf(output, "%s %s\n", oid_to_hex(&sought[i]->old_oid),
+			sought[i]->name);
+	fclose(output);
+
+	strbuf_release(&promisor_name);
+}
+
 static int get_pack(struct fetch_pack_args *args,
-		    int xd[2], char **pack_lockfile)
+		    int xd[2], char **pack_lockfile,
+		    struct ref **sought, int nr_sought)
 {
 	struct async demux;
 	int do_keep = args->keep_pack;
@@ -821,7 +856,13 @@ static int get_pack(struct fetch_pack_args *args,
 		}
 		if (args->check_self_contained_and_connected)
 			argv_array_push(&cmd.args, "--check-self-contained-and-connected");
-		if (args->from_promisor)
+		/*
+		 * If we're obtaining the filename of a lockfile, we'll use
+		 * that filename to write a .promisor file with more
+		 * information below. If not, we need index-pack to do it for
+		 * us.
+		 */
+		if (!(do_keep && pack_lockfile) && args->from_promisor)
 			argv_array_push(&cmd.args, "--promisor");
 	}
 	else {
@@ -875,6 +916,14 @@ static int get_pack(struct fetch_pack_args *args,
 		die(_("%s failed"), cmd_name);
 	if (use_sideband && finish_async(&demux))
 		die(_("error in sideband demultiplexer"));
+
+	/*
+	 * Now that index-pack has succeeded, write the promisor file using the
+	 * obtained .keep filename if necessary
+	 */
+	if (do_keep && pack_lockfile && args->from_promisor)
+		write_promisor_file(*pack_lockfile, sought, nr_sought);
+
 	return 0;
 }
 
@@ -892,12 +941,20 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 				 struct shallow_info *si,
 				 char **pack_lockfile)
 {
+	struct repository *r = the_repository;
 	struct ref *ref = copy_ref_list(orig_ref);
 	struct object_id oid;
 	const char *agent_feature;
 	int agent_len;
-	struct fetch_negotiator negotiator;
-	fetch_negotiator_init(&negotiator, negotiation_algorithm);
+	struct fetch_negotiator negotiator_alloc;
+	struct fetch_negotiator *negotiator;
+
+	if (args->no_dependents) {
+		negotiator = NULL;
+	} else {
+		negotiator = &negotiator_alloc;
+		fetch_negotiator_init(r, negotiator);
+	}
 
 	sort_ref_list(&ref, ref_compare_name);
 	QSORT(sought, nr_sought, cmp_ref_by_name);
@@ -911,7 +968,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 
 	if (server_supports("shallow"))
 		print_verbose(args, _("Server supports %s"), "shallow");
-	else if (args->depth > 0 || is_repository_shallow(the_repository))
+	else if (args->depth > 0 || is_repository_shallow(r))
 		die(_("Server does not support shallow clients"));
 	if (args->depth > 0 || args->deepen_since || args->deepen_not)
 		args->deepen = 1;
@@ -984,7 +1041,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 		die(_("Server does not support --deepen"));
 
 	if (!args->no_dependents) {
-		mark_complete_and_common_ref(&negotiator, args, &ref);
+		mark_complete_and_common_ref(negotiator, args, &ref);
 		filter_refs(args, &ref, sought, nr_sought);
 		if (everything_local(args, &ref)) {
 			packet_flush(fd[1]);
@@ -993,7 +1050,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 	} else {
 		filter_refs(args, &ref, sought, nr_sought);
 	}
-	if (find_common(&negotiator, args, fd, &oid, ref) < 0)
+	if (find_common(negotiator, args, fd, &oid, ref) < 0)
 		if (!args->keep_pack)
 			/* When cloning, it is not unusual to have
 			 * no common commit.
@@ -1009,11 +1066,12 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 		alternate_shallow_file = setup_temporary_shallow(si->shallow);
 	else
 		alternate_shallow_file = NULL;
-	if (get_pack(args, fd, pack_lockfile))
+	if (get_pack(args, fd, pack_lockfile, sought, nr_sought))
 		die(_("git fetch-pack: fetch failed."));
 
  all_done:
-	negotiator.release(&negotiator);
+	if (negotiator)
+		negotiator->release(negotiator);
 	return ref;
 }
 
@@ -1112,7 +1170,7 @@ static int add_haves(struct fetch_negotiator *negotiator,
 }
 
 static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
-			      const struct fetch_pack_args *args,
+			      struct fetch_pack_args *args,
 			      const struct ref *wants, struct oidset *common,
 			      int *haves_to_send, int *in_vain,
 			      int sideband_all)
@@ -1153,13 +1211,10 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
 	/* Add filter */
 	if (server_supports_feature("fetch", "filter", 0) &&
 	    args->filter_options.choice) {
-		struct strbuf expanded_filter_spec = STRBUF_INIT;
+		const char *spec =
+			expand_list_objects_filter_spec(&args->filter_options);
 		print_verbose(args, _("Server supports filter"));
-		expand_list_objects_filter_spec(&args->filter_options,
-						&expanded_filter_spec);
-		packet_buf_write(&req_buf, "filter %s",
-				 expanded_filter_spec.buf);
-		strbuf_release(&expanded_filter_spec);
+		packet_buf_write(&req_buf, "filter %s", spec);
 	} else if (args->filter_options.choice) {
 		warning("filtering not recognized by server, ignoring");
 	}
@@ -1234,7 +1289,8 @@ static int process_acks(struct fetch_negotiator *negotiator,
 				struct commit *commit;
 				oidset_insert(common, &oid);
 				commit = lookup_commit(the_repository, &oid);
-				negotiator->ack(negotiator, commit);
+				if (negotiator)
+					negotiator->ack(negotiator, commit);
 			}
 			continue;
 		}
@@ -1379,14 +1435,23 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 				    struct shallow_info *si,
 				    char **pack_lockfile)
 {
+	struct repository *r = the_repository;
 	struct ref *ref = copy_ref_list(orig_ref);
 	enum fetch_state state = FETCH_CHECK_LOCAL;
 	struct oidset common = OIDSET_INIT;
 	struct packet_reader reader;
-	int in_vain = 0;
+	int in_vain = 0, negotiation_started = 0;
 	int haves_to_send = INITIAL_FLUSH;
-	struct fetch_negotiator negotiator;
-	fetch_negotiator_init(&negotiator, negotiation_algorithm);
+	struct fetch_negotiator negotiator_alloc;
+	struct fetch_negotiator *negotiator;
+
+	if (args->no_dependents) {
+		negotiator = NULL;
+	} else {
+		negotiator = &negotiator_alloc;
+		fetch_negotiator_init(r, negotiator);
+	}
+
 	packet_reader_init(&reader, fd[0], NULL, 0,
 			   PACKET_READ_CHOMP_NEWLINE |
 			   PACKET_READ_DIE_ON_ERR_PACKET);
@@ -1410,15 +1475,15 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 
 			/* Filter 'ref' by 'sought' and those that aren't local */
 			if (!args->no_dependents) {
-				mark_complete_and_common_ref(&negotiator, args, &ref);
+				mark_complete_and_common_ref(negotiator, args, &ref);
 				filter_refs(args, &ref, sought, nr_sought);
 				if (everything_local(args, &ref))
 					state = FETCH_DONE;
 				else
 					state = FETCH_SEND_REQUEST;
 
-				mark_tips(&negotiator, args->negotiation_tips);
-				for_each_cached_alternate(&negotiator,
+				mark_tips(negotiator, args->negotiation_tips);
+				for_each_cached_alternate(negotiator,
 							  insert_one_alternate_object);
 			} else {
 				filter_refs(args, &ref, sought, nr_sought);
@@ -1426,7 +1491,13 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 			}
 			break;
 		case FETCH_SEND_REQUEST:
-			if (send_fetch_request(&negotiator, fd[1], args, ref,
+			if (!negotiation_started) {
+				negotiation_started = 1;
+				trace2_region_enter("fetch-pack",
+						    "negotiation_v2",
+						    the_repository);
+			}
+			if (send_fetch_request(negotiator, fd[1], args, ref,
 					       &common,
 					       &haves_to_send, &in_vain,
 					       reader.use_sideband))
@@ -1436,7 +1507,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 			break;
 		case FETCH_PROCESS_ACKS:
 			/* Process ACKs/NAKs */
-			switch (process_acks(&negotiator, &reader, &common)) {
+			switch (process_acks(negotiator, &reader, &common)) {
 			case 2:
 				state = FETCH_GET_PACK;
 				break;
@@ -1449,6 +1520,9 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 			}
 			break;
 		case FETCH_GET_PACK:
+			trace2_region_leave("fetch-pack",
+					    "negotiation_v2",
+					    the_repository);
 			/* Check for shallow-info section */
 			if (process_section_header(&reader, "shallow-info", 1))
 				receive_shallow_info(args, &reader, shallows, si);
@@ -1458,7 +1532,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 
 			/* get the pack */
 			process_section_header(&reader, "packfile", 0);
-			if (get_pack(args, fd, pack_lockfile))
+			if (get_pack(args, fd, pack_lockfile, sought, nr_sought))
 				die(_("git fetch-pack: fetch failed."));
 
 			state = FETCH_DONE;
@@ -1468,7 +1542,8 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 		}
 	}
 
-	negotiator.release(&negotiator);
+	if (negotiator)
+		negotiator->release(negotiator);
 	oidset_clear(&common);
 	return ref;
 }
@@ -1505,8 +1580,6 @@ static void fetch_pack_config(void)
 	git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta);
 	git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects);
 	git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects);
-	git_config_get_string("fetch.negotiationalgorithm",
-			      &negotiation_algorithm);
 
 	git_config(fetch_pack_config_cb, NULL);
 }
diff --git a/third_party/git/fsck.c b/third_party/git/fsck.c
index cdb7d8db0301..73f30773f28a 100644
--- a/third_party/git/fsck.c
+++ b/third_party/git/fsck.c
@@ -9,12 +9,14 @@
 #include "tag.h"
 #include "fsck.h"
 #include "refs.h"
+#include "url.h"
 #include "utf8.h"
 #include "decorate.h"
 #include "oidset.h"
 #include "packfile.h"
 #include "submodule-config.h"
 #include "config.h"
+#include "credential.h"
 #include "help.h"
 
 static struct oidset gitmodules_found = OIDSET_INIT;
@@ -43,21 +45,17 @@ static struct oidset gitmodules_done = OIDSET_INIT;
 	FUNC(MISSING_AUTHOR, ERROR) \
 	FUNC(MISSING_COMMITTER, ERROR) \
 	FUNC(MISSING_EMAIL, ERROR) \
-	FUNC(MISSING_GRAFT, ERROR) \
 	FUNC(MISSING_NAME_BEFORE_EMAIL, ERROR) \
 	FUNC(MISSING_OBJECT, ERROR) \
-	FUNC(MISSING_PARENT, ERROR) \
 	FUNC(MISSING_SPACE_BEFORE_DATE, ERROR) \
 	FUNC(MISSING_SPACE_BEFORE_EMAIL, ERROR) \
 	FUNC(MISSING_TAG, ERROR) \
 	FUNC(MISSING_TAG_ENTRY, ERROR) \
-	FUNC(MISSING_TAG_OBJECT, ERROR) \
 	FUNC(MISSING_TREE, ERROR) \
 	FUNC(MISSING_TREE_OBJECT, ERROR) \
 	FUNC(MISSING_TYPE, ERROR) \
 	FUNC(MISSING_TYPE_ENTRY, ERROR) \
 	FUNC(MULTIPLE_AUTHORS, ERROR) \
-	FUNC(TAG_OBJECT_NOT_TAG, ERROR) \
 	FUNC(TREE_NOT_SORTED, ERROR) \
 	FUNC(UNKNOWN_TYPE, ERROR) \
 	FUNC(ZERO_PADDED_DATE, ERROR) \
@@ -68,6 +66,7 @@ static struct oidset gitmodules_done = OIDSET_INIT;
 	FUNC(GITMODULES_SYMLINK, ERROR) \
 	FUNC(GITMODULES_URL, ERROR) \
 	FUNC(GITMODULES_PATH, ERROR) \
+	FUNC(GITMODULES_UPDATE, ERROR) \
 	/* warnings */ \
 	FUNC(BAD_FILEMODE, WARN) \
 	FUNC(EMPTY_NAME, WARN) \
@@ -281,14 +280,16 @@ static void append_msg_id(struct strbuf *sb, const char *msg_id)
 	strbuf_addstr(sb, ": ");
 }
 
-static int object_on_skiplist(struct fsck_options *opts, struct object *obj)
+static int object_on_skiplist(struct fsck_options *opts,
+			      const struct object_id *oid)
 {
-	return opts && obj && oidset_contains(&opts->skiplist, &obj->oid);
+	return opts && oid && oidset_contains(&opts->skiplist, oid);
 }
 
-__attribute__((format (printf, 4, 5)))
-static int report(struct fsck_options *options, struct object *object,
-	enum fsck_msg_id id, const char *fmt, ...)
+__attribute__((format (printf, 5, 6)))
+static int report(struct fsck_options *options,
+		  const struct object_id *oid, enum object_type object_type,
+		  enum fsck_msg_id id, const char *fmt, ...)
 {
 	va_list ap;
 	struct strbuf sb = STRBUF_INIT;
@@ -297,7 +298,7 @@ static int report(struct fsck_options *options, struct object *object,
 	if (msg_type == FSCK_IGNORE)
 		return 0;
 
-	if (object_on_skiplist(options, object))
+	if (object_on_skiplist(options, oid))
 		return 0;
 
 	if (msg_type == FSCK_FATAL)
@@ -309,49 +310,71 @@ static int report(struct fsck_options *options, struct object *object,
 
 	va_start(ap, fmt);
 	strbuf_vaddf(&sb, fmt, ap);
-	result = options->error_func(options, object, msg_type, sb.buf);
+	result = options->error_func(options, oid, object_type,
+				     msg_type, sb.buf);
 	strbuf_release(&sb);
 	va_end(ap);
 
 	return result;
 }
 
-static char *get_object_name(struct fsck_options *options, struct object *obj)
+void fsck_enable_object_names(struct fsck_options *options)
 {
 	if (!options->object_names)
+		options->object_names = kh_init_oid_map();
+}
+
+const char *fsck_get_object_name(struct fsck_options *options,
+				 const struct object_id *oid)
+{
+	khiter_t pos;
+	if (!options->object_names)
+		return NULL;
+	pos = kh_get_oid_map(options->object_names, *oid);
+	if (pos >= kh_end(options->object_names))
 		return NULL;
-	return lookup_decoration(options->object_names, obj);
+	return kh_value(options->object_names, pos);
 }
 
-static void put_object_name(struct fsck_options *options, struct object *obj,
-	const char *fmt, ...)
+void fsck_put_object_name(struct fsck_options *options,
+			  const struct object_id *oid,
+			  const char *fmt, ...)
 {
 	va_list ap;
 	struct strbuf buf = STRBUF_INIT;
-	char *existing;
+	khiter_t pos;
+	int hashret;
 
 	if (!options->object_names)
 		return;
-	existing = lookup_decoration(options->object_names, obj);
-	if (existing)
+
+	pos = kh_put_oid_map(options->object_names, *oid, &hashret);
+	if (!hashret)
 		return;
 	va_start(ap, fmt);
 	strbuf_vaddf(&buf, fmt, ap);
-	add_decoration(options->object_names, obj, strbuf_detach(&buf, NULL));
+	kh_value(options->object_names, pos) = strbuf_detach(&buf, NULL);
 	va_end(ap);
 }
 
-static const char *describe_object(struct fsck_options *o, struct object *obj)
+const char *fsck_describe_object(struct fsck_options *options,
+				 const struct object_id *oid)
 {
-	static struct strbuf buf = STRBUF_INIT;
-	char *name;
-
-	strbuf_reset(&buf);
-	strbuf_addstr(&buf, oid_to_hex(&obj->oid));
-	if (o->object_names && (name = lookup_decoration(o->object_names, obj)))
-		strbuf_addf(&buf, " (%s)", name);
+	static struct strbuf bufs[] = {
+		STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
+	};
+	static int b = 0;
+	struct strbuf *buf;
+	const char *name = fsck_get_object_name(options, oid);
+
+	buf = bufs + b;
+	b = (b + 1) % ARRAY_SIZE(bufs);
+	strbuf_reset(buf);
+	strbuf_addstr(buf, oid_to_hex(oid));
+	if (name)
+		strbuf_addf(buf, " (%s)", name);
 
-	return buf.buf;
+	return buf->buf;
 }
 
 static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *options)
@@ -364,7 +387,7 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
 	if (parse_tree(tree))
 		return -1;
 
-	name = get_object_name(options, &tree->object);
+	name = fsck_get_object_name(options, &tree->object.oid);
 	if (init_tree_desc_gently(&desc, tree->buffer, tree->size))
 		return -1;
 	while (tree_entry_gently(&desc, &entry)) {
@@ -377,20 +400,21 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
 		if (S_ISDIR(entry.mode)) {
 			obj = (struct object *)lookup_tree(the_repository, &entry.oid);
 			if (name && obj)
-				put_object_name(options, obj, "%s%s/", name,
-					entry.path);
+				fsck_put_object_name(options, &entry.oid, "%s%s/",
+						     name, entry.path);
 			result = options->walk(obj, OBJ_TREE, data, options);
 		}
 		else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {
 			obj = (struct object *)lookup_blob(the_repository, &entry.oid);
 			if (name && obj)
-				put_object_name(options, obj, "%s%s", name,
-					entry.path);
+				fsck_put_object_name(options, &entry.oid, "%s%s",
+						     name, entry.path);
 			result = options->walk(obj, OBJ_BLOB, data, options);
 		}
 		else {
 			result = error("in tree %s: entry %s has bad mode %.6o",
-					describe_object(options, &tree->object), entry.path, entry.mode);
+				       fsck_describe_object(options, &tree->object.oid),
+				       entry.path, entry.mode);
 		}
 		if (result < 0)
 			return result;
@@ -411,10 +435,10 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
 	if (parse_commit(commit))
 		return -1;
 
-	name = get_object_name(options, &commit->object);
+	name = fsck_get_object_name(options, &commit->object.oid);
 	if (name)
-		put_object_name(options, &get_commit_tree(commit)->object,
-				"%s:", name);
+		fsck_put_object_name(options, get_commit_tree_oid(commit),
+				     "%s:", name);
 
 	result = options->walk((struct object *)get_commit_tree(commit),
 			       OBJ_TREE, data, options);
@@ -442,16 +466,17 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
 
 	while (parents) {
 		if (name) {
-			struct object *obj = &parents->item->object;
+			struct object_id *oid = &parents->item->object.oid;
 
 			if (counter++)
-				put_object_name(options, obj, "%s^%d",
-					name, counter);
+				fsck_put_object_name(options, oid, "%s^%d",
+						     name, counter);
 			else if (generation > 0)
-				put_object_name(options, obj, "%.*s~%d",
-					name_prefix_len, name, generation + 1);
+				fsck_put_object_name(options, oid, "%.*s~%d",
+						     name_prefix_len, name,
+						     generation + 1);
 			else
-				put_object_name(options, obj, "%s^", name);
+				fsck_put_object_name(options, oid, "%s^", name);
 		}
 		result = options->walk((struct object *)parents->item, OBJ_COMMIT, data, options);
 		if (result < 0)
@@ -465,12 +490,12 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
 
 static int fsck_walk_tag(struct tag *tag, void *data, struct fsck_options *options)
 {
-	char *name = get_object_name(options, &tag->object);
+	const char *name = fsck_get_object_name(options, &tag->object.oid);
 
 	if (parse_tag(tag))
 		return -1;
 	if (name)
-		put_object_name(options, tag->tagged, "%s", name);
+		fsck_put_object_name(options, &tag->tagged->oid, "%s", name);
 	return options->walk(tag->tagged, OBJ_ANY, data, options);
 }
 
@@ -492,7 +517,8 @@ int fsck_walk(struct object *obj, void *data, struct fsck_options *options)
 	case OBJ_TAG:
 		return fsck_walk_tag((struct tag *)obj, data, options);
 	default:
-		error("Unknown object type for %s", describe_object(options, obj));
+		error("Unknown object type for %s",
+		      fsck_describe_object(options, &obj->oid));
 		return -1;
 	}
 }
@@ -543,7 +569,9 @@ static int verify_ordered(unsigned mode1, const char *name1, unsigned mode2, con
 	return c1 < c2 ? 0 : TREE_UNORDERED;
 }
 
-static int fsck_tree(struct tree *item, struct fsck_options *options)
+static int fsck_tree(const struct object_id *oid,
+		     const char *buffer, unsigned long size,
+		     struct fsck_options *options)
 {
 	int retval = 0;
 	int has_null_sha1 = 0;
@@ -560,8 +588,8 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 	unsigned o_mode;
 	const char *o_name;
 
-	if (init_tree_desc_gently(&desc, item->buffer, item->size)) {
-		retval += report(options, &item->object, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");
+	if (init_tree_desc_gently(&desc, buffer, size)) {
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");
 		return retval;
 	}
 
@@ -570,7 +598,7 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 
 	while (desc.size) {
 		unsigned short mode;
-		const char *name;
+		const char *name, *backslash;
 		const struct object_id *oid;
 
 		oid = tree_entry_extract(&desc, &name, &mode);
@@ -587,13 +615,30 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 			if (!S_ISLNK(mode))
 				oidset_insert(&gitmodules_found, oid);
 			else
-				retval += report(options, &item->object,
+				retval += report(options,
+						 oid, OBJ_TREE,
 						 FSCK_MSG_GITMODULES_SYMLINK,
 						 ".gitmodules is a symbolic link");
 		}
 
+		if ((backslash = strchr(name, '\\'))) {
+			while (backslash) {
+				backslash++;
+				has_dotgit |= is_ntfs_dotgit(backslash);
+				if (is_ntfs_dotgitmodules(backslash)) {
+					if (!S_ISLNK(mode))
+						oidset_insert(&gitmodules_found, oid);
+					else
+						retval += report(options, oid, OBJ_TREE,
+								 FSCK_MSG_GITMODULES_SYMLINK,
+								 ".gitmodules is a symbolic link");
+				}
+				backslash = strchr(backslash, '\\');
+			}
+		}
+
 		if (update_tree_entry_gently(&desc)) {
-			retval += report(options, &item->object, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");
+			retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");
 			break;
 		}
 
@@ -638,30 +683,31 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 	}
 
 	if (has_null_sha1)
-		retval += report(options, &item->object, FSCK_MSG_NULL_SHA1, "contains entries pointing to null sha1");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_NULL_SHA1, "contains entries pointing to null sha1");
 	if (has_full_path)
-		retval += report(options, &item->object, FSCK_MSG_FULL_PATHNAME, "contains full pathnames");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_FULL_PATHNAME, "contains full pathnames");
 	if (has_empty_name)
-		retval += report(options, &item->object, FSCK_MSG_EMPTY_NAME, "contains empty pathname");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_EMPTY_NAME, "contains empty pathname");
 	if (has_dot)
-		retval += report(options, &item->object, FSCK_MSG_HAS_DOT, "contains '.'");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_HAS_DOT, "contains '.'");
 	if (has_dotdot)
-		retval += report(options, &item->object, FSCK_MSG_HAS_DOTDOT, "contains '..'");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_HAS_DOTDOT, "contains '..'");
 	if (has_dotgit)
-		retval += report(options, &item->object, FSCK_MSG_HAS_DOTGIT, "contains '.git'");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_HAS_DOTGIT, "contains '.git'");
 	if (has_zero_pad)
-		retval += report(options, &item->object, FSCK_MSG_ZERO_PADDED_FILEMODE, "contains zero-padded file modes");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_ZERO_PADDED_FILEMODE, "contains zero-padded file modes");
 	if (has_bad_modes)
-		retval += report(options, &item->object, FSCK_MSG_BAD_FILEMODE, "contains bad file modes");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_FILEMODE, "contains bad file modes");
 	if (has_dup_entries)
-		retval += report(options, &item->object, FSCK_MSG_DUPLICATE_ENTRIES, "contains duplicate file entries");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_DUPLICATE_ENTRIES, "contains duplicate file entries");
 	if (not_properly_sorted)
-		retval += report(options, &item->object, FSCK_MSG_TREE_NOT_SORTED, "not properly sorted");
+		retval += report(options, oid, OBJ_TREE, FSCK_MSG_TREE_NOT_SORTED, "not properly sorted");
 	return retval;
 }
 
 static int verify_headers(const void *data, unsigned long size,
-			  struct object *obj, struct fsck_options *options)
+			  const struct object_id *oid, enum object_type type,
+			  struct fsck_options *options)
 {
 	const char *buffer = (const char *)data;
 	unsigned long i;
@@ -669,7 +715,7 @@ static int verify_headers(const void *data, unsigned long size,
 	for (i = 0; i < size; i++) {
 		switch (buffer[i]) {
 		case '\0':
-			return report(options, obj,
+			return report(options, oid, type,
 				FSCK_MSG_NUL_IN_HEADER,
 				"unterminated header: NUL at offset %ld", i);
 		case '\n':
@@ -687,11 +733,13 @@ static int verify_headers(const void *data, unsigned long size,
 	if (size && buffer[size - 1] == '\n')
 		return 0;
 
-	return report(options, obj,
+	return report(options, oid, type,
 		FSCK_MSG_UNTERMINATED_HEADER, "unterminated header");
 }
 
-static int fsck_ident(const char **ident, struct object *obj, struct fsck_options *options)
+static int fsck_ident(const char **ident,
+		      const struct object_id *oid, enum object_type type,
+		      struct fsck_options *options)
 {
 	const char *p = *ident;
 	char *end;
@@ -701,28 +749,28 @@ static int fsck_ident(const char **ident, struct object *obj, struct fsck_option
 		(*ident)++;
 
 	if (*p == '<')
-		return report(options, obj, FSCK_MSG_MISSING_NAME_BEFORE_EMAIL, "invalid author/committer line - missing space before email");
+		return report(options, oid, type, FSCK_MSG_MISSING_NAME_BEFORE_EMAIL, "invalid author/committer line - missing space before email");
 	p += strcspn(p, "<>\n");
 	if (*p == '>')
-		return report(options, obj, FSCK_MSG_BAD_NAME, "invalid author/committer line - bad name");
+		return report(options, oid, type, FSCK_MSG_BAD_NAME, "invalid author/committer line - bad name");
 	if (*p != '<')
-		return report(options, obj, FSCK_MSG_MISSING_EMAIL, "invalid author/committer line - missing email");
+		return report(options, oid, type, FSCK_MSG_MISSING_EMAIL, "invalid author/committer line - missing email");
 	if (p[-1] != ' ')
-		return report(options, obj, FSCK_MSG_MISSING_SPACE_BEFORE_EMAIL, "invalid author/committer line - missing space before email");
+		return report(options, oid, type, FSCK_MSG_MISSING_SPACE_BEFORE_EMAIL, "invalid author/committer line - missing space before email");
 	p++;
 	p += strcspn(p, "<>\n");
 	if (*p != '>')
-		return report(options, obj, FSCK_MSG_BAD_EMAIL, "invalid author/committer line - bad email");
+		return report(options, oid, type, FSCK_MSG_BAD_EMAIL, "invalid author/committer line - bad email");
 	p++;
 	if (*p != ' ')
-		return report(options, obj, FSCK_MSG_MISSING_SPACE_BEFORE_DATE, "invalid author/committer line - missing space before date");
+		return report(options, oid, type, FSCK_MSG_MISSING_SPACE_BEFORE_DATE, "invalid author/committer line - missing space before date");
 	p++;
 	if (*p == '0' && p[1] != ' ')
-		return report(options, obj, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date");
+		return report(options, oid, type, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date");
 	if (date_overflows(parse_timestamp(p, &end, 10)))
-		return report(options, obj, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow");
+		return report(options, oid, type, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow");
 	if ((end == p || *end != ' '))
-		return report(options, obj, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date");
+		return report(options, oid, type, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date");
 	p = end + 1;
 	if ((*p != '+' && *p != '-') ||
 	    !isdigit(p[1]) ||
@@ -730,83 +778,60 @@ static int fsck_ident(const char **ident, struct object *obj, struct fsck_option
 	    !isdigit(p[3]) ||
 	    !isdigit(p[4]) ||
 	    (p[5] != '\n'))
-		return report(options, obj, FSCK_MSG_BAD_TIMEZONE, "invalid author/committer line - bad time zone");
+		return report(options, oid, type, FSCK_MSG_BAD_TIMEZONE, "invalid author/committer line - bad time zone");
 	p += 6;
 	return 0;
 }
 
-static int fsck_commit_buffer(struct commit *commit, const char *buffer,
-	unsigned long size, struct fsck_options *options)
+static int fsck_commit(const struct object_id *oid,
+		       const char *buffer, unsigned long size,
+		       struct fsck_options *options)
 {
-	struct object_id tree_oid, oid;
-	struct commit_graft *graft;
-	unsigned parent_count, parent_line_count = 0, author_count;
+	struct object_id tree_oid, parent_oid;
+	unsigned author_count;
 	int err;
 	const char *buffer_begin = buffer;
 	const char *p;
 
-	if (verify_headers(buffer, size, &commit->object, options))
+	if (verify_headers(buffer, size, oid, OBJ_COMMIT, options))
 		return -1;
 
 	if (!skip_prefix(buffer, "tree ", &buffer))
-		return report(options, &commit->object, FSCK_MSG_MISSING_TREE, "invalid format - expected 'tree' line");
+		return report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_TREE, "invalid format - expected 'tree' line");
 	if (parse_oid_hex(buffer, &tree_oid, &p) || *p != '\n') {
-		err = report(options, &commit->object, FSCK_MSG_BAD_TREE_SHA1, "invalid 'tree' line format - bad sha1");
+		err = report(options, oid, OBJ_COMMIT, FSCK_MSG_BAD_TREE_SHA1, "invalid 'tree' line format - bad sha1");
 		if (err)
 			return err;
 	}
 	buffer = p + 1;
 	while (skip_prefix(buffer, "parent ", &buffer)) {
-		if (parse_oid_hex(buffer, &oid, &p) || *p != '\n') {
-			err = report(options, &commit->object, FSCK_MSG_BAD_PARENT_SHA1, "invalid 'parent' line format - bad sha1");
+		if (parse_oid_hex(buffer, &parent_oid, &p) || *p != '\n') {
+			err = report(options, oid, OBJ_COMMIT, FSCK_MSG_BAD_PARENT_SHA1, "invalid 'parent' line format - bad sha1");
 			if (err)
 				return err;
 		}
 		buffer = p + 1;
-		parent_line_count++;
-	}
-	graft = lookup_commit_graft(the_repository, &commit->object.oid);
-	parent_count = commit_list_count(commit->parents);
-	if (graft) {
-		if (graft->nr_parent == -1 && !parent_count)
-			; /* shallow commit */
-		else if (graft->nr_parent != parent_count) {
-			err = report(options, &commit->object, FSCK_MSG_MISSING_GRAFT, "graft objects missing");
-			if (err)
-				return err;
-		}
-	} else {
-		if (parent_count != parent_line_count) {
-			err = report(options, &commit->object, FSCK_MSG_MISSING_PARENT, "parent objects missing");
-			if (err)
-				return err;
-		}
 	}
 	author_count = 0;
 	while (skip_prefix(buffer, "author ", &buffer)) {
 		author_count++;
-		err = fsck_ident(&buffer, &commit->object, options);
+		err = fsck_ident(&buffer, oid, OBJ_COMMIT, options);
 		if (err)
 			return err;
 	}
 	if (author_count < 1)
-		err = report(options, &commit->object, FSCK_MSG_MISSING_AUTHOR, "invalid format - expected 'author' line");
+		err = report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_AUTHOR, "invalid format - expected 'author' line");
 	else if (author_count > 1)
-		err = report(options, &commit->object, FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines");
+		err = report(options, oid, OBJ_COMMIT, FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines");
 	if (err)
 		return err;
 	if (!skip_prefix(buffer, "committer ", &buffer))
-		return report(options, &commit->object, FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line");
-	err = fsck_ident(&buffer, &commit->object, options);
+		return report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line");
+	err = fsck_ident(&buffer, oid, OBJ_COMMIT, options);
 	if (err)
 		return err;
-	if (!get_commit_tree(commit)) {
-		err = report(options, &commit->object, FSCK_MSG_BAD_TREE, "could not load commit's tree %s", oid_to_hex(&tree_oid));
-		if (err)
-			return err;
-	}
 	if (memchr(buffer_begin, '\0', size)) {
-		err = report(options, &commit->object, FSCK_MSG_NUL_IN_COMMIT,
+		err = report(options, oid, OBJ_COMMIT, FSCK_MSG_NUL_IN_COMMIT,
 			     "NUL byte in the commit object body");
 		if (err)
 			return err;
@@ -814,91 +839,60 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer,
 	return 0;
 }
 
-static int fsck_commit(struct commit *commit, const char *data,
-	unsigned long size, struct fsck_options *options)
+static int fsck_tag(const struct object_id *oid, const char *buffer,
+		    unsigned long size, struct fsck_options *options)
 {
-	const char *buffer = data ?  data : get_commit_buffer(commit, &size);
-	int ret = fsck_commit_buffer(commit, buffer, size, options);
-	if (!data)
-		unuse_commit_buffer(commit, buffer);
-	return ret;
-}
-
-static int fsck_tag_buffer(struct tag *tag, const char *data,
-	unsigned long size, struct fsck_options *options)
-{
-	struct object_id oid;
+	struct object_id tagged_oid;
 	int ret = 0;
-	const char *buffer;
-	char *to_free = NULL, *eol;
+	char *eol;
 	struct strbuf sb = STRBUF_INIT;
 	const char *p;
 
-	if (data)
-		buffer = data;
-	else {
-		enum object_type type;
-
-		buffer = to_free =
-			read_object_file(&tag->object.oid, &type, &size);
-		if (!buffer)
-			return report(options, &tag->object,
-				FSCK_MSG_MISSING_TAG_OBJECT,
-				"cannot read tag object");
-
-		if (type != OBJ_TAG) {
-			ret = report(options, &tag->object,
-				FSCK_MSG_TAG_OBJECT_NOT_TAG,
-				"expected tag got %s",
-			    type_name(type));
-			goto done;
-		}
-	}
-
-	ret = verify_headers(buffer, size, &tag->object, options);
+	ret = verify_headers(buffer, size, oid, OBJ_TAG, options);
 	if (ret)
 		goto done;
 
 	if (!skip_prefix(buffer, "object ", &buffer)) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_OBJECT, "invalid format - expected 'object' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_OBJECT, "invalid format - expected 'object' line");
 		goto done;
 	}
-	if (parse_oid_hex(buffer, &oid, &p) || *p != '\n') {
-		ret = report(options, &tag->object, FSCK_MSG_BAD_OBJECT_SHA1, "invalid 'object' line format - bad sha1");
+	if (parse_oid_hex(buffer, &tagged_oid, &p) || *p != '\n') {
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_BAD_OBJECT_SHA1, "invalid 'object' line format - bad sha1");
 		if (ret)
 			goto done;
 	}
 	buffer = p + 1;
 
 	if (!skip_prefix(buffer, "type ", &buffer)) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TYPE_ENTRY, "invalid format - expected 'type' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TYPE_ENTRY, "invalid format - expected 'type' line");
 		goto done;
 	}
 	eol = strchr(buffer, '\n');
 	if (!eol) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TYPE, "invalid format - unexpected end after 'type' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TYPE, "invalid format - unexpected end after 'type' line");
 		goto done;
 	}
 	if (type_from_string_gently(buffer, eol - buffer, 1) < 0)
-		ret = report(options, &tag->object, FSCK_MSG_BAD_TYPE, "invalid 'type' value");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_BAD_TYPE, "invalid 'type' value");
 	if (ret)
 		goto done;
 	buffer = eol + 1;
 
 	if (!skip_prefix(buffer, "tag ", &buffer)) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TAG_ENTRY, "invalid format - expected 'tag' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAG_ENTRY, "invalid format - expected 'tag' line");
 		goto done;
 	}
 	eol = strchr(buffer, '\n');
 	if (!eol) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TAG, "invalid format - unexpected end after 'type' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAG, "invalid format - unexpected end after 'type' line");
 		goto done;
 	}
 	strbuf_addf(&sb, "refs/tags/%.*s", (int)(eol - buffer), buffer);
 	if (check_refname_format(sb.buf, 0)) {
-		ret = report(options, &tag->object, FSCK_MSG_BAD_TAG_NAME,
-			   "invalid 'tag' name: %.*s",
-			   (int)(eol - buffer), buffer);
+		ret = report(options, oid, OBJ_TAG,
+			     FSCK_MSG_BAD_TAG_NAME,
+			     "invalid 'tag' name: %.*s",
+			     (int)(eol - buffer), buffer);
 		if (ret)
 			goto done;
 	}
@@ -906,32 +900,163 @@ static int fsck_tag_buffer(struct tag *tag, const char *data,
 
 	if (!skip_prefix(buffer, "tagger ", &buffer)) {
 		/* early tags do not contain 'tagger' lines; warn only */
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TAGGER_ENTRY, "invalid format - expected 'tagger' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAGGER_ENTRY, "invalid format - expected 'tagger' line");
 		if (ret)
 			goto done;
 	}
 	else
-		ret = fsck_ident(&buffer, &tag->object, options);
+		ret = fsck_ident(&buffer, oid, OBJ_TAG, options);
 
 done:
 	strbuf_release(&sb);
-	free(to_free);
 	return ret;
 }
 
-static int fsck_tag(struct tag *tag, const char *data,
-	unsigned long size, struct fsck_options *options)
+/*
+ * Like builtin/submodule--helper.c's starts_with_dot_slash, but without
+ * relying on the platform-dependent is_dir_sep helper.
+ *
+ * This is for use in checking whether a submodule URL is interpreted as
+ * relative to the current directory on any platform, since \ is a
+ * directory separator on Windows but not on other platforms.
+ */
+static int starts_with_dot_slash(const char *str)
+{
+	return str[0] == '.' && (str[1] == '/' || str[1] == '\\');
+}
+
+/*
+ * Like starts_with_dot_slash, this is a variant of submodule--helper's
+ * helper of the same name with the twist that it accepts backslash as a
+ * directory separator even on non-Windows platforms.
+ */
+static int starts_with_dot_dot_slash(const char *str)
+{
+	return str[0] == '.' && starts_with_dot_slash(str + 1);
+}
+
+static int submodule_url_is_relative(const char *url)
+{
+	return starts_with_dot_slash(url) || starts_with_dot_dot_slash(url);
+}
+
+/*
+ * Count directory components that a relative submodule URL should chop
+ * from the remote_url it is to be resolved against.
+ *
+ * In other words, this counts "../" components at the start of a
+ * submodule URL.
+ *
+ * Returns the number of directory components to chop and writes a
+ * pointer to the next character of url after all leading "./" and
+ * "../" components to out.
+ */
+static int count_leading_dotdots(const char *url, const char **out)
+{
+	int result = 0;
+	while (1) {
+		if (starts_with_dot_dot_slash(url)) {
+			result++;
+			url += strlen("../");
+			continue;
+		}
+		if (starts_with_dot_slash(url)) {
+			url += strlen("./");
+			continue;
+		}
+		*out = url;
+		return result;
+	}
+}
+/*
+ * Check whether a transport is implemented by git-remote-curl.
+ *
+ * If it is, returns 1 and writes the URL that would be passed to
+ * git-remote-curl to the "out" parameter.
+ *
+ * Otherwise, returns 0 and leaves "out" untouched.
+ *
+ * Examples:
+ *   http::https://example.com/repo.git -> 1, https://example.com/repo.git
+ *   https://example.com/repo.git -> 1, https://example.com/repo.git
+ *   git://example.com/repo.git -> 0
+ *
+ * This is for use in checking for previously exploitable bugs that
+ * required a submodule URL to be passed to git-remote-curl.
+ */
+static int url_to_curl_url(const char *url, const char **out)
 {
-	struct object *tagged = tag->tagged;
+	/*
+	 * We don't need to check for case-aliases, "http.exe", and so
+	 * on because in the default configuration, is_transport_allowed
+	 * prevents URLs with those schemes from being cloned
+	 * automatically.
+	 */
+	if (skip_prefix(url, "http::", out) ||
+	    skip_prefix(url, "https::", out) ||
+	    skip_prefix(url, "ftp::", out) ||
+	    skip_prefix(url, "ftps::", out))
+		return 1;
+	if (starts_with(url, "http://") ||
+	    starts_with(url, "https://") ||
+	    starts_with(url, "ftp://") ||
+	    starts_with(url, "ftps://")) {
+		*out = url;
+		return 1;
+	}
+	return 0;
+}
 
-	if (!tagged)
-		return report(options, &tag->object, FSCK_MSG_BAD_TAG_OBJECT, "could not load tagged object");
+static int check_submodule_url(const char *url)
+{
+	const char *curl_url;
+
+	if (looks_like_command_line_option(url))
+		return -1;
+
+	if (submodule_url_is_relative(url)) {
+		char *decoded;
+		const char *next;
+		int has_nl;
+
+		/*
+		 * This could be appended to an http URL and url-decoded;
+		 * check for malicious characters.
+		 */
+		decoded = url_decode(url);
+		has_nl = !!strchr(decoded, '\n');
+
+		free(decoded);
+		if (has_nl)
+			return -1;
+
+		/*
+		 * URLs which escape their root via "../" can overwrite
+		 * the host field and previous components, resolving to
+		 * URLs like https::example.com/submodule.git and
+		 * https:///example.com/submodule.git that were
+		 * susceptible to CVE-2020-11008.
+		 */
+		if (count_leading_dotdots(url, &next) > 0 &&
+		    (*next == ':' || *next == '/'))
+			return -1;
+	}
 
-	return fsck_tag_buffer(tag, data, size, options);
+	else if (url_to_curl_url(url, &curl_url)) {
+		struct credential c = CREDENTIAL_INIT;
+		int ret = 0;
+		if (credential_from_url_gently(&c, curl_url, 1) ||
+		    !*c.host)
+			ret = -1;
+		credential_clear(&c);
+		return ret;
+	}
+
+	return 0;
 }
 
 struct fsck_gitmodules_data {
-	struct object *obj;
+	const struct object_id *oid;
 	struct fsck_options *options;
 	int ret;
 };
@@ -949,38 +1074,47 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata)
 
 	name = xmemdupz(subsection, subsection_len);
 	if (check_submodule_name(name) < 0)
-		data->ret |= report(data->options, data->obj,
+		data->ret |= report(data->options,
+				    data->oid, OBJ_BLOB,
 				    FSCK_MSG_GITMODULES_NAME,
 				    "disallowed submodule name: %s",
 				    name);
 	if (!strcmp(key, "url") && value &&
-	    looks_like_command_line_option(value))
-		data->ret |= report(data->options, data->obj,
+	    check_submodule_url(value) < 0)
+		data->ret |= report(data->options,
+				    data->oid, OBJ_BLOB,
 				    FSCK_MSG_GITMODULES_URL,
 				    "disallowed submodule url: %s",
 				    value);
 	if (!strcmp(key, "path") && value &&
 	    looks_like_command_line_option(value))
-		data->ret |= report(data->options, data->obj,
+		data->ret |= report(data->options,
+				    data->oid, OBJ_BLOB,
 				    FSCK_MSG_GITMODULES_PATH,
 				    "disallowed submodule path: %s",
 				    value);
+	if (!strcmp(key, "update") && value &&
+	    parse_submodule_update_type(value) == SM_UPDATE_COMMAND)
+		data->ret |= report(data->options, data->oid, OBJ_BLOB,
+				    FSCK_MSG_GITMODULES_UPDATE,
+				    "disallowed submodule update setting: %s",
+				    value);
 	free(name);
 
 	return 0;
 }
 
-static int fsck_blob(struct blob *blob, const char *buf,
+static int fsck_blob(const struct object_id *oid, const char *buf,
 		     unsigned long size, struct fsck_options *options)
 {
 	struct fsck_gitmodules_data data;
 	struct config_options config_opts = { 0 };
 
-	if (!oidset_contains(&gitmodules_found, &blob->object.oid))
+	if (!oidset_contains(&gitmodules_found, oid))
 		return 0;
-	oidset_insert(&gitmodules_done, &blob->object.oid);
+	oidset_insert(&gitmodules_done, oid);
 
-	if (object_on_skiplist(options, &blob->object))
+	if (object_on_skiplist(options, oid))
 		return 0;
 
 	if (!buf) {
@@ -989,18 +1123,18 @@ static int fsck_blob(struct blob *blob, const char *buf,
 		 * blob too gigantic to load into memory. Let's just consider
 		 * that an error.
 		 */
-		return report(options, &blob->object,
+		return report(options, oid, OBJ_BLOB,
 			      FSCK_MSG_GITMODULES_LARGE,
 			      ".gitmodules too large to parse");
 	}
 
-	data.obj = &blob->object;
+	data.oid = oid;
 	data.options = options;
 	data.ret = 0;
 	config_opts.error_action = CONFIG_ERROR_SILENT;
 	if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB,
 				".gitmodules", buf, size, &data, &config_opts))
-		data.ret |= report(options, &blob->object,
+		data.ret |= report(options, oid, OBJ_BLOB,
 				   FSCK_MSG_GITMODULES_PARSE,
 				   "could not parse gitmodules blob");
 
@@ -1011,31 +1145,33 @@ int fsck_object(struct object *obj, void *data, unsigned long size,
 	struct fsck_options *options)
 {
 	if (!obj)
-		return report(options, obj, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck");
+		return report(options, NULL, OBJ_NONE, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck");
 
 	if (obj->type == OBJ_BLOB)
-		return fsck_blob((struct blob *)obj, data, size, options);
+		return fsck_blob(&obj->oid, data, size, options);
 	if (obj->type == OBJ_TREE)
-		return fsck_tree((struct tree *) obj, options);
+		return fsck_tree(&obj->oid, data, size, options);
 	if (obj->type == OBJ_COMMIT)
-		return fsck_commit((struct commit *) obj, (const char *) data,
-			size, options);
+		return fsck_commit(&obj->oid, data, size, options);
 	if (obj->type == OBJ_TAG)
-		return fsck_tag((struct tag *) obj, (const char *) data,
-			size, options);
+		return fsck_tag(&obj->oid, data, size, options);
 
-	return report(options, obj, FSCK_MSG_UNKNOWN_TYPE, "unknown type '%d' (internal fsck error)",
-			  obj->type);
+	return report(options, &obj->oid, obj->type,
+		      FSCK_MSG_UNKNOWN_TYPE,
+		      "unknown type '%d' (internal fsck error)",
+		      obj->type);
 }
 
 int fsck_error_function(struct fsck_options *o,
-	struct object *obj, int msg_type, const char *message)
+			const struct object_id *oid,
+			enum object_type object_type,
+			int msg_type, const char *message)
 {
 	if (msg_type == FSCK_WARN) {
-		warning("object %s: %s", describe_object(o, obj), message);
+		warning("object %s: %s", fsck_describe_object(o, oid), message);
 		return 0;
 	}
-	error("object %s: %s", describe_object(o, obj), message);
+	error("object %s: %s", fsck_describe_object(o, oid), message);
 	return 1;
 }
 
@@ -1047,7 +1183,6 @@ int fsck_finish(struct fsck_options *options)
 
 	oidset_iter_init(&gitmodules_found, &iter);
 	while ((oid = oidset_iter_next(&iter))) {
-		struct blob *blob;
 		enum object_type type;
 		unsigned long size;
 		char *buf;
@@ -1055,29 +1190,22 @@ int fsck_finish(struct fsck_options *options)
 		if (oidset_contains(&gitmodules_done, oid))
 			continue;
 
-		blob = lookup_blob(the_repository, oid);
-		if (!blob) {
-			struct object *obj = lookup_unknown_object(oid);
-			ret |= report(options, obj,
-				      FSCK_MSG_GITMODULES_BLOB,
-				      "non-blob found at .gitmodules");
-			continue;
-		}
-
 		buf = read_object_file(oid, &type, &size);
 		if (!buf) {
-			if (is_promisor_object(&blob->object.oid))
+			if (is_promisor_object(oid))
 				continue;
-			ret |= report(options, &blob->object,
+			ret |= report(options,
+				      oid, OBJ_BLOB,
 				      FSCK_MSG_GITMODULES_MISSING,
 				      "unable to read .gitmodules blob");
 			continue;
 		}
 
 		if (type == OBJ_BLOB)
-			ret |= fsck_blob(blob, buf, size, options);
+			ret |= fsck_blob(oid, buf, size, options);
 		else
-			ret |= report(options, &blob->object,
+			ret |= report(options,
+				      oid, type,
 				      FSCK_MSG_GITMODULES_BLOB,
 				      "non-blob found at .gitmodules");
 		free(buf);
diff --git a/third_party/git/fsck.h b/third_party/git/fsck.h
index b95595ae5fee..69cf715e798c 100644
--- a/third_party/git/fsck.h
+++ b/third_party/git/fsck.h
@@ -27,10 +27,12 @@ typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct f
 
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
 typedef int (*fsck_error)(struct fsck_options *o,
-	struct object *obj, int type, const char *message);
+			  const struct object_id *oid, enum object_type object_type,
+			  int msg_type, const char *message);
 
 int fsck_error_function(struct fsck_options *o,
-	struct object *obj, int type, const char *message);
+			const struct object_id *oid, enum object_type object_type,
+			int msg_type, const char *message);
 
 struct fsck_options {
 	fsck_walk_func walk;
@@ -38,7 +40,7 @@ struct fsck_options {
 	unsigned strict:1;
 	int *msg_type;
 	struct oidset skiplist;
-	struct decoration *object_names;
+	kh_oid_map_t *object_names;
 };
 
 #define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL, OIDSET_INIT }
@@ -52,7 +54,11 @@ struct fsck_options {
  *    0		everything OK
  */
 int fsck_walk(struct object *obj, void *data, struct fsck_options *options);
-/* If NULL is passed for data, we assume the object is local and read it. */
+
+/*
+ * Blob objects my pass a NULL data pointer, which indicates they are too large
+ * to fit in memory. All other types must pass a real buffer.
+ */
 int fsck_object(struct object *obj, void *data, unsigned long size,
 	struct fsck_options *options);
 
@@ -63,4 +69,29 @@ int fsck_object(struct object *obj, void *data, unsigned long size,
  */
 int fsck_finish(struct fsck_options *options);
 
+/*
+ * Subsystem for storing human-readable names for each object.
+ *
+ * If fsck_enable_object_names() has not been called, all other functions are
+ * noops.
+ *
+ * Use fsck_put_object_name() to seed initial names (e.g. from refnames); the
+ * fsck code will extend that while walking trees, etc.
+ *
+ * Use fsck_get_object_name() to get a single name (or NULL if none). Or the
+ * more convenient describe_object(), which always produces an output string
+ * with the oid combined with the name (if any). Note that the return value
+ * points to a rotating array of static buffers, and may be invalidated by a
+ * subsequent call.
+ */
+void fsck_enable_object_names(struct fsck_options *options);
+const char *fsck_get_object_name(struct fsck_options *options,
+				 const struct object_id *oid);
+__attribute__((format (printf,3,4)))
+void fsck_put_object_name(struct fsck_options *options,
+			  const struct object_id *oid,
+			  const char *fmt, ...);
+const char *fsck_describe_object(struct fsck_options *options,
+				 const struct object_id *oid);
+
 #endif
diff --git a/third_party/git/fsmonitor.c b/third_party/git/fsmonitor.c
index 231e83a94db5..932bd9012daf 100644
--- a/third_party/git/fsmonitor.c
+++ b/third_party/git/fsmonitor.c
@@ -6,19 +6,42 @@
 #include "run-command.h"
 #include "strbuf.h"
 
-#define INDEX_EXTENSION_VERSION	(1)
-#define HOOK_INTERFACE_VERSION	(1)
+#define INDEX_EXTENSION_VERSION1	(1)
+#define INDEX_EXTENSION_VERSION2	(2)
+#define HOOK_INTERFACE_VERSION1		(1)
+#define HOOK_INTERFACE_VERSION2		(2)
 
 struct trace_key trace_fsmonitor = TRACE_KEY_INIT(FSMONITOR);
 
 static void fsmonitor_ewah_callback(size_t pos, void *is)
 {
 	struct index_state *istate = (struct index_state *)is;
-	struct cache_entry *ce = istate->cache[pos];
+	struct cache_entry *ce;
 
+	if (pos >= istate->cache_nr)
+		BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" >= %u)",
+		    (uintmax_t)pos, istate->cache_nr);
+
+	ce = istate->cache[pos];
 	ce->ce_flags &= ~CE_FSMONITOR_VALID;
 }
 
+static int fsmonitor_hook_version(void)
+{
+	int hook_version;
+
+	if (git_config_get_int("core.fsmonitorhookversion", &hook_version))
+		return -1;
+
+	if (hook_version == HOOK_INTERFACE_VERSION1 ||
+	    hook_version == HOOK_INTERFACE_VERSION2)
+		return hook_version;
+
+	warning("Invalid hook version '%i' in core.fsmonitorhookversion. "
+		"Must be 1 or 2.", hook_version);
+	return -1;
+}
+
 int read_fsmonitor_extension(struct index_state *istate, const void *data,
 	unsigned long sz)
 {
@@ -27,17 +50,26 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data,
 	uint32_t ewah_size;
 	struct ewah_bitmap *fsmonitor_dirty;
 	int ret;
+	uint64_t timestamp;
+	struct strbuf last_update = STRBUF_INIT;
 
-	if (sz < sizeof(uint32_t) + sizeof(uint64_t) + sizeof(uint32_t))
+	if (sz < sizeof(uint32_t) + 1 + sizeof(uint32_t))
 		return error("corrupt fsmonitor extension (too short)");
 
 	hdr_version = get_be32(index);
 	index += sizeof(uint32_t);
-	if (hdr_version != INDEX_EXTENSION_VERSION)
+	if (hdr_version == INDEX_EXTENSION_VERSION1) {
+		timestamp = get_be64(index);
+		strbuf_addf(&last_update, "%"PRIu64"", timestamp);
+		index += sizeof(uint64_t);
+	} else if (hdr_version == INDEX_EXTENSION_VERSION2) {
+		strbuf_addstr(&last_update, index);
+		index += last_update.len + 1;
+	} else {
 		return error("bad fsmonitor version %d", hdr_version);
+	}
 
-	istate->fsmonitor_last_update = get_be64(index);
-	index += sizeof(uint64_t);
+	istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL);
 
 	ewah_size = get_be32(index);
 	index += sizeof(uint32_t);
@@ -50,32 +82,45 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data,
 	}
 	istate->fsmonitor_dirty = fsmonitor_dirty;
 
+	if (!istate->split_index &&
+	    istate->fsmonitor_dirty->bit_size > istate->cache_nr)
+		BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
+		    (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
+
 	trace_printf_key(&trace_fsmonitor, "read fsmonitor extension successful");
 	return 0;
 }
 
 void fill_fsmonitor_bitmap(struct index_state *istate)
 {
-	unsigned int i;
+	unsigned int i, skipped = 0;
 	istate->fsmonitor_dirty = ewah_new();
-	for (i = 0; i < istate->cache_nr; i++)
-		if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID))
-			ewah_set(istate->fsmonitor_dirty, i);
+	for (i = 0; i < istate->cache_nr; i++) {
+		if (istate->cache[i]->ce_flags & CE_REMOVE)
+			skipped++;
+		else if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID))
+			ewah_set(istate->fsmonitor_dirty, i - skipped);
+	}
 }
 
 void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
 {
 	uint32_t hdr_version;
-	uint64_t tm;
 	uint32_t ewah_start;
 	uint32_t ewah_size = 0;
 	int fixup = 0;
 
-	put_be32(&hdr_version, INDEX_EXTENSION_VERSION);
+	if (!istate->split_index &&
+	    istate->fsmonitor_dirty->bit_size > istate->cache_nr)
+		BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
+		    (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
+
+	put_be32(&hdr_version, INDEX_EXTENSION_VERSION2);
 	strbuf_add(sb, &hdr_version, sizeof(uint32_t));
 
-	put_be64(&tm, istate->fsmonitor_last_update);
-	strbuf_add(sb, &tm, sizeof(uint64_t));
+	strbuf_addstr(sb, istate->fsmonitor_last_update);
+	strbuf_addch(sb, 0); /* Want to keep a NUL */
+
 	fixup = sb->len;
 	strbuf_add(sb, &ewah_size, sizeof(uint32_t)); /* we'll fix this up later */
 
@@ -92,9 +137,9 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
 }
 
 /*
- * Call the query-fsmonitor hook passing the time of the last saved results.
+ * Call the query-fsmonitor hook passing the last update token of the saved results.
  */
-static int query_fsmonitor(int version, uint64_t last_update, struct strbuf *query_result)
+static int query_fsmonitor(int version, const char *last_update, struct strbuf *query_result)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 
@@ -103,7 +148,7 @@ static int query_fsmonitor(int version, uint64_t last_update, struct strbuf *que
 
 	argv_array_push(&cp.args, core_fsmonitor);
 	argv_array_pushf(&cp.args, "%d", version);
-	argv_array_pushf(&cp.args, "%" PRIuMAX, (uintmax_t)last_update);
+	argv_array_pushf(&cp.args, "%s", last_update);
 	cp.use_shell = 1;
 	cp.dir = get_git_work_tree();
 
@@ -130,14 +175,18 @@ static void fsmonitor_refresh_callback(struct index_state *istate, const char *n
 void refresh_fsmonitor(struct index_state *istate)
 {
 	struct strbuf query_result = STRBUF_INIT;
-	int query_success = 0;
-	size_t bol; /* beginning of line */
+	int query_success = 0, hook_version = -1;
+	size_t bol = 0; /* beginning of line */
 	uint64_t last_update;
+	struct strbuf last_update_token = STRBUF_INIT;
 	char *buf;
 	unsigned int i;
 
 	if (!core_fsmonitor || istate->fsmonitor_has_run_once)
 		return;
+
+	hook_version = fsmonitor_hook_version();
+
 	istate->fsmonitor_has_run_once = 1;
 
 	trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
@@ -146,26 +195,60 @@ void refresh_fsmonitor(struct index_state *istate)
 	 * should be inclusive to ensure we don't miss potential changes.
 	 */
 	last_update = getnanotime();
+	if (hook_version == HOOK_INTERFACE_VERSION1)
+		strbuf_addf(&last_update_token, "%"PRIu64"", last_update);
 
 	/*
-	 * If we have a last update time, call query_fsmonitor for the set of
-	 * changes since that time, else assume everything is possibly dirty
+	 * If we have a last update token, call query_fsmonitor for the set of
+	 * changes since that token, else assume everything is possibly dirty
 	 * and check it all.
 	 */
 	if (istate->fsmonitor_last_update) {
-		query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION,
-			istate->fsmonitor_last_update, &query_result);
+		if (hook_version == -1 || hook_version == HOOK_INTERFACE_VERSION2) {
+			query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION2,
+				istate->fsmonitor_last_update, &query_result);
+
+			if (query_success) {
+				if (hook_version < 0)
+					hook_version = HOOK_INTERFACE_VERSION2;
+
+				/*
+				 * First entry will be the last update token
+				 * Need to use a char * variable because static
+				 * analysis was suggesting to use strbuf_addbuf
+				 * but we don't want to copy the entire strbuf
+				 * only the the chars up to the first NUL
+				 */
+				buf = query_result.buf;
+				strbuf_addstr(&last_update_token, buf);
+				if (!last_update_token.len) {
+					warning("Empty last update token.");
+					query_success = 0;
+				} else {
+					bol = last_update_token.len + 1;
+				}
+			} else if (hook_version < 0) {
+				hook_version = HOOK_INTERFACE_VERSION1;
+				if (!last_update_token.len)
+					strbuf_addf(&last_update_token, "%"PRIu64"", last_update);
+			}
+		}
+
+		if (hook_version == HOOK_INTERFACE_VERSION1) {
+			query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION1,
+				istate->fsmonitor_last_update, &query_result);
+		}
+
 		trace_performance_since(last_update, "fsmonitor process '%s'", core_fsmonitor);
 		trace_printf_key(&trace_fsmonitor, "fsmonitor process '%s' returned %s",
 			core_fsmonitor, query_success ? "success" : "failure");
 	}
 
 	/* a fsmonitor process can return '/' to indicate all entries are invalid */
-	if (query_success && query_result.buf[0] != '/') {
+	if (query_success && query_result.buf[bol] != '/') {
 		/* Mark all entries returned by the monitor as dirty */
 		buf = query_result.buf;
-		bol = 0;
-		for (i = 0; i < query_result.len; i++) {
+		for (i = bol; i < query_result.len; i++) {
 			if (buf[i] != '\0')
 				continue;
 			fsmonitor_refresh_callback(istate, buf + bol);
@@ -173,31 +256,47 @@ void refresh_fsmonitor(struct index_state *istate)
 		}
 		if (bol < query_result.len)
 			fsmonitor_refresh_callback(istate, buf + bol);
+
+		/* Now mark the untracked cache for fsmonitor usage */
+		if (istate->untracked)
+			istate->untracked->use_fsmonitor = 1;
 	} else {
+
+		/* We only want to run the post index changed hook if we've actually changed entries, so keep track
+		 * if we actually changed entries or not */
+		int is_cache_changed = 0;
 		/* Mark all entries invalid */
-		for (i = 0; i < istate->cache_nr; i++)
-			istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+		for (i = 0; i < istate->cache_nr; i++) {
+			if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) {
+				is_cache_changed = 1;
+				istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+			}
+		}
 
 		/* If we're going to check every file, ensure we save the results */
-		istate->cache_changed |= FSMONITOR_CHANGED;
+		if (is_cache_changed)
+			istate->cache_changed |= FSMONITOR_CHANGED;
 
 		if (istate->untracked)
 			istate->untracked->use_fsmonitor = 0;
 	}
 	strbuf_release(&query_result);
 
-	/* Now that we've updated istate, save the last_update time */
-	istate->fsmonitor_last_update = last_update;
+	/* Now that we've updated istate, save the last_update_token */
+	FREE_AND_NULL(istate->fsmonitor_last_update);
+	istate->fsmonitor_last_update = strbuf_detach(&last_update_token, NULL);
 }
 
 void add_fsmonitor(struct index_state *istate)
 {
 	unsigned int i;
+	struct strbuf last_update = STRBUF_INIT;
 
 	if (!istate->fsmonitor_last_update) {
 		trace_printf_key(&trace_fsmonitor, "add fsmonitor");
 		istate->cache_changed |= FSMONITOR_CHANGED;
-		istate->fsmonitor_last_update = getnanotime();
+		strbuf_addf(&last_update, "%"PRIu64"", getnanotime());
+		istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL);
 
 		/* reset the fsmonitor state */
 		for (i = 0; i < istate->cache_nr; i++)
@@ -219,7 +318,7 @@ void remove_fsmonitor(struct index_state *istate)
 	if (istate->fsmonitor_last_update) {
 		trace_printf_key(&trace_fsmonitor, "remove fsmonitor");
 		istate->cache_changed |= FSMONITOR_CHANGED;
-		istate->fsmonitor_last_update = 0;
+		FREE_AND_NULL(istate->fsmonitor_last_update);
 	}
 }
 
@@ -236,11 +335,12 @@ void tweak_fsmonitor(struct index_state *istate)
 			}
 
 			/* Mark all previously saved entries as dirty */
+			if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
+				BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
+				    (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
 			ewah_each_bit(istate->fsmonitor_dirty, fsmonitor_ewah_callback, istate);
 
-			/* Now mark the untracked cache for fsmonitor usage */
-			if (istate->untracked)
-				istate->untracked->use_fsmonitor = 1;
+			refresh_fsmonitor(istate);
 		}
 
 		ewah_free(istate->fsmonitor_dirty);
diff --git a/third_party/git/git-add--interactive.perl b/third_party/git/git-add--interactive.perl
index c20ae9e2102b..10fd30ae16a3 100755
--- a/third_party/git/git-add--interactive.perl
+++ b/third_party/git/git-add--interactive.perl
@@ -177,7 +177,9 @@ sub run_cmd_pipe {
 	} else {
 		my $fh = undef;
 		open($fh, '-|', @_) or die;
-		return <$fh>;
+		my @out = <$fh>;
+		close $fh || die "Cannot close @_ ($!)";
+		return @out;
 	}
 }
 
@@ -224,7 +226,7 @@ my $status_head = sprintf($status_fmt, __('staged'), __('unstaged'), __('path'))
 	sub get_empty_tree {
 		return $empty_tree if defined $empty_tree;
 
-		$empty_tree = run_cmd_pipe(qw(git hash-object -t tree /dev/null));
+		($empty_tree) = run_cmd_pipe(qw(git hash-object -t tree /dev/null));
 		chomp $empty_tree;
 		return $empty_tree;
 	}
@@ -1127,7 +1129,7 @@ aborted and the hunk is left unchanged.
 EOF2
 	close $fh;
 
-	chomp(my $editor = run_cmd_pipe(qw(git var GIT_EDITOR)));
+	chomp(my ($editor) = run_cmd_pipe(qw(git var GIT_EDITOR)));
 	system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
 
 	if ($? != 0) {
@@ -1541,7 +1543,7 @@ sub patch_update_file {
 		for (@{$hunk[$ix]{DISPLAY}}) {
 			print;
 		}
-		print colored $prompt_color,
+		print colored $prompt_color, "(", ($ix+1), "/$num) ",
 			sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other);
 
 		my $line = prompt_single_character;
diff --git a/third_party/git/git-compat-util.h b/third_party/git/git-compat-util.h
index 83be89de0aac..aed0b5d4f902 100644
--- a/third_party/git/git-compat-util.h
+++ b/third_party/git/git-compat-util.h
@@ -77,7 +77,7 @@
 #endif
 /*
  * ARRAY_SIZE - get the number of elements in a visible array
- *  <at> x: the array whose size you want.
+ * @x: the array whose size you want.
  *
  * This does not work on pointers, or arrays declared as [], or
  * function parameters.  With correct compiler support, such usage
@@ -320,30 +320,11 @@ char *gitdirname(char *);
 #define PATH_MAX 4096
 #endif
 
-#ifndef PRIuMAX
-#define PRIuMAX "llu"
-#endif
-
-#ifndef SCNuMAX
-#define SCNuMAX PRIuMAX
-#endif
-
-#ifndef PRIu32
-#define PRIu32 "u"
-#endif
-
-#ifndef PRIx32
-#define PRIx32 "x"
-#endif
-
-#ifndef PRIo32
-#define PRIo32 "o"
-#endif
-
 typedef uintmax_t timestamp_t;
 #define PRItime PRIuMAX
 #define parse_timestamp strtoumax
 #define TIME_MAX UINTMAX_MAX
+#define TIME_MIN 0
 
 #ifndef PATH_SEP
 #define PATH_SEP ':'
@@ -396,6 +377,10 @@ static inline int git_offset_1st_component(const char *path)
 #define offset_1st_component git_offset_1st_component
 #endif
 
+#ifndef is_valid_path
+#define is_valid_path(path) 1
+#endif
+
 #ifndef find_last_dir_sep
 static inline char *git_find_last_dir_sep(const char *path)
 {
@@ -818,9 +803,6 @@ const char *inet_ntop(int af, const void *src, char *dst, size_t size);
 int git_atexit(void (*handler)(void));
 #endif
 
-typedef void (*try_to_free_t)(size_t);
-try_to_free_t set_try_to_free_routine(try_to_free_t);
-
 static inline size_t st_add(size_t a, size_t b)
 {
 	if (unsigned_add_overflows(a, b))
@@ -1094,10 +1076,10 @@ static inline int strtol_i(char const *s, int base, int *result)
 	return 0;
 }
 
+void git_stable_qsort(void *base, size_t nmemb, size_t size,
+		      int(*compar)(const void *, const void *));
 #ifdef INTERNAL_QSORT
-void git_qsort(void *base, size_t nmemb, size_t size,
-	       int(*compar)(const void *, const void *));
-#define qsort git_qsort
+#define qsort git_stable_qsort
 #endif
 
 #define QSORT(base, n, compar) sane_qsort((base), (n), sizeof(*(base)), compar)
@@ -1108,6 +1090,9 @@ static inline void sane_qsort(void *base, size_t nmemb, size_t size,
 		qsort(base, nmemb, size, compar);
 }
 
+#define STABLE_QSORT(base, n, compar) \
+	git_stable_qsort((base), (n), sizeof(*(base)), compar)
+
 #ifndef HAVE_ISO_QSORT_S
 int git_qsort_s(void *base, size_t nmemb, size_t size,
 		int (*compar)(const void *, const void *, void *), void *ctx);
@@ -1312,4 +1297,42 @@ void unleak_memory(const void *ptr, size_t len);
  */
 #include "banned.h"
 
+/*
+ * container_of - Get the address of an object containing a field.
+ *
+ * @ptr: pointer to the field.
+ * @type: type of the object.
+ * @member: name of the field within the object.
+ */
+#define container_of(ptr, type, member) \
+	((type *) ((char *)(ptr) - offsetof(type, member)))
+
+/*
+ * helper function for `container_of_or_null' to avoid multiple
+ * evaluation of @ptr
+ */
+static inline void *container_of_or_null_offset(void *ptr, size_t offset)
+{
+	return ptr ? (char *)ptr - offset : NULL;
+}
+
+/*
+ * like `container_of', but allows returned value to be NULL
+ */
+#define container_of_or_null(ptr, type, member) \
+	(type *)container_of_or_null_offset(ptr, offsetof(type, member))
+
+/*
+ * like offsetof(), but takes a pointer to a a variable of type which
+ * contains @member, instead of a specified type.
+ * @ptr is subject to multiple evaluation since we can't rely on __typeof__
+ * everywhere.
+ */
+#if defined(__GNUC__) /* clang sets this, too */
+#define OFFSETOF_VAR(ptr, member) offsetof(__typeof__(*ptr), member)
+#else /* !__GNUC__ */
+#define OFFSETOF_VAR(ptr, member) \
+	((uintptr_t)&(ptr)->member - (uintptr_t)(ptr))
+#endif /* !__GNUC__ */
+
 #endif
diff --git a/third_party/git/git-cvsimport.perl b/third_party/git/git-cvsimport.perl
index b31613cb8aa8..1057f389d3b2 100755
--- a/third_party/git/git-cvsimport.perl
+++ b/third_party/git/git-cvsimport.perl
@@ -600,7 +600,7 @@ my $cvs = CVSconn->new($opt_d, $cvs_tree);
 sub pdate($) {
 	my ($d) = @_;
 	m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
-		or die "Unparseable date: $d\n";
+		or die "Unparsable date: $d\n";
 	my $y=$1;
 	$y+=100 if $y<70;
 	$y+=1900 if $y<1000;
diff --git a/third_party/git/git-filter-branch.sh b/third_party/git/git-filter-branch.sh
index 5c5afa2b985e..fea796461721 100755
--- a/third_party/git/git-filter-branch.sh
+++ b/third_party/git/git-filter-branch.sh
@@ -83,6 +83,20 @@ set_ident () {
 	finish_ident COMMITTER
 }
 
+if test -z "$FILTER_BRANCH_SQUELCH_WARNING$GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS"
+then
+	cat <<EOF
+WARNING: git-filter-branch has a glut of gotchas generating mangled history
+	 rewrites.  Hit Ctrl-C before proceeding to abort, then use an
+	 alternative filtering tool such as 'git filter-repo'
+	 (https://github.com/newren/git-filter-repo/) instead.  See the
+	 filter-branch manual page for more details; to squelch this warning,
+	 set FILTER_BRANCH_SQUELCH_WARNING=1.
+EOF
+	sleep 10
+	printf "Proceeding with filter-branch...\n\n"
+fi
+
 USAGE="[--setup <command>] [--subdirectory-filter <directory>] [--env-filter <command>]
 	[--tree-filter <command>] [--index-filter <command>]
 	[--parent-filter <command>] [--msg-filter <command>]
diff --git a/third_party/git/git-gui/README.md b/third_party/git/git-gui/README.md
new file mode 100644
index 000000000000..5ce2122fbc61
--- /dev/null
+++ b/third_party/git/git-gui/README.md
@@ -0,0 +1,174 @@
+# Git GUI - A graphical user interface for Git
+
+Git GUI allows you to use the [Git source control management
+tools](https://git-scm.com/) via a GUI. This includes staging, committing,
+adding, pushing, etc. It can also be used as a blame viewer, a tree browser,
+and a citool (make exactly one commit before exiting and returning to shell).
+More details about Git GUI can be found in its manual page by either running
+`man git-gui`, or by visiting the [online manual
+page](https://git-scm.com/docs/git-gui).
+
+Git GUI was initially written by Shawn O. Pearce, and is distributed with the
+standard Git installation.
+
+# Building and installing
+
+You need to have the following dependencies installed before you begin:
+
+- Git
+- Tcl
+- Tk
+- wish
+- Gitk (needed for browsing history)
+- msgfmt
+
+Most of Git GUI is written in Tcl, so there is no compilation involved. Still,
+some things do need to be done (mostly some substitutions), so you do need to
+"build" it.
+
+You can build Git GUI using:
+
+```
+make
+```
+
+And then install it using:
+
+```
+make install
+```
+
+You probably need to have root/admin permissions to install.
+
+# Contributing
+
+The project is currently maintained by Pratyush Yadav over at
+https://github.com/prati0100/git-gui. Even though the project is hosted at
+GitHub, the development does not happen over GitHub Issues and Pull Requests.
+Instead, an email based workflow is used. The Git mailing list
+[git@vger.kernel.org](mailto:git@vger.kernel.org) is where the patches are
+discussed and reviewed.
+
+More information about the Git mailing list and instructions to subscribe can
+be found [here](https://git.wiki.kernel.org/index.php/GitCommunity).
+
+## Sending your changes
+
+Since the development happens over email, you need to send in your commits in
+text format. Commits can be converted to emails via the two tools provided by
+Git: `git-send-email` and `git-format-patch`.
+
+You can use `git-format-patch` to generate patches in mbox format from your
+commits that can then be sent via email. Let's say you are working on a branch
+called 'foo' that was created on top of 'master'. You can run:
+
+```
+git format-patch -o output_dir master..foo
+```
+
+to convert all the extra commits in 'foo' into a set of patches saved in the
+folder `output_dir`.
+
+If you are sending multiple patches, it is recommended to include a cover
+letter. A cover letter is an email explaining in brief what the series is
+supposed to do. A cover letter template can be generated by passing
+`--cover-letter` to `git-format-patch`.
+
+After you send your patches, you might get a review suggesting some changes.
+Make those changes, and re-send your patch(es) in reply to the first patch of
+your initial version. Also please mention the version of the patch. This can be
+done by passing `-v X` to `git-format-patch`, where 'X' is the version number
+of the patch(es).
+
+### Using git-send-email
+
+You can use `git-send-email` to send patches generated via `git-format-patch`.
+While you can directly send patches via `git-send-email`, it is recommended
+that you first use `git-format-patch` to generate the emails, audit them, and
+then send them via `git-send-email`.
+
+A pretty good guide to configuring and using `git-send-email` can be found
+[here](https://www.freedesktop.org/wiki/Software/PulseAudio/HowToUseGitSendEmail/)
+
+### Using your email client
+
+If your email client supports sending mbox format emails, you can use
+`git-format-patch` to get an mbox file for each commit, and then send them. If
+there is more than one patch in the series, then all patches after the first
+patch (or the cover letter) need to be sent as replies to the first.
+`git-send-email` does this by default.
+
+### Using GitGitGadget
+
+Since some people prefer a GitHub pull request based workflow, they can use
+[GitGitGadget](https://gitgitgadget.github.io/) to send in patches. The tool
+was originally written for sending patches to the Git project, but it now also
+supports sending patches for git-gui.
+
+Instructions for using GitGitGadget to send git-gui patches, courtesy of
+Johannes Schindelin:
+
+If you don't already have a fork of the [git/git](https://github.com/git/git)
+repo, you need to make one. Then clone your fork:
+
+```
+git clone https://github.com/<your-username>/git
+```
+
+Then add GitGitGadget as a remote:
+
+```
+git remote add gitgitgadget https://github.com/gitgitgadget/git
+```
+
+Then fetch the git-gui branch:
+
+```
+git fetch gitgitgadget git-gui/master
+```
+
+Then create a new branch based on git-gui/master:
+
+```
+git checkout -b <your-branch-name> git-gui/master
+```
+
+Make whatever commits you need to, push them to your fork, and then head over
+to https://github.com/gitgitgadget/git/pulls and open a Pull Request targeting
+git-gui/master.
+
+GitGitGadget will welcome you with a (hopefully) helpful message.
+
+## Signing off
+
+You need to sign off your commits before sending them to the list. You can do
+that by passing the `-s` option to `git-commit`. You can also use the "Sign
+Off" option in Git GUI.
+
+A sign-off is a simple 'Signed-off-by: A U Thor \<author@example.com\>' line at
+the end of the commit message, after your explanation of the commit.
+
+A sign-off means that you are legally allowed to send the code, and it serves
+as a certificate of origin. More information can be found at
+[developercertificate.org](https://developercertificate.org/).
+
+## Responding to review comments
+
+It is quite likely your patches will get review comments. Those comments are
+sent on the Git mailing list as replies to your patch, and you will usually be
+Cc'ed in those replies.
+
+You are expected to respond by either explaining your code further to convince
+the reviewer what you are doing is correct, or acknowledge the comments and
+re-send the patches with those comments addressed.
+
+Some tips for those not familiar with communication on a mailing list:
+
+- Use only plain text emails. No HTML at all.
+- Wrap lines at around 75 characters.
+- Do not send attachments. If you do need to send some files, consider using a
+  hosting service, and paste the link in your email.
+- Do not [top post](http://www.idallen.com/topposting.html).
+- Always "reply all". Keep all correspondents and the list in Cc. If you reply
+  directly to a reviewer, and not Cc the list, other people would not be able
+  to chime in.
diff --git a/third_party/git/git-gui/git-gui--askpass b/third_party/git/git-gui/git-gui--askpass
index 4277f30c4116..1c99ee8ca20d 100755
--- a/third_party/git/git-gui/git-gui--askpass
+++ b/third_party/git/git-gui/git-gui--askpass
@@ -56,6 +56,11 @@ proc finish {} {
 		}
 	}
 
+	# On Windows, force the encoding to UTF-8: it is what `git.exe` expects
+	if {$::tcl_platform(platform) eq {windows}} {
+		set ::answer [encoding convertto utf-8 $::answer]
+	}
+
 	puts $::answer
 	set ::rc 0
 }
diff --git a/third_party/git/git-gui/git-gui.sh b/third_party/git/git-gui/git-gui.sh
index 6de74ce639ce..4610e4ca72a8 100755
--- a/third_party/git/git-gui/git-gui.sh
+++ b/third_party/git/git-gui/git-gui.sh
@@ -30,8 +30,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.}]
 ##
 ## Tcl/Tk sanity check
 
-if {[catch {package require Tcl 8.4} err]
- || [catch {package require Tk  8.4} err]
+if {[catch {package require Tcl 8.5} err]
+ || [catch {package require Tk  8.5} err]
 } {
 	catch {wm withdraw .}
 	tk_messageBox \
@@ -684,6 +684,7 @@ proc load_current_branch {} {
 	global current_branch is_detached
 
 	set fd [open [gitdir HEAD] r]
+	fconfigure $fd -translation binary -encoding utf-8
 	if {[gets $fd ref] < 1} {
 		set ref {}
 	}
@@ -1340,6 +1341,7 @@ set HEAD {}
 set PARENT {}
 set MERGE_HEAD [list]
 set commit_type {}
+set commit_type_is_amend 0
 set empty_tree {}
 set current_branch {}
 set is_detached 0
@@ -1347,8 +1349,9 @@ set current_diff_path {}
 set is_3way_diff 0
 set is_submodule_diff 0
 set is_conflict_diff 0
-set selected_commit_type new
 set diff_empty_count 0
+set last_revert {}
+set last_revert_enc {}
 
 set nullid "0000000000000000000000000000000000000000"
 set nullid2 "0000000000000000000000000000000000000001"
@@ -1434,7 +1437,7 @@ proc PARENT {} {
 }
 
 proc force_amend {} {
-	global selected_commit_type
+	global commit_type_is_amend
 	global HEAD PARENT MERGE_HEAD commit_type
 
 	repository_state newType newHEAD newMERGE_HEAD
@@ -1443,7 +1446,7 @@ proc force_amend {} {
 	set MERGE_HEAD $newMERGE_HEAD
 	set commit_type $newType
 
-	set selected_commit_type amend
+	set commit_type_is_amend 1
 	do_select_commit_type
 }
 
@@ -1795,10 +1798,10 @@ proc ui_status {msg} {
 	}
 }
 
-proc ui_ready {{test {}}} {
+proc ui_ready {} {
 	global main_status
 	if {[info exists main_status]} {
-		$main_status show [mc "Ready."] $test
+		$main_status show [mc "Ready."]
 	}
 }
 
@@ -2148,8 +2151,6 @@ proc incr_font_size {font {amt 1}} {
 ##
 ## ui commands
 
-set starting_gitk_msg [mc "Starting gitk... please wait..."]
-
 proc do_gitk {revs {is_submodule false}} {
 	global current_diff_path file_states current_diff_side ui_index
 	global _gitdir _gitworktree
@@ -2204,9 +2205,12 @@ proc do_gitk {revs {is_submodule false}} {
 		set env(GIT_WORK_TREE) $_gitworktree
 		cd $pwd
 
-		ui_status $::starting_gitk_msg
-		after 10000 {
-			ui_ready $starting_gitk_msg
+		if {[info exists main_status]} {
+			set status_operation [$::main_status \
+				start \
+				[mc "Starting %s... please wait..." "gitk"]]
+
+			after 3500 [list $status_operation stop]
 		}
 	}
 }
@@ -2238,16 +2242,16 @@ proc do_git_gui {} {
 		set env(GIT_WORK_TREE) $_gitworktree
 		cd $pwd
 
-		ui_status $::starting_gitk_msg
-		after 10000 {
-			ui_ready $starting_gitk_msg
-		}
+		set status_operation [$::main_status \
+			start \
+			[mc "Starting %s... please wait..." "git-gui"]]
+
+		after 3500 [list $status_operation stop]
 	}
 }
 
-proc do_explore {} {
-	global _gitworktree
-	set explorer {}
+# Get the system-specific explorer app/command.
+proc get_explorer {} {
 	if {[is_Cygwin] || [is_Windows]} {
 		set explorer "explorer.exe"
 	} elseif {[is_MacOSX]} {
@@ -2256,9 +2260,23 @@ proc do_explore {} {
 		# freedesktop.org-conforming system is our best shot
 		set explorer "xdg-open"
 	}
+	return $explorer
+}
+
+proc do_explore {} {
+	global _gitworktree
+	set explorer [get_explorer]
 	eval exec $explorer [list [file nativename $_gitworktree]] &
 }
 
+# Open file relative to the working tree by the default associated app.
+proc do_file_open {file} {
+	global _gitworktree
+	set explorer [get_explorer]
+	set full_file_path [file join $_gitworktree $file]
+	exec $explorer [file nativename $full_file_path] &
+}
+
 set is_quitting 0
 set ret_code    1
 
@@ -2494,7 +2512,7 @@ proc force_first_diff {after} {
 
 proc toggle_or_diff {mode w args} {
 	global file_states file_lists current_diff_path ui_index ui_workdir
-	global last_clicked selected_paths
+	global last_clicked selected_paths file_lists_last_clicked
 
 	if {$mode eq "click"} {
 		foreach {x y} $args break
@@ -2551,6 +2569,8 @@ proc toggle_or_diff {mode w args} {
 	$ui_index tag remove in_sel 0.0 end
 	$ui_workdir tag remove in_sel 0.0 end
 
+	set file_lists_last_clicked($w) $path
+
 	# Determine the state of the file
 	if {[info exists file_states($path)]} {
 		set state [lindex $file_states($path) 0]
@@ -2664,6 +2684,32 @@ proc show_less_context {} {
 	}
 }
 
+proc focus_widget {widget} {
+	global file_lists last_clicked selected_paths
+	global file_lists_last_clicked
+
+	if {[llength $file_lists($widget)] > 0} {
+		set path $file_lists_last_clicked($widget)
+		set index [lsearch -sorted -exact $file_lists($widget) $path]
+		if {$index < 0} {
+			set index 0
+			set path [lindex $file_lists($widget) $index]
+		}
+
+		focus $widget
+		set last_clicked [list $widget [expr $index + 1]]
+		array unset selected_paths
+		set selected_paths($path) 1
+		show_diff $path $widget
+	}
+}
+
+proc toggle_commit_type {} {
+	global commit_type_is_amend
+	set commit_type_is_amend [expr !$commit_type_is_amend]
+	do_select_commit_type
+}
+
 ######################################################################
 ##
 ## ui construction
@@ -2706,10 +2752,18 @@ if {![is_bare]} {
 }
 
 if {[is_Windows]} {
+	# Use /git-bash.exe if available
+	set normalized [file normalize $::argv0]
+	regsub "/mingw../libexec/git-core/git-gui$" \
+		$normalized "/git-bash.exe" cmdLine
+	if {$cmdLine != $normalized && [file exists $cmdLine]} {
+		set cmdLine [list "Git Bash" $cmdLine &]
+	} else {
+		set cmdLine [list "Git Bash" bash --login -l &]
+	}
 	.mbar.repository add command \
 		-label [mc "Git Bash"] \
-		-command {eval exec [auto_execok start] \
-					  [list "Git Bash" bash --login -l &]}
+		-command {eval exec [auto_execok start] $cmdLine}
 }
 
 if {[is_Windows] || ![is_bare]} {
@@ -2852,19 +2906,11 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 	menu .mbar.commit
 
 	if {![is_enabled nocommit]} {
-		.mbar.commit add radiobutton \
-			-label [mc "New Commit"] \
-			-command do_select_commit_type \
-			-variable selected_commit_type \
-			-value new
-		lappend disable_on_lock \
-			[list .mbar.commit entryconf [.mbar.commit index last] -state]
-
-		.mbar.commit add radiobutton \
+		.mbar.commit add checkbutton \
 			-label [mc "Amend Last Commit"] \
-			-command do_select_commit_type \
-			-variable selected_commit_type \
-			-value amend
+			-accelerator $M1T-E \
+			-variable commit_type_is_amend \
+			-command do_select_commit_type
 		lappend disable_on_lock \
 			[list .mbar.commit entryconf [.mbar.commit index last] -state]
 
@@ -3030,8 +3076,23 @@ unset doc_path doc_url
 wm protocol . WM_DELETE_WINDOW do_quit
 bind all <$M1B-Key-q> do_quit
 bind all <$M1B-Key-Q> do_quit
-bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
-bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
+
+set m1b_w_script {
+	set toplvl_win [winfo toplevel %W]
+
+	# If we are destroying the main window, we should call do_quit to take
+	# care of cleanup before exiting the program.
+	if {$toplvl_win eq "."} {
+		do_quit
+	} else {
+		destroy $toplvl_win
+	}
+}
+
+bind all <$M1B-Key-w> $m1b_w_script
+bind all <$M1B-Key-W> $m1b_w_script
+
+unset m1b_w_script
 
 set subcommand_args {}
 proc usage {} {
@@ -3337,18 +3398,10 @@ set ui_comm .vpane.lower.commarea.buffer.frame.t
 set ui_coml .vpane.lower.commarea.buffer.header.l
 
 if {![is_enabled nocommit]} {
-	${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
-		-text [mc "New Commit"] \
-		-command do_select_commit_type \
-		-variable selected_commit_type \
-		-value new
-	lappend disable_on_lock \
-		[list .vpane.lower.commarea.buffer.header.new conf -state]
-	${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
+	${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \
 		-text [mc "Amend Last Commit"] \
-		-command do_select_commit_type \
-		-variable selected_commit_type \
-		-value amend
+		-variable commit_type_is_amend \
+		-command do_select_commit_type
 	lappend disable_on_lock \
 		[list .vpane.lower.commarea.buffer.header.amend conf -state]
 }
@@ -3373,7 +3426,6 @@ pack $ui_coml -side left -fill x
 
 if {![is_enabled nocommit]} {
 	pack .vpane.lower.commarea.buffer.header.amend -side right
-	pack .vpane.lower.commarea.buffer.header.new -side right
 }
 
 textframe .vpane.lower.commarea.buffer.frame
@@ -3387,10 +3439,16 @@ ttext $ui_comm -background white -foreground black \
 	-relief sunken \
 	-width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
 	-font font_diff \
+	-xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx set} \
 	-yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set}
+${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
+	-orient horizontal \
+	-command [list $ui_comm xview]
 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
+	-orient vertical \
 	-command [list $ui_comm yview]
 
+pack .vpane.lower.commarea.buffer.frame.sbx -side bottom -fill x
 pack .vpane.lower.commarea.buffer.frame.sby -side right -fill y
 pack $ui_comm -side left -fill y
 pack .vpane.lower.commarea.buffer.header -side top -fill x
@@ -3470,9 +3528,11 @@ tlabel .vpane.lower.diff.header.file \
 	-justify left
 tlabel .vpane.lower.diff.header.path \
 	-background gold \
-	-foreground black \
+	-foreground blue \
 	-anchor w \
-	-justify left
+	-justify left \
+	-font [eval font create [font configure font_ui] -underline 1] \
+	-cursor hand2
 pack .vpane.lower.diff.header.status -side left
 pack .vpane.lower.diff.header.file -side left
 pack .vpane.lower.diff.header.path -fill x
@@ -3487,8 +3547,12 @@ $ctxm add command \
 			-type STRING \
 			-- $current_diff_path
 	}
+$ctxm add command \
+	-label [mc Open] \
+	-command {do_file_open $current_diff_path}
 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
+bind .vpane.lower.diff.header.path <Button-1> {do_file_open $current_diff_path}
 
 # -- Diff Body
 #
@@ -3547,6 +3611,9 @@ $ui_diff tag conf d_s- \
 $ui_diff tag conf d< \
 	-foreground orange \
 	-font font_diffbold
+$ui_diff tag conf d| \
+	-foreground orange \
+	-font font_diffbold
 $ui_diff tag conf d= \
 	-foreground orange \
 	-font font_diffbold
@@ -3606,16 +3673,32 @@ set ctxm .vpane.lower.diff.body.ctxm
 menu $ctxm -tearoff 0
 $ctxm add command \
 	-label [mc "Apply/Reverse Hunk"] \
-	-command {apply_hunk $cursorX $cursorY}
+	-command {apply_or_revert_hunk $cursorX $cursorY 0}
 set ui_diff_applyhunk [$ctxm index last]
 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
 $ctxm add command \
 	-label [mc "Apply/Reverse Line"] \
-	-command {apply_range_or_line $cursorX $cursorY; do_rescan}
+	-command {apply_or_revert_range_or_line $cursorX $cursorY 0; do_rescan}
 set ui_diff_applyline [$ctxm index last]
 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
 $ctxm add separator
 $ctxm add command \
+	-label [mc "Revert Hunk"] \
+	-command {apply_or_revert_hunk $cursorX $cursorY 1}
+set ui_diff_reverthunk [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_reverthunk -state]
+$ctxm add command \
+	-label [mc "Revert Line"] \
+	-command {apply_or_revert_range_or_line $cursorX $cursorY 1; do_rescan}
+set ui_diff_revertline [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_revertline -state]
+$ctxm add command \
+	-label [mc "Undo Last Revert"] \
+	-command {undo_last_revert; do_rescan}
+set ui_diff_undorevert [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_undorevert -state]
+$ctxm add separator
+$ctxm add command \
 	-label [mc "Show Less Context"] \
 	-command show_less_context
 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
@@ -3693,7 +3776,7 @@ proc has_textconv {path} {
 }
 
 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
-	global current_diff_path file_states
+	global current_diff_path file_states last_revert
 	set ::cursorX $x
 	set ::cursorY $y
 	if {[info exists file_states($current_diff_path)]} {
@@ -3707,19 +3790,28 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
 		tk_popup $ctxmsm $X $Y
 	} else {
 		set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
+		set u [mc "Undo Last Revert"]
 		if {$::ui_index eq $::current_diff_side} {
 			set l [mc "Unstage Hunk From Commit"]
+			set h [mc "Revert Hunk"]
+
 			if {$has_range} {
 				set t [mc "Unstage Lines From Commit"]
+				set r [mc "Revert Lines"]
 			} else {
 				set t [mc "Unstage Line From Commit"]
+				set r [mc "Revert Line"]
 			}
 		} else {
 			set l [mc "Stage Hunk For Commit"]
+			set h [mc "Revert Hunk"]
+
 			if {$has_range} {
 				set t [mc "Stage Lines For Commit"]
+				set r [mc "Revert Lines"]
 			} else {
 				set t [mc "Stage Line For Commit"]
+				set r [mc "Revert Line"]
 			}
 		}
 		if {$::is_3way_diff
@@ -3730,11 +3822,35 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
 			|| [string match {T?} $state]
 			|| [has_textconv $current_diff_path]} {
 			set s disabled
+			set revert_state disabled
 		} else {
 			set s normal
+
+			# Only allow reverting changes in the working tree. If
+			# the user wants to revert changes in the index, they
+			# need to unstage those first.
+			if {$::ui_workdir eq $::current_diff_side} {
+				set revert_state normal
+			} else {
+				set revert_state disabled
+			}
 		}
+
+		if {$last_revert eq {}} {
+			set undo_state disabled
+		} else {
+			set undo_state normal
+		}
+
 		$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
 		$ctxm entryconf $::ui_diff_applyline -state $s -label $t
+		$ctxm entryconf $::ui_diff_revertline -state $revert_state \
+			-label $r
+		$ctxm entryconf $::ui_diff_reverthunk -state $revert_state \
+			-label $h
+		$ctxm entryconf $::ui_diff_undorevert -state $undo_state \
+			-label $u
+
 		tk_popup $ctxm $X $Y
 	}
 }
@@ -3861,6 +3977,8 @@ bind .   <$M1B-Key-j> do_revert_selection
 bind .   <$M1B-Key-J> do_revert_selection
 bind .   <$M1B-Key-i> do_add_all
 bind .   <$M1B-Key-I> do_add_all
+bind .   <$M1B-Key-e> toggle_commit_type
+bind .   <$M1B-Key-E> toggle_commit_type
 bind .   <$M1B-Key-minus> {show_less_context;break}
 bind .   <$M1B-Key-KP_Subtract> {show_less_context;break}
 bind .   <$M1B-Key-equal> {show_more_context;break}
@@ -3877,6 +3995,14 @@ foreach i [list $ui_index $ui_workdir] {
 }
 unset i
 
+bind .   <Alt-Key-1> {focus_widget $::ui_workdir}
+bind .   <Alt-Key-2> {focus_widget $::ui_index}
+bind .   <Alt-Key-3> {focus $::ui_diff}
+bind .   <Alt-Key-4> {focus $::ui_comm}
+
+set file_lists_last_clicked($ui_index) {}
+set file_lists_last_clicked($ui_workdir) {}
+
 set file_lists($ui_index) [list]
 set file_lists($ui_workdir) [list]
 
@@ -4055,6 +4181,9 @@ if {$picked && [is_config_true gui.autoexplore]} {
 	do_explore
 }
 
+# Clear "Initializing..." status
+after 500 {$main_status show ""}
+
 # Local variables:
 # mode: tcl
 # indent-tabs-mode: t
diff --git a/third_party/git/git-gui/lib/blame.tcl b/third_party/git/git-gui/lib/blame.tcl
index a1aeb8b96e2d..62ec08366768 100644
--- a/third_party/git/git-gui/lib/blame.tcl
+++ b/third_party/git/git-gui/lib/blame.tcl
@@ -24,6 +24,7 @@ field w_cviewer  ; # pane showing commit message
 field finder     ; # find mini-dialog frame
 field gotoline   ; # line goto mini-dialog frame
 field status     ; # status mega-widget instance
+field status_operation ; # operation displayed by status mega-widget
 field old_height ; # last known height of $w.file_pane
 
 
@@ -274,6 +275,7 @@ constructor new {i_commit i_path i_jump} {
 	pack $w_cviewer -expand 1 -fill both
 
 	set status [::status_bar::new $w.status]
+	set status_operation {}
 
 	menu $w.ctxm -tearoff 0
 	$w.ctxm add command \
@@ -602,16 +604,23 @@ method _exec_blame {cur_w cur_d options cur_s} {
 	} else {
 		lappend options $commit
 	}
+
+	# We may recurse in from another call to _exec_blame and already have
+	# a status operation.
+	if {$status_operation == {}} {
+		set status_operation [$status start \
+			$cur_s \
+			[mc "lines annotated"]]
+	} else {
+		$status_operation restart $cur_s
+	}
+
 	lappend options -- $path
 	set fd [eval git_read --nice blame $options]
 	fconfigure $fd -blocking 0 -translation lf -encoding utf-8
 	fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d]
 	set current_fd $fd
 	set blame_lines 0
-
-	$status start \
-		$cur_s \
-		[mc "lines annotated"]
 }
 
 method _read_blame {fd cur_w cur_d} {
@@ -806,10 +815,11 @@ method _read_blame {fd cur_w cur_d} {
 				[mc "Loading original location annotations..."]
 		} else {
 			set current_fd {}
-			$status stop [mc "Annotation complete."]
+			$status_operation stop [mc "Annotation complete."]
+			set status_operation {}
 		}
 	} else {
-		$status update $blame_lines $total_lines
+		$status_operation update $blame_lines $total_lines
 	}
 } ifdeleted { catch {close $fd} }
 
@@ -1124,7 +1134,7 @@ method _blameparent {} {
 			set diffcmd [list diff-tree --unified=0 $cparent $cmit -- $new_path]
 		}
 		if {[catch {set fd [eval git_read $diffcmd]} err]} {
-			$status stop [mc "Unable to display parent"]
+			$status_operation stop [mc "Unable to display parent"]
 			error_popup [strcat [mc "Error loading diff:"] "\n\n$err"]
 			return
 		}
diff --git a/third_party/git/git-gui/lib/branch.tcl b/third_party/git/git-gui/lib/branch.tcl
index 777eeb79c135..8b0c4858890f 100644
--- a/third_party/git/git-gui/lib/branch.tcl
+++ b/third_party/git/git-gui/lib/branch.tcl
@@ -8,6 +8,7 @@ proc load_all_heads {} {
 	set rh_len [expr {[string length $rh] + 1}]
 	set all_heads [list]
 	set fd [git_read for-each-ref --format=%(refname) $rh]
+	fconfigure $fd -translation binary -encoding utf-8
 	while {[gets $fd line] > 0} {
 		if {!$some_heads_tracking || ![is_tracking_branch $line]} {
 			lappend all_heads [string range $line $rh_len end]
@@ -24,6 +25,7 @@ proc load_all_tags {} {
 		--sort=-taggerdate \
 		--format=%(refname) \
 		refs/tags]
+	fconfigure $fd -translation binary -encoding utf-8
 	while {[gets $fd line] > 0} {
 		if {![regsub ^refs/tags/ $line {} name]} continue
 		lappend all_tags $name
diff --git a/third_party/git/git-gui/lib/checkout_op.tcl b/third_party/git/git-gui/lib/checkout_op.tcl
index 9e7412c446f7..21ea768d8036 100644
--- a/third_party/git/git-gui/lib/checkout_op.tcl
+++ b/third_party/git/git-gui/lib/checkout_op.tcl
@@ -341,9 +341,9 @@ method _readtree {} {
 	global HEAD
 
 	set readtree_d {}
-	$::main_status start \
+	set status_bar_operation [$::main_status start \
 		[mc "Updating working directory to '%s'..." [_name $this]] \
-		[mc "files checked out"]
+		[mc "files checked out"]]
 
 	set fd [git_read --stderr read-tree \
 		-m \
@@ -354,26 +354,27 @@ method _readtree {} {
 		$new_hash \
 		]
 	fconfigure $fd -blocking 0 -translation binary
-	fileevent $fd readable [cb _readtree_wait $fd]
+	fileevent $fd readable [cb _readtree_wait $fd $status_bar_operation]
 }
 
-method _readtree_wait {fd} {
+method _readtree_wait {fd status_bar_operation} {
 	global current_branch
 
 	set buf [read $fd]
-	$::main_status update_meter $buf
+	$status_bar_operation update_meter $buf
 	append readtree_d $buf
 
 	fconfigure $fd -blocking 1
 	if {![eof $fd]} {
 		fconfigure $fd -blocking 0
+		$status_bar_operation stop
 		return
 	}
 
 	if {[catch {close $fd}]} {
 		set err $readtree_d
 		regsub {^fatal: } $err {} err
-		$::main_status stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]]
+		$status_bar_operation stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]]
 		warn_popup [strcat [mc "File level merge required."] "
 
 $err
@@ -384,12 +385,12 @@ $err
 		return
 	}
 
-	$::main_status stop
+	$status_bar_operation stop
 	_after_readtree $this
 }
 
 method _after_readtree {} {
-	global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
+	global commit_type HEAD MERGE_HEAD PARENT
 	global current_branch is_detached
 	global ui_comm
 
@@ -490,12 +491,12 @@ method _update_repo_state {} {
 	#    amend mode our file lists are accurate and we can avoid
 	#    the rescan.
 	#
-	global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
+	global commit_type_is_amend commit_type HEAD MERGE_HEAD PARENT
 	global ui_comm
 
 	unlock_index
 	set name [_name $this]
-	set selected_commit_type new
+	set commit_type_is_amend 0
 	if {[string match amend* $commit_type]} {
 		$ui_comm delete 0.0 end
 		$ui_comm edit reset
diff --git a/third_party/git/git-gui/lib/choose_repository.tcl b/third_party/git/git-gui/lib/choose_repository.tcl
index 80f5a59bbbfc..e54f3e66d8f0 100644
--- a/third_party/git/git-gui/lib/choose_repository.tcl
+++ b/third_party/git/git-gui/lib/choose_repository.tcl
@@ -9,6 +9,18 @@ field w_body      ; # Widget holding the center content
 field w_next      ; # Next button
 field w_quit      ; # Quit button
 field o_cons      ; # Console object (if active)
+
+# Status mega-widget instance during _do_clone2 (used by _copy_files and
+# _link_files). Widget is destroyed before _do_clone2 calls
+# _do_clone_checkout
+field o_status
+
+# Operation displayed by status mega-widget during _do_clone_checkout =>
+# _readtree_wait => _postcheckout_wait => _do_clone_submodules =>
+# _do_validate_submodule_cloning. The status mega-widget is a different
+# instance than that stored in $o_status in earlier operations.
+field o_status_op
+
 field w_types     ; # List of type buttons in clone
 field w_recentlist ; # Listbox containing recent repositories
 field w_localpath  ; # Entry widget bound to local_path
@@ -659,12 +671,12 @@ method _do_clone2 {} {
 
 	switch -exact -- $clone_type {
 	hardlink {
-		set o_cons [status_bar::two_line $w_body]
+		set o_status [status_bar::two_line $w_body]
 		pack $w_body -fill x -padx 10 -pady 10
 
-		$o_cons start \
+		set status_op [$o_status start \
 			[mc "Counting objects"] \
-			[mc "buckets"]
+			[mc "buckets"]]
 		update
 
 		if {[file exists [file join $objdir info alternates]]} {
@@ -689,6 +701,7 @@ method _do_clone2 {} {
 			} err]} {
 				catch {cd $pwd}
 				_clone_failed $this [mc "Unable to copy objects/info/alternates: %s" $err]
+				$status_op stop
 				return
 			}
 		}
@@ -700,7 +713,7 @@ method _do_clone2 {} {
 			-directory [file join $objdir] ??]
 		set bcnt [expr {[llength $buckets] + 2}]
 		set bcur 1
-		$o_cons update $bcur $bcnt
+		$status_op update $bcur $bcnt
 		update
 
 		file mkdir [file join .git objects pack]
@@ -708,7 +721,7 @@ method _do_clone2 {} {
 			-directory [file join $objdir pack] *] {
 			lappend tolink [file join pack $i]
 		}
-		$o_cons update [incr bcur] $bcnt
+		$status_op update [incr bcur] $bcnt
 		update
 
 		foreach i $buckets {
@@ -717,10 +730,10 @@ method _do_clone2 {} {
 				-directory [file join $objdir $i] *] {
 				lappend tolink [file join $i $j]
 			}
-			$o_cons update [incr bcur] $bcnt
+			$status_op update [incr bcur] $bcnt
 			update
 		}
-		$o_cons stop
+		$status_op stop
 
 		if {$tolink eq {}} {
 			info_popup [strcat \
@@ -747,6 +760,8 @@ method _do_clone2 {} {
 		if {!$i} return
 
 		destroy $w_body
+
+		set o_status {}
 	}
 	full {
 		set o_cons [console::embed \
@@ -781,9 +796,9 @@ method _do_clone2 {} {
 }
 
 method _copy_files {objdir tocopy} {
-	$o_cons start \
+	set status_op [$o_status start \
 		[mc "Copying objects"] \
-		[mc "KiB"]
+		[mc "KiB"]]
 	set tot 0
 	set cmp 0
 	foreach p $tocopy {
@@ -798,7 +813,7 @@ method _copy_files {objdir tocopy} {
 
 				while {![eof $f_in]} {
 					incr cmp [fcopy $f_in $f_cp -size 16384]
-					$o_cons update \
+					$status_op update \
 						[expr {$cmp / 1024}] \
 						[expr {$tot / 1024}]
 					update
@@ -808,17 +823,19 @@ method _copy_files {objdir tocopy} {
 				close $f_cp
 			} err]} {
 			_clone_failed $this [mc "Unable to copy object: %s" $err]
+			$status_op stop
 			return 0
 		}
 	}
+	$status_op stop
 	return 1
 }
 
 method _link_files {objdir tolink} {
 	set total [llength $tolink]
-	$o_cons start \
+	set status_op [$o_status start \
 		[mc "Linking objects"] \
-		[mc "objects"]
+		[mc "objects"]]
 	for {set i 0} {$i < $total} {} {
 		set p [lindex $tolink $i]
 		if {[catch {
@@ -827,15 +844,17 @@ method _link_files {objdir tolink} {
 					[file join $objdir $p]
 			} err]} {
 			_clone_failed $this [mc "Unable to hardlink object: %s" $err]
+			$status_op stop
 			return 0
 		}
 
 		incr i
 		if {$i % 5 == 0} {
-			$o_cons update $i $total
+			$status_op update $i $total
 			update
 		}
 	}
+	$status_op stop
 	return 1
 }
 
@@ -958,11 +977,26 @@ method _do_clone_checkout {HEAD} {
 		return
 	}
 
-	set o_cons [status_bar::two_line $w_body]
+	set status [status_bar::two_line $w_body]
 	pack $w_body -fill x -padx 10 -pady 10
-	$o_cons start \
+
+	# We start the status operation here.
+	#
+	# This function calls _readtree_wait as a callback.
+	#
+	# _readtree_wait in turn either calls _do_clone_submodules directly,
+	# or calls _postcheckout_wait as a callback which then calls
+	# _do_clone_submodules.
+	#
+	# _do_clone_submodules calls _do_validate_submodule_cloning.
+	#
+	# _do_validate_submodule_cloning stops the status operation.
+	#
+	# There are no other calls into this chain from other code.
+
+	set o_status_op [$status start \
 		[mc "Creating working directory"] \
-		[mc "files"]
+		[mc "files"]]
 
 	set readtree_err {}
 	set fd [git_read --stderr read-tree \
@@ -976,33 +1010,9 @@ method _do_clone_checkout {HEAD} {
 	fileevent $fd readable [cb _readtree_wait $fd]
 }
 
-method _do_validate_submodule_cloning {ok} {
-	if {$ok} {
-		$o_cons done $ok
-		set done 1
-	} else {
-		_clone_failed $this [mc "Cannot clone submodules."]
-	}
-}
-
-method _do_clone_submodules {} {
-	if {$recursive eq {true}} {
-		destroy $w_body
-		set o_cons [console::embed \
-			$w_body \
-			[mc "Cloning submodules"]]
-		pack $w_body -fill both -expand 1 -padx 10
-		$o_cons exec \
-			[list git submodule update --init --recursive] \
-			[cb _do_validate_submodule_cloning]
-	} else {
-		set done 1
-	}
-}
-
 method _readtree_wait {fd} {
 	set buf [read $fd]
-	$o_cons update_meter $buf
+	$o_status_op update_meter $buf
 	append readtree_err $buf
 
 	fconfigure $fd -blocking 1
@@ -1050,6 +1060,34 @@ method _postcheckout_wait {fd_ph} {
 	fconfigure $fd_ph -blocking 0
 }
 
+method _do_clone_submodules {} {
+	if {$recursive eq {true}} {
+		$o_status_op stop
+		set o_status_op {}
+
+		destroy $w_body
+
+		set o_cons [console::embed \
+			$w_body \
+			[mc "Cloning submodules"]]
+		pack $w_body -fill both -expand 1 -padx 10
+		$o_cons exec \
+			[list git submodule update --init --recursive] \
+			[cb _do_validate_submodule_cloning]
+	} else {
+		set done 1
+	}
+}
+
+method _do_validate_submodule_cloning {ok} {
+	if {$ok} {
+		$o_cons done $ok
+		set done 1
+	} else {
+		_clone_failed $this [mc "Cannot clone submodules."]
+	}
+}
+
 ######################################################################
 ##
 ## Open Existing Repository
diff --git a/third_party/git/git-gui/lib/chord.tcl b/third_party/git/git-gui/lib/chord.tcl
new file mode 100644
index 000000000000..e21e7d3d0b79
--- /dev/null
+++ b/third_party/git/git-gui/lib/chord.tcl
@@ -0,0 +1,158 @@
+# Simple Chord for Tcl
+#
+# A "chord" is a method with more than one entrypoint and only one body, such
+# that the body runs only once all the entrypoints have been called by
+# different asynchronous tasks. In this implementation, the chord is defined
+# dynamically for each invocation. A SimpleChord object is created, supplying
+# body script to be run when the chord is completed, and then one or more notes
+# are added to the chord. Each note can be called like a proc, and returns
+# immediately if the chord isn't yet complete. When the last remaining note is
+# called, the body runs before the note returns.
+#
+# The SimpleChord class has a constructor that takes the body script, and a
+# method add_note that returns a note object. Since the body script does not
+# run in the context of the procedure that defined it, a mechanism is provided
+# for injecting variables into the chord for use by the body script. The
+# activation of a note is idempotent; multiple calls have the same effect as
+# a simple call.
+#
+# If you are invoking asynchronous operations with chord notes as completion
+# callbacks, and there is a possibility that earlier operations could complete
+# before later ones are started, it is a good practice to create a "common"
+# note on the chord that prevents it from being complete until you're certain
+# you've added all the notes you need.
+#
+# Example:
+#
+#   # Turn off the UI while running a couple of async operations.
+#   lock_ui
+#
+#   set chord [SimpleChord::new {
+#     unlock_ui
+#     # Note: $notice here is not referenced in the calling scope
+#     if {$notice} { info_popup $notice }
+#   }
+#
+#   # Configure a note to keep the chord from completing until
+#   # all operations have been initiated.
+#   set common_note [$chord add_note]
+#
+#   # Activate notes in 'after' callbacks to other operations
+#   set newnote [$chord add_note]
+#   async_operation $args [list $newnote activate]
+#
+#   # Communicate with the chord body
+#   if {$condition} {
+#     # This sets $notice in the same context that the chord body runs in.
+#     $chord eval { set notice "Something interesting" }
+#   }
+#
+#   # Activate the common note, making the chord eligible to complete
+#   $common_note activate
+#
+# At this point, the chord will complete at some unknown point in the future.
+# The common note might have been the first note activated, or the async
+# operations might have completed synchronously and the common note is the
+# last one, completing the chord before this code finishes, or anything in
+# between. The purpose of the chord is to not have to worry about the order.
+
+# SimpleChord class:
+#   Represents a procedure that conceptually has multiple entrypoints that must
+#   all be called before the procedure executes. Each entrypoint is called a
+#   "note". The chord is only "completed" when all the notes are "activated".
+class SimpleChord {
+	field notes
+	field body
+	field is_completed
+	field eval_ns
+
+	# Constructor:
+	#   set chord [SimpleChord::new {body}]
+	#     Creates a new chord object with the specified body script. The
+	#     body script is evaluated at most once, when a note is activated
+	#     and the chord has no other non-activated notes.
+	constructor new {i_body} {
+		set notes [list]
+		set body $i_body
+		set is_completed 0
+		set eval_ns "[namespace qualifiers $this]::eval"
+		return $this
+	}
+
+	# Method:
+	#   $chord eval {script}
+	#     Runs the specified script in the same context (namespace) in which
+	#     the chord body will be evaluated. This can be used to set variable
+	#     values for the chord body to use.
+	method eval {script} {
+		namespace eval $eval_ns $script
+	}
+
+	# Method:
+	#   set note [$chord add_note]
+	#     Adds a new note to the chord, an instance of ChordNote. Raises an
+	#     error if the chord is already completed, otherwise the chord is
+	#     updated so that the new note must also be activated before the
+	#     body is evaluated.
+	method add_note {} {
+		if {$is_completed} { error "Cannot add a note to a completed chord" }
+
+		set note [ChordNote::new $this]
+
+		lappend notes $note
+
+		return $note
+	}
+
+	# This method is for internal use only and is intentionally undocumented.
+	method notify_note_activation {} {
+		if {!$is_completed} {
+			foreach note $notes {
+				if {![$note is_activated]} { return }
+			}
+
+			set is_completed 1
+
+			namespace eval $eval_ns $body
+			delete_this
+		}
+	}
+}
+
+# ChordNote class:
+#   Represents a note within a chord, providing a way to activate it. When the
+#   final note of the chord is activated (this can be any note in the chord,
+#   with all other notes already previously activated in any order), the chord's
+#   body is evaluated.
+class ChordNote {
+	field chord
+	field is_activated
+
+	# Constructor:
+	#   Instances of ChordNote are created internally by calling add_note on
+	#   SimpleChord objects.
+	constructor new {c} {
+		set chord $c
+		set is_activated 0
+		return $this
+	}
+
+	# Method:
+	#   [$note is_activated]
+	#     Returns true if this note has already been activated.
+	method is_activated {} {
+		return $is_activated
+	}
+
+	# Method:
+	#   $note activate
+	#     Activates the note, if it has not already been activated, and
+	#     completes the chord if there are no other notes awaiting
+	#     activation. Subsequent calls will have no further effect.
+	method activate {} {
+		if {!$is_activated} {
+			set is_activated 1
+			$chord notify_note_activation
+		}
+	}
+}
diff --git a/third_party/git/git-gui/lib/commit.tcl b/third_party/git/git-gui/lib/commit.tcl
index 75ea965dacd7..b516aa299069 100644
--- a/third_party/git/git-gui/lib/commit.tcl
+++ b/third_party/git/git-gui/lib/commit.tcl
@@ -333,7 +333,7 @@ proc commit_writetree {curHEAD msg_p} {
 proc commit_committree {fd_wt curHEAD msg_p} {
 	global HEAD PARENT MERGE_HEAD commit_type commit_author
 	global current_branch
-	global ui_comm selected_commit_type
+	global ui_comm commit_type_is_amend
 	global file_states selected_paths rescan_active
 	global repo_config
 	global env
@@ -467,8 +467,8 @@ A rescan will be automatically started now.
 
 	# -- Update in memory status
 	#
-	set selected_commit_type new
 	set commit_type normal
+	set commit_type_is_amend 0
 	set HEAD $cmt_id
 	set PARENT $cmt_id
 	set MERGE_HEAD [list]
diff --git a/third_party/git/git-gui/lib/console.tcl b/third_party/git/git-gui/lib/console.tcl
index 1f3248ffd113..bb6b9c889e20 100644
--- a/third_party/git/git-gui/lib/console.tcl
+++ b/third_party/git/git-gui/lib/console.tcl
@@ -203,6 +203,8 @@ method done {ok} {
 			focus $w.ok
 		}
 	}
+
+	bind $w <Key-Escape> "destroy $w;break"
 }
 
 method _sb_set {sb orient first last} {
diff --git a/third_party/git/git-gui/lib/diff.tcl b/third_party/git/git-gui/lib/diff.tcl
index 68c4a6c7366f..871ad488c2a1 100644
--- a/third_party/git/git-gui/lib/diff.tcl
+++ b/third_party/git/git-gui/lib/diff.tcl
@@ -55,7 +55,7 @@ proc reshow_diff {{after {}}} {
 
 proc force_diff_encoding {enc} {
 	global current_diff_path
-	
+
 	if {$current_diff_path ne {}} {
 		force_path_encoding $current_diff_path $enc
 		reshow_diff
@@ -270,19 +270,6 @@ proc show_other_diff {path w m cont_info} {
 	}
 }
 
-proc get_conflict_marker_size {path} {
-	set size 7
-	catch {
-		set fd_rc [eval [list git_read check-attr "conflict-marker-size" -- $path]]
-		set ret [gets $fd_rc line]
-		close $fd_rc
-		if {$ret > 0} {
-			regexp {.*: conflict-marker-size: (\d+)$} $line line size
-		}
-	}
-	return $size
-}
-
 proc start_show_diff {cont_info {add_opts {}}} {
 	global file_states file_lists
 	global is_3way_diff is_submodule_diff diff_active repo_config
@@ -298,7 +285,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
 	set is_submodule_diff 0
 	set diff_active 1
 	set current_diff_header {}
-	set conflict_size [get_conflict_marker_size $path]
+	set conflict_size [gitattr $path conflict-marker-size 7]
 
 	set cmd [list]
 	if {$w eq $ui_index} {
@@ -360,6 +347,10 @@ proc start_show_diff {cont_info {add_opts {}}} {
 	}
 
 	set ::current_diff_inheader 1
+	# Detect pre-image lines of the diff3 conflict-style. They are just
+	# '++' lines which is not bijective. Thus, we need to maintain a state
+	# across lines.
+	set ::conflict_in_pre_image 0
 	fconfigure $fd \
 		-blocking 0 \
 		-encoding [get_path_encoding $path] \
@@ -462,11 +453,23 @@ proc read_diff {fd conflict_size cont_info} {
 			{--} {set tags d_--}
 			{++} {
 				set regexp [string map [list %conflict_size $conflict_size]\
-								{^\+\+([<>=]){%conflict_size}(?: |$)}]
+								{^\+\+([<>=|]){%conflict_size}(?: |$)}]
 				if {[regexp $regexp $line _g op]} {
 					set is_conflict_diff 1
 					set line [string replace $line 0 1 {  }]
 					set tags d$op
+
+					# The ||| conflict-marker marks the start of the pre-image.
+					# All those lines are also prefixed with '++'. Thus we need
+					# to maintain this state.
+					set ::conflict_in_pre_image [expr {$op eq {|}}]
+				} elseif {$::conflict_in_pre_image} {
+					# This is a pre-image line. It is the one which both sides
+					# are based on. As it has also the '++' line start, it is
+					# normally shown as 'added'. Invert this to '--' to make
+					# it a 'removed' line.
+					set line [string replace $line 0 1 {--}]
+					set tags d_--
 				} else {
 					set tags d_++
 				}
@@ -567,24 +570,31 @@ proc read_diff {fd conflict_size cont_info} {
 	}
 }
 
-proc apply_hunk {x y} {
+proc apply_or_revert_hunk {x y revert} {
 	global current_diff_path current_diff_header current_diff_side
-	global ui_diff ui_index file_states
+	global ui_diff ui_index file_states last_revert last_revert_enc
 
 	if {$current_diff_path eq {} || $current_diff_header eq {}} return
 	if {![lock_index apply_hunk]} return
 
-	set apply_cmd {apply --cached --whitespace=nowarn}
+	set apply_cmd {apply --whitespace=nowarn}
 	set mi [lindex $file_states($current_diff_path) 0]
 	if {$current_diff_side eq $ui_index} {
 		set failed_msg [mc "Failed to unstage selected hunk."]
-		lappend apply_cmd --reverse
+		lappend apply_cmd --reverse --cached
 		if {[string index $mi 0] ne {M}} {
 			unlock_index
 			return
 		}
 	} else {
-		set failed_msg [mc "Failed to stage selected hunk."]
+		if {$revert} {
+			set failed_msg [mc "Failed to revert selected hunk."]
+			lappend apply_cmd --reverse
+		} else {
+			set failed_msg [mc "Failed to stage selected hunk."]
+			lappend apply_cmd --cached
+		}
+
 		if {[string index $mi 1] ne {M}} {
 			unlock_index
 			return
@@ -603,29 +613,40 @@ proc apply_hunk {x y} {
 		set e_lno end
 	}
 
+	set wholepatch "$current_diff_header[$ui_diff get $s_lno $e_lno]"
+
 	if {[catch {
 		set enc [get_path_encoding $current_diff_path]
 		set p [eval git_write $apply_cmd]
 		fconfigure $p -translation binary -encoding $enc
-		puts -nonewline $p $current_diff_header
-		puts -nonewline $p [$ui_diff get $s_lno $e_lno]
+		puts -nonewline $p $wholepatch
 		close $p} err]} {
 		error_popup "$failed_msg\n\n$err"
 		unlock_index
 		return
 	}
 
+	if {$revert} {
+		# Save a copy of this patch for undoing reverts.
+		set last_revert $wholepatch
+		set last_revert_enc $enc
+	}
+
 	$ui_diff conf -state normal
 	$ui_diff delete $s_lno $e_lno
 	$ui_diff conf -state disabled
 
+	# Check if the hunk was the last one in the file.
 	if {[$ui_diff get 1.0 end] eq "\n"} {
 		set o _
 	} else {
 		set o ?
 	}
 
-	if {$current_diff_side eq $ui_index} {
+	# Update the status flags.
+	if {$revert} {
+		set mi [string index $mi 0]$o
+	} elseif {$current_diff_side eq $ui_index} {
 		set mi ${o}M
 	} elseif {[string index $mi 0] eq {_}} {
 		set mi M$o
@@ -640,9 +661,9 @@ proc apply_hunk {x y} {
 	}
 }
 
-proc apply_range_or_line {x y} {
+proc apply_or_revert_range_or_line {x y revert} {
 	global current_diff_path current_diff_header current_diff_side
-	global ui_diff ui_index file_states
+	global ui_diff ui_index file_states last_revert
 
 	set selected [$ui_diff tag nextrange sel 0.0]
 
@@ -660,19 +681,27 @@ proc apply_range_or_line {x y} {
 	if {$current_diff_path eq {} || $current_diff_header eq {}} return
 	if {![lock_index apply_hunk]} return
 
-	set apply_cmd {apply --cached --whitespace=nowarn}
+	set apply_cmd {apply --whitespace=nowarn}
 	set mi [lindex $file_states($current_diff_path) 0]
 	if {$current_diff_side eq $ui_index} {
 		set failed_msg [mc "Failed to unstage selected line."]
 		set to_context {+}
-		lappend apply_cmd --reverse
+		lappend apply_cmd --reverse --cached
 		if {[string index $mi 0] ne {M}} {
 			unlock_index
 			return
 		}
 	} else {
-		set failed_msg [mc "Failed to stage selected line."]
-		set to_context {-}
+		if {$revert} {
+			set failed_msg [mc "Failed to revert selected line."]
+			set to_context {+}
+			lappend apply_cmd --reverse
+		} else {
+			set failed_msg [mc "Failed to stage selected line."]
+			set to_context {-}
+			lappend apply_cmd --cached
+		}
+
 		if {[string index $mi 1] ne {M}} {
 			unlock_index
 			return
@@ -830,7 +859,47 @@ proc apply_range_or_line {x y} {
 		puts -nonewline $p $wholepatch
 		close $p} err]} {
 		error_popup "$failed_msg\n\n$err"
+		unlock_index
+		return
+	}
+
+	if {$revert} {
+		# Save a copy of this patch for undoing reverts.
+		set last_revert $current_diff_header$wholepatch
+		set last_revert_enc $enc
+	}
+
+	unlock_index
+}
+
+# Undo the last line/hunk reverted. When hunks and lines are reverted, a copy
+# of the diff applied is saved. Re-apply that diff to undo the revert.
+#
+# Right now, we only use a single variable to hold the copy, and not a
+# stack/deque for simplicity, so multiple undos are not possible. Maybe this
+# can be added if the need for something like this is felt in the future.
+proc undo_last_revert {} {
+	global last_revert current_diff_path current_diff_header
+	global last_revert_enc
+
+	if {$last_revert eq {}} return
+	if {![lock_index apply_hunk]} return
+
+	set apply_cmd {apply --whitespace=nowarn}
+	set failed_msg [mc "Failed to undo last revert."]
+
+	if {[catch {
+		set enc $last_revert_enc
+		set p [eval git_write $apply_cmd]
+		fconfigure $p -translation binary -encoding $enc
+		puts -nonewline $p $last_revert
+		close $p} err]} {
+		error_popup "$failed_msg\n\n$err"
+		unlock_index
+		return
 	}
 
+	set last_revert {}
+
 	unlock_index
 }
diff --git a/third_party/git/git-gui/lib/index.tcl b/third_party/git/git-gui/lib/index.tcl
index b588db11d9fc..1fc5b42300d6 100644
--- a/third_party/git/git-gui/lib/index.tcl
+++ b/third_party/git/git-gui/lib/index.tcl
@@ -7,67 +7,74 @@ proc _delete_indexlock {} {
 	}
 }
 
-proc _close_updateindex {fd after} {
-	global use_ttk NS
-	fconfigure $fd -blocking 1
-	if {[catch {close $fd} err]} {
-		set w .indexfried
-		Dialog $w
-		wm withdraw $w
-		wm title $w [strcat "[appname] ([reponame]): " [mc "Index Error"]]
-		wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-		set s [mc "Updating the Git index failed.  A rescan will be automatically started to resynchronize git-gui."]
-		text $w.msg -yscrollcommand [list $w.vs set] \
-			-width [string length $s] -relief flat \
-			-borderwidth 0 -highlightthickness 0 \
-			-background [get_bg_color $w]
-		$w.msg tag configure bold -font font_uibold -justify center
-		${NS}::scrollbar $w.vs -command [list $w.msg yview]
-		$w.msg insert end $s bold \n\n$err {}
-		$w.msg configure -state disabled
-
-		${NS}::button $w.continue \
-			-text [mc "Continue"] \
-			-command [list destroy $w]
-		${NS}::button $w.unlock \
-			-text [mc "Unlock Index"] \
-			-command "destroy $w; _delete_indexlock"
-		grid $w.msg - $w.vs -sticky news
-		grid $w.unlock $w.continue - -sticky se -padx 2 -pady 2
-		grid columnconfigure $w 0 -weight 1
-		grid rowconfigure $w 0 -weight 1
-
-		wm protocol $w WM_DELETE_WINDOW update
-		bind $w.continue <Visibility> "
-			grab $w
-			focus %W
-		"
-		wm deiconify $w
-		tkwait window $w
-
-		$::main_status stop
+proc close_and_unlock_index {fd after} {
+	if {![catch {_close_updateindex $fd} err]} {
 		unlock_index
-		rescan $after 0
-		return
+		uplevel #0 $after
+	} else {
+		rescan_on_error $err $after
 	}
+}
 
-	$::main_status stop
+proc _close_updateindex {fd} {
+	fconfigure $fd -blocking 1
+	close $fd
+}
+
+proc rescan_on_error {err {after {}}} {
+	global use_ttk NS
+
+	set w .indexfried
+	Dialog $w
+	wm withdraw $w
+	wm title $w [strcat "[appname] ([reponame]): " [mc "Index Error"]]
+	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
+	set s [mc "Updating the Git index failed.  A rescan will be automatically started to resynchronize git-gui."]
+	text $w.msg -yscrollcommand [list $w.vs set] \
+		-width [string length $s] -relief flat \
+		-borderwidth 0 -highlightthickness 0 \
+		-background [get_bg_color $w]
+	$w.msg tag configure bold -font font_uibold -justify center
+	${NS}::scrollbar $w.vs -command [list $w.msg yview]
+	$w.msg insert end $s bold \n\n$err {}
+	$w.msg configure -state disabled
+
+	${NS}::button $w.continue \
+		-text [mc "Continue"] \
+		-command [list destroy $w]
+	${NS}::button $w.unlock \
+		-text [mc "Unlock Index"] \
+		-command "destroy $w; _delete_indexlock"
+	grid $w.msg - $w.vs -sticky news
+	grid $w.unlock $w.continue - -sticky se -padx 2 -pady 2
+	grid columnconfigure $w 0 -weight 1
+	grid rowconfigure $w 0 -weight 1
+
+	wm protocol $w WM_DELETE_WINDOW update
+	bind $w.continue <Visibility> "
+		grab $w
+		focus %W
+	"
+	wm deiconify $w
+	tkwait window $w
+
+	$::main_status stop_all
 	unlock_index
-	uplevel #0 $after
+	rescan [concat $after [list ui_ready]] 0
 }
 
-proc update_indexinfo {msg pathList after} {
+proc update_indexinfo {msg path_list after} {
 	global update_index_cp
 
 	if {![lock_index update]} return
 
 	set update_index_cp 0
-	set pathList [lsort $pathList]
-	set totalCnt [llength $pathList]
-	set batch [expr {int($totalCnt * .01) + 1}]
+	set path_list [lsort $path_list]
+	set total_cnt [llength $path_list]
+	set batch [expr {int($total_cnt * .01) + 1}]
 	if {$batch > 25} {set batch 25}
 
-	$::main_status start $msg [mc "files"]
+	set status_bar_operation [$::main_status start $msg [mc "files"]]
 	set fd [git_write update-index -z --index-info]
 	fconfigure $fd \
 		-blocking 0 \
@@ -78,26 +85,29 @@ proc update_indexinfo {msg pathList after} {
 	fileevent $fd writable [list \
 		write_update_indexinfo \
 		$fd \
-		$pathList \
-		$totalCnt \
+		$path_list \
+		$total_cnt \
 		$batch \
+		$status_bar_operation \
 		$after \
 		]
 }
 
-proc write_update_indexinfo {fd pathList totalCnt batch after} {
+proc write_update_indexinfo {fd path_list total_cnt batch status_bar_operation \
+	after} {
 	global update_index_cp
 	global file_states current_diff_path
 
-	if {$update_index_cp >= $totalCnt} {
-		_close_updateindex $fd $after
+	if {$update_index_cp >= $total_cnt} {
+		$status_bar_operation stop
+		close_and_unlock_index $fd $after
 		return
 	}
 
 	for {set i $batch} \
-		{$update_index_cp < $totalCnt && $i > 0} \
+		{$update_index_cp < $total_cnt && $i > 0} \
 		{incr i -1} {
-		set path [lindex $pathList $update_index_cp]
+		set path [lindex $path_list $update_index_cp]
 		incr update_index_cp
 
 		set s $file_states($path)
@@ -119,21 +129,21 @@ proc write_update_indexinfo {fd pathList totalCnt batch after} {
 		display_file $path $new
 	}
 
-	$::main_status update $update_index_cp $totalCnt
+	$status_bar_operation update $update_index_cp $total_cnt
 }
 
-proc update_index {msg pathList after} {
+proc update_index {msg path_list after} {
 	global update_index_cp
 
 	if {![lock_index update]} return
 
 	set update_index_cp 0
-	set pathList [lsort $pathList]
-	set totalCnt [llength $pathList]
-	set batch [expr {int($totalCnt * .01) + 1}]
+	set path_list [lsort $path_list]
+	set total_cnt [llength $path_list]
+	set batch [expr {int($total_cnt * .01) + 1}]
 	if {$batch > 25} {set batch 25}
 
-	$::main_status start $msg [mc "files"]
+	set status_bar_operation [$::main_status start $msg [mc "files"]]
 	set fd [git_write update-index --add --remove -z --stdin]
 	fconfigure $fd \
 		-blocking 0 \
@@ -144,26 +154,29 @@ proc update_index {msg pathList after} {
 	fileevent $fd writable [list \
 		write_update_index \
 		$fd \
-		$pathList \
-		$totalCnt \
+		$path_list \
+		$total_cnt \
 		$batch \
+		$status_bar_operation \
 		$after \
 		]
 }
 
-proc write_update_index {fd pathList totalCnt batch after} {
+proc write_update_index {fd path_list total_cnt batch status_bar_operation \
+	after} {
 	global update_index_cp
 	global file_states current_diff_path
 
-	if {$update_index_cp >= $totalCnt} {
-		_close_updateindex $fd $after
+	if {$update_index_cp >= $total_cnt} {
+		$status_bar_operation stop
+		close_and_unlock_index $fd $after
 		return
 	}
 
 	for {set i $batch} \
-		{$update_index_cp < $totalCnt && $i > 0} \
+		{$update_index_cp < $total_cnt && $i > 0} \
 		{incr i -1} {
-		set path [lindex $pathList $update_index_cp]
+		set path [lindex $path_list $update_index_cp]
 		incr update_index_cp
 
 		switch -glob -- [lindex $file_states($path) 0] {
@@ -190,21 +203,21 @@ proc write_update_index {fd pathList totalCnt batch after} {
 		display_file $path $new
 	}
 
-	$::main_status update $update_index_cp $totalCnt
+	$status_bar_operation update $update_index_cp $total_cnt
 }
 
-proc checkout_index {msg pathList after} {
+proc checkout_index {msg path_list after capture_error} {
 	global update_index_cp
 
 	if {![lock_index update]} return
 
 	set update_index_cp 0
-	set pathList [lsort $pathList]
-	set totalCnt [llength $pathList]
-	set batch [expr {int($totalCnt * .01) + 1}]
+	set path_list [lsort $path_list]
+	set total_cnt [llength $path_list]
+	set batch [expr {int($total_cnt * .01) + 1}]
 	if {$batch > 25} {set batch 25}
 
-	$::main_status start $msg [mc "files"]
+	set status_bar_operation [$::main_status start $msg [mc "files"]]
 	set fd [git_write checkout-index \
 		--index \
 		--quiet \
@@ -221,26 +234,45 @@ proc checkout_index {msg pathList after} {
 	fileevent $fd writable [list \
 		write_checkout_index \
 		$fd \
-		$pathList \
-		$totalCnt \
+		$path_list \
+		$total_cnt \
 		$batch \
+		$status_bar_operation \
 		$after \
+		$capture_error \
 		]
 }
 
-proc write_checkout_index {fd pathList totalCnt batch after} {
+proc write_checkout_index {fd path_list total_cnt batch status_bar_operation \
+	after capture_error} {
 	global update_index_cp
 	global file_states current_diff_path
 
-	if {$update_index_cp >= $totalCnt} {
-		_close_updateindex $fd $after
+	if {$update_index_cp >= $total_cnt} {
+		$status_bar_operation stop
+
+		# We do not unlock the index directly here because this
+		# operation expects to potentially run in parallel with file
+		# deletions scheduled by revert_helper. We're done with the
+		# update index, so we close it, but actually unlocking the index
+		# and dealing with potential errors is deferred to the chord
+		# body that runs when all async operations are completed.
+		#
+		# (See after_chord in revert_helper.)
+
+		if {[catch {_close_updateindex $fd} err]} {
+			uplevel #0 $capture_error [list $err]
+		}
+
+		uplevel #0 $after
+
 		return
 	}
 
 	for {set i $batch} \
-		{$update_index_cp < $totalCnt && $i > 0} \
+		{$update_index_cp < $total_cnt && $i > 0} \
 		{incr i -1} {
-		set path [lindex $pathList $update_index_cp]
+		set path [lindex $path_list $update_index_cp]
 		incr update_index_cp
 		switch -glob -- [lindex $file_states($path) 0] {
 		U? {continue}
@@ -253,7 +285,7 @@ proc write_checkout_index {fd pathList totalCnt batch after} {
 		}
 	}
 
-	$::main_status update $update_index_cp $totalCnt
+	$status_bar_operation update $update_index_cp $total_cnt
 }
 
 proc unstage_helper {txt paths} {
@@ -261,7 +293,7 @@ proc unstage_helper {txt paths} {
 
 	if {![lock_index begin-update]} return
 
-	set pathList [list]
+	set path_list [list]
 	set after {}
 	foreach path $paths {
 		switch -glob -- [lindex $file_states($path) 0] {
@@ -269,19 +301,19 @@ proc unstage_helper {txt paths} {
 		M? -
 		T? -
 		D? {
-			lappend pathList $path
+			lappend path_list $path
 			if {$path eq $current_diff_path} {
 				set after {reshow_diff;}
 			}
 		}
 		}
 	}
-	if {$pathList eq {}} {
+	if {$path_list eq {}} {
 		unlock_index
 	} else {
 		update_indexinfo \
 			$txt \
-			$pathList \
+			$path_list \
 			[concat $after [list ui_ready]]
 	}
 }
@@ -305,7 +337,7 @@ proc add_helper {txt paths} {
 
 	if {![lock_index begin-update]} return
 
-	set pathList [list]
+	set path_list [list]
 	set after {}
 	foreach path $paths {
 		switch -glob -- [lindex $file_states($path) 0] {
@@ -321,19 +353,19 @@ proc add_helper {txt paths} {
 		?M -
 		?D -
 		?T {
-			lappend pathList $path
+			lappend path_list $path
 			if {$path eq $current_diff_path} {
 				set after {reshow_diff;}
 			}
 		}
 		}
 	}
-	if {$pathList eq {}} {
+	if {$path_list eq {}} {
 		unlock_index
 	} else {
 		update_index \
 			$txt \
-			$pathList \
+			$path_list \
 			[concat $after {ui_status [mc "Ready to commit."]}]
 	}
 }
@@ -388,66 +420,303 @@ proc do_add_all {} {
 	add_helper [mc "Adding all changed files"] $paths
 }
 
+# Copied from TclLib package "lambda".
+proc lambda {arguments body args} {
+	return [list ::apply [list $arguments $body] {*}$args]
+}
+
 proc revert_helper {txt paths} {
 	global file_states current_diff_path
 
 	if {![lock_index begin-update]} return
 
-	set pathList [list]
-	set after {}
+	# Common "after" functionality that waits until multiple asynchronous
+	# operations are complete (by waiting for them to activate their notes
+	# on the chord).
+	#
+	# The asynchronous operations are each indicated below by a comment
+	# before the code block that starts the async operation.
+	set after_chord [SimpleChord::new {
+		if {[string trim $err] != ""} {
+			rescan_on_error $err
+		} else {
+			unlock_index
+			if {$should_reshow_diff} { reshow_diff }
+			ui_ready
+		}
+	}]
+
+	$after_chord eval { set should_reshow_diff 0 }
+
+	# This function captures an error for processing when after_chord is
+	# completed. (The chord is curried into the lambda function.)
+	set capture_error [lambda \
+		{chord error} \
+		{ $chord eval [list set err $error] } \
+		$after_chord]
+
+	# We don't know how many notes we're going to create (it's dynamic based
+	# on conditional paths below), so create a common note that will delay
+	# the chord's completion until we activate it, and then activate it
+	# after all the other notes have been created.
+	set after_common_note [$after_chord add_note]
+
+	set path_list [list]
+	set untracked_list [list]
+
 	foreach path $paths {
 		switch -glob -- [lindex $file_states($path) 0] {
 		U? {continue}
+		?O {
+			lappend untracked_list $path
+		}
 		?M -
 		?T -
 		?D {
-			lappend pathList $path
+			lappend path_list $path
 			if {$path eq $current_diff_path} {
-				set after {reshow_diff;}
+				$after_chord eval { set should_reshow_diff 1 }
 			}
 		}
 		}
 	}
 
+	set path_cnt [llength $path_list]
+	set untracked_cnt [llength $untracked_list]
+
+	# Asynchronous operation: revert changes by checking them out afresh
+	# from the index.
+	if {$path_cnt > 0} {
+		# Split question between singular and plural cases, because
+		# such distinction is needed in some languages. Previously, the
+		# code used "Revert changes in" for both, but that can't work
+		# in languages where 'in' must be combined with word from
+		# rest of string (in different way for both cases of course).
+		#
+		# FIXME: Unfortunately, even that isn't enough in some languages
+		# as they have quite complex plural-form rules. Unfortunately,
+		# msgcat doesn't seem to support that kind of string
+		# translation.
+		#
+		if {$path_cnt == 1} {
+			set query [mc \
+				"Revert changes in file %s?" \
+				[short_path [lindex $path_list]] \
+				]
+		} else {
+			set query [mc \
+				"Revert changes in these %i files?" \
+				$path_cnt]
+		}
 
-	# Split question between singular and plural cases, because
-	# such distinction is needed in some languages. Previously, the
-	# code used "Revert changes in" for both, but that can't work
-	# in languages where 'in' must be combined with word from
-	# rest of string (in different way for both cases of course).
-	#
-	# FIXME: Unfortunately, even that isn't enough in some languages
-	# as they have quite complex plural-form rules. Unfortunately,
-	# msgcat doesn't seem to support that kind of string translation.
-	#
-	set n [llength $pathList]
-	if {$n == 0} {
-		unlock_index
-		return
-	} elseif {$n == 1} {
-		set query [mc "Revert changes in file %s?" [short_path [lindex $pathList]]]
-	} else {
-		set query [mc "Revert changes in these %i files?" $n]
+		set reply [tk_dialog \
+			.confirm_revert \
+			"[appname] ([reponame])" \
+			"$query
+
+[mc "Any unstaged changes will be permanently lost by the revert."]" \
+			question \
+			1 \
+			[mc "Do Nothing"] \
+			[mc "Revert Changes"] \
+			]
+
+		if {$reply == 1} {
+			set note [$after_chord add_note]
+			checkout_index \
+				$txt \
+				$path_list \
+				[list $note activate] \
+				$capture_error
+		}
 	}
 
-	set reply [tk_dialog \
-		.confirm_revert \
-		"[appname] ([reponame])" \
-		"$query
+	# Asynchronous operation: Deletion of untracked files.
+	if {$untracked_cnt > 0} {
+		# Split question between singular and plural cases, because
+		# such distinction is needed in some languages.
+		#
+		# FIXME: Unfortunately, even that isn't enough in some languages
+		# as they have quite complex plural-form rules. Unfortunately,
+		# msgcat doesn't seem to support that kind of string
+		# translation.
+		#
+		if {$untracked_cnt == 1} {
+			set query [mc \
+				"Delete untracked file %s?" \
+				[short_path [lindex $untracked_list]] \
+				]
+		} else {
+			set query [mc \
+				"Delete these %i untracked files?" \
+				$untracked_cnt \
+				]
+		}
 
-[mc "Any unstaged changes will be permanently lost by the revert."]" \
-		question \
-		1 \
-		[mc "Do Nothing"] \
-		[mc "Revert Changes"] \
-		]
-	if {$reply == 1} {
-		checkout_index \
-			$txt \
-			$pathList \
-			[concat $after [list ui_ready]]
+		set reply [tk_dialog \
+			.confirm_revert \
+			"[appname] ([reponame])" \
+			"$query
+
+[mc "Files will be permanently deleted."]" \
+			question \
+			1 \
+			[mc "Do Nothing"] \
+			[mc "Delete Files"] \
+			]
+
+		if {$reply == 1} {
+			$after_chord eval { set should_reshow_diff 1 }
+
+			set note [$after_chord add_note]
+			delete_files $untracked_list [list $note activate]
+		}
+	}
+
+	# Activate the common note. If no other notes were created, this
+	# completes the chord. If other notes were created, then this common
+	# note prevents a race condition where the chord might complete early.
+	$after_common_note activate
+}
+
+# Delete all of the specified files, performing deletion in batches to allow the
+# UI to remain responsive and updated.
+proc delete_files {path_list after} {
+	# Enable progress bar status updates
+	set status_bar_operation [$::main_status \
+		start \
+		[mc "Deleting"] \
+		[mc "files"]]
+
+	set path_index 0
+	set deletion_errors [list]
+	set batch_size 50
+
+	delete_helper \
+		$path_list \
+		$path_index \
+		$deletion_errors \
+		$batch_size \
+		$status_bar_operation \
+		$after
+}
+
+# Helper function to delete a list of files in batches. Each call deletes one
+# batch of files, and then schedules a call for the next batch after any UI
+# messages have been processed.
+proc delete_helper {path_list path_index deletion_errors batch_size \
+	status_bar_operation after} {
+	global file_states
+
+	set path_cnt [llength $path_list]
+
+	set batch_remaining $batch_size
+
+	while {$batch_remaining > 0} {
+		if {$path_index >= $path_cnt} { break }
+
+		set path [lindex $path_list $path_index]
+
+		set deletion_failed [catch {file delete -- $path} deletion_error]
+
+		if {$deletion_failed} {
+			lappend deletion_errors [list "$deletion_error"]
+		} else {
+			remove_empty_directories [file dirname $path]
+
+			# Don't assume the deletion worked. Remove the file from
+			# the UI, but only if it no longer exists.
+			if {![path_exists $path]} {
+				unset file_states($path)
+				display_file $path __
+			}
+		}
+
+		incr path_index 1
+		incr batch_remaining -1
+	}
+
+	# Update the progress bar to indicate that this batch has been
+	# completed. The update will be visible when this procedure returns
+	# and allows the UI thread to process messages.
+	$status_bar_operation update $path_index $path_cnt
+
+	if {$path_index < $path_cnt} {
+		# The Tcler's Wiki lists this as the best practice for keeping
+		# a UI active and processing messages during a long-running
+		# operation.
+
+		after idle [list after 0 [list \
+			delete_helper \
+			$path_list \
+			$path_index \
+			$deletion_errors \
+			$batch_size \
+			$status_bar_operation \
+			$after
+			]]
 	} else {
-		unlock_index
+		# Finish the status bar operation.
+		$status_bar_operation stop
+
+		# Report error, if any, based on how many deletions failed.
+		set deletion_error_cnt [llength $deletion_errors]
+
+		if {($deletion_error_cnt > 0)
+		 && ($deletion_error_cnt <= [MAX_VERBOSE_FILES_IN_DELETION_ERROR])} {
+			set error_text [mc "Encountered errors deleting files:\n"]
+
+			foreach deletion_error $deletion_errors {
+				append error_text "* [lindex $deletion_error 0]\n"
+			}
+
+			error_popup $error_text
+		} elseif {$deletion_error_cnt == $path_cnt} {
+			error_popup [mc \
+				"None of the %d selected files could be deleted." \
+				$path_cnt \
+				]
+		} elseif {$deletion_error_cnt > 1} {
+			error_popup [mc \
+				"%d of the %d selected files could not be deleted." \
+				$deletion_error_cnt \
+				$path_cnt \
+				]
+		}
+
+		uplevel #0 $after
+	}
+}
+
+proc MAX_VERBOSE_FILES_IN_DELETION_ERROR {} { return 10; }
+
+# This function is from the TCL documentation:
+#
+#   https://wiki.tcl-lang.org/page/file+exists
+#
+# [file exists] returns false if the path does exist but is a symlink to a path
+# that doesn't exist. This proc returns true if the path exists, regardless of
+# whether it is a symlink and whether it is broken.
+proc path_exists {name} {
+	expr {![catch {file lstat $name finfo}]}
+}
+
+# Remove as many empty directories as we can starting at the specified path,
+# walking up the directory tree. If we encounter a directory that is not
+# empty, or if a directory deletion fails, then we stop the operation and
+# return to the caller. Even if this procedure fails to delete any
+# directories at all, it does not report failure.
+proc remove_empty_directories {directory_path} {
+	set parent_path [file dirname $directory_path]
+
+	while {$parent_path != $directory_path} {
+		set contents [glob -nocomplain -dir $directory_path *]
+
+		if {[llength $contents] > 0} { break }
+		if {[catch {file delete -- $directory_path}]} { break }
+
+		set directory_path $parent_path
+		set parent_path [file dirname $directory_path]
 	}
 }
 
@@ -466,19 +735,19 @@ proc do_revert_selection {} {
 }
 
 proc do_select_commit_type {} {
-	global commit_type selected_commit_type
+	global commit_type commit_type_is_amend
 
-	if {$selected_commit_type eq {new}
+	if {$commit_type_is_amend == 0
 		&& [string match amend* $commit_type]} {
 		create_new_commit
-	} elseif {$selected_commit_type eq {amend}
+	} elseif {$commit_type_is_amend == 1
 		&& ![string match amend* $commit_type]} {
 		load_last_commit
 
 		# The amend request was rejected...
 		#
 		if {![string match amend* $commit_type]} {
-			set selected_commit_type new
+			set commit_type_is_amend 0
 		}
 	}
 }
diff --git a/third_party/git/git-gui/lib/merge.tcl b/third_party/git/git-gui/lib/merge.tcl
index 9f253db5b37e..664803cf3fd1 100644
--- a/third_party/git/git-gui/lib/merge.tcl
+++ b/third_party/git/git-gui/lib/merge.tcl
@@ -241,23 +241,27 @@ Continue with resetting the current changes?"]
 	if {[ask_popup $op_question] eq {yes}} {
 		set fd [git_read --stderr read-tree --reset -u -v HEAD]
 		fconfigure $fd -blocking 0 -translation binary
-		fileevent $fd readable [namespace code [list _reset_wait $fd]]
-		$::main_status start [mc "Aborting"] [mc "files reset"]
+		set status_bar_operation [$::main_status \
+			start \
+			[mc "Aborting"] \
+			[mc "files reset"]]
+		fileevent $fd readable [namespace code [list \
+			_reset_wait $fd $status_bar_operation]]
 	} else {
 		unlock_index
 	}
 }
 
-proc _reset_wait {fd} {
+proc _reset_wait {fd status_bar_operation} {
 	global ui_comm
 
-	$::main_status update_meter [read $fd]
+	$status_bar_operation update_meter [read $fd]
 
 	fconfigure $fd -blocking 1
 	if {[eof $fd]} {
 		set fail [catch {close $fd} err]
-		$::main_status stop
 		unlock_index
+		$status_bar_operation stop
 
 		$ui_comm delete 0.0 end
 		$ui_comm edit modified false
diff --git a/third_party/git/git-gui/lib/status_bar.tcl b/third_party/git/git-gui/lib/status_bar.tcl
index 02111a1742f9..d32b14142ff8 100644
--- a/third_party/git/git-gui/lib/status_bar.tcl
+++ b/third_party/git/git-gui/lib/status_bar.tcl
@@ -1,16 +1,42 @@
 # git-gui status bar mega-widget
 # Copyright (C) 2007 Shawn Pearce
 
+# The status_bar class manages the entire status bar. It is possible for
+# multiple overlapping asynchronous operations to want to display status
+# simultaneously. Each one receives a status_bar_operation when it calls the
+# start method, and the status bar combines all active operations into the
+# line of text it displays. Most of the time, there will be at most one
+# ongoing operation.
+#
+# Note that the entire status bar can be either in single-line or two-line
+# mode, depending on the constructor. Multiple active operations are only
+# supported for single-line status bars.
+
 class status_bar {
 
+field allow_multiple ; # configured at construction
+
 field w         ; # our own window path
 field w_l       ; # text widget we draw messages into
 field w_c       ; # canvas we draw a progress bar into
 field c_pack    ; # script to pack the canvas with
-field status  {}; # single line of text we show
-field prefix  {}; # text we format into status
-field units   {}; # unit of progress
-field meter   {}; # current core git progress meter (if active)
+
+field baseline_text   ; # text to show if there are no operations
+field status_bar_text ; # combined text for all operations
+
+field operations ; # list of current ongoing operations
+
+# The status bar can display a progress bar, updated when consumers call the
+# update method on their status_bar_operation. When there are multiple
+# operations, the status bar shows the combined status of all operations.
+#
+# When an overlapping operation completes, the progress bar is going to
+# abruptly have one fewer operation in the calculation, causing a discontinuity.
+# Therefore, whenever an operation completes, if it is not the last operation,
+# this counter is increased, and the progress bar is calculated as though there
+# were still another operation at 100%. When the last operation completes, this
+# is reset to 0.
+field completed_operation_count
 
 constructor new {path} {
 	global use_ttk NS
@@ -18,12 +44,19 @@ constructor new {path} {
 	set w_l $w.l
 	set w_c $w.c
 
+	# Standard single-line status bar: Permit overlapping operations
+	set allow_multiple 1
+
+	set baseline_text ""
+	set operations [list]
+	set completed_operation_count 0
+
 	${NS}::frame $w
 	if {!$use_ttk} {
 		$w configure -borderwidth 1 -relief sunken
 	}
 	${NS}::label $w_l \
-		-textvariable @status \
+		-textvariable @status_bar_text \
 		-anchor w \
 		-justify left
 	pack $w_l -side left
@@ -44,9 +77,16 @@ constructor two_line {path} {
 	set w_l $w.l
 	set w_c $w.c
 
+	# Two-line status bar: Only one ongoing operation permitted.
+	set allow_multiple 0
+
+	set baseline_text ""
+	set operations [list]
+	set completed_operation_count 0
+
 	${NS}::frame $w
 	${NS}::label $w_l \
-		-textvariable @status \
+		-textvariable @status_bar_text \
 		-anchor w \
 		-justify left
 	pack $w_l -anchor w -fill x
@@ -56,7 +96,7 @@ constructor two_line {path} {
 	return $this
 }
 
-method start {msg uds} {
+method ensure_canvas {} {
 	if {[winfo exists $w_c]} {
 		$w_c coords bar 0 0 0 20
 	} else {
@@ -68,31 +108,170 @@ method start {msg uds} {
 		$w_c create rectangle 0 0 0 20 -tags bar -fill navy
 		eval $c_pack
 	}
+}
+
+method show {msg} {
+	$this ensure_canvas
+	set baseline_text $msg
+	$this refresh
+}
+
+method start {msg {uds {}}} {
+	set baseline_text ""
+
+	if {!$allow_multiple && [llength $operations]} {
+		return [lindex $operations 0]
+	}
+
+	$this ensure_canvas
+
+	set operation [status_bar_operation::new $this $msg $uds]
+
+	lappend operations $operation
+
+	$this refresh
+
+	return $operation
+}
+
+method refresh {} {
+	set new_text ""
+
+	set total [expr $completed_operation_count * 100]
+	set have $total
+
+	foreach operation $operations {
+		if {$new_text != ""} {
+			append new_text " / "
+		}
+
+		append new_text [$operation get_status]
+
+		set total [expr $total + 100]
+		set have [expr $have + [$operation get_progress]]
+	}
+
+	if {$new_text == ""} {
+		set new_text $baseline_text
+	}
+
+	set status_bar_text $new_text
+
+	if {[winfo exists $w_c]} {
+		set pixel_width 0
+		if {$have > 0} {
+			set pixel_width [expr {[winfo width $w_c] * $have / $total}]
+		}
+
+		$w_c coords bar 0 0 $pixel_width 20
+	}
+}
+
+method stop {operation stop_msg} {
+	set idx [lsearch $operations $operation]
+
+	if {$idx >= 0} {
+		set operations [lreplace $operations $idx $idx]
+		set completed_operation_count [expr \
+			$completed_operation_count + 1]
+
+		if {[llength $operations] == 0} {
+			set completed_operation_count 0
+
+			destroy $w_c
+			if {$stop_msg ne {}} {
+				set baseline_text $stop_msg
+			}
+		}
+
+		$this refresh
+	}
+}
+
+method stop_all {{stop_msg {}}} {
+	# This makes the operation's call to stop a no-op.
+	set operations_copy $operations
+	set operations [list]
+
+	foreach operation $operations_copy {
+		$operation stop
+	}
+
+	if {$stop_msg ne {}} {
+		set baseline_text $stop_msg
+	}
+
+	$this refresh
+}
+
+method _delete {current} {
+	if {$current eq $w} {
+		delete_this
+	}
+}
+
+}
+
+# The status_bar_operation class tracks a single consumer's ongoing status bar
+# activity, with the context that there are a few situations where multiple
+# overlapping asynchronous operations might want to display status information
+# simultaneously. Instances of status_bar_operation are created by calling
+# start on the status_bar, and when the caller is done with its stauts bar
+# operation, it calls stop on the operation.
+
+class status_bar_operation {
+
+field status_bar; # reference back to the status_bar that owns this object
+
+field is_active;
+
+field status   {}; # single line of text we show
+field progress {}; # current progress (0 to 100)
+field prefix   {}; # text we format into status
+field units    {}; # unit of progress
+field meter    {}; # current core git progress meter (if active)
+
+constructor new {owner msg uds} {
+	set status_bar $owner
 
 	set status $msg
+	set progress 0
 	set prefix $msg
 	set units  $uds
 	set meter  {}
+
+	set is_active 1
+
+	return $this
 }
 
+method get_is_active {} { return $is_active }
+method get_status {} { return $status }
+method get_progress {} { return $progress }
+
 method update {have total} {
-	set pdone 0
-	set cdone 0
+	if {!$is_active} { return }
+
+	set progress 0
+
 	if {$total > 0} {
-		set pdone [expr {100 * $have / $total}]
-		set cdone [expr {[winfo width $w_c] * $have / $total}]
+		set progress [expr {100 * $have / $total}]
 	}
 
 	set prec [string length [format %i $total]]
+
 	set status [mc "%s ... %*i of %*i %s (%3i%%)" \
 		$prefix \
 		$prec $have \
 		$prec $total \
-		$units $pdone]
-	$w_c coords bar 0 0 $cdone 20
+		$units $progress]
+
+	$status_bar refresh
 }
 
 method update_meter {buf} {
+	if {!$is_active} { return }
+
 	append meter $buf
 	set r [string last "\r" $meter]
 	if {$r == -1} {
@@ -109,23 +288,25 @@ method update_meter {buf} {
 	}
 }
 
-method stop {{msg {}}} {
-	destroy $w_c
-	if {$msg ne {}} {
-		set status $msg
+method stop {{stop_msg {}}} {
+	if {$is_active} {
+		set is_active 0
+		$status_bar stop $this $stop_msg
 	}
 }
 
-method show {msg {test {}}} {
-	if {$test eq {} || $status eq $test} {
-		set status $msg
-	}
+method restart {msg} {
+	if {!$is_active} { return }
+
+	set status $msg
+	set prefix $msg
+	set meter {}
+	$status_bar refresh
 }
 
-method _delete {current} {
-	if {$current eq $w} {
-		delete_this
-	}
+method _delete {} {
+	stop
+	delete_this
 }
 
 }
diff --git a/third_party/git/git-gui/po/de.po b/third_party/git/git-gui/po/de.po
index baebff2ffff7..a8d5f61ca36c 100644
--- a/third_party/git/git-gui/po/de.po
+++ b/third_party/git/git-gui/po/de.po
@@ -7,41 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 22:22+0100\n"
-"PO-Revision-Date: 2010-01-26 22:25+0100\n"
-"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
+"POT-Creation-Date: 2020-02-08 22:54+0100\n"
+"PO-Revision-Date: 2020-02-09 22:40+0100\n"
+"Last-Translator: Christian Stimming <christian@cstimming.de>\n"
 "Language-Team: German\n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
-#: git-gui.sh:922
-msgid "git-gui: fatal error"
-msgstr "git-gui: Programmfehler"
-
-#: git-gui.sh:743
+#: git-gui.sh:847
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Ungรผltige Zeichensatz-Angabe in %s:"
 
-#: git-gui.sh:779
+#: git-gui.sh:901
 msgid "Main Font"
 msgstr "Programmschriftart"
 
-#: git-gui.sh:780
+#: git-gui.sh:902
 msgid "Diff/Console Font"
 msgstr "Vergleich-Schriftart"
 
-#: git-gui.sh:794
+#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053
+#: git-gui.sh:3212
+msgid "git-gui: fatal error"
+msgstr "git-gui: Programmfehler"
+
+#: git-gui.sh:918
 msgid "Cannot find git in PATH."
 msgstr "Git kann im PATH nicht gefunden werden."
 
-#: git-gui.sh:821
+#: git-gui.sh:945
 msgid "Cannot parse Git version string:"
 msgstr "Git Versionsangabe kann nicht erkannt werden:"
 
-#: git-gui.sh:839
+#: git-gui.sh:970
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -60,479 +61,524 @@ msgstr ""
 "\n"
 "Soll angenommen werden, ยป%sยซ sei Version 1.5.0?\n"
 
-#: git-gui.sh:1128
+#: git-gui.sh:1267
 msgid "Git directory not found:"
 msgstr "Git-Verzeichnis nicht gefunden:"
 
-#: git-gui.sh:1146
+#: git-gui.sh:1301
 msgid "Cannot move to top of working directory:"
 msgstr ""
 "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
 "werden:"
 
-#: git-gui.sh:1154
+#: git-gui.sh:1309
 msgid "Cannot use bare repository:"
-msgstr "BloรŸes Projektarchiv kann nicht benutzt werden:"
+msgstr "BloรŸes Repository kann nicht benutzt werden:"
 
-#: git-gui.sh:1162
+#: git-gui.sh:1317
 msgid "No working directory"
 msgstr "Kein Arbeitsverzeichnis"
 
-#: git-gui.sh:1334 lib/checkout_op.tcl:306
+#: git-gui.sh:1491 lib/checkout_op.tcl:306
 msgid "Refreshing file status..."
 msgstr "Dateistatus aktualisieren..."
 
-#: git-gui.sh:1390
+#: git-gui.sh:1551
 msgid "Scanning for modified files ..."
 msgstr "Nach geรคnderten Dateien suchen..."
 
-#: git-gui.sh:1454
+#: git-gui.sh:1629
 msgid "Calling prepare-commit-msg hook..."
-msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle (ยปprepare-commit hookยซ)..."
+msgstr "Aufrufen des ยปprepare-commit-msg hookยซ..."
 
-#: git-gui.sh:1471
+#: git-gui.sh:1646
 msgid "Commit declined by prepare-commit-msg hook."
-msgstr ""
-"Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (ยปprepare-commit "
-"hookยซ)."
+msgstr "Commit abgelehnt durch ยปprepare-commit-msg hookยซ."
 
-#: git-gui.sh:1629 lib/browser.tcl:246
+#: git-gui.sh:1804 lib/browser.tcl:252
 msgid "Ready."
 msgstr "Bereit."
 
-#: git-gui.sh:1787
+#: git-gui.sh:1968
 #, tcl-format
-msgid "Displaying only %s of %s files."
-msgstr "Nur %s von %s Dateien werden angezeigt."
+msgid ""
+"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files."
+msgstr ""
+"Anzeigelimit erreicht (gui.maxfilesdisplayed = %s) fรผr Anzahl Eintrรคge. Es "
+"werden nicht alle %s Dateien gezeigt."
 
-#: git-gui.sh:1913
+#: git-gui.sh:2091
 msgid "Unmodified"
 msgstr "Unverรคndert"
 
-#: git-gui.sh:1915
+#: git-gui.sh:2093
 msgid "Modified, not staged"
 msgstr "Verรคndert, nicht bereitgestellt"
 
-#: git-gui.sh:1916 git-gui.sh:1924
+#: git-gui.sh:2094 git-gui.sh:2106
 msgid "Staged for commit"
-msgstr "Bereitgestellt zum Eintragen"
+msgstr "Bereitgestellt zum Committen"
 
-#: git-gui.sh:1917 git-gui.sh:1925
+#: git-gui.sh:2095 git-gui.sh:2107
 msgid "Portions staged for commit"
-msgstr "Teilweise bereitgestellt zum Eintragen"
+msgstr "Teilweise bereitgestellt zum Committen"
 
-#: git-gui.sh:1918 git-gui.sh:1926
+#: git-gui.sh:2096 git-gui.sh:2108
 msgid "Staged for commit, missing"
-msgstr "Bereitgestellt zum Eintragen, fehlend"
+msgstr "Bereitgestellt zum Committen, fehlend"
 
-#: git-gui.sh:1920
+#: git-gui.sh:2098
 msgid "File type changed, not staged"
 msgstr "Dateityp geรคndert, nicht bereitgestellt"
 
-#: git-gui.sh:1921
+#: git-gui.sh:2099 git-gui.sh:2100
+msgid "File type changed, old type staged for commit"
+msgstr "Dateityp geรคndert, alter Dateityp bereitgestellt"
+
+#: git-gui.sh:2101
 msgid "File type changed, staged"
 msgstr "Dateityp geรคndert, bereitgestellt"
 
-#: git-gui.sh:1923
+#: git-gui.sh:2102
+msgid "File type change staged, modification not staged"
+msgstr "Dateityp-ร„nderung bereitgestellt, Inhaltsรคnderung nicht bereitgestellt"
+
+#: git-gui.sh:2103
+msgid "File type change staged, file missing"
+msgstr "Dateityp-ร„nderung bereitgestellt, Datei gelรถscht"
+
+#: git-gui.sh:2105
 msgid "Untracked, not staged"
-msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
+msgstr "Unversioniert, nicht bereitgestellt"
 
-#: git-gui.sh:1928
+#: git-gui.sh:2110
 msgid "Missing"
 msgstr "Fehlend"
 
-#: git-gui.sh:1929
+#: git-gui.sh:2111
 msgid "Staged for removal"
 msgstr "Bereitgestellt zum Lรถschen"
 
-#: git-gui.sh:1930
+#: git-gui.sh:2112
 msgid "Staged for removal, still present"
 msgstr "Bereitgestellt zum Lรถschen, trotzdem vorhanden"
 
-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
-#: git-gui.sh:1936 git-gui.sh:1937
+#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
+#: git-gui.sh:2118 git-gui.sh:2119
 msgid "Requires merge resolution"
 msgstr "Konfliktauflรถsung nรถtig"
 
-#: git-gui.sh:1972
-msgid "Starting gitk... please wait..."
-msgstr "Gitk wird gestartet... bitte warten."
-
-#: git-gui.sh:1984
+#: git-gui.sh:2164
 msgid "Couldn't find gitk in PATH"
 msgstr "Gitk kann im PATH nicht gefunden werden."
 
-#: git-gui.sh:2043
+#: git-gui.sh:2210 git-gui.sh:2245
+#, tcl-format
+msgid "Starting %s... please wait..."
+msgstr "%s wird gestartet... bitte warten."
+
+#: git-gui.sh:2224
 msgid "Couldn't find git gui in PATH"
 msgstr "ยปGit guiยซ kann im PATH nicht gefunden werden."
 
-#: git-gui.sh:2455 lib/choose_repository.tcl:36
+#: git-gui.sh:2726 lib/choose_repository.tcl:53
 msgid "Repository"
-msgstr "Projektarchiv"
+msgstr "Repository"
 
-#: git-gui.sh:2456
+#: git-gui.sh:2727
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: git-gui.sh:2458 lib/choose_rev.tcl:561
+#: git-gui.sh:2729 lib/choose_rev.tcl:567
 msgid "Branch"
-msgstr "Zweig"
+msgstr "Branch"
 
-#: git-gui.sh:2461 lib/choose_rev.tcl:548
+#: git-gui.sh:2732 lib/choose_rev.tcl:554
 msgid "Commit@@noun"
-msgstr "Version"
+msgstr "Commit"
 
-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
 msgid "Merge"
 msgstr "Zusammenfรผhren"
 
-#: git-gui.sh:2465 lib/choose_rev.tcl:557
+#: git-gui.sh:2736 lib/choose_rev.tcl:563
 msgid "Remote"
-msgstr "Externe Archive"
+msgstr "Extern"
 
-#: git-gui.sh:2468
+#: git-gui.sh:2739
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: git-gui.sh:2477
+#: git-gui.sh:2748
 msgid "Explore Working Copy"
-msgstr "Arbeitskopie im Dateimanager"
+msgstr "Arbeitskopie im Dateimanager รถffnen"
+
+#: git-gui.sh:2763
+msgid "Git Bash"
+msgstr "Git Bash"
 
-#: git-gui.sh:2483
+#: git-gui.sh:2772
 msgid "Browse Current Branch's Files"
-msgstr "Aktuellen Zweig durchblรคttern"
+msgstr "Aktuellen Branch durchblรคttern"
 
-#: git-gui.sh:2487
+#: git-gui.sh:2776
 msgid "Browse Branch Files..."
-msgstr "Einen Zweig durchblรคttern..."
+msgstr "Branch durchblรคttern..."
 
-#: git-gui.sh:2492
+#: git-gui.sh:2781
 msgid "Visualize Current Branch's History"
-msgstr "Aktuellen Zweig darstellen"
+msgstr "Aktuellen Branch darstellen"
 
-#: git-gui.sh:2496
+#: git-gui.sh:2785
 msgid "Visualize All Branch History"
-msgstr "Alle Zweige darstellen"
+msgstr "Historie aller Branches darstellen"
 
-#: git-gui.sh:2503
+#: git-gui.sh:2792
 #, tcl-format
 msgid "Browse %s's Files"
-msgstr "Zweig ยป%sยซ durchblรคttern"
+msgstr "Branch ยป%sยซ durchblรคttern"
 
-#: git-gui.sh:2505
+#: git-gui.sh:2794
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "Historie von ยป%sยซ darstellen"
 
-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2799 lib/database.tcl:40
 msgid "Database Statistics"
 msgstr "Datenbankstatistik"
 
-#: git-gui.sh:2513 lib/database.tcl:34
+#: git-gui.sh:2802 lib/database.tcl:33
 msgid "Compress Database"
 msgstr "Datenbank komprimieren"
 
-#: git-gui.sh:2516
+#: git-gui.sh:2805
 msgid "Verify Database"
 msgstr "Datenbank รผberprรผfen"
 
-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
-#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
+#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820
 msgid "Create Desktop Icon"
 msgstr "Desktop-Icon erstellen"
 
-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217
 msgid "Quit"
 msgstr "Beenden"
 
-#: git-gui.sh:2547
+#: git-gui.sh:2836
 msgid "Undo"
 msgstr "Rรผckgรคngig"
 
-#: git-gui.sh:2550
+#: git-gui.sh:2839
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: git-gui.sh:2554 git-gui.sh:3109
+#: git-gui.sh:2843 git-gui.sh:3461
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
+#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr "Kopieren"
 
-#: git-gui.sh:2560 git-gui.sh:3115
+#: git-gui.sh:2849 git-gui.sh:3467
 msgid "Paste"
 msgstr "Einfรผgen"
 
-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
-#: lib/remote_branch_delete.tcl:38
+#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39
+#: lib/branch_delete.tcl:28
 msgid "Delete"
 msgstr "Lรถschen"
 
-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
+#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71
 msgid "Select All"
 msgstr "Alle auswรคhlen"
 
-#: git-gui.sh:2576
+#: git-gui.sh:2865
 msgid "Create..."
 msgstr "Erstellen..."
 
-#: git-gui.sh:2582
+#: git-gui.sh:2871
 msgid "Checkout..."
-msgstr "Umstellen..."
+msgstr "Auschecken..."
 
-#: git-gui.sh:2588
+#: git-gui.sh:2877
 msgid "Rename..."
 msgstr "Umbenennen..."
 
-#: git-gui.sh:2593
+#: git-gui.sh:2882
 msgid "Delete..."
 msgstr "Lรถschen..."
 
-#: git-gui.sh:2598
+#: git-gui.sh:2887
 msgid "Reset..."
-msgstr "Zurรผcksetzen..."
+msgstr "ร„nderungen verwerfen..."
 
-#: git-gui.sh:2608
+#: git-gui.sh:2897
 msgid "Done"
 msgstr "Fertig"
 
-#: git-gui.sh:2610
+#: git-gui.sh:2899
 msgid "Commit@@verb"
-msgstr "Eintragen"
+msgstr "Committen"
 
-#: git-gui.sh:2619 git-gui.sh:3050
-msgid "New Commit"
-msgstr "Neue Version"
-
-#: git-gui.sh:2627 git-gui.sh:3057
+#: git-gui.sh:2908 git-gui.sh:3400
 msgid "Amend Last Commit"
-msgstr "Letzte nachbessern"
+msgstr "Letzten Commit nachbessern"
 
-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101
 msgid "Rescan"
 msgstr "Neu laden"
 
-#: git-gui.sh:2643
+#: git-gui.sh:2924
 msgid "Stage To Commit"
-msgstr "Zum Eintragen bereitstellen"
+msgstr "Fรผr Commit bereitstellen"
 
-#: git-gui.sh:2649
+#: git-gui.sh:2930
 msgid "Stage Changed Files To Commit"
-msgstr "Geรคnderte Dateien bereitstellen"
+msgstr "Geรคnderte Dateien fรผr Commit bereitstellen"
 
-#: git-gui.sh:2655
+#: git-gui.sh:2936
 msgid "Unstage From Commit"
-msgstr "Aus der Bereitstellung herausnehmen"
+msgstr "Aus Commit-Bereitstellung herausnehmen"
 
-#: git-gui.sh:2661 lib/index.tcl:412
+#: git-gui.sh:2942 lib/index.tcl:521
 msgid "Revert Changes"
 msgstr "ร„nderungen verwerfen"
 
-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
+#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731
 msgid "Show Less Context"
 msgstr "Weniger Zeilen anzeigen"
 
-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
+#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735
 msgid "Show More Context"
 msgstr "Mehr Zeilen anzeigen"
 
-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
+#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485
 msgid "Sign Off"
 msgstr "Abzeichnen"
 
-#: git-gui.sh:2696
+#: git-gui.sh:2977
 msgid "Local Merge..."
 msgstr "Lokales Zusammenfรผhren..."
 
-#: git-gui.sh:2701
+#: git-gui.sh:2982
 msgid "Abort Merge..."
 msgstr "Zusammenfรผhren abbrechen..."
 
-#: git-gui.sh:2713 git-gui.sh:2741
+#: git-gui.sh:2994 git-gui.sh:3022
 msgid "Add..."
-msgstr "Hinzufรผgen..."
+msgstr "Neues hinzufรผgen..."
 
-#: git-gui.sh:2717
+#: git-gui.sh:2998
 msgid "Push..."
 msgstr "Versenden..."
 
-#: git-gui.sh:2721
+#: git-gui.sh:3002
 msgid "Delete Branch..."
-msgstr "Zweig lรถschen..."
+msgstr "Branch lรถschen..."
 
-#: git-gui.sh:2731 git-gui.sh:3292
+#: git-gui.sh:3012 git-gui.sh:3666
 msgid "Options..."
 msgstr "Optionen..."
 
-#: git-gui.sh:2742
+#: git-gui.sh:3023
 msgid "Remove..."
 msgstr "Entfernen..."
 
-#: git-gui.sh:2751 lib/choose_repository.tcl:50
+#: git-gui.sh:3032 lib/choose_repository.tcl:67
 msgid "Help"
 msgstr "Hilfe"
 
-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61
+#: lib/choose_repository.tcl:70 lib/about.tcl:14
 #, tcl-format
 msgid "About %s"
 msgstr "รœber %s"
 
-#: git-gui.sh:2783
+#: git-gui.sh:3064
 msgid "Online Documentation"
 msgstr "Online-Dokumentation"
 
-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73
 msgid "Show SSH Key"
 msgstr "SSH-Schlรผssel anzeigen"
 
-#: git-gui.sh:2893
+#: git-gui.sh:3097 git-gui.sh:3229
+msgid "usage:"
+msgstr "Verwendung:"
+
+#: git-gui.sh:3101 git-gui.sh:3233
+msgid "Usage"
+msgstr "Verwendung"
+
+#: git-gui.sh:3182 lib/blame.tcl:575
+msgid "Error"
+msgstr "Fehler"
+
+#: git-gui.sh:3213
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 "Fehler: Verzeichnis ยป%sยซ kann nicht gelesen werden: Datei oder Verzeichnis "
 "nicht gefunden"
 
-#: git-gui.sh:2926
+#: git-gui.sh:3246
 msgid "Current Branch:"
-msgstr "Aktueller Zweig:"
+msgstr "Aktueller Branch:"
 
-#: git-gui.sh:2947
-msgid "Staged Changes (Will Commit)"
-msgstr "Bereitstellung (zum Eintragen)"
-
-#: git-gui.sh:2967
+#: git-gui.sh:3271
 msgid "Unstaged Changes"
 msgstr "Nicht bereitgestellte ร„nderungen"
 
-#: git-gui.sh:3017
+#: git-gui.sh:3293
+msgid "Staged Changes (Will Commit)"
+msgstr "Bereitstellung (zum Committen)"
+
+#: git-gui.sh:3367
 msgid "Stage Changed"
 msgstr "Alles bereitstellen"
 
-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
+#: git-gui.sh:3386 lib/transport.tcl:137
 msgid "Push"
 msgstr "Versenden"
 
-#: git-gui.sh:3071
+#: git-gui.sh:3413
 msgid "Initial Commit Message:"
-msgstr "Erste Versionsbeschreibung:"
+msgstr "Erste Commit-Beschreibung:"
 
-#: git-gui.sh:3072
+#: git-gui.sh:3414
 msgid "Amended Commit Message:"
 msgstr "Nachgebesserte Beschreibung:"
 
-#: git-gui.sh:3073
+#: git-gui.sh:3415
 msgid "Amended Initial Commit Message:"
 msgstr "Nachgebesserte erste Beschreibung:"
 
-#: git-gui.sh:3074
+#: git-gui.sh:3416
 msgid "Amended Merge Commit Message:"
 msgstr "Nachgebesserte Zusammenfรผhrungs-Beschreibung:"
 
-#: git-gui.sh:3075
+#: git-gui.sh:3417
 msgid "Merge Commit Message:"
 msgstr "Zusammenfรผhrungs-Beschreibung:"
 
-#: git-gui.sh:3076
+#: git-gui.sh:3418
 msgid "Commit Message:"
-msgstr "Versionsbeschreibung:"
+msgstr "Commit-Beschreibung:"
 
-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
+#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73
 msgid "Copy All"
 msgstr "Alle kopieren"
 
-#: git-gui.sh:3149 lib/blame.tcl:104
+#: git-gui.sh:3501 lib/blame.tcl:106
 msgid "File:"
 msgstr "Datei:"
 
-#: git-gui.sh:3255
+#: git-gui.sh:3549 lib/choose_repository.tcl:1100
+msgid "Open"
+msgstr "ร–ffnen"
+
+#: git-gui.sh:3629
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: git-gui.sh:3276
+#: git-gui.sh:3650
 msgid "Decrease Font Size"
 msgstr "SchriftgrรถรŸe verkleinern"
 
-#: git-gui.sh:3280
+#: git-gui.sh:3654
 msgid "Increase Font Size"
 msgstr "SchriftgrรถรŸe vergrรถรŸern"
 
-#: git-gui.sh:3288 lib/blame.tcl:281
+#: git-gui.sh:3662 lib/blame.tcl:296
 msgid "Encoding"
 msgstr "Zeichenkodierung"
 
-#: git-gui.sh:3299
+#: git-gui.sh:3673
 msgid "Apply/Reverse Hunk"
-msgstr "Kontext anwenden/umkehren"
+msgstr "Patch-Block anwenden/zurรผcknehmen"
 
-#: git-gui.sh:3304
+#: git-gui.sh:3678
 msgid "Apply/Reverse Line"
-msgstr "Zeile anwenden/umkehren"
+msgstr "Zeile anwenden/zurรผcknehmen"
+
+#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805
+msgid "Revert Hunk"
+msgstr "Patch-Block zurรผcknehmen"
+
+#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812
+msgid "Revert Line"
+msgstr "Zeilenรคnderungen zurรผcknehmen"
+
+#: git-gui.sh:3694 git-gui.sh:3791
+msgid "Undo Last Revert"
+msgstr "Letztes Zurรผcknehmen rรผckgรคngig"
 
-#: git-gui.sh:3323
+#: git-gui.sh:3713
 msgid "Run Merge Tool"
 msgstr "Zusammenfรผhrungswerkzeug"
 
-#: git-gui.sh:3328
+#: git-gui.sh:3718
 msgid "Use Remote Version"
 msgstr "Externe Version benutzen"
 
-#: git-gui.sh:3332
+#: git-gui.sh:3722
 msgid "Use Local Version"
 msgstr "Lokale Version benutzen"
 
-#: git-gui.sh:3336
+#: git-gui.sh:3726
 msgid "Revert To Base"
-msgstr "Ursprรผngliche Version benutzen"
+msgstr "Zurรผcksetzen auf ursprรผnglichen Commit"
 
-#: git-gui.sh:3354
+#: git-gui.sh:3744
 msgid "Visualize These Changes In The Submodule"
-msgstr "Diese ร„nderungen im Untermodul darstellen"
+msgstr "Diese ร„nderungen im Submodul darstellen"
 
-#: git-gui.sh:3358
+#: git-gui.sh:3748
 msgid "Visualize Current Branch History In The Submodule"
-msgstr "Aktuellen Zweig im Untermodul darstellen"
+msgstr "Aktuellen Branch im Submodul darstellen"
 
-#: git-gui.sh:3362
+#: git-gui.sh:3752
 msgid "Visualize All Branch History In The Submodule"
-msgstr "Alle Zweige im Untermodul darstellen"
+msgstr "Alle Branches im Submodul darstellen"
 
-#: git-gui.sh:3367
+#: git-gui.sh:3757
 msgid "Start git gui In The Submodule"
-msgstr "Git gui im Untermodul starten"
+msgstr "Git gui im Submodul starten"
 
-#: git-gui.sh:3389
+#: git-gui.sh:3793
 msgid "Unstage Hunk From Commit"
-msgstr "Kontext aus Bereitstellung herausnehmen"
+msgstr "Patch-Block aus Bereitstellung herausnehmen"
 
-#: git-gui.sh:3391
+#: git-gui.sh:3797
 msgid "Unstage Lines From Commit"
 msgstr "Zeilen aus der Bereitstellung herausnehmen"
 
-#: git-gui.sh:3393
+#: git-gui.sh:3798 git-gui.sh:3809
+msgid "Revert Lines"
+msgstr "Zeilenรคnderung zurรผcknehmen"
+
+#: git-gui.sh:3800
 msgid "Unstage Line From Commit"
 msgstr "Zeile aus der Bereitstellung herausnehmen"
 
-#: git-gui.sh:3396
+#: git-gui.sh:3804
 msgid "Stage Hunk For Commit"
-msgstr "Kontext zur Bereitstellung hinzufรผgen"
+msgstr "Patch-Block zur Bereitstellung hinzufรผgen"
 
-#: git-gui.sh:3398
+#: git-gui.sh:3808
 msgid "Stage Lines For Commit"
 msgstr "Zeilen zur Bereitstellung hinzufรผgen"
 
-#: git-gui.sh:3400
+#: git-gui.sh:3811
 msgid "Stage Line For Commit"
 msgstr "Zeile zur Bereitstellung hinzufรผgen"
 
-#: git-gui.sh:3424
+#: git-gui.sh:3861
 msgid "Initializing..."
 msgstr "Initialisieren..."
 
-#: git-gui.sh:3541
+#: git-gui.sh:4017
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
@@ -548,7 +594,7 @@ msgstr ""
 "von %s an Git weitergegeben werden:\n"
 "\n"
 
-#: git-gui.sh:3570
+#: git-gui.sh:4046
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
@@ -558,7 +604,7 @@ msgstr ""
 "Dies ist ein bekanntes Problem der Tcl-Version, die\n"
 "in Cygwin mitgeliefert wird."
 
-#: git-gui.sh:3575
+#: git-gui.sh:4051
 #, tcl-format
 msgid ""
 "\n"
@@ -574,315 +620,151 @@ msgstr ""
 "gewรผnschten Werte fรผr die Einstellung user.name und \n"
 "user.email in Ihre Datei ~/.gitconfig einfรผgen.\n"
 
-#: lib/about.tcl:26
-msgid "git-gui - a graphical user interface for Git."
-msgstr "git-gui - eine grafische Oberflรคche fรผr Git."
-
-#: lib/blame.tcl:72
-msgid "File Viewer"
-msgstr "Datei-Browser"
-
-#: lib/blame.tcl:78
-msgid "Commit:"
-msgstr "Version:"
-
-#: lib/blame.tcl:271
-msgid "Copy Commit"
-msgstr "Version kopieren"
-
-#: lib/blame.tcl:275
-msgid "Find Text..."
-msgstr "Text suchen..."
-
-#: lib/blame.tcl:284
-msgid "Do Full Copy Detection"
-msgstr "Volle Kopie-Erkennung"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Rechtschreibprรผfungsprogramm nicht unterstรผtzt"
 
-#: lib/blame.tcl:288
-msgid "Show History Context"
-msgstr "Historien-Kontext anzeigen"
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "Rechtschreibprรผfung nicht verfรผgbar"
 
-#: lib/blame.tcl:291
-msgid "Blame Parent Commit"
-msgstr "Elternversion annotieren"
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "Unbenutzbare Konfiguration der Rechtschreibprรผfung"
 
-#: lib/blame.tcl:450
+#: lib/spellcheck.tcl:70
 #, tcl-format
-msgid "Reading %s..."
-msgstr "%s lesen..."
-
-#: lib/blame.tcl:557
-msgid "Loading copy/move tracking annotations..."
-msgstr "Annotierungen fรผr Kopieren/Verschieben werden geladen..."
-
-#: lib/blame.tcl:577
-msgid "lines annotated"
-msgstr "Zeilen annotiert"
-
-#: lib/blame.tcl:769
-msgid "Loading original location annotations..."
-msgstr "Annotierungen fรผr ursprรผnglichen Ort werden geladen..."
-
-#: lib/blame.tcl:772
-msgid "Annotation complete."
-msgstr "Annotierung vollstรคndig."
-
-#: lib/blame.tcl:802
-msgid "Busy"
-msgstr "Verarbeitung lรคuft"
-
-#: lib/blame.tcl:803
-msgid "Annotation process is already running."
-msgstr "Annotierung lรคuft bereits."
-
-#: lib/blame.tcl:842
-msgid "Running thorough copy detection..."
-msgstr "Intensive Kopie-Erkennung lรคuft..."
-
-#: lib/blame.tcl:910
-msgid "Loading annotation..."
-msgstr "Annotierung laden..."
-
-#: lib/blame.tcl:963
-msgid "Author:"
-msgstr "Autor:"
-
-#: lib/blame.tcl:967
-msgid "Committer:"
-msgstr "Eintragender:"
-
-#: lib/blame.tcl:972
-msgid "Original File:"
-msgstr "Ursprรผngliche Datei:"
-
-#: lib/blame.tcl:1020
-msgid "Cannot find HEAD commit:"
-msgstr "Zweigspitze (ยปHEADยซ) kann nicht gefunden werden:"
-
-#: lib/blame.tcl:1075
-msgid "Cannot find parent commit:"
-msgstr "Elternversion kann nicht gefunden werden:"
-
-#: lib/blame.tcl:1090
-msgid "Unable to display parent"
-msgstr "Elternversion kann nicht angezeigt werden"
-
-#: lib/blame.tcl:1091 lib/diff.tcl:320
-msgid "Error loading diff:"
-msgstr "Fehler beim Laden des Vergleichs:"
-
-#: lib/blame.tcl:1231
-msgid "Originally By:"
-msgstr "Ursprรผnglich von:"
-
-#: lib/blame.tcl:1237
-msgid "In File:"
-msgstr "In Datei:"
-
-#: lib/blame.tcl:1242
-msgid "Copied Or Moved Here By:"
-msgstr "Kopiert oder verschoben durch:"
-
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
-msgid "Checkout Branch"
-msgstr "Auf Zweig umstellen"
-
-#: lib/branch_checkout.tcl:23
-msgid "Checkout"
-msgstr "Umstellen"
-
-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
-#: lib/transport.tcl:108
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
-msgid "Revision"
-msgstr "Version"
-
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
-msgid "Options"
-msgstr "Optionen"
-
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
-msgid "Fetch Tracking Branch"
-msgstr "รœbernahmezweig anfordern"
-
-#: lib/branch_checkout.tcl:44
-msgid "Detach From Local Branch"
-msgstr "Verbindung zu lokalem Zweig lรถsen"
-
-#: lib/branch_create.tcl:22
-msgid "Create Branch"
-msgstr "Zweig erstellen"
-
-#: lib/branch_create.tcl:27
-msgid "Create New Branch"
-msgstr "Neuen Zweig erstellen"
-
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
-msgid "Create"
-msgstr "Erstellen"
-
-#: lib/branch_create.tcl:40
-msgid "Branch Name"
-msgstr "Zweigname"
-
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
-msgid "Name:"
-msgstr "Name:"
-
-#: lib/branch_create.tcl:58
-msgid "Match Tracking Branch Name"
-msgstr "Passend zu รœbernahmezweig-Name"
-
-#: lib/branch_create.tcl:66
-msgid "Starting Revision"
-msgstr "Anfangsversion"
-
-#: lib/branch_create.tcl:72
-msgid "Update Existing Branch:"
-msgstr "Existierenden Zweig aktualisieren:"
+msgid "Reverting dictionary to %s."
+msgstr "Wรถrterbuch auf %s zurรผckgesetzt."
 
-#: lib/branch_create.tcl:75
-msgid "No"
-msgstr "Nein"
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "Rechtschreibprรผfungsprogramm mit Fehler abgebrochen"
 
-#: lib/branch_create.tcl:80
-msgid "Fast Forward Only"
-msgstr "Nur Schnellzusammenfรผhrung"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Unbekanntes Rechtschreibprรผfungsprogramm"
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
-msgid "Reset"
-msgstr "Zurรผcksetzen"
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr "Keine Vorschlรคge"
 
-#: lib/branch_create.tcl:97
-msgid "Checkout After Creation"
-msgstr "Arbeitskopie umstellen nach Erstellen"
+#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr "Unerwartetes EOF vom Rechtschreibprรผfungsprogramm"
 
-#: lib/branch_create.tcl:131
-msgid "Please select a tracking branch."
-msgstr "Bitte wรคhlen Sie einen รœbernahmezweig."
+#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr "Rechtschreibprรผfung fehlgeschlagen"
 
-#: lib/branch_create.tcl:140
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
 #, tcl-format
-msgid "Tracking branch %s is not a branch in the remote repository."
-msgstr "รœbernahmezweig ยป%sยซ ist kein Zweig im externen Projektarchiv."
+msgid "fetch %s"
+msgstr "ยป%sยซ anfordern"
 
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
-msgid "Please supply a branch name."
-msgstr "Bitte geben Sie einen Zweignamen an."
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "Neue ร„nderungen von ยป%sยซ holen"
 
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#: lib/transport.tcl:18
 #, tcl-format
-msgid "'%s' is not an acceptable branch name."
-msgstr "ยป%sยซ ist kein zulรคssiger Zweigname."
+msgid "remote prune %s"
+msgstr "Gelรถschte externe Branches aus ยป%sยซ entfernen"
 
-#: lib/branch_delete.tcl:15
-msgid "Delete Branch"
-msgstr "Zweig lรถschen"
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "Gelรถschte externe Trackingbranches aus ยป%sยซ werden entfernt"
 
-#: lib/branch_delete.tcl:20
-msgid "Delete Local Branch"
-msgstr "Lokalen Zweig lรถschen"
+#: lib/transport.tcl:25
+msgid "fetch all remotes"
+msgstr "Abrufen aller externen"
 
-#: lib/branch_delete.tcl:37
-msgid "Local Branches"
-msgstr "Lokale Zweige"
+#: lib/transport.tcl:26
+msgid "Fetching new changes from all remotes"
+msgstr "Neue ร„nderungen von allen externen anfordern"
 
-#: lib/branch_delete.tcl:52
-msgid "Delete Only If Merged Into"
-msgstr "Nur lรถschen, wenn zusammengefรผhrt nach"
+#: lib/transport.tcl:40
+msgid "remote prune all remotes"
+msgstr "Extern veraltete Branches entfernen aller Repositories"
 
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
-msgstr "Immer (Keine Zusammenfรผhrungsprรผfung)"
+#: lib/transport.tcl:41
+msgid "Pruning tracking branches deleted from all remotes"
+msgstr ""
+"Gelรถschte externe Trackingbranches aus allen Repositories werden entfernt"
 
-#: lib/branch_delete.tcl:103
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
+#: lib/remote_add.tcl:162
 #, tcl-format
-msgid "The following branches are not completely merged into %s:"
-msgstr "Folgende Zweige sind noch nicht mit ยป%sยซ zusammengefรผhrt:"
-
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
-msgid ""
-"Recovering deleted branches is difficult.\n"
-"\n"
-"Delete the selected branches?"
-msgstr ""
-"Das Wiederherstellen von gelรถschten Zweigen ist nur mit grรถรŸerem Aufwand "
-"mรถglich.\n"
-"\n"
-"Sollen die ausgewรคhlten Zweige gelรถscht werden?"
+msgid "push %s"
+msgstr "ยป%sยซ versenden..."
 
-#: lib/branch_delete.tcl:141
+#: lib/transport.tcl:55
 #, tcl-format
-msgid ""
-"Failed to delete branches:\n"
-"%s"
-msgstr ""
-"Fehler beim Lรถschen der Zweige:\n"
-"%s"
+msgid "Pushing changes to %s"
+msgstr "ร„nderungen nach ยป%sยซ versenden"
 
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
-msgid "Rename Branch"
-msgstr "Zweig umbenennen"
+#: lib/transport.tcl:93
+#, tcl-format
+msgid "Mirroring to %s"
+msgstr "Spiegeln nach %s"
 
-#: lib/branch_rename.tcl:26
-msgid "Rename"
-msgstr "Umbenennen"
+#: lib/transport.tcl:111
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "%s %s nach %s versenden"
 
-#: lib/branch_rename.tcl:36
-msgid "Branch:"
-msgstr "Zweig:"
+#: lib/transport.tcl:132
+msgid "Push Branches"
+msgstr "Branches versenden"
 
-#: lib/branch_rename.tcl:39
-msgid "New Name:"
-msgstr "Neuer Name:"
+#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34
+#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32
+#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41
+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43
+#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: lib/branch_rename.tcl:75
-msgid "Please select a branch to rename."
-msgstr "Bitte wรคhlen Sie einen Zweig zum umbenennen."
+#: lib/transport.tcl:147
+msgid "Source Branches"
+msgstr "Lokale Branches"
 
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
-#, tcl-format
-msgid "Branch '%s' already exists."
-msgstr "Zweig ยป%sยซ existiert bereits."
+#: lib/transport.tcl:162
+msgid "Destination Repository"
+msgstr "Ziel-Repository"
 
-#: lib/branch_rename.tcl:117
-#, tcl-format
-msgid "Failed to rename '%s'."
-msgstr "Fehler beim Umbenennen von ยป%sยซ."
+#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
+msgid "Remote:"
+msgstr "Externes Repository:"
 
-#: lib/browser.tcl:17
-msgid "Starting..."
-msgstr "Starten..."
+#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
+msgid "Arbitrary Location:"
+msgstr "Beliebige Adresse:"
 
-#: lib/browser.tcl:26
-msgid "File Browser"
-msgstr "Datei-Browser"
+#: lib/transport.tcl:205
+msgid "Transfer Options"
+msgstr "Netzwerk-Einstellungen"
 
-#: lib/browser.tcl:126 lib/browser.tcl:143
-#, tcl-format
-msgid "Loading %s..."
-msgstr "%s laden..."
+#: lib/transport.tcl:207
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+"รœberschreiben von existierenden Branches erzwingen (kรถnnte ร„nderungen "
+"lรถschen)"
 
-#: lib/browser.tcl:187
-msgid "[Up To Parent]"
-msgstr "[Nach oben]"
+#: lib/transport.tcl:211
+msgid "Use thin pack (for slow network connections)"
+msgstr "Kompaktes Datenformat benutzen (fรผr langsame Netzverbindungen)"
 
-#: lib/browser.tcl:267 lib/browser.tcl:273
-msgid "Browse Branch Files"
-msgstr "Dateien des Zweigs durchblรคttern"
+#: lib/transport.tcl:215
+msgid "Include tags"
+msgstr "Mit Tags versenden"
 
-#: lib/browser.tcl:278 lib/choose_repository.tcl:398
-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
-#: lib/choose_repository.tcl:1028
-msgid "Browse"
-msgstr "Blรคttern"
+#: lib/transport.tcl:229
+#, tcl-format
+msgid "%s (%s): Push"
+msgstr "%s (%s): Versenden"
 
 #: lib/checkout_op.tcl:85
 #, tcl-format
@@ -892,23 +774,28 @@ msgstr "ร„nderungen ยป%sยซ von ยป%sยซ anfordern"
 #: lib/checkout_op.tcl:133
 #, tcl-format
 msgid "fatal: Cannot resolve %s"
-msgstr "Fehler: ยป%sยซ kann nicht als Zweig oder Version erkannt werden"
+msgstr "Fehler: ยป%sยซ kann nicht als Branch oder Version erkannt werden"
 
-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
-#: lib/sshkey.tcl:53
+#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81
+#: lib/database.tcl:30
 msgid "Close"
 msgstr "SchlieรŸen"
 
 #: lib/checkout_op.tcl:175
 #, tcl-format
 msgid "Branch '%s' does not exist."
-msgstr "Zweig ยป%sยซ existiert nicht."
+msgstr "Branch ยป%sยซ existiert nicht."
 
 #: lib/checkout_op.tcl:194
 #, tcl-format
 msgid "Failed to configure simplified git-pull for '%s'."
 msgstr "Fehler beim Einrichten der vereinfachten git-pull fรผr ยป%sยซ."
 
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "Branch ยป%sยซ existiert bereits."
+
 #: lib/checkout_op.tcl:229
 #, tcl-format
 msgid ""
@@ -917,10 +804,10 @@ msgid ""
 "It cannot fast-forward to %s.\n"
 "A merge is required."
 msgstr ""
-"Zweig ยป%sยซ existiert bereits.\n"
+"Branch ยป%sยซ existiert bereits.\n"
 "\n"
-"Zweig kann nicht mit ยป%sยซ schnellzusammengefรผhrt werden. Regulรคres "
-"Zusammenfรผhren ist notwendig."
+"Branch kann nicht auf ยป%sยซ vorgespult werden. Regulรคres Zusammenfรผhren ist "
+"notwendig."
 
 #: lib/checkout_op.tcl:243
 #, tcl-format
@@ -945,76 +832,79 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv รผberein.\n"
+"Der letzte geladene Status stimmt nicht mehr mit dem Repository รผberein.\n"
 "\n"
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
-"geรคndert.  Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\n"
+"Ein anderes Git-Programm hat das Repository seit dem letzten Laden "
+"geรคndert.  Vor dem Wechseln des lokalen Branches muss neu geladen werden.\n"
 "\n"
 "Es wird gleich neu geladen.\n"
 
 #: lib/checkout_op.tcl:345
 #, tcl-format
 msgid "Updating working directory to '%s'..."
-msgstr "Arbeitskopie umstellen auf ยป%sยซ..."
+msgstr "Arbeitskopie aktualisieren auf ยป%sยซ..."
 
 #: lib/checkout_op.tcl:346
 msgid "files checked out"
 msgstr "Dateien aktualisiert"
 
-#: lib/checkout_op.tcl:376
+#: lib/checkout_op.tcl:377
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
-"Auf Zweig ยป%sยซ umstellen abgebrochen (Zusammenfรผhren der Dateien ist "
+"Branch ยป%sยซ Auschecken abgebrochen (Zusammenfรผhren der Dateien ist "
 "notwendig)."
 
-#: lib/checkout_op.tcl:377
+#: lib/checkout_op.tcl:378
 msgid "File level merge required."
 msgstr "Zusammenfรผhren der Dateien ist notwendig."
 
-#: lib/checkout_op.tcl:381
+#: lib/checkout_op.tcl:382
 #, tcl-format
 msgid "Staying on branch '%s'."
-msgstr "Es wird auf Zweig ยป%sยซ verblieben."
+msgstr "Es wird auf Branch ยป%sยซ verblieben."
 
-#: lib/checkout_op.tcl:452
+#: lib/checkout_op.tcl:453
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
 "If you wanted to be on a branch, create one now starting from 'This Detached "
 "Checkout'."
 msgstr ""
-"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n"
+"Die Arbeitskopie ist nicht auf einem lokalen Branch.\n"
 "\n"
-"Wenn Sie auf einem Zweig arbeiten mรถchten, erstellen Sie bitte jetzt einen "
-"Zweig mit der Auswahl ยปAbgetrennte Arbeitskopie-Versionยซ."
+"Wenn Sie auf einem Branch arbeiten mรถchten, erstellen Sie bitte jetzt einen "
+"Branch mit der Auswahl ยปLosgelรถste Arbeitskopie-Versionยซ."
 
-#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
+#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "Umgestellt auf ยป%sยซ."
 
-#: lib/checkout_op.tcl:535
+#: lib/checkout_op.tcl:536
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
-msgstr "Zurรผcksetzen von ยป%sยซ nach ยป%sยซ wird folgende Versionen verwerfen:"
+msgstr "Umsetzen von ยป%sยซ nach ยป%sยซ wird folgende Commits verlieren:"
 
-#: lib/checkout_op.tcl:557
+#: lib/checkout_op.tcl:558
 msgid "Recovering lost commits may not be easy."
 msgstr ""
-"Verworfene Versionen kรถnnen nur mit grรถรŸerem Aufwand wiederhergestellt "
-"werden."
+"Verlorene Commits kรถnnen nur mit grรถรŸerem Aufwand wiederhergestellt werden."
 
-#: lib/checkout_op.tcl:562
+#: lib/checkout_op.tcl:563
 #, tcl-format
 msgid "Reset '%s'?"
-msgstr "ยป%sยซ zurรผcksetzen?"
+msgstr "ยป%sยซ umsetzen?"
 
-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170
 msgid "Visualize"
 msgstr "Darstellen"
 
-#: lib/checkout_op.tcl:635
+#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
+msgid "Reset"
+msgstr "Umsetzen (Reset)"
+
+#: lib/checkout_op.tcl:636
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -1024,7 +914,7 @@ msgid ""
 "\n"
 "This should not have occurred.  %s will now close and give up."
 msgstr ""
-"Lokaler Zweig kann nicht gesetzt werden.\n"
+"Lokaler Branch kann nicht gesetzt werden.\n"
 "\n"
 "Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt "
 "aktualisiert, aber einige interne Git-Dateien konnten nicht geรคndert "
@@ -1032,23 +922,345 @@ msgstr ""
 "\n"
 "Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen."
 
-#: lib/choose_font.tcl:39
+#: lib/remote_add.tcl:20
+#, tcl-format
+msgid "%s (%s): Add Remote"
+msgstr "%s (%s): Externes Repository hinzufรผgen"
+
+#: lib/remote_add.tcl:25
+msgid "Add New Remote"
+msgstr "Neues externes Repository hinzufรผgen"
+
+#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
+msgid "Add"
+msgstr "Hinzufรผgen"
+
+#: lib/remote_add.tcl:39
+msgid "Remote Details"
+msgstr "Einzelheiten des externen Repository"
+
+#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
+msgid "Name:"
+msgstr "Name:"
+
+#: lib/remote_add.tcl:50
+msgid "Location:"
+msgstr "Adresse:"
+
+#: lib/remote_add.tcl:60
+msgid "Further Action"
+msgstr "Weitere Aktion"
+
+#: lib/remote_add.tcl:63
+msgid "Fetch Immediately"
+msgstr "Jetzt anfordern"
+
+#: lib/remote_add.tcl:69
+msgid "Initialize Remote Repository and Push"
+msgstr "Externes Repository initialisieren und dahin versenden"
+
+#: lib/remote_add.tcl:75
+msgid "Do Nothing Else Now"
+msgstr "Keine weitere Aktion"
+
+#: lib/remote_add.tcl:100
+msgid "Please supply a remote name."
+msgstr "Bitte geben Sie einen Namen des externen Repository an."
+
+#: lib/remote_add.tcl:113
+#, tcl-format
+msgid "'%s' is not an acceptable remote name."
+msgstr "ยป%sยซ ist kein zulรคssiger Name eines externen Repository."
+
+#: lib/remote_add.tcl:124
+#, tcl-format
+msgid "Failed to add remote '%s' of location '%s'."
+msgstr "Fehler beim Hinzufรผgen des externen Repository ยป%sยซ aus Adresse ยป%sยซ."
+
+#: lib/remote_add.tcl:133
+#, tcl-format
+msgid "Fetching the %s"
+msgstr "ยป%sยซ anfordern"
+
+#: lib/remote_add.tcl:156
+#, tcl-format
+msgid "Do not know how to initialize repository at location '%s'."
+msgstr ""
+"Initialisieren eines externen Repositories an Adresse ยป%sยซ ist nicht mรถglich."
+
+#: lib/remote_add.tcl:163
+#, tcl-format
+msgid "Setting up the %s (at %s)"
+msgstr "Einrichten von ยป%sยซ an ยป%sยซ"
+
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "Starten..."
+
+#: lib/browser.tcl:27
+#, tcl-format
+msgid "%s (%s): File Browser"
+msgstr "%s (%s): Datei-Browser"
+
+#: lib/browser.tcl:132 lib/browser.tcl:149
+#, tcl-format
+msgid "Loading %s..."
+msgstr "%s laden..."
+
+#: lib/browser.tcl:193
+msgid "[Up To Parent]"
+msgstr "[Nach oben]"
+
+#: lib/browser.tcl:275
+#, tcl-format
+msgid "%s (%s): Browse Branch Files"
+msgstr "%s (%s): Dateien des Branches durchblรคttern"
+
+#: lib/browser.tcl:282
+msgid "Browse Branch Files"
+msgstr "Dateien des Branches durchblรคttern"
+
+#: lib/browser.tcl:288 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
+#: lib/choose_repository.tcl:1115
+msgid "Browse"
+msgstr "Blรคttern"
+
+#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
+msgid "Revision"
+msgstr "Version"
+
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
+msgstr "Bereitstellung kann nicht wieder freigegeben werden."
+
+#: lib/index.tcl:30
+msgid "Index Error"
+msgstr "Fehler in Bereitstellung"
+
+#: lib/index.tcl:32
+msgid ""
+"Updating the Git index failed.  A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr ""
+"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine "
+"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu "
+"synchronisieren."
+
+#: lib/index.tcl:43
+msgid "Continue"
+msgstr "Fortsetzen"
+
+#: lib/index.tcl:46
+msgid "Unlock Index"
+msgstr "Bereitstellung freigeben"
+
+#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587
+#: lib/choose_repository.tcl:999
+msgid "files"
+msgstr "Dateien"
+
+#: lib/index.tcl:326
+msgid "Unstaging selected files from commit"
+msgstr "Gewรคhlte Dateien aus der Bereitstellung herausnehmen"
+
+#: lib/index.tcl:330
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Datei ยป%sยซ aus der Bereitstellung herausnehmen"
+
+#: lib/index.tcl:369
+msgid "Ready to commit."
+msgstr "Bereit zum Committen."
+
+#: lib/index.tcl:378
+msgid "Adding selected files"
+msgstr "Gewรคhlte Dateien hinzufรผgen"
+
+#: lib/index.tcl:382
+#, tcl-format
+msgid "Adding %s"
+msgstr "ยป%sยซ hinzufรผgen"
+
+#: lib/index.tcl:412
+#, tcl-format
+msgid "Stage %d untracked files?"
+msgstr "%d unversionierte Dateien bereitstellen?"
+
+#: lib/index.tcl:420
+msgid "Adding all changed files"
+msgstr "Alle geรคnderten Dateien hinzufรผgen"
+
+#: lib/index.tcl:503
+#, tcl-format
+msgid "Revert changes in file %s?"
+msgstr "ร„nderungen in Datei ยป%sยซ verwerfen?"
+
+#: lib/index.tcl:508
+#, tcl-format
+msgid "Revert changes in these %i files?"
+msgstr "ร„nderungen in diesen %i Dateien verwerfen?"
+
+#: lib/index.tcl:517
+msgid "Any unstaged changes will be permanently lost by the revert."
+msgstr ""
+"Alle nicht bereitgestellten ร„nderungen werden beim Verwerfen verloren gehen."
+
+#: lib/index.tcl:520 lib/index.tcl:563
+msgid "Do Nothing"
+msgstr "Nichts tun"
+
+#: lib/index.tcl:545
+#, tcl-format
+msgid "Delete untracked file %s?"
+msgstr "Unversionierte Datei ยป%sยซ lรถschen?"
+
+#: lib/index.tcl:550
+#, tcl-format
+msgid "Delete these %i untracked files?"
+msgstr "Diese %i unversionierten Dateien lรถschen?"
+
+#: lib/index.tcl:560
+msgid "Files will be permanently deleted."
+msgstr "Dateien werden endgรผltig gelรถscht."
+
+#: lib/index.tcl:564
+msgid "Delete Files"
+msgstr "Dateien lรถschen"
+
+#: lib/index.tcl:586
+msgid "Deleting"
+msgstr "Lรถschen"
+
+#: lib/index.tcl:665
+msgid "Encountered errors deleting files:\n"
+msgstr "Fehler beim Lรถschen der Dateien:\n"
+
+#: lib/index.tcl:674
+#, tcl-format
+msgid "None of the %d selected files could be deleted."
+msgstr "Keine der %d gewรคhlten Dateien konnten gelรถscht werden."
+
+#: lib/index.tcl:679
+#, tcl-format
+msgid "%d of the %d selected files could not be deleted."
+msgstr "%d der %d gewรคhlten Dateien konnten nicht gelรถscht werden."
+
+#: lib/index.tcl:726
+msgid "Reverting selected files"
+msgstr "ร„nderungen in gewรคhlten Dateien verwerfen"
+
+#: lib/index.tcl:730
+#, tcl-format
+msgid "Reverting %s"
+msgstr "ร„nderungen in %s verwerfen"
+
+#: lib/branch_checkout.tcl:16
+#, tcl-format
+msgid "%s (%s): Checkout Branch"
+msgstr "%s (%s): Branch auschecken"
+
+#: lib/branch_checkout.tcl:21
+msgid "Checkout Branch"
+msgstr "Branch auschecken"
+
+#: lib/branch_checkout.tcl:26
+msgid "Checkout"
+msgstr "Auschecken"
+
+#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
+msgid "Options"
+msgstr "Optionen"
+
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "Trackingbranch anfordern"
+
+#: lib/branch_checkout.tcl:47
+msgid "Detach From Local Branch"
+msgstr "Verbindung zu lokalem Branch lรถsen"
+
+#: lib/status_bar.tcl:263
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%s ... %*i von %*i %s (%3i%%)"
+
+#: lib/remote.tcl:200
+msgid "Push to"
+msgstr "Versenden nach"
+
+#: lib/remote.tcl:218
+msgid "Remove Remote"
+msgstr "Externes Repository entfernen"
+
+#: lib/remote.tcl:223
+msgid "Prune from"
+msgstr "Veraltete Branches entfernen"
+
+#: lib/remote.tcl:228
+msgid "Fetch from"
+msgstr "Anfordern"
+
+#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264
+msgid "All"
+msgstr "Alle"
+
+#: lib/branch_rename.tcl:15
+#, tcl-format
+msgid "%s (%s): Rename Branch"
+msgstr "%s (%s): Branch umbenennen"
+
+#: lib/branch_rename.tcl:23
+msgid "Rename Branch"
+msgstr "Branch umbenennen"
+
+#: lib/branch_rename.tcl:28
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: lib/branch_rename.tcl:38
+msgid "Branch:"
+msgstr "Branch:"
+
+#: lib/branch_rename.tcl:46
+msgid "New Name:"
+msgstr "Neuer Name:"
+
+#: lib/branch_rename.tcl:81
+msgid "Please select a branch to rename."
+msgstr "Bitte wรคhlen Sie einen Branch zum umbenennen."
+
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
+msgid "Please supply a branch name."
+msgstr "Bitte geben Sie einen Branchnamen an."
+
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
+#, tcl-format
+msgid "'%s' is not an acceptable branch name."
+msgstr "ยป%sยซ ist kein zulรคssiger Branchname."
+
+#: lib/branch_rename.tcl:123
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "Fehler beim Umbenennen von ยป%sยซ."
+
+#: lib/choose_font.tcl:41
 msgid "Select"
 msgstr "Auswรคhlen"
 
-#: lib/choose_font.tcl:53
+#: lib/choose_font.tcl:55
 msgid "Font Family"
 msgstr "Schriftfamilie"
 
-#: lib/choose_font.tcl:74
+#: lib/choose_font.tcl:76
 msgid "Font Size"
 msgstr "SchriftgrรถรŸe"
 
-#: lib/choose_font.tcl:91
+#: lib/choose_font.tcl:93
 msgid "Font Example"
 msgstr "Schriftbeispiel"
 
-#: lib/choose_font.tcl:103
+#: lib/choose_font.tcl:105
 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
@@ -1056,277 +1268,1137 @@ msgstr ""
 "Dies ist ein Beispieltext.\n"
 "Wenn Ihnen dieser Text gefรคllt, sollten Sie diese Schriftart wรคhlen."
 
-#: lib/choose_repository.tcl:28
+#: lib/option.tcl:11
+#, tcl-format
+msgid "Invalid global encoding '%s'"
+msgstr "Ungรผltige globale Zeichenkodierung ยป%sยซ"
+
+#: lib/option.tcl:19
+#, tcl-format
+msgid "Invalid repo encoding '%s'"
+msgstr "Ungรผltige Repository-Zeichenkodierung ยป%sยซ"
+
+#: lib/option.tcl:119
+msgid "Restore Defaults"
+msgstr "Voreinstellungen wiederherstellen"
+
+#: lib/option.tcl:123
+msgid "Save"
+msgstr "Speichern"
+
+#: lib/option.tcl:133
+#, tcl-format
+msgid "%s Repository"
+msgstr "%s Repository"
+
+#: lib/option.tcl:134
+msgid "Global (All Repositories)"
+msgstr "Global (Alle Repositories)"
+
+#: lib/option.tcl:140
+msgid "User Name"
+msgstr "Benutzername"
+
+#: lib/option.tcl:141
+msgid "Email Address"
+msgstr "E-Mail-Adresse"
+
+#: lib/option.tcl:143
+msgid "Summarize Merge Commits"
+msgstr "Zusammenfรผhrungs-Commits zusammenfassen"
+
+#: lib/option.tcl:144
+msgid "Merge Verbosity"
+msgstr "Ausfรผhrlichkeit der Zusammenfรผhren-Meldungen"
+
+#: lib/option.tcl:145
+msgid "Show Diffstat After Merge"
+msgstr "Vergleichsstatistik nach Zusammenfรผhren anzeigen"
+
+#: lib/option.tcl:146
+msgid "Use Merge Tool"
+msgstr "Zusammenfรผhrungswerkzeug"
+
+#: lib/option.tcl:148
+msgid "Trust File Modification Timestamps"
+msgstr "Auf Dateiรคnderungsdatum verlassen"
+
+#: lib/option.tcl:149
+msgid "Prune Tracking Branches During Fetch"
+msgstr "Veraltete Trackingbranches entfernen wรคhrend Anforderung"
+
+#: lib/option.tcl:150
+msgid "Match Tracking Branches"
+msgstr "Neue Branches automatisch als Trackingbranch"
+
+#: lib/option.tcl:151
+msgid "Use Textconv For Diffs and Blames"
+msgstr "Benutze ยปtextconvยซ fรผr Vergleich und Annotieren"
+
+#: lib/option.tcl:152
+msgid "Blame Copy Only On Changed Files"
+msgstr "Kopie-Annotieren nur bei geรคnderten Dateien"
+
+#: lib/option.tcl:153
+msgid "Maximum Length of Recent Repositories List"
+msgstr "Anzahl Eintrรคge in ยปLetzte Repositoriesยซ"
+
+#: lib/option.tcl:154
+msgid "Minimum Letters To Blame Copy On"
+msgstr "Mindestzahl Zeichen fรผr Kopie-Annotieren"
+
+#: lib/option.tcl:155
+msgid "Blame History Context Radius (days)"
+msgstr "Anzahl Tage fรผr Annotieren-Historien-Kontext"
+
+#: lib/option.tcl:156
+msgid "Number of Diff Context Lines"
+msgstr "Anzahl der Kontextzeilen beim Vergleich"
+
+#: lib/option.tcl:157
+msgid "Additional Diff Parameters"
+msgstr "Zusรคtzliche Vergleich-/diff-Parameter"
+
+#: lib/option.tcl:158
+msgid "Commit Message Text Width"
+msgstr "Textbreite der Commit-Beschreibung"
+
+#: lib/option.tcl:159
+msgid "New Branch Name Template"
+msgstr "Namensvorlage fรผr neue Branches"
+
+#: lib/option.tcl:160
+msgid "Default File Contents Encoding"
+msgstr "Voreingestellte Zeichenkodierung"
+
+#: lib/option.tcl:161
+msgid "Warn before committing to a detached head"
+msgstr "Warnen vor Committen auf losgelรถste Branchspitze"
+
+#: lib/option.tcl:162
+msgid "Staging of untracked files"
+msgstr "Unversionierte Dateien bereitstellen"
+
+#: lib/option.tcl:163
+msgid "Show untracked files"
+msgstr "Unversionierte Dateien anzeigen"
+
+#: lib/option.tcl:164
+msgid "Tab spacing"
+msgstr "Tabulator-Breite"
+
+#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282
+#: lib/database.tcl:57
+#, tcl-format
+msgid "%s:"
+msgstr "%s:"
+
+#: lib/option.tcl:210
+msgid "Change"
+msgstr "ร„ndern"
+
+#: lib/option.tcl:254
+msgid "Spelling Dictionary:"
+msgstr "Wรถrterbuch Rechtschreibprรผfung:"
+
+#: lib/option.tcl:284
+msgid "Change Font"
+msgstr "Schriftart รคndern"
+
+#: lib/option.tcl:288
+#, tcl-format
+msgid "Choose %s"
+msgstr "%s wรคhlen"
+
+#: lib/option.tcl:294
+msgid "pt."
+msgstr "pt."
+
+#: lib/option.tcl:308
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: lib/option.tcl:345
+msgid "Failed to completely save options:"
+msgstr "Optionen konnten nicht gespeichert werden:"
+
+#: lib/encoding.tcl:443
+msgid "Default"
+msgstr "Voreinstellung"
+
+#: lib/encoding.tcl:448
+#, tcl-format
+msgid "System (%s)"
+msgstr "Systemweit (%s)"
+
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
+msgstr "Andere"
+
+#: lib/tools.tcl:76
+#, tcl-format
+msgid "Running %s requires a selected file."
+msgstr "Um ยป%sยซ zu starten, muss eine Datei ausgewรคhlt sein."
+
+#: lib/tools.tcl:92
+#, tcl-format
+msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
+msgstr "Wollen Sie %1$s wirklich auf Datei ยป%2$sยซ starten?"
+
+#: lib/tools.tcl:96
+#, tcl-format
+msgid "Are you sure you want to run %s?"
+msgstr "Wollen Sie %s wirklich starten?"
+
+#: lib/tools.tcl:118
+#, tcl-format
+msgid "Tool: %s"
+msgstr "Werkzeug: %s"
+
+#: lib/tools.tcl:119
+#, tcl-format
+msgid "Running: %s"
+msgstr "Starten: %s"
+
+#: lib/tools.tcl:158
+#, tcl-format
+msgid "Tool completed successfully: %s"
+msgstr "Werkzeug erfolgreich abgeschlossen: %s"
+
+#: lib/tools.tcl:160
+#, tcl-format
+msgid "Tool failed: %s"
+msgstr "Werkzeug fehlgeschlagen: %s"
+
+#: lib/mergetool.tcl:8
+msgid "Force resolution to the base version?"
+msgstr "Konflikt durch Basisversion ersetzen?"
+
+#: lib/mergetool.tcl:9
+msgid "Force resolution to this branch?"
+msgstr "Konflikt durch diesen Branch ersetzen?"
+
+#: lib/mergetool.tcl:10
+msgid "Force resolution to the other branch?"
+msgstr "Konflikt durch anderen Branch ersetzen?"
+
+#: lib/mergetool.tcl:14
+#, tcl-format
+msgid ""
+"Note that the diff shows only conflicting changes.\n"
+"\n"
+"%s will be overwritten.\n"
+"\n"
+"This operation can be undone only by restarting the merge."
+msgstr ""
+"Hinweis: Der Vergleich zeigt nur konfliktverursachende ร„nderungen an.\n"
+"\n"
+"ยป%sยซ wird รผberschrieben.\n"
+"\n"
+"Diese Operation kann nur rรผckgรคngig gemacht werden, wenn die\n"
+"Zusammenfรผhrung erneut gestartet wird."
+
+#: lib/mergetool.tcl:45
+#, tcl-format
+msgid "File %s seems to have unresolved conflicts, still stage?"
+msgstr "Datei ยป%sยซ hat nicht aufgelรถste Konflikte. Trotzdem bereitstellen?"
+
+#: lib/mergetool.tcl:60
+#, tcl-format
+msgid "Adding resolution for %s"
+msgstr "Auflรถsung hinzugefรผgt fรผr %s"
+
+#: lib/mergetool.tcl:141
+msgid "Cannot resolve deletion or link conflicts using a tool"
+msgstr ""
+"Konflikte durch gelรถschte Dateien oder symbolische Links kรถnnen nicht durch "
+"das Zusamenfรผhrungswerkzeug gelรถst werden."
+
+#: lib/mergetool.tcl:146
+msgid "Conflict file does not exist"
+msgstr "Konflikt-Datei existiert nicht"
+
+#: lib/mergetool.tcl:246
+#, tcl-format
+msgid "Not a GUI merge tool: '%s'"
+msgstr "Kein GUI Zusammenfรผhrungswerkzeug: ยป%sยซ"
+
+#: lib/mergetool.tcl:275
+#, tcl-format
+msgid "Unsupported merge tool '%s'"
+msgstr "Unbekanntes Zusammenfรผhrungswerkzeug: ยป%sยซ"
+
+#: lib/mergetool.tcl:310
+msgid "Merge tool is already running, terminate it?"
+msgstr "Zusammenfรผhrungswerkzeug lรคuft bereits. Soll es abgebrochen werden?"
+
+#: lib/mergetool.tcl:330
+#, tcl-format
+msgid ""
+"Error retrieving versions:\n"
+"%s"
+msgstr ""
+"Fehler beim Abrufen der Dateiversionen:\n"
+"%s"
+
+#: lib/mergetool.tcl:350
+#, tcl-format
+msgid ""
+"Could not start the merge tool:\n"
+"\n"
+"%s"
+msgstr ""
+"Zusammenfรผhrungswerkzeug konnte nicht gestartet werden:\n"
+"\n"
+"%s"
+
+#: lib/mergetool.tcl:354
+msgid "Running merge tool..."
+msgstr "Zusammenfรผhrungswerkzeug starten..."
+
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
+msgid "Merge tool failed."
+msgstr "Zusammenfรผhrungswerkzeug fehlgeschlagen."
+
+#: lib/tools_dlg.tcl:22
+#, tcl-format
+msgid "%s (%s): Add Tool"
+msgstr "%s (%s): Werkzeug hinzufรผgen"
+
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
+msgstr "Neues Kommando fรผr Werkzeug hinzufรผgen"
+
+#: lib/tools_dlg.tcl:34
+msgid "Add globally"
+msgstr "Global hinzufรผgen"
+
+#: lib/tools_dlg.tcl:46
+msgid "Tool Details"
+msgstr "Einzelheiten des Werkzeugs"
+
+#: lib/tools_dlg.tcl:49
+msgid "Use '/' separators to create a submenu tree:"
+msgstr "Benutzen Sie einen Schrรคgstrich ยป/ยซ, um Untermenรผs zu erstellen:"
+
+#: lib/tools_dlg.tcl:60
+msgid "Command:"
+msgstr "Kommando:"
+
+#: lib/tools_dlg.tcl:71
+msgid "Show a dialog before running"
+msgstr "Bestรคtigungsfrage vor Starten anzeigen"
+
+#: lib/tools_dlg.tcl:77
+msgid "Ask the user to select a revision (sets $REVISION)"
+msgstr "Benutzer nach Version fragen (setzt $REVISION)"
+
+#: lib/tools_dlg.tcl:82
+msgid "Ask the user for additional arguments (sets $ARGS)"
+msgstr "Benutzer nach zusรคtzlichen Argumenten fragen (setzt $ARGS)"
+
+#: lib/tools_dlg.tcl:89
+msgid "Don't show the command output window"
+msgstr "Kein Ausgabefenster zeigen"
+
+#: lib/tools_dlg.tcl:94
+msgid "Run only if a diff is selected ($FILENAME not empty)"
+msgstr "Nur starten, wenn ein Vergleich gewรคhlt ist ($FILENAME ist nicht leer)"
+
+#: lib/tools_dlg.tcl:118
+msgid "Please supply a name for the tool."
+msgstr "Bitte geben Sie einen Werkzeugnamen an."
+
+#: lib/tools_dlg.tcl:126
+#, tcl-format
+msgid "Tool '%s' already exists."
+msgstr "Werkzeug ยป%sยซ existiert bereits."
+
+#: lib/tools_dlg.tcl:148
+#, tcl-format
+msgid ""
+"Could not add tool:\n"
+"%s"
+msgstr ""
+"Werkzeug konnte nicht hinzugefรผgt werden:\n"
+"\n"
+"%s"
+
+#: lib/tools_dlg.tcl:187
+#, tcl-format
+msgid "%s (%s): Remove Tool"
+msgstr "%s (%s): Werkzeug entfernen"
+
+#: lib/tools_dlg.tcl:193
+msgid "Remove Tool Commands"
+msgstr "Werkzeugkommandos entfernen"
+
+#: lib/tools_dlg.tcl:198
+msgid "Remove"
+msgstr "Entfernen"
+
+#: lib/tools_dlg.tcl:231
+msgid "(Blue denotes repository-local tools)"
+msgstr "(Werkzeuge fรผr lokales Repository werden in Blau angezeigt)"
+
+#: lib/tools_dlg.tcl:283
+#, tcl-format
+msgid "%s (%s):"
+msgstr "%s (%s):"
+
+#: lib/tools_dlg.tcl:292
+#, tcl-format
+msgid "Run Command: %s"
+msgstr "Kommando aufrufen: %s"
+
+#: lib/tools_dlg.tcl:306
+msgid "Arguments"
+msgstr "Argumente"
+
+#: lib/tools_dlg.tcl:341
+msgid "OK"
+msgstr "Ok"
+
+#: lib/search.tcl:48
+msgid "Find:"
+msgstr "Suchen:"
+
+#: lib/search.tcl:50
+msgid "Next"
+msgstr "Nรคchster"
+
+#: lib/search.tcl:51
+msgid "Prev"
+msgstr "Voriger"
+
+#: lib/search.tcl:52
+msgid "RegExp"
+msgstr "RegAusdruck"
+
+#: lib/search.tcl:54
+msgid "Case"
+msgstr "GroรŸ/klein"
+
+#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75
+#, tcl-format
+msgid "%s (%s): Create Desktop Icon"
+msgstr "%s (%s): Desktop-Icon erstellen"
+
+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
+msgid "Cannot write shortcut:"
+msgstr "Fehler beim Schreiben der Verknรผpfung:"
+
+#: lib/shortcut.tcl:140
+msgid "Cannot write icon:"
+msgstr "Fehler beim Erstellen des Icons:"
+
+#: lib/remote_branch_delete.tcl:29
+#, tcl-format
+msgid "%s (%s): Delete Branch Remotely"
+msgstr "%s (%s): Branch in externem Repository lรถschen"
+
+#: lib/remote_branch_delete.tcl:34
+msgid "Delete Branch Remotely"
+msgstr "Branch in externem Repository lรถschen"
+
+#: lib/remote_branch_delete.tcl:48
+msgid "From Repository"
+msgstr "In Repository"
+
+#: lib/remote_branch_delete.tcl:88
+msgid "Branches"
+msgstr "Branches"
+
+#: lib/remote_branch_delete.tcl:110
+msgid "Delete Only If"
+msgstr "Nur lรถschen, wenn"
+
+#: lib/remote_branch_delete.tcl:112
+msgid "Merged Into:"
+msgstr "Zusammengefรผhrt mit:"
+
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
+msgid "Always (Do not perform merge checks)"
+msgstr "Immer (Keine Zusammenfรผhrungsprรผfung)"
+
+#: lib/remote_branch_delete.tcl:153
+msgid "A branch is required for 'Merged Into'."
+msgstr "Fรผr ยปZusammenfรผhren mitยซ muss ein Branch angegeben werden."
+
+#: lib/remote_branch_delete.tcl:185
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+"Folgende Branches sind noch nicht mit ยป%sยซ zusammengefรผhrt:\n"
+"\n"
+" - %s"
+
+#: lib/remote_branch_delete.tcl:190
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits.  Try fetching from %s first."
+msgstr ""
+"Ein oder mehrere Zusammenfรผhrungen sind fehlgeschlagen, da Sie nicht die "
+"notwendigen Commits vorher angefordert haben.  Sie sollten versuchen, zuerst "
+"von ยป%sยซ anzufordern."
+
+#: lib/remote_branch_delete.tcl:208
+msgid "Please select one or more branches to delete."
+msgstr "Bitte wรคhlen Sie mindestens einen Branch, der gelรถscht werden soll."
+
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"Das Wiederherstellen von gelรถschten Branches ist nur mit grรถรŸerem Aufwand "
+"mรถglich.\n"
+"\n"
+"Sollen die ausgewรคhlten Branches gelรถscht werden?"
+
+#: lib/remote_branch_delete.tcl:227
+#, tcl-format
+msgid "Deleting branches from %s"
+msgstr "Branches auf ยป%sยซ werden gelรถscht"
+
+#: lib/remote_branch_delete.tcl:300
+msgid "No repository selected."
+msgstr "Kein Repository ausgewรคhlt."
+
+#: lib/remote_branch_delete.tcl:305
+#, tcl-format
+msgid "Scanning %s..."
+msgstr "ยป%sยซ laden..."
+
+#: lib/choose_repository.tcl:45
 msgid "Git Gui"
 msgstr "Git Gui"
 
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
+#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
 msgid "Create New Repository"
-msgstr "Neues Projektarchiv"
+msgstr "Repository neu erstellen"
 
-#: lib/choose_repository.tcl:93
+#: lib/choose_repository.tcl:110
 msgid "New..."
 msgstr "Neu..."
 
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
+#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
 msgid "Clone Existing Repository"
-msgstr "Projektarchiv klonen"
+msgstr "Repository klonen"
 
-#: lib/choose_repository.tcl:106
+#: lib/choose_repository.tcl:128
 msgid "Clone..."
 msgstr "Klonen..."
 
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
+#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
 msgid "Open Existing Repository"
-msgstr "Projektarchiv รถffnen"
+msgstr "Repository รถffnen"
 
-#: lib/choose_repository.tcl:119
+#: lib/choose_repository.tcl:141
 msgid "Open..."
 msgstr "ร–ffnen..."
 
-#: lib/choose_repository.tcl:132
+#: lib/choose_repository.tcl:154
 msgid "Recent Repositories"
-msgstr "Zuletzt benutzte Projektarchive"
+msgstr "Letzte Repositories"
 
-#: lib/choose_repository.tcl:138
+#: lib/choose_repository.tcl:164
 msgid "Open Recent Repository:"
-msgstr "Zuletzt benutztes Projektarchiv รถffnen:"
+msgstr "Zuletzt benutztes Repository รถffnen:"
 
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
-#: lib/choose_repository.tcl:320
+#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
+#: lib/choose_repository.tcl:345
 #, tcl-format
 msgid "Failed to create repository %s:"
-msgstr "Projektarchiv ยป%sยซ konnte nicht erstellt werden:"
+msgstr "Repository ยป%sยซ konnte nicht erstellt werden:"
 
-#: lib/choose_repository.tcl:391
+#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
+msgid "Create"
+msgstr "Erstellen"
+
+#: lib/choose_repository.tcl:432
 msgid "Directory:"
 msgstr "Verzeichnis:"
 
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
-#: lib/choose_repository.tcl:1052
+#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
+#: lib/choose_repository.tcl:1139
 msgid "Git Repository"
-msgstr "Git Projektarchiv"
+msgstr "Git Repository"
 
-#: lib/choose_repository.tcl:448
+#: lib/choose_repository.tcl:487
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Verzeichnis ยป%sยซ existiert bereits."
 
-#: lib/choose_repository.tcl:452
+#: lib/choose_repository.tcl:491
 #, tcl-format
 msgid "File %s already exists."
 msgstr "Datei ยป%sยซ existiert bereits."
 
-#: lib/choose_repository.tcl:466
+#: lib/choose_repository.tcl:506
 msgid "Clone"
 msgstr "Klonen"
 
-#: lib/choose_repository.tcl:479
+#: lib/choose_repository.tcl:519
 msgid "Source Location:"
-msgstr "Herkunft:"
+msgstr "Herkunfts-Adresse:"
 
-#: lib/choose_repository.tcl:490
+#: lib/choose_repository.tcl:528
 msgid "Target Directory:"
 msgstr "Zielverzeichnis:"
 
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:538
 msgid "Clone Type:"
 msgstr "Art des Klonens:"
 
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:543
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Standard (schnell, teilweise redundant, Hardlinks)"
 
-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:548
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Alles kopieren (langsamer, volle Redundanz)"
 
-#: lib/choose_repository.tcl:520
+#: lib/choose_repository.tcl:553
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Verknรผpft (schnell, nicht empfohlen, kein Backup)"
 
-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
+#: lib/choose_repository.tcl:560
+msgid "Recursively clone submodules too"
+msgstr "Rekursiv weitere Submodule klonen"
+
+#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864
+#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153
 #, tcl-format
 msgid "Not a Git repository: %s"
-msgstr "Kein Git-Projektarchiv in ยป%sยซ gefunden."
+msgstr "Kein Git-Repository: %s"
 
-#: lib/choose_repository.tcl:592
+#: lib/choose_repository.tcl:630
 msgid "Standard only available for local repository."
-msgstr "Standard ist nur fรผr lokale Projektarchive verfรผgbar."
+msgstr "Standard ist nur fรผr lokale Repositories verfรผgbar."
 
-#: lib/choose_repository.tcl:596
+#: lib/choose_repository.tcl:634
 msgid "Shared only available for local repository."
-msgstr "Verknรผpft ist nur fรผr lokale Projektarchive verfรผgbar."
+msgstr "Verknรผpft ist nur fรผr lokale Repositories verfรผgbar."
 
-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:655
 #, tcl-format
 msgid "Location %s already exists."
-msgstr "Projektarchiv ยป%sยซ existiert bereits."
+msgstr "Adresse ยป%sยซ existiert bereits."
 
-#: lib/choose_repository.tcl:628
+#: lib/choose_repository.tcl:666
 msgid "Failed to configure origin"
 msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
 
-#: lib/choose_repository.tcl:640
+#: lib/choose_repository.tcl:678
 msgid "Counting objects"
 msgstr "Objekte werden gezรคhlt"
 
-#: lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:679
 msgid "buckets"
 msgstr "Buckets"
 
-#: lib/choose_repository.tcl:665
+#: lib/choose_repository.tcl:703
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
 
-#: lib/choose_repository.tcl:701
+#: lib/choose_repository.tcl:740
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Von ยป%sยซ konnte nichts geklont werden."
 
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
-#: lib/choose_repository.tcl:929
+#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
+#: lib/choose_repository.tcl:974
 msgid "The 'master' branch has not been initialized."
-msgstr "Der ยปmasterยซ-Zweig wurde noch nicht initialisiert."
+msgstr "Der ยปmasterยซ-Branch wurde noch nicht initialisiert."
 
-#: lib/choose_repository.tcl:716
+#: lib/choose_repository.tcl:755
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "Hardlinks nicht verfรผgbar. Stattdessen wird kopiert."
 
-#: lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:769
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Kopieren von ยป%sยซ"
 
-#: lib/choose_repository.tcl:759
+#: lib/choose_repository.tcl:800
 msgid "Copying objects"
 msgstr "Objektdatenbank kopieren"
 
-#: lib/choose_repository.tcl:760
+#: lib/choose_repository.tcl:801
 msgid "KiB"
 msgstr "KB"
 
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:825
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Objekt kann nicht kopiert werden: %s"
 
-#: lib/choose_repository.tcl:794
+#: lib/choose_repository.tcl:837
 msgid "Linking objects"
 msgstr "Objekte verlinken"
 
-#: lib/choose_repository.tcl:795
+#: lib/choose_repository.tcl:838
 msgid "objects"
 msgstr "Objekte"
 
-#: lib/choose_repository.tcl:803
+#: lib/choose_repository.tcl:846
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Fรผr Objekt konnte kein Hardlink erstellt werden: %s"
 
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:903
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
-"Zweige und Objekte konnten nicht angefordert werden.  Kontrollieren Sie die "
-"Ausgaben auf der Konsole fรผr weitere Angaben."
+"Branches und Objekte konnten nicht angefordert werden.  Kontrollieren Sie "
+"die Ausgaben auf der Konsole fรผr weitere Angaben."
 
-#: lib/choose_repository.tcl:869
+#: lib/choose_repository.tcl:914
 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
-"Markierungen konnten nicht angefordert werden.  Kontrollieren Sie die "
-"Ausgaben auf der Konsole fรผr weitere Angaben."
+"Tags konnten nicht angefordert werden.  Kontrollieren Sie die Ausgaben auf "
+"der Konsole fรผr weitere Angaben."
 
-#: lib/choose_repository.tcl:893
+#: lib/choose_repository.tcl:938
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr ""
-"Die Zweigspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die "
+"Die Branchspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die "
 "Ausgaben auf der Konsole fรผr weitere Angaben."
 
-#: lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:947
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Verzeichnis ยป%sยซ kann nicht aufgerรคumt werden."
 
-#: lib/choose_repository.tcl:908
+#: lib/choose_repository.tcl:953
 msgid "Clone failed."
 msgstr "Klonen fehlgeschlagen."
 
-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:960
 msgid "No default branch obtained."
-msgstr "Kein voreingestellter Zweig gefunden."
+msgstr "Kein voreingestellter Branch gefunden."
 
-#: lib/choose_repository.tcl:926
+#: lib/choose_repository.tcl:971
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
-msgstr "ยป%sยซ wurde nicht als Version gefunden."
+msgstr "ยป%sยซ wurde nicht als Commit gefunden."
 
-#: lib/choose_repository.tcl:938
+#: lib/choose_repository.tcl:998
 msgid "Creating working directory"
 msgstr "Arbeitskopie erstellen"
 
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
-#: lib/index.tcl:198
-msgid "files"
-msgstr "Dateien"
-
-#: lib/choose_repository.tcl:968
+#: lib/choose_repository.tcl:1028
 msgid "Initial file checkout failed."
 msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
 
-#: lib/choose_repository.tcl:1011
-msgid "Open"
-msgstr "ร–ffnen"
+#: lib/choose_repository.tcl:1072
+msgid "Cloning submodules"
+msgstr "Klone Submodul"
 
-#: lib/choose_repository.tcl:1021
+#: lib/choose_repository.tcl:1087
+msgid "Cannot clone submodules."
+msgstr "Submodul konnte nicht geklont werden."
+
+#: lib/choose_repository.tcl:1110
 msgid "Repository:"
-msgstr "Projektarchiv:"
+msgstr "Repository:"
 
-#: lib/choose_repository.tcl:1072
+#: lib/choose_repository.tcl:1159
 #, tcl-format
 msgid "Failed to open repository %s:"
-msgstr "Projektarchiv ยป%sยซ konnte nicht geรถffnet werden."
+msgstr "Repository ยป%sยซ konnte nicht geรถffnet werden."
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - eine grafische Oberflรคche fรผr Git."
+
+#: lib/blame.tcl:74
+#, tcl-format
+msgid "%s (%s): File Viewer"
+msgstr "%s (%s): Datei-Browser"
+
+#: lib/blame.tcl:80
+msgid "Commit:"
+msgstr "Commit:"
+
+#: lib/blame.tcl:282
+msgid "Copy Commit"
+msgstr "Commit kopieren"
+
+#: lib/blame.tcl:286
+msgid "Find Text..."
+msgstr "Text suchen..."
+
+#: lib/blame.tcl:290
+msgid "Goto Line..."
+msgstr "Gehe zu Zeile..."
+
+#: lib/blame.tcl:299
+msgid "Do Full Copy Detection"
+msgstr "Volle Kopie-Erkennung"
+
+#: lib/blame.tcl:303
+msgid "Show History Context"
+msgstr "Historien-Kontext anzeigen"
+
+#: lib/blame.tcl:306
+msgid "Blame Parent Commit"
+msgstr "Elterncommit annotieren"
+
+#: lib/blame.tcl:468
+#, tcl-format
+msgid "Reading %s..."
+msgstr "%s lesen..."
+
+#: lib/blame.tcl:596
+msgid "Loading copy/move tracking annotations..."
+msgstr "Annotierungen fรผr Kopieren/Verschieben werden geladen..."
+
+#: lib/blame.tcl:613
+msgid "lines annotated"
+msgstr "Zeilen annotiert"
+
+#: lib/blame.tcl:815
+msgid "Loading original location annotations..."
+msgstr "Annotierungen fรผr ursprรผnglichen Ort werden geladen..."
+
+#: lib/blame.tcl:818
+msgid "Annotation complete."
+msgstr "Annotierung vollstรคndig."
+
+#: lib/blame.tcl:849
+msgid "Busy"
+msgstr "Verarbeitung lรคuft"
+
+#: lib/blame.tcl:850
+msgid "Annotation process is already running."
+msgstr "Annotierung lรคuft bereits."
+
+#: lib/blame.tcl:889
+msgid "Running thorough copy detection..."
+msgstr "Intensive Kopie-Erkennung lรคuft..."
+
+#: lib/blame.tcl:957
+msgid "Loading annotation..."
+msgstr "Annotierung laden..."
+
+#: lib/blame.tcl:1010
+msgid "Author:"
+msgstr "Autor:"
+
+#: lib/blame.tcl:1014
+msgid "Committer:"
+msgstr "Committer:"
+
+#: lib/blame.tcl:1019
+msgid "Original File:"
+msgstr "Ursprรผngliche Datei:"
+
+#: lib/blame.tcl:1067
+msgid "Cannot find HEAD commit:"
+msgstr "Branchspitze (ยปHEAD commitยซ) kann nicht gefunden werden:"
+
+#: lib/blame.tcl:1122
+msgid "Cannot find parent commit:"
+msgstr "Elterncommit kann nicht gefunden werden:"
+
+#: lib/blame.tcl:1137
+msgid "Unable to display parent"
+msgstr "Elterncommit kann nicht angezeigt werden"
+
+#: lib/blame.tcl:1138 lib/diff.tcl:345
+msgid "Error loading diff:"
+msgstr "Fehler beim Laden des Vergleichs:"
+
+#: lib/blame.tcl:1279
+msgid "Originally By:"
+msgstr "Ursprรผnglich von:"
+
+#: lib/blame.tcl:1285
+msgid "In File:"
+msgstr "In Datei:"
+
+#: lib/blame.tcl:1290
+msgid "Copied Or Moved Here By:"
+msgstr "Kopiert oder verschoben durch:"
+
+#: lib/diff.tcl:77
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
+msgstr ""
+"Keine ร„nderungen feststellbar.\n"
+"\n"
+"ยป%sยซ enthรคlt keine ร„nderungen. Zwar wurde das ร„nderungsdatum dieser Datei "
+"von einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
+"unverรคndert.\n"
+"\n"
+"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese ร„nderung bei allen "
+"Dateien zu prรผfen."
+
+#: lib/diff.tcl:117
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Vergleich von ยป%sยซ laden..."
+
+#: lib/diff.tcl:143
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
+msgstr ""
+"LOKAL: gelรถscht\n"
+"EXTERN:\n"
+
+#: lib/diff.tcl:148
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
+msgstr ""
+"EXTERN: gelรถscht\n"
+"LOKAL:\n"
+
+#: lib/diff.tcl:155
+msgid "LOCAL:\n"
+msgstr "LOKAL:\n"
+
+#: lib/diff.tcl:158
+msgid "REMOTE:\n"
+msgstr "EXTERN:\n"
+
+#: lib/diff.tcl:220 lib/diff.tcl:344
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "Datei ยป%sยซ kann nicht angezeigt werden"
+
+#: lib/diff.tcl:221
+msgid "Error loading file:"
+msgstr "Fehler beim Laden der Datei:"
+
+#: lib/diff.tcl:227
+msgid "Git Repository (subproject)"
+msgstr "Git-Repository (Subprojekt)"
+
+#: lib/diff.tcl:239
+msgid "* Binary file (not showing content)."
+msgstr "* Binรคrdatei (Inhalt wird nicht angezeigt)"
+
+#: lib/diff.tcl:244
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"
+msgstr ""
+"* Unversionierte Datei hat %d Bytes.\n"
+"* Nur erste %d Bytes werden angezeigt.\n"
+
+#: lib/diff.tcl:250
+#, tcl-format
+msgid ""
+"\n"
+"* Untracked file clipped here by %s.\n"
+"* To see the entire file, use an external editor.\n"
+msgstr ""
+"\n"
+"* Unversionierte Datei, hier abgeschnitten durch %s.\n"
+"* Zum Ansehen der vollstรคndigen Datei externen Editor benutzen.\n"
+
+#: lib/diff.tcl:583
+msgid "Failed to unstage selected hunk."
+msgstr ""
+"Fehler beim Herausnehmen des gewรคhlten Patch-Blocks aus der Bereitstellung."
+
+#: lib/diff.tcl:591
+msgid "Failed to revert selected hunk."
+msgstr "Fehler beim Zurรผcknehmen des gewรคhlten Patch-Blocks."
+
+#: lib/diff.tcl:594
+msgid "Failed to stage selected hunk."
+msgstr "Fehler beim Bereitstellen des gewรคhlten Patch-Blocks."
+
+#: lib/diff.tcl:687
+msgid "Failed to unstage selected line."
+msgstr "Fehler beim Herausnehmen der gewรคhlten Zeile aus der Bereitstellung."
+
+#: lib/diff.tcl:696
+msgid "Failed to revert selected line."
+msgstr "Fehler beim Zurรผcknehmen der gewรคhlten Zeile."
+
+#: lib/diff.tcl:700
+msgid "Failed to stage selected line."
+msgstr "Fehler beim Bereitstellen der gewรคhlten Zeile."
+
+#: lib/diff.tcl:889
+msgid "Failed to undo last revert."
+msgstr "Fehler beim Rรผckgรคngigmachen des letzten Zurรผcknehmen-Commits"
+
+#: lib/sshkey.tcl:34
+msgid "No keys found."
+msgstr "Keine Schlรผssel gefunden."
+
+#: lib/sshkey.tcl:37
+#, tcl-format
+msgid "Found a public key in: %s"
+msgstr "ร–ffentlicher Schlรผssel gefunden in: %s"
+
+#: lib/sshkey.tcl:43
+msgid "Generate Key"
+msgstr "Schlรผssel erzeugen"
 
-#: lib/choose_rev.tcl:53
+#: lib/sshkey.tcl:61
+msgid "Copy To Clipboard"
+msgstr "In Zwischenablage kopieren"
+
+#: lib/sshkey.tcl:75
+msgid "Your OpenSSH Public Key"
+msgstr "Ihr OpenSSH รถffenlicher Schlรผssel"
+
+#: lib/sshkey.tcl:83
+msgid "Generating..."
+msgstr "Erzeugen..."
+
+#: lib/sshkey.tcl:89
+#, tcl-format
+msgid ""
+"Could not start ssh-keygen:\n"
+"\n"
+"%s"
+msgstr ""
+"Konnte ยปssh-keygenยซ nicht starten:\n"
+"\n"
+"%s"
+
+#: lib/sshkey.tcl:116
+msgid "Generation failed."
+msgstr "Schlรผsselerzeugung fehlgeschlagen."
+
+#: lib/sshkey.tcl:123
+msgid "Generation succeeded, but no keys found."
+msgstr "Schlรผsselerzeugung erfolgreich, aber keine Schlรผssel gefunden."
+
+#: lib/sshkey.tcl:126
+#, tcl-format
+msgid "Your key is in: %s"
+msgstr "Ihr Schlรผssel ist abgelegt in: %s"
+
+#: lib/branch_create.tcl:23
+#, tcl-format
+msgid "%s (%s): Create Branch"
+msgstr "%s (%s): Branch erstellen"
+
+#: lib/branch_create.tcl:28
+msgid "Create New Branch"
+msgstr "Neuen Branch erstellen"
+
+#: lib/branch_create.tcl:42
+msgid "Branch Name"
+msgstr "Branchname"
+
+#: lib/branch_create.tcl:57
+msgid "Match Tracking Branch Name"
+msgstr "Passend zu Trackingbranch-Name"
+
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "Anfangsversion"
+
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "Existierenden Branch aktualisieren:"
+
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "Nein"
+
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "Nur Vorspulen"
+
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "Branch auschecken nach Erstellen"
+
+#: lib/branch_create.tcl:132
+msgid "Please select a tracking branch."
+msgstr "Bitte wรคhlen Sie einen Trackingbranch."
+
+#: lib/branch_create.tcl:141
+#, tcl-format
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr "Trackingbranch ยป%sยซ ist kein Branch im externen Repository."
+
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "Verarbeitung. Bitte warten..."
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "Erfolgreich"
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr "Fehler: Kommando fehlgeschlagen"
+
+#: lib/line.tcl:17
+msgid "Goto Line:"
+msgstr "Gehe zu Zeile:"
+
+#: lib/line.tcl:23
+msgid "Go"
+msgstr "Gehe"
+
+#: lib/choose_rev.tcl:52
 msgid "This Detached Checkout"
-msgstr "Abgetrennte Arbeitskopie-Version"
+msgstr "Losgelรถste Arbeitskopie-Version"
 
 #: lib/choose_rev.tcl:60
 msgid "Revision Expression:"
-msgstr "Version Regexp-Ausdruck:"
+msgstr "Version Regex-Ausdruck:"
 
-#: lib/choose_rev.tcl:74
+#: lib/choose_rev.tcl:72
 msgid "Local Branch"
-msgstr "Lokaler Zweig"
+msgstr "Lokaler Branch"
 
-#: lib/choose_rev.tcl:79
+#: lib/choose_rev.tcl:77
 msgid "Tracking Branch"
-msgstr "รœbernahmezweig"
+msgstr "Trackingbranch"
 
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
 msgid "Tag"
-msgstr "Markierung"
+msgstr "Tag"
 
-#: lib/choose_rev.tcl:317
+#: lib/choose_rev.tcl:321
 #, tcl-format
 msgid "Invalid revision: %s"
 msgstr "Ungรผltige Version: %s"
 
-#: lib/choose_rev.tcl:338
+#: lib/choose_rev.tcl:342
 msgid "No revision selected."
 msgstr "Keine Version ausgewรคhlt."
 
-#: lib/choose_rev.tcl:346
+#: lib/choose_rev.tcl:350
 msgid "Revision expression is empty."
 msgstr "Versions-Ausdruck ist leer."
 
-#: lib/choose_rev.tcl:531
+#: lib/choose_rev.tcl:537
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: lib/choose_rev.tcl:559
+#: lib/choose_rev.tcl:565
 msgid "URL"
 msgstr "URL"
 
@@ -1337,10 +2409,10 @@ msgid ""
 "You are about to create the initial commit.  There is no commit before this "
 "to amend.\n"
 msgstr ""
-"Keine Version zur Nachbesserung vorhanden.\n"
+"Kein Commit zur Nachbesserung vorhanden.\n"
 "\n"
-"Sie sind dabei, die erste Version zu รผbertragen. Es gibt keine existierende "
-"Version, die Sie nachbessern kรถnnten.\n"
+"Sie sind dabei, den ersten Commit zu erstellen. Es gibt keinen existierenden "
+"Commit, den Sie nachbessern kรถnnten.\n"
 
 #: lib/commit.tcl:18
 msgid ""
@@ -1350,31 +2422,31 @@ msgid ""
 "completed.  You cannot amend the prior commit unless you first abort the "
 "current merge activity.\n"
 msgstr ""
-"Nachbesserung wรคhren Zusammenfรผhrung nicht mรถglich.\n"
+"Nachbesserung bei Zusammenfรผhrung nicht mรถglich.\n"
 "\n"
-"Sie haben das Zusammenfรผhren von Versionen angefangen, aber noch nicht "
-"beendet. Sie kรถnnen keine vorige รœbertragung nachbessern, solange eine "
+"Sie haben das Zusammenfรผhren von Commits angefangen, aber noch nicht "
+"beendet. Sie kรถnnen keinen vorigen Commit nachbessern, solange eine "
 "unfertige Zusammenfรผhrung existiert. Dazu mรผssen Sie die Zusammenfรผhrung "
 "beenden oder abbrechen.\n"
 
-#: lib/commit.tcl:48
+#: lib/commit.tcl:56
 msgid "Error loading commit data for amend:"
-msgstr "Fehler beim Laden der Versionsdaten fรผr Nachbessern:"
+msgstr "Fehler beim Laden der Commitdaten fรผr Nachbessern:"
 
-#: lib/commit.tcl:75
+#: lib/commit.tcl:83
 msgid "Unable to obtain your identity:"
 msgstr "Benutzername konnte nicht bestimmt werden:"
 
-#: lib/commit.tcl:80
+#: lib/commit.tcl:88
 msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr "Ungรผltiger Wert von GIT_COMMITTER_INDENT:"
 
-#: lib/commit.tcl:129
+#: lib/commit.tcl:138
 #, tcl-format
 msgid "warning: Tcl does not support encoding '%s'."
 msgstr "Warning: Tcl/Tk unterstรผtzt die Zeichencodierung ยป%sยซ nicht."
 
-#: lib/commit.tcl:149
+#: lib/commit.tcl:158
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -1383,14 +2455,14 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv รผberein.\n"
+"Der letzte geladene Status stimmt nicht mehr mit dem Repository รผberein.\n"
 "\n"
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
-"geรคndert.  Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
+"Ein anderes Git-Programm hat das Repository seit dem letzten Laden "
+"geรคndert.  Vor dem nรคchsten Commit muss neu geladen werden.\n"
 "\n"
 "Es wird gleich neu geladen.\n"
 
-#: lib/commit.tcl:172
+#: lib/commit.tcl:182
 #, tcl-format
 msgid ""
 "Unmerged files cannot be committed.\n"
@@ -1398,12 +2470,13 @@ msgid ""
 "File %s has merge conflicts.  You must resolve them and stage the file "
 "before committing.\n"
 msgstr ""
-"Nicht zusammengefรผhrte Dateien kรถnnen nicht eingetragen werden.\n"
+"Nicht zusammengefรผhrte Dateien kรถnnen nicht committet werden.\n"
 "\n"
 "Die Datei ยป%sยซ hat noch nicht aufgelรถste Zusammenfรผhrungs-Konflikte. Sie "
-"mรผssen diese Konflikte auflรถsen, bevor Sie eintragen kรถnnen.\n"
+"mรผssen diese Konflikte auflรถsen und die Dateien in die Bereitstellung "
+"hinzufรผgen, bevor Sie committen kรถnnen.\n"
 
-#: lib/commit.tcl:180
+#: lib/commit.tcl:190
 #, tcl-format
 msgid ""
 "Unknown file state %s detected.\n"
@@ -1412,19 +2485,19 @@ msgid ""
 msgstr ""
 "Unbekannter Dateizustand ยป%sยซ.\n"
 "\n"
-"Datei ยป%sยซ kann nicht eingetragen werden.\n"
+"Datei ยป%sยซ kann nicht committet werden.\n"
 
-#: lib/commit.tcl:188
+#: lib/commit.tcl:198
 msgid ""
 "No changes to commit.\n"
 "\n"
 "You must stage at least 1 file before you can commit.\n"
 msgstr ""
-"Keine ร„nderungen vorhanden, die eingetragen werden kรถnnten.\n"
+"Keine ร„nderungen vorhanden, die committet werden kรถnnten.\n"
 "\n"
-"Sie mรผssen mindestens eine Datei bereitstellen, bevor Sie eintragen kรถnnen.\n"
+"Sie mรผssen mindestens eine Datei bereitstellen, bevor Sie committen kรถnnen.\n"
 
-#: lib/commit.tcl:203
+#: lib/commit.tcl:213
 msgid ""
 "Please supply a commit message.\n"
 "\n"
@@ -1444,42 +2517,58 @@ msgstr ""
 "\n"
 "- Rest: Eine ausfรผhrliche Beschreibung, warum diese ร„nderung hilfreich ist.\n"
 
-#: lib/commit.tcl:234
+#: lib/commit.tcl:244
 msgid "Calling pre-commit hook..."
-msgstr "Aufrufen der Vor-Eintragen-Kontrolle (ยปpre-commit hookยซ)..."
+msgstr "Aufrufen des ยปpre-commit hookยซ..."
 
-#: lib/commit.tcl:249
+#: lib/commit.tcl:259
 msgid "Commit declined by pre-commit hook."
-msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (ยปpre-commit hookยซ)."
+msgstr "Committen abgelehnt durch ยปpre-commit hookยซ."
 
-#: lib/commit.tcl:272
+#: lib/commit.tcl:278
+msgid ""
+"You are about to commit on a detached head. This is a potentially dangerous "
+"thing to do because if you switch to another branch you will lose your "
+"changes and it can be difficult to retrieve them later from the reflog. You "
+"should probably cancel this commit and create a new branch to continue.\n"
+" \n"
+" Do you really want to proceed with your Commit?"
+msgstr ""
+"Sie sind dabei, einen Commit auf losgelรถste Branchspitze (ยปcommit to "
+"detached headยซ) zu erstellen. Das ist riskant, denn wenn Sie zu einem "
+"anderen Branch wechseln, wรผrden Sie diese ร„nderungen verlieren und es ist "
+"nachtrรคglich schwierig, diese aus dem Commit-Log (ยปreflogยซ) wiederzufinden. "
+"Es wird empfohlen, diesen Commit abzubrechen und zunรคchst einen neuen Branch "
+"zu erstellen.\n"
+"\n"
+" Wollen Sie den Commit trotzdem in dieser Form erstellen?"
+
+#: lib/commit.tcl:299
 msgid "Calling commit-msg hook..."
-msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle (ยปcommit-message hookยซ)..."
+msgstr "Aufrufen des ยปcommit-msg hookยซ..."
 
-#: lib/commit.tcl:287
+#: lib/commit.tcl:314
 msgid "Commit declined by commit-msg hook."
-msgstr ""
-"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (ยปcommit-message "
-"hookยซ)."
+msgstr "Committen abgelehnt durch ยปcommit-msg hookยซ."
 
-#: lib/commit.tcl:300
+#: lib/commit.tcl:327
 msgid "Committing changes..."
-msgstr "ร„nderungen eintragen..."
+msgstr "ร„nderungen committen..."
 
-#: lib/commit.tcl:316
+#: lib/commit.tcl:344
 msgid "write-tree failed:"
 msgstr "write-tree fehlgeschlagen:"
 
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
+#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
 msgid "Commit failed."
-msgstr "Eintragen fehlgeschlagen."
+msgstr "Committen fehlgeschlagen."
 
-#: lib/commit.tcl:334
+#: lib/commit.tcl:362
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "Version ยป%sยซ scheint beschรคdigt zu sein"
 
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
 msgid ""
 "No changes to commit.\n"
 "\n"
@@ -1487,70 +2576,104 @@ msgid ""
 "\n"
 "A rescan will be automatically started now.\n"
 msgstr ""
-"Keine ร„nderungen einzutragen.\n"
+"Keine ร„nderungen zum committen.\n"
 "\n"
-"Es gibt keine geรคnderte Datei bei dieser Version und es wurde auch nichts "
+"Es gibt keine geรคnderte Datei in diesem Commit und es wurde auch nichts "
 "zusammengefรผhrt.\n"
 "\n"
 "Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
 
-#: lib/commit.tcl:346
+#: lib/commit.tcl:374
 msgid "No changes to commit."
-msgstr "Keine ร„nderungen, die eingetragen werden kรถnnen."
+msgstr "Keine ร„nderungen, die committet werden kรถnnen."
 
-#: lib/commit.tcl:360
+#: lib/commit.tcl:394
 msgid "commit-tree failed:"
 msgstr "commit-tree fehlgeschlagen:"
 
-#: lib/commit.tcl:381
+#: lib/commit.tcl:421
 msgid "update-ref failed:"
 msgstr "update-ref fehlgeschlagen:"
 
-#: lib/commit.tcl:469
+#: lib/commit.tcl:514
 #, tcl-format
 msgid "Created commit %s: %s"
-msgstr "Version %s รผbertragen: %s"
+msgstr "Commit %s erstellt: %s"
 
-#: lib/console.tcl:59
-msgid "Working... please wait..."
-msgstr "Verarbeitung. Bitte warten..."
+#: lib/branch_delete.tcl:16
+#, tcl-format
+msgid "%s (%s): Delete Branch"
+msgstr "%s (%s): Branch lรถschen"
 
-#: lib/console.tcl:186
-msgid "Success"
-msgstr "Erfolgreich"
+#: lib/branch_delete.tcl:21
+msgid "Delete Local Branch"
+msgstr "Lokalen Branch lรถschen"
 
-#: lib/console.tcl:200
-msgid "Error: Command Failed"
-msgstr "Fehler: Kommando fehlgeschlagen"
+#: lib/branch_delete.tcl:39
+msgid "Local Branches"
+msgstr "Lokale Branches"
 
-#: lib/database.tcl:43
+#: lib/branch_delete.tcl:51
+msgid "Delete Only If Merged Into"
+msgstr "Nur lรถschen, wenn zusammengefรผhrt nach"
+
+#: lib/branch_delete.tcl:103
+#, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr "Folgende Branches sind noch nicht mit ยป%sยซ zusammengefรผhrt:"
+
+#: lib/branch_delete.tcl:131
+#, tcl-format
+msgid " - %s:"
+msgstr " - %s:"
+
+#: lib/branch_delete.tcl:141
+#, tcl-format
+msgid ""
+"Failed to delete branches:\n"
+"%s"
+msgstr ""
+"Fehler beim Lรถschen der Branches:\n"
+"%s"
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Ungรผltiges Datum von Git: %s"
+
+#: lib/database.tcl:42
 msgid "Number of loose objects"
 msgstr "Anzahl unverknรผpfter Objekte"
 
-#: lib/database.tcl:44
+#: lib/database.tcl:43
 msgid "Disk space used by loose objects"
 msgstr "Festplattenplatz von unverknรผpften Objekten"
 
-#: lib/database.tcl:45
+#: lib/database.tcl:44
 msgid "Number of packed objects"
 msgstr "Anzahl komprimierter Objekte"
 
-#: lib/database.tcl:46
+#: lib/database.tcl:45
 msgid "Number of packs"
 msgstr "Anzahl Komprimierungseinheiten"
 
-#: lib/database.tcl:47
+#: lib/database.tcl:46
 msgid "Disk space used by packed objects"
 msgstr "Festplattenplatz von komprimierten Objekten"
 
-#: lib/database.tcl:48
+#: lib/database.tcl:47
 msgid "Packed objects waiting for pruning"
 msgstr "Komprimierte Objekte, die zum Aufrรคumen vorgesehen sind"
 
-#: lib/database.tcl:49
+#: lib/database.tcl:48
 msgid "Garbage files"
 msgstr "Dateien im Mรผlleimer"
 
+#: lib/database.tcl:66
+#, tcl-format
+msgid "%s (%s): Database Statistics"
+msgstr "%s (%s): Datenbankstatistik"
+
 #: lib/database.tcl:72
 msgid "Compressing the object database"
 msgstr "Objektdatenbank komprimieren"
@@ -1569,214 +2692,37 @@ msgid ""
 "\n"
 "Compress the database now?"
 msgstr ""
-"Dieses Projektarchiv enthรคlt ungefรคhr %i nicht verknรผpfte Objekte.\n"
+"Dieses Repository enthรคlt ungefรคhr %i nicht verknรผpfte Objekte.\n"
 "\n"
-"Fรผr eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren.\n"
+"Fรผr eine optimale Performance wird empfohlen, die Datenbank des Repository "
+"zu komprimieren.\n"
 "\n"
 "Soll die Datenbank jetzt komprimiert werden?"
 
-#: lib/date.tcl:25
+#: lib/error.tcl:20
 #, tcl-format
-msgid "Invalid date from Git: %s"
-msgstr "Ungรผltiges Datum von Git: %s"
-
-#: lib/diff.tcl:64
-#, tcl-format
-msgid ""
-"No differences detected.\n"
-"\n"
-"%s has no changes.\n"
-"\n"
-"The modification date of this file was updated by another application, but "
-"the content within the file was not changed.\n"
-"\n"
-"A rescan will be automatically started to find other files which may have "
-"the same state."
-msgstr ""
-"Keine ร„nderungen feststellbar.\n"
-"\n"
-"ยป%sยซ enthรคlt keine ร„nderungen. Zwar wurde das ร„nderungsdatum dieser Datei von "
-"einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
-"unverรคndert.\n"
-"\n"
-"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese ร„nderung bei allen "
-"Dateien zu prรผfen."
-
-#: lib/diff.tcl:104
-#, tcl-format
-msgid "Loading diff of %s..."
-msgstr "Vergleich von ยป%sยซ laden..."
-
-#: lib/diff.tcl:125
-msgid ""
-"LOCAL: deleted\n"
-"REMOTE:\n"
-msgstr ""
-"LOKAL: gelรถscht\n"
-"ANDERES:\n"
-
-#: lib/diff.tcl:130
-msgid ""
-"REMOTE: deleted\n"
-"LOCAL:\n"
-msgstr ""
-"ANDERES: gelรถscht\n"
-"LOKAL:\n"
-
-#: lib/diff.tcl:137
-msgid "LOCAL:\n"
-msgstr "LOKAL:\n"
-
-#: lib/diff.tcl:140
-msgid "REMOTE:\n"
-msgstr "ANDERES:\n"
-
-#: lib/diff.tcl:202 lib/diff.tcl:319
-#, tcl-format
-msgid "Unable to display %s"
-msgstr "Datei ยป%sยซ kann nicht angezeigt werden"
-
-#: lib/diff.tcl:203
-msgid "Error loading file:"
-msgstr "Fehler beim Laden der Datei:"
-
-#: lib/diff.tcl:210
-msgid "Git Repository (subproject)"
-msgstr "Git-Projektarchiv (Unterprojekt)"
-
-#: lib/diff.tcl:222
-msgid "* Binary file (not showing content)."
-msgstr "* Binรคrdatei (Inhalt wird nicht angezeigt)"
-
-#: lib/diff.tcl:227
-#, tcl-format
-msgid ""
-"* Untracked file is %d bytes.\n"
-"* Showing only first %d bytes.\n"
-msgstr ""
-"* Datei nicht unter Versionskontrolle, DateigrรถรŸe %d Bytes.\n"
-"* Nur erste %d Bytes werden angezeigt.\n"
-
-#: lib/diff.tcl:233
-#, tcl-format
-msgid ""
-"\n"
-"* Untracked file clipped here by %s.\n"
-"* To see the entire file, use an external editor.\n"
-msgstr ""
-"\n"
-"* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n"
-"* Zum Ansehen der vollstรคndigen Datei externen Editor benutzen.\n"
-
-#: lib/diff.tcl:482
-msgid "Failed to unstage selected hunk."
-msgstr ""
-"Fehler beim Herausnehmen des gewรคhlten Kontexts aus der Bereitstellung."
-
-#: lib/diff.tcl:489
-msgid "Failed to stage selected hunk."
-msgstr "Fehler beim Bereitstellen des gewรคhlten Kontexts."
-
-#: lib/diff.tcl:568
-msgid "Failed to unstage selected line."
-msgstr "Fehler beim Herausnehmen der gewรคhlten Zeile aus der Bereitstellung."
-
-#: lib/diff.tcl:576
-msgid "Failed to stage selected line."
-msgstr "Fehler beim Bereitstellen der gewรคhlten Zeile."
-
-#: lib/encoding.tcl:443
-msgid "Default"
-msgstr "Voreinstellung"
-
-#: lib/encoding.tcl:448
-#, tcl-format
-msgid "System (%s)"
-msgstr "Systemweit (%s)"
-
-#: lib/encoding.tcl:459 lib/encoding.tcl:465
-msgid "Other"
-msgstr "Andere"
-
-#: lib/error.tcl:20 lib/error.tcl:114
-msgid "error"
-msgstr "Fehler"
+msgid "%s: error"
+msgstr "%s: Fehler"
 
 #: lib/error.tcl:36
-msgid "warning"
-msgstr "Warnung"
-
-#: lib/error.tcl:94
-msgid "You must correct the above errors before committing."
-msgstr ""
-"Sie mรผssen die obigen Fehler zuerst beheben, bevor Sie eintragen kรถnnen."
-
-#: lib/index.tcl:6
-msgid "Unable to unlock the index."
-msgstr "Bereitstellung kann nicht wieder freigegeben werden."
-
-#: lib/index.tcl:15
-msgid "Index Error"
-msgstr "Fehler in Bereitstellung"
-
-#: lib/index.tcl:17
-msgid ""
-"Updating the Git index failed.  A rescan will be automatically started to "
-"resynchronize git-gui."
-msgstr ""
-"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine "
-"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu "
-"synchronisieren."
-
-#: lib/index.tcl:28
-msgid "Continue"
-msgstr "Fortsetzen"
-
-#: lib/index.tcl:31
-msgid "Unlock Index"
-msgstr "Bereitstellung freigeben"
-
-#: lib/index.tcl:289
 #, tcl-format
-msgid "Unstaging %s from commit"
-msgstr "Datei ยป%sยซ aus der Bereitstellung herausnehmen"
+msgid "%s: warning"
+msgstr "%s: Warnung"
 
-#: lib/index.tcl:328
-msgid "Ready to commit."
-msgstr "Bereit zum Eintragen."
-
-#: lib/index.tcl:341
+#: lib/error.tcl:80
 #, tcl-format
-msgid "Adding %s"
-msgstr "ยป%sยซ hinzufรผgen..."
+msgid "%s hook failed:"
+msgstr "%s hook fehlgeschlagen:"
 
-#: lib/index.tcl:398
-#, tcl-format
-msgid "Revert changes in file %s?"
-msgstr "ร„nderungen in Datei ยป%sยซ verwerfen?"
-
-#: lib/index.tcl:400
-#, tcl-format
-msgid "Revert changes in these %i files?"
-msgstr "ร„nderungen in den gewรคhlten %i Dateien verwerfen?"
-
-#: lib/index.tcl:408
-msgid "Any unstaged changes will be permanently lost by the revert."
+#: lib/error.tcl:96
+msgid "You must correct the above errors before committing."
 msgstr ""
-"Alle nicht bereitgestellten ร„nderungen werden beim Verwerfen verloren gehen."
-
-#: lib/index.tcl:411
-msgid "Do Nothing"
-msgstr "Nichts tun"
-
-#: lib/index.tcl:429
-msgid "Reverting selected files"
-msgstr "ร„nderungen in gewรคhlten Dateien verwerfen"
+"Sie mรผssen die obigen Fehler zuerst beheben, bevor Sie committen kรถnnen."
 
-#: lib/index.tcl:433
+#: lib/error.tcl:116
 #, tcl-format
-msgid "Reverting %s"
-msgstr "ร„nderungen in %s verwerfen"
+msgid "%s (%s): error"
+msgstr "%s (%s): Fehler"
 
 #: lib/merge.tcl:13
 msgid ""
@@ -1786,7 +2732,7 @@ msgid ""
 msgstr ""
 "Zusammenfรผhren kann nicht gleichzeitig mit Nachbessern durchgefรผhrt werden.\n"
 "\n"
-"Sie mรผssen zuerst die Nachbesserungs-Version abschlieรŸen, bevor Sie "
+"Sie mรผssen zuerst den Nachbesserungs-Commit abschlieรŸen, bevor Sie "
 "zusammenfรผhren kรถnnen.\n"
 
 #: lib/merge.tcl:27
@@ -1798,9 +2744,9 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv รผberein.\n"
+"Der letzte geladene Status stimmt nicht mehr mit dem Repository รผberein.\n"
 "\n"
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
+"Ein anderes Git-Programm hat das Repository seit dem letzten Laden "
 "geรคndert.  Vor einem Zusammenfรผhren muss neu geladen werden.\n"
 "\n"
 "Es wird gleich neu geladen.\n"
@@ -1817,10 +2763,11 @@ msgid ""
 msgstr ""
 "Zusammenfรผhrung mit Konflikten.\n"
 "\n"
-"Die Datei ยป%sยซ enthรคlt Konflikte beim Zusammenfรผhren. Sie mรผssen diese "
-"Konflikte per Hand auflรถsen. AnschlieรŸend mรผssen Sie die Datei wieder "
-"bereitstellen und eintragen, um die Zusammenfรผhrung abzuschlieรŸen. Erst "
-"danach kann eine neue Zusammenfรผhrung begonnen werden.\n"
+"Die Datei ยป%sยซ enthรคlt Konflikte beim Zusammenfรผhren.\n"
+"\n"
+"Sie mรผssen diese Konflikte per Hand auflรถsen. AnschlieรŸend mรผssen Sie die "
+"Datei wieder bereitstellen und committen, um die Zusammenfรผhrung "
+"abzuschlieรŸen. Erst danach kann eine neue Zusammenfรผhrung begonnen werden.\n"
 
 #: lib/merge.tcl:55
 #, tcl-format
@@ -1834,39 +2781,45 @@ msgid ""
 msgstr ""
 "Es liegen ร„nderungen vor.\n"
 "\n"
-"Die Datei ยป%sยซ wurde geรคndert.  Sie sollten zuerst die bereitgestellte "
-"Version abschlieรŸen, bevor Sie eine Zusammenfรผhrung beginnen.  Mit dieser "
-"Reihenfolge kรถnnen Sie mรถgliche Konflikte beim Zusammenfรผhren wesentlich "
-"einfacher beheben oder abbrechen.\n"
+"Die Datei ยป%sยซ wurde geรคndert.\n"
+"\n"
+"Sie sollten zuerst den bereitgestellten Commit abschlieรŸen, bevor Sie eine "
+"Zusammenfรผhrung beginnen.  Mit dieser Reihenfolge kรถnnen Sie mรถgliche "
+"Konflikte beim Zusammenfรผhren wesentlich einfacher beheben oder abbrechen.\n"
 
-#: lib/merge.tcl:107
+#: lib/merge.tcl:108
 #, tcl-format
 msgid "%s of %s"
 msgstr "%s von %s"
 
-#: lib/merge.tcl:120
+#: lib/merge.tcl:126
 #, tcl-format
 msgid "Merging %s and %s..."
 msgstr "Zusammenfรผhren von %s und %s..."
 
-#: lib/merge.tcl:131
+#: lib/merge.tcl:137
 msgid "Merge completed successfully."
 msgstr "Zusammenfรผhren erfolgreich abgeschlossen."
 
-#: lib/merge.tcl:133
+#: lib/merge.tcl:139
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "Zusammenfรผhren fehlgeschlagen. Konfliktauflรถsung ist notwendig."
 
-#: lib/merge.tcl:158
+#: lib/merge.tcl:156
+#, tcl-format
+msgid "%s (%s): Merge"
+msgstr "%s (%s): Zusammenfรผhren"
+
+#: lib/merge.tcl:164
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Zusammenfรผhren in ยป%sยซ"
 
-#: lib/merge.tcl:177
+#: lib/merge.tcl:183
 msgid "Revision To Merge"
 msgstr "Zusammenzufรผhrende Version"
 
-#: lib/merge.tcl:212
+#: lib/merge.tcl:218
 msgid ""
 "Cannot abort while amending.\n"
 "\n"
@@ -1874,9 +2827,9 @@ msgid ""
 msgstr ""
 "Abbruch der Nachbesserung ist nicht mรถglich.\n"
 "\n"
-"Sie mรผssen die Nachbesserung der Version abschlieรŸen.\n"
+"Sie mรผssen die Nachbesserung diese Commits abschlieรŸen.\n"
 
-#: lib/merge.tcl:222
+#: lib/merge.tcl:228
 msgid ""
 "Abort merge?\n"
 "\n"
@@ -1886,12 +2839,11 @@ msgid ""
 msgstr ""
 "Zusammenfรผhren abbrechen?\n"
 "\n"
-"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen ร„nderungen "
-"verloren.\n"
+"Wenn Sie abbrechen, gehen alle noch nicht committeten ร„nderungen verloren.\n"
 "\n"
 "Zusammenfรผhren jetzt abbrechen?"
 
-#: lib/merge.tcl:228
+#: lib/merge.tcl:234
 msgid ""
 "Reset changes?\n"
 "\n"
@@ -1899,694 +2851,24 @@ msgid ""
 "\n"
 "Continue with resetting the current changes?"
 msgstr ""
-"ร„nderungen zurรผcksetzen?\n"
+"ร„nderungen verwerfen?\n"
 "\n"
-"Wenn Sie zurรผcksetzen, gehen alle noch nicht eingetragenen ร„nderungen "
-"verloren.\n"
+"Alle noch nicht committeten ร„nderungen wรผrden verloren gehen.\n"
 "\n"
-"ร„nderungen jetzt zurรผcksetzen?"
+"ร„nderungen jetzt verwerfen?"
 
-#: lib/merge.tcl:239
+#: lib/merge.tcl:246
 msgid "Aborting"
 msgstr "Abbruch"
 
-#: lib/merge.tcl:239
+#: lib/merge.tcl:247
 msgid "files reset"
 msgstr "Dateien zurรผckgesetzt"
 
-#: lib/merge.tcl:267
+#: lib/merge.tcl:277
 msgid "Abort failed."
 msgstr "Abbruch fehlgeschlagen."
 
-#: lib/merge.tcl:269
+#: lib/merge.tcl:279
 msgid "Abort completed.  Ready."
 msgstr "Abbruch durchgefรผhrt. Bereit."
-
-#: lib/mergetool.tcl:8
-msgid "Force resolution to the base version?"
-msgstr "Konflikt durch Basisversion ersetzen?"
-
-#: lib/mergetool.tcl:9
-msgid "Force resolution to this branch?"
-msgstr "Konflikt durch diesen Zweig ersetzen?"
-
-#: lib/mergetool.tcl:10
-msgid "Force resolution to the other branch?"
-msgstr "Konflikt durch anderen Zweig ersetzen?"
-
-#: lib/mergetool.tcl:14
-#, tcl-format
-msgid ""
-"Note that the diff shows only conflicting changes.\n"
-"\n"
-"%s will be overwritten.\n"
-"\n"
-"This operation can be undone only by restarting the merge."
-msgstr ""
-"Hinweis: Der Vergleich zeigt nur konfliktverursachende ร„nderungen an.\n"
-"\n"
-"ยป%sยซ wird รผberschrieben.\n"
-"\n"
-"Diese Operation kann nur rรผckgรคngig gemacht werden, wenn die\n"
-"Zusammenfรผhrung erneut gestartet wird."
-
-#: lib/mergetool.tcl:45
-#, tcl-format
-msgid "File %s seems to have unresolved conflicts, still stage?"
-msgstr "Datei ยป%sยซ hat nicht aufgelรถste Konflikte. Trotzdem bereitstellen?"
-
-#: lib/mergetool.tcl:60
-#, tcl-format
-msgid "Adding resolution for %s"
-msgstr "Auflรถsung hinzugefรผgt fรผr %s"
-
-#: lib/mergetool.tcl:141
-msgid "Cannot resolve deletion or link conflicts using a tool"
-msgstr ""
-"Konflikte durch gelรถschte Dateien oder symbolische Links kรถnnen nicht durch "
-"das Zusamenfรผhrungswerkzeug gelรถst werden."
-
-#: lib/mergetool.tcl:146
-msgid "Conflict file does not exist"
-msgstr "Konflikt-Datei existiert nicht"
-
-#: lib/mergetool.tcl:264
-#, tcl-format
-msgid "Not a GUI merge tool: '%s'"
-msgstr "Kein GUI Zusammenfรผhrungswerkzeug: ยป%sยซ"
-
-#: lib/mergetool.tcl:268
-#, tcl-format
-msgid "Unsupported merge tool '%s'"
-msgstr "Unbekanntes Zusammenfรผhrungswerkzeug: ยป%sยซ"
-
-#: lib/mergetool.tcl:303
-msgid "Merge tool is already running, terminate it?"
-msgstr "Zusammenfรผhrungswerkzeug lรคuft bereits. Soll es abgebrochen werden?"
-
-#: lib/mergetool.tcl:323
-#, tcl-format
-msgid ""
-"Error retrieving versions:\n"
-"%s"
-msgstr ""
-"Fehler beim Abrufen der Dateiversionen:\n"
-"%s"
-
-#: lib/mergetool.tcl:343
-#, tcl-format
-msgid ""
-"Could not start the merge tool:\n"
-"\n"
-"%s"
-msgstr ""
-"Zusammenfรผhrungswerkzeug konnte nicht gestartet werden:\n"
-"\n"
-"%s"
-
-#: lib/mergetool.tcl:347
-msgid "Running merge tool..."
-msgstr "Zusammenfรผhrungswerkzeug starten..."
-
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
-msgid "Merge tool failed."
-msgstr "Zusammenfรผhrungswerkzeug fehlgeschlagen."
-
-#: lib/option.tcl:11
-#, tcl-format
-msgid "Invalid global encoding '%s'"
-msgstr "Ungรผltige globale Zeichenkodierung ยป%sยซ"
-
-#: lib/option.tcl:19
-#, tcl-format
-msgid "Invalid repo encoding '%s'"
-msgstr "Ungรผltige Archiv-Zeichenkodierung ยป%sยซ"
-
-#: lib/option.tcl:117
-msgid "Restore Defaults"
-msgstr "Voreinstellungen wiederherstellen"
-
-#: lib/option.tcl:121
-msgid "Save"
-msgstr "Speichern"
-
-#: lib/option.tcl:131
-#, tcl-format
-msgid "%s Repository"
-msgstr "Projektarchiv %s"
-
-#: lib/option.tcl:132
-msgid "Global (All Repositories)"
-msgstr "Global (Alle Projektarchive)"
-
-#: lib/option.tcl:138
-msgid "User Name"
-msgstr "Benutzername"
-
-#: lib/option.tcl:139
-msgid "Email Address"
-msgstr "E-Mail-Adresse"
-
-#: lib/option.tcl:141
-msgid "Summarize Merge Commits"
-msgstr "Zusammenfรผhrungs-Versionen zusammenfassen"
-
-#: lib/option.tcl:142
-msgid "Merge Verbosity"
-msgstr "Ausfรผhrlichkeit der Zusammenfรผhren-Meldungen"
-
-#: lib/option.tcl:143
-msgid "Show Diffstat After Merge"
-msgstr "Vergleichsstatistik nach Zusammenfรผhren anzeigen"
-
-#: lib/option.tcl:144
-msgid "Use Merge Tool"
-msgstr "Zusammenfรผhrungswerkzeug"
-
-#: lib/option.tcl:146
-msgid "Trust File Modification Timestamps"
-msgstr "Auf Dateiรคnderungsdatum verlassen"
-
-#: lib/option.tcl:147
-msgid "Prune Tracking Branches During Fetch"
-msgstr "รœbernahmezweige aufrรคumen wรคhrend Anforderung"
-
-#: lib/option.tcl:148
-msgid "Match Tracking Branches"
-msgstr "Passend zu รœbernahmezweig"
-
-#: lib/option.tcl:149
-msgid "Blame Copy Only On Changed Files"
-msgstr "Kopie-Annotieren nur bei geรคnderten Dateien"
-
-#: lib/option.tcl:150
-msgid "Minimum Letters To Blame Copy On"
-msgstr "Mindestzahl Zeichen fรผr Kopie-Annotieren"
-
-#: lib/option.tcl:151
-msgid "Blame History Context Radius (days)"
-msgstr "Anzahl Tage fรผr Historien-Kontext"
-
-#: lib/option.tcl:152
-msgid "Number of Diff Context Lines"
-msgstr "Anzahl der Kontextzeilen beim Vergleich"
-
-#: lib/option.tcl:153
-msgid "Commit Message Text Width"
-msgstr "Textbreite der Versionsbeschreibung"
-
-#: lib/option.tcl:154
-msgid "New Branch Name Template"
-msgstr "Namensvorschlag fรผr neue Zweige"
-
-#: lib/option.tcl:155
-msgid "Default File Contents Encoding"
-msgstr "Voreingestellte Zeichenkodierung"
-
-#: lib/option.tcl:203
-msgid "Change"
-msgstr "ร„ndern"
-
-#: lib/option.tcl:230
-msgid "Spelling Dictionary:"
-msgstr "Wรถrterbuch Rechtschreibprรผfung:"
-
-#: lib/option.tcl:254
-msgid "Change Font"
-msgstr "Schriftart รคndern"
-
-#: lib/option.tcl:258
-#, tcl-format
-msgid "Choose %s"
-msgstr "%s wรคhlen"
-
-#: lib/option.tcl:264
-msgid "pt."
-msgstr "pt."
-
-#: lib/option.tcl:278
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: lib/option.tcl:314
-msgid "Failed to completely save options:"
-msgstr "Optionen konnten nicht gespeichert werden:"
-
-#: lib/remote_add.tcl:19
-msgid "Add Remote"
-msgstr "Externes Archiv hinzufรผgen"
-
-#: lib/remote_add.tcl:24
-msgid "Add New Remote"
-msgstr "Neues externes Archiv hinzufรผgen"
-
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
-msgid "Add"
-msgstr "Hinzufรผgen"
-
-#: lib/remote_add.tcl:37
-msgid "Remote Details"
-msgstr "Einzelheiten des externen Archivs"
-
-#: lib/remote_add.tcl:50
-msgid "Location:"
-msgstr "Adresse:"
-
-#: lib/remote_add.tcl:62
-msgid "Further Action"
-msgstr "Weitere Aktion jetzt"
-
-#: lib/remote_add.tcl:65
-msgid "Fetch Immediately"
-msgstr "Gleich anfordern"
-
-#: lib/remote_add.tcl:71
-msgid "Initialize Remote Repository and Push"
-msgstr "Externes Archiv initialisieren und dahin versenden"
-
-#: lib/remote_add.tcl:77
-msgid "Do Nothing Else Now"
-msgstr "Nichts tun"
-
-#: lib/remote_add.tcl:101
-msgid "Please supply a remote name."
-msgstr "Bitte geben Sie einen Namen des externen Archivs an."
-
-#: lib/remote_add.tcl:114
-#, tcl-format
-msgid "'%s' is not an acceptable remote name."
-msgstr "ยป%sยซ ist kein zulรคssiger Name eines externen Archivs."
-
-#: lib/remote_add.tcl:125
-#, tcl-format
-msgid "Failed to add remote '%s' of location '%s'."
-msgstr "Fehler beim Hinzufรผgen des externen Archivs ยป%sยซ aus Herkunftsort ยป%sยซ."
-
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
-#, tcl-format
-msgid "fetch %s"
-msgstr "ยป%sยซ anfordern"
-
-#: lib/remote_add.tcl:134
-#, tcl-format
-msgid "Fetching the %s"
-msgstr "ยป%sยซ anfordern"
-
-#: lib/remote_add.tcl:157
-#, tcl-format
-msgid "Do not know how to initialize repository at location '%s'."
-msgstr "Initialisieren eines externen Archivs an Adresse ยป%sยซ ist nicht mรถglich."
-
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
-#: lib/transport.tcl:81
-#, tcl-format
-msgid "push %s"
-msgstr "ยป%sยซ versenden..."
-
-#: lib/remote_add.tcl:164
-#, tcl-format
-msgid "Setting up the %s (at %s)"
-msgstr "Einrichten von ยป%sยซ an ยป%sยซ"
-
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
-msgid "Delete Branch Remotely"
-msgstr "Zweig in externem Archiv lรถschen"
-
-#: lib/remote_branch_delete.tcl:47
-msgid "From Repository"
-msgstr "In Projektarchiv"
-
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
-msgid "Remote:"
-msgstr "Externes Archiv:"
-
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
-msgid "Arbitrary Location:"
-msgstr "Adresse:"
-
-#: lib/remote_branch_delete.tcl:84
-msgid "Branches"
-msgstr "Zweige"
-
-#: lib/remote_branch_delete.tcl:109
-msgid "Delete Only If"
-msgstr "Nur lรถschen, wenn"
-
-#: lib/remote_branch_delete.tcl:111
-msgid "Merged Into:"
-msgstr "Zusammengefรผhrt mit:"
-
-#: lib/remote_branch_delete.tcl:152
-msgid "A branch is required for 'Merged Into'."
-msgstr "Fรผr ยปZusammenfรผhren mitยซ muss ein Zweig angegeben werden."
-
-#: lib/remote_branch_delete.tcl:184
-#, tcl-format
-msgid ""
-"The following branches are not completely merged into %s:\n"
-"\n"
-" - %s"
-msgstr ""
-"Folgende Zweige sind noch nicht mit ยป%sยซ zusammengefรผhrt:\n"
-"\n"
-" - %s"
-
-#: lib/remote_branch_delete.tcl:189
-#, tcl-format
-msgid ""
-"One or more of the merge tests failed because you have not fetched the "
-"necessary commits.  Try fetching from %s first."
-msgstr ""
-"Ein oder mehrere Zusammenfรผhrungen sind fehlgeschlagen, da Sie nicht die "
-"notwendigen Versionen vorher angefordert haben.  Sie sollten versuchen, "
-"zuerst von ยป%sยซ anzufordern."
-
-#: lib/remote_branch_delete.tcl:207
-msgid "Please select one or more branches to delete."
-msgstr "Bitte wรคhlen Sie mindestens einen Zweig, der gelรถscht werden soll."
-
-#: lib/remote_branch_delete.tcl:226
-#, tcl-format
-msgid "Deleting branches from %s"
-msgstr "Zweige auf ยป%sยซ werden gelรถscht"
-
-#: lib/remote_branch_delete.tcl:292
-msgid "No repository selected."
-msgstr "Kein Projektarchiv ausgewรคhlt."
-
-#: lib/remote_branch_delete.tcl:297
-#, tcl-format
-msgid "Scanning %s..."
-msgstr "ยป%sยซ laden..."
-
-#: lib/remote.tcl:163
-msgid "Remove Remote"
-msgstr "Externes Archiv entfernen"
-
-#: lib/remote.tcl:168
-msgid "Prune from"
-msgstr "Aufrรคumen von"
-
-#: lib/remote.tcl:173
-msgid "Fetch from"
-msgstr "Anfordern von"
-
-#: lib/remote.tcl:215
-msgid "Push to"
-msgstr "Versenden nach"
-
-#: lib/search.tcl:21
-msgid "Find:"
-msgstr "Suchen:"
-
-#: lib/search.tcl:23
-msgid "Next"
-msgstr "Nรคchster"
-
-#: lib/search.tcl:24
-msgid "Prev"
-msgstr "Voriger"
-
-#: lib/search.tcl:25
-msgid "Case-Sensitive"
-msgstr "GroรŸ-/Kleinschreibung unterscheiden"
-
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
-msgid "Cannot write shortcut:"
-msgstr "Fehler beim Schreiben der Verknรผpfung:"
-
-#: lib/shortcut.tcl:137
-msgid "Cannot write icon:"
-msgstr "Fehler beim Erstellen des Icons:"
-
-#: lib/spellcheck.tcl:57
-msgid "Unsupported spell checker"
-msgstr "Rechtschreibprรผfungsprogramm nicht unterstรผtzt"
-
-#: lib/spellcheck.tcl:65
-msgid "Spell checking is unavailable"
-msgstr "Rechtschreibprรผfung nicht verfรผgbar"
-
-#: lib/spellcheck.tcl:68
-msgid "Invalid spell checking configuration"
-msgstr "Unbenutzbare Konfiguration der Rechtschreibprรผfung"
-
-#: lib/spellcheck.tcl:70
-#, tcl-format
-msgid "Reverting dictionary to %s."
-msgstr "Wรถrterbuch auf %s zurรผckgesetzt."
-
-#: lib/spellcheck.tcl:73
-msgid "Spell checker silently failed on startup"
-msgstr "Rechtschreibprรผfungsprogramm mit Fehler abgebrochen"
-
-#: lib/spellcheck.tcl:80
-msgid "Unrecognized spell checker"
-msgstr "Unbekanntes Rechtschreibprรผfungsprogramm"
-
-#: lib/spellcheck.tcl:186
-msgid "No Suggestions"
-msgstr "Keine Vorschlรคge"
-
-#: lib/spellcheck.tcl:388
-msgid "Unexpected EOF from spell checker"
-msgstr "Unerwartetes EOF vom Rechtschreibprรผfungsprogramm"
-
-#: lib/spellcheck.tcl:392
-msgid "Spell Checker Failed"
-msgstr "Rechtschreibprรผfung fehlgeschlagen"
-
-#: lib/sshkey.tcl:31
-msgid "No keys found."
-msgstr "Keine Schlรผssel gefunden."
-
-#: lib/sshkey.tcl:34
-#, tcl-format
-msgid "Found a public key in: %s"
-msgstr "ร–ffentlicher Schlรผssel gefunden in: %s"
-
-#: lib/sshkey.tcl:40
-msgid "Generate Key"
-msgstr "Schlรผssel erzeugen"
-
-#: lib/sshkey.tcl:56
-msgid "Copy To Clipboard"
-msgstr "In Zwischenablage kopieren"
-
-#: lib/sshkey.tcl:70
-msgid "Your OpenSSH Public Key"
-msgstr "Ihr OpenSSH รถffenlicher Schlรผssel"
-
-#: lib/sshkey.tcl:78
-msgid "Generating..."
-msgstr "Erzeugen..."
-
-#: lib/sshkey.tcl:84
-#, tcl-format
-msgid ""
-"Could not start ssh-keygen:\n"
-"\n"
-"%s"
-msgstr ""
-"Konnte ยปssh-keygenยซ nicht starten:\n"
-"\n"
-"%s"
-
-#: lib/sshkey.tcl:111
-msgid "Generation failed."
-msgstr "Schlรผsselerzeugung fehlgeschlagen."
-
-#: lib/sshkey.tcl:118
-msgid "Generation succeeded, but no keys found."
-msgstr "Schlรผsselerzeugung erfolgreich, aber keine Schlรผssel gefunden."
-
-#: lib/sshkey.tcl:121
-#, tcl-format
-msgid "Your key is in: %s"
-msgstr "Ihr Schlรผssel ist abgelegt in: %s"
-
-#: lib/status_bar.tcl:83
-#, tcl-format
-msgid "%s ... %*i of %*i %s (%3i%%)"
-msgstr "%s ... %*i von %*i %s (%3i%%)"
-
-#: lib/tools_dlg.tcl:22
-msgid "Add Tool"
-msgstr "Werkzeug hinzufรผgen"
-
-#: lib/tools_dlg.tcl:28
-msgid "Add New Tool Command"
-msgstr "Neues Kommando fรผr Werkzeug hinzufรผgen"
-
-#: lib/tools_dlg.tcl:33
-msgid "Add globally"
-msgstr "Global hinzufรผgen"
-
-#: lib/tools_dlg.tcl:45
-msgid "Tool Details"
-msgstr "Einzelheiten des Werkzeugs"
-
-#: lib/tools_dlg.tcl:48
-msgid "Use '/' separators to create a submenu tree:"
-msgstr "Benutzen Sie einen Schrรคgstrich ยป/ยซ, um Untermenรผs zu erstellen:"
-
-#: lib/tools_dlg.tcl:61
-msgid "Command:"
-msgstr "Kommando:"
-
-#: lib/tools_dlg.tcl:74
-msgid "Show a dialog before running"
-msgstr "Bestรคtigungsfrage vor Starten anzeigen"
-
-#: lib/tools_dlg.tcl:80
-msgid "Ask the user to select a revision (sets $REVISION)"
-msgstr "Benutzer nach Version fragen (setzt $REVISION)"
-
-#: lib/tools_dlg.tcl:85
-msgid "Ask the user for additional arguments (sets $ARGS)"
-msgstr "Benutzer nach zusรคtzlichen Argumenten fragen (setzt $ARGS)"
-
-#: lib/tools_dlg.tcl:92
-msgid "Don't show the command output window"
-msgstr "Kein Ausgabefenster zeigen"
-
-#: lib/tools_dlg.tcl:97
-msgid "Run only if a diff is selected ($FILENAME not empty)"
-msgstr "Nur starten, wenn ein Vergleich gewรคhlt ist ($FILENAME ist nicht leer)"
-
-#: lib/tools_dlg.tcl:121
-msgid "Please supply a name for the tool."
-msgstr "Bitte geben Sie einen Werkzeugnamen an."
-
-#: lib/tools_dlg.tcl:129
-#, tcl-format
-msgid "Tool '%s' already exists."
-msgstr "Werkzeug ยป%sยซ existiert bereits."
-
-#: lib/tools_dlg.tcl:151
-#, tcl-format
-msgid ""
-"Could not add tool:\n"
-"%s"
-msgstr ""
-"Werkzeug konnte nicht hinzugefรผgt werden:\n"
-"\n"
-"%s"
-
-#: lib/tools_dlg.tcl:190
-msgid "Remove Tool"
-msgstr "Werkzeug entfernen"
-
-#: lib/tools_dlg.tcl:196
-msgid "Remove Tool Commands"
-msgstr "Werkzeugkommandos entfernen"
-
-#: lib/tools_dlg.tcl:200
-msgid "Remove"
-msgstr "Entfernen"
-
-#: lib/tools_dlg.tcl:236
-msgid "(Blue denotes repository-local tools)"
-msgstr "(Werkzeuge fรผr lokales Archiv werden in Blau angezeigt)"
-
-#: lib/tools_dlg.tcl:297
-#, tcl-format
-msgid "Run Command: %s"
-msgstr "Kommando aufrufen: %s"
-
-#: lib/tools_dlg.tcl:311
-msgid "Arguments"
-msgstr "Argumente"
-
-#: lib/tools_dlg.tcl:348
-msgid "OK"
-msgstr "Ok"
-
-#: lib/tools.tcl:75
-#, tcl-format
-msgid "Running %s requires a selected file."
-msgstr "Um ยป%sยซ zu starten, muss eine Datei ausgewรคhlt sein."
-
-#: lib/tools.tcl:90
-#, tcl-format
-msgid "Are you sure you want to run %s?"
-msgstr "Wollen Sie %s wirklich starten?"
-
-#: lib/tools.tcl:110
-#, tcl-format
-msgid "Tool: %s"
-msgstr "Werkzeug: %s"
-
-#: lib/tools.tcl:111
-#, tcl-format
-msgid "Running: %s"
-msgstr "Starten: %s"
-
-#: lib/tools.tcl:149
-#, tcl-format
-msgid "Tool completed successfully: %s"
-msgstr "Werkzeug erfolgreich abgeschlossen: %s"
-
-#: lib/tools.tcl:151
-#, tcl-format
-msgid "Tool failed: %s"
-msgstr "Werkzeug fehlgeschlagen: %s"
-
-#: lib/transport.tcl:7
-#, tcl-format
-msgid "Fetching new changes from %s"
-msgstr "Neue ร„nderungen von ยป%sยซ holen"
-
-#: lib/transport.tcl:18
-#, tcl-format
-msgid "remote prune %s"
-msgstr "Aufrรคumen von ยป%sยซ"
-
-#: lib/transport.tcl:19
-#, tcl-format
-msgid "Pruning tracking branches deleted from %s"
-msgstr "รœbernahmezweige aufrรคumen und entfernen, die in ยป%sยซ gelรถscht wurden"
-
-#: lib/transport.tcl:26
-#, tcl-format
-msgid "Pushing changes to %s"
-msgstr "ร„nderungen nach ยป%sยซ versenden"
-
-#: lib/transport.tcl:64
-#, tcl-format
-msgid "Mirroring to %s"
-msgstr "Spiegeln nach %s"
-
-#: lib/transport.tcl:82
-#, tcl-format
-msgid "Pushing %s %s to %s"
-msgstr "%s %s nach %s versenden"
-
-#: lib/transport.tcl:100
-msgid "Push Branches"
-msgstr "Zweige versenden"
-
-#: lib/transport.tcl:114
-msgid "Source Branches"
-msgstr "Lokale Zweige"
-
-#: lib/transport.tcl:131
-msgid "Destination Repository"
-msgstr "Ziel-Projektarchiv"
-
-#: lib/transport.tcl:169
-msgid "Transfer Options"
-msgstr "Netzwerk-Einstellungen"
-
-#: lib/transport.tcl:171
-msgid "Force overwrite existing branch (may discard changes)"
-msgstr ""
-"รœberschreiben von existierenden Zweigen erzwingen (kรถnnte ร„nderungen lรถschen)"
-
-#: lib/transport.tcl:175
-msgid "Use thin pack (for slow network connections)"
-msgstr "Kompaktes Datenformat benutzen (fรผr langsame Netzverbindungen)"
-
-#: lib/transport.tcl:179
-msgid "Include tags"
-msgstr "Mit Markierungen รผbertragen"
diff --git a/third_party/git/git-gui/po/git-gui.pot b/third_party/git/git-gui/po/git-gui.pot
index 0c94f9c2c6df..b79ed4e133df 100644
--- a/third_party/git/git-gui/po/git-gui.pot
+++ b/third_party/git/git-gui/po/git-gui.pot
@@ -8,41 +8,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 15:47-0800\n"
+"POT-Creation-Date: 2020-02-08 22:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
-#: git-gui.sh:922
-msgid "git-gui: fatal error"
-msgstr ""
-
-#: git-gui.sh:743
+#: git-gui.sh:847
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr ""
 
-#: git-gui.sh:779
+#: git-gui.sh:901
 msgid "Main Font"
 msgstr ""
 
-#: git-gui.sh:780
+#: git-gui.sh:902
 msgid "Diff/Console Font"
 msgstr ""
 
-#: git-gui.sh:794
+#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053
+#: git-gui.sh:3212
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:918
 msgid "Cannot find git in PATH."
 msgstr ""
 
-#: git-gui.sh:821
+#: git-gui.sh:945
 msgid "Cannot parse Git version string:"
 msgstr ""
 
-#: git-gui.sh:839
+#: git-gui.sh:970
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -54,473 +55,518 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 
-#: git-gui.sh:1128
+#: git-gui.sh:1267
 msgid "Git directory not found:"
 msgstr ""
 
-#: git-gui.sh:1146
+#: git-gui.sh:1301
 msgid "Cannot move to top of working directory:"
 msgstr ""
 
-#: git-gui.sh:1154
+#: git-gui.sh:1309
 msgid "Cannot use bare repository:"
 msgstr ""
 
-#: git-gui.sh:1162
+#: git-gui.sh:1317
 msgid "No working directory"
 msgstr ""
 
-#: git-gui.sh:1334 lib/checkout_op.tcl:306
+#: git-gui.sh:1491 lib/checkout_op.tcl:306
 msgid "Refreshing file status..."
 msgstr ""
 
-#: git-gui.sh:1390
+#: git-gui.sh:1551
 msgid "Scanning for modified files ..."
 msgstr ""
 
-#: git-gui.sh:1454
+#: git-gui.sh:1629
 msgid "Calling prepare-commit-msg hook..."
 msgstr ""
 
-#: git-gui.sh:1471
+#: git-gui.sh:1646
 msgid "Commit declined by prepare-commit-msg hook."
 msgstr ""
 
-#: git-gui.sh:1629 lib/browser.tcl:246
+#: git-gui.sh:1804 lib/browser.tcl:252
 msgid "Ready."
 msgstr ""
 
-#: git-gui.sh:1787
+#: git-gui.sh:1968
 #, tcl-format
-msgid "Displaying only %s of %s files."
+msgid ""
+"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files."
 msgstr ""
 
-#: git-gui.sh:1913
+#: git-gui.sh:2091
 msgid "Unmodified"
 msgstr ""
 
-#: git-gui.sh:1915
+#: git-gui.sh:2093
 msgid "Modified, not staged"
 msgstr ""
 
-#: git-gui.sh:1916 git-gui.sh:1924
+#: git-gui.sh:2094 git-gui.sh:2106
 msgid "Staged for commit"
 msgstr ""
 
-#: git-gui.sh:1917 git-gui.sh:1925
+#: git-gui.sh:2095 git-gui.sh:2107
 msgid "Portions staged for commit"
 msgstr ""
 
-#: git-gui.sh:1918 git-gui.sh:1926
+#: git-gui.sh:2096 git-gui.sh:2108
 msgid "Staged for commit, missing"
 msgstr ""
 
-#: git-gui.sh:1920
+#: git-gui.sh:2098
 msgid "File type changed, not staged"
 msgstr ""
 
-#: git-gui.sh:1921
+#: git-gui.sh:2099 git-gui.sh:2100
+msgid "File type changed, old type staged for commit"
+msgstr ""
+
+#: git-gui.sh:2101
 msgid "File type changed, staged"
 msgstr ""
 
-#: git-gui.sh:1923
+#: git-gui.sh:2102
+msgid "File type change staged, modification not staged"
+msgstr ""
+
+#: git-gui.sh:2103
+msgid "File type change staged, file missing"
+msgstr ""
+
+#: git-gui.sh:2105
 msgid "Untracked, not staged"
 msgstr ""
 
-#: git-gui.sh:1928
+#: git-gui.sh:2110
 msgid "Missing"
 msgstr ""
 
-#: git-gui.sh:1929
+#: git-gui.sh:2111
 msgid "Staged for removal"
 msgstr ""
 
-#: git-gui.sh:1930
+#: git-gui.sh:2112
 msgid "Staged for removal, still present"
 msgstr ""
 
-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
-#: git-gui.sh:1936 git-gui.sh:1937
+#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
+#: git-gui.sh:2118 git-gui.sh:2119
 msgid "Requires merge resolution"
 msgstr ""
 
-#: git-gui.sh:1972
-msgid "Starting gitk... please wait..."
+#: git-gui.sh:2164
+msgid "Couldn't find gitk in PATH"
 msgstr ""
 
-#: git-gui.sh:1984
-msgid "Couldn't find gitk in PATH"
+#: git-gui.sh:2210 git-gui.sh:2245
+#, tcl-format
+msgid "Starting %s... please wait..."
 msgstr ""
 
-#: git-gui.sh:2043
+#: git-gui.sh:2224
 msgid "Couldn't find git gui in PATH"
 msgstr ""
 
-#: git-gui.sh:2455 lib/choose_repository.tcl:36
+#: git-gui.sh:2726 lib/choose_repository.tcl:53
 msgid "Repository"
 msgstr ""
 
-#: git-gui.sh:2456
+#: git-gui.sh:2727
 msgid "Edit"
 msgstr ""
 
-#: git-gui.sh:2458 lib/choose_rev.tcl:561
+#: git-gui.sh:2729 lib/choose_rev.tcl:567
 msgid "Branch"
 msgstr ""
 
-#: git-gui.sh:2461 lib/choose_rev.tcl:548
+#: git-gui.sh:2732 lib/choose_rev.tcl:554
 msgid "Commit@@noun"
 msgstr ""
 
-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
 msgid "Merge"
 msgstr ""
 
-#: git-gui.sh:2465 lib/choose_rev.tcl:557
+#: git-gui.sh:2736 lib/choose_rev.tcl:563
 msgid "Remote"
 msgstr ""
 
-#: git-gui.sh:2468
+#: git-gui.sh:2739
 msgid "Tools"
 msgstr ""
 
-#: git-gui.sh:2477
+#: git-gui.sh:2748
 msgid "Explore Working Copy"
 msgstr ""
 
-#: git-gui.sh:2483
+#: git-gui.sh:2763
+msgid "Git Bash"
+msgstr ""
+
+#: git-gui.sh:2772
 msgid "Browse Current Branch's Files"
 msgstr ""
 
-#: git-gui.sh:2487
+#: git-gui.sh:2776
 msgid "Browse Branch Files..."
 msgstr ""
 
-#: git-gui.sh:2492
+#: git-gui.sh:2781
 msgid "Visualize Current Branch's History"
 msgstr ""
 
-#: git-gui.sh:2496
+#: git-gui.sh:2785
 msgid "Visualize All Branch History"
 msgstr ""
 
-#: git-gui.sh:2503
+#: git-gui.sh:2792
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr ""
 
-#: git-gui.sh:2505
+#: git-gui.sh:2794
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr ""
 
-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2799 lib/database.tcl:40
 msgid "Database Statistics"
 msgstr ""
 
-#: git-gui.sh:2513 lib/database.tcl:34
+#: git-gui.sh:2802 lib/database.tcl:33
 msgid "Compress Database"
 msgstr ""
 
-#: git-gui.sh:2516
+#: git-gui.sh:2805
 msgid "Verify Database"
 msgstr ""
 
-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
-#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
+#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820
 msgid "Create Desktop Icon"
 msgstr ""
 
-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217
 msgid "Quit"
 msgstr ""
 
-#: git-gui.sh:2547
+#: git-gui.sh:2836
 msgid "Undo"
 msgstr ""
 
-#: git-gui.sh:2550
+#: git-gui.sh:2839
 msgid "Redo"
 msgstr ""
 
-#: git-gui.sh:2554 git-gui.sh:3109
+#: git-gui.sh:2843 git-gui.sh:3461
 msgid "Cut"
 msgstr ""
 
-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
+#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr ""
 
-#: git-gui.sh:2560 git-gui.sh:3115
+#: git-gui.sh:2849 git-gui.sh:3467
 msgid "Paste"
 msgstr ""
 
-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
-#: lib/remote_branch_delete.tcl:38
+#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39
+#: lib/branch_delete.tcl:28
 msgid "Delete"
 msgstr ""
 
-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
+#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71
 msgid "Select All"
 msgstr ""
 
-#: git-gui.sh:2576
+#: git-gui.sh:2865
 msgid "Create..."
 msgstr ""
 
-#: git-gui.sh:2582
+#: git-gui.sh:2871
 msgid "Checkout..."
 msgstr ""
 
-#: git-gui.sh:2588
+#: git-gui.sh:2877
 msgid "Rename..."
 msgstr ""
 
-#: git-gui.sh:2593
+#: git-gui.sh:2882
 msgid "Delete..."
 msgstr ""
 
-#: git-gui.sh:2598
+#: git-gui.sh:2887
 msgid "Reset..."
 msgstr ""
 
-#: git-gui.sh:2608
+#: git-gui.sh:2897
 msgid "Done"
 msgstr ""
 
-#: git-gui.sh:2610
+#: git-gui.sh:2899
 msgid "Commit@@verb"
 msgstr ""
 
-#: git-gui.sh:2619 git-gui.sh:3050
-msgid "New Commit"
-msgstr ""
-
-#: git-gui.sh:2627 git-gui.sh:3057
+#: git-gui.sh:2908 git-gui.sh:3400
 msgid "Amend Last Commit"
 msgstr ""
 
-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101
 msgid "Rescan"
 msgstr ""
 
-#: git-gui.sh:2643
+#: git-gui.sh:2924
 msgid "Stage To Commit"
 msgstr ""
 
-#: git-gui.sh:2649
+#: git-gui.sh:2930
 msgid "Stage Changed Files To Commit"
 msgstr ""
 
-#: git-gui.sh:2655
+#: git-gui.sh:2936
 msgid "Unstage From Commit"
 msgstr ""
 
-#: git-gui.sh:2661 lib/index.tcl:412
+#: git-gui.sh:2942 lib/index.tcl:521
 msgid "Revert Changes"
 msgstr ""
 
-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
+#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731
 msgid "Show Less Context"
 msgstr ""
 
-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
+#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735
 msgid "Show More Context"
 msgstr ""
 
-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
+#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485
 msgid "Sign Off"
 msgstr ""
 
-#: git-gui.sh:2696
+#: git-gui.sh:2977
 msgid "Local Merge..."
 msgstr ""
 
-#: git-gui.sh:2701
+#: git-gui.sh:2982
 msgid "Abort Merge..."
 msgstr ""
 
-#: git-gui.sh:2713 git-gui.sh:2741
+#: git-gui.sh:2994 git-gui.sh:3022
 msgid "Add..."
 msgstr ""
 
-#: git-gui.sh:2717
+#: git-gui.sh:2998
 msgid "Push..."
 msgstr ""
 
-#: git-gui.sh:2721
+#: git-gui.sh:3002
 msgid "Delete Branch..."
 msgstr ""
 
-#: git-gui.sh:2731 git-gui.sh:3292
+#: git-gui.sh:3012 git-gui.sh:3666
 msgid "Options..."
 msgstr ""
 
-#: git-gui.sh:2742
+#: git-gui.sh:3023
 msgid "Remove..."
 msgstr ""
 
-#: git-gui.sh:2751 lib/choose_repository.tcl:50
+#: git-gui.sh:3032 lib/choose_repository.tcl:67
 msgid "Help"
 msgstr ""
 
-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61
+#: lib/choose_repository.tcl:70 lib/about.tcl:14
 #, tcl-format
 msgid "About %s"
 msgstr ""
 
-#: git-gui.sh:2783
+#: git-gui.sh:3064
 msgid "Online Documentation"
 msgstr ""
 
-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73
 msgid "Show SSH Key"
 msgstr ""
 
-#: git-gui.sh:2893
+#: git-gui.sh:3097 git-gui.sh:3229
+msgid "usage:"
+msgstr ""
+
+#: git-gui.sh:3101 git-gui.sh:3233
+msgid "Usage"
+msgstr ""
+
+#: git-gui.sh:3182 lib/blame.tcl:575
+msgid "Error"
+msgstr ""
+
+#: git-gui.sh:3213
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 
-#: git-gui.sh:2926
+#: git-gui.sh:3246
 msgid "Current Branch:"
 msgstr ""
 
-#: git-gui.sh:2947
-msgid "Staged Changes (Will Commit)"
+#: git-gui.sh:3271
+msgid "Unstaged Changes"
 msgstr ""
 
-#: git-gui.sh:2967
-msgid "Unstaged Changes"
+#: git-gui.sh:3293
+msgid "Staged Changes (Will Commit)"
 msgstr ""
 
-#: git-gui.sh:3017
+#: git-gui.sh:3367
 msgid "Stage Changed"
 msgstr ""
 
-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
+#: git-gui.sh:3386 lib/transport.tcl:137
 msgid "Push"
 msgstr ""
 
-#: git-gui.sh:3071
+#: git-gui.sh:3413
 msgid "Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3072
+#: git-gui.sh:3414
 msgid "Amended Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3073
+#: git-gui.sh:3415
 msgid "Amended Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3074
+#: git-gui.sh:3416
 msgid "Amended Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3075
+#: git-gui.sh:3417
 msgid "Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3076
+#: git-gui.sh:3418
 msgid "Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
+#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73
 msgid "Copy All"
 msgstr ""
 
-#: git-gui.sh:3149 lib/blame.tcl:104
+#: git-gui.sh:3501 lib/blame.tcl:106
 msgid "File:"
 msgstr ""
 
-#: git-gui.sh:3255
+#: git-gui.sh:3549 lib/choose_repository.tcl:1100
+msgid "Open"
+msgstr ""
+
+#: git-gui.sh:3629
 msgid "Refresh"
 msgstr ""
 
-#: git-gui.sh:3276
+#: git-gui.sh:3650
 msgid "Decrease Font Size"
 msgstr ""
 
-#: git-gui.sh:3280
+#: git-gui.sh:3654
 msgid "Increase Font Size"
 msgstr ""
 
-#: git-gui.sh:3288 lib/blame.tcl:281
+#: git-gui.sh:3662 lib/blame.tcl:296
 msgid "Encoding"
 msgstr ""
 
-#: git-gui.sh:3299
+#: git-gui.sh:3673
 msgid "Apply/Reverse Hunk"
 msgstr ""
 
-#: git-gui.sh:3304
+#: git-gui.sh:3678
 msgid "Apply/Reverse Line"
 msgstr ""
 
-#: git-gui.sh:3323
+#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805
+msgid "Revert Hunk"
+msgstr ""
+
+#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812
+msgid "Revert Line"
+msgstr ""
+
+#: git-gui.sh:3694 git-gui.sh:3791
+msgid "Undo Last Revert"
+msgstr ""
+
+#: git-gui.sh:3713
 msgid "Run Merge Tool"
 msgstr ""
 
-#: git-gui.sh:3328
+#: git-gui.sh:3718
 msgid "Use Remote Version"
 msgstr ""
 
-#: git-gui.sh:3332
+#: git-gui.sh:3722
 msgid "Use Local Version"
 msgstr ""
 
-#: git-gui.sh:3336
+#: git-gui.sh:3726
 msgid "Revert To Base"
 msgstr ""
 
-#: git-gui.sh:3354
+#: git-gui.sh:3744
 msgid "Visualize These Changes In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3358
+#: git-gui.sh:3748
 msgid "Visualize Current Branch History In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3362
+#: git-gui.sh:3752
 msgid "Visualize All Branch History In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3367
+#: git-gui.sh:3757
 msgid "Start git gui In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3389
+#: git-gui.sh:3793
 msgid "Unstage Hunk From Commit"
 msgstr ""
 
-#: git-gui.sh:3391
+#: git-gui.sh:3797
 msgid "Unstage Lines From Commit"
 msgstr ""
 
-#: git-gui.sh:3393
+#: git-gui.sh:3798 git-gui.sh:3809
+msgid "Revert Lines"
+msgstr ""
+
+#: git-gui.sh:3800
 msgid "Unstage Line From Commit"
 msgstr ""
 
-#: git-gui.sh:3396
+#: git-gui.sh:3804
 msgid "Stage Hunk For Commit"
 msgstr ""
 
-#: git-gui.sh:3398
+#: git-gui.sh:3808
 msgid "Stage Lines For Commit"
 msgstr ""
 
-#: git-gui.sh:3400
+#: git-gui.sh:3811
 msgid "Stage Line For Commit"
 msgstr ""
 
-#: git-gui.sh:3424
+#: git-gui.sh:3861
 msgid "Initializing..."
 msgstr ""
 
-#: git-gui.sh:3541
+#: git-gui.sh:4017
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
@@ -531,14 +577,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: git-gui.sh:3570
+#: git-gui.sh:4046
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 "Tcl binary distributed by Cygwin."
 msgstr ""
 
-#: git-gui.sh:3575
+#: git-gui.sh:4051
 #, tcl-format
 msgid ""
 "\n"
@@ -549,1846 +595,2072 @@ msgid ""
 "~/.gitconfig file.\n"
 msgstr ""
 
-#: lib/about.tcl:26
-msgid "git-gui - a graphical user interface for Git."
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
 msgstr ""
 
-#: lib/blame.tcl:72
-msgid "File Viewer"
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
 msgstr ""
 
-#: lib/blame.tcl:78
-msgid "Commit:"
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
 msgstr ""
 
-#: lib/blame.tcl:271
-msgid "Copy Commit"
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
 msgstr ""
 
-#: lib/blame.tcl:275
-msgid "Find Text..."
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
 msgstr ""
 
-#: lib/blame.tcl:284
-msgid "Do Full Copy Detection"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
 msgstr ""
 
-#: lib/blame.tcl:288
-msgid "Show History Context"
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
 msgstr ""
 
-#: lib/blame.tcl:291
-msgid "Blame Parent Commit"
+#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
 msgstr ""
 
-#: lib/blame.tcl:450
-#, tcl-format
-msgid "Reading %s..."
+#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
 msgstr ""
 
-#: lib/blame.tcl:557
-msgid "Loading copy/move tracking annotations..."
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
+#, tcl-format
+msgid "fetch %s"
 msgstr ""
 
-#: lib/blame.tcl:577
-msgid "lines annotated"
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
 msgstr ""
 
-#: lib/blame.tcl:769
-msgid "Loading original location annotations..."
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
 msgstr ""
 
-#: lib/blame.tcl:772
-msgid "Annotation complete."
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
 msgstr ""
 
-#: lib/blame.tcl:802
-msgid "Busy"
+#: lib/transport.tcl:25
+msgid "fetch all remotes"
 msgstr ""
 
-#: lib/blame.tcl:803
-msgid "Annotation process is already running."
+#: lib/transport.tcl:26
+msgid "Fetching new changes from all remotes"
 msgstr ""
 
-#: lib/blame.tcl:842
-msgid "Running thorough copy detection..."
+#: lib/transport.tcl:40
+msgid "remote prune all remotes"
 msgstr ""
 
-#: lib/blame.tcl:910
-msgid "Loading annotation..."
+#: lib/transport.tcl:41
+msgid "Pruning tracking branches deleted from all remotes"
 msgstr ""
 
-#: lib/blame.tcl:963
-msgid "Author:"
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
+#: lib/remote_add.tcl:162
+#, tcl-format
+msgid "push %s"
 msgstr ""
 
-#: lib/blame.tcl:967
-msgid "Committer:"
+#: lib/transport.tcl:55
+#, tcl-format
+msgid "Pushing changes to %s"
 msgstr ""
 
-#: lib/blame.tcl:972
-msgid "Original File:"
+#: lib/transport.tcl:93
+#, tcl-format
+msgid "Mirroring to %s"
 msgstr ""
 
-#: lib/blame.tcl:1020
-msgid "Cannot find HEAD commit:"
+#: lib/transport.tcl:111
+#, tcl-format
+msgid "Pushing %s %s to %s"
 msgstr ""
 
-#: lib/blame.tcl:1075
-msgid "Cannot find parent commit:"
+#: lib/transport.tcl:132
+msgid "Push Branches"
 msgstr ""
 
-#: lib/blame.tcl:1090
-msgid "Unable to display parent"
+#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34
+#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32
+#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41
+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43
+#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178
+msgid "Cancel"
 msgstr ""
 
-#: lib/blame.tcl:1091 lib/diff.tcl:320
-msgid "Error loading diff:"
+#: lib/transport.tcl:147
+msgid "Source Branches"
 msgstr ""
 
-#: lib/blame.tcl:1231
-msgid "Originally By:"
+#: lib/transport.tcl:162
+msgid "Destination Repository"
 msgstr ""
 
-#: lib/blame.tcl:1237
-msgid "In File:"
+#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
+msgid "Remote:"
 msgstr ""
 
-#: lib/blame.tcl:1242
-msgid "Copied Or Moved Here By:"
+#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
+msgid "Arbitrary Location:"
 msgstr ""
 
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
-msgid "Checkout Branch"
+#: lib/transport.tcl:205
+msgid "Transfer Options"
 msgstr ""
 
-#: lib/branch_checkout.tcl:23
-msgid "Checkout"
+#: lib/transport.tcl:207
+msgid "Force overwrite existing branch (may discard changes)"
 msgstr ""
 
-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
-#: lib/transport.tcl:108
-msgid "Cancel"
+#: lib/transport.tcl:211
+msgid "Use thin pack (for slow network connections)"
 msgstr ""
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
-msgid "Revision"
+#: lib/transport.tcl:215
+msgid "Include tags"
 msgstr ""
 
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
-msgid "Options"
+#: lib/transport.tcl:229
+#, tcl-format
+msgid "%s (%s): Push"
 msgstr ""
 
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
-msgid "Fetch Tracking Branch"
+#: lib/checkout_op.tcl:85
+#, tcl-format
+msgid "Fetching %s from %s"
 msgstr ""
 
-#: lib/branch_checkout.tcl:44
-msgid "Detach From Local Branch"
+#: lib/checkout_op.tcl:133
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
 msgstr ""
 
-#: lib/branch_create.tcl:22
-msgid "Create Branch"
+#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81
+#: lib/database.tcl:30
+msgid "Close"
 msgstr ""
 
-#: lib/branch_create.tcl:27
-msgid "Create New Branch"
+#: lib/checkout_op.tcl:175
+#, tcl-format
+msgid "Branch '%s' does not exist."
 msgstr ""
 
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
-msgid "Create"
+#: lib/checkout_op.tcl:194
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
 msgstr ""
 
-#: lib/branch_create.tcl:40
-msgid "Branch Name"
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
+#, tcl-format
+msgid "Branch '%s' already exists."
 msgstr ""
 
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
-msgid "Name:"
+#: lib/checkout_op.tcl:229
+#, tcl-format
+msgid ""
+"Branch '%s' already exists.\n"
+"\n"
+"It cannot fast-forward to %s.\n"
+"A merge is required."
 msgstr ""
 
-#: lib/branch_create.tcl:58
-msgid "Match Tracking Branch Name"
+#: lib/checkout_op.tcl:243
+#, tcl-format
+msgid "Merge strategy '%s' not supported."
 msgstr ""
 
-#: lib/branch_create.tcl:66
-msgid "Starting Revision"
+#: lib/checkout_op.tcl:262
+#, tcl-format
+msgid "Failed to update '%s'."
 msgstr ""
 
-#: lib/branch_create.tcl:72
-msgid "Update Existing Branch:"
+#: lib/checkout_op.tcl:274
+msgid "Staging area (index) is already locked."
 msgstr ""
 
-#: lib/branch_create.tcl:75
-msgid "No"
+#: lib/checkout_op.tcl:289
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan.  A "
+"rescan must be performed before the current branch can be changed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/branch_create.tcl:80
-msgid "Fast Forward Only"
+#: lib/checkout_op.tcl:345
+#, tcl-format
+msgid "Updating working directory to '%s'..."
 msgstr ""
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
-msgid "Reset"
+#: lib/checkout_op.tcl:346
+msgid "files checked out"
 msgstr ""
 
-#: lib/branch_create.tcl:97
-msgid "Checkout After Creation"
+#: lib/checkout_op.tcl:377
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
 
-#: lib/branch_create.tcl:131
-msgid "Please select a tracking branch."
+#: lib/checkout_op.tcl:378
+msgid "File level merge required."
 msgstr ""
 
-#: lib/branch_create.tcl:140
+#: lib/checkout_op.tcl:382
 #, tcl-format
-msgid "Tracking branch %s is not a branch in the remote repository."
+msgid "Staying on branch '%s'."
 msgstr ""
 
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
-msgid "Please supply a branch name."
+#: lib/checkout_op.tcl:453
+msgid ""
+"You are no longer on a local branch.\n"
+"\n"
+"If you wanted to be on a branch, create one now starting from 'This Detached "
+"Checkout'."
 msgstr ""
 
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508
 #, tcl-format
-msgid "'%s' is not an acceptable branch name."
+msgid "Checked out '%s'."
 msgstr ""
 
-#: lib/branch_delete.tcl:15
-msgid "Delete Branch"
+#: lib/checkout_op.tcl:536
+#, tcl-format
+msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr ""
 
-#: lib/branch_delete.tcl:20
-msgid "Delete Local Branch"
+#: lib/checkout_op.tcl:558
+msgid "Recovering lost commits may not be easy."
 msgstr ""
 
-#: lib/branch_delete.tcl:37
-msgid "Local Branches"
+#: lib/checkout_op.tcl:563
+#, tcl-format
+msgid "Reset '%s'?"
 msgstr ""
 
-#: lib/branch_delete.tcl:52
-msgid "Delete Only If Merged Into"
+#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170
+msgid "Visualize"
 msgstr ""
 
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
+#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
+msgid "Reset"
 msgstr ""
 
-#: lib/branch_delete.tcl:103
+#: lib/checkout_op.tcl:636
 #, tcl-format
-msgid "The following branches are not completely merged into %s:"
-msgstr ""
-
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
 msgid ""
-"Recovering deleted branches is difficult.\n"
+"Failed to set current branch.\n"
 "\n"
-"Delete the selected branches?"
+"This working directory is only partially switched.  We successfully updated "
+"your files, but failed to update an internal Git file.\n"
+"\n"
+"This should not have occurred.  %s will now close and give up."
 msgstr ""
 
-#: lib/branch_delete.tcl:141
+#: lib/remote_add.tcl:20
 #, tcl-format
-msgid ""
-"Failed to delete branches:\n"
-"%s"
+msgid "%s (%s): Add Remote"
 msgstr ""
 
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
-msgid "Rename Branch"
+#: lib/remote_add.tcl:25
+msgid "Add New Remote"
 msgstr ""
 
-#: lib/branch_rename.tcl:26
-msgid "Rename"
+#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
+msgid "Add"
 msgstr ""
 
-#: lib/branch_rename.tcl:36
-msgid "Branch:"
+#: lib/remote_add.tcl:39
+msgid "Remote Details"
 msgstr ""
 
-#: lib/branch_rename.tcl:39
-msgid "New Name:"
+#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
+msgid "Name:"
 msgstr ""
 
-#: lib/branch_rename.tcl:75
-msgid "Please select a branch to rename."
+#: lib/remote_add.tcl:50
+msgid "Location:"
 msgstr ""
 
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
+#: lib/remote_add.tcl:60
+msgid "Further Action"
+msgstr ""
+
+#: lib/remote_add.tcl:63
+msgid "Fetch Immediately"
+msgstr ""
+
+#: lib/remote_add.tcl:69
+msgid "Initialize Remote Repository and Push"
+msgstr ""
+
+#: lib/remote_add.tcl:75
+msgid "Do Nothing Else Now"
+msgstr ""
+
+#: lib/remote_add.tcl:100
+msgid "Please supply a remote name."
+msgstr ""
+
+#: lib/remote_add.tcl:113
 #, tcl-format
-msgid "Branch '%s' already exists."
+msgid "'%s' is not an acceptable remote name."
 msgstr ""
 
-#: lib/branch_rename.tcl:117
+#: lib/remote_add.tcl:124
 #, tcl-format
-msgid "Failed to rename '%s'."
+msgid "Failed to add remote '%s' of location '%s'."
+msgstr ""
+
+#: lib/remote_add.tcl:133
+#, tcl-format
+msgid "Fetching the %s"
+msgstr ""
+
+#: lib/remote_add.tcl:156
+#, tcl-format
+msgid "Do not know how to initialize repository at location '%s'."
+msgstr ""
+
+#: lib/remote_add.tcl:163
+#, tcl-format
+msgid "Setting up the %s (at %s)"
 msgstr ""
 
 #: lib/browser.tcl:17
 msgid "Starting..."
 msgstr ""
 
-#: lib/browser.tcl:26
-msgid "File Browser"
+#: lib/browser.tcl:27
+#, tcl-format
+msgid "%s (%s): File Browser"
 msgstr ""
 
-#: lib/browser.tcl:126 lib/browser.tcl:143
+#: lib/browser.tcl:132 lib/browser.tcl:149
 #, tcl-format
 msgid "Loading %s..."
 msgstr ""
 
-#: lib/browser.tcl:187
+#: lib/browser.tcl:193
 msgid "[Up To Parent]"
 msgstr ""
 
-#: lib/browser.tcl:267 lib/browser.tcl:273
+#: lib/browser.tcl:275
+#, tcl-format
+msgid "%s (%s): Browse Branch Files"
+msgstr ""
+
+#: lib/browser.tcl:282
 msgid "Browse Branch Files"
 msgstr ""
 
-#: lib/browser.tcl:278 lib/choose_repository.tcl:398
-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
-#: lib/choose_repository.tcl:1028
+#: lib/browser.tcl:288 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
+#: lib/choose_repository.tcl:1115
 msgid "Browse"
 msgstr ""
 
-#: lib/checkout_op.tcl:85
-#, tcl-format
-msgid "Fetching %s from %s"
+#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
+msgid "Revision"
 msgstr ""
 
-#: lib/checkout_op.tcl:133
-#, tcl-format
-msgid "fatal: Cannot resolve %s"
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
 msgstr ""
 
-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
-#: lib/sshkey.tcl:53
-msgid "Close"
+#: lib/index.tcl:30
+msgid "Index Error"
 msgstr ""
 
-#: lib/checkout_op.tcl:175
+#: lib/index.tcl:32
+msgid ""
+"Updating the Git index failed.  A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr ""
+
+#: lib/index.tcl:43
+msgid "Continue"
+msgstr ""
+
+#: lib/index.tcl:46
+msgid "Unlock Index"
+msgstr ""
+
+#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587
+#: lib/choose_repository.tcl:999
+msgid "files"
+msgstr ""
+
+#: lib/index.tcl:326
+msgid "Unstaging selected files from commit"
+msgstr ""
+
+#: lib/index.tcl:330
 #, tcl-format
-msgid "Branch '%s' does not exist."
+msgid "Unstaging %s from commit"
 msgstr ""
 
-#: lib/checkout_op.tcl:194
+#: lib/index.tcl:369
+msgid "Ready to commit."
+msgstr ""
+
+#: lib/index.tcl:378
+msgid "Adding selected files"
+msgstr ""
+
+#: lib/index.tcl:382
 #, tcl-format
-msgid "Failed to configure simplified git-pull for '%s'."
+msgid "Adding %s"
 msgstr ""
 
-#: lib/checkout_op.tcl:229
+#: lib/index.tcl:412
 #, tcl-format
-msgid ""
-"Branch '%s' already exists.\n"
-"\n"
-"It cannot fast-forward to %s.\n"
-"A merge is required."
+msgid "Stage %d untracked files?"
 msgstr ""
 
-#: lib/checkout_op.tcl:243
+#: lib/index.tcl:420
+msgid "Adding all changed files"
+msgstr ""
+
+#: lib/index.tcl:503
 #, tcl-format
-msgid "Merge strategy '%s' not supported."
+msgid "Revert changes in file %s?"
 msgstr ""
 
-#: lib/checkout_op.tcl:262
+#: lib/index.tcl:508
 #, tcl-format
-msgid "Failed to update '%s'."
+msgid "Revert changes in these %i files?"
 msgstr ""
 
-#: lib/checkout_op.tcl:274
-msgid "Staging area (index) is already locked."
+#: lib/index.tcl:517
+msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 
-#: lib/checkout_op.tcl:289
-msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan.  A "
-"rescan must be performed before the current branch can be changed.\n"
-"\n"
-"The rescan will be automatically started now.\n"
+#: lib/index.tcl:520 lib/index.tcl:563
+msgid "Do Nothing"
 msgstr ""
 
-#: lib/checkout_op.tcl:345
+#: lib/index.tcl:545
 #, tcl-format
-msgid "Updating working directory to '%s'..."
+msgid "Delete untracked file %s?"
 msgstr ""
 
-#: lib/checkout_op.tcl:346
-msgid "files checked out"
+#: lib/index.tcl:550
+#, tcl-format
+msgid "Delete these %i untracked files?"
 msgstr ""
 
-#: lib/checkout_op.tcl:376
-#, tcl-format
-msgid "Aborted checkout of '%s' (file level merging is required)."
+#: lib/index.tcl:560
+msgid "Files will be permanently deleted."
 msgstr ""
 
-#: lib/checkout_op.tcl:377
-msgid "File level merge required."
+#: lib/index.tcl:564
+msgid "Delete Files"
 msgstr ""
 
-#: lib/checkout_op.tcl:381
-#, tcl-format
-msgid "Staying on branch '%s'."
+#: lib/index.tcl:586
+msgid "Deleting"
 msgstr ""
 
-#: lib/checkout_op.tcl:452
-msgid ""
-"You are no longer on a local branch.\n"
-"\n"
-"If you wanted to be on a branch, create one now starting from 'This Detached "
-"Checkout'."
+#: lib/index.tcl:665
+msgid "Encountered errors deleting files:\n"
 msgstr ""
 
-#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
+#: lib/index.tcl:674
 #, tcl-format
-msgid "Checked out '%s'."
+msgid "None of the %d selected files could be deleted."
 msgstr ""
 
-#: lib/checkout_op.tcl:535
+#: lib/index.tcl:679
 #, tcl-format
-msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgid "%d of the %d selected files could not be deleted."
 msgstr ""
 
-#: lib/checkout_op.tcl:557
-msgid "Recovering lost commits may not be easy."
+#: lib/index.tcl:726
+msgid "Reverting selected files"
 msgstr ""
 
-#: lib/checkout_op.tcl:562
+#: lib/index.tcl:730
 #, tcl-format
-msgid "Reset '%s'?"
+msgid "Reverting %s"
 msgstr ""
 
-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
-msgid "Visualize"
+#: lib/branch_checkout.tcl:16
+#, tcl-format
+msgid "%s (%s): Checkout Branch"
 msgstr ""
 
-#: lib/checkout_op.tcl:635
-#, tcl-format
-msgid ""
-"Failed to set current branch.\n"
-"\n"
-"This working directory is only partially switched.  We successfully updated "
-"your files, but failed to update an internal Git file.\n"
-"\n"
-"This should not have occurred.  %s will now close and give up."
+#: lib/branch_checkout.tcl:21
+msgid "Checkout Branch"
 msgstr ""
 
-#: lib/choose_font.tcl:39
-msgid "Select"
+#: lib/branch_checkout.tcl:26
+msgid "Checkout"
 msgstr ""
 
-#: lib/choose_font.tcl:53
-msgid "Font Family"
+#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
+msgid "Options"
 msgstr ""
 
-#: lib/choose_font.tcl:74
-msgid "Font Size"
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
 msgstr ""
 
-#: lib/choose_font.tcl:91
-msgid "Font Example"
+#: lib/branch_checkout.tcl:47
+msgid "Detach From Local Branch"
 msgstr ""
 
-#: lib/choose_font.tcl:103
-msgid ""
-"This is example text.\n"
-"If you like this text, it can be your font."
+#: lib/status_bar.tcl:263
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr ""
 
-#: lib/choose_repository.tcl:28
-msgid "Git Gui"
+#: lib/remote.tcl:200
+msgid "Push to"
 msgstr ""
 
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
-msgid "Create New Repository"
+#: lib/remote.tcl:218
+msgid "Remove Remote"
 msgstr ""
 
-#: lib/choose_repository.tcl:93
-msgid "New..."
+#: lib/remote.tcl:223
+msgid "Prune from"
 msgstr ""
 
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
-msgid "Clone Existing Repository"
+#: lib/remote.tcl:228
+msgid "Fetch from"
 msgstr ""
 
-#: lib/choose_repository.tcl:106
-msgid "Clone..."
+#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264
+msgid "All"
 msgstr ""
 
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
-msgid "Open Existing Repository"
+#: lib/branch_rename.tcl:15
+#, tcl-format
+msgid "%s (%s): Rename Branch"
 msgstr ""
 
-#: lib/choose_repository.tcl:119
-msgid "Open..."
+#: lib/branch_rename.tcl:23
+msgid "Rename Branch"
 msgstr ""
 
-#: lib/choose_repository.tcl:132
-msgid "Recent Repositories"
+#: lib/branch_rename.tcl:28
+msgid "Rename"
 msgstr ""
 
-#: lib/choose_repository.tcl:138
-msgid "Open Recent Repository:"
+#: lib/branch_rename.tcl:38
+msgid "Branch:"
 msgstr ""
 
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
-#: lib/choose_repository.tcl:320
-#, tcl-format
-msgid "Failed to create repository %s:"
+#: lib/branch_rename.tcl:46
+msgid "New Name:"
 msgstr ""
 
-#: lib/choose_repository.tcl:391
-msgid "Directory:"
+#: lib/branch_rename.tcl:81
+msgid "Please select a branch to rename."
 msgstr ""
 
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
-#: lib/choose_repository.tcl:1052
-msgid "Git Repository"
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
+msgid "Please supply a branch name."
 msgstr ""
 
-#: lib/choose_repository.tcl:448
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
 #, tcl-format
-msgid "Directory %s already exists."
+msgid "'%s' is not an acceptable branch name."
 msgstr ""
 
-#: lib/choose_repository.tcl:452
+#: lib/branch_rename.tcl:123
 #, tcl-format
-msgid "File %s already exists."
+msgid "Failed to rename '%s'."
 msgstr ""
 
-#: lib/choose_repository.tcl:466
-msgid "Clone"
+#: lib/choose_font.tcl:41
+msgid "Select"
 msgstr ""
 
-#: lib/choose_repository.tcl:479
-msgid "Source Location:"
+#: lib/choose_font.tcl:55
+msgid "Font Family"
 msgstr ""
 
-#: lib/choose_repository.tcl:490
-msgid "Target Directory:"
+#: lib/choose_font.tcl:76
+msgid "Font Size"
 msgstr ""
 
-#: lib/choose_repository.tcl:502
-msgid "Clone Type:"
+#: lib/choose_font.tcl:93
+msgid "Font Example"
 msgstr ""
 
-#: lib/choose_repository.tcl:508
-msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+#: lib/choose_font.tcl:105
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
 msgstr ""
 
-#: lib/choose_repository.tcl:514
-msgid "Full Copy (Slower, Redundant Backup)"
+#: lib/option.tcl:11
+#, tcl-format
+msgid "Invalid global encoding '%s'"
 msgstr ""
 
-#: lib/choose_repository.tcl:520
-msgid "Shared (Fastest, Not Recommended, No Backup)"
+#: lib/option.tcl:19
+#, tcl-format
+msgid "Invalid repo encoding '%s'"
+msgstr ""
+
+#: lib/option.tcl:119
+msgid "Restore Defaults"
+msgstr ""
+
+#: lib/option.tcl:123
+msgid "Save"
 msgstr ""
 
-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
+#: lib/option.tcl:133
 #, tcl-format
-msgid "Not a Git repository: %s"
+msgid "%s Repository"
 msgstr ""
 
-#: lib/choose_repository.tcl:592
-msgid "Standard only available for local repository."
+#: lib/option.tcl:134
+msgid "Global (All Repositories)"
 msgstr ""
 
-#: lib/choose_repository.tcl:596
-msgid "Shared only available for local repository."
+#: lib/option.tcl:140
+msgid "User Name"
 msgstr ""
 
-#: lib/choose_repository.tcl:617
-#, tcl-format
-msgid "Location %s already exists."
+#: lib/option.tcl:141
+msgid "Email Address"
 msgstr ""
 
-#: lib/choose_repository.tcl:628
-msgid "Failed to configure origin"
+#: lib/option.tcl:143
+msgid "Summarize Merge Commits"
 msgstr ""
 
-#: lib/choose_repository.tcl:640
-msgid "Counting objects"
+#: lib/option.tcl:144
+msgid "Merge Verbosity"
 msgstr ""
 
-#: lib/choose_repository.tcl:641
-msgid "buckets"
+#: lib/option.tcl:145
+msgid "Show Diffstat After Merge"
 msgstr ""
 
-#: lib/choose_repository.tcl:665
-#, tcl-format
-msgid "Unable to copy objects/info/alternates: %s"
+#: lib/option.tcl:146
+msgid "Use Merge Tool"
 msgstr ""
 
-#: lib/choose_repository.tcl:701
-#, tcl-format
-msgid "Nothing to clone from %s."
+#: lib/option.tcl:148
+msgid "Trust File Modification Timestamps"
 msgstr ""
 
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
-#: lib/choose_repository.tcl:929
-msgid "The 'master' branch has not been initialized."
+#: lib/option.tcl:149
+msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 
-#: lib/choose_repository.tcl:716
-msgid "Hardlinks are unavailable.  Falling back to copying."
+#: lib/option.tcl:150
+msgid "Match Tracking Branches"
 msgstr ""
 
-#: lib/choose_repository.tcl:728
-#, tcl-format
-msgid "Cloning from %s"
+#: lib/option.tcl:151
+msgid "Use Textconv For Diffs and Blames"
 msgstr ""
 
-#: lib/choose_repository.tcl:759
-msgid "Copying objects"
+#: lib/option.tcl:152
+msgid "Blame Copy Only On Changed Files"
 msgstr ""
 
-#: lib/choose_repository.tcl:760
-msgid "KiB"
+#: lib/option.tcl:153
+msgid "Maximum Length of Recent Repositories List"
 msgstr ""
 
-#: lib/choose_repository.tcl:784
-#, tcl-format
-msgid "Unable to copy object: %s"
+#: lib/option.tcl:154
+msgid "Minimum Letters To Blame Copy On"
 msgstr ""
 
-#: lib/choose_repository.tcl:794
-msgid "Linking objects"
+#: lib/option.tcl:155
+msgid "Blame History Context Radius (days)"
 msgstr ""
 
-#: lib/choose_repository.tcl:795
-msgid "objects"
+#: lib/option.tcl:156
+msgid "Number of Diff Context Lines"
 msgstr ""
 
-#: lib/choose_repository.tcl:803
-#, tcl-format
-msgid "Unable to hardlink object: %s"
+#: lib/option.tcl:157
+msgid "Additional Diff Parameters"
 msgstr ""
 
-#: lib/choose_repository.tcl:858
-msgid "Cannot fetch branches and objects.  See console output for details."
+#: lib/option.tcl:158
+msgid "Commit Message Text Width"
 msgstr ""
 
-#: lib/choose_repository.tcl:869
-msgid "Cannot fetch tags.  See console output for details."
+#: lib/option.tcl:159
+msgid "New Branch Name Template"
 msgstr ""
 
-#: lib/choose_repository.tcl:893
-msgid "Cannot determine HEAD.  See console output for details."
+#: lib/option.tcl:160
+msgid "Default File Contents Encoding"
 msgstr ""
 
-#: lib/choose_repository.tcl:902
-#, tcl-format
-msgid "Unable to cleanup %s"
+#: lib/option.tcl:161
+msgid "Warn before committing to a detached head"
 msgstr ""
 
-#: lib/choose_repository.tcl:908
-msgid "Clone failed."
+#: lib/option.tcl:162
+msgid "Staging of untracked files"
 msgstr ""
 
-#: lib/choose_repository.tcl:915
-msgid "No default branch obtained."
+#: lib/option.tcl:163
+msgid "Show untracked files"
 msgstr ""
 
-#: lib/choose_repository.tcl:926
+#: lib/option.tcl:164
+msgid "Tab spacing"
+msgstr ""
+
+#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282
+#: lib/database.tcl:57
 #, tcl-format
-msgid "Cannot resolve %s as a commit."
+msgid "%s:"
 msgstr ""
 
-#: lib/choose_repository.tcl:938
-msgid "Creating working directory"
+#: lib/option.tcl:210
+msgid "Change"
 msgstr ""
 
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
-#: lib/index.tcl:198
-msgid "files"
+#: lib/option.tcl:254
+msgid "Spelling Dictionary:"
 msgstr ""
 
-#: lib/choose_repository.tcl:968
-msgid "Initial file checkout failed."
+#: lib/option.tcl:284
+msgid "Change Font"
 msgstr ""
 
-#: lib/choose_repository.tcl:1011
-msgid "Open"
+#: lib/option.tcl:288
+#, tcl-format
+msgid "Choose %s"
 msgstr ""
 
-#: lib/choose_repository.tcl:1021
-msgid "Repository:"
+#: lib/option.tcl:294
+msgid "pt."
 msgstr ""
 
-#: lib/choose_repository.tcl:1072
+#: lib/option.tcl:308
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:345
+msgid "Failed to completely save options:"
+msgstr ""
+
+#: lib/encoding.tcl:443
+msgid "Default"
+msgstr ""
+
+#: lib/encoding.tcl:448
 #, tcl-format
-msgid "Failed to open repository %s:"
+msgid "System (%s)"
 msgstr ""
 
-#: lib/choose_rev.tcl:53
-msgid "This Detached Checkout"
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
 msgstr ""
 
-#: lib/choose_rev.tcl:60
-msgid "Revision Expression:"
+#: lib/tools.tcl:76
+#, tcl-format
+msgid "Running %s requires a selected file."
 msgstr ""
 
-#: lib/choose_rev.tcl:74
-msgid "Local Branch"
+#: lib/tools.tcl:92
+#, tcl-format
+msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
 msgstr ""
 
-#: lib/choose_rev.tcl:79
-msgid "Tracking Branch"
+#: lib/tools.tcl:96
+#, tcl-format
+msgid "Are you sure you want to run %s?"
 msgstr ""
 
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
-msgid "Tag"
+#: lib/tools.tcl:118
+#, tcl-format
+msgid "Tool: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:317
+#: lib/tools.tcl:119
 #, tcl-format
-msgid "Invalid revision: %s"
+msgid "Running: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:338
-msgid "No revision selected."
+#: lib/tools.tcl:158
+#, tcl-format
+msgid "Tool completed successfully: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:346
-msgid "Revision expression is empty."
+#: lib/tools.tcl:160
+#, tcl-format
+msgid "Tool failed: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:531
-msgid "Updated"
+#: lib/mergetool.tcl:8
+msgid "Force resolution to the base version?"
 msgstr ""
 
-#: lib/choose_rev.tcl:559
-msgid "URL"
+#: lib/mergetool.tcl:9
+msgid "Force resolution to this branch?"
 msgstr ""
 
-#: lib/commit.tcl:9
-msgid ""
-"There is nothing to amend.\n"
-"\n"
-"You are about to create the initial commit.  There is no commit before this "
-"to amend.\n"
+#: lib/mergetool.tcl:10
+msgid "Force resolution to the other branch?"
 msgstr ""
 
-#: lib/commit.tcl:18
+#: lib/mergetool.tcl:14
+#, tcl-format
 msgid ""
-"Cannot amend while merging.\n"
+"Note that the diff shows only conflicting changes.\n"
 "\n"
-"You are currently in the middle of a merge that has not been fully "
-"completed.  You cannot amend the prior commit unless you first abort the "
-"current merge activity.\n"
+"%s will be overwritten.\n"
+"\n"
+"This operation can be undone only by restarting the merge."
 msgstr ""
 
-#: lib/commit.tcl:48
-msgid "Error loading commit data for amend:"
+#: lib/mergetool.tcl:45
+#, tcl-format
+msgid "File %s seems to have unresolved conflicts, still stage?"
 msgstr ""
 
-#: lib/commit.tcl:75
-msgid "Unable to obtain your identity:"
+#: lib/mergetool.tcl:60
+#, tcl-format
+msgid "Adding resolution for %s"
 msgstr ""
 
-#: lib/commit.tcl:80
-msgid "Invalid GIT_COMMITTER_IDENT:"
+#: lib/mergetool.tcl:141
+msgid "Cannot resolve deletion or link conflicts using a tool"
 msgstr ""
 
-#: lib/commit.tcl:129
+#: lib/mergetool.tcl:146
+msgid "Conflict file does not exist"
+msgstr ""
+
+#: lib/mergetool.tcl:246
 #, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
+msgid "Not a GUI merge tool: '%s'"
 msgstr ""
 
-#: lib/commit.tcl:149
-msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan.  A "
-"rescan must be performed before another commit can be created.\n"
-"\n"
-"The rescan will be automatically started now.\n"
+#: lib/mergetool.tcl:275
+#, tcl-format
+msgid "Unsupported merge tool '%s'"
 msgstr ""
 
-#: lib/commit.tcl:172
+#: lib/mergetool.tcl:310
+msgid "Merge tool is already running, terminate it?"
+msgstr ""
+
+#: lib/mergetool.tcl:330
 #, tcl-format
 msgid ""
-"Unmerged files cannot be committed.\n"
-"\n"
-"File %s has merge conflicts.  You must resolve them and stage the file "
-"before committing.\n"
+"Error retrieving versions:\n"
+"%s"
 msgstr ""
 
-#: lib/commit.tcl:180
+#: lib/mergetool.tcl:350
 #, tcl-format
 msgid ""
-"Unknown file state %s detected.\n"
+"Could not start the merge tool:\n"
 "\n"
-"File %s cannot be committed by this program.\n"
+"%s"
 msgstr ""
 
-#: lib/commit.tcl:188
-msgid ""
-"No changes to commit.\n"
-"\n"
-"You must stage at least 1 file before you can commit.\n"
+#: lib/mergetool.tcl:354
+msgid "Running merge tool..."
 msgstr ""
 
-#: lib/commit.tcl:203
-msgid ""
-"Please supply a commit message.\n"
-"\n"
-"A good commit message has the following format:\n"
-"\n"
-"- First line: Describe in one sentence what you did.\n"
-"- Second line: Blank\n"
-"- Remaining lines: Describe why this change is good.\n"
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
+msgid "Merge tool failed."
 msgstr ""
 
-#: lib/commit.tcl:234
-msgid "Calling pre-commit hook..."
+#: lib/tools_dlg.tcl:22
+#, tcl-format
+msgid "%s (%s): Add Tool"
 msgstr ""
 
-#: lib/commit.tcl:249
-msgid "Commit declined by pre-commit hook."
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
 msgstr ""
 
-#: lib/commit.tcl:272
-msgid "Calling commit-msg hook..."
+#: lib/tools_dlg.tcl:34
+msgid "Add globally"
 msgstr ""
 
-#: lib/commit.tcl:287
-msgid "Commit declined by commit-msg hook."
+#: lib/tools_dlg.tcl:46
+msgid "Tool Details"
 msgstr ""
 
-#: lib/commit.tcl:300
-msgid "Committing changes..."
+#: lib/tools_dlg.tcl:49
+msgid "Use '/' separators to create a submenu tree:"
 msgstr ""
 
-#: lib/commit.tcl:316
-msgid "write-tree failed:"
+#: lib/tools_dlg.tcl:60
+msgid "Command:"
 msgstr ""
 
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
-msgid "Commit failed."
+#: lib/tools_dlg.tcl:71
+msgid "Show a dialog before running"
 msgstr ""
 
-#: lib/commit.tcl:334
-#, tcl-format
-msgid "Commit %s appears to be corrupt"
+#: lib/tools_dlg.tcl:77
+msgid "Ask the user to select a revision (sets $REVISION)"
 msgstr ""
 
-#: lib/commit.tcl:339
-msgid ""
-"No changes to commit.\n"
-"\n"
-"No files were modified by this commit and it was not a merge commit.\n"
-"\n"
-"A rescan will be automatically started now.\n"
+#: lib/tools_dlg.tcl:82
+msgid "Ask the user for additional arguments (sets $ARGS)"
 msgstr ""
 
-#: lib/commit.tcl:346
-msgid "No changes to commit."
+#: lib/tools_dlg.tcl:89
+msgid "Don't show the command output window"
 msgstr ""
 
-#: lib/commit.tcl:360
-msgid "commit-tree failed:"
+#: lib/tools_dlg.tcl:94
+msgid "Run only if a diff is selected ($FILENAME not empty)"
 msgstr ""
 
-#: lib/commit.tcl:381
-msgid "update-ref failed:"
+#: lib/tools_dlg.tcl:118
+msgid "Please supply a name for the tool."
 msgstr ""
 
-#: lib/commit.tcl:469
+#: lib/tools_dlg.tcl:126
 #, tcl-format
-msgid "Created commit %s: %s"
+msgid "Tool '%s' already exists."
 msgstr ""
 
-#: lib/console.tcl:59
-msgid "Working... please wait..."
+#: lib/tools_dlg.tcl:148
+#, tcl-format
+msgid ""
+"Could not add tool:\n"
+"%s"
 msgstr ""
 
-#: lib/console.tcl:186
-msgid "Success"
+#: lib/tools_dlg.tcl:187
+#, tcl-format
+msgid "%s (%s): Remove Tool"
 msgstr ""
 
-#: lib/console.tcl:200
-msgid "Error: Command Failed"
+#: lib/tools_dlg.tcl:193
+msgid "Remove Tool Commands"
 msgstr ""
 
-#: lib/database.tcl:43
-msgid "Number of loose objects"
+#: lib/tools_dlg.tcl:198
+msgid "Remove"
 msgstr ""
 
-#: lib/database.tcl:44
-msgid "Disk space used by loose objects"
+#: lib/tools_dlg.tcl:231
+msgid "(Blue denotes repository-local tools)"
 msgstr ""
 
-#: lib/database.tcl:45
-msgid "Number of packed objects"
+#: lib/tools_dlg.tcl:283
+#, tcl-format
+msgid "%s (%s):"
 msgstr ""
 
-#: lib/database.tcl:46
-msgid "Number of packs"
+#: lib/tools_dlg.tcl:292
+#, tcl-format
+msgid "Run Command: %s"
 msgstr ""
 
-#: lib/database.tcl:47
-msgid "Disk space used by packed objects"
+#: lib/tools_dlg.tcl:306
+msgid "Arguments"
 msgstr ""
 
-#: lib/database.tcl:48
-msgid "Packed objects waiting for pruning"
+#: lib/tools_dlg.tcl:341
+msgid "OK"
 msgstr ""
 
-#: lib/database.tcl:49
-msgid "Garbage files"
+#: lib/search.tcl:48
+msgid "Find:"
 msgstr ""
 
-#: lib/database.tcl:72
-msgid "Compressing the object database"
+#: lib/search.tcl:50
+msgid "Next"
 msgstr ""
 
-#: lib/database.tcl:83
-msgid "Verifying the object database with fsck-objects"
+#: lib/search.tcl:51
+msgid "Prev"
 msgstr ""
 
-#: lib/database.tcl:107
-#, tcl-format
-msgid ""
-"This repository currently has approximately %i loose objects.\n"
-"\n"
-"To maintain optimal performance it is strongly recommended that you compress "
-"the database.\n"
-"\n"
-"Compress the database now?"
+#: lib/search.tcl:52
+msgid "RegExp"
 msgstr ""
 
-#: lib/date.tcl:25
-#, tcl-format
-msgid "Invalid date from Git: %s"
+#: lib/search.tcl:54
+msgid "Case"
 msgstr ""
 
-#: lib/diff.tcl:64
+#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75
 #, tcl-format
-msgid ""
-"No differences detected.\n"
-"\n"
-"%s has no changes.\n"
-"\n"
-"The modification date of this file was updated by another application, but "
-"the content within the file was not changed.\n"
-"\n"
-"A rescan will be automatically started to find other files which may have "
-"the same state."
+msgid "%s (%s): Create Desktop Icon"
 msgstr ""
 
-#: lib/diff.tcl:104
-#, tcl-format
-msgid "Loading diff of %s..."
+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
+msgid "Cannot write shortcut:"
 msgstr ""
 
-#: lib/diff.tcl:125
-msgid ""
-"LOCAL: deleted\n"
-"REMOTE:\n"
+#: lib/shortcut.tcl:140
+msgid "Cannot write icon:"
 msgstr ""
 
-#: lib/diff.tcl:130
-msgid ""
-"REMOTE: deleted\n"
-"LOCAL:\n"
+#: lib/remote_branch_delete.tcl:29
+#, tcl-format
+msgid "%s (%s): Delete Branch Remotely"
 msgstr ""
 
-#: lib/diff.tcl:137
-msgid "LOCAL:\n"
+#: lib/remote_branch_delete.tcl:34
+msgid "Delete Branch Remotely"
 msgstr ""
 
-#: lib/diff.tcl:140
-msgid "REMOTE:\n"
+#: lib/remote_branch_delete.tcl:48
+msgid "From Repository"
 msgstr ""
 
-#: lib/diff.tcl:202 lib/diff.tcl:319
-#, tcl-format
-msgid "Unable to display %s"
+#: lib/remote_branch_delete.tcl:88
+msgid "Branches"
 msgstr ""
 
-#: lib/diff.tcl:203
-msgid "Error loading file:"
+#: lib/remote_branch_delete.tcl:110
+msgid "Delete Only If"
 msgstr ""
 
-#: lib/diff.tcl:210
-msgid "Git Repository (subproject)"
+#: lib/remote_branch_delete.tcl:112
+msgid "Merged Into:"
 msgstr ""
 
-#: lib/diff.tcl:222
-msgid "* Binary file (not showing content)."
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
+msgid "Always (Do not perform merge checks)"
 msgstr ""
 
-#: lib/diff.tcl:227
-#, tcl-format
-msgid ""
-"* Untracked file is %d bytes.\n"
-"* Showing only first %d bytes.\n"
+#: lib/remote_branch_delete.tcl:153
+msgid "A branch is required for 'Merged Into'."
 msgstr ""
 
-#: lib/diff.tcl:233
+#: lib/remote_branch_delete.tcl:185
 #, tcl-format
 msgid ""
+"The following branches are not completely merged into %s:\n"
 "\n"
-"* Untracked file clipped here by %s.\n"
-"* To see the entire file, use an external editor.\n"
+" - %s"
 msgstr ""
 
-#: lib/diff.tcl:482
-msgid "Failed to unstage selected hunk."
+#: lib/remote_branch_delete.tcl:190
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits.  Try fetching from %s first."
 msgstr ""
 
-#: lib/diff.tcl:489
-msgid "Failed to stage selected hunk."
+#: lib/remote_branch_delete.tcl:208
+msgid "Please select one or more branches to delete."
 msgstr ""
 
-#: lib/diff.tcl:568
-msgid "Failed to unstage selected line."
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
 msgstr ""
 
-#: lib/diff.tcl:576
-msgid "Failed to stage selected line."
+#: lib/remote_branch_delete.tcl:227
+#, tcl-format
+msgid "Deleting branches from %s"
 msgstr ""
 
-#: lib/encoding.tcl:443
-msgid "Default"
+#: lib/remote_branch_delete.tcl:300
+msgid "No repository selected."
 msgstr ""
 
-#: lib/encoding.tcl:448
+#: lib/remote_branch_delete.tcl:305
 #, tcl-format
-msgid "System (%s)"
+msgid "Scanning %s..."
 msgstr ""
 
-#: lib/encoding.tcl:459 lib/encoding.tcl:465
-msgid "Other"
+#: lib/choose_repository.tcl:45
+msgid "Git Gui"
 msgstr ""
 
-#: lib/error.tcl:20 lib/error.tcl:114
-msgid "error"
+#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
+msgid "Create New Repository"
 msgstr ""
 
-#: lib/error.tcl:36
-msgid "warning"
+#: lib/choose_repository.tcl:110
+msgid "New..."
 msgstr ""
 
-#: lib/error.tcl:94
-msgid "You must correct the above errors before committing."
+#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
+msgid "Clone Existing Repository"
 msgstr ""
 
-#: lib/index.tcl:6
-msgid "Unable to unlock the index."
+#: lib/choose_repository.tcl:128
+msgid "Clone..."
 msgstr ""
 
-#: lib/index.tcl:15
-msgid "Index Error"
+#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
+msgid "Open Existing Repository"
 msgstr ""
 
-#: lib/index.tcl:17
-msgid ""
-"Updating the Git index failed.  A rescan will be automatically started to "
-"resynchronize git-gui."
+#: lib/choose_repository.tcl:141
+msgid "Open..."
 msgstr ""
 
-#: lib/index.tcl:28
-msgid "Continue"
+#: lib/choose_repository.tcl:154
+msgid "Recent Repositories"
 msgstr ""
 
-#: lib/index.tcl:31
-msgid "Unlock Index"
+#: lib/choose_repository.tcl:164
+msgid "Open Recent Repository:"
 msgstr ""
 
-#: lib/index.tcl:289
+#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
+#: lib/choose_repository.tcl:345
 #, tcl-format
-msgid "Unstaging %s from commit"
+msgid "Failed to create repository %s:"
 msgstr ""
 
-#: lib/index.tcl:328
-msgid "Ready to commit."
+#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
+msgid "Create"
 msgstr ""
 
-#: lib/index.tcl:341
-#, tcl-format
-msgid "Adding %s"
+#: lib/choose_repository.tcl:432
+msgid "Directory:"
 msgstr ""
 
-#: lib/index.tcl:398
+#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
+#: lib/choose_repository.tcl:1139
+msgid "Git Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:487
 #, tcl-format
-msgid "Revert changes in file %s?"
+msgid "Directory %s already exists."
 msgstr ""
 
-#: lib/index.tcl:400
+#: lib/choose_repository.tcl:491
 #, tcl-format
-msgid "Revert changes in these %i files?"
+msgid "File %s already exists."
 msgstr ""
 
-#: lib/index.tcl:408
-msgid "Any unstaged changes will be permanently lost by the revert."
+#: lib/choose_repository.tcl:506
+msgid "Clone"
 msgstr ""
 
-#: lib/index.tcl:411
-msgid "Do Nothing"
+#: lib/choose_repository.tcl:519
+msgid "Source Location:"
 msgstr ""
 
-#: lib/index.tcl:429
-msgid "Reverting selected files"
+#: lib/choose_repository.tcl:528
+msgid "Target Directory:"
 msgstr ""
 
-#: lib/index.tcl:433
-#, tcl-format
-msgid "Reverting %s"
+#: lib/choose_repository.tcl:538
+msgid "Clone Type:"
 msgstr ""
 
-#: lib/merge.tcl:13
-msgid ""
-"Cannot merge while amending.\n"
-"\n"
-"You must finish amending this commit before starting any type of merge.\n"
+#: lib/choose_repository.tcl:543
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr ""
 
-#: lib/merge.tcl:27
-msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan.  A "
-"rescan must be performed before a merge can be performed.\n"
-"\n"
-"The rescan will be automatically started now.\n"
+#: lib/choose_repository.tcl:548
+msgid "Full Copy (Slower, Redundant Backup)"
 msgstr ""
 
-#: lib/merge.tcl:45
+#: lib/choose_repository.tcl:553
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:560
+msgid "Recursively clone submodules too"
+msgstr ""
+
+#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864
+#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153
 #, tcl-format
-msgid ""
-"You are in the middle of a conflicted merge.\n"
-"\n"
-"File %s has merge conflicts.\n"
-"\n"
-"You must resolve them, stage the file, and commit to complete the current "
-"merge.  Only then can you begin another merge.\n"
+msgid "Not a Git repository: %s"
 msgstr ""
 
-#: lib/merge.tcl:55
+#: lib/choose_repository.tcl:630
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:634
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:655
 #, tcl-format
-msgid ""
-"You are in the middle of a change.\n"
-"\n"
-"File %s is modified.\n"
-"\n"
-"You should complete the current commit before starting a merge.  Doing so "
-"will help you abort a failed merge, should the need arise.\n"
+msgid "Location %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:666
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:678
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:679
+msgid "buckets"
 msgstr ""
 
-#: lib/merge.tcl:107
+#: lib/choose_repository.tcl:703
 #, tcl-format
-msgid "%s of %s"
+msgid "Unable to copy objects/info/alternates: %s"
 msgstr ""
 
-#: lib/merge.tcl:120
+#: lib/choose_repository.tcl:740
 #, tcl-format
-msgid "Merging %s and %s..."
+msgid "Nothing to clone from %s."
 msgstr ""
 
-#: lib/merge.tcl:131
-msgid "Merge completed successfully."
+#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
+#: lib/choose_repository.tcl:974
+msgid "The 'master' branch has not been initialized."
 msgstr ""
 
-#: lib/merge.tcl:133
-msgid "Merge failed.  Conflict resolution is required."
+#: lib/choose_repository.tcl:755
+msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr ""
 
-#: lib/merge.tcl:158
+#: lib/choose_repository.tcl:769
 #, tcl-format
-msgid "Merge Into %s"
+msgid "Cloning from %s"
 msgstr ""
 
-#: lib/merge.tcl:177
-msgid "Revision To Merge"
+#: lib/choose_repository.tcl:800
+msgid "Copying objects"
 msgstr ""
 
-#: lib/merge.tcl:212
-msgid ""
-"Cannot abort while amending.\n"
-"\n"
-"You must finish amending this commit.\n"
+#: lib/choose_repository.tcl:801
+msgid "KiB"
 msgstr ""
 
-#: lib/merge.tcl:222
-msgid ""
-"Abort merge?\n"
-"\n"
-"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
-"\n"
-"Continue with aborting the current merge?"
+#: lib/choose_repository.tcl:825
+#, tcl-format
+msgid "Unable to copy object: %s"
 msgstr ""
 
-#: lib/merge.tcl:228
-msgid ""
-"Reset changes?\n"
-"\n"
-"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
-"\n"
-"Continue with resetting the current changes?"
+#: lib/choose_repository.tcl:837
+msgid "Linking objects"
 msgstr ""
 
-#: lib/merge.tcl:239
-msgid "Aborting"
+#: lib/choose_repository.tcl:838
+msgid "objects"
 msgstr ""
 
-#: lib/merge.tcl:239
-msgid "files reset"
+#: lib/choose_repository.tcl:846
+#, tcl-format
+msgid "Unable to hardlink object: %s"
 msgstr ""
 
-#: lib/merge.tcl:267
-msgid "Abort failed."
+#: lib/choose_repository.tcl:903
+msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 
-#: lib/merge.tcl:269
-msgid "Abort completed.  Ready."
+#: lib/choose_repository.tcl:914
+msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
 
-#: lib/mergetool.tcl:8
-msgid "Force resolution to the base version?"
+#: lib/choose_repository.tcl:938
+msgid "Cannot determine HEAD.  See console output for details."
 msgstr ""
 
-#: lib/mergetool.tcl:9
-msgid "Force resolution to this branch?"
+#: lib/choose_repository.tcl:947
+#, tcl-format
+msgid "Unable to cleanup %s"
 msgstr ""
 
-#: lib/mergetool.tcl:10
-msgid "Force resolution to the other branch?"
+#: lib/choose_repository.tcl:953
+msgid "Clone failed."
 msgstr ""
 
-#: lib/mergetool.tcl:14
-#, tcl-format
-msgid ""
-"Note that the diff shows only conflicting changes.\n"
-"\n"
-"%s will be overwritten.\n"
-"\n"
-"This operation can be undone only by restarting the merge."
+#: lib/choose_repository.tcl:960
+msgid "No default branch obtained."
 msgstr ""
 
-#: lib/mergetool.tcl:45
+#: lib/choose_repository.tcl:971
 #, tcl-format
-msgid "File %s seems to have unresolved conflicts, still stage?"
+msgid "Cannot resolve %s as a commit."
 msgstr ""
 
-#: lib/mergetool.tcl:60
-#, tcl-format
-msgid "Adding resolution for %s"
+#: lib/choose_repository.tcl:998
+msgid "Creating working directory"
 msgstr ""
 
-#: lib/mergetool.tcl:141
-msgid "Cannot resolve deletion or link conflicts using a tool"
+#: lib/choose_repository.tcl:1028
+msgid "Initial file checkout failed."
 msgstr ""
 
-#: lib/mergetool.tcl:146
-msgid "Conflict file does not exist"
+#: lib/choose_repository.tcl:1072
+msgid "Cloning submodules"
 msgstr ""
 
-#: lib/mergetool.tcl:264
-#, tcl-format
-msgid "Not a GUI merge tool: '%s'"
+#: lib/choose_repository.tcl:1087
+msgid "Cannot clone submodules."
+msgstr ""
+
+#: lib/choose_repository.tcl:1110
+msgid "Repository:"
 msgstr ""
 
-#: lib/mergetool.tcl:268
+#: lib/choose_repository.tcl:1159
 #, tcl-format
-msgid "Unsupported merge tool '%s'"
+msgid "Failed to open repository %s:"
 msgstr ""
 
-#: lib/mergetool.tcl:303
-msgid "Merge tool is already running, terminate it?"
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
 msgstr ""
 
-#: lib/mergetool.tcl:323
+#: lib/blame.tcl:74
 #, tcl-format
-msgid ""
-"Error retrieving versions:\n"
-"%s"
+msgid "%s (%s): File Viewer"
 msgstr ""
 
-#: lib/mergetool.tcl:343
-#, tcl-format
-msgid ""
-"Could not start the merge tool:\n"
-"\n"
-"%s"
+#: lib/blame.tcl:80
+msgid "Commit:"
 msgstr ""
 
-#: lib/mergetool.tcl:347
-msgid "Running merge tool..."
+#: lib/blame.tcl:282
+msgid "Copy Commit"
 msgstr ""
 
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
-msgid "Merge tool failed."
+#: lib/blame.tcl:286
+msgid "Find Text..."
 msgstr ""
 
-#: lib/option.tcl:11
-#, tcl-format
-msgid "Invalid global encoding '%s'"
+#: lib/blame.tcl:290
+msgid "Goto Line..."
 msgstr ""
 
-#: lib/option.tcl:19
-#, tcl-format
-msgid "Invalid repo encoding '%s'"
+#: lib/blame.tcl:299
+msgid "Do Full Copy Detection"
 msgstr ""
 
-#: lib/option.tcl:117
-msgid "Restore Defaults"
+#: lib/blame.tcl:303
+msgid "Show History Context"
 msgstr ""
 
-#: lib/option.tcl:121
-msgid "Save"
+#: lib/blame.tcl:306
+msgid "Blame Parent Commit"
 msgstr ""
 
-#: lib/option.tcl:131
+#: lib/blame.tcl:468
 #, tcl-format
-msgid "%s Repository"
+msgid "Reading %s..."
 msgstr ""
 
-#: lib/option.tcl:132
-msgid "Global (All Repositories)"
+#: lib/blame.tcl:596
+msgid "Loading copy/move tracking annotations..."
 msgstr ""
 
-#: lib/option.tcl:138
-msgid "User Name"
+#: lib/blame.tcl:613
+msgid "lines annotated"
 msgstr ""
 
-#: lib/option.tcl:139
-msgid "Email Address"
+#: lib/blame.tcl:815
+msgid "Loading original location annotations..."
 msgstr ""
 
-#: lib/option.tcl:141
-msgid "Summarize Merge Commits"
+#: lib/blame.tcl:818
+msgid "Annotation complete."
 msgstr ""
 
-#: lib/option.tcl:142
-msgid "Merge Verbosity"
+#: lib/blame.tcl:849
+msgid "Busy"
 msgstr ""
 
-#: lib/option.tcl:143
-msgid "Show Diffstat After Merge"
+#: lib/blame.tcl:850
+msgid "Annotation process is already running."
 msgstr ""
 
-#: lib/option.tcl:144
-msgid "Use Merge Tool"
+#: lib/blame.tcl:889
+msgid "Running thorough copy detection..."
 msgstr ""
 
-#: lib/option.tcl:146
-msgid "Trust File Modification Timestamps"
+#: lib/blame.tcl:957
+msgid "Loading annotation..."
 msgstr ""
 
-#: lib/option.tcl:147
-msgid "Prune Tracking Branches During Fetch"
+#: lib/blame.tcl:1010
+msgid "Author:"
 msgstr ""
 
-#: lib/option.tcl:148
-msgid "Match Tracking Branches"
+#: lib/blame.tcl:1014
+msgid "Committer:"
 msgstr ""
 
-#: lib/option.tcl:149
-msgid "Blame Copy Only On Changed Files"
+#: lib/blame.tcl:1019
+msgid "Original File:"
 msgstr ""
 
-#: lib/option.tcl:150
-msgid "Minimum Letters To Blame Copy On"
+#: lib/blame.tcl:1067
+msgid "Cannot find HEAD commit:"
 msgstr ""
 
-#: lib/option.tcl:151
-msgid "Blame History Context Radius (days)"
+#: lib/blame.tcl:1122
+msgid "Cannot find parent commit:"
 msgstr ""
 
-#: lib/option.tcl:152
-msgid "Number of Diff Context Lines"
+#: lib/blame.tcl:1137
+msgid "Unable to display parent"
 msgstr ""
 
-#: lib/option.tcl:153
-msgid "Commit Message Text Width"
+#: lib/blame.tcl:1138 lib/diff.tcl:345
+msgid "Error loading diff:"
 msgstr ""
 
-#: lib/option.tcl:154
-msgid "New Branch Name Template"
+#: lib/blame.tcl:1279
+msgid "Originally By:"
 msgstr ""
 
-#: lib/option.tcl:155
-msgid "Default File Contents Encoding"
+#: lib/blame.tcl:1285
+msgid "In File:"
 msgstr ""
 
-#: lib/option.tcl:203
-msgid "Change"
+#: lib/blame.tcl:1290
+msgid "Copied Or Moved Here By:"
 msgstr ""
 
-#: lib/option.tcl:230
-msgid "Spelling Dictionary:"
+#: lib/diff.tcl:77
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
 msgstr ""
 
-#: lib/option.tcl:254
-msgid "Change Font"
+#: lib/diff.tcl:117
+#, tcl-format
+msgid "Loading diff of %s..."
 msgstr ""
 
-#: lib/option.tcl:258
-#, tcl-format
-msgid "Choose %s"
+#: lib/diff.tcl:143
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
 msgstr ""
 
-#: lib/option.tcl:264
-msgid "pt."
+#: lib/diff.tcl:148
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
 msgstr ""
 
-#: lib/option.tcl:278
-msgid "Preferences"
+#: lib/diff.tcl:155
+msgid "LOCAL:\n"
 msgstr ""
 
-#: lib/option.tcl:314
-msgid "Failed to completely save options:"
+#: lib/diff.tcl:158
+msgid "REMOTE:\n"
 msgstr ""
 
-#: lib/remote.tcl:163
-msgid "Remove Remote"
+#: lib/diff.tcl:220 lib/diff.tcl:344
+#, tcl-format
+msgid "Unable to display %s"
 msgstr ""
 
-#: lib/remote.tcl:168
-msgid "Prune from"
+#: lib/diff.tcl:221
+msgid "Error loading file:"
 msgstr ""
 
-#: lib/remote.tcl:173
-msgid "Fetch from"
+#: lib/diff.tcl:227
+msgid "Git Repository (subproject)"
 msgstr ""
 
-#: lib/remote.tcl:215
-msgid "Push to"
+#: lib/diff.tcl:239
+msgid "* Binary file (not showing content)."
 msgstr ""
 
-#: lib/remote_add.tcl:19
-msgid "Add Remote"
+#: lib/diff.tcl:244
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"
 msgstr ""
 
-#: lib/remote_add.tcl:24
-msgid "Add New Remote"
+#: lib/diff.tcl:250
+#, tcl-format
+msgid ""
+"\n"
+"* Untracked file clipped here by %s.\n"
+"* To see the entire file, use an external editor.\n"
 msgstr ""
 
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
-msgid "Add"
+#: lib/diff.tcl:583
+msgid "Failed to unstage selected hunk."
 msgstr ""
 
-#: lib/remote_add.tcl:37
-msgid "Remote Details"
+#: lib/diff.tcl:591
+msgid "Failed to revert selected hunk."
 msgstr ""
 
-#: lib/remote_add.tcl:50
-msgid "Location:"
+#: lib/diff.tcl:594
+msgid "Failed to stage selected hunk."
 msgstr ""
 
-#: lib/remote_add.tcl:62
-msgid "Further Action"
+#: lib/diff.tcl:687
+msgid "Failed to unstage selected line."
 msgstr ""
 
-#: lib/remote_add.tcl:65
-msgid "Fetch Immediately"
+#: lib/diff.tcl:696
+msgid "Failed to revert selected line."
 msgstr ""
 
-#: lib/remote_add.tcl:71
-msgid "Initialize Remote Repository and Push"
+#: lib/diff.tcl:700
+msgid "Failed to stage selected line."
 msgstr ""
 
-#: lib/remote_add.tcl:77
-msgid "Do Nothing Else Now"
+#: lib/diff.tcl:889
+msgid "Failed to undo last revert."
 msgstr ""
 
-#: lib/remote_add.tcl:101
-msgid "Please supply a remote name."
+#: lib/sshkey.tcl:34
+msgid "No keys found."
 msgstr ""
 
-#: lib/remote_add.tcl:114
+#: lib/sshkey.tcl:37
 #, tcl-format
-msgid "'%s' is not an acceptable remote name."
+msgid "Found a public key in: %s"
 msgstr ""
 
-#: lib/remote_add.tcl:125
-#, tcl-format
-msgid "Failed to add remote '%s' of location '%s'."
+#: lib/sshkey.tcl:43
+msgid "Generate Key"
 msgstr ""
 
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
-#, tcl-format
-msgid "fetch %s"
+#: lib/sshkey.tcl:61
+msgid "Copy To Clipboard"
 msgstr ""
 
-#: lib/remote_add.tcl:134
-#, tcl-format
-msgid "Fetching the %s"
+#: lib/sshkey.tcl:75
+msgid "Your OpenSSH Public Key"
 msgstr ""
 
-#: lib/remote_add.tcl:157
+#: lib/sshkey.tcl:83
+msgid "Generating..."
+msgstr ""
+
+#: lib/sshkey.tcl:89
 #, tcl-format
-msgid "Do not know how to initialize repository at location '%s'."
+msgid ""
+"Could not start ssh-keygen:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: lib/sshkey.tcl:116
+msgid "Generation failed."
 msgstr ""
 
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
-#: lib/transport.tcl:81
+#: lib/sshkey.tcl:123
+msgid "Generation succeeded, but no keys found."
+msgstr ""
+
+#: lib/sshkey.tcl:126
 #, tcl-format
-msgid "push %s"
+msgid "Your key is in: %s"
 msgstr ""
 
-#: lib/remote_add.tcl:164
+#: lib/branch_create.tcl:23
 #, tcl-format
-msgid "Setting up the %s (at %s)"
+msgid "%s (%s): Create Branch"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
-msgid "Delete Branch Remotely"
+#: lib/branch_create.tcl:28
+msgid "Create New Branch"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:47
-msgid "From Repository"
+#: lib/branch_create.tcl:42
+msgid "Branch Name"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
-msgid "Remote:"
+#: lib/branch_create.tcl:57
+msgid "Match Tracking Branch Name"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
-msgid "Arbitrary Location:"
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:84
-msgid "Branches"
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:109
-msgid "Delete Only If"
+#: lib/branch_create.tcl:75
+msgid "No"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:111
-msgid "Merged Into:"
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:152
-msgid "A branch is required for 'Merged Into'."
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:184
-#, tcl-format
-msgid ""
-"The following branches are not completely merged into %s:\n"
-"\n"
-" - %s"
+#: lib/branch_create.tcl:132
+msgid "Please select a tracking branch."
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:189
+#: lib/branch_create.tcl:141
 #, tcl-format
-msgid ""
-"One or more of the merge tests failed because you have not fetched the "
-"necessary commits.  Try fetching from %s first."
+msgid "Tracking branch %s is not a branch in the remote repository."
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:207
-msgid "Please select one or more branches to delete."
+#: lib/console.tcl:59
+msgid "Working... please wait..."
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:226
-#, tcl-format
-msgid "Deleting branches from %s"
+#: lib/console.tcl:186
+msgid "Success"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:292
-msgid "No repository selected."
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr ""
+
+#: lib/line.tcl:17
+msgid "Goto Line:"
+msgstr ""
+
+#: lib/line.tcl:23
+msgid "Go"
+msgstr ""
+
+#: lib/choose_rev.tcl:52
+msgid "This Detached Checkout"
+msgstr ""
+
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
+msgstr ""
+
+#: lib/choose_rev.tcl:72
+msgid "Local Branch"
+msgstr ""
+
+#: lib/choose_rev.tcl:77
+msgid "Tracking Branch"
+msgstr ""
+
+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
+msgid "Tag"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:297
+#: lib/choose_rev.tcl:321
 #, tcl-format
-msgid "Scanning %s..."
+msgid "Invalid revision: %s"
 msgstr ""
 
-#: lib/search.tcl:21
-msgid "Find:"
+#: lib/choose_rev.tcl:342
+msgid "No revision selected."
 msgstr ""
 
-#: lib/search.tcl:23
-msgid "Next"
+#: lib/choose_rev.tcl:350
+msgid "Revision expression is empty."
 msgstr ""
 
-#: lib/search.tcl:24
-msgid "Prev"
+#: lib/choose_rev.tcl:537
+msgid "Updated"
 msgstr ""
 
-#: lib/search.tcl:25
-msgid "Case-Sensitive"
+#: lib/choose_rev.tcl:565
+msgid "URL"
 msgstr ""
 
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
-msgid "Cannot write shortcut:"
+#: lib/commit.tcl:9
+msgid ""
+"There is nothing to amend.\n"
+"\n"
+"You are about to create the initial commit.  There is no commit before this "
+"to amend.\n"
 msgstr ""
 
-#: lib/shortcut.tcl:137
-msgid "Cannot write icon:"
+#: lib/commit.tcl:18
+msgid ""
+"Cannot amend while merging.\n"
+"\n"
+"You are currently in the middle of a merge that has not been fully "
+"completed.  You cannot amend the prior commit unless you first abort the "
+"current merge activity.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:57
-msgid "Unsupported spell checker"
+#: lib/commit.tcl:56
+msgid "Error loading commit data for amend:"
 msgstr ""
 
-#: lib/spellcheck.tcl:65
-msgid "Spell checking is unavailable"
+#: lib/commit.tcl:83
+msgid "Unable to obtain your identity:"
 msgstr ""
 
-#: lib/spellcheck.tcl:68
-msgid "Invalid spell checking configuration"
+#: lib/commit.tcl:88
+msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr ""
 
-#: lib/spellcheck.tcl:70
+#: lib/commit.tcl:138
 #, tcl-format
-msgid "Reverting dictionary to %s."
+msgid "warning: Tcl does not support encoding '%s'."
 msgstr ""
 
-#: lib/spellcheck.tcl:73
-msgid "Spell checker silently failed on startup"
+#: lib/commit.tcl:158
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan.  A "
+"rescan must be performed before another commit can be created.\n"
+"\n"
+"The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:80
-msgid "Unrecognized spell checker"
+#: lib/commit.tcl:182
+#, tcl-format
+msgid ""
+"Unmerged files cannot be committed.\n"
+"\n"
+"File %s has merge conflicts.  You must resolve them and stage the file "
+"before committing.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:186
-msgid "No Suggestions"
+#: lib/commit.tcl:190
+#, tcl-format
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:388
-msgid "Unexpected EOF from spell checker"
+#: lib/commit.tcl:198
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:392
-msgid "Spell Checker Failed"
+#: lib/commit.tcl:213
+msgid ""
+"Please supply a commit message.\n"
+"\n"
+"A good commit message has the following format:\n"
+"\n"
+"- First line: Describe in one sentence what you did.\n"
+"- Second line: Blank\n"
+"- Remaining lines: Describe why this change is good.\n"
 msgstr ""
 
-#: lib/sshkey.tcl:31
-msgid "No keys found."
+#: lib/commit.tcl:244
+msgid "Calling pre-commit hook..."
 msgstr ""
 
-#: lib/sshkey.tcl:34
-#, tcl-format
-msgid "Found a public key in: %s"
+#: lib/commit.tcl:259
+msgid "Commit declined by pre-commit hook."
 msgstr ""
 
-#: lib/sshkey.tcl:40
-msgid "Generate Key"
+#: lib/commit.tcl:278
+msgid ""
+"You are about to commit on a detached head. This is a potentially dangerous "
+"thing to do because if you switch to another branch you will lose your "
+"changes and it can be difficult to retrieve them later from the reflog. You "
+"should probably cancel this commit and create a new branch to continue.\n"
+" \n"
+" Do you really want to proceed with your Commit?"
 msgstr ""
 
-#: lib/sshkey.tcl:56
-msgid "Copy To Clipboard"
+#: lib/commit.tcl:299
+msgid "Calling commit-msg hook..."
 msgstr ""
 
-#: lib/sshkey.tcl:70
-msgid "Your OpenSSH Public Key"
+#: lib/commit.tcl:314
+msgid "Commit declined by commit-msg hook."
 msgstr ""
 
-#: lib/sshkey.tcl:78
-msgid "Generating..."
+#: lib/commit.tcl:327
+msgid "Committing changes..."
+msgstr ""
+
+#: lib/commit.tcl:344
+msgid "write-tree failed:"
+msgstr ""
+
+#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
+msgid "Commit failed."
 msgstr ""
 
-#: lib/sshkey.tcl:84
+#: lib/commit.tcl:362
 #, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
+#: lib/commit.tcl:367
 msgid ""
-"Could not start ssh-keygen:\n"
+"No changes to commit.\n"
 "\n"
-"%s"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/sshkey.tcl:111
-msgid "Generation failed."
+#: lib/commit.tcl:374
+msgid "No changes to commit."
 msgstr ""
 
-#: lib/sshkey.tcl:118
-msgid "Generation succeeded, but no keys found."
+#: lib/commit.tcl:394
+msgid "commit-tree failed:"
 msgstr ""
 
-#: lib/sshkey.tcl:121
-#, tcl-format
-msgid "Your key is in: %s"
+#: lib/commit.tcl:421
+msgid "update-ref failed:"
 msgstr ""
 
-#: lib/status_bar.tcl:83
+#: lib/commit.tcl:514
 #, tcl-format
-msgid "%s ... %*i of %*i %s (%3i%%)"
+msgid "Created commit %s: %s"
 msgstr ""
 
-#: lib/tools.tcl:75
+#: lib/branch_delete.tcl:16
 #, tcl-format
-msgid "Running %s requires a selected file."
+msgid "%s (%s): Delete Branch"
 msgstr ""
 
-#: lib/tools.tcl:90
-#, tcl-format
-msgid "Are you sure you want to run %s?"
+#: lib/branch_delete.tcl:21
+msgid "Delete Local Branch"
+msgstr ""
+
+#: lib/branch_delete.tcl:39
+msgid "Local Branches"
 msgstr ""
 
-#: lib/tools.tcl:110
+#: lib/branch_delete.tcl:51
+msgid "Delete Only If Merged Into"
+msgstr ""
+
+#: lib/branch_delete.tcl:103
 #, tcl-format
-msgid "Tool: %s"
+msgid "The following branches are not completely merged into %s:"
 msgstr ""
 
-#: lib/tools.tcl:111
+#: lib/branch_delete.tcl:131
 #, tcl-format
-msgid "Running: %s"
+msgid " - %s:"
 msgstr ""
 
-#: lib/tools.tcl:149
+#: lib/branch_delete.tcl:141
 #, tcl-format
-msgid "Tool completed successfully: %s"
+msgid ""
+"Failed to delete branches:\n"
+"%s"
 msgstr ""
 
-#: lib/tools.tcl:151
+#: lib/date.tcl:25
 #, tcl-format
-msgid "Tool failed: %s"
+msgid "Invalid date from Git: %s"
 msgstr ""
 
-#: lib/tools_dlg.tcl:22
-msgid "Add Tool"
+#: lib/database.tcl:42
+msgid "Number of loose objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:28
-msgid "Add New Tool Command"
+#: lib/database.tcl:43
+msgid "Disk space used by loose objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:33
-msgid "Add globally"
+#: lib/database.tcl:44
+msgid "Number of packed objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:45
-msgid "Tool Details"
+#: lib/database.tcl:45
+msgid "Number of packs"
 msgstr ""
 
-#: lib/tools_dlg.tcl:48
-msgid "Use '/' separators to create a submenu tree:"
+#: lib/database.tcl:46
+msgid "Disk space used by packed objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:61
-msgid "Command:"
+#: lib/database.tcl:47
+msgid "Packed objects waiting for pruning"
 msgstr ""
 
-#: lib/tools_dlg.tcl:74
-msgid "Show a dialog before running"
+#: lib/database.tcl:48
+msgid "Garbage files"
 msgstr ""
 
-#: lib/tools_dlg.tcl:80
-msgid "Ask the user to select a revision (sets $REVISION)"
+#: lib/database.tcl:66
+#, tcl-format
+msgid "%s (%s): Database Statistics"
 msgstr ""
 
-#: lib/tools_dlg.tcl:85
-msgid "Ask the user for additional arguments (sets $ARGS)"
+#: lib/database.tcl:72
+msgid "Compressing the object database"
 msgstr ""
 
-#: lib/tools_dlg.tcl:92
-msgid "Don't show the command output window"
+#: lib/database.tcl:83
+msgid "Verifying the object database with fsck-objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:97
-msgid "Run only if a diff is selected ($FILENAME not empty)"
+#: lib/database.tcl:107
+#, tcl-format
+msgid ""
+"This repository currently has approximately %i loose objects.\n"
+"\n"
+"To maintain optimal performance it is strongly recommended that you compress "
+"the database.\n"
+"\n"
+"Compress the database now?"
 msgstr ""
 
-#: lib/tools_dlg.tcl:121
-msgid "Please supply a name for the tool."
+#: lib/error.tcl:20
+#, tcl-format
+msgid "%s: error"
 msgstr ""
 
-#: lib/tools_dlg.tcl:129
+#: lib/error.tcl:36
 #, tcl-format
-msgid "Tool '%s' already exists."
+msgid "%s: warning"
 msgstr ""
 
-#: lib/tools_dlg.tcl:151
+#: lib/error.tcl:80
 #, tcl-format
-msgid ""
-"Could not add tool:\n"
-"%s"
+msgid "%s hook failed:"
 msgstr ""
 
-#: lib/tools_dlg.tcl:190
-msgid "Remove Tool"
+#: lib/error.tcl:96
+msgid "You must correct the above errors before committing."
 msgstr ""
 
-#: lib/tools_dlg.tcl:196
-msgid "Remove Tool Commands"
+#: lib/error.tcl:116
+#, tcl-format
+msgid "%s (%s): error"
 msgstr ""
 
-#: lib/tools_dlg.tcl:200
-msgid "Remove"
+#: lib/merge.tcl:13
+msgid ""
+"Cannot merge while amending.\n"
+"\n"
+"You must finish amending this commit before starting any type of merge.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:236
-msgid "(Blue denotes repository-local tools)"
+#: lib/merge.tcl:27
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan.  A "
+"rescan must be performed before a merge can be performed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:297
+#: lib/merge.tcl:45
 #, tcl-format
-msgid "Run Command: %s"
+msgid ""
+"You are in the middle of a conflicted merge.\n"
+"\n"
+"File %s has merge conflicts.\n"
+"\n"
+"You must resolve them, stage the file, and commit to complete the current "
+"merge.  Only then can you begin another merge.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:311
-msgid "Arguments"
+#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge.  Doing so "
+"will help you abort a failed merge, should the need arise.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:348
-msgid "OK"
+#: lib/merge.tcl:108
+#, tcl-format
+msgid "%s of %s"
 msgstr ""
 
-#: lib/transport.tcl:7
+#: lib/merge.tcl:126
 #, tcl-format
-msgid "Fetching new changes from %s"
+msgid "Merging %s and %s..."
 msgstr ""
 
-#: lib/transport.tcl:18
-#, tcl-format
-msgid "remote prune %s"
+#: lib/merge.tcl:137
+msgid "Merge completed successfully."
 msgstr ""
 
-#: lib/transport.tcl:19
-#, tcl-format
-msgid "Pruning tracking branches deleted from %s"
+#: lib/merge.tcl:139
+msgid "Merge failed.  Conflict resolution is required."
 msgstr ""
 
-#: lib/transport.tcl:26
+#: lib/merge.tcl:156
 #, tcl-format
-msgid "Pushing changes to %s"
+msgid "%s (%s): Merge"
 msgstr ""
 
-#: lib/transport.tcl:64
+#: lib/merge.tcl:164
 #, tcl-format
-msgid "Mirroring to %s"
+msgid "Merge Into %s"
 msgstr ""
 
-#: lib/transport.tcl:82
-#, tcl-format
-msgid "Pushing %s %s to %s"
+#: lib/merge.tcl:183
+msgid "Revision To Merge"
 msgstr ""
 
-#: lib/transport.tcl:100
-msgid "Push Branches"
+#: lib/merge.tcl:218
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
 msgstr ""
 
-#: lib/transport.tcl:114
-msgid "Source Branches"
+#: lib/merge.tcl:228
+msgid ""
+"Abort merge?\n"
+"\n"
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with aborting the current merge?"
 msgstr ""
 
-#: lib/transport.tcl:131
-msgid "Destination Repository"
+#: lib/merge.tcl:234
+msgid ""
+"Reset changes?\n"
+"\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with resetting the current changes?"
 msgstr ""
 
-#: lib/transport.tcl:169
-msgid "Transfer Options"
+#: lib/merge.tcl:246
+msgid "Aborting"
 msgstr ""
 
-#: lib/transport.tcl:171
-msgid "Force overwrite existing branch (may discard changes)"
+#: lib/merge.tcl:247
+msgid "files reset"
 msgstr ""
 
-#: lib/transport.tcl:175
-msgid "Use thin pack (for slow network connections)"
+#: lib/merge.tcl:277
+msgid "Abort failed."
 msgstr ""
 
-#: lib/transport.tcl:179
-msgid "Include tags"
+#: lib/merge.tcl:279
+msgid "Abort completed.  Ready."
 msgstr ""
diff --git a/third_party/git/git-gui/po/glossary/de.po b/third_party/git/git-gui/po/glossary/de.po
index 35764d1d22da..4c5f233ee52d 100644
--- a/third_party/git/git-gui/po/glossary/de.po
+++ b/third_party/git/git-gui/po/glossary/de.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: git-gui glossary\n"
-"POT-Creation-Date: 2008-01-07 21:20+0100\n"
-"PO-Revision-Date: 2008-02-16 21:48+0100\n"
+"POT-Creation-Date: 2020-01-26 22:26+0100\n"
+"PO-Revision-Date: 2020-02-09 21:22+0100\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German \n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,6 +20,9 @@ msgid ""
 "English Term (Dear translator: This file will never be visible to the user!)"
 msgstr ""
 "Deutsche รœbersetzung.\n"
+"Git-core glossary:\n"
+"  https://github.com/ruester/git-po-de/wiki/Translation-Guidelines\n"
+"\n"
 "Andere deutsche SCM:\n"
 "  http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://"
 "tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po "
@@ -32,33 +36,77 @@ msgstr ""
 "  http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po "
 "(username=guest, password empty, schlecht)"
 
+#. "prematurely stop and abandon an operation"
+msgid "abort"
+msgstr "abbrechen"
+
 #. ""
 msgid "amend"
 msgstr "nachbessern (ergรคnzen)"
 
+#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
+msgid "ancestor"
+msgstr "Vorgรคnger-Commit"
+
 #. ""
 msgid "annotate"
 msgstr "annotieren"
 
+#. "The person who initially created (authored) a commit"
+msgid "author"
+msgstr "Autor"
+
+#. "a repository with only .git directory, without working directory"
+msgid "bare repository"
+msgstr "bloรŸes Projektarchiv"
+
+#. "a parent version of the current file"
+msgid "base"
+msgstr "Ursprung"
+
+#. ""
+msgid "bisect"
+msgstr "binรคre Suche [noun], binรคre Suche benutzen [verb]"
+
+#. "get the authors responsible for each line in a file"
+msgid "blame"
+msgstr "annotieren"
+
+#.      ""
+msgid "blob"
+msgstr "Blob"
+
 #. "A 'branch' is an active line of development."
 msgid "branch [noun]"
-msgstr "Zweig"
+msgstr "Branch"
 
 #. ""
 msgid "branch [verb]"
-msgstr "verzweigen"
+msgstr "branchen"
 
 #. ""
 msgid "checkout [noun]"
 msgstr ""
-"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? "
-"Source Safe: Auscheckvorgang)"
+"Arbeitskopie (Checkout; Erstellung einer Arbeitskopie; Auscheck? Source "
+"Safe: Auscheckvorgang)"
 
 #. "The action of updating the working tree to a revision which was stored in the object database."
 msgid "checkout [verb]"
 msgstr ""
-"Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? "
-"ausspielen? abrufen? Source Safe: auschecken)"
+"Arbeitskopie erstellen; Branch auschecken [checkout a branch] (umstellen? "
+"Source Safe: auschecken)"
+
+#. "to select and apply a single commit to the current HEAD without merging"
+msgid "cherry-pick"
+msgstr "cherry-pick (pflรผcken?)"
+
+#. "a commit that directly succeeds the current one in git's graph of commits"
+msgid "child commit"
+msgstr "Kind-Commit"
+
+#. "clean the state of the git repository, often after manually stopped operation"
+msgid "cleanup"
+msgstr "aufrรคumen"
 
 #. ""
 msgid "clone [verb]"
@@ -66,39 +114,98 @@ msgstr "klonen"
 
 #. "A single point in the git history."
 msgid "commit [noun]"
-msgstr ""
-"Version; Eintragung; ร„nderung (Buchung?, Eintragung?, รœbertragung?, "
-"Sendung?, รœbergabe?, Einspielung?, Ablagevorgang?)"
+msgstr "Commit (Version?)"
 
 #. "The action of storing a new snapshot of the project's state in the git history."
 msgid "commit [verb]"
 msgstr ""
-"eintragen (TortoiseSVN: รผbertragen; Source Safe: einchecken; senden?, "
-"รผbergeben?, einspielen?, einpflegen?, ablegen?)"
+"committen (eintragen?, TortoiseSVN: รผbertragen; Source Safe: einchecken)"
+
+#. "a message that gets attached with any commit"
+msgid "commit message"
+msgstr "Commit-Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
+
+#.   "The person who committed a commit (to the current branch), which might be different than the author."
+msgid "committer"
+msgstr "Committer"
+
+#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
+msgid "descendant"
+msgstr "Nachfolger-Commit"
+
+#.       "checkout of a revision rather than some head"
+msgid "detached HEAD"
+msgstr "losgelรถster HEAD / Branchspitze"
+
+#. "checkout of a revision rather than some head"
+msgid "detached checkout"
+msgstr "losgelรถster Commit (von Branch losgelรถster Commit?)"
 
 #. ""
 msgid "diff [noun]"
-msgstr "Vergleich (Source Safe: Unterschiede)"
+msgstr "Vergleich (Diff? Source Safe: Unterschiede)"
 
 #. ""
 msgid "diff [verb]"
 msgstr "vergleichen"
 
-#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
-msgid "fast forward merge"
-msgstr "Schnellzusammenfรผhrung"
+#.   ""
+msgid "directory"
+msgstr "Verzeichnis"
+
+#. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
+msgid "fast-forward"
+msgstr "vorspulen"
 
 #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
 msgid "fetch"
 msgstr "anfordern (holen?)"
 
+#. "any merge strategy that works on a file by file basis"
+msgid "file level merging"
+msgstr "Datei-basiertes zusammenfรผhren"
+
+#.      ""
+msgid "file"
+msgstr "Datei"
+
+#. "the last revision in a branch"
+msgid "head"
+msgstr "HEAD / Branchspitze"
+
+#. "script that gets executed automatically on some event"
+msgid "hook"
+msgstr "Hook (in der dt. Informatik wohl als Einschubmethode bezeichnet)"
+
 #. "One context of consecutive lines in a whole patch, which consists of many such hunks"
 msgid "hunk"
-msgstr "Kontext"
+msgstr "Patch-Block (Kontext?)"
 
 #. "A collection of files. The index is a stored version of your working tree."
 msgid "index (in git-gui: staging area)"
-msgstr "Bereitstellung"
+msgstr ""
+"Bereitstellung (sofern der git index gemeint ist. In git-gui sowieso: "
+"staging area)"
+
+#. "the first checkout during a clone operation"
+msgid "initial checkout"
+msgstr "Erstellen der Arbeitskopie, auschecken"
+
+#. "The very first commit in a repository"
+msgid "initial commit"
+msgstr "Allererster Commit"
+
+#. "a branch that resides in the local git repository"
+msgid "local branch"
+msgstr "Lokaler Branch"
+
+#. "a Git object that is not part of any pack"
+msgid "loose object"
+msgstr "loses Objekt"
+
+#. "a branch called by convention 'master' that exists in a newly created git repository"
+msgid "master branch"
+msgstr "Master-Branch"
 
 #. "A successful merge results in the creation of a new commit representing the result of the merge."
 msgid "merge [noun]"
@@ -112,78 +219,212 @@ msgstr "zusammenfรผhren"
 msgid "message"
 msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
 
-#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
+#. "a remote called by convention 'origin' that the current git repository has been cloned from"
+msgid "origin"
+msgstr "origin"
+
+#.       ""
+msgid "orphan commit"
+msgstr "verwaister Commit"
+
+#.  ""
+msgid "orphan reference"
+msgstr "verwaiste Referenz"
+
+#. "a file containing many git objects packed together"
+msgid "pack [noun]"
+msgstr "Pack-Datei"
+
+#.     "the process of creating a pack file"
+msgid "pack [verb]"
+msgstr "Pack-Datei erstellen"
+
+#. "a Git object part of some pack"
+msgid "packed object"
+msgstr "gepacktes Objekt"
+
+#. "a commit that directly precedes the current one in git's graph of commits"
+msgid "parent commit"
+msgstr "Eltern-Commit"
+
+msgid "patch"
+msgstr "Patch"
+
+#. "The path to a file"
+msgid "path"
+msgstr "Pfad"
+
+#. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
 msgid "prune"
-msgstr "aufrรคumen (entfernen?)"
+msgstr "veraltete Branches entfernen (aufrรคumen?, entfernen?)"
 
 #. "Pulling a branch means to fetch it and merge it."
 msgid "pull"
-msgstr "รผbernehmen (ziehen?)"
+msgstr ""
+"รผbernehmen (pull? ziehen? Vorsicht: zusammenfรผhren = merge, aber pull kann "
+"auch rebase bewirken)"
 
 #. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)"
 msgid "push"
 msgstr "versenden (ausliefern? hochladen? verschicken? schieben?)"
 
+#. "The process of rebasing one set of commits on top of another branch's head"
+msgid "rebase [noun]"
+msgstr "der Rebase (das Umpflanzen)"
+
+#. "Re-apply one set of commits on top of another branch's head. Contrary to merge."
+msgid "rebase [verb]"
+msgstr "rebase (umpflanzen)"
+
 #. ""
 msgid "redo"
 msgstr "wiederholen"
 
-#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
-msgid "remote"
-msgstr "Andere Archive (Gegenseite?, Entfernte?, Server?)"
+#.   ""
+msgid "reference"
+msgstr "Referenz"
+
+#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
+msgid "reflog"
+msgstr "Commit-Log, ยปreflogยซ"
+
+msgid "refmap"
+msgstr "Refmap"
+
+#. ""
+msgid "refspec"
+msgstr "Refspec"
+
+#. "The adjective for anything which is outside of the current (local) repository"
+msgid "remote [adj]"
+msgstr "Extern (Andere?, Gegenseite?, Entfernte?, Server?)"
+
+#.       "A branch in any other ('remote') repository"
+msgid "remote branch"
+msgstr "Externer branch"
+
+#.   "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
+msgid "remote repository"
+msgstr "Externes Repository"
 
 #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
 msgid "repository"
-msgstr "Projektarchiv"
+msgstr "Repository"
 
 #. ""
 msgid "reset"
-msgstr "zurรผcksetzen (zurรผckkehren?)"
+msgstr "umsetzen (reset to commit), ร„nderungen verwerfen (reset to HEAD)"
+
+#. "decide which changes from alternative versions of a file should persist in Git"
+msgid "resolve (a conflict)"
+msgstr "auflรถsen (einen Konflikt)"
+
+#. "abandon changes and go to pristine version"
+msgid "revert changes"
+msgstr ""
+"verwerfen (bei git-reset bzw. checkout), zurรผcknehmen (bei git-revert, also "
+"mit neuem commit; umkehren?)"
 
 #. ""
 msgid "revert"
-msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)"
+msgstr ""
+"verwerfen (bei git-reset bzw. checkout), zurรผcknehmen (bei git-revert, also "
+"mit neuem commit; umkehren?)"
+
+#. "expression that signifies a revision in git"
+msgid "revision expression"
+msgstr "Version Regexp-Ausdruck"
 
 #. "A particular state of files and directories which was stored in the object database."
 msgid "revision"
-msgstr "Version (TortoiseSVN: Revision; Source Safe: Version)"
+msgstr ""
+"Version (aber was macht das Wort revision hier im Git?? TortoiseSVN: "
+"Revision; Source Safe: Version)"
 
 #. ""
 msgid "sign off"
-msgstr "abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)"
+msgstr "abzeichnen (signieren? gegenzeichnen?, freizeichnen?)"
 
-#. ""
+#.     "see: staging area. In some areas of git this is called 'index'."
+msgid "stage [noun], index"
+msgstr "Bereitstellung"
+
+#. "add some content of files and directories to the staging area in preparation for a commit"
+msgid "stage [verb]"
+msgstr "bereitstellen"
+
+#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'."
 msgid "staging area"
 msgstr "Bereitstellung"
 
+#. "The place (stack) where changes can be temporarily saved without committing"
+msgid "stash [noun]"
+msgstr "der Stash"
+
+#. "temporarily save changes in a stack without committing"
+msgid "stash [verb]"
+msgstr "in Stash speichern; \"stash\" benutzen"
+
 #. ""
 msgid "status"
 msgstr "Status"
 
-#. "A ref pointing to a tag or commit object"
+#. ""
+msgid "submodule"
+msgstr "Submodul (Untermodul?)"
+
+#. "A ref pointing to some commit object. In other words: A label on a specific commit."
 msgid "tag [noun]"
-msgstr "Markierung"
+msgstr "Tag (Markierung?)"
 
-#. ""
+#. "The process of creating a tag at a specific commit object"
 msgid "tag [verb]"
-msgstr "markieren"
+msgstr "taggen (markieren?)"
+
+#. "The person who created a tag"
+msgid "tagger"
+msgstr "Tag-Ersteller (Markierungs-Ersteller?)"
+
+#. "file whose content is tracked/not tracked by git"
+msgid "tracked/untracked"
+msgstr "versioniert/unversioniert"
 
 #. "A regular git branch that is used to follow changes from another repository."
 msgid "tracking branch"
-msgstr "รœbernahmezweig"
+msgstr "Tracking-Branch (Verfolgungsbranch? รœbernahmebranch?)"
+
+#. ""
+msgid "trailer"
+msgstr "Anhang"
+
+#. "1. tree object, 2. directory tree"
+msgid "tree"
+msgstr "1. Baum-Objekt, 2. Verzeichnisbaum"
 
 #. ""
 msgid "undo"
 msgstr "rรผckgรคngig"
 
+#. "Remove content of files from the staging area again so that it will not be part of the next commit"
+msgid "unstage"
+msgstr "aus Bereitstellung herausnehmen"
+
+#. "Retrieving the temporarily saved changes back again from the stash"
+msgid "unstash [verb]"
+msgstr "aus Stash zurรผckladen"
+
 #. ""
 msgid "update"
 msgstr "aktualisieren"
 
 #. ""
+msgid "upstream branch"
+msgstr "Upstream-Branch"
+
+#. ""
 msgid "verify"
 msgstr "รผberprรผfen"
 
 #. "The tree of actual checked out files."
-msgid "working copy, working tree"
+msgid "working directory, working copy, working tree"
 msgstr "Arbeitskopie"
diff --git a/third_party/git/git-gui/po/glossary/git-gui-glossary.pot b/third_party/git/git-gui/po/glossary/git-gui-glossary.pot
index 40eb3e9c07a4..4e66e0da3a9c 100644
--- a/third_party/git/git-gui/po/glossary/git-gui-glossary.pot
+++ b/third_party/git/git-gui/po/glossary/git-gui-glossary.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-01-07 21:20+0100\n"
+"POT-Creation-Date: 2020-01-26 22:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,14 +18,46 @@ msgstr ""
 msgid "English Term (Dear translator: This file will never be visible to the user!)"
 msgstr ""
 
+#. "prematurely stop and abandon an operation"
+msgid "abort"
+msgstr ""
+
 #. ""
 msgid "amend"
 msgstr ""
 
+#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
+msgid "ancestor"
+msgstr ""
+
 #. ""
 msgid "annotate"
 msgstr ""
 
+#. "The person who initially created (authored) a commit"
+msgid "author"
+msgstr ""
+
+#. "a repository with only .git directory, without working directory"
+msgid "bare repository"
+msgstr ""
+
+#. "a parent version of the current file"
+msgid "base"
+msgstr ""
+
+#. ""
+msgid "bisect"
+msgstr ""
+
+#. "get the authors responsible for each line in a file"
+msgid "blame"
+msgstr ""
+
+#.      ""
+msgid "blob"
+msgstr ""
+
 #. "A 'branch' is an active line of development."
 msgid "branch [noun]"
 msgstr ""
@@ -42,6 +74,18 @@ msgstr ""
 msgid "checkout [verb]"
 msgstr ""
 
+#. "to select and apply a single commit to the current HEAD without merging"
+msgid "cherry-pick"
+msgstr ""
+
+#. "a commit that directly succeeds the current one in git's graph of commits"
+msgid "child commit"
+msgstr ""
+
+#. "clean the state of the git repository, often after manually stopped operation"
+msgid "cleanup"
+msgstr ""
+
 #. ""
 msgid "clone [verb]"
 msgstr ""
@@ -54,6 +98,26 @@ msgstr ""
 msgid "commit [verb]"
 msgstr ""
 
+#. "a message that gets attached with any commit"
+msgid "commit message"
+msgstr ""
+
+#.   "The person who committed a commit (to the current branch), which might be different than the author."
+msgid "committer"
+msgstr ""
+
+#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
+msgid "descendant"
+msgstr ""
+
+#.       "checkout of a revision rather than some head"
+msgid "detached HEAD"
+msgstr ""
+
+#. "checkout of a revision rather than some head"
+msgid "detached checkout"
+msgstr ""
+
 #. ""
 msgid "diff [noun]"
 msgstr ""
@@ -62,14 +126,34 @@ msgstr ""
 msgid "diff [verb]"
 msgstr ""
 
-#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
-msgid "fast forward merge"
+#.   ""
+msgid "directory"
+msgstr ""
+
+#. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
+msgid "fast-forward"
 msgstr ""
 
 #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
 msgid "fetch"
 msgstr ""
 
+#. "any merge strategy that works on a file by file basis"
+msgid "file level merging"
+msgstr ""
+
+#.      ""
+msgid "file"
+msgstr ""
+
+#. "the last revision in a branch"
+msgid "head"
+msgstr ""
+
+#. "script that gets executed automatically on some event"
+msgid "hook"
+msgstr ""
+
 #. "One context of consecutive lines in a whole patch, which consists of many such hunks"
 msgid "hunk"
 msgstr ""
@@ -78,6 +162,26 @@ msgstr ""
 msgid "index (in git-gui: staging area)"
 msgstr ""
 
+#. "the first checkout during a clone operation"
+msgid "initial checkout"
+msgstr ""
+
+#. "The very first commit in a repository"
+msgid "initial commit"
+msgstr ""
+
+#. "a branch that resides in the local git repository"
+msgid "local branch"
+msgstr ""
+
+#. "a Git object that is not part of any pack"
+msgid "loose object"
+msgstr ""
+
+#. "a branch called by convention 'master' that exists in a newly created git repository"
+msgid "master branch"
+msgstr ""
+
 #. "A successful merge results in the creation of a new commit representing the result of the merge."
 msgid "merge [noun]"
 msgstr ""
@@ -90,7 +194,42 @@ msgstr ""
 msgid "message"
 msgstr ""
 
-#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
+#. "a remote called by convention 'origin' that the current git repository has been cloned from"
+msgid "origin"
+msgstr ""
+
+#.       ""
+msgid "orphan commit"
+msgstr ""
+
+#.  ""
+msgid "orphan reference"
+msgstr ""
+
+#. "a file containing many git objects packed together"
+msgid "pack [noun]"
+msgstr ""
+
+#.     "the process of creating a pack file"
+msgid "pack [verb]"
+msgstr ""
+
+#. "a Git object part of some pack"
+msgid "packed object"
+msgstr ""
+
+#. "a commit that directly precedes the current one in git's graph of commits"
+msgid "parent commit"
+msgstr ""
+
+msgid "patch" ""
+msgstr ""
+
+#. "The path to a file"
+msgid "path"
+msgstr ""
+
+#. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
 msgid "prune"
 msgstr ""
 
@@ -102,12 +241,43 @@ msgstr ""
 msgid "push"
 msgstr ""
 
+#. "The process of rebasing one set of commits on top of another branch's head"
+msgid "rebase [noun]"
+msgstr ""
+
+#. "Re-apply one set of commits on top of another branch's head. Contrary to merge."
+msgid "rebase [verb]"
+msgstr ""
+
 #. ""
 msgid "redo"
 msgstr ""
 
-#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
-msgid "remote"
+#.   ""
+msgid "reference"
+msgstr ""
+
+#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
+msgid "reflog"
+msgstr ""
+
+msgid "refmap"       ""
+msgstr ""
+
+#. ""
+msgid "refspec"
+msgstr ""
+
+#. "The adjective for anything which is outside of the current (local) repository"
+msgid "remote [adj]"
+msgstr ""
+
+#.       "A branch in any other ('remote') repository"
+msgid "remote branch"
+msgstr ""
+
+#.   "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
+msgid "remote repository"
 msgstr ""
 
 #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
@@ -118,10 +288,22 @@ msgstr ""
 msgid "reset"
 msgstr ""
 
+#. "decide which changes from alternative versions of a file should persist in Git"
+msgid "resolve (a conflict)"
+msgstr ""
+
+#. "abandon changes and go to pristine version"
+msgid "revert changes"
+msgstr ""
+
 #. ""
 msgid "revert"
 msgstr ""
 
+#. "expression that signifies a revision in git"
+msgid "revision expression"
+msgstr ""
+
 #. "A particular state of files and directories which was stored in the object database."
 msgid "revision"
 msgstr ""
@@ -130,39 +312,87 @@ msgstr ""
 msgid "sign off"
 msgstr ""
 
-#. ""
+#.     "see: staging area. In some areas of git this is called 'index'."
+msgid "stage [noun], index"
+msgstr ""
+
+#. "add some content of files and directories to the staging area in preparation for a commit"
+msgid "stage [verb]"
+msgstr ""
+
+#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'."
 msgid "staging area"
 msgstr ""
 
+#. "The place (stack) where changes can be temporarily saved without committing"
+msgid "stash [noun]"
+msgstr ""
+
+#. "temporarily save changes in a stack without committing"
+msgid "stash [verb]"
+msgstr ""
+
 #. ""
 msgid "status"
 msgstr ""
 
-#. "A ref pointing to a tag or commit object"
+#. ""
+msgid "submodule"
+msgstr ""
+
+#. "A ref pointing to some commit object. In other words: A label on a specific commit."
 msgid "tag [noun]"
 msgstr ""
 
-#. ""
+#. "The process of creating a tag at a specific commit object"
 msgid "tag [verb]"
 msgstr ""
 
+#. "The person who created a tag"
+msgid "tagger"
+msgstr ""
+
+#. "file whose content is tracked/not tracked by git"
+msgid "tracked/untracked"
+msgstr ""
+
 #. "A regular git branch that is used to follow changes from another repository."
 msgid "tracking branch"
 msgstr ""
 
 #. ""
+msgid "trailer"
+msgstr ""
+
+#. "1. tree object, 2. directory tree"
+msgid "tree"
+msgstr ""
+
+#. ""
 msgid "undo"
 msgstr ""
 
+#. "Remove content of files from the staging area again so that it will not be part of the next commit"
+msgid "unstage"
+msgstr ""
+
+#. "Retrieving the temporarily saved changes back again from the stash"
+msgid "unstash [verb]"
+msgstr ""
+
 #. ""
 msgid "update"
 msgstr ""
 
 #. ""
+msgid "upstream branch"
+msgstr ""
+
+#. ""
 msgid "verify"
 msgstr ""
 
 #. "The tree of actual checked out files."
-msgid "working copy, working tree"
+msgid "working directory, working copy, working tree"
 msgstr ""
 
diff --git a/third_party/git/git-gui/po/glossary/git-gui-glossary.txt b/third_party/git/git-gui/po/glossary/git-gui-glossary.txt
index 409304692dc1..48b9f10e57d3 100644
--- a/third_party/git/git-gui/po/glossary/git-gui-glossary.txt
+++ b/third_party/git/git-gui/po/glossary/git-gui-glossary.txt
@@ -1,67 +1,96 @@
 "English Term (Dear translator: This file will never be visible to the user!)"	"English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
+"abort"	"prematurely stop and abandon an operation"
 "amend"	""
+"ancestor"	"a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
 "annotate"	""
+"author"	"The person who initially created (authored) a commit"
+"bare repository"	"a repository with only .git directory, without working directory"
+"base"	"a parent version of the current file"
+"bisect"	""
+"blame"	"get the authors responsible for each line in a file"
+"blob"	     ""
 "branch [noun]"	"A 'branch' is an active line of development."
 "branch [verb]"	""
 "checkout [noun]"	""
 "checkout [verb]"	"The action of updating the working tree to a revision which was stored in the object database."
+"cherry-pick"	"to select and apply a single commit to the current HEAD without merging"
+"child commit"	"a commit that directly succeeds the current one in git's graph of commits"
+"cleanup"	"clean the state of the git repository, often after manually stopped operation"
 "clone [verb]"	""
 "commit [noun]"	"A single point in the git history."
 "commit [verb]"	"The action of storing a new snapshot of the project's state in the git history."
+"commit message"	"a message that gets attached with any commit"
+"committer"	  "The person who committed a commit (to the current branch), which might be different than the author."
+"descendant"	"a commit that precedes the current one in git's graph of commits (not necessarily directly)"
+"detached HEAD"	      "checkout of a revision rather than some head"
+"detached checkout"	"checkout of a revision rather than some head"
 "diff [noun]"	""
 "diff [verb]"	""
-"fast forward merge"	"A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
+"directory"	  ""
+"fast-forward"	"A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
 "fetch"	"Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
+"file level merging"	"any merge strategy that works on a file by file basis"
+"file"	     ""
+"head"	"the last revision in a branch"
+"hook"	"script that gets executed automatically on some event"
 "hunk"	"One context of consecutive lines in a whole patch, which consists of many such hunks"
 "index (in git-gui: staging area)"	"A collection of files. The index is a stored version of your working tree."
+"initial checkout"	"the first checkout during a clone operation"
+"initial commit"	"The very first commit in a repository"
+"local branch"	"a branch that resides in the local git repository"
+"loose object"	"a Git object that is not part of any pack"
+"master branch"	"a branch called by convention 'master' that exists in a newly created git repository"
 "merge [noun]"	"A successful merge results in the creation of a new commit representing the result of the merge."
 "merge [verb]"	"To bring the contents of another branch into the current branch."
 "message"	""
-"prune"	"Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
+"origin"	"a remote called by convention 'origin' that the current git repository has been cloned from"
+"orphan commit"	      ""
+"orphan reference"	 ""
+"pack [noun]"	"a file containing many git objects packed together"
+"pack [verb]"	    "the process of creating a pack file"
+"packed object"	"a Git object part of some pack"
+"parent commit"	"a commit that directly precedes the current one in git's graph of commits"
+"patch" ""
+"path"	"The path to a file"
+"prune"	"Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
 "pull"	"Pulling a branch means to fetch it and merge it."
 "push"	"Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)"
+"rebase [noun]"	"The process of rebasing one set of commits on top of another branch's head"
+"rebase [verb]"	"Re-apply one set of commits on top of another branch's head. Contrary to merge."
 "redo"	""
-"remote"	"An other repository ('remote'). One might have a set of remotes whose branches one tracks."
+"reference"	  ""
+"reflog"	"the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
+"refmap"       ""
+"refspec"	""
+"remote [adj]"	"The adjective for anything which is outside of the current (local) repository"
+"remote branch"	      "A branch in any other ('remote') repository"
+"remote repository"	  "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
 "repository"	"A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
 "reset"	""
+"resolve (a conflict)"	"decide which changes from alternative versions of a file should persist in Git"
+"revert changes"	"abandon changes and go to pristine version"
 "revert"	""
+"revision expression"	"expression that signifies a revision in git"
 "revision"	"A particular state of files and directories which was stored in the object database."
 "sign off"	""
-"staging area"	""
+"stage [noun], index"	    "see: staging area. In some areas of git this is called 'index'."
+"stage [verb]"	"add some content of files and directories to the staging area in preparation for a commit"
+"staging area"	"The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'."
+"stash [noun]"	"The place (stack) where changes can be temporarily saved without committing"
+"stash [verb]"	"temporarily save changes in a stack without committing"
 "status"	""
-"tag [noun]"	"A ref pointing to a tag or commit object"
-"tag [verb]"	""
+"submodule"	""
+"tag [noun]"	"A ref pointing to some commit object. In other words: A label on a specific commit."
+"tag [verb]"	"The process of creating a tag at a specific commit object"
+"tagger"	"The person who created a tag"
+"tracked/untracked"	"file whose content is tracked/not tracked by git"
 "tracking branch"	"A regular git branch that is used to follow changes from another repository."
+"trailer"	""
+"tree"	"1. tree object, 2. directory tree"
 "undo"	""
+"unstage"	"Remove content of files from the staging area again so that it will not be part of the next commit"
+"unstash [verb]"	"Retrieving the temporarily saved changes back again from the stash"
 "update"	""
+"upstream branch"	""
 "verify"	""
-"working copy, working tree"	"The tree of actual checked out files."
-"ancestor"	"a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
-"abort"	"prematurely stop and abandon an operation"
-"bare repository"	"a repository with only .git directory, without working directory"
-"base"	"a parent version of the current file"
-"blame"	"get the authors responsible for each line in a file"
-"cherry-pick"	"to select and apply a single commit without merging"
-"child"	"a commit that directly succeeds the current one in git's graph of commits"
-"cleanup"	"clean the state of the git repository, often after manually stopped operation"
-"commit message"	"a message that gets attached with any commit"
-"descendant"	"a commit that precedes the current one in git's graph of commits (not necessarily directly)"
-"detached checkout"	"checkout of a revision rather than a some head"
-"file level merging"	"any merge strategy that works on a file by file basis"
-"head"	"the last revision in a branch"
-"hook"	"script that gets executed automatically on some event"
-"initial checkout"	"the first checkout during a clone operation"
-"local branch"	"a branch that resides in the local git repository"
-"loose object"	"a Git object that is not part of any pack"
-"master branch"	"a branch called by convention 'master' that exists in a newly created git repository"
-"origin"	"a remote called by convention 'origin' that the current git repository has been cloned from"
-"pack [noun]"	"a file containing many git objects packed together"
-"packed object"	"a Git object part of some pack"
-"parent"	"a commit that directly precedes the current one in git's graph of commits"
-"reflog"	"the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
-"resolve (a conflict)"	"decide which changes from alternative versions of a file should persist in Git"
-"revert changes"	"abandon changes and go to pristine version"
-"revision expression"	"expression that signifies a revision in git"
-"stage/unstage"	"add some content of files and directories to the staging area in preparation for a commit"
-"stash"	"temporarily save changes in a stack without committing"
-"tracked/untracked"	"file whose content is tracked/not tracked by git"
+"working directory, working copy, working tree"	"The tree of actual checked out files."
diff --git a/third_party/git/git-gui/po/ja.po b/third_party/git/git-gui/po/ja.po
index 208651c1afc1..2f61153ab9ff 100644
--- a/third_party/git/git-gui/po/ja.po
+++ b/third_party/git/git-gui/po/ja.po
@@ -4,14 +4,15 @@
 #
 # ใ—ใ‚‰ใ„ใ— ใชใชใ“ <nanako3@bluebottle.com>, 2007.
 # Satoshi Yasushima <s.yasushima@gmail.com>, 2016.
+# KIDANI Akito <a.kid.1985@gmail.com>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-27 17:52+0900\n"
-"PO-Revision-Date: 2016-06-22 12:50+0900\n"
-"Last-Translator: Satoshi Yasushima <s.yasushima@gmail.com>\n"
+"PO-Revision-Date: 2019-10-13 23:20+0900\n"
+"Last-Translator: KIDANI Akito <a.kid.1985@gmail.com>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -661,7 +662,7 @@ msgstr ""
 #: lib/merge.tcl:108
 #, tcl-format
 msgid "%s of %s"
-msgstr "%s ใฎ %s ใƒ–ใƒฉใƒณใƒ"
+msgstr "%2$s ใฎ %1$s ใƒ–ใƒฉใƒณใƒ"
 
 #: lib/merge.tcl:122
 #, tcl-format
@@ -956,7 +957,7 @@ msgstr "ใ‚จใƒฉใƒผ: ใ‚ณใƒžใƒณใƒ‰ใŒๅคฑๆ•—ใ—ใพใ—ใŸ"
 #: lib/checkout_op.tcl:85
 #, tcl-format
 msgid "Fetching %s from %s"
-msgstr "%s ใ‹ใ‚‰ %s ใ‚’ใƒ•ใ‚งใƒƒใƒใ—ใฆใ„ใพใ™"
+msgstr "%2$s ใ‹ใ‚‰ %1$s ใ‚’ใƒ•ใ‚งใƒƒใƒใ—ใฆใ„ใพใ™"
 
 #: lib/checkout_op.tcl:133
 #, tcl-format
diff --git a/third_party/git/git-legacy-stash.sh b/third_party/git/git-legacy-stash.sh
index f60e9b3e877b..4d4ebb4f2ba5 100755
--- a/third_party/git/git-legacy-stash.sh
+++ b/third_party/git/git-legacy-stash.sh
@@ -193,7 +193,8 @@ create_stash () {
 			GIT_INDEX_FILE="$TMPindex" &&
 			export GIT_INDEX_FILE &&
 			git diff-index --name-only -z HEAD -- "$@" >"$TMP-stagenames" &&
-			git update-index -z --add --remove --stdin <"$TMP-stagenames" &&
+			git update-index --ignore-skip-worktree-entries \
+				-z --add --remove --stdin <"$TMP-stagenames" &&
 			git write-tree &&
 			rm -f "$TMPindex"
 		) ) ||
@@ -206,7 +207,7 @@ create_stash () {
 
 		# find out what the user wants
 		GIT_INDEX_FILE="$TMP-index" \
-			git add--interactive --patch=stash -- "$@" &&
+			git add --legacy-stash-p -- "$@" &&
 
 		# state of the working tree
 		w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) ||
@@ -370,7 +371,7 @@ push_stash () {
 			git diff-index -p --cached --binary HEAD -- "$@" |
 			git apply --index -R
 		else
-			git reset --hard -q
+			git reset --hard -q --no-recurse-submodules
 		fi
 
 		if test "$keep_index" = "t" && test -n "$i_tree"
diff --git a/third_party/git/git-p4.py b/third_party/git/git-p4.py
index 3991e7d1a7fc..9a71a6690db3 100755
--- a/third_party/git/git-p4.py
+++ b/third_party/git/git-p4.py
@@ -7,6 +7,14 @@
 #            2007 Trolltech ASA
 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
 #
+# pylint: disable=invalid-name,missing-docstring,too-many-arguments,broad-except
+# pylint: disable=no-self-use,wrong-import-position,consider-iterating-dictionary
+# pylint: disable=wrong-import-order,unused-import,too-few-public-methods
+# pylint: disable=too-many-lines,ungrouped-imports,fixme,too-many-locals
+# pylint: disable=line-too-long,bad-whitespace,superfluous-parens
+# pylint: disable=too-many-statements,too-many-instance-attributes
+# pylint: disable=too-many-branches,too-many-nested-blocks
+#
 import sys
 if sys.hexversion < 0x02040000:
     # The limiter is the subprocess module
@@ -161,12 +169,30 @@ def calcDiskFree():
         return st.f_bavail * st.f_frsize
 
 def die(msg):
+    """ Terminate execution. Make sure that any running child processes have been wait()ed for before
+        calling this.
+    """
     if verbose:
         raise Exception(msg)
     else:
         sys.stderr.write(msg + "\n")
         sys.exit(1)
 
+def prompt(prompt_text):
+    """ Prompt the user to choose one of the choices
+
+    Choices are identified in the prompt_text by square brackets around
+    a single letter option.
+    """
+    choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text))
+    while True:
+        response = raw_input(prompt_text).strip().lower()
+        if not response:
+            continue
+        response = response[0]
+        if response in choices:
+            return response
+
 def write_pipe(c, stdin):
     if verbose:
         sys.stderr.write('Writing pipe: %s\n' % str(c))
@@ -603,6 +629,14 @@ class P4RequestSizeException(P4ServerException):
         super(P4RequestSizeException, self).__init__(exit_code, p4_result)
         self.limit = limit
 
+class P4CommandException(P4Exception):
+    """ Something went wrong calling p4 which means we have to give up """
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg
+
 def isModeExecChanged(src_mode, dst_mode):
     return isModeExec(src_mode) != isModeExec(dst_mode)
 
@@ -1160,13 +1194,11 @@ class LargeFileSystem(object):
             if contentsSize <= gitConfigInt('git-p4.largeFileCompressedThreshold'):
                 return False
             contentTempFile = self.generateTempFile(contents)
-            compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False)
-            zf = zipfile.ZipFile(compressedContentFile.name, mode='w')
-            zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED)
-            zf.close()
-            compressedContentsSize = zf.infolist()[0].compress_size
+            compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=True)
+            with zipfile.ZipFile(compressedContentFile, mode='w') as zf:
+                zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED)
+                compressedContentsSize = zf.infolist()[0].compress_size
             os.remove(contentTempFile)
-            os.remove(compressedContentFile.name)
             if compressedContentsSize > gitConfigInt('git-p4.largeFileCompressedThreshold'):
                 return True
         return False
@@ -1259,9 +1291,15 @@ class GitLFS(LargeFileSystem):
             pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile)
 
         oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)
+        # if someone use external lfs.storage ( not in local repo git )
+        lfs_path = gitConfig('lfs.storage')
+        if not lfs_path:
+            lfs_path = 'lfs'
+        if not os.path.isabs(lfs_path):
+            lfs_path = os.path.join(os.getcwd(), '.git', lfs_path)
         localLargeFile = os.path.join(
-            os.getcwd(),
-            '.git', 'lfs', 'objects', oid[:2], oid[2:4],
+            lfs_path,
+            'objects', oid[:2], oid[2:4],
             oid,
         )
         # LFS Spec states that pointer files should not have the executable bit set.
@@ -1780,12 +1818,11 @@ class P4Submit(Command, P4UserMap):
         if os.stat(template_file).st_mtime > mtime:
             return True
 
-        while True:
-            response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
-            if response == 'y':
-                return True
-            if response == 'n':
-                return False
+        response = prompt("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
+        if response == 'y':
+            return True
+        if response == 'n':
+            return False
 
     def get_diff_description(self, editedFiles, filesToAdd, symlinks):
         # diff
@@ -2347,31 +2384,22 @@ class P4Submit(Command, P4UserMap):
                           " --prepare-p4-only")
                     break
                 if i < last:
-                    quit = False
-                    while True:
-                        # prompt for what to do, or use the option/variable
-                        if self.conflict_behavior == "ask":
-                            print("What do you want to do?")
-                            response = raw_input("[s]kip this commit but apply"
-                                                 " the rest, or [q]uit? ")
-                            if not response:
-                                continue
-                        elif self.conflict_behavior == "skip":
-                            response = "s"
-                        elif self.conflict_behavior == "quit":
-                            response = "q"
-                        else:
-                            die("Unknown conflict_behavior '%s'" %
-                                self.conflict_behavior)
-
-                        if response[0] == "s":
-                            print("Skipping this commit, but applying the rest")
-                            break
-                        if response[0] == "q":
-                            print("Quitting")
-                            quit = True
-                            break
-                    if quit:
+                    # prompt for what to do, or use the option/variable
+                    if self.conflict_behavior == "ask":
+                        print("What do you want to do?")
+                        response = prompt("[s]kip this commit but apply the rest, or [q]uit? ")
+                    elif self.conflict_behavior == "skip":
+                        response = "s"
+                    elif self.conflict_behavior == "quit":
+                        response = "q"
+                    else:
+                        die("Unknown conflict_behavior '%s'" %
+                            self.conflict_behavior)
+
+                    if response == "s":
+                        print("Skipping this commit, but applying the rest")
+                    if response == "q":
+                        print("Quitting")
                         break
 
         chdir(self.oldWorkingDirectory)
@@ -3525,10 +3553,79 @@ class P4Sync(Command, P4UserMap):
         self.updateOptionDict(details)
         try:
             self.commit(details, self.extractFilesFromCommit(details), self.branch)
-        except IOError:
+        except IOError as err:
             print("IO error with git fast-import. Is your git version recent enough?")
+            print("IO error details: {}".format(err))
             print(self.gitError.read())
 
+
+    def importRevisions(self, args, branch_arg_given):
+        changes = []
+
+        if len(self.changesFile) > 0:
+            with open(self.changesFile) as f:
+                output = f.readlines()
+            changeSet = set()
+            for line in output:
+                changeSet.add(int(line))
+
+            for change in changeSet:
+                changes.append(change)
+
+            changes.sort()
+        else:
+            # catch "git p4 sync" with no new branches, in a repo that
+            # does not have any existing p4 branches
+            if len(args) == 0:
+                if not self.p4BranchesInGit:
+                    raise P4CommandException("No remote p4 branches.  Perhaps you never did \"git p4 clone\" in here.")
+
+                # The default branch is master, unless --branch is used to
+                # specify something else.  Make sure it exists, or complain
+                # nicely about how to use --branch.
+                if not self.detectBranches:
+                    if not branch_exists(self.branch):
+                        if branch_arg_given:
+                            raise P4CommandException("Error: branch %s does not exist." % self.branch)
+                        else:
+                            raise P4CommandException("Error: no branch %s; perhaps specify one with --branch." %
+                                self.branch)
+
+            if self.verbose:
+                print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
+                                                          self.changeRange))
+            changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)
+
+            if len(self.maxChanges) > 0:
+                changes = changes[:min(int(self.maxChanges), len(changes))]
+
+        if len(changes) == 0:
+            if not self.silent:
+                print("No changes to import!")
+        else:
+            if not self.silent and not self.detectBranches:
+                print("Import destination: %s" % self.branch)
+
+            self.updatedBranches = set()
+
+            if not self.detectBranches:
+                if args:
+                    # start a new branch
+                    self.initialParent = ""
+                else:
+                    # build on a previous revision
+                    self.initialParent = parseRevision(self.branch)
+
+            self.importChanges(changes)
+
+            if not self.silent:
+                print("")
+                if len(self.updatedBranches) > 0:
+                    sys.stdout.write("Updated branches: ")
+                    for b in self.updatedBranches:
+                        sys.stdout.write("%s " % b)
+                    sys.stdout.write("\n")
+
     def openStreams(self):
         self.importProcess = subprocess.Popen(["git", "fast-import"],
                                               stdin=subprocess.PIPE,
@@ -3539,11 +3636,14 @@ class P4Sync(Command, P4UserMap):
         self.gitError = self.importProcess.stderr
 
     def closeStreams(self):
+        if self.gitStream is None:
+            return
         self.gitStream.close()
         if self.importProcess.wait() != 0:
             die("fast-import failed: %s" % self.gitError.read())
         self.gitOutput.close()
         self.gitError.close()
+        self.gitStream = None
 
     def run(self, args):
         if self.importIntoRemotes:
@@ -3727,87 +3827,36 @@ class P4Sync(Command, P4UserMap):
                     b = b[len(self.projectName):]
                 self.createdBranches.add(b)
 
-        self.openStreams()
-
-        if revision:
-            self.importHeadRevision(revision)
-        else:
-            changes = []
-
-            if len(self.changesFile) > 0:
-                output = open(self.changesFile).readlines()
-                changeSet = set()
-                for line in output:
-                    changeSet.add(int(line))
-
-                for change in changeSet:
-                    changes.append(change)
-
-                changes.sort()
-            else:
-                # catch "git p4 sync" with no new branches, in a repo that
-                # does not have any existing p4 branches
-                if len(args) == 0:
-                    if not self.p4BranchesInGit:
-                        die("No remote p4 branches.  Perhaps you never did \"git p4 clone\" in here.")
-
-                    # The default branch is master, unless --branch is used to
-                    # specify something else.  Make sure it exists, or complain
-                    # nicely about how to use --branch.
-                    if not self.detectBranches:
-                        if not branch_exists(self.branch):
-                            if branch_arg_given:
-                                die("Error: branch %s does not exist." % self.branch)
-                            else:
-                                die("Error: no branch %s; perhaps specify one with --branch." %
-                                    self.branch)
+        p4_check_access()
 
-                if self.verbose:
-                    print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
-                                                              self.changeRange))
-                changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)
+        self.openStreams()
 
-                if len(self.maxChanges) > 0:
-                    changes = changes[:min(int(self.maxChanges), len(changes))]
+        err = None
 
-            if len(changes) == 0:
-                if not self.silent:
-                    print("No changes to import!")
+        try:
+            if revision:
+                self.importHeadRevision(revision)
             else:
-                if not self.silent and not self.detectBranches:
-                    print("Import destination: %s" % self.branch)
+                self.importRevisions(args, branch_arg_given)
 
-                self.updatedBranches = set()
+            if gitConfigBool("git-p4.importLabels"):
+                self.importLabels = True
 
-                if not self.detectBranches:
-                    if args:
-                        # start a new branch
-                        self.initialParent = ""
-                    else:
-                        # build on a previous revision
-                        self.initialParent = parseRevision(self.branch)
+            if self.importLabels:
+                p4Labels = getP4Labels(self.depotPaths)
+                gitTags = getGitTags()
 
-                self.importChanges(changes)
+                missingP4Labels = p4Labels - gitTags
+                self.importP4Labels(self.gitStream, missingP4Labels)
 
-                if not self.silent:
-                    print("")
-                    if len(self.updatedBranches) > 0:
-                        sys.stdout.write("Updated branches: ")
-                        for b in self.updatedBranches:
-                            sys.stdout.write("%s " % b)
-                        sys.stdout.write("\n")
-
-        if gitConfigBool("git-p4.importLabels"):
-            self.importLabels = True
-
-        if self.importLabels:
-            p4Labels = getP4Labels(self.depotPaths)
-            gitTags = getGitTags()
+        except P4CommandException as e:
+            err = e
 
-            missingP4Labels = p4Labels - gitTags
-            self.importP4Labels(self.gitStream, missingP4Labels)
+        finally:
+            self.closeStreams()
 
-        self.closeStreams()
+        if err:
+            die(str(err))
 
         # Cleanup temporary branches created during import
         if self.tempBranches != []:
@@ -4141,7 +4190,12 @@ def main():
                                    description = cmd.description,
                                    formatter = HelpFormatter())
 
-    (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
+    try:
+        (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
+    except:
+        parser.print_help()
+        raise
+
     global verbose
     verbose = cmd.verbose
     if cmd.needsGit:
diff --git a/third_party/git/git-send-email.perl b/third_party/git/git-send-email.perl
index 5f92c89c1c1b..dc95656f75c1 100755
--- a/third_party/git/git-send-email.perl
+++ b/third_party/git/git-send-email.perl
@@ -1228,7 +1228,7 @@ sub process_address_list {
 # domain name that corresponds the IP address in the HELO/EHLO
 # handshake. This is used to verify the connection and prevent
 # spammers from trying to hide their identity. If the DNS and IP don't
-# match, the receiveing MTA may deny the connection.
+# match, the receiving MTA may deny the connection.
 #
 # Here is a deny example of Net::SMTP with the default "localhost.localdomain"
 #
diff --git a/third_party/git/git-submodule.sh b/third_party/git/git-submodule.sh
index c7f58c5756f7..89f915cae99b 100755
--- a/third_party/git/git-submodule.sh
+++ b/third_party/git/git-submodule.sh
@@ -10,8 +10,9 @@ USAGE="[--quiet] [--cached]
    or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
    or: $dashless [--quiet] init [--] [<path>...]
    or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
-   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--] [<path>...]
+   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
    or: $dashless [--quiet] set-branch (--default|--branch <branch>) [--] <path>
+   or: $dashless [--quiet] set-url [--] <path> <newurl>
    or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
    or: $dashless [--quiet] foreach [--recursive] <command>
    or: $dashless [--quiet] sync [--recursive] [--] [<path>...]
@@ -36,6 +37,7 @@ reference=
 cached=
 recursive=
 init=
+require_init=
 files=
 remote=
 nofetch=
@@ -45,6 +47,7 @@ custom_name=
 depth=
 progress=
 dissociate=
+single_branch=
 
 die_if_unmatched ()
 {
@@ -239,13 +242,15 @@ cmd_add()
 	    die "$(eval_gettext "'\$sm_path' does not have a commit checked out")"
 	fi
 
-	if test -z "$force" &&
-		! git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" > /dev/null 2>&1
+	if test -z "$force"
 	then
-		eval_gettextln "The following path is ignored by one of your .gitignore files:
-\$sm_path
-Use -f if you really want to add it." >&2
-		exit 1
+	    dryerr=$(git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" 2>&1 >/dev/null)
+	    res=$?
+	    if test $res -ne 0
+	    then
+		 echo >&2 "$dryerr"
+		 exit $res
+	    fi
 	fi
 
 	if test -n "$custom_name"
@@ -466,6 +471,10 @@ cmd_update()
 		-i|--init)
 			init=1
 			;;
+		--require-init)
+			init=1
+			require_init=1
+			;;
 		--remote)
 			remote=1
 			;;
@@ -520,6 +529,12 @@ cmd_update()
 		--jobs=*)
 			jobs=$1
 			;;
+		--single-branch)
+			single_branch="--single-branch"
+			;;
+		--no-single-branch)
+			single_branch="--no-single-branch"
+			;;
 		--)
 			shift
 			break
@@ -548,6 +563,8 @@ cmd_update()
 		${reference:+"$reference"} \
 		${dissociate:+"--dissociate"} \
 		${depth:+--depth "$depth"} \
+		${require_init:+--require-init} \
+		$single_branch \
 		$recommend_shallow \
 		$jobs \
 		-- \
@@ -761,6 +778,55 @@ cmd_set_branch() {
 }
 
 #
+# Configures a submodule's remote url
+#
+# $@ = requested path, requested url
+#
+cmd_set_url() {
+	while test $# -ne 0
+	do
+		case "$1" in
+		-q|--quiet)
+			GIT_QUIET=1
+			;;
+		--)
+			shift
+			break
+			;;
+		-*)
+			usage
+			;;
+		*)
+			break
+			;;
+		esac
+		shift
+	done
+
+	if test $# -ne 2
+	then
+		usage
+	fi
+
+	# we can't use `git submodule--helper name` here because internally, it
+	# hashes the path so a trailing slash could lead to an unintentional no match
+	name="$(git submodule--helper list "$1" | cut -f2)"
+	if test -z "$name"
+	then
+		exit 1
+	fi
+
+	url="$2"
+	if test -z "$url"
+	then
+		exit 1
+	fi
+
+	git submodule--helper config submodule."$name".url "$url"
+	git submodule--helper sync ${GIT_QUIET:+--quiet} "$name"
+}
+
+#
 # Show commit summary for submodules in index or working tree
 #
 # If '--cached' is given, show summary between index and given commit,
@@ -1059,7 +1125,7 @@ cmd_absorbgitdirs()
 while test $# != 0 && test -z "$command"
 do
 	case "$1" in
-	add | foreach | init | deinit | update | set-branch | status | summary | sync | absorbgitdirs)
+	add | foreach | init | deinit | update | set-branch | set-url | status | summary | sync | absorbgitdirs)
 		command=$1
 		;;
 	-q|--quiet)
diff --git a/third_party/git/git-svn.perl b/third_party/git/git-svn.perl
index 050f2a36f414..4aa208ff5ffb 100755
--- a/third_party/git/git-svn.perl
+++ b/third_party/git/git-svn.perl
@@ -110,7 +110,7 @@ my ($_stdin, $_help, $_edit,
 	$_template, $_shared,
 	$_version, $_fetch_all, $_no_rebase, $_fetch_parent,
 	$_before, $_after,
-	$_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local,
+	$_merge, $_strategy, $_rebase_merges, $_dry_run, $_parents, $_local,
 	$_prefix, $_no_checkout, $_url, $_verbose,
 	$_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props);
 
@@ -270,7 +270,8 @@ my %cmd = (
 			  'local|l' => \$_local,
 			  'fetch-all|all' => \$_fetch_all,
 			  'dry-run|n' => \$_dry_run,
-			  'preserve-merges|p' => \$_preserve_merges,
+			  'rebase-merges|p' => \$_rebase_merges,
+			  'preserve-merges|p' => \$_rebase_merges,
 			  %fc_opts } ],
 	'commit-diff' => [ \&cmd_commit_diff,
 	                   'Commit a diff between two trees',
@@ -1054,7 +1055,7 @@ sub cmd_dcommit {
 					  'If you are attempting to commit ',
 					  "merges, try running:\n\t",
 					  'git rebase --interactive',
-					  '--preserve-merges ',
+					  '--rebase-merges ',
 					  $gs->refname,
 					  "\nBefore dcommitting";
 				}
@@ -1717,7 +1718,7 @@ sub rebase_cmd {
 	push @cmd, '-v' if $_verbose;
 	push @cmd, qw/--merge/ if $_merge;
 	push @cmd, "--strategy=$_strategy" if $_strategy;
-	push @cmd, "--preserve-merges" if $_preserve_merges;
+	push @cmd, "--rebase-merges" if $_rebase_merges;
 	@cmd;
 }
 
diff --git a/third_party/git/git.c b/third_party/git/git.c
index c1ee7124edcf..7be7ad34bd05 100644
--- a/third_party/git/git.c
+++ b/third_party/git/git.c
@@ -369,8 +369,7 @@ static int handle_alias(int *argcp, const char ***argv)
 			die(_("alias '%s' changes environment variables.\n"
 			      "You can use '!git' in the alias to do this"),
 			    alias_command);
-		memmove(new_argv - option_count, new_argv,
-				count * sizeof(char *));
+		MOVE_ARRAY(new_argv - option_count, new_argv, count);
 		new_argv -= option_count;
 
 		if (count < 1)
@@ -385,7 +384,7 @@ static int handle_alias(int *argcp, const char ***argv)
 
 		REALLOC_ARRAY(new_argv, count + *argcp);
 		/* insert after command name */
-		memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);
+		COPY_ARRAY(new_argv + count, *argv + 1, *argcp);
 
 		trace2_cmd_alias(alias_command, new_argv);
 		trace2_cmd_list_config();
@@ -573,6 +572,7 @@ static struct cmd_struct commands[] = {
 	{ "show-branch", cmd_show_branch, RUN_SETUP },
 	{ "show-index", cmd_show_index },
 	{ "show-ref", cmd_show_ref, RUN_SETUP },
+	{ "sparse-checkout", cmd_sparse_checkout, RUN_SETUP | NEED_WORK_TREE },
 	{ "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
 	/*
 	 * NEEDSWORK: Until the builtin stash is thoroughly robust and no
diff --git a/third_party/git/gitk-git/gitk b/third_party/git/gitk-git/gitk
index a14d7a16b2dd..abe4805adedb 100755
--- a/third_party/git/gitk-git/gitk
+++ b/third_party/git/gitk-git/gitk
@@ -3404,6 +3404,8 @@ set rectmask {
 }
 image create bitmap reficon-H -background black -foreground "#00ff00" \
     -data $rectdata -maskdata $rectmask
+image create bitmap reficon-R -background black -foreground "#ffddaa" \
+    -data $rectdata -maskdata $rectmask
 image create bitmap reficon-o -background black -foreground "#ddddff" \
     -data $rectdata -maskdata $rectmask
 
@@ -7016,6 +7018,7 @@ proc commit_descriptor {p} {
 
 # append some text to the ctext widget, and make any SHA1 ID
 # that we know about be a clickable link.
+# Also look for URLs of the form "http[s]://..." and make them web links.
 proc appendwithlinks {text tags} {
     global ctext linknum curview
 
@@ -7032,6 +7035,18 @@ proc appendwithlinks {text tags} {
 	setlink $linkid link$linknum
 	incr linknum
     }
+    set wlinks [regexp -indices -all -inline -line \
+		    {https?://[^[:space:]]+} $text]
+    foreach l $wlinks {
+	set s2 [lindex $l 0]
+	set e2 [lindex $l 1]
+	set url [string range $text $s2 $e2]
+	incr e2
+	$ctext tag delete link$linknum
+	$ctext tag add link$linknum "$start + $s2 c" "$start + $e2 c"
+	setwlink $url link$linknum
+	incr linknum
+    }
 }
 
 proc setlink {id lk} {
@@ -7064,6 +7079,18 @@ proc setlink {id lk} {
     }
 }
 
+proc setwlink {url lk} {
+    global ctext
+    global linkfgcolor
+    global web_browser
+
+    if {$web_browser eq {}} return
+    $ctext tag conf $lk -foreground $linkfgcolor -underline 1
+    $ctext tag bind $lk <1> [list browseweb $url]
+    $ctext tag bind $lk <Enter> {linkcursor %W 1}
+    $ctext tag bind $lk <Leave> {linkcursor %W -1}
+}
+
 proc appendshortlink {id {pre {}} {post {}}} {
     global ctext linknum
 
@@ -7098,6 +7125,16 @@ proc linkcursor {w inc} {
     }
 }
 
+proc browseweb {url} {
+    global web_browser
+
+    if {$web_browser eq {}} return
+    # Use eval here in case $web_browser is a command plus some arguments
+    if {[catch {eval exec $web_browser [list $url] &} err]} {
+	error_popup "[mc "Error starting web browser:"] $err"
+    }
+}
+
 proc viewnextline {dir} {
     global canv linespc
 
@@ -8191,11 +8228,11 @@ proc parseblobdiffline {ids line} {
 	} else {
 	    $ctext insert end "$line\n" filesep
 	}
-    } elseif {![string compare -length 3 "  >" $line]} {
+    } elseif {$currdiffsubmod != "" && ![string compare -length 3 "  >" $line]} {
 	set $currdiffsubmod ""
 	set line [encoding convertfrom $diffencoding $line]
 	$ctext insert end "$line\n" dresult
-    } elseif {![string compare -length 3 "  <" $line]} {
+    } elseif {$currdiffsubmod != "" && ![string compare -length 3 "  <" $line]} {
 	set $currdiffsubmod ""
 	set line [encoding convertfrom $diffencoding $line]
 	$ctext insert end "$line\n" d0
@@ -10022,6 +10059,7 @@ proc sel_reflist {w x y} {
     set n [lindex $ref 0]
     switch -- [lindex $ref 1] {
 	"H" {selbyid $headids($n)}
+	"R" {selbyid $headids($n)}
 	"T" {selbyid $tagids($n)}
 	"o" {selbyid $otherrefids($n)}
     }
@@ -10051,7 +10089,11 @@ proc refill_reflist {} {
     foreach n [array names headids] {
 	if {[string match $reflistfilter $n]} {
 	    if {[commitinview $headids($n) $curview]} {
-		lappend refs [list $n H]
+		if {[string match "remotes/*" $n]} {
+		    lappend refs [list $n R]
+		} else {
+		    lappend refs [list $n H]
+		}
 	    } else {
 		interestedin $headids($n) {run refill_reflist}
 	    }
@@ -11488,7 +11530,7 @@ proc create_prefs_page {w} {
 proc prefspage_general {notebook} {
     global NS maxwidth maxgraphpct showneartags showlocalchanges
     global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
-    global hideremotes want_ttk have_ttk maxrefs
+    global hideremotes want_ttk have_ttk maxrefs web_browser
 
     set page [create_prefs_page $notebook.general]
 
@@ -11539,6 +11581,13 @@ proc prefspage_general {notebook} {
     pack configure $page.extdifff.l -padx 10
     grid x $page.extdifff $page.extdifft -sticky ew
 
+    ${NS}::entry $page.webbrowser -textvariable web_browser
+    ${NS}::frame $page.webbrowserf
+    ${NS}::label $page.webbrowserf.l -text [mc "Web browser" ]
+    pack $page.webbrowserf.l -side left
+    pack configure $page.webbrowserf.l -padx 10
+    grid x $page.webbrowserf $page.webbrowser -sticky ew
+
     ${NS}::label $page.lgen -text [mc "General options"]
     grid $page.lgen - -sticky w -pady 10
     ${NS}::checkbutton $page.want_ttk -variable want_ttk \
@@ -12310,6 +12359,7 @@ if {[tk windowingsystem] eq "win32"} {
     set bgcolor SystemWindow
     set fgcolor SystemWindowText
     set selectbgcolor SystemHighlight
+    set web_browser "cmd /c start"
 } else {
     set uicolor grey85
     set uifgcolor black
@@ -12317,6 +12367,11 @@ if {[tk windowingsystem] eq "win32"} {
     set bgcolor white
     set fgcolor black
     set selectbgcolor gray85
+    if {[tk windowingsystem] eq "aqua"} {
+	set web_browser "open"
+    } else {
+	set web_browser "xdg-open"
+    }
 }
 set diffcolors {red "#00a000" blue}
 set diffcontext 3
@@ -12390,6 +12445,7 @@ set config_variables {
     filesepbgcolor filesepfgcolor linehoverbgcolor linehoverfgcolor
     linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor
     indexcirclecolor circlecolors linkfgcolor circleoutlinecolor
+    web_browser
 }
 foreach var $config_variables {
     config_init_trace $var
diff --git a/third_party/git/gitk-git/po/zh_cn.po b/third_party/git/gitk-git/po/zh_cn.po
new file mode 100644
index 000000000000..17b7f899da3d
--- /dev/null
+++ b/third_party/git/gitk-git/po/zh_cn.po
@@ -0,0 +1,1367 @@
+# Translation of gitk to Simplified Chinese.
+#
+# Translators:
+# YanKe <imyanke@163.com>, 2017
+
+msgid ""
+msgstr ""
+"Project-Id-Version: Git Chinese Localization Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-28 23:11+0800\n"
+"PO-Revision-Date: 2017-03-11 02:27+0800\n"
+"Last-Translator: YanKe <imyanke@163.com>\n"
+"Language-Team: Chinese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "ไธ่ƒฝ่Žทๅ–ๆœชๅˆๅนถๆ–‡ไปถๅˆ—่กจ๏ผš"
+
+#: gitk:212 gitk:2403
+msgid "Color words"
+msgstr "็€่‰ฒๆ˜พ็คบๅทฎๅผ‚"
+
+#: gitk:217 gitk:2403 gitk:8249 gitk:8282
+msgid "Markup words"
+msgstr "ๆ ‡่ฎฐๆ˜พ็คบๅทฎๅผ‚"
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "่งฃๆž็‰ˆๆœฌ้”™่ฏฏ๏ผš"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "่ฟ่กŒ --argscmdๅ‘ฝไปคๅ‡บ้”™"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr "ๆฒกๆœ‰้€‰ไธญๆ–‡ไปถ๏ผš--ๆŒ‡ๅฎšmergeๅ‚ๆ•ฐไฝ†ๆฒกๆœ‰ๆœชๅˆๅนถ็š„ๆ–‡ไปถใ€‚"
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr "ๆฒกๆœ‰้€‰ไธญๆ–‡ไปถ๏ผš--ๆŒ‡ๅฎšmergeๅ‚ๆ•ฐไฝ†ๆฒกๆœ‰ๆœชๅˆๅนถ็š„ๆ–‡ไปถๅœจๆ–‡ไปถไธญ"
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "ๆ‰ง่กŒgit logๅ‘ฝไปคๅ‡บ้”™๏ผš"
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "่ฏปๅ–ไธญ"
+
+#: gitk:496 gitk:4549
+msgid "Reading commits..."
+msgstr "ๆไบค่ฎฐๅฝ•่ฏปๅ–ไธญ..."
+
+#: gitk:499 gitk:1641 gitk:4552
+msgid "No commits selected"
+msgstr "ๆœช้€‰ไธญไปปไฝ•ๆไบค"
+
+#: gitk:1449 gitk:4069 gitk:12583
+msgid "Command line"
+msgstr "ๅ‘ฝไปค่กŒ"
+
+#: gitk:1515
+msgid "Can't parse git log output:"
+msgstr "ไธ่ƒฝ่งฃๆžgit log่พ“ๅ‡บ๏ผš"
+
+#: gitk:1744
+msgid "No commit information available"
+msgstr "ๆ— ๅฏ็”จๆไบคไฟกๆฏ"
+
+#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668
+msgid "OK"
+msgstr "็กฎๅฎš"
+
+#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791
+#: gitk:11389 gitk:11669
+msgid "Cancel"
+msgstr "ๅ–ๆถˆ"
+
+#: gitk:2087
+msgid "&Update"
+msgstr "ๆ›ดๆ–ฐ"
+
+#: gitk:2088
+msgid "&Reload"
+msgstr "้‡ๆ–ฐๅŠ ่ฝฝ"
+
+#: gitk:2089
+msgid "Reread re&ferences"
+msgstr "้‡ๆ–ฐ่ฏปๅ–ๅผ•็”จ"
+
+#: gitk:2090
+msgid "&List references"
+msgstr "ๅˆ—ๅ‡บๅผ•็”จ(ๅˆ†ๆ”ฏไปฅๅŠtag)"
+
+#: gitk:2092
+msgid "Start git &gui"
+msgstr "ๅฏๅŠจgit guiๅฎขๆˆท็ซฏ"
+
+#: gitk:2094
+msgid "&Quit"
+msgstr "้€€ๅ‡บ"
+
+#: gitk:2086
+msgid "&File"
+msgstr "ๆ–‡ไปถ"
+
+#: gitk:2098
+msgid "&Preferences"
+msgstr "ๅๅฅฝ่ฎพ็ฝฎ"
+
+#: gitk:2097
+msgid "&Edit"
+msgstr "็ผ–่พ‘"
+
+#: gitk:2102
+msgid "&New view..."
+msgstr "ๆ–ฐ่ง†ๅ›พ..."
+
+#: gitk:2103
+msgid "&Edit view..."
+msgstr "็ผ–่พ‘่ง†ๅ›พ..."
+
+#: gitk:2104
+msgid "&Delete view"
+msgstr "ๅˆ ้™ค่ง†ๅ›พ"
+
+#: gitk:2106
+msgid "&All files"
+msgstr "ๆ‰€ๆœ‰ๆ–‡ไปถ"
+
+#: gitk:2101
+msgid "&View"
+msgstr "่ง†ๅ›พ"
+
+#: gitk:2111 gitk:2121
+msgid "&About gitk"
+msgstr "ๅ…ณไบŽgitk"
+
+#: gitk:2112 gitk:2126
+msgid "&Key bindings"
+msgstr "ๅฟซๆท้”ฎ"
+
+#: gitk:2110 gitk:2125
+msgid "&Help"
+msgstr "ๅธฎๅŠฉ"
+
+#: gitk:2203 gitk:8681
+msgid "SHA1 ID:"
+msgstr "SHA1 ID๏ผš"
+
+#: gitk:2247
+msgid "Row"
+msgstr "่กŒ"
+
+#: gitk:2285
+msgid "Find"
+msgstr "ๆŸฅๆ‰พ"
+
+#: gitk:2313
+msgid "commit"
+msgstr "ๆไบค"
+
+#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851
+#: gitk:6936
+msgid "containing:"
+msgstr "ๅŒ…ๅซ๏ผš"
+
+#: gitk:2320 gitk:3550 gitk:3555 gitk:4787
+msgid "touching paths:"
+msgstr "ๅฝฑๅ“่ทฏๅพ„๏ผš"
+
+#: gitk:2321 gitk:4801
+msgid "adding/removing string:"
+msgstr "ๅขžๅŠ /ๅˆ ้™คๅญ—็ฌฆไธฒ๏ผš"
+
+#: gitk:2322 gitk:4803
+msgid "changing lines matching:"
+msgstr "ๆ”นๅ˜่กŒๅŒน้…๏ผš"
+
+#: gitk:2331 gitk:2333 gitk:4790
+msgid "Exact"
+msgstr "็ฒพ็กฎๅŒน้…"
+
+#: gitk:2333 gitk:4878 gitk:6747
+msgid "IgnCase"
+msgstr "ๅฟฝ็•ฅๅคงๅฐๅ†™"
+
+#: gitk:2333 gitk:4760 gitk:4876 gitk:6743
+msgid "Regexp"
+msgstr "ๆญฃๅˆ™"
+
+#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940
+msgid "All fields"
+msgstr "ๆ‰€ๆœ‰ๅญ—ๆฎต"
+
+#: gitk:2336 gitk:4895 gitk:4928 gitk:6810
+msgid "Headline"
+msgstr "ๆ ‡้ข˜"
+
+#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413
+msgid "Comments"
+msgstr "ๆไบคๆณจ้‡Š"
+
+#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859
+#: gitk:8874
+msgid "Author"
+msgstr "ไฝœ่€…"
+
+#: gitk:2337 gitk:4895 gitk:6810 gitk:7350
+msgid "Committer"
+msgstr "ๆไบค่€…"
+
+#: gitk:2371
+msgid "Search"
+msgstr "ๆœ็ดข"
+
+#: gitk:2379
+msgid "Diff"
+msgstr "ๅทฎๅผ‚"
+
+#: gitk:2381
+msgid "Old version"
+msgstr "่€็‰ˆๆœฌ"
+
+#: gitk:2383
+msgid "New version"
+msgstr "ๆ–ฐ็‰ˆๆœฌ"
+
+#: gitk:2386
+msgid "Lines of context"
+msgstr "DiffไธŠไธ‹ๆ–‡ๆ˜พ็คบ่กŒๆ•ฐ"
+
+#: gitk:2396
+msgid "Ignore space change"
+msgstr "ๅฟฝ็•ฅ็ฉบๆ ผไฟฎๆ”น"
+
+#: gitk:2400 gitk:2402 gitk:7983 gitk:8235
+msgid "Line diff"
+msgstr "ๆŒ‰่กŒๆ˜พ็คบๅทฎๅผ‚"
+
+#: gitk:2467
+msgid "Patch"
+msgstr "่กฅไธ"
+
+#: gitk:2469
+msgid "Tree"
+msgstr "ๆ ‘"
+
+#: gitk:2639 gitk:2660
+msgid "Diff this -> selected"
+msgstr "ๆฏ”่พƒไปŽๅฝ“ๅ‰ๆไบคๅˆฐ้€‰ไธญๆไบค็š„ๅทฎๅผ‚"
+
+#: gitk:2640 gitk:2661
+msgid "Diff selected -> this"
+msgstr "ๆฏ”่พƒไปŽ้€‰ไธญๆไบคๅˆฐๅฝ“ๅ‰ๆไบค็š„ๅทฎๅผ‚"
+
+#: gitk:2641 gitk:2662
+msgid "Make patch"
+msgstr "ๅˆถไฝœ่กฅไธ"
+
+#: gitk:2642 gitk:9283
+msgid "Create tag"
+msgstr "ๅˆ›ๅปบtag"
+
+#: gitk:2643
+msgid "Copy commit summary"
+msgstr "ๅคๅˆถๆไบคๆ‘˜่ฆ"
+
+#: gitk:2644 gitk:9414
+msgid "Write commit to file"
+msgstr "ๅ†™ๅ…ฅๆไบคๅˆฐๆ–‡ไปถ"
+
+#: gitk:2645
+msgid "Create new branch"
+msgstr "ๅˆ›ๅปบๆ–ฐๅˆ†ๆ”ฏ"
+
+#: gitk:2646
+msgid "Cherry-pick this commit"
+msgstr "ๅœจๆญคๆไบค่ฟ็”จ่กฅไธ(cherry-pick)ๅ‘ฝไปค"
+
+#: gitk:2647
+msgid "Reset HEAD branch to here"
+msgstr "ๅฐ†ๅˆ†ๆ”ฏๅคด(HEAD)้‡็ฝฎๅˆฐๆญคๅค„"
+
+#: gitk:2648
+msgid "Mark this commit"
+msgstr "ๆ ‡่ฎฐๆญคๆไบค"
+
+#: gitk:2649
+msgid "Return to mark"
+msgstr "่ฟ”ๅ›žๅˆฐๆ ‡่ฎฐ"
+
+#: gitk:2650
+msgid "Find descendant of this and mark"
+msgstr "ๆŸฅๆ‰พๆœฌๆฌกๆไบค็š„ๅญๆไบคๅนถๆ ‡่ฎฐ"
+
+#: gitk:2651
+msgid "Compare with marked commit"
+msgstr "ๅ’Œๅทฒๆ ‡่ฎฐ็š„ๆไบคไฝœๆฏ”่พƒ"
+
+#: gitk:2652 gitk:2663
+msgid "Diff this -> marked commit"
+msgstr "ๆฏ”่พƒไปŽๅฝ“ๅ‰ๆไบคๅˆฐๅทฒๆ ‡่ฎฐๆไบค็š„ๅทฎๅผ‚"
+
+#: gitk:2653 gitk:2664
+msgid "Diff marked commit -> this"
+msgstr "ๆฏ”่พƒไปŽๅทฒๆ ‡่ฎฐๆไบคๅˆฐๅฝ“ๅ‰ๆไบค็š„ๅทฎๅผ‚"
+
+#: gitk:2654
+msgid "Revert this commit"
+msgstr "ๆ’ค้”€(revert)ๆญคๆไบค"
+
+#: gitk:2670
+msgid "Check out this branch"
+msgstr "ๆฃ€ๅ‡บ(checkout)ๆญคๅˆ†ๆ”ฏ"
+
+#: gitk:2671
+msgid "Rename this branch"
+msgstr "้‡ๅ‘ฝๅ(Rename)ๆญคๅˆ†ๆ”ฏ"
+
+#: gitk:2672
+msgid "Remove this branch"
+msgstr "ๅˆ ้™ค(Remove)ๆญคๅˆ†ๆ”ฏ"
+
+#: gitk:2673
+msgid "Copy branch name"
+msgstr "ๅคๅˆถๅˆ†ๆ”ฏๅ็งฐ"
+
+#: gitk:2680
+msgid "Highlight this too"
+msgstr "้ซ˜ไบฎๆญคๅค„"
+
+#: gitk:2681
+msgid "Highlight this only"
+msgstr "ๅช้ซ˜ไบฎๆญคๅค„"
+
+#: gitk:2682
+msgid "External diff"
+msgstr "ๅค–้ƒจdiff"
+
+#: gitk:2683
+msgid "Blame parent commit"
+msgstr "Blame็ˆถๆไบค"
+
+#: gitk:2684
+msgid "Copy path"
+msgstr "ๅคๅˆถ่ทฏๅพ„"
+
+#: gitk:2691
+msgid "Show origin of this line"
+msgstr "ๆ˜พ็คบๆญค่กŒๅŽŸๅง‹ๆไบค"
+
+#: gitk:2692
+msgid "Run git gui blame on this line"
+msgstr "ๅœจๆญค่กŒ่ฟ่กŒgit guiๅฎขๆˆท็ซฏ็š„blame"
+
+#: gitk:3036
+msgid "About gitk"
+msgstr "ๅ…ณไบŽgitk"
+
+#: gitk:3038
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright ยฉ 2005-2016 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr "\nGitk โ€” ไธ€ไธชgit็š„ๆไบคๆŸฅ็œ‹ๅ™จ\n\nยฉ 2005-2016 Paul Mackerras\n\nๅœจGNU่ฎธๅฏ่ฏไธ‹ไฝฟ็”จไปฅๅŠๅˆ†ๅ‘"
+
+#: gitk:3046 gitk:3113 gitk:10004
+msgid "Close"
+msgstr "ๅ…ณ้—ญ"
+
+#: gitk:3067
+msgid "Gitk key bindings"
+msgstr "Gitkๅฟซๆท้”ฎ"
+
+#: gitk:3070
+msgid "Gitk key bindings:"
+msgstr "Gitkๅฟซๆท้”ฎ๏ผš"
+
+#: gitk:3072
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\t้€€ๅ‡บ"
+
+#: gitk:3073
+#, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-W>\t\tๅ…ณ้—ญ็ช—ๅฃ"
+
+#: gitk:3074
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Home>\t\t็งปๅŠจๅˆฐ็ฌฌไธ€ๆฌกๆไบค"
+
+#: gitk:3075
+msgid "<End>\t\tMove to last commit"
+msgstr "<End>\t\t็งปๅŠจๅˆฐๆœ€ๅŽไธ€ๆฌกๆไบค"
+
+#: gitk:3076
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Up>, p, k\t็งปๅŠจๅˆฐไธŠไธ€ๆฌกๆไบค"
+
+#: gitk:3077
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Down>, n, j\t็งปๅŠจๅˆฐไธ‹ไธ€ๆฌกๆไบค"
+
+#: gitk:3078
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Left>, z, h\tๅŽ†ๅฒๅˆ—่กจ็š„ไธŠไธ€้กน"
+
+#: gitk:3079
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Right>, x, l\tๅŽ†ๅฒๅˆ—่กจ็š„ไธ‹ไธ€้กน"
+
+#: gitk:3080
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr "<%s-n>\tๅœจๅŽ†ๅฒๅˆ—่กจไธญๅ‰ๅพ€ๆœฌๆฌกๆไบค็š„็ฌฌnไธช็ˆถๆไบค"
+
+#: gitk:3081
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PageUp>\tไธŠไธ€้กตๆไบคๅˆ—่กจ"
+
+#: gitk:3082
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<PageDown>\tไธ‹ไธ€้กตๆไบคๅˆ—่กจ"
+
+#: gitk:3083
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Home>\tๆปšๅŠจๅˆฐๆไบคๅˆ—่กจ้กถ้ƒจ"
+
+#: gitk:3084
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\tๆปšๅŠจๅˆฐๆไบคๅˆ—่กจๅบ•้ƒจ"
+
+#: gitk:3085
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Up>\tๅ‘ไธŠๆปšๅŠจไธ€่กŒๆไบคๅˆ—่กจ"
+
+#: gitk:3086
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Down>\tๅ‘ไธ‹ๆปšๅŠจไธ€่กŒๆไบคๅˆ—่กจ"
+
+#: gitk:3087
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PageUp>\tๅ‘ไธŠๆปšๅŠจไธ€้กตๆไบคๅˆ—่กจ"
+
+#: gitk:3088
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PageDown>\tๅ‘ไธ‹ๆปšๅŠจไธ€้กตๆไบคๅˆ—่กจ"
+
+#: gitk:3089
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Shift-Up>\tๅ‘ๅŽๆŸฅๆ‰พ(ๅ‘ไธŠ็š„๏ผŒๆ›ดๆ™š็š„ๆไบค)"
+
+#: gitk:3090
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Shift-Down>\tๅ‘ๅ‰ๆŸฅๆ‰พ(ๅ‘ไธ‹็š„๏ผŒๆ›ดๆ—ฉ็š„ๆไบค)"
+
+#: gitk:3091
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Delete>, b\tๅ‘ไธŠๆปšๅŠจdiff่ง†ๅ›พไธ€้กต"
+
+#: gitk:3092
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Backspace>\tๅ‘ไธŠๆปšๅŠจdiff่ง†ๅ›พไธ€้กต"
+
+#: gitk:3093
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Space>\t\tๅ‘ไธ‹ๆปšๅŠจdiff่ง†ๅ›พไธ€้กต"
+
+#: gitk:3094
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tๅ‘ไธŠๆปšๅŠจdiff่ง†ๅ›พ18่กŒ"
+
+#: gitk:3095
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tๅ‘ไธ‹ๆปšๅŠจdiff่ง†ๅ›พ18่กŒ"
+
+#: gitk:3096
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tๆŸฅๆ‰พ"
+
+#: gitk:3097
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\t็งปๅŠจๅˆฐไธ‹ไธ€ๆฌกๆŸฅๆ‰พๅ‘ฝไธญ"
+
+#: gitk:3098
+msgid "<Return>\tMove to next find hit"
+msgstr "<Return>\t\t็งปๅŠจๅˆฐไธ‹ไธ€ๆฌกๆŸฅๆ‰พๅ‘ฝไธญ"
+
+#: gitk:3099
+msgid "g\t\tGo to commit"
+msgstr "g\t\t่ฝฌๅˆฐๆไบค"
+
+#: gitk:3100
+msgid "/\t\tFocus the search box"
+msgstr "/\t\t้€‰ไธญๆœ็ดขๆก†"
+
+#: gitk:3101
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\t็งปๅŠจๅˆฐไธŠไธ€ๆฌกๆŸฅๆ‰พๅ‘ฝไธญ"
+
+#: gitk:3102
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tๆปšๅŠจdiff่ง†ๅ›พๅˆฐไธ‹ไธ€ไธชๆ–‡ไปถ"
+
+#: gitk:3103
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tๅœจdiff่ง†ๅ›พไธญๆŸฅๆ‰พไธ‹ไธ€ๆญคๅ‘ฝไธญ"
+
+#: gitk:3104
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tๅœจdiff่ง†ๅ›พไธญๆŸฅๆ‰พไธŠไธ€ๆฌกๅ‘ฝไธญ"
+
+#: gitk:3105
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\tๅขžๅคงๅญ—ไฝ“ๅคงๅฐ"
+
+#: gitk:3106
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-plus>\tๅขžๅคงๅญ—ไฝ“ๅคงๅฐ"
+
+#: gitk:3107
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\tๅ‡ๅฐๅญ—ไฝ“ๅคงๅฐ"
+
+#: gitk:3108
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-minus>\tๅ‡ๅฐๅญ—ไฝ“ๅคงๅฐ"
+
+#: gitk:3109
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tๆ›ดๆ–ฐ"
+
+#: gitk:3574 gitk:3583
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "ๅˆ›ๅปบไธดๆ—ถ็›ฎๅฝ•ๅ‡บ้”™%s๏ผš"
+
+#: gitk:3596
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "ไปŽ%s่Žทๅ–\"%s\"ๅ‡บ้”™๏ผš"
+
+#: gitk:3659
+msgid "command failed:"
+msgstr "ๆ‰ง่กŒๅ‘ฝไปคๅคฑ่ดฅ๏ผš"
+
+#: gitk:3808
+msgid "No such commit"
+msgstr "ๆ— ๆญคๆไบค"
+
+#: gitk:3822
+msgid "git gui blame: command failed:"
+msgstr "git gui blame๏ผšๆ‰ง่กŒๅ‘ฝไปคๅคฑ่ดฅ๏ผš"
+
+#: gitk:3853
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "ไธ่ƒฝ่ฏปๅ–ๅˆๅนถๅคด(merge head)๏ผš%s"
+
+#: gitk:3861
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "่ฏปๅ–็ดขๅผ•ๅ‡บ้”™๏ผš%s"
+
+#: gitk:3886
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "ไธ่ƒฝๆ‰ง่กŒgit blame๏ผš%s"
+
+#: gitk:3889 gitk:6778
+msgid "Searching"
+msgstr "ๆœ็ดขไธญ"
+
+#: gitk:3921
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "่ฟ่กŒgit blameๅ‡บ้”™๏ผš%s"
+
+#: gitk:3949
+#, tcl-format
+msgid "That line comes from commit %s,  which is not in this view"
+msgstr "ๆญค่กŒๆฅ่‡ชๆไบค%s๏ผŒไธๅœจๆญค่ง†ๅ›พไธญ"
+
+#: gitk:3963
+msgid "External diff viewer failed:"
+msgstr "ๅค–้ƒจdiffๆŸฅ็œ‹ๅ™จๅคฑ่ดฅ๏ผš"
+
+#: gitk:4067
+msgid "All files"
+msgstr "ๆ‰€ๆœ‰ๆ–‡ไปถ"
+
+#: gitk:4091
+msgid "View"
+msgstr "่ง†ๅ›พ"
+
+#: gitk:4094
+msgid "Gitk view definition"
+msgstr "Gitk่ง†ๅ›พๅฎšไน‰"
+
+#: gitk:4098
+msgid "Remember this view"
+msgstr "่ฎฐไฝๆญค่ง†ๅ›พ"
+
+#: gitk:4099
+msgid "References (space separated list):"
+msgstr "ๅผ•็”จ(็ฉบๆ ผๅˆ‡ๅˆ†็š„ๅˆ—่กจ)๏ผš"
+
+#: gitk:4100
+msgid "Branches & tags:"
+msgstr "ๅˆ†ๆ”ฏๅ’Œtags"
+
+#: gitk:4101
+msgid "All refs"
+msgstr "ๆ‰€ๆœ‰ๅผ•็”จ"
+
+#: gitk:4102
+msgid "All (local) branches"
+msgstr "ๆ‰€ๆœ‰(ๆœฌๅœฐ)ๅˆ†ๆ”ฏ"
+
+#: gitk:4103
+msgid "All tags"
+msgstr "ๆ‰€ๆœ‰tag"
+
+#: gitk:4104
+msgid "All remote-tracking branches"
+msgstr "ๆ‰€ๆœ‰่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏ"
+
+#: gitk:4105
+msgid "Commit Info (regular expressions):"
+msgstr "ๆไบคไฟกๆฏ (ๆญฃๅˆ™่กจ่พพๅผ)๏ผš"
+
+#: gitk:4106
+msgid "Author:"
+msgstr "ไฝœ่€…๏ผš"
+
+#: gitk:4107
+msgid "Committer:"
+msgstr "ๆไบค่€…๏ผš"
+
+#: gitk:4108
+msgid "Commit Message:"
+msgstr "ๆไบคไฟกๆฏ๏ผš"
+
+#: gitk:4109
+msgid "Matches all Commit Info criteria"
+msgstr "ๅŒน้…ๆ‰€ๆœ‰ๆไบคไฟกๆฏๆ ‡ๅ‡†"
+
+#: gitk:4110
+msgid "Matches no Commit Info criteria"
+msgstr "ๅŒน้…ๆ— ๆไบคไฟกๆฏๆ ‡ๅ‡†"
+
+#: gitk:4111
+msgid "Changes to Files:"
+msgstr "ๆ–‡ไปถไฟฎๆ”นๅˆ—่กจ๏ผš"
+
+#: gitk:4112
+msgid "Fixed String"
+msgstr "ๅ›บๅฎšๅญ—็ฌฆไธฒ"
+
+#: gitk:4113
+msgid "Regular Expression"
+msgstr "ๆญฃๅˆ™่กจ่พพๅผ๏ผš"
+
+#: gitk:4114
+msgid "Search string:"
+msgstr "ๆœ็ดขๅญ—็ฌฆไธฒ๏ผš"
+
+#: gitk:4115
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr "ๆไบคๆ—ฅๆœŸ (\"2ๆ˜ŸๆœŸไน‹ๅ‰\", \"2009-03-17 15:27:38\", \"5ๆœˆ 17, 2009 15:27:38\"):"
+
+#: gitk:4116
+msgid "Since:"
+msgstr "่‡ช๏ผš"
+
+#: gitk:4117
+msgid "Until:"
+msgstr "ๅˆฐ๏ผš"
+
+#: gitk:4118
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "้™ๅˆถ ไธ”/ๆˆ– ่ทณ่ฟ‡ไธ€ๅฎšๆ•ฐ้‡็š„็‰ˆๆœฌ(ๆญฃๆ•ดๆ•ฐ)๏ผš"
+
+#: gitk:4119
+msgid "Number to show:"
+msgstr "ๆ˜พ็คบๆ•ฐ้‡๏ผš"
+
+#: gitk:4120
+msgid "Number to skip:"
+msgstr "่ทณ่ฟ‡ๆ•ฐ้‡๏ผš"
+
+#: gitk:4121
+msgid "Miscellaneous options:"
+msgstr "ๅ…ถไป–้€‰้กน๏ผš"
+
+#: gitk:4122
+msgid "Strictly sort by date"
+msgstr "ไธฅๆ ผๆŒ‰ๆ—ฅๆœŸๆ•ด็†"
+
+#: gitk:4123
+msgid "Mark branch sides"
+msgstr "ๆ ‡่ฎฐๅˆ†ๆ”ฏ่พน็•Œ"
+
+#: gitk:4124
+msgid "Limit to first parent"
+msgstr "้™ๅˆถๅˆฐ็ฌฌไธ€ไธช็ˆถๆไบค"
+
+#: gitk:4125
+msgid "Simple history"
+msgstr "็ฎ€ๆ˜“ๅŽ†ๅฒ"
+
+#: gitk:4126
+msgid "Additional arguments to git log:"
+msgstr "git logๅ‘ฝไปค็š„้ขๅค–ๅ‚ๆ•ฐ๏ผš"
+
+#: gitk:4127
+msgid "Enter files and directories to include, one per line:"
+msgstr "่พ“ๅ…ฅๆ–‡ไปถๅ’Œๆ–‡ไปถๅคนๆฅๅผ•็”จ๏ผŒๆฏ่กŒไธ€ไธช๏ผš"
+
+#: gitk:4128
+msgid "Command to generate more commits to include:"
+msgstr "ๅ‘ฝไปคไบง็”Ÿๆ›ดๅคš็š„ๆไบคๆฅๅผ•็”จ๏ผš"
+
+#: gitk:4252
+msgid "Gitk: edit view"
+msgstr "Gitk: ็ผ–่พ‘่ง†ๅ›พ"
+
+#: gitk:4260
+msgid "-- criteria for selecting revisions"
+msgstr "-- ็”จๆฅ้€‰ๆ‹ฉ็‰ˆๆœฌ็š„่ง„ๅˆ™"
+
+#: gitk:4265
+msgid "View Name"
+msgstr "่ง†ๅ›พๅ็งฐ"
+
+#: gitk:4340
+msgid "Apply (F5)"
+msgstr "ๅบ”็”จ(F5)"
+
+#: gitk:4378
+msgid "Error in commit selection arguments:"
+msgstr "ๆไบค้€‰ๆ‹ฉๅ‚ๆ•ฐ้”™่ฏฏ๏ผš"
+
+#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525
+msgid "None"
+msgstr "ๆ— "
+
+#: gitk:5045 gitk:5050
+msgid "Descendant"
+msgstr "ๅญๆไบค"
+
+#: gitk:5046
+msgid "Not descendant"
+msgstr "้žๅญๆไบค"
+
+#: gitk:5053 gitk:5058
+msgid "Ancestor"
+msgstr "็ˆถๆไบค"
+
+#: gitk:5054
+msgid "Not ancestor"
+msgstr "้ž็ˆถๆไบค"
+
+#: gitk:5348
+msgid "Local changes checked in to index but not committed"
+msgstr "ๅทฒๆทปๅŠ ๅˆฐ็ดขๅผ•ไฝ†ๆœชๆไบค็š„ไฟฎๆ”น"
+
+#: gitk:5384
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "ๆœชๆทปๅŠ ๅˆฐ็ดขๅผ•ไธ”ๆœชๆไบค็š„ไฟฎๆ”น"
+
+#: gitk:7158
+msgid "and many more"
+msgstr "ๆ›ดๅคš"
+
+#: gitk:7161
+msgid "many"
+msgstr "ๅพˆๅคš"
+
+#: gitk:7352
+msgid "Tags:"
+msgstr "Tags:"
+
+#: gitk:7369 gitk:7375 gitk:8854
+msgid "Parent"
+msgstr "็ˆถ่Š‚็‚น"
+
+#: gitk:7380
+msgid "Child"
+msgstr "ๅญ่Š‚็‚น"
+
+#: gitk:7389
+msgid "Branch"
+msgstr "ๅˆ†ๆ”ฏ"
+
+#: gitk:7392
+msgid "Follows"
+msgstr "ไน‹ๅŽ็š„tag"
+
+#: gitk:7395
+msgid "Precedes"
+msgstr "ไน‹ๅ‰็š„tag"
+
+#: gitk:7990
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "่Žทๅ–ๅทฎๅผ‚้”™่ฏฏ๏ผš%s"
+
+#: gitk:8679
+msgid "Goto:"
+msgstr "่ฝฌๅˆฐ๏ผš"
+
+#: gitk:8700
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "็Ÿญๆ ผๅผ็š„SHA1ๆไบคๅท%sไธๆ˜Ž็กฎใ€ๆœ‰ๆญงไน‰"
+
+#: gitk:8707
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "็‰ˆๆœฌ%sๆœช็Ÿฅ"
+
+#: gitk:8717
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "ๆไบคๅท(SHA1 id)%sๆœช็Ÿฅ"
+
+#: gitk:8719
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "็‰ˆๆœฌ%sไธๅœจๅฝ“ๅ‰่ง†ๅ›พไธญ"
+
+#: gitk:8861 gitk:8876
+msgid "Date"
+msgstr "ๆ—ฅๆœŸ"
+
+#: gitk:8864
+msgid "Children"
+msgstr "ๅญ่Š‚็‚น"
+
+#: gitk:8927
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "้‡็ฝฎๅˆ†ๆ”ฏ%sๅˆฐๆญคๅค„"
+
+#: gitk:8929
+msgid "Detached head: can't reset"
+msgstr "ๅˆ†็ฆป็š„ๅคด(head)๏ผšไธ่ƒฝ้‡็ฝฎ(reset)"
+
+#: gitk:9034 gitk:9040
+msgid "Skipping merge commit "
+msgstr "่ทณ่ฟ‡ๅˆๅนถๆไบค"
+
+#: gitk:9049 gitk:9054
+msgid "Error getting patch ID for "
+msgstr "่Žทๅ–่กฅไธIDๅ‡บ้”™"
+
+#: gitk:9050 gitk:9055
+msgid " - stopping\n"
+msgstr " โ€” ๅœๆญขไธญ\n"
+
+#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094
+msgid "Commit "
+msgstr "ๆไบค"
+
+#: gitk:9064
+msgid ""
+" is the same patch as\n"
+"       "
+msgstr " ๆ˜ฏ็›ธๅŒ็š„่กฅไธ(patch)\n       "
+
+#: gitk:9072
+msgid ""
+" differs from\n"
+"       "
+msgstr " ๅทฎๅผ‚ๆฅ่‡ช\n       "
+
+#: gitk:9074
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr "ๆไบค็š„ๅทฎๅผ‚(Diff)๏ผš\n\n"
+
+#: gitk:9086 gitk:9095
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr "ๆœ‰%sๅญ่Š‚็‚น โ€” ๅœๆญขไธญ\n"
+
+#: gitk:9114
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "ๅ†™ๅ…ฅๆไบคๅˆฐๆ–‡ไปถๅ‡บ้”™๏ผš%s"
+
+#: gitk:9120
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "ๆฏ”่พƒๆไบคๅทฎๅผ‚ๅ‡บ้”™๏ผš%s"
+
+#: gitk:9166
+msgid "Top"
+msgstr "้กถ้ƒจ"
+
+#: gitk:9167
+msgid "From"
+msgstr "ไปŽ"
+
+#: gitk:9172
+msgid "To"
+msgstr "ๅˆฐ"
+
+#: gitk:9196
+msgid "Generate patch"
+msgstr "็”Ÿๆˆ่กฅไธ(patch)"
+
+#: gitk:9198
+msgid "From:"
+msgstr "ไปŽ๏ผš"
+
+#: gitk:9207
+msgid "To:"
+msgstr "ๅˆฐ๏ผš"
+
+#: gitk:9216
+msgid "Reverse"
+msgstr "ๅๅ‘(Reverse)"
+
+#: gitk:9218 gitk:9428
+msgid "Output file:"
+msgstr "่พ“ๅ‡บๆ–‡ไปถ๏ผš"
+
+#: gitk:9224
+msgid "Generate"
+msgstr "็”Ÿๆˆ"
+
+#: gitk:9262
+msgid "Error creating patch:"
+msgstr "ๅˆ›ๅปบ่กฅไธ(patch)ๅ‡บ้”™๏ผš"
+
+#: gitk:9285 gitk:9416 gitk:9504
+msgid "ID:"
+msgstr "ID:"
+
+#: gitk:9294
+msgid "Tag name:"
+msgstr "Tagๅ็งฐ๏ผš"
+
+#: gitk:9297
+msgid "Tag message is optional"
+msgstr "Tagไฟกๆฏๆ˜ฏๅฏ้€‰็š„"
+
+#: gitk:9299
+msgid "Tag message:"
+msgstr "Tagไฟกๆฏ๏ผš"
+
+#: gitk:9303 gitk:9474
+msgid "Create"
+msgstr "ๅˆ›ๅปบ"
+
+#: gitk:9321
+msgid "No tag name specified"
+msgstr "ๆœชๆŒ‡ๅฎštagๅ็งฐ"
+
+#: gitk:9325
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Tag\"%s\"ๅทฒ็ปๅญ˜ๅœจ"
+
+#: gitk:9335
+msgid "Error creating tag:"
+msgstr "ๅˆ›ๅปบtagๅ‡บ้”™๏ผš"
+
+#: gitk:9425
+msgid "Command:"
+msgstr "ๅ‘ฝไปค๏ผš"
+
+#: gitk:9433
+msgid "Write"
+msgstr "ๅ†™ๅ…ฅ"
+
+#: gitk:9451
+msgid "Error writing commit:"
+msgstr "ๅ†™ๅ…ฅๆไบคๅ‡บ้”™๏ผš"
+
+#: gitk:9473
+msgid "Create branch"
+msgstr "ๅˆ›ๅปบๅˆ†ๆ”ฏ"
+
+#: gitk:9489
+#, tcl-format
+msgid "Rename branch %s"
+msgstr "้‡ๅ‘ฝๅๅˆ†ๆ”ฏ%s"
+
+#: gitk:9490
+msgid "Rename"
+msgstr "้‡ๅ‘ฝๅ"
+
+#: gitk:9514
+msgid "Name:"
+msgstr "ๅ็งฐ๏ผš"
+
+#: gitk:9538
+msgid "Please specify a name for the new branch"
+msgstr "่ฏทๆŒ‡ๅฎšๆ–ฐๅˆ†ๆ”ฏ็š„ๅ็งฐ"
+
+#: gitk:9543
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "ๅˆ†ๆ”ฏ\"%s\"ๅทฒ็ปๅญ˜ๅœจใ€‚่ฆ†็›–ๅฎƒ๏ผŸ"
+
+#: gitk:9587
+msgid "Please specify a new name for the branch"
+msgstr "่ฏท้‡ๆ–ฐๆŒ‡ๅฎšๆ–ฐๅˆ†ๆ”ฏ็š„ๅ็งฐ"
+
+#: gitk:9650
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr "ๆไบค%sๅทฒ็ปๅญ˜ๅœจไบŽๅˆ†ๆ”ฏ%sใ€‚็กฎๅฎš้‡ๆ–ฐๅบ”็”จๅฎƒ๏ผŸ"
+
+#: gitk:9655
+msgid "Cherry-picking"
+msgstr "ๆ‰“่กฅไธไธญ(Cherry-picking)"
+
+#: gitk:9664
+#, tcl-format
+msgid ""
+"Cherry-pick failed because of local changes to file '%s'.\n"
+"Please commit, reset or stash your changes and try again."
+msgstr "ๆ‰“่กฅไธ(Cherry-pick)ๅคฑ่ดฅ๏ผŒๅ› ไธบๆœฌๅœฐไฟฎๆ”นไบ†ๆ–‡ไปถ\"%s\"ใ€‚\n่ฏทๆไบค(commit)ใ€้‡็ฝฎ(reset)ๆˆ–ๆš‚ๅญ˜(stash)ไฟฎๆ”นๅŽ้‡่ฏ•ใ€‚"
+
+#: gitk:9670
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr "ๆ‰“่กฅไธ(Cherry-pick)ๅคฑ่ดฅๅ› ไธบๅˆๅนถๅ†ฒ็ชใ€‚\nไฝ ๆ˜ฏๅฆๅธŒๆœ›่ฟ่กŒgit citool ๆฅ่งฃๅ†ณๅ†ฒ็ช๏ผŸ"
+
+#: gitk:9686 gitk:9744
+msgid "No changes committed"
+msgstr "ๆ— ๅทฒ็ปๆไบค็š„ไฟฎๆ”น"
+
+#: gitk:9713
+#, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr "ๆไบค%sไธๅŒ…ๅซๅœจๅˆ†ๆ”ฏ%sไธญ๏ผŒ็กฎ่ฎคๅ›žๆปš(revert)ๅฎƒ๏ผŸ"
+
+#: gitk:9718
+msgid "Reverting"
+msgstr "ๅ›žๆปšไธญ(Reverting)"
+
+#: gitk:9726
+#, tcl-format
+msgid ""
+"Revert failed because of local changes to the following files:%s Please "
+"commit, reset or stash  your changes and try again."
+msgstr "ๅ›žๆปš(revert)ๅคฑ่ดฅ๏ผŒๅ› ไธบๅฆ‚ไธ‹็š„ๆœฌๅœฐๆ–‡ไปถไฟฎๆ”น๏ผš%s\n่ฏทๆไบค(commit)ใ€้‡็ฝฎ(reset)ๆˆ–่€…ๆš‚ๅญ˜(stash)ๆ”นๅ˜ๅŽ้‡่ฏ•ใ€‚"
+
+#: gitk:9730
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr "ๅ›žๆปš(revert)ๅคฑ่ดฅ๏ผŒๅ› ไธบๅˆๅนถๅ†ฒ็ชใ€‚\nไฝ ๆ˜ฏๅฆๅธŒๆœ›่ฟ่กŒgit citoolๆฅ่งฃๅ†ณๅ†ฒ็ช๏ผŸ"
+
+#: gitk:9773
+msgid "Confirm reset"
+msgstr "็กฎ่ฎค้‡็ฝฎ(reset)"
+
+#: gitk:9775
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "้‡็ฝฎ(reset)ๅˆ†ๆ”ฏ%sๅˆฐ%s๏ผŸ"
+
+#: gitk:9777
+msgid "Reset type:"
+msgstr "้‡็ฝฎ(reset)็ฑปๅž‹๏ผš"
+
+#: gitk:9780
+msgid "Soft: Leave working tree and index untouched"
+msgstr "่ฝฏๆ€ง๏ผš็ฆปๅผ€ๅทฅไฝœๆ ‘๏ผŒ็ดขๅผ•ๆœชๆ”นๅ˜"
+
+#: gitk:9783
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr "ๆททๅˆ๏ผš็ฆปๅผ€ๅทฅไฝœๆ ‘(ๆœชๆ”นๅ˜)๏ผŒ็ดขๅผ•้‡็ฝฎ"
+
+#: gitk:9786
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr "็กฌๆ€ง๏ผš้‡็ฝฎๅทฅไฝœๆ ‘ๅ’Œ็ดขๅผ•\n(ไธขๅผƒๆ‰€ๆœ‰็š„ๆœฌๅœฐไฟฎๆ”น)"
+
+#: gitk:9803
+msgid "Resetting"
+msgstr "้‡็ฝฎไธญ(Resetting)"
+
+#: gitk:9876
+#, tcl-format
+msgid "A local branch named %s exists already"
+msgstr "ๆœฌๅœฐๅˆ†ๆ”ฏ%sๅทฒ็ปๅญ˜ๅœจ"
+
+#: gitk:9884
+msgid "Checking out"
+msgstr "ๆฃ€ๅ‡บไธญ(Checking out)"
+
+#: gitk:9943
+msgid "Cannot delete the currently checked-out branch"
+msgstr "ไธ่ƒฝๅˆ ้™คๅฝ“ๅ‰ๆฃ€ๅ‡บ(checkout)ๅˆ†ๆ”ฏ"
+
+#: gitk:9949
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr "ๅœจๅˆ†ๆ”ฏ%sไธŠ็š„ๆไบคไธๅœจๅ…ถไป–ไปปไฝ•ๅˆ†ๆ”ฏไธŠใ€‚\n็กฎ่ฎคๅˆ ้™คๅˆ†ๆ”ฏ%s๏ผŸ"
+
+#: gitk:9980
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Tagsๅ’ŒๅคดๆŒ‡้’ˆ(heads)๏ผš%s"
+
+#: gitk:9997
+msgid "Filter"
+msgstr "่ฟ‡ๆปคๅ™จ"
+
+#: gitk:10293
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr "่ฏปๅ–ๆไบคๆ‹“ๆ‰‘ไฟกๆฏๅ‡บ้”™๏ผ›ๅˆ†ๆ”ฏๅ’Œไน‹ๅ‰/ไน‹ๅŽ็š„tagไฟกๆฏๅฐ†ไธ่ƒฝๅฎŒๆˆใ€‚"
+
+#: gitk:11270
+msgid "Tag"
+msgstr "ๆ ‡็ญพ(Tag)"
+
+#: gitk:11274
+msgid "Id"
+msgstr "Id"
+
+#: gitk:11357
+msgid "Gitk font chooser"
+msgstr "Gitkๅญ—ไฝ“้€‰ๆ‹ฉ"
+
+#: gitk:11374
+msgid "B"
+msgstr "็ฒ—ไฝ“"
+
+#: gitk:11377
+msgid "I"
+msgstr "ๆ–œไฝ“"
+
+#: gitk:11495
+msgid "Commit list display options"
+msgstr "ๆไบคๅˆ—่กจๅฑ•็คบ้€‰้กน"
+
+#: gitk:11498
+msgid "Maximum graph width (lines)"
+msgstr "ๆœ€ๅคงๅ›พๅฎฝๅบฆ(่กŒๆ•ฐ)"
+
+#: gitk:11502
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "ๆœ€ๅคงๅ›พๅฎฝๅบฆ(%็ช—ๅฃ็™พๅˆ†ๆฏ”)"
+
+#: gitk:11505
+msgid "Show local changes"
+msgstr "ๆ˜พ็คบๆœฌๅœฐไฟฎๆ”น"
+
+#: gitk:11508
+msgid "Auto-select SHA1 (length)"
+msgstr "่‡ชๅŠจ้€‰ๆ‹ฉSHA1(้•ฟๅบฆ)"
+
+#: gitk:11512
+msgid "Hide remote refs"
+msgstr "้š่—่ฟœ็จ‹ๅผ•็”จ"
+
+#: gitk:11516
+msgid "Diff display options"
+msgstr "ๅทฎๅผ‚(Diff)ๅฑ•็คบ้€‰้กน"
+
+#: gitk:11518
+msgid "Tab spacing"
+msgstr "ๅˆถ่กจ็ฌฆๅฎฝๅบฆ"
+
+#: gitk:11521
+msgid "Display nearby tags/heads"
+msgstr "ๆ˜พ็คบไธด่ฟ‘็š„tags/heads"
+
+#: gitk:11524
+msgid "Maximum # tags/heads to show"
+msgstr "ๆœ€ๅคงtags/headsๅฑ•็คบๆ•ฐ้‡"
+
+#: gitk:11527
+msgid "Limit diffs to listed paths"
+msgstr "diffไธญๅˆ—ๅ‡บๆ–‡ไปถ้™ๅˆถ"
+
+#: gitk:11530
+msgid "Support per-file encodings"
+msgstr "ๅ•็‹ฌๆ–‡ไปถ็ผ–็ ๆ”ฏๆŒ"
+
+#: gitk:11536 gitk:11683
+msgid "External diff tool"
+msgstr "ๅค–้ƒจๅทฎๅผ‚(diff)ๅทฅๅ…ท"
+
+#: gitk:11537
+msgid "Choose..."
+msgstr "้€‰ๆ‹ฉ..."
+
+#: gitk:11542
+msgid "General options"
+msgstr "ๅธธ่ง„้€‰้กน"
+
+#: gitk:11545
+msgid "Use themed widgets"
+msgstr "ไฝฟ็”จไธป้ข˜ๅฐ้ƒจไปถ"
+
+#: gitk:11547
+msgid "(change requires restart)"
+msgstr "(้œ€้‡ๅฏ็”Ÿๆ•ˆ)"
+
+#: gitk:11549
+msgid "(currently unavailable)"
+msgstr "(ๅฝ“ๅ‰ไธๅฏ็”จ)"
+
+#: gitk:11560
+msgid "Colors: press to choose"
+msgstr "้ขœ่‰ฒ๏ผš็‚นๅ‡ปๆฅ้€‰ๆ‹ฉ"
+
+#: gitk:11563
+msgid "Interface"
+msgstr "็•Œ้ข"
+
+#: gitk:11564
+msgid "interface"
+msgstr "็•Œ้ข"
+
+#: gitk:11567
+msgid "Background"
+msgstr "่ƒŒๆ™ฏ"
+
+#: gitk:11568 gitk:11598
+msgid "background"
+msgstr "่ƒŒๆ™ฏ"
+
+#: gitk:11571
+msgid "Foreground"
+msgstr "ๅ‰ๆ™ฏ"
+
+#: gitk:11572
+msgid "foreground"
+msgstr "ๅ‰ๆ™ฏ"
+
+#: gitk:11575
+msgid "Diff: old lines"
+msgstr "ๅทฎๅผ‚(Diff)๏ผš่€ไปฃ็ ่กŒ"
+
+#: gitk:11576
+msgid "diff old lines"
+msgstr "ๅทฎๅผ‚(diff)่€ไปฃ็ ่กŒ"
+
+#: gitk:11580
+msgid "Diff: new lines"
+msgstr "ๅทฎๅผ‚(Diff)๏ผšๆ–ฐไปฃ็ ่กŒ"
+
+#: gitk:11581
+msgid "diff new lines"
+msgstr "ๅทฎๅผ‚(diff)ๆ–ฐไปฃ็ ่กŒ"
+
+#: gitk:11585
+msgid "Diff: hunk header"
+msgstr "ๅทฎๅผ‚(Diff)๏ผš่กฅไธ็‰‡ๆฎตๅคดไฟกๆฏ"
+
+#: gitk:11587
+msgid "diff hunk header"
+msgstr "ๅทฎๅผ‚(diff)่กฅไธ็‰‡ๆฎตๅคดไฟกๆฏ"
+
+#: gitk:11591
+msgid "Marked line bg"
+msgstr "ๅทฒๆ ‡่ฎฐไปฃ็ ่กŒ่ƒŒๆ™ฏ"
+
+#: gitk:11593
+msgid "marked line background"
+msgstr "ๅทฒๆ ‡่ฎฐไปฃ็ ่กŒ่ƒŒๆ™ฏ"
+
+#: gitk:11597
+msgid "Select bg"
+msgstr "้€‰ๆ‹ฉ่ƒŒๆ™ฏ"
+
+#: gitk:11606
+msgid "Fonts: press to choose"
+msgstr "ๅญ—ไฝ“๏ผš็‚นๅ‡ปๆฅ้€‰ๆ‹ฉ"
+
+#: gitk:11608
+msgid "Main font"
+msgstr "ไธปๅญ—ไฝ“"
+
+#: gitk:11609
+msgid "Diff display font"
+msgstr "ๅทฎๅผ‚(Diff)ๆ˜พ็คบๅญ—ไฝ“"
+
+#: gitk:11610
+msgid "User interface font"
+msgstr "็”จๆˆท็•Œ้ขๅญ—ไฝ“"
+
+#: gitk:11632
+msgid "Gitk preferences"
+msgstr "Gitkๅๅฅฝ่ฎพ็ฝฎ"
+
+#: gitk:11641
+msgid "General"
+msgstr "ๅธธ่ง„"
+
+#: gitk:11642
+msgid "Colors"
+msgstr "้ขœ่‰ฒ"
+
+#: gitk:11643
+msgid "Fonts"
+msgstr "ๅญ—ไฝ“"
+
+#: gitk:11693
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk๏ผš้€‰ๆ‹ฉ้ขœ่‰ฒ็”จไบŽ%s"
+
+#: gitk:12206
+msgid ""
+"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
+" Gitk requires at least Tcl/Tk 8.4."
+msgstr "ๅฏนไธ่ตท๏ผŒgitkไธ่ƒฝ่ฟ่กŒๅœจๅฝ“ๅ‰็‰ˆๆœฌ็š„Tcl/Tkไธญใ€‚\nGitk่ฟ่กŒ้œ€่ฆๆœ€ไฝŽ็‰ˆๆœฌไธบTcl/Tk8.4ใ€‚"
+
+#: gitk:12416
+msgid "Cannot find a git repository here."
+msgstr "ๅœจๆญคไฝ็ฝฎๆœชๅ‘็Žฐgitไป“ๅบ“ใ€‚"
+
+#: gitk:12463
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "ไธๆ˜Ž็กฎๆœ‰ๆญงไน‰็š„ๅ‚ๆ•ฐ\"%s\"๏ผš็‰ˆๆœฌๅ’Œๆ–‡ไปถๅ็งฐ"
+
+#: gitk:12475
+msgid "Bad arguments to gitk:"
+msgstr "่ฟ่กŒgitkๅ‚ๆ•ฐ้”™่ฏฏ๏ผš"
diff --git a/third_party/git/gitweb/gitweb.perl b/third_party/git/gitweb/gitweb.perl
index 7fef19fe591c..65a3a9e62e80 100755
--- a/third_party/git/gitweb/gitweb.perl
+++ b/third_party/git/gitweb/gitweb.perl
@@ -741,7 +741,7 @@ sub evaluate_gitweb_config {
 	$GITWEB_CONFIG_SYSTEM = "" if ($GITWEB_CONFIG_SYSTEM eq $GITWEB_CONFIG_COMMON);
 
 	# Common system-wide settings for convenience.
-	# Those settings can be ovverriden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM.
+	# Those settings can be overridden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM.
 	read_config_file($GITWEB_CONFIG_COMMON);
 
 	# Use first config file that exists.  This means use the per-instance
@@ -1657,15 +1657,15 @@ sub quot_cec {
 	my $cntrl = shift;
 	my %opts = @_;
 	my %es = ( # character escape codes, aka escape sequences
-		"\t" => '\t',   # tab            (HT)
-		"\n" => '\n',   # line feed      (LF)
-		"\r" => '\r',   # carrige return (CR)
-		"\f" => '\f',   # form feed      (FF)
-		"\b" => '\b',   # backspace      (BS)
-		"\a" => '\a',   # alarm (bell)   (BEL)
-		"\e" => '\e',   # escape         (ESC)
-		"\013" => '\v', # vertical tab   (VT)
-		"\000" => '\0', # nul character  (NUL)
+		"\t" => '\t',   # tab             (HT)
+		"\n" => '\n',   # line feed       (LF)
+		"\r" => '\r',   # carriage return (CR)
+		"\f" => '\f',   # form feed       (FF)
+		"\b" => '\b',   # backspace       (BS)
+		"\a" => '\a',   # alarm (bell)    (BEL)
+		"\e" => '\e',   # escape          (ESC)
+		"\013" => '\v', # vertical tab    (VT)
+		"\000" => '\0', # nul character   (NUL)
 	);
 	my $chr = ( (exists $es{$cntrl})
 		    ? $es{$cntrl}
@@ -4048,7 +4048,7 @@ sub print_feed_meta {
 
 			$href_params{'extra_options'} = undef;
 			$href_params{'action'} = $type;
-			$link_attr{'-href'} = href(%href_params);
+			$link_attr{'-href'} = esc_attr(href(%href_params));
 			print "<link ".
 			      "rel=\"$link_attr{'-rel'}\" ".
 			      "title=\"$link_attr{'-title'}\" ".
@@ -4057,7 +4057,7 @@ sub print_feed_meta {
 			      "/>\n";
 
 			$href_params{'extra_options'} = '--no-merges';
-			$link_attr{'-href'} = href(%href_params);
+			$link_attr{'-href'} = esc_attr(href(%href_params));
 			$link_attr{'-title'} .= ' (no merges)';
 			print "<link ".
 			      "rel=\"$link_attr{'-rel'}\" ".
@@ -4070,10 +4070,12 @@ sub print_feed_meta {
 	} else {
 		printf('<link rel="alternate" title="%s projects list" '.
 		       'href="%s" type="text/plain; charset=utf-8" />'."\n",
-		       esc_attr($site_name), href(project=>undef, action=>"project_index"));
+		       esc_attr($site_name),
+		       esc_attr(href(project=>undef, action=>"project_index")));
 		printf('<link rel="alternate" title="%s projects feeds" '.
 		       'href="%s" type="text/x-opml" />'."\n",
-		       esc_attr($site_name), href(project=>undef, action=>"opml"));
+		       esc_attr($site_name),
+		       esc_attr(href(project=>undef, action=>"opml")));
 	}
 }
 
@@ -4287,8 +4289,8 @@ sub git_footer_html {
 	if (defined $action &&
 	    $action eq 'blame_incremental') {
 		print qq!<script type="text/javascript">\n!.
-		      qq!startBlame("!. href(action=>"blame_data", -replay=>1) .qq!",\n!.
-		      qq!           "!. href() .qq!");\n!.
+		      qq!startBlame("!. esc_attr(href(action=>"blame_data", -replay=>1)) .qq!",\n!.
+		      qq!           "!. esc_attr(href()) .qq!");\n!.
 		      qq!</script>\n!;
 	} else {
 		my ($jstimezone, $tz_cookie, $datetime_class) =
@@ -5283,7 +5285,7 @@ sub format_ctx_rem_add_lines {
 		#    + c
 		#   +  d
 		#
-		# Otherwise the highlightling would be confusing.
+		# Otherwise the highlighting would be confusing.
 		if ($is_combined) {
 			for (my $i = 0; $i < @$add; $i++) {
 				my $prefix_rem = substr($rem->[$i], 0, $num_parents);
@@ -7155,8 +7157,8 @@ sub git_blob {
 			print qq! alt="!.esc_attr($file_name).qq!" title="!.esc_attr($file_name).qq!"!;
 		}
 		print qq! src="! .
-		      href(action=>"blob_plain", hash=>$hash,
-		           hash_base=>$hash_base, file_name=>$file_name) .
+		      esc_attr(href(action=>"blob_plain", hash=>$hash,
+		           hash_base=>$hash_base, file_name=>$file_name)) .
 		      qq!" />\n!;
 	} else {
 		my $nr;
@@ -8239,6 +8241,7 @@ sub git_feed {
 	} else {
 		$alt_url = href(-full=>1, action=>"summary");
 	}
+	$alt_url = esc_attr($alt_url);
 	print qq!<?xml version="1.0" encoding="utf-8"?>\n!;
 	if ($format eq 'rss') {
 		print <<XML;
@@ -8276,7 +8279,7 @@ XML
 		      $alt_url . '" />' . "\n" .
 		      '<link rel="self" type="' . $content_type . '" href="' .
 		      $cgi->self_url() . '" />' . "\n" .
-		      "<id>" . href(-full=>1) . "</id>\n" .
+		      "<id>" . esc_url(href(-full=>1)) . "</id>\n" .
 		      # use project owner for feed author
 		      "<author><name>$owner</name></author>\n";
 		if (defined $favicon) {
@@ -8322,7 +8325,7 @@ XML
 			      "<author>" . esc_html($co{'author'}) . "</author>\n" .
 			      "<pubDate>$cd{'rfc2822'}</pubDate>\n" .
 			      "<guid isPermaLink=\"true\">$co_url</guid>\n" .
-			      "<link>$co_url</link>\n" .
+			      "<link>" . esc_html($co_url) . "</link>\n" .
 			      "<description>" . esc_html($co{'title'}) . "</description>\n" .
 			      "<content:encoded>" .
 			      "<![CDATA[\n";
@@ -8344,8 +8347,8 @@ XML
 			}
 			print "</contributor>\n" .
 			      "<published>$cd{'iso-8601'}</published>\n" .
-			      "<link rel=\"alternate\" type=\"text/html\" href=\"$co_url\" />\n" .
-			      "<id>$co_url</id>\n" .
+			      "<link rel=\"alternate\" type=\"text/html\" href=\"" . esc_attr($co_url) . "\" />\n" .
+			      "<id>" . esc_html($co_url) . "</id>\n" .
 			      "<content type=\"xhtml\" xml:base=\"" . esc_url($my_url) . "\">\n" .
 			      "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n";
 		}
@@ -8452,8 +8455,8 @@ XML
 		}
 
 		my $path = esc_html(chop_str($proj{'path'}, 25, 5));
-		my $rss  = href('project' => $proj{'path'}, 'action' => 'rss', -full => 1);
-		my $html = href('project' => $proj{'path'}, 'action' => 'summary', -full => 1);
+		my $rss  = esc_attr(href('project' => $proj{'path'}, 'action' => 'rss', -full => 1));
+		my $html = esc_attr(href('project' => $proj{'path'}, 'action' => 'summary', -full => 1));
 		print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
 	}
 	print <<XML;
diff --git a/third_party/git/gitweb/static/js/blame_incremental.js b/third_party/git/gitweb/static/js/blame_incremental.js
index db6eb505846a..e100d8206b52 100644
--- a/third_party/git/gitweb/static/js/blame_incremental.js
+++ b/third_party/git/gitweb/static/js/blame_incremental.js
@@ -484,7 +484,7 @@ function processBlameLines(lines) {
 			case 'previous':
 				curCommit.nprevious++;
 				// store only first 'previous' header
-				if (!'previous' in curCommit) {
+				if (!('previous' in curCommit)) {
 					var parts = data.split(' ', 2);
 					curCommit.previous    = parts[0];
 					curCommit.file_parent = unquote(parts[1]);
diff --git a/third_party/git/gpg-interface.c b/third_party/git/gpg-interface.c
index d60115ca404e..165274d74a84 100644
--- a/third_party/git/gpg-interface.c
+++ b/third_party/git/gpg-interface.c
@@ -7,6 +7,8 @@
 #include "tempfile.h"
 
 static char *configured_signing_key;
+static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;
+
 struct gpg_format {
 	const char *name;
 	const char *program;
@@ -85,6 +87,8 @@ void signature_check_clear(struct signature_check *sigc)
 #define GPG_STATUS_UID		(1<<2)
 /* The status includes key fingerprints */
 #define GPG_STATUS_FINGERPRINT	(1<<3)
+/* The status includes trust level */
+#define GPG_STATUS_TRUST_LEVEL	(1<<4)
 
 /* Short-hand for standard exclusive *SIG status with keyid & UID */
 #define GPG_STATUS_STDSIG	(GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID|GPG_STATUS_UID)
@@ -96,15 +100,49 @@ static struct {
 } sigcheck_gpg_status[] = {
 	{ 'G', "GOODSIG ", GPG_STATUS_STDSIG },
 	{ 'B', "BADSIG ", GPG_STATUS_STDSIG },
-	{ 'U', "TRUST_NEVER", 0 },
-	{ 'U', "TRUST_UNDEFINED", 0 },
 	{ 'E', "ERRSIG ", GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID },
 	{ 'X', "EXPSIG ", GPG_STATUS_STDSIG },
 	{ 'Y', "EXPKEYSIG ", GPG_STATUS_STDSIG },
 	{ 'R', "REVKEYSIG ", GPG_STATUS_STDSIG },
 	{ 0, "VALIDSIG ", GPG_STATUS_FINGERPRINT },
+	{ 0, "TRUST_", GPG_STATUS_TRUST_LEVEL },
+};
+
+static struct {
+	const char *key;
+	enum signature_trust_level value;
+} sigcheck_gpg_trust_level[] = {
+	{ "UNDEFINED", TRUST_UNDEFINED },
+	{ "NEVER", TRUST_NEVER },
+	{ "MARGINAL", TRUST_MARGINAL },
+	{ "FULLY", TRUST_FULLY },
+	{ "ULTIMATE", TRUST_ULTIMATE },
 };
 
+static void replace_cstring(char **field, const char *line, const char *next)
+{
+	free(*field);
+
+	if (line && next)
+		*field = xmemdupz(line, next - line);
+	else
+		*field = NULL;
+}
+
+static int parse_gpg_trust_level(const char *level,
+				 enum signature_trust_level *res)
+{
+	size_t i;
+
+	for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_trust_level); i++) {
+		if (!strcmp(sigcheck_gpg_trust_level[i].key, level)) {
+			*res = sigcheck_gpg_trust_level[i].value;
+			return 0;
+		}
+	}
+	return 1;
+}
+
 static void parse_gpg_output(struct signature_check *sigc)
 {
 	const char *buf = sigc->gpg_status;
@@ -126,9 +164,18 @@ static void parse_gpg_output(struct signature_check *sigc)
 		/* Iterate over all search strings */
 		for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
 			if (skip_prefix(line, sigcheck_gpg_status[i].check, &line)) {
+				/*
+				 * GOODSIG, BADSIG etc. can occur only once for
+				 * each signature.  Therefore, if we had more
+				 * than one then we're dealing with multiple
+				 * signatures.  We don't support them
+				 * currently, and they're rather hard to
+				 * create, so something is likely fishy and we
+				 * should reject them altogether.
+				 */
 				if (sigcheck_gpg_status[i].flags & GPG_STATUS_EXCLUSIVE) {
 					if (seen_exclusive_status++)
-						goto found_duplicate_status;
+						goto error;
 				}
 
 				if (sigcheck_gpg_status[i].result)
@@ -136,33 +183,62 @@ static void parse_gpg_output(struct signature_check *sigc)
 				/* Do we have key information? */
 				if (sigcheck_gpg_status[i].flags & GPG_STATUS_KEYID) {
 					next = strchrnul(line, ' ');
-					free(sigc->key);
-					sigc->key = xmemdupz(line, next - line);
+					replace_cstring(&sigc->key, line, next);
 					/* Do we have signer information? */
 					if (*next && (sigcheck_gpg_status[i].flags & GPG_STATUS_UID)) {
 						line = next + 1;
 						next = strchrnul(line, '\n');
-						free(sigc->signer);
-						sigc->signer = xmemdupz(line, next - line);
+						replace_cstring(&sigc->signer, line, next);
+					}
+				}
+
+				/* Do we have trust level? */
+				if (sigcheck_gpg_status[i].flags & GPG_STATUS_TRUST_LEVEL) {
+					/*
+					 * GPG v1 and v2 differs in how the
+					 * TRUST_ lines are written.  Some
+					 * trust lines contain no additional
+					 * space-separated information for v1.
+					 */
+					size_t trust_size = strcspn(line, " \n");
+					char *trust = xmemdupz(line, trust_size);
+
+					if (parse_gpg_trust_level(trust, &sigc->trust_level)) {
+						free(trust);
+						goto error;
 					}
+					free(trust);
 				}
+
 				/* Do we have fingerprint? */
 				if (sigcheck_gpg_status[i].flags & GPG_STATUS_FINGERPRINT) {
-					next = strchrnul(line, ' ');
-					free(sigc->fingerprint);
-					sigc->fingerprint = xmemdupz(line, next - line);
+					const char *limit;
+					char **field;
 
-					/* Skip interim fields */
+					next = strchrnul(line, ' ');
+					replace_cstring(&sigc->fingerprint, line, next);
+
+					/*
+					 * Skip interim fields.  The search is
+					 * limited to the same line since only
+					 * OpenPGP signatures has a field with
+					 * the primary fingerprint.
+					 */
+					limit = strchrnul(line, '\n');
 					for (j = 9; j > 0; j--) {
-						if (!*next)
+						if (!*next || limit <= next)
 							break;
 						line = next + 1;
 						next = strchrnul(line, ' ');
 					}
 
-					next = strchrnul(line, '\n');
-					free(sigc->primary_key_fingerprint);
-					sigc->primary_key_fingerprint = xmemdupz(line, next - line);
+					field = &sigc->primary_key_fingerprint;
+					if (!j) {
+						next = strchrnul(line, '\n');
+						replace_cstring(field, line, next);
+					} else {
+						replace_cstring(field, NULL, NULL);
+					}
 				}
 
 				break;
@@ -171,14 +247,7 @@ static void parse_gpg_output(struct signature_check *sigc)
 	}
 	return;
 
-found_duplicate_status:
-	/*
-	 * GOODSIG, BADSIG etc. can occur only once for each signature.
-	 * Therefore, if we had more than one then we're dealing with multiple
-	 * signatures.  We don't support them currently, and they're rather
-	 * hard to create, so something is likely fishy and we should reject
-	 * them altogether.
-	 */
+error:
 	sigc->result = 'E';
 	/* Clear partial data to avoid confusion */
 	FREE_AND_NULL(sigc->primary_key_fingerprint);
@@ -195,6 +264,7 @@ int check_signature(const char *payload, size_t plen, const char *signature,
 	int status;
 
 	sigc->result = 'N';
+	sigc->trust_level = -1;
 
 	status = verify_signed_buffer(payload, plen, signature, slen,
 				      &gpg_output, &gpg_status);
@@ -204,7 +274,8 @@ int check_signature(const char *payload, size_t plen, const char *signature,
 	sigc->gpg_output = strbuf_detach(&gpg_output, NULL);
 	sigc->gpg_status = strbuf_detach(&gpg_status, NULL);
 	parse_gpg_output(sigc);
-	status |= sigc->result != 'G' && sigc->result != 'U';
+	status |= sigc->result != 'G';
+	status |= sigc->trust_level < configured_min_trust_level;
 
  out:
 	strbuf_release(&gpg_status);
@@ -251,6 +322,8 @@ int git_gpg_config(const char *var, const char *value, void *cb)
 {
 	struct gpg_format *fmt = NULL;
 	char *fmtname = NULL;
+	char *trust;
+	int ret;
 
 	if (!strcmp(var, "user.signingkey")) {
 		if (!value)
@@ -270,6 +343,20 @@ int git_gpg_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "gpg.mintrustlevel")) {
+		if (!value)
+			return config_error_nonbool(var);
+
+		trust = xstrdup_toupper(value);
+		ret = parse_gpg_trust_level(trust, &configured_min_trust_level);
+		free(trust);
+
+		if (ret)
+			return error("unsupported value for %s: %s", var,
+				     value);
+		return 0;
+	}
+
 	if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program"))
 		fmtname = "openpgp";
 
diff --git a/third_party/git/gpg-interface.h b/third_party/git/gpg-interface.h
index 3e624ec289ab..796571e9e90f 100644
--- a/third_party/git/gpg-interface.h
+++ b/third_party/git/gpg-interface.h
@@ -7,6 +7,14 @@ struct strbuf;
 #define GPG_VERIFY_RAW			2
 #define GPG_VERIFY_OMIT_STATUS	4
 
+enum signature_trust_level {
+	TRUST_UNDEFINED,
+	TRUST_NEVER,
+	TRUST_MARGINAL,
+	TRUST_FULLY,
+	TRUST_ULTIMATE,
+};
+
 struct signature_check {
 	char *payload;
 	char *gpg_output;
@@ -16,7 +24,6 @@ struct signature_check {
 	 * possible "result":
 	 * 0 (not checked)
 	 * N (checked but no further result)
-	 * U (untrusted good)
 	 * G (good)
 	 * B (bad)
 	 */
@@ -25,6 +32,7 @@ struct signature_check {
 	char *key;
 	char *fingerprint;
 	char *primary_key_fingerprint;
+	enum signature_trust_level trust_level;
 };
 
 void signature_check_clear(struct signature_check *sigc);
diff --git a/third_party/git/graph.c b/third_party/git/graph.c
index f53135485f56..4fb25ad464db 100644
--- a/third_party/git/graph.c
+++ b/third_party/git/graph.c
@@ -34,6 +34,7 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb);
  * handle directly. It is assumed that this is the same file handle as the
  * file specified by the graph diff options. This is necessary so that
  * graph_show_strbuf can be called even with a NULL graph.
+ * If a NULL graph is supplied, the strbuf is printed as-is.
  */
 static void graph_show_strbuf(struct git_graph *graph,
 			      FILE *file,
@@ -112,14 +113,42 @@ static const char *column_get_color_code(unsigned short color)
 	return column_colors[color];
 }
 
-static void strbuf_write_column(struct strbuf *sb, const struct column *c,
-				char col_char)
+struct graph_line {
+	struct strbuf *buf;
+	size_t width;
+};
+
+static inline void graph_line_addch(struct graph_line *line, int c)
+{
+	strbuf_addch(line->buf, c);
+	line->width++;
+}
+
+static inline void graph_line_addchars(struct graph_line *line, int c, size_t n)
+{
+	strbuf_addchars(line->buf, c, n);
+	line->width += n;
+}
+
+static inline void graph_line_addstr(struct graph_line *line, const char *s)
+{
+	strbuf_addstr(line->buf, s);
+	line->width += strlen(s);
+}
+
+static inline void graph_line_addcolor(struct graph_line *line, unsigned short color)
+{
+	strbuf_addstr(line->buf, column_get_color_code(color));
+}
+
+static void graph_line_write_column(struct graph_line *line, const struct column *c,
+				    char col_char)
 {
 	if (c->color < column_colors_max)
-		strbuf_addstr(sb, column_get_color_code(c->color));
-	strbuf_addch(sb, col_char);
+		graph_line_addcolor(line, c->color);
+	graph_line_addch(line, col_char);
 	if (c->color < column_colors_max)
-		strbuf_addstr(sb, column_get_color_code(column_colors_max));
+		graph_line_addcolor(line, column_colors_max);
 }
 
 struct git_graph {
@@ -175,9 +204,63 @@ struct git_graph {
 	 */
 	int prev_commit_index;
 	/*
+	 * Which layout variant to use to display merge commits. If the
+	 * commit's first parent is known to be in a column to the left of the
+	 * merge, then this value is 0 and we use the layout on the left.
+	 * Otherwise, the value is 1 and the layout on the right is used. This
+	 * field tells us how many columns the first parent occupies.
+	 *
+	 * 		0)			1)
+	 *
+	 * 		| | | *-.		| | *---.
+	 * 		| |_|/|\ \		| | |\ \ \
+	 * 		|/| | | | |		| | | | | *
+	 */
+	int merge_layout;
+	/*
+	 * The number of columns added to the graph by the current commit. For
+	 * 2-way and octopus merges, this is usually one less than the
+	 * number of parents:
+	 *
+	 * 		| | |			| |    \
+	 *		| * |			| *---. \
+	 *		| |\ \			| |\ \ \ \
+	 *		| | | |         	| | | | | |
+	 *
+	 *		num_parents: 2		num_parents: 4
+	 *		edges_added: 1		edges_added: 3
+	 *
+	 * For left-skewed merges, the first parent fuses with its neighbor and
+	 * so one less column is added:
+	 *
+	 *		| | |			| |  \
+	 *		| * |			| *-. \
+	 *		|/| |			|/|\ \ \
+	 *		| | |			| | | | |
+	 *
+	 *		num_parents: 2		num_parents: 4
+	 *		edges_added: 0		edges_added: 2
+	 *
+	 * This number determines how edges to the right of the merge are
+	 * displayed in commit and post-merge lines; if no columns have been
+	 * added then a vertical line should be used where a right-tracking
+	 * line would otherwise be used.
+	 *
+	 *		| * \			| * |
+	 *		| |\ \			|/| |
+	 *		| | * \			| * |
+	 */
+	int edges_added;
+	/*
+	 * The number of columns added by the previous commit, which is used to
+	 * smooth edges appearing to the right of a commit in a commit line
+	 * following a post-merge line.
+	 */
+	int prev_edges_added;
+	/*
 	 * The maximum number of columns that can be stored in the columns
 	 * and new_columns arrays.  This is also half the number of entries
-	 * that can be stored in the mapping and new_mapping arrays.
+	 * that can be stored in the mapping and old_mapping arrays.
 	 */
 	int column_capacity;
 	/*
@@ -215,12 +298,12 @@ struct git_graph {
 	 */
 	int *mapping;
 	/*
-	 * A temporary array for computing the next mapping state
-	 * while we are outputting a mapping line.  This is stored as part
-	 * of the git_graph simply so we don't have to allocate a new
-	 * temporary array each time we have to output a collapsing line.
+	 * A copy of the contents of the mapping array from the last commit,
+	 * which we use to improve the display of columns that are tracking
+	 * from right to left through a commit line.  We also use this to
+	 * avoid allocating a fresh array when we compute the next mapping.
 	 */
-	int *new_mapping;
+	int *old_mapping;
 	/*
 	 * The current default column color being used.  This is
 	 * stored as an index into the array column_colors.
@@ -285,6 +368,9 @@ struct git_graph *graph_init(struct rev_info *opt)
 	graph->prev_state = GRAPH_PADDING;
 	graph->commit_index = 0;
 	graph->prev_commit_index = 0;
+	graph->merge_layout = 0;
+	graph->edges_added = 0;
+	graph->prev_edges_added = 0;
 	graph->num_columns = 0;
 	graph->num_new_columns = 0;
 	graph->mapping_size = 0;
@@ -303,7 +389,7 @@ struct git_graph *graph_init(struct rev_info *opt)
 	ALLOC_ARRAY(graph->columns, graph->column_capacity);
 	ALLOC_ARRAY(graph->new_columns, graph->column_capacity);
 	ALLOC_ARRAY(graph->mapping, 2 * graph->column_capacity);
-	ALLOC_ARRAY(graph->new_mapping, 2 * graph->column_capacity);
+	ALLOC_ARRAY(graph->old_mapping, 2 * graph->column_capacity);
 
 	/*
 	 * The diff output prefix callback, with this we can make
@@ -333,7 +419,7 @@ static void graph_ensure_capacity(struct git_graph *graph, int num_columns)
 	REALLOC_ARRAY(graph->columns, graph->column_capacity);
 	REALLOC_ARRAY(graph->new_columns, graph->column_capacity);
 	REALLOC_ARRAY(graph->mapping, graph->column_capacity * 2);
-	REALLOC_ARRAY(graph->new_mapping, graph->column_capacity * 2);
+	REALLOC_ARRAY(graph->old_mapping, graph->column_capacity * 2);
 }
 
 /*
@@ -432,74 +518,76 @@ static unsigned short graph_find_commit_color(const struct git_graph *graph,
 	return graph_get_current_column_color(graph);
 }
 
-static void graph_insert_into_new_columns(struct git_graph *graph,
-					  struct commit *commit,
-					  int *mapping_index)
+static int graph_find_new_column_by_commit(struct git_graph *graph,
+					   struct commit *commit)
 {
 	int i;
-
-	/*
-	 * If the commit is already in the new_columns list, we don't need to
-	 * add it.  Just update the mapping correctly.
-	 */
 	for (i = 0; i < graph->num_new_columns; i++) {
-		if (graph->new_columns[i].commit == commit) {
-			graph->mapping[*mapping_index] = i;
-			*mapping_index += 2;
-			return;
-		}
+		if (graph->new_columns[i].commit == commit)
+			return i;
 	}
-
-	/*
-	 * This commit isn't already in new_columns.  Add it.
-	 */
-	graph->new_columns[graph->num_new_columns].commit = commit;
-	graph->new_columns[graph->num_new_columns].color = graph_find_commit_color(graph, commit);
-	graph->mapping[*mapping_index] = graph->num_new_columns;
-	*mapping_index += 2;
-	graph->num_new_columns++;
+	return -1;
 }
 
-static void graph_update_width(struct git_graph *graph,
-			       int is_commit_in_existing_columns)
+static void graph_insert_into_new_columns(struct git_graph *graph,
+					  struct commit *commit,
+					  int idx)
 {
-	/*
-	 * Compute the width needed to display the graph for this commit.
-	 * This is the maximum width needed for any row.  All other rows
-	 * will be padded to this width.
-	 *
-	 * Compute the number of columns in the widest row:
-	 * Count each existing column (graph->num_columns), and each new
-	 * column added by this commit.
-	 */
-	int max_cols = graph->num_columns + graph->num_parents;
+	int i = graph_find_new_column_by_commit(graph, commit);
+	int mapping_idx;
 
 	/*
-	 * Even if the current commit has no parents to be printed, it
-	 * still takes up a column for itself.
+	 * If the commit is not already in the new_columns array, then add it
+	 * and record it as being in the final column.
 	 */
-	if (graph->num_parents < 1)
-		max_cols++;
+	if (i < 0) {
+		i = graph->num_new_columns++;
+		graph->new_columns[i].commit = commit;
+		graph->new_columns[i].color = graph_find_commit_color(graph, commit);
+	}
 
-	/*
-	 * We added a column for the current commit as part of
-	 * graph->num_parents.  If the current commit was already in
-	 * graph->columns, then we have double counted it.
-	 */
-	if (is_commit_in_existing_columns)
-		max_cols--;
+	if (graph->num_parents > 1 && idx > -1 && graph->merge_layout == -1) {
+		/*
+		 * If this is the first parent of a merge, choose a layout for
+		 * the merge line based on whether the parent appears in a
+		 * column to the left of the merge
+		 */
+		int dist, shift;
 
-	/*
-	 * Each column takes up 2 spaces
-	 */
-	graph->width = max_cols * 2;
+		dist = idx - i;
+		shift = (dist > 1) ? 2 * dist - 3 : 1;
+
+		graph->merge_layout = (dist > 0) ? 0 : 1;
+		graph->edges_added = graph->num_parents + graph->merge_layout  - 2;
+
+		mapping_idx = graph->width + (graph->merge_layout - 1) * shift;
+		graph->width += 2 * graph->merge_layout;
+
+	} else if (graph->edges_added > 0 && i == graph->mapping[graph->width - 2]) {
+		/*
+		 * If some columns have been added by a merge, but this commit
+		 * was found in the last existing column, then adjust the
+		 * numbers so that the two edges immediately join, i.e.:
+		 *
+		 *		* |		* |
+		 *		|\ \	=>	|\|
+		 *		| |/		| *
+		 *		| *
+		 */
+		mapping_idx = graph->width - 2;
+		graph->edges_added = -1;
+	} else {
+		mapping_idx = graph->width;
+		graph->width += 2;
+	}
+
+	graph->mapping[mapping_idx] = i;
 }
 
 static void graph_update_columns(struct git_graph *graph)
 {
 	struct commit_list *parent;
 	int max_new_columns;
-	int mapping_idx;
 	int i, seen_this, is_commit_in_columns;
 
 	/*
@@ -532,6 +620,10 @@ static void graph_update_columns(struct git_graph *graph)
 	for (i = 0; i < graph->mapping_size; i++)
 		graph->mapping[i] = -1;
 
+	graph->width = 0;
+	graph->prev_edges_added = graph->edges_added;
+	graph->edges_added = 0;
+
 	/*
 	 * Populate graph->new_columns and graph->mapping
 	 *
@@ -542,7 +634,6 @@ static void graph_update_columns(struct git_graph *graph)
 	 * supposed to end up after the collapsing is performed.
 	 */
 	seen_this = 0;
-	mapping_idx = 0;
 	is_commit_in_columns = 1;
 	for (i = 0; i <= graph->num_columns; i++) {
 		struct commit *col_commit;
@@ -556,9 +647,9 @@ static void graph_update_columns(struct git_graph *graph)
 		}
 
 		if (col_commit == graph->commit) {
-			int old_mapping_idx = mapping_idx;
 			seen_this = 1;
 			graph->commit_index = i;
+			graph->merge_layout = -1;
 			for (parent = first_interesting_parent(graph);
 			     parent;
 			     parent = next_interesting_parent(graph, parent)) {
@@ -571,21 +662,18 @@ static void graph_update_columns(struct git_graph *graph)
 				    !is_commit_in_columns) {
 					graph_increment_column_color(graph);
 				}
-				graph_insert_into_new_columns(graph,
-							      parent->item,
-							      &mapping_idx);
+				graph_insert_into_new_columns(graph, parent->item, i);
 			}
 			/*
-			 * We always need to increment mapping_idx by at
+			 * We always need to increment graph->width by at
 			 * least 2, even if it has no interesting parents.
 			 * The current commit always takes up at least 2
 			 * spaces.
 			 */
-			if (mapping_idx == old_mapping_idx)
-				mapping_idx += 2;
+			if (graph->num_parents == 0)
+				graph->width += 2;
 		} else {
-			graph_insert_into_new_columns(graph, col_commit,
-						      &mapping_idx);
+			graph_insert_into_new_columns(graph, col_commit, -1);
 		}
 	}
 
@@ -595,11 +683,43 @@ static void graph_update_columns(struct git_graph *graph)
 	while (graph->mapping_size > 1 &&
 	       graph->mapping[graph->mapping_size - 1] < 0)
 		graph->mapping_size--;
+}
+
+static int graph_num_dashed_parents(struct git_graph *graph)
+{
+	return graph->num_parents + graph->merge_layout - 3;
+}
 
+static int graph_num_expansion_rows(struct git_graph *graph)
+{
 	/*
-	 * Compute graph->width for this commit
+	 * Normally, we need two expansion rows for each dashed parent line from
+	 * an octopus merge:
+	 *
+	 * 		| *
+	 * 		| |\
+	 * 		| | \
+	 * 		| |  \
+	 * 		| *-. \
+	 * 		| |\ \ \
+	 *
+	 * If the merge is skewed to the left, then its parents occupy one less
+	 * column, and we don't need as many expansion rows to route around it;
+	 * in some cases that means we don't need any expansion rows at all:
+	 *
+	 * 		| *
+	 * 		| |\
+	 * 		| * \
+	 * 		|/|\ \
 	 */
-	graph_update_width(graph, is_commit_in_columns);
+	return graph_num_dashed_parents(graph) * 2;
+}
+
+static int graph_needs_pre_commit_line(struct git_graph *graph)
+{
+	return graph->num_parents >= 3 &&
+	       graph->commit_index < (graph->num_columns - 1) &&
+	       graph->expansion_row < graph_num_expansion_rows(graph);
 }
 
 void graph_update(struct git_graph *graph, struct commit *commit)
@@ -657,8 +777,7 @@ void graph_update(struct git_graph *graph, struct commit *commit)
 	 */
 	if (graph->state != GRAPH_PADDING)
 		graph->state = GRAPH_SKIP;
-	else if (graph->num_parents >= 3 &&
-		 graph->commit_index < (graph->num_columns - 1))
+	else if (graph_needs_pre_commit_line(graph))
 		graph->state = GRAPH_PRE_COMMIT;
 	else
 		graph->state = GRAPH_COMMIT;
@@ -686,8 +805,7 @@ static int graph_is_mapping_correct(struct git_graph *graph)
 	return 1;
 }
 
-static void graph_pad_horizontally(struct git_graph *graph, struct strbuf *sb,
-				   int chars_written)
+static void graph_pad_horizontally(struct git_graph *graph, struct graph_line *line)
 {
 	/*
 	 * Add additional spaces to the end of the strbuf, so that all
@@ -696,34 +814,22 @@ static void graph_pad_horizontally(struct git_graph *graph, struct strbuf *sb,
 	 * This way, fields printed to the right of the graph will remain
 	 * aligned for the entire commit.
 	 */
-	if (chars_written < graph->width)
-		strbuf_addchars(sb, ' ', graph->width - chars_written);
+	if (line->width < graph->width)
+		graph_line_addchars(line, ' ', graph->width - line->width);
 }
 
 static void graph_output_padding_line(struct git_graph *graph,
-				      struct strbuf *sb)
+				      struct graph_line *line)
 {
 	int i;
 
 	/*
-	 * We could conceivable be called with a NULL commit
-	 * if our caller has a bug, and invokes graph_next_line()
-	 * immediately after graph_init(), without first calling
-	 * graph_update().  Return without outputting anything in this
-	 * case.
-	 */
-	if (!graph->commit)
-		return;
-
-	/*
 	 * Output a padding row, that leaves all branch lines unchanged
 	 */
 	for (i = 0; i < graph->num_new_columns; i++) {
-		strbuf_write_column(sb, &graph->new_columns[i], '|');
-		strbuf_addch(sb, ' ');
+		graph_line_write_column(line, &graph->new_columns[i], '|');
+		graph_line_addch(line, ' ');
 	}
-
-	graph_pad_horizontally(graph, sb, graph->num_new_columns * 2);
 }
 
 
@@ -733,28 +839,24 @@ int graph_width(struct git_graph *graph)
 }
 
 
-static void graph_output_skip_line(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_skip_line(struct git_graph *graph, struct graph_line *line)
 {
 	/*
 	 * Output an ellipsis to indicate that a portion
 	 * of the graph is missing.
 	 */
-	strbuf_addstr(sb, "...");
-	graph_pad_horizontally(graph, sb, 3);
+	graph_line_addstr(line, "...");
 
-	if (graph->num_parents >= 3 &&
-	    graph->commit_index < (graph->num_columns - 1))
+	if (graph_needs_pre_commit_line(graph))
 		graph_update_state(graph, GRAPH_PRE_COMMIT);
 	else
 		graph_update_state(graph, GRAPH_COMMIT);
 }
 
 static void graph_output_pre_commit_line(struct git_graph *graph,
-					 struct strbuf *sb)
+					 struct graph_line *line)
 {
-	int num_expansion_rows;
 	int i, seen_this;
-	int chars_written;
 
 	/*
 	 * This function formats a row that increases the space around a commit
@@ -764,27 +866,24 @@ static void graph_output_pre_commit_line(struct git_graph *graph,
 	 * We need 2 extra rows for every parent over 2.
 	 */
 	assert(graph->num_parents >= 3);
-	num_expansion_rows = (graph->num_parents - 2) * 2;
 
 	/*
 	 * graph->expansion_row tracks the current expansion row we are on.
 	 * It should be in the range [0, num_expansion_rows - 1]
 	 */
 	assert(0 <= graph->expansion_row &&
-	       graph->expansion_row < num_expansion_rows);
+	       graph->expansion_row < graph_num_expansion_rows(graph));
 
 	/*
 	 * Output the row
 	 */
 	seen_this = 0;
-	chars_written = 0;
 	for (i = 0; i < graph->num_columns; i++) {
 		struct column *col = &graph->columns[i];
 		if (col->commit == graph->commit) {
 			seen_this = 1;
-			strbuf_write_column(sb, col, '|');
-			strbuf_addchars(sb, ' ', graph->expansion_row);
-			chars_written += 1 + graph->expansion_row;
+			graph_line_write_column(line, col, '|');
+			graph_line_addchars(line, ' ', graph->expansion_row);
 		} else if (seen_this && (graph->expansion_row == 0)) {
 			/*
 			 * This is the first line of the pre-commit output.
@@ -797,33 +896,27 @@ static void graph_output_pre_commit_line(struct git_graph *graph,
 			 */
 			if (graph->prev_state == GRAPH_POST_MERGE &&
 			    graph->prev_commit_index < i)
-				strbuf_write_column(sb, col, '\\');
+				graph_line_write_column(line, col, '\\');
 			else
-				strbuf_write_column(sb, col, '|');
-			chars_written++;
+				graph_line_write_column(line, col, '|');
 		} else if (seen_this && (graph->expansion_row > 0)) {
-			strbuf_write_column(sb, col, '\\');
-			chars_written++;
+			graph_line_write_column(line, col, '\\');
 		} else {
-			strbuf_write_column(sb, col, '|');
-			chars_written++;
+			graph_line_write_column(line, col, '|');
 		}
-		strbuf_addch(sb, ' ');
-		chars_written++;
+		graph_line_addch(line, ' ');
 	}
 
-	graph_pad_horizontally(graph, sb, chars_written);
-
 	/*
 	 * Increment graph->expansion_row,
 	 * and move to state GRAPH_COMMIT if necessary
 	 */
 	graph->expansion_row++;
-	if (graph->expansion_row >= num_expansion_rows)
+	if (!graph_needs_pre_commit_line(graph))
 		graph_update_state(graph, GRAPH_COMMIT);
 }
 
-static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_commit_char(struct git_graph *graph, struct graph_line *line)
 {
 	/*
 	 * For boundary commits, print 'o'
@@ -831,72 +924,67 @@ static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb)
 	 */
 	if (graph->commit->object.flags & BOUNDARY) {
 		assert(graph->revs->boundary);
-		strbuf_addch(sb, 'o');
+		graph_line_addch(line, 'o');
 		return;
 	}
 
 	/*
 	 * get_revision_mark() handles all other cases without assert()
 	 */
-	strbuf_addstr(sb, get_revision_mark(graph->revs, graph->commit));
+	graph_line_addstr(line, get_revision_mark(graph->revs, graph->commit));
 }
 
 /*
- * Draw the horizontal dashes of an octopus merge and return the number of
- * characters written.
+ * Draw the horizontal dashes of an octopus merge.
  */
-static int graph_draw_octopus_merge(struct git_graph *graph,
-				    struct strbuf *sb)
+static void graph_draw_octopus_merge(struct git_graph *graph, struct graph_line *line)
 {
 	/*
-	 * Here dashless_parents represents the number of parents which don't
-	 * need to have dashes (the edges labeled "0" and "1").  And
-	 * dashful_parents are the remaining ones.
+	 * The parents of a merge commit can be arbitrarily reordered as they
+	 * are mapped onto display columns, for example this is a valid merge:
 	 *
-	 * | *---.
-	 * | |\ \ \
-	 * | | | | |
-	 * x 0 1 2 3
+	 *	| | *---.
+	 *	| | |\ \ \
+	 *	| | |/ / /
+	 *	| |/| | /
+	 *	| |_|_|/
+	 *	|/| | |
+	 *	3 1 0 2
 	 *
-	 */
-	const int dashless_parents = 2;
-	int dashful_parents = graph->num_parents - dashless_parents;
-
-	/*
-	 * Usually, we add one new column for each parent (like the diagram
-	 * above) but sometimes the first parent goes into an existing column,
-	 * like this:
+	 * The numbers denote which parent of the merge each visual column
+	 * corresponds to; we can't assume that the parents will initially
+	 * display in the order given by new_columns.
 	 *
-	 * | *---.
-	 * | |\ \ \
-	 * |/ / / /
-	 * x 0 1 2
+	 * To find the right color for each dash, we need to consult the
+	 * mapping array, starting from the column 2 places to the right of the
+	 * merge commit, and use that to find out which logical column each
+	 * edge will collapse to.
 	 *
-	 * In which case the number of parents will be one greater than the
-	 * number of added columns.
+	 * Commits are rendered once all edges have collapsed to their correct
+	 * logcial column, so commit_index gives us the right visual offset for
+	 * the merge commit.
 	 */
-	int added_cols = (graph->num_new_columns - graph->num_columns);
-	int parent_in_old_cols = graph->num_parents - added_cols;
 
-	/*
-	 * In both cases, commit_index corresponds to the edge labeled "0".
-	 */
-	int first_col = graph->commit_index + dashless_parents
-	    - parent_in_old_cols;
+	int i, j;
+	struct column *col;
 
-	int i;
-	for (i = 0; i < dashful_parents; i++) {
-		strbuf_write_column(sb, &graph->new_columns[i+first_col], '-');
-		strbuf_write_column(sb, &graph->new_columns[i+first_col],
-				    i == dashful_parents-1 ? '.' : '-');
+	int dashed_parents = graph_num_dashed_parents(graph);
+
+	for (i = 0; i < dashed_parents; i++) {
+		j = graph->mapping[(graph->commit_index + i + 2) * 2];
+		col = &graph->new_columns[j];
+
+		graph_line_write_column(line, col, '-');
+		graph_line_write_column(line, col, (i == dashed_parents - 1) ? '.' : '-');
 	}
-	return 2 * dashful_parents;
+
+	return;
 }
 
-static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_commit_line(struct git_graph *graph, struct graph_line *line)
 {
 	int seen_this = 0;
-	int i, chars_written;
+	int i;
 
 	/*
 	 * Output the row containing this commit
@@ -906,7 +994,6 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 	 * children that we have already processed.)
 	 */
 	seen_this = 0;
-	chars_written = 0;
 	for (i = 0; i <= graph->num_columns; i++) {
 		struct column *col = &graph->columns[i];
 		struct commit *col_commit;
@@ -920,19 +1007,17 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 
 		if (col_commit == graph->commit) {
 			seen_this = 1;
-			graph_output_commit_char(graph, sb);
-			chars_written++;
+			graph_output_commit_char(graph, line);
 
 			if (graph->num_parents > 2)
-				chars_written += graph_draw_octopus_merge(graph,
-									  sb);
-		} else if (seen_this && (graph->num_parents > 2)) {
-			strbuf_write_column(sb, col, '\\');
-			chars_written++;
-		} else if (seen_this && (graph->num_parents == 2)) {
+				graph_draw_octopus_merge(graph, line);
+		} else if (seen_this && (graph->edges_added > 1)) {
+			graph_line_write_column(line, col, '\\');
+		} else if (seen_this && (graph->edges_added == 1)) {
 			/*
-			 * This is a 2-way merge commit.
-			 * There is no GRAPH_PRE_COMMIT stage for 2-way
+			 * This is either a right-skewed 2-way merge
+			 * commit, or a left-skewed 3-way merge.
+			 * There is no GRAPH_PRE_COMMIT stage for such
 			 * merges, so this is the first line of output
 			 * for this commit.  Check to see what the previous
 			 * line of output was.
@@ -944,21 +1029,21 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 			 * makes the output look nicer.
 			 */
 			if (graph->prev_state == GRAPH_POST_MERGE &&
+			    graph->prev_edges_added > 0 &&
 			    graph->prev_commit_index < i)
-				strbuf_write_column(sb, col, '\\');
+				graph_line_write_column(line, col, '\\');
 			else
-				strbuf_write_column(sb, col, '|');
-			chars_written++;
+				graph_line_write_column(line, col, '|');
+		} else if (graph->prev_state == GRAPH_COLLAPSING &&
+			   graph->old_mapping[2 * i + 1] == i &&
+			   graph->mapping[2 * i] < i) {
+			graph_line_write_column(line, col, '/');
 		} else {
-			strbuf_write_column(sb, col, '|');
-			chars_written++;
+			graph_line_write_column(line, col, '|');
 		}
-		strbuf_addch(sb, ' ');
-		chars_written++;
+		graph_line_addch(line, ' ');
 	}
 
-	graph_pad_horizontally(graph, sb, chars_written);
-
 	/*
 	 * Update graph->state
 	 */
@@ -970,26 +1055,19 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 		graph_update_state(graph, GRAPH_COLLAPSING);
 }
 
-static struct column *find_new_column_by_commit(struct git_graph *graph,
-						struct commit *commit)
-{
-	int i;
-	for (i = 0; i < graph->num_new_columns; i++) {
-		if (graph->new_columns[i].commit == commit)
-			return &graph->new_columns[i];
-	}
-	return NULL;
-}
+const char merge_chars[] = {'/', '|', '\\'};
 
-static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_post_merge_line(struct git_graph *graph, struct graph_line *line)
 {
 	int seen_this = 0;
-	int i, j, chars_written;
+	int i, j;
+
+	struct commit_list *first_parent = first_interesting_parent(graph);
+	struct column *parent_col = NULL;
 
 	/*
 	 * Output the post-merge row
 	 */
-	chars_written = 0;
 	for (i = 0; i <= graph->num_columns; i++) {
 		struct column *col = &graph->columns[i];
 		struct commit *col_commit;
@@ -1008,37 +1086,49 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf
 			 * new_columns and use those to format the
 			 * edges.
 			 */
-			struct commit_list *parents = NULL;
-			struct column *par_column;
+			struct commit_list *parents = first_parent;
+			int par_column;
+			int idx = graph->merge_layout;
+			char c;
 			seen_this = 1;
-			parents = first_interesting_parent(graph);
-			assert(parents);
-			par_column = find_new_column_by_commit(graph, parents->item);
-			assert(par_column);
-
-			strbuf_write_column(sb, par_column, '|');
-			chars_written++;
-			for (j = 0; j < graph->num_parents - 1; j++) {
+
+			for (j = 0; j < graph->num_parents; j++) {
+				par_column = graph_find_new_column_by_commit(graph, parents->item);
+				assert(par_column >= 0);
+
+				c = merge_chars[idx];
+				graph_line_write_column(line, &graph->new_columns[par_column], c);
+				if (idx == 2) {
+					if (graph->edges_added > 0 || j < graph->num_parents - 1)
+						graph_line_addch(line, ' ');
+				} else {
+					idx++;
+				}
 				parents = next_interesting_parent(graph, parents);
-				assert(parents);
-				par_column = find_new_column_by_commit(graph, parents->item);
-				assert(par_column);
-				strbuf_write_column(sb, par_column, '\\');
-				strbuf_addch(sb, ' ');
 			}
-			chars_written += j * 2;
+			if (graph->edges_added == 0)
+				graph_line_addch(line, ' ');
+
 		} else if (seen_this) {
-			strbuf_write_column(sb, col, '\\');
-			strbuf_addch(sb, ' ');
-			chars_written += 2;
+			if (graph->edges_added > 0)
+				graph_line_write_column(line, col, '\\');
+			else
+				graph_line_write_column(line, col, '|');
+			graph_line_addch(line, ' ');
 		} else {
-			strbuf_write_column(sb, col, '|');
-			strbuf_addch(sb, ' ');
-			chars_written += 2;
+			graph_line_write_column(line, col, '|');
+			if (graph->merge_layout != 0 || i != graph->commit_index - 1) {
+				if (parent_col)
+					graph_line_write_column(
+						line, parent_col, '_');
+				else
+					graph_line_addch(line, ' ');
+			}
 		}
-	}
 
-	graph_pad_horizontally(graph, sb, chars_written);
+		if (col_commit == first_parent->item)
+			parent_col = col;
+	}
 
 	/*
 	 * Update graph->state
@@ -1049,7 +1139,7 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf
 		graph_update_state(graph, GRAPH_COLLAPSING);
 }
 
-static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_collapsing_line(struct git_graph *graph, struct graph_line *line)
 {
 	int i;
 	short used_horizontal = 0;
@@ -1057,13 +1147,18 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 	int horizontal_edge_target = -1;
 
 	/*
-	 * Clear out the new_mapping array
+	 * Swap the mapping and old_mapping arrays
+	 */
+	SWAP(graph->mapping, graph->old_mapping);
+
+	/*
+	 * Clear out the mapping array
 	 */
 	for (i = 0; i < graph->mapping_size; i++)
-		graph->new_mapping[i] = -1;
+		graph->mapping[i] = -1;
 
 	for (i = 0; i < graph->mapping_size; i++) {
-		int target = graph->mapping[i];
+		int target = graph->old_mapping[i];
 		if (target < 0)
 			continue;
 
@@ -1084,14 +1179,14 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 			 * This column is already in the
 			 * correct place
 			 */
-			assert(graph->new_mapping[i] == -1);
-			graph->new_mapping[i] = target;
-		} else if (graph->new_mapping[i - 1] < 0) {
+			assert(graph->mapping[i] == -1);
+			graph->mapping[i] = target;
+		} else if (graph->mapping[i - 1] < 0) {
 			/*
 			 * Nothing is to the left.
 			 * Move to the left by one
 			 */
-			graph->new_mapping[i - 1] = target;
+			graph->mapping[i - 1] = target;
 			/*
 			 * If there isn't already an edge moving horizontally
 			 * select this one.
@@ -1107,9 +1202,9 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 				 * line.
 				 */
 				for (j = (target * 2)+3; j < (i - 2); j += 2)
-					graph->new_mapping[j] = target;
+					graph->mapping[j] = target;
 			}
-		} else if (graph->new_mapping[i - 1] == target) {
+		} else if (graph->mapping[i - 1] == target) {
 			/*
 			 * There is a branch line to our left
 			 * already, and it is our target.  We
@@ -1117,7 +1212,7 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 			 * the same parent commit.
 			 *
 			 * We don't have to add anything to the
-			 * output or new_mapping, since the
+			 * output or mapping, since the
 			 * existing branch line has already taken
 			 * care of it.
 			 */
@@ -1129,39 +1224,46 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 			 *
 			 * The space just to the left of this
 			 * branch should always be empty.
-			 *
-			 * The branch to the left of that space
-			 * should be our eventual target.
 			 */
-			assert(graph->new_mapping[i - 1] > target);
-			assert(graph->new_mapping[i - 2] < 0);
-			assert(graph->new_mapping[i - 3] == target);
-			graph->new_mapping[i - 2] = target;
+			assert(graph->mapping[i - 1] > target);
+			assert(graph->mapping[i - 2] < 0);
+			graph->mapping[i - 2] = target;
 			/*
 			 * Mark this branch as the horizontal edge to
 			 * prevent any other edges from moving
 			 * horizontally.
 			 */
-			if (horizontal_edge == -1)
-				horizontal_edge = i;
+			if (horizontal_edge == -1) {
+				int j;
+				horizontal_edge_target = target;
+				horizontal_edge = i - 1;
+
+				for (j = (target * 2) + 3; j < (i - 2); j += 2)
+					graph->mapping[j] = target;
+			}
 		}
 	}
 
 	/*
+	 * Copy the current mapping array into old_mapping
+	 */
+	COPY_ARRAY(graph->old_mapping, graph->mapping, graph->mapping_size);
+
+	/*
 	 * The new mapping may be 1 smaller than the old mapping
 	 */
-	if (graph->new_mapping[graph->mapping_size - 1] < 0)
+	if (graph->mapping[graph->mapping_size - 1] < 0)
 		graph->mapping_size--;
 
 	/*
 	 * Output out a line based on the new mapping info
 	 */
 	for (i = 0; i < graph->mapping_size; i++) {
-		int target = graph->new_mapping[i];
+		int target = graph->mapping[i];
 		if (target < 0)
-			strbuf_addch(sb, ' ');
+			graph_line_addch(line, ' ');
 		else if (target * 2 == i)
-			strbuf_write_column(sb, &graph->new_columns[target], '|');
+			graph_line_write_column(line, &graph->new_columns[target], '|');
 		else if (target == horizontal_edge_target &&
 			 i != horizontal_edge - 1) {
 				/*
@@ -1170,24 +1272,17 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 				 * won't continue into the next line.
 				 */
 				if (i != (target * 2)+3)
-					graph->new_mapping[i] = -1;
+					graph->mapping[i] = -1;
 				used_horizontal = 1;
-			strbuf_write_column(sb, &graph->new_columns[target], '_');
+			graph_line_write_column(line, &graph->new_columns[target], '_');
 		} else {
 			if (used_horizontal && i < horizontal_edge)
-				graph->new_mapping[i] = -1;
-			strbuf_write_column(sb, &graph->new_columns[target], '/');
+				graph->mapping[i] = -1;
+			graph_line_write_column(line, &graph->new_columns[target], '/');
 
 		}
 	}
 
-	graph_pad_horizontally(graph, sb, graph->mapping_size);
-
-	/*
-	 * Swap mapping and new_mapping
-	 */
-	SWAP(graph->mapping, graph->new_mapping);
-
 	/*
 	 * If graph->mapping indicates that all of the branch lines
 	 * are already in the correct positions, we are done.
@@ -1199,35 +1294,49 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 
 int graph_next_line(struct git_graph *graph, struct strbuf *sb)
 {
+	int shown_commit_line = 0;
+	struct graph_line line = { .buf = sb, .width = 0 };
+
+	/*
+	 * We could conceivable be called with a NULL commit
+	 * if our caller has a bug, and invokes graph_next_line()
+	 * immediately after graph_init(), without first calling
+	 * graph_update().  Return without outputting anything in this
+	 * case.
+	 */
+	if (!graph->commit)
+		return -1;
+
 	switch (graph->state) {
 	case GRAPH_PADDING:
-		graph_output_padding_line(graph, sb);
-		return 0;
+		graph_output_padding_line(graph, &line);
+		break;
 	case GRAPH_SKIP:
-		graph_output_skip_line(graph, sb);
-		return 0;
+		graph_output_skip_line(graph, &line);
+		break;
 	case GRAPH_PRE_COMMIT:
-		graph_output_pre_commit_line(graph, sb);
-		return 0;
+		graph_output_pre_commit_line(graph, &line);
+		break;
 	case GRAPH_COMMIT:
-		graph_output_commit_line(graph, sb);
-		return 1;
+		graph_output_commit_line(graph, &line);
+		shown_commit_line = 1;
+		break;
 	case GRAPH_POST_MERGE:
-		graph_output_post_merge_line(graph, sb);
-		return 0;
+		graph_output_post_merge_line(graph, &line);
+		break;
 	case GRAPH_COLLAPSING:
-		graph_output_collapsing_line(graph, sb);
-		return 0;
+		graph_output_collapsing_line(graph, &line);
+		break;
 	}
 
-	assert(0);
-	return 0;
+	graph_pad_horizontally(graph, &line);
+	return shown_commit_line;
 }
 
 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
 {
 	int i;
-	int chars_written = 0;
+	struct graph_line line = { .buf = sb, .width = 0 };
 
 	if (graph->state != GRAPH_COMMIT) {
 		graph_next_line(graph, sb);
@@ -1244,20 +1353,17 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
 	for (i = 0; i < graph->num_columns; i++) {
 		struct column *col = &graph->columns[i];
 
-		strbuf_write_column(sb, col, '|');
-		chars_written++;
+		graph_line_write_column(&line, col, '|');
 
 		if (col->commit == graph->commit && graph->num_parents > 2) {
 			int len = (graph->num_parents - 2) * 2;
-			strbuf_addchars(sb, ' ', len);
-			chars_written += len;
+			graph_line_addchars(&line, ' ', len);
 		} else {
-			strbuf_addch(sb, ' ');
-			chars_written++;
+			graph_line_addch(&line, ' ');
 		}
 	}
 
-	graph_pad_horizontally(graph, sb, chars_written);
+	graph_pad_horizontally(graph, &line);
 
 	/*
 	 * Update graph->prev_state since we have output a padding line
diff --git a/third_party/git/graph.h b/third_party/git/graph.h
index af623390b605..8313e293c78d 100644
--- a/third_party/git/graph.h
+++ b/third_party/git/graph.h
@@ -2,6 +2,103 @@
 #define GRAPH_H
 #include "diff.h"
 
+/**
+ * The graph API is used to draw a text-based representation of the commit
+ * history. The API generates the graph in a line-by-line fashion.
+ *
+ * Calling sequence
+ * ----------------
+ *
+ * - Create a `struct git_graph` by calling `graph_init()`.  When using the
+ *   revision walking API, this is done automatically by `setup_revisions()` if
+ *   the '--graph' option is supplied.
+ *
+ * - Use the revision walking API to walk through a group of contiguous commits.
+ *   The `get_revision()` function automatically calls `graph_update()` each time
+ *   it is invoked.
+ *
+ * - For each commit, call `graph_next_line()` repeatedly, until
+ *   `graph_is_commit_finished()` returns non-zero.  Each call to
+ *   `graph_next_line()` will output a single line of the graph.  The resulting
+ *   lines will not contain any newlines.  `graph_next_line()` returns 1 if the
+ *   resulting line contains the current commit, or 0 if this is merely a line
+ *   needed to adjust the graph before or after the current commit.  This return
+ *   value can be used to determine where to print the commit summary information
+ *   alongside the graph output.
+ *
+ * Limitations
+ * -----------
+ * - Check the graph_update() function for its limitations.
+ *
+ * - The graph API does not currently support reverse commit ordering.  In
+ *   order to implement reverse ordering, the graphing API needs an
+ *   (efficient) mechanism to find the children of a commit.
+ *
+ * Sample usage
+ * ------------
+ *
+ * ------------
+ * struct commit *commit;
+ * struct git_graph *graph = graph_init(opts);
+ *
+ * while ((commit = get_revision(opts)) != NULL) {
+ * 	while (!graph_is_commit_finished(graph))
+ * 	{
+ * 		struct strbuf sb;
+ * 		int is_commit_line;
+ *
+ * 		strbuf_init(&sb, 0);
+ * 		is_commit_line = graph_next_line(graph, &sb);
+ * 		fputs(sb.buf, stdout);
+ *
+ * 		if (is_commit_line)
+ * 			log_tree_commit(opts, commit);
+ * 		else
+ * 			putchar(opts->diffopt.line_termination);
+ * 	}
+ * }
+ * ------------
+ * Sample output
+ * -------------
+ *
+ * The following is an example of the output from the graph API.  This output does
+ * not include any commit summary information--callers are responsible for
+ * outputting that information, if desired.
+ * ------------
+ * *
+ * *
+ * *
+ * |\
+ * * |
+ * | | *
+ * | \ \
+ * |  \ \
+ * *-. \ \
+ * |\ \ \ \
+ * | | * | |
+ * | | | | | *
+ * | | | | | *
+ * | | | | | *
+ * | | | | | |\
+ * | | | | | | *
+ * | * | | | | |
+ * | | | | | *  \
+ * | | | | | |\  |
+ * | | | | * | | |
+ * | | | | * | | |
+ * * | | | | | | |
+ * | |/ / / / / /
+ * |/| / / / / /
+ * * | | | | | |
+ * |/ / / / / /
+ * * | | | | |
+ * | | | | | *
+ * | | | | |/
+ * | | | | *
+ * ------------
+ *
+ */
+
 /* A graph is a pointer to this opaque structure */
 struct git_graph;
 
@@ -50,6 +147,21 @@ struct git_graph *graph_init(struct rev_info *opt);
  * If graph_update() is called before graph_is_commit_finished() returns 1,
  * the next call to graph_next_line() will output an ellipsis ("...")
  * to indicate that a portion of the graph is missing.
+ *
+ * Limitations:
+ * -----------
+ *
+ * - `graph_update()` must be called with commits in topological order.  It should
+ *   not be called on a commit if it has already been invoked with an ancestor of
+ *   that commit, or the graph output will be incorrect.
+ *
+ * - `graph_update()` must be called on a contiguous group of commits.  If
+ *   `graph_update()` is called on a particular commit, it should later be called
+ *   on all parents of that commit.  Parents must not be skipped, or the graph
+ *   output will appear incorrect.
+ *
+ * - `graph_update()` may be used on a pruned set of commits only if the parent list
+ *   has been rewritten so as to include only ancestors from the pruned set.
  */
 void graph_update(struct git_graph *graph, struct commit *commit);
 
@@ -62,6 +174,10 @@ void graph_update(struct git_graph *graph, struct commit *commit);
  * for this commit.  If 0 is returned, graph_next_line() may still be
  * called without calling graph_update(), and it will merely output
  * appropriate "vertical padding" in the graph.
+ *
+ * If `graph_update()` is called before all lines for the current commit have
+ * been printed, the next call to `graph_next_line()` will output an ellipsis,
+ * to indicate that a portion of the graph was omitted.
  */
 int graph_is_commit_finished(struct git_graph const *graph);
 
@@ -112,6 +228,7 @@ void graph_show_padding(struct git_graph *graph);
 /*
  * If the graph is non-NULL, print the rest of the history graph for this
  * commit to stdout.  Does not print a terminating newline on the last line.
+ * Returns 1 if output was printed, and 0 if no output was necessary.
  */
 int graph_show_remainder(struct git_graph *graph);
 
@@ -121,6 +238,10 @@ int graph_show_remainder(struct git_graph *graph);
  * This is similar to graph_show_strbuf(), but it always prints the
  * remainder of the graph.
  *
+ * It is better than directly calling `graph_show_strbuf()` followed by
+ * `graph_show_remainder()` since it properly handles buffers that do not end in
+ * a terminating newline.
+ *
  * If the strbuf ends with a newline, the output printed by
  * graph_show_commit_msg() will end with a newline.  If the strbuf is
  * missing a terminating newline (including if it is empty), the output
diff --git a/third_party/git/grep.c b/third_party/git/grep.c
index cd952ef5d3cc..13232a904aca 100644
--- a/third_party/git/grep.c
+++ b/third_party/git/grep.c
@@ -16,6 +16,20 @@ static int grep_source_is_binary(struct grep_source *gs,
 
 static struct grep_opt grep_defaults;
 
+#ifdef USE_LIBPCRE2
+static pcre2_general_context *pcre2_global_context;
+
+static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data)
+{
+	return malloc(size);
+}
+
+static void pcre2_free(void *pointer, MAYBE_UNUSED void *memory_data)
+{
+	free(pointer);
+}
+#endif
+
 static const char *color_grep_slots[] = {
 	[GREP_COLOR_CONTEXT]	    = "context",
 	[GREP_COLOR_FILENAME]	    = "filename",
@@ -150,12 +164,28 @@ int grep_config(const char *var, const char *value, void *cb)
  * Initialize one instance of grep_opt and copy the
  * default values from the template we read the configuration
  * information in an earlier call to git_config(grep_config).
+ *
+ * If using PCRE, make sure that the library is configured
+ * to use the same allocator as Git (e.g. nedmalloc on Windows).
+ *
+ * Any allocated memory needs to be released in grep_destroy().
  */
 void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix)
 {
 	struct grep_opt *def = &grep_defaults;
 	int i;
 
+#if defined(USE_LIBPCRE2)
+	if (!pcre2_global_context)
+		pcre2_global_context = pcre2_general_context_create(
+					pcre2_malloc, pcre2_free, NULL);
+#endif
+
+#ifdef USE_LIBPCRE1
+	pcre_malloc = malloc;
+	pcre_free = free;
+#endif
+
 	memset(opt, 0, sizeof(*opt));
 	opt->repo = repo;
 	opt->prefix = prefix;
@@ -178,6 +208,13 @@ void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix
 		color_set(opt->colors[i], def->colors[i]);
 }
 
+void grep_destroy(void)
+{
+#ifdef USE_LIBPCRE2
+	pcre2_general_context_free(pcre2_global_context);
+#endif
+}
+
 static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, struct grep_opt *opt)
 {
 	/*
@@ -368,31 +405,20 @@ static int is_fixed(const char *s, size_t len)
 	return 1;
 }
 
-static int has_null(const char *s, size_t len)
-{
-	/*
-	 * regcomp cannot accept patterns with NULs so when using it
-	 * we consider any pattern containing a NUL fixed.
-	 */
-	if (memchr(s, 0, len))
-		return 1;
-
-	return 0;
-}
-
 #ifdef USE_LIBPCRE1
 static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt)
 {
 	const char *error;
 	int erroffset;
 	int options = PCRE_MULTILINE;
+	int study_options = 0;
 
 	if (opt->ignore_case) {
-		if (has_non_ascii(p->pattern))
+		if (!opt->ignore_locale && has_non_ascii(p->pattern))
 			p->pcre1_tables = pcre_maketables();
 		options |= PCRE_CASELESS;
 	}
-	if (is_utf8_locale() && has_non_ascii(p->pattern))
+	if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern))
 		options |= PCRE_UTF8;
 
 	p->pcre1_regexp = pcre_compile(p->pattern, options, &error, &erroffset,
@@ -400,44 +426,31 @@ static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt)
 	if (!p->pcre1_regexp)
 		compile_regexp_failed(p, error);
 
-	p->pcre1_extra_info = pcre_study(p->pcre1_regexp, GIT_PCRE_STUDY_JIT_COMPILE, &error);
-	if (!p->pcre1_extra_info && error)
-		die("%s", error);
-
-#ifdef GIT_PCRE1_USE_JIT
+#if defined(PCRE_CONFIG_JIT) && !defined(NO_LIBPCRE1_JIT)
 	pcre_config(PCRE_CONFIG_JIT, &p->pcre1_jit_on);
-	if (p->pcre1_jit_on == 1) {
-		p->pcre1_jit_stack = pcre_jit_stack_alloc(1, 1024 * 1024);
-		if (!p->pcre1_jit_stack)
-			die("Couldn't allocate PCRE JIT stack");
-		pcre_assign_jit_stack(p->pcre1_extra_info, NULL, p->pcre1_jit_stack);
-	} else if (p->pcre1_jit_on != 0) {
-		BUG("The pcre1_jit_on variable should be 0 or 1, not %d",
-		    p->pcre1_jit_on);
-	}
+	if (opt->debug)
+		fprintf(stderr, "pcre1_jit_on=%d\n", p->pcre1_jit_on);
+
+	if (p->pcre1_jit_on)
+		study_options = PCRE_STUDY_JIT_COMPILE;
 #endif
+
+	p->pcre1_extra_info = pcre_study(p->pcre1_regexp, study_options, &error);
+	if (!p->pcre1_extra_info && error)
+		die("%s", error);
 }
 
 static int pcre1match(struct grep_pat *p, const char *line, const char *eol,
 		regmatch_t *match, int eflags)
 {
-	int ovector[30], ret, flags = 0;
+	int ovector[30], ret, flags = PCRE_NO_UTF8_CHECK;
 
 	if (eflags & REG_NOTBOL)
 		flags |= PCRE_NOTBOL;
 
-#ifdef GIT_PCRE1_USE_JIT
-	if (p->pcre1_jit_on) {
-		ret = pcre_jit_exec(p->pcre1_regexp, p->pcre1_extra_info, line,
-				    eol - line, 0, flags, ovector,
-				    ARRAY_SIZE(ovector), p->pcre1_jit_stack);
-	} else
-#endif
-	{
-		ret = pcre_exec(p->pcre1_regexp, p->pcre1_extra_info, line,
-				eol - line, 0, flags, ovector,
-				ARRAY_SIZE(ovector));
-	}
+	ret = pcre_exec(p->pcre1_regexp, p->pcre1_extra_info, line,
+			eol - line, 0, flags, ovector,
+			ARRAY_SIZE(ovector));
 
 	if (ret < 0 && ret != PCRE_ERROR_NOMATCH)
 		die("pcre_exec failed with error code %d", ret);
@@ -453,15 +466,12 @@ static int pcre1match(struct grep_pat *p, const char *line, const char *eol,
 static void free_pcre1_regexp(struct grep_pat *p)
 {
 	pcre_free(p->pcre1_regexp);
-#ifdef GIT_PCRE1_USE_JIT
-	if (p->pcre1_jit_on) {
+#ifdef PCRE_CONFIG_JIT
+	if (p->pcre1_jit_on)
 		pcre_free_study(p->pcre1_extra_info);
-		pcre_jit_stack_free(p->pcre1_jit_stack);
-	} else
+	else
 #endif
-	{
 		pcre_free(p->pcre1_extra_info);
-	}
 	pcre_free((void *)p->pcre1_tables);
 }
 #else /* !USE_LIBPCRE1 */
@@ -488,7 +498,6 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 	PCRE2_UCHAR errbuf[256];
 	PCRE2_SIZE erroffset;
 	int options = PCRE2_MULTILINE;
-	const uint8_t *character_tables = NULL;
 	int jitret;
 	int patinforet;
 	size_t jitsizearg;
@@ -497,15 +506,20 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 
 	p->pcre2_compile_context = NULL;
 
+	/* pcre2_global_context is initialized in append_grep_pattern */
 	if (opt->ignore_case) {
-		if (has_non_ascii(p->pattern)) {
-			character_tables = pcre2_maketables(NULL);
+		if (!opt->ignore_locale && has_non_ascii(p->pattern)) {
+			if (!pcre2_global_context)
+				BUG("pcre2_global_context uninitialized");
+			p->pcre2_tables = pcre2_maketables(pcre2_global_context);
 			p->pcre2_compile_context = pcre2_compile_context_create(NULL);
-			pcre2_set_character_tables(p->pcre2_compile_context, character_tables);
+			pcre2_set_character_tables(p->pcre2_compile_context,
+							p->pcre2_tables);
 		}
 		options |= PCRE2_CASELESS;
 	}
-	if (is_utf8_locale() && has_non_ascii(p->pattern))
+	if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern) &&
+	    !(!opt->ignore_case && (p->fixed || p->is_fixed)))
 		options |= PCRE2_UTF;
 
 	p->pcre2_pattern = pcre2_compile((PCRE2_SPTR)p->pattern,
@@ -522,7 +536,9 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 	}
 
 	pcre2_config(PCRE2_CONFIG_JIT, &p->pcre2_jit_on);
-	if (p->pcre2_jit_on == 1) {
+	if (opt->debug)
+		fprintf(stderr, "pcre2_jit_on=%d\n", p->pcre2_jit_on);
+	if (p->pcre2_jit_on) {
 		jitret = pcre2_jit_compile(p->pcre2_pattern, PCRE2_JIT_COMPLETE);
 		if (jitret)
 			die("Couldn't JIT the PCRE2 pattern '%s', got '%d'\n", p->pattern, jitret);
@@ -547,19 +563,11 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 			BUG("pcre2_pattern_info() failed: %d", patinforet);
 		if (jitsizearg == 0) {
 			p->pcre2_jit_on = 0;
+			if (opt->debug)
+				fprintf(stderr, "pcre2_jit_on=%d: (*NO_JIT) in regex\n",
+					p->pcre2_jit_on);
 			return;
 		}
-
-		p->pcre2_jit_stack = pcre2_jit_stack_create(1, 1024 * 1024, NULL);
-		if (!p->pcre2_jit_stack)
-			die("Couldn't allocate PCRE2 JIT stack");
-		p->pcre2_match_context = pcre2_match_context_create(NULL);
-		if (!p->pcre2_match_context)
-			die("Couldn't allocate PCRE2 match context");
-		pcre2_jit_stack_assign(p->pcre2_match_context, NULL, p->pcre2_jit_stack);
-	} else if (p->pcre2_jit_on != 0) {
-		BUG("The pcre2_jit_on variable should be 0 or 1, not %d",
-		    p->pcre2_jit_on);
 	}
 }
 
@@ -603,8 +611,7 @@ static void free_pcre2_pattern(struct grep_pat *p)
 	pcre2_compile_context_free(p->pcre2_compile_context);
 	pcre2_code_free(p->pcre2_pattern);
 	pcre2_match_data_free(p->pcre2_match_data);
-	pcre2_jit_stack_free(p->pcre2_jit_stack);
-	pcre2_match_context_free(p->pcre2_match_context);
+	free((void *)p->pcre2_tables);
 }
 #else /* !USE_LIBPCRE2 */
 static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt)
@@ -626,7 +633,6 @@ static int pcre2match(struct grep_pat *p, const char *line, const char *eol,
 static void free_pcre2_pattern(struct grep_pat *p)
 {
 }
-#endif /* !USE_LIBPCRE2 */
 
 static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)
 {
@@ -647,46 +653,66 @@ static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)
 		compile_regexp_failed(p, errbuf);
 	}
 }
+#endif /* !USE_LIBPCRE2 */
 
 static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
 {
-	int ascii_only;
 	int err;
 	int regflags = REG_NEWLINE;
 
 	p->word_regexp = opt->word_regexp;
 	p->ignore_case = opt->ignore_case;
-	ascii_only     = !has_non_ascii(p->pattern);
+	p->fixed = opt->fixed;
 
-	/*
-	 * Even when -F (fixed) asks us to do a non-regexp search, we
-	 * may not be able to correctly case-fold when -i
-	 * (ignore-case) is asked (in which case, we'll synthesize a
-	 * regexp to match the pattern that matches regexp special
-	 * characters literally, while ignoring case differences).  On
-	 * the other hand, even without -F, if the pattern does not
-	 * have any regexp special characters and there is no need for
-	 * case-folding search, we can internally turn it into a
-	 * simple string match using kws.  p->fixed tells us if we
-	 * want to use kws.
-	 */
-	if (opt->fixed ||
-	    has_null(p->pattern, p->patternlen) ||
-	    is_fixed(p->pattern, p->patternlen))
-		p->fixed = !p->ignore_case || ascii_only;
-
-	if (p->fixed) {
-		p->kws = kwsalloc(p->ignore_case ? tolower_trans_tbl : NULL);
-		kwsincr(p->kws, p->pattern, p->patternlen);
-		kwsprep(p->kws);
-		return;
-	} else if (opt->fixed) {
-		/*
-		 * We come here when the pattern has the non-ascii
-		 * characters we cannot case-fold, and asked to
-		 * ignore-case.
-		 */
+	if (memchr(p->pattern, 0, p->patternlen) && !opt->pcre2)
+		die(_("given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2"));
+
+	p->is_fixed = is_fixed(p->pattern, p->patternlen);
+#ifdef USE_LIBPCRE2
+       if (!p->fixed && !p->is_fixed) {
+	       const char *no_jit = "(*NO_JIT)";
+	       const int no_jit_len = strlen(no_jit);
+	       if (starts_with(p->pattern, no_jit) &&
+		   is_fixed(p->pattern + no_jit_len,
+			    p->patternlen - no_jit_len))
+		       p->is_fixed = 1;
+       }
+#endif
+	if (p->fixed || p->is_fixed) {
+#ifdef USE_LIBPCRE2
+		opt->pcre2 = 1;
+		if (p->is_fixed) {
+			compile_pcre2_pattern(p, opt);
+		} else {
+			/*
+			 * E.g. t7811-grep-open.sh relies on the
+			 * pattern being restored.
+			 */
+			char *old_pattern = p->pattern;
+			size_t old_patternlen = p->patternlen;
+			struct strbuf sb = STRBUF_INIT;
+
+			/*
+			 * There is the PCRE2_LITERAL flag, but it's
+			 * only in PCRE v2 10.30 and later. Needing to
+			 * ifdef our way around that and dealing with
+			 * it + PCRE2_MULTILINE being an error is more
+			 * complex than just quoting this ourselves.
+			*/
+			strbuf_add(&sb, "\\Q", 2);
+			strbuf_add(&sb, p->pattern, p->patternlen);
+			strbuf_add(&sb, "\\E", 2);
+
+			p->pattern = sb.buf;
+			p->patternlen = sb.len;
+			compile_pcre2_pattern(p, opt);
+			p->pattern = old_pattern;
+			p->patternlen = old_patternlen;
+			strbuf_release(&sb);
+		}
+#else /* !USE_LIBPCRE2 */
 		compile_fixed_regexp(p, opt);
+#endif /* !USE_LIBPCRE2 */
 		return;
 	}
 
@@ -1053,9 +1079,7 @@ void free_grep_patterns(struct grep_opt *opt)
 		case GREP_PATTERN: /* atom */
 		case GREP_PATTERN_HEAD:
 		case GREP_PATTERN_BODY:
-			if (p->kws)
-				kwsfree(p->kws);
-			else if (p->pcre1_regexp)
+			if (p->pcre1_regexp)
 				free_pcre1_regexp(p);
 			else if (p->pcre2_pattern)
 				free_pcre2_pattern(p);
@@ -1115,29 +1139,12 @@ static void show_name(struct grep_opt *opt, const char *name)
 	opt->output(opt, opt->null_following_name ? "\0" : "\n", 1);
 }
 
-static int fixmatch(struct grep_pat *p, char *line, char *eol,
-		    regmatch_t *match)
-{
-	struct kwsmatch kwsm;
-	size_t offset = kwsexec(p->kws, line, eol - line, &kwsm);
-	if (offset == -1) {
-		match->rm_so = match->rm_eo = -1;
-		return REG_NOMATCH;
-	} else {
-		match->rm_so = offset;
-		match->rm_eo = match->rm_so + kwsm.size[0];
-		return 0;
-	}
-}
-
 static int patmatch(struct grep_pat *p, char *line, char *eol,
 		    regmatch_t *match, int eflags)
 {
 	int hit;
 
-	if (p->fixed)
-		hit = !fixmatch(p, line, eol, match);
-	else if (p->pcre1_regexp)
+	if (p->pcre1_regexp)
 		hit = !pcre1match(p, line, eol, match, eflags);
 	else if (p->pcre2_pattern)
 		hit = !pcre2match(p, line, eol, match, eflags);
@@ -1533,11 +1540,6 @@ static inline void grep_attr_unlock(void)
 		pthread_mutex_unlock(&grep_attr_mutex);
 }
 
-/*
- * Same as git_attr_mutex, but protecting the thread-unsafe object db access.
- */
-pthread_mutex_t grep_read_mutex;
-
 static int match_funcname(struct grep_opt *opt, struct grep_source *gs, char *bol, char *eol)
 {
 	xdemitconf_t *xecfg = opt->priv;
@@ -1734,13 +1736,20 @@ static int fill_textconv_grep(struct repository *r,
 	}
 
 	/*
-	 * fill_textconv is not remotely thread-safe; it may load objects
-	 * behind the scenes, and it modifies the global diff tempfile
-	 * structure.
+	 * fill_textconv is not remotely thread-safe; it modifies the global
+	 * diff tempfile structure, writes to the_repo's odb and might
+	 * internally call thread-unsafe functions such as the
+	 * prepare_packed_git() lazy-initializator. Because of the last two, we
+	 * must ensure mutual exclusion between this call and the object reading
+	 * API, thus we use obj_read_lock() here.
+	 *
+	 * TODO: allowing text conversion to run in parallel with object
+	 * reading operations might increase performance in the multithreaded
+	 * non-worktreee git-grep with --textconv.
 	 */
-	grep_read_lock();
+	obj_read_lock();
 	size = fill_textconv(r, driver, df, &buf);
-	grep_read_unlock();
+	obj_read_unlock();
 	free_filespec(df);
 
 	/*
@@ -1806,10 +1815,15 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 		grep_source_load_driver(gs, opt->repo->index);
 		/*
 		 * We might set up the shared textconv cache data here, which
-		 * is not thread-safe.
+		 * is not thread-safe. Also, get_oid_with_context() and
+		 * parse_object() might be internally called. As they are not
+		 * currenty thread-safe and might be racy with object reading,
+		 * obj_read_lock() must be called.
 		 */
 		grep_attr_lock();
+		obj_read_lock();
 		textconv = userdiff_get_textconv(opt->repo, gs->driver);
+		obj_read_unlock();
 		grep_attr_unlock();
 	}
 
@@ -2109,10 +2123,7 @@ static int grep_source_load_oid(struct grep_source *gs)
 {
 	enum object_type type;
 
-	grep_read_lock();
 	gs->buf = read_object_file(gs->identifier, &type, &gs->size);
-	grep_read_unlock();
-
 	if (!gs->buf)
 		return error(_("'%s': unable to read %s"),
 			     gs->name,
diff --git a/third_party/git/grep.h b/third_party/git/grep.h
index 1875880f3799..9115db851505 100644
--- a/third_party/git/grep.h
+++ b/third_party/git/grep.h
@@ -3,24 +3,12 @@
 #include "color.h"
 #ifdef USE_LIBPCRE1
 #include <pcre.h>
-#ifdef PCRE_CONFIG_JIT
-#if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32
-#ifndef NO_LIBPCRE1_JIT
-#define GIT_PCRE1_USE_JIT
-#define GIT_PCRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE
-#endif
-#endif
-#endif
-#ifndef GIT_PCRE_STUDY_JIT_COMPILE
-#define GIT_PCRE_STUDY_JIT_COMPILE 0
-#endif
-#if PCRE_MAJOR <= 8 && PCRE_MINOR < 20
-typedef int pcre_jit_stack;
+#ifndef PCRE_NO_UTF8_CHECK
+#define PCRE_NO_UTF8_CHECK 0
 #endif
 #else
 typedef int pcre;
 typedef int pcre_extra;
-typedef int pcre_jit_stack;
 #endif
 #ifdef USE_LIBPCRE2
 #define PCRE2_CODE_UNIT_WIDTH 8
@@ -29,10 +17,7 @@ typedef int pcre_jit_stack;
 typedef int pcre2_code;
 typedef int pcre2_match_data;
 typedef int pcre2_compile_context;
-typedef int pcre2_match_context;
-typedef int pcre2_jit_stack;
 #endif
-#include "kwset.h"
 #include "thread-utils.h"
 #include "userdiff.h"
 
@@ -88,17 +73,15 @@ struct grep_pat {
 	regex_t regexp;
 	pcre *pcre1_regexp;
 	pcre_extra *pcre1_extra_info;
-	pcre_jit_stack *pcre1_jit_stack;
 	const unsigned char *pcre1_tables;
 	int pcre1_jit_on;
 	pcre2_code *pcre2_pattern;
 	pcre2_match_data *pcre2_match_data;
 	pcre2_compile_context *pcre2_compile_context;
-	pcre2_match_context *pcre2_match_context;
-	pcre2_jit_stack *pcre2_jit_stack;
+	const uint8_t *pcre2_tables;
 	uint32_t pcre2_jit_on;
-	kwset_t kws;
 	unsigned fixed:1;
+	unsigned is_fixed:1;
 	unsigned ignore_case:1;
 	unsigned word_regexp:1;
 };
@@ -173,6 +156,7 @@ struct grep_opt {
 	int funcbody;
 	int extended_regexp_option;
 	int pattern_type_option;
+	int ignore_locale;
 	char colors[NR_GREP_COLORS][COLOR_MAXLEN];
 	unsigned pre_context;
 	unsigned post_context;
@@ -189,6 +173,7 @@ struct grep_opt {
 void init_grep_defaults(struct repository *);
 int grep_config(const char *var, const char *value, void *);
 void grep_init(struct grep_opt *, struct repository *repo, const char *prefix);
+void grep_destroy(void);
 void grep_commit_pattern_type(enum grep_pattern_type, struct grep_opt *opt);
 
 void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t);
@@ -235,18 +220,5 @@ int grep_threads_ok(const struct grep_opt *opt);
  */
 extern int grep_use_locks;
 extern pthread_mutex_t grep_attr_mutex;
-extern pthread_mutex_t grep_read_mutex;
-
-static inline void grep_read_lock(void)
-{
-	if (grep_use_locks)
-		pthread_mutex_lock(&grep_read_mutex);
-}
-
-static inline void grep_read_unlock(void)
-{
-	if (grep_use_locks)
-		pthread_mutex_unlock(&grep_read_mutex);
-}
 
 #endif
diff --git a/third_party/git/hashmap.c b/third_party/git/hashmap.c
index d42f01ff5ae6..09813e1a4667 100644
--- a/third_party/git/hashmap.c
+++ b/third_party/git/hashmap.c
@@ -51,7 +51,7 @@ unsigned int memihash(const void *buf, size_t len)
 }
 
 /*
- * Incoporate another chunk of data into a memihash
+ * Incorporate another chunk of data into a memihash
  * computation.
  */
 unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len)
@@ -140,8 +140,8 @@ static inline struct hashmap_entry **find_entry_ptr(const struct hashmap *map,
 }
 
 static int always_equal(const void *unused_cmp_data,
-			const void *unused1,
-			const void *unused2,
+			const struct hashmap_entry *unused1,
+			const struct hashmap_entry *unused2,
 			const void *unused_keydata)
 {
 	return 0;
@@ -171,41 +171,49 @@ void hashmap_init(struct hashmap *map, hashmap_cmp_fn equals_function,
 	map->do_count_items = 1;
 }
 
-void hashmap_free(struct hashmap *map, int free_entries)
+void hashmap_free_(struct hashmap *map, ssize_t entry_offset)
 {
 	if (!map || !map->table)
 		return;
-	if (free_entries) {
+	if (entry_offset >= 0) { /* called by hashmap_free_entries */
 		struct hashmap_iter iter;
 		struct hashmap_entry *e;
+
 		hashmap_iter_init(map, &iter);
 		while ((e = hashmap_iter_next(&iter)))
-			free(e);
+			/*
+			 * like container_of, but using caller-calculated
+			 * offset (caller being hashmap_free_entries)
+			 */
+			free((char *)e - entry_offset);
 	}
 	free(map->table);
 	memset(map, 0, sizeof(*map));
 }
 
-void *hashmap_get(const struct hashmap *map, const void *key, const void *keydata)
+struct hashmap_entry *hashmap_get(const struct hashmap *map,
+				const struct hashmap_entry *key,
+				const void *keydata)
 {
 	return *find_entry_ptr(map, key, keydata);
 }
 
-void *hashmap_get_next(const struct hashmap *map, const void *entry)
+struct hashmap_entry *hashmap_get_next(const struct hashmap *map,
+			const struct hashmap_entry *entry)
 {
-	struct hashmap_entry *e = ((struct hashmap_entry *) entry)->next;
+	struct hashmap_entry *e = entry->next;
 	for (; e; e = e->next)
 		if (entry_equals(map, entry, e, NULL))
 			return e;
 	return NULL;
 }
 
-void hashmap_add(struct hashmap *map, void *entry)
+void hashmap_add(struct hashmap *map, struct hashmap_entry *entry)
 {
 	unsigned int b = bucket(map, entry);
 
 	/* add entry */
-	((struct hashmap_entry *) entry)->next = map->table[b];
+	entry->next = map->table[b];
 	map->table[b] = entry;
 
 	/* fix size and rehash if appropriate */
@@ -216,7 +224,9 @@ void hashmap_add(struct hashmap *map, void *entry)
 	}
 }
 
-void *hashmap_remove(struct hashmap *map, const void *key, const void *keydata)
+struct hashmap_entry *hashmap_remove(struct hashmap *map,
+					const struct hashmap_entry *key,
+					const void *keydata)
 {
 	struct hashmap_entry *old;
 	struct hashmap_entry **e = find_entry_ptr(map, key, keydata);
@@ -238,7 +248,8 @@ void *hashmap_remove(struct hashmap *map, const void *key, const void *keydata)
 	return old;
 }
 
-void *hashmap_put(struct hashmap *map, void *entry)
+struct hashmap_entry *hashmap_put(struct hashmap *map,
+				struct hashmap_entry *entry)
 {
 	struct hashmap_entry *old = hashmap_remove(map, entry, NULL);
 	hashmap_add(map, entry);
@@ -252,7 +263,7 @@ void hashmap_iter_init(struct hashmap *map, struct hashmap_iter *iter)
 	iter->next = NULL;
 }
 
-void *hashmap_iter_next(struct hashmap_iter *iter)
+struct hashmap_entry *hashmap_iter_next(struct hashmap_iter *iter)
 {
 	struct hashmap_entry *current = iter->next;
 	for (;;) {
@@ -275,10 +286,15 @@ struct pool_entry {
 };
 
 static int pool_entry_cmp(const void *unused_cmp_data,
-			  const struct pool_entry *e1,
-			  const struct pool_entry *e2,
-			  const unsigned char *keydata)
+			  const struct hashmap_entry *eptr,
+			  const struct hashmap_entry *entry_or_key,
+			  const void *keydata)
 {
+	const struct pool_entry *e1, *e2;
+
+	e1 = container_of(eptr, const struct pool_entry, ent);
+	e2 = container_of(entry_or_key, const struct pool_entry, ent);
+
 	return e1->data != keydata &&
 	       (e1->len != e2->len || memcmp(e1->data, keydata, e1->len));
 }
@@ -290,18 +306,18 @@ const void *memintern(const void *data, size_t len)
 
 	/* initialize string pool hashmap */
 	if (!map.tablesize)
-		hashmap_init(&map, (hashmap_cmp_fn) pool_entry_cmp, NULL, 0);
+		hashmap_init(&map, pool_entry_cmp, NULL, 0);
 
 	/* lookup interned string in pool */
-	hashmap_entry_init(&key, memhash(data, len));
+	hashmap_entry_init(&key.ent, memhash(data, len));
 	key.len = len;
-	e = hashmap_get(&map, &key, data);
+	e = hashmap_get_entry(&map, &key, ent, data);
 	if (!e) {
 		/* not found: create it */
 		FLEX_ALLOC_MEM(e, data, data, len);
-		hashmap_entry_init(e, key.ent.hash);
+		hashmap_entry_init(&e->ent, key.ent.hash);
 		e->len = len;
-		hashmap_add(&map, e);
+		hashmap_add(&map, &e->ent);
 	}
 	return e->data;
 }
diff --git a/third_party/git/hashmap.h b/third_party/git/hashmap.h
index 84249115664b..79ae9f80de1c 100644
--- a/third_party/git/hashmap.h
+++ b/third_party/git/hashmap.h
@@ -13,7 +13,7 @@
  *
  * struct hashmap map;
  * struct long2string {
- *     struct hashmap_entry ent; // must be the first member!
+ *     struct hashmap_entry ent;
  *     long key;
  *     char value[FLEX_ARRAY];   // be careful with allocating on stack!
  * };
@@ -21,12 +21,16 @@
  * #define COMPARE_VALUE 1
  *
  * static int long2string_cmp(const void *hashmap_cmp_fn_data,
- *                            const struct long2string *e1,
- *                            const struct long2string *e2,
+ *                            const struct hashmap_entry *eptr,
+ *                            const struct hashmap_entry *entry_or_key,
  *                            const void *keydata)
  * {
  *     const char *string = keydata;
  *     unsigned flags = *(unsigned *)hashmap_cmp_fn_data;
+ *     const struct long2string *e1, *e2;
+ *
+ *     e1 = container_of(eptr, const struct long2string, ent);
+ *     e2 = container_of(entry_or_key, const struct long2string, ent);
  *
  *     if (flags & COMPARE_VALUE)
  *         return e1->key != e2->key ||
@@ -41,54 +45,58 @@
  *     char value[255], action[32];
  *     unsigned flags = 0;
  *
- *     hashmap_init(&map, (hashmap_cmp_fn) long2string_cmp, &flags, 0);
+ *     hashmap_init(&map, long2string_cmp, &flags, 0);
  *
  *     while (scanf("%s %ld %s", action, &key, value)) {
  *
  *         if (!strcmp("add", action)) {
  *             struct long2string *e;
  *             FLEX_ALLOC_STR(e, value, value);
- *             hashmap_entry_init(e, memhash(&key, sizeof(long)));
+ *             hashmap_entry_init(&e->ent, memhash(&key, sizeof(long)));
  *             e->key = key;
- *             hashmap_add(&map, e);
+ *             hashmap_add(&map, &e->ent);
  *         }
  *
  *         if (!strcmp("print_all_by_key", action)) {
  *             struct long2string k, *e;
- *             hashmap_entry_init(&k, memhash(&key, sizeof(long)));
+ *             hashmap_entry_init(&k.ent, memhash(&key, sizeof(long)));
  *             k.key = key;
  *
  *             flags &= ~COMPARE_VALUE;
- *             e = hashmap_get(&map, &k, NULL);
+ *             e = hashmap_get_entry(&map, &k, ent, NULL);
  *             if (e) {
  *                 printf("first: %ld %s\n", e->key, e->value);
- *                 while ((e = hashmap_get_next(&map, e)))
+ *                 while ((e = hashmap_get_next_entry(&map, e,
+ *                                              struct long2string, ent))) {
  *                     printf("found more: %ld %s\n", e->key, e->value);
+ *                 }
  *             }
  *         }
  *
  *         if (!strcmp("has_exact_match", action)) {
  *             struct long2string *e;
  *             FLEX_ALLOC_STR(e, value, value);
- *             hashmap_entry_init(e, memhash(&key, sizeof(long)));
+ *             hashmap_entry_init(&e->ent, memhash(&key, sizeof(long)));
  *             e->key = key;
  *
  *             flags |= COMPARE_VALUE;
- *             printf("%sfound\n", hashmap_get(&map, e, NULL) ? "" : "not ");
+ *             printf("%sfound\n",
+ *                    hashmap_get(&map, &e->ent, NULL) ? "" : "not ");
  *             free(e);
  *         }
  *
  *         if (!strcmp("has_exact_match_no_heap_alloc", action)) {
  *             struct long2string k;
- *             hashmap_entry_init(&k, memhash(&key, sizeof(long)));
+ *             hashmap_entry_init(&k.ent, memhash(&key, sizeof(long)));
  *             k.key = key;
  *
  *             flags |= COMPARE_VALUE;
- *             printf("%sfound\n", hashmap_get(&map, &k, value) ? "" : "not ");
+ *             printf("%sfound\n",
+ *                    hashmap_get(&map, &k.ent, value) ? "" : "not ");
  *         }
  *
  *         if (!strcmp("end", action)) {
- *             hashmap_free(&map, 1);
+ *             hashmap_free_entries(&map, struct long2string, ent);
  *             break;
  *         }
  *     }
@@ -133,7 +141,7 @@ static inline unsigned int oidhash(const struct object_id *oid)
 
 /*
  * struct hashmap_entry is an opaque structure representing an entry in the
- * hash table, which must be used as first member of user data structures.
+ * hash table.
  * Ideally it should be followed by an int-sized member to prevent unused
  * memory on 64-bit systems due to alignment.
  */
@@ -168,7 +176,8 @@ struct hashmap_entry {
  * The `hashmap_cmp_fn_data` entry is the pointer given in the init function.
  */
 typedef int (*hashmap_cmp_fn)(const void *hashmap_cmp_fn_data,
-			      const void *entry, const void *entry_or_key,
+			      const struct hashmap_entry *entry,
+			      const struct hashmap_entry *entry_or_key,
 			      const void *keydata);
 
 /*
@@ -223,13 +232,20 @@ void hashmap_init(struct hashmap *map,
 			 const void *equals_function_data,
 			 size_t initial_size);
 
+/* internal function for freeing hashmap */
+void hashmap_free_(struct hashmap *map, ssize_t offset);
+
 /*
- * Frees a hashmap structure and allocated memory.
- *
- * If `free_entries` is true, each hashmap_entry in the map is freed as well
- * using stdlibs free().
+ * Frees a hashmap structure and allocated memory, leaves entries undisturbed
  */
-void hashmap_free(struct hashmap *map, int free_entries);
+#define hashmap_free(map) hashmap_free_(map, -1)
+
+/*
+ * Frees @map and all entries.  @type is the struct type of the entry
+ * where @member is the hashmap_entry struct used to associate with @map
+ */
+#define hashmap_free_entries(map, type, member) \
+	hashmap_free_(map, offsetof(type, member));
 
 /* hashmap_entry functions */
 
@@ -244,9 +260,9 @@ void hashmap_free(struct hashmap *map, int free_entries);
  * your structure was allocated with xmalloc(), you can just free(3) it,
  * and if it is on stack, you can just let it go out of scope).
  */
-static inline void hashmap_entry_init(void *entry, unsigned int hash)
+static inline void hashmap_entry_init(struct hashmap_entry *e,
+					unsigned int hash)
 {
-	struct hashmap_entry *e = entry;
 	e->hash = hash;
 	e->next = NULL;
 }
@@ -286,8 +302,9 @@ static inline unsigned int hashmap_get_size(struct hashmap *map)
  * If an entry with matching hash code is found, `key` and `keydata` are passed
  * to `hashmap_cmp_fn` to decide whether the entry matches the key.
  */
-void *hashmap_get(const struct hashmap *map, const void *key,
-			 const void *keydata);
+struct hashmap_entry *hashmap_get(const struct hashmap *map,
+				const struct hashmap_entry *key,
+				const void *keydata);
 
 /*
  * Returns the hashmap entry for the specified hash code and key data,
@@ -301,9 +318,10 @@ void *hashmap_get(const struct hashmap *map, const void *key,
  * `entry_or_key` parameter of `hashmap_cmp_fn` points to a hashmap_entry
  * structure that should not be used in the comparison.
  */
-static inline void *hashmap_get_from_hash(const struct hashmap *map,
-					  unsigned int hash,
-					  const void *keydata)
+static inline struct hashmap_entry *hashmap_get_from_hash(
+					const struct hashmap *map,
+					unsigned int hash,
+					const void *keydata)
 {
 	struct hashmap_entry key;
 	hashmap_entry_init(&key, hash);
@@ -318,7 +336,8 @@ static inline void *hashmap_get_from_hash(const struct hashmap *map,
  * `entry` is the hashmap_entry to start the search from, obtained via a previous
  * call to `hashmap_get` or `hashmap_get_next`.
  */
-void *hashmap_get_next(const struct hashmap *map, const void *entry);
+struct hashmap_entry *hashmap_get_next(const struct hashmap *map,
+			const struct hashmap_entry *entry);
 
 /*
  * Adds a hashmap entry. This allows to add duplicate entries (i.e.
@@ -327,7 +346,7 @@ void *hashmap_get_next(const struct hashmap *map, const void *entry);
  * `map` is the hashmap structure.
  * `entry` is the entry to add.
  */
-void hashmap_add(struct hashmap *map, void *entry);
+void hashmap_add(struct hashmap *map, struct hashmap_entry *entry);
 
 /*
  * Adds or replaces a hashmap entry. If the hashmap contains duplicate
@@ -337,7 +356,20 @@ void hashmap_add(struct hashmap *map, void *entry);
  * `entry` is the entry to add or replace.
  * Returns the replaced entry, or NULL if not found (i.e. the entry was added).
  */
-void *hashmap_put(struct hashmap *map, void *entry);
+struct hashmap_entry *hashmap_put(struct hashmap *map,
+				struct hashmap_entry *entry);
+
+/*
+ * Adds or replaces a hashmap entry contained within @keyvar,
+ * where @keyvar is a pointer to a struct containing a
+ * "struct hashmap_entry" @member.
+ *
+ * Returns the replaced pointer which is of the same type as @keyvar,
+ * or NULL if not found.
+ */
+#define hashmap_put_entry(map, keyvar, member) \
+	container_of_or_null_offset(hashmap_put(map, &(keyvar)->member), \
+				OFFSETOF_VAR(keyvar, member))
 
 /*
  * Removes a hashmap entry matching the specified key. If the hashmap contains
@@ -346,8 +378,24 @@ void *hashmap_put(struct hashmap *map, void *entry);
  *
  * Argument explanation is the same as in `hashmap_get`.
  */
-void *hashmap_remove(struct hashmap *map, const void *key,
-		const void *keydata);
+struct hashmap_entry *hashmap_remove(struct hashmap *map,
+					const struct hashmap_entry *key,
+					const void *keydata);
+
+/*
+ * Removes a hashmap entry contained within @keyvar,
+ * where @keyvar is a pointer to a struct containing a
+ * "struct hashmap_entry" @member.
+ *
+ * See `hashmap_get` for an explanation of @keydata
+ *
+ * Returns the replaced pointer which is of the same type as @keyvar,
+ * or NULL if not found.
+ */
+#define hashmap_remove_entry(map, keyvar, member, keydata) \
+	container_of_or_null_offset( \
+			hashmap_remove(map, &(keyvar)->member, keydata), \
+			OFFSETOF_VAR(keyvar, member))
 
 /*
  * Returns the `bucket` an entry is stored in.
@@ -370,10 +418,10 @@ struct hashmap_iter {
 void hashmap_iter_init(struct hashmap *map, struct hashmap_iter *iter);
 
 /* Returns the next hashmap_entry, or NULL if there are no more entries. */
-void *hashmap_iter_next(struct hashmap_iter *iter);
+struct hashmap_entry *hashmap_iter_next(struct hashmap_iter *iter);
 
 /* Initializes the iterator and returns the first entry, if any. */
-static inline void *hashmap_iter_first(struct hashmap *map,
+static inline struct hashmap_entry *hashmap_iter_first(struct hashmap *map,
 		struct hashmap_iter *iter)
 {
 	hashmap_iter_init(map, iter);
@@ -381,6 +429,64 @@ static inline void *hashmap_iter_first(struct hashmap *map,
 }
 
 /*
+ * returns the first entry in @map using @iter, where the entry is of
+ * @type (e.g. "struct foo") and @member is the name of the
+ * "struct hashmap_entry" in @type
+ */
+#define hashmap_iter_first_entry(map, iter, type, member) \
+	container_of_or_null(hashmap_iter_first(map, iter), type, member)
+
+/* internal macro for hashmap_for_each_entry */
+#define hashmap_iter_next_entry_offset(iter, offset) \
+	container_of_or_null_offset(hashmap_iter_next(iter), offset)
+
+/* internal macro for hashmap_for_each_entry */
+#define hashmap_iter_first_entry_offset(map, iter, offset) \
+	container_of_or_null_offset(hashmap_iter_first(map, iter), offset)
+
+/*
+ * iterate through @map using @iter, @var is a pointer to a type
+ * containing a @member which is a "struct hashmap_entry"
+ */
+#define hashmap_for_each_entry(map, iter, var, member) \
+	for (var = hashmap_iter_first_entry_offset(map, iter, \
+						OFFSETOF_VAR(var, member)); \
+		var; \
+		var = hashmap_iter_next_entry_offset(iter, \
+						OFFSETOF_VAR(var, member)))
+
+/*
+ * returns a pointer of type matching @keyvar, or NULL if nothing found.
+ * @keyvar is a pointer to a struct containing a
+ * "struct hashmap_entry" @member.
+ */
+#define hashmap_get_entry(map, keyvar, member, keydata) \
+	container_of_or_null_offset( \
+				hashmap_get(map, &(keyvar)->member, keydata), \
+				OFFSETOF_VAR(keyvar, member))
+
+#define hashmap_get_entry_from_hash(map, hash, keydata, type, member) \
+	container_of_or_null(hashmap_get_from_hash(map, hash, keydata), \
+				type, member)
+/*
+ * returns the next equal pointer to @var, or NULL if not found.
+ * @var is a pointer of any type containing "struct hashmap_entry"
+ * @member is the name of the "struct hashmap_entry" field
+ */
+#define hashmap_get_next_entry(map, var, member) \
+	container_of_or_null_offset(hashmap_get_next(map, &(var)->member), \
+				OFFSETOF_VAR(var, member))
+
+/*
+ * iterate @map starting from @var, where @var is a pointer of @type
+ * and @member is the name of the "struct hashmap_entry" field in @type
+ */
+#define hashmap_for_each_entry_from(map, var, member) \
+	for (; \
+		var; \
+		var = hashmap_get_next_entry(map, var, member))
+
+/*
  * Disable item counting and automatic rehashing when adding/removing items.
  *
  * Normally, the hashmap keeps track of the number of items in the map
@@ -396,7 +502,7 @@ static inline void hashmap_disable_item_counting(struct hashmap *map)
 }
 
 /*
- * Re-enable item couting when adding/removing items.
+ * Re-enable item counting when adding/removing items.
  * If counting is currently disabled, it will force count them.
  * It WILL NOT automatically rehash them.
  */
diff --git a/third_party/git/help.c b/third_party/git/help.c
index 5261d83ecf15..cf67624a94bc 100644
--- a/third_party/git/help.c
+++ b/third_party/git/help.c
@@ -34,7 +34,7 @@ static struct category_description main_categories[] = {
 	{ CAT_foreignscminterface, N_("Interacting with Others") },
 	{ CAT_plumbingmanipulators, N_("Low-level Commands / Manipulators") },
 	{ CAT_plumbinginterrogators, N_("Low-level Commands / Interrogators") },
-	{ CAT_synchingrepositories, N_("Low-level Commands / Synching Repositories") },
+	{ CAT_synchingrepositories, N_("Low-level Commands / Syncing Repositories") },
 	{ CAT_purehelpers, N_("Low-level Commands / Internal Helpers") },
 	{ 0, NULL }
 };
@@ -774,7 +774,8 @@ static struct string_list guess_refs(const char *ref)
 	return similar_refs;
 }
 
-void help_unknown_ref(const char *ref, const char *cmd, const char *error)
+NORETURN void help_unknown_ref(const char *ref, const char *cmd,
+			       const char *error)
 {
 	int i;
 	struct string_list suggested_refs = guess_refs(ref);
diff --git a/third_party/git/help.h b/third_party/git/help.h
index b8780fbd0fc3..7a455beeb725 100644
--- a/third_party/git/help.h
+++ b/third_party/git/help.h
@@ -43,7 +43,7 @@ void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdn
  * call this to die(), when it is suspected that the user mistyped a
  * ref to the command, to give suggested "correct" refs.
  */
-void help_unknown_ref(const char *ref, const char *cmd, const char *error);
+NORETURN void help_unknown_ref(const char *ref, const char *cmd, const char *error);
 
 static inline void list_config_item(struct string_list *list,
 				    const char *prefix,
diff --git a/third_party/git/hex.c b/third_party/git/hex.c
index 7850a8879d5e..fd7f00c43f96 100644
--- a/third_party/git/hex.c
+++ b/third_party/git/hex.c
@@ -90,11 +90,6 @@ char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash,
 	return buffer;
 }
 
-char *sha1_to_hex_r(char *buffer, const unsigned char *sha1)
-{
-	return hash_to_hex_algop_r(buffer, sha1, &hash_algos[GIT_HASH_SHA1]);
-}
-
 char *oid_to_hex_r(char *buffer, const struct object_id *oid)
 {
 	return hash_to_hex_algop_r(buffer, oid->hash, the_hash_algo);
@@ -108,11 +103,6 @@ char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *a
 	return hash_to_hex_algop_r(hexbuffer[bufno], hash, algop);
 }
 
-char *sha1_to_hex(const unsigned char *sha1)
-{
-	return hash_to_hex_algop(sha1, &hash_algos[GIT_HASH_SHA1]);
-}
-
 char *hash_to_hex(const unsigned char *hash)
 {
 	return hash_to_hex_algop(hash, the_hash_algo);
diff --git a/third_party/git/http-push.c b/third_party/git/http-push.c
index 0353f9f5143d..822f32659936 100644
--- a/third_party/git/http-push.c
+++ b/third_party/git/http-push.c
@@ -501,10 +501,10 @@ static void release_request(struct transfer_request *request)
 	if (request == request_queue_head) {
 		request_queue_head = request->next;
 	} else {
-		while (entry->next != NULL && entry->next != request)
+		while (entry && entry->next != request)
 			entry = entry->next;
-		if (entry->next == request)
-			entry->next = entry->next->next;
+		if (entry)
+			entry->next = request->next;
 	}
 
 	free(request->url);
@@ -981,7 +981,7 @@ static int unlock_remote(struct remote_lock *lock)
 		while (prev && prev->next != lock)
 			prev = prev->next;
 		if (prev)
-			prev->next = prev->next->next;
+			prev->next = lock->next;
 	}
 
 	free(lock->owner);
diff --git a/third_party/git/http.c b/third_party/git/http.c
index 27aa0a319298..5f712634825e 100644
--- a/third_party/git/http.c
+++ b/third_party/git/http.c
@@ -150,7 +150,7 @@ static unsigned long empty_auth_useless =
 
 static struct curl_slist *pragma_header;
 static struct curl_slist *no_pragma_header;
-static struct curl_slist *extra_http_headers;
+static struct string_list extra_http_headers = STRING_LIST_INIT_DUP;
 
 static struct active_request_slot *active_queue_head;
 
@@ -414,11 +414,9 @@ static int http_options(const char *var, const char *value, void *cb)
 		if (!value) {
 			return config_error_nonbool(var);
 		} else if (!*value) {
-			curl_slist_free_all(extra_http_headers);
-			extra_http_headers = NULL;
+			string_list_clear(&extra_http_headers, 0);
 		} else {
-			extra_http_headers =
-				curl_slist_append(extra_http_headers, value);
+			string_list_append(&extra_http_headers, value);
 		}
 		return 0;
 	}
@@ -513,9 +511,11 @@ static void set_proxyauth_name_password(CURL *result)
 #else
 		struct strbuf s = STRBUF_INIT;
 
-		strbuf_addstr_urlencode(&s, proxy_auth.username, 1);
+		strbuf_addstr_urlencode(&s, proxy_auth.username,
+					is_rfc3986_unreserved);
 		strbuf_addch(&s, ':');
-		strbuf_addstr_urlencode(&s, proxy_auth.password, 1);
+		strbuf_addstr_urlencode(&s, proxy_auth.password,
+					is_rfc3986_unreserved);
 		curl_proxyuserpwd = strbuf_detach(&s, NULL);
 		curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd);
 #endif
@@ -558,6 +558,7 @@ static int has_cert_password(void)
 		return 0;
 	if (!cert_auth.password) {
 		cert_auth.protocol = xstrdup("cert");
+		cert_auth.host = xstrdup("");
 		cert_auth.username = xstrdup("");
 		cert_auth.path = xstrdup(ssl_cert);
 		credential_fill(&cert_auth);
@@ -680,8 +681,8 @@ static void curl_dump_header(const char *text, unsigned char *ptr, size_t size,
 	for (header = headers; *header; header++) {
 		if (hide_sensitive_header)
 			redact_sensitive_header(*header);
-		strbuf_insert((*header), 0, text, strlen(text));
-		strbuf_insert((*header), strlen(text), ": ", 2);
+		strbuf_insertstr((*header), 0, text);
+		strbuf_insertstr((*header), strlen(text), ": ");
 		strbuf_rtrim((*header));
 		strbuf_addch((*header), '\n');
 		trace_strbuf(&trace_curl, (*header));
@@ -1073,6 +1074,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 
 	git_config(urlmatch_config_entry, &config);
 	free(normalized_url);
+	string_list_clear(&config.vars, 1);
 
 #if LIBCURL_VERSION_NUM >= 0x073800
 	if (http_ssl_backend) {
@@ -1199,8 +1201,7 @@ void http_cleanup(void)
 #endif
 	curl_global_cleanup();
 
-	curl_slist_free_all(extra_http_headers);
-	extra_http_headers = NULL;
+	string_list_clear(&extra_http_headers, 0);
 
 	curl_slist_free_all(pragma_header);
 	pragma_header = NULL;
@@ -1624,10 +1625,11 @@ int run_one_slot(struct active_request_slot *slot,
 
 struct curl_slist *http_copy_default_headers(void)
 {
-	struct curl_slist *headers = NULL, *h;
+	struct curl_slist *headers = NULL;
+	const struct string_list_item *item;
 
-	for (h = extra_http_headers; h; h = h->next)
-		headers = curl_slist_append(headers, h->data);
+	for_each_string_list_item(item, &extra_http_headers)
+		headers = curl_slist_append(headers, item->string);
 
 	return headers;
 }
diff --git a/third_party/git/http.h b/third_party/git/http.h
index b429f1cf042b..5e0ad724f92f 100644
--- a/third_party/git/http.h
+++ b/third_party/git/http.h
@@ -25,8 +25,12 @@
 #if LIBCURL_VERSION_NUM < 0x070704
 #define curl_global_cleanup() do { /* nothing */ } while (0)
 #endif
+
 #if LIBCURL_VERSION_NUM < 0x070800
 #define curl_global_init(a) do { /* nothing */ } while (0)
+#elif LIBCURL_VERSION_NUM >= 0x070c00
+#define curl_global_init(a) curl_global_init_mem(a, xmalloc, free, \
+						xrealloc, xstrdup, xcalloc)
 #endif
 
 #if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)
diff --git a/third_party/git/kwset.h b/third_party/git/kwset.h
index df99a9217823..f50ecae573b9 100644
--- a/third_party/git/kwset.h
+++ b/third_party/git/kwset.h
@@ -1,3 +1,6 @@
+#ifndef KWSET_H
+#define KWSET_H
+
 /* This file has been copied from commit e7ac713d^ in the GNU grep git
  * repository. A few small changes have been made to adapt the code to
  * Git.
@@ -59,3 +62,4 @@ size_t kwsexec(kwset_t, char const *, size_t, struct kwsmatch *);
 /* Deallocate the given keyword set and all its associated storage. */
 void kwsfree(kwset_t);
 
+#endif /* KWSET_H */
diff --git a/third_party/git/line-log.c b/third_party/git/line-log.c
index 3aff1849e7d5..9010e00950b3 100644
--- a/third_party/git/line-log.c
+++ b/third_party/git/line-log.c
@@ -737,6 +737,38 @@ static struct line_log_data *lookup_line_range(struct rev_info *revs,
 	return ret;
 }
 
+static int same_paths_in_pathspec_and_range(struct pathspec *pathspec,
+					    struct line_log_data *range)
+{
+	int i;
+	struct line_log_data *r;
+
+	for (i = 0, r = range; i < pathspec->nr && r; i++, r = r->next)
+		if (strcmp(pathspec->items[i].match, r->path))
+			return 0;
+	if (i < pathspec->nr || r)
+		/* different number of pathspec items and ranges */
+		return 0;
+
+	return 1;
+}
+
+static void parse_pathspec_from_ranges(struct pathspec *pathspec,
+				       struct line_log_data *range)
+{
+	struct line_log_data *r;
+	struct argv_array array = ARGV_ARRAY_INIT;
+	const char **paths;
+
+	for (r = range; r; r = r->next)
+		argv_array_push(&array, r->path);
+	paths = argv_array_detach(&array);
+
+	parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL, "", paths);
+	/* strings are now owned by pathspec */
+	free(paths);
+}
+
 void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args)
 {
 	struct commit *commit = NULL;
@@ -746,20 +778,7 @@ void line_log_init(struct rev_info *rev, const char *prefix, struct string_list
 	range = parse_lines(rev->diffopt.repo, commit, prefix, args);
 	add_line_range(rev, commit, range);
 
-	if (!rev->diffopt.detect_rename) {
-		struct line_log_data *r;
-		struct argv_array array = ARGV_ARRAY_INIT;
-		const char **paths;
-
-		for (r = range; r; r = r->next)
-			argv_array_push(&array, r->path);
-		paths = argv_array_detach(&array);
-
-		parse_pathspec(&rev->diffopt.pathspec, 0,
-			       PATHSPEC_PREFER_FULL, "", paths);
-		/* strings are now owned by pathspec */
-		free(paths);
-	}
+	parse_pathspec_from_ranges(&rev->diffopt.pathspec, range);
 }
 
 static void move_diff_queue(struct diff_queue_struct *dst,
@@ -817,15 +836,29 @@ static void queue_diffs(struct line_log_data *range,
 			struct diff_queue_struct *queue,
 			struct commit *commit, struct commit *parent)
 {
+	struct object_id *tree_oid, *parent_tree_oid;
+
 	assert(commit);
 
+	tree_oid = get_commit_tree_oid(commit);
+	parent_tree_oid = parent ? get_commit_tree_oid(parent) : NULL;
+
+	if (opt->detect_rename &&
+	    !same_paths_in_pathspec_and_range(&opt->pathspec, range)) {
+		clear_pathspec(&opt->pathspec);
+		parse_pathspec_from_ranges(&opt->pathspec, range);
+	}
 	DIFF_QUEUE_CLEAR(&diff_queued_diff);
-	diff_tree_oid(parent ? get_commit_tree_oid(parent) : NULL,
-		      get_commit_tree_oid(commit), "", opt);
-	if (opt->detect_rename) {
+	diff_tree_oid(parent_tree_oid, tree_oid, "", opt);
+	if (opt->detect_rename && diff_might_be_rename()) {
+		/* must look at the full tree diff to detect renames */
+		clear_pathspec(&opt->pathspec);
+		DIFF_QUEUE_CLEAR(&diff_queued_diff);
+
+		diff_tree_oid(parent_tree_oid, tree_oid, "", opt);
+
 		filter_diffs_for_paths(range, 1);
-		if (diff_might_be_rename())
-			diffcore_std(opt);
+		diffcore_std(opt);
 		filter_diffs_for_paths(range, 0);
 	}
 	move_diff_queue(queue, &diff_queued_diff);
diff --git a/third_party/git/list-objects-filter-options.c b/third_party/git/list-objects-filter-options.c
index 1cb20c659c82..256bcfbdfe66 100644
--- a/third_party/git/list-objects-filter-options.c
+++ b/third_party/git/list-objects-filter-options.c
@@ -6,6 +6,14 @@
 #include "list-objects.h"
 #include "list-objects-filter.h"
 #include "list-objects-filter-options.h"
+#include "promisor-remote.h"
+#include "trace.h"
+#include "url.h"
+
+static int parse_combine_filter(
+	struct list_objects_filter_options *filter_options,
+	const char *arg,
+	struct strbuf *errbuf);
 
 /*
  * Parse value of the argument to the "filter" keyword.
@@ -29,16 +37,11 @@ static int gently_parse_list_objects_filter(
 {
 	const char *v0;
 
-	if (filter_options->choice) {
-		if (errbuf) {
-			strbuf_addstr(
-				errbuf,
-				_("multiple filter-specs cannot be combined"));
-		}
-		return 1;
-	}
+	if (!arg)
+		return 0;
 
-	filter_options->filter_spec = strdup(arg);
+	if (filter_options->choice)
+		BUG("filter_options already populated");
 
 	if (!strcmp(arg, "blob:none")) {
 		filter_options->choice = LOFC_BLOB_NONE;
@@ -52,28 +55,14 @@ static int gently_parse_list_objects_filter(
 
 	} else if (skip_prefix(arg, "tree:", &v0)) {
 		if (!git_parse_ulong(v0, &filter_options->tree_exclude_depth)) {
-			if (errbuf) {
-				strbuf_addstr(
-					errbuf,
-					_("expected 'tree:<depth>'"));
-			}
+			strbuf_addstr(errbuf, _("expected 'tree:<depth>'"));
 			return 1;
 		}
 		filter_options->choice = LOFC_TREE_DEPTH;
 		return 0;
 
 	} else if (skip_prefix(arg, "sparse:oid=", &v0)) {
-		struct object_context oc;
-		struct object_id sparse_oid;
-
-		/*
-		 * Try to parse <oid-expression> into an OID for the current
-		 * command, but DO NOT complain if we don't have the blob or
-		 * ref locally.
-		 */
-		if (!get_oid_with_context(the_repository, v0, GET_OID_BLOB,
-					  &sparse_oid, &oc))
-			filter_options->sparse_oid_value = oiddup(&sparse_oid);
+		filter_options->sparse_oid_name = xstrdup(v0);
 		filter_options->choice = LOFC_SPARSE_OID;
 		return 0;
 
@@ -84,103 +73,298 @@ static int gently_parse_list_objects_filter(
 				_("sparse:path filters support has been dropped"));
 		}
 		return 1;
+
+	} else if (skip_prefix(arg, "combine:", &v0)) {
+		return parse_combine_filter(filter_options, v0, errbuf);
+
 	}
 	/*
 	 * Please update _git_fetch() in git-completion.bash when you
 	 * add new filters
 	 */
 
-	if (errbuf)
-		strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg);
+	strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg);
 
 	memset(filter_options, 0, sizeof(*filter_options));
 	return 1;
 }
 
-int parse_list_objects_filter(struct list_objects_filter_options *filter_options,
-			      const char *arg)
+static const char *RESERVED_NON_WS = "~`!@#$^&*()[]{}\\;'\",<>?";
+
+static int has_reserved_character(
+	struct strbuf *sub_spec, struct strbuf *errbuf)
 {
-	struct strbuf buf = STRBUF_INIT;
-	if (gently_parse_list_objects_filter(filter_options, arg, &buf))
-		die("%s", buf.buf);
+	const char *c = sub_spec->buf;
+	while (*c) {
+		if (*c <= ' ' || strchr(RESERVED_NON_WS, *c)) {
+			strbuf_addf(
+				errbuf,
+				_("must escape char in sub-filter-spec: '%c'"),
+				*c);
+			return 1;
+		}
+		c++;
+	}
+
 	return 0;
 }
 
+static int parse_combine_subfilter(
+	struct list_objects_filter_options *filter_options,
+	struct strbuf *subspec,
+	struct strbuf *errbuf)
+{
+	size_t new_index = filter_options->sub_nr;
+	char *decoded;
+	int result;
+
+	ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1,
+		      filter_options->sub_alloc);
+
+	decoded = url_percent_decode(subspec->buf);
+
+	result = has_reserved_character(subspec, errbuf) ||
+		gently_parse_list_objects_filter(
+			&filter_options->sub[new_index], decoded, errbuf);
+
+	free(decoded);
+	return result;
+}
+
+static int parse_combine_filter(
+	struct list_objects_filter_options *filter_options,
+	const char *arg,
+	struct strbuf *errbuf)
+{
+	struct strbuf **subspecs = strbuf_split_str(arg, '+', 0);
+	size_t sub;
+	int result = 0;
+
+	if (!subspecs[0]) {
+		strbuf_addstr(errbuf, _("expected something after combine:"));
+		result = 1;
+		goto cleanup;
+	}
+
+	for (sub = 0; subspecs[sub] && !result; sub++) {
+		if (subspecs[sub + 1]) {
+			/*
+			 * This is not the last subspec. Remove trailing "+" so
+			 * we can parse it.
+			 */
+			size_t last = subspecs[sub]->len - 1;
+			assert(subspecs[sub]->buf[last] == '+');
+			strbuf_remove(subspecs[sub], last, 1);
+		}
+		result = parse_combine_subfilter(
+			filter_options, subspecs[sub], errbuf);
+	}
+
+	filter_options->choice = LOFC_COMBINE;
+
+cleanup:
+	strbuf_list_free(subspecs);
+	if (result) {
+		list_objects_filter_release(filter_options);
+		memset(filter_options, 0, sizeof(*filter_options));
+	}
+	return result;
+}
+
+static int allow_unencoded(char ch)
+{
+	if (ch <= ' ' || ch == '%' || ch == '+')
+		return 0;
+	return !strchr(RESERVED_NON_WS, ch);
+}
+
+static void filter_spec_append_urlencode(
+	struct list_objects_filter_options *filter, const char *raw)
+{
+	struct strbuf buf = STRBUF_INIT;
+	strbuf_addstr_urlencode(&buf, raw, allow_unencoded);
+	trace_printf("Add to combine filter-spec: %s\n", buf.buf);
+	string_list_append(&filter->filter_spec, strbuf_detach(&buf, NULL));
+}
+
+/*
+ * Changes filter_options into an equivalent LOFC_COMBINE filter options
+ * instance. Does not do anything if filter_options is already LOFC_COMBINE.
+ */
+static void transform_to_combine_type(
+	struct list_objects_filter_options *filter_options)
+{
+	assert(filter_options->choice);
+	if (filter_options->choice == LOFC_COMBINE)
+		return;
+	{
+		const int initial_sub_alloc = 2;
+		struct list_objects_filter_options *sub_array =
+			xcalloc(initial_sub_alloc, sizeof(*sub_array));
+		sub_array[0] = *filter_options;
+		memset(filter_options, 0, sizeof(*filter_options));
+		filter_options->sub = sub_array;
+		filter_options->sub_alloc = initial_sub_alloc;
+	}
+	filter_options->sub_nr = 1;
+	filter_options->choice = LOFC_COMBINE;
+	string_list_append(&filter_options->filter_spec, xstrdup("combine:"));
+	filter_spec_append_urlencode(
+		filter_options,
+		list_objects_filter_spec(&filter_options->sub[0]));
+	/*
+	 * We don't need the filter_spec strings for subfilter specs, only the
+	 * top level.
+	 */
+	string_list_clear(&filter_options->sub[0].filter_spec, /*free_util=*/0);
+}
+
+void list_objects_filter_die_if_populated(
+	struct list_objects_filter_options *filter_options)
+{
+	if (filter_options->choice)
+		die(_("multiple filter-specs cannot be combined"));
+}
+
+void parse_list_objects_filter(
+	struct list_objects_filter_options *filter_options,
+	const char *arg)
+{
+	struct strbuf errbuf = STRBUF_INIT;
+	int parse_error;
+
+	if (!filter_options->choice) {
+		string_list_append(&filter_options->filter_spec, xstrdup(arg));
+
+		parse_error = gently_parse_list_objects_filter(
+			filter_options, arg, &errbuf);
+	} else {
+		/*
+		 * Make filter_options an LOFC_COMBINE spec so we can trivially
+		 * add subspecs to it.
+		 */
+		transform_to_combine_type(filter_options);
+
+		string_list_append(&filter_options->filter_spec, xstrdup("+"));
+		filter_spec_append_urlencode(filter_options, arg);
+		ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1,
+			      filter_options->sub_alloc);
+
+		parse_error = gently_parse_list_objects_filter(
+			&filter_options->sub[filter_options->sub_nr - 1], arg,
+			&errbuf);
+	}
+	if (parse_error)
+		die("%s", errbuf.buf);
+}
+
 int opt_parse_list_objects_filter(const struct option *opt,
 				  const char *arg, int unset)
 {
 	struct list_objects_filter_options *filter_options = opt->value;
 
-	if (unset || !arg) {
+	if (unset || !arg)
 		list_objects_filter_set_no_filter(filter_options);
-		return 0;
+	else
+		parse_list_objects_filter(filter_options, arg);
+	return 0;
+}
+
+const char *list_objects_filter_spec(struct list_objects_filter_options *filter)
+{
+	if (!filter->filter_spec.nr)
+		BUG("no filter_spec available for this filter");
+	if (filter->filter_spec.nr != 1) {
+		struct strbuf concatted = STRBUF_INIT;
+		strbuf_add_separated_string_list(
+			&concatted, "", &filter->filter_spec);
+		string_list_clear(&filter->filter_spec, /*free_util=*/0);
+		string_list_append(
+			&filter->filter_spec, strbuf_detach(&concatted, NULL));
 	}
 
-	return parse_list_objects_filter(filter_options, arg);
+	return filter->filter_spec.items[0].string;
 }
 
-void expand_list_objects_filter_spec(
-	const struct list_objects_filter_options *filter,
-	struct strbuf *expanded_spec)
+const char *expand_list_objects_filter_spec(
+	struct list_objects_filter_options *filter)
 {
-	strbuf_init(expanded_spec, strlen(filter->filter_spec));
-	if (filter->choice == LOFC_BLOB_LIMIT)
-		strbuf_addf(expanded_spec, "blob:limit=%lu",
+	if (filter->choice == LOFC_BLOB_LIMIT) {
+		struct strbuf expanded_spec = STRBUF_INIT;
+		strbuf_addf(&expanded_spec, "blob:limit=%lu",
 			    filter->blob_limit_value);
-	else if (filter->choice == LOFC_TREE_DEPTH)
-		strbuf_addf(expanded_spec, "tree:%lu",
-			    filter->tree_exclude_depth);
-	else
-		strbuf_addstr(expanded_spec, filter->filter_spec);
+		string_list_clear(&filter->filter_spec, /*free_util=*/0);
+		string_list_append(
+			&filter->filter_spec,
+			strbuf_detach(&expanded_spec, NULL));
+	}
+
+	return list_objects_filter_spec(filter);
 }
 
 void list_objects_filter_release(
 	struct list_objects_filter_options *filter_options)
 {
-	free(filter_options->filter_spec);
-	free(filter_options->sparse_oid_value);
+	size_t sub;
+
+	if (!filter_options)
+		return;
+	string_list_clear(&filter_options->filter_spec, /*free_util=*/0);
+	free(filter_options->sparse_oid_name);
+	for (sub = 0; sub < filter_options->sub_nr; sub++)
+		list_objects_filter_release(&filter_options->sub[sub]);
+	free(filter_options->sub);
 	memset(filter_options, 0, sizeof(*filter_options));
 }
 
 void partial_clone_register(
 	const char *remote,
-	const struct list_objects_filter_options *filter_options)
+	struct list_objects_filter_options *filter_options)
 {
-	/*
-	 * Record the name of the partial clone remote in the
-	 * config and in the global variable -- the latter is
-	 * used throughout to indicate that partial clone is
-	 * enabled and to expect missing objects.
-	 */
-	if (repository_format_partial_clone &&
-	    *repository_format_partial_clone &&
-	    strcmp(remote, repository_format_partial_clone))
-		die(_("cannot change partial clone promisor remote"));
+	char *cfg_name;
+	char *filter_name;
 
-	git_config_set("core.repositoryformatversion", "1");
-	git_config_set("extensions.partialclone", remote);
+	/* Check if it is already registered */
+	if (!promisor_remote_find(remote)) {
+		git_config_set("core.repositoryformatversion", "1");
 
-	repository_format_partial_clone = xstrdup(remote);
+		/* Add promisor config for the remote */
+		cfg_name = xstrfmt("remote.%s.promisor", remote);
+		git_config_set(cfg_name, "true");
+		free(cfg_name);
+	}
 
 	/*
 	 * Record the initial filter-spec in the config as
 	 * the default for subsequent fetches from this remote.
 	 */
-	core_partial_clone_filter_default =
-		xstrdup(filter_options->filter_spec);
-	git_config_set("core.partialclonefilter",
-		       core_partial_clone_filter_default);
+	filter_name = xstrfmt("remote.%s.partialclonefilter", remote);
+	/* NEEDSWORK: 'expand' result leaking??? */
+	git_config_set(filter_name,
+		       expand_list_objects_filter_spec(filter_options));
+	free(filter_name);
+
+	/* Make sure the config info are reset */
+	promisor_remote_reinit();
 }
 
 void partial_clone_get_default_filter_spec(
-	struct list_objects_filter_options *filter_options)
+	struct list_objects_filter_options *filter_options,
+	const char *remote)
 {
+	struct promisor_remote *promisor = promisor_remote_find(remote);
+	struct strbuf errbuf = STRBUF_INIT;
+
 	/*
 	 * Parse default value, but silently ignore it if it is invalid.
 	 */
-	if (!core_partial_clone_filter_default)
+	if (!promisor)
 		return;
+
+	string_list_append(&filter_options->filter_spec,
+			   promisor->partial_clone_filter);
 	gently_parse_list_objects_filter(filter_options,
-					 core_partial_clone_filter_default,
-					 NULL);
+					 promisor->partial_clone_filter,
+					 &errbuf);
+	strbuf_release(&errbuf);
 }
diff --git a/third_party/git/list-objects-filter-options.h b/third_party/git/list-objects-filter-options.h
index c54f0000fbad..2ffb39222c49 100644
--- a/third_party/git/list-objects-filter-options.h
+++ b/third_party/git/list-objects-filter-options.h
@@ -2,7 +2,7 @@
 #define LIST_OBJECTS_FILTER_OPTIONS_H
 
 #include "parse-options.h"
-#include "strbuf.h"
+#include "string-list.h"
 
 /*
  * The list of defined filters for list-objects.
@@ -13,6 +13,7 @@ enum list_objects_filter_choice {
 	LOFC_BLOB_LIMIT,
 	LOFC_TREE_DEPTH,
 	LOFC_SPARSE_OID,
+	LOFC_COMBINE,
 	LOFC__COUNT /* must be last */
 };
 
@@ -23,8 +24,10 @@ struct list_objects_filter_options {
 	 * commands that launch filtering sub-processes, or for communication
 	 * over the network, don't use this value; use the result of
 	 * expand_list_objects_filter_spec() instead.
+	 * To get the raw filter spec given by the user, use the result of
+	 * list_objects_filter_spec().
 	 */
-	char *filter_spec;
+	struct string_list filter_spec;
 
 	/*
 	 * 'choice' is determined by parsing the filter-spec.  This indicates
@@ -38,19 +41,40 @@ struct list_objects_filter_options {
 	unsigned int no_filter : 1;
 
 	/*
-	 * Parsed values (fields) from within the filter-spec.  These are
-	 * choice-specific; not all values will be defined for any given
-	 * choice.
+	 * BEGIN choice-specific parsed values from within the filter-spec. Only
+	 * some values will be defined for any given choice.
 	 */
-	struct object_id *sparse_oid_value;
+
+	char *sparse_oid_name;
 	unsigned long blob_limit_value;
 	unsigned long tree_exclude_depth;
+
+	/* LOFC_COMBINE values */
+
+	/* This array contains all the subfilters which this filter combines. */
+	size_t sub_nr, sub_alloc;
+	struct list_objects_filter_options *sub;
+
+	/*
+	 * END choice-specific parsed values.
+	 */
 };
 
 /* Normalized command line arguments */
 #define CL_ARG__FILTER "filter"
 
-int parse_list_objects_filter(
+void list_objects_filter_die_if_populated(
+	struct list_objects_filter_options *filter_options);
+
+/*
+ * Parses the filter spec string given by arg and either (1) simply places the
+ * result in filter_options if it is not yet populated or (2) combines it with
+ * the filter already in filter_options if it is already populated. In the case
+ * of (2), the filter specs are combined as if specified with 'combine:'.
+ *
+ * Dies and prints a user-facing message if an error occurs.
+ */
+void parse_list_objects_filter(
 	struct list_objects_filter_options *filter_options,
 	const char *arg);
 
@@ -65,13 +89,22 @@ int opt_parse_list_objects_filter(const struct option *opt,
 /*
  * Translates abbreviated numbers in the filter's filter_spec into their
  * fully-expanded forms (e.g., "limit:blob=1k" becomes "limit:blob=1024").
+ * Returns a string owned by the list_objects_filter_options object.
  *
- * This form should be used instead of the raw filter_spec field when
- * communicating with a remote process or subprocess.
+ * This form should be used instead of the raw list_objects_filter_spec()
+ * value when communicating with a remote process or subprocess.
+ */
+const char *expand_list_objects_filter_spec(
+	struct list_objects_filter_options *filter);
+
+/*
+ * Returns the filter spec string more or less in the form as the user
+ * entered it. This form of the filter_spec can be used in user-facing
+ * messages.  Returns a string owned by the list_objects_filter_options
+ * object.
  */
-void expand_list_objects_filter_spec(
-	const struct list_objects_filter_options *filter,
-	struct strbuf *expanded_spec);
+const char *list_objects_filter_spec(
+	struct list_objects_filter_options *filter);
 
 void list_objects_filter_release(
 	struct list_objects_filter_options *filter_options);
@@ -85,8 +118,9 @@ static inline void list_objects_filter_set_no_filter(
 
 void partial_clone_register(
 	const char *remote,
-	const struct list_objects_filter_options *filter_options);
-void partial_clone_get_default_filter_spec(
 	struct list_objects_filter_options *filter_options);
+void partial_clone_get_default_filter_spec(
+	struct list_objects_filter_options *filter_options,
+	const char *remote);
 
 #endif /* LIST_OBJECTS_FILTER_OPTIONS_H */
diff --git a/third_party/git/list-objects-filter.c b/third_party/git/list-objects-filter.c
index 36e1f774bcfc..1e8d4e763da0 100644
--- a/third_party/git/list-objects-filter.c
+++ b/third_party/git/list-objects-filter.c
@@ -26,11 +26,46 @@
  */
 #define FILTER_SHOWN_BUT_REVISIT (1<<21)
 
-/*
- * A filter for list-objects to omit ALL blobs from the traversal.
- * And to OPTIONALLY collect a list of the omitted OIDs.
- */
-struct filter_blobs_none_data {
+struct subfilter {
+	struct filter *filter;
+	struct oidset seen;
+	struct oidset omits;
+	struct object_id skip_tree;
+	unsigned is_skipping_tree : 1;
+};
+
+struct filter {
+	enum list_objects_filter_result (*filter_object_fn)(
+		struct repository *r,
+		enum list_objects_filter_situation filter_situation,
+		struct object *obj,
+		const char *pathname,
+		const char *filename,
+		struct oidset *omits,
+		void *filter_data);
+
+	/*
+	 * Optional. If this function is supplied and the filter needs
+	 * to collect omits, then this function is called once before
+	 * free_fn is called.
+	 *
+	 * This is required because the following two conditions hold:
+	 *
+	 *   a. A tree filter can add and remove objects as an object
+	 *      graph is traversed.
+	 *   b. A combine filter's omit set is the union of all its
+	 *      subfilters, which may include tree: filters.
+	 *
+	 * As such, the omits sets must be separate sets, and can only
+	 * be unioned after the traversal is completed.
+	 */
+	void (*finalize_omits_fn)(struct oidset *omits, void *filter_data);
+
+	void (*free_fn)(void *filter_data);
+
+	void *filter_data;
+
+	/* If non-NULL, the filter collects a list of the omitted OIDs here. */
 	struct oidset *omits;
 };
 
@@ -40,10 +75,9 @@ static enum list_objects_filter_result filter_blobs_none(
 	struct object *obj,
 	const char *pathname,
 	const char *filename,
+	struct oidset *omits,
 	void *filter_data_)
 {
-	struct filter_blobs_none_data *filter_data = filter_data_;
-
 	switch (filter_situation) {
 	default:
 		BUG("unknown filter_situation: %d", filter_situation);
@@ -61,24 +95,18 @@ static enum list_objects_filter_result filter_blobs_none(
 		assert(obj->type == OBJ_BLOB);
 		assert((obj->flags & SEEN) == 0);
 
-		if (filter_data->omits)
-			oidset_insert(filter_data->omits, &obj->oid);
+		if (omits)
+			oidset_insert(omits, &obj->oid);
 		return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */
 	}
 }
 
-static void *filter_blobs_none__init(
-	struct oidset *omitted,
+static void filter_blobs_none__init(
 	struct list_objects_filter_options *filter_options,
-	filter_object_fn *filter_fn,
-	filter_free_fn *filter_free_fn)
+	struct filter *filter)
 {
-	struct filter_blobs_none_data *d = xcalloc(1, sizeof(*d));
-	d->omits = omitted;
-
-	*filter_fn = filter_blobs_none;
-	*filter_free_fn = free;
-	return d;
+	filter->filter_object_fn = filter_blobs_none;
+	filter->free_fn = free;
 }
 
 /*
@@ -86,8 +114,6 @@ static void *filter_blobs_none__init(
  * Can OPTIONALLY collect a list of the omitted OIDs.
  */
 struct filter_trees_depth_data {
-	struct oidset *omits;
-
 	/*
 	 * Maps trees to the minimum depth at which they were seen. It is not
 	 * necessary to re-traverse a tree at deeper or equal depths than it has
@@ -110,16 +136,16 @@ struct seen_map_entry {
 /* Returns 1 if the oid was in the omits set before it was invoked. */
 static int filter_trees_update_omits(
 	struct object *obj,
-	struct filter_trees_depth_data *filter_data,
+	struct oidset *omits,
 	int include_it)
 {
-	if (!filter_data->omits)
+	if (!omits)
 		return 0;
 
 	if (include_it)
-		return oidset_remove(filter_data->omits, &obj->oid);
+		return oidset_remove(omits, &obj->oid);
 	else
-		return oidset_insert(filter_data->omits, &obj->oid);
+		return oidset_insert(omits, &obj->oid);
 }
 
 static enum list_objects_filter_result filter_trees_depth(
@@ -128,6 +154,7 @@ static enum list_objects_filter_result filter_trees_depth(
 	struct object *obj,
 	const char *pathname,
 	const char *filename,
+	struct oidset *omits,
 	void *filter_data_)
 {
 	struct filter_trees_depth_data *filter_data = filter_data_;
@@ -152,7 +179,7 @@ static enum list_objects_filter_result filter_trees_depth(
 		return LOFR_ZERO;
 
 	case LOFS_BLOB:
-		filter_trees_update_omits(obj, filter_data, include_it);
+		filter_trees_update_omits(obj, omits, include_it);
 		return include_it ? LOFR_MARK_SEEN | LOFR_DO_SHOW : LOFR_ZERO;
 
 	case LOFS_BEGIN_TREE:
@@ -173,12 +200,12 @@ static enum list_objects_filter_result filter_trees_depth(
 			filter_res = LOFR_SKIP_TREE;
 		} else {
 			int been_omitted = filter_trees_update_omits(
-				obj, filter_data, include_it);
+				obj, omits, include_it);
 			seen_info->depth = filter_data->current_depth;
 
 			if (include_it)
 				filter_res = LOFR_DO_SHOW;
-			else if (filter_data->omits && !been_omitted)
+			else if (omits && !been_omitted)
 				/*
 				 * Must update omit information of children
 				 * recursively; they have not been omitted yet.
@@ -201,21 +228,18 @@ static void filter_trees_free(void *filter_data) {
 	free(d);
 }
 
-static void *filter_trees_depth__init(
-	struct oidset *omitted,
+static void filter_trees_depth__init(
 	struct list_objects_filter_options *filter_options,
-	filter_object_fn *filter_fn,
-	filter_free_fn *filter_free_fn)
+	struct filter *filter)
 {
 	struct filter_trees_depth_data *d = xcalloc(1, sizeof(*d));
-	d->omits = omitted;
 	oidmap_init(&d->seen_at_depth, 0);
 	d->exclude_depth = filter_options->tree_exclude_depth;
 	d->current_depth = 0;
 
-	*filter_fn = filter_trees_depth;
-	*filter_free_fn = filter_trees_free;
-	return d;
+	filter->filter_data = d;
+	filter->filter_object_fn = filter_trees_depth;
+	filter->free_fn = filter_trees_free;
 }
 
 /*
@@ -223,7 +247,6 @@ static void *filter_trees_depth__init(
  * And to OPTIONALLY collect a list of the omitted OIDs.
  */
 struct filter_blobs_limit_data {
-	struct oidset *omits;
 	unsigned long max_bytes;
 };
 
@@ -233,6 +256,7 @@ static enum list_objects_filter_result filter_blobs_limit(
 	struct object *obj,
 	const char *pathname,
 	const char *filename,
+	struct oidset *omits,
 	void *filter_data_)
 {
 	struct filter_blobs_limit_data *filter_data = filter_data_;
@@ -270,30 +294,27 @@ static enum list_objects_filter_result filter_blobs_limit(
 		if (object_length < filter_data->max_bytes)
 			goto include_it;
 
-		if (filter_data->omits)
-			oidset_insert(filter_data->omits, &obj->oid);
+		if (omits)
+			oidset_insert(omits, &obj->oid);
 		return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */
 	}
 
 include_it:
-	if (filter_data->omits)
-		oidset_remove(filter_data->omits, &obj->oid);
+	if (omits)
+		oidset_remove(omits, &obj->oid);
 	return LOFR_MARK_SEEN | LOFR_DO_SHOW;
 }
 
-static void *filter_blobs_limit__init(
-	struct oidset *omitted,
+static void filter_blobs_limit__init(
 	struct list_objects_filter_options *filter_options,
-	filter_object_fn *filter_fn,
-	filter_free_fn *filter_free_fn)
+	struct filter *filter)
 {
 	struct filter_blobs_limit_data *d = xcalloc(1, sizeof(*d));
-	d->omits = omitted;
 	d->max_bytes = filter_options->blob_limit_value;
 
-	*filter_fn = filter_blobs_limit;
-	*filter_free_fn = free;
-	return d;
+	filter->filter_data = d;
+	filter->filter_object_fn = filter_blobs_limit;
+	filter->free_fn = free;
 }
 
 /*
@@ -307,12 +328,12 @@ static void *filter_blobs_limit__init(
  */
 struct frame {
 	/*
-	 * defval is the usual default include/exclude value that
+	 * default_match is the usual default include/exclude value that
 	 * should be inherited as we recurse into directories based
 	 * upon pattern matching of the directory itself or of a
 	 * containing directory.
 	 */
-	int defval;
+	enum pattern_match_result default_match;
 
 	/*
 	 * 1 if the directory (recursively) contains any provisionally
@@ -326,8 +347,7 @@ struct frame {
 };
 
 struct filter_sparse_data {
-	struct oidset *omits;
-	struct exclude_list el;
+	struct pattern_list pl;
 
 	size_t nr, alloc;
 	struct frame *array_frame;
@@ -339,11 +359,13 @@ static enum list_objects_filter_result filter_sparse(
 	struct object *obj,
 	const char *pathname,
 	const char *filename,
+	struct oidset *omits,
 	void *filter_data_)
 {
 	struct filter_sparse_data *filter_data = filter_data_;
-	int val, dtype;
+	int dtype;
 	struct frame *frame;
+	enum pattern_match_result match;
 
 	switch (filter_situation) {
 	default:
@@ -352,15 +374,15 @@ static enum list_objects_filter_result filter_sparse(
 	case LOFS_BEGIN_TREE:
 		assert(obj->type == OBJ_TREE);
 		dtype = DT_DIR;
-		val = is_excluded_from_list(pathname, strlen(pathname),
-					    filename, &dtype, &filter_data->el,
-					    r->index);
-		if (val < 0)
-			val = filter_data->array_frame[filter_data->nr - 1].defval;
+		match = path_matches_pattern_list(pathname, strlen(pathname),
+						  filename, &dtype, &filter_data->pl,
+						  r->index);
+		if (match == UNDECIDED)
+			match = filter_data->array_frame[filter_data->nr - 1].default_match;
 
 		ALLOC_GROW(filter_data->array_frame, filter_data->nr + 1,
 			   filter_data->alloc);
-		filter_data->array_frame[filter_data->nr].defval = val;
+		filter_data->array_frame[filter_data->nr].default_match = match;
 		filter_data->array_frame[filter_data->nr].child_prov_omit = 0;
 		filter_data->nr++;
 
@@ -414,14 +436,14 @@ static enum list_objects_filter_result filter_sparse(
 		frame = &filter_data->array_frame[filter_data->nr - 1];
 
 		dtype = DT_REG;
-		val = is_excluded_from_list(pathname, strlen(pathname),
-					    filename, &dtype, &filter_data->el,
+		match = path_matches_pattern_list(pathname, strlen(pathname),
+					    filename, &dtype, &filter_data->pl,
 					    r->index);
-		if (val < 0)
-			val = frame->defval;
-		if (val > 0) {
-			if (filter_data->omits)
-				oidset_remove(filter_data->omits, &obj->oid);
+		if (match == UNDECIDED)
+			match = frame->default_match;
+		if (match == MATCHED) {
+			if (omits)
+				oidset_remove(omits, &obj->oid);
 			return LOFR_MARK_SEEN | LOFR_DO_SHOW;
 		}
 
@@ -435,8 +457,8 @@ static enum list_objects_filter_result filter_sparse(
 		 * Leave the LOFR_ bits unset so that if the blob appears
 		 * again in the traversal, we will be asked again.
 		 */
-		if (filter_data->omits)
-			oidset_insert(filter_data->omits, &obj->oid);
+		if (omits)
+			oidset_insert(omits, &obj->oid);
 
 		/*
 		 * Remember that at least 1 blob in this tree was
@@ -456,33 +478,169 @@ static void filter_sparse_free(void *filter_data)
 	free(d);
 }
 
-static void *filter_sparse_oid__init(
-	struct oidset *omitted,
+static void filter_sparse_oid__init(
 	struct list_objects_filter_options *filter_options,
-	filter_object_fn *filter_fn,
-	filter_free_fn *filter_free_fn)
+	struct filter *filter)
 {
 	struct filter_sparse_data *d = xcalloc(1, sizeof(*d));
-	d->omits = omitted;
-	if (add_excludes_from_blob_to_list(filter_options->sparse_oid_value,
-					   NULL, 0, &d->el) < 0)
-		die("could not load filter specification");
+	struct object_context oc;
+	struct object_id sparse_oid;
+
+	if (get_oid_with_context(the_repository,
+				 filter_options->sparse_oid_name,
+				 GET_OID_BLOB, &sparse_oid, &oc))
+		die(_("unable to access sparse blob in '%s'"),
+		    filter_options->sparse_oid_name);
+	if (add_patterns_from_blob_to_list(&sparse_oid, "", 0, &d->pl) < 0)
+		die(_("unable to parse sparse filter data in %s"),
+		    oid_to_hex(&sparse_oid));
 
 	ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
-	d->array_frame[d->nr].defval = 0; /* default to include */
+	d->array_frame[d->nr].default_match = 0; /* default to include */
 	d->array_frame[d->nr].child_prov_omit = 0;
 	d->nr++;
 
-	*filter_fn = filter_sparse;
-	*filter_free_fn = filter_sparse_free;
-	return d;
+	filter->filter_data = d;
+	filter->filter_object_fn = filter_sparse;
+	filter->free_fn = filter_sparse_free;
 }
 
-typedef void *(*filter_init_fn)(
-	struct oidset *omitted,
+/* A filter which only shows objects shown by all sub-filters. */
+struct combine_filter_data {
+	struct subfilter *sub;
+	size_t nr;
+};
+
+static enum list_objects_filter_result process_subfilter(
+	struct repository *r,
+	enum list_objects_filter_situation filter_situation,
+	struct object *obj,
+	const char *pathname,
+	const char *filename,
+	struct subfilter *sub)
+{
+	enum list_objects_filter_result result;
+
+	/*
+	 * Check and update is_skipping_tree before oidset_contains so
+	 * that is_skipping_tree gets unset even when the object is
+	 * marked as seen.  As of this writing, no filter uses
+	 * LOFR_MARK_SEEN on trees that also uses LOFR_SKIP_TREE, so the
+	 * ordering is only theoretically important. Be cautious if you
+	 * change the order of the below checks and more filters have
+	 * been added!
+	 */
+	if (sub->is_skipping_tree) {
+		if (filter_situation == LOFS_END_TREE &&
+		    oideq(&obj->oid, &sub->skip_tree))
+			sub->is_skipping_tree = 0;
+		else
+			return LOFR_ZERO;
+	}
+	if (oidset_contains(&sub->seen, &obj->oid))
+		return LOFR_ZERO;
+
+	result = list_objects_filter__filter_object(
+		r, filter_situation, obj, pathname, filename, sub->filter);
+
+	if (result & LOFR_MARK_SEEN)
+		oidset_insert(&sub->seen, &obj->oid);
+
+	if (result & LOFR_SKIP_TREE) {
+		sub->is_skipping_tree = 1;
+		sub->skip_tree = obj->oid;
+	}
+
+	return result;
+}
+
+static enum list_objects_filter_result filter_combine(
+	struct repository *r,
+	enum list_objects_filter_situation filter_situation,
+	struct object *obj,
+	const char *pathname,
+	const char *filename,
+	struct oidset *omits,
+	void *filter_data)
+{
+	struct combine_filter_data *d = filter_data;
+	enum list_objects_filter_result combined_result =
+		LOFR_DO_SHOW | LOFR_MARK_SEEN | LOFR_SKIP_TREE;
+	size_t sub;
+
+	for (sub = 0; sub < d->nr; sub++) {
+		enum list_objects_filter_result sub_result = process_subfilter(
+			r, filter_situation, obj, pathname, filename,
+			&d->sub[sub]);
+		if (!(sub_result & LOFR_DO_SHOW))
+			combined_result &= ~LOFR_DO_SHOW;
+		if (!(sub_result & LOFR_MARK_SEEN))
+			combined_result &= ~LOFR_MARK_SEEN;
+		if (!d->sub[sub].is_skipping_tree)
+			combined_result &= ~LOFR_SKIP_TREE;
+	}
+
+	return combined_result;
+}
+
+static void filter_combine__free(void *filter_data)
+{
+	struct combine_filter_data *d = filter_data;
+	size_t sub;
+	for (sub = 0; sub < d->nr; sub++) {
+		list_objects_filter__free(d->sub[sub].filter);
+		oidset_clear(&d->sub[sub].seen);
+		if (d->sub[sub].omits.set.size)
+			BUG("expected oidset to be cleared already");
+	}
+	free(d->sub);
+}
+
+static void add_all(struct oidset *dest, struct oidset *src) {
+	struct oidset_iter iter;
+	struct object_id *src_oid;
+
+	oidset_iter_init(src, &iter);
+	while ((src_oid = oidset_iter_next(&iter)) != NULL)
+		oidset_insert(dest, src_oid);
+}
+
+static void filter_combine__finalize_omits(
+	struct oidset *omits,
+	void *filter_data)
+{
+	struct combine_filter_data *d = filter_data;
+	size_t sub;
+
+	for (sub = 0; sub < d->nr; sub++) {
+		add_all(omits, &d->sub[sub].omits);
+		oidset_clear(&d->sub[sub].omits);
+	}
+}
+
+static void filter_combine__init(
 	struct list_objects_filter_options *filter_options,
-	filter_object_fn *filter_fn,
-	filter_free_fn *filter_free_fn);
+	struct filter* filter)
+{
+	struct combine_filter_data *d = xcalloc(1, sizeof(*d));
+	size_t sub;
+
+	d->nr = filter_options->sub_nr;
+	d->sub = xcalloc(d->nr, sizeof(*d->sub));
+	for (sub = 0; sub < d->nr; sub++)
+		d->sub[sub].filter = list_objects_filter__init(
+			filter->omits ? &d->sub[sub].omits : NULL,
+			&filter_options->sub[sub]);
+
+	filter->filter_data = d;
+	filter->filter_object_fn = filter_combine;
+	filter->free_fn = filter_combine__free;
+	filter->finalize_omits_fn = filter_combine__finalize_omits;
+}
+
+typedef void (*filter_init_fn)(
+	struct list_objects_filter_options *filter_options,
+	struct filter *filter);
 
 /*
  * Must match "enum list_objects_filter_choice".
@@ -493,14 +651,14 @@ static filter_init_fn s_filters[] = {
 	filter_blobs_limit__init,
 	filter_trees_depth__init,
 	filter_sparse_oid__init,
+	filter_combine__init,
 };
 
-void *list_objects_filter__init(
+struct filter *list_objects_filter__init(
 	struct oidset *omitted,
-	struct list_objects_filter_options *filter_options,
-	filter_object_fn *filter_fn,
-	filter_free_fn *filter_free_fn)
+	struct list_objects_filter_options *filter_options)
 {
+	struct filter *filter;
 	filter_init_fn init_fn;
 
 	assert((sizeof(s_filters) / sizeof(s_filters[0])) == LOFC__COUNT);
@@ -510,10 +668,44 @@ void *list_objects_filter__init(
 		    filter_options->choice);
 
 	init_fn = s_filters[filter_options->choice];
-	if (init_fn)
-		return init_fn(omitted, filter_options,
-			       filter_fn, filter_free_fn);
-	*filter_fn = NULL;
-	*filter_free_fn = NULL;
-	return NULL;
+	if (!init_fn)
+		return NULL;
+
+	filter = xcalloc(1, sizeof(*filter));
+	filter->omits = omitted;
+	init_fn(filter_options, filter);
+	return filter;
+}
+
+enum list_objects_filter_result list_objects_filter__filter_object(
+	struct repository *r,
+	enum list_objects_filter_situation filter_situation,
+	struct object *obj,
+	const char *pathname,
+	const char *filename,
+	struct filter *filter)
+{
+	if (filter && (obj->flags & NOT_USER_GIVEN))
+		return filter->filter_object_fn(r, filter_situation, obj,
+						pathname, filename,
+						filter->omits,
+						filter->filter_data);
+	/*
+	 * No filter is active or user gave object explicitly. In this case,
+	 * always show the object (except when LOFS_END_TREE, since this tree
+	 * had already been shown when LOFS_BEGIN_TREE).
+	 */
+	if (filter_situation == LOFS_END_TREE)
+		return 0;
+	return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+}
+
+void list_objects_filter__free(struct filter *filter)
+{
+	if (!filter)
+		return;
+	if (filter->finalize_omits_fn && filter->omits)
+		filter->finalize_omits_fn(filter->omits, filter->filter_data);
+	filter->free_fn(filter->filter_data);
+	free(filter);
 }
diff --git a/third_party/git/list-objects-filter.h b/third_party/git/list-objects-filter.h
index 1d45a4ad5786..cfd784e203f3 100644
--- a/third_party/git/list-objects-filter.h
+++ b/third_party/git/list-objects-filter.h
@@ -60,30 +60,36 @@ enum list_objects_filter_situation {
 	LOFS_BLOB
 };
 
-typedef enum list_objects_filter_result (*filter_object_fn)(
+struct filter;
+
+/*
+ * Constructor for the set of defined list-objects filters.
+ * The `omitted` set is optional. It is populated with objects that the
+ * filter excludes. This set should not be considered finalized until
+ * after list_objects_filter__free is called on the returned `struct
+ * filter *`.
+ */
+struct filter *list_objects_filter__init(
+	struct oidset *omitted,
+	struct list_objects_filter_options *filter_options);
+
+/*
+ * Lets `filter` decide how to handle the `obj`. If `filter` is NULL, this
+ * function behaves as expected if no filter is configured: all objects are
+ * included.
+ */
+enum list_objects_filter_result list_objects_filter__filter_object(
 	struct repository *r,
 	enum list_objects_filter_situation filter_situation,
 	struct object *obj,
 	const char *pathname,
 	const char *filename,
-	void *filter_data);
-
-typedef void (*filter_free_fn)(void *filter_data);
+	struct filter *filter);
 
 /*
- * Constructor for the set of defined list-objects filters.
- * Returns a generic "void *filter_data".
- *
- * The returned "filter_fn" will be used by traverse_commit_list()
- * to filter the results.
- *
- * The returned "filter_free_fn" is a destructor for the
- * filter_data.
+ * Destroys `filter` and finalizes the `omitted` set, if present. Does
+ * nothing if `filter` is null.
  */
-void *list_objects_filter__init(
-	struct oidset *omitted,
-	struct list_objects_filter_options *filter_options,
-	filter_object_fn *filter_fn,
-	filter_free_fn *filter_free_fn);
+void list_objects_filter__free(struct filter *filter);
 
 #endif /* LIST_OBJECTS_FILTER_H */
diff --git a/third_party/git/list-objects.c b/third_party/git/list-objects.c
index b5651ddd5bfd..e19589baa045 100644
--- a/third_party/git/list-objects.c
+++ b/third_party/git/list-objects.c
@@ -18,8 +18,7 @@ struct traversal_context {
 	show_object_fn show_object;
 	show_commit_fn show_commit;
 	void *show_data;
-	filter_object_fn filter_fn;
-	void *filter_data;
+	struct filter *filter;
 };
 
 static void process_blob(struct traversal_context *ctx,
@@ -29,7 +28,7 @@ static void process_blob(struct traversal_context *ctx,
 {
 	struct object *obj = &blob->object;
 	size_t pathlen;
-	enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
+	enum list_objects_filter_result r;
 
 	if (!ctx->revs->blob_objects)
 		return;
@@ -54,11 +53,10 @@ static void process_blob(struct traversal_context *ctx,
 
 	pathlen = path->len;
 	strbuf_addstr(path, name);
-	if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn)
-		r = ctx->filter_fn(ctx->revs->repo,
-				   LOFS_BLOB, obj,
-				   path->buf, &path->buf[pathlen],
-				   ctx->filter_data);
+	r = list_objects_filter__filter_object(ctx->revs->repo,
+					       LOFS_BLOB, obj,
+					       path->buf, &path->buf[pathlen],
+					       ctx->filter);
 	if (r & LOFR_MARK_SEEN)
 		obj->flags |= SEEN;
 	if (r & LOFR_DO_SHOW)
@@ -157,7 +155,7 @@ static void process_tree(struct traversal_context *ctx,
 	struct object *obj = &tree->object;
 	struct rev_info *revs = ctx->revs;
 	int baselen = base->len;
-	enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
+	enum list_objects_filter_result r;
 	int failed_parse;
 
 	if (!revs->tree_objects)
@@ -186,11 +184,10 @@ static void process_tree(struct traversal_context *ctx,
 	}
 
 	strbuf_addstr(base, name);
-	if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn)
-		r = ctx->filter_fn(ctx->revs->repo,
-				   LOFS_BEGIN_TREE, obj,
-				   base->buf, &base->buf[baselen],
-				   ctx->filter_data);
+	r = list_objects_filter__filter_object(ctx->revs->repo,
+					       LOFS_BEGIN_TREE, obj,
+					       base->buf, &base->buf[baselen],
+					       ctx->filter);
 	if (r & LOFR_MARK_SEEN)
 		obj->flags |= SEEN;
 	if (r & LOFR_DO_SHOW)
@@ -203,16 +200,14 @@ static void process_tree(struct traversal_context *ctx,
 	else if (!failed_parse)
 		process_tree_contents(ctx, tree, base);
 
-	if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn) {
-		r = ctx->filter_fn(ctx->revs->repo,
-				   LOFS_END_TREE, obj,
-				   base->buf, &base->buf[baselen],
-				   ctx->filter_data);
-		if (r & LOFR_MARK_SEEN)
-			obj->flags |= SEEN;
-		if (r & LOFR_DO_SHOW)
-			ctx->show_object(obj, base->buf, ctx->show_data);
-	}
+	r = list_objects_filter__filter_object(ctx->revs->repo,
+					       LOFS_END_TREE, obj,
+					       base->buf, &base->buf[baselen],
+					       ctx->filter);
+	if (r & LOFR_MARK_SEEN)
+		obj->flags |= SEEN;
+	if (r & LOFR_DO_SHOW)
+		ctx->show_object(obj, base->buf, ctx->show_data);
 
 	strbuf_setlen(base, baselen);
 	free_tree_buffer(tree);
@@ -370,7 +365,9 @@ static void do_traverse(struct traversal_context *ctx)
 		 * an uninteresting boundary commit may not have its tree
 		 * parsed yet, but we are not going to show them anyway
 		 */
-		if (get_commit_tree(commit)) {
+		if (!ctx->revs->tree_objects)
+			; /* do not bother loading tree */
+		else if (get_commit_tree(commit)) {
 			struct tree *tree = get_commit_tree(commit);
 			tree->object.flags |= NOT_USER_GIVEN;
 			add_pending_tree(ctx->revs, tree);
@@ -402,8 +399,7 @@ void traverse_commit_list(struct rev_info *revs,
 	ctx.show_commit = show_commit;
 	ctx.show_object = show_object;
 	ctx.show_data = show_data;
-	ctx.filter_fn = NULL;
-	ctx.filter_data = NULL;
+	ctx.filter = NULL;
 	do_traverse(&ctx);
 }
 
@@ -416,17 +412,12 @@ void traverse_commit_list_filtered(
 	struct oidset *omitted)
 {
 	struct traversal_context ctx;
-	filter_free_fn filter_free_fn = NULL;
 
 	ctx.revs = revs;
 	ctx.show_object = show_object;
 	ctx.show_commit = show_commit;
 	ctx.show_data = show_data;
-	ctx.filter_fn = NULL;
-
-	ctx.filter_data = list_objects_filter__init(omitted, filter_options,
-						    &ctx.filter_fn, &filter_free_fn);
+	ctx.filter = list_objects_filter__init(omitted, filter_options);
 	do_traverse(&ctx);
-	if (ctx.filter_data && filter_free_fn)
-		filter_free_fn(ctx.filter_data);
+	list_objects_filter__free(ctx.filter);
 }
diff --git a/third_party/git/ll-merge.c b/third_party/git/ll-merge.c
index 5b8d46aedee7..d65a8971db73 100644
--- a/third_party/git/ll-merge.c
+++ b/third_party/git/ll-merge.c
@@ -32,6 +32,20 @@ struct ll_merge_driver {
 	char *cmdline;
 };
 
+static struct attr_check *merge_attributes;
+static struct attr_check *load_merge_attributes(void)
+{
+	if (!merge_attributes)
+		merge_attributes = attr_check_initl("merge", "conflict-marker-size", NULL);
+	return merge_attributes;
+}
+
+void reset_merge_attributes(void)
+{
+	attr_check_free(merge_attributes);
+	merge_attributes = NULL;
+}
+
 /*
  * Built-in low-levels
  */
@@ -354,7 +368,7 @@ int ll_merge(mmbuffer_t *result_buf,
 	     struct index_state *istate,
 	     const struct ll_merge_options *opts)
 {
-	static struct attr_check *check;
+	struct attr_check *check = load_merge_attributes();
 	static const struct ll_merge_options default_opts;
 	const char *ll_driver_name = NULL;
 	int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
@@ -369,9 +383,6 @@ int ll_merge(mmbuffer_t *result_buf,
 		normalize_file(theirs, path, istate);
 	}
 
-	if (!check)
-		check = attr_check_initl("merge", "conflict-marker-size", NULL);
-
 	git_check_attr(istate, path, check);
 	ll_driver_name = check->items[0].value;
 	if (check->items[1].value) {
diff --git a/third_party/git/ll-merge.h b/third_party/git/ll-merge.h
index b9e2af1c8840..aceb1b241323 100644
--- a/third_party/git/ll-merge.h
+++ b/third_party/git/ll-merge.h
@@ -7,16 +7,87 @@
 
 #include "xdiff/xdiff.h"
 
+/**
+ *
+ * Calling sequence:
+ * ----------------
+ *
+ * - Prepare a `struct ll_merge_options` to record options.
+ *   If you have no special requests, skip this and pass `NULL`
+ *   as the `opts` parameter to use the default options.
+ *
+ * - Allocate an mmbuffer_t variable for the result.
+ *
+ * - Allocate and fill variables with the file's original content
+ *   and two modified versions (using `read_mmfile`, for example).
+ *
+ * - Call `ll_merge()`.
+ *
+ * - Read the merged content from `result_buf.ptr` and `result_buf.size`.
+ *
+ * - Release buffers when finished.  A simple
+ *   `free(ancestor.ptr); free(ours.ptr); free(theirs.ptr);
+ *   free(result_buf.ptr);` will do.
+ *
+ * If the modifications do not merge cleanly, `ll_merge` will return a
+ * nonzero value and `result_buf` will generally include a description of
+ * the conflict bracketed by markers such as the traditional `<<<<<<<`
+ * and `>>>>>>>`.
+ *
+ * The `ancestor_label`, `our_label`, and `their_label` parameters are
+ * used to label the different sides of a conflict if the merge driver
+ * supports this.
+ */
+
+
 struct index_state;
 
+/**
+ * This describes the set of options the calling program wants to affect
+ * the operation of a low-level (single file) merge.
+ */
 struct ll_merge_options {
+
+	/**
+	 * Behave as though this were part of a merge between common ancestors in
+	 * a recursive merge (merges of binary files may need to be handled
+	 * differently in such cases, for example). If a helper program is
+	 * specified by the `[merge "<driver>"] recursive` configuration, it will
+	 * be used.
+	 */
 	unsigned virtual_ancestor : 1;
-	unsigned variant : 2;	/* favor ours, favor theirs, or union merge */
+
+	/**
+	 * Resolve local conflicts automatically in favor of one side or the other
+	 * (as in 'git merge-file' `--ours`/`--theirs`/`--union`).  Can be `0`,
+	 * `XDL_MERGE_FAVOR_OURS`, `XDL_MERGE_FAVOR_THEIRS`,
+	 * or `XDL_MERGE_FAVOR_UNION`.
+	 */
+	unsigned variant : 2;
+
+	/**
+	 * Resmudge and clean the "base", "theirs" and "ours" files before merging.
+	 * Use this when the merge is likely to have overlapped with a change in
+	 * smudge/clean or end-of-line normalization rules.
+	 */
 	unsigned renormalize : 1;
+
+	/**
+	 * Increase the length of conflict markers so that nested conflicts
+	ย * can be differentiated.
+	 */
 	unsigned extra_marker_size;
+
+	/* Extra xpparam_t flags as defined in xdiff/xdiff.h. */
 	long xdl_opts;
 };
 
+/**
+ * Perform a three-way single-file merge in core.  This is a thin wrapper
+ * around `xdl_merge` that takes the path and any merge backend specified in
+ * `.gitattributes` or `.git/info/attributes` into account.
+ * Returns 0 for a clean merge.
+ */
 int ll_merge(mmbuffer_t *result_buf,
 	     const char *path,
 	     mmfile_t *ancestor, const char *ancestor_label,
@@ -26,5 +97,6 @@ int ll_merge(mmbuffer_t *result_buf,
 	     const struct ll_merge_options *opts);
 
 int ll_merge_marker_size(struct index_state *istate, const char *path);
+void reset_merge_attributes(void);
 
 #endif
diff --git a/third_party/git/log-tree.c b/third_party/git/log-tree.c
index 1e56df62a79c..52127427ffea 100644
--- a/third_party/git/log-tree.c
+++ b/third_party/git/log-tree.c
@@ -77,6 +77,7 @@ void add_name_decoration(enum decoration_type type, const char *name, struct obj
 
 const struct name_decoration *get_name_decoration(const struct object *obj)
 {
+	load_ref_decorations(NULL, DECORATE_SHORT_REFS);
 	return lookup_decoration(&name_decoration, obj);
 }
 
@@ -499,7 +500,8 @@ static int show_one_mergetag(struct commit *commit,
 	int status, nth;
 	size_t payload_size, gpg_message_offset;
 
-	hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid);
+	hash_object_file(the_hash_algo, extra->value, extra->len,
+			 type_name(OBJ_TAG), &oid);
 	tag = lookup_tag(the_repository, &oid);
 	if (!tag)
 		return -1; /* error message already given */
@@ -514,7 +516,7 @@ static int show_one_mergetag(struct commit *commit,
 			    "merged tag '%s'\n", tag->tag);
 	else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0)
 		strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
-				    tag->tag, tag->tagged->oid.hash);
+				    tag->tag, oid_to_hex(&tag->tagged->oid));
 	else
 		strbuf_addf(&verify_message,
 			    "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
@@ -677,9 +679,7 @@ void show_log(struct rev_info *opt)
 		raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
 		format_display_notes(&commit->object.oid, &notebuf,
 				     get_log_output_encoding(), raw);
-		ctx.notes_message = notebuf.len
-			? strbuf_detach(&notebuf, NULL)
-			: xcalloc(1, 1);
+		ctx.notes_message = strbuf_detach(&notebuf, NULL);
 	}
 
 	/*
@@ -771,7 +771,7 @@ void show_log(struct rev_info *opt)
 		opts.use_color = opt->diffopt.use_color;
 		diff_setup_done(&opts);
 		show_range_diff(opt->rdiff1, opt->rdiff2,
-				opt->creation_factor, 1, &opts);
+				opt->creation_factor, 1, &opts, NULL);
 
 		memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
 	}
diff --git a/third_party/git/mailinfo.c b/third_party/git/mailinfo.c
index b395adbdf2a4..742fa376ab01 100644
--- a/third_party/git/mailinfo.c
+++ b/third_party/git/mailinfo.c
@@ -19,8 +19,7 @@ static void cleanup_space(struct strbuf *sb)
 static void get_sane_name(struct strbuf *out, struct strbuf *name, struct strbuf *email)
 {
 	struct strbuf *src = name;
-	if (name->len < 3 || 60 < name->len || strchr(name->buf, '@') ||
-		strchr(name->buf, '<') || strchr(name->buf, '>'))
+	if (name->len < 3 || 60 < name->len || strpbrk(name->buf, "@<>"))
 		src = email;
 	else if (name == out)
 		return;
@@ -254,7 +253,7 @@ static void handle_content_type(struct mailinfo *mi, struct strbuf *line)
 	mi->delsp = has_attr_value(line->buf, "delsp=", "yes");
 
 	if (slurp_attr(line->buf, "boundary=", boundary)) {
-		strbuf_insert(boundary, 0, "--", 2);
+		strbuf_insertstr(boundary, 0, "--");
 		if (++mi->content_top >= &mi->content[MAX_BOUNDARIES]) {
 			error("Too many boundaries to handle");
 			mi->input_error = -1;
@@ -346,11 +345,17 @@ static const char *header[MAX_HDR_PARSED] = {
 	"From","Subject","Date",
 };
 
-static inline int cmp_header(const struct strbuf *line, const char *hdr)
+static inline int skip_header(const struct strbuf *line, const char *hdr,
+			      const char **outval)
 {
-	int len = strlen(hdr);
-	return !strncasecmp(line->buf, hdr, len) && line->len > len &&
-			line->buf[len] == ':' && isspace(line->buf[len + 1]);
+	const char *val;
+	if (!skip_iprefix(line->buf, hdr, &val) ||
+	    *val++ != ':')
+		return 0;
+	while (isspace(*val))
+		val++;
+	*outval = val;
+	return 1;
 }
 
 static int is_format_patch_separator(const char *line, int len)
@@ -543,22 +548,36 @@ release_return:
 		mi->input_error = -1;
 }
 
+/*
+ * Returns true if "line" contains a header matching "hdr", in which case "val"
+ * will contain the value of the header with any RFC2047 B and Q encoding
+ * unwrapped, and optionally normalize the meta information to utf8.
+ */
+static int parse_header(const struct strbuf *line,
+			const char *hdr,
+			struct mailinfo *mi,
+			struct strbuf *val)
+{
+	const char *val_str;
+
+	if (!skip_header(line, hdr, &val_str))
+		return 0;
+	strbuf_addstr(val, val_str);
+	decode_header(mi, val);
+	return 1;
+}
+
 static int check_header(struct mailinfo *mi,
 			const struct strbuf *line,
 			struct strbuf *hdr_data[], int overwrite)
 {
-	int i, ret = 0, len;
+	int i, ret = 0;
 	struct strbuf sb = STRBUF_INIT;
 
 	/* search for the interesting parts */
 	for (i = 0; header[i]; i++) {
-		int len = strlen(header[i]);
-		if ((!hdr_data[i] || overwrite) && cmp_header(line, header[i])) {
-			/* Unwrap inline B and Q encoding, and optionally
-			 * normalize the meta information to utf8.
-			 */
-			strbuf_add(&sb, line->buf + len + 2, line->len - len - 2);
-			decode_header(mi, &sb);
+		if ((!hdr_data[i] || overwrite) &&
+		    parse_header(line, header[i], mi, &sb)) {
 			handle_header(&hdr_data[i], &sb);
 			ret = 1;
 			goto check_header_out;
@@ -566,27 +585,17 @@ static int check_header(struct mailinfo *mi,
 	}
 
 	/* Content stuff */
-	if (cmp_header(line, "Content-Type")) {
-		len = strlen("Content-Type: ");
-		strbuf_add(&sb, line->buf + len, line->len - len);
-		decode_header(mi, &sb);
-		strbuf_insert(&sb, 0, "Content-Type: ", len);
+	if (parse_header(line, "Content-Type", mi, &sb)) {
 		handle_content_type(mi, &sb);
 		ret = 1;
 		goto check_header_out;
 	}
-	if (cmp_header(line, "Content-Transfer-Encoding")) {
-		len = strlen("Content-Transfer-Encoding: ");
-		strbuf_add(&sb, line->buf + len, line->len - len);
-		decode_header(mi, &sb);
+	if (parse_header(line, "Content-Transfer-Encoding", mi, &sb)) {
 		handle_content_transfer_encoding(mi, &sb);
 		ret = 1;
 		goto check_header_out;
 	}
-	if (cmp_header(line, "Message-Id")) {
-		len = strlen("Message-Id: ");
-		strbuf_add(&sb, line->buf + len, line->len - len);
-		decode_header(mi, &sb);
+	if (parse_header(line, "Message-Id", mi, &sb)) {
 		if (mi->add_message_id)
 			mi->message_id = strbuf_detach(&sb, NULL);
 		ret = 1;
@@ -607,8 +616,9 @@ static int is_inbody_header(const struct mailinfo *mi,
 			    const struct strbuf *line)
 {
 	int i;
+	const char *val;
 	for (i = 0; header[i]; i++)
-		if (!mi->s_hdr_data[i] && cmp_header(line, header[i]))
+		if (!mi->s_hdr_data[i] && skip_header(line, header[i], &val))
 			return 1;
 	return 0;
 }
diff --git a/third_party/git/merge-recursive.c b/third_party/git/merge-recursive.c
index 6b812d67e3ec..7a4e6f20fa8c 100644
--- a/third_party/git/merge-recursive.c
+++ b/third_party/git/merge-recursive.c
@@ -4,30 +4,40 @@
  * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
  */
 #include "cache.h"
-#include "config.h"
+#include "merge-recursive.h"
+
 #include "advice.h"
-#include "lockfile.h"
-#include "cache-tree.h"
-#include "object-store.h"
-#include "repository.h"
-#include "commit.h"
+#include "alloc.h"
+#include "attr.h"
 #include "blob.h"
 #include "builtin.h"
-#include "tree-walk.h"
+#include "cache-tree.h"
+#include "commit.h"
+#include "commit-reach.h"
+#include "config.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "dir.h"
+#include "ll-merge.h"
+#include "lockfile.h"
+#include "object-store.h"
+#include "repository.h"
+#include "revision.h"
+#include "string-list.h"
+#include "submodule.h"
 #include "tag.h"
-#include "alloc.h"
+#include "tree-walk.h"
 #include "unpack-trees.h"
-#include "string-list.h"
 #include "xdiff-interface.h"
-#include "ll-merge.h"
-#include "attr.h"
-#include "merge-recursive.h"
-#include "dir.h"
-#include "submodule.h"
-#include "revision.h"
-#include "commit-reach.h"
+
+struct merge_options_internal {
+	int call_depth;
+	int needed_rename_limit;
+	struct hashmap current_file_dir_set;
+	struct string_list df_conflict_file_set;
+	struct unpack_trees_options unpack_opts;
+	struct index_state orig_index;
+};
 
 struct path_hashmap_entry {
 	struct hashmap_entry e;
@@ -35,14 +45,16 @@ struct path_hashmap_entry {
 };
 
 static int path_hashmap_cmp(const void *cmp_data,
-			    const void *entry,
-			    const void *entry_or_key,
+			    const struct hashmap_entry *eptr,
+			    const struct hashmap_entry *entry_or_key,
 			    const void *keydata)
 {
-	const struct path_hashmap_entry *a = entry;
-	const struct path_hashmap_entry *b = entry_or_key;
+	const struct path_hashmap_entry *a, *b;
 	const char *key = keydata;
 
+	a = container_of(eptr, const struct path_hashmap_entry, e);
+	b = container_of(entry_or_key, const struct path_hashmap_entry, e);
+
 	if (ignore_case)
 		return strcasecmp(a->path, key ? key : b->path);
 	else
@@ -54,6 +66,24 @@ static unsigned int path_hash(const char *path)
 	return ignore_case ? strihash(path) : strhash(path);
 }
 
+/*
+ * For dir_rename_entry, directory names are stored as a full path from the
+ * toplevel of the repository and do not include a trailing '/'.  Also:
+ *
+ *   dir:                original name of directory being renamed
+ *   non_unique_new_dir: if true, could not determine new_dir
+ *   new_dir:            final name of directory being renamed
+ *   possible_new_dirs:  temporary used to help determine new_dir; see comments
+ *                       in get_directory_renames() for details
+ */
+struct dir_rename_entry {
+	struct hashmap_entry ent;
+	char *dir;
+	unsigned non_unique_new_dir:1;
+	struct strbuf new_dir;
+	struct string_list possible_new_dirs;
+};
+
 static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap,
 						      char *dir)
 {
@@ -61,18 +91,20 @@ static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap,
 
 	if (dir == NULL)
 		return NULL;
-	hashmap_entry_init(&key, strhash(dir));
+	hashmap_entry_init(&key.ent, strhash(dir));
 	key.dir = dir;
-	return hashmap_get(hashmap, &key, NULL);
+	return hashmap_get_entry(hashmap, &key, ent, NULL);
 }
 
 static int dir_rename_cmp(const void *unused_cmp_data,
-			  const void *entry,
-			  const void *entry_or_key,
+			  const struct hashmap_entry *eptr,
+			  const struct hashmap_entry *entry_or_key,
 			  const void *unused_keydata)
 {
-	const struct dir_rename_entry *e1 = entry;
-	const struct dir_rename_entry *e2 = entry_or_key;
+	const struct dir_rename_entry *e1, *e2;
+
+	e1 = container_of(eptr, const struct dir_rename_entry, ent);
+	e2 = container_of(entry_or_key, const struct dir_rename_entry, ent);
 
 	return strcmp(e1->dir, e2->dir);
 }
@@ -85,34 +117,46 @@ static void dir_rename_init(struct hashmap *map)
 static void dir_rename_entry_init(struct dir_rename_entry *entry,
 				  char *directory)
 {
-	hashmap_entry_init(entry, strhash(directory));
+	hashmap_entry_init(&entry->ent, strhash(directory));
 	entry->dir = directory;
 	entry->non_unique_new_dir = 0;
 	strbuf_init(&entry->new_dir, 0);
 	string_list_init(&entry->possible_new_dirs, 0);
 }
 
+struct collision_entry {
+	struct hashmap_entry ent;
+	char *target_file;
+	struct string_list source_files;
+	unsigned reported_already:1;
+};
+
 static struct collision_entry *collision_find_entry(struct hashmap *hashmap,
 						    char *target_file)
 {
 	struct collision_entry key;
 
-	hashmap_entry_init(&key, strhash(target_file));
+	hashmap_entry_init(&key.ent, strhash(target_file));
 	key.target_file = target_file;
-	return hashmap_get(hashmap, &key, NULL);
+	return hashmap_get_entry(hashmap, &key, ent, NULL);
 }
 
-static int collision_cmp(void *unused_cmp_data,
-			 const struct collision_entry *e1,
-			 const struct collision_entry *e2,
+static int collision_cmp(const void *unused_cmp_data,
+			 const struct hashmap_entry *eptr,
+			 const struct hashmap_entry *entry_or_key,
 			 const void *unused_keydata)
 {
+	const struct collision_entry *e1, *e2;
+
+	e1 = container_of(eptr, const struct collision_entry, ent);
+	e2 = container_of(entry_or_key, const struct collision_entry, ent);
+
 	return strcmp(e1->target_file, e2->target_file);
 }
 
 static void collision_init(struct hashmap *map)
 {
-	hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0);
+	hashmap_init(map, collision_cmp, NULL, 0);
 }
 
 static void flush_output(struct merge_options *opt)
@@ -180,17 +224,6 @@ static struct commit *make_virtual_commit(struct repository *repo,
 	return commit;
 }
 
-/*
- * Since we use get_tree_entry(), which does not put the read object into
- * the object pool, we cannot rely on a == b.
- */
-static int oid_eq(const struct object_id *a, const struct object_id *b)
-{
-	if (!a && !b)
-		return 2;
-	return a && b && oideq(a, b);
-}
-
 enum rename_type {
 	RENAME_NORMAL = 0,
 	RENAME_VIA_DIR,
@@ -284,7 +317,8 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
 
 static int show(struct merge_options *opt, int v)
 {
-	return (!opt->call_depth && opt->verbosity >= v) || opt->verbosity >= 5;
+	return (!opt->priv->call_depth && opt->verbosity >= v) ||
+		opt->verbosity >= 5;
 }
 
 __attribute__((format (printf, 3, 4)))
@@ -295,7 +329,7 @@ static void output(struct merge_options *opt, int v, const char *fmt, ...)
 	if (!show(opt, v))
 		return;
 
-	strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2);
+	strbuf_addchars(&opt->obuf, ' ', opt->priv->call_depth * 2);
 
 	va_start(ap, fmt);
 	strbuf_vaddf(&opt->obuf, fmt, ap);
@@ -310,7 +344,7 @@ static void output_commit_title(struct merge_options *opt, struct commit *commit
 {
 	struct merge_remote_desc *desc;
 
-	strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2);
+	strbuf_addchars(&opt->obuf, ' ', opt->priv->call_depth * 2);
 	desc = merge_remote_util(commit);
 	if (desc)
 		strbuf_addf(&opt->obuf, "virtual %s\n", desc->name);
@@ -358,6 +392,11 @@ static int add_cacheinfo(struct merge_options *opt,
 	return ret;
 }
 
+static inline int merge_detect_rename(struct merge_options *opt)
+{
+	return (opt->detect_renames >= 0) ? opt->detect_renames : 1;
+}
+
 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
 {
 	parse_tree(tree);
@@ -373,74 +412,43 @@ static int unpack_trees_start(struct merge_options *opt,
 	struct tree_desc t[3];
 	struct index_state tmp_index = { NULL };
 
-	memset(&opt->unpack_opts, 0, sizeof(opt->unpack_opts));
-	if (opt->call_depth)
-		opt->unpack_opts.index_only = 1;
+	memset(&opt->priv->unpack_opts, 0, sizeof(opt->priv->unpack_opts));
+	if (opt->priv->call_depth)
+		opt->priv->unpack_opts.index_only = 1;
 	else
-		opt->unpack_opts.update = 1;
-	opt->unpack_opts.merge = 1;
-	opt->unpack_opts.head_idx = 2;
-	opt->unpack_opts.fn = threeway_merge;
-	opt->unpack_opts.src_index = opt->repo->index;
-	opt->unpack_opts.dst_index = &tmp_index;
-	opt->unpack_opts.aggressive = !merge_detect_rename(opt);
-	setup_unpack_trees_porcelain(&opt->unpack_opts, "merge");
+		opt->priv->unpack_opts.update = 1;
+	opt->priv->unpack_opts.merge = 1;
+	opt->priv->unpack_opts.head_idx = 2;
+	opt->priv->unpack_opts.fn = threeway_merge;
+	opt->priv->unpack_opts.src_index = opt->repo->index;
+	opt->priv->unpack_opts.dst_index = &tmp_index;
+	opt->priv->unpack_opts.aggressive = !merge_detect_rename(opt);
+	setup_unpack_trees_porcelain(&opt->priv->unpack_opts, "merge");
 
 	init_tree_desc_from_tree(t+0, common);
 	init_tree_desc_from_tree(t+1, head);
 	init_tree_desc_from_tree(t+2, merge);
 
-	rc = unpack_trees(3, t, &opt->unpack_opts);
+	rc = unpack_trees(3, t, &opt->priv->unpack_opts);
 	cache_tree_free(&opt->repo->index->cache_tree);
 
 	/*
-	 * Update opt->repo->index to match the new results, AFTER saving a copy
-	 * in opt->orig_index.  Update src_index to point to the saved copy.
-	 * (verify_uptodate() checks src_index, and the original index is
-	 * the one that had the necessary modification timestamps.)
+	 * Update opt->repo->index to match the new results, AFTER saving a
+	 * copy in opt->priv->orig_index.  Update src_index to point to the
+	 * saved copy.  (verify_uptodate() checks src_index, and the original
+	 * index is the one that had the necessary modification timestamps.)
 	 */
-	opt->orig_index = *opt->repo->index;
+	opt->priv->orig_index = *opt->repo->index;
 	*opt->repo->index = tmp_index;
-	opt->unpack_opts.src_index = &opt->orig_index;
+	opt->priv->unpack_opts.src_index = &opt->priv->orig_index;
 
 	return rc;
 }
 
 static void unpack_trees_finish(struct merge_options *opt)
 {
-	discard_index(&opt->orig_index);
-	clear_unpack_trees_porcelain(&opt->unpack_opts);
-}
-
-struct tree *write_tree_from_memory(struct merge_options *opt)
-{
-	struct tree *result = NULL;
-	struct index_state *istate = opt->repo->index;
-
-	if (unmerged_index(istate)) {
-		int i;
-		fprintf(stderr, "BUG: There are unmerged index entries:\n");
-		for (i = 0; i < istate->cache_nr; i++) {
-			const struct cache_entry *ce = istate->cache[i];
-			if (ce_stage(ce))
-				fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
-					(int)ce_namelen(ce), ce->name);
-		}
-		BUG("unmerged index entries in merge-recursive.c");
-	}
-
-	if (!istate->cache_tree)
-		istate->cache_tree = cache_tree();
-
-	if (!cache_tree_fully_valid(istate->cache_tree) &&
-	    cache_tree_update(istate, 0) < 0) {
-		err(opt, _("error building trees"));
-		return NULL;
-	}
-
-	result = lookup_tree(opt->repo, &istate->cache_tree->oid);
-
-	return result;
+	discard_index(&opt->priv->orig_index);
+	clear_unpack_trees_porcelain(&opt->priv->unpack_opts);
 }
 
 static int save_files_dirs(const struct object_id *oid,
@@ -454,8 +462,8 @@ static int save_files_dirs(const struct object_id *oid,
 	strbuf_addstr(base, path);
 
 	FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
-	hashmap_entry_init(entry, path_hash(entry->path));
-	hashmap_add(&opt->current_file_dir_set, entry);
+	hashmap_entry_init(&entry->e, path_hash(entry->path));
+	hashmap_add(&opt->priv->current_file_dir_set, &entry->e);
 
 	strbuf_setlen(base, baselen);
 	return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
@@ -586,7 +594,7 @@ static void record_df_conflict_files(struct merge_options *opt,
 	 * If we're merging merge-bases, we don't want to bother with
 	 * any working directory changes.
 	 */
-	if (opt->call_depth)
+	if (opt->priv->call_depth)
 		return;
 
 	/* Ensure D/F conflicts are adjacent in the entries list. */
@@ -598,7 +606,7 @@ static void record_df_conflict_files(struct merge_options *opt,
 	df_sorted_entries.cmp = string_list_df_name_compare;
 	string_list_sort(&df_sorted_entries);
 
-	string_list_clear(&opt->df_conflict_file_set, 1);
+	string_list_clear(&opt->priv->df_conflict_file_set, 1);
 	for (i = 0; i < df_sorted_entries.nr; i++) {
 		const char *path = df_sorted_entries.items[i].string;
 		int len = strlen(path);
@@ -614,7 +622,7 @@ static void record_df_conflict_files(struct merge_options *opt,
 		    len > last_len &&
 		    memcmp(path, last_file, last_len) == 0 &&
 		    path[last_len] == '/') {
-			string_list_insert(&opt->df_conflict_file_set, last_file);
+			string_list_insert(&opt->priv->df_conflict_file_set, last_file);
 		}
 
 		/*
@@ -681,8 +689,8 @@ static void update_entry(struct stage_data *entry,
 static int remove_file(struct merge_options *opt, int clean,
 		       const char *path, int no_wd)
 {
-	int update_cache = opt->call_depth || clean;
-	int update_working_directory = !opt->call_depth && !no_wd;
+	int update_cache = opt->priv->call_depth || clean;
+	int update_working_directory = !opt->priv->call_depth && !no_wd;
 
 	if (update_cache) {
 		if (remove_file_from_index(opt->repo->index, path))
@@ -712,7 +720,9 @@ static void add_flattened_path(struct strbuf *out, const char *s)
 			out->buf[i] = '_';
 }
 
-static char *unique_path(struct merge_options *opt, const char *path, const char *branch)
+static char *unique_path(struct merge_options *opt,
+			 const char *path,
+			 const char *branch)
 {
 	struct path_hashmap_entry *entry;
 	struct strbuf newpath = STRBUF_INIT;
@@ -723,16 +733,16 @@ static char *unique_path(struct merge_options *opt, const char *path, const char
 	add_flattened_path(&newpath, branch);
 
 	base_len = newpath.len;
-	while (hashmap_get_from_hash(&opt->current_file_dir_set,
+	while (hashmap_get_from_hash(&opt->priv->current_file_dir_set,
 				     path_hash(newpath.buf), newpath.buf) ||
-	       (!opt->call_depth && file_exists(newpath.buf))) {
+	       (!opt->priv->call_depth && file_exists(newpath.buf))) {
 		strbuf_setlen(&newpath, base_len);
 		strbuf_addf(&newpath, "_%d", suffix++);
 	}
 
 	FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
-	hashmap_entry_init(entry, path_hash(entry->path));
-	hashmap_add(&opt->current_file_dir_set, entry);
+	hashmap_entry_init(&entry->e, path_hash(entry->path));
+	hashmap_add(&opt->priv->current_file_dir_set, &entry->e);
 	return strbuf_detach(&newpath, NULL);
 }
 
@@ -764,7 +774,8 @@ static int dir_in_way(struct index_state *istate, const char *path,
 
 	strbuf_release(&dirpath);
 	return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) &&
-		!(empty_ok && is_empty_dir(path));
+		!(empty_ok && is_empty_dir(path)) &&
+		!has_symlink_leading_path(path, strlen(path));
 }
 
 /*
@@ -774,7 +785,7 @@ static int dir_in_way(struct index_state *istate, const char *path,
 static int was_tracked_and_matches(struct merge_options *opt, const char *path,
 				   const struct diff_filespec *blob)
 {
-	int pos = index_name_pos(&opt->orig_index, path, strlen(path));
+	int pos = index_name_pos(&opt->priv->orig_index, path, strlen(path));
 	struct cache_entry *ce;
 
 	if (0 > pos)
@@ -782,8 +793,8 @@ static int was_tracked_and_matches(struct merge_options *opt, const char *path,
 		return 0;
 
 	/* See if the file we were tracking before matches */
-	ce = opt->orig_index.cache[pos];
-	return (oid_eq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode);
+	ce = opt->priv->orig_index.cache[pos];
+	return (oideq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode);
 }
 
 /*
@@ -791,7 +802,7 @@ static int was_tracked_and_matches(struct merge_options *opt, const char *path,
  */
 static int was_tracked(struct merge_options *opt, const char *path)
 {
-	int pos = index_name_pos(&opt->orig_index, path, strlen(path));
+	int pos = index_name_pos(&opt->priv->orig_index, path, strlen(path));
 
 	if (0 <= pos)
 		/* we were tracking this path before the merge */
@@ -848,12 +859,12 @@ static int was_dirty(struct merge_options *opt, const char *path)
 	struct cache_entry *ce;
 	int dirty = 1;
 
-	if (opt->call_depth || !was_tracked(opt, path))
+	if (opt->priv->call_depth || !was_tracked(opt, path))
 		return !dirty;
 
-	ce = index_file_exists(opt->unpack_opts.src_index,
+	ce = index_file_exists(opt->priv->unpack_opts.src_index,
 			       path, strlen(path), ignore_case);
-	dirty = verify_uptodate(ce, &opt->unpack_opts) != 0;
+	dirty = verify_uptodate(ce, &opt->priv->unpack_opts) != 0;
 	return dirty;
 }
 
@@ -863,8 +874,8 @@ static int make_room_for_path(struct merge_options *opt, const char *path)
 	const char *msg = _("failed to create path '%s'%s");
 
 	/* Unlink any D/F conflict files that are in the way */
-	for (i = 0; i < opt->df_conflict_file_set.nr; i++) {
-		const char *df_path = opt->df_conflict_file_set.items[i].string;
+	for (i = 0; i < opt->priv->df_conflict_file_set.nr; i++) {
+		const char *df_path = opt->priv->df_conflict_file_set.items[i].string;
 		size_t pathlen = strlen(path);
 		size_t df_pathlen = strlen(df_path);
 		if (df_pathlen < pathlen &&
@@ -874,7 +885,7 @@ static int make_room_for_path(struct merge_options *opt, const char *path)
 			       _("Removing %s to make room for subdirectory\n"),
 			       df_path);
 			unlink(df_path);
-			unsorted_string_list_delete_item(&opt->df_conflict_file_set,
+			unsorted_string_list_delete_item(&opt->priv->df_conflict_file_set,
 							 i, 0);
 			break;
 		}
@@ -915,7 +926,7 @@ static int update_file_flags(struct merge_options *opt,
 {
 	int ret = 0;
 
-	if (opt->call_depth)
+	if (opt->priv->call_depth)
 		update_wd = 0;
 
 	if (update_wd) {
@@ -934,9 +945,11 @@ static int update_file_flags(struct merge_options *opt,
 		}
 
 		buf = read_object_file(&contents->oid, &type, &size);
-		if (!buf)
-			return err(opt, _("cannot read object %s '%s'"),
-				   oid_to_hex(&contents->oid), path);
+		if (!buf) {
+			ret = err(opt, _("cannot read object %s '%s'"),
+				  oid_to_hex(&contents->oid), path);
+			goto free_buf;
+		}
 		if (type != OBJ_BLOB) {
 			ret = err(opt, _("blob expected for %s '%s'"),
 				  oid_to_hex(&contents->oid), path);
@@ -944,7 +957,8 @@ static int update_file_flags(struct merge_options *opt,
 		}
 		if (S_ISREG(contents->mode)) {
 			struct strbuf strbuf = STRBUF_INIT;
-			if (convert_to_working_tree(opt->repo->index, path, buf, size, &strbuf)) {
+			if (convert_to_working_tree(opt->repo->index,
+						    path, buf, size, &strbuf)) {
 				free(buf);
 				size = strbuf.len;
 				buf = strbuf_detach(&strbuf, NULL);
@@ -984,10 +998,13 @@ static int update_file_flags(struct merge_options *opt,
 		free(buf);
 	}
 update_index:
-	if (!ret && update_cache)
-		if (add_cacheinfo(opt, contents, path, 0, update_wd,
+	if (!ret && update_cache) {
+		int refresh = (!opt->priv->call_depth &&
+			       contents->mode != S_IFGITLINK);
+		if (add_cacheinfo(opt, contents, path, 0, refresh,
 				  ADD_CACHE_OK_TO_ADD))
 			return -1;
+	}
 	return ret;
 }
 
@@ -997,7 +1014,7 @@ static int update_file(struct merge_options *opt,
 		       const char *path)
 {
 	return update_file_flags(opt, contents, path,
-				 opt->call_depth || clean, !opt->call_depth);
+				 opt->priv->call_depth || clean, !opt->priv->call_depth);
 }
 
 /* Low level file merging, update and removal */
@@ -1019,22 +1036,22 @@ static int merge_3way(struct merge_options *opt,
 {
 	mmfile_t orig, src1, src2;
 	struct ll_merge_options ll_opts = {0};
-	char *base_name, *name1, *name2;
+	char *base, *name1, *name2;
 	int merge_status;
 
 	ll_opts.renormalize = opt->renormalize;
 	ll_opts.extra_marker_size = extra_marker_size;
 	ll_opts.xdl_opts = opt->xdl_opts;
 
-	if (opt->call_depth) {
+	if (opt->priv->call_depth) {
 		ll_opts.virtual_ancestor = 1;
 		ll_opts.variant = 0;
 	} else {
 		switch (opt->recursive_variant) {
-		case MERGE_RECURSIVE_OURS:
+		case MERGE_VARIANT_OURS:
 			ll_opts.variant = XDL_MERGE_FAVOR_OURS;
 			break;
-		case MERGE_RECURSIVE_THEIRS:
+		case MERGE_VARIANT_THEIRS:
 			ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
 			break;
 		default:
@@ -1043,16 +1060,13 @@ static int merge_3way(struct merge_options *opt,
 		}
 	}
 
-	assert(a->path && b->path);
-	if (strcmp(a->path, b->path) ||
-	    (opt->ancestor != NULL && strcmp(a->path, o->path) != 0)) {
-		base_name = opt->ancestor == NULL ? NULL :
-			mkpathdup("%s:%s", opt->ancestor, o->path);
+	assert(a->path && b->path && o->path && opt->ancestor);
+	if (strcmp(a->path, b->path) || strcmp(a->path, o->path) != 0) {
+		base  = mkpathdup("%s:%s", opt->ancestor, o->path);
 		name1 = mkpathdup("%s:%s", branch1, a->path);
 		name2 = mkpathdup("%s:%s", branch2, b->path);
 	} else {
-		base_name = opt->ancestor == NULL ? NULL :
-			mkpathdup("%s", opt->ancestor);
+		base  = mkpathdup("%s", opt->ancestor);
 		name1 = mkpathdup("%s", branch1);
 		name2 = mkpathdup("%s", branch2);
 	}
@@ -1061,11 +1075,11 @@ static int merge_3way(struct merge_options *opt,
 	read_mmblob(&src1, &a->oid);
 	read_mmblob(&src2, &b->oid);
 
-	merge_status = ll_merge(result_buf, a->path, &orig, base_name,
+	merge_status = ll_merge(result_buf, a->path, &orig, base,
 				&src1, name1, &src2, name2,
 				opt->repo->index, &ll_opts);
 
-	free(base_name);
+	free(base);
 	free(name1);
 	free(name2);
 	free(orig.ptr);
@@ -1160,7 +1174,7 @@ static int merge_submodule(struct merge_options *opt,
 	struct object_array merges;
 
 	int i;
-	int search = !opt->call_depth;
+	int search = !opt->priv->call_depth;
 
 	/* store a in result in case we fail */
 	oidcpy(result, a);
@@ -1295,7 +1309,7 @@ static int merge_mode_and_contents(struct merge_options *opt,
 			oidcpy(&result->blob.oid, &b->oid);
 		}
 	} else {
-		if (!oid_eq(&a->oid, &o->oid) && !oid_eq(&b->oid, &o->oid))
+		if (!oideq(&a->oid, &o->oid) && !oideq(&b->oid, &o->oid))
 			result->merge = 1;
 
 		/*
@@ -1311,9 +1325,9 @@ static int merge_mode_and_contents(struct merge_options *opt,
 			}
 		}
 
-		if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &o->oid))
+		if (oideq(&a->oid, &b->oid) || oideq(&a->oid, &o->oid))
 			oidcpy(&result->blob.oid, &b->oid);
-		else if (oid_eq(&b->oid, &o->oid))
+		else if (oideq(&b->oid, &o->oid))
 			oidcpy(&result->blob.oid, &a->oid);
 		else if (S_ISREG(a->mode)) {
 			mmbuffer_t result_buf;
@@ -1344,15 +1358,15 @@ static int merge_mode_and_contents(struct merge_options *opt,
 							&b->oid);
 		} else if (S_ISLNK(a->mode)) {
 			switch (opt->recursive_variant) {
-			case MERGE_RECURSIVE_NORMAL:
+			case MERGE_VARIANT_NORMAL:
 				oidcpy(&result->blob.oid, &a->oid);
-				if (!oid_eq(&a->oid, &b->oid))
+				if (!oideq(&a->oid, &b->oid))
 					result->clean = 0;
 				break;
-			case MERGE_RECURSIVE_OURS:
+			case MERGE_VARIANT_OURS:
 				oidcpy(&result->blob.oid, &a->oid);
 				break;
-			case MERGE_RECURSIVE_THEIRS:
+			case MERGE_VARIANT_THEIRS:
 				oidcpy(&result->blob.oid, &b->oid);
 				break;
 			}
@@ -1378,10 +1392,11 @@ static int handle_rename_via_dir(struct merge_options *opt,
 	const struct rename *ren = ci->ren1;
 	const struct diff_filespec *dest = ren->pair->two;
 	char *file_path = dest->path;
-	int mark_conflicted = (opt->detect_directory_renames == 1);
+	int mark_conflicted = (opt->detect_directory_renames ==
+			       MERGE_DIRECTORY_RENAMES_CONFLICT);
 	assert(ren->dir_rename_original_dest);
 
-	if (!opt->call_depth && would_lose_untracked(opt, dest->path)) {
+	if (!opt->priv->call_depth && would_lose_untracked(opt, dest->path)) {
 		mark_conflicted = 1;
 		file_path = unique_path(opt, dest->path, ren->branch);
 		output(opt, 1, _("Error: Refusing to lose untracked file at %s; "
@@ -1424,12 +1439,12 @@ static int handle_change_delete(struct merge_options *opt,
 	const char *update_path = path;
 	int ret = 0;
 
-	if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0) ||
-	    (!opt->call_depth && would_lose_untracked(opt, path))) {
+	if (dir_in_way(opt->repo->index, path, !opt->priv->call_depth, 0) ||
+	    (!opt->priv->call_depth && would_lose_untracked(opt, path))) {
 		update_path = alt_path = unique_path(opt, path, change_branch);
 	}
 
-	if (opt->call_depth) {
+	if (opt->priv->call_depth) {
 		/*
 		 * We cannot arbitrarily accept either a_sha or b_sha as
 		 * correct; since there is no true "middle point" between
@@ -1504,14 +1519,14 @@ static int handle_rename_delete(struct merge_options *opt,
 				     opt->branch2 : opt->branch1);
 
 	if (handle_change_delete(opt,
-				 opt->call_depth ? orig->path : dest->path,
-				 opt->call_depth ? NULL : orig->path,
+				 opt->priv->call_depth ? orig->path : dest->path,
+				 opt->priv->call_depth ? NULL : orig->path,
 				 orig, dest,
 				 rename_branch, delete_branch,
 				 _("rename"), _("renamed")))
 		return -1;
 
-	if (opt->call_depth)
+	if (opt->priv->call_depth)
 		return remove_file_from_index(opt->repo->index, dest->path);
 	else
 		return update_stages(opt, dest->path, NULL,
@@ -1545,42 +1560,13 @@ static int handle_file_collision(struct merge_options *opt,
 					     b, a);
 	}
 
-	/*
-	 * In the recursive case, we just opt to undo renames
-	 */
-	if (opt->call_depth && (prev_path1 || prev_path2)) {
-		/* Put first file (a->oid, a->mode) in its original spot */
-		if (prev_path1) {
-			if (update_file(opt, 1, a, prev_path1))
-				return -1;
-		} else {
-			if (update_file(opt, 1, a, collide_path))
-				return -1;
-		}
-
-		/* Put second file (b->oid, b->mode) in its original spot */
-		if (prev_path2) {
-			if (update_file(opt, 1, b, prev_path2))
-				return -1;
-		} else {
-			if (update_file(opt, 1, b, collide_path))
-				return -1;
-		}
-
-		/* Don't leave something at collision path if unrenaming both */
-		if (prev_path1 && prev_path2)
-			remove_file(opt, 1, collide_path, 0);
-
-		return 0;
-	}
-
 	/* Remove rename sources if rename/add or rename/rename(2to1) */
 	if (prev_path1)
 		remove_file(opt, 1, prev_path1,
-			    opt->call_depth || would_lose_untracked(opt, prev_path1));
+			    opt->priv->call_depth || would_lose_untracked(opt, prev_path1));
 	if (prev_path2)
 		remove_file(opt, 1, prev_path2,
-			    opt->call_depth || would_lose_untracked(opt, prev_path2));
+			    opt->priv->call_depth || would_lose_untracked(opt, prev_path2));
 
 	/*
 	 * Remove the collision path, if it wouldn't cause dirty contents
@@ -1622,12 +1608,12 @@ static int handle_file_collision(struct merge_options *opt,
 	null.mode = 0;
 
 	if (merge_mode_and_contents(opt, &null, a, b, collide_path,
-				    branch1, branch2, opt->call_depth * 2, &mfi))
+				    branch1, branch2, opt->priv->call_depth * 2, &mfi))
 		return -1;
 	mfi.clean &= !alt_path;
 	if (update_file(opt, mfi.clean, &mfi.blob, update_path))
 		return -1;
-	if (!mfi.clean && !opt->call_depth &&
+	if (!mfi.clean && !opt->priv->call_depth &&
 	    update_stages(opt, collide_path, NULL, a, b))
 		return -1;
 	free(alt_path);
@@ -1667,7 +1653,7 @@ static int handle_rename_add(struct merge_options *opt,
 				    &ci->ren1->src_entry->stages[other_stage],
 				    prev_path_desc,
 				    opt->branch1, opt->branch2,
-				    1 + opt->call_depth * 2, &mfi))
+				    1 + opt->priv->call_depth * 2, &mfi))
 		return -1;
 	free(prev_path_desc);
 
@@ -1685,7 +1671,7 @@ static char *find_path_for_conflict(struct merge_options *opt,
 				    const char *branch2)
 {
 	char *new_path = NULL;
-	if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0)) {
+	if (dir_in_way(opt->repo->index, path, !opt->priv->call_depth, 0)) {
 		new_path = unique_path(opt, path, branch1);
 		output(opt, 1, _("%s is a directory in %s adding "
 			       "as %s instead"),
@@ -1700,6 +1686,14 @@ static char *find_path_for_conflict(struct merge_options *opt,
 	return new_path;
 }
 
+/*
+ * Toggle the stage number between "ours" and "theirs" (2 and 3).
+ */
+static inline int flip_stage(int stage)
+{
+	return (2 + 3) - stage;
+}
+
 static int handle_rename_rename_1to2(struct merge_options *opt,
 				     struct rename_conflict_info *ci)
 {
@@ -1716,95 +1710,66 @@ static int handle_rename_rename_1to2(struct merge_options *opt,
 	       "rename \"%s\"->\"%s\" in \"%s\"%s"),
 	       o->path, a->path, ci->ren1->branch,
 	       o->path, b->path, ci->ren2->branch,
-	       opt->call_depth ? _(" (left unresolved)") : "");
+	       opt->priv->call_depth ? _(" (left unresolved)") : "");
 
 	path_desc = xstrfmt("%s and %s, both renamed from %s",
 			    a->path, b->path, o->path);
 	if (merge_mode_and_contents(opt, o, a, b, path_desc,
 				    ci->ren1->branch, ci->ren2->branch,
-				    opt->call_depth * 2, &mfi))
+				    opt->priv->call_depth * 2, &mfi))
 		return -1;
 	free(path_desc);
 
-	if (opt->call_depth) {
-		/*
-		 * FIXME: For rename/add-source conflicts (if we could detect
-		 * such), this is wrong.  We should instead find a unique
-		 * pathname and then either rename the add-source file to that
-		 * unique path, or use that unique path instead of src here.
-		 */
-		if (update_file(opt, 0, &mfi.blob, o->path))
-			return -1;
+	if (opt->priv->call_depth)
+		remove_file_from_index(opt->repo->index, o->path);
 
-		/*
-		 * Above, we put the merged content at the merge-base's
-		 * path.  Now we usually need to delete both a->path and
-		 * b->path.  However, the rename on each side of the merge
-		 * could also be involved in a rename/add conflict.  In
-		 * such cases, we should keep the added file around,
-		 * resolving the conflict at that path in its favor.
-		 */
-		add = &ci->ren1->dst_entry->stages[2 ^ 1];
-		if (is_valid(add)) {
-			if (update_file(opt, 0, add, a->path))
-				return -1;
-		}
-		else
-			remove_file_from_index(opt->repo->index, a->path);
-		add = &ci->ren2->dst_entry->stages[3 ^ 1];
-		if (is_valid(add)) {
-			if (update_file(opt, 0, add, b->path))
-				return -1;
-		}
-		else
-			remove_file_from_index(opt->repo->index, b->path);
+	/*
+	 * For each destination path, we need to see if there is a
+	 * rename/add collision.  If not, we can write the file out
+	 * to the specified location.
+	 */
+	add = &ci->ren1->dst_entry->stages[flip_stage(2)];
+	if (is_valid(add)) {
+		add->path = mfi.blob.path = a->path;
+		if (handle_file_collision(opt, a->path,
+					  NULL, NULL,
+					  ci->ren1->branch,
+					  ci->ren2->branch,
+					  &mfi.blob, add) < 0)
+			return -1;
 	} else {
-		/*
-		 * For each destination path, we need to see if there is a
-		 * rename/add collision.  If not, we can write the file out
-		 * to the specified location.
-		 */
-		add = &ci->ren1->dst_entry->stages[2 ^ 1];
-		if (is_valid(add)) {
-			add->path = mfi.blob.path = a->path;
-			if (handle_file_collision(opt, a->path,
-						  NULL, NULL,
-						  ci->ren1->branch,
-						  ci->ren2->branch,
-						  &mfi.blob, add) < 0)
-				return -1;
-		} else {
-			char *new_path = find_path_for_conflict(opt, a->path,
-								ci->ren1->branch,
-								ci->ren2->branch);
-			if (update_file(opt, 0, &mfi.blob,
-					new_path ? new_path : a->path))
-				return -1;
-			free(new_path);
-			if (update_stages(opt, a->path, NULL, a, NULL))
-				return -1;
-		}
+		char *new_path = find_path_for_conflict(opt, a->path,
+							ci->ren1->branch,
+							ci->ren2->branch);
+		if (update_file(opt, 0, &mfi.blob,
+				new_path ? new_path : a->path))
+			return -1;
+		free(new_path);
+		if (!opt->priv->call_depth &&
+		    update_stages(opt, a->path, NULL, a, NULL))
+			return -1;
+	}
 
-		add = &ci->ren2->dst_entry->stages[3 ^ 1];
-		if (is_valid(add)) {
-			add->path = mfi.blob.path = b->path;
-			if (handle_file_collision(opt, b->path,
-						  NULL, NULL,
-						  ci->ren1->branch,
-						  ci->ren2->branch,
-						  add, &mfi.blob) < 0)
-				return -1;
-		} else {
-			char *new_path = find_path_for_conflict(opt, b->path,
-								ci->ren2->branch,
-								ci->ren1->branch);
-			if (update_file(opt, 0, &mfi.blob,
-					new_path ? new_path : b->path))
-				return -1;
-			free(new_path);
-			if (update_stages(opt, b->path, NULL, NULL, b))
-				return -1;
-		}
+	add = &ci->ren2->dst_entry->stages[flip_stage(3)];
+	if (is_valid(add)) {
+		add->path = mfi.blob.path = b->path;
+		if (handle_file_collision(opt, b->path,
+					  NULL, NULL,
+					  ci->ren1->branch,
+					  ci->ren2->branch,
+					  add, &mfi.blob) < 0)
+			return -1;
+	} else {
+		char *new_path = find_path_for_conflict(opt, b->path,
+							ci->ren2->branch,
+							ci->ren1->branch);
+		if (update_file(opt, 0, &mfi.blob,
+				new_path ? new_path : b->path))
+			return -1;
+		free(new_path);
+		if (!opt->priv->call_depth &&
+		    update_stages(opt, b->path, NULL, NULL, b))
+			return -1;
 	}
 
 	return 0;
@@ -1834,19 +1799,19 @@ static int handle_rename_rename_2to1(struct merge_options *opt,
 	path_side_1_desc = xstrfmt("version of %s from %s", path, a->path);
 	path_side_2_desc = xstrfmt("version of %s from %s", path, b->path);
 	ostage1 = ci->ren1->branch == opt->branch1 ? 3 : 2;
-	ostage2 = ostage1 ^ 1;
+	ostage2 = flip_stage(ostage1);
 	ci->ren1->src_entry->stages[ostage1].path = a->path;
 	ci->ren2->src_entry->stages[ostage2].path = b->path;
 	if (merge_mode_and_contents(opt, a, c1,
 				    &ci->ren1->src_entry->stages[ostage1],
 				    path_side_1_desc,
 				    opt->branch1, opt->branch2,
-				    1 + opt->call_depth * 2, &mfi_c1) ||
+				    1 + opt->priv->call_depth * 2, &mfi_c1) ||
 	    merge_mode_and_contents(opt, b,
 				    &ci->ren2->src_entry->stages[ostage2],
 				    c2, path_side_2_desc,
 				    opt->branch1, opt->branch2,
-				    1 + opt->call_depth * 2, &mfi_c2))
+				    1 + opt->priv->call_depth * 2, &mfi_c2))
 		return -1;
 	free(path_side_1_desc);
 	free(path_side_2_desc);
@@ -1880,17 +1845,15 @@ static struct diff_queue_struct *get_diffpairs(struct merge_options *opt,
 	 */
 	if (opts.detect_rename > DIFF_DETECT_RENAME)
 		opts.detect_rename = DIFF_DETECT_RENAME;
-	opts.rename_limit = opt->merge_rename_limit >= 0 ? opt->merge_rename_limit :
-			    opt->diff_rename_limit >= 0 ? opt->diff_rename_limit :
-			    1000;
+	opts.rename_limit = (opt->rename_limit >= 0) ? opt->rename_limit : 1000;
 	opts.rename_score = opt->rename_score;
 	opts.show_rename_progress = opt->show_rename_progress;
 	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
 	diff_setup_done(&opts);
 	diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
 	diffcore_std(&opts);
-	if (opts.needed_rename_limit > opt->needed_rename_limit)
-		opt->needed_rename_limit = opts.needed_rename_limit;
+	if (opts.needed_rename_limit > opt->priv->needed_rename_limit)
+		opt->priv->needed_rename_limit = opts.needed_rename_limit;
 
 	ret = xmalloc(sizeof(*ret));
 	*ret = diff_queued_diff;
@@ -1930,6 +1893,16 @@ static char *apply_dir_rename(struct dir_rename_entry *entry,
 		return NULL;
 
 	oldlen = strlen(entry->dir);
+	if (entry->new_dir.len == 0)
+		/*
+		 * If someone renamed/merged a subdirectory into the root
+		 * directory (e.g. 'some/subdir' -> ''), then we want to
+		 * avoid returning
+		 *     '' + '/filename'
+		 * as the rename; we need to make old_path + oldlen advance
+		 * past the '/' character.
+		 */
+		oldlen++;
 	newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1;
 	strbuf_grow(&new_path, newlen);
 	strbuf_addbuf(&new_path, &entry->new_dir);
@@ -1942,8 +1915,8 @@ static void get_renamed_dir_portion(const char *old_path, const char *new_path,
 				    char **old_dir, char **new_dir)
 {
 	char *end_of_old, *end_of_new;
-	int old_len, new_len;
 
+	/* Default return values: NULL, meaning no rename */
 	*old_dir = NULL;
 	*new_dir = NULL;
 
@@ -1954,43 +1927,91 @@ static void get_renamed_dir_portion(const char *old_path, const char *new_path,
 	 *    "a/b/c/d" was renamed to "a/b/some/thing/else"
 	 * so, for this example, this function returns "a/b/c/d" in
 	 * *old_dir and "a/b/some/thing/else" in *new_dir.
-	 *
-	 * Also, if the basename of the file changed, we don't care.  We
-	 * want to know which portion of the directory, if any, changed.
+	 */
+
+	/*
+	 * If the basename of the file changed, we don't care.  We want
+	 * to know which portion of the directory, if any, changed.
 	 */
 	end_of_old = strrchr(old_path, '/');
 	end_of_new = strrchr(new_path, '/');
 
-	if (end_of_old == NULL || end_of_new == NULL)
+	/*
+	 * If end_of_old is NULL, old_path wasn't in a directory, so there
+	 * could not be a directory rename (our rule elsewhere that a
+	 * directory which still exists is not considered to have been
+	 * renamed means the root directory can never be renamed -- because
+	 * the root directory always exists).
+	 */
+	if (end_of_old == NULL)
+		return; /* Note: *old_dir and *new_dir are still NULL */
+
+	/*
+	 * If new_path contains no directory (end_of_new is NULL), then we
+	 * have a rename of old_path's directory to the root directory.
+	 */
+	if (end_of_new == NULL) {
+		*old_dir = xstrndup(old_path, end_of_old - old_path);
+		*new_dir = xstrdup("");
 		return;
+	}
+
+	/* Find the first non-matching character traversing backwards */
 	while (*--end_of_new == *--end_of_old &&
 	       end_of_old != old_path &&
 	       end_of_new != new_path)
 		; /* Do nothing; all in the while loop */
+
 	/*
-	 * We've found the first non-matching character in the directory
-	 * paths.  That means the current directory we were comparing
-	 * represents the rename.  Move end_of_old and end_of_new back
-	 * to the full directory name.
+	 * If both got back to the beginning of their strings, then the
+	 * directory didn't change at all, only the basename did.
 	 */
-	if (*end_of_old == '/')
-		end_of_old++;
-	if (*end_of_old != '/')
-		end_of_new++;
-	end_of_old = strchr(end_of_old, '/');
-	end_of_new = strchr(end_of_new, '/');
+	if (end_of_old == old_path && end_of_new == new_path &&
+	    *end_of_old == *end_of_new)
+		return; /* Note: *old_dir and *new_dir are still NULL */
 
 	/*
-	 * It may have been the case that old_path and new_path were the same
-	 * directory all along.  Don't claim a rename if they're the same.
+	 * If end_of_new got back to the beginning of its string, and
+	 * end_of_old got back to the beginning of some subdirectory, then
+	 * we have a rename/merge of a subdirectory into the root, which
+	 * needs slightly special handling.
+	 *
+	 * Note: There is no need to consider the opposite case, with a
+	 * rename/merge of the root directory into some subdirectory
+	 * because as noted above the root directory always exists so it
+	 * cannot be considered to be renamed.
 	 */
-	old_len = end_of_old - old_path;
-	new_len = end_of_new - new_path;
-
-	if (old_len != new_len || strncmp(old_path, new_path, old_len)) {
-		*old_dir = xstrndup(old_path, old_len);
-		*new_dir = xstrndup(new_path, new_len);
+	if (end_of_new == new_path &&
+	    end_of_old != old_path && end_of_old[-1] == '/') {
+		*old_dir = xstrndup(old_path, --end_of_old - old_path);
+		*new_dir = xstrdup("");
+		return;
 	}
+
+	/*
+	 * We've found the first non-matching character in the directory
+	 * paths.  That means the current characters we were looking at
+	 * were part of the first non-matching subdir name going back from
+	 * the end of the strings.  Get the whole name by advancing both
+	 * end_of_old and end_of_new to the NEXT '/' character.  That will
+	 * represent the entire directory rename.
+	 *
+	 * The reason for the increment is cases like
+	 *    a/b/star/foo/whatever.c -> a/b/tar/foo/random.c
+	 * After dropping the basename and going back to the first
+	 * non-matching character, we're now comparing:
+	 *    a/b/s          and         a/b/
+	 * and we want to be comparing:
+	 *    a/b/star/      and         a/b/tar/
+	 * but without the pre-increment, the one on the right would stay
+	 * a/b/.
+	 */
+	end_of_old = strchr(++end_of_old, '/');
+	end_of_new = strchr(++end_of_new, '/');
+
+	/* Copy the old and new directories into *old_dir and *new_dir. */
+	*old_dir = xstrndup(old_path, end_of_old - old_path);
+	*new_dir = xstrndup(new_path, end_of_new - new_path);
 }
 
 static void remove_hashmap_entries(struct hashmap *dir_renames,
@@ -2001,7 +2022,7 @@ static void remove_hashmap_entries(struct hashmap *dir_renames,
 
 	for (i = 0; i < items_to_remove->nr; i++) {
 		entry = items_to_remove->items[i].util;
-		hashmap_remove(dir_renames, entry, NULL);
+		hashmap_remove(dir_renames, &entry->ent, NULL);
 	}
 	string_list_clear(items_to_remove, 0);
 }
@@ -2124,8 +2145,8 @@ static void handle_directory_level_conflicts(struct merge_options *opt,
 	struct string_list remove_from_head = STRING_LIST_INIT_NODUP;
 	struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;
 
-	hashmap_iter_init(dir_re_head, &iter);
-	while ((head_ent = hashmap_iter_next(&iter))) {
+	hashmap_for_each_entry(dir_re_head, &iter, head_ent,
+				ent /* member name */) {
 		merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir);
 		if (merge_ent &&
 		    !head_ent->non_unique_new_dir &&
@@ -2149,8 +2170,8 @@ static void handle_directory_level_conflicts(struct merge_options *opt,
 	remove_hashmap_entries(dir_re_head, &remove_from_head);
 	remove_hashmap_entries(dir_re_merge, &remove_from_merge);
 
-	hashmap_iter_init(dir_re_merge, &iter);
-	while ((merge_ent = hashmap_iter_next(&iter))) {
+	hashmap_for_each_entry(dir_re_merge, &iter, merge_ent,
+				ent /* member name */) {
 		head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
 		if (tree_has_path(opt->repo, merge, merge_ent->dir)) {
 			/* 2. This wasn't a directory rename after all */
@@ -2229,7 +2250,7 @@ static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
 		if (!entry) {
 			entry = xmalloc(sizeof(*entry));
 			dir_rename_entry_init(entry, old_dir);
-			hashmap_put(dir_renames, entry);
+			hashmap_put(dir_renames, &entry->ent);
 		} else {
 			free(old_dir);
 		}
@@ -2254,8 +2275,8 @@ static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
 	 * we set non_unique_new_dir.  Once we've determined the winner (or
 	 * that there is no winner), we no longer need possible_new_dirs.
 	 */
-	hashmap_iter_init(dir_renames, &iter);
-	while ((entry = hashmap_iter_next(&iter))) {
+	hashmap_for_each_entry(dir_renames, &iter, entry,
+				ent /* member name */) {
 		int max = 0;
 		int bad_max = 0;
 		char *best = NULL;
@@ -2358,8 +2379,9 @@ static void compute_collisions(struct hashmap *collisions,
 		if (!collision_ent) {
 			collision_ent = xcalloc(1,
 						sizeof(struct collision_entry));
-			hashmap_entry_init(collision_ent, strhash(new_path));
-			hashmap_put(collisions, collision_ent);
+			hashmap_entry_init(&collision_ent->ent,
+						strhash(new_path));
+			hashmap_put(collisions, &collision_ent->ent);
 			collision_ent->target_file = new_path;
 		} else {
 			free(new_path);
@@ -2612,12 +2634,12 @@ static struct string_list *get_renames(struct merge_options *opt,
 							     entries);
 	}
 
-	hashmap_iter_init(&collisions, &iter);
-	while ((e = hashmap_iter_next(&iter))) {
+	hashmap_for_each_entry(&collisions, &iter, e,
+				ent /* member name */) {
 		free(e->target_file);
 		string_list_clear(&e->source_files, 0);
 	}
-	hashmap_free(&collisions, 1);
+	hashmap_free_entries(&collisions, struct collision_entry, ent);
 	return renames;
 }
 
@@ -2756,15 +2778,15 @@ static int process_renames(struct merge_options *opt,
 			dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
 			try_merge = 0;
 
-			if (oid_eq(&src_other.oid, &null_oid) &&
+			if (oideq(&src_other.oid, &null_oid) &&
 			    ren1->dir_rename_original_type == 'A') {
 				setup_rename_conflict_info(RENAME_VIA_DIR,
 							   opt, ren1, NULL);
-			} else if (oid_eq(&src_other.oid, &null_oid)) {
+			} else if (oideq(&src_other.oid, &null_oid)) {
 				setup_rename_conflict_info(RENAME_DELETE,
 							   opt, ren1, NULL);
 			} else if ((dst_other.mode == ren1->pair->two->mode) &&
-				   oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
+				   oideq(&dst_other.oid, &ren1->pair->two->oid)) {
 				/*
 				 * Added file on the other side identical to
 				 * the file being renamed: clean merge.
@@ -2779,7 +2801,7 @@ static int process_renames(struct merge_options *opt,
 						      1, /* update_cache */
 						      0  /* update_wd    */))
 					clean_merge = -1;
-			} else if (!oid_eq(&dst_other.oid, &null_oid)) {
+			} else if (!oideq(&dst_other.oid, &null_oid)) {
 				/*
 				 * Probably not a clean merge, but it's
 				 * premature to set clean_merge to 0 here,
@@ -2830,13 +2852,13 @@ static void initial_cleanup_rename(struct diff_queue_struct *pairs,
 	struct hashmap_iter iter;
 	struct dir_rename_entry *e;
 
-	hashmap_iter_init(dir_renames, &iter);
-	while ((e = hashmap_iter_next(&iter))) {
+	hashmap_for_each_entry(dir_renames, &iter, e,
+				ent /* member name */) {
 		free(e->dir);
 		strbuf_release(&e->new_dir);
 		/* possible_new_dirs already cleared in get_directory_renames */
 	}
-	hashmap_free(dir_renames, 1);
+	hashmap_free_entries(dir_renames, struct dir_rename_entry, ent);
 	free(dir_renames);
 
 	free(pairs->queue);
@@ -2863,8 +2885,9 @@ static int detect_and_process_renames(struct merge_options *opt,
 	head_pairs = get_diffpairs(opt, common, head);
 	merge_pairs = get_diffpairs(opt, common, merge);
 
-	if ((opt->detect_directory_renames == 2) ||
-	    (opt->detect_directory_renames == 1 && !opt->call_depth)) {
+	if ((opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE) ||
+	    (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT &&
+	     !opt->priv->call_depth)) {
 		dir_re_head = get_directory_renames(head_pairs);
 		dir_re_merge = get_directory_renames(merge_pairs);
 
@@ -2956,7 +2979,7 @@ static int blob_unchanged(struct merge_options *opt,
 
 	if (a->mode != o->mode)
 		return 0;
-	if (oid_eq(&o->oid, &a->oid))
+	if (oideq(&o->oid, &a->oid))
 		return 1;
 	if (!renormalize)
 		return 0;
@@ -3021,13 +3044,13 @@ static int handle_content_merge(struct merge_file_info *mfi,
 		reason = _("add/add");
 
 	assert(o->path && a->path && b->path);
-	if (ci && dir_in_way(opt->repo->index, path, !opt->call_depth,
+	if (ci && dir_in_way(opt->repo->index, path, !opt->priv->call_depth,
 			     S_ISGITLINK(ci->ren1->pair->two->mode)))
 		df_conflict_remains = 1;
 
 	if (merge_mode_and_contents(opt, o, a, b, path,
 				    opt->branch1, opt->branch2,
-				    opt->call_depth * 2, mfi))
+				    opt->priv->call_depth * 2, mfi))
 		return -1;
 
 	/*
@@ -3043,7 +3066,7 @@ static int handle_content_merge(struct merge_file_info *mfi,
 
 		output(opt, 3, _("Skipped %s (merged same as existing)"), path);
 		if (add_cacheinfo(opt, &mfi->blob, path,
-				  0, (!opt->call_depth && !is_dirty), 0))
+				  0, (!opt->priv->call_depth && !is_dirty), 0))
 			return -1;
 		/*
 		 * However, add_cacheinfo() will delete the old cache entry
@@ -3051,8 +3074,8 @@ static int handle_content_merge(struct merge_file_info *mfi,
 		 * flag to avoid making the file appear as if it were
 		 * deleted by the user.
 		 */
-		pos = index_name_pos(&opt->orig_index, path, strlen(path));
-		ce = opt->orig_index.cache[pos];
+		pos = index_name_pos(&opt->priv->orig_index, path, strlen(path));
+		ce = opt->priv->orig_index.cache[pos];
 		if (ce_skip_worktree(ce)) {
 			pos = index_name_pos(opt->repo->index, path, strlen(path));
 			ce = opt->repo->index->cache[pos];
@@ -3073,7 +3096,7 @@ static int handle_content_merge(struct merge_file_info *mfi,
 
 	if (df_conflict_remains || is_dirty) {
 		char *new_path;
-		if (opt->call_depth) {
+		if (opt->priv->call_depth) {
 			remove_file_from_index(opt->repo->index, path);
 		} else {
 			if (!mfi->clean) {
@@ -3122,7 +3145,8 @@ static int handle_rename_normal(struct merge_options *opt,
 	clean = handle_content_merge(&mfi, opt, path, was_dirty(opt, path),
 				     o, a, b, ci);
 
-	if (clean && opt->detect_directory_renames == 1 &&
+	if (clean &&
+	    opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT &&
 	    ren->dir_rename_original_dest) {
 		if (update_stages(opt, path,
 				  NULL,
@@ -3167,12 +3191,12 @@ static int warn_about_dir_renamed_entries(struct merge_options *opt,
 		return clean;
 
 	/* Sanity checks */
-	assert(opt->detect_directory_renames > 0);
+	assert(opt->detect_directory_renames > MERGE_DIRECTORY_RENAMES_NONE);
 	assert(ren->dir_rename_original_type == 'A' ||
 	       ren->dir_rename_original_type == 'R');
 
 	/* Check whether to treat directory renames as a conflict */
-	clean = (opt->detect_directory_renames == 2);
+	clean = (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE);
 
 	is_add = (ren->dir_rename_original_type == 'A');
 	if (ren->dir_rename_original_type == 'A' && clean) {
@@ -3331,7 +3355,7 @@ static int process_entry(struct merge_options *opt,
 			conf = _("directory/file");
 		}
 		if (dir_in_way(opt->repo->index, path,
-			       !opt->call_depth && !S_ISGITLINK(a->mode),
+			       !opt->priv->call_depth && !S_ISGITLINK(a->mode),
 			       0)) {
 			char *new_path = unique_path(opt, path, add_branch);
 			clean_merge = 0;
@@ -3340,7 +3364,7 @@ static int process_entry(struct merge_options *opt,
 			       conf, path, other_branch, path, new_path);
 			if (update_file(opt, 0, contents, new_path))
 				clean_merge = -1;
-			else if (opt->call_depth)
+			else if (opt->priv->call_depth)
 				remove_file_from_index(opt->repo->index, path);
 			free(new_path);
 		} else {
@@ -3380,37 +3404,32 @@ static int process_entry(struct merge_options *opt,
 	return clean_merge;
 }
 
-int merge_trees(struct merge_options *opt,
-		struct tree *head,
-		struct tree *merge,
-		struct tree *common,
-		struct tree **result)
+static int merge_trees_internal(struct merge_options *opt,
+				struct tree *head,
+				struct tree *merge,
+				struct tree *merge_base,
+				struct tree **result)
 {
 	struct index_state *istate = opt->repo->index;
 	int code, clean;
-	struct strbuf sb = STRBUF_INIT;
-
-	if (!opt->call_depth && repo_index_has_changes(opt->repo, head, &sb)) {
-		err(opt, _("Your local changes to the following files would be overwritten by merge:\n  %s"),
-		    sb.buf);
-		return -1;
-	}
 
 	if (opt->subtree_shift) {
-		merge = shift_tree_object(opt->repo, head, merge, opt->subtree_shift);
-		common = shift_tree_object(opt->repo, head, common, opt->subtree_shift);
+		merge = shift_tree_object(opt->repo, head, merge,
+					  opt->subtree_shift);
+		merge_base = shift_tree_object(opt->repo, head, merge_base,
+					       opt->subtree_shift);
 	}
 
-	if (oid_eq(&common->object.oid, &merge->object.oid)) {
+	if (oideq(&merge_base->object.oid, &merge->object.oid)) {
 		output(opt, 0, _("Already up to date!"));
 		*result = head;
 		return 1;
 	}
 
-	code = unpack_trees_start(opt, common, head, merge);
+	code = unpack_trees_start(opt, merge_base, head, merge);
 
 	if (code != 0) {
-		if (show(opt, 4) || opt->call_depth)
+		if (show(opt, 4) || opt->priv->call_depth)
 			err(opt, _("merging of trees %s and %s failed"),
 			    oid_to_hex(&head->object.oid),
 			    oid_to_hex(&merge->object.oid));
@@ -3429,12 +3448,13 @@ int merge_trees(struct merge_options *opt,
 		 * opposed to decaring a local hashmap is for convenience
 		 * so that we don't have to pass it to around.
 		 */
-		hashmap_init(&opt->current_file_dir_set, path_hashmap_cmp, NULL, 512);
+		hashmap_init(&opt->priv->current_file_dir_set, path_hashmap_cmp,
+			     NULL, 512);
 		get_files_dirs(opt, head);
 		get_files_dirs(opt, merge);
 
 		entries = get_unmerged(opt->repo->index);
-		clean = detect_and_process_renames(opt, common, head, merge,
+		clean = detect_and_process_renames(opt, merge_base, head, merge,
 						   entries, &re_info);
 		record_df_conflict_files(opt, entries);
 		if (clean < 0)
@@ -3465,7 +3485,8 @@ int merge_trees(struct merge_options *opt,
 		string_list_clear(entries, 1);
 		free(entries);
 
-		hashmap_free(&opt->current_file_dir_set, 1);
+		hashmap_free_entries(&opt->priv->current_file_dir_set,
+					struct path_hashmap_entry, e);
 
 		if (clean < 0) {
 			unpack_trees_finish(opt);
@@ -3477,7 +3498,8 @@ int merge_trees(struct merge_options *opt,
 
 	unpack_trees_finish(opt);
 
-	if (opt->call_depth && !(*result = write_tree_from_memory(opt)))
+	if (opt->priv->call_depth &&
+	    !(*result = write_in_core_index_as_tree(opt->repo)))
 		return -1;
 
 	return clean;
@@ -3498,16 +3520,18 @@ static struct commit_list *reverse_commit_list(struct commit_list *list)
  * Merge the commits h1 and h2, return the resulting virtual
  * commit object and a flag indicating the cleanness of the merge.
  */
-int merge_recursive(struct merge_options *opt,
-		    struct commit *h1,
-		    struct commit *h2,
-		    struct commit_list *ca,
-		    struct commit **result)
+static int merge_recursive_internal(struct merge_options *opt,
+				    struct commit *h1,
+				    struct commit *h2,
+				    struct commit_list *merge_bases,
+				    struct commit **result)
 {
 	struct commit_list *iter;
-	struct commit *merged_common_ancestors;
-	struct tree *mrtree;
+	struct commit *merged_merge_bases;
+	struct tree *result_tree;
 	int clean;
+	const char *ancestor_name;
+	struct strbuf merge_base_abbrev = STRBUF_INIT;
 
 	if (show(opt, 4)) {
 		output(opt, 4, _("Merging:"));
@@ -3515,32 +3539,43 @@ int merge_recursive(struct merge_options *opt,
 		output_commit_title(opt, h2);
 	}
 
-	if (!ca) {
-		ca = get_merge_bases(h1, h2);
-		ca = reverse_commit_list(ca);
+	if (!merge_bases) {
+		merge_bases = get_merge_bases(h1, h2);
+		merge_bases = reverse_commit_list(merge_bases);
 	}
 
 	if (show(opt, 5)) {
-		unsigned cnt = commit_list_count(ca);
+		unsigned cnt = commit_list_count(merge_bases);
 
 		output(opt, 5, Q_("found %u common ancestor:",
 				"found %u common ancestors:", cnt), cnt);
-		for (iter = ca; iter; iter = iter->next)
+		for (iter = merge_bases; iter; iter = iter->next)
 			output_commit_title(opt, iter->item);
 	}
 
-	merged_common_ancestors = pop_commit(&ca);
-	if (merged_common_ancestors == NULL) {
+	merged_merge_bases = pop_commit(&merge_bases);
+	if (merged_merge_bases == NULL) {
 		/* if there is no common ancestor, use an empty tree */
 		struct tree *tree;
 
 		tree = lookup_tree(opt->repo, opt->repo->hash_algo->empty_tree);
-		merged_common_ancestors = make_virtual_commit(opt->repo, tree, "ancestor");
+		merged_merge_bases = make_virtual_commit(opt->repo, tree,
+							 "ancestor");
+		ancestor_name = "empty tree";
+	} else if (opt->ancestor && !opt->priv->call_depth) {
+		ancestor_name = opt->ancestor;
+	} else if (merge_bases) {
+		ancestor_name = "merged common ancestors";
+	} else {
+		strbuf_add_unique_abbrev(&merge_base_abbrev,
+					 &merged_merge_bases->object.oid,
+					 DEFAULT_ABBREV);
+		ancestor_name = merge_base_abbrev.buf;
 	}
 
-	for (iter = ca; iter; iter = iter->next) {
+	for (iter = merge_bases; iter; iter = iter->next) {
 		const char *saved_b1, *saved_b2;
-		opt->call_depth++;
+		opt->priv->call_depth++;
 		/*
 		 * When the merge fails, the result contains files
 		 * with conflict markers. The cleanness flag is
@@ -3554,45 +3589,134 @@ int merge_recursive(struct merge_options *opt,
 		saved_b2 = opt->branch2;
 		opt->branch1 = "Temporary merge branch 1";
 		opt->branch2 = "Temporary merge branch 2";
-		if (merge_recursive(opt, merged_common_ancestors, iter->item,
-				    NULL, &merged_common_ancestors) < 0)
+		if (merge_recursive_internal(opt, merged_merge_bases, iter->item,
+					     NULL, &merged_merge_bases) < 0)
 			return -1;
 		opt->branch1 = saved_b1;
 		opt->branch2 = saved_b2;
-		opt->call_depth--;
+		opt->priv->call_depth--;
 
-		if (!merged_common_ancestors)
+		if (!merged_merge_bases)
 			return err(opt, _("merge returned no commit"));
 	}
 
 	discard_index(opt->repo->index);
-	if (!opt->call_depth)
+	if (!opt->priv->call_depth)
 		repo_read_index(opt->repo);
 
-	opt->ancestor = "merged common ancestors";
-	clean = merge_trees(opt, get_commit_tree(h1), get_commit_tree(h2),
-			    get_commit_tree(merged_common_ancestors),
-			    &mrtree);
+	opt->ancestor = ancestor_name;
+	clean = merge_trees_internal(opt,
+				     repo_get_commit_tree(opt->repo, h1),
+				     repo_get_commit_tree(opt->repo, h2),
+				     repo_get_commit_tree(opt->repo,
+							  merged_merge_bases),
+				     &result_tree);
+	strbuf_release(&merge_base_abbrev);
+	opt->ancestor = NULL;  /* avoid accidental re-use of opt->ancestor */
 	if (clean < 0) {
 		flush_output(opt);
 		return clean;
 	}
 
-	if (opt->call_depth) {
-		*result = make_virtual_commit(opt->repo, mrtree, "merged tree");
+	if (opt->priv->call_depth) {
+		*result = make_virtual_commit(opt->repo, result_tree,
+					      "merged tree");
 		commit_list_insert(h1, &(*result)->parents);
 		commit_list_insert(h2, &(*result)->parents->next);
 	}
+	return clean;
+}
+
+static int merge_start(struct merge_options *opt, struct tree *head)
+{
+	struct strbuf sb = STRBUF_INIT;
+
+	/* Sanity checks on opt */
+	assert(opt->repo);
+
+	assert(opt->branch1 && opt->branch2);
+
+	assert(opt->detect_renames >= -1 &&
+	       opt->detect_renames <= DIFF_DETECT_COPY);
+	assert(opt->detect_directory_renames >= MERGE_DIRECTORY_RENAMES_NONE &&
+	       opt->detect_directory_renames <= MERGE_DIRECTORY_RENAMES_TRUE);
+	assert(opt->rename_limit >= -1);
+	assert(opt->rename_score >= 0 && opt->rename_score <= MAX_SCORE);
+	assert(opt->show_rename_progress >= 0 && opt->show_rename_progress <= 1);
+
+	assert(opt->xdl_opts >= 0);
+	assert(opt->recursive_variant >= MERGE_VARIANT_NORMAL &&
+	       opt->recursive_variant <= MERGE_VARIANT_THEIRS);
+
+	assert(opt->verbosity >= 0 && opt->verbosity <= 5);
+	assert(opt->buffer_output <= 2);
+	assert(opt->obuf.len == 0);
+
+	assert(opt->priv == NULL);
+
+	/* Sanity check on repo state; index must match head */
+	if (repo_index_has_changes(opt->repo, head, &sb)) {
+		err(opt, _("Your local changes to the following files would be overwritten by merge:\n  %s"),
+		    sb.buf);
+		strbuf_release(&sb);
+		return -1;
+	}
+
+	opt->priv = xcalloc(1, sizeof(*opt->priv));
+	string_list_init(&opt->priv->df_conflict_file_set, 1);
+	return 0;
+}
+
+static void merge_finalize(struct merge_options *opt)
+{
 	flush_output(opt);
-	if (!opt->call_depth && opt->buffer_output < 2)
+	if (!opt->priv->call_depth && opt->buffer_output < 2)
 		strbuf_release(&opt->obuf);
 	if (show(opt, 2))
 		diff_warn_rename_limit("merge.renamelimit",
-				       opt->needed_rename_limit, 0);
+				       opt->priv->needed_rename_limit, 0);
+	FREE_AND_NULL(opt->priv);
+}
+
+int merge_trees(struct merge_options *opt,
+		struct tree *head,
+		struct tree *merge,
+		struct tree *merge_base)
+{
+	int clean;
+	struct tree *ignored;
+
+	assert(opt->ancestor != NULL);
+
+	if (merge_start(opt, head))
+		return -1;
+	clean = merge_trees_internal(opt, head, merge, merge_base, &ignored);
+	merge_finalize(opt);
+
 	return clean;
 }
 
-static struct commit *get_ref(struct repository *repo, const struct object_id *oid,
+int merge_recursive(struct merge_options *opt,
+		    struct commit *h1,
+		    struct commit *h2,
+		    struct commit_list *merge_bases,
+		    struct commit **result)
+{
+	int clean;
+
+	assert(opt->ancestor == NULL ||
+	       !strcmp(opt->ancestor, "constructed merge base"));
+
+	if (merge_start(opt, repo_get_commit_tree(opt->repo, h1)))
+		return -1;
+	clean = merge_recursive_internal(opt, h1, h2, merge_bases, result);
+	merge_finalize(opt);
+
+	return clean;
+}
+
+static struct commit *get_ref(struct repository *repo,
+			      const struct object_id *oid,
 			      const char *name)
 {
 	struct object *object;
@@ -3613,8 +3737,8 @@ static struct commit *get_ref(struct repository *repo, const struct object_id *o
 int merge_recursive_generic(struct merge_options *opt,
 			    const struct object_id *head,
 			    const struct object_id *merge,
-			    int num_base_list,
-			    const struct object_id **base_list,
+			    int num_merge_bases,
+			    const struct object_id **merge_bases,
 			    struct commit **result)
 {
 	int clean;
@@ -3623,15 +3747,18 @@ int merge_recursive_generic(struct merge_options *opt,
 	struct commit *next_commit = get_ref(opt->repo, merge, opt->branch2);
 	struct commit_list *ca = NULL;
 
-	if (base_list) {
+	if (merge_bases) {
 		int i;
-		for (i = 0; i < num_base_list; ++i) {
+		for (i = 0; i < num_merge_bases; ++i) {
 			struct commit *base;
-			if (!(base = get_ref(opt->repo, base_list[i], oid_to_hex(base_list[i]))))
+			if (!(base = get_ref(opt->repo, merge_bases[i],
+					     oid_to_hex(merge_bases[i]))))
 				return err(opt, _("Could not parse object '%s'"),
-					   oid_to_hex(base_list[i]));
+					   oid_to_hex(merge_bases[i]));
 			commit_list_insert(base, &ca);
 		}
+		if (num_merge_bases == 1)
+			opt->ancestor = "constructed merge base";
 	}
 
 	repo_hold_locked_index(opt->repo, &lock, LOCK_DIE_ON_ERROR);
@@ -3653,22 +3780,25 @@ static void merge_recursive_config(struct merge_options *opt)
 {
 	char *value = NULL;
 	git_config_get_int("merge.verbosity", &opt->verbosity);
-	git_config_get_int("diff.renamelimit", &opt->diff_rename_limit);
-	git_config_get_int("merge.renamelimit", &opt->merge_rename_limit);
+	git_config_get_int("diff.renamelimit", &opt->rename_limit);
+	git_config_get_int("merge.renamelimit", &opt->rename_limit);
 	if (!git_config_get_string("diff.renames", &value)) {
-		opt->diff_detect_rename = git_config_rename("diff.renames", value);
+		opt->detect_renames = git_config_rename("diff.renames", value);
 		free(value);
 	}
 	if (!git_config_get_string("merge.renames", &value)) {
-		opt->merge_detect_rename = git_config_rename("merge.renames", value);
+		opt->detect_renames = git_config_rename("merge.renames", value);
 		free(value);
 	}
 	if (!git_config_get_string("merge.directoryrenames", &value)) {
 		int boolval = git_parse_maybe_bool(value);
 		if (0 <= boolval) {
-			opt->detect_directory_renames = boolval ? 2 : 0;
+			opt->detect_directory_renames = boolval ?
+				MERGE_DIRECTORY_RENAMES_TRUE :
+				MERGE_DIRECTORY_RENAMES_NONE;
 		} else if (!strcasecmp(value, "conflict")) {
-			opt->detect_directory_renames = 1;
+			opt->detect_directory_renames =
+				MERGE_DIRECTORY_RENAMES_CONFLICT;
 		} /* avoid erroring on values from future versions of git */
 		free(value);
 	}
@@ -3680,23 +3810,25 @@ void init_merge_options(struct merge_options *opt,
 {
 	const char *merge_verbosity;
 	memset(opt, 0, sizeof(struct merge_options));
+
 	opt->repo = repo;
+
+	opt->detect_renames = -1;
+	opt->detect_directory_renames = MERGE_DIRECTORY_RENAMES_CONFLICT;
+	opt->rename_limit = -1;
+
 	opt->verbosity = 2;
 	opt->buffer_output = 1;
-	opt->diff_rename_limit = -1;
-	opt->merge_rename_limit = -1;
+	strbuf_init(&opt->obuf, 0);
+
 	opt->renormalize = 0;
-	opt->diff_detect_rename = -1;
-	opt->merge_detect_rename = -1;
-	opt->detect_directory_renames = 1;
+
 	merge_recursive_config(opt);
 	merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
 	if (merge_verbosity)
 		opt->verbosity = strtol(merge_verbosity, NULL, 10);
 	if (opt->verbosity >= 5)
 		opt->buffer_output = 0;
-	strbuf_init(&opt->obuf, 0);
-	string_list_init(&opt->df_conflict_file_set, 1);
 }
 
 int parse_merge_opt(struct merge_options *opt, const char *s)
@@ -3706,9 +3838,9 @@ int parse_merge_opt(struct merge_options *opt, const char *s)
 	if (!s || !*s)
 		return -1;
 	if (!strcmp(s, "ours"))
-		opt->recursive_variant = MERGE_RECURSIVE_OURS;
+		opt->recursive_variant = MERGE_VARIANT_OURS;
 	else if (!strcmp(s, "theirs"))
-		opt->recursive_variant = MERGE_RECURSIVE_THEIRS;
+		opt->recursive_variant = MERGE_VARIANT_THEIRS;
 	else if (!strcmp(s, "subtree"))
 		opt->subtree_shift = "";
 	else if (skip_prefix(s, "subtree=", &arg))
@@ -3739,16 +3871,16 @@ int parse_merge_opt(struct merge_options *opt, const char *s)
 	else if (!strcmp(s, "no-renormalize"))
 		opt->renormalize = 0;
 	else if (!strcmp(s, "no-renames"))
-		opt->merge_detect_rename = 0;
+		opt->detect_renames = 0;
 	else if (!strcmp(s, "find-renames")) {
-		opt->merge_detect_rename = 1;
+		opt->detect_renames = 1;
 		opt->rename_score = 0;
 	}
 	else if (skip_prefix(s, "find-renames=", &arg) ||
 		 skip_prefix(s, "rename-threshold=", &arg)) {
 		if ((opt->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
 			return -1;
-		opt->merge_detect_rename = 1;
+		opt->detect_renames = 1;
 	}
 	/*
 	 * Please update $__git_merge_strategy_options in
diff --git a/third_party/git/merge-recursive.h b/third_party/git/merge-recursive.h
index c2b7bb65c62f..978847e67248 100644
--- a/third_party/git/merge-recursive.h
+++ b/third_party/git/merge-recursive.h
@@ -1,104 +1,124 @@
 #ifndef MERGE_RECURSIVE_H
 #define MERGE_RECURSIVE_H
 
-#include "string-list.h"
-#include "unpack-trees.h"
+#include "strbuf.h"
 
 struct commit;
-
+struct commit_list;
+struct object_id;
 struct repository;
+struct tree;
 
+struct merge_options_internal;
 struct merge_options {
+	struct repository *repo;
+
+	/* ref names used in console messages and conflict markers */
 	const char *ancestor;
 	const char *branch1;
 	const char *branch2;
+
+	/* rename related options */
+	int detect_renames;
 	enum {
-		MERGE_RECURSIVE_NORMAL = 0,
-		MERGE_RECURSIVE_OURS,
-		MERGE_RECURSIVE_THEIRS
+		MERGE_DIRECTORY_RENAMES_NONE = 0,
+		MERGE_DIRECTORY_RENAMES_CONFLICT = 1,
+		MERGE_DIRECTORY_RENAMES_TRUE = 2
+	} detect_directory_renames;
+	int rename_limit;
+	int rename_score;
+	int show_rename_progress;
+
+	/* xdiff-related options (patience, ignore whitespace, ours/theirs) */
+	long xdl_opts;
+	enum {
+		MERGE_VARIANT_NORMAL = 0,
+		MERGE_VARIANT_OURS,
+		MERGE_VARIANT_THEIRS
 	} recursive_variant;
-	const char *subtree_shift;
+
+	/* console output related options */
+	int verbosity;
 	unsigned buffer_output; /* 1: output at end, 2: keep buffered */
+	struct strbuf obuf;     /* output buffer; if buffer_output == 2, caller
+				 * must handle and call strbuf_release */
+
+	/* miscellaneous control options */
+	const char *subtree_shift;
 	unsigned renormalize : 1;
-	long xdl_opts;
-	int verbosity;
-	int detect_directory_renames;
-	int diff_detect_rename;
-	int merge_detect_rename;
-	int diff_rename_limit;
-	int merge_rename_limit;
-	int rename_score;
-	int needed_rename_limit;
-	int show_rename_progress;
-	int call_depth;
-	struct strbuf obuf;
-	struct hashmap current_file_dir_set;
-	struct string_list df_conflict_file_set;
-	struct unpack_trees_options unpack_opts;
-	struct index_state orig_index;
-	struct repository *repo;
+
+	/* internal fields used by the implementation */
+	struct merge_options_internal *priv;
 };
 
+void init_merge_options(struct merge_options *opt, struct repository *repo);
+
+/* parse the option in s and update the relevant field of opt */
+int parse_merge_opt(struct merge_options *opt, const char *s);
+
 /*
- * For dir_rename_entry, directory names are stored as a full path from the
- * toplevel of the repository and do not include a trailing '/'.  Also:
- *
- *   dir:                original name of directory being renamed
- *   non_unique_new_dir: if true, could not determine new_dir
- *   new_dir:            final name of directory being renamed
- *   possible_new_dirs:  temporary used to help determine new_dir; see comments
- *                       in get_directory_renames() for details
+ * RETURN VALUES: All the merge_* functions below return a value as follows:
+ *   > 0     Merge was clean
+ *   = 0     Merge had conflicts
+ *   < 0     Merge hit an unexpected and unrecoverable problem (e.g. disk
+ *             full) and aborted merge part-way through.
  */
-struct dir_rename_entry {
-	struct hashmap_entry ent; /* must be the first member! */
-	char *dir;
-	unsigned non_unique_new_dir:1;
-	struct strbuf new_dir;
-	struct string_list possible_new_dirs;
-};
-
-struct collision_entry {
-	struct hashmap_entry ent; /* must be the first member! */
-	char *target_file;
-	struct string_list source_files;
-	unsigned reported_already:1;
-};
 
-static inline int merge_detect_rename(struct merge_options *o)
-{
-	return o->merge_detect_rename >= 0 ? o->merge_detect_rename :
-		o->diff_detect_rename >= 0 ? o->diff_detect_rename : 1;
-}
+/*
+ * rename-detecting three-way merge, no recursion.
+ *
+ * Outputs:
+ *   - See RETURN VALUES above
+ *   - No commit is created
+ *   - opt->repo->index has the new index
+ *   - $GIT_INDEX_FILE is not updated
+ *   - The working tree is updated with results of the merge
+ */
+int merge_trees(struct merge_options *opt,
+		struct tree *head,
+		struct tree *merge,
+		struct tree *merge_base);
 
-/* merge_trees() but with recursive ancestor consolidation */
-int merge_recursive(struct merge_options *o,
+/*
+ * merge_recursive is like merge_trees() but with recursive ancestor
+ * consolidation and, if the commit is clean, creation of a commit.
+ *
+ * NOTE: empirically, about a decade ago it was determined that with more
+ *       than two merge bases, optimal behavior was found when the
+ *       merge_bases were passed in the order of oldest commit to newest
+ *       commit.  Also, merge_bases will be consumed (emptied) so make a
+ *       copy if you need it.
+ *
+ * Outputs:
+ *   - See RETURN VALUES above
+ *   - If merge is clean, a commit is created and its address written to *result
+ *   - opt->repo->index has the new index
+ *   - $GIT_INDEX_FILE is not updated
+ *   - The working tree is updated with results of the merge
+ */
+int merge_recursive(struct merge_options *opt,
 		    struct commit *h1,
 		    struct commit *h2,
-		    struct commit_list *ancestors,
+		    struct commit_list *merge_bases,
 		    struct commit **result);
 
-/* rename-detecting three-way merge, no recursion */
-int merge_trees(struct merge_options *o,
-		struct tree *head,
-		struct tree *merge,
-		struct tree *common,
-		struct tree **result);
-
 /*
- * "git-merge-recursive" can be fed trees; wrap them into
- * virtual commits and call merge_recursive() proper.
+ * merge_recursive_generic can operate on trees instead of commits, by
+ * wrapping the trees into virtual commits, and calling merge_recursive().
+ * It also writes out the in-memory index to disk if the merge is successful.
+ *
+ * Outputs:
+ *   - See RETURN VALUES above
+ *   - If merge is clean, a commit is created and its address written to *result
+ *   - opt->repo->index has the new index
+ *   - $GIT_INDEX_FILE is updated
+ *   - The working tree is updated with results of the merge
  */
-int merge_recursive_generic(struct merge_options *o,
+int merge_recursive_generic(struct merge_options *opt,
 			    const struct object_id *head,
 			    const struct object_id *merge,
-			    int num_ca,
-			    const struct object_id **ca,
+			    int num_merge_bases,
+			    const struct object_id **merge_bases,
 			    struct commit **result);
 
-void init_merge_options(struct merge_options *o,
-			struct repository *repo);
-struct tree *write_tree_from_memory(struct merge_options *o);
-
-int parse_merge_opt(struct merge_options *out, const char *s);
-
 #endif
diff --git a/third_party/git/midx.c b/third_party/git/midx.c
index d6496444206a..1527e464a7b4 100644
--- a/third_party/git/midx.c
+++ b/third_party/git/midx.c
@@ -19,8 +19,7 @@
 #define MIDX_BYTE_NUM_PACKS 8
 #define MIDX_HASH_VERSION 1
 #define MIDX_HEADER_SIZE 12
-#define MIDX_HASH_LEN 20
-#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + MIDX_HASH_LEN)
+#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + the_hash_algo->rawsz)
 
 #define MIDX_MAX_CHUNKS 5
 #define MIDX_CHUNK_ALIGNMENT 4
@@ -93,7 +92,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
 	hash_version = m->data[MIDX_BYTE_HASH_VERSION];
 	if (hash_version != MIDX_HASH_VERSION)
 		die(_("hash version %u does not match"), hash_version);
-	m->hash_len = MIDX_HASH_LEN;
+	m->hash_len = the_hash_algo->rawsz;
 
 	m->num_chunks = m->data[MIDX_BYTE_NUM_CHUNKS];
 
@@ -234,7 +233,7 @@ int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t
 int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result)
 {
 	return bsearch_hash(oid->hash, m->chunk_oid_fanout, m->chunk_oid_lookup,
-			    MIDX_HASH_LEN, result);
+			    the_hash_algo->rawsz, result);
 }
 
 struct object_id *nth_midxed_object_oid(struct object_id *oid,
@@ -449,6 +448,8 @@ struct pack_list {
 	uint32_t nr;
 	uint32_t alloc;
 	struct multi_pack_index *m;
+	struct progress *progress;
+	unsigned pack_paths_checked;
 };
 
 static void add_pack_to_midx(const char *full_path, size_t full_path_len,
@@ -457,6 +458,7 @@ static void add_pack_to_midx(const char *full_path, size_t full_path_len,
 	struct pack_list *packs = (struct pack_list *)data;
 
 	if (ends_with(file_name, ".idx")) {
+		display_progress(packs->progress, ++packs->pack_paths_checked);
 		if (packs->m && midx_contains_pack(packs->m, file_name))
 			return;
 
@@ -532,7 +534,7 @@ static void fill_pack_entry(uint32_t pack_int_id,
 			    uint32_t cur_object,
 			    struct pack_midx_entry *entry)
 {
-	if (!nth_packed_object_oid(&entry->oid, p, cur_object))
+	if (nth_packed_object_id(&entry->oid, p, cur_object) < 0)
 		die(_("failed to locate object %d in packfile"), cur_object);
 
 	entry->pack_int_id = pack_int_id;
@@ -786,7 +788,7 @@ static size_t write_midx_large_offsets(struct hashfile *f, uint32_t nr_large_off
 }
 
 static int write_midx_internal(const char *object_dir, struct multi_pack_index *m,
-			       struct string_list *packs_to_drop)
+			       struct string_list *packs_to_drop, unsigned flags)
 {
 	unsigned char cur_chunk, num_chunks = 0;
 	char *midx_name;
@@ -800,6 +802,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 	uint64_t chunk_offsets[MIDX_MAX_CHUNKS + 1];
 	uint32_t nr_entries, num_large_offsets = 0;
 	struct pack_midx_entry *entries = NULL;
+	struct progress *progress = NULL;
 	int large_offsets_needed = 0;
 	int pack_name_concat_len = 0;
 	int dropped_packs = 0;
@@ -834,7 +837,14 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 		}
 	}
 
+	packs.pack_paths_checked = 0;
+	if (flags & MIDX_PROGRESS)
+		packs.progress = start_progress(_("Adding packfiles to multi-pack-index"), 0);
+	else
+		packs.progress = NULL;
+
 	for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &packs);
+	stop_progress(&packs.progress);
 
 	if (packs.m && packs.nr == packs.m->num_packs && !packs_to_drop)
 		goto cleanup;
@@ -928,7 +938,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 
 	cur_chunk++;
 	chunk_ids[cur_chunk] = MIDX_CHUNKID_OBJECTOFFSETS;
-	chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_HASH_LEN;
+	chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * the_hash_algo->rawsz;
 
 	cur_chunk++;
 	chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_CHUNK_OFFSET_WIDTH;
@@ -959,6 +969,9 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 		written += MIDX_CHUNKLOOKUP_WIDTH;
 	}
 
+	if (flags & MIDX_PROGRESS)
+		progress = start_progress(_("Writing chunks to multi-pack-index"),
+					  num_chunks);
 	for (i = 0; i < num_chunks; i++) {
 		if (written != chunk_offsets[i])
 			BUG("incorrect chunk offset (%"PRIu64" != %"PRIu64") for chunk id %"PRIx32,
@@ -976,7 +989,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 				break;
 
 			case MIDX_CHUNKID_OIDLOOKUP:
-				written += write_midx_oid_lookup(f, MIDX_HASH_LEN, entries, nr_entries);
+				written += write_midx_oid_lookup(f, the_hash_algo->rawsz, entries, nr_entries);
 				break;
 
 			case MIDX_CHUNKID_OBJECTOFFSETS:
@@ -991,7 +1004,10 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 				BUG("trying to write unknown chunk id %"PRIx32,
 				    chunk_ids[i]);
 		}
+
+		display_progress(progress, i + 1);
 	}
+	stop_progress(&progress);
 
 	if (written != chunk_offsets[num_chunks])
 		BUG("incorrect final offset %"PRIu64" != %"PRIu64,
@@ -1017,9 +1033,9 @@ cleanup:
 	return result;
 }
 
-int write_midx_file(const char *object_dir)
+int write_midx_file(const char *object_dir, unsigned flags)
 {
-	return write_midx_internal(object_dir, NULL, NULL);
+	return write_midx_internal(object_dir, NULL, NULL, flags);
 }
 
 void clear_midx_file(struct repository *r)
@@ -1077,19 +1093,20 @@ static int compare_pair_pos_vs_id(const void *_a, const void *_b)
 			display_progress(progress, _n); \
 	} while (0)
 
-int verify_midx_file(struct repository *r, const char *object_dir)
+int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags)
 {
 	struct pair_pos_vs_id *pairs = NULL;
 	uint32_t i;
-	struct progress *progress;
+	struct progress *progress = NULL;
 	struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
 	verify_midx_error = 0;
 
 	if (!m)
 		return 0;
 
-	progress = start_progress(_("Looking for referenced packfiles"),
-				  m->num_packs);
+	if (flags & MIDX_PROGRESS)
+		progress = start_progress(_("Looking for referenced packfiles"),
+					  m->num_packs);
 	for (i = 0; i < m->num_packs; i++) {
 		if (prepare_midx_pack(r, m, i))
 			midx_report("failed to load pack in position %d", i);
@@ -1107,8 +1124,9 @@ int verify_midx_file(struct repository *r, const char *object_dir)
 				    i, oid_fanout1, oid_fanout2, i + 1);
 	}
 
-	progress = start_sparse_progress(_("Verifying OID order in MIDX"),
-					 m->num_objects - 1);
+	if (flags & MIDX_PROGRESS)
+		progress = start_sparse_progress(_("Verifying OID order in multi-pack-index"),
+						 m->num_objects - 1);
 	for (i = 0; i < m->num_objects - 1; i++) {
 		struct object_id oid1, oid2;
 
@@ -1135,13 +1153,15 @@ int verify_midx_file(struct repository *r, const char *object_dir)
 		pairs[i].pack_int_id = nth_midxed_pack_int_id(m, i);
 	}
 
-	progress = start_sparse_progress(_("Sorting objects by packfile"),
-					 m->num_objects);
+	if (flags & MIDX_PROGRESS)
+		progress = start_sparse_progress(_("Sorting objects by packfile"),
+						 m->num_objects);
 	display_progress(progress, 0); /* TODO: Measure QSORT() progress */
 	QSORT(pairs, m->num_objects, compare_pair_pos_vs_id);
 	stop_progress(&progress);
 
-	progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects);
+	if (flags & MIDX_PROGRESS)
+		progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects);
 	for (i = 0; i < m->num_objects; i++) {
 		struct object_id oid;
 		struct pack_entry e;
@@ -1184,23 +1204,34 @@ int verify_midx_file(struct repository *r, const char *object_dir)
 	return verify_midx_error;
 }
 
-int expire_midx_packs(struct repository *r, const char *object_dir)
+int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags)
 {
 	uint32_t i, *count, result = 0;
 	struct string_list packs_to_drop = STRING_LIST_INIT_DUP;
 	struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+	struct progress *progress = NULL;
 
 	if (!m)
 		return 0;
 
 	count = xcalloc(m->num_packs, sizeof(uint32_t));
+
+	if (flags & MIDX_PROGRESS)
+		progress = start_progress(_("Counting referenced objects"),
+					  m->num_objects);
 	for (i = 0; i < m->num_objects; i++) {
 		int pack_int_id = nth_midxed_pack_int_id(m, i);
 		count[pack_int_id]++;
+		display_progress(progress, i + 1);
 	}
+	stop_progress(&progress);
 
+	if (flags & MIDX_PROGRESS)
+		progress = start_progress(_("Finding and deleting unreferenced packfiles"),
+					  m->num_packs);
 	for (i = 0; i < m->num_packs; i++) {
 		char *pack_name;
+		display_progress(progress, i + 1);
 
 		if (count[i])
 			continue;
@@ -1218,11 +1249,12 @@ int expire_midx_packs(struct repository *r, const char *object_dir)
 		unlink_pack_path(pack_name, 0);
 		free(pack_name);
 	}
+	stop_progress(&progress);
 
 	free(count);
 
 	if (packs_to_drop.nr)
-		result = write_midx_internal(object_dir, m, &packs_to_drop);
+		result = write_midx_internal(object_dir, m, &packs_to_drop, flags);
 
 	string_list_clear(&packs_to_drop, 0);
 	return result;
@@ -1316,7 +1348,7 @@ static int fill_included_packs_batch(struct repository *r,
 	return 0;
 }
 
-int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags)
 {
 	int result = 0;
 	uint32_t i;
@@ -1341,6 +1373,12 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
 	strbuf_addstr(&base_name, object_dir);
 	strbuf_addstr(&base_name, "/pack/pack");
 	argv_array_push(&cmd.args, base_name.buf);
+
+	if (flags & MIDX_PROGRESS)
+		argv_array_push(&cmd.args, "--progress");
+	else
+		argv_array_push(&cmd.args, "-q");
+
 	strbuf_release(&base_name);
 
 	cmd.git_cmd = 1;
@@ -1371,7 +1409,7 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
 		goto cleanup;
 	}
 
-	result = write_midx_internal(object_dir, m, NULL);
+	result = write_midx_internal(object_dir, m, NULL, flags);
 	m = NULL;
 
 cleanup:
diff --git a/third_party/git/midx.h b/third_party/git/midx.h
index f0ae656b5d76..e6fa356b5caa 100644
--- a/third_party/git/midx.h
+++ b/third_party/git/midx.h
@@ -37,6 +37,8 @@ struct multi_pack_index {
 	char object_dir[FLEX_ARRAY];
 };
 
+#define MIDX_PROGRESS     (1 << 0)
+
 struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local);
 int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id);
 int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result);
@@ -47,11 +49,11 @@ int fill_midx_entry(struct repository *r, const struct object_id *oid, struct pa
 int midx_contains_pack(struct multi_pack_index *m, const char *idx_or_pack_name);
 int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local);
 
-int write_midx_file(const char *object_dir);
+int write_midx_file(const char *object_dir, unsigned flags);
 void clear_midx_file(struct repository *r);
-int verify_midx_file(struct repository *r, const char *object_dir);
-int expire_midx_packs(struct repository *r, const char *object_dir);
-int midx_repack(struct repository *r, const char *object_dir, size_t batch_size);
+int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags);
+int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags);
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags);
 
 void close_midx(struct multi_pack_index *m);
 
diff --git a/third_party/git/name-hash.c b/third_party/git/name-hash.c
index 695908609f40..fb526a3775f6 100644
--- a/third_party/git/name-hash.c
+++ b/third_party/git/name-hash.c
@@ -17,14 +17,16 @@ struct dir_entry {
 };
 
 static int dir_entry_cmp(const void *unused_cmp_data,
-			 const void *entry,
-			 const void *entry_or_key,
+			 const struct hashmap_entry *eptr,
+			 const struct hashmap_entry *entry_or_key,
 			 const void *keydata)
 {
-	const struct dir_entry *e1 = entry;
-	const struct dir_entry *e2 = entry_or_key;
+	const struct dir_entry *e1, *e2;
 	const char *name = keydata;
 
+	e1 = container_of(eptr, const struct dir_entry, ent);
+	e2 = container_of(entry_or_key, const struct dir_entry, ent);
+
 	return e1->namelen != e2->namelen || strncasecmp(e1->name,
 			name ? name : e2->name, e1->namelen);
 }
@@ -33,9 +35,9 @@ static struct dir_entry *find_dir_entry__hash(struct index_state *istate,
 		const char *name, unsigned int namelen, unsigned int hash)
 {
 	struct dir_entry key;
-	hashmap_entry_init(&key, hash);
+	hashmap_entry_init(&key.ent, hash);
 	key.namelen = namelen;
-	return hashmap_get(&istate->dir_hash, &key, name);
+	return hashmap_get_entry(&istate->dir_hash, &key, ent, name);
 }
 
 static struct dir_entry *find_dir_entry(struct index_state *istate,
@@ -68,9 +70,9 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate,
 	if (!dir) {
 		/* not found, create it and add to hash table */
 		FLEX_ALLOC_MEM(dir, name, ce->name, namelen);
-		hashmap_entry_init(dir, memihash(ce->name, namelen));
+		hashmap_entry_init(&dir->ent, memihash(ce->name, namelen));
 		dir->namelen = namelen;
-		hashmap_add(&istate->dir_hash, dir);
+		hashmap_add(&istate->dir_hash, &dir->ent);
 
 		/* recursively add missing parent directories */
 		dir->parent = hash_dir_entry(istate, ce, namelen);
@@ -95,7 +97,7 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
 	struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
 	while (dir && !(--dir->nr)) {
 		struct dir_entry *parent = dir->parent;
-		hashmap_remove(&istate->dir_hash, dir, NULL);
+		hashmap_remove(&istate->dir_hash, &dir->ent, NULL);
 		free(dir);
 		dir = parent;
 	}
@@ -106,20 +108,23 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
 	if (ce->ce_flags & CE_HASHED)
 		return;
 	ce->ce_flags |= CE_HASHED;
-	hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce)));
-	hashmap_add(&istate->name_hash, ce);
+	hashmap_entry_init(&ce->ent, memihash(ce->name, ce_namelen(ce)));
+	hashmap_add(&istate->name_hash, &ce->ent);
 
 	if (ignore_case)
 		add_dir_entry(istate, ce);
 }
 
 static int cache_entry_cmp(const void *unused_cmp_data,
-			   const void *entry,
-			   const void *entry_or_key,
+			   const struct hashmap_entry *eptr,
+			   const struct hashmap_entry *entry_or_key,
 			   const void *remove)
 {
-	const struct cache_entry *ce1 = entry;
-	const struct cache_entry *ce2 = entry_or_key;
+	const struct cache_entry *ce1, *ce2;
+
+	ce1 = container_of(eptr, const struct cache_entry, ent);
+	ce2 = container_of(entry_or_key, const struct cache_entry, ent);
+
 	/*
 	 * For remove_name_hash, find the exact entry (pointer equality); for
 	 * index_file_exists, find all entries with matching hash code and
@@ -133,7 +138,7 @@ static int lazy_nr_dir_threads;
 
 /*
  * Set a minimum number of cache_entries that we will handle per
- * thread and use that to decide how many threads to run (upto
+ * thread and use that to decide how many threads to run (up to
  * the number on the system).
  *
  * For guidance setting the lower per-thread bound, see:
@@ -213,7 +218,7 @@ static int lookup_lazy_params(struct index_state *istate)
  * However, the hashmap is going to put items into bucket
  * chains based on their hash values.  Use that to create n
  * mutexes and lock on mutex[bucket(hash) % n].  This will
- * decrease the collision rate by (hopefully) by a factor of n.
+ * decrease the collision rate by (hopefully) a factor of n.
  */
 static void init_dir_mutex(void)
 {
@@ -280,10 +285,10 @@ static struct dir_entry *hash_dir_entry_with_parent_and_prefix(
 	dir = find_dir_entry__hash(istate, prefix->buf, prefix->len, hash);
 	if (!dir) {
 		FLEX_ALLOC_MEM(dir, name, prefix->buf, prefix->len);
-		hashmap_entry_init(dir, hash);
+		hashmap_entry_init(&dir->ent, hash);
 		dir->namelen = prefix->len;
 		dir->parent = parent;
-		hashmap_add(&istate->dir_hash, dir);
+		hashmap_add(&istate->dir_hash, &dir->ent);
 
 		if (parent) {
 			unlock_dir_mutex(lock_nr);
@@ -472,8 +477,8 @@ static void *lazy_name_thread_proc(void *_data)
 	for (k = 0; k < d->istate->cache_nr; k++) {
 		struct cache_entry *ce_k = d->istate->cache[k];
 		ce_k->ce_flags |= CE_HASHED;
-		hashmap_entry_init(ce_k, d->lazy_entries[k].hash_name);
-		hashmap_add(&d->istate->name_hash, ce_k);
+		hashmap_entry_init(&ce_k->ent, d->lazy_entries[k].hash_name);
+		hashmap_add(&d->istate->name_hash, &ce_k->ent);
 	}
 
 	return NULL;
@@ -625,7 +630,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
 	if (!istate->name_hash_initialized || !(ce->ce_flags & CE_HASHED))
 		return;
 	ce->ce_flags &= ~CE_HASHED;
-	hashmap_remove(&istate->name_hash, ce, ce);
+	hashmap_remove(&istate->name_hash, &ce->ent, ce);
 
 	if (ignore_case)
 		remove_dir_entry(istate, ce);
@@ -702,15 +707,15 @@ void adjust_dirname_case(struct index_state *istate, char *name)
 struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int icase)
 {
 	struct cache_entry *ce;
+	unsigned int hash = memihash(name, namelen);
 
 	lazy_init_name_hash(istate);
 
-	ce = hashmap_get_from_hash(&istate->name_hash,
-				   memihash(name, namelen), NULL);
-	while (ce) {
+	ce = hashmap_get_entry_from_hash(&istate->name_hash, hash, NULL,
+					 struct cache_entry, ent);
+	hashmap_for_each_entry_from(&istate->name_hash, ce, ent) {
 		if (same_name(ce, name, namelen, icase))
 			return ce;
-		ce = hashmap_get_next(&istate->name_hash, ce);
 	}
 	return NULL;
 }
@@ -721,6 +726,6 @@ void free_name_hash(struct index_state *istate)
 		return;
 	istate->name_hash_initialized = 0;
 
-	hashmap_free(&istate->name_hash, 0);
-	hashmap_free(&istate->dir_hash, 1);
+	hashmap_free(&istate->name_hash);
+	hashmap_free_entries(&istate->dir_hash, struct dir_entry, ent);
 }
diff --git a/third_party/git/notes-utils.c b/third_party/git/notes-utils.c
index a81941069873..4bf4888d8c1f 100644
--- a/third_party/git/notes-utils.c
+++ b/third_party/git/notes-utils.c
@@ -52,7 +52,7 @@ void commit_notes(struct repository *r, struct notes_tree *t, const char *msg)
 	strbuf_complete_line(&buf);
 
 	create_notes_commit(r, t, NULL, buf.buf, buf.len, &commit_oid);
-	strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
+	strbuf_insertstr(&buf, 0, "notes: ");
 	update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0,
 		   UPDATE_REFS_DIE_ON_ERR);
 
diff --git a/third_party/git/notes.c b/third_party/git/notes.c
index 75c028b3005a..564baac64d76 100644
--- a/third_party/git/notes.c
+++ b/third_party/git/notes.c
@@ -269,8 +269,10 @@ static int note_tree_insert(struct notes_tree *t, struct int_node *tree,
 		case PTR_TYPE_NOTE:
 			if (oideq(&l->key_oid, &entry->key_oid)) {
 				/* skip concatenation if l == entry */
-				if (oideq(&l->val_oid, &entry->val_oid))
+				if (oideq(&l->val_oid, &entry->val_oid)) {
+					free(entry);
 					return 0;
+				}
 
 				ret = combine_notes(&l->val_oid,
 						    &entry->val_oid);
@@ -458,7 +460,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
 			die("Failed to load %s %s into notes tree "
 			    "from %s",
 			    type == PTR_TYPE_NOTE ? "note" : "subtree",
-			    oid_to_hex(&l->key_oid), t->ref);
+			    oid_to_hex(&object_oid), t->ref);
 
 		continue;
 
@@ -574,16 +576,16 @@ redo:
 			 * the note tree that have not yet been explored. There
 			 * is a direct relationship between subtree entries at
 			 * level 'n' in the tree, and the 'fanout' variable:
-			 * Subtree entries at level 'n <= 2 * fanout' should be
+			 * Subtree entries at level 'n < 2 * fanout' should be
 			 * preserved, since they correspond exactly to a fanout
 			 * directory in the on-disk structure. However, subtree
-			 * entries at level 'n > 2 * fanout' should NOT be
+			 * entries at level 'n >= 2 * fanout' should NOT be
 			 * preserved, but rather consolidated into the above
 			 * notes tree level. We achieve this by unconditionally
 			 * unpacking subtree entries that exist below the
 			 * threshold level at 'n = 2 * fanout'.
 			 */
-			if (n <= 2 * fanout &&
+			if (n < 2 * fanout &&
 			    flags & FOR_EACH_NOTE_YIELD_SUBTREES) {
 				/* invoke callback with subtree */
 				unsigned int path_len =
@@ -600,7 +602,7 @@ redo:
 					 path,
 					 cb_data);
 			}
-			if (n > fanout * 2 ||
+			if (n >= 2 * fanout ||
 			    !(flags & FOR_EACH_NOTE_DONT_UNPACK_SUBTREES)) {
 				/* unpack subtree and resume traversal */
 				tree->a[i] = NULL;
@@ -721,13 +723,15 @@ static int write_each_note_helper(struct tree_write_stack *tws,
 
 struct write_each_note_data {
 	struct tree_write_stack *root;
-	struct non_note *next_non_note;
+	struct non_note **nn_list;
+	struct non_note *nn_prev;
 };
 
 static int write_each_non_note_until(const char *note_path,
 		struct write_each_note_data *d)
 {
-	struct non_note *n = d->next_non_note;
+	struct non_note *p = d->nn_prev;
+	struct non_note *n = p ? p->next : *d->nn_list;
 	int cmp = 0, ret;
 	while (n && (!note_path || (cmp = strcmp(n->path, note_path)) <= 0)) {
 		if (note_path && cmp == 0)
@@ -738,9 +742,10 @@ static int write_each_non_note_until(const char *note_path,
 			if (ret)
 				return ret;
 		}
+		p = n;
 		n = n->next;
 	}
-	d->next_non_note = n;
+	d->nn_prev = p;
 	return 0;
 }
 
@@ -1041,6 +1046,39 @@ struct notes_tree **load_notes_trees(struct string_list *refs, int flags)
 
 void init_display_notes(struct display_notes_opt *opt)
 {
+	memset(opt, 0, sizeof(*opt));
+	opt->use_default_notes = -1;
+}
+
+void enable_default_display_notes(struct display_notes_opt *opt, int *show_notes)
+{
+	opt->use_default_notes = 1;
+	*show_notes = 1;
+}
+
+void enable_ref_display_notes(struct display_notes_opt *opt, int *show_notes,
+		const char *ref) {
+	struct strbuf buf = STRBUF_INIT;
+	strbuf_addstr(&buf, ref);
+	expand_notes_ref(&buf);
+	string_list_append(&opt->extra_notes_refs,
+			strbuf_detach(&buf, NULL));
+	*show_notes = 1;
+}
+
+void disable_display_notes(struct display_notes_opt *opt, int *show_notes)
+{
+	opt->use_default_notes = -1;
+	/* we have been strdup'ing ourselves, so trick
+	 * string_list into free()ing strings */
+	opt->extra_notes_refs.strdup_strings = 1;
+	string_list_clear(&opt->extra_notes_refs, 0);
+	opt->extra_notes_refs.strdup_strings = 0;
+	*show_notes = 0;
+}
+
+void load_display_notes(struct display_notes_opt *opt)
+{
 	char *display_ref_env;
 	int load_config_refs = 0;
 	display_notes_refs.strdup_strings = 1;
@@ -1142,7 +1180,8 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
 	strbuf_init(&root.buf, 256 * (32 + the_hash_algo->hexsz)); /* assume 256 entries */
 	root.path[0] = root.path[1] = '\0';
 	cb_data.root = &root;
-	cb_data.next_non_note = t->first_non_note;
+	cb_data.nn_list = &(t->first_non_note);
+	cb_data.nn_prev = NULL;
 
 	/* Write tree objects representing current notes tree */
 	flags = FOR_EACH_NOTE_DONT_UNPACK_SUBTREES |
@@ -1244,10 +1283,8 @@ static void format_note(struct notes_tree *t, const struct object_id *object_oid
 		if (!ref || !strcmp(ref, GIT_NOTES_DEFAULT_REF)) {
 			strbuf_addstr(sb, "\nNotes:\n");
 		} else {
-			if (starts_with(ref, "refs/"))
-				ref += 5;
-			if (starts_with(ref, "notes/"))
-				ref += 6;
+			skip_prefix(ref, "refs/", &ref);
+			skip_prefix(ref, "notes/", &ref);
 			strbuf_addf(sb, "\nNotes (%s):\n", ref);
 		}
 	}
@@ -1297,9 +1334,9 @@ void expand_notes_ref(struct strbuf *sb)
 	if (starts_with(sb->buf, "refs/notes/"))
 		return; /* we're happy */
 	else if (starts_with(sb->buf, "notes/"))
-		strbuf_insert(sb, 0, "refs/", 5);
+		strbuf_insertstr(sb, 0, "refs/");
 	else
-		strbuf_insert(sb, 0, "refs/notes/", 11);
+		strbuf_insertstr(sb, 0, "refs/notes/");
 }
 
 void expand_loose_notes_ref(struct strbuf *sb)
diff --git a/third_party/git/notes.h b/third_party/git/notes.h
index 76337f238472..c1682c39a97b 100644
--- a/third_party/git/notes.h
+++ b/third_party/git/notes.h
@@ -261,6 +261,26 @@ struct display_notes_opt {
 };
 
 /*
+ * Initialize a display_notes_opt to its default value.
+ */
+void init_display_notes(struct display_notes_opt *opt);
+
+/*
+ * This family of functions enables or disables the display of notes. In
+ * particular, 'enable_default_display_notes' will display the default notes,
+ * 'enable_ref_display_notes' will display the notes ref 'ref' and
+ * 'disable_display_notes' will disable notes, including those added by previous
+ * invocations of the 'enable_*_display_notes' functions.
+ *
+ * 'show_notes' is a pointer to a boolean which will be set to 1 if notes are
+ * displayed, else 0. It must not be NULL.
+ */
+void enable_default_display_notes(struct display_notes_opt *opt, int *show_notes);
+void enable_ref_display_notes(struct display_notes_opt *opt, int *show_notes,
+		const char *ref);
+void disable_display_notes(struct display_notes_opt *opt, int *show_notes);
+
+/*
  * Load the notes machinery for displaying several notes trees.
  *
  * If 'opt' is not NULL, then it specifies additional settings for the
@@ -272,16 +292,16 @@ struct display_notes_opt {
  * - extra_notes_refs may contain a list of globs (in the same style
  *   as notes.displayRef) where notes should be loaded from.
  */
-void init_display_notes(struct display_notes_opt *opt);
+void load_display_notes(struct display_notes_opt *opt);
 
 /*
  * Append notes for the given 'object_sha1' from all trees set up by
- * init_display_notes() to 'sb'.
+ * load_display_notes() to 'sb'.
  *
  * If 'raw' is false the note will be indented by 4 places and
  * a 'Notes (refname):' header added.
  *
- * You *must* call init_display_notes() before using this function.
+ * You *must* call load_display_notes() before using this function.
  */
 void format_display_notes(const struct object_id *object_oid,
 			  struct strbuf *sb, const char *output_encoding, int raw);
diff --git a/third_party/git/object-store.h b/third_party/git/object-store.h
index 7f7b3cdd806b..be72fee7d557 100644
--- a/third_party/git/object-store.h
+++ b/third_party/git/object-store.h
@@ -6,6 +6,7 @@
 #include "list.h"
 #include "sha1-array.h"
 #include "strbuf.h"
+#include "thread-utils.h"
 
 struct object_directory {
 	struct object_directory *next;
@@ -60,6 +61,7 @@ struct oid_array *odb_loose_cache(struct object_directory *odb,
 void odb_clear_loose_cache(struct object_directory *odb);
 
 struct packed_git {
+	struct hashmap_entry packmap_ent;
 	struct packed_git *next;
 	struct list_head mru;
 	struct pack_window *windows;
@@ -88,6 +90,20 @@ struct packed_git {
 
 struct multi_pack_index;
 
+static inline int pack_map_entry_cmp(const void *unused_cmp_data,
+				     const struct hashmap_entry *entry,
+				     const struct hashmap_entry *entry2,
+				     const void *keydata)
+{
+	const char *key = keydata;
+	const struct packed_git *pg1, *pg2;
+
+	pg1 = container_of(entry, const struct packed_git, packmap_ent);
+	pg2 = container_of(entry2, const struct packed_git, packmap_ent);
+
+	return strcmp(pg1->pack_name, key ? key : pg2->pack_name);
+}
+
 struct raw_object_store {
 	/*
 	 * Set of all object directories; the main directory is first (and
@@ -110,6 +126,8 @@ struct raw_object_store {
 	 * (see git-replace(1)).
 	 */
 	struct oidmap *replace_map;
+	unsigned replace_map_initialized : 1;
+	pthread_mutex_t replace_mutex; /* protect object replace functions */
 
 	struct commit_graph *commit_graph;
 	unsigned commit_graph_attempted : 1; /* if loading has been attempted */
@@ -132,6 +150,12 @@ struct raw_object_store {
 	struct list_head packed_git_mru;
 
 	/*
+	 * A map of packfiles to packed_git structs for tracking which
+	 * packs have been loaded already.
+	 */
+	struct hashmap pack_map;
+
+	/*
 	 * A fast, rough count of the number of objects in the repository.
 	 * These two fields are not meant for direct access. Use
 	 * approximate_object_count() instead.
@@ -177,8 +201,9 @@ static inline void *repo_read_object_file(struct repository *r,
 /* Read and unpack an object file into memory, write memory to an object file */
 int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
 
-int hash_object_file(const void *buf, unsigned long len,
-		     const char *type, struct object_id *oid);
+int hash_object_file(const struct git_hash_algo *algo, const void *buf,
+		     unsigned long len, const char *type,
+		     struct object_id *oid);
 
 int write_object_file(const void *buf, unsigned long len,
 		      const char *type, struct object_id *oid);
@@ -187,6 +212,14 @@ int hash_object_file_literally(const void *buf, unsigned long len,
 			       const char *type, struct object_id *oid,
 			       unsigned flags);
 
+/*
+ * Add an object file to the in-memory object store, without writing it
+ * to disk.
+ *
+ * Callers are responsible for calling write_object_file to record the
+ * object in persistent storage before writing any other new objects
+ * that reference it.
+ */
 int pretend_object_file(void *, unsigned long, enum object_type,
 			struct object_id *oid);
 
@@ -228,12 +261,46 @@ int has_loose_object_nonlocal(const struct object_id *);
 
 void assert_oid_type(const struct object_id *oid, enum object_type expect);
 
+/*
+ * Enabling the object read lock allows multiple threads to safely call the
+ * following functions in parallel: repo_read_object_file(), read_object_file(),
+ * read_object_file_extended(), read_object_with_reference(), read_object(),
+ * oid_object_info() and oid_object_info_extended().
+ *
+ * obj_read_lock() and obj_read_unlock() may also be used to protect other
+ * section which cannot execute in parallel with object reading. Since the used
+ * lock is a recursive mutex, these sections can even contain calls to object
+ * reading functions. However, beware that in these cases zlib inflation won't
+ * be performed in parallel, losing performance.
+ *
+ * TODO: oid_object_info_extended()'s call stack has a recursive behavior. If
+ * any of its callees end up calling it, this recursive call won't benefit from
+ * parallel inflation.
+ */
+void enable_obj_read_lock(void);
+void disable_obj_read_lock(void);
+
+extern int obj_read_use_lock;
+extern pthread_mutex_t obj_read_mutex;
+
+static inline void obj_read_lock(void)
+{
+	if(obj_read_use_lock)
+		pthread_mutex_lock(&obj_read_mutex);
+}
+
+static inline void obj_read_unlock(void)
+{
+	if(obj_read_use_lock)
+		pthread_mutex_unlock(&obj_read_mutex);
+}
+
 struct object_info {
 	/* Request */
 	enum object_type *typep;
 	unsigned long *sizep;
 	off_t *disk_sizep;
-	unsigned char *delta_base_sha1;
+	struct object_id *delta_base_oid;
 	struct strbuf *type_name;
 	void **contentp;
 
@@ -271,8 +338,6 @@ struct object_info {
 #define OBJECT_INFO_LOOKUP_REPLACE 1
 /* Allow reading from a loose object file of unknown/bogus type */
 #define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2
-/* Do not check cached storage */
-#define OBJECT_INFO_SKIP_CACHED 4
 /* Do not retry packed storage after checking packed and loose storage */
 #define OBJECT_INFO_QUICK 8
 /* Do not check loose object */
diff --git a/third_party/git/object.c b/third_party/git/object.c
index 07bdd5b26e2b..794c86650e9a 100644
--- a/third_party/git/object.c
+++ b/third_party/git/object.c
@@ -7,7 +7,6 @@
 #include "commit.h"
 #include "tag.h"
 #include "alloc.h"
-#include "object-store.h"
 #include "packfile.h"
 #include "commit-graph.h"
 
@@ -263,7 +262,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
 	if ((obj && obj->type == OBJ_BLOB && repo_has_object_file(r, oid)) ||
 	    (!obj && repo_has_object_file(r, oid) &&
 	     oid_object_info(r, oid, NULL) == OBJ_BLOB)) {
-		if (check_object_signature(repl, NULL, 0, NULL) < 0) {
+		if (check_object_signature(r, repl, NULL, 0, NULL) < 0) {
 			error(_("hash mismatch %s"), oid_to_hex(oid));
 			return NULL;
 		}
@@ -273,7 +272,8 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
 
 	buffer = repo_read_object_file(r, oid, &type, &size);
 	if (buffer) {
-		if (check_object_signature(repl, buffer, size, type_name(type)) < 0) {
+		if (check_object_signature(r, repl, buffer, size,
+					   type_name(type)) < 0) {
 			free(buffer);
 			error(_("hash mismatch %s"), oid_to_hex(repl));
 			return NULL;
@@ -308,6 +308,15 @@ int object_list_contains(struct object_list *list, struct object *obj)
 	return 0;
 }
 
+void object_list_free(struct object_list **list)
+{
+	while (*list) {
+		struct object_list *p = *list;
+		*list = p->next;
+		free(p);
+	}
+}
+
 /*
  * A zero-length string to which object_array_entry::name can be
  * initialized without requiring a malloc/free.
@@ -480,6 +489,8 @@ struct raw_object_store *raw_object_store_new(void)
 
 	memset(o, 0, sizeof(*o));
 	INIT_LIST_HEAD(&o->packed_git_mru);
+	hashmap_init(&o->pack_map, pack_map_entry_cmp, NULL, 0);
+	pthread_mutex_init(&o->replace_mutex, NULL);
 	return o;
 }
 
@@ -507,6 +518,7 @@ void raw_object_store_clear(struct raw_object_store *o)
 
 	oidmap_free(o->replace_map, 1);
 	FREE_AND_NULL(o->replace_map);
+	pthread_mutex_destroy(&o->replace_mutex);
 
 	free_commit_graph(o->commit_graph);
 	o->commit_graph = NULL;
@@ -519,6 +531,8 @@ void raw_object_store_clear(struct raw_object_store *o)
 	INIT_LIST_HEAD(&o->packed_git_mru);
 	close_object_store(o);
 	o->packed_git = NULL;
+
+	hashmap_free(&o->pack_map);
 }
 
 void parsed_object_pool_clear(struct parsed_object_pool *o)
diff --git a/third_party/git/object.h b/third_party/git/object.h
index 0120892bbd39..2dbabfca0ab8 100644
--- a/third_party/git/object.h
+++ b/third_party/git/object.h
@@ -68,7 +68,8 @@ struct object_array {
  * bisect.c:                                        16
  * bundle.c:                                        16
  * http-push.c:                                     16-----19
- * commit-reach.c:                                15-------19
+ * commit-graph.c:                                15
+ * commit-reach.c:                                  16-----19
  * sha1-name.c:                                              20
  * list-objects-filter.c:                                      21
  * builtin/fsck.c:           0--3
@@ -150,6 +151,8 @@ struct object_list *object_list_insert(struct object *item,
 
 int object_list_contains(struct object_list *list, struct object *obj);
 
+void object_list_free(struct object_list **list);
+
 /* Object array handling .. */
 void add_object_array(struct object *obj, const char *name, struct object_array *array);
 void add_object_array_with_path(struct object *obj, const char *name, struct object_array *array, unsigned mode, const char *path);
diff --git a/third_party/git/oidmap.c b/third_party/git/oidmap.c
index 6d6e840d0376..423aa014a33e 100644
--- a/third_party/git/oidmap.c
+++ b/third_party/git/oidmap.c
@@ -2,14 +2,18 @@
 #include "oidmap.h"
 
 static int oidmap_neq(const void *hashmap_cmp_fn_data,
-		      const void *entry, const void *entry_or_key,
+		      const struct hashmap_entry *e1,
+		      const struct hashmap_entry *e2,
 		      const void *keydata)
 {
-	const struct oidmap_entry *entry_ = entry;
+	const struct oidmap_entry *a, *b;
+
+	a = container_of(e1, const struct oidmap_entry, internal_entry);
+	b = container_of(e2, const struct oidmap_entry, internal_entry);
+
 	if (keydata)
-		return !oideq(&entry_->oid, (const struct object_id *) keydata);
-	return !oideq(&entry_->oid,
-		      &((const struct oidmap_entry *) entry_or_key)->oid);
+		return !oideq(&a->oid, (const struct object_id *) keydata);
+	return !oideq(&a->oid, &b->oid);
 }
 
 void oidmap_init(struct oidmap *map, size_t initial_size)
@@ -21,7 +25,9 @@ void oidmap_free(struct oidmap *map, int free_entries)
 {
 	if (!map)
 		return;
-	hashmap_free(&map->map, free_entries);
+
+	/* TODO: make oidmap itself not depend on struct layouts */
+	hashmap_free_(&map->map, free_entries ? 0 : -1);
 }
 
 void *oidmap_get(const struct oidmap *map, const struct object_id *key)
@@ -51,5 +57,5 @@ void *oidmap_put(struct oidmap *map, void *entry)
 		oidmap_init(map, 0);
 
 	hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));
-	return hashmap_put(&map->map, to_put);
+	return hashmap_put(&map->map, &to_put->internal_entry);
 }
diff --git a/third_party/git/oidmap.h b/third_party/git/oidmap.h
index 7a939461ff5b..c66a83ab1d68 100644
--- a/third_party/git/oidmap.h
+++ b/third_party/git/oidmap.h
@@ -78,14 +78,16 @@ static inline void oidmap_iter_init(struct oidmap *map, struct oidmap_iter *iter
 
 static inline void *oidmap_iter_next(struct oidmap_iter *iter)
 {
-	return hashmap_iter_next(&iter->h_iter);
+	/* TODO: this API could be reworked to do compile-time type checks */
+	return (void *)hashmap_iter_next(&iter->h_iter);
 }
 
 static inline void *oidmap_iter_first(struct oidmap *map,
 				      struct oidmap_iter *iter)
 {
 	oidmap_iter_init(map, iter);
-	return oidmap_iter_next(iter);
+	/* TODO: this API could be reworked to do compile-time type checks */
+	return (void *)oidmap_iter_next(iter);
 }
 
 #endif
diff --git a/third_party/git/pack-bitmap-write.c b/third_party/git/pack-bitmap-write.c
index fa78a460c9aa..a7a4964b50d1 100644
--- a/third_party/git/pack-bitmap-write.c
+++ b/third_party/git/pack-bitmap-write.c
@@ -144,7 +144,7 @@ static inline void reset_all_seen(void)
 
 static uint32_t find_object_pos(const struct object_id *oid)
 {
-	struct object_entry *entry = packlist_find(writer.to_pack, oid, NULL);
+	struct object_entry *entry = packlist_find(writer.to_pack, oid);
 
 	if (!entry) {
 		die("Failed to write bitmap index. Packfile doesn't have full closure "
diff --git a/third_party/git/pack-bitmap.c b/third_party/git/pack-bitmap.c
index ed2befaac653..49a8d10d0cf9 100644
--- a/third_party/git/pack-bitmap.c
+++ b/third_party/git/pack-bitmap.c
@@ -12,6 +12,7 @@
 #include "packfile.h"
 #include "repository.h"
 #include "object-store.h"
+#include "list-objects-filter-options.h"
 
 /*
  * An entry on the bitmap index, representing the bitmap for a given
@@ -169,7 +170,7 @@ static int load_bitmap_header(struct bitmap_index *index)
 
 static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
 					  struct ewah_bitmap *root,
-					  const unsigned char *hash,
+					  const struct object_id *oid,
 					  struct stored_bitmap *xor_with,
 					  int flags)
 {
@@ -181,7 +182,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
 	stored->root = root;
 	stored->xor = xor_with;
 	stored->flags = flags;
-	oidread(&stored->oid, hash);
+	oidcpy(&stored->oid, oid);
 
 	hash_pos = kh_put_oid_map(index->bitmaps, stored->oid, &ret);
 
@@ -189,7 +190,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
 	 * because the SHA1 already existed on the map. this is bad, there
 	 * shouldn't be duplicated commits in the index */
 	if (ret == 0) {
-		error("Duplicate entry in bitmap index: %s", hash_to_hex(hash));
+		error("Duplicate entry in bitmap index: %s", oid_to_hex(oid));
 		return NULL;
 	}
 
@@ -221,13 +222,13 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
 		struct ewah_bitmap *bitmap = NULL;
 		struct stored_bitmap *xor_bitmap = NULL;
 		uint32_t commit_idx_pos;
-		const unsigned char *sha1;
+		struct object_id oid;
 
 		commit_idx_pos = read_be32(index->map, &index->map_pos);
 		xor_offset = read_u8(index->map, &index->map_pos);
 		flags = read_u8(index->map, &index->map_pos);
 
-		sha1 = nth_packed_object_sha1(index->pack, commit_idx_pos);
+		nth_packed_object_id(&oid, index->pack, commit_idx_pos);
 
 		bitmap = read_bitmap_1(index);
 		if (!bitmap)
@@ -244,7 +245,7 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
 		}
 
 		recent_bitmaps[i % MAX_XOR_OFFSET] = store_bitmap(
-			index, bitmap, sha1, xor_bitmap, flags);
+			index, bitmap, &oid, xor_bitmap, flags);
 	}
 
 	return 0;
@@ -326,6 +327,13 @@ failed:
 	munmap(bitmap_git->map, bitmap_git->map_size);
 	bitmap_git->map = NULL;
 	bitmap_git->map_size = 0;
+
+	kh_destroy_oid_map(bitmap_git->bitmaps);
+	bitmap_git->bitmaps = NULL;
+
+	kh_destroy_oid_pos(bitmap_git->ext_index.positions);
+	bitmap_git->ext_index.positions = NULL;
+
 	return -1;
 }
 
@@ -599,6 +607,7 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
 }
 
 static void show_extended_objects(struct bitmap_index *bitmap_git,
+				  struct rev_info *revs,
 				  show_reachable_fn show_reach)
 {
 	struct bitmap *objects = bitmap_git->result;
@@ -612,17 +621,48 @@ static void show_extended_objects(struct bitmap_index *bitmap_git,
 			continue;
 
 		obj = eindex->objects[i];
+		if ((obj->type == OBJ_BLOB && !revs->blob_objects) ||
+		    (obj->type == OBJ_TREE && !revs->tree_objects) ||
+		    (obj->type == OBJ_TAG && !revs->tag_objects))
+			continue;
+
 		show_reach(&obj->oid, obj->type, 0, eindex->hashes[i], NULL, 0);
 	}
 }
 
+static void init_type_iterator(struct ewah_iterator *it,
+			       struct bitmap_index *bitmap_git,
+			       enum object_type type)
+{
+	switch (type) {
+	case OBJ_COMMIT:
+		ewah_iterator_init(it, bitmap_git->commits);
+		break;
+
+	case OBJ_TREE:
+		ewah_iterator_init(it, bitmap_git->trees);
+		break;
+
+	case OBJ_BLOB:
+		ewah_iterator_init(it, bitmap_git->blobs);
+		break;
+
+	case OBJ_TAG:
+		ewah_iterator_init(it, bitmap_git->tags);
+		break;
+
+	default:
+		BUG("object type %d not stored by bitmap type index", type);
+		break;
+	}
+}
+
 static void show_objects_for_type(
 	struct bitmap_index *bitmap_git,
-	struct ewah_bitmap *type_filter,
 	enum object_type object_type,
 	show_reachable_fn show_reach)
 {
-	size_t pos = 0, i = 0;
+	size_t i = 0;
 	uint32_t offset;
 
 	struct ewah_iterator it;
@@ -630,13 +670,15 @@ static void show_objects_for_type(
 
 	struct bitmap *objects = bitmap_git->result;
 
-	if (bitmap_git->reuse_objects == bitmap_git->pack->num_objects)
-		return;
-
-	ewah_iterator_init(&it, type_filter);
+	init_type_iterator(&it, bitmap_git, object_type);
 
-	while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) {
+	for (i = 0; i < objects->word_alloc &&
+			ewah_iterator_next(&filter, &it); i++) {
 		eword_t word = objects->words[i] & filter;
+		size_t pos = (i * BITS_IN_EWORD);
+
+		if (!word)
+			continue;
 
 		for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
 			struct object_id oid;
@@ -648,20 +690,14 @@ static void show_objects_for_type(
 
 			offset += ewah_bit_ctz64(word >> offset);
 
-			if (pos + offset < bitmap_git->reuse_objects)
-				continue;
-
 			entry = &bitmap_git->pack->revindex[pos + offset];
-			nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr);
+			nth_packed_object_id(&oid, bitmap_git->pack, entry->nr);
 
 			if (bitmap_git->hashes)
 				hash = get_be32(bitmap_git->hashes + entry->nr);
 
 			show_reach(&oid, object_type, 0, hash, bitmap_git->pack, entry->offset);
 		}
-
-		pos += BITS_IN_EWORD;
-		i++;
 	}
 }
 
@@ -679,7 +715,179 @@ static int in_bitmapped_pack(struct bitmap_index *bitmap_git,
 	return 0;
 }
 
-struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
+static struct bitmap *find_tip_blobs(struct bitmap_index *bitmap_git,
+				     struct object_list *tip_objects)
+{
+	struct bitmap *result = bitmap_new();
+	struct object_list *p;
+
+	for (p = tip_objects; p; p = p->next) {
+		int pos;
+
+		if (p->item->type != OBJ_BLOB)
+			continue;
+
+		pos = bitmap_position(bitmap_git, &p->item->oid);
+		if (pos < 0)
+			continue;
+
+		bitmap_set(result, pos);
+	}
+
+	return result;
+}
+
+static void filter_bitmap_blob_none(struct bitmap_index *bitmap_git,
+				    struct object_list *tip_objects,
+				    struct bitmap *to_filter)
+{
+	struct eindex *eindex = &bitmap_git->ext_index;
+	struct bitmap *tips;
+	struct ewah_iterator it;
+	eword_t mask;
+	uint32_t i;
+
+	/*
+	 * The non-bitmap version of this filter never removes
+	 * blobs which the other side specifically asked for,
+	 * so we must match that behavior.
+	 */
+	tips = find_tip_blobs(bitmap_git, tip_objects);
+
+	/*
+	 * We can use the blob type-bitmap to work in whole words
+	 * for the objects that are actually in the bitmapped packfile.
+	 */
+	for (i = 0, init_type_iterator(&it, bitmap_git, OBJ_BLOB);
+	     i < to_filter->word_alloc && ewah_iterator_next(&mask, &it);
+	     i++) {
+		if (i < tips->word_alloc)
+			mask &= ~tips->words[i];
+		to_filter->words[i] &= ~mask;
+	}
+
+	/*
+	 * Clear any blobs that weren't in the packfile (and so would not have
+	 * been caught by the loop above. We'll have to check them
+	 * individually.
+	 */
+	for (i = 0; i < eindex->count; i++) {
+		uint32_t pos = i + bitmap_git->pack->num_objects;
+		if (eindex->objects[i]->type == OBJ_BLOB &&
+		    bitmap_get(to_filter, pos) &&
+		    !bitmap_get(tips, pos))
+			bitmap_unset(to_filter, pos);
+	}
+
+	bitmap_free(tips);
+}
+
+static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git,
+				     uint32_t pos)
+{
+	struct packed_git *pack = bitmap_git->pack;
+	unsigned long size;
+	struct object_info oi = OBJECT_INFO_INIT;
+
+	oi.sizep = &size;
+
+	if (pos < pack->num_objects) {
+		struct revindex_entry *entry = &pack->revindex[pos];
+		if (packed_object_info(the_repository, pack,
+				       entry->offset, &oi) < 0) {
+			struct object_id oid;
+			nth_packed_object_id(&oid, pack, entry->nr);
+			die(_("unable to get size of %s"), oid_to_hex(&oid));
+		}
+	} else {
+		struct eindex *eindex = &bitmap_git->ext_index;
+		struct object *obj = eindex->objects[pos - pack->num_objects];
+		if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
+			die(_("unable to get size of %s"), oid_to_hex(&obj->oid));
+	}
+
+	return size;
+}
+
+static void filter_bitmap_blob_limit(struct bitmap_index *bitmap_git,
+				     struct object_list *tip_objects,
+				     struct bitmap *to_filter,
+				     unsigned long limit)
+{
+	struct eindex *eindex = &bitmap_git->ext_index;
+	struct bitmap *tips;
+	struct ewah_iterator it;
+	eword_t mask;
+	uint32_t i;
+
+	tips = find_tip_blobs(bitmap_git, tip_objects);
+
+	for (i = 0, init_type_iterator(&it, bitmap_git, OBJ_BLOB);
+	     i < to_filter->word_alloc && ewah_iterator_next(&mask, &it);
+	     i++) {
+		eword_t word = to_filter->words[i] & mask;
+		unsigned offset;
+
+		for (offset = 0; offset < BITS_IN_EWORD; offset++) {
+			uint32_t pos;
+
+			if ((word >> offset) == 0)
+				break;
+			offset += ewah_bit_ctz64(word >> offset);
+			pos = i * BITS_IN_EWORD + offset;
+
+			if (!bitmap_get(tips, pos) &&
+			    get_size_by_pos(bitmap_git, pos) >= limit)
+				bitmap_unset(to_filter, pos);
+		}
+	}
+
+	for (i = 0; i < eindex->count; i++) {
+		uint32_t pos = i + bitmap_git->pack->num_objects;
+		if (eindex->objects[i]->type == OBJ_BLOB &&
+		    bitmap_get(to_filter, pos) &&
+		    !bitmap_get(tips, pos) &&
+		    get_size_by_pos(bitmap_git, pos) >= limit)
+			bitmap_unset(to_filter, pos);
+	}
+
+	bitmap_free(tips);
+}
+
+static int filter_bitmap(struct bitmap_index *bitmap_git,
+			 struct object_list *tip_objects,
+			 struct bitmap *to_filter,
+			 struct list_objects_filter_options *filter)
+{
+	if (!filter || filter->choice == LOFC_DISABLED)
+		return 0;
+
+	if (filter->choice == LOFC_BLOB_NONE) {
+		if (bitmap_git)
+			filter_bitmap_blob_none(bitmap_git, tip_objects,
+						to_filter);
+		return 0;
+	}
+
+	if (filter->choice == LOFC_BLOB_LIMIT) {
+		if (bitmap_git)
+			filter_bitmap_blob_limit(bitmap_git, tip_objects,
+						 to_filter,
+						 filter->blob_limit_value);
+		return 0;
+	}
+
+	/* filter choice not handled */
+	return -1;
+}
+
+static int can_filter_bitmap(struct list_objects_filter_options *filter)
+{
+	return !filter_bitmap(NULL, NULL, NULL, filter);
+}
+
+struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
+					 struct list_objects_filter_options *filter)
 {
 	unsigned int i;
 
@@ -689,9 +897,22 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
 	struct bitmap *wants_bitmap = NULL;
 	struct bitmap *haves_bitmap = NULL;
 
-	struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git));
+	struct bitmap_index *bitmap_git;
+
+	/*
+	 * We can't do pathspec limiting with bitmaps, because we don't know
+	 * which commits are associated with which object changes (let alone
+	 * even which objects are associated with which paths).
+	 */
+	if (revs->prune)
+		return NULL;
+
+	if (!can_filter_bitmap(filter))
+		return NULL;
+
 	/* try to open a bitmapped pack, but don't parse it yet
 	 * because we may not need to use it */
+	bitmap_git = xcalloc(1, sizeof(*bitmap_git));
 	if (open_pack_bitmap(revs->repo, bitmap_git) < 0)
 		goto cleanup;
 
@@ -709,9 +930,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
 			else
 				object_list_insert(object, &wants);
 
-			if (!tag->tagged)
-				die("bad tag");
-			object = parse_object_or_die(&tag->tagged->oid, NULL);
+			object = parse_object_or_die(get_tagged_oid(tag), NULL);
 		}
 
 		if (object->flags & UNINTERESTING)
@@ -760,93 +979,173 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
 	if (haves_bitmap)
 		bitmap_and_not(wants_bitmap, haves_bitmap);
 
+	filter_bitmap(bitmap_git, wants, wants_bitmap, filter);
+
 	bitmap_git->result = wants_bitmap;
 	bitmap_git->haves = haves_bitmap;
 
+	object_list_free(&wants);
+	object_list_free(&haves);
+
 	return bitmap_git;
 
 cleanup:
 	free_bitmap_index(bitmap_git);
+	object_list_free(&wants);
+	object_list_free(&haves);
 	return NULL;
 }
 
-int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
-				       struct packed_git **packfile,
-				       uint32_t *entries,
-				       off_t *up_to)
+static void try_partial_reuse(struct bitmap_index *bitmap_git,
+			      size_t pos,
+			      struct bitmap *reuse,
+			      struct pack_window **w_curs)
 {
+	struct revindex_entry *revidx;
+	off_t offset;
+	enum object_type type;
+	unsigned long size;
+
+	if (pos >= bitmap_git->pack->num_objects)
+		return; /* not actually in the pack */
+
+	revidx = &bitmap_git->pack->revindex[pos];
+	offset = revidx->offset;
+	type = unpack_object_header(bitmap_git->pack, w_curs, &offset, &size);
+	if (type < 0)
+		return; /* broken packfile, punt */
+
+	if (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA) {
+		off_t base_offset;
+		int base_pos;
+
+		/*
+		 * Find the position of the base object so we can look it up
+		 * in our bitmaps. If we can't come up with an offset, or if
+		 * that offset is not in the revidx, the pack is corrupt.
+		 * There's nothing we can do, so just punt on this object,
+		 * and the normal slow path will complain about it in
+		 * more detail.
+		 */
+		base_offset = get_delta_base(bitmap_git->pack, w_curs,
+					     &offset, type, revidx->offset);
+		if (!base_offset)
+			return;
+		base_pos = find_revindex_position(bitmap_git->pack, base_offset);
+		if (base_pos < 0)
+			return;
+
+		/*
+		 * We assume delta dependencies always point backwards. This
+		 * lets us do a single pass, and is basically always true
+		 * due to the way OFS_DELTAs work. You would not typically
+		 * find REF_DELTA in a bitmapped pack, since we only bitmap
+		 * packs we write fresh, and OFS_DELTA is the default). But
+		 * let's double check to make sure the pack wasn't written with
+		 * odd parameters.
+		 */
+		if (base_pos >= pos)
+			return;
+
+		/*
+		 * And finally, if we're not sending the base as part of our
+		 * reuse chunk, then don't send this object either. The base
+		 * would come after us, along with other objects not
+		 * necessarily in the pack, which means we'd need to convert
+		 * to REF_DELTA on the fly. Better to just let the normal
+		 * object_entry code path handle it.
+		 */
+		if (!bitmap_get(reuse, base_pos))
+			return;
+	}
+
 	/*
-	 * Reuse the packfile content if we need more than
-	 * 90% of its objects
+	 * If we got here, then the object is OK to reuse. Mark it.
 	 */
-	static const double REUSE_PERCENT = 0.9;
+	bitmap_set(reuse, pos);
+}
 
+int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
+				       struct packed_git **packfile_out,
+				       uint32_t *entries,
+				       struct bitmap **reuse_out)
+{
 	struct bitmap *result = bitmap_git->result;
-	uint32_t reuse_threshold;
-	uint32_t i, reuse_objects = 0;
+	struct bitmap *reuse;
+	struct pack_window *w_curs = NULL;
+	size_t i = 0;
+	uint32_t offset;
 
 	assert(result);
 
-	for (i = 0; i < result->word_alloc; ++i) {
-		if (result->words[i] != (eword_t)~0) {
-			reuse_objects += ewah_bit_ctz64(~result->words[i]);
-			break;
-		}
+	while (i < result->word_alloc && result->words[i] == (eword_t)~0)
+		i++;
 
-		reuse_objects += BITS_IN_EWORD;
-	}
+	/* Don't mark objects not in the packfile */
+	if (i > bitmap_git->pack->num_objects / BITS_IN_EWORD)
+		i = bitmap_git->pack->num_objects / BITS_IN_EWORD;
 
-#ifdef GIT_BITMAP_DEBUG
-	{
-		const unsigned char *sha1;
-		struct revindex_entry *entry;
+	reuse = bitmap_word_alloc(i);
+	memset(reuse->words, 0xFF, i * sizeof(eword_t));
 
-		entry = &bitmap_git->reverse_index->revindex[reuse_objects];
-		sha1 = nth_packed_object_sha1(bitmap_git->pack, entry->nr);
+	for (; i < result->word_alloc; ++i) {
+		eword_t word = result->words[i];
+		size_t pos = (i * BITS_IN_EWORD);
 
-		fprintf(stderr, "Failed to reuse at %d (%016llx)\n",
-			reuse_objects, result->words[i]);
-		fprintf(stderr, " %s\n", hash_to_hex(sha1));
+		for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
+			if ((word >> offset) == 0)
+				break;
+
+			offset += ewah_bit_ctz64(word >> offset);
+			try_partial_reuse(bitmap_git, pos + offset, reuse, &w_curs);
+		}
 	}
-#endif
 
-	if (!reuse_objects)
-		return -1;
+	unuse_pack(&w_curs);
 
-	if (reuse_objects >= bitmap_git->pack->num_objects) {
-		bitmap_git->reuse_objects = *entries = bitmap_git->pack->num_objects;
-		*up_to = -1; /* reuse the full pack */
-		*packfile = bitmap_git->pack;
-		return 0;
+	*entries = bitmap_popcount(reuse);
+	if (!*entries) {
+		bitmap_free(reuse);
+		return -1;
 	}
 
-	reuse_threshold = bitmap_popcount(bitmap_git->result) * REUSE_PERCENT;
+	/*
+	 * Drop any reused objects from the result, since they will not
+	 * need to be handled separately.
+	 */
+	bitmap_and_not(result, reuse);
+	*packfile_out = bitmap_git->pack;
+	*reuse_out = reuse;
+	return 0;
+}
 
-	if (reuse_objects < reuse_threshold)
-		return -1;
+int bitmap_walk_contains(struct bitmap_index *bitmap_git,
+			 struct bitmap *bitmap, const struct object_id *oid)
+{
+	int idx;
 
-	bitmap_git->reuse_objects = *entries = reuse_objects;
-	*up_to = bitmap_git->pack->revindex[reuse_objects].offset;
-	*packfile = bitmap_git->pack;
+	if (!bitmap)
+		return 0;
 
-	return 0;
+	idx = bitmap_position(bitmap_git, oid);
+	return idx >= 0 && bitmap_get(bitmap, idx);
 }
 
 void traverse_bitmap_commit_list(struct bitmap_index *bitmap_git,
+				 struct rev_info *revs,
 				 show_reachable_fn show_reachable)
 {
 	assert(bitmap_git->result);
 
-	show_objects_for_type(bitmap_git, bitmap_git->commits,
-		OBJ_COMMIT, show_reachable);
-	show_objects_for_type(bitmap_git, bitmap_git->trees,
-		OBJ_TREE, show_reachable);
-	show_objects_for_type(bitmap_git, bitmap_git->blobs,
-		OBJ_BLOB, show_reachable);
-	show_objects_for_type(bitmap_git, bitmap_git->tags,
-		OBJ_TAG, show_reachable);
+	show_objects_for_type(bitmap_git, OBJ_COMMIT, show_reachable);
+	if (revs->tree_objects)
+		show_objects_for_type(bitmap_git, OBJ_TREE, show_reachable);
+	if (revs->blob_objects)
+		show_objects_for_type(bitmap_git, OBJ_BLOB, show_reachable);
+	if (revs->tag_objects)
+		show_objects_for_type(bitmap_git, OBJ_TAG, show_reachable);
 
-	show_extended_objects(bitmap_git, show_reachable);
+	show_extended_objects(bitmap_git, revs, show_reachable);
 }
 
 static uint32_t count_object_type(struct bitmap_index *bitmap_git,
@@ -859,26 +1158,7 @@ static uint32_t count_object_type(struct bitmap_index *bitmap_git,
 	struct ewah_iterator it;
 	eword_t filter;
 
-	switch (type) {
-	case OBJ_COMMIT:
-		ewah_iterator_init(&it, bitmap_git->commits);
-		break;
-
-	case OBJ_TREE:
-		ewah_iterator_init(&it, bitmap_git->trees);
-		break;
-
-	case OBJ_BLOB:
-		ewah_iterator_init(&it, bitmap_git->blobs);
-		break;
-
-	case OBJ_TAG:
-		ewah_iterator_init(&it, bitmap_git->tags);
-		break;
-
-	default:
-		return 0;
-	}
+	init_type_iterator(&it, bitmap_git, type);
 
 	while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) {
 		eword_t word = objects->words[i++] & filter;
@@ -1062,8 +1342,8 @@ int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
 		struct object_entry *oe;
 
 		entry = &bitmap_git->pack->revindex[i];
-		nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr);
-		oe = packlist_find(mapping, &oid, NULL);
+		nth_packed_object_id(&oid, bitmap_git->pack, entry->nr);
+		oe = packlist_find(mapping, &oid);
 
 		if (oe)
 			reposition[i] = oe_in_pack_pos(mapping, oe) + 1;
@@ -1120,16 +1400,6 @@ void free_bitmap_index(struct bitmap_index *b)
 int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git,
 				    const struct object_id *oid)
 {
-	int pos;
-
-	if (!bitmap_git)
-		return 0; /* no bitmap loaded */
-	if (!bitmap_git->haves)
-		return 0; /* walk had no "haves" */
-
-	pos = bitmap_position_packfile(bitmap_git, oid);
-	if (pos < 0)
-		return 0;
-
-	return bitmap_get(bitmap_git->haves, pos);
+	return bitmap_git &&
+		bitmap_walk_contains(bitmap_git, bitmap_git->haves, oid);
 }
diff --git a/third_party/git/pack-bitmap.h b/third_party/git/pack-bitmap.h
index 00de3ec8e41d..1203120c4321 100644
--- a/third_party/git/pack-bitmap.h
+++ b/third_party/git/pack-bitmap.h
@@ -3,22 +3,24 @@
 
 #include "ewah/ewok.h"
 #include "khash.h"
+#include "pack.h"
 #include "pack-objects.h"
 
 struct commit;
 struct repository;
 struct rev_info;
+struct list_objects_filter_options;
+
+static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'};
 
 struct bitmap_disk_header {
-	char magic[4];
+	char magic[ARRAY_SIZE(BITMAP_IDX_SIGNATURE)];
 	uint16_t version;
 	uint16_t options;
 	uint32_t entry_count;
 	unsigned char checksum[GIT_MAX_RAWSZ];
 };
 
-static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'};
-
 #define NEEDS_BITMAP (1u<<22)
 
 enum pack_bitmap_opts {
@@ -44,15 +46,20 @@ struct bitmap_index *prepare_bitmap_git(struct repository *r);
 void count_bitmap_commit_list(struct bitmap_index *, uint32_t *commits,
 			      uint32_t *trees, uint32_t *blobs, uint32_t *tags);
 void traverse_bitmap_commit_list(struct bitmap_index *,
+				 struct rev_info *revs,
 				 show_reachable_fn show_reachable);
 void test_bitmap_walk(struct rev_info *revs);
-struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs);
+struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
+					 struct list_objects_filter_options *filter);
 int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
 				       struct packed_git **packfile,
-				       uint32_t *entries, off_t *up_to);
+				       uint32_t *entries,
+				       struct bitmap **reuse_out);
 int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
 			     kh_oid_map_t *reused_bitmaps, int show_progress);
 void free_bitmap_index(struct bitmap_index *);
+int bitmap_walk_contains(struct bitmap_index *,
+			 struct bitmap *bitmap, const struct object_id *oid);
 
 /*
  * After a traversal has been performed by prepare_bitmap_walk(), this can be
diff --git a/third_party/git/pack-check.c b/third_party/git/pack-check.c
index 2cc3603189b8..dad6d8ae7f23 100644
--- a/third_party/git/pack-check.c
+++ b/third_party/git/pack-check.c
@@ -8,10 +8,6 @@
 
 struct idx_entry {
 	off_t                offset;
-	union idx_entry_object {
-		const unsigned char *hash;
-		struct object_id *oid;
-	} oid;
 	unsigned int nr;
 };
 
@@ -67,23 +63,23 @@ static int verify_packfile(struct repository *r,
 	if (!is_pack_valid(p))
 		return error("packfile %s cannot be accessed", p->pack_name);
 
-	the_hash_algo->init_fn(&ctx);
+	r->hash_algo->init_fn(&ctx);
 	do {
 		unsigned long remaining;
 		unsigned char *in = use_pack(p, w_curs, offset, &remaining);
 		offset += remaining;
 		if (!pack_sig_ofs)
-			pack_sig_ofs = p->pack_size - the_hash_algo->rawsz;
+			pack_sig_ofs = p->pack_size - r->hash_algo->rawsz;
 		if (offset > pack_sig_ofs)
 			remaining -= (unsigned int)(offset - pack_sig_ofs);
-		the_hash_algo->update_fn(&ctx, in, remaining);
+		r->hash_algo->update_fn(&ctx, in, remaining);
 	} while (offset < pack_sig_ofs);
-	the_hash_algo->final_fn(hash, &ctx);
+	r->hash_algo->final_fn(hash, &ctx);
 	pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL);
 	if (!hasheq(hash, pack_sig))
 		err = error("%s pack checksum mismatch",
 			    p->pack_name);
-	if (!hasheq(index_base + index_size - the_hash_algo->hexsz, pack_sig))
+	if (!hasheq(index_base + index_size - r->hash_algo->hexsz, pack_sig))
 		err = error("%s pack checksum does not match its index",
 			    p->pack_name);
 	unuse_pack(w_curs);
@@ -97,9 +93,6 @@ static int verify_packfile(struct repository *r,
 	entries[nr_objects].offset = pack_sig_ofs;
 	/* first sort entries by pack offset, since unpacking them is more efficient that way */
 	for (i = 0; i < nr_objects; i++) {
-		entries[i].oid.hash = nth_packed_object_sha1(p, i);
-		if (!entries[i].oid.hash)
-			die("internal error pack-check nth-packed-object");
 		entries[i].offset = nth_packed_object_offset(p, i);
 		entries[i].nr = i;
 	}
@@ -107,11 +100,16 @@ static int verify_packfile(struct repository *r,
 
 	for (i = 0; i < nr_objects; i++) {
 		void *data;
+		struct object_id oid;
 		enum object_type type;
 		unsigned long size;
 		off_t curpos;
 		int data_valid;
 
+		if (nth_packed_object_id(&oid, p, entries[i].nr) < 0)
+			BUG("unable to get oid of object %lu from %s",
+			    (unsigned long)entries[i].nr, p->pack_name);
+
 		if (p->index_version > 1) {
 			off_t offset = entries[i].offset;
 			off_t len = entries[i+1].offset - offset;
@@ -119,7 +117,7 @@ static int verify_packfile(struct repository *r,
 			if (check_pack_crc(p, w_curs, offset, len, nr))
 				err = error("index CRC mismatch for object %s "
 					    "from %s at offset %"PRIuMAX"",
-					    oid_to_hex(entries[i].oid.oid),
+					    oid_to_hex(&oid),
 					    p->pack_name, (uintmax_t)offset);
 		}
 
@@ -142,14 +140,14 @@ static int verify_packfile(struct repository *r,
 
 		if (data_valid && !data)
 			err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
-				    oid_to_hex(entries[i].oid.oid), p->pack_name,
+				    oid_to_hex(&oid), p->pack_name,
 				    (uintmax_t)entries[i].offset);
-		else if (check_object_signature(entries[i].oid.oid, data, size, type_name(type)))
+		else if (check_object_signature(r, &oid, data, size, type_name(type)))
 			err = error("packed %s from %s is corrupt",
-				    oid_to_hex(entries[i].oid.oid), p->pack_name);
+				    oid_to_hex(&oid), p->pack_name);
 		else if (fn) {
 			int eaten = 0;
-			err |= fn(entries[i].oid.oid, type, size, data, &eaten);
+			err |= fn(&oid, type, size, data, &eaten);
 			if (eaten)
 				data = NULL;
 		}
diff --git a/third_party/git/pack-objects.c b/third_party/git/pack-objects.c
index 52560293b626..f2a433885ac8 100644
--- a/third_party/git/pack-objects.c
+++ b/third_party/git/pack-objects.c
@@ -68,8 +68,7 @@ static void rehash_objects(struct packing_data *pdata)
 }
 
 struct object_entry *packlist_find(struct packing_data *pdata,
-				   const struct object_id *oid,
-				   uint32_t *index_pos)
+				   const struct object_id *oid)
 {
 	uint32_t i;
 	int found;
@@ -79,9 +78,6 @@ struct object_entry *packlist_find(struct packing_data *pdata,
 
 	i = locate_object_entry_hash(pdata, oid, &found);
 
-	if (index_pos)
-		*index_pos = i;
-
 	if (!found)
 		return NULL;
 
@@ -123,7 +119,10 @@ void oe_map_new_pack(struct packing_data *pack)
 {
 	uint32_t i;
 
-	REALLOC_ARRAY(pack->in_pack, pack->nr_alloc);
+	if (pack->in_pack)
+		BUG("packing_data has already been converted to pack array");
+
+	ALLOC_ARRAY(pack->in_pack, pack->nr_alloc);
 
 	for (i = 0; i < pack->nr_objects; i++)
 		pack->in_pack[i] = oe_in_pack(pack, pack->objects + i);
@@ -153,8 +152,7 @@ void prepare_packing_data(struct repository *r, struct packing_data *pdata)
 }
 
 struct object_entry *packlist_alloc(struct packing_data *pdata,
-				    const unsigned char *sha1,
-				    uint32_t index_pos)
+				    const struct object_id *oid)
 {
 	struct object_entry *new_entry;
 
@@ -177,12 +175,19 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
 	new_entry = pdata->objects + pdata->nr_objects++;
 
 	memset(new_entry, 0, sizeof(*new_entry));
-	hashcpy(new_entry->idx.oid.hash, sha1);
+	oidcpy(&new_entry->idx.oid, oid);
 
 	if (pdata->index_size * 3 <= pdata->nr_objects * 4)
 		rehash_objects(pdata);
-	else
-		pdata->index[index_pos] = pdata->nr_objects;
+	else {
+		int found;
+		uint32_t pos = locate_object_entry_hash(pdata,
+							&new_entry->idx.oid,
+							&found);
+		if (found)
+			BUG("duplicate object inserted into hash");
+		pdata->index[pos] = pdata->nr_objects;
+	}
 
 	if (pdata->in_pack)
 		pdata->in_pack[pdata->nr_objects - 1] = NULL;
@@ -198,14 +203,14 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
 
 void oe_set_delta_ext(struct packing_data *pdata,
 		      struct object_entry *delta,
-		      const unsigned char *sha1)
+		      const struct object_id *oid)
 {
 	struct object_entry *base;
 
 	ALLOC_GROW(pdata->ext_bases, pdata->nr_ext + 1, pdata->alloc_ext);
 	base = &pdata->ext_bases[pdata->nr_ext++];
 	memset(base, 0, sizeof(*base));
-	hashcpy(base->idx.oid.hash, sha1);
+	oidcpy(&base->idx.oid, oid);
 
 	/* These flags mark that we are not part of the actual pack output. */
 	base->preferred_base = 1;
diff --git a/third_party/git/pack-objects.h b/third_party/git/pack-objects.h
index 857d43850b62..9d88e3e518f0 100644
--- a/third_party/git/pack-objects.h
+++ b/third_party/git/pack-objects.h
@@ -183,12 +183,10 @@ static inline void packing_data_unlock(struct packing_data *pdata)
 }
 
 struct object_entry *packlist_alloc(struct packing_data *pdata,
-				    const unsigned char *sha1,
-				    uint32_t index_pos);
+				    const struct object_id *oid);
 
 struct object_entry *packlist_find(struct packing_data *pdata,
-				   const struct object_id *oid,
-				   uint32_t *index_pos);
+				   const struct object_id *oid);
 
 static inline uint32_t pack_name_hash(const char *name)
 {
@@ -253,12 +251,21 @@ static inline void oe_set_in_pack(struct packing_data *pack,
 				  struct object_entry *e,
 				  struct packed_git *p)
 {
-	if (!p->index)
+	if (pack->in_pack_by_idx) {
+		if (p->index) {
+			e->in_pack_idx = p->index;
+			return;
+		}
+		/*
+		 * We're accessing packs by index, but this pack doesn't have
+		 * an index (e.g., because it was added since we created the
+		 * in_pack_by_idx array). Bail to oe_map_new_pack(), which
+		 * will convert us to using the full in_pack array, and then
+		 * fall through to our in_pack handling.
+		 */
 		oe_map_new_pack(pack);
-	if (pack->in_pack_by_idx)
-		e->in_pack_idx = p->index;
-	else
-		pack->in_pack[e - pack->objects] = p;
+	}
+	pack->in_pack[e - pack->objects] = p;
 }
 
 static inline struct object_entry *oe_delta(
@@ -285,7 +292,7 @@ static inline void oe_set_delta(struct packing_data *pack,
 
 void oe_set_delta_ext(struct packing_data *pack,
 		      struct object_entry *e,
-		      const unsigned char *sha1);
+		      const struct object_id *oid);
 
 static inline struct object_entry *oe_delta_child(
 		const struct packing_data *pack,
diff --git a/third_party/git/pack-write.c b/third_party/git/pack-write.c
index 29d17a9bec27..f0017beb9dd4 100644
--- a/third_party/git/pack-write.c
+++ b/third_party/git/pack-write.c
@@ -349,7 +349,7 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
 			 struct pack_idx_entry **written_list,
 			 uint32_t nr_written,
 			 struct pack_idx_option *pack_idx_opts,
-			 unsigned char sha1[])
+			 unsigned char hash[])
 {
 	const char *idx_tmp_name;
 	int basename_len = name_buffer->len;
@@ -358,18 +358,18 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
 		die_errno("unable to make temporary pack file readable");
 
 	idx_tmp_name = write_idx_file(NULL, written_list, nr_written,
-				      pack_idx_opts, sha1);
+				      pack_idx_opts, hash);
 	if (adjust_shared_perm(idx_tmp_name))
 		die_errno("unable to make temporary index file readable");
 
-	strbuf_addf(name_buffer, "%s.pack", sha1_to_hex(sha1));
+	strbuf_addf(name_buffer, "%s.pack", hash_to_hex(hash));
 
 	if (rename(pack_tmp_name, name_buffer->buf))
 		die_errno("unable to rename temporary pack file");
 
 	strbuf_setlen(name_buffer, basename_len);
 
-	strbuf_addf(name_buffer, "%s.idx", sha1_to_hex(sha1));
+	strbuf_addf(name_buffer, "%s.idx", hash_to_hex(hash));
 	if (rename(idx_tmp_name, name_buffer->buf))
 		die_errno("unable to rename temporary index file");
 
diff --git a/third_party/git/packfile.c b/third_party/git/packfile.c
index fc43a6c52c75..f4e752996dbc 100644
--- a/third_party/git/packfile.c
+++ b/third_party/git/packfile.c
@@ -6,7 +6,6 @@
 #include "mergesort.h"
 #include "packfile.h"
 #include "delta.h"
-#include "list.h"
 #include "streaming.h"
 #include "sha1-lookup.h"
 #include "commit.h"
@@ -17,14 +16,15 @@
 #include "object-store.h"
 #include "midx.h"
 #include "commit-graph.h"
+#include "promisor-remote.h"
 
 char *odb_pack_name(struct strbuf *buf,
-		    const unsigned char *sha1,
+		    const unsigned char *hash,
 		    const char *ext)
 {
 	strbuf_reset(buf);
 	strbuf_addf(buf, "%s/pack/pack-%s.%s", get_object_directory(),
-		    sha1_to_hex(sha1), ext);
+		    hash_to_hex(hash), ext);
 	return buf->buf;
 }
 
@@ -287,13 +287,6 @@ static int unuse_one_window(struct packed_git *current)
 	return 0;
 }
 
-void release_pack_memory(size_t need)
-{
-	size_t cur = pack_mapped;
-	while (need >= (cur - pack_mapped) && unuse_one_window(NULL))
-		; /* nothing */
-}
-
 void close_pack_windows(struct packed_git *p)
 {
 	while (p->windows) {
@@ -517,7 +510,6 @@ static int open_packed_git_1(struct packed_git *p)
 	struct pack_header hdr;
 	unsigned char hash[GIT_MAX_RAWSZ];
 	unsigned char *idx_hash;
-	long fd_flag;
 	ssize_t read_result;
 	const unsigned hashsz = the_hash_algo->rawsz;
 
@@ -561,16 +553,6 @@ static int open_packed_git_1(struct packed_git *p)
 	} else if (p->pack_size != st.st_size)
 		return error("packfile %s size changed", p->pack_name);
 
-	/* We leave these file descriptors open with sliding mmap;
-	 * there is no point keeping them open across exec(), though.
-	 */
-	fd_flag = fcntl(p->pack_fd, F_GETFD, 0);
-	if (fd_flag < 0)
-		return error("cannot determine file descriptor flags");
-	fd_flag |= FD_CLOEXEC;
-	if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1)
-		return error("cannot set FD_CLOEXEC");
-
 	/* Verify we recognize this pack file format. */
 	read_result = read_in_full(p->pack_fd, &hdr, sizeof(hdr));
 	if (read_result < 0)
@@ -594,9 +576,8 @@ static int open_packed_git_1(struct packed_git *p)
 			     " while index indicates %"PRIu32" objects",
 			     p->pack_name, ntohl(hdr.hdr_entries),
 			     p->num_objects);
-	if (lseek(p->pack_fd, p->pack_size - hashsz, SEEK_SET) == -1)
-		return error("end of packfile %s is unavailable", p->pack_name);
-	read_result = read_in_full(p->pack_fd, hash, hashsz);
+	read_result = pread_in_full(p->pack_fd, hash, hashsz,
+					p->pack_size - hashsz);
 	if (read_result < 0)
 		return error_errno("error reading from %s", p->pack_name);
 	if (read_result != hashsz)
@@ -710,23 +691,12 @@ void unuse_pack(struct pack_window **w_cursor)
 	}
 }
 
-static void try_to_free_pack_memory(size_t size)
-{
-	release_pack_memory(size);
-}
-
 struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
 {
-	static int have_set_try_to_free_routine;
 	struct stat st;
 	size_t alloc;
 	struct packed_git *p;
 
-	if (!have_set_try_to_free_routine) {
-		have_set_try_to_free_routine = 1;
-		set_try_to_free_routine(try_to_free_pack_memory);
-	}
-
 	/*
 	 * Make sure a corresponding .pack file exists and that
 	 * the index looks sane.
@@ -775,6 +745,9 @@ void install_packed_git(struct repository *r, struct packed_git *pack)
 
 	pack->next = r->objects->packed_git;
 	r->objects->packed_git = pack;
+
+	hashmap_entry_init(&pack->packmap_ent, strhash(pack->pack_name));
+	hashmap_add(&r->objects->pack_map, &pack->packmap_ent);
 }
 
 void (*report_garbage)(unsigned seen_bits, const char *path);
@@ -874,20 +847,18 @@ static void prepare_pack(const char *full_name, size_t full_name_len,
 
 	if (strip_suffix_mem(full_name, &base_len, ".idx") &&
 	    !(data->m && midx_contains_pack(data->m, file_name))) {
-		/* Don't reopen a pack we already have. */
-		for (p = data->r->objects->packed_git; p; p = p->next) {
-			size_t len;
-			if (strip_suffix(p->pack_name, ".pack", &len) &&
-			    len == base_len &&
-			    !memcmp(p->pack_name, full_name, len))
-				break;
-		}
+		struct hashmap_entry hent;
+		char *pack_name = xstrfmt("%.*s.pack", (int)base_len, full_name);
+		unsigned int hash = strhash(pack_name);
+		hashmap_entry_init(&hent, hash);
 
-		if (!p) {
+		/* Don't reopen a pack we already have. */
+		if (!hashmap_get(&data->r->objects->pack_map, &hent, pack_name)) {
 			p = add_packed_git(full_name, full_name_len, data->local);
 			if (p)
 				install_packed_git(data->r, p);
 		}
+		free(pack_name);
 	}
 
 	if (!report_garbage)
@@ -1033,12 +1004,14 @@ void reprepare_packed_git(struct repository *r)
 {
 	struct object_directory *odb;
 
+	obj_read_lock();
 	for (odb = r->objects->odb; odb; odb = odb->next)
 		odb_clear_loose_cache(odb);
 
 	r->objects->approximate_object_count_valid = 0;
 	r->objects->packed_git_initialized = 0;
 	prepare_packed_git(r);
+	obj_read_unlock();
 }
 
 struct packed_git *get_packed_git(struct repository *r)
@@ -1115,7 +1088,23 @@ unsigned long get_size_from_delta(struct packed_git *p,
 	do {
 		in = use_pack(p, w_curs, curpos, &stream.avail_in);
 		stream.next_in = in;
+		/*
+		 * Note: the window section returned by use_pack() must be
+		 * available throughout git_inflate()'s unlocked execution. To
+		 * ensure no other thread will modify the window in the
+		 * meantime, we rely on the packed_window.inuse_cnt. This
+		 * counter is incremented before window reading and checked
+		 * before window disposal.
+		 *
+		 * Other worrying sections could be the call to close_pack_fd(),
+		 * which can close packs even with in-use windows, and to
+		 * reprepare_packed_git(). Regarding the former, mmap doc says:
+		 * "closing the file descriptor does not unmap the region". And
+		 * for the latter, it won't re-open already available packs.
+		 */
+		obj_read_unlock();
 		st = git_inflate(&stream, Z_FINISH);
+		obj_read_lock();
 		curpos += stream.next_in - in;
 	} while ((st == Z_OK || st == Z_BUF_ERROR) &&
 		 stream.total_out < sizeof(delta_head));
@@ -1191,11 +1180,11 @@ const struct packed_git *has_packed_and_bad(struct repository *r,
 	return NULL;
 }
 
-static off_t get_delta_base(struct packed_git *p,
-				    struct pack_window **w_curs,
-				    off_t *curpos,
-				    enum object_type type,
-				    off_t delta_obj_offset)
+off_t get_delta_base(struct packed_git *p,
+		     struct pack_window **w_curs,
+		     off_t *curpos,
+		     enum object_type type,
+		     off_t delta_obj_offset)
 {
 	unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL);
 	off_t base_offset;
@@ -1236,30 +1225,32 @@ static off_t get_delta_base(struct packed_git *p,
  * the final object lookup), but more expensive for OFS deltas (we
  * have to load the revidx to convert the offset back into a sha1).
  */
-static const unsigned char *get_delta_base_sha1(struct packed_git *p,
-						struct pack_window **w_curs,
-						off_t curpos,
-						enum object_type type,
-						off_t delta_obj_offset)
+static int get_delta_base_oid(struct packed_git *p,
+			      struct pack_window **w_curs,
+			      off_t curpos,
+			      struct object_id *oid,
+			      enum object_type type,
+			      off_t delta_obj_offset)
 {
 	if (type == OBJ_REF_DELTA) {
 		unsigned char *base = use_pack(p, w_curs, curpos, NULL);
-		return base;
+		oidread(oid, base);
+		return 0;
 	} else if (type == OBJ_OFS_DELTA) {
 		struct revindex_entry *revidx;
 		off_t base_offset = get_delta_base(p, w_curs, &curpos,
 						   type, delta_obj_offset);
 
 		if (!base_offset)
-			return NULL;
+			return -1;
 
 		revidx = find_pack_revindex(p, base_offset);
 		if (!revidx)
-			return NULL;
+			return -1;
 
-		return nth_packed_object_sha1(p, revidx->nr);
+		return nth_packed_object_id(oid, p, revidx->nr);
 	} else
-		return NULL;
+		return -1;
 }
 
 static int retry_bad_packed_offset(struct repository *r,
@@ -1272,7 +1263,7 @@ static int retry_bad_packed_offset(struct repository *r,
 	revidx = find_pack_revindex(p, obj_offset);
 	if (!revidx)
 		return OBJ_BAD;
-	nth_packed_object_oid(&oid, p, revidx->nr);
+	nth_packed_object_id(&oid, p, revidx->nr);
 	mark_bad_packed_object(p, oid.hash);
 	type = oid_object_info(r, &oid, NULL);
 	if (type <= OBJ_NONE)
@@ -1361,7 +1352,7 @@ struct delta_base_cache_key {
 };
 
 struct delta_base_cache_entry {
-	struct hashmap hash;
+	struct hashmap_entry ent;
 	struct delta_base_cache_key key;
 	struct list_head lru;
 	void *data;
@@ -1381,7 +1372,7 @@ static unsigned int pack_entry_hash(struct packed_git *p, off_t base_offset)
 static struct delta_base_cache_entry *
 get_delta_base_cache_entry(struct packed_git *p, off_t base_offset)
 {
-	struct hashmap_entry entry;
+	struct hashmap_entry entry, *e;
 	struct delta_base_cache_key key;
 
 	if (!delta_base_cache.cmpfn)
@@ -1390,7 +1381,8 @@ get_delta_base_cache_entry(struct packed_git *p, off_t base_offset)
 	hashmap_entry_init(&entry, pack_entry_hash(p, base_offset));
 	key.p = p;
 	key.base_offset = base_offset;
-	return hashmap_get(&delta_base_cache, &entry, &key);
+	e = hashmap_get(&delta_base_cache, &entry, &key);
+	return e ? container_of(e, struct delta_base_cache_entry, ent) : NULL;
 }
 
 static int delta_base_cache_key_eq(const struct delta_base_cache_key *a,
@@ -1400,11 +1392,16 @@ static int delta_base_cache_key_eq(const struct delta_base_cache_key *a,
 }
 
 static int delta_base_cache_hash_cmp(const void *unused_cmp_data,
-				     const void *va, const void *vb,
+				     const struct hashmap_entry *va,
+				     const struct hashmap_entry *vb,
 				     const void *vkey)
 {
-	const struct delta_base_cache_entry *a = va, *b = vb;
+	const struct delta_base_cache_entry *a, *b;
 	const struct delta_base_cache_key *key = vkey;
+
+	a = container_of(va, const struct delta_base_cache_entry, ent);
+	b = container_of(vb, const struct delta_base_cache_entry, ent);
+
 	if (key)
 		return !delta_base_cache_key_eq(&a->key, key);
 	else
@@ -1423,7 +1420,7 @@ static int in_delta_base_cache(struct packed_git *p, off_t base_offset)
  */
 static void detach_delta_base_cache_entry(struct delta_base_cache_entry *ent)
 {
-	hashmap_remove(&delta_base_cache, ent, &ent->key);
+	hashmap_remove(&delta_base_cache, &ent->ent, &ent->key);
 	list_del(&ent->lru);
 	delta_base_cached -= ent->size;
 	free(ent);
@@ -1468,6 +1465,14 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
 	struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent));
 	struct list_head *lru, *tmp;
 
+	/*
+	 * Check required to avoid redundant entries when more than one thread
+	 * is unpacking the same object, in unpack_entry() (since its phases I
+	 * and III might run concurrently across multiple threads).
+	 */
+	if (in_delta_base_cache(p, base_offset))
+		return;
+
 	delta_base_cached += base_size;
 
 	list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
@@ -1487,8 +1492,8 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
 
 	if (!delta_base_cache.cmpfn)
 		hashmap_init(&delta_base_cache, delta_base_cache_hash_cmp, NULL, 0);
-	hashmap_entry_init(ent, pack_entry_hash(p, base_offset));
-	hashmap_add(&delta_base_cache, ent);
+	hashmap_entry_init(&ent->ent, pack_entry_hash(p, base_offset));
+	hashmap_add(&delta_base_cache, &ent->ent);
 }
 
 int packed_object_info(struct repository *r, struct packed_git *p,
@@ -1553,20 +1558,16 @@ int packed_object_info(struct repository *r, struct packed_git *p,
 		}
 	}
 
-	if (oi->delta_base_sha1) {
+	if (oi->delta_base_oid) {
 		if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
-			const unsigned char *base;
-
-			base = get_delta_base_sha1(p, &w_curs, curpos,
-						   type, obj_offset);
-			if (!base) {
+			if (get_delta_base_oid(p, &w_curs, curpos,
+					       oi->delta_base_oid,
+					       type, obj_offset) < 0) {
 				type = OBJ_BAD;
 				goto out;
 			}
-
-			hashcpy(oi->delta_base_sha1, base);
 		} else
-			hashclr(oi->delta_base_sha1);
+			oidclr(oi->delta_base_oid);
 	}
 
 	oi->whence = in_delta_base_cache(p, obj_offset) ? OI_DBCACHED :
@@ -1597,7 +1598,15 @@ static void *unpack_compressed_entry(struct packed_git *p,
 	do {
 		in = use_pack(p, w_curs, curpos, &stream.avail_in);
 		stream.next_in = in;
+		/*
+		 * Note: we must ensure the window section returned by
+		 * use_pack() will be available throughout git_inflate()'s
+		 * unlocked execution. Please refer to the comment at
+		 * get_size_from_delta() to see how this is done.
+		 */
+		obj_read_unlock();
 		st = git_inflate(&stream, Z_FINISH);
+		obj_read_lock();
 		if (!stream.avail_out)
 			break; /* the payload is larger than it should be */
 		curpos += stream.next_in - in;
@@ -1682,7 +1691,7 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
 			off_t len = revidx[1].offset - obj_offset;
 			if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
 				struct object_id oid;
-				nth_packed_object_oid(&oid, p, revidx->nr);
+				nth_packed_object_id(&oid, p, revidx->nr);
 				error("bad packed object CRC for %s",
 				      oid_to_hex(&oid));
 				mark_bad_packed_object(p, oid.hash);
@@ -1771,7 +1780,7 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
 			struct object_id base_oid;
 			revidx = find_pack_revindex(p, obj_offset);
 			if (revidx) {
-				nth_packed_object_oid(&base_oid, p, revidx->nr);
+				nth_packed_object_id(&base_oid, p, revidx->nr);
 				error("failed to read delta base object %s"
 				      " at offset %"PRIuMAX" from %s",
 				      oid_to_hex(&base_oid), (uintmax_t)obj_offset,
@@ -1858,36 +1867,27 @@ int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32
 			    index_lookup, index_lookup_width, result);
 }
 
-const unsigned char *nth_packed_object_sha1(struct packed_git *p,
-					    uint32_t n)
+int nth_packed_object_id(struct object_id *oid,
+			 struct packed_git *p,
+			 uint32_t n)
 {
 	const unsigned char *index = p->index_data;
 	const unsigned int hashsz = the_hash_algo->rawsz;
 	if (!index) {
 		if (open_pack_index(p))
-			return NULL;
+			return -1;
 		index = p->index_data;
 	}
 	if (n >= p->num_objects)
-		return NULL;
+		return -1;
 	index += 4 * 256;
 	if (p->index_version == 1) {
-		return index + (hashsz + 4) * n + 4;
+		oidread(oid, index + (hashsz + 4) * n + 4);
 	} else {
 		index += 8;
-		return index + hashsz * n;
+		oidread(oid, index + hashsz * n);
 	}
-}
-
-const struct object_id *nth_packed_object_oid(struct object_id *oid,
-					      struct packed_git *p,
-					      uint32_t n)
-{
-	const unsigned char *hash = nth_packed_object_sha1(p, n);
-	if (!hash)
-		return NULL;
-	hashcpy(oid->hash, hash);
-	return oid;
+	return 0;
 }
 
 void check_pack_index_ptr(const struct packed_git *p, const void *vptr)
@@ -2066,7 +2066,7 @@ int for_each_object_in_pack(struct packed_git *p,
 		else
 			pos = i;
 
-		if (!nth_packed_object_oid(&oid, p, pos))
+		if (nth_packed_object_id(&oid, p, pos) < 0)
 			return error("unable to get sha1 of object %u in %s",
 				     pos, p->pack_name);
 
@@ -2139,7 +2139,7 @@ static int add_promisor_object(const struct object_id *oid,
 			oidset_insert(set, &parents->item->object.oid);
 	} else if (obj->type == OBJ_TAG) {
 		struct tag *tag = (struct tag *) obj;
-		oidset_insert(set, &tag->tagged->oid);
+		oidset_insert(set, get_tagged_oid(tag));
 	}
 	return 0;
 }
@@ -2150,7 +2150,7 @@ int is_promisor_object(const struct object_id *oid)
 	static int promisor_objects_prepared;
 
 	if (!promisor_objects_prepared) {
-		if (repository_format_partial_clone) {
+		if (has_promisor_remote()) {
 			for_each_packed_object(add_promisor_object,
 					       &promisor_objects,
 					       FOR_EACH_OBJECT_PROMISOR_ONLY);
diff --git a/third_party/git/packfile.h b/third_party/git/packfile.h
index 3e98910bdd19..240aa73b95a6 100644
--- a/third_party/git/packfile.h
+++ b/third_party/git/packfile.h
@@ -100,7 +100,7 @@ struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
  * Does not unlink if 'force_delete' is false and the pack-file is
  * marked as ".keep".
  */
-extern void unlink_pack_path(const char *pack_name, int force_delete);
+void unlink_pack_path(const char *pack_name, int force_delete);
 
 /*
  * Make sure that a pointer access into an mmap'd index file is within bounds,
@@ -121,18 +121,11 @@ void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
 int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32_t *result);
 
 /*
- * Return the SHA-1 of the nth object within the specified packfile.
- * Open the index if it is not already open.  The return value points
- * at the SHA-1 within the mmapped index.  Return NULL if there is an
- * error.
+ * Write the oid of the nth object within the specified packfile into the first
+ * parameter. Open the index if it is not already open.  Returns 0 on success,
+ * negative otherwise.
  */
-const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
-/*
- * Like nth_packed_object_sha1, but write the data into the object specified by
- * the the first argument.  Returns the first argument on success, and NULL on
- * error.
- */
-const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
+int nth_packed_object_id(struct object_id *, struct packed_git *, uint32_t n);
 
 /*
  * Return the offset of the nth object within the specified packfile.
@@ -151,6 +144,9 @@ void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object
 unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
 unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
 int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
+off_t get_delta_base(struct packed_git *p, struct pack_window **w_curs,
+		     off_t *curpos, enum object_type type,
+		     off_t delta_obj_offset);
 
 void release_pack_memory(size_t);
 
diff --git a/third_party/git/parse-options-cb.c b/third_party/git/parse-options-cb.c
index 1240a8514e04..a28b55be48dc 100644
--- a/third_party/git/parse-options-cb.c
+++ b/third_party/git/parse-options-cb.c
@@ -159,39 +159,32 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
-struct option *parse_options_dup(const struct option *o)
+static size_t parse_options_count(const struct option *opt)
 {
-	struct option *opts;
-	int nr = 0;
+	size_t n = 0;
 
-	while (o && o->type != OPTION_END) {
-		nr++;
-		o++;
-	}
+	for (; opt && opt->type != OPTION_END; opt++)
+		n++;
+	return n;
+}
 
-	ALLOC_ARRAY(opts, nr + 1);
-	memcpy(opts, o - nr, sizeof(*o) * nr);
-	memset(opts + nr, 0, sizeof(*opts));
-	opts[nr].type = OPTION_END;
-	return opts;
+struct option *parse_options_dup(const struct option *o)
+{
+	struct option no_options[] = { OPT_END() };
+
+	return parse_options_concat(o, no_options);
 }
 
-struct option *parse_options_concat(struct option *a, struct option *b)
+struct option *parse_options_concat(const struct option *a,
+				    const struct option *b)
 {
 	struct option *ret;
-	size_t i, a_len = 0, b_len = 0;
-
-	for (i = 0; a[i].type != OPTION_END; i++)
-		a_len++;
-	for (i = 0; b[i].type != OPTION_END; i++)
-		b_len++;
+	size_t a_len = parse_options_count(a);
+	size_t b_len = parse_options_count(b);
 
 	ALLOC_ARRAY(ret, st_add3(a_len, b_len, 1));
-	for (i = 0; i < a_len; i++)
-		ret[i] = a[i];
-	for (i = 0; i < b_len; i++)
-		ret[a_len + i] = b[i];
-	ret[a_len + b_len] = b[b_len]; /* final OPTION_END */
+	COPY_ARRAY(ret, a, a_len);
+	COPY_ARRAY(ret + a_len, b, b_len + 1); /* + 1 for final OPTION_END */
 
 	return ret;
 }
diff --git a/third_party/git/parse-options.c b/third_party/git/parse-options.c
index 87b26a1d922e..63d6bab60c0e 100644
--- a/third_party/git/parse-options.c
+++ b/third_party/git/parse-options.c
@@ -61,7 +61,7 @@ static enum parse_opt_result opt_command_mode_error(
 	 */
 	for (that = all_opts; that->type != OPTION_END; that++) {
 		if (that == opt ||
-		    that->type != OPTION_CMDMODE ||
+		    !(that->flags & PARSE_OPT_CMDMODE) ||
 		    that->value != opt->value ||
 		    that->defval != *(int *)opt->value)
 			continue;
@@ -95,6 +95,14 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
 	if (!(flags & OPT_SHORT) && p->opt && (opt->flags & PARSE_OPT_NOARG))
 		return error(_("%s takes no value"), optname(opt, flags));
 
+	/*
+	 * Giving the same mode option twice, although unnecessary,
+	 * is not a grave error, so let it pass.
+	 */
+	if ((opt->flags & PARSE_OPT_CMDMODE) &&
+	    *(int *)opt->value && *(int *)opt->value != opt->defval)
+		return opt_command_mode_error(opt, all_opts, flags);
+
 	switch (opt->type) {
 	case OPTION_LOWLEVEL_CALLBACK:
 		return opt->ll_callback(p, opt, NULL, unset);
@@ -130,16 +138,6 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
 		*(int *)opt->value = unset ? 0 : opt->defval;
 		return 0;
 
-	case OPTION_CMDMODE:
-		/*
-		 * Giving the same mode option twice, although is unnecessary,
-		 * is not a grave error, so let it pass.
-		 */
-		if (*(int *)opt->value && *(int *)opt->value != opt->defval)
-			return opt_command_mode_error(opt, all_opts, flags);
-		*(int *)opt->value = opt->defval;
-		return 0;
-
 	case OPTION_STRING:
 		if (unset)
 			*(const char **)opt->value = NULL;
@@ -357,8 +355,7 @@ is_abbreviated:
 			}
 			/* negated? */
 			if (!starts_with(arg, "no-")) {
-				if (starts_with(long_name, "no-")) {
-					long_name += 3;
+				if (skip_prefix(long_name, "no-", &long_name)) {
 					opt_flags |= OPT_UNSET;
 					goto again;
 				}
@@ -420,7 +417,7 @@ static void check_typos(const char *arg, const struct option *options)
 		return;
 
 	if (starts_with(arg, "no-")) {
-		error(_("did you mean `--%s` (with two dashes ?)"), arg);
+		error(_("did you mean `--%s` (with two dashes)?"), arg);
 		exit(129);
 	}
 
@@ -428,7 +425,7 @@ static void check_typos(const char *arg, const struct option *options)
 		if (!options->long_name)
 			continue;
 		if (starts_with(options->long_name, arg)) {
-			error(_("did you mean `--%s` (with two dashes ?)"), arg);
+			error(_("did you mean `--%s` (with two dashes)?"), arg);
 			exit(129);
 		}
 	}
@@ -623,7 +620,7 @@ static int show_gitcomp(const struct option *opts)
  * Scan and may produce a new option[] array, which should be used
  * instead of the original 'options'.
  *
- * Right now this is only used to preprocess and substitue
+ * Right now this is only used to preprocess and substitute
  * OPTION_ALIAS.
  */
 static struct option *preprocess_options(struct parse_opt_ctx_t *ctx,
@@ -780,7 +777,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 			continue;
 		}
 
-		if (!arg[2]) { /* "--" */
+		if (!arg[2] /* "--" */ ||
+		    !strcmp(arg + 2, "end-of-options")) {
 			if (!(ctx->flags & PARSE_OPT_KEEP_DASHDASH)) {
 				ctx->argc--;
 				ctx->argv++;
diff --git a/third_party/git/parse-options.h b/third_party/git/parse-options.h
index a4bd40bb6acf..fece5ba628e5 100644
--- a/third_party/git/parse-options.h
+++ b/third_party/git/parse-options.h
@@ -1,6 +1,10 @@
 #ifndef PARSE_OPTIONS_H
 #define PARSE_OPTIONS_H
 
+/**
+ * Refer to Documentation/technical/api-parse-options.txt for the API doc.
+ */
+
 enum parse_opt_type {
 	/* special types */
 	OPTION_END,
@@ -14,7 +18,6 @@ enum parse_opt_type {
 	OPTION_BITOP,
 	OPTION_COUNTUP,
 	OPTION_SET_INT,
-	OPTION_CMDMODE,
 	/* options with arguments (usually) */
 	OPTION_STRING,
 	OPTION_INTEGER,
@@ -43,7 +46,17 @@ enum parse_opt_option_flags {
 	PARSE_OPT_LITERAL_ARGHELP = 64,
 	PARSE_OPT_SHELL_EVAL = 256,
 	PARSE_OPT_NOCOMPLETE = 512,
-	PARSE_OPT_COMP_ARG = 1024
+	PARSE_OPT_COMP_ARG = 1024,
+	PARSE_OPT_CMDMODE = 2048
+};
+
+enum parse_opt_result {
+	PARSE_OPT_COMPLETE = -3,
+	PARSE_OPT_HELP = -2,
+	PARSE_OPT_ERROR = -1,	/* must be the same as error() */
+	PARSE_OPT_DONE = 0,	/* fixed so that "return 0" works */
+	PARSE_OPT_NON_OPTION,
+	PARSE_OPT_UNKNOWN
 };
 
 struct option;
@@ -155,8 +168,8 @@ struct option {
 #define OPT_BOOL(s, l, v, h)        OPT_BOOL_F(s, l, v, h, 0)
 #define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \
 				      (h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1}
-#define OPT_CMDMODE(s, l, v, h, i)  { OPTION_CMDMODE, (s), (l), (v), NULL, \
-				      (h), PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) }
+#define OPT_CMDMODE(s, l, v, h, i)  { OPTION_SET_INT, (s), (l), (v), NULL, \
+				      (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) }
 #define OPT_INTEGER(s, l, v, h)     OPT_INTEGER_F(s, l, v, h, 0)
 #define OPT_MAGNITUDE(s, l, v, h)   { OPTION_MAGNITUDE, (s), (l), (v), \
 				      N_("n"), (h), PARSE_OPT_NONEG }
@@ -241,15 +254,6 @@ const char *optname(const struct option *opt, int flags);
 
 /*----- incremental advanced APIs -----*/
 
-enum parse_opt_result {
-	PARSE_OPT_COMPLETE = -3,
-	PARSE_OPT_HELP = -2,
-	PARSE_OPT_ERROR = -1,	/* must be the same as error() */
-	PARSE_OPT_DONE = 0,	/* fixed so that "return 0" works */
-	PARSE_OPT_NON_OPTION,
-	PARSE_OPT_UNKNOWN
-};
-
 /*
  * It's okay for the caller to consume argv/argc in the usual way.
  * Other fields of that structure are private to parse-options and should not
@@ -277,7 +281,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 int parse_options_end(struct parse_opt_ctx_t *ctx);
 
 struct option *parse_options_dup(const struct option *a);
-struct option *parse_options_concat(struct option *a, struct option *b);
+struct option *parse_options_concat(const struct option *a, const struct option *b);
 
 /*----- some often used options -----*/
 int parse_opt_abbrev_cb(const struct option *, const char *, int);
@@ -330,5 +334,7 @@ int parse_opt_passthru_argv(const struct option *, const char *, int);
 #define OPT_WITH(v, h) _OPT_CONTAINS_OR_WITH("with", v, h, PARSE_OPT_HIDDEN | PARSE_OPT_NONEG)
 #define OPT_WITHOUT(v, h) _OPT_CONTAINS_OR_WITH("without", v, h, PARSE_OPT_HIDDEN | PARSE_OPT_NONEG)
 #define OPT_CLEANUP(v) OPT_STRING(0, "cleanup", v, N_("mode"), N_("how to strip spaces and #comments from message"))
+#define OPT_PATHSPEC_FROM_FILE(v) OPT_FILENAME(0, "pathspec-from-file", v, N_("read pathspec from file"))
+#define OPT_PATHSPEC_FILE_NUL(v)  OPT_BOOL(0, "pathspec-file-nul", v, N_("with --pathspec-from-file, pathspec elements are separated with NUL character"))
 
 #endif
diff --git a/third_party/git/patch-ids.c b/third_party/git/patch-ids.c
index e8c150d0c92a..12aa6d494b4e 100644
--- a/third_party/git/patch-ids.c
+++ b/third_party/git/patch-ids.c
@@ -36,14 +36,16 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
  * any significance; only that it is non-zero matters.
  */
 static int patch_id_neq(const void *cmpfn_data,
-			const void *entry,
-			const void *entry_or_key,
+			const struct hashmap_entry *eptr,
+			const struct hashmap_entry *entry_or_key,
 			const void *unused_keydata)
 {
 	/* NEEDSWORK: const correctness? */
 	struct diff_options *opt = (void *)cmpfn_data;
-	struct patch_id *a = (void *)entry;
-	struct patch_id *b = (void *)entry_or_key;
+	struct patch_id *a, *b;
+
+	a = container_of(eptr, struct patch_id, ent);
+	b = container_of(entry_or_key, struct patch_id, ent);
 
 	if (is_null_oid(&a->patch_id) &&
 	    commit_patch_id(a->commit, opt, &a->patch_id, 0, 0))
@@ -69,7 +71,7 @@ int init_patch_ids(struct repository *r, struct patch_ids *ids)
 
 int free_patch_ids(struct patch_ids *ids)
 {
-	hashmap_free(&ids->patches, 1);
+	hashmap_free_entries(&ids->patches, struct patch_id, ent);
 	return 0;
 }
 
@@ -83,7 +85,7 @@ static int init_patch_id_entry(struct patch_id *patch,
 	if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))
 		return -1;
 
-	hashmap_entry_init(patch, oidhash(&header_only_patch_id));
+	hashmap_entry_init(&patch->ent, oidhash(&header_only_patch_id));
 	return 0;
 }
 
@@ -99,7 +101,7 @@ struct patch_id *has_commit_patch_id(struct commit *commit,
 	if (init_patch_id_entry(&patch, commit, ids))
 		return NULL;
 
-	return hashmap_get(&ids->patches, &patch, NULL);
+	return hashmap_get_entry(&ids->patches, &patch, ent, NULL);
 }
 
 struct patch_id *add_commit_patch_id(struct commit *commit,
@@ -116,6 +118,6 @@ struct patch_id *add_commit_patch_id(struct commit *commit,
 		return NULL;
 	}
 
-	hashmap_add(&ids->patches, key);
+	hashmap_add(&ids->patches, &key->ent);
 	return key;
 }
diff --git a/third_party/git/path.c b/third_party/git/path.c
index 25e97b8c3f76..88cf59300738 100644
--- a/third_party/git/path.c
+++ b/third_party/git/path.c
@@ -11,6 +11,7 @@
 #include "path.h"
 #include "packfile.h"
 #include "object-store.h"
+#include "lockfile.h"
 
 static int get_st_mode_bits(const char *path, int *mode)
 {
@@ -101,36 +102,36 @@ struct common_dir {
 	/* Not considered garbage for report_linked_checkout_garbage */
 	unsigned ignore_garbage:1;
 	unsigned is_dir:1;
-	/* Not common even though its parent is */
-	unsigned exclude:1;
-	const char *dirname;
+	/* Belongs to the common dir, though it may contain paths that don't */
+	unsigned is_common:1;
+	const char *path;
 };
 
 static struct common_dir common_list[] = {
-	{ 0, 1, 0, "branches" },
-	{ 0, 1, 0, "common" },
-	{ 0, 1, 0, "hooks" },
-	{ 0, 1, 0, "info" },
-	{ 0, 0, 1, "info/sparse-checkout" },
-	{ 1, 1, 0, "logs" },
-	{ 1, 1, 1, "logs/HEAD" },
-	{ 0, 1, 1, "logs/refs/bisect" },
-	{ 0, 1, 1, "logs/refs/rewritten" },
-	{ 0, 1, 1, "logs/refs/worktree" },
-	{ 0, 1, 0, "lost-found" },
-	{ 0, 1, 0, "objects" },
-	{ 0, 1, 0, "refs" },
-	{ 0, 1, 1, "refs/bisect" },
-	{ 0, 1, 1, "refs/rewritten" },
-	{ 0, 1, 1, "refs/worktree" },
-	{ 0, 1, 0, "remotes" },
-	{ 0, 1, 0, "worktrees" },
-	{ 0, 1, 0, "rr-cache" },
-	{ 0, 1, 0, "svn" },
-	{ 0, 0, 0, "config" },
-	{ 1, 0, 0, "gc.pid" },
-	{ 0, 0, 0, "packed-refs" },
-	{ 0, 0, 0, "shallow" },
+	{ 0, 1, 1, "branches" },
+	{ 0, 1, 1, "common" },
+	{ 0, 1, 1, "hooks" },
+	{ 0, 1, 1, "info" },
+	{ 0, 0, 0, "info/sparse-checkout" },
+	{ 1, 1, 1, "logs" },
+	{ 1, 0, 0, "logs/HEAD" },
+	{ 0, 1, 0, "logs/refs/bisect" },
+	{ 0, 1, 0, "logs/refs/rewritten" },
+	{ 0, 1, 0, "logs/refs/worktree" },
+	{ 0, 1, 1, "lost-found" },
+	{ 0, 1, 1, "objects" },
+	{ 0, 1, 1, "refs" },
+	{ 0, 1, 0, "refs/bisect" },
+	{ 0, 1, 0, "refs/rewritten" },
+	{ 0, 1, 0, "refs/worktree" },
+	{ 0, 1, 1, "remotes" },
+	{ 0, 1, 1, "worktrees" },
+	{ 0, 1, 1, "rr-cache" },
+	{ 0, 1, 1, "svn" },
+	{ 0, 0, 1, "config" },
+	{ 1, 0, 1, "gc.pid" },
+	{ 0, 0, 1, "packed-refs" },
+	{ 0, 0, 1, "shallow" },
 	{ 0, 0, 0, NULL }
 };
 
@@ -236,30 +237,41 @@ static void *add_to_trie(struct trie *root, const char *key, void *value)
 	return old;
 }
 
-typedef int (*match_fn)(const char *unmatched, void *data, void *baton);
+typedef int (*match_fn)(const char *unmatched, void *value, void *baton);
 
 /*
  * Search a trie for some key.  Find the longest /-or-\0-terminated
- * prefix of the key for which the trie contains a value.  Call fn
- * with the unmatched portion of the key and the found value, and
- * return its return value.  If there is no such prefix, return -1.
+ * prefix of the key for which the trie contains a value.  If there is
+ * no such prefix, return -1.  Otherwise call fn with the unmatched
+ * portion of the key and the found value.  If fn returns 0 or
+ * positive, then return its return value.  If fn returns negative,
+ * then call fn with the next-longest /-terminated prefix of the key
+ * (i.e. a parent directory) for which the trie contains a value, and
+ * handle its return value the same way.  If there is no shorter
+ * /-terminated prefix with a value left, then return the negative
+ * return value of the most recent fn invocation.
  *
  * The key is partially normalized: consecutive slashes are skipped.
  *
- * For example, consider the trie containing only [refs,
- * refs/worktree] (both with values).
- *
- * | key             | unmatched  | val from node | return value |
- * |-----------------|------------|---------------|--------------|
- * | a               | not called | n/a           | -1           |
- * | refs            | \0         | refs          | as per fn    |
- * | refs/           | /          | refs          | as per fn    |
- * | refs/w          | /w         | refs          | as per fn    |
- * | refs/worktree   | \0         | refs/worktree | as per fn    |
- * | refs/worktree/  | /          | refs/worktree | as per fn    |
- * | refs/worktree/a | /a         | refs/worktree | as per fn    |
- * |-----------------|------------|---------------|--------------|
+ * For example, consider the trie containing only [logs,
+ * logs/refs/bisect], both with values, but not logs/refs.
  *
+ * | key                | unmatched      | prefix to node   | return value |
+ * |--------------------|----------------|------------------|--------------|
+ * | a                  | not called     | n/a              | -1           |
+ * | logstore           | not called     | n/a              | -1           |
+ * | logs               | \0             | logs             | as per fn    |
+ * | logs/              | /              | logs             | as per fn    |
+ * | logs/refs          | /refs          | logs             | as per fn    |
+ * | logs/refs/         | /refs/         | logs             | as per fn    |
+ * | logs/refs/b        | /refs/b        | logs             | as per fn    |
+ * | logs/refs/bisected | /refs/bisected | logs             | as per fn    |
+ * | logs/refs/bisect   | \0             | logs/refs/bisect | as per fn    |
+ * | logs/refs/bisect/  | /              | logs/refs/bisect | as per fn    |
+ * | logs/refs/bisect/a | /a             | logs/refs/bisect | as per fn    |
+ * | (If fn in the previous line returns -1, then fn is called once more:) |
+ * | logs/refs/bisect/a | /refs/bisect/a | logs             | as per fn    |
+ * |--------------------|----------------|------------------|--------------|
  */
 static int trie_find(struct trie *root, const char *key, match_fn fn,
 		     void *baton)
@@ -288,9 +300,13 @@ static int trie_find(struct trie *root, const char *key, match_fn fn,
 
 	/* Matched the entire compressed section */
 	key += i;
-	if (!*key)
+	if (!*key) {
 		/* End of key */
-		return fn(key, root->value, baton);
+		if (root->value)
+			return fn(key, root->value, baton);
+		else
+			return -1;
+	}
 
 	/* Partial path normalization: skip consecutive slashes */
 	while (key[0] == '/' && key[1] == '/')
@@ -320,8 +336,8 @@ static void init_common_trie(void)
 	if (common_trie_done_setup)
 		return;
 
-	for (p = common_list; p->dirname; p++)
-		add_to_trie(&common_trie, p->dirname, p);
+	for (p = common_list; p->path; p++)
+		add_to_trie(&common_trie, p->path, p);
 
 	common_trie_done_setup = 1;
 }
@@ -334,14 +350,11 @@ static int check_common(const char *unmatched, void *value, void *baton)
 {
 	struct common_dir *dir = value;
 
-	if (!dir)
-		return 0;
-
 	if (dir->is_dir && (unmatched[0] == 0 || unmatched[0] == '/'))
-		return !dir->exclude;
+		return dir->is_common;
 
 	if (!dir->is_dir && unmatched[0] == 0)
-		return !dir->exclude;
+		return dir->is_common;
 
 	return 0;
 }
@@ -350,9 +363,14 @@ static void update_common_dir(struct strbuf *buf, int git_dir_len,
 			      const char *common_dir)
 {
 	char *base = buf->buf + git_dir_len;
+	int has_lock_suffix = strbuf_strip_suffix(buf, LOCK_SUFFIX);
+
 	init_common_trie();
 	if (trie_find(&common_trie, base, check_common, NULL) > 0)
 		replace_dir(buf, git_dir_len, common_dir);
+
+	if (has_lock_suffix)
+		strbuf_addstr(buf, LOCK_SUFFIX);
 }
 
 void report_linked_checkout_garbage(void)
@@ -365,8 +383,8 @@ void report_linked_checkout_garbage(void)
 		return;
 	strbuf_addf(&sb, "%s/", get_git_dir());
 	len = sb.len;
-	for (p = common_list; p->dirname; p++) {
-		const char *path = p->dirname;
+	for (p = common_list; p->path; p++) {
+		const char *path = p->path;
 		if (p->ignore_garbage)
 			continue;
 		strbuf_setlen(&sb, len);
@@ -1059,6 +1077,8 @@ const char *remove_leading_path(const char *in, const char *prefix)
 
 /*
  * It is okay if dst == src, but they should not overlap otherwise.
+ * The "dst" buffer must be at least as long as "src"; normalizing may shrink
+ * the size of the path, but will never grow it.
  *
  * Performs the following normalizations on src, storing the result in dst:
  * - Ensures that components are separated by '/' (Windows only)
@@ -1221,31 +1241,52 @@ static inline int chomp_trailing_dir_sep(const char *path, int len)
 }
 
 /*
- * If path ends with suffix (complete path components), returns the
- * part before suffix (sans trailing directory separators).
- * Otherwise returns NULL.
+ * If path ends with suffix (complete path components), returns the offset of
+ * the last character in the path before the suffix (sans trailing directory
+ * separators), and -1 otherwise.
  */
-char *strip_path_suffix(const char *path, const char *suffix)
+static ssize_t stripped_path_suffix_offset(const char *path, const char *suffix)
 {
 	int path_len = strlen(path), suffix_len = strlen(suffix);
 
 	while (suffix_len) {
 		if (!path_len)
-			return NULL;
+			return -1;
 
 		if (is_dir_sep(path[path_len - 1])) {
 			if (!is_dir_sep(suffix[suffix_len - 1]))
-				return NULL;
+				return -1;
 			path_len = chomp_trailing_dir_sep(path, path_len);
 			suffix_len = chomp_trailing_dir_sep(suffix, suffix_len);
 		}
 		else if (path[--path_len] != suffix[--suffix_len])
-			return NULL;
+			return -1;
 	}
 
 	if (path_len && !is_dir_sep(path[path_len - 1]))
-		return NULL;
-	return xstrndup(path, chomp_trailing_dir_sep(path, path_len));
+		return -1;
+	return chomp_trailing_dir_sep(path, path_len);
+}
+
+/*
+ * Returns true if the path ends with components, considering only complete path
+ * components, and false otherwise.
+ */
+int ends_with_path_components(const char *path, const char *components)
+{
+	return stripped_path_suffix_offset(path, components) != -1;
+}
+
+/*
+ * If path ends with suffix (complete path components), returns the
+ * part before suffix (sans trailing directory separators).
+ * Otherwise returns NULL.
+ */
+char *strip_path_suffix(const char *path, const char *suffix)
+{
+	ssize_t offset = stripped_path_suffix_offset(path, suffix);
+
+	return offset == -1 ? NULL : xstrndup(path, offset);
 }
 
 int daemon_avoid_alias(const char *p)
@@ -1295,37 +1336,77 @@ int daemon_avoid_alias(const char *p)
 	}
 }
 
-static int only_spaces_and_periods(const char *path, size_t len, size_t skip)
+/*
+ * On NTFS, we need to be careful to disallow certain synonyms of the `.git/`
+ * directory:
+ *
+ * - For historical reasons, file names that end in spaces or periods are
+ *   automatically trimmed. Therefore, `.git . . ./` is a valid way to refer
+ *   to `.git/`.
+ *
+ * - For other historical reasons, file names that do not conform to the 8.3
+ *   format (up to eight characters for the basename, three for the file
+ *   extension, certain characters not allowed such as `+`, etc) are associated
+ *   with a so-called "short name", at least on the `C:` drive by default.
+ *   Which means that `git~1/` is a valid way to refer to `.git/`.
+ *
+ *   Note: Technically, `.git/` could receive the short name `git~2` if the
+ *   short name `git~1` were already used. In Git, however, we guarantee that
+ *   `.git` is the first item in a directory, therefore it will be associated
+ *   with the short name `git~1` (unless short names are disabled).
+ *
+ * - For yet other historical reasons, NTFS supports so-called "Alternate Data
+ *   Streams", i.e. metadata associated with a given file, referred to via
+ *   `<filename>:<stream-name>:<stream-type>`. There exists a default stream
+ *   type for directories, allowing `.git/` to be accessed via
+ *   `.git::$INDEX_ALLOCATION/`.
+ *
+ * When this function returns 1, it indicates that the specified file/directory
+ * name refers to a `.git` file or directory, or to any of these synonyms, and
+ * Git should therefore not track it.
+ *
+ * For performance reasons, _all_ Alternate Data Streams of `.git/` are
+ * forbidden, not just `::$INDEX_ALLOCATION`.
+ *
+ * This function is intended to be used by `git fsck` even on platforms where
+ * the backslash is a regular filename character, therefore it needs to handle
+ * backlash characters in the provided `name` specially: they are interpreted
+ * as directory separators.
+ */
+int is_ntfs_dotgit(const char *name)
 {
-	if (len < skip)
+	char c;
+
+	/*
+	 * Note that when we don't find `.git` or `git~1` we end up with `name`
+	 * advanced partway through the string. That's okay, though, as we
+	 * return immediately in those cases, without looking at `name` any
+	 * further.
+	 */
+	c = *(name++);
+	if (c == '.') {
+		/* .git */
+		if (((c = *(name++)) != 'g' && c != 'G') ||
+		    ((c = *(name++)) != 'i' && c != 'I') ||
+		    ((c = *(name++)) != 't' && c != 'T'))
+			return 0;
+	} else if (c == 'g' || c == 'G') {
+		/* git ~1 */
+		if (((c = *(name++)) != 'i' && c != 'I') ||
+		    ((c = *(name++)) != 't' && c != 'T') ||
+		    *(name++) != '~' ||
+		    *(name++) != '1')
+			return 0;
+	} else
 		return 0;
-	len -= skip;
-	path += skip;
-	while (len-- > 0) {
-		char c = *(path++);
-		if (c != ' ' && c != '.')
+
+	for (;;) {
+		c = *(name++);
+		if (!c || c == '\\' || c == '/' || c == ':')
+			return 1;
+		if (c != '.' && c != ' ')
 			return 0;
 	}
-	return 1;
-}
-
-int is_ntfs_dotgit(const char *name)
-{
-	size_t len;
-
-	for (len = 0; ; len++)
-		if (!name[len] || name[len] == '\\' || is_dir_sep(name[len])) {
-			if (only_spaces_and_periods(name, len, 4) &&
-					!strncasecmp(name, ".git", 4))
-				return 1;
-			if (only_spaces_and_periods(name, len, 5) &&
-					!strncasecmp(name, "git~1", 5))
-				return 1;
-			if (name[len] != '\\')
-				return 0;
-			name += len + 1;
-			len = -1;
-		}
 }
 
 static int is_ntfs_dot_generic(const char *name,
@@ -1341,7 +1422,7 @@ static int is_ntfs_dot_generic(const char *name,
 only_spaces_and_periods:
 		for (;;) {
 			char c = name[i++];
-			if (!c)
+			if (!c || c == ':')
 				return 1;
 			if (c != ' ' && c != '.')
 				return 0;
diff --git a/third_party/git/path.h b/third_party/git/path.h
index 2ba6ca58c834..14d6dcad161e 100644
--- a/third_party/git/path.h
+++ b/third_party/git/path.h
@@ -193,4 +193,7 @@ const char *git_path_merge_head(struct repository *r);
 const char *git_path_fetch_head(struct repository *r);
 const char *git_path_shallow(struct repository *r);
 
+
+int ends_with_path_components(const char *path, const char *components);
+
 #endif /* PATH_H */
diff --git a/third_party/git/pathspec.c b/third_party/git/pathspec.c
index 12c2b322b30a..8243e06eab48 100644
--- a/third_party/git/pathspec.c
+++ b/third_party/git/pathspec.c
@@ -3,6 +3,8 @@
 #include "dir.h"
 #include "pathspec.h"
 #include "attr.h"
+#include "argv-array.h"
+#include "quote.h"
 
 /*
  * Finds which of the given pathspecs match items in the index.
@@ -436,8 +438,13 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
 	} else {
 		match = prefix_path_gently(prefix, prefixlen,
 					   &prefixlen, copyfrom);
-		if (!match)
-			die(_("%s: '%s' is outside repository"), elt, copyfrom);
+		if (!match) {
+			const char *hint_path = get_git_work_tree();
+			if (!hint_path)
+				hint_path = get_git_dir();
+			die(_("%s: '%s' is outside repository at '%s'"), elt,
+			    copyfrom, absolute_path(hint_path));
+		}
 	}
 
 	item->match = match;
@@ -613,6 +620,42 @@ void parse_pathspec(struct pathspec *pathspec,
 	}
 }
 
+void parse_pathspec_file(struct pathspec *pathspec, unsigned magic_mask,
+			 unsigned flags, const char *prefix,
+			 const char *file, int nul_term_line)
+{
+	struct argv_array parsed_file = ARGV_ARRAY_INIT;
+	strbuf_getline_fn getline_fn = nul_term_line ? strbuf_getline_nul :
+						       strbuf_getline;
+	struct strbuf buf = STRBUF_INIT;
+	struct strbuf unquoted = STRBUF_INIT;
+	FILE *in;
+
+	if (!strcmp(file, "-"))
+		in = stdin;
+	else
+		in = xfopen(file, "r");
+
+	while (getline_fn(&buf, in) != EOF) {
+		if (!nul_term_line && buf.buf[0] == '"') {
+			strbuf_reset(&unquoted);
+			if (unquote_c_style(&unquoted, buf.buf, NULL))
+				die(_("line is badly quoted: %s"), buf.buf);
+			strbuf_swap(&buf, &unquoted);
+		}
+		argv_array_push(&parsed_file, buf.buf);
+		strbuf_reset(&buf);
+	}
+
+	strbuf_release(&unquoted);
+	strbuf_release(&buf);
+	if (in != stdin)
+		fclose(in);
+
+	parse_pathspec(pathspec, magic_mask, flags, prefix, parsed_file.argv);
+	argv_array_clear(&parsed_file);
+}
+
 void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
 {
 	int i, j;
diff --git a/third_party/git/pathspec.h b/third_party/git/pathspec.h
index 1c18a2c90c41..454ce364fac7 100644
--- a/third_party/git/pathspec.h
+++ b/third_party/git/pathspec.h
@@ -22,6 +22,11 @@ struct index_state;
 
 #define PATHSPEC_ONESTAR 1	/* the pathspec pattern satisfies GFNM_ONESTAR */
 
+/**
+ * See glossary-context.txt for the syntax of pathspec.
+ * In memory, a pathspec set is represented by "struct pathspec" and is
+ * prepared by parse_pathspec().
+ */
 struct pathspec {
 	int nr;
 	unsigned int has_wildcard:1;
@@ -73,18 +78,56 @@ struct pathspec {
  */
 #define PATHSPEC_LITERAL_PATH (1<<6)
 
-/*
+/**
  * Given command line arguments and a prefix, convert the input to
  * pathspec. die() if any magic in magic_mask is used.
  *
  * Any arguments used are copied. It is safe for the caller to modify
  * or free 'prefix' and 'args' after calling this function.
+ *
+ * - magic_mask specifies what features that are NOT supported by the following
+ * code. If a user attempts to use such a feature, parse_pathspec() can reject
+ * it early.
+ *
+ * - flags specifies other things that the caller wants parse_pathspec to
+ * perform.
+ *
+ * - prefix and args come from cmd_* functions
+ *
+ * parse_pathspec() helps catch unsupported features and reject them politely.
+ * At a lower level, different pathspec-related functions may not support the
+ * same set of features. Such pathspec-sensitive functions are guarded with
+ * GUARD_PATHSPEC(), which will die in an unfriendly way when an unsupported
+ * feature is requested.
+ *
+ * The command designers are supposed to make sure that GUARD_PATHSPEC() never
+ * dies. They have to make sure all unsupported features are caught by
+ * parse_pathspec(), not by GUARD_PATHSPEC. grepping GUARD_PATHSPEC() should
+ * give the designers all pathspec-sensitive codepaths and what features they
+ * support.
+ *
+ * A similar process is applied when a new pathspec magic is added. The designer
+ * lifts the GUARD_PATHSPEC restriction in the functions that support the new
+ * magic. At the same time (s)he has to make sure this new feature will be
+ * caught at parse_pathspec() in commands that cannot handle the new magic in
+ * some cases. grepping parse_pathspec() should help.
  */
 void parse_pathspec(struct pathspec *pathspec,
 		    unsigned magic_mask,
 		    unsigned flags,
 		    const char *prefix,
 		    const char **args);
+/*
+ * Same as parse_pathspec() but uses file as input.
+ * When 'file' is exactly "-" it uses 'stdin' instead.
+ */
+void parse_pathspec_file(struct pathspec *pathspec,
+			 unsigned magic_mask,
+			 unsigned flags,
+			 const char *prefix,
+			 const char *file,
+			 int nul_term_line);
+
 void copy_pathspec(struct pathspec *dst, const struct pathspec *src);
 void clear_pathspec(struct pathspec *);
 
diff --git a/third_party/git/perl/Git.pm b/third_party/git/perl/Git.pm
index 62c472e0ce41..54c9ed0ddee5 100644
--- a/third_party/git/perl/Git.pm
+++ b/third_party/git/perl/Git.pm
@@ -563,7 +563,7 @@ sub get_record {
 Query user C<PROMPT> and return answer from user.
 
 Honours GIT_ASKPASS and SSH_ASKPASS environment variables for querying
-the user. If no *_ASKPASS variable is set or an error occoured,
+the user. If no *_ASKPASS variable is set or an error occurred,
 the terminal is tried as a fallback.
 If C<ISPASSWORD> is set and true, the terminal disables echo.
 
diff --git a/third_party/git/perl/Git/SVN.pm b/third_party/git/perl/Git/SVN.pm
index 76b29659057d..4b28b8778474 100644
--- a/third_party/git/perl/Git/SVN.pm
+++ b/third_party/git/perl/Git/SVN.pm
@@ -1491,6 +1491,10 @@ sub call_authors_prog {
 
 sub check_author {
 	my ($author) = @_;
+	if (defined $author) {
+		$author =~ s/^\s+//g;
+		$author =~ s/\s+$//g;
+	}
 	if (!defined $author || length $author == 0) {
 		$author = '(no author)';
 	}
diff --git a/third_party/git/pkt-line.h b/third_party/git/pkt-line.h
index 5c62015db4df..fef3a0d792d3 100644
--- a/third_party/git/pkt-line.h
+++ b/third_party/git/pkt-line.h
@@ -77,7 +77,7 @@ int packet_read(int fd, char **src_buffer, size_t *src_len, char
 /*
  * Read a packetized line into a buffer like the 'packet_read()' function but
  * returns an 'enum packet_read_status' which indicates the status of the read.
- * The number of bytes read will be assigined to *pktlen if the status of the
+ * The number of bytes read will be assigned to *pktlen if the status of the
  * read was 'PACKET_READ_NORMAL'.
  */
 enum packet_read_status {
diff --git a/third_party/git/po/TEAMS b/third_party/git/po/TEAMS
index 00472a47135c..dbcce4b40ff2 100644
--- a/third_party/git/po/TEAMS
+++ b/third_party/git/po/TEAMS
@@ -56,6 +56,10 @@ Language:	sv (Swedish)
 Repository:	https://github.com/nafmo/git-l10n-sv/
 Leader:		Peter Krefting <peter@softwolves.pp.se>
 
+Language:	tr (Turkish)
+Repository:	https://github.com/bitigchi/git-po/
+Leader:		Emir SARI <bitigchi@me.com>
+
 Language:	vi (Vietnamese)
 Repository:	https://github.com/vnwildman/git/
 Leader:		Trแบงn Ngแปc Quรขn <vnwildman AT gmail.com>
@@ -67,3 +71,8 @@ Leader:		Jiang Xin <worldhello.net AT gmail.com>
 Members:	Ray Chen <oldsharp AT gmail.com>
 		ไพไบ‘ <lilydjwg AT gmail.com>
 		Fangyi Zhou <me AT fangyi.io>
+
+Language:	zh_TW (Traditional Chinese)
+Respository:	https://github.com/l10n-tw/git-po
+Leader: 	Yi-Jyun Pan <pan93412 AT gmail.com>
+Members:	Franklin Weng <franklin AT goodhorse.idv.tw>
diff --git a/third_party/git/po/bg.po b/third_party/git/po/bg.po
index e1d10db68804..79903137a44b 100644
--- a/third_party/git/po/bg.po
+++ b/third_party/git/po/bg.po
@@ -1,7 +1,7 @@
 # Bulgarian translation of git po-file.
-# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019 Alexander Shopov <ash@kambanaria.org>.
+# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020 Alexander Shopov <ash@kambanaria.org>.
 # This file is distributed under the same license as the git package.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 # ========================
 # DICTIONARY TO MERGE IN GIT GUI
@@ -31,7 +31,7 @@
 # am ะฟั€ะธะปะฐะณะฐะผ ะฟะพั€ะตะดะธั†ะฐ ะพั‚ ะบั€ัŠะฟะบะธ
 # working directory/tree โ€” ะฒะธะฝะฐะณะธ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ, git ัะปะตะดะธ ั†ัะปะพั‚ะพ ะดัŠั€ะฒะพ, ะฐ ะฝะต ะดะธั€ะตะบั‚ะพั€ะธะธ, ั€ะฐะฑะพั‚ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะทะฐ cwd
 # switch to branch ะฟั€ะตะผะธะฝะฐะฒะฐะผ ะบัŠะผ ะบะปะพะฝ
-# sparse entry ั‡ะฐัั‚ะธั‡ะฝะพ ะธะทั‚ะตะณะปะตะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั/ะฟัŠั‚
+# sparse entry/blob ั‡ะฐัั‚ะธั‡ะฝะพ ะธะทั‚ะตะณะปะตะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั/ะฟัŠั‚/ะพะฑะตะบั‚-BLOB
 # revision range ะดะธะฐะฟะฐะทะพะฝ ะฝะฐ ะฒะตั€ัะธะธั‚ะต
 # cover letter ะฟั€ะธะดั€ัƒะถะฐะฒะฐั‰ะพ ะฟะธัะผะพ
 # reference repository ะตั‚ะฐะปะพะฝะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต
@@ -139,6 +139,10 @@
 # split (commit-graphr) ั€ะฐะทะดั€ะพะฑะตะฝ (ะณั€ะฐั„ ั ะฟะพะดะฐะฒะฐะฝะธั)
 # clobber (a tag) ะฟั€ะตะทะฐะฟะธัะฒะฐะผ (ะตั‚ะธะบะตั‚)
 # blame ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะฒั‚ะพั€ัั‚ะฒะพ
+# refname ะธะผะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะป
+# cone pattern matching ะฟัŠั‚ะตะฒะพะดะฝะพ ะฝะฐะฟะฐัะฒะฐะฝะต
+# negative pattern ะพั‚ั€ะธั†ะฐั‚ะตะปะตะฝ ัˆะฐะฑะปะพะฝ
+# colored hunk/diff ะพั†ะฒะตั‚ะตะฝะพ ะฟะฐั€ั‡ะต/ั€ะฐะทะปะธะบะฐ
 # ------------------------
 # โ€ž$varโ€œ - ะผะพะถะต ะดะฐ ะฝะต ัั€ะฐะฑะพั‚ะฒะฐ ะทะฐ shell ะธะผะฐ gettext ะธ eval_gettext - ะฟั€ะพะฒะตั€ะบะฐ - ะฝะฐะผะธั€ะฐั‚ ัะต ะปะตัะฝะพ ะฟะพ โ€ž$
 # ------------------------
@@ -155,10 +159,10 @@
 # for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n
 msgid ""
 msgstr ""
-"Project-Id-Version: git 2.22\n"
+"Project-Id-Version: git 2.25\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 12:25+0300\n"
-"PO-Revision-Date: 2019-08-10 12:33+0300\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-12 00:03+0100\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -167,37 +171,740 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "ะะตัƒัะฟะตัˆะตะฝ ะฐะฝะฐะปะธะท โ€” โ€ž%sโ€œ."
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "ะดะฒะพะธั‡ะฝะพ"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "ะฝะธั‰ะพ"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "ะฝัะผะฐ ะฟั€ะพะผะตะฝะธ"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะดะพะฑะฐะฒัะฝะต ะฒ ะธะฝะดะตะบัะฐ ะฝะฐ โ€ž%sโ€œ"
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "%d ั„ะฐะนะป ะพะฑะฝะพะฒะตะฝ\n"
+msgstr[1] "%d ั„ะฐะนะปะฐ ะพะฑะฝะพะฒะตะฝะธ\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "ะ‘ะ•ะ›ะ•ะ–ะšะ: โ€ž%sโ€œ ะฒะตั‡ะต ะฝะต ัะต ัะปะตะดะธ.\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะทะฐะฟะธั ะฒ ะบะตัˆะฐ ั‡ั€ะตะท โ€žmake_cache_entryโ€œ ะทะฐ โ€ž%sโ€œ"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "ะžั‚ะผัะฝะฐ"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEAD^{tree}โ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝ"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "%d ั„ะฐะนะป ั ะพั‚ะผะตะฝะตะฝะธ ะฟั€ะพะผะตะฝะธ\n"
+msgstr[1] "%d ั„ะฐะนะปะฐ ั ะพั‚ะผะตะฝะตะฝะธ ะฟั€ะพะผะตะฝะธ\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "ะัะผะฐ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต.\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธ"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "%d ั„ะฐะนะป ะดะพะฑะฐะฒะตะฝ\n"
+msgstr[1] "%d ั„ะฐะนะปะฐ ะดะพะฑะฐะฒะตะฝะธ\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ะฟั€ะตะฝะตะฑั€ะตะณะฒะฐะฝะต ะฝะฐ ะฝะตัะปัั‚ะพั‚ะพ: โ€ž%sโ€œ"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "ะกะฐะผะพ ะดะฒะพะธั‡ะฝะธ ั„ะฐะนะปะพะฒะต ัะฐ ะฟั€ะพะผะตะฝะตะฝะธ.\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "ะัะผะฐ ะฟั€ะพะผะตะฝะธ.\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐ"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "ะŸั€ะตะณะปะตะด ะฝะฐ ั€ะฐะทะปะธะบะฐั‚ะฐ"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัŠั‚ะธั‰ะฐั‚ะฐ ั ะฟั€ะพะผะตะฝะธ"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะบัŠะผ ะฟั€ะพะผะตะฝะธั‚ะต ะฒ ะธะฝะดะตะบัะฐ"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "ะฒั€ัŠั‰ะฐะฝะต ะฝะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ะธะฝะดะตะบัะฐ ะบัŠะผ ัะพั‡ะตะฝะพั‚ะพ ะพั‚ โ€žHEADโ€œ"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะธ ะธะทะฑะพั€ ะธ ะฟั€ะพะผัะฝะฐ ะฝะฐ ะฟะฐั€ั‡ะตั‚ะฐ ะบะพะด"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "ั€ะฐะทะปะธะบะฐ ะผะตะถะดัƒ ัะพั‡ะตะฝะพั‚ะพ ะพั‚ โ€žHEADโ€œ ะธ ะธะฝะดะตะบัะฐ"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะบัŠะผ ะธะฝะดะตะบัะฐ"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "ะŸะพะผะพั‰:"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "ะธะทะฑะพั€ ะฝะฐ eะดะธะฝ ะตะปะตะผะตะฝั‚"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "ะธะทะฑะพั€ ะฝะฐ ะฟะพั€ะตะดะธั†ะฐ ะพั‚ ะตะปะตะผะตะฝั‚ะธ"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "ะธะทะฑะพั€ ะฝะฐ ะฝัะบะพะปะบะพ ะฟะพั€ะตะดะธั†ะธ ะพั‚ ะตะปะตะผะตะฝั‚ะธ"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "ะธะทะฑะพั€ ะฝะฐ ะฑะฐะทะฐั‚ะฐ ะฝะฐ ัƒะฝะธะบะฐะปะตะฝ ะฟั€ะตั„ะธะบั"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐะฝะพั‚ะพ ะพั‚ ะธะทะฑะพั€ะฐ"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "ะธะทะฑะพั€ ะฝะฐ ะฒัะธั‡ะบะธ ะตะปะตะผะตะฝั‚ะธ"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "(ะฟั€ะฐะทะฝะพ) ะฟั€ะธะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะธะทะฑะธั€ะฐะฝะตั‚ะพ"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "ะธะทะฑะพั€ ะฝะฐ ะฝะพะผะตั€ะธั€ะฐะฝ ะตะปะตะผะตะฝั‚"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "(ะฟั€ะฐะทะฝะพ) ะฑะตะท ะธะทะฑะพั€ ะฝะฐ ะฝะธั‰ะพ"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "โ—โ—โ— ะšะพะผะฐะฝะดะธ โ—โ—โ—"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "ะ˜ะทะฑะพั€ ะฝะฐ ัะปะตะดะฒะฐั‰ะพ ะดะตะนัั‚ะฒะธะต"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "ะฒ ะธะฝะดะตะบัะฐ"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "ะธะทะฒัŠะฝ ะธะฝะดะตะบัะฐ"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "ะฟัŠั‚"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ"
+
+#
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "ะ˜ะทั…ะพะด.\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟะฐั€ั‡ะต [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"ะะบะพ ะบั€ัŠะฟะบะฐั‚ะฐ ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ ั‡ะธัั‚ะพ, ั€ะตะดะฐะบั‚ะธั€ะฐะฝะพั‚ะพ ะฟะฐั€ั‡ะต ั‰ะต ะฑัŠะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ "
+"ะดะพะฑะฐะฒะตะฝะพ ะบัŠะผ ะธะฝะดะตะบัะฐ."
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y โ€” ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะฒ ะธะฝะดะตะบัะฐ\n"
+"n โ€” ะฑะตะท ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะฒ ะธะฝะดะตะบัะฐ\n"
+"q โ€” ะธะทั…ะพะด, ะฑะตะท ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ะพัั‚ะฐะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ\n"
+"a โ€” ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะฒ ะธะฝะดะตะบัะฐ\n"
+"d โ€” ะฑะตะท ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะฒ ะธะฝะดะตะบัะฐ\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "ะกะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "ะกะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "ะกะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟะฐั€ั‡ะต [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"ะะบะพ ะบั€ัŠะฟะบะฐั‚ะฐ ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ ั‡ะธัั‚ะพ, ั€ะตะดะฐะบั‚ะธั€ะฐะฝะพั‚ะพ ะฟะฐั€ั‡ะต ั‰ะต ะฑัŠะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ "
+"ัะบัŠั‚ะฐะฝะพ."
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y โ€” ัะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ\n"
+"n โ€” ะฑะตะท ัะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ\n"
+"q โ€” ะธะทั…ะพะด, ะฑะตะท ัะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ะพัั‚ะฐะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ\n"
+"a โ€” ัะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ\n"
+"d โ€” ะฑะตะท ัะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "ะ˜ะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "ะ˜ะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "ะ˜ะทะฒะฐะถะดะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟะฐั€ั‡ะต [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"ะะบะพ ะบั€ัŠะฟะบะฐั‚ะฐ ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ ั‡ะธัั‚ะพ, ั€ะตะดะฐะบั‚ะธั€ะฐะฝะพั‚ะพ ะฟะฐั€ั‡ะต ั‰ะต ะฑัŠะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ "
+"ะธะทะฒะฐะดะตะฝะพ ะพั‚ ะธะฝะดะตะบัะฐ."
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y โ€” ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ\n"
+"n โ€” ะฑะตะท ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ\n"
+"q โ€” ะธะทั…ะพะด, ะฑะตะท ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ะพัั‚ะฐะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ะธะฝะดะตะบัะฐ\n"
+"a โ€” ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ\n"
+"d โ€” ะฑะตะท ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr ""
+"ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะบัŠะผ ะธะฝะดะตะบัะฐ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะบัŠะผ ะธะฝะดะตะบัะฐ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟะฐั€ั‡ะต ะบัŠะผ ะธะฝะดะตะบัะฐ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"ะะบะพ ะบั€ัŠะฟะบะฐั‚ะฐ ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ ั‡ะธัั‚ะพ, ั€ะตะดะฐะบั‚ะธั€ะฐะฝะพั‚ะพ ะฟะฐั€ั‡ะต ั‰ะต ะฑัŠะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ "
+"ะฝะฐะฑะตะปัะทะฐะฝะพ ะทะฐ ะฟั€ะธะปะฐะณะฐะฝะต."
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y โ€” ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะบัŠะผ ะธะฝะดะตะบัะฐ\n"
+"n โ€” ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะบัŠะผ ะธะฝะดะตะบัะฐ\n"
+"q โ€” ะธะทั…ะพะด, ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ะพัั‚ะฐะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะบัŠะผ ะธะฝะดะตะบัะฐ\n"
+"a โ€” ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะบัŠะผ ะธะฝะดะตะบัะฐ\n"
+"d โ€” ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะบัŠะผ ะธะฝะดะตะบัะฐ\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฒ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"ะะบะพ ะบั€ัŠะฟะบะฐั‚ะฐ ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ ั‡ะธัั‚ะพ, ั€ะตะดะฐะบั‚ะธั€ะฐะฝะพั‚ะพ ะฟะฐั€ั‡ะต ั‰ะต ะฑัŠะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ "
+"ะฝะฐะฑะตะปัะทะฐะฝะพ ะทะฐ ะทะฐะฝัƒะปัะฒะฐะฝะต."
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y โ€” ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"n โ€” ะฑะตะท ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"q โ€” ะธะทั…ะพะด, ะฑะตะท ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ะพัั‚ะฐะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ "
+"ะดัŠั€ะฒะพ\n"
+"a โ€” ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ "
+"ะดัŠั€ะฒะพ\n"
+"d โ€” ะฑะตะท ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ "
+"ะดัŠั€ะฒะพ\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฒ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,"
+"n,q,a,d%s,?]? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y โ€” ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"n โ€” ะฑะตะท ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"q โ€” ะธะทั…ะพะด, ะฑะตะท ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ะพัั‚ะฐะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ะธะฝะดะตะบัะฐ ะธ "
+"ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"a โ€” ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ ะธ "
+"ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"d โ€” ะฑะตะท ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ ะธ "
+"ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฒ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,"
+"q,a,d%s,?]? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y โ€” ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"n โ€” ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"q โ€” ะธะทั…ะพะด, ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ะพัั‚ะฐะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ะธะฝะดะตะบัะฐ ะธ "
+"ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"a โ€” ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ ะธ "
+"ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"d โ€” ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ ะธ "
+"ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y โ€” ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"n โ€” ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
+"q โ€” ะธะทั…ะพะด, ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ะพัั‚ะฐะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ\n"
+"a โ€” ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ\n"
+"d โ€” ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ โ€ž%.*sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ ะพั†ะฒะตั‚ะตะฝะพั‚ะพ ะฟะฐั€ั‡ะต โ€ž%.*sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "ั€ะฐะทะปะธะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "ะพั†ะฒะตั‚ะตะฝะฐั‚ะฐ ั€ะฐะทะปะธะบะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€ž%sโ€œ"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "ะธะทั…ะพะดัŠั‚ ะพั‚ โ€žinteractive.diffFilterโ€œ ะฝะต ะฝะฐะฟะฐัะฒะฐ"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"ะžะฑั€ะฐะฑะพั‚ะตะฝะธั‚ะต ั€ะตะดะพะฒะต ะฝะฐ ะธะทั…ะพะดะฐ ะฝะฐ ะฟะพะปะทะฒะฐะฝะธั ั„ะธะปั‚ัŠั€, ั‚ั€ัะฑะฒะฐ\n"
+"ะดะฐ ัะต ะพั‚ะฝะฐััั‚ ะตะดะฝะพ ะบัŠะผ ะตะดะฝะพ ัะฟั€ัะผะพ ั€ะตะดะพะฒะตั‚ะต ะฝะฐ ะฒั…ะพะดะฐ."
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"ะพั‡ะฐะบะฒะฐ ัะต ั€ะตะด โ„–%d ะพั‚ ะบะพะฝั‚ะตะบัั‚ะฐ ะฒ\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"ะฟะฐั€ั‡ะตั‚ะฐั‚ะฐ ะบะพะด ะฝะต ัะต ะฟั€ะธะฟะพะบั€ะธะฒะฐั‚:\n"
+"%.*s\n"
+"    ะฝะต ะทะฐะฒัŠั€ัˆะฒะฐ ั:\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "ะ ัŠั‡ะฝะพ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะฐ ะบะพะด โ€” ะพั‚ะดะพะปัƒ ะธะผะฐ ะฟะพะดัะบะฐะทะบะฐ.\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"โ€”โ€”โ€”\n"
+"ะ—ะฐ ะดะฐ ะฟั€ะพะฟัƒัะฝะตั‚ะต ั€ะตะดะพะฒะตั‚ะต, ะทะฐะฟะพั‡ะฒะฐั‰ะธ ั โ€ž%cโ€œ: ะทะฐะผะตะฝะตั‚ะต ะทะฝะฐะบะฐ ั โ€ž โ€œ (ัั‚ะฐะฒะฐั‚ "
+"ะบะพะฝั‚ะตะบัั‚)\n"
+"ะ—ะฐ ะดะฐ ะฟั€ะพะฟัƒัะฝะตั‚ะต ั€ะตะดะพะฒะตั‚ะต, ะทะฐะฟะพั‡ะฒะฐั‰ะธ ั โ€ž%cโ€œ: ะธะทั‚ั€ะธะนั‚ะต ะณะธ.\n"
+"ะ ะตะดะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะทะฐะฟะพั‡ะฒะฐั‚ ั โ€ž%cโ€œ ั‰ะต ะฑัŠะดะฐั‚ ะฟั€ะพะฟัƒัะฝะฐั‚ะธ.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"ะะบะพ ะต ะฝะตะฒัŠะทะผะพะถะฝะพ ั‡ะธัั‚ะพ ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบะพะดะฐ, ั‰ะต ะผะพะถะต ะฟะฐะบ ะดะฐ ั€ะตะดะฐะบั‚ะธั€ะฐั‚ะต.  ะะบะพ\n"
+"ะธะทั‚ั€ะธะตั‚ะต ะฒัะธั‡ะบะธ ั€ะตะดะพะฒะต ะพั‚ ะฟะฐั€ั‡ะตั‚ะพ ะบะพะด, ั‚ะพ ั‰ะต ะฑัŠะดะต ะพัั‚ะฐะฒะตะฝะพ ะฝะตะฟั€ะพะผะตะฝะตะฝะพ, ะฐ\n"
+"ั€ะตะดะฐะบั‚ะธั€ะฐะฝะตั‚ะพ โ€” ะพั‚ะบะฐะทะฐะฝะพ.\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฟะฐั€ั‡ะตั‚ะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žgit apply --cachedโ€œ"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"ะ ะตะดะฐะบั‚ะธั€ะฐะฝะพั‚ะพ ะฟะฐั€ั‡ะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ.  ะ”ะฐ ัะต ะฟั€ะพะดัŠะปะถะธ ะปะธ ั "
+"ั€ะตะดะฐะบั‚ะธั€ะฐะฝะตั‚ะพ? (ั‚ะตะบัƒั‰ะธั‚ะต ั€ะตะดะฐะบั†ะธะธ ั‰ะต ัะต ะพั‚ะผะตะฝัั‚ ะฟั€ะธ ะพั‚ะบะฐะท!): โ€žyโ€œ (ะดะฐ)/ "
+"โ€žnโ€œ (ะฝะต)? "
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "ะ˜ะทะฑั€ะฐะฝะธั‚ะต ะฟะฐั€ั‡ะตั‚ะฐ ะฝะต ะผะพะณะฐั‚ ะดะฐ ัะต ะดะพะฑะฐะฒัั‚ ะฒ ะธะฝะดะตะบัะฐ!"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "ะ”ะฐ ัะต ะฟั€ะธะปะพะถะฐั‚ ะปะธ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ? "
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "ะะธั‰ะพ ะฝะต ะต ะฟั€ะธะปะพะถะตะฝะพ.\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j โ€” ะฑะตะท ั€ะตัˆะตะฝะธะต ะทะฐ ะฟะฐั€ั‡ะตั‚ะพ, ะบัŠะผ ัะปะตะดะฒะฐั‰ะพั‚ะพ ะฟะฐั€ั‡ะต ะฑะตะท ั€ะตัˆะตะฝะธะต\n"
+"J โ€” ะฑะตะท ั€ะตัˆะตะฝะธะต ะทะฐ ะฟะฐั€ั‡ะตั‚ะพ, ะบัŠะผ ัะปะตะดะฒะฐั‰ะพั‚ะพ ะฟะฐั€ั‡ะต\n"
+"k โ€” ะฑะตะท ั€ะตัˆะตะฝะธะต ะทะฐ ะฟะฐั€ั‡ะตั‚ะพ, ะบัŠะผ ะฟั€ะตะดะธัˆะฝะพั‚ะพ ะฟะฐั€ั‡ะต ะฑะตะท ั€ะตัˆะตะฝะธะต\n"
+"K โ€” ะฑะตะท ั€ะตัˆะตะฝะธะต ะทะฐ ะฟะฐั€ั‡ะตั‚ะพ, ะบัŠะผ ะฟั€ะตะดะธัˆะฝะพั‚ะพ ะฟะฐั€ั‡ะต\n"
+"g โ€” ะธะทะฑะพั€ ะบัŠะผ ะบะพะต ะฟะฐั€ั‡ะต ะดะฐ ัะต ะฟั€ะตะผะธะฝะต\n"
+"/ โ€” ั‚ัŠั€ัะตะฝะต ะฝะฐ ะฟะฐั€ั‡ะต, ะฝะฐะฟะฐัะฒะฐั‰ะพ ะบัŠะผ ะดะฐะดะตะฝ ั€ะตะณัƒะปัั€ะตะฝ ะธะทั€ะฐะท\n"
+"s โ€” ั€ะฐะทะดะตะปัะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะพั‚ะพ ะฟะฐั€ั‡ะต ะฝะฐ ะฟะพ-ะผะฐะปะบะธ\n"
+"e โ€” ั€ัŠั‡ะฝะพ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะพั‚ะพ ะฟะฐั€ั‡ะต\n"
+"? โ€” ะธะทะฒะตะถะดะฐะฝะต ะฝะต ะฟะพะผะพั‰ั‚ะฐ\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "ะัะผะฐ ะดั€ัƒะณะพ ะฟะฐั€ั‡ะต ะฟั€ะตะดะธ ั‚ะพะฒะฐ"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "ะัะผะฐ ะดั€ัƒะณะพ ะฟะฐั€ั‡ะต ัะปะตะด ั‚ะพะฒะฐ"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "ะัะผะฐ ะดั€ัƒะณะธ ะฟะฐั€ั‡ะตั‚ะฐ"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "ะบัŠะผ ะบะพะต ะฟะฐั€ั‡ะต ะดะฐ ัะต ะฟั€ะธะดะฒะธะถะธ (ะทะฐ ะฟะพะฒะตั‡ะต ะฒะฐั€ะธะฐะฝั‚ะธ ะฝะฐั‚ะธัะฝะตั‚ะต โ€ženterโ€œ)? "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "ะบัŠะผ ะบะพะต ะฟะฐั€ั‡ะต ะดะฐ ัะต ะฟั€ะธะดะฒะธะถะธ? "
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ะฝะพะผะตั€: โ€ž%sโ€œ"
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "ะ˜ะผะฐ ัะฐะผะพ %d ะฟะฐั€ั‡ะต."
+msgstr[1] "ะ˜ะผะฐ ัะฐะผะพ %d ะฟะฐั€ั‡ะตั‚ะฐ."
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "ะัะผะฐ ะดั€ัƒะณะธ ะฟะฐั€ั‡ะตั‚ะฐ ะทะฐ ั‚ัŠั€ัะตะฝะต"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "ะดะฐ ัะต ั‚ัŠั€ัะธ ั ั€ะตะณัƒะปัั€ะตะฝ ะธะทั€ะฐะท? "
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "ะกะณั€ะตัˆะตะฝ ั€ะตะณัƒะปัั€ะตะฝ ะธะทั€ะฐะท โ€ž%sโ€œ: %s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "ะะธะบะพะต ะฟะฐั€ั‡ะต ะฝะต ะฝะฐะฟะฐัะฒะฐ ะฝะฐ ั€ะตะณัƒะปัั€ะฝะธั ะธะทั€ะฐะท"
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "ะขะพะฒะฐ ะฟะฐั€ั‡ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ั€ะฐะทะดะตะปะตะฝะพ"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "ะ ะฐะทะดะตะปัะฝะต ะฝะฐ %d ะฟะฐั€ั‡ะตั‚ะฐ."
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "ะขะพะฒะฐ ะฟะฐั€ั‡ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ั€ะตะดะฐะบั‚ะธั€ะฐะฝะพ"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žgit applyโ€œ"
+
+#: advice.c:115
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sะฟะพะดัะบะฐะทะบะฐ: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:168
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "ะžั‚ะฑะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ะต ะฑะปะพะบะธั€ะฐะฝะพ ะพั‚ ะฝะตัะปะตั‚ะธ ั„ะฐะนะปะพะฒะต."
 
-#: advice.c:164
+#: advice.c:170
 msgid "Committing is not possible because you have unmerged files."
 msgstr "ะŸะพะดะฐะฒะฐะฝะตั‚ะพ ะต ะฑะปะพะบะธั€ะฐะฝะพ ะพั‚ ะฝะตัะปะตั‚ะธ ั„ะฐะนะปะพะฒะต."
 
-#: advice.c:166
+#: advice.c:172
 msgid "Merging is not possible because you have unmerged files."
 msgstr "ะกะปะธะฒะฐะฝะตั‚ะพ ะต ะฑะปะพะบะธั€ะฐะฝะพ ะพั‚ ะฝะตัะปะตั‚ะธ ั„ะฐะนะปะพะฒะต."
 
-#: advice.c:168
+#: advice.c:174
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "ะ˜ะทะดัŠั€ะฟะฒะฐะฝะตั‚ะพ ะต ะฑะปะพะบะธั€ะฐะฝะพ ะพั‚ ะฝะตัะปะตั‚ะธ ั„ะฐะนะปะพะฒะต."
 
-#: advice.c:170
+#: advice.c:176
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "ะžั‚ะผัะฝะฐั‚ะฐ ะต ะฑะปะพะบะธั€ะฐะฝะฐ ะพั‚ ะฝะตัะปะตั‚ะธ ั„ะฐะนะปะพะฒะต."
 
-#: advice.c:172
+#: advice.c:178
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "ะ”ะตะนัั‚ะฒะธะตั‚ะพ โ€ž%sโ€œ ะต ะฑะปะพะบะธั€ะฐะฝะพ ะพั‚ ะฝะตัะปะตั‚ะธ ั„ะฐะนะปะพะฒะต."
 
-#: advice.c:180
+#: advice.c:186
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -205,23 +912,23 @@ msgstr ""
 "ะ ะตะดะฐะบั‚ะธั€ะฐะนั‚ะต ะณะธ ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ, ะธ ั‚ะพะณะฐะฒะฐ ะฟะพะปะทะฒะฐะนั‚ะต โ€žgit add/rm ะคะะ™ะ›โ€œ,\n"
 "ะทะฐ ะดะฐ ะพั‚ะฑะตะปะตะถะธั‚ะต ะบะพั€ะธะณะธั€ะฐะฝะตั‚ะพ ะธะผ.  ะกะปะตะด ั‚ะพะฒะฐ ะธะทะฒัŠั€ัˆะตั‚ะต ะฟะพะดะฐะฒะฐะฝะตั‚ะพ."
 
-#: advice.c:188
+#: advice.c:194
 msgid "Exiting because of an unresolved conflict."
 msgstr "ะ˜ะทั…ะพะด ะพั‚ ะฟั€ะพะณั€ะฐะผะฐั‚ะฐ ะทะฐั€ะฐะดะธ ะฝะตะบะพั€ะธะณะธั€ะฐะฝ ะบะพะฝั„ะปะธะบั‚."
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:199 builtin/merge.c:1335
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "ะะต ัั‚ะต ะทะฐะฒัŠั€ัˆะธะปะธ ัะปะธะฒะฐะฝะต.  (ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žMERGE_HEADโ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ)."
 
-#: advice.c:195
+#: advice.c:201
 msgid "Please, commit your changes before merging."
 msgstr "ะŸั€ะพะผะตะฝะธั‚ะต ั‚ั€ัะฑะฒะฐ ะดะฐ ัะต ะฟะพะดะฐะดะฐั‚ ะฟั€ะตะดะธ ัะปะธะฒะฐะฝะต."
 
-#: advice.c:196
+#: advice.c:202
 msgid "Exiting because of unfinished merge."
 msgstr "ะ˜ะทั…ะพะด ะพั‚ ะฟั€ะพะณั€ะฐะผะฐั‚ะฐ ะทะฐั€ะฐะดะธ ะฝะตะทะฐะฒัŠั€ัˆะตะฝะพ ัะปะธะฒะฐะฝะต."
 
-#: advice.c:202
+#: advice.c:208
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -355,17 +1062,7 @@ msgstr "ะณั€ะตัˆะตะฝ ั€ะตะถะธะผ ะฝะฐ ั€ะตะด โ„–%d: %s"
 msgid "inconsistent header lines %d and %d"
 msgstr "ะฝะตััŠะฒะผะตัั‚ะธะผะธ ะทะฐะณะปะฐะฒะฝะธ ั‡ะฐัั‚ะธ ะฝะฐ ั€ะตะดะพะฒะต โ„–%d ะธ โ„–%d"
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "ะฟั€ะธ ะฟะพะฒั‚ะพั€ะฝะพั‚ะพ ะฟั€ะตะฑั€ะพัะฒะฐะฝะต ะฑะต ะฟะพะปัƒั‡ะตะฝ ะฝะตะพั‡ะฐะบะฒะฐะฝ ั€ะตะด: โ€ž%.*sโ€œ"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "ั‡ะฐัั‚ ะพั‚ ะบั€ัŠะฟะบะฐ ะฑะตะท ะทะฐะณะปะฐะฒะฝะฐ ั‡ะฐัั‚ ะฝะฐ ั€ะตะด %d: %.*s"
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -380,71 +1077,81 @@ msgstr[1] ""
 "ะกะปะตะด ััŠะบั€ะฐั‰ะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟัŠั€ะฒะธั‚ะต %d ั‡ะฐัั‚ะธ ะพั‚ ะบะพะผะฟะพะฝะตะฝั‚ะธั‚ะต ะฝะฐ ะฟัŠั‚ั, ะฒ ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ "
 "ั‡ะฐัั‚ ะฝะฐ โ€žgit diffโ€œ ะปะธะฟัะฒะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะธะผะต ะฝะฐ ั„ะฐะนะป (ั€ะตะด: %d)"
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "ะฒ ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ โ€žgit diffโ€œ ะปะธะฟัะฒะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะธะผะต ะฝะฐ ั„ะฐะนะป (ั€ะตะด: %d)"
 
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "ะฟั€ะธ ะฟะพะฒั‚ะพั€ะฝะพั‚ะพ ะฟั€ะตะฑั€ะพัะฒะฐะฝะต ะฑะต ะฟะพะปัƒั‡ะตะฝ ะฝะตะพั‡ะฐะบะฒะฐะฝ ั€ะตะด: โ€ž%.*sโ€œ"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "ั‡ะฐัั‚ ะพั‚ ะบั€ัŠะฟะบะฐ ะฑะตะท ะทะฐะณะปะฐะฒะฝะฐ ั‡ะฐัั‚ ะฝะฐ ั€ะตะด %d: %.*s"
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "ะฝะพะฒะธัั‚ ั„ะฐะนะป ะทะฐะฒะธัะธ ะพั‚ ัั‚ะฐั€ะพั‚ะพ ััŠะดัŠั€ะถะฐะฝะธะต ะฝะฐ ั„ะฐะนะปะฐ"
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "ะธะทั‚ั€ะธั‚ะธัั‚ ั„ะฐะนะป ะฝะต ะต ะฟั€ะฐะทะตะฝ"
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "ะณั€ะตัˆะบะฐ ะฒ ะบั€ัŠะฟะบะฐั‚ะฐ ะฝะฐ ั€ะตะด %d"
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "ะฝะพะฒะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะทะฐะฒะธัะธ ะพั‚ ัั‚ะฐั€ะพั‚ะพ ััŠะดัŠั€ะถะฐะฝะธะต ะฝะฐ ั„ะฐะนะปะฐ"
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "ะธะทั‚ั€ะธั‚ะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะต ะฟั€ะฐะทะตะฝ"
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "โ— ะฟั€ะตะดัƒะฟั€ะตะถะดะตะฝะธะต: ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฒะตั‡ะต ะต ะฟั€ะฐะทะตะฝ, ะฝะพ ะฝะต ะต ะธะทั‚ั€ะธั‚"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "ะณั€ะตัˆะบะฐ ะฒ ะดะฒะพะธั‡ะฝะฐั‚ะฐ ะบั€ัŠะฟะบะฐ ะฝะฐ ั€ะตะด %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "ะฝะตั€ะฐะทะฟะพะทะฝะฐั‚ะฐ ะดะฒะพะธั‡ะฝะฐั‚ะฐ ะบั€ัŠะฟะบะฐ ะฝะฐ ั€ะตะด %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "ะบั€ัŠะฟะบะฐั‚ะฐ ะต ั ะธะทั†ัะปะพ ะฟะพะฒั€ะตะดะตะฝะธ ะดะฐะฝะฝะธ ะฝะฐ ั€ะตะด %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "ัะธะผะฒะพะปะฝะฐั‚ะฐ ะฒั€ัŠะทะบะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะฐ"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ ะธะปะธ ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะฝะฐั‡ะฐะปะพ ะฝะฐ ั€ะตะด: โ€ž%cโ€œ"
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -453,13 +1160,13 @@ msgstr[0] ""
 msgstr[1] ""
 "%d-ั‚ะพ ะฟะฐั€ั‡ะต ะบะพะด ะฑะต ัƒัะฟะตัˆะฝะพ ะฟั€ะธะปะพะถะตะฝะพ ะฝะฐ ั€ะตะด %d (ะพั‚ะผะตัั‚ะฒะฐะฝะต ะพั‚ %d ั€ะตะดะฐ)."
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 "ะšะพะฝั‚ะตะบัั‚ัŠั‚ ะต ะฝะฐะผะฐะปะตะฝ ะฝะฐ (%ld/%ld) ะทะฐ ะฟั€ะธะปะฐะณะฐะฝะตั‚ะพ ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะบะพะด ะฝะฐ ั€ะตะด %d"
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -468,317 +1175,312 @@ msgstr ""
 "ะฟั€ะธ ั‚ัŠั€ัะตะฝะต ะทะฐ:\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "ะปะธะฟัะฒะฐั‚ ะดะฐะฝะฝะธั‚ะต ะทะฐ ะดะฒะพะธั‡ะฝะฐั‚ะฐ ะบั€ัŠะฟะบะฐ ะทะฐ โ€ž%sโ€œ"
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "ะดะฒะพะธั‡ะฝะฐั‚ะฐ ะบั€ัŠะฟะบะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ ะฒ ะพะฑั€ะฐั‚ะฝะฐ ะฟะพัะพะบะฐ, ะบะพะณะฐั‚ะพ ะพะฑั€ะฐั‚ะฝะพั‚ะพ "
 "ะฟะฐั€ั‡ะต ะทะฐ โ€ž%sโ€œ ะปะธะฟัะฒะฐ"
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "ะบัŠะผ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ ะดะฒะพะธั‡ะฝะฐ ะบั€ัŠะฟะบะฐ ะฑะตะท ะฟัŠะปะตะฝ ะธะฝะดะตะบั"
 
-#: apply.c:3151
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "ะบั€ัŠะฟะบะฐั‚ะฐ ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐ ะฝะฐ โ€ž%sโ€œ (%s), ะบะพะนั‚ะพ ะฝะต ััŠะฒะฟะฐะดะฐ ะฟะพ ััŠะดัŠั€ะถะฐะฝะธะต."
 
-#: apply.c:3159
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "ะบั€ัŠะฟะบะฐั‚ะฐ ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐ ะฝะฐ โ€ž%sโ€œ, ะบะพะนั‚ะพ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ะฟั€ะฐะทะตะฝ, ะฝะพ ะฝะต ะต"
 
-#: apply.c:3177
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 "ะฝะตะพะฑั…ะพะดะธะผะธัั‚ ั€ะตะทัƒะปั‚ะฐั‚ ัะปะตะด ะพะฟะตั€ะฐั†ะธัั‚ะฐ  โ€” โ€ž%sโ€œ ะทะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต "
 "ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: apply.c:3190
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "ะดะฒะพะธั‡ะฝะฐั‚ะฐ ะบั€ัŠะฟะบะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะธะปะพะถะตะฝะฐ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ"
 
-#: apply.c:3196
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "ะดะฒะพะธั‡ะฝะฐั‚ะฐ ะบั€ัŠะฟะบะฐ ะทะฐ โ€ž%sโ€œ ะฒะพะดะธ ะดะพ ะฝะตะฟั€ะฐะฒะธะปะฝะธ ั€ะตะทัƒะปั‚ะฐั‚ะธ (ะพั‡ะฐะบะฒะฐัˆะต ัะต: โ€ž%sโ€œ, ะฐ "
 "ะฑะต ะฟะพะปัƒั‡ะตะฝะพ: โ€ž%sโ€œ)"
 
-#: apply.c:3217
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐ: โ€ž%s:%ldโ€œ"
 
-#: apply.c:3340
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทั‚ะตะณะปะธ"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
 #, c-format
 msgid "failed to read %s"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: apply.c:3400
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ โ€ž%sโ€œ ัะปะตะด ะฟั€ะพัะปะตะดัะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะฐ ะฒั€ัŠะทะบะฐ"
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "ะพะฑะตะบั‚ัŠั‚ ั ะฟัŠั‚ โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะธะปะธ ะธะทั‚ั€ะธั‚"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "โ€ž%sโ€œ ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฒ ะธะฝะดะตะบัะฐ"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr "โ€ž%sโ€œ ะฝะต ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐ ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: apply.c:3559
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "ะฒ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะปะธะฟัะฒะฐั‚ ะฝะตะพะฑั…ะพะดะธะผะธั‚ะต ะพะฑะตะบั‚ะธ-BLOB, ะทะฐ ะดะฐ ัะต ะฟั€ะตะผะธะฝะต ะบัŠะผ ั‚ั€ะพะนะฝะพ "
 "ัะปะธะฒะฐะฝะต."
 
-#: apply.c:3562
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "ะŸั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ั‚ั€ะพะนะฝะพ ัะปะธะฒะฐะฝะตโ€ฆ\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "ั‚ะตะบัƒั‰ะพั‚ะพ ััŠะดัŠั€ะถะฐะฝะธะต ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะพ"
 
-#: apply.c:3594
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ะฟั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ั‚ั€ะพะนะฝะพ ัะปะธะฒะฐะฝะตโ€ฆ\n"
 
-#: apply.c:3608
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "ะšะพะฝั„ะปะธะบั‚ะธ ะฟั€ะธ ะฟั€ะธะปะฐะณะฐะฝะตั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ ะบัŠะผ โ€ž%sโ€œ.\n"
 
-#: apply.c:3613
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "ะšั€ัŠะฟะบะฐั‚ะฐ ะฑะต ะฟั€ะธะปะพะถะตะฝะฐ ั‡ะธัั‚ะพ ะบัŠะผ โ€ž%sโ€œ.\n"
 
-#: apply.c:3639
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "ะธะทั‚ั€ะธะฒะฐั‰ะฐั‚ะฐ ะบั€ัŠะฟะบะฐ ะพัั‚ะฐะฒั ั„ะฐะนะปะฐ ะฝะตะฟั€ะฐะทะตะฝ"
 
-#: apply.c:3712
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "โ€ž%sโ€œ: ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฒะธะด"
 
-#: apply.c:3714
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "โ€ž%sโ€œ ะต ะพั‚ ะฒะธะด โ€ž%oโ€œ, ะฐ ัะต ะพั‡ะฐะบะฒะฐัˆะต โ€ž%oโ€œ"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟัŠั‚: โ€ž%sโ€œ"
 
-#: apply.c:3923
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr "โ€ž%sโ€œ: ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฒ ะธะฝะดะตะบัะฐ"
 
-#: apply.c:3926
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "โ€ž%sโ€œ: ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: apply.c:3946
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "ะฝะพะฒะธั‚ะต ะฟั€ะฐะฒะฐ ะทะฐ ะดะพัั‚ัŠะฟ (%o) ะฝะฐ โ€ž%sโ€œ ะฝะต ััŠะฒะฟะฐะดะฐั‚ ััŠั ัั‚ะฐั€ะธั‚ะต (%o)"
 
-#: apply.c:3951
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "ะฝะพะฒะธั‚ะต ะฟั€ะฐะฒะฐ ะทะฐ ะดะพัั‚ัŠะฟ (%o) ะฝะฐ โ€ž%sโ€œ ะฝะต ััŠะฒะฟะฐะดะฐั‚ ััŠั ัั‚ะฐั€ะธั‚ะต (%o) ะฝะฐ โ€ž%sโ€œ"
 
-#: apply.c:3971
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "ะทะฐัะตะณะฝะฐั‚ะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะต ัะปะตะด ัะธะผะฒะพะปะฝะฐ ะฒั€ัŠะทะบะฐ"
 
-#: apply.c:3975
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "ะšั€ัŠะฟะบะฐั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะธะปะพะถะตะฝะฐ"
 
-#: apply.c:3990
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr "ะŸั€ะพะฒะตั€ัะฒะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ โ€ž%sโ€œโ€ฆ"
 
-#: apply.c:4082
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะทะฐ ััƒะผะฐั‚ะฐ ะฟะพ SHA1 ะทะฐ ะฟะพะดะผะพะดัƒะปะฐ ะปะธะฟัะฒะฐ ะธะปะธ ะฝะต ะต ะดะพัั‚ะฐั‚ัŠั‡ะฝะฐ (%s)."
 
-#: apply.c:4089
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "ัะผัะฝะฐ ะฝะฐ ั€ะตะถะธะผะฐ ะฝะฐ ะดะพัั‚ัŠะฟะฐ ะฝะฐ โ€ž%sโ€œ, ะบะพะนั‚ะพ ะฝะต ะต ะฒ ั‚ะตะบัƒั‰ะธั ะฒั€ัŠั… โ€žHEADโ€œ"
 
-#: apply.c:4092
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะทะฐ ััƒะผะฐั‚ะฐ ะฟะพ SHA1 ะปะธะฟัะฒะฐ ะธะปะธ ะฝะต ะต ะดะพัั‚ะฐั‚ัŠั‡ะฝะฐ (%s)."
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะทะฐะฟะธั ะฒ ะบะตัˆะฐ ั‡ั€ะตะท โ€žmake_cache_entryโ€œ ะทะฐ โ€ž%sโ€œ"
-
-#: apply.c:4101
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะบัŠะผ ะฒั€ะตะผะตะฝะฝะธั ะธะฝะดะตะบั"
 
-#: apply.c:4111
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "ะฒั€ะตะผะตะฝะฝะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะฐะทะธ ะฒ โ€ž%sโ€œ"
 
-#: apply.c:4249
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒะฐะดะธ ะพั‚ ะธะฝะดะตะบัะฐ"
 
-#: apply.c:4283
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "ะฟะพะฒั€ะตะดะตะฝะฐ ะบั€ัŠะฟะบะฐ ะทะฐ ะผะพะดัƒะปะฐ โ€ž%sโ€œ"
 
-#: apply.c:4289
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปัƒั‡ะธ ะธะฝั„ะพั€ะผะฐั†ะธั ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ ะฝะพะฒะพััŠะทะดะฐะดะตะฝะธั ั„ะฐะนะป โ€ž%sโ€œ"
 
-#: apply.c:4297
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐ ััŠะทะดะฐะดะต ะผััั‚ะพั‚ะพ ะทะฐ ััŠั…ั€ะฐะฝะตะฝะธะต ะฝะฐ ะฝะพะฒะพััŠะทะดะฐะดะตะฝะธั ั„ะฐะนะป โ€ž%sโ€œ"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะทะฐะฟะธั ะฒ ะบะตัˆะฐ ะทะฐ โ€ž%sโ€œ"
 
-#: apply.c:4346
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "ะฒ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะธัˆะต"
 
-#: apply.c:4350
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr "ะทะฐั‚ะฒะฐั€ัะฝะต ะฝะฐ ั„ะฐะนะปะฐ โ€ž%sโ€œ"
 
-#: apply.c:4420
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัˆะต ั ั€ะตะถะธะผ ะฝะฐ ะดะพัั‚ัŠะฟ โ€ž%oโ€œ"
 
-#: apply.c:4518
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "ะšั€ัŠะฟะบะฐั‚ะฐ โ€ž%sโ€œ ะฑะต ะฟั€ะธะปะพะถะตะฝะฐ ั‡ะธัั‚ะพ."
 
-#: apply.c:4526
+#: apply.c:4539
 msgid "internal error"
 msgstr "ะฒัŠั‚ั€ะตัˆะฝะฐ ะณั€ะตัˆะบะฐ"
 
-#: apply.c:4529
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ โ€ž%%sโ€œ ั %d ะพั‚ั…ะฒัŠั€ะปะตะฝะพ ะฟะฐั€ั‡ะตโ€ฆ"
 msgstr[1] "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ โ€ž%%sโ€œ ั %d ะพั‚ั…ะฒัŠั€ะปะตะฝะธ ะฟะฐั€ั‡ะตั‚ะฐโ€ฆ"
 
-#: apply.c:4540
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "ััŠะบั€ะฐั‰ะฐะฒะฐะฝะต ะฝะฐ ะธะผะตั‚ะพ ะฝะฐ ั„ะฐะนะปะฐ ั ะพั‚ั…ะฒัŠั€ะปะตะฝะธั‚ะต ะฟะฐั€ั‡ะตั‚ะฐ ะฝะฐ โ€ž %.*s.rejโ€œ"
 
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
 #, c-format
 msgid "cannot open %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ"
 
-#: apply.c:4562
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "%d-ั‚ะพ ะฟะฐั€ั‡ะต ะฑะต ัƒัะฟะตัˆะฝะพ ะฟั€ะธะปะพะถะตะฝะพ."
 
-#: apply.c:4566
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "%d-ั‚ะพ ะฟะฐั€ั‡ะต ะฑะต ะพั‚ั…ะฒัŠั€ะปะตะฝะพ."
 
-#: apply.c:4676
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "ะŸั€ะพะฟัƒัะฝะฐั‚ะฐ ะบั€ัŠะฟะบะฐ: โ€ž%sโ€œ"
 
-#: apply.c:4684
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฒั…ะพะด"
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
 
-#: apply.c:4859
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "ะบั€ัŠะฟะบะฐั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝะฐ: %s"
 
-#: apply.c:4886
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "ะฟั€ะตะฝะตะฑั€ะตะณะฝะฐั‚ะฐ ะต %d ะณั€ะตัˆะบะฐ ะฒ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะธะฝั‚ะตั€ะฒะฐะปะธ"
 msgstr[1] "ะฟั€ะตะฝะตะฑั€ะตะณะฝะฐั‚ะธ ัะฐ %d ะณั€ะตัˆะบะธ ะฒ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะธะฝั‚ะตั€ะฒะฐะปะธ"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d ั€ะตะด ะดะพะฑะฐะฒั ะณั€ะตัˆะบะธ ะฒ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะธะฝั‚ะตั€ะฒะฐะปะธ."
 msgstr[1] "%d ั€ะตะดะฐ ะดะพะฑะฐะฒัั‚ ะณั€ะตัˆะบะธ ะฒ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะธะฝั‚ะตั€ะฒะฐะปะธ."
 
-#: apply.c:4900
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -787,144 +1489,135 @@ msgstr[0] ""
 msgstr[1] ""
 "ะ”ะพะฑะฐะฒะตะฝะธ ัะฐ %d ั€ะตะดะฐ ัะปะตะด ะบะพั€ะตะบั†ะธัั‚ะฐ ะฝะฐ ะณั€ะตัˆะบะธั‚ะต ะฒ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะธะฝั‚ะตั€ะฒะฐะปะธ."
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "ะะพะฒะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "ะฟัŠั‚"
-
-#: apply.c:4944
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr "ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ะฝะฐะฟะฐัะฒะฐั‰ะธ ะฝะฐ ะดะฐะดะตะฝะธั ะฟัŠั‚"
 
-#: apply.c:4947
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr "ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ะฝะฐะฟะฐัะฒะฐั‰ะธ ะฝะฐ ะดะฐะดะตะฝะธั ะฟัŠั‚"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4973 builtin/am.c:2260
 msgid "num"
 msgstr "ะ‘ะ ะžะ™"
 
-#: apply.c:4950
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั‚ะพะทะธ ะ‘ะ ะžะ™ ะฒะพะดะตั‰ะธ ะตะปะตะผะตะฝั‚ะธ ะพั‚ ะฟัŠั‚ะธั‰ะฐั‚ะฐ ะฒ ั€ะฐะทะปะธะบะฐั‚ะฐ"
 
-#: apply.c:4953
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ั€ะตะดะพะฒะตั‚ะต ะดะพะฑะฐะฒะตะฝะธ ะพั‚ ั‚ะฐะทะธ ะบั€ัŠะฟะบะฐ"
 
-#: apply.c:4955
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะฐั‚ะธัั‚ะธะบะฐ ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ"
 
-#: apply.c:4959
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฑั€ะพั ะฝะฐ ะดะพะฑะฐะฒะตะฝะธั‚ะต ะธ ะธะทั‚ั€ะธั‚ะธั‚ะต ั€ะตะดะพะฒะต"
 
-#: apply.c:4961
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะฐั‚ะธัั‚ะธะบะฐ ะฝะฐ ะฒั…ะพะดะฝะธั‚ะต ะดะฐะฝะฝะธ ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ"
 
-#: apply.c:4963
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ ะดะฐะปะธ ะบั€ัŠะฟะบะฐั‚ะฐ ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ, ะฑะตะท ะดะตะนัั‚ะฒะธั‚ะตะปะฝะพ ะฟั€ะธะปะฐะณะฐะฝะต"
 
-#: apply.c:4965
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ ะดะฐะปะธ ะบั€ัŠะฟะบะฐั‚ะฐ ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะธะปะพะถะตะฝะฐ ะบัŠะผ ั‚ะตะบัƒั‰ะธั ะธะฝะดะตะบั"
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "ะพั‚ะฑะตะปัะทะฒะฐะฝะต ะฝะฐ ะฝะพะฒะธั‚ะต ั„ะฐะนะปะพะฒะต ั โ€žgit add --intent-to-addโ€œ"
 
-#: apply.c:4969
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr "ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ ะฑะตะท ะฟั€ะพะผัะฝะฐ ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: apply.c:4971
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr "ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐ, ะบะพัั‚ะพ ะฟั€ะพะผะตะฝั ะธ ั„ะฐะนะปะพะฒะต ะธะทะฒัŠะฝ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: apply.c:4974
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "ะบั€ัŠะฟะบะฐั‚ะฐ ะดะฐ ะฑัŠะดะต ะฟั€ะธะปะพะถะตะฝะฐ.  ะžะฟั†ะธัั‚ะฐ ัะต ะบะพะผะฑะธะฝะธั€ะฐ ั โ€ž--checkโ€œ/โ€ž--statโ€œ/โ€ž--"
 "summaryโ€œ"
 
-#: apply.c:4976
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "ะฟั€ะพะฑะฒะฐะฝะต ั ั‚ั€ะพะนะฝะพ ัะปะธะฒะฐะฝะต, ะฐะบะพ ะบั€ัŠะฟะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ ะดะธั€ะตะบั‚ะฝะพ"
 
-#: apply.c:4978
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฒั€ะตะผะตะฝะตะฝ ะธะฝะดะตะบั ะฝะฐ ะฑะฐะทะฐ ะฝะฐ ะฒะบะปัŽั‡ะตะฝะฐั‚ะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะธะฝะดะตะบัะฐ"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr "ั€ะฐะทะดะตะปัะฝะต ะฝะฐ ะฟัŠั‚ะธั‰ะฐั‚ะฐ ั ะฝัƒะปะตะฒะธั ะทะฝะฐะบ โ€žNULโ€œ"
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
 msgstr "ะดะฐ ัะต ะพัะธะณัƒั€ะธ ะบะพะฝั‚ะตะบัั‚ ะพั‚ ะฟะพะฝะต ั‚ะฐะบัŠะฒ ะ‘ะ ะžะ™ ััŠะฒะฟะฐะดะฐั‰ะธ ั€ะตะดะพะฒะต"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
 msgid "action"
 msgstr "ะดะตะนัั‚ะฒะธะต"
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "ะทะฐัะธั‡ะฐะฝะต ะฝะฐ ะฝะพะฒะธ ะธะปะธ ะฟั€ะพะผะตะฝะตะฝะธ ั€ะตะดะพะฒะต ั ะณั€ะตัˆะบะธ ะฒ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะธะฝั‚ะตั€ะฒะฐะปะธ"
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ะฒ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะธะฝั‚ะตั€ะฒะฐะปะธ ะฟั€ะธ ะพั‚ะบั€ะธะฒะฐะฝะต ะฝะฐ ะบะพะฝั‚ะตะบัั‚ะฐ"
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr "ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ ะฒ ะพะฑั€ะฐั‚ะฝะฐ ะฟะพัะพะบะฐ"
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "don't expect at least one line of context"
 msgstr "ะฑะตะท ะธะทะธัะบะฒะฐะฝะต ะฝะฐ ะดะพั€ะธ ะธ ะตะดะธะฝ ั€ะตะด ะบะพะฝั‚ะตะบัั‚"
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "ะพัั‚ะฐะฒัะฝะต ะฝะฐ ะพั‚ั…ะฒัŠั€ะปะตะฝะธั‚ะต ะฟะฐั€ั‡ะตั‚ะฐ ะฒัŠะฒ ั„ะฐะนะปะพะฒะต ั ั€ะฐะทัˆะธั€ะตะฝะธะต โ€ž.rejโ€œ"
 
-#: apply.c:5000
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะทะฐัั‚ัŠะฟะฒะฐั‰ะธ ัะต ะฟะฐั€ั‡ะตั‚ะฐ"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "ะฟะพะฒะตั‡ะต ะฟะพะดั€ะพะฑะฝะพัั‚ะธ"
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "ะฟั€ะตะฝะตะฑั€ะตะณะฒะฐะฝะต ะฝะฐ ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะปะธะฟัะฒะฐั‰ ะทะฝะฐะบ ะทะฐ ะฝะพะฒ ั€ะตะด ะฒ ะบั€ะฐั ะฝะฐ ั„ะฐะนะป"
 
-#: apply.c:5006
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr "ะฑะตะท ะดะพะฒะตั€ัะฒะฐะฝะต ะฝะฐ ะฝะพะผะตั€ะฐั‚ะฐ ะฝะฐ ั€ะตะดะพะฒะตั‚ะต ะฒ ะทะฐะณะปะฐะฒะฝะธั‚ะต ั‡ะฐัั‚ะธ ะฝะฐ ะฟะฐั€ั‡ะตั‚ะฐั‚ะฐ"
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5032 builtin/am.c:2248
 msgid "root"
 msgstr "ะะะงะะ›ะะ_ะ”ะ˜ะ ะ•ะšะขะžะ ะ˜ะฏ"
 
-#: apply.c:5009
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะฐะทะธ ะะะงะะ›ะะ_ะ”ะ˜ะ ะ•ะšะขะžะ ะ˜ะฏ ะบัŠะผ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ะฒัะธั‡ะบะธ ั„ะฐะนะปะพะฒะต"
 
@@ -947,7 +1640,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote ะฅะ ะะะ˜ะ›ะ˜ะฉะ• [--exec ะšะžะœะะะ”ะ] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะฝะต ััŠะฒะฟะฐะดะฐ ั ะฝะธะบะพะน ั„ะฐะนะป"
@@ -979,7 +1672,7 @@ msgstr "ะคะžะ ะœะะข"
 msgid "archive format"
 msgstr "ะคะžะ ะœะะข ะฝะฐ ะฐั€ั…ะธะฒะฐ"
 
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr "ะŸะ ะ•ะคะ˜ะšะก"
 
@@ -987,11 +1680,12 @@ msgstr "ะŸะ ะ•ะคะ˜ะšะก"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะพะทะธ ะŸะ ะ•ะคะ˜ะšะก ะบัŠะผ ะฒัะตะบะธ ะฟัŠั‚ ะฒ ะฐั€ั…ะธะฒะฐ"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr "ะคะะ™ะ›"
 
@@ -1009,7 +1703,7 @@ msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐั€ั…ะธะฒะธั€ะฐะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฝะฐ ัั
 
 #: archive.c:465
 msgid "store only"
-msgstr "ัะฐะผะพ ััŠั…ั€ะฐะฝะตะฝะธะต ะฑะตะท ะบะพะผะฟั€ะตัะธั€ะฐะฝะต"
+msgstr "ััŠั…ั€ะฐะฝะตะฝะธะต ะฑะตะท ะบะพะผะฟั€ะตัะธั€ะฐะฝะต"
 
 #: archive.c:466
 msgid "compress faster"
@@ -1024,7 +1718,7 @@ msgid "list supported archive formats"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฟะธััŠะบะฐ ั ะฟะพะดะดัŠั€ะถะฐะฝะธั‚ะต ั„ะพั€ะผะฐั‚ะธ"
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr "ั…ั€ะฐะฝะธะปะธั‰ะต"
 
@@ -1032,7 +1726,7 @@ msgstr "ั…ั€ะฐะฝะธะปะธั‰ะต"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "ะธะทั‚ะตะณะปัะฝะต ะฝะฐ ะฐั€ั…ะธะฒะฐ ะพั‚ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ะฅะ ะะะ˜ะ›ะ˜ะฉะ•"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "ะบะพะผะฐะฝะดะฐ"
@@ -1063,66 +1757,66 @@ msgstr "ะะตะฟะพะทะฝะฐั‚ ั„ะพั€ะผะฐั‚ ะฝะฐ ะฐั€ั…ะธะฒ: โ€ž%sโ€œ"
 msgid "Argument not supported for format '%s': -%d"
 msgstr "ะั€ะณัƒะผะตะฝั‚ัŠั‚ ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ะทะฐ ั„ะพั€ะผะฐฬ€ั‚ะฐ โ€ž%sโ€œ: -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:351
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚-BLOB โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑั€ะฐะฑะพั‚ะตะฝ"
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:369
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "ะฝะตะฟะพะดะดัŠั€ะถะฐะฝะธ ะฟั€ะฐะฒะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะดะพ ั„ะฐะนะป: 0%o (SHA1: %s)"
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:359
 #, c-format
 msgid "cannot read %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "ั„ะธะปั‚ัŠั€ัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัั‚ะฐั€ั‚ะธั€ะฐะฝ"
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr "ะดะตัะบั€ะธะฟั‚ะพั€ัŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะตะฝะฐัะพั‡ะตะฝ"
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "ั„ะธะปั‚ัŠั€ัŠั‚ โ€ž%sโ€œ ะฒัŠั€ะฝะฐ ะณั€ะตัˆะบะฐ"
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "ะฟัŠั‚ัั‚ ะฝะต ะต ะฟั€ะฐะฒะธะปะฝะพ ะบะพะดะธั€ะฐะฝ ะฒ UTF-8: %s"
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "ั‚ะฒัŠั€ะดะต ะดัŠะปัŠะณ ะฟัŠั‚ (%d ะทะฝะฐะบะฐ, SHA1: %s): %s"
 
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
 #, c-format
 msgid "deflate error (%d)"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะดะตะบะพะผะฟั€ะตัะธั€ะฐะฝะต ั โ€ždeflateโ€œ (%d)"
 
-#: archive-zip.c:609
+#: archive-zip.c:615
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "ะฒั€ะตะผะตะฒะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะต ั‚ะฒัŠั€ะดะต ะณะพะปัะผะฐ ะทะฐ ั‚ะฐะทะธ ัะธัั‚ะตะผะฐ: %<PRIuMAX>"
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "โ€ž%.*sโ€œ ะต ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะทะฐ ะฐั‚ั€ะธะฑัƒั‚"
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s: ะบะพะผะฐะฝะดะฐั‚ะฐ ะฝะต ะต ะฟะพะทะฒะพะปะตะฝะฐ: โ€ž%s:%dโ€œ"
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1140,12 +1834,12 @@ msgstr "ะะตะฟั€ะฐะฒะธะปะฝะพ ั†ะธั‚ะธั€ะฐะฝะพ ััŠะดัŠั€ะถะฐะฝะธะต ะฒัŠะฒ ั„ะฐะน
 msgid "We cannot bisect more!\n"
 msgstr "ะŸะพะฒะตั‡ะต ะฝะต ะผะพะถะต ะดะฐ ัะต ั‚ัŠั€ัะธ ะดะฒะพะธั‡ะฝะพ!\n"
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ"
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1154,7 +1848,7 @@ msgstr ""
 "ะะตะฟั€ะฐะฒะธะปะฝะฐ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต: %s.\n"
 "ะกะปะตะดะพะฒะฐั‚ะตะปะฝะพ ะณั€ะตัˆะบะฐั‚ะฐ ะต ะบะพั€ะธะณะธั€ะฐะฝะฐ ะผะตะถะดัƒ โ€ž%sโ€œ ะธ [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1163,7 +1857,7 @@ msgstr ""
 "ะะพะฒะฐ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต: %s.\n"
 "ะกะฒะพะนัั‚ะฒะพั‚ะพ ะต ะฟั€ะพะผะตะฝะตะฝะพ ะผะตะถะดัƒ โ€ž%sโ€œ ะธ [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1172,7 +1866,7 @@ msgstr ""
 "ะ‘ะฐะทะฐั‚ะฐ ะทะฐ ัะปะธะฒะฐะฝะต โ€ž%sโ€œ ะต %s.\n"
 "ะกะปะตะดะพะฒะฐั‚ะตะปะฝะพ ะฟัŠั€ะฒะพั‚ะพ %s ะฟะพะดะฐะฒะฐะฝะต ะต ะผะตะถะดัƒ โ€ž%sโ€œ ะธ [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1183,7 +1877,7 @@ msgstr ""
 "ะ”ะฒะพะธั‡ะฝะพั‚ะพ ั‚ัŠั€ัะตะฝะต ั git bisect ะฝัะผะฐ ะดะฐ ั€ะฐะฑะพั‚ะธ ะฟั€ะฐะฒะธะปะฝะพ.\n"
 "ะ”ะฐะปะธ ะฝะต ัั‚ะต ะพะฑัŠั€ะบะฐะปะธ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต โ€ž%sโ€œ ะธ โ€ž%sโ€œ?\n"
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1194,36 +1888,36 @@ msgstr ""
 "ะะต ะผะพะถะต ะดะฐ ัะผะต ัะธะณัƒั€ะฝะธ, ั‡ะต ะฟัŠั€ะฒะพั‚ะพ %s ะฟะพะดะฐะฒะฐะฝะต ะต ะผะตะถะดัƒ โ€ž%sโ€œ ะธ โ€ž%sโ€œ.\n"
 "ะ”ะฒะพะธั‡ะฝะพั‚ะพ ั‚ัŠั€ัะตะฝะต ะฟั€ะพะดัŠะปะถะฐะฒะฐ."
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "ะ”ะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต: ั‚ั€ัะฑะฒะฐ ะดะฐ ัะต ะฟั€ะพะฒะตั€ะธ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต\n"
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr "ะฝะตะพะฑั…ะพะดะธะผะฐ ะต ะฒะตั€ัะธั โ€ž%sโ€œ"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
 #, c-format
 msgid "could not create file '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝ"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
 #, c-format
 msgid "could not read file '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะฟั€ะพั‡ะธั‚ะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะทะฐ ะดะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต"
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "โ€ž%sโ€œ e ะบะฐะบั‚ะพ โ€ž%sโ€œ, ั‚ะฐะบะฐ ะธ โ€ž%sโ€œ\n"
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1232,7 +1926,7 @@ msgstr ""
 "ะ›ะธะฟัะฒะฐ ะฟะพะดั…ะพะดัั‰ะพ ะทะฐ ั‚ะตัั‚ะฒะฐะฝะต ะฟะพะดะฐะฒะฐะฝะต.\n"
 "ะŸั€ะพะฒะตั€ะตั‚ะต ะฟะฐั€ะฐะผะตั‚ั€ะธั‚ะต ะทะฐ ะฟัŠั‚ะธั‰ะฐั‚ะฐ.\n"
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1242,48 +1936,48 @@ msgstr[1] "(ะฟั€ะธะฑะปะธะทะธั‚ะตะปะฝะพ %d ัั‚ัŠะฟะบะธ)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "ะ”ะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต: ะพัั‚ะฐะฒะฐ %d ะฒะตั€ัะธั ัะปะตะด ั‚ะฐะทะธ %s\n"
 msgstr[1] "ะ”ะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต: ะพัั‚ะฐะฒะฐั‚ %d ะฒะตั€ัะธะธ ัะปะตะด ั‚ะฐะทะธ %s\n"
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--contentsโ€œ ะธ โ€ž--reverseโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž--contentsโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะธะผะต ะฝะฐ ะพะฑะตะบั‚ ะพั‚ ะบั€ะฐะนะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "ะ•ะดะฝะพะฒั€ะตะผะตะฝะฝะพั‚ะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธะธั‚ะต โ€ž--reverseโ€œ ะธ โ€ž--first-parentโ€œ ะธะทะธัะบะฒะฐ "
 "ัƒะบะฐะทะฒะฐะฝะตั‚ะพ ะฝะฐ ะบั€ะฐะนะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะฝะฐัั‚ั€ะพะนะฒะฐะฝะต ะฝะฐ ะพะฑั…ะพะถะดะฐะฝะตั‚ะพ ะฝะฐ ะฒะตั€ัะธะธั‚ะต"
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "ะ•ะดะฝะพะฒั€ะตะผะตะฝะฝะพั‚ะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธะธั‚ะต โ€ž--reverseโ€œ ะธ โ€ž--first-parentโ€œ ะธะทะธัะบะฒะฐ "
 "ัƒะบะฐะทะฒะฐะฝะตั‚ะพ ะฝะฐ ะดะธะฐะฟะฐะทะพะฝ ะฟะพ ะฒะตั€ะธะณะฐั‚ะฐ ะฝะฐ ะฟัŠั€ะฒะธั‚ะต ะฝะฐัะปะตะดะฝะธั†ะธ"
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr "ะฝัะผะฐ ะฟัŠั‚ ะฝะฐ ะธะผะต โ€ž%sโ€œ ะฒ โ€ž%sโ€œ"
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚-BLOB โ€ž%sโ€œ ะฒ ะฟัŠั‚ั %s ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
@@ -1436,8 +2130,8 @@ msgstr "ะคะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะธะทะณะปะตะถะดะฐ ะดะฐ ะต ะฟั€ะฐั‚ะบะฐ ะฝะฐ gi
 msgid "unrecognized header: %s%s (%d)"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะทะฐะณะปะฐะฒะฝะฐ ั‡ะฐัั‚: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
 #, c-format
 msgid "could not open '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฒะพั€ะธ"
@@ -1468,63 +2162,63 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "ะŸั€ะฐั‚ะบะฐั‚ะฐ ะธะทะธัะบะฒะฐ ัะปะตะดะฝะธั ัƒะบะฐะทะฐั‚ะตะป:"
 msgstr[1] "ะŸั€ะฐั‚ะบะฐั‚ะฐ ะธะทะธัะบะฒะฐ ัะปะตะดะฝะธั‚ะต %d ัƒะบะฐะทะฐั‚ะตะปะธ:"
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะดัƒะฑะปะธั€ะฐะฝะต ะฝะฐ ะดะตัะบั€ะธะฟั‚ะพั€ะฐ ะฝะฐ ะฟั€ะฐั‚ะบะฐั‚ะฐ ั โ€ždupโ€œ"
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "ะšะพะผะฐะฝะดะฐั‚ะฐ โ€žgit pack-objectsโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัั‚ะฐั€ั‚ะธั€ะฐะฝะฐ"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "ะšะพะผะฐะฝะดะฐั‚ะฐ โ€žgit pack-objectsโ€œ ะฝะต ะทะฐะฒัŠั€ัˆะธ ัƒัะฟะตัˆะฝะพ"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "ะšะพะผะฐะฝะดะฐั‚ะฐ โ€žgit rev-listโ€œ ะฝะต ะทะฐะฒัŠั€ัˆะธ ัƒัะฟะตัˆะฝะพ"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€ž%sโ€œ ะฝะต ะต ะฑะธะป ะฒะบะปัŽั‡ะตะฝ ะฟะพั€ะฐะดะธ ะพะฟั†ะธะธั‚ะต ะทะฐะดะฐะดะตะฝะธ ะฝะฐ โ€žgit rev-listโ€œ"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฐั€ะณัƒะผะตะฝั‚: %s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "ะกัŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟั€ะฐะทะฝะฐ ะฟั€ะฐั‚ะบะฐ ะต ะฝะตะฒัŠะทะผะพะถะฝะพ."
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "ะคะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝ"
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "ะšะพะผะฐะฝะดะฐั‚ะฐ โ€žgit index-packโ€œ ะฝะต ะทะฐะฒัŠั€ัˆะธ ัƒัะฟะตัˆะฝะพ"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ ั†ะฒัั‚: %.*s"
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต!"
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1543,33 +2237,33 @@ msgstr ""
 "\n"
 "    git replace --convert-graft-file\n"
 "\n"
-"ะ—ะฐ ะดะฐ ะธะทะบะปัŽั‡ะธั‚ะต ั‚ะพะฒะฐ ััŠะพะฑั‰ะตะฝะธะต, ะฟะพะปะทะฒะฐะนั‚ะต ะบะพะผะฐะฝะดะฐั‚ะฐ:\n"
+"ะ—ะฐ ะดะฐ ะธะทะบะปัŽั‡ะธั‚ะต ั‚ะพะฒะฐ ััŠะพะฑั‰ะตะฝะธะต, ะธะทะฟัŠะปะฝะตั‚ะต:\n"
 "\n"
 "    git config advice.graftFileDeprecated false"
 
-#: commit.c:1127
+#: commit.c:1153
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "ะŸะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะต ั ะฝะตะดะพะฒะตั€ะตะฝ ะฟะพะดะฟะธั ะพั‚ GPG, ะบะพะนั‚ะพ ั‚ะฒัŠั€ะดะธ, ั‡ะต ะต ะฝะฐ โ€ž%sโ€œ."
 
-#: commit.c:1130
+#: commit.c:1157
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "ะŸะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะต ั ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟะพะดะฟะธั ะพั‚ GPG, ะบะพะนั‚ะพ ั‚ะฒัŠั€ะดะธ, ั‡ะต ะต ะฝะฐ โ€ž%sโ€œ."
 
-#: commit.c:1133
+#: commit.c:1160
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "ะŸะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะต ะฑะตะท ะฟะพะดะฟะธั ะพั‚ GPG."
 
-#: commit.c:1136
+#: commit.c:1163
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "ะŸะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะต ั ะบะพั€ะตะบั‚ะตะฝ ะฟะพะดะฟะธั ะพั‚ GPG ะฝะฐ โ€ž%sโ€œ.\n"
 
-#: commit.c:1390
+#: commit.c:1417
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1579,168 +2273,178 @@ msgstr ""
 "ะœะพะถะต ะดะฐ ะฟะพะฟั€ะฐะฒะธั‚ะต ะฟะพะดะฐะฒะฐะฝะตั‚ะพ ะทะฐะตะดะฝะพ ััŠั ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะธะปะธ ะผะพะถะต ะดะฐ\n"
 "ะทะฐะดะฐะดะตั‚ะต ะฟะพะปะทะฒะฐะฝะพั‚ะพ ะบะพะดะธั€ะฐะฝะต ะฒ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€ži18n.commitencodingโ€œ.\n"
 
-#: commit-graph.c:127
+#: commit-graph.c:122
 msgid "commit-graph file is too small"
 msgstr "ั„ะฐะนะปัŠั‚ ั ะณั€ะฐฬ€ั„ะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต ั‚ะฒัŠั€ะดะต ะผะฐะปัŠะบ"
 
-#: commit-graph.c:192
+#: commit-graph.c:189
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "ะพั‚ะฟะตั‡ะฐั‚ัŠะบัŠั‚ ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ %X ะฝะต ััŠะฒะฟะฐะดะฐ ั %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:196
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "ะฒะตั€ัะธัั‚ะฐ ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ %X ะฝะต ััŠะฒะฟะฐะดะฐ ั %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:203
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "ะฒะตั€ัะธัั‚ะฐ ะฝะฐ ะบะพะฝั‚ั€ะพะปะฝะฐั‚ะฐ ััƒะผะฐ ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ %X ะฝะต ััŠะฒะฟะฐะดะฐ ั %X"
 
-#: commit-graph.c:229
+#: commit-graph.c:226
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr ""
 "ะทะฐะฟะธััŠั‚ ะฒ ั‚ะฐะฑะปะธั†ะฐั‚ะฐ ะทะฐ ะพั‚ะบัŠัะธ ะปะธะฟัะฒะฐ, ั„ะฐะนะปัŠั‚ ะทะฐ ะณั€ะฐฬ€ั„ะฐ ะผะพะถะต ะดะฐ ะต ะฝะตะฟัŠะปะตะฝ"
 
-#: commit-graph.c:240
+#: commit-graph.c:237
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะพั‚ะผะตัั‚ะฒะฐะฝะต ะฝะฐ ะพั‚ะบัŠั: %08x%08x"
 
-#: commit-graph.c:283
+#: commit-graph.c:280
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "ะพั‚ะบัŠััŠั‚ %08x ัะต ัะฒัะฒะฐ ะผะฝะพะณะพะบั€ะฐั‚ะฝะพ"
 
-#: commit-graph.c:347
+#: commit-graph.c:343
 msgid "commit-graph has no base graphs chunk"
 msgstr "ะฑะฐะทะพะฒะธัั‚ ะพั‚ะบัŠั ะปะธะฟัะฒะฐ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: commit-graph.c:357
+#: commit-graph.c:353
 msgid "commit-graph chain does not match"
 msgstr "ะฒะตั€ะธะณะฐั‚ะฐ ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ััŠะฒะฟะฐะดะฐ"
 
-#: commit-graph.c:404
+#: commit-graph.c:401
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
 "ะณั€ะตัˆะบะฐ ะฒัŠะฒ ะฒะตั€ะธะณะฐั‚ะฐ ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ: ั€ะตะด โ€ž%sโ€œ ะฝะต ะต ะบะพะฝั‚ั€ะพะปะฝะฐ ััƒะผะฐ"
 
-#: commit-graph.c:430
+#: commit-graph.c:425
 msgid "unable to find all commit-graph files"
 msgstr "ะฝัะบะพะธ ั„ะฐะนะปะพะฒะต ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะพั‚ะบั€ะธั‚ะธ"
 
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:558 commit-graph.c:618
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฟะพะทะธั†ะธั ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ.  ะ’ะตั€ะพัั‚ะฝะพ ะณั€ะฐั„ัŠั‚ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต ะฟะพะฒั€ะตะดะตะฝ"
 
-#: commit-graph.c:575
+#: commit-graph.c:579
 #, c-format
 msgid "could not find commit %s"
 msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ"
 
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะพ: %s"
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "ะฒะธะดัŠั‚ ะฝะฐ ะพะฑะตะบั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฟั€ะตะดะตะปะตะฝ"
 
-#: commit-graph.c:1034
+#: commit-graph.c:1043
 msgid "Loading known commits in commit graph"
 msgstr "ะ—ะฐั€ะตะถะดะฐะฝะต ะฝะฐ ะฟะพะทะฝะฐั‚ะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: commit-graph.c:1051
+#: commit-graph.c:1060
 msgid "Expanding reachable commits in commit graph"
 msgstr "ะ ะฐะทัˆะธั€ัะฒะฐะฝะต ะฝะฐ ะดะพัั‚ะธะถะธะผะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะณั€ะฐฬ€ั„ะฐ"
 
-#: commit-graph.c:1070
+#: commit-graph.c:1079
 msgid "Clearing commit marks in commit graph"
 msgstr "ะ˜ะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ะพั‚ะฑะตะปัะทะฒะฐะฝะธัั‚ะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: commit-graph.c:1089
+#: commit-graph.c:1098
 msgid "Computing commit graph generation numbers"
 msgstr "ะ˜ะทั‡ะธัะปัะฒะฐะฝะต ะฝะฐ ะฝะพะผะตั€ะฐั‚ะฐ ะฝะฐ ะฟะพะบะพะปะตะฝะธัั‚ะฐ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: commit-graph.c:1163
+#: commit-graph.c:1173
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "ะžั‚ะบั€ะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ ะณั€ะฐฬ€ั„ะฐ ะฒ %d ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป"
 msgstr[1] "ะžั‚ะบั€ะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ ะณั€ะฐฬ€ั„ะฐ ะฒ %d ะฟะฐะบะตั‚ะฝะธ ั„ะฐะนะปะฐ"
 
-#: commit-graph.c:1176
+#: commit-graph.c:1186
 #, c-format
 msgid "error adding pack %s"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป โ€ž%sโ€œ"
 
-#: commit-graph.c:1180
+#: commit-graph.c:1190
 #, c-format
 msgid "error opening index for %s"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะพั‚ะฒะฐั€ัะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะฐ โ€ž%sโ€œ"
 
-#: commit-graph.c:1204
+#: commit-graph.c:1214
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
 msgstr[0] "ะžั‚ะบั€ะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ ะณั€ะฐฬ€ั„ะฐ ะธะทะผะตะถะดัƒ %d ัƒะบะฐะทะฐั‚ะตะป"
 msgstr[1] "ะžั‚ะบั€ะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ ะณั€ะฐฬ€ั„ะฐ ะธะทะผะตะถะดัƒ %d ัƒะบะฐะทะฐั‚ะตะปะธ"
 
-#: commit-graph.c:1238
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ ะฝะฐ ะพะฑะตะบั‚-ะฟะพะดะฐะฒะฐะฝะต: โ€ž%sโ€œ"
+
+#: commit-graph.c:1249
 msgid "Finding commits for commit graph among packed objects"
 msgstr "ะžั‚ะบั€ะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ ะณั€ะฐฬ€ั„ะฐ ะธะทะผะตะถะดัƒ ะฟะฐะบะตั‚ะธั€ะฐะฝะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: commit-graph.c:1253
+#: commit-graph.c:1264
 msgid "Counting distinct commits in commit graph"
 msgstr "ะŸั€ะตะฑั€ะพัะฒะฐะฝะต ะฝะฐ ั€ะฐะทะปะธั‡ะฝะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะณั€ะฐฬ€ั„ะฐ"
 
-#: commit-graph.c:1284
+#: commit-graph.c:1294
 msgid "Finding extra edges in commit graph"
 msgstr "ะžั‚ะบั€ะธะฒะฐะฝะต ะฝะฐ ะพั‰ะต ะฒัŠั€ั…ะพะฒะต ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: commit-graph.c:1332
+#: commit-graph.c:1340
 msgid "failed to write correct number of base graph ids"
 msgstr "ะฟั€ะฐะฒะธะปะฝะธัั‚ ะฑั€ะพะน ะฝะฐ ะฑะฐะทะพะฒะธั‚ะต ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัˆะต"
 
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1373 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "ั€ะพะดะธั‚ะตะปัะบะธั‚ะต ะดะธั€ะตะบั‚ะพั€ะธะธ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ััŠะทะดะฐะดะตะฝะธ"
 
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr "ะฟะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝ"
 
-#: commit-graph.c:1437
+#: commit-graph.c:1445
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "ะ—ะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ %d ะฟะฐั"
 msgstr[1] "ะ—ะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ %d ะฟะฐัะฐ"
 
-#: commit-graph.c:1478
+#: commit-graph.c:1486
 msgid "unable to open commit-graph chain file"
 msgstr "ั„ะฐะนะปัŠั‚ ั ะฒะตั€ะธะณะฐั‚ะฐ ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฒะพั€ะธ"
 
-#: commit-graph.c:1490
+#: commit-graph.c:1498
 msgid "failed to rename base commit-graph file"
 msgstr "ะพัะฝะพะฒะฝะธัั‚ ั„ะฐะนะป ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ"
 
-#: commit-graph.c:1510
+#: commit-graph.c:1518
 msgid "failed to rename temporary commit-graph file"
 msgstr "ะฒั€ะตะผะตะฝะฝะธัั‚ ั„ะฐะนะป ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ"
 
-#: commit-graph.c:1621
+#: commit-graph.c:1631
 msgid "Scanning merged commits"
 msgstr "ะขัŠั€ัะตะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ััŠั ัะปะธะฒะฐะฝะธั"
 
-#: commit-graph.c:1632
+#: commit-graph.c:1642
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝ, ะฟะพะฒั‚ะฐั€ัั‰ ัะต ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต: %s"
 
-#: commit-graph.c:1657
+#: commit-graph.c:1665
 msgid "Merging commit-graph"
 msgstr "ะกะปะธะฒะฐะฝะต ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
@@ -1753,25 +2457,25 @@ msgstr "ั„ะพั€ะผะฐั‚ัŠั‚ ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะผะพะถ
 msgid "too many commits to write graph"
 msgstr "ะฟั€ะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฟะพะดะฐะฒะฐะฝะธั ะทะฐ ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะณั€ะฐฬ€ั„ะฐ"
 
-#: commit-graph.c:1945
+#: commit-graph.c:1944
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "ะณั€ะฐั„ัŠั‚ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต ั ะณั€ะตัˆะฝะฐ ััƒะผะฐ ะทะฐ ะฟั€ะพะฒะตั€ะบะฐ โ€” ะฒะตั€ะพัั‚ะฝะพ ะต ะฟะพะฒั€ะตะดะตะฝ"
 
-#: commit-graph.c:1955
+#: commit-graph.c:1954
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฟะพะดั€ะตะดะฑะฐ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะฟะพ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ: โ€ž%sโ€œ "
 "ะต ะฟั€ะตะดะธ โ€ž%sโ€œ, ะฐ ะฝะต ั‚ั€ัะฑะฒะฐ"
 
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1964 commit-graph.c:1979
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ ะพั‚ะบัŠั ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ: fanout[%d] = %u, ะฐ "
 "ั‚ั€ัะฑะฒะฐ ะดะฐ ะต %u"
 
-#: commit-graph.c:1972
+#: commit-graph.c:1971
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
@@ -1780,36 +2484,36 @@ msgstr "ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต
 msgid "Verifying commits in commit graph"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ ะณั€ะฐฬ€ั„ะฐ"
 
-#: commit-graph.c:2002
+#: commit-graph.c:2003
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฒ ะฑะฐะทะฐั‚ะฐ ะพั‚ ะดะฐะฝะฝะธ ะบัŠะผ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต "
 "ะฐะฝะฐะปะธะทะธั€ะฐ"
 
-#: commit-graph.c:2009
+#: commit-graph.c:2010
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ัŠั‚ ะฝะฐ ะพะฑะตะบั‚ ะทะฐ ะบะพั€ะตะฝะพะฒะพั‚ะพ ะดัŠั€ะฒะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฒ ะณั€ะฐฬ€ั„ะฐ ั "
 "ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต โ€ž%sโ€œ, ะฐ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต โ€ž%sโ€œ"
 
-#: commit-graph.c:2019
+#: commit-graph.c:2020
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "ัะฟะธััŠะบัŠั‚ ั ั€ะพะดะธั‚ะตะปะธ ะฝะฐ โ€ž%sโ€œ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต ะฟั€ะตะบะฐะปะตะฝะพ ะดัŠะปัŠะณ"
 
-#: commit-graph.c:2028
+#: commit-graph.c:2029
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "ั€ะพะดะธั‚ะตะปัั‚ ะฝะฐ โ€ž%sโ€œ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต โ€ž%sโ€œ, ะฐ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต โ€ž%sโ€œ"
 
-#: commit-graph.c:2041
+#: commit-graph.c:2042
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "ัะฟะธััŠะบัŠั‚ ั ั€ะพะดะธั‚ะตะปะธ ะฝะฐ โ€ž%sโ€œ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต ะฟั€ะตะบะฐะปะตะฝะพ ะบัŠั"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2047
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1817,7 +2521,7 @@ msgstr ""
 "ะฝะพะผะตั€ัŠั‚ ะฝะฐ ะฟะพะบะพะปะตะฝะธะตั‚ะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต 0, ะฐ ะดั€ัƒะณะฐะดะต "
 "ะฝะต ะต"
 
-#: commit-graph.c:2050
+#: commit-graph.c:2051
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1825,14 +2529,14 @@ msgstr ""
 "ะฝะพะผะตั€ัŠั‚ ะฝะฐ ะฟะพะบะพะปะตะฝะธะตั‚ะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะต 0, ะฐ "
 "ะดั€ัƒะณะฐะดะต ะต"
 
-#: commit-graph.c:2065
+#: commit-graph.c:2066
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr ""
 "ะฝะพะผะตั€ัŠั‚ ะฝะฐ ะฟะพะบะพะปะตะฝะธะตั‚ะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฒ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต %u, ะฐ "
 "ะดั€ัƒะณะฐะดะต ะต %u"
 
-#: commit-graph.c:2071
+#: commit-graph.c:2072
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
@@ -1881,7 +2585,7 @@ msgstr "ะบะปัŽั‡ัŠั‚ ะฝะต ััŠะดัŠั€ะถะฐ ั€ะฐะทะดะตะป: โ€ž%sโ€œ"
 msgid "key does not contain variable name: %s"
 msgstr "ะบะปัŽั‡ัŠั‚ ะฝะต ััŠะดัŠั€ะถะฐ ะธะผะต ะฝะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐ: โ€ž%sโ€œ"
 
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2444
 #, c-format
 msgid "invalid key: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะบะปัŽั‡: โ€ž%sโ€œ"
@@ -2021,7 +2725,7 @@ msgstr ""
 "โ€žsimpleโ€œ (ะบะปะพะฝัŠั‚ ััŠั ััŠั‰ะพั‚ะพ ะธะผะต, ะพั‚ ะบะพะนั‚ะพ ัะต ะธะทะดัŠั€ะฟะฒะฐ), โ€župstreamโ€œ (ะบะปะพะฝัŠั‚, "
 "ะพั‚ ะบะพะนั‚ะพ ัะต ะธะทะดัŠั€ะฟะฒะฐ) ะธะปะธ โ€žcurrentโ€œ (ะบะปะพะฝัŠั‚ ััŠั ััŠั‰ะพั‚ะพ ะธะผะต)"
 
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1518 builtin/pack-objects.c:3541
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะฝะธะฒะพ ะฝะฐ ะบะพะผะฟั€ะตัะธั€ะฐะฝะต ะฟั€ะธ ะฟะฐะบะตั‚ะธั€ะฐะฝะต: %d"
@@ -2046,114 +2750,107 @@ msgstr "ะพะฑะตะบั‚ัŠั‚-BLOB โ€ž%sโ€œ ั ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะธ ะฝะต ะผะพะถะต ะ
 msgid "failed to parse %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝ"
 
-#: config.c:1745
+#: config.c:1743
 msgid "unable to parse command-line config"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะธ ะฝะฐัั‚ั€ะพะนะบะธ ะพั‚ ะบะพะผะฐะฝะดะฝะธั ั€ะตะด"
 
-#: config.c:2094
+#: config.c:2097
 msgid "unknown error occurred while reading the configuration files"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝะฐ ะณั€ะตัˆะบะฐ ะฟั€ะธ ะธะทั‡ะธั‚ะฐะฝะตั‚ะพ ะฝะฐ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: config.c:2264
+#: config.c:2267
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ %s: โ€ž%sโ€œ"
 
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-"ะฝะตะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ ะทะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žcore.untrackedCacheโ€œ.  ะฉะต ัะต ะฟะพะปะทะฒะฐ "
-"ัั‚ะฐะฝะดะฐั€ั‚ะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ โ€žkeepโ€œ (ะทะฐะฟะฐะทะฒะฐะฝะต)"
-
-#: config.c:2333
+#: config.c:2312
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ โ€žsplitIndex.maxPercentChangeโ€œ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ะผะตะถะดัƒ 1 ะธ 100, ะฐ ะฝะต "
 "%d"
 
-#: config.c:2379
+#: config.c:2358
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "ะฝะตั€ะฐะทะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ ะพั‚ ะบะพะผะฐะฝะดะฝะธั ั€ะตะด"
 
-#: config.c:2381
+#: config.c:2360
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐ โ€ž%sโ€œ ะฒัŠะฒ ั„ะฐะนะปะฐ โ€ž%sโ€œ ะฝะฐ ั€ะตะด โ„–%d"
 
-#: config.c:2462
+#: config.c:2441
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ั€ะฐะทะดะตะป: โ€ž%sโ€œ"
 
-#: config.c:2494
+#: config.c:2473
 #, c-format
 msgid "%s has multiple values"
 msgstr "ะทะฐะดะฐะดะตะฝะธ ัะฐ ะฝัะบะพะปะบะพ ัั‚ะพะนะฝะพัั‚ะธ ะทะฐ โ€ž%sโ€œ"
 
-#: config.c:2523
+#: config.c:2502
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "ะฝะพะฒะธัั‚ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะตะฝ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝ"
 
-#: config.c:2775 config.c:3099
+#: config.c:2754 config.c:3078
 #, c-format
 msgid "could not lock config file %s"
 msgstr "ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะบะปัŽั‡ะตะฝ"
 
-#: config.c:2786
+#: config.c:2765
 #, c-format
 msgid "opening %s"
 msgstr "ะพั‚ะฒะฐั€ัะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: config.c:2821 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัˆะฐะฑะปะพะฝ: %s"
 
-#: config.c:2846
+#: config.c:2825
 #, c-format
 msgid "invalid config file %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะตะฝ ั„ะฐะนะป: โ€ž%sโ€œ"
 
-#: config.c:2859 config.c:3112
+#: config.c:2838 config.c:3091
 #, c-format
 msgid "fstat on %s failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žfstatโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ"
 
-#: config.c:2870
+#: config.c:2849
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žmmapโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ"
 
-#: config.c:2879 config.c:3117
+#: config.c:2858 config.c:3096
 #, c-format
 msgid "chmod on %s failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะฐ ัะผัะฝะฐ ะฝะฐ ะฟั€ะฐะฒะฐ ั โ€žchmodโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ"
 
-#: config.c:2964 config.c:3214
+#: config.c:2943 config.c:3193
 #, c-format
 msgid "could not write config file %s"
 msgstr "ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
 
-#: config.c:2998
+#: config.c:2977
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ€ž%sโ€œ"
 
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะตะผะฐั…ะฝะต"
 
-#: config.c:3090
+#: config.c:3069
 #, c-format
 msgid "invalid section name: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ั€ะฐะทะดะตะป: %s"
 
-#: config.c:3257
+#: config.c:3236
 #, c-format
 msgid "missing value for '%s'"
 msgstr "ะปะธะฟัะฒะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€ž%sโ€œ"
@@ -2278,7 +2975,7 @@ msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะบั€ะธะต (%s)"
 msgid "unknown port %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฟะพั€ั‚ โ€ž%sโ€œ"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "ะฝะตะพะฑะธั‡ะฐะนะฝะพั‚ะพ ะธะผะต ะฝะฐ ั…ะพัั‚ โ€ž%sโ€œ ะต ะฑะปะพะบะธั€ะฐะฝะพ"
@@ -2293,62 +2990,62 @@ msgstr "ะฝะตะพะฑะธั‡ะฐะนะฝะธัั‚ ะฟะพั€ั‚ โ€ž%sโ€œ ะต ะฑะปะพะบะธั€ะฐะฝ"
 msgid "cannot start proxy %s"
 msgstr "ะฟะพัั€ะตะดะฝะธะบัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ัั‚ะฐั€ั‚ะธั€ะฐ"
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "ะฝะต ะต ัƒะบะฐะทะฐะฝ ะฟัŠั‚. ะŸั€ะพะฒะตั€ะตั‚ะต ัะธะฝั‚ะฐะบัะธัะฐ ั ะบะพะผะฐะฝะดะฐั‚ะฐ:\n"
 "\n"
 "    git help pull"
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ะฒะฐั€ะธะฐะฝั‚ัŠั‚ ะทะฐ โ€žsshโ€œ โ€” โ€žsimpleโ€œ (ะพะฟั€ะพัั‚ะตะฝ), ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž-4โ€œ"
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ะฒะฐั€ะธะฐะฝั‚ัŠั‚ ะทะฐ โ€žsshโ€œ โ€” โ€žsimpleโ€œ (ะพะฟั€ะพัั‚ะตะฝ), ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž-6โ€œ"
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 "ะฒะฐั€ะธะฐะฝั‚ัŠั‚ ะทะฐ โ€žsshโ€œ โ€” โ€žsimpleโ€œ (ะพะฟั€ะพัั‚ะตะฝ), ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะทะฐะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟะพั€ั‚"
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "ะฝะตะพะฑะธั‡ะฐะนะฝะธัั‚ ะฟัŠั‚ โ€ž%sโ€œ ะต ะฑะปะพะบะธั€ะฐะฝ"
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะพั†ะตั"
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ัะฒัŠั€ะทะฐะฝะพัั‚ั‚ะฐ"
 
-#: connected.c:98
+#: connected.c:110
 msgid "Could not run 'git rev-list'"
 msgstr "ะšะพะผะฐะฝะดะฐั‚ะฐ โ€žgit rev-listโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทะฟัŠะปะฝะตะฝะฐ."
 
-#: connected.c:118
+#: connected.c:130
 msgid "failed write to rev-list"
 msgstr "ะฝะตัƒัะฟะตัˆะตะฝ ะทะฐะฟะธั ะฝะฐ ัะฟะธััŠะบะฐ ั ะฒะตั€ัะธะธั‚ะต"
 
-#: connected.c:125
+#: connected.c:137
 msgid "failed to close rev-list's stdin"
 msgstr "ัั‚ะฐะฝะดะฐั€ั‚ะฝะธัั‚ ะฒั…ะพะด ะฝะฐ ัะฟะธััŠะบะฐ ั ะฒะตั€ัะธะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐั‚ะฒะพั€ะตะฝ"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะดะตะนัั‚ะฒะธะต ะทะฐ ะบั€ะฐะน ะฝะฐ ั€ะตะด: %d"
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "ะ’ััะบะฐ ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะพัั‚ ะพั‚ ะทะฝะฐั†ะธ โ€žCRLFโ€œ ั‰ะต ะฑัŠะดe ะทะฐะผะตะฝะตะฝะฐ ั โ€žLFโ€œ ะฒ โ€ž%sโ€œ."
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2358,13 +3055,13 @@ msgstr ""
 "ะคะฐะนะปัŠั‚ ั‰ะต ะพัั‚ะฐะฝะต ั ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะธั‚ะต ะทะฝะฐั†ะธ ะทะฐ ะบั€ะฐะน ะฝะฐ ั€ะตะด ะฒ ั€ะฐะฑะพั‚ะฝะฐั‚ะฐ ะฒะธ "
 "ะดะธั€ะตะบั‚ะพั€ะธั."
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr ""
 "ะ’ัะตะบะธ ะทะฝะฐะบ โ€žLFโ€œ ั‰ะต ะฑัŠะดe ะทะฐะผะตะฝะตะฝ ั ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะพัั‚ั‚ะฐ ะพั‚ ะทะฝะฐั†ะธ โ€žCRLFโ€œ ะฒ โ€ž%sโ€œ."
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2375,21 +3072,21 @@ msgstr ""
 "ะคะฐะนะปัŠั‚ ั‰ะต ะพัั‚ะฐะฝะต ั ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะธั‚ะต ะทะฝะฐั†ะธ ะทะฐ ะบั€ะฐะน ะฝะฐ ั€ะตะด ะฒ ั€ะฐะฑะพั‚ะฝะฐั‚ะฐ ะฒะธ "
 "ะดะธั€ะตะบั‚ะพั€ะธั."
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr ""
 "โ€ž%sโ€œ ะฝะต ั‚ั€ัะฑะฒะฐ ะดะฐ ััŠะดัŠั€ะถะฐ ะผะฐั€ะบะตั€ ะทะฐ ะฟะพั€ะตะดะฝะพัั‚ั‚ะฐ ะฝะฐ ะฑะฐะนั‚ะพะฒะตั‚ะต (BOM) ะฟั€ะธ "
 "ะบะพะดะธั€ะฐะฝะต โ€ž%sโ€œ"
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
 "ะคะฐะนะปัŠั‚ โ€ž%sโ€œ ััŠะดัŠั€ะถะฐ ะผะฐั€ะบะตั€ ะทะฐ ะฟะพั€ะตะดะฝะพัั‚ั‚ะฐ ะฝะฐ ะฑะฐะนั‚ะพะฒะตั‚ะต (BOM).  ะ˜ะทะฟะพะปะทะฒะฐะนั‚ะต "
-"โ€žUTF-%sโ€œ ะบะฐั‚ะพ ะบะพะดะธั€ะฐะฝะต ะทะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ."
+"โ€žUTF-%.*sโ€œ ะบะฐั‚ะพ ะบะพะดะธั€ะฐะฝะต ะทะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ."
 
 #: convert.c:304
 #, c-format
@@ -2408,50 +3105,50 @@ msgstr ""
 "ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะธะทะฟะพะปะทะฒะฐะนั‚ะต UTF-%sBE ะธะปะธ UTF-%sLE (ะฒ ะทะฐะฒะธัะธะผะพัั‚ ะพั‚ "
 "ะฟะพั€ะตะดะฝะพัั‚ั‚ะฐ ะฝะฐ ะฑะฐะนั‚ะพะฒะตั‚ะต)."
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะฟั€ะตะบะพะดะธั€ะฐะฝะต ะฝะฐ โ€ž%sโ€œ ะพั‚ โ€ž%sโ€œ ะบัŠะผ โ€ž%sโ€œ"
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "ะŸั€ะตะบะพะดะธั€ะฐะฝะตั‚ะพ ะฝะฐ โ€ž%sโ€œ ะพั‚ โ€ž%sโ€œ ะบัŠะผ โ€ž%sโ€œ ะธ ะพะฑั€ะฐั‚ะฝะพ ะฟั€ะพะผะตะฝั ั„ะฐะนะปะฐ"
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะพั†ะตั ะทะฐ ะฒัŠะฝัˆะตะฝ ั„ะธะปั‚ัŠั€ โ€ž%sโ€œ"
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "ะฒั…ะพะดัŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะดะฐะดะตะฝ ะฝะฐ ะฒัŠะฝัˆะฝะธั ั„ะธะปั‚ัŠั€ โ€ž%sโ€œ"
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะฒัŠะฝัˆะฝะธั ั„ะธะปั‚ัŠั€ โ€ž%sโ€œ: %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั‡ะตั‚ะตะฝะต ะพั‚ ะฒัŠะฝัˆะฝะธั ั„ะธะปั‚ัŠั€ โ€ž%sโ€œ"
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะฒัŠะฝัˆะฝะธั ั„ะธะปั‚ัŠั€ โ€ž%sโ€œ"
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝ ะฒะธะด ั„ะธะปั‚ัŠั€"
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr "ะฟัŠั‚ัั‚ ะต ะฟั€ะตะบะฐะปะตะฝะพ ะดัŠะปัŠะณ ะทะฐ ะฒัŠะฝัˆะตะฝ ั„ะธะปั‚ัŠั€"
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2460,67 +3157,67 @@ msgstr ""
 "ะฒัŠะฝัˆะฝะธัั‚ ั„ะธะปั‚ัŠั€ โ€ž%sโ€œ ะฒะตั‡ะต ะฝะต ะต ะฝะฐะปะธั‡ะตะฝ, ะฒัŠะฟั€ะตะบะธ ั‡ะต ะฝะต ะฒัะธั‡ะบะธ ะฟัŠั‚ะธั‰ะฐ ัะฐ "
 "ั„ะธะปั‚ั€ะธั€ะฐะฝะธ"
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr "โ€žtrueโ€œ/โ€žfalseโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะฐ ะบะพะดะธั€ะฐะฝะธั ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะดะตะบะพะดะธั€ะฐั‰ ั„ะธะปั‚ัŠั€ โ€ž%sโ€œ"
 
-#: convert.c:1476
+#: convert.c:1489
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบะพะดะธั€ะฐั‰ ั„ะธะปั‚ัŠั€ โ€ž%sโ€œ"
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr "ะฒ ะฑัŠะดะตั‰ะตั‚ะพ"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "ะฟั€ะตะดะธ %<PRIuMAX> ัะตะบัƒะฝะดะฐ"
 msgstr[1] "ะฟั€ะตะดะธ %<PRIuMAX> ัะตะบัƒะฝะดะธ"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "ะฟั€ะตะดะธ %<PRIuMAX> ะผะธะฝัƒั‚ะฐ"
 msgstr[1] "ะฟั€ะตะดะธ %<PRIuMAX> ะผะธะฝัƒั‚ะธ"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "ะฟั€ะตะดะธ %<PRIuMAX> ั‡ะฐั"
 msgstr[1] "ะฟั€ะตะดะธ %<PRIuMAX> ั‡ะฐัะฐ"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "ะฟั€ะตะดะธ %<PRIuMAX> ะดะตะฝ"
 msgstr[1] "ะฟั€ะตะดะธ %<PRIuMAX> ะดะตะฝะฐ"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "ะฟั€ะตะดะธ %<PRIuMAX> ัะตะดะผะธั†ะฐ"
 msgstr[1] "ะฟั€ะตะดะธ %<PRIuMAX> ัะตะดะผะธั†ะธ"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "ะฟั€ะตะดะธ %<PRIuMAX> ะผะตัะตั†"
 msgstr[1] "ะฟั€ะตะดะธ %<PRIuMAX> ะผะตัะตั†ะฐ"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2528,14 +3225,14 @@ msgstr[0] "%<PRIuMAX> ะณะพะดะธะฝะฐ"
 msgstr[1] "%<PRIuMAX> ะณะพะดะธะฝะธ"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "ะฟั€ะตะดะธ %s ะธ %<PRIuMAX> ะผะตัะตั†"
 msgstr[1] "ะฟั€ะตะดะธ %s ะธ %<PRIuMAX> ะผะตัะตั†ะฐ"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2573,7 +3270,7 @@ msgstr "ะžั‚ะฑะตะปัะทะฐะฝะธ ัะฐ %d ะณั€ัƒะฟะธ, ั€ะฐะฑะพั‚ะฐั‚ะฐ ะฟั€ะธะบะปัŽั‡
 msgid "failed to read orderfile '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ ั ะฟะพะดั€ะตะดะฑะฐั‚ะฐ ะฝะฐ ััŠะพั‚ะฒะตั‚ัั‚ะฒะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr "ะขัŠั€ัะตะฝะต ะฝะฐ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธั ะฝะฐ ะพะฑะตะบั‚ะธ ััŠั‡ะตั‚ะฐะฝะธ ั ะฟั€ะพะผะตะฝะธ"
 
@@ -2645,38 +3342,38 @@ msgstr ""
 "ะ“ั€ะตัˆะบะธ ะฒ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€ždiff.dirstatโ€œ:\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 "ะฒัŠะฝัˆะฝะฐั‚ะฐ ะฟั€ะพะณั€ะฐะผะฐ ะทะฐ ั€ะฐะทะปะธะบะธ ะทะฐะฒัŠั€ัˆะธ ะฝะตัƒัะฟะตัˆะฝะพ.  ะกะฟะธั€ะฐะฝะต ะฝะฐ ั€ะฐะฑะพั‚ะฐั‚ะฐ ะฟั€ะธ โ€ž%sโ€œ"
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "ะžะฟั†ะธะธั‚ะต โ€ž--name-onlyโ€œ, โ€ž--name-statusโ€œ, โ€ž--checkโ€œ ะธ โ€ž-sโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ "
 "ะตะดะฝะฐ ั ะดั€ัƒะณะฐ"
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž-Gโ€œ, โ€ž-Sโ€œ ะธ โ€ž--find-objectโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ะตะดะฝะฐ ั ะดั€ัƒะณะฐ"
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž--followโ€œ ะธะทะธัะบะฒะฐ ั‚ะพั‡ะฝะพ ะตะดะธะฝ ะฟัŠั‚"
 
-#: diff.c:4689
+#: diff.c:4676
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€ž--statโ€œ: %s"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะพั‡ะฐะบะฒะฐ ั‡ะธัะปะพ ะทะฐ ะฐั€ะณัƒะผะตะฝั‚"
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2685,44 +3382,44 @@ msgstr ""
 "ะะตั€ะฐะทะฟะพะทะฝะฐั‚ ะฟะฐั€ะฐะผะตั‚ัŠั€ ะบัŠะผ ะพะฟั†ะธัั‚ะฐ โ€ž--dirstat/-Xโ€œ:\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฒะธะด ะฟั€ะพะผัะฝะฐ: โ€ž%cโ€œ ะฒ โ€ž--diff-filter=%sโ€œ"
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ัะปะตะด โ€žws-error-highlight=%.*sโ€œ"
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะบั€ะธะต"
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะธะทะธัะบะฒะฐ ัั‚ะพะนะฝะพัั‚ะธ ะทะฐ ะœะ˜ะะ˜ะœะะ›ะ•ะ_%%_ะŸะ ะžะœะฏะะ_ะ—ะ_ะ˜ะ—ะขะžะงะะ˜ะš_/"
 "ะœะะšะกะ˜ะœะะ›ะ•ะ_%%_ะŸะ ะžะœะฏะะ_ะ—ะ_ะ—ะะœะฏะะ ะพั‚"
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะธะทะธัะบะฒะฐ ะทะฝะฐะบ, ะฐ ะฝะต: โ€ž%sโ€œ"
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฐั€ะณัƒะผะตะฝั‚ ะทะฐ โ€ž--color-movedโ€œ: โ€ž%sโ€œ"
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั€ะตะถะธะผ โ€ž%sโ€œ ะทะฐ โ€ž --color-moved-wsโ€œ"
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2731,153 +3428,153 @@ msgstr ""
 "ะœะฐะนะตั€ั), โ€žminimalโ€œ (ะผะธะฝะธะผะธะทะธั€ะฐะฝะต ะฝะฐ ั€ะฐะทะปะธะบะธั‚ะต), โ€žpatienceโ€œ (ะฟะฐัะธะฐะฝั) ะธ "
 "โ€žhistogramโ€œ (ั…ะธัั‚ะพะณั€ะฐะผะตะฝ)"
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฐั€ะณัƒะผะตะฝั‚ ะบัŠะผ โ€ž%sโ€œ"
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "ะฝะตั€ะฐะทะฟะพะทะฝะฐั‚ ะฟะฐั€ะฐะผะตั‚ัŠั€ ะบัŠะผ ะพะฟั†ะธัั‚ะฐ โ€ž--submoduleโ€œ: โ€ž%sโ€œ"
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฐั€ะณัƒะผะตะฝั‚ ะบัŠะผ โ€ž--word-diffโ€œ: โ€ž%sโ€œ"
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr "ะคะพั€ะผะฐั‚ ะฝะฐ ะธะทั…ะพะดะฐ ะทะฐ ั€ะฐะทะปะธะบะธั‚ะต"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะธ"
 
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั€ะฐะทะปะธะบะธั‚ะต"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr "ะ‘ะ ะžะ™"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr "ั„ะฐะนะปะพะฒะตั‚ะต ั ั€ะฐะทะปะธะบะธ ะดะฐ ัะฐ ั ะบะพะฝั‚ะตะบัั‚ ั ั‚ะฐะบัŠะฒ ะ‘ะ ะžะ™ ั€ะตะดะพะฒะต"
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr "ั„ะฐะนะปะพะฒะตั‚ะต ั ั€ะฐะทะปะธะบะธ ะดะฐ ัะฐ ะฒ ััƒั€ะพะฒ ั„ะพั€ะผะฐั‚"
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž-p --statโ€œ"
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž-p --statโ€œ"
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr "โ€ž--statโ€œ ะฒัŠะฒ ั„ะพั€ะผะฐั‚ ะทะฐ ั‡ะตั‚ะตะฝะต ะพั‚ ะฟั€ะพะณั€ะฐะผะฐ"
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะฟะพัะปะตะดะฝะธั ั€ะตะด ะฝะฐ โ€ž--statโ€œ"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr "ะŸะะ ะะœะ•ะขะชะ _1, ะŸะะ ะะœะ•ะขะชะ _2, โ€ฆ"
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั€ะฐะทะฟั€ะตะดะตะปะตะฝะธะตั‚ะพ ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ะทะฐ ะฒััะบะฐ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž--dirstat=cumulativeโ€œ"
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž--dirstat=ะคะะ™ะ›ะžะ’ะ•,ะŸะะ ะะœะ•ะขะชะ _1,ะŸะะ ะะœะ•ะขะชะ _2,โ€ฆโ€œ"
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "ะฟั€ะตะดัƒะฟั€ะตะถะดะฐะฒะฐะฝะต, ะฐะบะพ ะฟั€ะพะผะตะฝะธั‚ะต ะฒะพะดัั‚ ะดะพ ะผะฐั€ะบะตั€ะธ ะทะฐ ะบะพะฝั„ะปะธะบั‚ ะธะปะธ ะณั€ะตัˆะบะธ ะฒ "
 "ะฟั€ะฐะทะฝะธั‚ะต ะทะฝะฐั†ะธ"
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "ััŠะบั€ะฐั‚ะตะฝะพ ั€ะตะทัŽะผะต ะฝะฐ ััŠะทะดะฐะดะตะฝะธั‚ะต, ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธั‚ะต ะธ ั„ะฐะนะปะพะฒะตั‚ะต ั ะฟั€ะพะผัะฝะฐ ะฝะฐ "
 "ั€ะตะถะธะผะฐ ะฝะฐ ะดะพัั‚ัŠะฟ"
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะพะผะตะฝะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะธ ัั‚ะฐั‚ะธัั‚ะธะบะฐั‚ะฐ ะทะฐ ะฟั€ะพะผะตะฝะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "ะจะ˜ะ ะžะงะ˜ะะ[,ะ˜ะœะ•-ะจะ˜ะ ะžะงะ˜ะะ[,ะ‘ะ ะžะ™]]"
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะฐั‚ะธัั‚ะธะบะฐ ะทะฐ ะฟั€ะพะผะตะฝะธั‚ะต"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr "ะจะ˜ะ ะžะงะ˜ะะ"
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr "ัั‚ะฐั‚ะธัั‚ะธะบะฐ ั ั‚ะฐะบะฐะฒะฐ ะจะ˜ะ ะžะงะ˜ะะ ะทะฐ ะฟั€ะพะผะตะฝะธั‚ะต"
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr "ัั‚ะฐั‚ะธัั‚ะธะบะฐ ะทะฐ ะฟั€ะพะผะตะฝะธั‚ะต ั ั‚ะฐะบะฐะฒะฐ ะจะ˜ะ ะžะงะ˜ะะ ะฝะฐ ะธะผะตะฝะฐั‚ะฐ"
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr "ัั‚ะฐั‚ะธัั‚ะธะบะฐ ะทะฐ ะฟั€ะพะผะตะฝะธั‚ะต ั ั‚ะฐะบะฐะฒะฐ ะจะ˜ะ ะžะงะ˜ะะ ะฝะฐ ะณั€ะฐฬ€ั„ะฐ"
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr "ะ‘ะ ะžะ™"
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr "ะพะณั€ะฐะฝะธั‡ะฐะฒะฐะฝะต ะฝะฐ ะ‘ะ ะžั ะฝะฐ ั€ะตะดะพะฒะตั‚ะต ะฒ ัั‚ะฐั‚ะธัั‚ะธะบะฐั‚ะฐ ะทะฐ ะฟั€ะพะผะตะฝะธั‚ะต"
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr "ะบั€ะฐั‚ะบะพ ั€ะตะทัŽะผะต ะฒ ัั‚ะฐั‚ะธัั‚ะธะบะฐั‚ะฐ ะทะฐ ะฟั€ะพะผะตะฝะธั‚ะต"
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะดะฒะพะธั‡ะฝะฐ ั€ะฐะทะปะธะบะฐ ะฒัŠะฒ ะฒะธะด ะทะฐ ะฟั€ะธะปะฐะณะฐะฝะต"
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟัŠะปะฝะธั‚ะต ะธะผะตะฝะฐ ะฝะฐ ะพะฑะตะบั‚ะธ ะฒ ั€ะตะดะพะฒะตั‚ะต ะทะฐ ะธะฝะดะตะบัะฐ ะฟั€ะธ ะฒะฐั€ะธะฐะฝั‚ะธั‚ะต "
 "ะฟั€ะตะดะธ ะธ ัะปะตะด ะฟั€ะพะผัะฝะฐั‚ะฐ"
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr "ั€ะฐะทะปะธะบะธ ะฒ ั†ะฒัั‚"
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr "ะ’ะ˜ะ”"
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2885,7 +3582,7 @@ msgstr ""
 "ะณั€ะตัˆะบะธั‚ะต ะฒ ะฟั€ะฐะทะฝะธั‚ะต ะทะฝะฐั†ะธ ะดะฐ ัะต ัƒะบะฐะทะฒะฐั‚ ะฒ ั€ะตะดะพะฒะตั‚ะต ะทะฐ ะบะพะฝั‚ะตะบัั‚ะฐ, ะฒะฐั€ะธะฐะฝั‚ะธั‚ะต "
 "ะฟั€ะตะดะธ ะธ ัะปะตะด ั€ะฐะทะปะธะบะฐั‚ะฐ,"
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2893,257 +3590,257 @@ msgstr ""
 "ะฑะตะท ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ ะฟัŠั‚ะธั‰ะฐั‚ะฐ.  ะ”ะฐ ัะต ะธะทะฟะพะปะทะฒะฐั‚ ะฝัƒะปะตะฒะธ ะฑะฐะนั‚ะพะฒะต ะทะฐ ั€ะฐะทะดะตะปะธั‚ะตะปะธ "
 "ะฝะฐ ะฟะพะปะตั‚ะฐ ะฒ ะธะทั…ะพะดะฐ ะฟั€ะธ ะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--rawโ€œ ะธะปะธ โ€ž--numstatโ€œ"
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr "ะŸะ ะ•ะคะ˜ะšะก"
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr "ะฟั€ะตั„ะธะบั ะฒะผะตัั‚ะพ โ€ža/โ€œ ะทะฐ ะธะทั‚ะพั‡ะฝะธะบ"
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "ะฟั€ะตั„ะธะบั ะฒะผะตัั‚ะพ โ€žb/โ€œ ะทะฐ ั†ะตะป"
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะดะพะฟัŠะปะฝะธั‚ะตะปะตะฝ ะฟั€ะตั„ะธะบั ะทะฐ ะฒัะตะบะธ ั€ะตะด ะฝะฐ ะธะทั…ะพะดะฐ"
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr "ะฑะตะท ะฟั€ะตั„ะธะบั ะทะฐ ะธะทั‚ะพั‡ะฝะธะบะฐ ะธ ั†ะตะปั‚ะฐ"
 
-#: diff.c:5371
+#: diff.c:5358
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะบะพะฝั‚ะตะบัั‚ ะผะตะถะดัƒ ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะธั‚ะต ะฟะฐั€ั‡ะตั‚ะฐ ั ั€ะฐะทะปะธะบะธ ะพั‚ ัƒะบะฐะทะฐะฝะธั "
 "ะ‘ะ ะžะ™ ั€ะตะดะพะฒะต"
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr "ะ—ะะะš"
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "ะทะฝะฐะบ ะฒะผะตัั‚ะพ โ€ž+โ€œ ะทะฐ ะฝะพะฒ ะฒะฐั€ะธะฐะฝั‚ ะฝะฐ ั€ะตะด"
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "ะทะฝะฐะบ ะฒะผะตัั‚ะพ โ€ž-โ€œ ะทะฐ ัั‚ะฐั€ ะฒะฐั€ะธะฐะฝั‚ ะฝะฐ ั€ะตะด"
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "ะทะฝะฐะบ ะฒะผะตัั‚ะพ โ€ž โ€œ ะทะฐ ะบะพะฝั‚ะตะบัั‚"
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr "ะะฐัั‚ั€ะพะนะบะธ ะทะฐ ั€ะฐะทะปะธะบะธ ั ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต"
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr "ะœะ˜ะะ˜ะœะะ›ะ•ะ_%_ะŸะ ะžะœะฏะะ_ะ—ะ_ะ˜ะ—ะขะžะงะะ˜ะš[/ะœะะšะกะ˜ะœะะ›Eะ_%_ะŸะ ะžะœะฏะะ_ะ—ะ_ะ—ะะœะฏะะ]"
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "ะทะฐะผะตัั‚ะฒะฐะฝะต ะฝะฐ ะฟัŠะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ั ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะพัั‚ ะพั‚ ะธะทั‚ั€ะธะฒะฐะฝะต ะธ ััŠะทะดะฐะฒะฐะฝะต"
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr "ะทะฐัะธั‡ะฐะฝะต ะฝะฐ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธัั‚ะฐ"
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr "ะฑะตะท ะฟั€ะตะดะฒะฐั€ะธั‚ะตะปะตะฝ ะฒะฐั€ะธะฐะฝั‚ ะฟั€ะธ ะธะทั‚ั€ะธะฒะฐะฝะต"
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr "ะทะฐัะธั‡ะฐะฝะต ะฝะฐ ะบะพะฟะธั€ะฐะฝะธัั‚ะฐ"
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr "ั‚ัŠั€ัะตะฝะต ะฝะฐ ะบะพะฟะธั€ะฐะฝะพ ะธ ะพั‚ ะฝะตะฟั€ะพะผะตะฝะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr "ะฑะตะท ั‚ัŠั€ัะตะฝะต ะฝะฐ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธั"
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
 msgstr "ะฟั€ะฐะทะฝะธ ะพะฑะตะบั‚ะธ ะบะฐั‚ะพ ะธะทั‚ะพั‡ะฝะธะบ ะฟั€ะธ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธั"
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 "ะฟั€ะพะดัŠะปะถะฐะฒะฐะฝะต ะฝะฐ ะธะทะฒะตะถะดะฐะฝะตั‚ะพ ะฝะฐ ะธัั‚ะพั€ะธัั‚ะฐ โ€” ะฑะตะท ะพั‚ั€ัะทะฒะฐะฝะตั‚ะพ ะฟั€ะธ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธั "
 "ะฝะฐ ั„ะฐะนะป"
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 "ะฑะตะท ะทะฐัะธั‡ะฐะฝะต ะฝะฐ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธั/ะบะพะฟะธั€ะฐะฝะธั, ะฐะบะพ ะฑั€ะพัั‚ ะธะผ ะฝะฐะดะฒะธัˆะฐะฒะฐ ั‚ะฐะทะธ ัั‚ะพะนะฝะพัั‚"
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr "ะžะฟั†ะธะธ ะบัŠะผ ะฐะปะณะพั€ะธั‚ัŠะผะฐ ะทะฐ ั€ะฐะทะปะธะบะธ"
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr "ั‚ัŠั€ัะตะฝะต ะฝะฐ ะฒัŠะทะผะพะถะฝะพ ะฝะฐะน-ะผะฐะปะบะฐ ั€ะฐะทะปะธะบะฐ"
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr "ะฑะตะท ะฟั€ะพะผะตะฝะธ ะฒ ะฟั€ะฐะทะฝะธั‚ะต ะทะฝะฐั†ะธ ะฟั€ะธ ัั€ะฐะฒะฝัะฒะฐะฝะต ะฝะฐ ั€ะตะดะพะฒะต"
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr "ะฑะตะท ะฟั€ะพะผะตะฝะธ ะฒ ะฟั€ะฐะทะฝะธั‚ะต ะทะฝะฐั†ะธ"
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr "ะฑะตะท ะฟั€ะพะผะตะฝะธ ะฒ ะฟั€ะฐะทะฝะธั‚ะต ะทะฝะฐั†ะธ ะฒ ะบั€ะฐั ะฝะฐ ั€ะตะดะพะฒะตั‚ะต"
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr "ะฑะตะท ะฟั€ะพะผะตะฝะธ ะฒ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะบั€ะฐะน ะฝะฐ ั€ะตะด"
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr "ะฑะตะท ะฟั€ะพะผะตะฝะธ ะฒ ั€ะตะดะพะฒะตั‚ะต, ะบะพะธั‚ะพ ัะฐ ะธะทั†ัะปะพ ะพั‚ ะฟั€ะฐะทะฝะธ ะทะฝะฐั†ะธ"
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "ะตะฒั€ะธัั‚ะธะบะฐ ะทะฐ ะฟั€ะตะผะตัั‚ะฒะฐะฝะต ะฝะฐ ะณั€ะฐะฝะธั†ะธั‚ะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะฐั‚ะฐ ะทะฐ ัƒะปะตัะฝัะฒะฐะฝะต ะฝะฐ ั‡ะตั‚ะตะฝะตั‚ะพ"
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "ั€ะฐะทะปะธะบะฐ ั‡ั€ะตะท ะฐะปะณะพั€ะธั‚ัŠะผ ะทะฐ ะฟะพะดั€ะตะดะฑะฐ ะบะฐั‚ะพ ะฟะฐัะธะฐะฝั"
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "ั€ะฐะทะปะธะบะฐ ะฟะพ ั…ะธัั‚ะพะณั€ะฐะผะฝะธั ะฐะปะณะพั€ะธั‚ัŠะผ"
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr "ะะ›ะ“ะžะ ะ˜ะขะชะœ"
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr "ะธะทะฑะพั€ ะฝะฐ ะะ›ะ“ะžะ ะ˜ะขะชะœะฐ ะทะฐ ั€ะฐะทะปะธะบะธ"
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr "ะขะ•ะšะกะข"
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "ั€ะฐะทะปะธะบะฐ ั‡ั€ะตะท ะฐะปะณะพั€ะธั‚ัŠะผะฐ ััŠั ะทะฐะบะพั‚ะฒัะฝะต"
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr "ะ ะ•ะ–ะ˜ะœ"
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "ั€ะฐะทะปะธะบะฐ ะฟะพ ะดัƒะผะธ, ะบะฐั‚ะพ ัะต ะฟะพะปะทะฒะฐ ั‚ะพะทะธ ะ ะ•ะ–ะ˜ะœ ะทะฐ ะพั‚ะดะตะปัะฝะตั‚ะพ ะฝะฐ ะฟั€ะพะผะตะฝะตะฝะธั‚ะต ะดัƒะผะธ"
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr "ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ—"
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr "ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ— ะทะฐ ั€ะฐะทะดะตะปัะฝะต ะฟะพ ะดัƒะผะธ"
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž--word-diff=color --word-diff-regex=ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ—โ€œ"
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
 msgstr "ั€ะฐะทะปะธั‡ะตะฝ ั†ะฒัั‚ ะทะฐ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟั€ะตะผะตัั‚ะตะฝะธั‚ะต ั€ะตะดะพะฒะต"
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 "ั€ะตะถะธะผ ะทะฐ ะฟั€ะตัะบะฐั‡ะฐะฝะตั‚ะพ ะฝะฐ ะฟั€ะฐะทะฝะธั‚ะต ะทะฝะฐั†ะธ ะฟั€ะธ ะทะฐะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ โ€ž--color-movedโ€œ"
 
-#: diff.c:5469
+#: diff.c:5456
 msgid "Other diff options"
 msgstr "ะ”ั€ัƒะณะธ ะพะฟั†ะธะธ ะทะฐ ั€ะฐะทะปะธะบะธ"
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "ะฟั€ะธ ะธะทะฟัŠะปะฝะตะฝะธะต ะพั‚ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธั ะดะฐ ัะต ะฟั€ะตะฝะตะฑั€ะตะณะฒะฐั‚ ั€ะฐะทะปะธะบะธั‚ะต ะธะทะฒัŠะฝ ะฝะตั ะธ ะดะฐ "
 "ัะต ะฟะพะปะทะฒะฐั‚ ะพั‚ะฝะพัะธั‚ะตะปะฝะธ ะฟัŠั‚ะธั‰ะฐ"
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr "ะพะฑั€ะฐะฑะพั‚ะบะฐ ะฝะฐ ะฒัะธั‡ะบะธ ั„ะฐะนะปะพะฒะต ะบะฐั‚ะพ ั‚ะตะบัั‚ะพะฒะธ"
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
 msgstr "ั€ะฐะทะผัะฝะฐ ะฝะฐ ะดะฒะฐั‚ะฐ ะฒั…ะพะดะฐ โ€” ะพะฑั€ัŠั‰ะฐะฝะต ะฝะฐ ั€ะฐะทะปะธะบะฐั‚ะฐ"
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 "ะทะฐะฒัŠั€ัˆะฒะฐะฝะต ั ะบะพะด ะทะฐ ััŠัั‚ะพัะฝะธะต 1 ะฟั€ะธ ะฝะฐะปะธั‡ะธะตั‚ะพ ะฝะฐ ั€ะฐะทะปะธะบะธ, ะฐ ะฒ ะฟั€ะพั‚ะธะฒะตะฝ "
 "ัะปัƒั‡ะฐะน โ€” ั 0"
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr "ะฑะตะท ะฒััะบะฐะบัŠะฒ ะธะทั…ะพะด ะพั‚ ะฟั€ะพะณั€ะฐะผะฐั‚ะฐ"
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะฒัŠะฝัˆะฝะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ะทะฐ ั€ะฐะทะปะธะบะธ"
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะฒัŠะฝัˆะฝะธ ะฟั€ะพะณั€ะฐะผะธ-ั„ะธะปั‚ั€ะธ ะฟั€ะธ ัั€ะฐะฒะฝะตะฝะธะตั‚ะพ ะฝะฐ ะดะฒะพะธั‡ะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr "ะšะžะ“ะ"
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ะฒ ะฟะพะดะผะพะดัƒะปะธั‚ะต ะฟั€ะธ ะธะทะฒะตะถะดะฐะฝะตั‚ะพ ะฝะฐ ั€ะฐะทะปะธะบะธั‚ะต"
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr "ะคะžะ ะœะะข"
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr "ะฝะฐั‡ะธะฝ ะทะฐ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ะฒ ะฟะพะดะผะพะดัƒะปะธั‚ะต"
 
-#: diff.c:5496
+#: diff.c:5483
 msgid "hide 'git add -N' entries from the index"
 msgstr "ะฑะตะท ะฒะบะปัŽั‡ะฒะฐะฝะต ะฒ ะธะฝะดะตะบัะฐ ะฝะฐ ะทะฐะฟะธัะธั‚ะต, ะดะพะฑะฐะฒะตะฝะธ ั โ€žgit add -Nโ€œ"
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "ะฒะบะปัŽั‡ะฒะฐะฝะต ะฒ ะธะฝะดะตะบัะฐ ะฝะฐ ะทะฐะฟะธัะธั‚ะต, ะดะพะฑะฐะฒะตะฝะธ ั โ€žgit add -Nโ€œ"
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr "ะะ˜ะ—"
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "ั‚ัŠั€ัะตะฝะต ะฝะฐ ั€ะฐะทะปะธะบะธ, ะบะพะธั‚ะพ ะฟั€ะพะผะตะฝัั‚ ะฑั€ะพั ะฝะฐ ะฟะพัะฒะฐ ะฝะฐ ัƒะบะฐะทะฐะฝะธั‚ะต ะฝะธะทะพะฒะต"
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3151,97 +3848,118 @@ msgstr ""
 "ั‚ัŠั€ัะตะฝะต ะฝะฐ ั€ะฐะทะปะธะบะธ, ะบะพะธั‚ะพ ะฟั€ะพะผะตะฝัั‚ ะฑั€ะพั ะฝะฐ ะฟะพัะฒะฐ ะฝะฐ ะฝะธะทะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะฝะฐะฟะฐัะฒะฐั‚ "
 "ะฝะฐ ั€ะตะณัƒะปัั€ะฝะธั ะธะทั€ะฐะท"
 
-#: diff.c:5508
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะฟั€ะพะผะตะฝะธ ั โ€ž-Gโ€œ/โ€ž-Sโ€œ"
 
-#: diff.c:5511
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "ะะ˜ะ—ัŠั‚ ะบัŠะผ โ€ž-Sโ€œ ะดะฐ ัะต ั‚ัŠะปะบัƒะฒะฐ ะบะฐั‚ะพ ั€ะฐะทัˆะธั€ะตะฝ ั€ะตะณัƒะปัั€ะตะฝ ะธะทั€ะฐะท ะฟะพ POSIX"
 
-#: diff.c:5514
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
 msgstr "ัƒะฟั€ะฐะฒะปะตะฝะธะต ะฝะฐ ะฟะพะดั€ะตะดะฑะฐั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต ะฒ ะธะทั…ะพะดะฐ"
 
-#: diff.c:5515
+#: diff.c:5502
 msgid "<object-id>"
 msgstr "ะ˜ะ”ะ•ะะขะ˜ะคะ˜ะšะะขะžะ _ะะ_ะžะ‘ะ•ะšะข"
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "ั‚ัŠั€ัะตะฝะต ะฝะฐ ั€ะฐะทะปะธะบะธ, ะบะพะธั‚ะพ ะฟั€ะพะผะตะฝัั‚ ะฑั€ะพั ะฝะฐ ะฟะพัะฒะฐ ะฝะฐ ัƒะบะฐะทะฐะฝะธั ะพะฑะตะบั‚"
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)โ€ฆ[*]]"
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
 msgstr "ะธะทะฑะพั€ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต ะฟะพ ะฒะธะด ั€ะฐะทะปะธะบะฐ"
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr "ะคะะ™ะ›"
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr "ะ˜ะทั…ะพะด ะบัŠะผ ัƒะบะฐะทะฐะฝะธั ั„ะฐะนะป"
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "ั‚ัŠั€ัะตะฝะตั‚ะพ ะฝะฐ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธั ะฝะฐ ะพะฑะตะบั‚ะธ ััŠั‡ะตั‚ะฐะฝะธ ั ะฟั€ะพะผะตะฝะธ ัะต ะฟั€ะตัะบะฐั‡ะฐ ะฟะพั€ะฐะดะธ "
 "ะผะฝะพะณะพั‚ะพ ั„ะฐะนะปะพะฒะต."
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "ัƒัั‚ะฐะฝะพะฒะตะฝะธ ัะฐ ัะฐะผะพ ั‚ะพั‡ะฝะธั‚ะต ะบะพะฟะธั ะฝะฐ ะฟั€ะพะผะตะฝะตะฝะธั‚ะต ะฟัŠั‚ะธั‰ะฐ ะฟะพั€ะฐะดะธ ะผะฝะพะณะพั‚ะพ "
 "ั„ะฐะนะปะพะฒะต."
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "ะทะฐะดะฐะนั‚ะต ะฟั€ะพะผะตะฝะปะธะฒะฐั‚ะฐ โ€ž%sโ€œ ะดะฐ ะต ะฟะพะฝะต %d ะธ ะพั‚ะฝะพะฒะพ ะธะทะฟัŠะปะฝะตั‚ะต ะบะพะผะฐะฝะดะฐั‚ะฐ."
 
-#: dir.c:537
+#: dir.c:555
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะฝะต ััŠะฒะฟะฐะดะฐ ั ะฝะธะบะพะน ั„ะฐะนะป ะฒ git"
 
-#: dir.c:926
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "ะฝะตะฟะพะทะฝะฐั‚ ัˆะฐะฑะปะพะฝ: โ€ž%sโ€œ"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะพั‚ั€ะธั†ะฐั‚ะตะปะตะฝ ัˆะฐะฑะปะพะฝ: โ€ž%sโ€œ"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"ั„ะฐะนะปัŠั‚ ะพะฟั€ะตะดะตะปัั‰ ั‡ะฐัั‚ะธั‡ะฝะพัั‚ั‚ะฐ ะฝะฐ ะธะทั‚ะตะณะปะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะผะพะถะต ะดะฐ ะธะผะฐ ะฟั€ะพะฑะปะตะผ: "
+"ัˆะฐะฑะปะพะฝัŠั‚ โ€ž%sโ€œ ัะต ะฟะพะฒั‚ะฐั€ั"
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "ะธะทะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะฟัŠั‚ะตะฒะพะดะฝะพั‚ะพ ะฝะฐะฟะฐัะฒะฐะฝะต"
+
+#: dir.c:1173
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะทะฐ ะธะณะฝะพั€ะธั€ะฐะฝะธั‚ะต ั„ะฐะนะปะพะฒะต (ะบะฐั‚ะพ gitignore)"
 
-#: dir.c:1843
+#: dir.c:2144
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝะฐ"
 
-#: dir.c:2085
+#: dir.c:2479
 msgid "failed to get kernel name and information"
 msgstr "ะธะผะตั‚ะพ ะธ ะฒะตั€ัะธัั‚ะฐ ะฝะฐ ัะดั€ะพั‚ะพ ะฝะต ะฑัั…ะฐ ะฟะพะปัƒั‡ะตะฝะธ"
 
-#: dir.c:2209
+#: dir.c:2603
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 "ะบะตัˆัŠั‚ ะทะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะต ะธะทะบะปัŽั‡ะตะฝ ะฝะฐ ั‚ะฐะทะธ ัะธัั‚ะตะผะฐ ะธะปะธ ะผะตัั‚ะพะฟะพะปะพะถะตะฝะธะต"
 
-#: dir.c:3013
+#: dir.c:3407
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "ั„ะฐะนะปัŠั‚ ั ะธะฝะดะตะบัะฐ ะต ะฟะพะฒั€ะตะดะตะฝ ะฒ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ โ€ž%sโ€œ"
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3452 dir.c:3457
 #, c-format
 msgid "could not create directories for %s"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธะธั‚ะต ะทะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะฐั‚ ััŠะทะดะฐะดะตะฝะธ"
 
-#: dir.c:3092
+#: dir.c:3486
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะฐ git ะฝะต ะผะพะถะต ะดะฐ ัะต ะผะธะณั€ะธั€ะฐ ะพั‚ โ€ž%sโ€œ ะดะพ โ€ž%sโ€œ"
@@ -3260,12 +3978,12 @@ msgstr "ะคะธะปั‚ั€ะธั€ะฐะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ"
 msgid "could not stat file '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žstatโ€œ ะฒัŠั€ั…ัƒ ั„ะฐะนะปะฐ โ€ž%sโ€œ"
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟัŠั‚ ะบัŠะผ ะฟั€ะพัั‚ั€ะฐะฝัั‚ะฒะฐ ะพั‚ ะธะผะตะฝะฐ โ€ž%sโ€œ"
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "GIT_DIR ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ€ž%sโ€œ"
@@ -3275,269 +3993,273 @@ msgstr "GIT_DIR ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ€ž%sโ€œ"
 msgid "too many args to run %s"
 msgstr "ะฟั€ะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐั€ะณัƒะผะตะฝั‚ะธ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต โ€ž%sโ€œ"
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "ะ›ะธะฟัะฒะฐ ะฐะดั€ะตั ะทะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: ะพั‡ะฐะบะฒะฐ ัะต ะฟะปะธั‚ัŠะบ ัะฟะธััŠะบ"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: ัะปะตะด ะฟะปะธั‚ัŠะบ ัะฟะธััŠะบ ัะต ะพั‡ะฐะบะฒะฐ ะธะทั‡ะธัั‚ะฒะฐั‰ ะฟะฐะบะตั‚ โ€žflushโ€œ"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 "git fetch-pack: ะพั‡ะฐะบะฒะฐ ัะต โ€žACKโ€œ/โ€žNAKโ€œ, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝ ะธะทั‡ะธัั‚ะฒะฐั‰ ะฟะฐะบะตั‚ โ€žflushโ€œ"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ะพั‡ะฐะบะฒะฐ ัะต โ€žACKโ€œ/โ€žNAKโ€œ, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝะพ โ€ž%sโ€œ"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr "ะฝะตะฒัŠะทะผะพะถะฝะพ ะฟะธัะฐะฝะต ะบัŠะผ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--stateless-rpcโ€œ ะธะทะธัะบะฒะฐ  โ€žmulti_ack_detailedโ€œ"
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟะปะธั‚ัŠะบ ั€ะตะด: โ€ž%sโ€œ"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฝะตะฟะปะธั‚ัŠะบ ั€ะตะด: โ€ž%sโ€œ"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะปะธะฟัะฒะฐ"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr "ะณั€ะตัˆะบะฐ ะฒ ะพะฑะตะบั‚ะฐ: โ€ž%sโ€œ"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ะฝะต ะต ะพั‚ะบั€ะธั‚ ะฟะปะธั‚ัŠะบ ะพะฑะตะบั‚: %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะฟะปะธั‚ัŠะบ ะธะปะธ ะฝะต ะพะฑะตะบั‚, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝะพ: โ€ž%sโ€œ"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr "ะฟะพะปัƒั‡ะตะฝะพ ะฑะต %s %d %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต: โ€ž%sโ€œ"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr "ะดะตะนัั‚ะฒะธะตั‚ะพ ะทะฐะฒัŠั€ัˆะธ"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "ะฟะพะปัƒั‡ะตะฝะพ ะฑะต %s (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr "ะžั‚ะฑะตะปัะทะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ ะบะฐั‚ะพ ะฟัŠะปะฝะพ"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ะฒะตั‡ะต ะธะผะฐ โ€ž%sโ€œ (%s)"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฟั€ะพั†ะตั ะทะฐ ะดะตะผัƒะปั‚ะธะฟะปะตะบัะพั€ะฐ"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr "ะฟั€ะพั‚ะพะบะพะปะฝะฐ ะณั€ะตัˆะบะฐ: ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะทะฐะณะปะฐะฒะฝะฐ ั‡ะฐัั‚ ะฝะฐ ะฟะฐะบะตั‚"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฟั€ะพั†ะตั ะทะฐ โ€ž%sโ€œ"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€ž%sโ€œ"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr "ะณั€ะตัˆะบะฐ ะฒ ะดะตะผัƒะปั‚ะธะฟะปะตะบัะพั€ะฐ"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr "ะ’ะตั€ัะธัั‚ะฐ ะฝะฐ ััŠั€ะฒัŠั€ะฐ ะต: %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr "ะกัŠั€ะฒัŠั€ัŠั‚ ะฟะพะดะดัŠั€ะถะฐ โ€ž%sโ€œ"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr "ะกัŠั€ะฒัŠั€ัŠั‚ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะฟะปะธั‚ะบะธ ะบะปะธะตะฝั‚ะธ"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr "ะกัŠั€ะฒัŠั€ัŠั‚ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--shallow-sinceโ€œ"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr "ะกัŠั€ะฒัŠั€ัŠั‚ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--shallow-excludeโ€œ"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr "ะกัŠั€ะฒัŠั€ัŠั‚ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--deepenโ€œ"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr "ะฝัะผะฐ ะพะฑั‰ะธ ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: ะฝะตัƒัะฟะตัˆะฝะพ ะดะพัั‚ะฐะฒัะฝะต."
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr "ะกัŠั€ะฒัŠั€ัŠั‚ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะฟะปะธั‚ะบะธ ะทะฐัะฒะบะธ"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr "ะกัŠั€ะฒัŠั€ัŠั‚ ะฟะพะดะดัŠั€ะถะฐ ั„ะธะปั‚ั€ะธ"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr "ะฝะตะฒัŠะทะผะพะถะฝะพ ะฟะธัะฐะฝะต ะบัŠะผ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะฟั€ะพั‡ะธั‚ะฐะฝะต ะฝะฐ ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ ั€ะฐะทะดะตะป โ€ž%sโ€œ"
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต โ€ž%sโ€œ, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝะพ โ€ž%sโ€œ"
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝ ั€ะตะด ะทะฐ ะฟะพั‚ะฒัŠั€ะถะดะตะฝะธะต: โ€ž%sโ€œ"
 
-#: fetch-pack.c:1252
+#: fetch-pack.c:1308
 #, c-format
 msgid "error processing acks: %d"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะพะฑั€ะฐะฑะพั‚ะบะฐ ะฝะฐ ะฟะพั‚ะฒัŠั€ะถะดะตะฝะธัั‚ะฐ: %d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 "ะพั‡ะฐะบะฒะฐัˆะต ัะต ะฟะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป ะดะฐ ะฑัŠะดะต ะธะทะฟั€ะฐั‚ะตะฝ ัะปะตะด ะพั‚ะณะพะฒะพั€ ะทะฐ ะณะพั‚ะพะฒะฝะพัั‚ (ready)"
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 "ะพั‡ะฐะบะฒะฐัˆะต ัะต ัะปะตะด ะปะธะฟัะฐ ะฝะฐ ะพั‚ะณะพะฒะพั€ ะทะฐ ะณะพั‚ะพะฒะฝะพัั‚ (ready) ะดะฐ ะฝะต ัะต ัะต ะฟั€ะฐั‰ะฐั‚ "
 "ะดั€ัƒะณะธ ั€ะฐะทะดะตะปะธ"
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะพะฑั€ะฐะฑะพั‚ะบะฐ ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะดัŠะปะฑะพั‡ะธะฝะฐั‚ะฐ/ะฟะปะธั‚ะบะพัั‚ั‚ะฐ: %d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะธัะบะฐะฝ ัƒะบะฐะทะฐั‚ะตะป, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝะพ: โ€ž%sโ€œ"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝ ะธัะบะฐะฝ ัƒะบะฐะทะฐั‚ะตะป: โ€ž%sโ€œ"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะพะฑั€ะฐะฑะพั‚ะบะฐั‚ะฐ ะฝะฐ ะธัะบะฐะฝะธั‚ะต ัƒะบะฐะทะฐั‚ะตะปะธ: %d"
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ ะฟะพะดั…ะพะดัั‰ ะฒั€ัŠั… ะพั‚ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:689
 msgid "remote did not send all necessary objects"
 msgstr "ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะต ะธะทะฟั€ะฐั‚ะธ ะฒัะธั‡ะบะธ ะฝะตะพะฑั…ะพะดะธะผะธ ะพะฑะตะบั‚ะธ."
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr "ั‚ะฐะบัŠะฒ ะพั‚ะดะฐะปะตั‡ะตะฝ ัƒะบะฐะทะฐั‚ะตะป ะฝัะผะฐ: %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "ะกัŠั€ะฒัŠั€ัŠั‚ ะฝะต ะฟะพะทะฒะพะปัะฒะฐ ะทะฐัะฒะบะฐ ะทะฐ ะฝะตะพะฑัะฒะตะฝ ะพะฑะตะบั‚ โ€ž%sโ€œ"
 
-#: gpg-interface.c:321
+#: gpg-interface.c:408
 msgid "gpg failed to sign the data"
 msgstr "ะŸั€ะพะณั€ะฐะผะฐั‚ะฐ โ€žgpgโ€œ ะฝะต ะฟะพะดะฟะธัะฐ ะดะฐะฝะฝะธั‚ะต."
 
-#: gpg-interface.c:347
+#: gpg-interface.c:434
 msgid "could not create temporary file"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฒั€ะตะผะตะฝะตะฝ ั„ะฐะนะป"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:437
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "ะŸั€ะพะณั€ะฐะผะฐั‚ะฐ ะฝะต ัƒัะฟั ะดะฐ ะทะฐะฟะธัˆะต ัะฐะผะพัั‚ะพัั‚ะตะปะฝะธั ะฟะพะดะฟะธั ะฒ โ€ž%sโ€œ"
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะฝะตะฟั€ะฐะฒะธะปะฝะธั ั†ะฒัั‚ โ€ž%.*sโ€œ ะฒ โ€žlog.graphColorsโ€œ"
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"ะทะฐะดะฐะดะตะฝะธัั‚ ัˆะฐะฑะปะพะฝ ััŠะดัŠั€ะถะฐ ะฝัƒะปะตะฒ ะทะฝะฐะบ (ะธะดะฒะฐ ะพั‚ -f โ€žะคะะ™ะ›โ€œ).  ะขะพะฒะฐ ัะต ะฟะพะดะดัŠั€ะถะฐ "
+"ะฒ ะบะพะผะฑะธะฝะฐั†ะธั ั โ€ž-Pโ€œ ัะฐะผะพ ะฟั€ะธ ะฟะพะปะทะฒะฐะฝะตั‚ะพ ะฝะฐ โ€žPCRE v2โ€œ"
+
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "โ€ž%sโ€œ: ั„ะฐะนะปัŠั‚ ัะพั‡ะตะฝ ะพั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ โ€ž%sโ€œ"
 
-#: grep.c:2145
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "โ€ž%sโ€œ: ะธะทั‡ะธั‚ะฐะฝะตั‚ะพ ะฒัŠั€ะฝะฐ ะฟะพ-ะผะฐะปะบะพ ะฑะฐะนั‚ะพะฒะต ะพั‚ ะพั‡ะฐะบะฒะฐะฝะพั‚ะพ"
@@ -3568,11 +4290,11 @@ msgstr "ะžัะฝะพะฒะฝะธ ะบะพะผะฐะฝะดะธ ะพั‚ ะฟะพั‚ั€ะตะฑะธั‚ะตะปัะบะพ ะฝะธะฒะพ"
 
 #: help.c:32
 msgid "Ancillary Commands / Manipulators"
-msgstr "ะŸะพะผะพั‰ะฝะธ ะบะพะผะฐะฝะดะธ/ะŸั€ะพะผะตะฝัั‰ะธ"
+msgstr "ะŸะพะผะพั‰ะฝะธ ะบะพะผะฐะฝะดะธ / ะŸั€ะพะผะตะฝัั‰ะธ"
 
 #: help.c:33
 msgid "Ancillary Commands / Interrogators"
-msgstr "ะŸะพะผะพั‰ะฝะธ ะบะพะผะฐะฝะดะธ/ะ—ะฐะฟะธั‚ะฒะฐั‰ะธ"
+msgstr "ะŸะพะผะพั‰ะฝะธ ะบะพะผะฐะฝะดะธ / ะ—ะฐะฟะธั‚ะฒะฐั‰ะธ"
 
 #: help.c:34
 msgid "Interacting with Others"
@@ -3580,19 +4302,19 @@ msgstr "ะกัŠะฒะผะตัั‚ะฝะฐ ั€ะฐะฑะพั‚ะฐ ั ะดั€ัƒะณะธ ั…ะพั€ะฐ"
 
 #: help.c:35
 msgid "Low-level Commands / Manipulators"
-msgstr "ะšะพะผะฐะฝะดะธ ะพั‚ ะฝะธัะบะพ ะฝะธะฒะพ/ะŸั€ะพะผะตะฝัั‰ะธ"
+msgstr "ะšะพะผะฐะฝะดะธ ะพั‚ ะฝะธัะบะพ ะฝะธะฒะพ / ะŸั€ะพะผะตะฝัั‰ะธ"
 
 #: help.c:36
 msgid "Low-level Commands / Interrogators"
-msgstr "ะšะพะผะฐะฝะดะธ ะพั‚ ะฝะธัะบะพ ะฝะธะฒะพ/ะ—ะฐะฟะธั‚ะฒะฐั‰ะธ"
+msgstr "ะšะพะผะฐะฝะดะธ ะพั‚ ะฝะธัะบะพ ะฝะธะฒะพ / ะ—ะฐะฟะธั‚ะฒะฐั‰ะธ"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
-msgstr "ะšะพะผะฐะฝะดะธ ะพั‚ ะฝะธัะบะพ ะฝะธะฒะพ/ะกะธะฝั…ั€ะพะฝะธะทะฐั†ะธั ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะฐ"
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "ะšะพะผะฐะฝะดะธ ะพั‚ ะฝะธัะบะพ ะฝะธะฒะพ / ะกะธะฝั…ั€ะพะฝะธะทะฐั†ะธั ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะฐ"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
-msgstr "ะšะพะผะฐะฝะดะธ ะพั‚ ะฝะธัะบะพ ะฝะธะฒะพ/ะ”ะพะฟัŠะปะฝะธั‚ะตะปะฝะธ ะธะฝัั‚ั€ัƒะผะตะฝั‚ะธ"
+msgstr "ะšะพะผะฐะฝะดะธ ะพั‚ ะฝะธัะบะพ ะฝะธะฒะพ / ะ”ะพะฟัŠะปะฝะธั‚ะตะปะฝะธ ะธะฝัั‚ั€ัƒะผะตะฝั‚ะธ"
 
 #: help.c:298
 #, c-format
@@ -3684,12 +4406,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr "git version [ะžะŸะฆะ˜ะฏโ€ฆ]"
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s โ€” %s"
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3760,46 +4482,62 @@ msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะฟั€ะฐะทะฝะพ ะธะผะต ะบะฐั‚ะพ ะธะดะต
 msgid "name consists only of disallowed characters: %s"
 msgstr "ะธะผะตั‚ะพ ััŠะดัŠั€ะถะฐ ัะฐะผะพ ะฝะตะฟะพะทะฒะพะปะตะฝะธ ะทะฝะฐั†ะธ: โ€ž%sโ€œ"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:635
 #, c-format
 msgid "invalid date format: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะพั€ะผะฐั‚ ะฝะฐ ะดะฐั‚ะฐ: %s"
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "ะพะฑะตะบั‚ โ€ž%sโ€œ ะฒ ะดัŠั€ะฒะพั‚ะพ โ€ž%sโ€œ ะต ะพั‚ะฑะตะปัะทะฐะฝ ะบะฐั‚ะพ ะดัŠั€ะฒะพ, ะฝะพ ะฝะต ะต"
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "ะพะฑะตะบั‚ โ€ž%sโ€œ ะฒ ะดัŠั€ะฒะพั‚ะพ โ€ž%sโ€œ ะต ะพั‚ะฑะตะปัะทะฐะฝ ะบะฐั‚ะพ BLOB, ะฝะพ ะฝะต ะต"
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "ะบะพั€ะตะฝะพะฒะพั‚ะพ ะดัŠั€ะฒะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐั€ะตะดะธ"
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "ะฝะต ะผะพะถะต ะดะฐ ะบะพะผะฑะธะฝะธั€ะฐั‚ะต ะผะฝะพะถะตัั‚ะฒะพ ั„ะธะปั‚ั€ะธ"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "ะฝัะผะฐ ะดะพัั‚ัŠะฟ ะดะพ ั‡ะฐัั‚ะธั‡ะฝะพ ะธะทั‚ะตะณะปะตะฝะธั ะพะฑะตะบั‚-BLOB ะฒ โ€ž%sโ€œ"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr ""
+"ะดะฐะฝะฝะธั‚ะต ะพั‚ ั„ะธะปั‚ัŠั€ะฐ ะทะฐ ั‡ะฐัั‚ะธั‡ะฝะธ ะธะทั‚ะตะณะปัะฝะธั ะฒ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะฐั‚ ะฐะฝะฐะปะธะทะธั€ะฐะฝะธ"
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต โ€žtree:ะ”ะชะ›ะ‘ะžะงะ˜ะะโ€œ"
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr "ะฟะพะดะดั€ัŠะถะบะฐั‚ะฐ ะฝะฐ ั„ะธะปั‚ั€ะธ ััŠั โ€žsparse:pathโ€œ ะต ะฟั€ะตะผะฐั…ะฝะฐั‚ะฐ"
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะธะปั‚ัŠั€: โ€ž%sโ€œ"
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะพะผะตะฝะธั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ-ะณะฐั€ะฐะฝั‚ ะฝะฐ ะฝะตะฟัŠะปะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "ะทะฝะฐะบ ะทะฐ ะตะบั€ะฐะฝะธั€ะฐะฝะต ะฒ ะฟะพะดั„ะธะปั‚ัŠั€: โ€ž%cโ€œ"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "ะดะพะฑะฐะฒะตั‚ะต ะฝะตั‰ะพ ัะปะตะด ะบะพะผะฑะธะฝะธั€ะฐะฝะตั‚ะพ:"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "ะฝะต ะผะพะถะต ะดะฐ ะบะพะผะฑะธะฝะธั€ะฐั‚ะต ะผะฝะพะถะตัั‚ะฒะพ ั„ะธะปั‚ั€ะธ"
 
 #: lockfile.c:151
 #, c-format
@@ -3829,126 +4567,122 @@ msgstr "ะคะฐะนะปัŠั‚-ะบะปัŽั‡ะฐะปะบะฐ โ€ž%s.lockโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต
 msgid "failed to read the cache"
 msgstr "ะบะตัˆัŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะฝะพะฒะธั ะธะฝะดะตะบั"
 
-#: merge-recursive.c:322
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(ะปะพัˆะพ ะฟะพะดะฐะฒะฐะฝะต)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žadd_cacheinfoโ€œ ะทะฐ ะฟัŠั‚ั โ€ž%sโ€œ.  ะกะปะธะฒะฐะฝะตั‚ะพ ะต "
 "ะฟั€ะตัƒัั‚ะฐะฝะพะฒะตะฝะพ."
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žadd_cacheinfoโ€œ ะทะฐ ะพะฑะฝะพะฒัะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟัŠั‚ั โ€ž%sโ€œ.  "
 "ะกะปะธะฒะฐะฝะตั‚ะพ ะต ะฟั€ะตัƒัั‚ะฐะฝะพะฒะตะฝะพ."
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะธะทะณั€ะฐะถะดะฐะฝะต ะฝะฐ ะดัŠั€ะฒะตั‚ะฐั‚ะฐ"
-
-#: merge-recursive.c:863
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟัŠั‚ั โ€ž%sโ€œ%s"
 
-#: merge-recursive.c:874
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ, ะทะฐ ะดะฐ ัะต ะพัะฒะพะฑะพะดะธ ะผััั‚ะพ ะทะฐ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธั\n"
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr ": ะฒัŠะทะผะพะถะฝะพ ะต ะดะฐ ะธะผะฐ ะบะพะฝั„ะปะธะบั‚ ะดะธั€ะตะบั‚ะพั€ะธั/ั„ะฐะนะป."
 
-#: merge-recursive.c:897
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนัั‚ะฒะธะตั‚ะพ, ะทะฐ ะดะฐ ะฝะต ัะต ะธะทั‚ั€ะธะต ะฝะตัะปะตะดะตะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ"
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ (%s) ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: merge-recursive.c:941
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ (%s) ัะต ะพั‡ะฐะบะฒะฐัˆะต ะดะฐ ะต BLOB, ะฐ ะฝะต ะต"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฒะพั€ะธ: %s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะฐั‚ะฐ ะฒั€ัŠะทะบะฐ โ€ž%sโ€œ: %s"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 "ะฝะต ะต ััะฝะพ ะบะฐะบะฒะพ ะดะฐ ัะต ะฟั€ะฐะฒะธ ั ะพะฑะตะบั‚ะฐ โ€ž%2$sโ€œ (%3$s) ั ะฟั€ะฐะฒะฐ ะทะฐ ะดะพัั‚ัŠะฟ โ€ž%1$06oโ€œ"
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ (ะฝะต ะต ะธะทั‚ะตะณะปะตะฝ)"
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ (ะฝัะผะฐ ะฟะพะดะฐะฒะฐะฝะธั)"
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "ะŸะพะดะผะพะดัƒะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัะปัั‚ (ะฑะฐะทะฐั‚ะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะฝะต ะฟั€ะตะดัˆะตัั‚ะฒะฐ "
 "ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ)"
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "ะŸั€ะตะฒัŠั€ั‚ะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะดะพ ัะปะตะดะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต:"
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "ะŸั€ะตะฒัŠั€ั‚ะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "ะะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ (ะปะธะฟัะฒะฐ ัะปะธะฒะฐะฝะตั‚ะพ, ะบะพะตั‚ะพ ัะต ะฟั€ะตะดัˆะตัั‚ะฒะฐ "
 "ะพั‚ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ)"
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ (ะฝะต ะต ะฟั€ะตะฒัŠั€ั‚ะฐะฝะต)"
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 "ะžั‚ะบั€ะธั‚ะพ ะต ัะปะธะฒะฐะฝะต, ะบะพะตั‚ะพ ะผะพะถะต ะดะฐ ั€ะตัˆะฐะฒะฐ ะฟั€ะพะฑะปะตะผะฐ ััŠั ัะปะธะฒะฐะฝะตั‚ะพ ะฝะฐ "
 "ะฟะพะดะผะพะดัƒะปะฐ:\n"
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3964,31 +4698,31 @@ msgstr ""
 "\n"
 "ะขะพะฒะฐ ะฟั€ะธะตะผะฐ ะฟั€ะตะดะปะพะถะตะฝะพั‚ะพ.\n"
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ (ะพั‚ะบั€ะธั‚ะธ ัะฐ ะผะฝะพะถะตัั‚ะฒะพ ัะปะธะฒะฐะฝะธั)"
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ะฒัŠั‚ั€ะตัˆะฝะพ ัะปะธะฒะฐะฝะต"
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะฒ ะฑะฐะทะฐั‚ะฐ ั ะดะฐะฝะฝะธ"
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "ะะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "ะ“ั€ะตัˆะบะฐ: ะทะฐ ะดะฐ ะฝะต ัะต ะธะทั‚ั€ะธะต ะฝะตัะปะตะดะตะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ, ัะต ะทะฐะฟะธัะฒะฐ ะฒ โ€ž%sโ€œ."
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3997,7 +4731,7 @@ msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (%s/ะธะทั‚ั€ะธะฒะฐะฝะต): โ€ž%sโ€œ ะต ะธะทั‚ั€ะธั‚ ะฒ %s, ะฐ โ€ž%sโ€œ ะฒ %s.  ะ’ะตั€ัะธั %s ะฝะฐ โ€ž%sโ€œ "
 "ะต ะพัั‚ะฐะฒะตะฝะฐ ะฒ ะดัŠั€ะฒะพั‚ะพ."
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4006,7 +4740,7 @@ msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (%s/ะธะทั‚ั€ะธะฒะฐะฝะต): โ€ž%sโ€œ ะต ะธะทั‚ั€ะธั‚ ะฒ %s, ะฐ โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ "
 "%s.  ะ’ะตั€ัะธั %s ะฝะฐ โ€ž%sโ€œ ะต ะพัั‚ะฐะฒะตะฝะฐ ะฒ ะดัŠั€ะฒะพั‚ะพ."
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4015,7 +4749,7 @@ msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (%s/ะธะทั‚ั€ะธะฒะฐะฝะต): โ€ž%sโ€œ ะต ะธะทั‚ั€ะธั‚ ะฒ %s, ะฐ โ€ž%sโ€œ ะฒ %s.  ะ’ะตั€ัะธั %s ะฝะฐ โ€ž%sโ€œ "
 "ะต ะพัั‚ะฐะฒะตะฝะฐ ะฒ ะดัŠั€ะฒะพั‚ะพ: %s."
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4024,45 +4758,45 @@ msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (%s/ะธะทั‚ั€ะธะฒะฐะฝะต): โ€ž%sโ€œ ะต ะธะทั‚ั€ะธั‚ ะฒ %s, ะฐ โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ "
 "%s.  ะ’ะตั€ัะธั %s ะฝะฐ โ€ž%sโ€œ ะต ะพัั‚ะฐะฒะตะฝะฐ ะฒ ะดัŠั€ะฒะพั‚ะพ: %s."
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "ะŸั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนัั‚ะฒะธะตั‚ะพ, ะทะฐ ะดะฐ ะฝะต ัะต ะธะทะณัƒะฑะธ ะฟั€ะพะผะตะฝะตะฝะธัั‚ โ€ž%sโ€œ"
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "ะžั‚ะบะฐะท ะดะฐ ัะต ะทะฐะณัƒะฑะธ ะฝะตัะปะตะดะตะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ, ะทะฐั‰ะพั‚ะพ ะต ะฝะฐ ะผััั‚ะพ, ะบัŠะดะตั‚ะพ ะฟั€ะตั‡ะธ."
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต/ะดะพะฑะฐะฒัะฝะต): โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ ะบะปะพะฝ โ€ž%sโ€œ, ะฐ "
 "โ€ž%sโ€œ ะต ะดะพะฑะฐะฒะตะฝ ะฒ โ€ž%sโ€œ"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "โ€ž%sโ€œ ะต ะดะธั€ะตะบั‚ะพั€ะธั ะฒ โ€ž%sโ€œ, ะทะฐั‚ะพะฒะฐ ัะต ะดะพะฑะฐะฒั ะบะฐั‚ะพ โ€ž%sโ€œ"
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "ะŸั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนัั‚ะฒะธะตั‚ะพ, ะทะฐ ะดะฐ ะฝะต ัะต ะธะทะณัƒะฑะธ ะฝะตัะปะตะดะตะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ.  "
 "ะ’ะผะตัั‚ะพ ะฝะตะณะพ ัะต ะดะพะฑะฐะฒั โ€ž%sโ€œ"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4071,18 +4805,18 @@ msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต/ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต): โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ ะบะปะพะฝ "
 "โ€ž%sโ€œ, ะฐ โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ โ€ž%sโ€œ/%s."
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " (ะฝะตะบะพั€ะธะณะธั€ะฐะฝ ะบะพะฝั„ะปะธะบั‚)"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1793
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต/ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต): โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ ะบะปะพะฝ "
 "โ€ž%sโ€œ, ะฐ โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ โ€ž%sโ€œ"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4093,7 +4827,7 @@ msgstr ""
 "ะฟะพัั‚ะฐะฒะธ โ€ž%sโ€œ, ะทะฐั‰ะพั‚ะพ ะฝัะบะพะปะบะพ ะฝะพะฒะธ ะดะธั€ะตะบั‚ะพั€ะธะธ ะฟะพะดะตะปัั‚ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ "
 "ะดะธั€ะตะบั‚ะพั€ะธั โ€ž%sโ€œ, ะบะฐั‚ะพ ะฝะธะบะพั ะฝะต ััŠะดัŠั€ะถะฐ ะผะฝะพะทะธะฝัั‚ะฒะพ ะพั‚ ั„ะฐะนะปะพะฒะตั‚ะต ั."
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4102,7 +4836,7 @@ msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (ะบะพัะฒะตะฝะพ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั): ัะปะตะดะฝะธัั‚ ั„ะฐะนะป ะธะปะธ ะดะธั€ะตะบั‚ะพั€ะธั "
 "โ€ž%sโ€œ ะฝะต ะฟะพะทะฒะพะปัะฒะฐั‚ ะบะพัะฒะตะฝะพั‚ะพ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ ัะปะตะดะฝะธั ะฟัŠั‚/ะธั‰ะฐ: %s."
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4112,7 +4846,7 @@ msgstr ""
 "ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐ ะฝะฐ โ€ž%sโ€œ.  ะšะพัะฒะตะฝะพ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะฒะพะดะธ ะดะพ ะฟะพัั‚ะฐะฒัะฝะตั‚ะพ "
 "ะฝะฐ ั‚ะตะทะธ ะฟัŠั‚ะธั‰ะฐ ั‚ะฐะผ: %s."
 
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4121,7 +4855,7 @@ msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต/ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต): โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ ะบะปะพะฝ "
 "โ€ž%sโ€œ, ะฐ โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ โ€ž%sโ€œ"
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4130,52 +4864,52 @@ msgstr ""
 "ะŸะ ะ•ะ”ะฃะŸะ ะ•ะ–ะ”ะ•ะะ˜ะ•: ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะตั‚ะพ ะฝะฐ โ€ž%sโ€œ ะฝะฐ โ€ž%sโ€œ ะฒ โ€ž%sโ€œ, ะทะฐั‰ะพั‚ะพ "
 "โ€ž%sโ€œ ััŠั‰ะพ ะต ั ะฟั€ะพะผะตะฝะตะฝะพ ะธะผะต."
 
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
 #, c-format
 msgid "cannot read object %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพั‡ะตั‚ะต"
 
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
 #, c-format
 msgid "object %s is not a blob"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฝะต ะต BLOB"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modify"
 msgstr "ะฟั€ะพะผัะฝะฐ"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modified"
 msgstr "ะฟั€ะพะผะตะฝะตะฝ"
 
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
 msgid "content"
 msgstr "ััŠะดัŠั€ะถะฐะฝะธะต"
 
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
 msgid "add/add"
 msgstr "ะดะพะฑะฐะฒัะฝะต/ะดะพะฑะฐะฒัะฝะต"
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "ะŸั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ โ€ž%sโ€œ (ัะปะตั‚ะธัั‚ ั€ะตะทัƒะปั‚ะฐั‚ ะต ะธะดะตะฝั‚ะธั‡ะตะฝ ััŠั ัะตะณะฐัˆะฝะธั)"
 
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:1003
 msgid "submodule"
 msgstr "ะŸะžะ”ะœะžะ”ะฃะ›"
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "ะšะžะะคะ›ะ˜ะšะข (%s): ะšะพะฝั„ะปะธะบั‚ ะฟั€ะธ ัะปะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
 #, c-format
 msgid "Adding as %s instead"
 msgstr "ะ”ะพะฑะฐะฒัะฝะต ะบะฐั‚ะพ โ€ž%sโ€œ"
 
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4184,7 +4918,7 @@ msgstr ""
 "ะžะฑะฝะพะฒะตะฝ ะฟัŠั‚: โ€ž%sโ€œ ะต ะดะพะฑะฐะฒะตะฝ ะฒ โ€ž%sโ€œ ะฒ ะดะธั€ะตะบั‚ะพั€ะธั, ะบะพัั‚ะพ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะฐ ะฒ "
 "โ€ž%sโ€œ.  ะžะฑะตะบั‚ัŠั‚ ัะต ะผะตัั‚ะธ ะฒ โ€ž%sโ€œ."
 
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4193,7 +4927,7 @@ msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (ะผะตัั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะต): โ€ž%sโ€œ ะต ะดะพะฑะฐะฒะตะฝ ะฒ โ€ž%sโ€œ ะฒ ะดะธั€ะตะบั‚ะพั€ะธั, ะบะพัั‚ะพ ะต "
 "ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะฐ ะฒ โ€ž%sโ€œ.  ะŸั€ะตะดะปะพะถะตะฝะธะตั‚ะพ ะต ะดะฐ ะฟั€ะตะผะตัั‚ะธั‚ะต ะพะฑะตะบั‚ะฐ ะฒ โ€ž%sโ€œ."
 
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4202,7 +4936,7 @@ msgstr ""
 "ะžะฑะฝะพะฒะตะฝ ะฟัŠั‚: โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ โ€ž%sโ€œ ะฒ ะดะธั€ะตะบั‚ะพั€ะธั, ะบะพัั‚ะพ ะต "
 "ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะฐ ะฒ โ€ž%sโ€œ.  ะžะฑะตะบั‚ัŠั‚ ัะต ะผะตัั‚ะธ ะฒ โ€ž%sโ€œ."
 
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4211,179 +4945,187 @@ msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (ะผะตัั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะต): โ€ž%sโ€œ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ ะฒ โ€ž%sโ€œ ะฒ ะดะธั€ะตะบั‚ะพั€ะธั, "
 "ะบะพัั‚ะพ ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะฐ ะฒ โ€ž%sโ€œ.  ะŸั€ะตะดะปะพะถะตะฝะธะตั‚ะพ ะต ะดะฐ ะฟั€ะตะผะตัั‚ะธั‚ะต ะพะฑะตะบั‚ะฐ ะฒ โ€ž%sโ€œ."
 
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
 #, c-format
 msgid "Removing %s"
 msgstr "ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
 msgid "file/directory"
 msgstr "ั„ะฐะนะป/ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
 msgid "directory/file"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธั/ั„ะฐะนะป"
 
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "ะšะžะะคะ›ะ˜ะšะข (%s): ะกัŠั‰ะตัั‚ะฒัƒะฒะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะฝะฐ ะธะผะต โ€ž%sโ€œ ะฒ โ€ž%sโ€œ.  ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ โ€ž%sโ€œ "
 "ะบะฐั‚ะพ โ€ž%sโ€œ"
 
-#: merge-recursive.c:3347
+#: merge-recursive.c:3371
 #, c-format
 msgid "Adding %s"
 msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "ะšะžะะคะ›ะ˜ะšะข (ะดะพะฑะฐะฒัะฝะต/ะดะพะฑะฐะฒัะฝะต): ะšะพะฝั„ะปะธะบั‚ ะฟั€ะธ ัะปะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"ะกะปะธะฒะฐะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฝะฐ ั‚ะตะทะธ ั„ะฐะนะปะพะฒะต:\n"
-"    %s"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
 msgid "Already up to date!"
 msgstr "ะ’ะตั‡ะต ะต ะพะฑะฝะพะฒะตะฝะพ!"
 
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะดัŠั€ะฒะตั‚ะฐั‚ะฐ โ€ž%sโ€œ ะธ โ€ž%sโ€œ"
 
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
 msgid "Merging:"
 msgstr "ะกะปะธะฒะฐะฝะต:"
 
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "ะพั‚ะบั€ะธั‚ ะต %u ะพะฑั‰ ะฟั€ะตะดัˆะตัั‚ะฒะตะฝะธะบ:"
 msgstr[1] "ะพั‚ะบั€ะธั‚ะธ ัะฐ %u ะพะฑั‰ะธ ะฟั€ะตะดัˆะตัั‚ะฒะตะฝะธั†ะธ:"
 
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
 msgid "merge returned no commit"
 msgstr "ัะปะธะฒะฐะฝะตั‚ะพ ะฝะต ะฒัŠั€ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"ะกะปะธะฒะฐะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฝะฐ ั‚ะตะทะธ ั„ะฐะนะปะพะฒะต:\n"
+"    %s"
+
+#: merge-recursive.c:3756
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "ะะตัƒัะฟะตัˆะตะฝ ะฐะฝะฐะปะธะท ะฝะฐ ะพะฑะตะบั‚ะฐ โ€ž%sโ€œ"
 
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
 msgid "Unable to write index."
 msgstr "ะ˜ะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "ั„ะฐะนะปัŠั‚ ั ะธะฝะดะตะบัะฐ ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ โ€ž%sโ€œ ะต ั‚ะฒัŠั€ะดะต ะผะฐะปัŠะบ"
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "ะพั‚ะฟะตั‡ะฐั‚ัŠะบัŠั‚ ะฝะฐ ะธะฝะดะตะบัะฐ ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ 0x%08x ะฝะต ััŠะฒะฟะฐะดะฐ ั 0x%08x"
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะฒะตั€ัะธั ะฝะฐ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ โ€” %d"
 
-#: midx.c:95
+#: midx.c:94
 #, c-format
 msgid "hash version %u does not match"
 msgstr "ะฒะตั€ัะธัั‚ะฐ ะฝะฐ ะพั‚ะฟะตั‡ะฐั‚ัŠะบะฐ %u ะฝะต ััŠะฒะฟะฐะดะฐ"
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ (ะฟั€ะตะบะฐะปะตะฝะพ ะณะพะปัะผะพ) ะพั‚ะผะตัั‚ะฒะฐะฝะต ะฝะฐ ะพั‚ะบัŠั"
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr ""
 "ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ัŠั‚ ะทะฐ ะบั€ะฐะตะฝ ะพั‚ะบัŠั ะฝะฐ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ ัะต ัะฒัะฒะฐ ะฟะพ-"
 "ั€ะฐะฝะพ ะพั‚ ะพั‡ะฐะบะฒะฐะฝะพั‚ะพ"
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "ะปะธะฟัะฒะฐ ะพั‚ะบัŠั (pack-name) ะพั‚ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ"
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "ะปะธะฟัะฒะฐ ะพั‚ะบัŠั (OID fanout) ะพั‚ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ"
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "ะปะธะฟัะฒะฐ ะพั‚ะบัŠั (OID lookup) ะพั‚ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ"
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "ะปะธะฟัะฒะฐ ะพั‚ะบัŠั ะทะฐ ะพั‚ะผะตัั‚ะฒะฐะฝะธัั‚ะฐ ะฝะฐ ะพะฑะตะบั‚ะธ ะพั‚ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ"
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฟะพะดั€ะตะดะฑะฐ ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฒ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ: โ€ž%sโ€œ ัะต ะฟะพัะฒะธ "
 "ะฟั€ะตะดะธ โ€ž%sโ€œ"
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ ะฝะฐ ะฟะฐะบะตั‚ (pack-int-id): %u (ะพั‚ ะพะฑั‰ะพ %u ะฟะฐะบะตั‚ะธ)"
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "ะธะฝะดะตะบััŠั‚ ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ ััŠะดัŠั€ะถะฐ 64-ะฑะธั‚ะพะฒะธ ะพั‚ะผะตัั‚ะฒะฐะฝะธั, ะฝะพ ั€ะฐะทะผะตั€ัŠั‚ ะฝะฐ "
 "โ€žoff_tโ€œ ะต ะฝะตะดะพัั‚ะฐั‚ัŠั‡ะตะฝ"
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr ""
 "ะณั€ะตัˆะบะฐ ะฟั€ะธ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป ะฝะฐ ะฑะฐะทะฐั‚ะฐ ะฝะฐ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ "
 "ะฟะฐะบะตั‚ะธ"
 
-#: midx.c:470
+#: midx.c:472
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "ะฟะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะดะพะฑะฐะฒะตะฝ"
 
-#: midx.c:476
+#: midx.c:478
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "ะธะฝะดะตะบััŠั‚ ะทะฐ ะฟะฐะบะตั‚ะธ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ"
 
-#: midx.c:536
+#: midx.c:538
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "ะพะฑะตะบั‚ %d ะฒ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป ะปะธะฟัะฒะฐ"
 
-#: midx.c:865
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะฐะบะตั‚ะฝะธ ั„ะฐะนะปะพะฒะต ะบัŠะผ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ"
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "ะฟะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป ะทะฐ ั‚ั€ะธะตะฝะต โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะบั€ะธะต"
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "ะ—ะฐะฟะธั ะฝะฐ ะพั‚ะบัŠัะธ ะบัŠะผ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ"
+
+#: midx.c:1052
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "ะธะฝะดะตะบััŠั‚ ะทะฐ ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะธ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‡ะธัั‚ะตะฝ ะฟั€ะธ โ€ž%sโ€œ"
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr "ะขัŠั€ัะตะฝะต ะฝะฐ ัƒะบะฐะทะฐะฝะธั‚ะต ะฟะฐะบะตั‚ะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -4391,60 +5133,68 @@ msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฟะพะดั€ะตะดะฑะฐ ะฝะฐ ะพั‚ะบัŠัะธ (OID fanout): fanout[%d] = %<PRIx32> > "
 "%<PRIx32> = fanout[%d]"
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
 msgstr ""
-"ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฟะพะดั€ะตะดะฑะฐั‚ะฐ ะฝะฐ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ะธ ะฝะฐ ะพะฑะตะบั‚ะธ ะฒ MIDX (ั„ะฐะนะป ั ะธะฝะดะตะบั ะบัŠะผ "
-"ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะฝะธ ั„ะฐะนะปะพะฒะต)"
+"ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฟะพะดั€ะตะดะฑะฐั‚ะฐ ะฝะฐ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ะธ ะฝะฐ ะพะฑะตะบั‚ะธ ะฒัŠะฒ ั„ะฐะนะป ั ะธะฝะดะตะบั ะบัŠะผ "
+"ะผะฝะพะถะตัั‚ะฒะพ ะฟะฐะบะตั‚ะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฟะพะดั€ะตะดะฑะฐ ะฝะฐ ะพั‚ะบัŠัะธ (OID lookup): oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr "ะŸะพะดั€ะตะดะฑะฐ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะฟะพ ะฟะฐะบะตั‚ะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะพั‚ะผะตัั‚ะฒะฐะฝะตั‚ะพ ะฝะฐ ะพะฑะตะบั‚ะธ"
 
-#: midx.c:1160
+#: midx.c:1180
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "ะทะฐะฟะธััŠั‚ ะฒ ะฟะฐะบะตั‚ะฐ ะทะฐ ะพะฑะตะบั‚ะฐ oid[%d] = %s ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐั€ะตะดะตะฝ"
 
-#: midx.c:1166
+#: midx.c:1186
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "ะธะฝะดะตะบััŠั‚ ะฝะฐ ะฟะฐะบะตั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐั€ะตะดะตะฝ"
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะพั‚ะผะตัั‚ะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ ะทะฐ oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "ะŸั€ะตะฑั€ะพัะฒะฐะฝะต ะฝะฐ ัะฒัŠั€ะทะฐะฝะธั‚ะต ะพะฑะตะบั‚ะธ"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "ะขัŠั€ัะตะฝะต ะธ ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ะฝะตัะฒัŠั€ะทะฐะฝะธั‚ะต ะฟะฐะบะตั‚ะฝะธ ั„ะฐะนะปะพะฒะต"
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žpack-objectsโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัั‚ะฐั€ั‚ะธั€ะฐะฝะฐ"
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žpack-objectsโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฒัŠั€ัˆะตะฝะฐ"
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฝะธัˆะบะฐ ะทะฐ ะดะธั€ะตะบั‚ะพั€ะธะธ: %s"
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฝะธัˆะบะฐ ะทะฐ ะธะผะตะฝะฐ: %s"
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทั‡ะฐะบะฐ ะฝะธัˆะบะฐ ะทะฐ ะธะผะตะฝะฐ: %s"
@@ -4497,32 +5247,32 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "ะ—ะฐะดะฐะดะตะฝะฐ ะต ะปะพัˆะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐั‚ะฐ โ€ž%sโ€œ: โ€ž%sโ€œ"
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฒะธะด ะพะฑะตะบั‚: โ€ž%sโ€œ"
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะต %s, ะฐ ะฝะต %s"
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะต ะฝะตะฟะพะทะฝะฐั‚ ะฒะธะด: %d"
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝ"
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr "ั€ะฐะทะปะธะบะฐ ะฒ ะบะพะฝั‚ั€ะพะปะฝะฐั‚ะฐ ััƒะผะฐ: โ€ž%sโ€œ"
 
-#: packfile.c:648
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 "ะพั‚ะผะตัั‚ะฒะฐะฝะต ะฟั€ะตะดะธ ะบั€ะฐั ะฝะฐ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป (ะฒัŠะทะผะพะถะฝะพ ะต ะธะฝะดะตะบััŠั‚ ะดะฐ ะต ะฟะพะฒั€ะตะดะตะฝ)"
@@ -4541,6 +5291,11 @@ msgstr ""
 "ะพั‚ะผะตัั‚ะฒะฐะฝะต ะฟั€ะตะดะธ ะบั€ะฐั ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะฐ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป โ€ž%sโ€œ (ะฒัŠะทะผะพะถะฝะพ ะต ะธะฝะดะตะบััŠั‚ "
 "ะดะฐ ะต ะพั‚ั€ัะทะฐะฝ)"
 
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "ั€ะฐะทะผะตั€ัŠั‚ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝ"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4556,7 +5311,7 @@ msgstr "ะพะฟั†ะธะธั‚ะต โ€ž%sโ€œ ะธ โ€ž%sโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 msgid "%s : incompatible with something else"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะฝะตั‰ะพ"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
@@ -4566,42 +5321,42 @@ msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 msgid "%s isn't available"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะต ะฝะฐะปะธั‡ะฝะฐ"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 "โ€ž%sโ€œ ะพั‡ะฐะบะฒะฐ ะฝะตะพั‚ั€ะธั†ะฐั‚ะตะปะฝะพ ั†ัะปะพ ั‡ะธัะปะพ, ะตะฒะตะฝั‚ัƒะฐะปะฝะพ ััŠั ััƒั„ะธะบั โ€žkโ€œ/โ€žmโ€œ/โ€žgโ€œ"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "ะฝะตะตะดะฝะพะทะฝะฐั‡ะฝะฐ ะพะฟั†ะธั: โ€ž%sโ€œ (ะผะพะถะต ะดะฐ ะต โ€ž--%s%sโ€œ ะธะปะธ โ€ž--%s%sโ€œ)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr "โ€ž--%sโ€œ (ั 2 ั‚ะธั€ะตั‚ะฐ) ะปะธ ะธะผะฐั…ั‚ะต ะฟั€ะตะดะฒะธะด?"
 
-#: parse-options.c:859
+#: parse-options.c:857
 #, c-format
 msgid "unknown option `%s'"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะพะฟั†ะธั: โ€ž%sโ€œ"
 
-#: parse-options.c:861
+#: parse-options.c:859
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ั„ะปะฐะณ โ€ž%cโ€œ"
 
-#: parse-options.c:863
+#: parse-options.c:861
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะธะทะฒัŠะฝ โ€žasciiโ€œ ะฒ ะฝะธะทะฐ: โ€ž%sโ€œ"
 
-#: parse-options.c:887
+#: parse-options.c:885
 msgid "..."
 msgstr "โ€ฆ"
 
-#: parse-options.c:906
+#: parse-options.c:904
 #, c-format
 msgid "usage: %s"
 msgstr "ัƒะฟะพั‚ั€ะตะฑะฐ: %s"
@@ -4609,21 +5364,21 @@ msgstr "ัƒะฟะพั‚ั€ะตะฑะฐ: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:910
 #, c-format
 msgid "   or: %s"
 msgstr "     ะธะปะธ: %s"
 
-#: parse-options.c:915
+#: parse-options.c:913
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:952
 msgid "-NUM"
 msgstr "-ะงะ˜ะกะ›ะž"
 
-#: parse-options.c:968
+#: parse-options.c:966
 #, c-format
 msgid "alias of --%s"
 msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž--%sโ€œ"
@@ -4650,34 +5405,34 @@ msgstr ""
 msgid "malformed object name '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚ โ€ž%sโ€œ"
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "ะะต ะผะพะณะฐั‚ ะดะฐ ัะต ะดะฐะดะฐั‚ ะฟั€ะฐะฒะฐ ะทะฐ ะทะฐะฟะธั ะฒ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะฝะฐ ะณั€ัƒะฟะฐั‚ะฐ"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "ะ•ะบั€ะฐะฝะธั€ะฐั‰ะธัั‚ ะทะฝะฐะบ โ€ž\\โ€œะฝะต ะผะพะถะต ะดะฐ ะต ะฟะพัะปะตะดะตะฝ ะทะฝะฐะบ ะฒ ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ ะฐั‚ั€ะธะฑัƒั‚"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "ะŸะพะทะฒะพะปะตะฝะพ ะต ัะฐะผะพ ะตะดะฝะพ ัƒะบะฐะทะฒะฐะฝะต ะฝะฐ โ€žattr:โ€œ."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "โ€žattr:โ€œ ั‚ั€ัะฑะฒะฐ ะดะฐ ัƒะบะฐะทะฒะฐ ัั‚ะพะนะฝะพัั‚"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะฐั‚ั€ะธะฑัƒั‚: โ€ž%sโ€œ"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "ะณะปะพะฑะฐะปะฝะธั‚ะต ะฝะฐัั‚ั€ะพะนะบะธ ะทะฐ ะฟัŠั‚ะธั‰ะฐ โ€žglobโ€œ ะธ โ€žnoglobโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4685,50 +5440,55 @@ msgstr ""
 "ะณะปะพะฑะฐะปะฝะฐั‚ะฐ ะฝะฐัั‚ั€ะพะนะบะฐ ะทะฐ ะดะพัะปะพะฒะฝะธ ะฟัŠั‚ะธั‰ะฐ โ€žliteralโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะฒัะธั‡ะบะธ "
 "ะดั€ัƒะณะธ ะณะปะพะฑะฐะปะฝะธ ะฝะฐัั‚ั€ะพะนะบะธ ะทะฐ ะฟัŠั‚ะธั‰ะฐ"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟะฐั€ะฐะผะตั‚ัŠั€ ะทะฐ ะพะฟั†ะธัั‚ะฐ ะทะฐ ะผะฐะณะธั‡ะตัะบะธ ะฟัŠั‚ะธั‰ะฐ โ€žprefixโ€œ"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ ะพะฟั†ะธัั‚ะฐ ะทะฐ ะผะฐะณะธั‡ะตัะบะธ ะฟัŠั‚ะธั‰ะฐ โ€ž%.*sโ€œ ะฒ โ€ž%sโ€œ"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "ะ—ะฝะฐะบัŠั‚ โ€ž)โ€œ ะปะธะฟัะฒะฐ ะฒ ะพะฟั†ะธัั‚ะฐ ะทะฐ ะผะฐะณะธั‡ะตัะบะธ ะฟัŠั‚ะธั‰ะฐ ะฒ โ€ž%sโ€œ"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "ะœะฐะณะธั‡ะตัะบะธั‚ะต ะฟัŠั‚ะธั‰ะฐ โ€ž%cโ€œ ัะฐ ะฑะตะท ั€ะตะฐะปะธะทะฐั†ะธั ะทะฐ โ€ž%sโ€œ"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: ะพะฟั†ะธะธั‚ะต โ€žliteralโ€œ ะธ โ€žglobโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: โ€ž%sโ€œ ะต ะธะทะฒัŠะฝ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: โ€ž%sโ€œ ะต ะธะทะฒัŠะฝ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะฟั€ะธ โ€ž%sโ€œ"
 
-#: pathspec.c:514
+#: pathspec.c:517
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "โ€ž%sโ€œ (ะบะปะฐะฒะธัˆ: โ€ž%cโ€œ)"
 
-#: pathspec.c:524
+#: pathspec.c:527
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: ะผะฐะณะธั‡ะตัะบะธั‚ะต ะฟัŠั‚ะธั‰ะฐ ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐั‚ ะพั‚ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€ž%sโ€œ"
 
-#: pathspec.c:591
+#: pathspec.c:594
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะต ัะปะตะด ัะธะผะฒะพะปะฝะฐ ะฒั€ัŠะทะบะฐ"
 
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ั†ะธั‚ะธั€ะฐะฝ ั€ะตะด: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "ะฟะฐะบะตั‚ัŠั‚ ะทะฐ ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ะฑัƒั„ะตั€ะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัˆะต"
@@ -4791,34 +5551,44 @@ msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ"
 msgid "unable to create threaded lstat: %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฝะธัˆะบะฐ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะตั‚ะพ ะฝะฐ โ€žlstatโ€œ: %s"
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr "ะฐั€ะณัƒะผะตะฝั‚ัŠั‚ ะบัŠะผ ะพะฟั†ะธัั‚ะฐ โ€ž--prettyโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "ะ›ะธะฟัะฒะฐ ะฐะดั€ะตั ะทะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr ""
+"ะธะผะตั‚ะพ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต-ะณะฐั€ะฐะฝั‚ ะฝะต ะผะพะถะต ะทะฐ ะทะฐะฟะพั‡ะฒะฐ ััŠั ะทะฝะฐะบะฐ โ€ž/โ€œ: %s"
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "ะบะพะผะฐะฝะดะฐั‚ะฐ ะทะฐ ะถัƒั€ะฝะฐะปะฐ ั ะฟะพะดะฐะฒะฐะฝะธั โ€žlogโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ัั‚ะฐั€ั‚ะธั€ะฐ"
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr ""
 "ะธะทั…ะพะดัŠั‚ ะพั‚ ะบะพะผะฐะฝะดะฐั‚ะฐ ะทะฐ ะถัƒั€ะฝะฐะปะฐ ั ะฟะพะดะฐะฒะฐะฝะธั โ€žlogโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพั‡ะตั‚ะต"
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5020
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะพ"
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ git โ€ž%.*sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั‚ัŠั€ัะตะฝะต ะฝะฐ ั€ะฐะทะปะธะบะฐ"
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "ะถัƒั€ะฝะฐะปัŠั‚ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝ"
@@ -4860,16 +5630,16 @@ msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะฒ ะธะฝะดะตะบัะฐ"
 msgid "unable to stat '%s'"
 msgstr "โ€žstatโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ"
 
-#: read-cache.c:1314
+#: read-cache.c:1330
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "โ€ž%sโ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะธ ะบะฐั‚ะพ ั„ะฐะนะป, ะธ ะบะฐั‚ะพ ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: read-cache.c:1499
+#: read-cache.c:1536
 msgid "Refresh index"
 msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: read-cache.c:1613
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4878,7 +5648,7 @@ msgstr ""
 "ะ—ะฐะดะฐะดะตะฝะฐ ะต ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žindex.versionโ€œ.\n"
 "ะฉะต ัะต ะฟะพะปะทะฒะฐ ะฒะตั€ัะธั %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4888,146 +5658,157 @@ msgstr ""
 "โ€žGIT_INDEX_VERSIONโ€œ.\n"
 "ะฉะต ัะต ะฟะพะปะทะฒะฐ ะฒะตั€ัะธั %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1717
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟะพะดะฟะธั: โ€ž0x%08xโ€œ"
 
-#: read-cache.c:1682
+#: read-cache.c:1720
 #, c-format
 msgid "bad index version %d"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฒะตั€ัะธั ะฝะฐ ะธะฝะดะตะบัะฐ %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1729
 msgid "bad index file sha1 signature"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟะพะดะฟะธั ะทะฐ ะบะพะฝั‚ั€ะพะปะฝะฐ ััƒะผะฐ ะฟะพ SHA1 ะฝะฐ ั„ะฐะนะปะฐ ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: read-cache.c:1721
+#: read-cache.c:1759
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 "ะธะฝะดะตะบััŠั‚ ะฟะพะปะทะฒะฐ ั€ะฐะทัˆะธั€ะตะฝะธะต โ€ž%.4sโ€œ, ะบะพะตั‚ะพ ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ะพั‚ ั‚ะฐะทะธ ะฒะตั€ัะธั ะฝะฐ git"
 
-#: read-cache.c:1723
+#: read-cache.c:1761
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ั€ะฐะทัˆะธั€ะตะฝะธะตั‚ะพ โ€ž%.4sโ€œ"
 
-#: read-cache.c:1760
+#: read-cache.c:1798
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ั„ะพั€ะผะฐั‚ ะฝะฐ ะทะฐะฟะธั ะฒ ะธะฝะดะตะบัะฐ: โ€ž0x%08xโ€œ"
 
-#: read-cache.c:1776
+#: read-cache.c:1814
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะฟะพะปะต ะฒ ะธะฝะดะตะบัะฐ ะฑะปะธะทะพ ะดะพ ะฟัŠั‚ั โ€ž%sโ€œ"
 
-#: read-cache.c:1833
+#: read-cache.c:1871
 msgid "unordered stage entries in index"
 msgstr "ะฝะตะฟะพะดั€ะตะดะตะฝะธ ะทะฐะฟะธัะธ ะฒ ะธะฝะดะตะบัะฐ"
 
-#: read-cache.c:1836
+#: read-cache.c:1874
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "ะผะฝะพะถะตัั‚ะฒะพ ะทะฐะฟะธัะธ ะทะฐ ัะปะตั‚ะธั ั„ะฐะนะป โ€ž%sโ€œ"
 
-#: read-cache.c:1839
+#: read-cache.c:1877
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "ะฝะตะฟะพะดั€ะตะดะตะฝะธ ะทะฐะฟะธัะธ ะทะฐ โ€ž%sโ€œ"
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "ั„ะฐะนะปัŠั‚ ั ะธะฝะดะตะบัะฐ ะต ะฟะพะฒั€ะตะดะตะฝ"
 
-#: read-cache.c:2087
+#: read-cache.c:2124
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฝะธัˆะบะฐ ะทะฐ ะทะฐั€ะตะถะดะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะพั‚ ะบะตัˆะฐ: %s"
 
-#: read-cache.c:2100
+#: read-cache.c:2137
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทั‡ะฐะบะฐ ะฝะธัˆะบะฐ ะทะฐ ะทะฐั€ะตะถะดะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะพั‚ ะบะตัˆะฐ: %s"
 
-#: read-cache.c:2133
+#: read-cache.c:2170
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: ะฝะตัƒัะฟะตัˆะฝะพ ะพั‚ะฒะฐั€ัะฝะต ะฝะฐ ั„ะฐะนะปะฐ ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: read-cache.c:2137
+#: read-cache.c:2174
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปัƒั‡ะธ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะพั‚ะฒะพั€ะตะฝะธั ะธะฝะดะตะบั ััŠั โ€žstatโ€œ"
 
-#: read-cache.c:2141
+#: read-cache.c:2178
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: ั„ะฐะนะปัŠั‚ ะฝะฐ ะธะฝะดะตะบัะฐ ะต ะฟะพ-ะผะฐะปัŠะบ ะพั‚ ะพั‡ะฐะบะฒะฐะฝะพั‚ะพ"
 
-#: read-cache.c:2145
+#: read-cache.c:2182
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s: ะฝะตัƒัะฟะตัˆะฝะพ ะทะฐะดะตะปัะฝะต ะฝะฐ ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐั‰ะฐ ะฟะฐะผะตั‚ ั‡ั€ะตะท โ€žmmapโ€œ ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: read-cache.c:2187
+#: read-cache.c:2224
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฝะธัˆะบะฐ ะทะฐ ะทะฐั€ะตะถะดะฐะฝะต ะฝะฐ ั€ะฐะทัˆะธั€ะตะฝะธัั‚ะฐ ะฝะฐ ะธะฝะดะตะบัะฐ: %s"
 
-#: read-cache.c:2214
+#: read-cache.c:2251
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฝะธัˆะบะฐ ะทะฐ ะทะฐั€ะตะถะดะฐะฝะต ะฝะฐ ั€ะฐะทัˆะธั€ะตะฝะธัั‚ะฐ ะฝะฐ ะธะฝะดะตะบัะฐ: %s"
 
-#: read-cache.c:2246
+#: read-cache.c:2283
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "ัะฟะพะดะตะปะตะฝะธัั‚ ะธะฝะดะตะบั โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ"
 
-#: read-cache.c:2293
+#: read-cache.c:2330
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "ะณั€ะตัˆะบะธ ะฒ ะธะฝะดะตะบัะฐ โ€” ะฒ โ€ž%2$sโ€œ ัะต ะพั‡ะฐะบะฒะฐ โ€ž%1$sโ€œ, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝะพ โ€ž%3$sโ€œ"
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
 #, c-format
 msgid "could not close '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐั‚ะฒะพั€ะธ"
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
 #, c-format
 msgid "could not stat '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žstatโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ"
 
-#: read-cache.c:3105
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฒะพั€ะธ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะฐ git: %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: read-cache.c:3142
+#: read-cache.c:3179
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะดะพ โ€ž%sโ€œ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะฟะพะฟั€ะฐะฒะตะฝะธ"
 
-#: read-cache.c:3291
+#: read-cache.c:3328
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะตะผะธะฝะต ะบัŠะผ ะตั‚ะฐะฟ โ„–0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"ะœะพะถะต ะดะฐ ะฟั€ะพะผะตะฝะธั‚ะต ั‚ะพะฒะฐ ั ะบะพะผะฐะฝะดะธั‚ะต โ€žgit rebase --edit-todoโ€œ ะธ โ€žgit rebase --"
+"continueโ€œ ัะปะตะด ั‚ะพะฒะฐ.\n"
+"ะœะพะถะต ะธ ะดะฐ ะฟั€ะตัƒัั‚ะฐะฝะพะฒะธั‚ะต ะฟั€ะตะฑะฐะทะธั€ะฐะฝะตั‚ะพ ั ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit rebase --abortโ€œ.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
@@ -5035,7 +5816,7 @@ msgstr ""
 "ะะตะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ ะทะฐย ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žrebase.missingCommitsCheckโ€œ.  "
 "ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ ัะต ะฟั€ะตัะบะฐั‡ะฐ."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -5082,14 +5863,14 @@ msgstr ""
 "ะœะพะถะต ะดะฐ ะฟั€ะพะผะตะฝัั‚ะต ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะพัั‚ั‚ะฐ ะฝะฐ ั€ะตะดะพะฒะตั‚ะต โ€” ั‚ะต ัะต ะธะทะฟัŠะปะฝัะฒะฐั‚\n"
 "ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะพ ะพั‚ะณะพั€ะต-ะฝะฐะดะพะปัƒ.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "ะŸั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ โ€ž%sโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ (%d ะบะพะผะฐะฝะดะธ)"
 msgstr[1] "ะŸั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ โ€ž%sโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ (%d ะบะพะผะฐะฝะดะฐ)"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5098,7 +5879,7 @@ msgstr ""
 "ะะต ะธะทั‚ั€ะธะฒะฐะนั‚ะต ั€ะตะดะพะฒะต.  ะŸะพะดะฐะฒะฐะฝะธัั‚ะฐ ะผะพะณะฐั‚ ะดะฐ ัะต ะฟั€ะตัะบะฐั‡ะฐั‚ ั ะบะพะผะฐะฝะดะฐั‚ะฐ "
 "โ€ždropโ€œ.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5106,7 +5887,7 @@ msgstr ""
 "\n"
 "ะะบะพ ะธะทั‚ั€ะธะตั‚ะต ั€ะตะด, ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐั‰ะพั‚ะพ ะผัƒ ะฟะพะดะฐะฒะฐะฝะต ั‰ะต ะฑัŠะดะต ะ˜ะ—ะขะ ะ˜ะขะž.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5121,7 +5902,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -5131,22 +5912,19 @@ msgstr ""
 "ะะบะพ ะธะทั‚ั€ะธะตั‚ะต ะฒัะธั‡ะบะพ, ะฟั€ะตะฑะฐะทะธั€ะฐะฝะตั‚ะพ ั‰ะต ะฑัŠะดะต ะฟั€ะตัƒัั‚ะฐะฝะพะฒะตะฝะพ.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "ะŸั€ะฐะทะฝะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั ัะฐ ะบะพะผะตะฝั‚ะธั€ะฐะฝะธ"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
 #, c-format
 msgid "could not write '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัˆะต"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะฟะธั€ะฐ ะบะฐั‚ะพ โ€ž%sโ€œ."
+msgid "could not write '%s'."
+msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัˆะต."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -5155,7 +5933,7 @@ msgstr ""
 "ะŸั€ะตะดัƒะฟั€ะตะถะดะตะฝะธะต: ะฝัะบะพะธ ะฟะพะดะฐะฒะฐะฝะธั ะผะพะถะต ะดะฐ ัะฐ ะฟั€ะพะฟัƒัะฝะฐั‚ะธ.\n"
 "ะŸั€ะพะฟัƒัะฝะฐั‚ะธ ะฟะพะดะฐะฒะฐะฝะธั (ะฝะพะฒะธั‚ะต ัะฐ ะฝะฐะน-ะพั‚ะณะพั€ะต):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -5172,6 +5950,13 @@ msgstr ""
 "ะฟั€ะตะดัƒะฟั€ะตะถะดะตะฝะธะต)\n"
 "ะธะปะธ โ€žerrorโ€œ (ัั‡ะธั‚ะฐะฝะต ะทะฐ ะณั€ะตัˆะบะฐ).\n"
 
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "ะพั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ั‡ะตั‚ะต."
+
 #: refs.c:262
 #, c-format
 msgid "%s does not point to a valid object!"
@@ -5182,7 +5967,7 @@ msgstr "โ€ž%sโ€œ ะฝะต ัะพั‡ะธ ะบัŠะผ ะฟะพะทะฒะพะปะตะฝ ะพะฑะตะบั‚!"
 msgid "ignoring dangling symref %s"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะป ะฝะฐ ะพะฑะตะบั‚ ะธะทะฒัŠะฝ ะบะปะพะฝ โ€ž%sโ€œ"
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ะฟะพะฒั€ะตะดะตะฝะธั ัƒะบะฐะทะฐั‚ะตะป โ€ž%sโ€œ"
@@ -5207,14 +5992,15 @@ msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€ž%sโ€œ ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ"
 msgid "unexpected object ID when writing '%s'"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ ะฝะฐ ะพะฑะตะบั‚ ะฟั€ะธ ะทะฐะฟะธัะฒะฐะฝะตั‚ะพ ะฝะฐ โ€ž%sโ€œ"
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "ะฒ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะธัˆะต"
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ ะทะฐ ะทะฐะฟะธั"
@@ -5249,37 +6035,37 @@ msgstr "ัƒะบะฐะทะฐั‚ะตะป ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ ั ะณั€ะตัˆะฝะพ ะธ
 msgid "update_ref failed for ref '%s': %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปั โ€ž%sโ€œ: %s"
 
-#: refs.c:2012
+#: refs.c:2023
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "ะฝะต ัะฐ ะฟะพะทะฒะพะปะตะฝะธ ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะฝะฐ ะฟั€ะพะผะตะฝะธ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปั โ€ž%sโ€œ"
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะธัั‚ะฐ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธ ัะฐ ะทะฐะฑั€ะฐะฝะตะฝะธ ะฒ ัั€ะตะดะธ ะฟะพะด ะบะฐั€ะฐะฝั‚ะธะฝะฐ"
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "โ€ž%sโ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ, ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต โ€ž%sโ€œ"
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "ะฝะตะฒัŠะทะผะพะถะฝะพ ะต ะตะดะฝะพะฒั€ะตะผะตะฝะฝะพ ะดะฐ ัะต ะพะฑั€ะฐะฑะพั‚ะฒะฐั‚ โ€ž%sโ€œ ะธ โ€ž%sโ€œ"
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚: %s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะฐั‚ ะธะทั‚ั€ะธั‚ะธ: %s"
@@ -5289,7 +6075,7 @@ msgstr "ะฃะบะฐะทะฐั‚ะตะปะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะฐั‚ ะธะทั‚ั€ะธั‚ะธ: %s"
 msgid "invalid refspec '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป: โ€ž%sโ€œ"
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr "ะธะทั‚ั€ะธั‚"
 
@@ -5308,281 +6094,281 @@ msgstr "ะฝะฐะทะฐะด ั %d"
 msgid "ahead %d, behind %d"
 msgstr "ะฝะฐะฟั€ะตะด ั %d, ะฝะฐะทะฐะด ั %d"
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "ะพั‡ะฐะบะฒะฐะฝ ั„ะพั€ะผะฐั‚: %%(color:ะฆะ’ะฏะข)"
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ั†ะฒัั‚: %%(color:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ั†ัะปะพ ั‡ะธัะปะพ ะทะฐ โ€žrefname:lstrip=%sโ€œ"
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ั†ัะปะพ ั‡ะธัะปะพ ะทะฐ โ€žrefname:rstrip=%sโ€œ"
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ ะทะฐ โ€ž%%(%s)โ€œ: %s"
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: ref-filter.c:269
+#: ref-filter.c:272
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ ะทะฐ %%(objectsize): %s"
 
-#: ref-filter.c:277
+#: ref-filter.c:280
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ โ€ž%%(trailers)โ€œ: %s"
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะฟะพะปะพะถะธั‚ะตะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€žcontents:lines=%sโ€œ"
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ ะทะฐ %%(contents): %s"
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะฟะพะปะพะถะธั‚ะตะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€žobjectname:short=%sโ€œ"
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ ะทะฐ %%(objectname): %s"
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "ะพั‡ะฐะบะฒะฐะฝ ั„ะพั€ะผะฐั‚: %%(align:ะจะ˜ะ ะžะงะ˜ะะ,ะŸะžะ—ะ˜ะฆะ˜ะฏ)"
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะฟะพะทะธั†ะธั: %s"
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ัˆะธั€ะพั‡ะธะฝะฐ: %s"
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ ะทะฐ %%(align): %s"
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะฟะพะปะพะถะธั‚ะตะปะฝะฐ ัˆะธั€ะพั‡ะธะฝะฐ ั ะปะตะบัะตะผะฐั‚ะฐ โ€ž%%(align)โ€œ"
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ ะทะฐ โ€ž%%(if)โ€œ: %s"
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚: โ€ž%.*sโ€œ"
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚: โ€ž%.*sโ€œ"
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "ะฝะต ะต ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ git, ะฐ ะฟะพะปะตั‚ะพ โ€ž%.*sโ€œ ะธะทะธัะบะฒะฐ ะดะพัั‚ัŠะฟ ะดะฐะฝะฝะธ ะฝะฐ ะพะฑะตะบั‚ะฝะธ"
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "ั„ะพั€ะผะฐั‚: ะปะตะบัะตะผะฐั‚ะฐ %%(if) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััŠะพั‚ะฒะตั‚ะฝะฐั‚ะฐ ั %%(then)"
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "ั„ะพั€ะผะฐั‚: ะปะตะบัะตะผะฐั‚ะฐ %%(then) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััŠะพั‚ะฒะตั‚ะฝะฐั‚ะฐ ั %%(if)"
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "ั„ะพั€ะผะฐั‚: ะปะตะบัะตะผะฐั‚ะฐ %%(then) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะธะฝ ะฟัŠั‚"
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "ั„ะพั€ะผะฐั‚: ะปะตะบัะตะผะฐั‚ะฐ %%(then) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ัะปะตะด %%(else)"
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "ั„ะพั€ะผะฐั‚: ะปะตะบัะตะผะฐั‚ะฐ %%(else) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััŠะพั‚ะฒะตั‚ะฝะฐั‚ะฐ ั %%(if)"
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "ั„ะพั€ะผะฐั‚: ะปะตะบัะตะผะฐั‚ะฐ %%(else) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััŠะพั‚ะฒะตั‚ะฝะฐั‚ะฐ ั %%(then)"
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "ั„ะพั€ะผะฐั‚: ะปะตะบัะตะผะฐั‚ะฐ %%(else) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะธะฝ ะฟัŠั‚"
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "ั„ะพั€ะผะฐั‚: ะปะตะบัะตะผะฐั‚ะฐ %%(end) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััŠะพั‚ะฒะตั‚ะฝะฐั‚ะฐ ั"
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะพั€ะผะฐั‚ะธั€ะฐั‰ ะฝะธะท โ€ž%sโ€œ"
 
-#: ref-filter.c:1485
+#: ref-filter.c:1488
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr "ะธะทะฒัŠะฝ ะบะปะพะฝ, ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1491
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr "ะธะทะฒัŠะฝ ะบะปะพะฝ, ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ ะฝะตัะฒัŠั€ะทะฐะฝ ัƒะบะฐะทะฐั‚ะตะป โ€žHEADโ€œ ะฟั€ะธ โ€ž%sโ€œ"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr "ะธะทะฒัŠะฝ ะบะปะพะฝ, ะดะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต ะพั‚ โ€ž%sโ€œ"
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr "ะธะทะฒัŠะฝ ะบะปะพะฝ"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะปะธะฟัะฒะฐ ะทะฐ โ€ž%sโ€œ"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะฐะฝะฐะปะธะทะธั€ะฐะฝะต ั‡ั€ะตะท โ€žparse_object_bufferโ€œ ะฝะฐ โ€ž%sโ€œ ะทะฐ โ€ž%sโ€œ"
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "ะพะฑะตะบั‚ ััŠั ัะณั€ะตัˆะตะฝ ั„ะพั€ะผะฐั‚ ะฟั€ะธ โ€ž%sโ€œ"
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปั ั ะณั€ะตัˆะฝะพ ะธะผะต โ€ž%sโ€œ"
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "ะณั€ะตัˆะบะฐ ะฒัŠะฒ ั„ะพั€ะผะฐฬ€ั‚ะฐ: ะปะธะฟัะฒะฐ ะปะตะบัะตะผะฐั‚ะฐ %%(end)"
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž%sโ€œ ะธ โ€ž--mergedโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž%sโ€œ ะธ โ€ž--no-mergedโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚ โ€ž%sโ€œ"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ัะพั‡ะธ ะบัŠะผ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "ััŠะบั€ะฐั‰ะตะฝะธะตั‚ะพ ะทะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะต ะผะพะถะต ะทะฐ ะทะฐะฟะพั‡ะฒะฐ ััŠั ะทะฝะฐะบะฐ โ€ž/โ€œ: %s"
 
-#: remote.c:410
+#: remote.c:414
 msgid "more than one receivepack given, using the first"
 msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะธะฝ ะฟะฐะบะตั‚ ะทะฐ ะฟะพะปัƒั‡ะฐะฒะฐะฝะต, ั‰ะต ัะต ะฟะพะปะทะฒะฐ ะฟัŠั€ะฒะธัั‚"
 
-#: remote.c:418
+#: remote.c:422
 msgid "more than one uploadpack given, using the first"
 msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะธะฝ ะฟะฐะบะตั‚ ะทะฐ ะธะทะฟั€ะฐั‰ะฐะฝะต, ั‰ะต ัะต ะฟะพะปะทะฒะฐ ะฟัŠั€ะฒะธัั‚"
 
-#: remote.c:608
+#: remote.c:612
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "ะะตะฒัŠะทะผะพะถะฝะพ ะต ะดะฐ ัะต ะดะพัั‚ะฐะฒัั‚ ะตะดะฝะพะฒั€ะตะผะตะฝะฝะพ ะธ โ€ž%sโ€œ, ะธ โ€ž%sโ€œ ะบัŠะผ โ€ž%sโ€œ"
 
-#: remote.c:612
+#: remote.c:616
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "โ€ž%sโ€œ ะพะฑะธะบะฝะพะฒะตะฝะพ ัะปะตะดะธ โ€ž%sโ€œ, ะฐ ะฝะต โ€ž%sโ€œ"
 
-#: remote.c:616
+#: remote.c:620
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "โ€ž%sโ€œ ัะปะตะดะธ ะบะฐะบั‚ะพ โ€ž%sโ€œ, ั‚ะฐะบะฐ ะธ โ€ž%sโ€œ"
 
-#: remote.c:684
+#: remote.c:688
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "ะบะปัŽั‡ โ€ž%sโ€œ ะฝะฐ ัˆะฐะฑะปะพะฝะฐ ะฝะต ััŠะดัŠั€ะถะฐ โ€ž*โ€œ"
 
-#: remote.c:694
+#: remote.c:698
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ ะฝะฐ ัˆะฐะฑะปะพะฝะฐ ะฝะต ััŠะดัŠั€ะถะฐ โ€ž*โ€œ"
 
-#: remote.c:1000
+#: remote.c:1004
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะฝะฐ ะฒะตั€ัะธั-ะธะทั‚ะพั‡ะฝะธะบ โ€ž%sโ€œ ะฝะต ััŠะฒะฟะฐะดะฐ ั ะฝะธะบะพะน ะพะฑะตะบั‚"
 
-#: remote.c:1005
+#: remote.c:1009
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะฝะฐ ะฒะตั€ัะธั-ะธะทั‚ะพั‡ะฝะธะบ โ€ž%sโ€œ ััŠะฒะฟะฐะดะฐ ั ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะธะฝ ะพะฑะตะบั‚"
@@ -5591,7 +6377,7 @@ msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะฝะฐ ะฒะตั€ัะธั-ะธะทั‚ะพั‡ะฝะธะบ โ€ž%sโ€œ ััŠะฒะ
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1024
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5604,7 +6390,7 @@ msgid ""
 "\n"
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
-"ะ—ะฐะดะฐะดะตะฝะฐั‚ะฐ ั†ะตะป ะฝะต ะต ะฟัŠะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป (ะฝะต ะทะฐะฟะพั‡ะฒะฐ ั โ€žrefs/โ€œ).\n"
+"ะ—ะฐะดะฐะดะตะฝะฐั‚ะฐ ั†ะตะป ะฝะต ะต ะฟัŠะปะฝะพ ะธะผะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะป (ะฝะต ะทะฐะฟะพั‡ะฒะฐ ั โ€žrefs/โ€œ).\n"
 "ะ‘ัั…ะฐ ะฟั€ะพะฑะฒะฐะฝะธ ัะปะตะดะฝะธั‚ะต ะฒะฐั€ะธะฐะฝั‚ะธ:\n"
 "\n"
 "  โƒ ัƒะบะฐะทะฐั‚ะตะป ะพั‚ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะบะพะนั‚ะพ ะดะฐ ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐ ะฝะฐ โ€ž%sโ€œ;\n"
@@ -5615,7 +6401,7 @@ msgstr ""
 "ะะธะบะพะน ะพั‚ ะฒะฐั€ะธะฐะฝั‚ะธั‚ะต ะฝะต ัั€ะฐะฑะพั‚ะธ.  ะขั€ัะฑะฒะฐ ัะฐะผะธ ะดะฐ ัƒะบะฐะถะตั‚ะต ะฟัŠะปะฝะพั‚ะพ ะธะผะต ะฝะฐ\n"
 "ัƒะบะฐะทะฐั‚ะตะปั."
 
-#: remote.c:1040
+#: remote.c:1044
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5626,7 +6412,7 @@ msgstr ""
 "ะบะฐั‚ะพ\n"
 "ะธะทั‚ะปะฐัะบะฐั‚ะต ะบัŠะผ โ€ž%s:refs/heads/%sโ€œ?"
 
-#: remote.c:1045
+#: remote.c:1049
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5637,7 +6423,7 @@ msgstr ""
 "ะบะฐั‚ะพ\n"
 "ะธะทั‚ะปะฐัะบะฐั‚ะต ะบัŠะผ โ€ž%s:refs/tags/%sโ€œ?"
 
-#: remote.c:1050
+#: remote.c:1054
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5647,7 +6433,7 @@ msgstr ""
 "ะ˜ะ—ะขะžะงะะ˜ะšัŠั‚ ะต ะพะฑะตะบั‚-ะดัŠั€ะฒะพ.  ะะต ั†ะตะปะธั‚ะต ะปะธ ะฒััŠั‰ะฝะพัั‚ ะดะฐ ััŠะทะดะฐะดะตั‚ะต ะฝะพะฒ ะบะปะพะฝ ะบะฐั‚ะพ\n"
 "ะธะทั‚ะปะฐัะบะฐั‚ะต ะบัŠะผ โ€ž%s:refs/tags/%sโ€œ?"
 
-#: remote.c:1055
+#: remote.c:1059
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5657,118 +6443,118 @@ msgstr ""
 "ะ˜ะ—ะขะžะงะะ˜ะšัŠั‚ ะต ะพะฑะตะบั‚-BLOB.  ะะต ั†ะตะปะธั‚ะต ะปะธ ะฒััŠั‰ะฝะพัั‚ ะดะฐ ััŠะทะดะฐะดะตั‚ะต ะฝะพะฒ ะบะปะพะฝ ะบะฐั‚ะพ\n"
 "ะธะทั‚ะปะฐัะบะฐั‚ะต ะบัŠะผ โ€ž%s:refs/tags/%sโ€œ?"
 
-#: remote.c:1091
+#: remote.c:1095
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "ะฝะต ะต ะพั‚ะบั€ะธั‚ ะบะปะพะฝ ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐั‰ ะฝะฐ โ€ž%sโ€œ"
 
-#: remote.c:1102
+#: remote.c:1106
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทั‚ั€ะธะต: ะพั‚ะดะฐะปะตั‡ะตะฝะธั ัƒะบะฐะทะฐั‚ะตะป ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ"
 
-#: remote.c:1114
+#: remote.c:1118
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะฝะฐ ะฒะตั€ัะธั-ั†ะตะป โ€ž%sโ€œ ััŠะฒะฟะฐะดะฐ ั ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะธะฝ ะพะฑะตะบั‚"
 
-#: remote.c:1121
+#: remote.c:1125
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะฝะฐ ะฒะตั€ัะธั-ั†ะตะป โ€ž%sโ€œ ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐ ะธ ั‰ะต ะฟะพะปัƒั‡ะฐะฒะฐ ะพั‚ ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะธะฝ "
 "ะธะทั‚ะพั‡ะฝะธะบ"
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1628 remote.c:1729
 msgid "HEAD does not point to a branch"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ัะพั‡ะธ ะบัŠะผ ะบะปะพะฝ"
 
-#: remote.c:1633
+#: remote.c:1637
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "ะฝัะผะฐ ะบะปะพะฝ ะฝะฐ ะธะผะต โ€ž%sโ€œ"
 
-#: remote.c:1636
+#: remote.c:1640
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝ ะบะปะพะฝ-ะธะทั‚ะพั‡ะฝะธะบ ะทะฐ ะบะปะพะฝะฐ โ€ž%sโ€œ"
 
-#: remote.c:1642
+#: remote.c:1646
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "ะบะปะพะฝัŠั‚-ะธะทั‚ะพั‡ะฝะธะบ โ€ž%sโ€œ ะฝะต ะต ััŠั…ั€ะฐะฝะตะฝ ะบะฐั‚ะพ ัะปะตะดัั‰ ะบะปะพะฝ"
 
-#: remote.c:1657
+#: remote.c:1661
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "ะปะธะฟัะฒะฐ ะปะพะบะฐะปะตะฝ ัะปะตะดัั‰ ะบะปะพะฝ ะทะฐ ะผะตัั‚ะพะฟะพะปะพะถะตะฝะธะตั‚ะพ ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต โ€ž%sโ€œ ะฒ "
 "ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ โ€ž%sโ€œ"
 
-#: remote.c:1669
+#: remote.c:1673
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "ะฝัะผะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะบะปะพะฝัŠั‚ โ€ž%sโ€œ ะดะฐ ัะปะตะดะธ ะฝัะบะพะน ะดั€ัƒะณ"
 
-#: remote.c:1679
+#: remote.c:1683
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ ะฝะต ะฒะบะปัŽั‡ะฒะฐ โ€ž%sโ€œ"
 
-#: remote.c:1692
+#: remote.c:1696
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะต ะฒะบะปัŽั‡ะฒะฐ ั†ะตะป (โ€žpush.defaultโ€œ ะต โ€žnothingโ€œ)"
 
-#: remote.c:1714
+#: remote.c:1718
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "ะฟั€ะพัั‚ะพั‚ะพ (simple) ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะต ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐ ะฝะฐ ะตะดะฝะฐ ั†ะตะป"
 
-#: remote.c:1840
+#: remote.c:1844
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "ะพั‚ะดะฐะปะตั‡ะตะฝะธัั‚ ัƒะบะฐะทะฐั‚ะตะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚"
 
-#: remote.c:1853
+#: remote.c:1857
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "โ€ข ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะฝะตะพั‡ะฐะบะฒะฐะฝะธั ะปะพะบะฐะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป โ€ž%sโ€œ"
 
-#: remote.c:2016
+#: remote.c:2020
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "ะขะพะทะธ ะบะปะพะฝ ัะปะตะดะธ โ€ž%sโ€œ, ะฝะพ ัะปะตะดะตะฝะธัั‚ ะบะปะพะฝ ะต ะธะทั‚ั€ะธั‚.\n"
 
-#: remote.c:2020
+#: remote.c:2024
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (ะทะฐ ะดะฐ ะบะพั€ะธะณะธั€ะฐั‚ะต ั‚ะพะฒะฐ, ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit branch --unset-upstreamโ€œ)\n"
 
-#: remote.c:2023
+#: remote.c:2027
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "ะšะปะพะฝัŠั‚ ะต ะฐะบั‚ัƒะฐะปะธะทะธั€ะฐะฝ ะบัŠะผ โ€ž%sโ€œ.\n"
 
-#: remote.c:2027
+#: remote.c:2031
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "ะšะปะพะฝัŠั‚ ะฒะธ ะธ โ€ž%sโ€œ ัะพั‡ะฐั‚ ะบัŠะผ ั€ะฐะทะปะธั‡ะฝะธ ะฟะพะดะฐะฒะฐะฝะธั.\n"
 
-#: remote.c:2030
+#: remote.c:2034
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (ะทะฐ ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะฟะพะปะทะฒะฐะนั‚ะต โ€ž%sโ€œ)\n"
 
-#: remote.c:2034
+#: remote.c:2038
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "ะšะปะพะฝัŠั‚ ะฒะธ ะต ั %2$d ะฟะพะดะฐะฒะฐะฝะต ะฟั€ะตะด โ€ž%1$sโ€œ.\n"
 msgstr[1] "ะšะปะพะฝัŠั‚ ะฒะธ ะต ั %2$d ะฟะพะดะฐะฒะฐะฝะธั ะฟั€ะตะด โ€ž%1$sโ€œ.\n"
 
-#: remote.c:2040
+#: remote.c:2044
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (ะฟัƒะฑะปะธะบัƒะฒะฐะนั‚ะต ะปะพะบะฐะปะฝะธั‚ะต ัะธ ะฟั€ะพะผะตะฝะธ ั‡ั€ะตะท โ€žgit pushโ€œ)\n"
 
-#: remote.c:2043
+#: remote.c:2047
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5776,11 +6562,11 @@ msgid_plural ""
 msgstr[0] "ะšะปะพะฝัŠั‚ ะฒะธ ะต ั %2$d ะฟะพะดะฐะฒะฐะฝะต ะทะฐะด โ€ž%1$sโ€œ ะธ ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะตะฒัŠั€ั‚ัะฝ.\n"
 msgstr[1] "ะšะปะพะฝัŠั‚ ะฒะธ ะต ั %2$d ะฟะพะดะฐะฒะฐะฝะธั ะทะฐะด โ€ž%1$sโ€œ ะธ ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะตะฒัŠั€ั‚ัะฝ.\n"
 
-#: remote.c:2051
+#: remote.c:2055
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (ะพะฑะฝะพะฒะตั‚ะต ะปะพะบะฐะปะฝะธั ัะธ ะบะปะพะฝ ั‡ั€ะตะท โ€žgit pullโ€œ)\n"
 
-#: remote.c:2054
+#: remote.c:2058
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5795,11 +6581,11 @@ msgstr[1] ""
 "ะขะตะบัƒั‰ะธัั‚ ะบะปะพะฝ ัะต ะต ะพั‚ะดะตะปะธะป ะพั‚ โ€ž%sโ€œ,\n"
 "ะดะฒะฐั‚ะฐ ะธะผะฐั‚ ััŠะพั‚ะฒะตั‚ะฝะพ ะฟะพ %d ะธ %d ะฝะตััŠะฒะฟะฐะดะฐั‰ะธ ะฟะพะดะฐะฒะฐะฝะธั.\n"
 
-#: remote.c:2064
+#: remote.c:2068
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (ัะปะตะนั‚ะต ะพั‚ะดะฐะปะตั‡ะตะฝะธั ะบะปะพะฝ ะฒ ะปะพะบะฐะปะฝะธั ั‡ั€ะตะท โ€žgit pullโ€œ)\n"
 
-#: remote.c:2247
+#: remote.c:2251
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "ะพั‡ะฐะบะฒะฐะฝะพั‚ะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะพ"
@@ -5814,7 +6600,7 @@ msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะป ะทะฐ ะทะฐะผัะฝะฐ: โ€ž
 msgid "duplicate replace ref: %s"
 msgstr "ะฟะพะฒั‚ะฐั€ัั‰ ัะต ัƒะบะฐะทะฐั‚ะตะป ะทะฐ ะทะฐะผัะฝะฐ: โ€ž%sโ€œ"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "ะดัŠะปะฑะพั‡ะธะฝะฐั‚ะฐ ะฝะฐ ะทะฐะผัะฝะฐ ะต ะฟั€ะตะบะฐะปะตะฝะพ ะณะพะปัะผะฐ ะทะฐ ะพะฑะตะบั‚ะฐ: โ€ž%sโ€œ"
@@ -5880,8 +6666,8 @@ msgstr "ะธะทะปะธัˆะฝะธัั‚ ะพะฑะตะบั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทั‚ั€ะ
 msgid "Recorded preimage for '%s'"
 msgstr "ะŸั€ะตะดะฒะฐั€ะธั‚ะตะปะฝะธัั‚ ะฒะฐั€ะธะฐะฝั‚ ะฝะฐ โ€ž%sโ€œ ะต ะทะฐะฟะฐะทะตะฝ"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝะฐ"
@@ -5915,20 +6701,20 @@ msgstr "ะ—ะฐะฟะฐะทะตะฝะฐั‚ะฐ ะบะพั€ะตะบั†ะธั ะฝะฐ ะบะพะฝั„ะปะธะบั‚ ะฟั€ะธ โ€ž%s
 msgid "unable to open rr-cache directory"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€žrr-cacheโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฒะพั€ะธ"
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr "ะขะตะบัƒั‰ะธัั‚ ะบะปะพะฝ ะต ะฟะพะฒั€ะตะดะตะฝ"
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "ะขะตะบัƒั‰ะธัั‚ ะบะปะพะฝ โ€ž%sโ€œ ะต ะฑะตะท ะฟะพะดะฐะฒะฐะฝะธั "
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--first-parentโ€œ ะธ โ€ž--bisectโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž-Lโ€œ ะฟะพะดะดัŠั€ะถะฐ ะตะดะธะฝัั‚ะฒะตะฝะพ ั„ะพั€ะผะฐั‚ะธั€ะฐะฝะตั‚ะพ ะฝะฐ ั€ะฐะทะปะธะบะธั‚ะต ัะฟะพั€ะตะด ะพะฟั†ะธะธั‚ะต โ€ž-"
@@ -5953,32 +6739,32 @@ msgstr ""
 "ะ—ะฐ ะดะฐ ะธะทะบะปัŽั‡ะธั‚ะต ั‚ะพะฒะฐ ะฟั€ะตะดัƒะฟั€ะตะถะดะตะฝะธะต, ะธะทะฟัŠะปะฝะตั‚ะต:\n"
 "    git config advice.ignoredHook false"
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "ะฝะตะพั‡ะฐะบะฒะฐะฝ ะธะทั‡ะธัั‚ะฒะฐั‰ ะฟะฐะบะตั‚ โ€žflushโ€œ ะฟั€ะธ ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะพั‚ "
 "ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต"
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr ""
 "ััŠัั‚ะพัะฝะธะตั‚ะพ ะพั‚ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะพ: %s"
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต: %s"
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr "ัะตั€ั‚ะธั„ะธะบะฐั‚ัŠั‚ ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะดะฟะธัะฐะฝ"
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr "ะพั‚ัั€ะตั‰ะฝะฐั‚ะฐ ัั‚ั€ะฐะฝะฐ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต ั ะพะฟั†ะธัั‚ะฐ โ€ž--signedโ€œ"
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5986,47 +6772,47 @@ msgstr ""
 "ะพั‚ัั€ะตั‰ะฝะฐั‚ะฐ ัั‚ั€ะฐะฝะฐ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต ั ะพะฟั†ะธัั‚ะฐ โ€ž--signedโ€œ, ะทะฐั‚ะพะฒะฐ ะฝะต ัะต "
 "ะธะทะฟะพะปะทะฒะฐ ัะตั€ั‚ะธั„ะธะบะฐั‚"
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr "ะฟะพะปัƒั‡ะฐะฒะฐั‰ะฐั‚ะฐ ัั‚ั€ะฐะฝะฐ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต ั ะพะฟั†ะธัั‚ะฐ โ€ž--atomicโ€œ"
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr "ะพั‚ัั€ะตั‰ะฝะฐั‚ะฐ ัั‚ั€ะฐะฝะฐ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธะธ ะฟั€ะธ ะธะทั‚ะปะฐัะบะฒะฐะฝะต"
 
-#: sequencer.c:187
+#: sequencer.c:191
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "ะฝะตััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ ั€ะตะถะธะผ ะฝะฐ ะธะทั‡ะธัั‚ะฒะฐะฝะต โ€ž%sโ€œ ะฝะฐ ััŠะพะฑั‰ะตะฝะธะต ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: sequencer.c:292
+#: sequencer.c:296
 #, c-format
 msgid "could not delete '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: sequencer.c:321
+#: sequencer.c:325
 msgid "revert"
 msgstr "ะพั‚ะผัะฝะฐ"
 
-#: sequencer.c:323
+#: sequencer.c:327
 msgid "cherry-pick"
 msgstr "ะพั‚ะฑะธั€ะฐะฝะต"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:329
+msgid "rebase"
+msgstr "ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: sequencer.c:327
+#: sequencer.c:331
 #, c-format
 msgid "unknown action: %d"
 msgstr "ะฝะตะธะทะฒะตัั‚ะฝะพ ะดะตะนัั‚ะฒะธะต: %d"
 
-#: sequencer.c:385
+#: sequencer.c:389
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -6034,7 +6820,7 @@ msgstr ""
 "ัะปะตะด ะบะพั€ะธะณะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะบะพะฝั„ะปะธะบั‚ะธั‚ะต, ะพั‚ะฑะตะปะตะถะตั‚ะต ััŠะพั‚ะฒะตั‚ะฝะธั‚ะต\n"
 "ะฟัŠั‚ะธั‰ะฐ ั โ€žgit add ะŸะชะขโ€ฆโ€œ ะธะปะธ โ€žgit rm ะŸะชะขโ€ฆโ€œ."
 
-#: sequencer.c:388
+#: sequencer.c:392
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6044,115 +6830,110 @@ msgstr ""
 "ะฟัŠั‚ะธั‰ะฐ ั โ€žgit add ะŸะชะขโ€ฆโ€œ ะธะปะธ โ€žgit rm ะŸะชะขโ€ฆโ€œ, ัะปะตะด ะบะพะตั‚ะพ\n"
 "ะฟะพะดะฐะนั‚ะต ั€ะตะทัƒะปั‚ะฐั‚ะฐ ั ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit commit'โ€œ."
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:405 sequencer.c:2901
 #, c-format
 msgid "could not lock '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะบะปัŽั‡ะธ"
 
-#: sequencer.c:408
+#: sequencer.c:412
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "ะบั€ะฐัั‚ ะฝะฐ ั€ะตะด ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัˆะต ะฒ โ€ž%sโ€œ"
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฒัŠั€ัˆะธ"
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
 #, c-format
 msgid "could not read '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: sequencer.c:462
+#: sequencer.c:466
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "ะปะพะบะฐะปะฝะธั‚ะต ะฒะธ ะฟั€ะพะผะตะฝะธ ั‰ะต ะฑัŠะดะฐั‚ ะฟั€ะตะทะฐะฟะธัะฐะฝะธ ะฟั€ะธ %s."
 
-#: sequencer.c:466
+#: sequencer.c:470
 msgid "commit your changes or stash them to proceed."
 msgstr "ะฟะพะดะฐะนั‚ะต ะธะปะธ ัะบะฐั‚ะฐะนั‚ะต ะฟั€ะพะผะตะฝะธั‚ะต, ะทะฐ ะดะฐ ะฟั€ะพะดัŠะปะถะธั‚ะต"
 
-#: sequencer.c:498
+#: sequencer.c:502
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: ะฟั€ะตะฒัŠั€ั‚ะฐะฝะต"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "ะะตััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ ั€ะตะถะธะผ ะฝะฐ ะธะทั‡ะธัั‚ะฒะฐะฝะต โ€ž%sโ€œ"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:635
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: ะฝะพะฒะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝ"
 
-#: sequencer.c:649
+#: sequencer.c:652
 msgid "unable to update cache tree"
 msgstr "ะดัŠั€ะฒะพั‚ะพ ะฝะฐ ะบะตัˆะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝะพ"
 
-#: sequencer.c:663
+#: sequencer.c:666
 msgid "could not resolve HEAD commit"
 msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ, ัะพั‡ะตะฝะพ ะพั‚ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ, ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ"
 
-#: sequencer.c:743
+#: sequencer.c:746
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "ะฒ โ€ž%.*sโ€œ ะฝัะผะฐ ะบะปัŽั‡ะพะฒะต"
 
-#: sequencer.c:754
+#: sequencer.c:757
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "ั†ะธั‚ะธั€ะฐะฝะตั‚ะพ ะฝะฐ ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‡ะธัั‚ะตะฝะพ"
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "ั„ะฐะนะปัŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ: โ€ž%sโ€œ"
 
-#: sequencer.c:801
+#: sequencer.c:804
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ ะทะฐ ะฐะฒั‚ะพั€ โ€žGIT_AUTHOR_NAMEโ€œ ะฒะตั‡ะต ะต ะทะฐะดะฐะดะตะฝะฐ"
 
-#: sequencer.c:806
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ ะทะฐ ะต-ะฟะพั‰ะฐ โ€žGIT_AUTHOR_EMAILโ€œ ะฒะตั‡ะต ะต ะทะฐะดะฐะดะตะฝะฐ"
 
-#: sequencer.c:811
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ ะทะฐ ะดะฐั‚ะฐ โ€žGIT_AUTHOR_DATEโ€œ ะฒะตั‡ะต ะต ะทะฐะดะฐะดะตะฝะฐ"
 
-#: sequencer.c:815
+#: sequencer.c:818
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐ โ€ž%sโ€œ"
 
-#: sequencer.c:820
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ ะทะฐ ะฐะฒั‚ะพั€ โ€žGIT_AUTHOR_NAMEโ€œ ะปะธะฟัะฒะฐ"
 
-#: sequencer.c:822
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ ะทะฐ ะต-ะฟะพั‰ะฐ โ€žGIT_AUTHOR_EMAILโ€œ ะปะธะฟัะฒะฐ"
 
-#: sequencer.c:824
+#: sequencer.c:827
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ ะทะฐ ะดะฐั‚ะฐ โ€žGIT_AUTHOR_DATEโ€œ ะปะธะฟัะฒะฐ"
 
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะพั€ะผะฐั‚ ะฝะฐ ะดะฐั‚ะฐ โ€ž%sโ€œ ะฒ โ€ž%sโ€œ"
-
-#: sequencer.c:901
+#: sequencer.c:876
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -6181,17 +6962,13 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฝะฐั‡ะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
-
-#: sequencer.c:1216
+#: sequencer.c:1148
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบัƒะบะฐั‚ะฐ ะฟั€ะธ ะฟั€ะพะผัะฝะฐ ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต "
 "(prepare-commit-msg)"
 
-#: sequencer.c:1223
+#: sequencer.c:1154
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6220,7 +6997,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: sequencer.c:1167
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6246,338 +7023,337 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1209
 msgid "couldn't look up newly created commit"
 msgstr "ั‚ะพะบัƒ ั‰ะพ ััŠะทะดะฐะดะตะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ"
 
-#: sequencer.c:1280
+#: sequencer.c:1211
 msgid "could not parse newly created commit"
 msgstr "ั‚ะพะบัƒ ั‰ะพ ััŠะทะดะฐะดะตะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะพ"
 
-#: sequencer.c:1326
+#: sequencer.c:1257
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 "ััŠัั‚ะพัะฝะธะตั‚ะพ ัะพั‡ะตะฝะพ ะพั‚ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ ัะปะตะด "
 "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ"
 
-#: sequencer.c:1328
+#: sequencer.c:1259
 msgid "detached HEAD"
 msgstr "ะฝะตัะฒัŠั€ะทะฐะฝ ะฒั€ัŠั… โ€žHEADโ€œ"
 
-#: sequencer.c:1332
+#: sequencer.c:1263
 msgid " (root-commit)"
 msgstr " (ะฝะฐั‡ะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต)"
 
-#: sequencer.c:1353
+#: sequencer.c:1284
 msgid "could not parse HEAD"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝ"
 
-#: sequencer.c:1355
+#: sequencer.c:1286
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ โ€ž%sโ€œ ัะพั‡ะธ ะบัŠะผ ะฝะตั‰ะพ, ะบะพะตั‚ะพ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต!"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
 msgid "could not parse HEAD commit"
 msgstr "ะฒัŠั€ั…ะพะฒะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะพ"
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1342 sequencer.c:1968
 msgid "unable to parse commit author"
 msgstr "ะฐะฒั‚ะพั€ัŠั‚ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝ"
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
 msgid "git write-tree failed to write a tree"
 msgstr "ะšะพะผะฐะฝะดะฐั‚ะฐ โ€žgit write-treeโ€œ ะฝะต ัƒัะฟั ะดะฐ ะทะฐะฟะธัˆะต ะพะฑะตะบั‚-ะดัŠั€ะฒะพ"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1386 sequencer.c:1447
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะพ ะพั‚ โ€ž%sโ€œ"
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
 msgid "failed to write commit object"
 msgstr "ะพะฑะตะบั‚ัŠั‚ ะทะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
 
-#: sequencer.c:1526
+#: sequencer.c:1474
 #, c-format
 msgid "could not parse commit %s"
 msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะพ"
 
-#: sequencer.c:1531
+#: sequencer.c:1479
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "ั€ะพะดะธั‚ะตะปัะบะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะพ"
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1562 sequencer.c:1673
 #, c-format
 msgid "unknown command: %d"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะบะพะผะฐะฝะดะฐ: %d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1620 sequencer.c:1645
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "ะขะพะฒะฐ ะต ะพะฑะตะดะธะฝะตะฝะธะต ะพั‚ %d ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: sequencer.c:1672
+#: sequencer.c:1630
 msgid "need a HEAD to fixup"
 msgstr "ะ—ะฐ ะฒะบะฐั€ะฒะฐะฝะต ะฒ ะฟั€ะตะดั…ะพะดะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ะฒะธ ั‚ั€ัะฑะฒะฐ ัƒะบะฐะทะฐั‚ะตะป โ€žHEADโ€œ"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1632 sequencer.c:3212
 msgid "could not read HEAD"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพั‡ะตั‚ะต"
 
-#: sequencer.c:1676
+#: sequencer.c:1634
 msgid "could not read HEAD's commit message"
 msgstr ""
 "ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะบัŠะผ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะพ: %s"
 
-#: sequencer.c:1682
+#: sequencer.c:1640
 #, c-format
 msgid "cannot write '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะฐะทะธ"
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "ะขะพะฒะฐ ะต 1-ั‚ะพ ััŠะพะฑั‰ะตะฝะธะต ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต:"
 
-#: sequencer.c:1697
+#: sequencer.c:1655
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะบัŠะผ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะพ"
 
-#: sequencer.c:1704
+#: sequencer.c:1662
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "ะขะพะฒะฐ ะต ััŠะพะฑั‰ะตะฝะธะต ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต โ„–%d:"
 
-#: sequencer.c:1710
+#: sequencer.c:1668
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "ะกัŠะพะฑั‰ะตะฝะธะต ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต โ„–%d ั‰ะต ะฑัŠะดะต ะฟั€ะตัะบะพั‡ะตะฝะพ:"
 
-#: sequencer.c:1798
+#: sequencer.c:1756
 msgid "your index file is unmerged."
 msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะต ัะปัั‚."
 
-#: sequencer.c:1805
+#: sequencer.c:1763
 msgid "cannot fixup root commit"
 msgstr "ะฝะฐั‡ะฐะปะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะบะฐั€ะฐ ะฒ ะฟั€ะตะดั…ะพะดะฝะพั‚ะพ ะผัƒ"
 
-#: sequencer.c:1824
+#: sequencer.c:1782
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะต ัะปะธะฒะฐะฝะต, ะฝะพ ะฝะต ะต ะดะฐะดะตะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž-mโ€œ"
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1790 sequencer.c:1798
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะฝัะผะฐ ั€ะพะดะธั‚ะตะป %d"
 
-#: sequencer.c:1846
+#: sequencer.c:1804
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฒะปะธั‡ะฐะฝะต ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1823
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: ะฝะตั€ะฐะทะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ ั€ะพะดะธั‚ะตะปัะบะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ"
 
-#: sequencer.c:1930
+#: sequencer.c:1888
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะตะธะผะตะฝัƒะฒะฐ ะฝะฐ โ€ž%sโ€œ"
 
-#: sequencer.c:1985
+#: sequencer.c:1943
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œโ€ฆ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะผะตะฝะตะฝะพ: โ€ž%sโ€œ"
 
-#: sequencer.c:1986
+#: sequencer.c:1944
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œโ€ฆ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะธะปะพะถะตะฝะพ: โ€ž%sโ€œ"
 
-#: sequencer.c:2045
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ %s %s โ€” ะบั€ัŠะฟะบะฐั‚ะฐ ะฒะตั‡ะต ะต ะฟั€ะธะปะพะถะตะฝะฐ\n"
+
+#: sequencer.c:2018
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: ะฝะตัƒัะฟะตัˆะฝะพ ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: sequencer.c:2052
+#: sequencer.c:2025
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: ะฝะตัƒัะฟะตัˆะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: sequencer.c:2128
+#: sequencer.c:2102
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ: โ€ž%sโ€œ"
 
-#: sequencer.c:2137
+#: sequencer.c:2111
 #, c-format
 msgid "missing arguments for %s"
 msgstr "โ€ž%sโ€œ ะธะทะธัะบะฒะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: sequencer.c:2174
+#: sequencer.c:2142
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "โ€ž%.*sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
+msgid "could not parse '%s'"
+msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
 
-#: sequencer.c:2228
+#: sequencer.c:2203
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั€ะตะด %d: %.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2214
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "ะ‘ะตะท ะฟั€ะตะดะธัˆะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ โ€ž%sโ€œ"
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "ะพั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ั‡ะตั‚ะต."
-
-#: sequencer.c:2323
+#: sequencer.c:2298
 msgid "cancelling a cherry picking in progress"
 msgstr "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะทะฒัŠั€ัˆะฒะฐะฝะพั‚ะพ ะฒ ะผะพะผะตะฝั‚ะฐ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: sequencer.c:2330
+#: sequencer.c:2305
 msgid "cancelling a revert in progress"
 msgstr "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะทะฒัŠั€ัˆะฒะฐะฝะพั‚ะพ ะฒ ะผะพะผะตะฝั‚ะฐ ะพั‚ะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: sequencer.c:2364
+#: sequencer.c:2349
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "ะบะพั€ะธะณะธั€ะฐะนั‚ะต ั‚ะพะฒะฐ ั‡ั€ะตะท โ€žgit rebase --edit-todoโ€œ."
 
-#: sequencer.c:2366
+#: sequencer.c:2351
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "ะฝะตะธะทะฟะพะปะทะฒะฐะตะผ ั„ะฐะนะป ั ะพะฟะธัะฐะฝะธะต ะฝะฐ ะฟั€ะตะดัั‚ะพัั‰ะธั‚ะต ะดะตะนัั‚ะฒะธั: โ€ž%sโ€œ"
 
-#: sequencer.c:2371
+#: sequencer.c:2356
 msgid "no commits parsed."
 msgstr "ะฝะธะบะพะต ะพั‚ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ั€ะฐะทะฟะพะทะฝะฐะต."
 
-#: sequencer.c:2382
+#: sequencer.c:2367
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 "ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะพั‚ะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต."
 
-#: sequencer.c:2384
+#: sequencer.c:2369
 msgid "cannot revert during a cherry-pick."
 msgstr "ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะพั‚ะฑะธั€ะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ะพั‚ะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต."
 
-#: sequencer.c:2466
+#: sequencer.c:2447
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€ž%sโ€œ: โ€ž%sโ€œ"
 
-#: sequencer.c:2553
+#: sequencer.c:2540
 msgid "unusable squash-onto"
 msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ, ะฒ ะบะพะตั‚ะพ ะดั€ัƒะณะธั‚ะต ะดะฐ ัะต ะฒะบะฐั€ะฐั‚, ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ"
 
-#: sequencer.c:2569
+#: sequencer.c:2556
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะฐะนะป ั ะพะฟั†ะธะธ: โ€ž%sโ€œ"
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2644 sequencer.c:4361
 msgid "empty commit set passed"
 msgstr "ะทะฐะดะฐะดะตะฝะพ ะต ะฟั€ะฐะทะฝะพ ะผะฝะพะถะตัั‚ะฒะพ ะพั‚ ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: sequencer.c:2668
+#: sequencer.c:2660
 msgid "revert is already in progress"
 msgstr "ะฒ ะผะพะผะตะฝั‚ะฐ ะฒะตั‡ะต ัะต ะธะทะฒัŠั€ัˆะฒะฐ ะพั‚ะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: sequencer.c:2670
+#: sequencer.c:2662
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit cherry-pick (--continue | %s--abort | --quit)โ€œ"
 
-#: sequencer.c:2673
+#: sequencer.c:2665
 msgid "cherry-pick is already in progress"
 msgstr "ะฒ ะผะพะผะตะฝั‚ะฐ ะฒะตั‡ะต ัะต ะธะทะฒัŠั€ัˆะฒะฐ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: sequencer.c:2675
+#: sequencer.c:2667
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit cherry-pick (--continue | %s--abort | --quit)โ€œ"
 
-#: sequencer.c:2689
+#: sequencer.c:2681
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะทะฐ ะพะฟั€ะตะดะตะปัะฝะตั‚ะพ ะฝะฐ ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะพัั‚ั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต "
 "ััŠะทะดะฐะดะตะฝะฐ"
 
-#: sequencer.c:2704
+#: sequencer.c:2696
 msgid "could not lock HEAD"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะบะปัŽั‡ะธ"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2756 sequencer.c:4099
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 "ะฒ ะผะพะผะตะฝั‚ะฐ ะฝะต ัะต ะธะทะฒัŠั€ัˆะฒะฐ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ะธะปะธ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2758 sequencer.c:2769
 msgid "cannot resolve HEAD"
 msgstr "ะŸะพะดะฐะฒะฐะฝะตั‚ะพ ัะพั‡ะตะฝะพ ะพั‚ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2760 sequencer.c:2804
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 "ะดะตะนัั‚ะฒะธะตั‚ะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะตัƒัั‚ะฐะฝะพะฒะตะฝะพ, ะบะพะณะฐั‚ะพ ัั‚ะต ะฝะฐ ะบะปะพะฝ, ะบะพะนั‚ะพ ั‚ะตะฟัŠั€ะฒะฐ "
 "ะฟั€ะตะดัั‚ะพะธ ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝ"
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2790 builtin/grep.c:724
 #, c-format
 msgid "cannot open '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ"
 
-#: sequencer.c:2800
+#: sequencer.c:2792
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ: %s"
 
-#: sequencer.c:2801
+#: sequencer.c:2793
 msgid "unexpected end of file"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝ ะบั€ะฐะน ะฝะฐ ั„ะฐะนะป"
 
-#: sequencer.c:2807
+#: sequencer.c:2799
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 "ะทะฐะฟะฐะทะตะฝะธัั‚ ะฟั€ะตะดะธ ะทะฐะฟะพั‡ะฒะฐะฝะตั‚ะพ ะฝะฐ ะพั‚ะฑะธั€ะฐะฝะตั‚ะพ ั„ะฐะนะป ะทะฐ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ โ€” โ€ž%sโ€œ ะต "
 "ะฟะพะฒั€ะตะดะตะฝ"
 
-#: sequencer.c:2818
+#: sequencer.c:2810
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "ะ˜ะทะณะปะตะถะดะฐ ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะต ะฟั€ะพะผะตะฝะตะฝ.  ะŸั€ะพะฒะตั€ะตั‚ะต ะบัŠะผ ะบะฐะบะฒะพ ัะพั‡ะธ.\n"
 "ะะต ัะต ะฟั€ะฐะฒัั‚ ะฟั€ะพะผะตะฝะธ."
 
-#: sequencer.c:2859
+#: sequencer.c:2851
 msgid "no revert in progress"
 msgstr "ะฒ ะผะพะผะตะฝั‚ะฐ ะฝะต ั‚ะตั‡ะต ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: sequencer.c:2867
+#: sequencer.c:2859
 msgid "no cherry-pick in progress"
 msgstr "ะฒ ะผะพะผะตะฝั‚ะฐ ะฝะต ัะต ะธะทะฒัŠั€ัˆะฒะฐ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: sequencer.c:2877
+#: sequencer.c:2869
 msgid "failed to skip the commit"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ"
 
-#: sequencer.c:2884
+#: sequencer.c:2876
 msgid "there is nothing to skip"
 msgstr "ะฝัะผะฐ ะบะฐะบะฒะพ ะดะฐ ัะต ะฟั€ะตัะบะพั‡ะธ"
 
-#: sequencer.c:2887
+#: sequencer.c:2879
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6587,21 +7363,21 @@ msgstr ""
 "\n"
 "    git %s --continue"
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3003 sequencer.c:4011
 #, c-format
 msgid "could not update %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ"
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3042 sequencer.c:3991
 msgid "cannot read HEAD"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: sequencer.c:3066
+#: sequencer.c:3059
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะฟะธั€ะฐ ะบะฐั‚ะพ โ€ž%sโ€œ"
 
-#: sequencer.c:3074
+#: sequencer.c:3067
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6620,27 +7396,22 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3077
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "ะŸะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œโ€ฆ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะธะปะพะถะตะฝะพ: โ€ž%.*sโ€œ"
 
-#: sequencer.c:3091
+#: sequencer.c:3084
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "ะะตะฒัŠะทะผะพะถะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ โ€ž%.*sโ€œ"
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะฟะธั€ะฐ ะบะฐั‚ะพ โ€ž%sโ€œ"
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
-
-#: sequencer.c:3136
+#: sequencer.c:3129
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6655,11 +7426,11 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3135
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "ะธ ะฟั€ะพะผะตะฝั ะธะฝะดะตะบัะฐ ะธ/ะธะปะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ\n"
 
-#: sequencer.c:3148
+#: sequencer.c:3141
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6676,76 +7447,72 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3202
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะตั‚ะธะบะตั‚: โ€ž%.*sโ€œ"
 
-#: sequencer.c:3263
+#: sequencer.c:3256
 msgid "writing fake root commit"
 msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ั„ะฐะปัˆะธะฒะพ ะฝะฐั‡ะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: sequencer.c:3268
+#: sequencer.c:3261
 msgid "writing squash-onto"
 msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ, ะฒ ะบะพะตั‚ะพ ะดั€ัƒะณะธั‚ะต ะดะฐ ัะต ะฒะบะฐั€ะฐั‚"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "ะดัŠั€ะฒะพั‚ะพ, ัะพั‡ะตะฝะพ ะพั‚ โ€ž%sโ€œ, ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ"
 
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
-
-#: sequencer.c:3351
+#: sequencer.c:3344
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚"
 
-#: sequencer.c:3379
+#: sequencer.c:3375
 msgid "cannot merge without a current revision"
 msgstr "ะฑะตะท ั‚ะตะบัƒั‰ะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ัะปะธะฒะฐ"
 
-#: sequencer.c:3401
+#: sequencer.c:3397
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "โ€ž%.*sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
 
-#: sequencer.c:3410
+#: sequencer.c:3406
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "ะฝัะผะฐ ะฝะธั‰ะพ ะทะฐ ัะปะธะฒะฐะฝะต: โ€ž%.*sโ€œ"
 
-#: sequencer.c:3422
+#: sequencer.c:3418
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "ะฒัŠั€ั…ัƒ ะฝะฐั‡ะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ะผะฝะพะถะตัั‚ะฒะตะฝะพ ัะปะธะฒะฐะฝะต"
 
-#: sequencer.c:3437
+#: sequencer.c:3434
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะบัŠะผ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝะพ"
 
-#: sequencer.c:3590
+#: sequencer.c:3594
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "ัะปะธะฒะฐะฝะตั‚ะพ ะฝะฐ โ€ž%.*sโ€œ ะฝะต ะผะพะถะต ะดะฐะถะต ะดะฐ ะทะฐะฟะพั‡ะฝะต"
 
-#: sequencer.c:3606
+#: sequencer.c:3610
 msgid "merge: Unable to write new index file"
 msgstr "ัะปะธะฒะฐะฝะต: ะฝะพะฒะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝ"
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3679 builtin/rebase.c:737
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "ะะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ัะบะฐั‚ะฐะฝะพั‚ะพ ะต ะฟั€ะธะปะพะถะตะฝะพ.\n"
 
-#: sequencer.c:3687
+#: sequencer.c:3691
 #, c-format
 msgid "cannot store %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝ"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6756,31 +7523,26 @@ msgstr ""
 "ะฝะฐะดะตะถะดะฝะพ ัะบะฐั‚ะฐะฝะธ.  ะœะพะถะตั‚ะต ะดะฐ ะฟั€ะพะฑะฒะฐั‚ะต ะดะฐ ะณะธ ะฟั€ะธะปะพะถะธั‚ะต ั‡ั€ะตะท โ€žgit stash popโ€œ\n"
 "ะธะปะธ ะดะฐ ะณะธ ะธะทั…ะฒัŠั€ะปะธั‚ะต ั‡ั€ะตะท โ€žgit stash dropโ€œ, ะบะพะณะฐั‚ะพ ะฟะพะธัะบะฐั‚ะต.\n"
 
-#: sequencer.c:3751
-#, c-format
-msgid "could not checkout %s"
-msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทั‚ะตะณะปะธ"
-
-#: sequencer.c:3765
+#: sequencer.c:3755
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "โ€ž%sโ€œ ะต ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ ะฝะฐ ะพะฑะตะบั‚"
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะดะตะปะธ"
 
-#: sequencer.c:3785
+#: sequencer.c:3775
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "ะ‘ะต ัะฟั€ัะฝะพ ะฟั€ะธ โ€žHEADโ€œ\n"
 
-#: sequencer.c:3787
+#: sequencer.c:3777
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "ะ‘ะต ัะฟั€ัะฝะพ ะฟั€ะธ โ€ž%sโ€œ\n"
 
-#: sequencer.c:3795
+#: sequencer.c:3785
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6803,48 +7565,48 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3877
+#: sequencer.c:3869
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "ะกะฟะธั€ะฐะฝะต ะฟั€ะธ โ€ž%sโ€œโ€ฆ  %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:3940
 #, c-format
 msgid "unknown command %d"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะบะพะผะฐะฝะดะฐ %d"
 
-#: sequencer.c:4003
+#: sequencer.c:3999
 msgid "could not read orig-head"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะทะฐ โ€žorig-headโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพั‡ะตั‚ะต"
 
-#: sequencer.c:4008
+#: sequencer.c:4004
 msgid "could not read 'onto'"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะทะฐ โ€žontoโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพั‡ะตั‚ะต"
 
-#: sequencer.c:4022
+#: sequencer.c:4018
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ ะดะพ โ€ž%sโ€œ"
 
-#: sequencer.c:4115
+#: sequencer.c:4111
 msgid "cannot rebase: You have unstaged changes."
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะตะฑะฐะทะธั€ะฐั‚ะต, ะทะฐั‰ะพั‚ะพ ะธะผะฐ ะฟั€ะพะผะตะฝะธ, ะบะพะธั‚ะพ ะฝะต ัะฐ ะฒ ะธะฝะดะตะบัะฐ."
 
-#: sequencer.c:4124
+#: sequencer.c:4120
 msgid "cannot amend non-existing commit"
 msgstr "ะฝะตััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะฟั€ะฐะฒะธ"
 
-#: sequencer.c:4126
+#: sequencer.c:4122
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะฐะนะป: โ€ž%sโ€œ"
 
-#: sequencer.c:4128
+#: sequencer.c:4124
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ััŠะดัŠั€ะถะฐะฝะธะต: โ€ž%sโ€œ"
 
-#: sequencer.c:4131
+#: sequencer.c:4127
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6854,69 +7616,59 @@ msgstr ""
 "ะ’ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะธะผะฐ ะฝะตะฟะพะดะฐะดะตะฝะธ ะฟั€ะพะผะตะฝะธ.  ะŸัŠั€ะฒะพ ะณะธ ะฟะพะดะฐะนั‚ะต, ะฐ ัะปะตะด ั‚ะพะฒะฐ\n"
 "ะพั‚ะฝะพะฒะพ ะธะทะฟัŠะปะฝะตั‚ะต โ€žgit rebase --continueโ€œ."
 
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4163 sequencer.c:4202
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
 
-#: sequencer.c:4220
+#: sequencer.c:4217
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žCHERRY_PICK_HEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: sequencer.c:4227
+#: sequencer.c:4224
 msgid "could not commit staged changes."
 msgstr "ะฟั€ะพะผะตะฝะธั‚ะต ะฒ ะธะฝะดะตะบัะฐ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะฟะพะดะฐะดะตะฝะธ."
 
-#: sequencer.c:4328
+#: sequencer.c:4338
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฑะตั€ะต โ€ž%sโ€œ"
 
-#: sequencer.c:4332
+#: sequencer.c:4342
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฒะตั€ัะธั"
 
-#: sequencer.c:4367
+#: sequencer.c:4377
 msgid "can't revert as initial commit"
 msgstr "ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะผะตะฝะตะฝะพ"
 
-#: sequencer.c:4810
+#: sequencer.c:4846
 msgid "make_script: unhandled options"
 msgstr "make_script: ะฝะตะฟะพะดะดัŠั€ะถะฐะฝะธ ะพะฟั†ะธะธ"
 
-#: sequencer.c:4813
+#: sequencer.c:4849
 msgid "make_script: error preparing revisions"
 msgstr "make_script: ะณั€ะตัˆะบะฐ ะฟั€ะธ ะฟะพะดะณะพั‚ะพะฒะบะฐั‚ะฐ ะฝะฐ ะฒะตั€ัะธะธ"
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"ะœะพะถะต ะดะฐ ะฟั€ะพะผะตะฝะธั‚ะต ั‚ะพะฒะฐ ั ะบะพะผะฐะฝะดะธั‚ะต โ€žgit rebase --edit-todoโ€œ ะธ โ€žgit rebase --"
-"continueโ€œ ัะปะตะด ั‚ะพะฒะฐ.\n"
-"ะœะพะถะต ะธ ะดะฐ ะฟั€ะตัƒัั‚ะฐะฝะพะฒะธั‚ะต ะฟั€ะตะฑะฐะทะธั€ะฐะฝะตั‚ะพ ั ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit rebase --abortโ€œ.\n"
-
 #: sequencer.c:5083 sequencer.c:5100
 msgid "nothing to do"
 msgstr "ะฝัะผะฐ ะบะฐะบะฒะพ ะดะฐ ัะต ะฟั€ะฐะฒะธ"
 
-#: sequencer.c:5114
+#: sequencer.c:5119
 msgid "could not skip unnecessary pick commands"
 msgstr "ะธะทะปะธัˆะฝะธั‚ะต ะบะพะผะฐะฝะดะธ ะทะฐ ะพั‚ะฑะธั€ะฐะฝะต ะฝะต ะฑัั…ะฐ ะฟั€ะตัะบะพั‡ะตะฝะธ"
 
-#: sequencer.c:5197
+#: sequencer.c:5213
 msgid "the script was already rearranged."
 msgstr "ัะบั€ะธะฟั‚ัŠั‚ ะฒะตั‡ะต ะต ะฟั€ะตะฟะพะดั€ะตะดะตะฝ."
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "โ€ž%sโ€œ ะต ะธะทะฒัŠะฝ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ"
+msgid "'%s' is outside repository at '%s'"
+msgstr "โ€ž%sโ€œ ะต ะธะทะฒัŠะฝ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะฟั€ะธ โ€ž%sโ€œ"
 
-#: setup.c:173
+#: setup.c:175
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6927,7 +7679,7 @@ msgstr ""
 "\n"
 "    git ะšะžะœะะะ”ะ -- ะŸะชะขโ€ฆ"
 
-#: setup.c:186
+#: setup.c:188
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6940,12 +7692,12 @@ msgstr ""
 "\n"
 "    git ะšะžะœะะะ”ะ [ะ’ะ•ะ ะกะ˜ะฏโ€ฆ] -- [ะคะะ™ะ›โ€ฆ]"
 
-#: setup.c:235
+#: setup.c:254
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ะฟั€ะตะดะธ ะฟัŠั€ะฒะธั ะฐั€ะณัƒะผะตะฝั‚, ะบะพะนั‚ะพ ะฝะต ะต ะพะฟั†ะธั"
 
-#: setup.c:254
+#: setup.c:273
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6957,95 +7709,95 @@ msgstr ""
 "\n"
 "    git ะšะžะœะะะ”ะ [ะ’ะ•ะ ะกะ˜ะฏโ€ฆ] -- [ะคะะ™ะ›โ€ฆ]"
 
-#: setup.c:390
+#: setup.c:409
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ั‚ะตะบัƒั‰ะฐ ั€ะฐะฑะพั‚ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะฟั€ะธ ะฝะตะฟั€ะฐะฒะธะปะฝะธ ะฝะฐัั‚ั€ะพะนะบะธ"
 
-#: setup.c:394
+#: setup.c:413
 msgid "this operation must be run in a work tree"
 msgstr "ั‚ะฐะทะธ ะบะพะผะฐะฝะดะฐ ั‚ั€ัะฑะฒะฐ ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ ะฒ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ"
 
-#: setup.c:540
+#: setup.c:559
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "ะžั‡ะฐะบะฒะฐ ัะต ะฒะตั€ัะธั ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะฝะฐ git <= %d, ะฐ ะฝะต %d"
 
-#: setup.c:548
+#: setup.c:567
 msgid "unknown repository extensions found:"
 msgstr "ะพั‚ะบั€ะธั‚ะธ ัะฐ ะฝะตะฟะพะทะฝะฐั‚ะธ ั€ะฐะทัˆะธั€ะตะฝะธั ะฒ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ:"
 
-#: setup.c:567
+#: setup.c:586
 #, c-format
 msgid "error opening '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฒะพั€ะธ"
 
-#: setup.c:569
+#: setup.c:588
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "ะฟั€ะตะบะฐะปะตะฝะพ ะณะพะปัะผ ั„ะฐะนะป โ€ž.gitโ€œ: โ€ž%sโ€œ"
 
-#: setup.c:571
+#: setup.c:590
 #, c-format
 msgid "error reading %s"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะฟั€ะพั‡ะธั‚ะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: setup.c:573
+#: setup.c:592
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะพั€ะผะฐั‚ ะฝะฐ gitfile: %s"
 
-#: setup.c:575
+#: setup.c:594
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "ะปะธะฟัะฒะฐ ะฟัŠั‚ ะฒ gitfile: โ€ž%sโ€œ"
 
-#: setup.c:577
+#: setup.c:596
 #, c-format
 msgid "not a git repository: %s"
 msgstr "ะฝะต ะต ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ Git: %s"
 
-#: setup.c:676
+#: setup.c:695
 #, c-format
 msgid "'$%s' too big"
 msgstr "โ€ž%sโ€œ ะต ะฟั€ะตะบะฐะปะตะฝะพ ะณะพะปัะผ"
 
-#: setup.c:690
+#: setup.c:709
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "ะฝะต ะต ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ git: โ€ž%sโ€œ"
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:738 setup.c:740 setup.c:771
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะปะตะทะต ะฒ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ"
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
 msgid "cannot come back to cwd"
 msgstr "ะฟั€ะพั†ะตััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒัŠั€ะฝะต ะบัŠะผ ะฟั€ะตะดะธัˆะฝะฐั‚ะฐ ั€ะฐะฑะพั‚ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: setup.c:851
+#: setup.c:870
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ โ€ž%*s%s%sโ€œ"
 
-#: setup.c:1083
+#: setup.c:1108
 msgid "Unable to read current working directory"
 msgstr "ะขะตะบัƒั‰ะฐั‚ะฐ ั€ะฐะฑะพั‚ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะฐ"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1117 setup.c:1123
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะปะตะทะต ะฒ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ"
 
-#: setup.c:1103
+#: setup.c:1128
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 "ะฝะธั‚ะพ ั‚ะฐะทะธ, ะฝะธั‚ะพ ะบะพัั‚ะพ ะธ ะดะฐ ะต ะพั‚ ะฟะพ-ะณะพั€ะฝะธั‚ะต ะดะธั€ะตะบั‚ะพั€ะธะธ, ะฝะต ะต ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ "
 "git: %s"
 
-#: setup.c:1109
+#: setup.c:1134
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -7056,7 +7808,7 @@ msgstr ""
 "Git ั€ะฐะฑะพั‚ะธ ะฒ ั€ะฐะผะบะธั‚ะต ะฝะฐ ะตะดะฝะฐ ั„ะฐะนะปะพะฒะฐ ัะธัั‚ะตะผะฐ, ะทะฐั‰ะพั‚ะพ ะฟั€ะพะผะตะฝะปะธะฒะฐั‚ะฐ ะฝะฐ ัั€ะตะดะฐั‚ะฐ "
 "โ€žGIT_DISCOVERY_ACROSS_FILESYSTEMโ€œ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ."
 
-#: setup.c:1220
+#: setup.c:1245
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7066,291 +7818,291 @@ msgstr ""
 "(0%.3o).\n"
 "ะกะพะฑัั‚ะฒะตะฝะธะบัŠั‚ ะฝะฐ ั„ะฐะนะปะฐ ั‚ั€ัะฑะฒะฐ ะดะฐ ะธะผะฐ ะฟั€ะฐะฒะฐ ะทะฐ ะฟะธัะฐะฝะต ะธ ั‡ะตั‚ะตะฝะต."
 
-#: setup.c:1264
+#: setup.c:1289
 msgid "open /dev/null or dup failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žopenโ€œ ะธะปะธ โ€ždupโ€œ ะฒัŠั€ั…ัƒ โ€ž/dev/nullโ€œ"
 
-#: setup.c:1279
+#: setup.c:1304
 msgid "fork failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะพั†ะตั ั‡ั€ะตะท โ€žforkโ€œ"
 
-#: setup.c:1284
+#: setup.c:1309
 msgid "setsid failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žsetsidโ€œ"
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะทะฐ ะพะฑะตะบั‚ะธ โ€ž%sโ€œ ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ, ะฟั€ะพะฒะตั€ะตั‚ะต โ€ž.git/objects/info/"
 "alternatesโ€œ"
 
-#: sha1-file.c:504
+#: sha1-file.c:503
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะฝะธัั‚ ะฟัŠั‚ ะบัŠะผ ะพะฑะตะบั‚ะธ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฝะพั€ะผะฐะปะธะทะธั€ะฐะฝ: โ€ž%sโ€œ"
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 "%s: ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะฝะธั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะฐ ะทะฐ ะพะฑะตะบั‚ะธ ัะต ะฟั€ะตะฝะตะฑั€ะตะณะฒะฐั‚ ะฟะพั€ะฐะดะธ ะฟั€ะตะบะฐะปะตะฝะพ "
 "ะดัŠะปะฑะพะบะพ ะฒะปะฐะณะฐะฝะต"
 
-#: sha1-file.c:583
+#: sha1-file.c:582
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะทะฐ ะพะฑะตะบั‚ะธ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฝะพั€ะผะฐะปะธะทะธั€ะฐะฝะฐ"
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 msgid "unable to fdopen alternates lockfile"
 msgstr "ะทะฐะบะปัŽั‡ะฒะฐั‰ะธัั‚ ั„ะฐะนะป ะทะฐ ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฒะพั€ะธ ั โ€žfdopenโ€œ"
 
-#: sha1-file.c:644
+#: sha1-file.c:643
 msgid "unable to read alternates file"
 msgstr "ั„ะฐะนะปัŠั‚ ั ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: sha1-file.c:651
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
 msgstr "ะฝะพะฒะธัั‚ ั„ะฐะนะป ั ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะตะผะตัั‚ะตะฝ ะฝะฐ ะผััั‚ะพั‚ะพ ะผัƒ"
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ."
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "ะฒัะต ะพั‰ะต ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ะตั‚ะฐะปะพะฝะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ ะบะฐั‚ะพ ัะฒัŠั€ะทะฐะฝะพ."
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "ะตั‚ะฐะปะพะฝะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ ะฝะต ะต ะปะพะบะฐะปะฝะพ"
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "ะตั‚ะฐะปะพะฝะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ ะต ะฟะปะธั‚ะบะพ"
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "ะตั‚ะฐะปะพะฝะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ ะต ั ะฟั€ะธัะฐะถะดะฐะฝะต"
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั€ะตะด ะฟั€ะธ ะฐะฝะฐะปะธะทะฐ ะฝะฐ ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะฝะธั‚ะต ัƒะบะฐะทะฐั‚ะตะปะธ: โ€ž%sโ€œ"
 
-#: sha1-file.c:944
+#: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 "ะฝะตัƒัะฟะตัˆะตะฝ ะพะฟะธั‚ ะทะฐ โ€žmmapโ€œ %<PRIuMAX>, ะบะพะตั‚ะพ ะต ะฝะฐะด ะฟะพะทะฒะพะปะตะฝะพั‚ะพ %<PRIuMAX>"
 
-#: sha1-file.c:969
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žmmapโ€œ"
 
-#: sha1-file.c:1133
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr "ั„ะฐะนะปัŠั‚ ั ะพะฑะตะบั‚ะธั‚ะต โ€ž%sโ€œ ะต ะฟั€ะฐะทะตะฝ"
 
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1263 sha1-file.c:2443
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝะธัั‚ ะพะฑะตะบั‚ โ€ž%sโ€œ ะต ะฟะพะฒั€ะตะดะตะฝ"
 
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1265 sha1-file.c:2447
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "ะณั€ะตัˆะฝะธ ะดะฐะฝะฝะธ ะฒ ะบั€ะฐั ะฝะฐ ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝะธั ะพะฑะตะบั‚ โ€ž%sโ€œ"
 
-#: sha1-file.c:1301
+#: sha1-file.c:1307
 msgid "invalid object type"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฒะธะด ะพะฑะตะบั‚"
 
-#: sha1-file.c:1385
+#: sha1-file.c:1391
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr ""
 "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐ ั ะพะฟั†ะธัั‚ะฐ โ€ž--allow-unknown-"
 "typeโ€œ"
 
-#: sha1-file.c:1388
+#: sha1-file.c:1394
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะฐ"
 
-#: sha1-file.c:1394
+#: sha1-file.c:1400
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr ""
 "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ ั ะพะฟั†ะธัั‚ะฐ โ€ž--allow-unknown-typeโ€œ"
 
-#: sha1-file.c:1397
+#: sha1-file.c:1403
 #, c-format
 msgid "unable to parse %s header"
 msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะฐ"
 
-#: sha1-file.c:1588
+#: sha1-file.c:1629
 #, c-format
 msgid "failed to read object %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: sha1-file.c:1592
+#: sha1-file.c:1633
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "ะทะฐะผะตัั‚ะธั‚ะตะปัั‚ โ€ž%sโ€œ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚"
 
-#: sha1-file.c:1596
+#: sha1-file.c:1637
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝะธัั‚ ะพะฑะตะบั‚ โ€ž%sโ€œ (ะฒ โ€ž%sโ€œ) ะต ะฟะพะฒั€ะตะดะตะฝ"
 
-#: sha1-file.c:1600
+#: sha1-file.c:1641
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "ะฟะฐะบะตั‚ะธั€ะฐะฝะธัั‚ ะพะฑะตะบั‚ โ€ž%sโ€œ (ะฒ โ€ž%sโ€œ) ะต ะฟะพะฒั€ะตะดะตะฝ"
 
-#: sha1-file.c:1703
+#: sha1-file.c:1746
 #, c-format
 msgid "unable to write file %s"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
 
-#: sha1-file.c:1710
+#: sha1-file.c:1753
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะดะพ โ€ž%sโ€œ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะทะฐะดะฐะดะตะฝะธ"
 
-#: sha1-file.c:1717
+#: sha1-file.c:1760
 msgid "file write error"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธั ะฝะฐ ั„ะฐะนะป"
 
-#: sha1-file.c:1736
+#: sha1-file.c:1780
 msgid "error when closing loose object file"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐั‚ะฒะฐั€ัะฝะตั‚ะพ ะฝะฐ ั„ะฐะนะปะฐ ั ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝ ะพะฑะตะบั‚"
 
-#: sha1-file.c:1801
+#: sha1-file.c:1845
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "ะฝัะผะฐ ะฟั€ะฐะฒะฐ ะทะฐ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะพะฑะตะบั‚ ะบัŠะผ ะฑะฐะทะฐั‚ะฐ ะพั‚ ะดะฐะฝะฝะธ ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ โ€ž%sโ€œ"
 
-#: sha1-file.c:1803
+#: sha1-file.c:1847
 msgid "unable to create temporary file"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝ ะฒั€ะตะผะตะฝะตะฝ ั„ะฐะนะป"
 
-#: sha1-file.c:1827
+#: sha1-file.c:1871
 msgid "unable to write loose object file"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธัะฐ ะฝะฐ ั„ะฐะนะปะฐ ั ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝ ะพะฑะตะบั‚"
 
-#: sha1-file.c:1833
+#: sha1-file.c:1877
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "ะฝะพะฒะธัั‚ ะพะฑะตะบั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะผะฟั€ะตัะธั€ะฐ ั โ€ždeflateโ€œ: %d"
 
-#: sha1-file.c:1837
+#: sha1-file.c:1881
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะฟั€ะธะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ โ€ždeflateโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ: %d"
 
-#: sha1-file.c:1841
+#: sha1-file.c:1885
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "ะณั€ะตัˆะบะฐ ะฟะพั€ะฐะดะธ ะฝะตัั‚ะฐะฑะธะปะฝะธั ะธะทั‚ะพั‡ะฝะธะบ ะดะฐะฝะฝะธ ะทะฐ ะพะฑะตะบั‚ะธั‚ะต โ€ž%sโ€œ"
 
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
 #, c-format
 msgid "failed utime() on %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฒั€ะตะผะต ะฝะฐ ะดะพัั‚ัŠะฟ/ััŠะทะดะฐะฒะฐะฝะต ั‡ั€ะตะท โ€žutimeโ€œ ะฝะฐ โ€ž%sโ€œ"
 
-#: sha1-file.c:1926
+#: sha1-file.c:1972
 #, c-format
 msgid "cannot read object for %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ ะทะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพั‡ะตั‚ะต"
 
-#: sha1-file.c:1966
+#: sha1-file.c:2011
 msgid "corrupt commit"
 msgstr "ะฟะพะฒั€ะตะดะตะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: sha1-file.c:1974
+#: sha1-file.c:2019
 msgid "corrupt tag"
 msgstr "ะฟะพะฒั€ะตะดะตะฝ ะตั‚ะธะบะตั‚"
 
-#: sha1-file.c:2073
+#: sha1-file.c:2119
 #, c-format
 msgid "read error while indexing %s"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ั‡ะตั‚ะตะฝะต ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะธะฝะดะตะบัะธั€ะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: sha1-file.c:2076
+#: sha1-file.c:2122
 #, c-format
 msgid "short read while indexing %s"
 msgstr "ะฝะตะฟัŠะปะฝะพ ะฟั€ะพั‡ะธั‚ะฐะฝะต ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะธะฝะดะตะบัะธั€ะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2195 sha1-file.c:2205
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะผัŠะบะฝะต ะฒ ะฑะฐะทะฐั‚ะฐ ะพั‚ ะดะฐะฝะฝะธ"
 
-#: sha1-file.c:2164
+#: sha1-file.c:2211
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "ะฝะตะฟะพะดะดัŠั€ะถะฐะฝ ะฒะธะด ั„ะฐะนะป: โ€ž%sโ€œ"
 
-#: sha1-file.c:2188
+#: sha1-file.c:2235
 #, c-format
 msgid "%s is not a valid object"
 msgstr "โ€ž%sโ€œ ะต ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะพะฑะตะบั‚"
 
-#: sha1-file.c:2190
+#: sha1-file.c:2237
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "โ€ž%sโ€œ ะต ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะพะฑะตะบั‚ ะพั‚ ะฒะธะด โ€ž%sโ€œ"
 
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ"
 
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2454 sha1-file.c:2507
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะบะพะฝั‚ั€ะพะปะฝะฐ ััƒะผะฐ ะทะฐ โ€ž%sโ€œ (ั‚ั€ัะฑะฒะฐ ะดะฐ ะต %s)"
 
-#: sha1-file.c:2431
+#: sha1-file.c:2478
 #, c-format
 msgid "unable to mmap %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žmmapโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ"
 
-#: sha1-file.c:2436
+#: sha1-file.c:2483
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะฐ"
 
-#: sha1-file.c:2442
+#: sha1-file.c:2489
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะฐ"
 
-#: sha1-file.c:2453
+#: sha1-file.c:2500
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะพ"
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "ะบัŠัะธัั‚ SHA1 โ€ž%sโ€œ ะฝะต ะต ะตะดะฝะพะทะฝะฐั‡ะตะฝ"
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "ะ’ัŠะทะผะพะถะฝะพัั‚ะธั‚ะต ัะฐ:"
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7362,57 +8114,122 @@ msgid ""
 "examine these refs and maybe delete them. Turn this message off by\n"
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
-"ะŸั€ะธ ะฝะพั€ะผะฐะปะฝะฐ ั€ะฐะฑะพั‚ะฐ Git ะฝะธะบะพะณะฐ ะฝะต ััŠะทะดะฐะฒะฐ ัƒะบะฐะทะฐั‚ะตะปะธ, ะบะพะธั‚ะพ ะทะฐะฒัŠั€ัˆะฒะฐั‚ ั 40\n"
-"ัˆะตัั‚ะฝะฐะดะตัะตั‚ะธั‡ะฝะธ ะทะฝะฐะบะฐ, ะทะฐั‰ะพั‚ะพ ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ั‚ะต ั‰ะต ะฑัŠะดะฐั‚ ะฟั€ะตัะบะฐั‡ะฐะฝะธ.\n"
+"ะŸั€ะธ ะฝะพั€ะผะฐะปะฝะฐ ั€ะฐะฑะพั‚ะฐ Git ะฝะธะบะพะณะฐ ะฝะต ััŠะทะดะฐะฒะฐ ัƒะบะฐะทะฐั‚ะตะปะธ, ะบะพะธั‚ะพ ะทะฐะฒัŠั€ัˆะฒะฐั‚\n"
+"ั 40 ัˆะตัั‚ะฝะฐะดะตัะตั‚ะธั‡ะฝะธ ะทะฝะฐะบะฐ, ะทะฐั‰ะพั‚ะพ ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ั‚ะต ั‰ะต ะฑัŠะดะฐั‚ ะฟั€ะตัะบะฐั‡ะฐะฝะธ.\n"
 "ะ’ัŠะทะผะพะถะฝะพ ะต ั‚ะฐะบะธะฒะฐ ัƒะบะฐะทะฐั‚ะตะปะธ ะดะฐ ัะฐ ััŠะทะดะฐะดะตะฝะธ ัะปัƒั‡ะฐะนะฝะพ.  ะะฐะฟั€ะธะผะตั€:\n"
 "\n"
 "    git switch -c $BRANCH $(git rev-parse โ€ฆ)\n"
 "\n"
-"ะบัŠะดะตั‚ะพ ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐั‚ะฐ ะฝะฐ ัั€ะตะดะฐั‚ะฐ BRANCH ะต ะฟั€ะฐะทะฝะฐ, ะฟั€ะธ ะบะพะตั‚ะพ ัะต\n"
-"ััŠะทะดะฐะฒะฐ ะฟะพะดะพะฑะตะฝ ัƒะบะฐะทะฐั‚ะตะป.  ะŸั€ะตะณะปะตะดะฐะนั‚ะต ั‚ะตะทะธ ัƒะบะฐะทะฐั‚ะตะปะธ ะธ ะณะธ ะธะทั‚ั€ะธะนั‚ะต.  ะœะพะถะต "
-"ะดะฐ\n"
-"ัะฟั€ะตั‚ะต ั‚ะพะฒะฐ ััŠะพะฑั‰ะตะฝะธะต ะบะฐั‚ะพ ะธะทะฟัŠะปะฝะธั‚ะต ะบะพะผะฐะฝะดะฐั‚ะฐ:\n"
+"ะบัŠะดะตั‚ะพ ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐั‚ะฐ ะฝะฐ ัั€ะตะดะฐั‚ะฐ BRANCH ะต ะฟั€ะฐะทะฝะฐ, ะฟั€ะธ ะบะพะตั‚ะพ\n"
+"ัะต ััŠะทะดะฐะฒะฐ ะฟะพะดะพะฑะตะฝ ัƒะบะฐะทะฐั‚ะตะป.  ะŸั€ะตะณะปะตะดะฐะนั‚ะต ั‚ะตะทะธ ัƒะบะฐะทะฐั‚ะตะปะธ ะธ ะณะธ ะธะทั‚ั€ะธะนั‚ะต.\n"
+"ะ—ะฐ ะดะฐ ะธะทะบะปัŽั‡ะธั‚ะต ั‚ะพะฒะฐ ััŠะพะฑั‰ะตะฝะธะต, ะธะทะฟัŠะปะฝะตั‚ะต:\n"
 "\n"
 "    git config advice.objectNameWarning false"
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "ะถัƒั€ะฝะฐะปัŠั‚ ะทะฐ โ€ž%.*sโ€œ ัั‚ะธะณะฐ ัะฐะผะพ ะดะพ โ€ž%sโ€œ"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "ะถัƒั€ะฝะฐะปัŠั‚ ะทะฐ โ€ž%.*sโ€œ ััŠะดัŠั€ะถะฐ ัะฐะผะพ %d ะทะฐะฟะธัะฐ"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฝะฐ ะดะธัะบะฐ, ะฝะพ ะฝะต ะธ ะฒ โ€ž%.*sโ€œ"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"ะฟัŠั‚ัั‚ โ€ž%sโ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฝะฐ ะดะธัะบะฐ, ะฝะพ ะฝะต ะต ะฒ โ€ž%sโ€œ\n"
+"ะŸั€ะพะฑะฒะฐะนั‚ะต ั โ€ž%.*s:%sโ€œ, ะบะพะตั‚ะพ ะต ััŠั‰ะพั‚ะพ ะบะฐั‚ะพ โ€ž%.*s:./%sโ€œ."
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฒ โ€ž%.*sโ€œ"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะต ะฒ ะธะฝะดะตะบัะฐ, ะฝะพ ะฝะต ะฒะตั€ัะธั %d\n"
+"ะŸั€ะพะฑะฒะฐะนั‚ะต ั โ€ž%d:%sโ€œ."
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะต ะฒ ะธะฝะดะตะบัะฐ, ะฝะพ ะฝะต ะฒ โ€ž%sโ€œ\n"
+"ะŸั€ะพะฑะฒะฐะนั‚ะต ั โ€ž%d:%sโ€œ, ะบะพะตั‚ะพ ะต ััŠั‰ะพั‚ะพ ะบะฐั‚ะพ โ€ž%d:./%sโ€œ."
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฝะฐ ะดะธัะบะฐ, ะฝะพ ะฝะต ะต ะฒ ะธะฝะดะตะบัะฐ"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฝะธั‚ะพ ะฝะฐ ะดะธัะบะฐ, ะฝะธั‚ะพ ะฒ ะธะฝะดะตะบัะฐ"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr "ะพั‚ะฝะพัะธั‚ะตะปะตะฝ ะฟัŠั‚ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะธะทะฒัŠะฝ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚: โ€ž%.*sโ€œ"
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:837
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:839
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:847
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:849
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:856
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:864
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7420,13 +8237,18 @@ msgstr[0] "%u ะฑะฐะนั‚"
 msgstr[1] "%u ะฑะฐะนั‚ะฐ"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:866
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u ะฑะฐะนั‚/ัะตะบ."
 msgstr[1] "%u ะฑะฐะนั‚ะฐ/ัะตะบ."
 
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ั€ะตะดะฐะบั‚ะธั€ะฐ"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7457,51 +8279,129 @@ msgstr "ะฒ ะฝะตะฟะพะดะณะพั‚ะฒะตะฝะธั ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ"
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "ะŸัŠั‚ัั‚ โ€ž%sโ€œ ะต ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%.*sโ€œ"
 
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฐั€ะณัƒะผะตะฝั‚ ะทะฐ โ€ž--ignore-submodulesโ€œ: โ€ž%sโ€œ"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"ะŸะพะดะผะพะดัƒะปัŠั‚ ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต %s ะฝะฐ ะฟัŠั‚ั โ€ž%sโ€œ ะต ั€ะฐะทะปะธั‡ะตะฝ ะพั‚ ะดั€ัƒะณะธั ะผะพะดัƒะป ััŠั "
+"ััŠั‰ะพั‚ะพ ะธะผะต, ะทะฐั‚ะพะฒะฐ ะฟัŠั€ะฒะธัั‚ ัะต ะฟั€ะตัะบะฐั‡ะฐ."
+
 #: submodule.c:910
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "ะทะฐะฟะธััŠั‚ ะทะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ (%s) ะต %s, ะฐ ะฝะต ะฟะพะดะฐะฒะฐะฝะต!"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"ะšะพะผะฐะฝะดะฐั‚ะฐ โ€žgit rev-list ะŸะžะ”ะะ’ะะะ˜ะฏ --not --remotes -n 1โ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต "
+"ะธะทะฟัŠะปะฝะธ ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "ะฟั€ะพั†ะตััŠั‚ ะทะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะทะฐะฒัŠั€ัˆะธ ะฝะตัƒัะฟะตัˆะฝะพ"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะบั€ะธะต ะบัŠะผ ะบะฐะบะฒะพ ัะพั‡ะธ ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ"
 
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "ะ˜ะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ\n"
+
+#: submodule.c:1161
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "ะŸะพะดะผะพะดัƒะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะดะพัั‚ัŠะฟะตะฝ"
+msgid "Unable to push submodule '%s'\n"
+msgstr "ะŸะพะดะผะพะดัƒะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ะปะฐัะบะฐะฝ\n"
 
-#: submodule.c:1651
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "ะ”ะพัั‚ะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%s%sโ€œ\n"
+
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "ะŸะพะดะผะพะดัƒะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะดะพัั‚ัŠะฟะตะฝ\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"ะ“ั€ะตัˆะบะธ ะฟั€ะธ ะดะพัั‚ะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะป:\n"
+"%s"
+
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ git"
 
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr ""
+"ะšะพะผะฐะฝะดะฐั‚ะฐ โ€žgit status --porcelain=2โ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+"ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit status --porcelain=2โ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
+
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit statusโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit statusโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
 
-#: submodule.c:1817
+#: submodule.c:1828
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žcore.worktreeโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทั‚ั€ะธะต ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
 
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "ะฝะตัƒัะฟะตัˆะฝะฐ ะพะฑั€ะฐะฑะพั‚ะบะฐ ะฝะฐ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธะธั‚ะต ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะทะฐะฝัƒะปัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ"
+
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "ะธะฝะดะตะบััŠั‚ ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะต ั‡ะธัั‚"
 
-#: submodule.c:1959
+#: submodule.c:1970
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "ะŸะพะดะผะพะดัƒะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ."
 
-#: submodule.c:2007
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "โ€ž%sโ€œ (ะดะธั€ะตะบั‚ะพั€ะธั ะฝะฐ ะฟะพะดะผะพะดัƒะป) ะต ะฒ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะฐ git: โ€ž%.*sโ€œ"
+
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7509,12 +8409,17 @@ msgstr ""
 "ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ โ€žrelocate_gitdirโ€œ ะทะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ, ะบะพะนั‚ะพ ะธะผะฐ ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะฝะพ "
 "ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "ะธะผะตั‚ะพ ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฝะฐะผะตั€ะตะฝะพ"
 
-#: submodule.c:2026
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะตะผะตัั‚ะธ ะฒ ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะฝะฐ git"
+
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7525,42 +8430,37 @@ msgstr ""
 "โ€ž%sโ€œ ะบัŠะผ\n"
 "โ€ž%sโ€œ\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "ะฝะตัƒัะฟะตัˆะฝะฐ ะพะฑั€ะฐะฑะพั‚ะบะฐ ะฝะฐ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธะธั‚ะต ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
-
-#: submodule.c:2153
+#: submodule.c:2209
 msgid "could not start ls-files in .."
 msgstr "โ€žls-statโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ัั‚ะฐั€ั‚ะธั€ะฐ ะฒ โ€ž..โ€œ"
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "โ€žls-treeโ€œ ะทะฐะฒัŠั€ัˆะธ ั ะฝะตะพั‡ะฐะบะฒะฐะฝ ะธะทั…ะพะดะตะฝ ะบะพะด: %d"
 
-#: submodule-config.c:232
+#: submodule-config.c:236
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะพะทั€ะธั‚ะตะปะฝะพ ะธะผะต ะฝะฐ ะฟะพะดะผะพะดัƒะป: โ€ž%sโ€œ"
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žsubmodule.fetchjobsโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะพั‚ั€ะธั†ะฐั‚ะตะปะฝะธ ัั‚ะพะนะฝะพัั‚ะธ"
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 "โ€ž%sโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ, ะทะฐั‰ะพั‚ะพ ะต ะฒัŠะทะผะพะถะฝะพ ะดะฐ ัะต ั‚ัŠะปะบัƒะฒะฐ ะบะฐั‚ะพ ะพะฟั†ะธั ะทะฐ ะบะพะผะฐะฝะดะฝะธั "
 "ั€ะตะด: %s"
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€ž%sโ€œ"
 
-#: submodule-config.c:755
+#: submodule-config.c:765
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "ะ—ะฐะฟะธััŠั‚ โ€ž%sโ€œ ะฒัŠะฒ ั„ะฐะนะปะฐ โ€ž.gitmodulesโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพะผะตะฝะตะฝ"
@@ -7576,7 +8476,7 @@ msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะทะฐะฒัŠั€ัˆะฒะฐั‰ะฐั‚ะฐ ะบ
 msgid "unknown value '%s' for key '%s'"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ ะทะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€ž%sโ€œ"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "ัั‚ะพะนะฝะพัั‚ั‚ะฐ โ€ž%sโ€œ ัะต ะฟะพะฒั‚ะฐั€ั ะฒ ะฝะฐัั‚ั€ะพะนะบะธั‚ะต"
@@ -7595,7 +8495,7 @@ msgstr "ะฒั…ะพะดะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะ
 msgid "could not read from stdin"
 msgstr "ะพั‚ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด ะฝะต ะผะพะถะต ะดะฐ ัะต ั‡ะตั‚ะต"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปัƒั‡ะธ ะธะฝั„ะพั€ะผะฐั†ะธั ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ โ€ž%sโ€œ"
@@ -7624,48 +8524,48 @@ msgstr "ะฒั€ะตะผะตะฝะฝะธัั‚ ั„ะฐะนะป ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะตะธะผะตะฝัƒะฒ
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "ะšะปะพะฝัŠั‚ โ€ž%sโ€œ ั‰ะต ัะปะตะดะธ โ€ž%sโ€œ ะพั‚ โ€ž%sโ€œ\n"
 
-#: transport.c:142
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr "ะฟั€ะฐั‚ะบะฐั‚ะฐ ะฝะฐ git โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะฐ"
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะพะฟั†ะธั ะทะฐ ะดัŠะปะฑะพั‡ะธะฝะฐ: %s"
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr ""
 "ะ—ะฐ ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะฒะธะถั‚ะต ั€ะฐะทะดะตะปะฐ โ€žprotocol.versionโ€œ ะฒ โ€žgit help configโ€œ"
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr "ะพะฟั†ะธะธั‚ะต ะฝะฐ ััŠั€ะฒัŠั€ะฐ ะธะทะธัะบะฒะฐั‚ ะฟะพะฝะต ะฒะตั€ัะธั 2 ะฝะฐ ะฟั€ะพั‚ะพะบะพะปะฐ"
 
-#: transport.c:625
+#: transport.c:632
 msgid "could not parse transport.color.* config"
 msgstr "ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žtransport.color.*โ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ั€ะฐะทะฟะพะทะฝะฐะต"
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr "ะฟั€ะพั‚ะพะบะพะป ะฒะตั€ัะธั 2 ะฒัะต ะพั‰ะต ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ"
 
-#: transport.c:825
+#: transport.c:831
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€ž%sโ€œ: โ€ž%sโ€œ"
 
-#: transport.c:891
+#: transport.c:897
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "ะฟั€ะตะฝะพััŠั‚ ะฟะพ โ€ž%sโ€œ ะฝะต ะต ะฟะพะทะฒะพะปะตะฝ"
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-over-rsyncโ€œ ะฒะตั‡ะต ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ"
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -7674,7 +8574,7 @@ msgstr ""
 "ะกะปะตะดะฝะธั‚ะต ะฟัŠั‚ะธั‰ะฐ ะทะฐ ะฟะพะดะผะพะดัƒะปะธ ััŠะดัŠั€ะถะฐั‚ ะฟั€ะพะผะตะฝะธ,\n"
 "ะบะพะธั‚ะพ ะปะธะฟัะฒะฐั‚ ะพั‚ ะฒัะธั‡ะบะธ ะพั‚ะดะฐะปะตั‡ะตะฝะธ ั…ั€ะฐะฝะธะปะธั‰ะฐ:\n"
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -7699,34 +8599,34 @@ msgstr ""
 "    git push\n"
 "\n"
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr "ะŸั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนัั‚ะฒะธะตั‚ะพ."
 
-#: transport.c:1193
+#: transport.c:1201
 msgid "failed to push all needed submodules"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะฝะตะพะฑั…ะพะดะธะผะธ ะฟะพะดะผะพะดัƒะปะธ"
 
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:657
 msgid "operation not supported by protocol"
 msgstr "ะพะฟั†ะธัั‚ะฐ ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ะพั‚ ะฟั€ะพั‚ะพะบะพะปะฐ"
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 msgid "full write to remote helper failed"
 msgstr "ะฝะตัƒัะฟะตัˆะตะฝ ะฟัŠะปะตะฝ ะทะฐะฟะธั ะบัŠะผ ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ"
 
-#: transport-helper.c:134
+#: transport-helper.c:144
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ะทะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะฐ"
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:571
 msgid "can't dup helper output fd"
 msgstr ""
 "ั„ะฐะนะปะพะฒะธัั‚ ะดะตัะบั€ะธะฟั‚ะพั€ ะพั‚ ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดัƒะฑะปะธั€ะฐ ั "
 "โ€ždupโ€œ"
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7735,106 +8635,111 @@ msgstr ""
 "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะทะฐะดัŠะปะถะธั‚ะตะปะฝะฐ ัะฟะพัะพะฑะฝะพัั‚ โ€ž%sโ€œ.  ะะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ "
 "ะฒะตั€ะพัั‚ะฝะพ ะธะทะธัะบะฒะฐ ะฝะพะฒะฐ ะฒะตั€ัะธั ะฝะฐ Git"
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr ""
 "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ั‚ั€ัะฑะฒะฐ ะดะฐ ะฟะพะดะดัŠั€ะถะฐ ัะฟะพัะพะฑะฝะพัั‚ ะทะฐ ะธะทะฑั€ะพัะฒะฐะฝะต ะฝะฐ "
 "ัƒะบะฐะทะฐั‚ะตะปะธ"
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:425
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "โ€ž%sโ€œ ะฝะตะพั‡ะฐะบะฒะฐะฝะพ ะฒัŠั€ะฝะฐ: โ€ž%sโ€œ"
 
-#: transport-helper.c:403
+#: transport-helper.c:414
 #, c-format
 msgid "%s also locked %s"
 msgstr "โ€ž%sโ€œ ะทะฐะบะปัŽั‡ะธ ะธ โ€ž%sโ€œ"
 
-#: transport-helper.c:481
+#: transport-helper.c:493
 msgid "couldn't run fast-import"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะฑัŠั€ะทะพ ะฒะฝะฐััะฝะต"
 
-#: transport-helper.c:504
+#: transport-helper.c:516
 msgid "error while running fast-import"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะธะทะฟัŠะปะฝะตะฝะธะตั‚ะพ ะฝะฐ ะฑัŠั€ะทะพ ะฒะฝะฐััะฝะต"
 
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:545 transport-helper.c:1134
 #, c-format
 msgid "could not read ref %s"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพั‡ะตั‚ะต"
 
-#: transport-helper.c:578
+#: transport-helper.c:590
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝ ะพั‚ะณะพะฒะพั€ ะฟั€ะธ ัะฒัŠั€ะทะฒะฐะฝะต: โ€ž%sโ€œ"
 
-#: transport-helper.c:600
+#: transport-helper.c:612
 msgid "setting remote service path not supported by protocol"
 msgstr "ะฟั€ะพั‚ะพะบะพะปัŠั‚ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะทะฐะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟัŠั‚ ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะฐั‚ะฐ ัƒัะปัƒะณะฐ"
 
-#: transport-helper.c:602
+#: transport-helper.c:614
 msgid "invalid remote service path"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟัŠั‚ ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะฐั‚ะฐ ัƒัะปัƒะณะฐ"
 
-#: transport-helper.c:648
+#: transport-helper.c:660
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ัะฒัŠั€ะทะฒะฐะฝะต ะบัŠะผ ะฟะพะดัƒัะปัƒะณะฐั‚ะฐ โ€ž%sโ€œ"
 
-#: transport-helper.c:720
+#: transport-helper.c:736
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr ""
 "ะพั‡ะฐะบะฒะฐ ัะต ะธะปะธ ัƒัะฟะตั…, ะธะปะธ ะณั€ะตัˆะบะฐ, ะฝะพ ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ะฒัŠั€ะฝะฐ โ€ž%sโ€œ"
 
-#: transport-helper.c:773
+#: transport-helper.c:789
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ะทะฐะฒัŠั€ัˆะธ ั ะฝะตะพั‡ะฐะบะฒะฐะฝ ะธะทั…ะพะดะตะฝ ะบะพะด: โ€ž%sโ€œ"
 
-#: transport-helper.c:834
+#: transport-helper.c:850
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ โ€ž%sโ€œ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะฟั€ะพะฑะธ โ€ždry-runโ€œ"
 
-#: transport-helper.c:837
+#: transport-helper.c:853
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ โ€ž%sโ€œ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--signedโ€œ"
 
-#: transport-helper.c:840
+#: transport-helper.c:856
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ โ€ž%sโ€œ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--signed=if-askedโ€œ"
 
-#: transport-helper.c:847
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ โ€ž%sโ€œ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--atomicโ€œ"
+
+#: transport-helper.c:867
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ โ€ž%sโ€œ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธะธ ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต"
 
-#: transport-helper.c:945
+#: transport-helper.c:965
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต.  ะะตะพะฑั…ะพะดะธะผะพ ะต "
 "ะธะทะฑั€ะพัะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต"
 
-#: transport-helper.c:950
+#: transport-helper.c:970
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr ""
 "ะฝะฐัั€ะตั‰ะฝะฐั‚ะฐ ะฟะพะผะพั‰ะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ะฝะต ะฟะพะดะดัŠั€ะถะฐ โ€ž%sโ€œ ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--forceโ€œ"
 
-#: transport-helper.c:997
+#: transport-helper.c:1017
 msgid "couldn't run fast-export"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ะฑัŠั€ะทะพ ะธะทะฝะฐััะฝะต"
 
-#: transport-helper.c:1002
+#: transport-helper.c:1022
 msgid "error while running fast-export"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะธะทะฟัŠะปะฝะตะฝะธะตั‚ะพ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ ะทะฐ ะฑัŠั€ะทะพ ะธะทะฝะฐััะฝะต"
 
-#: transport-helper.c:1027
+#: transport-helper.c:1047
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -7843,67 +8748,67 @@ msgstr ""
 "ะัะผะฐ ะพะฑั‰ะธ ัƒะบะฐะทะฐั‚ะตะปะธ, ะฝะต ัะฐ ัƒะบะฐะทะฐะฝะธ ะฝะธะบะฐะบะฒะธ ัƒะบะฐะทะฐั‚ะตะปะธ โ€” ะฝะธั‰ะพ ะฝัะผะฐ ะดะฐ ะฑัŠะดะต\n"
 "ะฝะฐะฟั€ะฐะฒะตะฝะพ.  ะŸั€ะพะฑะฒะฐะนั‚ะต ะดะฐ ัƒะบะฐะถะตั‚ะต ะบะปะพะฝ, ะฝะฐะฟั€. โ€œmasterโ€œ.\n"
 
-#: transport-helper.c:1091
+#: transport-helper.c:1120
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะพั‚ะณะพะฒะพั€ ะฒ ัะฟะธััŠะบะฐ ั ัƒะบะฐะทะฐั‚ะตะปะธ: โ€ž%sโ€œ"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1272
 #, c-format
 msgid "read(%s) failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั‡ะตั‚ะตะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: transport-helper.c:1271
+#: transport-helper.c:1299
 #, c-format
 msgid "write(%s) failed"
 msgstr "ะฝะตัƒัะฟะตัˆะตะฝ ะทะฐะฟะธั ะฒ โ€ž%sโ€œ"
 
-#: transport-helper.c:1320
+#: transport-helper.c:1348
 #, c-format
 msgid "%s thread failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะฝะธัˆะบะฐั‚ะฐ โ€ž%sโ€œ"
 
-#: transport-helper.c:1324
+#: transport-helper.c:1352
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "ะทะฐะฒัŠั€ัˆะฒะฐะฝะตั‚ะพ ะฝะฐ ะฝะธัˆะบะฐั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทั‡ะฐะบะฐ: โ€ž%sโ€œ"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1371 transport-helper.c:1375
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ัั‚ะฐั€ั‚ะธั€ะฐะฝะต ะฝะฐ ะฝะธัˆะบะฐ ะทะฐ ะบะพะฟะธั€ะฐะฝะต ะฝะฐ ะดะฐะฝะฝะธั‚ะต: โ€ž%sโ€œ"
 
-#: transport-helper.c:1384
+#: transport-helper.c:1412
 #, c-format
 msgid "%s process failed to wait"
 msgstr "ะฟั€ะพั†ะตััŠั‚ ะฝะฐ โ€ž%sโ€œ ะฝะต ัƒัะฟั ะดะฐ ะธะทั‡ะฐะบะฐ ั‡ั€ะตะท โ€žwaitpidโ€œ"
 
-#: transport-helper.c:1388
+#: transport-helper.c:1416
 #, c-format
 msgid "%s process failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€ž%sโ€œ"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1434 transport-helper.c:1443
 msgid "can't start thread for copying data"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ัั‚ะฐั€ั‚ะธั€ะฐะฝะต ะฝะฐ ะฝะธัˆะบะฐ ะทะฐ ะบะพะฟะธั€ะฐะฝะต ะฝะฐ ะดะฐะฝะฝะธั‚ะต"
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "ะฟั€ะตะบะฐะปะตะฝะพ ะบั€ะฐั‚ัŠะบ ะพะฑะตะบั‚-ะดัŠั€ะฒะพ"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะธ ะฟั€ะฐะฒะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะฒ ะทะฐะฟะธั ะฒ ะดัŠั€ะฒะพ"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "ะฟั€ะฐะทะฝะพ ะธะผะต ะฝะฐ ั„ะฐะนะป ะฒ ะทะฐะฟะธั ะฒ ะดัŠั€ะฒะพ"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "ะฟั€ะตะบะฐะปะตะฝะพ ะบั€ะฐั‚ัŠะบ ั„ะฐะนะป-ะดัŠั€ะฒะพ"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7912,7 +8817,7 @@ msgstr ""
 "ะ˜ะทั‚ะตะณะปัะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฝะฐ ั‚ะตะทะธ ั„ะฐะนะปะพะฒะต:\n"
 "%%sะŸะพะดะฐะนั‚ะต ะธะปะธ ัะบะฐั‚ะฐะนั‚ะต ะฟั€ะพะผะตะฝะธั‚ะต, ะทะฐ ะดะฐ ะฟั€ะตะผะธะฝะตั‚ะต ะบัŠะผ ะฝะพะฒ ะบะปะพะฝ."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7921,7 +8826,7 @@ msgstr ""
 "ะ˜ะทั‚ะตะณะปัะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฝะฐ ั‚ะตะทะธ ั„ะฐะนะปะพะฒะต:\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7930,7 +8835,7 @@ msgstr ""
 "ะกะปะธะฒะฐะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฝะฐ ั‚ะตะทะธ ั„ะฐะนะปะพะฒะต:\n"
 "%%sะŸะพะดะฐะนั‚ะต ะธะปะธ ัะบะฐั‚ะฐะนั‚ะต ะฟั€ะพะผะตะฝะธั‚ะต, ะทะฐ ะดะฐ ัะปะตะตั‚ะต."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7939,7 +8844,7 @@ msgstr ""
 "ะกะปะธะฒะฐะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฝะฐ ั‚ะตะทะธ ั„ะฐะนะปะพะฒะต:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7948,7 +8853,7 @@ msgstr ""
 "โ€ž%sโ€œ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฝะฐ ั‚ะตะทะธ ั„ะฐะนะปะพะฒะต:\n"
 "%%sะŸะพะดะฐะนั‚ะต ะธะปะธ ัะบะฐั‚ะฐะนั‚ะต ะฟั€ะพะผะตะฝะธั‚ะต, ะทะฐ ะดะฐ ะธะทะฒัŠั€ัˆะธั‚ะต โ€ž%sโ€œ."
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7957,7 +8862,7 @@ msgstr ""
 "โ€ž%sโ€œ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฝะฐ ั‚ะตะทะธ ั„ะฐะนะปะพะฒะต:\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7966,7 +8871,7 @@ msgstr ""
 "ะžะฑะฝะพะฒัะฒะฐะฝะตั‚ะพ ะฝะฐ ัะปะตะดะฝะธั‚ะต ะดะธั€ะตะบั‚ะพั€ะธะธ ั‰ะต ะธะทั‚ั€ะธะต ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฒ ั‚ัั…:\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7975,7 +8880,7 @@ msgstr ""
 "ะ˜ะทั‚ะตะณะปัะฝะตั‚ะพ ั‰ะต ะธะทั‚ั€ะธะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%sะŸั€ะตะผะตัั‚ะตั‚ะต ะณะธ ะธะปะธ ะณะธ ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ะฟั€ะตะผะธะฝะตั‚ะต ะฝะฐ ะดั€ัƒะณ ะบะปะพะฝ."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7984,7 +8889,7 @@ msgstr ""
 "ะ˜ะทั‚ะตะณะปัะฝะตั‚ะพ ั‰ะต ะธะทั‚ั€ะธะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7993,7 +8898,7 @@ msgstr ""
 "ะกะปะธะฒะฐะฝะตั‚ะพ ั‰ะต ะธะทั‚ั€ะธะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%sะŸั€ะตะผะตัั‚ะตั‚ะต ะณะธ ะธะปะธ ะณะธ ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ัะปะตะตั‚ะต."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -8002,7 +8907,7 @@ msgstr ""
 "ะกะปะธะฒะฐะฝะตั‚ะพ ั‰ะต ะธะทั‚ั€ะธะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -8011,7 +8916,7 @@ msgstr ""
 "โ€ž%sโ€œ ั‰ะต ะธะทั‚ั€ะธะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%sะŸั€ะตะผะตัั‚ะตั‚ะต ะณะธ ะธะปะธ ะณะธ ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ะธะทะฒัŠั€ัˆะธั‚ะต โ€ž%sโ€œ."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -8020,7 +8925,7 @@ msgstr ""
 "โ€ž%sโ€œ ั‰ะต ะธะทั‚ั€ะธะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -8030,7 +8935,7 @@ msgstr ""
 "ะ˜ะทั‚ะตะณะปัะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%sะŸั€ะตะผะตัั‚ะตั‚ะต ะณะธ ะธะปะธ ะณะธ ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ัะผะตะฝะธั‚ะต ะบะปะพะฝ."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -8040,7 +8945,7 @@ msgstr ""
 "ะ˜ะทั‚ะตะณะปัะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -8049,7 +8954,7 @@ msgstr ""
 "ะกะปะธะฒะฐะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%sะŸั€ะตะผะตัั‚ะตั‚ะต ะณะธ ะธะปะธ ะณะธ ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ัะปะตะตั‚ะต."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -8058,7 +8963,7 @@ msgstr ""
 "ะกะปะธะฒะฐะฝะตั‚ะพ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -8067,7 +8972,7 @@ msgstr ""
 "โ€ž%sโ€œ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%sะŸั€ะตะผะตัั‚ะตั‚ะต ะณะธ ะธะปะธ ะณะธ ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ะธะทะฒัŠั€ัˆะธั‚ะต โ€ž%sโ€œ."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -8076,12 +8981,12 @@ msgstr ""
 "โ€ž%sโ€œ ั‰ะต ะฟั€ะตะทะฐะฟะธัˆะต ั‚ะตะทะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "ะ—ะฐะฟะธััŠั‚ ะทะฐ โ€ž%sโ€œ ััŠะฒะฟะฐะดะฐ ั ั‚ะพะทะธ ะทะฐ โ€ž%sโ€œ.  ะะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะธัะฒะพะธ."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -8091,7 +8996,7 @@ msgstr ""
 "ะฐะบั‚ัƒะฐะปะฝะธ:\n"
 "%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -8102,7 +9007,7 @@ msgstr ""
 "ะดัŠั€ะฒะพ:\n"
 "%s"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -8113,7 +9018,7 @@ msgstr ""
 "ะดัŠั€ะฒะพ:\n"
 "%s"
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -8122,16 +9027,16 @@ msgstr ""
 "ะŸะพะดะผะพะดัƒะปัŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ:\n"
 "โ€ž%sโ€œ"
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr "ะŸั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนัั‚ะฒะธะตั‚ะพ\n"
 
-#: unpack-trees.c:318
+#: unpack-trees.c:317
 msgid "Updating files"
 msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ั„ะฐะนะปะพะฒะต"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -8141,6 +9046,10 @@ msgstr ""
 "ะฒัŠะฒ ั„ะฐะนะปะพะฒะธ ัะธัั‚ะตะผะธ, ะบะพะธั‚ะพ ะฝะต ั€ะฐะทะปะธั‡ะฐะฒะฐั‚ ะณะปะฐะฒะฝะธ ะพั‚ ะผะฐะปะบะธ ะฑัƒะบะฒะธ)\n"
 "ะธ ัะฐะผะพ ะตะดะธะฝ ะพั‚ ัƒั‡ะฐัั‚ะฝะธั†ะธั‚ะต ะฒ ะบะพะฝั„ะปะธะบั‚ะฐ ะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ:\n"
 
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ั„ะปะฐะณะพะฒะตั‚ะต ะฝะฐ ะธะฝะดะตะบัะฐ"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั…ะตะผะฐ ะทะฐ ะฐะดั€ะตั ะธะปะธ ััƒั„ะธะบััŠั‚ โ€ž://โ€œ ะปะธะฟัะฒะฐ"
@@ -8170,48 +9079,52 @@ msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฝะพะผะตั€ ะฝะฐ ะฟะพั€ั‚"
 msgid "invalid '..' path segment"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ั‡ะฐัั‚ ะพั‚ ะฟัŠั‚ั โ€ž..โ€œ"
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "ะ”ะพัั‚ะฐะฒัะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
+
+#: worktree.c:259 builtin/am.c:2099
 #, c-format
 msgid "failed to read '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "โ€ž%sโ€œ ะฒ ะพัะฝะพะฒะฝะพั‚ะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ ะฝะต ะต ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ััŠะดัŠั€ะถะฐ ะฐะฑัะพะปัŽั‚ะฝะธั ะฟัŠั‚ ะบัŠะผ ะผะตัั‚ะพะฟะพะปะพะถะตะฝะธะตั‚ะพ ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "โ€ž%sโ€œ ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ."
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ั„ะฐะนะป ะฝะฐ .git, ะบะพะด ะทะฐ ะณั€ะตัˆะบะฐ: %d"
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ัะพั‡ะธ ะบัŠะผ ะพะฑั€ะฐั‚ะฝะพ ะบัŠะผ โ€ž%sโ€œ"
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ ะธ ะทะฐ ั‡ะตั‚ะตะฝะต, ะธ ะทะฐ ะทะฐะฟะธั"
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr "ะฝัะผะฐ ะดะพัั‚ัŠะฟ ะดะพ โ€ž%sโ€œ"
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr "ั‚ะตะบัƒั‰ะฐั‚ะฐ ั€ะฐะฑะพั‚ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะต ะฝะตะดะพัั‚ัŠะฟะฝะฐ"
 
@@ -8558,86 +9471,94 @@ msgstr ""
 "  (ะฒัะธั‡ะบะธ ะบะพะฝั„ะปะธะบั‚ะธ ัะฐ ะบะพั€ะธะณะธั€ะฐะฝะธ, ะธะทะฟัŠะปะฝะตั‚ะต โ€žgit cherry-pick --continueโ€œ)"
 
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit cherry-pick --skipโ€œ, ะทะฐ ะดะฐ ะฟั€ะพะฟัƒัะฝะตั‚ะต ั‚ะฐะทะธ ะบั€ัŠะฟะบะฐ)"
+
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit cherry-pick --abortโ€œ, ะทะฐ ะดะฐ ะพั‚ะผะตะฝะธั‚ะต ะฒัะธั‡ะบะธ ะดะตะนัั‚ะฒะธั ั "
 "ะพั‚ะฑะธั€ะฐะฝะต)"
 
-#: wt-status.c:1447
+#: wt-status.c:1449
 msgid "Revert currently in progress."
 msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ั‚ะตั‡ะต ะพั‚ะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต."
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ะพั‚ะผะตะฝัั‚ะต ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ."
 
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (ะบะพั€ะธะณะธั€ะฐะนั‚ะต ะบะพะฝั„ะปะธะบั‚ะธั‚ะต ะธ ะธะทะฟัŠะปะฝะตั‚ะต โ€žgit revert --continueโ€œ)"
 
-#: wt-status.c:1459
+#: wt-status.c:1461
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (ะทะฐ ะดะฐ ะฟั€ะพะดัŠะปะถะธั‚ะต, ะธะทะฟัŠะปะฝะตั‚ะต โ€žgit revert --continueโ€œ)"
 
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (ะฒัะธั‡ะบะธ ะบะพะฝั„ะปะธะบั‚ะธ ัะฐ ะบะพั€ะธะณะธั€ะฐะฝะธ, ะธะทะฟัŠะปะฝะตั‚ะต โ€žgit revert --continueโ€œ)"
 
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit revert --skipโ€œ, ะทะฐ ะดะฐ ะฟั€ะพะฟัƒัะฝะตั‚ะต ั‚ะฐะทะธ ะบั€ัŠะฟะบะฐ)"
+
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit revert --abortโ€œ, ะทะฐ ะดะฐ ะฟั€ะตัƒัั‚ะฐะฝะพะฒะธั‚ะต ะพั‚ะผัะฝะฐั‚ะฐ ะฝะฐ "
 "ะฟะพะดะฐะฒะฐะฝะต)"
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ั‚ัŠั€ัะธั‚ะต ะดะฒะพะธั‡ะฝะพ, ะบะฐั‚ะพ ัั‚ะต ัั‚ะฐั€ั‚ะธั€ะฐะปะธ ะพั‚ ะบะปะพะฝ โ€ž%sโ€œ."
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ั‚ัŠั€ัะธั‚ะต ะดะฒะพะธั‡ะฝะพ."
 
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit bisect resetโ€œ, ะทะฐ ะดะฐ ัะต ะฒัŠั€ะฝะตั‚ะต ะบัŠะผ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพ "
 "ััŠัั‚ะพัะฝะธะต ะธ ะบะปะพะฝ)"
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr "ะะฐ ะบะปะพะฝ "
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr "ะธะทะฒัŠั€ัˆะฒะฐั‚ะต ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฒัŠั€ั…ัƒ "
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr "ะธะทะฒัŠั€ัˆะฒะฐั‚ะต ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฒัŠั€ั…ัƒ "
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr "ะ˜ะทะฒัŠะฝ ะฒัะธั‡ะบะธ ะบะปะพะฝะธ."
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr "ะŸัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
 msgstr "ะ’ัะต ะพั‰ะต ะปะธะฟัะฒะฐั‚ ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr "ะะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr "ะ˜ะณะฝะพั€ะธั€ะฐะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8649,32 +9570,32 @@ msgstr ""
 "ะธะทะฟัŠะปะฝะตะฝะธะตั‚ะพ, ะฝะพ ั‰ะต ั‚ั€ัะฑะฒะฐ ะดะฐ ะดะพะฑะฐะฒัั‚ะต ะฝะพะฒะธั‚ะต ั„ะฐะนะปะพะฒะต ั€ัŠั‡ะฝะพ.\n"
 "ะ—ะฐ ะฟะพะฒะตั‡ะต ะฟะพะดั€ะพะฑะฝะพัั‚ะธ ะฟะพะณะปะตะดะฝะตั‚ะต โ€žgit status helpโ€œ."
 
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "ะะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฝะต ัะฐ ะธะทะฒะตะดะตะฝะธ%s"
 
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr " (ะธะทะฟะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ โ€ž-uโ€œ, ะทะฐ ะดะฐ ะธะทะฒะตะดะตั‚ะต ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต)"
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr "ะัะผะฐ ะฟั€ะพะผะตะฝะธ"
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "ะบัŠะผ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะฟั€ะพะผะตะฝะธ (ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit addโ€œ ะธ/ะธะปะธ "
 "โ€žgit commit -aโ€œ)\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "ะบัŠะผ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะฟั€ะพะผะตะฝะธ\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8683,201 +9604,205 @@ msgstr ""
 "ะบัŠะผ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะฟั€ะพะผะตะฝะธ, ะฝะพ ะธะผะฐ ะฝะพะฒะธ ั„ะฐะนะปะพะฒะต "
 "(ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit addโ€œ, ะทะฐ ะดะฐ ะทะฐะฟะพั‡ะฝะต ั‚ัั…ะฝะพั‚ะพ ัะปะตะดะตะฝะต)\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "ะบัŠะผ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะฟั€ะพะผะตะฝะธ, ะฝะพ ะธะผะฐ ะฝะพะฒะธ ั„ะฐะนะปะพะฒะต\n"
 
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "ะปะธะฟัะฒะฐั‚ ะบะฐะบะฒะธั‚ะพ ะธ ะดะฐ ะต ะฟั€ะพะผะตะฝะธ (ััŠะทะดะฐะนั‚ะต ะธะปะธ ะบะพะฟะธั€ะฐะนั‚ะต ั„ะฐะนะปะพะฒะต ะธ ะธะทะฟะพะปะทะฒะฐะนั‚ะต "
 "โ€žgit addโ€œ, ะทะฐ ะดะฐ ะทะฐะฟะพั‡ะฝะต ั‚ัั…ะฝะพั‚ะพ ัะปะตะดะตะฝะต)\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr "ะปะธะฟัะฒะฐั‚ ะบะฐะบะฒะธั‚ะพ ะธ ะดะฐ ะต ะฟั€ะพะผะตะฝะธ\n"
 
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "ะปะธะฟัะฒะฐั‚ ะบะฐะบะฒะธั‚ะพ ะธ ะดะฐ ะต ะฟั€ะพะผะตะฝะธ (ะธะทะฟะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ โ€ž-uโ€œ, ะทะฐ ะดะฐ ัะต ะธะทะฒะตะดะฐั‚ ะธ "
 "ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต)\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "ะปะธะฟัะฒะฐั‚ ะบะฐะบะฒะธั‚ะพ ะธ ะดะฐ ะต ะฟั€ะพะผะตะฝะธ, ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะต ั‡ะธัั‚ะพ\n"
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr "ะ’ัะต ะพั‰ะต ะปะธะฟัะฒะฐั‚ ะฟะพะดะฐะฒะฐะฝะธั ะฒ "
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr "HEAD (ะธะทะฒัŠะฝ ะบะปะพะฝ)"
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr "ั€ะฐะทะปะธั‡ะตะฝ"
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr "ะฝะฐะทะฐะด ั "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr "ะฝะฐะฟั€ะตะด ั "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ะธะทะฒัŠั€ัˆะธั‚ะต โ€ž%sโ€œ, ะทะฐั‰ะพั‚ะพ ะธะผะฐ ะฟั€ะพะผะตะฝะธ, ะบะพะธั‚ะพ ะฝะต ัะฐ ะฒ ะธะฝะดะตะบัะฐ."
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr "ะพัะฒะตะฝ ั‚ะพะฒะฐ ะฒ ะธะฝะดะตะบัะฐ ะธะผะฐ ะฝะตะฟะพะดะฐะดะตะฝะธ ะฟั€ะพะผะตะฝะธ."
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ะธะทะฒัŠั€ัˆะธั‚ะต โ€ž%sโ€œ, ะทะฐั‰ะพั‚ะพ ะฒ ะธะฝะดะตะบัะฐ ะธะผะฐ ะฝะตะฟะพะดะฐะดะตะฝะธ ะฟั€ะพะผะตะฝะธ."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:453
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [ะžะŸะฆะ˜ะฏโ€ฆ] [--] ะŸะชะขโ€ฆ"
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝ ะธะทั…ะพะดะตะฝ ะบะพะด ะฟั€ะธ ะณะตะฝะตั€ะธั€ะฐะฝะต ะฝะฐ ั€ะฐะทะปะธะบะฐ: %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
 msgid "updating files failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "ะŸั€ะพะผะตะฝะธ, ะบะพะธั‚ะพ ะธ ัะปะตะด ะพะฑะฝะพะฒัะฒะฐะฝะตั‚ะพ ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะบัŠะผ ะฝะตะณะพ:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:266 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr "ะ˜ะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "ะคะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ ะทะฐ ะทะฐะฟะธั."
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr "ะšั€ัŠะฟะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝะฐ"
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐ"
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปัƒั‡ะธ ะธะฝั„ะพั€ะผะฐั†ะธั ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ ั„ะฐะนะปะฐ โ€ž%sโ€œ"
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr "ะŸั€ะฐะทะฝะฐ ะบั€ัŠะฟะบะฐ, ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนัั‚ะฒะธะตั‚ะพ."
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "ะšั€ัŠะฟะบะฐั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะธะปะพะถะตะฝะฐ"
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "ะกะปะตะดะฝะธั‚ะต ะฟัŠั‚ะธั‰ะฐ ั‰ะต ะฑัŠะดะฐั‚ ะธะณะฝะพั€ะธั€ะฐะฝะธ ัะฟะพั€ะตะด ะฝัะบะพะน ะพั‚ ั„ะฐะนะปะพะฒะตั‚ะต โ€ž.gitignoreโ€œ:\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "ะฟั€ะพะฑะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต"
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธ"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะตะฝ ะธะทะฑะพั€ ะฝะฐ ะฟะฐั€ั‡ะตั‚ะฐ ะบะพะด"
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr "ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะฐั‚ะฐ ั€ะฐะทะปะธะบะฐ ะธ ะฟั€ะธะปะฐะณะฐะฝะต"
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะธ ะฝะฐ ะธะฝะฐั‡ะต ะธะณะฝะพั€ะธั€ะฐะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "ัƒะตะดะฝะฐะบะฒัะฒะฐะฝะต ะฝะฐ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะบั€ะฐะน ะฝะฐ ั„ะฐะนะป (ะฒะบะปัŽั‡ะฒะฐ ะพะฟั†ะธัั‚ะฐ โ€ž-uโ€œ)"
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr "ะพั‚ะฑะตะปัะทะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ั„ะฐะบั‚ะฐ, ั‡ะต ะฟัŠั‚ัั‚ ั‰ะต ะฑัŠะดะต ะดะพะฑะฐะฒะตะฝ ะฟะพ-ะบัŠัะฝะพ"
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะฟั€ะพะผะตะฝะธ ะฒ ัะปะตะดะตะฝะธั‚ะต ะธ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ะฟัŠั‚ะธั‰ะฐั‚ะฐ, ะบะพะธั‚ะพ ัะฐ ะธะทั‚ั€ะธั‚ะธ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ (ััŠั‰ะพั‚ะพ ะบะฐั‚ะพ โ€ž--"
 "no-allโ€œ)"
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr "ะฑะตะท ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะพะฒะธ ั„ะฐะนะปะพะฒะต, ัะฐะผะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะดะพะฑะฐะฒะตะฝะธ ะฟะพั€ะฐะดะธ ะณั€ะตัˆะบะธ"
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "ะฟั€ะพะฒะตั€ะบะฐ, ั‡ะต ะฟั€ะธ ะฟั€ะพะฑะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฒัะธั‡ะบะธ ั„ะฐะนะปะพะฒะต, ะดะพั€ะธ ะธ ะธะทั‚ั€ะธั‚ะธั‚ะต, ัะต "
 "ะธะณะฝะพั€ะธั€ะฐั‚"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "ะธะทั€ะธั‡ะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ ั„ะปะฐะณะฐ ะดะฐะปะธ ั„ะฐะนะปัŠั‚ ะต ะธะทะฟัŠะปะฝะธะผ"
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr "ะฟั€ะตะดัƒะฟั€ะตะถะดะฐะฒะฐะฝะต ะฟั€ะธ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฒะณั€ะฐะดะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/add.c:326
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "ั€ะตะฐะปะธะทะฐั†ะธั ะฝะฐ โ€žgit stash -pโ€œ"
+
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8908,151 +9833,180 @@ msgstr ""
 "\n"
 "ะ—ะฐ ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะฟะพะณะปะตะดะฝะตั‚ะต โ€žgit help submoduleโ€œ."
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฒะณั€ะฐะดะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "ะ˜ะทะฟะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ โ€ž-fโ€œ, ะทะฐ ะดะฐ ะณะธ ะดะพะฑะฐะฒะธั‚ะต ะฝะฐะธัั‚ะธะฝะฐ.\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"ะŸะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ โ€ž-fโ€œ, ะฐะบะพ ะฝะฐะธัั‚ะธะฝะฐ ะธัะบะฐั‚ะต ะดะฐ ะณะธ ะดะพะฑะฐะฒะธั‚ะต.\n"
+"ะ—ะฐ ะดะฐ ะธะทะบะปัŽั‡ะธั‚ะต ั‚ะพะฒะฐ ััŠะพะฑั‰ะตะฝะธะต, ะธะทะฟัŠะปะฝะตั‚ะต:\n"
+"\n"
+"    git config advice.addIgnoredFile false"
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/add.c:419
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr ""
+"ะพะฟั†ะธัั‚ะฐ โ€ž--pathspec-from-fileโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะฒััะบะฐ ะพั‚ ะพะฟั†ะธะธั‚ะต โ€ž--"
+"interactiveโ€œ/โ€ž--patchโ€œ"
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--pathspec-from-fileโ€œ ะธ โ€ž--editโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
+
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž-Aโ€œ ะธ โ€ž-uโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž--ignore-missingโ€œ ะต ััŠะฒะผะตัั‚ะธะผะฐ ัะฐะผะพ ั โ€ž--dry-runโ€œ"
+msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž--ignore-missingโ€œ ะธะทะธัะบะฒะฐ โ€ž--dry-runโ€œ"
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "ะฟะฐั€ะฐะผะตั‚ัŠั€ัŠั‚ ะบัŠะผ โ€ž--chmodโ€œ โ€” โ€ž%sโ€œ ะผะพะถะต ะดะฐ ะต ะธะปะธ โ€ž-xโ€œ, ะธะปะธ โ€ž+xโ€œ"
 
-#: builtin/add.c:445
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr ""
+"ะพะฟั†ะธัั‚ะฐ โ€ž--pathspec-from-fileโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะฐั€ะณัƒะผะตะฝั‚ะธ, ัƒะบะฐะทะฒะฐั‰ะธ ะฟัŠั‚ะธั‰ะฐ"
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--pathspec-file-nulโ€œ ะธะทะธัะบะฒะฐ ะพะฟั†ะธั โ€ž--pathspec-from-fileโ€œ"
+
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "ะะธั‰ะพ ะฝะต ะต ะทะฐะดะฐะดะตะฝะพ ะธ ะฝะธั‰ะพ ะฝะต ะต ะดะพะฑะฐะฒะตะฝะพ.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "ะ’ะตั€ะพัั‚ะฝะพ ะธัะบะฐั…ั‚ะต ะดะฐ ะธะทะฟะพะปะทะฒะฐั‚ะต โ€žgit add .โ€œ?\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"โ€žgit add .โ€œ ะปะธ ะธัะบะฐั…ั‚ะต ะดะฐ ะธะทะฟัŠะปะฝะธั‚ะต?\n"
+"ะ—ะฐ ะดะฐ ะธะทะบะปัŽั‡ะธั‚ะต ั‚ะพะฒะฐ ััŠะพะฑั‰ะตะฝะธะต, ะธะทะฟัŠะปะฝะตั‚ะต:\n"
+"\n"
+"    git config advice.addEmptyPathspec false"
 
-#: builtin/am.c:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "ัะบั€ะธะฟั‚ัŠั‚ ะทะฐ ะฐะฒั‚ะพั€ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "โ€ž%sโ€œ ะฑะต ะธะทั‚ั€ะธั‚ ะพั‚ ะบัƒะบะฐั‚ะฐ โ€žapplypatch-msgโ€œ"
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "ะ”ะฐะดะตะฝะธัั‚ ะฒั…ะพะดะตะฝ ั€ะตะด ะต ั ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะพั€ะผะฐั‚: โ€ž%sโ€œ."
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "ะ‘ะตะปะตะถะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะฟะธั€ะฐ ะพั‚ โ€ž%sโ€œ ะบัŠะผ โ€ž%sโ€œ"
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žfseekโ€œ"
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "ะบั€ัŠะฟะบะฐั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 "ะกะฐะผะพ ะตะดะฝะฐ ะฟะพั€ะตะดะธั†ะฐ ะพั‚ ะบั€ัŠะฟะบะธ ะพั‚ โ€žStGITโ€œ ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะธะปะฐะณะฐะฝะฐ ะฒ ะดะฐะดะตะฝ ะผะพะผะตะฝั‚"
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ ะฒั€ะตะผะต"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั€ะตะด ะทะฐ ะดะฐั‚ะฐ โ€žDateโ€œ"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะพั‚ะผะตัั‚ะฒะฐะฝะต ะฝะฐ ั‡ะฐัะพะฒะธั ะฟะพัั"
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "ะคะพั€ะผะฐั‚ัŠั‚ ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฟั€ะตะดะตะปะตะฝ."
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝะฐ"
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "ะšั€ัŠะฟะบะธั‚ะต ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ั€ะฐะทะดะตะปะตะฝะธ."
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "ะกะปะตะด ะบะพั€ะธะณะธั€ะฐะฝะตั‚ะพ ะฝะฐ ั‚ะพะทะธ ะฟั€ะพะฑะปะตะผ ะธะทะฟัŠะปะฝะตั‚ะต โ€ž%s --continueโ€œ."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "ะะบะพ ะฟั€ะตะดะฟะพั‡ะธั‚ะฐั‚ะต ะดะฐ ะฟั€ะตัะบะพั‡ะธั‚ะต ั‚ะฐะทะธ ะบั€ัŠะฟะบะฐ, ะธะทะฟัŠะปะฝะตั‚ะต โ€ž%s --skipโ€œ."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "ะ—ะฐ ะดะฐ ัะต ะฒัŠั€ะฝะตั‚ะต ะบัŠะผ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพ ััŠัั‚ะพัะฝะธะต, ะธะทะฟัŠะปะฝะตั‚ะต โ€ž%s --abortโ€œ."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "ะšั€ัŠะฟะบะฐั‚ะฐ ะต ะฟั€ะฐั‚ะตะฝะฐ ั ั„ะพั€ะผะฐั‚ะธั€ะฐะฝะต โ€žformat=flowedโ€œ.  ะŸั€ะฐะทะฝะธั‚ะต ะทะฝะฐั†ะธ ะฒ ะบั€ะฐั ะฝะฐ "
 "ั€ะตะดะพะฒะตั‚ะต ะผะพะถะต ะดะฐ ัะต ะทะฐะณัƒะฑัั‚."
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "ะšั€ัŠะฟะบะฐั‚ะฐ ะต ะฟั€ะฐะทะฝะฐ."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "ะณั€ะตัˆะตะฝ ั€ะตะด ั ะธะดะตะฝั‚ะธั‡ะฝะพัั‚: %.*s"
+msgid "missing author line in commit %s"
+msgstr "ะปะธะฟัะฒะฐ ั€ะตะด ะทะฐ ะฐะฒั‚ะพั€ัั‚ะฒะพ ะฒ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ"
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "ะฟะพะดะฐะฒะฐะฝะตั‚ะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะพ: %s"
+msgid "invalid ident line: %.*s"
+msgstr "ะณั€ะตัˆะตะฝ ั€ะตะด ั ะธะดะตะฝั‚ะธั‡ะฝะพัั‚: %.*s"
 
-#: builtin/am.c:1496
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "ะ’ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะปะธะฟัะฒะฐั‚ ะฝะตะพะฑั…ะพะดะธะผะธั‚ะต ะพะฑะตะบั‚ะธ-BLOB, ะทะฐ ะดะฐ ัะต ะฟั€ะตะผะธะฝะต ะบัŠะผ ั‚ั€ะพะนะฝะพ "
 "ัะปะธะฒะฐะฝะต."
 
-#: builtin/am.c:1498
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr "ะ‘ะฐะทะพะฒะพั‚ะพ ะดัŠั€ะฒะพ ัะต ั€ะตะบะพะฝัั‚ั€ัƒะธั€ะฐ ะพั‚ ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะฒ ะธะฝะดะตะบัะฐโ€ฆ"
 
-#: builtin/am.c:1517
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -9060,24 +10014,24 @@ msgstr ""
 "ะšั€ัŠะฟะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ ะบัŠะผ ะพะฑะตะบั‚ะธั‚ะต-BLOB ะฒ ะธะฝะดะตะบัะฐ.\n"
 "ะ”ะฐ ะฝะต ะฑะธ ะดะฐ ัั‚ะต ั ั€ะตะดะฐะบั‚ะธั€ะฐะปะธ ะฝะฐ ั€ัŠะบะฐ?"
 
-#: builtin/am.c:1523
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "ะŸั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐ ะบัŠะผ ะฑะฐะทะฐั‚ะฐ ะธ ั‚ั€ะพะนะฝะพ ัะปะธะฒะฐะฝะตโ€ฆ"
 
-#: builtin/am.c:1549
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต."
 
-#: builtin/am.c:1581
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "ะฟั€ะธะปะฐะณะฐะฝะต ะฒัŠั€ั…ัƒ ะฟั€ะฐะทะฝะฐ ะธัั‚ะพั€ะธั"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพะดัŠะปะถะธ โ€” โ€ž%sโ€œ ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ."
 
-#: builtin/am.c:1650
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr "ะขัะปะพั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ ะทะฐ ะฟั€ะธะปะฐะณะฐะฝะต ะต:"
 
@@ -9085,40 +10039,45 @@ msgstr "ะขัะปะพั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ ะทะฐ ะฟั€ะธะปะฐะณะฐะฝะต ะต:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "ะŸั€ะธะปะฐะณะฐะฝะต? โ€žyโ€œ โ€” ะดะฐ/โ€žnโ€œ โ€” ะฝะต/โ€žeโ€œ โ€” ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต/โ€žvโ€œ โ€” ะฟั€ะตะณะปะตะด/โ€žaโ€œ โ€” ะฟั€ะธะตะผะฐะฝะต "
 "ะฝะฐ ะฒัะธั‡ะบะพ:"
 
-#: builtin/am.c:1710
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
+
+#: builtin/am.c:1704
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 "ะ˜ะฝะดะตะบััŠั‚ ะฝะต ะต ั‡ะธัั‚: ะบั€ัŠะฟะบะธั‚ะต ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะฟั€ะธะปะพะถะตะฝะธ (ะทะฐะผัŠั€ัะตะฝะธ ัะฐ: %s)"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1744 builtin/am.c:1812
 #, c-format
 msgid "Applying: %.*s"
 msgstr "ะŸั€ะธะปะฐะณะฐะฝะต: %.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1761
 msgid "No changes -- Patch already applied."
 msgstr "ะ‘ะตะท ะฟั€ะพะผะตะฝะธ โ€” ะบั€ัŠะฟะบะฐั‚ะฐ ะฒะตั‡ะต ะต ะฟั€ะธะปะพะถะตะฝะฐ."
 
-#: builtin/am.c:1773
+#: builtin/am.c:1767
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐ ะฟั€ะธ %s %.*sโ€œ"
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
-"ะ—ะฐ ะดะฐ ะฒะธะดะธั‚ะต ะฝะตัƒัะฟะตัˆะฝะพ ะฟั€ะธะปะพะถะตะฝะธ ะบั€ัŠะฟะบะธ, ะธะทะฟะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ โ€žgit am --show-"
-"current-patchโ€œ to see the failed patch"
+"ะ—ะฐ ะดะฐ ะฒะธะดะธั‚ะต ะฝะตัƒัะฟะตัˆะฝะพ ะฟั€ะธะปะพะถะตะฝะธ ะบั€ัŠะฟะบะธ, ะธะทะฟะพะปะทะฒะฐะนั‚ะต:\n"
+"\n"
+"    git am --show-current-patch=diff"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1815
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -9128,7 +10087,7 @@ msgstr ""
 "ะะบะพ ะฝัะผะฐ ะดั€ัƒะณะฐ ะฟั€ะพะผัะฝะฐ ะทะฐ ะฒะบะปัŽั‡ะฒะฐะฝะต ะฒ ะธะฝะดะตะบัะฐ, ะฝะฐะน-ะฒะตั€ะพัั‚ะฝะพ ะฝัะบะพั ะดั€ัƒะณะฐ\n"
 "ะบั€ัŠะฟะบะฐ ะต ะดะพะฒะตะปะฐ ะดะพ ััŠั‰ะธั‚ะต ะฟั€ะพะผะตะฝะธ ะธ ะฒ ั‚ะฐะบัŠะฒ ัะปัƒั‡ะฐะน ะฟั€ะพัั‚ะพ ะฟั€ะพะฟัƒัะฝะตั‚ะต ั‚ะฐะทะธ."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1822
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -9139,17 +10098,17 @@ msgstr ""
 "ะกะปะตะด ะบะพั€ะตะบั†ะธั ะฝะฐ ะบะพะฝั„ะปะธะบั‚ะธั‚ะต ะธะทะฟัŠะปะฝะตั‚ะต โ€žgit addโ€œ ะฒัŠั€ั…ัƒ ะฟะพะฟั€ะฐะฒะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต.\n"
 "ะ—ะฐ ะดะฐ ะฟั€ะธะตะผะตั‚ะต โ€žะธะทั‚ั€ะธั‚ะธ ะพั‚ ั‚ัั…โ€œ, ะธะทะฟัŠะปะฝะตั‚ะต โ€žgit rmโ€œ ะฒัŠั€ั…ัƒ ะธะทั‚ั€ะธั‚ะธั‚ะต ั„ะฐะนะปะพะฒะต."
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "โ€ž%sโ€œ ะฝะต ะต ั€ะฐะทะฟะพะทะฝะฐั‚ ะบะฐั‚ะพ ะพะฑะตะบั‚."
 
-#: builtin/am.c:1987
+#: builtin/am.c:1981
 msgid "failed to clean index"
 msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‡ะธัั‚ะตะฝ"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2025
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -9160,149 +10119,160 @@ msgstr ""
 "ัะพั‡ะธ ะบัŠะผ\n"
 "โ€žORIG_HEADโ€œ"
 
-#: builtin/am.c:2128
+#: builtin/am.c:2132
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€ž--patch-formatโ€œ: โ€ž%sโ€œ"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€ž--show-current-patchโ€œ: โ€ž%sโ€œ"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+"ะพะฟั†ะธะธั‚ะต โ€ž--show-current-patch=%sโ€œ ะธ โ€ž--show-current-patch=%sโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
+
+#: builtin/am.c:2207
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [ะžะŸะฆะ˜ะฏโ€ฆ] [(ะคะะ™ะ›_ะก_ะŸะžะฉะ|ะ”ะ˜ะ ะ•ะšะขะžะ ะ˜ะฏ_ะก_ะŸะžะฉะ)โ€ฆ]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2208
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [ะžะŸะฆะ˜ะฏโ€ฆ] (--continue | --quit | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2214
 msgid "run interactively"
 msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะฐ ั€ะฐะฑะพั‚ะฐ"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2216
 msgid "historical option -- no-op"
 msgstr "ะธะทะพัั‚ะฐะฒะตะฝะฐ ะพะฟั†ะธั, ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฟะพ ะธัั‚ะพั€ะธั‡ะตัะบะธ ะฟั€ะธั‡ะธะฝะธ, ะฝะธั‰ะพ ะฝะต ะฟั€ะฐะฒะธ"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2218
 msgid "allow fall back on 3way merging if needed"
 msgstr "ะดะฐ ัะต ะฟั€ะตะผะธะฝะฐะฒะฐ ะบัŠะผ ั‚ั€ะพะนะฝะพ ัะปะธะฒะฐะฝะต ะฟั€ะธ ะฝัƒะถะดะฐ."
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
 msgid "be quiet"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2221
 msgid "add a Signed-off-by line to the commit message"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั€ะตะด ะทะฐ ะฟะพะดะฟะธั โ€žSigned-off-byโ€œ ะฒ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2224
 msgid "recode into utf8 (default)"
 msgstr "ะฟั€ะตะบะพะดะธั€ะฐะฝะต ะฒ UTF-8 (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2226
 msgid "pass -k flag to git-mailinfo"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž-kโ€œ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-mailinfoโ€œ"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2228
 msgid "pass -b flag to git-mailinfo"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž-bโ€œ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-mailinfoโ€œ"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2230
 msgid "pass -m flag to git-mailinfo"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž-mโ€œ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-mailinfoโ€œ"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2232
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--keep-crโ€œ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-mailsplitโ€œ ะทะฐ ั„ะพั€ะผะฐั‚ โ€žmboxโ€œ"
 
-#: builtin/am.c:2192
+#: builtin/am.c:2235
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "ะฑะตะท ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--keep-crโ€œ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-mailsplitโ€œ ะฝะตะทะฐะฒะธัะธะผะพ "
 "ะพั‚ โ€žam.keepcrโ€œ"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2238
 msgid "strip everything before a scissors line"
 msgstr "ะฟั€ะพะฟัƒัะบะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะพ ะฟั€ะตะดะธ ั€ะตะดะฐ ะทะฐ ะพั‚ั€ัะทะฒะฐะฝะต"
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
 msgid "pass it through git-apply"
 msgstr "ะฟั€ะตะบะฐั€ะฒะฐะฝะต ะฟั€ะตะท โ€žgit-applyโ€œ"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr "ะ‘ะ ะžะ™"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr "ะคะžะ ะœะะข"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2264
 msgid "format the patch(es) are in"
 msgstr "ั„ะพั€ะผะฐั‚ ะฝะฐ ะบั€ัŠะฟะบะธั‚ะต"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2270
 msgid "override error message when patch failure occurs"
 msgstr "ะธะทะฑั€ะฐะฝะพ ะพั‚ ะฒะฐั ััŠะพะฑั‰ะตะฝะธะต ะทะฐ ะณั€ะตัˆะบะฐ ะฟั€ะธ ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะธ"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2272
 msgid "continue applying patches after resolving a conflict"
 msgstr "ะฟั€ะพะดัŠะปะถะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะธะปะฐะณะฐะฝะตั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะธ ัะปะตะด ะบะพั€ะธะณะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะบะพะฝั„ะปะธะบั‚"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2275
 msgid "synonyms for --continue"
 msgstr "ะฟัะตะฒะดะพะฝะธะผะธ ะฝะฐ โ€ž--continueโ€œ"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2278
 msgid "skip the current patch"
 msgstr "ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะฐั‚ะฐ ะบั€ัŠะฟะบะฐ"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2281
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "ะฒัŠะทัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพ ััŠัั‚ะพัะฝะธะต ะฝะฐ ะบะปะพะฝะฐ ะธ ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ "
 "ะฟั€ะธะปะฐะณะฐะฝะตั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ."
 
-#: builtin/am.c:2241
+#: builtin/am.c:2284
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr ""
 "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฟั€ะธะปะฐะณะฐะฝะตั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ ะฑะตะท ะฟั€ะพะผัะฝะฐ ะบัŠะผ ะบะพะต ัะพั‡ะธ โ€žHEADโ€œ."
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
-msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟั€ะธะปะฐะณะฐะฝะฐั‚ะฐ ะบั€ัŠะฟะบะฐ."
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟั€ะธะปะฐะณะฐะฝะฐั‚ะฐ ะบั€ัŠะฟะบะฐ"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2293
 msgid "lie about committer date"
 msgstr "ะดะฐั‚ะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ั€ะฐะทะปะธั‡ะฝะฐ ะพั‚ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะฐั‚ะฐ"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2295
 msgid "use current timestamp for author date"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะพั‚ะพ ะฒั€ะตะผะต ะบะฐั‚ะพ ั‚ะพะฒะฐ ะทะฐ ะฐะฒั‚ะพั€"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr "ะ˜ะ”ะ•ะะขะ˜ะคะ˜ะšะะขะžะ _ะะ_ะšะ›ะฎะง"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
 msgid "GPG-sign commits"
 msgstr "ะฟะพะดะฟะธัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ั GPG"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2301
 msgid "(internal use for git-rebase)"
 msgstr "(ะฟะพะปะทะฒะฐ ัะต ะฒัŠั‚ั€ะตัˆะฝะพ ะทะฐ โ€žgit-rebaseโ€œ)"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2319
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -9310,18 +10280,18 @@ msgstr ""
 "ะžะฟั†ะธะธั‚ะต โ€ž-bโ€œ/โ€ž--binaryโ€œ ะพั‚ะดะฐะฒะฝะฐ ะฝะต ะฟั€ะฐะฒัั‚ ะฝะธั‰ะพ ะธ\n"
 "ั‰ะต ะฑัŠะดะฐั‚ ะฟั€ะตะผะฐั…ะฝะฐั‚ะธ ะฒ ะฑัŠะดะตั‰ะต.  ะะต ะณะธ ะฟะพะปะทะฒะฐะนั‚ะต."
 
-#: builtin/am.c:2281
+#: builtin/am.c:2326
 msgid "failed to read the index"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2341
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "ะฟั€ะตะดะธัˆะฝะฐั‚ะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะทะฐ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต โ€ž%sโ€œ ะฒัะต ะพั‰ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ, ะฐ ะต ะทะฐะดะฐะดะตะฝ "
 "ั„ะฐะนะป โ€žmboxโ€œ."
 
-#: builtin/am.c:2320
+#: builtin/am.c:2365
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9330,11 +10300,11 @@ msgstr ""
 "ะžั‚ะบั€ะธั‚ะฐ ะต ะธะทะปะธัˆะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั โ€ž%sโ€œ.\n"
 "ะœะพะถะตั‚ะต ะดะฐ ั ะธะทั‚ั€ะธะตั‚ะต ั ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit am --abortโ€œ."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2371
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ะฝะต ั‚ะตั‡ะต ะพะฟะตั€ะฐั†ะธั ะฟะพ ะบะพั€ะธะณะธั€ะฐะฝะต ะธ ะฝัะผะฐ ะบะฐะบ ะดะฐ ัะต ะฟั€ะพะดัŠะปะถะธ."
 
-#: builtin/am.c:2336
+#: builtin/am.c:2381
 msgid "interactive mode requires patches on the command line"
 msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะธัั‚ ั€ะตะถะธะผ ะธะทะธัะบะฒะฐ ะบั€ัŠะฟะบะธ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ั€ะตะด"
 
@@ -9455,7 +10425,7 @@ msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ะฝะต ัะต ะธะทะฒัŠั€ัˆะฒะฐ ะดะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝ
 msgid "'%s' is not a valid commit"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9463,27 +10433,27 @@ msgstr ""
 "ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพ ัƒะบะฐะทะฐะฝะพั‚ะพ โ€ž%sโ€œ ะฒ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต\n"
 "ะธะทั‚ะตะณะปะตะฝะพ.  ะŸั€ะพะฑะฒะฐะนั‚ะต ะดะฐ ะธะทะฟัŠะปะฝะธั‚ะต ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit bisect reset ะŸะžะ”ะะ’ะะะ•โ€œ."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ะฐั€ะณัƒะผะตะฝั‚ ะฝะฐ ั„ัƒะฝะบั†ะธัั‚ะฐ โ€žbisect_writeโ€œ: โ€ž%sโ€œ"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ัŠั‚ ะฝะฐ ะพะฑะตะบั‚ ะฝะฐ ะฒะตั€ัะธั โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝ"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ะบะพะผะฐะฝะดะฐ: ะฒ ะผะพะผะตะฝั‚ะฐ ัะต ะธะทะฟัŠะปะฝัะฒะฐ ะดะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต ะฟะพ %s/%s."
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9492,7 +10462,7 @@ msgstr ""
 "ะขั€ัะฑะฒะฐ ะดะฐ ะทะฐะดะฐะดะตั‚ะต ะฟะพะฝะต ะตะดะฝะฐ โ€ž%sโ€œ ะธ ะตะดะฝะฐ โ€ž%sโ€œ ะฒะตั€ัะธั.  (ะขะพะฒะฐ ะผะพะถะต ะดะฐ ัะต\n"
 "ะฝะฐะฟั€ะฐะฒะธ ััŠะพั‚ะฒะตั‚ะฝะพ ะธ ั‡ั€ะตะท ะบะพะผะฐะฝะดะธั‚ะต โ€žgit bisect %sโ€œ ะธ โ€žgit bisect %sโ€œ.)"
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9503,7 +10473,7 @@ msgstr ""
 "ะขั€ัะฑะฒะฐ ะดะฐ ะทะฐะดะฐะดะตั‚ะต ะฟะพะฝะต ะตะดะฝะฐ โ€ž%sโ€œ ะธ ะตะดะฝะฐ โ€ž%sโ€œ ะฒะตั€ัะธั.  (ะขะพะฒะฐ ะผะพะถะต ะดะฐ ัะต\n"
 "ะฝะฐะฟั€ะฐะฒะธ ััŠะพั‚ะฒะตั‚ะฝะพ ะธ ั‡ั€ะตะท ะบะพะผะฐะฝะดะธั‚ะต โ€žgit bisect %sโ€œ ะธ โ€žgit bisect %sโ€œ.)"
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:310
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "ะดะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต ัะฐะผะพ ะฟะพ โ€ž%sโ€œ ะฟะพะดะฐะฒะฐะฝะต."
@@ -9512,15 +10482,15 @@ msgstr "ะดะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต ัะฐะผะพ ะฟะพ โ€ž%sโ€œ ะฟะพะดะฐะฒะฐะฝะต."
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr "ะ”ะฐ ัะต ะฟั€ะพะดัŠะปะถะธ ะปะธ? โ€žYโ€œ โ€”  ะ”ะ, โ€žnโ€œ โ€” ะฝะต"
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr "ะฝะต ัะฐ ัƒะบะฐะทะฐะฝะธ ัƒะฟั€ะฐะฒะปัะฒะฐั‰ะธ ะดัƒะผะธ"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:382
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9529,7 +10499,7 @@ msgstr ""
 "ะขะตะบัƒั‰ะธั‚ะต ัƒะฟั€ะฐะฒะปัะฒะฐั‰ะธ ะดัƒะผะธ ัะฐ: %s ะทะฐ ัั‚ะฐั€ะพั‚ะพ ััŠัั‚ะพัะฝะธะต\n"
 "ะธ %s ะทะฐ ะฝะพะฒะพั‚ะพ ััŠัั‚ะพัะฝะธะต.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:392
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9538,291 +10508,287 @@ msgstr ""
 "ะฝะฐ โ€žgit bisect termsโ€œ ะต ะฟะพะดะฐะดะตะฝ ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฐั€ะณัƒะผะตะฝั‚ โ€ž%sโ€œ\n"
 "ะŸะพะดะดัŠั€ะถะฐั‚ ัะต ะพะฟั†ะธะธั‚ะต โ€ž--term-goodโ€œ/โ€ž--term-oldโ€œ ะธ โ€ž--term-badโ€ž/โ€ž--term-newโ€œ."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:478
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะพะฟั†ะธั: %s"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:482
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "โ€ž%sโ€œ ะฝะต ะธะทะณะปะตะถะดะฐ ะบะฐั‚ะพ ัƒะบะฐะทะฐั‚ะตะป ะบัŠะผ ะฒะตั€ัะธั"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:514
 msgid "bad HEAD - I need a HEAD"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป โ€žHEADโ€œ"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:529
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "ะะตัƒัะฟะตัˆะฝะพ ะฟั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ โ€ž%sโ€œ.  ะ˜ะทะฟัŠะปะฝะตั‚ะต ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit bisect start "
 "ะกะชะฉะ•ะกะขะ’ะฃะ’ะะฉ_ะšะ›ะžะโ€œ."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ัะต ั‚ัŠั€ัะธ ะดะฒะพะธั‡ะฝะพ, ะบะพะณะฐั‚ะพ ะต ะธะทะฟัŠะปะฝะตะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žcg-seekโ€œ ะพั‚ "
 "โ€žcogitoโ€œ"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:553
 msgid "bad HEAD - strange symbolic ref"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป โ€žHEADโ€œ โ€” ะฝะตะพะฑะธั‡ะฐะตะฝ ัะธะผะฒะพะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:577
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป: โ€ž%sโ€œ"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr "ะธะทะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ โ€žgit bisect nextโ€œ"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ัƒะฟั€ะฐะฒะปัะฒะฐั‰ะธั‚ะต ะดัƒะผะธ ะฒ โ€žโ€œ.git/BISECT_TERMSโ€žโ€œ"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr "ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ะดะฒะพะธั‡ะฝะพั‚ะพ ั‚ัŠั€ัะตะฝะต"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ ะทะฐ ะพั‡ะฐะบะฒะฐะฝะธั‚ะต ะฒะตั€ัะธะธ"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:641
 msgid "reset the bisection state"
 msgstr "ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ะดะฒะพะธั‡ะฝะพั‚ะพ ั‚ัŠั€ัะตะฝะต"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:643
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "ะทะฐะฟะธั ะฝะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ะดะฒะพะธั‡ะฝะพั‚ะพ ั‚ัŠั€ัะตะฝะต ะฒ โ€žBISECT_LOGโ€œ"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:645
 msgid "check and set terms in a bisection state"
 msgstr ""
 "ะฟั€ะพะฒะตั€ะบะฐ ะธ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ัƒะฟั€ะฐะฒะปัะฒะฐั‰ะธ ะดัƒะผะธ ะบัŠะผ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ะดะฒะพะธั‡ะฝะพั‚ะพ ั‚ัŠั€ัะตะฝะต"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:647
 msgid "check whether bad or good terms exist"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ ะดะฐะปะธ ััŠั‰ะตัั‚ะฒัƒะฒะฐั‚ ะพะดะพะฑั€ัะฒะฐั‰ะธ/ะพั‚ั…ะฒัŠั€ะปัั‰ะธ ัƒะฟั€ะฐะฒะปัะฒะฐั‰ะธ ะดัƒะผะธ"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:649
 msgid "print out the bisect terms"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัƒะฟั€ะฐะฒะปัะฒะฐั‰ะธั‚ะต ะดัƒะผะธ"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:651
 msgid "start the bisect session"
 msgstr "ะฝะฐั‡ะฐะปะพ ะฝะฐ ะดะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต"
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr ""
 "ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปั โ€žBISECT_HEADโ€œ ะฒะผะตัั‚ะพ ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ั‚ะตะบัƒั‰ะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:655
 msgid "no log for BISECT_WRITE"
 msgstr "ะปะธะฟัะฒะฐ ะทะฐะฟะธั ะทะฐ โ€žBISECT_WRITEโ€œ"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--write-termsโ€œ ะธะทะธัะบะฒะฐ ั‚ะพั‡ะฝะพ 2 ะฐั€ะณัƒะผะตะฝั‚ะฐ"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--bisect-clean-stateโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:684
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--bisect-resetโ€œ ะธะทะธัะบะฒะฐ ะธะปะธ 0 ะฐั€ะณัƒะผะตะฝั‚ะธ, ะธะปะธ 1 โ€” ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:688
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--bisect-writeโ€œ ะธะทะธัะบะฒะฐ 4 ะธะปะธ 5 ะฐั€ะณัƒะผะตะฝั‚ะฐ"
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:694
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--check-and-set-termsโ€œ ะธะทะธัะบะฒะฐ 3 ะฐั€ะณัƒะผะตะฝั‚ะฐ"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:700
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--bisect-next-checkโ€œ ะธะทะธัะบะฒะฐ 2 ะธะปะธ 3 ะฐั€ะณัƒะผะตะฝั‚ะฐ"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:706
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--bisect-termsโ€œ ะธะทะธัะบะฒะฐ 0 ะธะปะธ 1 ะฐั€ะณัƒะผะตะฝั‚ะฐ"
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [ะžะŸะฆะ˜ะฏโ€ฆ] [ะžะŸะฆะ˜ะฏ_ะ—ะ_ะ’ะ•ะ ะกะ˜ะฏะขะโ€ฆ] [ะ’ะ•ะ ะกะ˜ะฏ] [--] ะคะะ™ะ›"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "ะžะŸะฆะ˜ะ˜ั‚ะต_ะ—ะ_ะ’ะ•ะ ะกะ˜ะฏะขะ ัะฐ ะดะพะบัƒะผะตะฝั‚ะธั€ะฐะฝะธ ะฒ ั€ัŠะบะพะฒะพะดัั‚ะฒะพั‚ะพ git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, c-format
 msgid "expecting a color: %s"
 msgstr "ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ั†ะฒัั‚: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr "ั‚ั€ัะฑะฒะฐ ะดะฐ ะทะฐะฒัŠั€ัˆะฒะฐ ั ั†ะฒัั‚"
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั†ะฒัั‚ โ€ž%sโ€œ ะฒ โ€žcolor.blame.repeatedLinesโ€œ"
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 msgid "invalid value for blame.coloring"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€žblame.coloringโ€œ"
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "ะฒะตั€ัะธัั‚ะฐ ะทะฐ ะฟั€ะตัะบะฐั‡ะฐะฝะต โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะฐ"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะฒั‚ะพั€ัั‚ะฒะพั‚ะพ ั ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะผัƒ, ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะพ"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟั€ะฐะทะฝะธ ััƒะผะธ ะฟะพ SHA1 ะทะฐ ะณั€ะฐะฝะธั‡ะฝะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะพะฟั†ะธัั‚ะฐ "
 "ะต ะธะทะบะปัŽั‡ะตะฝะฐ)"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "ะะฐั‡ะฐะปะฝะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั ะดะฐ ะฝะต ัะต ัั‡ะธั‚ะฐั‚ ะทะฐ ะณั€ะฐะฝะธั‡ะฝะธ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะพะฟั†ะธัั‚ะฐ ะต "
 "ะธะทะบะปัŽั‡ะตะฝะฐ)"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะฐั‚ะธัั‚ะธะบะฐ ะทะฐ ะธะทะฒัŠั€ัˆะตะฝะธั‚ะต ะดะตะนัั‚ะฒะธั"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr "ะŸั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะดะพะฟัŠะปะฝะธั‚ะตะปะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะพะฟั€ะตะดะตะปัะฝะตั‚ะพ ะฝะฐ ะฐะฒั‚ะพั€ัั‚ะฒะพั‚ะพ"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr ""
 "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพ ะธะผะต ะฝะฐ ั„ะฐะนะป (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ั‚ะพะฒะฐ ะต ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ)"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะธัั‚ ะฝะพะผะตั€ ะฝะฐ ั€ะตะด (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะพะฟั†ะธัั‚ะฐ ะต ะธะทะบะปัŽั‡ะตะฝะฐ)"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฒัŠะฒ ั„ะพั€ะผะฐั‚ ะทะฐ ะฟะพ-ะฝะฐั‚ะฐั‚ัŠัˆะฝะฐ ะพะฑั€ะฐะฑะพั‚ะบะฐ"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 "ะ˜ะทะฒะตะถะดะฐะฝะต ะฒัŠะฒ ั„ะพั€ะผะฐั‚ ะทะฐ ะบะพะผะฐะฝะดะธ ะพั‚ ะฟะพั‚ั€ะตะฑะธั‚ะตะปัะบะพ ะฝะธะฒะพ ั ะธะฝั„ะพั€ะผะฐั†ะธั ะฝะฐ ะฒัะตะบะธ "
 "ั€ะตะด"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััŠั‰ะธั ั„ะพั€ะผะฐั‚ ะบะฐั‚ะพ โ€žgit-annotateโ€œ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะพะฟั†ะธัั‚ะฐ ะต "
 "ะธะทะบะปัŽั‡ะตะฝะฐ)"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตั„ะพั€ะผะฐั‚ะธั€ะฐะฝะธ ะฒั€ะตะผะตะฝะฐ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะพะฟั†ะธัั‚ะฐ ะต ะธะทะบะปัŽั‡ะตะฝะฐ)"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัŠะปะฝะธั‚ะต ััƒะผะธ ะฟะพ SHA1 (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะพะฟั†ะธัั‚ะฐ ะต ะธะทะบะปัŽั‡ะตะฝะฐ)"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "ะ‘ะตะท ะธะผะต ะฝะฐ ะฐะฒั‚ะพั€ ะธ ะฒั€ะตะผะต ะฝะฐ ะฟั€ะพะผัะฝะฐ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะพะฟั†ะธัั‚ะฐ ะต ะธะทะบะปัŽั‡ะตะฝะฐ)"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะต-ะฟะพั‰ะฐั‚ะฐ ะฝะฐ ะฐะฒั‚ะพั€ะฐ, ะฐ ะฝะต ะธะผะตั‚ะพ ะผัƒ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะพะฟั†ะธัั‚ะฐ ะต "
 "ะธะทะบะปัŽั‡ะตะฝะฐ)"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr "ะ‘ะตะท ั€ะฐะทะปะธะบะธ ะฒ ะทะฝะฐั†ะธั‚ะต ะทะฐ ะธะฝั‚ะตั€ะฒะฐะปะธ"
 
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr "ะ’ะ•ะ ะก"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 msgid "Ignore <rev> when blaming"
 msgstr "ะŸั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะ’ะ•ะ ะกะธัั‚ะฐ ะฟั€ะธ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะฒั‚ะพั€ัั‚ะฒะพั‚ะพ"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 msgid "Ignore revisions from <file>"
 msgstr "ะŸั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะฒะตั€ัะธะธั‚ะต ัƒะบะฐะทะฐะฝะธ ะฒัŠะฒ ะคะะ™ะ›ะฐ ะฟั€ะธ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะฒั‚ะพั€ัั‚ะฒะพั‚ะพ"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 "ะพั†ะฒะตั‚ัะฒะฐะฝะต ะฝะฐ ะฟะพะฒั‚ะฐั€ัั‰ะธั‚ะต ัะต ะผะตั‚ะฐะดะฐะฝะฝะธ ะพั‚ ะฟั€ะตะดะธัˆะฝะธั ั€ะตะด ะฒ ั€ะฐะทะปะธั‡ะตะฝ ั†ะฒัั‚"
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr "ะพั†ะฒะตั‚ัะฒะฐะฝะต ะฝะฐ ั€ะตะดะพะฒะตั‚ะต ะฟะพ ะฒัŠะทั€ะฐัั‚"
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "ะŸะพะดะพะฑั€ัะฒะฐะฝะต ะฝะฐ ั€ะฐะทะปะธะบะธั‚ะต ั‡ั€ะตะท ะตะบัะฟะตั€ะธะผะตะฝั‚ะฐะปะฝะฐ ะตะฒั€ะธัั‚ะธะบะฐ"
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr "ะ”ะพะฟัŠะปะฝะธั‚ะตะปะฝะธ ะธะทั‡ะธัะปะตะฝะธั ะทะฐ ะฟะพ-ะดะพะฑั€ะธ ั€ะตะทัƒะปั‚ะฐั‚ะธ"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "ะ˜ะทั‡ะธั‚ะฐะฝะต ะฝะฐ ะฒะตั€ัะธะธั‚ะต ะพั‚ ะคะะ™ะ›, ะฐ ะฝะต ั‡ั€ะตะท ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žgit-rev-listโ€œ"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ะคะะ™ะ›ะฐ ะบะฐั‚ะพ ะบั€ะฐะนะฝะพ ะฟะพะปะพะถะตะฝะธะต"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "ะฝะฐะฟะฐัะฒะฐะฝะต ะฝะฐ ั€ะตะดะพะฒะตั‚ะต"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr ""
 "ะขัŠั€ัะตะฝะต ะฝะฐ ะบะพะฟะธั€ะฐะฝะธ ั€ะตะดะพะฒะต ะบะฐะบั‚ะพ ะฒ ั€ะฐะผะบะธั‚ะต ะฝะฐ ะตะดะธะฝ ั„ะฐะนะป, ั‚ะฐะบะฐ ะธ ะพั‚ ะตะดะธะฝ ั„ะฐะนะป "
 "ะบัŠะผ ะดั€ัƒะณ"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr ""
 "ะขัŠั€ัะตะฝะต ะฝะฐ ะฟั€ะตะผะตัั‚ะตะฝะธ ั€ะตะดะพะฒะต ะบะฐะบั‚ะพ ะฒ ั€ะฐะผะบะธั‚ะต ะฝะฐ ะตะดะธะฝ ั„ะฐะนะป, ั‚ะฐะบะฐ ะธ ะพั‚ ะตะดะธะฝ "
 "ั„ะฐะนะป ะบัŠะผ ะดั€ัƒะณ"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 "ะ˜ะฝั„ะพั€ะผะฐั†ะธั ัะฐะผะพ ะทะฐ ั€ะตะดะพะฒะตั‚ะต ะฒ ะดะธะฐะฟะฐะทะพะฝะฐ ะพั‚ n ะดะพ m ะฒะบะปัŽั‡ะธั‚ะตะปะฝะพ.  ะ‘ั€ะพะตะฝะตั‚ะพ "
 "ะทะฐะฟะพั‡ะฒะฐ ะพั‚ 1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--progressโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž--incrementalโ€œ ะธ ั„ะพั€ะผะฐฬ€ั‚ะฐ ะฝะฐ ะบะพะผะฐะฝะดะธั‚ะต "
@@ -9836,18 +10802,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "ะฟั€ะตะดะธ 4 ะณะพะดะธะฝะธ ะธ 11 ะผะตัะตั†ะฐ"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "ะธะผะฐ ัะฐะผะพ %2$lu ั€ะตะด ะฒัŠะฒ ั„ะฐะนะปะฐ โ€ž%1$sโ€œ"
 msgstr[1] "ะธะผะฐ ัะฐะผะพ %2$lu ั€ะตะดะฐ ะฒัŠะฒ ั„ะฐะนะปะฐ โ€ž%1$sโ€œ"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr "ะ ะตะดะพะฒะต ั ะฐะฒั‚ะพั€ัั‚ะฒะพ"
 
@@ -10059,7 +11025,7 @@ msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ั€ะตะถะธะผะฐ ะฝะฐ ัะปะตะดะตะฝะต (ะฒะธะถ git-pull(
 msgid "do not use"
 msgstr "ะดะฐ ะฝะต ัะต ะฟะพะปะทะฒะฐ"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:513
 msgid "upstream"
 msgstr "ะบะปะพะฝ-ะธะทั‚ะพั‡ะฝะธะบ"
 
@@ -10068,8 +11034,8 @@ msgid "change the upstream info"
 msgstr "ัะผัะฝะฐ ะฝะฐ ะบะปะพะฝะฐ-ะธะทั‚ะพั‡ะฝะธะบ"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "ะฑะตะท ะบะปะพะฝ-ะธะทั‚ะพั‡ะฝะธะบ"
+msgid "unset the upstream info"
+msgstr "ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะทะฐ ะบะปะพะฝ-ะธะทั‚ะพั‡ะฝะธะบ"
 
 #: builtin/branch.c:628
 msgid "use colored output"
@@ -10171,7 +11137,7 @@ msgstr "ะฟะพะดั€ะตะดะฑะฐั‚ะฐ ะธ ั„ะธะปั‚ั€ะธั€ะฐะฝะตั‚ะพ ั‚ั€ะตั‚ะธั€ะฐั‚ ะตะดะฝ
 msgid "format to use for the output"
 msgstr "ะคะžะ ะœะะข ะทะฐ ะธะทั…ะพะดะฐ"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:785
 msgid "HEAD not found below refs/heads!"
 msgstr "ะ’ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€žrefs/headsโ€œ ะปะธะฟัะฒะฐ ั„ะฐะนะป โ€žHEADโ€œ"
 
@@ -10261,20 +11227,66 @@ msgstr ""
 "ะžะฟั†ะธัั‚ะฐ โ€ž--set-upstreamโ€œ ะฒะตั‡ะต ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ.  ะ˜ะทะฟะพะปะทะฒะฐะนั‚ะต โ€ž--trackโ€œ ะธะปะธ โ€ž--"
 "set-upstream-toโ€œ"
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr "ะŸั€ะฐั‚ะบะฐั‚ะฐ โ€ž%sโ€œ ะต ะฝะฐั€ะตะด\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [ะžะŸะฆะ˜ะฏโ€ฆ] ะคะะ™ะ› ะะ ะ“ะฃะœะ•ะะข_ะ—ะ_git_rev-listโ€ฆ"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [ะžะŸะฆะ˜ะฏโ€ฆ] ะคะะ™ะ›โ€ฆ"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads ะคะะ™ะ› [ะ˜ะœะ•_ะะ_ะฃะšะะ—ะะขะ•ะ›โ€ฆ]"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle ะคะะ™ะ› [ะ˜ะœะ•_ะะ_ะฃะšะะ—ะะขะ•ะ›โ€ฆ]"
+
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ ะฒัŠะฒ ั„ะฐะทะฐั‚ะฐ ะฝะฐ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+"ััŠั‰ะพั‚ะพ ะดะตะนัั‚ะฒะธะต ะบะฐั‚ะพ ะพะฟั†ะธัั‚ะฐ โ€ž--all-progressโ€œ ะฟั€ะธ ะธะทะฒะตะถะดะฐะฝะตั‚ะพ ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
+
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "ะ—ะฐ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟั€ะฐั‚ะบะฐ ะต ะฝะตะพะฑั…ะพะดะธะผะพ ั…ั€ะฐะฝะธะปะธั‰ะต."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "ะฑะตะท ะฟะพะดั€ะพะฑะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะฟั€ะฐั‚ะบะธั‚ะต"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "ะŸั€ะฐั‚ะบะฐั‚ะฐ โ€ž%sโ€œ ะต ะฝะฐั€ะตะด\n"
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "ะ—ะฐ ะฟั€ะธะตะผะฐะฝะตั‚ะพ ะฝะฐ ะฟั€ะฐั‚ะบะฐ ะต ะฝะตะพะฑั…ะพะดะธะผะพ ั…ั€ะฐะฝะธะปะธั‰ะต."
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ะฟะพะฒะตั‡ะต ะฟะพะดั€ะพะฑะฝะพัั‚ะธ.  ะŸะพัั‚ะฐะฒั ัะต ะฟั€ะตะด ะฟะพะดะบะพะผะฐะฝะดะฐ"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "ะะตะฟะพะทะฝะฐั‚ะฐ ะฟะพะดะบะพะผะฐะฝะดะฐ: %s"
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -10282,7 +11294,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | ะ’ะ˜ะ” | --textconv --filters) [--path=ะŸะชะข] ะžะ‘ะ•ะšะข"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -10290,79 +11302,79 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 msgid "only one batch option may be specified"
 msgstr "ะผะพะถะต ะดะฐ ัƒะบะฐะถะตั‚ะต ัะฐะผะพ ะตะดะฝะฐ ะฟะฐะบะตั‚ะฝะฐ ะพะฟั†ะธั"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 "ะ’ะ˜ะ”ัŠั‚ ะผะพะถะต ะดะฐ ะต: โ€žblobโ€œ (BLOB), โ€žtreeโ€œ (ะดัŠั€ะฒะพ), โ€žcommitโ€œ (ะฟะพะดะฐะฒะฐะฝะต), "
 "โ€žtagโ€œ (ะตั‚ะธะบะตั‚)"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒะธะดะฐ ะฝะฐ ะพะฑะตะบั‚"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั€ะฐะทะผะตั€ะฐ ะฝะฐ ะพะฑะตะบั‚"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr "ะธะทั…ะพะด ั 0, ะบะพะณะฐั‚ะพ ะฝัะผะฐ ะณั€ะตัˆะบะฐ"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr "ั„ะพั€ะผะฐั‚ะธั€ะฐะฝะพ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ะพะฑะตะบั‚ะฐ"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 "ะดะฐ ัะต ัั‚ะฐั€ั‚ะธั€ะฐ ะฟั€ะพะณั€ะฐะผะฐั‚ะฐ ะทะฐะดะฐะดะตะฝะฐ ะฒ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žtextconvโ€œ ะทะฐ ะฟั€ะตะพะฑั€ะฐะทัƒะฒะฐะฝะต "
 "ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ะพะฑะตะบั‚ะฐ-BLOB"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 "ะดะฐ ัะต ัั‚ะฐั€ั‚ะธั€ะฐั‚ ะฟั€ะพะณั€ะฐะผะธั‚ะต ะทะฐ ะฟั€ะตะพะฑั€ะฐะทัƒะฒะฐะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต-BLOB"
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:1002
 msgid "blob"
 msgstr "ะพะฑะตะบั‚-BLOB"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--textconvโ€œ/โ€ž--filtersโ€œ ะธะทะธัะบะฒะฐั‚ ะฟัŠั‚"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธะธั‚ะต โ€ž-sโ€œ ะธ โ€ž-tโ€œ ะดะฐ ั€ะฐะฑะพั‚ัั‚ ั ะฟะพะฒั€ะตะดะตะฝะธ ะพะฑะตะบั‚ะธ"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr "ะฑัƒั„ะตั€ะธั€ะฐะฝะต ะฝะฐ ะธะทั…ะพะดะฐ ะพั‚ โ€ž--batchโ€œ"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะธ ััŠะดัŠั€ะถะฐะฝะธะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะฟะพะดะฐะดะตะฝะธ ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะพะฑะตะบั‚ะธั‚ะต ะฟะพะดะฐะดะตะฝะธ ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "ัะปะตะดะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะธั‚ะต ะฒั€ัŠะทะบะธ ัะพั‡ะตั‰ะธ ะฒ ะดัŠั€ะฒะพั‚ะพ (ะฟะพะปะทะฒะฐ ัะต ั โ€ž--batchโ€œ ะธะปะธ โ€ž--"
 "batch-checkโ€œ)"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะพะฑะตะบั‚ะธ ั โ€ž--batchโ€œ ะธะปะธ โ€ž--batch-checkโ€œ"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr "ะฑะตะท ะฟะพะดั€ะตะถะดะฐะฝะต ะฝะฐ ะธะทั…ะพะดะฐ ะพั‚ โ€ž--batch-all-objectsโ€œ"
 
@@ -10390,8 +11402,8 @@ msgstr "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต ะพั‚ ัั‚ะฐ
 msgid "terminate input and output records by a NUL character"
 msgstr "ั€ะฐะทะดะตะปัะฝะต ะฝะฐ ะฒั…ะพะดะฝะธั‚ะต ะธ ะธะทั…ะพะดะฝะธั‚ะต ะทะฐะฟะธัะธ ั ะฝัƒะปะตะฒะธั ะทะฝะฐะบ โ€žNULโ€œ"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
 msgid "suppress progress reporting"
 msgstr "ะฑะตะท ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
 
@@ -10403,27 +11415,27 @@ msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตััŠะฒะฟะฐะดะฐั‰ะธั‚ะต ะฟัŠั‚ะธั‰ะฐ"
 msgid "ignore index when checking"
 msgstr "ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฟั€ะธ ะฟั€ะพะฒะตั€ะบะฐั‚ะฐ"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--stdinโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะธะผะตะฝะฐ ะฝะฐ ะฟัŠั‚ะธั‰ะฐ"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž-zโ€œ ะธะทะธัะบะฒะฐ โ€ž--stdinโ€œ"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝ ะฟัŠั‚"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--quietโ€œ ะธะทะธัะบะฒะฐ ะดะฐ ะต ะฟะพะดะฐะดะตะฝ ั‚ะพั‡ะฝะพ ะตะดะธะฝ ะฟัŠั‚"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--quietโ€œ ะธ โ€ž--verboseโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--non-matchingโ€œ ะธะทะธัะบะฒะฐ โ€ž--verboseโ€œ"
 
@@ -10481,9 +11493,9 @@ msgid "write the content to temporary files"
 msgstr "ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฒัŠะฒ ะฒั€ะตะผะตะฝะฝะธ ั„ะฐะนะปะพะฒะต"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
 msgid "string"
 msgstr "ะะ˜ะ—"
 
@@ -10511,99 +11523,99 @@ msgstr "git switch [ะžะŸะฆะ˜ะฏโ€ฆ] ะšะ›ะžะ"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [ะžะŸะฆะ˜ะฏโ€ฆ] [--source=ะšะ›ะžะ] ะคะะ™ะ›โ€ฆ"
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "ะฒะฐัˆะฐั‚ะฐ ะฒะตั€ัะธั ะปะธะฟัะฒะฐ ะฒ ะฟัŠั‚ั โ€ž%sโ€œ"
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "ั‡ัƒะถะดะฐั‚ะฐ ะฒะตั€ัะธั ะปะธะฟัะฒะฐ ะฒ ะฟัŠั‚ั โ€ž%sโ€œ"
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "ะฝัะบะพั ะพั‚ ะฝะตะพะฑั…ะพะดะธะผะธั‚ะต ะฒะตั€ัะธะธ ะปะธะฟัะฒะฐ ะฒ ะฟัŠั‚ั โ€ž%sโ€œ"
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "ะฝัะบะพั ะพั‚ ะฝะตะพะฑั…ะพะดะธะผะธั‚ะต ะฒะตั€ัะธะธ ะปะธะฟัะฒะฐ ะฒ ะฟัŠั‚ั โ€ž%sโ€œ"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัะปัะฝ"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "ะ ะตะทัƒะปั‚ะฐั‚ัŠั‚ ะทะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัะปัะฝ"
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "ะŸั€ะตััŠะทะดะฐะดะตะฝ ะต %d ะบะพะฝั„ะปะธะบั‚ ะฟั€ะธ ัะปะธะฒะฐะฝะต"
 msgstr[1] "ะŸั€ะตััŠะทะดะฐะดะตะฝะธ ัะฐ %d ะบะพะฝั„ะปะธะบั‚ะฐ ะฟั€ะธ ัะปะธะฒะฐะฝะต"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "ะžะฑะฝะพะฒะตะฝ ะต %d ะฟัŠั‚ ะพั‚ โ€ž%sโ€œ"
 msgstr[1] "ะžะฑะฝะพะฒะตะฝะธ ัะฐ %d ะฟัŠั‚ั ะพั‚ โ€ž%sโ€œ"
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:389
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "ะžะฑะฝะพะฒะตะฝ ะต %d ะฟัŠั‚ ะพั‚ ะธะฝะดะตะบัะฐ"
 msgstr[1] "ะžะฑะฝะพะฒะตะฝะธ ัะฐ %d ะฟัŠั‚ั ะพั‚ ะธะฝะดะตะบัะฐ"
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะพะฑะฝะพะฒัะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟัŠั‚ะธั‰ะฐ"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž%sโ€œ"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "ะะตะฒัŠะทะผะพะถะฝะพ ะต ะตะดะฝะพะฒั€ะตะผะตะฝะฝะพ ะดะฐ ะพะฑะฝะพะฒัะฒะฐั‚ะต ะฟัŠั‚ะธั‰ะฐ ะธ ะดะฐ ะฟั€ะตะผะธะฝะตั‚ะต ะบัŠะผ ะบะปะพะฝะฐ โ€ž%sโ€œ."
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ะฝะต ะต ัƒะบะฐะทะฐะฝะพ ะฝะธั‚ะพ โ€ž%sโ€œ, ะฝะธั‚ะพ โ€ž%sโ€œ"
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะต ะทะฐะดัŠะปะถะธั‚ะตะปะฝะฐ, ะบะพะณะฐั‚ะพ โ€ž%sโ€œ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%3$sโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ะบะฐะบั‚ะพ ั โ€ž%1$sโ€œ, ั‚ะฐะบะฐ ะธ ั โ€ž%2$sโ€œ"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ ะฝะต ะต ัะปัั‚"
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
 msgid "you need to resolve your current index first"
 msgstr "ะฟัŠั€ะฒะพ ั‚ั€ัะฑะฒะฐ ะดะฐ ะบะพั€ะธะณะธั€ะฐั‚ะต ะธะฝะดะตะบัะฐ ัะธ"
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:734
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10613,55 +11625,50 @@ msgstr ""
 "ะธะฝะดะตะบัะฐ:\n"
 "%s"
 
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr "ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฒ ั‚ะตะทะธ ั„ะฐะนะปะพะฒะต ั‰ะต ัะต ะฟั€ะตะทะฐะฟะธัˆะฐั‚: %s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:837
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "ะ–ัƒั€ะฝะฐะปัŠั‚ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะทะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพัะปะตะดะธ: %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:879
 msgid "HEAD is now at"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฒ ะผะพะผะตะฝั‚ะฐ ัะพั‡ะธ ะบัŠะผ"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:883 builtin/clone.c:717
 msgid "unable to update HEAD"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:887
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "ะ—ะฐะฝัƒะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ โ€ž%sโ€œ\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "ะ’ะตั‡ะต ัั‚ะต ะฝะฐ โ€ž%sโ€œ\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:894
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "ะŸั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ะบะปะพะฝะฐ โ€ž%sโ€œ ะธ ะทะฐะฝัƒะปัะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:896 builtin/checkout.c:1320
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "ะŸั€ะตะผะธะฝะฐั…ั‚ะต ะบัŠะผ ะฝะพะฒะธั ะบะปะพะฝ โ€ž%sโ€œ\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:898
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "ะŸั€ะตะผะธะฝะฐั…ั‚ะต ะบัŠะผ ะบะปะพะฝะฐ โ€ž%sโ€œ\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:949
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "โ€ฆ ะธ ะพั‰ะต %d.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:955
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10683,7 +11690,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:974
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10710,28 +11717,19 @@ msgstr[1] ""
 "    git branch ะ˜ะœะ•_ะะ_ะะžะ’ะ˜ะฏ_ะšะ›ะžะ %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1009
 msgid "internal error in revision walk"
 msgstr "ะฒัŠั‚ั€ะตัˆะฝะฐ ะณั€ะตัˆะบะฐ ะฟั€ะธ ะพะฑั…ะพะถะดะฐะฝะตั‚ะพ ะฝะฐ ะฒะตั€ัะธะธั‚ะต"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1013
 msgid "Previous HEAD position was"
 msgstr "ะŸั€ะตะดะธ ั‚ะพะฒะฐ โ€žHEADโ€œ ัะพั‡ะตัˆะต ะบัŠะผ"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
 msgid "You are on a branch yet to be born"
 msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ัั‚ะต ะฝะฐ ะบะปะพะฝ, ะบะพะนั‚ะพ ะฒัะต ะพั‰ะต ะฝะต ะต ััŠะทะดะฐะดะตะฝ"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "ะพั‡ะฐะบะฒะฐ ัะต ัะฐะผะพ ะตะดะธะฝ ัƒะบะฐะทะฐั‚ะตะป"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะตะดะธะฝ ัƒะบะฐะทะฐั‚ะตะป, ะฐ ัั‚ะต ะฟะพะดะฐะปะธ %d."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1128
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10740,37 +11738,73 @@ msgstr ""
 "โ€ž%sโ€œ ะผะพะถะต ะดะฐ ะต ะบะฐะบั‚ะพ ะปะพะบะฐะปะตะฝ ั„ะฐะนะป, ั‚ะฐะบะฐ ะธ ัะปะตะดัั‰ ะบะปะพะฝ.  ะ—ะฐ ัƒั‚ะพั‡ะฝัะฒะฐะฝะต\n"
 "ะฟะพะปะทะฒะฐะนั‚ะต ั€ะฐะทะดะตะปะธั‚ะตะปั โ€ž--โ€œ (ะธ ะตะฒะตะฝั‚ัƒะฐะปะฝะพ ะพะฟั†ะธัั‚ะฐ โ€ž--no-guessโ€œ)"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"ะะบะพ ะธัะบะฐั‚ะต ะดะฐ ะธะทั‚ะตะณะปะธั‚ะต ะบะปะพะฝะฐ ะพั‚ ะบะพะฝะบั€ะตั‚ะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะฝะฐะฟั€. โ€žoriginโ€œ,\n"
+"ะธะทั€ะธั‡ะฝะพ ะณะพ ัƒะบะฐะถะตั‚ะต ะบัŠะผ ะพะฟั†ะธัั‚ะฐ โ€ž--trackโ€œ:\n"
+"\n"
+"    git checkout --track origin/ะ˜ะœะ•_ะะ_ะšะ›ะžะ\n"
+"\n"
+"ะะบะพ ะธัะบะฐั‚ะต ะฒะธะฝะฐะณะธ ะดะฐ ัะต ะฟั€ะตะดะฟะพั‡ะธั‚ะฐ ะบะพะฝะบั€ะตั‚ะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฟั€ะธ ะฝะตะตะดะฝะพะทะฝะฐั‡ะฝะพ\n"
+"ะ˜ะœะ•_ะะ_ะšะ›ะžะ, ะฝะฐะฟั€. โ€žoriginโ€œ, ะทะฐะดะฐะนั‚ะต ัะปะตะดะฝะฐั‚ะฐ ะฝะฐัั‚ั€ะพะนะบะฐ ะฒ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธั\n"
+"ั„ะฐะนะป:\n"
+"\n"
+"    checkout.defaultRemote=origin"
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "โ€ž%sโ€œ ะฝะฐะฟะฐัะฒะฐ ั ะผะฝะพะถะตัั‚ะฒะพ (%d) ะพั‚ะดะฐะปะตั‡ะตะฝะธ ะบะปะพะฝะธ"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "ะพั‡ะฐะบะฒะฐ ัะต ัะฐะผะพ ะตะดะธะฝ ัƒะบะฐะทะฐั‚ะตะป"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะตะดะธะฝ ัƒะบะฐะทะฐั‚ะตะป, ะฐ ัั‚ะต ะฟะพะดะฐะปะธ %d."
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
 #, c-format
 msgid "invalid reference: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ะฝะต ัะพั‡ะธ ะบัŠะผ ะพะฑะตะบั‚-ะดัŠั€ะฒะพ: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1334
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะบะปะพะฝ, ะฐ ะฝะต ะตั‚ะธะบะตั‚ โ€” โ€ž%sโ€œ"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1336
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะปะพะบะฐะปะตะฝ, ะฐ ะฝะต ะพั‚ะดะฐะปะตั‡ะตะฝ ะบะปะพะฝ โ€” โ€ž%sโ€œ"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะบะปะพะฝ, ะฐ ะฝะต โ€ž%sโ€œ"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1340
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะบะปะพะฝ, ะฐ ะฝะต ะฟะพะดะฐะฒะฐะฝะต โ€” โ€ž%sโ€œ"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1356
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10778,7 +11812,7 @@ msgstr ""
 "ะฟะพ ะฒั€ะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะตะผะธะฝะตั‚ะต ะบัŠะผ ะดั€ัƒะณ ะบะปะพะฝ.\n"
 "ะŸั€ะพะฑะฒะฐะนั‚ะต ั โ€žgit merge --quitโ€œ ะธะปะธ โ€žgit worktree addโ€œ."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1360
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10787,7 +11821,7 @@ msgstr ""
 "ะบะปะพะฝ.\n"
 "ะŸั€ะพะฑะฒะฐะนั‚ะต ั โ€žgit am --quitโ€œ ะธะปะธ โ€žgit worktree addโ€œ."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1364
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10795,7 +11829,7 @@ msgstr ""
 "ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะตะผะธะฝะตั‚ะต ะบัŠะผ ะดั€ัƒะณ ะบะปะพะฝ.\n"
 "ะŸั€ะพะฑะฒะฐะนั‚ะต ั โ€žgit rebase --quitโ€œ ะธะปะธ โ€žgit worktree addโ€œ."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1368
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10803,7 +11837,7 @@ msgstr ""
 "ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะตะผะธะฝะตั‚ะต ะบัŠะผ ะดั€ัƒะณ ะบะปะพะฝ.\n"
 "ะŸั€ะพะฑะฒะฐะนั‚ะต ั โ€žgit cherry-pick --quitโ€œ ะธะปะธ โ€žgit worktree addโ€œ."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1372
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10811,139 +11845,144 @@ msgstr ""
 "ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะพั‚ะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะตะผะธะฝะตั‚ะต ะบัŠะผ ะดั€ัƒะณ ะบะปะพะฝ.\n"
 "ะŸั€ะพะฑะฒะฐะนั‚ะต ั โ€žgit revert --quitโ€œ ะธะปะธ โ€žgit worktree addโ€œ."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1376
 msgid "you are switching branch while bisecting"
 msgstr "ะฟั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ะดั€ัƒะณ ะบะปะพะฝ ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะดะฒะพะธั‡ะฝะพ ั‚ัŠั€ัะตะฝะต"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1383
 msgid "paths cannot be used with switching branches"
 msgstr "ะทะฐะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟัŠั‚ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะพ ั ะฟั€ะตะผะธะฝะฐะฒะฐะฝะตั‚ะพ ะพั‚ ะตะดะธะฝ ะบะปะพะฝ ะบัŠะผ ะดั€ัƒะณ"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะฟั€ะตะผะธะฝะฐะฒะฐะฝะตั‚ะพ ะพั‚ ะตะดะธะฝ ะบะปะพะฝ ะบัŠะผ ะดั€ัƒะณ"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž%sโ€œ"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1411
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ััŠั ะทะฐะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะะะงะะ›ะž"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1419
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 "ะ—ะฐ ะดะฐ ะฟั€ะตะผะธะฝะตั‚ะต ะบัŠะผ ะบะปะพะฝ, ะฟะพะดะฐะนั‚ะต ัƒะบะฐะทะฐั‚ะตะป, ะบะพะนั‚ะพ ัะพั‡ะธ ะบัŠะผ ะฟะพะดะฐะฒะฐะฝะต.  โ€ž%sโ€œ "
 "ะฝะต ะต ั‚ะฐะบัŠะฒ"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1426
 msgid "missing branch or commit argument"
 msgstr "ะปะธะฟัะฒะฐ ะฐั€ะณัƒะผะตะฝั‚ โ€” ะบะปะพะฝ ะธะปะธ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1469
 msgid "perform a 3-way merge with the new branch"
 msgstr "ะธะทะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ ั‚ั€ะพะนะฝะพ ัะปะธะฒะฐะฝะต ั ะฝะพะฒะธั ะบะปะพะฝ"
 
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr "ะกะขะ˜ะ›"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1471
 msgid "conflict style (merge or diff3)"
 msgstr "ะดะตะนัั‚ะฒะธะต ะฟั€ะธ ะบะพะฝั„ะปะธะบั‚ (ัะปะธะฒะฐะฝะต ะธะปะธ ั‚ั€ะพะนะฝะฐ ั€ะฐะทะปะธะบะฐ)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1483 builtin/worktree.c:496
 msgid "detach HEAD at named commit"
 msgstr "ะพั‚ะดะตะปัะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ ะบัŠะผ ัƒะบะฐะทะฐะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1484
 msgid "set upstream info for new branch"
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะบะพะน ะบะปะพะฝ ะฑะธะฒะฐ ัะปะตะดะตะฝ ะฟั€ะธ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฝะพะฒะธั ะบะปะพะฝ"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1486
 msgid "force checkout (throw away local modifications)"
 msgstr "ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะธะทั‚ะตะณะปัะฝะต (ะฒะฐัˆะธั‚ะต ะฟั€ะพะผะตะฝะธ ั‰ะต ะฑัŠะดะฐั‚ ะทะฐะฝัƒะปะตะฝะธ)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new-branch"
 msgstr "ะะžะ’_ะšะ›ะžะ"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new unparented branch"
 msgstr "ะฝะพะฒ ะบะปะพะฝ ะฑะตะท ั€ะพะดะธั‚ะตะป"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
 msgid "update ignored files (default)"
 msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะณะฝะพั€ะธั€ะฐะฝะธั‚ะต ั„ะฐะนะปะพะฒะต (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1493
 msgid "do not check if another worktree is holding the given ref"
 msgstr "ะฑะตะท ะฟั€ะพะฒะตั€ะบะฐ ะดะฐะปะธ ะดั€ัƒะณะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ ะดัŠั€ะถะธ ัƒะบะฐะทะฐั‚ะตะปั"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1506
 msgid "checkout our version for unmerged files"
 msgstr "ะธะทั‚ะตะณะปัะฝะต ะฝะฐ ะฒะฐัˆะฐั‚ะฐ ะฒะตั€ัะธั ะฝะฐ ะฝะตัะปะตั‚ะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1509
 msgid "checkout their version for unmerged files"
 msgstr "ะธะทั‚ะตะณะปัะฝะต ะฝะฐ ั‡ัƒะถะดะฐั‚ะฐ ะฒะตั€ัะธั ะฝะฐ ะฝะตัะปะตั‚ะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1513
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "ะฑะตะท ะพะณั€ะฐะฝะธั‡ะฐะฒะฐะฝะต ะฝะฐ ะธะทะฑั€ะพะตะฝะธั‚ะต ะฟัŠั‚ะธั‰ะฐ ัะฐะผะพ ะดะพ ั‡ะฐัั‚ะธั‡ะฝะพ ะธะทั‚ะตะณะปะตะฝะธั‚ะต"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž-bโ€œ, โ€ž-Bโ€œ ะธ โ€ž--orphanโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ะตะดะฝะฐ ั ะดั€ัƒะณะฐ"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1568
 msgid "-p and --overlay are mutually exclusive"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž-pโ€œ ะธ โ€ž--overlayโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1605
 msgid "--track needs a branch name"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--trackโ€œ ะธะทะธัะบะฒะฐ ะธะผะต ะฝะฐ ะบะปะพะฝ"
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1610
 msgid "missing branch name; try -b"
 msgstr "ะปะธะฟัะฒะฐ ะธะผะต ะฝะฐ ะบะปะพะฝ, ะธะทะฟะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ โ€ž-bโ€œ"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1642
 #, c-format
 msgid "could not resolve %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "ั‚ั€ัะฑะฒะฐ ะดะฐ ัƒะบะฐะถะตั‚ะต ะฟะพะฝะต ะตะดะธะฝ ะฟัŠั‚ ะทะฐ ะฒัŠะทัั‚ะฐะฝะพะฒัะฒะฐะฝะต"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
 msgid "invalid path specification"
 msgstr "ัƒะบะฐะทะฐะฝ ะต ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟัŠั‚"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต, ะทะฐั‚ะพะฒะฐ ะพั‚ ะฝะตะณะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะบะปะพะฝ โ€ž%sโ€œ"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: ะพะฟั†ะธัั‚ะฐ โ€ž--detachโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚-ะฟัŠั‚ โ€ž%sโ€œ"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--pathspec-from-fileโ€œ ะธ โ€ž--detachโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--pathspec-from-fileโ€œ ะธ โ€ž--patchโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
+
+#: builtin/checkout.c:1692
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10951,99 +11990,73 @@ msgstr ""
 "git checkout: ะพะฟั†ะธะธั‚ะต โ€ž--oursโ€œ/โ€ž--theirsโ€œ, โ€ž--forceโ€œ ะธ โ€ž--mergeโ€œ\n"
 "ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ั ะธะทั‚ะตะณะปัะฝะต ะพั‚ ะธะฝะดะตะบัะฐ."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"โ€ž%sโ€œ ััŠะฒะฟะฐะดะฐ ั ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะธะฝ ะพั‚ะดะฐะปะตั‡ะตะฝ ะบะปะพะฝ โ€” ะพั‚ะบั€ะธั‚ะธ ัะฐ %d ะฒัŠะทะผะพะถะฝะพัั‚ะธ.\n"
-"ะŸั€ะพะฑะฐั‚ะฐ ะฐั€ะณัƒะผะตะฝั‚ัŠั‚ ะดะฐ ัะต ั‚ัŠะปะบัƒะฒะฐ ะบะฐั‚ะพ ะฟัŠั‚ ััŠั‰ะพ ะฑะต ะฝะตัƒัะฟะตัˆะฝะฐ.\n"
-"\n"
-"ะะบะพ ะธัะบะฐั‚ะต ะดะฐ ะธะทั‚ะตะณะปะธั‚ะต ะบะปะพะฝะฐ ะพั‚ ะบะพะฝะบั€ะตั‚ะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะฝะฐะฟั€. โ€žoriginโ€œ,\n"
-"ะธะทั€ะธั‡ะฝะพ ะณะพ ัƒะบะฐะถะตั‚ะต ะบัŠะผ ะพะฟั†ะธัั‚ะฐ โ€ž--trackโ€œ:\n"
-"\n"
-"    git checkout --track origin/ะ˜ะœะ•_ะะ_ะšะ›ะžะ\n"
-"\n"
-"ะะบะพ ะธัะบะฐั‚ะต ะฒะธะฝะฐะณะธ ะดะฐ ัะต ะฟั€ะตะดะฟะพั‡ะธั‚ะฐ ะบะพะฝะบั€ะตั‚ะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฟั€ะธ ะฝะตะตะดะฝะพะทะฝะฐั‡ะฝะพ\n"
-"ะ˜ะœะ•_ะะ_ะšะ›ะžะ, ะฝะฐะฟั€. โ€žoriginโ€œ, ะทะฐะดะฐะนั‚ะต ัะปะตะดะฝะฐั‚ะฐ ะฝะฐัั‚ั€ะพะนะบะฐ ะฒ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธั\n"
-"ั„ะฐะนะป:\n"
-"\n"
-"    checkout.defaultRemote=origin"
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "ั‚ั€ัะฑะฒะฐ ะดะฐ ัƒะบะฐะถะตั‚ะต ะฟะพะฝะต ะตะดะธะฝ ะฟัŠั‚ ะทะฐ ะฒัŠะทัั‚ะฐะฝะพะฒัะฒะฐะฝะต"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
 msgid "branch"
 msgstr "ะบะปะพะฝ"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1724
 msgid "create and checkout a new branch"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะธ ะฟั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ะฝะพะฒ ะบะปะพะฝ"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1726
 msgid "create/reset and checkout a branch"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต/ะทะฐะฝัƒะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝ ะธ ะฟั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ะฝะตะณะพ"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1727
 msgid "create reflog for new branch"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะถัƒั€ะฝะฐะป ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะทะฐ ะฝะพะฒ ะบะปะพะฝ"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1729
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 "ะพะฟะธั‚ ะทะฐ ะพั‚ะณะฐั‚ะฒะฐะฝะต ะฝะฐ ะธะผะต ะฝะฐ ะบะปะพะฝ ัะปะตะด ะฝะตัƒัะฟะตัˆะตะฝ ะพะฟะธั‚ ั โ€žgit checkout "
 "ะะ•ะกะชะฉะ•ะกะขะ’ะฃะ’ะะฉ_ะšะ›ะžะโ€œ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1730
 msgid "use overlay mode (default)"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟั€ะธะฟะพะบั€ะธะฒะฐั‰ ั€ะตะถะธะผ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ)"
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1775
 msgid "create and switch to a new branch"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะธ ะฟั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ะฝะพะฒ ะบะปะพะฝ"
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1777
 msgid "create/reset and switch to a branch"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต/ะทะฐะฝัƒะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝ ะธ ะฟั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ะฝะตะณะพ"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1779
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 "ะพะฟะธั‚ ะทะฐ ะพั‚ะณะฐั‚ะฒะฐะฝะต ะฝะฐ ะธะผะต ะฝะฐ ะบะปะพะฝ ัะปะตะด ะฝะตัƒัะฟะตัˆะตะฝ ะพะฟะธั‚ ั โ€žgit switch "
 "ะะ•ะกะชะฉะ•ะกะขะ’ะฃะ’ะะฉ_ะšะ›ะžะโ€œ"
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1781
 msgid "throw away local modifications"
 msgstr "ะทะฐะฝัƒะปัะฒะฐะฝะต ะฝะฐ ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ"
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1813
 msgid "which tree-ish to checkout from"
 msgstr "ะบัŠะผ ะบะพะน ัƒะบะฐะทะฐั‚ะตะป ะบัŠะผ ะดัŠั€ะฒะพ ะดะฐ ัะต ะฟั€ะตะผะธะฝะต"
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1815
 msgid "restore the index"
 msgstr "ะฒัŠะทัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1817
 msgid "restore the working tree (default)"
 msgstr "ะฒัŠะทัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ)"
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1819
 msgid "ignore unmerged entries"
 msgstr "ะฟั€ะตะฝะตะฑั€ะตะณะฒะฐะฝะต ะฝะฐ ะฝะตัะปะตั‚ะธั‚ะต ะตะปะตะผะตะฝั‚ะธ"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
 msgid "use overlay mode"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟั€ะธะฟะพะบั€ะธะฒะฐั‰ ั€ะตะถะธะผ"
 
@@ -11082,7 +12095,7 @@ msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 msgid "could not lstat %s\n"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปัƒั‡ะธ ะธะฝั„ะพั€ะผะฐั†ะธั ั‡ั€ะตะท โ€žlstatโ€œ ะทะฐ โ€ž%sโ€œ\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -11095,7 +12108,7 @@ msgstr ""
 "ะŸะ ะ•ะคะ˜ะšะก    โ€” ะธะทะฑะพั€ ะฝะฐ ะตะดะธะฝัั‚ะฒะตะฝ ะพะฑะตะบั‚ ะฟะพ ั‚ะพะทะธ ัƒะฝะธะบะฐะปะตะฝ ะฟั€ะตั„ะธะบั\n"
 "           โ€” (ะฟั€ะฐะทะฝะพ) ะฝะธั‰ะพ ะดะฐ ะฝะต ัะต ะธะทะฑะธั€ะฐ\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -11116,39 +12129,33 @@ msgstr ""
 "*          โ€” ะธะทะฑะธั€ะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะพะฑะตะบั‚ะธ\n"
 "           โ€” (ะฟั€ะฐะทะฝะพ) ะทะฐะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ ะธะทะฑะธั€ะฐะฝะตั‚ะพ\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ะธะทะฑะพั€ (%s).\n"
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "ะจะฐะฑะปะพะฝะธ ะทะฐ ะธะณะฝะพั€ะธั€ะฐะฝะธ ะตะปะตะผะตะฝั‚ะธโ‰ซ "
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ะŸะ ะ•ะ”ะฃะŸะ ะ•ะ–ะ”ะ•ะะ˜ะ•: ะะธะบะพะน ะพะฑะตะบั‚ ะฝะต ะฝะฐะฟะฐัะฒะฐ ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "ะ˜ะทะฑะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธ ะทะฐ ะธะทั‚ั€ะธะฒะฐะฝะต"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "ะ”ะฐ ัะต ะธะทั‚ั€ะธะต ะปะธ โ€ž%sโ€œ? โ€žyโ€œ โ€”  ะดะฐ, โ€žNโ€œ โ€” ะะ•"
 
-#
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "ะ˜ะทั…ะพะด.\n"
-
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11166,64 +12173,56 @@ msgstr ""
 "help                โ€” ั‚ะพะทะธ ะบั€ะฐะน\n"
 "?                   โ€” ะฟะพะดัะบะฐะทะบะฐ ะทะฐ ัˆะฐะฑะปะพะฝะธั‚ะต"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "โ—โ—โ— ะšะพะผะฐะฝะดะธ โ—โ—โ—"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "ะ˜ะทะฑะพั€ ะฝะฐ ัะปะตะดะฒะฐั‰ะพ ะดะตะนัั‚ะฒะธะต"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "ะกะปะตะดะฝะธัั‚ ะพะฑะตะบั‚ ั‰ะต ะฑัŠะดะต ะธะทั‚ั€ะธั‚:"
 msgstr[1] "ะกะปะตะดะฝะธั‚ะต ะพะฑะตะบั‚ะธ ั‰ะต ะฑัŠะดะฐั‚ ะธะทั‚ั€ะธั‚ะธ:"
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "ะคะฐะนะปะพะฒะตั‚ะต ะทะฐ ะธะทั‡ะธัั‚ะฒะฐะฝะต ัะฒัŠั€ัˆะธั…ะฐ.  ะ˜ะทั…ะพะด ะพั‚ ะฟั€ะพะณั€ะฐะผะฐั‚ะฐ."
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต, ะบะพะธั‚ะพ ั‰ะต ะฑัŠะดะฐั‚ ะธะทั‚ั€ะธั‚ะธ"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr "ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ั†ะตะปะธ ะดะธั€ะตะบั‚ะพั€ะธะธ"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "ะจะะ‘ะ›ะžะ"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะจะะ‘ะ›ะžะ ะพั‚ ั„ะฐะนะปะพะฒะต, ะบะพะธั‚ะพ ะดะฐ ะฝะต ัะต ั‚ั€ะธัั‚"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะธ ะฝะฐ ะธะณะฝะพั€ะธั€ะฐะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะณะฝะพั€ะธั€ะฐะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž-xโ€œ ะธ โ€ž-Xโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -11231,7 +12230,7 @@ msgstr ""
 "ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žclean.requireForceโ€œ ะต ะทะฐะดะฐะดะตะฝะฐ ะบะฐั‚ะพ ะธัั‚ะธะฝะฐ, ะบะพะตั‚ะพ ะธะทะธัะบะฒะฐ ะฝัะบะพั "
 "ะพั‚ ะพะฟั†ะธะธั‚ะต โ€ž-iโ€œ, โ€ž-nโ€œ ะธะปะธ โ€ž-fโ€œ.  ะัะผะฐ ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ะธะทั‡ะธัั‚ะฒะฐะฝะต"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -11240,7 +12239,7 @@ msgstr ""
 "ะบะพะตั‚ะพ ะธะทะธัะบะฒะฐ ะฝัะบะพั ะพั‚ ะพะฟั†ะธะธั‚ะต โ€ž-iโ€œ, โ€ž-nโ€œ ะธะปะธ โ€ž-fโ€œ.  ะัะผะฐ ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ "
 "ะธะทั‡ะธัั‚ะฒะฐะฝะต"
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [ะžะŸะฆะ˜ะฏโ€ฆ] [--] ะฅะ ะะะ˜ะ›ะ˜ะฉะ• [ะ”ะ˜ะ ะ•ะšะขะžะ ะ˜ะฏ]"
 
@@ -11289,18 +12288,18 @@ msgstr "ะดะธั€ะตะบั‚ะพั€ะธั ั ัˆะฐะฑะปะพะฝะธ"
 msgid "directory from which templates will be used"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธั, ะบะพัั‚ะพ ััŠะดัŠั€ะถะฐ ัˆะฐะฑะปะพะฝะธั‚ะต, ะบะพะธั‚ะพ ะดะฐ ัะต ะฟะพะปะทะฒะฐั‚"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr "ะตั‚ะฐะปะพะฝะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--referenceโ€œ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะฟั€ะธ ะบะปะพะฝะธั€ะฐะฝะต"
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
 msgid "name"
 msgstr "ะ˜ะœะ•"
 
@@ -11316,8 +12315,8 @@ msgstr "ะธะทั‚ะตะณะปัะฝะต ะฝะฐ ั‚ะพะทะธ ะšะ›ะžะ, ะฐ ะฝะต ัะพั‡ะตะฝะธัั‚ ะพั‚
 msgid "path to git-upload-pack on the remote"
 msgstr "ะฟัŠั‚ ะบัŠะผ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-upload-packโ€œ ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
 msgid "depth"
 msgstr "ะ”ะชะ›ะ‘ะžะงะ˜ะะ"
 
@@ -11325,7 +12324,7 @@ msgstr "ะ”ะชะ›ะ‘ะžะงะ˜ะะ"
 msgid "create a shallow clone of that depth"
 msgstr "ะฟะปะธั‚ะบะพ ะบะปะพะฝะธั€ะฐะฝะต ะดะพ ั‚ะฐะทะธ ะ”ะชะ›ะ‘ะžะงะ˜ะะ"
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
 msgid "time"
 msgstr "ะ’ะ ะ•ะœะ•"
 
@@ -11333,16 +12332,17 @@ msgstr "ะ’ะ ะ•ะœะ•"
 msgid "create a shallow clone since a specific time"
 msgstr "ะฟะปะธั‚ะบะพ ะบะปะพะฝะธั€ะฐะฝะต ะดะพ ะผะพะผะตะฝั‚ ะฒัŠะฒ ะฒั€ะตะผะตั‚ะพ"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
 msgid "revision"
 msgstr "ะ’ะ•ะ ะกะ˜ะฏ"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "ะทะฐะดัŠะปะฑะพั‡ะฐะฒะฐะฝะต ะฝะฐ ะธัั‚ะพั€ะธัั‚ะฐ ะฝะฐ ะฟะปะธั‚ะบะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะดะพ ะธะทะบะปัŽั‡ะฒะฐั‰ ัƒะบะฐะทะฐั‚ะตะป"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 "ะบะปะพะฝะธั€ะฐะฝะต ัะฐะผะพ ะฝะฐ ะตะดะธะฝ ะบะปะพะฝ โ€” ะธะปะธ ัะพั‡ะตะฝะธั ะพั‚ ะพั‚ะดะฐะปะตั‡ะตะฝะธั โ€žHEADโ€œ, ะธะปะธ ะธะทั€ะธั‡ะฝะพ "
@@ -11373,23 +12373,23 @@ msgstr "ะšะ›ะฎะง=ะกะขะžะ™ะะžะกะข"
 msgid "set config inside the new repository"
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะธั‚ะต ะฝะฐ ะฝะพะฒะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "ัะฟะตั†ะธั„ะธั‡ะฝะธ ะทะฐ ััŠั€ะฒัŠั€ะฐ"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "ะพะฟั†ะธั ะทะฐ ะฟั€ะตะฝะพั"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr "ัะฐะผะพ ะฐะดั€ะตัะธ IPv4"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr "ัะฐะผะพ ะฐะดั€ะตัะธ IPv6"
 
@@ -11397,7 +12397,13 @@ msgstr "ัะฐะผะพ ะฐะดั€ะตัะธ IPv6"
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "ะฒัะธั‡ะบะธ ะบะปะพะฝะธั€ะฐะฝะธ ะฟะพะดะผะพะดัƒะปะธ ั‰ะต ะฟะพะปะทะฒะฐั‚ ัะปะตะดัั‰ะธั‚ะต ัะธ ะบะปะพะฝะธ"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"ะธะฝะธั†ะธะฐะปะธะทะธั€ะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ ะทะฐ ั‡ะฐัั‚ะธั‡ะฝะพ ะธะทั‚ะตะณะปัะฝะต (โ€ž.git/info/sparse-checkoutโ€œ) "
+"ะดะฐ ััŠะดัŠั€ะถะฐ ัะฐะผะพ ั„ะฐะนะปะพะฒะตั‚ะต ะฒ ะพัะฝะพะฒะฝะฐั‚ะฐ ะดะธั€ะตะบั‚ะพั€ะธั"
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11405,43 +12411,43 @@ msgstr ""
 "ะ˜ะผะตั‚ะพ ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะณะฐั‚ะฝะฐั‚ะพ.\n"
 "ะ—ะฐะดะฐะนั‚ะต ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะธะทั€ะธั‡ะฝะพ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ั€ะตะด"
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 "ะŸะ ะ•ะ”ะฃะŸะ ะ•ะ–ะ”ะ•ะะ˜ะ•: ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะตะฝ ะธะทั‚ะพั‡ะฝะธะบ ะฝะฐ โ€ž%sโ€œ: %s\n"
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "โ€ž%sโ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะธ ะฝะต ะต ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธั‚ะตั€ะธั€ะฐะฝะต ะฟะพ โ€ž%sโ€œ"
 
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "ะฒั€ัŠะทะบะฐั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝะฐ"
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะบะพะฟะธั€ะฐะฝ ะบะฐั‚ะพ โ€ž%sโ€œ"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธั‚ะตั€ะธั€ะฐะฝะต ะฟะพ โ€ž%sโ€œ"
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr "ะดะตะนัั‚ะฒะธะตั‚ะพ ะทะฐะฒัŠั€ัˆะธ.\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11454,99 +12460,103 @@ msgstr ""
 "\n"
 "    git restore --source=HEAD :/\n"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 "ะšะปะพะฝัŠั‚ โ€ž%sโ€œ ะพั‚ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะบะพะตั‚ะพ ะบะปะพะฝะธั€ะฐั‚ะต,\n"
 "ะธ ะบะพะนั‚ะพ ัะปะตะดะฒะฐ ะดะฐ ะฑัŠะดะต ะธะทั‚ะตะณะปะตะฝ, ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ."
 
-#: builtin/clone.c:702
+#: builtin/clone.c:705
 #, c-format
 msgid "unable to update %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ"
 
-#: builtin/clone.c:752
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "ั‡ะฐัั‚ะธั‡ะฝะพั‚ะพ ะธะทั‚ะตะณะปัะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะฝะธั†ะธะฐะปะธะทะธั€ะฐ"
+
+#: builtin/clone.c:776
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะพั‚ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ัะพั‡ะธ ะบัŠะผ ะฝะตั‰ะพ,\n"
 "ะบะพะตั‚ะพ ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ.  ะะต ะผะพะถะต ะดะฐ ัะต ะธะทั‚ะตะณะปะธ ะพะฟั€ะตะดะตะปะตะฝ ะบะปะพะฝ.\n"
 
-#: builtin/clone.c:783
+#: builtin/clone.c:807
 msgid "unable to checkout working tree"
 msgstr "ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะดะณะพั‚ะฒะตะฝะพ"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:862
 msgid "unable to write parameters to config file"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะธั‚ะต ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะทะฐะฟะธัะฐะฝะธ ะฒ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธั ั„ะฐะนะป"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:925
 msgid "cannot repack to clean up"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ะฟะฐะบะตั‚ะธั€ะฐะฝะต ะทะฐ ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:927
 msgid "cannot unlink temporary alternates file"
 msgstr "ะฒั€ะตะผะตะฝะฝะธัั‚ ั„ะฐะนะป ะทะฐ ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะฝะธ ะพะฑะตะบั‚ะธ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
 msgid "Too many arguments."
 msgstr "ะŸั€ะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐั€ะณัƒะผะตะฝั‚ะธ."
 
-#: builtin/clone.c:942
+#: builtin/clone.c:969
 msgid "You must specify a repository to clone."
 msgstr "ะขั€ัะฑะฒะฐ ะดะฐ ัƒะบะฐะถะตั‚ะต ะบะพะต ั…ั€ะฐะฝะธะปะธั‰ะต ะธัะบะฐั‚ะต ะดะฐ ะบะปะพะฝะธั€ะฐั‚ะต."
 
-#: builtin/clone.c:955
+#: builtin/clone.c:982
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--bareโ€œ ะธ โ€ž--origin %sโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ."
 
-#: builtin/clone.c:958
+#: builtin/clone.c:985
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--bareโ€œ ะธ โ€ž--separate-git-dirโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:998
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ"
 
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:1004 builtin/fetch.c:1796
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "ะดัŠะปะฑะพั‡ะธะฝะฐั‚ะฐ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ะฟะพะปะพะถะธั‚ะตะปะฝะพ ั†ัะปะพ ั‡ะธัะปะพ, ะฐ ะฝะต โ€ž%sโ€œ"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1014
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "ั†ะตะปะตะฒะธัั‚ ะฟัŠั‚ โ€ž%sโ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะธ ะฝะต ะต ะฟั€ะฐะทะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั."
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1024
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "ะฒ โ€ž%sโ€œ ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ."
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "ั€ะพะดะธั‚ะตะปัะบะธั‚ะต ะดะธั€ะตะบั‚ะพั€ะธะธ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ััŠะทะดะฐะดะตะฝะธ"
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1044
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฒ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝะพ."
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1064
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "ะšะปะพะฝะธั€ะฐะฝะต ะธ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะณะพะปะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฒ โ€ž%sโ€œโ€ฆ\n"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1066
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "ะšะปะพะฝะธั€ะฐะฝะต ะธ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะต ะฒ โ€ž%sโ€œโ€ฆ\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1090
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11554,44 +12564,44 @@ msgstr ""
 "ะžะฟั†ะธัั‚ะฐ โ€ž--recursiveโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะพะฟั†ะธะธั‚ะต โ€ž--referenceโ€œ ะธ โ€ž--reference-"
 "if-ableโ€œ"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1154
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "ะŸั€ะธ ะปะพะบะฐะปะฝะพ ะบะปะพะฝะธั€ะฐะฝะต ะพะฟั†ะธัั‚ะฐ โ€ž--depthโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ.  ะŸะพะปะทะฒะฐะนั‚ะต ัั…ะตะผะฐั‚ะฐ "
 "โ€žfile://โ€œ."
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1156
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "ะŸั€ะธ ะปะพะบะฐะปะฝะพ ะบะปะพะฝะธั€ะฐะฝะต ะพะฟั†ะธัั‚ะฐ โ€ž--shallow-sinceโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ.  ะŸะพะปะทะฒะฐะนั‚ะต "
 "ัั…ะตะผะฐั‚ะฐ โ€žfile://โ€œ."
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1158
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "ะŸั€ะธ ะปะพะบะฐะปะฝะพ ะบะปะพะฝะธั€ะฐะฝะต ะพะฟั†ะธัั‚ะฐ โ€ž--shallow-excludeโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ.  ะŸะพะปะทะฒะฐะนั‚ะต "
 "ัั…ะตะผะฐั‚ะฐ โ€žfile://โ€œ."
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1160
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "ะŸั€ะธ ะปะพะบะฐะปะฝะพ ะบะปะพะฝะธั€ะฐะฝะต ะพะฟั†ะธัั‚ะฐ โ€ž--filterโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ.  ะŸะพะปะทะฒะฐะนั‚ะต ัั…ะตะผะฐั‚ะฐ "
 "โ€žfile://โ€œ."
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1163
 msgid "source repository is shallow, ignoring --local"
 msgstr "ะบะปะพะฝะธั€ะฐะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะต ะฟะปะธั‚ะบะพ, ะทะฐั‚ะพะฒะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--localโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ"
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1168
 msgid "--local is ignored"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--localโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1243 builtin/clone.c:1251
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "ะžั‚ะดะฐะปะตั‡ะตะฝะธัั‚ ะบะปะพะฝ โ€ž%sโ€œ ะปะธะฟัะฒะฐ ะฒ ะบะปะพะฝะธั€ะฐะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ"
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1254
 msgid "You appear to have cloned an empty repository."
 msgstr "ะ˜ะทะณะปะตะถะดะฐ ะบะปะพะฝะธั€ะฐั…ั‚ะต ะฟั€ะฐะทะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต."
 
@@ -11640,7 +12650,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะฟะพะฒั‚ะฐั€ัั‰ ัะต ั€ะพะดะธั‚ะตะป: โ€ž%sโ€œ"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, c-format
 msgid "not a valid object name %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚: โ€ž%sโ€œ"
@@ -11668,13 +12678,13 @@ msgstr "ั€ะพะดะธั‚ะตะป"
 msgid "id of a parent commit object"
 msgstr "ะ˜ะ”ะ•ะะขะ˜ะคะ˜ะšะะขะžะ  ะฝะฐ ะพะฑะตะบั‚ะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ-ั€ะพะดะธั‚ะตะป"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
 #: builtin/tag.c:412
 msgid "message"
 msgstr "ะกะชะžะ‘ะฉะ•ะะ˜ะ•"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
 msgid "commit message"
 msgstr "ะกะชะžะ‘ะฉะ•ะะ˜ะ• ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต"
 
@@ -11682,8 +12692,8 @@ msgstr "ะกะชะžะ‘ะฉะ•ะะ˜ะ• ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต"
 msgid "read commit log message from file"
 msgstr "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะพั‚ ะคะะ™ะ›"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "ะฟะพะดะฟะธัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ ั GPG"
 
@@ -11763,57 +12773,65 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "ะฒัŠั€ั…ะพะฒะพั‚ะพ ะดัŠั€ะฒะพ (HEAD tree object) ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทะฒะฐะดะตะฝะพ ะพั‚ ะฟะฐะบะตั‚"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "ะพะฟั†ะธะธั‚ะต โ€ž-aโ€œ ะธ โ€ž--pathspec-from-fileโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--includeโ€œ ะธ โ€ž--onlyโ€œ ะธะทะธัะบะฒะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ะธ."
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr "ะฒั€ะตะผะตะฝะฝะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝ"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:385
 msgid "interactive add failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะดะพะฑะฐะฒัะฝะต"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:400
 msgid "unable to update temporary index"
 msgstr "ะฒั€ะตะผะตะฝะฝะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:402
 msgid "Failed to update main cache tree"
 msgstr "ะ”ัŠั€ะฒะพั‚ะพ ะฝะฐ ะพัะฝะพะฒะฝะธั ะบะตัˆ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝะพ"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
 msgid "unable to write new_index file"
 msgstr "ะฝะพะฒะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:479
 msgid "cannot do a partial commit during a merge."
 msgstr "ะฟะพ ะฒั€ะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ั‡ะฐัั‚ะธั‡ะฝะพ ะฟะพะดะฐะฒะฐะฝะต."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:481
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะพั‚ะฑะธั€ะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ั‡ะฐัั‚ะธั‡ะฝะพ ะฟะพะดะฐะฒะฐะฝะต."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:489
 msgid "cannot read the index"
 msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:508
 msgid "unable to write temporary index file"
 msgstr "ะฒั€ะตะผะตะฝะฝะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:606
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะทะฐ ะฐะฒั‚ะพั€ ะฒ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะปะธะฟัะฒะฐ"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:608
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะทะฐ ะฐะฒั‚ะพั€ ะฒ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ ะต ะฝะตะฟั€ะฐะฒะธะปะฝะฐ"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:627
 msgid "malformed --author parameter"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟะฐั€ะฐะผะตั‚ัŠั€ ะบัŠะผ ะพะฟั†ะธัั‚ะฐ โ€ž--authorโ€œ"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:680
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11821,38 +12839,38 @@ msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฑะตั€ะต ะทะฝะฐะบ ะทะฐ ะบะพะผะตะฝั‚ะฐั€ โ€” ะฒ ั‚ะตะบัƒั‰ะพั‚ะพ ััŠะพะฑั‰ะตะฝะธะต ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ัะฐ "
 "ะธะทะฟะพะปะทะฒะฐะฝะธ ะฒัะธั‡ะบะธ ะฟะพะดะพะฑะฝะธ ะทะฝะฐั†ะธ"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "ัะปะตะดะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ: %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะพั‚ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:732
 msgid "could not read log from standard input"
 msgstr "ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะฑะต ะฟั€ะพั‡ะตั‚ะตะฝะพ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:736
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ ััŠั ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:767 builtin/commit.c:783
 msgid "could not read SQUASH_MSG"
 msgstr "ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฒะบะฐั€ะฒะฐะฝะต SQUASH_MSG ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะพ"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:774
 msgid "could not read MERGE_MSG"
 msgstr "ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ัะปะธะฒะฐะฝะต MERGE_MSG ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะพ"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:834
 msgid "could not write commit template"
 msgstr "ัˆะฐะฑะปะพะฝัŠั‚ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝ"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:853
 #, c-format
 msgid ""
 "\n"
@@ -11867,7 +12885,7 @@ msgstr ""
 "    %s\n"
 "ะธ ะพะฟะธั‚ะฐะนั‚ะต ะพั‚ะฝะพะฒะพ.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:858
 #, c-format
 msgid ""
 "\n"
@@ -11883,7 +12901,7 @@ msgstr ""
 "    %s\n"
 "ะธ ะพะฟะธั‚ะฐะนั‚ะต ะพั‚ะฝะพะฒะพ.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:871
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11892,7 +12910,7 @@ msgstr ""
 "ะ’ัŠะฒะตะดะตั‚ะต ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต.  ะ ะตะดะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะทะฐะฟะพั‡ะฒะฐั‚\n"
 "ั โ€ž%cโ€œ, ั‰ะต ะฑัŠะดะฐั‚ ะฟั€ะพะฟัƒัะฝะฐั‚ะธ, ะฐ ะฟั€ะฐะทะฝะพ ััŠะพะฑั‰ะตะฝะธะต ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:879
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11903,151 +12921,147 @@ msgstr ""
 "ั โ€ž%cโ€œ, ััŠั‰ะพ ั‰ะต ะฑัŠะดะฐั‚ ะฒะบะปัŽั‡ะตะฝะธ โ€” ะผะพะถะต ะดะฐ ะณะธ ะธะทั‚ั€ะธะตั‚ะต ะฒะธะต.  ะŸั€ะฐะทะฝะพ \n"
 "ััŠะพะฑั‰ะตะฝะธะต ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:896
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sะะฒั‚ะพั€:   %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:904
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sะ”ะฐั‚ะฐ:    %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:911
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sะŸะพะดะฐะฒะฐั‰: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:929
 msgid "Cannot read index"
 msgstr "ะ˜ะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ะธะทะณั€ะฐะถะดะฐะฝะต ะฝะฐ ะดัŠั€ะฒะตั‚ะฐั‚ะฐ"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "ะŸะพะดะฐะนั‚ะต ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ั ะฝัะบะพั ะพั‚ ะพะฟั†ะธะธั‚ะต โ€ž-mโ€œ ะธะปะธ โ€ž-Fโ€œ.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "ะžะฟั†ะธัั‚ะฐ โ€ž--author '%s'โ€œ ะฝะต ะพั‚ะณะพะฒะฐั€ั ะฝะฐ ั„ะพั€ะผะฐฬ€ั‚ะฐ โ€žะ˜ะผะต <ะต-ะฟะพั‰ะฐ>โ€œ ะธ ะฝะต ััŠะฒะฟะฐะดะฐ ั "
 "ะฝะธะบะพะน ะฐะฒั‚ะพั€"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ั€ะตะถะธะผ ะทะฐ ะธะณะฝะพั€ะธั€ะฐะฝะธั‚ะต ั„ะฐะนะปะพะฒะต: โ€ž%sโ€œ"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1327
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ั€ะตะถะธะผ ะทะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต: โ€ž%sโ€œ"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--longโ€œ ะธ โ€ž-zโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ."
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--reset-authorโ€œ ะธ โ€ž--authorโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ."
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "ะัะผะฐ ะบะฐะบะฒะพ ะดะฐ ะฑัŠะดะต ะฟะพะฟั€ะฐะฒะตะฝะพ."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ัะต ะธะทะฒัŠั€ัˆะฒะฐ ัะปะธะฒะฐะฝะต, ะฝะต ะผะพะถะตั‚ะต ะดะฐ ะฟะพะฟั€ะฐะฒัั‚ะต."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ัะต ะธะทะฒัŠั€ัˆะฒะฐ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต, ะฝะต ะผะพะถะตั‚ะต ะดะฐ ะฟะพะฟั€ะฐะฒัั‚ะต."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1188
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--squashโ€œ ะธ โ€ž--fixupโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ."
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1198
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž-cโ€œ, โ€ž-Cโ€œ, โ€ž-Fโ€œ ะธ โ€ž--fixupโ€œโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1200
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž-mโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž-cโ€œ, โ€ž-Cโ€œ ะธ โ€ž-Fโ€œ."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1208
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "ะžะฟั†ะธัั‚ะฐ โ€ž--reset-authorโ€œ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะทะฐะตะดะฝะพ ั โ€ž-Cโ€œ, โ€ž-cโ€œ ะธะปะธ\n"
 "โ€ž--amendโ€œ."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1225
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "ะžะฟั†ะธะธั‚ะต โ€ž--includeโ€œ, โ€ž--onlyโ€œ, โ€ž--allโ€œ, โ€ž--interactiveโ€œ ะธ โ€ž--patchโ€œ ัะฐ\n"
 "ะฝะตััŠะฒะผะตัั‚ะธะผะธ."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--includeโ€œ ะธ โ€ž--onlyโ€œ ะธะทะธัะบะฒะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ะธ."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1231
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž-aโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ััŠั ะทะฐะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟัŠั‚ะธั‰ะฐ: โ€ž%sโ€ฆโ€œ"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1362 builtin/commit.c:1524
 msgid "show status concisely"
 msgstr "ะบั€ะฐั‚ะบะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1364 builtin/commit.c:1526
 msgid "show branch information"
 msgstr "ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะบะปะพะฝะธั‚ะต"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1366
 msgid "show stash information"
 msgstr "ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ัะบะฐั‚ะฐะฝะพั‚ะพ"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1368 builtin/commit.c:1528
 msgid "compute full ahead/behind values"
 msgstr "ะธะทั‡ะธัะปัะฒะฐะฝะต ะฝะฐ ั‚ะพั‡ะฝะธั‚ะต ัั‚ะพะนะฝะพัั‚ะธ ะฝะฐะฟั€ะตะด/ะฝะฐะทะฐะด"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1370
 msgid "version"
 msgstr "ะฒะตั€ัะธั"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
 msgid "machine-readable output"
 msgstr "ั„ะพั€ะผะฐั‚ ะฝะฐ ะธะทั…ะพะดะฐ ะทะฐ ั‡ะตั‚ะตะฝะต ะพั‚ ะฟั€ะพะณั€ะฐะผะฐ"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1373 builtin/commit.c:1532
 msgid "show status in long format (default)"
 msgstr "ะฟะพะดั€ะพะฑะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1376 builtin/commit.c:1535
 msgid "terminate entries with NUL"
 msgstr "ั€ะฐะทะดะตะปัะฝะต ะฝะฐ ะตะปะตะผะตะฝั‚ะธั‚ะต ั ะฝัƒะปะตะฒะธั ะทะฝะฐะบ โ€žNULโ€œ"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
 msgid "mode"
 msgstr "ะ ะ•ะ–ะ˜ะœ"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1379 builtin/commit.c:1538
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต.  ะ’ัŠะทะผะพะถะฝะธั‚ะต ะ ะ•ะ–ะ˜ะœะธ ัะฐ โ€žallโ€œ (ะฟะพะดั€ะพะฑะฝะฐ "
 "ะธะฝั„ะพั€ะผะฐั†ะธั), โ€žnormalโ€œ (ะบั€ะฐั‚ะบะฐ ะธะฝั„ะพั€ะผะฐั†ะธั), โ€žnoโ€œ (ะฑะตะท ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต).  "
 "ะกั‚ะฐะฝะดะฐั€ั‚ะฝะธัั‚ ะ ะ•ะ–ะ˜ะœ ะต: โ€žallโ€œ."
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1383
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -12056,11 +13070,11 @@ msgstr ""
 "โ€žtraditionalโ€œ (ั‚ั€ะฐะดะธั†ะธะพะฝะตะฝ), โ€žmatchingโ€œ (ะฝะฐะฟะฐัะฒะฐั‰ะธ), โ€žnoโ€œ (ะฑะตะท ะธะณะฝะพั€ะธั€ะฐะฝะธั‚ะต "
 "ั„ะฐะนะปะพะฒะต).  ะกั‚ะฐะฝะดะฐั€ั‚ะฝะธัั‚ ะ ะ•ะ–ะ˜ะœ ะต: โ€žtraditionalโ€œ."
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1385 parse-options.h:192
 msgid "when"
 msgstr "ะšะžะ“ะ"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1386
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -12069,176 +13083,176 @@ msgstr ""
 "ะตะดะฝะฐ ะพั‚ โ€žallโ€œ (ะฒัะธั‡ะบะธ), โ€ždirtyโ€œ (ั‚ะตะทะธ ั ะฝะตะฟะพะดะฐะดะตะฝะธ ะฟั€ะพะผะตะฝะธ), "
 "โ€žuntrackedโ€œ (ะฝะตัะปะตะดะตะฝะธ)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1388
 msgid "list untracked files in columns"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฒ ะบะพะปะพะฝะธ"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1389
 msgid "do not detect renames"
 msgstr "ะฑะตะท ะทะฐัะธั‡ะฐะฝะต ะฝะฐ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธัั‚ะฐ"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1391
 msgid "detect renames, optionally set similarity index"
 msgstr "ะทะฐัะธั‡ะฐะฝะต ะฝะฐ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะธัั‚ะฐ, ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะบะพะตั„ะธั†ะธะตะฝั‚ ะฝะฐ ะฟั€ะธะปะธะบะฐ"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1411
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "ะะตะฟะพะดะดัŠั€ะถะฐะฝะฐ ะบะพะผะฑะธะฝะฐั†ะธั ะพั‚ ะฐั€ะณัƒะผะตะฝั‚ะธ ะทะฐ ะธะณะฝะพั€ะธั€ะฐะฝะธ ะธ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "suppress summary after successful commit"
 msgstr "ะฑะตะท ะธะฝั„ะพั€ะผะฐั†ะธั ัะปะตะด ัƒัะฟะตัˆะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1495
 msgid "show diff in commit message template"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั€ะฐะทะปะธะบะฐั‚ะฐ ะบัŠะผ ัˆะฐะฑะปะพะฝะฐ ะทะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1497
 msgid "Commit message options"
 msgstr "ะžะฟั†ะธะธ ะทะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
 msgid "read message from file"
 msgstr "ะฒะทะธะผะฐะฝะต ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะพั‚ ะคะะ™ะ›"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "author"
 msgstr "ะะ’ะขะžะ "
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "override author for commit"
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะะ’ะขะžะ  ะทะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1500 builtin/gc.c:538
 msgid "date"
 msgstr "ะ”ะะขะ"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1500
 msgid "override date for commit"
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะ”ะะขะ ะทะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "ะŸะžะ”ะะ’ะะะ•"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1502
 msgid "reuse and edit message from specified commit"
 msgstr "ะฟั€ะตะธะทะฟะพะปะทะฒะฐะฝะต ะธ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะพั‚ ัƒะบะฐะทะฐะฝะพั‚ะพ ะŸะžะ”ะะ’ะะะ•"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1503
 msgid "reuse message from specified commit"
 msgstr "ะฟั€ะตะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะพั‚ ัƒะบะฐะทะฐะฝะพั‚ะพ ะŸะžะ”ะะ’ะะะ•"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1504
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพั‚ะพ ััŠะพะฑั‰ะตะฝะธะต ะทะฐ ะฒะบะฐั€ะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐะฝะพั‚ะพ ะŸะžะ”ะะ’ะะะ• ะฒ "
 "ะฟั€ะตะดั…ะพะดะฝะพั‚ะพ ะฑะตะท ัะปะตะดะฐ"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1505
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพั‚ะพ ััŠะพะฑั‰ะตะฝะธะต ะทะฐ ะฒะบะฐั€ะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐะฝะพั‚ะพ ะŸะžะ”ะะ’ะะะ• ะฒ "
 "ะฟั€ะตะดะฝะพั‚ะพ"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1506
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "ัะผัะฝะฐ ะฝะฐ ะฐะฒั‚ะพั€ะฐ ะดะฐ ััŠะฒะฟะฐะดะฐ ั ะฟะพะดะฐะฒะฐั‰ะธั (ะธะทะฟะพะปะทะฒะฐ ัะต ั โ€ž-Cโ€œ/โ€ž-cโ€œ/โ€ž--amendโ€œ)"
 
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะพะปะต ะทะฐ ะฟะพะดะฟะธั โ€” โ€žSigned-off-by:โ€œ"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1508
 msgid "use specified template file"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐะฝะธั ัˆะฐะฑะปะพะฝะตะฝ ะคะะ™ะ›"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1509
 msgid "force edit of commit"
 msgstr "ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1511
 msgid "include status in commit message template"
 msgstr "ะฒะผัŠะบะฒะฐะฝะต ะฝะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฒ ัˆะฐะฑะปะพะฝะฐ ะทะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1516
 msgid "Commit contents options"
 msgstr "ะžะฟั†ะธะธ ะทะฐ ะธะทะฑะพั€ ะฝะฐ ั„ะฐะนะปะพะฒะต ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1517
 msgid "commit all changed files"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะฟั€ะพะผะตะฝะตะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1518
 msgid "add specified files to index for commit"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัƒะบะฐะทะฐะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะบัŠะผ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1519
 msgid "interactively add files"
 msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1520
 msgid "interactively add changes"
 msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธ"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1521
 msgid "commit only specified files"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ัƒะบะฐะทะฐะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1522
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 "ะฑะตะท ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบัƒะบะธั‚ะต ะฟั€ะตะดะธ ะฟะพะดะฐะฒะฐะฝะต ะธ ะฟั€ะธ ะฟั€ะพะผัะฝะฐ ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ "
 "ะฟะพะดะฐะฒะฐะฝะต (pre-commit ะธ commit-msg)"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1523
 msgid "show what would be committed"
 msgstr "ะพั‚ะฟะตั‡ะฐั‚ะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ, ะบะพะตั‚ะพ ะฑะธ ะฑะธะปะพ ะฟะพะดะฐะดะตะฝะพ"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1536
 msgid "amend previous commit"
 msgstr "ะฟะพะฟั€ะฐะฒัะฝะต ะฝะฐ ะฟั€ะตะดะธัˆะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1537
 msgid "bypass post-rewrite hook"
 msgstr "ะฑะตะท ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบัƒะบะฐั‚ะฐ ัะปะตะด ะฟั€ะตะทะฐะฟะธัะฒะฐะฝะต (post-rewrite)"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1544
 msgid "ok to record an empty change"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟั€ะฐะทะฝะธ ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1546
 msgid "ok to record a change with an empty message"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ั ะฟั€ะฐะทะฝะธ ััŠะพะฑั‰ะตะฝะธั"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1619
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "ะŸะพะฒั€ะตะดะตะฝ ั„ะฐะนะป ะทะฐ ะฒัŠั€ั…ะฐ ะทะฐ ัะปะธะฒะฐะฝะตั‚ะพ โ€žMERGE_HEADโ€œ (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
 msgid "could not read MERGE_MODE"
 msgstr "ั€ะตะถะธะผัŠั‚ ะฝะฐ ัะปะธะฒะฐะฝะต โ€žMERGE_MODEโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1645
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะพ: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "ะะตะธะทะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฟะพั€ะฐะดะธ ะฟั€ะฐะทะฝะพ ััŠะพะฑั‰ะตะฝะธะต.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "ะะตะธะทะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฟะพั€ะฐะดะธ ะฝะตั€ะตะดะฐะบั‚ะธั€ะฐะฝะพ ััŠะพะฑั‰ะตะฝะธะต.\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1691
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -12250,80 +13264,79 @@ msgstr ""
 "\n"
 "    git restore --staged :/"
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir ะ”ะ˜ะ _ะžะ‘ะ•ะšะขะ˜]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir ะ”ะ˜ะ _ะžะ‘ะ•ะšะขะ˜]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-msgstr "git commit-graph verify [--object-dir ะ”ะ˜ะ _ะžะ‘ะ•ะšะขะ˜] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir ะ”ะ˜ะ _ะžะ‘ะ•ะšะขะ˜] [--shallow] [--"
+"[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
 msgstr ""
 "git commit-graph write [--object-dir ะ”ะ˜ะ _ะžะ‘ะ•ะšะขะ˜] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] ะžะŸะฆะ˜ะ˜_ะ—ะ_ะ ะะ—ะ”ะ•ะ›ะฏะะ•"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] ะžะŸะฆะ˜ะ˜_ะ—ะ_ะ ะะ—ะ”ะ•ะ›ะฏะะ•"
+
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ั ะพะฑะตะบั‚ะธ, ะบะพัั‚ะพ ะพั‚ะณะพะฒะฐั€ั ะฝะฐ โ€ž%sโ€œ, ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะฐ"
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
 msgid "The object directory to store the graph"
 msgstr "ะ”ะ˜ะ ะตะบั‚ะพั€ะธัั‚ะฐ_ั_ะžะ‘ะ•ะšะขะ˜ ะทะฐ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะณั€ะฐฬ€ั„ะฐ"
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:71
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 "ะฐะบะพ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะต ั€ะฐะทะดั€ะพะฑะตะฝ, ะดะฐ ัะต ะฟั€ะพะฒะตั€ัะฒะฐ ัะฐะผะพ ั„ะฐะนะปัŠั‚ ะฝะฐ ะฒัŠั€ั…ะฐ"
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "ะ“ั€ะฐั„ัŠั‚ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฒะพั€ะธ: โ€ž%sโ€œ"
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:128
 msgid "start walk at all refs"
 msgstr "ะพะฑั…ะพะถะดะฐะฝะตั‚ะพ ะดะฐ ะทะฐะฟะพั‡ะฝะต ะพั‚ ะฒัะธั‡ะบะธ ัƒะบะฐะทะฐั‚ะตะปะธ"
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:130
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 "ะฟั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะทะฐ ะธะฝะดะตะบัะธั‚ะต ะฝะฐ ะฟะฐะบะตั‚ะธั‚ะต ะธะทะฑั€ะพะตะฝะธ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ั€ะตะด"
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:132
 msgid "start walk at commits listed by stdin"
 msgstr "ะทะฐะฟะพั‡ะฒะฐะฝะต ะฝะฐ ะพะฑั…ะพะถะดะฐะฝะตั‚ะพ ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฟะพะดะฐะดะตะฝะธ ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:134
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 "ะฒะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะฟะพะดะฐะฒะฐะฝะธั, ะบะพะธั‚ะพ ะฒะตั‡ะต ัะฐ ะฒัŠะฒ ั„ะฐะนะปะฐ ั ะณั€ะฐฬ€ั„ะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:137
 msgid "allow writing an incremental commit-graph file"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะทะฐะฟะธั ะฝะฐ ะฝะฐั€ะฐัั‚ะฒะฐั‰ ั„ะฐะนะป ั ะณั€ะฐฬ€ั„ะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "ะผะฐะบัะธะผะฐะปะตะฝ ะฑั€ะพะน ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะฝะตะฑะฐะทะพะฒะพ ะฝะธะฒะพ ะฝะฐ ั€ะฐะทะดั€ะพะฑะตะฝ ะณั€ะฐั„"
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:141
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 "ะผะฐะบัะธะผะฐะปะฝะพ ะพั‚ะฝะพัˆะตะฝะธะต ะฝะฐ ะฑั€ะพั ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะดะฒะต ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะธ ะฝะธะฒะฐ ะฒ ั€ะฐะทะดั€ะพะฑะตะฝ "
 "ะณั€ะฐั„"
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:159
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 "ะพะฟั†ะธะธั‚ะต โ€ž--reachableโ€œ, โ€ž--stdin-commitsโ€œ ะธ โ€ž--stdin-packsโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
@@ -12332,212 +13345,219 @@ msgstr ""
 msgid "git config [<options>]"
 msgstr "git config [ะžะŸะฆะ˜ะฏโ€ฆ]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฐั€ะณัƒะผะตะฝั‚ โ€ž--typeโ€œ: %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:116
 msgid "only one type at a time"
 msgstr "ัะฐะผะพ ะฟะพ ะตะดะธะฝ ะฒะธะด"
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr "ะœะตัั‚ะพะฟะพะปะพะถะตะฝะธะต ะฝะฐ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธั ั„ะฐะนะป"
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะณะปะพะฑะฐะปะฝะธั ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะตะฝ ั„ะฐะนะป"
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะธัั‚ะตะผะฝะธั ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะตะฝ ั„ะฐะนะป"
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธั ั„ะฐะนะป ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ"
 
-#: builtin/config.c:128
+#: builtin/config.c:129
 msgid "use per-worktree config file"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธั ั„ะฐะนะป ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะบะพะฟะธะต"
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะทะฐะดะฐะดะตะฝะธั ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะตะฝ ะคะะ™ะ›"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr "ะ˜ะ”ะ•ะะขะ˜ะคะ˜ะšะะขะžะ "
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr ""
 "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธัั‚ะฐ ะพั‚ BLOB ั ั‚ะพะทะธ ะ˜ะ”ะ•ะะขะ˜ะคะ˜ะšะะขะžะ  ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ"
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr "ะ”ะตะนัั‚ะฒะธะต"
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะพะนะฝะพัั‚: ะ˜ะœะ• [ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ—_ะ—ะ_ะกะขะžะ™ะะžะกะขะขะ]"
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ัั‚ะพะนะฝะพัั‚ะธ: ะบะปัŽั‡ [ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ—_ะ—ะ_ะกะขะžะ™ะะžะกะขะขะ]"
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะพะนะฝะพัั‚ะธั‚ะต ะทะฐ ะ ะ•ะ“ะฃะ›ะฏะ ะะธั_ะ˜ะ—ะ ะะ—: ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ—_ะ—ะ_ะ˜ะœะ•ะขะž "
 "[ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ—_ะ—ะ_ะกะขะžะ™ะะžะกะขะขะ]"
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะทะฐ ัƒะบะฐะทะฐะฝะธั ะฐะดั€ะตั: ะ ะะ—ะ”ะ•ะ›[.ะŸะ ะžะœะ•ะะ›ะ˜ะ’ะ] ะะ”ะ ะ•ะก"
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 "ะทะฐะผัะฝะฐ ะฝะฐ ะฒัะธั‡ะบะธ ััŠะฒะฟะฐะดะฐั‰ะธ ะฟั€ะพะผะตะฝะปะธะฒะธ: ะ˜ะœะ• ะกะขะžะ™ะะžะกะข "
 "[ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ—_ะ—ะ_ะกะขะžะ™ะะžะกะขะขะ]"
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะพะฒะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐ: ะ˜ะœะ• ะกะขะžะ™ะะžะกะข"
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐ: ะ˜ะœะ• [ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ—_ะ—ะ_ะกะขะžะ™ะะžะกะขะขะ]"
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ััŠะฒะฟะฐะดะฐั‰ะธ: ะ˜ะœะ• [ะ ะ•ะ“ะฃะ›ะฏะ ะ•ะ_ะ˜ะ—ะ ะะ—_ะ—ะ_ะกะขะžะ™ะะžะกะขะขะ]"
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr "ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ ั€ะฐะทะดะตะป: ะกะขะะ ะž_ะ˜ะœะ• ะะžะ’ะž_ะ˜ะœะ•"
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ั€ะฐะทะดะตะป: ะ˜ะœะ•"
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr "ะธะทะฑั€ะพัะฒะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ"
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr "ะพั‚ะฒะฐั€ัะฝะต ะฝะฐ ั€ะตะดะฐะบั‚ะพั€"
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะทะฐะดะฐะดะตะฝะธั ั†ะฒัั‚: ะฝะพะผะตั€ [ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ]"
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะทะฐะดะฐะดะตะฝะธั ั†ะฒัั‚: ะฝะพะผะตั€ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะธัั‚ ะธะทั…ะพะด ะต ั‚ะตั€ะผะธะฝะฐะป)"
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr "ะ’ะธะด"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
 msgid "value is given this type"
 msgstr "ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะต ะพั‚ ั‚ะพะทะธ ะฒะธะด"
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr "ะกะขะžะ™ะะžะกะขะขะ ะต โ€žtrueโ€œ (ะธัั‚ะธะฝะฐ) ะธะปะธ โ€žfalseโ€œ (ะปัŠะถะฐ)"
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr "ะกะขะžะ™ะะžะกะขะขะ ะต ั†ัะปะพ, ะดะตัะตั‚ะธั‡ะฝะพ ั‡ะธัะปะพ"
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr "ะกะขะžะ™ะะžะกะขะขะ ะต โ€ž--boolโ€œ (ะฑัƒะปะตะฒะฐ) ะธะปะธ โ€ž--intโ€œ (ะดะตัะตั‚ะธั‡ะฝะพ ั†ัะปะพ ั‡ะธัะปะพ)"
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr "ะกะขะžะ™ะะžะกะขะขะ ะต ะฟัŠั‚ (ะดะพ ั„ะฐะนะป ะธะปะธ ะดะธั€ะตะบั‚ะพั€ะธั)"
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr "ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะต ะฟะตั€ะธะพะด ะฝะฐ ะฒะฐะปะธะดะฝะพัั‚/ะทะฐะฟะฐะทะฒะฐะฝะต"
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr "ะ”ั€ัƒะณะธ"
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr "ั€ะฐะทะดะตะปัะฝะต ะฝะฐ ัั‚ะพะนะฝะพัั‚ะธั‚ะต ั ะฝัƒะปะตะฒะธั ะทะฝะฐะบ โ€žNULโ€œ"
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะพะผะตะฝะปะธะฒะธั‚ะต"
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr "ะฟั€ะธ ั‚ัŠั€ัะตะฝะต ะดะฐ ัะต ัƒะฒะฐะถะฐั‚ ะธ ะดะธั€ะตะบั‚ะธะฒะธั‚ะต ะทะฐ ะฒะบะปัŽั‡ะฒะฐะฝะต"
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะผััั‚ะพั‚ะพ ะฝะฐ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ (ั„ะฐะนะป, ัั‚ะฐะฝะดะฐั€ั‚ะตะฝ ะฒั…ะพะด, "
 "ะพะฑะตะบั‚-BLOB, ะบะพะผะฐะฝะดะตะฝ ั€ะตะด)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะพะฑั…ะฒะฐั‚ะฐ ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žworktreeโ€œ (ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ), "
+"โ€žlocalโ€œ (ั…ั€ะฐะฝะธะปะธั‰ะต), โ€žglobalโ€œ (ะฟะพั‚ั€ะตะฑะธั‚ะตะป), โ€žsystemโ€œ (ัะธัั‚ะตะผะฐ), "
+"โ€žcommandโ€œ (ะบะพะผะฐะฝะดะฐ)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
 msgid "value"
 msgstr "ะกะขะžะ™ะะžะกะข"
 
-#: builtin/config.c:158
+#: builtin/config.c:160
 msgid "with --get, use default value when missing entry"
 msgstr "ั โ€ž--getโ€œ ัะต ะธะทะฟะพะปะทะฒะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะฐ ะกะขะžะ™ะะžะกะข ะฟั€ะธ ะปะธะฟัะฒะฐั‰ะฐ"
 
-#: builtin/config.c:172
+#: builtin/config.c:174
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฑั€ะพะน ะฐั€ะณัƒะผะตะฝั‚ะธ, ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ั‚ะพั‡ะฝะพ %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:176
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฑั€ะพะน ะฐั€ะณัƒะผะตะฝั‚ะธ, ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ะพั‚ %d ะดะพ %d ะฒะบะปัŽั‡ะธั‚ะตะปะฝะพ"
 
-#: builtin/config.c:308
+#: builtin/config.c:324
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัˆะฐะฑะปะพะฝ ะทะฐ ะบะปัŽั‡: โ€ž%sโ€œ"
 
-#: builtin/config.c:344
+#: builtin/config.c:360
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั„ะพั€ะผะฐั‚ะธั€ะฐะฝะต ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐ: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:417
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ ะบะฐั‚ะพ ั†ะฒัั‚"
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr "ะฝะตั€ะฐะทะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ั†ะฒัั‚"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
 msgid "not in a git directory"
 msgstr "ะฝะต ะต ะฒ ะดะธั€ะตะบั‚ะพั€ะธั ะฟะพะด Git"
 
-#: builtin/config.c:499
+#: builtin/config.c:515
 msgid "writing to stdin is not supported"
 msgstr "ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ะทะฐะฟะธัะฒะฐะฝะต ะฒ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/config.c:502
+#: builtin/config.c:518
 msgid "writing config blobs is not supported"
 msgstr "ะพะฑะตะบั‚ะธ-BLOB ะฒ ะฝะฐัั‚ั€ะพะนะบะธั‚ะต ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐั‚"
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12552,23 +13572,23 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:627
 msgid "only one config file at a time"
 msgstr "ัะฐะผะพ ะฟะพ ะตะดะธะฝ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะตะฝ ั„ะฐะนะป"
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr "โ€ž--localโ€œ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะฒ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/config.c:619
+#: builtin/config.c:635
 msgid "--blob can only be used inside a git repository"
 msgstr "โ€ž--blobโ€œ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะฒ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/config.c:638
+#: builtin/config.c:655
 msgid "$HOME not set"
 msgstr "ะฟั€ะพะผะตะฝะปะธะฒะฐั‚ะฐ โ€žHOMEโ€œ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ"
 
-#: builtin/config.c:658
+#: builtin/config.c:679
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12579,20 +13599,20 @@ msgstr ""
 "ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะฒะธะถั‚ะต ั€ะฐะทะดะตะปะฐ โ€žCONFIGURATION FILEโ€œ ะฒ\n"
 "โ€žgit help worktreeโ€œ"
 
-#: builtin/config.c:688
+#: builtin/config.c:714
 msgid "--get-color and variable type are incoherent"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--get-colorโ€œ ะฝะต ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐ ะฝะฐ ะฒะธะดะฐ ะฝะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐั‚ะฐ"
 
-#: builtin/config.c:693
+#: builtin/config.c:719
 msgid "only one action at a time"
 msgstr "ัะฐะผะพ ะฟะพ ะตะดะฝะพ ะดะตะนัั‚ะฒะธะต"
 
-#: builtin/config.c:706
+#: builtin/config.c:732
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--name-onlyโ€œ ะต ะฟั€ะธะปะพะถะธะผะฐ ัะฐะผะพ ะบัŠะผ ะพะฟั†ะธะธั‚ะต โ€ž--listโ€œ ะธ โ€ž--get-regexpโ€œ"
 
-#: builtin/config.c:712
+#: builtin/config.c:738
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -12600,33 +13620,33 @@ msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--show-originโ€œ ะต ะฟั€ะธะปะพะถะธะผะฐ ัะฐะผะพ ะบัŠะผ ะพะฟั†ะธะธั‚ะต โ€ž--getโ€œ, โ€ž--get-allโ€œ, "
 "โ€ž--get-regexpโ€œ ะธ โ€ž--listโ€œ"
 
-#: builtin/config.c:718
+#: builtin/config.c:744
 msgid "--default is only applicable to --get"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--defaultโ€œ ะต ะฟั€ะธะปะพะถะธะผะฐ ัะฐะผะพ ะบัŠะผ ะพะฟั†ะธัั‚ะฐ โ€ž--getโ€œ"
 
-#: builtin/config.c:731
+#: builtin/config.c:757
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/config.c:734
+#: builtin/config.c:760
 msgid "error processing config file(s)"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะพะฑั€ะฐะฑะพั‚ะบะฐั‚ะฐ ะฝะฐ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะตะฝ ั„ะฐะนะป"
 
-#: builtin/config.c:744
+#: builtin/config.c:770
 msgid "editing stdin is not supported"
 msgstr "ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/config.c:746
+#: builtin/config.c:772
 msgid "editing blobs is not supported"
 msgstr "ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธ-BLOB"
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝ"
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12636,7 +13656,7 @@ msgstr ""
 "ะ—ะฐ ะดะฐ ะฟั€ะพะผะตะฝะธั‚ะต โ€ž%sโ€œ, ะฟะพะปะทะฒะฐะนั‚ะต ั€ะตะณัƒะปัั€ะตะฝ ะธะทั€ะฐะท ะธะปะธ ะพะฟั†ะธะธั‚ะต โ€ž--addโ€œ ะธ โ€ž--"
 "replace-allโ€œ."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
 #, c-format
 msgid "no such section: %s"
 msgstr "ั‚ะฐะบัŠะฒ ั€ะฐะทะทะตะป ะฝัะผะฐ: %s"
@@ -12649,57 +13669,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั€ะฐะทะผะตั€ะธั‚ะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะฒัŠะฒ ั„ะพั€ะผะฐั‚ ะปะตัะฝะพ ั‡ะตั‚ะธะผ ะพั‚ ั…ะพั€ะฐ"
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [ะžะŸะฆะ˜ะฏโ€ฆ] [ะฃะšะะ—ะะขะ•ะ›_ะšะชะœ_ะŸะžะ”ะะ’ะะะ•โ€ฆ]"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [ะžะŸะฆะ˜ะฏโ€ฆ] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr "ะพัะฝะพะฒะฝะพ"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr "ะบั€ะฐั‚ะบะพ"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr "ะฐะฝะพั‚ะธั€ะฐะฝะพ"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฐะฝะพั‚ะธั€ะฐะฝ ะตั‚ะธะบะตั‚ โ€ž%sโ€œ"
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "ะฒ ะฐะฝะพั‚ะธั€ะฐะฝะธั ะตั‚ะธะบะตั‚ โ€ž%sโ€œ ะปะธะฟัะฒะฐ ะฒะณั€ะฐะดะตะฝะพ ะธะผะต"
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "ะตั‚ะธะบะตั‚ัŠั‚ โ€ž%sโ€œ ั‚ัƒะบ ะต ะฒััŠั‰ะฝะพัั‚ โ€ž%sโ€œ"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "ะฝะธะบะพะน ะตั‚ะธะบะตั‚ ะฝะต ะฝะฐะฟะฐัะฒะฐ ั‚ะพั‡ะฝะพ โ€ž%sโ€œ"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "ะะธะบะพั ะฒะตั€ัะธั ะธ ะตั‚ะธะบะตั‚ ะฝะต ะฝะฐะฟะฐัะฒะฐั‚ ั‚ะพั‡ะฝะพ.  ะขัŠั€ัะธ ัะต ะฟะพ ะพะฟะธัะฐะฝะธะต\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:394
 #, c-format
 msgid "finished search at %s\n"
 msgstr "ั‚ัŠั€ัะตะฝะตั‚ะพ ะฟั€ะธะบะปัŽั‡ะธ ะฟั€ะธ โ€ž%sโ€œ\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:421
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12708,7 +13728,7 @@ msgstr ""
 "ะะธะบะพะน ะฐะฝะพั‚ะธั€ะฐะฝ ะตั‚ะธะบะตั‚ ะฝะต ะพะฟะธัะฒะฐ โ€ž%sโ€œ.\n"
 "ะกัŠั‰ะตัั‚ะฒัƒะฒะฐั‚ ะธ ะฝะตะฐะฝะพั‚ะธั€ะฐะฝะธ ะตั‚ะธะบะตั‚ะธ.  ะŸั€ะพะฑะฒะฐะนั‚ะต ั ะพะฟั†ะธัั‚ะฐ โ€ž--tagsโ€œ."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:425
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12717,12 +13737,12 @@ msgstr ""
 "ะะธะบะพะน ะตั‚ะธะบะตั‚ ะฝะต ะพะฟะธัะฒะฐ โ€ž%sโ€œ.\n"
 "ะŸั€ะพะฑะฒะฐะนั‚ะต ั ะพะฟั†ะธัั‚ะฐ โ€ž--alwaysโ€œ ะธะปะธ ััŠะทะดะฐะนั‚ะต ะตั‚ะธะบะตั‚ะธ."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:455
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "ะฟั€ะตั‚ัŠั€ัะตะฝะธ ัะฐ %lu ะฟะพะดะฐะฒะฐะฝะธั\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:458
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12731,93 +13751,93 @@ msgstr ""
 "ะพั‚ะบั€ะธั‚ะธ ัะฐ ะฝะฐะด %i ะตั‚ะธะบะตั‚ะฐ, ะธะทะฒะตะดะตะฝะธ ัะฐ ะฟะพัะปะตะดะฝะธั‚ะต %i,\n"
 "ั‚ัŠั€ัะตะฝะตั‚ะพ ะฑะต ะฟั€ะตะบั€ะฐั‚ะตะฝะพ ะฟั€ะธ โ€ž%sโ€œ.\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:526
 #, c-format
 msgid "describe %s\n"
 msgstr "ะพะฟะธัะฐะฝะธะต ะฝะฐ โ€ž%sโ€œ\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:529
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚ โ€ž%sโ€œ"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:537
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ะฝะธั‚ะพ ะฟะพะดะฐะฒะฐะฝะต, ะฝะธั‚ะพ ะพะฑะตะบั‚-BLOB"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:551
 msgid "find the tag that comes after the commit"
 msgstr "ะพั‚ะบั€ะธะฒะฐะฝะต ะฝะฐ ะตั‚ะธะบะตั‚ะฐ, ะบะพะนั‚ะพ ัะปะตะดะฒะฐ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:552
 msgid "debug search strategy on stderr"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ั‚ั€ะฐัะธั€ะฐะฝะต ะฝะฐ ัั‚ั€ะฐั‚ะตะณะธัั‚ะฐ ะทะฐ ั‚ัŠั€ัะตะฝะต ะฝะฐ "
 "ัั‚ะฐะฝะดะฐั€ั‚ะฝะฐั‚ะฐ ะณั€ะตัˆะบะฐ"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:553
 msgid "use any ref"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟั€ะพะธะทะฒะพะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:554
 msgid "use any tag, even unannotated"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฒัะตะบะธ ะตั‚ะธะบะตั‚ โ€” ะฒะบะปัŽั‡ะธั‚ะตะปะฝะพ ะธ ะฝะตะฐะฝะพั‚ะธั€ะฐะฝะธั‚ะต"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:555
 msgid "always use long format"
 msgstr "ะฒะธะฝะฐะณะธ ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะดัŠะปะณะธัั‚ ั„ะพั€ะผะฐั‚"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:556
 msgid "only follow first parent"
 msgstr "ะฟั€ะพัะปะตะดัะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ะฟัŠั€ะฒะธั ั€ะพะดะธั‚ะตะป"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:559
 msgid "only output exact matches"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ั‚ะพั‡ะฝะธั‚ะต ััŠะฒะฟะฐะดะตะฝะธั"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:561
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "ะดะฐ ัะต ั‚ัŠั€ัะธ ัะฐะผะพ ะฒ ั‚ะพะทะธ ะ‘ะ ะžะ™ ะฟะพัะปะตะดะฝะธ ะตั‚ะธะบะตั‚ะธ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ: 10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:563
 msgid "only consider tags matching <pattern>"
 msgstr "ะดะฐ ัะต ั‚ัŠั€ัะธ ัะฐะผะพ ะธะทะผะตะถะดัƒ ะตั‚ะธะบะตั‚ะธั‚ะต ะฝะฐะฟะฐัะฒะฐั‰ะธ ั‚ะพะทะธ ะจะะ‘ะ›ะžะ"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:565
 msgid "do not consider tags matching <pattern>"
 msgstr "ะดะฐ ะฝะต ัะต ั‚ัŠั€ัะธ ะธะทะผะตะถะดัƒ ะตั‚ะธะบะตั‚ะธั‚ะต ะฝะฐะฟะฐัะฒะฐั‰ะธ ั‚ะพะทะธ ะจะะ‘ะ›ะžะ"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:567 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััŠะบั€ะฐั‚ะตะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚ ะบะฐั‚ะพ ั€ะตะทะตั€ะฒะตะฝ ะฒะฐั€ะธะฐะฝั‚"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:568 builtin/describe.c:571
 msgid "mark"
 msgstr "ะœะะ ะšะ•ะ "
 
-#: builtin/describe.c:553
+#: builtin/describe.c:569
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะฐะบัŠะฒ ะœะะ ะšะ•ะ  ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะต โ€ž-dirtyโ€œ)"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:572
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะฐะบัŠะฒ ะœะะ ะšะ•ะ  ะฝะฐ ัั‡ัƒะฟะตะฝะพั‚ะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะต โ€ž-brokenโ€œ)"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:590
 msgid "--long is incompatible with --abbrev=0"
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--longโ€œ ะธ โ€ž--abbrev=0โ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/describe.c:603
+#: builtin/describe.c:619
 msgid "No names found, cannot describe anything."
 msgstr "ะะต ัะฐ ะพั‚ะบั€ะธั‚ะธ ะธะผะตะฝะฐ โ€” ะฝะธั‰ะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฟะธัะฐะฝะพ."
 
-#: builtin/describe.c:654
+#: builtin/describe.c:670
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--dirtyโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ัƒะบะฐะทะฐั‚ะตะป ะบัŠะผ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:672
 msgid "--broken is incompatible with commit-ishes"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--brokenโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ัƒะบะฐะทะฐั‚ะตะป ะบัŠะผ ะฟะพะดะฐะฒะฐะฝะต"
 
@@ -12854,27 +13874,27 @@ msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฝะตะฟะพะดะดัŠั€ะถะฐะฝ ะพะฑะตะบั‚ โ€ž%sโ€œ."
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [ะžะŸะฆะ˜ะฏโ€ฆ] [ะŸะžะ”ะะ’ะะะ• [ะŸะžะ”ะะ’ะะะ•]] [[--] ะŸะชะขโ€ฆ]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะดะตะนัั‚ะฒะธะต ั ะธะทั…ะพะดะตะฝ ะบะพะด: %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "ัะธะผะฒะพะปะฝะฐั‚ะฐ ะฒั€ัŠะทะบะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะฐ"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "ั„ะฐะนะปัŠั‚, ัะพั‡ะตะฝ ะพั‚ ัะธะผะฒะพะปะฝะฐั‚ะฐ ะฒั€ัŠะทะบะฐ โ€ž%sโ€œ, ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะทะฐ ัะธะผะฒะพะปะฝะฐั‚ะฐ ะฒั€ัŠะทะบะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -12882,55 +13902,55 @@ msgstr ""
 "ะบะพะผะฑะธะฝะธั€ะฐะฝะธั‚ะต ั„ะพั€ะผะฐั‚ะธ ะฝะฐ ั€ะฐะทะปะธะบะธั‚ะต (โ€ž-cโ€œ ะธ โ€ž--ccโ€œ) ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐั‚\n"
 "ะฒ ั€ะตะถะธะผะฐ ะทะฐ ั€ะฐะทะปะธะบะธ ะฒัŠั€ั…ัƒ ะดะธั€ะตะบั‚ะพั€ะธะธ (โ€ž-dโ€œ ะธ โ€ž--dir-diffโ€œ)."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ะธ ะดะฒะฐั‚ะฐ ั„ะฐะนะปะฐ ัะฐ ะฟั€ะพะผะตะฝะตะฝะธ: โ€ž%sโ€œ ะธ โ€ž%sโ€œ."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr "ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะต ะธะทะพัั‚ะฐะฒะตะฝะพ."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "ะฒ โ€ž%sโ€œ ะธะผะฐ ะฒั€ะตะผะตะฝะฝะธ ั„ะฐะนะปะพะฒะต."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr "ะฒัŠะทะผะพะถะฝะพ ะต ะดะฐ ะณะธ ะธะทั‡ะธัั‚ะธั‚ะต ะธะปะธ ะฒัŠะทัั‚ะฐะฝะพะฒะธั‚ะต"
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€ždiff.guitoolโ€œ ะฒะผะตัั‚ะพ โ€ždiff.toolโ€œ"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr "ั€ะฐะทะปะธะบะฐ ะฟะพ ะดะธั€ะตะบั‚ะพั€ะธะธ"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr "ัั‚ะฐั€ั‚ะธั€ะฐะฝะต ะฝะฐ ะŸะ ะžะ“ะ ะะœะั‚ะฐ ะทะฐ ั€ะฐะทะปะธะบะธ ะฑะตะท ะฟั€ะตะดัƒะฟั€ะตะถะดะตะฝะธะต"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "ัะปะตะดะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะธั‚ะต ะฒั€ัŠะทะบะธ ะฟั€ะธ ั€ะฐะทะปะธะบะฐ ะฟะพ ะดะธั€ะตะบั‚ะพั€ะธะธ"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr "ะŸะ ะžะ“ะ ะะœะ"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐะฝะฐั‚ะฐ ะŸะ ะžะ“ะ ะะœะ"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฟะธััŠะบ ั ะฒัะธั‡ะบะธ ะŸะ ะžะ“ะ ะะœะธ, ะบะพะธั‚ะพ ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐั‚ ั ะพะฟั†ะธัั‚ะฐ โ€ž--"
 "toolโ€œ"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12938,31 +13958,31 @@ msgstr ""
 "โ€žgit-difftoolโ€œ ะดะฐ ัะฟั€ะต ั€ะฐะฑะพั‚ะฐ, ะบะพะณะฐั‚ะพ ัั‚ะฐั€ั‚ะธั€ะฐะฝะฐั‚ะฐ ะŸะ ะžะ“ะ ะะœะ ะทะฐะฒัŠั€ัˆะธ ั "
 "ะฝะตะฝัƒะปะตะฒ ะบะพะด"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "ะบะพะผะฐะฝะดะฐ ะทะฐ ั€ะฐะทะณะปะตะถะดะฐะฝะต ะฝะฐ ั€ะฐะทะปะธะบะธ"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr "ะฟะพะดะฐะฒะฐ ัะต ะบัŠะผ โ€ždiffโ€œ"
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "โ€žgit-difftoolโ€œ ะธะทะธัะบะฒะฐ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ ะธะปะธ ะพะฟั†ะธัั‚ะฐ โ€ž--no-indexโ€œ"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--dir-diffโ€œ ะธ โ€ž--no-indexโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--guiโ€œ, โ€ž--toolโ€œ ะธ โ€ž--extcmdโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ะตะดะฝะฐ ั ะดั€ัƒะณะฐ"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ะทะฐ โ€ž--tool=ะŸะ ะžะ“ะ ะะœะโ€œ"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ะบะพะผะฐะฝะดะฐ ะทะฐ โ€ž--extcmd=ะšะžะœะะะ”ะโ€œ"
 
@@ -13002,160 +14022,185 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [ะžะŸะฆะ˜ะ˜_ะ—ะ_ะกะŸะ˜ะกะชะšะ_ะก_ะ’ะ•ะ ะกะ˜ะ˜]"
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+"ะ“ั€ะตัˆะบะฐ: ะฝะตะฟั€ะตะบะธั‚ะต ะตั‚ะธะบะตั‚ะธ ะฝะต ัะต ะธะทะฝะฐััั‚, ะพัะฒะตะฝ ะฐะบะพ ะฝะต ะทะฐะดะฐะดะตั‚ะต โ€ž--mark-tagsโ€œ."
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr "ะกัŠะพะฑั‰ะตะฝะธะต ะทะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ ะฝะฐ ะฒัะตะบะธ ั‚ะฐะบัŠะฒ ะ‘ะ ะžะ™ ะพะฑะตะบั‚ะฐ"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr "ะšะฐะบ ะดะฐ ัะต ะพะฑั€ะฐะฑะพั‚ะฒะฐั‚ ะฟะพะดะฟะธัะฐะฝะธั‚ะต ะตั‚ะธะบะตั‚ะธ"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr "ะšะฐะบ ะดะฐ ัะต ะพะฑั€ะฐะฑะพั‚ะฒะฐั‚ ะตั‚ะธะบะตั‚ะธั‚ะต ะฝะฐ ั„ะธะปั‚ั€ะธั€ะฐะฝะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "ะบะฐะบ ะดะฐ ัะต ะพะฑั€ะฐะฑะพั‚ะฒะฐั‚ ััŠะพะฑั‰ะตะฝะธัั‚ะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต, ะบะพะธั‚ะพ ัะฐ ะฒ ะดั€ัƒะณะพ ะบะพะดะธั€ะฐะฝะต"
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
 msgstr "ะ—ะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะผะฐั€ะบะตั€ะธั‚ะต ะฒ ั‚ะพะทะธ ะคะะ™ะ›"
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
 msgstr "ะ’ะฝะฐััะฝะต ะฝะฐ ะผะฐั€ะบะตั€ะธั‚ะต ะพั‚ ั‚ะพะทะธ ะคะะ™ะ›"
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "ะ’ะฝะฐััะฝะต ะฝะฐ ะผะฐั€ะบะตั€ะธั‚ะต ะพั‚ ั‚ะพะทะธ ะคะะ™ะ›, ะฐะบะพ ััŠั‰ะตัั‚ะฒัƒะฒะฐ"
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr "ะ”ะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะธะทะบัƒัั‚ะฒะตะฝะพ ะธะผะต ะฝะฐ ั‡ะพะฒะตะบ ะฟั€ะธ ะปะธะฟัะฐ ะฝะฐ ะทะฐะดะฐะฒะฐั‰ ะตั‚ะธะบะตั‚ะฐ"
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ั†ัะปะพั‚ะพ ะดัŠั€ะฒะพ ะทะฐ ะฒััะบะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr "ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะผะฐั€ะบะตั€ ะทะฐ ะทะฐะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ ะฟะพั‚ะพะบะฐ"
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr "ะ‘ะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต-BLOB"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr "ะฃะšะะ—ะะขะ•ะ›_ะะ_ะ’ะ•ะ ะกะ˜ะฏ"
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฃะšะะ—ะะขะ•ะ›ั_ะะ_ะ’ะ•ะ ะกะ˜ะฏ ะบัŠะผ ะธะทะฝะตัะตะฝะธั‚ะต ัƒะบะฐะทะฐั‚ะตะปะธ"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr "ะฐะฝะพะฝะธะผะธะทะธั€ะฐะฝะต ะฝะฐ ะธะทะฒะตะถะดะฐะฝะฐั‚ะฐ ะธะฝั„ะพั€ะผะฐั†ะธั"
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 "ะฃะบะฐะทะฒะฐะฝะต ะฝะฐ ั€ะพะดะธั‚ะตะปะธั‚ะต, ะบะพะธั‚ะพ ะฝะต ัะฐ ะฒ ะฟะพั‚ะพะบะฐ ะฝะฐ ะฑัŠั€ะทะพ ะธะทะฝะฐััะฝะต, ั "
 "ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ ะฝะฐ ะพะฑะตะบั‚"
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะธั‚ะต ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ะธ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต BLOB/ะฟะพะดะฐะฒัะฝะธั"
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "ะ—ะฐะดะฐะฒะฐะฝะต ะฝะฐ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ะธ ะฝะฐ ะผะฐั€ะบะตั€ะธ ะฝะฐ ะตั‚ะธะบะตั‚ะธั‚ะต"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--import-marksโ€œ ะธ โ€ž--import-marks-if-existsโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [ะžะŸะฆะ˜ะฏโ€ฆ] [ะฅะ ะะะ˜ะ›ะ˜ะฉะ• [ะฃะšะะ—ะะขะ•ะ›โ€ฆ]]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [ะžะŸะฆะ˜ะฏโ€ฆ] ะ“ะ ะฃะŸะ"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [ะžะŸะฆะ˜ะฏโ€ฆ] [(ะฅะ ะะะ˜ะ›ะ˜ะฉะ• | ะ“ะ ะฃะŸะ)โ€ฆ]"
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [ะžะŸะฆะ˜ะฏโ€ฆ]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "ะพะฟั†ะธัั‚ะฐ โ€žfetch.parallelโ€œ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ะฝะตะพั‚ั€ะธั†ะฐั‚ะตะปะฝะฐ"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
 msgid "fetch from all remotes"
 msgstr "ะดะพัั‚ะฐะฒัะฝะต ะพั‚ ะฒัะธั‡ะบะธ ะพั‚ะดะฐะปะตั‡ะตะฝะธ ั…ั€ะฐะฝะธะปะธั‰ะฐ"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะบะปะพะฝ ะทะฐ ัะปะตะดะตะฝะต ะทะฐ ะธะทะดัŠั€ะฟะฒะฐะฝะต/ะดะพัั‚ะฐะฒัะฝะต"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะบัŠะผ โ€ž.git/FETCH_HEADโ€œ ะฒะผะตัั‚ะพ ะทะฐะผัะฝะฐ"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:190
 msgid "path to upload pack on remote end"
 msgstr "ะพั‚ะดะฐะปะตั‡ะตะฝ ะฟัŠั‚, ะบัŠะดะตั‚ะพ ะดะฐ ัะต ะบะฐั‡ะธ ะฟะฐะบะตั‚ัŠั‚"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr "ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะฟั€ะตะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะปะพะบะฐะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr "ะดะพัั‚ะฐะฒัะฝะต ะพั‚ ะผะฝะพะถะตัั‚ะฒะพ ะพั‚ะดะฐะปะตั‡ะตะฝะธ ั…ั€ะฐะฝะธะปะธั‰ะฐ"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:194
 msgid "fetch all tags and associated objects"
 msgstr "ะดะพัั‚ะฐะฒัะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะตั‚ะธะบะตั‚ะธ ะธ ะฟั€ะธะฝะฐะดะปะตะถะฐั‰ะธ ะพะฑะตะบั‚ะธ"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr "ะฑะตะท ะดะพัั‚ะฐะฒัะฝะตั‚ะพ ะฝะฐ ะฒัะธั‡ะบะธ ะตั‚ะธะบะตั‚ะธ โ€ž--no-tagsโ€œ"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr "ะฑั€ะพะน ะฟะพะดะผะพะดัƒะปะธ ะดะพัั‚ะฐะฒะตะฝะธ ะฟะฐั€ะฐะปะตะปะฝะพ"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:197
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "ะพะบะฐัั‚ั€ัะฝะต ะฝะฐ ะบะปะพะฝะธั‚ะต ัะปะตะดัั‰ะธ ะฒะตั‡ะต ะฝะตััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะธ ะพั‚ะดะฐะปะตั‡ะตะฝะธ ะบะปะพะฝะธ"
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "ะพะบะฐัั‚ั€ัะฝะต ะฝะฐ ะปะพะบะฐะปะฝะธั‚ะต ะตั‚ะธะบะตั‚ะธ, ะบะพะธั‚ะพ ะฒะตั‡ะต ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐั‚ ะฒ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ "
 "ั…ั€ะฐะฝะธะปะธั‰ะต ะธ ะฟั€ะตะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะตะฝะธั‚ะต"
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
 msgid "on-demand"
 msgstr "ะŸะ ะ˜ ะะฃะ–ะ”ะ"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr "ัƒะฟั€ะฐะฒะปะตะฝะธะต ะฝะฐ ั€ะตะบัƒั€ัะธะฒะฝะพั‚ะพ ะดะพัั‚ะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะธั‚ะต"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:205
 msgid "keep downloaded pack"
 msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะทั‚ะตะณะปะตะฝะธั‚ะต ะฟะฐะบะตั‚ะธ ั ะพะฑะตะบั‚ะธ"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะตั‚ะพ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
 msgid "deepen history of shallow clone"
 msgstr "ะทะฐะดัŠะปะฑะพั‡ะฐะฒะฐะฝะต ะฝะฐ ะธัั‚ะพั€ะธัั‚ะฐ ะฝะฐ ะฟะปะธั‚ะบะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr "ะทะฐะดัŠะปะฑะพั‡ะฐะฒะฐะฝะต ะฝะฐ ะธัั‚ะพั€ะธัั‚ะฐ ะฝะฐ ะฟะปะธั‚ะบะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะดะพ ะพะฟั€ะตะดะตะปะตะฝะพ ะฒั€ะตะผะต"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:211
 msgid "convert to a complete repository"
 msgstr "ะฟั€ะตะฒั€ัŠั‰ะฐะฝะต ะฒ ะฟัŠะปะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟั€ะตะด ะฟัŠั‚ั ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -13163,90 +14208,94 @@ msgstr ""
 "ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ั€ะตะบัƒั€ัะธะฒะฝะพ ะธะทั‚ะตะณะปัะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะธั‚ะต (ั„ะฐะนะปะพะฒะตั‚ะต ั ะฝะฐัั‚ั€ะพะนะบะธ ัะฐ ั "
 "ะฟั€ะธะพั€ะธั‚ะตั‚)"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:214
 msgid "accept refs that update .git/shallow"
 msgstr "ะฟั€ะธะตะผะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธ, ะบะพะธั‚ะพ ะพะฑะฝะพะฒัะฒะฐั‚ โ€ž.git/shallowโ€œ"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:216
 msgid "refmap"
 msgstr "ะšะะ ะขะ_ะก_ะฃะšะะ—ะะขะ•ะ›ะ˜"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:217
 msgid "specify fetch refmap"
 msgstr "ัƒะบะฐะทะฒะฐะฝะต ะฝะฐ ะšะะ ะขะั‚ะฐ_ะก_ะฃะšะะ—ะะขะ•ะ›ะ˜ ะทะฐ ะดะพัั‚ะฐะฒัะฝะต"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr "ะดะพะบะปะฐะดะฒะฐะฝะต, ั‡ะต ะฒัะธั‡ะบะธ ะพะฑะตะบั‚ะธ ะผะพะณะฐั‚ ัะฐ ะดะพัั‚ะธะถะธะผะธ ะฟั€ะธ ะทะฐะฟะพั‡ะฒะฐะฝะต ะพั‚ ั‚ะพะทะธ"
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 msgid "run 'gc --auto' after fetching"
 msgstr "ะธะทะฟัŠะปะฝัะฒะฐะฝะต ะฝะฐ โ€žgc --autoโ€œ ัะปะตะด ะดะพัั‚ะฐะฒัะฝะต"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:226
 msgid "check for forced-updates on all updated branches"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ ะทะฐ ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะธ ะพะฑะฝะพะฒัะฒะฐะฝะธั ะฝะฐ ะฒัะธั‡ะบะธ ะบะปะพะฝะธ"
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะณั€ะฐฬ€ั„ะฐ ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ัะปะตะด ะดะพัั‚ะฐะฒัะฝะต"
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฒ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚"
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žfetch.outputโ€œ ะต ั ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ"
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะปะธะฟัะฒะฐ"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr "[ะฐะบั‚ัƒะฐะปะธะทะธั€ะฐะฝ]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr "[ะพั‚ั…ะฒัŠั€ะปะตะฝ]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr "ะฒ ั‚ะตะบัƒั‰ะธั ะบะปะพะฝ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพัั‚ะฐะฒั"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr "[ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะตั‚ะธะบะตั‚ะธั‚ะต]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr "ะปะพะบะฐะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr "ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ ะตั‚ะธะบะตั‚ ั‰ะต ะฑัŠะดะต ะฟั€ะตะทะฐะฟะธัะฐะฝ"
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr "[ะฝะพะฒ ะตั‚ะธะบะตั‚]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr "[ะฝะพะฒ ะบะปะพะฝ]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr "[ะฝะพะฒ ัƒะบะฐะทะฐั‚ะตะป]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr "ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr "ััŠั‰ะธะฝัะบะพ ัะปะธะฒะฐะฝะต"
 
-#: builtin/fetch.c:854
+#: builtin/fetch.c:877
 msgid ""
 "Fetch normally indicates which branches had a forced update,\n"
 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -13257,7 +14306,7 @@ msgstr ""
 "\n"
 "    git config fetch.showForcedUpdates true"
 
-#: builtin/fetch.c:858
+#: builtin/fetch.c:881
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -13266,29 +14315,29 @@ msgid ""
 " to avoid this check.\n"
 msgstr ""
 "ะŸั€ะพะฒะตั€ะบะฐั‚ะฐ ะทะฐ ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะธ ะธะทั‚ะปะฐัะบะฒะฐะฝะธั ะพั‚ะฝะต %.2f ัะตะบ.  ะœะพะถะต ะดะฐ ั ะฟั€ะตัะบะพั‡ะธั‚ะต "
-"ะตะดะฝะพะบั€ะฐั‚ะฝะพ ั ะพะฟั†ะธัั‚ะฐ โ€ž--no-show-forced-updatesโ€œ, ะฐ ะทะฐ ะดะฐ ั ะธะทะฒะบะปัŽั‡ะธั‚ะต ะทะฐ "
+"ะตะดะฝะพะบั€ะฐั‚ะฝะพ ั ะพะฟั†ะธัั‚ะฐ โ€ž--no-show-forced-updatesโ€œ, ะฐ ะทะฐ ะดะฐ ั ะธะทะบะปัŽั‡ะธั‚ะต ะทะฐ "
 "ะฟะพัั‚ะพัะฝะฝะพ, ะธะทะฟัŠะปะฝะตั‚ะต:\n"
 "\n"
 "    git config fetch.showForcedUpdates false\n"
 
-#: builtin/fetch.c:888
+#: builtin/fetch.c:920
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ โ€ž%sโ€œ ะฝะต ะธะทะฟั€ะฐั‚ะธ ะฒัะธั‡ะบะธ ะฝะตะพะฑั…ะพะดะธะผะธ ะพะฑะตะบั‚ะธ\n"
 
-#: builtin/fetch.c:909
+#: builtin/fetch.c:941
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 "ะพั‚ั…ะฒัŠั€ะปัะฝะต ะฝะฐ ะฒัŠั€ั…ะฐ โ€ž%sโ€œ, ะทะฐั‰ะพั‚ะพ ะฟะปะธั‚ะบะธั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะฐ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ "
 "ะพะฑะฝะพะฒัะฒะฐะฝะธ"
 
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
 #, c-format
 msgid "From %.*s\n"
 msgstr "ะžั‚ %.*s\n"
 
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1037
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -13298,58 +14347,80 @@ msgstr ""
 "โ€žgit remote prune %sโ€œ, ะทะฐ ะดะฐ ะฟั€ะตะผะฐั…ะฝะตั‚ะต ะพัั‚ะฐั€ะตะปะธั‚ะต ะบะปะพะฝะธ, ะบะพะธั‚ะพ\n"
 "ะฟั€ะตะดะธะทะฒะธะบะฒะฐั‚ ะบะพะฝั„ะปะธะบั‚ะฐ"
 
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1134
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ั‰ะต ัะต ะพะบะฐะถะต ะธะทะฒัŠะฝ ะบะปะพะฝ)"
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1135
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฒะตั‡ะต ะต ะธะทะฒัŠะฝ ะบะปะพะฝ)"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1167
 msgid "[deleted]"
 msgstr "[ะธะทั‚ั€ะธั‚]"
 
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1168 builtin/remote.c:1112
 msgid "(none)"
 msgstr "(ะฝะธั‰ะพ)"
 
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1191
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "ะะต ะผะพะถะต ะดะฐ ะดะพัั‚ะฐะฒะธั‚ะต ะฒ ั‚ะตะบัƒั‰ะธั ะบะปะพะฝ โ€ž%sโ€œ ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะต, ะบะพะตั‚ะพ ะฝะต ะต ะณะพะปะพ"
 
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1210
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "ะกั‚ะพะนะฝะพัั‚ั‚ะฐ โ€ž%2$sโ€œ ะทะฐ ะพะฟั†ะธัั‚ะฐ โ€ž%1$sโ€œ ะฝะต ะต ััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž%3$sโ€œ"
 
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1213
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ ะฟั€ะธ โ€ž%sโ€œ\n"
 
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr ""
+"ะทะฐัะตั‡ะตะฝะธ ัะฐ ะผะฝะพะถะตัั‚ะฒะพ ะบะปะพะฝะธ, ั‚ะพะฒะฐ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะพ ั ะพะฟั†ะธัั‚ะฐ โ€ž--set-upstreamโ€œ"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "ะฝะต ะผะพะถะต ะดะฐ ัƒะบะฐะทะฒะฐั‚ะต ะบะปะพะฝ ะทะฐ ัะปะตะดะตะฝะต ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝ ะตั‚ะธะบะตั‚"
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "ะฝะต ะผะพะถะต ะดะฐ ัƒะบะฐะทะฒะฐั‚ะต ะบะปะพะฝ ะทะฐ ัะปะตะดะตะฝะต ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝ ะตั‚ะธะบะตั‚"
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "ะฝะตะฟะพะทะฝะฐั‚ ะฒะธะด ะบะปะพะฝ"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"ะฝะต ะต ะพั‚ะบั€ะธั‚ ะบะปะพะฝ ะทะฐ ัะปะตะดะตะฝะต.\n"
+"ะขั€ัะฑะฒะฐ ะธะทั€ะธั‡ะฝะพ ะดะฐ ะทะฐะดะฐะดะตั‚ะต ะตะดะธะฝ ะบะปะพะฝ ั ะพะฟั†ะธัั‚ะฐ โ€ž--set-upstream optionโ€œ."
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
 #, c-format
 msgid "Fetching %s\n"
 msgstr "ะ”ะพัั‚ะฐะฒัะฝะต ะฝะฐ โ€ž%sโ€œ\n"
 
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพัั‚ะฐะฒะธ"
 
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr ""
-"ะพะฟั†ะธัั‚ะฐ โ€ž--filterโ€œ ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัะฐะผะพ ั ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ัƒะบะฐะทะฐะฝะพ ะฒ "
-"ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žextensions.partialCloneโ€œ"
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพัั‚ะฐะฒะธ (ะธะทั…ะพะดะฝะธัั‚ ะบะพะด ะต: %d)\n"
 
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1693
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -13357,45 +14428,45 @@ msgstr ""
 "ะะต ัั‚ะต ัƒะบะฐะทะฐะปะธ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต.  ะ—ะฐะดะฐะนั‚ะต ะธะปะธ ะฐะดั€ะตั, ะธะปะธ ะธะผะต\n"
 "ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะพั‚ะบัŠะดะตั‚ะพ ะดะฐ ัะต ะดะพัั‚ะฐะฒัั‚ ะฝะพะฒะธั‚ะต ะฒะตั€ัะธะธ."
 
-#: builtin/fetch.c:1593
+#: builtin/fetch.c:1730
 msgid "You need to specify a tag name."
 msgstr "ะขั€ัะฑะฒะฐ ะดะฐ ัƒะบะฐะถะตั‚ะต ะธะผะต ะฝะฐ ะตั‚ะธะบะตั‚."
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1780
 msgid "Negative depth in --deepen is not supported"
 msgstr "ะžั‚ั€ะธั†ะฐั‚ะตะปะฝะฐ ะดัŠะปะฑะพั‡ะธะฝะฐ ะบะฐั‚ะพ ะฐั€ะณัƒะผะตะฝั‚ ะฝะฐ โ€ž--deepenโ€œ ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ"
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1782
 msgid "--deepen and --depth are mutually exclusive"
-msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--deepenโ€œ ะธ โ€ž--depthโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ะตะดะฝะฐ ั ะดั€ัƒะณะฐ"
+msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--deepenโ€œ ะธ โ€ž--depthโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1787
 msgid "--depth and --unshallow cannot be used together"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--depthโ€œ ะธ โ€ž--unshallowโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1789
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "ะฝะต ะผะพะถะตั‚ะต ะดะฐ ะธะทะฟะพะปะทะฒะฐั‚ะต ะพะฟั†ะธัั‚ะฐ โ€ž--unshallowโ€œ ะฒัŠั€ั…ัƒ ะฟัŠะปะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1805
 msgid "fetch --all does not take a repository argument"
 msgstr "ะบัŠะผ โ€žgit fetch --allโ€œ ะฝะต ะผะพะถะตั‚ะต ะดะฐ ะดะพะฑะฐะฒะธั‚ะต ะฐั€ะณัƒะผะตะฝั‚ โ€” ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1807
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 "ะบัŠะผ โ€žgit fetch --allโ€œ ะฝะต ะผะพะถะตั‚ะต ะดะฐ ะดะพะฑะฐะฒะธั‚ะต ะฐั€ะณัƒะผะตะฝั‚ โ€” ัƒะบะฐะทะฐั‚ะตะป ะฝะฐ ะฒะตั€ัะธั"
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1816
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "ะัะผะฐ ะฝะธั‚ะพ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะฝะธั‚ะพ ะณั€ัƒะฟะฐ ะพั‚ ั…ั€ะฐะฝะธะปะธั‰ะฐ ะฝะฐ ะธะผะต โ€ž%sโ€œ"
 
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1823
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "ะฃะบะฐะทะฒะฐะฝะตั‚ะพ ะฝะฐ ะณั€ัƒะฟะฐ ะธ ัƒะบะฐะทะฒะฐะฝะตั‚ะพ ะฝะฐ ะฒะตั€ัะธั ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1841
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -13409,25 +14480,25 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m ะกะชะžะ‘ะฉะ•ะะ˜ะ•] [--log[=ะ‘ะ ะžะ™] | --no-log] [--file ะคะะ™ะ›]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:671
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 "ะฒะผัŠะบะฒะฐะฝะต ะฝะฐ ะถัƒั€ะฝะฐะป ััŠัั‚ะพัั‰ ัะต ะพั‚ ะฝะต ะฟะพะฒะตั‡ะต ะพั‚ ะ‘ะ ะžะ™ ะทะฐะฟะธัะฐ ะพั‚ ััŠะบั€ะฐั‚ะตะฝะธั "
 "ะถัƒั€ะฝะฐะป"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:674
 msgid "alias for --log (deprecated)"
-msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž--logโ€œ (ะพัั‚ะฐั€ัะปะพ)"
+msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž--logโ€œ (ะžะกะขะะ ะฏะ›ะž)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:677
 msgid "text"
 msgstr "ะขะ•ะšะกะข"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:678
 msgid "use <text> as start of message"
 msgstr "ะทะฐ ะฝะฐั‡ะฐะปะพ ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะขะ•ะšะกะข"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:679
 msgid "file to read from"
 msgstr "ั„ะฐะนะป, ะพั‚ ะบะพะนั‚ะพ ะดะฐ ัะต ั‡ะตั‚ะต"
 
@@ -13491,32 +14562,32 @@ msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต, ะบะพะธั‚ะพ ััŠ
 msgid "print only refs which don't contain the commit"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต, ะบะพะธั‚ะพ ะฝะต ััŠะดัŠั€ะถะฐั‚ ั‚ะพะฒะฐ ะŸะžะ”ะะ’ะะะ•"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "ะณั€ะตัˆะบะฐ ะฒ %s โ€ž%sโ€œ: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "ะฟั€ะตะดัƒะฟั€ะตะถะดะตะฝะธะต ะทะฐ %s โ€ž%sโ€œ: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "ัะบัŠัะฐะฝะฐ ะฒั€ัŠะทะบะฐ ะพั‚ %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฒะธะด ะพะฑะตะบั‚ ะฒัŠะฒ ะฒั€ัŠะทะบะฐั‚ะฐ"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13525,217 +14596,217 @@ msgstr ""
 "ัะบัŠัะฐะฝะฐ ะฒั€ัŠะทะบะฐ ะพั‚ %7s %s\n"
 "              ะบัŠะผ %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr "ะปะธะฟัะฒะฐั‰ ะพะฑะตะบั‚: %s โ€ž%sโ€œ"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr "ะฝะตะดะพัั‚ะธะถะธะผ ะพะฑะตะบั‚: %s โ€ž%sโ€œ"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, c-format
 msgid "dangling %s %s"
 msgstr "ะธะทะฒัŠะฝ ะบะปะพะฝ: %s โ€ž%sโ€œ"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 msgid "could not create lost-found"
 msgstr "โ€žlost-foundโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฒัŠั€ัˆะธ"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ัะฒัŠั€ะทะฐะฝะพัั‚ั‚ะฐ (%d ะพะฑะตะบั‚ะฐ)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr "ะŸั€ะพะฒะตั€ัะฒะฐะฝะต ะฝะฐ %s โ€ž%sโ€œ"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr "ัะบัŠัะฐะฝะธ ะฒั€ัŠะทะบะธ"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr "ะฝะฐั‡ะฐะปะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั โ€ž%sโ€œ"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "ะฟั€ะธะปะพะถะตะฝ ะตั‚ะธะบะตั‚ โ€ž%sโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ (%s) ะฒ โ€ž%sโ€œ"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: ะปะธะฟัะฒะฐั‰ ะธะปะธ ะฟะพะฒั€ะตะดะตะฝ ะพะฑะตะบั‚"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะทะฐะฟะธั ะฒ ะถัƒั€ะฝะฐะปะฐ ะทะฐ ัƒะบะฐะทะฐั‚ะตะปะธ โ€ž%sโ€œ"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะถัƒั€ะฝะฐะปะฐ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต: โ€ž%sโ€œ ะดะพ โ€ž%sโ€œ"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "โ€ž%sโ€œ: ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป ะทะฐ SHA1: โ€ž%sโ€œ"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต!"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr "ะฒะฝะธะผะฐะฝะธะต: ะฝัะผะฐ ัƒะบะฐะทะฐั‚ะตะปะธ ะฟะพ ะฟะพะดั€ะฐะทะฑะธั€ะฐะฝะต"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "โ€ž%sโ€œ: ะปะธะฟัะฒะฐั‰ ะพะฑะตะบั‚: โ€ž%sโ€œ"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "โ€ž%sโ€œ: ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ: โ€ž%sโ€œ"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั€ะตะด ั ะบะพะฝั‚ั€ะพะปะฝะฐ ััƒะผะฐ ะฟะพ SHA1: โ€ž%sโ€œ"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั ั ะพะฑะตะบั‚ะธ"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธะธั‚ะต ั ะพะฑะตะบั‚ะธ"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฒั€ัŠะทะบะธั‚ะต ะฝะฐ โ€ž%sโ€œ"
 
 #
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป โ€ž%sโ€œ"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "โ€ž%sโ€œ ัะพั‡ะธ ะบัŠะผ ะฝะตั‰ะพ ะฝะตะพะฑะธั‡ะฐะนะฝะพ (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: ะฝะตัะฒัŠั€ะทะฐะฝะธัั‚ ะฒั€ัŠั… โ€žHEADโ€œ ะฝะต ัะพั‡ะธ ะบัŠะผ ะฝะธั‰ะพ"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "ะฟั€ะตะดัƒะฟั€ะตะถะดะตะฝะธะต: โ€ž%sโ€œ ัะพั‡ะธ ะบัŠะผ ะฒัะต ะพั‰ะต ะฝะตััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ ะบะปะพะฝ (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะดัŠั€ะฒะพั‚ะพ ะฝะฐ ะบะตัˆะฐ"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "โ€ž%sโ€œ: ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป ะทะฐ SHA1 ะฒ ะดัŠั€ะฒะพั‚ะพ ะฝะฐ ะบะตัˆะฐ"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr "ะฒ ะดัŠั€ะฒะพั‚ะพ ะฝะฐ ะบะตัˆะฐ ะธะผะฐ ะฝะตั‰ะพ, ะบะพะตั‚ะพ ะฝะต ะต ะดัŠั€ะฒะพ"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [ะžะŸะฆะ˜ะฏโ€ฆ] [ะžะ‘ะ•ะšะขโ€ฆ]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฝะตะดะพัั‚ะธะถะธะผะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะธะทะฒัŠะฝ ะบะปะพะฝะธั‚ะต"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะตั‚ะธะบะตั‚ะธั‚ะต"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะบะพั€ะตะฝะพะฒะธั‚ะต ะฒัŠะทะปะธ"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธ ะพั‚ ะธะฝะดะตะบัะฐ ะดะฐ ัะฐ ะบะพั€ะตะฝะพะฒะธ"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr "ะฟั€ะพัะปะตะดัะฒะฐะฝะต ะธ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะพั‚ ะถัƒั€ะฝะฐะปะฐ ั ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
 msgstr "ะดะพะฟัŠะปะฝะธั‚ะตะปะฝะพ ะดะฐ ัะต ะฟั€ะพะฒะตั€ัะฒะฐั‚ ะฟะฐะบะตั‚ะธั‚ะต ะธ ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะฝะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ ัะฐะผะพ ะฝะฐ ะฒั€ัŠะทะบะฐั‚ะฐ"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr "ะฟะพ-ัั‚ั€ะพะณะธ ะฟั€ะพะฒะตั€ะบะธ"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะธะทะฒัŠะฝ ะบะปะพะฝะธั‚ะต ะฒ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž.git/lost-foundโ€œ"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟะพะดั€ะพะฑะฝะธ ะธะผะตะฝะฐ ะฝะฐ ะดะพัั‚ะธะถะธะผะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, c-format
 msgid "%s: object missing"
 msgstr "โ€ž%sโ€œ: ะปะธะฟัะฒะฐั‰ ะพะฑะตะบั‚"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟะฐั€ะฐะผะตั‚ัŠั€: ะพั‡ะฐะบะฒะฐ ัะต SHA1, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝะพ: โ€ž%sโ€œ"
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr "git gc [ะžะŸะฆะ˜ะฏโ€ฆ]"
 
@@ -13749,17 +14820,17 @@ msgstr "ะะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žfstatโ€œ ะฒัŠั€ั…ัƒ โ€ž%
 msgid "failed to parse '%s' value '%s'"
 msgstr "ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ โ€ž%sโ€œ โ€” โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปัƒั‡ะธ ะธะฝั„ะพั€ะผะฐั†ะธั ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13776,58 +14847,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr "ะพะบะฐัั‚ั€ัะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต, ะบัŠะผ ะบะพะธั‚ะพ ะฝะธั‰ะพ ะฝะต ัะพั‡ะธ"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr "ะธะทั‡ะตั€ะฟะฐั‚ะตะปะฝะพ ั‚ัŠั€ัะตะฝะต ะฝะฐ ะฑะพะบะปัƒะบะฐ (ะทะฐ ัะผะตั‚ะบะฐ ะฝะฐ ะฟะพะฒะตั‡ะต ะฒั€ะตะผะต ั€ะฐะฑะพั‚ะฐ)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr "ะฒะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพั‚ะพ ััŠะฑะธั€ะฐะฝะต ะฝะฐ ะฑะพะบะปัƒะบะฐ (auto-gc)"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "ะธะทั€ะธั‡ะฝะพ ัั‚ะฐั€ั‚ะธั€ะฐะฝะต ะฝะฐ ััŠะฑะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฑะพะบะปัƒะบะฐ, ะดะพั€ะธ ะธ ะฐะบะพ ะฒะตั‡ะต ั€ะฐะฑะพั‚ะธ ะดั€ัƒะณะพ "
 "ััŠะฑะธั€ะฐะฝะต"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr "ะฟั€ะตะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะพ ะฑะตะท ะฝะฐะน-ะณะพะปะตะผะธั ะฟะฐะบะตั‚"
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "ะฝะตั€ะฐะทะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ โ€žgc.logexpiryโ€œ %s"
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "ะฝะตั€ะฐะทะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ ะฟะตั€ะธะพะดะฐ ะทะฐ ะพะบะฐัั‚ั€ัะฝะต: %s"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "ะะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะทะฐะดะตะฝ ั„ะพะฝ ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะทะฐ ะฟะพ-ะดะพะฑั€ะฐ "
 "ะฟั€ะพะธะทะฒะพะดะธั‚ะตะปะฝะพัั‚.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "ะะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะทะฐ ะฟะพ-ะดะพะฑั€ะฐ ะฟั€ะพะธะทะฒะพะดะธั‚ะตะปะฝะพัั‚.\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 "ะŸะพะณะปะตะดะฝะตั‚ะต ั€ัŠะบะพะฒะพะดัั‚ะฒะพั‚ะพ ะทะฐ ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะบะฐะบ ะดะฐ ะธะทะฟัŠะปะฝะธั‚ะต โ€žgit help "
 "gcโ€œ.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13836,14 +14907,14 @@ msgstr ""
 "ะฟั€ะพั†ะตัะฐ: %<PRIuMAX> (ะฐะบะพ ัั‚ะต ัะธะณัƒั€ะฝะธ, ั‡ะต ั‚ะพะฒะฐ ะฝะต ะต ะฒัั€ะฝะพ, ั‚ะพะฒะฐ ะธะทะฟะพะปะทะฒะฐะนั‚ะต\n"
 "ะพะฟั†ะธัั‚ะฐ โ€ž--forceโ€œ)"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "ะ˜ะผะฐ ะฟั€ะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฝะตะดะพัั‚ะธะถะธะผะธ, ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝะธ ะพะฑะตะบั‚ะธ.\n"
 "ะ˜ะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit pruneโ€œ, ะทะฐ ะดะฐ ะณะธ ะพะบะฐัั‚ั€ะธั‚ะต."
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [ะžะŸะฆะ˜ะฏโ€ฆ] [-e] ะจะะ‘ะ›ะžะ [ะ’ะ•ะ ะกะ˜ะฏโ€ฆ] [[--] ะŸะชะขโ€ฆ]"
 
@@ -13861,272 +14932,271 @@ msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฑั€ะพะน ะฝะธัˆะบะธ (%d) ะทะฐ %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "ะปะธะฟัะฒะฐ ะฟะพะดะดั€ัŠะถะบะฐ ะทะฐ ะฝะธัˆะบะธ.  โ€ž%sโ€œ ั‰ะต ัะต ะฟั€ะตะฝะตะฑั€ะตะณะฝะต"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "ะดัŠั€ะฒะพั‚ะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝะพ (%s)"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:633
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ โ€žgrepโ€œ ะพั‚ ะพะฑะตะบั‚ ะพั‚ ะฒะธะดะฐ %s"
 
-#: builtin/grep.c:714
+#: builtin/grep.c:704
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%cโ€œ ะพั‡ะฐะบะฒะฐ ั‡ะธัะปะพ ะทะฐ ะฐั€ะณัƒะผะตะฝั‚"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:803
 msgid "search in index instead of in the work tree"
 msgstr "ั‚ัŠั€ัะตะฝะต ะฒ ะธะฝะดะตะบัะฐ, ะฐ ะฝะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:805
 msgid "find in contents not managed by git"
 msgstr "ั‚ัŠั€ัะตะฝะต ะธ ะฒัŠะฒ ั„ะฐะนะปะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะฝะต ัะฐ ะฟะพะด ัƒะฟั€ะฐะฒะปะตะฝะธะตั‚ะพ ะฝะฐ git"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:807
 msgid "search in both tracked and untracked files"
 msgstr "ั‚ัŠั€ัะตะฝะต ะธ ะฒ ัะปะตะดะตะฝะธั‚ะต, ะธ ะฒ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:809
 msgid "ignore files specified via '.gitignore'"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต ัƒะบะฐะทะฐะฝะธ ะฒ โ€ž.gitignoreโ€œ"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:811
 msgid "recursively search in each submodule"
 msgstr "ั€ะตะบัƒั€ัะธะฒะฝะพ ั‚ัŠั€ัะตะฝะต ะฒัŠะฒ ะฒัะธั‡ะบะธ ะฟะพะดะผะพะดัƒะปะธ"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:814
 msgid "show non-matching lines"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั€ะตะดะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะฝะต ััŠะฒะฟะฐะดะฐั‚"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:816
 msgid "case insensitive matching"
 msgstr "ะฑะตะท ะทะฝะฐั‡ะตะฝะธะต ะฝะฐ ั€ะตะณะธัั‚ัŠั€ะฐ ะฝะฐ ะฑัƒะบะฒะธั‚ะต (ะณะปะฐะฒะฝะธ/ะผะฐะปะบะธ)"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:818
 msgid "match patterns only at word boundaries"
 msgstr "ะฝะฐะฟะฐัะฒะฐะฝะต ะฝะฐ ัˆะฐะฑะปะพะฝะธั‚ะต ัะฐะผะพ ะฟะพ ะณั€ะฐะฝะธั†ะธั‚ะต ะฝะฐ ะดัƒะผะธั‚ะต"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:820
 msgid "process binary files as text"
 msgstr "ะพะฑั€ะฐะฑะพั‚ะฒะฐะฝะต ะฝะฐ ะดะฒะพะธั‡ะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะบะฐั‚ะพ ั‚ะตะบัั‚ะพะฒะธ"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:822
 msgid "don't match patterns in binary files"
 msgstr "ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะดะฒะพะธั‡ะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:825
 msgid "process binary files with textconv filters"
 msgstr ""
 "ะพะฑั€ะฐะฑะพั‚ะฒะฐะฝะต ะฝะฐ ะดะฒะพะธั‡ะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ั‡ั€ะตะท ั„ะธะปั‚ั€ะธ ะทะฐ ะฟั€ะตะพะฑั€ะฐะทัƒะฒะฐะฝะต ะบัŠะผ ั‚ะตะบัั‚"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:827
 msgid "search in subdirectories (default)"
 msgstr "ั‚ัŠั€ัะตะฝะต ะฒ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธะธั‚ะต (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ)"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:829
 msgid "descend at most <depth> levels"
 msgstr "ะฝะฐะฒะปะธะทะฐะฝะต ะผะฐะบัะธะผะฐะปะฝะพ ะฝะฐ ั‚ะฐะทะธ ะ”ะชะ›ะ‘ะžะงะ˜ะะ ะฒ ะดัŠั€ะฒะพั‚ะพ"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:833
 msgid "use extended POSIX regular expressions"
 msgstr "ั€ะฐะทัˆะธั€ะตะฝะธ ั€ะตะณัƒะปัั€ะฝะธ ะธะทั€ะฐะทะธ ะฟะพ POSIX"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:836
 msgid "use basic POSIX regular expressions (default)"
 msgstr "ะพัะฝะพะฒะฝะธ ั€ะตะณัƒะปัั€ะฝะธ ะธะทั€ะฐะทะธ ะฟะพ POSIX (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ)"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:839
 msgid "interpret patterns as fixed strings"
 msgstr "ัˆะฐะฑะปะพะฝะธั‚ะต ัะฐ ะดะพัะปะพะฒะฝะธ ะฝะธะทะพะฒะต"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:842
 msgid "use Perl-compatible regular expressions"
 msgstr "ั€ะตะณัƒะปัั€ะฝะธ ะธะทั€ะฐะทะธ ะฝะฐ Perl"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:845
 msgid "show line numbers"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะพะผะตั€ะฐั‚ะฐ ะฝะฐ ั€ะตะดะพะฒะตั‚ะต"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:846
 msgid "show column number of first match"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะพะผะตั€ะฐ ะฝะฐ ะบะพะปะพะฝะฐั‚ะฐ ะฝะฐ ะฟัŠั€ะฒะพั‚ะพ ะฝะฐะฟะฐัะฒะฐะฝะต"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:847
 msgid "don't show filenames"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:848
 msgid "show filenames"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:850
 msgid "show filenames relative to top directory"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะพั‚ะฝะพัะธั‚ะตะปะฝะธั‚ะต ะธะผะตะฝะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต ัะฟั€ัะผะพ ะพัะฝะพะฒะฝะฐั‚ะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะฝะฐ "
 "ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:852
 msgid "show only filenames instead of matching lines"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต ะฑะตะท ะฝะฐะฟะฐัะฒะฐั‰ะธั‚ะต ั€ะตะดะพะฒะต"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:854
 msgid "synonym for --files-with-matches"
 msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž--files-with-matchesโ€œ"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:857
 msgid "show only the names of files without match"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะฝะต ััŠะดัŠั€ะถะฐั‚ ั€ะตะด, ะฝะฐะฟะฐัะฒะฐั‰ ะฝะฐ "
 "ัˆะฐะฑะปะพะฝะฐ"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:859
 msgid "print NUL after filenames"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝัƒะปะตะฒะธั ะทะฝะฐะบ โ€žNULโ€œ ัะปะตะด ะฒััะบะพ ะธะผะต ะฝะฐ ั„ะฐะนะป"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:862
 msgid "show only matching parts of a line"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ั‡ะฐัั‚ะธั‚ะต ะฝะฐ ั€ะตะดะพะฒะตั‚ะต, ะบะพะธั‚ะพ ััŠะฒะฟะฐะดะฐั‚"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:864
 msgid "show the number of matches instead of matching lines"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฑั€ะพั ะฝะฐ ััŠะฒะฟะฐะดะตะฝะธัั‚ะฐ ะฒะผะตัั‚ะพ ะฝะฐะฟะฐัะฒะฐั‰ะธั‚ะต ั€ะตะดะพะฒะต"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:865
 msgid "highlight matches"
 msgstr "ะพั†ะฒะตั‚ัะฒะฐะฝะต ะฝะฐ ะฝะฐะฟะฐัะฒะฐะฝะธัั‚ะฐ"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:867
 msgid "print empty line between matches from different files"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟั€ะฐะทะตะฝ ั€ะตะด ะผะตะถะดัƒ ะฝะฐะฟะฐัะฒะฐะฝะธัั‚ะฐ ะพั‚ ั€ะฐะทะปะธั‡ะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:869
 msgid "show filename only once above matches from same file"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตั‚ะพ ะฝะฐ ั„ะฐะนะปะฐ ัะฐะผะพ ะฒะตะดะฝัŠะถ ะทะฐ ะฒัะธั‡ะบะธ ะฝะฐะฟะฐัะฒะฐะฝะธั ะพั‚ ั‚ะพะทะธ ั„ะฐะนะป"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:872
 msgid "show <n> context lines before and after matches"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั‚ะฐะบัŠะฒ ะ‘ะ ะžะ™ ั€ะตะดะพะฒะต ะฟั€ะตะดะธ ะธ ัะปะตะด ะฝะฐะฟะฐัะฒะฐะฝะธัั‚ะฐ"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:875
 msgid "show <n> context lines before matches"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั‚ะฐะบัŠะฒ ะ‘ะ ะžะ™ ั€ะตะดะพะฒะต ะฟั€ะตะดะธ ะฝะฐะฟะฐัะฒะฐะฝะธัั‚ะฐ"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:877
 msgid "show <n> context lines after matches"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั‚ะฐะบัŠะฒ ะ‘ะ ะžะ™ ั€ะตะดะพะฒะต ัะปะตะด ะฝะฐะฟะฐัะฒะฐะฝะธัั‚ะฐ"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:879
 msgid "use <n> worker threads"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ั‚ะฐะบัŠะฒ ะ‘ะ ะžะ™ ั€ะฐะฑะพั‚ะตั‰ะธ ะฝะธัˆะบะธ"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:880
 msgid "shortcut for -C NUM"
 msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž-C ะ‘ะ ะžะ™โ€œ"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:883
 msgid "show a line with the function name before matches"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั€ะตะด ั ะธะผะตั‚ะพ ะฝะฐ ั„ัƒะฝะบั†ะธัั‚ะฐ, ะฒ ะบะพัั‚ะพ ะต ะฝะฐะฟะฐัะฝะฐั‚ ัˆะฐะฑะปะพะฝะฐ"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:885
 msgid "show the surrounding function"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะพะฑั…ะฒะฐั‰ะฐั‰ะฐั‚ะฐ ั„ัƒะฝะบั†ะธั"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:888
 msgid "read patterns from file"
 msgstr "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ัˆะฐะฑะปะพะฝะธั‚ะต ะพั‚ ะคะะ™ะ›"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:890
 msgid "match <pattern>"
 msgstr "ะฝะฐะฟะฐัะฒะฐะฝะต ะฝะฐ ะจะะ‘ะ›ะžะ"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:892
 msgid "combine patterns specified with -e"
 msgstr "ะบะพะผะฑะธะฝะธั€ะฐะฝะต ะฝะฐ ัˆะฐะฑะปะพะฝะธั‚ะต ัƒะบะฐะทะฐะฝะธ ั ะพะฟั†ะธัั‚ะฐ โ€ž-eโ€œ"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:904
 msgid "indicate hit with exit status without output"
 msgstr ""
 "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะธะทั…ะพะด.  ะ˜ะทั…ะพะดะฝะธัั‚ ะบะพะด ัƒะบะฐะทะฒะฐ ะฝะฐะปะธั‡ะธะตั‚ะพ ะฝะฐ "
 "ะฝะฐะฟะฐัะฒะฐะฝะต"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:906
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั€ะตะดะพะฒะต ัะฐะผะพ ะพั‚ ั„ะฐะนะปะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะฝะฐะฟะฐัะฒะฐั‚ ะฝะฐ ะฒัะธั‡ะบะธ ัˆะฐะฑะปะพะฝะธ"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:908
 msgid "show parse tree for grep expression"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะดัŠั€ะฒะพั‚ะพ ะทะฐ ะฐะฝะฐะปะธะท ะฝะฐ ั€ะตะณัƒะปัั€ะฝะธั ะธะทั€ะฐะท"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "pager"
 msgstr "ะฟั€ะพะณั€ะฐะผะฐ ะทะฐ ะฟั€ะตะณะปะตะด ะฟะพ ัั‚ั€ะฐะฝะธั†ะธ"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "show matching files in the pager"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััŠะฒะฟะฐะดะฐั‰ะธั‚ะต ั„ะฐะนะปะพะฒะต ะฒ ะฟั€ะพะณั€ะฐะผะฐ ะทะฐ ะฟั€ะตะณะปะตะด ะฟะพ ัั‚ั€ะฐะฝะธั†ะธ"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:916
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ัั‚ะฐั€ั‚ะธั€ะฐะฝะตั‚ะพ ะฝะฐ grep(1) (ั‚ะตะบัƒั‰ะธัั‚ ะบะพะผะฟะธะปะฐั‚ ะฟั€ะตะฝะตะฑั€ะตะณะฒะฐ ั‚ะฐะทะธ "
 "ะพะฟั†ะธั)"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:983
 msgid "no pattern given"
 msgstr "ะฝะต ัั‚ะต ะทะฐะดะฐะปะธ ัˆะฐะฑะปะพะฝ"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1019
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--cachedโ€œ ะธ โ€ž--untrackedโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ั ะฒะตั€ัะธะธ."
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1027
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "ะฒะตั€ัะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะฐ"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--untrackedโ€œ ะธ โ€ž--recurse-submodulesโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
+
+#: builtin/grep.c:1061
 msgid "invalid option combination, ignoring --threads"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะบะพะผะฑะธะฝะฐั†ะธั ะพั‚ ะพะฟั†ะธะธ, โ€ž--threadsโ€œ ั‰ะต ัะต ะฟั€ะตะฝะตะฑั€ะตะณะฝะต"
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
 msgid "no threads support, ignoring --threads"
 msgstr "ะปะธะฟัะฒะฐ ะฟะพะดะดั€ัŠะถะบะฐ ะทะฐ ะฝะธัˆะบะธ.  โ€ž--threadsโ€œ ั‰ะต ัะต ะฟั€ะตะฝะตะฑั€ะตะณะฝะต"
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฑั€ะพะน ะฝะธัˆะบะธ: %d"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1101
 msgid "--open-files-in-pager only works on the worktree"
-msgstr ""
-"ะพะฟั†ะธัั‚ะฐ โ€ž--open-files-in-pagerโ€œ ะต ััŠะฒะผะตัั‚ะธะผะฐ ัะฐะผะพ ั ั‚ัŠั€ัะตะฝะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
-
-#: builtin/grep.c:1117
-msgid "option not supported with --recurse-submodules"
-msgstr "ะพะฟั†ะธัั‚ะฐ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž--recurse-submodulesโ€œ"
+msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--open-files-in-pagerโ€œ ะธะทะธัะบะฒะฐ ั‚ัŠั€ัะตะฝะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/grep.c:1123
+#: builtin/grep.c:1127
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--cachedโ€œ ะธ โ€ž--untrackedโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ั โ€ž--no-indexโ€œ"
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1133
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 "ะพะฟั†ะธะธั‚ะต โ€ž--(no-)exclude-standardโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ั ั‚ัŠั€ัะตะฝะต ะฟะพ ัะปะตะดะตะฝะธ "
 "ั„ะฐะนะปะพะฒะต"
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1141
 msgid "both --cached and trees are given"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--cachedโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ััŠั ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะดัŠั€ะฒะพ"
 
@@ -14314,11 +15384,11 @@ msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ั‡ะตั‚ะตะฝะต ะฝะฐ ะฒั…ะพะดะฝะธั‚ะต ะดะฐะฝะฝะธ"
 msgid "used more bytes than were available"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะธ ัะฐ ะฟะพะฒะตั‡ะต ะพั‚ ะฝะฐะปะธั‡ะฝะธั‚ะต ะฑะฐะนั‚ะพะฒะต"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
 msgid "pack too large for current definition of off_t"
 msgstr "ะฟะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป ะต ะฟั€ะตะบะฐะปะตะฝะพ ะณะพะปัะผ ะทะฐ ั‚ะตะบัƒั‰ะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ ั‚ะธะฟะฐ โ€žoff_tโ€œ"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "ะฟะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป ะฝะฐะดะฒะธัˆะฐะฒะฐ ะผะฐะบัะธะผะฐะปะฝะธั ะฒัŠะทะผะพะถะตะฝ ั€ะฐะทะผะตั€"
 
@@ -14374,200 +15444,200 @@ msgstr[1] "ะฝะตะพั‡ะฐะบะฒะฐะฝ ะบั€ะฐะน ะฝะฐ ั„ะฐะนะป, ะปะธะฟัะฒะฐั‚ %<PRIuMAX>
 msgid "serious inflate inconsistency"
 msgstr "ัะตั€ะธะพะทะฝะฐ ะณั€ะตัˆะบะฐ ะฟั€ะธ ะดะตะบะพะผะฟั€ะตัะธั€ะฐะฝะต ั โ€žinflateโ€œ"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 "ะกะชะ’ะŸะะ”ะ•ะะ˜ะ• ะะ ะกะขะžะ™ะะžะกะขะ˜ะขะ• ะ—ะ ะกะฃะœะ˜ะขะ• ะ—ะ SHA1: โ€ž%sโ€œ ะะ ะ”ะ’ะ ะ ะะ—ะ›ะ˜ะงะะ˜ ะžะ‘ะ•ะšะขะ!"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
 #, c-format
 msgid "unable to read %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะธัั‚ ะพะฑะตะบั‚ ะฒ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะธัั‚ ะพะฑะตะบั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะพะฑะตะบั‚-BLOB โ€ž%sโ€œ"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
 msgid "fsck error in packed object"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะฟั€ะพะฒะตั€ะบะฐั‚ะฐ ะฝะฐ ะฟะฐะบะตั‚ะธั€ะฐะฝะธ ะพะฑะตะบั‚ะธ"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "ะัะบะพะธ ะพะฑะตะบั‚ะธ, ะฝะฐัะปะตะดะฝะธั†ะธ ะฝะฐ โ€ž%sโ€œ, ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะดะพัั‚ะธะณะฝะฐั‚ะธ"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr "ั€ะฐะทะปะธะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะธะปะพะถะตะฝะฐ"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr "ะŸะพะปัƒั‡ะฐะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธ"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr "ะ˜ะฝะดะตะบัะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธ"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "ะฟะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป ะต ะฟะพะฒั€ะตะดะตะฝ (ะฝะตะตะดะฝะฐะบะฒะธ ััƒะผะธ ะฟะพ SHA1)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปัƒั‡ะธ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป ั โ€žfstatโ€œ"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr "ะฒ ะบั€ะฐั ะฝะฐ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป ะธะผะฐ ะฟะพะฒั€ะตะดะตะฝะธ ะดะฐะฝะฝะธ"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 "ั„ะฐั‚ะฐะปะฝะฐ ะณั€ะตัˆะบะฐ ะฒัŠะฒ ั„ัƒะฝะบั†ะธัั‚ะฐ โ€žparse_pack_objectsโ€œ.  ะขะพะฒะฐ ะต ะณั€ะตัˆะบะฐ ะฒ Git, "
 "ะดะพะบะปะฐะดะฒะฐะนั‚ะต ั ะฝะฐ ั€ะฐะทั€ะฐะฑะพั‚ั‡ะธั†ะธั‚ะต, ะบะฐั‚ะพ ะฟั€ะฐั‚ะธั‚ะต ะต-ะฟะธัะผะพ ะฝะฐ ะฐะดั€ะตั: โ€žgit@vger."
 "kernel.orgโ€œ."
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr "ะžั‚ะบั€ะธะฒะฐะฝะต ะฝะฐ ััŠะพั‚ะฒะตั‚ะฝะธั‚ะต ั€ะฐะทะปะธะบะธ"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฝะธัˆะบะฐ: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr ""
 "ั„ะฐั‚ะฐะปะฝะฐ ะณั€ะตัˆะบะฐ ะฒัŠะฒ ั„ัƒะฝะบั†ะธัั‚ะฐ โ€žconclude_packโ€œ.  ะขะพะฒะฐ ะต ะณั€ะตัˆะบะฐ ะฒ Git, "
 "ะดะพะบะปะฐะดะฒะฐะนั‚ะต ั ะฝะฐ ั€ะฐะทั€ะฐะฑะพั‚ั‡ะธั†ะธั‚ะต, ะบะฐั‚ะพ ะฟั€ะฐั‚ะธั‚ะต ะต-ะฟะธัะผะพ ะฝะฐ ะฐะดั€ะตั: โ€žgit@vger."
 "kernel.orgโ€œ."
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "ะดะตะนัั‚ะฒะธะตั‚ะพ ะทะฐะฒัŠั€ัˆะธ ั %d ะปะพะบะฐะปะตะฝ ะพะฑะตะบั‚"
 msgstr[1] "ะดะตะนัั‚ะฒะธะตั‚ะพ ะทะฐะฒัŠั€ัˆะธ ั %d ะปะพะบะฐะปะฝะธ ะพะฑะตะบั‚ะฐ"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "ะะตะพั‡ะฐะบะฒะฐะฝะฐ ะฟะพัะปะตะดะฒะฐั‰ะฐ ััƒะผะฐ ะทะฐ ะณั€ะตัˆะบะธ ะทะฐ โ€ž%sโ€œ (ะฟั€ะธั‡ะธะฝะฐั‚ะฐ ะผะพะถะต ะดะฐ ะต ะณั€ะตัˆะบะฐ ะฒ "
 "ะดะธัะบะฐ)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "ะฒ ะฟะฐะบะตั‚ะฐ ะธะผะฐ %d ะฝะตะฝะฐะฟะฐัะฒะฐั‰ะฐ ั€ะฐะทะปะธะบะฐ"
 msgstr[1] "ะฒ ะฟะฐะบะตั‚ะฐ ะธะผะฐ %d ะฝะตะฝะฐะฟะฐัะฒะฐั‰ะธ ั€ะฐะทะปะธะบะธ"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "ะดะพะฑะฐะฒะตะฝะธัั‚ ะพะฑะตะบั‚ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะผะฟั€ะตัะธั€ะฐ ั โ€ždeflateโ€œ: %d"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "ะปะพะบะฐะปะฝะธัั‚ ะพะฑะตะบั‚ โ€ž%sโ€œ ะต ะฟะพะฒั€ะตะดะตะฝ"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "ะธะผะตั‚ะพ ะฝะฐ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะทะฐะฒัŠั€ัˆะฒะฐ ะฝะฐ โ€ž.packโ€œ"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธั ะฝะฐ ั„ะฐะนะปะฐ โ€ž%sโ€œ โ€ž%sโ€œ"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐั‚ะฒะฐั€ัะฝะตั‚ะพ ะฝะฐ ะทะฐะฟะธัะฐะฝะธั ั„ะฐะนะป โ€ž%sโ€œ โ€ž%sโ€œ"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
 msgid "error while closing pack file"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐั‚ะฒะฐั€ัะฝะตั‚ะพ ะฝะฐ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
 msgid "cannot store pack file"
 msgstr "ะฟะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝ"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
 msgid "cannot store index file"
 msgstr "ั„ะฐะนะปัŠั‚ ะทะฐ ะธะฝะดะตะบัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠั…ั€ะฐะฝะตะฝ"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "ะทะฐะดะฐะดะตะฝะฐ ะต ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฒะตั€ัะธั ะฟะฐะบะตั‚ะธั€ะฐะฝะต: โ€žpack.indexversion=%<PRIu32>โ€œ"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "ะกัŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะธัั‚ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "ะกัŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะธัั‚ ะธะฝะดะตะบั ะทะฐ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "%d ะพะฑะตะบั‚ ะฝะต ะต ั€ะฐะทะปะธะบะฐ"
 msgstr[1] "%d ะพะฑะตะบั‚ะฐ ะฝะต ัะฐ ั€ะฐะทะปะธะบะฐ"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "ะดัŠะปะถะธะฝะฐั‚ะฐ ะฝะฐ ะฒะตั€ะธะณะฐั‚ะฐ ะต %d: %lu ะพะฑะตะบั‚"
 msgstr[1] "ะดัŠะปะถะธะฝะฐั‚ะฐ ะฝะฐ ะฒะตั€ะธะณะฐั‚ะฐ ะต %d: %lu ะพะฑะตะบั‚ะฐ"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
 msgid "Cannot come back to cwd"
 msgstr "ะŸั€ะพั†ะตััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒัŠั€ะฝะต ะบัŠะผ ะฟั€ะตะดะธัˆะฝะฐั‚ะฐ ั€ะฐะฑะพั‚ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
 #, c-format
 msgid "bad %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--fix-thinโ€œ ะธะทะธัะบะฒะฐ โ€ž--stdinโ€œ"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
 msgid "--stdin requires a git repository"
 msgstr "โ€ž--stdinโ€œ ะธะทะธัะบะฒะฐ ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
 msgid "--verify with no packfile name given"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--verifyโ€œ ะธะทะธัะบะฒะฐ ะธะผะต ะฝะฐ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะฟั€ะพะฒะตั€ะบะฐ ั โ€žfsckโ€œ ะฝะฐ ะฟะฐะบะตั‚ะฝะธั‚ะต ะพะฑะตะบั‚ะธ"
 
@@ -14753,125 +15823,130 @@ msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--trailerโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž--name-
 msgid "no input file given for in-place editing"
 msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝ ะฒั…ะพะดะตะฝ ั„ะฐะนะป ะทะฐ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ะผััั‚ะพ"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [ะžะŸะฆะ˜ะฏโ€ฆ] [ะ”ะ˜ะะŸะะ—ะžะ_ะะ_ะ’ะ•ะ ะกะ˜ะ˜ะขะ•] [[--] ะŸะชะขโ€ฆ]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [ะžะŸะฆะ˜ะฏโ€ฆ] ะžะ‘ะ•ะšะขโ€ฆ"
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะพะฟั†ะธั โ€ž--decorateโ€œ: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:174
 msgid "show source"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะทั…ะพะดะฝะธั ะบะพะด"
 
-#: builtin/log.c:174
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr ""
 "ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ั„ะฐะนะป ะทะฐ ััŠะพั‚ะฒะตั‚ัั‚ะฒะธัั‚ะฐ ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะธ ะฐะดั€ะตัะธั‚ะต ะฝะฐ ะต-ะฟะพั‰ะฐ (โ€ž."
 "mailmapโ€œ)"
 
-#: builtin/log.c:176
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr "ัะฟะตั†ะธะฐะปะตะฝ ั„ะพั€ะผะฐั‚ ัะฐะผะพ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะฝะฐะฟะฐัะฒะฐั‰ะธ ะฝะฐ ะจะะ‘ะ›ะžะะฐ"
 
-#: builtin/log.c:178
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr "ะฑะตะท ัะฟะตั†ะธะฐะปะตะฝ ั„ะพั€ะผะฐั‚ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะฝะฐะฟะฐัะฒะฐั‰ะธ ะฝะฐ ะจะะ‘ะ›ะžะะฐ"
 
-#: builtin/log.c:179
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr "ะฝะฐัั‚ั€ะพะนะบะธ ะฝะฐ ั„ะพั€ะผะฐฬ€ั‚ะฐ ะฝะฐ ะธะทะฒะตะถะดะฐะฝะฐั‚ะฐ ะธะฝั„ะพั€ะผะฐั†ะธั"
 
-#: builtin/log.c:182
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 "ะžะฑั€ะฐะฑะพั‚ะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ั€ะตะดะพะฒะตั‚ะต ะฒัŠะฒ ั„ะฐะนะปะฐ ะฒ ะดะธะฐะฟะฐะทะพะฝะฐ ะพั‚ n ะดะพ m ะฒะบะปัŽั‡ะธั‚ะตะปะฝะพ.  "
 "ะ‘ั€ะพะตะฝะตั‚ะพ ะทะฐะฟะพั‡ะฒะฐ ะพั‚ 1"
 
-#: builtin/log.c:280
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "ะ ะตะทัƒะปั‚ะฐั‚: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ะฟะพะฒั€ะตะดะตะฝ ั„ะฐะนะป"
 
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:550 builtin/log.c:645
 #, c-format
 msgid "could not read object %s"
 msgstr "ะพะฑะตะบั‚ัŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ: %s"
 
-#: builtin/log.c:668
+#: builtin/log.c:670
 #, c-format
 msgid "unknown type: %d"
 msgstr "ะฝะตะธะทะฒะตัั‚ะตะฝ ะฒะธะด: %d"
 
-#: builtin/log.c:791
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะฟั€ะธะดั€ัƒะถะฐะฒะฐั‰ะพ ะฟะธัะผะพ ะพั‚ ั€ะตะถะธะผะฐ ะฝะฐ ะพะฟะธัะฐะฝะธะต"
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ โ€žformat.headersโ€œ"
 
-#: builtin/log.c:908
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr "ะฟั€ะตะบะฐะปะตะฝะพ ะดัŠะปะณะพ ะธะผะต ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะทะฐ ะธะทั…ะพะดะฝะฐั‚ะฐ ะธะฝั„ะพั€ะผะฐั†ะธั"
 
-#: builtin/log.c:924
+#: builtin/log.c:952
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "ั„ะฐะนะปัŠั‚-ะบั€ัŠะฟะบะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ"
 
-#: builtin/log.c:941
+#: builtin/log.c:969
 msgid "need exactly one range"
 msgstr "ั‚ั€ัะฑะฒะฐ ะดะฐ ะทะฐะดะฐะดะตั‚ะต ั‚ะพั‡ะฝะพ ะตะดะธะฝ ะดะธะฐะฟะฐะทะพะฝ"
 
-#: builtin/log.c:951
+#: builtin/log.c:979
 msgid "not a range"
 msgstr "ะฝะต ะต ะดะธะฐะฟะฐะทะพะฝ"
 
-#: builtin/log.c:1074
+#: builtin/log.c:1143
 msgid "cover letter needs email format"
 msgstr "ะฟั€ะธะดั€ัƒะถะฐะฒะฐั‰ะพั‚ะพ ะฟะธัะผะพ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ั„ะพั€ะผะฐั‚ะธั€ะฐะฝะพ ะบะฐั‚ะพ ะต-ะฟะธัะผะพ"
 
-#: builtin/log.c:1080
+#: builtin/log.c:1149
 msgid "failed to create cover-letter file"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะธะดั€ัƒะถะฐะฒะฐั‰ะพ ะฟะธัะผะพ"
 
-#: builtin/log.c:1159
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะพั€ะผะฐั‚ ะฝะฐ ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะทะฐ ะพั‚ะณะพะฒะพั€ โ€žin-reply-toโ€œ: %s"
 
-#: builtin/log.c:1186
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [ะžะŸะฆะ˜ะฏโ€ฆ] [ะžะข | ะ”ะ˜ะะŸะะ—ะžะ_ะะ_ะ’ะ•ะ ะกะ˜ะ˜ะขะ•]"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1313
 msgid "two output directories?"
 msgstr "ะผะพะถะต ะดะฐ ัƒะบะฐะถะตั‚ะต ะผะฐะบัะธะผัƒะผ ะตะดะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะทะฐ ะธะทั…ะพะด"
 
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, c-format
 msgid "unknown commit %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะพ ะฟะพะดะฐะฒะฐะฝะต: โ€ž%sโ€œ"
 
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ัƒะบะฐะทะฐั‚ะตะป ะธะปะธ ะฝะต ัะพั‡ะธ ะบัŠะผ ะฝะธั‰ะพ"
 
-#: builtin/log.c:1370
+#: builtin/log.c:1439
 msgid "could not find exact merge base"
 msgstr "ั‚ะพั‡ะฝะฐั‚ะฐ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะฐ"
 
-#: builtin/log.c:1374
+#: builtin/log.c:1443
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -14881,281 +15956,291 @@ msgstr ""
 "ะทะฐะดะฐะดะตั‚ะต, ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit branch --set-upstream-toโ€œ.\n"
 "ะœะพะถะตั‚ะต ั€ัŠั‡ะฝะพ ะดะฐ ะทะฐะดะฐะดะตั‚ะต ะฑะฐะทะพะฒะพ ะฟะพะดะฐะฒะฐะฝะต ั‡ั€ะตะท โ€ž--base=<base-commit-id>โ€œ."
 
-#: builtin/log.c:1394
+#: builtin/log.c:1463
 msgid "failed to find exact merge base"
 msgstr "ั‚ะพั‡ะฝะฐั‚ะฐ ะฑะฐะทะฐ ะฟั€ะธ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะฐ"
 
-#: builtin/log.c:1405
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr "ะฑะฐะทะพะฒะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ะฟั€ะตะดัˆะตัั‚ะฒะตะฝะธะบัŠั‚ ะฝะฐ ัะฟะธััŠะบะฐ ั ะฒะตั€ัะธะธั‚ะต"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr "ะฑะฐะทะพะฒะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะต ะฒ ัะฟะธััŠะบะฐ ั ะฒะตั€ัะธะธั‚ะต"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr "ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ัŠั‚ ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝ"
 
-#: builtin/log.c:1514
+#: builtin/log.c:1583
 msgid "failed to infer range-diff ranges"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะพะฟั€ะตะดะตะปัะฝะต ะฝะฐ ะดะธะฐะฟะฐะทะพะฝะธั‚ะต ะทะฐ ั€ะฐะทะปะธะบะฐ"
 
-#: builtin/log.c:1559
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "ะฝะพะผะตั€ะฐั†ะธั โ€ž[PATCH n/m]โ€œ ะดะพั€ะธ ะธ ะฟั€ะธ ะตะดะธะฝัั‚ะฒะตะฝะฐ ะบั€ัŠะฟะบะฐ"
 
-#: builtin/log.c:1562
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr "ะฝะพะผะตั€ะฐั†ะธั โ€ž[PATCH]โ€œ ะดะพั€ะธ ะธ ะฟั€ะธ ะผะฝะพะถะตัั‚ะฒะพ ะบั€ัŠะฟะบะธ"
 
-#: builtin/log.c:1566
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะธั‚ะต ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะธะทั…ะพะด"
 
-#: builtin/log.c:1568
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะธะดั€ัƒะถะฐะฒะฐั‰ะพ ะฟะธัะผะพ"
 
-#: builtin/log.c:1570
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr "ะฟั€ะพัั‚ะฐ ั‡ะธัะปะพะฒะฐ ะฟะพัะปะตะดะพะฒะฐั‚ะตะปะฝะพัั‚ ะทะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต-ะบั€ัŠะฟะบะธ"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr "ะ—ะะะฆะ˜"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ั‚ะตะทะธ ะ—ะะะฆะ˜ ะทะฐ ััƒั„ะธะบั ะฒะผะตัั‚ะพ โ€ž.patchโ€œ"
 
-#: builtin/log.c:1574
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr "ะฝะพะผะตั€ะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะธั‚ะต ะดะฐ ะทะฐะฟะพั‡ะฒะฐ ะพั‚ ั‚ะพะทะธ ะ‘ะ ะžะ™, ะฐ ะฝะต ั 1"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr "ะพั‚ะฑะตะปัะทะฒะฐะฝะต, ั‡ะต ั‚ะพะฒะฐ ะต N-ั‚ะฐั‚ะฐ ะฟะพั€ะตะดะฝะฐ ั€ะตะดะฐะบั†ะธั ะฝะฐ ะฟะพั€ะตะดะธั†ะฐั‚ะฐ ะพั‚ ะบั€ัŠะฟะบะธ"
 
-#: builtin/log.c:1578
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ โ€ž[RFC PATCH]โ€œ ะฒะผะตัั‚ะพ โ€ž[PATCH]โ€œ"
 
-#: builtin/log.c:1581
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "ั€ะตะถะธะผ-ะฟั€ะธะดั€ัƒะถะฐะฒะฐั‰ะพ-ะฟะธัะผะพ-ะฟะพ-ะพะฟะธัะฐะฝะธะต"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"ะณะตะฝะตั€ะธั€ะฐะฝะต ะฝะฐ ั‡ะฐัั‚ะธั‚ะต ะฝะฐ ะฟั€ะธะดั€ัƒะถะฐะฒะฐั‰ะพั‚ะพ ะฟะธัะผะพ ะฝะฐ ะฑะฐะทะฐั‚ะฐ ะฝะฐ ะพะฟะธัะฐะฝะธะตั‚ะพ ะฝะฐ "
+"ะบะปะพะฝะฐ"
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ั‚ะพะทะธ โ€ž[ะŸะ ะ•ะคะ˜ะšะก]โ€œ ะฒะผะตัั‚ะพ โ€ž[PATCH]โ€œ"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะทั…ะพะดะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฒ ั‚ะฐะทะธ ะ”ะ˜ะ ะ•ะšะขะžะ ะ˜ะฏ"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr "ะฑะตะท ะดะพะฑะฐะฒัะฝะต/ะผะฐั…ะฐะฝะต ะฝะฐ ะฟั€ะตั„ะธะบัะฐ โ€ž[PATCH]โ€œ"
 
-#: builtin/log.c:1590
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั€ะฐะทะปะธะบะธ ะผะตะถะดัƒ ะดะฒะพะธั‡ะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/log.c:1592
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr "ะฒ ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ โ€žFrom:โ€œ (ะพั‚) ะบะพะฝั‚ั€ะพะปะฝะฐั‚ะฐ ััƒะผะฐ ะดะฐ ะต ัะฐะผะพ ะพั‚ ะฝัƒะปะธ"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr "ะฑะตะท ะบั€ัŠะฟะบะธ, ะบะพะธั‚ะพ ะฟั€ะธััŠัั‚ะฒะฐั‚ ะฒ ัะปะตะดะตะฝะธั ะบะปะพะฝ"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฒัŠะฒ ั„ะพั€ะผะฐั‚ ะทะฐ ะบั€ัŠะฟะบะธ, ะฐ ะฝะฐ ะฒ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั (ะบั€ัŠะฟะบะฐ ะธ ัั‚ะฐั‚ะธัั‚ะธะบะฐ)"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr "ะžะฟั†ะธะธ ะฟั€ะธ ะธะทะฟั€ะฐั‰ะฐะฝะต"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1672
 msgid "header"
 msgstr "ะ—ะะ“ะ›ะะ’ะะ_ะงะะกะข"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะฐะทะธ ะ—ะะ“ะ›ะะ’ะะ_ะงะะกะข"
 
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr "ะ•-ะŸะžะฉะ"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะทะฐะณะปะฐะฒะฝะฐ ั‡ะฐัั‚ โ€žTo:โ€œ (ะดะพ)"
 
-#: builtin/log.c:1603
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะทะฐะณะปะฐะฒะฝะฐ ั‡ะฐัั‚ โ€žCc:โ€œ (ะธ ะดะพ)"
 
-#: builtin/log.c:1605
+#: builtin/log.c:1678
 msgid "ident"
 msgstr "ะ˜ะ”ะ•ะะขะ˜ะงะะžะกะข"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฐะดั€ะตัะฐ ะฒ ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ โ€žFromโ€œ (ะพั‚) ะดะฐ ะต ั‚ะฐะทะธ ะ˜ะ”ะ•ะะขะ˜ะงะะžะกะข.  ะะบะพ "
 "ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ั‚ะฐะบะฐะฒะฐ, ัะต ะฒะทะธะผะฐ ะฐะดั€ะตัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐั‰ะธั"
 
-#: builtin/log.c:1608
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr "ะ˜ะ”ะ•ะะขะ˜ะคะ˜ะšะะขะžะ _ะะ_ะกะชะžะ‘ะฉะ•ะะ˜ะ•"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 "ะฟัŠั€ะฒะพั‚ะพ ััŠะพะฑั‰ะตะฝะธะต ะดะฐ ะต ะฒ ะพั‚ะณะพะฒะพั€ ะฝะฐ ะต-ะฟะธัะผะพั‚ะพ ั ั‚ะพะทะธ "
 "ะ˜ะ”ะ•ะะขะ˜ะคะ˜ะšะะขะžะ _ะะ_ะกะชะžะ‘ะฉะ•ะะ˜ะ•"
 
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr "ะณั€ะฐะฝะธั†ะฐ"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr "ะฟั€ะธะบั€ะตะฟัะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ"
 
-#: builtin/log.c:1614
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr "ะฒะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ ะฒ ั‚ะตะบัั‚ะฐ ะฝะฐ ะฟะธัะผะฐั‚ะฐ"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฝะธัˆะบะธ ะทะฐ ััŠะพะฑั‰ะตะฝะธัั‚ะฐ.  ะกะขะ˜ะ›ัŠั‚ ะต โ€žshallowโ€œ (ะฟะปะธั‚ัŠะบ) ะธะปะธ "
 "โ€ždeepโ€œ (ะดัŠะปะฑะพะบ)"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1693
 msgid "signature"
 msgstr "ะฟะพะดะฟะธั"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะพะปะต ะทะฐ ะฟะพะดะฟะธั"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr "ะ‘ะะ—ะžะ’ะž_ะŸะžะ”ะะ’ะะะ•"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะตะพะฑั…ะพะดะธะผะพั‚ะพ ะ‘ะะ—ะพะฒะพ ะดัŠั€ะฒะพ ะบัŠะผ ะฟะพั€ะตะดะธั†ะฐั‚ะฐ ะพั‚ ะบั€ัŠะฟะบะธ"
 
-#: builtin/log.c:1625
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะพะดะฟะธั ะพั‚ ั„ะฐะนะป"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ะบั€ัŠะฟะบะธั‚ะต"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ ะฒัŠะฒ ั„ะฐะทะฐั‚ะฐ ะฝะฐ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะธั‚ะต"
 
-#: builtin/log.c:1630
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ัะฟั€ัะผะพ ะ’ะ•ะ ะกะธัั‚ะฐ ะฒ ะฟั€ะธะดั€ัƒะถะฐะฒะฐั‰ะพั‚ะพ ะฟะธัะผะพ ะธะปะธ ะตะดะธะฝัั‚ะฒะตะฝะฐ "
 "ะบั€ัŠะฟะบะฐ"
 
-#: builtin/log.c:1633
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ัะฟั€ัะผะพ ัƒะบะฐะทะฐั‚ะตะปั ะฝะฐ ะ’ะ•ะ ะกะธัั‚ะฐ ะฒ ะฟั€ะธะดั€ัƒะถะฐะฒะฐั‰ะพั‚ะพ ะฟะธัะผะพ "
 "ะธะปะธ ะตะดะธะฝัั‚ะฒะตะฝะฐ ะบั€ัŠะฟะบะฐ"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr "ะฟั€ะพั†ะตะฝั‚ ะทะฐ ะฟั€ะตั‚ะตะณะปัะฝะต ะฟั€ะธ ะพั†ะตะฝะบะฐ ะฝะฐ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ"
 
-#: builtin/log.c:1710
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ะณั€ะตัˆะฝะฐ ะธะดะตะฝั‚ะธั‡ะฝะพัั‚: %s"
 
-#: builtin/log.c:1725
+#: builtin/log.c:1807
 msgid "-n and -k are mutually exclusive"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž-nโ€œ ะธ โ€ž-kโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/log.c:1727
+#: builtin/log.c:1809
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--subject-prefixโ€œ/โ€ž-rfcโ€œ ะธ โ€ž-kโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/log.c:1735
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--name-onlyโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะณะตะฝะตั€ะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะธ"
 
-#: builtin/log.c:1737
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--name-statusโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะณะตะฝะตั€ะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะธ"
 
-#: builtin/log.c:1739
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--checkโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะณะตะฝะตั€ะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะบั€ัŠะฟะบะธ"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
 msgstr ""
 "ะธะทั…ะพะดัŠั‚ ะผะพะถะต ะดะฐ ะธะปะธ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธัั‚, ะธะปะธ ะดะฐ ะต ะฒ ะดะธั€ะตะบั‚ะพั€ะธั, ะฝะพ ะฝะต ะธ ะดะฒะตั‚ะต."
 
-#: builtin/log.c:1860
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--interdiffโ€œ ะธะทะธัะบะฒะฐ ะพะฟั†ะธั โ€ž--cover-letterโ€œ ะธะปะธ ะตะดะธะฝัั‚ะฒะตะฝะฐ ะบั€ัŠะฟะบะฐ"
 
-#: builtin/log.c:1864
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr "ะ ะฐะทะปะธะบะฐ ะฒ ั€ะฐะทะปะธะบะธั‚ะต:"
 
-#: builtin/log.c:1865
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "ะ ะฐะทะปะธะบะฐ ะฒ ั€ะฐะทะปะธะบะธั‚ะต ัะฟั€ัะผะพ v%d:"
 
-#: builtin/log.c:1871
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--creation-factorโ€œ ะธะทะธัะบะฒะฐ ะพะฟั†ะธั โ€ž--range-diffโ€œ"
 
-#: builtin/log.c:1875
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--range-diffโ€œ ะธะทะธัะบะฒะฐ ะพะฟั†ะธั โ€ž--cover-letterโ€œ ะธะปะธ ะตะดะธะฝัั‚ะฒะตะฝะฐ ะบั€ัŠะฟะบะฐ"
 
-#: builtin/log.c:1883
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr "ะ”ะธะฐะฟะฐะทะพะฝะฝะฐ ั€ะฐะทะปะธะบะฐ:"
 
-#: builtin/log.c:1884
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "ะ”ะธะฐะฟะฐะทะพะฝะฝะฐ ั€ะฐะทะปะธะบะฐ ัะฟั€ัะผะพ v%d:"
 
-#: builtin/log.c:1895
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ั ะฟะพะดะฟะธั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/log.c:1931
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr "ะกัŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะธ"
 
-#: builtin/log.c:1975
+#: builtin/log.c:2073
 msgid "failed to create output files"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะธะทั…ะพะดะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/log.c:2034
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [ะžะขะ”ะะ›ะ•ะงะ•ะ_ะšะ›ะžะ [ะ’ะ ะชะฅ [ะŸะ ะ•ะ”ะ•ะ›]]]"
 
-#: builtin/log.c:2088
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15283,7 +16368,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะดั€ะตัะธั‚ะต ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะธั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะฐ"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
 msgid "exec"
 msgstr "ะšะžะœะะะ”ะ"
 
@@ -15370,152 +16455,153 @@ msgstr "git merge --abort"
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:119
 msgid "switch `m' requires a value"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž-mโ€œ ะธะทะธัะบะฒะฐ ัั‚ะพะนะฝะพัั‚"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž%sโ€œ ะธะทะธัะบะฒะฐ ัั‚ะพะนะฝะพัั‚"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:188
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "ะัะผะฐ ั‚ะฐะบะฐะฒะฐ ัั‚ั€ะฐั‚ะตะณะธั ะทะฐ ัะปะธะฒะฐะฝะต: โ€ž%sโ€œ.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:189
 #, c-format
 msgid "Available strategies are:"
 msgstr "ะะฐะปะธั‡ะฝะธั‚ะต ัั‚ั€ะฐั‚ะตะณะธะธ ัะฐ:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:194
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "ะ”ะพะฟัŠะปะฝะธั‚ะตะปะฝะธั‚ะต ัั‚ั€ะฐั‚ะตะณะธะธ ัะฐ:"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:245 builtin/pull.c:132
 msgid "do not show a diffstat at the end of the merge"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะฐั‚ะธัั‚ะธะบะฐั‚ะฐ ัะปะตะด ะทะฐะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะต"
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:248 builtin/pull.c:135
 msgid "show a diffstat at the end of the merge"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะฐั‚ะธัั‚ะธะบะฐั‚ะฐ ัะปะตะด ะทะฐะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะต"
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:249 builtin/pull.c:138
 msgid "(synonym to --stat)"
 msgstr "(ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ€ž--statโ€œ)"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:251 builtin/pull.c:141
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "ะดะพะฑะฐะฒัะฝะต (ะฝะฐ ะผะฐะบัะธะผัƒะผ ั‚ะฐะบัŠะฒ ะ‘ะ ะžะ™) ะทะฐะฟะธัะธ ะพั‚ ััŠะบั€ะฐั‚ะตะฝะธั ะถัƒั€ะฝะฐะป ะฒ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ "
 "ะทะฐ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:254 builtin/pull.c:147
 msgid "create a single commit instead of doing a merge"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะตะดะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฒะผะตัั‚ะพ ะธะทะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะต"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:256 builtin/pull.c:150
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "ะธะทะฒัŠั€ัˆะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฟั€ะธ ัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะดะตะนัั‚ะฒะธะต)"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:258 builtin/pull.c:153
 msgid "edit message before committing"
 msgstr "ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะฟั€ะตะดะธ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:260
 msgid "allow fast-forward (default)"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟั€ะตะฒัŠั€ั‚ะฐะฝะต (ัั‚ะฐะฝะดะฐั€ั‚ะฝะพ ะดะตะนัั‚ะฒะธะต)"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:262 builtin/pull.c:160
 msgid "abort if fast-forward is not possible"
 msgstr "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต, ะฐะบะพ ะฟั€ะตะฒัŠั€ั‚ะฐะฝะตั‚ะพ ะต ะฝะตะฒัŠะทะผะพะถะฝะพ"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:266 builtin/pull.c:163
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ, ั‡ะต ัƒะบะฐะทะฐะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ะต ั ะฟั€ะฐะฒะธะปะตะฝ ะฟะพะดะฟะธั ะฝะฐ GPG"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
 msgid "strategy"
 msgstr "ะกะขะ ะะขะ•ะ“ะ˜ะฏ"
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:268 builtin/pull.c:168
 msgid "merge strategy to use"
 msgstr "ะกะขะ ะะขะ•ะ“ะ˜ะฏ ะทะฐ ัะปะธะฒะฐะฝะต, ะบะพัั‚ะพ ะดะฐ ัะต ะฟะพะปะทะฒะฐ"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:171
 msgid "option=value"
 msgstr "ะžะŸะฆะ˜ะฏ=ะกะขะžะ™ะะžะกะข"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option for selected merge strategy"
 msgstr "ะžะŸะฆะ˜ะฏ ะทะฐ ะธะทะฑั€ะฐะฝะฐั‚ะฐ ัั‚ั€ะฐั‚ะตะณะธั ะทะฐ ัะปะธะฒะฐะฝะต"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "ะกะชะžะ‘ะฉะ•ะะ˜ะ• ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ ััŠั ัะปะธะฒะฐะฝะต (ะฟั€ะธ ััŠั‰ะธะฝัะบะธ ัะปะธะฒะฐะฝะธั)"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะพั‚ะพ ัะปะธะฒะฐะฝะต"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฑะตะท ะฟั€ะพะผัะฝะฐ ะฝะฐ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr "ะฟั€ะพะดัŠะปะถะฐะฒะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะพั‚ะพ ัะปะธะฒะฐะฝะต"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:285 builtin/pull.c:179
 msgid "allow merging unrelated histories"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะฐ ะฝะตะทะฐะฒะธัะธะผะธ ะธัั‚ะพั€ะธะธ"
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
-"ะฟั€ะพะฒะตั€ะบะฐ ะฝะฐ ะบัƒะบะฐั‚ะฐ ะฟั€ะธ ะฟั€ะพะผัะฝะฐ ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต (commit-msg)"
+"ะฑะตะท ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบัƒะบะธั‚ะต ะฟั€ะตะดะธ ะฟะพะดะฐะฒะฐะฝะต ะธ ัะปะธะฒะฐะฝะต ะธ ะฟั€ะธ ะฟั€ะพะผัะฝะฐ ะฝะฐ "
+"ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต (pre-merge-commit ะธ commit-msg)"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:308
 msgid "could not run stash."
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ัะบะฐั‚ะฐะฒะฐะฝะต"
 
-#: builtin/merge.c:312
+#: builtin/merge.c:313
 msgid "stash failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ัะบะฐั‚ะฐะฒะฐะฝะต"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:318
 #, c-format
 msgid "not a valid object: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะพะฑะตะบั‚: โ€ž%sโ€œ"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
 msgid "read-tree failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะฟั€ะพั‡ะธั‚ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚-ะดัŠั€ะฒะพ"
 
-#: builtin/merge.c:386
+#: builtin/merge.c:387
 msgid " (nothing to squash)"
 msgstr " (ะฝัะผะฐ ะบะฐะบะฒะพ ะดะฐ ัะต ะฒะบะฐั€ะฐ)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:398
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "ะ’ะบะฐั€ะฐะฝะพ ะฟะพะดะฐะฒะฐะฝะต โ€” ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝัะผะฐ ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:448
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 "ะ›ะธะฟัะฒะฐ ััŠะพะฑั‰ะตะฝะธะต ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต โ€” ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝัะผะฐ ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:499
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "โ€ž%sโ€œ ะฝะต ัะพั‡ะธ ะบัŠะผ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:586
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ะฝะธะท ะทะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žbranch.%s.mergeoptionsโ€œ: โ€ž%sโ€œ"
@@ -15568,76 +16654,76 @@ msgstr ""
 "ะ ะตะดะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะทะฐะฟะพั‡ะฒะฐั‚ ั โ€ž%cโ€œ, ั‰ะต ะฑัŠะดะฐั‚ ะฟั€ะพะฟัƒัะฝะฐั‚ะธ, ะฐ ะฟั€ะฐะทะฝะพ\n"
 "ััŠะพะฑั‰ะตะฝะธะต ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ.\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:865
 msgid "Empty commit message."
 msgstr "ะŸั€ะฐะทะฝะพ ััŠะพะฑั‰ะตะฝะธะต ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต."
 
-#: builtin/merge.c:872
+#: builtin/merge.c:880
 #, c-format
 msgid "Wonderful.\n"
 msgstr "ะŸัŠั€ะฒะธัั‚ ะตั‚ะฐะฟ ะฝะฐ ัะปะธะฒะฐะฝะตั‚ะพ ะทะฐะฒัŠั€ัˆะธ.\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:941
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "ะะตัƒัะฟะตัˆะฝะพ ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ัะปะธะฒะฐะฝะต โ€” ะบะพั€ะธะณะธั€ะฐะนั‚ะต ะบะพะฝั„ะปะธะบั‚ะธั‚ะต ะธ ะฟะพะดะฐะนั‚ะต "
 "ั€ะตะทัƒะปั‚ะฐั‚ะฐ.\n"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:980
 msgid "No current branch."
 msgstr "ะัะผะฐ ั‚ะตะบัƒั‰ ะบะปะพะฝ."
 
-#: builtin/merge.c:974
+#: builtin/merge.c:982
 msgid "No remote for the current branch."
 msgstr "ะขะตะบัƒั‰ะธัั‚ ะบะปะพะฝ ะฝะต ัะปะตะดะธ ะฝะธะบะพะน."
 
-#: builtin/merge.c:976
+#: builtin/merge.c:984
 msgid "No default upstream defined for the current branch."
 msgstr "ะขะตะบัƒั‰ะธัั‚ ะบะปะพะฝ ะฝะต ัะปะตะดะธ ะฝะธะบะพะน ะบะปะพะฝ."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:989
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "ะะธะบะพะน ะบะปะพะฝ ะฝะต ัะปะตะดะธ ะบะปะพะฝะฐ โ€ž%sโ€œ ะพั‚ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ โ€ž%sโ€œ"
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1046
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ ะฒ ัั€ะตะดะฐั‚ะฐ โ€ž%sโ€œ"
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1149
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ัะปะตะต ะฒ โ€ž%sโ€œ: %s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1183
 msgid "not something we can merge"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ัะปะตะต"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1286
 msgid "--abort expects no arguments"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--abortโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1290
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "ะะต ะผะพะถะต ะดะฐ ะฟั€ะตัƒัั‚ะฐะฝะพะฒะธั‚ะต ัะปะธะฒะฐะฝะต, ะทะฐั‰ะพั‚ะพ ะฒ ะผะพะผะตะฝั‚ะฐ ะฝะต ัะต ะธะทะฒัŠั€ัˆะฒะฐ ั‚ะฐะบะพะฒะฐ "
 "(ะปะธะฟัะฒะฐ ัƒะบะฐะทะฐั‚ะตะป โ€žMERGE_HEADโ€œ)."
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1299
 msgid "--quit expects no arguments"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--quitโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1312
 msgid "--continue expects no arguments"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--continueโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1316
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "ะ’ ะผะพะผะตะฝั‚ะฐ ะฝะต ัะต ะธะทะฒัŠั€ัˆะฒะฐ ัะปะธะฒะฐะฝะต (ะปะธะฟัะฒะฐ ัƒะบะฐะทะฐั‚ะตะป โ€žMERGE_HEADโ€œ)."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1332
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15645,7 +16731,7 @@ msgstr ""
 "ะะต ัั‚ะต ะทะฐะฒัŠั€ัˆะธะปะธ ัะปะธะฒะฐะฝะต.  (ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žMERGE_HEADโ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ).\n"
 "ะŸะพะดะฐะนั‚ะต ะฟั€ะพะผะตะฝะธั‚ะต ัะธ, ะฟั€ะตะดะธ ะดะฐ ะทะฐะฟะพั‡ะฝะตั‚ะต ะฝะพะฒะพ ัะปะธะฒะฐะฝะต."
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1339
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15653,103 +16739,103 @@ msgstr ""
 "ะะต ัั‚ะต ะทะฐะฒัŠั€ัˆะธะปะธ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต (ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žCHERRY_PICK_HEADโ€œ\n"
 "ััŠั‰ะตัั‚ะฒัƒะฒะฐ).  ะŸะพะดะฐะนั‚ะต ะฟั€ะพะผะตะฝะธั‚ะต ัะธ, ะฟั€ะตะดะธ ะดะฐ ะทะฐะฟะพั‡ะฝะตั‚ะต ะฝะพะฒะพ ัะปะธะฒะฐะฝะต."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1342
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "ะะต ัั‚ะต ะทะฐะฒัŠั€ัˆะธะปะธ ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต (ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žCHERRY_PICK_HEADโ€œ\n"
 "ััŠั‰ะตัั‚ะฒัƒะฒะฐ)."
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1356
 msgid "You cannot combine --squash with --no-ff."
 msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž--squashโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž--no-ffโ€œ."
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1358
 msgid "You cannot combine --squash with --commit."
 msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž--squashโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž--commitโ€œ."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1374
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "ะะต ะต ัƒะบะฐะทะฐะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะธ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žmerge.defaultToUpstreamโ€œ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1391
 msgid "Squash commit into empty head not supported yet"
 msgstr "ะ’ะบะฐั€ะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฒัŠะฒ ะฒั€ัŠั… ะฑะตะท ะธัั‚ะพั€ะธั ะฒัะต ะพั‰ะต ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1393
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "ะŸะพะฝะตะถะต ะฒัŠั€ั…ัŠั‚ ะต ะฑะตะท ะธัั‚ะพั€ะธั, ะฒัะธั‡ะบะธ ัะปะธะฒะฐะฝะธั ัะฐ ะฟั€ะตะฒัŠั€ั‚ะฐะฝะธั, ะฝะต ะผะพะถะต ะดะฐ ัะต "
 "ะธะทะฒัŠั€ัˆะธ ััŠั‰ะธะฝัะบะพ ัะปะธะฒะฐะฝะต ะธะทะธัะบะฒะฐะฝะพ ะพั‚ ะพะฟั†ะธัั‚ะฐ โ€ž--no-ffโ€œ"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1398
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "โ€ž%sโ€œ โ€” ะฝะต ะต ะฝะตั‰ะพ, ะบะพะตั‚ะพ ะผะพะถะต ะดะฐ ัะต ัะปะตะต"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1400
 msgid "Can merge only exactly one commit into empty head"
 msgstr "ะœะพะถะตั‚ะต ะดะฐ ัะปะตะตั‚ะต ั‚ะพั‡ะฝะพ ะตะดะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฒัŠะฒ ะฒั€ัŠั… ะฑะตะท ะธัั‚ะพั€ะธั"
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1481
 msgid "refusing to merge unrelated histories"
 msgstr "ะฝะตะทะฐะฒะธัะธะผะธ ะธัั‚ะพั€ะธะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะปะตัั‚"
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1490
 msgid "Already up to date."
 msgstr "ะ’ะตั‡ะต ะต ะพะฑะฝะพะฒะตะฝะพ."
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1500
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต โ€ž%s..%sโ€œ\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "ะŸั€ะพะฑะฐ ััŠั ัะปะธะฒะฐะฝะต ะฒ ั€ะฐะผะบะธั‚ะต ะฝะฐ ะธะฝะดะตะบัะฐโ€ฆ\n"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1549
 #, c-format
 msgid "Nope.\n"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต.\n"
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1574
 msgid "Already up to date. Yeeah!"
 msgstr "ะ’ะตั‡ะต ะต ะพะฑะฝะพะฒะตะฝะพ!"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1580
 msgid "Not possible to fast-forward, aborting."
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ ะฟั€ะตะฒัŠั€ั‚ะฐะฝะต, ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนัั‚ะฒะธะตั‚ะพ."
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1603 builtin/merge.c:1668
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "ะŸั€ะธะฒะตะถะดะฐะฝะต ะฝะฐ ะดัŠั€ะฒะพั‚ะพ ะบัŠะผ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพโ€ฆ\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1607
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "ะŸั€ะพะฑะฒะฐะฝะต ััŠั ัั‚ั€ะฐั‚ะตะณะธัั‚ะฐ ะทะฐ ัะปะธะฒะฐะฝะต โ€ž%sโ€œโ€ฆ\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1659
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "ะะธะบะพั ัั‚ั€ะฐั‚ะตะณะธั ะทะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะธะทะฒัŠั€ัˆะธ ัะปะธะฒะฐะฝะตั‚ะพ.\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1661
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต ััŠั ัั‚ั€ะฐั‚ะตะณะธั โ€ž%sโ€œ.\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1670
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 "ะŸะพะปะทะฒะฐ ัะต ัั‚ั€ะฐั‚ะตะณะธัั‚ะฐ โ€ž%sโ€œ, ะบะพัั‚ะพ ั‰ะต ะฟะพะดะณะพั‚ะฒะธ ะดัŠั€ะฒะพั‚ะพ ะทะฐ ะบะพั€ะธะณะธั€ะฐะฝะต ะฝะฐ "
 "ั€ัŠะบะฐ.\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1682
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -15837,33 +16923,33 @@ msgstr "ะฑะตะท ะฟั€ะตะดัƒะฟั€ะตะถะดะตะฝะธั ะฟั€ะธ ะบะพะฝั„ะปะธะบั‚ะธ"
 msgid "set labels for file1/orig-file/file2"
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะตั‚ะธะบะตั‚ะธ ะทะฐ ะคะะ™ะ›_1/ะžะ ะ˜ะ“ะ˜ะะะ›/ะคะะ™ะ›_2"
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะพะฟั†ะธั: โ€ž%sโ€œ"
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะตะฝ ะฐะฝะฐะปะธะท ะฝะฐ ะพะฑะตะบั‚ะฐ โ€ž%sโ€œ"
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ะฟะพะฒะตั‡ะต ะพั‚ %d ะฑะฐะทะฐ.  โ€ž%sโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ."
 msgstr[1] "ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐั‚ ะฟะพะฒะตั‡ะต ะพั‚ %d ะฑะฐะทะธ.  โ€ž%sโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ."
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "ะฟะพะดะดัŠั€ะถะฐ ัะต ัะฐะผะพ ัะปะธะฒะฐะฝะต ะฝะฐ ั‚ะพั‡ะฝะพ ะดะฒะต ะธัั‚ะพั€ะธะธ."
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "ะกะปะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ ั โ€ž%sโ€œ\n"
@@ -15886,19 +16972,19 @@ msgstr "ั€ะฐะทั€ะตัˆะฐะฒะฐะฝะต ะฝะฐ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟะพะฒะตั‡ะต ะพั
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
-"git multi-pack-index [--object-dir=ะ”ะ˜ะ _ะžะ‘ะ•ะšะข] (write|verify|expire|repack --"
-"batch-size=ะ ะะ—ะœะ•ะ )"
+"git multi-pack-index [ะžะŸะฆะ˜ะฏโ€ฆ] (write|verify|expire|repack --batch-"
+"size=ะ ะะ—ะœะ•ะ )"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "ะ”ะ˜ะ ะตะบั‚ะพั€ะธัั‚ะฐ_ั_ะžะ‘ะ•ะšะขะธ ััŠะดัŠั€ะถะฐ ะผะฝะพะถะตัั‚ะฒะพ ะดะฒะพะนะบะธ ะฟะฐะบะตั‚ะฝะธ ั„ะฐะนะปะพะฒะต ััŠั "
 "ััŠะพั‚ะฒะตั‚ะฝะธั ะธะผ ะธะฝะดะตะบั"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15906,15 +16992,15 @@ msgstr ""
 "ะฟั€ะธ ะฟั€ะตะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฟะฐะบะตั‚ะฝะธั‚ะต ั„ะฐะนะปะพะฒะต, ะบะพะธั‚ะพ ัะฐ ั ะฟะพ-ะผะฐะปัŠะบ ะพั‚ ั‚ะพะทะธ ั€ะฐะทะผะตั€, ะดะฐ "
 "ัะต ะพะฑะตะดะธะฝัะฒะฐั‚ ะฒ ะฟะฐะบะตั‚ะธ ั ะฟะพ-ะณะพะปัะผ ะพั‚ ั‚ะพะทะธ ั€ะฐะทะผะตั€"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr "ะฟั€ะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--batch-sizeโ€œ ะธะทะธัะบะฒะฐ ะฟะพะดะบะพะผะฐะฝะดะฐั‚ะฐ โ€žrepackโ€œ"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะฟะพะดะบะพะผะฐะฝะดะฐ: %s"
@@ -16008,54 +17094,54 @@ msgstr "%s, ะพะฑะตะบั‚: โ€ž%sโ€œ, ั†ะตะป: โ€ž%sโ€œ"
 msgid "Renaming %s to %s\n"
 msgstr "ะŸั€ะตะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ ะฝะฐ โ€ž%sโ€œ\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [ะžะŸะฆะ˜ะฏโ€ฆ] ะŸะžะ”ะะ’ะะะ•โ€ฆ"
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [ะžะŸะฆะ˜ะฏโ€ฆ] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [ะžะŸะฆะ˜ะฏโ€ฆ] --stdin"
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐั‚ะฐ (ะฑะตะท ััƒะผะธั‚ะต ะฟะพ SHA1)"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ะตั‚ะธะบะตั‚ะธั‚ะต ะทะฐ ะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะฝะฐะฟะฐัะฒะฐั‰ะธ ะฝะฐ ะจะะ‘ะ›ะžะะฐ"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะฝะฐะฟะฐัะฒะฐั‰ะธ ะฝะฐ ะจะะ‘ะ›ะžะะฐ"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะฟะพะดะฐะฒะฐะฝะธั, ะบะพะธั‚ะพ ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะดะพัั‚ะธะณะฝะฐั‚ะธ ะพั‚ ะฒัะธั‡ะบะธ "
 "ัƒะบะฐะทะฐั‚ะตะปะธ"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "ั‡ะตั‚ะตะฝะต ะพั‚ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "ะดะฐ ัะต ะธะทะฒะตะถะดะฐั‚ ะธ ะฝะตะดะตั„ะธะฝะธั€ะฐะฝะธั‚ะต ะธะผะตะฝะฐ (ัั‚ะฐะฝะดะฐั€ั‚ะฝะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ ะพะฟั†ะธัั‚ะฐ)"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ะธั‚ะต ะฝะฐ ะพะฑะตะบั‚ะธ-ะตั‚ะธะบะตั‚ะธ (ะทะฐ ะฒัŠั‚ั€ะตัˆะฝะธ ะฝัƒะถะดะธ)"
 
@@ -16461,7 +17547,7 @@ msgstr "ะพะฟะธั‚ัŠั‚ ะทะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะฝะฐ ะฝะตััŠั‰ะตัั‚ะฒัƒะฒะฐั‰
 msgid "read object names from the standard input"
 msgstr "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ะธะผะตะฝะฐั‚ะฐ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะพั‚ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "ัะฐะผะพ ะธะทะฒะตะถะดะฐะฝะต ะฑะตะท ะดะตะนัั‚ะฒะธั‚ะตะปะฝะพ ะพะบะฐัั‚ั€ัะฝะต"
 
@@ -16477,7 +17563,7 @@ msgstr "ะฃะšะะ—ะะขะ•ะ›_ะ—ะ_ะ‘ะ•ะ›ะ•ะ–ะšะ"
 msgid "use notes from <notes-ref>"
 msgstr "ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะฑะตะปะตะถะบะฐั‚ะฐ ัะพั‡ะตะฝะฐ ะพั‚ ั‚ะพะทะธ ะฃะšะะ—ะะขะ•ะ›_ะ—ะ_ะ‘ะ•ะ›ะ•ะ–ะšะ"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1643
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะฟะพะดะบะพะผะฐะฝะดะฐ: %s"
@@ -16495,130 +17581,107 @@ msgstr ""
 "git pack-objects [ะžะŸะฆะ˜ะฏโ€ฆ] ะŸะ ะ•ะคะ˜ะšะก_ะะ_ะ˜ะœะ•ะขะž [< ะกะŸะ˜ะกะชะš_ะก_ะฃะšะะ—ะะขะ•ะ›ะ˜ | < "
 "ะกะŸะ˜ะกะชะš_ะก_ะžะ‘ะ•ะšะขะ˜]"
 
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:430
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "ะปะพัˆะฐ ะบะพะฝั‚ั€ะพะปะฝะฐ ััƒะผะฐ ะทะฐ ะฟะฐะบะตั‚ะธั€ะฐะฝะธั ะพะฑะตะบั‚ โ€ž%sโ€œ"
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:441
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "ะฟะฐะบะตั‚ะธั€ะฐะฝ ะพะฑะตะบั‚ ั ะณั€ะตัˆะบะธ ะทะฐ โ€ž%sโ€œ"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:572
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "ั€ะตะบัƒั€ัะธะฒะฝะฐ ั€ะฐะทะปะธะบะฐ ะทะฐ ะพะฑะตะบั‚ โ€ž%sโ€œ"
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "ะฟะพะดั€ะตะดะตะฝะธ ะฑัั…ะฐ %u ะพะฑะตะบั‚ะฐ, ะฐ ัะต ะพั‡ะฐะบะฒะฐั…ะฐ %<PRIu32>"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป: โ€ž%sโ€œ"
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "ะฟะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะฒั‚ะพั€ะฝะพ ะพั‚ะฒะพั€ะตะฝ"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั‚ัŠั€ัะตะฝะต ะฒ ะฟั€ะตะธะทะฟะพะปะทะฒะฐะฝ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั‡ะตั‚ะตะฝะต ะพั‚ ะฟั€ะตะธะทะฟะพะปะทะฒะฐะฝ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:972
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "ะธะทะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะทะฐะฟะธัะฒะฐะฝะตั‚ะพ ะฝะฐ ะฑะธั‚ะพะฒะฐั‚ะฐ ะผะฐัะบะฐ, ะฟะฐะบะตั‚ะธั‚ะต ัะฐ ั€ะฐะทะดะตะปะตะฝะธ ะฟะพั€ะฐะดะธ "
 "ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ โ€žpack.packSizeLimitโ€œ"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:985
 msgid "Writing objects"
 msgstr "ะ—ะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ โ€ž%sโ€œ"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1099
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "ะฑัั…ะฐ ะทะฐะฟะธัะฐะฝะธ %<PRIu32> ะพะฑะตะบั‚ะธ, ะฐ ัะต ะพั‡ะฐะบะฒะฐั…ะฐ %<PRIu32>"
 
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1297
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "ะธะทะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะทะฐะฟะธัะฒะฐะฝะตั‚ะพ ะฝะฐ ะฑะธั‚ะพะฒะฐั‚ะฐ ะผะฐัะบะฐ, ะทะฐั‰ะพั‚ะพ ะฝัะบะพะธ ะพะฑะตะบั‚ะธ ะฝัะผะฐ ะดะฐ ัะต "
 "ะฟะฐะบะตั‚ะธั€ะฐั‚"
 
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1724
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "ะฟั€ะตะบะฐะปะตะฝะพ ะดะฐะปะตั‡ะฝะพ ะฝะฐั‡ะฐะปะพ ะฝะฐ ะพั‚ะผะตัั‚ะฒะฐะฝะตั‚ะพ ะทะฐ ะพะฑะตะบั‚ะธั‚ะต-ั€ะฐะทะปะธะบะฐ ะทะฐ โ€ž%sโ€œ"
 
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1733
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "ะฝะตะดะพัั‚ะธะถะธะผะพ ะฝะฐั‡ะฐะปะพ ะฝะฐ ะพั‚ะผะตัั‚ะฒะฐะฝะตั‚ะพ ะทะฐ ะพะฑะตะบั‚ะธั‚ะต-ั€ะฐะทะปะธะบะฐ ะทะฐ โ€ž%sโ€œ"
 
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:2004
 msgid "Counting objects"
 msgstr "ะŸั€ะตะฑั€ะพัะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
 
-#: builtin/pack-objects.c:2005
-#, c-format
-msgid "unable to get size of %s"
-msgstr "ั€ะฐะทะผะตั€ัŠั‚ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝ"
-
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2149
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚ ะฝะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝะฐ"
 
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
 #, c-format
 msgid "object %s cannot be read"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพั‡ะตั‚ะต"
 
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "ะพะฑะตะบั‚ัŠั‚ โ€ž%sโ€œ ะต ั ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะดัŠะปะถะธะฝะฐ (%<PRIuMAX>, ะฐ ะฝะต %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2259
 msgid "suboptimal pack - out of memory"
 msgstr "ะฝะตะพะฟั‚ะธะผะธะทะธั€ะฐะฝ ะฟะฐะบะตั‚ โ€” ะฟะฐะผะตั‚ั‚ะฐ ัะฒัŠั€ัˆะธ"
 
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2574
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "ะ”ะตะปั‚ะฐ ะบะพะผะฟั€ะตัะธัั‚ะฐ ั‰ะต ะธะทะฟะพะปะทะฒะฐ ะดะพ %d ะฝะธัˆะบะธ"
 
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2713
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 "ะพะฑะตะบั‚ะธั‚ะต, ะบะพะธั‚ะพ ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะดะพัั‚ะธะณะฝะฐั‚ะธ ะพั‚ ะตั‚ะธะบะตั‚ะฐ โ€ž%sโ€œ, ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะฐั‚ "
 "ะฟะฐะบะตั‚ะธั€ะฐะฝะธ"
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2801
 msgid "Compressing objects"
 msgstr "ะšะพะผะฟั€ะตัะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
 
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2807
 msgid "inconsistency with delta count"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฑั€ะพะน ั€ะฐะทะปะธะบะธ"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2888
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16627,7 +17690,7 @@ msgstr ""
 "ะพั‡ะฐะบะฒะฐ ัะต ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ ะฝะฐ ะบั€ะฐะตะฝ ะพะฑะตะบั‚, ะฐ ะฝะต:\n"
 " %s"
 
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2894
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16636,267 +17699,252 @@ msgstr ""
 "ะพั‡ะฐะบะฒะฐ ัะต ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ ะฝะฐ ะพะฑะตะบั‚, ะฐ ะฝะต:\n"
 " %s"
 
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2992
 msgid "invalid value for --missing"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€ž--missingโ€œ"
 
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
 msgid "cannot open pack index"
 msgstr "ะธะฝะดะตะบััŠั‚ ะฝะฐ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:3082
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝะธัั‚ ะพะฑะตะบั‚ ะฒ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฐะฝะฐะปะธะทะธั€ะฐะฝ"
 
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3167
 msgid "unable to force loose object"
 msgstr "ะพัั‚ะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะพะฑะตะบั‚ะฐ ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฝะฐะปะพะถะตะฝะพ"
 
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3260
 #, c-format
 msgid "not a rev '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ะฒะตั€ัะธั"
 
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3263
 #, c-format
 msgid "bad revision '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฒะตั€ัะธั โ€ž%sโ€œ"
 
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3288
 msgid "unable to add recent objects"
 msgstr "ัะบะพั€ะพัˆะฝะธั‚ะต ะพะฑะตะบั‚ะธ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะดะพะฑะฐะฒะตะฝะธ"
 
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3341
 #, c-format
 msgid "unsupported index version %s"
 msgstr "ะฝะตะฟะพะดะดัŠั€ะถะฐะฝะฐ ะฒะตั€ัะธั ะฝะฐ ะธะฝะดะตะบัะฐ โ€ž%sโ€œ"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "bad index version '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ะฒะตั€ัะธั ะฝะฐ ะธะฝะดะตะบัะฐ โ€ž%sโ€œ"
 
-#: builtin/pack-objects.c:3248
-msgid "do not show progress meter"
-msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
-
-#: builtin/pack-objects.c:3250
-msgid "show progress meter"
-msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
-
-#: builtin/pack-objects.c:3252
-msgid "show progress meter during object writing phase"
-msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ ะฒัŠะฒ ั„ะฐะทะฐั‚ะฐ ะฝะฐ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
-
-#: builtin/pack-objects.c:3255
-msgid "similar to --all-progress when progress meter is shown"
-msgstr ""
-"ััŠั‰ะพั‚ะพ ะดะตะนัั‚ะฒะธะต ะบะฐั‚ะพ ะพะฟั†ะธัั‚ะฐ โ€ž--all-progressโ€œ ะฟั€ะธ ะธะทะฒะตะถะดะฐะฝะตั‚ะพ ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ"
-
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3383
 msgid "<version>[,<offset>]"
 msgstr "ะ’ะ•ะ ะกะ˜ะฏ[,ะžะขะœะ•ะกะขะ’ะะะ•]"
 
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3384
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะฐ ะฟะฐะบะตั‚ะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฒัŠะฒ ั„ะพั€ะผะฐฬ€ั‚ะฐ ั ัƒะบะฐะทะฐะฝะฐั‚ะฐ ะฒะตั€ัะธั"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3387
 msgid "maximum size of each output pack file"
 msgstr "ะผะฐะบัะธะผะฐะปะตะฝ ั€ะฐะทะผะตั€ ะฝะฐ ะฒัะตะบะธ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3389
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะทะฐะตั‚ะธ ะพั‚ ะดั€ัƒะณะธ ั…ั€ะฐะฝะธะปะธั‰ะฐ ะฝะฐ ะพะฑะตะบั‚ะธ"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3391
 msgid "ignore packed objects"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ะฟะฐะบะตั‚ะธั€ะฐะฝะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3393
 msgid "limit pack window by objects"
 msgstr "ะพะณั€ะฐะฝะธั‡ะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะพะทะพั€ะตั†ะฐ ะทะฐ ะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฟะพ ะฑั€ะพะน ะพะฑะตะบั‚ะธ"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3395
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "ะพะณั€ะฐะฝะธั‡ะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะพะทะพั€ะตั†ะฐ ะทะฐ ะฟะฐะบะตั‚ะธั€ะฐะฝะต ะธ ะฟะพ ะฟะฐะผะตั‚ ะพัะฒะตะฝ ะฟะพ ะฑั€ะพะน ะพะฑะตะบั‚ะธ"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3397
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "ะผะฐะบัะธะผะฐะปะฝะฐ ะดัŠะปะถะธะฝะฐ ะฝะฐ ะฒะตั€ะธะณะฐั‚ะฐ ะพั‚ ั€ะฐะทะปะธะบะธ, ะบะพัั‚ะพ ะต ะฟะพะทะฒะพะปะตะฝะฐ ะฒ ะฟะฐะบะตั‚ะฝะธั ั„ะฐะนะป"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3399
 msgid "reuse existing deltas"
 msgstr "ะฟั€ะตะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะธั‚ะต ั€ะฐะทะปะธะบะธ"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3401
 msgid "reuse existing objects"
 msgstr "ะฟั€ะตะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3403
 msgid "use OFS_DELTA objects"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธ โ€žOFS_DELTAโ€œ"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3405
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "ัั‚ะฐั€ั‚ะธั€ะฐะฝะต ะฝะฐ ะฝะธัˆะบะธ ะทะฐ ะฟั€ะตั‚ัŠั€ัะฒะฐะฝะต ะฝะฐ ะฝะฐะน-ะดะพะฑั€ะธั‚ะต ััŠะฒะฟะฐะดะตะฝะธั ะฝะฐ ั€ะฐะทะปะธะบะธั‚ะต"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3407
 msgid "do not create an empty pack output"
 msgstr "ะฑะตะท ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะฐะทะตะฝ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3409
 msgid "read revision arguments from standard input"
 msgstr "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ะฒะตั€ัะธะธั‚ะต ะพั‚ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3411
 msgid "limit the objects to those that are not yet packed"
 msgstr "ะพะณั€ะฐะฝะธั‡ะฐะฒะฐะฝะต ะดะพ ะฒัะต ะพั‰ะต ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3414
 msgid "include objects reachable from any reference"
 msgstr ""
 "ะฒะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะพะฑะตะบั‚ะธ, ะบะพะธั‚ะพ ะผะพะณะฐั‚ ะดะฐ ัะต ะดะพัั‚ะธะณะฝะฐั‚ ะพั‚ ะฟั€ะพะธะทะฒะพะปะตะฝ "
 "ัƒะบะฐะทะฐั‚ะตะป"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3417
 msgid "include objects referred by reflog entries"
 msgstr "ะฒะบะปัŽั‡ะฒะฐะฝะต ะธ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ัะพั‡ะตะฝะธ ะพั‚ ะทะฐะฟะธัะธั‚ะต ะฒ ะถัƒั€ะฝะฐะปะฐ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3420
 msgid "include objects referred to by the index"
 msgstr "ะฒะบะปัŽั‡ะฒะฐะฝะต ะธ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ัะพั‡ะตะฝะธ ะพั‚ ะธะฝะดะตะบัะฐ"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3423
 msgid "output pack to stdout"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟะฐะบะตั‚ะฐ ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะธะทั…ะพะด"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3425
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "ะฒะบะปัŽั‡ะฒะฐะฝะต ะธ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต-ะตั‚ะธะบะตั‚ะธ, ะบะพะธั‚ะพ ัะพั‡ะฐั‚ ะบัŠะผ ะพะฑะตะบั‚ะธั‚ะต, ะบะพะธั‚ะพ ั‰ะต ะฑัŠะดะฐั‚ "
 "ะฟะฐะบะตั‚ะธั€ะฐะฝะธ"
 
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3427
 msgid "keep unreachable objects"
 msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฝะตะดะพัั‚ะธะถะธะผะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3429
 msgid "pack loose unreachable objects"
 msgstr "ะฟะฐะบะตั‚ะธั€ะฐะฝะต ะธ ะฝะฐ ะฝะตะดะพัั‚ะธะถะธะผะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3431
 msgid "unpack unreachable objects newer than <time>"
 msgstr "ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะฝะตะดะพัั‚ะธะถะธะผะธั‚ะต ะพะฑะตะบั‚ะธ, ะบะพะธั‚ะพ ัะฐ ะฟะพ-ะฝะพะฒะธ ะพั‚ ั‚ะพะฒะฐ ะ’ะ ะ•ะœะ•"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3434
 msgid "use the sparse reachability algorithm"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฐะปะณะพั€ะธั‚ัŠะผ ะทะฐ ั‡ะฐัั‚ะธั‡ะฝะฐ ะดะพัั‚ะธะถะธะผะพัั‚"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3436
 msgid "create thin packs"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ััŠะบั€ะฐั‚ะตะฝะธ ะฟะฐะบะตั‚ะธ"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3438
 msgid "create packs suitable for shallow fetches"
 msgstr "ะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฟะพะดั…ะพะดัั‰ะพ ะทะฐ ะฟะปะธั‚ะบะพ ะดะพัั‚ะฐะฒัะฝะต"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3440
 msgid "ignore packs that have companion .keep file"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ะฟะฐะบะตั‚ะธั‚ะต, ะบะพะธั‚ะพ ัะฐ ะฟั€ะธะดั€ัƒะถะตะฝะธ ะพั‚ ั„ะฐะนะป โ€ž.keepโ€œ"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3442
 msgid "ignore this pack"
 msgstr "ะฟั€ะพะฟัƒัะบะฐะฝะต ะฝะฐ ั‚ะพะทะธ ะฟะฐะบะตั‚"
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3444
 msgid "pack compression level"
 msgstr "ะฝะธะฒะพ ะฝะฐ ะบะพะผะฟั€ะตัะธั€ะฐะฝะต ะฟั€ะธ ะฟะฐะบะตั‚ะธั€ะฐะฝะต"
 
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3446
 msgid "do not hide commits by grafts"
 msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ั€ะพะดะธั‚ะตะปะธ โ€” ะดะพั€ะธ ะธ ั‚ะตะทะธ, ะบะพะธั‚ะพ ะฝะพั€ะผะฐะปะฝะพ ัะฐ ัะบั€ะธั‚ะธ ะฟั€ะธ "
 "ะฟั€ะธัะฐะถะดะฐะฝะธัั‚ะฐ"
 
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3448
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะธ ะธะฝะดะตะบัะธ ะฝะฐ ะฑะฐะทะฐ ะฑะธั‚ะพะฒะธ ะผะฐัะบะธ ะทะฐ ัƒัะบะพั€ัะฒะฐะฝะต ะฝะฐ "
 "ะฟั€ะตะฑั€ะพัะฒะฐะฝะตั‚ะพ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3450
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 "ะทะฐะฟะฐะทะฒะฐะฝะต ะธ ะฝะฐ ะธะฝะดะตะบั ะฝะฐ ะฑะฐะทะฐ ะฟะพะฑะธั‚ะพะฒะฐ ะผะฐัะบะฐ, ะทะฐะตะดะฝะพ ั ะธะฝะดะตะบัะฐ ะทะฐ ะฟะฐะบะตั‚ะฐ"
 
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3454
 msgid "write a bitmap index if possible"
 msgstr "ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะธ ะฝะฐ ะฑะฐะทะฐ ะฑะธั‚ะพะฒะธ ะผะฐัะบะธ ะฟั€ะธ ะฒัŠะทะผะพะถะฝะพัั‚"
 
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3458
 msgid "handling for missing objects"
 msgstr "ะบะฐะบ ะดะฐ ัะต ะพะฑั€ะฐะฑะพั‚ะฒะฐั‚ ะปะธะฟัะฒะฐั‰ะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3461
 msgid "do not pack objects in promisor packfiles"
 msgstr "ะฑะตะท ะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธ ะฒ ะณะฐั€ะฐะฝั‚ะธั€ะฐั‰ะธ ะฟะฐะบะตั‚ะธ"
 
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3463
 msgid "respect islands during delta compression"
 msgstr "ะฑะตะท ะฟั€ะพะผัะฝะฐ ะฝะฐ ะณั€ัƒะฟะธั‚ะต ะฟั€ะธ ะดะตะปั‚ะฐ ะบะพะผะฟั€ะตัะธั"
 
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3492
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "ะฒะตั€ะธะณะฐั‚ะฐ ั ั€ะฐะทะปะธะบะธ ะต ะฟั€ะตะบะฐะปะตะฝะพ ะดัŠะปะฑะพะบะฐ โ€” %d, ั‰ะต ัะต ะฟะพะปะทะฒะฐ %d"
 
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3497
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 "ะกั‚ะพะนะฝะพัั‚ั‚ะฐ ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žpack.deltaCacheLimitโ€œ ะต ะฟั€ะตะบะฐะปะตะฝะพ ะณะพะปัะผะฐ.  ะฉะต ัะต "
 "ะฟะพะปะทะฒะฐ %d"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3551
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--max-pack-sizeโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟะฐะบะตั‚ะฝะธ "
 "ั„ะฐะนะปะพะฒะต ะทะฐ ะฟั€ะตะฝะพั"
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3553
 msgid "minimum pack size limit is 1 MiB"
 msgstr "ะผะธะฝะธะผะฐะปะฝะธัั‚ ั€ะฐะทะผะตั€ ะฝะฐ ะฟะฐะบะตั‚ะธั‚ะต ะต 1โ€ŠMiB"
 
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3558
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--thinโ€œะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟะฐะบะตั‚ะฝะธ ั„ะฐะนะปะพะฒะต ั "
 "ะธะฝะดะตะบั"
 
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3561
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--keep-unreachableโ€œ ะธ โ€ž--unpack-unreachableโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3567
 msgid "cannot use --filter without --stdout"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž-filterโ€œ ะธะทะธัะบะฒะฐ โ€ž-stdoutโ€œ"
 
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3627
 msgid "Enumerating objects"
 msgstr "ะ˜ะทะฑั€ะพัะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
 
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3657
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 msgstr ""
-"ะžะฑั‰ะพ %<PRIu32> (ั€ะฐะทะปะธะบะธ %<PRIu32>), ะฟั€ะตะธะทะฟะพะปะทะฒะฐะฝะธ %<PRIu32> (ั€ะฐะทะปะธะบะธ "
-"%<PRIu32>)"
+"ะžะฑั‰ะพ: %<PRIu32> (ั€ะฐะทะปะธะบะธ: %<PRIu32>), ะฟั€ะตะธะทะฟะพะปะทะฒะฐะฝะธ: %<PRIu32> (ั€ะฐะทะปะธะบะธ: "
+"%<PRIu32>), ะฟั€ะตะธะทะฟะพะปะทะฒะฐะฝะธ ะฟั€ะธ ะฟะฐะบะตั‚ะธั€ะฐะฝะต: %<PRIu32>"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16938,53 +17986,53 @@ msgstr "ะพะณั€ะฐะฝะธั‡ะฐะฒะฐะฝะต ะฝะฐ ะพะฑั…ะพะถะดะฐะฝะตั‚ะพ ะดะพ ะพะฑะตะบั‚ะธ ะ
 msgid "cannot prune in a precious-objects repo"
 msgstr "ั…ั€ะฐะฝะธะปะธั‰ะต ั ะฒะฐะถะฝะธ ะพะฑะตะบั‚ะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะบะฐัั‚ั€ั"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€ž%sโ€œ: โ€ž%sโ€œ"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [ะžะŸะฆะ˜ะฏโ€ฆ] [ะฅะ ะะะ˜ะ›ะ˜ะฉะ• [ะฃะšะะ—ะะขะ•ะ›_ะะ_ะ’ะ•ะ ะกะ˜ะฏโ€ฆ]]"
 
-#: builtin/pull.c:141
+#: builtin/pull.c:122
 msgid "control for recursive fetching of submodules"
 msgstr "ัƒะฟั€ะฐะฒะปะตะฝะธะต ะฝะฐ ั€ะตะบัƒั€ัะธะฒะฝะพั‚ะพ ะดะพัั‚ะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะธั‚ะต"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:126
 msgid "Options related to merging"
 msgstr "ะžะฟั†ะธะธ ะฟั€ะธ ัะปะธะฒะฐะฝะต"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:129
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "ะฒะฝะฐััะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ั‡ั€ะตะท ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต, ะฐ ะฝะต ั‡ั€ะตะท ัะปะธะฒะฐะฝะต"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟั€ะตะฒัŠั€ั‚ะฐะฝะธั"
 
-#: builtin/pull.c:185
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ัะบะฐั‚ะฐะฒะฐะฝะต/ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ัะบะฐั‚ะฐะฝะพั‚ะพ ะฟั€ะตะดะธ ะธ ัะปะตะด ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:182
 msgid "Options related to fetching"
 msgstr "ะžะฟั†ะธะธ ะฟั€ะธ ะดะพัั‚ะฐะฒัะฝะต"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:192
 msgid "force overwrite of local branch"
 msgstr "ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะฟั€ะตะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะปะพะบะฐะปะฝะธั ะบะปะพะฝ"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:200
 msgid "number of submodules pulled in parallel"
 msgstr "ะฑั€ะพะน ะฟะพะดะผะพะดัƒะปะธ ะธะทะดัŠั€ะฟะฐะฝะธ ะฟะฐั€ะฐะปะตะปะฝะพ"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:300
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€žpull.ffโ€œ: โ€ž%sโ€œ"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:426
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16992,14 +18040,14 @@ msgstr ""
 "ะœะตะถะดัƒ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต, ะบะพะธั‚ะพ ั‚ะพะบัƒ ั‰ะพ ะดะพัั‚ะฐะฒะธั…ั‚ะต, ะฝัะผะฐ ะฟะพะดั…ะพะดัั‰ ะบะฐะฝะดะธะดะฐั‚, ะฒัŠั€ั…ัƒ "
 "ะบะพะนั‚ะพ ะดะฐ ะฟั€ะตะฑะฐะทะธั€ะฐั‚ะต."
 
-#: builtin/pull.c:435
+#: builtin/pull.c:428
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "ะœะตะถะดัƒ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต, ะบะพะธั‚ะพ ั‚ะพะบัƒ ั‰ะพ ะดะพัั‚ะฐะฒะธั…ั‚ะต, ะฝัะผะฐ ะฟะพะดั…ะพะดัั‰ ะบะฐะฝะดะธะดะฐั‚, ะบะพะนั‚ะพ "
 "ะดะฐ ัะปะตะตั‚ะต."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:429
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -17007,7 +18055,7 @@ msgstr ""
 "ะะฐะน ะฒะตั€ะพัั‚ะฝะพ ัั‚ะต ะฟะพะดะฐะปะธ ัˆะฐะฑะปะพะฝ ะทะฐ ัƒะบะฐะทะฐั‚ะตะปะธ, ะบะพะนั‚ะพ ะฝะต ะต ะฝะฐะฟะฐัะฝะฐะป ั ะฝะธั‰ะพ ะฒ "
 "ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:432
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -17018,44 +18066,44 @@ msgstr ""
 "ะŸะพะฝะตะถะต ั‚ะพะฒะฐ ะฝะต ะต ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะฟะพ ะฟะพะดั€ะฐะทะฑะธั€ะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะธั ะบะปะพะฝ, ั‚ั€ัะฑะฒะฐ\n"
 "ะดะฐ ัƒะบะฐะถะตั‚ะต ะพั‚ะดะฐะปะตั‡ะตะฝะธั ะบะปะพะฝ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ั€ะตะด."
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "ะ˜ะทะฒัŠะฝ ะฒัะธั‡ะบะธ ะบะปะพะฝะธ."
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "ะฃะบะฐะถะตั‚ะต ะฒัŠั€ั…ัƒ ะบะพะน ะบะปะพะฝ ะธัะบะฐั‚ะต ะดะฐ ะฟั€ะตะฑะฐะทะธั€ะฐั‚ะต."
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "ะฃะบะฐะถะตั‚ะต ะบะพะน ะบะปะพะฝ ะธัะบะฐั‚ะต ะดะฐ ัะปะตะตั‚ะต."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:442 builtin/pull.c:457
 msgid "See git-pull(1) for details."
 msgstr "ะ—ะฐ ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะฟะพะณะปะตะดะฝะตั‚ะต ั€ัŠะบะพะฒะพะดัั‚ะฒะพั‚ะพ โ€žgit-pull(1)โ€œ"
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "ะžะขะ”ะะ›ะ•ะงะ•ะะž_ะฅะ ะะะ˜ะ›ะ˜ะฉะ•"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "ะšะ›ะžะ"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "ะขะตะบัƒั‰ะธัั‚ ะบะปะพะฝ ะฝะต ัะปะตะดะธ ะฝะธะบะพะน."
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "ะะบะพ ะธัะบะฐั‚ะต ะดะฐ ะทะฐะดะฐะดะตั‚ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ัะปะตะดะตะฝ ะบะปะพะฝ, ะผะพะถะตั‚ะต ะดะฐ ะฝะฐะฟั€ะฐะฒะธั‚ะต ั‚ะพะฒะฐ ั "
 "ะบะพะผะฐะฝะดะฐั‚ะฐ:"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:466
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -17064,32 +18112,32 @@ msgstr ""
 "ะ—ะฐ ัะปะธะฒะฐะฝะต ะต ัƒะบะฐะทะฐะฝ ะพั‚ะดะฐะปะตั‡ะตะฝะธัั‚ ัƒะบะฐะทะฐั‚ะตะป โ€ž%sโ€œ,\n"
 "ะฝะพ ั‚ะฐะบัŠะฒ ะฝะต ะต ะดะพัั‚ะฐะฒะตะฝ."
 
-#: builtin/pull.c:581
+#: builtin/pull.c:576
 #, c-format
 msgid "unable to access commit %s"
 msgstr "ะฝะตะดะพัั‚ัŠะฟะฝะพ ะฟะพะดะฐะฒะฐะฝะต: %s"
 
-#: builtin/pull.c:861
+#: builtin/pull.c:857
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ะฑะตะท โ€ž--verify-signaturesโ€œ ะฟั€ะธ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/pull.c:916
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--[no-]autostashโ€œ ะธะทะธัะบะฒะฐ โ€ž--rebaseโ€œ"
 
-#: builtin/pull.c:924
+#: builtin/pull.c:920
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฒัะต ะพั‰ะต ะฝะตััŠะทะดะฐะดะตะฝ ะบะปะพะฝ ั ะฟั€ะพะผะตะฝะธั‚ะต ะพั‚ ะธะฝะดะตะบัะฐ"
 
-#: builtin/pull.c:928
+#: builtin/pull.c:924
 msgid "pull with rebase"
 msgstr "ะธะทะดัŠั€ะฟะฒะฐะฝะต ั ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:925
 msgid "please commit or stash them."
 msgstr "ั‚ั€ัะฑะฒะฐ ะดะฐ ะฟะพะดะฐะดะตั‚ะต ะธะปะธ ัะบะฐั‚ะฐะตั‚ะต ะฟั€ะพะผะตะฝะธั‚ะต."
 
-#: builtin/pull.c:954
+#: builtin/pull.c:950
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -17099,7 +18147,7 @@ msgstr ""
 "ะดะพัั‚ะฐะฒัะฝะตั‚ะพ ะพะฑะฝะพะฒะธ ะฒัŠั€ั…ะฐ ะฝะฐ ั‚ะตะบัƒั‰ะธั ะบะปะพะฝ.  ะ ะฐะฑะพั‚ะฝะพั‚ะพ\n"
 "ะฒะธ ะบะพะฟะธะต ะฑะต ะฟั€ะตะฒัŠั€ั‚ัะฝะพ ะพั‚ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:956
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -17116,15 +18164,15 @@ msgstr ""
 "    git reset --hard\n"
 "ะทะฐ ะฒั€ัŠั‰ะฐะฝะต ะบัŠะผ ะฝะพั€ะผะฐะปะฝะพ ััŠัั‚ะพัะฝะธะต."
 
-#: builtin/pull.c:975
+#: builtin/pull.c:971
 msgid "Cannot merge multiple branches into empty head."
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะปะธะฒะฐั‚ะต ะผะฝะพะถะตัั‚ะฒะพ ะบะปะพะฝะธ ะฒ ะฟั€ะฐะทะตะฝ ะฒัŠั€ั…ะพะฒ ัƒะบะฐะทะฐั‚ะตะป."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:975
 msgid "Cannot rebase onto multiple branches."
 msgstr "ะะต ะผะพะถะต ะดะฐ ะฟั€ะตะฑะฐะทะธั€ะฐั‚ะต ะฒัŠั€ั…ัƒ ะฟะพะฒะตั‡ะต ะพั‚ ะตะดะธะฝ ะบะปะพะฝ."
 
-#: builtin/pull.c:986
+#: builtin/pull.c:982
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "ะฟั€ะตะฑะฐะทะธั€ะฐะฝะตั‚ะพ ะต ะฝะตะฒัŠะทะผะพะถะฝะพ ะทะฐั€ะฐะดะธ ะปะพะบะฐะปะฝะพ ะทะฐะฟะธัะฐะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฟะพ ะฟะพะดะผะพะดัƒะปะธั‚ะต"
@@ -17133,15 +18181,15 @@ msgstr ""
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [ะžะŸะฆะ˜ะฏโ€ฆ] [ะฅะ ะะะ˜ะ›ะ˜ะฉะ• [ะฃะšะะ—ะะขะ•ะ›_ะะ_ะ’ะ•ะ ะกะ˜ะฏโ€ฆ]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "ััŠะบั€ะฐั‰ะตะฝะธะต ะทะฐ ะตั‚ะธะบะตั‚ ะฑะตะท ะ•ะขะ˜ะšะ•ะข"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--deleteโ€œ ะฟั€ะธะตะผะฐ ะทะฐ ั†ะตะป ัะฐะผะพ ะฟั€ะพัั‚ะธ ะธะผะตะฝะฐ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธ"
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -17150,7 +18198,7 @@ msgstr ""
 "ะ—ะฐ ะดะฐ ะฒะบะปัŽั‡ะธั‚ะต ั‚ะฐะทะธ ะพะฟั†ะธั ะทะฐ ะฟะพัั‚ะพัะฝะฝะพ, ะฟะพะณะปะตะดะฝะตั‚ะต ะดะพะบัƒะผะตะฝั‚ะฐั†ะธัั‚ะฐ ะทะฐ "
 "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žpush.defaultโ€œ ะฒ โ€žgit help configโ€œ."
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -17175,7 +18223,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -17189,7 +18237,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:ะ˜ะœะ•_ะะ_ะžะขะ”ะะ›ะ•ะงะ•ะะ˜ะฏ_ะšะ›ะžะ\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -17203,14 +18251,14 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "ะขะตะบัƒั‰ะธัั‚ ะบะปะพะฝ โ€ž%sโ€œ ัะปะตะดะธ ะฝัะบะพะปะบะพ ะพั‚ะดะฐะปะตั‡ะตะฝะธ ะบะปะพะฝะฐ, ะฝะต ะผะพะถะตั‚ะต ะฟั€ะพัั‚ะพ ะดะฐ "
 "ะธะทั‚ะปะฐัะบะฐั‚ะต."
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -17222,14 +18270,14 @@ msgstr ""
 "ะขั€ัะฑะฒะฐ ะดะฐ ัƒะบะฐะถะตั‚ะต ะบะพั ะฒะตั€ัะธั ะดะฐ ัะต ะธะทั‚ะปะฐัะบะฐ, ะทะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะธั "
 "ะบะปะพะฝ."
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "ะะต ัั‚ะต ัƒะบะฐะทะฐะปะธ ะฒะตั€ัะธั ะทะฐ ะฟะพะดะฐะฒะฐะฝะต, ะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žpush.defaultโ€œ ะต "
 "โ€žnothingโ€œ (ะฝะธั‰ะพ ะฑะตะท ะธะทั€ะธั‡ะฝะพ ัƒะบะฐะทะฐะฝะฐ ะฒะตั€ัะธั ะดะฐ ะฝะต ัะต ะธะทั‚ะปะฐัะบะฒะฐ)"
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -17243,7 +18291,7 @@ msgstr ""
 "ะฟั€ะตะดะธ ะพั‚ะฝะพะฒะพ ะดะฐ ะธะทั‚ะปะฐัะบะฐั‚ะต ะฟั€ะพะผะตะฝะธั‚ะต.  ะ—ะฐ ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะฒะธะถั‚ะต ั€ะฐะทะดะตะปะฐ\n"
 "โ€žNote about fast-forwardsโ€œ ะฒ ัั‚ั€ะฐะฝะธั†ะฐั‚ะฐ ะพั‚ ั€ัŠะบะพะฒะพะดัั‚ะฒะพั‚ะพ โ€žgit push --helpโ€œ."
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -17257,7 +18305,7 @@ msgstr ""
 "ะธะฝั„ะพั€ะผะฐั†ะธั ะฟะพะณะปะตะดะฝะตั‚ะต ั€ะฐะทะดะตะปะฐ โ€žNote about fast-forwardsโ€œ ะฒ ัั‚ั€ะฐะฝะธั†ะฐั‚ะฐ ะพั‚\n"
 "ั€ัŠะบะพะฒะพะดัั‚ะฒะพั‚ะพ โ€žgit push --helpโ€œ."
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -17276,14 +18324,14 @@ msgstr ""
 "ัั‚ั€ะฐะฝะธั†ะฐั‚ะฐ\n"
 "ะพั‚ ั€ัŠะบะพะฒะพะดัั‚ะฒะพั‚ะพ โ€žgit push --helpโ€œ."
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "ะ˜ะทั‚ะปะฐัะบะฒะฐะฝะตั‚ะพ ะต ะพั‚ั…ะฒัŠั€ะปะตะฝะพ, ะทะฐั‰ะพั‚ะพ ะฒ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ "
 "ะตั‚ะธะบะตั‚,\n"
 "ะบะพะนั‚ะพ ั‰ะต ะฟั€ะธะฟะพะบั€ะธะตั‚ะต ั ะตั‚ะธะบะตั‚ ะพั‚ ะฒะฐัˆะตั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต."
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -17293,144 +18341,144 @@ msgstr ""
 "ัƒะบะฐะทะฐั‚ะตะป, ะบะพะนั‚ะพ ะฒะตั‡ะต ัะพั‡ะธ ะบัŠะผ ะพะฑะตะบั‚, ะบะพะนั‚ะพ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต, ะบะฐะบั‚ะพ ะธ ั‚ะตะฟัŠั€ะฒะฐ\n"
 "ะดะฐ ะณะพ ะฟั€ะพะผะตะฝะธั‚ะต ะดะฐ ัะพั‡ะธ ะบัŠะผ ะฟะพะดะพะฑะตะฝ ะพะฑะตะบั‚.\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "ะ˜ะทั‚ะปะฐัะบะฒะฐะฝะต ะบัŠะผ โ€ž%sโ€œ\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "ั‡ะฐัั‚ ะพั‚ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะฝะต ะฑัั…ะฐ ะธะทั‚ะปะฐัะบะฐะฝะธ ะบัŠะผ โ€ž%sโ€œ"
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ัƒะบะฐะทะฐะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"ะะต ะต ัƒะบะฐะทะฐะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะบัŠะผ ะบะพะตั‚ะพ ะดะฐ ัะต ะธะทั‚ะปะฐัะบะฒะฐ.\n"
-"ะ˜ะปะธ ัƒะบะฐะถะตั‚ะต ะฐะดั€ะตัะฐ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ั€ะตะด, ะธะปะธ ะฝะฐัั‚ั€ะพะนั‚ะต ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ั "
-"ะบะพะผะฐะฝะดะฐั‚ะฐ:\n"
-"\n"
-"    git remote add ะ˜ะœะ• ะะ”ะ ะ•ะก\n"
-"\n"
-"ะธ ัะปะตะด ั‚ะพะฒะฐ ะธะทั‚ะปะฐัะบะฐะนั‚ะต, ะบะฐั‚ะพ ัƒะบะฐะถะตั‚ะต ะธะผะตั‚ะพ ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต:\n"
-"\n"
-"    git push ะ˜ะœะ•\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr "ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ัƒะบะฐะทะฐั‚ะตะปะธ"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "ะพะณะปะตะดะฐะปะฝะพ ะบะพะฟะธะต ะฝะฐ ะฒัะธั‡ะบะธ ัƒะบะฐะทะฐั‚ะตะปะธ"
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต"
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะฐ ะตั‚ะธะบะตั‚ะธั‚ะต (ะฝะตััŠะฒะผะตัั‚ะธะผะพ ั ะพะฟั†ะธะธั‚ะต โ€ž--allโ€œ ะธ โ€ž--mirrorโ€œ)"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
-msgstr "ะฃะšะะ—ะะขะ•ะ›:ะžะงะะšะ’ะะะ_ะกะขะžะ™ะะžะกะข"
+msgstr "ะ˜ะœะ•_ะะ_ะฃะšะะ—ะะขะ•ะ›:ะžะงะะšะ’ะะะ_ะกะขะžะ™ะะžะกะข"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr "ะฃะšะะ—ะะขะ•ะ›ัั‚ ั‚ั€ัะฑะฒะฐ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพ ะดะฐ ะต ั ั‚ะฐะทะธ ะžะงะะšะ’ะะะ_ะกะขะžะ™ะะžะกะข"
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr "ัƒะฟั€ะฐะฒะปะตะฝะธะต ะฝะฐ ั€ะตะบัƒั€ัะธะฒะฝะพั‚ะพ ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะธั‚ะต"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััŠะบั€ะฐั‚ะตะฝะธ ะฟะฐะบะตั‚ะธ"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "ะฟั€ะพะณั€ะฐะผะฐ ะทะฐ ะฟะพะปัƒั‡ะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟะฐะบะตั‚ะธ"
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะทะฐ ะบะพะผะฐะฝะดะธั‚ะต โ€žgit pull/statusโ€œ"
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
 msgstr "ะพะบะฐัั‚ั€ัะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต, ะบะพะธั‚ะพ ัะฐ ะฟั€ะตะผะฐั…ะฝะฐั‚ะธ ะพั‚ ะปะพะบะฐะปะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr "ะฑะตะท ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบัƒะบะฐั‚ะฐ ะฟั€ะตะดะธ ะธะทั‚ะปะฐัะบะฒะฐะฝะต (pre-push)"
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr ""
 "ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะฐ ะปะธะฟัะฒะฐั‰ะธั‚ะต ะฒ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะฝะพ ัะฒัŠั€ะทะฐะฝะธ ั ั‚ะตะบัƒั‰ะพั‚ะพ "
 "ะธะทั‚ะปะฐัะบะฒะฐะฝะต, ะตั‚ะธะบะตั‚ะธ"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr "ะฟะพะดะฟะธัะฒะฐะฝะต ะฝะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะตั‚ะพ ั GPG"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr "ะธะทะธัะบะฒะฐะฝะต ะฝะฐ ะฐั‚ะพะผะฐั€ะฝะธ ะพะฟะตั€ะฐั†ะธะธ ะพั‚ ะพั‚ัั€ะตั‰ะฝะฐั‚ะฐ ัั‚ั€ะฐะฝะฐ"
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--deleteโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะพะฟั†ะธะธั‚ะต  โ€ž--allโ€œ, โ€ž--mirrorโ€œ ะธ โ€ž--tagsโ€œ"
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--deleteโ€œ ะธะทะธัะบะฒะฐ ะฟะพะฝะต ะตะดะธะฝ ัƒะบะฐะทะฐั‚ะตะป ะฝะฐ ะฒะตั€ัะธั"
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ัƒะบะฐะทะฐะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"ะะต ะต ัƒะบะฐะทะฐะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะบัŠะผ ะบะพะตั‚ะพ ะดะฐ ัะต ะธะทั‚ะปะฐัะบะฒะฐ.\n"
+"ะ˜ะปะธ ัƒะบะฐะถะตั‚ะต ะฐะดั€ะตัะฐ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ั€ะตะด, ะธะปะธ ะฝะฐัั‚ั€ะพะนั‚ะต ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ั "
+"ะบะพะผะฐะฝะดะฐั‚ะฐ:\n"
+"\n"
+"    git remote add ะ˜ะœะ• ะะ”ะ ะ•ะก\n"
+"\n"
+"ะธ ัะปะตะด ั‚ะพะฒะฐ ะธะทั‚ะปะฐัะบะฐะนั‚ะต, ะบะฐั‚ะพ ัƒะบะฐะถะตั‚ะต ะธะผะตั‚ะพ ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต:\n"
+"\n"
+"    git push ะ˜ะœะ•\n"
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--allโ€œ ะธ โ€ž--tagsโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--allโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ัƒะบะฐะทะฒะฐะฝะตั‚ะพ ะฝะฐ ะฒะตั€ัะธั"
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--mirrorโ€œ ะธ โ€ž--tagsโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--mirrorโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ัƒะบะฐะทะฒะฐะฝะตั‚ะพ ะฝะฐ ะฒะตั€ัะธั"
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--allโ€œ ะธ โ€ž--mirrorโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr "ะพะฟั†ะธะธั‚ะต ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะฝะต ั‚ั€ัะฑะฒะฐ ะดะฐ ััŠะดัŠั€ะถะฐั‚ ะทะฝะฐะบ ะทะฐ ะฝะพะฒ ั€ะตะด"
 
@@ -17446,24 +18494,32 @@ msgstr "git range-diff [ะžะŸะฆะ˜ะฏโ€ฆ] ะกะขะะ _ะ’ะ ะชะฅ...ะะžะ’_ะ’ะ ะชะฅ"
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [ะžะŸะฆะ˜ะฏโ€ฆ] ะ‘ะะ—ะ ะกะขะะ _ะ’ะ ะชะฅ ะะžะ’_ะ’ะ ะชะฅ"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr "ะŸั€ะพั†ะตะฝั‚ ะทะฐ ะพั†ะตะฝะบะฐ ะฝะฐ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ"
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟั€ะพัั‚ะธ ั†ะฒะตั‚ะพะฒะต ะทะฐ ั€ะฐะทะปะธะบะธั‚ะต"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "ะฑะตะปะตะถะบะธ"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "ะฟะพะดะฐะฒะฐ ัะต ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit logโ€œ"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr "โ€ž..โ€œ ะปะธะฟัะฒะฐ ะฒ ะดะธะฐะฟะฐะทะพะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "ะฒะฐั€ะธะฐะฝั‚ัŠั‚ ั ะตะดะธะฝัั‚ะฒะตะฝ ะฐั€ะณัƒะผะตะฝั‚ ะธะทะธัะบะฒะฐ ัะธะผะตั‚ั€ะธั‡ะตะฝ ะดะธะฐะฟะฐะทะพะฝ"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "ะฝะตะพะฑั…ะพะดะธะผะธ ัะฐ ะดะฒะฐ ะดะธะฐะฟะฐะทะพะฝะฐ ั ะฟะพะดะฐะฒะฐะฝะธั"
 
@@ -17546,13 +18602,17 @@ msgstr "ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ะณั€ะตัˆะบะธ ะฒ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žunpack-t
 msgid "suppress feedback messages"
 msgstr "ะฑะตะท ะธะฝั„ะพั€ะผะฐั†ะธะพะฝะฝะธ ััŠะพะฑั‰ะตะฝะธั"
 
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "ะŸัŠั€ะฒะพ ั‚ั€ัะฑะฒะฐ ะดะฐ ะบะพั€ะธะณะธั€ะฐั‚ะต ะธะฝะดะตะบัะฐ ัะธ"
+
 #: builtin/rebase.c:32
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [ะžะŸะฆะ˜ะฏโ€ฆ] [--exec ะšะžะœะะะ”ะ] [--onto ะะžะ’ะ_ะ‘ะะ—ะ] [ะšะ›ะžะ_ะ˜ะ—ะขะžะงะะ˜ะš] "
-"[ะšะ›ะžะ]"
+"git rebase [-i] [ะžะŸะฆะ˜ะฏโ€ฆ] [--exec ะšะžะœะะะ”ะ] [--onto ะะžะ’ะ_ะ‘ะะ—ะ | --keep-base] "
+"[ะšะ›ะžะ_ะ˜ะ—ะขะžะงะะ˜ะš [ะšะ›ะžะ]]"
 
 #: builtin/rebase.c:34
 msgid ""
@@ -17564,220 +18624,211 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ัะฟะธััŠะบะฐ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต: โ€ž%sโ€œ"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัˆะต."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "ะ›ะธะฟัะฒะฐ ัƒะบะฐะทะฐั‚ะตะป โ€žHEADโ€œ"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:292
 #, c-format
 msgid "could not create temporary %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฒั€ะตะผะตะฝะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั โ€ž%sโ€œ"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:298
 msgid "could not mark as interactive"
 msgstr "ะฝะตะฒัŠะทะผะพะถะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะฐ ั€ะฐะฑะพั‚ะฐ"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:352
 msgid "could not generate todo list"
 msgstr "ั„ะฐะนะปัŠั‚ ั ะบะพะผะฐะฝะดะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะณะตะฝะตั€ะธั€ะฐ"
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:391
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--upstreamโ€œ ะธ โ€ž--ontoโ€œ ะธะทะธัะบะฒะฐั‚ ะฑะฐะทะพะฒะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:461
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [ะžะŸะฆะ˜ะฏโ€ฆ]"
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟั€ะฐะทะฝะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(ะžะกะขะะ ะฏะ›ะž) ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟั€ะฐะทะฝะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟั€ะฐะทะฝะธ ััŠะพะฑั‰ะตะฝะธั ะฟั€ะธ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:480
 msgid "rebase merge commits"
 msgstr "ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ััŠั ัะปะธะฒะฐะฝะธั"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:482
 msgid "keep original branch points of cousins"
 msgstr ""
 "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะธั‚ะต ั‚ะพั‡ะบะธ ะฝะฐ ั€ะฐะทะบะปะพะฝัะฒะฐะฝะต ะฝะฐ ัะตัั‚ั€ะธะฝัะบะธั‚ะต ะบะปะพะฝะธ"
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:484
 msgid "move commits that begin with squash!/fixup!"
 msgstr "ะฟั€ะตะผะตัั‚ะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ, ะบะพะธั‚ะพ ะทะฐะฟะพั‡ะฒะฐั‚ ััŠั โ€žsquash!โ€œ/โ€œfixup!โ€œ"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:485
 msgid "sign commits"
 msgstr "ะฟะพะดะฟะธัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:487 builtin/rebase.c:1490
 msgid "display a diffstat of what changed upstream"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะฐั‚ะธัั‚ะธะบะฐ ั ะฟั€ะพะผะตะฝะธั‚ะต ะฒ ัะปะตะดะตะฝะธั ะบะปะพะฝ"
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:489
 msgid "continue rebase"
 msgstr "ะฟั€ะพะดัŠะปะถะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะตั‚ะพ"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:491
 msgid "skip commit"
 msgstr "ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:492
 msgid "edit the todo list"
 msgstr "ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ัะฟะธััŠะบะฐ ั ะบะพะผะฐะฝะดะธ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:494
 msgid "show the current patch"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะฐั‚ะฐ ะบั€ัŠะฟะบะฐ"
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:497
 msgid "shorten commit ids in the todo list"
 msgstr "ััŠะบั€ะฐั‚ะตะฝะธ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ะธ ะฒ ัะฟะธััŠะบะฐ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:499
 msgid "expand commit ids in the todo list"
 msgstr "ะฟัŠะปะฝะธ ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ะธ ะฒ ัะฟะธััŠะบะฐ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:501
 msgid "check the todo list"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ ะฝะฐ ัะฟะธััŠะบะฐ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:503
 msgid "rearrange fixup/squash lines"
 msgstr ""
 "ะฟั€ะตะฟะพะดั€ะตะถะดะฐะฝะต ะฝะฐ ั€ะตะดะพะฒะตั‚ะต ะทะฐ ะฒะบะฐั€ะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะฒ "
 "ะฟั€ะตะดั…ะพะดะฝะธั‚ะต ะธะผ ััŠั ะธ ะฑะตะท ัะผะตะฝะธ ะฝะฐ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:505
 msgid "insert exec commands in todo list"
 msgstr "ะฒะผัŠะบะฒะฐะฝะต ะฝะฐ ะบะพะผะฐะฝะดะธั‚ะต ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต ะฒ ัะฟะธััŠะบะฐ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:506
 msgid "onto"
 msgstr "ะฒัŠั€ั…ัƒ"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict-revision"
 msgstr "ะพะณั€ะฐะฝะธั‡ะตะฝะฐ ะฒะตั€ัะธั"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict revision"
 msgstr "ะพะณั€ะฐะฝะธั‡ะตะฝะฐ ะฒะตั€ัะธั"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:511
 msgid "squash-onto"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต, ะฒ ะบะพะตั‚ะพ ะดั€ัƒะณะธั‚ะต ะดะฐ ัะต ะฒะบะฐั€ะฐั‚"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:512
 msgid "squash onto"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต, ะฒ ะบะพะตั‚ะพ ะดั€ัƒะณะธั‚ะต ะดะฐ ัะต ะฒะบะฐั€ะฐั‚"
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:514
 msgid "the upstream commit"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะธะทั‚ะพั‡ะฝะธะบะฐ"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head-name"
 msgstr "ะธะผะต ะฝะฐ ะฒัŠั€ั…ะฐ"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head name"
 msgstr "ะธะผะต ะฝะฐ ะฒัŠั€ั…ะฐ"
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:521
 msgid "rebase strategy"
 msgstr "ัั‚ั€ะฐั‚ะตะณะธั ะฝะฐ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:522
 msgid "strategy-opts"
 msgstr "ะพะฟั†ะธะธ ะฝะฐ ัั‚ั€ะฐั‚ะตะณะธัั‚ะฐ"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:523
 msgid "strategy options"
 msgstr "ะพะฟั†ะธะธ ะฝะฐ ัั‚ั€ะฐั‚ะตะณะธัั‚ะฐ"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:524
 msgid "switch-to"
 msgstr "ะฟั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:525
 msgid "the branch or commit to checkout"
 msgstr "ะบะปะพะฝัŠั‚, ะบัŠะผ ะบะพะนั‚ะพ ะดะฐ ัะต ะฟั€ะตะผะธะฝะต"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto-name"
 msgstr "ะธะผะต ะฝะฐ ะฑะฐะทะฐ"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto name"
 msgstr "ะธะผะต ะฝะฐ ะฑะฐะทะฐ"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "cmd"
 msgstr "ะบะพะผะฐะฝะดะฐ"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "the command to run"
 msgstr "ะบะพะผะฐะฝะดะฐ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:530 builtin/rebase.c:1584
 msgid "automatically re-schedule any `exec` that fails"
 msgstr ""
 "ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะทะฐ ะฟะพะฒั‚ะพั€ะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบะพะผะฐะฝะดะธั‚ะต ะทะฐะฒัŠั€ัˆะธะปะธ ั ะฝะตัƒัะฟะตั…"
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:546
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--[no-]rebase-cousinsโ€œ ะธะทะธัะบะฒะฐั‚ ะพะฟั†ะธัั‚ะฐ โ€ž--rebase-mergesโ€œ"
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:562
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "โ€ž%sโ€œ ะธะทะธัะบะฒะฐ ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:612
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะตะผะธะฝะต ะบัŠะผ ะฝะพะฒะฐั‚ะฐ ะฑะฐะทะฐ, ะทะฐะดะฐะดะตะฝะฐ ั โ€žontoโ€œ: โ€ž%sโ€œ"
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:627
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป ะบัŠะผ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะตะฝ ะฒั€ัŠั… โ€žorig-headโ€œ: โ€ž%sโ€œ"
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:652
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ ะฝะฐ โ€žallow_rerere_autoupdateโ€œ ัะต ะฟั€ะตัะบะฐั‡ะฐ: โ€ž%sโ€œ"
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:728
 #, c-format
 msgid "Could not read '%s'"
 msgstr "ะŸัŠั‚ัั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:746
 #, c-format
 msgid "Cannot store %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝ"
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:853
 msgid "could not determine HEAD revision"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฟั€ะตะดะตะปะธ ะบัŠะผ ะบะฐะบะฒะพ ะดะฐ ัะพั‡ะธ ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ"
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17791,7 +18842,7 @@ msgstr ""
 "ะ—ะฐ ะดะฐ ะพั‚ะบะฐะถะตั‚ะต ะฟั€ะตะฑะฐะทะธั€ะฐะฝะตั‚ะพ ะธ ะดะฐ ัะต ะฒัŠั€ะฝะตั‚ะต ะบัŠะผ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพ ััŠัั‚ะพัะฝะธะต,\n"
 "ะธะทะฟัŠะปะฝะตั‚ะต โ€žgit rebase --abortโ€œ."
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -17809,7 +18860,16 @@ msgstr ""
 "\n"
 "ะ’ ั€ะตะทัƒะปั‚ะฐั‚ ั‚ะต ะฝะต ะผะพะณะฐั‚ ะดะฐ ัะต ะฟั€ะตะฑะฐะทะธั€ะฐั‚."
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ: ะฒะฐั€ะธะฐะฝั‚ะธั‚ะต ัะฐ โ€ždropโ€œ (ะฟั€ะตัะบะฐั‡ะฐะฝะต), "
+"โ€žkeepโ€œ (ะทะฐะฟะฐะทะฒะฐะฝะต) ะธ โ€žaskโ€œ (ะฟะธั‚ะฐะฝะต)"
+
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "%s\n"
@@ -17826,7 +18886,7 @@ msgstr ""
 "    git rebase ะšะ›ะžะ\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1417
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17839,135 +18899,143 @@ msgstr ""
 "\n"
 "    git branch --set-upstream-to=%s/ะšะ›ะžะ %s\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1447
 msgid "exec commands cannot contain newlines"
 msgstr "ะบะพะผะฐะฝะดะธั‚ะต ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะต ะผะพะถะต ะดะฐ ััŠะดัŠั€ะถะฐั‚ ะฝะพะฒะธ ั€ะตะดะพะฒะต"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1451
 msgid "empty exec command"
 msgstr "ะฟั€ะฐะทะฝะฐ ะบะพะผะฐะฝะดะฐ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต"
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1481
 msgid "rebase onto given branch instead of upstream"
 msgstr "ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฒัŠั€ั…ัƒ ะทะฐะดะฐะดะตะฝะธั, ะฐ ะฝะต ัะปะตะดะตะฝะธั ะบะปะพะฝ"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "ะทะฐ ั‚ะตะบัƒั‰ะฐ ะฑะฐะทะฐ ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะฑะฐะทะฐั‚ะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ ะธ ัะปะตะดะตะฝะพั‚ะพ"
+
+#: builtin/rebase.c:1485
 msgid "allow pre-rebase hook to run"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะบัƒะบะฐั‚ะฐ ะฟั€ะตะดะธ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1487
 msgid "be quiet. implies --no-stat"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั.  ะ’ะบะปัŽั‡ะฒะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--no-statโ€œ"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1493
 msgid "do not show diffstat of what changed upstream"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัั‚ะฐั‚ะธัั‚ะธะบะฐ ั ะฟั€ะพะผะตะฝะธั‚ะต ะฒ ัะปะตะดะตะฝะธั ะบะปะพะฝ"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1496
 msgid "add a Signed-off-by: line to each commit"
 msgstr ""
 "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั€ะตะด ะทะฐ ะฟะพะดะฟะธั โ€žSigned-off-byโ€œ ะฒ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะฝะฐ ะฒััะบะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
 msgid "passed to 'git am'"
 msgstr "ะฟะพะดะฐะฒะฐ ัะต ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit amโ€œ"
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
 msgid "passed to 'git apply'"
 msgstr "ะฟะพะดะฐะฒะฐ ัะต ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit applyโ€œ"
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "ะพั‚ะฑะธั€ะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะฟะพะดะฐะฒะฐะฝะธั ะดะพั€ะธ ะดะฐ ะฝัะผะฐ ะฟั€ะพะผะตะฝะธ"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1515
 msgid "continue"
 msgstr "ะฟั€ะพะดัŠะปะถะฐะฒะฐะฝะต"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1518
 msgid "skip current patch and continue"
 msgstr "ะฟั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะฐั‚ะฐ ะบั€ัŠะฟะบะฐ ะธ ะฟั€ะพะดัŠะปะถะฐะฒะฐะฝะต"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1520
 msgid "abort and check out the original branch"
 msgstr "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะธ ะฒัŠะทัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะธั ะบะปะพะฝ"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1523
 msgid "abort but keep HEAD where it is"
 msgstr "ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฑะตะท ะฟั€ะพะผัะฝะฐ ะบัŠะผ ะบะฐะบะฒะพ ัะพั‡ะธ โ€žHEADโ€œ"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1524
 msgid "edit the todo list during an interactive rebase"
 msgstr "ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ ั ะบะพะผะฐะฝะดะธ ะฟั€ะธ ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1527
 msgid "show the patch file being applied or merged"
 msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐั‚ะฐ, ะบะพัั‚ะพ ัะต ะฟั€ะธะปะฐะณะฐ ะธะปะธ ัะปะธะฒะฐ"
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "ะฟั€ะธ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัั‚ั€ะฐั‚ะตะณะธั ั ะฟั€ะธะปะฐะณะฐะฝะต"
+
+#: builtin/rebase.c:1534
 msgid "use merging strategies to rebase"
-msgstr "ะฟั€ะธ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัั‚ั€ะฐั‚ะตะณะธั ะทะฐ ัะปะธะฒะฐะฝะต"
+msgstr "ะฟั€ะธ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัั‚ั€ะฐั‚ะตะณะธั ััŠั ัะปะธะฒะฐะฝะต"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1538
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟะพั‚ั€ะตะฑะธั‚ะตะปั ะดะฐ ั€ะตะดะฐะบั‚ะธั€ะฐ ัะฟะธััŠะบะฐ ั ะฟะพะดะฐะฒะฐะฝะธั ะทะฐ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1542
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "(ะพัั‚ะฐั€ัะปะพ) ะฟั€ะตััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะธัั‚ะฐ ะฒะผะตัั‚ะพ ะดะฐ ัะต ะฟั€ะตัะบะฐั‡ะฐั‚"
+msgstr "(ะžะกะขะะ ะฏะ›ะž) ะฟั€ะตััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะธัั‚ะฐ ะฒะผะตัั‚ะพ ะดะฐ ัะต ะฟั€ะตัะบะฐั‡ะฐั‚"
 
-#: builtin/rebase.c:1455
-msgid "preserve empty commits during rebase"
-msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟั€ะฐะทะฝะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั ะฟั€ะธ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "ะบะฐะบ ะดะฐ ัะต ะพะฑั€ะฐะฑะพั‚ะฒะฐั‚ ะพะบะฐะทะฐะปะธั‚ะต ัะต ะฟั€ะฐะทะฝะธ ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1554
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 "ะฟั€ะตะผะตัั‚ะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ, ะบะพะธั‚ะพ ะทะฐะฟะพั‡ะฒะฐั‚ ััŠั โ€žsquash!โ€œ/โ€œfixup!โ€œ ะฟั€ะธ โ€ž-iโ€œ"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1560
 msgid "automatically stash/stash pop before and after"
 msgstr "ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ัะบะฐั‚ะฐะฒะฐะฝะต/ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ัะบะฐั‚ะฐะฝะพั‚ะพ ะฟั€ะตะดะธ ะธ ัะปะตะด ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1562
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั€ะตะดะพะฒะต ั ะบะพะผะฐะฝะดะธ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต ัะปะตะด ะฒััะบะพ ะฟะพะดะฐะฒะฐะฝะต ะฒ "
 "ั€ะตะดะฐะบั‚ะธั€ะฐะฝะธั ัะฟะธััŠะบ"
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1566
 msgid "allow rebasing commits with empty messages"
 msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ั ะฟั€ะฐะทะฝะธ ััŠะพะฑั‰ะตะฝะธั"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1570
 msgid "try to rebase merges instead of skipping them"
 msgstr "ะพะฟะธั‚ ะทะฐ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะธัั‚ะฐ ะฒะผะตัั‚ะพ ั‚ะต ะดะฐ ัะต ะฟั€ะตัะบะฐั‡ะฐั‚"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1573
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 "ะทะฐ ะดะพัƒั‚ะพั‡ะฝัะฒะฐะฝะตั‚ะพ ะฝะฐ ัะปะตะดะตะฝะธั ะบะปะพะฝ, ะธะทะฟะพะปะทะฒะฐะนั‚ะต:\n"
 "\n"
 "    git merge-base --fork-point"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1575
 msgid "use the given merge strategy"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะทะฐะดะฐะดะตะฝะฐั‚ะฐ ัั‚ั€ะฐั‚ะตะณะธัั‚ะฐ ะฝะฐ ัะปะธะฒะฐะฝะต"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
 msgid "option"
 msgstr "ะพะฟั†ะธั"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1578
 msgid "pass the argument through to the merge strategy"
 msgstr "ะฐั€ะณัƒะผะตะฝั‚ัŠั‚ ะดะฐ ัะต ะฟะพะดะฐะดะต ะฝะฐ ัั‚ั€ะฐั‚ะตะณะธัั‚ะฐ ะทะฐ ัะปะธะฒะฐะฝะต"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1581
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะดะพัั‚ะธะถะธะผะธ ะฟะพะดะฐะฒะฐะฝะธั ะดะพ ะฝะฐั‡ะฐะปะฝะพั‚ะพ ะธะผ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1598
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -17975,33 +19043,41 @@ msgstr ""
 "ะฟะพะดะดั€ัŠะถะบะฐั‚ะฐ ะฝะฐ โ€žrebase.useBuiltinโ€œ ะต ะฟั€ะตะผะฐั…ะฝะฐั‚ะฐ.\n"
 "ะ—ะฐ ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะฒะธะถั‚ะต โ€žgit help configโ€œ."
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1604
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 "ะ˜ะทะณะปะตะถะดะฐ, ั‡ะต ัะตะณะฐ ัะต ะฟั€ะธะปะฐะณะฐั‚ ะบั€ัŠะฟะบะธ ั‡ั€ะตะท ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-amโ€œ.  ะะต ะผะพะถะต ะดะฐ "
 "ะฟั€ะตะฑะฐะทะธั€ะฐั‚ะต ะฒ ะผะพะผะตะฝั‚ะฐ."
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1645
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 "ะžะฟั†ะธัั‚ะฐ โ€ž--preserve-mergesโ€œ ะต ะพัั‚ะฐั€ัะปะฐ.  ะŸะพะปะทะฒะฐะนั‚ะต โ€ž--rebase-mergesโ€œ ะฒะผะตัั‚ะพ "
 "ะฝะตั."
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--keep-baseโ€œ ะธ โ€ž--ontoโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--keep-baseโ€œ ะธ โ€ž--rootโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
+
+#: builtin/rebase.c:1656
 msgid "No rebase in progress?"
 msgstr "ะ˜ะทะณะปะตะถะดะฐ ะฒ ะผะพะผะตะฝั‚ะฐ ะฝะต ั‚ะตั‡ะต ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1660
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "ะžะฟั†ะธัั‚ะฐ โ€ž--edit-todoโ€œ ะต ะดะพัั‚ัŠะฟะฝะฐ ัะฐะผะพ ะฟะพ ะฒั€ะตะผะต ะฝะฐ ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต."
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1683
 msgid "Cannot read HEAD"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1695
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -18009,16 +19085,16 @@ msgstr ""
 "ะขั€ัะฑะฒะฐ ะดะฐ ั€ะตะดะฐะบั‚ะธั€ะฐั‚ะต ะฒัะธั‡ะบะธ ะบะพะฝั„ะปะธะบั‚ะธ ะฟั€ะธ ัะปะธะฒะฐะฝะตั‚ะพ.  ะกะปะตะด ั‚ะพะฒะฐ\n"
 "ะพั‚ะฑะตะปะตะถะตั‚ะต ะบะพั€ะธะณะธั€ะฐะฝะตั‚ะพ ะธะผ ั‡ั€ะตะท ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit addโ€œ"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1714
 msgid "could not discard worktree changes"
 msgstr "ะฟั€ะพะผะตะฝะธั‚ะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะทะฐะฝัƒะปะตะฝะธ"
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1733
 #, c-format
 msgid "could not move back to %s"
 msgstr "ะฒั€ัŠั‰ะฐะฝะตั‚ะพ ะบัŠะผ โ€ž%sโ€œ ะต ะฝะตะฒัŠะทะผะพะถะฝะพ"
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1778
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -18039,180 +19115,170 @@ msgstr ""
 "ะทะฐ\n"
 "ะดะฐ ะฝะต ะทะฐะณัƒะฑะธั‚ะต ัะปัƒั‡ะฐะนะฝะพ ะฟั€ะพะผะตะฝะธ.\n"
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1806
 msgid "switch `C' expects a numerical value"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€žCโ€œ ะพั‡ะฐะบะฒะฐ ั‡ะธัะปะพ ะทะฐ ะฐั€ะณัƒะผะตะฝั‚"
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1847
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "ะะตะธะทะฒะตัั‚ะฝะฐ ัั‚ั€ะฐั‚ะตะณะธั: โ€ž%sโ€œ"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1869
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--strategyโ€œ ะธะทะธัะบะฒะฐ ะฝัะบะพั ะพั‚ ะพะฟั†ะธะธั‚ะต โ€ž--mergeโ€œ ะธะปะธ โ€ž--interactiveโ€œ"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr "ะพะฟั†ะธะธั‚ะต ะทะฐ โ€žapplyโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ั ะพะฟั†ะธะธั‚ะต ะทะฐ ัะปะธะฒะฐะฝะต"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "ะะตะฟะพะทะฝะฐั‚ะฐ ั€ะตะฐะปะธะทะฐั†ะธั ะฝะฐ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต: %s"
+
+#: builtin/rebase.c:1937
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--reschedule-failed-execโ€œ ะธะทะธัะบะฒะฐ ะฝัะบะพั ะพั‚ ะพะฟั†ะธะธั‚ะต โ€ž--execโ€œ ะธะปะธ โ€ž--"
 "interactiveโ€œ"
 
-#: builtin/rebase.c:1809
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"ะพะฟั†ะธะธั‚ะต ะทะฐ โ€žamโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ั ะพะฟั†ะธะธั‚ะต ะทะฐ ัะปะธะฒะฐะฝะต ะธะปะธ ะทะฐ ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะฐ "
-"ั€ะฐะฑะพั‚ะฐ"
-
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1957
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--preserve-mergesโ€œ ะธ โ€ž--rebase-mergesโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1961
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "ะ“ะ ะ•ะจะšะ: ะพะฟั†ะธะธั‚ะต โ€ž--preserve-mergesโ€œ ะธ โ€ž--reschedule-failed-execโ€œ ัะฐ "
 "ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--rebase-mergesโ€œ ะธ โ€ž--strategy-optionโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--rebase-mergesโ€œ ะธ โ€ž--strategyโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1985
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ัะปะตะดะตะฝ ะบะปะพะฝ: โ€ž%sโ€œ"
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1991
 msgid "Could not create new root commit"
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ะฝะพะฒะพ ะฝะฐั‡ะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "โ€ž%sโ€œ: ะธะทะธัะบะฒะฐ ัะต ั‚ะพั‡ะฝะพ ะตะดะฝะฐ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต ั ะบะปะพะฝะฐ"
+
+#: builtin/rebase.c:2020
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "โ€ž%sโ€œ: ะธะทะธัะบะฒะฐ ัะต ั‚ะพั‡ะฝะพ ะตะดะฝะฐ ะฑะฐะทะฐ ะทะฐ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:2028
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€ž%sโ€œ ะฝะต ัะพั‡ะธ ะบัŠะผ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:2054
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "ะคะะขะะ›ะะ ะ“ะ ะ•ะจะšะ: ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะบะปะพะฝ โ€ž%sโ€œ"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr "ะขะฐะบัŠะฒ ัƒะบะฐะทะฐั‚ะตะป ะฝัะผะฐ: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2073
 msgid "Could not resolve HEAD to a revision"
 msgstr "ะŸะพะดะฐะฒะฐะฝะตั‚ะพ, ัะพั‡ะตะฝะพ ะพั‚ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ, ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ"
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2111
 msgid "Cannot autostash"
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ัะบะฐั‚ะฐะต ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ"
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2114
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "ะะตะพั‡ะฐะบะฒะฐะฝ ั€ะตะทัƒะปั‚ะฐั‚ ะฟั€ะธ ัะบะฐั‚ะฐะฒะฐะฝะต: โ€ž%sโ€œ"
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2120
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะทะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝะฐ"
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2123
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "ะะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ัะบะฐั‚ะฐะฝะพ: โ€ž%sโ€œ\n"
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2126
 msgid "could not reset --hard"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žgit reset --hardโ€œ"
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ัะพั‡ะธ ะบัŠะผ โ€ž%sโ€œ"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2135
 msgid "Please commit or stash them."
 msgstr "ะŸั€ะพะผะตะฝะธั‚ะต ั‚ั€ัะฑะฒะฐ ะธะปะธ ะดะฐ ัะต ะฟะพะดะฐะดะฐั‚, ะธะปะธ ะดะฐ ัะต ัะบะฐั‚ะฐัั‚."
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ"
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2169
 #, c-format
 msgid "could not switch to %s"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะตะผะธะฝะต ะบัŠะผ โ€ž%sโ€œ"
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2180
 msgid "HEAD is up to date."
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะต ะฝะฐะฟัŠะปะฝะพ ะฐะบั‚ัƒะฐะปะตะฝ."
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2182
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "ะขะตะบัƒั‰ะธัั‚ ะบะปะพะฝ โ€ž%sโ€œ ะต ะฝะฐะฟัŠะปะฝะพ ะฐะบั‚ัƒะฐะปะตะฝ.\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2190
 msgid "HEAD is up to date, rebase forced."
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะต ะฝะฐะฟัŠะปะฝะพ ะฐะบั‚ัƒะฐะปะตะฝ โ€” ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต"
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "ะขะตะบัƒั‰ะธัั‚ ะบะปะพะฝ โ€ž%sโ€œ ะต ะฝะฐะฟัŠะปะฝะพ ะฐะบั‚ัƒะฐะปะตะฝ โ€” ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต\n"
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2200
 msgid "The pre-rebase hook refused to rebase."
 msgstr "ะšัƒะบะฐั‚ะฐ ะทะฐ ะธะทะฟัŠะปะฝะตะฝะธะต ะฟั€ะตะดะธ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะพั‚ั…ะฒัŠั€ะปะธ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะตั‚ะพ."
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2207
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "ะŸั€ะพะผะตะฝะธั‚ะต ะฒ โ€ž%sโ€œ:\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2210
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "ะŸั€ะพะผะตะฝะธั‚ะต ะพั‚ โ€ž%sโ€œ ะบัŠะผ โ€ž%sโ€œ:\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2235
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "ะŸัŠั€ะฒะพ, ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะทะฐะฟะพั‡ะฒะฐ ะดะฐ ัะพั‡ะธ ะบัŠะผ ะฑะฐะทะฐั‚ะฐ, ะฒัŠั€ั…ัƒ ะบะพัั‚ะพ "
 "ะฟั€ะตะฑะฐะทะธั€ะฐั‚ะตโ€ฆ\n"
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2244
 msgid "Could not detach HEAD"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะดะตะปั"
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2253
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "ะŸั€ะตะฒัŠั€ั‚ะฐะฝะต ะฝะฐ โ€ž%sโ€œ ะบัŠะผ โ€ž%sโ€œ.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack ะ”ะ˜ะ ะ•ะšะขะžะ ะ˜ะฏ_ะะ_GIT"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:821
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -18245,7 +19311,7 @@ msgstr ""
 "ะ—ะฐ ะดะฐ ะทะฐะณะปัƒัˆะธั‚ะต ั‚ะพะฒะฐ ััŠะพะฑั‰ะตะฝะธะต, ะบะฐั‚ะพ ะทะฐะฟะฐะทะธั‚ะต ัั‚ะฐะฝะดะฐั€ั‚ะฝะพั‚ะพ ะฟะพะฒะตะดะตะฝะธะต,\n"
 "ะทะฐะดะฐะนั‚ะต ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žreceive.denyCurrentBranchโ€œ ะดะฐ ะต โ€žrefuseโ€œ (ะพั‚ะบะฐะท)."
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -18295,49 +19361,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists ะฃะšะะ—ะะขะ•ะ›"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ ะฒั€ะตะผะต"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "ะžั‚ะฑะตะปัะทะฒะฐะฝะต ะฝะฐ ะดะพัั‚ะธะถะธะผะธั‚ะต ะพะฑะตะบั‚ะธโ€ฆ"
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr "โ€ž%sโ€œ ะฝะต ัะพั‡ะธ ะฝะฐะฝะธะบัŠะดะต!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr "ะฝะต ะต ัƒะบะฐะทะฐะฝ ะถัƒั€ะฝะฐะป ั ะฟะพะดะฐะฒะฐะฝะธั ะทะฐ ะธะทั‚ั€ะธะฒะฐะฝะต"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ะถัƒั€ะฝะฐะป ั ะฟะพะดะฐะฒะฐะฝะธั"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "ะปะธะฟัะฒะฐ ะถัƒั€ะฝะฐะป ั ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ ะทะฐ โ€ž%sโ€œ"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะพั€ะผะฐั‚ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะป: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -18345,83 +19411,83 @@ msgstr ""
 "git remote add [-t ะšะ›ะžะ] [-m ะžะกะะžะ’ะ•ะ_ะšะ›ะžะ] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] ะ˜ะœะ• ะะ”ะ ะ•ะก"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename ะกะขะะ ะž_ะ˜ะœะ• ะะžะ’ะž_ะ˜ะœะ•"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove ะ˜ะœะ•"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head ะ˜ะœะ• (-a | --auto | -d | --delete | ะšะ›ะžะ)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] ะ˜ะœะ•"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] ะ˜ะœะ•"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(ะ“ะ ะฃะŸะ | "
 "ะžะขะ”ะะ›ะ•ะงะ•ะะž_ะฅะ ะะะ˜ะ›ะ˜ะฉะ•)โ€ฆ]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] ะ˜ะœะ• ะšะ›ะžะโ€ฆ"
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] ะ˜ะœะ•"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] ะ˜ะœะ• ะะžะ’_ะะ”ะ ะ•ะก [ะกะขะะ _ะะ”ะ ะ•ะก]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add ะ˜ะœะ• ะะžะ’_ะะ”ะ ะ•ะก"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete ะ˜ะœะ• ะะ”ะ ะ•ะก"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [ะžะŸะฆะ˜ะฏโ€ฆ] ะ˜ะœะ• ะะ”ะ ะ•ะก"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches ะ˜ะœะ• ะšะ›ะžะโ€ฆ"
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add ะ˜ะœะ• ะšะ›ะžะโ€ฆ"
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [ะžะŸะฆะ˜ะฏโ€ฆ] ะ˜ะœะ•"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [ะžะŸะฆะ˜ะฏโ€ฆ] ะ˜ะœะ•"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [ะžะŸะฆะ˜ะฏโ€ฆ] [ะ“ะ ะฃะŸะ | ะžะขะ”ะะ›ะ•ะงะ•ะะž_ะฅะ ะะะ˜ะ›ะ˜ะฉะ•โ€ฆ]"
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18429,86 +19495,102 @@ msgstr ""
 "ะ˜ะทะฟะพะปะทะฒะฐะฝะตั‚ะพ ัะฐะผะพ ะฝะฐ โ€ž--mirrorโ€œ ะต ะพะฟะฐัะฝะพ.  ะ’ะผะตัั‚ะพ ั‚ะพะฒะฐ\n"
 "ะฟะพะปะทะฒะฐะนั‚ะต โ€ž--mirror=fetchโ€œ ะธะปะธ โ€ž--mirror=pushโ€œ"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€ž--mirrorโ€œ: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "ะพั‚ะดะฐะปะตั‡ะตะฝะธั‚ะต ะบะปะพะฝะธ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะดะพัั‚ะฐะฒะตะฝะธ"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "ะฒะฝะฐััะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะตั‚ะธะบะตั‚ะธ ะธ ะฟั€ะธะฝะฐะดะปะตะถะฐั‰ะธั‚ะต ะธะผ ะพะฑะตะบั‚ะธ ะฟั€ะธ ะดะพัั‚ะฐะฒัะฝะต"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "ะผะพะถะต ะธ ะดะฐ ะฝะต ัะต ะดะพัั‚ะฐะฒัั‚ ะฝะธะบะฐะบะฒะธ ะตั‚ะธะบะตั‚ะธ (ั‡ั€ะตะท ะพะฟั†ะธัั‚ะฐ โ€ž--no-tagsโ€œ)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "ะบะปะพะฝ/ะธ ะทะฐ ัะปะตะดะตะฝะต"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "ะพัะฝะพะฒะตะฝ ะบะปะพะฝ"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "ะฝะฐัั‚ั€ะพะนะฒะฐะฝะต ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะพั‚ ะบะพะตั‚ะพ ะดะฐ ัะต ะธะทะดัŠั€ะฟะฒะฐ ะธะปะธ ะดะพัั‚ะฐะฒั"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 "ะฝัะผะฐ ัะผะธััŠะป ะดะฐ ัะต ัƒะบะฐะทะฒะฐ ะพัะฝะพะฒะตะฝ ะบะปะพะฝ ะฟั€ะธ ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--mirrorโ€œ"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "ัƒะบะฐะทะฒะฐะฝะตั‚ะพ ะฝะฐ ัะปะตะดะตะฝะธ ะบะปะพะฝะธ ะต ัะผะธัะปะตะฝะพ ัะฐะผะพ ะทะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะธ ั…ั€ะฐะฝะธะปะธั‰ะฐ, ะพั‚ "
 "ะบะพะธั‚ะพ ัะต ะดะพัั‚ะฐะฒั"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr "ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ั ะธะผะต โ€ž%sโ€œ."
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "โ€ž%sโ€œ ะต ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะทะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "ะžัะฝะพะฒะฝะธัั‚ ะบะปะพะฝ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฝะฐัั‚ั€ะพะตะฝ"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "ะžะฑะตะบั‚ะธั‚ะต ะทะฐ ะดะพัั‚ะฐะฒัะฝะต ะทะฐ ัƒะบะฐะทะฐั‚ะตะปั โ€ž%sโ€œ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะฟะพะปัƒั‡ะตะฝะธ"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "(ััŠะฒะฟะฐะดะฐั‰ะธ)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "(ะทะฐ ะธะทั‚ั€ะธะฒะฐะฝะต)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žremote.pushDefaultโ€œ ั ะพะฑั…ะฒะฐั‚ โ€ž%sโ€œ ะฒ:\n"
+"    %s:%d\n"
+"ะธะทะฟะพะปะทะฒะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต, ะบะพะตั‚ะพ ะฒะตั‡ะต ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ: โ€ž%sโ€œ"
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "ะัะผะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ ะธะผะต โ€ž%sโ€œ"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "ะ ะฐะทะดะตะปัŠั‚ โ€ž%sโ€œ ะฒ ะฝะฐัั‚ั€ะพะนะบะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝ ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18519,17 +19601,17 @@ msgstr ""
 "    %s\n"
 "  ะŸั€ะพะผะตะฝะตั‚ะต ะฝะฐัั‚ั€ะพะนะบะธั‚ะต ั€ัŠั‡ะฝะพ, ะฐะบะพ ะต ะฝะตะพะฑั…ะพะดะธะผะพ."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18543,121 +19625,121 @@ msgstr[1] ""
 "ะ‘ะตะปะตะถะบะฐ: ะัะบะพะปะบะพ ะบะปะพะฝะฐ ะธะทะฒัŠะฝ ะนะตั€ะฐั€ั…ะธัั‚ะฐ โ€žrefs/remotes/โ€œ ะฝะต ะฑัั…ะฐ ะธะทั‚ั€ะธั‚ะธ.\n"
 "ะ˜ะทั‚ั€ะธะนั‚ะต ะณะธ ั‡ั€ะตะท ะบะพะผะฐะฝะดะฐั‚ะฐ:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "ะ ะฐะทะดะตะปัŠั‚ โ€ž%sโ€œ ะฒ ะฝะฐัั‚ั€ะพะนะบะธั‚ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " ะฝะพะฒ (ัะปะตะดะฒะฐั‰ะพั‚ะพ ะดะพัั‚ะฐะฒัะฝะต ั‰ะต ะณะพ ั€ะฐะทะฟะพะปะพะถะธ ะฒ โ€žremotes/%sโ€œ)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr " ัะปะตะดะตะฝ"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " ัั‚ะฐั€ (ะธะทั‚ั€ะธะนั‚ะต ั‡ั€ะตะท โ€žgit remote pruneโ€œ)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr " ะฝะตััะฝะพ ััŠัั‚ะพัะฝะธะต"
 
 # CHECK
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะบะปะพะฝ ะทะฐ ัะปะธะฒะฐะฝะต โ€ž%sโ€œ.  ะะตะฒัŠะทะผะพะถะฝะพ ะต ะดะฐ ะฟั€ะตะฑะฐะทะธั€ะฐั‚ะต ะฒัŠั€ั…ัƒ ะฟะพะฒะตั‡ะต "
 "ะพั‚ 1 ะบะปะพะฝ"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฒัŠั€ั…ัƒ ะพั‚ะดะฐะปะตั‡ะตะฝะธั ะบะปะพะฝ โ€ž%sโ€œ"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1052
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "ะธะฝั‚ะตั€ะฐะบั‚ะธะฒะฝะพ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต (ััŠั ัะปะธะฒะฐะฝะธั) ะฒัŠั€ั…ัƒ ะพั‚ะดะฐะปะตั‡ะตะฝะธั ะบะปะพะฝ โ€ž%sโ€œ"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฒัŠั€ั…ัƒ ะพั‚ะดะฐะปะตั‡ะตะฝะธั ะบะปะพะฝ โ€ž%sโ€œ"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr " ัะปะธะฒะฐะฝะต ั ะพั‚ะดะฐะปะตั‡ะตะฝะธั ะบะปะพะฝ โ€ž%sโ€œ"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr "ัะปะธะฒะฐะฝะต ั ะพั‚ะดะฐะปะตั‡ะตะฝะธั ะบะปะพะฝ โ€ž%sโ€œ"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    ะธ ั ะพั‚ะดะฐะปะตั‡ะตะฝะธั ะบะปะพะฝ โ€ž%sโ€œ\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr "ััŠะทะดะฐะดะตะฝ"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr "ะธะทั‚ั€ะธั‚"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr "ะฐะบั‚ัƒะฐะปะตะฝ"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr "ะผะพะถะต ะดะฐ ัะต ะฟั€ะตะฒัŠั€ั‚ะธ"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr "ะปะพะบะฐะปะฝะธัั‚ ะต ะธะทะพัั‚ะฐะฝะฐะป"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะธะทั‚ะปะฐัะบะฒะฐ ะบัŠะผ %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s ะธะทั‚ะปะฐัะบะฒะฐ ะบัŠะผ %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะธะทั‚ะปะฐัะบะฒะฐ ะบัŠะผ %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s ะธะทั‚ะปะฐัะบะฒะฐ ะบัŠะผ %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr "ะฑะตะท ะทะฐัะฒะบะธ ะบัŠะผ ะพั‚ะดะฐะปะตั‡ะตะฝะธั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะฐ"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr "โ— ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  ะะดั€ะตั ะทะฐ ะดะพัั‚ะฐะฒัะฝะต: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr "(ะฑะตะท ะฐะดั€ะตั)"
 
@@ -18665,25 +19747,25 @@ msgstr "(ะฑะตะท ะฐะดั€ะตั)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  ะะดั€ะตั ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  ะบะปะพะฝ ัะพั‡ะตะฝ ะพั‚ HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr "(ะฑะตะท ะฟั€ะพะฒะตั€ะบะฐ)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr "(ะฝะตะฟะพะทะฝะฐั‚)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -18692,170 +19774,161 @@ msgstr ""
 "ั…ั€ะฐะฝะธะปะธั‰ะต\n"
 "  ะฝะต ะต ะตะดะฝะพะทะฝะฐั‡ะตะฝ ะธ ะต ะฝัะบะพะน ะพั‚ ัะปะตะดะฝะธั‚ะต):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  ะžั‚ะดะฐะปะตั‡ะตะฝ ะบะปะพะฝ:%s"
 msgstr[1] "  ะžั‚ะดะฐะปะตั‡ะตะฝะธ ะบะปะพะฝะธ:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr " (ััŠัั‚ะพัะฝะธะตั‚ะพ ะฝะต ะฑะต ะฟั€ะพะฒะตั€ะตะฝะพ)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  ะ›ะพะบะฐะปะตะฝ ะบะปะพะฝ ะฝะฐัั‚ั€ะพะตะฝ ะทะฐ ะธะทะดัŠั€ะฟะฒะฐะฝะต ั‡ั€ะตะท โ€žgit pullโ€œ:"
 msgstr[1] "  ะ›ะพะบะฐะปะฝะธ ะบะปะพะฝะธ ะฝะฐัั‚ั€ะพะตะฝะธ ะทะฐ ะธะทะดัŠั€ะฟะฒะฐะฝะต ั‡ั€ะตะท โ€žgit pullโ€œ:"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  ะ›ะพะบะฐะปะฝะธั‚ะต ัƒะบะฐะทะฐั‚ะตะปะธ ั‰ะต ะฑัŠะดะฐั‚ ะฟั€ะตะฝะตัะตะฝะธ ั‡ั€ะตะท โ€ž pushโ€œ"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  ะ›ะพะบะฐะปะฝะธัั‚ ัƒะบะฐะทะฐั‚ะตะป, ะฝะฐัั‚ั€ะพะตะฝ ะทะฐ โ€žgit pushโ€œ%s:"
 msgstr[1] "  ะ›ะพะบะฐะปะฝะธั‚ะต ัƒะบะฐะทะฐั‚ะตะปะธ, ะฝะฐัั‚ั€ะพะตะฝะธ ะทะฐ โ€žgit pushโ€œ%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ refs/remotes/ะ˜ะœะ•/HEAD ัะฟะพั€ะตะด ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ refs/remotes/ะ˜ะœะ•/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ัƒัั‚ะฐะฝะพะฒะธ ะพั‚ะดะฐะปะตั‡ะตะฝะธัั‚ ะฒั€ัŠั…"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "ะœะฝะพะถะตัั‚ะฒะพ ะบะปะพะฝะธ ั ะฒัŠั€ั…ะพะฒะต.  ะ˜ะทะฑะตั€ะตั‚ะต ะธะทั€ะธั‡ะฝะพ ะฝัะบะพะน ะพั‚ ั‚ัั… ั‡ั€ะตะท ะบะพะผะฐะฝะดะฐั‚ะฐ:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ัƒะบะฐะทะฐั‚ะตะป: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฝะฐัั‚ั€ะพะธ"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
 msgstr "โ€ž%sโ€œ ั‰ะต ัะต ะฟั€ะตะฒัŠั€ะฝะต ะฒ ะพะฑะตะบั‚ ะธะทะฒัŠะฝ ะบะปะพะฝะธั‚ะต!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
 msgstr "โ€ž%sโ€œ ัะต ะฟั€ะตะฒัŠั€ะฝะฐ ะฒ ะพะฑะตะบั‚ ะธะทะฒัŠะฝ ะบะปะพะฝะธั‚ะต!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr "ะžะบะฐัั‚ั€ัะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr "ะฐะดั€ะตั: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr " โ— [ั‰ะต ะฑัŠะดะต ะพะบะฐัั‚ั€ะตะฝะพ] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr " โ— [ะพะบะฐัั‚ั€ะตะฝะพ] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr "ะพะบะฐัั‚ั€ัะฝะต ะฝะฐ ะพะณะปะตะดะฐะปะฐั‚ะฐ ะฝะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะธั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะฐ ัะปะตะด ะดะพัั‚ะฐะฒัะฝะต"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr "ะัะผะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ ะธะผะต โ€ž%sโ€œ"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะบะปะพะฝ"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr "ะฝะต ะต ัƒะบะฐะทะฐะฝะพ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr "ะทะฐะฟะธั‚ะฒะฐะฝะต ะบัŠะผ ะฐะดั€ะตัะธั‚ะต ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต, ะฐ ะฝะต ะทะฐ ะดะพัั‚ะฐะฒัะฝะต"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ะฐะดั€ะตัะธ"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝ ะฐะดั€ะตั ะทะฐ ะพั‚ะดะฐะปะตั‡ะตะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต โ€ž%sโ€œ"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr "ะฟั€ะพะผัะฝะฐ ะฝะฐ ะฐะดั€ะตัะธั‚ะต ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฐะดั€ะตัะธ"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ะฐะดั€ะตัะธ"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--addโ€œ ะธ โ€ž--deleteโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ (ัั‚ะฐั€) ั„ะพั€ะผะฐั‚ ะทะฐ ะฐะดั€ะตั: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr "ะขะฐะบัŠะฒ ะฐะดั€ะตั ะฝะต ะต ะพั‚ะบั€ะธั‚: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr "ะะธะบะพะน ะพั‚ ะฐะดั€ะตัะธั‚ะต, ะบะพะธั‚ะพ ะฝะต ัะฐ ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต, ะฝัะผะฐ ะดะฐ ัะต ะธะทั‚ั€ะธะต"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ะฟะพะฒะตั‡ะต ะฟะพะดั€ะพะฑะฝะพัั‚ะธ.  ะŸะพัั‚ะฐะฒั ัะต ะฟั€ะตะด ะฟะพะดะบะพะผะฐะฝะดะฐ"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "ะะตะฟะพะทะฝะฐั‚ะฐ ะฟะพะดะบะพะผะฐะฝะดะฐ: %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr "git repack [ะžะŸะฆะ˜ะฏโ€ฆ]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18864,126 +19937,126 @@ msgstr ""
 "ะŸะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ --no-write-bitmap-index ะธะปะธ ะธะทะบะปัŽั‡ะตั‚ะต ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ\n"
 "โ€žpack.writebitmapsโ€œ."
 
-#: builtin/repack.c:190
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žpack-objectsโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ัั‚ะฐั€ั‚ะธั€ะฐ ะทะฐ ะฟั€ะตะฟะฐะบะตั‚ะธั€ะฐะฝะตั‚ะพ ะฝะฐ "
 "ะณะฐั€ะฐะฝั‚ะธั€ะฐั‰ะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
-"repack: ะพั‚ โ€žpack-objectsโ€œ ัะต ะพั‡ะฐะบะฒะฐั‚ ั€ะตะดะพะฒะต ัะฐะผะพ ั ะฟัŠะปะฝะธ ัˆะตัั‚ะฝะฐะนัะตั‚ะธั‡ะฝะธ "
+"repack: ะพั‚ โ€žpack-objectsโ€œ ัะต ะธะทะธัะบะฒะฐั‚ ั€ะตะดะพะฒะต ัะฐะผะพ ั ะฟัŠะปะฝะธ ัˆะตัั‚ะฝะฐะนัะตั‚ะธั‡ะฝะธ "
 "ัƒะบะฐะทะฐั‚ะตะปะธ."
 
-#: builtin/repack.c:246
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žpack-objectsโ€œ ะฝะต ะผะพะถะต ะดะฐ ะทะฐะฒัŠั€ัˆะธ ะทะฐ ะฟั€ะตะฟะฐะบะตั‚ะธั€ะฐะฝะตั‚ะพ ะฝะฐ "
 "ะณะฐั€ะฐะฝั‚ะธั€ะฐั‰ะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/repack.c:284
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr "ะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะพ ะฒ ะฟะฐะบะตั‚"
 
-#: builtin/repack.c:286
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 "ััŠั‰ะพั‚ะพ ะบะฐั‚ะพ ะพะฟั†ะธัั‚ะฐ โ€ž-aโ€œ.  ะ”ะพะฟัŠะปะฝะธั‚ะตะปะฝะพ โ€” ะฝะตะดะพัั‚ะธะถะธะผะธั‚ะต ะพะฑะตะบั‚ะธ ะดะฐ ัั‚ะฐะฝะฐั‚ "
 "ะฝะตะฟะฐะบะตั‚ะธั€ะฐะฝะธ"
 
-#: builtin/repack.c:289
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 "ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฝะตะฝัƒะถะฝะธั‚ะต ะฟะฐะบะตั‚ะธั€ะฐะฝะธ ั„ะฐะนะปะพะฒะต ะธ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-"
 "prune-packedโ€œ"
 
-#: builtin/repack.c:291
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--no-reuse-deltaโ€œ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-pack-objectsโ€œ"
 
-#: builtin/repack.c:293
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--no-reuse-objectโ€œ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-pack-objectsโ€œ"
 
-#: builtin/repack.c:295
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr "ะฑะตะท ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-update-server-infoโ€œ"
 
-#: builtin/repack.c:298
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--localโ€œ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-pack-objectsโ€œ"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะธ ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะธ ะฝะฐ ะฑะฐะทะฐ ะฑะธั‚ะพะฒะธ ะผะฐัะบะธ"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:310
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--delta-islandsโ€œ ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit-pack-objectsโ€œ"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr "ะตะฒั€ะธัั‚ะธั‡ะฝะฐ ะดะฐั‚ะฐ"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 "ะฟั€ะธ ะบะพะผะฑะธะฝะธั€ะฐะฝะตั‚ะพ ั ะพะฟั†ะธัั‚ะฐ โ€ž-Aโ€œ โ€” ะฑะตะท ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะฟะพ ัั‚ะฐั€ะธ ะพั‚ "
 "ั‚ะพะฒะฐ"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr "ั โ€ž-aโ€œ โ€” ะฟั€ะตะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะฝะตะดะพัั‚ะธะถะธะผะธั‚ะต ะพะฑะตะบั‚ะธ"
 
-#: builtin/repack.c:308
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr "ั€ะฐะทะผะตั€ ะฝะฐ ะฟั€ะพะทะพั€ะตั†ะฐ ะทะฐ ะดะตะปั‚ะฐ ะบะพะผะฟั€ะตัะธัั‚ะฐ"
 
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr "ะฑะฐะนั‚ะพะฒะต"
 
-#: builtin/repack.c:310
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "ััŠั‰ะพั‚ะพ ะบะฐั‚ะพ ะณะพั€ะฝะฐั‚ะฐ ะพะฟั†ะธั, ะฝะพ ะพะณั€ะฐะฝะธั‡ะตะฝะธะตั‚ะพ ะดะฐ ะต ะฟะพ ั€ะฐะทะผะตั€ ะฝะฐ ะฟะฐะผะตั‚ั‚ะฐ, ะฐ ะฝะต "
 "ะฟะพ ะฑั€ะพั ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr "ะพะณั€ะฐะฝะธั‡ะฐะฒะฐะฝะต ะฝะฐ ะผะฐะบัะธะผะฐะปะฝะฐั‚ะฐ ะดัŠะปะฑะพั‡ะธะฝะฐ ะฝะฐ ะดะตะปั‚ะฐั‚ะฐ"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr "ะพะณั€ะฐะฝะธั‡ะฐะฒะฐะฝะต ะฝะฐ ะผะฐะบัะธะผะฐะปะฝะธั ะฑั€ะพะน ะฝะธัˆะบะธ"
 
-#: builtin/repack.c:316
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr "ะผะฐะบัะธะผะฐะปะตะฝ ั€ะฐะทะผะตั€ ะฝะฐ ะฒัะตะบะธ ะฟะฐะบะตั‚"
 
-#: builtin/repack.c:318
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr "ะฟั€ะตะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะฒ ะฟะฐะบะตั‚ะธ ะฑะตะปัะทะฐะฝะธ ั โ€ž.keepโ€œ"
 
-#: builtin/repack.c:320
+#: builtin/repack.c:328
 msgid "do not repack this pack"
 msgstr "ะฑะตะท ะฟั€ะตะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ั‚ะพะทะธ ะฟะฐะบะตั‚"
 
-#: builtin/repack.c:330
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "ะฟะฐะบะตั‚ะธั‚ะต ะฒ ั…ั€ะฐะฝะธะปะธั‰ะต ั ะฒะฐะถะฝะธ ะพะฑะตะบั‚ะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ั‚ั€ะธัั‚"
 
-#: builtin/repack.c:334
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--keep-unreachableโ€œ ะธ โ€ž-Aโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/repack.c:417
+#: builtin/repack.c:425
 msgid "Nothing new to pack."
 msgstr "ะะธั‰ะพ ะฝะพะฒะพ ะทะฐ ะฟะฐะบะตั‚ะธั€ะฐะฝะต"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -19001,7 +20074,7 @@ msgstr ""
 "ะŸะ ะ•ะ”ะฃะŸะ ะ•ะ–ะ”ะ•ะะ˜ะ•: ะธฬ€ โ€” ะทะฐ ะฒั€ัŠั‰ะฐะฝะตั‚ะพ ะฝะฐ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะธั‚ะต ะธะผะตะฝะฐ.\n"
 "ะŸะ ะ•ะ”ะฃะŸะ ะ•ะ–ะ”ะ•ะะ˜ะ•: ะŸั€ะตะธะผะตะฝัƒะฒะฐะนั‚ะต ั„ะฐะนะปะพะฒะตั‚ะต ะฒ โ€ž%sโ€œ ั€ัŠั‡ะฝะพ:\n"
 
-#: builtin/repack.c:526
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚ะฐ"
@@ -19109,8 +20182,8 @@ msgstr "โ€žfstatโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ"
 msgid "unable to write object to database"
 msgstr "ะพะฑะตะบั‚ัŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ ะฒ ะฑะฐะทะฐั‚ะฐ ะพั‚ ะดะฐะฝะฝะธ"
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั‚: โ€ž%sโ€œ"
@@ -19129,22 +20202,22 @@ msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ ั ะพะฑะตะบั‚ะ
 msgid "new object is the same as the old one: '%s'"
 msgstr "ะฝะพะฒะธัั‚ ะธ ัั‚ะฐั€ะธัั‚ ะพะฑะตะบั‚ ัะฐ ะตะดะธะฝ ะธ ััŠั‰: โ€ž%sโ€œ"
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธั€ะฐ ะบะฐั‚ะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "ะตั‚ะธะบะตั‚ัŠั‚ ะฟั€ะธ ัะปะธะฒะฐะฝะต ะฒ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ e ะฝะตะฟั€ะฐะฒะธะปะตะฝ"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "ะตั‚ะธะบะตั‚ัŠั‚ ะฟั€ะธ ัะปะธะฒะฐะฝะต ะฒ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž%sโ€œ e ะฝะตะฟั€ะฐะฒะธะปะตะฝ"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -19153,31 +20226,31 @@ msgstr ""
 "ะŸัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ััŠะดัŠั€ะถะฐ ะตั‚ะธะบะตั‚ะฐ ะฟั€ะธ ัะปะธะฒะฐะฝะต โ€ž%sโ€œ, ะบะพะนั‚ะพ ะต "
 "ะธะทั…ะฒัŠั€ะปะตะฝ, ะทะฐั‚ะพะฒะฐ ะธะทะฟะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ โ€ž--editโ€œ, ะฐ ะฝะต โ€ž--graftโ€œ."
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต โ€ž%sโ€œ ะต ั ะฟะพะดะฟะธั ะฝะฐ GPG"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "ะŸะพะดะฟะธััŠั‚ ั‰ะต ะฑัŠะดะต ะฟั€ะตะผะฐั…ะฝะฐั‚ ะฒ ะทะฐะผะตะฝัั‰ะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต!"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "ะทะฐะผะตะฝัั‰ะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ะทะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝะพ"
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "ะฟั€ะธัะฐะดะบะฐั‚ะฐ ะทะฐ โ€ž%sโ€œ ะต ะธะทะปะธัˆะฝะฐ"
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "ะฝะพะฒะพั‚ะพ ะธ ัั‚ะฐั€ะพั‚ะพ ะฟะพะดะฐะฒะฐะฝะต ัะฐ ะตะดะฝะพ ะธ ััŠั‰ะพ: โ€ž%sโ€œ"
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -19186,71 +20259,71 @@ msgstr ""
 "ัะปะตะดะฝะธั‚ะต ะฟั€ะธัะฐะดะบะธ ะฝะต ะผะพะณะฐั‚ ะดะฐ ัะต ะฟั€ะตะพะฑั€ะฐะทัƒะฒะฐั‚:\n"
 "%s"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฟะธััŠะบะฐ ั ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะทะฐ ะทะฐะผัะฝะฐ"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะทะฐ ะทะฐะผัะฝะฐ"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ ะพะฑะตะบั‚"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "ัะผัะฝะฐ ะฝะฐ ั€ะพะดะธั‚ะตะปะธั‚ะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "ะฟั€ะตะพะฑั€ะฐะทัƒะฒะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ ะทะฐ ะฟั€ะธัะฐะดะบะธั‚ะต"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "ะทะฐะผัะฝะฐ ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปั, ะฐะบะพ ััŠั‰ะตัั‚ะฒัƒะฒะฐ"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "ะฑะตะท ั„ะพั€ะผะฐั‚ะธั€ะฐะฝะพ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ โ€” ะทะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--editโ€œ"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ั‚ะพะทะธ ะคะžะ ะœะะข"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--formatโ€œ ะธะทะธัะบะฒะฐ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฟะธััŠะบ"
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž-fโ€œ ะธะทะธัะบะฒะฐ ะทะฐะฟะฐะทะฒะฐะฝะตั‚ะพ ะฝะฐ ะทะฐะผะตัั‚ะธั‚ะตะป"
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--rawโ€œ ะธะทะธัะบะฒะฐ โ€ž--editโ€œ"
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž-dโ€œ ะธะทะธัะบะฒะฐ ะฟะพะฝะต ะตะดะธะฝ ะฐั€ะณัƒะผะตะฝั‚"
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฑั€ะพะน ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž-eโ€œ ะธะทะธัะบะฒะฐ ะฟะพะฝะต ะตะดะธะฝ ะฐั€ะณัƒะผะตะฝั‚"
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž-gโ€œ ะธะทะธัะบะฒะฐ ะฟะพะฝะต ะตะดะธะฝ ะฐั€ะณัƒะผะตะฝั‚"
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--convert-graft-fileโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž-lโ€œ ะฟั€ะธะตะผะฐ ั‚ะพั‡ะฝะพ ะตะดะธะฝ ัˆะฐะฑะปะพะฝ"
 
@@ -19278,117 +20351,130 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ะŸะžะ”ะะ’ะะะ•]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] ะฃะšะะ—ะะขะ•ะ›_ะšะชะœ_ะ”ะชะ ะ’ะž [--] ะŸะชะขะ˜ะฉะโ€ฆ"
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [ะฃะšะะ—ะะขะ•ะ›_ะšะชะœ_ะ”ะชะ ะ’ะž] [--] ะŸะชะขะ˜ะฉะโ€ฆ"
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] "
+"[ะฃะšะะ—ะะขะ•ะ›_ะšะชะœ_ะ”ะชะ ะ’ะž]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [ะฃะšะะ—ะะขะ•ะ›_ะšะชะœ_ะ”ะชะ ะ’ะž] [--] [ะŸะชะขะ˜ะฉะโ€ฆ]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "ัะผะตัะตะฝะพ (mixed)"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "ะผะตะบะพ (soft)"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "ะฟัŠะปะฝะพ (hard)"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "ัะปัั‚ะพ (merge)"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "ะทะฐะฟะฐะทะฒะฐั‰ะพ (keep)"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะต ะฟะพะฒั€ะตะดะตะฝ."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr "ะ”ัŠั€ะฒะพั‚ะพ, ัะพั‡ะตะฝะพ ะพั‚ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ, ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "ะ”ัŠั€ะฒะพั‚ะพ, ัะพั‡ะตะฝะพ ะพั‚ โ€ž%sโ€œ, ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚ะพ."
 
-#: builtin/reset.c:193
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ัะพั‡ะธ ะบัŠะผ โ€ž%sโ€œ"
+
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัŠั€ัˆะธ %s ะทะฐะฝัƒะปัะฒะฐะฝะต ะฟะพ ะฒั€ะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต."
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "ะฟะพ-ะผะฐะปะบะพ ะฟะพะดั€ะพะฑะฝะพัั‚ะธ, ะดะฐ ัะต ะธะทะฒะตะถะดะฐั‚ ัะฐะผะพ ะณั€ะตัˆะบะธั‚ะต"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr "ะธะฝะดะตะบัะฐ ะธ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ, ะฑะตะท ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr "ัะฐะผะพ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ, ะฑะตะท ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ, ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr "ะทะฐะฝัƒะปัะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ, ะฝะพ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะปะพะบะฐะปะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "ะพั‚ะฑะตะปัะทะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ั„ะฐะบั‚ะฐ, ั‡ะต ะธะทั‚ั€ะธั‚ะธั‚ะต ะฟัŠั‚ะธั‰ะฐ ั‰ะต ะฑัŠะดะฐั‚ ะดะพะฑะฐะฒะตะฝะธ ะฟะพ-ะบัŠัะฝะพ"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "ะกั‚ะพะนะฝะพัั‚ั‚ะฐ โ€ž%sโ€œ ะฝะต ะต ั€ะฐะทะฟะพะทะฝะฐั‚ะฐ ะบะฐั‚ะพ ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะฐ ะฒะตั€ัะธั."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "โ€ž%sโ€œ ะฝะต ะต ั€ะฐะทะฟะพะทะฝะฐั‚ ะบะฐั‚ะพ ะดัŠั€ะฒะพ."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
-"ะพะฟั†ะธัั‚ะฐ โ€ž--patchโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะฒััะบะฐ ะพั‚ ะพะฟั†ะธะธั‚ะต โ€ž--hard/--mixed/--softโ€œ"
+"ะพะฟั†ะธัั‚ะฐ โ€ž--patchโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะฒััะบะฐ ะพั‚ ะพะฟั†ะธะธั‚ะต โ€ž--hardโ€œ/โ€ž--mixedโ€œ/โ€ž--"
+"softโ€œ"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "ะพะฟั†ะธัั‚ะฐ โ€ž--mixedโ€œ ะฝะต ะฑะธะฒะฐ ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐะตะดะฝะพ ั ะฟัŠั‚ะธั‰ะฐ.  ะ’ะผะตัั‚ะพ ั‚ะพะฒะฐ "
 "ะธะทะฟัŠะปะฝะตั‚ะต โ€žgit reset -- ะŸะชะขโ€ฆโ€œ."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "ะะต ะผะพะถะต ะดะฐ ะธะทะฒัŠั€ัˆะธั‚ะต %s ะทะฐะฝัƒะปัะฒะฐะฝะต, ะบะพะณะฐั‚ะพ ัั‚ะต ะทะฐะดะฐะปะธ ะŸะชะข."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "ะ’ ะณะพะปะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะต ะผะพะถะต ะดะฐ ะธะทะฒัŠั€ัˆะธั‚ะต %s ะทะฐะฝัƒะปัะฒะฐะฝะต"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
-msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž-Nโ€œ ะต ััŠะฒะผะตัั‚ะธะผะฐ ัะฐะผะพ ั โ€ž--mixedโ€œ"
+msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž-Nโ€œ ะธะทะธัะบะฒะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--mixedโ€œ"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr "ะŸั€ะพะผะตะฝะธ ะธะทะฒัŠะฝ ะธะฝะดะตะบัะฐ ัะปะตะด ะทะฐะฝัƒะปัะฒะฐะฝะตั‚ะพ:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -19401,35 +20487,30 @@ msgstr ""
 "ะžะฟั†ะธัั‚ะฐ โ€ž--quietโ€œ ะทะฐะณะปัƒัˆะฐะฒะฐ ั‚ะพะฒะฐ ััŠะพะฑั‰ะตะฝะธะต ะตะดะฝะพะบั€ะฐั‚ะฝะพ.  ะ—ะฐ ะฟะพัั‚ะพัะฝะฝะพ\n"
 "ะทะฐะณะปัƒัˆะฐะฒะฐะฝะต ะทะฐะดะฐะนั‚ะต ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žreset.quietโ€œ ะดะฐ ะต โ€žtrueโ€œ (ะธัั‚ะธะฝะฐ).\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "ะ˜ะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฝัƒะปะตะฝ ะบัŠะผ ะฒะตั€ัะธั โ€ž%sโ€œ."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr "ะะพะฒะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะธัะฐะฝ."
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "ะพะฟั†ะธะธั‚ะต โ€ž--exclude-promisor-objectsโ€œ ะธ โ€ž--missingโ€œ ะธ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "ั„ะธะปั‚ั€ะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะพะฑะตะบั‚ะธ ะธะทะธัะบะฒะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--objectsโ€œ"
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "ะฝะตะฟั€ะฐะฒะธะปะฝะฐ ั‡ะฐัั‚ะธั‡ะฝะฐ ัั‚ะพะนะฝะพัั‚: %s"
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žrev-listโ€œ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะธะทะฒะตะถะดะฐะฝะตั‚ะพ ะฝะฐ ะฑะตะปะตะถะบะธ"
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--use-bitmap-indexโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ั„ะธะปั‚ั€ะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "ะพะฟั†ะธัั‚ะฐ โ€ž--objectsโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั ะธะทะฑั€ะพัะฒะฐะฝะตั‚ะพ"
 
 #: builtin/rev-parse.c:408
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -19597,40 +20678,44 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "ัะปะตะดะฝะธัั‚ ั„ะฐะนะป ะต ั ะฟั€ะพะผะตะฝะตะฝะพ ััŠะดัŠั€ะถะฐะฝะธะต"
 msgstr[1] "ัะปะตะดะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ัะฐ ั ะฟั€ะพะผะตะฝะตะฝะพ ััŠะดัŠั€ะถะฐะฝะธะต"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "ะดะฐ ะฝะต ัะต ะธะทะฒะตะถะดะฐั‚ ะธะทั‚ั€ะธั‚ะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ัะฐะผะพ ะพั‚ ะธะฝะดะตะบัะฐ"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "ะฒัŠะฟั€ะตะบะธ ะฟั€ะพะฒะตั€ะบะฐั‚ะฐ ะทะฐ ะฐะบั‚ัƒะฐะปะฝะพัั‚ั‚ะฐ ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "ั€ะตะบัƒั€ัะธะฒะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 "ะธะทั…ะพะดะฝะธัั‚ ะบะพะด ะดะฐ ะต 0, ะดะพั€ะธ ะฐะบะพ ะฝะธะบะพะน ั„ะฐะนะป ะฝe e ะฝะฐะฟะฐัะฝะฐะป ั ัˆะฐะฑะปะพะฝะฐ ะทะฐ "
 "ะธะทั‚ั€ะธะฒะฐะฝะต"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "ะะต ัะฐ ะทะฐะดะฐะดะตะฝะธ ะฟัŠั‚ะธั‰ะฐ.  ะšะพะธ ั„ะฐะนะปะพะฒะต ะดะฐ ัะต ะธะทั‚ั€ะธัั‚?"
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "ะทะฐ ะดะฐ ะฟั€ะพะดัŠะปะถะธั‚ะต, ะธะปะธ ะฒะบะฐั€ะฐะนั‚ะต ะฟั€ะพะผะตะฝะธั‚ะต ะฟะพ ั„ะฐะนะปะฐ โ€ž.gitmodulesโ€œ ะฒ ะธะฝะดะตะบัะฐ,\n"
 "ะธะปะธ ะณะธ ัะบะฐั‚ะฐะนั‚ะต"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "ะฑะตะท ะธะทะฟะพะปะทะฒะฐะฝะตั‚ะพ ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž-rโ€œ โ€ž%sโ€œ ะฝัะผะฐ ะดะฐ ัะต ะธะทั‚ั€ะธะต ั€ะตะบัƒั€ัะธะฒะฝะพ"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทั‚ั€ะธะต"
@@ -19886,15 +20971,83 @@ msgstr ""
 "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะปะธั‚ะต ะฟั€ะธะตั‚ะธ ะพั‚ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด, ะบะพะธั‚ะพ ะปะธะฟัะฒะฐั‚ ะฒ "
 "ะปะพะบะฐะปะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) ะžะŸะฆะ˜ะฏโ€ฆ"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"ั‚ะพะฒะฐ ะฝะต ะต ั‡ะฐัั‚ะธั‡ะฝะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ (ะฒะตั€ะพัั‚ะฝะพ ะปะธะฟัะฒะฐ ั„ะฐะนะป โ€žsparse-checkoutโ€œ)"
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะทะฐ ั‡ะฐัั‚ะธั‡ะฝะพ ะธะทั‚ะตะณะปัะฝะต โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝะฐ"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žextensions.worktreeConfigโ€œ"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "ะธะฝะธั†ะธะฐะปะธะทะธั€ะฐะฝะต ะฝะฐ ั‡ะฐัั‚ะธั‡ะฝะพั‚ะพ ะธะทั‚ะตะณะปัะฝะต ะฒ ะฟัŠั‚ะตะฒะพะดะตะฝ ั€ะตะถะธะผ"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "ะธะฝะธั†ะธะฐะปะธะทะธั€ะฐะฝะต ะฝะฐ ั‡ะฐัั‚ะธั‡ะฝะพั‚ะพ ะธะทั‚ะตะณะปัะฝะต"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะฒะพั€ะธ"
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "ะฟัŠั‚ัั‚ โ€ž%sโ€œ  ะฝะต ะผะพะถะต ะดะฐ ัะต ะฝะพั€ะผะฐะปะธะทะธั€ะฐ"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | ะจะะ‘ะ›ะžะโ€ฆ)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "ั†ะธั‚ะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฝะธะท, ั„ะพั€ะผะฐั‚ะธั€ะฐะฝ ะทะฐ C โ€” โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‡ะธัั‚ะตะฝะพ"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "ัˆะฐะฑะปะพะฝะธั‚ะต ะทะฐ ั‡ะฐัั‚ะธั‡ะฝะพ ะธะทั‚ะตะณะปัะฝะต ะฝะต ะผะพะณะฐั‚ ะดะฐ ัะต ะทะฐั€ะตะดัั‚"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ัˆะฐะฑะปะพะฝะธั‚ะต ะพั‚ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ัˆะฐะฑะปะพะฝะธั‚ะต ะทะฐ ั‡ะฐัั‚ะธั‡ะฝะพั‚ะพ ะธะทั‚ะตะณะปัะฝะต"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "ะฑะตะท ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ั‡ะฐัั‚ะธั‡ะฝะพ ะธะทั‚ะตะณะปัะฝะต"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ั€ะฐะฑะพั‚ะฝะฐั‚ะฐ ะดะธั€ะตะบั‚ะพั€ะธั"
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [ะžะŸะฆะ˜ะฏโ€ฆ]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [ะžะŸะฆะ˜ะฏโ€ฆ] [ะกะšะะขะะะž]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [ะกะšะะขะะะž]"
 
@@ -19902,25 +21055,27 @@ msgstr "git stash drop [-q|--quiet] [ะกะšะะขะะะž]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [ะกะšะะขะะะž]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch ะšะ›ะžะ [ะกะšะะขะะะž]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message ะกะชะžะ‘ะฉะ•ะะ˜ะ•]\n"
+"          [--pathspec-from-file=ะคะะ™ะ› [--pathspec-file-nul]]\n"
 "          [--] [ะŸะชะขโ€ฆ]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19928,188 +21083,198 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [ะกะชะžะ‘ะฉะ•ะะ˜ะ•]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [ะกะšะะขะะะž]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [ะกะšะะขะะะž]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message ะกะชะžะ‘ะฉะ•ะะ˜ะ•] [-q|--quiet] ะŸะžะ”ะะ’ะะะ•"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message ะกะชะžะ‘ะฉะ•ะะ˜ะ•]\n"
+"          [--] [ะŸะชะขโ€ฆ]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต, ะฟั€ะธะปะธั‡ะฐั‰ะพ ะฝะฐ ะฝะตั‰ะพ ัะบะฐั‚ะฐะฝะพ"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "ะฃะบะฐะทะฐะฝะธ ัะฐ ะฟั€ะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฒะตั€ัะธะธ:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr "ะะต ะต ะพั‚ะบั€ะธั‚ะพ ะฝะธั‰ะพ ัะบะฐั‚ะฐะฝะพ."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "โ€ž%sโ€œ ะต ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะธะผะต ะทะฐ ัƒะบะฐะทะฐั‚ะตะป"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit stash clearโ€œ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "ะฟะพ ะฒั€ะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะธะปะพะถะธั‚ะต ะฝะตั‰ะพ ัะบะฐั‚ะฐะฝะพ"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "ั„ะฐะนะปัŠั‚ ั ั€ะฐะทะปะธะบะธั‚ะต โ€ž%s^!โ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะณะตะฝะตั€ะธั€ะฐ"
 
-#: builtin/stash.c:421
+#: builtin/stash.c:422
 msgid "conflicts in index.Try without --index."
 msgstr ""
 "ะฒ ะธะฝะดะตะบัะฐ ะธะผะฐ ะบะพะฝั„ะปะธะบั‚ะธ.  ะŸั€ะพะฑะฒะฐะนั‚ะต ะดะฐ ะธะทะฟัŠะปะฝะธั‚ะต ะบะพะผะฐะฝะดะฐั‚ะฐ ะฑะตะท ะพะฟั†ะธัั‚ะฐ โ€ž--"
 "indexโ€œ."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "ะดัŠั€ะฒะพั‚ะพ ัะพั‡ะตะฝะพ ะพั‚ ะธะฝะดะตะบัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝะพ"
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฝะต ะผะพะณะฐั‚ ะดะฐ ัะต ะฒัŠะทัั‚ะฐะฝะพะฒัั‚ ะพั‚ ัะบะฐั‚ะฐะฝะพั‚ะพ"
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "ะกะปะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ ั โ€ž%sโ€œ"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
 msgstr "ะ˜ะฝะดะตะบััŠั‚ ะฝะต ะต ะธะทะฒะฐะดะตะฝ ะพั‚ ัะบะฐั‚ะฐะฝะพั‚ะพ."
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
 msgid "attempt to recreate the index"
 msgstr "ะพะฟะธั‚ ะทะฐ ะฟะพะฒั‚ะพั€ะฝะพ ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:555
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "ะ˜ะทั‚ั€ะธั‚ะพ: โ€ž%sโ€œ (%s)"
 
-#: builtin/stash.c:552
+#: builtin/stash.c:558
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "ะกะบะฐั‚ะฐะฝะพั‚ะพ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚ะพ"
 
-#: builtin/stash.c:577
+#: builtin/stash.c:583
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ัƒะบะฐะทะฐั‚ะตะป ะบัŠะผ ะฝะตั‰ะพ ัะบะฐั‚ะฐะฝะพ"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr "ะกะบะฐั‚ะฐะฝะพั‚ะพ ะต ะทะฐะฟะฐะทะตะฝะพ ะฒ ัะปัƒั‡ะฐะน, ั‡ะต ะฒะธ ะฟะพั‚ั€ัะฑะฒะฐ ะพั‚ะฝะพะฒะพ."
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr "ะะต ะต ัƒะบะฐะทะฐะฝะพ ะธะผะต ะฝะฐ ะบะปะพะฝ"
 
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ ะดะฐ ัะพั‡ะธ ะบัŠะผ โ€ž%sโ€œ"
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
 msgid "stash message"
 msgstr "ััŠะพะฑั‰ะตะฝะธะต ะฟั€ะธ ัะบะฐั‚ะฐะฒะฐะฝะต"
 
-#: builtin/stash.c:818
+#: builtin/stash.c:824
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit stash storeโ€œ ะธะทะธัะบะฒะฐ ั‚ะพั‡ะฝะพ ะตะดะธะฝ ะฐั€ะณัƒะผะตะฝั‚-ะŸะžะ”ะะ’ะะะ•"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr "ะะต ัะฐ ะธะทะฑั€ะฐะฝะธ ะฝะธะบะฐะบะฒะธ ะฟั€ะพะผะตะฝะธ"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr "ะ’ัะต ะพั‰ะต ะปะธะฟัะฒะฐ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr "ะกัŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ั‚ะตะบัƒั‰ะธั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝะพ"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr "ะะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฝะต ะผะพะณะฐั‚ ะดะฐ ัะต ะทะฐะฟะฐะทัั‚"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr "ะกัŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝะพ"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr "ะกัŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝะพ"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "ะžะฟั†ะธัั‚ะฐ โ€ž--patchโ€œ ะต ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ั โ€ž--include-untrackedโ€œ ะธ โ€ž--allโ€œ"
 
-#: builtin/stash.c:1285
+#: builtin/stash.c:1298
 msgid "Did you forget to 'git add'?"
 msgstr "ะŸั€ะพะฑะฒะฐะนั‚ะต ะดะฐ ะธะทะฟะพะปะทะฒะฐั‚ะต โ€žgit addโ€œ"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr "ะัะผะฐ ะฝะธะบะฐะบะฒะธ ะปะพะบะฐะปะฝะธ ะฟั€ะพะผะตะฝะธ ะทะฐ ัะบะฐั‚ะฐะฒะฐะฝะต"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr "ะกะบะฐั‚ะฐะฒะฐะฝะตั‚ะพ ะฝะต ะผะพะถะต ะดะฐ ัั‚ะฐั€ั‚ะธั€ะฐ"
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr "ะขะตะบัƒั‰ะพั‚ะพ ััŠัั‚ะพัะฝะธะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝะพ"
 
-#: builtin/stash.c:1327
+#: builtin/stash.c:1340
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "ะกัŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ั€ะฐะฑะพั‚ะฝะฐั‚ะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะธ ะธะฝะดะตะบัะฐ e ะทะฐะฟะฐะทะตะฝะพ: โ€ž%sโ€œ"
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr "ะŸั€ะพะผะตะฝะธั‚ะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะทะฐะฝัƒะปะตะฝะธ"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "keep index"
 msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash in patch mode"
 msgstr "ัะบะฐั‚ะฐะฒะฐะฝะต ะฒ ั€ะตะถะธะผ ะทะฐ ะบั€ัŠะฟะบะธ"
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1472 builtin/stash.c:1537
 msgid "quiet mode"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1474 builtin/stash.c:1539
 msgid "include untracked files in stash"
 msgstr "ัะบะฐั‚ะฐะฒะฐะฝะต ะธ ะฝะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1476 builtin/stash.c:1541
 msgid "include ignore files"
 msgstr "ัะบะฐั‚ะฐะฒะฐะฝะต ะธ ะฝะฐ ะธะณะฝะพั€ะธั€ะฐะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1600
 #, c-format
 msgid "could not exec %s"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ"
@@ -20130,41 +21295,41 @@ msgstr "ะฟั€ะพะฟัƒัะบะฐะฝะต ะฝะฐ ะฒัะธั‡ะบะธ ั€ะตะดะพะฒะต, ะบะพะธั‚ะพ ะทะฐะฟะพ
 msgid "prepend comment character and space to each line"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ โ€ž# โ€œ ะฒ ะฝะฐั‡ะฐะปะพั‚ะพ ะฝะฐ ะฒัะตะบะธ ั€ะตะด"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "ะžั‡ะฐะบะฒะฐ ัะต ะฟัŠะปะฝะพ ะธะผะต ะฝะฐ ัƒะบะฐะทะฐั‚ะตะป, ะฐ ะฝะต โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žprint-default-remoteโ€œ ะฝะฐ โ€žsubmodule--helperโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะฐั€ะณัƒะผะตะฝั‚ะธ"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะผะฐั…ะฝะต ะบะพะผะฟะพะฝะตะฝั‚ ะพั‚ ะฐะดั€ะตัะฐ โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธั ะทะฐ ะพะฟั€ะตะดะตะปัะฝะตั‚ะพ ะฝะฐ ะพั‚ะฝะพัะธั‚ะตะปะฝะธั‚ะต ะฟัŠั‚ะธั‰ะฐ"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=ะŸะชะข] [ะŸะชะขโ€ฆ]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "ะ’ัŠะฒ ั„ะฐะนะปะฐ โ€ž.gitmodulesโ€œ ะฝะต ะต ะพั‚ะบั€ะธั‚ ะฐะดั€ะตั ะทะฐ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "ะ’ะปะธะทะฐะฝะต ะฒ โ€ž%sโ€œ\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -20173,7 +21338,7 @@ msgstr ""
 "ะธะทะฟัŠะปะฝะตะฝะฐั‚ะฐ ะบะพะผะฐะฝะดะฐ ะทะฐะฒัŠั€ัˆะธ ั ะฝะตะฝัƒะปะตะฒ ะธะทั…ะพะด ะทะฐ โ€ž%sโ€œ\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -20184,19 +21349,19 @@ msgstr ""
 "ะฒะปะพะถะตะฝะธ ะฒ โ€ž%sโ€œ\n"
 "."
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr "ะ‘ะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะทั…ะพะด ะฟั€ะธ ะฒัŠะฒะตะถะดะฐะฝะตั‚ะพ ะฝะฐ ะฒััะบะฐ ะบะพะผะฐะฝะดะฐ ะทะฐ ะฟะพะดะผะพะดัƒะปะธ"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr "ะ ะตะบัƒั€ัะธะฒะฝะพ ะพะฑั…ะพะถะดะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะธั‚ะต"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] ะšะžะœะะะ”ะ"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -20205,55 +21370,55 @@ msgstr ""
 "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€ž%sโ€œ ะปะธะฟัะฒะฐ.  ะŸั€ะธะตะผะฐ ัะต, ั‡ะต ั‚ะพะฒะฐ ั…ั€ะฐะฝะธะปะธั‰ะต ะต ะฟั€ะฐะฒะธะปะฝะธัั‚ ะธะทั‚ะพั‡ะฝะธะบ "
 "ะทะฐ ัะตะฑะต ัะธ."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ั€ะตะณะธัั‚ั€ะธั€ะฐะฝะต ะฝะฐ ะฐะดั€ะตั ะทะฐ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "ะ ะตะณะธัั‚ั€ะธั€ะฐะฝ ะต ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ (%s) ะทะฐ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "ะŸะ ะ•ะ”ะฃะŸะ ะ•ะ–ะ”ะ•ะะ˜ะ•: ะฟั€ะตะฟะพั€ัŠั‡ะฒะฐ ัะต ั€ะตะถะธะผ ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต ะทะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "ะะตัƒัะฟะตัˆะฝะพ ั€ะตะณะธัั‚ั€ะธั€ะฐะฝะต ะฝะฐ ั€ะตะถะธะผะฐ ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต ะทะฐ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "ะ‘ะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะฟั€ะธ ะธะฝะธั†ะธะฐะปะธะทะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฟะพะดะผะพะดัƒะป"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [ะžะŸะฆะ˜ะฏโ€ฆ] [ะŸะชะข]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "ะ’ัŠะฒ ั„ะฐะนะปะฐ โ€ž.gitmodulesโ€œ ะปะธะฟัะฒะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะฟัŠั‚ั โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "ัƒะบะฐะทะฐั‚ะตะปัั‚ ัะพั‡ะตะฝ ะพั‚ โ€žHEADโ€œ ะฒ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะบั€ะธั‚"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั€ะตะบัƒั€ัะธะฒะฝะพ ะพะฑั…ะพะถะดะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr "ะ—ะฐะณะปัƒัˆะฐะฒะฐะฝะต ะฝะฐ ะธะทั…ะพะดะฐ ะทะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -20261,47 +21426,47 @@ msgstr ""
 "ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ ัƒะบะฐะทะฐะฝะพ ะฒ ะธะฝะดะตะบัะฐ, ะฐ ะฝะต ั‚ะพะฒะฐ ะพั‚ ัƒะบะฐะทะฐั‚ะตะปั โ€žHEADโ€œ ะฝะฐ "
 "ะฟะพะดะผะพะดัƒะปะฐ"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr "ั€ะตะบัƒั€ัะธะฒะฝะพ ะพะฑั…ะพะถะดะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะธั‚ะต"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [ะŸะชะขโ€ฆ]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name ะŸะชะข"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "ะกะธะฝั…ั€ะพะฝะธะทะธั€ะฐะฝะต ะฝะฐ ะฐะดั€ะตัะฐ ะฝะฐ ะฟะพะดะผะพะดัƒะป ะทะฐ โ€ž%sโ€œ\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ั€ะตะณะธัั‚ั€ะธั€ะฐะฝะต ะฝะฐ ะฐะดั€ะตั ะทะฐ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "ะพั‚ะดะฐะปะตั‡ะตะฝะธัั‚ ะฐะดั€ะตั ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝ"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "ะพั‚ะดะฐะปะตั‡ะตะฝะธัั‚ ะฐะดั€ะตั ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพะผะตะฝะตะฝ"
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr "ะ‘ะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะฟั€ะธ ัะธะฝั…ั€ะพะฝะธะทะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฟะพะดะผะพะดัƒะป"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [ะŸะชะข]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20310,7 +21475,7 @@ msgstr ""
 "ะ ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะฐ ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ ััŠะดัŠั€ะถะฐ ะดะธั€ะตะบั‚ะพั€ะธั โ€ž.gitโ€œ.\n"
 "(ะฐะบะพ ะธัะบะฐั‚ะต ะดะฐ ะณะธ ะธะทั‚ั€ะธะตั‚ะต ะทะฐะตะดะฝะพ ั ั†ัะปะฐั‚ะฐ ะธะผ ะธัั‚ะพั€ะธั, ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žrm -rfโ€œ)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20319,180 +21484,209 @@ msgstr ""
 "ะ ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะฐ ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ ััŠะดัŠั€ะถะฐ ะปะพะบะฐะปะฝะธ ะฟั€ะพะผะตะฝะธ.  ะœะพะถะตั‚ะต ะดะฐ ะณะธ "
 "ะพั‚ั…ะฒัŠั€ะปะธั‚ะต ั ะพะฟั†ะธัั‚ะฐ โ€ž-fโ€œ"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะต ะธะทั‡ะธัั‚ะตะฝะฐ\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 "ะ”ะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚ะฐ\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "ะฟั€ะฐะทะฝะฐั‚ะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะทะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝะฐ"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "ะ ะตะณะธัั‚ั€ะฐั†ะธัั‚ะฐ ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ (%s) ะทะฐ ะฟัŠั‚ั โ€ž%sโ€œ ะต ะฟั€ะตะผะฐั…ะฝะฐั‚ะฐ\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ั€ะฐะฑะพั‚ะฝะธั‚ะต ะดัŠั€ะฒะตั‚ะฐ ะฝะฐ ะฟะพะดะผะพะดัƒะปะธั‚ะต, ะดะพั€ะธ ะบะพะณะฐั‚ะพ ั‚ะต ััŠะดัŠั€ะถะฐั‚ "
 "ะปะพะบะฐะปะฝะธ ะฟั€ะพะผะตะฝะธ"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr "ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั€ะตะณะธัั‚ั€ะฐั†ะธะธั‚ะต ะฝะฐ ะฒัะธั‡ะบะธ ะฟะพะดะผะพะดัƒะปะธ"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ะŸะชะขโ€ฆ]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "ะ˜ะทะฟะพะปะทะฒะฐะนั‚ะต โ€ž--allโ€œ, ะทะฐ ะดะฐ ะฟั€ะตะผะฐั…ะฝะตั‚ะต ะฒัะธั‡ะบะธ ะฟะพะดะผะพะดัƒะปะธ"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"ะะปั‚ะตั€ะฝะฐั‚ะธะฒะฝะธัั‚ ะธะทั‚ะพั‡ะฝะธะบ, ะพะฟั€ะตะดะตะปะตะฝ ะพั‚ ะพะฑั…ะฒะฐั‰ะฐั‰ะธั ะฟั€ะพะตะบั‚ ะต ะฝะตะฟั€ะฐะฒะธะปะตะฝ.\n"
+"ะ—ะฐ ะดะฐ ะฟะพะทะฒะพะปะธั‚ะต ะฝะฐ git ะดะฐ ะบะปะพะฝะธั€ะฐ ะฑะตะท ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะตะฝ ะธะทั‚ะพั‡ะฝะธะบ ะฒ ั‚ะพะทะธ ัะปัƒั‡ะฐะน,\n"
+"ะทะฐะดะฐะนั‚ะต ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žsubmodule.alternateErrorStrategyโ€œ ะดะฐ ะต โ€žinfoโ€œ ะธะปะธ\n"
+"ะฟั€ะธ ะบะปะพะฝะธั€ะฐะฝะต ะฟะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ โ€ž--reference-if-ableโ€œ ะฒะผะตัั‚ะพ โ€ž--referenceโ€œ."
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "ะบัŠะผ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะฐะปั‚ะตั€ะฝะฐั‚ะธะฒะตะฝ ะธะทั‚ะพั‡ะฝะธะบ: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "ะะตะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ ะทะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žsubmodule.alternateErrorStrategyโ€œ"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "ะะตะฟะพะทะฝะฐั‚ะฐ ัั‚ะพะนะฝะพัั‚ โ€ž%sโ€œ ะทะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žsubmodule.alternateLocationโ€œ"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
 msgstr "ะบัŠะดะต ะดะฐ ัะต ะบะปะพะฝะธั€ะฐ ะฝะพะฒะธัั‚ ะฟะพะดะผะพะดัƒะป"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr "ะธะผะต ะฝะฐ ะฝะพะฒะธั ะฟะพะดะผะพะดัƒะป"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr "ะฐะดั€ะตั, ะพั‚ ะบะพะนั‚ะพ ะดะฐ ัะต ะบะปะพะฝะธั€ะฐ ะฝะพะฒะธัั‚ ะฟะพะดะผะพะดัƒะป"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr "ะดัŠะปะฑะพั‡ะธะฝะฐ ะฝะฐ ะฟะปะธั‚ะบะธั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะฐ"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ ะฝะฐ ะบะปะพะฝะธั€ะฐะฝะตั‚ะพ"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "ะฟั€ะตะดะพั‚ะฒั€ะฐั‚ัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะธั€ะฐะฝะต ะฒ ะฝะตะฟั€ะฐะทะฝะฐ ะธัั‚ะพั€ะธั"
+
+#: builtin/submodule--helper.c:1424
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=ะŸะชะข] [--quiet] [--reference ะฅะ ะะะ˜ะ›ะ˜ะฉะ•] "
-"[--name ะ˜ะœะ•] [--depth ะ”ะชะ›ะ‘ะžะงะ˜ะะ] --url ะะ”ะ ะ•ะก --path ะŸะชะขโ€ฆ"
+"[--name ะ˜ะœะ•] [--depth ะ”ะชะ›ะ‘ะžะงะ˜ะะ] [--single-branch] --url ะะ”ะ ะ•ะก --path ะŸะชะข"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+"โ€ž%sโ€œ ะฝะต ะผะพะถะต ะฝะธั‚ะพ ะดะฐ ัะต ััŠะทะดะฐะดะต, ะฝะธั‚ะพ ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะฒ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะฐ git ะฝะฐ "
+"ะดั€ัƒะณ ะฟะพะดะผะพะดัƒะป"
+
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ะบะปะพะฝะธั€ะฐะฝะต ะฝะฐ ะฐะดั€ะตัะฐ โ€ž%sโ€œ ะฒ ะฟัŠั‚ั โ€ž%sโ€œ ะบะฐั‚ะพ ะฟะพะดะผะพะดัƒะป"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะต ะต ะฟั€ะฐะทะฝะฐ: โ€ž%sโ€œ"
+
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟะพะปัƒั‡ะตะฝะฐ"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ั€ะตะถะธะผ ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต โ€ž%sโ€œ ะทะฐ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1516
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "ะะฐัั‚ั€ะพะตะฝ ะต ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั€ะตะถะธะผ ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต โ€ž%sโ€œ ะทะฐ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "ะŸัŠั‚ัั‚ ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะฝะต ะต ะธะฝะธั†ะธะฐะปะธะทะธั€ะฐะฝ"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
 msgstr "ะ’ะตั€ะพัั‚ะฝะพ ะธัะบะฐั…ั‚ะต ะดะฐ ะธะทะฟะพะปะทะฒะฐั‚ะต โ€župdate --initโ€œ?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "ะŸั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะฝะตัะปะตั‚ะธั ะฟะพะดะผะพะดัƒะป โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "ะŸั€ะตัะบะฐั‡ะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "ะะตัƒัะฟะตัˆะตะฝ ะพะฟะธั‚ ะทะฐ ะบะปะพะฝะธั€ะฐะฝะต ะฝะฐ โ€ž%sโ€œ.  ะะฐัั€ะพั‡ะตะฝ ะต ะฒั‚ะพั€ะธ ะพะฟะธั‚"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 "ะ’ั‚ะพั€ะธ ะฝะตัƒัะฟะตัˆะตะฝ ะพะฟะธั‚ ะทะฐ ะบะปะพะฝะธั€ะฐะฝะต ะฝะฐ โ€ž%sโ€œ.  ะ”ะตะนัั‚ะฒะธะตั‚ะพ ัะต ะฟั€ะตัƒัั‚ะฐะฝะพะฒัะฒะฐ"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr "ะฟัŠั‚ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "ะฟัŠั‚ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ, ะฟั€ะตะท ะณั€ะฐะฝะธั†ะธั‚ะต ะฝะฐ ะฒะปะพะถะตะฝะธั‚ะต ะฟะพะดะผะพะดัƒะปะธ"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr ""
 "โ€žrebaseโ€œ (ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต), โ€žmergeโ€œ (ัะปะธะฒะฐะฝะต), โ€žcheckoutโ€œ (ะธะทั‚ะตะณะปัะฝะต) ะธะปะธ "
 "โ€žnoneโ€œ (ะฝะธั‰ะพ ะดะฐ ะฝะต ัะต ะฟั€ะฐะฒะธ)"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "ะŸะปะธั‚ะบะพ ะบะปะพะฝะธั€ะฐะฝะต, ะพั‚ั€ัะทะฐะฝะพ ะดะพ ัƒะบะฐะทะฐะฝะธั ะฑั€ะพะน ะฒะตั€ัะธะธ"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr "ะฑั€ะพะน ะฟะฐั€ะฐะปะตะปะฝะธ ะฟั€ะพั†ะตัะธ"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "ะดะฐะปะธ ะฟัŠั€ะฒะพะฝะฐั‡ะฐะปะฝะพั‚ะพ ะบะปะพะฝะธั€ะฐะฝะต ะดะฐ ะต ะฟะปะธั‚ะบะพ, ะบะฐะบั‚ะพ ัะต ะฟั€ะตะฟะพั€ัŠั‡ะฒะฐ"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟั€ะตะดัŠะบะฐ ะฝะฐ ะบะปะพะฝะธั€ะฐะฝะตั‚ะพ"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=ะŸะชะข] [ะŸะชะขโ€ฆ]"
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=ะŸะชะข] [ะŸะชะขโ€ฆ]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฟะฐั€ะฐะผะตั‚ัŠั€ ะบัŠะผ ะพะฟั†ะธัั‚ะฐ โ€ž--updateโ€œ"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20501,50 +21695,50 @@ msgstr ""
 "ะšะปะพะฝัŠั‚ ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ ะต ะฝะฐัั‚ั€ะพะตะฝ ะดะฐ ะฝะฐัะปะตะดัะฒะฐ ะบะปะพะฝะฐ ะพั‚ ะพะฑั…ะฒะฐั‰ะฐั‰ะธั ะฟั€ะพะตะบั‚, "
 "ะฝะพ ั‚ะพะน ะฝะต ะต ะฝะฐ ะฝะธะบะพะน ะบะปะพะฝ"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2117
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปัƒั‡ะธ ะฒั€ัŠะทะบะฐ ะบัŠะผ ั…ั€ะฐะฝะธะปะธั‰ะต ะทะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž%sโ€œ"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr "ั€ะตะบัƒั€ัะธะฒะฝะพ ะพะฑั…ะพะถะดะฐะฝะต ะฟะพะดะผะพะดัƒะปะธั‚ะต"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2156
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [ะžะŸะฆะ˜ะฏโ€ฆ] [ะŸะชะขโ€ฆ]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2212
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ ะดะฐะปะธ ะฟะธัะฐะฝะตั‚ะพ ะฒัŠะฒ ั„ะฐะนะปะฐ โ€ž.gitmodulesโ€œ ะต ะฑะตะทะพะฟะฐัะฝะพ"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2215
 msgid "unset the config in the .gitmodules file"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐ ะฒัŠะฒ ั„ะฐะนะปะฐ โ€ž.gitmodulesโ€œ"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2220
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config ะ˜ะœะ• [ะกะขะžะ™ะะžะกะข]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2221
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset ะ˜ะœะ•"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2222
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž.gitmodulesโ€œ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "โ€ž%sโ€œ ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--super-prefixโ€œ"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2297
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ะฟะพะดะบะพะผะฐะฝะดะฐ ะฝะฐ โ€žsubmodule--helperโ€œ"
@@ -20798,222 +21992,226 @@ msgstr "ะตั‚ะธะบะตั‚ัŠั‚ โ€ž%sโ€œ ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ"
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "ะžะฑะฝะพะฒะตะฝ ะตั‚ะธะบะตั‚ โ€ž%sโ€œ (ะฑะต โ€ž%sโ€œ)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "ะ ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝะฐ"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝ"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "ั„ะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚ะฐ"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฒั€ะตะผะตั‚ะพ ะฝะฐ ะฟั€ะพะผัะฝะฐ (mtime) ะฝะฐ ั„ะฐะนะปะฐ โ€ž%sโ€œ"
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะฟะพะปัƒั‡ะตะฝะฐ ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะต ัะต ะฟั€ะพะผะตะฝั ัะปะตะด "
 "ะดะพะฑะฐะฒัะฝะตั‚ะพ ะฝะฐ ะฝะพะฒ ั„ะฐะนะป"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะฟะพะปัƒั‡ะตะฝะฐ ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะต ัะต ะฟั€ะพะผะตะฝั ัะปะตะด "
 "ะดะพะฑะฐะฒัะฝะตั‚ะพ ะฝะฐ ะฝะพะฒะฐ ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะฟะพะปัƒั‡ะตะฝะฐ ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ัะต ะฟั€ะพะผะตะฝั ัะปะตะด "
 "ะพะฑะฝะพะฒัะฒะฐะฝะตั‚ะพ ะฝะฐ ะฝะพะฒ ั„ะฐะนะป"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะฟะพะปัƒั‡ะตะฝะฐ ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ัะต ะฟั€ะพะผะตะฝั ัะปะตะด ะดะพะฑะฐะฒัะฝะตั‚ะพ "
 "ะฝะฐ ั„ะฐะนะป ะฒ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะฟะพะปัƒั‡ะตะฝะฐ ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะต ัะต ะฟั€ะพะผะตะฝั ัะปะตะด "
 "ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะฝะฐ ั„ะฐะนะป"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะฟะพะปัƒั‡ะตะฝะฐ ั‡ั€ะตะท โ€žstatโ€œ ะทะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะฝะต ัะต ะฟั€ะพะผะตะฝั ัะปะตะด "
 "ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " ะ”ะพะฑั€ะต"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [ะžะŸะฆะ˜ะฏโ€ฆ] [--] [ะคะะ™ะ›โ€ฆ]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "ะฟั€ะพะดัŠะปะถะฐะฒะฐะฝะต ั ะพะฑะฝะพะฒัะฒะฐะฝะตั‚ะพ, ะดะพั€ะธ ะบะพะณะฐั‚ะพ ะธะฝะดะตะบััŠั‚ ั‚ั€ัะฑะฒะฐ ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "ะฟะพะดะผะพะดัƒะปะธั‚ะต ะดะฐ ัะต ะธะณะฝะพั€ะธั€ะฐั‚ ะฟั€ะธ ะพะฑะฝะพะฒัะฒะฐะฝะตั‚ะพ"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "ะฝะพะฒะธั‚ะต ั„ะฐะนะปะพะฒะต ะดะฐ ะฝะต ัะต ะธะณะฝะพั€ะธั€ะฐั‚"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "ั„ะฐะนะปะพะฒะต ะดะฐ ะผะพะณะฐั‚ ะดะฐ ะทะฐะผะตะฝัั‚ ะดะธั€ะตะบั‚ะพั€ะธะธ ะธ ะพะฑั€ะฐั‚ะฝะพ"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "ะฟั€ะตะดัƒะฟั€ะตะถะดะฐะฒะฐะฝะต ะฟั€ะธ ะปะธะฟัะฒะฐั‰ะธ ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะต ะดะพั€ะธ ะธ ะธะฝะดะตะบััŠั‚ ะดะฐ ััŠะดัŠั€ะถะฐ ะฝะตัะปะตั‚ะธ ะพะฑะตะบั‚ะธ"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะพั‚ ั„ัƒะฝะบั†ะธัั‚ะฐ โ€žstatโ€œ"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 "ะบะฐั‚ะพ ะพะฟั†ะธัั‚ะฐ โ€ž--refreshโ€œ, ะฝะพ ะดะฐ ัะต ะฟั€ะพะฒะตั€ัั‚ ะธ ะพะฑะตะบั‚ะธั‚ะต, ะบะพะธั‚ะพ ัะฐ ะฑะธะปะธ ะฟั€ะธะตั‚ะธ "
 "ะทะฐ ะฝะตะฟั€ะพะผะตะฝะตะฝะธ"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "ะ ะ•ะ–ะ˜ะœ,ะžะ‘ะ•ะšะข,ะŸะชะข"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะธะทะฑั€ะพะตะฝะธั‚ะต ะพะฑะตะบั‚ะธ ะบัŠะผ ะธะฝะดะตะบัะฐ"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ั„ะปะฐะณ, ั‡ะต ั„ะฐะนะปัŠั‚ ะฝะต ัะต ะฟั€ะพะผะตะฝั"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ั„ะปะฐะณะฐ, ั‡ะต ั„ะฐะนะปัŠั‚ ะฝะต ัะต ะฟั€ะพะผะตะฝั"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ั„ะปะฐะณ, ั‡ะต ั„ะฐะนะปะพะฒะตั‚ะต ัะฐ ัะฐะผะพ ะทะฐ ะธะฝะดะตะบัะฐ"
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
-msgstr "ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ั„ะปะฐะณะฐ,  ั‡ะต ั„ะฐะนะปะพะฒะตั‚ะต ัะฐ ัะฐะผะพ ะทะฐ ะธะฝะดะตะบัะฐ"
+msgstr "ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ั„ะปะฐะณะฐ, ั‡ะต ั„ะฐะนะปะพะฒะตั‚ะต ัะฐ ัะฐะผะพ ะทะฐ ะธะฝะดะตะบัะฐ"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "ะฑะตะท ะฟั€ะพะผัะฝะฐ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต ัะฐะผะพ ะทะฐ ะธะฝะดะตะบัะฐ"
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "ะดะพะฑะฐะฒัะฝะต ัะฐะผะพ ะบัŠะผ ะธะฝะดะตะบัะฐ ะฑะตะท ะดะพะฑะฐะฒัะฝะต ะบัŠะผ ะฑะฐะทะฐั‚ะฐ ะพั‚ ะดะฐะฝะฝะธ ะทะฐ ะพะฑะตะบั‚ะธั‚ะต"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ัƒะบะฐะทะฐะฝะธั‚ะต ะฟัŠั‚ะธั‰ะฐ, ะดะพั€ะธ ะธ ะดะฐ ััŠั‰ะตัั‚ะฒัƒะฒะฐั‚ ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 "ะฟั€ะธ ะบะพะผะฑะธะฝะธั€ะฐะฝะต ั ะพะฟั†ะธัั‚ะฐ โ€ž--stdinโ€œ โ€” ะฒั…ะพะดะฝะธั‚ะต ั€ะตะดะพะฒะต ัะฐ ั€ะฐะทะดะตะปะตะฝะธ ั ะฝัƒะปะตะฒะธั "
 "ะฑะฐะนั‚"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ัะฟะธััŠะบะฐ ั ะฟัŠั‚ะธั‰ะฐ ะทะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต ะพั‚ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะตะปะตะผะตะฝั‚ะธั‚ะต ะพั‚ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะฒั…ะพะด ะบัŠะผ ะธะฝะดะตะบัะฐ"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "ะฒัŠะทัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฟั€ะตะดะธ ัะปะธะฒะฐะฝะต ะธะปะธ ะฝัƒะถะดะฐ ะพั‚ ะพะฑะฝะพะฒัะฒะฐะฝะต ะทะฐ "
 "ะธะทะฑั€ะพะตะฝะธั‚ะต ะฟัŠั‚ะธั‰ะฐ"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "ะดะพะฑะฐะฒัะฝะต ัะฐะผะพ ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ, ะบะพะตั‚ะพ ัะต ั€ะฐะทะปะธั‡ะฐะฒะฐ ะพั‚ ั‚ะพะฒะฐ ะฒ โ€žHEADโ€œ"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ะธะณะฝะพั€ะธั€ะฐะฝะต ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะปะธะฟัะฒะฐั‚ ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะดะตะนัั‚ะฒะธัั‚ะฐ ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะธะทั…ะพะด"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 "ะทะฐะฑั€ะฐะฒัะฝะต ะฝะฐ ะทะฐะฟะธัะฐะฝะฐั‚ะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะฝะตั€ะฐะทั€ะตัˆะตะฝะธ ะบะพะฝั„ะปะธะบั‚ะธ โ€” ะทะฐ ะบะพะผะฐะฝะดะธั‚ะต "
 "ะพั‚ ะฟะพั‚ั€ะตะฑะธั‚ะตะปัะบะพ ะฝะธะฒะพ"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฒ ั‚ะพะทะธ ั„ะพั€ะผะฐั‚"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "ะฒะบะปัŽั‡ะฒะฐะฝะต ะธะปะธ ะธะทะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ั€ะฐะทะดะตะปัะฝะตั‚ะพ ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "ะฒะบะปัŽั‡ะฒะฐะฝะต/ะธะทะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะบะตัˆะฐ ะทะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "ะฟั€ะพะฒะตั€ะบะฐ ะดะฐะปะธ ั„ะฐะนะปะพะฒะฐั‚ะฐ ัะธัั‚ะตะผะฐ ะฟะพะดะดัŠั€ะถะฐ ะบะตัˆ ะทะฐ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "ะฒะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะบะตัˆะฐ ะทะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฑะตะท ะฟั€ะพะฒะตั€ะบะฐ ะฝะฐ ั„ะฐะนะปะพะฒะฐั‚ะฐ ัะธัั‚ะตะผะฐ"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "ะทะฐะฟะธั ะฝะฐ ะธะฝะดะตะบัะฐ, ะดะพั€ะธ ะดะฐ ะฝะต ะต ะพั‚ะฑะตะปัะทะฐะฝ ะบะฐั‚ะพ ะฟั€ะพะผะตะฝะตะฝ"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "ะฒะบะปัŽั‡ะฒะฐะฝะต ะธะปะธ ะธะทะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะฝะฐะฑะปัŽะดะตะฝะธะตั‚ะพ ะฝะฐ ั„ะฐะนะปะพะฒะฐั‚ะฐ ัะธัั‚ะตะผะฐ"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "ะพั‚ะฑะตะปัะทะฒะฐะฝะต ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต, ั‡ะต ะผะพะณะฐั‚ ะดะฐ ัะต ัะปะตะดัั‚ ั‡ั€ะตะท ั„ะฐะนะปะพะฒะฐั‚ะฐ ัะธัั‚ะตะผะฐ"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ั„ะปะฐะณะฐ ะทะฐ ัะปะตะดะตะฝะตั‚ะพ ั‡ั€ะตะท ั„ะฐะนะปะพะฒะฐั‚ะฐ ัะธัั‚ะตะผะฐ"
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -21021,7 +22219,7 @@ msgstr ""
 "ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žcore.splitIndexโ€œ ะต ะทะฐะดะฐะดะตะฝะฐ ะฝะฐ โ€žfalseโ€œ (ะปัŠะถะฐ).  ะกะผะตะฝะตั‚ะต ั ะธะปะธ ั "
 "ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ะฒะบะปัŽั‡ะธั‚ะต ั€ะฐะทะดะตะปัะฝะตั‚ะพ ะฝะฐ ะธะฝะดะตะบัะฐ"
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -21029,7 +22227,7 @@ msgstr ""
 "ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žcore.splitIndexโ€œ ะต ะทะฐะดะฐะดะตะฝะฐ ะฝะฐ โ€žtrueโ€œ (ะธัั‚ะธะฝะฐ).  ะกะผะตะฝะตั‚ะต ั ะธะปะธ "
 "ั ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ะธะทะบะปัŽั‡ะธั‚ะต ั€ะฐะทะดะตะปัะฝะตั‚ะพ ะฝะฐ ะธะฝะดะตะบัะฐ."
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -21037,11 +22235,11 @@ msgstr ""
 "ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žcore.untrackedCacheโ€œ ะต ะทะฐะดะฐะดะตะฝะฐ ะฝะฐ โ€žtrueโ€œ (ะธัั‚ะธะฝะฐ).  ะกะผะตะฝะตั‚ะต ั "
 "ะธะปะธ ั ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ะธะทะบะปัŽั‡ะธั‚ะต ะบะตัˆะฐ ะทะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "ะšะตัˆัŠั‚ ะทะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะต ะธะทะบะปัŽั‡ะตะฝ"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -21049,29 +22247,29 @@ msgstr ""
 "ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žcore.untrackedCacheโ€œ ะต ะทะฐะดะฐะดะตะฝะฐ ะฝะฐ โ€žfalseโ€œ (ะปัŠะถะฐ).  ะกะผะตะฝะตั‚ะต ั "
 "ะธะปะธ ั ะธะทั‚ั€ะธะนั‚ะต, ะทะฐ ะดะฐ ะฒะบะปัŽั‡ะธั‚ะต ะบะตัˆะฐ ะทะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "ะšะตัˆัŠั‚ ะทะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะต ะฒะบะปัŽั‡ะตะฝ ะทะฐ โ€ž%sโ€œ"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žcore.fsmonitorโ€œ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ.  ะ—ะฐะดะฐะนั‚ะต ั, ะทะฐ ะดะฐ ะฒะบะปัŽั‡ะธั‚ะต "
 "ัะปะตะดะตะฝะตั‚ะพ ั‡ั€ะตะท ั„ะฐะนะปะพะฒะฐั‚ะฐ ัะธัั‚ะตะผะฐ."
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "ัะปะตะดะตะฝะตั‚ะพ ั‡ั€ะตะท ั„ะฐะนะปะพะฒะฐั‚ะฐ ัะธัั‚ะตะผะฐ ะต ะฒะบะปัŽั‡ะตะฝะพ"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "ะะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žcore.fsmonitorโ€œ ะต ะทะฐะดะฐะดะตะฝะฐ.  ะ˜ะทั‚ั€ะธะนั‚ะต ั, ะทะฐ ะดะฐ ะธะทะบะปัŽั‡ะธั‚ะต "
 "ัะปะตะดะตะฝะตั‚ะพ ั‡ั€ะตะท ั„ะฐะนะปะพะฒะฐั‚ะฐ ัะธัั‚ะตะผะฐ."
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "ัะปะตะดะตะฝะตั‚ะพ ั‡ั€ะตะท ั„ะฐะนะปะพะฒะฐั‚ะฐ ัะธัั‚ะตะผะฐ ะต ะธะทะบะปัŽั‡ะตะฝะพ"
 
@@ -21166,56 +22364,56 @@ msgstr "git verify-tag [-v | --verbose] [--format=ะคะžะ ะœะะข] ะ•ะขะ˜ะšะ•ะขโ€ฆ"
 msgid "print tag contents"
 msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ะ•ะขะ˜ะšะ•ะขะธ"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [ะžะŸะฆะ˜ะฏโ€ฆ] ะŸะชะข [ะฃะšะะ—ะะขะ•ะ›_ะšะชะœ_ะŸะžะ”ะะ’ะะะ•]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [ะžะŸะฆะ˜ะฏโ€ฆ]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [ะžะŸะฆะ˜ะฏโ€ฆ] [ะŸะชะข]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move [ะ”ะชะ ะ’ะž] [ะะžะ’_ะŸะชะข]"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [ะžะŸะฆะ˜ะฏโ€ฆ]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [ะžะŸะฆะ˜ะฏโ€ฆ] [ะ”ะชะ ะ’ะž]"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock [ะŸะชะข]"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:891
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€ž%sโ€œ"
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€žworktrees/%sโ€œ: ะฝะต ะต ะฟั€ะฐะฒะธะปะฝะฐ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€žworktrees/%sโ€œ: ั„ะฐะนะปัŠั‚ โ€žgitdirโ€œ ะฝะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ"
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 "ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€žworktrees/%sโ€œ: ั„ะฐะนะปัŠั‚ โ€žgitdirโ€œ (%s) ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะพั‡ะตั‚ะตะฝ"
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -21224,37 +22422,37 @@ msgstr ""
 "ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€žworktrees/%sโ€œ: ะธะทั‡ะธั‚ะฐะฝะตั‚ะพ ะฒัŠั€ะฝะฐ ะฟะพ-ะผะฐะปะบะพ ะฑะฐะนั‚ะพะฒะต ะพั‚ ะพั‡ะฐะบะฒะฐะฝะพั‚ะพ "
 "(ะพั‡ะฐะบะฒะฐะฝะธ: %<PRIuMAX> ะฑะฐะนั‚ะฐ, ะฟะพะปัƒั‡ะตะฝะธ: %<PRIuMAX>)"
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€žworktrees/%sโ€œ: ะฝะตะฟั€ะฐะฒะธะปะตะฝ ั„ะฐะนะป โ€žgitdirโ€œ"
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ โ€žworktrees/%sโ€œ: ั„ะฐะนะปัŠั‚ โ€žgitdirโ€œ ัะพั‡ะธ ะฝะตััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะพ "
 "ะผะตัั‚ะพะฟะพะปะพะถะตะฝะธะต"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr "ะดะพะบะปะฐะดะฒะฐะฝะต ะฝะฐ ะพะบะฐัั‚ั€ะตะฝะธั‚ะต ั€ะฐะฑะพั‚ะฝะธ ะดัŠั€ะฒะตั‚ะฐ"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr "ะพะฑัะฒัะฒะฐะฝะต ะฝะฐ ั€ะฐะฑะพั‚ะฝะธั‚ะต ะบะพะฟะธั ะฟะพ-ัั‚ะฐั€ะธ ะพั‚ ั‚ะพะฒะฐ ะ’ะ ะ•ะœะ• ะทะฐ ะพัั‚ะฐั€ะตะปะธ"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr "โ€ž%sโ€œ ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ"
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:244
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "ะดัŠั€ะฒะพั‚ะพ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะดะพะฑะฐะฒะตะฝะพ ะฝะฐะฝะพะฒะพ"
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:249
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -21264,7 +22462,7 @@ msgstr ""
 "ะ—ะฐ ะธะทั€ะธั‡ะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฟะพะปะทะฒะฐะนั‚ะต โ€žadd -fโ€œ, ะฐ ะทะฐ ะธะทั‡ะธัั‚ะฒะฐะฝะต โ€” โ€žpruneโ€œ ะธะปะธ "
 "โ€žremoveโ€œ"
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:251
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -21274,125 +22472,125 @@ msgstr ""
 "ะ—ะฐ ะธะทั€ะธั‡ะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฟะพะปะทะฒะฐะนั‚ะต โ€žadd -fโ€œ, ะฐ ะทะฐ ะธะทั‡ะธัั‚ะฒะฐะฝะต โ€” โ€žpruneโ€œ ะธะปะธ "
 "โ€žremoveโ€œ"
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝะฐ"
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:432 builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "ะŸั€ะธะณะพั‚ะฒัะฝะต ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ (ะฝะพะฒ ะบะปะพะฝ โ€ž%sโ€œ)"
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:434
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "ะŸั€ะธะณะพั‚ะฒัะฝะต ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ (ะทะฐะฝัƒะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ โ€ž%sโ€œ, ะบะพะนั‚ะพ ัะพั‡ะตัˆะต ะบัŠะผ "
 "โ€ž%sโ€œ)"
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:443
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "ะŸั€ะธะณะพั‚ะฒัะฝะต ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ (ะธะทั‚ะตะณะปัะฝะต ะฝะฐ โ€ž%sโ€œ)"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:449
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "ะŸะพะดะณะพั‚ะฒัะฝะต ะฝะฐ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ (ัƒะบะฐะทะฐั‚ะตะปัั‚ โ€žHEADโ€œ ะฝะต ัะฒัŠั€ะทะฐะฝ: %s)"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:490
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "ะ˜ะทั‚ะตะณะปัะฝะต ะšะ›ะžะะฐ, ะดะพั€ะธ ะธ ะดะฐ ะต ะธะทั‚ะตะณะปะตะฝ ะฒ ะดั€ัƒะณะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:493
 msgid "create a new branch"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฝะพะฒ ะบะปะพะฝ"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:495
 msgid "create or reset a branch"
 msgstr "ััŠะทะดะฐะฒะฐะฝะต ะธะปะธ ะทะฐะฝัƒะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะธ"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:497
 msgid "populate the new working tree"
 msgstr "ะฟะพะดะณะพั‚ะฒัะฝะต ะฝะฐ ะฝะพะฒะพั‚ะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:498
 msgid "keep the new working tree locked"
 msgstr "ะฝะพะฒะพั‚ะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ ะดะฐ ะพัั‚ะฐะฝะต ะทะฐะบะปัŽั‡ะตะฝะพ"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:501
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ั€ะตะถะธะผะฐ ะฝะฐ ัะปะตะดะตะฝะต (ะฒะธะถ git-branch(1))"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:504
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "ะพะฟะธั‚ ะทะฐ ะฝะฐะฟะฐัะฒะฐะฝะต ะฝะฐ ะธะผะตั‚ะพ ะฝะฐ ะฝะพะฒะธั ะบะปะพะฝ ั ั‚ะพะฒะฐ ะฝะฐ ัะปะตะดัั‰ ะบะปะพะฝ"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:512
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž-bโ€œ, โ€ž-Bโ€œ ะธ โ€ž--detachโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ ะตะดะฝะฐ ั ะดั€ัƒะณะฐ"
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:573
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "โ€ž--[no-]trackโ€œ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะฟั€ะธ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฝะพะฒ ะบะปะพะฝ"
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:673
 msgid "reason for locking"
 msgstr "ะฟั€ะธั‡ะธะฝะฐ ะทะฐ ะทะฐะบะปัŽั‡ะฒะฐะฝะต"
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:687 builtin/worktree.c:720
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "ะžัะฝะพะฒะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะบะปัŽั‡ะธ ะธะปะธ ะทะฐะบะปัŽั‡ะธ"
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:692
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "โ€ž%sโ€œ ะฒะตั‡ะต ะต ะทะฐะบะปัŽั‡ะตะฝะพ, ะทะฐั‰ะพั‚ะพ โ€ž%sโ€œ"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:694
 #, c-format
 msgid "'%s' is already locked"
 msgstr "โ€ž%sโ€œ ะฒะตั‡ะต ะต ะทะฐะบะปัŽั‡ะตะฝะพ"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:722
 #, c-format
 msgid "'%s' is not locked"
 msgstr "โ€ž%sโ€œ ะฝะต ะต ะทะฐะบะปัŽั‡ะตะฝะพ"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:763
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ะผะตัั‚ะธั‚ะต ะธะปะธ ะธะทั‚ั€ะธะฒะฐั‚ะต ั€ะฐะฑะพั‚ะฝะธ ะดัŠั€ะฒะตั‚ะฐ, ะฒ ะบะพะธั‚ะพ ะธะผะฐ ะฟะพะดะผะพะดัƒะปะธ"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:771
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะฟั€ะตะผะตัั‚ะฒะฐะฝะต, ะดะพั€ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะดะฐ ะฝะต ะต ั‡ะธัั‚ะพ ะธะปะธ ะดะฐ ะต "
 "ะทะฐะบะปัŽั‡ะตะฝะพ"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:794 builtin/worktree.c:921
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "โ€ž%sโ€œ ะต ะพัะฝะพะฒะฝะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:799
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "ะธะผะตั‚ะพ ะฝะฐ ั†ะตะปั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฟั€ะตะดะตะปะธ ะพั‚ โ€ž%sโ€œ"
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:805
 #, c-format
 msgid "target '%s' already exists"
 msgstr "ั†ะตะปั‚ะฐ โ€ž%sโ€œ ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ"
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:813
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -21401,7 +22599,7 @@ msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะตะผะตัั‚ะธั‚ะต ะทะฐะบะปัŽั‡ะตะฝะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ, ะฟั€ะธั‡ะธะฝะฐ ะทะฐ ะทะฐะบะปัŽั‡ะฒะฐะฝะตั‚ะพ: %s\n"
 "ะธะปะธ ะณะพ ะพั‚ะบะปัŽั‡ะตั‚ะต, ะธะปะธ ะณะพ ะฟั€ะตะผะตัั‚ะตั‚ะต ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ั โ€žmove -f -fโ€œ"
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:815
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -21409,41 +22607,41 @@ msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะตะผะตัั‚ะธั‚ะต ะทะฐะบะปัŽั‡ะตะฝะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ:\n"
 "ะธะปะธ ะณะพ ะพั‚ะบะปัŽั‡ะตั‚ะต, ะธะปะธ ะณะพ ะฟั€ะตะผะตัั‚ะตั‚ะต ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ั โ€žmove -f -fโ€œ"
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:818
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 "ะฟั€ะพะฒะตั€ะบะธั‚ะต ัะฐ ะฝะตัƒัะฟะตัˆะฝะธ, ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฟั€ะตะผะตัั‚ะตะฝะพ: %s"
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:823
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "โ€ž%sโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะตะผะตัั‚ะธ ะฒ โ€ž%sโ€œ"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:871
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "ะฝะต ะผะพะถะต ะดะฐ ะธะทะฟัŠะปะฝะธ โ€žgit statusโ€œ ะฒัŠั€ั…ัƒ โ€ž%sโ€œ"
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:875
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
-"ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ โ€ž%sโ€œ ะฝะต ะต ั‡ะธัั‚ะพ, ะทะฐ ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต ะต ะฝะตะพะฑั…ะพะดะธะผะฐ "
-"ะพะฟั†ะธัั‚ะฐ โ€ž--forceโ€œ "
+"โ€ž%sโ€œ ััŠะดัŠั€ะถะฐ ะฟั€ะพะผะตะฝะตะฝะธ ะธะปะธ ะฝะพะฒะธ ั„ะฐะนะปะพะฒะต, ะทะฐ ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต ะต "
+"ะฝะตะพะฑั…ะพะดะธะผะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--forceโ€œ"
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:880
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 "ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit statusโ€œ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ ะทะฐ โ€ž%sโ€œ, ะบะพะด ะทะฐ ะณั€ะตัˆะบะฐ: %d"
 
-#: builtin/worktree.c:911
+#: builtin/worktree.c:903
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะธะทั‚ั€ะธะฒะฐะฝะต, ะดะพั€ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะดะฐ ะฝะต ะต ั‡ะธัั‚ะพ ะธะปะธ ะดะฐ ะต ะทะฐะบะปัŽั‡ะตะฝะพ"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:926
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -21452,7 +22650,7 @@ msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ะธะทั‚ั€ะธะตั‚ะต ะทะฐะบะปัŽั‡ะตะฝะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ, ะฟั€ะธั‡ะธะฝะฐ ะทะฐ ะทะฐะบะปัŽั‡ะฒะฐะฝะตั‚ะพ: %s\n"
 "ะธะปะธ ะณะพ ะพั‚ะบะปัŽั‡ะตั‚ะต, ะธะปะธ ะณะพ ะธะทั‚ั€ะธะนั‚ะต ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ั โ€žremove -f -fโ€œ"
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:928
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -21460,7 +22658,7 @@ msgstr ""
 "ะฝะต ะผะพะถะต ะดะฐ ะธะทั‚ั€ะธะตั‚ะต ะทะฐะบะปัŽั‡ะตะฝะพ ั€ะฐะฑะพั‚ะฝะพ ะดัŠั€ะฒะพ:\n"
 "ะธะปะธ ะณะพ ะพั‚ะบะปัŽั‡ะตั‚ะต, ะธะปะธ ะณะพ ะธะทั‚ั€ะธะนั‚ะต ะฟั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ั โ€žremove -f -fโ€œ"
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:931
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "ะฟั€ะพะฒะตั€ะบะธั‚ะต ัะฐ ะฝะตัƒัะฟะตัˆะฝะธ, ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚ะพ: %s"
@@ -21481,6 +22679,21 @@ msgstr "ะทะฐะฟะธั ะฝะฐ ะพะฑะตะบั‚-ะดัŠั€ะฒะพ ะทะฐ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธัั‚ะ
 msgid "only useful for debugging"
 msgstr "ัะฐะผะพ ะทะฐ ะธะทั‡ะธัั‚ะฒะฐะฝะต ะฝะฐ ะณั€ะตัˆะบะธ"
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะบะพะผะฐะฝะดะฐ โ€žmarkโ€œ, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝะฐ: โ€ž%sโ€œ"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "ะพั‡ะฐะบะฒะฐ ัะต ะบะพะผะฐะฝะดะฐ โ€žtoโ€œ, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝะฐ: โ€ž%sโ€œ"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "โ€ž%sโ€œ ะธะทะธัะบะฒะฐ ะธะทั€ะธั‡ะฝะพั‚ะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟั†ะธัั‚ะฐ โ€ž--allow-unsafe-featuresโ€œ"
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -21544,10 +22757,7 @@ msgstr ""
 "ะฒัŠะฒะตะดะตะฝะธั.  ะ—ะฐ ะฟะพะผะพั‰ ะทะฐ ัะฟะตั†ะธั„ะธั‡ะฝะฐ ะšะžะœะะะ”ะ ะฟะพะปะทะฒะฐะนั‚ะต โ€žgit help ะšะžะœะะะ”ะโ€œ, ะฐ "
 "ะทะฐ\n"
 "ะฝัะบะพะต ะพะฟั€ะตะดะตะปะตะฝะพ ะŸะžะะฏะขะ˜ะ• ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit help ะŸะžะะฏะขะ˜ะ•โ€œ.  ะ—ะฐ ะฟั€ะตะณะปะตะด ะฝะฐ\n"
-"ัะธัั‚ะตะผะฐั‚ะฐ ะทะฐ ะฟะพะผะพั‰ ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit help gitโ€œ.\n"
-"\n"
-"ะ‘ัŠะปะณะฐั€ัะบะธ ะฟั€ะตะฒะพะด ะฝะฐ ะบะฝะธะณะฐั‚ะฐ โ€žPro Gitโ€œ ะพั‚ ะงะฐะบัŠะฝ ะธ ะกั‚ั€ะฐัƒะฑ:\n"
-"http://i-can.eu/progit2-bg/progit.html"
+"ัะธัั‚ะตะผะฐั‚ะฐ ะทะฐ ะฟะพะผะพั‰ ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žgit help gitโ€œ."
 
 #: git.c:186
 #, c-format
@@ -21598,25 +22808,25 @@ msgstr ""
 "ะฟัะตะฒะดะพะฝะธะผัŠั‚ โ€ž%sโ€œ ะฟั€ะพะผะตะฝั ะฟั€ะพะผะตะฝะปะธะฒะธ ะฝะฐ ัั€ะตะดะฐั‚ะฐ.\n"
 "ะ—ะฐ ั‚ะพะฒะฐ ะผะพะถะต ะดะฐ ะฟะพะปะทะฒะฐั‚ะต โ€ž!gitโ€œ ะฒ ะฟัะตะฒะดะพะฝะธะผะฐ"
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr "ะฟั€ะฐะทะตะฝ ะฟัะตะฒะดะพะฝะธะผ ะทะฐ โ€ž%sโ€œ"
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr "ะทะฐั†ะธะบะปะตะฝ ะฟัะตะฒะดะพะฝะธะผ: โ€ž%sโ€œ"
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธั ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะธะทั…ะพะด"
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr "ะฝะตะธะทะฒะตัั‚ะฝะฐ ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธั ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะธะทั…ะพะด"
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐั‚ะฒะฐั€ัะฝะต ะฝะฐ ัั‚ะฐะฝะดะฐั€ั‚ะฝะธั ะธะทั…ะพะด"
 
@@ -21673,26 +22883,26 @@ msgstr "โ€žCURLSSLOPT_NO_REVOKEโ€œ ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ะพั‚ cURL < 7.44.0
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "ะžะณั€ะฐะฝะธั‡ะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟั€ะพั‚ะพะบะพะปะธั‚ะต ะฝะต ัะต ะฟะพะดะดัŠั€ะถะฐ ะพั‚ cURL < 7.44.0"
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "ะะตะฟะพะดะดัŠั€ะถะฐะฝะฐ ั€ะตะฐะปะธะทะฐั†ะธั ะฝะฐ SSL โ€ž%sโ€œ. ะŸะพะดะดัŠั€ะถะฐั‚ ัะต:"
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "ะ ะตะฐะปะธะทะฐั†ะธัั‚ะฐ ะฝะฐ SSL ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ€ž%sโ€œ: cURL ะต ะบะพะผะฟะธะปะธั€ะฐะฝ ะฑะตะท "
 "ะฟะพะดะดั€ัŠะถะบะฐ ะฝะฐ SSL"
 
-#: http.c:1096
+#: http.c:1097
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 "ะ ะตะฐะปะธะทะฐั†ะธัั‚ะฐ ะฝะฐ SSL ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ€ž%sโ€œ, ะทะฐั‰ะพั‚ะพ ะฒะตั‡ะต ะต ะทะฐะดะฐะดะตะฝะฐ "
 "ะดั€ัƒะณะฐ"
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21703,156 +22913,167 @@ msgstr ""
 "    โ— ะทะฐัะฒะตะฝ ะฐะดั€ะตั: %s\n"
 "    โ— ะฟั€ะตะฝะฐัะพั‡ะฒะฐะฝะต: %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะฝะพ ะตะบั€ะฐะฝะธั€ะฐะฝะต ะธะปะธ ั†ะธั‚ะธั€ะฐะฝะต ะฒ ัั‚ะพะนะฝะพัั‚ั‚ะฐ ะบัŠะผ ะพะฟั†ะธั ะทะฐ ะธะทั‚ะปะฐัะบะฒะฐะฝะต: "
 "โ€ž%sโ€œ"
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "โ€ž%sinfo/refsโ€œ ะต ะฝะตะธะทะฟะพะปะทะฒะฐะตะผะพ, ะฟั€ะพะฒะตั€ะตั‚ะต ะดะฐะปะธ ะต ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ git"
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะพั‚ะณะพะฒะพั€ ะพั‚ ััŠั€ะฒัŠั€ะฐ: ะพั‡ะฐะบะฒะฐัˆะต ัะต ัƒัะปัƒะณะฐ, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝ ะธะทั‡ะธัั‚ะฒะฐั‰ "
 "ะฟะฐะบะตั‚ โ€žflushโ€œ"
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะพั‚ะณะพะฒะพั€ ะพั‚ ััŠั€ะฒัŠั€ะฐ, ะฑะต ะฟะพะปัƒั‡ะตะฝะพ: โ€ž%sโ€œ"
 
-#: remote-curl.c:446
+#: remote-curl.c:455
 #, c-format
 msgid "repository '%s' not found"
 msgstr "ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ โ€ž%sโ€œ ะปะธะฟัะฒะฐ"
 
-#: remote-curl.c:450
+#: remote-curl.c:459
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "ะะตัƒัะฟะตัˆะฝะฐ ะธะดะตะฝั‚ะธั„ะธะบะฐั†ะธั ะบัŠะผ โ€ž%sโ€œ"
 
-#: remote-curl.c:454
+#: remote-curl.c:463
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "ะฝัะผะฐ ะดะพัั‚ัŠะฟ ะดะพ โ€ž%sโ€œ: %s"
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr "ะฟั€ะตะฝะฐัะพั‡ะฒะฐะฝะต ะบัŠะผ โ€ž%sโ€œ"
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "ะฟะพะปัƒั‡ะตะฝ ะต EOF, ะฒ ั€ะตะถะธะผ ะฑะตะท ะฟะพะดะดั€ัŠะถะบะฐ ะทะฐ ั‚ะพะฒะฐ"
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "ะดะฐะฝะฝะธั‚ะต ะทะฐ POST ะฝะต ะผะพะณะฐั‚ ะดะฐ ัะต ะฟั€ะพั‡ะตั‚ะฐั‚ ะฝะฐะฝะพะฒะพ, ะฟั€ะพะฑะฒะฐะนั‚ะต ะดะฐ ัƒะฒะตะปะธั‡ะธั‚ะต "
 "ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ โ€žhttp.postBufferโ€œ"
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, c-format
 msgid "RPC failed; %s"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ะพั‚ะดะฐะปะตั‡ะตะฝะพ ะธะทะฒะธะบะฒะฐะฝะต.  %s"
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 msgid "cannot handle pushes this big"
 msgstr "ั‚ะพะปะบะพะฒะฐ ะณะพะปะตะผะธ ะธะทั‚ะปะฐัะบะฒะฐะฝะธั ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝัั‚"
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 "ะทะฐัะฒะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะดะตะบะพะผะฟั€ะตัะธั€ะฐะฝะฐ, ะณั€ะตัˆะบะฐ ะพั‚ โ€žzlibโ€œ ะฟั€ะธ "
 "ะดะตะบะพะผะฟั€ะตัะธั€ะฐะฝะต: %d"
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 "ะทะฐัะฒะบะฐั‚ะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะดะตะบะพะผะฟั€ะตัะธั€ะฐะฝะฐ; ะณั€ะตัˆะบะฐ ะพั‚ โ€žzlibโ€œ ะฟั€ะธ ะทะฐะฒัŠั€ัˆะฒะฐะฝะต: %d<"
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "ะพะฟั€ะพัั‚ะตะฝะธัั‚ ั‚ั€ะฐะฝัะฟะพั€ั‚ ะฟะพ http ะฝะต ะฟะพะดะดัŠั€ะถะฐ ะฟะปะธั‚ะบะธ ะบะปะธะตะฝั‚ะธ"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1038
 msgid "fetch failed."
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะดะพัั‚ะฐะฒัะฝะต."
 
-#: remote-curl.c:1076
+#: remote-curl.c:1086
 msgid "cannot fetch by sha1 over smart http"
 msgstr "ัƒะผะฝะธัั‚ ะฒะฐั€ะธะฐะฝั‚ ะฝะฐ http ะฝะต ะผะพะถะต ะดะฐ ะดะพัั‚ะฐะฒั ะฟะพ SHA1"
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1130 remote-curl.c:1136
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "ะฟั€ะพั‚ะพะบะพะปะฝะฐ ะณั€ะตัˆะบะฐ: ะพั‡ะฐะบะฒะฐ ัะต SHA1 ะธะปะธ ัƒะบะฐะทะฐั‚ะตะป, ะฐ ะฑะต ะฟะพะปัƒั‡ะตะฝะพ: โ€ž%sโ€œ"
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1148 remote-curl.c:1263
 #, c-format
 msgid "http transport does not support %s"
 msgstr "ั‚ั€ะฐะฝัะฟะพั€ั‚ัŠั‚ ะฟะพ http ะฝะต ะฟะพะดะดัŠั€ะถะฐ โ€ž%sโ€œ"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1184
 msgid "git-http-push failed"
 msgstr "ะฝะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žgit-http-pushโ€œ"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1369
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: ัƒะฟะพั‚ั€ะตะฑะฐ: git remote-curl ะฅะ ะะะ˜ะ›ะ˜ะฉะ• [ะะ”ะ ะ•ะก]"
 
-#: remote-curl.c:1392
+#: remote-curl.c:1401
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: ะณั€ะตัˆะบะฐ ะฟั€ะธ ะธะทั‡ะธั‚ะฐะฝะตั‚ะพ ะฝะฐ ะฟะพั‚ะพะบะฐ ะบะพะผะฐะฝะดะธ ะพั‚ git"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1408
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: ะพะฟะธั‚ ะทะฐ ะดะพัั‚ะฐะฒัะฝะต ะฑะตะท ะปะพะบะฐะปะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต"
 
-#: remote-curl.c:1439
+#: remote-curl.c:1448
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: ะฝะตะฟะพะทะฝะฐั‚ะฐ ะบะพะผะฐะฝะดะฐ โ€ž%sโ€œ ะพั‚ git"
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr "ะะ ะ“ะฃะœะ•ะะขะ˜"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr "ั„ะธะปั‚ั€ะธั€ะฐะฝะต ะฟะพ ะฒะธะด ะฝะฐ ะพะฑะตะบั‚ะฐ"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "ะฟะตั€ะธะพะด ะฝะฐ ะฒะฐะปะธะดะฝะพัั‚/ะทะฐะฟะฐะทะฒะฐะฝะต"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "ะฝัƒะปะตะฒะฐ ะพะฟะตั€ะฐั†ะธั (ะทะฐ ััŠะฒะผะตัั‚ะธะผะพัั‚ ั ะฟั€ะตะดะธัˆะฝะธ ะฒะตั€ัะธะธ)"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "ะฟะพะฒะตั‡ะต ะฟะพะดั€ะพะฑะฝะพัั‚ะธ"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "ะฟะพ-ะผะฐะปะบะพ ะฟะพะดั€ะพะฑะฝะพัั‚ะธ"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "ะดะฐ ัะต ะฟะพะบะฐะทะฒะฐั‚ ั‚ะฐะบัŠะฒ ะ‘ะ ะžะ™ ั†ะธั„ั€ะธ ะพั‚ ััƒะผะธั‚ะต ะฟะพ SHA1"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "ะบะพะธ ะฟั€ะฐะทะฝะธ ะทะฝะฐั†ะธ ะธ #ะบะพะผะตะฝั‚ะฐั€ะธ ะดะฐ ัะต ะผะฐั…ะฐั‚ ะพั‚ ััŠะพะฑั‰ะตะฝะธัั‚ะฐ"
 
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "ะธะทั‡ะธั‚ะฐะฝะต ะฝะฐ ะฟัŠั‚ะธั‰ะฐั‚ะฐ ะพั‚ ะคะะ™ะ›"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"ะฟั€ะธ ะฟะพะปะทะฒะฐะฝะตั‚ะพ ะฝะฐ โ€ž--pathspec-from-fileโ€œ, ะฟัŠั‚ะธั‰ะฐั‚ะฐ ัะฐ ั€ะฐะทะดะตะปะตะฝะธ ั ะฝัƒะปะตะฒะธั "
+"ะทะฝะฐะบ โ€žNULโ€œ"
+
 #: ref-filter.h:101
 msgid "key"
 msgstr "ะšะ›ะฎะง"
@@ -22377,163 +23598,171 @@ msgid "Common Git shell script setup code"
 msgstr "ะะฐัั‚ั€ะพะนะบะธ ะฝะฐ Git ะทะฐ ัะบั€ะธะฟั‚ะพะฒะตั‚ะต ะฝะฐ ะพะฑะฒะธะฒะบะฐั‚ะฐ"
 
 #: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "ะ˜ะฝะธั†ะธะฐะปะธะทะธั€ะฐะฝะต ะธ ะฟั€ะพะผัะฝะฐ ะฝะฐ ั‡ะฐัั‚ะธั‡ะฝะพั‚ะพ ะธะทั‚ะตะณะปัะฝะต"
+
+#: command-list.h:172
 msgid "Stash the changes in a dirty working directory away"
 msgstr "ะกะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ะฝะตะฟะพะดะฐะดะตะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฒ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: command-list.h:172
+#: command-list.h:173
 msgid "Add file contents to the staging area"
 msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ั„ะฐะนะปะฐ ะบัŠะผ ะธะฝะดะตะบัะฐ"
 
-#: command-list.h:173
+#: command-list.h:174
 msgid "Show the working tree status"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ััŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: command-list.h:174
+#: command-list.h:175
 msgid "Remove unnecessary whitespace"
 msgstr "ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะธะทะปะธัˆะฝะธั‚ะต ะทะฝะฐั†ะธ ะทะฐ ะธะฝั‚ะตั€ะฒะฐะปะธ"
 
-#: command-list.h:175
+#: command-list.h:176
 msgid "Initialize, update or inspect submodules"
 msgstr "ะ˜ะฝะธั†ะธะฐะปะธะทะธั€ะฐะฝะต, ะพะฑะฝะพะฒัะฒะฐะฝะต ะธะปะธ ั€ะฐะทะณะปะตะถะดะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะธ"
 
-#: command-list.h:176
+#: command-list.h:177
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "ะ”ะฒัƒะฟะพัะพั‡ะฝะฐ ั€ะฐะฑะพั‚ะฐ ะผะตะถะดัƒ ั…ั€ะฐะฝะธะปะธั‰ะฐ ะฟะพะด Subversion ะธ Git"
 
-#: command-list.h:177
+#: command-list.h:178
 msgid "Switch branches"
 msgstr "ะŸั€ะตะผะธะฝะฐะฒะฐะฝะต ะบัŠะผ ะดั€ัƒะณ ะบะปะพะฝ"
 
-#: command-list.h:178
+#: command-list.h:179
 msgid "Read, modify and delete symbolic refs"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต, ะฟั€ะพะผัะฝะฐ ะธ ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะธ ัƒะบะฐะทะฐั‚ะตะปะธ"
 
-#: command-list.h:179
+#: command-list.h:180
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต, ััŠะทะดะฐะฒะฐะฝะต, ะธะทั‚ั€ะธะฒะฐะฝะต, ะฟั€ะพะฒะตั€ะบะฐ ะฝะฐ ะตั‚ะธะบะตั‚ะธ ะฟะพะดะฟะธัะฐะฝะธ ั GPG"
 
-#: command-list.h:180
+#: command-list.h:181
 msgid "Creates a temporary file with a blob's contents"
 msgstr "ะกัŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะฒั€ะตะผะตะฝะตะฝ ั„ะฐะนะป ััŠั ััŠั‰ะพั‚ะพ ััŠะดัŠั€ะถะฐะฝะธะต ะบะฐั‚ะพ ะพะฑะตะบั‚ัŠั‚-BLOB"
 
-#: command-list.h:181
+#: command-list.h:182
 msgid "Unpack objects from a packed archive"
 msgstr "ะ ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ ะพะฑะตะบั‚ะธ ะพั‚ ะฟะฐะบะตั‚ะธั€ะฐะฝ ะฐั€ั…ะธะฒ"
 
-#: command-list.h:182
+#: command-list.h:183
 msgid "Register file contents in the working tree to the index"
 msgstr "ะ ะตะณะธัั‚ั€ะธั€ะฐะฝะต ะฝะฐ ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ั„ะฐะนะปะพะฒะตั‚ะต ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฒ ะธะฝะดะตะบัะฐ"
 
-#: command-list.h:183
+#: command-list.h:184
 msgid "Update the object name stored in a ref safely"
 msgstr "ะ‘ะตะทะพะฟะฐัะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะผะตั‚ะพ ะฝะฐ ะพะฑะตะบั‚ ะฒ ัƒะบะฐะทะฐั‚ะตะป"
 
-#: command-list.h:184
+#: command-list.h:185
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ ั ะดะพะฟัŠะปะฝะธั‚ะตะปะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะฒ ะฟะพะผะพั‰ ะฝะฐ ะพะฟั€ะพัั‚ะตะฝะธั‚ะต ััŠั€ะฒัŠั€ะธ"
 
-#: command-list.h:185
+#: command-list.h:186
 msgid "Send archive back to git-archive"
 msgstr "ะ˜ะทะฟั€ะฐั‰ะฐะฝะต ะฝะฐ ะฐั€ั…ะธะฒะฐ ะพะฑั€ะฐั‚ะฝะพ ะบัŠะผ โ€žgit-archiveโ€œ"
 
-#: command-list.h:186
+#: command-list.h:187
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "ะ˜ะทะฟั€ะฐั‰ะฐะฝะต ะฝะฐ ะฟะฐะบะตั‚ะธั€ะฐะฝะธั‚ะต ะพะฑะตะบั‚ะธ ะพะฑั€ะฐั‚ะฝะพ ะบัŠะผ โ€žgit-fetch-packโ€œ"
 
-#: command-list.h:187
+#: command-list.h:188
 msgid "Show a Git logical variable"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะปะพะณะธั‡ะตัะบะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐ ะฝะฐ Git"
 
-#: command-list.h:188
+#: command-list.h:189
 msgid "Check the GPG signature of commits"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฟะพะดะฟะธัะธั‚ะต GPG ะฒัŠั€ั…ัƒ ะฟะพะดะฐะฒะฐะฝะธัั‚ะฐ"
 
-#: command-list.h:189
+#: command-list.h:190
 msgid "Validate packed Git archive files"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฟะฐะบะตั‚ะธั€ะฐะฝะธั‚ะต ะฐั€ั…ะธะฒะฝะธ ั„ะฐะนะปะพะฒะต ะฝะฐ Git"
 
-#: command-list.h:190
+#: command-list.h:191
 msgid "Check the GPG signature of tags"
 msgstr "ะŸั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฟะพะดะฟะธัะธั‚ะต GPG ะฒัŠั€ั…ัƒ ะตั‚ะธะบะตั‚ะธั‚ะต"
 
-#: command-list.h:191
+#: command-list.h:192
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "ะฃะตะฑ ะธะฝั‚ะตั€ั„ะตะนั ะฝะฐ Git"
 
-#: command-list.h:192
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "ะ˜ะทะฒะตะถะดะฐะฝะต ะฝะฐ ะถัƒั€ะฝะฐะป ั ั€ะฐะทะปะธะบะธั‚ะต, ะฒัŠะฒะตะดะตะฝะธ ั ะฒััะบะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: command-list.h:193
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "ะฃะฟั€ะฐะฒะปะตะฝะธะต ะฝะฐ ะผะฝะพะถะตัั‚ะฒะพ ั€ะฐะฑะพั‚ะฝะธ ะดัŠั€ะฒะตั‚ะฐ"
 
-#: command-list.h:194
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "ะกัŠะทะดะฐะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั‚-ะดัŠั€ะฒะพ ะพั‚ ั‚ะตะบัƒั‰ะธั ะธะฝะดะตะบั"
 
-#: command-list.h:195
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "ะฃะบะฐะทะฒะฐะฝะต ะฝะฐ ะฐั‚ั€ะธะฑัƒั‚ะธ ะบัŠะผ ะฟัŠั‚"
 
-#: command-list.h:196
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "ะšะพะผะฐะฝะดะตะฝ ั€ะตะด ะธ ะบะพะฝะฒะตะฝั†ะธะธ ะฝะฐ Git"
 
-#: command-list.h:197
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "ะ’ัŠะฒะตะถะดะฐั‰ ัƒั€ะพะบ ะฒ Git ะทะฐ ั€ะฐะทั€ะฐะฑะพั‚ั‡ะธั†ะธ"
 
-#: command-list.h:198
+#: command-list.h:199
 msgid "Git for CVS users"
 msgstr "Git ะทะฐ ะฟะพั‚ั€ะตะฑะธั‚ะตะปะธ ะฝะฐ CVS"
 
-#: command-list.h:199
+#: command-list.h:200
 msgid "Tweaking diff output"
 msgstr "ะะฐัั‚ั€ะพะนะฒะฐะฝะต ะฝะฐ ะธะทะณะปะตะดะฐ ะฝะฐ ั€ะฐะทะปะธะบะธั‚ะต"
 
-#: command-list.h:200
+#: command-list.h:201
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "ะŸะพะปะตะทะตะฝ ะผะธะฝะธะผะฐะปะตะฝ ะฝะฐะฑะพั€ ะพั‚ ะบะพะผะฐะฝะดะธ ะทะฐ ะตะถะตะดะฝะตะฒะฝะฐั‚ะฐ ั€ะฐะฑะพั‚ะฐ ั Git"
 
-#: command-list.h:201
+#: command-list.h:202
 msgid "A Git Glossary"
 msgstr "ะ ะตั‡ะฝะธะบ ั ั‚ะตั€ะผะธะฝะธั‚ะต ะฝะฐ Git"
 
-#: command-list.h:202
+#: command-list.h:203
 msgid "Hooks used by Git"
 msgstr "ะšัƒะบะธ ะฝะฐ Git"
 
-#: command-list.h:203
+#: command-list.h:204
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "ะฃะบะฐะทะฒะฐะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต, ะบะพะธั‚ะพ ะดะฐ ะฑัŠะดะฐั‚ ะฝะฐั€ะพั‡ะฝะพ ะฟั€ะตะฝะตะฑั€ะตะณะฒะฐะฝะธ"
 
-#: command-list.h:204
+#: command-list.h:205
 msgid "Defining submodule properties"
 msgstr "ะ”ะตั„ะธะฝะธั€ะฐะฝะต ะฝะฐ ัะฒะพะนัั‚ะฒะฐั‚ะฐ ะฝะฐ ะฟะพะดะผะพะดัƒะปะธั‚ะต"
 
-#: command-list.h:205
+#: command-list.h:206
 msgid "Git namespaces"
 msgstr "ะŸั€ะพัั‚ั€ะฐะฝัั‚ะฒะฐ ะพั‚ ะธะผะตะฝะฐ ะฝะฐ Git"
 
-#: command-list.h:206
+#: command-list.h:207
 msgid "Git Repository Layout"
 msgstr "ะฃัั‚ั€ะพะนัั‚ะฒะพ ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะฝะฐ Git"
 
-#: command-list.h:207
+#: command-list.h:208
 msgid "Specifying revisions and ranges for Git"
 msgstr "ะฃะบะฐะทะฒะฐะฝะต ะฝะฐ ะฒะตั€ัะธะธ ะธ ะดะธะฐะฟะฐะทะพะฝะธ ะฒ Git"
 
-#: command-list.h:208
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "ะœะพะฝั‚ะธั€ะฐะฝะต ะฝะฐ ะตะดะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฒ ะดั€ัƒะณะพ"
+
+#: command-list.h:210
 msgid "A tutorial introduction to Git: part two"
 msgstr "ะ’ัŠะฒะตะถะดะฐั‰ ัƒั€ะพะบ ะทะฐ Git: ะฒั‚ะพั€ะฐ ั‡ะฐัั‚"
 
-#: command-list.h:209
+#: command-list.h:211
 msgid "A tutorial introduction to Git"
 msgstr "ะ’ัŠะฒะตะถะดะฐั‰ ัƒั€ะพะบ ะทะฐ Git"
 
-#: command-list.h:210
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr "ะžะฑั‰ ะฟั€ะตะณะปะตะด ะฝะฐ ะฟั€ะตะฟะพั€ัŠั‡ะฒะฐะฝะธั‚ะต ะฝะฐั‡ะธะฝะธ ะทะฐ ั€ะฐะฑะพั‚ะฐ ั Git"
 
@@ -22662,149 +23891,138 @@ msgstr "ะžะฟะธั‚ ะทะฐ ะฟั€ะพัั‚ะพ ัะปะธะฒะฐะฝะต ั โ€ž$pretty_nameโ€œ"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "ะŸั€ะพัั‚ะพั‚ะพ ัะปะธะฒะฐะฝะต ะฝะต ัั€ะฐะฑะพั‚ะธ, ะฟั€ะพะฑะฒะฐ ัะต ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ัะปะธะฒะฐะฝะต."
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "ะ’ั€ะตะผะตะฝะฝะธัั‚ ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr ""
 "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€ž${ref_stash}โ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ ะดะฐ ัะพั‡ะธ ะบัŠะผ โ€ž${w_commit}โ€œ"
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "ะ“ะ ะ•ะจะšะ: ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žstash pushโ€œ ะฝะต ะฟั€ะธะตะผะฐ ะพะฟั†ะธัั‚ะฐ โ€ž$optionโ€œ"
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 "ะกัŠัั‚ะพัะฝะธะตั‚ะพ ะฝะฐ ั€ะฐะฑะพั‚ะฝะฐั‚ะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะธ ะธะฝะดะตะบัะฐ ัะฐ ะทะฐะฟะฐะทะตะฝะธ: โ€ž$stash_msgโ€œ"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "ะฝะตะฟะพะทะฝะฐั‚ะฐ ะพะฟั†ะธั: ${opt}"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "ะฃะบะฐะทะฐะฝะธ ัะฐ ะฟั€ะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฒะตั€ัะธะธ: โ€ž${REV}โ€œ"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "ะฃะบะฐะทะฐั‚ะตะปัั‚ โ€ž${reference}โ€œ ะต ะณั€ะตัˆะตะฝ"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "โ€ž${args}โ€œ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต, ะฟั€ะธะปะธั‡ะฐั‰ะพ ะฝะฐ ะฝะตั‰ะพ ัะบะฐั‚ะฐะฝะพ"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "โ€ž${args}โ€œ ะฝะต ะต ัƒะบะฐะทะฐั‚ะตะป ะบัŠะผ ะฝะตั‰ะพ ัะบะฐั‚ะฐะฝะพ"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "ะธะฝะดะตะบััŠั‚ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพะฑะฝะพะฒะตะฝ"
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "ะŸะพ ะฒั€ะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฟั€ะธะปะพะถะธั‚ะต ะฝะตั‰ะพ ัะบะฐั‚ะฐะฝะพ"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 "ะ’ ะธะฝะดะตะบัะฐ ะธะผะฐ ะบะพะฝั„ะปะธะบั‚ะธ.  ะŸั€ะพะฑะฒะฐะนั‚ะต ะดะฐ ะธะทะฟัŠะปะฝะธั‚ะต ะบะพะผะฐะฝะดะฐั‚ะฐ ะฑะตะท ะพะฟั†ะธัั‚ะฐ โ€ž--"
 "indexโ€œ."
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "ะ”ัŠั€ะฒะพั‚ะพ ัะพั‡ะตะฝะพ ะพั‚ ะธะฝะดะตะบัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝะพ"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr "ะะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต ะฝะต ะผะพะณะฐั‚ ะดะฐ ัะต ะฒัŠะทัั‚ะฐะฝะพะฒัั‚ ะพั‚ ัะบะฐั‚ะฐะฝะพั‚ะพ"
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "ะŸั€ะพะผะตะฝะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฑัŠะดะฐั‚ ะธะทะฒะฐะดะตะฝะธ ะพั‚ ะธะฝะดะตะบัะฐ"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "ะ˜ะทั‚ั€ะธั‚ะพ ะต ัะบะฐั‚ะฐะฝะพั‚ะพ โ€ž${REV}โ€œ ($s)"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "ะกะบะฐั‚ะฐะฝะพั‚ะพ โ€ž${REV}โ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ั€ะธั‚ะพ"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(ะ—ะฐ ะดะฐ ะณะธ ะฒัŠะทัั‚ะฐะฝะพะฒะธั‚ะต, ะธะทะฟัŠะปะฝะตั‚ะต ะบะพะผะฐะฝะดะฐั‚ะฐ โ€žgit stash applyโ€œ)"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:203
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "ะžั‚ะฝะพัะธั‚ะตะปะตะฝ ะฟัŠั‚ ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัะฐะผะพ ะพั‚ ะพัะฝะพะฒะฝะฐั‚ะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ "
 "ะดัŠั€ะฒะพ"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:213
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 "ะฐะดั€ะตั ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะต: โ€ž${repo}โ€œ ั‚ั€ัะฑะฒะฐ ะธะปะธ ะดะฐ ะต ะฐะฑัะพะปัŽั‚ะตะฝ, ะธะปะธ ะดะฐ ะทะฐะฟะพั‡ะฒะฐ ั "
 "โ€ž./โ€œ ะธะปะธ โ€ž../โ€œ"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:232
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "โ€ž${sm_path}โ€œ ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฒ ะธะฝะดะตะบัะฐ"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:235
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "โ€ž${sm_path}โ€œ ะฒะตั‡ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐ ะฒ ะธะฝะดะตะบัะฐ ะธ ะฝะต ะต ะฟะพะดะผะพะดัƒะป"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:242
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "ะฒ โ€ž${sm_path}โ€œ ะฝะต ะต ะธะทั‚ะตะณะปะตะฝะพ ะฟะพะดะฐะฒะฐะฝะต"
 
-#: git-submodule.sh:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"ะกะปะตะดะฝะธัั‚ ะฟัŠั‚ ัะต ะธะณะฝะพั€ะธั€ะฐ ะฟะพั€ะฐะดะธ ะฝัะบะพะน ะพั‚ ั„ะฐะนะปะพะฒะตั‚ะต โ€ž.gitignoreโ€œ:\n"
-"${sm_path}\n"
-"ะ˜ะทะฟะพะปะทะฒะฐะนั‚ะต ะพะฟั†ะธัั‚ะฐ โ€ž-fโ€œ, ะฐะบะพ ะทะฐ ะดะฐ ะณะพ ะดะพะฑะฐะฒะธั‚ะต ะฝะฐะธัั‚ะธะฝะฐ."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:273
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฒ โ€ž${sm_path}โ€œ ะบัŠะผ ะธะฝะดะตะบัะฐ"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:275
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "โ€ž${sm_path}โ€œ ััŠั‰ะตัั‚ะฒัƒะฒะฐ, ะฐ ะฝะต ะต ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะฐ Git"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:283
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "ะžั‚ะบั€ะธั‚ะฐ ะต ะปะพะบะฐะปะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั ะฝะฐ Git โ€” โ€ž${sm_name}โ€œ, ะบะพัั‚ะพ ัะพั‡ะธ ะบัŠะผ "
 "ะพั‚ะดะฐะปะตั‡ะตะฝะธั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะฐ:"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:285
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22821,37 +24039,37 @@ msgstr ""
 "ะฟั€ะฐะฒะธะปะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะธะปะธ ะฐะบะพ ะฝะต ะทะฝะฐะตั‚ะต ะบะฐะบะฒะพ ะพะทะฝะฐั‡ะฐะฒะฐ ั‚ะพะฒะฐ, ะธะทะฟะพะปะทะฒะฐะนั‚ะต\n"
 "ะดั€ัƒะณะพ ะธะผะต ะบะฐั‚ะพ ะฐั€ะณัƒะผะตะฝั‚ ะบัŠะผ ะพะฟั†ะธัั‚ะฐ โ€ž--nameโ€œ."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:291
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "ะะบั‚ะธะฒะธั€ะฐะฝะต ะฝะฐ ะปะพะบะฐะปะฝะพั‚ะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะทะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž${sm_name}โ€œ ะฝะฐะฝะพะฒะพ."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:303
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "ะŸะพะดะผะพะดัƒะปัŠั‚ โ€ž${sm_path}โ€œ ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะธะทั‚ะตะณะปะตะฝ"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:308
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž${sm_path}โ€œ"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:317
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ั€ะตะณะธัั‚ั€ะธั€ะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัƒะปะฐ โ€ž${sm_path}โ€œ"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "ะขะตะบัƒั‰ะฐั‚ะฐ ะฒะตั€ัะธั ะทะฐ ะฟะพะดะผะพะดัƒะปะฐ ะฒ โ€ž${displaypath}โ€œ ะปะธะฟัะฒะฐ"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:600
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "ะะตัƒัะฟะตัˆะฝะพ ะดะพัั‚ะฐะฒัะฝะต ะฒ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${sm_path}โ€œ"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:605
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22860,7 +24078,7 @@ msgstr ""
 "ะขะตะบัƒั‰ะฐั‚ะฐ ะฒะตั€ัะธั โ€ž${remote_name}/${branch}โ€œ ะฒ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${sm_path}โ€œ "
 "ะปะธะฟัะฒะฐ"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22869,7 +24087,7 @@ msgstr ""
 "ะะตัƒัะฟะตัˆะฝะพ ะดะพัั‚ะฐะฒัะฝะต ะฒ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${displaypath}โ€œ, ะพะฟะธั‚ ะทะฐ ะดะธั€ะตะบั‚ะฝะพ "
 "ะดะพัั‚ะฐะฒัะฝะต ะฝะฐ โ€ž${sha1}โ€œ"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:629
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22878,80 +24096,80 @@ msgstr ""
 "ะŸะพะดะผะพะดัƒะปัŠั‚ ะฒ ะฟัŠั‚ั โ€ž$displaypathโ€œ ะต ะดะพัั‚ะฐะฒะตะฝ, ะฝะพ ะฝะต ััŠะดัŠั€ะถะฐ ะพะฑะตะบั‚ะฐ ััŠั ััƒะผะฐ\n"
 "โ€ž${sha1}โ€œ.  ะ”ะธั€ะตะบั‚ะฝะพั‚ะพ ะดะพัั‚ะฐะฒัะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟะพะดะฐะฒะฐะฝะต ะต ะฝะตัƒัะฟะตัˆะฝะพ."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:636
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "ะะตัƒัะฟะตัˆะฝะพ ะธะทั‚ะตะณะปัะฝะต ะฝะฐ ะฒะตั€ัะธั โ€ž${sha1}โ€œ ะฒ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${displaypath}โ€œ'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:637
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "ะŸัŠั‚ ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${displaypath}โ€œ: ะธะทั‚ะตะณะปะตะฝะฐ ะต ะฒะตั€ัะธั โ€ž${sha1}โ€œ"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "ะะตัƒัะฟะตัˆะฝะพ ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ ะฒะตั€ัะธั โ€ž${sha1}โ€œ ะฒ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป "
 "โ€ž${displaypath}โ€œ"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "ะŸัŠั‚ ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${displaypath}โ€œ: ะฟั€ะตะฑะฐะทะธั€ะฐะฝะต ะฒัŠั€ั…ัƒ ะฒะตั€ัะธั โ€ž${sha1}โ€œ"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "ะะตัƒัะฟะตัˆะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฒะตั€ัะธั โ€ž${sha1}โ€œ ะฒ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${displaypath}โ€œ"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "ะŸัŠั‚ ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${displaypath}โ€œ: ัะปะธะฒะฐะฝะต ั ะฒะตั€ัะธั โ€ž${sha1}โ€œ"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:653
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "ะะตัƒัะฟะตัˆะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ะบะพะผะฐะฝะดะฐั‚ะฐ โ€ž${command} ${sha1}โ€œ ะฒ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป "
 "โ€ž${displaypath}โ€œ"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:654
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "ะŸัŠั‚ ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${displaypath}โ€œ: โ€ž${command} ${sha1}โ€œ"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:685
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 "ะะตัƒัะฟะตัˆะฝะฐ ะพะฑั€ะฐะฑะพั‚ะบะฐ ะฝะฐ ะฟะพะดะดะธั€ะตะบั‚ะพั€ะธะธั‚ะต ะฒ ะฟัŠั‚ั ะบัŠะผ ะฟะพะดะผะพะดัƒะป โ€ž${displaypath}โ€œ"
 
-#: git-submodule.sh:830
+#: git-submodule.sh:896
 msgid "The --cached option cannot be used with the --files option"
 msgstr "ะžะฟั†ะธะธั‚ะต โ€ž--cachedโ€œ ะธ โ€ž--filesโ€œ ัะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะธ"
 
-#: git-submodule.sh:882
+#: git-submodule.sh:948
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "ะฝะตะพั‡ะฐะบะฒะฐะฝ ั€ะตะถะธะผ โ€ž${mod_dst}โ€œ"
 
-#: git-submodule.sh:902
+#: git-submodule.sh:968
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 "  ะŸะ ะ•ะ”ะฃะŸะ ะ•ะ–ะ”ะ•ะะ˜ะ•: โ€ž${display_name}โ€œ ะฝะต ััŠะดัŠั€ะถะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž${sha1_src}โ€œ"
 
-#: git-submodule.sh:905
+#: git-submodule.sh:971
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 "  ะŸะ ะ•ะ”ะฃะŸะ ะ•ะ–ะ”ะ•ะะ˜ะ•: โ€ž${display_name}โ€œ ะฝะต ััŠะดัŠั€ะถะฐ ะฟะพะดะฐะฒะฐะฝะตั‚ะพ โ€ž${sha1_dst}โ€œ"
 
-#: git-submodule.sh:908
+#: git-submodule.sh:974
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
@@ -23278,6 +24496,10 @@ msgstr[0] ""
 msgstr[1] ""
 "ะŸั€ะตะฑะฐะทะธั€ะฐะฝะต ะฝะฐ $shortrevisions ะฒัŠั€ั…ัƒ $shortonto ($todocount ะบะพะผะฐะฝะดะธ)"
 
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "ะŸั€ะฐะทะฝะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั ัะฐ ะบะพะผะตะฝั‚ะธั€ะฐะฝะธ"
+
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
 msgstr "ะกะฟะธััŠะบัŠั‚ ั ะฟั€ะตะทะฐะฟะธัะฐะฝะธั‚ะต ะฟะพะดะฐะฒะฐะฝะธั ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ััŠะทะดะฐะดะตะฝ"
@@ -23350,81 +24572,19 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "ะะฑัะพะปัŽั‚ะฝะธัั‚ ะฟัŠั‚ ะฝะฐ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฟั€ะตะดะตะปะธ"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%14s %14s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "ะฒ ะธะฝะดะตะบัะฐ"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "ะธะทะฒัŠะฝ ะธะฝะดะตะบัะฐ"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "ะดะฒะพะธั‡ะฝะพ"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "ะฝะธั‰ะพ"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "ะฝัะผะฐ ะฟั€ะพะผะตะฝะธ"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "%d ั„ะฐะนะป ะดะพะฑะฐะฒะตะฝ\n"
-msgstr[1] "%d ั„ะฐะนะปะฐ ะดะพะฑะฐะฒะตะฝะธ\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "%d ั„ะฐะนะป ะพะฑะฝะพะฒะตะฝ\n"
-msgstr[1] "%d ั„ะฐะนะปะฐ ะพะฑะฝะพะฒะตะฝะธ\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "%d ั„ะฐะนะป ั ะพั‚ะผะตะฝะตะฝะธ ะฟั€ะพะผะตะฝะธ\n"
-msgstr[1] "%d ั„ะฐะนะปะฐ ั ะพั‚ะผะตะฝะตะฝะธ ะฟั€ะพะผะตะฝะธ\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d ั„ะฐะนะป ะทะฐัะตะณะฝะฐั‚\n"
 msgstr[1] "%d ั„ะฐะนะปะฐ ะทะฐัะตะณะฝะฐั‚ะธ\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "ะžั‚ะผัะฝะฐ"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "ะ‘ะ•ะ›ะ•ะ–ะšะ: โ€ž%sโ€œ ะฒะตั‡ะต ะฝะต ัะต ัะปะตะดะธ.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธ"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "ะัะผะฐ ะฝะตัะปะตะดะตะฝะธ ั„ะฐะนะปะพะฒะต.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -23433,7 +24593,7 @@ msgstr ""
 "ะฝะตะทะฐะฑะฐะฒะฝะพ\n"
 "ะดะพะฑะฐะฒะตะฝะพ ะบัŠะผ ะธะฝะดะตะบัะฐ"
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -23442,7 +24602,7 @@ msgstr ""
 "ะฝะตะทะฐะฑะฐะฒะฝะพ\n"
 "ัะบัŠั‚ะฐะฝะพ"
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -23451,8 +24611,8 @@ msgstr ""
 "ะฝะตะทะฐะฑะฐะฒะฝะพ\n"
 "ะธะทะฒะฐะดะตะฝะพ ะพั‚ ะธะฝะดะตะบัะฐ."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -23461,8 +24621,8 @@ msgstr ""
 "ะฝะตะทะฐะฑะฐะฒะฝะพ\n"
 "ะฝะฐะฑะตะปัะทะฐะฝะพ ะทะฐ ะฟั€ะธะปะฐะณะฐะฝะต."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -23471,16 +24631,12 @@ msgstr ""
 "ะฝะตะทะฐะฑะฐะฒะฝะพ\n"
 "ะฝะฐะฑะตะปัะทะฐะฝะพ ะทะฐ ะทะฐะฝัƒะปัะฒะฐะฝะต."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "ั„ะฐะนะปัŠั‚ ะทะฐ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะบะพะด ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ: โ€ž%sโ€œ"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "ะ ัŠั‡ะฝะพ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะฐ ะบะพะด โ€” ะพั‚ะดะพะปัƒ ะธะผะฐ ะฟะพะดัะบะฐะทะบะฐ.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -23494,38 +24650,13 @@ msgstr ""
 "ะ—ะฐ ะดะฐ ะฟั€ะพะฟัƒัะฝะตั‚ะต ั€ะตะดะพะฒะตั‚ะต ะทะฐะฟะพั‡ะฒะฐั‰ะธ ั โ€ž%sโ€œ โ€” ะธะทั‚ั€ะธะนั‚ะต ะณะธ.\n"
 "ะ ะตะดะพะฒะตั‚ะต, ะบะพะธั‚ะพ ะทะฐะฟะพั‡ะฒะฐั‚ ั โ€ž%sโ€œ ั‰ะต ะฑัŠะดะฐั‚ ะฟั€ะพะฟัƒัะฝะฐั‚ะธ.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"ะะบะพ ะต ะฝะตะฒัŠะทะผะพะถะฝะพ ั‡ะธัั‚ะพ ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบะพะดะฐ, ั‰ะต ะผะพะถะต ะฟะฐะบ ะดะฐ ั€ะตะดะฐะบั‚ะธั€ะฐั‚ะต.  ะะบะพ\n"
-"ะธะทั‚ั€ะธะตั‚ะต ะฒัะธั‡ะบะธ ั€ะตะดะพะฒะต ะพั‚ ะฟะฐั€ั‡ะตั‚ะพ ะบะพะด, ั‚ะพ ั‰ะต ะฑัŠะดะต ะพัั‚ะฐะฒะตะฝะพ ะฝะตะฟั€ะพะผะตะฝะตะฝะพ, ะฐ\n"
-"ั€ะตะดะฐะบั‚ะธั€ะฐะฝะตั‚ะพ โ€” ะพั‚ะบะฐะทะฐะฝะพ.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 "ั„ะฐะนะปัŠั‚ ะทะฐ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะบะพะด ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะพั‚ะฒะพั€ะตะฝ ะทะฐ ั‡ะตั‚ะตะฝะต: โ€ž%sโ€œ"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"ะ ะตะดะฐะบั‚ะธั€ะฐะฝะพั‚ะพ ะฟะฐั€ั‡ะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะธะปะพะถะธ.  ะ”ะฐ ัะต ะฟั€ะพะดัŠะปะถะธ ะปะธ ั "
-"ั€ะตะดะฐะบั‚ะธั€ะฐะฝะตั‚ะพ? (ั‚ะตะบัƒั‰ะธั‚ะต ั€ะตะดะฐะบั†ะธะธ ั‰ะต ัะต ะพั‚ะผะตะฝัั‚ ะฟั€ะธ ะพั‚ะบะฐะท!): โ€žyโ€œ (ะดะฐ)/ "
-"โ€žnโ€œ (ะฝะต)? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23539,7 +24670,7 @@ msgstr ""
 "a โ€” ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะฒ ะธะฝะดะตะบัะฐ\n"
 "d โ€” ะฑะตะท ะดะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะฒ ะธะฝะดะตะบัะฐ"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23553,7 +24684,7 @@ msgstr ""
 "a โ€” ัะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ\n"
 "d โ€” ะฑะตะท ัะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23567,7 +24698,7 @@ msgstr ""
 "a โ€” ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ\n"
 "d โ€” ะฑะตะท ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23581,7 +24712,7 @@ msgstr ""
 "a โ€” ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะบัŠะผ ะธะฝะดะตะบัะฐ\n"
 "d โ€” ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะบัŠะผ ะธะฝะดะตะบัะฐ"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23598,7 +24729,7 @@ msgstr ""
 "d โ€” ะฑะตะท ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ "
 "ะดัŠั€ะฒะพ"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23615,7 +24746,7 @@ msgstr ""
 "d โ€” ะฑะตะท ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ ะธ "
 "ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23632,7 +24763,7 @@ msgstr ""
 "d โ€” ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ ะพั‚ ะธะฝะดะตะบัะฐ ะธ "
 "ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23646,7 +24777,7 @@ msgstr ""
 "a โ€” ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ\n"
 "d โ€” ะฑะตะท ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะธ ะฒัะธั‡ะบะธ ัะปะตะดะฒะฐั‰ะธ ะฟะฐั€ั‡ะตั‚ะฐ ะพั‚ ั„ะฐะนะปะฐ"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23668,237 +24799,87 @@ msgstr ""
 "e โ€” ั€ัŠั‡ะฝะพ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต ะฝะฐ ั‚ะตะบัƒั‰ะพั‚ะพ ะฟะฐั€ั‡ะต\n"
 "? โ€” ะธะทะฒะตะถะดะฐะฝะต ะฝะต ะฟะพะผะพั‰ั‚ะฐ\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "ะ˜ะทะฑั€ะฐะฝะธั‚ะต ะฟะฐั€ั‡ะตั‚ะฐ ะฝะต ะผะพะณะฐั‚ ะดะฐ ัะต ะดะพะฑะฐะฒัั‚ ะฒ ะธะฝะดะตะบัะฐ!\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "ะ”ะฐ ัะต ะฟั€ะธะปะพะถะฐั‚ ะปะธ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "ะะธั‰ะพ ะฝะต ะต ะฟั€ะธะปะพะถะตะฝะพ.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ะฟั€ะตะฝะตะฑั€ะตะณะฒะฐะฝะต ะฝะฐ ะฝะตัะปัั‚ะพั‚ะพ: โ€ž%sโ€œ\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "ะกะฐะผะพ ะดะฒะพะธั‡ะฝะธ ั„ะฐะนะปะพะฒะต ัะฐ ะฟั€ะพะผะตะฝะตะฝะธ.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "ะัะผะฐ ะฟั€ะพะผะตะฝะธ.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐ"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟะฐั€ั‡ะต [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "ะกะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "ะกะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "ะกะบะฐั‚ะฐะฒะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟะฐั€ั‡ะต [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "ะ˜ะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "ะ˜ะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "ะ˜ะทะฒะฐะถะดะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟะฐั€ั‡ะต [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr ""
-"ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฝะฐ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะบัŠะผ ะธะฝะดะตะบัะฐ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะบัŠะผ ะธะฝะดะตะบัะฐ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ั‚ะพะฒะฐ ะฟะฐั€ั‡ะต ะบัŠะผ ะธะฝะดะตะบัะฐ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฒ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฒ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,"
-"n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฒ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,"
-"q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะพั‚ ะธะฝะดะตะบัะฐ ะธ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1468
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟั€ะพะผัะฝะฐั‚ะฐ ะฒ ะฟั€ะฐะฒะฐั‚ะฐ ะทะฐ ะดะพัั‚ัŠะฟ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d"
 "%s,?]? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1469
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะธะทั‚ั€ะธะฒะฐะฝะตั‚ะพ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1470
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "ะŸั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะฐั€ั‡ะตั‚ะพ ะบัŠะผ ั€ะฐะฑะพั‚ะฝะพั‚ะพ ะดัŠั€ะฒะพ [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "ะัะผะฐ ะดั€ัƒะณะธ ะฟะฐั€ั‡ะตั‚ะฐ\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "ะบัŠะผ ะบะพะต ะฟะฐั€ั‡ะต ะดะฐ ัะต ะฟั€ะธะดะฒะธะถะธ (ะทะฐ ะฟะพะฒะตั‡ะต ะฒะฐั€ะธะฐะฝั‚ะธ ะฝะฐั‚ะธัะฝะตั‚ะต โ€ženterโ€œ)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "ะบัŠะผ ะบะพะต ะฟะฐั€ั‡ะต ะดะฐ ัะต ะฟั€ะธะดะฒะธะถะธ? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "ะะตะฟั€ะฐะฒะธะปะตะฝ ะฝะพะผะตั€: โ€ž%sโ€œ\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "ะ˜ะผะฐ ัะฐะผะพ %d ะฟะฐั€ั‡ะต.\n"
 msgstr[1] "ะ˜ะผะฐ ัะฐะผะพ %d ะฟะฐั€ั‡ะตั‚ะฐ.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "ะัะผะฐ ะดั€ัƒะณะธ ะฟะฐั€ั‡ะตั‚ะฐ ะทะฐ ั‚ัŠั€ัะตะฝะต\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "ะดะฐ ัะต ั‚ัŠั€ัะธ ั ั€ะตะณัƒะปัั€ะตะฝ ะธะทั€ะฐะท? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "ะกะณั€ะตัˆะตะฝ ั€ะตะณัƒะปัั€ะตะฝ ะธะทั€ะฐะท โ€ž%sโ€œ: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
 msgstr "ะะธะบะพะต ะฟะฐั€ั‡ะต ะฝะต ะฝะฐะฟะฐัะฒะฐ ะฝะฐ ั€ะตะณัƒะปัั€ะฝะธั ะธะทั€ะฐะท\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "ะัะผะฐ ะดั€ัƒะณะพ ะฟะฐั€ั‡ะต ะฟั€ะตะดะธ ั‚ะพะฒะฐ\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "ะัะผะฐ ะดั€ัƒะณะพ ะฟะฐั€ั‡ะต ัะปะตะด ั‚ะพะฒะฐ\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "ะขะพะฒะฐ ะฟะฐั€ั‡ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ั€ะฐะทะดะตะปะตะฝะพ\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "ะ ะฐะทะดะตะปัะฝะต ะฝะฐ %d ะฟะฐั€ั‡ะต.\n"
 msgstr[1] "ะ ะฐะทะดะตะปัะฝะต ะฝะฐ %d ะฟะฐั€ั‡ะตั‚ะฐ.\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "ะขะพะฒะฐ ะฟะฐั€ั‡ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ั€ะตะดะฐะบั‚ะธั€ะฐะฝะพ\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "ะŸั€ะตะณะปะตะด ะฝะฐ ั€ะฐะทะปะธะบะฐั‚ะฐ"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23919,19 +24900,19 @@ msgstr ""
 "                ะธ ะธะฝะดะตะบัะฐ\n"
 "add untracked โ€” ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะบัŠะผ ะฟั€ะพะผะตะฝะธั‚ะต ะฒ ะธะฝะดะตะบัะฐ\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "โ€ž--โ€œ ะปะธะฟัะฒะฐ"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "ะฝะตะธะทะฒะตัั‚ะฝะฐ ัั‚ั€ะฐั‚ะตะณะธั ะทะฐ ะฟั€ะธะปะฐะณะฐะฝะต ะฝะฐ ะบั€ัŠะฟะบะฐ: โ€ž%sโ€œ"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "ัƒะบะฐะทะฐะฝ ะต ะฝะตะฟั€ะฐะฒะธะปะตะฝ ะฐั€ะณัƒะผะตะฝั‚ โ€ž%sโ€œ, ะฐ ัะต ะพั‡ะฐะบะฒะฐ โ€ž--โ€œ."
diff --git a/third_party/git/po/ca.po b/third_party/git/po/ca.po
index 73a08242c324..e324c8055118 100644
--- a/third_party/git/po/ca.po
+++ b/third_party/git/po/ca.po
@@ -1,7 +1,7 @@
 # Catalan translations for Git.
 # This file is distributed under the same license as the Git package.
 # Alex Henrie <alexhenrie24@gmail.com>, 2014-2016.
-# Jordi Mas i Hernร ndez <jmas@softcatala.org>, 2016-2019
+# Jordi Mas i Hernร ndez <jmas@softcatala.org>, 2016-2020
 #
 # Terminologia i criteris utilitzats
 #
@@ -49,8 +49,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-07-30 09:59+0800\n"
-"PO-Revision-Date: 2019-07-30 08:23+0200\n"
+"POT-Creation-Date: 2019-12-30 08:48+0800\n"
+"PO-Revision-Date: 2020-01-09 10:10+0100\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
@@ -58,39 +58,464 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.4\n"
 
-#: advice.c:109
+#: add-interactive.c:347
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Perdรณ (%s)?"
+
+#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216
+#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643
+#: builtin/rebase.c:2019 builtin/rebase.c:2063
+msgid "could not read index"
+msgstr "no s'ha pogut llegir l'รญndex"
+
+#: add-interactive.c:555 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binari"
+
+#: add-interactive.c:613 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "res"
+
+#: add-interactive.c:614 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "sense canvis"
+
+#: add-interactive.c:651 git-add--interactive.perl:643
+msgid "Update"
+msgstr "Actualitza"
+
+#: add-interactive.c:668 add-interactive.c:856
+#, c-format
+msgid "could not stage '%s'"
+msgstr "no s'ha pogut fer ยซstageยป ยซ%sยป"
+
+#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409
+#: builtin/rebase.c:895
+msgid "could not write index"
+msgstr "no s'ha pogut escriure l'รญndex"
+
+#: add-interactive.c:677 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "actualitzat %d camรญ\n"
+msgstr[1] "actualitzats %d camins\n"
+
+#: add-interactive.c:695 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "nota: %s estร  ara sense seguiment.\n"
+
+#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry ha fallat per al camรญ ยซ%sยป"
+
+#: add-interactive.c:730 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "Reverteix"
+
+#: add-interactive.c:746
+msgid "Could not parse HEAD^{tree}"
+msgstr "No s'ha pogut analitzar HEAD^{tree}"
+
+#: add-interactive.c:784 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "revertit %d camรญ\n"
+msgstr[1] "revertits %d camins\n"
+
+#: add-interactive.c:835 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Sense fitxers no seguits.\n"
+
+#: add-interactive.c:839 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "Afegeix sense seguiment"
+
+#: add-interactive.c:866 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "afegit %d camรญ\n"
+msgstr[1] "afegits %d camins\n"
+
+#: add-interactive.c:896
+#,  c-format
+msgid "ignoring unmerged: %s"
+msgstr "s'estร  ignorant allรฒ no fusionat: %s"
+
+#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Nomรฉs s'han canviat els fitxers binaris.\n"
+
+#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "Sense canvis.\n"
+
+#: add-interactive.c:914 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "Actualitzaciรณ del pedaรง"
+
+#: add-interactive.c:953 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "Reviseu les diferรจncies"
+
+#: add-interactive.c:981
+msgid "show paths with changes"
+msgstr "mostra els camins amb canvis"
+
+#: add-interactive.c:983
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+
+#: add-interactive.c:985
+msgid "revert staged set of changes back to the HEAD version"
+msgstr ""
+
+#: add-interactive.c:987
+msgid "pick hunks and update selectively"
+msgstr "selecciona els trossos i actualitza selectivament"
+
+#: add-interactive.c:989
+msgid "view diff between HEAD and index"
+msgstr "visualitza les diferรจncies entre HEAD i l'รญndex"
+
+#: add-interactive.c:991
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+
+#: add-interactive.c:999 add-interactive.c:1048
+msgid "Prompt help:"
+msgstr "Mostra ajuda:"
+
+#: add-interactive.c:1001
+msgid "select a single item"
+msgstr "seleccioneu un รบnic รญtem"
+
+#: add-interactive.c:1003
+msgid "select a range of items"
+msgstr "seleccioneu un rang d'รญtems"
+
+#: add-interactive.c:1005
+msgid "select multiple ranges"
+msgstr "seleccioneu rangs mรบltiples"
+
+#: add-interactive.c:1007 add-interactive.c:1052
+msgid "select item based on unique prefix"
+msgstr "seleccioneu un รญtem basant-se en un prefix รบnic"
+
+#: add-interactive.c:1009
+msgid "unselect specified items"
+msgstr "desselecciona els รญtems especificats"
+
+#: add-interactive.c:1011
+msgid "choose all items"
+msgstr "escolliu tots els รญtems"
+
+#: add-interactive.c:1013
+msgid "(empty) finish selecting"
+msgstr "(buit) finalitza la selecciรณ"
+
+#: add-interactive.c:1050
+msgid "select a numbered item"
+msgstr "seleccioneu un รญtem numerat"
+
+#: add-interactive.c:1054
+msgid "(empty) select nothing"
+msgstr "(buit) no seleccionis res"
+
+#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** Ordres ***"
+
+#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "I ara quรจ"
+
+#: add-interactive.c:1115 git-add--interactive.perl:213
+msgid "staged"
+msgstr "staged"
+
+#: add-interactive.c:1115 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "unstaged"
+
+#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197
+#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213
+msgid "path"
+msgstr "camรญ"
+
+#: add-interactive.c:1122
+msgid "could not refresh index"
+msgstr "no s'ha pogut actualitzar l'รญndex"
+
+#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "Adรฉu.\n"
+
+#: add-patch.c:15
+#, c-format
+msgid "Stage mode change [y,n,a,q,d%s,?]? "
+msgstr "Canvia el mode de ยซstageยป [y,n,a,q,d%s,?]? "
+
+#: add-patch.c:16
+#, c-format
+msgid "Stage deletion [y,n,a,q,d%s,?]? "
+msgstr "Suprimeix ยซstageยป [y,n,a,q,d%s,?]? "
+
+#: add-patch.c:17
+#, c-format
+msgid "Stage this hunk [y,n,a,q,d%s,?]? "
+msgstr "Fer un ยซstageยป d'aquest tros [y,n,a,q,d%s,?]? "
+
+#: add-patch.c:111
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "no s'ha pogut analitzar la capรงalera del tros ยซ%.*sยป"
+
+#: add-patch.c:130 add-patch.c:134
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "no s'ha pogut analitzar la capรงalera del tros acolorida ยซ%.*sยป"
+
+#: add-patch.c:176
+msgid "could not parse diff"
+msgstr "no s'ha pogut analitzar el diff"
+
+#: add-patch.c:194
+msgid "could not parse colored diff"
+msgstr "no s'ha pogut analitzar el diff acolorit"
+
+#: add-patch.c:508
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"s'esperava la lรญnia amb contingut #%d a\n"
+"%.*s"
+
+
+#: add-patch.c:523
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+
+#: add-patch.c:799 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+"Mode d'ediciรณ de trossos manual - vegeu mรฉs avall per una guia rร pida.\n"
+
+#: add-patch.c:803
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Per suprimir ยซ%cยป lรญnies, convertiu-les a ' ' (context).\n"
+"Per suprimir ยซ%cยป lรญnies, suprimiu-les.\n"
+"Les lรญnies que comencin per %c seran suprimides.\n"
+
+#: add-patch.c:810
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging.\n"
+msgstr ""
+"Si el pedaรง s'aplica correctament, el tros editat es marcarร  immediatament\n"
+"per ยซstagingยป.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:818 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
+"de nou. Si totes les lรญnies del tros se suprimeixen, llavors l'ediciรณ "
+"s'avorta\n"
+"i el tros es deixa sense cap canvi.\n"
+
+#: add-patch.c:851
+msgid "could not parse hunk header"
+msgstr "no s'ha pogut analitzar la capรงalera del tros"
+
+#: add-patch.c:895 add-patch.c:1294
+msgid "'git apply --cached' failed"
+msgstr ""
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:952 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es "
+"descartarร ) [y/n]? "
+
+#: add-patch.c:1009
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this and all the remaining hunks\n"
+"d - do not stage this hunk nor any of the remaining hunks\n"
+msgstr ""
+"y - fes ยซstageยป d'aquest tros\n"
+"n - no facis ยซstageยป d'aquest tros\n"
+"q - surt; no facis ยซstageยป d'aquest tros o de cap altre restant\n"
+"a - fes ยซstageยป d'aquest tros i de tota la resta de trossos del fitxer\n"
+"d - no facis ยซstageยป d'aquest tros o de cap altre restant del fitxer\n"
+
+#: add-patch.c:1016
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - deixa aquest tros sense decidir, veure el tros sense decidir segรผent\n"
+"J - deixa aquest tros sense decidir, veure el tros segรผent\n"
+"k - deixa aquest tros sense decidir, veure el tros sense decidir anterior\n"
+"K - deixa aquest tros sense decidir, veure el tros anterior\n"
+"g - selecciona el tros on voleu anar\n"
+"/ - cerca un tros que coincideixi amb l'expressiรณ regular donada\n"
+"s - divideix el tros actual en trossos mรฉs petits\n"
+"e - edita manualment el tros actual\n"
+"? - mostra l'ajuda\n"
+
+#: add-patch.c:1137 add-patch.c:1147
+msgid "No previous hunk"
+msgstr "Sense tros previ"
+
+#: add-patch.c:1142 add-patch.c:1152
+msgid "No next hunk"
+msgstr "No hi ha tros segรผent"
+
+#: add-patch.c:1158
+msgid "No other hunks to goto"
+msgstr "No hi ha altres trossos on anar-hi"
+
+#: add-patch.c:1169 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "vรฉs a quin tros (<ret> per veure'n mรฉs)? "
+
+#: add-patch.c:1170 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "vรฉs a quin tros? "
+
+#: add-patch.c:1181
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Nรบmero no vร lid: ยซ%sยป"
+
+#: add-patch.c:1186
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Nomรฉs %d tros disponible."
+msgstr[1] "Nomรฉs %d trossos disponibles."
+
+#: add-patch.c:1195
+msgid "No other hunks to search"
+msgstr "No hi ha cap altre tros a cercar"
+
+#: add-patch.c:1201 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "cerca per expressiรณ regular? "
+
+#: add-patch.c:1216
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Expressiรณ regular de cerca mal formada %s: %s"
+
+#: add-patch.c:1233
+msgid "No hunk matches the given pattern"
+msgstr "No hi ha trossos que coincideixin amb el patrรณ donat"
+
+#: add-patch.c:1240
+msgid "Sorry, cannot split this hunk"
+msgstr "No es pot dividir aquest tros"
+
+#: add-patch.c:1244
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Divideix en %d trossos."
+
+#: add-patch.c:1248
+msgid "Sorry, cannot edit this hunk"
+msgstr "No es pot editar aquest tros"
+
+#: advice.c:111
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%spista: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:164
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Fer ยซcherry pickยป no รฉs possible perquรจ teniu fitxers sense fusionar."
 
-#: advice.c:164
+#: advice.c:166
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Cometre no รฉs possible perquรจ teniu fitxers sense fusionar."
 
-#: advice.c:166
+#: advice.c:168
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Fusionar no รฉs possible perquรจ teniu fitxers sense fusionar."
 
-#: advice.c:168
+#: advice.c:170
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Baixar no รฉs possible perquรจ teniu fitxers sense fusionar."
 
-#: advice.c:170
+#: advice.c:172
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Revertir no รฉs possible perquรจ teniu fitxers sense fusionar."
 
-#: advice.c:172
+#: advice.c:174
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "No รฉs possible %s perquรจ teniu fitxers sense fusionar."
 
-#: advice.c:180
+#: advice.c:182
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -99,23 +524,23 @@ msgstr ""
 "'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
 "resoluciรณ i feu una comissiรณ."
 
-#: advice.c:188
+#: advice.c:190
 msgid "Exiting because of an unresolved conflict."
 msgstr "S'estร  sortint a causa d'un conflicte no resolt."
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:195 builtin/merge.c:1332
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No heu conclรฒs la vostra fusiรณ (MERGE_HEAD existeix)."
 
-#: advice.c:195
+#: advice.c:197
 msgid "Please, commit your changes before merging."
 msgstr "Cometeu els vostres canvis abans de fusionar."
 
-#: advice.c:196
+#: advice.c:198
 msgid "Exiting because of unfinished merge."
 msgstr "S'estร  sortint a causa d'una fusiรณ no terminada."
 
-#: advice.c:202
+#: advice.c:204
 #, fuzzy, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -137,7 +562,7 @@ msgid ""
 "false\n"
 "\n"
 msgstr ""
-"Avรญs: s'estร  agafant ยซ%sยป.\n"
+"Avรญs: s'estร  canviant a ยซ%sยป.\n"
 "\n"
 "Esteu en un estat de ยซHEAD separatยป. Podeu mirar al voltant, fer canvis\n"
 "experimentals i cometre'ls, i podeu descartar qualsevol comissiรณ que feu\n"
@@ -238,17 +663,7 @@ msgstr "mode no vร lid en la lรญnia %d: %s"
 msgid "inconsistent header lines %d and %d"
 msgstr "lรญnies de capรงalera %d i %d inconsistents"
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recompte: lรญnia inesperada: %.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragment de pedaรง sense capรงalera a la lรญnia %d: %.*s"
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -263,83 +678,93 @@ msgstr[1] ""
 "a la capรงalera de git diff li manca informaciรณ de nom de fitxer en eliminar "
 "%d components de nom de camรญ inicial (lรญnia %d)"
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "a la capรงalera de git diff li manca informaciรณ de nom de fitxer (lรญnia %d)"
 
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recompte: lรญnia inesperada: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragment de pedaรง sense capรงalera a la lรญnia %d: %.*s"
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "el fitxer nou depรจn dels continguts antics"
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "el fitxer suprimit encara tรฉ continguts"
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "pedaรง malmรจs a la lรญnia %d"
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "el fitxer nou %s depรจn dels continguts antics"
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el fitxer suprimit %s encara tรฉ continguts"
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** advertรจncia: el fitxer %s queda buit perรฒ no se suprimeix"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "pedaรง binari malmรจs a la lรญnia %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "pedaรง binari no reconegut a la lรญnia %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "pedaรง amb nomรฉs escombraries a la lรญnia %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaรง simbรฒlic %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no s'ha pogut obrir o llegir %s"
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "inici de lรญnia no vร lid: ยซ%cยป"
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "El tros #%d ha tingut รจxit a %d (desplaรงament d'%d lรญnia)."
 msgstr[1] "El tros #%d ha tingut รจxit a %d (desplaรงament de %d lรญnies)."
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "El context s'ha reduรฏt a (%ld/%ld) per a aplicar el fragment a %d"
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -348,23 +773,23 @@ msgstr ""
 "tot cercant:\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "manquen les dades de pedaรง binari de ยซ%sยป"
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "no es pot aplicar al revรฉs un pedaรง binari sense el tros revรฉs a ยซ%sยป"
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "no es pot aplicar un pedaรง binari a ยซ%sยป sense la lรญnia d'รญndex completa"
 
-#: apply.c:3151
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -372,289 +797,284 @@ msgstr ""
 "el pedaรง s'aplica a ยซ%sยป (%s), el qual no coincideix amb els continguts "
 "actuals."
 
-#: apply.c:3159
+#: apply.c:3170
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "el pedaรง s'aplica a un ยซ%sยป buit perรฒ no รฉs buit"
 
-#: apply.c:3177
+#: apply.c:3188
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "no es pot llegir la postimatge %s necessร ria per a ยซ%sยป"
 
-#: apply.c:3190
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el pedaรง binari no s'aplica a ยซ%sยป"
 
-#: apply.c:3196
+#: apply.c:3207
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "el pedaรง binari a ยซ%sยป crea un resultat incorrecte (s'esperava %s, s'ha "
 "rebut %s)"
 
-#: apply.c:3217
+#: apply.c:3228
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el pedaรง ha fallat: %s:%ld"
 
-#: apply.c:3340
+#: apply.c:3351
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no es pot agafar %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280
 #, c-format
 msgid "failed to read %s"
 msgstr "s'ha produรฏt un error en llegir %s"
 
-#: apply.c:3400
+#: apply.c:3411
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "s'estร  llegint de ยซ%sยป mรฉs enllร  d'un enllaรง simbรฒlic"
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3440 apply.c:3683
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "el camรญ %s s'ha canviat de nom / s'ha suprimit"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3526 apply.c:3698
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existeix en l'รญndex"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3535 apply.c:3706
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no coincideix amb l'รญndex"
 
-#: apply.c:3559
+#: apply.c:3570
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "al dipรฒsit li manca el blob necessari per a retrocedir a una fusiรณ de 3 vies."
 
-#: apply.c:3562
+#: apply.c:3573
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "S'estร  retrocedint a una fusiรณ de 3 vies...\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3589 apply.c:3593
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no es poden llegir els continguts actuals de ยซ%sยป"
 
-#: apply.c:3594
+#: apply.c:3605
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "S'ha produรฏt un error en retrocedir a una fusiรณ de 3 vies...\n"
 
-#: apply.c:3608
+#: apply.c:3619
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "S'ha aplicat el pedaรง a ยซ%sยป amb conflictes.\n"
 
-#: apply.c:3613
+#: apply.c:3624
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "S'ha aplicat el pedaรง a ยซ%sยป netament.\n"
 
-#: apply.c:3639
+#: apply.c:3650
 msgid "removal patch leaves file contents"
 msgstr "el pedaรง d'eliminaciรณ deixa els continguts dels fitxers"
 
-#: apply.c:3712
+#: apply.c:3723
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipus erroni"
 
-#: apply.c:3714
+#: apply.c:3725
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s รฉs del tipus %o, s'esperava %o"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1320
 #, c-format
 msgid "invalid path '%s'"
 msgstr "camรญ no vร lid: ยซ%sยป"
 
-#: apply.c:3923
+#: apply.c:3934
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ja existeix en l'รญndex"
 
-#: apply.c:3926
+#: apply.c:3937
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ja existeix en el directori de treball"
 
-#: apply.c:3946
+#: apply.c:3957
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
 
-#: apply.c:3951
+#: apply.c:3962
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
 
-#: apply.c:3971
+#: apply.c:3982
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "el fitxer afectat ยซ%sยป รฉs mรฉs enllร  d'un enllaรง simbรฒlic"
 
-#: apply.c:3975
+#: apply.c:3986
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el pedaรง no s'aplica"
 
-#: apply.c:3990
+#: apply.c:4001
 #, c-format
 msgid "Checking patch %s..."
 msgstr "S'estร  comprovant el pedaรง %s..."
 
-#: apply.c:4082
+#: apply.c:4093
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "falta la informaciรณ sha1 o รฉs inรบtil per al submรฒdul %s"
 
-#: apply.c:4089
+#: apply.c:4100
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "canvi de mode per a %s, el qual no estร  en la HEAD actual"
 
-#: apply.c:4092
+#: apply.c:4103
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta informaciรณ sha1 o รฉs inรบtil (%s)."
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry ha fallat per al camรญ ยซ%sยป"
-
-#: apply.c:4101
+#: apply.c:4112
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no s'ha pogut afegir %s a l'รญndex temporal"
 
-#: apply.c:4111
+#: apply.c:4122
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no s'ha pogut escriure l'รญndex temporal a %s"
 
-#: apply.c:4249
+#: apply.c:4260
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no s'ha pogut eliminar %s de l'รญndex"
 
-#: apply.c:4283
+#: apply.c:4294
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "pedaรง malmรจs per al submรฒdul %s"
 
-#: apply.c:4289
+#: apply.c:4300
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no s'ha pogut fer stat al fitxer novament creat ยซ%sยป"
 
-#: apply.c:4297
+#: apply.c:4308
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
 "%s"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4314 apply.c:4459
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "no s'ha pogut afegir una entrada de cau per a %s"
 
-#: apply.c:4346
+#: apply.c:4357
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "no s'ha pogut escriure a ยซ%sยป"
 
-#: apply.c:4350
+#: apply.c:4361
 #, c-format
 msgid "closing file '%s'"
 msgstr "s'estร  tancant el fitxer ยซ%sยป"
 
-#: apply.c:4420
+#: apply.c:4431
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no s'ha pogut escriure el fitxer ยซ%sยป mode %o"
 
-#: apply.c:4518
+#: apply.c:4529
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "El pedaรง %s s'ha aplicat netament."
 
-#: apply.c:4526
+#: apply.c:4537
 msgid "internal error"
 msgstr "error intern"
 
-#: apply.c:4529
+#: apply.c:4540
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "S'estร  aplicant el pedaรง %%s amb %d rebuig..."
 msgstr[1] "S'estร  aplicant el pedaรง %%s amb %d rebutjos..."
 
-#: apply.c:4540
+#: apply.c:4551
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "s'estร  truncant el nom del fitxer .rej a %.*s.rej"
 
-#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
+#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192
 #, c-format
 msgid "cannot open %s"
 msgstr "no es pot obrir %s"
 
-#: apply.c:4562
+#: apply.c:4573
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "El tros #%d s'ha aplicat netament."
 
-#: apply.c:4566
+#: apply.c:4577
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "S'ha rebutjat el tros #%d."
 
-#: apply.c:4676
+#: apply.c:4696
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "S'ha omรจs el pedaรง ยซ%sยป."
 
-#: apply.c:4684
+#: apply.c:4704
 msgid "unrecognized input"
 msgstr "entrada no reconeguda"
 
-#: apply.c:4704
+#: apply.c:4724
 msgid "unable to read index file"
 msgstr "no es pot llegir el fitxer d'รญndex"
 
-#: apply.c:4859
+#: apply.c:4881
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no es pot obrir el pedaรง ยซ%sยป: %s"
 
-#: apply.c:4886
+#: apply.c:4908
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "s'ha silenciat %d error d'espai en blanc"
 msgstr[1] "s'han silenciat %d errors d'espai en blanc"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4914 apply.c:4929
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d lรญnia afegeix errors d'espai en blanc."
 msgstr[1] "%d lรญnies afegeixen errors d'espai en blanc."
 
-#: apply.c:4900
+#: apply.c:4922
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -663,144 +1083,135 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han aplicat %d lรญnies desprรฉs d'arreglar els errors d'espai en blanc."
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390
 msgid "Unable to write new index file"
 msgstr "No s'ha pogut escriure un fitxer d'รญndex nou"
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "camรญ"
-
-#: apply.c:4944
+#: apply.c:4966
 msgid "don't apply changes matching the given path"
 msgstr "no apliquis els canvis que coincideixin amb el camรญ donat"
 
-#: apply.c:4947
+#: apply.c:4969
 msgid "apply changes matching the given path"
 msgstr "aplica els canvis que coincideixin amb el camรญ donat"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4971 builtin/am.c:2206
 msgid "num"
 msgstr "nรบmero"
 
-#: apply.c:4950
+#: apply.c:4972
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "elimina <nombre> barres obliqรผes inicials dels camins de diferรจncia "
 "tradicionals"
 
-#: apply.c:4953
+#: apply.c:4975
 msgid "ignore additions made by the patch"
 msgstr "ignora afegiments fets pel pedaรง"
 
-#: apply.c:4955
+#: apply.c:4977
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "en lloc d'aplicar el pedaรง, emet les estadรญstiques de diferรจncia de l'entrada"
 
-#: apply.c:4959
+#: apply.c:4981
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "mostra el nombre de lรญnies afegides i suprimides en notaciรณ decimal"
 
-#: apply.c:4961
+#: apply.c:4983
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "en lloc d'aplicar el pedaรง, emet un resum de l'entrada"
 
-#: apply.c:4963
+#: apply.c:4985
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "en lloc d'aplicar el pedaรง, veges si el pedaรง รฉs aplicable"
 
-#: apply.c:4965
+#: apply.c:4987
 msgid "make sure the patch is applicable to the current index"
 msgstr "assegura que el pedaรง sigui aplicable a l'รญndex actual"
 
-#: apply.c:4967
+#: apply.c:4989
 msgid "mark new files with `git add --intent-to-add`"
 msgstr ""
 
-#: apply.c:4969
+#: apply.c:4991
 msgid "apply a patch without touching the working tree"
 msgstr "aplica un pedaรง sense tocar l'arbre de treball"
 
-#: apply.c:4971
+#: apply.c:4993
 msgid "accept a patch that touches outside the working area"
 msgstr "accepta un pedaรง que toqui fora de l'ร rea de treball"
 
-#: apply.c:4974
+#: apply.c:4996
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "aplica el pedaรง tambรฉ (useu amb --stat/--summary/--check)"
 
-#: apply.c:4976
+#: apply.c:4998
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "intenta una fusiรณ de tres vies si el pedaรง no s'aplica"
 
-#: apply.c:4978
+#: apply.c:5000
 msgid "build a temporary index based on embedded index information"
 msgstr "construeix un รญndex temporal basat en la informaciรณ d'รญndex incrustada"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr "els camins se separen amb el carร cter NUL"
 
-#: apply.c:4983
+#: apply.c:5005
 msgid "ensure at least <n> lines of context match"
 msgstr "assegura't que almenys <n> lรญnies de context coincideixin"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3310 builtin/rebase.c:1474
 msgid "action"
 msgstr "acciรณ"
 
-#: apply.c:4985
+#: apply.c:5007
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "detecta les lรญnies noves o modificades que tinguin errors d'espai en blanc"
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5010 apply.c:5013
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignora els canvis d'espai en blanc en cercar context"
 
-#: apply.c:4994
+#: apply.c:5016
 msgid "apply the patch in reverse"
 msgstr "aplica el pedaรง al revรฉs"
 
-#: apply.c:4996
+#: apply.c:5018
 msgid "don't expect at least one line of context"
 msgstr "no esperis almenys una lรญnia de context"
 
-#: apply.c:4998
+#: apply.c:5020
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
 
-#: apply.c:5000
+#: apply.c:5022
 msgid "allow overlapping hunks"
 msgstr "permet trossos encavalcants"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22
+#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "sigues detallat"
 
-#: apply.c:5003
+#: apply.c:5025
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolera una lรญnia nova incorrectament detectada al final del fitxer"
 
-#: apply.c:5006
+#: apply.c:5028
 msgid "do not trust the line counts in the hunk headers"
 msgstr "no confiรฏs en els recomptes de lรญnia en les capรงaleres dels trossos"
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5030 builtin/am.c:2194
 msgid "root"
 msgstr "arrel"
 
-#: apply.c:5009
+#: apply.c:5031
 msgid "prepend <root> to all filenames"
 msgstr "anteposa <arrel> a tots els noms de fitxer"
 
@@ -823,7 +1234,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dipรฒsit> [--exec <ordre>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "l'especificaciรณ de camรญ ยซ%sยป no ha coincidit amb cap fitxer"
@@ -855,7 +1266,7 @@ msgstr "format"
 msgid "archive format"
 msgstr "format d'arxiu"
 
-#: archive.c:458 builtin/log.c:1597
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr "prefix"
 
@@ -863,11 +1274,12 @@ msgstr "prefix"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteposa el prefix a cada nom de camรญ en l'arxiu"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr "fitxer"
 
@@ -900,7 +1312,7 @@ msgid "list supported archive formats"
 msgstr "llista els formats d'arxiu admesos"
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884
 msgid "repo"
 msgstr "dipรฒsit"
 
@@ -908,7 +1320,7 @@ msgstr "dipรฒsit"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "recupera l'arxiu del dipรฒsit remot <dipรฒsit>"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "ordre"
@@ -939,66 +1351,66 @@ msgstr "Format d'arxiu desconegut ยซ%sยป"
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Parร metre no admรจs per al format ยซ%sยป: -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, fuzzy, c-format
+#: archive-tar.c:125 archive-zip.c:350
+#, c-format
 msgid "cannot stream blob %s"
-msgstr "no es pot emmagatzemar %s"
+msgstr "no es pot transmetre el blob %s"
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:368
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)"
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:358
 #, c-format
 msgid "cannot read %s"
 msgstr "no es pot llegir ยซ%sยป"
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "no s'ha pogut iniciar el filtre ยซ%sยป"
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr "no s'ha pogut redirigir el descriptor"
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "ยซ%sยป error reportat pel filtre"
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "el camรญ no รฉs vร lid en UTF-8: %s"
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "el camรญ รฉs massa llarg (%d carร cters, SHA1: %s): %s"
 
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error de deflaciรณ (%d)"
 
-#: archive-zip.c:609
+#: archive-zip.c:614
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>"
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no รฉs un nom d'atribut vร lid"
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s no estร  permรจs: %s:%d"
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1126,41 +1538,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisecant: manca %d revisiรณ a provar desprรฉs d'aquesta %s\n"
 msgstr[1] "Bisecant: manquen %d revisions a provar desprรฉs d'aquesta %s\n"
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents i --reverse no funcionen bรฉ juntes."
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr "no es pot usar --contents amb el nom d'objecte de la comissiรณ final"
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse i --first-parent-together requereixen una รบltima comissiรณ "
 "especificada"
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
-#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093
+#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991
+#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411
+#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "la configuraciรณ del passeig per revisions ha fallat"
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent junts requereixen un rang de la cadena de mares "
 "primeres"
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hi ha tal camรญ %s en %s"
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no es pot llegir el blob %s per al camรญ %s"
@@ -1324,15 +1736,15 @@ msgstr "ยซ%sยป no sembla un fitxer de farcell v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "capรงalera no reconeguda: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108
+#: builtin/commit.c:811
 #, c-format
 msgid "could not open '%s'"
 msgstr "no s'ha pogut obrir ยซ%sยป"
 
 #: bundle.c:143
 msgid "Repository lacks these prerequisite commits:"
-msgstr "Al dipรฒsit li manquen aquestes comissions prerequisits:"
+msgstr "Al dipรฒsit li manquen aquestes comissions prerequerides:"
 
 #: bundle.c:146
 msgid "need a repository to verify a bundle"
@@ -1356,42 +1768,42 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "El farcell requereix aquesta referรจncia:"
 msgstr[1] "El farcell requereix aquestes %d referรจncies:"
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr "no s'ha pogut duplicar el descriptor del farcell"
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "No s'ha pogut executar el pack-objects"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "El pack-objects s'ha mort"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "El rev-list s'ha mort"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "les opcions de la llista de revisions exclouen la referรจncia ยซ%sยป"
 
-#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "parร metre no reconegut: %s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "S'estร  refusant crear un farcell buit."
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no es pot crear ยซ%sยป"
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "L'index-pack s'ha mort"
 
@@ -1400,18 +1812,18 @@ msgstr "L'index-pack s'ha mort"
 msgid "invalid color value: %.*s"
 msgstr "valor de color no vร lid: %.*s"
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398
+#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "no s'ha pogut analitzar %s"
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s no รฉs una comissiรณ!"
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1423,27 +1835,27 @@ msgid ""
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
-#: commit.c:1127
+#: commit.c:1152
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "La comissiรณ %s tรฉ una signatura GPG no fiable, suposadament de %s."
 
-#: commit.c:1130
+#: commit.c:1155
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "La comissiรณ %s tรฉ una signatura GPG incorrecta suposadament de %s."
 
-#: commit.c:1133
+#: commit.c:1158
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La comissiรณ %s no tรฉ signatura GPG."
 
-#: commit.c:1136
+#: commit.c:1161
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "La comissiรณ %s tรฉ una signatura GPG bona de %s\n"
 
-#: commit.c:1390
+#: commit.c:1415
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1454,245 +1866,266 @@ msgstr ""
 "la variable de configuraciรณ i18n.commitencoding a la codificaciรณ que\n"
 "usi el vostre projecte.\n"
 
-#: commit-graph.c:127
+#: commit-graph.c:130
 msgid "commit-graph file is too small"
 msgstr ""
 
-#: commit-graph.c:192
+#: commit-graph.c:195
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
-msgstr "la signatura del graf de comissions %X no coincideix amb la signatura %X"
+msgstr ""
+"la signatura del graf de comissions %X no coincideix amb la signatura %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:202
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "la versiรณ del graf de comissions %X no coincideix amb la versiรณ %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:209
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
-msgstr "la versiรณ del hash del graf de comissions %X no coincideix amb la versiรณ %X"
+msgstr ""
+"la versiรณ del hash del graf de comissions %X no coincideix amb la versiรณ %X"
 
-#: commit-graph.c:229
+#: commit-graph.c:232
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr ""
 
-#: commit-graph.c:240
+#: commit-graph.c:243
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr ""
 
-#: commit-graph.c:283
+#: commit-graph.c:286
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr ""
 
-#: commit-graph.c:347
+#: commit-graph.c:350
 msgid "commit-graph has no base graphs chunk"
 msgstr ""
 
-#: commit-graph.c:357
+#: commit-graph.c:360
 msgid "commit-graph chain does not match"
 msgstr "la cadena del graf de comissions no coincideix"
 
-#: commit-graph.c:404
+#: commit-graph.c:407
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
 
-#: commit-graph.c:430
+#: commit-graph.c:433
 msgid "unable to find all commit-graph files"
 msgstr "no es poden trobar tots els fitxers del graf de comissions"
 
-#: commit-graph.c:553 commit-graph.c:613
+#: commit-graph.c:564 commit-graph.c:624
 msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "posiciรณ de la comissiรณ no vร lida. Probablement el graf de comissions estร  malmรจs"
+msgstr ""
+"posiciรณ de la comissiรณ no vร lida. Probablement el graf de comissions estร  "
+"malmรจs"
 
-#: commit-graph.c:574
+#: commit-graph.c:585
 #, c-format
 msgid "could not find commit %s"
 msgstr "no s'ha pogut trobar la comissiรณ %s"
 
-#: commit-graph.c:1001 builtin/pack-objects.c:2651
+#: commit-graph.c:858 builtin/am.c:1287
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "no s'ha pogut analitzar la comissiรณ %s"
+
+#: commit-graph.c:1017 builtin/pack-objects.c:2641
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
 
-#: commit-graph.c:1033
+#: commit-graph.c:1049
 msgid "Loading known commits in commit graph"
 msgstr "S'estan carregant comissions conegudes al graf de comissions"
 
-#: commit-graph.c:1050
+#: commit-graph.c:1066
 msgid "Expanding reachable commits in commit graph"
 msgstr "S'estan expandint les comissions abastables al graf de comissions"
 
-#: commit-graph.c:1069
+#: commit-graph.c:1085
 msgid "Clearing commit marks in commit graph"
 msgstr "S'estan netejant les marques de comissions al graf de comissions"
 
-#: commit-graph.c:1088
+#: commit-graph.c:1104
 msgid "Computing commit graph generation numbers"
 msgstr "S'estan calculant els nombres de generaciรณ del graf de comissions"
 
-#: commit-graph.c:1162
+#: commit-graph.c:1179
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet"
 msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets"
 
-#: commit-graph.c:1175
+#: commit-graph.c:1192
 #, c-format
 msgid "error adding pack %s"
 msgstr "error en afegir paquet %s"
 
-#: commit-graph.c:1179
+#: commit-graph.c:1196
 #, c-format
 msgid "error opening index for %s"
 msgstr "s'ha produรฏt un error en obrir l'รญndex per ยซ%sยป"
 
-#: commit-graph.c:1203
+#: commit-graph.c:1220
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "S'estan cercant les comissions pel graf de comissions des de %d referรจncia"
-msgstr[1] "S'estan cercant les comissions pel graf de comissions des de %d referรจncies"
+msgstr[0] ""
+"S'estan cercant les comissions pel graf de comissions des de %d referรจncia"
+msgstr[1] ""
+"S'estan cercant les comissions pel graf de comissions des de %d referรจncies"
+
+#: commit-graph.c:1240
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "identificador d'objecte de comissiรณ no vร lid: %s"
 
-#: commit-graph.c:1237
+#: commit-graph.c:1255
 msgid "Finding commits for commit graph among packed objects"
-msgstr "S'estan cercant les comissions pel graf de comissions entre els objectes empaquetats"
+msgstr ""
+"S'estan cercant les comissions pel graf de comissions entre els objectes "
+"empaquetats"
 
-#: commit-graph.c:1252
+#: commit-graph.c:1270
 msgid "Counting distinct commits in commit graph"
-msgstr "S'estant comptant les comissions diferents al graf de comissions"
+msgstr "S'estan comptant les comissions diferents al graf de comissions"
 
-#: commit-graph.c:1283
+#: commit-graph.c:1300
 msgid "Finding extra edges in commit graph"
 msgstr "S'estan cercant les vores addicionals al graf de comissions"
 
-#: commit-graph.c:1331
+#: commit-graph.c:1346
 msgid "failed to write correct number of base graph ids"
-msgstr "s'ha produรฏt un error en escriure el nombre correcte d'ids base del graf"
+msgstr ""
+"s'ha produรฏt un error en escriure el nombre correcte d'ids base del graf"
 
-#: commit-graph.c:1364 midx.c:811
+#: commit-graph.c:1379 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "no s'han pogut crear els directoris inicials de ยซ%sยป"
 
-#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
+#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr "no s'ha pogut crear ยซ%sยป"
 
-#: commit-graph.c:1436
+#: commit-graph.c:1451
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "S'estร  escrivint el graf de comissions en %d pas"
 msgstr[1] "S'estร  escrivint el graf de comissions en %d passos"
 
-#: commit-graph.c:1477
+#: commit-graph.c:1492
 msgid "unable to open commit-graph chain file"
 msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions"
 
-#: commit-graph.c:1489
+#: commit-graph.c:1504
 msgid "failed to rename base commit-graph file"
 msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions"
 
-#: commit-graph.c:1509
+#: commit-graph.c:1524
 msgid "failed to rename temporary commit-graph file"
-msgstr "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
+msgstr ""
+"no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
 
-#: commit-graph.c:1620
+#: commit-graph.c:1635
 msgid "Scanning merged commits"
 msgstr "S'estan escanejant les comissions fusionades"
 
-#: commit-graph.c:1631
+#: commit-graph.c:1646
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "id de comissiรณ duplicat %s no esperat"
 
-#: commit-graph.c:1656
+#: commit-graph.c:1670
 msgid "Merging commit-graph"
 msgstr "S'estร  fusionant el graf de comissions"
 
-#: commit-graph.c:1842
+#: commit-graph.c:1860
 #, c-format
 msgid "the commit graph format cannot write %d commits"
 msgstr "el format del graf de comissions no pot escriure %d comissions"
 
-#: commit-graph.c:1853
+#: commit-graph.c:1871
 msgid "too many commits to write graph"
 msgstr "massa comissions per escriure un graf"
 
-#: commit-graph.c:1943
+#: commit-graph.c:1961
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "el fitxer commit-graph (graf de comissions) tรฉ una suma de verificaciรณ "
 "incorrecta i probablement รฉs corrupte"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1971
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 
-#: commit-graph.c:1963 commit-graph.c:1978
+#: commit-graph.c:1981 commit-graph.c:1996
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 
-#: commit-graph.c:1970
+#: commit-graph.c:1988
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
-msgstr "s'ha produรฏt un error en analitzar la comissiรณ %s del graf de comissions"
+msgstr ""
+"s'ha produรฏt un error en analitzar la comissiรณ %s del graf de comissions"
 
-#: commit-graph.c:1987
+#: commit-graph.c:2006
 msgid "Verifying commits in commit graph"
 msgstr "S'estan verificant les comissions al graf de comissions"
 
-#: commit-graph.c:2000
+#: commit-graph.c:2020
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 
-#: commit-graph.c:2007
+#: commit-graph.c:2027
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2017
+#: commit-graph.c:2037
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 
-#: commit-graph.c:2026
+#: commit-graph.c:2046
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2039
+#: commit-graph.c:2059
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 
-#: commit-graph.c:2044
+#: commit-graph.c:2064
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2048
+#: commit-graph.c:2068
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2063
+#: commit-graph.c:2083
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr ""
 
-#: commit-graph.c:2069
+#: commit-graph.c:2089
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
@@ -1725,288 +2158,281 @@ msgid "relative config include conditionals must come from files"
 msgstr ""
 "els condicionals d'inclusiรณ de configuraciรณ relatius han de venir de fitxers"
 
-#: config.c:375
+#: config.c:376
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "la clau no contรฉ una secciรณ: ยซ%sยป"
 
-#: config.c:381
+#: config.c:382
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "la clau no contรฉ un nom de variable: ยซ%sยป"
 
-#: config.c:405 sequencer.c:2463
+#: config.c:406 sequencer.c:2530
 #, c-format
 msgid "invalid key: %s"
 msgstr "clau no vร lida: %s"
 
-#: config.c:411
+#: config.c:412
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "clau no vร lida (lรญnea nova): %s"
 
-#: config.c:447 config.c:459
+#: config.c:448 config.c:460
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "parร metre de configuraciรณ erroni: %s"
 
-#: config.c:494
+#: config.c:495
 #, c-format
 msgid "bogus format in %s"
 msgstr "format erroni a %s"
 
-#: config.c:820
+#: config.c:821
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "lรญnia de configuraciรณ %d errรฒnia en el blob %s"
 
-#: config.c:824
+#: config.c:825
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "lรญnia de configuraciรณ %d errรฒnia en el fitxer %s"
 
-#: config.c:828
+#: config.c:829
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "lรญnia de configuraciรณ %d errรฒnia en l'entrada estร ndard"
 
-#: config.c:832
+#: config.c:833
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "lรญnia de configuraciรณ %d errรฒnia en el blob de submรฒdul %s"
 
-#: config.c:836
+#: config.c:837
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "lรญnia de configuraciรณ %d errรฒnia en la lรญnia d'ordres %s"
 
-#: config.c:840
+#: config.c:841
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "lรญnia de configuraciรณ %d errรฒnia en %s"
 
-#: config.c:977
+#: config.c:978
 msgid "out of range"
 msgstr "fora de rang"
 
-#: config.c:977
+#: config.c:978
 msgid "invalid unit"
 msgstr "unitat no vร lida"
 
-#: config.c:978
+#: config.c:979
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valor de configuraciรณ numรจric erroni ยซ%sยป per ยซ%sยป: %s"
 
-#: config.c:997
+#: config.c:998
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "valor de configuraciรณ numรจric erroni ยซ%sยป per ยซ%sยป en el blob %s: %s"
 
-#: config.c:1000
+#: config.c:1001
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "valor de configuraciรณ numรจric ยซ%sยป erroni per ยซ%sยป en el fitxer %s: %s"
 
-#: config.c:1003
+#: config.c:1004
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "valor de configuraciรณ numรจric ยซ%sยป erroni per ยซ%sยป en l'entrada estร ndard: %s"
 
-#: config.c:1006
+#: config.c:1007
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "valor de configuraciรณ numรจric ยซ%sยป erroni' per ยซ%sยป en el blob de submรฒdul "
 "%s: %s"
 
-#: config.c:1009
+#: config.c:1010
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "valor de configuraciรณ numรจric ยซ%sยป erroni per ยซ%sยป en la lรญnia d'ordres %s: "
 "%s"
 
-#: config.c:1012
+#: config.c:1013
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "valor de configuraciรณ numรจric incorrecte ยซ%sยป per ยซ%sยป en %s: %s"
 
-#: config.c:1107
+#: config.c:1108
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "s'ha produรฏt un error en expandir el directori d'usuari en: ยซ%sยป"
 
-#: config.c:1116
+#: config.c:1117
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "ยซ%sยป per a ยซ%sยป no รฉs una marca de temps vร lida"
 
-#: config.c:1207
+#: config.c:1208
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr ""
 
-#: config.c:1221 config.c:1232
+#: config.c:1222 config.c:1233
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nivell de compressiรณ de zlib incorrecte %d"
 
-#: config.c:1324
+#: config.c:1325
 msgid "core.commentChar should only be one character"
 msgstr ""
 
-#: config.c:1357
+#: config.c:1358
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode de creaciรณ d'objecte no vร lid: %s"
 
-#: config.c:1429
+#: config.c:1430
 #, c-format
 msgid "malformed value for %s"
 msgstr "valor no vร lid per a %s"
 
-#: config.c:1455
+#: config.c:1456
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valor no vร lid per a %s: %s"
 
-#: config.c:1456
+#: config.c:1457
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 
-#: config.c:1517 builtin/pack-objects.c:3399
+#: config.c:1518 builtin/pack-objects.c:3394
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivell de compressiรณ de paquet %d Erroni"
 
-#: config.c:1638
+#: config.c:1639
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "no s'ha pogut carregar l'objecte blob de configuraciรณ ยซ%sยป"
 
-#: config.c:1641
+#: config.c:1642
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "la referรจncia ยซ%sยป no assenyala a un blob"
 
-#: config.c:1658
+#: config.c:1659
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "no s'ha pogut resoldre el blob de configuraciรณ: ยซ%sยป"
 
-#: config.c:1688
+#: config.c:1689
 #, c-format
 msgid "failed to parse %s"
 msgstr "s'ha produรฏt un error en analitzar %s"
 
-#: config.c:1744
+#: config.c:1745
 msgid "unable to parse command-line config"
 msgstr "no s'ha pogut analitzar la configuraciรณ de la lรญnia d'ordres"
 
-#: config.c:2093
+#: config.c:2096
 msgid "unknown error occurred while reading the configuration files"
 msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuraciรณ"
 
-#: config.c:2263
+#: config.c:2266
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s no vร lid: ยซ%sยป"
 
-#: config.c:2306
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-"valor ยซ%sยป a core.untrackedCache desconegut; utilitzant el valor per defecte "
-"ยซkeepยป"
-
-#: config.c:2332
+#: config.c:2311
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "valor ยซ%dยป a splitIndex.maxPercentChange ha d'estar entre 0 i 100"
 
-#: config.c:2378
+#: config.c:2357
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "no s'ha pogut analitzar ยซ%sยป de la configuraciรณ de la lรญnia d'ordres"
 
-#: config.c:2380
+#: config.c:2359
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "variable de configuraciรณ ยซ%sยป errรฒnia en el fitxer ยซ%sยป a la lรญnia %d"
 
-#: config.c:2461
+#: config.c:2440
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nom de secciรณ no vร lid ยซ%sยป"
 
-#: config.c:2493
+#: config.c:2472
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s tรฉ mรบltiples valors"
 
-#: config.c:2522
+#: config.c:2501
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "no es pot escriure un nou fitxer de configuraciรณ %s"
 
-#: config.c:2774 config.c:3098
+#: config.c:2753 config.c:3077
 #, c-format
 msgid "could not lock config file %s"
 msgstr "no s'ha pogut blocar el fitxer de configuraciรณ %s"
 
-#: config.c:2785
+#: config.c:2764
 #, c-format
 msgid "opening %s"
 msgstr "s'estร  obrint %s"
 
-#: config.c:2820 builtin/config.c:328
+#: config.c:2799 builtin/config.c:328
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "patrรณ no vร lid: %s"
 
-#: config.c:2845
+#: config.c:2824
 #, c-format
 msgid "invalid config file %s"
 msgstr "fitxer de configuraciรณ no vร lid %s"
 
-#: config.c:2858 config.c:3111
+#: config.c:2837 config.c:3090
 #, c-format
 msgid "fstat on %s failed"
 msgstr "ha fallat ยซfstatยป a %s"
 
-#: config.c:2869
+#: config.c:2848
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "no s'ha pogut fer ยซmmapยป ยซ%sยป"
 
-#: config.c:2878 config.c:3116
+#: config.c:2857 config.c:3095
 #, c-format
 msgid "chmod on %s failed"
 msgstr "ha fallat chmod a %s"
 
-#: config.c:2963 config.c:3213
+#: config.c:2942 config.c:3192
 #, c-format
 msgid "could not write config file %s"
 msgstr "no s'ha pogut escriure el fitxer de configuraciรณ ยซ%sยป"
 
-#: config.c:2997
+#: config.c:2976
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no s'ha pogut establir ยซ%sยป a ยซ%sยป"
 
-#: config.c:2999 builtin/remote.c:782
+#: config.c:2978 builtin/remote.c:781
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no s'ha pogut desassignar ยซ%sยป"
 
-#: config.c:3089
+#: config.c:3068
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nom de secciรณ no vร lida: %s"
 
-#: config.c:3256
+#: config.c:3235
 #, c-format
 msgid "missing value for '%s'"
 msgstr "falta el valor per ยซ%sยป"
@@ -2131,7 +2557,7 @@ msgstr "no s'ha pogut trobar %s (%s)"
 msgid "unknown port %s"
 msgstr "port desconegut %s"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "s'ha bloquejat el nom estrany d'amfitriรณ ยซ%sยป"
@@ -2146,58 +2572,60 @@ msgstr "s'ha bloquejat el port estrany ยซ%sยป"
 msgid "cannot start proxy %s"
 msgstr "no s'ha pogut iniciar servidor intermediari ยซ%sยป"
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr "no s'ha especificat un camรญ; vegeu ยซgit help pullยป per la sintaxis vร lida per URL"
+msgstr ""
+"no s'ha especificat un camรญ; vegeu ยซgit help pullยป per la sintaxi vร lida per "
+"URL"
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr "la variant ยซsimpleยป d'ssh no รฉs compatible amb -4"
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr "la variant ยซsimpleยป d'ssh no รฉs compatible amb -6"
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "la variant ยซsimpleยป d'ssh no permet definir el port"
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
-msgstr "s'ha bloquejat el nom de fitxer extrany ยซ%sยป"
+msgstr "s'ha bloquejat el nom de fitxer estrany ยซ%sยป"
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr "no s'ha pogut bifurcar"
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr "S'estร  comprovant la connectivitat"
 
-#: connected.c:98
+#: connected.c:101
 msgid "Could not run 'git rev-list'"
 msgstr "No s'ha pogut executar 'git rev-list'"
 
-#: connected.c:118
+#: connected.c:121
 msgid "failed write to rev-list"
 msgstr "escriptura fallada al rev-list"
 
-#: connected.c:125
+#: connected.c:128
 msgid "failed to close rev-list's stdin"
 msgstr "s'ha produรฏt un error en tancar l'stdin del rev-list"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr ""
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF es reemplaรงร  per LF en %s."
+msgstr "CRLF es reemplaรงร  per LF en %s"
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2205,14 +2633,14 @@ msgid ""
 msgstr ""
 "CRLF serร  reemplaรงat per LF en %s.\n"
 "El fitxer tindrร  els seus terminadors de lรญnia originals en el vostre "
-"directori de treball."
+"directori de treball"
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF es reemplaรงร  per LF en %s"
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2220,18 +2648,18 @@ msgid ""
 msgstr ""
 "LF serร  reemplaรงat per CRLF en %s.\n"
 "El fitxer tindrร  els seus terminadors de lรญnia originals en el vostre "
-"directori de treball."
+"directori de treball"
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr ""
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
 
 #: convert.c:304
@@ -2246,117 +2674,117 @@ msgid ""
 "%sLE (depending on the byte order) as working-tree-encoding."
 msgstr ""
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "s'ha produรฏt un error en codificar ยซ%sยป des de %s a %s"
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "codificar ยซ%sยป des de %s a %s i cap enrere no รฉs el mateix"
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "no es pot bifurcar per a executar el filtre extern ยซ%sยป"
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "no es pot alimentar l'entrada al filtre extern ยซ%sยป"
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "el filtre extern ยซ%sยป ha fallat %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "la lectura del filtre extern ยซ%sยป ha fallat"
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "el filtre extern ยซ%sยป ha fallat"
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr "tipus de filtre inesperat"
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr ""
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: el filtre de netejat ยซ%sยป ha fallat"
 
-#: convert.c:1476
+#: convert.c:1489
 #, fuzzy, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "s'ha produรฏt un error en actualitzar els fitxers"
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr "en el futur"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "fa %<PRIuMAX> segon"
 msgstr[1] "fa %<PRIuMAX> segons"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "fa %<PRIuMAX> minut"
 msgstr[1] "fa %<PRIuMAX> minuts"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "fa %<PRIuMAX> hora"
 msgstr[1] "fa %<PRIuMAX> hores"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "fa %<PRIuMAX> dia"
 msgstr[1] "fa %<PRIuMAX> dies"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "fa %<PRIuMAX> setmana"
 msgstr[1] "fa %<PRIuMAX> setmanes"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "fa %<PRIuMAX> mes"
 msgstr[1] "fa %<PRIuMAX> mesos"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2364,14 +2792,14 @@ msgstr[0] "%<PRIuMAX> any"
 msgstr[1] "%<PRIuMAX> anys"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "fa %s i %<PRIuMAX> mes"
 msgstr[1] "fa %s i %<PRIuMAX> mesos"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2410,7 +2838,7 @@ msgstr "Marcades %d illes, fet.\n"
 msgid "failed to read orderfile '%s'"
 msgstr "s'ha produรฏt un error en llegir el fitxer d'ordres ยซ%sยป"
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr "S'estร  realitzant una detecciรณ inexacta de canvis de nom"
 
@@ -2426,7 +2854,6 @@ msgstr ""
 "No รฉs un dipรฒsit Git. Useu --no-index per a comparar dos camins fora del "
 "directori de treball"
 
-
 #: diff.c:155
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
@@ -2475,35 +2902,35 @@ msgstr ""
 "S'han trobat errors en la variable de configuraciรณ 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "el diff external s'ha mort, s'estร  aturant a %s"
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check i -s sรณn mรบtuament excloents"
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S and --find-object sรณn mรบtuament excloents"
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requereix exactament una especificaciรณ de camรญ"
 
-#: diff.c:4689
-#,  c-format
+#: diff.c:4676
+#, c-format
 msgid "invalid --stat value: %s"
 msgstr "valor --stat no vร lid: %s"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
 #: parse-options.c:199 parse-options.c:203
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s espera un valor numรจric"
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2512,499 +2939,498 @@ msgstr ""
 "S'ha produรฏt un error en analitzar el parร metre d'opciรณ de --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "classe de canvi ยซ%cยป desconeguda a --diff-filter=%s"
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valor desconegut desprรฉs de ws-error-highlight=%.*s"
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "no s'ha pogut resoldre ยซ%sยป"
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s esperava un carร cter, s'ha rebut ยซ%sยป"
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "parร metre --color-moved incorrecte: %s"
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "mode ยซ%sยป no vร lid en -color-moved-ws"
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
-"l'opciรณ diff-algorithm accepta ยซmyersยป, ยซminimalminimalยป, \"patience\" and "
-"ยซhistogramยป"
+"l'opciรณ diff-algorithm accepta ยซmyersยป, ยซminimalยป, ยซpatienceยป i ยซhistogramยป"
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argument no vร lid a %s"
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr ""
 "s'ha produรฏt un error en analitzar el parร metre d'opciรณ de --submodule: ยซ%sยป"
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "parร metre --word-diff incorrecte: %s"
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr "Opcions del format de sortida del diff"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr "generant pedaรง"
 
-#: diff.c:5275 builtin/log.c:182
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr "omet la sortida de diferรจncies"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr "genera diffs amb <n> lรญnies de context"
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr "genera el diff en format cru"
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr "sinรฒnim de per a ยซ-p --rawยป"
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr "sinรฒnim de per a ยซ-p --statยป"
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr "llegible per mร quina --stat"
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr "mostra nomรฉs l'รบltima lรญnia de --stat"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinรฒnim per -dirstat=cumulative"
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "sinรฒnim per --dirstat=files,param1,param2..."
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr "mostra nomรฉs els noms de fitxers canviats"
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr "mostra nomรฉs els noms i l'estat dels fitxers canviats"
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr ""
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr "genera diffstat"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr "<amplada>"
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr "genera diffstat amb una amplada donada"
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr "genera diffstat amb un nom d'amplada donat"
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr "genera diffstat amb una amplada de graf donada"
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr "<comptador>"
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr "genera diffstat amb lรญnies limitades"
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr "genera un resum compacte a diffstat"
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr "diff amb sortida binaria que pot ser aplicada"
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr "mostra un diff amb colors"
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr ""
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr "<prefix>"
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr ""
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr ""
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr "afegir un prefix addicional per a cada lรญnia de sortida"
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr "no mostris cap prefix d'origen o destรญ"
 
-#: diff.c:5371
+#: diff.c:5358
 #, fuzzy
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr "<char>"
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
-msgstr "especifiqueu el carร cter per a indicar una lรญnia nova en comptes de ยซ+ยป"
+msgstr ""
+"especifiqueu el carร cter per a indicar una lรญnia nova en comptes de ยซ+ยป"
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
-msgstr "especifiqueu el carร cter per a indicar una lรญnia antiga en comptes de ยซ-ยป"
+msgstr ""
+"especifiqueu el carร cter per a indicar una lรญnia antiga en comptes de ยซ-ยป"
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "especifiqueu el carร cter per a indicar context en comptes de ยซ ยป"
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr "Opcions de canvi de nom del diff"
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
-msgstr "divideix els canvis de reescriptura completa en parells de suprimir i crear"
+msgstr ""
+"divideix els canvis de reescriptura completa en parells de suprimir i crear"
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr "detecta els canvis de noms"
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr "omet les preimatges per les supressions"
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr "detecta cรฒpies"
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr "usa els fitxers no modificats com a font per trobar cรฒpies"
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr "inhabilita la detecciรณ de canvis de nom"
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
 msgstr "usa els blobs buits com a font de canvi de nom"
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
-msgstr "continua llistant l'histรฒric d'un un fitxer mรฉs enllร  dels canvis de nom"
+msgstr ""
+"continua llistant l'histรฒric d'un un fitxer mรฉs enllร  dels canvis de nom"
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr "Opcions d'algorisme Diff"
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr "produeix el diff mรฉs petit possible"
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr "ignora els espai en blanc en comparar lรญnies"
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr "ignora els canvis en la quantitat d'espai en blanc"
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignora els canvis d'espai en blanc al final de la lรญnia"
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr "ignora els retorns de lรญnia al final de la lรญnia"
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr "ignora els canvis en lรญnies que estan en blanc"
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "genera diff usant l'algorisme ยซpatience diffยป"
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "genera diff usant l'algorisme ยซhistogram diffยป"
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr "<algorisme>"
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr "escolliu un algorisme pel diff"
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr "<text>"
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "genera diff usant l'algorisme ยซanchored diffยป"
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr ""
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
-msgstr ""
+msgstr "les lรญnies de codi que s'ha mogut s'acoloreixen diferent"
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
-msgstr ""
+msgstr "com s'ignoren els espais en blanc a --color-moved"
 
-#: diff.c:5469
-#, fuzzy
+#: diff.c:5456
 msgid "Other diff options"
-msgstr "Opcions genรจriques"
+msgstr "Altres opcions diff"
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
-msgstr ""
+msgstr "quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els camins relatius"
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr "tracta tots els fitxers com a text"
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
-msgstr ""
+msgstr "intercanvia les dues entrades, inverteix el diff"
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "surt amb 1 si hi ha diferรจncies, 0 en cas contrari"
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr "inhabilita totes les sortides del programa"
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr ""
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr "<quan>"
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignora els canvis als submรฒduls en la generaciรณ del diff"
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr "especifiqueu com es mostren els canvis als submรฒduls"
 
-#: diff.c:5496
+#: diff.c:5483
 #, fuzzy
 msgid "hide 'git add -N' entries from the index"
 msgstr "usa .gitattributes nomรฉs des de l'รญndex"
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr ""
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr "<cadena>"
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
 
-#: diff.c:5508
-#, fuzzy
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
-msgstr "mostra els fitxers coincidents en el paginador"
+msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G"
 
-#: diff.c:5511
-#, fuzzy
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "usa les expressions regulars POSIX ampliades"
+msgstr "tracta <cadena> a -S com a expressiรณ regular POSIX ampliada"
 
-#: diff.c:5514
-#, fuzzy
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
-msgstr "mostra en la sortida els altres fitxers"
+msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida"
 
-#: diff.c:5515
-#, fuzzy
+#: diff.c:5502
 msgid "<object-id>"
-msgstr "objecte"
+msgstr "<id de l'objecte>"
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
-msgstr "seleccioneu els fitxer per tipus de diff"
+msgstr "seleccioneu els fitxers per tipus de diff"
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr "<fitxer>"
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr "Sortida a un fitxer especรญfic"
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
-msgstr "s'ha omรจs la detecciรณ de canvi de nom inexacta a causa de massa fitxers."
+msgstr ""
+"s'ha omรจs la detecciรณ de canvi de nom inexacta a causa de massa fitxers."
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "nomรฉs s'han trobat cรฒpies des de camins modificats a causa de massa fitxers."
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3012,42 +3438,61 @@ msgstr ""
 "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
 "l'ordre."
 
-#: dir.c:537
+#: dir.c:554
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 "l'especificaciรณ de camรญ ยซ%sยป no ha coincidit amb cap fitxer que git conegui"
 
-#: dir.c:926
+#: dir.c:664
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "patrรณ no reconegut: ยซ%sยป"
+
+#: dir.c:682 dir.c:696
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "patrรณ negatiu no reconegut: ยซ%sยป"
+
+#: dir.c:714
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+
+#: dir.c:724
+msgid "disabling cone pattern matching"
+msgstr "inhabilita la coincidรจncia de patrons ยซconeยป"
+
+#: dir.c:1101
 #, c-format
 msgid "cannot use %s as an exclude file"
-msgstr "no es pot usar  %s com a fitxer d'exclusiรณ"
+msgstr "no es pot usar %s com a fitxer d'exclusiรณ"
 
-#: dir.c:1843
+#: dir.c:2078
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "no s'ha pogut obrir el directori ยซ%sยป"
 
-#: dir.c:2085
+#: dir.c:2415
 msgid "failed to get kernel name and information"
 msgstr "s'ha produรฏt un error en obtenir el nombre i la informaciรณ del nucli"
 
-#: dir.c:2209
+#: dir.c:2539
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 "la memรฒria cau no seguida estร  inhabilitada en aquest sistema o ubicaciรณ"
 
-#: dir.c:3013
+#: dir.c:3343
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "el fitxer d'รญndex al dipรฒsit %s รฉs malmรจs"
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3388 dir.c:3393
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no s'han pogut crear directoris per %s"
 
-#: dir.c:3092
+#: dir.c:3422
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no s'ha pogut migrar el directori de ยซ%sยป a ยซ%sยป"
@@ -3066,12 +3511,12 @@ msgstr "S'estร  filtrant el contingut"
 msgid "could not stat file '%s'"
 msgstr "no s'ha pogut fer ยซstatยป sobre el fitxer ยซ%sยป"
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr ""
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "no s'ha pogut establir GIT_DIR a ยซ%sยป"
@@ -3081,266 +3526,268 @@ msgstr "no s'ha pogut establir GIT_DIR a ยซ%sยป"
 msgid "too many args to run %s"
 msgstr "hi ha massa arguments per a executar %s"
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Remot sense URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: llista superficial esperada"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 #, fuzzy
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: llista superficial esperada"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut ยซ%sยป"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr "no s'ha pogut escriure al remot"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requereix multi_ack_detailed"
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "lรญnia de shallow no vร lida: %s"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "lรญnia d'unshallow no vร lida: %s"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr "objecte no trobat: %s"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objecte: %s"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr "no s'ha trobat cap shallow: %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr "s'ha rebut %s %d %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr "comissiรณ no vร lida %s"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr "s'abandona"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr "fet"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "s'ha rebut %s (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr "S'estร  marcant %s com a complet"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ja es tรฉ %s (%s)"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr "error de protocol: capรงalera de paquet errรฒnia"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no es pot bifurcar de %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr "%s ha fallat"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr "error en desmultiplexor de banda lateral"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La versiรณ del servidor รฉs %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr "El servidor accepta %s"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr "El servidor no permet clients superficials"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr "El servidor no admet --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no admet --shallow-exclude"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr "El servidor no admet --deepen"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr "cap comissiรณ en comรบ"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: l'obtenciรณ ha fallat."
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr "El servidor no permet peticions superficials"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr "El servidor accepta filtratge"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr "no s'ha pogut escriure la peticiรณ al remot"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "error en llegir la capรงalera de la secciรณ ยซ%sยป"
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "s'esperava ยซ%sยป, s'ha rebut ยซ%sยป"
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "lรญnia de confirmaciรณ inesperada: ยซ%sยป"
 
-#: fetch-pack.c:1252
-#, fuzzy, c-format
+#: fetch-pack.c:1308
+#, c-format
 msgid "error processing acks: %d"
-msgstr "error en llegir %s"
+msgstr "s'ha produรฏt un error en processar els acks: %d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr "s'espera l'enviament del fitxer de paquet desprรฉs de ยซreadyยป"
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "s'espera que cap altra seccions s'enviรฏ desprรฉs de no ยซreadyยป"
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "s'ha produรฏt un error en processar la informaciรณ superficial: %d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "s'esperava wanted-ref, s'ha rebut ยซ%sยป"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inesperat: ยซ%sยป"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "s'ha produรฏt un error en processar les referรจncies desitjades: %d"
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr "no hi ha cap HEAD remot coincident"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:688
 msgid "remote did not send all necessary objects"
 msgstr "el remot no ha enviat tots els objectes necessaris"
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existeix la referรจncia remota %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "El servidor no permet solยทlicitar objectes no anunciats %s"
 
-#: gpg-interface.c:321
-msgid "gpg failed to sign the data"
-msgstr "gpg ha fallat en signar les dades"
-
-#: gpg-interface.c:347
+#: gpg-interface.c:223
 msgid "could not create temporary file"
 msgstr "no s'ha pogut crear el fitxer temporal"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:226
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "s'ha produรฏt un error en escriure la signatura separada a ยซ%sยป"
 
-#: graph.c:97
+#: gpg-interface.c:390
+msgid "gpg failed to sign the data"
+msgstr "gpg ha fallat en signar les dades"
+
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora el color no vร lid ยซ%.*sยป en log.graphColors"
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+
+#: grep.c:2124
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "ยซ%sยป: no s'ha pogut llegir %s"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "s'ha produรฏt un error en fer stat a ยซ%sยป"
 
-#: grep.c:2145
+#: grep.c:2152
 #, c-format
 msgid "'%s': short read"
 msgstr "ยซ%sยป: lectura curta"
@@ -3390,7 +3837,7 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Ordres de baix nivell / Interrogadors"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Ordres de baix nivell / Sincronitzaciรณ de dipรฒsits"
 
 #: help.c:38
@@ -3485,12 +3932,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr "git version [<opcions>]"
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3562,47 +4009,62 @@ msgstr "nom d'identitat buit (per <%s>) no รฉs permรจs"
 msgid "name consists only of disallowed characters: %s"
 msgstr "el nom contรฉ nomรฉs carร cters no permesos: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:631
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de data no vร lid: %s"
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "l'entrada ยซ%sยป a l'arbre %s tรฉ mode d'arbre, perรฒ no รฉs un arbre"
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "l'entrada ยซ%sยป a l'arbre %s tรฉ mode blob, perรฒ no รฉs un blob"
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissiรณ %s"
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "no es poden combinar mรบltiples especificacions de filtratge"
+#: list-objects-filter.c:492
+#, fuzzy, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "no s'ha pogut accedir a ยซ%sยป"
+
+#: list-objects-filter.c:495
+#, fuzzy, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "no s'ha pogut llegir %s"
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr "s'esperava ยซtree:<profunditat>ยป"
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr ""
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "filtre d'especificaciรณ no vร lid: ยซ%sยป"
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
 msgstr ""
 
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr ""
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "no es poden combinar mรบltiples especificacions de filtratge"
+
 #: lockfile.c:151
 #, c-format
 msgid ""
@@ -3632,117 +4094,114 @@ msgstr "No s'ha pogut crear ยซ%s.lockยป: %s"
 msgid "failed to read the cache"
 msgstr "s'ha produรฏt un error en llegir la memรฒria cau"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
+#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809
 #: builtin/stash.c:264
 msgid "unable to write new index file"
 msgstr "no s'ha pogut escriure un fitxer d'รญndex nou"
 
-#: merge-recursive.c:322
+#: merge-recursive.c:367
 msgid "(bad commit)\n"
 msgstr "(comissiรณ errรฒnia)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "addinfo_cache ha fallat per al camรญ ยซ%sยป; interrompent la fusiรณ."
 
-#: merge-recursive.c:354
+#: merge-recursive.c:399
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "addinfo_cache ha fallat al refrescar el camรญ ยซ%sยป; interrompent la fusiรณ."
-
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "error en construir arbres"
+msgstr ""
+"addinfo_cache ha fallat al refrescar el camรญ ยซ%sยป; interrompent la fusiรณ."
 
-#: merge-recursive.c:863
+#: merge-recursive.c:885
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "s'ha produรฏt un error en crear el camรญ ยซ%sยป%s"
 
-#: merge-recursive.c:874
+#: merge-recursive.c:896
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "S'estร  eliminant %s per a fer espai per al subdirectori\n"
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:910 merge-recursive.c:929
 msgid ": perhaps a D/F conflict?"
 msgstr ": potser un conflicte D/F?"
 
-#: merge-recursive.c:897
+#: merge-recursive.c:919
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "s'estร  refusant perdre el fitxer no seguit a ยซ%sยป"
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:960 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no es pot llegir l'objecte %s ยซ%sยป"
 
-#: merge-recursive.c:941
+#: merge-recursive.c:965
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob esperat per a %s ยซ%sยป"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "s'ha produรฏt un error en obrir ยซ%sยป: %s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:1001
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "s'ha produรฏt un error en fer l'enllaรง simbรฒlic ยซ%sยป: %s"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:1006
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "no se sap quรจ fer amb %06o %s ยซ%sยป"
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1199
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "S'ha produรฏt un error en fusionar el submรฒdul %s (no estร  agafat)"
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1206
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "S'ha produรฏt un error en fusionar el submรฒdul %s (no hi ha comissions)"
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1213
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "S'ha produรฏt un error en fusionar el submรฒdul %s (les comissions no "
 "segueixen merge-base)"
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1221 merge-recursive.c:1233
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Avanรงament rร pid del submรฒdul %s a la segรผent comissiรณ:"
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1224 merge-recursive.c:1236
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avanรงament rร pid al submรฒdul %s"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1259
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1263
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr ""
 "S'ha produรฏt un error en fusionar el submรฒdul %s (sense avanรงament rร pid)"
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1264
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "S'ha trobat una possible resoluciรณ de fusiรณ pel submรฒdul:\n"
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1267
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3753,33 +4212,35 @@ msgid ""
 "which will accept this suggestion.\n"
 msgstr ""
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1276
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 "S'ha produรฏt un error en fusionar el submรฒdul %s (s'han trobat mรบltiples "
 "fusions)"
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1349
 msgid "Failed to execute internal merge"
 msgstr "S'ha produรฏt un error en executar la fusiรณ interna"
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1354
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No s'ha pogut afegir %s a la base de dades"
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1386
 #, c-format
 msgid "Auto-merging %s"
 msgstr "S'estร  autofusionant %s"
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1410
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "Error: s'estร  refusant perdre el fitxer no seguit a %s; en comptes s'ha escrit a %s."
+msgstr ""
+"Error: s'estร  refusant perdre el fitxer no seguit a %s; en comptes s'ha "
+"escrit a %s."
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1482
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3788,7 +4249,7 @@ msgstr ""
 "CONFLICTE: (%s/supressiรณ): %s suprimit en %s i %s en %s. La versiรณ %s de %s "
 "s'ha deixat en l'arbre."
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1487
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3797,7 +4258,7 @@ msgstr ""
 "CONFLICTE: (%s/supressiรณ): %s suprimit en %s i %s a %s en %s. La versiรณ %s "
 "de %s s'ha deixat en l'arbre."
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1494
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3806,7 +4267,7 @@ msgstr ""
 "CONFLICTE: (%s/supressiรณ): %s suprimit en %s i %s en %s. La versiรณ %s de %s "
 "s'ha deixat en l'arbre a %s."
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1499
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3815,64 +4276,66 @@ msgstr ""
 "CONFLICTE: (%s/supressiรณ): %s suprimit en %s i %s a %s en %s. La versiรณ %s "
 "de %s s'ha deixat en l'arbre a %s."
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1534
 msgid "rename"
 msgstr "canvi de nom"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1534
 msgid "renamed"
 msgstr "canviat de nom"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
+#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "S'estร  refusant a perdre el fitxer brut a %s"
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1624
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "S'estร  refusant perdre el fitxer no seguit a ยซ%sยป, malgrat que estร  en mig de l'operaciรณ."
+msgstr ""
+"S'estร  refusant perdre el fitxer no seguit a ยซ%sยป, malgrat que estร  en mig "
+"de l'operaciรณ."
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1682
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
-"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s.  S'ha afegit %s a "
-"%s"
+"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s.  S'ha afegit "
+"%s a %s"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1713
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s รฉs un directori en %s; s'estร  afegint com a %s en lloc d'aixรฒ"
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1718
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "s'estร  refusant perdre el fitxer no seguit a %s; en comptes, s'estร  afegint "
 "com a %s"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1737
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom ยซ%sยป->ยซ%sยป en la "
-"branca ยซ%sยป canvi de nom ยซ%sยป->ยซ%sยป en ยซ%sยป%s"
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom ยซ%sยป->ยซ%sยป en la branca "
+"ยซ%sยป canvi de nom ยซ%sยป->ยซ%sยป en ยซ%sยป%s"
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1742
 msgid " (left unresolved)"
 msgstr " (deixat sense resoluciรณ)"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1851
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
 "nom %s->%s en %s"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2114
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3880,330 +4343,348 @@ msgid ""
 "getting a majority of the files."
 msgstr ""
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2146
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
 "implicit directory rename(s) putting the following path(s) there: %s."
 msgstr ""
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2156
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
 "implicit directory renames tried to put these paths there: %s"
 msgstr ""
 
-#: merge-recursive.c:2169
-#, fuzzy, c-format
+#: merge-recursive.c:2248
+#, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
 ">%s in %s"
 msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
-"nom %s->%s en %s"
+"CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de "
+"nom de directori %s->%s en %s"
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2493
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr ""
-"AVรS: S'estร  evitant aplicar el canvi de nom %s -> %s a %s, perquรจ %s ell mateix ja havia canviat de nom."
+"AVรS: S'estร  evitant aplicar el canvi de nom %s -> %s a %s, perquรจ %s ell "
+"mateix ja havia canviat de nom."
 
-#: merge-recursive.c:2937
+#: merge-recursive.c:3019
 #, c-format
 msgid "cannot read object %s"
 msgstr "no es pot llegir l'objecte %s"
 
-#: merge-recursive.c:2940
+#: merge-recursive.c:3022
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objecte %s no รฉs un blob"
 
-#: merge-recursive.c:3004
+#: merge-recursive.c:3086
 msgid "modify"
 msgstr "modificaciรณ"
 
-#: merge-recursive.c:3004
+#: merge-recursive.c:3086
 msgid "modified"
 msgstr "modificat"
 
-#: merge-recursive.c:3016
+#: merge-recursive.c:3098
 msgid "content"
 msgstr "contingut"
 
-#: merge-recursive.c:3020
+#: merge-recursive.c:3102
 msgid "add/add"
 msgstr "afegiment/afegiment"
 
-#: merge-recursive.c:3043
+#: merge-recursive.c:3125
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "S'ha omรจs %s (el fusionat รฉs igual a l'existent)"
 
-#: merge-recursive.c:3065 git-submodule.sh:937
+#: merge-recursive.c:3147 git-submodule.sh:993
 msgid "submodule"
 msgstr "submรฒdul"
 
-#: merge-recursive.c:3066
+#: merge-recursive.c:3148
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTE (%s): Conflicte de fusiรณ en %s"
 
-#: merge-recursive.c:3096
+#: merge-recursive.c:3178
 #, c-format
 msgid "Adding as %s instead"
 msgstr "S'estร  afegint com a %s en lloc d'aixรฒ"
 
-#: merge-recursive.c:3178
+#: merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
 "moving it to %s."
 msgstr ""
 
-#: merge-recursive.c:3181
+#: merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
 "in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-recursive.c:3185
+#: merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
 "%s; moving it to %s."
 msgstr ""
 
-#: merge-recursive.c:3188
+#: merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
 "was renamed in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-recursive.c:3302
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "S'estร  eliminant %s"
 
-#: merge-recursive.c:3325
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "fitxer/directori"
 
-#: merge-recursive.c:3330
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "directori/fitxer"
 
-#: merge-recursive.c:3337
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'estร  afegint %s com a "
 "%s"
 
-#: merge-recursive.c:3346
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "S'estร  afegint %s"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusiรณ en %s"
 
-#: merge-recursive.c:3393
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Els canvis locals als fitxers segรผents se sobreescriuran per la fusiรณ:\n"
-"  %s"
-
-#: merge-recursive.c:3404
+#: merge-recursive.c:3482
 msgid "Already up to date!"
 msgstr "Ja estร  al dia!"
 
-#: merge-recursive.c:3413
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "la fusiรณ dels arbres %s i %s ha fallat"
 
-#: merge-recursive.c:3512
+#: merge-recursive.c:3595
 msgid "Merging:"
 msgstr "S'estร  fusionant:"
 
-#: merge-recursive.c:3525
+#: merge-recursive.c:3608
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "s'ha trobat %u avantpassat en comรบ:"
 msgstr[1] "s'han trobat %u avantpassats en comรบ:"
 
-#: merge-recursive.c:3564
+#: merge-recursive.c:3658
 msgid "merge returned no commit"
 msgstr "la fusiรณ no ha retornat cap comissiรณ"
 
-#: merge-recursive.c:3630
+#: merge-recursive.c:3717
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Els canvis locals als fitxers segรผents se sobreescriuran per la fusiรณ:\n"
+"  %s"
+
+#: merge-recursive.c:3814
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No s'ha pogut analitzar l'objecte ยซ%sยป"
 
-#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874
 msgid "Unable to write index."
 msgstr "No s'ha pogut escriure l'รญndex."
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr ""
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr ""
 
-#: midx.c:95
+#: midx.c:94
 #, fuzzy, c-format
 msgid "hash version %u does not match"
 msgstr "el camรญ ยซ%sยป no tรฉ la seva versiรณ"
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr ""
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr ""
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr ""
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr ""
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr ""
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr ""
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr ""
 
-#: midx.c:470
+#: midx.c:472
 #, fuzzy, c-format
 msgid "failed to add packfile '%s'"
 msgstr "s'ha produรฏt un error en llegir el fitxer d'ordres ยซ%sยป"
 
-#: midx.c:476
+#: midx.c:478
 #, fuzzy, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "s'ha produรฏt un error en obrir ยซ%sยป"
 
-#: midx.c:536
+#: midx.c:538
 #, fuzzy, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "s'ha produรฏt un error en llegir l'objecte ยซ%sยป."
 
-#: midx.c:865
+#: midx.c:842
+#, fuzzy
+msgid "Adding packfiles to multi-pack-index"
+msgstr "s'ha produรฏt un error en netejar l'รญndex"
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr ""
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr ""
+
+#: midx.c:1052
 #, fuzzy, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "s'ha produรฏt un error en netejar l'รญndex"
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr "S'estan cercant fitxers de paquets referenciats"
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
 msgstr ""
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr "S'estan ordenant els objectes per fitxer de paquet"
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr "S'estan verificant els desplaรงaments dels objectes"
 
-#: midx.c:1160
+#: midx.c:1180
 #, fuzzy, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "no s'ha pogut afegir una entrada de cau per a %s"
 
-#: midx.c:1166
+#: midx.c:1186
 #, fuzzy, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "s'ha produรฏt un error en llegir el fitxer d'ordres ยซ%sยป"
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "S'estan comptant els objectes referenciats"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr "no s'ha pogut executar el pack-objects"
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr "no s'ha pogut finalitzar el pack-objects"
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, fuzzy, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, fuzzy, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, fuzzy, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
@@ -4247,42 +4728,42 @@ msgstr "S'estร  refusant reescriure les notes en %s (fora de refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Valor erroni de %s: ยซ%sยป"
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "tipus d'objecte ยซ%sยป no vร lid"
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "l'objecte %s รฉs %s, no pas %s"
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "l'objecte %s tรฉ un identificador de tipus %d desconegut"
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "no s'ha pogut analitzar l'objecte: %s"
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:277
 #, c-format
 msgid "hash mismatch %s"
 msgstr ""
 
-#: packfile.c:648
+#: packfile.c:641
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "desplaรงament abans de la fi del fitxer de paquet (.idx trencat?)"
 
-#: packfile.c:1899
+#: packfile.c:1888
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "desplaรงament abans d'inici d'รญndex de paquet per a %s (รญndex corromput?)"
 
-#: packfile.c:1903
+#: packfile.c:1892
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
@@ -4328,26 +4809,26 @@ msgstr ""
 msgid "did you mean `--%s` (with two dashes ?)"
 msgstr ""
 
-#: parse-options.c:859
+#: parse-options.c:860
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opciรณ desconeguda ยซ%sยป"
 
-#: parse-options.c:861
+#: parse-options.c:862
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "ยซswitchยป ยซ%cยป desconegut"
 
-#: parse-options.c:863
+#: parse-options.c:864
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "opciรณ no ascii desconeguda en la cadena: ยซ%sยป"
 
-#: parse-options.c:887
+#: parse-options.c:888
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:906
+#: parse-options.c:907
 #, c-format
 msgid "usage: %s"
 msgstr "รบs: %s"
@@ -4355,21 +4836,21 @@ msgstr "รบs: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:913
 #, c-format
 msgid "   or: %s"
 msgstr " o: %s"
 
-#: parse-options.c:915
+#: parse-options.c:916
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:955
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:968
+#: parse-options.c:969
 #, c-format
 msgid "alias of --%s"
 msgstr "ร lies de --%s"
@@ -4394,37 +4875,37 @@ msgstr "l'opciรณ ยซ%sยป espera ยซalwaysยป, ยซautoยป o ยซneverยป"
 msgid "malformed object name '%s'"
 msgstr "nom d'objecte ยซ%sยป mal format"
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No s'ha pogut fer %s escrivible pel grup"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "El carร cter d'escapament ยซ\\ยป no estร  permรจs com a รบltim carร cter en un "
 "valor d'un atribut"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Nomรฉs es permet una especificaciรณ ยซattr:ยป."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "una especificaciรณ d'atribut no pot estar buida"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nom d'atribut no vร lid %s"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "els parร metres d'especificaciรณ de camรญ ยซglobยป i ยซnoglobยป globals sรณn "
 "incompatibles"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4432,51 +4913,56 @@ msgstr ""
 "el parร metre d'especificaciรณ de camรญ ยซliteralยป global รฉs incompatible amb "
 "tots els altres parร metres d'especificaciรณ de camรญ globals"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "parร metre no vร lid per a la mร gia d'especificaciรณ de camรญ ยซprefixยป"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Mร gia d'especificaciรณ de camรญ no vร lida '%.*s' en ยซ%sยป"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "ยซ)ยป mancant al final de la mร gia d'especificaciรณ de camรญ en ยซ%sยป"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Mร gia d'especificaciรณ de camรญ no implementada ยซ%cยป en ยซ%sยป"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: ยซliteralยป i ยซglobยป sรณn incompatibles"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr "%s: ยซ%sยป รฉs fora del dipรฒsit"
 
-#: pathspec.c:514
+#: pathspec.c:516
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "ยซ%sยป (mnemรฒnic: ยซ%cยป)"
 
-#: pathspec.c:524
+#: pathspec.c:526
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 "%s: aquesta ordre no estร  admesa amb la mร gia d'especificaciรณ de camรญ: %s"
 
-#: pathspec.c:591
+#: pathspec.c:593
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "l'especificaciรณ de camรญ ยซ%sยป รฉs mรฉs enllร  d'un enllaรง simbรฒlic"
 
+#: pathspec.c:638
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr ""
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "no s'ha pogut escriure el paquet de buidatge"
@@ -4539,33 +5025,42 @@ msgstr "S'estร  actualitzant l'รญndex"
 msgid "unable to create threaded lstat: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr "no s'ha pogut analitzar el format --pretty"
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "Remot sense URL"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr ""
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "no s'ha pogut iniciar ยซlogยป"
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr "no s'ha pogut llegir la sortida de ยซlogยป"
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5163
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "no s'ha pogut analitzar la comissiรณ ยซ%sยป"
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "no s'ha pogut llegir la capรงalera de la gif ยซ%.*sยป"
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr "s'ha produรฏt un error en generar el diff"
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "no s'ha pogut llegir el fitxer de registre per ยซ%sยป"
@@ -4582,7 +5077,8 @@ msgstr "no es pot crear un blob buit a la base de dades d'objectes"
 #: read-cache.c:718
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr "%s: nomรฉs pot afegir fitxers normals, enllaรงos simbolics o directoris git"
+msgstr ""
+"%s: nomรฉs pot afegir fitxers normals, enllaรงos simbรฒlics o directoris git"
 
 #: read-cache.c:723
 #, fuzzy, c-format
@@ -4600,20 +5096,20 @@ msgid "unable to add '%s' to index"
 msgstr "no s'ha pogut afegir ยซ%sยป a l'รญndex"
 
 #: read-cache.c:805
-#, fuzzy, c-format
+#, c-format
 msgid "unable to stat '%s'"
-msgstr "no s'ha pogut actualitzar %s"
+msgstr "no s'ha pogut fer ยซstatยป a ยซ%sยป"
 
-#: read-cache.c:1314
-#, fuzzy, c-format
+#: read-cache.c:1325
+#, c-format
 msgid "'%s' appears as both a file and as a directory"
-msgstr "%s existeix i no รฉs directori"
+msgstr "ยซ%sยป apareix com a fitxer i com a directori"
 
-#: read-cache.c:1499
+#: read-cache.c:1531
 msgid "Refresh index"
 msgstr "Actualitza l'รญndex"
 
-#: read-cache.c:1613
+#: read-cache.c:1646
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4622,7 +5118,7 @@ msgstr ""
 "index.version estร  establerta, perรฒ el valor no รฉs vร lid.\n"
 "S'estร  usant la versiรณ %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1656
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4631,138 +5127,138 @@ msgstr ""
 "GIT_INDEX_VERSION estร  establerta, perรฒ el valor no รฉs vร lid.\n"
 "S'estร  usant la versiรณ %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1712
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "signatura malmesa 0x%08x"
 
-#: read-cache.c:1682
+#: read-cache.c:1715
 #, c-format
 msgid "bad index version %d"
 msgstr "versiรณ d'รญndex incorrecta %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1724
 msgid "bad index file sha1 signature"
 msgstr "signatura sha1 malmesa al fitxer d'รญndex"
 
-#: read-cache.c:1721
+#: read-cache.c:1754
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "l'รญndex usa l'extensiรณ %.4s, que no es pot entendre"
 
-#: read-cache.c:1723
+#: read-cache.c:1756
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "s'estร  ignorant l'extensiรณ %.4s"
 
-#: read-cache.c:1760
+#: read-cache.c:1793
 #, c-format
 msgid "unknown index entry format 0x%08x"
-msgstr "Format d'entrada d'รญndex desconeguda ยซ0x%08xยป"
+msgstr "format d'entrada d'รญndex desconeguda ยซ0x%08xยป"
 
-#: read-cache.c:1776
+#: read-cache.c:1809
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "camp del nom mal formatat l'index, camรญ a prop ยซ%sยป"
 
-#: read-cache.c:1833
+#: read-cache.c:1866
 msgid "unordered stage entries in index"
 msgstr ""
 
-#: read-cache.c:1836
+#: read-cache.c:1869
 #, fuzzy, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "nom d'identitat buit (per <%s>) no รฉs permรจs"
 
-#: read-cache.c:1839
+#: read-cache.c:1872
 #, fuzzy, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "no s'han pogut crear directoris per %s"
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470
+#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367
 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "fitxer d'รญndex malmรจs"
 
-#: read-cache.c:2087
+#: read-cache.c:2119
 #, fuzzy, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: read-cache.c:2100
+#: read-cache.c:2132
 #, fuzzy, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: read-cache.c:2133
+#: read-cache.c:2165
 #, fuzzy, c-format
 msgid "%s: index file open failed"
-msgstr "s'ha produรฏt un error en actualitzar els fitxers"
+msgstr "%s: s'ha produรฏt un error en actualitzar els fitxers"
 
-#: read-cache.c:2137
+#: read-cache.c:2169
 #, fuzzy, c-format
 msgid "%s: cannot stat the open index"
 msgstr "no es pot llegir l'รญndex"
 
-#: read-cache.c:2141
+#: read-cache.c:2173
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: fitxer d'รญndex mรฉs petit que s'esperava"
 
-#: read-cache.c:2145
+#: read-cache.c:2177
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s: no es pot mapar el fitxer d'รญndex"
 
-#: read-cache.c:2187
+#: read-cache.c:2219
 #, fuzzy, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: read-cache.c:2214
+#: read-cache.c:2246
 #, fuzzy, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: read-cache.c:2246
-#, fuzzy, c-format
+#: read-cache.c:2278
+#, c-format
 msgid "could not freshen shared index '%s'"
-msgstr "no s'ha pogut llegir el fitxer ยซ%sยป"
+msgstr "no s'ha pogut refrescar l'รญndex compartit ยซ%sยป"
 
-#: read-cache.c:2293
+#: read-cache.c:2325
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "รญndex malmรจs, s'esperava %s a %s, s'ha rebut %s"
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119
 #, c-format
 msgid "could not close '%s'"
 msgstr "no s'ha pogut tancar ยซ%sยป"
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069
 #, c-format
 msgid "could not stat '%s'"
 msgstr "no s'ha pogut fer stat a ยซ%sยป"
 
-#: read-cache.c:3105
+#: read-cache.c:3137
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no s'ha pogut obrir el directori git: %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3149
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no s'ha pogut desenllaรงar: %s"
 
-#: read-cache.c:3142
+#: read-cache.c:3174
 #, fuzzy, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "no s'ha pogut resoldre la revisiรณ: %s"
 
-#: read-cache.c:3291
+#: read-cache.c:3323
 #, fuzzy, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "no es pot canviar de directori a %s"
@@ -4863,8 +5359,8 @@ msgstr ""
 msgid "Note that empty commits are commented out"
 msgstr "Tingueu en compte que les comissions buides estan comentades"
 
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536
+#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254
 #, c-format
 msgid "could not write '%s'"
 msgstr "no s'ha pogut escriure ยซ%sยป"
@@ -4911,7 +5407,7 @@ msgstr "%s no apunta a un objecte vร lid"
 msgid "ignoring dangling symref %s"
 msgstr "s'estร  ignorant la referรจncia trencada %s"
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "s'estร  ignorant la referรจncia trencada %s"
@@ -4936,14 +5432,15 @@ msgstr "la referรจncia ยซ%sยป ja existeix"
 msgid "unexpected object ID when writing '%s'"
 msgstr "ID d'objecte no esperat en escriure ยซ%sยป"
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997
+#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "no s'ha pogut escriure a ยซ%sยป"
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714
+#: builtin/rebase.c:1031
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "no s'ha pogut obrir ยซ%sยป per a escriptura"
@@ -4978,21 +5475,21 @@ msgstr "s'estร  refusant la referรจncia amb nom malmรจs ยซ%sยป"
 msgid "update_ref failed for ref '%s': %s"
 msgstr "s'ha produรฏt un error en obrir ยซ%sยป: %s"
 
-#: refs.c:2012
+#: refs.c:2023
 #, fuzzy, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "nom d'identitat buit (per <%s>) no รฉs permรจs"
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "no estร  permรจs actualitzar les referรจncies en un entorn de quarantena"
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "ยซ%sยป existeix; no es pot crear ยซ%sยป"
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "no es poden processar ยซ%sยป i ยซ%sยป a la vegada"
@@ -5002,23 +5499,23 @@ msgstr "no es poden processar ยซ%sยป i ยซ%sยป a la vegada"
 msgid "could not remove reference %s"
 msgstr "no s'ha pogut eliminar la referรจncia %s"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1248 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no s'ha pogut suprimir la referรจncia %s: %s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "no s'han pogut suprimir les referรจncies: %s"
 
 #: refspec.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "invalid refspec '%s'"
-msgstr "fitxer no vร lid: ยซ%sยป"
+msgstr "refspec no vร lida: ยซ%sยป"
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr "no hi รฉs"
 
@@ -5037,280 +5534,280 @@ msgstr "darrere per %d"
 msgid "ahead %d, behind %d"
 msgstr "davant per %d, darrere per %d"
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "format esperat: %%(color:<color>)"
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconegut: %%(color:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
-msgstr "valor enter esperat pel nom de referรจncia:lstrip=%s"
+msgstr "Valor enter esperat pel nom de referรจncia:lstrip=%s"
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
-msgstr "valor enter esperat pel nom de referรจncia:rstrip=%s"
+msgstr "Valor enter esperat pel nom de referรจncia:rstrip=%s"
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "parร metre %%(%s) desconegut: %s"
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(subject) no accepta parร metres"
 
-#: ref-filter.c:269
-#, fuzzy, c-format
+#: ref-filter.c:272
+#, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "parร metre %%(objectname) no reconegut: %s"
+msgstr "parร metre %%(objectsize) no reconegut: %s"
 
-#: ref-filter.c:277
-#, fuzzy, c-format
+#: ref-filter.c:280
+#, c-format
 msgid "%%(deltabase) does not take arguments"
-msgstr "%%(objectsize) no accepta parร metres"
+msgstr "%%(deltabase) no accepta parร metres"
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no accepta parร metres"
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) no accepta parร metres"
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "parร metre %%(trailers) desconegut: %s"
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positiu esperat contรฉ:lines=%s"
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "parร metre %%(contents) no reconegut: %s"
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valor positiu esperat nom d'objecte:curt=%s"
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "parร metre %%(objectname) no reconegut: %s"
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format esperat: %%(align:<amplada>,<posiciรณ>)"
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posiciรณ no reconeguda:%s"
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "amplada no reconeguda:%s"
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "parร metre %%(align) no reconegut: %s"
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "amplada positiva esperada amb l'ร tom %%(align)"
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "parร metre %%(if) no reconegut: %s"
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de camp mal format: %.*s"
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de camp desconegut: %.*s"
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: s'ha usat l'ร tom %%(if) sense un ร tom %%(then)"
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: s'ha usat l'ร tom %%(then) sense un ร tom %%(if)"
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: s'ha usat l'ร tom %%(then) mรฉs d'un cop"
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: s'ha usat l'ร tom %%(then) desprรฉs de %%(else)"
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: s'ha usat l'ร tom %%(else) sense un ร tom %%(if)"
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format: s'ha usat l'ร tom %%(else) sense un ร tom %%(then)"
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: s'ha usat l'ร tom %%(else) mรฉs d'un cop"
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: s'ha usat l'ร tom %%(end) sense l'ร tom corresponent"
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr "cadena de format mal format %s"
 
-#: ref-filter.c:1485
-#, fuzzy, c-format
+#: ref-filter.c:1488
+#, c-format
 msgid "no branch, rebasing %s"
-msgstr "(cap branca, s'estร  fent ยซrebaseยป %s)"
+msgstr "sense branca, s'estร  fent ยซrebaseยป %s"
 
-#: ref-filter.c:1488
-#, fuzzy, c-format
+#: ref-filter.c:1491
+#, c-format
 msgid "no branch, rebasing detached HEAD %s"
-msgstr "(cap branca, s'estร  fent ยซrebaseยป d'un ยซHEADยป %s no adjuntat)"
+msgstr "sense branca, s'estร  fent ยซrebaseยป d'un ยซHEADยป %s no adjuntat"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
-msgstr "(cap branca, bisecciรณ comenรงada en %s)"
+msgstr "(sense branca, bisecciรณ comenรงada en %s)"
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr "sense branca"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr "manca l'objecte %s per a %s"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer ha fallat en %s per a %s"
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objecte mal format a ยซ%sยป"
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "s'estร  ignorant la referรจncia amb nom malmรจs %s"
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: manca l'ร tom %%(end)"
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr "l'opciรณ ยซ%sยป รฉs incompatible amb --merged"
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr "l'opciรณ ยซ%sยป รฉs incompatible amb --no-merged"
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objecte %s mal format"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'opciรณ ยซ%sยป ha d'apuntar a una comissiรณ"
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 
-#: remote.c:410
+#: remote.c:413
 msgid "more than one receivepack given, using the first"
 msgstr ""
 
-#: remote.c:418
+#: remote.c:421
 msgid "more than one uploadpack given, using the first"
 msgstr ""
 
-#: remote.c:608
+#: remote.c:611
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "No es poden obtenir ambdรณs %s i %s a %s"
 
-#: remote.c:612
+#: remote.c:615
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s generalment segueix %s, no %s"
 
-#: remote.c:616
+#: remote.c:619
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s segueix ambdรณs %s i %s"
 
-#: remote.c:684
+#: remote.c:687
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr ""
 
-#: remote.c:694
+#: remote.c:697
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr ""
 
-#: remote.c:1000
+#: remote.c:1003
 #, fuzzy, c-format
 msgid "src refspec %s does not match any"
 msgstr "%s: no coincideix amb l'รญndex"
 
-#: remote.c:1005
+#: remote.c:1008
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -5319,7 +5816,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1023
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5333,7 +5830,7 @@ msgid ""
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
 
-#: remote.c:1040
+#: remote.c:1043
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5341,7 +5838,7 @@ msgid ""
 "'%s:refs/heads/%s'?"
 msgstr ""
 
-#: remote.c:1045
+#: remote.c:1048
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5349,7 +5846,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1050
+#: remote.c:1053
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5357,7 +5854,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1055
+#: remote.c:1058
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5365,115 +5862,115 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1091
-#,  c-format
+#: remote.c:1094
+#, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "ยซ%sยป no es pot resoldre a una branca"
 
-#: remote.c:1102
+#: remote.c:1105
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "no s'ha pogut suprimir ยซ%sยป: la referรจncia remota no existeix"
 
-#: remote.c:1114
+#: remote.c:1117
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 
-#: remote.c:1121
+#: remote.c:1124
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1627 remote.c:1728
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no assenyala cap branca"
 
-#: remote.c:1633
+#: remote.c:1636
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no existeix la branca: ยซ%sยป"
 
-#: remote.c:1636
+#: remote.c:1639
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "cap font configurada per a la branca ยซ%sยป"
 
-#: remote.c:1642
+#: remote.c:1645
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la branca font ยซ%sยป no s'emmagatzema com a branca amb seguiment remot"
 
-#: remote.c:1657
+#: remote.c:1660
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "el destรญ de pujada ยซ%sยป en el remot ยซ%sยป no tรฉ cap branca amb seguiment remot"
 
-#: remote.c:1669
+#: remote.c:1672
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branca ยซ%sยป no tรฉ cap remot al qual pujar"
 
-#: remote.c:1679
+#: remote.c:1682
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "les especificacions de referรจncia de ยซ%sยป no inclouen ยซ%sยป"
 
-#: remote.c:1692
+#: remote.c:1695
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "push no tรฉ destรญ (push.default รฉs ยซnothing)"
 
-#: remote.c:1714
+#: remote.c:1717
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "no es pot resoldre una pujada 'simple' a un sol destรญ"
 
-#: remote.c:1840
+#: remote.c:1843
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "no s'ha pogut trobar la referรจncia remota %s"
 
-#: remote.c:1853
+#: remote.c:1856
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr ""
 
-#: remote.c:2016
+#: remote.c:2019
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "La vostra branca estร  basada en ยซ%sยป, perรฒ la font no hi รฉs.\n"
 
-#: remote.c:2020
+#: remote.c:2023
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (useu \"git branch --unset-upstream\" per a arreglar)\n"
 
-#: remote.c:2023
+#: remote.c:2026
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "La vostra branca estร  al dia amb ยซ%sยป.\n"
 
-#: remote.c:2027
+#: remote.c:2030
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "La vostra branca i ยซ%sยป es refereixen a diferents comissions.\n"
 
-#: remote.c:2030
+#: remote.c:2033
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 
-#: remote.c:2034
+#: remote.c:2037
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "La vostra branca estร  %2$d comissiรณ per davant de ยซ%1$sยป.\n"
 msgstr[1] "La vostra branca estร  %2$d comissions per davant de ยซ%1$sยป.\n"
 
-#: remote.c:2040
+#: remote.c:2043
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (useu \"git push\" per a publicar les vostres comissions locals)\n"
 
-#: remote.c:2043
+#: remote.c:2046
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5485,11 +5982,11 @@ msgstr[1] ""
 "La vostra branca estร  %2$d comissions per darrere de ยซ%1$sยป, i pot avanรงar-"
 "se rร pidament.\n"
 
-#: remote.c:2051
+#: remote.c:2054
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (useu ยซgit pullยป per a actualitzar la vostra branca local)\n"
 
-#: remote.c:2054
+#: remote.c:2057
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5504,43 +6001,42 @@ msgstr[1] ""
 "La vostra branca i ยซ%sยป han divergit,\n"
 "i tenen %d i %d comissions distintes cada una, respectivament.\n"
 
-#: remote.c:2064
+#: remote.c:2067
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (useu ยซgit pullยป per a fusionar la branca remota a la vostra)\n"
+msgstr "  (useu ยซgit pullยป per a fusionar la branca remota amb la vostra)\n"
 
-#: remote.c:2247
+#: remote.c:2250
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "no es pot analitzar el nom de l'objecte esperat ยซ%sยป"
 
 #: replace-object.c:21
-#, fuzzy, c-format
+#, c-format
 msgid "bad replace ref name: %s"
-msgstr "suprimeix les referรจncies reemplaรงades"
+msgstr "nom de la referรจncia reemplaรงada incorrecte: %s"
 
 #: replace-object.c:30
-#, fuzzy, c-format
+#, c-format
 msgid "duplicate replace ref: %s"
-msgstr "suprimeix les referรจncies reemplaรงades"
+msgstr "duplica les referรจncies reemplaรงades: %s"
 
 #: replace-object.c:73
-#, fuzzy, c-format
+#, c-format
 msgid "replace depth too high for object %s"
-msgstr "reemplaรงa l'etiqueta si existeix"
+msgstr "la profunditat de reemplaรงament รฉs massa alta per l'objecte %s"
 
 #: rerere.c:217 rerere.c:226 rerere.c:229
 msgid "corrupt MERGE_RR"
-msgstr ""
+msgstr "MERGE_RR corrupte"
 
 #: rerere.c:264 rerere.c:269
-#, fuzzy
 msgid "unable to write rerere record"
-msgstr "no s'ha pogut escriure l'objecte de nota"
+msgstr "no s'ha pogut escriure el registre ยซrerereยป"
 
 #: rerere.c:495
-#, fuzzy, c-format
+#, c-format
 msgid "there were errors while writing '%s' (%s)"
-msgstr "error en llegir %s"
+msgstr "s'han produรฏt errors en escriure ยซ%sยป (%s)"
 
 #: rerere.c:498
 #, fuzzy, c-format
@@ -5548,19 +6044,19 @@ msgid "failed to flush '%s'"
 msgstr "s'ha produรฏt un error en fer stat a ยซ%sยป"
 
 #: rerere.c:503 rerere.c:1039
-#, fuzzy, c-format
+#,  c-format
 msgid "could not parse conflict hunks in '%s'"
-msgstr "no s'ha pogut analitzar la comissiรณ ยซ%sยป"
+msgstr "no s'han pogut analitzar els pedaรงos en conflicte a ยซ%sยป"
 
 #: rerere.c:684
-#, fuzzy, c-format
+#, c-format
 msgid "failed utime() on '%s'"
-msgstr "s'ha produรฏt un error en obrir ยซ%sยป"
+msgstr "s'ha produรฏt un error en fer ยซfailed utime()ยป a ยซ%sยป"
 
 #: rerere.c:694
-#, fuzzy, c-format
+#, c-format
 msgid "writing '%s' failed"
-msgstr "la creaciรณ de ยซ%sยป ha fallat"
+msgstr "s'ha produรฏt un error en escriure ยซ%sยป"
 
 #: rerere.c:714
 #, c-format
@@ -5570,12 +6066,12 @@ msgstr ""
 #: rerere.c:753
 #, c-format
 msgid "Recorded resolution for '%s'."
-msgstr ""
+msgstr "Es recorda la resoluciรณ per a ยซ%sยป."
 
 #: rerere.c:788
 #, c-format
 msgid "Resolved '%s' using previous resolution."
-msgstr ""
+msgstr "S'ha resolt ยซ%sยป usant una resoluciรณ anterior."
 
 #: rerere.c:803
 #, fuzzy, c-format
@@ -5587,8 +6083,8 @@ msgstr "no es pot fer symlink en ยซ%sยป ยซ%sยป"
 msgid "Recorded preimage for '%s'"
 msgstr "no s'ha pogut llegir el fitxer de registre ยซ%sยป"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2067 builtin/log.c:1871
+#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no s'ha pogut crear el directori ยซ%sยป"
@@ -5604,9 +6100,9 @@ msgid "no remembered resolution for '%s'"
 msgstr "No s'ha pogut afegir el resultat de fusiรณ per a ยซ%sยป"
 
 #: rerere.c:1077
-#, fuzzy, c-format
+#, c-format
 msgid "cannot unlink '%s'"
-msgstr "no es pot fer readlink en ยซ%sยป"
+msgstr "no es pot fer ยซunlinkยป de ยซ%sยป"
 
 #: rerere.c:1087
 #, fuzzy, c-format
@@ -5619,68 +6115,67 @@ msgid "Forgot resolution for '%s'\n"
 msgstr "no s'ha pogut llegir el fitxer de registre ยซ%sยป"
 
 #: rerere.c:1199
-#, fuzzy
 msgid "unable to open rr-cache directory"
-msgstr "no s'ha pogut actualitzar l'arbre cau"
+msgstr "no s'ha pogut obrir el directori rr-cache"
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr "la vostra branca actual sembla malmesa"
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "la branca actual ยซ%sยป encara no tรฉ cap comissiรณ"
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent รฉs incompatible amb --bisect"
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
-msgstr ""
+msgstr "-L no รฉs encara compatible amb formats que no siguin ยซ-pยป o ยซ-sยป"
 
-#: run-command.c:763
+#: run-command.c:762
 msgid "open /dev/null failed"
 msgstr "s'ha produรฏt un error en obrir /dev/null"
 
-#: run-command.c:1269
-#, fuzzy, c-format
+#: run-command.c:1268
+#,                    c-format
 msgid "cannot create async thread: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'ha pogut crear fil ยซasyncยป: %s"
 
-#: run-command.c:1333
+#: run-command.c:1332
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 "You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "paquet de neteja no esperat quan estava llegint l'estat del desempaquetament "
 "remot"
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s"
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "s'ha produรฏt un error en el desempaquetament remot: %s"
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr "s'ha produรฏt un error en signar el certificat de pujada"
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr "el destรญ receptor no admet pujar --signed"
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5688,47 +6183,47 @@ msgstr ""
 "no s'estร  enviant una certificaciรณ de pujada perquรจ el destรญ receptor no "
 "admet pujar --signed"
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr "el destรญ receptor no admet pujar --atomic"
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr "el destรญ receptor no admet opcions de pujada"
 
-#: sequencer.c:187
+#: sequencer.c:189
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mode de neteja ยซ%sยป no vร lid en la comissiรณ del missatge"
 
-#: sequencer.c:292
-#, fuzzy, c-format
+#: sequencer.c:294
+#, c-format
 msgid "could not delete '%s'"
-msgstr "No s'ha pogut suprimir %s"
+msgstr "no s'ha pogut suprimir ยซ%sยป"
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr "no s'ha pogut suprimir ยซ%sยป"
 
-#: sequencer.c:321
+#: sequencer.c:323
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:323
+#: sequencer.c:325
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
+#: sequencer.c:327
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:327
-#, fuzzy, c-format
+#: sequencer.c:329
+#, c-format
 msgid "unknown action: %d"
-msgstr "Acciรณ desconeguda: %d"
+msgstr "acciรณ desconeguda: %d"
 
-#: sequencer.c:385
+#: sequencer.c:387
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5736,7 +6231,7 @@ msgstr ""
 "desprรฉs de resoldre els conflictes, marqueu els camins\n"
 "corregits amb 'git add <camins>' o 'git rm <camins>'"
 
-#: sequencer.c:388
+#: sequencer.c:390
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5746,44 +6241,44 @@ msgstr ""
 "corregits amb 'git add <camins>' o 'git rm <camins>'\n"
 "i cometeu el resultat amb 'git commit'"
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:403 sequencer.c:2993
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no s'ha pogut bloquejar ยซ%sยป"
 
-#: sequencer.c:408
+#: sequencer.c:410
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no s'ha pogut escriure el terminador de lรญnia a ยซ%sยป"
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013
+#: sequencer.c:3277
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "s'ha produรฏt un error en finalitzar ยซ%sยป"
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259
+#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117
+#: builtin/rebase.c:589
 #, c-format
 msgid "could not read '%s'"
 msgstr "no s'ha pogut llegir ยซ%sยป"
 
-#: sequencer.c:462
+#: sequencer.c:464
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "els vostres canvis locals se sobreescriurien per %s."
 
-#: sequencer.c:466
+#: sequencer.c:468
 msgid "commit your changes or stash them to proceed."
 msgstr "cometeu els vostres canvis o feu un ยซstashยป per a procedir."
 
-#: sequencer.c:498
+#: sequencer.c:500
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avanรง rร pid"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:539 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de neteja no vร lid %s"
@@ -5791,70 +6286,69 @@ msgstr "Mode de neteja no vร lid %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:632
+#: sequencer.c:633
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: No s'ha pogut escriure un fitxer d'รญndex nou"
 
-#: sequencer.c:649
+#: sequencer.c:650
 msgid "unable to update cache tree"
 msgstr "no s'ha pogut actualitzar l'arbre cau"
 
-#: sequencer.c:663
+#: sequencer.c:664
 msgid "could not resolve HEAD commit"
 msgstr "no s'ha pogut resoldre la comissiรณ HEAD"
 
-#: sequencer.c:743
-#, fuzzy, c-format
+#: sequencer.c:744
+#, c-format
 msgid "no key present in '%.*s'"
-msgstr "no s'ha pogut analitzar ยซ%.*sยป"
+msgstr "no hi ha una clau a ยซ%.*sยป"
 
-#: sequencer.c:754
+#: sequencer.c:755
 #, fuzzy, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "No s'ha pogut afegir el resultat de fusiรณ per a ยซ%sยป"
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705
+#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no s'ha pogut obrir ยซ%sยป per a lectura"
 
-#: sequencer.c:801
+#: sequencer.c:802
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "Ja s'ha donat ยซGIT_AUTHOR_NAMEยป"
 
-#: sequencer.c:806
+#: sequencer.c:807
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "Ja s'ha donat ยซGIT_AUTHOR_EMAILยป"
 
-#: sequencer.c:811
+#: sequencer.c:812
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "Ja s'ha donat ยซGIT_AUTHOR_DATEยป"
 
-#: sequencer.c:815
+#: sequencer.c:816
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable  ยซ%sยป desconeguda"
 
-#: sequencer.c:820
+#: sequencer.c:821
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "falta ยซGIT_AUTHOR_NAMEยป"
 
-#: sequencer.c:822
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "falta ยซGIT_AUTHOR_EMAILยป"
 
-#: sequencer.c:824
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "falta ยซGIT_AUTHOR_DATEยป"
 
-#: sequencer.c:884
-#, fuzzy, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "format de data no vร lid: %s"
+#: sequencer.c:902 sequencer.c:1427
+msgid "malformed ident line"
+msgstr "lรญnia d'identitat mal formada"
 
-#: sequencer.c:901
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5884,16 +6378,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:995
-#, fuzzy
-msgid "writing root commit"
-msgstr "no hi ha res a cometre\n"
-
-#: sequencer.c:1216
+#: sequencer.c:1218
 msgid "'prepare-commit-msg' hook failed"
 msgstr "el lligam ยซprepare-commit-msgยป ha fallat"
 
-#: sequencer.c:1223
+#: sequencer.c:1224
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5920,7 +6409,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: sequencer.c:1237
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5946,355 +6435,351 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1279
 msgid "couldn't look up newly created commit"
 msgstr "no s'ha pogut trobar la comissiรณ novament creada"
 
-#: sequencer.c:1280
+#: sequencer.c:1281
 msgid "could not parse newly created commit"
 msgstr "no s'ha pogut analitzar la comissiรณ novament creada"
 
-#: sequencer.c:1326
+#: sequencer.c:1327
 msgid "unable to resolve HEAD after creating commit"
 msgstr "no s'ha pogut resoldre HEAD desprรฉs de crear la comissiรณ"
 
-#: sequencer.c:1328
+#: sequencer.c:1329
 msgid "detached HEAD"
 msgstr "HEAD separat"
 
-#: sequencer.c:1332
+#: sequencer.c:1333
 msgid " (root-commit)"
-msgstr " (comissiรณ d'arrel)"
+msgstr " (comissiรณ arrel)"
 
-#: sequencer.c:1353
+#: sequencer.c:1354
 msgid "could not parse HEAD"
 msgstr "no s'ha pogut analitzar HEAD"
 
-#: sequencer.c:1355
+#: sequencer.c:1356
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s no รฉs una comissiรณ!"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569
 msgid "could not parse HEAD commit"
 msgstr "no s'ha pogut analitzar la comissiรณ HEAD"
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1411 sequencer.c:2055
 msgid "unable to parse commit author"
 msgstr "no s'ha pogut analitzar l'autor de la comissiรณ"
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1431
+msgid "corrupted author without date information"
+msgstr "autor malmรจs sense informaciรณ de data"
+
+#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree ha fallat en escriure un arbre"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1480 sequencer.c:1550
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "no s'ha pogut llegir el missatge de comissiรณ des de ยซ%sยป"
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883
+#: builtin/merge.c:908
 msgid "failed to write commit object"
 msgstr "s'ha produรฏt un error en escriure l'objecte de comissiรณ"
 
-#: sequencer.c:1526
+#: sequencer.c:1577
 #, c-format
 msgid "could not parse commit %s"
 msgstr "no s'ha pogut analitzar la comissiรณ %s"
 
-#: sequencer.c:1531
+#: sequencer.c:1582
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "no s'ha pogut analitzar la comissiรณ pare %s"
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1656 sequencer.c:1767
 #, c-format
 msgid "unknown command: %d"
 msgstr "ordre desconeguda: %d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1714 sequencer.c:1739
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Aixรฒ รฉs una combinaciรณ de %d comissions."
 
-#: sequencer.c:1672
+#: sequencer.c:1724
 msgid "need a HEAD to fixup"
 msgstr "cal un HEAD per reparar-ho"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1726 sequencer.c:3304
 msgid "could not read HEAD"
 msgstr "no s'ha pogut llegir HEAD"
 
-#: sequencer.c:1676
+#: sequencer.c:1728
 msgid "could not read HEAD's commit message"
 msgstr "no s'ha pogut llegir el missatge de comissiรณ de HEAD"
 
-#: sequencer.c:1682
+#: sequencer.c:1734
 #, c-format
 msgid "cannot write '%s'"
 msgstr "no es pot escriure ยซ%sยป"
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1741 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "Aquest รฉs el 1r missatge de comissiรณ:"
 
-#: sequencer.c:1697
+#: sequencer.c:1749
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no s'ha pogut llegir el missatge de comissiรณ: %s"
 
-#: sequencer.c:1704
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Aquest รฉs el missatge de comissiรณ #%d:"
 
-#: sequencer.c:1710
+#: sequencer.c:1762
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El missatge de comissiรณ nรบm. #%d s'ometrร :"
 
-#: sequencer.c:1798
+#: sequencer.c:1850
 msgid "your index file is unmerged."
 msgstr "el vostre fitxer d'รญndex estร  sense fusionar."
 
-#: sequencer.c:1805
-#, fuzzy
+#: sequencer.c:1857
 msgid "cannot fixup root commit"
-msgstr "no es pot trobar la comissiรณ %s (%s)"
+msgstr "no es pot arreglar la comissiรณ arrel"
 
-#: sequencer.c:1824
+#: sequencer.c:1876
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "la comissiรณ %s รฉs una fusiรณ perรฒ no s'ha donat cap opciรณ -m."
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1884 sequencer.c:1892
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "la comissiรณ %s no tรฉ pare %d"
 
-#: sequencer.c:1846
+#: sequencer.c:1898
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "no es pot obtenir el missatge de comissiรณ de %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1917
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no es pot analitzar la comissiรณ pare %s"
 
-#: sequencer.c:1930
+#: sequencer.c:1982
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no s'ha pogut canviar el nom ยซ%sยป a ยซ%sยป"
 
-#: sequencer.c:1985
+#: sequencer.c:2037
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no s'ha pogut revertir %s... %s"
 
-#: sequencer.c:1986
+#: sequencer.c:2038
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no s'ha pogut aplicar %s... %s"
 
-#: sequencer.c:2045
+#: sequencer.c:2105
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: s'ha produรฏt un error en llegir l'รญndex"
 
-#: sequencer.c:2052
+#: sequencer.c:2112
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: s'ha produรฏt un error en actualitzar l'รญndex"
 
-#: sequencer.c:2128
+#: sequencer.c:2189
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s no accepta parร metres: ยซ%sยป"
 
-#: sequencer.c:2137
+#: sequencer.c:2198
 #, c-format
 msgid "missing arguments for %s"
 msgstr "falten els arguments per %s"
 
-#: sequencer.c:2174
-#, fuzzy, c-format
+#: sequencer.c:2235
+#, c-format
 msgid "could not parse '%.*s'"
-msgstr "no s'ha pogut analitzar ยซ%sยป"
+msgstr "no s'ha pogut analitzar ยซ%.*sยป"
 
-#: sequencer.c:2228
+#: sequencer.c:2289
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "lรญnia no vร lida %d: %.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2300
 #, c-format
 msgid "cannot '%s' without a previous commit"
-msgstr "No es pot ยซ%sยป sense una comissiรณ prรจvia"
+msgstr "no es pot ยซ%sยป sense una comissiรณ prรจvia"
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
+#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197
+#: builtin/rebase.c:223 builtin/rebase.c:248
 #, c-format
 msgid "could not read '%s'."
 msgstr "no s'ha pogut llegir ยซ%sยป."
 
-#: sequencer.c:2323
-#, fuzzy
+#: sequencer.c:2384
 msgid "cancelling a cherry picking in progress"
-msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs"
+msgstr "s'estร  cancelยทlant un ยซcherry pickยป en curs"
 
-#: sequencer.c:2330
-#, fuzzy
+#: sequencer.c:2391
 msgid "cancelling a revert in progress"
-msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs"
+msgstr "s'estร  cancelยทlant la reversiรณ en curs"
 
-#: sequencer.c:2364
+#: sequencer.c:2435
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "corregiu-ho usant ยซgit rebase --edit-todoยป."
 
-#: sequencer.c:2366
+#: sequencer.c:2437
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "full d'instruccions inusable: ยซ%sยป"
 
-#: sequencer.c:2371
+#: sequencer.c:2442
 msgid "no commits parsed."
 msgstr "no s'ha analitzat cap comissiรณ."
 
-#: sequencer.c:2382
+#: sequencer.c:2453
 msgid "cannot cherry-pick during a revert."
 msgstr "no es pot fer ยซcherry pickยป durant una reversiรณ."
 
-#: sequencer.c:2384
+#: sequencer.c:2455
 msgid "cannot revert during a cherry-pick."
 msgstr "no es pot revertir durant un ยซcherry pickยป."
 
-#: sequencer.c:2466
+#: sequencer.c:2533
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor no vร lid per a %s: %s"
 
-#: sequencer.c:2553
+#: sequencer.c:2630
 msgid "unusable squash-onto"
-msgstr ""
+msgstr "ยซsquash-ontoยป no usable"
 
-#: sequencer.c:2569
+#: sequencer.c:2646
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "full d'opcions mal format: ยซ%sยป"
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2736 sequencer.c:4463
 msgid "empty commit set passed"
 msgstr "conjunt de comissions buit passat"
 
-#: sequencer.c:2668
-#, fuzzy
+#: sequencer.c:2752
 msgid "revert is already in progress"
-msgstr "un ยซcherry pickยป o una reversiรณ ja estร  en curs"
+msgstr "una reversiรณ ja estร  en curs"
 
-#: sequencer.c:2670
-#, fuzzy, c-format
+#: sequencer.c:2754
+#, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "intenteu ยซgit revert (--continue | %s--abort | --quit)ยป"
 
-#: sequencer.c:2673
-#, fuzzy
+#: sequencer.c:2757
 msgid "cherry-pick is already in progress"
-msgstr "un ยซcherry pickยป o una reversiรณ ja estร  en curs"
+msgstr "un ยซcherry pickยป ja estร  en curs"
 
-#: sequencer.c:2675
-#, fuzzy, c-format
+#: sequencer.c:2759
+#, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "intenteu ยซgit cherry-pick (--continue | %s--abort | --quit)ยป"
 
-#: sequencer.c:2689
+#: sequencer.c:2773
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no s'ha pogut crear el directori de seqรผenciador ยซ%sยป"
 
-#: sequencer.c:2704
+#: sequencer.c:2788
 msgid "could not lock HEAD"
 msgstr "no s'ha pogut bloquejar HEAD"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2848 sequencer.c:4209
 msgid "no cherry-pick or revert in progress"
 msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2850 sequencer.c:2861
 msgid "cannot resolve HEAD"
 msgstr "no es pot resoldre HEAD"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2852 sequencer.c:2896
 msgid "cannot abort from a branch yet to be born"
 msgstr "no es pot avortar des d'una branca que encara ha de nร ixer"
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2882 builtin/grep.c:736
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no es pot obrir ยซ%sยป"
 
-#: sequencer.c:2800
+#: sequencer.c:2884
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no es pot llegir ยซ%sยป: %s"
 
-#: sequencer.c:2801
+#: sequencer.c:2885
 msgid "unexpected end of file"
 msgstr "final de fitxer inesperat"
 
-#: sequencer.c:2807
+#: sequencer.c:2891
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "el fitxer HEAD emmagatzemat abans de fer ยซcherry pickยป ยซ%sยป รฉs malmรจs"
 
-#: sequencer.c:2818
+#: sequencer.c:2902
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
 
-#: sequencer.c:2859
-#, fuzzy
+#: sequencer.c:2943
 msgid "no revert in progress"
-msgstr "No hi ha un ยซrebaseยป en curs?"
+msgstr "no hi ha cap reversiรณ en curs"
 
-#: sequencer.c:2867
-#, fuzzy
+#: sequencer.c:2951
 msgid "no cherry-pick in progress"
-msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs"
+msgstr "ni hi ha cap ยซcherry pickยป en curs"
 
-#: sequencer.c:2877
-#, fuzzy
+#: sequencer.c:2961
 msgid "failed to skip the commit"
-msgstr "s'ha produรฏt un error en escriure l'objecte de comissiรณ"
+msgstr "s'ha produรฏt un error en ometre la comissiรณ"
 
-#: sequencer.c:2884
+#: sequencer.c:2968
 msgid "there is nothing to skip"
-msgstr ""
+msgstr "no hi ha res a ometre"
 
-#: sequencer.c:2887
+#: sequencer.c:2971
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3095 sequencer.c:4121
 #, c-format
 msgid "could not update %s"
 msgstr "no s'ha pogut actualitzar %s"
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3134 sequencer.c:4101
 msgid "cannot read HEAD"
-msgstr "No es pot llegir HEAD"
+msgstr "no es pot llegir HEAD"
 
-#: sequencer.c:3066
+#: sequencer.c:3151
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "no s'ha pogut copiar ยซ%sยป a ยซ%sยป"
 
-#: sequencer.c:3074
-#, fuzzy, c-format
+#: sequencer.c:3159
+#, c-format
 msgid ""
 "You can amend the commit now, with\n"
 "\n"
@@ -6306,33 +6791,28 @@ msgid ""
 msgstr ""
 "Podeu esmenar la comissiรณ ara, amb\n"
 "\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"  git commit --amend %s\n"
 "\n"
 "Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
 "\n"
-"\tgit rebase --continue"
+"  git rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3169
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "No s'ha pogut aplicar %s... %.*s"
 
-#: sequencer.c:3091
+#: sequencer.c:3176
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "No s'ha pogut fusionar %.*s"
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no s'ha pogut copiar ยซ%sยป a ยซ%sยป"
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "no s'ha pogut llegir l'รญndex"
-
-#: sequencer.c:3136
+#: sequencer.c:3221
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6347,11 +6827,11 @@ msgstr ""
 " git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3227
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "i ha fet canvis a l'รญndex i/o l'arbre de treball\n"
 
-#: sequencer.c:3148
+#: sequencer.c:3233
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6367,79 +6847,72 @@ msgstr ""
 "\n"
 " git rebase --continue\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3294
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nom d'etiqueta no permรจs: ยซ%.*sยป"
 
-#: sequencer.c:3263
-#, fuzzy
+#: sequencer.c:3348
 msgid "writing fake root commit"
-msgstr "no hi ha res a cometre\n"
+msgstr "s'estร  escrivint una comissiรณ arrel falsa"
 
-#: sequencer.c:3268
+#: sequencer.c:3353
 msgid "writing squash-onto"
-msgstr ""
+msgstr "s'estร  escrivint ยซsquash-ontoยป"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
-#, fuzzy, c-format
+#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882
+#, c-format
 msgid "failed to find tree of %s"
-msgstr "S'ha produรฏt un error en cercar l'arbre de %s."
-
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "no s'ha pogut escriure l'รญndex"
+msgstr "s'ha produรฏt un error en cercar l'arbre de %s"
 
-#: sequencer.c:3351
+#: sequencer.c:3436
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "no s'ha pogut resoldre ยซ%sยป"
 
-#: sequencer.c:3379
-#, fuzzy
+#: sequencer.c:3467
 msgid "cannot merge without a current revision"
-msgstr "No es pot ยซ%sยป sense una comissiรณ prรจvia"
+msgstr "no es pot fusionar sense una revisiรณ actual"
 
-#: sequencer.c:3401
+#: sequencer.c:3489
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "no s'ha pogut analitzar ยซ%.*sยป"
 
-#: sequencer.c:3410
+#: sequencer.c:3498
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "no hi ha res per fusionar ยซ%.*sยป"
 
-#: sequencer.c:3422
+#: sequencer.c:3510
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 
-#: sequencer.c:3437
-#, fuzzy, c-format
+#: sequencer.c:3526
+#, c-format
 msgid "could not get commit message of '%s'"
-msgstr "no s'ha pogut llegir el missatge de comissiรณ: %s"
+msgstr "no s'ha pogut llegir el missatge de comissiรณ de ยซ%sยป"
 
-#: sequencer.c:3590
+#: sequencer.c:3688
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "no s'ha pogut fusionar ยซ%.*sยป"
 
-#: sequencer.c:3606
-#, fuzzy
+#: sequencer.c:3704
 msgid "merge: Unable to write new index file"
-msgstr "%s: No s'ha pogut escriure un fitxer d'รญndex nou"
+msgstr "fusiรณ: no s'ha pogut escriure un fitxer d'รญndex nou"
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3773 builtin/rebase.c:733
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "S'ha aplicat el ยซstashยป automร ticament.\n"
 
-#: sequencer.c:3687
+#: sequencer.c:3785
 #, c-format
 msgid "cannot store %s"
 msgstr "no es pot emmagatzemar %s"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6450,31 +6923,31 @@ msgstr ""
 "Els vostres canvis estan segurs en el ยซstashยป.\n"
 "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
 
-#: sequencer.c:3751
-#, fuzzy, c-format
+#: sequencer.c:3849
+#, c-format
 msgid "could not checkout %s"
 msgstr "no es pot agafar %s"
 
-#: sequencer.c:3765
-#, fuzzy, c-format
+#: sequencer.c:3863
+#, c-format
 msgid "%s: not a valid OID"
-msgstr "ยซ%sยป no รฉs un terme vร lid"
+msgstr "%s: no รฉs un OID vร lid"
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3868 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "no s'ha pogut separar HEAD"
 
-#: sequencer.c:3785
-#, fuzzy, c-format
+#: sequencer.c:3883
+#, c-format
 msgid "Stopped at HEAD\n"
-msgstr "Aturat a %s...  %.*s\n"
+msgstr "Aturat a HEAD\n"
 
-#: sequencer.c:3787
-#, fuzzy, c-format
+#: sequencer.c:3885
+#, c-format
 msgid "Stopped at %s\n"
-msgstr "Aturat a %s...  %.*s\n"
+msgstr "Aturat a %s\n"
 
-#: sequencer.c:3795
+#: sequencer.c:3893
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6487,48 +6960,48 @@ msgid ""
 "    git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:3877
+#: sequencer.c:3979
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Aturat a %s...  %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:4050
 #, c-format
 msgid "unknown command %d"
 msgstr "ordre %d desconeguda"
 
-#: sequencer.c:4003
+#: sequencer.c:4109
 msgid "could not read orig-head"
-msgstr "No s'ha pogut llegir orig-head"
+msgstr "no s'ha pogut llegir orig-head"
 
-#: sequencer.c:4008
+#: sequencer.c:4114
 msgid "could not read 'onto'"
 msgstr "no s'ha pogut llegir 'onto'"
 
-#: sequencer.c:4022
+#: sequencer.c:4128
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no s'ha pogut actualitzar HEAD a %s"
 
-#: sequencer.c:4115
+#: sequencer.c:4221
 msgid "cannot rebase: You have unstaged changes."
 msgstr "No es pot fer ยซrebaseยป: teniu canvis ยซunstagedยป."
 
-#: sequencer.c:4124
+#: sequencer.c:4230
 msgid "cannot amend non-existing commit"
 msgstr "no es pot esmenar una comissiรณ no existent"
 
-#: sequencer.c:4126
+#: sequencer.c:4232
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fitxer no vร lid: ยซ%sยป"
 
-#: sequencer.c:4128
+#: sequencer.c:4234
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contingut no vร lid: ยซ%sยป"
 
-#: sequencer.c:4131
+#: sequencer.c:4237
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6536,44 +7009,44 @@ msgid ""
 msgstr ""
 "\n"
 "Teniu canvis no comesos en el vostre arbre de treball. \n"
-"Primer cometeu-los i desprรฉs executeu 'git rebase --continue' de nou."
+"Cometeu-los primer i desprรฉs executeu ยซgit rebase --continueยป de nou."
 
-#: sequencer.c:4167 sequencer.c:4205
-#, fuzzy, c-format
+#: sequencer.c:4273 sequencer.c:4312
+#,  c-format
 msgid "could not write file: '%s'"
-msgstr "no s'ha pogut crear el fitxer ยซ%sยป"
+msgstr "no s'ha pogut escriure el fitxer: ยซ%sยป"
 
-#: sequencer.c:4220
+#: sequencer.c:4327
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
 
-#: sequencer.c:4227
+#: sequencer.c:4334
 msgid "could not commit staged changes."
-msgstr "No s'han pogut cometre els canvis ยซstagedยป."
+msgstr "no s'han pogut cometre els canvis ยซstagedยป."
 
-#: sequencer.c:4328
+#: sequencer.c:4440
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no es pot fer ยซcherry pickยป a %s"
 
-#: sequencer.c:4332
+#: sequencer.c:4444
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisiรณ incorrecta"
 
-#: sequencer.c:4367
+#: sequencer.c:4479
 msgid "can't revert as initial commit"
 msgstr "no es pot revertir com a comissiรณ inicial"
 
-#: sequencer.c:4810
+#: sequencer.c:4952
 msgid "make_script: unhandled options"
 msgstr "make_script: opcions no gestionades"
 
-#: sequencer.c:4813
+#: sequencer.c:4955
 msgid "make_script: error preparing revisions"
 msgstr "make_script: s'ha produรฏt un error en preparar les revisions"
 
-#: sequencer.c:4971
+#: sequencer.c:5113
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'.\n"
@@ -6582,24 +7055,24 @@ msgstr ""
 "Podeu arreglar aixรฒ amb 'git rebase --edit-todo' i desprรฉs 'git rebase --"
 "continue'.\n"
 
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5226 sequencer.c:5243
 msgid "nothing to do"
 msgstr "res a fer"
 
-#: sequencer.c:5114
+#: sequencer.c:5257
 msgid "could not skip unnecessary pick commands"
 msgstr "no s'han pogut ometre les ordres ยซpicksยป no necessร ries"
 
-#: sequencer.c:5197
+#: sequencer.c:5351
 msgid "the script was already rearranged."
 msgstr "l'script ja estava endreรงat."
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
 msgid "'%s' is outside repository"
 msgstr "ยซ%sยป รฉs fora del dipรฒsit"
 
-#: setup.c:173
+#: setup.c:174
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6609,7 +7082,7 @@ msgstr ""
 "Useu ยซgit <ordre> -- <camรญ>...ยป per a especificar camins que no existeixin "
 "localment."
 
-#: setup.c:186
+#: setup.c:187
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6621,12 +7094,12 @@ msgstr ""
 "Useu ยซ--ยป per a separar els camins de les revisions:\n"
 "'git <ordre> [<revisiรณ>...] -- [<fitxer>...]'"
 
-#: setup.c:235
+#: setup.c:236
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "l'opciรณ ยซ%sยป ha de venir abans dels arguments opcionals"
 
-#: setup.c:254
+#: setup.c:255
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6637,104 +7110,104 @@ msgstr ""
 "Useu '--' per a separar els camins de les revisions:\n"
 "'git <ordre> [<revisiรณ>...] -- [<fitxer>...]'"
 
-#: setup.c:390
+#: setup.c:391
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "no s'ha pogut configurar un arbre de treball utilitzant una configuraciรณ no "
 "vร lida"
 
-#: setup.c:394
+#: setup.c:395
 msgid "this operation must be run in a work tree"
 msgstr "aquesta operaciรณ s'ha d'executar en un arbre de treball"
 
-#: setup.c:540
+#: setup.c:541
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "S'esperava una versiรณ de dipรฒsit de git <= %d, s'ha trobat %d"
 
-#: setup.c:548
+#: setup.c:549
 msgid "unknown repository extensions found:"
 msgstr "s'han trobat extensions de dipรฒsit desconegudes:"
 
-#: setup.c:567
+#: setup.c:568
 #, c-format
 msgid "error opening '%s'"
 msgstr "s'ha produรฏt un error en obrir ยซ%sยป"
 
-#: setup.c:569
+#: setup.c:570
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "massa larg per a ser un fitxer .git: ยซ%sยป"
 
-#: setup.c:571
+#: setup.c:572
 #, c-format
 msgid "error reading %s"
 msgstr "error en llegir %s"
 
-#: setup.c:573
+#: setup.c:574
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "format gitfile no vร lid: %s"
 
-#: setup.c:575
+#: setup.c:576
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "sense camรญ al gitfile: %s"
 
-#: setup.c:577
+#: setup.c:578
 #, c-format
 msgid "not a git repository: %s"
 msgstr "no รฉs un dipรฒsit de git: %s"
 
-#: setup.c:676
+#: setup.c:677
 #, c-format
 msgid "'$%s' too big"
 msgstr "ยซ$%sยป massa gran"
 
-#: setup.c:690
+#: setup.c:691
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "no รฉs un dipรฒsit de git: ยซ%sยป"
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:720 setup.c:722 setup.c:753
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "no es pot canviar de directori a ยซ%sยป"
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
 msgid "cannot come back to cwd"
 msgstr "no es pot tornar al directori de treball actual"
 
-#: setup.c:851
+#: setup.c:852
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "s'ha produรฏt un error en fer stat a ยซ%*s%s%sยป"
 
-#: setup.c:1083
+#: setup.c:1090
 msgid "Unable to read current working directory"
 msgstr "No s'ha pogut llegir el directori de treball actual"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1099 setup.c:1105
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no es pot canviar a ยซ%sยป"
 
-#: setup.c:1103
+#: setup.c:1110
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "no รฉs un dipรฒsit de git (ni cap dels directoris pares): %s"
 
-#: setup.c:1109
+#: setup.c:1116
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"no un dipรฒsit de git (ni cap pare fins al punt de muntatge %s)\n"
+"no รฉs un dipรฒsit de git (ni cap pare fins al punt de muntatge %s)\n"
 "S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "no estร  establert)."
 
-#: setup.c:1220
+#: setup.c:1227
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6745,294 +7218,288 @@ msgstr ""
 "El propietari dels fitxers sempre ha de tenir permisos de lectura i "
 "escriptura."
 
-#: setup.c:1264
+#: setup.c:1271
 msgid "open /dev/null or dup failed"
 msgstr "s'ha produรฏt un error en obrir /dev/null o dup"
 
-#: setup.c:1279
+#: setup.c:1286
 msgid "fork failed"
 msgstr "el ยซforkยป ha fallat"
 
-#: setup.c:1284
+#: setup.c:1291
 msgid "setsid failed"
 msgstr "l'ยซstashยป ha fallat"
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
+msgstr "no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates"
 
-#: sha1-file.c:504
-#, fuzzy, c-format
+#: sha1-file.c:503
+#, c-format
 msgid "unable to normalize alternate object path: %s"
-msgstr "no s'ha pogut analitzar l'objecte: %s"
+msgstr "no s'ha pogut normalitzar el camรญ a l'objecte alternatiu: %s"
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 
-#: sha1-file.c:583
-#, fuzzy, c-format
+#: sha1-file.c:582
+#, c-format
 msgid "unable to normalize object directory: %s"
-msgstr "no s'ha pogut analitzar l'objecte: %s"
+msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s"
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 #, fuzzy
 msgid "unable to fdopen alternates lockfile"
 msgstr "no s'han pogut escriure els parร metres al fitxer de configuraciรณ"
 
-#: sha1-file.c:644
-#, fuzzy
+#: sha1-file.c:643
 msgid "unable to read alternates file"
-msgstr "no es pot llegir el fitxer d'รญndex"
+msgstr "no es pot llegir el fitxer ยซalternatesยป"
 
-#: sha1-file.c:651
-#, fuzzy
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
-msgstr "no s'ha pogut escriure un fitxer d'รญndex nou"
+msgstr "no s'ha pogut moure el nou fitxer ยซalternatesยป al lloc"
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "el camรญ ยซ%sยป no existeix"
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "Encara no se suporta el dipรฒsit de referรจncia ยซ%sยป com a agafament enllaรงat."
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "el dipรฒsit de referรจncia ยซ%sยป no รฉs un dipรฒsit local."
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "el dipรฒsit de referรจncia ยซ%sยป รฉs superficial"
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "el dipรฒsit de referรจncia ยซ%sยป รฉs empeltat"
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
+msgstr "lรญnia no vร lida quan s'analitzaven les referรจncies de l'ยซalternateยป: %s"
 
 #: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 
-#: sha1-file.c:968
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr "mmap ha fallat"
 
-#: sha1-file.c:1132
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr "el tipus d'objecte %s รฉs buit"
 
-#: sha1-file.c:1256 sha1-file.c:2395
+#: sha1-file.c:1252 sha1-file.c:2392
 #, fuzzy, c-format
 msgid "corrupt loose object '%s'"
 msgstr "no s'ha pogut analitzar l'objecte ยซ%sยป"
 
-#: sha1-file.c:1258 sha1-file.c:2399
+#: sha1-file.c:1254 sha1-file.c:2396
 #, fuzzy, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "no s'ha pogut analitzar l'objecte: %s"
 
-#: sha1-file.c:1300
-#, fuzzy
+#: sha1-file.c:1296
 msgid "invalid object type"
-msgstr "el tipus d'objecte รฉs incorrecte."
+msgstr "tipus d'objecte รฉs incorrecte"
 
-#: sha1-file.c:1384
+#: sha1-file.c:1380
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
+msgstr "no s'ha pogut desempaquetar la capรงalera %s amb --allow-unknown-type"
 
-#: sha1-file.c:1387
-#, fuzzy, c-format
+#: sha1-file.c:1383
+#, c-format
 msgid "unable to unpack %s header"
-msgstr "no s'ha pogut actualitzar %s"
+msgstr "no s'ha pogut desempaquetar la capรงalera %s"
 
-#: sha1-file.c:1393
+#: sha1-file.c:1389
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
+msgstr "no s'ha pogut analitzar la capรงalera %s amb --allow-unknown-type"
 
-#: sha1-file.c:1396
-#, fuzzy, c-format
+#: sha1-file.c:1392
+#, c-format
 msgid "unable to parse %s header"
-msgstr "no s'ha pogut actualitzar %s"
+msgstr "no s'ha pogut analitzar la capรงalera %s"
 
-#: sha1-file.c:1587
-#, fuzzy, c-format
+#: sha1-file.c:1584
+#, c-format
 msgid "failed to read object %s"
-msgstr "s'ha produรฏt un error en llegir l'objecte ยซ%sยป."
+msgstr "s'ha produรฏt un error en llegir l'objecte %s"
 
-#: sha1-file.c:1591
+#: sha1-file.c:1588
 #, fuzzy, c-format
 msgid "replacement %s not found for %s"
 msgstr "no s'han trobat les plantilles %s"
 
-#: sha1-file.c:1595
+#: sha1-file.c:1592
 #, fuzzy, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "l'objecte local %s รฉs malmรจs"
 
-#: sha1-file.c:1599
+#: sha1-file.c:1596
 #, fuzzy, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "l'objecte local %s รฉs malmรจs"
 
-#: sha1-file.c:1702
-#, fuzzy, c-format
+#: sha1-file.c:1699
+#, c-format
 msgid "unable to write file %s"
-msgstr "no s'ha pogut escriure %s"
+msgstr "no s'ha pogut escriure al fitxer %s"
 
-#: sha1-file.c:1709
+#: sha1-file.c:1706
 #, fuzzy, c-format
 msgid "unable to set permission to '%s'"
 msgstr "no s'ha pogut resoldre la revisiรณ: %s"
 
-#: sha1-file.c:1716
-#, fuzzy
+#: sha1-file.c:1713
 msgid "file write error"
-msgstr "escriptura fallada al rev-list"
+msgstr "s'ha produรฏt un error en escriure al fitxer"
 
-#: sha1-file.c:1735
+#: sha1-file.c:1732
 #, fuzzy
 msgid "error when closing loose object file"
 msgstr "error en tancar el fitxer de paquet"
 
-#: sha1-file.c:1800
+#: sha1-file.c:1797
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 
-#: sha1-file.c:1802
-#, fuzzy
+#: sha1-file.c:1799
 msgid "unable to create temporary file"
-msgstr "no s'ha pogut crear un รญndex temporal"
+msgstr "no s'ha pogut crear un fitxer temporal"
 
-#: sha1-file.c:1826
+#: sha1-file.c:1823
 #, fuzzy
 msgid "unable to write loose object file"
 msgstr "no s'ha pogut escriure l'objecte de nota"
 
-#: sha1-file.c:1832
+#: sha1-file.c:1829
 #, fuzzy, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
 
-#: sha1-file.c:1836
+#: sha1-file.c:1833
 #, fuzzy, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "ha fallat fstat a %s"
 
-#: sha1-file.c:1840
+#: sha1-file.c:1837
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr ""
 
-#: sha1-file.c:1850 builtin/pack-objects.c:920
+#: sha1-file.c:1847 builtin/pack-objects.c:925
 #, fuzzy, c-format
 msgid "failed utime() on %s"
 msgstr "s'ha produรฏt un error en obrir ยซ%sยป"
 
-#: sha1-file.c:1925
+#: sha1-file.c:1922
 #, fuzzy, c-format
 msgid "cannot read object for %s"
 msgstr "no es pot llegir l'objecte %s"
 
-#: sha1-file.c:1965
+#: sha1-file.c:1962
 #, fuzzy
 msgid "corrupt commit"
 msgstr "autor corregit de la comissiรณ"
 
-#: sha1-file.c:1973
+#: sha1-file.c:1970
 #, fuzzy
 msgid "corrupt tag"
 msgstr "informa de les etiquetes"
 
-#: sha1-file.c:2072
+#: sha1-file.c:2069
 #, fuzzy, c-format
 msgid "read error while indexing %s"
 msgstr "error en llegir %s"
 
-#: sha1-file.c:2075
+#: sha1-file.c:2072
 #, fuzzy, c-format
 msgid "short read while indexing %s"
 msgstr "no es pot llegir l'รญndex"
 
-#: sha1-file.c:2148 sha1-file.c:2157
+#: sha1-file.c:2145 sha1-file.c:2154
 #, fuzzy, c-format
 msgid "%s: failed to insert into database"
 msgstr "gpg ha fallat en signar les dades"
 
-#: sha1-file.c:2163
+#: sha1-file.c:2160
 #, fuzzy, c-format
 msgid "%s: unsupported file type"
 msgstr "versiรณ d'รญndex no compatible %s"
 
-#: sha1-file.c:2187
+#: sha1-file.c:2184
 #, fuzzy, c-format
 msgid "%s is not a valid object"
 msgstr "ยซ%sยป no รฉs una terme vร lid"
 
-#: sha1-file.c:2189
+#: sha1-file.c:2186
 #, fuzzy, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s no รฉs un objecte de ยซ%sยป vร lid"
 
-#: sha1-file.c:2216 builtin/index-pack.c:155
+#: sha1-file.c:2213 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "no s'ha pogut obrir %s"
 
-#: sha1-file.c:2406 sha1-file.c:2458
+#: sha1-file.c:2403 sha1-file.c:2455
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
-msgstr ""
+msgstr "no coincideix la suma per a %s (s'esperava %s)"
 
-#: sha1-file.c:2430
-#, fuzzy, c-format
+#: sha1-file.c:2427
+#, c-format
 msgid "unable to mmap %s"
-msgstr "no s'ha pogut obrir %s"
+msgstr "no s'ha pogut fer ยซmmapยป %s"
 
-#: sha1-file.c:2435
-#, fuzzy, c-format
+#: sha1-file.c:2432
+#, c-format
 msgid "unable to unpack header of %s"
-msgstr "no s'ha pogut actualitzar %s"
+msgstr "no s'ha pogut desempaquetar la capรงalera de %s"
 
-#: sha1-file.c:2441
-#, fuzzy, c-format
+#: sha1-file.c:2438
+#, c-format
 msgid "unable to parse header of %s"
-msgstr "no s'ha pogut llegir %s"
+msgstr "no s'ha pogut analitzar la capรงalera de %s"
 
-#: sha1-file.c:2452
-#, fuzzy, c-format
+#: sha1-file.c:2449
+#, c-format
 msgid "unable to unpack contents of %s"
-msgstr "no s'ha pogut analitzar el contacte: %s"
+msgstr "no s'han pogut desempaquetar els continguts de %s"
 
-#: sha1-name.c:490
+#: sha1-name.c:487
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "l'SHA1 %s curt รฉs ambigu"
 
-#: sha1-name.c:501
+#: sha1-name.c:498
 msgid "The candidates are:"
 msgstr "Els candidats sรณn:"
 
-#: sha1-name.c:800
-#, fuzzy
+#: sha1-name.c:797
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7049,64 +7516,69 @@ msgstr ""
 "hexadecimals. Aquestes referรจncies es poden crear per error. Per\n"
 "exemple,\n"
 "\n"
-"  git checkout -b $br $(git rev-parse ...)\n"
+"  git switch -c $br $(git rev-parse ...)\n"
 "\n"
-"on ยซ$brยป รฉs d'alguna manera buida i una referรจncia de 40 carร cters\n"
+"on ยซ$brยป รฉs buida per algun motiu i es crea una referรจncia de 40 carร cters\n"
 "hexadecimals. Examineu aquestes referรจncies i potser\n"
 "suprimiu-les. Desactiveu aquest missatge executant\n"
 "ยซgit config advice.objectNameWarning falseยป"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:822
 #, c-format
 msgid "%u.%2.2u GiB"
-msgstr ""
+msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:824
 #, c-format
 msgid "%u.%2.2u GiB/s"
-msgstr ""
+msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:832
 #, c-format
 msgid "%u.%2.2u MiB"
-msgstr ""
+msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:834
 #, c-format
 msgid "%u.%2.2u MiB/s"
-msgstr ""
+msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:841
 #, c-format
 msgid "%u.%2.2u KiB"
-msgstr ""
+msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:843
 #, c-format
 msgid "%u.%2.2u KiB/s"
-msgstr ""
+msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
-#, fuzzy, c-format
+#: strbuf.c:849
+#, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
-#, fuzzy, c-format
+#: strbuf.c:851
+#, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
-msgstr[0] "octets"
-msgstr[1] "octets"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u bytes/s"
+
+#: strbuf.c:1149
+#, c-format
+msgid "could not edit '%s'"
+msgstr "no s'ha pogut editar ยซ%sยป"
 
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
@@ -7143,14 +7615,14 @@ msgstr "L'especificaciรณ ยซ%sยป รฉs en el submรฒdul ยซ%.*sยป"
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "l'entrada del submรฒdul ยซ%sยป (%s) รฉs a %s, no รฉs una comissiรณ"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "S'ha produรฏt un error en resoldre HEAD com a referรจncia vร lida."
 
 #: submodule.c:1481
-#, fuzzy, c-format
+#, c-format
 msgid "Could not access submodule '%s'"
-msgstr "s'ha produรฏt un error en cercar recursivament al camรญ de submรฒdul ยซ%sยป"
+msgstr "no s'ha pogut accedir al submรฒdul ยซ%sยป"
 
 #: submodule.c:1651
 #, c-format
@@ -7178,11 +7650,16 @@ msgid "submodule '%s' has dirty index"
 msgstr "el submรฒdul ยซ%sยป tรฉ l'รญndex brut"
 
 #: submodule.c:1959
-#, fuzzy, c-format
+#, c-format
 msgid "Submodule '%s' could not be updated."
-msgstr "Submรฒduls canviats perรฒ no actualitzats:"
+msgstr "No s'ha pogut actualitzar el submรฒdul ยซ%sยป"
 
-#: submodule.c:2007
+#: submodule.c:2027
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+
+#: submodule.c:2048
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7190,12 +7667,17 @@ msgstr ""
 "no estร  admรจs relocate_gitdir per al submรฒdul ยซ%sยป amb mรฉs d'un arbre de "
 "treball"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2060 submodule.c:2119
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no s'ha trobat el nom pel submรฒdul ยซ%sยป"
 
-#: submodule.c:2026
+#: submodule.c:2064
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr ""
+
+#: submodule.c:2071
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7206,40 +7688,40 @@ msgstr ""
 "ยซ%sยป a\n"
 "ยซ%sยป\n"
 
-#: submodule.c:2109
+#: submodule.c:2154
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "s'ha produรฏt un error en cercar recursivament al camรญ de submรฒdul ยซ%sยป"
 
-#: submodule.c:2153
+#: submodule.c:2198
 msgid "could not start ls-files in .."
 msgstr "no s'ha pogut iniciar ls-files a .."
 
-#: submodule.c:2192
+#: submodule.c:2237
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
 
-#: submodule-config.c:232
-#, fuzzy, c-format
+#: submodule-config.c:236
+#, c-format
 msgid "ignoring suspicious submodule name: %s"
-msgstr "s'estร  ignorant la referรจncia amb nom malmรจs %s"
+msgstr "s'estร  ignorant el nom de submรฒdul sospitรฒs %s"
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "no es permeten els valors negatius a submodule.fetchjobs"
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr "valor no vร lid per a %s"
 
-#: submodule-config.c:755
+#: submodule-config.c:769
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
@@ -7274,7 +7756,7 @@ msgstr "no s'ha pogut llegir el fitxer d'entrada ยซ%sยป"
 msgid "could not read from stdin"
 msgstr "no s'ha pogut llegir des de stdin"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr "no s'ha pogut fer stat a %s"
@@ -7303,48 +7785,48 @@ msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Canviaria la font de ยซ%sยป a ยซ%sยป de ยซ%sยป\n"
 
-#: transport.c:142
+#: transport.c:145
 #, fuzzy, c-format
 msgid "could not read bundle '%s'"
 msgstr "no s'ha pogut llegir el fitxer ยซ%sยป"
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opciรณ de profunditat no vร lida ยซ%sยป"
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr ""
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr ""
 
-#: transport.c:625
+#: transport.c:632
 #, fuzzy
 msgid "could not parse transport.color.* config"
 msgstr "no s'ha pogut analitzar l'script d'autor"
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr ""
 
-#: transport.c:825
+#: transport.c:831
 #, fuzzy, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "valor desconegut ยซ%sยป per a la clau ยซ%sยป"
 
-#: transport.c:891
-#, fuzzy, c-format
+#: transport.c:897
+#, c-format
 msgid "transport '%s' not allowed"
-msgstr "no s'ha trobat la branca ยซ%sยป."
+msgstr "no es permet el transport ยซ%sยป"
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr ""
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -7353,7 +7835,7 @@ msgstr ""
 "Els camins de submรฒdul segรผents contenen canvis que no\n"
 "es poden trobar en cap remot:\n"
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -7379,186 +7861,189 @@ msgstr ""
 "\n"
 "per a pujar-los a un remot.\n"
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr "S'estร  avortant."
 
-#: transport.c:1193
+#: transport.c:1201
 #, fuzzy
 msgid "failed to push all needed submodules"
 msgstr "s'ha produรฏt un error en cercar recursivament al submรฒdul ยซ%sยป"
 
-#: transport.c:1340 transport-helper.c:645
-#, fuzzy
+#: transport.c:1345 transport-helper.c:656
 msgid "operation not supported by protocol"
-msgstr "opciรณ no admesa amb --recurse-submodules."
+msgstr "opciรณ no admesa pel protocol"
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 #, fuzzy
 msgid "full write to remote helper failed"
 msgstr "imprimeix l'estat des de l'ajudant remot"
 
-#: transport-helper.c:134
-#, fuzzy, c-format
+#: transport-helper.c:144
+#, c-format
 msgid "unable to find remote helper for '%s'"
-msgstr "No s'ha pogut afegir el resultat de fusiรณ per a ยซ%sยป"
+msgstr "no s'ha pogut trobar l'ajudant remot per a ยซ%sยป"
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:570
 msgid "can't dup helper output fd"
 msgstr ""
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr ""
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr ""
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:424
 #, fuzzy, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "blob esperat per a %s ยซ%sยป"
 
-#: transport-helper.c:403
+#: transport-helper.c:413
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s tambรฉ ha bloquejat %s"
 
-#: transport-helper.c:481
-#, fuzzy
+#: transport-helper.c:492
 msgid "couldn't run fast-import"
-msgstr "no s'ha pogut executar ยซstashยป."
+msgstr "no s'ha pogut executar ยซfast-importยป"
 
-#: transport-helper.c:504
+#: transport-helper.c:515
 #, fuzzy
 msgid "error while running fast-import"
 msgstr "error en tancar el fitxer de paquet"
 
-#: transport-helper.c:533 transport-helper.c:1105
-#, fuzzy, c-format
+#: transport-helper.c:544 transport-helper.c:1133
+#, c-format
 msgid "could not read ref %s"
-msgstr "No s'ha pogut llegir la referรจncia %s"
+msgstr "no s'ha pogut llegir la referรจncia %s"
 
-#: transport-helper.c:578
+#: transport-helper.c:589
 #, fuzzy, c-format
 msgid "unknown response to connect: %s"
 msgstr "opciรณ desconeguda: %s\n"
 
-#: transport-helper.c:600
+#: transport-helper.c:611
 msgid "setting remote service path not supported by protocol"
 msgstr ""
 
-#: transport-helper.c:602
+#: transport-helper.c:613
 #, fuzzy
 msgid "invalid remote service path"
 msgstr "referรจncia no vร lida: %s"
 
-#: transport-helper.c:648
+#: transport-helper.c:659
 #, c-format
 msgid "can't connect to subservice %s"
-msgstr ""
+msgstr "no es pot connectar al subservei %s"
 
-#: transport-helper.c:720
+#: transport-helper.c:735
 #, fuzzy, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "blob esperat per a %s ยซ%sยป"
 
-#: transport-helper.c:773
+#: transport-helper.c:788
 #, fuzzy, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
 
-#: transport-helper.c:834
+#: transport-helper.c:849
 #, fuzzy, c-format
 msgid "helper %s does not support dry-run"
 msgstr "El servidor no admet --deepen"
 
-#: transport-helper.c:837
+#: transport-helper.c:852
 #, fuzzy, c-format
 msgid "helper %s does not support --signed"
 msgstr "El servidor no admet --shallow-since"
 
-#: transport-helper.c:840
+#: transport-helper.c:855
 #, fuzzy, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "el destรญ receptor no admet pujar --signed"
 
-#: transport-helper.c:847
+#: transport-helper.c:860
+#, fuzzy, c-format
+msgid "helper %s does not support --atomic"
+msgstr "El servidor no admet --shallow-since"
+
+#: transport-helper.c:866
 #, fuzzy, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "el destรญ receptor no admet opcions de pujada"
 
-#: transport-helper.c:945
+#: transport-helper.c:964
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
-#: transport-helper.c:950
+#: transport-helper.c:969
 #, fuzzy, c-format
 msgid "helper %s does not support 'force'"
 msgstr "El servidor no admet --deepen"
 
-#: transport-helper.c:997
+#: transport-helper.c:1016
 #, fuzzy
 msgid "couldn't run fast-export"
 msgstr "no s'ha pogut executar ยซstashยป."
 
-#: transport-helper.c:1002
+#: transport-helper.c:1021
 #, fuzzy
 msgid "error while running fast-export"
 msgstr "error en tancar el fitxer de paquet"
 
-#: transport-helper.c:1027
+#: transport-helper.c:1046
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 "Perhaps you should specify a branch such as 'master'.\n"
 msgstr ""
 
-#: transport-helper.c:1091
+#: transport-helper.c:1119
 #, fuzzy, c-format
 msgid "malformed response in ref list: %s"
 msgstr "full d'opcions mal format: ยซ%sยป"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1271
 #, fuzzy, c-format
 msgid "read(%s) failed"
 msgstr "%s ha fallat"
 
-#: transport-helper.c:1271
+#: transport-helper.c:1298
 #, fuzzy, c-format
 msgid "write(%s) failed"
 msgstr "%s ha fallat"
 
-#: transport-helper.c:1320
+#: transport-helper.c:1347
 #, fuzzy, c-format
 msgid "%s thread failed"
 msgstr "%s ha fallat"
 
-#: transport-helper.c:1324
+#: transport-helper.c:1351
 #, fuzzy, c-format
 msgid "%s thread failed to join: %s"
 msgstr "s'ha produรฏt un error en obrir ยซ%sยป"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1370 transport-helper.c:1374
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr ""
 
-#: transport-helper.c:1384
+#: transport-helper.c:1411
 #, c-format
 msgid "%s process failed to wait"
 msgstr ""
 
-#: transport-helper.c:1388
+#: transport-helper.c:1415
 #, fuzzy, c-format
 msgid "%s process failed"
 msgstr "%s ha fallat"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1433 transport-helper.c:1442
 msgid "can't start thread for copying data"
 msgstr ""
 
@@ -7574,11 +8059,16 @@ msgstr "mode mal format en entrada d'arbre"
 msgid "empty filename in tree entry"
 msgstr "nom de fitxer buit en una entrada d'arbre"
 
-#: tree-walk.c:118
+#: tree-walk.c:48
+#, c-format
+msgid "filename in tree entry contains backslash: '%s'"
+msgstr ""
+
+#: tree-walk.c:124
 msgid "too-short tree file"
 msgstr "fitxer d'arbre massa curt"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7588,7 +8078,7 @@ msgstr ""
 "agafar:\n"
 "%%sCometeu els vostres canvis o feu ยซstashยป abans de canviar de branca."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7598,7 +8088,7 @@ msgstr ""
 "agafar:\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7608,7 +8098,7 @@ msgstr ""
 "fusionar:\n"
 "%%sCometeu els vostres canvis o feu ยซstashยป abans de fusionar."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7618,7 +8108,7 @@ msgstr ""
 "fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7627,7 +8117,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers segรผents se sobreescriurien per %s:\n"
 "%%sCometeu els vostres canvis o feu ยซstashยป abans de %s."
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7636,7 +8126,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers segรผents se sobreescriurien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7645,7 +8135,7 @@ msgstr ""
 "En actualitzar els directoris segรผents perdria fitxers no seguits en el:\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7655,7 +8145,7 @@ msgstr ""
 "agafar:\n"
 "%%sMoveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7665,7 +8155,7 @@ msgstr ""
 "agafar:\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7675,7 +8165,7 @@ msgstr ""
 "fusionar:\n"
 "%%sMoveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7685,7 +8175,7 @@ msgstr ""
 "fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7694,7 +8184,7 @@ msgstr ""
 "Els segรผents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%sMoveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7703,7 +8193,7 @@ msgstr ""
 "Els segรผents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7714,7 +8204,7 @@ msgstr ""
 "agafar:\n"
 "%%sMoveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7725,7 +8215,7 @@ msgstr ""
 "agafar:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7735,7 +8225,7 @@ msgstr ""
 "fusionar:\n"
 "%%sMoveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7745,7 +8235,7 @@ msgstr ""
 "fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7755,7 +8245,7 @@ msgstr ""
 "%s:\n"
 "%%sMoveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7765,12 +8255,12 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrada ยซ%sยป encavalca amb ยซ%sยป.  No es pot vincular."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -7780,7 +8270,7 @@ msgstr ""
 "dia:\n"
 "%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -7791,7 +8281,7 @@ msgstr ""
 "actualitzar l'agafament parcial:\n"
 "%s"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -7802,7 +8292,7 @@ msgstr ""
 "l'agafament parcial:\n"
 "%s"
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -7811,23 +8301,27 @@ msgstr ""
 "No es pot actualitzar el submรฒdul:\n"
 "%s"
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr "S'estร  avortant\n"
 
-#: unpack-trees.c:318
-#, fuzzy
+#: unpack-trees.c:317
 msgid "Updating files"
-msgstr "S'estร  actualitzant %s"
+msgstr "S'estan actualitzant els fitxers"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
 "colliding group is in the working tree:\n"
 msgstr ""
 
+#: unpack-trees.c:1441
+#, fuzzy
+msgid "Updating index flags"
+msgstr "S'estan actualitzant els fitxers"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "l'esquema d'URL no รฉs vร lid o li manca el sufix '://'"
@@ -7857,7 +8351,7 @@ msgstr "nรบmero de port no vร lid"
 msgid "invalid '..' path segment"
 msgstr "segment de camรญ '..' no vร lid"
 
-#: worktree.c:258 builtin/am.c:2095
+#: worktree.c:258 builtin/am.c:2084
 #, c-format
 msgid "failed to read '%s'"
 msgstr "s'ha produรฏt un error en llegir ยซ%sยป"
@@ -7887,17 +8381,17 @@ msgstr "ยซ%sยป no รฉs un fitxer .git, codi d'error %d"
 msgid "'%s' does not point back to '%s'"
 msgstr "ยซ%sยป no assenyala de tornada a ยซ%sยป"
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "no s'ha pogut obrir ยซ%sยป per a lectura i escriptura"
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr "no s'ha pogut accedir a ยซ%sยป"
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr "no s'ha pogut obtenir el directori de treball actual"
 
@@ -8157,20 +8651,20 @@ msgstr "Actualment esteu fent ยซrebaseยป."
 #: wt-status.c:1371
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
-"  (arregleu els conflictes i desprรฉs executeu \"git rebase --continue\")"
+"  (arregleu els conflictes i desprรฉs executeu ยซgit rebase --continueยป)"
 
 #: wt-status.c:1373
 msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (useu \"git rebase --skip\" per a ometre aquest pedaรง)"
+msgstr "  (useu ยซgit rebase --skipยป per a ometre aquest pedaรง)"
 
 #: wt-status.c:1375
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  (useu \"git rebase --abort\" per a agafar la branca original)"
+msgstr "  (useu ยซgit rebase --abortยป per a agafar la branca original)"
 
 #: wt-status.c:1382
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
-"  (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
+"  (tots els conflictes estan arreglats: executeu ยซgit rebase --continueยป)"
 
 #: wt-status.c:1386
 #, c-format
@@ -8213,9 +8707,8 @@ msgstr ""
 "vostres canvis)"
 
 #: wt-status.c:1419
-#, fuzzy
 msgid "Cherry-pick currently in progress."
-msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs"
+msgstr "Hi ha ยซcherry pickยป actualment en curs."
 
 #: wt-status.c:1422
 #, c-format
@@ -8224,7 +8717,7 @@ msgstr "Actualment esteu fent ยซcherry pickยป a la comissiรณ %s."
 
 #: wt-status.c:1429
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
+msgstr "  (arregleu els conflictes i executeu ยซgit cherry-pick --continueยป)"
 
 #: wt-status.c:1432
 #, fuzzy
@@ -8233,91 +8726,97 @@ msgstr "  (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
 
 #: wt-status.c:1435
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-"  (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue"
-"\")"
+msgstr "  (tots els conflictes estan arreglats: executeu ยซgit cherry-pick --continueยป)"
 
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (useu ยซgit cherry-pick --skipยป per a ometre aquest pedaรง)"
+
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (useu \"git cherry-pick --abort\" per a cancelยทlar l'operaciรณ de ยซcherry "
 "pickยป)"
 
-#: wt-status.c:1447
-#, fuzzy
+#: wt-status.c:1449
 msgid "Revert currently in progress."
-msgstr "avorta la fusiรณ en curs actual"
+msgstr "Una reversiรณ estร  actualment en curs."
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Actualment esteu revertint la comissiรณ %s."
 
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (arregleu els conflictes i executeu \"git revert --continue\")"
 
-#: wt-status.c:1459
+#: wt-status.c:1461
 #, fuzzy
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (arregleu els conflictes i executeu \"git revert --continue\")"
 
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 "  (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
 
-#: wt-status.c:1464
+#: wt-status.c:1466
+#, fuzzy
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (useu \"git rebase --skip\" per a ometre aquest pedaรง)"
+
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (useu \"git revert --abort\" per a cancelยทlar l'operaciรณ de reversiรณ)"
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Actualment esteu bisecant, heu comenรงat des de la branca ยซ%sยป."
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr "Actualment esteu bisecant."
 
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (useu \"git bisect reset\" per a tornar a la branca original)"
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr "En la branca "
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr "ยซrebaseยป interactiu en curs; sobre "
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr "ยซrebaseยป en curs; sobre "
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr "Actualment no s'รฉs en cap branca."
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr "Comissiรณ inicial"
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
-msgstr "No s'ha fet cap comissiรณ encara."
+msgstr "No s'ha fet cap comissiรณ encara"
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr "Fitxers no seguits"
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr "Fitxers ignorats"
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8329,31 +8828,31 @@ msgstr ""
 "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
 "'git help status')."
 
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Els fitxers no seguits no estan llistats%s"
 
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr " (useu l'opciรณ -u per a mostrar els fitxers no seguits)"
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr "Sense canvis"
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no hi ha canvis afegits a cometre\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8362,192 +8861,197 @@ msgstr ""
 "no hi ha res afegit a cometre perรฒ hi ha fitxers no seguits (useu \"git add"
 "\" per a seguir-los)\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "no hi ha res afegit a cometre perรฒ hi ha fitxers no seguits\n"
 
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"
 "los)\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr "no hi ha res a cometre\n"
 
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "no hi ha res a cometre, l'arbre de treball estร  net\n"
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr "No s'ha fet cap comissiรณ encara a "
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr "HEAD (sense branca)"
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr "diferent"
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr "darrere "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr "davant per "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no es pot %s: Teniu canvis ยซunstagedยป."
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr "addicionalment, el vostre รญndex contรฉ canvis sense cometre."
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "no es pot %s: El vostre รญndex contรฉ canvis sense cometre."
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "s'ha produรฏt un error en desenllaรงar ยซ%sยป"
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opcions>] [--] <especificaciรณ-de-camรญ>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:87
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "estat de diff inesperat %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:92 builtin/commit.c:288
 msgid "updating files failed"
 msgstr "s'ha produรฏt un error en actualitzar els fitxers"
 
-#: builtin/add.c:99
+#: builtin/add.c:102
 #, c-format
 msgid "remove '%s'\n"
 msgstr "elimina ยซ%sยป\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:177
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Canvis ยซunstagedยป desprรฉs d'actualitzar l'รญndex:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:252 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr "No s'ha pogut llegir l'รญndex"
 
-#: builtin/add.c:245
+#: builtin/add.c:263
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "No s'ha pogut obrir ยซ%sยป per a escriptura."
 
-#: builtin/add.c:249
+#: builtin/add.c:267
 msgid "Could not write patch"
 msgstr "No s'ha pogut escriure el pedaรง"
 
-#: builtin/add.c:252
+#: builtin/add.c:270
 msgid "editing patch failed"
 msgstr "l'ediciรณ del pedaรง ha fallat"
 
-#: builtin/add.c:255
+#: builtin/add.c:273
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No s'ha pogut fer stat a ยซ%sยป"
 
-#: builtin/add.c:257
+#: builtin/add.c:275
 msgid "Empty patch. Aborted."
 msgstr "El pedaรง รฉs buit. S'ha avortat."
 
-#: builtin/add.c:262
+#: builtin/add.c:280
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No s'ha pogut aplicar ยซ%sยป"
 
-#: builtin/add.c:270
+#: builtin/add.c:288
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Els camins segรผents s'ignoren per un dels vostres fitxers .gitignore:\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548
+#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "marxa en sec"
 
-#: builtin/add.c:293
+#: builtin/add.c:311
 msgid "interactive picking"
 msgstr "recull interactiu"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr "selecciona els trossos interactivament"
 
-#: builtin/add.c:295
+#: builtin/add.c:313
 msgid "edit current diff and apply"
 msgstr "edita la diferรจncia actual i aplica-la"
 
-#: builtin/add.c:296
+#: builtin/add.c:314
 msgid "allow adding otherwise ignored files"
 msgstr "permet afegir fitxers que d'altra manera s'ignoren"
 
-#: builtin/add.c:297
+#: builtin/add.c:315
 msgid "update tracked files"
 msgstr "actualitza els fitxers seguits"
 
-#: builtin/add.c:298
+#: builtin/add.c:316
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 
-#: builtin/add.c:299
+#: builtin/add.c:317
 msgid "record only the fact that the path will be added later"
 msgstr "registra nomรฉs el fet que el camรญ s'afegirร  mรฉs tard"
 
-#: builtin/add.c:300
+#: builtin/add.c:318
 msgid "add changes from all tracked and untracked files"
 msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
 
-#: builtin/add.c:303
+#: builtin/add.c:321
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:323
 msgid "don't add, only refresh the index"
 msgstr "no afegeixis, nomรฉs actualitza l'รญndex"
 
-#: builtin/add.c:306
+#: builtin/add.c:324
 msgid "just skip files which cannot be added because of errors"
 msgstr "nomรฉs omet els fitxers que no es poden afegir a causa d'errors"
 
-#: builtin/add.c:307
+#: builtin/add.c:325
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:327 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "passa per alt el bit executable dels fitxers llistats"
 
-#: builtin/add.c:311
+#: builtin/add.c:329
 msgid "warn when adding an embedded repository"
 msgstr "avisa'm quan s'afegeixi un dipรฒsit incrustat"
 
-#: builtin/add.c:326
+#: builtin/add.c:347
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8565,7 +9069,7 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 "Heu afegit un altre dipรฒsit git dins del dipรฒsit actual.\n"
-"Els clons de dipรฒsits externs no contindran els continguts de\n"
+"Els clons de dipรฒsits externs no contindran els continguts\n"
 "del dipรฒsit incrustat i no sabran com obtenir-ho.\n"
 "Si volรญeu afegir un submรฒdul, useu:\n"
 "\n"
@@ -8578,151 +9082,168 @@ msgstr ""
 "\n"
 "Vegeu \"git help submodule\" per a mรฉs informaciรณ."
 
-#: builtin/add.c:354
+#: builtin/add.c:375
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "s'estร  afegint un dipรฒsit incrustat: %s"
 
-#: builtin/add.c:372
+#: builtin/add.c:393
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Useu -f si realment els voleu afegir.\n"
 
-#: builtin/add.c:379
+#: builtin/add.c:400
 msgid "adding files failed"
 msgstr "l'afegiment de fitxers ha fallat"
 
-#: builtin/add.c:419
+#: builtin/add.c:428 builtin/commit.c:348
+#, fuzzy
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--first-parent รฉs incompatible amb --bisect"
+
+#: builtin/add.c:434
+#, fuzzy
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--first-parent รฉs incompatible amb --bisect"
+
+#: builtin/add.c:446
 msgid "-A and -u are mutually incompatible"
 msgstr "-A i -u sรณn mรบtuament incompatibles"
 
-#: builtin/add.c:426
+#: builtin/add.c:449
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "L'opciรณ --ignore-missing nomรฉs es pot usar juntament amb --dry-run"
 
-#: builtin/add.c:430
+#: builtin/add.c:453
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "el parร metre --chmod ยซ%sยป ha de ser o -x o +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354
+#: builtin/reset.c:327
+#, fuzzy
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--patch รฉs incompatible amb --{hard,mixed,soft}"
+
+#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360
+#: builtin/reset.c:333
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr ""
+
+#: builtin/add.c:482
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "No s'ha especificat res, no s'ha afegit res.\n"
 
-#: builtin/add.c:446
+#: builtin/add.c:483
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Potser volรญeu dir ยซgit add .ยป?\n"
 
-#: builtin/am.c:348
+#: builtin/am.c:347
 msgid "could not parse author script"
 msgstr "no s'ha pogut analitzar l'script d'autor"
 
-#: builtin/am.c:432
+#: builtin/am.c:431
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "s'ha suprimit ยซ%sยป pel lligam applypatch-msg"
 
-#: builtin/am.c:474
+#: builtin/am.c:473
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Lรญnia d'entrada mal formada: ยซ%sยป."
 
-#: builtin/am.c:512
+#: builtin/am.c:511
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "S'ha produรฏt un error en copiar les notes de ยซ%sยป a ยซ%sยป"
 
-#: builtin/am.c:538
+#: builtin/am.c:537
 msgid "fseek failed"
 msgstr "fseek ha fallat"
 
-#: builtin/am.c:726
+#: builtin/am.c:725
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no s'ha pogut analitzar el pedaรง ยซ%sยป"
 
-#: builtin/am.c:791
+#: builtin/am.c:790
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Nomรฉs una sรจrie de pedaรงos StGIT es pot aplicar a la vegada"
 
-#: builtin/am.c:839
+#: builtin/am.c:838
 msgid "invalid timestamp"
 msgstr "marca de temps no vร lida"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:843 builtin/am.c:855
 msgid "invalid Date line"
 msgstr "lรญnia Date no vร lida"
 
-#: builtin/am.c:851
+#: builtin/am.c:850
 msgid "invalid timezone offset"
 msgstr "desplaรงament de zona de temps no vร lid"
 
-#: builtin/am.c:944
+#: builtin/am.c:943
 msgid "Patch format detection failed."
 msgstr "La detecciรณ de format de pedaรง ha fallat."
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:948 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "s'ha produรฏt un error en crear el directori ยซ%sยป"
 
-#: builtin/am.c:954
+#: builtin/am.c:953
 msgid "Failed to split patches."
 msgstr "S'ha produรฏt un error en dividir els pedaรงos."
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "no s'ha pogut escriure el fitxer d'รญndex"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1084
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Quan hร giu resolt aquest problema, executeu \"%s --continue\"."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1085
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 "Si preferiu ometre aquest pedaรง, executeu \"%s --skip\" en lloc d'aixรฒ."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1086
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Per a restaurar la branca original i deixar d'apedaรงar, executeu \"%s --abort"
 "\"."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1169
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 
-#: builtin/am.c:1211
+#: builtin/am.c:1197
 msgid "Patch is empty."
 msgstr "El pedaรง estร  buit."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1262
+#, fuzzy, c-format
+msgid "missing author line in commit %s"
+msgstr "Manca el nom de branca; proveu -b"
+
+#: builtin/am.c:1265
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "lรญnia d'identitat no vร lida: %.*s"
 
-#: builtin/am.c:1299
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "no s'ha pogut analitzar la comissiรณ %s"
-
-#: builtin/am.c:1496
+#: builtin/am.c:1484
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Al dipรฒsit li manquen els blobs necessaris per a retrocedir a una fusiรณ de 3 "
 "vies."
 
-#: builtin/am.c:1498
+#: builtin/am.c:1486
 msgid "Using index info to reconstruct a base tree..."
 msgstr "S'estร  usant la informaciรณ d'รญndex per a reconstruir un arbre base..."
 
-#: builtin/am.c:1517
+#: builtin/am.c:1505
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8730,24 +9251,24 @@ msgstr ""
 "Heu editat el vostre pedaรง a mร ?\n"
 "No s'aplica als blobs recordats en el seu รญndex."
 
-#: builtin/am.c:1523
+#: builtin/am.c:1511
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "S'estร  retrocedint a apedaรงar la base i una fusiรณ de 3 vies..."
 
-#: builtin/am.c:1549
+#: builtin/am.c:1537
 msgid "Failed to merge in the changes."
 msgstr "S'ha produรฏt un error en fusionar els canvis."
 
-#: builtin/am.c:1581
+#: builtin/am.c:1569
 msgid "applying to an empty history"
 msgstr "s'estร  aplicant a una histรฒria buida"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1616 builtin/am.c:1620
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no es pot reprendre: %s no existeix."
 
-#: builtin/am.c:1650
+#: builtin/am.c:1638
 msgid "Commit Body is:"
 msgstr "El cos de la comissiรณ รฉs:"
 
@@ -8755,37 +9276,41 @@ msgstr "El cos de la comissiรณ รฉs:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1648
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaรง/[a]ccepta'ls "
 "tots: "
 
-#: builtin/am.c:1710
+#: builtin/am.c:1695 builtin/commit.c:394
+msgid "unable to write index file"
+msgstr "no s'ha pogut escriure el fitxer d'รญndex"
+
+#: builtin/am.c:1699
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "รndex brut: no es poden aplicar pedaรงos (bruts: %s)"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1739 builtin/am.c:1807
 #, c-format
 msgid "Applying: %.*s"
 msgstr "S'estร  aplicant: %.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1756
 msgid "No changes -- Patch already applied."
 msgstr "Sense canvis -- El pedaรง ja s'ha aplicat."
 
-#: builtin/am.c:1773
+#: builtin/am.c:1762
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El pedaรง ha fallat a %s %.*s"
 
-#: builtin/am.c:1777
+#: builtin/am.c:1766
 msgid "Use 'git am --show-current-patch' to see the failed patch"
 msgstr ""
 
-#: builtin/am.c:1821
+#: builtin/am.c:1810
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -8795,7 +9320,7 @@ msgstr ""
 "Si no hi ha res per fer ยซstageยป, probablement alguna altra cosa ja ha\n"
 "introduรฏt els mateixos canvis; potser voleu ometre aquest pedaรง."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1817
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -8808,17 +9333,17 @@ msgstr ""
 "Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel "
 "fitxer."
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No s'ha pogut analitzar l'objecte ยซ%sยป."
 
-#: builtin/am.c:1987
+#: builtin/am.c:1976
 msgid "failed to clean index"
 msgstr "s'ha produรฏt un error en netejar l'รญndex"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2020
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -8826,144 +9351,144 @@ msgstr ""
 "Sembla que heu mogut HEAD desprรฉs de l'รบltima fallada de 'am'.\n"
 "No s'estร  rebobinant a ORIG_HEAD"
 
-#: builtin/am.c:2128
+#: builtin/am.c:2117
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor no vร lid per a --patch-format: %s"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2153
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opcions>] [(<bรบstia> | <directori-de-correu>)...]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2154
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opcions>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2160
 msgid "run interactively"
 msgstr "executa interactivament"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2162
 msgid "historical option -- no-op"
 msgstr "opciรณ histรฒrica -- no-op"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2164
 msgid "allow fall back on 3way merging if needed"
 msgstr "permet retrocedir a una fusiรณ de 3 vies si รฉs necessari"
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:307 builtin/stash.c:806
+#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:811
 msgid "be quiet"
 msgstr "silenciรณs"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2167
 msgid "add a Signed-off-by line to the commit message"
 msgstr "afegeix una lรญnia ยซSigned-off-byยป al missatge de comissiรณ"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2170
 msgid "recode into utf8 (default)"
 msgstr "recodifica en utf8 (per defecte)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2172
 msgid "pass -k flag to git-mailinfo"
 msgstr "passa l'indicador -k a git-mailinfo"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2174
 msgid "pass -b flag to git-mailinfo"
 msgstr "passa l'indicador -b a git-mailinfo"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2176
 msgid "pass -m flag to git-mailinfo"
 msgstr "passa l'indicador -m a git-mailinfo"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2178
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
 
-#: builtin/am.c:2192
+#: builtin/am.c:2181
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2184
 msgid "strip everything before a scissors line"
 msgstr "elimina tot abans d'una lรญnia de tisores"
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
+#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
+#: builtin/am.c:2213
 msgid "pass it through git-apply"
 msgstr "passa-ho a travรฉs de git-apply"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
+#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249
+#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
+#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2210
 msgid "format the patch(es) are in"
 msgstr "el format en el qual estan els pedaรงos"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2216
 msgid "override error message when patch failure occurs"
 msgstr "passa per alt el missatge d'error si falla l'aplicaciรณ del pedaรง"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2218
 msgid "continue applying patches after resolving a conflict"
 msgstr "segueix aplicant pedaรงos desprรฉs de resoldre un conflicte"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2221
 msgid "synonyms for --continue"
 msgstr "sinรฒnims de --continue"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2224
 msgid "skip the current patch"
 msgstr "omet el pedaรง actual"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2227
 msgid "restore the original branch and abort the patching operation."
 msgstr "restaura la branca original i avorta l'operaciรณ d'apedaรงament."
 
-#: builtin/am.c:2241
+#: builtin/am.c:2230
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr ""
 
-#: builtin/am.c:2244
+#: builtin/am.c:2233
 msgid "show the patch being applied."
 msgstr "mostra el pedaรง que s'estร  aplicant."
 
-#: builtin/am.c:2248
+#: builtin/am.c:2237
 msgid "lie about committer date"
 msgstr "menteix sobre la data del comitent"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2239
 msgid "use current timestamp for author date"
 msgstr "usa el marc de temps actual per la data d'autor"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507
+#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509
+#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr "ID de clau"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514
 msgid "GPG-sign commits"
 msgstr "signa les comissions amb GPG"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2245
 msgid "(internal use for git-rebase)"
 msgstr "(รบs intern per a git-rebase)"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2263
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -8971,18 +9496,18 @@ msgstr ""
 "Fa molt que l'opciรณ -b/--binary no ha fet res, i\n"
 "s'eliminarร . No l'useu mรฉs."
 
-#: builtin/am.c:2281
+#: builtin/am.c:2270
 msgid "failed to read the index"
 msgstr "S'ha produรฏt un error en llegir l'รญndex"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2285
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "un directori de ยซrebaseยป anterior %s encara existeix perรฒ s'ha donat una "
 "bรบstia."
 
-#: builtin/am.c:2320
+#: builtin/am.c:2309
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -8991,11 +9516,11 @@ msgstr ""
 "S'ha trobat un directori %s extraviat.\n"
 "Useu \"git am --abort\" per a eliminar-lo."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2315
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Una operaciรณ de resoluciรณ no estร  en curs; no reprenem."
 
-#: builtin/am.c:2336
+#: builtin/am.c:2325
 msgid "interactive mode requires patches on the command line"
 msgstr ""
 
@@ -9046,9 +9571,8 @@ msgid "git bisect--helper --bisect-clean-state"
 msgstr "git bisect--helper --bisect-clean-state"
 
 #: builtin/bisect--helper.c:25
-#, fuzzy
 msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-reset [<comissiรณ>]"
 
 #: builtin/bisect--helper.c:26
 #, fuzzy
@@ -9113,11 +9637,11 @@ msgid "We are not bisecting.\n"
 msgstr "No estem bisecant."
 
 #: builtin/bisect--helper.c:163
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid commit"
-msgstr "ยซ%sยป no รฉs un terme vร lid"
+msgstr "ยซ%sยป no รฉs una comissiรณ vร lida"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, fuzzy, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9125,28 +9649,28 @@ msgstr ""
 "No s'ha pogut agafar la HEAD original '$branch'.\n"
 "Proveu 'git bisect reset <comissiรณ>'."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, fuzzy, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Parร metre bisect_write incorrecte: $state"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, fuzzy, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "no es pot canviar el significat del terme ยซ%sยป"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, fuzzy, c-format
 msgid "couldn't open the file '%s'"
 msgstr "no s'ha pogut crear el fitxer ยซ%sยป"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, fuzzy, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr ""
 "Ordre no vร lida: actualment esteu en una bisecciรณ $TERM_BAD/$TERM_GOOD."
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, fuzzy, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9155,7 +9679,7 @@ msgstr ""
 "Cal donar-me almenys una revisiรณ $bad_syn i una $good_syn.\n"
 "(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per aixรฒ.)"
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, fuzzy, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9166,321 +9690,316 @@ msgstr ""
 "Desprรฉs cal donar-me almenys una revisiรณ $good_syn i una $bad_syn.\n"
 "(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per aixรฒ.)"
 
-#: builtin/bisect--helper.c:321
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:322
+#, c-format
 msgid "bisecting only with a %s commit"
-msgstr "Advertรจncia: bisecant amb nomรฉs comissiรณ $TERM_BAD."
+msgstr "bisecant amb nomรฉs una comissiรณ %s"
 
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:330
 msgid "Are you sure [Y/n]? "
 msgstr "N'esteu segur [Y/n]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:377
 msgid "no terms defined"
 msgstr "cap terme definit"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:380
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:389
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:390
+#, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
 msgstr ""
-"parร metre no vร lid $arg per a 'git bisect terms'.\n"
+"parร metre no vร lid %s per a 'git bisect terms'.\n"
 "Les opcions admeses sรณn: --term-good|--term-old i --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:475
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:476
+#, c-format
 msgid "unrecognized option: '%s'"
-msgstr "posiciรณ no reconeguda:%s"
+msgstr "opciรณ no reconeguda: ยซ%sยป"
 
-#: builtin/bisect--helper.c:479
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:480
+#, c-format
 msgid "'%s' does not appear to be a valid revision"
-msgstr "'$arg' no sembla una revisiรณ vร lida"
+msgstr "ยซ%sยป no sembla ser una revisiรณ vร lida"
 
-#: builtin/bisect--helper.c:511
-#, fuzzy
+#: builtin/bisect--helper.c:512
 msgid "bad HEAD - I need a HEAD"
 msgstr "HEAD incorrecte - Cal un HEAD"
 
-#: builtin/bisect--helper.c:526
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:527
+#, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
-"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
-"vร lida>'."
+"l'agafament de ยซ%sยป ha fallat. Proveu ยซgit  bisect start <branca-"
+"vร lida>ยป."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:548
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "no es bisecarร  en un arbre en el qual s'ha fet cg-seek"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:551
 #, fuzzy
 msgid "bad HEAD - strange symbolic ref"
 msgstr "HEAD incorrecte - referรจncia simbรฒlica estranya"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:575
 #, fuzzy, c-format
 msgid "invalid ref: '%s'"
 msgstr "fitxer no vร lid: ยซ%sยป"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:631
 msgid "perform 'git bisect next'"
 msgstr "realitza 'git bisect next'"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:633
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "escriu els termes a .git/BISECT_TERMS"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:635
 msgid "cleanup the bisection state"
 msgstr "neteja l'estat de la bisecciรณ"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:637
 msgid "check for expected revs"
 msgstr "comprova les revisions esperades"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:639
 #, fuzzy
 msgid "reset the bisection state"
 msgstr "neteja l'estat de la bisecciรณ"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:641
 #, fuzzy
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "neteja l'estat de la bisecciรณ"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:643
 #, fuzzy
 msgid "check and set terms in a bisection state"
 msgstr "neteja l'estat de la bisecciรณ"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:645
 msgid "check whether bad or good terms exist"
 msgstr ""
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:647
 #, fuzzy
 msgid "print out the bisect terms"
 msgstr "imprimeix nomรฉs les etiquetes de l'objecte"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:649
 msgid "start the bisect session"
 msgstr ""
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:651
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissiรณ actual"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:653
 msgid "no log for BISECT_WRITE"
 msgstr ""
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:670
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms requereix dos parร metres"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:674
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state no accepta parร metres"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:681
 #, fuzzy
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-clean-state no accepta parร metres"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:685
 #, fuzzy
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-clean-state no accepta parร metres"
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:691
 #, fuzzy
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--bisect-clean-state no accepta parร metres"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:697
 #, fuzzy
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-clean-state no accepta parร metres"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:703
 #, fuzzy
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--write-terms requereix dos parร metres"
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opcions>] [<opcions-de-revisiรณ>] [<revisiรณ>] [--] fitxer"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "es documenten les <opcions-de-revisiรณ> en git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, fuzzy, c-format
 msgid "expecting a color: %s"
 msgstr "respecta els colors del format"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr ""
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, fuzzy, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "ignora el color no vร lid ยซ%.*sยป en log.graphColors"
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 #, fuzzy
 msgid "invalid value for blame.coloring"
 msgstr "valor no vร lid per a --missing"
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, fuzzy, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "no s'ha pogut resoldre la revisiรณ: %s"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Mostra les entrades ยซblameยป mentre les trobem, incrementalment"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
 "desactivat)"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "No tractis les comissions d'arrel com a lรญmits (Per defecte: desactivat)"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr "Mostra les estadรญstiques de preu de treball"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr "Forรงa l'informe de progrรฉs"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr "Mostra la puntuaciรณ de sortida de les entrades ยซblameยป"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr "Mostra el nom de fitxer original (Per defecte: automร tic)"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr "Mostra el nรบmero de lรญnia original (Per defecte: desactivat)"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr "Presenta en un format dissenyat per consumpciรณ per mร quina"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr "Mostra el format de porcellana amb informaciรณ de comissiรณ per lรญnia"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Mostra l'SHA1 de comissiรณ llarg (Per defecte: desactivat)"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "Mostra l'adreรงa electrรฒnica de l'autor en lloc del nom (Per defecte: "
 "desactivat)"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr "Ignora les diferรจncies d'espai en blanc"
 
-#: builtin/blame.c:861 builtin/log.c:1646
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 #, fuzzy
 msgid "Ignore <rev> when blaming"
 msgstr "ignora l'รญndex en comprovar"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 #, fuzzy
 msgid "Ignore revisions from <file>"
 msgstr "llegiu el missatge des d'un fitxer"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr ""
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Usa un heurรญstic experimental per a millorar les diferรจncies"
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr "Gasta cicles extres per a trobar una coincidรจncia millor"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "Usa els continguts de <fitxer> com a la imatge final"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "puntuaciรณ"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr "Troba cรฒpies de lรญnia dins i a travรฉs dels fitxers"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr "Troba moviments de lรญnia dins i a travรฉs dels fitxers"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr "Processa nomรฉs el rang de lรญnies n,m, comptant des d'1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "no es pot usar --progress amb els formats --incremental o de porcellana"
@@ -9493,18 +10012,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "fa 4 anys i 11 mesos"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "el fitxer %s tรฉ nomรฉs %lu lรญnia"
 msgstr[1] "el fitxer %s tรฉ nomรฉs %lu lรญnies"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr "S'estร  fent un ยซblameยป"
 
@@ -9720,7 +10239,7 @@ msgstr "configura el mode de seguiment (vegeu git-pull(1))"
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:505
 msgid "upstream"
 msgstr "font"
 
@@ -9729,7 +10248,8 @@ msgid "change the upstream info"
 msgstr "canvia la informaciรณ de font"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
+#, fuzzy
+msgid "unset the upstream info"
 msgstr "Desassigna la informaciรณ de font"
 
 #: builtin/branch.c:628
@@ -9828,11 +10348,11 @@ msgid "sorting and filtering are case insensitive"
 msgstr "l'ordenaciรณ i el filtratge distingeixen entre majรบscules i minรบscules"
 
 #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
-#: builtin/verify-tag.c:39
+#: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format a usar en la sortida"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:784
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no trobat sota refs/heads!"
 
@@ -9921,20 +10441,68 @@ msgstr ""
 "L'opciรณ --set-upstream ja no estร  suportada. Useu en comptes --track o --set-"
 "upstream-to."
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr "%s estร  bรฉ\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+#, fuzzy
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git remote add [<opcions>] <nom> <url>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+#, fuzzy
+msgid "git bundle verify [<options>] <file>"
+msgstr "git rm [<opcions>] [--] <fitxer>..."
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:66 builtin/pack-objects.c:3228
+msgid "do not show progress meter"
+msgstr "no mostris l'indicador de progrรฉs"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3230
+msgid "show progress meter"
+msgstr "mostra l'indicador de progrรฉs"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:70 builtin/pack-objects.c:3232
+msgid "show progress meter during object writing phase"
+msgstr "mostra l'indicador de progrรฉs durant la fase d'escriptura d'objectes"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3235
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "similar a --all-progress quan l'indicador de progrรฉs es mostra"
+
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "Cal un dipรฒsit per a fer un farcell."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+#, fuzzy
+msgid "do not show bundle details"
+msgstr "no mostris les etiquetes pelades"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s estร  bรฉ\n"
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "Cal un dipรฒsit per a desfer un farcell."
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1609
+msgid "be verbose; must be placed before a subcommand"
+msgstr "sigues detallat; s'ha de colยทlocar abans d'un subordre"
+
+#: builtin/bundle.c:190 builtin/remote.c:1640
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Subordre desconeguda: %s"
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -9942,7 +10510,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipus> | --textconv | --filters [--path=<camรญ>]) <objecte>"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -9950,75 +10518,75 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 #, fuzzy
 msgid "only one batch option may be specified"
 msgstr "Cap nom de branca especificat"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr "mostra el tipus de l'objecte"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr "mostra la mida de l'objecte"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr "surt amb zero quan no hi ha error"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr "imprimeix bellament el contingut de l'objecte"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 "en els objectes de blob, executa els filtres en el contingut de l'objecte"
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:992
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr "usa un camรญ especรญfic per a --textconv/--filters"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr "posa la sortida de --batch en memรฒria intermรจdia"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "mostra la informaciรณ i contingut dels objectes rebuts de l'entrada estร ndard"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr "mostra informaciรณ sobre els objectes rebuts de l'entrada estร ndard"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "segueix els enllaรงos simbรฒlics en l'arbre (s'usa amb --batch o --batch-check)"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostra tots els objectes amb --batch o --batch-check"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr ""
 
@@ -10046,8 +10614,8 @@ msgstr "llegeix els noms de fitxer de stdin"
 msgid "terminate input and output records by a NUL character"
 msgstr "acaba els registres d'entrada i de sortida amb un carร cter NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537
+#: builtin/worktree.c:506
 msgid "suppress progress reporting"
 msgstr "omet els informes de progrรฉs"
 
@@ -10138,9 +10706,9 @@ msgid "write the content to temporary files"
 msgstr "escriu el contingut a fitxers temporals"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882
+#: builtin/worktree.c:679
 msgid "string"
 msgstr "cadena"
 
@@ -10170,156 +10738,149 @@ msgstr "git checkout [<opcions>] <branca>"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "el camรญ ยซ%sยป no tรฉ la nostra versiรณ"
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "el camรญ ยซ%sยป no tรฉ la seva versiรณ"
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "el camรญ ยซ%sยป no tรฉ totes les versions necessร ries"
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "el camรญ ยซ%sยป no tรฉ les versions necessร ries"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "camรญ ยซ%sยป: no es pot fusionar"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "No s'ha pogut afegir el resultat de fusiรณ per a ยซ%sยป"
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, fuzzy, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "etiqueta de fusiรณ incorrecta en la comissiรณ ยซ%sยป"
 msgstr[1] "etiqueta de fusiรณ incorrecta en la comissiรณ ยซ%sยป"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, fuzzy, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "actualitzat %d camรญ\n"
 msgstr[1] "actualitzats %d camins\n"
 
-#: builtin/checkout.c:386
-#, fuzzy, c-format
+#: builtin/checkout.c:389
+#, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
-msgstr[0] "S'ha produรฏt un error en llegir l'รญndex"
-msgstr[1] "S'ha produรฏt un error en llegir l'รญndex"
+msgstr[0] "S'ha actualitzat un camรญ des de l'รญndex"
+msgstr[1] "S'ha actualitzat %d camins des de l'รญndex"
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "ยซ%sยป no es pot usar amb actualitzaciรณ de camins"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "ยซ%sยป no es pot usar amb %s"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "No es poden actualitzar els camins i canviar a la branca ยซ%sยป a la vegada."
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr ""
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, fuzzy, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "ยซ%sยป no es pot usar amb ยซ%sยป"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, fuzzy, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "%s: %s no es pot usar amb %s"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "el camรญ ยซ%sยป estร  sense fusionar"
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:682 builtin/sparse-checkout.c:82
 msgid "you need to resolve your current index first"
 msgstr "heu de primer resoldre el vostre รญndex actual"
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:732
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
 
-#: builtin/checkout.c:736
-#, fuzzy, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-"Els vostres canvis locals als fitxers segรผents se sobreescriurien per %s:\n"
-"%%s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:835
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No es pot fer reflog per a ยซ%sยป: %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:877
 msgid "HEAD is now at"
 msgstr "HEAD ara รฉs a"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:881 builtin/clone.c:716
 msgid "unable to update HEAD"
 msgstr "no s'ha pogut actualitzar HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:885
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Restableix la branca ยซ%sยป\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:888
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ja en ยซ%sยป\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:892
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "S'ha canviat i restablert a la branca ยซ%sยป\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:894 builtin/checkout.c:1291
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "S'ha canviat a la branca nova ยซ%sยป\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:896
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "S'ha canviat a la branca ยซ%sยป\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:947
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... i %d mรฉs.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:953
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10342,7 +10903,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:972
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10369,217 +10930,213 @@ msgstr[1] ""
 " git branch <nom-de-branca-nova> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1007
 msgid "internal error in revision walk"
 msgstr "error intern en el passeig per revisions"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1011
 msgid "Previous HEAD position was"
 msgstr "La posiciรณ de HEAD anterior era"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1051 builtin/checkout.c:1286
 msgid "You are on a branch yet to be born"
 msgstr "Sou en una branca que encara ha de nรฉixer"
 
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1178
 #, fuzzy
 msgid "only one reference expected"
 msgstr "s'esperava nomรฉs una referรจncia, s'han donat %d."
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1195
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "s'esperava nomรฉs una referรจncia, s'han donat %d."
 
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1232
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
 "Please use -- (and optionally --no-guess) to disambiguate"
 msgstr ""
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referรจncia no vร lida: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1258 builtin/checkout.c:1622
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referรจncia no รฉs un arbre: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1305
 #, fuzzy, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "no es pot llegir l'objecte %s ยซ%sยป"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1307
 #, fuzzy, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr ""
 "La branca ยซ%sยป estร  configurada per a seguir la branca remota ยซ%sยป de ยซ%sยป."
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1308 builtin/checkout.c:1316
 #, fuzzy, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1311
 #, fuzzy, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "La vostra branca estร  al dia amb ยซ%sยป.\n"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1327
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1331
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1335
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1339
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1343
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1347
 #, fuzzy
 msgid "you are switching branch while bisecting"
 msgstr "Actualment esteu bisecant."
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1354
 msgid "paths cannot be used with switching branches"
 msgstr "els camins no es poden usar amb canvi de branca"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "ยซ%sยป no es pot usar amb canvi de branca"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375
+#: builtin/checkout.c:1380 builtin/checkout.c:1385
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "ยซ%sยป no es pot usar amb ยซ%sยป"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1382
 #, fuzzy, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "ยซ%sยป no es pot usar amb actualitzaciรณ de camins"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1390
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "No es pot canviar la branca a la no comissiรณ ยซ%sยป"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1397
 #, fuzzy
 msgid "missing branch or commit argument"
 msgstr "Manca el nom de branca; proveu -b"
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52
+#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285
+#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "forรงa l'informe de progrรฉs"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1440
 msgid "perform a 3-way merge with the new branch"
 msgstr "realitza una fusiรณ de 3 vies amb la branca nova"
 
-#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
+#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr "estil"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1442
 msgid "conflict style (merge or diff3)"
 msgstr "estil de conflicte (fusiรณ o diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1454 builtin/worktree.c:503
 msgid "detach HEAD at named commit"
 msgstr "separa HEAD a la comissiรณ anomenada"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1455
 msgid "set upstream info for new branch"
 msgstr "estableix la informaciรณ de font de la branca nova"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1457
 msgid "force checkout (throw away local modifications)"
 msgstr "agafa a la forรงa (descarta qualsevol modificaciรณ local)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1459
 msgid "new-branch"
 msgstr "branca-nova"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1459
 msgid "new unparented branch"
 msgstr "branca รฒrfena nova"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1461 builtin/merge.c:288
 msgid "update ignored files (default)"
 msgstr "actualitza els fitxers ignorats (per defecte)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1464
 msgid "do not check if another worktree is holding the given ref"
 msgstr "no comprovis si altre arbre de treball tรฉ la referรจncia donada"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1477
 msgid "checkout our version for unmerged files"
 msgstr "agafa la versiรณ nostra dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1480
 msgid "checkout their version for unmerged files"
 msgstr "agafa la versiรณ seva dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1484
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitis les especificacions de camรญ nomรฉs a entrades disperses"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1537
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B i --orphan sรณn mรบtuament excloents"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1540
 #, fuzzy
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-n i -k sรณn mรบtuament excloents."
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1577
 msgid "--track needs a branch name"
 msgstr "--track necessita un nom de branca"
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1582
 #, fuzzy
 msgid "missing branch name; try -b"
 msgstr "Manca el nom de branca; proveu -b"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1615
 #, fuzzy, c-format
 msgid "could not resolve %s"
 msgstr "no s'ha pogut resoldre ยซ%sยป"
 
-#: builtin/checkout.c:1623
-#, fuzzy
-msgid "you must specify path(s) to restore"
-msgstr "Heu d'especificar un directori."
-
 #: builtin/checkout.c:1631
 msgid "invalid path specification"
 msgstr "especificaciรณ de camรญ no vร lida"
@@ -10596,7 +11153,17 @@ msgstr ""
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach no accepta un parร metre de camรญ ยซ%sยป"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1651
+#, fuzzy
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--first-parent รฉs incompatible amb --bisect"
+
+#: builtin/checkout.c:1654 builtin/reset.c:324
+#, fuzzy
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--first-parent รฉs incompatible amb --bisect"
+
+#: builtin/checkout.c:1665
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10604,7 +11171,12 @@ msgstr ""
 "git checkout: --ours/--theirs, --force i --merge sรณn incompatibles en\n"
 "agafar de l'รญndex."
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1670
+#, fuzzy
+msgid "you must specify path(s) to restore"
+msgstr "Heu d'especificar un directori."
+
+#: builtin/checkout.c:1689
 #, c-format
 msgid ""
 "'%s' matched more than one remote tracking branch.\n"
@@ -10621,75 +11193,75 @@ msgid ""
 "checkout.defaultRemote=origin in your config."
 msgstr ""
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765
+#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
 msgid "branch"
 msgstr "branca"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1715
 msgid "create and checkout a new branch"
 msgstr "crea i agafa una branca nova"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1717
 msgid "create/reset and checkout a branch"
 msgstr "crea/restableix i agafa una branca"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1718
 msgid "create reflog for new branch"
 msgstr "crea un registre de referรจncia per a la branca nova"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1720
 #, fuzzy
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "dubta 'git checkout <cap-branca-aixรญ>'"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1721
 #, fuzzy
 msgid "use overlay mode (default)"
 msgstr "poda les referรจncies soltes (per defecte)"
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1766
 #, fuzzy
 msgid "create and switch to a new branch"
 msgstr "crea i agafa una branca nova"
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1768
 #, fuzzy
 msgid "create/reset and switch to a branch"
 msgstr "crea/restableix i agafa una branca"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1770
 #, fuzzy
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "dubta 'git checkout <cap-branca-aixรญ>'"
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1772
 #, fuzzy
 msgid "throw away local modifications"
 msgstr "agafa a la forรงa (descarta qualsevol modificaciรณ local)"
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1804
 #, fuzzy
-msgid "where the checkout from"
+msgid "which tree-ish to checkout from"
 msgstr "llegeix l'objecte des de stdin"
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1806
 #, fuzzy
 msgid "restore the index"
 msgstr "S'ha produรฏt un error en llegir l'รญndex"
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1808
 #, fuzzy
 msgid "restore the working tree (default)"
 msgstr "Mostra l'estat de l'arbre de treball"
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1810
 #, fuzzy
 msgid "ignore unmerged entries"
 msgstr "s'estร  ignorant %s no fusionat\n"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1811
 msgid "use overlay mode"
 msgstr ""
 
@@ -10729,7 +11301,7 @@ msgstr "s'ha produรฏt un error en eliminar %s"
 msgid "could not lstat %s\n"
 msgstr "no s'ha pogut fer stat a %s"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10742,7 +11314,7 @@ msgstr ""
 "foo        - selecciona un รญtem basat en un prefix รบnic\n"
 "           - (buit) no seleccionis res\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10763,38 +11335,33 @@ msgstr ""
 "*          - tria tots els รญtems\n"
 "           - (buit) finalitza la selecciรณ\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Perdรณ (%s)?\n"
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Introduรฏu els patrons a ignorar>> "
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ADVERTรˆNCIA: No es poden trobar รญtems que coincideixin amb: %s"
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Selecciona els รญtems a suprimir"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Voleu eliminar %s [y/N]? "
 
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Adรฉu.\n"
-
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10812,64 +11379,56 @@ msgstr ""
 "help                - aquesta pantalla\n"
 "?                   - ajuda de selecciรณ de l'avรญs"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Ordres ***"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "I ara quรจ"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Eliminaria l'รญtem segรผent:"
 msgstr[1] "Eliminaria els รญtems segรผents:"
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "No hi ha mรฉs fitxers a netejar; s'estร  sortint."
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "no imprimeixis els noms dels fitxers eliminats"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr "forรงa"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "neteja interactiva"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "elimina directoris sencers"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
+#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "patrรณ"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "afegiu <patrรณ> per a ignorar les regles"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "elimina els fitxers ignorats, tambรฉ"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "elimina nomรฉs els fitxers ignorats"
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x i -X no es poden usar junts"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -10877,7 +11436,7 @@ msgstr ""
 "clean.requireForce estร  establerta en cert i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -10885,7 +11444,7 @@ msgstr ""
 "clean.requireForce รฉs per defecte cert i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opcions>] [--] <dipรฒsit> [<directori>]"
 
@@ -10933,18 +11492,18 @@ msgstr "directori-de-plantilla"
 msgid "directory from which templates will be used"
 msgstr "directori des del qual s'usaran les plantilles"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1885
 msgid "reference repository"
 msgstr "dipรฒsit de referรจncia"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1394
+#: builtin/submodule--helper.c:1887
 msgid "use --reference only while cloning"
 msgstr "usa --reference nomรฉs en clonar"
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3308 builtin/repack.c:330
+#: builtin/pack-objects.c:3294 builtin/repack.c:327
 msgid "name"
 msgstr "nom"
 
@@ -10960,8 +11519,8 @@ msgstr "agafa <branca> en lloc de la HEAD del remot"
 msgid "path to git-upload-pack on the remote"
 msgstr "camรญ a git-upload-pack en el remot"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840
+#: builtin/pull.c:227
 msgid "depth"
 msgstr "profunditat"
 
@@ -10969,7 +11528,7 @@ msgstr "profunditat"
 msgid "create a shallow clone of that depth"
 msgstr "crea un clon superficial de tal profunditat"
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283
 msgid "time"
 msgstr "hora"
 
@@ -10977,12 +11536,12 @@ msgstr "hora"
 msgid "create a shallow clone since a specific time"
 msgstr "crea un clon superficial des d'una hora especรญfica"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1445
 msgid "revision"
 msgstr "revisiรณ"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "aprofundeix la histรฒria d'un clon superficial, excloent una revisiรณ"
 
@@ -11015,23 +11574,23 @@ msgstr "clau=valor"
 msgid "set config inside the new repository"
 msgstr "estableix la configuraciรณ dins del dipรฒsit nou"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "especรญfic al servidor"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "opciรณ a transmetre"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr "usa nomรฉs adreces IPv4"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr "usa nomรฉs adreces IPv6"
 
@@ -11040,7 +11599,11 @@ msgstr "usa nomรฉs adreces IPv6"
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "qualsevol submรฒdul clonat serร  superficial"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11048,47 +11611,42 @@ msgstr ""
 "No s'ha pogut endevinar cap nom de directori.\n"
 "Especifiqueu un directori en la lรญnia d'ordres"
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: No s'ha pogut afegir un alternatiu per a ยซ%sยป: %s\n"
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existeix i no รฉs directori"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, fuzzy, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "no s'ha pogut escriure a ยซ%sยป"
 
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "s'ha produรฏt un error en desenllaรงar ยซ%sยป"
-
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "s'ha produรฏt un error en crear l'enllaรง ยซ%sยป"
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "s'ha produรฏt un error en copiar el fitxer a ยซ%sยป"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, fuzzy, c-format
 msgid "failed to iterate over '%s'"
 msgstr "s'ha produรฏt un error en eliminar ยซ%sยป"
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr "fet.\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 #, fuzzy
 msgid ""
 "Clone succeeded, but checkout failed.\n"
@@ -11100,97 +11658,102 @@ msgstr ""
 "'git status' i tornar a intentar l'agafament amb\n"
 "'git checkout -f HEAD'\n"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
 
-#: builtin/clone.c:702
+#: builtin/clone.c:704
 #, c-format
 msgid "unable to update %s"
 msgstr "no s'ha pogut actualitzar %s"
 
 #: builtin/clone.c:752
+#, fuzzy
+msgid "failed to initialize sparse-checkout"
+msgstr "s'ha produรฏt un error en finalitzar ยซ%sยป"
+
+#: builtin/clone.c:775
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "la HEAD remot es refereix a una referรจncia que no existeix; no s'ha pogut "
 "agafar.\n"
 
-#: builtin/clone.c:783
+#: builtin/clone.c:806
 msgid "unable to checkout working tree"
 msgstr "no s'ha pogut agafar l'arbre de treball"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:856
 msgid "unable to write parameters to config file"
 msgstr "no s'han pogut escriure els parร metres al fitxer de configuraciรณ"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:919
 msgid "cannot repack to clean up"
 msgstr "no es pot reempaquetar per a netejar"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:921
 msgid "cannot unlink temporary alternates file"
 msgstr "no es pot desenllaรงar el fitxer d'alternatives temporal"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:959 builtin/receive-pack.c:1948
 msgid "Too many arguments."
 msgstr "Hi ha massa parร metres."
 
-#: builtin/clone.c:942
+#: builtin/clone.c:963
 msgid "You must specify a repository to clone."
 msgstr "Heu d'especificar un dipรฒsit per a clonar."
 
-#: builtin/clone.c:955
+#: builtin/clone.c:976
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les opcions --bare i --origin %s sรณn incompatibles."
 
-#: builtin/clone.c:958
+#: builtin/clone.c:979
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare i --separate-git-dir sรณn incompatibles."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:992
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "el dipรฒsit ยซ%sยป no existeix"
 
-#: builtin/clone.c:977 builtin/fetch.c:1653
+#: builtin/clone.c:998 builtin/fetch.c:1787
 #, c-format
 msgid "depth %s is not a positive number"
-msgstr "la profunditat %s no รฉs nombre positiu"
+msgstr "la profunditat %s no รฉs un nombre positiu"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1008
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "el camรญ destรญ ยซ%sยป ja existeix i no รฉs un directori buit."
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1018
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "l'arbre de treball ยซ%sยป ja existeix."
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no s'han pogut crear els directoris inicials de ยซ%sยป"
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1038
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no s'ha pogut crear el directori d'arbre de treball ยซ%sยป"
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1058
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "S'estร  clonant al dipรฒsit nu ยซ%sยป...\n"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1060
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "S'estร  clonant a ยซ%sยป...\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1084
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11198,38 +11761,38 @@ msgstr ""
 "clone --recursive no รฉs compatible amb ambdรณs --reference i --reference-if-"
 "able"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1148
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'aixรฒ."
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1150
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since s'ignora en els clons locals; useu file:// en lloc d'aixรฒ."
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1152
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'aixรฒ."
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1154
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'aixรฒ."
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1157
 msgid "source repository is shallow, ignoring --local"
 msgstr "el dipรฒsit font รฉs superficial, s'estร  ignorant --local"
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1162
 msgid "--local is ignored"
 msgstr "--local s'ignora"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1237 builtin/clone.c:1245
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "La branca remota %s no es troba en la font %s"
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1248
 msgid "You appear to have cloned an empty repository."
 msgstr "Sembla que heu clonat un dipรฒsit buit."
 
@@ -11276,7 +11839,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "suprimeix les referรจncies reemplaรงades"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, fuzzy, c-format
 msgid "not a valid object name %s"
 msgstr "no รฉs un nom d'objecte vร lid: %s"
@@ -11306,13 +11869,13 @@ msgstr "pare"
 msgid "id of a parent commit object"
 msgstr "s'ha produรฏt un error en escriure l'objecte de comissiรณ"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
 #: builtin/tag.c:412
 msgid "message"
 msgstr "missatge"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1496
 msgid "commit message"
 msgstr "missatge de comissiรณ"
 
@@ -11321,8 +11884,8 @@ msgstr "missatge de comissiรณ"
 msgid "read commit log message from file"
 msgstr "llegiu el missatge des d'un fitxer"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287
+#: builtin/pull.c:195 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "signa la comissiรณ amb GPG"
 
@@ -11391,57 +11954,66 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "s'ha produรฏt un error en desempaquetar l'objecte d'arbre HEAD"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+#, fuzzy
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "-a no tรฉ sentit amb camins."
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "--include/--only no tรฉ sentit sense camรญ."
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr "no s'ha pogut crear un รญndex temporal"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:382
 msgid "interactive add failed"
 msgstr "l'afegiment interactiu ha fallat"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:396
 msgid "unable to update temporary index"
 msgstr "no s'ha pogut actualitzar l'รญndex temporal"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:398
 msgid "Failed to update main cache tree"
 msgstr "S'ha produรฏt un error en actualitzar l'arbre principal de memรฒria cau"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492
 msgid "unable to write new_index file"
 msgstr "no s'ha pogut escriure el fitxer new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:475
 msgid "cannot do a partial commit during a merge."
 msgstr "no es pot fer una comissiรณ parcial durant una fusiรณ."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:477
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no es pot fer una comissiรณ parcial durant un ยซcherry pickยป."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:485
 msgid "cannot read the index"
 msgstr "no es pot llegir l'รญndex"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:504
 msgid "unable to write temporary index file"
 msgstr "no s'ha pogut escriure un fitxer d'รญndex temporal"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:602
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "a la comissiรณ ยซ%sยป li manca la capรงalera d'autor"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:604
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "la comissiรณ ยซ%sยป tรฉ una lรญnia d'autor mal formada"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:623
 msgid "malformed --author parameter"
 msgstr "parร metre --author mal format"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:676
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11449,38 +12021,38 @@ msgstr ""
 "no es pot seleccionar un carร cter de comentari que\n"
 "no sigui usat en el missatge de comissiรณ actual"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no s'ha pogut trobar la comissiรณ %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:726 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(s'estร  llegint el missatge de registre des de l'entrada estร ndard)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:728
 msgid "could not read log from standard input"
 msgstr "no s'ha pogut llegir el registre des de l'entrada estร ndard"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:732
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de registre ยซ%sยป"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:763 builtin/commit.c:779
 msgid "could not read SQUASH_MSG"
 msgstr "no s'ha pogut llegir SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:770
 msgid "could not read MERGE_MSG"
 msgstr "no s'ha pogut llegir MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:830
 msgid "could not write commit template"
 msgstr "no s'ha pogut escriure la plantilla de comissiรณ"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:849
 #, c-format
 msgid ""
 "\n"
@@ -11495,7 +12067,7 @@ msgstr ""
 "\t%s\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:854
 #, c-format
 msgid ""
 "\n"
@@ -11510,7 +12082,7 @@ msgstr ""
 "\t%s\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:867
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11520,7 +12092,7 @@ msgstr ""
 "S'ignoraran les lรญnies que comencin amb ยซ%cยป, i un missatge de\n"
 "comissiรณ buit avorta la comissiรณ.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:875
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11532,146 +12104,142 @@ msgstr ""
 "vosaltres\n"
 "mateixos si voleu. Un missatge buit avorta la comissiรณ.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:892
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:    %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:900
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:907
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sComitent: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:925
 msgid "Cannot read index"
 msgstr "No es pot llegir l'รญndex"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:992
 msgid "Error building trees"
 msgstr "Error en construir arbres"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1006 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Especifiqueu el missatge usant l'opciรณ -m o l'opciรณ -F.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1050
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author ยซ%sยป no รฉs ยซNom <adreรงa-electrรฒnica>ยป i no coincideix amb\n"
 "cap autor existent"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1064
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "mode ignorat no vร lid ยซ%sยป"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1082 builtin/commit.c:1322
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fitxers no seguits no vร lid ยซ%sยป"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1122
 msgid "--long and -z are incompatible"
 msgstr "--long i -z sรณn incompatibles"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1166
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambdรณs --reset-author i --author no tรฉ sentit"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1175
 msgid "You have nothing to amend."
 msgstr "No teniu res a esmenar."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1178
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Esteu enmig d'una fusiรณ -- no es pot esmenar."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1180
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Esteu enmig d'un ยซcherry pickยป -- no es pot esmenar."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1183
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les opcions --squash i --fixup no es poden usar juntes"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1193
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Nomรฉs un de -c/-C/-F/--fixup es pot usar."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1195
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "L'opciรณ -m no es pot combinar amb -c/-C/-F/."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1203
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author nomรฉs es pot usar amb -C, -c o --amend."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1220
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "Nomรฉs un de --include/--only/--all/--interactive/--patch es pot usar."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "--include/--only no tรฉ sentit sense camรญ."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1226
 #, fuzzy, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "-a no tรฉ sentit amb camins."
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1357 builtin/commit.c:1519
 msgid "show status concisely"
 msgstr "mostra l'estat concisament"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1359 builtin/commit.c:1521
 msgid "show branch information"
 msgstr "mostra la informaciรณ de branca"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1361
 msgid "show stash information"
 msgstr "mostra la informaciรณ de ยซstashยป"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1363 builtin/commit.c:1523
 msgid "compute full ahead/behind values"
 msgstr ""
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1365
 msgid "version"
 msgstr "versiรณ"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549
+#: builtin/worktree.c:650
 msgid "machine-readable output"
 msgstr "sortida llegible per mร quina"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1368 builtin/commit.c:1527
 msgid "show status in long format (default)"
 msgstr "mostra l'estat en format llarg (per defecte)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1371 builtin/commit.c:1530
 msgid "terminate entries with NUL"
 msgstr "acaba les entrades amb NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1374 builtin/commit.c:1533
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
 "defecte: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1378
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11679,11 +12247,11 @@ msgstr ""
 "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
 "(Per defecte: traditional, matching, no.)"
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1380 parse-options.h:192
 msgid "when"
 msgstr "quan"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1381
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11691,173 +12259,173 @@ msgstr ""
 "ignora els canvis als submรฒduls, opcional quan: all, dirty, untracked. (Per "
 "defecte: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1383
 msgid "list untracked files in columns"
 msgstr "mostra els fitxers no seguits en columnes"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1384
 msgid "do not detect renames"
 msgstr "no detectis canvis de noms"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1386
 msgid "detect renames, optionally set similarity index"
 msgstr "detecta canvis de noms, i opcionalment estableix un รญndex de semblanรงa"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1406
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1489
 msgid "suppress summary after successful commit"
 msgstr "omet el resum desprรฉs d'una comissiรณ reeixida"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1490
 msgid "show diff in commit message template"
 msgstr "mostra la diferรจncia en la plantilla de missatge de comissiรณ"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1492
 msgid "Commit message options"
 msgstr "Opcions de missatge de comissiรณ"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414
 msgid "read message from file"
 msgstr "llegiu el missatge des d'un fitxer"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1494
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1494
 msgid "override author for commit"
 msgstr "autor corregit de la comissiรณ"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1495 builtin/gc.c:538
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1495
 msgid "override date for commit"
 msgstr "data corregida de la comissiรณ"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499
+#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "comissiรณ"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1497
 msgid "reuse and edit message from specified commit"
 msgstr "reusa i edita el missatge de la comissiรณ especificada"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1498
 msgid "reuse message from specified commit"
 msgstr "reusa el missatge de la comissiรณ especificada"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1499
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usa el missatge formatat de ยซsquashยป automร tic per a corregir la comissiรณ "
 "especificada"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1500
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usa el missatge formatat de ยซsquashยป automร tic per a ยซsquashยป a la comissiรณ "
 "especificada"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1501
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "l'autor de la comissiรณ ja sรณc jo (s'usa amb -C/-c/--amend)"
 
-#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289
+#: builtin/pull.c:164 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "afegeix Signed-off-by:"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1503
 msgid "use specified template file"
 msgstr "usa el fitxer de plantilla especificat"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1504
 msgid "force edit of commit"
 msgstr "forรงa l'ediciรณ de la comissiรณ"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1506
 msgid "include status in commit message template"
 msgstr "inclou l'estat en la plantilla de missatge de comissiรณ"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1511
 msgid "Commit contents options"
 msgstr "Opcions dels continguts de les comissions"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1512
 msgid "commit all changed files"
 msgstr "comet tots els fitxers canviats"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1513
 msgid "add specified files to index for commit"
 msgstr "afegeix els fitxers especificats a l'รญndex per a cometre"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1514
 msgid "interactively add files"
 msgstr "afegeix els fitxers interactivament"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1515
 msgid "interactively add changes"
 msgstr "afegeix els canvis interactivament"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1516
 msgid "commit only specified files"
 msgstr "comet nomรฉs els fitxers especificats"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1517
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evita els lligams de precomissiรณ i missatge de comissiรณ"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1518
 msgid "show what would be committed"
 msgstr "mostra quรจ es cometria"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1531
 msgid "amend previous commit"
 msgstr "esmena la comissiรณ anterior"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1532
 msgid "bypass post-rewrite hook"
 msgstr "evita el lligam de post escriptura"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1539
 msgid "ok to record an empty change"
 msgstr "estร  bรฉ registrar un canvi buit"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1541
 msgid "ok to record a change with an empty message"
 msgstr "estร  bรฉ registrar un canvi amb missatge buit"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1614
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fitxer MERGE_HEAD malmรจs (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1621
 msgid "could not read MERGE_MODE"
 msgstr "no s'ha pogut llegir MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1640
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no s'ha pogut llegir el missatge de comissiรณ: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1647
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "S'estร  avortant la comissiรณ a causa d'un missatge de comissiรณ buit.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "S'estร  avortant la comissiรณ; no heu editat el missatge.\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1686
 #, fuzzy
 msgid ""
 "repository has been updated, but unable to write\n"
@@ -11869,74 +12437,66 @@ msgstr ""
 "que no s'hagi excedit la quota, i desprรฉs feu \n"
 "ยซgit reset HEADยป per a recuperar-ho."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr ""
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr ""
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
 msgstr ""
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1601
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:103
+#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr "directori"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:49 builtin/commit-graph.c:104
+#: builtin/commit-graph.c:188
 msgid "The object directory to store the graph"
 msgstr ""
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:51
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23
 #, fuzzy, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "no s'ha pogut analitzar la comissiรณ ยซ%sยป"
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:106
 msgid "start walk at all refs"
 msgstr ""
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:108
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:110
 msgid "start walk at commits listed by stdin"
 msgstr ""
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:112
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:115
 #, fuzzy
 msgid "allow writing an incremental commit-graph file"
 msgstr "Escriu i verifica els fitxers commit-graph de Git"
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:117 builtin/commit-graph.c:121
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:119
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:137
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 
@@ -12252,57 +12812,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "imprimeix les mides en un format llegible pels humans"
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opcions>] [<comissiรณ>...]"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opcions>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr "davant per"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr "lleuger"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr "anotat"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'etiqueta anotada %s no รฉs disponible"
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "l'etiqueta anotada %s no tรฉ nom incrustat"
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "l'etiqueta ยซ%sยป realment รฉs ยซ%sยป aquรญ"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "cap etiqueta coincideix exactament amb ยซ%sยป"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 
-#: builtin/describe.c:379
+#: builtin/describe.c:381
 #, c-format
 msgid "finished search at %s\n"
 msgstr "s'ha finalitzat la cerca a %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:407
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12311,7 +12871,7 @@ msgstr ""
 "Cap etiqueta anotada pot descriure ยซ%sยป.\n"
 "No obstant, hi havia etiquetes no anotades: proveu --tags."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:411
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12320,12 +12880,12 @@ msgstr ""
 "Cap etiqueta pot descriure ยซ%sยป.\n"
 "Proveu --always, o creeu algunes etiquetes."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:441
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu comissions travessades\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:444
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12334,90 +12894,90 @@ msgstr ""
 "s'han trobat mรฉs de %i etiquetes: s'han llistat les %i mรฉs recents\n"
 "s'ha renunciat la cerca a %s\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:512
 #, c-format
 msgid "describe %s\n"
 msgstr "descriu %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:515
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s no รฉs un nom d'objecte vร lid"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:523
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s no รฉs una comissiรณ o un blob"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:537
 msgid "find the tag that comes after the commit"
 msgstr "troba l'etiqueta que vingui desprรฉs de la comissiรณ"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:538
 msgid "debug search strategy on stderr"
 msgstr "estratรจgia de cerca de depuraciรณ en stderr"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:539
 msgid "use any ref"
 msgstr "usa qualsevol referรจncia"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:540
 msgid "use any tag, even unannotated"
 msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:541
 msgid "always use long format"
 msgstr "sempre usa el format llarg"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:542
 msgid "only follow first parent"
 msgstr "nomรฉs segueix la primera mare"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:545
 msgid "only output exact matches"
 msgstr "emet nomรฉs coincidรจncies exactes"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:547
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considera les <n> etiquetes mรฉs recents (per defecte: 10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:549
 msgid "only consider tags matching <pattern>"
 msgstr "nomรฉs considera les etiquetes que coincideixen amb <patrรณ>"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:551
 msgid "do not consider tags matching <pattern>"
 msgstr "no consideris les etiquetes que no coincideixen amb <patrรณ>"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:553 builtin/name-rev.c:473
 msgid "show abbreviated commit object as fallback"
 msgstr "mostra l'objecte de comissiรณ abreviat com a sistema alternatiu"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:554 builtin/describe.c:557
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:555
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:558
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:576
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long รฉs incompatible amb --abbrev=0"
 
-#: builtin/describe.c:603
+#: builtin/describe.c:605
 msgid "No names found, cannot describe anything."
 msgstr "No s'ha trobat cap nom, no es pot descriure res."
 
-#: builtin/describe.c:654
+#: builtin/describe.c:656
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty รฉs incompatible amb les comissions"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:658
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken รฉs incompatible amb les comissions"
 
@@ -12454,27 +13014,27 @@ msgstr "s'ha donat l'objecte no gestionat ยซ%sยป."
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camรญ>...]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "ha fallat: %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaรง simbรฒlic %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "no s'ha pogut llegir el fitxer d'enllaรง simbรฒlic %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "No es pot llegir l'objecte %s per l'enllaรง simbรฒlic %s"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -12482,54 +13042,54 @@ msgstr ""
 "els formats de diff combinats ('-c' and '--cc') no sรณn admesos \n"
 "en el mode diff per directoris ('-d' and '--dir-diff')."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "s'han modificat ambdรณs fitxers: ยซ%sยป i ยซ%sยป."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr "s'ha deixat un fitxer de l'arbre de treball."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existeix un fitxer temporal a ยซ%sยป."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr "podeu netejar o recuperar-los."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr "fes un diff de tot el directori"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr "no preguntis abans d'executar l'eina diff"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "utilitza enllaรงos simbรฒlics en mode dir-diff"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr "eina"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "utilitza l'eina de diff especificada"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "imprimeix una llista de totes les eines diff que podeu usar amb `--tool`"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12537,31 +13097,31 @@ msgstr ""
 "fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de "
 "sortida diferent de zero"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "especifiqueu un ordre personalitzat per veure diffs"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr "passa-ho a ยซdiffยป"
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool requereix worktree o --no-index"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff รฉs incompatible amb --no-index"
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool and --extcmd sรณn mรบtuament excloents"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
 
@@ -12597,156 +13157,182 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [opcions-de-llista-de-revisions]"
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:852
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr "mostra el progrรฉs desprรฉs de <n> objectes"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr "selecciona la gestiรณ de les etiquetes signades"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr "selecciona la gestiรณ de les etiquetes que etiquetin objectes filtrats"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 #, fuzzy
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "selecciona la gestiรณ de les etiquetes que etiquetin objectes filtrats"
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
 msgstr "Bolca les marques a aquest fitxer"
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
 msgstr "Importa les marques d'aquest fitxer"
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+#, fuzzy
+msgid "Import marks from this file if it exists"
+msgstr "Importa les marques d'aquest fitxer"
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr "Imprimeix l'arbre complet de cada comissiรณ"
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr "Usa la caracterรญstica done per a acabar el corrent"
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr "Omet l'emissiรณ de dades de blob"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1649
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr "especificaciรณ de referรจncia"
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr "Aplica l'especificaciรณ de referรจncia a les referรจncies exportades"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr "anonimitza la sortida"
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
 msgstr ""
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr ""
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr ""
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opcions>] [<dipรฒsit> [<especificaciรณ-de-referรจncia>...]]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opcions>] <grup>"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opcions>] [(<dipรฒsit> | <grup>)...]"
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opcions>]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr ""
+
+#: builtin/fetch.c:139 builtin/pull.c:204
 msgid "fetch from all remotes"
 msgstr "obtรฉn de tots els remots"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:248
+#, fuzzy
+msgid "set upstream for git pull/fetch"
+msgstr "estableix la font per a git pull/status"
+
+#: builtin/fetch.c:143 builtin/pull.c:207
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:210
 msgid "path to upload pack on remote end"
 msgstr "camรญ al qual pujar el paquet al costat remot"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr "forรงa la sobreescriptura de la referรจncia local"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr "obtรฉn de mรบltiples remots"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:214
 msgid "fetch all tags and associated objects"
 msgstr "obtรฉn totes les etiquetes i tots els objectes associats"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no obtinguis les etiquetes (--no-tags)"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de submรฒduls obtinguts en paralยทlel"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:217
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot"
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141
 msgid "on-demand"
 msgstr "sota demanda"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr "controla l'obtenciรณ recursiva de submรฒduls"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:225
 msgid "keep downloaded pack"
 msgstr "retรฉn el paquet baixat"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr "permet l'actualitzaciรณ de la referรจncia HEAD"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228
 msgid "deepen history of shallow clone"
 msgstr "aprofundeix la histรฒria d'un clon superficial"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr "aprofundeix la histรฒria d'un clon superficial basat en temps"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:231
 msgid "convert to a complete repository"
 msgstr "converteix en un dipรฒsit complet"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr "anteposa aixรฒ a la sortida de camรญ del submรฒdul"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -12754,107 +13340,128 @@ msgstr ""
 "per defecte per a l'obtenciรณ recursiva de submรฒduls (prioritat mรฉs baixa que "
 "els fitxers de configuraciรณ)"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:234
 msgid "accept refs that update .git/shallow"
 msgstr "accepta les referรจncies que actualitzin .git/shallow"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:236
 msgid "refmap"
 msgstr "mapa de referรจncies"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:237
 msgid "specify fetch refmap"
-msgstr "mostra el mapa de referรจncies d'obtenciรณ"
+msgstr "especรญfica l'obtenciรณ del mapa de referรจncies"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 #, fuzzy
 msgid "run 'gc --auto' after fetching"
 msgstr "poda els remots desprรฉs d'obtenir-los"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:246
 msgid "check for forced-updates on all updated branches"
 msgstr ""
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+#, fuzzy
+msgid "write the commit-graph after fetching"
+msgstr "poda els remots desprรฉs d'obtenir-los"
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr "No s'ha pogut trobar la referรจncia HEAD remota"
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "la configuraciรณ fetch.output contรฉ un valor no vร lid %s"
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr "objecte %s no trobat"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr "[al dia]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr "[rebutjat]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr "no es pot obtenir en la branca actual"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr "[actualitzaciรณ d'etiqueta]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr "no s'ha pogut actualitzar la referรจncia local"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr ""
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr "[etiqueta nova]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr "[branca nova]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr "[referรจncia nova]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr "actualitzaciรณ forรงada"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr "sense avanรง rร pid"
 
-#: builtin/fetch.c:879
+#: builtin/fetch.c:877
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+
+#: builtin/fetch.c:881
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+
+#: builtin/fetch.c:911
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no ha enviat tots els objectes necessaris\n"
 
-#: builtin/fetch.c:900
+#: builtin/fetch.c:932
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 "rebutja %s perquรจ no es permet que les arrels superficials s'actualitzin"
 
-#: builtin/fetch.c:991 builtin/fetch.c:1124
+#: builtin/fetch.c:1017 builtin/fetch.c:1155
 #, c-format
 msgid "From %.*s\n"
 msgstr "De %.*s\n"
 
-#: builtin/fetch.c:1002
+#: builtin/fetch.c:1028
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -12864,80 +13471,80 @@ msgstr ""
 " intenteu executar 'git remote prune %s' per a eliminar\n"
 " qualsevol branca antiga o conflictiva"
 
-#: builtin/fetch.c:1008
-msgid ""
-"Fetch normally indicates which branches had a forced update, but that check "
-"has been disabled."
-msgstr ""
-
-#: builtin/fetch.c:1009
-msgid ""
-"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
-"showForcedUpdates true'."
-msgstr ""
-
-#: builtin/fetch.c:1011
-#, c-format
-msgid ""
-"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
-"updates'\n"
-msgstr ""
-
-#: builtin/fetch.c:1013
-msgid ""
-"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
-msgstr ""
-
-#: builtin/fetch.c:1094
+#: builtin/fetch.c:1125
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s es tornarร  penjant)"
 
-#: builtin/fetch.c:1095
+#: builtin/fetch.c:1126
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s s'ha tornat penjant)"
 
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1158
 msgid "[deleted]"
 msgstr "[suprimit]"
 
-#: builtin/fetch.c:1128 builtin/remote.c:1036
+#: builtin/fetch.c:1159 builtin/remote.c:1035
 msgid "(none)"
 msgstr "(cap)"
 
-#: builtin/fetch.c:1151
+#: builtin/fetch.c:1182
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "S'estร  refusant obtenir en la branca actual %s d'un dipรฒsit no nu"
 
-#: builtin/fetch.c:1170
+#: builtin/fetch.c:1201
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "L'opciรณ ยซ%sยป amb valor ยซ%sยป no รฉs vร lida per a %s"
 
-#: builtin/fetch.c:1173
+#: builtin/fetch.c:1204
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "S'ignora l'opciรณ ยซ%sยป per a %s\n"
 
-#: builtin/fetch.c:1477
+#: builtin/fetch.c:1412
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr ""
+
+#: builtin/fetch.c:1427
+#, fuzzy
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "la branca font ยซ%sยป no s'emmagatzema com a branca amb seguiment remot"
+
+#: builtin/fetch.c:1429
+#, fuzzy
+msgid "not setting upstream for a remote tag"
+msgstr "estableix la font per a git pull/status"
+
+#: builtin/fetch.c:1431
+#, fuzzy
+msgid "unknown branch type"
+msgstr "tipus d'objecte desconegut %d"
+
+#: builtin/fetch.c:1433
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+
+#: builtin/fetch.c:1559 builtin/fetch.c:1622
 #, c-format
 msgid "Fetching %s\n"
 msgstr "S'estร  obtenint %s\n"
 
-#: builtin/fetch.c:1479 builtin/remote.c:100
+#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No s'ha pogut obtenir %s"
 
-#: builtin/fetch.c:1525
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr ""
+#: builtin/fetch.c:1581
+#, fuzzy, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "no s'ha pogut establir ยซ%sยป a ยซ%sยป"
 
-#: builtin/fetch.c:1549
+#: builtin/fetch.c:1684
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -12945,44 +13552,44 @@ msgstr ""
 "Cap dipรฒsit remot especificat. Especifiqueu un URL o\n"
 "un nom remot del qual es deuen obtenir les revisions noves."
 
-#: builtin/fetch.c:1586
+#: builtin/fetch.c:1721
 msgid "You need to specify a tag name."
 msgstr "Necessiteu especificar un nom d'etiqueta."
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1771
 msgid "Negative depth in --deepen is not supported"
 msgstr "No s'admet una profunditat negativa en --deepen"
 
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1773
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen i --depth sรณn mรบtuament excloents"
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1778
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth i --unshallow no es poden usar junts"
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1780
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow en un dipรฒsit complet no tรฉ sentit"
 
-#: builtin/fetch.c:1662
+#: builtin/fetch.c:1796
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no accepta un parร metre de dipรฒsit"
 
-#: builtin/fetch.c:1664
+#: builtin/fetch.c:1798
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no tรฉ sentit amb especificacions de referรจncia"
 
-#: builtin/fetch.c:1673
+#: builtin/fetch.c:1807
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No existeix un remot ni un grup remot: %s"
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1814
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Obtenir un grup i especificar referรจncies no tรฉ sentit"
 
-#: builtin/fetch.c:1696
+#: builtin/fetch.c:1832
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -12994,23 +13601,23 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:674
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "emplena el registre amb <n> entrades del registre curt com a mร xim"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:677
 msgid "alias for --log (deprecated)"
 msgstr "ร lies per --log (en desรบs)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:680
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:681
 msgid "use <text> as start of message"
 msgstr "usa <text> com a inici de missatge"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:682
 msgid "file to read from"
 msgstr "fitxer del qual llegir"
 
@@ -13076,249 +13683,249 @@ msgstr "imprimeix nomรฉs les referรจncies que continguin la comissiรณ"
 msgid "print only refs which don't contain the commit"
 msgstr "imprimeix nomรฉs les referรจncies que no continguin la comissiรณ"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr "desconegut"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "error en %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr ""
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr "tipus d'objecte incorrecte en l'enllaรง"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr "manca %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr "inabastable %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, fuzzy, c-format
 msgid "dangling %s %s"
 msgstr "S'estan actualitzant %s..%s\n"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 #, fuzzy
 msgid "could not create lost-found"
 msgstr "no s'ha pogut crear el fitxer ยซ%sยป"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr "no s'ha pogut finalitzar ยซ%sยป"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr "S'estร  comprovant %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "S'estร  comprovant la connectivitat (%d objectes)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr "S'estร  comprovant %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr "enllaรงos trencats"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr "arrel %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr ""
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objecte corrupte o no trobat"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr " %s: entrada de referรจncia no vร lida %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, fuzzy, c-format
 msgid "Checking reflog %s->%s"
 msgstr "S'estร  comprovant el canvi de nom de ยซ%sยป a ยซ%sยป\n"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: punter sha1 no vร lid: %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: no รฉs una comissiรณ"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr "avรญs: no hi ha referรจncies per defecte"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objecte corrupte o no trobat: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "fitxer sha1 malmรจs: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr "S'estร  comprovant el directori d'objecte"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr "S'estan comprovant els directoris d'objecte"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr "S'estร  comprovant l'enllaรง %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:842
 #, c-format
 msgid "invalid %s"
 msgstr "%s no vร lid"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, fuzzy, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s - no รฉs una cosa que puguem fusionar"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr ""
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr ""
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr "S'estร  comprovant l'arbre de la memรฒria cau"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, fuzzy, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "S'ha produรฏt un error en actualitzar l'arbre principal de memรฒria cau"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opcions>] [<objecte>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr "mostra els objectes inabastables"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr "mostra els objectes penjants"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr "informa de les etiquetes"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr "informa dels nodes d'arrel"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr "fes els objectes d'รญndex nodes de cap"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr "fes que els registres de referรจncies siguin nodes de cap (per defecte)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
 msgstr "tambรฉ considera els paquets i els objectes alternatius"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr "comprova nomรฉs la connectivitat"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr "habilita la comprovaciรณ mรฉs estricta"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr "escriu objectes penjants a .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr "mostra el progrรฉs"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr "mostra els noms detallats dels objectes abastables"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "S'estan comprovant els objectes"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, fuzzy, c-format
 msgid "%s: object missing"
 msgstr "mostra la mida de l'objecte"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, fuzzy, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr "git gc [<opcions>]"
 
@@ -13332,17 +13939,17 @@ msgstr "S'ha produรฏt un error en fer fstat %s: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "s'ha produรฏt un error en moure ยซ%sยป a ยซ%sยป"
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "no es pot fer stat en ยซ%sยป"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr "no es pot llegir ยซ%sยป"
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13357,62 +13964,62 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr "poda objectes sense referรจncia"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr "sigues mรฉs exhaustiu (el temps d'execuciรณ augmenta)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr "habilita el mode de recollida d'escombraries automร tica"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr "forรงa l'execuciรณ de gc encara que hi pugui haver un altre gc executant"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr ""
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, fuzzy, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, fuzzy, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "S'estร  empaquetant el dipรฒsit automร ticament en el rerefons per a un "
 "rendiment รฒptim.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 "S'estร  empaquetant automร ticament el dipรฒsit per a un rendiment รฒptim.\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vegeu ยซgit help gcยป per a neteja manual.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 "gc ja s'estร  executant en la mร quina ยซ%sยป pid %<PRIuMAX> (useu --force si no)"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -13438,262 +14045,262 @@ msgstr "s'ha especificat un nombre de fils no vร lid (%d) per a %s"
 #. grep.threads
 #.
 #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2722
+#: builtin/pack-objects.c:2708
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hi ha suport de fils, s'estร  ignorant %s"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no s'ha pogut llegir l'arbre (%s)"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:650
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es pot fer grep des d'un objecte de tipus %s"
 
-#: builtin/grep.c:714
+#: builtin/grep.c:716
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'opciรณ ยซ%cยป espera un valor numรจric"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:815
 msgid "search in index instead of in the work tree"
 msgstr "cerca en l'รญndex en lloc de l'arbre de treball"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:817
 msgid "find in contents not managed by git"
 msgstr "cerca en continguts no gestionats per git"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:819
 msgid "search in both tracked and untracked files"
 msgstr "cerca tant en fitxers seguits com en no seguits"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:821
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignora els fitxers especificats mitjanรงant '.gitignore'"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:823
 msgid "recursively search in each submodule"
 msgstr "cerca recursivament a cada submรฒdul"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:826
 msgid "show non-matching lines"
 msgstr "mostra les lรญnies no coincidents"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:828
 msgid "case insensitive matching"
 msgstr "coincidรจncia insensible a majรบscula i minรบscula"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:830
 msgid "match patterns only at word boundaries"
 msgstr "coincideix amb els patrons nomรฉs als lรญmits de paraula"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:832
 msgid "process binary files as text"
 msgstr "processa els fitxers binaris com a text"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:834
 msgid "don't match patterns in binary files"
 msgstr "no coincideixis amb els patrons en els fitxers binaris"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:837
 msgid "process binary files with textconv filters"
 msgstr "processa els fitxers binaris amb filtres de textconv"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:839
 msgid "search in subdirectories (default)"
 msgstr "cerca als subdirectories (per defecte)"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:841
 msgid "descend at most <depth> levels"
 msgstr "descendeix com a mร xim <profunditat> nivells"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:845
 msgid "use extended POSIX regular expressions"
 msgstr "usa les expressions regulars POSIX ampliades"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:848
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usa les expressions regulars POSIX bร siques (per defecte)"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:851
 msgid "interpret patterns as fixed strings"
 msgstr "interpreta els patrons com a cadenes fixes"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:854
 msgid "use Perl-compatible regular expressions"
 msgstr "usa les expressions regulars compatibles amb Perl"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:857
 msgid "show line numbers"
 msgstr "mostra els nรบmeros de lรญnia"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:858
 msgid "show column number of first match"
 msgstr "mostra el nombre de columna de la primera coincidรจncia"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:859
 msgid "don't show filenames"
 msgstr "no mostris els noms de fitxer"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:860
 msgid "show filenames"
 msgstr "mostra els noms de fitxer"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:862
 msgid "show filenames relative to top directory"
 msgstr "mostra els noms de fitxer relatius al directori superior"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:864
 msgid "show only filenames instead of matching lines"
 msgstr "mostra nomรฉs els noms de fitxer en lloc de les lรญnies coincidents"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:866
 msgid "synonym for --files-with-matches"
 msgstr "sinรฒnim de --files-with-matches"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:869
 msgid "show only the names of files without match"
 msgstr "mostra nomรฉs els noms dels fitxers sense coincidรจncia"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:871
 msgid "print NUL after filenames"
 msgstr "imprimeix NUL desprรฉs dels noms de fitxer"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:874
 msgid "show only matching parts of a line"
 msgstr "mostra nomรฉs les parts de coincidents de la lรญnia"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:876
 msgid "show the number of matches instead of matching lines"
 msgstr "mostra el nombre de coincidรจncies en lloc de les lรญnies coincidents"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:877
 msgid "highlight matches"
 msgstr "ressalta les coincidรจncies"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:879
 msgid "print empty line between matches from different files"
 msgstr "imprimeix una lรญnia buida entre coincidรจncies de fitxers distints"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:881
 msgid "show filename only once above matches from same file"
 msgstr ""
 "mostra el nom de fitxer nomรฉs una vegada a dalt de les coincidรจncies del "
 "mateix fitxer"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:884
 msgid "show <n> context lines before and after matches"
 msgstr "mostra <n> lรญnies de context abans i desprรฉs d'una coincidรจncia"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:887
 msgid "show <n> context lines before matches"
 msgstr "mostra <n> lรญnies de context abans d'una coincidรจncia"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:889
 msgid "show <n> context lines after matches"
 msgstr "mostra <n> lรญnies de context desprรฉs d'una coincidรจncia"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:891
 msgid "use <n> worker threads"
 msgstr "usa <n> fils de treball"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:892
 msgid "shortcut for -C NUM"
 msgstr "drecera per -C NUM"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:895
 msgid "show a line with the function name before matches"
 msgstr "mostra una lรญnia amb el nom de funciรณ abans de les coincidรจncies"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:897
 msgid "show the surrounding function"
 msgstr "mostra la funciรณ circumdant"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:900
 msgid "read patterns from file"
 msgstr "llegeix els patrons des d'un fitxer"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:902
 msgid "match <pattern>"
 msgstr "coincideix amb <patrรณ>"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:904
 msgid "combine patterns specified with -e"
 msgstr "combina els patrons especificats amb -e"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:916
 msgid "indicate hit with exit status without output"
 msgstr "indica coincidรจncia amb estat de sortida sense sortida textual"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:918
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "mostra nomรฉs les coincidรจncies dels fitxers que coincideixin amb tots els "
 "patrons"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:920
 msgid "show parse tree for grep expression"
 msgstr "mostra l'arbre d'anร lisi de l'expressiรณ grep"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:924
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:924
 msgid "show matching files in the pager"
 msgstr "mostra els fitxers coincidents en el paginador"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:928
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permet la invocaciรณ de grep(1) (ignorat per aquesta compilaciรณ)"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:992
 msgid "no pattern given"
 msgstr "no s'ha donat cap patrรณ"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1028
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no es pot usar amb revisions"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1036
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no s'ha pogut resoldre la revisiรณ: %s"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1067
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinaciรณ d'opcions no vร lida, s'estร  ignorant --threads"
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3405
+#: builtin/grep.c:1070 builtin/pack-objects.c:3400
 msgid "no threads support, ignoring --threads"
 msgstr "no hi ha suport de fils, s'estร  ignorant --threads"
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
+#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "s'ha especificat un nombre de fils no vร lid (%d)"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1096
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager nomรฉs funciona en l'arbre de treball"
 
-#: builtin/grep.c:1117
+#: builtin/grep.c:1119
 msgid "option not supported with --recurse-submodules"
-msgstr "opciรณ no admesa amb --recurse-submodules."
+msgstr "opciรณ no admesa amb --recurse-submodules"
 
-#: builtin/grep.c:1123
+#: builtin/grep.c:1125
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached o --untracked no es pot usar amb --no-index."
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1131
 #, fuzzy
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1139
 #, fuzzy
 msgid "both --cached and trees are given"
 msgstr "s'han donat ambdรณs --caches i arbres."
@@ -13882,11 +14489,11 @@ msgstr "error de lectura d'entrada"
 msgid "used more bytes than were available"
 msgstr "s'han usat mรฉs octets que hi havia disponibles"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
 msgid "pack too large for current definition of off_t"
 msgstr "paquet massa gran per a la definiciรณ actual d'off_t"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "el paquet supera la mida mร xima permesa"
 
@@ -13950,8 +14557,8 @@ msgstr "hi ha una inconsistรจncia seriosa d'inflaciรณ"
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "S'HA TROBAT UNA COLยทLISIร“ SHA1 AMB %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
 #, c-format
 msgid "unable to read %s"
 msgstr "no s'ha pogut llegir %s"
@@ -14013,7 +14620,7 @@ msgstr "confusiรณ mรฉs enllร  de la bogeria en parse_pack_objects()"
 msgid "Resolving deltas"
 msgstr "S'estan resolent les diferรจncies"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
@@ -14078,7 +14685,7 @@ msgstr "no es pot emmagatzemar el fitxer empaquetat"
 msgid "cannot store index file"
 msgstr "no es pot emmagatzemar el fitxer d'รญndex"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> incorrecte"
@@ -14129,7 +14736,7 @@ msgstr "--stdin requereix un dipรฒsit git"
 msgid "--verify with no packfile name given"
 msgstr "s'ha donat --verify sense nom de fitxer de paquet"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581
 #, fuzzy
 msgid "fsck error in pack objects"
 msgstr "error en objecte: %s"
@@ -14313,139 +14920,132 @@ msgstr "--trailer amb --only-input no tรฉ sentit"
 msgid "no input file given for in-place editing"
 msgstr "no s'ha donat cap fitxer d'entrada per a ediciรณ in situ"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camรญ>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opcions>] <objecte>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opciรณ --decorate no vร lida: %s"
 
-#: builtin/log.c:160
-msgid ""
-"log.mailmap is not set; its implicit value will change in an\n"
-"upcoming release. To squelch this message and preserve current\n"
-"behaviour, set the log.mailmap configuration value to false.\n"
-"\n"
-"To squelch this message and adopt the new behaviour now, set the\n"
-"log.mailmap configuration value to true.\n"
-"\n"
-"See 'git help config' and search for 'log.mailmap' for further information."
-msgstr ""
-
-#: builtin/log.c:183
+#: builtin/log.c:174
 msgid "show source"
 msgstr "mostra la font"
 
-#: builtin/log.c:184
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr "Usa el fitxer de mapa de correu"
 
-#: builtin/log.c:186
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr "nomรฉs decora les referรจncies que coincideixin amb <patrรณ>"
 
-#: builtin/log.c:188
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr "no decoris les referรจncies que coincideixen amb <patrรณ>"
 
-#: builtin/log.c:189
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr "opcions de decoraciรณ"
 
-#: builtin/log.c:192
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Processa el rang de lรญnies n,m en el fitxer, comptant des d'1"
 
-#: builtin/log.c:297
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortida final: %d %s\n"
 
-#: builtin/log.c:551
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: fitxer incorrecte"
 
-#: builtin/log.c:566 builtin/log.c:660
+#: builtin/log.c:550 builtin/log.c:645
 #, fuzzy, c-format
 msgid "could not read object %s"
 msgstr "No es pot llegir l'objecte %s"
 
-#: builtin/log.c:685
+#: builtin/log.c:670
 #, fuzzy, c-format
 msgid "unknown type: %d"
 msgstr "Tipus desconegut: %d"
 
-#: builtin/log.c:808
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr ""
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr "format.headers sense valor"
 
-#: builtin/log.c:925
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr "el nom del directori de sortida รฉs massa llarg"
 
-#: builtin/log.c:941
+#: builtin/log.c:952
 #, fuzzy, c-format
 msgid "cannot open patch file %s"
 msgstr "No es pot obrir el fitxer de pedaรง %s"
 
-#: builtin/log.c:958
+#: builtin/log.c:969
 #, fuzzy
 msgid "need exactly one range"
 msgstr "Cal exactament un rang."
 
-#: builtin/log.c:968
+#: builtin/log.c:979
 #, fuzzy
 msgid "not a range"
 msgstr "No รฉs un rang."
 
-#: builtin/log.c:1091
+#: builtin/log.c:1143
 #, fuzzy
 msgid "cover letter needs email format"
 msgstr "La carta de presentaciรณ necessita el format de correu electrรฒnic"
 
-#: builtin/log.c:1097
+#: builtin/log.c:1149
 #, fuzzy
 msgid "failed to create cover-letter file"
 msgstr "S'ha produรฏt un error en crear els fitxers de sortida"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to boig: %s"
 
-#: builtin/log.c:1203
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1313
 #, fuzzy
 msgid "two output directories?"
 msgstr "Hi ha dos directoris de sortida?"
 
-#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, fuzzy, c-format
 msgid "unknown commit %s"
 msgstr "Comissiรณ desconeguda %s"
 
-#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "s'ha produรฏt un error en resoldre ยซ%sยป com a referรจncia vร lida"
 
-#: builtin/log.c:1387
+#: builtin/log.c:1439
 #, fuzzy
 msgid "could not find exact merge base"
 msgstr "No s'ha pogut trobar la base exacta de fusiรณ."
 
-#: builtin/log.c:1391
+#: builtin/log.c:1443
 #, fuzzy
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
@@ -14458,274 +15058,282 @@ msgstr ""
 "seguir una branca remota. O podeu especificar la comissiรณ base manualment\n"
 "amb --base=<id-de-comissiรณ-base>."
 
-#: builtin/log.c:1411
+#: builtin/log.c:1463
 #, fuzzy
 msgid "failed to find exact merge base"
 msgstr "S'ha produรฏt un error en trobar la base exacta de fusiรณ."
 
-#: builtin/log.c:1422
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr "la comissiรณ base ha de ser l'avantpassat de la llista de revisions"
 
-#: builtin/log.c:1426
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr "la comissiรณ base no ha de ser en la llista de revisions"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr "no es pot obtenir l'id del pedaรง"
 
-#: builtin/log.c:1531
+#: builtin/log.c:1583
 #, fuzzy
 msgid "failed to infer range-diff ranges"
 msgstr "s'ha produรฏt un error en executar ยซ%sยป"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "usa [PATCH n/m] fins i tot amb un sol pedaรง"
 
-#: builtin/log.c:1579
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr "usa [PATCH] fins i tot amb mรบltiples pedaรงos"
 
-#: builtin/log.c:1583
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr "imprimeix els pedaรงos a la sortida estร ndard"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr "genera una carta de presentaciรณ"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr "usa una seqรผรจncia de nรบmeros per als noms dels fitxers de sortida"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr "sufix"
 
-#: builtin/log.c:1589
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr "usa <sufix> en lloc de '.patch'"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr "comenรงa numerant els pedaรงos a <n> en lloc d'1"
 
-#: builtin/log.c:1593
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr "marca la sรจrie com a l'enรจsima llanรงada"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr ""
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Usa [<prefix>] en lloc de [PATCH]"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr "emmagatzema els fitxers resultants a <directori>"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr "no despullis/afegeixis [PATCH]"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr "no emetis diferรจncies binร ries"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr "emet un hash de tots zeros en la capรงalera From"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr "no incloguis pedaรงos que coincideixin amb comissions a la font"
 
-#: builtin/log.c:1613
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "mostra el format de pedaรง en lloc del per defecte (pedaรง + estadรญstiques)"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr "Missatgeria"
 
-#: builtin/log.c:1616
+#: builtin/log.c:1672
 msgid "header"
 msgstr "capรงalera"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr "afegeix una capรงalera de correu electrรฒnic"
 
-#: builtin/log.c:1618 builtin/log.c:1620
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr "correu electrรฒnic"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr "afegeix la capรงalera To:"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr "afegeix la capรงalera Cc:"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1678
 msgid "ident"
 msgstr "identitat"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "estableix l'adreรงa From a <identitat> (o la identitat del comitent si manca)"
 
-#: builtin/log.c:1625
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr "ID de missatge"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
 
-#: builtin/log.c:1627 builtin/log.c:1630
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr "lรญmit"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr "adjunta el pedaรง"
 
-#: builtin/log.c:1631
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr "posa el pedaรง en el cos"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1693
 msgid "signature"
 msgstr "signatura"
 
-#: builtin/log.c:1638
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr "afegeix una signatura"
 
-#: builtin/log.c:1639
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr "comissiรณ base"
 
-#: builtin/log.c:1640
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr "afegeix la informaciรณ d'arbre requerida a la sรจrie de pedaรงos"
 
-#: builtin/log.c:1642
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr "afegeix una signatura des d'un fitxer"
 
-#: builtin/log.c:1643
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr "no imprimeixis els noms de fitxer del pedaรง"
 
-#: builtin/log.c:1645
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr "mostra el progrรฉs durant la generaciรณ de pedaรงos"
 
-#: builtin/log.c:1647
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1650
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1652
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/log.c:1727
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "lรญnia d'identitat no vร lida: %s"
 
-#: builtin/log.c:1742
+#: builtin/log.c:1807
 #, fuzzy
 msgid "-n and -k are mutually exclusive"
 msgstr "-n i -k sรณn mรบtuament excloents."
 
-#: builtin/log.c:1744
+#: builtin/log.c:1809
 #, fuzzy
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc i -k sรณn mรบtuament excloents."
 
-#: builtin/log.c:1752
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr "--name-only no tรฉ sentit"
 
-#: builtin/log.c:1754
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr "--name-status no tรฉ sentit"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr "--check no tรฉ sentit"
 
-#: builtin/log.c:1788
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
 msgstr "sortida estร ndard o directori, quin dels dos?"
 
-#: builtin/log.c:1877
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1881
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr ""
 
-#: builtin/log.c:1882
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 
-#: builtin/log.c:1888
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr ""
 
-#: builtin/log.c:1892
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1900
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr ""
 
-#: builtin/log.c:1901
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 
-#: builtin/log.c:1912
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de signatura ยซ%sยป"
 
-#: builtin/log.c:1948
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr "S'estan generant els pedaรงos"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2073
 #, fuzzy
 msgid "failed to create output files"
 msgstr "S'ha produรฏt un error en crear els fitxers de sortida"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<font> [<cap> [<lรญmit>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -14854,7 +15462,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "no imprimeixis l'URL remot"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518
 msgid "exec"
 msgstr "executable"
 
@@ -14964,33 +15572,33 @@ msgstr "Les estratรจgies disponibles sรณn:"
 msgid "Available custom strategies are:"
 msgstr "Les estratรจgies personalitzades disponibles sรณn:"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:244 builtin/pull.c:152
 msgid "do not show a diffstat at the end of the merge"
 msgstr "no mostris les estadรญstiques de diferรจncia al final de la fusiรณ"
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:247 builtin/pull.c:155
 msgid "show a diffstat at the end of the merge"
 msgstr "mostra les estadรญstiques de diferรจncia al final de la fusiรณ"
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:248 builtin/pull.c:158
 msgid "(synonym to --stat)"
 msgstr "(sinรฒnim de --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:250 builtin/pull.c:161
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "afegeix (com a mร xim <n>) entrades del registre curt al missatge de comissiรณ "
 "de fusiรณ"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:253 builtin/pull.c:167
 msgid "create a single commit instead of doing a merge"
 msgstr "crea una รบnica comissiรณ en lloc de fusionar"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:255 builtin/pull.c:170
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realitza una comissiรณ si la fusiรณ tรฉ รจxit (per defecte)"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:257 builtin/pull.c:173
 msgid "edit message before committing"
 msgstr "edita el missatge abans de cometre"
 
@@ -14998,28 +15606,28 @@ msgstr "edita el missatge abans de cometre"
 msgid "allow fast-forward (default)"
 msgstr "permet l'avanรง rร pid (per defecte)"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:261 builtin/pull.c:180
 msgid "abort if fast-forward is not possible"
 msgstr "avorta si l'avanรง rร pid no รฉs possible"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:265 builtin/pull.c:183
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verifica que la comissiรณ anomenada tingui una signatura GPG vร lida"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
+#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114
 msgid "strategy"
 msgstr "estratรจgia"
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:267 builtin/pull.c:188
 msgid "merge strategy to use"
 msgstr "estratรจgia de fusiรณ a usar"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:268 builtin/pull.c:191
 msgid "option=value"
 msgstr "opciรณ=valor"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:269 builtin/pull.c:192
 msgid "option for selected merge strategy"
 msgstr "opciรณ per a l'estratรจgia de fusiรณ seleccionada"
 
@@ -15040,13 +15648,14 @@ msgstr "restableix HEAD, l'รญndex i l'arbre de treball"
 msgid "continue the current in-progress merge"
 msgstr "continua la fusiรณ en curs actual"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:284 builtin/pull.c:199
 msgid "allow merging unrelated histories"
 msgstr "permet fusionar histรฒries no relacionades"
 
 #: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "verifica el lligam de missatge de comissiรณ"
+#, fuzzy
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "evita els lligams de precomissiรณ i missatge de comissiรณ"
 
 #: builtin/merge.c:307
 msgid "could not run stash."
@@ -15089,32 +15698,32 @@ msgstr "ยซ%sยป no assenyala una comissiรณ"
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
 
-#: builtin/merge.c:708
+#: builtin/merge.c:705
 msgid "Not handling anything other than two heads merge."
 msgstr "No s'estร  gestionant res a part de la fusiรณ de dos caps."
 
-#: builtin/merge.c:722
+#: builtin/merge.c:719
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opciรณ desconeguda de merge-recursive: -X%s"
 
-#: builtin/merge.c:737
+#: builtin/merge.c:734
 #, c-format
 msgid "unable to write %s"
 msgstr "no s'ha pogut escriure %s"
 
-#: builtin/merge.c:789
+#: builtin/merge.c:786
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No s'ha pogut llegir de ยซ%sยป"
 
-#: builtin/merge.c:798
+#: builtin/merge.c:795
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "No s'estร  cometent la fusiรณ; useu 'git commit' per a completar la fusiรณ.\n"
 
-#: builtin/merge.c:804
+#: builtin/merge.c:801
 #, fuzzy
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -15128,12 +15737,12 @@ msgstr ""
 "S'ignoraran les lรญnies que comencin amb ยซ%cยป, i un missatge buit\n"
 "avorta la comissiรณ.\n"
 
-#: builtin/merge.c:809
+#: builtin/merge.c:806
 #, fuzzy
 msgid "An empty message aborts the commit.\n"
 msgstr "edita el missatge abans de cometre"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:809
 #, fuzzy, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -15143,75 +15752,75 @@ msgstr ""
 "S'ignoraran les lรญnies que comencin amb ยซ%cยป, i un missatge de\n"
 "comissiรณ buit avorta la comissiรณ.\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:862
 msgid "Empty commit message."
 msgstr "El missatge de comissiรณ รฉs buit."
 
-#: builtin/merge.c:872
+#: builtin/merge.c:877
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Meravellรณs.\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:938
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "La fusiรณ automร tica ha fallat; arregleu els conflictes i desprรฉs cometeu el "
 "resultat.\n"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:977
 msgid "No current branch."
 msgstr "No hi ha cap branca actual."
 
-#: builtin/merge.c:974
+#: builtin/merge.c:979
 msgid "No remote for the current branch."
 msgstr "No hi ha cap remot per a la branca actual."
 
-#: builtin/merge.c:976
+#: builtin/merge.c:981
 msgid "No default upstream defined for the current branch."
 msgstr "No hi ha cap font per defecte definida per a la branca actual."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:986
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1043
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor incorrecte ยซ%sยป en l'entorn ยซ%sยป"
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1146
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "no รฉs quelcom que puguem fusionar en %s: %s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1180
 msgid "not something we can merge"
 msgstr "no รฉs quelcom que puguem fusionar"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1283
 msgid "--abort expects no arguments"
 msgstr "--abort no accepta parร metres"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1287
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hi ha fusiรณ a avortar (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1296
 #, fuzzy
 msgid "--quit expects no arguments"
 msgstr "--abort no accepta parร metres"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1309
 msgid "--continue expects no arguments"
 msgstr "--continue no accepta parร metres"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1313
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hi ha cap fusiรณ en curs (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1329
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15219,7 +15828,7 @@ msgstr ""
 "No heu conclรฒs la vostra fusiรณ (MERGE_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1336
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15227,99 +15836,99 @@ msgstr ""
 "No heu conclรฒs el vostre ยซcherry pickยป (CHERRY_PICK_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1339
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "No heu conclรฒs el vostre ยซcherry pickยป (CHERRY_PICK_HEAD existeix)."
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1353
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No podeu combinar --squash amb --no-ff."
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1355
 #, fuzzy
 msgid "You cannot combine --squash with --commit."
 msgstr "No podeu combinar --squash amb --no-ff."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1371
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "No hi ha una comissiรณ especificada i merge.defaultToUpstream no estร  "
 "establert."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1388
 msgid "Squash commit into empty head not supported yet"
 msgstr "Una comissiรณ ยซsquashยป a un HEAD buit encara no es permet"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1390
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Una comissiรณ no d'avanรง rร pid no tรฉ sentit a un HEAD buit"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1395
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - no รฉs una cosa que puguem fusionar"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1397
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Es pot fusionar nomรฉs una comissiรณ a un HEAD buit"
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1476
 msgid "refusing to merge unrelated histories"
 msgstr "s'estร  refusant fusionar histรฒries no relacionades"
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1485
 msgid "Already up to date."
 msgstr "Ja estร  al dia."
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1495
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "S'estan actualitzant %s..%s\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1537
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "S'estร  intentant una fusiรณ molt trivial en l'รญndex...\n"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1544
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1569
 msgid "Already up to date. Yeeah!"
 msgstr "Ja estร  al dia. Estupend!"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1575
 msgid "Not possible to fast-forward, aborting."
 msgstr "No รฉs possible avanรงar rร pidament, s'estร  avortant."
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1598 builtin/merge.c:1663
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "S'estร  rebobinant l'arbre a la pristina...\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1602
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "S'estร  intentant l'estratรจgia de fusiรณ %s...\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1654
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Cap estratรจgia de fusiรณ ha gestionat la fusiรณ.\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1656
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "L'estratรจgia de fusiรณ %s ha fallat.\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1665
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "S'estร  usant el %s per a preparar la resoluciรณ a mร .\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1677
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -15407,33 +16016,33 @@ msgstr "no avisis de conflictes"
 msgid "set labels for file1/orig-file/file2"
 msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "opciรณ desconeguda %s"
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "no s'ha pogut analitzar l'objecte ยซ%sยป"
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "no es pot gestionar mรฉs d'%d base. S'estร  ignorant %s."
 msgstr[1] "no es poden gestionar mรฉs de %d bases. S'estร  ignorant %s."
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "no s'estร  gestionant res a part de la fusiรณ de dos caps."
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "no s'ha pogut resoldre la referรจncia ยซ%sยป"
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "S'estร  fusionant %s amb %s\n"
@@ -15456,36 +16065,36 @@ msgstr "permet la creaciรณ de mรฉs d'un arbre"
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
 msgstr ""
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr "hi ha massa parร metres"
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr ""
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, fuzzy, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "subordre desconeguda: %s"
 
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<opcions>] <font>... <destรญ>"
+msgstr "git mv [<opcions>] <origen>... <destรญ>"
 
 #: builtin/mv.c:83
 #, c-format
@@ -15523,7 +16132,7 @@ msgstr "S'estร  comprovant el canvi de nom de ยซ%sยป a ยซ%sยป\n"
 
 #: builtin/mv.c:184
 msgid "bad source"
-msgstr "font incorrecta"
+msgstr "origen incorrecte"
 
 #: builtin/mv.c:187
 msgid "can not move directory into itself"
@@ -15535,7 +16144,7 @@ msgstr "no es pot moure un directori sobre un fitxer"
 
 #: builtin/mv.c:199
 msgid "source directory is empty"
-msgstr "el directori font estร  buit"
+msgstr "el directori d'origen estร  buit"
 
 #: builtin/mv.c:224
 msgid "not under version control"
@@ -15556,7 +16165,7 @@ msgstr "No es pot sobreescriure"
 
 #: builtin/mv.c:241
 msgid "multiple sources for the same target"
-msgstr "mรบltiples fonts per al mateix destรญ"
+msgstr "mรบltiples orรญgens per al mateix destรญ"
 
 #: builtin/mv.c:243
 msgid "destination directory does not exist"
@@ -15572,52 +16181,52 @@ msgstr "%s, origen=%s, destรญ=%s"
 msgid "Renaming %s to %s\n"
 msgstr "S'estร  canviant el nom de %s a %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
+#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "el canvi del nom de ยซ%sยป ha fallat"
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:403
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opcions>] <comissiรณ>..."
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:404
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opcions>] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:405
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opcions>] --stdin"
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:462
 msgid "print only names (no SHA-1)"
 msgstr "imprimeix nomรฉs els noms (sense SHA-1)"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:463
 msgid "only use tags to name the commits"
 msgstr "nomรฉs usa les etiquetes per a anomenar les comissions"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:465
 msgid "only use refs matching <pattern>"
 msgstr "nomรฉs usa les referรจncies que coincideixin amb <patrรณ>"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:467
 msgid "ignore refs matching <pattern>"
 msgstr "ignora les referรจncies que coincideixin amb <patrรณ>"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:469
 msgid "list all commits reachable from all refs"
 msgstr "llista totes les comissions abastables de totes les referรจncies"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:470
 msgid "read from stdin"
 msgstr "llegeix de stdin"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:471
 msgid "allow to print `undefined` names (default)"
 msgstr "permet imprimir els noms `undefined` (per defecte)"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:477
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferencia les etiquetes en l'entrada (รบs intern)"
 
@@ -15848,7 +16457,7 @@ msgid ""
 "existing notes"
 msgstr ""
 "No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
-"Useu '-f' per a sobreescriure les notes existents."
+"Useu '-f' per a sobreescriure les notes existents"
 
 #: builtin/notes.c:463 builtin/notes.c:544
 #, c-format
@@ -16020,7 +16629,7 @@ msgstr "l'intent d'eliminar una nota no existent no รฉs un error"
 msgid "read object names from the standard input"
 msgstr "llegeix els noms d'objecte des de l'entrada estร ndard"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "no eliminis, nomรฉs mostra"
 
@@ -16036,7 +16645,7 @@ msgstr "referรจncia de notes"
 msgid "use notes from <notes-ref>"
 msgstr "usa les notes de <referรจncia-de-notes>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1607
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subordre desconeguda: %s"
@@ -16055,391 +16664,380 @@ msgstr ""
 "git pack-objects [<opcions>...] <nom-base> [< <llista-de-referรจncies> | < "
 "<llista-de-objectes>]"
 
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:428
 #, fuzzy, c-format
 msgid "bad packed object CRC for %s"
 msgstr "ignora els objectes empaquetats"
 
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:439
 #, fuzzy, c-format
 msgid "corrupt packed object for %s"
 msgstr "ignora els objectes empaquetats"
 
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:570
 #, fuzzy, c-format
 msgid "recursive delta detected for object %s"
 msgstr "no s'ha rebut l'objecte esperat %s"
 
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:781
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:794
 #, fuzzy, c-format
 msgid "packfile is invalid: %s"
 msgstr "%s no vร lid"
 
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:798
 #, fuzzy, c-format
 msgid "unable to open packfile for reuse: %s"
 msgstr "no s'ha pogut obrir o llegir %s"
 
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:802
 #, fuzzy
 msgid "unable to seek in reused packfile"
 msgstr "no es pot llegir el fitxer d'รญndex"
 
-#: builtin/pack-objects.c:809
+#: builtin/pack-objects.c:813
 #, fuzzy
 msgid "unable to read from reused packfile"
 msgstr "no es pot llegir el fitxer d'รญndex"
 
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:841
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "s'estร  inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
 "a causa de pack.packSizeLimit"
 
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:854
 msgid "Writing objects"
 msgstr "S'estan escrivint els objectes"
 
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:917 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "s'ha produรฏt un error en fer stat a %s"
 
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:970
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1164
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "s'estร  inhabilitant l'escriptura de mapes de bits, perquรจ alguns objectes no "
 "s'empaqueten"
 
-#: builtin/pack-objects.c:1591
+#: builtin/pack-objects.c:1592
 #, fuzzy, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "el desplaรงament de base de diferรจncies estร  fora de lรญmits"
 
-#: builtin/pack-objects.c:1600
+#: builtin/pack-objects.c:1601
 #, fuzzy, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "el desplaรงament de base de diferรจncies estร  fora de lรญmits"
 
-#: builtin/pack-objects.c:1869
+#: builtin/pack-objects.c:1870
 msgid "Counting objects"
 msgstr "S'estan comptant els objectes"
 
-#: builtin/pack-objects.c:1999
+#: builtin/pack-objects.c:2000
 #, fuzzy, c-format
 msgid "unable to get size of %s"
 msgstr "no s'ha pogut moure %s a %s"
 
-#: builtin/pack-objects.c:2014
+#: builtin/pack-objects.c:2015
 #, fuzzy, c-format
 msgid "unable to parse object header of %s"
 msgstr "no s'ha pogut analitzar l'objecte: %s"
 
-#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
-#: builtin/pack-objects.c:2110
+#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
+#: builtin/pack-objects.c:2111
 #, fuzzy, c-format
 msgid "object %s cannot be read"
 msgstr "objecte %s no trobat"
 
-#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
+#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 
-#: builtin/pack-objects.c:2124
+#: builtin/pack-objects.c:2125
 msgid "suboptimal pack - out of memory"
 msgstr ""
 
-#: builtin/pack-objects.c:2450
+#: builtin/pack-objects.c:2440
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr ""
 
-#: builtin/pack-objects.c:2582
+#: builtin/pack-objects.c:2572
 #, fuzzy, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "inclou els objectes abastables de qualsevol referรจncia"
 
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2659
 msgid "Compressing objects"
 msgstr "S'estan comprimint els objectes"
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2665
 msgid "inconsistency with delta count"
 msgstr ""
 
-#: builtin/pack-objects.c:2756
+#: builtin/pack-objects.c:2742
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2748
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2860
+#: builtin/pack-objects.c:2846
 msgid "invalid value for --missing"
 msgstr "valor no vร lid per a --missing"
 
-#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
+#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
 #, fuzzy
 msgid "cannot open pack index"
 msgstr "no es pot fer pread en el fitxer de paquet"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2936
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 
-#: builtin/pack-objects.c:3035
+#: builtin/pack-objects.c:3021
 #, fuzzy
 msgid "unable to force loose object"
 msgstr "no s'ha pogut escriure l'objecte de nota"
 
-#: builtin/pack-objects.c:3127
+#: builtin/pack-objects.c:3113
 #, fuzzy, c-format
 msgid "not a rev '%s'"
 msgstr "no es pot llegir ยซ%sยป"
 
-#: builtin/pack-objects.c:3130
+#: builtin/pack-objects.c:3116
 #, c-format
 msgid "bad revision '%s'"
 msgstr "revisiรณ incorrecte ยซ%sยป"
 
-#: builtin/pack-objects.c:3155
+#: builtin/pack-objects.c:3141
 msgid "unable to add recent objects"
 msgstr "no s'han pogut afegir els objectes recents"
 
-#: builtin/pack-objects.c:3208
+#: builtin/pack-objects.c:3194
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versiรณ d'รญndex no compatible %s"
 
-#: builtin/pack-objects.c:3212
+#: builtin/pack-objects.c:3198
 #, c-format
 msgid "bad index version '%s'"
 msgstr "versiรณ d'รญndex incorrecta ยซ%sยป"
 
-#: builtin/pack-objects.c:3242
-msgid "do not show progress meter"
-msgstr "no mostris l'indicador de progrรฉs"
-
-#: builtin/pack-objects.c:3244
-msgid "show progress meter"
-msgstr "mostra l'indicador de progrรฉs"
-
-#: builtin/pack-objects.c:3246
-msgid "show progress meter during object writing phase"
-msgstr "mostra l'indicador de progrรฉs durant la fase d'escriptura d'objectes"
-
-#: builtin/pack-objects.c:3249
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "similar a --all-progress quan l'indicador de progrรฉs es mostra"
-
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3236
 msgid "<version>[,<offset>]"
 msgstr "<versiรณ>[,<desplaรงament>]"
 
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3237
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "escriu el fitxer d'รญndex de paquet en la versiรณ de format d'รญndex "
 "especificada"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3240
 msgid "maximum size of each output pack file"
 msgstr "mida mร xima de cada fitxer empaquetat de sortida"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3242
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3244
 msgid "ignore packed objects"
 msgstr "ignora els objectes empaquetats"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3246
 msgid "limit pack window by objects"
 msgstr "limita la finestra d'empaquetament per objectes"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3248
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limita la finestra d'empaquetament per memรฒria a mรฉs del lรญmit d'objectes"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3250
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "longitud mร xima de la cadena de diferรจncies permesa en el paquet resultant"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3252
 msgid "reuse existing deltas"
 msgstr "reusa les diferรจncies existents"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3254
 msgid "reuse existing objects"
 msgstr "reusa els objectes existents"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3256
 msgid "use OFS_DELTA objects"
 msgstr "usa objectes OFS_DELTA"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3258
 msgid "use threads when searching for best delta matches"
 msgstr "usa fils en cercar les millores coincidรจncies de diferรจncies"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3260
 msgid "do not create an empty pack output"
 msgstr "no creรฏs una emissiรณ de paquet buida"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3262
 msgid "read revision arguments from standard input"
 msgstr "llegeix els parร metres de revisiรณ des de l'entrada estร ndard"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3264
 msgid "limit the objects to those that are not yet packed"
 msgstr "limita els objectes als quals encara no s'hagin empaquetat"
 
-#: builtin/pack-objects.c:3281
+#: builtin/pack-objects.c:3267
 msgid "include objects reachable from any reference"
 msgstr "inclou els objectes abastables de qualsevol referรจncia"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3270
 msgid "include objects referred by reflog entries"
 msgstr ""
 "inclou els objectes als quals facin referรจncia les entrades del registre de "
 "referรจncies"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3273
 msgid "include objects referred to by the index"
 msgstr "inclou els objectes als quals faci referรจncia l'รญndex"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3276
 msgid "output pack to stdout"
 msgstr "emet el paquet a stdout"
 
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3278
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "inclou els objectes d'etiqueta que facin referรจncia als objectes a empaquetar"
 
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3280
 msgid "keep unreachable objects"
 msgstr "retรฉn els objectes inabastables"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3282
 msgid "pack loose unreachable objects"
 msgstr "empaqueta els objectes inabastables solts"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3284
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaqueta els objectes inabastables mรฉs nous que <hora>"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3287
 msgid "use the sparse reachability algorithm"
 msgstr ""
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3289
 msgid "create thin packs"
 msgstr "crea paquets prims"
 
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3291
 msgid "create packs suitable for shallow fetches"
 msgstr "crea paquets adequats per a les obtencions superficials"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3293
 msgid "ignore packs that have companion .keep file"
 msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3295
 #, fuzzy
 msgid "ignore this pack"
 msgstr "usa el paquet prim"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3297
 msgid "pack compression level"
 msgstr "nivell de compressiรณ de paquet"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3299
 msgid "do not hide commits by grafts"
 msgstr "no amaguis les comissions per empelt"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3301
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "usa un รญndex de mapa de bits, si estร  disponible, per a accelerar el "
 "recompte d'objectes"
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3303
 msgid "write a bitmap index together with the pack index"
 msgstr "escriu un รญndex de mapa de bits juntament amb l'รญndex de paquet"
 
-#: builtin/pack-objects.c:3320
+#: builtin/pack-objects.c:3307
+#, fuzzy
+msgid "write a bitmap index if possible"
+msgstr "escriu รญndex de mapa de bits"
+
+#: builtin/pack-objects.c:3311
 msgid "handling for missing objects"
 msgstr "gestiรณ dels objectes absents"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3314
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 
-#: builtin/pack-objects.c:3325
+#: builtin/pack-objects.c:3316
 #, fuzzy
 msgid "respect islands during delta compression"
 msgstr "mida de la finestra que s'usa per a compressiรณ de diferรจncies"
 
-#: builtin/pack-objects.c:3350
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3355
+#: builtin/pack-objects.c:3350
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3404
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3406
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
-#: builtin/pack-objects.c:3416
+#: builtin/pack-objects.c:3411
 #, fuzzy
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--fix-thin no es pot usar sense --stdin"
 
-#: builtin/pack-objects.c:3419
+#: builtin/pack-objects.c:3414
 #, fuzzy
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable i -A sรณn incompatibles"
 
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3420
 #, fuzzy
 msgid "cannot use --filter without --stdout"
 msgstr "no es pot usar -a amb -d"
 
-#: builtin/pack-objects.c:3486
+#: builtin/pack-objects.c:3481
 msgid "Enumerating objects"
 msgstr "S'estan enumerant els objectes"
 
-#: builtin/pack-objects.c:3516
+#: builtin/pack-objects.c:3511
 #, c-format
 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
 msgstr ""
@@ -16495,45 +17093,45 @@ msgstr "Valor no vร lid per a %s: %s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opcions>] [<dipรฒsit> [<especificaciรณ-de-referรจncia>...]]"
 
-#: builtin/pull.c:141
+#: builtin/pull.c:142
 msgid "control for recursive fetching of submodules"
 msgstr "controla l'obtenciรณ recursiva de submรฒduls"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:146
 msgid "Options related to merging"
 msgstr "Opcions relacionades amb fusionar"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:149
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorpora els canvis fent ยซrebaseยป en lloc de fusionar"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "permet l'avanรง rร pid"
 
-#: builtin/pull.c:185
+#: builtin/pull.c:186
 msgid "automatically stash/stash pop before and after rebase"
 msgstr ""
 "fes ยซstashยป i ยซstash popยป automร ticament abans i desprรฉs de fer ยซrebaseยป"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:202
 msgid "Options related to fetching"
 msgstr "Opcions relacionades amb obtenir"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:212
 msgid "force overwrite of local branch"
 msgstr "forรงa la sobreescriptura de la branca local"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:220
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de submรฒduls baixats en paralยทlel"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:320
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor no vร lid per a pull.ff: %s"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:437
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16541,13 +17139,13 @@ msgstr ""
 "No hi ha cap candidat sobre el qual fer ยซrebaseยป entre les referรจncies que "
 "acabeu d'obtenir."
 
-#: builtin/pull.c:435
+#: builtin/pull.c:439
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "No hi ha candidats per a fusionar entre les referรจncies que acabeu d'obtenir."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:440
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16555,7 +17153,7 @@ msgstr ""
 "Generalment aixรฒ vol dir que heu proveรฏt una especificaciรณ de\n"
 "referรจncia de comodรญ que no tenia cap coincidรจncia en el costat remot."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16566,44 +17164,44 @@ msgstr ""
 "Perquรจ aquest no รฉs el remot configurat per defecte per a la vostra\n"
 "branca actual, heu d'especificar una branca en la lรญnia d'ordres."
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Actualment no sou en cap branca."
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
-msgstr "Especifiqueu sobre quรจ branca voleu fer ยซrebaseยป."
+msgstr "Especifiqueu sobre quina branca voleu fer ยซrebaseยป."
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Especifiqueu amb quina branca voleu fusionar."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:453 builtin/pull.c:468
 msgid "See git-pull(1) for details."
 msgstr "Vegeu git-pull(1) per detalls."
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
+#: builtin/rebase.c:1381 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<remot>"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branca>"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "No hi ha cap informaciรณ de seguiment per a la branca actual."
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:472 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Si voleu establir informaciรณ de seguiment per a aquesta branca, podeu fer-ho "
 "amb:"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:477
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16612,33 +17210,33 @@ msgstr ""
 "La vostra configuraciรณ especifica fusionar amb la referรจncia ยซ%sยป\n"
 "del remot, perรฒ no s'ha obtingut tal referรจncia."
 
-#: builtin/pull.c:581
+#: builtin/pull.c:587
 #, c-format
 msgid "unable to access commit %s"
 msgstr "no s'ha pogut accedir a la comissiรณ %s"
 
-#: builtin/pull.c:861
+#: builtin/pull.c:867
 msgid "ignoring --verify-signatures for rebase"
 msgstr "s'estร  ignorant --verify-signatures en fer ยซrebaseยป"
 
-#: builtin/pull.c:916
+#: builtin/pull.c:922
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "l'opciรณ --[no-]-autostash รฉs vร lid nomรฉs amb --rebase."
 
-#: builtin/pull.c:924
+#: builtin/pull.c:930
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "S'estร  actualitzant una branca no nascuda amb canvis afegits a l'รญndex."
 
-#: builtin/pull.c:928
+#: builtin/pull.c:934
 msgid "pull with rebase"
 msgstr "baixar fent ยซrebaseยป"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:935
 msgid "please commit or stash them."
 msgstr "cometeu-los o emmagatzemeu-los."
 
-#: builtin/pull.c:954
+#: builtin/pull.c:960
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16649,7 +17247,7 @@ msgstr ""
 "s'estร  avanรงant rร pidament el vostre arbre de treball des de\n"
 "la comissiรณ %s."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:966
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16667,15 +17265,15 @@ msgstr ""
 "$ git reset --hard\n"
 "per a recuperar."
 
-#: builtin/pull.c:975
+#: builtin/pull.c:981
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No es poden fusionar mรบltiples branques a un HEAD buit."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:985
 msgid "Cannot rebase onto multiple branches."
 msgstr "No es pot fer ยซrebaseยป sobre mรบltiples branques."
 
-#: builtin/pull.c:986
+#: builtin/pull.c:992
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no es pot fer ยซrebaseยป amb modificacions als submรฒduls enregistrades "
@@ -16685,15 +17283,15 @@ msgstr ""
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<opcions>] [<dipรฒsit> [<especificaciรณ-de-referรจncia>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "abreviatura d'etiqueta sense <tag>"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete nomรฉs accepta noms de referรจncia de destรญ senzills"
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16702,7 +17300,7 @@ msgstr ""
 "Per a triar qualsevol opciรณ permanentment, vegeu push.default a 'git help "
 "config'."
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16727,7 +17325,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16742,7 +17340,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-branca-remota>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16755,13 +17353,13 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "La branca actual %s tรฉ mรบltiples branques fonts, s'estร  refusant pujar."
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -16772,14 +17370,14 @@ msgstr ""
 "branca actual ยซ%sยป, sense dir-me quรจ pujar per a actualitzar\n"
 "quina branca remota."
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "No heu especificat cap especificaciรณ de referรจncia a pujar, i push.default "
 "รฉs \"nothing\"."
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -16791,7 +17389,7 @@ msgstr ""
 "els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n"
 "Vegeu la 'Nota sobre avanรงos rร pids' a 'git push --help' per detalls."
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -16804,7 +17402,7 @@ msgstr ""
 "abans de pujar de nou.\n"
 "Vegeu la 'Nota sobre avanรงos rร pids' a 'git push --help' per detalls."
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -16819,12 +17417,12 @@ msgstr ""
 "pujar de nou.\n"
 "Vegeu la 'Nota sobre avanรงos rร pids' a 'git push --help' per detalls."
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "S'han rebutjat les actualitzacions perquรจ l'etiqueta ja existeix en el remot."
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -16835,141 +17433,141 @@ msgstr ""
 "fer que assenyali un objecte no de comissiรณ, sense usar l'opciรณ\n"
 "'--force'.\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "S'estร  pujant a %s\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "s'ha produรฏt un error en pujar algunes referรจncies a ยซ%sยป"
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "dipรฒsit incorrecte ยซ%sยป"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"No hi ha cap destรญ de pujada configurat.\n"
-"Especifiqueu l'URL des de la lรญnia d'ordres o bรฉ configureu un dipรฒsit remot "
-"fent servir\n"
-"\n"
-"    git remote add <nom> <url>\n"
-"\n"
-"i desprรฉs pugeu fent servir el nom remot\n"
-"\n"
-"    git push <nom>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr "dipรฒsit"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "puja totes les referรจncies"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "reflecteix totes les referรจncies"
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "suprimeix les referรจncies"
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "forรงa les actualitzacions"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
 msgstr "<nom-de-referรจncia>:<esperat>"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr "requereix que el valor antic de la referรจncia sigui d'aquest valor"
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr "controla la pujada recursiva dels submรฒduls"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr "usa el paquet prim"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "programa que rep els paquets"
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr "estableix la font per a git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
 msgstr "poda les referรจncies eliminades localment"
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr "evita el lligam de prepujada"
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr "puja les etiquetes absents perรฒ rellevants"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr "signa la pujada amb GPG"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr "demana una transacciรณ atรฒmica al costat remot"
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete รฉs incompatible amb --all, --mirror i --tags"
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no tรฉ sentit sense referรจncies"
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "dipรฒsit incorrecte ยซ%sยป"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"No hi ha cap destรญ de pujada configurat.\n"
+"Especifiqueu l'URL des de la lรญnia d'ordres o bรฉ configureu un dipรฒsit remot "
+"fent servir\n"
+"\n"
+"    git remote add <nom> <url>\n"
+"\n"
+"i desprรฉs pugeu fent servir el nom remot\n"
+"\n"
+"    git push <nom>\n"
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr "--all i --tags sรณn incompatibles"
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr "--all no es pot combinar amb especificacions de referรจncia"
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror i --tags sรณn incompatibles"
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no es pot combinar amb especificacions de referรจncia"
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr "--all i --mirror sรณn incompatibles"
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr "les opcions de pujada no han de tenir carร cters de lรญnia nova"
 
@@ -16987,24 +17585,34 @@ msgstr "git merge [<opcions>] [<comissiรณ>...]"
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git mv [<opcions>] <font>... <destรญ>"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "utilitza colors simples de diff"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+#, fuzzy
+msgid "notes"
+msgstr "notes"
+
+#: builtin/range-diff.c:26
+#, fuzzy
+msgid "passed to 'git log'"
+msgstr "passa-ho a ยซgit amยป"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr "cap .. en rang: ยซ%sยป"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "el format de l'argument รบnic ha de ser de rang simรจtric"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "calen dos rangs de comissiรณ"
 
@@ -17087,11 +17695,16 @@ msgstr "depura unpack-trees"
 msgid "suppress feedback messages"
 msgstr "omet els missatges informatius"
 
+#: builtin/read-tree.c:188
+#, fuzzy
+msgid "You need to resolve your current index first"
+msgstr "heu de primer resoldre el vostre รญndex actual"
+
 #: builtin/rebase.c:32
 #, fuzzy
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
 "git archive --remote <dipรฒsit> [--exec <ordre>] [<opcions>] <arbre> "
 "[<camรญ>...]"
@@ -17105,227 +17718,227 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "llista per a fer inestable: ยซ%sยป"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236
 #, c-format
 msgid "could not write '%s'."
 msgstr "no s'ha pogut escriure a ยซ%sยป."
 
-#: builtin/rebase.c:252
+#: builtin/rebase.c:271
 msgid "no HEAD?"
 msgstr "no hi ha cap HEAD?"
 
-#: builtin/rebase.c:279
+#: builtin/rebase.c:298
 #, c-format
 msgid "could not create temporary %s"
 msgstr "no s'ha pogut crear el fitxer temporal %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:304
 msgid "could not mark as interactive"
 msgstr "no s'ha pogut marcar com a interactiu"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:362
 msgid "could not generate todo list"
 msgstr "no s'ha pogut generar la llista per a fer"
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:402
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:457
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<opcions>]"
 
-#: builtin/rebase.c:449
+#: builtin/rebase.c:469
 msgid "keep empty commits"
 msgstr "mantรฉn les comissions buides"
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:471 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "permet les comissions amb missatges buits"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:472
 msgid "rebase merge commits"
 msgstr "fes ยซrebaseยป de les comissions de fusiรณ"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:474
 msgid "keep original branch points of cousins"
 msgstr ""
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:476
 msgid "move commits that begin with squash!/fixup!"
 msgstr ""
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:477
 msgid "sign commits"
 msgstr "signa les comissions"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:479 builtin/rebase.c:1455
 msgid "display a diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:481
 msgid "continue rebase"
 msgstr "continua el ยซrebaseยป"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:483
 msgid "skip commit"
 msgstr "omet la comissiรณ"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:484
 msgid "edit the todo list"
 msgstr "edita la llista a fer"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:486
 msgid "show the current patch"
 msgstr "mostra el pedaรง actual"
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:489
 msgid "shorten commit ids in the todo list"
 msgstr "escurรงa els ids de les comissions en la llista per a fer"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:491
 msgid "expand commit ids in the todo list"
 msgstr "expandeix els ids de les comissions en la llista per a fer"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:493
 msgid "check the todo list"
 msgstr "comprova la llista a fer"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:495
 msgid "rearrange fixup/squash lines"
 msgstr "reorganitza les lรญnies ยซfixup/pickยป"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:497
 msgid "insert exec commands in todo list"
 msgstr "expandeix les ordres exec en la llista per a fer"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:498
 msgid "onto"
 msgstr ""
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:501
 #, fuzzy
 msgid "restrict-revision"
 msgstr "revisiรณ"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:501
 #, fuzzy
 msgid "restrict revision"
 msgstr "revisiรณ"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:503
 msgid "squash-onto"
 msgstr ""
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:504
 msgid "squash onto"
 msgstr ""
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:506
 #, fuzzy
 msgid "the upstream commit"
 msgstr "Desassigna la informaciรณ de font"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:508
 #, fuzzy
 msgid "head-name"
 msgstr "canvi de nom"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:508
 #, fuzzy
 msgid "head name"
 msgstr "davant per "
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:513
 #, fuzzy
 msgid "rebase strategy"
 msgstr "estratรจgia de fusiรณ"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:514
 #, fuzzy
 msgid "strategy-opts"
 msgstr "estratรจgia"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:515
 #, fuzzy
 msgid "strategy options"
 msgstr "opcions de decoraciรณ"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:516
 msgid "switch-to"
 msgstr ""
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:517
 msgid "the branch or commit to checkout"
 msgstr ""
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:518
 #, fuzzy
 msgid "onto-name"
 msgstr "nom"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:518
 #, fuzzy
 msgid "onto name"
 msgstr "nom del remot"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:519
 #, fuzzy
 msgid "cmd"
 msgstr "ordre"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:519
 msgid "the command to run"
 msgstr "l'ordre a executar"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:522 builtin/rebase.c:1540
 msgid "automatically re-schedule any `exec` that fails"
 msgstr ""
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:540
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr ""
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:556
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s requereix un ยซrebaseยป interactiu"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:608
 #, fuzzy, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "no s'ha pogut establir ยซ%sยป a ยซ%sยป"
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:623
 #, fuzzy, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "fitxer no vร lid: ยซ%sยป"
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:648
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:724
 #, c-format
 msgid "Could not read '%s'"
 msgstr "No s'ha pogut llegir ยซ%sยป"
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:742
 #, c-format
 msgid "Cannot store %s"
 msgstr "No es pot emmagatzemar %s"
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:849
 msgid "could not determine HEAD revision"
 msgstr "no s'ha pogut determinar la revisiรณ de HEAD"
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17334,13 +17947,13 @@ msgid ""
 "abort\"."
 msgstr ""
 "Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"ยซgit add/rm <fitxers amb conflicte>ยป, llavors executeu ยซgit rebase --"
+"ยซgit add/rm <fitxers_amb_conflicte>ยป, llavors executeu ยซgit rebase --"
 "continueยป.\n"
 "Podeu en comptes ometre aquesta comissiรณ: executeu ยซgit rebase --skipยป.\n"
 "Per a avortar i tornar a l'estat anterior abans de l'ordre ยซgit rebaseยป, "
 "executeu ยซgit rebase --abortยป."
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1060
 #, c-format
 msgid ""
 "\n"
@@ -17352,7 +17965,7 @@ msgid ""
 "As a result, git cannot rebase them."
 msgstr ""
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1367
 #, c-format
 msgid ""
 "%s\n"
@@ -17369,7 +17982,7 @@ msgstr ""
 "    git rebase '<branca>'\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1383
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17383,165 +17996,195 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1413
 #, fuzzy
 msgid "exec commands cannot contain newlines"
 msgstr "expandeix les ordres exec en la llista per a fer"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1417
 msgid "empty exec command"
 msgstr ""
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1446
 msgid "rebase onto given branch instead of upstream"
 msgstr "fes un ยซrebaseยป en la branca donada en comptes de la font"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1448
+#, fuzzy
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "la branca font demanada ยซ%sยป no existeix"
+
+#: builtin/rebase.c:1450
 msgid "allow pre-rebase hook to run"
 msgstr "permet al lligam pre-rebase executar-se"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1452
 msgid "be quiet. implies --no-stat"
 msgstr "silenciรณs. Implica --no-stat"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1458
 #, fuzzy
 msgid "do not show diffstat of what changed upstream"
 msgstr "no mostris les estadรญstiques de diferรจncia al final de la fusiรณ"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1461
 #, fuzzy
 msgid "add a Signed-off-by: line to each commit"
 msgstr "afegeix una lรญnia ยซSigned-off-byยป al missatge de comissiรณ"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
-msgid "passed to 'git am'"
-msgstr "passa-ho a ยซgit amยป"
+#: builtin/rebase.c:1464
+#, fuzzy
+msgid "make committer date match author date"
+msgstr "Agrupa per ยซcomitterยป en comptes de per autor"
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1466
+msgid "ignore author date and use current date"
+msgstr ""
+
+#: builtin/rebase.c:1468
+#, fuzzy
+msgid "synonym of --reset-author-date"
+msgstr "sinรฒnim de --files-with-matches"
+
+#: builtin/rebase.c:1470 builtin/rebase.c:1474
 msgid "passed to 'git apply'"
 msgstr "passa-ho a ยซgit-applyยป"
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1472
+#, fuzzy
+msgid "ignore changes in whitespace"
+msgstr "ignora els canvis d'espai en blanc al final de la lรญnia"
+
+#: builtin/rebase.c:1476 builtin/rebase.c:1479
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "ยซcherry pickยป totes les comissions, inclรบs les no canviades"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1481
 msgid "continue"
 msgstr "continua"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1484
 msgid "skip current patch and continue"
 msgstr "omet el pedaรง actual i continua"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1486
 msgid "abort and check out the original branch"
 msgstr "interromp i agafa la branca original"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1489
 msgid "abort but keep HEAD where it is"
 msgstr "interromp perรฒ mantรฉ HEAD on รฉs"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1490
 msgid "edit the todo list during an interactive rebase"
 msgstr "edita la llista de coses a fer durant un ยซrebaseยป interactiu"
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1493
 msgid "show the patch file being applied or merged"
 msgstr "mostra el pedaรง que s'estร  aplicant o fusionant"
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1496
 #, fuzzy
 msgid "use merging strategies to rebase"
 msgstr "estratรจgia de fusiรณ a usar"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1500
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1504
 #, fuzzy
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "intenta recrear les "
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1509
 #, fuzzy
 msgid "preserve empty commits during rebase"
 msgstr "preserva les comissions inicialment buides"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1511
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1517
 #, fuzzy
 msgid "automatically stash/stash pop before and after"
 msgstr ""
 "fes ยซstashยป i ยซstash popยป automร ticament abans i desprรฉs de fer ยซrebaseยป"
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1519
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1523
 #, fuzzy
 msgid "allow rebasing commits with empty messages"
 msgstr "permet les comissions amb missatges buits"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1526
 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1529
 #, fuzzy
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "git merge-base --fork-point <referรจncia> [<comissiรณ>]"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1531
 msgid "use the given merge strategy"
 msgstr "utilitza l'estratรจgia de fusiรณ donada"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1533 builtin/revert.c:115
 msgid "option"
 msgstr "opciรณ"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1534
 msgid "pass the argument through to the merge strategy"
 msgstr "passa l'argument a l'estratรจgia de fusiรณ"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1537
 msgid "rebase all reachable commits up to the root(s)"
-msgstr "fes ยซrebaseยป de totes les comissions accessibles fins l'arrel"
+msgstr "fes ยซrebaseยป de totes les comissions accessibles fins a l'arrel"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1554
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
 msgstr ""
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1560
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Sembla que ยซgit amยป estร  en curs. No es pot fer ยซrebaseยป."
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1601
 #, fuzzy
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr "error: no es pot combinar ยซ--preserve-mergesยป amb ยซ--rebase-mergesยป"
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1606
+#, fuzzy
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "error: no es pot combinar ยซ--rebase-mergesยป amb ยซ--strategyยป"
+
+#: builtin/rebase.c:1608
+#, fuzzy
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "error: no es pot combinar ยซ--rebase-mergesยป amb ยซ--strategyยป"
+
+#: builtin/rebase.c:1612
 msgid "No rebase in progress?"
 msgstr "No hi ha un ยซrebaseยป en curs?"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1616
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "L'acciรณ --edit-todo nomรฉs es pot usar durant un ยซrebaseยป interactiu."
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1639
 msgid "Cannot read HEAD"
 msgstr "No es pot llegir HEAD"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1651
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17549,16 +18192,16 @@ msgstr ""
 "Heu d'editar tots els conflictes de fusiรณ i desprรฉs\n"
 "marcar-los com a resolts fent servir git add"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1670
 msgid "could not discard worktree changes"
 msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1689
 #, c-format
 msgid "could not move back to %s"
 msgstr "no s'ha pogut tornar a %s"
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1734
 #, fuzzy, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17579,171 +18222,161 @@ msgstr ""
 "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
 "de valor."
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1757
 msgid "switch `C' expects a numerical value"
 msgstr "ยซswitchยป ยซcยป espera un valor numรจric"
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1798
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Mode desconegut: %s"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1820
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requereix --merge o --interactive"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1860
 #, fuzzy
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--strategy requereix --merge o --interactive"
 
-#: builtin/rebase.c:1809
+#: builtin/rebase.c:1872
 msgid "cannot combine am options with either interactive or merge options"
 msgstr ""
 
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1891
 #, fuzzy
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "error: no es pot combinar ยซ--preserve-mergesยป amb ยซ--rebase-mergesยป"
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1895
 #, fuzzy
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr "error: no es pot combinar ยซ--preserve-mergesยป amb ยซ--rebase-mergesยป"
 
-#: builtin/rebase.c:1838
-#, fuzzy
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "error: no es pot combinar ยซ--rebase-mergesยป amb ยซ--strategy-optionยป"
-
-#: builtin/rebase.c:1841
-#, fuzzy
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "error: no es pot combinar ยซ--rebase-mergesยป amb ยซ--strategyยป"
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1919
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "font no vร lida: ยซ%sยป"
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1925
 msgid "Could not create new root commit"
 msgstr "no s'ha pogut crear una comissiรณ arrel nova"
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:1951
+#, fuzzy, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "Cal exactament un rang."
+
+#: builtin/rebase.c:1954
 #, fuzzy, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "Cal exactament un rang."
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:1962
 #, fuzzy, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "No assenyala una comissiรณ vร lida: $onto_name"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1987
 #, fuzzy, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "fatal: no hi ha tal branca: $branch_name"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1995 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1961
 #, c-format
 msgid "No such ref: %s"
 msgstr "No hi ha tal referรจncia: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2006
 #, fuzzy
 msgid "Could not resolve HEAD to a revision"
 msgstr "no s'ha pogut resoldre la comissiรณ HEAD"
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2044
 msgid "Cannot autostash"
 msgstr "No es pot emmagatzemar automร ticament"
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2047
 #, fuzzy, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "final de fitxer inesperat"
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2053
 #, fuzzy, c-format
 msgid "Could not create directory for '%s'"
 msgstr "No s'ha pogut crear el directori ยซ%sยป"
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2056
 #, fuzzy, c-format
 msgid "Created autostash: %s\n"
 msgstr "S'ha creat un magatzem automร tic: $stash_abbrev"
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2059
 #, fuzzy
 msgid "could not reset --hard"
 msgstr "No s'ha pogut llegir orig-head"
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD ara รฉs a %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2068
 msgid "Please commit or stash them."
 msgstr "Cometeu-los o emmagatzemeu-los."
 
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2095
 #, c-format
 msgid "could not parse '%s'"
 msgstr "no s'ha pogut analitzar ยซ%sยป"
 
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2108
 #, c-format
 msgid "could not switch to %s"
 msgstr "no s'ha pogut commutar a %s"
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2119
 msgid "HEAD is up to date."
 msgstr "HEAD estร  al dia."
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2121
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La branca actual %s estร  al dia.\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2129
 msgid "HEAD is up to date, rebase forced."
 msgstr "La branca actual estร  al dia, ยซrebaseยป forรงat."
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2131
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "La branca actual %s estร  al dia; ยซrebaseยป forรงat.\n"
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2139
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El lligam pre-ยซrebaseยป ha refusat a fer ยซrebaseยป."
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2146
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Canvis a  %s:\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2149
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Canvis de %s a %s:\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2174
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Primer, s'estร  rebobinant HEAD per a reproduir el vostre treball al "
 "damunt...\n"
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2183
 msgid "Could not detach HEAD"
 msgstr "No s'ha pogut separar HEAD"
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avanรง rร pid %s a %s.\n"
@@ -17752,7 +18385,7 @@ msgstr "Avanรง rร pid %s a %s.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:830
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -17783,7 +18416,7 @@ msgstr ""
 "predeterminat, establiu la variable de configuraciรณ\n"
 "'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:850
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -17805,11 +18438,11 @@ msgstr ""
 "\n"
 "Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
 
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:1936
 msgid "quiet"
 msgstr "silenciรณs"
 
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1950
 msgid "You must specify a directory."
 msgstr "Heu d'especificar un directori."
 
@@ -18032,7 +18665,7 @@ msgstr "(coincident)"
 msgid "(delete)"
 msgstr "(suprimir)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "No existeix el remot ยซ%sยป"
@@ -18054,17 +18687,17 @@ msgstr ""
 "\t%s\n"
 "\tActualitzeu la configuraciรณ manualment si รฉs necessari."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:701
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "la supressiรณ de ยซ%sยป ha fallat"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:735
 #, c-format
 msgid "creating '%s' failed"
 msgstr "la creaciรณ de ยซ%sยป ha fallat"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:801
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18079,118 +18712,118 @@ msgstr[1] ""
 "eliminat;\n"
 "per a suprimir-les, useu:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:815
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No s'ha pogut eliminar la secciรณ de configuraciรณ ยซ%sยป"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:916
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nou (la prรฒxima obtenciรณ emmagatzemarร  a remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:919
 msgid " tracked"
 msgstr " seguit"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:921
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " estancat (useu 'git remote prune' per a eliminar)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:923
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:964
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge no vร lid; no es pot fer ยซrebaseยป sobre > 1 branca"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:973
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "es fa ยซrebaseยป interactivament sobre el remot %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:975
 #, fuzzy, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "es fa ยซrebaseยป interactivament sobre el remot %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:978
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "es fa ยซrebaseยป sobre el remot %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:982
 #, c-format
 msgid " merges with remote %s"
 msgstr "es fusiona amb el remot %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:985
 #, c-format
 msgid "merges with remote %s"
 msgstr "es fusiona amb el remot %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:988
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    i amb el remot %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1031
 msgid "create"
 msgstr "crea"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1034
 msgid "delete"
 msgstr "suprimeix"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1038
 msgid "up to date"
 msgstr "al dia"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1041
 msgid "fast-forwardable"
 msgstr "avanรง rร pid possible"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1044
 msgid "local out of date"
 msgstr "local no actualitzat"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1051
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s forรงa a %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1054
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s puja a %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1058
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s forรงa a %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1061
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s puja a %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1129
 msgid "do not query remotes"
 msgstr "no consultis els remots"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1156
 #, c-format
 msgid "* remote %s"
 msgstr "* remot %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1157
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL d'obtenciรณ: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
 msgid "(no URL)"
 msgstr "(sense URL)"
 
@@ -18198,194 +18831,185 @@ msgstr "(sense URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1172 builtin/remote.c:1174
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL de pujada: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branca de HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1176
 msgid "(not queried)"
 msgstr "(no consultat)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1178
 msgid "(unknown)"
 msgstr "(desconegut)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1182
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 "  Branca de HEAD (la HEAD remot รฉs ambigua, pot ser un dels segรผents):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1194
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branca remota:%s"
 msgstr[1] "  Branques remotes:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1197 builtin/remote.c:1223
 msgid " (status not queried)"
 msgstr " (estat no consultat)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1206
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branca local configurada per a ยซgit pullยป:"
 msgstr[1] "  Branques locals configurades per a ยซgit pullยป:"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1214
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  ยซgit pushยป reflectirร  les referรจncies locals"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1220
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referรจncia local configurada per a ยซgit pushยป%s:"
 msgstr[1] "  Referรจncies locals configurades per a ยซgit pushยป%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1241
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1243
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "suprimeix refs/remotes/<name>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1258
 msgid "Cannot determine remote HEAD"
 msgstr "No es pot determinar la HEAD remota"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Mรบltiples branques de HEAD remotes. Trieu-ne una explรญcitament amb:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1270
 #, c-format
 msgid "Could not delete %s"
 msgstr "No s'ha pogut suprimir %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1278
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No รฉs una referรจncia vร lida: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
 #, c-format
 msgid "Could not setup %s"
 msgstr "No s'ha pogut configurar %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1298
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s es tornarร  penjant!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1299
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s s'ha tornat penjant!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1309
 #, c-format
 msgid "Pruning %s"
 msgstr "S'estร  podant %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1310
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1326
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [podaria] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1329
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [podat] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1374
 msgid "prune remotes after fetching"
 msgstr "poda els remots desprรฉs d'obtenir-los"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
 #, c-format
 msgid "No such remote '%s'"
 msgstr "No hi ha tal remot ยซ%sยป"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1453
 msgid "add branch"
 msgstr "afegeix branca"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1460
 msgid "no remote specified"
 msgstr "cap remot especificat"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1477
 msgid "query push URLs rather than fetch URLs"
 msgstr "consulta els URL de pujada en lloc dels URL d'obtenciรณ"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1479
 msgid "return all URLs"
 msgstr "retorna tots els URL"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1507
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "cap URL configurat per al remot ยซ%sยป"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1533
 msgid "manipulate push URLs"
 msgstr "manipula els URL de pujada"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1535
 msgid "add URL"
 msgstr "afegeix URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1537
 msgid "delete URLs"
 msgstr "suprimeix els URL"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1544
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no tรฉ sentit"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1583
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patrรณ d'URL antic no vร lid: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No s'ha trobat tal URL: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1593
 msgid "Will not delete all non-push URLs"
 msgstr "No se suprimiran tots els URL no de pujada"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de colยทlocar abans d'un subordre"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Subordre desconeguda: %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr "git repack [<opcions>]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18395,116 +19019,116 @@ msgstr ""
 "--no-write-bitmap-index o inhabiliteu el parร metre de configuraciรณ pack."
 "writebitmaps."
 
-#: builtin/repack.c:201
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:240 builtin/repack.c:418
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 
-#: builtin/repack.c:257
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:295
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr "empaqueta-ho tot en un รบnic paquet"
 
-#: builtin/repack.c:297
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "el mateix que -a, i solta els objectes inabastables"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "elimina els paquets redundants, i executeu git-prune-packed"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passa --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passa --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr "no executis git-update-server-info"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr "passa --local a git-pack-objects"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr "escriu รญndex de mapa de bits"
 
-#: builtin/repack.c:313
+#: builtin/repack.c:310
 #, fuzzy
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "passa --local a git-pack-objects"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr "data aproximada"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr "amb -A, no soltis els objectes mรฉs vells que aquest"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr "amb -a, reempaqueta els objectes inabastables"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr "mida de la finestra que s'usa per a compressiรณ de diferรจncies"
 
-#: builtin/repack.c:320 builtin/repack.c:326
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:321
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "el mateix que l'anterior, perรฒ limita la mida de memรฒria en lloc del nombre "
 "d'entrades"
 
-#: builtin/repack.c:323
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr "limita la profunditat mร xima de les diferรจncies"
 
-#: builtin/repack.c:325
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr "limita el nombre mร xim de fils"
 
-#: builtin/repack.c:327
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr "mida mร xima de cada fitxer de paquet"
 
-#: builtin/repack.c:329
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr "reempaqueta els objectes en paquets marcats amb .keep"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:328
 #, fuzzy
 msgid "do not repack this pack"
 msgstr "crea paquets prims"
 
-#: builtin/repack.c:341
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no es poden suprimir paquets en un dipรฒsit d'objectes preciosos"
 
-#: builtin/repack.c:345
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable i -A sรณn incompatibles"
 
-#: builtin/repack.c:427
+#: builtin/repack.c:425
 #, fuzzy
 msgid "Nothing new to pack."
 msgstr "usa el paquet prim"
 
-#: builtin/repack.c:488
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -18516,7 +19140,7 @@ msgid ""
 "WARNING: Please rename them in %s manually:\n"
 msgstr ""
 
-#: builtin/repack.c:536
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "s'ha produรฏt un error en eliminar ยซ%sยป"
@@ -18624,8 +19248,8 @@ msgstr "no s'ha pogut actualitzar %s"
 msgid "unable to write object to database"
 msgstr "no s'ha pogut escriure l'objecte de nota"
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
+#: builtin/replace.c:453
 #, fuzzy, c-format
 msgid "not a valid object name: '%s'"
 msgstr "No รฉs un nom d'objecte vร lid: ยซ%sยป"
@@ -18645,22 +19269,22 @@ msgstr "la lectura de les referรจncies de bisecciรณ ha fallat"
 msgid "new object is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, fuzzy, c-format
 msgid "could not parse %s as a commit"
 msgstr "no s'ha pogut analitzar la comissiรณ HEAD"
 
-#: builtin/replace.c:414
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "etiqueta de fusiรณ incorrecta en la comissiรณ ยซ%sยป"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "etiqueta de fusiรณ mal formada en la comissiรณ ยซ%sยป"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18669,105 +19293,105 @@ msgstr ""
 "la comissiรณ original ยซ%sยป contรฉ l'etiqueta de fusiรณ ยซ%sยป que es descarta; "
 "useu --edit en lloc de --graft"
 
-#: builtin/replace.c:467
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "la comissiรณ original ยซ%sยป tรฉ una signatura gpg"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "s'eliminarร  la signatura en la comissiรณ de reemplaรงament!"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "no s'ha pogut escriure la comissiรณ de reemplaรงament per a: ยซ%sยป"
 
-#: builtin/replace.c:486
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr ""
 
-#: builtin/replace.c:490
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "la comissiรณ nova รฉs la mateixa que l'antiga: ยซ%sยป"
 
-#: builtin/replace.c:525
+#: builtin/replace.c:526
 #, fuzzy, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr "Eliminaria l'รญtem segรผent:"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "llista les referรจncies reemplaรงades"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "suprimeix les referรจncies reemplaรงades"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "edita un objecte existent"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "canvia les mares d'una comissiรณ"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 #, fuzzy
 msgid "convert existing graft file"
 msgstr "forรงa la sobreescriptura de fitxers existents"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "reemplaรงa la referรจncia si existeix"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "no imprimeixis bellament els continguts per a --edit"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "usa aquest format"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:568
 #, fuzzy
 msgid "--format cannot be used when not listing"
 msgstr "--fix-thin no es pot usar sense --stdin"
 
-#: builtin/replace.c:575
+#: builtin/replace.c:576
 #, fuzzy
 msgid "-f only makes sense when writing a replacement"
 msgstr "-z nomรฉs tรฉ sentit amb --stdin"
 
-#: builtin/replace.c:579
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw nomรฉs tรฉ sentit amb --edit"
 
-#: builtin/replace.c:585
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:591
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "nombre incorrecte d'arguments"
 
-#: builtin/replace.c:597
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e necessita exactament un argument"
 
-#: builtin/replace.c:603
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g necessita almenys un argument"
 
-#: builtin/replace.c:609
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file arguments"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "nomรฉs es pot especificar un patrรณ amb -l"
 
@@ -18795,115 +19419,127 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissiรณ>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#, fuzzy
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<arbre>] [--] <camins>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+
+#: builtin/reset.c:35
+#, fuzzy
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<arbre>] [--] [<camins>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "mixt"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "suau"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "dur"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "fusiรณ"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "reteniment"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr "No teniu un HEAD vร lid."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr "S'ha produรฏt un error en trobar l'arbre de HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "S'ha produรฏt un error en cercar l'arbre de %s."
 
-#: builtin/reset.c:193
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ara รฉs a %s"
+
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "No es pot fer un restabliment de %s enmig d'una fusiรณ."
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594
+#: builtin/stash.c:618
 msgid "be quiet, only report errors"
 msgstr "sigues silenciรณs, nomรฉs informa d'errors"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr "restableix HEAD i l'รญndex"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr "restableix nomรฉs HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr "restableix HEAD, l'รญndex i l'arbre de treball"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr "restableix HEAD perรฒ retรฉn els canvis locals"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr "registra nomรฉs el fet que els camins eliminats s'afegiran desprรฉs"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "S'ha produรฏt un error en resoldre ยซ%sยป com a revisiรณ vร lida."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "S'ha produรฏt un error en resoldre ยซ%sยป com a arbre vร lid."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch รฉs incompatible amb --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed amb camins estร  en desรบs; useu 'git reset -- <camins>' en lloc "
 "d'aixรฒ."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No es pot restablir de %s amb camins."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "el restabliment de %s no es permet en un dipรฒsit nu"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
 msgstr "-N nomรฉs es pot usar amb --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr "Canvis ยซunstagedยป desprรฉs del restabliment:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -18912,33 +19548,28 @@ msgid ""
 "to make this the default.\n"
 msgstr ""
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "No s'ha pogut restablir el fitxer d'รญndex a la revisiรณ ยซ%sยป."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr "No s'ha pogut escriure el fitxer d'รญndex nou."
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:411
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "no es pot combinar --exclude-promisor-objects i --missing"
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:472
 msgid "object filtering requires --objects"
 msgstr "el filtratge d'objectes requereix --objects"
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "valor parcial no vร lid: ยซ%sยป"
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:522
 msgid "rev-list does not support display of notes"
 msgstr "el rev-list no permet mostrar notes"
 
-#: builtin/rev-list.c:530
+#: builtin/rev-list.c:525
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes"
 
@@ -19135,7 +19766,7 @@ msgstr ""
 #: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
-msgstr "no s'estร  eliminant ยซ%sยป recursivament sense -r"
+msgstr "no s'ha suprimit ยซ%sยป recursivament sense -r"
 
 #: builtin/rm.c:346
 #, c-format
@@ -19171,14 +19802,12 @@ msgid "print status from remote helper"
 msgstr "imprimeix l'estat des de l'ajudant remot"
 
 #: builtin/shortlog.c:14
-#, fuzzy
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camรญ>...]]"
+msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] <camรญ>...]"
 
 #: builtin/shortlog.c:15
-#, fuzzy
 msgid "git log --pretty=short | git shortlog [<options>]"
-msgstr "git worktree list [<opcions>]"
+msgstr "git log --pretty=short | git shortlog [<opcions>]"
 
 #: builtin/shortlog.c:264
 msgid "Group by committer rather than author"
@@ -19199,16 +19828,15 @@ msgstr "Mostra l'adreรงa electrรฒnica de cada autor"
 
 #: builtin/shortlog.c:271
 msgid "<w>[,<i1>[,<i2>]]"
-msgstr ""
+msgstr "<w>[,<i1>[,<i2>]]"
 
 #: builtin/shortlog.c:272
 msgid "Linewrap output"
 msgstr "Ajusta les lรญnies de la sortida"
 
 #: builtin/shortlog.c:301
-#, fuzzy
 msgid "too many arguments given outside repository"
-msgstr "hi ha massa arguments per a desassignar la font"
+msgstr "hi ha massa arguments donats fora del dipรฒsit"
 
 #: builtin/show-branch.c:13
 msgid ""
@@ -19391,15 +20019,64 @@ msgstr "no imprimeixis els resultats a stdout (รบtil amb --verify)"
 msgid "show refs from stdin that aren't in local repository"
 msgstr "mostra les referรจncies de stdin que no siguin en el dipรฒsit local"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:20
+msgid "git sparse-checkout (init|list|set|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|disable) <opcions>"
+
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:220
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr ""
+
+#: builtin/sparse-checkout.c:237
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:256
+msgid "initialize the sparse-checkout in cone mode"
+msgstr ""
+
+#: builtin/sparse-checkout.c:262
 #, fuzzy
+msgid "initialize sparse-checkout"
+msgstr "omet l'aplicaciรณ del filtre d'agafament parcial"
+
+#: builtin/sparse-checkout.c:295
+#, c-format
+msgid "failed to open '%s'"
+msgstr "s'ha produรฏt un error en obrir ยซ%sยป"
+
+#: builtin/sparse-checkout.c:361
+msgid "git sparse-checkout set (--stdin | <patterns>)"
+msgstr "git sparse-checkout set (--stdin | <patrons>)"
+
+#: builtin/sparse-checkout.c:378
+msgid "read patterns from standard in"
+msgstr "llegeix els patrons de l'entrada estร ndard"
+
+#: builtin/sparse-checkout.c:384
+#, msgid "set sparse-checkout patterns"
+msgid "set sparse-checkout patterns"
+msgstr "estableix els patrons ยซsparse-checkoutยป"
+
+#: builtin/sparse-checkout.c:447
+msgid "disable sparse-checkout"
+msgstr "inhabilita ยซsparse-checkoutยป"
+
+#: builtin/sparse-checkout.c:459
+msgid "error while refreshing working directory"
+msgstr "s'ha produรฏt un error en actualitzar el directori de treball"
+
+#: builtin/stash.c:22 builtin/stash.c:37
 msgid "git stash list [<options>]"
-msgstr "git worktree list [<opcions>]"
+msgstr "git stash list [<opcions>]"
 
 #: builtin/stash.c:23 builtin/stash.c:42
-#, fuzzy
 msgid "git stash show [<options>] [<stash>]"
-msgstr "git remote show [<opcions>] <nom>"
+msgstr "git stash show [<opcions>] [<stash>]"
 
 #: builtin/stash.c:24 builtin/stash.c:47
 msgid "git stash drop [-q|--quiet] [<stash>]"
@@ -19410,13 +20087,12 @@ msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
 #: builtin/stash.c:26 builtin/stash.c:62
-#, fuzzy
 msgid "git stash branch <branchname> [<stash>]"
-msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
+msgstr "git stash branch <nom-de-branca> [<stash>]"
 
 #: builtin/stash.c:27 builtin/stash.c:67
 msgid "git stash clear"
-msgstr ""
+msgstr "git stash clear"
 
 #: builtin/stash.c:28 builtin/stash.c:77
 msgid ""
@@ -19424,205 +20100,198 @@ msgid ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n"
+"          [--] [<pathspec>...]]"
 
 #: builtin/stash.c:31 builtin/stash.c:84
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<missatge>]"
 
 #: builtin/stash.c:52
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
 #: builtin/stash.c:57
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
 #: builtin/stash.c:72
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
-msgstr ""
+msgstr "git stash store [-m|--message <missatge>] [-q|--quiet] <commit>"
 
 #: builtin/stash.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a stash-like commit"
-msgstr "'$args' no รฉs una comissiรณ de tipus magatzem"
+msgstr "ยซ%sยป no รฉs una comissiรณ de tipus ยซstashยป"
 
 #: builtin/stash.c:147
-#, fuzzy, c-format
+#, c-format
 msgid "Too many revisions specified:%s"
-msgstr "S'han especificat massa revisions: $REV"
+msgstr "S'han especificat massa revisions:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:161 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr "No s'ha trobat cap ยซstashยป."
 
 #: builtin/stash.c:175
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a valid reference"
-msgstr "ยซ%sยป no รฉs un nom de remot vร lid"
+msgstr "ยซ%sยป no รฉs una referรจncia vร lida"
 
 #: builtin/stash.c:224 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear amb parร metres no estร  implementat"
 
 #: builtin/stash.c:403
-#, fuzzy
 msgid "cannot apply a stash in the middle of a merge"
-msgstr "No es pot aplicar un magatzem enmig d'una fusiรณ"
+msgstr "no es pot aplicar un ยซstashยป enmig d'una fusiรณ"
 
 #: builtin/stash.c:414
-#, fuzzy, c-format
+#, c-format
 msgid "could not generate diff %s^!."
-msgstr "no s'ha pogut generar la llista per a fer"
+msgstr "no s'ha pogut generar diff %s^!."
 
 #: builtin/stash.c:421
-#, fuzzy
 msgid "conflicts in index.Try without --index."
-msgstr "Hi ha conflictes en l'รญndex. Proveu-ho sense --index."
+msgstr "hi ha conflictes en l'รญndex. Proveu-ho sense --index."
 
 #: builtin/stash.c:427
-#, fuzzy
 msgid "could not save index tree"
-msgstr "No s'ha pogut desar l'arbre d'รญndex"
+msgstr "no s'ha pogut desar l'arbre d'รญndex"
 
-#: builtin/stash.c:434
-#, fuzzy
+#: builtin/stash.c:436
 msgid "could not restore untracked files from stash"
-msgstr "No s'han pogut restaurar els fitxers no seguits des del ยซstashยป"
+msgstr "no s'han pogut restaurar els fitxers no seguits des del ยซstashยป"
 
-#: builtin/stash.c:448
-#, fuzzy, c-format
+#: builtin/stash.c:450
+#, c-format
 msgid "Merging %s with %s"
-msgstr "S'estร  fusionant %s amb %s\n"
+msgstr "S'estร  fusionant %s amb %s"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:460 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
-msgstr "L'รญndex no estava sense emmagatzemar."
+msgstr "L'รญndex no estava ยซunstashedยป"
 
-#: builtin/stash.c:516 builtin/stash.c:615
-#, fuzzy
+#: builtin/stash.c:521 builtin/stash.c:620
 msgid "attempt to recreate the index"
-msgstr "S'ha produรฏt un error en llegir l'รญndex"
+msgstr "intenta tornar a crear l'รญndex"
 
-#: builtin/stash.c:549
-#, fuzzy, c-format
+#: builtin/stash.c:554
+#, c-format
 msgid "Dropped %s (%s)"
-msgstr "${REV} ($s) descartada"
+msgstr "Descartat %s (%s)"
 
-#: builtin/stash.c:552
-#, fuzzy, c-format
+#: builtin/stash.c:557
+#, c-format
 msgid "%s: Could not drop stash entry"
-msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
+msgstr "%s: no s'ha pogut descartar l'entrada ยซstashยป"
 
-#: builtin/stash.c:577
-#, fuzzy, c-format
+#: builtin/stash.c:582
+#, c-format
 msgid "'%s' is not a stash reference"
-msgstr "'$args' no รฉs una referรจncia de magatzem"
+msgstr "ยซ%sยป no รฉs una referรจncia ยซstashยป"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:632 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr "Es conserva l'entrada ยซstashยป en cas que la necessiteu altra vegada."
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:655 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr "Cap nom de branca especificat"
 
-#: builtin/stash.c:790 builtin/stash.c:827
-#, fuzzy, c-format
+#: builtin/stash.c:795 builtin/stash.c:832
+#, c-format
 msgid "Cannot update %s with %s"
-msgstr "No es pot actualitzar $ref_stash amb $w_commit"
+msgstr "No es pot actualitzar %s amb %s"
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
-#, fuzzy
+#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506
 msgid "stash message"
-msgstr "missatge d'etiqueta"
+msgstr "missatge ยซstashยป"
 
-#: builtin/stash.c:818
-#, fuzzy
+#: builtin/stash.c:823
 msgid "\"git stash store\" requires one <commit> argument"
-msgstr "--bisect-clean-state no accepta parร metres"
+msgstr "ยซgit stash storeยป requereix un parร metre <comissiรณ>"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1045 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr "No hi ha canvis seleccionats"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1145 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr "Encara no teniu la comissiรณ inicial"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1172 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr "No es pot desar l'estat d'รญndex actual"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1181 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr "No es poden desar els fitxers no seguits"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr "No es pot desar l'estat d'arbre de treball actual"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1229 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr "No es pot registrar l'estat de l'arbre de treball"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1278 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "No es poden usar --patch i --include-untracked o --all a la vegada."
+msgstr "No es poden usar --patch i --include-untracked o --all a la vegada"
 
-#: builtin/stash.c:1285
-#, fuzzy
+#: builtin/stash.c:1294
 msgid "Did you forget to 'git add'?"
-msgstr "Potser volรญeu dir ยซgit add .ยป?\n"
+msgstr "Heu oblidat de fer ยซgit addยป?"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1309 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr "No hi ha canvis locals a desar"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1316 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr "No es pot inicialitzar el magatzem"
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1331 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr "No es pot desar l'estat actual"
 
-#: builtin/stash.c:1327
-#, fuzzy, c-format
+#: builtin/stash.c:1336
+#, c-format
 msgid "Saved working directory and index state %s"
-msgstr "S'han desat el directori de treball i l'estat d'รญndex $stash_msg"
+msgstr "S'han desat el directori de treball i l'estat d'รญndex %s"
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1426 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
-#, fuzzy
+#: builtin/stash.c:1461 builtin/stash.c:1497
 msgid "keep index"
-msgstr "Actualitza l'รญndex"
+msgstr "mantรฉn l'รญndex"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1463 builtin/stash.c:1499
 msgid "stash in patch mode"
 msgstr ""
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
-#, fuzzy
+#: builtin/stash.c:1464 builtin/stash.c:1500
 msgid "quiet mode"
-msgstr "silenciรณs"
+msgstr "mode silenciรณs"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
-#, fuzzy
+#: builtin/stash.c:1466 builtin/stash.c:1502
 msgid "include untracked files in stash"
-msgstr "mostra els fitxers no seguits en columnes"
+msgstr "inclou els fitxers no seguits a ยซstashยป"
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
-#, fuzzy
+#: builtin/stash.c:1468 builtin/stash.c:1504
 msgid "include ignore files"
-msgstr "elimina nomรฉs els fitxers ignorats"
+msgstr "inclou els fitxers ignorats"
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1564
 #, c-format
 msgid "could not exec %s"
 msgstr "no s'ha pogut executar %s"
@@ -19644,47 +20313,47 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "anteposa el carร cter de comentari i un espai a cada lรญnia"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "S'espera un nom de referรจncia ple, s'ha rebut %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "no es pot despullar un component de l'url ยซ%sยป"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380
 msgid "alternative anchor for relative paths"
 msgstr "ร ncora alternativa per als camins relatius"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<camรญ>] [<camรญ>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "No s'ha trobat cap url per al camรญ de submรฒdul ยซ%sยป a .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "S'estร  entrant a ยซ%sยป\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19692,20 +20361,19 @@ msgid ""
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr "Omet la sortida en entrar l'ordre de cada submรฒdul"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053
 msgid "Recurse into nested submodules"
-msgstr "Inclou recursivament els submรฒduls imbrincats"
+msgstr "Inclou recursivament els submรฒduls imbricats"
 
-#: builtin/submodule--helper.c:570
-#, fuzzy
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] [<ordre>]"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ordre>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -19714,106 +20382,105 @@ msgstr ""
 "no s'ha pogut trobar la configuraciรณ ยซ%sยป. S'assumeix que aquest dipรฒsit รฉs "
 "el seu dipรฒsit font autoritzat."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "S'ha produรฏt un error en registrar l'url per al camรญ de submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "S'ha registrat el submรฒdul ยซ%sยป (%s) per al camรญ ยซ%sยป\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "advertรจncia: se suggereix el mode d'actualitzaciรณ per ordre per al submรฒdul "
 "ยซ%sยป\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "S'ha produรฏt un error en registrar el mode d'actualitzaciรณ per al camรญ de "
 "submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "Omet la sortida d'inicialitzar un submรฒdul"
 
-#: builtin/submodule--helper.c:713
-#, fuzzy
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
-msgstr "git submodule--helper init [<camรญ>]"
+msgstr "git submodule--helper init [<opcions>] [<camรญ>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "No s'ha trobat cap mapatge de submรฒdul a .gitmodules per al camรญ ยซ%sยป"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:827
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "no s'ha pogut resoldre la referรจncia a HEAD dins del submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "s'ha produรฏt un error en cercar recursivament al submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189
 msgid "Suppress submodule status output"
 msgstr "Suprimeix la sortida de l'estat del submรฒdul"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:879
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:880
 msgid "recurse into nested submodules"
-msgstr "inclou recursivament els submรฒduls imbrincats"
+msgstr "inclou recursivament els submรฒduls imbricats"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:885
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camรญ>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:909
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <camรญ>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:973
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "S'estร  sincronitzant l'url del submรฒdul per a ยซ%sยป\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:979
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "s'ha produรฏt un error en registrar l'url per al camรญ del submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:993
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 "s'ha produรฏt un error en obtenir el remot per defecte pel submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1004
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "s'ha produรฏt un error en actualitzar el remot pel submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1051
 msgid "Suppress output of synchronizing submodule url"
 msgstr "Omet la sortida de la sincronitzaciรณ de l'url del submรฒdul"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1058
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<camรญ>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1112
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -19822,7 +20489,7 @@ msgstr ""
 "L'arbre de treball de submรฒdul ยซ%sยป contรฉ un directori .git\n"
 "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva histรฒria)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1124
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -19831,82 +20498,94 @@ msgstr ""
 "L'arbre de treball del submรฒdul ยซ%sยป contรฉ modificacions locals; useu '-f' "
 "per a descartar-les"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1132
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "S'ha netejat el directori ยซ%sยป\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "No s'ha pogut eliminar l'arbre de treball de submรฒdul ยซ%sยป\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1145
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "no s'ha pogut crear el directori de submรฒdul buit %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1161
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "S'ha desregistrat el submรฒdul ยซ%sยป (%s) per al camรญ ยซ%sยป\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1190
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "Suprimeix els arbres de treball dels submรฒduls fins i tot si contenen canvis "
 "locals"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1191
 msgid "Unregister all submodules"
 msgstr "Desregistra recursivament tots els submรฒduls"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1196
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camรญ>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1210
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Useu '--all' si realment voleu desinicialitzar tots els submรฒduls"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1275
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+
+#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "el submรฒdul ยซ%sยป no pot afegir un alternatiu: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1353
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "No es reconeix el valor ยซ%sยป per a submodule.alternateErrorStrategy"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1360
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "No es reconeix el valor ยซ%sยป per a submodule.alternateLocation"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1383
 msgid "where the new submodule will be cloned to"
 msgstr "a on es clonarร  el submรฒdul nou"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1386
 msgid "name of the new submodule"
 msgstr "nom del submรฒdul nou"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1389
 msgid "url where to clone the submodule from"
 msgstr "url del qual clonar el submรฒdul"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1397
 msgid "depth for shallow clones"
 msgstr "profunditat dels clons superficials"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897
 msgid "force cloning progress"
 msgstr "forรงa el progrรฉs del clonatge"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899
+msgid "disallow cloning into non-empty directory"
+msgstr "no permetis clonar en un directori no buit"
+
+#: builtin/submodule--helper.c:1407
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -19914,93 +20593,103 @@ msgstr ""
 "git submodule--helper clone [--prefix=<camรญ>] [--quiet] [--reference "
 "<dipรฒsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camรญ>"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1431
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+
+#: builtin/submodule--helper.c:1442
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "el clonatge de ยซ%sยป al camรญ de submรฒdul ยซ%sยป ha fallat"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1446
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "directori no buit: ยซ%sยป"
+
+#: builtin/submodule--helper.c:1458
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "no s'ha pogut obtenir el directori de submรฒdul per a ยซ%sยป"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1494
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Mode d'actualitzaciรณ ยซ%sยป no vร lid per al camรญ de submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1498
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Mode d'actualitzaciรณ ยซ%sยป configurat no vร lid per al camรญ de submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1594
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "El camรญ de submรฒdul ยซ%sยป no estร  inicialitzat"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1598
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Potser voleu usar 'update --init'?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1628
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "S'estร  ometent el submรฒdul no fusionat %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1657
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "S'estร  ometent el submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1803
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "S'ha produรฏt un error en clonar ยซ%sยป. S'ha programat un reintent"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1814
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "S'ha produรฏt un error per segon cop en clonar ยซ%sยป, s'estร  avortant"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120
 msgid "path into the working tree"
 msgstr "camรญ a l'arbre de treball"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1879
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "camรญ a l'arbre de treball, a travรฉs de fronteres de submรฒduls niats"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1883
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1889
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1892
 msgid "parallel jobs"
 msgstr "tasques paralยทleles"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1894
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "si el clonatge inicial ha de seguir la recomanaciรณ de superficialitat"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1895
 msgid "don't print cloning progress"
 msgstr "no imprimeixis el progrรฉs del clonatge"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<camรญ>] [<camรญ>...]"
+#: builtin/submodule--helper.c:1904
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<camรญ>] [<camรญ>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1917
 msgid "bad value for update parameter"
 msgstr "valor incorrecte per al parร metre update"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1965
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20009,56 +20698,55 @@ msgstr ""
 "La branca de submรฒdul (%s) estร  configurada per a heretar la branca del "
 "superprojecte, perรฒ el superprojecte no รฉs en cap branca"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2088
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "no s'ha pogut obtenir el gestor del dipรฒsit pel submรฒdul ยซ%sยป"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2121
 msgid "recurse into submodules"
 msgstr "inclou recursivament als submรฒduls"
 
-#: builtin/submodule--helper.c:2100
-#, fuzzy
+#: builtin/submodule--helper.c:2127
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<camรญ>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camรญ>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2183
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "comprova si รฉs segur escriure al fitxer .gitmodules"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2186
 #, fuzzy
 msgid "unset the config in the .gitmodules file"
 msgstr "l'allistament del .gitmodules actualitzat ha fallat"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2191
 #, fuzzy
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config name [valor]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2192
 #, fuzzy
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config name [valor]"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2193
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2212 git-submodule.sh:173
 #, fuzzy, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 "Feu ยซstageยป dels vostres canvis a .gitmodules o feu ยซstashยป dels mateixos "
 "per a procedir"
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2262 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no admet --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "ยซ%sยป no รฉs un subordre vร lid de submodule--helper"
@@ -20309,212 +20997,216 @@ msgstr "l'etiqueta ยซ%sยป ja existeix"
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta ยซ%sยป actualitzada (era %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:501
 msgid "Unpacking objects"
 msgstr "S'estan desempaquetant els objectes"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "s'ha produรฏt un error en crear el directori %s"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "s'ha produรฏt un error en crear el fitxer %s"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "s'ha produรฏt un error en suprimir el fitxer %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "s'ha produรฏt un error en suprimir el directori %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "S'estร  provant mtime en ยซ%sยป "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "la informaciรณ d'stat de directori no canvia desprรฉs d'afegir un fitxer nou"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "la informaciรณ d'stat de directori no canvia desprรฉs d'afegir un directori nou"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "la informaciรณ d'stat de directori canvia desprรฉs d'actualitzar un fitxer"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "la informaciรณ d'stat de directori canvia desprรฉs d'afegir un fitxer dins "
 "d'un subdirectori"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "la informaciรณ d'stat de directori no canvia desprรฉs de suprimir un fitxer"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "la informaciรณ d'stat de directori no canvia desprรฉs de suprimir un directori"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " D'acord"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "continua l'actualitzaciรณ encara que l'รญndex necessiti una actualitzaciรณ"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "actualitza: ignora els submรฒduls"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "no ignoris els fitxers nous"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "tingues en compte els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "actualitza encara que l'รญndex contingui entrades no fusionades"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "actualitza la informaciรณ d'estadรญstiques"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "com --refresh, perรฒ ignora el parร metre assume-unchanged"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>,<objecte>,<camรญ>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "afegeix l'entrada especificada a l'รญndex"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "marca els fitxers com a \"no canviant\""
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "neteja el bit assumed-unchanged"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "marca els fitxers com a \"nomรฉs รญndex\""
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "neteja el bit skip-worktree"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr ""
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "nomรฉs afegeix a l'รญndex; no afegeixis el contingut a la base de dades "
 "d'objectes"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "elimina els camins anomenats encara que estiguin presents en l'arbre de "
 "treball"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "amb --stdin: les lรญnies d'entrada acaben amb octets nuls"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "llegeix la llista de camins a actualitzar des de l'entrada estร ndard"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "afegeix les entrades de l'entrada estร ndard a l'รญndex"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "reemplena les ยซstageยป #2 i #3 per als camins llistats"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "nomรฉs actualitza les entrades que difereixin de HEAD"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignora els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "informa de les accions en la sortida estร ndard"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "escriu l'รญndex en aquest format"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "habilita o inhabilita l'รญndex dividit"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "habilita/inhabilita la memรฒria cau no seguida"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "prova si el sistema de fitxers admet la memรฒria cau no seguida"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "habilita la memรฒria cau no seguida sense provar el sistema de fitxers"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr ""
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "habilita o inhabilita el monitor del sistema de fitxers"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "marca els fitxers com a vร lids pel fsmonitor"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "neteja el bit de validesa del fsmonitor"
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20522,7 +21214,7 @@ msgstr ""
 "core.splitIndex estร  establert a fals; elimineu-lo o canviar-lo, si realment "
 "voleu habilitar l'รญndex dividit"
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20530,7 +21222,7 @@ msgstr ""
 "core.splitIndex estร  establert a cert; elimineu-lo o canvieu-lo, si realment "
 "voleu inhabilitar l'รญndex dividit"
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -20538,11 +21230,11 @@ msgstr ""
 "core.untrackedCache estร  establert a cert; elimineu-lo o canvieu-lo, si "
 "realment voleu inhabilitar el cau no seguit"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "La memรฒria cau no seguida estร  inhabilitada"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -20550,29 +21242,29 @@ msgstr ""
 "core.untrackedCache estร  establert a fals; elimineu-lo o canviar-lo, si "
 "realment voleu habilitar el cau no seguit"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "La memรฒria cau no seguida estร  habilitada per a ยซ%sยป"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor estร  establert a fals; establiu-lo a cert si realment voleu "
 "habilitar fsmonitor"
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor habilitat"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor estร  establert a cert; elimineu-lo si realment voleu "
 "inhabilitar fsmonitor"
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor inhabilitat"
 
@@ -20634,15 +21326,15 @@ msgstr ""
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interromp la transferรจncia desprรฉs de <n> segons d'inactivitat"
 
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <comissiรณ>..."
 
-#: builtin/verify-commit.c:69
+#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "imprimeix els continguts de la comissiรณ"
 
-#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "imprimeix la sortida crua de l'estat gpg"
 
@@ -20658,63 +21350,63 @@ msgstr "detallat"
 msgid "show statistics only"
 msgstr "mostra nomรฉs estadรญstiques"
 
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..."
 
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "imprimeix els continguts de l'etiqueta"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opcions>] <camรญ> [<commit-ish>"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opcions>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opcions>] <camรญ>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbre de treball> <camรญ-nou>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opcions>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree lock [<opcions>] <arbre de treball>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <camรญ>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:898
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "s'ha produรฏt un error en suprimir ยซ%sยป"
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Eliminaciรณ de worktrees/%s: no รฉs un directori vร lid"
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Eliminaciรณ de worktrees/%s: el fitxer gitdir no existeix"
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Eliminaciรณ de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -20723,225 +21415,223 @@ msgstr ""
 "S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven "
 "%<PRIuMAX> bytes, llegits %<PRIuMAX>)"
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Eliminaciรณ de worktrees/%s: fitxer gitdir no vร lid"
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Eliminaciรณ de worktrees/%s: el fitxer gitdir es refereix a una ubicaciรณ no "
 "existent"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr "informa dels arbres de treball podats"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr "fes caducar els arbres de treball mรฉs vells que <hora>"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr "ยซ%sยป ja existeix"
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:251
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "no s'ha pogut tornar a afegir a l'arbre de treball ยซ%sยป"
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:256
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
 "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:258
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
 "use 'add -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:308
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no s'ha pogut crear directori de ยซ%sยป"
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:439 builtin/worktree.c:445
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "S'estร  preparant l'arbre de treball (branca nova ยซ%sยป)"
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:441
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:450
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "S'estร  preparant l'arbre de treball (s'estร  agafant ยซ%sยป)"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:456
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "S'estร  preparant l'arbre de treball (HEAD %s separat)"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:497
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:500
 msgid "create a new branch"
 msgstr "crea una branca nova"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:502
 msgid "create or reset a branch"
 msgstr "crea o restableix una branca"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:504
 msgid "populate the new working tree"
 msgstr "emplena l'arbre de treball nou"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:505
 msgid "keep the new working tree locked"
 msgstr "mantรฉn l'arbre de treball nou bloquejat"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:508
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configura el mode de seguiment (vegeu git-branch(1))"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:511
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "prova de fer coincidir el nom de la branca nova amb una branca amb seguiment "
 "remot"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:519
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B i --detach sรณn mรบtuament excloents"
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:580
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track nomรฉs es pot usar si es crea una branca nova"
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:680
 msgid "reason for locking"
 msgstr "raรณ per bloquejar"
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
+#: builtin/worktree.c:926
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "ยซ%sยป no รฉs un arbre de treball"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:694 builtin/worktree.c:727
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:699
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "ยซ%sยป ja estร  bloquejat, raรณ: ยซ%sยป"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:701
 #, c-format
 msgid "'%s' is already locked"
 msgstr "ยซ%sยป ja estร  bloquejat"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:729
 #, c-format
 msgid "'%s' is not locked"
 msgstr "ยซ%sยป no estร  bloquejat"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:770
 msgid "working trees containing submodules cannot be moved or removed"
-msgstr ""
+msgstr "els arbres de treball que contenen submรฒduls no es poden moure o suprimir"
 
-#: builtin/worktree.c:779
-#, fuzzy
+#: builtin/worktree.c:778
 msgid "force move even if worktree is dirty or locked"
-msgstr "forรงa el moviment / canvi de nom encara que el destรญ existeixi"
+msgstr "forรงa el moviment encara que l'arbre de treball estigui brut o bloquejat"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:801 builtin/worktree.c:928
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "ยซ%sยป รฉs un arbre de treball principal"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:806
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "no s'ha pogut deduir el nom de destรญ des de ยซ%sยป"
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:812
 #, c-format
 msgid "target '%s' already exists"
 msgstr "el destรญ ยซ%sยป ja existeix"
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:820
 #, fuzzy, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 "use 'move -f -f' to override or unlock first"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:822
 #, fuzzy
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:825
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "la validaciรณ ha fallat, no es pot moure l'arbre de treball: %s"
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:830
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "s'ha produรฏt un error en moure ยซ%sยป a ยซ%sยป"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "no s'ha pogut executar ยซgit statusยป a ยซ%sยป"
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:882
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:887
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "no s'ha pogut executar ยซgit statusยป a ยซ%sยป, codi %d"
 
-#: builtin/worktree.c:911
-#, fuzzy
+#: builtin/worktree.c:910
 msgid "force removal even if worktree is dirty or locked"
-msgstr "forรงa el moviment / canvi de nom encara que el destรญ existeixi"
+msgstr "forรงa la supressiรณ encara que l'arbre de treball estigui brut o bloquejat"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, fuzzy, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:935
 #, fuzzy
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:938
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
@@ -20962,6 +21652,21 @@ msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>"
 msgid "only useful for debugging"
 msgstr "nomรฉs รบtil per a la depuraciรณ"
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "S'esperava l'ordre ยซmarkยป, s'ha rebut %s"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "S'esperava l'ordre ยซtoยป, s'ha rebut ยซ%sยป"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -20990,14 +21695,12 @@ msgid "too many commits marked reachable"
 msgstr "masses comission marcades com abastable"
 
 #: t/helper/test-serve-v2.c:7
-#, fuzzy
 msgid "test-tool serve-v2 [<options>]"
-msgstr "git serve [<opcions>]"
+msgstr "test-tool serve-v2 [<opcions>]"
 
 #: t/helper/test-serve-v2.c:19
-#, fuzzy
 msgid "exit immediately after advertising capabilities"
-msgstr "surt immediatament desprรฉs de l'anunci inicial de referรจncia"
+msgstr "surt immediatament desprรฉs d'anunciar les funcionalitats"
 
 #: git.c:27
 msgid ""
@@ -21037,9 +21740,9 @@ msgid "no directory given for --work-tree\n"
 msgstr "no s'ha especificat un directori per --work-tree\n"
 
 #: git.c:228
-#, fuzzy, c-format
+#, c-format
 msgid "no prefix given for --super-prefix\n"
-msgstr "%s no admet --super-prefix"
+msgstr "no s'ha especificat cap prefix per a --super-prefix\n"
 
 #: git.c:250
 #, c-format
@@ -21068,39 +21771,39 @@ msgid ""
 "You can use '!git' in the alias to do this"
 msgstr ""
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr ""
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr "ร lies recursiu: %s"
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr "fallada d'escriptura en la sortida estร ndard"
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr "fallada d'escriptura desconeguda en la sortida estร ndard"
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr "ha fallat el tancament en la sortida estร ndard"
 
-#: git.c:796
+#: git.c:793
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 
-#: git.c:846
+#: git.c:843
 #, fuzzy, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "no es pot usar  %s com a fitxer d'exclusiรณ"
 
-#: git.c:859
+#: git.c:856
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -21109,12 +21812,12 @@ msgstr ""
 "รบs: %s\n"
 "\n"
 
-#: git.c:879
+#: git.c:876
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 
-#: git.c:891
+#: git.c:888
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "s'ha produรฏt un error en executar l'ordre ยซ%sยป: %s\n"
@@ -21142,22 +21845,22 @@ msgstr "No s'admet l'enganx de clau pรบblica amb cURL < 7.44.0"
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "No s'admet l'enganx de clau pรบblica amb cURL < 7.44.0"
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 
-#: http.c:1096
+#: http.c:1097
 #, fuzzy, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "No s'ha pogut tornar a $head_name"
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21168,153 +21871,164 @@ msgstr ""
 "  peticiรณ: %s\n"
 "   redirecciรณ: %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, fuzzy, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "valor parcial no vร lid: ยซ%sยป"
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, fuzzy, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "ยซ%sยป no reconegut com un dipรฒsit git"
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 #, fuzzy
 msgid "invalid server response; expected service, got flush packet"
 msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, fuzzy, c-format
 msgid "invalid server response; got '%s'"
 msgstr "referรจncia no vร lida: %s"
 
-#: remote-curl.c:446
-#, fuzzy, c-format
+#: remote-curl.c:455
+#, c-format
 msgid "repository '%s' not found"
-msgstr "no s'ha trobat la branca ยซ%sยป."
+msgstr "no s'ha trobat el dipรฒsit ยซ%sยป"
 
-#: remote-curl.c:450
-#, fuzzy, c-format
+#: remote-curl.c:459
+#, c-format
 msgid "Authentication failed for '%s'"
-msgstr "falta el valor per ยซ%sยป"
+msgstr "S'ha produรฏt un error en autenticar per ยซ%sยป"
 
-#: remote-curl.c:454
-#, fuzzy, c-format
+#: remote-curl.c:463
+#, c-format
 msgid "unable to access '%s': %s"
-msgstr "no s'ha pogut accedir a '%s': %s"
+msgstr "no s'ha pogut accedir a ยซ%sยป: %s"
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr "s'estร  redirigint a %s"
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, fuzzy, c-format
 msgid "RPC failed; %s"
 msgstr "STARTTLS ha fallat! %s"
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 #, fuzzy
 msgid "cannot handle pushes this big"
 msgstr "no es pot usar  %s com a fitxer d'exclusiรณ"
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 #, fuzzy
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "El servidor no permet clients superficials"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1037
 #, fuzzy
 msgid "fetch failed."
 msgstr "l'ยซstashยป ha fallat"
 
-#: remote-curl.c:1076
+#: remote-curl.c:1085
 msgid "cannot fetch by sha1 over smart http"
 msgstr ""
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1129 remote-curl.c:1135
 #, fuzzy, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr ""
 "s'ha produรฏt un error de protocol: s'esperava shallow sha-1, s'ha rebut ยซ%sยป"
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1147 remote-curl.c:1261
 #, fuzzy, c-format
 msgid "http transport does not support %s"
 msgstr "la variant ยซsimpleยป d'ssh no รฉs compatible amb -4"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1183
 #, fuzzy
 msgid "git-http-push failed"
 msgstr "l'ยซstashยป ha fallat"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1367
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr ""
 
-#: remote-curl.c:1392
+#: remote-curl.c:1399
 msgid "remote-curl: error reading command stream from git"
 msgstr ""
 
-#: remote-curl.c:1399
+#: remote-curl.c:1406
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr ""
 
-#: remote-curl.c:1439
+#: remote-curl.c:1446
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr ""
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr "args"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr "filtratge d'objecte"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "data-de-caducitat"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "operaciรณ nulยทla (per a compatibilitat amb versions anteriors)"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "sigues mรฉs detallat"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
-msgstr "sigues mรฉs callat"
+msgstr "sigues mรฉs discret"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "usa <n> xifres per presentar els SHA-1"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "com suprimir els espais i #comentaris del missatge"
 
+#: parse-options.h:337
+#, fuzzy
+msgid "read pathspec from file"
+msgstr "llegeix els patrons des d'un fitxer"
+
+#: parse-options.h:338
+#, fuzzy
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "els camins se separen amb el carร cter NUL"
+
 #: ref-filter.h:101
 msgid "key"
 msgstr "clau"
@@ -21328,11 +22042,11 @@ msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 "actualitza l'รญndex amb la resoluciรณ de conflicte reusada si รฉs possible"
 
-#: wt-status.h:68
+#: wt-status.h:67
 msgid "HEAD detached at "
 msgstr "HEAD separat a "
 
-#: wt-status.h:69
+#: wt-status.h:68
 msgid "HEAD detached from "
 msgstr "HEAD separat de "
 
@@ -21482,12 +22196,13 @@ msgstr "Un servidor realment senzill per a dipรฒsits Git"
 
 #: command-list.h:85
 msgid "Give an object a human readable name based on an available ref"
-msgstr "Dรณna un nom llegible per humans basant-se en les referรจncies disponibles"
+msgstr ""
+"Dรณna un nom llegible per humans basant-se en les referรจncies disponibles"
 
 #: command-list.h:86
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
-"Mostra els canvis entre comissions, la comissiรณ i l'arbre de treball, etc."
+"Mostra els canvis entre comissions, la comissiรณ i l'arbre de treball, etc"
 
 #: command-list.h:87
 msgid "Compares files in the working tree and the index"
@@ -21539,7 +22254,7 @@ msgstr "Prepara pedaรงos per enviar-los per correu electrรฒnic"
 
 #: command-list.h:99
 msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr "Verifica la connectivitat i validesa del objectes a la base de dades"
+msgstr "Verifica la connectivitat i validesa dels objectes a la base de dades"
 
 #: command-list.h:100
 msgid "Cleanup unnecessary files and optimize the local repository"
@@ -21608,7 +22323,7 @@ msgstr "Mostra els registres de comissiรณ"
 
 #: command-list.h:116
 msgid "Show information about files in the index and the working tree"
-msgstr "Mostra informaciรณ sobre els fitxer a l'รญndex i a l'arbre de treball"
+msgstr "Mostra informaciรณ sobre els fitxers a l'รญndex i a l'arbre de treball"
 
 #: command-list.h:117
 msgid "List references in a remote repository"
@@ -21651,7 +22366,8 @@ msgstr ""
 
 #: command-list.h:126
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr "Executa eines de resoluciรณ de conflictes per a resoldre conflictes de fussiรณ"
+msgstr ""
+"Executa eines de resoluciรณ de conflictes per a resoldre conflictes de fussiรณ"
 
 #: command-list.h:127
 msgid "Show three-way merge without touching index"
@@ -21800,7 +22516,7 @@ msgstr "Elimina fitxers de l'arbre de treball i de l'รญndex"
 
 #: command-list.h:161
 msgid "Send a collection of patches as emails"
-msgstr "Envia una colยทleciรณ de pedaรงos com a correus electrรฒnics"
+msgstr "Envia una colยทlecciรณ de pedaรงos com a correus electrรฒnics"
 
 #: command-list.h:162
 msgid "Push objects over Git protocol to another repository"
@@ -21839,167 +22555,175 @@ msgid "Common Git shell script setup code"
 msgstr "Codi de scripts de configuraciรณ comuns pel Git shell"
 
 #: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr ""
+
+#: command-list.h:172
 #, fuzzy
 msgid "Stash the changes in a dirty working directory away"
 msgstr "%s: ja existeix en el directori de treball"
 
-#: command-list.h:172
+#: command-list.h:173
 #, fuzzy
 msgid "Add file contents to the staging area"
 msgstr "Afegeix els continguts dels fitxers a l'รญndex"
 
-#: command-list.h:173
+#: command-list.h:174
 msgid "Show the working tree status"
 msgstr "Mostra l'estat de l'arbre de treball"
 
-#: command-list.h:174
+#: command-list.h:175
 msgid "Remove unnecessary whitespace"
 msgstr "Suprimeix l'espai en blanc innecessari"
 
-#: command-list.h:175
+#: command-list.h:176
 msgid "Initialize, update or inspect submodules"
 msgstr "Inicialitza, actualitza o inspecciona submรฒduls"
 
-#: command-list.h:176
+#: command-list.h:177
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operaciรณ bidireccional entre un dipรฒsit a Subversion i Git"
 
-#: command-list.h:177
+#: command-list.h:178
 msgid "Switch branches"
 msgstr "Commuta branques"
 
-#: command-list.h:178
+#: command-list.h:179
 msgid "Read, modify and delete symbolic refs"
 msgstr "Llegeix, modifica i suprimeix referรจncies simbรฒliques"
 
-#: command-list.h:179
+#: command-list.h:180
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
 
-#: command-list.h:180
+#: command-list.h:181
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un fitxer temporal amb els continguts dels blobs"
 
-#: command-list.h:181
+#: command-list.h:182
 msgid "Unpack objects from a packed archive"
 msgstr "Desempaqueta objectes d'un arxiu empaquetat"
 
-#: command-list.h:182
+#: command-list.h:183
 msgid "Register file contents in the working tree to the index"
 msgstr "Registra els continguts del fitxer en l'arbre de treball a l'รญndex"
 
-#: command-list.h:183
+#: command-list.h:184
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "Actualitza el nom de l'objecte emmagatzema en una referรจncia de forma segura"
 
-#: command-list.h:184
+#: command-list.h:185
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#: command-list.h:185
+#: command-list.h:186
 msgid "Send archive back to git-archive"
 msgstr "Envia l'arxiu de tornada al git-archive"
 
-#: command-list.h:186
+#: command-list.h:187
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:188
 msgid "Show a Git logical variable"
 msgstr "Mostra una variable lรฒgica del Git"
 
-#: command-list.h:188
+#: command-list.h:189
 msgid "Check the GPG signature of commits"
 msgstr "Verifica la signatura GPG de les comissions"
 
-#: command-list.h:189
+#: command-list.h:190
 msgid "Validate packed Git archive files"
 msgstr "Valida els fitxers d'arxius Git empaquetats"
 
-#: command-list.h:190
+#: command-list.h:191
 msgid "Check the GPG signature of tags"
 msgstr "Verifica la signatura GPG de les etiquetes"
 
-#: command-list.h:191
+#: command-list.h:192
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interfรญcie web del Git (interfรญcie web pels dipรฒsits Git)"
 
-#: command-list.h:192
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Mostra registres amb la diferรจncia introduรฏda per cada comissiรณ"
 
-#: command-list.h:193
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Gestiona mรบltiples arbres de treball"
 
-#: command-list.h:194
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Crea un objecte arbre des de l'รญndex actual"
 
-#: command-list.h:195
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "La definiciรณ d'atributs per camรญ"
 
-#: command-list.h:196
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Interfรญcie i convencions de la lรญnia d'ordres del Git"
 
-#: command-list.h:197
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial bร sic del Git per a desenvolupadors"
 
-#: command-list.h:198
+#: command-list.h:199
 msgid "Git for CVS users"
 msgstr "Git per a usuaris del CVS"
 
-#: command-list.h:199
+#: command-list.h:200
 #, fuzzy
 msgid "Tweaking diff output"
 msgstr "omet la sortida de diferรจncies"
 
-#: command-list.h:200
+#: command-list.h:201
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un conjunt mรญnim รบtil d'ordres diร ries del Git"
 
-#: command-list.h:201
+#: command-list.h:202
 msgid "A Git Glossary"
 msgstr "Un glossari de Git"
 
-#: command-list.h:202
+#: command-list.h:203
 msgid "Hooks used by Git"
 msgstr "Lligams utilitzats pel Git"
 
-#: command-list.h:203
+#: command-list.h:204
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
 
-#: command-list.h:204
+#: command-list.h:205
 msgid "Defining submodule properties"
 msgstr "La definiciรณ de les propietats de submรฒduls"
 
-#: command-list.h:205
+#: command-list.h:206
 msgid "Git namespaces"
 msgstr "Espais de noms del Git"
 
-#: command-list.h:206
+#: command-list.h:207
 msgid "Git Repository Layout"
 msgstr "Disposiciรณ del dipรฒsit del Git"
 
-#: command-list.h:207
+#: command-list.h:208
 msgid "Specifying revisions and ranges for Git"
 msgstr "L'especificaciรณ de revisions i rangs per al Git"
 
-#: command-list.h:208
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr ""
+
+#: command-list.h:210
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial d'introducciรณ al Git: segona part"
 
-#: command-list.h:209
+#: command-list.h:211
 msgid "A tutorial introduction to Git"
 msgstr "Un tutorial d'introducciรณ al Git"
 
-#: command-list.h:210
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visiรณ de conjunt de fluxos de treball recomanats amb Git"
 
@@ -22127,115 +22851,115 @@ msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 "La fusiรณ simple no ha funcionat, s'estร  intentant una fusiรณ automร tica."
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "No es pot eliminar l'รญndex temporal (aixรฒ no pot passar)"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "No es pot actualitzar $ref_stash amb $w_commit"
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr ""
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "S'han desat el directori de treball i l'estat d'รญndex $stash_msg"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opciรณ desconeguda: $opt"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "S'han especificat massa revisions: $REV"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no รฉs una referรจncia vร lida"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no รฉs una comissiรณ de tipus magatzem"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no รฉs una referรจncia de magatzem"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "no s'ha pogut actualitzar l'รญndex"
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "No es pot aplicar un magatzem enmig d'una fusiรณ"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr "Hi ha conflictes en l'รญndex. Proveu-ho sense --index."
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "No s'ha pogut desar l'arbre d'รญndex"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr "No s'han pogut restaurar els fitxers no seguits des del ยซstashยป"
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "No es pot fer ยซunstageยป dels fitxers modificats"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} ($s) descartada"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:202
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "El camรญ relatiu nomรฉs es pot usar des del nivell superior de l'arbre de "
 "treball"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:212
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "URL de dipรฒsit: '$repo' ha de ser absolut o comenรงar amb ./|../"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:231
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' ja existeix en l'รญndex"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:234
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' ja existeix en l'รญndex i no รฉs submรฒdul"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:241
 #, fuzzy, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "el camรญ ยซ%sยป no tรฉ la seva versiรณ"
 
-#: git-submodule.sh:245
+#: git-submodule.sh:247
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -22246,23 +22970,23 @@ msgstr ""
 "$sm_path\n"
 "Useu -f si realment voleu afegir-lo."
 
-#: git-submodule.sh:268
+#: git-submodule.sh:270
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "S'estร  afegint el dipรฒsit existent a '$sm_path' a l'รญndex"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:272
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' ja existeix i no รฉs un dipรฒsit de git vร lid"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:280
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Es troba un directori de git per a '$sm_name' localment amb els remots:"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:282
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22279,39 +23003,39 @@ msgstr ""
 "o no esteu segur de quรจ vol dir aixรฒ, trieu un altre nom amb l'opciรณ '--"
 "name'."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:288
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 "S'estร  reactivant el directori de git local per al submรฒdul '$sm_name'."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:300
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "No s'ha pogut agafar el submรฒdul '$sm_path'"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:305
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "S'ha produรฏt un error en afegir el submรฒdul '$sm_path'"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:314
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "S'ha produรฏt un error en registrar el submรฒdul '$sm_path'"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:580
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "No s'ha pogut trobar la revisiรณ actual en el camรญ de submรฒdul '$displaypath'"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "No s'ha pogut obtenir en el camรญ de submรฒdul '$sm_path'"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:595
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22320,92 +23044,94 @@ msgstr ""
 "No s'ha pogut trobar la revisiรณ actual de ${remote_name}/${branch} en el "
 "camรญ de submรฒdul '$sm_path'"
 
-#: git-submodule.sh:606
-#, fuzzy, sh-format
+#: git-submodule.sh:613
+#, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
 "$sha1:"
-msgstr "No s'ha pogut obtenir en el camรญ de submรฒdul '$displaypath'"
+msgstr ""
+"No s'ha pogut obtenir en el camรญ de submรฒdul ยซ$displaypathยป; s'estร  "
+"intentant obtenir directament $sha1:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:619
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr ""
-"S'ha obtingut en el camรญ de submรฒdul '$displaypath', perรฒ no contenia $sha1. "
+"S'ha obtingut en el camรญ de submรฒdul ยซ$displaypathยป, perรฒ no contenia $sha1. "
 "L'obtenciรณ directa d'aquella comissiรณ ha fallat."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:626
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "No s'ha pogut agafar '$sha1' en el camรญ de submรฒdul '$displaypath'"
+msgstr "No s'ha pogut agafar ยซ$sha1ยป en el camรญ de submรฒdul ยซ$displaypathยป"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:627
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Camรญ de submรฒdul '$displaypath': s'ha agafat '$sha1'"
+msgstr "Camรญ de submรฒdul ยซ$displaypathยป: s'ha agafat ยซ$sha1ยป"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:631
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
-"No s'ha pogut fer ยซrebaseยป '$sha1' en el camรญ de submรฒdul '$displaypath'"
+"No s'ha pogut fer ยซrebaseยป ยซ$sha1ยป' en el camรญ de submรฒdul ยซ$displaypathยป"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:632
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Camรญ de submรฒdul '$displaypath': s'ha fet ยซrebaseยป en '$sha1'"
+msgstr "Camรญ de submรฒdul ยซ$displaypathยป: s'ha fet ยซrebaseยป en ยซ$sha1ยป"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:637
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "No s'ha pogut fusionar '$sha1' en el camรญ de submรฒdul '$displaypath'"
+msgstr "No s'ha pogut fusionar ยซ$sha1ยป en el camรญ de submรฒdul ยซ$displaypathยป"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:638
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Camรญ de submรฒdul '$displaypath': s'ha fusionat en '$sha1'"
+msgstr "Camรญ de submรฒdul ยซ$displaypathยป: s'ha fusionat en ยซ$sha1ยป"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:643
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
-"L'execuciรณ de '$command $sha1' ha fallat en el camรญ de submรฒdul "
-"'$displaypath'"
+"L'execuciรณ de ยซ$command $sha1ยป ha fallat en el camรญ de submรฒdul "
+"ยซ$displaypathยป"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:644
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Camรญ de submรฒdul '$displaypath': '$command $sha1'"
+msgstr "Camรญ de submรฒdul ยซ$displaypathยป: ยซ$command $sha1ยป"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:675
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 "S'ha produรฏt un error en recorre recursivament dins del camรญ de submรฒdul "
-"'$displaypath'"
+"ยซ$displaypathยป"
 
-#: git-submodule.sh:830
+#: git-submodule.sh:886
 msgid "The --cached option cannot be used with the --files option"
 msgstr "L'opciรณ --cached no es pot usar amb l'opciรณ --files"
 
-#: git-submodule.sh:882
+#: git-submodule.sh:938
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "mode inesperat $mod_dst"
 
-#: git-submodule.sh:902
+#: git-submodule.sh:958
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Avรญs: $display_name no contรฉ la comissiรณ $sha1_src"
 
-#: git-submodule.sh:905
+#: git-submodule.sh:961
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Avรญs: $display_name no contรฉ la comissiรณ $sha1_dst"
 
-#: git-submodule.sh:908
+#: git-submodule.sh:964
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  Avรญs: $display_name no contรฉ les comissions $sha1_src i $sha1_dst"
@@ -22416,12 +23142,11 @@ msgid "See git-${cmd}(1) for details."
 msgstr "Vegeu git-${cmd}(1) per detalls."
 
 #: git-rebase--preserve-merges.sh:109
-#, fuzzy
 msgid "Applied autostash."
-msgstr "S'ha aplicat el magatzem automร tic."
+msgstr "S'ha aplicat l'ยซautostashยป."
 
 #: git-rebase--preserve-merges.sh:112
-#, fuzzy, sh-format
+#, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "No es pot emmagatzemar $stash_sha1"
 
@@ -22453,11 +23178,11 @@ msgid ""
 msgstr ""
 "\n"
 "Ordres:\n"
-" p, pick = usa la comissiรณ\n"
-" r, reword = usa la comissiรณ, perรฒ edita el missatge de comissiรณ\n"
-" e, edit = usa la comissiรณ, perรฒ atura't per a esmenar\n"
-" s, squash = usa la comissiรณ, perรฒ fusiona'l a la comissiรณ prรจvia\n"
-" f, fixup = com \"squash\", perรฒ descarta el missatge de registre d'aquesta "
+" p, pick <comissiรณ> = usa la comissiรณ\n"
+" r, reword <comissiรณ> = usa la comissiรณ, perรฒ edita el missatge de comissiรณ\n"
+" e, edit <comissiรณ> = usa la comissiรณ, perรฒ atura't per a esmenar\n"
+" s, squash <comissiรณ> = usa la comissiรณ, perรฒ fusiona'l a la comissiรณ prรจvia\n"
+" f, fixup <comissiรณ> = com \"squash\", perรฒ descarta el missatge de registre d'aquesta "
 "comissiรณ\n"
 " x, exec = executa l'ordre (la resta de la lรญnia) usant l'intรจrpret "
 "d'ordres\n"
@@ -22719,8 +23444,8 @@ msgstr "No s'ha pogut marcar com a interactiu"
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
-msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
+msgstr[0] "Fes ยซrebaseยป $shortrevisions sobre $shortonto ($todocount ordre)"
+msgstr[1] "Fes ยซrebaseยป $shortrevisions sobre $shortonto ($todocount ordres)"
 
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
@@ -22788,81 +23513,19 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "No s'ha pogut determinar el camรญ absolut del directori de git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "staged"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "unstaged"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binari"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "res"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "sense canvis"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "afegit %d camรญ\n"
-msgstr[1] "afegits %d camins\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "actualitzat %d camรญ\n"
-msgstr[1] "actualitzats %d camins\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "revertit %d camรญ\n"
-msgstr[1] "revertits %d camins\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "modificat %d camรญ\n"
 msgstr[1] "modificat %d camins\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Actualitza"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Reverteix"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "nota: %s estร  ara sense seguiment.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Afegeix sense seguiment"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Sense fitxers no seguits.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -22870,7 +23533,7 @@ msgstr ""
 "Si el pedaรง s'aplica correctament, el tros editat es marcarร  immediatament\n"
 "per ยซstagingยป."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -22878,7 +23541,7 @@ msgstr ""
 "Si el pedaรง s'aplica correctament, el tros editat es marcarร  immediatament\n"
 "per ยซstashingยป."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -22886,8 +23549,8 @@ msgstr ""
 "Si el pedaรง s'aplica correctament, el tros editat es marcarร  immediatament\n"
 "per ยซunstagingยป."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -22895,8 +23558,8 @@ msgstr ""
 "Si el pedaรง s'aplica correctament, el tros editat es marcarร  immediatament\n"
 "per aplicar-se."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -22904,17 +23567,12 @@ msgstr ""
 "Si el pedaรง s'aplica correctament, el tros editat es marcarร  immediatament\n"
 "per descartar-se."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "s'ha produรฏt un error en escriure al fitxer d'ediciรณ del tros: %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-"Mode d'ediciรณ de trossos manual - vegeu mรฉs avall per una guia rร pida.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -22927,37 +23585,12 @@ msgstr ""
 "Per suprimir ยซ%sยป lรญnies, suprimiu-les.\n"
 "Les lรญnies que comencin per %s seran suprimides.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
-"de nou. Si totes les lรญnies del tros se suprimeixen, llavors l'ediciรณ "
-"s'avorta\n"
-"i el tros es deixa sense cap canvi.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "s'ha produรฏt un error en llegir al fitxer d'ediciรณ del tros: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es "
-"descartarร ) [y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -22971,7 +23604,7 @@ msgstr ""
 "a - fes ยซstageยป d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis ยซstageยป d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -22985,7 +23618,7 @@ msgstr ""
 "a - fes ยซstashยป d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis ยซstashยป d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -22999,7 +23632,7 @@ msgstr ""
 "a - fes ยซunstageยป d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis ยซunstageยป d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23013,7 +23646,7 @@ msgstr ""
 "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23027,7 +23660,7 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23041,7 +23674,7 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23055,8 +23688,7 @@ msgstr ""
 "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1294
-#, fuzzy
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23064,13 +23696,13 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplica aquest tros a l'รญndex i l'arbre de treball\n"
-"n - no apliquis aquest tros des de l'รญndex i de l'arbre de treball\n"
+"y - aplica aquest tros a l'arbre de treball\n"
+"n - no apliquis aquest tros a l'arbre de treball\n"
 "q - surt; no apliquis aquest tros ni cap dels pendents\n"
 "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23092,232 +23724,203 @@ msgstr ""
 "e - edita manualment el tros actual\n"
 "? - mostra l'ajuda\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Els trossos seleccionats no apliquen a l'รญndex\n"
 
-#: git-add--interactive.perl:1341
+#: git-add--interactive.perl:1343
 msgid "Apply them to the worktree anyway? "
 msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
 
-#: git-add--interactive.perl:1344
+#: git-add--interactive.perl:1346
 msgid "Nothing was applied.\n"
 msgstr "No s'ha aplicat res.\n"
 
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "s'estร  ignorant %s no fusionat\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Nomรฉs s'han canviat els fitxers binaris.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Sense canvis.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Actualitzaciรณ del pedaรง"
-
-#: git-add--interactive.perl:1426
+#: git-add--interactive.perl:1428
 #, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Canvia el mode de ยซstageยป [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1427
+#: git-add--interactive.perl:1429
 #, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Suprimeix ยซstageยป [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1428
+#: git-add--interactive.perl:1430
 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Fer un ยซstageยป d'aquest tros [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1431
+#: git-add--interactive.perl:1433
 #, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Canvia el mode de ยซstashยป [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1432
+#: git-add--interactive.perl:1434
 #, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Suprimeix ยซstashยป [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1433
+#: git-add--interactive.perl:1435
 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Fer un ยซstashยป d'aquest tros [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1436
+#: git-add--interactive.perl:1438
 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Canvia el mode de ยซunstageยป [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1437
+#: git-add--interactive.perl:1439
 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Suprimeix ยซUnstageยป [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1438
+#: git-add--interactive.perl:1440
 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Fer un ยซunstageยป d'aquest tros [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1441
+#: git-add--interactive.perl:1443
 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica el canvi de mode a l'รญndex [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1444
 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica l'esborrat a l'รญndex [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1443
+#: git-add--interactive.perl:1445
 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica aquest tros a l'รญndex [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
+#: git-add--interactive.perl:1449 git-add--interactive.perl:1464
 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
+#: git-add--interactive.perl:1450 git-add--interactive.perl:1465
 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta aquest tros des de l'arbre de treball  [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1453
 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descarta el canvi de mode des de l'รญndex i l'arbre de treball [y,n,q,a,d"
 "%s,?]? "
 
-#: git-add--interactive.perl:1452
+#: git-add--interactive.perl:1454
 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descarta la supressiรณ des de l'รญndex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1453
+#: git-add--interactive.perl:1455
 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descarta aquest tros des de l'รญndex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1458
 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Aplica el canvi de mode a l'รญndex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1457
+#: git-add--interactive.perl:1459
 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica la supressiรณ a l'รญndex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1458
+#: git-add--interactive.perl:1460
 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica aquest tros a l'รญndex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1466
-#, fuzzy, perl-format
+#: git-add--interactive.perl:1468
+#, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Aplica el canvi de mode a l'รญndex i l'arbre de treball [y,n,q,a,d%s,?]? "
+msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1467
-#, fuzzy, perl-format
+#: git-add--interactive.perl:1469
+#, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica la supressiรณ a l'รญndex i l'arbre de treball [y,n,q,a,d%s,?]? "
+msgstr "Aplica la supressiรณ a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
-#, fuzzy, perl-format
+#: git-add--interactive.perl:1470
+#, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica aquest tros a l'รญndex i l'arbre de treball [y,n,q,a,d%s,?]? "
+msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "No hi ha altres trossos on anar-hi\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "vรฉs a quin tros (<ret> per veure'n mรฉs)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "vรฉs a quin tros? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Nรบmero no vร lid: ยซ%sยป\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Nomรฉs %d tros disponible.\n"
 msgstr[1] "Nomรฉs %d trossos disponibles.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "No hi ha cap altre tros a cercar\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "Cerca per expressiรณ regular? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Expressiรณ regular de cerca mal formada %s: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
 msgstr "No hi ha trossos que coincideixin amb el patrรณ donat\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "Sense tros previ\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "No hi ha tros segรผent\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "No es pot dividir aquest tros\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Divideix en %d tros.\n"
 msgstr[1] "Divideix en %d trossos.\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "No es pot editar aquest tros\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Reviseu les diferรจncies"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23336,19 +23939,19 @@ msgstr ""
 "add untracked - afegeix el contingut dels fitxers no seguits al conjunt de "
 "canvis ยซstagedยป\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "manca --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "desconegut --patch mode: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument %s no vร lid, s'esperava --"
@@ -23716,154 +24319,3 @@ msgstr "S'estร  ometent %s amb el sufix de cรฒpia de seguretat ยซ%sยป.\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Esteu segur que voleu enviar %s? [y|N]: "
-
-#, fuzzy
-#~ msgid "hash version %X does not match version %X"
-#~ msgstr "el camรญ ยซ%sยป no tรฉ la seva versiรณ"
-
-#~ msgid "option '%s' requires a value"
-#~ msgstr "l'opciรณ ยซ%sยป requereix un valor"
-
-#~ msgid "Server supports multi_ack_detailed"
-#~ msgstr "El servidor accepta multi_ack_detailed"
-
-#~ msgid "Server supports no-done"
-#~ msgstr "El servidor accepta no-done"
-
-#~ msgid "Server supports multi_ack"
-#~ msgstr "El servidor accepta multi_ack"
-
-#~ msgid "Server supports side-band-64k"
-#~ msgstr "El servidor accepta side-band-64k"
-
-#~ msgid "Server supports side-band"
-#~ msgstr "El servidor accepta banda lateral"
-
-#~ msgid "Server supports allow-tip-sha1-in-want"
-#~ msgstr "El servidor accepta allow-tip-sha1-in-want"
-
-#~ msgid "Server supports allow-reachable-sha1-in-want"
-#~ msgstr "El servidor accepta allow-reachable-sha1-in-want"
-
-#~ msgid "Server supports ofs-delta"
-#~ msgstr "El servidor accepta ofs-delta"
-
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD separat a %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD separat de %s)"
-
-#~ msgid "could not transform the todo list"
-#~ msgstr "no s'ha pogut transformar la llista per a fer"
-
-#~ msgid "Checking out files"
-#~ msgstr "S'estan agafant fitxers"
-
-#~ msgid "cannot be interactive without stdin connected to a terminal."
-#~ msgstr ""
-#~ "no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-
-#~ msgid "failed to stat %s\n"
-#~ msgstr "s'ha produรฏt un error en fer stat a '%s'\n"
-
-#~ msgid ""
-#~ "If you wish to skip this commit, use:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-#~ "the remaining commits.\n"
-#~ msgstr ""
-#~ "Si voleu ometre aquesta comissiรณ, useu:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "Llavors \"git cherry-pick --continue\" reprendrร \n"
-#~ "com a ยซcherry pickยป les comissions restants.\n"
-
-#~ msgid "default"
-#~ msgstr "per defecte"
-
-#~ msgid "Could not create directory '%s'"
-#~ msgstr "No s'ha pogut crear el directori ยซ%sยป"
-
-#~ msgid "unrecognized verb: %s"
-#~ msgstr "parร metre no reconegut: %s"
-
-#~ msgid "could not open %s"
-#~ msgstr "no s'ha pogut obrir ยซ%sยป"
-
-#~ msgid "Could not move back to $head_name"
-#~ msgstr "No s'ha pogut tornar a $head_name"
-
-#~ msgid ""
-#~ "It seems that there is already a $state_dir_base directory, and\n"
-#~ "I wonder if you are in the middle of another rebase.  If that is the\n"
-#~ "case, please try\n"
-#~ "\t$cmd_live_rebase\n"
-#~ "If that is not the case, please\n"
-#~ "\t$cmd_clear_stale_rebase\n"
-#~ "and run me again.  I am stopping in case you still have something\n"
-#~ "valuable there."
-#~ msgstr ""
-#~ "Sembla que ja hi ha un directori $state_dir_base, i\n"
-#~ "em pregunto si esteu enmig d'un altre ยซrebaseยป. Si aquest รฉs el\n"
-#~ "cas, proveu\n"
-#~ "\t$cmd_live_rebase\n"
-#~ "Si no รฉs el cas, \n"
-#~ "\t$cmd_clear_stale_rebase\n"
-#~ "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
-#~ "de valor."
-
-#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
-#~ msgstr "fatal: no es pot combinar ยซ--signoffยป amb ยซ--preserve-mergesยป"
-
-#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr "fatal: no es pot combinar ยซ--preserve-mergesยป amb ยซ--rebase-mergesยป"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr "fatal: no es pot combinar ยซ--rebase-mergesยป amb ยซ--strategy-optionยป"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
-#~ msgstr "fatal: no es pot combinar ยซ--rebase-mergesยป amb ยซ--strategyยป"
-
-#, fuzzy
-#~ msgid "invalid upstream '$upstream_name'"
-#~ msgstr "font no vร lida $upstream_name"
-
-#~ msgid "$onto_name: there are more than one merge bases"
-#~ msgstr "$onto_name: ja hi ha mรฉs d'una base de fusiรณ"
-
-#~ msgid "$onto_name: there is no merge base"
-#~ msgstr "$onto_name: no hi ha cap base de fusiรณ"
-
-#~ msgid "Does not point to a valid commit: $onto_name"
-#~ msgstr "No assenyala una comissiรณ vร lida: $onto_name"
-
-#, fuzzy
-#~ msgid "fatal: no such branch/commit '$branch_name'"
-#~ msgstr "fatal: no hi ha tal branca: $branch_name"
-
-#~ msgid "Created autostash: $stash_abbrev"
-#~ msgstr "S'ha creat un magatzem automร tic: $stash_abbrev"
-
-#~ msgid "Current branch $branch_name is up to date."
-#~ msgstr "La branca actual $branch_name estร  al dia."
-
-#~ msgid "Current branch $branch_name is up to date, rebase forced."
-#~ msgstr "La branca actual $branch_name estร  al dia; ยซrebaseยป forรงat."
-
-#~ msgid "Changes to $onto:"
-#~ msgstr "Canvis a $onto:"
-
-#~ msgid "Changes from $mb to $onto:"
-#~ msgstr "Canvis de $mb a $onto:"
-
-#~ msgid "Fast-forwarded $branch_name to $onto_name."
-#~ msgstr "S'ha avanรงat $branch_name rร pidament a $onto_name."
-
-#~ msgid "First, rewinding head to replay your work on top of it..."
-#~ msgstr ""
-#~ "Primer, s'estร  rebobinant HEAD per a reproduir el vostre treball al "
-#~ "damunt..."
diff --git a/third_party/git/po/de.po b/third_party/git/po/de.po
index 6d80cfb158a0..cfe50c1055ac 100644
--- a/third_party/git/po/de.po
+++ b/third_party/git/po/de.po
@@ -1,15 +1,15 @@
 # German translations for Git.
 # Copyright (C) 2019 Matthias Rรผster <matthias.ruester@gmail.com>
 # This file is distributed under the same license as the Git package.
-# Matthias Rรผster <matthias.ruester@gmail.com>, 2019.
+# Matthias Rรผster <matthias.ruester@gmail.com>, 2019-2020.
 # Ralf Thielow <ralf.thielow@gmail.com>, 2010-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 20:12+0800\n"
-"PO-Revision-Date: 2016-11-28 18:10+0100\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-14 22:34+0100\n"
 "Last-Translator: Matthias Rรผster <matthias.ruester@gmail.com>\n"
 "Language-Team: Matthias Rรผster <matthias.ruester@gmail.com>\n"
 "Language: de\n"
@@ -18,43 +18,748 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Wie bitte (%s)?"
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "Index konnte nicht gelesen werden"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "Binรคr"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "Nichts"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "unverรคndert"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "Konnte '%s' nicht zum Commit vormerken."
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "Konnte Index nicht schreiben."
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "%d Pfad aktualisiert\n"
+msgstr[1] "%d Pfade aktualisiert\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "Hinweis: %s ist nun unversioniert.\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry fรผr Pfad '%s' fehlgeschlagen"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "Revert"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "Konnte HEAD^{tree} nicht parsen."
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "%d Pfad wiederhergestellt\n"
+msgstr[1] "%d Pfade wiederhergestellt\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Keine unversionierten Dateien.\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "unversionierte Dateien hinzufรผgen"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "%d Pfad hinzugefรผgt\n"
+msgstr[1] "%d Pfade hinzugefรผgt\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "Ignoriere nicht zusammengefรผhrte Datei: %s"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Nur Binรคrdateien geรคndert.\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "Keine ร„nderungen.\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "Patch Aktualisierung"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "Diff รผberprรผfen"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "Zeige Pfade mit ร„nderungen"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr "Zustand des Arbeitsverzeichnisses zum Commit vormerken"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "Zum Commit vorgemerkte ร„nderungen auf HEAD-Version zurรผcksetzen"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr "Blรถcke und ร„nderung gezielt auswรคhlen"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "Differenz zwischen HEAD und Index ansehen"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "Inhalte von unversionierten Dateien zum Commit vormerken"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "Hilfe fรผr Eingaben:"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "Ein einzelnes Element auswรคhlen"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "Eine Reihe von Elementen auswรคhlen"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "Mehrere Reihen auswรคhlen"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "Element basierend auf eindeutigen Prรคfix auswรคhlen"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "Angegebene Elemente abwรคhlen"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "Alle Elemente auswรคhlen"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "(leer) Auswรคhlen beenden"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "Ein nummeriertes Element auswรคhlen"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "(leer) nichts auswรคhlen"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** Befehle ***"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "Was nun"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "zur Staging-Area hinzugefรผgt"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "aus Staging-Area entfernt"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "Pfad"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "Index konnte nicht aktualisiert werden"
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "Tschรผss.\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Modusรคnderung der Staging-Area hinzufรผgen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Lรถschung der Staging-Area hinzufรผgen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block der Staging-Area hinzufรผgen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete "
+"Patch-Block direkt fรผr die Staging-Area markiert."
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block zum Commit vormerken\n"
+"n - diesen Patch-Block nicht zum Commit vormerken\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blรถcke nicht zum Commit "
+"vormerken\n"
+"a - diesen und alle weiteren Patch-Blรถcke dieser Datei zum Commit vormerken\n"
+"d - diesen oder alle weiteren Patch-Blรถcke in dieser Datei nicht zum Commit "
+"vormerken\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Modusรคnderung stashen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Lรถschung stashen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete "
+"Patch-Block direkt zum Stashen markiert."
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block stashen\n"
+"n - diesen Patch-Block nicht stashen\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blรถcke nicht stashen\n"
+"a - diesen und alle weiteren Patch-Blรถcke dieser Datei stashen\n"
+"d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht stashen\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Modusรคnderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Lรถschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete "
+"Patch-Block direkt zum Entfernen aus der Staging-Area markiert."
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block aus Staging-Area entfernen\n"
+"n - diesen Patch-Block nicht aus Staging-Area entfernen\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blรถcke nicht aus Staging-"
+"Area entfernen\n"
+"a - diesen und alle weiteren Patch-Blรถcke dieser Datei aus Staging-Area "
+"entfernen\n"
+"d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht aus Staging-"
+"Area entfernen\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Modusรคnderung auf Index anwenden [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Lรถschung auf Index anwenden [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete "
+"Patch-Block direkt zum Anwenden markiert."
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block auf den Index anwenden\n"
+"n - diesen Patch-Block nicht auf den Index anwenden\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blรถcke nicht auf den Index "
+"anwenden\n"
+"a - diesen und alle weiteren Patch-Blรถcke dieser Datei auf den Index "
+"anwenden\n"
+"d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht auf den Index "
+"anwenden\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Modusรคnderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Lรถschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete "
+"Patch-Block direkt zum Verwerfen markiert."
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n"
+"n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blรถcke nicht im "
+"Arbeitsverzeichnis verwerfen\n"
+"a - diesen und alle weiteren Patch-Blรถcke dieser Datei im Arbeitsverzeichnis "
+"verwerfen\n"
+"d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht im "
+"Arbeitsverzeichnis verwerfen\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Modusรคnderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Lรถschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n"
+"n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blรถcke nicht verwerfen\n"
+"a - diesen und alle weiteren Patch-Blรถcke in der Datei verwerfen\n"
+"d - diesen oder alle weiteren Patch-Blรถcke in der Datei nicht verwerfen\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Modusรคnderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Lรถschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block im Index und auf das Arbeitsverzeichnis anwenden\n"
+"n - diesen Patch-Block nicht im Index und auf das Arbeitsverzeichnis "
+"anwenden\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blรถcke nicht anwenden\n"
+"a - diesen und alle weiteren Patch-Blรถcke in der Datei anwenden\n"
+"d - diesen oder alle weiteren Patch-Blรถcke in der Datei nicht anwenden\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n"
+"n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n"
+"q - Beenden; diesen und alle verbleibenden Patch-Blรถcke nicht anwenden\n"
+"a - diesen und alle weiteren Patch-Blรถcke in der Datei anwenden\n"
+"d - diesen und alle weiteren Patch-Blรถcke in der Datei nicht anwenden\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "Konnte Block-Header '%.*s' nicht parsen."
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "Konnte farbigen Block-Header '%.*s' nicht parsen."
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "Konnte Differenz nicht parsen."
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "Konnte farbige Differenz nicht parsen."
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "'%s' konnte nicht ausgefรผhrt werden"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "nicht รผbereinstimmende Ausgabe von interactive.diffFilter"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Der Filter muss eine Eins-zu-Eins-Beziehung\n"
+"zwischen den Ein- und Ausgabe-Zeilen einhalten."
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"Erwartete Kontextzeile #%d in\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"Patch-Blรถcke รผberlappen sich nicht:\n"
+"%.*s\n"
+"\tendet nicht mit:\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+"Manueller Editiermodus fรผr Patch-Blรถcke -- siehe nach unten fรผr eine\n"
+"Kurzanleitung.\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Um '%c' Zeilen zu entfernen, machen Sie aus diesen ' ' Zeilen (Kontext).\n"
+"Um '%c' Zeilen zu entfernen, lรถschen Sie diese.\n"
+"Zeilen, die mit %c beginnen, werden entfernt.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Wenn das nicht sauber angewendet werden kann, haben Sie die Mรถglichkeit\n"
+"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt "
+"werden,\n"
+"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverรคndert.\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "Konnte Block-Header nicht parsen."
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' schlug fehl."
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
+"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr ""
+"Die ausgewรคhlten Patch-Blรถcke kรถnnen nicht auf den Index angewendet werden!"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "Nichts angewendet.\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - diesen Patch-Block unbestimmt lassen, nรคchsten unbestimmten Patch-Block "
+"anzeigen\n"
+"J - diesen Patch-Block unbestimmt lassen, nรคchsten Patch-Block anzeigen\n"
+"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-"
+"Block anzeigen\n"
+"K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n"
+"g - Patch-Block zum Hinspringen auswรคhlen\n"
+"/ - nach Patch-Block suchen, der gegebenem regulรคrem Ausdruck entspricht\n"
+"s - aktuellen Patch-Block in kleinere Patch-Blรถcke aufteilen\n"
+"e - aktuellen Patch-Block manuell editieren\n"
+"? - Hilfe anzeigen\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "Kein vorheriger Patch-Block"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "Kein folgender Patch-Block"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "Keine anderen Patch-Blรถcke verbleibend"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "zu welchem Patch-Block springen (<Enter> fรผr mehr Informationen)? "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "zu welchem Patch-Block springen? "
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Ungรผltige Nummer: '%s'"
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Entschuldigung, nur %d Patch-Block verfรผgbar."
+msgstr[1] "Entschuldigung, nur %d Patch-Blรถcke verfรผgbar."
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "Keine anderen Patch-Blรถcke zum Durchsuchen"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "Suche nach regulรคrem Ausdruck? "
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Fehlerhafter regulรคrer Ausdruck fรผr Suche %s: %s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "Kein Patch-Block entspricht dem angegebenen Muster"
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "In %d Patch-Block aufgeteilt."
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "'git apply' schlug fehl"
+
+#: advice.c:115
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sHinweis: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:168
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "Cherry-Picken ist nicht mรถglich, weil Sie nicht zusammengefรผhrte Dateien "
 "haben."
 
-#: advice.c:164
+#: advice.c:170
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 "Committen ist nicht mรถglich, weil Sie nicht zusammengefรผhrte Dateien haben."
 
-#: advice.c:166
+#: advice.c:172
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 "Mergen ist nicht mรถglich, weil Sie nicht zusammengefรผhrte Dateien haben."
 
-#: advice.c:168
+#: advice.c:174
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 "Pullen ist nicht mรถglich, weil Sie nicht zusammengefรผhrte Dateien haben."
 
-#: advice.c:170
+#: advice.c:176
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 "Reverten ist nicht mรถglich, weil Sie nicht zusammengefรผhrte Dateien haben."
 
-#: advice.c:172
+#: advice.c:178
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "%s ist nicht mรถglich, weil Sie nicht zusammengefรผhrte Dateien haben."
 
-#: advice.c:180
+#: advice.c:186
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -63,23 +768,23 @@ msgstr ""
 "dann 'git add/rm <Datei>', um die Auflรถsung entsprechend zu markieren\n"
 "und zu committen."
 
-#: advice.c:188
+#: advice.c:194
 msgid "Exiting because of an unresolved conflict."
 msgstr "Beende wegen unaufgelรถstem Konflikt."
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:199 builtin/merge.c:1335
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
 
-#: advice.c:195
+#: advice.c:201
 msgid "Please, commit your changes before merging."
 msgstr "Bitte committen Sie Ihre ร„nderungen, bevor Sie mergen."
 
-#: advice.c:196
+#: advice.c:202
 msgid "Exiting because of unfinished merge."
 msgstr "Beende wegen nicht abgeschlossenem Merge."
 
-#: advice.c:202
+#: advice.c:208
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -212,17 +917,7 @@ msgstr "Ungรผltiger Modus in Zeile %d: %s"
 msgid "inconsistent header lines %d and %d"
 msgstr "Inkonsistente Kopfzeilen %d und %d."
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: unerwartete Zeile: %.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -237,72 +932,82 @@ msgstr[1] ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
 "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile "
 "%d)"
 
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: unerwartete Zeile: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "neue Datei hรคngt von alten Inhalten ab"
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "entfernte Datei hat noch Inhalte"
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "fehlerhafter Patch bei Zeile %d"
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "neue Datei %s hรคngt von alten Inhalten ab"
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "entfernte Datei %s hat noch Inhalte"
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "fehlerhafter Binรคr-Patch bei Zeile %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "nicht erkannter Binรคr-Patch bei Zeile %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "konnte symbolische Verknรผpfung %s nicht lesen"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "konnte %s nicht รถffnen oder lesen"
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "Ungรผltiger Zeilenanfang: '%c'"
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -310,12 +1015,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
 msgstr[1] ""
 "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -324,25 +1029,25 @@ msgstr ""
 "bei der Suche nach:\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "keine Daten in Binรคr-Patch fรผr '%s'"
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "kann binรคren Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n"
 "umgekehrten Patch-Block auf '%s'"
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "kann binรคren Patch auf '%s' nicht ohne eine vollstรคndige Index-Zeile anwenden"
 
-#: apply.c:3151
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -350,441 +1055,427 @@ msgstr ""
 "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
 "entspricht"
 
-#: apply.c:3159
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist"
 
-#: apply.c:3177
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "das erforderliche Postimage %s fรผr '%s' kann nicht gelesen werden"
 
-#: apply.c:3190
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "Konnte Binรคr-Patch nicht auf '%s' anwenden"
 
-#: apply.c:3196
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "Binรคr-Patch fรผr '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
 
-#: apply.c:3217
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
 
-#: apply.c:3340
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kann %s nicht auschecken"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
 #, c-format
 msgid "failed to read %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: apply.c:3400
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' ist hinter einer symbolischen Verknรผpfung"
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "Pfad %s wurde umbenannt/gelรถscht"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s ist nicht im Index"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s entspricht nicht der Version im Index"
 
-#: apply.c:3559
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n"
 "zurรผckzufallen."
 
-#: apply.c:3562
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Falle zurรผck auf 3-Wege-Merge ...\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
 
-#: apply.c:3594
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Fehler beim Zurรผckfallen auf 3-Wege-Merge...\n"
 
-#: apply.c:3608
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
 
-#: apply.c:3613
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch auf '%s' sauber angewendet.\n"
 
-#: apply.c:3639
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "Lรถsch-Patch hinterlรคsst Dateiinhalte"
 
-#: apply.c:3712
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: falscher Typ"
 
-#: apply.c:3714
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ist vom Typ %o, erwartete %o"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr "Ungรผltiger Pfad '%s'"
 
-#: apply.c:3923
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s ist bereits bereitgestellt"
 
-#: apply.c:3926
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s existiert bereits im Arbeitsverzeichnis"
 
-#: apply.c:3946
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
 
-#: apply.c:3951
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
 
-#: apply.c:3971
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknรผpfung"
 
-#: apply.c:3975
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: Patch konnte nicht angewendet werden"
 
-#: apply.c:3990
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Prรผfe Patch %s ..."
 
-#: apply.c:4082
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar fรผr Submodul %s"
 
-#: apply.c:4089
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "Modusรคnderung fรผr %s, was sich nicht im aktuellen HEAD befindet"
 
-#: apply.c:4092
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry fรผr Pfad '%s' fehlgeschlagen"
-
-#: apply.c:4101
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "konnte %s nicht zum temporรคren Index hinzufรผgen"
 
-#: apply.c:4111
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "konnte temporรคren Index nicht nach %s schreiben"
 
-#: apply.c:4249
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "konnte %s nicht aus dem Index entfernen"
 
-#: apply.c:4283
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "fehlerhafter Patch fรผr Submodul %s"
 
-#: apply.c:4289
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "konnte neu erstellte Datei '%s' nicht lesen"
 
-#: apply.c:4297
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "kann internen Speicher fรผr eben erstellte Datei %s nicht erzeugen"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kann fรผr %s keinen Eintrag in den Zwischenspeicher hinzufรผgen"
 
-#: apply.c:4346
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "Fehler beim Schreiben nach '%s'"
 
-#: apply.c:4350
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr "schlieรŸe Datei '%s'"
 
-#: apply.c:4420
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
 
-#: apply.c:4518
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s sauber angewendet"
 
-#: apply.c:4526
+#: apply.c:4539
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: apply.c:4529
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Wende Patch %%s mit %d Zurรผckweisung an..."
 msgstr[1] "Wende Patch %%s mit %d Zurรผckweisungen an..."
 
-#: apply.c:4540
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "Verkรผrze Name von .rej Datei zu %.*s.rej"
 
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
 #, c-format
 msgid "cannot open %s"
 msgstr "kann '%s' nicht รถffnen"
 
-#: apply.c:4562
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Patch-Bereich #%d sauber angewendet."
 
-#: apply.c:4566
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Patch-Block #%d zurรผckgewiesen."
 
-#: apply.c:4676
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ausgelassen."
 
-#: apply.c:4684
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr "nicht erkannte Eingabe"
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr "Konnte Index-Datei nicht lesen"
 
-#: apply.c:4859
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kann Patch '%s' nicht รถffnen: %s"
 
-#: apply.c:4886
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "unterdrรผckte %d Whitespace-Fehler"
 msgstr[1] "unterdrรผckte %d Whitespace-Fehler"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d Zeile fรผgt Whitespace-Fehler hinzu."
 msgstr[1] "%d Zeilen fรผgen Whitespace-Fehler hinzu."
 
-#: apply.c:4900
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet."
 msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "Pfad"
-
-#: apply.c:4944
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr "keine ร„nderungen im angegebenen Pfad anwenden"
 
-#: apply.c:4947
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr "ร„nderungen nur im angegebenen Pfad anwenden"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4973 builtin/am.c:2260
 msgid "num"
 msgstr "Anzahl"
 
-#: apply.c:4950
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "<Anzahl> vorangestellte Schrรคgstriche von herkรถmmlichen Differenzpfaden "
 "entfernen"
 
-#: apply.c:4953
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr "hinzugefรผgte Zeilen des Patches ignorieren"
 
-#: apply.c:4955
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "anstatt der Anwendung des Patches, den \"diffstat\" fรผr die Eingabe "
 "ausgegeben"
 
-#: apply.c:4959
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "die Anzahl von hinzugefรผgten/entfernten Zeilen in Dezimalnotation anzeigen"
 
-#: apply.c:4961
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 "anstatt der Anwendung des Patches, eine Zusammenfassung fรผr die Eingabe "
 "ausgeben"
 
-#: apply.c:4963
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
 
-#: apply.c:4965
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "neue Dateien mit `git add --intent-to-add` markieren"
 
-#: apply.c:4969
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr "Patch anwenden, ohne ร„nderungen im Arbeitsverzeichnis vorzunehmen"
 
-#: apply.c:4971
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 "Patch anwenden, der ร„nderungen auรŸerhalb des Arbeitsverzeichnisses vornimmt"
 
-#: apply.c:4974
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
 
-#: apply.c:4976
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
 
-#: apply.c:4978
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "einen temporรคren Index, basierend auf den integrierten Index-Informationen, "
 "erstellen"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr "Pfade sind getrennt durch NUL Zeichen"
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 "sicher stellen, dass mindestens <n> Zeilen des Kontextes รผbereinstimmen"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
 msgid "action"
 msgstr "Aktion"
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "neue oder geรคnderte Zeilen, die Whitespace-Fehler haben, ermitteln"
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
 msgstr "ร„nderungen im Whitespace bei der Suche des Kontextes ignorieren"
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr "den Patch in umgekehrter Reihenfolge anwenden"
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "don't expect at least one line of context"
 msgstr "keinen Kontext erwarten"
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 "zurรผckgewiesene Patch-Blรถcke in entsprechenden *.rej Dateien hinterlassen"
 
-#: apply.c:5000
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr "sich รผberlappende Patch-Blรถcke erlauben"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "erweiterte Ausgaben"
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
 
-#: apply.c:5006
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5032 builtin/am.c:2248
 msgid "root"
 msgstr "Wurzelverzeichnis"
 
-#: apply.c:5009
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
 
@@ -807,7 +1498,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien รผberein"
@@ -839,7 +1530,7 @@ msgstr "Format"
 msgid "archive format"
 msgstr "Archivformat"
 
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr "Prรคfix"
 
@@ -847,11 +1538,12 @@ msgstr "Prรคfix"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "einen Prรคfix vor jeden Pfadnamen in dem Archiv stellen"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr "Datei"
 
@@ -884,7 +1576,7 @@ msgid "list supported archive formats"
 msgstr "unterstรผtzte Archivformate auflisten"
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr "Repository"
 
@@ -892,7 +1584,7 @@ msgstr "Repository"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "Archiv vom Remote-Repository <Repository> abrufen"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "Programm"
@@ -923,66 +1615,66 @@ msgstr "Unbekanntes Archivformat '%s'"
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument fรผr Format '%s' nicht unterstรผtzt: -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:351
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "Kann Blob %s nicht streamen."
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:369
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "Nicht unterstรผtzter Dateimodus: 0%o (SHA1: %s)"
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:359
 #, c-format
 msgid "cannot read %s"
 msgstr "Kann %s nicht lesen."
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "Konnte '%s' Filter nicht starten."
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr "Konnte Descriptor nicht umleiten."
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' Filter meldete Fehler."
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "Pfad ist kein gรผltiges UTF-8: %s"
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s"
 
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
 #, c-format
 msgid "deflate error (%d)"
 msgstr "Fehler beim Komprimieren (%d)"
 
-#: archive-zip.c:609
+#: archive-zip.c:615
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "Timestamp zu groรŸ fรผr dieses System: %<PRIuMAX>"
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s ist kein gรผltiger Attributname"
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s nicht erlaubt: %s:%d"
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1000,12 +1692,12 @@ msgstr "Ungรผltiger Inhalt bzgl. Anfรผhrungszeichen in Datei '%s': %s"
 msgid "We cannot bisect more!\n"
 msgstr "Keine binรคre Suche mehr mรถglich!\n"
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s ist kein gรผltiger Commit-Name"
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1014,7 +1706,7 @@ msgstr ""
 "Die Merge-Basis %s ist fehlerhaft.\n"
 "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1023,7 +1715,7 @@ msgstr ""
 "Die Merge-Basis %s ist neu.\n"
 "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geรคndert.\n"
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1032,7 +1724,7 @@ msgstr ""
 "Die Merge-Basis %s ist %s.\n"
 "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1043,7 +1735,7 @@ msgstr ""
 "git bisect kann in diesem Fall nicht richtig arbeiten.\n"
 "Vielleicht verwechselten Sie %s und %s Commits?\n"
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1055,36 +1747,36 @@ msgstr ""
 "erste %s Commit zwischen %s und %s befindet.\n"
 "Es wird dennoch fortgesetzt."
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "binรคre Suche: eine Merge-Basis muss geprรผft werden\n"
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr "ein %s Commit wird benรถtigt"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
 #, c-format
 msgid "could not create file '%s'"
 msgstr "konnte Datei '%s' nicht erstellen"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
 #, c-format
 msgid "could not read file '%s'"
 msgstr "Konnte Datei '%s' nicht lesen"
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr "Lesen von Referenzen fรผr binรคre Suche fehlgeschlagen"
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s war sowohl %s als auch %s\n"
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1093,7 +1785,7 @@ msgstr ""
 "Kein testbarer Commit gefunden.\n"
 "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1103,50 +1795,50 @@ msgstr[1] "(ungefรคhr %d Schritte)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "binรคre Suche: danach noch %d Commit zum Testen รผbrig %s\n"
 msgstr[1] "binรคre Suche: danach noch %d Commits zum Testen รผbrig %s\n"
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents und --reverse funktionieren gemeinsam nicht."
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr ""
 "kann --contents nicht mit endgรผltigem Namen des Commit-Objektes benutzen"
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse und --first-parent zusammen erfordern die Angabe eines "
 "endgรผltigen\n"
 "Commits"
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
 "\"first-parent\"-Kette"
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr "Pfad %s nicht in %s"
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "kann Blob %s fรผr Pfad '%s' nicht lesen"
@@ -1303,8 +1995,8 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
 #, c-format
 msgid "could not open '%s'"
 msgstr "Konnte '%s' nicht รถffnen"
@@ -1335,62 +2027,62 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Das Paket benรถtigt diese Referenz:"
 msgstr[1] "Das Paket benรถtigt diese %d Referenzen:"
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr "Konnte dup fรผr Descriptor des Pakets nicht ausfรผhren."
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "Konnte Paketobjekte nicht erstellen"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "Erstellung der Paketobjekte abgebrochen"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "\"rev-list\" abgebrochen"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "nicht erkanntes Argument: %s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "Erstellung eines leeren Pakets zurรผckgewiesen."
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kann '%s' nicht erstellen"
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "Erstellung der Paketindexdatei abgebrochen"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "Ungรผltiger Farbwert: %.*s"
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "konnte %s nicht parsen"
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s ist kein Commit!"
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1411,28 +2103,28 @@ msgstr ""
 "Sie kรถnnen diese Meldung unterdrรผcken, indem Sie\n"
 "\"git config advice.graftFileDeprecated false\" ausfรผhren."
 
-#: commit.c:1127
+#: commit.c:1153
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Commit %s hat eine nicht vertrauenswรผrdige GPG-Signatur, angeblich von %s."
 
-#: commit.c:1130
+#: commit.c:1157
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s hat eine ungรผltige GPG-Signatur, angeblich von %s."
 
-#: commit.c:1133
+#: commit.c:1160
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s hat keine GPG-Signatur."
 
-#: commit.c:1136
+#: commit.c:1163
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Commit %s hat eine gรผltige GPG-Signatur von %s\n"
 
-#: commit.c:1390
+#: commit.c:1417
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1444,167 +2136,177 @@ msgstr ""
 "Encoding,\n"
 "welches von ihrem Projekt verwendet wird.\n"
 
-#: commit-graph.c:127
+#: commit-graph.c:122
 msgid "commit-graph file is too small"
 msgstr "Commit-Graph-Datei ist zu klein."
 
-#: commit-graph.c:192
+#: commit-graph.c:189
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X รผberein."
 
-#: commit-graph.c:199
+#: commit-graph.c:196
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X รผberein."
 
-#: commit-graph.c:206
+#: commit-graph.c:203
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X รผberein."
 
-#: commit-graph.c:229
+#: commit-graph.c:226
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr ""
 "fehlender Tabelleneintrag fรผr Commit-Graph Chunk-Lookup; Datei "
 "mรถglicherweise unvollstรคndig"
 
-#: commit-graph.c:240
+#: commit-graph.c:237
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "Unzulรคssiger Commit-Graph Chunk-Offset %08x%08x"
 
-#: commit-graph.c:283
+#: commit-graph.c:280
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor."
 
-#: commit-graph.c:347
+#: commit-graph.c:343
 msgid "commit-graph has no base graphs chunk"
 msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
 
-#: commit-graph.c:357
+#: commit-graph.c:353
 msgid "commit-graph chain does not match"
 msgstr "Commit-Graph Verkettung stimmt nicht รผberein."
 
-#: commit-graph.c:404
+#: commit-graph.c:401
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "Ungรผltige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
 
-#: commit-graph.c:430
+#: commit-graph.c:425
 msgid "unable to find all commit-graph files"
 msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
 
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:558 commit-graph.c:618
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "Ungรผltige Commit-Position. Commit-Graph ist wahrscheinlich beschรคdigt."
 
-#: commit-graph.c:575
+#: commit-graph.c:579
 #, c-format
 msgid "could not find commit %s"
 msgstr "Konnte Commit %s nicht finden."
 
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "Konnte Commit '%s' nicht parsen."
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
 
-#: commit-graph.c:1034
+#: commit-graph.c:1043
 msgid "Loading known commits in commit graph"
 msgstr "Lade bekannte Commits in Commit-Graph"
 
-#: commit-graph.c:1051
+#: commit-graph.c:1060
 msgid "Expanding reachable commits in commit graph"
 msgstr "Erweitere erreichbare Commits in Commit-Graph"
 
-#: commit-graph.c:1070
+#: commit-graph.c:1079
 msgid "Clearing commit marks in commit graph"
 msgstr "Lรถsche Commit-Markierungen in Commit-Graph"
 
-#: commit-graph.c:1089
+#: commit-graph.c:1098
 msgid "Computing commit graph generation numbers"
-msgstr "Commit-Graph Generierungsnummern berechnen"
+msgstr "Commit-Graph Generationsnummern berechnen"
 
-#: commit-graph.c:1163
+#: commit-graph.c:1173
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Suche Commits fรผr Commit-Graph in %d Paket"
 msgstr[1] "Suche Commits fรผr Commit-Graph in %d Paketen"
 
-#: commit-graph.c:1176
+#: commit-graph.c:1186
 #, c-format
 msgid "error adding pack %s"
 msgstr "Fehler beim Hinzufรผgen von Paket %s."
 
-#: commit-graph.c:1180
+#: commit-graph.c:1190
 #, c-format
 msgid "error opening index for %s"
 msgstr "Fehler beim ร–ffnen des Index fรผr %s."
 
-#: commit-graph.c:1204
+#: commit-graph.c:1214
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
 msgstr[0] "Suche Commits fรผr Commit-Graph in %d Referenz"
 msgstr[1] "Suche Commits fรผr Commit-Graph in %d Referenzen"
 
-#: commit-graph.c:1238
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "ungรผltige Commit-Objekt-ID: %s"
+
+#: commit-graph.c:1249
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Suche Commits fรผr Commit-Graph in gepackten Objekten"
 
-#: commit-graph.c:1253
+#: commit-graph.c:1264
 msgid "Counting distinct commits in commit graph"
 msgstr "Zรคhle Commits in Commit-Graph"
 
-#: commit-graph.c:1284
+#: commit-graph.c:1294
 msgid "Finding extra edges in commit graph"
 msgstr "Suche zusรคtzliche Rรคnder in Commit-Graph"
 
-#: commit-graph.c:1332
+#: commit-graph.c:1340
 msgid "failed to write correct number of base graph ids"
 msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
 
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1373 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "Konnte fรผhrende Verzeichnisse von '%s' nicht erstellen."
 
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr "konnte '%s' nicht erstellen"
 
-#: commit-graph.c:1437
+#: commit-graph.c:1445
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Schreibe Commit-Graph in %d Durchgang"
 msgstr[1] "Schreibe Commit-Graph in %d Durchgรคngen"
 
-#: commit-graph.c:1478
+#: commit-graph.c:1486
 msgid "unable to open commit-graph chain file"
 msgstr "Konnte Commit-Graph Chain-Datei nicht รถffnen."
 
-#: commit-graph.c:1490
+#: commit-graph.c:1498
 msgid "failed to rename base commit-graph file"
 msgstr "Konnte Basis-Commit-Graph-Datei nicht umbenennen."
 
-#: commit-graph.c:1510
+#: commit-graph.c:1518
 msgid "failed to rename temporary commit-graph file"
 msgstr "Konnte temporรคre Commit-Graph-Datei nicht umbenennen."
 
-#: commit-graph.c:1621
+#: commit-graph.c:1631
 msgid "Scanning merged commits"
 msgstr "Durchsuche zusammengefรผhrte Commits"
 
-#: commit-graph.c:1632
+#: commit-graph.c:1642
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "Unerwartete doppelte Commit-ID %s"
 
-#: commit-graph.c:1657
+#: commit-graph.c:1665
 msgid "Merging commit-graph"
 msgstr "Zusammenfรผhren von Commit-Graph"
 
@@ -1617,23 +2319,23 @@ msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben."
 msgid "too many commits to write graph"
 msgstr "Zu viele Commits zum Schreiben des Graphen."
 
-#: commit-graph.c:1945
+#: commit-graph.c:1944
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "Die Commit-Graph-Datei hat eine falsche Prรผfsumme und ist wahrscheinlich "
 "beschรคdigt."
 
-#: commit-graph.c:1955
+#: commit-graph.c:1954
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s"
 
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1964 commit-graph.c:1979
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
 
-#: commit-graph.c:1972
+#: commit-graph.c:1971
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "Konnte Commit %s von Commit-Graph nicht parsen."
@@ -1642,34 +2344,34 @@ msgstr "Konnte Commit %s von Commit-Graph nicht parsen."
 msgid "Verifying commits in commit graph"
 msgstr "Commit in Commit-Graph รผberprรผfen"
 
-#: commit-graph.c:2002
+#: commit-graph.c:2003
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "Fehler beim Parsen des Commits %s von Objekt-Datenbank fรผr Commit-Graph"
 
-#: commit-graph.c:2009
+#: commit-graph.c:2010
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "OID des Wurzelverzeichnisses fรผr Commit %s in Commit-Graph ist %s != %s"
 
-#: commit-graph.c:2019
+#: commit-graph.c:2020
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "Commit-Graph Vorgรคnger-Liste fรผr Commit %s ist zu lang"
 
-#: commit-graph.c:2028
+#: commit-graph.c:2029
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "Commit-Graph-Vorgรคnger fรผr %s ist %s != %s"
 
-#: commit-graph.c:2041
+#: commit-graph.c:2042
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "Commit-Graph Vorgรคnger-Liste fรผr Commit %s endet zu frรผh"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2047
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1677,7 +2379,7 @@ msgstr ""
 "Commit-Graph hat Generationsnummer null fรผr Commit %s, aber sonst ungleich "
 "null"
 
-#: commit-graph.c:2050
+#: commit-graph.c:2051
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1685,12 +2387,12 @@ msgstr ""
 "Commit-Graph hat Generationsnummer ungleich null fรผr Commit %s, aber sonst "
 "null"
 
-#: commit-graph.c:2065
+#: commit-graph.c:2066
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "Commit-Graph Erstellung fรผr Commit %s ist %u != %u"
 
-#: commit-graph.c:2071
+#: commit-graph.c:2072
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
@@ -1742,7 +2444,7 @@ msgstr "Schlรผssel enthรคlt keine Sektion: %s"
 msgid "key does not contain variable name: %s"
 msgstr "Schlรผssel enthรคlt keinen Variablennamen: %s"
 
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2444
 #, c-format
 msgid "invalid key: %s"
 msgstr "Ungรผltiger Schlรผssel: %s"
@@ -1886,7 +2588,7 @@ msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 "Muss einer von diesen sein: nothing, matching, simple, upstream, current"
 
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1518 builtin/pack-objects.c:3541
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "ungรผltiger Komprimierungsgrad (%d) fรผr Paketierung"
@@ -1911,117 +2613,111 @@ msgstr "Konnte Blob '%s' fรผr Konfiguration nicht auflรถsen."
 msgid "failed to parse %s"
 msgstr "Fehler beim Parsen von %s."
 
-#: config.c:1745
+#: config.c:1743
 msgid "unable to parse command-line config"
 msgstr ""
 "Konnte die รผber die Befehlszeile angegebene Konfiguration nicht parsen."
 
-#: config.c:2094
+#: config.c:2097
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
 
-#: config.c:2264
+#: config.c:2267
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Ungรผltiger %s: '%s'"
 
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-"Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'"
-
-#: config.c:2333
+#: config.c:2312
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 "
 "liegen."
 
-#: config.c:2379
+#: config.c:2358
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 "Konnte Wert '%s' aus der รผber die Befehlszeile angegebenen Konfiguration\n"
 "nicht parsen."
 
-#: config.c:2381
+#: config.c:2360
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "ungรผltige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
 
-#: config.c:2462
+#: config.c:2441
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "Ungรผltiger Sektionsname '%s'"
 
-#: config.c:2494
+#: config.c:2473
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s hat mehrere Werte"
 
-#: config.c:2523
+#: config.c:2502
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
 
-#: config.c:2775 config.c:3099
+#: config.c:2754 config.c:3078
 #, c-format
 msgid "could not lock config file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
 
-#: config.c:2786
+#: config.c:2765
 #, c-format
 msgid "opening %s"
 msgstr "ร–ffne %s"
 
-#: config.c:2821 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "Ungรผltiges Muster: %s"
 
-#: config.c:2846
+#: config.c:2825
 #, c-format
 msgid "invalid config file %s"
 msgstr "Ungรผltige Konfigurationsdatei %s"
 
-#: config.c:2859 config.c:3112
+#: config.c:2838 config.c:3091
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat auf %s fehlgeschlagen"
 
-#: config.c:2870
+#: config.c:2849
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "mmap fรผr '%s' fehlgeschlagen"
 
-#: config.c:2879 config.c:3117
+#: config.c:2858 config.c:3096
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod auf %s fehlgeschlagen"
 
-#: config.c:2964 config.c:3214
+#: config.c:2943 config.c:3193
 #, c-format
 msgid "could not write config file %s"
 msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
 
-#: config.c:2998
+#: config.c:2977
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' setzen."
 
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr "Konnte '%s' nicht aufheben."
 
-#: config.c:3090
+#: config.c:3069
 #, c-format
 msgid "invalid section name: %s"
 msgstr "Ungรผltiger Sektionsname: %s"
 
-#: config.c:3257
+#: config.c:3236
 #, c-format
 msgid "missing value for '%s'"
 msgstr "Fehlender Wert fรผr '%s'"
@@ -2148,7 +2844,7 @@ msgstr "Fehler bei der Suche nach %s (%s)"
 msgid "unknown port %s"
 msgstr "Unbekannter Port %s"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "Merkwรผrdigen Hostnamen '%s' blockiert."
@@ -2163,59 +2859,59 @@ msgstr "Merkwรผrdigen Port '%s' blockiert."
 msgid "cannot start proxy %s"
 msgstr "Kann Proxy %s nicht starten."
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "Kein Pfad angegeben; siehe 'git help pull' fรผr eine gรผltige URL-Syntax."
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr "SSH-Variante 'simple' unterstรผtzt kein -4."
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr "SSH-Variante 'simple' unterstรผtzt kein -6."
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "SSH-Variante 'simple' unterstรผtzt nicht das Setzen eines Ports."
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "Merkwรผrdigen Pfadnamen '%s' blockiert."
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr "Kann Prozess nicht starten."
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr "Prรผfe Konnektivitรคt"
 
-#: connected.c:98
+#: connected.c:110
 msgid "Could not run 'git rev-list'"
 msgstr "Konnte 'git rev-list' nicht ausfรผhren"
 
-#: connected.c:118
+#: connected.c:130
 msgid "failed write to rev-list"
 msgstr "Fehler beim Schreiben nach rev-list"
 
-#: connected.c:125
+#: connected.c:137
 msgid "failed to close rev-list's stdin"
 msgstr "Fehler beim SchlieรŸen von rev-list's Standard-Eingabe"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "Unerlaubte crlf_action %d"
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF wรผrde in %s durch LF ersetzt werden."
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2225,12 +2921,12 @@ msgstr ""
 "Die Datei wird ihre ursprรผnglichen Zeilenenden im Arbeitsverzeichnis "
 "behalten."
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF wรผrde in %s durch CRLF ersetzt werden."
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2240,19 +2936,19 @@ msgstr ""
 "Die Datei wird ihre ursprรผnglichen Zeilenenden im Arbeitsverzeichnis "
 "behalten."
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM ist in '%s' unzulรคssig, wenn als %s codiert."
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
-"Die Datei '%s' enthรคlt ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%s\n"
-"als Codierung im Arbeitsverzeichnis."
+"Die Datei '%s' enthรคlt ein Byte-Order-Mark (BOM). Bitte benutzen Sie\n"
+"UTF-%.*s als Codierung im Arbeitsverzeichnis."
 
 #: convert.c:304
 #, c-format
@@ -2269,50 +2965,50 @@ msgstr ""
 "oder UTF-%sLE (abhรคngig von der Byte-Reihenfolge) als Codierung im\n"
 "Arbeitsverzeichnis."
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "Fehler beim Codieren von '%s' von %s nach %s."
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "Die Codierung '%s' von %s nach %s und zurรผck ist nicht dasselbe."
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "Kann externen Filter '%s' nicht starten."
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "Kann Eingaben nicht an externen Filter '%s' รผbergeben."
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "Externer Filter '%s' fehlgeschlagen %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "Lesen von externem Filter '%s' fehlgeschlagen."
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "Externer Filter '%s' fehlgeschlagen."
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr "Unerwartete Filterart."
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr "Pfadname zu lang fรผr externen Filter."
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2320,67 +3016,67 @@ msgid ""
 msgstr ""
 "Externer Filter '%s' nicht mehr verfรผgbar. Nicht alle Pfade wurden gefiltert."
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false sind keine gรผltigen Codierungen im Arbeitsverzeichnis."
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: clean-Filter '%s' fehlgeschlagen."
 
-#: convert.c:1476
+#: convert.c:1489
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: smudge-Filter '%s' fehlgeschlagen."
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr "in der Zukunft"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "vor %<PRIuMAX> Sekunde"
 msgstr[1] "vor %<PRIuMAX> Sekunden"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "vor %<PRIuMAX> Minute"
 msgstr[1] "vor %<PRIuMAX> Minuten"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "vor %<PRIuMAX> Stunde"
 msgstr[1] "vor %<PRIuMAX> Stunden"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "vor %<PRIuMAX> Tag"
 msgstr[1] "vor %<PRIuMAX> Tagen"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "vor %<PRIuMAX> Woche"
 msgstr[1] "vor %<PRIuMAX> Wochen"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "vor %<PRIuMAX> Monat"
 msgstr[1] "vor %<PRIuMAX> Monaten"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2388,14 +3084,14 @@ msgstr[0] "vor %<PRIuMAX> Jahr"
 msgstr[1] "vor %<PRIuMAX> Jahren"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "%s, und %<PRIuMAX> Monat"
 msgstr[1] "%s, und %<PRIuMAX> Monaten"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2434,7 +3130,7 @@ msgstr "%d Delta-Islands markiert, fertig.\n"
 msgid "failed to read orderfile '%s'"
 msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr "Fรผhre Erkennung fรผr ungenaue Umbenennung aus"
 
@@ -2500,36 +3196,36 @@ msgstr ""
 "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "--name-only, --name-status, --check und -s schlieรŸen sich gegenseitig aus"
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S und --find-object schlieรŸen sich gegenseitig aus"
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow erfordert genau eine Pfadspezifikation"
 
-#: diff.c:4689
+#: diff.c:4676
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "Ungรผltiger --stat Wert: %s"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s erwartet einen numerischen Wert."
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2538,42 +3234,42 @@ msgstr ""
 "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "Unbekannte ร„nderungsklasse '%c' in --diff-filter=%s"
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "Unbekannter Wert nach ws-error-highlight=%.*s"
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "konnte '%s' nicht auflรถsen"
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s erwartet die Form <n>/<m>"
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s erwartet ein Zeichen, '%s' bekommen"
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "Ungรผltiges --color-moved Argument: %s"
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "Ungรผltiger Modus '%s' in --color-moved-ws"
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2581,152 +3277,152 @@ msgstr ""
 "Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr "Ungรผltiges Argument fรผr %s"
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "Ungรผltiges --word-diff Argument: %s"
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr "Diff-Optionen zu Ausgabeformaten"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr "Erzeuge Patch"
 
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr "Ausgabe der Unterschiede unterdrรผcken"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr "Erstelle Unterschiede mit <n> Zeilen des Kontextes"
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr "Erstelle Unterschiede im Rohformat"
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr "Synonym fรผr '-p --raw'"
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr "Synonym fรผr '-p --stat'"
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr "maschinenlesbare Ausgabe von --stat"
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr "nur die letzte Zeile von --stat ausgeben"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr "<Parameter1,Parameter2>..."
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "Gebe die Verteilung des relativen Umfangs der ร„nderungen fรผr jedes "
 "Unterverzeichnis aus"
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr "Synonym fรผr --dirstat=cumulative"
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "Synonym fรผr --dirstat=files,Parameter1,Parameter2..."
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "Warnen, wenn ร„nderungen Konfliktmarker oder Whitespace-Fehler einbringen"
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "Gekรผrzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
 "ร„nderungen der Datei-Rechte"
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr "nur Dateinamen der geรคnderten Dateien anzeigen"
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr "nur Dateinamen und Status der geรคnderten Dateien anzeigen"
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr "Generiere Zusammenfassung der Unterschiede"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr "<Breite>"
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Breite"
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Namens-Breite"
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Graph-Breite"
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr "<Anzahl>"
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr "Erzeuge Zusammenfassung der Unterschiede mit begrenzten Zeilen"
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr "Erzeuge kompakte Zusammenstellung in Zusammenfassung der Unterschiede"
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr "Gebe eine binรคre Differenz aus, dass angewendet werden kann"
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "Zeige vollstรคndige Objekt-Namen in den \"index\"-Zeilen"
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr "Zeige farbige Unterschiede"
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr "<Art>"
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2734,7 +3430,7 @@ msgstr ""
 "Hebe Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
 "Unterschieden hervor"
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2742,91 +3438,91 @@ msgstr ""
 "Verschleiere nicht die Pfadnamen und nutze NUL-Zeichen als Schlusszeichen in "
 "Ausgabefeldern bei --raw oder --numstat"
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr "<Prรคfix>"
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr "Zeige den gegebenen Quell-Prรคfix statt \"a/\""
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "Zeige den gegebenen Ziel-Prรคfix statt \"b/\""
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr "Stelle einen zusรคtzlichen Prรคfix bei jeder Ausgabezeile voran"
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr "Zeige keine Quell- oder Ziel-Prรคfixe an"
 
-#: diff.c:5371
+#: diff.c:5358
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "Zeige Kontext zwischen Unterschied-Blรถcken bis zur angegebenen Anzahl von "
 "Zeilen."
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr "<Zeichen>"
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "Das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "Das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "Das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr "Diff-Optionen zur Umbenennung"
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "Teile komplette Rewrite-ร„nderungen in ร„nderungen mit \"lรถschen\" und "
 "\"erstellen\""
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr "Umbenennungen erkennen"
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr "Preimage fรผr Lรถschungen weglassen."
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr "Kopien erkennen"
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr "Nutze ungeรคnderte Dateien als Quelle zum Finden von Kopien"
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr "Erkennung von Umbenennungen deaktivieren"
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
 msgstr "Nutze leere Blobs als Quelle von Umbennungen"
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
 msgstr "Fortfรผhren der Auflistung der Historie einer Datei nach Umbennung"
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2834,159 +3530,159 @@ msgstr ""
 "Verhindere die Erkennung von Umbennungen und Kopien, wenn die Anzahl der "
 "Ziele fรผr Umbennungen und Kopien das gegebene Limit รผberschreitet"
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr "Diff Algorithmus-Optionen"
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr "Erzeuge die kleinstmรถglichen ร„nderungen"
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr "Whitespace-ร„nderungen beim Vergleich von Zeilen ignorieren"
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr "ร„nderungen bei der Anzahl von Whitespace ignorieren"
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr "Whitespace-ร„nderungen am Zeilenende ignorieren"
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr "Ignoriere den Zeilenumbruch am Ende der Zeile"
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr "Ignoriere ร„nderungen in leeren Zeilen"
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "Heuristik, um Grenzen der ร„nderungsblรถcke fรผr bessere Lesbarkeit zu "
 "verschieben"
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "Erzeuge ร„nderungen durch Nutzung des Algorithmus \"Patience Diff\""
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "Erzeuge ร„nderungen durch Nutzung des Algorithmus \"Histogram Diff\""
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr "<Algorithmus>"
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr "Ein Algorithmus fรผr ร„nderungen wรคhlen"
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr "<Text>"
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "Erzeuge ร„nderungen durch Nutzung des Algorithmus \"Anchored Diff\""
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr "<Modus>"
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "Zeige Wort-ร„nderungen, nutze <Modus>, um Wรถrter abzugrenzen"
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr "<Regex>"
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr "Nutze <Regex>, um zu entscheiden, was ein Wort ist"
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "Entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
 msgstr "Verschobene Codezeilen sind andersfarbig"
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
 msgstr "Wie Whitespaces in --color-moved ignoriert werden"
 
-#: diff.c:5469
+#: diff.c:5456
 msgid "Other diff options"
 msgstr "Andere Diff-Optionen"
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "Wenn vom Unterverzeichnis aufgerufen, schlieรŸe ร„nderungen auรŸerhalb aus und "
 "zeige relative Pfade an"
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr "alle Dateien als Text behandeln"
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
 msgstr "Vertausche die beiden Eingaben und drehe die ร„nderungen um"
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 "Beende mit Exit-Status 1, wenn ร„nderungen vorhanden sind, andernfalls mit 0"
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr "Keine Ausgaben vom Programm"
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr "Erlaube die Ausfรผhrung eines externes Programms fรผr ร„nderungen"
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "Fรผhre externe Text-Konvertierungsfilter aus, wenn binรคre Dateien vergleicht "
 "werden"
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr "<wann>"
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 "ร„nderungen in Submodulen wรคhrend der Erstellung der Unterschiede ignorieren"
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr "<Format>"
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr "Angeben, wie Unterschiede in Submodulen gezeigt werden"
 
-#: diff.c:5496
+#: diff.c:5483
 msgid "hide 'git add -N' entries from the index"
 msgstr "verstecke 'git add -N' Eintrรคge vom Index"
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "Behandle 'git add -N' Eintrรคge im Index als echt"
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr "<Zeichenkette>"
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -2994,7 +3690,7 @@ msgstr ""
 "Suche nach Unterschieden, welche die Anzahl des Vorkommens der angegebenen "
 "Zeichenkette verรคndern"
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3002,25 +3698,25 @@ msgstr ""
 "Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
 "regulรคren Ausdrucks verรคndern"
 
-#: diff.c:5508
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
 msgstr "zeige alle ร„nderungen im Changeset mit -S oder -G"
 
-#: diff.c:5511
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 "behandle <Zeichenkette> bei -S als erweiterten POSIX regulรคren Ausdruck"
 
-#: diff.c:5514
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
 msgstr ""
 "kontrolliere die Reihenfolge, in der die Dateien in der Ausgabe erscheinen"
 
-#: diff.c:5515
+#: diff.c:5502
 msgid "<object-id>"
 msgstr "<Objekt-ID>"
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3028,33 +3724,33 @@ msgstr ""
 "Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
 "Objektes verรคndern"
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
 msgstr "Wรคhle Dateien anhand der Art der ร„nderung"
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr "<Datei>"
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr "Ausgabe zu einer bestimmten Datei"
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "Ungenaue Erkennung fรผr Umbenennungen wurde aufgrund zu vieler Dateien\n"
 "รผbersprungen."
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr "nur Kopien von geรคnderten Pfaden, aufgrund zu vieler Dateien, gefunden"
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3062,43 +3758,64 @@ msgstr ""
 "Sie kรถnnten die Variable %s auf mindestens %d setzen und den Befehl\n"
 "erneut versuchen."
 
-#: dir.c:537
+#: dir.c:555
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 "Pfadspezifikation '%s' stimmt mit keinen git-bekannten Dateien รผberein."
 
-#: dir.c:926
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "Unbekanntes Muster: '%s'"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "Unbekanntes verneinendes Muster: '%s'"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"Ihre Datei fรผr den partiellen Checkout hat eventuell Probleme:\n"
+"Muster '%s' wiederholt sich."
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "Deaktiviere Cone-Muster-รœbereinstimmung"
+
+#: dir.c:1173
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "Kann %s nicht als exclude-Filter benutzen."
 
-#: dir.c:1843
+#: dir.c:2144
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht รถffnen."
 
-#: dir.c:2085
+#: dir.c:2479
 msgid "failed to get kernel name and information"
 msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
 
-#: dir.c:2209
+#: dir.c:2603
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 "Cache fรผr unversionierte Dateien ist auf diesem System oder\n"
 "fรผr dieses Verzeichnis deaktiviert."
 
-#: dir.c:3013
+#: dir.c:3407
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "Index-Datei in Repository %s beschรคdigt."
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3452 dir.c:3457
 #, c-format
 msgid "could not create directories for %s"
 msgstr "Konnte Verzeichnisse fรผr '%s' nicht erstellen."
 
-#: dir.c:3092
+#: dir.c:3486
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
@@ -3117,12 +3834,12 @@ msgstr "Filtere Inhalt"
 msgid "could not stat file '%s'"
 msgstr "Konnte Datei '%s' nicht lesen."
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "Ungรผltiger Git-Namespace-Pfad \"%s\""
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "Konnte GIT_DIR nicht zu '%s' setzen."
@@ -3132,265 +3849,269 @@ msgstr "Konnte GIT_DIR nicht zu '%s' setzen."
 msgid "too many args to run %s"
 msgstr "Zu viele Argumente angegeben, um %s auszufรผhren."
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Remote-Repository ohne URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: erwartete shallow-Liste"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: erwartete ein Flush-Paket nach der shallow-Liste"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr "konnte nicht zum Remote schreiben"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc benรถtigt multi_ack_detailed"
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "Ungรผltige shallow-Zeile: %s"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "Ungรผltige unshallow-Zeile: %s"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr "Objekt nicht gefunden: %s"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr "Fehler in Objekt: %s"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr "Kein shallow-Objekt gefunden: %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "shallow/unshallow erwartet, %s bekommen"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s bekommen"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr "Ungรผltiger Commit %s"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr "Gebe auf"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr "Fertig"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s (%d) %s bekommen"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markiere %s als vollstรคndig"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr "habe %s (%s) bereits"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr "Protokollfehler: ungรผltiger Pack-Header"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: konnte %s nicht starten"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr "Fehler in sideband demultiplexer"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Server-Version ist %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr "Server unterstรผtzt %s"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr "Server unterstรผtzt keine shallow-Clients"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr "Server unterstรผtzt kein --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr "Server unterstรผtzt kein --shallow-exclude"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr "Server unterstรผtzt kein --deepen"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr "keine gemeinsamen Commits"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: Abholen fehlgeschlagen."
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr "Server unterstรผtzt keine shallow-Anfragen."
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr "Server unterstรผtzt Filter"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr "konnte Anfrage nicht zum Remote schreiben"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "Fehler beim Lesen von Sektionskopf '%s'."
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' erwartet, '%s' empfangen"
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
 
-#: fetch-pack.c:1252
+#: fetch-pack.c:1308
 #, c-format
 msgid "error processing acks: %d"
 msgstr "Fehler beim Verarbeiten von ACKS: %d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr "Erwartete Versand einer Packdatei nach 'ready'."
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'."
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref erwartet, '%s' bekommen"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "Unerwartetes wanted-ref: '%s'"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr "kein รผbereinstimmender Remote-Branch"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:689
 msgid "remote did not send all necessary objects"
 msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr "keine solche Remote-Referenz %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
 
-#: gpg-interface.c:321
+#: gpg-interface.c:408
 msgid "gpg failed to sign the data"
 msgstr "gpg beim Signieren der Daten fehlgeschlagen"
 
-#: gpg-interface.c:347
+#: gpg-interface.c:434
 msgid "could not create temporary file"
 msgstr "konnte temporรคre Datei nicht erstellen"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:437
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "Fehler beim Schreiben der losgelรถsten Signatur nach '%s'"
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "Ignoriere ungรผltige Farbe '%.*s' in log.graphColors"
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"Angegebenes Muster enthรคlt NULL Byte (รผber -f <Datei>). Das wird nur mit -"
+"Punter PCRE v2 unterstรผtzt."
+
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': konnte %s nicht lesen"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "Konnte '%s' nicht lesen"
 
-#: grep.c:2145
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': read() zu kurz"
@@ -3440,7 +4161,7 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Systembefehle / Abfragen"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Systembefehle / Repositories synchronisieren"
 
 #: help.c:38
@@ -3535,12 +4256,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr "git version [<Optionen>]"
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3608,47 +4329,62 @@ msgstr "Leerer Name in Identifikation (fรผr <%s>) nicht erlaubt."
 msgid "name consists only of disallowed characters: %s"
 msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:635
 #, c-format
 msgid "invalid date format: %s"
 msgstr "Ungรผltiges Datumsformat: %s"
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr ""
 "Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt"
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "Eintrag '%s' im Tree-Objekt %s hat Blob-Modus, aber ist kein Blob"
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "Konnte Root-Tree-Objekt fรผr Commit %s nicht laden."
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "Mehrere filter-specs kรถnnen nicht kombiniert werden."
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "konnte nicht auf partiellen Blob '%s' zugreifen"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "Konnte partielle Filter-Daten in %s nicht parsen."
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr "'tree:<Tiefe>' erwartet"
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr "Keine Unterstรผtzung fรผr sparse:path Filter mehr"
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "Ungรผltige filter-spec '%s'"
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "Kann Remote-Repository fรผr partielles Klonen nicht รคndern."
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "Zeichen in sub-filter-spec muss maskiert werden: '%c'"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "erwartete etwas nach 'combine:'"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "Mehrere filter-specs kรถnnen nicht kombiniert werden."
 
 #: lockfile.c:151
 #, c-format
@@ -3679,118 +4415,114 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s"
 msgid "failed to read the cache"
 msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: merge-recursive.c:322
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(ungรผltiger Commit)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo fรผr Pfad '%s' fehlgeschlagen; Merge wird abgebrochen."
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "add_cacheinfo zur Aktualisierung fรผr Pfad '%s' fehlgeschlagen;\n"
 "Merge wird abgebrochen."
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
-
-#: merge-recursive.c:863
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "Fehler beim Erstellen des Pfades '%s'%s"
 
-#: merge-recursive.c:874
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Entferne %s, um Platz fรผr Unterverzeichnis zu schaffen\n"
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
 
-#: merge-recursive.c:897
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen wรผrden"
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kann Objekt %s '%s' nicht lesen"
 
-#: merge-recursive.c:941
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "Blob erwartet fรผr %s '%s'"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "Fehler beim ร–ffnen von '%s': %s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "Fehler beim Erstellen einer symbolischen Verknรผpfung fรผr '%s': %s"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "weiรŸ nicht was mit %06o %s '%s' zu machen ist"
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)"
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Spule Submodul %s vor"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht "
 "gefunden)"
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Mรถgliche Auflรถsung des Merges fรผr Submodul gefunden:\n"
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3807,33 +4539,33 @@ msgstr ""
 "\n"
 "hinzu, um diesen Vorschlag zu akzeptieren.\n"
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "Fehler bei Ausfรผhrung des internen Merges"
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Konnte %s nicht zur Datenbank hinzufรผgen"
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "automatischer Merge von %s"
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n"
 "schreibe stattdessen nach %s."
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3842,7 +4574,7 @@ msgstr ""
 "KONFLIKT (%s/lรถschen): %s gelรถscht in %s und %s in %s. Stand %s von %s wurde "
 "im Arbeitsbereich gelassen."
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3851,7 +4583,7 @@ msgstr ""
 "KONFLIKT (%s/lรถschen): %s gelรถscht in %s und %s nach %s in %s. Stand %s von "
 "%s wurde im Arbeitsbereich gelassen."
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3860,7 +4592,7 @@ msgstr ""
 "KONFLIKT (%s/lรถschen): %s gelรถscht in %s und %s in %s. Stand %s von %s wurde "
 "im Arbeitsbereich bei %s gelassen."
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3869,46 +4601,46 @@ msgstr ""
 "KONFLIKT (%s/lรถschen): %s gelรถscht in %s und %s nach %s in %s. Stand %s von "
 "%s wurde im Arbeitsbereich bei %s gelassen."
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "umbenennen"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "umbenannt"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Verweigere geรคnderte Datei bei %s zu verlieren."
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg "
 "ist."
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "KONFLIKT (umbenennen/hinzufรผgen): Benenne um %s->%s in %s. %s hinzugefรผgt in "
 "%s"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s ist ein Verzeichnis in %s, fรผge es stattdessen als %s hinzu"
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Verweigere unversionierte Datei bei %s zu verlieren; fรผge stattdessen %s "
 "hinzu"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3917,18 +4649,18 @@ msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
 "und \"%s\"->\"%s\" in Branch \"%s\"%s"
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " (bleibt unaufgelรถst)"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1793
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
 "in %s"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3941,7 +4673,7 @@ msgstr ""
 "wobei\n"
 "keines dieser Ziele die Mehrheit der Dateien erhielt."
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3952,7 +4684,7 @@ msgstr ""
 "Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
 "Pfade dahin zu setzen: %s."
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3963,7 +4695,7 @@ msgstr ""
 "%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
 "zu setzen: %s"
 
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3972,7 +4704,7 @@ msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
 "Benenne Verzeichnis um %s->%s in %s"
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3981,52 +4713,52 @@ msgstr ""
 "WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
 "wurde."
 
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
 #, c-format
 msgid "cannot read object %s"
 msgstr "kann Objekt %s nicht lesen"
 
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
 #, c-format
 msgid "object %s is not a blob"
 msgstr "Objekt %s ist kein Blob"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modify"
 msgstr "รคndern"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modified"
 msgstr "geรคndert"
 
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
 msgid "content"
 msgstr "Inhalt"
 
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
 msgid "add/add"
 msgstr "hinzufรผgen/hinzufรผgen"
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
 
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:1003
 msgid "submodule"
 msgstr "Submodul"
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
 
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Fรผge stattdessen als %s hinzu"
 
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4035,7 +4767,7 @@ msgstr ""
 "Pfad aktualisiert: %s hinzugefรผgt in %s innerhalb eines Verzeichnisses, das "
 "umbenannt wurde in %s; Verschiebe es nach %s."
 
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4044,7 +4776,7 @@ msgstr ""
 "KONFLIKT (Speicherort): %s hinzugefรผgt in %s innerhalb eines Verzeichnisses, "
 "das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
 
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4053,7 +4785,7 @@ msgstr ""
 "Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
 "Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
 
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4063,173 +4795,181 @@ msgstr ""
 "Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
 "verschoben werden."
 
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
 #, c-format
 msgid "Removing %s"
 msgstr "Entferne %s"
 
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
 msgid "file/directory"
 msgstr "Datei/Verzeichnis"
 
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
 msgid "directory/file"
 msgstr "Verzeichnis/Datei"
 
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Fรผge %s als %s "
 "hinzu."
 
-#: merge-recursive.c:3347
+#: merge-recursive.c:3371
 #, c-format
 msgid "Adding %s"
 msgstr "Fรผge %s hinzu"
 
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "KONFLIKT (hinzufรผgen/hinzufรผgen): Merge-Konflikt in %s"
 
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Ihre lokalen ร„nderungen in den folgenden Dateien wรผrden durch den Merge\n"
-"รผberschrieben werden:\n"
-"  %s"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
 msgid "Already up to date!"
 msgstr "Bereits aktuell!"
 
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "Zusammenfรผhren der \"Tree\"-Objekte %s und %s fehlgeschlagen"
 
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
 msgid "Merging:"
 msgstr "Merge:"
 
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u gemeinsamen Vorgรคnger-Commit gefunden"
 msgstr[1] "%u gemeinsame Vorgรคnger-Commits gefunden"
 
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
 msgid "merge returned no commit"
 msgstr "Merge hat keinen Commit zurรผckgegeben"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Ihre lokalen ร„nderungen in den folgenden Dateien wรผrden durch den Merge\n"
+"รผberschrieben werden:\n"
+"  %s"
+
+#: merge-recursive.c:3756
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
 msgid "Unable to write index."
 msgstr "Konnte Index nicht schreiben."
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "multi-pack-index-Datei %s ist zu klein."
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 "multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x รผberein."
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index-Version %d nicht erkannt."
 
-#: midx.c:95
+#: midx.c:94
 #, c-format
 msgid "hash version %u does not match"
 msgstr "Hash-Version %u stimmt nicht รผberein."
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr "Ungรผltiger Chunk-Offset (zu groรŸ)"
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr "AbschlieรŸende multi-pack-index Chunk-Id erscheint eher als erwartet."
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk."
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk."
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk."
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index fehlt erforderlicher object offset Chunk."
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'"
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "Ungรผltige pack-int-id: %u (%u Pakete insgesamt)"
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein."
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr "Fehler bei Vorbereitung der Packdatei aus multi-pack-index."
 
-#: midx.c:470
+#: midx.c:472
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "Fehler beim Hinzufรผgen von Packdatei '%s'."
 
-#: midx.c:476
+#: midx.c:478
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "Fehler beim ร–ffnen von pack-index '%s'"
 
-#: midx.c:536
+#: midx.c:538
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei."
 
-#: midx.c:865
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Packdateien zum multi-pack-index hinzufรผgen"
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "Chunks zum multi-pack-index schreiben"
+
+#: midx.c:1052
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "Fehler beim Lรถschen des multi-pack-index bei %s"
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr "Suche nach referenzierten Pack-Dateien"
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -4237,57 +4977,65 @@ msgstr ""
 "Ungรผltige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
 "fanout[%d]"
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
-msgstr "Verifiziere OID-Reihenfolge in MIDX"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verifiziere OID-Reihenfolge im multi-pack-index"
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "Ungรผltige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr "Sortiere Objekte nach Pack-Datei"
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr "รœberprรผfe Objekt-Offsets"
 
-#: midx.c:1160
+#: midx.c:1180
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "Fehler beim Laden des Pack-Eintrags fรผr oid[%d] = %s"
 
-#: midx.c:1166
+#: midx.c:1186
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "Fehler beim Laden des Pack-Index fรผr Packdatei %s"
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "Falscher Objekt-Offset fรผr oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "Referenzierte Objekte zรคhlen"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Suchen und Lรถschen von unreferenzierten Pack-Dateien"
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr "Konnte 'pack-objects' nicht ausfรผhren"
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr "Konnte 'pack-objects' nicht beenden"
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "Kann lazy_dir Thread nicht erzeugen: %s"
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "Kann lazy_name Thread nicht erzeugen: %s"
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "Kann lazy_name Thread nicht beitreten: %s"
@@ -4337,32 +5085,32 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "Ungรผltiger %s Wert: '%s'"
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "Ungรผltiger Objekttyp \"%s\""
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "Objekt %s ist ein %s, kein %s"
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d"
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr "Hash stimmt nicht mit %s รผberein."
 
-#: packfile.c:648
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
 
@@ -4376,6 +5124,11 @@ msgstr "Offset vor Beginn des Pack-Index fรผr %s (beschรคdigter Index?)"
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "Offset hinter Ende des Pack-Index fรผr %s (abgeschnittener Index?)"
 
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "Konnte GrรถรŸe von %s nicht bestimmen."
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4391,7 +5144,7 @@ msgstr "%s ist inkompatibel mit %s."
 msgid "%s : incompatible with something else"
 msgstr "%s: inkompatibel mit etwas anderem"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s erwartet keinen Wert"
@@ -4401,43 +5154,43 @@ msgstr "%s erwartet keinen Wert"
 msgid "%s isn't available"
 msgstr "%s ist nicht verfรผgbar."
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 "%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g "
 "Suffix"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr "Meinten Sie `--%s` (mit zwei Strichen?)"
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "Meinten Sie `--%s` (mit zwei Strichen)?"
 
-#: parse-options.c:859
+#: parse-options.c:857
 #, c-format
 msgid "unknown option `%s'"
 msgstr "Unbekannte Option: `%s'"
 
-#: parse-options.c:861
+#: parse-options.c:859
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "Unbekannter Schalter `%c'"
 
-#: parse-options.c:863
+#: parse-options.c:861
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "Unbekannte nicht-Ascii Option in String: `%s'"
 
-#: parse-options.c:887
+#: parse-options.c:885
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:906
+#: parse-options.c:904
 #, c-format
 msgid "usage: %s"
 msgstr "Verwendung: %s"
@@ -4445,21 +5198,21 @@ msgstr "Verwendung: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:910
 #, c-format
 msgid "   or: %s"
 msgstr "      oder: %s"
 
-#: parse-options.c:915
+#: parse-options.c:913
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:952
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:968
+#: parse-options.c:966
 #, c-format
 msgid "alias of --%s"
 msgstr "Alias fรผr --%s"
@@ -4484,35 +5237,35 @@ msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"."
 msgid "malformed object name '%s'"
 msgstr "fehlerhafter Objekt-Name '%s'"
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Konnte Gruppenschreibrecht fรผr %s nicht setzen."
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "Angabe von 'attr:' darf nicht leer sein"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "Ungรผltiger Attributname %s"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
 "inkompatibel."
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4520,51 +5273,56 @@ msgstr ""
 "Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
 "mit allen anderen Optionen."
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "ungรผltiger Parameter fรผr Pfadspezifikationsangabe 'prefix'"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "ungรผltige Pfadspezifikationsangabe '%.*s' in '%s'"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "nicht unterstรผtzte Pfadspezifikationsangabe '%c' in '%s'"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' und 'glob' sind inkompatibel"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' liegt auรŸerhalb des Repositories"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' liegt auรŸerhalb des Repositories von '%s'"
 
-#: pathspec.c:514
+#: pathspec.c:517
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (Kรผrzel: '%c')"
 
-#: pathspec.c:524
+#: pathspec.c:527
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 "%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstรผtzt: %s"
 
-#: pathspec.c:591
+#: pathspec.c:594
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknรผpfung"
 
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "Zeile enthรคlt falsche Anfรผhrungszeichen: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "Konnte Flush-Paket nicht schreiben."
@@ -4626,33 +5384,42 @@ msgstr "Aktualisiere Index"
 msgid "unable to create threaded lstat: %s"
 msgstr "Kann Thread fรผr lstat nicht erzeugen: %s"
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr "Konnte --pretty Format nicht parsen."
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "Remote-Repository ohne URL"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s"
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "Konnte `log` nicht starten."
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr "Konnte Ausgabe von `log` nicht lesen."
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5020
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "Konnte Git-Header '%.*s' nicht parsen."
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr "Fehler beim Generieren des Diffs."
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "Konnte Log fรผr '%s' nicht parsen."
@@ -4694,16 +5461,16 @@ msgstr "Konnte '%s' nicht dem Index hinzufรผgen."
 msgid "unable to stat '%s'"
 msgstr "Konnte '%s' nicht lesen."
 
-#: read-cache.c:1314
+#: read-cache.c:1330
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein."
 
-#: read-cache.c:1499
+#: read-cache.c:1536
 msgid "Refresh index"
 msgstr "Aktualisiere Index"
 
-#: read-cache.c:1613
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4712,7 +5479,7 @@ msgstr ""
 "index.version gesetzt, aber Wert ungรผltig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4721,143 +5488,154 @@ msgstr ""
 "GIT_INDEX_VERSION gesetzt, aber Wert ungรผltig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1717
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "Ungรผltige Signatur 0x%08x"
 
-#: read-cache.c:1682
+#: read-cache.c:1720
 #, c-format
 msgid "bad index version %d"
 msgstr "Ungรผltige Index-Version %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1729
 msgid "bad index file sha1 signature"
 msgstr "Ungรผltige SHA1-Signatur der Index-Datei."
 
-#: read-cache.c:1721
+#: read-cache.c:1759
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstรผtzen."
 
-#: read-cache.c:1723
+#: read-cache.c:1761
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "Ignoriere Erweiterung %.4s"
 
-#: read-cache.c:1760
+#: read-cache.c:1798
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "Unbekanntes Format fรผr Index-Eintrag 0x%08x"
 
-#: read-cache.c:1776
+#: read-cache.c:1814
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "Ungรผltiges Namensfeld im Index, in der Nรคhe von Pfad '%s'."
 
-#: read-cache.c:1833
+#: read-cache.c:1871
 msgid "unordered stage entries in index"
 msgstr "Ungeordnete Stage-Eintrรคge im Index."
 
-#: read-cache.c:1836
+#: read-cache.c:1874
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "Mehrere Stage-Eintrรคge fรผr zusammengefรผhrte Datei '%s'."
 
-#: read-cache.c:1839
+#: read-cache.c:1877
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "Ungeordnete Stage-Eintrรคge fรผr '%s'."
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "Index-Datei beschรคdigt"
 
-#: read-cache.c:2087
+#: read-cache.c:2124
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "Kann Thread fรผr load_cache_entries nicht erzeugen: %s"
 
-#: read-cache.c:2100
+#: read-cache.c:2137
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "Kann Thread fรผr load_cache_entries nicht erzeugen: %s"
 
-#: read-cache.c:2133
+#: read-cache.c:2170
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: ร–ffnen der Index-Datei fehlgeschlagen."
 
-#: read-cache.c:2137
+#: read-cache.c:2174
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: Kann geรถffneten Index nicht lesen."
 
-#: read-cache.c:2141
+#: read-cache.c:2178
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: Index-Datei ist kleiner als erwartet."
 
-#: read-cache.c:2145
+#: read-cache.c:2182
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s: Konnte Index-Datei nicht einlesen."
 
-#: read-cache.c:2187
+#: read-cache.c:2224
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "Kann Thread fรผr load_index_extensions nicht erzeugen: %s"
 
-#: read-cache.c:2214
+#: read-cache.c:2251
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "Kann Thread fรผr load_index_extensions nicht beitreten: %s"
 
-#: read-cache.c:2246
+#: read-cache.c:2283
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
 
-#: read-cache.c:2293
+#: read-cache.c:2330
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
 #, c-format
 msgid "could not close '%s'"
 msgstr "Konnte '%s' nicht schlieรŸen."
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
 #, c-format
 msgid "could not stat '%s'"
 msgstr "Konnte '%s' nicht lesen."
 
-#: read-cache.c:3105
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "konnte Git-Verzeichnis nicht รถffnen: %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "Konnte '%s' nicht entfernen."
 
-#: read-cache.c:3142
+#: read-cache.c:3179
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
 
-#: read-cache.c:3291
+#: read-cache.c:3328
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: Kann nicht auf Stufe #0 wechseln."
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Sie kรถnnen das mit 'git rebase --edit-todo' beheben. Fรผhren Sie danach\n"
+"'git rebase --continue' aus.\n"
+"Oder Sie kรถnnen den Rebase mit 'git rebase --abort' abbrechen.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
@@ -4865,7 +5643,7 @@ msgstr ""
 "Nicht erkannte Einstellung %s fรผr Option rebase.missingCommitsCheck. "
 "Ignoriere."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4910,14 +5688,14 @@ msgstr ""
 "Diese Zeilen kรถnnen umsortiert werden; Sie werden von oben nach unten\n"
 "ausgefรผhrt.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebase von %s auf %s (%d Kommando)"
 msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -4926,7 +5704,7 @@ msgstr ""
 "Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
 "entfernen.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4934,7 +5712,7 @@ msgstr ""
 "\n"
 "Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4948,7 +5726,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4958,22 +5736,19 @@ msgstr ""
 "Wenn Sie jedoch alles lรถschen, wird der Rebase abgebrochen.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Leere Commits sind auskommentiert."
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
 #, c-format
 msgid "could not write '%s'"
 msgstr "Konnte '%s' nicht schreiben."
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "Konnte '%s' nicht nach '%s' kopieren."
+msgid "could not write '%s'."
+msgstr "Konnte '%s' nicht schreiben."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4982,7 +5757,7 @@ msgstr ""
 "Warnung: Einige Commits kรถnnten aus Versehen entfernt worden sein.\n"
 "Entfernte Commits (neu zu alt):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4999,6 +5774,13 @@ msgstr ""
 "Warnungen zu รคndern.\n"
 "Die mรถglichen Verhaltensweisen sind: ignore, warn, error.\n"
 
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "Konnte '%s' nicht lesen."
+
 #: refs.c:262
 #, c-format
 msgid "%s does not point to a valid object!"
@@ -5009,7 +5791,7 @@ msgstr "%s zeigt auf kein gรผltiges Objekt!"
 msgid "ignoring dangling symref %s"
 msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "Ignoriere fehlerhafte Referenz %s"
@@ -5034,14 +5816,15 @@ msgstr "Referenz '%s' existiert bereits."
 msgid "unexpected object ID when writing '%s'"
 msgstr "Unerwartete Objekt-ID beim Schreiben von '%s'."
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "Konnte nicht nach '%s' schreiben."
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "Konnte '%s' nicht zum Schreiben รถffnen."
@@ -5076,39 +5859,39 @@ msgstr "Verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'."
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref fรผr Referenz '%s' fehlgeschlagen: %s"
 
-#: refs.c:2012
+#: refs.c:2023
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "Mehrere Aktualisierungen fรผr Referenz '%s' nicht erlaubt."
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 "Aktualisierungen von Referenzen ist innerhalb der Quarantรคne-Umgebung "
 "verboten."
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' existiert; kann '%s' nicht erstellen"
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "Kann '%s' und '%s' nicht zur selben Zeit verarbeiten."
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr "Konnte Referenz %s nicht lรถschen"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Konnte Referenz %s nicht entfernen: %s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Konnte Referenzen nicht entfernen: %s"
@@ -5118,7 +5901,7 @@ msgstr "Konnte Referenzen nicht entfernen: %s"
 msgid "invalid refspec '%s'"
 msgstr "Ungรผltige Refspec '%s'"
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr "entfernt"
 
@@ -5137,283 +5920,283 @@ msgstr "%d hinterher"
 msgid "ahead %d, behind %d"
 msgstr "%d voraus, %d hinterher"
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "Erwartetes Format: %%(color:<Farbe>)"
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "nicht erkannte Farbe: %%(color:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Positiver Wert erwartet refname:lstrip=%s"
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Positiver Wert erwartet refname:rstrip=%s"
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "nicht erkanntes %%(%s) Argument: %s"
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) akzeptiert keine Argumente"
 
-#: ref-filter.c:269
+#: ref-filter.c:272
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "nicht erkanntes %%(objectsize) Argument: %s"
 
-#: ref-filter.c:277
+#: ref-filter.c:280
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) akzeptiert keine Argumente"
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) akzeptiert keine Argumente"
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) akzeptiert keine Argumente"
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "unbekanntes %%(trailers) Argument: %s"
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "Positiver Wert erwartet contents:lines=%s"
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "nicht erkanntes %%(contents) Argument: %s"
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "Positiver Wert erwartet objectname:short=%s"
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "nicht erkanntes %%(objectname) Argument: %s"
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "nicht erkannte Position:%s"
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "nicht erkannte Breite:%s"
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "nicht erkanntes %%(align) Argument: %s"
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "Positive Breitenangabe fรผr %%(align) erwartet"
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "nicht erkanntes %%(if) Argument: %s"
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "Fehlerhafter Feldname: %.*s"
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "Unbekannter Feldname: %.*s"
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 "Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: %%(then) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: %%(then) Atom nach %%(else) verwendet"
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "Format: %%(end) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "Format: %%(end) Atom ohne zugehรถriges Atom verwendet"
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr "Fehlerhafter Formatierungsstring %s"
 
-#: ref-filter.c:1485
+#: ref-filter.c:1488
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr "kein Branch, Rebase von %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1491
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr "kein Branch, Rebase von losgelรถstem HEAD %s"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr "kein Branch, binรคre Suche begonnen bei %s"
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr "kein Branch"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr "Objekt %s fehlt fรผr %s"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer bei %s fรผr %s fehlgeschlagen"
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "fehlerhaftes Objekt bei '%s'"
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "Format: %%(end) Atom fehlt"
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr "Die Option `%s' ist inkompatibel mit --merged."
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr "Die Option `%s' ist inkompatibel mit --no-merged."
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr "Missgebildeter Objektname %s"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "Die Option `%s' muss auf einen Commit zeigen."
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "Kรผrzel fรผr Remote-Repository in der Konfiguration kann nicht mit '/' "
 "beginnen: %s"
 
-#: remote.c:410
+#: remote.c:414
 msgid "more than one receivepack given, using the first"
 msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten."
 
-#: remote.c:418
+#: remote.c:422
 msgid "more than one uploadpack given, using the first"
 msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten."
 
-#: remote.c:608
+#: remote.c:612
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Kann 'fetch' nicht fรผr sowohl %s als auch %s nach %s ausfรผhren."
 
-#: remote.c:612
+#: remote.c:616
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s folgt รผblicherweise %s, nicht %s"
 
-#: remote.c:616
+#: remote.c:620
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s folgt sowohl %s als auch %s"
 
-#: remote.c:684
+#: remote.c:688
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "Schlรผssel '%s' des Musters hatte kein '*'."
 
-#: remote.c:694
+#: remote.c:698
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "Wert '%s' des Musters hat kein '*'."
 
-#: remote.c:1000
+#: remote.c:1004
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "Src-Refspec %s entspricht keiner Referenz."
 
-#: remote.c:1005
+#: remote.c:1009
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
@@ -5422,7 +6205,7 @@ msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1024
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5449,7 +6232,7 @@ msgstr ""
 "Keines hat funktioniert, sodass wir aufgegeben haben. Sie mรผssen die\n"
 "Referenz mit vollqualifizierten Namen angeben."
 
-#: remote.c:1040
+#: remote.c:1044
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5460,7 +6243,7 @@ msgstr ""
 "Meinten Sie, einen neuen Branch mittels Push nach\n"
 "'%s:refs/heads/%s' zu erstellen?"
 
-#: remote.c:1045
+#: remote.c:1049
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5471,7 +6254,7 @@ msgstr ""
 "Meinten Sie, einen neuen Tag mittels Push nach\n"
 "'%s:refs/tags/%s' zu erstellen?"
 
-#: remote.c:1050
+#: remote.c:1054
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5482,7 +6265,7 @@ msgstr ""
 "Meinten Sie, einen Tag fรผr ein neues Tree-Objekt\n"
 "mittels Push nach '%s:refs/tags/'%s' zu erstellen?"
 
-#: remote.c:1055
+#: remote.c:1059
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5493,117 +6276,117 @@ msgstr ""
 "Meinten Sie, einen Tag fรผr ein neues Blob-Objekt\n"
 "mittels Push nach '%s:refs/tags/%s' zu erstellen?"
 
-#: remote.c:1091
+#: remote.c:1095
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s kann nicht zu Branch aufgelรถst werden."
 
-#: remote.c:1102
+#: remote.c:1106
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "Konnte '%s' nicht lรถschen: Remote-Referenz existiert nicht."
 
-#: remote.c:1114
+#: remote.c:1118
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "Dst-Refspec %s entspricht mehr als einer Referenz."
 
-#: remote.c:1121
+#: remote.c:1125
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "Dst-Referenz %s empfรคngt von mehr als einer Quelle"
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1628 remote.c:1729
 msgid "HEAD does not point to a branch"
 msgstr "HEAD zeigt auf keinen Branch"
 
-#: remote.c:1633
+#: remote.c:1637
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "Kein solcher Branch: '%s'"
 
-#: remote.c:1636
+#: remote.c:1640
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "Kein Upstream-Branch fรผr Branch '%s' konfiguriert."
 
-#: remote.c:1642
+#: remote.c:1646
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
 
-#: remote.c:1657
+#: remote.c:1661
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "Ziel fรผr \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
 "Branch"
 
-#: remote.c:1669
+#: remote.c:1673
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: remote.c:1679
+#: remote.c:1683
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "Push-Refspecs fรผr '%s' beinhalten nicht '%s'"
 
-#: remote.c:1692
+#: remote.c:1696
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "kein Ziel fรผr \"push\" (push.default ist 'nothing')"
 
-#: remote.c:1714
+#: remote.c:1718
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "kann einzelnes Ziel fรผr \"push\" im Modus 'simple' nicht auflรถsen"
 
-#: remote.c:1840
+#: remote.c:1844
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "Konnte Remote-Referenz %s nicht finden."
 
-#: remote.c:1853
+#: remote.c:1857
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Ignoriere sonderbare Referenz '%s' lokal"
 
-#: remote.c:2016
+#: remote.c:2020
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
 
-#: remote.c:2020
+#: remote.c:2024
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
 
-#: remote.c:2023
+#: remote.c:2027
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
 
-#: remote.c:2027
+#: remote.c:2031
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
 
-#: remote.c:2030
+#: remote.c:2034
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (benutzen Sie \"%s\" fรผr Details)\n"
 
-#: remote.c:2034
+#: remote.c:2038
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
 msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
 
-#: remote.c:2040
+#: remote.c:2044
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
 
-#: remote.c:2043
+#: remote.c:2047
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5613,12 +6396,12 @@ msgstr[0] ""
 msgstr[1] ""
 "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
 
-#: remote.c:2051
+#: remote.c:2055
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
 
-#: remote.c:2054
+#: remote.c:2058
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5633,13 +6416,13 @@ msgstr[1] ""
 "Ihr Branch und '%s' sind divergiert,\n"
 "und haben jeweils %d und %d unterschiedliche Commits.\n"
 
-#: remote.c:2064
+#: remote.c:2068
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
 "zusammenzufรผhren)\n"
 
-#: remote.c:2247
+#: remote.c:2251
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "Kann erwarteten Objektnamen '%s' nicht parsen."
@@ -5654,7 +6437,7 @@ msgstr "ungรผltiger Name fรผr ersetzende Referenz: %s"
 msgid "duplicate replace ref: %s"
 msgstr "doppelte ersetzende Referenz: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "Ersetzungstiefe zu hoch fรผr Objekt %s"
@@ -5717,8 +6500,8 @@ msgstr "Kann '%s' nicht lรถschen."
 msgid "Recorded preimage for '%s'"
 msgstr "Preimage fรผr '%s' aufgezeichnet."
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
@@ -5752,20 +6535,20 @@ msgstr "Aufgezeichnete Konfliktauflรถsung fรผr '%s' gelรถscht.\n"
 msgid "unable to open rr-cache directory"
 msgstr "Konnte rr-cache Verzeichnis nicht รถffnen."
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L unterstรผtzt noch keine anderen Diff-Formate auรŸer -p und -s"
 
@@ -5788,30 +6571,30 @@ msgstr ""
 "Sie kรถnnen diese Warnung mit `git config advice.ignoredHook false` "
 "deaktivieren."
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr ""
 "die Gegenseite unterstรผtzt keinen signierten Versand (\"--signed push\")"
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5819,47 +6602,47 @@ msgstr ""
 "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
 "Versand (\"--signed push\") unterstรผtzt"
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr "die Gegenseite unterstรผtzt keinen atomaren Versand (\"--atomic push\")"
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr "die Gegenseite unterstรผtzt keine Push-Optionen"
 
-#: sequencer.c:187
+#: sequencer.c:191
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "Ungรผltiger \"cleanup\"-Modus '%s' fรผr Commit-Beschreibungen."
 
-#: sequencer.c:292
+#: sequencer.c:296
 #, c-format
 msgid "could not delete '%s'"
 msgstr "Konnte '%s' nicht lรถschen."
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "Konnte '%s' nicht lรถschen"
 
-#: sequencer.c:321
+#: sequencer.c:325
 msgid "revert"
 msgstr "Revert"
 
-#: sequencer.c:323
+#: sequencer.c:327
 msgid "cherry-pick"
 msgstr "Cherry-Pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "interaktives Rebase"
+#: sequencer.c:329
+msgid "rebase"
+msgstr "Rebase"
 
-#: sequencer.c:327
+#: sequencer.c:331
 #, c-format
 msgid "unknown action: %d"
 msgstr "Unbekannte Aktion: %d"
 
-#: sequencer.c:385
+#: sequencer.c:389
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5867,7 +6650,7 @@ msgstr ""
 "nach Auflรถsung der Konflikte markieren Sie die korrigierten Pfade\n"
 "mit 'git add <Pfade>' oder 'git rm <Pfade>'"
 
-#: sequencer.c:388
+#: sequencer.c:392
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5877,116 +6660,111 @@ msgstr ""
 "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
 "'git commit' ein"
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:405 sequencer.c:2901
 #, c-format
 msgid "could not lock '%s'"
 msgstr "Konnte '%s' nicht sperren"
 
-#: sequencer.c:408
+#: sequencer.c:412
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "Konnte EOL nicht nach '%s' schreiben."
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "Fehler beim Fertigstellen von '%s'."
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
 #, c-format
 msgid "could not read '%s'"
 msgstr "Konnte '%s' nicht lesen"
 
-#: sequencer.c:462
+#: sequencer.c:466
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "Ihre lokalen ร„nderungen wรผrden durch den %s รผberschrieben werden."
 
-#: sequencer.c:466
+#: sequencer.c:470
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 "Committen Sie Ihre ร„nderungen oder benutzen Sie \"stash\", um fortzufahren."
 
-#: sequencer.c:498
+#: sequencer.c:502
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: Vorspulen"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Ungรผltiger \"cleanup\" Modus %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:635
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Konnte neue Index-Datei nicht schreiben"
 
-#: sequencer.c:649
+#: sequencer.c:652
 msgid "unable to update cache tree"
 msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
 
-#: sequencer.c:663
+#: sequencer.c:666
 msgid "could not resolve HEAD commit"
 msgstr "Konnte HEAD-Commit nicht auflรถsen."
 
-#: sequencer.c:743
+#: sequencer.c:746
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "Kein Schlรผssel in '%.*s' vorhanden."
 
-#: sequencer.c:754
+#: sequencer.c:757
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "Konnte Anfรผhrungszeichen von '%s' nicht entfernen."
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "Konnte '%s' nicht zum Lesen รถffnen."
 
-#: sequencer.c:801
+#: sequencer.c:804
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
 
-#: sequencer.c:806
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
 
-#: sequencer.c:811
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
 
-#: sequencer.c:815
+#: sequencer.c:818
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "Unbekannte Variable '%s'"
 
-#: sequencer.c:820
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "'GIT_AUTHOR_NAME' fehlt."
 
-#: sequencer.c:822
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "'GIT_AUTHOR_EMAIL' fehlt."
 
-#: sequencer.c:824
+#: sequencer.c:827
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "'GIT_AUTHOR_DATE' fehlt."
 
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "Ungรผltiges Datumsformat '%s' in '%s'"
-
-#: sequencer.c:901
+#: sequencer.c:876
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -6017,15 +6795,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr "Root-Commit schreiben"
-
-#: sequencer.c:1216
+#: sequencer.c:1148
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
 
-#: sequencer.c:1223
+#: sequencer.c:1154
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6053,7 +6827,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: sequencer.c:1167
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6079,327 +6853,326 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1209
 msgid "couldn't look up newly created commit"
 msgstr "Konnte neu erstellten Commit nicht nachschlagen."
 
-#: sequencer.c:1280
+#: sequencer.c:1211
 msgid "could not parse newly created commit"
 msgstr "Konnte neu erstellten Commit nicht analysieren."
 
-#: sequencer.c:1326
+#: sequencer.c:1257
 msgid "unable to resolve HEAD after creating commit"
 msgstr "Konnte HEAD nicht auflรถsen, nachdem der Commit erstellt wurde."
 
-#: sequencer.c:1328
+#: sequencer.c:1259
 msgid "detached HEAD"
 msgstr "losgelรถster HEAD"
 
-#: sequencer.c:1332
+#: sequencer.c:1263
 msgid " (root-commit)"
 msgstr " (Root-Commit)"
 
-#: sequencer.c:1353
+#: sequencer.c:1284
 msgid "could not parse HEAD"
 msgstr "Konnte HEAD nicht parsen."
 
-#: sequencer.c:1355
+#: sequencer.c:1286
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s ist kein Commit!"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
 msgid "could not parse HEAD commit"
 msgstr "Konnte Commit von HEAD nicht analysieren."
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1342 sequencer.c:1968
 msgid "unable to parse commit author"
 msgstr "Konnte Commit-Autor nicht parsen."
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
 msgid "git write-tree failed to write a tree"
 msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1386 sequencer.c:1447
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
 msgid "failed to write commit object"
 msgstr "Fehler beim Schreiben des Commit-Objektes."
 
-#: sequencer.c:1526
+#: sequencer.c:1474
 #, c-format
 msgid "could not parse commit %s"
 msgstr "Konnte Commit %s nicht parsen."
 
-#: sequencer.c:1531
+#: sequencer.c:1479
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "Konnte Eltern-Commit %s nicht parsen."
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1562 sequencer.c:1673
 #, c-format
 msgid "unknown command: %d"
 msgstr "Unbekannter Befehl: %d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1620 sequencer.c:1645
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Das ist eine Kombination aus %d Commits."
 
-#: sequencer.c:1672
+#: sequencer.c:1630
 msgid "need a HEAD to fixup"
 msgstr "benรถtige HEAD fรผr fixup"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1632 sequencer.c:3212
 msgid "could not read HEAD"
 msgstr "Konnte HEAD nicht lesen"
 
-#: sequencer.c:1676
+#: sequencer.c:1634
 msgid "could not read HEAD's commit message"
 msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
 
-#: sequencer.c:1682
+#: sequencer.c:1640
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kann '%s' nicht schreiben"
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "Das ist die erste Commit-Beschreibung:"
 
-#: sequencer.c:1697
+#: sequencer.c:1655
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
 
-#: sequencer.c:1704
+#: sequencer.c:1662
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Das ist Commit-Beschreibung #%d:"
 
-#: sequencer.c:1710
+#: sequencer.c:1668
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
 
-#: sequencer.c:1798
+#: sequencer.c:1756
 msgid "your index file is unmerged."
 msgstr "Ihre Index-Datei ist nicht zusammengefรผhrt."
 
-#: sequencer.c:1805
+#: sequencer.c:1763
 msgid "cannot fixup root commit"
 msgstr "kann fixup nicht auf Root-Commit anwenden"
 
-#: sequencer.c:1824
+#: sequencer.c:1782
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1790 sequencer.c:1798
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "Commit %s hat keinen Eltern-Commit %d"
 
-#: sequencer.c:1846
+#: sequencer.c:1804
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "Kann keine Commit-Beschreibung fรผr %s bekommen."
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1823
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kann Eltern-Commit %s nicht parsen"
 
-#: sequencer.c:1930
+#: sequencer.c:1888
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' umbenennen."
 
-#: sequencer.c:1985
+#: sequencer.c:1943
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "Konnte \"revert\" nicht auf %s... (%s) ausfรผhren"
 
-#: sequencer.c:1986
+#: sequencer.c:1944
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "Konnte %s... (%s) nicht anwenden"
 
-#: sequencer.c:2045
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "Weglassen von %s %s -- Patch-Inhalte sind bereits im Upstream-Branch\n"
+
+#: sequencer.c:2018
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: Fehler beim Lesen des Index"
 
-#: sequencer.c:2052
+#: sequencer.c:2025
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: Fehler beim Aktualisieren des Index"
 
-#: sequencer.c:2128
+#: sequencer.c:2102
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s akzeptiert keine Argumente: '%s'"
 
-#: sequencer.c:2137
+#: sequencer.c:2111
 #, c-format
 msgid "missing arguments for %s"
 msgstr "Fehlende Argumente fรผr %s."
 
-#: sequencer.c:2174
+#: sequencer.c:2142
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "Konnte '%.*s' nicht parsen."
+msgid "could not parse '%s'"
+msgstr "Konnte '%s' nicht parsen."
 
-#: sequencer.c:2228
+#: sequencer.c:2203
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "Ungรผltige Zeile %d: %.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2214
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Kann '%s' nicht ohne vorherigen Commit ausfรผhren"
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "Konnte '%s' nicht lesen."
-
-#: sequencer.c:2323
+#: sequencer.c:2298
 msgid "cancelling a cherry picking in progress"
 msgstr "Abbrechen eines laufenden \"cherry-pick\""
 
-#: sequencer.c:2330
+#: sequencer.c:2305
 msgid "cancelling a revert in progress"
 msgstr "Abbrechen eines laufenden \"revert\""
 
-#: sequencer.c:2364
+#: sequencer.c:2349
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausfรผhren."
 
-#: sequencer.c:2366
+#: sequencer.c:2351
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "Unbenutzbares Instruktionsblatt: '%s'"
 
-#: sequencer.c:2371
+#: sequencer.c:2356
 msgid "no commits parsed."
 msgstr "Keine Commits geparst."
 
-#: sequencer.c:2382
+#: sequencer.c:2367
 msgid "cannot cherry-pick during a revert."
 msgstr "Kann Cherry-Pick nicht wรคhrend eines Reverts ausfรผhren."
 
-#: sequencer.c:2384
+#: sequencer.c:2369
 msgid "cannot revert during a cherry-pick."
 msgstr "Kann Revert nicht wรคhrend eines Cherry-Picks ausfรผhren."
 
-#: sequencer.c:2466
+#: sequencer.c:2447
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "Ungรผltiger Wert fรผr %s: %s"
 
-#: sequencer.c:2553
+#: sequencer.c:2540
 msgid "unusable squash-onto"
 msgstr "Unbenutzbares squash-onto."
 
-#: sequencer.c:2569
+#: sequencer.c:2556
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "Fehlerhaftes Optionsblatt: '%s'"
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2644 sequencer.c:4361
 msgid "empty commit set passed"
 msgstr "leere Menge von Commits รผbergeben"
 
-#: sequencer.c:2668
+#: sequencer.c:2660
 msgid "revert is already in progress"
 msgstr "\"revert\" ist bereits im Gange"
 
-#: sequencer.c:2670
+#: sequencer.c:2662
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "Versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2673
+#: sequencer.c:2665
 msgid "cherry-pick is already in progress"
 msgstr "\"cherry-pick\" wird bereits durchgefรผhrt"
 
-#: sequencer.c:2675
+#: sequencer.c:2667
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "Versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2689
+#: sequencer.c:2681
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
 
-#: sequencer.c:2704
+#: sequencer.c:2696
 msgid "could not lock HEAD"
 msgstr "Konnte HEAD nicht sperren"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2756 sequencer.c:4099
 msgid "no cherry-pick or revert in progress"
 msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2758 sequencer.c:2769
 msgid "cannot resolve HEAD"
 msgstr "kann HEAD nicht auflรถsen"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2760 sequencer.c:2804
 msgid "cannot abort from a branch yet to be born"
 msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2790 builtin/grep.c:724
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kann '%s' nicht รถffnen"
 
-#: sequencer.c:2800
+#: sequencer.c:2792
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "Kann '%s' nicht lesen: %s"
 
-#: sequencer.c:2801
+#: sequencer.c:2793
 msgid "unexpected end of file"
 msgstr "Unerwartetes Dateiende"
 
-#: sequencer.c:2807
+#: sequencer.c:2799
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschรคdigt"
 
-#: sequencer.c:2818
+#: sequencer.c:2810
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Sie scheinen HEAD verรคndert zu haben. Keine Rรผckspulung, prรผfen Sie HEAD."
 
-#: sequencer.c:2859
+#: sequencer.c:2851
 msgid "no revert in progress"
 msgstr "Kein Revert im Gange"
 
-#: sequencer.c:2867
+#: sequencer.c:2859
 msgid "no cherry-pick in progress"
 msgstr "kein \"cherry-pick\" im Gange"
 
-#: sequencer.c:2877
+#: sequencer.c:2869
 msgid "failed to skip the commit"
 msgstr "รœberspringen des Commits fehlgeschlagen"
 
-#: sequencer.c:2884
+#: sequencer.c:2876
 msgid "there is nothing to skip"
 msgstr "Nichts zum รœberspringen vorhanden"
 
-#: sequencer.c:2887
+#: sequencer.c:2879
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6408,21 +7181,21 @@ msgstr ""
 "Haben Sie bereits committet?\n"
 "Versuchen Sie \"git %s --continue\""
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3003 sequencer.c:4011
 #, c-format
 msgid "could not update %s"
 msgstr "Konnte %s nicht aktualisieren."
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3042 sequencer.c:3991
 msgid "cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: sequencer.c:3066
+#: sequencer.c:3059
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "Konnte '%s' nicht nach '%s' kopieren."
 
-#: sequencer.c:3074
+#: sequencer.c:3067
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6441,27 +7214,22 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3077
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Konnte %s... (%.*s) nicht anwenden"
 
-#: sequencer.c:3091
+#: sequencer.c:3084
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Konnte \"%.*s\" nicht zusammenfรผhren."
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "Konnte '%s' nicht nach '%s' kopieren."
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "Konnte den Index nicht lesen."
-
-#: sequencer.c:3136
+#: sequencer.c:3129
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6477,11 +7245,11 @@ msgstr ""
 "\n"
 "ausfรผhren.\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3135
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geรคndert.\n"
 
-#: sequencer.c:3148
+#: sequencer.c:3141
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6499,77 +7267,73 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3202
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "Unerlaubter Beschriftungsname: '%.*s'"
 
-#: sequencer.c:3263
+#: sequencer.c:3256
 msgid "writing fake root commit"
 msgstr "unechten Root-Commit schreiben"
 
-#: sequencer.c:3268
+#: sequencer.c:3261
 msgid "writing squash-onto"
 msgstr "squash-onto schreiben"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
 
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "Konnte Index nicht schreiben."
-
-#: sequencer.c:3351
+#: sequencer.c:3344
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "Konnte '%s' nicht auflรถsen."
 
-#: sequencer.c:3379
+#: sequencer.c:3375
 msgid "cannot merge without a current revision"
 msgstr "Kann nicht ohne einen aktuellen Commit mergen."
 
-#: sequencer.c:3401
+#: sequencer.c:3397
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "Konnte '%.*s' nicht parsen."
 
-#: sequencer.c:3410
+#: sequencer.c:3406
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "Nichts zum Zusammenfรผhren: '%.*s'"
 
-#: sequencer.c:3422
+#: sequencer.c:3418
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 "Octupus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgefรผhrt werden."
 
-#: sequencer.c:3437
+#: sequencer.c:3434
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen."
 
-#: sequencer.c:3590
+#: sequencer.c:3594
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen."
 
-#: sequencer.c:3606
+#: sequencer.c:3610
 msgid "merge: Unable to write new index file"
 msgstr "merge: Konnte neue Index-Datei nicht schreiben."
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3679 builtin/rebase.c:737
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Automatischen Stash angewendet.\n"
 
-#: sequencer.c:3687
+#: sequencer.c:3691
 #, c-format
 msgid "cannot store %s"
 msgstr "kann %s nicht speichern"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6580,31 +7344,26 @@ msgstr ""
 "Ihre ร„nderungen sind im Stash sicher.\n"
 "Sie kรถnnen jederzeit \"git stash pop\" oder \"git stash drop\" ausfรผhren.\n"
 
-#: sequencer.c:3751
-#, c-format
-msgid "could not checkout %s"
-msgstr "Konnte %s nicht auschecken."
-
-#: sequencer.c:3765
+#: sequencer.c:3755
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s: keine gรผltige OID"
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "Konnte HEAD nicht loslรถsen"
 
-#: sequencer.c:3785
+#: sequencer.c:3775
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Angehalten bei HEAD\n"
 
-#: sequencer.c:3787
+#: sequencer.c:3777
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Angehalten bei %s\n"
 
-#: sequencer.c:3795
+#: sequencer.c:3785
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6626,50 +7385,50 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3877
+#: sequencer.c:3869
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Angehalten bei %s... %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:3940
 #, c-format
 msgid "unknown command %d"
 msgstr "Unbekannter Befehl %d"
 
-#: sequencer.c:4003
+#: sequencer.c:3999
 msgid "could not read orig-head"
 msgstr "Konnte orig-head nicht lesen."
 
-#: sequencer.c:4008
+#: sequencer.c:4004
 msgid "could not read 'onto'"
 msgstr "Konnte 'onto' nicht lesen."
 
-#: sequencer.c:4022
+#: sequencer.c:4018
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "Konnte HEAD nicht auf %s aktualisieren."
 
-#: sequencer.c:4115
+#: sequencer.c:4111
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 "Rebase nicht mรถglich: Sie haben ร„nderungen, die nicht zum Commit\n"
 "vorgemerkt sind."
 
-#: sequencer.c:4124
+#: sequencer.c:4120
 msgid "cannot amend non-existing commit"
 msgstr "Kann nicht existierenden Commit nicht nachbessern."
 
-#: sequencer.c:4126
+#: sequencer.c:4122
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "Ungรผltige Datei: '%s'"
 
-#: sequencer.c:4128
+#: sequencer.c:4124
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "Ungรผltige Inhalte: '%s'"
 
-#: sequencer.c:4131
+#: sequencer.c:4127
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6680,69 +7439,59 @@ msgstr ""
 "committen Sie diese zuerst und fรผhren Sie dann 'git rebase --continue'\n"
 "erneut aus."
 
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4163 sequencer.c:4202
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "Konnte Datei nicht schreiben: '%s'"
 
-#: sequencer.c:4220
+#: sequencer.c:4217
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "Konnte CHERRY_PICK_HEAD nicht lรถschen."
 
-#: sequencer.c:4227
+#: sequencer.c:4224
 msgid "could not commit staged changes."
 msgstr "Konnte ร„nderungen aus der Staging-Area nicht committen."
 
-#: sequencer.c:4328
+#: sequencer.c:4338
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
 
-#: sequencer.c:4332
+#: sequencer.c:4342
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ungรผltiger Commit"
 
-#: sequencer.c:4367
+#: sequencer.c:4377
 msgid "can't revert as initial commit"
 msgstr "Kann nicht als allerersten Commit einen Revert ausfรผhren."
 
-#: sequencer.c:4810
+#: sequencer.c:4846
 msgid "make_script: unhandled options"
 msgstr "make_script: unbehandelte Optionen"
 
-#: sequencer.c:4813
+#: sequencer.c:4849
 msgid "make_script: error preparing revisions"
 msgstr "make_script: Fehler beim Vorbereiten der Commits"
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Sie kรถnnen das mit 'git rebase --edit-todo' beheben. Fรผhren Sie danach\n"
-"'git rebase --continue' aus.\n"
-"Oder Sie kรถnnen den Rebase mit 'git rebase --abort' abbrechen.\n"
-
 #: sequencer.c:5083 sequencer.c:5100
 msgid "nothing to do"
 msgstr "Nichts zu tun."
 
-#: sequencer.c:5114
+#: sequencer.c:5119
 msgid "could not skip unnecessary pick commands"
 msgstr "Konnte unnรถtige \"pick\"-Befehle nicht auslassen."
 
-#: sequencer.c:5197
+#: sequencer.c:5213
 msgid "the script was already rearranged."
 msgstr "Das Script wurde bereits umgeordnet."
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' liegt auรŸerhalb des Repositories."
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' liegt auรŸerhalb des Repositories von '%s'"
 
-#: setup.c:173
+#: setup.c:175
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6752,7 +7501,7 @@ msgstr ""
 "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
 "nicht existieren."
 
-#: setup.c:186
+#: setup.c:188
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6764,13 +7513,13 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, รคhnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:235
+#: setup.c:254
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 "Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind."
 
-#: setup.c:254
+#: setup.c:273
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6781,93 +7530,93 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, รคhnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:390
+#: setup.c:409
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "Konnte Arbeitsverzeichnis mit ungรผltiger Konfiguration nicht einrichten."
 
-#: setup.c:394
+#: setup.c:413
 msgid "this operation must be run in a work tree"
 msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgefรผhrt werden."
 
-#: setup.c:540
+#: setup.c:559
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
 
-#: setup.c:548
+#: setup.c:567
 msgid "unknown repository extensions found:"
 msgstr "Unbekannte Repository-Erweiterungen gefunden:"
 
-#: setup.c:567
+#: setup.c:586
 #, c-format
 msgid "error opening '%s'"
 msgstr "Fehler beim ร–ffnen von '%s'."
 
-#: setup.c:569
+#: setup.c:588
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "Zu groรŸ, um eine .git-Datei zu sein: '%s'"
 
-#: setup.c:571
+#: setup.c:590
 #, c-format
 msgid "error reading %s"
 msgstr "Fehler beim Lesen von '%s'."
 
-#: setup.c:573
+#: setup.c:592
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "Ungรผltiges gitfile-Format: %s"
 
-#: setup.c:575
+#: setup.c:594
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "Kein Pfad in gitfile: %s"
 
-#: setup.c:577
+#: setup.c:596
 #, c-format
 msgid "not a git repository: %s"
 msgstr "Kein Git-Repository: %s"
 
-#: setup.c:676
+#: setup.c:695
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' zu groรŸ"
 
-#: setup.c:690
+#: setup.c:709
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "Kein Git-Repository: '%s'"
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:738 setup.c:740 setup.c:771
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "Kann nicht in Verzeichnis '%s' wechseln."
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
 msgid "cannot come back to cwd"
 msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurรผckwechseln."
 
-#: setup.c:851
+#: setup.c:870
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "Konnte '%*s%s%s' nicht lesen."
 
-#: setup.c:1083
+#: setup.c:1108
 msgid "Unable to read current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1117 setup.c:1123
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "Kann nicht nach '%s' wechseln."
 
-#: setup.c:1103
+#: setup.c:1128
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s"
 
-#: setup.c:1109
+#: setup.c:1134
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6877,7 +7626,7 @@ msgstr ""
 "%s)\n"
 "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
 
-#: setup.c:1220
+#: setup.c:1245
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6886,290 +7635,290 @@ msgstr ""
 "Problem mit Wert fรผr Dateimodus (0%.3o) von core.sharedRepository.\n"
 "Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
 
-#: setup.c:1264
+#: setup.c:1289
 msgid "open /dev/null or dup failed"
 msgstr "ร–ffnen von /dev/null oder dup fehlgeschlagen."
 
-#: setup.c:1279
+#: setup.c:1304
 msgid "fork failed"
 msgstr "fork fehlgeschlagen"
 
-#: setup.c:1284
+#: setup.c:1309
 msgid "setsid failed"
 msgstr "setsid fehlgeschlagen"
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "Objektverzeichnis %s existiert nicht; prรผfe .git/objects/info/alternates"
 
-#: sha1-file.c:504
+#: sha1-file.c:503
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
 
-#: sha1-file.c:583
+#: sha1-file.c:582
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 msgid "unable to fdopen alternates lockfile"
 msgstr "Konnte fdopen nicht auf Lock-Datei fรผr \"alternates\" aufrufen."
 
-#: sha1-file.c:644
+#: sha1-file.c:643
 msgid "unable to read alternates file"
 msgstr "Konnte \"alternates\"-Datei nicht lesen."
 
-#: sha1-file.c:651
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
 msgstr "Konnte neue \"alternates\"-Datei nicht รผbernehmen."
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "Pfad '%s' existiert nicht"
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "Referenziertes Repository '%s' wird noch nicht als verknรผpftes\n"
 "Arbeitsverzeichnis unterstรผtzt."
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 "Referenziertes Repository '%s' hat eine unvollstรคndige Historie (shallow)."
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 "Referenziertes Repository '%s' ist mit kรผnstlichen Vorgรคngern (\"grafts\") "
 "eingehรคngt."
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "Ungรผltige Zeile beim Parsen alternativer Referenzen: %s"
 
-#: sha1-file.c:944
+#: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "Versuche mmap %<PRIuMAX> รผber Limit %<PRIuMAX>."
 
-#: sha1-file.c:969
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr "mmap fehlgeschlagen"
 
-#: sha1-file.c:1133
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr "Objektdatei %s ist leer."
 
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1263 sha1-file.c:2443
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "Fehlerhaftes loses Objekt '%s'."
 
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1265 sha1-file.c:2447
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
 
-#: sha1-file.c:1301
+#: sha1-file.c:1307
 msgid "invalid object type"
 msgstr "ungรผltiger Objekt-Typ"
 
-#: sha1-file.c:1385
+#: sha1-file.c:1391
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
 
-#: sha1-file.c:1388
+#: sha1-file.c:1394
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "Konnte %s Kopfbereich nicht entpacken."
 
-#: sha1-file.c:1394
+#: sha1-file.c:1400
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
 
-#: sha1-file.c:1397
+#: sha1-file.c:1403
 #, c-format
 msgid "unable to parse %s header"
 msgstr "Konnte %s Kopfbereich nicht parsen."
 
-#: sha1-file.c:1588
+#: sha1-file.c:1629
 #, c-format
 msgid "failed to read object %s"
 msgstr "Konnte Objekt %s nicht lesen."
 
-#: sha1-file.c:1592
+#: sha1-file.c:1633
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "Ersetzung %s fรผr %s nicht gefunden."
 
-#: sha1-file.c:1596
+#: sha1-file.c:1637
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "Loses Objekt %s (gespeichert in %s) ist beschรคdigt."
 
-#: sha1-file.c:1600
+#: sha1-file.c:1641
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschรคdigt."
 
-#: sha1-file.c:1703
+#: sha1-file.c:1746
 #, c-format
 msgid "unable to write file %s"
 msgstr "Konnte Datei %s nicht schreiben."
 
-#: sha1-file.c:1710
+#: sha1-file.c:1753
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
 
-#: sha1-file.c:1717
+#: sha1-file.c:1760
 msgid "file write error"
 msgstr "Fehler beim Schreiben einer Datei."
 
-#: sha1-file.c:1736
+#: sha1-file.c:1780
 msgid "error when closing loose object file"
 msgstr "Fehler beim SchlieรŸen der Datei fรผr lose Objekte."
 
-#: sha1-file.c:1801
+#: sha1-file.c:1845
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "Unzureichende Berechtigung zum Hinzufรผgen eines Objektes zur Repository-"
 "Datenbank %s"
 
-#: sha1-file.c:1803
+#: sha1-file.c:1847
 msgid "unable to create temporary file"
 msgstr "Konnte temporรคre Datei nicht erstellen."
 
-#: sha1-file.c:1827
+#: sha1-file.c:1871
 msgid "unable to write loose object file"
 msgstr "Fehler beim Schreiben der Datei fรผr lose Objekte."
 
-#: sha1-file.c:1833
+#: sha1-file.c:1877
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
 
-#: sha1-file.c:1837
+#: sha1-file.c:1881
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
 
-#: sha1-file.c:1841
+#: sha1-file.c:1885
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "Fehler wegen instabilen Objektquelldaten fรผr %s"
 
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
 #, c-format
 msgid "failed utime() on %s"
 msgstr "Fehler beim Aufruf von utime() auf '%s'."
 
-#: sha1-file.c:1926
+#: sha1-file.c:1972
 #, c-format
 msgid "cannot read object for %s"
 msgstr "Kann Objekt fรผr %s nicht lesen."
 
-#: sha1-file.c:1966
+#: sha1-file.c:2011
 msgid "corrupt commit"
 msgstr "fehlerhafter Commit"
 
-#: sha1-file.c:1974
+#: sha1-file.c:2019
 msgid "corrupt tag"
 msgstr "fehlerhaftes Tag"
 
-#: sha1-file.c:2073
+#: sha1-file.c:2119
 #, c-format
 msgid "read error while indexing %s"
 msgstr "Lesefehler beim Indizieren von '%s'."
 
-#: sha1-file.c:2076
+#: sha1-file.c:2122
 #, c-format
 msgid "short read while indexing %s"
 msgstr "read() zu kurz beim Indizieren von '%s'."
 
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2195 sha1-file.c:2205
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: Fehler beim Einfรผgen in die Datenbank"
 
-#: sha1-file.c:2164
+#: sha1-file.c:2211
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: nicht unterstรผtzte Dateiart"
 
-#: sha1-file.c:2188
+#: sha1-file.c:2235
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s ist kein gรผltiges Objekt"
 
-#: sha1-file.c:2190
+#: sha1-file.c:2237
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s ist kein gรผltiges '%s' Objekt"
 
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "kann %s nicht รถffnen"
 
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2454 sha1-file.c:2507
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "Hash fรผr %s stimmt nicht รผberein (%s erwartet)."
 
-#: sha1-file.c:2431
+#: sha1-file.c:2478
 #, c-format
 msgid "unable to mmap %s"
 msgstr "Konnte mmap nicht auf %s ausfรผhren."
 
-#: sha1-file.c:2436
+#: sha1-file.c:2483
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "Konnte Kopfbereich von %s nicht entpacken."
 
-#: sha1-file.c:2442
+#: sha1-file.c:2489
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "Konnte Kopfbereich von %s nicht parsen."
 
-#: sha1-file.c:2453
+#: sha1-file.c:2500
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "Konnte Inhalt von %s nicht entpacken."
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "Kurzer SHA-1 %s ist mehrdeutig."
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "Die Kandidaten sind:"
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7194,44 +7943,112 @@ msgstr ""
 "indem Sie \"git config advice.objectNameWarning false\"\n"
 "ausfรผhren."
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "Log fรผr '%.*s' geht nur bis %s zurรผck"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "Log fรผr '%.*s' hat nur %d Eintrรคge"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"Pfad '%s' existiert, aber nicht '%s'\n"
+"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "Pfad '%s' existiert nicht in '%.*s'"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"Pfad '%s' ist im Index, aber nicht in Stufe %d\n"
+"Hinweis: Meinten Sie ':%d:%s'?"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"Pfad '%s' ist im Index, aber nicht '%s'\n"
+"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"Die Syntax fรผr relative Pfade kann nicht auรŸerhalb des Arbeitsverzeichnisses "
+"benutzt werden."
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "ungรผltiger Objektname '%.*s'."
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:837
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:839
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:847
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:849
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:856
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:864
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7239,13 +8056,18 @@ msgstr[0] "%u Byte"
 msgstr[1] "%u Bytes"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:866
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u Byte/s"
 msgstr[1] "%u Bytes/s"
 
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "Konnte '%s' nicht editieren."
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7276,51 +8098,128 @@ msgstr "In nicht ausgechecktem Submodul '%s'."
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
 
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "ungรผltiges --ignore-submodules Argument: %s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein "
+"Submodul. Wird รผbersprungen."
+
 #: submodule.c:910
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' "
+"ausfรผhren."
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "Prozess fรผr Submodul '%s' fehlgeschlagen"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Konnte HEAD nicht als gรผltige Referenz auflรถsen."
 
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Pushe Submodul '%s'\n"
+
+#: submodule.c:1161
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Kann Push fรผr Submodul '%s' nicht ausfรผhren\n"
+
+#: submodule.c:1453
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "Konnte nicht auf Submodul '%s' zugreifen."
+msgid "Fetching submodule %s%s\n"
+msgstr "Anfordern des Submoduls %s%s\n"
 
-#: submodule.c:1651
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Konnte nicht auf Submodul '%s' zugreifen\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Fehler wรคhrend des Anforderns der Submodule:\n"
+"%s"
+
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' nicht als Git-Repository erkannt"
 
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "Konnte 'git status --porcelain=2' nicht in Submodul %s ausfรผhren"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen"
+
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht ausfรผhren."
 
-#: submodule.c:1817
+#: submodule.c:1828
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
 
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "konnte Index des Submoduls nicht zurรผcksetzen"
+
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "Submodul '%s' hat einen geรคnderten Index."
 
-#: submodule.c:1959
+#: submodule.c:1970
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Submodule '%s' konnte nicht aktualisiert werden."
 
-#: submodule.c:2007
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+"Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten."
+
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7328,12 +8227,17 @@ msgstr ""
 "relocate_gitdir fรผr Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
 "wird nicht unterstรผtzt"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
-msgstr "konnte Name fรผr Submodul '%s' nicht nachschlagen"
+msgstr "Konnte Name fรผr Submodul '%s' nicht nachschlagen."
+
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert."
 
-#: submodule.c:2026
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7344,42 +8248,37 @@ msgstr ""
 "'%s' nach\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2209
 msgid "could not start ls-files in .."
 msgstr "Konnte 'ls-files' nicht in .. starten"
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree mit unerwartetem Rรผckgabewert %d beendet"
 
-#: submodule-config.c:232
+#: submodule-config.c:236
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "Ignoriere verdรคchtigen Submodulnamen: %s"
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "Negative Werte fรผr submodule.fetchjobs nicht erlaubt."
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 "Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden "
 "wรผrde."
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr "Ungรผltiger Wert fรผr %s"
 
-#: submodule-config.c:755
+#: submodule-config.c:765
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
@@ -7395,7 +8294,7 @@ msgstr "Ausfรผhren des Anhang-Befehls '%s' fehlgeschlagen"
 msgid "unknown value '%s' for key '%s'"
 msgstr "unbekannter Wert '%s' fรผr Schlรผssel %s"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "mehr als ein %s"
@@ -7414,7 +8313,7 @@ msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
 msgid "could not read from stdin"
 msgstr "konnte nicht von der Standard-Eingabe lesen"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr "Konnte '%s' nicht lesen"
@@ -7443,47 +8342,47 @@ msgstr "konnte temporรคre Datei nicht zu %s umbenennen"
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Wรผrde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
 
-#: transport.c:142
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr "Konnte Paket '%s' nicht lesen."
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: ungรผltige --depth Option '%s'"
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "Siehe protocol.version in 'git help config' fรผr weitere Informationen"
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr "Server-Optionen benรถtigen Protokoll-Version 2 oder hรถher"
 
-#: transport.c:625
+#: transport.c:632
 msgid "could not parse transport.color.* config"
 msgstr "Konnte transport.color.* Konfiguration nicht parsen."
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr "Unterstรผtzung fรผr Protokoll v2 noch nicht implementiert."
 
-#: transport.c:825
+#: transport.c:831
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "Unbekannter Wert fรผr Konfiguration '%s': %s"
 
-#: transport.c:891
+#: transport.c:897
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "รœbertragungsart '%s' nicht erlaubt."
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync wird nicht lรคnger unterstรผtzt."
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -7492,7 +8391,7 @@ msgstr ""
 "Die folgenden Submodul-Pfade enthalten ร„nderungen, die in keinem\n"
 "Remote-Repository gefunden wurden:\n"
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -7519,34 +8418,34 @@ msgstr ""
 "zum Versenden zu einem Remote-Repository.\n"
 "\n"
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr "Abbruch."
 
-#: transport.c:1193
+#: transport.c:1201
 msgid "failed to push all needed submodules"
 msgstr "Fehler beim Versand aller erforderlichen Submodule."
 
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:657
 msgid "operation not supported by protocol"
 msgstr "Die Operation wird von dem Protokoll nicht unterstรผtzt."
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 msgid "full write to remote helper failed"
 msgstr "Vollstรคndiges Schreiben zu Remote-Helper fehlgeschlagen."
 
-#: transport-helper.c:134
+#: transport-helper.c:144
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "Konnte Remote-Helper fรผr '%s' nicht finden."
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:571
 msgid "can't dup helper output fd"
 msgstr ""
 "Konnte dup() auf Dateideskriptor fรผr Ausgaben des Remote-Helpers nicht "
 "ausfรผhren."
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7555,100 +8454,105 @@ msgstr ""
 "Unbekannte erforderliche Fรคhigkeit %s; dieser Remote-Helper benรถtigt\n"
 "wahrscheinlich eine neuere Version von Git."
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fรคhigkeit implementieren."
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:425
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "unerwartete Ausgabe von %s: '%s'"
 
-#: transport-helper.c:403
+#: transport-helper.c:414
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s sperrte auch %s"
 
-#: transport-helper.c:481
+#: transport-helper.c:493
 msgid "couldn't run fast-import"
 msgstr "Konnte \"fast-import\" nicht ausfรผhren."
 
-#: transport-helper.c:504
+#: transport-helper.c:516
 msgid "error while running fast-import"
 msgstr "Fehler beim Ausfรผhren von 'fast-import'."
 
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:545 transport-helper.c:1134
 #, c-format
 msgid "could not read ref %s"
 msgstr "Konnte Referenz %s nicht lesen."
 
-#: transport-helper.c:578
+#: transport-helper.c:590
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "Unbekannte Antwort auf 'connect': %s"
 
-#: transport-helper.c:600
+#: transport-helper.c:612
 msgid "setting remote service path not supported by protocol"
 msgstr ""
 "Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstรผtzt."
 
-#: transport-helper.c:602
+#: transport-helper.c:614
 msgid "invalid remote service path"
 msgstr "Ungรผltiger Remote-Service Pfad."
 
-#: transport-helper.c:648
+#: transport-helper.c:660
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "Kann keine Verbindung zu Subservice %s herstellen."
 
-#: transport-helper.c:720
+#: transport-helper.c:736
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "Erwartete ok/error, Remote-Helper gab '%s' aus."
 
-#: transport-helper.c:773
+#: transport-helper.c:789
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "Remote-Helper meldete unerwarteten Status von %s."
 
-#: transport-helper.c:834
+#: transport-helper.c:850
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "Remote-Helper %s unterstรผtzt kein Trockenlauf."
 
-#: transport-helper.c:837
+#: transport-helper.c:853
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "Remote-Helper %s unterstรผtzt kein --signed."
 
-#: transport-helper.c:840
+#: transport-helper.c:856
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "Remote-Helper %s unterstรผtzt kein --signed=if-asked."
 
-#: transport-helper.c:847
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "Remote-Helper %s unterstรผtzt kein --atomic."
+
+#: transport-helper.c:867
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "Remote-Helper %s unterstรผtzt nicht 'push-option'."
 
-#: transport-helper.c:945
+#: transport-helper.c:965
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "Remote-Helper unterstรผtzt kein Push; Refspec benรถtigt"
 
-#: transport-helper.c:950
+#: transport-helper.c:970
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "Remote-Helper %s unterstรผtzt kein 'force'."
 
-#: transport-helper.c:997
+#: transport-helper.c:1017
 msgid "couldn't run fast-export"
 msgstr "Konnte \"fast-export\" nicht ausfรผhren."
 
-#: transport-helper.c:1002
+#: transport-helper.c:1022
 msgid "error while running fast-export"
 msgstr "Fehler beim Ausfรผhren von \"fast-export\"."
 
-#: transport-helper.c:1027
+#: transport-helper.c:1047
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -7657,67 +8561,67 @@ msgstr ""
 "Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausfรผhrung.\n"
 "Vielleicht sollten Sie einen Branch wie 'master' angeben.\n"
 
-#: transport-helper.c:1091
+#: transport-helper.c:1120
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "Ungรผltige Antwort in Referenzliste: %s"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1272
 #, c-format
 msgid "read(%s) failed"
 msgstr "Lesen von %s fehlgeschlagen."
 
-#: transport-helper.c:1271
+#: transport-helper.c:1299
 #, c-format
 msgid "write(%s) failed"
 msgstr "Schreiben von %s fehlgeschlagen."
 
-#: transport-helper.c:1320
+#: transport-helper.c:1348
 #, c-format
 msgid "%s thread failed"
 msgstr "Thread %s fehlgeschlagen."
 
-#: transport-helper.c:1324
+#: transport-helper.c:1352
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "Fehler beim Beitreten zu Thread %s: %s"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1371 transport-helper.c:1375
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
 
-#: transport-helper.c:1384
+#: transport-helper.c:1412
 #, c-format
 msgid "%s process failed to wait"
 msgstr "Fehler beim Warten von Prozess %s."
 
-#: transport-helper.c:1388
+#: transport-helper.c:1416
 #, c-format
 msgid "%s process failed"
 msgstr "Prozess %s fehlgeschlagen"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1434 transport-helper.c:1443
 msgid "can't start thread for copying data"
 msgstr "Kann Thread zum Kopieren von Daten nicht starten."
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "zu kurzes Tree-Objekt"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "fehlerhafter Modus in Tree-Eintrag"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "leerer Dateiname in Tree-Eintrag"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "zu kurze Tree-Datei"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7728,7 +8632,7 @@ msgstr ""
 "%%sBitte committen oder stashen Sie Ihre ร„nderungen, bevor Sie Branches\n"
 "wechseln."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7738,7 +8642,7 @@ msgstr ""
 "รผberschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7748,7 +8652,7 @@ msgstr ""
 "รผberschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre ร„nderungen, bevor Sie mergen."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7758,7 +8662,7 @@ msgstr ""
 "รผberschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7768,7 +8672,7 @@ msgstr ""
 "รผberschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre ร„nderungen, bevor Sie %s ausfรผhren."
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7777,7 +8681,7 @@ msgstr ""
 "Ihre lokalen ร„nderungen wรผrden durch %s รผberschrieben werden.\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7787,7 +8691,7 @@ msgstr ""
 "Dateien in diesen Verzeichnissen verloren gehen:\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7797,7 +8701,7 @@ msgstr ""
 "den Checkout entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7808,7 +8712,7 @@ msgstr ""
 "Checkout entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7818,7 +8722,7 @@ msgstr ""
 "den Merge entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7829,7 +8733,7 @@ msgstr ""
 "Merge entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7839,7 +8743,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausfรผhren."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7849,7 +8753,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7860,7 +8764,7 @@ msgstr ""
 "den Checkout รผberschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7872,7 +8776,7 @@ msgstr ""
 "Checkout รผberschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7882,7 +8786,7 @@ msgstr ""
 "den Merge รผberschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7892,7 +8796,7 @@ msgstr ""
 "den Merge รผberschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7902,7 +8806,7 @@ msgstr ""
 "den %s รผberschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausfรผhren."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7913,12 +8817,12 @@ msgstr ""
 "%s รผberschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Eintrag '%s' รผberschneidet sich mit '%s'. Kann nicht verbinden."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -7928,7 +8832,7 @@ msgstr ""
 "sind nicht aktuell:\n"
 "%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -7939,7 +8843,7 @@ msgstr ""
 "รผber einen partiellen Checkout รผberschrieben werden:\n"
 "%s"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -7950,7 +8854,7 @@ msgstr ""
 "รผber einen partiellen Checkout entfernt werden:\n"
 "%s"
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -7959,16 +8863,16 @@ msgstr ""
 "Kann Submodul nicht aktualisieren:\n"
 "%s"
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr "Abbruch\n"
 
-#: unpack-trees.c:318
+#: unpack-trees.c:317
 msgid "Updating files"
 msgstr "Aktualisiere Dateien"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -7978,6 +8882,10 @@ msgstr ""
 "auf einem case-insensitiven Dateisystem) und nur einer von der\n"
 "selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
 
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "Aktualisiere Index-Markierungen"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "Ungรผltiges URL-Schema oder Suffix '://' fehlt"
@@ -8007,47 +8915,51 @@ msgstr "ungรผltige Portnummer"
 msgid "invalid '..' path segment"
 msgstr "ungรผltiges '..' Pfadsegment"
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Anfordern der Objekte"
+
+#: worktree.c:259 builtin/am.c:2099
 #, c-format
 msgid "failed to read '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "'%s' Datei enthรคlt nicht den absoluten Pfad zum Arbeitsverzeichnis."
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' existiert nicht."
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' zeigt nicht zurรผck auf '%s'"
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "Konnte '%s' nicht zum Lesen und Schreiben รถffnen."
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr "konnte nicht auf '%s' zugreifen"
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
 
@@ -8243,7 +9155,7 @@ msgstr "Sie haben nicht zusammengefรผhrte Pfade."
 
 #: wt-status.c:1147
 msgid "  (fix conflicts and run \"git commit\")"
-msgstr " (beheben Sie die Konflikte und fรผhren Sie \"git commit\" aus)"
+msgstr "  (beheben Sie die Konflikte und fรผhren Sie \"git commit\" aus)"
 
 #: wt-status.c:1149
 msgid "  (use \"git merge --abort\" to abort the merge)"
@@ -8411,87 +9323,96 @@ msgstr ""
 "  (alle Konflikte behoben: fรผhren Sie \"git cherry-pick --continue\" aus)"
 
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr ""
+"  (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)"
+
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
 "abzubrechen)"
 
-#: wt-status.c:1447
+#: wt-status.c:1449
 msgid "Revert currently in progress."
 msgstr "Revert zurzeit im Gange."
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Sie sind gerade beim Revert von Commit '%s'."
 
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und fรผhren Sie dann \"git revert --continue\" "
 "aus)"
 
-#: wt-status.c:1459
+#: wt-status.c:1461
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (Fรผhren Sie \"git revert --continue\", um weiterzumachen)"
 
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (alle Konflikte behoben: fรผhren Sie \"git revert --continue\" aus)"
 
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)"
+
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Sie sind gerade bei einer binรคren Suche, gestartet von Branch '%s'."
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr "Sie sind gerade bei einer binรคren Suche."
 
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (benutzen Sie \"git bisect reset\", um zum ursprรผnglichen Branch "
 "zurรผckzukehren)"
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr "Auf Branch "
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr "interaktives Rebase im Gange; auf "
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr "Rebase im Gange; auf "
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr "Initialer Commit"
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
 msgstr "Noch keine Commits"
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr "Unversionierte Dateien"
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr "Ignorierte Dateien"
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8502,32 +9423,32 @@ msgstr ""
 "'status -uno' kรถnnte das beschleunigen, aber Sie mรผssen darauf achten,\n"
 "neue Dateien selbststรคndig hinzuzufรผgen (siehe 'git help status')."
 
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Unversionierte Dateien nicht aufgelistet%s"
 
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr "Keine ร„nderungen"
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "keine ร„nderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "keine ร„nderungen zum Commit vorgemerkt\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8536,200 +9457,209 @@ msgstr ""
 "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 "(benutzen Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
 "Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nichts zu committen\n"
 
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
 "anzuzeigen)\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nichts zu committen, Arbeitsverzeichnis unverรคndert\n"
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr "Noch keine Commits in "
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr "HEAD (kein Branch)"
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr "unterschiedlich"
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr "hinterher "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr "voraus "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 "%s nicht mรถglich: Sie haben ร„nderungen, die nicht zum Commit vorgemerkt sind."
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr "Zusรคtzlich enthรคlt die Staging-Area nicht committete ร„nderungen."
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "%s nicht mรถglich: Die Staging-Area enthรคlt nicht committete ร„nderungen."
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "Konnte '%s' nicht entfernen."
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "unerwarteter Differenz-Status %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
 msgid "updating files failed"
 msgstr "Aktualisierung der Dateien fehlgeschlagen"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "lรถsche '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "Nicht zum Commit vorgemerkte ร„nderungen nach Aktualisierung der Staging-Area:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:266 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr "Konnte den Index nicht lesen"
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Konnte '%s' nicht zum Schreiben รถffnen."
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr "Konnte Patch nicht schreiben"
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr "Bearbeitung des Patches fehlgeschlagen"
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht lesen"
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr "Leerer Patch. Abgebrochen."
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Konnte '%s' nicht anwenden."
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
 "ignoriert:\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "Probelauf"
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr "interaktives Auswรคhlen"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr "Blรถcke interaktiv auswรคhlen"
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr "aktuelle Unterschiede editieren und anwenden"
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr "das Hinzufรผgen andernfalls ignorierter Dateien erlauben"
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr "versionierte Dateien aktualisieren"
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
 "-u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr "nur speichern, dass der Pfad spรคter hinzugefรผgt werden soll"
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 "ร„nderungen von allen versionierten und unversionierten Dateien hinzufรผgen"
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "gelรถschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr "nichts hinzufรผgen, nur den Index aktualisieren"
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "Dateien รผberspringen, die aufgrund von Fehlern nicht hinzugefรผgt werden "
 "konnten"
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "prรผfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "das \"ausfรผhrbar\"-Bit der aufgelisteten Dateien รผberschreiben"
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr "warnen wenn eingebettetes Repository hinzugefรผgt wird"
 
-#: builtin/add.c:326
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "Backend fรผr `git stash -p`"
+
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8763,158 +9693,186 @@ msgstr ""
 "\n"
 "Siehe \"git help submodule\" fรผr weitere Informationen."
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "Fรผge eingebettetes Repository hinzu: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufรผgen mรถchten.\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Nutzen Sie die Option -f, wenn sie wirklich hinzugefรผgt werden sollen.\n"
+"Um diese Meldung abzuschalten, fรผhren Sie folgenden Befehl aus:\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr "Hinzufรผgen von Dateien fehlgeschlagen"
 
-#: builtin/add.c:419
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr ""
+"Die Optionen --pathspec-from-file und --interactive/--patch sind "
+"inkompatibel."
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "Die Optionen --pathspec-from-file und --edit sind inkompatibel."
+
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 "Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
 
-#: builtin/add.c:445
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr ""
+"Die Option --pathspec-from-file ist inkompatibel mit\n"
+"Pfadspezifikation-Argumenten."
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "Die Option --pathspec-file-nul benรถtigt --pathspec-from-file"
+
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nichts spezifiziert, nichts hinzugefรผgt.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Meinten Sie vielleicht 'git add .'?\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"Eventuell meinten Sie 'git add .'?\n"
+"Um diese Meldung abzuschalten, fรผhren Sie folgenden Befehl aus:\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "konnte Autor-Skript nicht parsen"
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Fehlerhafte Eingabezeile: '%s'."
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "\"fseek\" fehlgeschlagen"
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "konnte Patch '%s' nicht parsen"
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "ungรผltiger Zeitstempel"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "Ungรผltige \"Date\"-Zeile"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "Ungรผltiger Offset in der Zeitzone"
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "Patch-Formaterkennung fehlgeschlagen."
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "Fehler beim Aufteilen der Patches."
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "Konnte Index-Datei nicht schreiben."
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 "Wenn Sie das Problem aufgelรถst haben, fรผhren Sie \"%s --continue\" aus."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 "Falls Sie diesen Patch auslassen mรถchten, fรผhren Sie stattdessen \"%s --skip"
 "\" aus."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Um den ursprรผnglichen Branch wiederherzustellen und die Anwendung der "
 "Patches abzubrechen, fรผhren Sie \"%s --abort\" aus."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Patch mit format=flowed versendet; Leerzeichen am Ende von Zeilen kรถnnte "
 "verloren gehen."
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "Patch ist leer."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "Ungรผltige Identifikationszeile: %.*s"
+msgid "missing author line in commit %s"
+msgstr "Autor-Zeile fehlt in Commit %s"
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "Konnte Commit '%s' nicht parsen."
+msgid "invalid ident line: %.*s"
+msgstr "Ungรผltige Identifikationszeile: %.*s"
 
-#: builtin/am.c:1496
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge "
 "zurรผckzufallen."
 
-#: builtin/am.c:1498
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
 "nachzustellen ..."
 
-#: builtin/am.c:1517
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8922,24 +9880,24 @@ msgstr ""
 "Haben Sie den Patch per Hand editiert?\n"
 "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
 
-#: builtin/am.c:1523
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Falle zurรผck zum Patchen der Basis und zum 3-Wege-Merge ..."
 
-#: builtin/am.c:1549
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "Merge der ร„nderungen fehlgeschlagen."
 
-#: builtin/am.c:1581
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "auf leere Historie anwenden"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "Kann nicht fortsetzen: %s existiert nicht"
 
-#: builtin/am.c:1650
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr "Commit-Beschreibung ist:"
 
@@ -8947,37 +9905,41 @@ msgstr "Commit-Beschreibung ist:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 
-#: builtin/am.c:1710
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "Konnte Index-Datei nicht schreiben."
+
+#: builtin/am.c:1704
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Geรคnderter Index: kann Patches nicht anwenden (geรคndert: %s)"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1744 builtin/am.c:1812
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Wende an: %.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1761
 msgid "No changes -- Patch already applied."
 msgstr "Keine ร„nderungen -- Patches bereits angewendet."
 
-#: builtin/am.c:1773
+#: builtin/am.c:1767
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
-"Benutzen Sie 'git am --show-current-patch', um den\n"
-"fehlgeschlagenen Patch zu sehen."
+"Benutzen Sie 'git am --show-current-patch=diff', um den\n"
+"fehlgeschlagenen Patch zu sehen"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1815
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -8988,7 +9950,7 @@ msgstr ""
 "diese bereits anderweitig eingefรผgt worden sein; Sie kรถnnten diesen Patch\n"
 "auslassen."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1822
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -9001,17 +9963,17 @@ msgstr ""
 "Sie kรถnnen 'git rm' auf Dateien ausfรผhren, um \"von denen gelรถscht\" fรผr\n"
 "diese zu akzeptieren."
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/am.c:1987
+#: builtin/am.c:1981
 msgid "failed to clean index"
 msgstr "Fehler beim Bereinigen des Index"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2025
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -9019,144 +9981,155 @@ msgstr ""
 "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geรคndert zu haben.\n"
 "Keine Zurรผcksetzung zu ORIG_HEAD."
 
-#: builtin/am.c:2128
+#: builtin/am.c:2132
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Ungรผltiger Wert fรผr --patch-format: %s"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Ungรผltiger Wert fรผr --show-current-patch: %s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+"--show-current-patch=%s ist inkombatibel mit --show-current-patch=%s"
+
+#: builtin/am.c:2207
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2208
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2214
 msgid "run interactively"
 msgstr "interaktiv ausfรผhren"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2216
 msgid "historical option -- no-op"
 msgstr "historische Option -- kein Effekt"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2218
 msgid "allow fall back on 3way merging if needed"
 msgstr "erlaube, falls notwendig, das Zurรผckfallen auf einen 3-Wege-Merge"
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
 msgid "be quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2221
 msgid "add a Signed-off-by line to the commit message"
 msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufรผgen"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2224
 msgid "recode into utf8 (default)"
 msgstr "nach UTF-8 umkodieren (Standard)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2226
 msgid "pass -k flag to git-mailinfo"
 msgstr "-k an git-mailinfo รผbergeben"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2228
 msgid "pass -b flag to git-mailinfo"
 msgstr "-b an git-mailinfo รผbergeben"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2230
 msgid "pass -m flag to git-mailinfo"
 msgstr "-m an git-mailinfo รผbergeben"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2232
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "--keep-cr an git-mailsplit fรผr mbox-Format รผbergeben"
 
-#: builtin/am.c:2192
+#: builtin/am.c:2235
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "kein --keep-cr an git-mailsplit รผbergeben, unabhรคngig von am.keepcr"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2238
 msgid "strip everything before a scissors line"
 msgstr "alles vor einer Scheren-Zeile entfernen"
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
 msgid "pass it through git-apply"
 msgstr "an git-apply รผbergeben"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr "Anzahl"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr "Format"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2264
 msgid "format the patch(es) are in"
 msgstr "Patch-Format"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2270
 msgid "override error message when patch failure occurs"
 msgstr "Meldung bei fehlerhafter Patch-Anwendung รผberschreiben"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2272
 msgid "continue applying patches after resolving a conflict"
 msgstr "Anwendung der Patches nach Auflรถsung eines Konfliktes fortsetzen"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2275
 msgid "synonyms for --continue"
 msgstr "Synonyme fรผr --continue"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2278
 msgid "skip the current patch"
 msgstr "den aktuellen Patch auslassen"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2281
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "ursprรผnglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2284
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
+#: builtin/am.c:2288
+msgid "show the patch being applied"
 msgstr "den Patch, der gerade angewendet wird, anzeigen"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2293
 msgid "lie about committer date"
 msgstr "Autor-Datum als Commit-Datum verwenden"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2295
 msgid "use current timestamp for author date"
 msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr "GPG-Schlรผsselkennung"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
 msgid "GPG-sign commits"
 msgstr "Commits mit GPG signieren"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2301
 msgid "(internal use for git-rebase)"
 msgstr "(intern fรผr git-rebase verwendet)"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2319
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -9164,16 +10137,16 @@ msgstr ""
 "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
 "entfernt. Bitte verwenden Sie diese nicht mehr."
 
-#: builtin/am.c:2281
+#: builtin/am.c:2326
 msgid "failed to read the index"
 msgstr "Fehler beim Lesen des Index"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2341
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
 
-#: builtin/am.c:2320
+#: builtin/am.c:2365
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9182,11 +10155,11 @@ msgstr ""
 "Stray %s Verzeichnis gefunden.\n"
 "Benutzen Sie \"git am --abort\", um es zu entfernen."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2371
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Es ist keine Auflรถsung im Gange, es wird nicht fortgesetzt."
 
-#: builtin/am.c:2336
+#: builtin/am.c:2381
 msgid "interactive mode requires patches on the command line"
 msgstr "Interaktiver Modus benรถtigt Patches รผber die Kommandozeile"
 
@@ -9311,7 +10284,7 @@ msgstr "Keine binรคre Suche im Gange.\n"
 msgid "'%s' is not a valid commit"
 msgstr "'%s' ist kein gรผltiger Commit."
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9319,27 +10292,27 @@ msgstr ""
 "Konnte den ursprรผnglichen HEAD '%s' nicht auschecken.\n"
 "Versuchen Sie 'git bisect reset <Commit>'."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Ungรผltiges \"bisect_write\" Argument: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "Konnte die OID der Revision '%s' nicht erhalten."
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "Konnte die Datei '%s' nicht รถffnen."
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Ungรผltiger Befehl: Sie sind gerade bei einer binรคren %s/%s Suche."
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9348,7 +10321,7 @@ msgstr ""
 "Sie mรผssen mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
 "Sie kรถnnen dafรผr \"git bisect %s\" und \"git bisect %s\" benutzen."
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9359,7 +10332,7 @@ msgstr ""
 "Danach mรผssen Sie mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
 "Sie kรถnnen dafรผr \"git bisect %s\" und \"git bisect %s\" benutzen."
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:310
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "Binรคre Suche nur mit einem %s Commit."
@@ -9368,15 +10341,15 @@ msgstr "Binรคre Suche nur mit einem %s Commit."
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr "Sind Sie sicher [Y/n]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr "Keine Begriffe definiert."
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:382
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9385,7 +10358,7 @@ msgstr ""
 "Ihre aktuellen Begriffe sind %s fรผr den alten Zustand\n"
 "und %s fรผr den neuen Zustand.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:392
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9394,274 +10367,268 @@ msgstr ""
 "Ungรผltiges Argument %s fรผr 'git bisect terms'.\n"
 "Unterstรผtzte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:478
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "Nicht erkannte Position: '%s'"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:482
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' scheint kein gรผltiger Commit zu sein."
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:514
 msgid "bad HEAD - I need a HEAD"
 msgstr "Ungรผltiger HEAD - HEAD wird benรถtigt."
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:529
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start "
 "<gรผltiger-Branch>'."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 "binรคre Suche auf einem durch 'cg-seek' geรคndertem Verzeichnis nicht mรถglich"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:553
 msgid "bad HEAD - strange symbolic ref"
 msgstr "Ungรผltiger HEAD - merkwรผrdige symbolische Referenz."
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:577
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "Ungรผltige Referenz: '%s'"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr "'git bisect next' ausfรผhren"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "die Begriffe nach .git/BISECT_TERMS schreiben"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr "den Zustand der binรคren Suche aufrรคumen"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr "auf erwartete Commits prรผfen"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:641
 msgid "reset the bisection state"
 msgstr "den Zustand der binรคren Suche zurรผcksetzen"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:643
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "den Zustand der binรคren Suche nach BISECT_LOG schreiben"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:645
 msgid "check and set terms in a bisection state"
 msgstr "Begriffe innerhalb einer binรคren Suche prรผfen und setzen"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:647
 msgid "check whether bad or good terms exist"
 msgstr "prรผfen, ob Begriffe fรผr gute und schlechte Commits existieren"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:649
 msgid "print out the bisect terms"
 msgstr "die Begriffe fรผr die binรคre Suche ausgeben"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:651
 msgid "start the bisect session"
 msgstr "Sitzung fรผr binรคre Suche starten"
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:655
 msgid "no log for BISECT_WRITE"
 msgstr "kein Log fรผr BISECT_WRITE"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms benรถtigt zwei Argumente."
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state erwartet keine Argumente."
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:684
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset benรถtigt entweder kein Argument oder ein Commit."
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:688
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write benรถtigt entweder 4 oder 5 Argumente."
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:694
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--check-and-set-terms benรถtigt 3 Argumente."
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:700
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check benรถtigt 2 oder 3 Argumente."
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:706
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms benรถtigt 0 oder 1 Argument."
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, c-format
 msgid "expecting a color: %s"
 msgstr "Erwarte eine Farbe: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr "Muss mit einer Farbe enden."
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "Ungรผltige Farbe '%s' in color.blame.repeatedLines."
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 msgid "invalid value for blame.coloring"
 msgstr "Ungรผltiger Wert fรผr blame.coloring."
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "Konnte Commit %s zum Ignorieren nicht finden"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr "\"blame\"-Eintrรคge schrittweise anzeigen, wรคhrend wir sie generieren"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "leere SHA-1 fรผr Grenz-Commits anzeigen (Standard: aus)"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr "Statistiken zum Arbeitsaufwand anzeigen"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr "Ausgabebewertung fรผr \"blame\"-Eintrรคge anzeigen"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr "ursprรผnglichen Dateinamen anzeigen (Standard: auto)"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr "ursprรผngliche Zeilennummer anzeigen (Standard: aus)"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr "Anzeige in einem Format fรผr maschinelle Auswertung"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 "Anzeige in Format fรผr Fremdprogramme mit Commit-Informationen pro Zeile"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Den Namen des Autors und den Zeitstempel unterdrรผcken (Standard: aus)"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr "Unterschiede im Whitespace ignorieren"
 
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr "Commit"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 msgid "Ignore <rev> when blaming"
 msgstr "Ignoriere <rev> beim Ausfรผhren von 'blame'"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 msgid "Ignore revisions from <file>"
 msgstr "Ignoriere Commits aus <Datei>"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfรคrben"
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr "Zeilen nach Alter einfรคrben"
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr ""
-"eine experimentelle Heuristik zur Verbesserung der Darstellung\n"
-"von Unterschieden verwenden"
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr "Lรคnger arbeiten, um bessere รœbereinstimmungen zu finden"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "Inhalte der <Datei>en als endgรผltiges Abbild benutzen"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "Bewertung"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr "nur Zeilen im Bereich n,m verarbeiten, gezรคhlt von 1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress kann nicht mit --incremental oder Formaten fรผr Fremdprogramme\n"
@@ -9675,18 +10642,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "vor 4 Jahren und 11 Monaten"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "Datei %s hat nur %lu Zeile"
 msgstr[1] "Datei %s hat nur %lu Zeilen"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr "Verarbeite Zeilen"
 
@@ -9903,7 +10870,7 @@ msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
 msgid "do not use"
 msgstr "nicht verwenden"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:513
 msgid "upstream"
 msgstr "Upstream"
 
@@ -9912,7 +10879,7 @@ msgid "change the upstream info"
 msgstr "Informationen zum Upstream-Branch รคndern"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
+msgid "unset the upstream info"
 msgstr "Informationen zum Upstream-Branch entfernen"
 
 #: builtin/branch.c:628
@@ -10015,7 +10982,7 @@ msgstr "Sortierung und Filterung sind unabhรคngig von GroรŸ- und Kleinschreibung
 msgid "format to use for the output"
 msgstr "fรผr die Ausgabe zu verwendendes Format"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:785
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
 
@@ -10109,20 +11076,65 @@ msgstr ""
 "Die '--set-upstream' Option wird nicht lรคnger unterstรผtzt.\n"
 "Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr "%s ist in Ordnung\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<Optionen>] <Datei> <git-rev-list Argumente>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<Optionen>] <Datei>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <Datei> [<Referenzname>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <Datei> [<Referenzname>...]"
+
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "keine Fortschrittsanzeige anzeigen"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "Fortschrittsanzeige anzeigen"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr "Forschrittsanzeige wรคhrend des Schreibens von Objekten anzeigen"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "รคhnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
+
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "Um ein Paket zu erstellen wird ein Repository benรถtigt."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "Keine Bundle-Details anzeigen"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s ist in Ordnung\n"
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "Zum Entpacken wird ein Repository benรถtigt."
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Unbekannter Unterbefehl: %s"
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -10130,7 +11142,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -10138,76 +11150,76 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 msgid "only one batch option may be specified"
 msgstr "Nur eine Batch-Option erlaubt."
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<Art> kann sein: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr "Objektart anzeigen"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr "ObjektgrรถรŸe anzeigen"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr "mit Rรผckgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr "ansprechende Anzeige des Objektinhaltes"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausfรผhren"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr "fรผr Blob-Objekte, Filter auf Objekt-Inhalte ausfรผhren"
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:1002
 msgid "blob"
 msgstr "Blob"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr "einen bestimmten Pfad fรผr --textconv/--filters verwenden"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s und -t mit beschรคdigten Objekten erlauben"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr "Ausgabe von --batch puffern"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
 "Eingabe"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr ""
 "Anzeige von Informationen รผber Objekte, gelesen von der Standard-Eingabe"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "symbolischen Verknรผpfungen innerhalb des Repositories folgen (verwendet mit "
 "--batch oder --batch-check)"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr "Ausgabe von --batch-all-objects nicht ordnen"
 
@@ -10235,8 +11247,8 @@ msgstr "Dateinamen von der Standard-Eingabe lesen"
 msgid "terminate input and output records by a NUL character"
 msgstr "Eintrรคge von Ein- und Ausgabe mit NUL-Zeichen abschlieรŸen"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
 msgid "suppress progress reporting"
 msgstr "Fortschrittsanzeige unterdrรผcken"
 
@@ -10248,28 +11260,28 @@ msgstr "Eingabe-Pfade ohne รœbereinstimmungen anzeigen"
 msgid "ignore index when checking"
 msgstr "Index bei der Prรผfung ignorieren"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "Die Option -z kann nur mit --stdin verwendet werden."
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "kein Pfad angegeben"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gรผltig."
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 "Die Optionen --quiet und --verbose kรถnnen nicht gemeinsam verwendet werden."
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching ist nur mit --verbose zulรคssig"
 
@@ -10329,9 +11341,9 @@ msgid "write the content to temporary files"
 msgstr "den Inhalt in temporรคre Dateien schreiben"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
 msgid "string"
 msgstr "Zeichenkette"
 
@@ -10360,99 +11372,99 @@ msgstr "git switch [<Optionen>] [<Branch>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..."
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "Pfad '%s' hat nicht unsere Version."
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "Pfad '%s' hat nicht deren Version."
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "Pfad '%s': kann nicht zusammenfรผhren"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufรผgen."
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "%d Merge-Konflikt wieder erstellt"
 msgstr[1] "%d Merge-Konflikte wieder erstellt"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d Pfad von %s aktualisiert"
 msgstr[1] "%d Pfade von %s aktualisiert"
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:389
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d Pfad vom Index aktualisiert"
 msgstr[1] "%d Pfade vom Index aktualisiert"
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "Weder '%s' noch '%s' ist angegeben"
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "Pfad '%s' ist nicht zusammengefรผhrt."
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
 msgid "you need to resolve your current index first"
 msgstr "Sie mรผssen zuerst die Konflikte in Ihrem aktuellen Index auflรถsen."
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:734
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10461,57 +11473,50 @@ msgstr ""
 "Kann nicht mit vorgemerkten ร„nderungen in folgenden Dateien fortsetzen:\n"
 "%s"
 
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-"Zum Commit vorgemerkte ร„nderungen in den folgenden Dateien gehen eventuell "
-"verloren: %s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:837
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kann \"reflog\" fรผr '%s' nicht durchfรผhren: %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:879
 msgid "HEAD is now at"
 msgstr "HEAD ist jetzt bei"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:883 builtin/clone.c:717
 msgid "unable to update HEAD"
 msgstr "Konnte HEAD nicht aktualisieren."
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:887
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Setze Branch '%s' neu\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Bereits auf '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:894
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:896 builtin/checkout.c:1320
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Zu neuem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:898
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Zu Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:949
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... und %d weitere.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:955
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10534,7 +11539,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:974
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10561,28 +11566,19 @@ msgstr[1] ""
 " git branch <neuer-Branchname> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1009
 msgid "internal error in revision walk"
 msgstr "interner Fehler im Revisionsgang"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1013
 msgid "Previous HEAD position was"
 msgstr "Vorherige Position von HEAD war"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
 msgid "You are on a branch yet to be born"
 msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "nur eine Referenz erwartet"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "nur eine Referenz erwartet, %d gegeben."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1128
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10592,37 +11588,74 @@ msgstr ""
 "Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
 "eindeutig voneinander zu unterscheiden."
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Falls Sie einen Remote-Tracking-Branch, z.B. von 'origin', auschecken "
+"wollten,\n"
+"kรถnnen Sie das tun, indem Sie den vollstรคndig qualifizierten Namen mit der\n"
+"--track Option angeben:\n"
+"\n"
+"    git checkout --track origin/<Name>\n"
+"\n"
+"Falls Sie beim Auschecken mit mehrdeutigen <Namen> immer ein Remote-"
+"Repository\n"
+"bevorzugen mรถchten, z.B. 'origin', kรถnnen Sie die Einstellung\n"
+"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "nur eine Referenz erwartet"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "nur eine Referenz erwartet, %d gegeben."
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
 #, c-format
 msgid "invalid reference: %s"
 msgstr "Ungรผltige Referenz: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1334
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1336
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "Ein Branch wird erwartet, '%s' bekommen"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1340
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1356
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10630,7 +11663,7 @@ msgstr ""
 "Der Branch kann nicht wรคhrend eines Merges gewechselt werden.\n"
 "Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1360
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10639,7 +11672,7 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1364
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10648,7 +11681,7 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1368
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10657,7 +11690,7 @@ msgstr ""
 "gewechselt werden.\n"
 "Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1372
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10666,140 +11699,145 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1376
 msgid "you are switching branch while bisecting"
 msgstr "Sie wechseln den Branch wรคhrend einer binรคren Suche"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1383
 msgid "paths cannot be used with switching branches"
 msgstr "Pfade kรถnnen nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1411
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' kann nicht <Startpunkt> bekommen"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1419
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1426
 msgid "missing branch or commit argument"
 msgstr "Branch- oder Commit-Argument fehlt"
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1469
 msgid "perform a 3-way merge with the new branch"
 msgstr "einen 3-Wege-Merge mit dem neuen Branch ausfรผhren"
 
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr "Stil"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1471
 msgid "conflict style (merge or diff3)"
 msgstr "Konfliktstil (merge oder diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1483 builtin/worktree.c:496
 msgid "detach HEAD at named commit"
 msgstr "HEAD bei benanntem Commit loslรถsen"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1484
 msgid "set upstream info for new branch"
 msgstr "Informationen zum Upstream-Branch fรผr den neuen Branch setzen"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1486
 msgid "force checkout (throw away local modifications)"
 msgstr "Auschecken erzwingen (verwirft lokale ร„nderungen)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new-branch"
 msgstr "neuer Branch"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new unparented branch"
 msgstr "neuer Branch ohne Eltern-Commit"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
 msgid "update ignored files (default)"
 msgstr "ignorierte Dateien aktualisieren (Standard)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1493
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "Prรผfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
 "ausgecheckt wurde, deaktivieren"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1506
 msgid "checkout our version for unmerged files"
 msgstr "unsere Variante fรผr nicht zusammengefรผhrte Dateien auschecken"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1509
 msgid "checkout their version for unmerged files"
 msgstr "ihre Variante fรผr nicht zusammengefรผhrte Dateien auschecken"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1513
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "keine Einschrรคnkung bei Pfadspezifikationen zum partiellen Auschecken"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Die Optionen -b, -B und --orphan schlieรŸen sich gegenseitig aus."
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1568
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p und --overlay schlieรŸen sich gegenseitig aus."
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1605
 msgid "--track needs a branch name"
 msgstr "Bei der Option --track muss ein Branchname angegeben werden."
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1610
 msgid "missing branch name; try -b"
 msgstr "Kein Branchname; versuchen Sie -b."
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1642
 #, c-format
 msgid "could not resolve %s"
 msgstr "Konnte %s nicht auflรถsen."
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "Sie mรผssen Pfad(e) zur Wiederherstellung angeben."
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
 msgid "invalid path specification"
 msgstr "ungรผltige Pfadspezifikation"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "Die Optionen --pathspec-from-file und --detach sind inkompatibel."
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "Die Optionen --pathspec-from-file und --patch sind inkompatibel."
+
+#: builtin/checkout.c:1692
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10807,98 +11845,69 @@ msgstr ""
 "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
 "Sie aus dem Index auschecken."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' entspricht mehr als einem Remote-Tracking-Branch.\n"
-"Wir fanden %d Remote-Repositories mit einer entsprechenden Referenz, also\n"
-"haben wir versucht, das Argument als Pfad aufzulรถsen, was auch schief ging!\n"
-"\n"
-"Falls Sie einen Remote-Tracking-Branch, z.B. von 'origin', auschecken "
-"wollten,\n"
-"kรถnnen Sie das tun, indem Sie den vollstรคndig qualifizierten Namen mit der\n"
-"--track Option angeben:\n"
-"\n"
-"    git checkout --track origin/<Name>\n"
-"\n"
-"Falls Sie beim Auschecken mit mehrdeutigen <Namen> immer ein Remote-"
-"Repository\n"
-"bevorzugen mรถchten, z.B. 'origin', kรถnnten Sie die Einstellung\n"
-"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "Sie mรผssen Pfad(e) zur Wiederherstellung angeben."
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
 msgid "branch"
 msgstr "Branch"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1724
 msgid "create and checkout a new branch"
 msgstr "einen neuen Branch erzeugen und auschecken"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1726
 msgid "create/reset and checkout a branch"
 msgstr "einen Branch erstellen/umsetzen und auschecken"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1727
 msgid "create reflog for new branch"
 msgstr "das Reflog fรผr den neuen Branch erzeugen"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1729
 msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr ""
-"Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
+msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1730
 msgid "use overlay mode (default)"
 msgstr "benutze Overlay-Modus (Standard)"
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1775
 msgid "create and switch to a new branch"
 msgstr "einen neuen Branch erzeugen und dahin wechseln"
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1777
 msgid "create/reset and switch to a branch"
 msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1779
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1781
 msgid "throw away local modifications"
 msgstr "lokale ร„nderungen verwerfen"
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1813
 msgid "which tree-ish to checkout from"
 msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1815
 msgid "restore the index"
 msgstr "Index wiederherstellen"
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1817
 msgid "restore the working tree (default)"
 msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1819
 msgid "ignore unmerged entries"
 msgstr "ignoriere nicht zusammengefรผhrte Eintrรคge"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
 msgid "use overlay mode"
 msgstr "benutze Overlay-Modus"
 
@@ -10938,7 +11947,7 @@ msgstr "Fehler beim Lรถschen von %s"
 msgid "could not lstat %s\n"
 msgstr "Konnte 'lstat' nicht fรผr %s ausfรผhren\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10951,7 +11960,7 @@ msgstr ""
 "foo        - Element anhand eines eindeutigen Prรคfix auswรคhlen\n"
 "           - (leer) nichts auswรคhlen\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10972,38 +11981,33 @@ msgstr ""
 "*          - alle Elemente auswรคhlen\n"
 "           - (leer) Auswahl beenden\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Wie bitte (%s)?\n"
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ignorier-Muster eingeben>> "
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "WARNUNG: Kann keine Eintrรคge finden die Muster entsprechen: %s"
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Wรคhlen Sie Eintrรคge zum Lรถschen"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "'%s' lรถschen [y/N]? "
 
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Tschรผss.\n"
-
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11021,64 +12025,56 @@ msgstr ""
 "help                - diese Meldung anzeigen\n"
 "?                   - Hilfe zur Auswahl mittels Eingabe anzeigen"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Befehle ***"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Was nun"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Wรผrde das folgende Element entfernen:"
 msgstr[1] "Wรผrde die folgenden Elemente entfernen:"
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Keine Dateien mehr zum Lรถschen, beende."
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "keine Namen von gelรถschten Dateien ausgeben"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr "Aktion erzwingen"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "interaktives Clean"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "ganze Verzeichnisse lรถschen"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "Muster"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "<Muster> zu den Regeln fรผr ignorierte Pfade hinzufรผgen"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "auch ignorierte Dateien lรถschen"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "nur ignorierte Dateien lรถschen"
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "Die Optionen -x und -X kรถnnen nicht gemeinsam verwendet werden."
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -11086,7 +12082,7 @@ msgstr ""
 "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
 "\"clean\" verweigert"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -11094,7 +12090,7 @@ msgstr ""
 "clean.requireForce standardmรครŸig auf \"true\" gesetzt und weder -i, -n noch -"
 "f gegeben; \"clean\" verweigert"
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
 
@@ -11142,18 +12138,18 @@ msgstr "Vorlagenverzeichnis"
 msgid "directory from which templates will be used"
 msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr "Repository referenzieren"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr "--reference nur wรคhrend des Klonens benutzen"
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
 msgid "name"
 msgstr "Name"
 
@@ -11169,8 +12165,8 @@ msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
 msgid "path to git-upload-pack on the remote"
 msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
 msgid "depth"
 msgstr "Tiefe"
 
@@ -11179,7 +12175,7 @@ msgid "create a shallow clone of that depth"
 msgstr ""
 "einen Klon mit unvollstรคndiger Historie (shallow) in dieser Tiefe erstellen"
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
 msgid "time"
 msgstr "Zeit"
 
@@ -11190,18 +12186,19 @@ msgstr ""
 "Zeit\n"
 "erstellen"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
 msgid "revision"
 msgstr "Commit"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "die Historie eines Klons mit unvollstรคndiger Historie (shallow) mittels\n"
 "Ausschluss eines Commits vertiefen"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr "nur einen Branch klonen, HEAD oder --branch"
 
@@ -11229,23 +12226,23 @@ msgstr "Schlรผssel=Wert"
 msgid "set config inside the new repository"
 msgstr "Konfiguration innerhalb des neuen Repositories setzen"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "serverspezifisch"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "Option รผbertragen"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr "nur IPv4-Adressen benutzen"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr "nur IPv6-Adressen benutzen"
 
@@ -11253,7 +12250,13 @@ msgstr "nur IPv6-Adressen benutzen"
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "jedes geklonte Submodul nutzt seinen Remote-Tracking-Branch"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"Initialisiere Datei fรผr partiellen Checkout, um nur Dateien im\n"
+"Root-Verzeichnis einzubeziehen"
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11261,47 +12264,42 @@ msgstr ""
 "Konnte keinen Verzeichnisnamen erraten.\n"
 "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: Konnte Alternative fรผr '%s' nicht hinzufรผgen: %s\n"
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existiert und ist kein Verzeichnis"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "Fehler beim Starten der Iteration รผber '%s'"
 
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "Konnte '%s' nicht entfernen."
-
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "Konnte Verweis '%s' nicht erstellen"
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "Konnte Datei nicht nach '%s' kopieren"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "Fehler beim Iterieren รผber '%s'"
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11311,97 +12309,101 @@ msgstr ""
 "Sie kรถnnen mit 'git status' prรผfen, was ausgecheckt worden ist\n"
 "und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
 
-#: builtin/clone.c:702
+#: builtin/clone.c:705
 #, c-format
 msgid "unable to update %s"
 msgstr "kann %s nicht aktualisieren"
 
-#: builtin/clone.c:752
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "Fehler beim Initialisieren vom partiellen Checkout."
+
+#: builtin/clone.c:776
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
 "nicht ausgecheckt werden.\n"
 
-#: builtin/clone.c:783
+#: builtin/clone.c:807
 msgid "unable to checkout working tree"
 msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:862
 msgid "unable to write parameters to config file"
 msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:925
 msgid "cannot repack to clean up"
 msgstr "Kann \"repack\" zum Aufrรคumen nicht aufrufen"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:927
 msgid "cannot unlink temporary alternates file"
 msgstr "Kann temporรคre \"alternates\"-Datei nicht entfernen"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: builtin/clone.c:942
+#: builtin/clone.c:969
 msgid "You must specify a repository to clone."
 msgstr "Sie mรผssen ein Repository zum Klonen angeben."
 
-#: builtin/clone.c:955
+#: builtin/clone.c:982
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
 
-#: builtin/clone.c:958
+#: builtin/clone.c:985
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:998
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "Repository '%s' existiert nicht."
 
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:1004 builtin/fetch.c:1796
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "Tiefe %s ist keine positive Zahl"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1014
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1024
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Arbeitsverzeichnis '%s' existiert bereits."
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "Konnte fรผhrende Verzeichnisse von '%s' nicht erstellen."
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1044
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1064
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klone in Bare-Repository '%s' ...\n"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1066
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klone nach '%s' ...\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1090
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11409,45 +12411,45 @@ msgstr ""
 "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
 "able"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1154
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
 "stattdessen file://"
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1156
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
 "file://"
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1158
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
 "file://"
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1160
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://"
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1163
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 "Quelle ist ein Repository mit unvollstรคndiger Historie (shallow),\n"
 "ignoriere --local"
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1168
 msgid "--local is ignored"
 msgstr "--local wird ignoriert"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1243 builtin/clone.c:1251
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1254
 msgid "You appear to have cloned an empty repository."
 msgstr "Sie scheinen ein leeres Repository geklont zu haben."
 
@@ -11496,7 +12498,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "doppelter Vorgรคnger %s ignoriert"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, c-format
 msgid "not a valid object name %s"
 msgstr "Kein gรผltiger Objektname: %s"
@@ -11524,13 +12526,13 @@ msgstr "Eltern-Commit"
 msgid "id of a parent commit object"
 msgstr "ID eines Eltern-Commit-Objektes."
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
 #: builtin/tag.c:412
 msgid "message"
 msgstr "Beschreibung"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
 msgid "commit message"
 msgstr "Commit-Beschreibung"
 
@@ -11538,8 +12540,8 @@ msgstr "Commit-Beschreibung"
 msgid "read commit log message from file"
 msgstr "Commit-Beschreibung von Datei lesen"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "Commit mit GPG signieren"
 
@@ -11614,58 +12616,66 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "Option --pathspec-from-file mit -a ist nicht sinnvoll."
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "Keine Pfade mit der Option --include/--only ist nicht sinnvoll."
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr "Konnte temporรคren Index nicht erstellen."
 
-#: builtin/commit.c:362
+#: builtin/commit.c:385
 msgid "interactive add failed"
 msgstr "interaktives Hinzufรผgen fehlgeschlagen"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:400
 msgid "unable to update temporary index"
 msgstr "Konnte temporรคren Index nicht aktualisieren."
 
-#: builtin/commit.c:378
+#: builtin/commit.c:402
 msgid "Failed to update main cache tree"
 msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
 msgid "unable to write new_index file"
 msgstr "Konnte new_index Datei nicht schreiben"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:479
 msgid "cannot do a partial commit during a merge."
 msgstr "Kann keinen Teil-Commit durchfรผhren, wรคhrend ein Merge im Gange ist."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:481
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 "Kann keinen Teil-Commit durchfรผhren, wรคhrend \"cherry-pick\" im Gange ist."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:489
 msgid "cannot read the index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:508
 msgid "unable to write temporary index file"
 msgstr "Konnte temporรคre Index-Datei nicht schreiben."
 
-#: builtin/commit.c:582
+#: builtin/commit.c:606
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "Commit '%s' fehlt Autor-Kopfbereich"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:608
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:627
 msgid "malformed --author parameter"
 msgstr "Fehlerhafter --author Parameter"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:680
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11673,38 +12683,38 @@ msgstr ""
 "Konnte kein Kommentar-Zeichen auswรคhlen, das nicht in\n"
 "der aktuellen Commit-Beschreibung verwendet wird."
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "Konnte Commit %s nicht nachschlagen"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:732
 msgid "could not read log from standard input"
 msgstr "Konnte Log nicht von Standard-Eingabe lesen."
 
-#: builtin/commit.c:712
+#: builtin/commit.c:736
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "Konnte Log-Datei '%s' nicht lesen"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:767 builtin/commit.c:783
 msgid "could not read SQUASH_MSG"
 msgstr "Konnte SQUASH_MSG nicht lesen"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:774
 msgid "could not read MERGE_MSG"
 msgstr "Konnte MERGE_MSG nicht lesen"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:834
 msgid "could not write commit template"
 msgstr "Konnte Commit-Vorlage nicht schreiben"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:853
 #, c-format
 msgid ""
 "\n"
@@ -11719,7 +12729,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:858
 #, c-format
 msgid ""
 "\n"
@@ -11734,7 +12744,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:871
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11744,7 +12754,7 @@ msgstr ""
 "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:879
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11757,155 +12767,149 @@ msgstr ""
 "entfernen.\n"
 "Eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:896
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:           %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:904
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:            %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:911
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommit-Ersteller: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:929
 msgid "Cannot read index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
 "vorhandenen Autor รผberein"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ungรผltiger ignored-Modus '%s'."
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1327
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ungรผltiger Modus '%s' fรผr unversionierte Dateien"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "Die Optionen --long und -z sind inkompatibel."
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 "Die Optionen --reset-author und --author kรถnnen nicht gemeinsam verwendet "
 "werden."
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "Sie haben nichts fรผr \"--amend\"."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausfรผhren."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausfรผhren."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1188
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 "Die Optionen --squash und --fixup kรถnnen nicht gemeinsam verwendet werden."
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1198
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1200
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1208
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1225
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
 "verwendet werden."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr ""
-"Die Optionen --include und --only kรถnnen nur mit der Angabe von Pfaden "
-"verwendet werden."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1231
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1362 builtin/commit.c:1524
 msgid "show status concisely"
 msgstr "Status im Kurzformat anzeigen"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1364 builtin/commit.c:1526
 msgid "show branch information"
 msgstr "Branchinformationen anzeigen"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1366
 msgid "show stash information"
 msgstr "Stashinformationen anzeigen"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1368 builtin/commit.c:1528
 msgid "compute full ahead/behind values"
 msgstr "voraus/hinterher-Werte berechnen"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1370
 msgid "version"
 msgstr "Version"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
 msgid "machine-readable output"
 msgstr "maschinenlesbare Ausgabe"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1373 builtin/commit.c:1532
 msgid "show status in long format (default)"
 msgstr "Status im Langformat anzeigen (Standard)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1376 builtin/commit.c:1535
 msgid "terminate entries with NUL"
 msgstr "Eintrรคge mit NUL-Zeichen abschlieรŸen"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
 msgid "mode"
 msgstr "Modus"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1379 builtin/commit.c:1538
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
 "all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1383
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11913,11 +12917,11 @@ msgstr ""
 "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
 "(Standard: traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1385 parse-options.h:192
 msgid "when"
 msgstr "wann"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1386
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11925,174 +12929,174 @@ msgstr ""
 "ร„nderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
 "(Standard: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1388
 msgid "list untracked files in columns"
 msgstr "unversionierte Dateien in Spalten auflisten"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1389
 msgid "do not detect renames"
 msgstr "keine Umbenennungen ermitteln"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1391
 msgid "detect renames, optionally set similarity index"
 msgstr "Umbenennungen erkennen, optional Index fรผr Gleichheit setzen"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1411
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Nicht unterstรผtzte Kombination von ignored und untracked-files Argumenten."
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "suppress summary after successful commit"
 msgstr "Zusammenfassung nach erfolgreichem Commit unterdrรผcken"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1495
 msgid "show diff in commit message template"
 msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1497
 msgid "Commit message options"
 msgstr "Optionen fรผr Commit-Beschreibung"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
 msgid "read message from file"
 msgstr "Beschreibung von Datei lesen"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "author"
 msgstr "Autor"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "override author for commit"
 msgstr "Autor eines Commits รผberschreiben"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1500 builtin/gc.c:538
 msgid "date"
 msgstr "Datum"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1500
 msgid "override date for commit"
 msgstr "Datum eines Commits รผberschreiben"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "Commit"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1502
 msgid "reuse and edit message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1503
 msgid "reuse message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1504
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1505
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1506
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)"
 
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "'Signed-off-by:'-Zeile hinzufรผgen"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1508
 msgid "use specified template file"
 msgstr "angegebene Vorlagendatei verwenden"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1509
 msgid "force edit of commit"
 msgstr "Bearbeitung des Commits erzwingen"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1511
 msgid "include status in commit message template"
 msgstr "Status in die Commit-Beschreibungsvorlage einfรผgen"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1516
 msgid "Commit contents options"
 msgstr "Optionen fรผr Commit-Inhalt"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1517
 msgid "commit all changed files"
 msgstr "alle geรคnderten Dateien committen"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1518
 msgid "add specified files to index for commit"
 msgstr "die angegebenen Dateien zusรคtzlich zum Commit vormerken"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1519
 msgid "interactively add files"
 msgstr "interaktives Hinzufรผgen von Dateien"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1520
 msgid "interactively add changes"
 msgstr "interaktives Hinzufรผgen von ร„nderungen"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1521
 msgid "commit only specified files"
 msgstr "nur die angegebenen Dateien committen"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1522
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "Hooks pre-commit und commit-msg umgehen"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1523
 msgid "show what would be committed"
 msgstr "anzeigen, was committet werden wรผrde"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1536
 msgid "amend previous commit"
 msgstr "vorherigen Commit รคndern"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1537
 msgid "bypass post-rewrite hook"
 msgstr "\"post-rewrite hook\" umgehen"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1544
 msgid "ok to record an empty change"
 msgstr "Aufzeichnung einer leeren ร„nderung erlauben"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1546
 msgid "ok to record a change with an empty message"
 msgstr "Aufzeichnung einer ร„nderung mit einer leeren Beschreibung erlauben"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1619
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Beschรคdigte MERGE_HEAD-Datei (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
 msgid "could not read MERGE_MODE"
 msgstr "Konnte MERGE_MODE nicht lesen"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1645
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1691
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -12103,80 +13107,80 @@ msgstr ""
 "voll und Ihr Kontingent nicht aufgebraucht ist und fรผhren Sie\n"
 "anschlieรŸend \"git restore HEAD --staged :/\" zur Wiederherstellung aus."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <Objektverzeichnis>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <Objektverzeichnis>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-msgstr "git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow] [--"
+"[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
 msgstr ""
 "git commit-graph write [--object-dir <Objektverzeichnis>] [--append|split] "
-"[--reachable|--stdin-packs|--stdin-commits] <Split-Optionen>"
+"[--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <Split-"
+"Optionen>"
+
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr "Verzeichnis"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
 msgid "The object directory to store the graph"
 msgstr "Das Objektverzeichnis zum Speichern des Graphen."
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:71
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 "Wenn der Commit-Graph aufgeteilt ist, nur die Datei an der Spitze รผberprรผfen"
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Konnte Commit-Graph '%s' nicht รถffnen."
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:128
 msgid "start walk at all refs"
 msgstr "Durchlauf auf allen Referenzen beginnen"
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:130
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:132
 msgid "start walk at commits listed by stdin"
 msgstr "Lauf bei Commits beginnen, die รผber die Standard-Eingabe gelistet sind"
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:134
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 "alle Commits einschlieรŸen, die sich bereits in der Commit-Graph-Datei "
 "befinden"
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:137
 msgid "allow writing an incremental commit-graph file"
 msgstr "Erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 "Maximale Anzahl von Commits in einem aufgeteilten Commit-Graph ohne Basis"
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:141
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 "Maximales Verhรคltnis zwischen zwei Ebenen eines aufgeteilten Commit-Graph"
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:159
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 "Benutzen Sie mindestens eins von --reachable, --stdin-commits, oder --stdin-"
@@ -12186,208 +13190,214 @@ msgstr ""
 msgid "git config [<options>]"
 msgstr "git config [<Optionen>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "nicht erkanntes --type Argument, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:116
 msgid "only one type at a time"
 msgstr "nur ein Typ erlaubt"
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr "Ort der Konfigurationsdatei"
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr "globale Konfigurationsdatei verwenden"
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr "systemweite Konfigurationsdatei verwenden"
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr "Konfigurationsdatei des Repositories verwenden"
 
-#: builtin/config.c:128
+#: builtin/config.c:129
 msgid "use per-worktree config file"
 msgstr "Konfigurationsdatei pro Arbeitsverzeichnis verwenden"
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr "die angegebene Konfigurationsdatei verwenden"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr "Blob-Id"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr "Konfiguration von angegebenem Blob-Objekt lesen"
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr "Aktion"
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr "Wert zurรผckgeben: Name [Wert-regex]"
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr "alle Werte zurรผckgeben: Schlรผssel [Wert-regex]"
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "Werte fรผr den regulรคren Ausdruck zurรผckgeben: Name-regex [Wert-regex]"
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "Wert spezifisch fรผr eine URL zurรผckgeben: section[.var] URL"
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] "
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr "neue Variable hinzufรผgen: Name Wert"
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr "eine Variable entfernen: Name [Wert-regex]"
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr "alle รœbereinstimmungen entfernen: Name [Wert-regex]"
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr "eine Sektion umbenennen: alter-Name neuer-Name"
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr "eine Sektion entfernen: Name"
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr "alles auflisten"
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr "einen Editor รถffnen"
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr "die konfigurierte Farbe finden: Slot [Standard]"
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]"
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr "Typ"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
 msgid "value is given this type"
 msgstr "Wert ist mit diesem Typ angegeben"
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr "Wert ist \"true\" oder \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr "Wert ist eine Dezimalzahl"
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr "Wert ist --bool oder --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr "Wert ist ein Verfallsdatum"
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr "Sonstiges"
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr "schlieรŸt Werte mit NUL-Byte ab"
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr "nur Variablennamen anzeigen"
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
 "Befehlszeile)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"Zeige Geltungsbereich der Konfiguration (Arbeitsverzeichnis, lokal, global, "
+"systemweit, Befehl)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
 msgid "value"
 msgstr "Wert"
 
-#: builtin/config.c:158
+#: builtin/config.c:160
 msgid "with --get, use default value when missing entry"
 msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt"
 
-#: builtin/config.c:172
+#: builtin/config.c:174
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "Falsche Anzahl von Argumenten - sollte %d sein."
 
-#: builtin/config.c:174
+#: builtin/config.c:176
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "Falsche Anzahl von Argumenten - sollte zwischen %d und %d sein."
 
-#: builtin/config.c:308
+#: builtin/config.c:324
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "Ungรผltiges Schlรผsselmuster: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:360
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:417
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "Kann Farbe '%s' nicht parsen."
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr "konnte Standard-Farbwert nicht parsen"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
 msgid "not in a git directory"
 msgstr "Nicht in einem Git-Repository."
 
-#: builtin/config.c:499
+#: builtin/config.c:515
 msgid "writing to stdin is not supported"
 msgstr "Das Schreiben in die Standard-Eingabe wird nicht unterstรผtzt."
 
-#: builtin/config.c:502
+#: builtin/config.c:518
 msgid "writing config blobs is not supported"
 msgstr ""
 "Das Schreiben von Blob-Objekten fรผr Konfigurationen wird nicht unterstรผtzt."
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12402,23 +13412,23 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:627
 msgid "only one config file at a time"
 msgstr "Nur eine Konfigurationsdatei zu einer Zeit mรถglich."
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden."
 
-#: builtin/config.c:619
+#: builtin/config.c:635
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden."
 
-#: builtin/config.c:638
+#: builtin/config.c:655
 msgid "$HOME not set"
 msgstr "$HOME nicht gesetzt."
 
-#: builtin/config.c:658
+#: builtin/config.c:679
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12429,52 +13439,52 @@ msgstr ""
 "lesen Sie die Sektion \"CONFIGURATION_FILE\" in \"git help worktree\" fรผr "
 "Details"
 
-#: builtin/config.c:688
+#: builtin/config.c:714
 msgid "--get-color and variable type are incoherent"
 msgstr "Angabe von --get-color und Variablentyp sind ungรผltig."
 
-#: builtin/config.c:693
+#: builtin/config.c:719
 msgid "only one action at a time"
 msgstr "Nur eine Aktion erlaubt."
 
-#: builtin/config.c:706
+#: builtin/config.c:732
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:738
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin ist nur anwendbar auf --get, --get-all, --get-regexp und --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:744
 msgid "--default is only applicable to --get"
 msgstr "--default ist nur anwendbar auf --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:757
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "Konnte Konfigurationsdatei '%s' nicht lesen."
 
-#: builtin/config.c:734
+#: builtin/config.c:760
 msgid "error processing config file(s)"
 msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)."
 
-#: builtin/config.c:744
+#: builtin/config.c:770
 msgid "editing stdin is not supported"
 msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstรผtzt."
 
-#: builtin/config.c:746
+#: builtin/config.c:772
 msgid "editing blobs is not supported"
 msgstr "Das Bearbeiten von Blobs wird nicht unterstรผtzt."
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12484,7 +13494,7 @@ msgstr ""
 "       Benutzen Sie einen regulรคren Ausdruck, --add oder --replace, um %s\n"
 "       zu รคndern."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
 #, c-format
 msgid "no such section: %s"
 msgstr "Keine solche Sektion: %s"
@@ -12497,59 +13507,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "gibt GrรถรŸenangaben in menschenlesbaren Format aus"
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<Optionen>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr "Branch"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr "nicht-annotiert"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr "annotiert"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "annotiertes Tag %s ist nicht verfรผgbar"
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "Tag '%s' ist eigentlich '%s' hier"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "kein Tag entspricht exakt '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Keine exakte รœbereinstimmung bei Referenzen oder Tags, Suche zum "
 "Beschreiben\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:394
 #, c-format
 msgid "finished search at %s\n"
 msgstr "beendete Suche bei %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:421
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12558,7 +13568,7 @@ msgstr ""
 "Keine annotierten Tags kรถnnen '%s' beschreiben.\n"
 "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:425
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12567,12 +13577,12 @@ msgstr ""
 "Keine Tags kรถnnen '%s' beschreiben.\n"
 "Versuchen Sie --always oder erstellen Sie einige Tags."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:455
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu Commits durchlaufen\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:458
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12581,94 +13591,93 @@ msgstr ""
 "mehr als %i Tags gefunden; fรผhre die ersten %i auf\n"
 "Suche bei %s aufgegeben\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:526
 #, c-format
 msgid "describe %s\n"
 msgstr "Beschreibe %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:529
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s ist kein gรผltiger Objekt-Name"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:537
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s ist weder ein Commit, noch ein Blob."
 
-#: builtin/describe.c:535
+#: builtin/describe.c:551
 msgid "find the tag that comes after the commit"
 msgstr "das Tag finden, das nach dem Commit kommt"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:552
 msgid "debug search strategy on stderr"
 msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:553
 msgid "use any ref"
 msgstr "alle Referenzen verwenden"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:554
 msgid "use any tag, even unannotated"
 msgstr "jedes Tag verwenden, auch nicht-annotierte"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:555
 msgid "always use long format"
 msgstr "immer langes Format verwenden"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:556
 msgid "only follow first parent"
 msgstr "nur erstem Elternteil folgen"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:559
 msgid "only output exact matches"
 msgstr "nur exakte รœbereinstimmungen ausgeben"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:561
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "die jรผngsten <n> Tags betrachten (Standard: 10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:563
 msgid "only consider tags matching <pattern>"
 msgstr "nur Tags, die <Muster> entsprechen, betrachten"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:565
 msgid "do not consider tags matching <pattern>"
 msgstr "keine Tags betrachten, die <Muster> entsprechen"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:567 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "gekรผrztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:568 builtin/describe.c:571
 msgid "mark"
-msgstr "Kennzeichen"
+msgstr "Markierung"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:569
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
-"<Kennzeichen> bei geรคndertem Arbeitsverzeichnis anhรคngen (Standard: \"-dirty"
+"<Markierung> bei geรคndertem Arbeitsverzeichnis anhรคngen (Standard: \"-dirty"
 "\")"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:572
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
-"<Kennzeichen> bei defektem Arbeitsverzeichnis anhรคngen (Standard: \"-broken"
-"\")"
+"<Markierung> bei defektem Arbeitsverzeichnis anhรคngen (Standard: \"-broken\")"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:590
 msgid "--long is incompatible with --abbrev=0"
 msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
 
-#: builtin/describe.c:603
+#: builtin/describe.c:619
 msgid "No names found, cannot describe anything."
 msgstr "Keine Namen gefunden, kann nichts beschreiben."
 
-#: builtin/describe.c:654
+#: builtin/describe.c:670
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
 
-#: builtin/describe.c:656
+#: builtin/describe.c:672
 msgid "--broken is incompatible with commit-ishes"
 msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
 
@@ -12705,27 +13714,27 @@ msgstr "unbehandeltes Objekt '%s' angegeben"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "fehlgeschlagen: %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "konnte symbolische Verknรผpfung %s nicht lesen"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "Konnte Datei von symbolischer Verknรผpfung '%s' nicht lesen."
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "Konnte Objekt '%s' fรผr symbolische Verknรผpfung '%s' nicht lesen."
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -12733,54 +13742,54 @@ msgstr ""
 "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
 "Diff-Modus('-d' und '--dir-diff') nicht unterstรผtzt."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "beide Dateien geรคndert: '%s' und '%s'."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr "Datei im Arbeitsverzeichnis belassen."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "Es existieren temporรคre Dateien in '%s'."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr "Sie kรถnnten diese aufrรคumen oder wiederherstellen."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "`diff.guitool` anstatt `diff.tool` benutzen"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr "Diff รผber ganzes Verzeichnis ausfรผhren"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr "keine Eingabeaufforderung vor Ausfรผhrung eines Diff-Tools"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "symbolische Verknรผpfungen im dir-diff Modus verwenden"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr "Tool"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "das angegebene Diff-Tool benutzen"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden kรถnnen"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12789,31 +13798,31 @@ msgstr ""
 "Rรผckkehrwert\n"
 "verschieden 0 ausgefรผhrt wurde"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr "an 'diff' รผbergeben"
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool benรถtigt Arbeitsverzeichnis oder --no-index"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff kann nicht mit --no-index verwendet werden"
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool und --extcmd schlieรŸen sich gegenseitig aus"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "kein <Tool> fรผr --tool=<Tool> angegeben"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "kein <Programm> fรผr --extcmd=<Programm> angegeben"
 
@@ -12853,166 +13862,194 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+"Fehler: Verschachtelte Tags kรถnnen nicht exportiert werden, auรŸer --mark-"
+"tags wurde angegeben."
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr "Fortschritt nach <n> Objekten anzeigen"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr "Behandlung von signierten Tags wรคhlen"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr "Behandlung von Tags wรคhlen, die gefilterte Objekte markieren"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "Auswรคhlen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding"
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
-msgstr "Kennzeichen in diese Datei schreiben"
+msgstr "Markierungen in diese Datei schreiben"
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
-msgstr "Kennzeichen von dieser Datei importieren"
+msgstr "Markierungen von dieser Datei importieren"
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "Markierungen von dieser Datei importieren, wenn diese existiert"
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr "kรผnstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat"
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr "fรผr jeden Commit das gesamte Verzeichnis ausgeben"
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschlieรŸen"
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr "Ausgabe von Blob-Daten รผberspringen"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr "Refspec"
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr "Refspec auf exportierte Referenzen anwenden"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr "Ausgabe anonymisieren"
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 "Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID "
 "referenzieren"
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
 msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "Tags mit Markierungs-IDs beschriften"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr ""
+"--import-marks und --import-marks-if-exists kรถnnen nicht zusammen "
+"weitergegeben werden"
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<Optionen>] <Gruppe>"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<Optionen>]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel kann nicht negativ sein"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
 msgid "fetch from all remotes"
 msgstr "fordert von allen Remote-Repositories an"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "Upstream fรผr \"git pull/fetch\" setzen"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "an .git/FETCH_HEAD anhรคngen, anstatt zu รผberschreiben"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:190
 msgid "path to upload pack on remote end"
 msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr "das รœberschreiben einer lokalen Referenz erzwingen"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr "von mehreren Remote-Repositories anfordern"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:194
 msgid "fetch all tags and associated objects"
 msgstr "alle Tags und verbundene Objekte anfordern"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr "nicht alle Tags anfordern (--no-tags)"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr "Anzahl der parallel anzufordernden Submodule"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:197
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository "
 "befinden"
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, "
 "und geรคnderte Tags aktualisieren"
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
 msgid "on-demand"
 msgstr "bei-Bedarf"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:205
 msgid "keep downloaded pack"
 msgstr "heruntergeladenes Paket behalten"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
 msgid "deepen history of shallow clone"
 msgstr ""
 "die Historie eines Klons mit unvollstรคndiger Historie (shallow) vertiefen"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 "die Historie eines Klons mit unvollstรคndiger Historie (shallow) auf "
 "Zeitbasis\n"
 "vertiefen"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:211
 msgid "convert to a complete repository"
 msgstr "zu einem vollstรคndigen Repository konvertieren"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -13020,92 +14057,96 @@ msgstr ""
 "Standard fรผr die rekursive Anforderung von Submodulen (geringere Prioritรคt\n"
 "als Konfigurationsdateien)"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:214
 msgid "accept refs that update .git/shallow"
 msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:216
 msgid "refmap"
 msgstr "Refmap"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:217
 msgid "specify fetch refmap"
 msgstr "Refmap fรผr 'fetch' angeben"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 "ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar "
 "sind"
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 msgid "run 'gc --auto' after fetching"
 msgstr "Fรผhre 'gc --auto' nach \"fetch\" aus"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:226
 msgid "check for forced-updates on all updated branches"
 msgstr "Prรผfe auf erzwungene Aktualisierungen in allen aktualisierten Branches"
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "Schreibe den Commit-Graph nach \"fetch\""
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr "Konnte Remote-Referenz von HEAD nicht finden."
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "Konfiguration fetch.output enthรคlt ungรผltigen Wert %s"
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr "Objekt %s nicht gefunden"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr "[aktuell]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr "[zurรผckgewiesen]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr "kann \"fetch\" im aktuellen Branch nicht ausfรผhren"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr "[Tag Aktualisierung]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr "kann lokale Referenz nicht aktualisieren"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr "wรผrde bestehende Tags verรคndern"
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr "[neues Tag]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr "[neuer Branch]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr "[neue Referenz]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr "Aktualisierung erzwungen"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr "kein Vorspulen"
 
-#: builtin/fetch.c:854
+#: builtin/fetch.c:877
 msgid ""
 "Fetch normally indicates which branches had a forced update,\n"
 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -13116,7 +14157,7 @@ msgstr ""
 "aktivieren, nutzen Sie die Option '--show-forced-updated' oder fรผhren\n"
 "Sie 'git config fetch.showForcedUpdates true' aus."
 
-#: builtin/fetch.c:858
+#: builtin/fetch.c:881
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -13129,12 +14170,12 @@ msgstr ""
 "'git config fetch.showForcedUpdates false' ausfรผhren, um diese รœberprรผfung\n"
 "zu umgehen.\n"
 
-#: builtin/fetch.c:888
+#: builtin/fetch.c:920
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
 
-#: builtin/fetch.c:909
+#: builtin/fetch.c:941
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
@@ -13142,12 +14183,12 @@ msgstr ""
 "unvollstรคndiger\n"
 "Historie (shallow) nicht aktualisiert werden dรผrfen."
 
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
 #, c-format
 msgid "From %.*s\n"
 msgstr "Von %.*s\n"
 
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1037
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -13156,60 +14197,81 @@ msgstr ""
 "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
 "'git remote prune %s', um jeden รคlteren, widersprรผchlichen Branch zu lรถschen."
 
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1134
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s wird unreferenziert)"
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1135
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s wurde unreferenziert)"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1167
 msgid "[deleted]"
 msgstr "[gelรถscht]"
 
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1168 builtin/remote.c:1112
 msgid "(none)"
 msgstr "(nichts)"
 
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1191
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 "Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
 "wurde verweigert."
 
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1210
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Option \"%s\" Wert \"%s\" ist nicht gรผltig fรผr %s"
 
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1213
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Option \"%s\" wird ignoriert fรผr %s\n"
 
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "Setze keinen Upstream fรผr einen entfernten Remote-Tracking-Branch."
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "Setze keinen Upstream fรผr einen Tag eines Remote-Repositories."
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "Unbekannter Branch-Typ"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"Keinen Quell-Branch gefunden.\n"
+"Sie mรผssen bei der Option --set-upstream genau einen Branch angeben."
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Fordere an von %s\n"
 
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Konnte nicht von %s anfordern"
 
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr ""
-"--filter kann nur mit den Remote-Repositories verwendet werden,\n"
-"die in core.partialClone konfiguriert sind."
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n"
 
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1693
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -13218,49 +14280,49 @@ msgstr ""
 "oder den Namen des Remote-Repositories an, von welchem neue\n"
 "Commits angefordert werden sollen."
 
-#: builtin/fetch.c:1593
+#: builtin/fetch.c:1730
 msgid "You need to specify a tag name."
 msgstr "Sie mรผssen den Namen des Tags angeben."
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1780
 msgid "Negative depth in --deepen is not supported"
 msgstr "Negative Tiefe wird von --deepen nicht unterstรผtzt."
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1782
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen und --depth schlieรŸen sich gegenseitig aus"
 
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1787
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 "Die Optionen --depth und --unshallow kรถnnen nicht gemeinsam verwendet werden."
 
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1789
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 "Die Option --unshallow kann nicht in einem Repository mit vollstรคndiger "
 "Historie verwendet werden."
 
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1805
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all akzeptiert kein Repository als Argument"
 
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1807
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1816
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
 
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1823
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
 "von Refspecs verwendet werden."
 
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1841
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -13275,23 +14337,23 @@ msgstr ""
 "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
 "<Datei>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:671
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "Historie mit hรถchstens <n> Eintrรคgen von \"shortlog\" hinzufรผgen"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:674
 msgid "alias for --log (deprecated)"
 msgstr "Alias fรผr --log (veraltet)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:677
 msgid "text"
 msgstr "Text"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:678
 msgid "use <text> as start of message"
 msgstr "<Text> als Beschreibungsanfang verwenden"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:679
 msgid "file to read from"
 msgstr "Datei zum Einlesen"
 
@@ -13355,32 +14417,32 @@ msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
 msgid "print only refs which don't contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr "unbekannt"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "Fehler in %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "Warnung in %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "Fehlerhafte Verknรผpfung von %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr "Falscher Objekttyp in Verknรผpfung."
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13389,216 +14451,216 @@ msgstr ""
 "Fehlerhafte Verknรผpfung von %7s %s\n"
 "                       nach %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr "%s %s fehlt"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr "%s %s nicht erreichbar"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, c-format
 msgid "dangling %s %s"
 msgstr "%s %s unreferenziert"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 msgid "could not create lost-found"
 msgstr "Konnte lost-found nicht erstellen."
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr "Konnte '%s' nicht abschlieรŸen."
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr "Prรผfe %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Prรผfe Konnektivitรคt (%d Objekte)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr "Prรผfe %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr "Fehlerhafte Verknรผpfungen"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr "Wurzel %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "%s %s (%s) in %s getaggt"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: Objekt fehlerhaft oder nicht vorhanden"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: Ungรผltiger Reflog-Eintrag %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Prรผfe Reflog %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: Ungรผltiger SHA1-Zeiger %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: kein Commit"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr "Notiz: Keine Standardreferenzen"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: Objekt konnte nicht geparst werden: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "Ungรผltige SHA1-Datei: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr "Prรผfe Objekt-Verzeichnis"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr "Prรผfe Objekt-Verzeichnisse"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr "Prรผfe %s Verknรผpfung"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr "Ungรผltiger Objekt-Typ %s"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s zeigt auf etwas seltsames (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: losgelรถster HEAD zeigt auf nichts"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr "Prรผfe Cache-Verzeichnis"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: Ungรผltiger SHA1-Zeiger in Cache-Verzeichnis"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr "non-tree in Cache-Verzeichnis"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<Optionen>] [<Objekt>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr "unerreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr "unreferenzierte Objekte anzeigen"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr "Tags melden"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr "Hauptwurzeln melden"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr "Index-Objekte in Erreichbarkeitsprรผfung einbeziehen"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr "Reflogs in Erreichbarkeitsprรผfung einbeziehen (Standard)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
 msgstr "ebenso Pakete und alternative Objekte betrachten"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr "nur Konnektivitรคt prรผfen"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr "genauere Prรผfung aktivieren"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr "ausfรผhrliche Namen fรผr erreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "Prรผfe Objekte"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: Objekt nicht vorhanden"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "Ungรผltiger Parameter: SHA-1 erwartet, '%s' bekommen"
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr "git gc [<Optionen>]"
 
@@ -13612,17 +14674,17 @@ msgstr "Konnte '%s' nicht lesen: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'"
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "Kann '%s' nicht lesen"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kann '%s' nicht lesen"
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13638,58 +14700,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr "unreferenzierte Objekte entfernen"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr "mehr Grรผndlichkeit (erhรถht Laufzeit)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr "\"auto-gc\" Modus aktivieren"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "Ausfรผhrung von \"git gc\" erzwingen, selbst wenn ein anderes\n"
 "\"git gc\" bereits ausgefรผhrt wird"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr "alle anderen Pakete, auรŸer das grรถรŸte Paket, neu packen"
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry."
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Die Datenbank des Repositories wird fรผr eine optimale Performance im\n"
 "Hintergrund komprimiert.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 "Die Datenbank des Projektarchivs wird fรผr eine optimale Performance "
 "komprimiert.\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Siehe \"git help gc\" fรผr manuelles Aufrรคumen.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13697,14 +14759,14 @@ msgstr ""
 "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgefรผhrt\n"
 "(benutzen Sie --force falls nicht)"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Es gibt zu viele unerreichbare lose Objekte; fรผhren Sie 'git prune' aus, um "
 "diese zu lรถschen."
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
 
@@ -13722,266 +14784,266 @@ msgstr "ungรผltige Anzahl von Threads (%d) fรผr %s angegeben"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "keine Unterstรผtzung von Threads, '%s' wird ignoriert"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:633
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchfรผhren"
 
-#: builtin/grep.c:714
+#: builtin/grep.c:704
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "Schalter '%c' erwartet einen numerischen Wert"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:803
 msgid "search in index instead of in the work tree"
 msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:805
 msgid "find in contents not managed by git"
 msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:807
 msgid "search in both tracked and untracked files"
 msgstr "in versionierten und unversionierten Dateien suchen"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:809
 msgid "ignore files specified via '.gitignore'"
 msgstr "Dateien, die รผber '.gitignore' angegeben sind, ignorieren"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:811
 msgid "recursively search in each submodule"
 msgstr "rekursive Suche in jedem Submodul"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:814
 msgid "show non-matching lines"
 msgstr "Zeilen ohne รœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:816
 msgid "case insensitive matching"
 msgstr "รœbereinstimmungen unabhรคngig von GroรŸ- und Kleinschreibung finden"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:818
 msgid "match patterns only at word boundaries"
 msgstr "nur ganze Wรถrter suchen"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:820
 msgid "process binary files as text"
 msgstr "binรคre Dateien als Text verarbeiten"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:822
 msgid "don't match patterns in binary files"
 msgstr "keine Muster in Binรคrdateien finden"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:825
 msgid "process binary files with textconv filters"
 msgstr "binรคre Dateien mit \"textconv\"-Filtern verarbeiten"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:827
 msgid "search in subdirectories (default)"
 msgstr "in Unterverzeichnissen suchen (Standard)"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:829
 msgid "descend at most <depth> levels"
 msgstr "hรถchstens <Tiefe> Ebenen durchlaufen"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:833
 msgid "use extended POSIX regular expressions"
 msgstr "erweiterte regulรคre Ausdrรผcke aus POSIX verwenden"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:836
 msgid "use basic POSIX regular expressions (default)"
 msgstr "grundlegende regulรคre Ausdrรผcke aus POSIX verwenden (Standard)"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:839
 msgid "interpret patterns as fixed strings"
 msgstr "Muster als feste Zeichenketten interpretieren"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:842
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl-kompatible regulรคre Ausdrรผcke verwenden"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:845
 msgid "show line numbers"
 msgstr "Zeilennummern anzeigen"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:846
 msgid "show column number of first match"
 msgstr "Nummer der Spalte des ersten Treffers anzeigen"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:847
 msgid "don't show filenames"
 msgstr "keine Dateinamen anzeigen"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:848
 msgid "show filenames"
 msgstr "Dateinamen anzeigen"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:850
 msgid "show filenames relative to top directory"
 msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:852
 msgid "show only filenames instead of matching lines"
 msgstr "nur Dateinamen anzeigen anstatt รผbereinstimmende Zeilen"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:854
 msgid "synonym for --files-with-matches"
 msgstr "Synonym fรผr --files-with-matches"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:857
 msgid "show only the names of files without match"
 msgstr "nur die Dateinamen ohne รœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:859
 msgid "print NUL after filenames"
 msgstr "NUL-Zeichen nach Dateinamen ausgeben"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:862
 msgid "show only matching parts of a line"
 msgstr "nur รผbereinstimmende Teile der Zeile anzeigen"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:864
 msgid "show the number of matches instead of matching lines"
 msgstr "anstatt der Zeilen, die Anzahl der รผbereinstimmenden Zeilen anzeigen"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:865
 msgid "highlight matches"
 msgstr "รœbereinstimmungen hervorheben"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:867
 msgid "print empty line between matches from different files"
 msgstr ""
 "eine Leerzeile zwischen รœbereinstimmungen in verschiedenen Dateien ausgeben"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:869
 msgid "show filename only once above matches from same file"
 msgstr ""
 "den Dateinamen nur einmal oberhalb der รœbereinstimmungen aus dieser Datei "
 "anzeigen"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:872
 msgid "show <n> context lines before and after matches"
 msgstr "<n> Zeilen vor und nach den รœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:875
 msgid "show <n> context lines before matches"
 msgstr "<n> Zeilen vor den รœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:877
 msgid "show <n> context lines after matches"
 msgstr "<n> Zeilen nach den รœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:879
 msgid "use <n> worker threads"
 msgstr "<n> Threads benutzen"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:880
 msgid "shortcut for -C NUM"
 msgstr "Kurzform fรผr -C NUM"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:883
 msgid "show a line with the function name before matches"
 msgstr "eine Zeile mit dem Funktionsnamen vor รœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:885
 msgid "show the surrounding function"
 msgstr "die umgebende Funktion anzeigen"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:888
 msgid "read patterns from file"
 msgstr "Muster von einer Datei lesen"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:890
 msgid "match <pattern>"
 msgstr "<Muster> finden"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:892
 msgid "combine patterns specified with -e"
 msgstr "Muster kombinieren, die mit -e angegeben wurden"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:904
 msgid "indicate hit with exit status without output"
 msgstr "รœbereinstimmungen nur durch Beendigungsstatus anzeigen"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:906
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "nur รœbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:908
 msgid "show parse tree for grep expression"
 msgstr "geparstes Verzeichnis fรผr \"grep\"-Ausdruck anzeigen"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "pager"
 msgstr "Anzeigeprogramm"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "show matching files in the pager"
 msgstr "Dateien mit รœbereinstimmungen im Anzeigeprogramm anzeigen"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:916
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:983
 msgid "no pattern given"
 msgstr "Kein Muster angegeben."
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1019
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index oder --untracked kรถnnen nicht mit Commits verwendet werden"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1027
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "Konnte Commit nicht auflรถsen: %s"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstรผtzt"
+
+#: builtin/grep.c:1061
 msgid "invalid option combination, ignoring --threads"
 msgstr "Ungรผltige Kombination von Optionen, --threads wird ignoriert."
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
 msgid "no threads support, ignoring --threads"
 msgstr "Keine Unterstรผtzung fรผr Threads, --threads wird ignoriert."
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ungรผltige Anzahl von Threads angegeben (%d)"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1101
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 "Die Option --open-files-in-pager kann nur innerhalb des "
 "Arbeitsverzeichnisses verwendet werden."
 
-#: builtin/grep.c:1117
-msgid "option not supported with --recurse-submodules"
-msgstr "Die Option wird mit --recurse-submodules nicht unterstรผtzt."
-
-#: builtin/grep.c:1123
+#: builtin/grep.c:1127
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached und --untracked kรถnnen nicht mit --no-index verwendet werden."
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1133
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 "--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
 "werden."
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1141
 msgid "both --cached and trees are given"
 msgstr "--cached und \"Tree\"-Objekte angegeben"
 
@@ -14167,11 +15229,11 @@ msgstr "Fehler beim Lesen der Eingabe"
 msgid "used more bytes than were available"
 msgstr "verwendete mehr Bytes als verfรผgbar waren"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
 msgid "pack too large for current definition of off_t"
 msgstr "Paket ist zu groรŸ fรผr die aktuelle Definition von off_t"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "Paket รผberschreitet die maximal erlaubte GrรถรŸe"
 
@@ -14228,191 +15290,191 @@ msgstr[1] "frรผhzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
 msgid "serious inflate inconsistency"
 msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
 #, c-format
 msgid "unable to read %s"
 msgstr "kann %s nicht lesen"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "Kann existierendes Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ungรผltiges Blob-Objekt %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
 msgid "fsck error in packed object"
 msgstr "fsck Fehler in gepacktem Objekt"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr "Konnte Dateiunterschied nicht anwenden"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr "Empfange Objekte"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr "Indiziere Objekte"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "Paket ist beschรคdigt (SHA1 unterschiedlich)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr "kann Paketdatei nicht lesen"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr "Paketende enthรคlt nicht verwendbaren Inhalt"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "Fehler beim Ausfรผhren von \"parse_pack_objects()\""
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr "Lรถse Unterschiede auf"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kann Thread nicht erzeugen: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr "Fehler beim Auflรถsen der Unterschiede"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "abgeschlossen mit %d lokalem Objekt"
 msgstr[1] "abgeschlossen mit %d lokalen Objekten"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Unerwartete Prรผfsumme fรผr %s (Festplattenfehler?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "Paket hat %d unaufgelรถsten Unterschied"
 msgstr[1] "Paket hat %d unaufgelรถste Unterschiede"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "Konnte angehรคngtes Objekt (%d) nicht komprimieren"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokales Objekt %s ist beschรคdigt"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "Kann %s Datei '%s' nicht schreiben."
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "Kann eben geschriebene %s Datei '%s' nicht schlieรŸen."
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
 msgid "error while closing pack file"
 msgstr "Fehler beim SchlieรŸen der Paketdatei"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
 msgid "cannot store pack file"
 msgstr "Kann Paketdatei nicht speichern"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
 msgid "cannot store index file"
 msgstr "Kann Indexdatei nicht speichern"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "\"pack.indexversion=%<PRIu32>\" ist ungรผltig"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kann existierende Paketdatei '%s' nicht รถffnen"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Kann existierende Indexdatei fรผr Paket '%s' nicht รถffnen"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "kein Unterschied: %d Objekt"
 msgstr[1] "kein Unterschied: %d Objekte"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "Lรคnge der Objekt-Liste = %d: %lu Objekt"
 msgstr[1] "Lรคnge der Objekt-Liste = %d: %lu Objekte"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
 msgid "Cannot come back to cwd"
 msgstr "Kann nicht zurรผck zum Arbeitsverzeichnis wechseln"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
 #, c-format
 msgid "bad %s"
 msgstr "%s ist ungรผltig"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
 msgid "--stdin requires a git repository"
 msgstr "--stdin erfordert ein Git-Repository"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
 msgid "--verify with no packfile name given"
 msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "fsck Fehler beim Packen von Objekten"
 
@@ -14597,121 +15659,127 @@ msgstr ""
 msgid "no input file given for in-place editing"
 msgstr "keine Datei zur direkten Bearbeitung angegeben"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<Optionen>] <Objekt>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "Ungรผltige Option fรผr --decorate: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:174
 msgid "show source"
 msgstr "Quelle anzeigen"
 
-#: builtin/log.c:174
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr "\"mailmap\"-Datei verwenden"
 
-#: builtin/log.c:176
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
 
-#: builtin/log.c:178
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
 
-#: builtin/log.c:179
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr "decorate-Optionen"
 
-#: builtin/log.c:182
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezรคhlt von 1"
 
-#: builtin/log.c:280
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "letzte Ausgabe: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ungรผltige Datei"
 
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:550 builtin/log.c:645
 #, c-format
 msgid "could not read object %s"
 msgstr "Konnte Objekt %s nicht lesen."
 
-#: builtin/log.c:668
+#: builtin/log.c:670
 #, c-format
 msgid "unknown type: %d"
 msgstr "Unbekannter Typ: %d"
 
-#: builtin/log.c:791
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr ""
+"%s: Ungรผltiger Modus fรผr Erstellung des Deckblattes aus der Beschreibung"
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr "format.headers ohne Wert"
 
-#: builtin/log.c:908
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr "Name des Ausgabeverzeichnisses ist zu lang."
 
-#: builtin/log.c:924
+#: builtin/log.c:952
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "Kann Patch-Datei %s nicht รถffnen"
 
-#: builtin/log.c:941
+#: builtin/log.c:969
 msgid "need exactly one range"
 msgstr "Brauche genau einen Commit-Bereich."
 
-#: builtin/log.c:951
+#: builtin/log.c:979
 msgid "not a range"
 msgstr "Kein Commit-Bereich."
 
-#: builtin/log.c:1074
+#: builtin/log.c:1143
 msgid "cover letter needs email format"
 msgstr "Anschreiben benรถtigt E-Mail-Format"
 
-#: builtin/log.c:1080
+#: builtin/log.c:1149
 msgid "failed to create cover-letter file"
 msgstr "Fehler beim Erstellen der Datei fรผr das Anschreiben."
 
-#: builtin/log.c:1159
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ungรผltiges in-reply-to: %s"
 
-#: builtin/log.c:1186
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1313
 msgid "two output directories?"
 msgstr "Zwei Ausgabeverzeichnisse?"
 
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, c-format
 msgid "unknown commit %s"
 msgstr "Unbekannter Commit %s"
 
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "Konnte '%s' nicht als gรผltige Referenz auflรถsen."
 
-#: builtin/log.c:1370
+#: builtin/log.c:1439
 msgid "could not find exact merge base"
 msgstr "Konnte keine exakte Merge-Basis finden."
 
-#: builtin/log.c:1374
+#: builtin/log.c:1443
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -14722,272 +15790,281 @@ msgstr ""
 "'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
 "Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
 
-#: builtin/log.c:1394
+#: builtin/log.c:1463
 msgid "failed to find exact merge base"
 msgstr "Fehler beim Finden einer exakten Merge-Basis."
 
-#: builtin/log.c:1405
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr "Basis-Commit sollte der Vorgรคnger der Revisionsliste sein."
 
-#: builtin/log.c:1409
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
 
-#: builtin/log.c:1462
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr "kann Patch-Id nicht lesen"
 
-#: builtin/log.c:1514
+#: builtin/log.c:1583
 msgid "failed to infer range-diff ranges"
 msgstr "Fehler beim Ableiten des range-diff-Bereichs."
 
-#: builtin/log.c:1559
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
 
-#: builtin/log.c:1562
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr "[PATCH] auch mit mehreren Patches verwenden"
 
-#: builtin/log.c:1566
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr "Ausgabe der Patches in Standard-Ausgabe"
 
-#: builtin/log.c:1568
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr "ein Deckblatt erzeugen"
 
-#: builtin/log.c:1570
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr "einfache Nummernfolge fรผr die Namen der Ausgabedateien verwenden"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr "Dateiendung"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr "<Dateiendung> anstatt '.patch' verwenden"
 
-#: builtin/log.c:1574
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr "die Serie als n-te Fassung kennzeichnen"
 
-#: builtin/log.c:1578
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
 
-#: builtin/log.c:1581
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "Modus fรผr Erstellung des Deckblattes aus der Beschreibung"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"Erzeuge Teile des Deckblattes basierend auf der Beschreibung des Branches"
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "[<Prรคfix>] anstatt [PATCH] verwenden"
+msgstr "Nutze [<Prรคfix>] statt [PATCH]"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr "erzeugte Dateien in <Verzeichnis> speichern"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH] nicht entfernen/hinzufรผgen"
 
-#: builtin/log.c:1590
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr "keine binรคren Unterschiede ausgeben"
 
-#: builtin/log.c:1592
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 "keine Patches einschlieรŸen, die einem Commit im Upstream-Branch entsprechen"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr "E-Mail-Einstellungen"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1672
 msgid "header"
 msgstr "Header"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr "E-Mail-Header hinzufรผgen"
 
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr "E-Mail"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr "\"To:\"-Header hinzufรผgen"
 
-#: builtin/log.c:1603
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr "\"Cc:\"-Header hinzufรผgen"
 
-#: builtin/log.c:1605
+#: builtin/log.c:1678
 msgid "ident"
 msgstr "Ident"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
 "fehlend)"
 
-#: builtin/log.c:1608
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
 
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr "Grenze"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr "den Patch anhรคngen"
 
-#: builtin/log.c:1614
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr "den Patch direkt in die Nachricht einfรผgen"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1693
 msgid "signature"
 msgstr "Signatur"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr "eine Signatur hinzufรผgen"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr "Basis-Commit"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufรผgen"
 
-#: builtin/log.c:1625
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr "eine Signatur aus einer Datei hinzufรผgen"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr "keine Dateinamen der Patches anzeigen"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr "Forschrittsanzeige wรคhrend der Erzeugung der Patches"
 
-#: builtin/log.c:1630
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "ร„nderungen gegenรผber <Commit> im Deckblatt oder einzelnem Patch anzeigen"
 
-#: builtin/log.c:1633
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "ร„nderungen gegenรผber <Refspec> im Deckblatt oder einzelnem Patch anzeigen"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
 
-#: builtin/log.c:1710
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "Ungรผltige Identifikationszeile: %s"
 
-#: builtin/log.c:1725
+#: builtin/log.c:1807
 msgid "-n and -k are mutually exclusive"
 msgstr "-n und -k schlieรŸen sich gegenseitig aus."
 
-#: builtin/log.c:1727
+#: builtin/log.c:1809
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc und -k schlieรŸen sich gegenseitig aus."
 
-#: builtin/log.c:1735
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr "Die Option --name-only kann nicht verwendet werden."
 
-#: builtin/log.c:1737
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr "Die Option --name-status kann nicht verwendet werden."
 
-#: builtin/log.c:1739
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr "Die Option --check kann nicht verwendet werden."
 
-#: builtin/log.c:1771
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
 msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
 
-#: builtin/log.c:1860
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch."
 
-#: builtin/log.c:1864
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1865
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff gegen v%d:"
 
-#: builtin/log.c:1871
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor erfordert --range-diff"
 
-#: builtin/log.c:1875
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch."
 
-#: builtin/log.c:1883
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr "Range-Diff:"
 
-#: builtin/log.c:1884
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-Diff gegen v%d:"
 
-#: builtin/log.c:1895
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "Konnte Signatur-Datei '%s' nicht lesen"
 
-#: builtin/log.c:1931
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr "Erzeuge Patches"
 
-#: builtin/log.c:1975
+#: builtin/log.c:2073
 msgid "failed to create output files"
 msgstr "Fehler beim Erstellen der Ausgabedateien."
 
-#: builtin/log.c:2034
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
 
-#: builtin/log.c:2088
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15118,7 +16195,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "URL des Remote-Repositories nicht ausgeben"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
 msgid "exec"
 msgstr "Programm"
 
@@ -15207,151 +16284,151 @@ msgstr "git merge --abort"
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:119
 msgid "switch `m' requires a value"
 msgstr "Schalter 'm' erfordert einen Wert."
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "Option `%s' erfordert einen Wert."
 
-#: builtin/merge.c:187
+#: builtin/merge.c:188
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:189
 #, c-format
 msgid "Available strategies are:"
 msgstr "Verfรผgbare Strategien sind:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:194
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Verfรผgbare benutzerdefinierte Strategien sind:"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:245 builtin/pull.c:132
 msgid "do not show a diffstat at the end of the merge"
 msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:248 builtin/pull.c:135
 msgid "show a diffstat at the end of the merge"
 msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:249 builtin/pull.c:138
 msgid "(synonym to --stat)"
 msgstr "(Synonym fรผr --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:251 builtin/pull.c:141
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "(hรถchstens <n>) Eintrรคge von \"shortlog\" zur Beschreibung des Merge-Commits "
 "hinzufรผgen"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:254 builtin/pull.c:147
 msgid "create a single commit instead of doing a merge"
 msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:256 builtin/pull.c:150
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "einen Commit durchfรผhren, wenn der Merge erfolgreich war (Standard)"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:258 builtin/pull.c:153
 msgid "edit message before committing"
 msgstr "Bearbeitung der Beschreibung vor dem Commit"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:260
 msgid "allow fast-forward (default)"
 msgstr "Vorspulen erlauben (Standard)"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:262 builtin/pull.c:160
 msgid "abort if fast-forward is not possible"
 msgstr "abbrechen, wenn kein Vorspulen mรถglich ist"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:266 builtin/pull.c:163
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "den genannten Commit auf eine gรผltige GPG-Signatur รผberprรผfen"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
 msgid "strategy"
 msgstr "Strategie"
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:268 builtin/pull.c:168
 msgid "merge strategy to use"
 msgstr "zu verwendende Merge-Strategie"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:171
 msgid "option=value"
 msgstr "Option=Wert"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option for selected merge strategy"
 msgstr "Option fรผr ausgewรคhlte Merge-Strategie"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "Commit-Beschreibung zusammenfรผhren (fรผr einen Merge, der kein Vorspulen war)"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge abbrechen"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort, aber Index und Arbeitsverzeichnis unverรคndert lassen"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge fortsetzen"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:285 builtin/pull.c:179
 msgid "allow merging unrelated histories"
 msgstr "erlaube das Zusammenfรผhren von nicht zusammenhรคngenden Historien"
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "commit-msg Hook รผberprรผfen"
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "Hooks pre-merge-commit und commit-msg umgehen"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:308
 msgid "could not run stash."
 msgstr "Konnte \"stash\" nicht ausfรผhren."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:313
 msgid "stash failed"
 msgstr "\"stash\" fehlgeschlagen"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:318
 #, c-format
 msgid "not a valid object: %s"
 msgstr "kein gรผltiges Objekt: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
 msgid "read-tree failed"
 msgstr "read-tree fehlgeschlagen"
 
-#: builtin/merge.c:386
+#: builtin/merge.c:387
 msgid " (nothing to squash)"
 msgstr " (nichts zu quetschen)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:398
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:448
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:499
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' zeigt auf keinen Commit"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:586
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Ungรผltiger branch.%s.mergeoptions String: %s"
@@ -15406,75 +16483,75 @@ msgstr ""
 "Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
 "und eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:865
 msgid "Empty commit message."
 msgstr "Leere Commit-Beschreibung"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:880
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wunderbar.\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:941
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
 "Sie dann das Ergebnis.\n"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:980
 msgid "No current branch."
 msgstr "Sie befinden sich auf keinem Branch."
 
-#: builtin/merge.c:974
+#: builtin/merge.c:982
 msgid "No remote for the current branch."
 msgstr "Kein Remote-Repository fรผr den aktuellen Branch."
 
-#: builtin/merge.c:976
+#: builtin/merge.c:984
 msgid "No default upstream defined for the current branch."
 msgstr ""
 "Es ist kein Standard-Upstream-Branch fรผr den aktuellen Branch definiert."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:989
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Kein Remote-Tracking-Branch fรผr %s von %s"
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1046
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1149
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nichts was wir in %s zusammenfรผhren kรถnnen: %s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1183
 msgid "not something we can merge"
 msgstr "nichts was wir zusammenfรผhren kรถnnen"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1286
 msgid "--abort expects no arguments"
 msgstr "--abort akzeptiert keine Argumente"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1290
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1299
 msgid "--quit expects no arguments"
 msgstr "--quit erwartet keine Argumente"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1312
 msgid "--continue expects no arguments"
 msgstr "--continue erwartet keine Argumente"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1316
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1332
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15482,7 +16559,7 @@ msgstr ""
 "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
 "Bitte committen Sie Ihre ร„nderungen, bevor Sie den Merge ausfรผhren."
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1339
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15490,100 +16567,100 @@ msgstr ""
 "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
 "Bitte committen Sie Ihre ร„nderungen, bevor Sie den Merge ausfรผhren."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1342
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1356
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Sie kรถnnen --squash nicht mit --no-ff kombinieren."
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1358
 msgid "You cannot combine --squash with --commit."
 msgstr "Sie kรถnnen --squash nicht mit --commit kombinieren."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1374
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1391
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausfรผhren."
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1393
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
 "werden."
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1398
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nichts was wir zusammenfรผhren kรถnnen"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1400
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenfรผhren."
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1481
 msgid "refusing to merge unrelated histories"
 msgstr "Verweigere den Merge von nicht zusammenhรคngenden Historien."
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1490
 msgid "Already up to date."
 msgstr "Bereits aktuell."
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1500
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualisiere %s..%s\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1549
 #, c-format
 msgid "Nope.\n"
 msgstr "Nein.\n"
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1574
 msgid "Already up to date. Yeeah!"
 msgstr "Bereits aktuell."
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1580
 msgid "Not possible to fast-forward, aborting."
 msgstr "Vorspulen nicht mรถglich, breche ab."
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1603 builtin/merge.c:1668
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rรผcklauf des Verzeichnisses bis zum Ursprung ...\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1607
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Probiere Merge-Strategie %s ...\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1659
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1661
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1670
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Benutzen Sie \"%s\", um die Auflรถsung per Hand vorzubereiten.\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1682
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -15669,33 +16746,33 @@ msgstr "keine Warnung bei Konflikten"
 msgid "set labels for file1/orig-file/file2"
 msgstr "Beschriftung fรผr Datei1/orig-Datei/Datei2 setzen"
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "unbekannte Option: %s"
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "kann nicht mit mehr als %d Merge-Basis umgehen. Ignoriere %s."
 msgstr[1] "kann nicht mit mehr als %d Merge-Basen umgehen. Ignoriere %s."
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "Es wird nur der Merge von zwei Branches behandelt."
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "Konnte Referenz '%s' nicht auflรถsen"
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Fรผhre %s mit %s zusammen\n"
@@ -15718,18 +16795,18 @@ msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben"
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
-"git multi-pack-index [--object-dir=<Verzeichnis>] (write|verify|expire|"
-"repack --batch-size=<GrรถรŸe>)"
+"git multi-pack-index [<Optionen>] (write|verify|expire|repack --batch-"
+"size=<GrรถรŸe>)"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthรคlt"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15737,15 +16814,15 @@ msgstr ""
 "Wรคhrend des Umpackens, sammle Paket-Dateien von geringerer GrรถรŸe in "
 "einenStapel, welcher grรถรŸer ist als diese GrรถรŸe"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr "Zu viele Argumente."
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr "Option --batch-size ist nur fรผr den Unterbefehl 'repack'"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "Nicht erkannter Unterbefehl: %s"
@@ -15840,52 +16917,52 @@ msgstr "%s, Quelle=%s, Ziel=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Benenne %s nach %s um\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "Umbenennung von '%s' fehlgeschlagen"
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<Optionen>] <Commit>..."
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<Optionen>] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<Optionen>] --stdin"
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr "nur Namen anzeigen (keine SHA-1)"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "nur Tags verwenden, um die Commits zu benennen"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignoriere Referenzen die <Muster> entsprechen"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "von der Standard-Eingabe lesen"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
 
@@ -16291,7 +17368,7 @@ msgstr "der Versuch, eine nicht existierende Notiz zu lรถschen, ist kein Fehler"
 msgid "read object names from the standard input"
 msgstr "Objektnamen von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "nicht lรถschen, nur anzeigen"
 
@@ -16307,7 +17384,7 @@ msgstr "Notiz-Referenz"
 msgid "use notes from <notes-ref>"
 msgstr "Notizen von <Notiz-Referenz> verwenden"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1643
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
@@ -16326,129 +17403,106 @@ msgstr ""
 "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:430
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "Ungรผltiges CRC fรผr gepacktes Objekt %s."
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:441
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "Fehlerhaftes gepacktes Objekt fรผr %s."
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:572
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "Rekursiver Unterschied fรผr Objekt %s festgestellt."
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u Objekte geordnet, %<PRIu32> erwartet."
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "Packdatei ist ungรผltig: %s"
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "Konnte Packdatei nicht zur Wiederverwendung รถffnen: %s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "Konnte \"seek\" nicht in wiederverwendeter Packdatei ausfรผhren."
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "Konnte nicht von wiederverwendeter Packdatei lesen."
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:972
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
 "aufgetrennt."
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:985
 msgid "Writing objects"
 msgstr "Schreibe Objekte"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "Konnte '%s' nicht lesen"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1099
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "Schrieb %<PRIu32> Objekte wรคhrend %<PRIu32> erwartet waren."
 
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1297
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
 "Datei\n"
 "geschrieben wurden."
 
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1724
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "\"delta base offset\" รœberlauf in Paket fรผr %s"
 
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1733
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "\"delta base offset\" liegt auรŸerhalb des gรผltigen Bereichs fรผr %s"
 
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:2004
 msgid "Counting objects"
 msgstr "Zรคhle Objekte"
 
-#: builtin/pack-objects.c:2005
-#, c-format
-msgid "unable to get size of %s"
-msgstr "Konnte GrรถรŸe von %s nicht bestimmen."
-
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2149
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
 
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
 #, c-format
 msgid "object %s cannot be read"
 msgstr "Objekt %s kann nicht gelesen werden."
 
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "Inkonsistente Objektlรคnge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2259
 msgid "suboptimal pack - out of memory"
 msgstr "ungรผnstiges Packet - Speicher voll"
 
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2574
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Delta-Kompression verwendet bis zu %d Threads."
 
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2713
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind."
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2801
 msgid "Compressing objects"
 msgstr "Komprimiere Objekte"
 
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2807
 msgid "inconsistency with delta count"
 msgstr "Inkonsistenz mit der Anzahl von Deltas"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2888
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16457,7 +17511,7 @@ msgstr ""
 "Erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
 " %s"
 
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2894
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16466,261 +17520,247 @@ msgstr ""
 "Erwartete Objekt-ID, erhielt nutzlose Daten:\n"
 " %s"
 
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2992
 msgid "invalid value for --missing"
 msgstr "Ungรผltiger Wert fรผr --missing."
 
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
 msgid "cannot open pack index"
 msgstr "Kann Paketindex nicht รถffnen."
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:3082
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "Loses Objekt bei %s konnte nicht untersucht werden."
 
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3167
 msgid "unable to force loose object"
 msgstr "Konnte loses Objekt nicht erzwingen."
 
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3260
 #, c-format
 msgid "not a rev '%s'"
 msgstr "'%s' ist kein Commit."
 
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3263
 #, c-format
 msgid "bad revision '%s'"
 msgstr "Ungรผltiger Commit '%s'."
 
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3288
 msgid "unable to add recent objects"
 msgstr "Konnte jรผngste Objekte nicht hinzufรผgen."
 
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3341
 #, c-format
 msgid "unsupported index version %s"
 msgstr "Nicht unterstรผtzte Index-Version %s"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "bad index version '%s'"
 msgstr "Ungรผltige Index-Version '%s'"
 
-#: builtin/pack-objects.c:3248
-msgid "do not show progress meter"
-msgstr "keine Fortschrittsanzeige anzeigen"
-
-#: builtin/pack-objects.c:3250
-msgid "show progress meter"
-msgstr "Fortschrittsanzeige anzeigen"
-
-#: builtin/pack-objects.c:3252
-msgid "show progress meter during object writing phase"
-msgstr "Forschrittsanzeige wรคhrend des Schreibens von Objekten anzeigen"
-
-#: builtin/pack-objects.c:3255
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "รคhnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3383
 msgid "<version>[,<offset>]"
 msgstr "<Version>[,<Offset>]"
 
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3384
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3387
 msgid "maximum size of each output pack file"
 msgstr "maximale GrรถรŸe fรผr jede ausgegebene Paketdatei"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3389
 msgid "ignore borrowed objects from alternate object store"
 msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3391
 msgid "ignore packed objects"
 msgstr "gepackte Objekte ignorieren"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3393
 msgid "limit pack window by objects"
 msgstr "Paketfenster durch Objekte begrenzen"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3395
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "Paketfenster, zusรคtzlich zur Objektbegrenzung, durch Speicher begrenzen"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3397
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "maximale Lรคnge der erlaubten Differenzverkettung im resultierenden Paket"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3399
 msgid "reuse existing deltas"
 msgstr "existierende Unterschiede wiederverwenden"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3401
 msgid "reuse existing objects"
 msgstr "existierende Objekte wiederverwenden"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3403
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA Objekte verwenden"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3405
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "Threads bei der Suche nach den besten รœbereinstimmungen bei Unterschieden "
 "verwenden"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3407
 msgid "do not create an empty pack output"
 msgstr "keine leeren Pakete erzeugen"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3409
 msgid "read revision arguments from standard input"
 msgstr "Argumente bezรผglich Commits von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3411
 msgid "limit the objects to those that are not yet packed"
 msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3414
 msgid "include objects reachable from any reference"
 msgstr "Objekte einschlieรŸen, die von jeder Referenz erreichbar sind"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3417
 msgid "include objects referred by reflog entries"
 msgstr ""
 "Objekte einschlieรŸen, die von Eintrรคgen des Reflogs referenziert werden"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3420
 msgid "include objects referred to by the index"
 msgstr "Objekte einschlieรŸen, die vom Index referenziert werden"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3423
 msgid "output pack to stdout"
 msgstr "Paket in die Standard-Ausgabe schreiben"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3425
 msgid "include tag objects that refer to objects to be packed"
 msgstr "Tag-Objekte einschlieรŸen, die auf gepackte Objekte referenzieren"
 
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3427
 msgid "keep unreachable objects"
 msgstr "nicht erreichbare Objekte behalten"
 
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3429
 msgid "pack loose unreachable objects"
 msgstr "nicht erreichbare lose Objekte packen"
 
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3431
 msgid "unpack unreachable objects newer than <time>"
 msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3434
 msgid "use the sparse reachability algorithm"
 msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3436
 msgid "create thin packs"
 msgstr "dรผnnere Pakete erzeugen"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3438
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 "Pakete geeignet fรผr Abholung mit unvollstรคndiger Historie (shallow) erzeugen"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3440
 msgid "ignore packs that have companion .keep file"
 msgstr "Pakete ignorieren, die .keep Dateien haben"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3442
 msgid "ignore this pack"
 msgstr "dieses Paket ignorieren"
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3444
 msgid "pack compression level"
 msgstr "Komprimierungsgrad fรผr Paketierung"
 
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3446
 msgid "do not hide commits by grafts"
 msgstr "keine kรผnstlichen Vorgรคnger-Commits (\"grafts\") verbergen"
 
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3448
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "Bitmap-Index (falls verfรผgbar) zur Optimierung der Objektzรคhlung benutzen"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3450
 msgid "write a bitmap index together with the pack index"
 msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
 
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3454
 msgid "write a bitmap index if possible"
 msgstr "Bitmap-Index schreiben, wenn mรถglich"
 
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3458
 msgid "handling for missing objects"
 msgstr "Behandlung fรผr fehlende Objekte"
 
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3461
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
 "packen"
 
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3463
 msgid "respect islands during delta compression"
 msgstr "Delta-Islands bei Delta-Kompression beachten"
 
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3492
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "Tiefe fรผr Verkettung von Unterschieden %d ist zu tief, erzwinge %d"
 
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3497
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3551
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size kann nicht fรผr die Erstellung eines Pakets fรผr eine "
 "รœbertragung\n"
 "benutzt werden."
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3553
 msgid "minimum pack size limit is 1 MiB"
 msgstr "Minimales Limit fรผr die PaketgrรถรŸe ist 1 MiB."
 
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3558
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 "--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen."
 
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3561
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
 
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3567
 msgid "cannot use --filter without --stdout"
 msgstr "Kann --filter nicht ohne --stdout benutzen."
 
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3627
 msgid "Enumerating objects"
 msgstr "Objekte aufzรคhlen"
 
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3657
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 msgstr ""
 "Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta "
-"%<PRIu32>)"
+"%<PRIu32>), Pack wiederverwendet %<PRIu32>"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16764,53 +17804,53 @@ msgstr ""
 msgid "cannot prune in a precious-objects repo"
 msgstr "kann \"prune\" in precious-objects Repository nicht ausfรผhren"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Ungรผltiger Wert fรผr %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/pull.c:141
+#: builtin/pull.c:122
 msgid "control for recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:126
 msgid "Options related to merging"
 msgstr "Optionen bezogen auf Merge"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:129
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "Integration von ร„nderungen durch Rebase statt Merge"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "Vorspulen erlauben"
 
-#: builtin/pull.c:185
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:182
 msgid "Options related to fetching"
 msgstr "Optionen bezogen auf Fetch"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:192
 msgid "force overwrite of local branch"
 msgstr "das รœberschreiben von lokalen Branches erzwingen"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:200
 msgid "number of submodules pulled in parallel"
 msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:300
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Ungรผltiger Wert fรผr pull.ff: %s"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:426
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16818,14 +17858,14 @@ msgstr ""
 "Es gibt keinen Kandidaten fรผr Rebase innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:435
+#: builtin/pull.c:428
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Es gibt keine Kandidaten fรผr Merge innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:429
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16833,7 +17873,7 @@ msgstr ""
 "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
 "haben, der auf der Gegenseite mit keinen Referenzen รผbereinstimmt."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:432
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16845,39 +17885,39 @@ msgstr ""
 "Repository fรผr den aktuellen Branch ist, mรผssen Sie einen Branch auf\n"
 "der Befehlszeile angeben."
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausfรผhren "
 "mรถchten."
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenfรผhren mรถchten."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:442 builtin/pull.c:457
 msgid "See git-pull(1) for details."
 msgstr "Siehe git-pull(1) fรผr weitere Details."
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<Remote-Repository>"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<Branch>"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Es gibt keine Tracking-Informationen fรผr den aktuellen Branch."
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
@@ -16885,7 +17925,7 @@ msgstr ""
 "Sie\n"
 "dies tun mit:"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:466
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16895,34 +17935,34 @@ msgstr ""
 "des Remote-Repositories durchzufรผhren, aber diese Referenz\n"
 "wurde nicht angefordert."
 
-#: builtin/pull.c:581
+#: builtin/pull.c:576
 #, c-format
 msgid "unable to access commit %s"
 msgstr "Konnte nicht auf Commit '%s' zugreifen."
 
-#: builtin/pull.c:861
+#: builtin/pull.c:857
 msgid "ignoring --verify-signatures for rebase"
 msgstr "Ignoriere --verify-signatures fรผr Rebase"
 
-#: builtin/pull.c:916
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash ist nur mit --rebase zulรคssig."
 
-#: builtin/pull.c:924
+#: builtin/pull.c:920
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Aktualisiere einen ungeborenen Branch mit ร„nderungen, die zum Commit "
 "vorgemerkt sind."
 
-#: builtin/pull.c:928
+#: builtin/pull.c:924
 msgid "pull with rebase"
 msgstr "Pull mit Rebase"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:925
 msgid "please commit or stash them."
 msgstr "Bitte committen Sie die ร„nderungen oder benutzen Sie \"stash\"."
 
-#: builtin/pull.c:954
+#: builtin/pull.c:950
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16932,7 +17972,7 @@ msgstr ""
 "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
 "Spule Ihr Arbeitsverzeichnis von Commit %s vor."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:956
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16949,15 +17989,15 @@ msgstr ""
 "$ git reset --hard\n"
 "zur Wiederherstellung aus."
 
-#: builtin/pull.c:975
+#: builtin/pull.c:971
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenfรผhren."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:975
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kann Rebase nicht auf mehrere Branches ausfรผhren."
 
-#: builtin/pull.c:986
+#: builtin/pull.c:982
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "Kann Rebase nicht mit lokal aufgezeichneten ร„nderungen in Submodulen "
@@ -16967,15 +18007,15 @@ msgstr ""
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "Kurzschrift fรผr Tag ohne <Tag>"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel."
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16984,7 +18024,7 @@ msgstr ""
 "Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
 "config'."
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -17010,7 +18050,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -17025,7 +18065,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<Name-des-Remote-Branches>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -17039,13 +18079,13 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert."
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -17056,14 +18096,14 @@ msgstr ""
 "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
 "Remote-Branch zu aktualisieren."
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Sie haben keine Refspec fรผr \"push\" angegeben, und push.default ist "
 "\"nothing\"."
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -17077,7 +18117,7 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "fรผr weitere Details."
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -17091,7 +18131,7 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "fรผr weitere Details."
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -17110,13 +18150,13 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "fรผr weitere Details."
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Aktualisierungen wurden zurรผckgewiesen, weil das Tag bereits\n"
 "im Remote-Repository existiert."
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -17126,141 +18166,141 @@ msgstr ""
 "das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
 "die Option '--force' zu verwenden.\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
-msgstr "Versende nach %s\n"
+msgstr "Push nach %s\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "ungรผltiges Repository '%s'"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"Kein Ziel fรผr \"push\" konfiguriert.\n"
-"Entweder spezifizieren Sie die URL von der Befehlszeile oder konfigurieren "
-"ein Remote-Repository unter Benutzung von\n"
-"\n"
-"    git remote add <Name> <URL>\n"
-"\n"
-"und fรผhren \"push\" dann unter Benutzung dieses Namens aus\n"
-"\n"
-"    git push <Name>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr "Repository"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "alle Referenzen versenden"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "alle Referenzen spiegeln"
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "Referenzen lรถschen"
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "Aktualisierung erzwingen"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
 msgstr "<Referenzname>:<Erwartungswert>"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr "rekursiven \"push\" von Submodulen steuern"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr "kleinere Pakete verwenden"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "'receive pack' Programm"
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr "Upstream fรผr \"git pull/status\" setzen"
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
 msgstr "lokal gelรถschte Referenzen entfernen"
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr "\"pre-push hook\" umgehen"
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr "fehlende, aber relevante Tags versenden"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr "signiert \"push\" mit GPG"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr "Referenzen atomar versenden"
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "ungรผltiges Repository '%s'"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"Kein Ziel fรผr \"push\" konfiguriert.\n"
+"Entweder spezifizieren Sie die URL von der Befehlszeile oder konfigurieren "
+"ein Remote-Repository unter Benutzung von\n"
+"\n"
+"    git remote add <Name> <URL>\n"
+"\n"
+"und fรผhren \"push\" dann unter Benutzung dieses Namens aus\n"
+"\n"
+"    git push <Name>\n"
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr "Die Optionen --all und --tags sind inkompatibel."
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr "Die Optionen --mirror und --tags sind inkompatibel."
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr "Die Optionen --all und --mirror sind inkompatibel."
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr "Push-Optionen dรผrfen keine Zeilenvorschubzeichen haben"
 
@@ -17278,24 +18318,32 @@ msgstr "git range-diff [<Optionen>] <alte-Spitze>...<neue-Spitze>"
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<Optionen>] <Basis> <alte-Spitze> <neue-Spitze>"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "einfache Diff-Farben benutzen"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "Notizen"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "an 'git log' รผbergeben"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr "Kein .. im Bereich: '%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein."
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "Benรถtige zwei Commit-Bereiche."
 
@@ -17378,13 +18426,17 @@ msgstr "unpack-trees protokollieren"
 msgid "suppress feedback messages"
 msgstr "Rรผckmeldungen unterdrรผcken"
 
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Sie mรผssen zuerst die Konflikte in Ihrem aktuellen Index auflรถsen."
+
 #: builtin/rebase.c:32
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] "
-"[<Upstream>] [<Branch>]"
+"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis> | --"
+"keep-base] [<Upstream> [<Branch>]]"
 
 #: builtin/rebase.c:34
 msgid ""
@@ -17397,217 +18449,208 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "Unbenutzbare TODO-Liste: '%s'"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "Konnte '%s' nicht schreiben."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "Kein HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:292
 #, c-format
 msgid "could not create temporary %s"
 msgstr "Konnte temporรคres Verzeichnis '%s' nicht erstellen."
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:298
 msgid "could not mark as interactive"
 msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:352
 msgid "could not generate todo list"
 msgstr "Konnte TODO-Liste nicht erzeugen."
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:391
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden."
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:461
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<Optionen>]"
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "leere Commits behalten"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(VERALTET) leere Commits behalten"
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "Commits mit leerer Beschreibung erlauben"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:480
 msgid "rebase merge commits"
 msgstr "Rebase auf Merge-Commits ausfรผhren"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:482
 msgid "keep original branch points of cousins"
 msgstr "originale Branch-Punkte der Cousins behalten"
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:484
 msgid "move commits that begin with squash!/fixup!"
 msgstr "Commits verschieben, die mit squash!/fixup! beginnen"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:485
 msgid "sign commits"
 msgstr "Commits signieren"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:487 builtin/rebase.c:1490
 msgid "display a diffstat of what changed upstream"
 msgstr ""
 "Zusammenfassung der Unterschiede gegenรผber dem Upstream-Branch anzeigen"
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:489
 msgid "continue rebase"
 msgstr "Rebase fortsetzen"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:491
 msgid "skip commit"
 msgstr "Commit auslassen"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:492
 msgid "edit the todo list"
 msgstr "die TODO-Liste bearbeiten"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:494
 msgid "show the current patch"
 msgstr "den aktuellen Patch anzeigen"
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:497
 msgid "shorten commit ids in the todo list"
 msgstr "Commit-IDs in der TODO-Liste verkรผrzen"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:499
 msgid "expand commit ids in the todo list"
 msgstr "Commit-IDs in der TODO-Liste erweitern"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:501
 msgid "check the todo list"
 msgstr "die TODO-Liste prรผfen"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:503
 msgid "rearrange fixup/squash lines"
 msgstr "fixup/squash-Zeilen umordnen"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:505
 msgid "insert exec commands in todo list"
 msgstr "\"exec\"-Befehle in TODO-Liste einfรผgen"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:506
 msgid "onto"
 msgstr "auf"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict-revision"
 msgstr "Begrenzungscommit"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict revision"
 msgstr "Begrenzungscommit"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:511
 msgid "squash-onto"
 msgstr "squash-onto"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:512
 msgid "squash onto"
 msgstr "squash onto"
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:514
 msgid "the upstream commit"
 msgstr "der Upstream-Commit"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head-name"
 msgstr "head-Name"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head name"
 msgstr "head-Name"
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:521
 msgid "rebase strategy"
 msgstr "Rebase-Strategie"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:522
 msgid "strategy-opts"
 msgstr "Strategie-Optionen"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:523
 msgid "strategy options"
 msgstr "Strategie-Optionen"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:524
 msgid "switch-to"
 msgstr "wechseln zu"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:525
 msgid "the branch or commit to checkout"
 msgstr "der Branch oder Commit zum Auschecken"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto-name"
 msgstr "onto-Name"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto name"
 msgstr "onto-Name"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "cmd"
 msgstr "Befehl"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "the command to run"
 msgstr "auszufรผhrender Befehl"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:530 builtin/rebase.c:1584
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:546
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung"
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:562
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s erfordert ein interaktives Rebase"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:612
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "Konnte 'onto' nicht bestimmen: '%s'"
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:627
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "Ungรผltiges orig-head: '%s'"
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:652
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "Ignoriere ungรผltiges allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:728
 #, c-format
 msgid "Could not read '%s'"
 msgstr "Konnte '%s' nicht lesen."
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:746
 #, c-format
 msgid "Cannot store %s"
 msgstr "Kann %s nicht speichern."
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:853
 msgid "could not determine HEAD revision"
 msgstr "Konnte HEAD-Commit nicht bestimmen."
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17623,7 +18666,7 @@ msgstr ""
 "Um abzubrechen und zurรผck zum Zustand vor \"git rebase\" zu gelangen,\n"
 "fรผhren Sie \"git rebase --abort\" aus."
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -17643,7 +18686,16 @@ msgstr ""
 "Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
 "ausfรผhren."
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"nicht erkannter leerer Typ '%s'; Gรผltige Werte sind \"drop\", \"keep\", und "
+"\"ask\"."
+
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "%s\n"
@@ -17661,7 +18713,7 @@ msgstr ""
 "    git rebase '<Branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1417
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17675,132 +18727,140 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<Branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1447
 msgid "exec commands cannot contain newlines"
 msgstr "\"exec\"-Befehle kรถnnen keine neuen Zeilen enthalten"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1451
 msgid "empty exec command"
 msgstr "Leerer \"exec\"-Befehl."
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1481
 msgid "rebase onto given branch instead of upstream"
 msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausfรผhren"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "Nutze die Merge-Basis von Upstream und Branch als die aktuelle Basis"
+
+#: builtin/rebase.c:1485
 msgid "allow pre-rebase hook to run"
 msgstr "Ausfรผhrung des pre-rebase-Hooks erlauben"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1487
 msgid "be quiet. implies --no-stat"
 msgstr "weniger Ausgaben (impliziert --no-stat)"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1493
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 "Zusammenfassung der Unterschiede gegenรผber dem Upstream-Branch verbergen"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1496
 msgid "add a Signed-off-by: line to each commit"
 msgstr "eine \"Signed-off-by:\"-Zeile zu jedem Commit hinzufรผgen"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
 msgid "passed to 'git am'"
 msgstr "an 'git am' รผbergeben"
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
 msgid "passed to 'git apply'"
 msgstr "an 'git apply' รผbergeben"
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 "Cherry-Pick auf alle Commits ausfรผhren, auch wenn diese unverรคndert sind"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1515
 msgid "continue"
 msgstr "fortsetzen"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1518
 msgid "skip current patch and continue"
 msgstr "den aktuellen Patch auslassen und fortfahren"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1520
 msgid "abort and check out the original branch"
 msgstr "abbrechen und den ursprรผnglichen Branch auschecken"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1523
 msgid "abort but keep HEAD where it is"
 msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1524
 msgid "edit the todo list during an interactive rebase"
 msgstr "TODO-Liste wรคhrend eines interaktiven Rebase bearbeiten"
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1527
 msgid "show the patch file being applied or merged"
 msgstr "den Patch, der gerade angewendet oder zusammengefรผhrt wird, anzeigen"
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "Strategien von 'git am' bei Rebase verwenden"
+
+#: builtin/rebase.c:1534
 msgid "use merging strategies to rebase"
 msgstr "Merge-Strategien beim Rebase verwenden"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1538
 msgid "let the user edit the list of commits to rebase"
 msgstr "den Benutzer die Liste der Commits fรผr den Rebase bearbeiten lassen"
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1542
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr ""
 "(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren"
 
-#: builtin/rebase.c:1455
-msgid "preserve empty commits during rebase"
-msgstr "leere Commits wรคhrend des Rebase erhalten"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "wie sollen Commits behandelt werden, die leer werden"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1554
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1560
 msgid "automatically stash/stash pop before and after"
 msgstr "automatischer Stash/Stash-Pop davor und danach"
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1562
 msgid "add exec lines after each commit of the editable list"
 msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufรผgen"
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1566
 msgid "allow rebasing commits with empty messages"
 msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1570
 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 "versuchen, Rebase mit Merges auszufรผhren, anstatt diese zu รผberspringen"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1573
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 "'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1575
 msgid "use the given merge strategy"
 msgstr "angegebene Merge-Strategie verwenden"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
 msgid "option"
 msgstr "Option"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1578
 msgid "pass the argument through to the merge strategy"
 msgstr "Argument zur Merge-Strategie durchreichen"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1581
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausfรผhren"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1598
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -17808,32 +18868,40 @@ msgstr ""
 "Die Unterstรผtzung fรผr rebase.useBuiltin wurde entfernt!\n"
 "Siehe dessen Eintrag in 'git help config' fรผr Details."
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1604
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchfรผhren."
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1645
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 "'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--"
 "rebase-merges'."
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden"
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden"
+
+#: builtin/rebase.c:1656
 msgid "No rebase in progress?"
 msgstr "Kein Rebase im Gange?"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1660
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Die --edit-todo Aktion kann nur wรคhrend eines interaktiven Rebase verwendet "
 "werden."
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1683
 msgid "Cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1695
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17841,16 +18909,16 @@ msgstr ""
 "Sie mรผssen alle Merge-Konflikte editieren und diese dann\n"
 "mittels \"git add\" als aufgelรถst markieren"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1714
 msgid "could not discard worktree changes"
 msgstr "Konnte ร„nderungen im Arbeitsverzeichnis nicht verwerfen."
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1733
 #, c-format
 msgid "could not move back to %s"
 msgstr "Konnte nicht zu %s zurรผckgehen."
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1778
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17871,179 +18939,170 @@ msgstr ""
 "und fรผhren Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
 "etwas Schรผtzenswertes vorhanden ist.\n"
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1806
 msgid "switch `C' expects a numerical value"
 msgstr "Schalter `C' erwartet einen numerischen Wert."
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1847
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Unbekannter Modus: %s"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1869
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy erfordert --merge oder --interactive"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr ""
+"Optionen fรผr \"am\" kรถnnen nicht mit Optionen fรผr \"merge\" kombiniert "
+"werden."
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Unbekanntes Rebase-Backend: %s"
+
+#: builtin/rebase.c:1937
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
 
-#: builtin/rebase.c:1809
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"Optionen fรผr \"am\" kรถnnen nicht mit Optionen fรผr \"interactive\" oder "
-"\"merge\" kombiniert werden."
-
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1957
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr ""
 "'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden."
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1961
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' "
 "kombiniert werden."
 
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr ""
-"'--rebase-merges' kann nicht mit '--strategy-option' kombiniert werden."
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "'--rebase-merges' kann nicht mit '--strategy' kombiniert werden."
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1985
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "Ungรผltiger Upstream '%s'"
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1991
 msgid "Could not create new root commit"
 msgstr "Konnte neuen Root-Commit nicht erstellen."
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s': benรถtige genau eine Merge-Basis mit dem Branch"
+
+#: builtin/rebase.c:2020
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': benรถtige genau eine Merge-Basis"
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:2028
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "'%s' zeigt auf keinen gรผltigen Commit."
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:2054
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "fatal: Branch/Commit '%s' nicht gefunden"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2073
 msgid "Could not resolve HEAD to a revision"
 msgstr "Konnte HEAD zu keinem Commit auflรถsen."
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2111
 msgid "Cannot autostash"
 msgstr "Kann automatischen Stash nicht erzeugen."
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2114
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Unerwartete 'stash'-Antwort: '%s'"
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2120
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Konnte Verzeichnis fรผr '%s' nicht erstellen."
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2123
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Automatischen Stash erzeugt: %s\n"
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2126
 msgid "could not reset --hard"
 msgstr "Konnte 'reset --hard' nicht ausfรผhren."
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD ist jetzt bei %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2135
 msgid "Please commit or stash them."
 msgstr "Bitte committen Sie die ร„nderungen oder benutzen Sie \"stash\"."
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr "Konnte '%s' nicht parsen."
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2169
 #, c-format
 msgid "could not switch to %s"
 msgstr "Konnte nicht zu %s wechseln."
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2180
 msgid "HEAD is up to date."
 msgstr "HEAD ist aktuell."
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2182
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2190
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD ist aktuell, Rebase erzwungen."
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n"
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2200
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Der \"pre-rebase hook\" hat den Rebase zurรผckgewiesen."
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2207
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "ร„nderungen zu %s:\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2210
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "ร„nderungen von %s zu %s:\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2235
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Zunรคchst wird der Branch zurรผckgespult, um Ihre ร„nderungen darauf neu "
 "anzuwenden...\n"
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2244
 msgid "Could not detach HEAD"
 msgstr "Konnte HEAD nicht loslรถsen."
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2253
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Spule %s vor zu %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <Git-Verzeichnis>"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:821
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -18075,7 +19134,7 @@ msgstr ""
 "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
 "'refuse'."
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -18126,49 +19185,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <Referenz>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' ist kein gรผltiger Zeitstempel"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Markiere nicht erreichbare Objekte..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s zeigt auf nichts!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr "Kein Reflog zum Lรถschen angegeben."
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr "Kein Reflog: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "Kein Reflog fรผr '%s'."
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "Ungรผltiges Format fรผr Referenzen: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -18176,82 +19235,82 @@ msgstr ""
 "git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <Name> <URL>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <alt> <neu>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <Name>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <Name>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <Name>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <Name> <Branch>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <Name>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <Name> <neueURL>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <Name> <URL>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<Optionen>] <Name> <URL>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <Name> <Branch>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <Name> <Branch>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<Optionen>] <Name>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<Optionen>] <Name>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Aktualisiere %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18259,88 +19318,104 @@ msgstr ""
 "--mirror ist gefรคhrlich und veraltet; bitte\n"
 "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "unbekanntes Argument fรผr Option --mirror: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "die Remote-Branches anfordern"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "alle Tags und verbundene Objekte beim Anfordern importieren"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "oder fordere gar keine Tags an (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "Branch(es) zur รœbernahme"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "Hauptbranch"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "Aufsetzen des Remote-Repositories als Spiegel-Repository fรผr \"push\" und "
 "\"fetch\""
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 "Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet "
 "werden."
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
 "Spiegelarchiven verwendet werden."
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr "externes Repository %s existiert bereits"
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' ist kein gรผltiger Name fรผr ein Remote-Repository"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Konnte symbolische Referenz fรผr Hauptbranch von '%s' nicht einrichten"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Konnte Fetch-Map fรผr Refspec %s nicht bekommen"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "(รผbereinstimmend)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "(lรถsche)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "konnte '%s' nicht setzen"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Die %s Konfiguration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"benennt jetzt das nicht existierende Remote-Repository '%s'"
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Kein solches Remote-Repository: '%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18351,17 +19426,17 @@ msgstr ""
 "\t%s\n"
 "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "Konnte '%s' nicht lรถschen"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr "Konnte '%s' nicht erstellen"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18377,118 +19452,118 @@ msgstr[1] ""
 "entfernt;\n"
 "um diese zu entfernen, benutzen Sie:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " neu (wird bei nรคchstem \"fetch\" in remotes/%s gespeichert)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr " gefolgt"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " veraltet (benutzen Sie 'git remote prune' zum Lรถschen)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "ungรผltiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausfรผhren"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "interaktiver Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1052
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr " fรผhrt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr "fรผhrt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    und mit Remote-Branch %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr "erstellt"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr "gelรถscht"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr "aktuell"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr "vorspulbar"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr "lokal nicht aktuell"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s erzwingt Versandt nach %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s versendet nach %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s erzwingt Versand nach %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s versendet nach %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr "keine Abfrage von Remote-Repositories"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr "* Remote-Repository %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL zum Abholen: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr "(keine URL)"
 
@@ -18496,25 +19571,25 @@ msgstr "(keine URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL zum Versenden: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Hauptbranch: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr "(nicht abgefragt)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -18522,172 +19597,163 @@ msgstr ""
 "  Hauptbranch (externer HEAD ist mehrdeutig, kรถnnte einer der folgenden "
 "sein):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Remote-Branch:%s"
 msgstr[1] "  Remote-Branches:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr " (Zustand nicht abgefragt)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokaler Branch konfiguriert fรผr 'git pull':"
 msgstr[1] "  Lokale Branches konfiguriert fรผr 'git pull':"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokale Referenzen werden von 'git push' gespiegelt"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Lokale Referenz konfiguriert fรผr 'git push'%s:"
 msgstr[1] "  Lokale Referenzen konfiguriert fรผr 'git push'%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "setzt refs/remotes/<Name>/HEAD gemรครŸ dem Remote-Repository"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "entfernt refs/remotes/<Name>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Mehrere Hauptbranches im Remote-Repository. Bitte wรคhlen Sie explizit einen "
 "aus mit:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr "Konnte %s nicht entfernen"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "keine gรผltige Referenz: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr "Konnte %s nicht einrichten"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s wird unreferenziert!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s wurde unreferenziert!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr "entferne veraltete Branches von %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [wรผrde veralteten Branch entfernen] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr "* [veralteten Branch entfernt] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Kein solches Remote-Repository '%s'"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr "Branch hinzufรผgen"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr "kein Remote-Repository angegeben"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr "nur URLs fรผr Push ausgeben"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr "alle URLs ausgeben"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "Keine URLs fรผr Remote-Repository '%s' konfiguriert."
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr "URLs fรผr \"push\" manipulieren"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr "URL hinzufรผgen"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr "URLs lรถschen"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr ""
 "Die Optionen --add und --delete kรถnnen nicht gemeinsam verwendet werden."
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "ungรผltiges altes URL Format: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Keine solche URL gefunden: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr "Werde keine URLs entfernen, die nicht fรผr \"push\" bestimmt sind"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Unbekannter Unterbefehl: %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr "git repack [<Optionen>]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18696,119 +19762,119 @@ msgstr ""
 "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
 "Konfiguration."
 
-#: builtin/repack.c:190
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "Konnte 'pack-objects' fรผr das Neupacken von Objekten aus partiell geklonten\n"
 "Remote-Repositories nicht starten."
 
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: Erwarte Zeilen mit vollstรคndiger Hex-Objekt-ID nur von pack-objects."
 
-#: builtin/repack.c:246
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "Konnte 'pack-objects' fรผr das Neupacken von Objekten aus partiell geklonten\n"
 "Remote-Repositories nicht abschlieรŸen."
 
-#: builtin/repack.c:284
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr "alles in eine einzige Pack-Datei packen"
 
-#: builtin/repack.c:286
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelรถscht"
 
-#: builtin/repack.c:289
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausfรผhren"
 
-#: builtin/repack.c:291
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "--no-reuse-delta an git-pack-objects รผbergeben"
 
-#: builtin/repack.c:293
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "--no-reuse-object an git-pack-objects รผbergeben"
 
-#: builtin/repack.c:295
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr "git-update-server-info nicht ausfรผhren"
 
-#: builtin/repack.c:298
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr "--local an git-pack-objects รผbergeben"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr "Bitmap-Index schreiben"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:310
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "--delta-islands an git-pack-objects รผbergeben"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr "Datumsangabe"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr "mit -A, keine Objekte รคlter als dieses Datum lรถschen"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr "mit -a, nicht erreichbare Objekte neu packen"
 
-#: builtin/repack.c:308
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr "GrรถรŸe des Fensters fรผr die Delta-Kompression"
 
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr "Bytes"
 
-#: builtin/repack.c:310
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "gleiches wie oben, aber die SpeichergrรถรŸe anstatt der\n"
 "Anzahl der Eintrรคge limitieren"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr "die maximale Delta-Tiefe limitieren"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr "maximale Anzahl von Threads limitieren"
 
-#: builtin/repack.c:316
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr "maximale GrรถรŸe fรผr jede Paketdatei"
 
-#: builtin/repack.c:318
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
 
-#: builtin/repack.c:320
+#: builtin/repack.c:328
 msgid "do not repack this pack"
 msgstr "dieses Paket nicht neu packen"
 
-#: builtin/repack.c:330
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kann Pack-Dateien in precious-objects Repository nicht lรถschen"
 
-#: builtin/repack.c:334
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable und -A sind inkompatibel"
 
-#: builtin/repack.c:417
+#: builtin/repack.c:425
 msgid "Nothing new to pack."
 msgstr "Nichts Neues zum Packen."
 
-#: builtin/repack.c:478
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -18827,7 +19893,7 @@ msgstr ""
 "WARNUNG: ebenfalls fehl.\n"
 "WARNUNG: Bitte benennen Sie diese manuell nach %s um:\n"
 
-#: builtin/repack.c:526
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "Fehler beim Lรถschen von '%s'"
@@ -18936,8 +20002,8 @@ msgstr "Kann fstat auf %s nicht ausfรผhren."
 msgid "unable to write object to database"
 msgstr "Konnte Objekt nicht in Datenbank schreiben."
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "Kein gรผltiger Objektname: '%s'"
@@ -18956,22 +20022,22 @@ msgstr "Bearbeiten von Objektdatei fehlgeschlagen."
 msgid "new object is the same as the old one: '%s'"
 msgstr "Neues Objekt ist dasselbe wie das alte: '%s'"
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "Konnte nicht %s als Commit parsen."
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "ungรผltiger Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "fehlerhafter Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18980,31 +20046,31 @@ msgstr ""
 "Der ursprรผngliche Commit '%s' enthรคlt Merge-Tag '%s', der verworfen\n"
 "wird; benutzen Sie --edit anstatt --graft"
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "Der originale Commit '%s' hat eine GPG-Signatur."
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "Konnte Ersetzungs-Commit fรผr '%s' nicht schreiben"
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "Kรผnstlicher Vorgรคnger (\"graft\") fรผr '%s' nicht notwendig."
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "Neuer Commit ist derselbe wie der alte: '%s'"
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -19013,71 +20079,71 @@ msgstr ""
 "Konnte die folgenden kรผnstlichen Vorgรคnger (\"grafts\") nicht konvertieren:\n"
 "%s"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "ersetzende Referenzen auflisten"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "ersetzende Referenzen lรถschen"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "existierendes Objekt bearbeiten"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "Eltern-Commits eines Commits รคndern"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "existierende Datei des kรผnstlichen Vorgรคngers (\"graft\") konvertieren"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "die Referenz ersetzen, wenn sie existiert"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "keine ansprechende Anzeige des Objektinhaltes fรผr --edit"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "das angegebene Format benutzen"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format kann nicht beim Auflisten verwendet werden."
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn."
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw macht nur mit --edit Sinn."
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d benรถtigt mindestens ein Argument."
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "Ungรผltige Anzahl von Argumenten."
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e benรถtigt genau ein Argument."
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g benรถtigt mindestens ein Argument."
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file erwartet keine Argumente"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "Mit -l kann nur ein Muster angegeben werden."
 
@@ -19105,115 +20171,127 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfade>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfadspezifikation>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfade>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<Commit-"
+"Referenz>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfadspezifikation>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "zusammenfรผhren"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr "Sie haben keinen gรผltigen HEAD."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
 
-#: builtin/reset.c:193
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ist jetzt bei %s"
+
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Kann keinen '%s'-Reset durchfรผhren, wรคhrend ein Merge im Gange ist."
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "weniger Ausgaben, nur Fehler melden"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr "HEAD und Index umsetzen"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr "nur HEAD umsetzen"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD umsetzen, aber lokale ร„nderungen behalten"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr "nur speichern, dass gelรถschte Pfade spรคter hinzugefรผgt werden sollen"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Konnte '%s' nicht als gรผltigen Commit auflรถsen."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Konnte '%s' nicht als gรผltiges \"Tree\"-Objekt auflรถsen."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- "
 "<Pfade>'."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Ein '%s'-Reset mit Pfaden ist nicht mรถglich."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
 msgstr "-N kann nur mit -mixed benutzt werden"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr "Nicht zum Commit vorgemerkte ร„nderungen nach Zurรผcksetzung:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -19227,37 +20305,31 @@ msgstr ""
 "das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n"
 "auf \"true\", um das zum Standard zu machen.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 "--exclude-promisor-objects und --missing kรถnnen nicht kombiniert werden."
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "Das Filtern von Objekten erfordert --objects."
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "Ungรผltiger \"sparse\"-Wert '%s'."
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list unterstรผtzt keine Anzeige von Notizen"
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr ""
-"--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden."
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "markiertes Zรคhlen ist inkompatibel mit der Option --objects"
 
 #: builtin/rev-parse.c:408
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -19425,38 +20497,44 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "die folgende Datei hat lokale ร„nderungen:"
 msgstr[1] "die folgenden Dateien haben lokale ร„nderungen:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "keine gelรถschten Dateien auflisten"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "nur aus dem Index entfernen"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "die \"up-to-date\" Prรผfung รผberschreiben"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "rekursives Entfernen erlauben"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "mit Rรผckgabewert 0 beenden, wenn keine รœbereinstimmung gefunden wurde"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr ""
+"Es wurde keine Pfadspezifikation angegeben. Welche Dateien sollen entfernt "
+"werden?"
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Bitte merken Sie Ihre ร„nderungen in .gitmodules zum Commit vor oder\n"
 "benutzen Sie \"stash\", um fortzufahren."
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: konnte %s nicht lรถschen"
@@ -19711,15 +20789,85 @@ msgstr ""
 "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen "
 "Repository befinden"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <Optionen>"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"Dieses Arbeitsverzeichnis ist nicht partiell (Datei fรผr partieller Checkout "
+"existiert eventuell nicht)."
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "Fehler beim Erstellen eines Verzeichnisses fรผr Datei eines partiellen "
+"Checkouts"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "Einstellung fรผr extensions.worktreeConfig konnte nicht gesetzt werden"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "Initialisiere den partiellen Checkout im Cone-Modus"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "Partiellen Checkout initialisieren"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "Fehler beim ร–ffnen von '%s'"
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "konnte Pfad '%s' nicht normalisieren"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "konnte Anfรผhrungszeichen von C-Style Zeichenkette '%s' nicht entfernen"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "Muster von der Standard-Eingabe lesen"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "setze Muster fรผr partiellen Checkout"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "Partiellen Checkout deaktivieren"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "Fehler wรคhrend der Aktualisierung des Arbeitsverzeichnisses."
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<Optionen>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<Optionen>] [<Stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<Stash>]"
 
@@ -19727,25 +20875,27 @@ msgstr "git stash drop [-q|--quiet] [<Stash>]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<Stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <Branch> [<Stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
+"          [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n"
 "          [--] [<Pfadspezifikation>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19753,189 +20903,199 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<Nachricht>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<Stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<Stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <Nachricht>] [-q|--quiet] <Commit>"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
+"          [--] [<Pfadspezifikation>...]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' ist kein \"stash\"-artiger Commit"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Zu viele Commits angegeben:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr "Keine Stash-Eintrรคge gefunden."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "'%s' ist kein gรผltiger Referenzname."
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear mit Parametern ist nicht implementiert"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "Kann Stash nicht anwenden, solange ein Merge im Gange ist"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "Konnte keinen Diff erzeugen %s^!."
 
-#: builtin/stash.c:421
+#: builtin/stash.c:422
 msgid "conflicts in index.Try without --index."
 msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "Konnte Index-Verzeichnis nicht speichern"
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Fรผhre %s mit %s zusammen"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
 msgstr "Index wurde nicht aus dem Stash zurรผckgeladen."
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
 msgid "attempt to recreate the index"
 msgstr "Versuche Index wiederherzustellen."
 
-#: builtin/stash.c:549
+#: builtin/stash.c:555
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s (%s) gelรถscht"
 
-#: builtin/stash.c:552
+#: builtin/stash.c:558
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Konnte Stash-Eintrag nicht lรถschen"
 
-#: builtin/stash.c:577
+#: builtin/stash.c:583
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' ist keine Stash-Referenz"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 "Der Stash-Eintrag wird fรผr den Fall behalten, dass Sie diesen nochmal "
 "benรถtigen."
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr "Kein Branchname spezifiziert"
 
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Kann nicht %s mit %s aktualisieren."
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
 msgid "stash message"
 msgstr "Stash-Beschreibung"
 
-#: builtin/stash.c:818
+#: builtin/stash.c:824
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" erwartet ein Argument <Commit>"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr "Keine ร„nderungen ausgewรคhlt"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr "Sie haben bisher noch keinen initialen Commit"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr "Kann den aktuellen Zustand des Index nicht speichern"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr "Kann die unversionierten Dateien nicht speichern"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden"
 
-#: builtin/stash.c:1285
+#: builtin/stash.c:1298
 msgid "Did you forget to 'git add'?"
 msgstr "Haben Sie vielleicht 'git add' vergessen?"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr "Keine lokalen ร„nderungen zum Speichern"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr "Kann \"stash\" nicht initialisieren"
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr "Kann den aktuellen Status nicht speichern"
 
-#: builtin/stash.c:1327
+#: builtin/stash.c:1340
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr "Kann ร„nderungen im Arbeitsverzeichnis nicht lรถschen"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "keep index"
 msgstr "behalte Index"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash in patch mode"
 msgstr "Stash in Patch-Modus"
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1472 builtin/stash.c:1537
 msgid "quiet mode"
 msgstr "weniger Ausgaben"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1474 builtin/stash.c:1539
 msgid "include untracked files in stash"
 msgstr "unversionierte Dateien in Stash einbeziehen"
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1476 builtin/stash.c:1541
 msgid "include ignore files"
 msgstr "ignorierte Dateien einbeziehen"
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1600
 #, c-format
 msgid "could not exec %s"
 msgstr "Konnte 'exec %s' nicht ausfรผhren."
@@ -19958,40 +21118,40 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Vollstรคndiger Referenzname erwartet, %s erhalten"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "'submodule--helper print-default-remote' erwartet keine Argumente."
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr "Alternativer Anker fรผr relative Pfade"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Keine URL fรผr Submodul-Pfad '%s' in .gitmodules gefunden"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Betrete '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -20000,7 +21160,7 @@ msgstr ""
 "run_command gab nicht-Null Status fรผr '%s' zurรผck.\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -20012,21 +21172,21 @@ msgstr ""
 "nicht-Null Status zurรผck.\n"
 "."
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr ""
 "Ausgaben beim Betreten und der Befehlsausfรผhrung in einem Submodul "
 "unterdrรผcken"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr "Rekursion in verschachtelte Submodule durchfรผhren"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -20035,104 +21195,104 @@ msgstr ""
 "Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
 "Repository sein eigenes verbindliches Upstream-Repository ist."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 "Fehler beim Eintragen der URL fรผr Submodul-Pfad '%s' in die Konfiguration."
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submodul '%s' (%s) fรผr Pfad '%s' in die Konfiguration eingetragen.\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "Warnung: 'update'-Modus fรผr Submodul '%s' vorgeschlagen\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Fehler bei ร„nderung des Aktualisierungsmodus fรผr Submodul-Pfad '%s' in der\n"
 "Konfiguration."
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrรผcken"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "Keine Submodul-Zuordnung in .gitmodules fรผr Pfad '%s' gefunden"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflรถsen."
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul '%s'."
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr "Ausgabe รผber Submodul-Status unterdrรผcken"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 "Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr "Rekursion in verschachtelte Submodule durchfรผhren"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <Pfad>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synchronisiere Submodul-URL fรผr '%s'\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "Fehler beim Registrieren der URL fรผr Submodul-Pfad '%s'."
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "Fehler beim Lesen des Standard-Remote-Repositories fรผr Submodul '%s'."
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "Fehler beim Aktualisieren des Remote-Repositories fรผr Submodul '%s'."
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrรผcken"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20142,7 +21302,7 @@ msgstr ""
 "(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
 "lรถschen mรถchten)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20151,185 +21311,215 @@ msgstr ""
 "Arbeitsverzeichnis von Submodul in '%s' enthรคlt lokale ร„nderungen;\n"
 "verwenden Sie '-f', um diese zu verwerfen."
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Verzeichnis '%s' bereinigt.\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht lรถschen.\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "Konnte kein leeres Verzeichnis fรผr Submodul in '%s' erstellen."
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Submodul '%s' (%s) fรผr Pfad '%s' ausgetragen.\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "Arbeitsverzeichnisse von Submodulen lรถschen, auch wenn lokale ร„nderungen "
 "vorliegen"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr "alle Submodule austragen"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
 "mรถchten."
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Eine Alternative, die von einer รผbergeordneten Projekt-Alternative\n"
+"berechnet wurde, ist ungรผltig.\n"
+"Um Git das Klonen ohne Alternative in solch einem Fall zu erlauben, setze\n"
+"submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n"
+"'--reference-if-able' statt '--reference'."
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "Submodul '%s' kann Alternative nicht hinzufรผgen: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Wert '%s' fรผr submodule.alternateErrorStrategy wird nicht erkannt"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Wert '%s' fรผr submodule.alternateLocation wird nicht erkannt."
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
 msgstr "Pfad fรผr neues Submodul"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr "Name des neuen Submoduls"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr "URL von der das Submodul geklont wird"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr "Tiefe des Klons mit unvollstรคndiger Historie (shallow)"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr "Fortschrittsanzeige beim Klonen erzwingen"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "Klonen in ein nicht leeres Verzeichnis verbieten"
+
+#: builtin/submodule--helper.c:1424
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference "
-"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
-"<Tiefe>] --url <URL> --path <Pfad>"
+"<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url "
+"<URL> --path <Pfad>"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+"Erstellung/Benutzung von '%s' in einem anderen Submodul-Git-Verzeichnis\n"
+"verweigert."
+
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
+msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen."
+
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "Verzeichnis ist nicht leer: '%s'"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Ungรผltiger Aktualisierungsmodus '%s' fรผr Submodul-Pfad '%s'."
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1516
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Ungรผltiger Aktualisierungsmodus '%s' fรผr Submodul-Pfad '%s' konfiguriert."
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Submodul-Pfad '%s' nicht initialisiert"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Meinten Sie vielleicht 'update --init'?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "รœberspringe nicht zusammengefรผhrtes Submodul %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "รœberspringe Submodul '%s'"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr "Pfad zum Arbeitsverzeichnis"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "Pfad zum Arbeitsverzeichnis, รผber verschachtelte Submodul-Grenzen hinweg"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout oder none"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 "Erstellung eines Klons mit unvollstรคndiger Historie (shallow), abgeschnitten "
 "bei\n"
 "der angegebenen Anzahl von Commits."
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr "Parallele Ausfรผhrungen"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 "ob das initiale Klonen den Empfehlungen fรผr eine unvollstรคndige\n"
 "Historie (shallow) folgen soll"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr "keine Fortschrittsanzeige beim Klonen"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr "Fehlerhafter Wert fรผr --update Parameter"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20338,52 +21528,52 @@ msgstr ""
 "Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
 "zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2117
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "Konnte kein Repository-Handle fรผr Submodul '%s' erhalten."
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr "Rekursion in Submodule durchfรผhren"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2156
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2212
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "prรผfen, ob es sicher ist, in die Datei .gitmodules zu schreiben"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2215
 msgid "unset the config in the .gitmodules file"
 msgstr "Konfiguration in der .gitmodules-Datei entfernen"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2220
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <name> [<Wert>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2221
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <Name>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2222
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 "Bitte stellen Sie sicher, dass sich die Datei .gitmodules im "
 "Arbeitsverzeichnis befindet."
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s unterstรผtzt kein --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2297
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' ist kein gรผltiger Unterbefehl von submodule--helper"
@@ -20639,219 +21829,223 @@ msgstr "Tag '%s' existiert bereits"
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aktualisiert (war %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "Entpacke Objekte"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "Konnte Datei '%s' nicht erstellen"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "Konnte Datei '%s' nicht lรถschen"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "Konnte Verzeichnis '%s' nicht lรถschen"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Prรผfe mtime in '%s' "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Hinzufรผgen einer neuen Datei nicht "
 "geรคndert"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Hinzufรผgen eines neuen "
 "Verzeichnisses nicht geรคndert"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geรคndert"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Hinzufรผgen einer Datei in ein "
 "Unterverzeichnis geรคndert"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach dem Lรถschen einer Datei nicht "
 "geรคndert"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "Verzeichnisinformationen haben sich nach dem Lรถschen eines Verzeichnisses "
 "nicht geรคndert"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "Aktualisierung: ignoriert Submodule"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "keine neuen Dateien ignorieren"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "aktualisieren, auch wenn der Index nicht zusammengefรผhrte Eintrรคge beinhaltet"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "Dateiinformationen aktualisieren"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<Modus>,<Objekt>,<Pfad>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "den angegebenen Eintrag zum Commit vormerken"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "diese Datei immer als unverรคndert betrachten"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "\"assumed-unchanged\"-Bit lรถschen"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "Dateien als \"index-only\" markieren"
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "\"skip-worktree\"-Bit lรถschen"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "\"index-only\" Eintrรคge รผberspringen"
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "die ร„nderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-"
 "Datenbank hinzugefรผgt"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "benannte Pfade lรถschen, auch wenn sie sich im Arbeitsverzeichnis befinden"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "Eintrรคge von der Standard-Eingabe zum Commit vormerken"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "wiederholtes Einpflegen der Zustรคnde #2 und #3 fรผr die aufgelisteten Pfade"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "nur Eintrรคge aktualisieren, die unterschiedlich zu HEAD sind"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(fรผr Fremdprogramme) keine gespeicherten, nicht aufgelรถste Konflikte"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "Index-Datei in diesem Format schreiben"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "Splitting des Index aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "Cache fรผr unversionierte Dateien aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 "prรผfen, ob das Dateisystem einen Cache fรผr unversionierte Dateien unterstรผtzt"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "Cache fรผr unversionierte Dateien ohne Prรผfung des Dateisystems aktivieren"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "Index rausschreiben, auch wenn dieser nicht als geรคndert markiert ist"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "Dateisystem-Monitor aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "Dateien als \"fsmonitor valid\" markieren"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "\"fsmonitor valid\"-Bit lรถschen"
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20859,7 +22053,7 @@ msgstr ""
 "core.splitIndex ist auf 'false' gesetzt. Entfernen oder รคndern Sie dies,\n"
 "wenn sie wirklich das Splitting des Index aktivieren mรถchten."
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20867,7 +22061,7 @@ msgstr ""
 "core.splitIndex ist auf 'true' gesetzt. Entfernen oder รคndern Sie dies,\n"
 "wenn Sie wirklich das Splitting des Index deaktivieren mรถchten."
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -20875,11 +22069,11 @@ msgstr ""
 "core.untrackedCache ist auf 'true' gesetzt. Entfernen oder รคndern Sie dies,\n"
 "wenn Sie wirklich den Cache fรผr unversionierte Dateien deaktivieren mรถchten."
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Cache fรผr unversionierte Dateien deaktiviert"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -20888,23 +22082,23 @@ msgstr ""
 "dies,\n"
 "wenn sie wirklich den Cache fรผr unversionierte Dateien aktivieren mรถchten."
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Cache fรผr unversionierte Dateien fรผr '%s' aktiviert"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor nicht gesetzt. Setzen Sie es, wenn Sie den Dateisystem-"
 "Monitor\n"
 "wirklich aktivieren mรถchten."
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "Dateisystem-Monitor aktiviert"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
@@ -20912,7 +22106,7 @@ msgstr ""
 "Monitor\n"
 "wirklich deaktivieren mรถchten."
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "Dateisystem-Monitor deaktiviert"
 
@@ -21007,55 +22201,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..."
 msgid "print tag contents"
 msgstr "Tag-Inhalte ausgeben"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<Optionen>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<Optionen>] <Pfad>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<Optionen>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <Pfad>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:891
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "Fehler beim Lรถschen von '%s'"
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Lรถsche worktrees/%s: kein gรผltiges Verzeichnis"
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Lรถsche worktrees/%s: gitdir-Datei existiert nicht"
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Lรถsche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -21064,35 +22258,35 @@ msgstr ""
 "Lรถsche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> "
 "gelesen)"
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Lรถsche worktrees/%s: ungรผltige gitdir-Datei"
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Lรถsche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr "entfernte Arbeitsverzeichnisse ausgeben"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr "Arbeitsverzeichnisse รคlter als <Zeit> verfallen lassen"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existiert bereits"
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:244
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "Konnte Arbeitsverzeichnis '%s' nicht neu hinzufรผgen."
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:249
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -21102,7 +22296,7 @@ msgstr ""
 "Benutzen Sie 'add -f -f' zum รœberschrieben, oder 'unlock' und 'prune'\n"
 "oder 'remove' zum Lรถschen."
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:251
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -21112,129 +22306,129 @@ msgstr ""
 "Benutzen Sie 'add -f' zum รœberschreiben, oder 'prune' oder 'remove' zum\n"
 "Lรถschen."
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:432 builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')"
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:434
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)"
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:443
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:449
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Bereite Arbeitsverzeichnis vor (losgelรถster HEAD %s)"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:490
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "<Branch> auschecken, auch wenn dieser bereits in einem anderen "
 "Arbeitsverzeichnis ausgecheckt ist"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:493
 msgid "create a new branch"
 msgstr "neuen Branch erstellen"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:495
 msgid "create or reset a branch"
 msgstr "Branch erstellen oder umsetzen"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:497
 msgid "populate the new working tree"
 msgstr "das neue Arbeitsverzeichnis auschecken"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:498
 msgid "keep the new working tree locked"
 msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:501
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:504
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "versuchen, eine รœbereinstimmung des Branch-Namens mit einem\n"
 "Remote-Tracking-Branch herzustellen"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:512
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B und --detach schlieรŸen sich gegenseitig aus"
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:573
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 "--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:673
 msgid "reason for locking"
 msgstr "Sperrgrund"
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' ist kein Arbeitsverzeichnis"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:687 builtin/worktree.c:720
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:692
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ist bereits gesperrt, Grund: %s"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:694
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ist bereits gesperrt"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:722
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' ist nicht gesperrt"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:763
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "Arbeitsverzeichnisse, die Submodule enthalten, kรถnnen nicht verschoben oder\n"
 "entfernt werden."
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:771
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geรคndert oder "
 "gesperrt ist"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:794 builtin/worktree.c:921
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:799
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "Konnte Zielname aus '%s' nicht bestimmen."
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:805
 #, c-format
 msgid "target '%s' already exists"
 msgstr "Ziel '%s' existiert bereits."
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:813
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -21244,7 +22438,7 @@ msgstr ""
 "Benutzen Sie 'move -f -f' zum รœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:815
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -21253,38 +22447,40 @@ msgstr ""
 "Benutzen Sie 'move -f -f' zum รœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:818
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:823
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "Fehler beim Verschieben von '%s' nach '%s'"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:871
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "Fehler beim Ausfรผhren von 'git status' auf '%s'"
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:875
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
-msgstr "'%s' ist verรคndert, benutzen Sie --force zum Lรถschen"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"'%s' enthรคlt geรคnderte oder nicht versionierte Dateien, benutzen Sie --force "
+"zum Lรถschen"
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:880
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "Fehler beim Ausfรผhren von 'git status' auf '%s'. Code: %d"
 
-#: builtin/worktree.c:911
+#: builtin/worktree.c:903
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "Lรถschen erzwingen, auch wenn das Arbeitsverzeichnis geรคndert oder gesperrt "
 "ist"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:926
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -21294,7 +22490,7 @@ msgstr ""
 "Benutzen Sie 'remove -f -f' zum รœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:928
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -21303,7 +22499,7 @@ msgstr ""
 "Benutzen Sie 'remove -f -f' zum รœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:931
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht lรถschen: %s"
@@ -21324,6 +22520,21 @@ msgstr "das Tree-Objekt fรผr ein Unterverzeichnis <Prรคfix> schreiben"
 msgid "only useful for debugging"
 msgstr "nur nรผtzlich fรผr Fehlersuche"
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "'mark' Befehl erwartet, '%s' bekommen"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "'to' Befehl erwartet, '%s' bekommen"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features"
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -21439,25 +22650,25 @@ msgstr ""
 "Alias '%s' รคndert Umgebungsvariablen.\n"
 "Sie kรถnnen '!git' im Alias benutzen, um dies zu tun."
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr "leerer Alias fรผr %s"
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr "rekursiver Alias: %s"
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr "Fehler beim SchlieรŸen der Standard-Ausgabe."
 
@@ -21513,23 +22724,23 @@ msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstรผtzt."
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Protokollbeschrรคnkungen werden mit cURL < 7.19.4 nicht unterstรผtzt."
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Nicht unterstรผtztes SSL-Backend '%s'. Unterstรผtzte SSL-Backends:"
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "Konnte SSL-Backend nicht zu '%s' setzen: cURL wurde ohne SSL-Backends gebaut."
 
-#: http.c:1096
+#: http.c:1097
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt"
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21540,150 +22751,160 @@ msgstr ""
 "  gefragt nach: %s\n"
 "    umgeleitet: %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "Ungรผltiges Quoting beim \"push-option\"-Wert: '%s'"
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs nicht gรผltig: Ist das ein Git-Repository?"
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 msgid "invalid server response; expected service, got flush packet"
 msgstr "Ungรผltige Antwort des Servers. Service erwartet, Flush-Paket bekommen"
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "Ungรผltige Serverantwort; '%s' bekommen"
 
-#: remote-curl.c:446
+#: remote-curl.c:455
 #, c-format
 msgid "repository '%s' not found"
 msgstr "Repository '%s' nicht gefunden."
 
-#: remote-curl.c:450
+#: remote-curl.c:459
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Authentifizierung fehlgeschlagen fรผr '%s'"
 
-#: remote-curl.c:454
+#: remote-curl.c:463
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "konnte nicht auf '%s' zugreifen: %s"
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr "Leite nach %s um"
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "Konnte nicht RPC-POST-Daten zurรผckspulen - Versuchen Sie http.postBuffer zu "
 "erhรถhen"
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC fehlgeschlagen; %s"
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 msgid "cannot handle pushes this big"
 msgstr "Kann solche groรŸen รœbertragungen nicht verarbeiten."
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "Dumb HTTP-Transport unterstรผtzt keine shallow-Funktionen"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1038
 msgid "fetch failed."
 msgstr "\"fetch\" fehlgeschlagen."
 
-#: remote-curl.c:1076
+#: remote-curl.c:1086
 msgid "cannot fetch by sha1 over smart http"
 msgstr "Kann SHA-1 nicht รผber Smart-HTTP anfordern"
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1130 remote-curl.c:1136
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1148 remote-curl.c:1263
 #, c-format
 msgid "http transport does not support %s"
 msgstr "HTTP-Transport unterstรผtzt nicht %s"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1184
 msgid "git-http-push failed"
 msgstr "\"git-http-push\" fehlgeschlagen"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1369
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
 
-#: remote-curl.c:1392
+#: remote-curl.c:1401
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1408
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
 
-#: remote-curl.c:1439
+#: remote-curl.c:1448
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr "Argumente"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr "Filtern nach Objekten"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "Verfallsdatum"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "Kein Effekt (Rรผckwรคrtskompatibilitรคt)"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "erweiterte Ausgaben"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "weniger Ausgaben"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
 
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "Pfadspezifikation aus einer Datei lesen"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt"
+
 #: ref-filter.h:101
 msgid "key"
 msgstr "Schรผssel"
@@ -22218,167 +23439,175 @@ msgid "Common Git shell script setup code"
 msgstr "allgemeiner Git Shell-Skript Konfigurationscode"
 
 #: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Initialisiere und verรคndere den partiellen Checkout"
+
+#: command-list.h:172
 msgid "Stash the changes in a dirty working directory away"
 msgstr "ร„nderungen in einem Arbeitsverzeichnis aufbewahren"
 
-#: command-list.h:172
+#: command-list.h:173
 msgid "Add file contents to the staging area"
 msgstr "Dateiinhalte der Staging-Area hinzufรผgen"
 
-#: command-list.h:173
+#: command-list.h:174
 msgid "Show the working tree status"
 msgstr "den Zustand des Arbeitsverzeichnisses anzeigen"
 
-#: command-list.h:174
+#: command-list.h:175
 msgid "Remove unnecessary whitespace"
 msgstr "nicht erforderlichen Whitespace entfernen"
 
-#: command-list.h:175
+#: command-list.h:176
 msgid "Initialize, update or inspect submodules"
 msgstr "Submodule initialisieren, aktualisieren oder inspizieren"
 
-#: command-list.h:176
+#: command-list.h:177
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 "Bidirektionale Operationen zwischen einem Subversion Repository und Git"
 
-#: command-list.h:177
+#: command-list.h:178
 msgid "Switch branches"
 msgstr "Branches wechseln"
 
-#: command-list.h:178
+#: command-list.h:179
 msgid "Read, modify and delete symbolic refs"
 msgstr "symbolische Referenzen lesen, รคndern und lรถschen"
 
-#: command-list.h:179
+#: command-list.h:180
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, lรถschen oder "
 "verifizieren."
 
-#: command-list.h:180
+#: command-list.h:181
 msgid "Creates a temporary file with a blob's contents"
 msgstr "eine temporรคre Datei mit den Inhalten eines Blobs erstellen"
 
-#: command-list.h:181
+#: command-list.h:182
 msgid "Unpack objects from a packed archive"
 msgstr "Objekte von einem gepackten Archiv entpacken"
 
-#: command-list.h:182
+#: command-list.h:183
 msgid "Register file contents in the working tree to the index"
 msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren"
 
-#: command-list.h:183
+#: command-list.h:184
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren"
 
-#: command-list.h:184
+#: command-list.h:185
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren"
 
-#: command-list.h:185
+#: command-list.h:186
 msgid "Send archive back to git-archive"
 msgstr "Archiv zurรผck zu git-archive senden"
 
-#: command-list.h:186
+#: command-list.h:187
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Objekte gepackt zurรผck an git-fetch-pack senden"
 
-#: command-list.h:187
+#: command-list.h:188
 msgid "Show a Git logical variable"
 msgstr "eine logische Variable von Git anzeigen"
 
-#: command-list.h:188
+#: command-list.h:189
 msgid "Check the GPG signature of commits"
 msgstr "die GPG-Signatur von Commits prรผfen"
 
-#: command-list.h:189
+#: command-list.h:190
 msgid "Validate packed Git archive files"
 msgstr "gepackte Git-Archivdateien validieren"
 
-#: command-list.h:190
+#: command-list.h:191
 msgid "Check the GPG signature of tags"
 msgstr "die GPG-Signatur von Tags prรผfen"
 
-#: command-list.h:191
+#: command-list.h:192
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git Web Interface (Web-Frontend fรผr Git-Repositories)"
 
-#: command-list.h:192
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Logs mit dem Unterschied, den jeder Commit einfรผhrt, anzeigen"
 
-#: command-list.h:193
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "mehrere Arbeitsverzeichnisse verwalten"
 
-#: command-list.h:194
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Tree-Objekt vom aktuellen Index erstellen"
 
-#: command-list.h:195
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Definition von Attributen pro Pfad"
 
-#: command-list.h:196
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Git Kommandozeilenschnittstelle und Konventionen"
 
-#: command-list.h:197
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "eine Git Anleitung fรผr Entwickler"
 
-#: command-list.h:198
+#: command-list.h:199
 msgid "Git for CVS users"
 msgstr "Git fรผr CVS Benutzer"
 
-#: command-list.h:199
+#: command-list.h:200
 msgid "Tweaking diff output"
 msgstr "Diff-Ausgabe optimieren"
 
-#: command-list.h:200
+#: command-list.h:201
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 "ein kleine, nรผtzliche Menge von Befehlen fรผr die tรคgliche Verwendung von Git"
 
-#: command-list.h:201
+#: command-list.h:202
 msgid "A Git Glossary"
 msgstr "ein Git-Glossar"
 
-#: command-list.h:202
+#: command-list.h:203
 msgid "Hooks used by Git"
 msgstr "von Git verwendete Hooks"
 
-#: command-list.h:203
+#: command-list.h:204
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
 
-#: command-list.h:204
+#: command-list.h:205
 msgid "Defining submodule properties"
 msgstr "Definition von Submodul-Eigenschaften"
 
-#: command-list.h:205
+#: command-list.h:206
 msgid "Git namespaces"
 msgstr "Git Namensbereiche"
 
-#: command-list.h:206
+#: command-list.h:207
 msgid "Git Repository Layout"
 msgstr "Git Repository Aufbau"
 
-#: command-list.h:207
+#: command-list.h:208
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spezifikation von Commits und Bereichen fรผr Git"
 
-#: command-list.h:208
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "Einbinden eines Repositories in ein anderes"
+
+#: command-list.h:210
 msgid "A tutorial introduction to Git: part two"
 msgstr "eine einfรผhrende Anleitung zu Git: Teil zwei"
 
-#: command-list.h:209
+#: command-list.h:211
 msgid "A tutorial introduction to Git"
 msgstr "eine einfรผhrende Anleitung zu Git"
 
-#: command-list.h:210
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr "Eine รœbersicht รผber empfohlene Arbeitsablรคufe mit Git"
 
@@ -22506,144 +23735,133 @@ msgstr "Versuche einfachen Merge mit $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Kann temporรคren Index nicht lรถschen (kann nicht passieren)"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "Fehler: unbekannte Option fรผr 'stash push': $option"
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "unbekannte Option: $opt"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Zu viele Commits angegeben: $REV"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference ist keine gรผltige Referenz"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' ist kein \"stash\"-artiger Commit"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' ist keine \"stash\"-Referenz"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "Konnte den Index nicht aktualisieren."
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Kann \"stash\" nicht anwenden, solange ein Merge im Gange ist"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "Konnte Index-Verzeichnis nicht speichern"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 "Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "Kann geรคnderte Dateien nicht aus dem Index entfernen"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} ($s) gelรถscht"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Konnte \"stash\"-Eintrag nicht lรถschen"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:203
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Relative Pfade kรถnnen nur von der obersten Ebene des Arbeitsverzeichnisses "
 "benutzt werden."
 
-#: git-submodule.sh:210
+#: git-submodule.sh:213
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:232
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:235
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:242
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "'$sm_path' hat keinen Commit ausgecheckt"
 
-#: git-submodule.sh:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"Der folgende Pfad wird durch eine Ihrer \".gitignore\" Dateien ignoriert:\n"
-"$sm_path\n"
-"Benutzen Sie -f wenn Sie diesen wirklich hinzufรผgen mรถchten."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:273
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Fรผge existierendes Repository in '$sm_path' dem Index hinzu."
 
-#: git-submodule.sh:270
+#: git-submodule.sh:275
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' existiert bereits und ist kein gรผltiges Git-Repository"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:283
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Ein Git-Verzeichnis fรผr '$sm_name' wurde lokal gefunden mit den Remote-"
 "Repositories:"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:285
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22661,37 +23879,37 @@ msgstr ""
 "nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
 "wรคhlen Sie einen anderen Namen mit der Option '--name'."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:291
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Reaktiviere lokales Git-Verzeichnis fรผr Submodul '$sm_name'."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:303
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Kann Submodul '$sm_path' nicht auschecken"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:308
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Hinzufรผgen von Submodul '$sm_path' fehlgeschlagen"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:317
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
 
-#: git-submodule.sh:573
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
 
-#: git-submodule.sh:583
+#: git-submodule.sh:600
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausfรผhren"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:605
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22700,7 +23918,7 @@ msgstr ""
 "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
 "'$sm_path' nicht finden."
 
-#: git-submodule.sh:606
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22709,7 +23927,7 @@ msgstr ""
 "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausfรผhren. Versuche "
 "$sha1 direkt anzufordern:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:629
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22718,74 +23936,74 @@ msgstr ""
 "\"fetch\" in Submodul-Pfad '$displaypath' ausgefรผhrt, aber $sha1 nicht\n"
 "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:636
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
 
-#: git-submodule.sh:620
+#: git-submodule.sh:637
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht mรถglich"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': zusammengefรผhrt in '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:653
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Ausfรผhrung von '$command $sha1' in Submodul-Pfad '$displaypath' "
 "fehlgeschlagen"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:654
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:685
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
 
-#: git-submodule.sh:830
+#: git-submodule.sh:896
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 "Die Optionen --cached und --files kรถnnen nicht gemeinsam verwendet werden."
 
-#: git-submodule.sh:882
+#: git-submodule.sh:948
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "unerwarteter Modus $mod_dst"
 
-#: git-submodule.sh:902
+#: git-submodule.sh:968
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_src"
 
-#: git-submodule.sh:905
+#: git-submodule.sh:971
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
 
-#: git-submodule.sh:908
+#: git-submodule.sh:974
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
@@ -23116,6 +24334,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
 msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
 
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "Leere Commits sind auskommentiert."
+
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
 msgstr "Konnte neu geschriebene Commits nicht initialisieren."
@@ -23198,140 +24420,67 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%28s %25s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "zur Staging-Area hinzugefรผgt"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "aus Staging-Area entfernt"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "Binรคr"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "Nichts"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "unverรคndert"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "%d Pfad hinzugefรผgt\n"
-msgstr[1] "%d Pfade hinzugefรผgt\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "%d Pfad aktualisiert\n"
-msgstr[1] "%d Pfade aktualisiert\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "%d Pfad wiederhergestellt\n"
-msgstr[1] "%d Pfade wiederhergestellt\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d Pfad angefasst\n"
 msgstr[1] "%d Pfade angefasst\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Revert"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "Hinweis: %s ist nun unversioniert.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "unversionierte Dateien hinzufรผgen"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Keine unversionierten Dateien.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Hinzufรผgen zur Staging-Area markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Hinzufรผgen zur Staging-Area markiert."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Hinzufรผgen zum Stash markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Hinzufรผgen zum Stash markiert."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Entfernen aus der Staging-Area markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Entfernen aus der Staging-Area markiert."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Anwenden markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Anwenden markiert."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Verwerfen markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Verwerfen markiert."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 "Fehler beim ร–ffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-"Manueller Editiermodus fรผr Patch-Blรถcke -- siehe nach unten fรผr eine\n"
-"Kurzanleitung.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -23344,37 +24493,12 @@ msgstr ""
 "Um '%s' Zeilen zu entfernen, lรถschen Sie diese.\n"
 "Zeilen, die mit %s beginnen, werden entfernt.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"Wenn das nicht sauber angewendet werden kann, haben Sie die Mรถglichkeit\n"
-"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt "
-"werden,\n"
-"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverรคndert.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "Fehler beim ร–ffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
-"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23390,7 +24514,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blรถcke in dieser Datei nicht zum Commit "
 "vormerken"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23404,7 +24528,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blรถcke dieser Datei stashen\n"
 "d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht stashen"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23418,7 +24542,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blรถcke dieser Datei unstashen\n"
 "d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht unstashen"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23435,7 +24559,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht auf den Index "
 "anwenden"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23452,7 +24576,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht im "
 "Arbeitsverzeichnis verwerfen"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23467,7 +24591,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blรถcke in der Datei verwerfen\n"
 "d - diesen oder alle weiteren Patch-Blรถcke in der Datei nicht verwerfen"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23481,7 +24605,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blรถcke in der Datei anwenden\n"
 "d - diesen oder alle weiteren Patch-Blรถcke in der Datei nicht anwenden"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23495,7 +24619,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blรถcke in der Datei anwenden\n"
 "d - diesen und alle weiteren Patch-Blรถcke in der Datei nicht anwenden"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23519,234 +24643,87 @@ msgstr ""
 "e - aktuellen Patch-Block manuell editieren\n"
 "? - Hilfe anzeigen\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 "Die ausgewรคhlten Patch-Blรถcke kรถnnen nicht auf den Index angewendet werden!\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Nichts angewendet.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignoriere nicht zusammengefรผhrte Datei: %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Nur Binรคrdateien geรคndert.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Keine ร„nderungen.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Patch Aktualisierung"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Modusรคnderung der Staging-Area hinzufรผgen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Lรถschung der Staging-Area hinzufรผgen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Diesen Patch-Block der Staging-Area hinzufรผgen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Modusรคnderung stashen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Lรถschung stashen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Modusรคnderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Lรถschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "Modusรคnderung auf Index anwenden [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Lรถschung auf Index anwenden [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Modusรคnderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Lรถschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Modusรคnderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Lรถschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Modusรคnderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Lรถschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1468
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Modusรคnderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1469
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Lรถschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1470
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "Keine anderen Patch-Blรถcke verbleibend\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "zu welchem Patch-Block springen (<Enter> fรผr mehr Informationen)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "zu welchem Patch-Block springen? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ungรผltige Nummer: '%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Entschuldigung, nur %d Patch-Block verfรผgbar.\n"
 msgstr[1] "Entschuldigung, nur %d Patch-Blรถcke verfรผgbar.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "Keine anderen Patch-Blรถcke zum Durchsuchen\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "Suche nach regulรคrem Ausdruck? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Fehlerhafter regulรคrer Ausdruck fรผr Suche %s: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
 msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "Kein vorheriger Patch-Block\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "Kein folgender Patch-Block\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "In %d Patch-Block aufgeteilt.\n"
 msgstr[1] "In %d Patch-Blรถcke aufgeteilt.\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Diff รผberprรผfen"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23765,19 +24742,19 @@ msgstr ""
 "diff          - Unterschiede zwischen HEAD und Index anzeigen\n"
 "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "-- fehlt"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "Unbekannter --patch Modus: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "ungรผltiges Argument %s, erwarte --"
@@ -24161,102 +25138,3 @@ msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
-
-#~ msgid ""
-#~ "Fetch normally indicates which branches had a forced update, but that "
-#~ "check has been disabled."
-#~ msgstr ""
-#~ "'fetch' zeigt normalerweise, welche Branches eine erzwungene "
-#~ "Aktualisierung hatten, aber diese รœberprรผfung wurde deaktiviert."
-
-#~ msgid ""
-#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
-#~ msgstr ""
-#~ "oder fรผhren Sie 'git config fetch.showForcedUpdates false' aus, um diese "
-#~ "รœberprรผfung zu umgehen.\n"
-
-#~ msgid ""
-#~ "log.mailmap is not set; its implicit value will change in an\n"
-#~ "upcoming release. To squelch this message and preserve current\n"
-#~ "behaviour, set the log.mailmap configuration value to false.\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behaviour now, set the\n"
-#~ "log.mailmap configuration value to true.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'log.mailmap' for further "
-#~ "information."
-#~ msgstr ""
-#~ "'log.mailmap' ist nicht gesetzt; der implizite Wert wird sich in einem\n"
-#~ "kommenden Release รคndern. Um diese Meldung zu unterdrรผcken und das "
-#~ "aktuelle\n"
-#~ "Verhalten beizubehalten, setzen Sie den Konfigurationswert von'log."
-#~ "mailmap' auf 'false'.\n"
-#~ "\n"
-#~ "Um diese Meldung zu unterdrรผcken und jetzt das neue Verhalten zu\n"
-#~ "รผbernehmen, setzen Sie den Konfigurationswert von 'log.mailmap' auf "
-#~ "'true'.\n"
-#~ "\n"
-#~ "Fรผhren Sie 'git help config' aus und suchen Sie nach 'log.mailmap', um\n"
-#~ "weitere Informationen zu erhalten."
-
-#~ msgid "Server supports multi_ack_detailed"
-#~ msgstr "Server unterstรผtzt multi_ack_detailed"
-
-#~ msgid "Server supports no-done"
-#~ msgstr "Server unterstรผtzt no-done"
-
-#~ msgid "Server supports multi_ack"
-#~ msgstr "Server unterstรผtzt multi_ack"
-
-#~ msgid "Server supports side-band-64k"
-#~ msgstr "Server unterstรผtzt side-band-64k"
-
-#~ msgid "Server supports side-band"
-#~ msgstr "Server unterstรผtzt side-band"
-
-#~ msgid "Server supports allow-tip-sha1-in-want"
-#~ msgstr "Server unterstรผtzt allow-tip-sha1-in-want"
-
-#~ msgid "Server supports allow-reachable-sha1-in-want"
-#~ msgstr "Server unterstรผtzt allow-reachable-sha1-in-want"
-
-#~ msgid "Server supports ofs-delta"
-#~ msgstr "Server unterstรผtzt ofs-delta"
-
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD losgelรถst bei %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD losgelรถst von %s)"
-
-#~ msgid "Checking out files"
-#~ msgstr "Checke Dateien aus"
-
-#~ msgid "cannot be interactive without stdin connected to a terminal."
-#~ msgstr ""
-#~ "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
-#~ "Terminal verbunden ist."
-
-#~ msgid "failed to open '%s'"
-#~ msgstr "Fehler beim ร–ffnen von '%s'"
-
-#~ msgid "failed to stat %s\n"
-#~ msgstr "Konnte %s nicht lesen\n"
-
-#~ msgid ""
-#~ "If you wish to skip this commit, use:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-#~ "the remaining commits.\n"
-#~ msgstr ""
-#~ "Wenn Sie diesen Commit auslassen mรถchten, benutzen Sie:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "Benutzen Sie anschlieรŸend \"git cherry-pick --continue\", um die\n"
-#~ "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-
-#~ msgid "unrecognized verb: %s"
-#~ msgstr "Nicht erkanntes Verb: %s"
diff --git a/third_party/git/po/es.po b/third_party/git/po/es.po
index 87c77ff9931b..4a94ee938f58 100644
--- a/third_party/git/po/es.po
+++ b/third_party/git/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 20:12+0800\n"
-"PO-Revision-Date: 2019-08-10 12:55-0500\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-11 23:18-0500\n"
 "Last-Translator: christopher.diaz.riv@gmail.com\n"
 "Language-Team: CodeLabora <codelabora@gmail.com>\n"
 "Language: es\n"
@@ -16,40 +16,729 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2\n"
+"X-Generator: Poedit 2.3\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "ยฟAhh (%s)?"
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "no se pudo leer รญndice"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binario"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "nada"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "sin cambios"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "Actualizar"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "no se pudo poner en stage '%s'"
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "no se pudo escribir รญndice"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "actualizada %d ruta\n"
+msgstr[1] "actualizadas %d rutas\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "nota: %s no es rastreado ahora.\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry fallรณ para la ruta '%s'"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "Revertir"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "no se pudo analizar HEAD^{tree}"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "revertida %d ruta\n"
+msgstr[1] "revertidas %d rutas\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "No hay archivos sin rastrear.\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "Agregar no rastreados"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "agregada %d ruta\n"
+msgstr[1] "agregadas %d rutas\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignorando lo no fusionado: %s"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Solo cambiaron archivos binarios.\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "Sin cambios.\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "Actualizaciรณn del parche"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "Revisiรณn de  diff"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "mostrar rutas con cambios"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr "agregar estado del รกrbol de trabajo al conjunto de cambios en stage"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "revertir conjunto de cambios en stage a la versiรณn de HEAD"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr "elegir hunks y actualizar de forma selectiva"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "ver diff entre HEAD e index"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+"agregar contenidos de archivos sin rastrear al conjunto de cambios de stage"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "Mostrar ayuda:"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "selecciona un รบnico objeto"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "selecciona un rango de objetos"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "selecciona multiples rangos"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "seleccionar objeto basado en prefijo รบnico"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "quitar objetos especificados"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "escoger todos los objetos"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "(vacรญo) finalizar selecciรณn"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "selecciona un objeto numerado"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "(vacรญo) selecciona nada"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** Comandos ***"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "Ahora que"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "rastreado"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "no rastreado"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "ruta"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "no se pudo refrescar el index"
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "Adiรณs.\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "ยฟCambio de modo de stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar stage al borrado [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar stage a este hunk [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
+"para el รกrea de stage."
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aplicar stage a este hunk\n"
+"n - no aplicar stage a este hunk\n"
+"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n"
+"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n"
+"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
+"archivo\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar stash al borrado [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar stash a este hunk [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
+"para aplicar stash."
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aplicar stash a este hunk\n"
+"n - no aplicar stash a este hunk\n"
+"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n"
+"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
+"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "ยฟSacar cambio de modo del stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "ยฟSacar borrado del stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "ยฟSacar este hunk del stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
+"para sacar del รกrea de stage."
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - sacar desde hunk del รกrea de stage\n"
+"n - no sacar este hunk del area de stage\n"
+"q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n"
+"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n"
+"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
+"archivo\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar cambio de modo al รญndice [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar borrado al รญndice [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar este hunk al รญndice [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"Si el parche aplica de forma limpia, el hunk editado sera marcado "
+"inmediatamente para aplicar."
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aplicar este hunk al รญndice\n"
+"n - no aplicar este hunk al รญndice\n"
+"q - quit; no aplicar este hunk o ninguno de los restantes\n"
+"a - aplicar este hunk y todos los posteriores en el archivo\n"
+"d - no aplicar este hunko ninguno de los posteriores en el archivo\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "ยฟDescartar cambio de modo del รกrbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "ยฟDescartar borrado del รกrbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "ยฟDescartar este hunk del รกrbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"Si el parche aplica de forma limpia, el hunk editado sera marcado "
+"inmediatamente para descarte."
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - descartar este hunk del รกrbol de trabajo\n"
+"n - no descartar este hunk del รกrbol de trabajo\n"
+"q - quit; no descartar este hunk o ninguno de los que restantes\n"
+"a - descartar este hunk y todos los posteriores en este archivo\n"
+"d - no descartar este hunk o ninguno de los posteriores en el archivo\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"ยฟDescartar cambio de modo del รญndice y el รกrbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ยฟDescartar borrado del รญndice y el รกrbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"ยฟDescartar este hunk del รญndice y el รกrbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - descartar este hunk del รญndice y el รกrbol de trabajo\n"
+"n - no descartar este hunk del รญndice ni el รกrbol de trabajo\n"
+"q - quit; no descartar este hunk o ninguno de los que quedan\n"
+"a - descartar este hunk y todos los posteriores en este archivo\n"
+"d - no descartar este hunk o ninguno posterior en el archivo\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"ยฟAplicar cambio de modo para el รญndice y el รกrbol de trabajo [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar borrado al รญndice y al รกrbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar este hunk al รญndice y รกrbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aplicar este hunk al รญndice y al รกrbol de trabajo\n"
+"n - no aplicar este hunk al รญndice y al รกrbol de trabajo\n"
+"q - quit;  no aplicar este hunk o ninguno de los restantes\n"
+"a - aplicar este hunk y todos los posteriores en el archivo\n"
+"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aplicar este hunk al รญndice y al รกrbol de trabajo\n"
+"n - no aplicar este hunk al รญndice y al รกrbol de trabajo\n"
+"q - quit;  no aplicar este hunk o ninguno de los restantes\n"
+"a - aplicar este hunk y todos los posteriores en el archivo\n"
+"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "no se puede analizar hunk header '%.*s'"
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "no se puede analizar hunk header '%.*s'"
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "no se puede analizar diff"
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "no se pudo analizar diff a colores"
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "fallรณ al ejecutar '%s'"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "output de interactive.diffFilter no concuerda"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Tu filtro tiene que mantener correspondencia de uno a uno\n"
+"entre las lรญneas de entrada y salida."
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"se esperaba lรญnea de contexto #%d en\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"hunks no hacen overlap:\n"
+"%.*s\n"
+"\tno acaba con:\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Modo de ediciรณn manual de hunk -- vea abajo para una guรญa rรกpida.\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Para eliminar '%c' lรญneas, haga de ellas lรญneas  ' '  (contexto).\n"
+"Para eliminar '%c' lรญneas, bรณrrelas.\n"
+"Lineas comenzando con  %c serรกn eliminadas.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Si esto no aplica de manera limpia, se te da la oportunidad de \n"
+"editar nuevamente. Si todas las lรญneas del hunk son eliminadas, entonces \n"
+"la ediciรณn es abortada y el hunk queda sin cambios.\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "no se puede analizar hunk header"
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "fallรณ 'git apply --cached'"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Tu hunk editado no aplica. ยฟEditar nuevamente (ยกdecir \"no\" descarta!) [y/"
+"n]? "
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "ยกLos hunks seleccionados no aplican al รญndice!"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "ยฟAplicarlos al รกrbol de trabajo de todas maneras? "
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "Nada fue aplicado.\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - deja este hunk sin decidir, ver el siguiente hunk sin decisiรณn\n"
+"J - deja este hunk sin decidir, ver siguiente hunk\n"
+"k - deja este hunk sin decidir, ver hunk previo sin decidir\n"
+"K - deja este hunk sin decidir, ver hunk anterior\n"
+"g - selecciona un hunk a dรณnde ir\n"
+"/ - buscar un hunk que cumpla con el regex dado\n"
+"s - separar el hunk actual en mรกs pequeรฑos\n"
+"e - editar manualmente el hunk actual\n"
+"? - imprimir ayuda\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "No el anterior hunk"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "No el siguiente hunk"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "No hay mรกs pedazos para el ir"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "ยฟa que hunk ir (<enter> para ver mรกs)? "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "ยฟa que hunk ir? "
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Numero invรกlido: '%s'"
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Lo siento, solo %d hunk disponible."
+msgstr[1] "Lo siento, solo %d hunks disponibles."
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "No hay mรกs pedazos para buscar"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "ยฟbuscar para regexp? "
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Regexp para la bรบsqueda mal formado %s: %s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "No hay hunks que concuerden con el patrรณn entregado."
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "Perdรณn, no se puede dividir este pedazo"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Cortar en %d hunk."
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "Perdรณn, no se puede editar este pedazo"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "fallรณ 'git apply'"
+
+#: advice.c:115
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sayuda: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:168
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
 
-#: advice.c:164
+#: advice.c:170
 msgid "Committing is not possible because you have unmerged files."
 msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
 
-#: advice.c:166
+#: advice.c:172
 msgid "Merging is not possible because you have unmerged files."
 msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
 
-#: advice.c:168
+#: advice.c:174
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
 
-#: advice.c:170
+#: advice.c:176
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "No es posible revertir porque tienes archivos sin fusionar."
 
-#: advice.c:172
+#: advice.c:178
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "No es posible %s porque tienes archivos sin fusionar."
 
-#: advice.c:180
+#: advice.c:186
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -57,23 +746,23 @@ msgstr ""
 "Corrรญgelos en el รกrbol de trabajo y entonces usa 'git add/rm <archivo>',\n"
 "como sea apropiado, para marcar la resoluciรณn y realizar un commit."
 
-#: advice.c:188
+#: advice.c:194
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saliendo porque existe un conflicto sin resolver."
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:199 builtin/merge.c:1335
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No has concluido tu fusiรณn (MERGE_HEAD existe)."
 
-#: advice.c:195
+#: advice.c:201
 msgid "Please, commit your changes before merging."
 msgstr "Por favor, realiza un commit antes de fusionar."
 
-#: advice.c:196
+#: advice.c:202
 msgid "Exiting because of unfinished merge."
 msgstr "Saliendo por una fusiรณn inconclusa."
 
-#: advice.c:202
+#: advice.c:208
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -112,7 +801,7 @@ msgstr ""
 "\n"
 "  git switch -\n"
 "\n"
-"Apaga este aviso mediante la variable de config advice.detachedHead en "
+"Desactiva este aviso poniendo la variable de config advice.detachedHead en "
 "false\n"
 "\n"
 
@@ -206,17 +895,7 @@ msgstr "modo invรกlido en la lรญnea %d: %s"
 msgid "inconsistent header lines %d and %d"
 msgstr "header inconsistente en las lรญneas %d y %d"
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: lรญnea inesperada: %.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragmento de parche sin header en la lรญnea %d: %.*s"
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -231,83 +910,94 @@ msgstr[1] ""
 "los headers de git diff carecen de informaciรณn de los nombres de los "
 "archivos %d cuando los eliminan de la ruta principal componentes (lรญnea %d)"
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
-"el header de git diff carece de informaciรณn del nombre del archivo (lรญnea %d)"
+"la cabecera de git diff carece de informaciรณn del nombre del archivo (lรญnea "
+"%d)"
+
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: lรญnea inesperada: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragmento de parche sin header en la lรญnea %d: %.*s"
 
-#: apply.c:1752
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "el nuevo archivo depende de contenidos viejos"
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "el archivo eliminado todavรญa tiene contenido"
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "parche corrupto en la lรญnea %d"
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nuevo archivo %s depende en contenidos viejos"
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el archivo borrado %s todavรญa tiene contenido"
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** peligro: el archivo %s estรก vacรญo pero no es borrado"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "parche binario corrupto en la lรญnea %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "parche binario no reconocido en la lรญnea %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "parche que solo contiene basura en la lรญnea %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no es posible leer el enlace simbรณlico %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no es posible abrir o leer %s"
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "comienzo invรกlido de lรญnea: '%c'"
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Hunk #%d tuvo รฉxito en %d (%d lรญnea compensada)."
 msgstr[1] "Hunk #%d tuvo รฉxito en %d (%d lรญneas compensadas)."
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d"
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -316,23 +1006,23 @@ msgstr ""
 "mientras se busca:\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "data perdida en parche binario para '%s'"
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'"
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "no se puede aplicar el parche binario a '%s' sin un รญndice completo"
 
-#: apply.c:3151
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -340,289 +1030,284 @@ msgstr ""
 "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
 "actuales."
 
-#: apply.c:3159
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "el parche aplica a un '%s' vacรญo, pero este no lo esta"
 
-#: apply.c:3177
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "la postimagen necesaria %s para '%s' no se puede leer"
 
-#: apply.c:3190
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el parche binario no aplica para '%s'"
 
-#: apply.c:3196
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se "
 "obtuvo %s)"
 
-#: apply.c:3217
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el parche fallรณ: %s:%ld"
 
-#: apply.c:3340
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no se puede hacer checkout a %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
 #, c-format
 msgid "failed to read %s"
 msgstr "no se pudo leer %s"
 
-#: apply.c:3400
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "leyendo de '%s' tras un enlace simbรณlico"
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "la ruta %s ha sido renombrada/suprimida"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existe en el รญndice"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no concuerda con el รญndice"
 
-#: apply.c:3559
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "el repositorio carece del blob necesario para regresar en un merge de tres-"
 "vรญas."
 
-#: apply.c:3562
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Retrocediendo en un merge de tres-vรญas...\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no se pueden leer los contenidos actuales de '%s'"
 
-#: apply.c:3594
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Fallรณ el merge en retroceso de tres-vรญas...\n"
 
-#: apply.c:3608
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Parche aplicado a '%s' con conflictos.\n"
 
-#: apply.c:3613
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Parche aplicado a '%s' limpiamente\n"
 
-#: apply.c:3639
+#: apply.c:3652
 msgid "removal patch leaves file contents"
-msgstr "parche de remociรณn deja contenidos en el archivo"
+msgstr "parche de eliminaciรณn deja contenidos en el archivo"
 
-#: apply.c:3712
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo incorrecto"
 
-#: apply.c:3714
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s tiene tipo %o, se esperaba %o"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ruta invรกlida '%s'"
 
-#: apply.c:3923
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ya existe en el รญndice"
 
-#: apply.c:3926
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ya existe en el directorio de trabajo"
 
-#: apply.c:3946
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
 
-#: apply.c:3951
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
 
-#: apply.c:3971
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "archivo afectado '%s' estรก tras un enlace simbรณlico"
 
-#: apply.c:3975
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el parche no aplica"
 
-#: apply.c:3990
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Revisando el parche %s..."
 
-#: apply.c:4082
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "falta informaciรณn del sha1 o es inรบtil para el submรณdulo %s"
 
-#: apply.c:4089
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
 
-#: apply.c:4092
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta informaciรณn sha1 o es inรบtil (%s)."
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry fallรณ para la ruta '%s'"
-
-#: apply.c:4101
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no se pudo aรฑadir %s al รญndice temporal"
 
-#: apply.c:4111
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no se pudo escribir un รญndice temporal para %s"
 
-#: apply.c:4249
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no se puede eliminar %s del รญndice"
 
-#: apply.c:4283
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "parche corrupto para el submรณdulo %s"
 
-#: apply.c:4289
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no es posible establecer el archivo reciรฉn creado '%s'"
 
-#: apply.c:4297
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "no es posible crear una copia de seguridad para el archivo reciรฉn creado %s"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "no es posible agregar una entrada en el cache para %s"
 
-#: apply.c:4346
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "fallรณ escribir para '%s'"
 
-#: apply.c:4350
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr "cerrando archivo '%s'"
 
-#: apply.c:4420
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no es posible escribir el archivo '%s' modo %o"
 
-#: apply.c:4518
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Parche %s aplicado limpiamente."
 
-#: apply.c:4526
+#: apply.c:4539
 msgid "internal error"
 msgstr "error interno"
 
-#: apply.c:4529
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Aplicando parche %%s con %d rechazo..."
 msgstr[1] "Aplicando parche %%s con %d rechazos..."
 
-#: apply.c:4540
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncando el nombre de archivo .rej a %.*s.rej"
 
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"
 
-#: apply.c:4562
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Hunk #%d aplicado limpiamente."
 
-#: apply.c:4566
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Hunk #%d rechazado."
 
-#: apply.c:4676
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Parche '%s' saltado."
 
-#: apply.c:4684
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr "input no reconocido"
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr "no es posible leer el archivo รญndice"
 
-#: apply.c:4859
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no se puede abrir el parche '%s': %s"
 
-#: apply.c:4886
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d error de espacios en blanco aplastado"
 msgstr[1] "%d errores de espacios en blanco aplastados"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d lรญnea agrega errores de espacios en blanco."
 msgstr[1] "%d lรญneas agregan errores de espacios en blanco."
 
-#: apply.c:4900
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -631,146 +1316,137 @@ msgstr[0] ""
 msgstr[1] ""
 "%d lรญneas aplicadas despuรฉs de arreglar los errores de espacios en blanco."
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "No es posible escribir el archivo รญndice"
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "ruta"
-
-#: apply.c:4944
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr "no aplicar cambios que concuerden con la ruta suministrada"
 
-#: apply.c:4947
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr "aplicar cambios que concuerden con la ruta suministrada"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4973 builtin/am.c:2260
 msgid "num"
 msgstr "num"
 
-#: apply.c:4950
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
 
-#: apply.c:4953
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr "ignorar adiciones hechas por el parche"
 
-#: apply.c:4955
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"
 
-#: apply.c:4959
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "mostrar el numero de lรญneas agregadas y eliminadas en notaciรณn decimal"
 
-#: apply.c:4961
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
 
-#: apply.c:4963
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
 
-#: apply.c:4965
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr "asegurar que el parche es aplicable al รญndice actual"
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marca los nuevos archivos con `git add --intent-to-add`"
 
-#: apply.c:4969
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr "aplicar un parche sin tocar el รกrbol de trabajo"
 
-#: apply.c:4971
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr "aceptar un parche que toca fuera del รกrea de trabajo"
 
-#: apply.c:4974
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "tambiรฉn aplicar el parche ( usar con --stat/--summary/--check"
 
-#: apply.c:4976
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "intentar merge de tres-vรญas si el parche no aplica"
 
-#: apply.c:4978
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construir un รญndice temporal basado en la informaciรณn del รญndice incrustado"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr "rutas estรกn separadas con un carรกcter NULL"
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
-msgstr "asegure que por lo menos <n> lรญneas del contexto concuerden"
+msgstr "asegurar que al menos concuerden <n> lรญneas del contexto concuerden"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
 msgid "action"
 msgstr "acciรณn"
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "detectar lรญneas nuevas o modificadas que contienen errores de espacios en "
 "blanco"
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr "aplicar el parche en reversa"
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "don't expect at least one line of context"
 msgstr "no espera al menos una lรญnea del contexto"
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
 
-#: apply.c:5000
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr "permitir solapamiento de hunks"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "ser verboso"
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolerar nuevas lรญneas faltantes detectadas incorrectamente al final del "
 "archivo"
 
-#: apply.c:5006
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr "no confiar en el conteo de lรญneas en los headers del hunk"
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5032 builtin/am.c:2248
 msgid "root"
 msgstr "raรญz"
 
-#: apply.c:5009
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr "anteponer <root> a todos los nombres de archivos"
 
@@ -793,7 +1469,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <comando>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "ruta especificada '%s' no concordรณ con ninguna carpeta"
@@ -825,7 +1501,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "formato del archivo"
 
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr "prefijo"
 
@@ -833,11 +1509,12 @@ msgstr "prefijo"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteponer prefijo a cada ruta en el archivo"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr "carpeta"
 
@@ -870,7 +1547,7 @@ msgid "list supported archive formats"
 msgstr "listar los formatos de carpeta soportados"
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr "repo"
 
@@ -878,7 +1555,7 @@ msgstr "repo"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "obtener la carpeta del repositorio remoto <repo>"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "comando"
@@ -909,66 +1586,66 @@ msgstr "Formato de carpeta desconocido '%s'"
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumento no soportado para formato '%s': -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:351
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "no se puede transmitir el blob %s"
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:369
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:359
 #, c-format
 msgid "cannot read %s"
 msgstr "no se puede leer %s"
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "no se puede comenzar filtro '%s'"
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr "incapaz de redirigir descriptor"
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "filtro '%s' reportรณ un error"
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "ruta no vรกlida UTF-8: %s"
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
 
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error al desinflar (%d)"
 
-#: archive-zip.c:609
+#: archive-zip.c:615
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no es un nombre de atributo vรกlido"
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s no permitido: %s:%d"
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -986,12 +1663,12 @@ msgstr "Revisa las comillas en el archivo '%s': %s"
 msgid "We cannot bisect more!\n"
 msgstr "ยกNo podemos biseccionar mรกs!\n"
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No es un nombre de commit vรกlido %s"
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1000,7 +1677,7 @@ msgstr ""
 "La base de fisiรณn %s estรก mal.\n"
 "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1009,7 +1686,7 @@ msgstr ""
 "La base de fisiรณn %s es nueva.\n"
 "Esta propiedad ha cambiado entre %s y [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1018,7 +1695,7 @@ msgstr ""
 "La base de fisiรณn %s es %s.\n"
 "Esto quiere decir que el primer '%s' commit estรก entre %s y [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1027,9 +1704,9 @@ msgid ""
 msgstr ""
 "Algunas %s revisiones no son ancestros de la revisiรณn %s.\n"
 "git bisect no puede trabajar bien en este caso.\n"
-"Tal vez confundiste la revisiรณn %s y %s?\n"
+"ยฟTal vez confundiste la revisiรณn %s y %s?\n"
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1040,36 +1717,36 @@ msgstr ""
 "Asรญ que no podemos estar seguros que el primer %s commit estรก entre%s y %s.\n"
 "Vamos a continuar de todas maneras."
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Biseccionando: una base de fisiรณn debe ser probada\n"
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr "una %s revisiรณn es necesaria"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no se pudo crear el archivo '%s'"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no se pudo leer el archivo '%s'"
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr "fallรณ leer las refs de bisect"
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s fue tanto %s como %s\n"
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1078,7 +1755,7 @@ msgstr ""
 "No se encontrรณ commit que se pueda probar.\n"
 "ยฟQuizรกs iniciaste con parรกmetros de rutas incorrectos?\n"
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1088,47 +1765,47 @@ msgstr[1] "(aproximadamente %d pasos)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Biseccionando: falta %d revisiรณn por probar despuรฉs de esto %s\n"
 msgstr[1] "Biseccionando: faltan %d revisiones por probar despuรฉs de esto %s\n"
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents y --reverse no se mezclan bien."
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr "no se puede usar --contents con el nombre de objeto commit final"
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse y --first-parent juntos requieren especificar el รบltimo commit"
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "fallรณ la configuraciรณn del camino de revisiรณn"
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent juntos requieren un rango a lo largo de la cadena "
 "del primer padre"
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hay una ruta %s en %s"
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no se puede leer el blob %s para la ruta %s"
@@ -1292,8 +1969,8 @@ msgstr "'%s' no se ve como un archivo bundle v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "header no reconocido %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
 #, c-format
 msgid "could not open '%s'"
 msgstr "no se pudo abrir '%s'"
@@ -1324,62 +2001,62 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "El bundle requiere esta referencia:"
 msgstr[1] "El bundle requiere estas %d referencias:"
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr "incapaz de duplicar bundle descriptor"
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "No se pudo crear los pack-objetcts"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "pack-objects muriรณ"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "rev-list muriรณ"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referencia '%s' es excluida por las opciones de rev-list"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argumento no reconocido: %s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "Rechazando crear un bundle vacรญo."
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no se puede crear '%s'"
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "index-pack muriรณ"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "color invรกlido: %.*s"
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "no se puede analizar %s"
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
-msgstr "%s %s no es un commit!"
+msgstr "ยก%s %s no es un commit!"
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1399,27 +2076,27 @@ msgstr ""
 "Apapa este mensaje ejecutando\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1127
+#: commit.c:1153
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
 
-#: commit.c:1130
+#: commit.c:1157
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
 
-#: commit.c:1133
+#: commit.c:1160
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s no tiene una firma GPG."
 
-#: commit.c:1136
+#: commit.c:1163
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "El Commit %s tiene una buena firma GPG por %s\n"
 
-#: commit.c:1390
+#: commit.c:1417
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1430,167 +2107,177 @@ msgstr ""
 "variable de configuraciรณn i18n.commitencoding para la codificaciรณn que usa "
 "tu proyecto.\n"
 
-#: commit-graph.c:127
+#: commit-graph.c:122
 msgid "commit-graph file is too small"
 msgstr "archivo commit-graph es muy pequeรฑo"
 
-#: commit-graph.c:192
+#: commit-graph.c:189
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "firma %X en commit-graph no concuerda con firma %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:196
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "versiรณn de commit-graph %X no concuerda con versiรณn %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:203
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "versiรณn de hash de commit-graph %X no concuerda con versiรณn %X"
 
-#: commit-graph.c:229
+#: commit-graph.c:226
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr ""
 "falta tabla de lookup del chunk en commit-graph; el archivo puede estar "
 "incompleto"
 
-#: commit-graph.c:240
+#: commit-graph.c:237
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
 
-#: commit-graph.c:283
+#: commit-graph.c:280
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "id de chunk de commit-graph %08x parece tener mรบltiples tiempos"
 
-#: commit-graph.c:347
+#: commit-graph.c:343
 msgid "commit-graph has no base graphs chunk"
 msgstr "commit-graph no tiene una chunk base de graphs"
 
-#: commit-graph.c:357
+#: commit-graph.c:353
 msgid "commit-graph chain does not match"
 msgstr "cadena commit-graph no concuerda"
 
-#: commit-graph.c:404
+#: commit-graph.c:401
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "cadena de commit-graph invรกlida: lรญnea '%s' no es un hash"
 
-#: commit-graph.c:430
+#: commit-graph.c:425
 msgid "unable to find all commit-graph files"
 msgstr "no es posible encontrar los archivos commit-graph"
 
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:558 commit-graph.c:618
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "posiciรณn de commit invรกlida. commit-graph estรก probablemente corrupto"
 
-#: commit-graph.c:575
+#: commit-graph.c:579
 #, c-format
 msgid "could not find commit %s"
 msgstr "no se pudo encontrar commit %s"
 
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "no es posible analizar el commit %s"
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "incapaz de obtener el tipo de objeto: %s"
 
-#: commit-graph.c:1034
+#: commit-graph.c:1043
 msgid "Loading known commits in commit graph"
 msgstr "Cargando commits conocidos en commit graph"
 
-#: commit-graph.c:1051
+#: commit-graph.c:1060
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expandiendo commits alcanzables en commit graph"
 
-#: commit-graph.c:1070
+#: commit-graph.c:1079
 msgid "Clearing commit marks in commit graph"
 msgstr "Limpiando marcas de commits en commit graph"
 
-#: commit-graph.c:1089
+#: commit-graph.c:1098
 msgid "Computing commit graph generation numbers"
 msgstr "Calculando nรบmeros de generaciรณn de commit graph"
 
-#: commit-graph.c:1163
+#: commit-graph.c:1173
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Encontrando commits para commit graph en %d pack"
 msgstr[1] "Encontrando commits para commit graph en %d packs"
 
-#: commit-graph.c:1176
+#: commit-graph.c:1186
 #, c-format
 msgid "error adding pack %s"
 msgstr "error agregando pack %s"
 
-#: commit-graph.c:1180
+#: commit-graph.c:1190
 #, c-format
 msgid "error opening index for %s"
 msgstr "error abriendo index para %s"
 
-#: commit-graph.c:1204
+#: commit-graph.c:1214
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
 msgstr[0] "Encontrando commits para commit graph de %d ref"
 msgstr[1] "Encontrando commits para commit graph de %d refs"
 
-#: commit-graph.c:1238
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "id de objeto commit: %s invรกlido"
+
+#: commit-graph.c:1249
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
 
-#: commit-graph.c:1253
+#: commit-graph.c:1264
 msgid "Counting distinct commits in commit graph"
 msgstr "Contando commits distintos en commit graph"
 
-#: commit-graph.c:1284
+#: commit-graph.c:1294
 msgid "Finding extra edges in commit graph"
 msgstr "Encontrando esquinas extra en commit graph"
 
-#: commit-graph.c:1332
+#: commit-graph.c:1340
 msgid "failed to write correct number of base graph ids"
 msgstr "fallรณ al escribir el nรบmero correcto de ids de base graph"
 
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1373 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "no se pudo crear directorios principales para %s"
 
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr "no se puede crear '%s'"
 
-#: commit-graph.c:1437
+#: commit-graph.c:1445
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Escribiendo commit graph en %d paso"
 msgstr[1] "Escribiendo commit graph en %d pasos"
 
-#: commit-graph.c:1478
+#: commit-graph.c:1486
 msgid "unable to open commit-graph chain file"
 msgstr "no se pudo abrir la cadena de archivos commit-graph"
 
-#: commit-graph.c:1490
+#: commit-graph.c:1498
 msgid "failed to rename base commit-graph file"
 msgstr "no se pudo renombrar el archivo base commit-graph"
 
-#: commit-graph.c:1510
+#: commit-graph.c:1518
 msgid "failed to rename temporary commit-graph file"
 msgstr "fallรณ al renombrar el archivo temporal commit-graph"
 
-#: commit-graph.c:1621
+#: commit-graph.c:1631
 msgid "Scanning merged commits"
 msgstr "Escaneando commits fusionados"
 
-#: commit-graph.c:1632
+#: commit-graph.c:1642
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "id de commit duplicado inesperado %s"
 
-#: commit-graph.c:1657
+#: commit-graph.c:1665
 msgid "Merging commit-graph"
 msgstr "Fusionando commit-graph"
 
@@ -1603,23 +2290,23 @@ msgstr "el formato de grรกficos de commit no pudede escribir %d commits"
 msgid "too many commits to write graph"
 msgstr "demasiados commits para escribir el grรกfico"
 
-#: commit-graph.c:1945
+#: commit-graph.c:1944
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "el archivo de commit-graph tiene checksums incorrectos y probablemente estรก "
 "corrupto"
 
-#: commit-graph.c:1955
+#: commit-graph.c:1954
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
 
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1964 commit-graph.c:1979
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
 
-#: commit-graph.c:1972
+#: commit-graph.c:1971
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "fallรณ al analizar commit %s para commit-graph"
@@ -1628,53 +2315,53 @@ msgstr "fallรณ al analizar commit %s para commit-graph"
 msgid "Verifying commits in commit graph"
 msgstr "Verificando commits en commit graph"
 
-#: commit-graph.c:2002
+#: commit-graph.c:2003
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "fallรณ al analizar el commit %s de la base de datos de objetos para commit-"
 "graph"
 
-#: commit-graph.c:2009
+#: commit-graph.c:2010
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "รกrbol raรญz OID para commit %s en commit-graph es %s != %s"
 
-#: commit-graph.c:2019
+#: commit-graph.c:2020
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "lista padre de commit-graph para commit %s es muy larga"
 
-#: commit-graph.c:2028
+#: commit-graph.c:2029
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "padre de commit-graph para %s es %s != %s"
 
-#: commit-graph.c:2041
+#: commit-graph.c:2042
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "lista padre de commit-graph para commit %s termina antes"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2047
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
 "commit-graph ha generado nรบmero cero para %s, pero no-cero para los demรกs"
 
-#: commit-graph.c:2050
+#: commit-graph.c:2051
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
 "commit-graph tiene generaciรณn no-cero para %s, pero cero para los demรกs"
 
-#: commit-graph.c:2065
+#: commit-graph.c:2066
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "generaciรณn commit-graph para commit %s es %u != %u"
 
-#: commit-graph.c:2071
+#: commit-graph.c:2072
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
@@ -1723,7 +2410,7 @@ msgstr "llave no contiene una secciรณn: %s"
 msgid "key does not contain variable name: %s"
 msgstr "llave no contiene el nombre de variable: %s"
 
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2444
 #, c-format
 msgid "invalid key: %s"
 msgstr "llave invรกlida: %s"
@@ -1861,7 +2548,7 @@ msgstr "valor malformado para %s: %s"
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "debe ser uno de nothing, matching, simple, upstream o current"
 
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1518 builtin/pack-objects.c:3541
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivel de compresiรณn de pack errรณneo %d"
@@ -1886,113 +2573,106 @@ msgstr "no se posible resolver configuraciรณn de blob '%s'"
 msgid "failed to parse %s"
 msgstr "no se pudo analizar %s"
 
-#: config.c:1745
+#: config.c:1743
 msgid "unable to parse command-line config"
 msgstr "no es posible analizar la configuraciรณn de la lรญnea de comando"
 
-#: config.c:2094
+#: config.c:2097
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "error desconocido ocurriรณ mientras se leรญan los archivos de configuraciรณn"
 
-#: config.c:2264
+#: config.c:2267
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Invรกlido %s: '%s'"
 
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-"valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por "
-"defecto"
-
-#: config.c:2333
+#: config.c:2312
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
 
-#: config.c:2379
+#: config.c:2358
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "no es posible analizar '%s' de la configuraciรณn de la lรญnea de comando"
 
-#: config.c:2381
+#: config.c:2360
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "mala variable de config '%s' en el archivo '%s' en la lรญnea %d"
 
-#: config.c:2462
+#: config.c:2441
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nombre de secciรณn invรกlido '%s'"
 
-#: config.c:2494
+#: config.c:2473
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s tiene mรบltiples valores"
 
-#: config.c:2523
+#: config.c:2502
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "fallรณ al escribir nuevo archivo de configuraciรณn %s"
 
-#: config.c:2775 config.c:3099
+#: config.c:2754 config.c:3078
 #, c-format
 msgid "could not lock config file %s"
 msgstr "no se pudo bloquear archivo de configuraciรณn %s"
 
-#: config.c:2786
+#: config.c:2765
 #, c-format
 msgid "opening %s"
 msgstr "abriendo %s"
 
-#: config.c:2821 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "patrรณn invรกlido: %s"
 
-#: config.c:2846
+#: config.c:2825
 #, c-format
 msgid "invalid config file %s"
 msgstr "archivo de configuraciรณn invรกlido: %s"
 
-#: config.c:2859 config.c:3112
+#: config.c:2838 config.c:3091
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat en %s fallรณ"
 
-#: config.c:2870
+#: config.c:2849
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "no es posible hacer mmap '%s'"
 
-#: config.c:2879 config.c:3117
+#: config.c:2858 config.c:3096
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod en %s fallรณ"
 
-#: config.c:2964 config.c:3214
+#: config.c:2943 config.c:3193
 #, c-format
 msgid "could not write config file %s"
 msgstr "no se pudo escribir el archivo de configuraciรณn %s"
 
-#: config.c:2998
+#: config.c:2977
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no se pudo configurar '%s' a '%s'"
 
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no se pudo desactivar '%s'"
 
-#: config.c:3090
+#: config.c:3069
 #, c-format
 msgid "invalid section name: %s"
 msgstr "secciรณn de nombre invรกlida: %s"
 
-#: config.c:3257
+#: config.c:3236
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valor faltante para '%s'"
@@ -2116,7 +2796,7 @@ msgstr "no es posible revisar %s (%s)"
 msgid "unknown port %s"
 msgstr "puerto desconocido %s"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "hostname extraรฑo '%s' bloqueado"
@@ -2131,59 +2811,59 @@ msgstr "puerto extraรฑo '%s' bloqueado"
 msgid "cannot start proxy %s"
 msgstr "no se puede comenzar proxy %s"
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "no hay ruta especificada; vea 'git help pull' para sintaxis de url vรกlidas"
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr "variante 'simple' de ssh no soporta -4"
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr "variante 'simple' de ssh no soporta -6"
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "variante ssh 'simple' no soporta configurar puerto"
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "ruta extraรฑa '%s' bloqueada"
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr "no es posible hacer fork"
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr "Verificando conectividad"
 
-#: connected.c:98
+#: connected.c:110
 msgid "Could not run 'git rev-list'"
 msgstr "No se pudo correr 'git rev-list'"
 
-#: connected.c:118
+#: connected.c:130
 msgid "failed write to rev-list"
 msgstr "fallรณ escribir a rev-list"
 
-#: connected.c:125
+#: connected.c:137
 msgid "failed to close rev-list's stdin"
 msgstr "fallรณ al cerrar la entrada standard de rev-list"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "crlf_action %d ilegal"
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF serรก reemplazado por LF en %s"
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2192,12 +2872,12 @@ msgstr ""
 "CRLF serรก remplazado por LF en %s.\n"
 "El archivo tendrรก sus finales de lรญnea originales en tu directorio de trabajo"
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF serรก reemplazado por CRLF en %s"
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2206,19 +2886,19 @@ msgstr ""
 "LF serรก reemplazado por CRLF en %s.\n"
 "El archivo tendrรก sus finales de lรญnea originales en tu directorio de trabajo"
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM estรก prohibido en '%s' si es codificado como %s"
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
-msgstr ""
-"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%s como "
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
 "working-tree-encoding."
+msgstr ""
+"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%.*s "
+"como working-tree-encoding."
 
 #: convert.c:304
 #, c-format
@@ -2234,50 +2914,50 @@ msgstr ""
 "Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o "
 "UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding."
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "fallรณ al codificar '%s' de %s a %s"
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "codificaciรณn '%s' de %s a %s y de vuelta no son iguales"
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "no se pueden alimentar de input a los filtros externos '%s'"
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "filtro externo '%s' fallรณ %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "lectura de filtro externo '%s' fallรณ"
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "filtro externo '%s' fallรณ"
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr "tipo de filtro inesperado"
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr "nombre de ruta muy largo para filtro externo"
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2286,67 +2966,67 @@ msgstr ""
 "filtro externo '%s' ya no estรก disponible aunque no todas las rutas han sido "
 "filtradas"
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false no son working-tree-encodings vรกlidos"
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: fallรณ al limpiar filtro '%s'"
 
-#: convert.c:1476
+#: convert.c:1489
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: filtro smudge %s fallรณ"
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr "en el futuro"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "hace %<PRIuMAX> segundo"
 msgstr[1] "hace %<PRIuMAX> segundos"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "hace %<PRIuMAX> minuto"
 msgstr[1] "hace %<PRIuMAX> minutos"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "hace %<PRIuMAX> hora"
 msgstr[1] "hace %<PRIuMAX> horas"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "hace %<PRIuMAX> dรญa"
 msgstr[1] "hace %<PRIuMAX> dรญas"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "hace %<PRIuMAX> semana"
 msgstr[1] "hace %<PRIuMAX> semanas"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "hace %<PRIuMAX> mes"
 msgstr[1] "hace %<PRIuMAX> meses"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2354,14 +3034,14 @@ msgstr[0] "%<PRIuMAX> aรฑo"
 msgstr[1] "%<PRIuMAX> aรฑos"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "%s, y %<PRIuMAX> mes atrรกs"
 msgstr[1] "%s, y %<PRIuMAX> meses atrรกs"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2397,7 +3077,7 @@ msgstr "%d islas marcadas, listo.\n"
 msgid "failed to read orderfile '%s'"
 msgstr "fallรณ al leer orden de archivos '%s'"
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr "Realizando una detecciรณn de cambios de nombre inexacta"
 
@@ -2464,35 +3144,35 @@ msgstr ""
 "Errores en la variable de config 'diff.dirstat' encontrados:\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "diff externo muriรณ, deteniendo en %s"
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S y --find-object son mutuamente exclusivas"
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requiere exactamente un pathspec"
 
-#: diff.c:4689
+#: diff.c:4676
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valor --stat invรกlido: %s"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s espera un valor numรฉrico"
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2501,42 +3181,42 @@ msgstr ""
 "Fallรณ al analizar parรกmetro de opciรณn --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valor desconocido luego de ws-error-highlight=%.*s"
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "no se puede resolver '%s'"
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s espera forma <n>/<m>"
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s esperaba un char, se obtuvo '%s'"
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "mal argumento --color-moved: %s"
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "modo invรกlido '%s' en --color-moved-ws"
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2544,154 +3224,154 @@ msgstr ""
 "opciรณn diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
 "\"histogram\""
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argumento invรกlido para %s"
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "fallรณ al analizar parรกmetro de opciรณn --submodule: '%s'"
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "mal argumento --word-diff: %s"
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr "Opciones de formato de salida para diff"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr "generar parche"
 
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr "suprimir salida de diff"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr "genera diffs con <n> lรญneas de contexto"
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr "genera el diff en formato raw"
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr "sinรณnimo para '-p --stat'"
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr "sinรณnimo para '-p --stat'"
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr "--stat amigable para mรกquina"
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr "mostrar solo la รบltima lรญnea para --stat"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "muestra la distribuciรณn de cantidades de cambios relativa para cada "
 "subdirectorio"
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinรณnimo para --dirstat=cumulative"
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "sinonimo para --dirstat=archivos,param1,param2..."
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "advierte si cambios introducen conflictos de markers o errores de espacios "
 "en blanco"
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "resumen condensado de creaciones, cambios de nombres y cambios de modos"
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr "mostrar solo nombres de archivos cambiados"
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr "mostrar solo nombres y estados de archivos cambiados"
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr "generar diffstat"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr "<ancho>"
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr "genera diffstat con un ancho dado"
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr "genera diffstat con un nombre de ancho dado"
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr "genera diffstat con un ancho de graph dado"
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr "<cantidad>"
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr "genera diffstat con lรญneas limitadas"
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr "genera un resumen compacto de diffstat"
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr "muestra un diff binario que puede ser aplicado"
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "mostrar todo un pre- y post-image de nombres de objetos en las lรญneas \"index"
 "\""
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr "mostrar diff colorido"
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr "<tipo>"
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2699,7 +3379,7 @@ msgstr ""
 "resaltar errores de espacios en blanco en las lรญneas 'context', 'old' o "
 "'new' del diff"
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2707,89 +3387,89 @@ msgstr ""
 "no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
 "o --numstat"
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr "<prefijo>"
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "mostrar el prefijo de destino en lugar de \"b/\""
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr "anteponer un prefijo adicional a cada lรญnea mostrada"
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr "no mostrar ningรบn prefijo de fuente o destino"
 
-#: diff.c:5371
+#: diff.c:5358
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "muestra el contexto entre hunks de diff hasta el nรบmero especificado de "
 "lรญneas"
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr "<char>"
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "especifica el char para indicar una nueva lรญnea en lugar de '+'"
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "especifica el char para indicar una lรญnea vieja en lugar de '-'"
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "especifica el char para indicar un contexto en lugar de ' '"
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr "Opciones de diff rename"
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr "detectar renombrados"
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr "omite la preimage para borrados"
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr "detectar copias"
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr "usa archivos no modificados como fuente para encontrar copias"
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr "deshabilita detecciรณn de renombres"
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
 msgstr "usa blobs vacรญos como fuente de renombre"
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
 msgstr "continua listando el historial de un archivo mรกs allรก de renombres"
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2797,155 +3477,155 @@ msgstr ""
 "previene detecciรณn de renombre/copias si el nรบmero de objetivos para "
 "renombres/copias excede el lรญmite dado"
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr "Opciones de algoritmos de diff"
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr "produce el diff mรกs pequeรฑo posible"
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorar espacios en blanco cuando comparando lรญneas"
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorar cambios en la cantidad de lรญneas en blanco"
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorar cambios en espacios en blanco en EOL"
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr "ignora carrier-return al final de la lรญnea"
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr "ignora cambios cuyas lรญneas son todas en blanco"
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "heurรญstica para cambiar los lรญmites de hunk para una fรกcil lectura"
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "genera un diff usando algoritmo \"patience diff\""
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "genera un diff usando algoritmo \"histogram diff\""
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr "<algoritmo>"
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr "escoge un algoritmo para diff"
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr "<texto>"
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "genera un diff usando algoritmo \"anchored diff\""
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr "<modo>"
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr "usa <regex> para decidir que palabra es"
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
 msgstr "lรญneas movidas de cรณdigo estรกn coloreadas diferente"
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
 msgstr "como espacios en blanco son ignorados en --color-moved"
 
-#: diff.c:5469
+#: diff.c:5456
 msgid "Other diff options"
 msgstr "Otras opciones de diff"
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
 "paths relativos"
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr "tratar todos los archivos como texto"
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
 msgstr "cambia dos inputs, invierte el diff"
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr "deshabilita todo el output del programa"
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr "permite la ejecuciรณn de un diff helper externo"
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "ejecuta filtros de conversiรณn de texto externos cuando comparando binarios"
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr "<cuando>"
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignorar cambios a submรณdulos en la generaciรณn de diff"
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr "<formato>"
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr "especifica como son mostradas las diferencias en submรณdulos"
 
-#: diff.c:5496
+#: diff.c:5483
 msgid "hide 'git add -N' entries from the index"
 msgstr "ocultar entradas 'git add -N' del index"
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "trata entradas 'git add -N' como reales en el index"
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr "<string>"
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -2953,7 +3633,7 @@ msgstr ""
 "busca por diferencias que cambien el nรบmero de ocurrencias para el string "
 "especificado"
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -2961,23 +3641,23 @@ msgstr ""
 "busca por diferencias que cambien el nรบmero de ocurrencias para el regex "
 "especificado"
 
-#: diff.c:5508
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
 msgstr "mostrar todos los cambios en el changeset con -S o -G"
 
-#: diff.c:5511
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "tratar <string> en -S como una expresiรณn regular extendida de POSIX"
 
-#: diff.c:5514
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
 msgstr "controlar el orden en el que los archivos aparecen en la salida"
 
-#: diff.c:5515
+#: diff.c:5502
 msgid "<object-id>"
 msgstr "<id-objeto>"
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -2985,33 +3665,33 @@ msgstr ""
 "busca por diferencias que cambien el nรบmero de ocurrencias para el objeto "
 "especificado"
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
 msgstr "selecciona archivos por tipo de diff"
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr "<archivo>"
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr "Output a un archivo especรญfico"
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "detecciรณn de cambio de nombre inexacta fue saltada por haber muchos archivos."
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "solo se encontraron copias de rutas modificadas por haber muchos archivos."
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3019,41 +3699,61 @@ msgstr ""
 "tal vez quieras configurar la variable %s para por lo menos %d y volver a "
 "intentar el comando."
 
-#: dir.c:537
+#: dir.c:555
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 "ruta especificada '%s' no concordรณ con ningรบn archivo(s) conocido por git"
 
-#: dir.c:926
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "patrรณn desconocido: '%s'"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "patrรณn negativo no reconocido: '%s'"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"tu archivo sparse-checkout tal vez tenga errores: patrรณn '%s' estรก repetido"
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "deshabilitar coincidencia de patrรณnes cono"
+
+#: dir.c:1173
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "no se puede usar %s como archivo de exclusiรณn"
 
-#: dir.c:1843
+#: dir.c:2144
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "no se pudo abrir el directorio '%s'"
 
-#: dir.c:2085
+#: dir.c:2479
 msgid "failed to get kernel name and information"
 msgstr "fallรณ al conseguir la informaciรณn y nombre del kernel"
 
-#: dir.c:2209
+#: dir.c:2603
 msgid "untracked cache is disabled on this system or location"
 msgstr "untracked cache estรก desactivado en este sistema o ubicaciรณn"
 
-#: dir.c:3013
+#: dir.c:3407
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "archivo รญndice corrompido en repositorio %s"
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3452 dir.c:3457
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no se pudo crear directorios para %s"
 
-#: dir.c:3092
+#: dir.c:3486
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
@@ -3072,12 +3772,12 @@ msgstr "Filtrando contenido"
 msgid "could not stat file '%s'"
 msgstr "no se pudo establecer el archivo '%s'"
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "ruta de namespace de git mala \"%s\""
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "no se pudo configurar GIT_DIR a '%s'"
@@ -3087,266 +3787,270 @@ msgstr "no se pudo configurar GIT_DIR a '%s'"
 msgid "too many args to run %s"
 msgstr "demasiados argumentos para correr %s"
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Remoto sin URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: lista poco profunda esperada"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 "git fetch-pack: se esperaba un flush packet luego de la lista superficial"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr "no se puede escribir al remoto"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requiere multi_ack_detailed"
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "lรญnea poco profunda invรกlida: %s"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "lรญnea superficial invรกlida: %s"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr "objeto no encontrado: %s"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objeto: %s"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr "superficie no encontrada: %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "se esperaba shallow/unshallow, se obtuvo %s"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr "se obtuvo %s %d %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit invรกlido %s"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr "rindiรฉndose"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr "listo"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "se obtuvo %s (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marcando %s como completa"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ya se tiene %s (%s)"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr "error de protocolo: paquete de header errรณneo"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no se puede quitar %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr "%s fallรณ"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr "error en demultiplexor de banda lateral"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Versiรณn de servidor es %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr "El servidor soporta %s"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr "El servidor no soporta clientes superficiales"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr "El servidor no soporta --shalow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no soporta --shalow-exclude"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr "El servidor no soporta --deepen"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr "no hay commits comunes"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch fallรณ."
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr "El servidor no soporta peticiones superficiales"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr "El servidor soporta filtro"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr "no se puede escribir request al remoto"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "error leyendo secciรณn header '%s'"
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "se esperaba '%s', se recibiรณ '%s'"
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "lรญnea de confirmaciรณn inesperada: '%s'"
 
-#: fetch-pack.c:1252
+#: fetch-pack.c:1308
 #, c-format
 msgid "error processing acks: %d"
 msgstr "error procesando acks: %d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr "espere que el packfile sea mandado luego del 'listo'"
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "espere que ninguna otra secciรณn sea enviada luego del 'listo'"
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "error procesando informaciรณn superficial: %d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "se esperaba wanted-ref, se obtuvo '%s'"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inesperado: '%s'"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "error procesando refs deseadas: %d"
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr "no concuerda el head remoto"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:689
 msgid "remote did not send all necessary objects"
 msgstr "remoto no mando todos los objetos necesarios"
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existe ref remota %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
 
-#: gpg-interface.c:321
+#: gpg-interface.c:408
 msgid "gpg failed to sign the data"
 msgstr "gpg fallรณ al firmar la data"
 
-#: gpg-interface.c:347
+#: gpg-interface.c:434
 msgid "could not create temporary file"
 msgstr "no se pudo crear archivo temporal"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:437
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "fallรณ al escribir la firma separada para '%s'"
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora color invรกlido '%.*s' en log.graphColors"
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"el patrรณn provisto contiene bytes NULL (via -f <archivo>). Esto solo es "
+"soportado con -P bajo PCRE v2"
+
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': no es posible leer %s"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "fallรณ al marcar '%s'"
 
-#: grep.c:2145
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': lectura corta"
@@ -3396,7 +4100,7 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Comandos de bajo nivel / Interrogadores"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Comandos de bajo nivel / Sincronizaciรณn de repositorios"
 
 #: help.c:38
@@ -3444,7 +4148,7 @@ msgid ""
 "able to execute it. Maybe git-%s is broken?"
 msgstr ""
 "'%s' parece ser un comando de git, pero no hemos\n"
-"podido ejecutarlo. Tal vez git-%s se ha roto?"
+"podido ejecutarlo. ยฟTal vez git-%s se ha roto?"
 
 #: help.c:655
 msgid "Uh oh. Your system reports no Git commands at all."
@@ -3488,12 +4192,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr "git versiรณn [<opciones>]"
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3561,46 +4265,61 @@ msgstr "no se puede tener un nombre vacรญo (para <%s>)"
 msgid "name consists only of disallowed characters: %s"
 msgstr "el nombre consiste solo de caracteres no permitidos: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:635
 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato de fecha invรกlido: %s"
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "entrada '%s' en รกrbol %s tiene modo รกrbol, pero no es uno"
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "entrada '%s' en รกrbol %s tiene modo blob, pero no es uno"
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "no se puede cargar รกrbol raรญz para commit %s"
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "no se pueden combinar mรบltiples tipos de especificaciones de filtro"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "no es posible acceder al blob en '%s'"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "incapaz de analizar filtro de data en %s"
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr "se esperaba 'tree:<depth>'"
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr "soporte para filtros sparse:path ha sido discontinuado"
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "filtro -spec invรกlido '%s'"
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "no se puede cambiar un clon parcial remoto promisor"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "se espera algo luego de combine:"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "no se pueden combinar mรบltiples tipos de especificaciones de filtro"
 
 #: lockfile.c:151
 #, c-format
@@ -3631,115 +4350,111 @@ msgstr "No se pudo crear '%s.lock': %s"
 msgid "failed to read the cache"
 msgstr "fallรณ al leer la cache"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "no es posible escribir el archivo รญndice"
 
-#: merge-recursive.c:322
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(commit errรณneo)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo fallรณ para la ruta '%s'; abortando fusiรณn."
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "add_cacheinfo fallรณ para refrescar la ruta '%s'; abortando fusiรณn."
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "error construyendo รกrboles"
-
-#: merge-recursive.c:863
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "fallรณ al crear la ruta '%s'%s"
 
-#: merge-recursive.c:874
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
-msgstr ": tal vez un conflicto D/F?"
+msgstr ": ยฟtal vez un conflicto D/F?"
 
-#: merge-recursive.c:897
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "rehusando perder el archivo rastreado en '%s'"
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no se puede leer el objeto %s '%s'"
 
-#: merge-recursive.c:941
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "se esperaba blob para %s '%s'"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "fallรณ al abrir '%s': %s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "fallรณ al crear el enlace simbรณlico '%s': %s"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "no se que hacer con %06o %s '%s'"
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Fallรณ al fusionar el submรณdulo %s (no revisado)"
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Fallรณ al fusionar el submรณdulo %s (commits no presentes)"
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "Fallรณ el fusionar submรณdulo %s (commits no siguen la fusiรณn base)"
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Haciendo fast-forward a submรณdulo %s para el siguiente commit:"
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avance rรกpido en submรณdulo %s"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Fallรณ al fusionar submรณdulo %s (los siguentes commits no fueron encontrados)"
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Fallรณ al fusionar el submรณdulo %s (no es posible avance rรกpido)"
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Se encontrรณ una posible soluciรณn de fusiรณn para el submรณdulo:\n"
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3756,33 +4471,33 @@ msgstr ""
 "\n"
 "el cual aceptarรก esta sugerencia.\n"
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Fallรณ al fusionar el submรณdulo %s (fusiones mรบltiples encontradas)"
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "Fallรณ al ejecutar la fusiรณn interna"
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No es posible agregar %s a la base de datos"
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Auto-fusionando %s"
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Error: Rehusando perder el archivo no rastreado en %s; escribiรฉndolo a %s en "
 "cambio."
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3791,7 +4506,7 @@ msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versiรณn %s de %s "
 "en el รกrbol."
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3800,7 +4515,7 @@ msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versiรณn %s de %s "
 "permanece en el รกrbol."
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3809,7 +4524,7 @@ msgstr ""
 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versiรณn %s de %s "
 "dejada en el รกrbol, en %s."
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3818,44 +4533,44 @@ msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versiรณn %s de %s "
 "permanece en el รกrbol en %s."
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "renombrar"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "renombrado"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Rehusando perder el archivo sucio en %s"
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Rehusando perder el archivo no rastreado en %s, incluso aunque se estรก "
 "interponiendo."
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s.  %s agregado en %s"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s es un directorio en %s agregando como %s mรกs bien"
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Rehusando perder el archivo no rastreado en %s; agregรกndolo como %s en cambio"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3864,18 +4579,18 @@ msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
 "renombrar \"%s\"->\"%s\" en \"%s\"%s"
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " (dejado sin resolver)"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1793
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
 "%s"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3886,7 +4601,7 @@ msgstr ""
 "colocar %s porque el directorio %s fue renombrado a otros mรบltiples "
 "directorios, sin ningรบn que contenga la mayorรญa de archivos."
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3896,7 +4611,7 @@ msgstr ""
 "existente en %s se interpone con el cambio de nombres implรญcito, poniendo "
 "la(s) siguiente(s) ruta(s) aquรญ: %s."
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3905,7 +4620,7 @@ msgstr ""
 "CONFLICTO (cambio de nombre implรญcito): No se puede mapear mรกs de una ruta "
 "para %s; cambio de nombre implรญcito intentรณ poner estas rutas: %s"
 
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3914,7 +4629,7 @@ msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
 "Renombrar directorio %s->%s en %s"
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3923,52 +4638,52 @@ msgstr ""
 "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
 "renombrado."
 
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
 #, c-format
 msgid "cannot read object %s"
 msgstr "no se pudo leer el objeto %s"
 
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
 #, c-format
 msgid "object %s is not a blob"
 msgstr "objeto %s no es un blob"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modify"
 msgstr "modificar"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modified"
 msgstr "modificado"
 
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
 msgid "content"
 msgstr "contenido"
 
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
 msgid "add/add"
 msgstr "agregar/agregar"
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Saltado %s (fusionado como existente)"
 
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:1003
 msgid "submodule"
 msgstr "submรณdulo"
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTO (%s): Conflicto de fusiรณn en %s"
 
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Agregando mรกs bien como %s"
 
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -3977,7 +4692,7 @@ msgstr ""
 "Path actualizado: %s agregado en %s dentro de un directorio que fue "
 "renombrado en %s; moviรฉndolo a %s."
 
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -3986,7 +4701,7 @@ msgstr ""
 "CONFLICTO (ubicaciรณn de archivo): %s agregado en %s dentro de un directorio "
 "que fue renombrado en %s, sugerimos que deberรญa ser movido a %s."
 
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -3995,7 +4710,7 @@ msgstr ""
 "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
 "renombrado en %s; moviรฉndolo a %s."
 
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4005,230 +4720,246 @@ msgstr ""
 "directorio que fue renombrado en %s, sugiriendo que tal vez deberรญa ser "
 "movido a %s."
 
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
 msgid "file/directory"
 msgstr "archivo/directorio"
 
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
 msgid "directory/file"
 msgstr "directorio/archivo"
 
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "
 "%s"
 
-#: merge-recursive.c:3347
+#: merge-recursive.c:3371
 #, c-format
 msgid "Adding %s"
 msgstr "Agregando %s"
 
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
 
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Los cambios locales de los siguientes archivos serรกn sobreescritos por "
-"merge:\n"
-"  %s"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
 msgid "Already up to date!"
 msgstr "ยกYa estรก actualizado!"
 
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "fallรณ la fusiรณn de los รกrboles %s y %s"
 
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
 msgid "Merging:"
 msgstr "Fusionando:"
 
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "se encontrรณ %u ancestro comรบn:"
 msgstr[1] "se encontraron %u ancestros comunes:"
 
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
 msgid "merge returned no commit"
 msgstr "la fusiรณn no devolviรณ ningรบn commit"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Los cambios locales de los siguientes archivos serรกn sobreescritos por "
+"merge:\n"
+"  %s"
+
+#: merge-recursive.c:3756
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No se pudo analizar el objeto '%s'"
 
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
 msgid "Unable to write index."
 msgstr "Incapaz de escribir el รญndice."
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "archivo multi-pack-index %s es muy pequeรฑo"
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "versiรณn %d de multi-pack-index no reconocida"
 
-#: midx.c:95
+#: midx.c:94
 #, c-format
 msgid "hash version %u does not match"
 msgstr "versiรณn de hash %u no concuerda"
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr "offset invรกlido del conjunto (muy grande)"
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr ""
 "terminando multi-pack-index porque el id del conjunto aparece antes de lo "
 "esperado"
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index le falta el conjunto pack-name requerido"
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "mal pack-int-id: %u (%u paquetes totales)"
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeรฑo"
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr "error preparando packfile de multi-pack-index"
 
-#: midx.c:470
+#: midx.c:472
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "fallรณ al agregar packfile '%s'"
 
-#: midx.c:476
+#: midx.c:478
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "fallรณ al abrir pack-index '%s'"
 
-#: midx.c:536
+#: midx.c:538
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "fallรณ al ubicar objeto %d en packfile"
 
-#: midx.c:865
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Agregando packfiles a multi-pack-index"
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "no se viรณ pack-file %s caer"
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "Escribiendo chunks a multi-pack-index"
+
+#: midx.c:1052
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "fallรณ al limpiar multi-pack-index en %s"
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr "Buscando por packfiles referidos"
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
-msgstr "Verificando orden de OID en MIDX"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verificando orden de OID en multi-pack-index"
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr "Ordenando objetos por packfile"
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr "Verificando offsets de objetos"
 
-#: midx.c:1160
+#: midx.c:1180
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "fallo al cargar entrada pack para oid[%d] = %s"
 
-#: midx.c:1166
+#: midx.c:1186
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "fallรณ al cargar el pack-index para packfile %s"
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "Contando objetos no referenciados"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Encontrando y borrando packfiles sin referencias"
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr "no se pudo empezar los pack-objetcts"
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr "no se pudo finalizar pack-objetcts"
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "no es posible crear hilo lazy_dir: %s"
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "no es posible crear hilo lazy_name: %s"
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "no es posible unir hilo lazy_name: %s"
@@ -4275,32 +5006,32 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Valor errรณneo para %s: '%s'"
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "tipo de objeto \"%s\" invรกlido"
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "objeto %s es un %s, no un %s"
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "el objeto %s tiene un id de tipo desconocido %d"
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "incapaz de analizar objeto: %s"
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr "hash no concuerda %s"
 
-#: packfile.c:648
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset antes del final del paquete (broken .idx?)"
 
@@ -4308,13 +5039,18 @@ msgstr "offset antes del final del paquete (broken .idx?)"
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
-"offset antes del comienzo del รญndice del paquete para %s (รญndice corrupto?)"
+"offset antes del comienzo del รญndice del paquete para %s (ยฟรญndice corrupto?)"
 
 #: packfile.c:1903
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
-"offset mรกs allรก del รญndice de fin de paquete para %s (รญndice truncado?)"
+"offset mรกs allรก del รญndice de fin de paquete para %s (ยฟรญndice truncado?)"
+
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "no se pudo obtener el tamaรฑo de %s"
 
 #: parse-options.c:38
 #, c-format
@@ -4331,7 +5067,7 @@ msgstr "%s es incompatible con %s"
 msgid "%s : incompatible with something else"
 msgstr "%s : incompatible con otra cosa"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s no toma valores"
@@ -4341,41 +5077,41 @@ msgstr "%s no toma valores"
 msgid "%s isn't available"
 msgstr "%s no estรก disponible"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "opciรณn ambigua: %s (puede ser --%s%s o --%s%s)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr "ยฟquisiste decir `--%s` (con dos guiones)?"
 
-#: parse-options.c:859
+#: parse-options.c:857
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opciรณn `%s' desconocida"
 
-#: parse-options.c:861
+#: parse-options.c:859
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "switch desconocido `%c'"
 
-#: parse-options.c:863
+#: parse-options.c:861
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "opciรณn desconocida en string no ascii: `%s'"
 
-#: parse-options.c:887
+#: parse-options.c:885
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:906
+#: parse-options.c:904
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
@@ -4383,21 +5119,21 @@ msgstr "uso: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:910
 #, c-format
 msgid "   or: %s"
 msgstr "   o: %s"
 
-#: parse-options.c:915
+#: parse-options.c:913
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:952
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:968
+#: parse-options.c:966
 #, c-format
 msgid "alias of --%s"
 msgstr "alias de --%s"
@@ -4422,35 +5158,35 @@ msgstr "opciรณn `%s' puede usar \"always\", \"auto\", o \"never\""
 msgid "malformed object name '%s'"
 msgstr "nombre de objeto mal formado '%s'"
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No se pudo hacer que %s fuera escribible por el grupo"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Carรกcter de escape '\\' no permitido como รบltimo carรกcter en el valor attr"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Solo una especificaciรณn 'attr' es permitida."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "especificaciรณn attr no puede estar vacรญa"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nombre de atributo %s invรกlido"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4458,50 +5194,55 @@ msgstr ""
 "la configuraciรณn global de 'literal' para patrones de ruta es incompatible "
 "con las demรกs configuraciones globales de patrones de ruta"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "parรกmetro no vรกlido para el prefijo 'magic pathspec'"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Magic pathspec invรกlido '%.*s' en '%s'"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Falta ')' al final del magic pathspec en '%s'"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Magic pathspec '%c' no implementado en '%s'"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' y 'glob' son incompatibles"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' estรก fuera del repositorio"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' estรก fuera del repositorio en '%s'"
 
-#: pathspec.c:514
+#: pathspec.c:517
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (nemotรฉcnico: '%c')"
 
-#: pathspec.c:524
+#: pathspec.c:527
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: magic pathspec no soportado por este comando: %s"
 
-#: pathspec.c:591
+#: pathspec.c:594
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "el patrรณn de ruta '%s' estรก detrรกs de un enlace simbรณlico"
 
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la lรญnea estรก mรกl citada: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "no es posible escribir flush packet"
@@ -4562,33 +5303,42 @@ msgstr "Refrescando index"
 msgid "unable to create threaded lstat: %s"
 msgstr "no es posible crear lstat hilado: %s"
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr "incapaz de analizar el formato --pretty"
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "Remoto sin URL"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "nombre remoto promisor no puede comenzar con '/': %s"
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "no se pudo comenzar `log`"
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr "no se pudo leer output de `log`"
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5020
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "no se pudo analizar commit '%s'"
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "no se puede analizar git header '%.*s'"
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr "fallรณ al generar diff"
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "no se pudo leer el log para '%s'"
@@ -4628,16 +5378,16 @@ msgstr "no es posible agregar '%s' al index"
 msgid "unable to stat '%s'"
 msgstr "incapaz de correr stat en '%s'"
 
-#: read-cache.c:1314
+#: read-cache.c:1330
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' parece ser un directorio y un archivo a la vez"
 
-#: read-cache.c:1499
+#: read-cache.c:1536
 msgid "Refresh index"
 msgstr "Refrescar index"
 
-#: read-cache.c:1613
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4646,7 +5396,7 @@ msgstr ""
 "index.version configurado, pero el valor no es vรกlido.\n"
 "Usando versiรณn %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4655,150 +5405,161 @@ msgstr ""
 "GIT_INDEX_VERSION configurado, pero el valor no es vรกlido.\n"
 "Usando versiรณn %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1717
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "mala firma 0x%08x"
 
-#: read-cache.c:1682
+#: read-cache.c:1720
 #, c-format
 msgid "bad index version %d"
 msgstr "mala versiรณn del รญndice %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1729
 msgid "bad index file sha1 signature"
 msgstr "mala firma sha1 del archivo index"
 
-#: read-cache.c:1721
+#: read-cache.c:1759
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "index usa %.4s extensiones, cosa que no entendemos"
 
-#: read-cache.c:1723
+#: read-cache.c:1761
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ignorando extensiรณn %.4s"
 
-#: read-cache.c:1760
+#: read-cache.c:1798
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "formato de index desconocido 0x%08x"
 
-#: read-cache.c:1776
+#: read-cache.c:1814
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "campo nombre malformado en el index, cerca a ruta '%s'"
 
-#: read-cache.c:1833
+#: read-cache.c:1871
 msgid "unordered stage entries in index"
 msgstr "entradas en stage desordenadas en index"
 
-#: read-cache.c:1836
+#: read-cache.c:1874
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "mรบltiples entradas extraรฑas para archivo fusionado '%s'"
 
-#: read-cache.c:1839
+#: read-cache.c:1877
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "entradas de stage desordenadas para '%s'"
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "archivo รญndice corrompido"
 
-#: read-cache.c:2087
+#: read-cache.c:2124
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "no es posible crear hilo load_cache_entries: %s"
 
-#: read-cache.c:2100
+#: read-cache.c:2137
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "no es posible unir hilo load_cache_entires: %s"
 
-#: read-cache.c:2133
+#: read-cache.c:2170
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: fallรณ al abrir el archivo index"
 
-#: read-cache.c:2137
+#: read-cache.c:2174
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: no se puede hacer stat del index abierto"
 
-#: read-cache.c:2141
+#: read-cache.c:2178
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: archivo index mรกs pequeรฑo de lo esperado"
 
-#: read-cache.c:2145
+#: read-cache.c:2182
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s: no se pudo mapear el archivo index"
 
-#: read-cache.c:2187
+#: read-cache.c:2224
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "no es posible crear hilo load_index_extensions: %s"
 
-#: read-cache.c:2214
+#: read-cache.c:2251
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "no es posible unir hilo load_index_extensions: %s"
 
-#: read-cache.c:2246
+#: read-cache.c:2283
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "no se pudo refrescar el index compartido '%s'"
 
-#: read-cache.c:2293
+#: read-cache.c:2330
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
 #, c-format
 msgid "could not close '%s'"
 msgstr "no se pudo cerrar '%s'"
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
 #, c-format
 msgid "could not stat '%s'"
 msgstr "no se pudo definir '%s'"
 
-#: read-cache.c:3105
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no es posible abrir el directorio de git: %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no es posible eliminar el vinculo: %s"
 
-#: read-cache.c:3142
+#: read-cache.c:3179
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "no se pudo arreglar bits de permisos en '%s'"
 
-#: read-cache.c:3291
+#: read-cache.c:3328
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: no se puede eliminar a stage #0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Se puede arreglar esto con 'git rebase --edit-todo' y despuรฉs ejecuta 'git "
+"rebase --continue'.\n"
+"O se puede abortar el rebase con 'git rebase --abort'.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "opciรณn %s no reconocida para la opciรณn rebase.missingCommitsCheck. Ignorando."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4840,14 +5601,14 @@ msgstr ""
 "Estas lรญneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
 "abajo.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebase %s en %s (%d comando)"
 msgstr[1] "Rebase %s en %s (%d comandos)"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -4855,15 +5616,15 @@ msgstr ""
 "\n"
 "No eliminar ninguna lรญnea. Usa 'drop' explรญcitamente para borrar un commit \n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 "\n"
-"Si remueves una lรญnea aquรญ EL COMMIT SE PERDERร.\n"
+"Si eliminas una lรญnea aquรญ EL COMMIT SE PERDERร.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4877,7 +5638,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4887,22 +5648,19 @@ msgstr ""
 "Como sea, si quieres borrar todo, el rebase serรก abortado.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Tenga en cuenta que los commits vacรญos estรกn comentados"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
 #, c-format
 msgid "could not write '%s'"
 msgstr "no se pudo escribir '%s'"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "no se pudo copiar '%s' a '%s'."
+msgid "could not write '%s'."
+msgstr "no se pudo escribir '%s'."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4911,7 +5669,7 @@ msgstr ""
 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
 "Commits botados (empezando con el mรกs nuevo):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4929,17 +5687,24 @@ msgstr ""
 "Los posibles comportamientos son: ignore,warn,error.\n"
 "\n"
 
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "no se puede leer '%s'."
+
 #: refs.c:262
 #, c-format
 msgid "%s does not point to a valid object!"
-msgstr "%s no apunta a ningรบn objeto vรกlido!"
+msgstr "ยก%s no apunta a ningรบn objeto vรกlido!"
 
 #: refs.c:667
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "ignorando referencia rota %s"
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorando referencia rota %s"
@@ -4962,16 +5727,17 @@ msgstr "ref '%s' ya existe"
 #: refs.c:825
 #, c-format
 msgid "unexpected object ID when writing '%s'"
-msgstr "ID de objecto inesperado cuando se escribรญa '%s'"
+msgstr "ID de objecto inesperado al escribir '%s'"
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "no se pudo escribir en '%s'"
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "no se pudo abrir '%s' para escritura"
@@ -4979,7 +5745,7 @@ msgstr "no se pudo abrir '%s' para escritura"
 #: refs.c:867
 #, c-format
 msgid "unexpected object ID when deleting '%s'"
-msgstr "ID de objecto inesperado cuando se borraba '%s'"
+msgstr "ID de objecto inesperado al borrar '%s'"
 
 #: refs.c:998
 #, c-format
@@ -5006,37 +5772,37 @@ msgstr "rehusando actualizar ref con mal nombre '%s'"
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref fallรณ para ref '%s': %s"
 
-#: refs.c:2012
+#: refs.c:2023
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "mรบltiples actualizaciones para ref '%s' no permitidas"
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' existe; no se puede crear '%s'"
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr "no se pudo eliminar la referencia %s"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no se pudo eliminar la referencia %s: %s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "no se pudo eliminar la referencia: %s"
@@ -5046,7 +5812,7 @@ msgstr "no se pudo eliminar la referencia: %s"
 msgid "invalid refspec '%s'"
 msgstr "refspec invรกlido: '%s'"
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr "desaparecido"
 
@@ -5065,281 +5831,281 @@ msgstr "detrรกs %d"
 msgid "ahead %d, behind %d"
 msgstr "delante %d, detrรกs %d"
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "formato esperado: %%(color:<color>)"
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconocido: %%(color:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valor entero esperado refname:lstrip=%s"
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valor entero esperado refname:rstrip=%s"
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argumento: %s no reconocido %%(%s)"
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) no toma ningรบn argumento"
 
-#: ref-filter.c:269
+#: ref-filter.c:272
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "%%(objectsize) no reconocido argumento: %s"
 
-#: ref-filter.c:277
+#: ref-filter.c:280
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) no toma argumentos"
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no toma ningรบn argumento"
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) no toma ningรบn argumento"
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "%%(trailers) desconocidos, argumento: %s"
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positivo esperado contents:lines=%s"
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argumento %s no reconocido %%(contents)"
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valor positivo esperado objectname:short=%s"
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "argumento: %s no reconocido %%(objectname)"
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "formato esperado: %%(align:<ancho>,<posiciรณn>)"
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posiciรณn desconocida: %s"
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "ancho desconocido: %s"
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argumento no reconocido para %%(align): %s"
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "se esperaba un ancho positivo con el รกtomo %%(align)"
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argumento: %s no reconocido %%(if)"
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nombre mal formado de campo: %.*s"
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nombre de campo desconocido: %.*s"
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "formato: รกtomo %%(if) usado sin un รกtomo %%(then)"
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "formato: รกtomo %%(then) usado sin รกtomo %%(if)"
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "formato: รกtomo %%(then) usado mรกs de una vez"
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "formato: รกtomo %%(then) usado despuรฉs de %%(else)"
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "formato: รกtomo %%(else) usado sin un รกtomo %%(if)"
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "formato: รกtomo %%(else) usado sin un รกtomo %%(then)"
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "formato: รกtomo %%(else) usado mรกs de una vez"
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "formato: รกtomo %%(end) usado sin รกtomo correspondiente"
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr "formato de cadena mal formado %s"
 
-#: ref-filter.c:1485
+#: ref-filter.c:1488
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr "no hay rama, rebasando %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1491
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr "(o hay rama, rebasando con HEAD desacoplado %s"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr "no hay rama, comenzando biseccรณn en  %s"
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr "sin rama"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr "falta objeto %s para %s"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer fallรณ en %s para %s"
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objeto mal formado en '%s'"
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorando referencia con nombre roto %s"
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "formato: falta รกtomo %%(end)"
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr "opciรณn `%s' es incompatible con --merged"
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr "opciรณn `%s' es incompatible con --no-merged"
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr "nombre de objeto mal formado %s"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "opciรณn '%s' debe apuntar a un commit"
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "config remote shorthand no puede comenzar con '/': %s"
 
-#: remote.c:410
+#: remote.c:414
 msgid "more than one receivepack given, using the first"
 msgstr "mรกs de un receivepack dado, usando el primero"
 
-#: remote.c:418
+#: remote.c:422
 msgid "more than one uploadpack given, using the first"
 msgstr "mรกs de un uploadpack dado, usando el primero"
 
-#: remote.c:608
+#: remote.c:612
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "No se pueden traer ambos %s y %s a %s"
 
-#: remote.c:612
+#: remote.c:616
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s por lo general hace seguimiento a %s, no a %s"
 
-#: remote.c:616
+#: remote.c:620
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s hace seguimiento tanto a %s como a %s"
 
-#: remote.c:684
+#: remote.c:688
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "llave '%s' de patrรณn no tuvo '*'"
 
-#: remote.c:694
+#: remote.c:698
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "valor '%s' del patrรณn no tiene '*'"
 
-#: remote.c:1000
+#: remote.c:1004
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "src refsoec %s: no concuerda con ninguno"
 
-#: remote.c:1005
+#: remote.c:1009
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "src refspec %s concuerda con mรกs de uno"
@@ -5348,7 +6114,7 @@ msgstr "src refspec %s concuerda con mรกs de uno"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1024
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5372,7 +6138,7 @@ msgstr ""
 "Ninguno funcionรณ asรญ que nos dimos por vencidos. Tienes que especificar el "
 "full ref."
 
-#: remote.c:1040
+#: remote.c:1044
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5383,7 +6149,7 @@ msgstr ""
 "ยฟQuisiste crear un branch nuevo mediante un push a\n"
 "'%s:refs/heads/%s'?"
 
-#: remote.c:1045
+#: remote.c:1049
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5394,7 +6160,7 @@ msgstr ""
 "Did you mean to create a new tag by pushing to\n"
 "'%s:refs/tags/%s'?"
 
-#: remote.c:1050
+#: remote.c:1054
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5405,7 +6171,7 @@ msgstr ""
 "ยฟQuisiste crear un tag nuevo mediante un push a\n"
 "'%s:refs/heads/%s'?"
 
-#: remote.c:1055
+#: remote.c:1059
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5416,115 +6182,115 @@ msgstr ""
 "ยฟQuisiste crear un tag nuevo mediante un push a\n"
 "'%s:refs/heads/%s'?"
 
-#: remote.c:1091
+#: remote.c:1095
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s no puede ser resolver a un branch"
 
-#: remote.c:1102
+#: remote.c:1106
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "no es posible borrar '%s': ref remoto no existe"
 
-#: remote.c:1114
+#: remote.c:1118
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "dst refspec %s concuerda con mรกs de uno"
 
-#: remote.c:1121
+#: remote.c:1125
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "dst ref %s recibe de mรกs de un src"
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1628 remote.c:1729
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no apunta a ninguna rama"
 
-#: remote.c:1633
+#: remote.c:1637
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no existe tal rama: '%s'"
 
-#: remote.c:1636
+#: remote.c:1640
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "no se ha configurado upstream para la rama '%s'"
 
-#: remote.c:1642
+#: remote.c:1646
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"
 
-#: remote.c:1657
+#: remote.c:1661
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
 
-#: remote.c:1669
+#: remote.c:1673
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la rama '%s' no tiene remoto para enviar"
 
-#: remote.c:1679
+#: remote.c:1683
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "refspecs del push para '%s' no incluyen '%s'"
 
-#: remote.c:1692
+#: remote.c:1696
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "push no tiene destino (push.default es 'nada')"
 
-#: remote.c:1714
+#: remote.c:1718
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "no se puede resolver push 'simple' para un destino รบnico"
 
-#: remote.c:1840
+#: remote.c:1844
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "no se puedo encontrar ref remota %s"
 
-#: remote.c:1853
+#: remote.c:1857
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Ignorando ref graciosa '%s' localmente"
 
-#: remote.c:2016
+#: remote.c:2020
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Tu rama estรก basada en '%s', pero upstream ha desaparecido.\n"
 
-#: remote.c:2020
+#: remote.c:2024
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (usa \"git branch --unset-upstream\" para arreglar)\n"
 
-#: remote.c:2023
+#: remote.c:2027
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Tu rama estรก actualizada con '%s'.\n"
 
-#: remote.c:2027
+#: remote.c:2031
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
 
-#: remote.c:2030
+#: remote.c:2034
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (usa \"%s\" para detalles)\n"
 
-#: remote.c:2034
+#: remote.c:2038
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Tu rama estรก adelantada a '%s' por %d commit.\n"
 msgstr[1] "Tu rama estรก adelantada a '%s' por %d commits.\n"
 
-#: remote.c:2040
+#: remote.c:2044
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (usa \"git push\" para publicar tus commits locales)\n"
 
-#: remote.c:2043
+#: remote.c:2047
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5534,11 +6300,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Tu rama estรก detrรกs de '%s' por %d commits, y puede ser avanzada rรกpido.\n"
 
-#: remote.c:2051
+#: remote.c:2055
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (usa \"git pull\" para actualizar tu rama local)\n"
 
-#: remote.c:2054
+#: remote.c:2058
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5553,11 +6319,11 @@ msgstr[1] ""
 "Tu rama y '%s' han divergido,\n"
 "y tienen %d y %d commits diferentes cada una respectivamente.\n"
 
-#: remote.c:2064
+#: remote.c:2068
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
 
-#: remote.c:2247
+#: remote.c:2251
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "no se puede leer el nombre de objeto '%s'"
@@ -5572,7 +6338,7 @@ msgstr "mal nombre de ref de reemplazo: %s"
 msgid "duplicate replace ref: %s"
 msgstr "duplicar ref de reemplazo: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "remplazar profundiad muy elevada para objeto %s"
@@ -5635,8 +6401,8 @@ msgstr "no se puede desvincular stray '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "Resoluciรณn precargada para '%s'"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no se pudo crear el directorio '%s'"
@@ -5670,20 +6436,20 @@ msgstr "Se olvidรณ resoluciรณn para '%s'\n"
 msgid "unable to open rr-cache directory"
 msgstr "no es posible abrir directorio rr-cache"
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr "tu rama actual parece estar rota"
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "tu rama actual '%s' no tiene ningรบn commit todavรญa"
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent es incompatible con --bisect"
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L no soporta todavรญa formatos de diff fuera de -p y -s"
 
@@ -5706,30 +6472,30 @@ msgstr ""
 "Puedes desactivar esta advertencias con `git config advice.ignoredHook "
 "false`."
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "flush packet inesperado mientras se leรญa estatus de desempaquetado remoto"
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "desempaquetado remoto fallรณ: %s"
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr "fallรณ al firmar el certificado de push"
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr "el final receptor no soporta --signed push"
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5737,47 +6503,47 @@ msgstr ""
 "no se manda un certificado de push ya que el destino no soporta push firmado "
 "(--signed )"
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr "el destino no soporta push atรณmicos (--atomic)"
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr "el destino no soporta opciones de push"
 
-#: sequencer.c:187
+#: sequencer.c:191
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mensaje de commit invรกlido, modo cleanup '%s'"
 
-#: sequencer.c:292
+#: sequencer.c:296
 #, c-format
 msgid "could not delete '%s'"
 msgstr "no se pudo borrar '%s'"
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "no se pudo eliminar'%s'"
 
-#: sequencer.c:321
+#: sequencer.c:325
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:323
+#: sequencer.c:327
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:329
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:331
 #, c-format
 msgid "unknown action: %d"
 msgstr "acciรณn desconocida: %d"
 
-#: sequencer.c:385
+#: sequencer.c:389
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5785,7 +6551,7 @@ msgstr ""
 "despuรฉs de resolver los conflictos, marca las rutas corregidas\n"
 "con 'git add <rutas>' o 'git rm <rutas>'"
 
-#: sequencer.c:388
+#: sequencer.c:392
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5795,115 +6561,110 @@ msgstr ""
 "con 'git add <rutas>' o 'git rm <rutas>'\n"
 "y haz un commit del resultado con 'git commit'"
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:405 sequencer.c:2901
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no se pudo bloquear '%s'"
 
-#: sequencer.c:408
+#: sequencer.c:412
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no se pudo escribir EOL en '%s'"
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "fallรณ al finalizar '%s'"
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
 #, c-format
 msgid "could not read '%s'"
 msgstr "no se pudo leer '%s'"
 
-#: sequencer.c:462
+#: sequencer.c:466
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "tus cambios locales serรกn sobreescritos por %s."
 
-#: sequencer.c:466
+#: sequencer.c:470
 msgid "commit your changes or stash them to proceed."
 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
 
-#: sequencer.c:498
+#: sequencer.c:502
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rรกpido"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo cleanup invรกlido %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:635
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Incapaz de escribir el nuevo archivo รญndice"
 
-#: sequencer.c:649
+#: sequencer.c:652
 msgid "unable to update cache tree"
 msgstr "no es posible actualizar el รกrbol de la cachรฉ"
 
-#: sequencer.c:663
+#: sequencer.c:666
 msgid "could not resolve HEAD commit"
 msgstr "no se pudo resolver el commit de HEAD"
 
-#: sequencer.c:743
+#: sequencer.c:746
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "no hay llave presente en '%.*s'"
 
-#: sequencer.c:754
+#: sequencer.c:757
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "no es posible dequote para '%s'"
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no se pudo abrir '%s' para lectura"
 
-#: sequencer.c:801
+#: sequencer.c:804
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
 
-#: sequencer.c:806
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
 
-#: sequencer.c:811
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
 
-#: sequencer.c:815
+#: sequencer.c:818
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable desconocida '%s'"
 
-#: sequencer.c:820
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "falta 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:822
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "falta 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:824
+#: sequencer.c:827
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "falta 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "formato de fecha invรกlido '%s' en '%s'"
-
-#: sequencer.c:901
+#: sequencer.c:876
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5933,15 +6694,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr "escribiendo commit raรญz"
-
-#: sequencer.c:1216
+#: sequencer.c:1148
 msgid "'prepare-commit-msg' hook failed"
 msgstr "hook 'prepare-commit-msg' fallรณ"
 
-#: sequencer.c:1223
+#: sequencer.c:1154
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5968,7 +6725,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: sequencer.c:1167
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5992,325 +6749,324 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1209
 msgid "couldn't look up newly created commit"
 msgstr "no se pudo revisar el commit reciรฉn creado"
 
-#: sequencer.c:1280
+#: sequencer.c:1211
 msgid "could not parse newly created commit"
 msgstr "no se pudo analizar el commit reciรฉn creado"
 
-#: sequencer.c:1326
+#: sequencer.c:1257
 msgid "unable to resolve HEAD after creating commit"
 msgstr "no se pudo resolver HEAD tras crear el commit"
 
-#: sequencer.c:1328
+#: sequencer.c:1259
 msgid "detached HEAD"
 msgstr "HEAD desacoplado"
 
-#: sequencer.c:1332
+#: sequencer.c:1263
 msgid " (root-commit)"
 msgstr " (commit-raรญz)"
 
-#: sequencer.c:1353
+#: sequencer.c:1284
 msgid "could not parse HEAD"
 msgstr "no se pudo analizar HEAD"
 
-#: sequencer.c:1355
+#: sequencer.c:1286
 #, c-format
 msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s no es un commit!"
+msgstr "ยกHEAD %s no es un commit!"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
 msgid "could not parse HEAD commit"
 msgstr "no se pudo analizar el commit de HEAD"
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1342 sequencer.c:1968
 msgid "unable to parse commit author"
 msgstr "no es posible analizar el autor del commit"
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree fallรณ al escribir el รกrbol"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1386 sequencer.c:1447
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "no se puede leer el mensaje del commit de '%s'"
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
 msgid "failed to write commit object"
 msgstr "fallรณ al escribir el objeto commit"
 
-#: sequencer.c:1526
+#: sequencer.c:1474
 #, c-format
 msgid "could not parse commit %s"
 msgstr "no se pudo analizar commit %s"
 
-#: sequencer.c:1531
+#: sequencer.c:1479
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "no se pudo analizar el commit padre %s"
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1562 sequencer.c:1673
 #, c-format
 msgid "unknown command: %d"
 msgstr "comando desconocido: %d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1620 sequencer.c:1645
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Esta es una combinaciรณn de %d commits."
 
-#: sequencer.c:1672
+#: sequencer.c:1630
 msgid "need a HEAD to fixup"
 msgstr "se necesita un HEAD para arreglar"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1632 sequencer.c:3212
 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 
-#: sequencer.c:1676
+#: sequencer.c:1634
 msgid "could not read HEAD's commit message"
 msgstr "no se pudo leer el mensaje de commit de HEAD"
 
-#: sequencer.c:1682
+#: sequencer.c:1640
 #, c-format
 msgid "cannot write '%s'"
 msgstr "no se puede escribir '%s'"
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "Este es el mensaje del 1er commit:"
 
-#: sequencer.c:1697
+#: sequencer.c:1655
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no se puede leer el mensaje del commit de %s"
 
-#: sequencer.c:1704
+#: sequencer.c:1662
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Este es el mensaje del commit #%d:"
 
-#: sequencer.c:1710
+#: sequencer.c:1668
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El mensaje del commit #%d serรก saltado:"
 
-#: sequencer.c:1798
+#: sequencer.c:1756
 msgid "your index file is unmerged."
 msgstr "tu archivo รญndice no estรก fusionado."
 
-#: sequencer.c:1805
+#: sequencer.c:1763
 msgid "cannot fixup root commit"
 msgstr "no se puede arreglar el commit raรญz"
 
-#: sequencer.c:1824
+#: sequencer.c:1782
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "el commit %s es una fusiรณn pero no se proporcionรณ la opciรณn -m."
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1790 sequencer.c:1798
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "el commit %s no tiene un padre %d"
 
-#: sequencer.c:1846
+#: sequencer.c:1804
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "no se puede obtener el mensaje de commit para %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1823
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no se puede analizar el commit padre %s"
 
-#: sequencer.c:1930
+#: sequencer.c:1888
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no se puede renombrar '%s' a '%s'"
 
-#: sequencer.c:1985
+#: sequencer.c:1943
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no se pudo revertir %s... %s"
 
-#: sequencer.c:1986
+#: sequencer.c:1944
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no se pudo aplicar %s... %s"
 
-#: sequencer.c:2045
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "botando $%s %s -- contenidos del parche ya estรกn en upstream\n"
+
+#: sequencer.c:2018
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: fallรณ al leer el รญndice"
 
-#: sequencer.c:2052
+#: sequencer.c:2025
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: fallรณ al refrescar el รญndice"
 
-#: sequencer.c:2128
+#: sequencer.c:2102
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s no acepta los argumentos: '%s'"
 
-#: sequencer.c:2137
+#: sequencer.c:2111
 #, c-format
 msgid "missing arguments for %s"
 msgstr "faltan argumentos para para %s"
 
-#: sequencer.c:2174
+#: sequencer.c:2142
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "no se puede analizar '%.*s'"
+msgid "could not parse '%s'"
+msgstr "no se puede analizar '%s'"
 
-#: sequencer.c:2228
+#: sequencer.c:2203
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "lรญnea invรกlida %d: %.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2214
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "no se puede  '%s' sin un commit previo"
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "no se puede leer '%s'."
-
-#: sequencer.c:2323
+#: sequencer.c:2298
 msgid "cancelling a cherry picking in progress"
 msgstr "cancelando cherry-pick en progreso"
 
-#: sequencer.c:2330
+#: sequencer.c:2305
 msgid "cancelling a revert in progress"
 msgstr "cancelando revert en progreso"
 
-#: sequencer.c:2364
+#: sequencer.c:2349
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
 
-#: sequencer.c:2366
+#: sequencer.c:2351
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "hoja de instrucciones inutilizable: '%s'"
 
-#: sequencer.c:2371
+#: sequencer.c:2356
 msgid "no commits parsed."
 msgstr "ningรบn commit analizado."
 
-#: sequencer.c:2382
+#: sequencer.c:2367
 msgid "cannot cherry-pick during a revert."
 msgstr "no se puede realizar cherry-pick durante un revert."
 
-#: sequencer.c:2384
+#: sequencer.c:2369
 msgid "cannot revert during a cherry-pick."
 msgstr "no se puede realizar un revert durante un cherry-pick."
 
-#: sequencer.c:2466
+#: sequencer.c:2447
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor invรกlido para %s: %s"
 
-#: sequencer.c:2553
+#: sequencer.c:2540
 msgid "unusable squash-onto"
 msgstr "squash-onto inservible"
 
-#: sequencer.c:2569
+#: sequencer.c:2556
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "hoja de opciones mal formada: '%s'"
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2644 sequencer.c:4361
 msgid "empty commit set passed"
 msgstr "conjunto de commits vacรญo entregado"
 
-#: sequencer.c:2668
+#: sequencer.c:2660
 msgid "revert is already in progress"
 msgstr "revert ya estรก en progreso"
 
-#: sequencer.c:2670
+#: sequencer.c:2662
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""
 
-#: sequencer.c:2673
+#: sequencer.c:2665
 msgid "cherry-pick is already in progress"
 msgstr "cherry-pick ya estรก en progreso"
 
-#: sequencer.c:2675
+#: sequencer.c:2667
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""
 
-#: sequencer.c:2689
+#: sequencer.c:2681
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no se pudo crear un directorio secuenciador '%s'"
 
-#: sequencer.c:2704
+#: sequencer.c:2696
 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2756 sequencer.c:4099
 msgid "no cherry-pick or revert in progress"
 msgstr "ningรบn cherry-pick o revert en progreso"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2758 sequencer.c:2769
 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2760 sequencer.c:2804
 msgid "cannot abort from a branch yet to be born"
 msgstr "no se puede abortar de una rama por nacer"
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2790 builtin/grep.c:724
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no se puede abrir '%s'"
 
-#: sequencer.c:2800
+#: sequencer.c:2792
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no se puede leer '%s': %s"
 
-#: sequencer.c:2801
+#: sequencer.c:2793
 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 
-#: sequencer.c:2807
+#: sequencer.c:2799
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "archivo HEAD de pre-cherry-pick guardadoย '%s' estรก corrupto"
 
-#: sequencer.c:2818
+#: sequencer.c:2810
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revisa tu HEAD!"
+msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ยกrevisa tu HEAD!"
 
-#: sequencer.c:2859
+#: sequencer.c:2851
 msgid "no revert in progress"
 msgstr "no hay revert en progreso"
 
-#: sequencer.c:2867
+#: sequencer.c:2859
 msgid "no cherry-pick in progress"
 msgstr "ningรบn cherry-pick en progreso"
 
-#: sequencer.c:2877
+#: sequencer.c:2869
 msgid "failed to skip the commit"
 msgstr "fallรณ al escribir el commit"
 
-#: sequencer.c:2884
+#: sequencer.c:2876
 msgid "there is nothing to skip"
 msgstr "no hay nada que saltar"
 
-#: sequencer.c:2887
+#: sequencer.c:2879
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6319,21 +7075,21 @@ msgstr ""
 "ยฟya has hecho el commit?\n"
 "intenta \"git %s --continue\""
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3003 sequencer.c:4011
 #, c-format
 msgid "could not update %s"
 msgstr "no se puede actualizar %s"
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3042 sequencer.c:3991
 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 
-#: sequencer.c:3066
+#: sequencer.c:3059
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 
-#: sequencer.c:3074
+#: sequencer.c:3067
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6352,27 +7108,22 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3077
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "No se pudo aplicar %s... %.*s"
 
-#: sequencer.c:3091
+#: sequencer.c:3084
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "No se pudo fusionar %.*s"
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "no se pudo leer รญndice"
-
-#: sequencer.c:3136
+#: sequencer.c:3129
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6387,11 +7138,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3135
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "y se hicieron cambios al รญndice y/o รกrbol de trabajo\n"
 
-#: sequencer.c:3148
+#: sequencer.c:3141
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6408,76 +7159,72 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3202
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nombre de label ilegal: '%.*s'"
 
-#: sequencer.c:3263
+#: sequencer.c:3256
 msgid "writing fake root commit"
 msgstr "escribiendo commit raรญz falso"
 
-#: sequencer.c:3268
+#: sequencer.c:3261
 msgid "writing squash-onto"
 msgstr "escribiendo squash-onto"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "fallรณ al encontrar รกrbol de %s"
 
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "no se pudo escribir รญndice"
-
-#: sequencer.c:3351
+#: sequencer.c:3344
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "no se pudo resolver '%s'"
 
-#: sequencer.c:3379
+#: sequencer.c:3375
 msgid "cannot merge without a current revision"
 msgstr "no se puede fusionar sin una versiรณn actual"
 
-#: sequencer.c:3401
+#: sequencer.c:3397
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "no se puede analizar '%.*s'"
 
-#: sequencer.c:3410
+#: sequencer.c:3406
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "nada para fusionar: '%.*s'"
 
-#: sequencer.c:3422
+#: sequencer.c:3418
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "fusiรณn octopus no puede ser ejecutada en la punta de un [nuevo root]"
 
-#: sequencer.c:3437
+#: sequencer.c:3434
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "no se puede leer el mensaje del commit '%s'"
 
-#: sequencer.c:3590
+#: sequencer.c:3594
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "no se pudo intentar fusionar '%.*s'"
 
-#: sequencer.c:3606
+#: sequencer.c:3610
 msgid "merge: Unable to write new index file"
 msgstr "fusiรณn: No se puede escribir el nuevo archivo รญndice"
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3679 builtin/rebase.c:737
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 
-#: sequencer.c:3687
+#: sequencer.c:3691
 #, c-format
 msgid "cannot store %s"
 msgstr "no se puede guardar %s"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6489,31 +7236,26 @@ msgstr ""
 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
 "momento.\n"
 
-#: sequencer.c:3751
-#, c-format
-msgid "could not checkout %s"
-msgstr "no se puede hacer checkout a %s"
-
-#: sequencer.c:3765
+#: sequencer.c:3755
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s no es OID vรกlido"
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "no se puede desacoplar HEAD"
 
-#: sequencer.c:3785
+#: sequencer.c:3775
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Detenido en HEAD\n"
 
-#: sequencer.c:3787
+#: sequencer.c:3777
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Detenido en %s\n"
 
-#: sequencer.c:3795
+#: sequencer.c:3785
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6534,48 +7276,48 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3877
+#: sequencer.c:3869
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Detenido en %s...  %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:3940
 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 
-#: sequencer.c:4003
+#: sequencer.c:3999
 msgid "could not read orig-head"
 msgstr "no se puede leer orig-head"
 
-#: sequencer.c:4008
+#: sequencer.c:4004
 msgid "could not read 'onto'"
 msgstr "no se puede leer 'onto'"
 
-#: sequencer.c:4022
+#: sequencer.c:4018
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no se puede actualizar HEAD a %s"
 
-#: sequencer.c:4115
+#: sequencer.c:4111
 msgid "cannot rebase: You have unstaged changes."
 msgstr "no se puede realizar rebase: Tienes cambios fuera del รกrea de stage."
 
-#: sequencer.c:4124
+#: sequencer.c:4120
 msgid "cannot amend non-existing commit"
 msgstr "no se puede arreglar un commit no existente"
 
-#: sequencer.c:4126
+#: sequencer.c:4122
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo invรกlido: '%s'"
 
-#: sequencer.c:4128
+#: sequencer.c:4124
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido invรกlido: '%s'"
 
-#: sequencer.c:4131
+#: sequencer.c:4127
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6586,69 +7328,59 @@ msgstr ""
 "un commit con estos\n"
 "primero y luego ejecuta 'git rebase --continue' de nuevo."
 
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4163 sequencer.c:4202
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "no se pudo escribir el archivo: '%s'"
 
-#: sequencer.c:4220
+#: sequencer.c:4217
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "no se puede eliminar CHERRY_PICK_HEAD"
 
-#: sequencer.c:4227
+#: sequencer.c:4224
 msgid "could not commit staged changes."
 msgstr "no se pudo realizar el commit con los cambios en el รกrea de stage."
 
-#: sequencer.c:4328
+#: sequencer.c:4338
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no se puede aplicar cherry-pick a un %s"
 
-#: sequencer.c:4332
+#: sequencer.c:4342
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisiรณn errรณnea"
 
-#: sequencer.c:4367
+#: sequencer.c:4377
 msgid "can't revert as initial commit"
 msgstr "no se puede revertir como commit inicial"
 
-#: sequencer.c:4810
+#: sequencer.c:4846
 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 
-#: sequencer.c:4813
+#: sequencer.c:4849
 msgid "make_script: error preparing revisions"
 msgstr "make_script: error preparando revisiones"
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Se puede arreglar esto con 'git rebase --edit-todo' y despuรฉs ejecuta 'git "
-"rebase --continue'.\n"
-"O se puede abortar el rebase con 'git rebase --abort'.\n"
-
 #: sequencer.c:5083 sequencer.c:5100
 msgid "nothing to do"
 msgstr "nada que hacer"
 
-#: sequencer.c:5114
+#: sequencer.c:5119
 msgid "could not skip unnecessary pick commands"
 msgstr "no se pudo saltar los comandos pick innecesarios"
 
-#: sequencer.c:5197
+#: sequencer.c:5213
 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' estรก fuera del repositorio"
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' estรก fuera del repositorio en '%s'"
 
-#: setup.c:173
+#: setup.c:175
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6658,7 +7390,7 @@ msgstr ""
 "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
 "localmente."
 
-#: setup.c:186
+#: setup.c:188
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6670,12 +7402,12 @@ msgstr ""
 "Use '--' para separar las rutas de las revisiones, de esta manera:\n"
 "'git <comando> [<revisiรณn>...] -- [<archivo>...]'"
 
-#: setup.c:235
+#: setup.c:254
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "opciรณn '%s' debe venir antes de argumentos no opcionales"
 
-#: setup.c:254
+#: setup.c:273
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6686,95 +7418,95 @@ msgstr ""
 "Use '--' para separar rutas de revisiones, de esta manera:\n"
 "'git <comando> [<revisiรณn>...] -- [<archivo>...]'"
 
-#: setup.c:390
+#: setup.c:409
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "no es posible configurar el directorio de trabajo usando una configuraciรณn "
 "invรกlida"
 
-#: setup.c:394
+#: setup.c:413
 msgid "this operation must be run in a work tree"
 msgstr "esta operaciรณn debe ser realizada en un รกrbol de trabajo"
 
-#: setup.c:540
+#: setup.c:559
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Se esperaba versiรณn de git repo  <= %d, encontrada %d"
 
-#: setup.c:548
+#: setup.c:567
 msgid "unknown repository extensions found:"
 msgstr "se encontrรณ extensiรณn de repositorio desconocida:"
 
-#: setup.c:567
+#: setup.c:586
 #, c-format
 msgid "error opening '%s'"
 msgstr "error abriendo '%s'"
 
-#: setup.c:569
+#: setup.c:588
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "muy grande para ser un archivo .git: '%s'"
 
-#: setup.c:571
+#: setup.c:590
 #, c-format
 msgid "error reading %s"
 msgstr "error leyendo %s"
 
-#: setup.c:573
+#: setup.c:592
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "formato gitfile invรกlido: %s"
 
-#: setup.c:575
+#: setup.c:594
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "no hay ruta en gitfile: %s"
 
-#: setup.c:577
+#: setup.c:596
 #, c-format
 msgid "not a git repository: %s"
 msgstr "no es un repositorio git: %s"
 
-#: setup.c:676
+#: setup.c:695
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' muy grande"
 
-#: setup.c:690
+#: setup.c:709
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "no es un repositorio git: '%s'"
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:738 setup.c:740 setup.c:771
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "no se puede aplicar chdir a '%s'"
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
 msgid "cannot come back to cwd"
 msgstr "no se puede volver a cwd"
 
-#: setup.c:851
+#: setup.c:870
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "fallรณ al determinar '%*s%s%s'"
 
-#: setup.c:1083
+#: setup.c:1108
 msgid "Unable to read current working directory"
 msgstr "Incapaz de leer el directorio de trabajo actual"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1117 setup.c:1123
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no se puede cambiar a '%s'"
 
-#: setup.c:1103
+#: setup.c:1128
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 "no es un repositorio git (ni ninguno de los directorios superiores): %s"
 
-#: setup.c:1109
+#: setup.c:1134
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6784,7 +7516,7 @@ msgstr ""
 "Parando en el lรญmite del sistema de archivos "
 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
 
-#: setup.c:1220
+#: setup.c:1245
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6793,286 +7525,286 @@ msgstr ""
 "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
 "El dueรฑo de los archivos tiene que tener permisos de lectura y escritura."
 
-#: setup.c:1264
+#: setup.c:1289
 msgid "open /dev/null or dup failed"
 msgstr "fallรณ al abrir /dev/null o dup"
 
-#: setup.c:1279
+#: setup.c:1304
 msgid "fork failed"
 msgstr "fallรณ fork"
 
-#: setup.c:1284
+#: setup.c:1309
 msgid "setsid failed"
 msgstr "fallรณ setsid"
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates"
 
-#: sha1-file.c:504
+#: sha1-file.c:503
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo"
 
-#: sha1-file.c:583
+#: sha1-file.c:582
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "incapaz de normalizar directorio de objeto: %s"
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 msgid "unable to fdopen alternates lockfile"
 msgstr "no es posible hacer fdopen en lockfile alternos"
 
-#: sha1-file.c:644
+#: sha1-file.c:643
 msgid "unable to read alternates file"
 msgstr "no es posible leer archivos alternos"
 
-#: sha1-file.c:651
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
 msgstr "no es posible mover archivos alternos en el lugar"
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ruta '%s' no existe"
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "repositorio de referencia '%s' como un checkout vinculado no es soportado "
 "todavรญa."
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "repositorio de referencia '%s' no es un repositorio local."
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "repositorio de referencia '%s' es superficial (shallow)"
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "repositorio de referencia '% s' estรก injertado"
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "lรญnea invรกlida mientras se analizaban refs alternas: %s"
 
-#: sha1-file.c:944
+#: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "intentando usar mmap %<PRIuMAX> sobre lรญmite %<PRIuMAX>"
 
-#: sha1-file.c:969
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr "mmap fallรณ"
 
-#: sha1-file.c:1133
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr "archivo de objeto %s estรก vacรญo"
 
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1263 sha1-file.c:2443
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "objeto perdido corrupto '%s'"
 
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1265 sha1-file.c:2447
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "basura al final del objeto perdido '%s'"
 
-#: sha1-file.c:1301
+#: sha1-file.c:1307
 msgid "invalid object type"
 msgstr "tipo de objeto invรกlido"
 
-#: sha1-file.c:1385
+#: sha1-file.c:1391
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "no es posible desempacar header %s con --allow-unknown-type"
 
-#: sha1-file.c:1388
+#: sha1-file.c:1394
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "incapaz de desempaquetar header %s"
 
-#: sha1-file.c:1394
+#: sha1-file.c:1400
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "no es posible analizar header %s con --allow-unknown-type"
 
-#: sha1-file.c:1397
+#: sha1-file.c:1403
 #, c-format
 msgid "unable to parse %s header"
 msgstr "incapaz de analizar header %s"
 
-#: sha1-file.c:1588
+#: sha1-file.c:1629
 #, c-format
 msgid "failed to read object %s"
 msgstr "fallรณ al leer objeto %s"
 
-#: sha1-file.c:1592
+#: sha1-file.c:1633
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "reemplazo %s no encontrado para %s"
 
-#: sha1-file.c:1596
+#: sha1-file.c:1637
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "objeto perdido %s (guardado en %s) estรก corrompido"
 
-#: sha1-file.c:1600
+#: sha1-file.c:1641
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "paquete de objeto %s (guardado en %s) estรก corrompido"
 
-#: sha1-file.c:1703
+#: sha1-file.c:1746
 #, c-format
 msgid "unable to write file %s"
 msgstr "no es posible escribir archivo %s"
 
-#: sha1-file.c:1710
+#: sha1-file.c:1753
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "no se pudo poner permisos a '%s'"
 
-#: sha1-file.c:1717
+#: sha1-file.c:1760
 msgid "file write error"
 msgstr "fallรณ de escritura"
 
-#: sha1-file.c:1736
+#: sha1-file.c:1780
 msgid "error when closing loose object file"
 msgstr "error cerrando el archivo de objeto suelto"
 
-#: sha1-file.c:1801
+#: sha1-file.c:1845
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "permisos insuficientes para agregar un objeto a la base de datos del "
 "repositorio %s"
 
-#: sha1-file.c:1803
+#: sha1-file.c:1847
 msgid "unable to create temporary file"
 msgstr "no es posible crear un archivo temporal"
 
-#: sha1-file.c:1827
+#: sha1-file.c:1871
 msgid "unable to write loose object file"
 msgstr "no es posible escribir el archivo de objeto suelto"
 
-#: sha1-file.c:1833
+#: sha1-file.c:1877
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "no es posible desinflar el objeto nuevo %s (%d)"
 
-#: sha1-file.c:1837
+#: sha1-file.c:1881
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd en objeto %s fallรณ (%d)"
 
-#: sha1-file.c:1841
+#: sha1-file.c:1885
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "confundido por fuente de data de objetos inestable para %s"
 
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
 #, c-format
 msgid "failed utime() on %s"
 msgstr "fallรณ utime() en %s"
 
-#: sha1-file.c:1926
+#: sha1-file.c:1972
 #, c-format
 msgid "cannot read object for %s"
 msgstr "no se pudo leer el objeto para %s"
 
-#: sha1-file.c:1966
+#: sha1-file.c:2011
 msgid "corrupt commit"
 msgstr "commit corrupto"
 
-#: sha1-file.c:1974
+#: sha1-file.c:2019
 msgid "corrupt tag"
 msgstr "tag corrupto"
 
-#: sha1-file.c:2073
+#: sha1-file.c:2119
 #, c-format
 msgid "read error while indexing %s"
 msgstr "error leyendo al indexar %s"
 
-#: sha1-file.c:2076
+#: sha1-file.c:2122
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lectura corta al indexar %s"
 
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2195 sha1-file.c:2205
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: fallรณ al insertar en la base de datos"
 
-#: sha1-file.c:2164
+#: sha1-file.c:2211
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: tipo de archivo no soportado"
 
-#: sha1-file.c:2188
+#: sha1-file.c:2235
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s no es objeto vรกlido"
 
-#: sha1-file.c:2190
+#: sha1-file.c:2237
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s no es un objeto '%s' vรกlido"
 
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "no es posible abrir %s"
 
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2454 sha1-file.c:2507
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "hash no concuerda para %s (se esperaba %s)"
 
-#: sha1-file.c:2431
+#: sha1-file.c:2478
 #, c-format
 msgid "unable to mmap %s"
 msgstr "no es posible hacer mmap a %s"
 
-#: sha1-file.c:2436
+#: sha1-file.c:2483
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "incapaz de desempaquetar header de %s"
 
-#: sha1-file.c:2442
+#: sha1-file.c:2489
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "incapaz de analizar header de %s"
 
-#: sha1-file.c:2453
+#: sha1-file.c:2500
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "no es posible desempaquetar contenidos de %s"
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "SHA1 %s corto es ambiguo"
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "Los candidatos son:"
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7095,44 +7827,111 @@ msgstr ""
 "examina estas refs y tal vez bรณrralas. Silencia este mensaje \n"
 "ejecutando \"git config advice.objectNameWarning false\""
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "log para '%.*s' solo va hasta %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "log para '%.*s' solo tiene %d entradas"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "la ruta '%s' existe en disco, pero no en '%.*s'"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"ruta '%s' existe, pero no '%s'\n"
+"ayuda: ยฟQuisiste decir '%.*s:%s' o '%.*s:./%s'?"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "ruta '%s' no existe en '%.*s'"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"ruta '%s' estรก en el index, pero no en stage %d\n"
+"ayuda:ยฟQuisiste decir: '%d:%s'?"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"ruta '%s' estรก en el index, pero no '%s'\n"
+"ayuda:ยฟQuisiste decir ':%d:%s' o ':%d:./%s'?"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "ruta '%s' existe en el disco, pero no en el index"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "ruta '%s' no existe (ni en disco ni en el index)"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nombre de objeto no vรกlido: '%.*s'."
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:837
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:839
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:847
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:849
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:856
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:864
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7140,13 +7939,18 @@ msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:866
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u bytes/s"
 msgstr[1] "%u bytes/s"
 
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "no se pudo editar '%s'"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7176,51 +7980,127 @@ msgstr "en el submรณdulo no poblado '%s'"
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "El patrรณn de ruta '%s' estรก en el submรณdulo '%.*s'"
 
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "mal argumento --ignore-submodules: %s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Submรณdulo en el commit %s en ruta: '%s' colisiona con un submรณdulo llamado "
+"igual. Saltandolo."
+
 #: submodule.c:910
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "entrada de submรณdulo '%s' (%s) es un %s, no un commit"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"no se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en "
+"el submรณdulo %s"
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "proceso para submรณdulo '%s' fallรณ"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Fallรณ al resolver HEAD como un ref vรกlido."
 
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Empujando submรณdulo '%s'\n"
+
+#: submodule.c:1161
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "no pudo acceder al submรณdulo '%s'"
+msgid "Unable to push submodule '%s'\n"
+msgstr "No es posible hacer push al submรณdulo '%s'\n"
 
-#: submodule.c:1651
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Haciendo fetch al submรณdulo %s%s\n"
+
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "No pudo acceder al submรณdulo '%s'\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Errores durante el fetch del submรณdulo:\n"
+"%s"
+
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' no reconocido como un repositorio git"
 
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "No se pudo ejecutar 'git status --procelain=2' en el submรณdulo %s"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --procelain=2' fallรณ en el submรณdulo %s"
+
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "no se pudo comenzar 'git status' en el submรณdulo '%s'"
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "no se pudo ejecutar 'git status' en el submรณdulo '%s'"
 
-#: submodule.c:1817
+#: submodule.c:1828
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "No se pudo quitar configuraciรณn core.worktree en submรณdulo '%s'"
 
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "no pudo recursar en el submรณdulo '%s'"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "no se pudo reiniciar el index del submรณdulo"
+
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "submรณdulo '%s' tiene un รญndice corrupto"
 
-#: submodule.c:1959
+#: submodule.c:1970
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Submรณdulo '%s' no pudo ser actualizado."
 
-#: submodule.c:2007
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "submรณdulo git dir '%s' esta dentro de git dir '%.*s'"
+
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7228,12 +8108,17 @@ msgstr ""
 "relocate_gitdir para el submรณdulo '%s' con mรกs de un รกrbol de trabajo no "
 "soportado"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no se pudo resolver el nombre para el submรณdulo '%s'"
 
-#: submodule.c:2026
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "rechazando mover '%s' dentro de un directorio git existente"
+
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7244,42 +8129,37 @@ msgstr ""
 "'%s' hacia\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "no pudo recursar en el submรณdulo '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2209
 msgid "could not start ls-files in .."
 msgstr "no se pudo comenzar ls-files en .."
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree devolviรณ un cรณdigo %d inesperado"
 
-#: submodule-config.c:232
+#: submodule-config.c:236
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "ignorando submรณdulo sospechoso: %s"
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "no se permiten valores negativos para submodule.fetchjobs"
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 "ignorando '%s' ya que puede ser interpretado como una opciรณn de lรญnea de "
 "comando: %s"
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr "valor invรกlido para %s"
 
-#: submodule-config.c:755
+#: submodule-config.c:765
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "No se pudo actualizar la entrada %s de .gitmodules"
@@ -7295,7 +8175,7 @@ msgstr "ejecuciรณn del comando de remolque '%s' fallรณ"
 msgid "unknown value '%s' for key '%s'"
 msgstr "valor '%s' desconocido para la clave '%s'"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "mรกs de un %s"
@@ -7314,7 +8194,7 @@ msgstr "no se pudo leer el archivo de entrada '%s'"
 msgid "could not read from stdin"
 msgstr "no se pudo leer desde stdin"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr "no se pudo definir %s"
@@ -7343,47 +8223,47 @@ msgstr "no se pudo renombrar el archivo temporal a %s"
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Configurarรก upstream de '%s' a '%s' de '%s'\n"
 
-#: transport.c:142
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr "no se pudo leer el conjunto '%s'"
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opciรณn invรกlida '%s'"
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "ver protocol.version en 'git help config' para mรกs informaciรณn"
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr "opciones del servidor requieren protocolo versiรณn 2 o posterior"
 
-#: transport.c:625
+#: transport.c:632
 msgid "could not parse transport.color.* config"
 msgstr "no se pudo analizar valor de configuraciรณn transport.color.*"
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr "soporte para protocolo v2 no implementado todavรญa"
 
-#: transport.c:825
+#: transport.c:831
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "valor desconocido para configuraciรณn '%s': %s"
 
-#: transport.c:891
+#: transport.c:897
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "transporte '%s' no permitido"
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync ya no es soportado"
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -7392,7 +8272,7 @@ msgstr ""
 "La siguiente ruta de submรณdulo contiene cambios que no\n"
 "pueden ser encontrados en ningรบn remoto:\n"
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -7419,32 +8299,32 @@ msgstr ""
 "para hacer un push al remoto.\n"
 "\n"
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr "Abortando."
 
-#: transport.c:1193
+#: transport.c:1201
 msgid "failed to push all needed submodules"
 msgstr "fallรณ al hacer push a todos los submรณdulos necesarios"
 
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:657
 msgid "operation not supported by protocol"
 msgstr "operaciรณn no soportada por protocolo"
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 msgid "full write to remote helper failed"
 msgstr "escritura total al helper remoto fallรณ"
 
-#: transport-helper.c:134
+#: transport-helper.c:144
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "no es posible encontrar helper remoto para '%s'"
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:571
 msgid "can't dup helper output fd"
 msgstr "no se puede duplicar output de fd del helper"
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7453,99 +8333,104 @@ msgstr ""
 "capacidad mandatoria desconocida %s; este helper remoto probablemente "
 "necesita una nueva versiรณn de Git"
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr "este helper remoto deberรญa implementar capacidad refspec"
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:425
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s dijo inesperadamente: '%s'"
 
-#: transport-helper.c:403
+#: transport-helper.c:414
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s tambiรฉn bloqueรณ %s"
 
-#: transport-helper.c:481
+#: transport-helper.c:493
 msgid "couldn't run fast-import"
 msgstr "no se pudo ejecutar fast-import"
 
-#: transport-helper.c:504
+#: transport-helper.c:516
 msgid "error while running fast-import"
 msgstr "error al ejecutar fast-import"
 
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:545 transport-helper.c:1134
 #, c-format
 msgid "could not read ref %s"
 msgstr "no se pudo leer la referencia %s"
 
-#: transport-helper.c:578
+#: transport-helper.c:590
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "respuesta para conectar desconocida: %s"
 
-#: transport-helper.c:600
+#: transport-helper.c:612
 msgid "setting remote service path not supported by protocol"
 msgstr "configurando servicio de ruta remota no soportado por el protocolo"
 
-#: transport-helper.c:602
+#: transport-helper.c:614
 msgid "invalid remote service path"
 msgstr "ruta de servicio remoto invรกlida"
 
-#: transport-helper.c:648
+#: transport-helper.c:660
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "no se puede conectar al subservicio %s"
 
-#: transport-helper.c:720
+#: transport-helper.c:736
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "se esperaba ok/error, helper dijo '%s'"
 
-#: transport-helper.c:773
+#: transport-helper.c:789
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "helper reportรณ estado inesperado de %s"
 
-#: transport-helper.c:834
+#: transport-helper.c:850
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "helper %s no soporta dry-run"
 
-#: transport-helper.c:837
+#: transport-helper.c:853
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "helper %s no soporta --signed"
 
-#: transport-helper.c:840
+#: transport-helper.c:856
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "helper %s no soporta --signed=if-asked"
 
-#: transport-helper.c:847
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "helper %s no soporta --atomic"
+
+#: transport-helper.c:867
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "helper %s no soporta 'push-option'"
 
-#: transport-helper.c:945
+#: transport-helper.c:965
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-helper no soporta push; se necesita refspec"
 
-#: transport-helper.c:950
+#: transport-helper.c:970
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "helper %s no soporta 'force'"
 
-#: transport-helper.c:997
+#: transport-helper.c:1017
 msgid "couldn't run fast-export"
 msgstr "no se pudo ejecutar fast-export"
 
-#: transport-helper.c:1002
+#: transport-helper.c:1022
 msgid "error while running fast-export"
 msgstr "error al ejecutar fast-export"
 
-#: transport-helper.c:1027
+#: transport-helper.c:1047
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -7554,67 +8439,67 @@ msgstr ""
 "No hay refs comunes y ninguno especificado; no se hace nada.\n"
 "Tal vez deberรญas especificar un branch como 'master'.\n"
 
-#: transport-helper.c:1091
+#: transport-helper.c:1120
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "respuesta malformada en lista de refs: %s"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1272
 #, c-format
 msgid "read(%s) failed"
 msgstr "leer(%s) fallรณ"
 
-#: transport-helper.c:1271
+#: transport-helper.c:1299
 #, c-format
 msgid "write(%s) failed"
 msgstr "escribir(%s) fallรณ"
 
-#: transport-helper.c:1320
+#: transport-helper.c:1348
 #, c-format
 msgid "%s thread failed"
 msgstr "hilo %s fallรณ"
 
-#: transport-helper.c:1324
+#: transport-helper.c:1352
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "hilo %s fallรณ al unirse: %s"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1371 transport-helper.c:1375
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "no se puede iniciar el hilo para copiar data: %s"
 
-#: transport-helper.c:1384
+#: transport-helper.c:1412
 #, c-format
 msgid "%s process failed to wait"
 msgstr "proceso %s fallรณ al esperar"
 
-#: transport-helper.c:1388
+#: transport-helper.c:1416
 #, c-format
 msgid "%s process failed"
 msgstr "proceso %s fallรณ"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1434 transport-helper.c:1443
 msgid "can't start thread for copying data"
 msgstr "no se puede iniciar hilo para copiar data"
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "objeto de รกrbol muy corto"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "modo mal formado en la entrada de รกrbol"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "nombre de archivo vacรญo en la entrada de รกrbol"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "archivo de รกrbol muy corto"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7625,7 +8510,7 @@ msgstr ""
 "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
 "ramas."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7635,7 +8520,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7645,7 +8530,7 @@ msgstr ""
 "fusionar:\n"
 "%%sPor favor, confirma tus cambios o aguรกrdalos antes de fusionar."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7655,7 +8540,7 @@ msgstr ""
 "merge:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7664,7 +8549,7 @@ msgstr ""
 "Los cambios locales de los siguientes archivos serรกn sobrescritos al %s:\n"
 "%%sPor favor, confirma tus cambios o guรกrdalos antes de %s."
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7673,7 +8558,7 @@ msgstr ""
 "Los cambios locales de los siguientes archivos serรกn sobreescritos por %s:\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7683,7 +8568,7 @@ msgstr ""
 "seguimiento en ellos:\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7693,7 +8578,7 @@ msgstr ""
 "eliminados al actualizar el รกrbol de trabajo:\n"
 "%%sPor favor, muรฉvelos o elimรญnalos antes de intercambiar ramas."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7703,7 +8588,7 @@ msgstr ""
 "eliminadosal actualizar el รกrbol de trabajo:\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7713,7 +8598,7 @@ msgstr ""
 "eliminados al fusionar:\n"
 "%%sPor favor, muรฉvelos o elimรญnalos antes de fusionar."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7723,7 +8608,7 @@ msgstr ""
 "eliminadosal fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7733,7 +8618,7 @@ msgstr ""
 "eliminados al %s:\n"
 "%%sPor favor, muรฉvelos o elimรญnalos antes de %s."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7743,7 +8628,7 @@ msgstr ""
 "eliminados al ejecutar %s:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7754,7 +8639,7 @@ msgstr ""
 "sobrescritos al actualizar el รกrbol de trabajo:\n"
 "%%sPor favor, muรฉvelos o elimรญnalos antes de intercambiar ramas."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7765,7 +8650,7 @@ msgstr ""
 "sobrescritos al actualizar el รกrbol de trabajo:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7775,7 +8660,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%sPor favor, muรฉvelos o elimรญnalos antes de fusionar."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7785,7 +8670,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7795,7 +8680,7 @@ msgstr ""
 "sobrescritos al %s:\n"
 "%%sPor favor, muรฉvelos o elimรญnalos antes de %s."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7805,12 +8690,12 @@ msgstr ""
 "eliminadospor %s:\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Entrada '%s' se superpone con '%s'.  No se pueden unir."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -7820,7 +8705,7 @@ msgstr ""
 "actualizadas:\n"
 "%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -7831,7 +8716,7 @@ msgstr ""
 "actualizaciรณn sparse checkout:\n"
 "%s"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -7842,7 +8727,7 @@ msgstr ""
 "actualizaciรณn sparse checkout:\n"
 "%s"
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -7851,16 +8736,16 @@ msgstr ""
 "No se puede actualizar le submรณdulo:\n"
 "%s"
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr "Abortando\n"
 
-#: unpack-trees.c:318
+#: unpack-trees.c:317
 msgid "Updating files"
 msgstr "Actualizando archivos"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -7870,6 +8755,10 @@ msgstr ""
 "en un filesystem case-insensitive) y solo una del grupo\n"
 "colisionando estรก en el รกrbol de trabajo:\n"
 
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "Actualizando flags del index"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "nombre de URL invรกlido oย sufijo '://' faltante"
@@ -7899,50 +8788,54 @@ msgstr "numero de puertoย invรกlido"
 msgid "invalid '..' path segment"
 msgstr "segmento de ruta '..' invรกlido"
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Haciendo fetch a objetos"
+
+#: worktree.c:259 builtin/am.c:2099
 #, c-format
 msgid "failed to read '%s'"
 msgstr "fallรณ al leer '%s'"
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 "'%s' en el รกrbol de trabajo principal no es el directorio del repositorio"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "archivo '%s' no contiene una ruta absoluta a la ubicaciรณn del รกrbol de "
 "trabajo"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' no existe"
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' no es un archivo .git, cรณdigo de error %d"
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' no apunta de vuelta a '%s'"
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "no se pudo abrir '%s' para lectura y escritura"
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr "no es posible acceder '%s'"
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr "no es posible obtener el directorio de trabajo actual"
 
@@ -8287,81 +9180,89 @@ msgstr ""
 "  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
 
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (usa \"git cherry-pick --skip\" para saltar este parche)"
+
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (use \"git cherry-pick --abort\" para cancelar la operaciรณn cherry-pick)"
 
-#: wt-status.c:1447
+#: wt-status.c:1449
 msgid "Revert currently in progress."
 msgstr "Revierte el estado en progreso actual."
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Estรกs revirtiendo el commit %s."
 
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
 
-#: wt-status.c:1459
+#: wt-status.c:1461
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (ejecuta \"git revert --continue\" para continuar)"
 
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
 
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (usa \"git revert --skip\" para omitir este parche)"
+
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (usa \"git revert --abort\" para cancelar la operaciรณn de revertir)"
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Estรกs aplicando un bisect, comenzando en la rama '%s'."
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr "Estรกs aplicando un bisect."
 
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (usa \"git bisect reset\" para volver a la rama original)"
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr "En la rama "
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr "rebase interactivo en progreso; en "
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr "rebase en progreso; en "
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr "Actualmente no estรกs en ninguna rama."
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr "Confirmaciรณn inicial"
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
 msgstr "No hay commits todavรญa"
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr "Archivos sin seguimiento"
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr "Archivos ignorados"
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8372,31 +9273,31 @@ msgstr ""
 "puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
 "nuevos archivos tรบ mismo (vea 'git help status')."
 
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Archivos no rastreados no son mostrados %s"
 
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr " (usa la opciรณn -u para mostrar los archivos sin seguimiento)"
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr "Sin cambios"
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no se agregaron cambios al commit\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8405,192 +9306,202 @@ msgstr ""
 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
 "(usa \"git add\" para hacerles seguimiento)\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
 "presentes\n"
 
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
 "hacerles seguimiento)\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nada para hacer commit\n"
 
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nada para hacer commit, el รกrbol de trabajo estรก limpio\n"
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr "No hay commits todavรญa en "
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr "HEAD (sin rama)"
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr "diferente"
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr "detrรกs "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no se puede %s: Tienes cambios sin marcar."
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr "adicionalmente, tu รญndice contiene cambios que no estรกn en un commit."
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "no se puede %s: Tu รญndice contiene cambios que no estรกn en un commit."
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "fallรณ al desvincular '%s'"
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opciรณn>] [--] <especificaciรณn-de-ruta>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
 msgid "updating files failed"
 msgstr "fallรณ la actualizaciรณn de carpetas"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "eliminar '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Cambios fuera del รกrea de stage tras refrescar el รญndice:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:266 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr "No se pudo leer el รญndice"
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "No se pudo abrir '%s' para escritura."
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr "No se puede escribir el parche"
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr "fallรณ la ediciรณn del parche"
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No se pudo definir '%s'"
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr "Parche vacรญo. Abortado."
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No se pudo aplicar '%s'"
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "dry run ( ejecuciรณn en seco)"
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr "selecciรณn interactiva"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr "elegir hunks de forma interactiva"
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr "editar diff actual y aplicar"
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr "permitir agregar caso contrario ignorar archivos"
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr "actualizado las carpetas rastreadas"
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr "grabar solo el hecho de que la ruta serรก agregada despuรฉs"
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "ignorar rutas removidas en el รกrbol de trabajo (lo mismo que --no-all)"
+msgstr ""
+"ignorar rutas eliminadas en el รกrbol de trabajo (lo mismo que --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr "no agregar, solo actualizar el รญndice"
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "sobrescribir el bit ejecutable de los archivos listados"
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr "avisar cuando se agrega un repositorio incrustado"
 
-#: builtin/add.c:326
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "backend para `git stash -p`"
+
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8621,177 +9532,201 @@ msgstr ""
 "\n"
 "Vea \"git help submodule\" para mรกs informaciรณn."
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "agregando repositorio embebido: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Usa -f si realmente quieres agregarlos.\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Usa -f si realmente quieres agregarlos.\n"
+"Desactiva este mensaje ejecutando\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr "fallรณ al agregar archivos"
 
-#: builtin/add.c:419
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file es incompatible con --interactive/--patch"
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file es incompatible con --edit"
+
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr "-A y -u son mutuamente incompatibles"
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Opciรณn --ignore-missing solo puede ser usada junto a --dry-run"
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "El parรกmetro '%s' para --chmod debe ser -x รณ +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--pathspec-from-file es incompatible con argumentos de pathspec"
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul requiere --pathspec-from-file"
+
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nada especificado, nada agregado.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Tal vez quiso decir 'git add .'?\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"ยฟTal vez quisiste decir 'git add.'?\n"
+"Desactiva este mensage ejecutando\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "no se pudo analizar el script del autor"
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' fue borrado por el hook de applypatch-msg"
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Lรญnea mal formada: '%s'."
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Fallรณ al copiar notas de '%s' a '%s'"
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "fall de fseek"
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no se pudo analizar el parche '%s'"
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Solo un parche StGIT puede ser aplicado de una vez"
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "timestamp invรกlido"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "lรญnea Date invรกlida"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "offset de zona horaria invรกlido"
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "Fallรณ al detectar el formato del parche."
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "fallรณ al crear el directorio '%s'"
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "Fallรณ al dividir parches."
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "no es posible escribir en el archivo รญndice"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"
 "\"."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Parche mandado con formato=flowed; espacios al final de las lรญneas tal vez "
 "desaparezcan."
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "El parche estรก vacรญo."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "sangrรญa no vรกlida: %.*s"
+msgid "missing author line in commit %s"
+msgstr "falta lรญnea autor en commit %s"
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "no es posible analizar el commit %s"
+msgid "invalid ident line: %.*s"
+msgstr "sangrรญa no vรกlida: %.*s"
 
-#: builtin/am.c:1496
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Repositorio carece de los blobs necesarios para retroceder en una fusiรณn de "
 "3-vรญas."
 
-#: builtin/am.c:1498
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Usando la informaciรณn del รญndice para reconstruir un รกrbol base..."
 
-#: builtin/am.c:1517
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
-"Editaste el parche a mano?\n"
+"ยฟEditaste el parche a mano?\n"
 "No aplica a blobs guardados en su รญndice."
 
-#: builtin/am.c:1523
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retrocediendo para parchar base y fusiรณn de 3-vรญas..."
 
-#: builtin/am.c:1549
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "Fallรณ al fusionar en los cambios."
 
-#: builtin/am.c:1581
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "aplicando a un historial vacรญo"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no se puede continuar: %s no existe."
 
-#: builtin/am.c:1650
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr "Cuerpo de commit es:"
 
@@ -8799,45 +9734,49 @@ msgstr "Cuerpo de commit es:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "ยฟAplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 
-#: builtin/am.c:1710
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "no es posible escribir en el archivo รญndice"
+
+#: builtin/am.c:1704
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "รndice sucio: no se puede aplicar parches (sucio: %s)"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1744 builtin/am.c:1812
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Aplicando: %.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1761
 msgid "No changes -- Patch already applied."
 msgstr "Sin cambios -- parche ya aplicado."
 
-#: builtin/am.c:1773
+#: builtin/am.c:1767
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El parche fallรณ en %s %.*s"
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr "Use 'git am --show-current-patch' para ver el parche fallido"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1815
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
-"Sin cambios - olvidaste usar 'git add'?\n"
+"Sin cambios - ยฟolvidaste usar 'git add'?\n"
 "Si no hay nada en el รกrea de stage, las posibilidad es que algo mas\n"
 "ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1822
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -8850,17 +9789,17 @@ msgstr ""
 "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" "
 "en รฉl."
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No se pudo analizar el objeto '%s'."
 
-#: builtin/am.c:1987
+#: builtin/am.c:1981
 msgid "failed to clean index"
 msgstr "fallรณ al limpiar el รญndice"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2025
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -8868,161 +9807,171 @@ msgstr ""
 "Parece haber movido HEAD desde el รบltimo fallรณ 'am'.\n"
 "No rebobinando a ORIG_HEAD"
 
-#: builtin/am.c:2128
+#: builtin/am.c:2132
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor invรกlido para --patch-format: %s"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valor invรกlido para --show-current-patch: %s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s"
+
+#: builtin/am.c:2207
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2208
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opciones>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2214
 msgid "run interactively"
 msgstr "ejecutar de manera interactiva"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2216
 msgid "historical option -- no-op"
 msgstr "opciรณn histรณrica -- no-op"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2218
 msgid "allow fall back on 3way merging if needed"
 msgstr "permitir retroceso en fusiรณn de 3-vรญas si es necesario"
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
 msgid "be quiet"
 msgstr "ser silencioso"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2221
 msgid "add a Signed-off-by line to the commit message"
 msgstr "agregar una lรญnea \"Firmado-por\" al mensaje del commit"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2224
 msgid "recode into utf8 (default)"
 msgstr "recodificar en utf8 (default)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2226
 msgid "pass -k flag to git-mailinfo"
 msgstr "pasar flag -k a git-mailinfo"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2228
 msgid "pass -b flag to git-mailinfo"
 msgstr "pasar flag -b a git-mailinfo"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2230
 msgid "pass -m flag to git-mailinfo"
 msgstr "pasar flag -m a git-mailinfo"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2232
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
 
-#: builtin/am.c:2192
+#: builtin/am.c:2235
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2238
 msgid "strip everything before a scissors line"
 msgstr "descubrir todo antes de una lรญnea de tijeras"
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
 msgid "pass it through git-apply"
 msgstr "pasarlo a travรฉs de git-apply"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr "formato"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2264
 msgid "format the patch(es) are in"
 msgstr "formatear el parche(s)"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2270
 msgid "override error message when patch failure occurs"
 msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2272
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuar aplicando los parches tras resolver conflictos"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2275
 msgid "synonyms for --continue"
 msgstr "sinรณnimos para --continue"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2278
 msgid "skip the current patch"
 msgstr "saltar el parche actual"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2281
 msgid "restore the original branch and abort the patching operation."
 msgstr "restaurar la rama original y abortar la operaciรณn de parchado."
 
-#: builtin/am.c:2241
+#: builtin/am.c:2284
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "abortar la operaciรณn de parchado pero mantener HEAD donde estรก."
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
-msgstr "muestra el parche siendo aplicado."
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "muestra el parche siendo aplicado"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2293
 msgid "lie about committer date"
 msgstr "mentir sobre la fecha del committer"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2295
 msgid "use current timestamp for author date"
 msgstr "usar el timestamp actual para la fecha del autor"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
 msgid "GPG-sign commits"
 msgstr "Commits con firma GPG"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2301
 msgid "(internal use for git-rebase)"
 msgstr "(uso interno para git-rebase)"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2319
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr ""
 "La opciรณn -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
-"serรก removida. Por favor no la use mรกs."
+"serรก eliminada. Por favor no la use mรกs."
 
-#: builtin/am.c:2281
+#: builtin/am.c:2326
 msgid "failed to read the index"
 msgstr "fallรณ al leer el รญndice"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2341
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "directorio de rebase previo %s todavรญa existe en el mbox dado."
 
-#: builtin/am.c:2320
+#: builtin/am.c:2365
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9031,11 +9980,11 @@ msgstr ""
 "Directorio extraviado %s encontrado.\n"
 "Use \"git am --abort\" para borrarlo."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2371
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Operaciรณn de resoluciรณn no estรก en progreso, no vamos a continuar."
 
-#: builtin/am.c:2336
+#: builtin/am.c:2381
 msgid "interactive mode requires patches on the command line"
 msgstr "modo interactivo requiere parches en la lรญnea de comando"
 
@@ -9158,7 +10107,7 @@ msgstr "No estamos bisecando.\n"
 msgid "'%s' is not a valid commit"
 msgstr "'%s' no es un commit vรกlido"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9166,27 +10115,27 @@ msgstr ""
 "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset "
 "<commit>'."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Mal argumento bisect_write: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "no se puede obtener el oid de la rev '%s'"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "no se pudo abrir el archivo '%s'"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Comando invรกlido: actualmente se encuentra en un bisect %s/%s"
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9195,7 +10144,7 @@ msgstr ""
 "Tienes que dar al menos un %s y un %s revision.\n"
 "Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso."
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9206,7 +10155,7 @@ msgstr ""
 "Despuรฉs tienes que entregar al menos un %s y una revision %s.\n"
 "Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso."
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:310
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "haciendo bisect solo con un commit %s"
@@ -9215,15 +10164,15 @@ msgstr "haciendo bisect solo con un commit %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr "ยฟEstรกs seguro [Y/n]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr "no hay tรฉrminos definidos"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:382
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9232,7 +10181,7 @@ msgstr ""
 "Tus tรฉrminos actuales son %s para el estado viejo\n"
 "y %s para el estado nuevo.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:392
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9241,267 +10190,263 @@ msgstr ""
 "argumento invรกlido %s para 'git bisect terms'.\n"
 "Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:478
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "opciรณn desconocida: '%s'"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:482
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' no parece ser una revisiรณn vรกlida"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:514
 msgid "bad HEAD - I need a HEAD"
 msgstr "mal HEAD - Necesito un HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:529
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "error al hacer checkout '%s'. Intente 'git bisect start <rama-vรกlida>'."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "no se bisecarรก en un รกrbol con cg-seek"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:553
 msgid "bad HEAD - strange symbolic ref"
 msgstr "mal HEAD - ref simbรณlico extraรฑo"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:577
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ref invรกlido: '%s'"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr "realiza 'git bisect next'"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "escribe los tรฉrminos a .git/BISECT_TERMS"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr "limpiar el estado de bisecciรณn"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr "revisar por revs esperados"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:641
 msgid "reset the bisection state"
 msgstr "reiniciar el estado de bisect"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:643
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "escribir el estado de bisect en BISECT_LOG"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:645
 msgid "check and set terms in a bisection state"
 msgstr "revisar y configurar los terms en el estado de bisect"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:647
 msgid "check whether bad or good terms exist"
 msgstr "revisar si existen tรฉrminos malos o buenos"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:649
 msgid "print out the bisect terms"
 msgstr "imprimir los terms del bisect"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:651
 msgid "start the bisect session"
 msgstr "comenzar la sesiรณn de bisect"
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:655
 msgid "no log for BISECT_WRITE"
 msgstr "no hay log para BISECT_WRITE"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms requiere dos argumentos"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state no requiere argumentos"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:684
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset requiere un commit o ningรบn argumento"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:688
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write requiere entre 4 o 5 argumentos"
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:694
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--bisect-clean-state no requiere argumentos"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:700
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check requiere 2 o 3 argumentos"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:706
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms requiere 0 o 1 argumentos"
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> estรกn documentadas en git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, c-format
 msgid "expecting a color: %s"
 msgstr "esperando un color: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr "tiene que terminar con un color"
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "color invรกlido '%s' en color.blame.repeatedLines"
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 msgid "invalid value for blame.coloring"
 msgstr "valor invรกlido para blame.coloring"
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "no se pudo encontrar revision %s para ignorar"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "No tratar commits raรญces como extremos (Default: off)"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr "Mostrar estadรญsticas de costo de trabajo"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr "Forzar el reporte de progreso"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr "Mostrar la puntuaciรณn de salida de las entradas de blame"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr "Mostrar nombre original del archivo (Default: auto)"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr "Mostrar nรบmero de lรญnea original (Default: off)"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr "Mostrar en un formato diseรฑado para consumo de mรกquina"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr "Mostrar en formato porcelana con informaciรณn de commit por lรญnea"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Usar el mismo modo salida como git-annotate (Default: off)"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr "Mostrar timestamp en formato raw (Default: off)"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Suprimir nombre del autor y timestamp (Default: off)"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr "Mostrar en cambio el email del autor (Default: off)"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr "Ignorar diferencias de espacios en blanco"
 
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 msgid "Ignore <rev> when blaming"
-msgstr "ignorar <rev> durante el blame"
+msgstr "Ignorar <rev> durante el blame"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 msgid "Ignore revisions from <file>"
-msgstr "ignorar revisiones de <archivo>"
+msgstr "Ignorar revisiones de <archivo>"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr "colorear metadata redundante de lรญneas previas de manera diferente"
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr "colorear lรญneas por edad"
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Usar un heurรญstico experimental para mejorar los diffs"
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr "Ocupo mรกs ciclos para encontrar mejoras resultados"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "Usar contenido de <archivo> como imagen final"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "puntaje"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr "Encontrar copias de lรญneas entre y a travรฉs de archivos"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr "Encontrar movimientos de lรญneas entre y a travรฉs de archivos"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr "Procesar solo el rango de lรญneas n,m, contando desde 1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 
@@ -9513,18 +10458,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "hace 4 aรฑos, 11 meses"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "archivo %s tiene solo %lu lรญnea"
 msgstr[1] "archivo %s tiene solo %lu lรญneas"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr "Blaming a lรญneas"
 
@@ -9715,7 +10660,7 @@ msgid ""
 msgstr ""
 "Por favor, edita la descripciรณn para la rama\n"
 "%s\n"
-"Las lรญneas que comiencen con '%c' serรกn removidas.\n"
+"Las lรญneas que comiencen con '%c' serรกn eliminadas.\n"
 
 #: builtin/branch.c:618
 msgid "Generic options"
@@ -9737,7 +10682,7 @@ msgstr "configurando modo tracking (mirar git-pull(1))"
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:513
 msgid "upstream"
 msgstr "upstream"
 
@@ -9746,8 +10691,8 @@ msgid "change the upstream info"
 msgstr "cambiar info de upstream"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Desconfigurando la info de upstream"
+msgid "unset the upstream info"
+msgstr "desconfigurando la info de upstream"
 
 #: builtin/branch.c:628
 msgid "use colored output"
@@ -9848,9 +10793,9 @@ msgstr "ordenamiento y filtrado son case-insensitive"
 msgid "format to use for the output"
 msgstr "formato para usar para el output"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:785
 msgid "HEAD not found below refs/heads!"
-msgstr "HEAD no encontrado abajo de refs/heads!"
+msgstr "ยกHEAD no encontrado abajo de refs/heads!"
 
 #: builtin/branch.c:708
 msgid "--column and --verbose are incompatible"
@@ -9939,20 +10884,65 @@ msgstr ""
 "la opciรณn '--set-upstream' ya no es soportada. Considere usar '--track' o '--"
 "set-upstream-to' en cambio."
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr "%s estรก bien\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<opciones>] <file> <git-rev-list args>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<opciones>] <archivo>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"
+
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "no mostrar medidor de progreso"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "mostrar medidor de progreso"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "Se necesita un repositorio para agrupar."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "no mostrar detalles del bundle"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s estรก bien\n"
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "Se necesita un repositorio para desagrupar."
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sub-comando desconocido: %s"
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -9960,7 +10950,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -9968,72 +10958,72 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 msgid "only one batch option may be specified"
 msgstr "solo se puede especificar una opciรณn batch"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipo> puede ser: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr "mostrar el tamaรฑo del objeto"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr "salir con cero cuando no haya error"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr "realizar pretty-print del contenido del objeto"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr "para objetos blob, ejecuta filters en el contenido del objeto"
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:1002
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr "use una ruta especรญfica para --textconv/--filters"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr "salida buffer --batch"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr "mostrar info y content de los objetos alimentados por standard input"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr "mostrar info de los objetos alimentados por standard input"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "seguir los enlaces simbรณlicos en el รกrbol (usado con --batch o --batch-check)"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostrar todos los objetos con --batch o --batch-check"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr "no ordenar el output de --batch-all-objects"
 
@@ -10061,8 +11051,8 @@ msgstr "leer nombres de archivos de stdin"
 msgid "terminate input and output records by a NUL character"
 msgstr "terminar registros de entrada y salida con un carรกcter NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 
@@ -10074,27 +11064,27 @@ msgstr "mostrar rutas de entrada que no concuerdan"
 msgid "ignore index when checking"
 msgstr "ignorar el รญndice cuando se revise"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "no se puede especificar los nombres de rutas con --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z sรณlo tiene sentido con --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "ruta no especificada"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet solo es vรกlido con un nombre de ruta รบnico"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "no se puede tener ambos --quiet y --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching sรณlo es vรกlida con --verbose"
 
@@ -10154,9 +11144,9 @@ msgid "write the content to temporary files"
 msgstr "escribir el contenido en un archivo temporal"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
 msgid "string"
 msgstr "string"
 
@@ -10184,98 +11174,98 @@ msgstr "git switch [<opciones>] [<rama>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..."
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "ruta '%s' no tiene nuestra versiรณn"
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "ruta '%s' no tiene su versiรณn"
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "ruta '%s' no tiene todas las versiones necesarias"
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "ruta '%s' no tiene versiones necesarias"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "ruta '%s': no se puede fusionar"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Incapaz de agregar resultados de fusiรณn a '%s'"
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Recreado %d conflicto de merge"
 msgstr[1] "Recreados %d conflictos de merge"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "Actualizada %d ruta para %s"
 msgstr[1] "Actualizadas %d rutas para %s"
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:389
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "Actualizada %d ruta desde el index"
 msgstr[1] "Actualizadas %d rutas desde el index"
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' no puede ser usada con rutas actualizadas"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' no puede ser usado con %s"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ni '%s' o '%s' estรกn especificados"
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' tiene que ser usado cuando '%s' no es especificado"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' o '%s' no puede ser usado con %s"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "ruta '%s' no esta fusionada"
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
 msgid "you need to resolve your current index first"
 msgstr "necesitas resolver tu รญndice actual primero"
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:734
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10284,56 +11274,50 @@ msgstr ""
 "no se puede continuar con los cambios en stage en los siguientes archivos:\n"
 "%s"
 
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-"cambios en el รกrea de stage en el siguiente archivo pueden ser perdidos: %s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:837
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No se puede hacer reflog para '%s': %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:879
 msgid "HEAD is now at"
 msgstr "HEAD estรก ahora en"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:883 builtin/clone.c:717
 msgid "unable to update HEAD"
 msgstr "no es posible actualizar  HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:887
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Reiniciar rama '%s'\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ya en '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:894
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Rama reiniciada y cambiada a '%s'\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:896 builtin/checkout.c:1320
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Cambiado a nueva rama '%s'\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:898
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Cambiado a rama '%s'\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:949
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... y %d mรกs.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:955
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10356,7 +11340,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:974
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10383,28 +11367,19 @@ msgstr[1] ""
 " git branch <nombre-de-rama> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1009
 msgid "internal error in revision walk"
 msgstr "error interno en camino de revisiรณn"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1013
 msgid "Previous HEAD position was"
 msgstr "La posiciรณn previa de HEAD era"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
 msgid "You are on a branch yet to be born"
 msgstr "Estรกs en una rama por nacer"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "solo una referencia esperada"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "solo una referencia esperada, %d entregadas."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1128
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10413,37 +11388,72 @@ msgstr ""
 "'%s' puede ser tanto un archivo local como una rama de rastreo.\n"
 "Por favor use -- (y opcionalmente --no-guess) para desambiguar"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Si querรญas hacer un check out a una rama rastreada remota, como 'origin',\n"
+"puedes hacerlo proporcionando el nombre completo con la opciรณn --track:\n"
+"\n"
+"    git checkout --track origin/<nombre>\n"
+"\n"
+"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una "
+"rama\n"
+"de nombre <nombre> remota, como 'origin', considera configurar\n"
+"checkout.defaultRemote=origin en tu configuraciรณn."
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' concordรณ con multiples (%d) ramas de rastreo remoto"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "solo una referencia esperada"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "solo una referencia esperada, %d entregadas."
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia invรกlida: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referencia no es n รกrbol: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1334
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "se esperaba un branch, se obtuvo tag '%s'"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1336
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "se espera una rama, se obtuvo una rama remota '%s'"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "se esperaba branch, se obuto '%s'"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1340
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "se espera una rama, se obtuvo commit '%s'"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1356
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10451,7 +11461,7 @@ msgstr ""
 "no se puede cambiar de branch durante un merge\n"
 "Considera \"git merge --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1360
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10459,7 +11469,7 @@ msgstr ""
 "no se puede cambiar de branch en medio de una sesiรณn de am\n"
 "Considera \"git am --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1364
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10467,7 +11477,7 @@ msgstr ""
 "no se puede cambiar de branch durante un rebase\n"
 "Considera \"git rebase --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1368
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10475,7 +11485,7 @@ msgstr ""
 "no se puede cambiar de branch durante un cherry-pick\n"
 "Considera \"git cherry-pick --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1372
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10483,137 +11493,142 @@ msgstr ""
 "no se puede cambiar de branch durante un revert\n"
 "Considera \"git revert --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1376
 msgid "you are switching branch while bisecting"
 msgstr "estรกs cambiando ramas durante un bisect"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1383
 msgid "paths cannot be used with switching branches"
 msgstr "rutas no pueden ser usadas con cambios de rama"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' no puede ser usado con cambios de ramas"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' no puede ser usado con '%s'"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1411
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' no puede tomar <punto de partida>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1419
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "No se puede cambiar rama a un '%s' sin commits"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1426
 msgid "missing branch or commit argument"
 msgstr "falta branch o commit como argumento"
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "forzar el reporte de progreso"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1469
 msgid "perform a 3-way merge with the new branch"
 msgstr "realizar una fusiรณn de tres vรญas con la rama nueva"
 
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr "estilo"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1471
 msgid "conflict style (merge or diff3)"
 msgstr "conflicto de estilos (merge o diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1483 builtin/worktree.c:496
 msgid "detach HEAD at named commit"
 msgstr "desacoplar HEAD en el commit nombrado"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1484
 msgid "set upstream info for new branch"
 msgstr "configurar info de upstream para una rama nueva"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1486
 msgid "force checkout (throw away local modifications)"
 msgstr "forzar el checkout (descartar modificaciones locales)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new-branch"
 msgstr "nueva-rama"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1493
 msgid "do not check if another worktree is holding the given ref"
 msgstr "no revise si otro รกrbol de trabajo contiene la ref entregada"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1506
 msgid "checkout our version for unmerged files"
 msgstr "hacer checkout a  nuestra versiรณn para archivos sin fusionar"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1509
 msgid "checkout their version for unmerged files"
 msgstr "hacer checkout a su versiรณn para los archivos sin fusionar"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1513
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitar pathspecs a dispersar entradas solamente"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B y --orphan son mutuamente exclusivas"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1568
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p y --overlay son mutuamente exclusivas"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1605
 msgid "--track needs a branch name"
 msgstr "--track necesita el nombre de una rama"
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1610
 msgid "missing branch name; try -b"
 msgstr "falta nombre de rama; prueba -b"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1642
 #, c-format
 msgid "could not resolve %s"
 msgstr "no se pudo resolver %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "debes especificar path(s) para restaurar"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
 msgid "invalid path specification"
 msgstr "especificaciรณn de ruta invรกlida"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file es incompatible con --detach"
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file es incompatible con --patch"
+
+#: builtin/checkout.c:1692
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10621,95 +11636,69 @@ msgstr ""
 "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
 "se revisa fuera del รญndice."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' acertรณ mรกs de una rama remota rastreada.\n"
-"Encontramos %d remotos con una referencia que concuerda. Asรญ que volvemos\n"
-"a intentar resolver el argumento como una ruta, pero eso tambiรฉn fallรณ!\n"
-"\n"
-"Si querรญas hacer un check out a una rama rastreada remota, como 'origin',\n"
-"puedes hacerlo proporcionando el nombre completo con la opciรณn --track:\n"
-"\n"
-"    git checkout --track origin/<nombre>\n"
-"\n"
-"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una "
-"rama\n"
-"de nombre <nombre> remota, como 'origin', considera configurar\n"
-"checkout.defaultRemote=origin en tu configuraciรณn."
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "debes especificar path(s) para restaurar"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
 msgid "branch"
 msgstr "rama"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1724
 msgid "create and checkout a new branch"
 msgstr "crear y hacer checkout a una nueva rama"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1726
 msgid "create/reset and checkout a branch"
 msgstr "crear/reiniciar y hacer checkout a una rama"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1727
 msgid "create reflog for new branch"
 msgstr "crear un reflog para una nueva rama"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1729
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "adivinar segunda opciรณn 'git checkout <no-hay-tal-rama>' (default)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1730
 msgid "use overlay mode (default)"
 msgstr "usar modo overlay (default)"
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1775
 msgid "create and switch to a new branch"
 msgstr "crear y hacer switch a una nueva rama"
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1777
 msgid "create/reset and switch to a branch"
 msgstr "crear/reiniciar y hacer switch a una rama"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1779
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "adivinar segunda opciรณn 'git checkout <no-hay-tal-rama>'"
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1781
 msgid "throw away local modifications"
 msgstr "descartar modificaciones locales"
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1813
 msgid "which tree-ish to checkout from"
 msgstr "de quรฉ รกrbol hacer el checkout"
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1815
 msgid "restore the index"
 msgstr "restaurar el index"
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1817
 msgid "restore the working tree (default)"
 msgstr "restaurar el รกrbol de trabajo (default)"
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1819
 msgid "ignore unmerged entries"
 msgstr "ignorar entradas no fusionadas"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
 msgid "use overlay mode"
 msgstr "usar modo overlay"
 
@@ -10749,7 +11738,7 @@ msgstr "fallรณ al borrar %s"
 msgid "could not lstat %s\n"
 msgstr "no se pudo lstat %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10762,7 +11751,7 @@ msgstr ""
 "foo        - selecciona un objeto basado en un prefijo รบnico\n"
 "           - (vacรญo) no elegir nada\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10783,38 +11772,33 @@ msgstr ""
 "*          - escoger todos los objetos\n"
 "           - (vacรญo) terminar selecciรณn\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
-msgstr "Ahh (%s)?\n"
+msgstr "ยฟAhh (%s)?\n"
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Input ignora los patrones >> "
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Seleccionar objetos para borrar"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
-msgstr "Borrar %s [y/N]? "
-
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Adiรณs.\n"
+msgstr "ยฟBorrar %s [y/N]? "
 
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10832,64 +11816,56 @@ msgstr ""
 "help                - esta ventana\n"
 "?                   - ayuda para selecciรณn de opciones"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Comandos ***"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Ahora que"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Se eliminarรก el siguiente objeto:"
 msgstr[1] "Se eliminarรกn los siguientes objetos:"
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "No hay mรกs archivos para limpiar, saliendo."
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "no imprimir nombres de archivos borrados"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr "forzar"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "limpieza interactiva"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "borrar directorios completos"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "patrรณn"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "agregar <patrรณn> para ignorar reglas"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "borrar archivos ignorados, tambiรฉn"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "borrar solo archivos ignorados"
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x y -X no pueden ser usadas juntas"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -10897,7 +11873,7 @@ msgstr ""
 "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
 "rehusando el clean"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -10905,7 +11881,7 @@ msgstr ""
 "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
 "rehusando el clean"
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
 
@@ -10953,18 +11929,18 @@ msgstr "directorio-template"
 msgid "directory from which templates will be used"
 msgstr "directorio del cual los templates serรกn usados"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr "repositorio de referencia"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr "usa--reference  solamente si estรกs clonado"
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
 msgid "name"
 msgstr "nombre"
 
@@ -10980,8 +11956,8 @@ msgstr "checkout <rama> en lugar de HEAD remota"
 msgid "path to git-upload-pack on the remote"
 msgstr "ruta para git-upload-pack en el remoto"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
 msgid "depth"
 msgstr "profundidad"
 
@@ -10989,7 +11965,7 @@ msgstr "profundidad"
 msgid "create a shallow clone of that depth"
 msgstr "crear un clon superficial para esa profundidad"
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
 msgid "time"
 msgstr "tiempo"
 
@@ -10997,16 +11973,17 @@ msgstr "tiempo"
 msgid "create a shallow clone since a specific time"
 msgstr "crear un clon superficial desde el tiempo especรญfico"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
 msgid "revision"
 msgstr "revision"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "ahondando historia de clon superficial, excluyendo rev"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clonar solo una rama,HEAD o --branch"
 
@@ -11034,23 +12011,23 @@ msgstr "llave=valor"
 msgid "set config inside the new repository"
 msgstr "configurar config dentro del nuevo repositorio"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "especifico-de-servidor"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "opciรณn para trasmitir"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 
@@ -11058,7 +12035,12 @@ msgstr "solo usar direcciones IPv6"
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "cualquier submรณdulo clonado usarรก su branch de rastreo remoto"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"inicializar archivo sparse-checkout para incluir solo archivos en la raรญz"
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11066,47 +12048,42 @@ msgstr ""
 "No se pudo adivinar ningรบn nombre de directorio.\n"
 "Por favor especifique un directorio en la lรญnea de comando"
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe pero no es un directorio"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "fallรณ al iniciar el iterador sobre '%s'"
 
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "fallรณ al desvincular '%s'"
-
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "fallรณ al crear link '%s'"
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "fallรณ al copiar archivo a '%s'"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "fallรณ al iterar sobre '%s'"
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11116,96 +12093,100 @@ msgstr ""
 "Puedes inspeccionar a quรฉ se hizo checkout con 'git status'\n"
 "y volver a intentarlo con 'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "No se pudo encontrar la rama remota %s para clonar."
 
-#: builtin/clone.c:702
+#: builtin/clone.c:705
 #, c-format
 msgid "unable to update %s"
 msgstr "incapaz de actualizar %s"
 
-#: builtin/clone.c:752
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "fallรณ al inicializar sparse-checkout"
+
+#: builtin/clone.c:776
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
 
-#: builtin/clone.c:783
+#: builtin/clone.c:807
 msgid "unable to checkout working tree"
 msgstr "no es posible realizar checkout en el รกrbol de trabajo"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:862
 msgid "unable to write parameters to config file"
 msgstr "no es posible escribir parรกmetros al archivo config"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:925
 msgid "cannot repack to clean up"
 msgstr "no se puede reempaquetar para limpiar"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:927
 msgid "cannot unlink temporary alternates file"
 msgstr "no se puede desvincular archivos alternos temporales"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
 msgid "Too many arguments."
 msgstr "Muchos argumentos."
 
-#: builtin/clone.c:942
+#: builtin/clone.c:969
 msgid "You must specify a repository to clone."
 msgstr "Tienes que especificar un repositorio para clonar."
 
-#: builtin/clone.c:955
+#: builtin/clone.c:982
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Las opciones --bare y --origin %s son incompatibles."
 
-#: builtin/clone.c:958
+#: builtin/clone.c:985
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare y --separate-git-dir son incompatibles."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:998
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositorio '%s' no existe"
 
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:1004 builtin/fetch.c:1796
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "profundidad %s no es un numero positivo"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1014
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "la ruta de destino '%s' ya existe y no es un directorio vacรญo."
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1024
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "directorio de trabajo '%s' ya existe."
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no se pudo crear directorios principales de '%s'"
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1044
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no se pudo crear un รกrbol de trabajo '%s'"
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1064
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonando en un repositorio vacรญo '%s'...\n"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1066
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonando en '%s'...\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1090
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11213,36 +12194,36 @@ msgstr ""
 "clone --recursive no es compatible con --reference y --reference-if-able al "
 "mismo tiempo"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1154
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth es ignorada en clonaciones locales; usa file:// mรกs bien."
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1156
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since es ignorado en el clon local; use file:// ."
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1158
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude es ignorado en clones locales; use file://."
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1160
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1163
 msgid "source repository is shallow, ignoring --local"
 msgstr "repositorio fuente es superficial, ignorando --local"
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1168
 msgid "--local is ignored"
 msgstr "--local es ignorado"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1243 builtin/clone.c:1251
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Rama remota %s no encontrada en upstream %s"
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1254
 msgid "You appear to have cloned an empty repository."
 msgstr "Pareces haber clonado un repositorio sin contenido."
 
@@ -11291,7 +12272,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "padre duplicado %s ignorado"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, c-format
 msgid "not a valid object name %s"
 msgstr "no es un nombre de objeto vรกlido %s"
@@ -11319,13 +12300,13 @@ msgstr "padre"
 msgid "id of a parent commit object"
 msgstr "id del objeto commit padre"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
 #: builtin/tag.c:412
 msgid "message"
 msgstr "mensaje"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
 msgid "commit message"
 msgstr "mensaje del commit"
 
@@ -11333,8 +12314,8 @@ msgstr "mensaje del commit"
 msgid "read commit log message from file"
 msgstr "leer mensaje de commit desde un archivo"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "Firmar commit con GPG"
 
@@ -11409,57 +12390,65 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "fallรณ al desempaquetar objeto del รกrbol HEAD"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file con -a no tiene sentido"
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "No hay rutas con --include/--only no tiene sentido."
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr "no es posible crear un รญndice temporal"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:385
 msgid "interactive add failed"
 msgstr "adiciรณn interactiva fallida"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:400
 msgid "unable to update temporary index"
 msgstr "no es posible actualizar el รญndice temporal"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:402
 msgid "Failed to update main cache tree"
 msgstr "Fallรณ al actualizar el cache principal del รกrbol"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
 msgid "unable to write new_index file"
 msgstr "no es posible escribir archivo new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:479
 msgid "cannot do a partial commit during a merge."
 msgstr "no se puede realizar un commit parcial durante una fusiรณn."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:481
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no se puede realizar un commit parcial durante un cherry-pick."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:489
 msgid "cannot read the index"
 msgstr "no se puede leer el รญndice"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:508
 msgid "unable to write temporary index file"
 msgstr "no es posible escribir el รญndice temporal"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:606
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "commit '%s' requiere cabecera de autor"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:608
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "el commit '%s' tiene una lรญnea de autor mal formada"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:627
 msgid "malformed --author parameter"
 msgstr "parรกmetro --author mal formado"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:680
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11467,38 +12456,38 @@ msgstr ""
 "no es posible seleccionar un carรกcter de comentario que no es usado\n"
 "en el mensaje de commit actual"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no se pudo revisar el commit %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(leyendo mensajes de logs desde standard input)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:732
 msgid "could not read log from standard input"
 msgstr "no se pudo leer log desde standard input"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:736
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no se pudo leer el log '%s'"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:767 builtin/commit.c:783
 msgid "could not read SQUASH_MSG"
 msgstr "no se pudo leer SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:774
 msgid "could not read MERGE_MSG"
 msgstr "no se pudo leer MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:834
 msgid "could not write commit template"
 msgstr "no se pudo escribir el template del commit"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:853
 #, c-format
 msgid ""
 "\n"
@@ -11509,11 +12498,11 @@ msgid ""
 msgstr ""
 "\n"
 "Parece que estรกs haciendo un commit con una fusiรณn dentro.\n"
-"Si esto no es correcto, por favor remueve el archivo\n"
+"Si esto no es correcto, por favor elimina el archivo\n"
 "\t%s\n"
 "y vuelve a intentar.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:858
 #, c-format
 msgid ""
 "\n"
@@ -11528,169 +12517,165 @@ msgstr ""
 "\t%s\n"
 "y vuelve a intentar.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:871
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
-"Por favor ingresa el mensaje del commit para tus cambios. Las lรญneas que "
-"comiencen\n"
-"con '%c' serรกn ignoradas, y un mensaje vacรญo aborta el commit.\n"
+"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
+" lรญneas que comiencen con '%c' serรกn ignoradas, y un mensaje\n"
+" vacรญo aborta el commit.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:879
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be kept; you may remove them yourself if you want to.\n"
 "An empty message aborts the commit.\n"
 msgstr ""
-"Por favor ingresa el mensaje del commit para tus cambios. Las lรญneas que "
-"comiencen\n"
-"con '%c' serรกn guardadas; puede eliminarlas usted mismo si desea.\n"
+"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
+" lรญneas que comiencen con '%c' serรกn guardadas; puede eliminarlas\n"
+" usted mismo si lo desea.\n"
 "Un mensaje vacรญo aborta el commit.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:896
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:904
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sFecha:     %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:911
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:929
 msgid "Cannot read index"
 msgstr "No se puede leer el รญndice"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "Error al construir los รกrboles"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' no estรก en el formato 'Name <email>' y no concuerda con ningรบn "
 "autor existente"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Modo ignorado invรกlido '%s'"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1327
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Modo invรกlido de los archivos no rastreados '%s'"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "--long y -z son incompatibles"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambos --reset-author y --author no tiene sentido"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "No tienes nada que enmendar."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Estรกs en medio de una fusiรณn -- no puedes enmendar."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Estรก en medio de un cherry-pick -- no se puede enmendar."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1188
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1198
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1200
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "La opciรณn -m no puede ser combinada con -c/-C/-F."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1208
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author sรณlo puede ser usada con -C, -c o --amend."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1225
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "No hay rutas con --include/--only no tiene sentido."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1231
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "paths '%s ...' con -a no tiene sentido"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1362 builtin/commit.c:1524
 msgid "show status concisely"
 msgstr "mostrar status de manera concisa"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1364 builtin/commit.c:1526
 msgid "show branch information"
 msgstr "mostrar informaciรณn de la rama"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1366
 msgid "show stash information"
 msgstr "mostrar informaciรณn del stash"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1368 builtin/commit.c:1528
 msgid "compute full ahead/behind values"
 msgstr "calcular todos los valores delante/atrรกs"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1370
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
 msgid "machine-readable output"
 msgstr "output formato-maquina"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1373 builtin/commit.c:1532
 msgid "show status in long format (default)"
 msgstr "mostrar status en formato largo (default)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1376 builtin/commit.c:1535
 msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
 msgid "mode"
 msgstr "modo"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1379 builtin/commit.c:1538
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
 "(Predeterminado: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1383
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11698,11 +12683,11 @@ msgstr ""
 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
 "(Predeterminado: traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1385 parse-options.h:192
 msgid "when"
 msgstr "cuando"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1386
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11710,173 +12695,173 @@ msgstr ""
 "ignorar cambios en submรณdulos, opcional cuando: all,dirty,untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1388
 msgid "list untracked files in columns"
 msgstr "listar en columnas los archivos sin seguimiento"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1389
 msgid "do not detect renames"
 msgstr "no detectar renombrados"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1391
 msgid "detect renames, optionally set similarity index"
 msgstr "detectar renombres, opcionalmente configurar similaridad de รญndice"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1411
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinaciรณn de argumentos de archivos ignorados y no rastreados no soportada"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "suppress summary after successful commit"
 msgstr "suprime summary tras un commit exitoso"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1495
 msgid "show diff in commit message template"
 msgstr "mostrar diff en el template del mensaje de commit"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1497
 msgid "Commit message options"
 msgstr "Opciones para el mensaje del commit"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "override author for commit"
 msgstr "sobrescribe el autor del commit"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1500 builtin/gc.c:538
 msgid "date"
 msgstr "fecha"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1500
 msgid "override date for commit"
 msgstr "sobrescribe la fecha del commit"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "confirmar"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1502
 msgid "reuse and edit message from specified commit"
 msgstr "reusar y editar el mensaje de un commit especifico"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1503
 msgid "reuse message from specified commit"
 msgstr "reusar el mensaje de un commit especifico"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1504
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usar mensaje de formato autosquashย para arreglar el commit especificado"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1505
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usar el mensaje de formato autosquash para realizar squash  al commit "
 "especificado"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1506
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
 
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1508
 msgid "use specified template file"
 msgstr "usar archivo de template especificado"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1509
 msgid "force edit of commit"
 msgstr "forzar la ediciรณn del commit"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1511
 msgid "include status in commit message template"
 msgstr "incluir status en el template del mensaje de commit"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1516
 msgid "Commit contents options"
 msgstr "Opciones para el contenido del commit"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1517
 msgid "commit all changed files"
 msgstr "confirmar todos los archivos cambiados"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1518
 msgid "add specified files to index for commit"
 msgstr "agregar archivos especรญficos al รญndice para confirmar"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1519
 msgid "interactively add files"
 msgstr "agregar archivos interactivamente"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1520
 msgid "interactively add changes"
 msgstr "agregar cambios interactivamente"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1521
 msgid "commit only specified files"
 msgstr "sรณlo confirmar archivos especรญficos"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1522
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1523
 msgid "show what would be committed"
 msgstr "mostrar lo que serรญa incluido en el commit"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1536
 msgid "amend previous commit"
 msgstr "enmendar commit previo"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1537
 msgid "bypass post-rewrite hook"
 msgstr "gancho bypass post reescritura"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1544
 msgid "ok to record an empty change"
 msgstr "ok al grabar un cambio vacรญo"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1546
 msgid "ok to record a change with an empty message"
 msgstr "ok al grabar un cambio con un mensaje vacรญo"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1619
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Archivo MERGE_HEAD (%s) corrupto"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
 msgid "could not read MERGE_MODE"
 msgstr "no se pudo leer MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1645
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no se pudo leer el mensaje de commit: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abortando commit debido que el mensaje estรก en blanco.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Abortando commit; no se ha editado el mensaje\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1691
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -11886,75 +12871,74 @@ msgstr ""
 "new_index. Verifique que el disco no este lleno y la quota no ha\n"
 "sido superada, y luego \"git restore --sateged :/\" para recuperar."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
 msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"git commit-graph write [--object-dir <dir objeto>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opciones de "
+"split>"
+
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "no se pudo entoncrar el objeto directorio concordante con %s"
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr "dir"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
 msgid "The object directory to store the graph"
 msgstr "El directorio de objetos para guardar el grรกfico"
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:71
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "si el commit-graph estรก cortado, solo verifica la punta del archivo"
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "No se pudo abrir commit-graph '%s'"
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:128
 msgid "start walk at all refs"
 msgstr "comenzar caminata en todas las refs"
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:130
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "escanear paquete de รญndices por stdin por commits"
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:132
 msgid "start walk at commits listed by stdin"
 msgstr "comenzar a caminar a los commits listados por stdin"
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:134
 msgid "include all commits already in the commit-graph file"
 msgstr "inclye todos los commits que ya estรกn en el archivo commit-graph"
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:137
 msgid "allow writing an incremental commit-graph file"
 msgstr "permitir escribir un archivo commit-graph incremental"
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "mรกximo nรบmero de commits en un commit-graph sin base cortada"
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:141
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "radio mรกximo entre dos niveles de corte de commit-graph"
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:159
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "use como mรกximo uno de --reachable, --stdin-commits, o --stdin-packs"
 
@@ -11962,206 +12946,212 @@ msgstr "use como mรกximo uno de --reachable, --stdin-commits, o --stdin-packs"
 msgid "git config [<options>]"
 msgstr "git config [<opciones>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argumento --type no reconocido, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:116
 msgid "only one type at a time"
 msgstr "solo un tipo a la vez"
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr "Ubicaciรณn del archivo configuraciรณn"
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr "usar archivo de config global"
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr "usar archivo de config del sistema"
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr "usar archivo de config del repositorio"
 
-#: builtin/config.c:128
+#: builtin/config.c:129
 msgid "use per-worktree config file"
 msgstr "usar un archivo de config por รกrbol de trabajo"
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr "usar archivo config especificado"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr "leer config del objeto blob suministrado"
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr "Acciรณn"
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr "obtener valor: nombre [valor-regex]"
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr "obtener todos los valores: llave [valores-regex]"
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "obtener valores para una regexp: nombre-regex [valor-regex]"
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtener valor especifico para el URL: secciรณn[.var] URL"
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 "remplazar todas las variables que concuerden: nombre valor [valor_regex]"
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr "agregar nueva variable: nombre valor"
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr "borrar una variable. nombre [valor-regex]"
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr "borrar todas las concurrencias: nombre [valor-regex]"
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr "renombrar secciรณn: nombre-viejo nombre-nuevo"
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr "borrar una secciรณn: nombre"
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr "listar todo"
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr "abrir el editor"
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr "encontrar el color configurado: slot [default]"
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "encontrar las opciones del color: slot [stdout-es-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr "Tipo"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
 msgid "value is given this type"
 msgstr "al valor se ha dado este tipo"
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr "valor es \"true\" o \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr "valor es un numero decimal"
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr "valor es --bool o --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr "valor es una ruta (archivo o nombre de directorio)"
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr "valor es una fecha de expiraciรณn"
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr "Otro"
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr "terminar valores con un byte NULL"
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr "mostrar solo nombres de variables"
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr "respetar directivas include en la bรบsqueda"
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "mostrar el origen de configuraciรณn (archivo, stdin, blob, comando)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"mostrar el scope de la configuraciรณn (worktree, local, global, system, "
+"command)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
 msgid "value"
 msgstr "valor"
 
-#: builtin/config.c:158
+#: builtin/config.c:160
 msgid "with --get, use default value when missing entry"
 msgstr "con --get, usa el valor por defecto cuando falta una entrada"
 
-#: builtin/config.c:172
+#: builtin/config.c:174
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "nรบmero de argumentos invรกlidos, deberรญan ser %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:176
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "nรบmero de argumentos invรกlidos, deberรญan ser de %d a %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:324
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "patrรณn de llave invรกlido: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:360
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "fallรณ al formatear el valor por defecto de configuraciรณn: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:417
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "no se analizar color '%s'"
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr "no es posible analizar el valor por defecto de color"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
 msgid "not in a git directory"
 msgstr "no en un directorio git"
 
-#: builtin/config.c:499
+#: builtin/config.c:515
 msgid "writing to stdin is not supported"
 msgstr "escribir en stdin no estรก soportado"
 
-#: builtin/config.c:502
+#: builtin/config.c:518
 msgid "writing config blobs is not supported"
 msgstr "escribir blobs de configuraciรณn no estรก soportado"
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12176,23 +13166,23 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:627
 msgid "only one config file at a time"
 msgstr "solo un archivo de configuraciรณn a la vez"
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr "--local solo puedo ser usado dentro de un repositorio"
 
-#: builtin/config.c:619
+#: builtin/config.c:635
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob solo puede ser usado dentro de un repositorio"
 
-#: builtin/config.c:638
+#: builtin/config.c:655
 msgid "$HOME not set"
 msgstr "$HOME no estรก configurado"
 
-#: builtin/config.c:658
+#: builtin/config.c:679
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12204,52 +13194,52 @@ msgstr ""
 "\"\n"
 "en \"git help worktree\" para mรกs detalles"
 
-#: builtin/config.c:688
+#: builtin/config.c:714
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color y tipo de variable incoherente"
 
-#: builtin/config.c:693
+#: builtin/config.c:719
 msgid "only one action at a time"
 msgstr "solo una acciรณn a la vez"
 
-#: builtin/config.c:706
+#: builtin/config.c:732
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only solo es aplicable para --list o --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:738
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:744
 msgid "--default is only applicable to --get"
 msgstr "--default solo es aplicable para --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:757
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "no se puede leer el archivo de configuraciรณn '%s'"
 
-#: builtin/config.c:734
+#: builtin/config.c:760
 msgid "error processing config file(s)"
 msgstr "error al procesar archivo(s) de configuraciรณn"
 
-#: builtin/config.c:744
+#: builtin/config.c:770
 msgid "editing stdin is not supported"
 msgstr "editar stdin no estรก soportado"
 
-#: builtin/config.c:746
+#: builtin/config.c:772
 msgid "editing blobs is not supported"
 msgstr "editar blobs no estรก soportado"
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "no se puede crear el archivo de configuraciรณn %s"
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12258,7 +13248,7 @@ msgstr ""
 "no se puede sobrescribir mรบltiples valores con un รบnico valor\n"
 "\tUse una regexp, --add o --replace-all para cambiar %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
 #, c-format
 msgid "no such section: %s"
 msgstr "no existe la secciรณn: %s"
@@ -12271,57 +13261,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "mostrar tamaรฑos en formato legible para humano"
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opciones>] [<commit-ish>...]"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opciones>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr "head"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr "ligero"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr "anotado"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "tag anotado %s no disponible"
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "tag anotado %s no tiene nombre embebido"
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "tag '%s' es realmente '%s' aquรญ"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "no hay tag que concuerde exactamente con '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:394
 #, c-format
 msgid "finished search at %s\n"
 msgstr "bรบsqueda finalizada a las %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:421
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12330,7 +13320,7 @@ msgstr ""
 "No hay tags anotados que puedan describir '%s'.\n"
 "Sin embargo, hubieron tags no anotados: intente --tags."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:425
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12339,12 +13329,12 @@ msgstr ""
 "Ningรบn tag puede describit '%s'.\n"
 "Intente --always, o cree algunos tags."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:455
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits cruzados\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:458
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12353,90 +13343,90 @@ msgstr ""
 "se encontrรณ mรกs de %i tags; se mostrรณ %i mรกs reciente\n"
 "fin de la bรบsqueda en %s\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:526
 #, c-format
 msgid "describe %s\n"
 msgstr "describe %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:529
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Nombre de objeto %s no vรกlido"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:537
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s no es un commit ni un blob"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:551
 msgid "find the tag that comes after the commit"
 msgstr "encontrar el tag que viene despuรฉs del commit"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:552
 msgid "debug search strategy on stderr"
 msgstr "hacer debug a la estrategia de bรบsqueda en stderr"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:553
 msgid "use any ref"
 msgstr "use cualquier ref"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:554
 msgid "use any tag, even unannotated"
 msgstr "use cualquier tag, incluso los no anotados"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:555
 msgid "always use long format"
 msgstr "siempre usar formato largo"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:556
 msgid "only follow first parent"
 msgstr "solo seguir el primer patrรณn"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:559
 msgid "only output exact matches"
 msgstr "solo mostrar concordancias exactas"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:561
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considerar <n> tags mรกs recientes (default:10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:563
 msgid "only consider tags matching <pattern>"
 msgstr "solo considerar tags que concuerden con <patrรณn>"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:565
 msgid "do not consider tags matching <pattern>"
 msgstr "no considerar tags que concuerden con <patrรณn>"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:567 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "mostrar el objeto commit abreviado como fallback"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:568 builtin/describe.c:571
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:569
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "adjuntar <marca> en el รกrbol de trabajo sucio (default: \"-dirty\")"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:572
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "adjuntar <marca> en un รกrbol de trabajo roto (default: \"-broken\")"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:590
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long es incompatible con --abbrev=0"
 
-#: builtin/describe.c:603
+#: builtin/describe.c:619
 msgid "No names found, cannot describe anything."
 msgstr "No se encontraron nombres, no se puede describir nada."
 
-#: builtin/describe.c:654
+#: builtin/describe.c:670
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty es incompatible con commit-ismos"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:672
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken es incompatible con commit-ismos"
 
@@ -12473,27 +13463,27 @@ msgstr "objeto no manejado '%s' entregado."
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "fallรณ: %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no se pudo leer el symlink %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "no se pudo leer el archivo symlink %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "no se pudo leer el objeto %s para el symlink %s"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -12501,54 +13491,54 @@ msgstr ""
 "formatos combinados de diff ('-c' y '--cc') no soportados en\n"
 "modo diff para directorio('-d' y '--dir-diff')."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ambos archivos modificados: '%s' y '%s'."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr "archivo del รกrbol de trabajo ha sido dejado."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "archivo temporal existe en '%s'."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr "tal vez desees limpiar o recuperar estos."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "use `diff.guitool` en lugar de `diff.tool`"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr "realizar un diff de todo el directorio"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr "no mostrar antes de lanzar una herramienta de diff"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "usar enlaces simbรณlicos en modo dir-diff"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr "herramienta"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "usar la herramienta de diff especificada"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12556,31 +13546,31 @@ msgstr ""
 "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
 "cรณdigo de salida distinto de cero"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "especificar un comando personalizado para ver diffs"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr "pasado a `diff`"
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool requiere un รกrbol de trabajo o --no-index"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dirty-diff es incompatible con --no-index"
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no se ha entregado <comando> para --extcmd=<comando>"
 
@@ -12617,158 +13607,184 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+"Error: No se puede exportar los tags anidados a menos que --mark-tags sea "
+"especificado."
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr "mostrar progreso despuรฉs de <n> objetos"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr "seleccionar el manejo de tags firmados"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente"
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
 msgstr "Volcar marcas a este archivo"
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
 msgstr "Importar marcas de este archivo"
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "Importar marcas de este archivo si existe"
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr "Falsificar un tagger cuando les falta uno"
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr "Mostrar todo el รกrbol para cada commit"
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr "Use el feature done para terminar el stream"
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr "Saltar el output de data blob"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr "refspec"
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr "Aplicar refspec para los refs exportados"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr "anonimizar la salida"
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 "Padres de la referencia que no estan en fast-export stream por id de objeto"
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
 msgstr "Mostrar ids de objetos originales para blobs/commits"
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "Marcar tags con ids de mark"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists"
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opciones>] <grupo>"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel no puede ser negativo"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
 msgid "fetch from all remotes"
 msgstr "extraer de todos los remotos"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "configurar upstream para git pulll/fetch"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:190
 msgid "path to upload pack on remote end"
 msgstr "ruta para cargar el paquete al final del remoto"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr "forzar sobrescritura de referencia local"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr "extraer de mรบltiples remotos"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:194
 msgid "fetch all tags and associated objects"
 msgstr "extraer todos los tags y objetos asociados"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no extraer todos los tags (--no-tags)"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr "nรบmero de submรณdulos extraรญdos en paralelo"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:197
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "limpiar ramas remotas rastreadas que ya no estรกn en el remoto"
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "limpiar tags locales que no se encuentran en el remoto y eliminar tags "
 "cambiados"
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
 msgid "on-demand"
 msgstr "en demanda"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr "controlar extracciรณn recursiva de submรณdulos"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:205
 msgid "keep downloaded pack"
 msgstr "mantener el paquete descargado"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr "permitir actualizar la ref HEAD"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
 msgid "deepen history of shallow clone"
 msgstr "historia profunda de un clon superficial"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr "historia profunda de un repositorio superficial basado en tiempo"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:211
 msgid "convert to a complete repository"
 msgstr "convertir a un repositorio completo"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr "anteponer esto a salida de la ruta del submรณdulo"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -12776,90 +13792,94 @@ msgstr ""
 "default para extracciรณn recursiva de submรณdulos (menor prioridad que "
 "archivos de configuraciรณn)"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:214
 msgid "accept refs that update .git/shallow"
 msgstr "aceptar refs que actualicen .git/shallow"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:216
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:217
 msgid "specify fetch refmap"
 msgstr "especificar extracciรณn de refmap"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 msgid "run 'gc --auto' after fetching"
 msgstr "ejecutar 'gc --auto' tras el fetch"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:226
 msgid "check for forced-updates on all updated branches"
 msgstr "verificar updates forzados en todos los branch actualizados"
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "escribir commit-graph luego del fetch"
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr "No se puedo encontrar ref remota HEAD"
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "la configuraciรณn fetch.output contiene el valor invรกlido %s"
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr "objeto %s no encontrado"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr "[actualizado]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr "[rechazado]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr "no se puede traer en la rama actual"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr "[actualizaciรณn de tag]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr "no se posible actualizar el ref local"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr "podrรญa golpear tag existente"
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr "[nuevo tag]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr "[nueva rama]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr "[nueva referencia]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr "actualizaciรณn forzada"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr "avance lento"
 
-#: builtin/fetch.c:854
+#: builtin/fetch.c:877
 msgid ""
 "Fetch normally indicates which branches had a forced update,\n"
 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -12870,7 +13890,7 @@ msgstr ""
 "show-forced-updates'\n"
 "o ejecute 'git config fetch.showForcedUpdates true'."
 
-#: builtin/fetch.c:858
+#: builtin/fetch.c:881
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -12883,22 +13903,22 @@ msgstr ""
 "false'\n"
 "para evitar esta validaciรณn.\n"
 
-#: builtin/fetch.c:888
+#: builtin/fetch.c:920
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no enviรณ todos los objetos necesarios\n"
 
-#: builtin/fetch.c:909
+#: builtin/fetch.c:941
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "rechazado %s porque raรญces superficiales no pueden ser actualizadas"
 
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1037
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -12907,58 +13927,79 @@ msgstr ""
 "algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
 " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
 
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1134
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s se pondrรก colgado)"
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1135
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s se ha colgado)"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1167
 msgid "[deleted]"
 msgstr "[eliminado]"
 
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1168 builtin/remote.c:1112
 msgid "(none)"
 msgstr "(nada)"
 
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1191
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacรญo"
 
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1210
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Opciรณn \"%s\" valor \"%s\" no es vรกlido para %s"
 
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1213
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Opciรณn \"%s\" es ignorada por %s\n"
 
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "mรบltiples ramas detectadas, incompatible con --set-upstream"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "no configurar upstream para una rama de rastreo remoto"
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "no configurar upstream para un tag remoto"
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "tipo de branch desconocido"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"no se encontrรณ rama fuente.\n"
+"tienes que especificar exactamente una rama con la opciรณn --set-upstream."
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No se pudo extraer %s"
 
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr ""
-"--filter solo puede ser usado con el remoto configurado en extensions."
-"partialClone"
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "no se pudo hacer fetch a '%s' (cรณdigo de salida: %d)\n"
 
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1693
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -12966,44 +14007,44 @@ msgstr ""
 "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
 "nombre remoto del cual las nuevas revisiones deben ser extraรญdas."
 
-#: builtin/fetch.c:1593
+#: builtin/fetch.c:1730
 msgid "You need to specify a tag name."
 msgstr "Tienes que especificar un nombre de tag."
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1780
 msgid "Negative depth in --deepen is not supported"
 msgstr "Profundidad negativa en --deepen no soportada"
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1782
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen y --depth son mutuamente exclusivas"
 
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1787
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth y --unshallow no pueden ser usadas juntas"
 
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1789
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow no tiene sentido en un repositorio completo"
 
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1805
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no toma un argumento de repositorio"
 
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1807
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no tiene sentido con refspecs"
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1816
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No existe el remoto o grupo remoto: %s"
 
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1823
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
 
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1841
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -13017,23 +14058,23 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:671
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "poblar el log con mรกximo <n> entradas del shorlog"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:674
 msgid "alias for --log (deprecated)"
 msgstr "alias para --log (deprecado)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:677
 msgid "text"
 msgstr "texto"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:678
 msgid "use <text> as start of message"
 msgstr "use <text> como comienzo de mensaje"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:679
 msgid "file to read from"
 msgstr "archivo del cual leer"
 
@@ -13097,32 +14138,32 @@ msgstr "mostrar solo refs que contienen el commit"
 msgid "print only refs which don't contain the commit"
 msgstr "mostrar solo refs que no contienen el commit"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr "desconocido"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "error en %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "peligro en %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "link roto de %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr "tipo de objeto equivocado en link"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13131,216 +14172,216 @@ msgstr ""
 "link roto de %7s %s\n"
 "              a %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr "faltan %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr "inalcanzable %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, c-format
 msgid "dangling %s %s"
 msgstr "actualizando %s %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 msgid "could not create lost-found"
 msgstr "no se pudo crear lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr "no se pudo finalizar '%s'"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr "Revisando %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Verificando conectividad (%d objetos)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr "Revisando %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr "links rotos"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr "raรญz %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "tag %s %s (%s) en %s"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objecto corrupto o faltante"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: referencia invรกlida %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Revisando reflog %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: puntero sha1 invรกlido %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: no es un commit"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr "aviso: No hay referencias por defecto"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objeto corrupto o no encontrado: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: no se puede analizar objeto: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "mal sha1 de archivo: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr "Revisando directorio de objetos"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr "Revisando link %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr "%s invรกlido"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s apunta a algo extraรฑo (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: HEAD desacoplado apunta a nada"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "aviso: %s apunta a un branch no nacido (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr "Revisando el cache tree"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: puntero invรกlido sha1 en cache-tree"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr "non-tree en cache-tree"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr "mostrar objetos ilegibles"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr "mostrar objetos colgados"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr "reportar tags"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr "reportar nodos raรญz"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr "hacer objetos รญndices cabezas de nodos"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr "hacer reflogs cabeza de nodos (default)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
 msgstr "tambiรฉn considerar paquetes y objetos alternos"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr "habilitar revisiรณn mรกs estricta"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr "escribir objetos colgados en .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr "mostrar progreso"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr "mostrar nombres verboso para objetos alcanzables"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "Revisando objetos"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objeto faltante"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "parรกmetro invรกlido: sha1 esperado, se obtuvo '%s'"
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr "git gc [<opciones>]"
 
@@ -13354,17 +14395,17 @@ msgstr "Fallรณ el fstat %s: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "fallรณ al analizar '%s' valor '%s'"
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "no se pudo definir '%s'"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr "no se puede leer '%s'"
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13374,59 +14415,59 @@ msgid ""
 "%s"
 msgstr ""
 "El รบltimo gc reportรณ lo siguiente. Por favor corrige la causa\n"
-"y remueva %s.\n"
+"y elimine %s.\n"
 "Limpieza automรกtica no se realizarรก hasta que el archivo sea eliminado.\n"
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr "limpiar objetos no referenciados"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr "ser mรกs exhaustivo (aumentar runtime)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr "habilitar modo auto-gc"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr "forzar la ejecuciรณn de gc incluso si puede haber otro gc ejecutรกndose"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr "reempaquetar todos los otros paquetes excepto el paquete mรกs grande"
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "fallรณ al analizar valor %s de gc.logexpirity"
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "fallรณ al analizar valor %s de prune expiry"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Auto empaquetado del repositorio en segundo plano para un performance "
 "รณptimo.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Auto empaquetado del repositorio para performance รณptimo.\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vea \"git help gc\" para limpieza manual.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13434,14 +14475,14 @@ msgstr ""
 "gc ya estรก ejecutรกndose en la mรกquina '%s' pid %<PRIuMAX> (use --force so no "
 "es asรญ)"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
 "eliminarlos."
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opciones>] [-e] <patrรณn> [<rev>...] [[--] <ruta>...]"
 
@@ -13459,262 +14500,262 @@ msgstr "nรบmero invรกlido de hilos especificado (%d) para %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hay soporte para hilos, ignorando %s"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no es posible leer el  รกrbol (%s)"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:633
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es posible realizar grep del objeto de tipo %s"
 
-#: builtin/grep.c:714
+#: builtin/grep.c:704
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "switch `%c' espera un valor numรฉrico"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:803
 msgid "search in index instead of in the work tree"
 msgstr "buscar en el รญndice en lugar del รกrbol de trabajo"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:805
 msgid "find in contents not managed by git"
 msgstr "encontrar en contenidos no manejados por git"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:807
 msgid "search in both tracked and untracked files"
 msgstr "buscar en archivos rastreados y no rastreados"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:809
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorar archivos especificados via '.gitignore'"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:811
 msgid "recursively search in each submodule"
 msgstr "bรบsqueda recursiva en cada submรณdulo"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:814
 msgid "show non-matching lines"
 msgstr "mostrar lรญneas que no concuerdan"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:816
 msgid "case insensitive matching"
 msgstr "bรบsqueda insensible a mayรบsculas"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:818
 msgid "match patterns only at word boundaries"
 msgstr "concordar patrรณn solo a los lรญmites de las palabras"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:820
 msgid "process binary files as text"
 msgstr "procesar archivos binarios como texto"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:822
 msgid "don't match patterns in binary files"
 msgstr "no concordar patrones en archivos binarios"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:825
 msgid "process binary files with textconv filters"
 msgstr "procesar archivos binarios con filtros textconv"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:827
 msgid "search in subdirectories (default)"
 msgstr "buscar en subdirectorios (default)"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:829
 msgid "descend at most <depth> levels"
 msgstr "descender como mรกximo <valor-de-profundiad>  niveles"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:833
 msgid "use extended POSIX regular expressions"
 msgstr "usar expresiones regulares POSIX extendidas"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:836
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usar expresiones regulares POSIX (default)"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:839
 msgid "interpret patterns as fixed strings"
 msgstr "interpretar patrones como strings arreglados"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:842
 msgid "use Perl-compatible regular expressions"
 msgstr "usar expresiones regulares compatibles con Perl"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:845
 msgid "show line numbers"
 msgstr "mostrar nรบmeros de lรญnea"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:846
 msgid "show column number of first match"
 msgstr "mostrar el nรบmero de columna de la primer coincidencia"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:847
 msgid "don't show filenames"
 msgstr "no mostrar nombres de archivo"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:848
 msgid "show filenames"
 msgstr "mostrar nombres de archivo"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:850
 msgid "show filenames relative to top directory"
 msgstr "mostrar nombres de archivo relativos al directorio superior"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:852
 msgid "show only filenames instead of matching lines"
 msgstr "mostrar solo nombres de archivos en lugar de lรญneas encontradas"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:854
 msgid "synonym for --files-with-matches"
 msgstr "sinรณnimo para --files-with-matches"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:857
 msgid "show only the names of files without match"
 msgstr "mostrar solo los nombres de archivos sin coincidencias"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:859
 msgid "print NUL after filenames"
 msgstr "imprimir NUL despuรฉs del nombre de archivo"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:862
 msgid "show only matching parts of a line"
 msgstr "mostrar solo partes que concuerdan de una lรญnea"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:864
 msgid "show the number of matches instead of matching lines"
 msgstr "mostrar el nรบmero de concordancias en lugar de las lรญneas concordantes"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:865
 msgid "highlight matches"
 msgstr "resaltar concordancias"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:867
 msgid "print empty line between matches from different files"
 msgstr "imprimir una lรญnea vacรญa entre coincidencias de diferentes archivos"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:869
 msgid "show filename only once above matches from same file"
 msgstr ""
 "mostrar el nombre de archivo solo una vez para concordancias en el mismo "
 "archivo"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:872
 msgid "show <n> context lines before and after matches"
 msgstr "mostrar <n> lรญneas de contexto antes y despuรฉs de la concordancia"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:875
 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> lรญneas de contexto antes de las concordancias"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:877
 msgid "show <n> context lines after matches"
 msgstr "mostrar <n> lรญneas de context despuรฉs de las concordancias"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:879
 msgid "use <n> worker threads"
 msgstr "usar <n> hilos de trabajo"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:880
 msgid "shortcut for -C NUM"
 msgstr "atajo para -C NUM"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:883
 msgid "show a line with the function name before matches"
 msgstr ""
 "mostrar una lรญnea con el nombre de la funciรณn antes de las concordancias"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:885
 msgid "show the surrounding function"
 msgstr "mostrar la funciรณn circundante"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:888
 msgid "read patterns from file"
 msgstr "leer patrones del archivo"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:890
 msgid "match <pattern>"
 msgstr "concordar <patrรณn>"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:892
 msgid "combine patterns specified with -e"
 msgstr "combinar patrones especificados con -e"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:904
 msgid "indicate hit with exit status without output"
 msgstr "indicar concordancia con exit status sin output"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:906
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "mostrar solo concordancias con archivos que concuerdan todos los patrones"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:908
 msgid "show parse tree for grep expression"
 msgstr "mostrar รกrbol analizado para la expresiรณn grep"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "show matching files in the pager"
 msgstr "mostrar archivos concordantes en el paginador"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:916
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:983
 msgid "no pattern given"
 msgstr "no se ha entregado patrรณn"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1019
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no se puede usar con revs"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1027
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no se posible resolver revisiรณn: %s"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked no es soportada con --recurse-submodules"
+
+#: builtin/grep.c:1061
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinaciรณn de opciones invรกlida, ignorando --threads"
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
 msgid "no threads support, ignoring --threads"
 msgstr "no se soportan hilos, ignorando --threads"
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "nรบmero invรกlido de hilos especificado (%d)"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1101
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager solo funciona en el รกrbol de trabajo"
 
-#: builtin/grep.c:1117
-msgid "option not supported with --recurse-submodules"
-msgstr "opciรณn no soportada con --recurse-submodules"
-
-#: builtin/grep.c:1123
+#: builtin/grep.c:1127
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached o --untracked no pueden ser usadas con --no-index"
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1133
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1141
 msgid "both --cached and trees are given"
 msgstr "--cached y รกrboles han sido entregados"
 
@@ -13900,11 +14941,11 @@ msgstr "leer error en input"
 msgid "used more bytes than were available"
 msgstr "se usaron mรกs bytes de los disponibles"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
 msgid "pack too large for current definition of off_t"
 msgstr "paquete muy grande para la definiciรณn actual de off_t"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "paquete excede el mรกximo tamaรฑo permitido"
 
@@ -13960,191 +15001,191 @@ msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
 msgid "serious inflate inconsistency"
 msgstr "inconsistencia seria en inflate"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
-msgstr "COLISIร“N DE TIPO SHA1 ENCONTRADA CON %s !"
+msgstr "ยกCOLISIร“N DE TIPO SHA1 ENCONTRADA CON %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
 #, c-format
 msgid "unable to read %s"
 msgstr "no se posible leer %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no se puede leer la informaciรณn existente del objeto %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no se puede leer el objeto existente %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objeto blob %s invรกlido"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
 msgid "fsck error in packed object"
 msgstr "error de fsck en el objeto empaquetado"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "No todos los objetos hijos de %s son alcanzables"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr "fallรณ al aplicar delta"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr "Recibiendo objetos"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr "Indexando objetos"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paquete estรก corrompido (SHA1 no concuerda)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr "no se puede fstat al archivo de paquete"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr "el paquete tiene basura al final"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusiรณn mรกs allรก de la locura en parse_pack_objects()"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no es posible crear hilo: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr "confusiรณn mรกs allรก de la locura"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "completado con %d objeto local"
 msgstr[1] "completado con %d objetos locales"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "Tail checksum para %s inesperada (corrupciรณn de disco?)"
+msgstr "Tail checksum para %s inesperada (ยฟcorrupciรณn de disco?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "paquete tiene %d delta sin resolver"
 msgstr[1] "paquete tiene %d deltas sin resolver"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no es posible desinflar el objeto adjunto (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "objeto local %s estรก corrompido"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "no se puede escribir %s en el archivo '%s'"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "no se puede cerrar escrito %s en archivo '%s'"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
 msgid "error while closing pack file"
 msgstr "error mientras se cierra el archivo paquete"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
 msgid "cannot store pack file"
 msgstr "no se puede guardar el archivo paquete"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
 msgid "cannot store index file"
 msgstr "no se puede guardar el archivo รญndice"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mal pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No se puede abrir el archivo paquete existente '%s'"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "No se puede abrir el รญndice del archivo paquete para '%s'"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "no delta: %d objeto"
 msgstr[1] "no delta: %d objetos"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "largo de cadena = %d: %lu objeto"
 msgstr[1] "largo de cadena = %d: %lu objetos"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
 msgid "Cannot come back to cwd"
 msgstr "No se puede regresar a cwd"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
 #, c-format
 msgid "bad %s"
 msgstr "mal %s"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin no puede ser usada sin --stdin"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiere un repositorio git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
 msgid "--verify with no packfile name given"
 msgstr "--verify no recibiรณ ningรบn nombre de archivo de paquete"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "error de fsck en objetos paquete"
 
@@ -14328,121 +15369,126 @@ msgstr "--trailer con --only-input no tiene sentido"
 msgid "no input file given for in-place editing"
 msgstr "no se entregรณ archivo de entrada para ediciรณn en lugar"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opciones>] [<rango-de-revisiรณn>] [[--] <ruta>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opciones>] <objeto>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opciรณn --decorate invรกlida: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:174
 msgid "show source"
 msgstr "mostrar fuente"
 
-#: builtin/log.c:174
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr "Usar archivo de mapa de mail"
 
-#: builtin/log.c:176
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr "solo decorar refs que concuerden con <patrรณn>"
 
-#: builtin/log.c:178
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr "no decorar refs que concuerden con <patrรณn>"
 
-#: builtin/log.c:179
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr "opciones de decorado"
 
-#: builtin/log.c:182
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Procesar rango de lรญneas n,m en archivo, contando desde 1"
 
-#: builtin/log.c:280
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Salida final: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: mal archivo"
 
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:550 builtin/log.c:645
 #, c-format
 msgid "could not read object %s"
 msgstr "no se pudo leer objeto %s"
 
-#: builtin/log.c:668
+#: builtin/log.c:670
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipo desconocido: %d"
 
-#: builtin/log.c:791
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: modo cover from description invรกlido"
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr "formate.headers. sin valor"
 
-#: builtin/log.c:908
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr "nombre del directorio de salida es muy largo"
 
-#: builtin/log.c:924
+#: builtin/log.c:952
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "no se puede abrir archivo patch %s"
 
-#: builtin/log.c:941
+#: builtin/log.c:969
 msgid "need exactly one range"
 msgstr "necesita exactamente un rango"
 
-#: builtin/log.c:951
+#: builtin/log.c:979
 msgid "not a range"
 msgstr "no es un rango"
 
-#: builtin/log.c:1074
+#: builtin/log.c:1143
 msgid "cover letter needs email format"
 msgstr "letras de portada necesita formato email"
 
-#: builtin/log.c:1080
+#: builtin/log.c:1149
 msgid "failed to create cover-letter file"
 msgstr "fallรณ al crear los archivos cover-letter"
 
-#: builtin/log.c:1159
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "insano in-reply-to: %s"
 
-#: builtin/log.c:1186
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1313
 msgid "two output directories?"
-msgstr "dos directorios de salida?"
+msgstr "ยฟdos directorios de salida?"
 
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, c-format
 msgid "unknown commit %s"
 msgstr "commit desconocido %s"
 
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "fallรณ al resolver '%s' como ref vรกlida"
 
-#: builtin/log.c:1370
+#: builtin/log.c:1439
 msgid "could not find exact merge base"
 msgstr "no se pudo encontrar una base de fusiรณn exacta"
 
-#: builtin/log.c:1374
+#: builtin/log.c:1443
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -14454,271 +15500,281 @@ msgstr ""
 "O puedes especificar un commit base mediante --base=<id-commit-base> "
 "manualmente"
 
-#: builtin/log.c:1394
+#: builtin/log.c:1463
 msgid "failed to find exact merge base"
 msgstr "fallรณ al encontrar una base de fusiรณn exacta"
 
-#: builtin/log.c:1405
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr "el commit base debe ser el ancestro de la lista de revisiรณn"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr "el commit base no debe estar en la lista de revisiรณn"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr "no se puede obtener id de patch"
 
-#: builtin/log.c:1514
+#: builtin/log.c:1583
 msgid "failed to infer range-diff ranges"
 msgstr "fallรณ al inferir rangos range-diff"
 
-#: builtin/log.c:1559
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "use [PATCH n/m] incluso con un รบnico parche"
 
-#: builtin/log.c:1562
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr "use [PATCH] incluso con mรบltiples parches"
 
-#: builtin/log.c:1566
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr "mostrar parches en standard out"
 
-#: builtin/log.c:1568
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr "generar letra de cover"
 
-#: builtin/log.c:1570
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr ""
 "usar una secuencia simple de nรบmeros para salida de nombres de archivos"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr "use <sfx> en lugar de '.patch'"
 
-#: builtin/log.c:1574
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr "marcar las series como Nth re-roll"
 
-#: builtin/log.c:1578
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Use [RFC PATCH] en lugar de [PATCH]"
 
-#: builtin/log.c:1581
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "modo-cover-from-description"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"genera partes de una carta de presentaciรณn basado en la descripciรณn de la "
+"rama"
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Use [<prefijo>] en lugar de [PATCH]"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr "guardar archivos resultantes en <dir>"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr "no cortar/agregar [PATCH]"
 
-#: builtin/log.c:1590
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr "no mostrar diffs binarios"
 
-#: builtin/log.c:1592
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr "salida como hash de todos-ceros en la cabecera From"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr "no incluya un parche que coincida con un commit en upstream"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr "mostrar formato de parche en lugar del default (parche + stat)"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr "Mensajeando"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1672
 msgid "header"
 msgstr "cabezal"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr "agregar cabecera email"
 
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr "email"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr "agregar cabecera To:"
 
-#: builtin/log.c:1603
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr "agregar cabecera Cc:"
 
-#: builtin/log.c:1605
+#: builtin/log.c:1678
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "configurar direcciรณn From a <ident> ( o identidad de committer si estรก "
 "ausente)"
 
-#: builtin/log.c:1608
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr "id de mensaje"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr "hacer primer mail una respuesta a <id de mensaje>"
 
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr "lรญmite"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr "adjuntar el parche"
 
-#: builtin/log.c:1614
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr "poner el parche en lรญnea"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1693
 msgid "signature"
 msgstr "firma"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr "agregar una firma"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr "commit-base"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 "agregar informaciรณn de รกrbol de requisitos previos a la serie de parches"
 
-#: builtin/log.c:1625
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr "agregar una firma de un archivo"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr "no mostrar los nombres de archivos de los parches"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr "mostrar medidor de progreso mientras se generan los parches"
 
-#: builtin/log.c:1630
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "muestra cambios contra <rev> en cover letter o en un solo parche"
 
-#: builtin/log.c:1633
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr "porcentaje por el cual la creaciรณn es pesada"
 
-#: builtin/log.c:1710
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "lรญnea de identificaciรณn invรกlida: %s"
 
-#: builtin/log.c:1725
+#: builtin/log.c:1807
 msgid "-n and -k are mutually exclusive"
 msgstr "-n y -k son mutuamente exclusivas"
 
-#: builtin/log.c:1727
+#: builtin/log.c:1809
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"
 
-#: builtin/log.c:1735
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr "--name-only no tiene sentido"
 
-#: builtin/log.c:1737
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr "--name-status no tiene sentido"
 
-#: builtin/log.c:1739
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr "--check no tiene sentido"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
-msgstr "salida standard, o directorio, cual?"
+msgstr "ยฟsalida standard, o directorio, cual?"
 
-#: builtin/log.c:1860
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiere --cover-letter o un parche รบnico"
 
-#: builtin/log.c:1864
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1865
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contra v%d:"
 
-#: builtin/log.c:1871
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor requiere --range-diff"
 
-#: builtin/log.c:1875
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requiere --cover-letter o parche รบnico"
 
-#: builtin/log.c:1883
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:1884
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff contra v%d:"
 
-#: builtin/log.c:1895
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no se puede leer la firma del archivo '%s'"
 
-#: builtin/log.c:1931
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr "Generando parches"
 
-#: builtin/log.c:1975
+#: builtin/log.c:2073
 msgid "failed to create output files"
 msgstr "fallรณ al crear los archivos de salida"
 
-#: builtin/log.c:2034
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<upstream> [<head> [<lรญmite>]]]"
 
-#: builtin/log.c:2088
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -14848,7 +15904,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "no mostrar el URL remoto"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
 msgid "exec"
 msgstr "ejecutar"
 
@@ -14934,150 +15990,150 @@ msgstr "git merge --abort"
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:119
 msgid "switch `m' requires a value"
 msgstr "cambiar `m' requiere un valor"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "opciรณn `%s' requiere un valor"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:188
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "No se pudo encontrar estrategia de fusiรณn '%s'.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:189
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:194
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estrategias personalizadas disponibles son:"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:245 builtin/pull.c:132
 msgid "do not show a diffstat at the end of the merge"
 msgstr "no mostrar un diffstat al final de la fusiรณn"
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:248 builtin/pull.c:135
 msgid "show a diffstat at the end of the merge"
 msgstr "mostrar un diffstat al final de la fusiรณn"
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:249 builtin/pull.c:138
 msgid "(synonym to --stat)"
 msgstr "(sinรณnimo para --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:251 builtin/pull.c:141
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "agregar (como mรกximo <n>) entradas del shortlog al mensaje del commit de "
 "fusiรณn"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:254 builtin/pull.c:147
 msgid "create a single commit instead of doing a merge"
 msgstr "crear un commit รบnico en lugar de hacer una fusiรณn"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:256 builtin/pull.c:150
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realizar un commit si la fusiรณn es exitosa (default)"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:258 builtin/pull.c:153
 msgid "edit message before committing"
 msgstr "editar mensaje antes de realizar commit"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:260
 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:262 builtin/pull.c:160
 msgid "abort if fast-forward is not possible"
 msgstr "abortar si fast-forward no es posible"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:266 builtin/pull.c:163
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verificar que el commit nombrado tiene una firma GPG vรกlida"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
 msgid "strategy"
 msgstr "estrategia"
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:268 builtin/pull.c:168
 msgid "merge strategy to use"
 msgstr "estrategia de fusiรณn para usar"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:171
 msgid "option=value"
 msgstr "opciรณn=valor"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option for selected merge strategy"
 msgstr "opciรณn para la estrategia de fusiรณn seleccionada"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "fusionar mensaje de commit (para una fusiรณn no fast-forward)"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr "abortar la fusiรณn en progreso actual"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort pero deja el รญndice y el รกrbol de trabajo solos"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr "continuar la fusiรณn en progreso actual"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:285 builtin/pull.c:179
 msgid "allow merging unrelated histories"
 msgstr "permitir fusionar historias no relacionadas"
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "verificar el hook commit-msg"
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:308
 msgid "could not run stash."
 msgstr "no se pudo ejecutar stash."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:313
 msgid "stash failed"
 msgstr "stash fallรณ"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:318
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no es un objeto vรกlido: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
 msgid "read-tree failed"
 msgstr "lectura de รกrbol fallรณ"
 
-#: builtin/merge.c:386
+#: builtin/merge.c:387
 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:398
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Commit de squash -- no actualizando HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:448
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "No hay mensaje de fusiรณn -- no actualizando HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:499
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' no apunta a ningรบn commit"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:586
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mal string branch.%s.mergeoptions: %s"
@@ -15133,74 +16189,74 @@ msgstr ""
 "Lรญneas comenzando con '%c' serรกn ignoradas, y un mensaje vacรญo aborta\n"
 " el commit.\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:865
 msgid "Empty commit message."
 msgstr "Mensaje de commit vacรญo."
 
-#: builtin/merge.c:872
+#: builtin/merge.c:880
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:941
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Fusiรณn automรกtica fallรณ; arregle los conflictos y luego realice un commit "
 "con el resultado.\n"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:980
 msgid "No current branch."
 msgstr "No rama actual."
 
-#: builtin/merge.c:974
+#: builtin/merge.c:982
 msgid "No remote for the current branch."
 msgstr "No hay remoto para la rama actual."
 
-#: builtin/merge.c:976
+#: builtin/merge.c:984
 msgid "No default upstream defined for the current branch."
 msgstr "Por defecto, no hay un upstream  definido para la rama actual."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:989
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "No hay rama de rastreo remoto para %s de %s"
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1046
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor errรณneo '%s' en el entorno '%s'"
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1149
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nada que podamos fusionar en %s: %s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1183
 msgid "not something we can merge"
 msgstr "nada que podamos fusionar"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1286
 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1290
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hay una fusiรณn para abortar (falta MERGE_HEAD)"
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1299
 msgid "--quit expects no arguments"
 msgstr "--quit no espera argumentos"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1312
 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1316
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hay fusiรณn en progreso (falta MERGE_HEAD)."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1332
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15208,7 +16264,7 @@ msgstr ""
 "No has concluido la fusiรณn (existe MERGE_HEAD).\n"
 "Por favor, realiza un commit con los cambios antes de fusionar."
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1339
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15216,97 +16272,97 @@ msgstr ""
 "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
 "Por favor, realiza un commit con los cambios antes de fusionar."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1342
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1356
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No se puede combinar --squash con --no-ff."
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1358
 msgid "You cannot combine --squash with --commit."
 msgstr "No se puede combinar --squash con --commit."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1374
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "No hay commit especificado y merge.defaultToUpstream no estรก configurado."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1391
 msgid "Squash commit into empty head not supported yet"
 msgstr "Commit aplastado dentro de un head vacรญo no es soportado todavรญa"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1393
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Commit no fast-forward no tiene sentido dentro de un head vacรญo"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1398
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nada que podamos fusionar"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1400
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Solo se puede fusionar exactamente un commit en un head vacรญo"
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1481
 msgid "refusing to merge unrelated histories"
 msgstr "rehusando fusionar historias no relacionadas"
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1490
 msgid "Already up to date."
 msgstr "Ya estรก actualizado."
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1500
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Actualizando %s..%s\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Intentando fusiรณn en รญndice realmente trivial...\n"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1549
 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1574
 msgid "Already up to date. Yeeah!"
 msgstr "Ya estรก actualizado. ยกOh, yeaahh!"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1580
 msgid "Not possible to fast-forward, aborting."
 msgstr "No es posible hacer fast-forward, abortando."
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1603 builtin/merge.c:1668
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rebobinando el รกrbol a original...\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1607
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Intentando estrategia de fusiรณn %s...\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1659
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ninguna estrategia de fusiรณn manejรณ la fusiรณn.\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1661
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Fusionar con estrategia %s fallรณ.\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1670
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Usando el %s para preparar resoluciรณn a mano.\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1682
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -15346,7 +16402,7 @@ msgstr "listar revs no alcanzables desde otros"
 
 #: builtin/merge-base.c:159
 msgid "is the first one ancestor of the other?"
-msgstr "es el primer ancestro del otro?"
+msgstr "ยฟes el primer ancestro del otro?"
 
 #: builtin/merge-base.c:161
 msgid "find where <commit> forked from reflog of <ref>"
@@ -15392,33 +16448,33 @@ msgstr "no advertir sobre conflictos"
 msgid "set labels for file1/orig-file/file2"
 msgstr "configurar labels para archivo1/orig-archivo/archivo2"
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "opciรณn %s desconocida"
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "no se pudo analizar el objeto '%s'"
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "no se puede manejar mรกs de %d base. Ignorando %s."
 msgstr[1] "no se puede manejar mรกs de %d bases. Ignorando %s."
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "no manejando nada distinto a fusiones de dos heads."
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "no se pudo resolver ref '%s'"
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Fusionando %s con %s\n"
@@ -15441,17 +16497,17 @@ msgstr "permitir la creaciรณn de mรกs de un รกrbol"
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<tamaรฑo>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<tamaรฑo>)"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "objeto directorio conteniendo conjuntos de pares packfile y pack-index"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15459,15 +16515,15 @@ msgstr ""
 "durante el repack, recolectar los pack-files de tamaรฑo menor en un batch que "
 "es mรกs grande que este tamaรฑo"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr "muchos argumentos"
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr "opciรณn --batch-size es solo para el subcomando 'repack'"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "subcomando desconocido: %s"
@@ -15479,7 +16535,7 @@ msgstr "git mv [<opciones>] <fuente>... <destino>"
 #: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
-msgstr "Directorio %s estรก en el รญndice y no hay submรณdulo?"
+msgstr "ยฟDirectorio %s estรก en el รญndice y no hay submรณdulo?"
 
 #: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
@@ -15561,52 +16617,52 @@ msgstr "%s, fuente=%s, destino=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Renombrando %s a %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "renombrando '%s' fallรณ"
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opciones>] <commit>..."
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opciones>] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opciones>] --stdin"
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr "imprimir sรณlo nombres (sin SHA-1)"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "sรณlo usar tags para nombrar commits"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "solo usar refs que concuerden con <patrรณn>"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignorar refs que concuerden con <patrรณn>"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "listar todos los commits alcanzables desde todas las referencias"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "leer desde stdin"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "permitir imprimir nombres `undefined` (predeterminado)"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferenciar tags en la entrada (uso interno)"
 
@@ -16006,7 +17062,7 @@ msgstr "intentar eliminar una nota no existente no es un error"
 msgid "read object names from the standard input"
 msgstr "leer nombres de objetos de standard input"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "no eliminar, solo mostrar"
 
@@ -16022,7 +17078,7 @@ msgstr "referencia-de-notas"
 msgid "use notes from <notes-ref>"
 msgstr "usar notas desde <referencia-de-notas>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1643
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"
@@ -16041,129 +17097,106 @@ msgstr ""
 "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
 "de-objetos>]"
 
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:430
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "mal paquete de objeto CRC para %s"
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:441
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objeto empaquetado corrupto para %s"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:572
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "delta recursivo encontrado para objeto %s"
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objetos ordenados, esperados %<PRIu32>"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "packfile es invรกlido: %s"
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "no es posible abrir packfile para reusar: %s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "no es posible buscar en los packfile reusados"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "no es posible leer de packfile reusado"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:972
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "deshabilitando escritura bitmap, paquetes son divididos debido a pack."
 "packSizeLimit"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:985
 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "fallรณ al iniciar %s"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1099
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
 
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1297
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "deshabilitando escritura bitmap, ya que algunos objetos no estรกn siendo "
 "empaquetados"
 
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1724
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "overflow de offset en la base de delta en paquete para %s"
 
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1733
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "outbound de offset en la base de delta para %s"
 
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:2004
 msgid "Counting objects"
 msgstr "Contando objetos"
 
-#: builtin/pack-objects.c:2005
-#, c-format
-msgid "unable to get size of %s"
-msgstr "no se pudo obtener el tamaรฑo de %s"
-
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2149
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "incapaz de analizar header del objeto %s"
 
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
 #, c-format
 msgid "object %s cannot be read"
 msgstr "objeto %s no puede ser leรญdo"
 
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2259
 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - fuera de memoria"
 
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2574
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compresiรณn delta usando hasta %d hilos"
 
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2713
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "no es posible empaquetar objetos alcanzables desde tag %s"
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2801
 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2807
 msgid "inconsistency with delta count"
 msgstr "inconsistencia con la cuenta de delta"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2888
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16172,7 +17205,7 @@ msgstr ""
 "se espseraba ID de objeto al borde, se obtuvo basura:\n"
 "%s"
 
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2894
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16181,249 +17214,237 @@ msgstr ""
 "se esperaba ID de objeto, se obtuvo basuta:\n"
 "%s"
 
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2992
 msgid "invalid value for --missing"
 msgstr "valor invรกlido para --missing"
 
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
 msgid "cannot open pack index"
 msgstr "no se puede abrir รญndice de paquetes"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:3082
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "objeto perdido en %s no pudo ser examinado"
 
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3167
 msgid "unable to force loose object"
 msgstr "incapaz de forzar un objeto perdido"
 
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3260
 #, c-format
 msgid "not a rev '%s'"
 msgstr "no es una rev '%s'"
 
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3263
 #, c-format
 msgid "bad revision '%s'"
 msgstr "mala revisiรณn '%s'"
 
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3288
 msgid "unable to add recent objects"
 msgstr "incapaz de aรฑadir objetos recientes"
 
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3341
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versiรณn de รญndice no soportada %s"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mala versiรณn del รญndice '%s'"
 
-#: builtin/pack-objects.c:3248
-msgid "do not show progress meter"
-msgstr "no mostrar medidor de progreso"
-
-#: builtin/pack-objects.c:3250
-msgid "show progress meter"
-msgstr "mostrar medidor de progreso"
-
-#: builtin/pack-objects.c:3252
-msgid "show progress meter during object writing phase"
-msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
-
-#: builtin/pack-objects.c:3255
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
-
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3383
 msgid "<version>[,<offset>]"
 msgstr "<versiรณn>[,<offset>]"
 
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3384
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "escribir el รญndice de paquete en la versiรณn de formato idx especificado"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3387
 msgid "maximum size of each output pack file"
 msgstr "tamaรฑo mรกximo de cada paquete resultante"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3389
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorar objetos prestados de otros almacenes de objetos"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3391
 msgid "ignore packed objects"
 msgstr "ignorar objetos paquete"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3393
 msgid "limit pack window by objects"
 msgstr "limitar ventana de paquete por objetos"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3395
 msgid "limit pack window by memory in addition to object limit"
 msgstr "limitar ventana de paquete por memoria en adiciรณn a lรญmite de objetos"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3397
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "longitud mรกxima de cadena delta permitida en el paquete resultante"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3399
 msgid "reuse existing deltas"
 msgstr "reusar deltas existentes"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3401
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3403
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3405
 msgid "use threads when searching for best delta matches"
 msgstr "usar hilos cuando se busque para mejores concordancias de delta"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3407
 msgid "do not create an empty pack output"
 msgstr "no crear un paquete resultante vacรญo"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3409
 msgid "read revision arguments from standard input"
 msgstr "leer argumentos de revisiรณn de standard input"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3411
 msgid "limit the objects to those that are not yet packed"
 msgstr "limitar los objetos a aquellos que no han sido empaquetados todavรญa"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3414
 msgid "include objects reachable from any reference"
 msgstr "incluir objetos alcanzables por cualquier referencia"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3417
 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referidos por entradas de reflog"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3420
 msgid "include objects referred to by the index"
 msgstr "incluir objetos referidos por el รญndice"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3423
 msgid "output pack to stdout"
 msgstr "mostrar paquete en stdout"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3425
 msgid "include tag objects that refer to objects to be packed"
 msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
 
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3427
 msgid "keep unreachable objects"
 msgstr "mantener objetos inalcanzables"
 
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3429
 msgid "pack loose unreachable objects"
 msgstr "empaquetar objetos sueltos inalcanzables"
 
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3431
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaquetar objetos inalcanzables mรกs nuevos que <tiempo>"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3434
 msgid "use the sparse reachability algorithm"
 msgstr "usar el algoritmo sparse reachability"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3436
 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3438
 msgid "create packs suitable for shallow fetches"
 msgstr "crear paquetes adecuados para fetches superficiales"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3440
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorar paquetes que tienen un archivo .keep acompaรฑante"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3442
 msgid "ignore this pack"
 msgstr "ignorar este paquete"
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3444
 msgid "pack compression level"
 msgstr "nivel de compresiรณn del paquete"
 
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3446
 msgid "do not hide commits by grafts"
 msgstr "no ocultar commits por injertos"
 
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3448
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "usar un รญndice bitmap si estรก disponible para acelerar la cuenta de objetos"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3450
 msgid "write a bitmap index together with the pack index"
 msgstr "escribir un รญndice de bitmap junto al รญndice de paquete"
 
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3454
 msgid "write a bitmap index if possible"
 msgstr "escribir un รญndice de bitmap si es posible"
 
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3458
 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3461
 msgid "do not pack objects in promisor packfiles"
 msgstr "no se puede empaquetar objetos en packfiles promisores"
 
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3463
 msgid "respect islands during delta compression"
 msgstr "respetar islas durante la compresiรณn delta"
 
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3492
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d"
 
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3497
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3551
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size no puede ser usado para construir un paquete para "
 "transferencia"
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3553
 msgid "minimum pack size limit is 1 MiB"
 msgstr "tamaรฑo mรญnimo del paquete es 1 MiB"
 
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3558
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin no puede ser usado para construir un paquete indexable"
 
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3561
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
 
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3567
 msgid "cannot use --filter without --stdout"
 msgstr "no se puede usar--filter sin --stdout"
 
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3627
 msgid "Enumerating objects"
 msgstr "Enumerando objetos"
 
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3657
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-"
+"reusado %<PRIu32>"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16465,66 +17486,66 @@ msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
 msgid "cannot prune in a precious-objects repo"
 msgstr "no se puede recortar en un repositorio de objetos-preciosos"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valor invรกlido para %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git pull [<opciones>] [<repositorio> [<especificaciรณn-de-referencia>...]]"
 
-#: builtin/pull.c:141
+#: builtin/pull.c:122
 msgid "control for recursive fetching of submodules"
 msgstr "control de fetch recursivo en submรณdulos"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:126
 msgid "Options related to merging"
 msgstr "Opciones relacionadas a fusiรณn"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:129
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar cambios por rebase en lugar de fusiรณn"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 
-#: builtin/pull.c:185
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "ejecutar automรกticamente stash/stash pop antes y despuรฉs de rebase"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:182
 msgid "Options related to fetching"
 msgstr "Opciones relacionadas a fetch"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:192
 msgid "force overwrite of local branch"
 msgstr "forzar sobrescritura de la rama local"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:200
 msgid "number of submodules pulled in parallel"
 msgstr "nรบmero de submรณdulos que realizan pull en paralelo"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:300
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor invรกlido para pull.ff: %s"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:426
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
 
-#: builtin/pull.c:435
+#: builtin/pull.c:428
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "No hay candidatos para fusionar entre las refs que has bajado con fetch."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:429
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16533,7 +17554,7 @@ msgstr ""
 "tiene\n"
 "concordancia en el final remoto."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:432
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16544,44 +17565,44 @@ msgstr ""
 "una rama. Porque este no es el remoto configurado por default\n"
 "para tu rama actual, tienes que especificar una rama en la lรญnea de comando."
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "No te encuentras actualmente en la rama."
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Por favor especifica a quรฉ rama quieres rebasar."
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Por favor especifica a quรฉ rama quieres fusionar."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:442 builtin/pull.c:457
 msgid "See git-pull(1) for details."
 msgstr "Ver git-pull(1) para detalles."
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<remoto>"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<rama>"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "No hay informaciรณn de rastreo para la rama actual."
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Si deseas configurar el rastreo de informaciรณn para esta rama, puedes "
 "hacerlo con:"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:466
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16590,32 +17611,32 @@ msgstr ""
 "Tu configuraciรณn especifica fusionar con la ref '%s'\n"
 "de tu remoto, pero no se pudo hacer fetch a esa ref."
 
-#: builtin/pull.c:581
+#: builtin/pull.c:576
 #, c-format
 msgid "unable to access commit %s"
 msgstr "no es posible acceder al commit %s"
 
-#: builtin/pull.c:861
+#: builtin/pull.c:857
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorando --verify-signatures para rebase"
 
-#: builtin/pull.c:916
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "La opciรณn --[no-]autostash sรณlo es vรกlida con --rebase."
 
-#: builtin/pull.c:924
+#: builtin/pull.c:920
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Actualizando una rama no nata con cambios agregados al รญndice."
 
-#: builtin/pull.c:928
+#: builtin/pull.c:924
 msgid "pull with rebase"
 msgstr "pull con rebase"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:925
 msgid "please commit or stash them."
 msgstr "por favor realiza un commit o un stash con ellos."
 
-#: builtin/pull.c:954
+#: builtin/pull.c:950
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16626,7 +17647,7 @@ msgstr ""
 "realizando fast-forward al รกrbol de trabajo\n"
 "desde commit %s."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:956
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16643,15 +17664,15 @@ msgstr ""
 "$ git reset --hard\n"
 "para recuperar."
 
-#: builtin/pull.c:975
+#: builtin/pull.c:971
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No se puede fusionar mรบltiples ramas en un head vacรญo."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:975
 msgid "Cannot rebase onto multiple branches."
 msgstr "No se puede rebasar en mรบltiples ramas."
 
-#: builtin/pull.c:986
+#: builtin/pull.c:982
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no se puede rebasar con modificaciones de submรณdulos grabadas localmente"
@@ -16661,15 +17682,15 @@ msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "taquigrafรญa de tag sin <tag>"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete solo acepta como objetivos nombres de ref planos"
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16678,7 +17699,7 @@ msgstr ""
 "Para elegir si la opciรณn es permanente, mira push.default en 'git help "
 "config'."
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16703,7 +17724,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16718,7 +17739,7 @@ msgstr ""
 "\n"
 "\tgit push %s HEAD:<nombre-de-rama-remota>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16732,12 +17753,12 @@ msgstr ""
 "\n"
 "\tgit push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "La rama actual %s tiene mรบltiples ramas upstream, rechazando el push."
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -16748,13 +17769,13 @@ msgstr ""
 "la rama actual '%s', sin decirme quรฉ poner en el push\n"
 "para actualizar en quรฉ rama de remoto."
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "No se especificรณ ningรบn refspecs para hacer push, y push.default es \"nada\"."
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -16766,7 +17787,7 @@ msgstr ""
 "'git pull ...') antes de hacer push de nuevo.\n"
 "Mira 'Note about fast-forwards' en 'git push --help' para mรกs detalles."
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -16779,7 +17800,7 @@ msgstr ""
 "(ejem. 'git pull ...') antes de volver a hacer push.\n"
 "Vea las 'Notes about fast-forwards' en 'git push --help' para mรกs detalles."
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -16793,12 +17814,12 @@ msgstr ""
 "remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
 "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -16808,141 +17829,141 @@ msgstr ""
 "o actualizar un ref remoto para hacer que  apunte a un objeto no-commit,\n"
 "sin usar la opciรณn '--force'.\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Haciendo push a %s\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "fallรณ el push de algunas referencias a '%s'"
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "mal repositorio '%s'"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"No se ha configurado un destino para el push.\n"
-"Puedes o especificar una URL desde la lรญnea de comandos o configurar un "
-"repositorio remoto usando\n"
-"\n"
-"    git remote add <nombre> <url>\n"
-"\n"
-"y luego haciendo push al nombre del remoto\n"
-"\n"
-"    git push <nombre>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr "repositorio"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "realizar push a todas las refs"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "realizar mirror a todas las refs"
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "borrar refs"
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "forzar actualizaciones"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
 msgstr "<refname>:<expect>"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr "requiere haber valor viejo de ref en este valor"
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr "controlar push recursivo de submรณdulos"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr "usar empaquetado delgado"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "recibir programa de paquete"
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr "configurar upstream para git pulll/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
-msgstr "recortando refs removidas localmente"
+msgstr "recortando refs eliminadas localmente"
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr "hacer un bypass al hook pre-push"
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr "realizar push de tags faltantes pero relevantes"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr "Firmar con GPG el push"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr "solicitar transacciรณn atรณmica en el lado remoto"
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete es incompatible con --all, --mirror y --tags"
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no tiene sentido sin ninguna referencia"
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "mal repositorio '%s'"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"No se ha configurado un destino para el push.\n"
+"Puedes o especificar una URL desde la lรญnea de comandos o configurar un "
+"repositorio remoto usando\n"
+"\n"
+"    git remote add <nombre> <url>\n"
+"\n"
+"y luego haciendo push al nombre del remoto\n"
+"\n"
+"    git push <nombre>\n"
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr "--all y --tags son incompatibles"
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr "--all no puede ser combinada con refspecs"
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror y --tags son incompatibles"
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no puede ser combinado con refspecs"
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr "--all y --mirror son incompatibles"
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr "opciones de push no pueden tener caracteres de lรญnea nueva"
 
@@ -16960,24 +17981,32 @@ msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>"
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr "Porcentaje por el cual la creaciรณn es pesada"
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "usar colores simples de diff"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "notas"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "pasado a 'git log'"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr "no .. en rango: '%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "argumento รบnico de formato debe ser un rango simรฉtrico"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "se necesitan dos rangos de commits"
 
@@ -17060,13 +18089,17 @@ msgstr "debug de รกrboles-desempacados"
 msgid "suppress feedback messages"
 msgstr "suprimir mensajes de feedback"
 
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Necesitas resolver tu รญndice actual primero"
+
 #: builtin/rebase.c:32
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 
 #: builtin/rebase.c:34
 msgid ""
@@ -17078,216 +18111,207 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "lista de pendientes inutilizable: '%s'"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "no se pudo escribir '%s'."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "ยฟSin HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:292
 #, c-format
 msgid "could not create temporary %s"
 msgstr "no se pudo crear archivo temporal %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:298
 msgid "could not mark as interactive"
 msgstr "no se pudo marcar como interactivo"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:352
 msgid "could not generate todo list"
 msgstr "no se pudo generar lista de pendientes"
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:391
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "un commit base tiene que ser provisto con --upstream o --onto"
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:461
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<opciones>]"
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "mantener commits vacรญos"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(DEPRECADO) mantener commits vacรญos"
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "permitir commits con mensajes vacรญos"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:480
 msgid "rebase merge commits"
 msgstr "rebasando commits de fusiรณn"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:482
 msgid "keep original branch points of cousins"
 msgstr "mantener puntos originales de la rama de sus primos"
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:484
 msgid "move commits that begin with squash!/fixup!"
 msgstr "mover commits que comienzan con squash!/fixup!"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:485
 msgid "sign commits"
 msgstr "firmar commits"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:487 builtin/rebase.c:1490
 msgid "display a diffstat of what changed upstream"
 msgstr "mostrar un diffstat de lo que cambiรณ en upstream"
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:489
 msgid "continue rebase"
 msgstr "continuar rebase"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:491
 msgid "skip commit"
 msgstr "saltar commit"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:492
 msgid "edit the todo list"
 msgstr "editar la lista de pendientes"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:494
 msgid "show the current patch"
 msgstr "mostrar el parche actual"
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:497
 msgid "shorten commit ids in the todo list"
 msgstr "ids de commits cortos en la lista de pendientes"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:499
 msgid "expand commit ids in the todo list"
 msgstr "expandir ids de commits en la lista de pendientes"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:501
 msgid "check the todo list"
 msgstr "revisar la lista de pendientes"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:503
 msgid "rearrange fixup/squash lines"
 msgstr "reorganizar lรญneas fixup/squash"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:505
 msgid "insert exec commands in todo list"
 msgstr "insertar comando exec en la lista de pendientes"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:506
 msgid "onto"
 msgstr "hacia"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict-revision"
 msgstr "restrict-revision"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict revision"
 msgstr "restringir revision"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:511
 msgid "squash-onto"
 msgstr "squash-onto"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:512
 msgid "squash onto"
 msgstr "squash hacia"
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:514
 msgid "the upstream commit"
 msgstr "el commit de upstream"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head-name"
 msgstr "head-name"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head name"
 msgstr "nombre de head"
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:521
 msgid "rebase strategy"
 msgstr "estrategia de rebase"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:522
 msgid "strategy-opts"
 msgstr "strategy-opts"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:523
 msgid "strategy options"
 msgstr "opciones de estrategia"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:524
 msgid "switch-to"
 msgstr "cambiar a"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:525
 msgid "the branch or commit to checkout"
 msgstr "la rama o commit para hacer checkout"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto-name"
 msgstr "hacia-nombre"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto name"
 msgstr "hacia nombre"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "cmd"
 msgstr "cmd"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "the command to run"
 msgstr "el comando para ejecutar"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:530 builtin/rebase.c:1584
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "reprogramar automaticamente cualquier `exec` que falle"
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:546
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:562
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s requiere un rebase interactivo"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:612
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "no se pudo conseguir 'onto': '%s'"
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:627
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head invรกlido: '%s'"
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:652
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorando invรกlido allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:728
 #, c-format
 msgid "Could not read '%s'"
 msgstr "No se pudo leer '%s'"
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:746
 #, c-format
 msgid "Cannot store %s"
 msgstr "No se puede guardar %s"
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:853
 msgid "could not determine HEAD revision"
 msgstr "no se pudo determinar revisiรณn HEAD"
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17302,7 +18326,7 @@ msgstr ""
 "Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git "
 "rebase --abort\"."
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -17321,7 +18345,16 @@ msgstr ""
 "\n"
 "Como resultado, git no puede hacer rebase con ellos."
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"tipo '%s' vacรญo y desconocido; valores vรกlidos son \"drop\", \"keep\", y "
+"\"ask\"."
+
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "%s\n"
@@ -17338,7 +18371,7 @@ msgstr ""
 "    git rebase '<rama>'\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1417
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17351,158 +18384,174 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<rama> %s\n"
 "\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1447
 msgid "exec commands cannot contain newlines"
 msgstr "comandos exec no pueden contener newlines"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1451
 msgid "empty exec command"
 msgstr "comando exec vacรญo"
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1481
 msgid "rebase onto given branch instead of upstream"
 msgstr "haciendo rebase hacia rama dada en lugar de upstream"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "usar la base de fusiรณn de upstream y la rama como base actual"
+
+#: builtin/rebase.c:1485
 msgid "allow pre-rebase hook to run"
 msgstr "permitir ejecutar hook pre-rebase"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1487
 msgid "be quiet. implies --no-stat"
 msgstr "ser silencioso implica --no-stat"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1493
 msgid "do not show diffstat of what changed upstream"
 msgstr "no mostrar un diffstat de lo que cambiรณ en upstream"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1496
 msgid "add a Signed-off-by: line to each commit"
 msgstr "agregar una lรญnea \"Firmado-por\" al mensaje de cada commit"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
 msgid "passed to 'git am'"
 msgstr "pasado a 'git am'"
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
 msgid "passed to 'git apply'"
 msgstr "pasado a 'git-apply'"
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "cherry-pick todos los commits, incluso si no han cambiado"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1515
 msgid "continue"
 msgstr "continuar"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1518
 msgid "skip current patch and continue"
 msgstr "saltar el parche y continuar"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1520
 msgid "abort and check out the original branch"
 msgstr "aborta y revisa la rama original"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1523
 msgid "abort but keep HEAD where it is"
 msgstr "aborta pero mantiene HEAD donde estรก"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1524
 msgid "edit the todo list during an interactive rebase"
 msgstr "editar la lista de pendientes durante el rebase interactivo"
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1527
 msgid "show the patch file being applied or merged"
 msgstr "muestra el archivo parche siendo aplicado o fusionado"
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "usar estrategias de apply para el rebase"
+
+#: builtin/rebase.c:1534
 msgid "use merging strategies to rebase"
 msgstr "usar estrategias de fusiรณn para el rebase"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1538
 msgid "let the user edit the list of commits to rebase"
 msgstr "permitir al usuario editar la lista de commits para rebasar"
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1542
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
 
-#: builtin/rebase.c:1455
-msgid "preserve empty commits during rebase"
-msgstr "preservar commits vacรญos durante el rebase"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "como manejar commits que se vuelven vacรญos"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1554
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "mover commits que comienzan con squash!/fixup! bajo -i"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1560
 msgid "automatically stash/stash pop before and after"
 msgstr "ejecutar automรกticamente stash/stash pop antes y despuรฉs"
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1562
 msgid "add exec lines after each commit of the editable list"
 msgstr "agregar lรญneas exec tras cada acommit de la lista editable"
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1566
 msgid "allow rebasing commits with empty messages"
 msgstr "permitir rebase commits con mensajes vacรญos"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1570
 msgid "try to rebase merges instead of skipping them"
 msgstr "intentar fusiones por rebase en lugar de saltarlas"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1573
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "use 'merge-base --fork-point' para refinar upstream"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1575
 msgid "use the given merge strategy"
 msgstr "usar la estrategia de merge dada"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
 msgid "option"
 msgstr "opciรณn"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1578
 msgid "pass the argument through to the merge strategy"
 msgstr "pasar el argumento para la estrategia de fusiรณn"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1581
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "hacer rebase a todos los commits alcanzables hasta la raรญz(raรญces)"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1598
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
 msgstr ""
-"el soporte para rebase.useBuiltin ha sido removido!\n"
+"el soporte para rebase.useBuiltin ha sido eliminado!\n"
 "Vea su entrada en 'git help config' para detalles."
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1604
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Parece que 'git am' estรก en progreso. No se puede rebasar."
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1645
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 "git rebase --preserve-merges estรก deprecado. Use --rebase-merges en su lugar."
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "no se puede combinar '--keep-base' con '--onto'"
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "no se puede combinar '--keep-base' con '--root'"
+
+#: builtin/rebase.c:1656
 msgid "No rebase in progress?"
-msgstr "No hay rebase en progreso?"
+msgstr "ยฟNo hay rebase en progreso?"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1660
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "La acciรณn --edit-todo sรณlo puede ser usada al rebasar interactivamente."
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1683
 msgid "Cannot read HEAD"
 msgstr "No se puede leer el HEAD"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1695
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17510,16 +18559,16 @@ msgstr ""
 "Tienes que editar todos los conflictos de fusiรณn y luego\n"
 "marcarlos como resueltos usando git add"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1714
 msgid "could not discard worktree changes"
 msgstr "no se pudo descartar los cambios del รกrbol de trabajo"
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1733
 #, c-format
 msgid "could not move back to %s"
 msgstr "no se puede regresar a %s"
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1778
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17540,176 +18589,167 @@ msgstr ""
 "y ejecรบtame nuevamente. Me estoy deteniendo en caso de que tengas\n"
 "algo de valor ahรญ.\n"
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1806
 msgid "switch `C' expects a numerical value"
 msgstr "switch `C' espera un valor numรฉrico"
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1847
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Modo desconocido: %s"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1869
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiere --merge o --interactive"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr "no se pueden combinar opciones de apply con opciones de merge"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Backend de rebase desconocido: %s"
+
+#: builtin/rebase.c:1937
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec requiere --exec o --interactive"
 
-#: builtin/rebase.c:1809
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"no se pueden combinar opciones de am con opciones interactivas o de merge"
-
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1957
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1961
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
 "exec'"
 
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'"
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "no se puede combinar '--rebase-merges' con '--strategy'"
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1985
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "upstream invรกlido '%s'"
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1991
 msgid "Could not create new root commit"
 msgstr "No se pudo crear commit raรญz nuevo"
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s': necesita exactamente una base de fusiรณn con rama"
+
+#: builtin/rebase.c:2020
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': necesita exactamente una base de fusiรณn"
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:2028
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "No apunta a un commit vรกlido '%s'"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:2054
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "fatal: no existe la rama/commit: '%s'"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr "No existe ref: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2073
 msgid "Could not resolve HEAD to a revision"
 msgstr "No se pudo resolver HEAD a una revisiรณn"
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2111
 msgid "Cannot autostash"
 msgstr "No se puede ejecutar autostash"
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2114
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Respuesta de stash inesperada: '%s'"
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2120
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "No se pudo crear el directorio para '%s'"
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2123
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Autostash creado: %s\n"
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2126
 msgid "could not reset --hard"
 msgstr "no se pudo reset --hard"
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD estรก ahora en %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2135
 msgid "Please commit or stash them."
 msgstr "Por favor, confรญrmalos o guรกrdalos."
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr "no se puede analizar '%s'"
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2169
 #, c-format
 msgid "could not switch to %s"
 msgstr "no se pudo cambiar a %s"
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2180
 msgid "HEAD is up to date."
 msgstr "HEAD estรก actualizado."
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2182
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La rama actual %s estรก actualizada.\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2190
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD estรก actualizado, rebase forzado."
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Rama actual %s estรก actualizada, rebase forzado.\n"
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2200
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El hook pre-rebase rechazรณ el rebase."
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2207
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Cambios a %s:\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2210
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Cambios desde %s a %s:\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2235
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "En primer lugar, rebobinando HEAD para despuรฉs reproducir tus cambios encima "
 "de รฉsta...\n"
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2244
 msgid "Could not detach HEAD"
 msgstr "No se puede desacoplar HEAD"
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2253
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avance rรกpido de %s a %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:821
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -17735,14 +18775,14 @@ msgstr ""
 "Puedes configurar la variable de configuraciรณn 'receive.denyCurrentBranch'\n"
 "\"ignore\" o \"warn\" en el repositorio remoto para permitir\n"
 "su rama actual; Sin embargo, esto no se recomienda a menos que tรบ\n"
-"te hayas organizado para actualizar su รกrbol de trabajo para que coincida con "
-"lo que\n"
+"te hayas organizado para actualizar su รกrbol de trabajo para que coincida "
+"con lo que\n"
 "enviarรกs con el push de otra manera.\n"
 "\n"
 "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
 "configura 'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -17793,49 +18833,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog existe <ref>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' no es una marca de tiempo vรกlida"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Marcando objectos alcanzables..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
-msgstr "%s apunta a ningรบn lado!"
+msgstr "ยก%s apunta a ningรบn lado!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr "no reflog especificado para borrar"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr "no es una reflog: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "no reflog para '%s'"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "formato invรกlido: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -17843,82 +18883,82 @@ msgstr ""
 "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nombre> <url>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <viejo> <nuevo>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <nombre>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nombre>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nombre>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nombre> <rama>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nombre>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nombre> <nuevo-url>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nombre> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opciones>] <nombre> <url>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nombre> <rama>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nombre> <rama>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opciones>] <nombre>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opciones>] <nombre>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Actualizando %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -17926,84 +18966,100 @@ msgstr ""
 "Usar --mirror es peligroso y estรก desaprobado;\n"
 "\t usa mรกs bien --mirror=fetch o --mirror=push"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argumento mirror desconocido: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "realizar fetch a las ramas remotas"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "importar todos los tags y objetos asociados cuando realiza el fetch"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "o no realziar fetch a ningรบn tag (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "rama(s) para rastrear"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "rama master"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "configurar remote como mirror para realizar push o desde el cual realizar "
 "fetch"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "especificar una rama master no tiene sentido con --mirror"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr "remoto %s ya existe."
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' no es un nombre remoto vรกlido"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "No se pudo configurar master '%s'"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "No se pudo realizar el fetch al mapa para refspec %s"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "(concordando)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "(eliminar)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "no se pudo configurar '%s'"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"La configuraciรณn %s remote.pushDefault en:\n"
+"\t%s:%d\n"
+"ahora nombra al remoto inexistente '%s'"
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "No existe el remoto '%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "No se pudo renombrar la secciรณn de configuraciรณn '%s' a '%s'"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18014,17 +19070,17 @@ msgstr ""
 "\t%s\n"
 "\tPor favor actualice la configuraciรณn manualmente si es necesario."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "borrando '%s' fallรณ"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr "creando '%s' fallรณ"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18032,125 +19088,125 @@ msgid_plural ""
 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
 "to delete them, use:"
 msgstr[0] ""
-"Nota: Una rama fuera de la jerarquรญa refs/remotes/ no fue removida;\n"
+"Nota: Una rama fuera de la jerarquรญa refs/remotes/ no fue eliminada;\n"
 "para borrarla, use:"
 msgstr[1] ""
 "Nota: Algunas ramas fuera de la jerarquรญa refs/remotes/ no fueron "
-"removidas;\n"
+"eliminadas;\n"
 "para borrarlas, use:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No se pudo borrar la secciรณn de configuraciรณn '%s'"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nuevo (siguiente fetch se guardarรก en remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr " rastreada"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " viejo ( use 'git remote prune' para eliminar)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "invรกlido branch.%s.merge; no se puede rebasar en > 1 rama"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebasa interactivamente en remoto %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1052
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "rebasa interactivamente (con fusiones) en remoto %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebasa sobre el remoto %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr " se fusiona con remoto %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusiona con remoto %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s y con el remoto %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr "crear"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr "borrar"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr "actualizado"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr "puede realizar fast-forward"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr "desactualizado local"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s fuerza a %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s publica a %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s fuerza a %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s publica a %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr "no consultar remotos"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL  para obtener: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr "(sin URL)"
 
@@ -18158,194 +19214,185 @@ msgstr "(sin URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL para publicar: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Rama HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr "(no consultado)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 "  HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Rama remota:%s"
 msgstr[1] "  Ramas remotas:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr " (estado no consultado)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Rama local configurada para 'git pull':"
 msgstr[1] "  Ramas locales configuradas para 'git pull':"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Las referencias locales serรกn reflejadas por 'git push'"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referencia local configurada para 'git push'%s:"
 msgstr[1] "  Referencias locales configuradas para 'git push'%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "borrar refs/remotos/<nombre>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr "No se puede determinar el HEAD remoto"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Mรบltiples ramas HEAD remotas. Por favor escoja una explรญcitamente con:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr "No se pudo borrar %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No es un ref vรกlido: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr "No se pudo configurar %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
-msgstr " %s serรก colgado!"
+msgstr " ยก%s serรก colgado!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
-msgstr " %s ha sido colgado!"
+msgstr " ยก%s ha sido colgado!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr "Recortando %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [ejecutarรก prune] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [prune realizado] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr "recortar remotos tras realizar fetch"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr "No existe el remoto '%s'"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr "agregar rama"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr "no hay remotos especificados"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr "consultar URLs de push en lugar de URLs de fetch"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr "retornar todos los URLs"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "no hay URLs configurados para remoto '%s'"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr "manipular URLs de push"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr "agregar URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr "borrar URLs"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no tiene sentido"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patrรณn de URL viejo invรกlido: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No se encontrรณ URL: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr "No borrarรก todos los URLs de no-push"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Sub-comando desconocido: %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr "git repack [<opciones>]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18353,115 +19400,115 @@ msgstr ""
 "Re empaquetados incrementales son incompatibles con รญndices bitmap. Use \n"
 "--no-write-bitmap-index o deshabilite la configuraciรณn pack.writebitmaps."
 
-#: builtin/repack.c:190
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
 
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: Esperando lรญneas de ID de objeto en full hex solo desde pack-objects."
 
-#: builtin/repack.c:246
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "no se puede finalizar pack-objects para reempaquetar objetos promisores"
 
-#: builtin/repack.c:284
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr "empaquetar todo en un รบnico paquete"
 
-#: builtin/repack.c:286
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "lo mismo que -a, y pierde objetos inaccesibles"
 
-#: builtin/repack.c:289
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
 
-#: builtin/repack.c:291
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "pasar --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:293
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "pasar --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:295
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr "no ejecutar git-update-server-info"
 
-#: builtin/repack.c:298
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr "pasar --local a git-pack-objects"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr "escribir un รญndice de bitmap"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:310
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "pasar --delta-islands a git-pack-objects"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr "aproxime"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr "con -A, no perder objetos mรกs antiguos que este"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr "con -a, re empaquetar objetos inalcanzables"
 
-#: builtin/repack.c:308
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr "tamaรฑo de la ventana usado para la compresiรณn delta"
 
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr "bytes"
 
-#: builtin/repack.c:310
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "lo mismo que arriba, pero limita el tamaรฑo de memoria en lugar de contar "
 "entradas"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr "limita la profundidad mรกxima del delta"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr "limita el nรบmero mรกximo de hilos"
 
-#: builtin/repack.c:316
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr "tamaรฑo mรกximo de cada paquete"
 
-#: builtin/repack.c:318
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr "re-empaquetar objetos en paquetes marcados con .keep"
 
-#: builtin/repack.c:320
+#: builtin/repack.c:328
 msgid "do not repack this pack"
 msgstr "no reempaquetar este paquete"
 
-#: builtin/repack.c:330
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
 
-#: builtin/repack.c:334
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable y -A son incompatibles"
 
-#: builtin/repack.c:417
+#: builtin/repack.c:425
 msgid "Nothing new to pack."
 msgstr "Nada nuevo para empaquetar."
 
-#: builtin/repack.c:478
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -18480,7 +19527,7 @@ msgstr ""
 "WARNING: tambiรฉn fallรณ.\n"
 "WARNING: Por favor renombralos en %s manualmente:\n"
 
-#: builtin/repack.c:526
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "fallรณ al eliminar'%s'"
@@ -18588,8 +19635,8 @@ msgstr "incapaz de correr fstat %s"
 msgid "unable to write object to database"
 msgstr "incapaz de escribir el objeto en la base de datos"
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "nombre de objeto no vรกlido: '%s'"
@@ -18608,22 +19655,22 @@ msgstr "ediciรณn de archivo de objeto fallรณ"
 msgid "new object is the same as the old one: '%s'"
 msgstr "nuevo objeto es igual al antiguo: '%s'"
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "no se pudo analizar %s como un commit"
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mal mergetag en commit '%s'"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "mergetag mal formado en commit '%s'"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18632,31 +19679,31 @@ msgstr ""
 "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
 "en lugar de --graft"
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "el commit original '%s' tiene una firma gpg"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
-msgstr "la firma serรก removida en el commit de reemplazo!"
+msgstr "la firma serรก eliminada en el commit de reemplazo!"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "no se pudo escribir el commit de reemplazo: '%s'"
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft para '%s' innecesario"
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "nuevo commit es le mismo que el antiguo: '%s'"
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18665,71 +19712,71 @@ msgstr ""
 "no se pudo convertir el siguiente graft(s):\n"
 "%s"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "listar replace refs"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "borrar replace refs"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "editar objeto existente"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "cambiar un padre de commit"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "convertir archivo graft existente"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "reemplazar el ref si este existe"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "no se puede imprimir contenidos para --edit"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "usar este formato"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format no puede ser usado cuando no se hace listing"
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f solo tiene sentido cuando se escribe un reemplazo"
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw solo tiene sentido con --edit"
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d necesita al menos un argumento"
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "mal nรบmero de argumentos"
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e necesita exactamente un argumento"
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g necesita al menos un argumento"
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file no toma argumentos"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "solo se puede dar un patrรณn con -l"
 
@@ -18757,115 +19804,126 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<รกrbol-ismo>] [--] <rutas>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<รกrbol-ismo>] [--] <pathspec>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<รกrbol-ismo>] [--] [<rutas>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<รกrbol-ismo>]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<รกrbol-ismo>] [--] [<pathspec>...]"
+
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "mezclado"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "suave"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "duro"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "fusionar"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "mantener"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr "No hay un HEAD vรกlido."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr "Fallรณ al encontrar el HEAD del รกrbol."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Fallรณ al encontrar รกrbol de %s."
 
-#: builtin/reset.c:193
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD estรก ahora en %s"
+
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "No se puede realziar un reset %s  en medio de una fusiรณn."
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "ser silencioso, solo reportar errores"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr "reiniciar HEAD e index"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr "reiniciar solo HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr "reiniciar HEAD, รญndice y รกrbol de trabajo"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr "reiniciar HEAD pero mantener cambios locales"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
-"grabar solo el hecho de que las rutas removidas serรกn agregadas despuรฉs"
+"grabar solo el hecho de que las rutas eliminadas serรกn agregadas despuรฉs"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Fallรณ al resolver '%s' como una revisiรณn vรกlida."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Fallรณ al resolver '%s' como un รกrbol vรกlido."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch es incompatible con --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No se puede hacer un reset %s con rutas."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s reset no estรก permitido en un repositorio vacรญo"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
 msgstr "-N sรณlo puede ser usada con --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr "Cambios fuera del รกrea de stage tras el reset:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -18879,35 +19937,30 @@ msgstr ""
 "usar '--quiet' para evitar esto.  Configura la opciรณn reset.quiet a true\n"
 "para volverlo en el default.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "No se puede reiniciar el รญndice a la revisiรณn '%s'."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr "No se puede escribir un nuevo archivo รญndice."
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "no se puede combinar --exclude-promisor-objects y --missing"
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "filtrado de objetos requiere --objects"
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "valor disperso invรกlido: '%s'"
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list no soporta mostrar notas"
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "conteo de marcas es incompatible con --objects"
 
 #: builtin/rev-parse.c:408
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -19072,38 +20125,42 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "el siguiente archivo tiene modificaciones locales:"
 msgstr[1] "los siguientes archivos tienen modificaciones locales:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "no listar archivos eliminado"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "solo eliminar del รญndice"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "sobrescribir el check de actualizado"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "permitir eliminar de forma recursiva"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "salir con estado cero incluso si nada coincide"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Se entregรณ un nuevo pathspec. ยฟQuรฉ archivos deberรญa eliminar?"
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
 "para proceder"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
-msgstr "no removiendo '%s' de manera recursiva sin -r"
+msgstr "no eliminando '%s' de manera recursiva sin -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no es posible eliminar %s"
@@ -19351,15 +20408,84 @@ msgstr "no mostrar resultados en stdout (รบtil con --verify)"
 msgid "show refs from stdin that aren't in local repository"
 msgstr "mostrar refs de stdin que no estรกn en el repositorio local"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <opciones>"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"este รกrbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no "
+"existe)"
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "fallรณ al crear directorio para el archivo sparse-checkout"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "fallรณ al configurar opciรณn extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "inicializa el sparse-checkout en modo cono"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "inicializar sparse-checkout"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "fallรณ al abrir '%s'"
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "no se pudo normalizar la ruta %s"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "no es posible dequote para la cadena de estilo C '%s'"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "no se pudo cargar patrones de sparse-checkout existentes"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "leer patrones de standard in"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "configurar patrones de sparse-checkout"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "deshabilitar sparse-checkout"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "error al refrescar directorio de trabajo"
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<opciones>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<opciones>] [<stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
@@ -19367,25 +20493,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nombre-rama> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n"
+"          [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19393,186 +20521,196 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<mensaje>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <mensaje>] [-q|--quiet] <commit>"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n"
+"          [--] [<pathspec>...]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' no es un commit estilo stash"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Se especificaron demasiadas revisiones: %s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr "No se encontraron entradas de stash."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s no es una referencia vรกlida"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear con parรกmetros no estรก implementado"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "no se puede aplicar un stash en medio de un merge"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "no se pudo generar diff %s^!."
 
-#: builtin/stash.c:421
+#: builtin/stash.c:422
 msgid "conflicts in index.Try without --index."
 msgstr "conflictos en รญndice. Intente sin --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "no se puede guardar el รญndice del รกrbol"
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "no se pueden restaurar archivos no rastreados de la entrada stash"
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Fusionando %s con %s"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
 msgstr "El รญndice no fue sacado de stash."
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
 msgid "attempt to recreate the index"
 msgstr "intento de recrear el index"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:555
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Botado %s (%s)"
 
-#: builtin/stash.c:552
+#: builtin/stash.c:558
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: No se pudo borrar entrada stash"
 
-#: builtin/stash.c:577
+#: builtin/stash.c:583
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' no es una referencia stash"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr "La entrada de stash se guardรณ en caso de ser necesario nuevamente."
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr "No se especificรณ el nombre de la rama"
 
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "No se puede actualizar %s con %s"
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
 msgid "stash message"
 msgstr "mensaje de stash"
 
-#: builtin/stash.c:818
+#: builtin/stash.c:824
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" requiere un argumento <commit>"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr "Sin cambios seleccionados"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr "Aรบn no tienes un commit inicial"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr "No se puede guardar el estado actual del รญndice"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr "No se pueden guardar los archivos no rastreados"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr "No se puede guardar el estado actual del รกrbol de trabajo"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr "No se puede grabar el estado del รกrbol de trabajo"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
 
-#: builtin/stash.c:1285
+#: builtin/stash.c:1298
 msgid "Did you forget to 'git add'?"
-msgstr "Olvidaste 'git add'?"
+msgstr "ยฟOlvidaste 'git add'?"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr "No hay cambios locales para guardar"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr "No se puede inicializar stash"
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr "No se puede guardar el estado actual"
 
-#: builtin/stash.c:1327
+#: builtin/stash.c:1340
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Directorio de trabajo guardado y estado de รญndice %s"
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr "No se pueden eliminar cambios del รกrbol de trabajo"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "keep index"
 msgstr "mantener index"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash in patch mode"
 msgstr "stash en modo patch"
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1472 builtin/stash.c:1537
 msgid "quiet mode"
 msgstr "modo tranquilo"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1474 builtin/stash.c:1539
 msgid "include untracked files in stash"
 msgstr "incluir archivos sin seguimiento en stash"
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1476 builtin/stash.c:1541
 msgid "include ignore files"
 msgstr "incluir archivos ignorados"
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1600
 #, c-format
 msgid "could not exec %s"
 msgstr "no se pudo ejecutar %s"
@@ -19594,40 +20732,40 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "anteponer carรกcter de comentario y espacio a cada lรญnea"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "subomdule--helper print-default-remote no toma argumentos"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "no se puede quitar un componente del url '%s'"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr "ancho alternativo para rutas relativas"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "No se encontrรณ url para la ruta del submรณdulo '%s' en .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrando '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -19636,7 +20774,7 @@ msgstr ""
 "run_command devolviรณ estado no-cero para %s\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19647,19 +20785,19 @@ msgstr ""
 "anidados de %s\n"
 "."
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr "Suprime la salida al inicializar cada comando de submรณdulo"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr "Recursar en submรณdulos anidados"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -19668,57 +20806,57 @@ msgstr ""
 "no se pudo encontrar configuraciรณn '%s'. Asumiendo que este repositorio es "
 "su propio upstream autoritativo."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Fallรณ al registrar el url para la ruta del submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submรณdulo '%s' (%s) registrado para ruta '%s'\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "peligro: modo de actualizaciรณn de comandos sugerido para el submรณdulo '%s'\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Error al registrar el modo de actualizaciรณn para la ruta del submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "Suprime la salida para inicializar un submรณdulo"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opciones>] [<path>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "no se ha encontrado mapeo de submรณdulos en .gitmodules para la ruta '%s'"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "no pudo resolver ref de HEAD dentro del submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "fallรณ al recursar en el submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr "Suprimir output del estado del submรณdulo"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -19726,47 +20864,47 @@ msgstr ""
 "Usar el commit guardado en el รญndice en lugar del guardado en el submรณdulo "
 "HEAD"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr "recursar en submรณdulos anidados"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <ruta>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Sincronizando url del submรณdulo para '%s'\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "fallรณ al registrar el url para la ruta del submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "error al conseguir el remoto por defecto para el submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "error al actualizar el remoto para el submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr "Suprime la salida del url del submรณdulo que se sincroniza"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -19775,7 +20913,7 @@ msgstr ""
 "El รกrbol de trabajo del submรณdulo '%s' contiene un directorio .git (use 'rm -"
 "rf' si realmente quieres eliminarlo incluyendo todo en su historia)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -19784,177 +20922,206 @@ msgstr ""
 "El รกrbol de trabajo del submรณdulo '%s' contiene modificaciones locales; usa "
 "'-f' para descartarlas"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Directorio '%s' limpiado\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "No se pudo eliminar el รกrbol de trabajo del submรณdulo '%s'\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "no se pudo crear directorio vacรญo de submรณdulo %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Submรณdulo '%s' (%s) no registrado para ruta '%s'\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "Remover รกrboles de trabajo de submรณdulos incluso si contienen cambios locales"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr "Quitar todos los submรณdulos"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Usa '--all' si realmente quieres des-inicializar todos los submรณdulos"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Una alternativa calculada a partir de la alternativa de un superproyecto no "
+"es vรกlida.\n"
+"Para permitir que Git clone sin una alternativa en ese caso, establezca\n"
+"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clonar "
+"con\n"
+"'--reference-if-able' en lugar de '--reference'."
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "submรณdulo '%s' no puede agregar alterno: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
 msgstr "a donde el nuevo submรณdulo serรก clonado"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr "nombre del nuevo submรณdulo"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr "url de dรณnde clonar el submรณdulo"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr "forzar el proceso de clonado"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "no permitir clonar en directorios no vacรญos"
+
+#: builtin/submodule--helper.c:1424
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference "
-"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
-"<ruta>"
+"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --"
+"url <url> --path <ruta>"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "rechazando crear/usar '%s' en el directorio de git de otro submรณdulo"
+
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "clon de '%s' en la ruta de submรณdulo '%s' fallรณ"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "directorio no estรก vacรญo: '%s'"
+
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "no se pudo obtener el directorio de submรณdulo para '%s'"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Modo de actualizaciรณn invรกlido '%s' para ruta de submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1516
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Modo de actualizaciรณn invรกlido '%s' configurado para ruta de submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Ruta de submรณdulo '%s' no inicializada"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
-msgstr "Tal vez quieres usar 'update --init'?"
+msgstr "ยฟTal vez quieres usar 'update --init'?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Saltando submรณdulo %s no fusionado"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Saltando submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Fallรณ al clonar '%s'. Reintento programado"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Fallรณ al clonar '%s' una segunda vez, abortando"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr "ruta hacia el รกrbol de trabajo"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "ruta hacia el รกrbol de trabajo, a travรฉs de extremos de submรณdulos anidados"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Crea un clon superficial truncado al nรบmero especificado de revisiรณn"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr "trabajos paralelos"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "si el clon inicial debe seguir la recomendaciรณn superficial"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr "no mostrar el progreso de clonado"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]"
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr "mal valor para parรกmetro update"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -19963,51 +21130,51 @@ msgstr ""
 "Rama de submรณdulo (%s) configurada para heredar rama del superproyecto, pero "
 "el superproyecto no estรก en ninguna rama"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2117
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "no se pudo conseguir un handle para el submรณdulo '%s'"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr "recurrir a submรณdulos"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2156
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2212
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "revisar is es seguro escribir el archivo .gitmodules"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2215
 msgid "unset the config in the .gitmodules file"
 msgstr "desconfigura la opciรณn en elarchivo .gitmodules"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2220
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nombre> [<valor>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2221
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nombre>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2222
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 "por favor asegรบrate que el archivo .gitmodules estรก en el รกrbol de trabajo"
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no soporta --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2297
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' no es un comando submodule--helper vรกlido"
@@ -20261,207 +21428,211 @@ msgstr "el tag '%s' ya existe"
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' actualizada (era %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "Desempaquetando objetos"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "fallรณ al crear directorio %s"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "fallรณ al crear el archivo %s"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "fallรณ al eliminar el archivo %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "fallรณ al eliminar directorio %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Probando mtime en '%s' "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "info de estado del directorio no cambia tras agregar un nuevo directorio"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr "info de estado del directorio cambia tras actualizar un archivo"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "info de estado del directorio cambia tras agregar un archivo dentro del "
 "subdirectorio"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr "info de estado del directorio no cambia tras borrar un archivo"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr "info de estado del directorio no cambia tras borrar un directorio"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opciones>] [--] [<archivo>...]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "continuar refresh (Actualizaciรณn) incluso cuando el รญndice necesita "
 "actualizaciรณn"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submรณdulos"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "no ignorar archivos nuevos"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "permitir que archivos remplacen directorios y vice-versa"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "avisar de archivos faltando en el รกrbol de trabajo"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "ejecutar refresh incluso si el รญndice contiene entradas sin cambios"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "refresh informaciรณn de estado"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "como --refresh, pero ignora configuraciรณn assume-unchanged"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "agregar la entrada especificada al รญndice"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "marcar archivos como \"not changing\""
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "marcar archivos como \"index-only\""
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "no tocar entradas index-only"
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "agregar solo al รญndice; no agregar contenido a la base de datos de objetos"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "eliminar rutas nombradas incluso si estรกn presentes en el รกrbol de trabajo"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "con --stdin: las lรญneas de entrada son terminadas con bytes nulos"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "leer la lista de rutas para ser actualizada desde standard input"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "agregar entradas de standard input al รญndice"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repoblar stages #2 y #3 para las rutas listadas"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "solo actualizar entradas que difieren de HEAD"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignorar archivos faltantes en el รกrbol de trabajo"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "reportar acciones por standard output"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(para porcelanas) olvidar conflictos sin resolver guardados"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "escribir รญndice en este formato"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "activar o desactivar รญndice dividido"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "habilitar o deshabilitar cachรฉ no rastreado"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "probar si el filesystem soporta cachรฉ no rastreado"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "habilitar cachรฉ no rastreado sin probar el filesystem"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "escribir el รญndice incluso si no estรก marcado como cambiado"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "activar o desactivar monitor de sistema de archivos"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "marcar archivos como vรกlidos para fsmonitor"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "limpia el bit de validaciรณn fsmonitor"
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20469,7 +21640,7 @@ msgstr ""
 "core.splitIndex estรก configurado en false; remuรฉvelo o cรกmbialo, si "
 "realmente quieres habilitar el รญndice partido"
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20477,7 +21648,7 @@ msgstr ""
 "core.splitIndex estรก configurado en true; remuรฉvelo o cรกmbialo, si realmente "
 "quieres deshabilitar el รญndice partido"
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -20485,11 +21656,11 @@ msgstr ""
 "core.untrackedCache estรก configurado en true; remuรฉvelo o cรกmbialo, si "
 "realmente quieres deshabilitar el chachรฉ no rastreado"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Cachรฉ no rastreado deshabilitado"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -20497,29 +21668,29 @@ msgstr ""
 "core.untrackedCache estรก configurado en false; remuรฉvelo o cรกmbialo, si "
 "realmente quieres habilitar el cachรฉ no rastreado"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Cachรฉ no rastreado habilitado para '%s'"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor no estรก configurado; actรญvalo si realmente quieres habilitar "
 "fsmonitor"
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor estรก configurado; remuรฉvelo si realmente quieres deshabilitar "
 "el fsmonitor"
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 
@@ -20613,55 +21784,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
 msgid "print tag contents"
 msgstr "imprimir contenido del tag"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opciones>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opciones>] <ruta>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> <nueva-ruta>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opciones>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opciones>] <worktree>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ruta>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:891
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "fallรณ al borrar '%s'"
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Removiendo el worktrees/%s: no es un directorio vรกlido"
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -20670,36 +21841,36 @@ msgstr ""
 "Removiendo รกrboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
 "bytes, %<PRIuMAX> leรญdos)"
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Removiendo worktrees/%s: archivo gitdir invรกlido"
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Removiendo worktrees/%s: archivo gitdir apunta a una ubicaciรณn no existente"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr "reporta รกrboles de trabajo recortados"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr "expirar รกrboles de trabajo mรกs viejos a <tiempo>"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:244
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "no es posible volver a agregar el รกrbol '%s'"
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:249
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -20709,7 +21880,7 @@ msgstr ""
 "usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
 "limpiar"
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:251
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -20718,124 +21889,124 @@ msgstr ""
 "'%s' es un รกrbol de trabajo faltante pero ya registrado;\n"
 "usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no se pudo crear directorio de '%s'"
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:432 builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Preparando รกrbol de trabajo (nueva rama '%s')"
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:434
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Preparando รกrbol de trabajo (reiniciando rama '%s'; estaba en %s)"
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:443
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Preparando รกrbol de trabajo (haciendo checkout a '%s')"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:449
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Preparando รกrbol de trabajo (HEAD desacoplado %s)"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:490
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "hacer checkout a <rama> incluso si ya ha hecho checkout en otro รกrbol de "
 "trabajo"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:493
 msgid "create a new branch"
 msgstr "crear una nueva rama"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:495
 msgid "create or reset a branch"
 msgstr "crear o restablecer una rama"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:497
 msgid "populate the new working tree"
 msgstr "popular el nuevo รกrbol de trabajo"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:498
 msgid "keep the new working tree locked"
 msgstr "mantener el nuevo รกrbol de trabajo bloqueado"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:501
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configurando modo tracking (mirar git-branch(1))"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:504
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:512
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B, y --detach son mutuamente exclusivas"
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:573
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track solo puede ser usado si una nueva rama es creada"
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:673
 msgid "reason for locking"
 msgstr "razรณn para bloquear"
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' no es un รกrbol de trabajo"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:687 builtin/worktree.c:720
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "El รกrbol de trabajo principal no puede ser bloqueado ni desbloqueado"
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:692
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ya estรก bloqueado; razรณn: %s"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:694
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ya estรก bloqueado"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:722
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' no estรก bloqueado"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:763
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "รกrboles de trabajo conteniendo submรณdulos no puede ser movidos o eliminado"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:771
 msgid "force move even if worktree is dirty or locked"
 msgstr "forzar move incluso si el รกrbol de trabajo estรก sucio o bloqueado"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:794 builtin/worktree.c:921
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' es un รกrbol de trabajo principal"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:799
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "no se pudo descubrir el nombre de destino de '%s'"
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:805
 #, c-format
 msgid "target '%s' already exists"
 msgstr "el objetivo '%s' ya existe"
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:813
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -20844,7 +22015,7 @@ msgstr ""
 "no se puede mover un รกrbol de trabajo bloqueado, motivo del bloqueo: %s\n"
 "use 'move -f -f' para sobreescribir o desbloquear primero"
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:815
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -20852,36 +22023,37 @@ msgstr ""
 "no se puede mover un รกrbol de trabajo bloqueado;\n"
 "use 'move -f -f' para sobreescribir o desbloquear primero"
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:818
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "fallรณ validaciรณn, no se puede mover el รกrbol de trabajo: %s"
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:823
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "fallรณ al mover '%s' a '%s'"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:871
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "fallรณ al ejecutar 'git status' en '%s'"
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:875
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
-msgstr "'%s' estรก sucio, use --force para borrarlo"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"'%s' contiene archivos no rastreados o modificados, use --force para borrarlo"
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:880
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "no se pudo ejecutar 'git status' en '%s', cรณdigo %d"
 
-#: builtin/worktree.c:911
+#: builtin/worktree.c:903
 msgid "force removal even if worktree is dirty or locked"
 msgstr "forzar remociรณn incluso si el รกrbol de trabajo estรก sucio o bloqueado"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:926
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -20890,7 +22062,7 @@ msgstr ""
 "no se pueden eliminar รกrbol de trabajo bloqueado, razรณn del bloqueo: %s\n"
 "use 'remove -f -f' para sobreescribir o desbloquear primero"
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:928
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -20898,7 +22070,7 @@ msgstr ""
 "no se pueden eliminar รกrbol de trabajo bloqueado;\n"
 "use 'remove -f -f' para sobreescribir o desbloquear primero"
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:931
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "fallรณ validaciรณn, no se puede eliminar รกrbol de trabajo: %s"
@@ -20919,6 +22091,21 @@ msgstr "escribir objeto de  รกrbol para un subdirectorio <prefijo>"
 msgid "only useful for debugging"
 msgstr "sรณlo รบtil para depurar"
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Se esperaba comando 'mark', se obtuvo %s"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Se esperaba comando 'to', se obtuvo %s"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "caracterรญstica '%s' prohibida en input sin --allow-unsafe-features"
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -21031,25 +22218,25 @@ msgstr ""
 "alias '%s' cambia las variables de entorno.\n"
 "Puedes usar '!git' en el alias para hacer esto"
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr "alias vacรญo para %s"
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr "alias recursivo: %s"
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr "error de escritura en standard output"
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr "error desconocido de escritura en standard output"
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr "cierre fallรณ en standard output"
 
@@ -21105,24 +22292,24 @@ msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Restricciรณn de protocolo no soportada con cURL < 7.19.4"
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "No se pudo configurar backend SSL a '%s': cURL fue construido sin backends "
 "SSL"
 
-#: http.c:1096
+#: http.c:1097
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "No se pudo configurar backend SSL para '%s': ya configurado"
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21133,150 +22320,161 @@ msgstr ""
 "  preguntaba por: %s\n"
 "   redireccionamiento: %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "quoting invรกlido en valor de push-option: '%s'"
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs no es vรกlido: ยฟes este un repositorio git?"
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "respuesta de servidor invรกlida; se esperaba servicio, se obtuvo un flush "
 "packet"
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "respuesta de servidor invรกlida; se obtuvo '%s'"
 
-#: remote-curl.c:446
+#: remote-curl.c:455
 #, c-format
 msgid "repository '%s' not found"
 msgstr "repositorio '%s' no encontrado"
 
-#: remote-curl.c:450
+#: remote-curl.c:459
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Autenticaciรณn fallรณ para '%s'"
 
-#: remote-curl.c:454
+#: remote-curl.c:463
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "no es posible acceder '%s':%s"
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirigiendo a %s"
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "no deberรญa tener EOF cuando no es gentil en EOF"
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "no es posible rebobinar rpc post data - intenta incrementando http.postBuffer"
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC fallรณ; %s"
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 msgid "cannot handle pushes this big"
 msgstr "no se puede manejar pushes tan grandes"
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "no se puede desinflar el request; zlib deflate error %d"
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "no se puede desinflar el request; zlib end error %d"
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "dump http transport no soporta capacidades superficiales"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1038
 msgid "fetch failed."
 msgstr "fetch fallรณ."
 
-#: remote-curl.c:1076
+#: remote-curl.c:1086
 msgid "cannot fetch by sha1 over smart http"
 msgstr "no se puede hacer fetch por sha1 sobre smart http"
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1130 remote-curl.c:1136
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'"
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1148 remote-curl.c:1263
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http transport no soporta %s"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1184
 msgid "git-http-push failed"
 msgstr "git-http-push fallรณ"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1369
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
 
-#: remote-curl.c:1392
+#: remote-curl.c:1401
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: error leyendo command stream de git"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1408
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: fetch intentado sin un repositorio local"
 
-#: remote-curl.c:1439
+#: remote-curl.c:1448
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: comando '%s' desconocido de git"
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr "args"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr "filtrado de objeto"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "fecha de expiraciรณn"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "no-op (compatibilidad con versiones anteriores)"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "ser mรกs verboso"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "ser mรกs discreto"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "usa <n> dรญgitos para mostrar SHA-1s"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "cรณmo quitar espacios y #comentarios de mensajes"
 
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "leer pathspec de archivo"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"con --pathspec-from-file, elementos de pathspec son separados con caracter "
+"NUL"
+
 #: ref-filter.h:101
 msgid "key"
 msgstr "clave"
@@ -21795,167 +22993,175 @@ msgid "Common Git shell script setup code"
 msgstr "Cรณdigo de configuraciรณn de script de shell comรบn de Git"
 
 #: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Inicializa y modifica el sparse-checkout"
+
+#: command-list.h:172
 msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 "Poner en un stash los cambios en un directorio de trabajo sucio de todas "
 "maneras"
 
-#: command-list.h:172
+#: command-list.h:173
 msgid "Add file contents to the staging area"
 msgstr "Agrega contenidos de un archivo al รกrea de staging"
 
-#: command-list.h:173
+#: command-list.h:174
 msgid "Show the working tree status"
 msgstr "Muestra el estado del รกrbol de trabajo"
 
-#: command-list.h:174
+#: command-list.h:175
 msgid "Remove unnecessary whitespace"
 msgstr "Eliminar el espacio en blanco innecesario"
 
-#: command-list.h:175
+#: command-list.h:176
 msgid "Initialize, update or inspect submodules"
 msgstr "Inicializa, actualiza o inspecciona submรณdulos"
 
-#: command-list.h:176
+#: command-list.h:177
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operaciรณn bidireccional entre un repositorio Subversion y Git"
 
-#: command-list.h:177
+#: command-list.h:178
 msgid "Switch branches"
 msgstr "Cambiar branches"
 
-#: command-list.h:178
+#: command-list.h:179
 msgid "Read, modify and delete symbolic refs"
 msgstr "Lee, modifica y borra referencias simbรณlicas"
 
-#: command-list.h:179
+#: command-list.h:180
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
 
-#: command-list.h:180
+#: command-list.h:181
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un archivo temporal con contenidos de un blob"
 
-#: command-list.h:181
+#: command-list.h:182
 msgid "Unpack objects from a packed archive"
 msgstr "Desempaqueta objetos de un archivo empaquetado"
 
-#: command-list.h:182
+#: command-list.h:183
 msgid "Register file contents in the working tree to the index"
 msgstr "Registra contenidos de archivos en el รกrbol de trabajo al รญndice"
 
-#: command-list.h:183
+#: command-list.h:184
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "Actualiza el nombre del objeto almacenado en una referencia de forma segura"
 
-#: command-list.h:184
+#: command-list.h:185
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Actualiza el archivo de informaciรณn auxiliar para ayudar a los servidores "
 "dumb"
 
-#: command-list.h:185
+#: command-list.h:186
 msgid "Send archive back to git-archive"
 msgstr "Enviar archivo a git-archive"
 
-#: command-list.h:186
+#: command-list.h:187
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Enviar objetos empaquetados a git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:188
 msgid "Show a Git logical variable"
 msgstr "Mostrar una variable lรณgica de Git"
 
-#: command-list.h:188
+#: command-list.h:189
 msgid "Check the GPG signature of commits"
 msgstr "Verificar firma GPG de commits"
 
-#: command-list.h:189
+#: command-list.h:190
 msgid "Validate packed Git archive files"
 msgstr "Valida archivos Git empaquetados"
 
-#: command-list.h:190
+#: command-list.h:191
 msgid "Check the GPG signature of tags"
 msgstr "Verifica la firma GPG de etiquetas"
 
-#: command-list.h:191
+#: command-list.h:192
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interfaz web Git (interfaz web para repositorios Git)"
 
-#: command-list.h:192
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Muestra logs con las diferencias que cada commit introduce"
 
-#: command-list.h:193
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Gestiona mรบltiples รกrboles de trabajo"
 
-#: command-list.h:194
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Crea un objeto รกrbol del รญndice actual"
 
-#: command-list.h:195
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Definiendo atributos por ruta"
 
-#: command-list.h:196
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Interfaz y convenciones de lรญnea de comandos de Git"
 
-#: command-list.h:197
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial bรกsico de Git para desarrolladores"
 
-#: command-list.h:198
+#: command-list.h:199
 msgid "Git for CVS users"
 msgstr "Git para usuarios CVS"
 
-#: command-list.h:199
+#: command-list.h:200
 msgid "Tweaking diff output"
 msgstr "Afinar la salida de diff"
 
-#: command-list.h:200
+#: command-list.h:201
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un conjunto mรญnimo รบtil de comandos diarios de Git"
 
-#: command-list.h:201
+#: command-list.h:202
 msgid "A Git Glossary"
 msgstr "Un Glosario de Git"
 
-#: command-list.h:202
+#: command-list.h:203
 msgid "Hooks used by Git"
 msgstr "Hooks utilizados por Git"
 
-#: command-list.h:203
+#: command-list.h:204
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
 
-#: command-list.h:204
+#: command-list.h:205
 msgid "Defining submodule properties"
 msgstr "Definiendo las propiedades del submรณdulo"
 
-#: command-list.h:205
+#: command-list.h:206
 msgid "Git namespaces"
 msgstr "Namespaces de Git"
 
-#: command-list.h:206
+#: command-list.h:207
 msgid "Git Repository Layout"
 msgstr "Disposiciรณn del repositorio Git"
 
-#: command-list.h:207
+#: command-list.h:208
 msgid "Specifying revisions and ranges for Git"
 msgstr "Especificando revisiones y rangos para Git"
 
-#: command-list.h:208
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "Montando un repositorio dentro de otro"
+
+#: command-list.h:210
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial de introducciรณn a Git: parte dos"
 
-#: command-list.h:209
+#: command-list.h:211
 msgid "A tutorial introduction to Git"
 msgstr "Un tutorial de introducciรณn para Git"
 
-#: command-list.h:210
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visiรณn general de flujos de trabajo recomendados con Git"
 
@@ -22082,143 +23288,132 @@ msgstr "Intentando fusiรณn simple con $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Fusiรณn simple no funcionรณ, intentando fusiรณn automรกtica."
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "No se puede eliminar el รญndice temporal (no puede suceder)"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "No se puede actualizar $ref_stash con $w_commit"
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "error: opciรณn desconocida para 'stash pus': $option"
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Directorio de trabajo guardado y estado de รญndice $stash_msg"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opciรณn desconocida: $opt"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Se especificaron demasiadas revisiones: $REV"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no es una referencia vรกlida"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no es un commit estilo stash"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no es una referencia stash"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "incapaz de refrescar el รญndice"
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "No se puede aplicar un stash en medio de una fusiรณn"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr "Conflictos en รญndice. Intente sin --index."
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "No se puede guardar el รญndice del รกrbol"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "No se puede sacar de stage archivos modificados"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Botado ${REV} ($s)"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No se pudo borrar entrada stash"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Para restaurarlos, escribe \"git stash apply\")"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:203
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "La ruta relativa sรณlo se puede usar desde el nivel superior del รกrbol de "
 "trabajo"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:213
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:232
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' ya existe en el รญndice"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:235
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' ya existe en el รญndice y no es un submรณdulo"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:242
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "'$sm_path' no tiene un commit checked out"
 
-#: git-submodule.sh:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n"
-"$sm_path\n"
-"Usa -f si en verdad quieres agregarlo."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:273
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Agregando el repositorio existente en '$sm_path' al รญndice"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:275
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' ya existe y no es un repositorio git vรกlido"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:283
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Se encontrรณ localmente un directorio git para '$sm_name' con el(los) "
 "remoto(s):"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:285
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22235,39 +23430,39 @@ msgstr ""
 "o no estรกs seguro de lo que esto significa, escoge otro nombre con la opciรณn "
 "'--name'."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:291
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Reactivar directorio git local para el submรณdulo '$sm_name'."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:303
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "No es posible hacer checkout al submรณdulo '$sm_path'"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:308
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Fallรณ al agregar el submรณdulo '$sm_path'"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:317
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Fallรณ al registrar el submรณdulo '$sm_path'"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "No se pudo encontrar la revisiรณn actual en la ruta de submรณdulo "
 "'$displaypath'"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:600
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "No es posible realizar fetch en la ruta de submรณdulo '$sm_path'"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:605
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22276,7 +23471,7 @@ msgstr ""
 "No es posible encontrar revisiรณn actual ${remote_name}/${branch} en la ruta "
 "de submรณdulo  '$sm_path'"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22285,7 +23480,7 @@ msgstr ""
 "No es posible realizar fetch en la ruta de submรณdulo '$displaypath'; "
 "intentando hacer un fetch directo $sha1:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:629
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22294,75 +23489,75 @@ msgstr ""
 "Fetch realizado en ruta de submรณdulo '$displaypath', pero no contenรญa $sha1. "
 "Fetch directo del commit fallรณ."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:636
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "No es posible revisar '$sha1' en la ruta de submรณdulo '$displaypath'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:637
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Ruta de submรณdulo '$displaypath': check out realizado a '$sha1'"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "No se posible ejecutar rebase a '$sha1' en la ruta de submรณdulo "
 "'$displaypath'"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Ruta de submรณdulo '$displaypath': rebasada en '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Incapaz de fusionar '$sha1' en la ruta del submรณdulo '$displaypath'"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Ruta de submรณdulo '$displaypath': fusionada en '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:653
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Fallรณ la ejecuciรณn  de  '$command $sha1' en la ruta de submรณdulo "
 "'$displaypath'"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:654
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Ruta de submรณdulo '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:685
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Fallรณ al recurrir en la ruta de submรณdulo '$displaypath'"
 
-#: git-submodule.sh:830
+#: git-submodule.sh:896
 msgid "The --cached option cannot be used with the --files option"
 msgstr "La opciรณn --cached no puede ser usada con la opciรณn --files"
 
-#: git-submodule.sh:882
+#: git-submodule.sh:948
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "modo $mod_dst inesperado"
 
-#: git-submodule.sh:902
+#: git-submodule.sh:968
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Advertencia: $display_name no contiene el commit $sha1_src"
 
-#: git-submodule.sh:905
+#: git-submodule.sh:971
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Advertencia: $display_name no contiene el commit $sha1_dst"
 
-#: git-submodule.sh:908
+#: git-submodule.sh:974
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
@@ -22684,6 +23879,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
 msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
 
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "Tenga en cuenta que los commits vacรญos estรกn comentados"
+
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
 msgstr "No se puede inicializar los commits reescritos"
@@ -22758,81 +23957,19 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Incapaz de determinar la ruta absoluta del directorio git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "rastreado"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "no rastreado"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binario"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "nada"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "sin cambios"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "agregada %d ruta\n"
-msgstr[1] "agregadas %d rutas\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "actualizada %d ruta\n"
-msgstr[1] "actualizadas %d rutas\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "revertida %d ruta\n"
-msgstr[1] "revertidas %d rutas\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "touch hecho a %d ruta\n"
 msgstr[1] "touch hecho a %d rutas\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Actualizar"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Revertir"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "nota: %s no es rastreado ahora.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Agregar no rastreados"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "No hay archivos sin rastrear.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -22840,7 +23977,7 @@ msgstr ""
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para el รกrea de stage."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -22848,7 +23985,7 @@ msgstr ""
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para aplicar stash."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -22856,8 +23993,8 @@ msgstr ""
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para sacar del รกrea de stage."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -22865,8 +24002,8 @@ msgstr ""
 "Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
 "inmediatamente para aplicar."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -22874,16 +24011,12 @@ msgstr ""
 "Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
 "inmediatamente para descarte."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "fallรณ al abrir el archivo de adiciรณn del hunk para escritura: %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Modo de ediciรณn manual de hunk -- vea abajo para una guรญa rรกpida.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -22894,37 +24027,14 @@ msgstr ""
 "---\n"
 "Para eliminar '%s' lรญneas, haga de ellas lรญneas  ' '  (contexto).\n"
 "Para eliminar '%s' lรญneas, bรณrrelas.\n"
-"Lineas comenzando con  %s serรกn removidas.\n"
-
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"Si esto no aplica de manera limpia, se te da la oportunidad de \n"
-"editar nuevamente. Si todas las lรญneas del hunk son removidas, entonces \n"
-"la ediciรณn es abortada y el hunk queda sin cambios.\n"
+"Lineas comenzando con  %s serรกn eliminadas.\n"
 
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "fallรณ al abrir el archivo de ediciรณn del hunk para lectura: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -22939,7 +24049,7 @@ msgstr ""
 "d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
 "archivo"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -22953,7 +24063,7 @@ msgstr ""
 "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
 "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -22968,7 +24078,7 @@ msgstr ""
 "d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
 "archivo"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -22982,7 +24092,7 @@ msgstr ""
 "a - aplicar este hunk y todos los posteriores en el archivo\n"
 "d - no aplicar este hunko ninguno de los posteriores en el archivo"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -22996,7 +24106,7 @@ msgstr ""
 "a - descartar este hunk y todos los posteriores en este archivo\n"
 "d - no descartar este hunk o ninguno de los posteriores en el archivo"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23010,7 +24120,7 @@ msgstr ""
 "a - descartar este hunk y todos los posteriores en este archivo\n"
 "d - no descartar este hunk o ninguno posterior en el archivo"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23024,7 +24134,7 @@ msgstr ""
 "a - aplicar este hunk y todos los posteriores en el archivo\n"
 "d - no aplicar este hunk o ninguno de los siguientes en este archivo"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23038,7 +24148,7 @@ msgstr ""
 "a - aplicar este hunk y todos los posteriores en el archivo\n"
 "d - no aplicar este hunk o ninguno de los siguientes en este archivo"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23060,228 +24170,85 @@ msgstr ""
 "e - editar manualmente el hunk actual\n"
 "? - imprimir ayuda\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
-msgstr "Los hunks seleccionados no aplican al รญndice!\n"
-
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Aplicarlos al รกrbol de trabajo de todas maneras? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Nada fue aplicado.\n"
+msgstr "ยกLos hunks seleccionados no aplican al รญndice!\n"
 
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorando lo no fusionado: %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Solo cambiaron archivos binarios.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Sin cambios.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Actualizaciรณn del parche"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "Aplicar cambio de modo al รญndice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Aplicar borrado al รญndice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Aplicar este hunk al รญndice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar cambio de modo del รกrbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar borrado del รกrbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar este hunk del รกrbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Descartar cambio de modo del รญndice y el รกrbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar borrado del รญndice y el รกrbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar este hunk del รญndice y el รกrbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Aplicar cambio de modo para el รญndice y el รกrbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplicar borrado al รญndice y al รกrbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplicar este hunk al รญndice y รกrbol de trabajo [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1468
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplicar cambio de modo para el รกrbol de trabajo [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar cambio de modo para el รกrbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1469
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplicar borrado al รกrbol de trabajo [y,n,q,a,d%s,?]? "
+msgstr "ยฟAplicar borrado al รกrbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1470
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplicar este hunk al รกrbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgstr "ยฟAplicar este hunk al รกrbol de trabajo [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "No hay mรกs pedazos para el ir\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "a que hunk ir (<enter> para ver mรกs)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "a que hunk ir? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Numero invรกlido: '%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Lo siento, solo %d hunk disponible.\n"
 msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "No hay mรกs pedazos para buscar\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "buscar para regexp? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regexp para la bรบsqueda mal formado %s: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
 msgstr "No hay hunks que concuerden con el patrรณn entregado.\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "No el anterior hunk\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "No el siguiente hunk\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Perdรณn, no se puede dividir este pedazo\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Cortar en %d hunk.\n"
 msgstr[1] "Cortar en  %d hunks.\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Perdรณn, no se puede editar este pedazo\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Revisiรณn de  diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23301,19 +24268,19 @@ msgstr ""
 "add untracked - agrega contenidos de archivos no rastreados al grupo de "
 "cambios del area de stage\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "falta --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "modo --patch desconocido: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argumento invรกlido %s, se esperaba --"
@@ -23430,7 +24397,7 @@ msgstr ""
 #: git-send-email.perl:718
 #, perl-format
 msgid "No subject line in %s?"
-msgstr "No hay lรญnea de subject en %s?"
+msgstr "ยฟNo hay lรญnea de subject en %s?"
 
 #: git-send-email.perl:728
 #, perl-format
@@ -23445,7 +24412,7 @@ msgid ""
 "\n"
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
-"Lineas que comienzan en \"GIT:\" serรกn removidas.\n"
+"Lineas que comienzan en \"GIT:\" serรกn eliminadas.\n"
 "Considere incluir un diffstat global o una tabla de contenidos\n"
 "para el parche que estรกs escribiendo.\n"
 "\n"
@@ -23469,7 +24436,7 @@ msgstr "Archivo de resumen estรก vacรญo, saltando al siguiente\n"
 #: git-send-email.perl:858
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr "Estรกs seguro de que deseas usar <%s> [y/N]? "
+msgstr "ยฟEstรกs seguro de que deseas usar <%s> [y/N]? "
 
 #: git-send-email.perl:913
 msgid ""
@@ -23481,7 +24448,7 @@ msgstr ""
 
 #: git-send-email.perl:918
 msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "Que codificaciรณn de 8bit deberรญa declarar [UTF-8]? "
+msgstr "ยฟQue codificaciรณn de 8bit deberรญa declarar [UTF-8]? "
 
 #: git-send-email.perl:926
 #, perl-format
@@ -23498,7 +24465,7 @@ msgstr ""
 
 #: git-send-email.perl:945
 msgid "To whom should the emails be sent (if anyone)?"
-msgstr "A quien se deben mandar los correos (si existe)?"
+msgstr "ยฟA quien se deben mandar los correos (si existe)?"
 
 #: git-send-email.perl:963
 #, perl-format
@@ -23508,7 +24475,7 @@ msgstr "fatal: alias '%s' se expande a si mismo\n"
 #: git-send-email.perl:975
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
-"Quรฉ id de mensaje serรก usado como En-Respuesta-Para en el primer email (si "
+"ยฟQuรฉ id de mensaje serรก usado como En-Respuesta-Para en el primer email (si "
 "existe alguno)? "
 
 #: git-send-email.perl:1033 git-send-email.perl:1041
@@ -23521,7 +24488,7 @@ msgstr "error: no es posible extraer una direcciรณn vรกlida de %s\n"
 #. at this point.
 #: git-send-email.perl:1045
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "Que hacer con esta direcciรณn? ([q]salir|[d]botar|[e]ditar): "
+msgstr "ยฟQue hacer con esta direcciรณn? ([q]salir|[d]botar|[e]ditar): "
 
 #: git-send-email.perl:1362
 #, perl-format
@@ -23558,7 +24525,7 @@ msgstr ""
 #. at this point.
 #: git-send-email.perl:1460
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr "Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): "
+msgstr "ยฟMandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): "
 
 #: git-send-email.perl:1463
 msgid "Send this email reply required"
@@ -23571,12 +24538,12 @@ msgstr "El servidor SMTP no esta definido adecuadamente."
 #: git-send-email.perl:1538
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
-msgstr "El servidor no soporta STARTTLS! %s"
+msgstr "ยกEl servidor no soporta STARTTLS! %s"
 
 #: git-send-email.perl:1543 git-send-email.perl:1547
 #, perl-format
 msgid "STARTTLS failed! %s"
-msgstr "Fallรณ STARTTLS! %s"
+msgstr "ยกFallรณ STARTTLS! %s"
 
 #: git-send-email.perl:1556
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
@@ -23682,7 +24649,166 @@ msgstr "Saltando %s con el sufijo de backup '%s'.\n"
 #: git-send-email.perl:1978
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
-msgstr "Realmente deseas mandar %s?[y|N]: "
+msgstr "ยฟRealmente deseas mandar %s?[y|N]: "
+
+#, c-format
+#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
+#~ msgstr "ยฟCambio de modo de stage [y,n,a,q,d%s,?]? "
+
+#, c-format
+#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
+#~ msgstr "ยฟAplicar stage al borrado [y,n,a,q,d%s,?]? "
+
+#, c-format
+#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
+#~ msgstr "ยฟAplicar stage a este hunk [y,n,a,q,d%s,?]? "
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for staging.\n"
+#~ msgstr ""
+#~ "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
+#~ "inmediatamente para el รกrea de stage.\n"
+
+#~ msgid ""
+#~ "y - stage this hunk\n"
+#~ "n - do not stage this hunk\n"
+#~ "q - quit; do not stage this hunk or any of the remaining ones\n"
+#~ "a - stage this and all the remaining hunks\n"
+#~ "d - do not stage this hunk nor any of the remaining hunks\n"
+#~ msgstr ""
+#~ "y - aplicar stage a este hunk\n"
+#~ "n - no aplicar stage a este hunk\n"
+#~ "q - quit; no aplicar stage a este hunk o ninguno de los restantes\n"
+#~ "a - aplicar stage a este hunk y a todos los posteriores en el archivo \n"
+#~ "d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
+#~ "archivo\n"
+
+#, c-format
+#~ msgid "could not copy '%s' to '%s'."
+#~ msgstr "no se pudo copiar '%s' a '%s'."
+
+#~ msgid "malformed ident line"
+#~ msgstr "lรญnea de entrada mal formada"
+
+#~ msgid "corrupted author without date information"
+#~ msgstr "autor corrupto sin informaciรณn de fecha"
+
+#, c-format
+#~ msgid "could not parse '%.*s'"
+#~ msgstr "no se puede analizar '%.*s'"
+
+#, c-format
+#~ msgid "could not checkout %s"
+#~ msgstr "no se puede hacer checkout a %s"
+
+#, c-format
+#~ msgid "filename in tree entry contains backslash: '%s'"
+#~ msgstr "nombre de archivo en el รกrbol contiene un backslash: '%s'"
+
+#, c-format
+#~ msgid "Use -f if you really want to add them.\n"
+#~ msgstr "Usa -f si realmente quieres agregarlos.\n"
+
+#, c-format
+#~ msgid "Maybe you wanted to say 'git add .'?\n"
+#~ msgstr "ยฟTal vez quiso decir 'git add .'?\n"
+
+#, c-format
+#~ msgid "packfile is invalid: %s"
+#~ msgstr "packfile es invรกlido: %s"
+
+#, c-format
+#~ msgid "unable to open packfile for reuse: %s"
+#~ msgstr "no es posible abrir packfile para reusar: %s"
+
+#~ msgid "unable to seek in reused packfile"
+#~ msgstr "no es posible buscar en los packfile reusados"
+
+#~ msgid "unable to read from reused packfile"
+#~ msgstr "no es posible leer de packfile reusado"
+
+#~ msgid "no HEAD?"
+#~ msgstr "ยฟSin HEAD?"
+
+#~ msgid "make committer date match author date"
+#~ msgstr "hacer que la fecha del commit concuerde con la fecha de autorรญa"
+
+#~ msgid "ignore author date and use current date"
+#~ msgstr "ignorar la fecha del autor y usar la fecha actual"
+
+#~ msgid "synonym of --reset-author-date"
+#~ msgstr "sinรณnimo para --reset-author-date"
+
+#~ msgid "ignore changes in whitespace"
+#~ msgstr "ignorar cambios en espacios en blanco"
+
+#~ msgid "preserve empty commits during rebase"
+#~ msgstr "preservar commits vacรญos durante el rebase"
+
+#~ msgid "cannot combine --use-bitmap-index with object filtering"
+#~ msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
+
+#, sh-format
+#~ msgid ""
+#~ "The following path is ignored by one of your .gitignore files:\n"
+#~ "$sm_path\n"
+#~ "Use -f if you really want to add it."
+#~ msgstr ""
+#~ "La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n"
+#~ "$sm_path\n"
+#~ "Usa -f si en verdad quieres agregarlo."
+
+#, c-format
+#~ msgid "unable to get tree for %s"
+#~ msgstr "no se pudo obtener รกrbol para %s"
+
+#~ msgid "Use an experimental heuristic to improve diffs"
+#~ msgstr "Usar un heurรญstico experimental para mejorar los diffs"
+
+#~ msgid "git commit-graph [--object-dir <objdir>]"
+#~ msgstr "git commit-graph [--object-dir <objdir>]"
+
+#~ msgid "git commit-graph read [--object-dir <objdir>]"
+#~ msgstr "git commit-graph read [--object-dir <objdir>]"
+
+#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+#~ msgstr ""
+#~ "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por "
+#~ "defecto"
+
+#~ msgid "cannot change partial clone promisor remote"
+#~ msgstr "no se puede cambiar un clon parcial remoto promisor"
+
+#~ msgid "error building trees"
+#~ msgstr "error construyendo รกrboles"
+
+#~ msgid "invalid date format '%s' in '%s'"
+#~ msgstr "formato de fecha invรกlido '%s' en '%s'"
+
+#~ msgid "writing root commit"
+#~ msgstr "escribiendo commit raรญz"
+
+#~ msgid "staged changes in the following files may be lost: %s"
+#~ msgstr ""
+#~ "cambios en el รกrea de stage en el siguiente archivo pueden ser perdidos: "
+#~ "%s"
+
+#~ msgid ""
+#~ "--filter can only be used with the remote configured in extensions."
+#~ "partialClone"
+#~ msgstr ""
+#~ "--filter solo puede ser usado con el remoto configurado en extensions."
+#~ "partialClone"
+
+#~ msgid "verify commit-msg hook"
+#~ msgstr "verificar el hook commit-msg"
+
+#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'"
+
+#~ msgid "invalid sparse value '%s'"
+#~ msgstr "valor disperso invรกlido: '%s'"
 
 #~ msgid "Server supports multi_ack_detailed"
 #~ msgstr "El servidor soporta ulti_ack_detailed"
@@ -23720,9 +24846,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: "
 #~ msgid "cannot be interactive without stdin connected to a terminal."
 #~ msgstr "no se puede ser interactivo sin stdin conectado a un terminal."
 
-#~ msgid "failed to open '%s'"
-#~ msgstr "fallรณ al abrir '%s'"
-
 #~ msgid "failed to stat %s\n"
 #~ msgstr "fallรณ al analizar %s\n"
 
diff --git a/third_party/git/po/fr.po b/third_party/git/po/fr.po
index 55c7db6aa6d0..314ff3747ef9 100644
--- a/third_party/git/po/fr.po
+++ b/third_party/git/po/fr.po
@@ -75,8 +75,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 20:12+0800\n"
-"PO-Revision-Date: 2019-08-10 18:17+0200\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-11 21:03+0100\n"
 "Last-Translator: Cรฉdric Malard <c.malard-git@valdun.net>\n"
 "Language-Team: Jean-Noรซl Avila <jn.avila@free.fr>\n"
 "Language: fr\n"
@@ -86,37 +86,730 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
 "X-Generator: Poedit 2.2.3\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Hein (%s)ย ?"
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "impossible de lire l'index"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binaire"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "rien"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "inchangรฉ"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "Mise ร  jour"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "impossible d'indexer '%s'"
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "impossible d'รฉcrire l'index"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "%d chemin mis ร  jour\n"
+msgstr[1] "%d chemins mis ร  jour\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "noteย : %s n'est plus suivi ร  prรฉsent.\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "รฉchec de make_cache_entry pour le chemin '%s'"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "Inverser"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "impossible d'analyser HEAD^{tree}"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "%d chemin inversรฉ\n"
+msgstr[1] "%d chemins inversรฉs\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Aucun Fichier non suivi.\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "Ajouter un fichier non-suivi"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "%d chemin ajoutรฉ\n"
+msgstr[1] "%d chemins ajoutรฉs\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "fichier non-fusionnรฉ ignorรฉย : %s"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Seuls des fichiers binaires ont changรฉ.\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "Aucune modification.\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "Mise ร  jour par patch"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "Rรฉviser la diffรฉrence"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "afficher les chemins comprenant des modifications"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+"ajouter l'รฉtat de l'arbre de travail ร  l'ensemble des modifications indexรฉes"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "retourner l'ensemble de modifications indexรฉes ร  la version HEAD"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr "sรฉlection et mise ร  jour individuelle des sections"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "visualiser les diffs entre HEAD et l'index"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+"ajouter le contenu des fichiers non-suivis ร  l'ensemble des modifications "
+"indexรฉes"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "Aideย :"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "sรฉlectionner un seul รฉlรฉment"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "sรฉlectionner une plage d'รฉlรฉments"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "sรฉlectionner plusieurs plages"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "sรฉlectionner un รฉlรฉment basรฉ sur une prรฉfixe unique"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "dรฉsรฉlectionner les รฉlรฉments spรฉcifiรฉs"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "choisir tous les รฉlรฉments"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "(vide) arrรชter de sรฉlectionner"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "sรฉlectionner un รฉlรฉment par son numรฉro"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "(vide) ne rien sรฉlectionner"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** Commandes ***"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "Et maintenant ?"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "indexรฉ"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "non-indexรฉ"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "chemin"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "impossible de rafraรฎchir l'index"
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "Au revoir.\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Indexer le changement de mode [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Indexer la suppression [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Indexer cette section [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Si le patch s'applique proprement, la section รฉditรฉe sera immรฉdiatement "
+"marquรฉe comme indexรฉe."
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - indexer cette section\n"
+"n - ne pas indexer cette section\n"
+"q - quitterย ; ne pas indexer cette section ni les autres restantes\n"
+"a - indexer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas indexer cette section ni les suivantes de ce fichier\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Remiser le changement de mode [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Remiser la suppression [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Remiser cette section [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Si le patch s'applique proprement, la section รฉditรฉe sera immรฉdiatement "
+"marquรฉe comme remisรฉe."
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - remiser cette section\n"
+"n - ne pas remiser cette section\n"
+"q - quitterย ; ne pas remiser cette section ni les autres restantes\n"
+"a - remiser cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas remiser cette section ni les suivantes de ce fichier\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Dรฉsindexer le changement de mode [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Dรฉsindexer la suppression [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Dรฉsindexer cette section [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Si le patch s'applique proprement, la section รฉditรฉe sera immรฉdiatement "
+"marquรฉe comme desindexรฉe."
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - dรฉsindexer cette section\n"
+"n - ne pas dรฉsindexer cette section\n"
+"q - quitterย ; ne pas dรฉsindexer cette section ni les autres restantes\n"
+"a - dรฉsindexer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas dรฉsindexer cette section ni les suivantes de ce fichier\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Appliquer le changement de mode ร  l'index [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Appliquer la suppression ร  l'index [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Appliquer cette section ร  l'index [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"Si le patch s'applique proprement, la section รฉditรฉe sera immรฉdiatement "
+"marquรฉe comme appliquรฉe."
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - appliquer cette section\n"
+"n - ne pas appliquer cette section\n"
+"q - quitterย ; ne pas appliquer cette section ni les autres restantes\n"
+"a - appliquer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"Si le patch s'applique proprement, la section รฉditรฉe sera immรฉdiatement "
+"marquรฉe comme รฉliminรฉe."
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - supprimer cette section\n"
+"n - ne pas supprimer cette section\n"
+"q - quitterย ; ne pas supprimer cette section ni les autres restantes\n"
+"a - supprimer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas supprimer cette section ni les suivantes de ce fichier\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - รฉliminer cette section de l'index et de l'arbre de travail\n"
+"n - ne pas รฉliminer cette section\n"
+"q - quitterย ; ne pas รฉliminer cette section ni les autres restantes\n"
+"a - รฉliminer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas รฉliminer cette section ni les suivantes de ce fichier\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"
+"%s,?]ย ? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"
+"%s,?]ย ? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Appliquer la section ร  l'index et l'arbre de travail [y,n,q,a,d%s,?]ย ? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - appliquer cette section ร  l'index et ร  l'arbre de travail\n"
+"n - ne pas appliquer cette section\n"
+"q - quitterย ; ne pas appliquer cette section ni les autres restantes\n"
+"a - appliquer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - appliquer cette section ร  l'arbre de travail\n"
+"n - ne pas appliquer cette section\n"
+"q - quitterย ; ne pas appliquer cette section ni les autres restantes\n"
+"a - appliquer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "impossible d'analyser l'entรชte de section '%.*s'"
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "impossible d'analyser l'entรชte colorรฉ de section '%.*s'"
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "impossible d'analyser la diff"
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "impossible d'analyser la diff colorรฉe"
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "รฉchec pour lancer '%s'"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "sortie sans correspondance depuis interactive.diffFilter"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Votre filtre doit maintenir une correspondance un-pour-un\n"
+"entre les lignes en entrรฉe et en sortie."
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"ligne de contexte attendue #%d dans\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"les sections ne se recouvrent pasย :\n"
+"%.*s\n"
+"\tne se termine pas parย :\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+"Mode d'รฉdition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Pour รฉliminer les lignes '%c', rendez-les ' ' (contexte).\n"
+"Pour รฉliminer les lignes '%c', effacez-les.\n"
+"Les lignes commenรงant par %c seront รฉliminรฉes.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Si รงa ne s'applique pas proprement, vous aurez la possibilitรฉ de\n"
+"l'รฉditer ร  nouveau. Si toutes les lignes de la section sont supprimรฉes,\n"
+"alors l'รฉdition sera abandonnรฉe et la section conservรฉe.\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "impossible d'analyser l'entรชte de section"
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' a รฉchouรฉ"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Votre section รฉditรฉe ne s'applique pas. L'รฉditer ร  nouveau (\"no\" "
+"l'รฉlimineย !) [y|n]ย ? "
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "Les sections sรฉlectionnรฉes ne s'applique pas ร  l'indexย !"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "Les appliquer quand mรชme ร  l'arbre de travailย ? "
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "Rien n'a รฉtรฉ appliquรฉ.\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - laisser cette section non dรฉcidรฉe et aller ร  la suivante non-dรฉcidรฉe\n"
+"J - laisser cette section non dรฉcidรฉe et aller ร  la suivante\n"
+"k - laisser cette section non dรฉcidรฉe et aller ร  la prรฉcรฉdente non-dรฉcidรฉe\n"
+"K - laisser cette section non dรฉcidรฉe et aller ร  la prรฉcรฉdente\n"
+"g - sรฉlectionner une section et s'y rendre\n"
+"/ - rechercher une section correspondant ร  une regex donnรฉe\n"
+"s - dรฉcouper la section en sections plus petites\n"
+"e - รฉditer manuellement la section actuelle\n"
+"? - afficher l'aide\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "Pas de section prรฉcรฉdente"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "Pas de section suivante"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "Aucune autre section ร  atteindre"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "aller ร  quelle section (<ret> pour voir plus)ย ? "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "aller ร  quelle sectionย ? "
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Numรฉro invalide : '%s'"
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Dรฉsolรฉ, %d seule section disponible."
+msgstr[1] "Dรฉsolรฉ, Seulement %d sections disponibles."
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "aucune autre section ร  rechercher"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "rechercher la regexย ? "
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Regex de recherche malformรฉe %sย : %s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "Aucune section ne correspond au motif donnรฉ"
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "Dรฉsolรฉ, impossible de dรฉcouper cette section"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Dรฉcoupรฉe en %d sections."
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "Dรฉsolรฉ, impossible d'รฉditer cette section"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "'git apply' a รฉchouรฉ"
+
+#: advice.c:115
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sastuce: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:168
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Impossible de picorer car vous avez des fichiers non fusionnรฉs."
 
-#: advice.c:164
+#: advice.c:170
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Impossible de valider car vous avez des fichiers non fusionnรฉs."
 
-#: advice.c:166
+#: advice.c:172
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Impossible de fusionner car vous avez des fichiers non fusionnรฉs."
 
-#: advice.c:168
+#: advice.c:174
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Impossible de tirer car vous avez des fichiers non fusionnรฉs."
 
-#: advice.c:170
+#: advice.c:176
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Impossible d'annuler car vous avez des fichiers non fusionnรฉs."
 
-#: advice.c:172
+#: advice.c:178
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "%s n'est pas possible car vous avez des fichiers non fusionnรฉs."
 
-#: advice.c:180
+#: advice.c:186
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -124,23 +817,23 @@ msgstr ""
 "Corrigez-les puis lancez 'git add/rm <fichier>'\n"
 "si nรฉcessaire pour marquer la rรฉsolution et valider."
 
-#: advice.c:188
+#: advice.c:194
 msgid "Exiting because of an unresolved conflict."
 msgstr "Abandon ร  cause de conflit non rรฉsolu."
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:199 builtin/merge.c:1335
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Vous n'avez pas terminรฉ votre fusion (MERGE_HEAD existe)."
 
-#: advice.c:195
+#: advice.c:201
 msgid "Please, commit your changes before merging."
 msgstr "Veuillez valider vos changements avant de fusionner."
 
-#: advice.c:196
+#: advice.c:202
 msgid "Exiting because of unfinished merge."
 msgstr "Abandon ร  cause d'une fusion non terminรฉe."
 
-#: advice.c:202
+#: advice.c:208
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -275,17 +968,7 @@ msgstr "mode invalide dans la ligne %dย : %s"
 msgid "inconsistent header lines %d and %d"
 msgstr "lignes d'entรชte inconsistantes %d et %d"
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recomptage : ligne inattendue : %.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragment de patch sans en-tรชte ร  la ligne %d : %.*s"
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -300,83 +983,93 @@ msgstr[1] ""
 "information de nom de fichier manquante dans l'en-tรชte de git diff lors de "
 "la suppression de %d composants de prรฉfixe de chemin (ligne %d)"
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "information de nom de fichier manquante dans l'en-tรชte de git diff (ligne %d)"
 
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recomptage : ligne inattendue : %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragment de patch sans en-tรชte ร  la ligne %d : %.*s"
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "le nouveau fichier dรฉpend de contenus anciens"
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "le fichier supprimรฉ a encore du contenu"
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "patch corrompu ร  la ligne %d"
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "le nouveau fichier %s dรฉpend de contenus anciens"
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "le fichier supprimรฉ %s a encore du contenu"
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimรฉ"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binaire corrompu ร  la ligne %d : %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binaire non reconnu ร  la ligne %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch totalement incomprรฉhensible ร  la ligne %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "ouverture ou lecture de %s impossible"
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "dรฉbut de ligne invalide : '%c'"
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "La section nยฐ%d a rรฉussi ร  la ligne %d (offset %d ligne)."
 msgstr[1] "La section nยฐ%d a rรฉussi ร  la ligne %d (offset %d lignes)."
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contexte rรฉduit ร  (%ld/%ld) pour appliquer le fragment ร  la ligne %d"
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -385,463 +1078,449 @@ msgstr ""
 "pendant la recherche de :\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "donnรฉes de patch binaire manquantes pour '%s'"
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "impossible d'appliquer l'inverse d'un patch binaire ร  '%s' sans la section "
 "inverse"
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "impossible d'appliquer un patch binaire ร  '%s' sans la ligne complรจte d'index"
 
-#: apply.c:3151
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 "le patch s'applique ร  '%s' (%s), ce qui ne correspond pas au contenu actuel."
 
-#: apply.c:3159
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "le patch s'applique ร  un '%s' vide mais ce n'est pas vide"
 
-#: apply.c:3177
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "l'image postรฉrieure nรฉcessaire %s pour '%s' ne peut pas รชtre lue"
 
-#: apply.c:3190
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "le patch binaire ne s'applique par correctement ร  '%s'"
 
-#: apply.c:3196
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "le patch binaire sur '%s' crรฉe un rรฉsultat incorrect (%s attendu, mais %s "
 "trouvรฉ)"
 
-#: apply.c:3217
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "le patch a รฉchouรฉ : %s:%ld"
 
-#: apply.c:3340
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "extraction de %s impossible"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
 #, c-format
 msgid "failed to read %s"
 msgstr "รฉchec de la lecture de %s"
 
-#: apply.c:3400
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lecture depuis '%s' au-delร  d'un lien symbolique"
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "le chemin %s a รฉtรฉ renommรฉ/supprimรฉ"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s : n'existe pas dans l'index"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s : ne correspond pas ร  l'index"
 
-#: apply.c:3559
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "le dรฉpรดt n'a pas les blobs nรฉcessaires pour un retour ร  une fusion ร  3 "
 "points."
 
-#: apply.c:3562
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Retour ร  une fusion ร  3 pointsโ€ฆ\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "impossible de lire le contenu actuel de '%s'"
 
-#: apply.c:3594
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "ร‰chec du retour ร  une fusion ร  3 pointsโ€ฆ\n"
 
-#: apply.c:3608
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch %s appliquรฉ avec des conflits.\n"
 
-#: apply.c:3613
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch %s appliquรฉ proprement.\n"
 
-#: apply.c:3639
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "le patch de suppression laisse un contenu dans le fichier"
 
-#: apply.c:3712
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s : type erronรฉ"
 
-#: apply.c:3714
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s est de type %o, mais %o attendu"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr "chemin invalide '%s'"
 
-#: apply.c:3923
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s : existe dรฉjร  dans l'index"
 
-#: apply.c:3926
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s : existe dรฉjร  dans la copie de travail"
 
-#: apply.c:3946
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "le nouveau mode (%o) de %s ne correspond pas ร  l'ancien mode (%o)"
 
-#: apply.c:3951
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "le nouveau mode (%o) de %s ne correspond pas ร  l'ancien mode (%o) de %s"
 
-#: apply.c:3971
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "le fichier affectรฉ '%s' est au-delร  d'un lien symbolique"
 
-#: apply.c:3975
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s : le patch ne s'applique pas"
 
-#: apply.c:3990
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Vรฉrification du patch %s..."
 
-#: apply.c:4082
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "l'information sha1 est manquante ou inutilisable pour le sous-module %s"
 
-#: apply.c:4089
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
 
-#: apply.c:4092
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "รฉchec de make_cache_entry pour le chemin '%s'"
-
-#: apply.c:4101
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "impossible d'ajouter %s ร  l'index temporaire"
 
-#: apply.c:4111
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "impossible d'รฉcrire l'index temporaire dans %s"
 
-#: apply.c:4249
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "suppression de %s dans l'index impossible"
 
-#: apply.c:4283
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompu pour le sous-module %s"
 
-#: apply.c:4289
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "stat du fichier nouvellement crรฉรฉ '%s' impossible"
 
-#: apply.c:4297
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "crรฉation du magasin de stockage pour le fichier nouvellement crรฉรฉ %s "
 "impossible"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "ajout de l'รฉlรฉment de cache %s impossible"
 
-#: apply.c:4346
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "รฉchec de l'รฉcriture dans '%s'"
 
-#: apply.c:4350
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr "fermeture du fichier '%s'"
 
-#: apply.c:4420
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "รฉcriture du fichier '%s' mode %o impossible"
 
-#: apply.c:4518
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s appliquรฉ proprement."
 
-#: apply.c:4526
+#: apply.c:4539
 msgid "internal error"
 msgstr "erreur interne"
 
-#: apply.c:4529
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Application du patch %%s avec %d rejet..."
 msgstr[1] "Application du patch %%s avec %d rejets..."
 
-#: apply.c:4540
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "troncature du nom de fichier .rej en %.*s.rej"
 
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: apply.c:4562
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Section nยฐ%d appliquรฉe proprement."
 
-#: apply.c:4566
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Section nยฐ%d rejetรฉe."
 
-#: apply.c:4676
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Chemin '%s' non traitรฉ."
 
-#: apply.c:4684
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr "entrรฉe non reconnue"
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr "lecture du fichier d'index impossible"
 
-#: apply.c:4859
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "ouverture impossible du patch '%s'ย :%s"
 
-#: apply.c:4886
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d erreur d'espace ignorรฉe"
 msgstr[1] "%d erreurs d'espace ignorรฉes"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d ligne a ajoutรฉ des erreurs d'espace."
 msgstr[1] "%d lignes ont ajoutรฉ des erreurs d'espace."
 
-#: apply.c:4900
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d ligne ajoutรฉe aprรจs correction des erreurs d'espace."
 msgstr[1] "%d lignes ajoutรฉes aprรจs correction des erreurs d'espace."
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "Impossible d'รฉcrire le nouveau fichier d'index"
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "chemin"
-
-#: apply.c:4944
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr "ne pas appliquer les modifications qui correspondent au chemin donnรฉ"
 
-#: apply.c:4947
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donnรฉ"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4973 builtin/am.c:2260
 msgid "num"
 msgstr "num"
 
-#: apply.c:4950
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
 
-#: apply.c:4953
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr "ignorer les additions rรฉalisรฉes par le patch"
 
-#: apply.c:4955
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrรฉe"
 
-#: apply.c:4959
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "afficher le nombre de lignes ajoutรฉes et supprimรฉes en notation dรฉcimale"
 
-#: apply.c:4961
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "au lieu d'appliquer le patch, afficher un rรฉsumรฉ de l'entrรฉe"
 
-#: apply.c:4963
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
 
-#: apply.c:4965
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr "s'assurer que le patch est applicable sur l'index actuel"
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
 
-#: apply.c:4969
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr "appliquer les patch sans toucher ร  la copie de travail"
 
-#: apply.c:4971
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr "accepter un patch qui touche hors de la copie de travail"
 
-#: apply.c:4974
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "appliquer aussi le patch (ร  utiliser avec --stat/--summary/--check)"
 
-#: apply.c:4976
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "tenter une fusion ร  3 points si le patch ne s'applique pas proprement"
 
-#: apply.c:4978
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construire un index temporaire fondรฉ sur l'information de l'index embarquรฉ"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr "les chemins sont sรฉparรฉs par un caractรจre NUL"
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
 msgid "action"
 msgstr "action"
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "dรฉtecter des lignes nouvelles ou modifiรฉes qui contiennent des erreurs "
 "d'espace"
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr "appliquer le patch en sens inverse"
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "don't expect at least one line of context"
 msgstr "ne pas s'attendre ร  au moins une ligne de contexte"
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "laisser les sections rejetรฉes dans les fichiers *.rej correspondants"
 
-#: apply.c:5000
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr "accepter les recouvrements de sections"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "mode verbeux"
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolรฉrer des erreurs de dรฉtection de retours chariot manquants en fin de "
 "fichier"
 
-#: apply.c:5006
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr "ne pas se fier au compte de lignes dans les en-tรชtes de section"
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5032 builtin/am.c:2248
 msgid "root"
 msgstr "racine"
 
-#: apply.c:5009
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr "prรฉfixer tous les noms de fichier avec <root>"
 
@@ -864,7 +1543,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dรฉpรดt> [--exec <commande>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "le chemin '%s' ne correspond ร  aucun fichier"
@@ -896,7 +1575,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "format d'archive"
 
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr "prรฉfixe"
 
@@ -904,11 +1583,12 @@ msgstr "prรฉfixe"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "prรฉfixer chaque chemin de fichier dans l'archive"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr "fichier"
 
@@ -941,7 +1621,7 @@ msgid "list supported archive formats"
 msgstr "afficher les formats d'archive supportรฉs"
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr "dรฉpรดt"
 
@@ -949,7 +1629,7 @@ msgstr "dรฉpรดt"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "rรฉcupรฉrer l'archive depuis le dรฉpรดt distant <dรฉpรดt>"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "commande"
@@ -980,66 +1660,66 @@ msgstr "Format d'archive inconnu '%s'"
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument non supportรฉ pour le format '%s'ย : -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:351
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "impossible de transmettre le blob %s en flux"
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:369
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "mode de fichier non supportรฉย :0%o (SHA1: %s)"
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:359
 #, c-format
 msgid "cannot read %s"
 msgstr "impossible de lire %s"
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "impossible de dรฉmarrer le filtre '%s'"
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr "impossible de rediriger un descripteur"
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "le filtre '%s' a retournรฉ une erreur"
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "le chemin n'est pas codรฉ en UTF-8 valideย : %s"
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "le chemin est trop long (%d caractรจres, SHA1ย : %s)ย : %s"
 
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
 #, c-format
 msgid "deflate error (%d)"
 msgstr "erreur de compression (%d)"
 
-#: archive-zip.c:609
+#: archive-zip.c:615
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "l'horodatage est trop grand pour ce systรจmeย : %<PRIuMAX>"
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s n'est pas un nom valide d'attribut"
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s non permis : %s : %d"
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1057,12 +1737,12 @@ msgstr "Contenu mal citรฉ dans le fichier '%s'ย : %s"
 msgid "We cannot bisect more!\n"
 msgstr "Impossible de pousser la bissection plus loinย !\n"
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s n'est pas un nom de commit valide"
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1071,7 +1751,7 @@ msgstr ""
 "La base de fusion %s est mauvaise.\n"
 "Cela signifie que le bogue รฉtรฉ corrigรฉ entre %s et [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1080,7 +1760,7 @@ msgstr ""
 "La base de fusion %s est nouvelle.\n"
 "La propriรฉtรฉ a changรฉ entre %s et [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1089,7 +1769,7 @@ msgstr ""
 "La base de fusion %s est %s.\n"
 "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1100,7 +1780,7 @@ msgstr ""
 "git bisect ne peut pas fonctionner correctement dans ce cas.\n"
 "Peut-รชtre les rรฉvisions %s et %s ne sont-elles pas les bonnesย ?\n"
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1112,36 +1792,36 @@ msgstr ""
 "et %s.\n"
 "On continue tout de mรชme."
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bissectionย : une base de fusion doit รชtre testรฉe\n"
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr "une rรฉvision %s est nรฉcessaire"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
 #, c-format
 msgid "could not create file '%s'"
 msgstr "impossible de crรฉer le fichier '%s'"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossible de lire le fichier '%s'"
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr "impossible de lire les rรฉfรฉrences de bissection"
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s รฉtait ร  la fois %s et %s\n"
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1150,7 +1830,7 @@ msgstr ""
 "Aucun commit testable n'a รฉtรฉ trouvรฉ\n"
 "Peut-รชtre avez-vous dรฉmarrรฉ avec un mauvais paramรจtre de cheminย ?\n"
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1160,48 +1840,48 @@ msgstr[1] "(ร  peu prรจs %d รฉtapes)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bissectionย : %d rรฉvision ร  tester aprรจs ceci %s\n"
 msgstr[1] "Bissectionย : %d rรฉvisions ร  tester aprรจs ceci %s\n"
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents et --reverse ne font pas bon mรฉnage."
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse et --first-parent ensemble nรฉcessitent la spรฉcification d'un "
 "dernier commit"
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "รฉchec de la prรฉparation du parcours des rรฉvisions"
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent ensemble nรฉcessitent une portรฉe avec la chaรฎne de "
 "premier parent"
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr "pas de chemin %s dans %s"
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "impossible de lire le blob %s  pour le chemin %s"
@@ -1364,8 +2044,8 @@ msgstr "'%s' ne semble pas รชtre un fichier bundle v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "en-tรชte non reconnu : %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
 #, c-format
 msgid "could not open '%s'"
 msgstr "impossible d'ouvrir '%s'"
@@ -1396,62 +2076,62 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Le colis exige cette rรฉfรฉrence :"
 msgstr[1] "Le colis exige ces %d rรฉfรฉrences :"
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr "impossible de dupliquer le descripteur de liasse"
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "Impossible de crรฉer des objets groupรฉs"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "les objets groupรฉs ont disparu"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "rev-list a disparu"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "la rรฉfรฉrence '%s' est exclue par les options de rev-list"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argument non reconnu : %s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "Refus de crรฉer un colis vide."
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "impossible de crรฉer '%s'"
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "l'index de groupe a disparu"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "Valeur invalide de couleur : %.*s"
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "impossible d'analyser %s"
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s n'est pas un commit !"
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1471,27 +2151,27 @@ msgstr ""
 "Supprimez ce message en lanรงant\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1127
+#: commit.c:1153
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "La validation %s a une signature GPG non fiable, prรฉtendument par %s."
 
-#: commit.c:1130
+#: commit.c:1157
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "La validation %s a une mauvaise signature GPG prรฉtendument par %s."
 
-#: commit.c:1133
+#: commit.c:1160
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La validation %s n'a pas de signature GPG."
 
-#: commit.c:1136
+#: commit.c:1163
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "La validation %s a une signature GPG correcte par %s\n"
 
-#: commit.c:1390
+#: commit.c:1417
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1503,174 +2183,184 @@ msgstr ""
 "variable de configuration i18n.commitencoding ร  l'encodage utilisรฉ par votre "
 "projet.\n"
 
-#: commit-graph.c:127
+#: commit-graph.c:122
 msgid "commit-graph file is too small"
 msgstr "le graphe de commit est trop petit"
 
-#: commit-graph.c:192
+#: commit-graph.c:189
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr ""
 "la signature du graphe de commit %X ne correspond pas ร  la signature %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:196
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "la version %X du graphe de commit ne correspond pas ร  la version %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:203
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr ""
 "l'empreinte de la version %X du graphe de commit ne correspond pas ร  la "
 "version %X"
 
-#: commit-graph.c:229
+#: commit-graph.c:226
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr ""
 "entrรฉe de table de consultation de morceaux de graphe de commite manquanteย ; "
 "le fichier est peut รชtre incomplet"
 
-#: commit-graph.c:240
+#: commit-graph.c:237
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "dรฉcalage de bloc %08x%08x du graphe de commit inadรฉquat"
 
-#: commit-graph.c:283
+#: commit-graph.c:280
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "l'id de bloc de graphe de commit %08x apparaรฎt des multiples fois"
 
-#: commit-graph.c:347
+#: commit-graph.c:343
 msgid "commit-graph has no base graphs chunk"
 msgstr "le graphe de commit n'a pas de section de graphes de base"
 
-#: commit-graph.c:357
+#: commit-graph.c:353
 msgid "commit-graph chain does not match"
 msgstr "la chaรฎne de graphe de commit ne correspond pas"
 
-#: commit-graph.c:404
+#: commit-graph.c:401
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
 "chaรฎne de graphe de commit invalideย : la ligne '%s' n'est pas une empreinte"
 
-#: commit-graph.c:430
+#: commit-graph.c:425
 msgid "unable to find all commit-graph files"
 msgstr "impossible de trouver tous les fichiers du graphe de commit"
 
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:558 commit-graph.c:618
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "position de commit invalide. Le graphe de commit est vraisemblablement "
 "corrompu"
 
-#: commit-graph.c:575
+#: commit-graph.c:579
 #, c-format
 msgid "could not find commit %s"
 msgstr "impossible de trouver le commit %s"
 
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "impossible d'analyser le commit %s"
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "impossible d'obtenir le type de l'objet %s"
 
-#: commit-graph.c:1034
+#: commit-graph.c:1043
 msgid "Loading known commits in commit graph"
 msgstr "Lecture des commits connus dans un graphe de commit"
 
-#: commit-graph.c:1051
+#: commit-graph.c:1060
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expansion des commits joignables dans un graphe de commit"
 
-#: commit-graph.c:1070
+#: commit-graph.c:1079
 msgid "Clearing commit marks in commit graph"
 msgstr "Suppression les marques de commit dans le graphe de commits"
 
-#: commit-graph.c:1089
+#: commit-graph.c:1098
 msgid "Computing commit graph generation numbers"
 msgstr "Calcul des chiffres de gรฉnรฉration du graphe de commits"
 
-#: commit-graph.c:1163
+#: commit-graph.c:1173
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"
 msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"
 
-#: commit-graph.c:1176
+#: commit-graph.c:1186
 #, c-format
 msgid "error adding pack %s"
 msgstr "erreur ร  l'ajout du packet %s"
 
-#: commit-graph.c:1180
+#: commit-graph.c:1190
 #, c-format
 msgid "error opening index for %s"
 msgstr "erreur ร  l'ouverture de l'index pour %s"
 
-#: commit-graph.c:1204
+#: commit-graph.c:1214
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
 msgstr[0] "Recherche de commits pour un graphe de commits depuis %d rรฉf"
 msgstr[1] "Recherche de commits pour un graphe de commits depuis %d rรฉfs"
 
-#: commit-graph.c:1238
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "identifiant d'objet commit invalide : %s"
+
+#: commit-graph.c:1249
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 "Recherche de commits pour un graphe de commits parmi les objets empaquetรฉs"
 
-#: commit-graph.c:1253
+#: commit-graph.c:1264
 msgid "Counting distinct commits in commit graph"
 msgstr "Comptage des commits distincts dans un graphe de commit"
 
-#: commit-graph.c:1284
+#: commit-graph.c:1294
 msgid "Finding extra edges in commit graph"
 msgstr "Recherche d'arรชtes supplรฉmentaires dans un graphe de commits"
 
-#: commit-graph.c:1332
+#: commit-graph.c:1340
 msgid "failed to write correct number of base graph ids"
 msgstr "รฉchec ร  l'รฉcriture le nombre correct d'id de base de fusion"
 
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1373 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "impossible de crรฉer les rรฉpertoires de premier niveau de %s"
 
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr "impossible de crรฉer '%s'"
 
-#: commit-graph.c:1437
+#: commit-graph.c:1445
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "ร‰criture le graphe de commits en %d passe"
 msgstr[1] "ร‰criture le graphe de commits en %d passes"
 
-#: commit-graph.c:1478
+#: commit-graph.c:1486
 msgid "unable to open commit-graph chain file"
 msgstr "impossible d'ouvrir le fichier de graphe de commit"
 
-#: commit-graph.c:1490
+#: commit-graph.c:1498
 msgid "failed to rename base commit-graph file"
 msgstr "รฉchec du renommage du fichier de graphe de commits"
 
-#: commit-graph.c:1510
+#: commit-graph.c:1518
 msgid "failed to rename temporary commit-graph file"
 msgstr "impossible de renommer le fichier temporaire de graphe de commits"
 
-#: commit-graph.c:1621
+#: commit-graph.c:1631
 msgid "Scanning merged commits"
 msgstr "Analyse des commits de fusion"
 
-#: commit-graph.c:1632
+#: commit-graph.c:1642
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "id de commit %s dupliquรฉ inattendu"
 
-#: commit-graph.c:1657
+#: commit-graph.c:1665
 msgid "Merging commit-graph"
 msgstr "fusion du graphe de commits"
 
@@ -1683,25 +2373,25 @@ msgstr "le graphe de commits ne peut pas รฉcrire %d commits"
 msgid "too many commits to write graph"
 msgstr "trop de commits pour รฉcrire un graphe"
 
-#: commit-graph.c:1945
+#: commit-graph.c:1944
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "le graphe de commit a une somme de contrรดle incorrecte et est "
 "vraisemblablement corrompu"
 
-#: commit-graph.c:1955
+#: commit-graph.c:1954
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "le graphe de commit a un ordre d'OID incorrectย : %s puis %s"
 
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1964 commit-graph.c:1979
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "
 "%u != %u"
 
-#: commit-graph.c:1972
+#: commit-graph.c:1971
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "รฉchec de l'analyse le commit %s depuis le graphe de commits"
@@ -1710,38 +2400,38 @@ msgstr "รฉchec de l'analyse le commit %s depuis le graphe de commits"
 msgid "Verifying commits in commit graph"
 msgstr "Verification des commits dans le graphe de commits"
 
-#: commit-graph.c:2002
+#: commit-graph.c:2003
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "รฉchec de l'analyse du commit %s depuis la base de donnรฉes d'objets pour le "
 "graphe de commit"
 
-#: commit-graph.c:2009
+#: commit-graph.c:2010
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "
 "%s"
 
-#: commit-graph.c:2019
+#: commit-graph.c:2020
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 "la liste des parents du graphe de commit pour le commit %s est trop longue"
 
-#: commit-graph.c:2028
+#: commit-graph.c:2029
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "le parent du graphe de commit pour %s est %s != %s"
 
-#: commit-graph.c:2041
+#: commit-graph.c:2042
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 "la liste de parents du graphe de commit pour le commit %s se termine trop tรดt"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2047
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1749,7 +2439,7 @@ msgstr ""
 "le graphe de commit a un numรฉro de gรฉnรฉration nul pour le commit %s, mais "
 "non-nul ailleurs"
 
-#: commit-graph.c:2050
+#: commit-graph.c:2051
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1757,12 +2447,12 @@ msgstr ""
 "le graphe de commit a un numรฉro de gรฉnรฉration non-nul pour le commit %s, "
 "mais nul ailleurs"
 
-#: commit-graph.c:2065
+#: commit-graph.c:2066
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "la gรฉnรฉration du graphe de commit pour le commit %s est %u != %u"
 
-#: commit-graph.c:2071
+#: commit-graph.c:2072
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
@@ -1813,7 +2503,7 @@ msgstr "la clรฉ ne contient pas de section: %s"
 msgid "key does not contain variable name: %s"
 msgstr "la clรฉ ne contient pas de nom de variableย : %s"
 
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2444
 #, c-format
 msgid "invalid key: %s"
 msgstr "clรฉ invalideย : %s"
@@ -1960,7 +2650,7 @@ msgstr "valeur mal formรฉe pour %sย : %s"
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "doit รชtre parmi nothing, matching, simple, upstream ou current"
 
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1518 builtin/pack-objects.c:3541
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "niveau de compression du paquet %d"
@@ -1985,116 +2675,109 @@ msgstr "impossible de rรฉsoudre le blob de config '%s'"
 msgid "failed to parse %s"
 msgstr "รฉchec de l'analyse de %s"
 
-#: config.c:1745
+#: config.c:1743
 msgid "unable to parse command-line config"
 msgstr "lecture de la configuration de ligne de commande impossible"
 
-#: config.c:2094
+#: config.c:2097
 msgid "unknown error occurred while reading the configuration files"
 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
 
-#: config.c:2264
+#: config.c:2267
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s invalide : '%s'"
 
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-"valeur '%s' de core.untrackedCache inconnueย ; utilisation de 'keep' par "
-"dรฉfaut"
-
-#: config.c:2333
+#: config.c:2312
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
 "100"
 
-#: config.c:2379
+#: config.c:2358
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 "impossible d'analyser '%s' depuis le configuration en ligne de commande"
 
-#: config.c:2381
+#: config.c:2360
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 "variable de configuration '%s' incorrecte dans le fichier '%s' ร  la ligne %d"
 
-#: config.c:2462
+#: config.c:2441
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nom de section invalide '%s'"
 
-#: config.c:2494
+#: config.c:2473
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s a des valeurs multiples"
 
-#: config.c:2523
+#: config.c:2502
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "impossible d'รฉcrire le fichier de configuration %s"
 
-#: config.c:2775 config.c:3099
+#: config.c:2754 config.c:3078
 #, c-format
 msgid "could not lock config file %s"
 msgstr "impossible de verrouiller le fichier de configuration %s"
 
-#: config.c:2786
+#: config.c:2765
 #, c-format
 msgid "opening %s"
 msgstr "ouverture de %s"
 
-#: config.c:2821 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "motif invalide : %s"
 
-#: config.c:2846
+#: config.c:2825
 #, c-format
 msgid "invalid config file %s"
 msgstr "fichier de configuration invalide %s"
 
-#: config.c:2859 config.c:3112
+#: config.c:2838 config.c:3091
 #, c-format
 msgid "fstat on %s failed"
 msgstr "รฉchec de fstat sur %s"
 
-#: config.c:2870
+#: config.c:2849
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "impossible de rรฉaliser un map de '%s'"
 
-#: config.c:2879 config.c:3117
+#: config.c:2858 config.c:3096
 #, c-format
 msgid "chmod on %s failed"
 msgstr "รฉchec de chmod sur %s"
 
-#: config.c:2964 config.c:3214
+#: config.c:2943 config.c:3193
 #, c-format
 msgid "could not write config file %s"
 msgstr "impossible d'รฉcrire le fichier de configuration %s"
 
-#: config.c:2998
+#: config.c:2977
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "impossible de rรฉgler '%s' ร  '%s'"
 
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr "impossible de dรฉsinitialiser '%s'"
 
-#: config.c:3090
+#: config.c:3069
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nom de section invalideย : %s"
 
-#: config.c:3257
+#: config.c:3236
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valeur manquante pour '%s'"
@@ -2218,7 +2901,7 @@ msgstr "impossible de rechercher %s (%s)"
 msgid "unknown port %s"
 msgstr "port inconnu %s"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "nom d'hรดte รฉtrange '%s' bloquรฉ"
@@ -2233,60 +2916,60 @@ msgstr "port รฉtrange '%s' bloquรฉ"
 msgid "cannot start proxy %s"
 msgstr "impossible de dรฉmarrer un proxy %s"
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "aucun chemin spรฉcifiรฉย ; rรฉfรฉrez-vous ร  'git help pull' pour une syntaxe "
 "d'URL valide"
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr "la variante ssh 'simple' ne supporte pas -4"
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr "la variante ssh 'simple' ne supporte pas -6"
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "la variante ssh 'simple' ne supporte pas de spรฉcifier le port"
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "chemin รฉtrange '%s' bloquรฉ"
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr "fork impossible"
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr "Vรฉrification de la connectivitรฉ"
 
-#: connected.c:98
+#: connected.c:110
 msgid "Could not run 'git rev-list'"
 msgstr "Impossible de lancer 'git rev-list'"
 
-#: connected.c:118
+#: connected.c:130
 msgid "failed write to rev-list"
 msgstr "impossible d'รฉcrire dans la rev-list"
 
-#: connected.c:125
+#: connected.c:137
 msgid "failed to close rev-list's stdin"
 msgstr "impossible de fermer l'entrรฉe standard du rev-list"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "crlf_action illรฉgal %d"
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "Les CRLF seraient remplacรฉs par des LF dans %s"
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2295,12 +2978,12 @@ msgstr ""
 "Les CRLF seront remplacรฉs par des LF dans %s.\n"
 "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "Les LF seraient remplacรฉs par des CRLF dans %s"
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2309,19 +2992,19 @@ msgstr ""
 "Les LF seront remplacรฉs par des CRLF dans %s.\n"
 "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "Aucun BOM n'est permis dans '%s' s'il est encodรฉ comme %s"
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
 "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez "
-"utiliser UTF-%s comme encodage d'arbre de travail."
+"utiliser UTF-%.*s comme encodage d'arbre de travail."
 
 #: convert.c:304
 #, c-format
@@ -2338,52 +3021,52 @@ msgstr ""
 "utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre dรฉsirรฉ) comme encodage d'arbre "
 "de travail."
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "รฉchec de l'encodage de '%s' de %s vers %s"
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 "encoder '%s' depuis %s vers %s puis inversement ne produit pas le mรชme "
 "contenu"
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "impossible de forker pour lancer le filtre externe '%s'"
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "impossible de fournir l'entrรฉe au filtre externe '%s'"
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "le filtre externe '%s' a รฉchouรฉ %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "la lecture depuis le filtre externe '%s' a รฉchouรฉ"
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "le filtre externe '%s' a รฉchouรฉ"
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr "type de filtre inattendu"
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr "nom de chemin trop long pour un filtre externe"
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2392,67 +3075,67 @@ msgstr ""
 "le filtre externe '%s' n'est plus disponible bien que tous les chemins "
 "n'aient pas รฉtรฉ filtrรฉs"
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false ne sont pas des encodages d'arbre de travail valides"
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%sย : le filtre clean '%s' a รฉchouรฉ"
 
-#: convert.c:1476
+#: convert.c:1489
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%sย : le filtre smudge '%s' a รฉchouรฉ"
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr "dans le futur"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "il y a %<PRIuMAX> seconde"
 msgstr[1] "il y a %<PRIuMAX> secondes"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "il y a %<PRIuMAX> minute"
 msgstr[1] "il y a %<PRIuMAX> minutes"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "il y a %<PRIuMAX> heure"
 msgstr[1] "il y a %<PRIuMAX> heures"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "il y a %<PRIuMAX> jour"
 msgstr[1] "il y a %<PRIuMAX> jours"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "il y a %<PRIuMAX> semaine"
 msgstr[1] "il y a %<PRIuMAX> semaines"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "il y a %<PRIuMAX> mois"
 msgstr[1] "il y a %<PRIuMAX> mois"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2460,14 +3143,14 @@ msgstr[0] "%<PRIuMAX> an"
 msgstr[1] "%<PRIuMAX> ans"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "il y a %s et %<PRIuMAX> mois"
 msgstr[1] "il y a %s et %<PRIuMAX> mois"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2505,7 +3188,7 @@ msgstr "Marquage de %d รฎlots, fait.\n"
 msgid "failed to read orderfile '%s'"
 msgstr "impossible de lire le fichier de commande '%s'"
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr "Dรฉtection de renommage inexact en cours"
 
@@ -2573,35 +3256,35 @@ msgstr ""
 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "l'application de diff externe a disparu, arrรชt ร  %s"
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S et --find-object sont mutuellement exclusifs"
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow a besoin d'une spรฉcification de chemin unique"
 
-#: diff.c:4689
+#: diff.c:4676
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valeur invalide de --statย : %s"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s attend une valeur numรฉrique"
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2610,42 +3293,42 @@ msgstr ""
 "Impossible d'analyser le paramรจtre de l'option --dirstat/-X :\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s"
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valeur inconnue aprรจs ws-error-highlight=%.*s"
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "impossible de rรฉsoudre '%s'"
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "forme <n>/<m> attendue par %s"
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "caractรจre attendu par %s, '%s' trouvรฉ"
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "mauvais argument --color-movedย : %s"
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "mode invalide '%s' dans --color-moved-ws"
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2653,155 +3336,155 @@ msgstr ""
 "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
 "\"histogram\""
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argument invalide pour %s"
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "รฉchec de l'analyse du paramรจtre de l'option --submodule : '%s'"
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "mauvais argument pour --word-diffย : %s"
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr "Options de format de sortie de diff"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr "gรฉnรฉrer la rustine"
 
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr "supprimer la sortie des diffรฉrences"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr "gรฉnรฉrer les diffs avec <n> lignes de contexte"
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr "gรฉnรฉrer le diff en format brut"
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr "synonyme de '-p --raw'"
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr "synonyme de '-p --stat'"
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr "--stat pour traitement automatique"
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr "afficher seulement la derniรจre ligne de --stat"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "afficher la distribution des quantitรฉs de modifications relatives pour "
 "chaque sous-rรฉpertoire"
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr "synonyme pour --dirstat=cumulative"
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "synonyme pour --dirstat=files,param1,param2..."
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "avertir si les modifications introduisent des marqueurs de conflit ou des "
 "erreurs d'espace"
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "rรฉsumรฉ succinct tel que les crรฉations, les renommages et les modifications "
 "de mode"
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr "n'afficher que les noms de fichiers modifiรฉs"
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr "n'afficher que les noms et les status des fichiers modifiรฉs"
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr "gรฉnรฉrer un diffstat"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr "<largeur>"
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr "gรฉnรฉrer un diffstat avec la largeur indiquรฉe"
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr "gรฉnerer un diffstat avec la largeur de nom indiquรฉe"
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr "gรฉnerer un diffstat avec la largeur de graphe indiquรฉe"
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr "<compte>"
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr "gรฉnรฉrer un diffstat avec des lignes limitรฉes"
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr "gรฉnรฉrer une rรฉsumรฉ compact dans le diffstat"
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr "produire un diff binaire qui peut รชtre appliquรฉ"
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "afficher les noms complets des objets pre- et post-image sur les lignes "
 "\"index\""
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr "afficher un diff colorรฉ"
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr "<sorte>"
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2809,7 +3492,7 @@ msgstr ""
 "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
 "'nouveau' dans le diff"
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2817,93 +3500,93 @@ msgstr ""
 "ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
 "champs dans --raw ou --numstat"
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr "<prรฉfixe>"
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr "afficher le prรฉfixe de source indiquรฉ au lieu de \"a/\""
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "afficher le prรฉfixe de destination indiquรฉ au lieu de \"b/\""
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr "prรฉfixer toutes les lignes en sortie avec la chaรฎne indiquรฉe"
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr "n'afficher aucun prรฉfixe, ni de source, ni de destination"
 
-#: diff.c:5371
+#: diff.c:5358
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "afficher le contexte entre les sections ร  concurrence du nombre de ligne "
 "indiquรฉ"
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr "<caractรจre>"
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "spรฉcifier le caractรจre pour indiquer une nouvelle ligne au lieu de '+'"
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "spรฉcifier le caractรจre pour indiquer une ancienne ligne au lieu de '-'"
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 "spรฉcifier le caractรจre pour indiquer une ligne de contexte au lieu de ' '"
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr "Options de renommage de diff"
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "casser les modifications d'une rรฉรฉcrire complรจte en paires de suppression et "
 "crรฉation"
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr "dรฉtecter les renommages"
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr "supprimer la prรฉ-image pour les suppressions"
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr "dรฉtecter les copies"
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr ""
 "utiliser les fichiers non-modifiรฉs comme sources pour trouver des copies"
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr "dรฉsactiver la dรฉtection de renommage"
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
 msgstr "utiliser des blobs vides comme source de renommage"
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
 msgstr "continuer ร  afficher l'historique d'un fichier au delร  des renommages"
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2911,161 +3594,161 @@ msgstr ""
 "empรชcher la dรฉtection de renommage/copie si le nombre de cibles de renommage/"
 "copie excรจde la limite indiquรฉe"
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr "Options de l'algorithme de diff"
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr "produire le diff le plus petit possible"
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorer les espaces lors de la comparaison de ligne"
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorer des modifications du nombre d'espaces"
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorer des modifications d'espace en fin de ligne"
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr "ignore le retour chariot en fin de ligne"
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr "ignorer les modifications dont les lignes sont vides"
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "heuristique qui dรฉplace les limites de sections de diff pour faciliter la "
 "lecture"
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "gรฉnรฉrer un diff en utilisant l'algorithme de diffรฉrence \"patience\""
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr ""
 "gรฉnรฉrer un diff en utilisant l'algorithme de diffรฉrence \"histogramme\""
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr "<algorithme>"
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr "choisir un algorithme de diffรฉrence"
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr "<texte>"
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "gรฉnรฉrer un diff en utilisant l'algorithme de diffรฉrence \"ancrรฉ\""
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "afficher des diffรฉrences par mot, en utilisant <mode> pour dรฉlimiter les "
 "mots modifiรฉs"
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr "utiliser <regex> pour dรฉcider ce qu'est un mot"
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "รฉquivalent ร  --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
 msgstr "les lignes dรฉplacรฉes sont colorรฉes diffรฉremment"
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
 msgstr "comment les espaces sont ignorรฉs dans --color-moved"
 
-#: diff.c:5469
+#: diff.c:5456
 msgid "Other diff options"
 msgstr "Autres options diff"
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "lancรฉ depuis un sous-rรฉpertoire, exclure les modifications en dehors et "
 "afficher les chemins relatifs"
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr "traiter les fichiers comme texte"
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
 msgstr "รฉchanger les entrรฉes, inverser le diff"
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "sortir un code d'erreur 1 s'il y avait de diffรฉrences, 0 sinon"
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr "dรฉsactiver tous les affichages du programme"
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr "autoriser l'exรฉcution d'un assistant externe de diff"
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "lancer les filtres externes de conversion en texte lors de la comparaison de "
 "fichiers binaires"
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr "<quand>"
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 "ignorer les modifications dans les sous-modules lors de la gรฉnรฉration de diff"
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr "spรฉcifier comment les diffรฉrences dans les sous-modules sont affichรฉes"
 
-#: diff.c:5496
+#: diff.c:5483
 msgid "hide 'git add -N' entries from the index"
 msgstr "masquer les entrรฉes 'git add -N' de l'index"
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "traiter les entrรฉes 'git add -N' comme rรฉelles dans l'index"
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr "<chaรฎne>"
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -3073,7 +3756,7 @@ msgstr ""
 "rechercher les diffรฉrences qui modifient le nombre d'occurrences de la "
 "chaรฎne spรฉcifiรฉe"
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3081,26 +3764,26 @@ msgstr ""
 "rechercher les diffรฉrences qui modifient le nombre d'occurrences de la regex "
 "spรฉcifiรฉe"
 
-#: diff.c:5508
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
 msgstr ""
 "afficher toutes les modifications dans l'ensemble de modifications avec -S "
 "ou -G"
 
-#: diff.c:5511
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 "traiter <chaรฎne> dans -S comme une expression rationnelle POSIX รฉtendue"
 
-#: diff.c:5514
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
 msgstr "contrรดler l'ordre dans lequel les fichiers apparaissent dans la sortie"
 
-#: diff.c:5515
+#: diff.c:5502
 msgid "<object-id>"
 msgstr "<id-objet>"
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3108,35 +3791,35 @@ msgstr ""
 "rechercher les diffรฉrences qui modifient le nombre d'occurrences de l'objet "
 "indiquรฉ"
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
 msgstr "sรฉlectionner les fichiers par types de diff"
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr "<fichier>"
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr "Sortie vers un fichier spรฉcifiรฉ"
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "dรฉtection de renommage inexact annulรฉe ร  cause d'un trop grand nombre de "
 "fichiers."
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "recherche uniquement des copies par modification de chemin ร  cause d'un trop "
 "grand nombre de fichiers."
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3144,41 +3827,62 @@ msgstr ""
 "vous souhaitez peut-รชtre rรฉgler la variable %s ร  au moins %d et rรฉessayer le "
 "commande."
 
-#: dir.c:537
+#: dir.c:555
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 "le spรฉcificateur de chemin '%s' ne correspond ร  aucun fichier connu de git"
 
-#: dir.c:926
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "motif non reconnuย : '%s'"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "motif nรฉgatif non reconnuย : '%s'"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"votre fichier d'extraction partielle pourrait prรฉsenter des problรจmesย : le "
+"motif '%s' est rรฉpรฉtรฉ"
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "dรฉsactivation de la correspondance de motif de cone"
+
+#: dir.c:1173
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "impossible d'utiliser %s comme fichier d'exclusion"
 
-#: dir.c:1843
+#: dir.c:2144
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "impossible d'ouvrir le rรฉpertoire '%s'"
 
-#: dir.c:2085
+#: dir.c:2479
 msgid "failed to get kernel name and information"
 msgstr "echec de l'obtention d'information de kernel"
 
-#: dir.c:2209
+#: dir.c:2603
 msgid "untracked cache is disabled on this system or location"
 msgstr "Le cache non suivi est dรฉsactivรฉ sur ce systรจme ou sur cet endroit"
 
-#: dir.c:3013
+#: dir.c:3407
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "fichier d'index corrompu dans le dรฉpรดt %s"
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3452 dir.c:3457
 #, c-format
 msgid "could not create directories for %s"
 msgstr "impossible de crรฉer les rรฉpertoires pour %s"
 
-#: dir.c:3092
+#: dir.c:3486
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "impossible de migrer le rรฉpertoire git de '%s' vers '%s'"
@@ -3199,12 +3903,12 @@ msgstr "Filtrage du contenu"
 msgid "could not stat file '%s'"
 msgstr "impossible de stat le fichier '%s'"
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "Espaces de nom de Git \"%s\""
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "impossible de rรฉgler GIT_DIR ร  '%s'"
@@ -3214,266 +3918,270 @@ msgstr "impossible de rรฉgler GIT_DIR ร  '%s'"
 msgid "too many args to run %s"
 msgstr "trop d'arguments pour lancer %s"
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Dรฉpรดt distant sans URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack : liste superficielle attendue"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 "git fetch-pack : paquet de vidage attendu aprรจs une liste superficielle"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reรงu"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reรงu"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr "impossible d'รฉcrire sur un distant"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc nรฉcessite multi_ack_detailed"
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ligne de superficiel invalideย : %s"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ligne de fin de superficiel invalide : %s"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr "objet non trouvรฉย : %s"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr "Erreur dans l'objetย : %s"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr "Pas de superficiel trouvรฉย : %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "superficiel/non superficiel attendu, %s trouvรฉ"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr "rรฉponse %s %d %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit invalide %s"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr "abandon"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr "fait"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s trouvรฉ (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marquage de %s comme terminรฉ"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr "%s dรฉjร  possรฉdรฉ (%s)"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-packย : impossible de dupliquer le dรฉmultiplexeur latรฉral"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr "erreur de protocoleย : mauvais entรชte de paquet"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack : impossible de dupliquer %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr "รฉchec de %s"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr "erreur dans le dรฉmultiplexer latรฉral"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La version du serveur est %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr "Le serveur supporte %s"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr "Le serveur ne supporte les clients superficiels"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr "Le receveur ne gรจre pas --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr "Le receveur ne gรจre pas --shallow-exclude"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr "Le receveur ne gรจre pas --deepen"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr "pas de commit commun"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-packย : รฉchec de le rรฉcupรฉration."
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr "Le serveur ne supporte les requรชtes superficielles"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr "Le serveur supporte filter"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr "impossible d'รฉcrire la requรชte sur le distant"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "erreur ร  la lecture de l'entรชte de section '%s'"
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' attendu, '%s' reรงu"
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "ligne d'acquittement inattendueย : '%s'"
 
-#: fetch-pack.c:1252
+#: fetch-pack.c:1308
 #, c-format
 msgid "error processing acks: %d"
 msgstr "erreur lors du traitement des acquittementsย : %d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr "fichier paquet attendu ร  envoyer aprรจs 'ready'"
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "aucune autre section attendue ร  envoyer aprรจs absence de 'ready'"
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "erreur lors du traitement de l'information de superficialitรฉย : %d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref attendu, '%s' trouvรฉ"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inattenduย : '%s'"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "erreur lors du traitement des rรฉfรฉrences vouluesย : %d"
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr "pas de HEAD distante correspondante"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:689
 msgid "remote did not send all necessary objects"
 msgstr "le serveur distant n'a pas envoyรฉ tous les objets nรฉcessaires"
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr "rรฉfรฉrence distante inconnue %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Le serveur n'autorise pas de requรชte pour l'objet %s non annoncรฉ"
 
-#: gpg-interface.c:321
+#: gpg-interface.c:408
 msgid "gpg failed to sign the data"
 msgstr "gpg n'a pas pu signer les donnรฉes"
 
-#: gpg-interface.c:347
+#: gpg-interface.c:434
 msgid "could not create temporary file"
 msgstr "impossible de crรฉer un fichier temporaire"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:437
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "impossible d'รฉcrire la signature dรฉtachรฉe dans '%s'"
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "couleur invalide '%.*s' ignorรฉe dans log.graphColors"
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
+"supportรฉ qu'avec -P avec PCRE v2"
+
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s' : lecture de %s impossible"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "รฉchec du stat de '%s'"
 
-#: grep.c:2145
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s' : lecture tronquรฉe"
@@ -3524,7 +4232,7 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Commandes bas niveau / Interrogateurs"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Commandes bas niveau / Synchronisation de dรฉpรดts"
 
 #: help.c:38
@@ -3620,12 +4328,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr "git version [<options>]"
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3693,48 +4401,64 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"
 msgid "name consists only of disallowed characters: %s"
 msgstr "le nom n'est constituรฉ que de caractรจres interditsย : %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:635
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de date invalide : %s"
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr ""
 "l'entrรฉe '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr ""
 "l'entrรฉe '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "impossible de charger l'arbre racine pour le commit %s"
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "impossible de combiner des spรฉcificateurs multiples de filtre"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "impossible d'accรฉder au blob clairsemรฉ dans '%s'"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "impossible d'analyser la donnรฉe de filtre clairsemรฉ dans %s"
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr "attenduย : 'tree:<profondeur>'"
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr "sparseย : le support des filtres de chemin a รฉtรฉ abandonnรฉ"
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "spรฉcificateur de filtre invalide '%s'"
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "impossible de modifier le prometteur distant de clone partiel"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+"le caractรจre doit รชtre รฉchappรฉ dans le spรฉcificateur de sous-filtreย : '%c'"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "quelque chose attendu aprรจs combineย :"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "impossible de combiner des spรฉcificateurs multiples de filtre"
 
 #: lockfile.c:151
 #, c-format
@@ -3764,117 +4488,113 @@ msgstr "Impossible de crรฉer '%s.lock'ย : %s"
 msgid "failed to read the cache"
 msgstr "impossible de lire le cache"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "impossible d'รฉcrire le nouveau fichier d'index"
 
-#: merge-recursive.c:322
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(mauvais commit)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "รฉchec de addinfo_cache pour le chemin '%s'ย ; abandon de la fusion."
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "รฉchec de addinfo_cache pour le chemin '%s'ย ; abandon de la fusion."
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "erreur de construction des arbres"
-
-#: merge-recursive.c:863
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "impossible de crรฉer le chemin '%s' %s"
 
-#: merge-recursive.c:874
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Suppression de %s pour faire de la place pour le sous-rรฉpertoire\n"
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr ": peut-รชtre un conflit D/F ?"
 
-#: merge-recursive.c:897
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "refus de perdre le fichier non suivi '%s'"
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "impossible de lire l'objet %s '%s'"
 
-#: merge-recursive.c:941
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob attendu pour %s '%s'"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "รฉchec ร  l'ouverture de '%s'ย : %s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "รฉchec ร  la crรฉation du lien symbolique '%s'ย : %s"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "ne sait pas traiter %06o %s '%s'"
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "ร‰chec de la fusion du sous-module %s (non extrait)"
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "ร‰chec de fusion du sous-module %s (commits non prรฉsents)"
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "ร‰chec de la fusion du sous-module %s (les commits ne descendent pas de la "
 "base de fusion)"
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Avance rapide du sous-module %s au commit suivantย :"
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avance rapide du sous-module %s"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "ร‰chec de fusion du sous-module %s (fusion suivant les commits non trouvรฉe)"
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "ร‰chec de fusion du sous-module %s (pas en avance rapide)"
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Rรฉsolution possible de fusion trouvรฉe pour le sous-moduleย :\n"
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3891,33 +4611,33 @@ msgstr ""
 "\n"
 "qui acceptera cette suggestion.\n"
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "ร‰chec de fusion du sous-module %s (plusieurs fusions trouvรฉes)"
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "ร‰chec ร  l'exรฉcution de la fusion interne"
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Impossible d'ajouter %s ร  la base de donnรฉes"
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Fusion automatique de %s"
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Erreurย : refus de perdre le fichier non suivi %sย ; รฉcriture dans %s ร  la "
 "place."
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3926,7 +4646,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimรฉ dans %s et %s dans %s. Version %s de "
 "%s laissรฉe dans l'arbre."
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3935,7 +4655,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimรฉ dans %s et %s ร  %s dans %s. Version "
 "%s de %s laissรฉe dans l'arbre."
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3944,7 +4664,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimรฉ dans %s et %s dans %s. Version %s de "
 "%s laissรฉe dans l'arbre dans le fichier %s."
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3953,41 +4673,41 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimรฉ dans %s et %s ร  %s dans %s. Version "
 "%s de %s laissรฉe dans l'arbre dans le fichier %s."
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "renommage"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "renommรฉ"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Refus de perdre le fichier modifiรฉ %s"
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "Refus de perdre le fichier non suivi %s, mรชme s'il gรชne."
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajoutรฉ dans %s"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s est un rรฉpertoire dans %s ajoutรฉ plutรดt comme %s"
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s ร  la place"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3996,18 +4716,18 @@ msgstr ""
 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " (laissรฉ non rรฉsolu)"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1793
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
 ">'%s' dans %s"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4018,7 +4738,7 @@ msgstr ""
 "parce que le rรฉpertoire %s a รฉtรฉ renommรฉ en plusieurs autres rรฉpertoires, "
 "sans aucune destination rรฉcupรฉrant la majoritรฉ des fichiers."
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4027,7 +4747,7 @@ msgstr ""
 "CONFLIT (renommage implicite de rรฉpertoire)ย : le rรฉpertoire/fichier %s gรชne "
 "des renommages implicites de rรฉpertoire dรฉplaรงant les chemins suivantsย : %s."
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4036,7 +4756,7 @@ msgstr ""
 "CONFLIT (renommage implicite de rรฉpertoire)ย : impossible de transformer "
 "plusieurs chemins sur %sย ; les chemins concernรฉs sontย : %s"
 
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4045,7 +4765,7 @@ msgstr ""
 "CONFLIT (renommage/renommage) : renommage du rรฉpertoire %s->%s dans %s. "
 "Renommage de rรฉpertoire %s->%s dans %s"
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4054,52 +4774,52 @@ msgstr ""
 "AVERTISSEMENTย : ne renomme pas %s->%s dans %s, parce que %s lui-mรชme a รฉtรฉ "
 "renommรฉ."
 
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
 #, c-format
 msgid "cannot read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objet %s n'est pas un blob"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modify"
 msgstr "modification"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modified"
 msgstr "modifiรฉ"
 
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
 msgid "content"
 msgstr "contenu"
 
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
 msgid "add/add"
 msgstr "ajout/ajout"
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s sautรฉ (fusion identique ร  l'existant)"
 
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:1003
 msgid "submodule"
 msgstr "sous-module"
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
 
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Ajout plutรดt comme %s"
 
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4108,7 +4828,7 @@ msgstr ""
 "Chemin mis ร  jourย : %s ajoutรฉ dans %s dans un rรฉpertoire qui a รฉtรฉ renommรฉ "
 "en %sย ; dรฉplacรฉ dans %s."
 
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4118,7 +4838,7 @@ msgstr ""
 "a รฉtรฉ renommรฉ dans %s, ce qui suggรจre qu'il devrait peut-รชtre รชtre dรฉplacรฉ "
 "vers %s."
 
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4127,7 +4847,7 @@ msgstr ""
 "Chemin mis ร  jourย : %s renommรฉ en %s dans %s, dans un rรฉpertoire qui a รฉtรฉ "
 "renommรฉ en %sย ; dรฉplacรฉ dans %s."
 
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4137,176 +4857,184 @@ msgstr ""
 "rรฉpertoire qui a รฉtรฉ renommรฉ dans %s, ce qui suggรจre qu'il devrait peut-รชtre "
 "รชtre dรฉplacรฉ vers %s."
 
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
 msgid "file/directory"
 msgstr "fichier/rรฉpertoire"
 
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
 msgid "directory/file"
 msgstr "rรฉpertoire/fichier"
 
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLIT (%s) : Il y a un rรฉpertoire nommรฉ %s dans %s. Ajout de %s comme %s"
 
-#: merge-recursive.c:3347
+#: merge-recursive.c:3371
 #, c-format
 msgid "Adding %s"
 msgstr "Ajout de %s"
 
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLIT (ajout/ajout)ย : Conflit de fusion dans %s"
 
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Vos modifications locales aux fichiers suivants seraient รฉcrasรฉes par la "
-"fusionย :\n"
-"  %s"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
 msgid "Already up to date!"
 msgstr "Dรฉjร  ร  jour !"
 
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "รฉchec de fusion des arbres %s et %s"
 
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
 msgid "Merging:"
 msgstr "Fusion :"
 
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u ancรชtre commun trouvรฉ :"
 msgstr[1] "%u ancรชtres communs trouvรฉs :"
 
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
 msgid "merge returned no commit"
 msgstr "la fusion n'a pas retournรฉ de commit"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient รฉcrasรฉes par la "
+"fusionย :\n"
+"  %s"
+
+#: merge-recursive.c:3756
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
 msgid "Unable to write index."
 msgstr "Impossible d'รฉcrire l'index."
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "le fichier d'index multi-paquet %s est trop petit"
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 "la signature de l'index multi-paquet 0x%08x ne correspond pas ร  la signature "
 "0x%08x"
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "la version d'index multi-paquet %d n'est pas reconnue"
 
-#: midx.c:95
+#: midx.c:94
 #, c-format
 msgid "hash version %u does not match"
 msgstr "la version %u du condensรฉ ne correspond pas"
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr "dรฉcalage de section invalide (trop grand)"
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr ""
 "identifiant de terminaison de tronรงon d'index multi-paquet terminant "
 "apparaรฎt plus tรดt qu'attendu"
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "index multi-paquet manque de tronรงon de nom de paquet"
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "index multi-paquet manque de tronรงon de d'รฉtalement OID requis"
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "index multi-paquet manque de tronรงon de recherche OID"
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "index multi-paquet manque de tronรงon de dรฉcalage d'objet"
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 "index multi-paquet les noms de paquets sont en dรฉsordreย : '%s' avant '%s'"
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "mauvais pack-int-idย : %u (%u paquets au total)"
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "multi-pack-index stock un dรฉcalage en 64-bit, mais off_t est trop petit"
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr "erreur ร  la prรฉparation du fichier paquet depuis un index multi-paquet"
 
-#: midx.c:470
+#: midx.c:472
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "รฉchec de l'ajout du fichier paquet '%s'"
 
-#: midx.c:476
+#: midx.c:478
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "รฉchec ร  l'ouverture du fichier paquet '%s'"
 
-#: midx.c:536
+#: midx.c:538
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "รฉchec de localisation de l'objet %d dans le fichier paquet"
 
-#: midx.c:865
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Ajout de fichiers paquet ร  un index multi-paquet"
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "fichier paquet ร  รฉliminer %s non trouvรฉ"
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "ร‰criture des sections dans l'index multi-paquet"
+
+#: midx.c:1052
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "รฉchec du nettoyage de l'index de multi-paquet ร  %s"
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr "Recherche de fichiers paquets rรฉfรฉrencรฉs"
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -4314,57 +5042,65 @@ msgstr ""
 "รฉtalement oid en dรฉsordreย : รฉtalement[%d] = %<PRIx32> > %<PRIx32> = "
 "รฉtalement[%d]"
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
-msgstr "Vรฉrification de l'ordre des OID dans MIDX"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Vรฉrification de l'ordre des OID dans l'index multi-paquet"
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "recherche d'oid en dรฉsordreย : oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr "Classement des objets par fichier paquet"
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr "Vรฉrification des dรฉcalages des objets"
 
-#: midx.c:1160
+#: midx.c:1180
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "รฉchec de la lecture de l'รฉlรฉment de cache pour oid[%d] = %s"
 
-#: midx.c:1166
+#: midx.c:1186
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "impossible de lire le fichier paquet %s"
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "dรฉcalage d'objet incorrect pour oid[%d] = %sย : %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "Comptage des objets rรฉfรฉrencรฉs"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Recherche et effacement des fichiers paquets non-rรฉfรฉrencรฉs"
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr "Impossible de dรฉmarrer le groupement d'objets"
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr "Impossible de finir le groupement d'objets"
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "impossible de crรฉer le fil lazy_dir : %s"
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "impossible de crรฉer le fil lazy_name : %s"
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "impossible de joindre le fil lazy_name : %s"
@@ -4408,32 +5144,32 @@ msgstr "Refus de rรฉรฉcrire des notes dans %s (hors de refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Mauvaise valeur de %s : '%s'"
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "type d'objet invalide \"%s\""
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "l'objet %s est de type %s, pas de type %s"
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "l'objet %s a un id de type inconnu %d"
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "impossible d'analyser l'objet : %s"
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr "incohรฉrence de hachage %s"
 
-#: packfile.c:648
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset avant la fin du fichier paquet (.idx cassรฉย ?)"
 
@@ -4448,6 +5184,11 @@ msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset au delร  de la fin de l'index de paquet pour %s (index tronquรฉย ?)"
 
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "impossible de rรฉcupรฉrer la taille de %s"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4463,7 +5204,7 @@ msgstr "%s est incompatible avec %s"
 msgid "%s : incompatible with something else"
 msgstr "%s est incompatible avec toute autre option"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s n'accepte aucune valeur"
@@ -4473,41 +5214,41 @@ msgstr "%s n'accepte aucune valeur"
 msgid "%s isn't available"
 msgstr "%s n'est pas disponible"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s attend une valeur entiรจre non nรฉgative avec une suffixe k/m/g"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "option ambigรผeย : %s (devrait รชtre --%s%s ou --%s%s)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
 
-#: parse-options.c:859
+#: parse-options.c:857
 #, c-format
 msgid "unknown option `%s'"
 msgstr "option inconnue ยซย %sย ยป"
 
-#: parse-options.c:861
+#: parse-options.c:859
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "bascule inconnue ยซย %cย ยป"
 
-#: parse-options.c:863
+#: parse-options.c:861
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "option non-ascii inconnue dans la chaรฎneย : '%s'"
 
-#: parse-options.c:887
+#: parse-options.c:885
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:906
+#: parse-options.c:904
 #, c-format
 msgid "usage: %s"
 msgstr "usage : %s"
@@ -4515,21 +5256,21 @@ msgstr "usage : %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:910
 #, c-format
 msgid "   or: %s"
 msgstr "   ou : %s"
 
-#: parse-options.c:915
+#: parse-options.c:913
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:952
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:968
+#: parse-options.c:966
 #, c-format
 msgid "alias of --%s"
 msgstr "alias pour --%s"
@@ -4554,37 +5295,37 @@ msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""
 msgid "malformed object name '%s'"
 msgstr "nom d'objet malformรฉ '%s'"
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Impossible de rendre %s inscriptible pour le groupe"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Le caractรจre d'รฉchappement '\\\\' interdit comme dernier caractรจre dans une "
 "valeur d'attribut"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Une seule spรฉcification 'attr:' est autorisรฉe."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "un spรฉcificateur d'attribut ne peut pas รชtre vide"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nom d'attribut invalide %s"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "les rรฉglages de spรฉcificateurs de chemin gรฉnรฉraux 'glob' et 'noglob' sont "
 "incompatibles"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4592,52 +5333,57 @@ msgstr ""
 "le rรฉglage global de spรฉcificateur de chemin 'literal' est incompatible avec "
 "tous les autres rรฉglages globaux de spรฉcificateur de chemin"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "paramรจtre invalide pour le spรฉcificateur magique de chemin 'prefix'"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "La spรฉcification magique de chemin '%.*s' est invalide dans '%s'"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "')' manquante ร  la fin du spรฉcificateur magique de chemin dans '%s'"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Spรฉcificateur magique '%c' non implรฉmentรฉ dans '%s'"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s : 'literal' et 'glob' sont incompatibles"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s : '%s' est hors du dรฉpรดt"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s : '%s' est hors du dรฉpรดt ร  '%s'"
 
-#: pathspec.c:514
+#: pathspec.c:517
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (mnรฉmoniqueย : '%c')"
 
-#: pathspec.c:524
+#: pathspec.c:527
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 "%s : le spรฉcificateur magique de chemin n'est pas supportรฉ par cette "
 "commande : %s"
 
-#: pathspec.c:591
+#: pathspec.c:594
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "le chemin '%s' est au-delร  d'un lien symbolique"
 
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la ligne est mal citรฉeย : %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "impossible d'รฉcrire le paquet de vidage"
@@ -4700,33 +5446,42 @@ msgstr "Rafraรฎchissement de l'index"
 msgid "unable to create threaded lstat: %s"
 msgstr "impossible de crรฉer le lstat en fil : %s"
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr "impossible d'analyser le format --pretty"
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "Dรฉpรดt distant sans URL"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "un nom de prometteur distant ne peut pas commencer par '/'ย : %s"
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "impossible de dรฉmarrer `log`"
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr "impossible de lire la sortie de `log`"
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5020
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "impossible d'analyser le commit '%s'"
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "impossible d'analyser l'entรชte git '%.*s'"
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr "รฉchec de la gรฉnรฉration de diff"
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "impossible d'analyser le journal pour '%s'"
@@ -4767,16 +5522,16 @@ msgstr "impossible d'ajouter '%s' ร  l'index"
 msgid "unable to stat '%s'"
 msgstr "fstat de '%s' impossible"
 
-#: read-cache.c:1314
+#: read-cache.c:1330
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' existe ร  la fois comme un fichier et un rรฉpertoire"
 
-#: read-cache.c:1499
+#: read-cache.c:1536
 msgid "Refresh index"
 msgstr "Rafraรฎchir l'index"
 
-#: read-cache.c:1613
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4785,7 +5540,7 @@ msgstr ""
 "version d'index renseignรฉe, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4794,150 +5549,161 @@ msgstr ""
 "GIT_INDEX_VERSION est renseignรฉ, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1717
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "signature incorrecte 0x%08x"
 
-#: read-cache.c:1682
+#: read-cache.c:1720
 #, c-format
 msgid "bad index version %d"
 msgstr "mauvaise version d'index %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1729
 msgid "bad index file sha1 signature"
 msgstr "mauvaise signature sha1 d'index"
 
-#: read-cache.c:1721
+#: read-cache.c:1759
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"
 
-#: read-cache.c:1723
+#: read-cache.c:1761
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "extension %.4s ignorรฉe"
 
-#: read-cache.c:1760
+#: read-cache.c:1798
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "format d'entrรฉe d'index inconnu 0x%08x"
 
-#: read-cache.c:1776
+#: read-cache.c:1814
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "champ de nom malformรฉ dans l'index, prรจs du chemin '%s'"
 
-#: read-cache.c:1833
+#: read-cache.c:1871
 msgid "unordered stage entries in index"
 msgstr "entrรฉes de prรฉparation non ordonnรฉes dans l'index"
 
-#: read-cache.c:1836
+#: read-cache.c:1874
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "entrรฉes multiples de prรฉparation pour le fichier fusionnรฉ '%s'"
 
-#: read-cache.c:1839
+#: read-cache.c:1877
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "entrรฉes de prรฉparation non ordonnรฉes pour '%s'"
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "fichier d'index corrompu"
 
-#: read-cache.c:2087
+#: read-cache.c:2124
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "impossible de crรฉer le fil load_cache_entries : %s"
 
-#: read-cache.c:2100
+#: read-cache.c:2137
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "impossible de joindre le fil load_cach_entries : %s"
 
-#: read-cache.c:2133
+#: read-cache.c:2170
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%sย : l'ouverture du fichier d'index a รฉchouรฉ"
 
-#: read-cache.c:2137
+#: read-cache.c:2174
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%sย : impossible de faire un stat sur l'index ouvert"
 
-#: read-cache.c:2141
+#: read-cache.c:2178
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%sย : fichier d'index plus petit qu'attendu"
 
-#: read-cache.c:2145
+#: read-cache.c:2182
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%sย : impossible de mapper le fichier d'index"
 
-#: read-cache.c:2187
+#: read-cache.c:2224
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "impossible de crรฉer le fil load_index_extensions : %s"
 
-#: read-cache.c:2214
+#: read-cache.c:2251
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "impossible de joindre le fil load_index_extensions : %s"
 
-#: read-cache.c:2246
+#: read-cache.c:2283
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "impossible de rafraรฎchir l'index partagรฉ '%s'"
 
-#: read-cache.c:2293
+#: read-cache.c:2330
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "index cassรฉ, %s attendu dans %s, %s obtenu"
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
 #, c-format
 msgid "could not close '%s'"
 msgstr "impossible de fermer '%s'"
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
 #, c-format
 msgid "could not stat '%s'"
 msgstr "stat impossible de '%s'"
 
-#: read-cache.c:3105
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "impossible d'ouvrir le rรฉpertoire gitย : %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "รฉchec lors de l'unlinkย : %s"
 
-#: read-cache.c:3142
+#: read-cache.c:3179
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "impossible de rรฉgler les bits de droit de '%s'"
 
-#: read-cache.c:3291
+#: read-cache.c:3328
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s : impossible de revenir ร  l'รฉtape 0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
+"rebase --continue'.\n"
+"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "paramรจtre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignorรฉ."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4979,14 +5745,14 @@ msgstr ""
 "\n"
 "Vous pouvez rรฉordonner ces lignesย ; elles sont exรฉcutรฉes de haut en bas.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebasage de %s sur %s (%d commande)"
 msgstr[1] "Rebasage de %s sur %s (%d commandes)"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -4995,7 +5761,7 @@ msgstr ""
 "Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
 "commit.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5003,7 +5769,7 @@ msgstr ""
 "\n"
 "Si vous รฉliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5018,7 +5784,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -5028,22 +5794,19 @@ msgstr ""
 "Cependant, si vous effacez tout, le rebasage sera annulรฉ.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Veuillez noter que les commits vides sont en commentaire"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
 #, c-format
 msgid "could not write '%s'"
 msgstr "impossible d'รฉcrire '%s'"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "impossible de copier '%s' vers '%s'."
+msgid "could not write '%s'."
+msgstr "impossible d'รฉcrire '%s'."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -5052,7 +5815,7 @@ msgstr ""
 "Attentionย : certains commits ont pu รชtre accidentellement supprimรฉs.\n"
 "Commits supprimรฉs (du plus jeune au plus vieux)ย :\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -5070,6 +5833,13 @@ msgstr ""
 "Les comportements disponibles sontย : ignore, warn, error.\n"
 "\n"
 
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "impossible de lire '%s'."
+
 #: refs.c:262
 #, c-format
 msgid "%s does not point to a valid object!"
@@ -5080,7 +5850,7 @@ msgstr "%s ne pointe pas sur un objet valide!"
 msgid "ignoring dangling symref %s"
 msgstr "symref pendant %s ignorรฉ"
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "rรฉf cassรฉ %s ignorรฉ"
@@ -5105,14 +5875,15 @@ msgstr "la rรฉfรฉrence '%s' existe dรฉjร "
 msgid "unexpected object ID when writing '%s'"
 msgstr "id d'objet inattendu pendant l'รฉcriture de '%s'"
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "impossible d'รฉcrire dans '%s'"
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "impossible d'ouvrir '%s' en รฉcriture"
@@ -5147,37 +5918,37 @@ msgstr "refus de mettre ร  jour une rรฉf avec un nom cassรฉ '%s'"
 msgid "update_ref failed for ref '%s': %s"
 msgstr "รฉchec de update_ref pour la rรฉf '%s'ย : %s"
 
-#: refs.c:2012
+#: refs.c:2023
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "mises ร  jour multiples pour la rรฉf '%s' non permises"
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "mises ร  jour des rรฉfรฉrences interdites en environnement de quarantaine"
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' existeย ; impossible de crรฉer '%s'"
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "impossible de traiter '%s' et '%s' en mรชme temps"
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr "impossible de supprimer la rรฉfรฉrence %s"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Impossible de supprimer la rรฉfรฉrence %sย : %s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "impossible de supprimer les rรฉfรฉrencesย : %s"
@@ -5188,7 +5959,7 @@ msgid "invalid refspec '%s'"
 msgstr "spรฉcificateur de rรฉference invalideย : '%s'"
 
 # ร  priori on parle d'une branche ici
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr "disparue"
 
@@ -5207,283 +5978,283 @@ msgstr "en retard de %d"
 msgid "ahead %d, behind %d"
 msgstr "en avance de %d, en retard de %d"
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "format attenduย : %%(color:<couleur>)"
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "couleur non reconnue : %%(color:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valeur entiรจre attendue refname:lstrip=%s"
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valeur entiรจre attendue refname:rstrip=%s"
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argument %%(%s) non reconnuย : %s"
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) n'accepte pas d'argument"
 
-#: ref-filter.c:269
+#: ref-filter.c:272
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "argument %%(objectsize) non reconnu : %s"
 
-#: ref-filter.c:277
+#: ref-filter.c:280
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) n'accepte pas d'argument"
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) n'accepte pas d'argument"
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) n'accepte pas d'argument"
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "argument %%(trailers) inconnuย : %s"
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valeur positive attendue contents:lines=%s"
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argument %%(contents) non reconnu : %s"
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valeur positive attendue objectname:short=%s"
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "argument %%(objectname) non reconnu : %s"
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format attenduย : %%(align:<largeur>,<position>)"
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "position non reconnueย : %s"
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "largeur non reconnueย : %s"
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argument %%(align) non reconnu : %s"
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "valeur positive attendue avec l'atome %%(align)"
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argument %%(if) non reconnuย : %s"
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de champ malformรฉ %.*s"
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de champ inconnu : %.*s"
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 "pas un dรฉpรดt git, mais le champ '%.*s' nรฉcessite l'accรจs aux donnรฉes d'objet"
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "formatย : atome %%(if) utilisรฉ sans un atome %%(then)"
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "formatย : atome %%(then) utilisรฉ sans un atome %%(if)"
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "formatย : atome %%(then) utilisรฉ plus d'une fois"
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atome %%(then) utilisรฉ aprรจs %%(else)"
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "formatย : atome %%(else) utilisรฉ sans un atome %%(if)"
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "formatย : atome %%(else) utilisรฉ sans un atome %%(then)"
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "formatย : atome %%(else) utilisรฉ plus d'une fois"
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "formatย : atome %%(end) utilisรฉ sans atome correspondant"
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr "Chaรฎne de formatage mal formรฉe %s"
 
-#: ref-filter.c:1485
+#: ref-filter.c:1488
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr "aucune branche, rebasage de %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1491
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr "aucune branche, rebasage de la HEAD dรฉtachรฉe %s"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr "aucune branche, bisect a dรฉmarrรฉ sur %s"
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr "aucune branche"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objet manquant %s pour %s"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "รฉchec de parse_object_buffer sur %s pour %s"
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objet malformรฉ ร  '%s'"
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "rรฉf avec un nom cassรฉ %s ignorรฉ"
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atome %%(end) manquant"
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr "l'option ยซย %sย ยป est incompatible avec --merged"
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr "l'option ยซย %sย ยป est incompatible avec --no-merged"
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objet malformรฉ %s"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'option '%s' doit pointer sur un commit"
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "un raccourci de configuration de distant ne peut pas commencer par '/'ย : %s"
 
-#: remote.c:410
+#: remote.c:414
 msgid "more than one receivepack given, using the first"
 msgstr "plus d'un receivepack fournis, utilisation du premier"
 
-#: remote.c:418
+#: remote.c:422
 msgid "more than one uploadpack given, using the first"
 msgstr "plus d'un uploadpack fournis, utilisation du premier"
 
-#: remote.c:608
+#: remote.c:612
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Impossible de rรฉcupรฉrer ร  la fois %s et %s pour %s"
 
-#: remote.c:612
+#: remote.c:616
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s suit habituellement %s, pas %s"
 
-#: remote.c:616
+#: remote.c:620
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s suit ร  la fois %s et %s"
 
-#: remote.c:684
+#: remote.c:688
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "la clรฉ '%s' du modรจle n'a pas de '*'"
 
-#: remote.c:694
+#: remote.c:698
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "la valeur '%s' du modรจle n'a pas de '*'"
 
-#: remote.c:1000
+#: remote.c:1004
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr ""
 "le spรฉcificateur de rรฉfรฉrence source %s ne correspond ร  aucune rรฉfรฉrence"
 
-#: remote.c:1005
+#: remote.c:1009
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -5493,7 +6264,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1024
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5517,7 +6288,7 @@ msgstr ""
 "Aucune n'a fonctionnรฉ, donc abandon. Veuillez spรฉcifier une rรฉfรฉrence "
 "totalement qualifiรฉe."
 
-#: remote.c:1040
+#: remote.c:1044
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5528,7 +6299,7 @@ msgstr ""
 "Souhaitiez-vous crรฉer une nouvelle branche en poussant sur\n"
 "'%s:refs/heads/%s'ย ?"
 
-#: remote.c:1045
+#: remote.c:1049
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5539,7 +6310,7 @@ msgstr ""
 "Souhaitiez-vous crรฉer une nouvelle รฉtiquette en poussant sur\n"
 "'%s:refs/tags/%s'ย ?"
 
-#: remote.c:1050
+#: remote.c:1054
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5550,7 +6321,7 @@ msgstr ""
 "Souhaitiez-vous crรฉer un nouvel arbre en poussant sur\n"
 "'%s:refs/tags/%s'ย ?"
 
-#: remote.c:1055
+#: remote.c:1059
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5561,119 +6332,119 @@ msgstr ""
 "Souhaitiez-vous crรฉer un nouveau blob en poussant sur\n"
 "'%s:refs/tags/%s'ย ?"
 
-#: remote.c:1091
+#: remote.c:1095
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "'%s' ne peut pas รชtre rรฉsolue comme une branche"
 
-#: remote.c:1102
+#: remote.c:1106
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "suppression d '%s' impossibleย : la rรฉfรฉrence distante n'existe pas"
 
-#: remote.c:1114
+#: remote.c:1118
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 "le spรฉcificateur de rรฉfรฉrence dst %s correspond ร  plus d'un spรฉcificateur de "
 "rรฉfรฉrences"
 
-#: remote.c:1121
+#: remote.c:1125
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "le spรฉcificateur de rรฉfรฉrence dst %s reรงoit depuis plus d'une source"
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1628 remote.c:1729
 msgid "HEAD does not point to a branch"
 msgstr "HEAD ne pointe pas sur une branche"
 
-#: remote.c:1633
+#: remote.c:1637
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "pas de branche '%s'"
 
-#: remote.c:1636
+#: remote.c:1640
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "aucune branche amont configurรฉe pour la branche '%s'"
 
-#: remote.c:1642
+#: remote.c:1646
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la branche amont '%s' n'est pas stockรฉe comme branche de suivi"
 
-#: remote.c:1657
+#: remote.c:1661
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "la destination de poussรฉe '%s' sur le serveur distant '%s' n'a pas de "
 "branche locale de suivi"
 
-#: remote.c:1669
+#: remote.c:1673
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branche '%s' n'a aucune branche distante de poussรฉe"
 
-#: remote.c:1679
+#: remote.c:1683
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "les rรฉfรฉrences de spec pour '%s' n'incluent pas '%s'"
 
-#: remote.c:1692
+#: remote.c:1696
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "la poussรฉe n'a pas de destination (push.default vaut 'nothing')"
 
-#: remote.c:1714
+#: remote.c:1718
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 "impossible de rรฉsoudre une poussรฉe 'simple' pour une destination unique"
 
-#: remote.c:1840
+#: remote.c:1844
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "impossible de trouver la rรฉfรฉrence distante %s"
 
-#: remote.c:1853
+#: remote.c:1857
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Rรฉfรฉrence bizarre '%s' ignorรฉe localement"
 
-#: remote.c:2016
+#: remote.c:2020
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Votre branche est basรฉe sur '%s', mais la branche amont a disparu.\n"
 
-#: remote.c:2020
+#: remote.c:2024
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
 
-#: remote.c:2023
+#: remote.c:2027
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Votre branche est ร  jour avec '%s'.\n"
 
-#: remote.c:2027
+#: remote.c:2031
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Votre branche et '%s' font rรฉfรฉrence ร  des commits diffรฉrents.\n"
 
-#: remote.c:2030
+#: remote.c:2034
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (utilisez \"%s\" pour plus de dรฉtails)\n"
 
-#: remote.c:2034
+#: remote.c:2038
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
 
-#: remote.c:2040
+#: remote.c:2044
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (utilisez \"git push\" pour publier vos commits locaux)\n"
 
-#: remote.c:2043
+#: remote.c:2047
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5685,11 +6456,11 @@ msgstr[1] ""
 "Votre branche est en retard sur '%s' de %d commits, et peut รชtre mise ร  jour "
 "en avance rapide.\n"
 
-#: remote.c:2051
+#: remote.c:2055
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (utilisez \"git pull\" pour mettre ร  jour votre branche locale)\n"
 
-#: remote.c:2054
+#: remote.c:2058
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5704,12 +6475,12 @@ msgstr[1] ""
 "Votre branche et '%s' ont divergรฉ,\n"
 "et ont %d et %d commits diffรฉrents chacune respectivement.\n"
 
-#: remote.c:2064
+#: remote.c:2068
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (utilisez \"git pull\" pour fusionner la branche distante dans la vรดtre)\n"
 
-#: remote.c:2247
+#: remote.c:2251
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "impossible d'analyser le nom attendu d'objet '%s'"
@@ -5724,7 +6495,7 @@ msgstr "mauvaise rรฉfรฉrences de remplacement : %s"
 msgid "duplicate replace ref: %s"
 msgstr "rรฉfรฉrence de remplacement dupliquรฉeย : %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "profondeur de remplacement trop grande pour l'objet %s"
@@ -5787,8 +6558,8 @@ msgstr "impossible de dรฉlier '%s' qui est errant"
 msgid "Recorded preimage for '%s'"
 msgstr "Prรฉ-image enregistrรฉe pour '%s'"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossible de crรฉer le rรฉpertoire '%s'"
@@ -5822,20 +6593,20 @@ msgstr "Rรฉsolution  pour '%s' oubliรฉe\n"
 msgid "unable to open rr-cache directory"
 msgstr "impossible d'ouvrir le rรฉpertoire rr-cache"
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr "votre branche actuelle semble cassรฉe"
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent est incompatible avec --bisect"
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"
 
@@ -5858,31 +6629,31 @@ msgstr ""
 "Vous pouvez dรฉsactiver cet avertissement avec `git config advice.ignoredHook "
 "false`."
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "paquet de nettoyage inattendu pendant la lecture de l'รฉtat de dรฉpaquetage "
 "distant"
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "impossible d'analyser l'รฉtat de dรฉpaquetage distantย : %s"
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "le dรฉpaquetage a รฉchouรฉย : %s"
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr "impossible de signer le certificat de poussรฉe"
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr "Le receveur ne gรจre pas les poussรฉes avec --signed"
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5890,47 +6661,47 @@ msgstr ""
 "pas d'envoi de certificat de poussรฉe car le receveur ne gรจre pas les "
 "poussรฉes avec --signed"
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr "Le receveur ne gรจre pas les poussรฉes avec --atomic"
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr "Le receveur ne gรจre pas les options de poussรฉes"
 
-#: sequencer.c:187
+#: sequencer.c:191
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mode de nettoyage invalide de message de validation '%s'"
 
-#: sequencer.c:292
+#: sequencer.c:296
 #, c-format
 msgid "could not delete '%s'"
 msgstr "Impossible de supprimer '%s'"
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "impossible de supprimer '%s'"
 
-#: sequencer.c:321
+#: sequencer.c:325
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:323
+#: sequencer.c:327
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:329
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:331
 #, c-format
 msgid "unknown action: %d"
 msgstr "action inconnueย : %d"
 
-#: sequencer.c:385
+#: sequencer.c:389
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5938,7 +6709,7 @@ msgstr ""
 "aprรจs rรฉsolution des conflits, marquez les chemins corrigรฉs\n"
 "avec 'git add <chemins>' ou 'git rm <chemins>'"
 
-#: sequencer.c:388
+#: sequencer.c:392
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5948,115 +6719,110 @@ msgstr ""
 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"
 "puis validez le rรฉsultat avec 'git commit'"
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:405 sequencer.c:2901
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossible de verrouiller '%s'"
 
-#: sequencer.c:408
+#: sequencer.c:412
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "impossible d'รฉcrire la fin de ligne dans '%s'"
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "รฉchec lors de la finalisation de '%s'"
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
 #, c-format
 msgid "could not read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: sequencer.c:462
+#: sequencer.c:466
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "vos modifications locales seraient รฉcrasรฉes par %s."
 
-#: sequencer.c:466
+#: sequencer.c:470
 msgid "commit your changes or stash them to proceed."
 msgstr "validez vos modifications ou les remiser pour continuer."
 
-#: sequencer.c:498
+#: sequencer.c:502
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%sย : avance rapide"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de nettoyage invalide %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:635
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Impossible d'รฉcrire le nouveau fichier index"
 
-#: sequencer.c:649
+#: sequencer.c:652
 msgid "unable to update cache tree"
 msgstr "impossible de mettre ร  jour l'arbre de cache"
 
-#: sequencer.c:663
+#: sequencer.c:666
 msgid "could not resolve HEAD commit"
 msgstr "impossible de rรฉsoudre le commit HEAD"
 
-#: sequencer.c:743
+#: sequencer.c:746
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "aucune clรฉ prรฉsente dans '%.*s'"
 
-#: sequencer.c:754
+#: sequencer.c:757
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "Impossible de dรฉcoter la valeur de '%s'"
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "impossible d'ouvrir '%s' en lecture"
 
-#: sequencer.c:801
+#: sequencer.c:804
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' dรฉjร  fourni"
 
-#: sequencer.c:806
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' dรฉjร  fourni"
 
-#: sequencer.c:811
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' dรฉjร  fourni"
 
-#: sequencer.c:815
+#: sequencer.c:818
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable inconnue '%s'"
 
-#: sequencer.c:820
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "'GIT_AUTHOR_NAME' manquant"
 
-#: sequencer.c:822
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "'GIT_AUTHOR_EMAIL' manquant"
 
-#: sequencer.c:824
+#: sequencer.c:827
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "'GIT_AUTHOR_DATE' manquant"
 
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "format de date invalide '%s' dans '%s'"
-
-#: sequencer.c:901
+#: sequencer.c:876
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -6085,15 +6851,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr "รฉcriture du commit racine"
-
-#: sequencer.c:1216
+#: sequencer.c:1148
 msgid "'prepare-commit-msg' hook failed"
 msgstr "รฉchec du crochet 'prepare-commit-msg'"
 
-#: sequencer.c:1223
+#: sequencer.c:1154
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6122,7 +6884,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: sequencer.c:1167
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6148,326 +6910,325 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1209
 msgid "couldn't look up newly created commit"
 msgstr "impossible de retrouver le commit nouvellement crรฉรฉ"
 
-#: sequencer.c:1280
+#: sequencer.c:1211
 msgid "could not parse newly created commit"
 msgstr "impossible d'analyser le commit nouvellement crรฉรฉ"
 
-#: sequencer.c:1326
+#: sequencer.c:1257
 msgid "unable to resolve HEAD after creating commit"
 msgstr "impossible de rรฉsoudre HEAD aprรจs crรฉation du commit"
 
-#: sequencer.c:1328
+#: sequencer.c:1259
 msgid "detached HEAD"
 msgstr "HEAD dรฉtachรฉe"
 
-#: sequencer.c:1332
+#: sequencer.c:1263
 msgid " (root-commit)"
 msgstr " (commit racine)"
 
-#: sequencer.c:1353
+#: sequencer.c:1284
 msgid "could not parse HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1355
+#: sequencer.c:1286
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s n'est pas un commit !"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
 msgid "could not parse HEAD commit"
 msgstr "impossible d'analyser le commit HEAD"
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1342 sequencer.c:1968
 msgid "unable to parse commit author"
 msgstr "impossible d'analyser l'auteur du commit"
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree a รฉchouรฉ ร  รฉcrire un arbre"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1386 sequencer.c:1447
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "impossible de lire le message de validation de '%s'"
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
 msgid "failed to write commit object"
 msgstr "รฉchec de l'รฉcriture de l'objet commit"
 
-#: sequencer.c:1526
+#: sequencer.c:1474
 #, c-format
 msgid "could not parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: sequencer.c:1531
+#: sequencer.c:1479
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "impossible d'analyser le commit parent %s"
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1562 sequencer.c:1673
 #, c-format
 msgid "unknown command: %d"
 msgstr "commande inconnueย : %d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1620 sequencer.c:1645
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Ceci est la combinaison de %d commits."
 
-#: sequencer.c:1672
+#: sequencer.c:1630
 msgid "need a HEAD to fixup"
 msgstr "une HEAD est nรฉcessaire ร  la correction"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1632 sequencer.c:3212
 msgid "could not read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: sequencer.c:1676
+#: sequencer.c:1634
 msgid "could not read HEAD's commit message"
 msgstr "impossible de lire le message de validation de HEAD"
 
-#: sequencer.c:1682
+#: sequencer.c:1640
 #, c-format
 msgid "cannot write '%s'"
 msgstr "impossible d'รฉcrire '%s'"
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "Ceci est le premier message de validationย :"
 
-#: sequencer.c:1697
+#: sequencer.c:1655
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "impossible de lire le message de validation de %s"
 
-#: sequencer.c:1704
+#: sequencer.c:1662
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Ceci est le message de validation numรฉro %dย :"
 
-#: sequencer.c:1710
+#: sequencer.c:1668
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Le message de validation %d sera ignorรฉย :"
 
-#: sequencer.c:1798
+#: sequencer.c:1756
 msgid "your index file is unmerged."
 msgstr "votre fichier d'index n'est pas fusionnรฉ."
 
-#: sequencer.c:1805
+#: sequencer.c:1763
 msgid "cannot fixup root commit"
 msgstr "impossible de rรฉparer le commit racine"
 
-#: sequencer.c:1824
+#: sequencer.c:1782
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "le commit %s est une fusion mais l'option -m n'a pas รฉtรฉ spรฉcifiรฉe."
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1790 sequencer.c:1798
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "le commit %s n'a pas de parent %d"
 
-#: sequencer.c:1846
+#: sequencer.c:1804
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "impossible d'obtenir un message de validation pour %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1823
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s : impossible d'analyser le commit parent %s"
 
-#: sequencer.c:1930
+#: sequencer.c:1888
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossible de renommer '%s' en '%s'"
 
-#: sequencer.c:1985
+#: sequencer.c:1943
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "impossible d'annuler %s... %s"
 
-#: sequencer.c:1986
+#: sequencer.c:1944
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "impossible d'appliquer %s... %s"
 
-#: sequencer.c:2045
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "abandon de %s %s -- le contenu de la rustine dรฉjร  en amont\n"
+
+#: sequencer.c:2018
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s : รฉchec ร  la lecture de l'index"
 
-#: sequencer.c:2052
+#: sequencer.c:2025
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s : รฉchec du rafraรฎchissement de l'index"
 
-#: sequencer.c:2128
+#: sequencer.c:2102
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s n'accepte pas d'argumentย : '%s'"
 
-#: sequencer.c:2137
+#: sequencer.c:2111
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument manquant pour %s"
 
-#: sequencer.c:2174
+#: sequencer.c:2142
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "impossible d'analyser '%.*s'"
+msgid "could not parse '%s'"
+msgstr "impossible d'analyser '%s'"
 
-#: sequencer.c:2228
+#: sequencer.c:2203
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ligne %d invalideย : %.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2214
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "'%s' impossible avec le commit prรฉcรฉdent"
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "impossible de lire '%s'."
-
-#: sequencer.c:2323
+#: sequencer.c:2298
 msgid "cancelling a cherry picking in progress"
 msgstr "annulation d'un picorage en cours"
 
-#: sequencer.c:2330
+#: sequencer.c:2305
 msgid "cancelling a revert in progress"
 msgstr "annulation d'un retour en cours"
 
-#: sequencer.c:2364
+#: sequencer.c:2349
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
-#: sequencer.c:2366
+#: sequencer.c:2351
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "feuille d'instruction inutilisableย : '%s'"
 
-#: sequencer.c:2371
+#: sequencer.c:2356
 msgid "no commits parsed."
 msgstr "aucun commit analysรฉ."
 
-#: sequencer.c:2382
+#: sequencer.c:2367
 msgid "cannot cherry-pick during a revert."
 msgstr "impossible de picorer pendant l'annulation d'un commit."
 
-#: sequencer.c:2384
+#: sequencer.c:2369
 msgid "cannot revert during a cherry-pick."
 msgstr "impossible d'annuler un commit pendant un picorage."
 
-#: sequencer.c:2466
+#: sequencer.c:2447
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valeur invalide pour %sย : %s"
 
-#: sequencer.c:2553
+#: sequencer.c:2540
 msgid "unusable squash-onto"
 msgstr "\"รฉcrase-sur\" inutilisable"
 
-#: sequencer.c:2569
+#: sequencer.c:2556
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "feuille d'options malformรฉeย : %s"
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2644 sequencer.c:4361
 msgid "empty commit set passed"
 msgstr "l'ensemble de commits spรฉcifiรฉ est vide"
 
-#: sequencer.c:2668
+#: sequencer.c:2660
 msgid "revert is already in progress"
 msgstr "un retour est dรฉjร  en cours"
 
-#: sequencer.c:2670
+#: sequencer.c:2662
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2673
+#: sequencer.c:2665
 msgid "cherry-pick is already in progress"
 msgstr "un picorage est dรฉjร  en cours"
 
-#: sequencer.c:2675
+#: sequencer.c:2667
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2689
+#: sequencer.c:2681
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossible de crรฉer le rรฉpertoire de sรฉquenceur '%s'"
 
-#: sequencer.c:2704
+#: sequencer.c:2696
 msgid "could not lock HEAD"
 msgstr "impossible de verrouiller HEAD"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2756 sequencer.c:4099
 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2758 sequencer.c:2769
 msgid "cannot resolve HEAD"
 msgstr "impossible de rรฉsoudre HEAD"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2760 sequencer.c:2804
 msgid "cannot abort from a branch yet to be born"
 msgstr "impossible d'abandonner depuis une branche non encore crรฉรฉe"
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2790 builtin/grep.c:724
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: sequencer.c:2800
+#: sequencer.c:2792
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossible de lire '%s'ย : %s"
 
-#: sequencer.c:2801
+#: sequencer.c:2793
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 
-#: sequencer.c:2807
+#: sequencer.c:2799
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "le fichier HEAD de prรฉparation de picorage '%s' est corrompu"
 
-#: sequencer.c:2818
+#: sequencer.c:2810
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Vous semblez avoir dรฉplacรฉ la HEAD. Pas de rembobinage, vรฉrifiez votre HEADย !"
 
-#: sequencer.c:2859
+#: sequencer.c:2851
 msgid "no revert in progress"
 msgstr "Pas de retour en cours ?"
 
-#: sequencer.c:2867
+#: sequencer.c:2859
 msgid "no cherry-pick in progress"
 msgstr "aucun picorage en cours"
 
-#: sequencer.c:2877
+#: sequencer.c:2869
 msgid "failed to skip the commit"
 msgstr "รฉchec du saut de commit"
 
-#: sequencer.c:2884
+#: sequencer.c:2876
 msgid "there is nothing to skip"
 msgstr "il n'y a rien ร  sauter"
 
-#: sequencer.c:2887
+#: sequencer.c:2879
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6476,21 +7237,21 @@ msgstr ""
 "Avez-vous dรฉjร  validรฉย ?\n"
 "essayez \"git %s -continue\""
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3003 sequencer.c:4011
 #, c-format
 msgid "could not update %s"
 msgstr "impossible de mettre ร  jour %s"
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3042 sequencer.c:3991
 msgid "cannot read HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:3066
+#: sequencer.c:3059
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:3074
+#: sequencer.c:3067
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6509,27 +7270,22 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3077
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "impossible d'appliquer %s... %.*s"
 
-#: sequencer.c:3091
+#: sequencer.c:3084
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Impossible de fusionner %.*s"
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "impossible de lire l'index"
-
-#: sequencer.c:3136
+#: sequencer.c:3129
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6544,11 +7300,11 @@ msgstr ""
 "git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3135
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "et a mis ร  jour l'index ou l'arbre de travail\n"
 
-#: sequencer.c:3148
+#: sequencer.c:3141
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6565,77 +7321,73 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3202
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nom de label illรฉgal '%.*s'"
 
-#: sequencer.c:3263
+#: sequencer.c:3256
 msgid "writing fake root commit"
 msgstr "รฉcriture d'un commit racine bidon"
 
-#: sequencer.c:3268
+#: sequencer.c:3261
 msgid "writing squash-onto"
 msgstr "รฉcriture de 'รฉcraser-sur'"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "impossible de trouver l'arbre de %s"
 
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "impossible d'รฉcrire l'index"
-
-#: sequencer.c:3351
+#: sequencer.c:3344
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "impossible de rรฉsoudre '%s'"
 
-#: sequencer.c:3379
+#: sequencer.c:3375
 msgid "cannot merge without a current revision"
 msgstr "impossible de fusionner avec une rรฉvision courante"
 
-#: sequencer.c:3401
+#: sequencer.c:3397
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "impossible d'analyser '%.*s'"
 
-#: sequencer.c:3410
+#: sequencer.c:3406
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "rien ร  fusionnerย : '%.*s'"
 
-#: sequencer.c:3422
+#: sequencer.c:3418
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 "une fusion octopus ne peut pas รชtre exรฉcutรฉe par dessus une nouvelle racine"
 
-#: sequencer.c:3437
+#: sequencer.c:3434
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "impossible de lire le message de validation de '%s'"
 
-#: sequencer.c:3590
+#: sequencer.c:3594
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "impossible de seulement essayer de fusionner '%.*s'"
 
-#: sequencer.c:3606
+#: sequencer.c:3610
 msgid "merge: Unable to write new index file"
 msgstr "fusionย : Impossible d'รฉcrire le nouveau fichier index"
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3679 builtin/rebase.c:737
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autoremisage appliquรฉ.\n"
 
-#: sequencer.c:3687
+#: sequencer.c:3691
 #, c-format
 msgid "cannot store %s"
 msgstr "impossible de stocker %s"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6646,31 +7398,26 @@ msgstr ""
 "Vos  modifications sont ร  l'abri dans la remise.\n"
 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" ร  tout moment.\n"
 
-#: sequencer.c:3751
-#, c-format
-msgid "could not checkout %s"
-msgstr "extraction de %s impossible"
-
-#: sequencer.c:3765
+#: sequencer.c:3755
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s n'est pas un OID valide"
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "Impossible de dรฉtacher HEAD"
 
-#: sequencer.c:3785
+#: sequencer.c:3775
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "arrรชt ร  HEAD\n"
 
-#: sequencer.c:3787
+#: sequencer.c:3777
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Arrรชtรฉ ร  %s\n"
 
-#: sequencer.c:3795
+#: sequencer.c:3785
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6691,48 +7438,48 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3877
+#: sequencer.c:3869
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "arrรชt ร  %s... %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:3940
 #, c-format
 msgid "unknown command %d"
 msgstr "commande inconnue %d"
 
-#: sequencer.c:4003
+#: sequencer.c:3999
 msgid "could not read orig-head"
 msgstr "impossible de lire orig-head"
 
-#: sequencer.c:4008
+#: sequencer.c:4004
 msgid "could not read 'onto'"
 msgstr "impossible de lire 'onto'"
 
-#: sequencer.c:4022
+#: sequencer.c:4018
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossible de mettre ร  jour HEAD sur %s"
 
-#: sequencer.c:4115
+#: sequencer.c:4111
 msgid "cannot rebase: You have unstaged changes."
 msgstr "impossible de rebaserย : vous avez des modifications non indexรฉes."
 
-#: sequencer.c:4124
+#: sequencer.c:4120
 msgid "cannot amend non-existing commit"
 msgstr "impossible de corriger un commit non-existant"
 
-#: sequencer.c:4126
+#: sequencer.c:4122
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fichier invalideย : '%s'"
 
-#: sequencer.c:4128
+#: sequencer.c:4124
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenu invalide : '%s'"
 
-#: sequencer.c:4131
+#: sequencer.c:4127
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6742,69 +7489,59 @@ msgstr ""
 "Vous avez des modifications non validรฉes dans votre copie de travail.\n"
 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
 
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4163 sequencer.c:4202
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "impossible d'รฉcrire le fichierย : '%s'"
 
-#: sequencer.c:4220
+#: sequencer.c:4217
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossible de supprimer CHERRY_PICK_HEAD"
 
-#: sequencer.c:4227
+#: sequencer.c:4224
 msgid "could not commit staged changes."
 msgstr "impossible de valider les modifications indexรฉes."
 
-#: sequencer.c:4328
+#: sequencer.c:4338
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 
-#: sequencer.c:4332
+#: sequencer.c:4342
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise rรฉvision"
 
-#: sequencer.c:4367
+#: sequencer.c:4377
 msgid "can't revert as initial commit"
 msgstr "impossible d'annuler en tant que commit initial"
 
-#: sequencer.c:4810
+#: sequencer.c:4846
 msgid "make_script: unhandled options"
 msgstr "make_scriptย : options non gรฉrรฉes"
 
-#: sequencer.c:4813
+#: sequencer.c:4849
 msgid "make_script: error preparing revisions"
 msgstr "make_scriptย : erreur lors de la prรฉparation des rรฉvisions"
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
-"rebase --continue'.\n"
-"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
-
 #: sequencer.c:5083 sequencer.c:5100
 msgid "nothing to do"
 msgstr "rien ร  faire"
 
-#: sequencer.c:5114
+#: sequencer.c:5119
 msgid "could not skip unnecessary pick commands"
 msgstr "impossible d'รฉviter les commandes de picorage non nรฉcessaires"
 
-#: sequencer.c:5197
+#: sequencer.c:5213
 msgid "the script was already rearranged."
 msgstr "le script a dรฉjร  รฉtรฉ rรฉarrangรฉ."
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' est hors du dรฉpรดt"
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' est hors du dรฉpรดt ร  '%s'"
 
-#: setup.c:173
+#: setup.c:175
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6814,7 +7551,7 @@ msgstr ""
 "Utilisez 'git <commande> -- <chemin>...' pour spรฉcifier des chemins qui "
 "n'existent pas localement."
 
-#: setup.c:186
+#: setup.c:188
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6825,14 +7562,14 @@ msgstr ""
 "Utilisez '--' pour sรฉparer les chemins des rรฉvisions, comme ceciย :\n"
 "'git <commande> [<rรฉvision>...] -- [<chemin>...]'"
 
-#: setup.c:235
+#: setup.c:254
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 "l'option '%s' doit รชtre prรฉsente avant les arguments qui ne sont pas des "
 "options"
 
-#: setup.c:254
+#: setup.c:273
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6843,94 +7580,94 @@ msgstr ""
 "Utilisez '--' pour sรฉparer les chemins des rรฉvisions, comme ceciย :\n"
 "'git <commande> [<rรฉvision>...] -- [<chemin>...]'"
 
-#: setup.c:390
+#: setup.c:409
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "impossible de mettre en place le rรฉpertoire de travail en utilisant une "
 "configuration invalide"
 
-#: setup.c:394
+#: setup.c:413
 msgid "this operation must be run in a work tree"
 msgstr "Cette opรฉration doit รชtre effectuรฉe dans un arbre de travail"
 
-#: setup.c:540
+#: setup.c:559
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Version attendue du dรฉpรดt git <= %d, %d trouvรฉe"
 
-#: setup.c:548
+#: setup.c:567
 msgid "unknown repository extensions found:"
 msgstr "extensions de dรฉpรดt inconnues trouvรฉesย :"
 
-#: setup.c:567
+#: setup.c:586
 #, c-format
 msgid "error opening '%s'"
 msgstr "erreur ร  l'ouverture de '%s'"
 
-#: setup.c:569
+#: setup.c:588
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "trop gros pour รชtre une fichier .gitย : '%s'"
 
-#: setup.c:571
+#: setup.c:590
 #, c-format
 msgid "error reading %s"
 msgstr "erreur ร  la lecture de %s"
 
-#: setup.c:573
+#: setup.c:592
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "format de fichier git invalide : %s"
 
-#: setup.c:575
+#: setup.c:594
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "aucun chemin dans le fichier gitย : %s"
 
-#: setup.c:577
+#: setup.c:596
 #, c-format
 msgid "not a git repository: %s"
 msgstr "ce n'est pas un dรฉpรดt gitย : %s"
 
-#: setup.c:676
+#: setup.c:695
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' trop gros"
 
-#: setup.c:690
+#: setup.c:709
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "ce n'est pas un dรฉpรดt git : '%s'"
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:738 setup.c:740 setup.c:771
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "impossible de se dรฉplacer vers le rรฉpertoire (chdir) '%s'"
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
 msgid "cannot come back to cwd"
 msgstr "impossible de revenir au rรฉpertoire de travail courant"
 
-#: setup.c:851
+#: setup.c:870
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "รฉchec du stat de '%*s%s%s'"
 
-#: setup.c:1083
+#: setup.c:1108
 msgid "Unable to read current working directory"
 msgstr "Impossible d'accรฉder au rรฉpertoire de travail courant"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1117 setup.c:1123
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "impossible de modifier en '%s'"
 
-#: setup.c:1103
+#: setup.c:1128
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "ni ceci ni aucun de ses rรฉpertoires parents n'est un dรฉpรดt gitย : %s"
 
-#: setup.c:1109
+#: setup.c:1134
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6941,7 +7678,7 @@ msgstr ""
 "Arrรชt ร  la limite du systรจme de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "n'est pas dรฉfini)."
 
-#: setup.c:1220
+#: setup.c:1245
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6951,286 +7688,286 @@ msgstr ""
 "Le propriรฉtaire des fichiers doit toujours avoir les droits en lecture et "
 "รฉcriture."
 
-#: setup.c:1264
+#: setup.c:1289
 msgid "open /dev/null or dup failed"
 msgstr "รฉchec de l'ouverture ou au dup de /dev/null"
 
-#: setup.c:1279
+#: setup.c:1304
 msgid "fork failed"
 msgstr "รฉchec de la bifurcation"
 
-#: setup.c:1284
+#: setup.c:1309
 msgid "setsid failed"
 msgstr "รฉchec du setsid"
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "le rรฉpertoire objet %s n'existe pasย ; vรฉrifiez .git/objects/info/alternates"
 
-#: sha1-file.c:504
+#: sha1-file.c:503
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "impossible de normaliser le chemin d'objet alternatifย : %s"
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%sย : magasins d'objets alternatifs ignorรฉs, rรฉcursion trop profonde"
 
-#: sha1-file.c:583
+#: sha1-file.c:582
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "impossible de normaliser le rรฉpertoire d'objetย : %s"
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 msgid "unable to fdopen alternates lockfile"
 msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
 
-#: sha1-file.c:644
+#: sha1-file.c:643
 msgid "unable to read alternates file"
 msgstr "lecture du fichier d'alternatives impossible"
 
-#: sha1-file.c:651
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
 msgstr "impossible de dรฉplacer le nouveau fichier d'alternative"
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "le chemin '%s' n'existe pas"
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "extraire le dรฉpรดt de rรฉfรฉrence '%s' comme une extraction liรฉe n'est pas "
 "encore supportรฉ."
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "le dรฉpรดt de rรฉfรฉrence '%s' n'est pas un dรฉpรดt local."
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "le dรฉpรดt de rรฉfรฉrence '%s' est superficiel"
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "le dรฉpรดt de rรฉfรฉrence '%s' est greffรฉ"
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "ligne invalide pendant l'analyse des refs alternativesย : %s"
 
-#: sha1-file.c:944
+#: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "essai de mmap %<PRIuMAX> au delร  de la limite %<PRIuMAX>"
 
-#: sha1-file.c:969
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr "รฉchec de mmap"
 
-#: sha1-file.c:1133
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr "le fichier objet %s est vide"
 
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1263 sha1-file.c:2443
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "objet libre corrompu '%s'"
 
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1265 sha1-file.c:2447
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "donnรฉes incorrectes ร  la fin de l'objet libre '%s'"
 
-#: sha1-file.c:1301
+#: sha1-file.c:1307
 msgid "invalid object type"
 msgstr "type d'objet invalide"
 
-#: sha1-file.c:1385
+#: sha1-file.c:1391
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "impossible de dรฉpaqueter l'entรชte %s avec --allow-unknow-type"
 
-#: sha1-file.c:1388
+#: sha1-file.c:1394
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "impossible de dรฉpaqueter l'entรชte %s"
 
-#: sha1-file.c:1394
+#: sha1-file.c:1400
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "impossible d'analyser l'entรชte %s avec --allow-unknow-type"
 
-#: sha1-file.c:1397
+#: sha1-file.c:1403
 #, c-format
 msgid "unable to parse %s header"
 msgstr "impossible d'analyser l'entรชte %s"
 
-#: sha1-file.c:1588
+#: sha1-file.c:1629
 #, c-format
 msgid "failed to read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: sha1-file.c:1592
+#: sha1-file.c:1633
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "remplacement %s non trouvรฉ pour %s"
 
-#: sha1-file.c:1596
+#: sha1-file.c:1637
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "l'objet libre %s (stockรฉ dans %s) est corrompu"
 
-#: sha1-file.c:1600
+#: sha1-file.c:1641
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "l'objet empaquetรฉ %s (stockรฉ dans %s) est corrompu"
 
-#: sha1-file.c:1703
+#: sha1-file.c:1746
 #, c-format
 msgid "unable to write file %s"
 msgstr "impossible d'รฉcrire le fichier %s"
 
-#: sha1-file.c:1710
+#: sha1-file.c:1753
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "impossible de rรฉgler les droits de '%s'"
 
-#: sha1-file.c:1717
+#: sha1-file.c:1760
 msgid "file write error"
 msgstr "erreur d'รฉcriture d'un fichier"
 
-#: sha1-file.c:1736
+#: sha1-file.c:1780
 msgid "error when closing loose object file"
 msgstr "erreur en fermeture du fichier d'objet esseulรฉ"
 
-#: sha1-file.c:1801
+#: sha1-file.c:1845
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "droits insuffisants pour ajouter un objet ร  la base de donnรฉes %s du dรฉpรดt"
 
-#: sha1-file.c:1803
+#: sha1-file.c:1847
 msgid "unable to create temporary file"
 msgstr "impossible de crรฉer un fichier temporaire"
 
-#: sha1-file.c:1827
+#: sha1-file.c:1871
 msgid "unable to write loose object file"
 msgstr "impossible d'รฉcrire le fichier d'objet esseulรฉ"
 
-#: sha1-file.c:1833
+#: sha1-file.c:1877
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "impossible de compresser le nouvel objet %s (%d)"
 
-#: sha1-file.c:1837
+#: sha1-file.c:1881
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "รฉchec de deflateEnd sur l'objet %s (%d)"
 
-#: sha1-file.c:1841
+#: sha1-file.c:1885
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "donnรฉes de source d'objet instable pour %s"
 
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
 #, c-format
 msgid "failed utime() on %s"
 msgstr "รฉchec de utime() sur %s"
 
-#: sha1-file.c:1926
+#: sha1-file.c:1972
 #, c-format
 msgid "cannot read object for %s"
 msgstr "impossible de lire l'objet pour %s"
 
-#: sha1-file.c:1966
+#: sha1-file.c:2011
 msgid "corrupt commit"
 msgstr "commit corrompu"
 
-#: sha1-file.c:1974
+#: sha1-file.c:2019
 msgid "corrupt tag"
 msgstr "รฉtiquette corrompue"
 
-#: sha1-file.c:2073
+#: sha1-file.c:2119
 #, c-format
 msgid "read error while indexing %s"
 msgstr "erreur de lecture ร  l'indexation de %s"
 
-#: sha1-file.c:2076
+#: sha1-file.c:2122
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lecture tronquรฉe pendant l'indexation de %s"
 
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2195 sha1-file.c:2205
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%sย : รฉchec de l'insertion dans la base de donnรฉes"
 
-#: sha1-file.c:2164
+#: sha1-file.c:2211
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%sย : type de fichier non supportรฉ"
 
-#: sha1-file.c:2188
+#: sha1-file.c:2235
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s n'est pas un objet valide"
 
-#: sha1-file.c:2190
+#: sha1-file.c:2237
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s n'est pas un objet '%s' valide"
 
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2454 sha1-file.c:2507
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "incohรฉrence de hachage pour %s (%s attendu)"
 
-#: sha1-file.c:2431
+#: sha1-file.c:2478
 #, c-format
 msgid "unable to mmap %s"
 msgstr "impossible de mmap %s"
 
-#: sha1-file.c:2436
+#: sha1-file.c:2483
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "impossible de dรฉpaqueter l'entรชte de %s"
 
-#: sha1-file.c:2442
+#: sha1-file.c:2489
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "impossible d'analyser l'entรชte de %s"
 
-#: sha1-file.c:2453
+#: sha1-file.c:2500
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "impossible de dรฉpaqueter le contenu de %s"
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "le SHA1 court %s est ambigu"
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "Les candidats sontย :"
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7254,44 +7991,112 @@ msgstr ""
 "message\n"
 "en lanรงant \"git config advice.objectNameWarning false\""
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "le journal de '%.*s' ne remonte qu'ร  %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "le journal de '%.*s' n'a que %d entrรฉes"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"le chemin '%s' existe, mais pas '%s'\n"
+"conseilย : peut-รชtre vouliez-vous dire '%.*s:%s', soit '%.*s:./%s'"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "le chemin '%s' n'existe pas dnas '%.*s'"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"le chemin '%s' est dans l'index, mais pas ร  l'รฉtape %d\n"
+"conseilย : vous vouliez peut-รชtre dire ':%d:%s'ย ?"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"le chemin '%s' est dans l'index, mais pas '%s'\n"
+"conseilย : peut-รชtre vouliez-vous dire ':%d:%s', soit '%d:./%s'"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"la syntaxe de chemin relatif ne peut pas รชtre utilisรฉe hors de l'arbre de "
+"travail"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nom d'objet invalide : '%.*s'."
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:837
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u Gio"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:839
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u Gio/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:847
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u Mio"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:849
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u Mio/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:856
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u Kio"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u Kio/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:864
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7299,13 +8104,18 @@ msgstr[0] "%u octet"
 msgstr[1] "%u octets"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:866
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u octet/s"
 msgstr[1] "%u octets/s"
 
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "impossible d'รฉditer '%s'"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7337,51 +8147,129 @@ msgstr "dans le sous-module '%s' non populรฉ"
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
 
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "mauvais argument --ignore-submodulesย : %s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Le sous-module dans le commit %s au cheminย : '%s' entre en collision avec un "
+"sous-module du mรชme nom. Ignorรฉ."
+
 #: submodule.c:910
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "l'entrรฉe de sous-module '%s' (%s) est un %s, pas un commit"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n "
+"1' dans le sous-module %s"
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "le processus pour le sous-module '%s' a รฉchouรฉ"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "ร‰chec de rรฉsolution de HEAD comme rรฉfรฉrence valide."
 
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Poussรฉe du sous-module '%s'\n"
+
+#: submodule.c:1161
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Impossible de pousser le sous-module '%s'\n"
+
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Rรฉcupรฉration du sous-module %s%s\n"
+
+#: submodule.c:1483
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "Impossible d'accรฉder au sous-module '%s'"
+msgid "Could not access submodule '%s'\n"
+msgstr "Impossible d'accรฉder au sous-module '%s'\n"
 
-#: submodule.c:1651
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Erreurs pendant la rรฉcupรฉration du sous-moduleย :\n"
+"%s"
+
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' n'est pas reconnu comme dรฉpรดt git"
 
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "impossible de lancer 'git status --porcelain=2' dans le sous-module %s"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' a รฉchouรฉ dans le sous-module %s"
+
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "impossible de dรฉmarrer 'git status' dans le sous-module '%s'"
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
 
-#: submodule.c:1817
+#: submodule.c:1828
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Impossible de dรฉsactiver core.worktree dans le sous-module '%s'"
 
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "rรฉcursion impossible dans le sous-module '%s'"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "impossible de rรฉinitialiser l'index du sous-module"
+
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "le sous-module '%s' a un index sale"
 
-#: submodule.c:1959
+#: submodule.c:1970
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "le sous-module '%s' n'a pas pu รชtre mis ร  jour."
 
-#: submodule.c:2007
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+"le rรฉpertoire git du sous-module '%s' est ร  l'intรฉrieur du rรฉpertoire git "
+"'%.*s'"
+
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7389,12 +8277,17 @@ msgstr ""
 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
 "n'est pas supportรฉ"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "impossible de trouve le nom pour le sous-module '%s'"
 
-#: submodule.c:2026
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "refus de dรฉplacer '%s' dans une rรฉpertoire git existant"
+
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7405,42 +8298,37 @@ msgstr ""
 "'%s' sur\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "rรฉcursion impossible dans le sous-module '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2209
 msgid "could not start ls-files in .."
 msgstr "impossible de dรฉmarrer ls-files dans .."
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree a renvoyรฉ un code de retour inattendu %d"
 
-#: submodule-config.c:232
+#: submodule-config.c:236
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "nom de sous-module suspicieux %s ignorรฉ"
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "les valeurs nรฉgatives ne sont pas permises pour submodule.fetchJobs"
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 "'%s' ignorรฉ et qui peut รชtre interprรฉtรฉ comme une option de ligne de "
 "commandeย : %s"
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr "Valeur invalide pour %s"
 
-#: submodule-config.c:755
+#: submodule-config.c:765
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Impossible de mettre ร  jour l'รฉlรฉment %s de .gitmodules"
@@ -7456,7 +8344,7 @@ msgstr "รฉchec de la commande trailer '%s'"
 msgid "unknown value '%s' for key '%s'"
 msgstr "valeur inconnue '%s' pour la clรฉ '%s'"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "plus d'un %s"
@@ -7475,7 +8363,7 @@ msgstr "impossible de lire le fichier d'entrรฉe '%s'"
 msgid "could not read from stdin"
 msgstr "Impossible de lire depuis l'entrรฉe standard"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr "stat impossible de %s"
@@ -7504,47 +8392,47 @@ msgstr "impossible de renommer un fichier temporaire en %s"
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
 
-#: transport.c:142
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr "impossible de lire la liasse '%s'"
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transportย : option de profondeur invalide '%s'"
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "voir protocol.version dans 'git help config' pour plus d'information"
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr "les options de serveur exigent une version 2 ou supรฉrieure"
 
-#: transport.c:625
+#: transport.c:632
 msgid "could not parse transport.color.* config"
 msgstr "impossible d'analyser la configuration transport.color.*"
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr "le support du protocole v2 n'est pas encore implantรฉ"
 
-#: transport.c:825
+#: transport.c:831
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "valeur inconnue pour la config '%s'ย : %s"
 
-#: transport.c:891
+#: transport.c:897
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "transport '%s' non permis"
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync n'est plus supportรฉ"
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -7553,7 +8441,7 @@ msgstr ""
 "Les chemins suivants de sous-module contiennent des modifications\n"
 "qui ne peuvent รชtre trouvรฉes sur aucun distantย :\n"
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -7580,33 +8468,33 @@ msgstr ""
 "pour les pousser vers un serveur distant.\n"
 "\n"
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr "Abandon."
 
-#: transport.c:1193
+#: transport.c:1201
 msgid "failed to push all needed submodules"
 msgstr "รฉchec de la poussรฉe de tous les sous-modules nรฉcessaires"
 
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:657
 msgid "operation not supported by protocol"
 msgstr "option non supportรฉe par le protocole"
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 msgid "full write to remote helper failed"
 msgstr "รฉchec de l'รฉcriture totale sur l'assistant distant"
 
-#: transport-helper.c:134
+#: transport-helper.c:144
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "Impossible de trouver un assistant distant pour '%s'"
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:571
 msgid "can't dup helper output fd"
 msgstr ""
 "impossible de dupliquer le descripteur de flux de sortie de l'assistant"
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7615,103 +8503,108 @@ msgstr ""
 "capacitรฉ obligatoire inconnue %sย ; cet assistant distant requiert "
 "probablement une une nouvelle version de Git"
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr "cet assistant distant devrait supporter la capacitรฉ refspec"
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:425
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s a dit de maniรจre inattendueย : '%s'"
 
-#: transport-helper.c:403
+#: transport-helper.c:414
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s a aussi verrouillรฉ %s"
 
-#: transport-helper.c:481
+#: transport-helper.c:493
 msgid "couldn't run fast-import"
 msgstr "impossible de lancer fast-import"
 
-#: transport-helper.c:504
+#: transport-helper.c:516
 msgid "error while running fast-import"
 msgstr "erreur au lancement de fast-import"
 
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:545 transport-helper.c:1134
 #, c-format
 msgid "could not read ref %s"
 msgstr "impossible de lire la rรฉf %s"
 
-#: transport-helper.c:578
+#: transport-helper.c:590
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "rรฉponse inconnue ร  connectย : %s"
 
-#: transport-helper.c:600
+#: transport-helper.c:612
 msgid "setting remote service path not supported by protocol"
 msgstr ""
 "la spรฉcification du chemin de service distant n'est pas supportรฉe par le "
 "protocole"
 
-#: transport-helper.c:602
+#: transport-helper.c:614
 msgid "invalid remote service path"
 msgstr "chemin de service distant invalide"
 
-#: transport-helper.c:648
+#: transport-helper.c:660
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "impossible de se connecter au sous-service %s"
 
-#: transport-helper.c:720
+#: transport-helper.c:736
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "ok/error attendu, l'assistant a dit '%s'"
 
-#: transport-helper.c:773
+#: transport-helper.c:789
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "l'assistant a renvoyรฉ un statut de retour inattendu %s"
 
-#: transport-helper.c:834
+#: transport-helper.c:850
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "l'assistant %s ne gรจre pas dry-run"
 
-#: transport-helper.c:837
+#: transport-helper.c:853
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "l'assistant %s ne gรจre pas --signed"
 
-#: transport-helper.c:840
+#: transport-helper.c:856
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "l'assistant %s ne gรจre pas --signed=if-asked"
 
-#: transport-helper.c:847
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "l'assistant %s ne gรจre pas --atomic"
+
+#: transport-helper.c:867
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "l'assistant %s ne gรจre pas 'push-option'"
 
-#: transport-helper.c:945
+#: transport-helper.c:965
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 "l'assistant %s ne gรจre pas pushย ; un spรฉcificateur de rรฉfรฉrence est "
 "nรฉcessaire"
 
-#: transport-helper.c:950
+#: transport-helper.c:970
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "l'assistant %s ne gรจre pas 'force'"
 
-#: transport-helper.c:997
+#: transport-helper.c:1017
 msgid "couldn't run fast-export"
 msgstr "impossible de lancer fast-export"
 
-#: transport-helper.c:1002
+#: transport-helper.c:1022
 msgid "error while running fast-export"
 msgstr "erreur au lancement de fast-export"
 
-#: transport-helper.c:1027
+#: transport-helper.c:1047
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -7720,67 +8613,67 @@ msgstr ""
 "Aucune rรฉfรฉrence en commun et aucune spรฉcfiรฉeย ; rien ร  faire.\n"
 "Vous devriez peut-รชtre spรฉcifier une branche telle que 'master'.\n"
 
-#: transport-helper.c:1091
+#: transport-helper.c:1120
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "rรฉponse malformรฉe dans le liste de rรฉfsย : %s"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1272
 #, c-format
 msgid "read(%s) failed"
 msgstr "รฉchec de read(%s)"
 
-#: transport-helper.c:1271
+#: transport-helper.c:1299
 #, c-format
 msgid "write(%s) failed"
 msgstr "รฉchec de write(%s)"
 
-#: transport-helper.c:1320
+#: transport-helper.c:1348
 #, c-format
 msgid "%s thread failed"
 msgstr "รฉchec du fil d'exรฉcution %s"
 
-#: transport-helper.c:1324
+#: transport-helper.c:1352
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "รฉchec de jonction du fil d'exรฉcution %sย : %s"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1371 transport-helper.c:1375
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "impossible de dรฉmarrer le fil d'exรฉcution pour copier les donnรฉesย : %s"
 
-#: transport-helper.c:1384
+#: transport-helper.c:1412
 #, c-format
 msgid "%s process failed to wait"
 msgstr "รฉchec du processus %s pour l'attente"
 
-#: transport-helper.c:1388
+#: transport-helper.c:1416
 #, c-format
 msgid "%s process failed"
 msgstr "รฉchec du processus %s"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1434 transport-helper.c:1443
 msgid "can't start thread for copying data"
 msgstr "impossible de dรฉmarrer le fil d'exรฉcution pour copier les donnรฉes"
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "objet arbre trop court"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "mode invalide dans l'entrรฉe d'arbre"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "nom de fichier vide dans une entrรฉe de l'arbre"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "fichier arbre trop court"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7791,7 +8684,7 @@ msgstr ""
 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "
 "branche."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7801,7 +8694,7 @@ msgstr ""
 "l'extractionย :\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7811,7 +8704,7 @@ msgstr ""
 "fusionย :\n"
 "%%sVeuillez valider ou remiser vos modifications avant la fusion."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7821,7 +8714,7 @@ msgstr ""
 "fusionย :\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7830,7 +8723,7 @@ msgstr ""
 "Vos modifications locales aux fichiers suivants seraient รฉcrasรฉes par %sย :\n"
 "%%sVeuillez valider ou remiser vos modifications avant %s."
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7839,7 +8732,7 @@ msgstr ""
 "Vos modifications locales aux fichiers suivants seraient รฉcrasรฉes par %sย :\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7849,7 +8742,7 @@ msgstr ""
 "contenusย :\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7859,7 +8752,7 @@ msgstr ""
 "l'extractionย :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7868,7 +8761,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacรฉs par l'extractionย :\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7878,7 +8771,7 @@ msgstr ""
 "la fusionย :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7887,7 +8780,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacรฉs par la fusionย :\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7897,7 +8790,7 @@ msgstr ""
 "%sย :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7906,7 +8799,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacรฉs par %sย :\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7917,7 +8810,7 @@ msgstr ""
 "l'extractionย :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7927,7 +8820,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient รฉcrasรฉs par l'extractionย :\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7937,7 +8830,7 @@ msgstr ""
 "la fusionย :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7946,7 +8839,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient รฉcrasรฉs par la fusionย :\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7956,7 +8849,7 @@ msgstr ""
 "%sย :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7965,12 +8858,12 @@ msgstr ""
 "Les fichiers suivants non suivis seraient รฉcrasรฉs par %sย :\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrรฉe '%s' surcharge avec '%s'. Affectation impossible."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -7980,7 +8873,7 @@ msgstr ""
 "pas ร  jourย :\n"
 "%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -7991,7 +8884,7 @@ msgstr ""
 "jour par l'extraction creuseย :\n"
 "%s"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -8002,7 +8895,7 @@ msgstr ""
 "ร  jour par extraction creuseย :\n"
 "%s"
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -8011,16 +8904,16 @@ msgstr ""
 "Mise ร  jour impossible pour le sous-moduleย :\n"
 "%s"
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr "Abandon\n"
 
-#: unpack-trees.c:318
+#: unpack-trees.c:317
 msgid "Updating files"
 msgstr "Mise ร  jour des fichiers"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -8030,6 +8923,10 @@ msgstr ""
 "sensibles ร  la casse dans une systรจme de fichier insensible) et un\n"
 "seul du groupe en collision est dans l'arbre de travailย :\n"
 
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "Mise ร  jour des drapeaux de l'index"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "nom de schรฉma d'URL invalide ou suffixe '://' manquant"
@@ -8059,50 +8956,54 @@ msgstr "numรฉro de port invalide"
 msgid "invalid '..' path segment"
 msgstr "segment de chemin '..' invalide"
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Rรฉcupรฉration des objets"
+
+#: worktree.c:259 builtin/am.c:2099
 #, c-format
 msgid "failed to read '%s'"
 msgstr "รฉchec de la lecture de '%s'"
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 "'%s' dans l'arbre de travail principal n'est pas le rรฉpertoire de dรฉpรดt"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "le fichier '%s' ne contient pas de chemin absolu ร  l'emplacement de l'arbre "
 "de travail"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' n'existe pas"
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' ne pointe pas en retour sur '%s'"
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "impossible d'ouvrir '%s' en lecture/รฉcriture"
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr "impossible d'accรฉder ร  '%s'"
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr "impossible d'accรฉder au rรฉpertoire de travail courant"
 
@@ -8447,80 +9348,88 @@ msgstr ""
 "  (tous les conflits sont rรฉglรฉs : lancez \"git cherry-pick --continue\")"
 
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (utilisez \"git cherry-pick --skip\" pour sauter ce patch)"
+
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
 
-#: wt-status.c:1447
+#: wt-status.c:1449
 msgid "Revert currently in progress."
 msgstr "Rรฉtablissement en cours."
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Vous รชtes actuellement en train de rรฉtablir le commit %s."
 
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (rรฉglez les conflits puis lancez \"git revert --continue\")"
 
-#: wt-status.c:1459
+#: wt-status.c:1461
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (lancez \"git revert --continue\" pour continuer)"
 
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (tous les conflits sont rรฉglรฉs : lancez \"git revert --continue\")"
 
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (utilisez \"git revert --skip\" pour sauter ce patch)"
+
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (utilisez \"git revert --abort\" pour annuler le rรฉtablissement)"
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Vous รชtes en cours de bissection, depuis la branche '%s'."
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr "Vous รชtes en cours de bissection."
 
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (utilisez \"git bisect reset\" pour revenir ร  la branche d'origine)"
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr "Sur la branche "
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr "rebasage interactif en cours ; sur "
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr "rebasage en cours ; sur "
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr "Actuellement sur aucun branche."
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr "Validation initiale"
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
 msgstr "Aucun commit"
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr "Fichiers non suivis"
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr "Fichiers ignorรฉs"
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8532,32 +9441,32 @@ msgstr ""
 "oublier d'ajouter les nouveaux fichiers par vous-mรชme (voir 'git help "
 "status')."
 
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Fichiers non suivis non affichรฉs%s"
 
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr " (utilisez -u pour afficher les fichiers non suivis)"
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr "Aucune modification"
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "aucune modification n'a รฉtรฉ ajoutรฉe ร  la validation (utilisez \"git add\" ou "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "aucune modification ajoutรฉe ร  la validation\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8566,195 +9475,204 @@ msgstr ""
 "aucune modification ajoutรฉe ร  la validation mais des fichiers non suivis "
 "sont prรฉsents (utilisez \"git add\" pour les suivre)\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "aucune modification ajoutรฉe ร  la validation mais des fichiers non suivis "
 "sont prรฉsents\n"
 
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "rien ร  valider (crรฉez/copiez des fichiers et utilisez \"git add\" pour les "
 "suivre)\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr "rien ร  valider\n"
 
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "rien ร  valider (utilisez -u pour afficher les fichiers non suivis)\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "rien ร  valider, la copie de travail est propre\n"
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr "Encore aucun commit sur "
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr "HEAD (aucune branche)"
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr "diffรฉrent"
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr "derriรจre "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr "devant "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "Impossible de %sย : vous avez des modifications non indexรฉes."
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr "de plus, votre index contient des modifications non validรฉes."
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "%s impossibleย : votre index contient des modifications non validรฉes."
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "รฉchec pour dรฉlier '%s'"
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<options>] [--] <chemin>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "รฉtat de diff inattendu %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
 msgid "updating files failed"
 msgstr "รฉchec de la mise ร  jour des fichiers"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "suppression de '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifications non indexรฉes aprรจs rafraรฎchissement de l'index :"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:266 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Impossible d'ouvrir '%s' en รฉcriture."
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr "Impossible d'รฉcrire le patch"
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr "รฉchec de l'รฉdition du patch"
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Stat de '%s' impossible"
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr "Patch vide. Abandon."
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossible d'appliquer '%s'"
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Les chemins suivants sont ignorรฉs par un de vos fichiers .gitignore :\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "simuler l'action"
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr "sรฉlection interactive"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr "sรฉlection interactive des sections"
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr "รฉdition du diff actuel et application"
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr "permettre l'ajout de fichiers ignorรฉs"
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr "mettre ร  jour les fichiers suivis"
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr "enregistrer seulement le fait que le chemin sera ajoutรฉ plus tard"
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "ignorer les chemins effacรฉs dans la copie de travail (identique ร  --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr "ne pas ajouter, juste rafraรฎchir l'index"
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "sauter seulement les fichiers qui ne peuvent pas รชtre ajoutรฉs du fait "
 "d'erreurs"
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "vรฉrifier si des fichiers - mรชme manquants - sont ignorรฉs, ร  vide"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "outrepasser le bit exรฉcutable pour les fichiers listรฉs"
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr "avertir lors de l'ajout d'un dรฉpรดt embarquรฉ"
 
-#: builtin/add.c:326
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "backend pour `git stash -p`"
+
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8785,154 +9703,178 @@ msgstr ""
 "\n"
 "Rรฉfรฉrez-vous ร  \"git help submodule\" pour plus d'information."
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "dรฉpรดt git embarquรฉ ajoutรฉย : %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Utilisez -f si vous voulez rรฉellement les ajouter.\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Utilisez -f si vous voulez vraiment les ajouter.\n"
+"ร‰liminez ce message en lanรงant\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr "รฉchec de l'ajout de fichiers"
 
-#: builtin/add.c:419
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file est incompatible avec --edit"
+
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr "-A et -u sont mutuellement incompatibles"
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 "L'option --ignore-missing ne peut รชtre utilisรฉe qu'en complรฉment de --dry-run"
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "Le paramรจtre '%s' de --chmod doit รชtre soit -x soit +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul nรฉcessite --pathspec-from-file"
+
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Rien de spรฉcifiรฉ, rien n'a รฉtรฉ ajoutรฉ.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Vous vouliez sรปrement dire 'git add .' ?\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"Peut-รชtre avez-vous voulu dire 'git add .'ย ?\n"
+"ร‰liminez ce message en lanรงant\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "impossible d'analyser l'auteur du script"
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' a รฉtรฉ effacรฉ par le crochet applypatch-msg"
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Ligne en entrรฉe malformรฉe : '%s'."
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Impossible de copier les notes de '%s' vers '%s'"
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "รฉchec de fseek"
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "impossible d'analyser le patch '%s'"
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Seulement une sรฉrie de patchs StGIT peut รชtre appliquรฉe ร  la fois"
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "horodatage invalide"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "ligne de Date invalide"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "dรฉcalage horaire invalide"
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "ร‰chec de dรฉtection du format du patch."
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "รฉchec de la crรฉation du rรฉpertoire '%s'"
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "ร‰chec de dรฉcoupage des patchs."
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "impossible d'รฉcrire le fichier d'index"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Quand vous avez rรฉsolu ce problรจme, lancez \"%s --continue\"."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Si vous prรฉfรฉrez plutรดt sauter ce patch, lancez \"%s --skip\"."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Pour restaurer la branche originale et arrรชter de patcher, lancez \"%s --"
 "abort\"."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Rustine envoyรฉe avec format=flowedย ; les espaces en fin de ligne peuvent "
 "รชtre perdus."
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "ligne d'identification invalide : %.*s"
+msgid "missing author line in commit %s"
+msgstr "ligne d'auteur manquante dans le commit %s"
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "impossible d'analyser le commit %s"
+msgid "invalid ident line: %.*s"
+msgstr "ligne d'identification invalide : %.*s"
 
-#: builtin/am.c:1496
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Le dรฉpรดt n'a pas les blobs nรฉcessaires pour un retour ร  une fusion ร  3 "
 "points."
 
-#: builtin/am.c:1498
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."
 
-#: builtin/am.c:1517
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8940,24 +9882,24 @@ msgstr ""
 "Avez-vous รฉditรฉ le patch ร  la main ?\n"
 "Il ne s'applique pas aux blobs enregistrรฉs dans son index."
 
-#: builtin/am.c:1523
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour ร  un patch de la base et fusion ร  3 points..."
 
-#: builtin/am.c:1549
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "ร‰chec d'intรฉgration des modifications."
 
-#: builtin/am.c:1581
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "application ร  un historique vide"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 
-#: builtin/am.c:1650
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
@@ -8965,36 +9907,39 @@ msgstr "Le corps de la validation est :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept allย : "
 
-#: builtin/am.c:1710
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "impossible d'รฉcrire le fichier d'index"
+
+#: builtin/am.c:1704
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1744 builtin/am.c:1812
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1761
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch dรฉjร  appliquรฉ."
 
-#: builtin/am.c:1773
+#: builtin/am.c:1767
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "le patch a รฉchouรฉ ร  %s %.*s"
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr ""
-"Utilisez 'git am --show-current-patch' pour visualiser le patch en รฉchec"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en รฉchec"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1815
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -9005,7 +9950,7 @@ msgstr ""
 "introduit les mรชmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1822
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -9018,17 +9963,17 @@ msgstr ""
 "Vous pouvez lancer 'git rm' sur un fichier \"supprimรฉ par eux\" pour "
 "accepter son รฉtat."
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossible d'analyser l'objet '%s'."
 
-#: builtin/am.c:1987
+#: builtin/am.c:1981
 msgid "failed to clean index"
 msgstr "รฉchec du nettoyage de l'index"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2025
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -9036,145 +9981,155 @@ msgstr ""
 "Vous semblez avoir dรฉplacรฉ la HEAD depuis le dernier รฉchec de 'am'.\n"
 "Pas de retour ร  ORIG_HEAD"
 
-#: builtin/am.c:2128
+#: builtin/am.c:2132
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valeur invalide pour --show-current-patch : %s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s"
+
+#: builtin/am.c:2207
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2208
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2214
 msgid "run interactively"
 msgstr "exรฉcution interactive"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2216
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2218
 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir ร  une fusion ร  3 points si nรฉcessaire"
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
 msgid "be quiet"
 msgstr "รชtre silencieux"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2221
 msgid "add a Signed-off-by line to the commit message"
 msgstr "ajouter une ligne Signed-off-by au message de validation"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2224
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par dรฉfaut)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2226
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k ร  git-mailinfo"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2228
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b ร  git-mailinfo"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2230
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m ร  git-mailinfo"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2232
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passer l'option --keep-cr ร  git-mailsplit fpour le format mbox"
 
-#: builtin/am.c:2192
+#: builtin/am.c:2235
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "ne pas passer l'option --keep-cr ร  git-mailsplit indรฉpendamment de am.keepcr"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2238
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
 msgid "pass it through git-apply"
 msgstr "le passer jusqu'ร  git-apply"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2264
 msgid "format the patch(es) are in"
 msgstr "format de prรฉsentation des patchs"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2270
 msgid "override error message when patch failure occurs"
 msgstr "surcharger le message d'erreur lors d'un รฉchec d'application de patch"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2272
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer ร  appliquer les patchs aprรจs rรฉsolution d'un conflit"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2275
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2278
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2281
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "restaurer la branche originale et abandonner les applications de patch."
 
-#: builtin/am.c:2241
+#: builtin/am.c:2284
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "abandonne l'opรฉration de patch mais garde HEAD oรน il est."
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
-msgstr "afficher le patch en cours d'application."
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "afficher le patch en cours d'application"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2293
 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2295
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr "id-clรฉ"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2301
 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2319
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -9182,17 +10137,17 @@ msgstr ""
 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"
 "et elle sera supprimรฉe. Veuillez ne plus l'utiliser."
 
-#: builtin/am.c:2281
+#: builtin/am.c:2326
 msgid "failed to read the index"
 msgstr "รฉchec ร  la lecture de l'index"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2341
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "le rรฉpertoire prรฉcรฉdent de rebasage %s existe toujours mais mbox donnรฉe."
 
-#: builtin/am.c:2320
+#: builtin/am.c:2365
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9201,13 +10156,13 @@ msgstr ""
 "Rรฉpertoire abandonnรฉ %s trouvรฉ.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2371
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 "Pas de rรฉsolution de l'opรฉration en cours, nous ne sommes pas dans une "
 "reprise."
 
-#: builtin/am.c:2336
+#: builtin/am.c:2381
 msgid "interactive mode requires patches on the command line"
 msgstr "le mode interactif requiert des rustines sur la ligne de commande"
 
@@ -9332,7 +10287,7 @@ msgstr "Pas de bissection en cours.\n"
 msgid "'%s' is not a valid commit"
 msgstr "'%s' n'est pas un commit valide"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9340,27 +10295,27 @@ msgstr ""
 "ร‰chec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset "
 "<commit>'."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Mauvais argument pour bisect_writeย : %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "impossible d'obtenir l'oid de la rรฉvision '%s'"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "impossible d'ouvrir le fichier '%s'"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Commande invalideย : vous รชtes actuellement dans une bissection %s/%s"
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9369,7 +10324,7 @@ msgstr ""
 "Vous devez me donner au moins une rรฉvision %s et une rรฉvision %s.\n"
 "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9380,7 +10335,7 @@ msgstr ""
 "Puis vous devez me donner au moins une rรฉvision %s et une rรฉvision %s.\n"
 "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:310
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "Attention : bissection avec seulement une validation %s"
@@ -9389,15 +10344,15 @@ msgstr "Attention : bissection avec seulement une validation %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr "Confirmez-vous [Y/n] ? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr "aucun terme dรฉfini"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:382
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9406,7 +10361,7 @@ msgstr ""
 "Vos termes actuels sont %s pour l'รฉtat ancien\n"
 "et %s pour le nouvel รฉtat.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:392
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9416,274 +10371,270 @@ msgstr ""
 "Les options supportรฉes sontย : --term-good|--term-old et --term-bad|--term-"
 "new."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:478
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "option non reconnueย : %s"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:482
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' ne semble รชtre une rรฉvision valide"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:514
 msgid "bad HEAD - I need a HEAD"
 msgstr "mauvaise HEAD - j'ai besoin d'une HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:529
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "L'extraction de '%s' a รฉchouรฉ. Essayez 'git bisect start <branche-valide>'."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "refus de bissecter sur un arbre 'cg-seeked'"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:553
 msgid "bad HEAD - strange symbolic ref"
 msgstr "mauvaise HEAD - rรฉfรฉrence symbolique douteuse"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:577
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "rรฉference invalideย : '%s'"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr "effectuer 'git bisect next'"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "รฉcrire les termes dans .git/BISECT_TERMS"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr "vรฉrifier l'รฉtat de la bissection"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr "vรฉrifier si des rรฉvisions sont attendues"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:641
 msgid "reset the bisection state"
 msgstr "rรฉinitialiser l'รฉtat de la bissection"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:643
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "รฉcrire l'รฉtat de la bissection dans BISECT_LOG"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:645
 msgid "check and set terms in a bisection state"
 msgstr "vรฉrifier et rรฉgler les termes dans un รฉtat de la bissection"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:647
 msgid "check whether bad or good terms exist"
 msgstr "vรฉrifier si les termes bons ou mauvais existent"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:649
 msgid "print out the bisect terms"
 msgstr "afficher les termes de bissection"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:651
 msgid "start the bisect session"
 msgstr "dรฉmarrer une session de bissection"
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "mettre ร  jour BISECT_HEAD au lieu d'extraire le commit actuel"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:655
 msgid "no log for BISECT_WRITE"
 msgstr "pas de journal pour BISECT_WRITE"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms exige deux arguments"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state ne supporte aucun argument"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:684
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:688
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments"
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:694
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--check-and-set-terms exige 3 arguments"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:700
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check exige 2 ou 3 arguments"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:706
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms exige 0 ou 1 argument"
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<options-de-rรฉvision> sont documentรฉs dans git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, c-format
 msgid "expecting a color: %s"
 msgstr "couleur attendueย : %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr "doit finir avec une couleur"
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "couleur invalide '%s' dans color.blame.repeatedlines"
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 msgid "invalid value for blame.coloring"
 msgstr "valeur invalide pour blame.coloring"
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "rรฉfรฉrence ร  ignorer %s introuvable"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 "Montrer les รฉlรฉments de blรขme au fur et ร  mesure de leur dรฉcouverte, de "
 "maniรจre incrรฉmentale"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Dรฉfaut : dรฉsactivรฉ)"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "Ne pas traiter les commits racine comme des limites (Dรฉfaut : dรฉsactivรฉ)"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr "Montrer les statistiques de coรปt d'activitรฉ"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr "Forcer l'affichage de l'รฉtat d'avancement"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr "Montrer le score de sortie pour les รฉlรฉments de blรขme"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr "Montrer les noms de fichier originaux (Dรฉfaut : auto)"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr "Montrer les numรฉros de lignes originaux (Dรฉfaut : dรฉsactivรฉ)"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr "Afficher dans un format propice ร  la consommation par machine"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Utiliser le mรชme mode de sortie que git-annotate (Dรฉfaut : dรฉsactivรฉ)"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr "Afficher les horodatages bruts (Dรฉfaut : dรฉsactivรฉ)"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Afficher les longs SHA1 de commits (Dรฉfaut : dรฉsactivรฉ)"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Supprimer le nom de l'auteur et l'horodatage (Dรฉfaut : dรฉsactivรฉ)"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr "Afficher le courriel de l'auteur au lieu du nom (Dรฉfaut : dรฉsactivรฉ)"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr "Ignorer les diffรฉrences d'espace"
 
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr "rรฉv"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 msgid "Ignore <rev> when blaming"
 msgstr "ignore <rev> pendant le blรขme"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 msgid "Ignore revisions from <file>"
 msgstr "ignorer les rรฉvisions listรฉes dans <fichier>"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 "colorer diffรฉremment les mรฉtadonnรฉes redondantes avec la ligne prรฉcรฉdente"
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr "colorier les lignes par รขge"
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Utiliser une heuristique expรฉrimentale pour amรฉliorer les diffs"
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr ""
 "Dรฉpenser des cycles supplรฉmentaires pour trouver une meilleure correspondance"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 "Utiliser les rรฉvisions du fichier <fichier> au lieu d'appeler git-rev-list"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "Utiliser le contenu de <fichier> comme image finale"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "score"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr "Trouver les copies de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 "Traiter seulement l'intervalle de ligne n,m en commenรงant le compte ร  1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress ne peut pas รชtre utilisรฉ avec --incremental ou les formats "
@@ -9697,18 +10648,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "il y a 10 ans et 11 mois"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "le fichier %s n'a qu'%lu ligne"
 msgstr[1] "le fichier %s n'a que %lu lignes"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr "Assignation de blรขme aux lignes"
 
@@ -9923,7 +10874,7 @@ msgstr "rรฉgler le mode de suivi (voir git-pull(1))"
 msgid "do not use"
 msgstr "ne pas utiliser"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:513
 msgid "upstream"
 msgstr "amont"
 
@@ -9932,8 +10883,8 @@ msgid "change the upstream info"
 msgstr "modifier l'information amont"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Dรฉsactiver l'information amont"
+msgid "unset the upstream info"
+msgstr "dรฉsactiver l'information amont"
 
 #: builtin/branch.c:628
 msgid "use colored output"
@@ -10034,7 +10985,7 @@ msgstr "le tri et le filtrage sont non-sensibles ร  la casse"
 msgid "format to use for the output"
 msgstr "format ร  utiliser pour la sortie"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:785
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trouvรฉe sous refs/heads !"
 
@@ -10126,20 +11077,65 @@ msgstr ""
 "l'option '--set-upstream' est obsolรจte. Utilisez '--track' ou '--set-"
 "upstream-to' ร  la place."
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr "%s est correct\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<options>] <fichier> <args git-rev-list>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<options>] <fichier>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]"
+
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "ne pas afficher la barre de progression"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "afficher la barre de progression"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr "afficher la barre de progression durant la phase d'รฉcrite des objets"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "similaire ร  --all-progress quand la barre de progression est affichรฉe"
+
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "La crรฉation d'un colis requiert un dรฉpรดt."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "ne pas afficher les dรฉtails du colis"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s est correct\n"
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "Le dรฉpaquetage d'un colis requiert un dรฉpรดt."
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr "รชtre verbeux : doit รชtre placรฉ avant une sous-commande"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sous-commande inconnue : %s"
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -10147,7 +11143,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
 "| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -10155,74 +11151,74 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 msgid "only one batch option may be specified"
 msgstr "une seule option de traitement ne peut รชtre spรฉcifiรฉe ร  la fois"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<type> peut รชtre : blob, tree, commit ou tag"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr "afficher le type de l'objet"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr "afficher la taille de l'objet"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr "afficher avec mise en forme le contenu de l'objet"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:1002
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr "utiliser un chemin spรฉcifique pour --textconv/--filters"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "autoriser -s et -t ร  travailler sur des objets cassรฉs/corrompus"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr "bufferiser la sortie de --batch"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "afficher l'information et le contenu des objets passรฉs en entrรฉe standard"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr "afficher l'information des objets passรฉs en entrรฉe standard"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "suivre les liens symbolique internes ร  la copie de travail (utilisรฉ avec --"
 "batch ou --batch-check)"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr "montrer tous les objets avec --batch ou --batch-check"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr "ne pas ordonner la sortie de --batch-all-objects"
 
@@ -10251,8 +11247,8 @@ msgid "terminate input and output records by a NUL character"
 msgstr ""
 "terminer les enregistrements en entrรฉe et en sortie par un caractรจre NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
 msgid "suppress progress reporting"
 msgstr "supprimer l'รฉtat d'avancement"
 
@@ -10264,27 +11260,27 @@ msgstr "afficher les chemins en entrรฉe qui ne correspondent pas"
 msgid "ignore index when checking"
 msgstr "ignorer l'index pendant la vรฉrification"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "impossible de spรฉcifier les chemins avec --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z n'a de sens qu'avec l'option --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "aucun chemin spรฉcifiรฉ"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet n'est valide qu'avec un seul chemin"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "impossible d'avoir --quiet et --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching n'est valide qu'avec --verbose"
 
@@ -10344,9 +11340,9 @@ msgid "write the content to temporary files"
 msgstr "รฉcrire le contenu dans des fichiers temporaires"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
 msgid "string"
 msgstr "chaรฎne"
 
@@ -10374,100 +11370,100 @@ msgstr "git switch [<options>] <branche>"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<options>] [--source=<branche>] <fichier>..."
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "le chemin '%s' n'a pas notre version"
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "le chemin '%s' n'a pas leur version"
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "le chemin '%s' n'a aucune des versions nรฉcessaires"
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "le chemin '%s' n'a pas les versions nรฉcessaires"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "chemin '%s' : impossible de fusionner"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossible d'ajouter le rรฉsultat de fusion pour '%s'"
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "%d conflit du fusion recrรฉรฉ"
 msgstr[1] "%d conflits du fusion recrรฉรฉs"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d chemin mis ร  jour depuis %s"
 msgstr[1] "%d chemins mis ร  jour depuis %s"
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:389
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d chemin mis ร  jour depuis l'index"
 msgstr[1] "%d chemins mis ร  jour depuis l'index"
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' ne peut pas รชtre utilisรฉ avec des mises ร  jour de chemins"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' ne peut pas รชtre utilisรฉ avec %s"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Impossible de mettre ร  jour les chemins et basculer sur la branche '%s' en "
 "mรชme temps."
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ni '%s', ni '%s' spรฉcifiรฉ"
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' ne peut pas รชtre utilisรฉ quand '%s' n'est pas spรฉcifiรฉ"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' ou '%s' ne peut pas รชtre utilisรฉ avec %s"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "le chemin '%s' n'est pas fusionnรฉ"
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
 msgid "you need to resolve your current index first"
 msgstr "vous devez d'abord rรฉsoudre votre index courant"
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:734
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10477,56 +11473,50 @@ msgstr ""
 "suivants :\n"
 "%s"
 
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-"les modifications indexรฉes dans les fichiers suivants seraient perduesย : %s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:837
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossible de faire un reflog pour '%s'ย : %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:879
 msgid "HEAD is now at"
 msgstr "HEAD est maintenant sur"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:883 builtin/clone.c:717
 msgid "unable to update HEAD"
 msgstr "impossible de mettre ร  jour HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:887
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Remise ร  zรฉro de la branche '%s'\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Dรฉjร  sur '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:894
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Basculement et remise ร  zรฉro de la branche '%s'\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:896 builtin/checkout.c:1320
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Basculement sur la nouvelle branche '%s'\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:898
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Basculement sur la branche '%s'\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:949
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... et %d en plus.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:955
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10549,7 +11539,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:974
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10578,28 +11568,19 @@ msgstr[1] ""
 "git branch <nouvelle-branche> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1009
 msgid "internal error in revision walk"
 msgstr "erreur interne lors du parcours des rรฉvisions"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1013
 msgid "Previous HEAD position was"
 msgstr "La position prรฉcรฉdente de HEAD รฉtait sur"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
 msgid "You are on a branch yet to be born"
 msgstr "Vous รชtes sur une branche qui doit encore naรฎtre"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "une seule rรฉfรฉrence attendue"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "une seule rรฉfรฉrence attendue, %d fournies."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1128
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10608,37 +11589,71 @@ msgstr ""
 "'%s' pourrait รชtre un fichier local ou un branche de suivi.\n"
 "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Si vous souhaitiez extraire une branche de suivi distant sur 'origin',\n"
+"par exemple, qualifiez-la complรจtement avec l'option --trackย :\n"
+"\n"
+"    git checkout --track origin/<nom>\n"
+"\n"
+"Si vous souhaitez privilรฉgier un distant particulier lorsque <nom> est\n"
+"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
+"votre config."
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' correspond ร  plusieurs (%d) branches de suivi ร  distance"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "une seule rรฉfรฉrence attendue"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "une seule rรฉfรฉrence attendue, %d fournies."
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
 #, c-format
 msgid "invalid reference: %s"
 msgstr "rรฉfรฉrence invalide : %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la rรฉfรฉrence n'est pas un arbre : %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1334
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "branche attendue, mais รฉtiquette '%s' reรงue"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1336
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "une branche est attendue, mais une branche distante '%s' a รฉtรฉ reรงue"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "une branche est attendue, mais '%s' a รฉtรฉ reรงue"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1340
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "une branche est attendue, mais un commit '%s' a รฉtรฉ reรงu"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1356
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10646,7 +11661,7 @@ msgstr ""
 "impossible de basculer de branche pendant une fusion\n"
 "Envisagez \"git merge --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1360
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10654,7 +11669,7 @@ msgstr ""
 "impossible de basculer de branche pendant une session am\n"
 "Envisagez \"git am --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1364
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10662,7 +11677,7 @@ msgstr ""
 "impossible de basculer de branche pendant un rebasage\n"
 "Envisagez \"git rebase --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1368
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10670,7 +11685,7 @@ msgstr ""
 "impossible de basculer de branche pendant un picorage\n"
 "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1372
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10678,139 +11693,144 @@ msgstr ""
 "impossible de basculer de branche pendant un retour\n"
 "Envisagez \"git revert --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1376
 msgid "you are switching branch while bisecting"
 msgstr "Vous basculez de branche en cours de bissection"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1383
 msgid "paths cannot be used with switching branches"
 msgstr "impossible d'utiliser des chemins avec un basculement de branches"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' ne peut pas รชtre utilisรฉ avec un basculement de branches"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' ne peut pas รชtre utilisรฉ avec '%s'"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1411
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' n'accepte pas <point-de-dรฉpart>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1419
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1426
 msgid "missing branch or commit argument"
 msgstr "argument de branche ou de commit manquant"
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "forcer l'affichage de l'รฉtat d'avancement"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1469
 msgid "perform a 3-way merge with the new branch"
 msgstr "effectuer une fusion ร  3 points avec la nouvelle branche"
 
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr "style"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1471
 msgid "conflict style (merge or diff3)"
 msgstr "style de conflit (merge (fusion) ou diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1483 builtin/worktree.c:496
 msgid "detach HEAD at named commit"
 msgstr "dรฉtacher la HEAD au commit nommรฉ"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1484
 msgid "set upstream info for new branch"
 msgstr "paramรฉtrer les coordonnรฉes de branche amont pour une nouvelle branche"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1486
 msgid "force checkout (throw away local modifications)"
 msgstr "forcer l'extraction (laisser tomber les modifications locales)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new-branch"
 msgstr "nouvelle branche"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new unparented branch"
 msgstr "nouvelle branche sans parent"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
 msgid "update ignored files (default)"
 msgstr "mettre ร  jour les fichiers ignorรฉs (par dรฉfaut)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1493
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "ne pas vรฉrifier si une autre copie de travail contient le rรฉfรฉrence fournie"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1506
 msgid "checkout our version for unmerged files"
 msgstr "extraire notre version pour les fichiers non fusionnรฉs"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1509
 msgid "checkout their version for unmerged files"
 msgstr "extraire leur version pour les fichiers non fusionnรฉs"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1513
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "ne pas limiter les spรฉcificateurs de chemins aux seuls รฉlรฉments creux"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B et --orphan sont mutuellement exclusifs"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1568
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p et --overlay sont mutuellement exclusifs"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1605
 msgid "--track needs a branch name"
 msgstr "--track requiert un nom de branche"
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1610
 msgid "missing branch name; try -b"
 msgstr "nom de branche manquant ; essayez -b"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1642
 #, c-format
 msgid "could not resolve %s"
 msgstr "impossible de rรฉsoudre %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "Vous devez spรฉcifier un ou des chemins ร  restaurer"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
 msgid "invalid path specification"
 msgstr "spรฉcification de chemin invalide"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "'%s' n'est pas un commit et une branche '%s' ne peut pas en รชtre crรฉรฉe depuis"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file est incompatible avec --detach"
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file est incompatible avec --patch"
+
+#: builtin/checkout.c:1692
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10818,95 +11838,70 @@ msgstr ""
 "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
 "de l'extraction de l'index."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' correspond ร  plusieurs branches de suivi distant. Nous avons\n"
-"trouvรฉ %d distants avec une rรฉfรฉrence correspondante. Nous avons essayรฉ\n"
-"de rรฉsoudre l'argument comme un chemin, sans plus de rรฉsultatย !\n"
-"\n"
-"Si vous souhaitiez extraire une branche de suivi distant sur 'origin',\n"
-"par exemple, qualifiez-la complรจtement avec l'option --trackย :\n"
-"\n"
-"    git checkout --track origin/<nom>\n"
-"\n"
-"Si vous souhaitez privilรฉgier un distant particulier lorsque <nom> est\n"
-"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
-"votre config."
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "Vous devez spรฉcifier un ou des chemins ร  restaurer"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
 msgid "branch"
 msgstr "branche"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1724
 msgid "create and checkout a new branch"
 msgstr "crรฉer et extraire une nouvelle branche"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1726
 msgid "create/reset and checkout a branch"
 msgstr "crรฉer/rรฉinitialiser et extraire une branche"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1727
 msgid "create reflog for new branch"
 msgstr "crรฉer un reflog pour une nouvelle branche"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1729
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 "essayer d'interprรฉter 'git checkout <branche-inexistante>' (par dรฉfaut)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1730
 msgid "use overlay mode (default)"
 msgstr "utiliser le mode de superposition (dรฉfaut)"
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1775
 msgid "create and switch to a new branch"
 msgstr "crรฉer et basculer sur une nouvelle branche"
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1777
 msgid "create/reset and switch to a branch"
 msgstr "crรฉer/rรฉinitialiser et basculer sur une branche"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1779
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "interprรฉter 'git switch <branche-inexistante>'"
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1781
 msgid "throw away local modifications"
 msgstr "laisser tomber les modifications locales"
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1813
 msgid "which tree-ish to checkout from"
 msgstr "de quel <arbre-esque> faire l'extraction"
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1815
 msgid "restore the index"
 msgstr "restaurer l'index"
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1817
 msgid "restore the working tree (default)"
 msgstr "restaurer l'arbre de travail (par dรฉfaut)"
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1819
 msgid "ignore unmerged entries"
 msgstr "ignorer les entrรฉes non-fusionnรฉes"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
 msgid "use overlay mode"
 msgstr "utiliser le mode de superposition"
 
@@ -10946,7 +11941,7 @@ msgstr "รฉchec de la suppression de %s"
 msgid "could not lstat %s\n"
 msgstr "lstat de %s impossible\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10959,7 +11954,7 @@ msgstr ""
 "foo         - sรฉlectionner un รฉlรฉment par un prรฉfixe unique\n"
 "            - (vide) ne rien sรฉlectionner\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10980,38 +11975,33 @@ msgstr ""
 "*          - choisir tous les รฉlรฉments\n"
 "           - (vide) terminer la sรฉlection\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Hein (%s)ย ?\n"
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Entrez les motifs ร  ignorer>> "
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ATTENTION : Impossible de trouver les รฉlรฉments correspondant ร  : %s"
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Sรฉlectionner les รฉlรฉments ร  supprimer"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Supprimer %s [y/N] ? "
 
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Au revoir.\n"
-
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11029,64 +12019,56 @@ msgstr ""
 "help                - cet รฉcran\n"
 "?                   - aide pour la sรฉlection en ligne"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Commandes ***"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Et maintenant ?"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Supprimerait l'รฉlรฉment suivant :"
 msgstr[1] "Supprimerait les รฉlรฉments suivants :"
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Plus de fichier ร  nettoyer, sortie."
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "ne pas afficher les noms des fichiers supprimรฉs"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr "forcer"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "nettoyage interactif"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "supprimer les rรฉpertoires entiers"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "motif"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "ajouter <motif> aux rรจgles ignore"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "supprimer les fichiers ignorรฉs, aussi"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "supprimer seulement les fichiers ignorรฉs"
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x et -X ne peuvent pas รชtre utilisรฉs ensemble"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -11094,7 +12076,7 @@ msgstr ""
 "clean.requireForce positionnรฉ ร  true et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -11102,7 +12084,7 @@ msgstr ""
 "clean.requireForce ร  true par dรฉfaut et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<options>] [--] <dรฉpรดt> [<rรฉpertoire>]"
 
@@ -11150,18 +12132,18 @@ msgstr "rรฉpertoire-modรจle"
 msgid "directory from which templates will be used"
 msgstr "rรฉpertoire depuis lequel les modรจles vont รชtre utilisรฉs"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr "dรฉpรดt de rรฉfรฉrence"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr "utiliser seulement --reference pour cloner"
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
 msgid "name"
 msgstr "nom"
 
@@ -11177,8 +12159,8 @@ msgstr "extraire <branche> au lieu de la HEAD du rรฉpertoire distant"
 msgid "path to git-upload-pack on the remote"
 msgstr "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
 msgid "depth"
 msgstr "profondeur"
 
@@ -11186,7 +12168,7 @@ msgstr "profondeur"
 msgid "create a shallow clone of that depth"
 msgstr "crรฉer un clone superficiel de cette profondeur"
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
 msgid "time"
 msgstr "heure"
 
@@ -11194,17 +12176,18 @@ msgstr "heure"
 msgid "create a shallow clone since a specific time"
 msgstr "crรฉer un clone superficiel depuis une date spรฉcifique"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
 msgid "revision"
 msgstr "rรฉvision"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "approfondir l'historique d'un clone superficiel en excluant une rรฉvision"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr "cloner seulement une branche, HEAD ou --branch"
 
@@ -11234,23 +12217,23 @@ msgstr "clรฉ=valeur"
 msgid "set config inside the new repository"
 msgstr "rรฉgler la configuration dans le nouveau dรฉpรดt"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "spรฉcifique au serveur"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "option ร  transmettre"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr "n'utiliser que des adresses IPv4"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr "n'utiliser que des adresses IPv6"
 
@@ -11259,7 +12242,13 @@ msgid "any cloned submodules will use their remote-tracking branch"
 msgstr ""
 "tous les sous-modules clonรฉs utiliseront leur branche de suivi ร  distance"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"initialiser le fichier d'extraction partielle pour n'inclure que les "
+"fichiers ร  la racine"
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11267,47 +12256,42 @@ msgstr ""
 "Aucun nom de rรฉpertoire n'a pu รชtre devinรฉ\n"
 "Veuillez spรฉcifier un rรฉpertoire dans la ligne de commande"
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "infoย : impossible d'ajouter une alternative pour '%s'ย : %s\n"
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe et n'est pas un rรฉpertoire"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "รฉchec du dรฉmarrage un itรฉrateur sur '%s'"
 
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "รฉchec pour dรฉlier '%s'"
-
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "รฉchec de la crรฉation du lien '%s'"
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "รฉchec de la copie vers '%s'"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "รฉchec de l'itรฉration sur '%s'"
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr "fait.\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11317,98 +12301,102 @@ msgstr ""
 "Vous pouvez inspecter ce qui a รฉtรฉ extrait avec 'git status'\n"
 "et rรฉessayer avec 'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossible de trouver la branche distante '%s' ร  cloner."
 
-#: builtin/clone.c:702
+#: builtin/clone.c:705
 #, c-format
 msgid "unable to update %s"
 msgstr "impossible de mettre ร  jour %s"
 
-#: builtin/clone.c:752
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "รฉchec lors de l'initialisation l'extraction partielle"
+
+#: builtin/clone.c:776
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "la HEAD distante rรฉfรจre ร  une rรฉfรฉrence non existante, impossible de "
 "l'extraire.\n"
 
-#: builtin/clone.c:783
+#: builtin/clone.c:807
 msgid "unable to checkout working tree"
 msgstr "impossible d'extraire la copie de travail"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:862
 msgid "unable to write parameters to config file"
 msgstr "impossible d'รฉcrire les paramรจtres dans le fichier de configuration"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:925
 msgid "cannot repack to clean up"
 msgstr "impossible de remballer pour nettoyer"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:927
 msgid "cannot unlink temporary alternates file"
 msgstr "impossible de dรฉlier le fichier temporaire alternates"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: builtin/clone.c:942
+#: builtin/clone.c:969
 msgid "You must specify a repository to clone."
 msgstr "Vous devez spรฉcifier un dรฉpรดt ร  cloner."
 
-#: builtin/clone.c:955
+#: builtin/clone.c:982
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les options --bare et --origin %s sont incompatibles."
 
-#: builtin/clone.c:958
+#: builtin/clone.c:985
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare et --separate-git-dir sont incompatibles."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:998
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "le dรฉpรดt '%s' n'existe pas"
 
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:1004 builtin/fetch.c:1796
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profondeur %s n'est pas un entier positif"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1014
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 "le chemin de destination '%s' existe dรฉjร  et n'est pas un rรฉpertoire vide."
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1024
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "la copie de travail '%s' existe dรฉjร ."
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "impossible de crรฉer les rรฉpertoires de premier niveau dans '%s'"
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1044
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "impossible de crรฉer le rรฉpertoire de la copie de travail '%s'"
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1064
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonage dans le dรฉpรดt nu '%s'\n"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1066
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonage dans '%s'...\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1090
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11416,41 +12404,41 @@ msgstr ""
 "clone --recursive n'est pas compatible avec ร  la fois --reference et --"
 "reference-if-able"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1154
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth est ignorรฉ dans les clones locaux : utilisez plutรดt \"file://\"."
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1156
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since est ignorรฉ dans les clones locaux : utilisez plutรดt \"file://"
 "\"."
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1158
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude est ignorรฉ dans les clones locaux : utilisez plutรดt "
 "\"file://\"."
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1160
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter est ignorรฉ dans les clones locaux ; utilisez plutรดt file:// ."
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1163
 msgid "source repository is shallow, ignoring --local"
 msgstr "le dรฉpรดt source est superficiel, option --local ignorรฉe"
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1168
 msgid "--local is ignored"
 msgstr "--local est ignorรฉ"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1243 builtin/clone.c:1251
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "La branche distante %s n'a pas รฉtรฉ trouvรฉe dans le dรฉpรดt amont %s"
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1254
 msgid "You appear to have cloned an empty repository."
 msgstr "Vous semblez avoir clonรฉ un dรฉpรดt vide."
 
@@ -11499,7 +12487,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "le parent dupliquรฉ %s est ignorรฉ"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, c-format
 msgid "not a valid object name %s"
 msgstr "nom d'objet invalide %s"
@@ -11527,13 +12515,13 @@ msgstr "parent"
 msgid "id of a parent commit object"
 msgstr "id d'un objet commit parent"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
 #: builtin/tag.c:412
 msgid "message"
 msgstr "message"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
 msgid "commit message"
 msgstr "message de validation"
 
@@ -11541,8 +12529,8 @@ msgstr "message de validation"
 msgid "read commit log message from file"
 msgstr "lire le message de validation depuis un fichier"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "signer la validation avec GPG"
 
@@ -11618,57 +12606,65 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "รฉchec du dรฉpaquetage de l'objet arbre HEAD"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file avec l'option -a n'a pas de sens"
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr "impossible de crรฉer l'index temporaire"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:385
 msgid "interactive add failed"
 msgstr "รฉchec de l'ajout interactif"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:400
 msgid "unable to update temporary index"
 msgstr "impossible de mettre ร  jour l'index temporaire"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:402
 msgid "Failed to update main cache tree"
 msgstr "Impossible de mettre ร  jour l'arbre de cache principal"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
 msgid "unable to write new_index file"
 msgstr "impossible d'รฉcrire le fichier new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:479
 msgid "cannot do a partial commit during a merge."
 msgstr "impossible de faire une validation partielle pendant une fusion."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:481
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:489
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:508
 msgid "unable to write temporary index file"
 msgstr "impossible d'รฉcrire le fichier d'index temporaire"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:606
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "entรชte d'auteur manquant dans le commit '%s'"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:608
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "le commit '%s' a une ligne d'auteur malformรฉe"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:627
 msgid "malformed --author parameter"
 msgstr "paramรจtre --author mal formรฉ"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:680
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11676,38 +12672,38 @@ msgstr ""
 "impossible de sรฉlectionner un caractรจre de commentaire\n"
 "qui n'est pas utilisรฉ dans le message de validation actuel"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossible de rechercher le commit %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lecture du message de journal depuis l'entrรฉe standard)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:732
 msgid "could not read log from standard input"
 msgstr "impossible de lire le journal depuis l'entrรฉe standard"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:736
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossible de lire le fichier de journal '%s'"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:767 builtin/commit.c:783
 msgid "could not read SQUASH_MSG"
 msgstr "impossible de lire SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:774
 msgid "could not read MERGE_MSG"
 msgstr "impossible de lire MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:834
 msgid "could not write commit template"
 msgstr "impossible d'รฉcrire le modรจle de commit"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:853
 #, c-format
 msgid ""
 "\n"
@@ -11722,7 +12718,7 @@ msgstr ""
 "\t%s\n"
 "et essayez ร  nouveau.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:858
 #, c-format
 msgid ""
 "\n"
@@ -11737,7 +12733,7 @@ msgstr ""
 "\t%s\n"
 "et essayez ร  nouveau.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:871
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11747,7 +12743,7 @@ msgstr ""
 "commenรงant par '%c' seront ignorรฉes, et un message vide abandonne la "
 "validation.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:879
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11758,148 +12754,144 @@ msgstr ""
 "commenรงant par '%c' seront conservรฉes ; vous pouvez les supprimer vous-mรชme\n"
 "si vous le souhaitez. Un message vide abandonne la validation.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:896
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAuteur :     %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:904
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDate :       %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:911
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sValidateur : %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:929
 msgid "Cannot read index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "Erreur lors de la construction des arbres"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond ร  aucun "
 "auteur existant"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode de fichier ignorรฉ invalide '%s'"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1327
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fichier non suivi invalide '%s'"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "--long et -z sont incompatibles"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "L'utilisation simultanรฉe de --reset-author et --author n'a pas de sens"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "Il n'y a rien ร  corriger."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Vous รชtes en pleine fusion -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Vous รชtes en plein picorage -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1188
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les options --squash et --fixup ne peuvent pas รชtre utilisรฉes ensemble"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1198
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Une seule option parmi -c/-C/-F/--fixup peut รชtre utilisรฉe."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1200
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "L'option -m ne peut pas รชtre combinรฉe avec -c/-C/-F."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1208
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author ne peut รชtre utilisรฉ qu'avec -C, -c ou --amend."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1225
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "
 "รชtre utilisรฉe."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1231
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1362 builtin/commit.c:1524
 msgid "show status concisely"
 msgstr "afficher l'รฉtat avec concision"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1364 builtin/commit.c:1526
 msgid "show branch information"
 msgstr "afficher l'information de branche"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1366
 msgid "show stash information"
 msgstr "afficher l'information de remisage"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1368 builtin/commit.c:1528
 msgid "compute full ahead/behind values"
 msgstr "calcule les valeurs complรจtes en avance/en retard"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1370
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
 msgid "machine-readable output"
 msgstr "sortie pour traitement automatique"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1373 builtin/commit.c:1532
 msgid "show status in long format (default)"
 msgstr "afficher l'รฉtat en format long (par dรฉfaut)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1376 builtin/commit.c:1535
 msgid "terminate entries with NUL"
 msgstr "terminer les รฉlรฉments par NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1379 builtin/commit.c:1538
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
 "no. (Dรฉfaut : all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1383
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11907,11 +12899,11 @@ msgstr ""
 "afficher les fichiers ignorรฉs, \"mode\" facultatif : traditional "
 "(traditionnel), matching (correspondant), no. (Dรฉfautย : traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1385 parse-options.h:192
 msgid "when"
 msgstr "quand"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1386
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11919,175 +12911,175 @@ msgstr ""
 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
 "(tous), dirty (sale), untracked (non suivi). (Dรฉfaut : all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1388
 msgid "list untracked files in columns"
 msgstr "afficher les fichiers non suivis en colonnes"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1389
 msgid "do not detect renames"
 msgstr "ne pas dรฉtecter les renommages"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1391
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 "dรฉtecter les renommages, en spรฉcifiant optionnellement le facteur de "
 "similaritรฉ"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1411
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinaison non supportรฉe d'arguments sur les fichiers ignorรฉs et non-suivis"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "suppress summary after successful commit"
 msgstr "supprimer le rรฉsumรฉ aprรจs une validation rรฉussie"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1495
 msgid "show diff in commit message template"
 msgstr "afficher les diff dans le modรจle de message de validation"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1497
 msgid "Commit message options"
 msgstr "Options du message de validation"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
 msgid "read message from file"
 msgstr "lire le message depuis un fichier"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "author"
 msgstr "auteur"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "override author for commit"
 msgstr "remplacer l'auteur pour la validation"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1500 builtin/gc.c:538
 msgid "date"
 msgstr "date"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1500
 msgid "override date for commit"
 msgstr "remplacer la date pour la validation"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1502
 msgid "reuse and edit message from specified commit"
 msgstr "rรฉutiliser et รฉditer le message du commit spรฉcifiรฉ"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1503
 msgid "reuse message from specified commit"
 msgstr "rรฉutiliser le message du commit spรฉcifiรฉ"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1504
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour corriger le commit spรฉcifiรฉ"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1505
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour compresser le commit spรฉcifiรฉ"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1506
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "ร  prรฉsent je suis l'auteur de la validation (utilisรฉ avec -C/-c/--amend)"
 
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "ajouter une entrรฉe Signed-off-by :"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1508
 msgid "use specified template file"
 msgstr "utiliser le fichier de modรจle spรฉcifiรฉ"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1509
 msgid "force edit of commit"
 msgstr "forcer l'รฉdition du commit"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1511
 msgid "include status in commit message template"
 msgstr "inclure l'รฉtat dans le modรจle de message de validation"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1516
 msgid "Commit contents options"
 msgstr "Valider les options des contenus"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1517
 msgid "commit all changed files"
 msgstr "valider tous les fichiers modifiรฉs"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1518
 msgid "add specified files to index for commit"
 msgstr "ajouter les fichiers spรฉcifiรฉs ร  l'index pour la validation"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1519
 msgid "interactively add files"
 msgstr "ajouter des fichiers en mode interactif"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1520
 msgid "interactively add changes"
 msgstr "ajouter les modifications en mode interactif"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1521
 msgid "commit only specified files"
 msgstr "valider seulement les fichiers spรฉcifiรฉs"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1522
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "รฉviter d'utiliser les crochets pre-commit et commit-msg"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1523
 msgid "show what would be committed"
 msgstr "afficher ce qui serait validรฉ"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1536
 msgid "amend previous commit"
 msgstr "corriger la validation prรฉcรฉdente"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1537
 msgid "bypass post-rewrite hook"
 msgstr "รฉviter d'utiliser le crochet post-rewrite"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1544
 msgid "ok to record an empty change"
 msgstr "accepter d'enregistrer une modification vide"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1546
 msgid "ok to record a change with an empty message"
 msgstr "accepter d'enregistrer une modification avec un message vide"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1619
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fichier MERGE_HEAD corrompu (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
 msgid "could not read MERGE_MODE"
 msgstr "impossible de lire MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1645
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "impossible de lire le message de validation : %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abandon de la validation dรป ร  un message de validation vide.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Abandon de la validation ; vous n'avez pas รฉditรฉ le message\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1691
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -12097,78 +13089,77 @@ msgstr ""
 "new_index. Vรฉrifiez que le disque n'est pas plein ou que le quota\n"
 "n'a pas รฉtรฉ dรฉpassรฉ, puis lancez \"git restore --staged :/\" pour rรฉparer."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
 msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <options de division>"
+"git commit-graph write [--object-dir <rรฉpertoire-d'objet>] [--append|--"
+"split] [--reachable|--stdin-packs|--stdin-commits] [--|no-]progress] "
+"<options de division>"
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "impossible de trouver le rรฉpertoire objet correspondant ร  %s"
+
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr "rรฉpertoire"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
 msgid "The object directory to store the graph"
 msgstr "Le rรฉpertoire d'objet oรน stocker le graphe"
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:71
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 "si le graphe de commit est divisรฉ, vรฉrifier seulement le fichier sommet"
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "impossible d'ouvrir le graphe de commit '%s'"
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:128
 msgid "start walk at all refs"
 msgstr "commencer le parcours ร  toutes les rรฉfs"
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:130
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "scanner les index compactรฉs listรฉs sur stdin ร  la recherche de commits"
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:132
 msgid "start walk at commits listed by stdin"
 msgstr "commencer le parcours aux commits listรฉs sur stdin"
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:134
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 "inclure tous les commits dรฉjร  prรฉsents dans le fichier de graphe de commits"
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:137
 msgid "allow writing an incremental commit-graph file"
 msgstr "permettre d'รฉcrire un fichier incrรฉmental de graphe de commit"
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 "le nombre maximum de commits dans un graphe de commit divisรฉ pas de base"
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:141
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisรฉ"
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:159
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"
 
@@ -12176,208 +13167,214 @@ msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"
 msgid "git config [<options>]"
 msgstr "git config [<options>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argument --type non reconnu, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:116
 msgid "only one type at a time"
 msgstr "qu'un seul type ร  la fois"
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr "Emplacement du fichier de configuration"
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr "utiliser les fichier de configuration global"
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr "utiliser le fichier de configuration du systรจme"
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr "utiliser le fichier de configuration du dรฉpรดt"
 
-#: builtin/config.c:128
+#: builtin/config.c:129
 msgid "use per-worktree config file"
 msgstr "utiliser un fichier de configuration par arbre de travail"
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr "utiliser le fichier de configuration spรฉcifiรฉ"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr "lire la configuration depuis l'objet blob fourni"
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr "Action"
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr "obtenir la valeur : nom [regex-de-valeur]"
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr "obtenir toutes les valeurs : clรฉ [regex-de-valeur]"
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtenir la valeur spรฉcifique pour l'URL : section[.var] URL"
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr "ajouter une nouvelle variable : nom valeur"
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr "supprimer une variable : nom [regex-de-valeur]"
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr "renommer une section : ancien-nom nouveau-nom"
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr "supprimer une section : nom"
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr "afficher tout"
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr "ouvrir un รฉditeur"
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr "trouver la couleur configurรฉe : slot [par dรฉfaut]"
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "trouver le rรฉglage de la couleur : slot [stdout-est-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr "Type"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
 msgid "value is given this type"
 msgstr "ce type est assignรฉ ร  la valeur"
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr "la valeur est un nombre dรฉcimal"
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr "la valeur est --bool ou --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr "la valeur est un chemin (vers un fichier ou un rรฉpertoire)"
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr "la valeur est une date d'expiration"
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr "Autre"
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr "terminer les valeurs avec un caractรจre NUL"
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr "n'afficher que les noms de variable"
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr "respecter les directives d'inclusion lors de la recherche"
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "afficher l'origine de la configuration (fichier, entrรฉe standard, blob, "
 "ligne de commande)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"afficher la portรฉe de configuration (arbre de travail, local, global, "
+"systรจme, commande)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
 msgid "value"
 msgstr "valeur"
 
-#: builtin/config.c:158
+#: builtin/config.c:160
 msgid "with --get, use default value when missing entry"
 msgstr "avec --get, utiliser le valeur par dรฉfaut quand l'entrรฉe n'existe pas"
 
-#: builtin/config.c:172
+#: builtin/config.c:174
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "mauvais nombre d'arguments, devrait รชtre %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:176
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "mauvais nombre d'arguments, devrait รชtre entre %d et %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:324
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "motif de clรฉ invalideย : %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:360
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "รฉchec du formatage de la valeur de config par dรฉfautย : %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:417
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "impossible d'analyser la couleur '%s'"
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr "impossible de lire la valeur de couleur par dรฉfaut"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
 msgid "not in a git directory"
 msgstr "pas dans un rรฉpertoire git"
 
-#: builtin/config.c:499
+#: builtin/config.c:515
 msgid "writing to stdin is not supported"
 msgstr "l'รฉcriture sur stdin n'est pas supportรฉe"
 
-#: builtin/config.c:502
+#: builtin/config.c:518
 msgid "writing config blobs is not supported"
 msgstr "l'รฉcriture de blob de configuration n'est pas supportรฉe<"
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12392,23 +13389,23 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:627
 msgid "only one config file at a time"
 msgstr "un seul fichier de configuration ร  la fois"
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr "--local ne peut รชtre utilisรฉ qu'ร  l'intรฉrieur d'un dรฉpรดt git"
 
-#: builtin/config.c:619
+#: builtin/config.c:635
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob ne peut รชtre utilisรฉ qu'ร  l'intรฉrieur d'un dรฉpรดt git"
 
-#: builtin/config.c:638
+#: builtin/config.c:655
 msgid "$HOME not set"
 msgstr "$HOME n'est pas dรฉfini"
 
-#: builtin/config.c:658
+#: builtin/config.c:679
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12419,19 +13416,19 @@ msgstr ""
 "la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de "
 "dรฉtails"
 
-#: builtin/config.c:688
+#: builtin/config.c:714
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color et le type de la variable sont incohรฉrents"
 
-#: builtin/config.c:693
+#: builtin/config.c:719
 msgid "only one action at a time"
 msgstr "une seule action ร  la fois"
 
-#: builtin/config.c:706
+#: builtin/config.c:732
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:738
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -12439,33 +13436,33 @@ msgstr ""
 "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --"
 "list"
 
-#: builtin/config.c:718
+#: builtin/config.c:744
 msgid "--default is only applicable to --get"
 msgstr "--default n'est applicable qu'avec --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:757
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "lecture du fichier de configuration '%s' impossible"
 
-#: builtin/config.c:734
+#: builtin/config.c:760
 msgid "error processing config file(s)"
 msgstr "erreur lors du traitement de fichier(s) de configuration"
 
-#: builtin/config.c:744
+#: builtin/config.c:770
 msgid "editing stdin is not supported"
 msgstr "l'รฉdition de stdin n'est pas supportรฉe"
 
-#: builtin/config.c:746
+#: builtin/config.c:772
 msgid "editing blobs is not supported"
 msgstr "l'รฉdition de blobs n'est pas supportรฉe"
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "crรฉation impossible du fichier de configuration '%s'"
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12474,7 +13471,7 @@ msgstr ""
 "impossible de surcharger des valeurs multiples avec une seule valeur\n"
 "       Utilisez une regexp, --add ou --replace-all pour modifier %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
 #, c-format
 msgid "no such section: %s"
 msgstr "section inexistanteย : %s"
@@ -12487,59 +13484,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "affiche les tailles dans un format humainement lisible"
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<options>] <commit ou apparentรฉ>*"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<options>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr "tรชte"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr "lรฉger"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr "annotรฉ"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'รฉtiquette annotรฉe %s n'est pas disponible"
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "l'รฉtiquette annotรฉe %s n'a pas de nom embarquรฉ"
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "l'รฉtiquette '%s' est en fait '%s'"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "aucune รฉtiquette ne correspond parfaitement ร  '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Pas de correspondance exacte sur des rรฉfs ou des รฉtiquettes, recherche par "
 "describe\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:394
 #, c-format
 msgid "finished search at %s\n"
 msgstr "recherche terminรฉe ร  %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:421
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12548,7 +13545,7 @@ msgstr ""
 "Aucune รฉtiquette annotรฉe ne peut dรฉcrire '%s'.\n"
 "Cependant, il existe des รฉtiquettes non-annotรฉes : essayez avec --tags."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:425
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12557,12 +13554,12 @@ msgstr ""
 "Aucune รฉtiquette ne peut dรฉcrire '%s'.\n"
 "Essayez --always, ou crรฉez des รฉtiquettes."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:455
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits parcourus\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:458
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12572,92 +13569,92 @@ msgstr ""
 "affichรฉes\n"
 "abandon de la recherche ร  %s\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:526
 #, c-format
 msgid "describe %s\n"
 msgstr "dรฉcrire %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:529
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s n'est pas un nom d'objet valide"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:537
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s n'est ni un commit ni un blob"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:551
 msgid "find the tag that comes after the commit"
 msgstr "rechercher l'รฉtiquette qui suit le commit"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:552
 msgid "debug search strategy on stderr"
 msgstr "dรฉboguer la stratรฉgie de recherche sur stderr"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:553
 msgid "use any ref"
 msgstr "utiliser n'importe quelle rรฉfรฉrence"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:554
 msgid "use any tag, even unannotated"
 msgstr "utiliser n'importe quelle รฉtiquette, mรชme non-annotรฉe"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:555
 msgid "always use long format"
 msgstr "toujours utiliser le format long"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:556
 msgid "only follow first parent"
 msgstr "ne suivre que le premier parent"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:559
 msgid "only output exact matches"
 msgstr "n'afficher que les correspondances exactes"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:561
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 "considรฉrer uniquement les <n> รฉtiquettes le plus rรฉcentes (dรฉfaut : 10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:563
 msgid "only consider tags matching <pattern>"
 msgstr "ne considรฉrer que les รฉtiquettes correspondant ร  <motif>"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:565
 msgid "do not consider tags matching <pattern>"
 msgstr "ne pas considรฉrer les รฉtiquettes correspondant ร  <motif>"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:567 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "afficher les objets commits abrรฉgรฉs en dernier recours"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:568 builtin/describe.c:571
 msgid "mark"
 msgstr "marque"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:569
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "ajouter <marque> si la copie de travail est sale (dรฉfaut : \"-dirty\")"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:572
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "ajouter <marque> si la copie de travail est cassรฉe (dรฉfaut : \"-broken\")"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:590
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long et --abbrev=0 sont incompatibles"
 
-#: builtin/describe.c:603
+#: builtin/describe.c:619
 msgid "No names found, cannot describe anything."
 msgstr "aucun nom trouvรฉ, impossible de dรฉcrire quoi que ce soit."
 
-#: builtin/describe.c:654
+#: builtin/describe.c:670
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty est incompatible avec la spรฉcification de commits ou assimilรฉs"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:672
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken est incompatible avec les commits ou assimilรฉs"
 
@@ -12694,27 +13691,27 @@ msgstr "objet non gรฉrรฉ '%s' spรฉcifiรฉ."
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "รฉchec : %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "impossible de lire le fichier symlink %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "Impossible de lire l'objet %s pour le symlink %s"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -12722,53 +13719,53 @@ msgstr ""
 "les formats de diff combinรฉs ('-c' et '--cc') ne sont pas supportรฉs\n"
 "dans le mode de diff de rรฉpertoire ('-d' et '--dir-diff')."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "les deux fichiers sont modifiรฉsย : '%s' et '%s'."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr "le fichier dans l'arbre de travail a รฉtรฉ laissรฉ."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "des fichiers temporaires existent dans '%s'."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr "vous pourriez souhaiter les nettoyer ou les rรฉcupรฉrer."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr "rรฉalise un diff de rรฉpertoire complet"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr "ne pas confirmer avant de lancer l'outil de diff"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "utiliser les liens symboliques en mode de diff de rรฉpertoire"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr "outil"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "utiliser l'outil de diff spรฉcifiรฉ"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12776,31 +13773,31 @@ msgstr ""
 "provoque la fin de 'git-difftool' si l'outil de diff invoquรฉ renvoie un code "
 "non-nul"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "spรฉcifier une commande personnalisรฉe pour visualiser les diffรฉrences"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr "passรฉ ร  `diff`"
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool exige un arbre de travail ou --no-index"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff est incompatible avec --no-index"
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "pas d'<outil> spรฉcifiรฉ pour --tool=<outil>"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "pas de <commande> spรฉcifiรฉ pour --extcmd=<commande>"
 
@@ -12841,164 +13838,191 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [options-de-liste-de-rรฉvisions]"
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+"Erreurย : impossible d'exporter des รฉtiquettes imbriquรฉes ร  moins que --mark-"
+"tags ne soit spรฉcifiรฉ."
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr "afficher la progression aprรจs <n> objets"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr "sรฉlectionner la gestion des รฉtiquettes signรฉes"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 "sรฉlectionner la gestion des รฉtiquettes qui pointent sur des objets filtrรฉs"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "sรฉlectionner la gestion des messages de validation dans un encodage "
 "alternatif"
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
 msgstr "Enregistrer les marques dans ce fichier"
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
 msgstr "importer les marques depuis ce fichier"
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "importer les marques depuis ce fichier s'il existe"
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr "falsifier un auteur d'รฉtiquette si l'รฉtiquette n'en prรฉsente pas"
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr "Afficher l'arbre complet pour chaque commit"
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr "Utiliser la fonction \"done\" pour terminer le flux"
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr "Sauter l'affichage de donnรฉes de blob"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr "spรฉcificateur de rรฉfรฉrence"
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr "Appliquer le spรฉcificateur de rรฉfรฉrence aux rรฉfรฉrences exportรฉes"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr "anonymise la sortie"
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 "les parents rรฉfรฉrences qui ne sont pas dans le flux d'export rapide par id "
 "d'objet"
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
 msgstr "Afficher les ids d'objet originaux des blobs/commits"
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "Marquer les รฉtiquettes avec des ids de marque"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr ""
+"Impossible d'utiliser ร  la fois --import-marks et --import-marks-if-exists"
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<options>] [<dรฉpรดt> [<spรฉcification-de-rรฉfรฉrence>...]]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<options>] <groupe>"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<options>] [(<dรฉpรดt> | <groupe>)...]"
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<options>]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel ne peut pas รชtre nรฉgatif"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
 msgid "fetch from all remotes"
 msgstr "rรฉcupรฉrer depuis tous les dรฉpรดts distants"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "dรฉfinir la branche amont pour git pull/fetch"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "ajouter ร  .git/FETCH_HEAD au lieu de l'รฉcraser"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:190
 msgid "path to upload pack on remote end"
 msgstr "chemin vers lequel tรฉlรฉcharger le paquet sur le poste distant"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr "forcer l'รฉcrasement de la branche locale"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr "rรฉcupรฉrer depuis plusieurs dรฉpรดts distants"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:194
 msgid "fetch all tags and associated objects"
 msgstr "rรฉcupรฉrer toutes les รฉtiquettes et leurs objets associรฉs"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr "ne pas rรฉcupรฉrer toutes les รฉtiquettes (--no-tags)"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de sous-modules rรฉcupรฉrรฉs en parallรจle"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:197
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "รฉliminer les branches de suivi distant si la branche n'existe plus dans le "
 "dรฉpรดt distant"
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "รฉliminer les รฉtiquettes locales qui ont disparu du dรฉpรดt distant et qui "
 "encombrent les รฉtiquettes modifiรฉes"
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
 msgid "on-demand"
 msgstr "ร  la demande"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr "contrรดler la rรฉcupรฉration rรฉcursive dans les sous-modules"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:205
 msgid "keep downloaded pack"
 msgstr "conserver le paquet tรฉlรฉchargรฉ"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr "permettre la mise ร  jour de la rรฉfรฉrence HEAD"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
 msgid "deepen history of shallow clone"
 msgstr "approfondir l'historique d'un clone superficiel"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:211
 msgid "convert to a complete repository"
 msgstr "convertir en un dรฉpรดt complet"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr "prรฉfixer ceci ร  la sortie du chemin du sous-module"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -13006,91 +14030,95 @@ msgstr ""
 "par dรฉfaut pour la rรฉcupรฉration rรฉcursive de sous-modules (prioritรฉ plus "
 "basse que les fichiers de config)"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:214
 msgid "accept refs that update .git/shallow"
 msgstr "accepter les rรฉfรฉrences qui mettent ร  jour .git/shallow"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:216
 msgid "refmap"
 msgstr "correspondance de rรฉfรฉrence"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:217
 msgid "specify fetch refmap"
 msgstr "spรฉcifier une correspondance de rรฉfรฉrence pour la rรฉcupรฉration"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet"
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 msgid "run 'gc --auto' after fetching"
 msgstr "lancer 'gc --auto' aprรจs la rรฉcupรฉration"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:226
 msgid "check for forced-updates on all updated branches"
 msgstr "vรฉrifier les mises ร  jour forcรฉes sur toutes les branches mises ร  jour"
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "รฉcrire le graphe de commits aprรจs le rapatriement"
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr "impossible de trouver la rรฉfรฉrence HEAD distante"
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 "le paramรจtre de configuration fetch.output contient une valeur invalide %s"
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr "objet %s non trouvรฉ"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr "[ร  jour]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr "[rejetรฉ]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr "impossible de rรฉcupรฉrer dans la branche actuelle"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr "[mise ร  jour de l'รฉtiquette]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr "impossible de mettre ร  jour la rรฉfรฉrence locale"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr "รฉcraserait l'รฉtiquette existante"
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr "[nouvelle รฉtiquette]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr "[nouvelle branche]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr "[nouvelle rรฉfรฉrence]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr "mise ร  jour forcรฉe"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr "pas en avance rapide"
 
-#: builtin/fetch.c:854
+#: builtin/fetch.c:877
 msgid ""
 "Fetch normally indicates which branches had a forced update,\n"
 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -13100,7 +14128,7 @@ msgstr ""
 "mais ceci a รฉtรฉ dรฉsactivรฉ. Pour rรฉ-activer, utilisez le drapeau\n"
 "'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'."
 
-#: builtin/fetch.c:858
+#: builtin/fetch.c:881
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -13112,23 +14140,23 @@ msgstr ""
 "Vous pouvez utiliser '--no-show-forced-update' ou lancer\n"
 "'git config fetch.showForcedUpdates false' pour รฉviter ceci.\n"
 
-#: builtin/fetch.c:888
+#: builtin/fetch.c:920
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s n'a pas envoyรฉ tous les objets nรฉcessaires\n"
 
-#: builtin/fetch.c:909
+#: builtin/fetch.c:941
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 "%s rejetรฉ parce que les racines superficielles ne sont pas mises ร  jour"
 
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
 #, c-format
 msgid "From %.*s\n"
 msgstr "Depuis %.*s\n"
 
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1037
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -13137,58 +14165,79 @@ msgstr ""
 "des rรฉfรฉrences locales n'ont pas pu รชtre mises ร  jour ; essayez de lancer\n"
 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"
 
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1134
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sera en suspens)"
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1135
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s est devenu en suspens)"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1167
 msgid "[deleted]"
 msgstr "[supprimรฉ]"
 
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1168 builtin/remote.c:1112
 msgid "(none)"
 msgstr "(aucun(e))"
 
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1191
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Refus de rรฉcupรฉrer dans la branche courant %s d'un dรฉpรดt non nu"
 
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1210
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
 
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1213
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "L'option \"%s\" est ignorรฉe pour %s\n"
 
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "branches multiples dรฉtectรฉes, imcompatible avec --set-upstream"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "dรฉpรดt amont non dรฉfini pour la branche de suivi ร  distance"
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "dรฉpรดt amont non dรฉfini pour l'รฉtiquette distante"
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "type de branche inconnu"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"Aucune branche source trouvรฉe.\n"
+"Vous devez spรฉcifier exactement une branche avec l'option --set-upstream."
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Rรฉcupรฉration de %s\n"
 
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Impossible de rรฉcupรฉrer %s"
 
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr ""
-"--filter ne peut รชtre utilisรฉ qu'avec le dรฉpรดt distant configurรฉ dans "
-"extensions.partialClone"
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "impossible de rรฉcupรฉrer '%s' (code de sortieย : %d)\n"
 
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1693
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -13196,46 +14245,46 @@ msgstr ""
 "Aucun dรฉpรดt distant spรฉcifiรฉ. Veuillez spรฉcifier une URL ou un nom\n"
 "distant depuis lesquels les nouvelles rรฉvisions devraient รชtre rรฉcupรฉrรฉes."
 
-#: builtin/fetch.c:1593
+#: builtin/fetch.c:1730
 msgid "You need to specify a tag name."
 msgstr "Vous devez spรฉcifier un nom d'รฉtiquette."
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1780
 msgid "Negative depth in --deepen is not supported"
 msgstr "Une profondeur nรฉgative dans --deepen n'est pas supportรฉe"
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1782
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen et --depth sont mutuellement exclusifs"
 
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1787
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth et --unshallow ne peuvent pas รชtre utilisรฉs ensemble"
 
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1789
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow sur un dรฉpรดt complet n'a pas de sens"
 
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1805
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all n'accepte pas d'argument de dรฉpรดt"
 
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1807
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all n'a pas de sens avec des spรฉcifications de rรฉfรฉrence"
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1816
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "distant ou groupe distant inexistant : %s"
 
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1823
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "La rรฉcupรฉration d'un groupe et les spรฉcifications de rรฉfรฉrence n'ont pas de "
 "sens"
 
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1841
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -13249,23 +14298,23 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:671
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "peupler le journal avec au plus <n> รฉlรฉments depuis le journal court"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:674
 msgid "alias for --log (deprecated)"
 msgstr "alias pour --log (obsolรจte)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:677
 msgid "text"
 msgstr "texte"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:678
 msgid "use <text> as start of message"
 msgstr "utiliser <texte> comme dรฉbut de message"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:679
 msgid "file to read from"
 msgstr "fichier d'oรน lire"
 
@@ -13329,32 +14378,32 @@ msgstr "afficher seulement les rรฉfรฉrences qui contiennent le commit"
 msgid "print only refs which don't contain the commit"
 msgstr "afficher seulement les rรฉfรฉrences qui ne contiennent pas le commit"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr "inconnu"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "erreur dans l'objet %s %sย : %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "avertissement dans l'objet %s %sย : %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "lien cassรฉ dans l'objet %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr "type d'objet inconnu dans le lien"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13363,217 +14412,217 @@ msgstr ""
 "lien cassรฉ depuis %7s %s\n"
 "             vers %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr "objet %s manquant %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr "objet %s inatteignable %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, c-format
 msgid "dangling %s %s"
 msgstr "objet %s fantรดme %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 msgid "could not create lost-found"
 msgstr "impossible de crรฉer le fichier lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr "impossible de finir '%s'"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr "Vรฉrification de l'objet %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Vรฉrification de la connectivitรฉ (%d objets)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr "Vรฉrification de l'objet %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr "liens cassรฉs"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr "racine %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "รฉtiquetage de l'objet %s %s (%s) dans %s"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%sย : objet corrompu ou manquant"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%sย : entrรฉe %s de journal de rรฉfรฉrences invalide"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Vรฉrification du journal de rรฉferences %s-> %s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%sย : pointeur de sha1 invalide %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr "l'objet %s n'est pas un commit"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr "Noteย : pas de rรฉfรฉrence par dรฉfaut"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%sย : objet corrompu ou manquantย : %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%sย : impossible d'analyserย : %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "mauvais fichier de sha1ย : %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr "Vรฉrification du rรฉpertoire d'objet"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr "Vรฉrification des rรฉpertoires d'objet"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr "Vรฉrification du lien %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr "%s invalide"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pointe sur quelque chose bizarre (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%sย : la HEAD dรฉtachรฉe ne pointe sur rien"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "noteย : %s pointe sur une branche non-nรฉe (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr "Vรฉrification de l'arbre cache"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%sย : pointer sha1 invalide dans l'arbre de cache"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr "non-arbre dans l'arbre de cache"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<options>] [<objet>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr "afficher les objets inaccessibles"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr "afficher les objets en suspens"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr "afficher les รฉtiquettes"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr "signaler les nล“uds racines"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr "considรฉrer les objets de l'index comme nล“uds tรชte"
 
 # translated from man page
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr "considรฉrer les reflogs comme nล“uds tรชte (par dรฉfaut)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
 msgstr "inspecter aussi les objets pack et alternatifs"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr "ne vรฉrifier que la connectivitรฉ"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr "activer une vรฉrification plus strict"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr "รฉcrire les objets en suspens dans .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr "afficher la progression"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr "afficher les noms รฉtendus pour les objets inaccessibles"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "Vรฉrification des objets"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, c-format
 msgid "%s: object missing"
 msgstr "%sย : objet manquant"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "paramรจtre invalideย : sha-1 attendu, '%s' trouvรฉ"
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr "git gc [<options>]"
 
@@ -13587,17 +14636,17 @@ msgstr "ร‰chec du stat de %sย : %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "รฉchec de l'analyse de '%s' valeur '%s'"
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "impossible de faire un stat de '%s'"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13613,56 +14662,56 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr "รฉliminer les objets non rรฉfรฉrencรฉs"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr "รชtre plus consciencieux (durรฉe de traitement allongรฉe)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr "activer le mode auto-gc"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "forcer le lancement du ramasse-miettes mรชme si un autre ramasse-miettes "
 "tourne dรฉjร "
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr "recompacter tous les autres paquets exceptรฉ le plus gros paquet"
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "impossible d'analyser gc.logexpiry %s"
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "impossible d'analyser la valeur d'expiration d'รฉlagage %s"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Compression automatique du dรฉpรดt en tรขche de fond pour optimiser les "
 "performances.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Compression du dรฉpรดt pour optimiser les performances.\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13670,14 +14719,14 @@ msgstr ""
 "un ramasse-miettes est dรฉjร  en cours sur la machine '%s' pid %<PRIuMAX> "
 "(utilisez --force si ce n'est pas le cas)"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
 "supprimer."
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<options>] [-e] <motif> [<rรฉvision>...] [[--] <chemin>...]"
 
@@ -13695,266 +14744,266 @@ msgstr "nombre de fils spรฉcifiรฉ invalide (%d) pour %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "pas de support des fils, ignore %s"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "impossible de lire l'arbre (%s)"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:633
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "impossible de faire un grep sur un objet de type %s"
 
-#: builtin/grep.c:714
+#: builtin/grep.c:704
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'option '%c' attend une valeur numรฉrique"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:803
 msgid "search in index instead of in the work tree"
 msgstr "rechercher dans l'index plutรดt que dans la copie de travail"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:805
 msgid "find in contents not managed by git"
 msgstr "rechercher dans les contenus non gรฉrรฉs par git"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:807
 msgid "search in both tracked and untracked files"
 msgstr "rechercher dans les fichiers suivis et non-suivis"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:809
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorer les fichiers spรฉcifiรฉs via '.gitignore'"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:811
 msgid "recursively search in each submodule"
 msgstr "rechercher rรฉcursivement dans chaque sous-module"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:814
 msgid "show non-matching lines"
 msgstr "afficher les lignes qui ne correspondent pas"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:816
 msgid "case insensitive matching"
 msgstr "correspondance insensible ร  la casse"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:818
 msgid "match patterns only at word boundaries"
 msgstr "rechercher les motifs aux sรฉparateurs de mots"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:820
 msgid "process binary files as text"
 msgstr "traiter les fichiers binaires comme texte"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:822
 msgid "don't match patterns in binary files"
 msgstr "ne pas chercher les motifs dans les fichiers binaires"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:825
 msgid "process binary files with textconv filters"
 msgstr "traiter les fichiers binaires avec les filtres textconv"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:827
 msgid "search in subdirectories (default)"
 msgstr "rechercher dans les sous-rรฉpertoires (dรฉfaut)"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:829
 msgid "descend at most <depth> levels"
 msgstr "descendre au plus de <profondeur> dans l'arborescence"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:833
 msgid "use extended POSIX regular expressions"
 msgstr "utiliser des expressions rรฉguliรจres รฉtendues POSIX"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:836
 msgid "use basic POSIX regular expressions (default)"
 msgstr "utiliser des expressions rรฉguliรจres basiques POSIX (par dรฉfaut)"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:839
 msgid "interpret patterns as fixed strings"
 msgstr "interprรฉter les motifs comme de chaรฎnes fixes"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:842
 msgid "use Perl-compatible regular expressions"
 msgstr "utiliser des expressions rรฉguliรจres compatibles avec Perl"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:845
 msgid "show line numbers"
 msgstr "afficher les numรฉros de ligne"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:846
 msgid "show column number of first match"
 msgstr "afficher le numรฉro de colonne de la premiรจre correspondance"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:847
 msgid "don't show filenames"
 msgstr "ne pas pas afficher les noms de fichier"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:848
 msgid "show filenames"
 msgstr "afficher les noms de fichier"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:850
 msgid "show filenames relative to top directory"
 msgstr "afficher les noms de fichiers relativement au rรฉpertoire de base"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:852
 msgid "show only filenames instead of matching lines"
 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:854
 msgid "synonym for --files-with-matches"
 msgstr "synonyme pour --files-with-matches"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:857
 msgid "show only the names of files without match"
 msgstr "n'afficher que les noms des fichiers sans correspondance"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:859
 msgid "print NUL after filenames"
 msgstr "imprimer une caractรจre NUL aprรจs le noms de fichier"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:862
 msgid "show only matching parts of a line"
 msgstr "n'afficher que les parties correspondantes d'une ligne"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:864
 msgid "show the number of matches instead of matching lines"
 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:865
 msgid "highlight matches"
 msgstr "mettre en รฉvidence les correspondances"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:867
 msgid "print empty line between matches from different files"
 msgstr ""
 "imprimer une ligne vide entre les correspondances de fichiers diffรฉrents"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:869
 msgid "show filename only once above matches from same file"
 msgstr ""
 "afficher le nom de fichier une fois au dessus des correspondances du mรชme "
 "fichier"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:872
 msgid "show <n> context lines before and after matches"
 msgstr "afficher <n> lignes de contexte avant et aprรจs les correspondances"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:875
 msgid "show <n> context lines before matches"
 msgstr "afficher <n> lignes de contexte avant les correspondances"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:877
 msgid "show <n> context lines after matches"
 msgstr "afficher <n> lignes de contexte aprรจs les correspondances"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:879
 msgid "use <n> worker threads"
 msgstr "utiliser <n> fils de travail"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:880
 msgid "shortcut for -C NUM"
 msgstr "raccourci pour -C NUM"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:883
 msgid "show a line with the function name before matches"
 msgstr ""
 "afficher une ligne avec le nom de la fonction avant les correspondances"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:885
 msgid "show the surrounding function"
 msgstr "afficher la fonction contenante"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:888
 msgid "read patterns from file"
 msgstr "lire les motifs depuis fichier"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:890
 msgid "match <pattern>"
 msgstr "rechercher <motif>"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:892
 msgid "combine patterns specified with -e"
 msgstr "combiner les motifs spรฉcifiรฉs par -e"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:904
 msgid "indicate hit with exit status without output"
 msgstr ""
 "indiquer des correspondances avec le code de sortie mais sans rien afficher"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:906
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "n'afficher que les correspondances de fichiers qui correspondent ร  tous les "
 "motifs"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:908
 msgid "show parse tree for grep expression"
 msgstr "afficher l'arbre d'analyse pour le motif grep"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "pager"
 msgstr "pagineur"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "show matching files in the pager"
 msgstr "afficher les fichiers correspondant dans le pagineur"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:916
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permettre l'appel de grep(1) (ignorรฉ par ce build)"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:983
 msgid "no pattern given"
 msgstr "aucun motif fourni"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1019
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 "--no-index ou --untracked ne peuvent pas รชtre utilisรฉs avec des rรฉvisions"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1027
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "impossible de rรฉsoudre la rรฉvisionย : %s"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked non supportรฉe avec --recurse-submodules"
+
+#: builtin/grep.c:1061
 msgid "invalid option combination, ignoring --threads"
 msgstr "option de combinaison invalide, ignore --threads"
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
 msgid "no threads support, ignoring --threads"
 msgstr "pas de support des fils, ignore --threads"
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "nombre de fils spรฉcifiรฉ invalide (%d)"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1101
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
 
-#: builtin/grep.c:1117
-msgid "option not supported with --recurse-submodules"
-msgstr "option non supportรฉe avec --recurse-submodules"
-
-#: builtin/grep.c:1123
+#: builtin/grep.c:1127
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached ou --untracked ne peuvent pas รชtre utilisรฉs avec --no-index"
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1133
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard ne peut pas รชtre utilisรฉ avec du contenu suivi"
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1141
 msgid "both --cached and trees are given"
 msgstr "--cached et des arbres sont fournis en mรชme temps"
 
@@ -14140,11 +15189,11 @@ msgstr "erreur de lecture sur l'entrรฉe"
 msgid "used more bytes than were available"
 msgstr "plus d'octets utilisรฉs que disponibles"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
 msgid "pack too large for current definition of off_t"
 msgstr "le paquet est trop grand pour la dรฉfinition actuelle de off_t"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "le paquet dรฉpasse la taille maximale permise"
 
@@ -14200,192 +15249,192 @@ msgstr[1] "fin prรฉmaturรฉe du fichier paquet, %<PRIuMAX> octets lus"
 msgid "serious inflate inconsistency"
 msgstr "grave incohรฉrence dans la dรฉcompression (inflate)"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLLISION SHA1 TROUVร‰E AVEC %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
 #, c-format
 msgid "unable to read %s"
 msgstr "impossible de lire %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "impossible de lire l'information existante de l'objet %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "impossible de lire l'objet existant %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objet blob invalide %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
 msgid "fsck error in packed object"
 msgstr "erreur de fsck dans l'objet empaquetรฉ"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Tous les objets enfants de %s ne sont pas accessibles"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr "รฉchec d'application du delta"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr "Rรฉception d'objets"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr "Indexation d'objets"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr "le paquet est invalide ร  la fin"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusion extrรชme dans parse_pack_objects()"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr "Rรฉsolution des deltas"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "impossible de crรฉer le fil : %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr "confusion extrรชme"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "complรฉtรฉ avec %d objet local"
 msgstr[1] "complรฉtรฉ avec %d objets locaux"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "Somme de contrรดle de fin inattendue pour %s (corruption sur le disque ?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "le paquet a %d delta non rรฉsolu"
 msgstr[1] "le paquet a %d deltas non rรฉsolus"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "impossible de compresser l'objet ajoutรฉ (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objet local %s est corrompu"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "impossible d'รฉcrire le fichier %s '%s'"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "impossible de fermer le fichier %s รฉcrit '%s'"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
 msgid "error while closing pack file"
 msgstr "erreur en fermeture du fichier paquet"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
 msgid "cannot store pack file"
 msgstr "impossible de stocker le fichier paquet"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
 msgid "cannot store index file"
 msgstr "impossible de stocker le fichier d'index"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mauvais pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "pas un delta : %d objet"
 msgstr[1] "pas un delta : %d objets"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "longueur chaรฎnรฉe = %d : %lu objet"
 msgstr[1] "longueur chaรฎnรฉe = %d : %lu objets"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
 msgid "Cannot come back to cwd"
 msgstr "Impossible de revenir au rรฉpertoire de travail courant"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
 #, c-format
 msgid "bad %s"
 msgstr "mauvais %s"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin ne peut pas รชtre utilisรฉ sans --stdin"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiert un dรฉpรดt git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
 msgid "--verify with no packfile name given"
 msgstr "--verify sans nom de fichier paquet donnรฉ"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "erreur de fsck dans les objets paquets"
 
@@ -14568,123 +15617,128 @@ msgstr "--trailer n'a aucune signification avec --only-input"
 msgid "no input file given for in-place editing"
 msgstr "aucun fichier en entrรฉe pour l'รฉditon sur place"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<options>] [<plage de rรฉvisions>] [[--] <chemin>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<options>] <objet>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "option --decorate invalide : %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:174
 msgid "show source"
 msgstr "afficher la source"
 
-#: builtin/log.c:174
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr "Utiliser le fichier de correspondance de mail"
 
-#: builtin/log.c:176
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr "dรฉcorer seulement les rรฉfรฉrences correspondant ร  <motif>"
 
-#: builtin/log.c:178
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr "ne pas dรฉcorer les rรฉfรฉrences correspondant ร  <motif>"
 
-#: builtin/log.c:179
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr "dรฉcorer les options"
 
-#: builtin/log.c:182
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 "Traiter seulement l'intervalle de lignes n,m du fichier en commenรงant le "
 "compte ร  1"
 
-#: builtin/log.c:280
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortie finale : %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s : fichier incorrect"
 
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:550 builtin/log.c:645
 #, c-format
 msgid "could not read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: builtin/log.c:668
+#: builtin/log.c:670
 #, c-format
 msgid "unknown type: %d"
 msgstr "type inconnu : %d"
 
-#: builtin/log.c:791
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%sย : couverture invalide pour le mode de description"
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr "format.headers sans valeur"
 
-#: builtin/log.c:908
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr "le nom du rรฉpertoire de sortie est trop long"
 
-#: builtin/log.c:924
+#: builtin/log.c:952
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "impossible d'ouvrir le fichier correctif %s"
 
-#: builtin/log.c:941
+#: builtin/log.c:969
 msgid "need exactly one range"
 msgstr "exactement une plage nรฉcessaire"
 
-#: builtin/log.c:951
+#: builtin/log.c:979
 msgid "not a range"
 msgstr "ceci n'est pas une plage"
 
-#: builtin/log.c:1074
+#: builtin/log.c:1143
 msgid "cover letter needs email format"
 msgstr "la lettre de motivation doit รชtre au format courriel"
 
-#: builtin/log.c:1080
+#: builtin/log.c:1149
 msgid "failed to create cover-letter file"
 msgstr "รฉchec de crรฉation du fichier de lettre de motivation"
 
-#: builtin/log.c:1159
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to aberrant : %s"
 
-#: builtin/log.c:1186
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<options>] [<depuis> | <plage de rรฉvisions>]"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1313
 msgid "two output directories?"
 msgstr "deux rรฉpertoires de sortieย ?"
 
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, c-format
 msgid "unknown commit %s"
 msgstr "commit inconnu %s"
 
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "รฉchec ร  rรฉsoudre '%s' comme une rรฉfรฉrence valide"
 
-#: builtin/log.c:1370
+#: builtin/log.c:1439
 msgid "could not find exact merge base"
 msgstr "impossible de trouver la base de fusion exacte"
 
-#: builtin/log.c:1374
+#: builtin/log.c:1443
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -14697,275 +15751,285 @@ msgstr ""
 "Ou vous pouvez spรฉcifier le commit de base par --base=<id-du-commit-de-base> "
 "manuellement"
 
-#: builtin/log.c:1394
+#: builtin/log.c:1463
 msgid "failed to find exact merge base"
 msgstr "รฉchec ร  trouver la base de fusion exacte"
 
-#: builtin/log.c:1405
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr "le commit de base devrait รชtre l'ancรชtre de la liste de rรฉvisions"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr "le commit de base ne devrait pas faire partie de la liste de rรฉvisions"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr "impossible d'obtenir l'id du patch"
 
-#: builtin/log.c:1514
+#: builtin/log.c:1583
 msgid "failed to infer range-diff ranges"
 msgstr "รฉchec d'infรฉrence d'intervalles de diffรฉrence d'intervalles"
 
-#: builtin/log.c:1559
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "utiliser [PATCH n/m] mรชme avec un patch unique"
 
-#: builtin/log.c:1562
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr "utiliser [PATCH] mรชme avec des patchs multiples"
 
-#: builtin/log.c:1566
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr "afficher les patchs sur la sortie standard"
 
-#: builtin/log.c:1568
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr "gรฉnรฉrer une lettre de motivation"
 
-#: builtin/log.c:1570
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr ""
 "utiliser une sรฉquence simple de nombres pour les nom des fichiers de sortie"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr "utiliser <sfx> au lieu de '.patch'"
 
-#: builtin/log.c:1574
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr "dรฉmarrer la numรฉrotation des patchs ร  <n> au lieu de 1"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr "marquer la sรฉrie comme une Niรจme rรฉรฉdition"
 
-#: builtin/log.c:1578
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
 
-#: builtin/log.c:1581
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "cover-from-description-mode"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"gรฉnรฉrer des parties de la lettre d'introduction ร  partir de la description "
+"de la branche"
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "utiliser [<prรฉfixe>] au lieu de [PATCH]"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr "stocker les fichiers rรฉsultats dans <rรฉpertoire>"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr "ne pas retirer/ajouter [PATCH]"
 
-#: builtin/log.c:1590
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr "ne pas imprimer les diffs binaires"
 
-#: builtin/log.c:1592
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr "รฉcrire une empreinte ร  zรฉro dans l'entรชte From"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr "ne pas inclure un patch correspondant ร  un commit amont"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr "afficher le format du patch au lieu du dรฉfaut (patch + stat)"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr "Communication"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1672
 msgid "header"
 msgstr "en-tรชte"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr "ajouter l'en-tรชte de courriel"
 
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr "courriel"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr "ajouter l'en-tรชte \"To:\""
 
-#: builtin/log.c:1603
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr "ajouter l'en-tรชte \"Cc:\""
 
-#: builtin/log.c:1605
+#: builtin/log.c:1678
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "renseigner l'adresse From ร  <ident> (ou ร  l'ident du validateur si absent)"
 
-#: builtin/log.c:1608
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr "id-message"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr "rรฉpondre dans le premier message ร  <id-message>"
 
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr "attacher le patch"
 
-#: builtin/log.c:1614
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr "patch ร  l'intรฉrieur"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1693
 msgid "signature"
 msgstr "signature"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr "ajouter une signature"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr "commit-de-base"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr "Ajouter un arbre prรฉrequis ร  la sรฉrie de patchs"
 
-#: builtin/log.c:1625
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr "ajouter une signature depuis un fichier"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr "ne pas afficher les noms de fichiers des patchs"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr ""
 "afficher la barre de progression durant la phase de gรฉnรฉration des patchs"
 
-#: builtin/log.c:1630
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "afficher les modifications par rapport ร  <rรฉv> dans la premiรจre page ou une "
 "rustine"
 
-#: builtin/log.c:1633
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "afficher les modifications par rapport ร  <refspec> dans la premiรจre page ou "
 "une rustine"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr "pourcentage par lequel la crรฉation est pondรฉrรฉe"
 
-#: builtin/log.c:1710
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ligne d'identification invalide : %s"
 
-#: builtin/log.c:1725
+#: builtin/log.c:1807
 msgid "-n and -k are mutually exclusive"
 msgstr "-n et -k sont mutuellement exclusifs"
 
-#: builtin/log.c:1727
+#: builtin/log.c:1809
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
 
-#: builtin/log.c:1735
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr "--name-only n'a pas de sens"
 
-#: builtin/log.c:1737
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr "--name-status n'a pas de sens"
 
-#: builtin/log.c:1739
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr "--check n'a pas de sens"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
 msgstr "sortie standard, ou rรฉpertoire, lequel ?"
 
-#: builtin/log.c:1860
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiert --cover-letter ou une rustine unique"
 
-#: builtin/log.c:1864
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr "Interdiffย :"
 
-#: builtin/log.c:1865
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contre v%dย :"
 
-#: builtin/log.c:1871
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor requiert --range-diff"
 
-#: builtin/log.c:1875
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requiert --cover-letter ou une rustine unique"
 
-#: builtin/log.c:1883
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr "Diff-intervalleย :"
 
-#: builtin/log.c:1884
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Diff-intervalle contre v%dย :"
 
-#: builtin/log.c:1895
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "lecture du fichier de signature '%s' impossible"
 
-#: builtin/log.c:1931
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr "Gรฉnรฉration des patchs"
 
-#: builtin/log.c:1975
+#: builtin/log.c:2073
 msgid "failed to create output files"
 msgstr "รฉchec de crรฉation des fichiers en sortie"
 
-#: builtin/log.c:2034
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
 
-#: builtin/log.c:2088
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15094,7 +16158,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "ne pas afficher les URL distantes"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
 msgid "exec"
 msgstr "exรฉcutable"
 
@@ -15183,151 +16247,151 @@ msgstr "git merge --abort"
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:119
 msgid "switch `m' requires a value"
 msgstr "le commutateur `m' a besoin d'une valeur"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "le commutateur '%s' a besoin d'une valeur"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:188
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Impossible de trouver la stratรฉgie de fusion '%s'.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:189
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les stratรฉgies disponibles sont :"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:194
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les stratรฉgies personnalisรฉes sont :"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:245 builtin/pull.c:132
 msgid "do not show a diffstat at the end of the merge"
 msgstr "ne pas afficher un diffstat ร  la fin de la fusion"
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:248 builtin/pull.c:135
 msgid "show a diffstat at the end of the merge"
 msgstr "afficher un diffstat ร  la fin de la fusion"
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:249 builtin/pull.c:138
 msgid "(synonym to --stat)"
 msgstr "(synonyme de --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:251 builtin/pull.c:141
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "ajouter (au plus <n>) รฉlรฉments du journal court au message de validation de "
 "la fusion"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:254 builtin/pull.c:147
 msgid "create a single commit instead of doing a merge"
 msgstr "crรฉer une validation unique au lieu de faire une fusion"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:256 builtin/pull.c:150
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "effectuer une validation si la fusion rรฉussit (dรฉfaut)"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:258 builtin/pull.c:153
 msgid "edit message before committing"
 msgstr "รฉditer le message avant la validation"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:260
 msgid "allow fast-forward (default)"
 msgstr "autoriser l'avance rapide (dรฉfaut)"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:262 builtin/pull.c:160
 msgid "abort if fast-forward is not possible"
 msgstr "abandonner si l'avance rapide n'est pas possible"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:266 builtin/pull.c:163
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "vรฉrifier que le commit nommรฉ a une signature GPG valide"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
 msgid "strategy"
 msgstr "stratรฉgie"
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:268 builtin/pull.c:168
 msgid "merge strategy to use"
 msgstr "stratรฉgie de fusion ร  utiliser"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:171
 msgid "option=value"
 msgstr "option=valeur"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option for selected merge strategy"
 msgstr "option pour la stratรฉgie de fusion sรฉlectionnรฉe"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "message de validation de la fusion (pour une fusion sans avance rapide)"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr "abandonner la fusion en cours"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort mais laisser l'index et l'arbre de travail inchangรฉs"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr "continuer la fusion en cours"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:285 builtin/pull.c:179
 msgid "allow merging unrelated histories"
 msgstr "permettre la fusion d'historiques sans rapport"
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "vรฉrifier le crochet commit-msg"
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:308
 msgid "could not run stash."
 msgstr "impossible de lancer le remisage."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:313
 msgid "stash failed"
 msgstr "รฉchec du remisage"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:318
 #, c-format
 msgid "not a valid object: %s"
 msgstr "pas un objet valide : %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
 msgid "read-tree failed"
 msgstr "read-tree a รฉchouรฉ"
 
-#: builtin/merge.c:386
+#: builtin/merge.c:387
 msgid " (nothing to squash)"
 msgstr " (rien ร  compresser)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:398
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Validation compressรฉe -- HEAD non mise ร  jour\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:448
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Pas de message de fusion -- pas de mise ร  jour de HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:499
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' ne pointe pas sur un commit"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:586
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mauvaise chaรฎne branch.%s.mergeoptions : %s"
@@ -15383,74 +16447,74 @@ msgstr ""
 "Les lignes commenรงant par '%c' seront ignorรฉes, et un message vide\n"
 "abandonne la validation.\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:865
 msgid "Empty commit message."
 msgstr "Message de validation vide."
 
-#: builtin/merge.c:872
+#: builtin/merge.c:880
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Merveilleux.\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:941
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "La fusion automatique a รฉchouรฉ ; rรฉglez les conflits et validez le "
 "rรฉsultat.\n"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:980
 msgid "No current branch."
 msgstr "Pas de branche courante."
 
-#: builtin/merge.c:974
+#: builtin/merge.c:982
 msgid "No remote for the current branch."
 msgstr "Pas de branche distante pour la branche courante."
 
-#: builtin/merge.c:976
+#: builtin/merge.c:984
 msgid "No default upstream defined for the current branch."
 msgstr "Pas de branche amont par dรฉfaut dรฉfinie pour la branche courante."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:989
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Pas de branche de suivi pour %s depuis %s"
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1046
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1149
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "pas possible de fusionner ceci dans %sย : %s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1183
 msgid "not something we can merge"
 msgstr "pas possible de fusionner ceci"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1286
 msgid "--abort expects no arguments"
 msgstr "--abort n'accepte pas d'argument"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1290
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Il n'y a pas de fusion ร  abandonner (MERGE_HEAD manquant)."
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1299
 msgid "--quit expects no arguments"
 msgstr "--quit n'accepte pas d'argument"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1312
 msgid "--continue expects no arguments"
 msgstr "--continue ne supporte aucun argument"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1316
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1332
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15458,7 +16522,7 @@ msgstr ""
 "Vous n'avez pas terminรฉ votre fusion (MERGE_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1339
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15466,98 +16530,98 @@ msgstr ""
 "Vous n'avez pas terminรฉ votre picorage (CHERRY_PICK_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1342
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Vous n'avez pas terminรฉ votre picorage (CHERRY_PICK_HEAD existe)."
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1356
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1358
 msgid "You cannot combine --squash with --commit."
 msgstr "Vous ne pouvez pas combiner --squash avec --commit."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1374
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "Pas de validation spรฉcifiรฉe et merge.defaultToUpstream n'est pas dรฉfini."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1391
 msgid "Squash commit into empty head not supported yet"
 msgstr "La validation compressรฉe vers une tรชte vide n'est pas encore supportรฉe"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1393
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Une validation sans avance rapide n'a pas de sens dans une tรชte vide"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1398
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - pas possible de fusionner ceci"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1400
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 "Possible de fusionner exactement une seule validation dans une tรชte vide"
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1481
 msgid "refusing to merge unrelated histories"
 msgstr "refus de fusionner des historiques sans relation"
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1490
 msgid "Already up to date."
 msgstr "Dรฉjร  ร  jour."
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1500
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Mise ร  jour %s..%s\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Essai de fusion vraiment triviale dans l'index...\n"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1549
 #, c-format
 msgid "Nope.\n"
 msgstr "Non.\n"
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1574
 msgid "Already up to date. Yeeah!"
 msgstr "Dรฉjร  ร  jour. Ouaisย !"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1580
 msgid "Not possible to fast-forward, aborting."
 msgstr "Pas possible d'avancer rapidement, abandon."
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1603 builtin/merge.c:1668
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Retour de l'arbre ร  l'original...\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1607
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Essai de la stratรฉgie de fusion %s...\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1659
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Aucune stratรฉgie de fusion n'a pris en charge la fusion.\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1661
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "La fusion avec la stratรฉgie %s a รฉchouรฉ.\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1670
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Utilisation de %s pour prรฉparer la rรฉsolution ร  la main.\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1682
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -15643,33 +16707,33 @@ msgstr "ne pas avertir ร  propos des conflits"
 msgid "set labels for file1/orig-file/file2"
 msgstr "dรฉfinir les labels pour fichier1/fichier-orig/fichier2"
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "option inconnue %s"
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "impossible de gรฉrer plus de %d base. %s ignorรฉ."
 msgstr[1] "impossible de gรฉrer plus de %d bases. %s ignorรฉ."
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "impossible de gรฉrer autre chose que la fusion de deux tรชtes."
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "impossible de rรฉsoudre la rรฉfรฉrence '%s'"
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Fusion de %s avec %s\n"
@@ -15692,19 +16756,19 @@ msgstr "autoriser la crรฉation de plus d'un arbre"
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<taille>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<taille>)"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "rรฉpertoire objet contenant un ensemble de paires de fichiers paquet et "
 "d'index de paquet"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15712,15 +16776,15 @@ msgstr ""
 "pendant le repaquetage, collecter les fichiers paquet de plus petite taille "
 "dans un lot plus grand que cette taille"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr "l'option --batch-size ne sert que pour la sous-commande 'repack'"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "sous-commande non reconnue : %s"
@@ -15814,53 +16878,53 @@ msgstr "%s, source=%s, destination=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "le renommage de '%s' a รฉchouรฉ"
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<options>] <validation>..."
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<options>] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<options>] --stdin"
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr "afficher seulement les noms (pas de SHA-1)"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "utiliser seulement les รฉtiquettes pour nommer les validations"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "utiliser seulement les rรฉfรฉrences correspondant ร  <motif>"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignorer les rรฉfรฉrences correspondant ร  <motif>"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr ""
 "afficher toutes les validations accessibles depuis toutes les rรฉfรฉrences"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "lire depuis l'entrรฉe standard"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "autoriser l'affichage des noms `non dรฉfinis` (par dรฉfaut)"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "dรฉrรฉfรฉrencer les รฉtiquettes en entrรฉe (usage interne)"
 
@@ -16260,7 +17324,7 @@ msgstr ""
 msgid "read object names from the standard input"
 msgstr "lire les noms d'objet depuis l'entrรฉe standard"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "ne pas supprimer, afficher seulement"
 
@@ -16276,7 +17340,7 @@ msgstr "rรฉfรฉrences-notes"
 msgid "use notes from <notes-ref>"
 msgstr "utiliser les notes depuis <rรฉfรฉrences-notes>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1643
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "sous-commande inconnue : %s"
@@ -16295,129 +17359,106 @@ msgstr ""
 "git pack-objects [options...] base-name [< <liste-rรฉfรฉrences> | < <liste-"
 "objets>]"
 
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:430
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "mauvais CRC d'objet empaquetรฉ pour %s"
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:441
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objet empaquetรฉ corrompu pour %s"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:572
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "delta rรฉcursif dรฉtectรฉ pour l'objet %s"
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objets commandรฉs, %<PRIu32> attendus"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "le fichier packet est invalideย : %s"
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "ouverture du fichier paquet pour rรฉutilisation impossibleย : %s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "impossible de rechercher (seek) dans le fichier paquet rรฉutilisรฉ"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "lecture du fichier de paquet rรฉutilisรฉ impossible"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:972
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "dรฉsactivation de l'รฉcriture en bitmap, les fichiers paquets sont scindรฉs ร  "
 "cause de pack.packSizeLimit"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:985
 msgid "Writing objects"
 msgstr "ร‰criture des objets"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "รฉchec du stat de %s"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1099
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> objets รฉcrits, %<PRIu32> attendus"
 
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1297
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "dรฉsactivation de l'รฉcriture en bitmap car certains objets ne sont pas "
 "compressรฉs"
 
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1724
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "dรฉpassement de dรฉcalage de base de delta pour %s"
 
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1733
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "dรฉcalage de base de delta est hors limite pour %s"
 
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:2004
 msgid "Counting objects"
 msgstr "Dรฉcompte des objets"
 
-#: builtin/pack-objects.c:2005
-#, c-format
-msgid "unable to get size of %s"
-msgstr "impossible de rรฉcupรฉrer la taille de %s"
-
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2149
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "impossible d'analyser l'entรชte d'objet de %s"
 
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
 #, c-format
 msgid "object %s cannot be read"
 msgstr "l'objet %s ne peut รชtre lu"
 
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2259
 msgid "suboptimal pack - out of memory"
 msgstr "paquet sous-optimal - mรฉmoire insuffisante"
 
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2574
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compression par delta en utilisant jusqu'ร  %d fils d'exรฉcution"
 
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2713
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "impossible d'empaqueter les objets joignables depuis l'รฉtiquette %s"
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2801
 msgid "Compressing objects"
 msgstr "Compression des objets"
 
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2807
 msgid "inconsistency with delta count"
 msgstr "inconsistance dans le compte de delta"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2888
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16426,7 +17467,7 @@ msgstr ""
 "ID d'objet de bord attendu, reรงu des donnรฉes illisiblesย :\n"
 "%s"
 
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2894
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16435,256 +17476,243 @@ msgstr ""
 "ID d'objet attendu, reรงu des donnรฉes illisiblesย :\n"
 "%s"
 
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2992
 msgid "invalid value for --missing"
 msgstr "valeur invalide pour --missing"
 
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
 msgid "cannot open pack index"
 msgstr "impossible d'ouvrir l'index de paquet"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:3082
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "l'objet libre ร  %s n'a pas pu รชtre examinรฉ"
 
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3167
 msgid "unable to force loose object"
 msgstr "impossible de forcer l'objet libre"
 
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3260
 #, c-format
 msgid "not a rev '%s'"
 msgstr "'%s' n'est pas une rรฉvision"
 
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3263
 #, c-format
 msgid "bad revision '%s'"
 msgstr "mauvaise rรฉvision '%s'"
 
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3288
 msgid "unable to add recent objects"
 msgstr "impossible d'ajouter les objets rรฉcents"
 
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3341
 #, c-format
 msgid "unsupported index version %s"
 msgstr "version d'index non supportรฉe %s"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mauvaise version d'index '%s'"
 
-#: builtin/pack-objects.c:3248
-msgid "do not show progress meter"
-msgstr "ne pas afficher la barre de progression"
-
-#: builtin/pack-objects.c:3250
-msgid "show progress meter"
-msgstr "afficher la barre de progression"
-
-#: builtin/pack-objects.c:3252
-msgid "show progress meter during object writing phase"
-msgstr "afficher la barre de progression durant la phase d'รฉcrite des objets"
-
-#: builtin/pack-objects.c:3255
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "similaire ร  --all-progress quand la barre de progression est affichรฉe"
-
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3383
 msgid "<version>[,<offset>]"
 msgstr "<version>[,<dรฉcalage>]"
 
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3384
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "รฉcrire le fichier d'index du paquet dans le format d'index de version "
 "spรฉcifiรฉ"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3387
 msgid "maximum size of each output pack file"
 msgstr "taille maximum de chaque fichier paquet en sortie"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3389
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorer les objets empruntรฉs ร  un autre magasin d'objets"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3391
 msgid "ignore packed objects"
 msgstr "ignorer les objets empaquetรฉs"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3393
 msgid "limit pack window by objects"
 msgstr "limiter la fenรชtre d'empaquetage par objets"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3395
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limiter la fenรชtre d'empaquetage par mรฉmoire en plus de la limite d'objets"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3397
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "longueur maximum de la chaรฎne de delta autorisรฉe dans le paquet rรฉsultant"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3399
 msgid "reuse existing deltas"
 msgstr "rรฉutiliser les deltas existants"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3401
 msgid "reuse existing objects"
 msgstr "rรฉutiliser les objets existants"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3403
 msgid "use OFS_DELTA objects"
 msgstr "utiliser les objets OFS_DELTA"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3405
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "utiliser des fils lors de la recherche pour une meilleure correspondance des "
 "deltas"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3407
 msgid "do not create an empty pack output"
 msgstr "ne pas crรฉer un paquet vide"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3409
 msgid "read revision arguments from standard input"
 msgstr "lire les paramรจtres de rรฉvision depuis l'entrรฉe standard"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3411
 msgid "limit the objects to those that are not yet packed"
 msgstr "limiter les objets ร  ceux qui ne sont pas encore empaquetรฉs"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3414
 msgid "include objects reachable from any reference"
 msgstr "inclure les objets accessibles depuis toute rรฉfรฉrence"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3417
 msgid "include objects referred by reflog entries"
 msgstr "inclure les objets rรฉfรฉrencรฉs par les รฉlรฉments de reflog"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3420
 msgid "include objects referred to by the index"
 msgstr "inclure les objets rรฉfรฉrencรฉs par l'index"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3423
 msgid "output pack to stdout"
 msgstr "afficher l'empaquetage sur la sortie standard"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3425
 msgid "include tag objects that refer to objects to be packed"
 msgstr "inclure les objets d'รฉtiquettes qui rรฉfรจrent ร  des objets ร  empaqueter"
 
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3427
 msgid "keep unreachable objects"
 msgstr "garder les objets inaccessibles"
 
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3429
 msgid "pack loose unreachable objects"
 msgstr "empaqueter les objets inaccessibles dรฉtachรฉs"
 
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3431
 msgid "unpack unreachable objects newer than <time>"
 msgstr "dรฉpaqueter les objets inaccessibles plus rรฉcents que <heure>"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3434
 msgid "use the sparse reachability algorithm"
 msgstr "utiliser l'algorithme de joignabilitรฉ creuse"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3436
 msgid "create thin packs"
 msgstr "crรฉer des paquets lรฉgers"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3438
 msgid "create packs suitable for shallow fetches"
 msgstr "crรฉer des paquets permettant des rรฉcupรฉrations superficielles"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3440
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorer les paquets qui ont un fichier .keep"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3442
 msgid "ignore this pack"
 msgstr "ignorer ce paquet"
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3444
 msgid "pack compression level"
 msgstr "niveau de compression du paquet"
 
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3446
 msgid "do not hide commits by grafts"
 msgstr "ne pas cacher les validations par greffes"
 
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3448
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "utiliser un index en bitmap si disponible pour accรฉlerer le dรฉcompte des "
 "objets"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3450
 msgid "write a bitmap index together with the pack index"
 msgstr "รฉcrire un index en bitmap associรฉ ร  l'index de paquet"
 
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3454
 msgid "write a bitmap index if possible"
 msgstr "รฉcrire un index de bitmap si possible"
 
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3458
 msgid "handling for missing objects"
 msgstr "gestion des objets manquants"
 
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3461
 msgid "do not pack objects in promisor packfiles"
 msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
 
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3463
 msgid "respect islands during delta compression"
 msgstr "respecter les รฎlots pendant la compression des deltas"
 
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3492
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "la profondeur %d de chaรฎne de delta est trop grande, forcรฉe ร  %d"
 
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3497
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit est trop grand, forcรฉ ร  %d"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3551
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size ne peut pas รชtre utilisรฉ pour construire un paquet ร  "
 "transfรฉrer"
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3553
 msgid "minimum pack size limit is 1 MiB"
 msgstr "la taille limite minimale d'un paquet est 1 MiB"
 
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3558
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin ne peut pas รชtre utilisรฉ pour construire un paquet indexable"
 
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3561
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
 
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3567
 msgid "cannot use --filter without --stdout"
 msgstr "impossible d'utiliser --filter sans --stdout"
 
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3627
 msgid "Enumerating objects"
 msgstr "ร‰numรฉration des objets"
 
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3657
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 msgstr ""
-"Total %<PRIu32> (delta %<PRIu32>), rรฉutilisรฉs %<PRIu32> (delta %<PRIu32>)"
+"Total %<PRIu32> (delta %<PRIu32>), rรฉutilisรฉs %<PRIu32> (delta %<PRIu32>), "
+"rรฉutilisรฉs du pack %<PRIu32>"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16726,53 +17754,53 @@ msgstr "limiter la traversรฉe aux objets hors des fichiers paquets prometteurs"
 msgid "cannot prune in a precious-objects repo"
 msgstr "impossible de nettoyer dans un dรฉpรดt d'objets prรฉcieux"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valeur invalide pour %s : %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<options>] [<dรฉpรดt> [<spรฉcification-de-rรฉfรฉrence>...]]"
 
-#: builtin/pull.c:141
+#: builtin/pull.c:122
 msgid "control for recursive fetching of submodules"
 msgstr "contrรดler la rรฉcupรฉration rรฉcursive dans les sous-modules"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:126
 msgid "Options related to merging"
 msgstr "Options relatives ร  la fusion"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:129
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporer les modifications en rebasant plutรดt qu'en fusionnant"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "autoriser l'avance rapide"
 
-#: builtin/pull.c:185
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "remiser avant et rรฉappliquer aprรจs le rebasage automatiquement"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:182
 msgid "Options related to fetching"
 msgstr "Options relatives au rapatriement"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:192
 msgid "force overwrite of local branch"
 msgstr "forcer l'รฉcrasement de la branche locale"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:200
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de sous-modules tirรฉs en parallรจle"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:300
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valeur invalide pour pull.ff : %s"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:426
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16780,14 +17808,14 @@ msgstr ""
 "Il n'y a pas de candidate sur laquelle rebaser parmi les rรฉfรฉrences que vous "
 "venez de rรฉcupรฉrer."
 
-#: builtin/pull.c:435
+#: builtin/pull.c:428
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Il n'y a pas de candidate avec laquelle fusionner parmi les rรฉfรฉrences que "
 "vous venez de rรฉcupรฉrer."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:429
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16795,7 +17823,7 @@ msgstr ""
 "Gรฉnรฉralement, cela signifie que vous avez indiquรฉ un spรฉcificateur\n"
 "de rรฉfรฉrence joker qui n'a pas eu de correspondance sur le serveur distant."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:432
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16807,44 +17835,44 @@ msgstr ""
 "configuration\n"
 "pour la branche actuelle, vous devez spรฉcifier la branche avec la commande."
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Vous n'รชtes actuellement sur aucune branche."
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Veuillez spรฉcifier sur quelle branche vous souhaiter rebaser."
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Veuillez spรฉcifier une branche avec laquelle fusionner."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:442 builtin/pull.c:457
 msgid "See git-pull(1) for details."
 msgstr "Rรฉfรฉrez-vous ร  git-pull(1) pour de plus amples dรฉtails."
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<distant>"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branche>"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Pas d'information de suivi distant pour la branche actuelle."
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Si vous souhaitez indiquer l'information de suivi distant pour cette "
 "branche, vous pouvez le faire avecย :"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:466
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16854,34 +17882,34 @@ msgstr ""
 "'%s'\n"
 "du serveur distant, mais cette rรฉfรฉrence n'a pas รฉtรฉ rรฉcupรฉrรฉe."
 
-#: builtin/pull.c:581
+#: builtin/pull.c:576
 #, c-format
 msgid "unable to access commit %s"
 msgstr "impossible d'accรฉder le commit %s"
 
-#: builtin/pull.c:861
+#: builtin/pull.c:857
 msgid "ignoring --verify-signatures for rebase"
 msgstr "--verify-signatures est ignorรฉ pour un rebasage"
 
-#: builtin/pull.c:916
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
 
-#: builtin/pull.c:924
+#: builtin/pull.c:920
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Mise ร  jour d'une branche non encore crรฉรฉe avec les changements ajoutรฉs dans "
 "l'index."
 
-#: builtin/pull.c:928
+#: builtin/pull.c:924
 msgid "pull with rebase"
 msgstr "tirer avec un rebasage"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:925
 msgid "please commit or stash them."
 msgstr "veuillez les valider ou les remiser."
 
-#: builtin/pull.c:954
+#: builtin/pull.c:950
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16892,7 +17920,7 @@ msgstr ""
 "avance rapide de votre copie de travail\n"
 "depuis le commit %s."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:956
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16909,15 +17937,15 @@ msgstr ""
 "$ git reset --hard\n"
 "pour rรฉgรฉnรฉrer."
 
-#: builtin/pull.c:975
+#: builtin/pull.c:971
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossible de fusionner de multiples branches sur une tรชte vide."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:975
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossible de rebaser sur de multiples branches."
 
-#: builtin/pull.c:986
+#: builtin/pull.c:982
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "impossible de rebaser avec des modifications de sous-modules enregistrรฉes "
@@ -16927,15 +17955,15 @@ msgstr ""
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<options>] [<dรฉpรดt> [<spรฉcification-de-rรฉfรฉrence>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "raccourci d'รฉtiquette sans <รฉtiquette>"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete accepte seulement des noms entiers de rรฉfรฉrences cibles"
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16944,7 +17972,7 @@ msgstr ""
 "Pour choisir l'option de maniรจre permanente, voir push.default dans 'git "
 "help config'."
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16969,7 +17997,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16984,7 +18012,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-la-branche-amont>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16998,13 +18026,13 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "La branche courante %s a de multiples branches amont, impossible de pousser."
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -17015,14 +18043,14 @@ msgstr ""
 "pas une branche amont de votre branche courante '%s', sans me dire\n"
 "quoi pousser pour mettre ร  jour quelle branche amont."
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Vous n'avez pas spรฉcifiรฉ de spรฉcifications de rรฉfรฉrence ร  pousser, et push."
 "default est \"nothing\"."
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -17037,7 +18065,7 @@ msgstr ""
 "Voir la 'Note ร  propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -17052,7 +18080,7 @@ msgstr ""
 "Voir la 'Note ร  propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -17070,13 +18098,13 @@ msgstr ""
 "Voir la 'Note ร  propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Les mises ร  jour ont รฉtรฉ rejetรฉes car l'รฉtiquette existe dรฉjร  dans la "
 "branche distante."
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -17088,142 +18116,142 @@ msgstr ""
 "pointer\n"
 "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Poussรฉe vers %s\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "impossible de pousser des rรฉfรฉrences vers '%s'"
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "mauvais dรฉpรดt '%s'"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"Pas de destination pour pousser.\n"
-"Spรฉcifiez une URL depuis la ligne de commande ou configurez un dรฉpรดt distant "
-"en utilisant\n"
-"\n"
-"    git remote add <nom> <url>\n"
-"\n"
-"et poussez alors en utilisant le dรฉpรดt distant\n"
-"\n"
-"    git push <nom>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr "dรฉpรดt"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "pousser toutes les rรฉfรฉrences"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "reflรฉter toutes les rรฉfรฉrences"
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "supprimer les rรฉfรฉrences"
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 "pousser les รฉtiquettes (ne peut pas รชtre utilisรฉ avec --all ou --mirror)"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "forcer les mises ร  jour"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
 msgstr "<nom-de-ref>:<attendu>"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr "exiger que l'ancienne valeur de la rรฉfรฉrence soit ร  cette valeur"
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr "contrรดler la poussรฉe rรฉcursive des sous-modules"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr "utiliser un empaquetage lรฉger"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "recevoir le programme d'empaquetage"
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr "dรฉfinir la branche amont pour git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
 msgstr "รฉliminer les rรฉfรฉrences locales supprimรฉes"
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr "รฉviter d'utiliser le crochet pre-push"
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr "pousser les รฉtiquettes manquantes mais pertinentes"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr "signer la poussรฉe avec GPG"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr "demande une transaction atomique sur le serveur distant"
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete est incompatible avec --all, --mirror et --tags"
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete n'a pas de sens sans aucune rรฉfรฉrence"
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "mauvais dรฉpรดt '%s'"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"Pas de destination pour pousser.\n"
+"Spรฉcifiez une URL depuis la ligne de commande ou configurez un dรฉpรดt distant "
+"en utilisant\n"
+"\n"
+"    git remote add <nom> <url>\n"
+"\n"
+"et poussez alors en utilisant le dรฉpรดt distant\n"
+"\n"
+"    git push <nom>\n"
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr "--all et --tags sont incompatibles"
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr "--all ne peut pas รชtre combinรฉ avec des spรฉcifications de rรฉfรฉrence"
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror et --tags sont incompatibles"
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror ne peut pas รชtre combinรฉ avec des spรฉcifications de rรฉfรฉrence"
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr "--all et --mirror sont incompatibles"
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr ""
 "les options de poussรฉe ne peuvent pas contenir de caractรจres de nouvelle "
@@ -17243,24 +18271,32 @@ msgstr "git range-diff [<options>] <ancien-sommet>...<nouveau-sommet>"
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<options>] <base> <ancien-sommet> <nouveau-sommet>"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr "Pourcentage par lequel la crรฉation est pondรฉrรฉe"
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "utiliser des couleurs de diff simples"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "notes"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "passรฉ ร  'git log'"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr "pas de .. dans la plageย : '%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "un format d'argument unique doit รชtre une plage symรฉtrique"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "plage entre deux commits requise"
 
@@ -17343,13 +18379,17 @@ msgstr "dรฉboguer unpack-trees"
 msgid "suppress feedback messages"
 msgstr "supprimer les messages d'information de suivi"
 
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Vous devez d'abord rรฉsoudre votre index courant"
+
 #: builtin/rebase.c:32
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] [<amont>] "
-"[<branche>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-"
+"base] [<amont> [<branche>]]"
 
 #: builtin/rebase.c:34
 msgid ""
@@ -17362,216 +18402,207 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "liste ร  faire inutilisableย : '%s'"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "impossible d'รฉcrire '%s'."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "pas de HEADย ?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:292
 #, c-format
 msgid "could not create temporary %s"
 msgstr "impossible de crรฉer un fichier temporaire %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:298
 msgid "could not mark as interactive"
 msgstr "impossible de marquer comme interactif"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:352
 msgid "could not generate todo list"
 msgstr "impossible de gรฉnรฉrer la liste ร -faire"
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:391
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "un commit de base doit รชtre fourni avec --upstream ou --onto"
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:461
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<options>]"
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "garder les validations vides"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(OBSOLรˆTE) garder les validations vides"
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "autoriser les validations avec des messages vides"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:480
 msgid "rebase merge commits"
 msgstr "rebaser les commits de fusion"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:482
 msgid "keep original branch points of cousins"
 msgstr "conserver les points de branchement de cousins originaux"
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:484
 msgid "move commits that begin with squash!/fixup!"
 msgstr "dรฉplacer les commits qui commencent par squash!/fixup!"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:485
 msgid "sign commits"
 msgstr "signer les commits"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:487 builtin/rebase.c:1490
 msgid "display a diffstat of what changed upstream"
 msgstr "afficher un diffstat de ce qui a changรฉ en amont"
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:489
 msgid "continue rebase"
 msgstr "continuer le rebasage"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:491
 msgid "skip commit"
 msgstr "sauter le commit"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:492
 msgid "edit the todo list"
 msgstr "รฉditer la liste ร -faire"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:494
 msgid "show the current patch"
 msgstr "afficher le patch courant"
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:497
 msgid "shorten commit ids in the todo list"
 msgstr "raccourcir les identifiants de commits dans la liste ร -faire"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:499
 msgid "expand commit ids in the todo list"
 msgstr "รฉtendre les identifiants de commit dans la liste ร -faire"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:501
 msgid "check the todo list"
 msgstr "vรฉrifier la liste ร -faire"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:503
 msgid "rearrange fixup/squash lines"
 msgstr "rรฉarranger les lignes fixup/squash"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:505
 msgid "insert exec commands in todo list"
 msgstr "insรฉrer les commandes exec dans la liste ร -faire"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:506
 msgid "onto"
 msgstr "sur"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict-revision"
 msgstr "restrict-revision"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict revision"
 msgstr "restreindre la rรฉvision"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:511
 msgid "squash-onto"
 msgstr "รฉcraser-sur"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:512
 msgid "squash onto"
 msgstr "รฉcraser sur"
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:514
 msgid "the upstream commit"
 msgstr "le commit amont"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head-name"
 msgstr "nom du head"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head name"
 msgstr "nom du head"
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:521
 msgid "rebase strategy"
 msgstr "stratรฉgie de rebasage"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:522
 msgid "strategy-opts"
 msgstr "options de stratรฉgie"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:523
 msgid "strategy options"
 msgstr "options de stratรฉgie"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:524
 msgid "switch-to"
 msgstr "switch-to"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:525
 msgid "the branch or commit to checkout"
 msgstr "la branche ou le commit ร  extraire"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto-name"
 msgstr "sur-le-nom"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto name"
 msgstr "sur le nom"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "cmd"
 msgstr "cmd"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "the command to run"
 msgstr "la commande ร  lancer"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:530 builtin/rebase.c:1584
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "re-planifier automatiquement tout `exec` qui รฉchoue"
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:546
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges"
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:562
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s requiert un rebasage interactif"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:612
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "impossible d'accรฉder 'onto' : '%s'"
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:627
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head invalideย : '%s'"
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:652
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "allow_rerere_autoupdate invalide ignorรฉย : '%s'"
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:728
 #, c-format
 msgid "Could not read '%s'"
 msgstr "Impossible de lire '%s'"
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:746
 #, c-format
 msgid "Cannot store %s"
 msgstr "Impossible de stocker %s"
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:853
 msgid "could not determine HEAD revision"
 msgstr "impossible de dรฉterminer la rรฉvision HEAD"
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17585,7 +18616,7 @@ msgstr ""
 "arrรชter\n"
 "et revenir ร  l'รฉtat antรฉrieur ร  la commande, lancez \"git rebase --abort\"."
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -17604,7 +18635,16 @@ msgstr ""
 "\n"
 "Rรฉsultat, git ne peut pas les rebaser."
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"type vide non connu '%s'ย ; les valeurs valides sont \"drop\" (abandonner), "
+"\"keep\" (garder) et \"ask\" (demander)."
+
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "%s\n"
@@ -17621,7 +18661,7 @@ msgstr ""
 "    git rebase '<branche>'\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1417
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17635,127 +18675,136 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branche> %s\n"
 "\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1447
 msgid "exec commands cannot contain newlines"
 msgstr "les commandes exec ne peut pas contenir de retour ร  la ligne"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1451
 msgid "empty exec command"
 msgstr "commande exec vide"
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1481
 msgid "rebase onto given branch instead of upstream"
 msgstr "rebaser sur la branche %s au lieu de la branche amont"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr ""
+"utiliser la base de fusion de l'amont et la branche comme base actuelle"
+
+#: builtin/rebase.c:1485
 msgid "allow pre-rebase hook to run"
 msgstr "permettre le lancement du crochet pre-rebase"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1487
 msgid "be quiet. implies --no-stat"
 msgstr "รชtre silencieux. implique --no-stat"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1493
 msgid "do not show diffstat of what changed upstream"
 msgstr "ne pas afficher un diffstat de ce qui a changรฉ en amont"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1496
 msgid "add a Signed-off-by: line to each commit"
 msgstr "ajouter une ligne Signed-off-by ร  chaque message de validation"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
 msgid "passed to 'git am'"
-msgstr "passรฉ ร  'git am'"
+msgstr "passรฉ jusqu'ร  'git am'"
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
 msgid "passed to 'git apply'"
 msgstr "passรฉ jusqu'ร  git-apply"
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "picorer tous les commits, mรชme sans modifiant"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1515
 msgid "continue"
 msgstr "continuer"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1518
 msgid "skip current patch and continue"
 msgstr "sauter le patch courant et continuer"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1520
 msgid "abort and check out the original branch"
 msgstr "abandonner et extraire la branche d'origine"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1523
 msgid "abort but keep HEAD where it is"
 msgstr "abandonne mais garde HEAD oรน il est"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1524
 msgid "edit the todo list during an interactive rebase"
 msgstr "รฉditer la liste ร  faire lors d'un rebasage interactif"
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1527
 msgid "show the patch file being applied or merged"
 msgstr "afficher le patch en cours d'application ou de fusion"
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "utiliser des stratรฉgies d'application pour rebaser"
+
+#: builtin/rebase.c:1534
 msgid "use merging strategies to rebase"
 msgstr "utiliser des stratรฉgies de fusion pour rebaser"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1538
 msgid "let the user edit the list of commits to rebase"
 msgstr "laisser l'utilisateur รฉditer la liste des commits ร  rebaser"
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1542
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(Dร‰CONSEILLร‰) essayer de recrรฉer les fusions au lieu de les ignorer"
 
-#: builtin/rebase.c:1455
-msgid "preserve empty commits during rebase"
-msgstr "prรฉserver les validations vides pendant le rebasage"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "comment gรฉrer les commits qui deviennent vides"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1554
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "dรฉplace les commits qui commencent par squash!/fixup! sous -i"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1560
 msgid "automatically stash/stash pop before and after"
 msgstr "remiser et rรฉappliquer automatiquement avant et aprรจs"
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1562
 msgid "add exec lines after each commit of the editable list"
 msgstr "ajouter les lignes exec aprรจs chaque commit de la liste รฉditable"
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1566
 msgid "allow rebasing commits with empty messages"
 msgstr "autoriser les commits de rebasage avec des messages vides"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1570
 msgid "try to rebase merges instead of skipping them"
 msgstr "essayer de rebaser les fusions au lieu de les garder"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1573
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1575
 msgid "use the given merge strategy"
 msgstr "utiliser la stratรฉgie de fusion indiquรฉe"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
 msgid "option"
 msgstr "option"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1578
 msgid "pass the argument through to the merge strategy"
 msgstr "passer les arguments jusqu'ร  la stratรฉgie de fusion"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1581
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "rebaser tous les objets inatteignables depuis les racines"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1598
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -17763,32 +18812,40 @@ msgstr ""
 "les support de rebase.useBuiltin a รฉtรฉ supprimรฉ !\n"
 "Voir son entrรฉe dans 'git help config' pour plus de dรฉtails."
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1604
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser."
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1645
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 "git rebase --preserve-merges est dรฉconseillรฉ. Utilisez --rebase-merges ร  la "
 "place."
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "impossible de combiner '--keep-base' avec '--onto'"
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "impossible de combiner '--keep-base' avec '--root'"
+
+#: builtin/rebase.c:1656
 msgid "No rebase in progress?"
 msgstr "Pas de rebasage en cours ?"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1660
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "L'action --edit-todo peut seulement รชtre utilisรฉe lors d'un rebasage "
 "interactif."
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1683
 msgid "Cannot read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1695
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17796,16 +18853,16 @@ msgstr ""
 "Vous devez รฉditer tous les conflits de fusion et\n"
 "les marquer comme rรฉsolus avec git add"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1714
 msgid "could not discard worktree changes"
 msgstr "Impossible de supprimer les changements de l'arbre de travail"
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1733
 #, c-format
 msgid "could not move back to %s"
 msgstr "Impossible de revenir ร  %s"
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1778
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17827,176 +18884,168 @@ msgstr ""
 "chose\n"
 "d'important ici.\n"
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1806
 msgid "switch `C' expects a numerical value"
 msgstr "l'option `C' attend un valeur numรฉrique"
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1847
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "mode inconnuย : %s"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1869
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiert --merge ou --interactive"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr ""
+"impossible de combiner les options d'application avec les options de fusion"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "backend de rebasage inconnu : %s"
+
+#: builtin/rebase.c:1937
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
 
-#: builtin/rebase.c:1809
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"impossible de combiner les options am avec l'options interactive ou merge"
-
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1957
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'"
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1961
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "erreurย : impossible de combiner '--preserve-merges' avec '--reschedule-"
 "failed-exec'"
 
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "impossible de combiner '--rebase-merges' avec '--strategy-option'"
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "impossible de combiner '--rebase-merges' avec '--strategy'"
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1985
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "amont invalide '%s'"
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1991
 msgid "Could not create new root commit"
 msgstr "Impossible de crรฉer un nouveau commit racine"
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s': exactement une base de fusion nรฉcessaire avec une branche"
+
+#: builtin/rebase.c:2020
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': exactement une base de fusion nรฉcessaire"
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:2028
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "ne pointe pas sur une validation valide : '%s'"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:2054
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "fatal : pas de branche ou commit '%s'"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr "Rรฉfรฉrence inexistanteย : %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2073
 msgid "Could not resolve HEAD to a revision"
 msgstr "Impossible de rรฉsoudre le commit HEAD vers un rรฉvision"
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2111
 msgid "Cannot autostash"
 msgstr "Autoremisage impossible"
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2114
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "rรฉponse de remisage inattendueย : '%s'"
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2120
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Impossible de crรฉer le rรฉpertoire pour '%s'"
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2123
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Autoremisage crรฉรฉ : %s\n"
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2126
 msgid "could not reset --hard"
 msgstr "impossible de rรฉinitialiser --hard"
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD est maintenant ร  %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2135
 msgid "Please commit or stash them."
 msgstr "Veuillez les valider ou les remiser."
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr "impossible d'analyser '%s'"
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2169
 #, c-format
 msgid "could not switch to %s"
 msgstr "Impossible de basculer vers %s"
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2180
 msgid "HEAD is up to date."
 msgstr "HEAD est ร  jour."
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2182
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La branche courante %s est ร  jour.\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2190
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD est ร  jour, rebasage forcรฉ."
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "La branche courante %s est ร  jour, rebasage forcรฉ.\n"
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2200
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Le crochet pre-rebase a refusรฉ de rebaser."
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2207
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Changements vers %s :\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2210
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Changements de %s sur %s :\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2235
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Rembobinage prรฉalable de head pour pouvoir rejouer votre travail par-"
 "dessus...\n"
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2244
 msgid "Could not detach HEAD"
 msgstr "Impossible de dรฉtacher HEAD"
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2253
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avance rapide de %s sur %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <rรฉpertoire-git>"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:821
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -18026,7 +19075,7 @@ msgstr ""
 "Pour รฉliminer ce message et conserver le comportement par dรฉfaut,\n"
 "rรฉglez ยซย receive.denyCurrentBranchย ยป ร  'refuse'."
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -18076,49 +19125,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <rรฉfรฉrence>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' n'est pas un horodatage valide"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Marquage des objets inaccessibles..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s ne pointe nulle partย !"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr "pas de journal de rรฉfรฉrences ร  supprimer spรฉcifiรฉ"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr "'%s' n'est pas un journal de rรฉfรฉrences"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "pas de journal de rรฉfรฉrences pour '%s'"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "format de rรฉfรฉrence invalideย : %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -18126,83 +19175,83 @@ msgstr ""
 "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nom> <url>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <ancienne> <nouvelle>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <nom>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nom>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nom>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | "
 "<distante>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nom> <branche>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nom>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nom> <nouvelle-URL>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nom> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<options>] <nom> <URL>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nom> <branche>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nom> <branche>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<options>] <nom>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<options>] <nom>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<options>] [<groupe> | <distante>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Mise ร  jour de %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18210,88 +19259,104 @@ msgstr ""
 "--mirror est dangereux et obsolรจte ; merci\n"
 "\t d'utiliser --mirror=fetch ou --mirror=push ร  la place"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argument miroir inconnu : %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "rapatrier les branches distantes"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr ""
 "importer toutes les รฉtiquettes et les objets associรฉs lors du rapatriement"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "ou ne rapatrier aucune รฉtiquette (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "branche(s) ร  suivre"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "branche maรฎtresse"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "paramรฉtrer la distante comme miroir pour pousser ou pour rapatrier depuis"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "spรฉcifier une branche maรฎtresse n'a pas de sens avec --mirror"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "spรฉcifier les branches ร  suivre n'a de sens qu'avec des miroirs de "
 "rapatriement"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr "la distante %s existe dรฉjร ."
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' n'est pas un nom valide de distante"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Impossible de paramรฉtrer la maรฎtresse '%s'"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 "Impossible d'obtenir une correspondance distante pour la spรฉcification de "
 "rรฉfรฉrence %s"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "(correspond)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "(supprimer)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "impossible d'assigner '%s'"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"La configuration %s remote.pushDefault dansย :\n"
+"\t%s%d\n"
+"nomme ร  prรฉsent le distant inexistant '%s'"
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Pas de serveur remoteย : '%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18302,17 +19367,17 @@ msgstr ""
 "\t%s\n"
 "\tVeuillez mettre ร  jour la configuration manuellement si nรฉcessaire."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "รฉchec de suppression de '%s'"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr "รฉchec de crรฉation de '%s'"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18327,118 +19392,118 @@ msgstr[1] ""
 "supprimรฉes ;\n"
 "pour les supprimer, utilisez :"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Impossible de supprimer la section de configuration '%s'"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr " suivi"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " dรฉpassรฉ (utilisez 'git remote prune' pour supprimer)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebase de maniรจre interactive sur la distante %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1052
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "rebase de maniรจre interactive (avec fusions) sur la distante %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebase sur la distante %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr " fusionne avec la distante %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusionne avec la distante %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    et avec la distante %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr "crรฉer"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr "supprimer"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr "ร  jour"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr "peut รชtre mis ร  jour en avance rapide"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr "le local n'est pas ร  jour"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s force vers %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s pousse vers %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s force vers %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s pousse vers %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr "ne pas interroger les distantes"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr "* distante %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL de rapatriement : %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr "(pas d'URL)"
 
@@ -18446,25 +19511,25 @@ msgstr "(pas d'URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL push : %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branche HEAD : %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr "(non demandรฉ)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -18472,171 +19537,162 @@ msgstr ""
 "  Branche HEAD (la HEAD distante est ambiguรซ, peut รชtre l'une des "
 "suivantes) :\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branche distante :%s"
 msgstr[1] "  Branches distantes :%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr " (รฉtat non demandรฉ)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branche locale configurรฉe pour 'git pull' :"
 msgstr[1] "  Branches locales configurรฉes pour 'git pull' :"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Les rรฉfรฉrences locales seront reflรฉtรฉes par 'git push'"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Rรฉfรฉrence locale configurรฉe pour 'git push'%s :"
 msgstr[1] "  Rรฉfรฉrences locales configurรฉes pour 'git push'%s :"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "dรฉfinir refs/remotes/<nom>/HEAD selon la distante"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "supprimer refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr "Impossible de dรฉterminer la HEAD distante"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
 "explicitement avec :"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr "Impossible de supprimer %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Rรฉfรฉrence non valide : %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr "Impossible de paramรฉtrer %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s se retrouvera en suspens !"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s se retrouve en suspens !"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr "ร‰limination de %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [serait รฉliminรฉ] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [รฉliminรฉ] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr "รฉliminer les distants aprรจs le rapatriement"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Pas de serveur remote '%s'"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr "ajouter une branche"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr "pas de serveur distant spรฉcifiรฉ"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr "interroger les URLs de poussรฉe plutรดt que les URLs de rรฉcupรฉration"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr "retourner toutes les URLs"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "aucune URL configurรฉe pour le dรฉpรดt distant '%s'"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr "manipuler les URLs push"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr "ajouter une URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr "supprimer des URLs"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete n'a aucun sens"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Motif d'URL ancien invalide : %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Pas d'URL trouvรฉe : %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr "Pas de suppression de toutes les URLs non-push"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "รชtre verbeux : doit รชtre placรฉ avant une sous-commande"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Sous-commande inconnue : %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr "git repack [<options>]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18645,117 +19701,117 @@ msgstr ""
 "Utilisez\n"
 "--no-write-bitmap-index ou dรฉsactivez le paramรจtre pack.writebitmaps."
 
-#: builtin/repack.c:190
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "ne pas dรฉmarrer pack-objects pour rรฉ-empaqueter les objects de prometteur"
 
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repackย : attente de lignes d'Id d'objets en hexa complet seulement depuis "
 "les objects de paquet."
 
-#: builtin/repack.c:246
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "impossible de terminer pack-objects  pour rรฉ-empaqueter les objets de "
 "prometteur"
 
-#: builtin/repack.c:284
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr "empaqueter tout dans un seul paquet"
 
-#: builtin/repack.c:286
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "identique ร  -a et transformer les objets inaccessibles en suspens"
 
-#: builtin/repack.c:289
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "supprimer les paquets redondants et lancer git-prune-packed"
 
-#: builtin/repack.c:291
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passer --no-reuse-delta ร  git-pack-objects"
 
-#: builtin/repack.c:293
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passer --no-reuse-object ร  git-pack-objects"
 
-#: builtin/repack.c:295
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr "ne pas lancer git update-server-info"
 
-#: builtin/repack.c:298
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr "passer --local ร  git-pack-objects"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr "รฉcrire un index en bitmap"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:310
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "passer --delta-islands ร  git-pack-objects"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr "date approximative"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr "avec -a, repaquรฉtiser les objets inaccessibles"
 
-#: builtin/repack.c:308
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr "taille de la fenรชtre utilisรฉe pour la compression des deltas"
 
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:310
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "idem ci-dessus, mais limiter la taille mรฉmoire au lieu du nombre d'รฉlรฉments"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr "limite la profondeur maximale des deltas"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr "limite le nombre maximal de fils"
 
-#: builtin/repack.c:316
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr "taille maximum de chaque fichier paquet"
 
-#: builtin/repack.c:318
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr "rรฉempaqueter les objets dans des paquets marquรฉs avec .keep"
 
-#: builtin/repack.c:320
+#: builtin/repack.c:328
 msgid "do not repack this pack"
 msgstr "ne pas rempaqueter ce paquet"
 
-#: builtin/repack.c:330
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "impossible de supprimer les paquets dans un dรฉpรดt d'objets prรฉcieux"
 
-#: builtin/repack.c:334
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable et -A sont incompatibles"
 
-#: builtin/repack.c:417
+#: builtin/repack.c:425
 msgid "Nothing new to pack."
 msgstr "Rien de neuf ร  empaqueter."
 
-#: builtin/repack.c:478
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -18774,7 +19830,7 @@ msgstr ""
 "ALERTEย : aussi รฉchouรฉ.\n"
 "ALERTEย : Veuillez les renommer manuellement dans %s :\n"
 
-#: builtin/repack.c:526
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "รฉchec de la suppression de '%s'"
@@ -18882,8 +19938,8 @@ msgstr "fstat de %s impossible"
 msgid "unable to write object to database"
 msgstr "impossible d'รฉcrire l'objet dans la base de donnรฉes"
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "nom d'objet invalide : '%s'"
@@ -18902,22 +19958,22 @@ msgstr "รฉchec de l'รฉdition du fichier d'objet"
 msgid "new object is the same as the old one: '%s'"
 msgstr "le nouvel objet est identique ร  l'ancienย : '%s'"
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "impossible d'analyser %s comme commit"
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mauvaise รฉtiquette de fusion dans le commit '%s'"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "รฉtiquette de fusion malformรฉe dans le commit '%s'"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18926,31 +19982,31 @@ msgstr ""
 "le commit original '%s' contient l'รฉtiquette de fusion '%s' qui a disparu ; "
 "utilisez --edit au lieu de --graft"
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "le commit original '%s' contient une signature GPG"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "la signature sera รฉliminรฉe dans la validation de remplacement !"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "Impossible d'รฉcrire le commit de remplacement pour '%s'"
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft pour '%s' non nรฉcessaire"
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "le nouveau commit est identique ร  l'ancienย : '%s'"
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18959,71 +20015,71 @@ msgstr ""
 "impossible de convertir la(les) greffe(s) suivante(s) :\n"
 "%s"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "afficher les rรฉfรฉrences de remplacement"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "supprimer les rรฉfรฉrences de remplacement"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "รฉditer l'objet existant"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "Modifier les parents d'un commit"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "convertir le fichier de greffe existant"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "remplacer la rรฉfรฉrence si elle existe"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "afficher sans mise en forme pour --edit"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "utiliser ce format"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format ne peut pas รชtre utilisรฉ sans lister"
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f n'a de sens qu'en รฉcrivant un remplacement"
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw n'a de sens qu'avec l'option --edit"
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d requiert au moins un argument"
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "mauvais nombre d'arguments"
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e requiert un seul argument"
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g requiert au moins un argument"
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file ne supporte aucun argument"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "-l n'accepte qu'un motifs"
 
@@ -19052,117 +20108,129 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<arbre ou apparentรฉ>] [--] <chemins>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr ""
+"git reset [-q] [<arbre ou apparentรฉ>] [--] <spรฉcificateur-de-chemin>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<arbre ou apparentรฉ>] [--] [<chemins>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<arbre-esque>] [--] [<spรฉc.-de-chemin>...]"
+
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "merge"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr "Vous n'avez pas une HEAD valide."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr "Impossible de trouver l'arbre pour HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Impossible de trouver l'arbre pour %s."
 
-#: builtin/reset.c:193
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD est maintenant ร  %s"
+
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "รชtre silencieux, afficher seulement les erreurs"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr "rรฉinitialiser HEAD et l'index"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr "rรฉinitialiser seulement HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr "rรฉinitialiser HEAD, l'index et la copie de travail"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr "rรฉinitialiser HEAD mais garder les changements locaux"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "enregistrer seulement le fait que les chemins effacรฉs seront ajoutรฉs plus "
 "tard"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "ร‰chec de rรฉsolution de '%s' comme une rรฉvision valide."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "ร‰chec de rรฉsolution de '%s' comme un arbre valide."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch est incompatible avec --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed avec des chemins est obsolรจte ; utilisez 'git reset -- <paths>' ร  la "
 "place."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Impossible de faire un \"%s reset\" avec des chemins."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "Le \"%s reset\" n'est pas permis dans un dรฉpรดt nu"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
 msgstr "-N ne peut รชtre utilisรฉ qu'avec --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr "Modifications non indexรฉes aprรจs reset :"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -19177,35 +20245,30 @@ msgstr ""
 "de\n"
 "config reset.quiet ร  true pour avoir ce comportement en permanence.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Impossible de rรฉinitialiser le fichier d'index ร  la rรฉvision '%s'."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr "Impossible d'รฉcrire le nouveau fichier d'index."
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "impossible de combiner --exclude-promisor-objects et --missing"
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "le filtrage d'objet exige --objects"
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "valeur invalide de 'sparse' '%s'"
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list ne supporte l'affichage des notes"
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "le comptage marquรฉ est incompatible avec --objects"
 
 #: builtin/rev-parse.c:408
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -19370,38 +20433,42 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "le fichier suivant a des modifications locales :"
 msgstr[1] "les fichiers suivants ont des modifications locales :"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "ne pas afficher les fichiers supprimรฉs"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "supprimer seulement de l'index"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "outrepasser la vรฉrification des fichiers ร  jour"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "autoriser la suppression rรฉcursive"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "sortir avec un รฉtat zรฉro mรชme si rien ne correspondait"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Aucun spรฉcificateur de chemin fourni. Quel fichier doit รชtre supprimรฉย ?"
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "veuillez indexer vos modifications de .gitmodules ou les remiser pour "
 "continuer"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "pas de suppression rรฉcursive de '%s' sans -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm : impossible de supprimer %s"
@@ -19660,15 +20727,85 @@ msgstr ""
 "afficher les rรฉfรฉrences de l'entrรฉe standard qui ne sont pas dans le dรฉpรดt "
 "local"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <options>"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"cet arbre de travail n'est pas partiel (le fichier sparse-checkout pourrait "
+"ne pas exister)"
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr ""
+"รฉchec de la crรฉation du rรฉpertoire pour le fichier d'extraction partielle"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "รฉchec de paramรฉtrage extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "initialiser l'extraction partielle en mode cone"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "initialiser l'extraction partielle"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "รฉchec ร  l'ouverture de '%s'"
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "impossible de normaliser le chemin '%s'"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "Impossible de dรฉcoter la chaรฎne en style C '%s'"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "impossible de charger les motifs de l'extraction partielle existants"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "lire les motifs depuis l'entrรฉe standard"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "indiquer les motifs de l'extraction partielle"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "dรฉsactiver d'extraction partielle"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "erreur lors du rafraรฎchissement du rรฉpertoire de travail"
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<options>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<options>] [<remise>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<remise>]"
 
@@ -19676,25 +20813,27 @@ msgstr "git stash drop [-q|--quiet] [<remise>]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nom-de-branche> [<remise>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
 "          [--] [<spรฉcificateur-de-chemin>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19702,188 +20841,198 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<remise>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<remise>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <message>] [-q|--quiet] <remise>"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<spรฉcificateur-de-chemin>...]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' n'est pas une validation de type remisage"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Trop de rรฉvisions spรฉcifiรฉes : %s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr "Aucune entrรฉe de remisage trouvรฉe."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s n'est pas une rรฉfรฉrence valide"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear avec des paramรจtres n'est pas implรฉmentรฉ"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "impossible d'appliquer un remisage en cours de fusion"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "impossible de gรฉnรฉrer %s^!."
 
-#: builtin/stash.c:421
+#: builtin/stash.c:422
 msgid "conflicts in index.Try without --index."
 msgstr "conflits dans l'index. Essayez sans --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "impossible de sauvegarder l'arbre d'index"
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Fusion de %s avec %s"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
 msgstr "L'index n'a pas รฉtรฉ sorti de remise."
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
 msgid "attempt to recreate the index"
 msgstr "tentative de recrรฉer l'index"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:555
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s supprimรฉ (%s)"
 
-#: builtin/stash.c:552
+#: builtin/stash.c:558
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%sย : Impossible de supprimer l'รฉlรฉment de stash"
 
-#: builtin/stash.c:577
+#: builtin/stash.c:583
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' n'est pas une rรฉfรฉrence de remisage"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 "L'entrรฉe de remisage est conservรฉe au cas oรน vous en auriez encore besoin."
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr "Aucune branche spรฉcifiรฉe"
 
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Impossible de mettre ร  jour %s avec %s"
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
 msgid "stash message"
 msgstr "message pour le remisage"
 
-#: builtin/stash.c:818
+#: builtin/stash.c:824
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" exige un argument <commit>"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr "Aucun changement sรฉlectionnรฉ"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr "Vous n'avez pas encore la validation initiale"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr "Impossible de sauver l'รฉtat courant de l'index"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr "Impossible de sauver les fichiers non-suivis"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr "Impossible de sauver l'รฉtat courant de la copie de travail"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr "Impossible d'enregistrer l'รฉtat de la copie de travail"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Impossible d'utiliser --patch et --include-untracked ou --all en mรชme temps"
 
-#: builtin/stash.c:1285
+#: builtin/stash.c:1298
 msgid "Did you forget to 'git add'?"
 msgstr "Vous avez sรปrement oubliรฉ 'git add' ?"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr "Pas de modifications locales ร  sauver"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr "Impossible d'initialiser le remisage"
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr "Impossible de sauver l'รฉtat courant"
 
-#: builtin/stash.c:1327
+#: builtin/stash.c:1340
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Arbre de travail et รฉtat de l'index sauvegardรฉs dans %s"
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr "Impossible de supprimer les changements de la copie de travail"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "keep index"
 msgstr "conserver l'index"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash in patch mode"
 msgstr "remiser une mode rustine"
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1472 builtin/stash.c:1537
 msgid "quiet mode"
 msgstr "mode silencieux"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1474 builtin/stash.c:1539
 msgid "include untracked files in stash"
 msgstr "inclure les fichiers non suivis dans la remise"
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1476 builtin/stash.c:1541
 msgid "include ignore files"
 msgstr "inclure les fichiers ignorรฉs"
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1600
 #, c-format
 msgid "could not exec %s"
 msgstr "impossible d'exรฉcuter %s"
@@ -19906,40 +21055,40 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "ajouter devant chaque ligne le caractรจre de commentaire et un espace"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Nom de rรฉfรฉrence complet attendu, %s obtenu"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper  print-default-remote n'accepte aucun argument"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "impossible de supprimer un composant de l'URL '%s'"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr "ancre alternative pour les chemins relatifs"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "URL non trouvรฉe pour le chemin de sous-module '%s' dans .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrรฉe dans '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -19948,7 +21097,7 @@ msgstr ""
 "run_command a retournรฉ un statut non-nul pour %s\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19959,20 +21108,20 @@ msgstr ""
 "modules inclus de %s\n"
 "."
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr ""
 "Supprimer la sortie lors de l'entrรฉe dans chaque commande de sous-module"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr "Parcourir rรฉcursivement les sous-modules"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -19981,60 +21130,60 @@ msgstr ""
 "impossible de trouver la configuration '%s'. Ce dรฉpรดt est considรฉrรฉ comme "
 "son propre amont d'autoritรฉ."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "ร‰chec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Sous-module '%s' (%s) enregistrรฉ pour le chemin '%s'\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "attentionย : nous vous suggรฉrons de spรฉcifier une commande de mode de mise ร  "
 "jour pour le sous-module '%s'\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "ร‰chec d'enregistrement du mode de mise ร  jour pour le chemin de sous-module "
 "'%s'"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<options>] [<chemin>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "Pas de mise en correspondance du sous-module trouvรฉ dans .gitmodules pour le "
 "chemin '%s'"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "impossible de rรฉsoudre HEAD dans le sous-module '%s'"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "rรฉcursion impossible dans le sous-module '%s'"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr "supprimer la sortie d'รฉtat du sous-module"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -20042,48 +21191,48 @@ msgstr ""
 "Utiliser le commit stockรฉ dans l'index au lieu de celui stockรฉ dans la HEAD "
 "du sous-module"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr "parcourir rรฉcursivement les sous-modules"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper <nom> <chemin>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "รฉchec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "รฉchec d'obtention du dรฉpรดt distant par dรฉfaut pour le sous-module '%s'"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "รฉchec de mise ร  jour du dรฉpรดt distant pour le sous-module '%s'"
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 "Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20093,7 +21242,7 @@ msgstr ""
 "'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
 "historique)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20102,179 +21251,208 @@ msgstr ""
 "L'arbre de travail du sous-module '%s' contient des modifications locales ; "
 "utilisez '-f' pour les annuler"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Rรฉpertoire '%s' nettoyรฉ\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "impossible de crรฉer le rรฉpertoire vide du sous-module %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Sous-module '%s' (%s) non enregistrรฉ pour le chemin '%s'\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "ร‰liminer les arbres de travail des sous-modules mรชme s'ils contiennent des "
 "modifications locales"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr "Dรฉsenregistrer tous les sous-modules"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Utilisez '--all' si vous voulez vraiment rรฉinitialiser tous les sous-modules"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Une alternative calculรฉe depuis l'alternative du super-projet est invalide.\n"
+"Pour permettre ร  Git de cloner sans alternative dans un tel cas, rรฉglez\n"
+"submodule.alternateErrorStrategy ร  'info', ou de maniรจre รฉquivalente,\n"
+"clonez avec '--reference-if-able' au lieu de '--reference'."
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "le sous-module '%s' ne peut pas ajouter d'alternativeย : %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
 msgstr "emplacement oรน le sous-module sera clonรฉ"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr "nom du nouveau sous-module"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr "URL depuis laquelle cloner le sous-module"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr "profondeur de l'historique des clones superficiels"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr "forcer l'affichage de la progression du clonage"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "interdire de cloner dans un rรฉpertoire non-vide"
+
+#: builtin/submodule--helper.c:1424
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
-"<dรฉpรดt>] [--name <nom>] [--depth <profondeur>]  --url <url> --path <chemin>"
+"<dรฉpรดt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
+"--path <chemin>"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+"refus de crรฉer/utiliser '%s' dans un rรฉpertoire git d'un autre sous-module"
+
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a รฉchouรฉ"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "le rรฉpertoire n'est pas vide : '%s'"
+
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "impossible de crรฉer le rรฉpertoire de sous-module pour '%s'"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "mode de mise ร  jour '%s' invalide pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1516
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Mode de mise ร  jour '%s'invalide configurรฉ pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Le chemin de sous-module '%s' n'est pas initialisรฉ"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Vous voudriez sรปrement utiliser 'update --init'ย ?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Sous-module non fusionnรฉ %s non traitรฉ"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Sous-module '%s' non traitรฉ"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Impossible de cloner '%s'. Rรฉessai prรฉvu"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr "chemin dans la copie de travail"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "chemin dans la copie de travail, traversant les frontiรจres de sous-modules"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr "valeurs possiblesย : rebase, merge, checkout ou none"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Crรฉer un clone superficiel tronquรฉ au nombre de rรฉvisions spรฉcifiรฉ"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr "jobs parallรจles"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "spรฉcifie si le clonage initial doit รชtre aussi superficiel"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr "ne pas afficher la progression du clonage"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr "valeur invalide pour la mise ร  jour du paramรจtre"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20283,51 +21461,51 @@ msgstr ""
 "la branche du sous-module %s est configurรฉe pour hรฉriter de la branche du "
 "superprojet, mais le superprojet n'est sur aucune branche"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2117
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "impossible de trouver une poignรฉe de dรฉpรดt pour le sous-module '%s'"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr "parcourir rรฉcursivement les sous-modules"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2156
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<options>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2212
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "vรฉrifier si รฉcrire dans le fichier .gitmodules est sur"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2215
 msgid "unset the config in the .gitmodules file"
 msgstr "dรฉsactiver la configuration dans le fichier .gitmodules"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2220
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config name [<valeur>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2221
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nom>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2222
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s ne gรจre pas --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2297
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -20585,214 +21763,218 @@ msgstr "l'รฉtiquette '%s' existe dรฉjร "
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "ร‰tiquette '%s' mise ร  jour (elle รฉtait sur %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "Dรฉpaquetage des objets"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "รฉchec de la crรฉation du rรฉpertoire %s"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "รฉchec de la crรฉation du fichier %s"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "รฉchec de la suppression du fichier %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "รฉchec de la suppression du rรฉpertoire %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Test du mtime dans '%s' "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "l'information de stat du rรฉpertoire ne change pas aprรจs ajout d'un fichier"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "l'information de stat du rรฉpertoire ne change pas aprรจs ajout d'un rรฉpertoire"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "l'information de stat du rรฉpertoire change aprรจs mise ร  jour d'un fichier"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "l'information de stat du rรฉpertoire change aprรจs l'ajout d'un fichier dans "
 "un sous-rรฉpertoire"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "l'information de stat du rรฉpertoire ne change pas aprรจs la suppression d'un "
 "fichier<"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "l'information de stat du rรฉpertoire ne change pas aprรจs la suppression d'un "
 "rรฉpertoire"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<options>] [--] [<fichier>...]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "continuer de rafraรฎchir mรชme si l'index a besoin d'une mise ร  jour"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "rafraรฎchir : ignorer les sous-modules"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "ne pas ignorer les nouveaux fichiers"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "laisser les fichiers remplacer des rรฉpertoires et vice-versa"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "aviser des fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "rafraรฎchir mรชme si l'index contient des รฉlรฉments non fusionnรฉs"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "rafraรฎchir l'information de stat"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>, <objet>, <chemin>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "ajouter l'รฉlรฉment spรฉcifiรฉ dans l'index"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "marquer les fichiers comme \"non changeants\""
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "mettre ร  zรฉro le bit supposรฉ-non-modifiรฉ"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "marquer les fichiers comme \"index seulement\""
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "mettre ร  zรฉro le bit sauter-la-copie-de travail"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "ne pas toucher aux entrรฉes restreintes ร  l'index"
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "ajouter seulement ร  l'index ; ne pas ajouter le contenu dans la base de "
 "donnรฉes des objets"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "supprimer les chemins nommรฉs mรชme s'ils sont prรฉsents dans la copie de "
 "travail"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "avec --stdin : les lignes en entrรฉe sont terminรฉes par des octets nuls"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "lire la liste des chemins ร  mettre ร  jour depuis l'entrรฉe standard"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "ajouter les รฉlรฉments depuis l'entrรฉe standard ร  l'index"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repeupler les รฉtapes nยฐ2 et nยฐ3 pour les chemins listรฉs"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "mettre ร  jour seulement les รฉlรฉments qui diffรจrent de HEAD"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignorer les fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "afficher les actions sur la sortie standard"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(pour porcelaines) oublier les conflits sauvรฉs et non rรฉsolus"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "รฉcrire l'index dans ce format"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "activer ou dรฉsactiver l'index divisรฉ"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "activer ou dรฉsactiver le cache de non-suivis"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "tester si le systรจme de fichier supporte le cache de non-suivis"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "activer le cache de non-suivis sans tester le systรจme de fichier"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "รฉcrire l'index mรชme s'il n'est pas marquรฉ comme modifiรฉ"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr ""
 "activer ou dรฉsactiver la surveillance du systรจme de fichier (fsmonitor)"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "marquer les fichiers comme valides pour fsmonitor"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "effacer le bit de validitรฉ fsmonitor"
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20800,7 +21982,7 @@ msgstr ""
 "core.splitIndex est rรฉglรฉ ร  falseย ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment activer l'index coupรฉ"
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20808,7 +21990,7 @@ msgstr ""
 "core.splitIndex est rรฉglรฉ ร  vraiย ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment dรฉsactiver l'index coupรฉ"
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -20816,11 +21998,11 @@ msgstr ""
 "core.untrackedCache est rรฉglรฉ ร  trueย ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment dรฉsactiver le cache des fichiers non-suivis"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Le cache non suivi est dรฉsactivรฉ"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -20828,29 +22010,29 @@ msgstr ""
 "core.untrackedCache est rรฉglรฉ ร  falseย ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment activer le cache des fichiers non-suivis"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Le cache non suivi est activรฉ pour '%s'"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor est rรฉglรฉ ร  falseย ; changez-le si vous souhaitez vraiment "
 "activer la surveillance du systรจme de fichiers"
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activรฉ"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor est rรฉglรฉ ร  trueย ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment dรฉsactiver la surveillance du systรจme de fichiers"
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor dรฉsactivรฉ"
 
@@ -20946,56 +22128,56 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <รฉtiquette>..."
 msgid "print tag contents"
 msgstr "afficher le contenu de l'รฉtiquette"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<options>] <chemin> [<commit>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<options>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<options>] <chemin>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<options>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<options>] <arbre-de-travail>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <chemin>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:891
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "รฉchec de la suppression de '%s'"
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Suppression de worktrees/%sย : rรฉpertoire invalide"
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Suppression de worktrees/%sย : le fichier gitdir n'existe pas"
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 "Suppression de worktrees/%sย : รฉchec de la lecture du fichier gitdir (%s)"
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -21004,37 +22186,37 @@ msgstr ""
 "Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets "
 "attendus, %<PRIuMAX> octets lus)"
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Suppression de worktrees/%sย : fichier gitdir invalide"
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Suppression de worktrees/%sย : le fichier gitdir point sur un endroit "
 "inexistant"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr "afficher les arbres de travail รฉliminรฉs"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr "faire expirer les arbres de travail plus vieux que <temps>"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existe dรฉjร "
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:244
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "impossible de rรฉ-ajouter l'arbre de travail '%s'"
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:249
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -21044,7 +22226,7 @@ msgstr ""
 "utilisez 'add -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' "
 "pour corriger"
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:251
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -21053,129 +22235,129 @@ msgstr ""
 "'%s' est un arbre de travail manquant mais dรฉjร  enregistrรฉย ;\n"
 "utilisez 'add -f' pour passer outre, ou 'prune' ou 'remove' pour corriger"
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossible de crรฉer le rรฉpertoire de '%s'"
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:432 builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Prรฉparation de l'arbre de travail (nouvelle branche '%s')"
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:434
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Prรฉparation de l'arbre de travail (rรฉinitialisation de la branche '%s'ย ; "
 "prรฉcรฉdemment sur %s)"
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:443
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Prรฉparation de l'arbre de travail (extraction de '%s')"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:449
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Prรฉparation de l'arbre de travail (HEAD dรฉtachรฉe %s)"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:490
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "extraire la <branche> mรชme si elle est dรฉjร  extraite dans une autre copie de "
 "travail"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:493
 msgid "create a new branch"
 msgstr "crรฉer une nouvelle branche"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:495
 msgid "create or reset a branch"
 msgstr "crรฉer ou rรฉinitialiser une branche"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:497
 msgid "populate the new working tree"
 msgstr "remplissage de la nouvelle copie de travail"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:498
 msgid "keep the new working tree locked"
 msgstr "conserver le verrou sur le nouvel arbre de travail"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:501
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "rรฉgler le mode de suivi (voir git-branch(1))"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:504
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "essayer de nommer la nouvelle branche comme la branche amont"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:512
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B et --detach sont mutuellement exclusifs"
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:573
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 "--[no-]track ne peut รชtre utilisรฉ qu'ร  la crรฉation d'une nouvelle branche"
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:673
 msgid "reason for locking"
 msgstr "raison du verrouillage"
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' n'est pas une copie de travail"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:687 builtin/worktree.c:720
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 "La copie de travail principale ne peut pas รชtre verrouillรฉe ou dรฉverrouillรฉe"
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:692
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' est dรฉjร  verrouillรฉ, car '%s'"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:694
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' est dรฉjร  verrouillรฉ"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:722
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' n'est pas verrouillรฉ"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:763
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "les arbres de travail contenant des sous-modules ne peuvent pas รชtre "
 "dรฉplacรฉs ou supprimรฉs"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:771
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "forcer le dรฉplacement mรชme si l'arbre de travail est sale ou verrouillรฉ"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:794 builtin/worktree.c:921
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' est un arbre de travail principal"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:799
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "impossible de trouver le nom de la destination ร  partir de '%s'"
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:805
 #, c-format
 msgid "target '%s' already exists"
 msgstr "la cible '%s' existe dรฉjร "
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:813
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -21185,7 +22367,7 @@ msgstr ""
 "verrouillageย : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou dรฉverrouiller avant"
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:815
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -21193,37 +22375,39 @@ msgstr ""
 "impossible de dรฉplacer un arbre de travail verrouillรฉ;\n"
 "utilisez 'move -f -f' pour outrepasser ou dรฉverrouiller avant"
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:818
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "la validation a รฉchouรฉ, impossible de dรฉplacer l'arbre de travailย : %s"
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:823
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "รฉchec au dรฉplacement de '%s' vers '%s'"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:871
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "รฉchec du lancement de 'git status' sur '%s'"
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:875
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
-msgstr "'%s' est sale, utilisez --force pour le supprimer"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"'%s' contient des fichiers modifiรฉs ou non-suivis, utilisez --force pour le "
+"supprimer"
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:880
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "impossible de lancer 'git status' sur '%s', code %d"
 
-#: builtin/worktree.c:911
+#: builtin/worktree.c:903
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "forcer la suppression mรชme si l'arbre de travail est sale ou verrouillรฉ"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:926
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -21233,7 +22417,7 @@ msgstr ""
 "verrouillageย : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou dรฉverrouiller avant"
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:928
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -21241,7 +22425,7 @@ msgstr ""
 "impossible de supprimer un arbre de travail verrouillรฉ;\n"
 "utilisez 'move -f -f' pour outrepasser ou dรฉverrouiller avant"
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:931
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
@@ -21263,6 +22447,22 @@ msgstr "รฉcrire l'objet arbre pour un sous-rรฉpertoire <prรฉfixe>"
 msgid "only useful for debugging"
 msgstr "seulement utile pour le dรฉbogage"
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "commande 'mark' attendue, %s trouvรฉ"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "commande 'to' attendue, %s trouvรฉ"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+"la fonctionnalitรฉ '%s' est interdite en entrรฉe sans --allow-unsafe-features"
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -21375,25 +22575,25 @@ msgstr ""
 "l'alias '%s' modifie les variables d'environnement.\n"
 "Vous pouvez utiliser '!git' dans l'alias pour le faire"
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr "alias vide pour %s"
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr "alias recursifย : %s"
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr "รฉchec d'รฉcriture sur la sortie standard"
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr "รฉchec inconnu d'รฉcriture sur la sortie standard"
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr "รฉchec de fermeture de la sortie standard"
 
@@ -21449,24 +22649,24 @@ msgstr "CURLSSLOPT_NO_REMOVE n'est pas supportรฉ avec cuRL < 7.44.0"
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Les restrictions de protocole ne sont pas supportรฉs avec cuRL < 7.19.4"
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Dorsale SSL '%s' non supportรฉe. Dorsales SSL supportรฉesย :"
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "Impossible de rรฉgler la dorsale SSL ร  '%s'ย : cURL a รฉtรฉ construit sans "
 "dorsale SSL"
 
-#: http.c:1096
+#: http.c:1097
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Impossible de spรฉcifier le dorsal SSL ร  '%s'ย : dรฉjร  spรฉcifiรฉ"
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21477,149 +22677,160 @@ msgstr ""
 "      demandรฉย : %s\n"
 "  redirectionย : %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "citation invalide dans la valeur push-optionย : '%s'"
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs n'est pas valide : est-ce bien un dรฉpรดt gitย ?"
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 msgid "invalid server response; expected service, got flush packet"
 msgstr "rรฉponse du serveur invalideย ; service attendu, paquet de vidage reรงu"
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "rรฉponse du serveur invalideย ; '%s' reรงu"
 
-#: remote-curl.c:446
+#: remote-curl.c:455
 #, c-format
 msgid "repository '%s' not found"
 msgstr "dรฉpรดt '%s' non trouvรฉ"
 
-#: remote-curl.c:450
+#: remote-curl.c:459
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "ร‰chec d'authentification pour '%s'"
 
-#: remote-curl.c:454
+#: remote-curl.c:463
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "impossible d'accรฉder ร  '%s'ย : %s"
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirection vers %s"
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF"
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "impossible de rembobiner le donnรฉes post rpc - essayer d'augmenter http."
 "postBuffer"
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, c-format
 msgid "RPC failed; %s"
 msgstr "รฉchec RPCย ; %s"
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 msgid "cannot handle pushes this big"
 msgstr "impossible de gรฉrer des poussรฉes aussi grosses"
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "impossible de compresser la requรชteย ; erreur de compression zlib %d"
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "impossible de compresser la requรชteย ; erreur de fin zlib %d"
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "le protocole http idiot ne supporte la capacitรฉ superficielle"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1038
 msgid "fetch failed."
 msgstr "รฉchec du rรฉcupรฉration."
 
-#: remote-curl.c:1076
+#: remote-curl.c:1086
 msgid "cannot fetch by sha1 over smart http"
 msgstr "impossible de rรฉcupรฉrer par sha1 sur http intelligent"
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1130 remote-curl.c:1136
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "erreur de protocoleย : sha/ref attendu, '%s' trouvรฉ"
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1148 remote-curl.c:1263
 #, c-format
 msgid "http transport does not support %s"
 msgstr "le transport http ne supporte pas %s"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1184
 msgid "git-http-push failed"
 msgstr "รฉchec de git-http-push"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1369
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
 
-#: remote-curl.c:1392
+#: remote-curl.c:1401
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curlย : erreur de lecture du flux de commande depuis git"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1408
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curlย : rรฉcupรฉration tentรฉe sans dรฉpรดt local"
 
-#: remote-curl.c:1439
+#: remote-curl.c:1448
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curlย : commande inconnue '%s' depuis git"
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr "args"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr "filtrage d'objet"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "date-d'expiration"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "sans action (rรฉtrocompatibilitรฉ)"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "รชtre plus verbeux"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "รชtre plus silencieux"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "comment รฉliminer les espaces et les commentaires # du message"
 
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "lire les spรฉcificateurs de fichier depuis fichier"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"avec --pathspec-from-file, les spรฉcificateurs de chemin sont sรฉparรฉs par un "
+"caractรจre NUL"
+
 #: ref-filter.h:101
 msgid "key"
 msgstr "clรฉ"
@@ -22148,166 +23359,174 @@ msgid "Common Git shell script setup code"
 msgstr "Le code d'initialisation commun aux scripts shell Git"
 
 #: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Initialiser et modifier l'extraction partielle"
+
+#: command-list.h:172
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Remiser les modifications d'un rรฉpertoire de travail sale"
 
-#: command-list.h:172
+#: command-list.h:173
 msgid "Add file contents to the staging area"
 msgstr "Ajouter le contenu de fichiers ร  l'index"
 
-#: command-list.h:173
+#: command-list.h:174
 msgid "Show the working tree status"
 msgstr "Afficher l'รฉtat de la copie de travail"
 
-#: command-list.h:174
+#: command-list.h:175
 msgid "Remove unnecessary whitespace"
 msgstr "Retirer les espaces inutiles"
 
-#: command-list.h:175
+#: command-list.h:176
 msgid "Initialize, update or inspect submodules"
 msgstr "Initialiser, mettre ร  jour et inspecter les sous-modules"
 
-#: command-list.h:176
+#: command-list.h:177
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Opรฉration Bidirectionnelles entre un dรฉpรดt Subversion et Git"
 
-#: command-list.h:177
+#: command-list.h:178
 msgid "Switch branches"
 msgstr "Basculer de branche"
 
-#: command-list.h:178
+#: command-list.h:179
 msgid "Read, modify and delete symbolic refs"
 msgstr "Lire, modifier et supprimer les rรฉfรฉrences symboliques"
 
-#: command-list.h:179
+#: command-list.h:180
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "Crรฉer, lister, supprimer ou vรฉrifier un objet d'รฉtiquette signรฉ avec GPG"
 
-#: command-list.h:180
+#: command-list.h:181
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crรฉer un fichier temporaire avec le contenu d'un blob"
 
-#: command-list.h:181
+#: command-list.h:182
 msgid "Unpack objects from a packed archive"
 msgstr "Dรฉpaqueter les objets depuis une archive empaquetรฉe"
 
-#: command-list.h:182
+#: command-list.h:183
 msgid "Register file contents in the working tree to the index"
 msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index"
 
-#: command-list.h:183
+#: command-list.h:184
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "Mettre ร  jour le nom d'objet stockรฉ dans une rรฉfรฉrence en toute sรฉcuritรฉ"
 
-#: command-list.h:184
+#: command-list.h:185
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Mettre ร  jour le fichier d'informations auxiliaires pour aider les serveurs "
 "idiots"
 
-#: command-list.h:185
+#: command-list.h:186
 msgid "Send archive back to git-archive"
 msgstr "Renvoyer une archive dans git-archive"
 
-#: command-list.h:186
+#: command-list.h:187
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Renvoyer des objets empaquetรฉs dans git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:188
 msgid "Show a Git logical variable"
 msgstr "Afficher un variable logique de Git"
 
-#: command-list.h:188
+#: command-list.h:189
 msgid "Check the GPG signature of commits"
 msgstr "Vรฉrifier la signature GPG de commits"
 
-#: command-list.h:189
+#: command-list.h:190
 msgid "Validate packed Git archive files"
 msgstr "Valider des fichiers d'archive Git empaquetรฉs"
 
-#: command-list.h:190
+#: command-list.h:191
 msgid "Check the GPG signature of tags"
 msgstr "Vรฉrifier la signature GPG d'รฉtiquettes"
 
-#: command-list.h:191
+#: command-list.h:192
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interface web de Git"
 
-#: command-list.h:192
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Afficher les journaux avec la diffรฉrence que chaque commit introduit"
 
-#: command-list.h:193
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Gรจre de arbres de travail multiples"
 
-#: command-list.h:194
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Crรฉer un objet arbre depuis l'index courant"
 
-#: command-list.h:195
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Dรฉfinition des attributs par chemin"
 
-#: command-list.h:196
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "interface en ligne de commande et conventions de Git"
 
-#: command-list.h:197
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Tutoriel du cล“ur de Git pour les dรฉveloppeurs"
 
-#: command-list.h:198
+#: command-list.h:199
 msgid "Git for CVS users"
 msgstr "Git pour les utilisateurs de CVS"
 
-#: command-list.h:199
+#: command-list.h:200
 msgid "Tweaking diff output"
 msgstr "Bidouillage de la sortie diff"
 
-#: command-list.h:200
+#: command-list.h:201
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours"
 
-#: command-list.h:201
+#: command-list.h:202
 msgid "A Git Glossary"
 msgstr "Un glossaire Git"
 
-#: command-list.h:202
+#: command-list.h:203
 msgid "Hooks used by Git"
 msgstr "Crochets utilisรฉs par Git"
 
-#: command-list.h:203
+#: command-list.h:204
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spรฉcifie les fichiers non-suivis ร  ignorer intentionnellement"
 
-#: command-list.h:204
+#: command-list.h:205
 msgid "Defining submodule properties"
 msgstr "Dรฉfinition des propriรฉtรฉs de sous-module"
 
-#: command-list.h:205
+#: command-list.h:206
 msgid "Git namespaces"
 msgstr "Espaces de nom de Git"
 
-#: command-list.h:206
+#: command-list.h:207
 msgid "Git Repository Layout"
 msgstr "Disposition d'un dรฉpรดt Git"
 
-#: command-list.h:207
+#: command-list.h:208
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spรฉcification des rรฉvisions et portรฉes pour Git"
 
-#: command-list.h:208
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "Montage d'un dรฉpรดt dans un autre dรฉpรดt"
+
+#: command-list.h:210
 msgid "A tutorial introduction to Git: part two"
 msgstr "Une introduction pratique ร  Gitย : deuxiรจme partie"
 
-#: command-list.h:209
+#: command-list.h:211
 msgid "A tutorial introduction to Git"
 msgstr "Une introduction pratique ร  Git"
 
-#: command-list.h:210
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr "Un aperรงu des flux de travail recommandรฉs avec Git"
 
@@ -22434,144 +23653,133 @@ msgstr "Essai de fusion simple avec $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "La fusion simple a รฉchouรฉ, essai avec la fusion automatique."
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Impossible de mettre ร  jour $ref_stash avec $w_commit"
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "erreurย : option inconnue pour 'stash push'ย : $option"
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Copie de travail et รฉtat de l'index sauvegardรฉs dans $stash_msg"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "option inconnueย : $opt"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Trop de rรฉvisions spรฉcifiรฉes : $REV"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference n'est pas une rรฉfรฉrence valide"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' n'est pas une validation de type remisage"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' n'est pas une rรฉfรฉrence de remisage"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "impossible de rafraรฎchir l'index"
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Impossible d'appliquer un remisage en cours de fusion"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr "Conflits dans l'index. Essayez sans --index."
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "Impossible de sauvegarder l'arbre d'index"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 "Impossible de restaurer les fichiers non-suivis depuis l'entrรฉe de remisage"
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "Impossible de dรฉsindexer les fichiers modifiรฉs"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} supprimรฉ ($s)"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Impossible de supprimer l'entrรฉe de stash"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Pour les restaurer tapez \"git stash apply\")"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:203
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Un chemin relatif ne peut รชtre utilisรฉ que depuis la racine de la copie de "
 "travail"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:213
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "L'URL de dรฉpรดt '$repo' doit รชtre absolu ou commencer par ./|../"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:232
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' existe dรฉjร  dans l'index"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:235
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' existe dรฉjร  dans l'index et n'est pas un sous-module"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:242
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "'$sm_path' n'a pas de commit extrait"
 
-#: git-submodule.sh:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"Le chemin suivant est ignorรฉ par un de vos fichiers .gitignore :\n"
-"$sm_path\n"
-"Utilisez -f si vous voulez vraiment l'ajouter."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:273
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Ajout du dรฉpรดt existant ร  '$sm_path' dans l'index"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:275
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' existe dรฉjร  et n'est pas un dรฉpรดt git valide"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:283
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Un rรฉpertoire git pour '$sm_name' est trouvรฉ en local avec le(s) serveur(s) "
 "distant(s) :"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:285
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22588,39 +23796,39 @@ msgstr ""
 "correct\n"
 "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:291
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Rรฉactivation du rรฉpertoire git local pour le sous-module '$sm_name'."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:303
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Impossible d'extraire le sous-module '$sm_path'"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:308
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "ร‰chec d'ajout du sous-module '$sm_path'"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:317
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "ร‰chec d'enregistrement du sous-module '$sm_path'"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Impossible de trouver la rรฉvision courante dans le chemin de sous-module "
 "'$displaypath'"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:600
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:605
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22629,7 +23837,7 @@ msgstr ""
 "Impossible de trouver la rรฉvision courante ${remote_name}/${branch} dans le "
 "chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22638,7 +23846,7 @@ msgstr ""
 "Impossible de rapatrier dans le chemin de sous-module '$displaypath'ย ; essai "
 "de rapatriement direct de $sha1ย :"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:629
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22647,76 +23855,76 @@ msgstr ""
 "Chemin de sous-module '$displaypath' rรฉcupรฉrรฉ, mais il ne contenait pas "
 "$sha1. La rรฉcupรฉration directe de ce commit a รฉchouรฉ."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:636
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:637
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : rebasรฉ dans '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : fusionnรฉ dans '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:653
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "L'exรฉcution de '$command $sha1' a รฉchouรฉ dans le chemin de sous-module "
 "'$displaypath'"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:654
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:685
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "ร‰chec de parcours dans le chemin du sous-module '$displaypath'"
 
-#: git-submodule.sh:830
+#: git-submodule.sh:896
 msgid "The --cached option cannot be used with the --files option"
 msgstr "L'option --cached ne peut pas รชtre utilisรฉe avec l'option --files"
 
-#: git-submodule.sh:882
+#: git-submodule.sh:948
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "mode $mod_dst inattendu"
 
-#: git-submodule.sh:902
+#: git-submodule.sh:968
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Attention : $display_name ne contient pas la validation $sha1_src"
 
-#: git-submodule.sh:905
+#: git-submodule.sh:971
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Attention : $display_name ne contient pas la validation $sha1_dst"
 
-#: git-submodule.sh:908
+#: git-submodule.sh:974
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
@@ -23038,6 +24246,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
 msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
 
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "Veuillez noter que les commits vides sont en commentaire"
+
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
 msgstr "Impossible d'initialiser les commits rรฉรฉcrits"
@@ -23110,81 +24322,19 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Impossible de dรฉterminer le chemin absolu du rรฉpertoire git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %s12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "indexรฉ"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "non-indexรฉ"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binaire"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "rien"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "inchangรฉ"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "%d chemin ajoutรฉ\n"
-msgstr[1] "%d chemins ajoutรฉs\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "%d chemin mis ร  jour\n"
-msgstr[1] "%d chemins mis ร  jour\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "%d chemin inversรฉ\n"
-msgstr[1] "%d chemins inversรฉs\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d chemin touchรฉ\n"
 msgstr[1] "%d chemins touchรฉs\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Mise ร  jour"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Inverser"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "noteย : %s n'est plus suivi ร  prรฉsent.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Ajouter un fichier non-suivi"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Aucun Fichier non suivi.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -23192,7 +24342,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section รฉditรฉe sera\n"
 "immรฉdiatement marquรฉe comme indexรฉe."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -23200,7 +24350,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section รฉditรฉe sera\n"
 "immรฉdiatement marquรฉe comme remisรฉe."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -23208,8 +24358,8 @@ msgstr ""
 "Si le patch s'applique proprement, la section รฉditรฉe sera\n"
 "immรฉdiatement marquรฉe comme desindexรฉe."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -23217,8 +24367,8 @@ msgstr ""
 "Si le patch s'applique proprement, la section รฉditรฉe sera\n"
 "immรฉdiatement marquรฉe comme appliquรฉe."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -23226,17 +24376,12 @@ msgstr ""
 "Si le patch s'applique proprement, la section รฉditรฉe sera\n"
 "immรฉdiatement marquรฉe comme รฉliminรฉe."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "impossible d'ouvrir le fichier d'รฉdition de section en รฉcritureย : %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-"Mode d'รฉdition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -23249,36 +24394,12 @@ msgstr ""
 "Pour รฉliminer les lignes '%s', effacez-les.\n"
 "Les lignes commenรงant par %s seront รฉliminรฉes.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"Si รงa ne s'applique pas proprement, vous aurez la possibilitรฉ de\n"
-"l'รฉditer ร  nouveau. Si toutes les lignes de la section sont supprimรฉes,\n"
-"alors l'รฉdition sera abandonnรฉe et la section conservรฉe.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "รฉchec de l'ouverture du fichier d'รฉdition de section en lectureย : %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Votre section รฉditรฉe ne s'applique pas. L'รฉditer ร  nouveau (\"no\" "
-"l'รฉlimineย !) [y|n]ย ? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23292,7 +24413,7 @@ msgstr ""
 "a - indexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas indexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23306,7 +24427,7 @@ msgstr ""
 "a - remiser cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas remiser cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23320,7 +24441,7 @@ msgstr ""
 "a - dรฉsindexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas dรฉsindexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23334,7 +24455,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23348,7 +24469,7 @@ msgstr ""
 "a - supprimer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas supprimer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23362,7 +24483,7 @@ msgstr ""
 "a - รฉliminer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas รฉliminer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23376,7 +24497,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23390,7 +24511,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23412,234 +24533,86 @@ msgstr ""
 "e - รฉditer manuellement la section actuelle\n"
 "? - afficher l'aide\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Les sections sรฉlectionnรฉes ne s'applique pas ร  l'indexย !\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Les appliquer quand mรชme ร  l'arbre de travailย ? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Rien n'a รฉtรฉ appliquรฉ.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "fichier non-fusionnรฉ ignorรฉย : %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Seuls des fichiers binaires ont changรฉ.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Aucune modification.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Mise ร  jour par patch"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Indexer le changement de mode [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Indexer la suppression [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Indexer cette section [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Remiser le changement de mode [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Remiser la suppression [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Remiser cette section [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Dรฉsindexer le changement de mode [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Dรฉsindexer la suppression [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Dรฉsindexer cette section [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "Appliquer le changement de mode ร  l'index [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Appliquer la suppression ร  l'index [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Appliquer cette section ร  l'index [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"
-"%s,?]ย ? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"
-"%s,?]ย ? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Appliquer la section ร  l'index et l'arbre de travail [y,n,q,a,d%s,?]ย ? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1468
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?]ย ? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1469
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?]ย ? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1470
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Appliquer la section ร  l'arbre de travail [y,n,q,a,d%s,?]ย ? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "Aucune autre section ร  atteindre\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "aller ร  quelle section (<ret> pour voir plus)ย ? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "aller ร  quelle sectionย ? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Nombre invalide : '%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Dรฉsolรฉ, %d seule section disponible.\n"
 msgstr[1] "Dรฉsolรฉ, Seulement %d sections disponibles.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "aucune autre section ร  rechercher\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "rechercher la regexย ? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regex de recherche malformรฉe %sย : %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
 msgstr "Aucune section ne correspond au motif donnรฉ\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "Pas de section prรฉcรฉdente\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "Pas de section suivante\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Dรฉsolรฉ, impossible de dรฉcouper cette section\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Dรฉcoupรฉe en %d section.\n"
 msgstr[1] "Dรฉcoupรฉe en %d sections.\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Dรฉsolรฉ, impossible d'รฉditer cette section\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Rรฉviser la diffรฉrence"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23657,19 +24630,19 @@ msgstr ""
 "diff          - visualiser les diff entre HEAD et l'index\n"
 "add untracked - ajouter les fichiers non-suivis aux modifications ร  indexer\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "-- manquant"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "mode de --patch inconnuย : %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument invalide %s, -- attendu"
diff --git a/third_party/git/po/git.pot b/third_party/git/po/git.pot
index d799696ad09a..7dd2e2bcf31c 100644
--- a/third_party/git/po/git.pot
+++ b/third_party/git/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,59 +18,665 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr ""
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr ""
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr ""
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr ""
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr ""
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr ""
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr ""
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr ""
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr ""
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr ""
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr ""
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr ""
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr ""
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr ""
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr ""
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr ""
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr ""
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr ""
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr ""
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr ""
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr ""
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr ""
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr ""
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr ""
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr ""
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr ""
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr ""
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr ""
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr ""
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr ""
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr ""
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr ""
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr ""
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr ""
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr ""
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr ""
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr ""
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr ""
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr ""
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr ""
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr ""
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr ""
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr ""
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr ""
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr ""
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr ""
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr ""
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr ""
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr ""
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr ""
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr ""
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr ""
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr ""
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr ""
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr ""
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr ""
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr ""
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] ""
+msgstr[1] ""
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr ""
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr ""
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr ""
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr ""
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr ""
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr ""
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr ""
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr ""
+
+#: advice.c:115
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr ""
 
-#: advice.c:162
+#: advice.c:168
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:164
+#: advice.c:170
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:166
+#: advice.c:172
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:168
+#: advice.c:174
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:170
+#: advice.c:176
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:172
+#: advice.c:178
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 
-#: advice.c:180
+#: advice.c:186
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
 msgstr ""
 
-#: advice.c:188
+#: advice.c:194
 msgid "Exiting because of an unresolved conflict."
 msgstr ""
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:199 builtin/merge.c:1335
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
-#: advice.c:195
+#: advice.c:201
 msgid "Please, commit your changes before merging."
 msgstr ""
 
-#: advice.c:196
+#: advice.c:202
 msgid "Exiting because of unfinished merge."
 msgstr ""
 
-#: advice.c:202
+#: advice.c:208
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -176,17 +782,7 @@ msgstr ""
 msgid "inconsistent header lines %d and %d"
 msgstr ""
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr ""
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr ""
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -197,527 +793,523 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr ""
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr ""
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr ""
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr ""
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr ""
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr ""
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr ""
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr ""
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr ""
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr ""
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr ""
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr ""
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr ""
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr ""
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 
-#: apply.c:3151
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 
-#: apply.c:3159
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr ""
 
-#: apply.c:3177
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 
-#: apply.c:3190
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr ""
 
-#: apply.c:3196
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 
-#: apply.c:3217
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr ""
 
-#: apply.c:3340
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr ""
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
 #, c-format
 msgid "failed to read %s"
 msgstr ""
 
-#: apply.c:3400
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr ""
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 
-#: apply.c:3559
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 
-#: apply.c:3562
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr ""
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr ""
 
-#: apply.c:3594
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr ""
 
-#: apply.c:3608
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr ""
 
-#: apply.c:3613
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr ""
 
-#: apply.c:3639
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr ""
 
-#: apply.c:3712
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr ""
 
-#: apply.c:3714
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr ""
 
-#: apply.c:3923
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 
-#: apply.c:3926
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 
-#: apply.c:3946
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
-#: apply.c:3951
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
-#: apply.c:3971
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr ""
 
-#: apply.c:3975
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 
-#: apply.c:3990
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr ""
 
-#: apply.c:4082
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 
-#: apply.c:4089
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr ""
 
-#: apply.c:4092
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr ""
-
-#: apply.c:4101
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr ""
 
-#: apply.c:4111
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr ""
 
-#: apply.c:4249
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 
-#: apply.c:4283
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr ""
 
-#: apply.c:4289
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 
-#: apply.c:4297
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr ""
 
-#: apply.c:4346
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr ""
 
-#: apply.c:4350
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr ""
 
-#: apply.c:4420
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr ""
 
-#: apply.c:4518
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr ""
 
-#: apply.c:4526
+#: apply.c:4539
 msgid "internal error"
 msgstr ""
 
-#: apply.c:4529
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4540
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
 #, c-format
 msgid "cannot open %s"
 msgstr ""
 
-#: apply.c:4562
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr ""
 
-#: apply.c:4566
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr ""
 
-#: apply.c:4676
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr ""
 
-#: apply.c:4684
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr ""
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr ""
 
-#: apply.c:4859
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr ""
 
-#: apply.c:4886
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4900
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr ""
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr ""
-
-#: apply.c:4944
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr ""
 
-#: apply.c:4947
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr ""
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4973 builtin/am.c:2260
 msgid "num"
 msgstr ""
 
-#: apply.c:4950
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 
-#: apply.c:4953
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr ""
 
-#: apply.c:4955
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 
-#: apply.c:4959
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 
-#: apply.c:4961
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 
-#: apply.c:4963
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 
-#: apply.c:4965
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "mark new files with `git add --intent-to-add`"
 msgstr ""
 
-#: apply.c:4969
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr ""
 
-#: apply.c:4971
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 
-#: apply.c:4974
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
-#: apply.c:4976
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr ""
 
-#: apply.c:4978
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr ""
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
 msgid "action"
 msgstr ""
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr ""
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "don't expect at least one line of context"
 msgstr ""
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
-#: apply.c:5000
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr ""
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr ""
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
-#: apply.c:5006
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5032 builtin/am.c:2248
 msgid "root"
 msgstr ""
 
-#: apply.c:5009
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr ""
 
@@ -738,7 +1330,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr ""
@@ -770,7 +1362,7 @@ msgstr ""
 msgid "archive format"
 msgstr ""
 
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr ""
 
@@ -778,11 +1370,12 @@ msgstr ""
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr ""
 
@@ -815,7 +1408,7 @@ msgid "list supported archive formats"
 msgstr ""
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr ""
 
@@ -823,7 +1416,7 @@ msgstr ""
 msgid "retrieve the archive from remote repository <repo>"
 msgstr ""
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr ""
@@ -854,66 +1447,66 @@ msgstr ""
 msgid "Argument not supported for format '%s': -%d"
 msgstr ""
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:351
 #, c-format
 msgid "cannot stream blob %s"
 msgstr ""
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:369
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr ""
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:359
 #, c-format
 msgid "cannot read %s"
 msgstr ""
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr ""
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr ""
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr ""
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr ""
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr ""
 
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
 #, c-format
 msgid "deflate error (%d)"
 msgstr ""
 
-#: archive-zip.c:609
+#: archive-zip.c:615
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr ""
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr ""
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr ""
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -929,33 +1522,33 @@ msgstr ""
 msgid "We cannot bisect more!\n"
 msgstr ""
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr ""
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -963,7 +1556,7 @@ msgid ""
 "Maybe you mistook %s and %s revs?\n"
 msgstr ""
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -971,43 +1564,43 @@ msgid ""
 "We continue anyway."
 msgstr ""
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr ""
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
 #, c-format
 msgid "could not create file '%s'"
 msgstr ""
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
 #, c-format
 msgid "could not read file '%s'"
 msgstr ""
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr ""
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr ""
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path parameters?\n"
 msgstr ""
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1017,44 +1610,44 @@ msgstr[1] ""
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr ""
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr ""
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr ""
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr ""
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr ""
@@ -1193,8 +1786,8 @@ msgstr ""
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
 #, c-format
 msgid "could not open '%s'"
 msgstr ""
@@ -1225,62 +1818,62 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr ""
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr ""
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr ""
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr ""
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr ""
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr ""
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr ""
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr ""
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr ""
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr ""
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1292,192 +1885,202 @@ msgid ""
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
-#: commit.c:1127
+#: commit.c:1153
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
-#: commit.c:1130
+#: commit.c:1157
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
-#: commit.c:1133
+#: commit.c:1160
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
-#: commit.c:1136
+#: commit.c:1163
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
-#: commit.c:1390
+#: commit.c:1417
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
 
-#: commit-graph.c:127
+#: commit-graph.c:122
 msgid "commit-graph file is too small"
 msgstr ""
 
-#: commit-graph.c:192
+#: commit-graph.c:189
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr ""
 
-#: commit-graph.c:199
+#: commit-graph.c:196
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr ""
 
-#: commit-graph.c:206
+#: commit-graph.c:203
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr ""
 
-#: commit-graph.c:229
+#: commit-graph.c:226
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr ""
 
-#: commit-graph.c:240
+#: commit-graph.c:237
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr ""
 
-#: commit-graph.c:283
+#: commit-graph.c:280
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr ""
 
-#: commit-graph.c:347
+#: commit-graph.c:343
 msgid "commit-graph has no base graphs chunk"
 msgstr ""
 
-#: commit-graph.c:357
+#: commit-graph.c:353
 msgid "commit-graph chain does not match"
 msgstr ""
 
-#: commit-graph.c:404
+#: commit-graph.c:401
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
 
-#: commit-graph.c:430
+#: commit-graph.c:425
 msgid "unable to find all commit-graph files"
 msgstr ""
 
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:558 commit-graph.c:618
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:575
+#: commit-graph.c:579
 #, c-format
 msgid "could not find commit %s"
 msgstr ""
 
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr ""
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
 #, c-format
 msgid "unable to get type of object %s"
 msgstr ""
 
-#: commit-graph.c:1034
+#: commit-graph.c:1043
 msgid "Loading known commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1051
+#: commit-graph.c:1060
 msgid "Expanding reachable commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1070
+#: commit-graph.c:1079
 msgid "Clearing commit marks in commit graph"
 msgstr ""
 
-#: commit-graph.c:1089
+#: commit-graph.c:1098
 msgid "Computing commit graph generation numbers"
 msgstr ""
 
-#: commit-graph.c:1163
+#: commit-graph.c:1173
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: commit-graph.c:1176
+#: commit-graph.c:1186
 #, c-format
 msgid "error adding pack %s"
 msgstr ""
 
-#: commit-graph.c:1180
+#: commit-graph.c:1190
 #, c-format
 msgid "error opening index for %s"
 msgstr ""
 
-#: commit-graph.c:1204
+#: commit-graph.c:1214
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: commit-graph.c:1238
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr ""
+
+#: commit-graph.c:1249
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 
-#: commit-graph.c:1253
+#: commit-graph.c:1264
 msgid "Counting distinct commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1284
+#: commit-graph.c:1294
 msgid "Finding extra edges in commit graph"
 msgstr ""
 
-#: commit-graph.c:1332
+#: commit-graph.c:1340
 msgid "failed to write correct number of base graph ids"
 msgstr ""
 
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1373 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr ""
 
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr ""
 
-#: commit-graph.c:1437
+#: commit-graph.c:1445
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: commit-graph.c:1478
+#: commit-graph.c:1486
 msgid "unable to open commit-graph chain file"
 msgstr ""
 
-#: commit-graph.c:1490
+#: commit-graph.c:1498
 msgid "failed to rename base commit-graph file"
 msgstr ""
 
-#: commit-graph.c:1510
+#: commit-graph.c:1518
 msgid "failed to rename temporary commit-graph file"
 msgstr ""
 
-#: commit-graph.c:1621
+#: commit-graph.c:1631
 msgid "Scanning merged commits"
 msgstr ""
 
-#: commit-graph.c:1632
+#: commit-graph.c:1642
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr ""
 
-#: commit-graph.c:1657
+#: commit-graph.c:1665
 msgid "Merging commit-graph"
 msgstr ""
 
@@ -1490,21 +2093,21 @@ msgstr ""
 msgid "too many commits to write graph"
 msgstr ""
 
-#: commit-graph.c:1945
+#: commit-graph.c:1944
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:1955
+#: commit-graph.c:1954
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1964 commit-graph.c:1979
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 
-#: commit-graph.c:1972
+#: commit-graph.c:1971
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr ""
@@ -1513,49 +2116,49 @@ msgstr ""
 msgid "Verifying commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:2002
+#: commit-graph.c:2003
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 
-#: commit-graph.c:2009
+#: commit-graph.c:2010
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2019
+#: commit-graph.c:2020
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 
-#: commit-graph.c:2028
+#: commit-graph.c:2029
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2041
+#: commit-graph.c:2042
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 
-#: commit-graph.c:2046
+#: commit-graph.c:2047
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2050
+#: commit-graph.c:2051
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2065
+#: commit-graph.c:2066
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr ""
 
-#: commit-graph.c:2071
+#: commit-graph.c:2072
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
@@ -1597,7 +2200,7 @@ msgstr ""
 msgid "key does not contain variable name: %s"
 msgstr ""
 
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2444
 #, c-format
 msgid "invalid key: %s"
 msgstr ""
@@ -1733,7 +2336,7 @@ msgstr ""
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1518 builtin/pack-objects.c:3541
 #, c-format
 msgid "bad pack compression level %d"
 msgstr ""
@@ -1758,110 +2361,105 @@ msgstr ""
 msgid "failed to parse %s"
 msgstr ""
 
-#: config.c:1745
+#: config.c:1743
 msgid "unable to parse command-line config"
 msgstr ""
 
-#: config.c:2094
+#: config.c:2097
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 
-#: config.c:2264
+#: config.c:2267
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr ""
 
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-
-#: config.c:2333
+#: config.c:2312
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
-#: config.c:2379
+#: config.c:2358
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 
-#: config.c:2381
+#: config.c:2360
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 
-#: config.c:2462
+#: config.c:2441
 #, c-format
 msgid "invalid section name '%s'"
 msgstr ""
 
-#: config.c:2494
+#: config.c:2473
 #, c-format
 msgid "%s has multiple values"
 msgstr ""
 
-#: config.c:2523
+#: config.c:2502
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr ""
 
-#: config.c:2775 config.c:3099
+#: config.c:2754 config.c:3078
 #, c-format
 msgid "could not lock config file %s"
 msgstr ""
 
-#: config.c:2786
+#: config.c:2765
 #, c-format
 msgid "opening %s"
 msgstr ""
 
-#: config.c:2821 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
 #, c-format
 msgid "invalid pattern: %s"
 msgstr ""
 
-#: config.c:2846
+#: config.c:2825
 #, c-format
 msgid "invalid config file %s"
 msgstr ""
 
-#: config.c:2859 config.c:3112
+#: config.c:2838 config.c:3091
 #, c-format
 msgid "fstat on %s failed"
 msgstr ""
 
-#: config.c:2870
+#: config.c:2849
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr ""
 
-#: config.c:2879 config.c:3117
+#: config.c:2858 config.c:3096
 #, c-format
 msgid "chmod on %s failed"
 msgstr ""
 
-#: config.c:2964 config.c:3214
+#: config.c:2943 config.c:3193
 #, c-format
 msgid "could not write config file %s"
 msgstr ""
 
-#: config.c:2998
+#: config.c:2977
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr ""
 
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr ""
 
-#: config.c:3090
+#: config.c:3069
 #, c-format
 msgid "invalid section name: %s"
 msgstr ""
 
-#: config.c:3257
+#: config.c:3236
 #, c-format
 msgid "missing value for '%s'"
 msgstr ""
@@ -1977,7 +2575,7 @@ msgstr ""
 msgid "unknown port %s"
 msgstr ""
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr ""
@@ -1992,86 +2590,86 @@ msgstr ""
 msgid "cannot start proxy %s"
 msgstr ""
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr ""
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr ""
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr ""
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr ""
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr ""
 
-#: connected.c:98
+#: connected.c:110
 msgid "Could not run 'git rev-list'"
 msgstr ""
 
-#: connected.c:118
+#: connected.c:130
 msgid "failed write to rev-list"
 msgstr ""
 
-#: connected.c:125
+#: connected.c:137
 msgid "failed to close rev-list's stdin"
 msgstr ""
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr ""
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr ""
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory"
 msgstr ""
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr ""
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory"
 msgstr ""
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr ""
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
 
 #: convert.c:304
@@ -2086,117 +2684,117 @@ msgid ""
 "%sLE (depending on the byte order) as working-tree-encoding."
 msgstr ""
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr ""
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr ""
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr ""
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr ""
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr ""
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr ""
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr ""
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr ""
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr ""
 
-#: convert.c:1476
+#: convert.c:1489
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr ""
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr ""
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2204,14 +2802,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2247,7 +2845,7 @@ msgstr ""
 msgid "failed to read orderfile '%s'"
 msgstr ""
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr ""
 
@@ -2302,562 +2900,581 @@ msgid ""
 "%s"
 msgstr ""
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr ""
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr ""
 
-#: diff.c:4689
+#: diff.c:4676
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr ""
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr ""
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr ""
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr ""
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr ""
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr ""
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr ""
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr ""
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr ""
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr ""
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr ""
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr ""
 
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr ""
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr ""
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr ""
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr ""
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr ""
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr ""
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr ""
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr ""
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr ""
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr ""
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr ""
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr ""
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr ""
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr ""
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr ""
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr ""
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr ""
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr ""
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr ""
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr ""
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr ""
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr ""
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr ""
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr ""
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr ""
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr ""
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr ""
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr ""
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr ""
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr ""
 
-#: diff.c:5371
+#: diff.c:5358
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr ""
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr ""
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr ""
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr ""
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr ""
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr ""
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr ""
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr ""
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr ""
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr ""
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
 msgstr ""
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr ""
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr ""
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr ""
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr ""
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr ""
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr ""
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr ""
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr ""
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr ""
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr ""
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr ""
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr ""
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr ""
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr ""
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr ""
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr ""
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr ""
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
 msgstr ""
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 
-#: diff.c:5469
+#: diff.c:5456
 msgid "Other diff options"
 msgstr ""
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr ""
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
 msgstr ""
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr ""
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr ""
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr ""
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr ""
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr ""
 
-#: diff.c:5496
+#: diff.c:5483
 msgid "hide 'git add -N' entries from the index"
 msgstr ""
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr ""
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr ""
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
 
-#: diff.c:5508
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
 msgstr ""
 
-#: diff.c:5511
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 
-#: diff.c:5514
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
 msgstr ""
 
-#: diff.c:5515
+#: diff.c:5502
 msgid "<object-id>"
 msgstr ""
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr ""
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
 msgstr ""
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr ""
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr ""
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 
-#: dir.c:537
+#: dir.c:555
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 
-#: dir.c:926
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr ""
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr ""
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr ""
+
+#: dir.c:1173
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr ""
 
-#: dir.c:1843
+#: dir.c:2144
 #, c-format
 msgid "could not open directory '%s'"
 msgstr ""
 
-#: dir.c:2085
+#: dir.c:2479
 msgid "failed to get kernel name and information"
 msgstr ""
 
-#: dir.c:2209
+#: dir.c:2603
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 
-#: dir.c:3013
+#: dir.c:3407
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3452 dir.c:3457
 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 
-#: dir.c:3092
+#: dir.c:3486
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
@@ -2876,12 +3493,12 @@ msgstr ""
 msgid "could not stat file '%s'"
 msgstr ""
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr ""
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr ""
@@ -2891,265 +3508,267 @@ msgstr ""
 msgid "too many args to run %s"
 msgstr ""
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr ""
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr ""
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr ""
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr ""
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr ""
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr ""
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr ""
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr ""
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr ""
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr ""
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr ""
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr ""
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr ""
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr ""
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr ""
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr ""
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr ""
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr ""
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr ""
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr ""
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr ""
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr ""
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr ""
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr ""
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr ""
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr ""
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr ""
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr ""
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr ""
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1252
+#: fetch-pack.c:1308
 #, c-format
 msgid "error processing acks: %d"
 msgstr ""
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr ""
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr ""
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr ""
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:689
 msgid "remote did not send all necessary objects"
 msgstr ""
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr ""
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
 
-#: gpg-interface.c:321
+#: gpg-interface.c:408
 msgid "gpg failed to sign the data"
 msgstr ""
 
-#: gpg-interface.c:347
+#: gpg-interface.c:434
 msgid "could not create temporary file"
 msgstr ""
 
-#: gpg-interface.c:350
+#: gpg-interface.c:437
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr ""
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr ""
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr ""
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr ""
 
-#: grep.c:2145
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr ""
@@ -3199,7 +3818,7 @@ msgid "Low-level Commands / Interrogators"
 msgstr ""
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr ""
 
 #: help.c:38
@@ -3285,12 +3904,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr ""
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr ""
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3343,45 +3962,60 @@ msgstr ""
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:635
 #, c-format
 msgid "invalid date format: %s"
 msgstr ""
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr ""
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr ""
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr ""
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr ""
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
 msgstr ""
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr ""
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr ""
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr ""
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr ""
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
 msgstr ""
 
 #: lockfile.c:151
@@ -3405,114 +4039,110 @@ msgstr ""
 msgid "failed to read the cache"
 msgstr ""
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr ""
 
-#: merge-recursive.c:322
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr ""
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr ""
-
-#: merge-recursive.c:863
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr ""
 
-#: merge-recursive.c:874
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr ""
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr ""
 
-#: merge-recursive.c:897
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:941
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:965
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:976
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:981
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr ""
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr ""
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr ""
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr ""
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr ""
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3523,108 +4153,108 @@ msgid ""
 "which will accept this suggestion.\n"
 msgstr ""
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr ""
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr ""
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr ""
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr ""
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr ""
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr ""
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree at %s."
 msgstr ""
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr ""
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr ""
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr ""
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr ""
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1793
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3632,323 +4262,339 @@ msgid ""
 "getting a majority of the files."
 msgstr ""
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
 "implicit directory rename(s) putting the following path(s) there: %s."
 msgstr ""
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
 "implicit directory renames tried to put these paths there: %s"
 msgstr ""
 
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
 ">%s in %s"
 msgstr ""
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr ""
 
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
 #, c-format
 msgid "cannot read object %s"
 msgstr ""
 
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
 #, c-format
 msgid "object %s is not a blob"
 msgstr ""
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modify"
 msgstr ""
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modified"
 msgstr ""
 
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
 msgid "content"
 msgstr ""
 
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
 msgid "add/add"
 msgstr ""
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr ""
 
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:1003
 msgid "submodule"
 msgstr ""
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
 #, c-format
 msgid "Adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
 "moving it to %s."
 msgstr ""
 
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
 "in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
 "%s; moving it to %s."
 msgstr ""
 
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
 "was renamed in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
 msgid "file/directory"
 msgstr ""
 
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
 msgid "directory/file"
 msgstr ""
 
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 
-#: merge-recursive.c:3347
+#: merge-recursive.c:3371
 #, c-format
 msgid "Adding %s"
 msgstr ""
 
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr ""
 
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
 msgid "Already up to date!"
 msgstr ""
 
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr ""
 
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
 msgid "Merging:"
 msgstr ""
 
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
 msgid "merge returned no commit"
 msgstr ""
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+
+#: merge-recursive.c:3756
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
 msgid "Unable to write index."
 msgstr ""
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr ""
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr ""
 
-#: midx.c:95
+#: midx.c:94
 #, c-format
 msgid "hash version %u does not match"
 msgstr ""
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr ""
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr ""
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr ""
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr ""
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr ""
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr ""
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr ""
 
-#: midx.c:470
+#: midx.c:472
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr ""
 
-#: midx.c:476
+#: midx.c:478
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr ""
 
-#: midx.c:536
+#: midx.c:538
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr ""
 
-#: midx.c:865
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr ""
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr ""
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr ""
+
+#: midx.c:1052
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr ""
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr ""
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
 msgstr ""
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr ""
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr ""
 
-#: midx.c:1160
+#: midx.c:1180
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr ""
 
-#: midx.c:1166
+#: midx.c:1186
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr ""
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr ""
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr ""
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr ""
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr ""
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr ""
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr ""
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr ""
@@ -3989,32 +4635,32 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr ""
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr ""
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr ""
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr ""
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr ""
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr ""
 
-#: packfile.c:648
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
@@ -4028,6 +4674,11 @@ msgstr ""
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4043,7 +4694,7 @@ msgstr ""
 msgid "%s : incompatible with something else"
 msgstr ""
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr ""
@@ -4053,41 +4704,41 @@ msgstr ""
 msgid "%s isn't available"
 msgstr ""
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr ""
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr ""
 
-#: parse-options.c:859
+#: parse-options.c:857
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: parse-options.c:861
+#: parse-options.c:859
 #, c-format
 msgid "unknown switch `%c'"
 msgstr ""
 
-#: parse-options.c:863
+#: parse-options.c:861
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr ""
 
-#: parse-options.c:887
+#: parse-options.c:885
 msgid "..."
 msgstr ""
 
-#: parse-options.c:906
+#: parse-options.c:904
 #, c-format
 msgid "usage: %s"
 msgstr ""
@@ -4095,21 +4746,21 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:910
 #, c-format
 msgid "   or: %s"
 msgstr ""
 
-#: parse-options.c:915
+#: parse-options.c:913
 #, c-format
 msgid "    %s"
 msgstr ""
 
-#: parse-options.c:954
+#: parse-options.c:952
 msgid "-NUM"
 msgstr ""
 
-#: parse-options.c:968
+#: parse-options.c:966
 #, c-format
 msgid "alias of --%s"
 msgstr ""
@@ -4134,82 +4785,87 @@ msgstr ""
 msgid "malformed object name '%s'"
 msgstr ""
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr ""
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr ""
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr ""
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr ""
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr ""
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr ""
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr ""
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr ""
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr ""
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
-msgid "%s: '%s' is outside repository"
+msgid "%s: '%s' is outside repository at '%s'"
 msgstr ""
 
-#: pathspec.c:514
+#: pathspec.c:517
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr ""
 
-#: pathspec.c:524
+#: pathspec.c:527
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 
-#: pathspec.c:591
+#: pathspec.c:594
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr ""
 
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr ""
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr ""
@@ -4270,33 +4926,42 @@ msgstr ""
 msgid "unable to create threaded lstat: %s"
 msgstr ""
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr ""
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr ""
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr ""
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr ""
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr ""
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5020
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr ""
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr ""
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr ""
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr ""
@@ -4335,172 +5000,180 @@ msgstr ""
 msgid "unable to stat '%s'"
 msgstr ""
 
-#: read-cache.c:1314
+#: read-cache.c:1330
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr ""
 
-#: read-cache.c:1499
+#: read-cache.c:1536
 msgid "Refresh index"
 msgstr ""
 
-#: read-cache.c:1613
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1623
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1679
+#: read-cache.c:1717
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr ""
 
-#: read-cache.c:1682
+#: read-cache.c:1720
 #, c-format
 msgid "bad index version %d"
 msgstr ""
 
-#: read-cache.c:1691
+#: read-cache.c:1729
 msgid "bad index file sha1 signature"
 msgstr ""
 
-#: read-cache.c:1721
+#: read-cache.c:1759
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 
-#: read-cache.c:1723
+#: read-cache.c:1761
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr ""
 
-#: read-cache.c:1760
+#: read-cache.c:1798
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr ""
 
-#: read-cache.c:1776
+#: read-cache.c:1814
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
-#: read-cache.c:1833
+#: read-cache.c:1871
 msgid "unordered stage entries in index"
 msgstr ""
 
-#: read-cache.c:1836
+#: read-cache.c:1874
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr ""
 
-#: read-cache.c:1839
+#: read-cache.c:1877
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr ""
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr ""
 
-#: read-cache.c:2087
+#: read-cache.c:2124
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2100
+#: read-cache.c:2137
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2133
+#: read-cache.c:2170
 #, c-format
 msgid "%s: index file open failed"
 msgstr ""
 
-#: read-cache.c:2137
+#: read-cache.c:2174
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr ""
 
-#: read-cache.c:2141
+#: read-cache.c:2178
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr ""
 
-#: read-cache.c:2145
+#: read-cache.c:2182
 #, c-format
 msgid "%s: unable to map index file"
 msgstr ""
 
-#: read-cache.c:2187
+#: read-cache.c:2224
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2214
+#: read-cache.c:2251
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2246
+#: read-cache.c:2283
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr ""
 
-#: read-cache.c:2293
+#: read-cache.c:2330
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr ""
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
 #, c-format
 msgid "could not close '%s'"
 msgstr ""
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
 #, c-format
 msgid "could not stat '%s'"
 msgstr ""
 
-#: read-cache.c:3105
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
-#: read-cache.c:3117
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
 
-#: read-cache.c:3142
+#: read-cache.c:3179
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr ""
 
-#: read-cache.c:3291
+#: read-cache.c:3328
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr ""
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4522,26 +5195,26 @@ msgid ""
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4550,36 +5223,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr ""
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
 #, c-format
 msgid "could not write '%s'"
 msgstr ""
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
 #, c-format
-msgid "could not copy '%s' to '%s'."
+msgid "could not write '%s'."
 msgstr ""
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4590,6 +5260,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
+
 #: refs.c:262
 #, c-format
 msgid "%s does not point to a valid object!"
@@ -4600,7 +5277,7 @@ msgstr ""
 msgid "ignoring dangling symref %s"
 msgstr ""
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
@@ -4625,14 +5302,15 @@ msgstr ""
 msgid "unexpected object ID when writing '%s'"
 msgstr ""
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr ""
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr ""
@@ -4667,37 +5345,37 @@ msgstr ""
 msgid "update_ref failed for ref '%s': %s"
 msgstr ""
 
-#: refs.c:2012
+#: refs.c:2023
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr ""
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr ""
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr ""
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr ""
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
@@ -4707,7 +5385,7 @@ msgstr ""
 msgid "invalid refspec '%s'"
 msgstr ""
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr ""
 
@@ -4726,280 +5404,280 @@ msgstr ""
 msgid "ahead %d, behind %d"
 msgstr ""
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr ""
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr ""
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:269
+#: ref-filter.c:272
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr ""
 
-#: ref-filter.c:277
+#: ref-filter.c:280
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr ""
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr ""
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr ""
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr ""
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr ""
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr ""
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr ""
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr ""
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr ""
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr ""
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr ""
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr ""
 
-#: ref-filter.c:1485
+#: ref-filter.c:1488
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr ""
 
-#: ref-filter.c:1488
+#: ref-filter.c:1491
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr ""
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr ""
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr ""
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr ""
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr ""
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr ""
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr ""
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr ""
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 
-#: remote.c:410
+#: remote.c:414
 msgid "more than one receivepack given, using the first"
 msgstr ""
 
-#: remote.c:418
+#: remote.c:422
 msgid "more than one uploadpack given, using the first"
 msgstr ""
 
-#: remote.c:608
+#: remote.c:612
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 
-#: remote.c:612
+#: remote.c:616
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 
-#: remote.c:616
+#: remote.c:620
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 
-#: remote.c:684
+#: remote.c:688
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr ""
 
-#: remote.c:694
+#: remote.c:698
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr ""
 
-#: remote.c:1000
+#: remote.c:1004
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr ""
 
-#: remote.c:1005
+#: remote.c:1009
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -5008,7 +5686,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1024
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5022,7 +5700,7 @@ msgid ""
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
 
-#: remote.c:1040
+#: remote.c:1044
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5030,7 +5708,7 @@ msgid ""
 "'%s:refs/heads/%s'?"
 msgstr ""
 
-#: remote.c:1045
+#: remote.c:1049
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5038,7 +5716,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1050
+#: remote.c:1054
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5046,7 +5724,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1055
+#: remote.c:1059
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5054,114 +5732,114 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1091
+#: remote.c:1095
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr ""
 
-#: remote.c:1102
+#: remote.c:1106
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr ""
 
-#: remote.c:1114
+#: remote.c:1118
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 
-#: remote.c:1121
+#: remote.c:1125
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1628 remote.c:1729
 msgid "HEAD does not point to a branch"
 msgstr ""
 
-#: remote.c:1633
+#: remote.c:1637
 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 
-#: remote.c:1636
+#: remote.c:1640
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 
-#: remote.c:1642
+#: remote.c:1646
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 
-#: remote.c:1657
+#: remote.c:1661
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 
-#: remote.c:1669
+#: remote.c:1673
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
-#: remote.c:1679
+#: remote.c:1683
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 
-#: remote.c:1692
+#: remote.c:1696
 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
-#: remote.c:1714
+#: remote.c:1718
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
-#: remote.c:1840
+#: remote.c:1844
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr ""
 
-#: remote.c:1853
+#: remote.c:1857
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr ""
 
-#: remote.c:2016
+#: remote.c:2020
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 
-#: remote.c:2020
+#: remote.c:2024
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 
-#: remote.c:2023
+#: remote.c:2027
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr ""
 
-#: remote.c:2027
+#: remote.c:2031
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr ""
 
-#: remote.c:2030
+#: remote.c:2034
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 
-#: remote.c:2034
+#: remote.c:2038
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2040
+#: remote.c:2044
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 
-#: remote.c:2043
+#: remote.c:2047
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5169,11 +5847,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2051
+#: remote.c:2055
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 
-#: remote.c:2054
+#: remote.c:2058
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5184,11 +5862,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2064
+#: remote.c:2068
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 
-#: remote.c:2247
+#: remote.c:2251
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr ""
@@ -5203,7 +5881,7 @@ msgstr ""
 msgid "duplicate replace ref: %s"
 msgstr ""
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr ""
@@ -5266,8 +5944,8 @@ msgstr ""
 msgid "Recorded preimage for '%s'"
 msgstr ""
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr ""
@@ -5301,20 +5979,20 @@ msgstr ""
 msgid "unable to open rr-cache directory"
 msgstr ""
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr ""
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 
@@ -5334,196 +6012,191 @@ msgid ""
 "You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr ""
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr ""
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr ""
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr ""
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr ""
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr ""
 
-#: sequencer.c:187
+#: sequencer.c:191
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 
-#: sequencer.c:292
+#: sequencer.c:296
 #, c-format
 msgid "could not delete '%s'"
 msgstr ""
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr ""
 
-#: sequencer.c:321
+#: sequencer.c:325
 msgid "revert"
 msgstr ""
 
-#: sequencer.c:323
+#: sequencer.c:327
 msgid "cherry-pick"
 msgstr ""
 
-#: sequencer.c:325
-msgid "rebase -i"
+#: sequencer.c:329
+msgid "rebase"
 msgstr ""
 
-#: sequencer.c:327
+#: sequencer.c:331
 #, c-format
 msgid "unknown action: %d"
 msgstr ""
 
-#: sequencer.c:385
+#: sequencer.c:389
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 
-#: sequencer.c:388
+#: sequencer.c:392
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 "and commit the result with 'git commit'"
 msgstr ""
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:405 sequencer.c:2901
 #, c-format
 msgid "could not lock '%s'"
 msgstr ""
 
-#: sequencer.c:408
+#: sequencer.c:412
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr ""
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr ""
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
 #, c-format
 msgid "could not read '%s'"
 msgstr ""
 
-#: sequencer.c:462
+#: sequencer.c:466
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr ""
 
-#: sequencer.c:466
+#: sequencer.c:470
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 
-#: sequencer.c:498
+#: sequencer.c:502
 #, c-format
 msgid "%s: fast-forward"
 msgstr ""
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:635
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:649
+#: sequencer.c:652
 msgid "unable to update cache tree"
 msgstr ""
 
-#: sequencer.c:663
+#: sequencer.c:666
 msgid "could not resolve HEAD commit"
 msgstr ""
 
-#: sequencer.c:743
+#: sequencer.c:746
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr ""
 
-#: sequencer.c:754
+#: sequencer.c:757
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr ""
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr ""
 
-#: sequencer.c:801
+#: sequencer.c:804
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr ""
 
-#: sequencer.c:806
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr ""
 
-#: sequencer.c:811
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr ""
 
-#: sequencer.c:815
+#: sequencer.c:818
 #, c-format
 msgid "unknown variable '%s'"
 msgstr ""
 
-#: sequencer.c:820
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr ""
 
-#: sequencer.c:822
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr ""
 
-#: sequencer.c:824
+#: sequencer.c:827
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr ""
 
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr ""
-
-#: sequencer.c:901
+#: sequencer.c:876
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5540,15 +6213,11 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr ""
-
-#: sequencer.c:1216
+#: sequencer.c:1148
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 
-#: sequencer.c:1223
+#: sequencer.c:1154
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5563,7 +6232,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
-#: sequencer.c:1236
+#: sequencer.c:1167
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5577,346 +6246,345 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
-#: sequencer.c:1278
+#: sequencer.c:1209
 msgid "couldn't look up newly created commit"
 msgstr ""
 
-#: sequencer.c:1280
+#: sequencer.c:1211
 msgid "could not parse newly created commit"
 msgstr ""
 
-#: sequencer.c:1326
+#: sequencer.c:1257
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 
-#: sequencer.c:1328
+#: sequencer.c:1259
 msgid "detached HEAD"
 msgstr ""
 
-#: sequencer.c:1332
+#: sequencer.c:1263
 msgid " (root-commit)"
 msgstr ""
 
-#: sequencer.c:1353
+#: sequencer.c:1284
 msgid "could not parse HEAD"
 msgstr ""
 
-#: sequencer.c:1355
+#: sequencer.c:1286
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr ""
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
 msgid "could not parse HEAD commit"
 msgstr ""
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1342 sequencer.c:1968
 msgid "unable to parse commit author"
 msgstr ""
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
 msgid "git write-tree failed to write a tree"
 msgstr ""
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1386 sequencer.c:1447
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
 msgid "failed to write commit object"
 msgstr ""
 
-#: sequencer.c:1526
+#: sequencer.c:1474
 #, c-format
 msgid "could not parse commit %s"
 msgstr ""
 
-#: sequencer.c:1531
+#: sequencer.c:1479
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1562 sequencer.c:1673
 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1620 sequencer.c:1645
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 
-#: sequencer.c:1672
+#: sequencer.c:1630
 msgid "need a HEAD to fixup"
 msgstr ""
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1632 sequencer.c:3212
 msgid "could not read HEAD"
 msgstr ""
 
-#: sequencer.c:1676
+#: sequencer.c:1634
 msgid "could not read HEAD's commit message"
 msgstr ""
 
-#: sequencer.c:1682
+#: sequencer.c:1640
 #, c-format
 msgid "cannot write '%s'"
 msgstr ""
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr ""
 
-#: sequencer.c:1697
+#: sequencer.c:1655
 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 
-#: sequencer.c:1704
+#: sequencer.c:1662
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 
-#: sequencer.c:1710
+#: sequencer.c:1668
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 
-#: sequencer.c:1798
+#: sequencer.c:1756
 msgid "your index file is unmerged."
 msgstr ""
 
-#: sequencer.c:1805
+#: sequencer.c:1763
 msgid "cannot fixup root commit"
 msgstr ""
 
-#: sequencer.c:1824
+#: sequencer.c:1782
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr ""
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1790 sequencer.c:1798
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 
-#: sequencer.c:1846
+#: sequencer.c:1804
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr ""
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1823
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:1930
+#: sequencer.c:1888
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:1985
+#: sequencer.c:1943
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
-#: sequencer.c:1986
+#: sequencer.c:1944
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
-#: sequencer.c:2045
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr ""
+
+#: sequencer.c:2018
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
-#: sequencer.c:2052
+#: sequencer.c:2025
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
-#: sequencer.c:2128
+#: sequencer.c:2102
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 
-#: sequencer.c:2137
+#: sequencer.c:2111
 #, c-format
 msgid "missing arguments for %s"
 msgstr ""
 
-#: sequencer.c:2174
+#: sequencer.c:2142
 #, c-format
-msgid "could not parse '%.*s'"
+msgid "could not parse '%s'"
 msgstr ""
 
-#: sequencer.c:2228
+#: sequencer.c:2203
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 
-#: sequencer.c:2239
+#: sequencer.c:2214
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr ""
-
-#: sequencer.c:2323
+#: sequencer.c:2298
 msgid "cancelling a cherry picking in progress"
 msgstr ""
 
-#: sequencer.c:2330
+#: sequencer.c:2305
 msgid "cancelling a revert in progress"
 msgstr ""
 
-#: sequencer.c:2364
+#: sequencer.c:2349
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: sequencer.c:2366
+#: sequencer.c:2351
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:2371
+#: sequencer.c:2356
 msgid "no commits parsed."
 msgstr ""
 
-#: sequencer.c:2382
+#: sequencer.c:2367
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 
-#: sequencer.c:2384
+#: sequencer.c:2369
 msgid "cannot revert during a cherry-pick."
 msgstr ""
 
-#: sequencer.c:2466
+#: sequencer.c:2447
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr ""
 
-#: sequencer.c:2553
+#: sequencer.c:2540
 msgid "unusable squash-onto"
 msgstr ""
 
-#: sequencer.c:2569
+#: sequencer.c:2556
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2644 sequencer.c:4361
 msgid "empty commit set passed"
 msgstr ""
 
-#: sequencer.c:2668
+#: sequencer.c:2660
 msgid "revert is already in progress"
 msgstr ""
 
-#: sequencer.c:2670
+#: sequencer.c:2662
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr ""
 
-#: sequencer.c:2673
+#: sequencer.c:2665
 msgid "cherry-pick is already in progress"
 msgstr ""
 
-#: sequencer.c:2675
+#: sequencer.c:2667
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr ""
 
-#: sequencer.c:2689
+#: sequencer.c:2681
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 
-#: sequencer.c:2704
+#: sequencer.c:2696
 msgid "could not lock HEAD"
 msgstr ""
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2756 sequencer.c:4099
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2758 sequencer.c:2769
 msgid "cannot resolve HEAD"
 msgstr ""
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2760 sequencer.c:2804
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2790 builtin/grep.c:724
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: sequencer.c:2800
+#: sequencer.c:2792
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr ""
 
-#: sequencer.c:2801
+#: sequencer.c:2793
 msgid "unexpected end of file"
 msgstr ""
 
-#: sequencer.c:2807
+#: sequencer.c:2799
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
-#: sequencer.c:2818
+#: sequencer.c:2810
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 
-#: sequencer.c:2859
+#: sequencer.c:2851
 msgid "no revert in progress"
 msgstr ""
 
-#: sequencer.c:2867
+#: sequencer.c:2859
 msgid "no cherry-pick in progress"
 msgstr ""
 
-#: sequencer.c:2877
+#: sequencer.c:2869
 msgid "failed to skip the commit"
 msgstr ""
 
-#: sequencer.c:2884
+#: sequencer.c:2876
 msgid "there is nothing to skip"
 msgstr ""
 
-#: sequencer.c:2887
+#: sequencer.c:2879
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3003 sequencer.c:4011
 #, c-format
 msgid "could not update %s"
 msgstr ""
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3042 sequencer.c:3991
 msgid "cannot read HEAD"
 msgstr ""
 
-#: sequencer.c:3066
+#: sequencer.c:3059
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:3074
+#: sequencer.c:3067
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -5928,27 +6596,22 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:3084
+#: sequencer.c:3077
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr ""
 
-#: sequencer.c:3091
+#: sequencer.c:3084
 #, c-format
 msgid "Could not merge %.*s"
 msgstr ""
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr ""
-
-#: sequencer.c:3136
+#: sequencer.c:3129
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -5958,11 +6621,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:3142
+#: sequencer.c:3135
 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 
-#: sequencer.c:3148
+#: sequencer.c:3141
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -5973,76 +6636,72 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:3209
+#: sequencer.c:3202
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3263
+#: sequencer.c:3256
 msgid "writing fake root commit"
 msgstr ""
 
-#: sequencer.c:3268
+#: sequencer.c:3261
 msgid "writing squash-onto"
 msgstr ""
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
 #, c-format
 msgid "failed to find tree of %s"
 msgstr ""
 
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr ""
-
-#: sequencer.c:3351
+#: sequencer.c:3344
 #, c-format
 msgid "could not resolve '%s'"
 msgstr ""
 
-#: sequencer.c:3379
+#: sequencer.c:3375
 msgid "cannot merge without a current revision"
 msgstr ""
 
-#: sequencer.c:3401
+#: sequencer.c:3397
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr ""
 
-#: sequencer.c:3410
+#: sequencer.c:3406
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3422
+#: sequencer.c:3418
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 
-#: sequencer.c:3437
+#: sequencer.c:3434
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr ""
 
-#: sequencer.c:3590
+#: sequencer.c:3594
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr ""
 
-#: sequencer.c:3606
+#: sequencer.c:3610
 msgid "merge: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3679 builtin/rebase.c:737
 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 
-#: sequencer.c:3687
+#: sequencer.c:3691
 #, c-format
 msgid "cannot store %s"
 msgstr ""
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6050,31 +6709,26 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
-#: sequencer.c:3751
-#, c-format
-msgid "could not checkout %s"
-msgstr ""
-
-#: sequencer.c:3765
+#: sequencer.c:3755
 #, c-format
 msgid "%s: not a valid OID"
 msgstr ""
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr ""
 
-#: sequencer.c:3785
+#: sequencer.c:3775
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr ""
 
-#: sequencer.c:3787
+#: sequencer.c:3777
 #, c-format
 msgid "Stopped at %s\n"
 msgstr ""
 
-#: sequencer.c:3795
+#: sequencer.c:3785
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6087,121 +6741,114 @@ msgid ""
 "    git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:3877
+#: sequencer.c:3869
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
-#: sequencer.c:3958
+#: sequencer.c:3940
 #, c-format
 msgid "unknown command %d"
 msgstr ""
 
-#: sequencer.c:4003
+#: sequencer.c:3999
 msgid "could not read orig-head"
 msgstr ""
 
-#: sequencer.c:4008
+#: sequencer.c:4004
 msgid "could not read 'onto'"
 msgstr ""
 
-#: sequencer.c:4022
+#: sequencer.c:4018
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 
-#: sequencer.c:4115
+#: sequencer.c:4111
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
-#: sequencer.c:4124
+#: sequencer.c:4120
 msgid "cannot amend non-existing commit"
 msgstr ""
 
-#: sequencer.c:4126
+#: sequencer.c:4122
 #, c-format
 msgid "invalid file: '%s'"
 msgstr ""
 
-#: sequencer.c:4128
+#: sequencer.c:4124
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr ""
 
-#: sequencer.c:4131
+#: sequencer.c:4127
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
 
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4163 sequencer.c:4202
 #, c-format
 msgid "could not write file: '%s'"
 msgstr ""
 
-#: sequencer.c:4220
+#: sequencer.c:4217
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: sequencer.c:4227
+#: sequencer.c:4224
 msgid "could not commit staged changes."
 msgstr ""
 
-#: sequencer.c:4328
+#: sequencer.c:4338
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
-#: sequencer.c:4332
+#: sequencer.c:4342
 #, c-format
 msgid "%s: bad revision"
 msgstr ""
 
-#: sequencer.c:4367
+#: sequencer.c:4377
 msgid "can't revert as initial commit"
 msgstr ""
 
-#: sequencer.c:4810
+#: sequencer.c:4846
 msgid "make_script: unhandled options"
 msgstr ""
 
-#: sequencer.c:4813
+#: sequencer.c:4849
 msgid "make_script: error preparing revisions"
 msgstr ""
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-
 #: sequencer.c:5083 sequencer.c:5100
 msgid "nothing to do"
 msgstr ""
 
-#: sequencer.c:5114
+#: sequencer.c:5119
 msgid "could not skip unnecessary pick commands"
 msgstr ""
 
-#: sequencer.c:5197
+#: sequencer.c:5213
 msgid "the script was already rearranged."
 msgstr ""
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
-msgid "'%s' is outside repository"
+msgid "'%s' is outside repository at '%s'"
 msgstr ""
 
-#: setup.c:173
+#: setup.c:175
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
 
-#: setup.c:186
+#: setup.c:188
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6209,12 +6856,12 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:235
+#: setup.c:254
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 
-#: setup.c:254
+#: setup.c:273
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6222,381 +6869,381 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:390
+#: setup.c:409
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 
-#: setup.c:394
+#: setup.c:413
 msgid "this operation must be run in a work tree"
 msgstr ""
 
-#: setup.c:540
+#: setup.c:559
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
-#: setup.c:548
+#: setup.c:567
 msgid "unknown repository extensions found:"
 msgstr ""
 
-#: setup.c:567
+#: setup.c:586
 #, c-format
 msgid "error opening '%s'"
 msgstr ""
 
-#: setup.c:569
+#: setup.c:588
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 
-#: setup.c:571
+#: setup.c:590
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: setup.c:573
+#: setup.c:592
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr ""
 
-#: setup.c:575
+#: setup.c:594
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr ""
 
-#: setup.c:577
+#: setup.c:596
 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 
-#: setup.c:676
+#: setup.c:695
 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 
-#: setup.c:690
+#: setup.c:709
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:738 setup.c:740 setup.c:771
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr ""
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
 msgid "cannot come back to cwd"
 msgstr ""
 
-#: setup.c:851
+#: setup.c:870
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr ""
 
-#: setup.c:1083
+#: setup.c:1108
 msgid "Unable to read current working directory"
 msgstr ""
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1117 setup.c:1123
 #, c-format
 msgid "cannot change to '%s'"
 msgstr ""
 
-#: setup.c:1103
+#: setup.c:1128
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 
-#: setup.c:1109
+#: setup.c:1134
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 
-#: setup.c:1220
+#: setup.c:1245
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 
-#: setup.c:1264
+#: setup.c:1289
 msgid "open /dev/null or dup failed"
 msgstr ""
 
-#: setup.c:1279
+#: setup.c:1304
 msgid "fork failed"
 msgstr ""
 
-#: setup.c:1284
+#: setup.c:1309
 msgid "setsid failed"
 msgstr ""
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 
-#: sha1-file.c:504
+#: sha1-file.c:503
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr ""
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 
-#: sha1-file.c:583
+#: sha1-file.c:582
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr ""
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 msgid "unable to fdopen alternates lockfile"
 msgstr ""
 
-#: sha1-file.c:644
+#: sha1-file.c:643
 msgid "unable to read alternates file"
 msgstr ""
 
-#: sha1-file.c:651
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
 msgstr ""
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""
 
-#: sha1-file.c:944
+#: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 
-#: sha1-file.c:969
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr ""
 
-#: sha1-file.c:1133
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr ""
 
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1263 sha1-file.c:2443
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1265 sha1-file.c:2447
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""
 
-#: sha1-file.c:1301
+#: sha1-file.c:1307
 msgid "invalid object type"
 msgstr ""
 
-#: sha1-file.c:1385
+#: sha1-file.c:1391
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr ""
 
-#: sha1-file.c:1388
+#: sha1-file.c:1394
 #, c-format
 msgid "unable to unpack %s header"
 msgstr ""
 
-#: sha1-file.c:1394
+#: sha1-file.c:1400
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr ""
 
-#: sha1-file.c:1397
+#: sha1-file.c:1403
 #, c-format
 msgid "unable to parse %s header"
 msgstr ""
 
-#: sha1-file.c:1588
+#: sha1-file.c:1629
 #, c-format
 msgid "failed to read object %s"
 msgstr ""
 
-#: sha1-file.c:1592
+#: sha1-file.c:1633
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr ""
 
-#: sha1-file.c:1596
+#: sha1-file.c:1637
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: sha1-file.c:1600
+#: sha1-file.c:1641
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: sha1-file.c:1703
+#: sha1-file.c:1746
 #, c-format
 msgid "unable to write file %s"
 msgstr ""
 
-#: sha1-file.c:1710
+#: sha1-file.c:1753
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr ""
 
-#: sha1-file.c:1717
+#: sha1-file.c:1760
 msgid "file write error"
 msgstr ""
 
-#: sha1-file.c:1736
+#: sha1-file.c:1780
 msgid "error when closing loose object file"
 msgstr ""
 
-#: sha1-file.c:1801
+#: sha1-file.c:1845
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 
-#: sha1-file.c:1803
+#: sha1-file.c:1847
 msgid "unable to create temporary file"
 msgstr ""
 
-#: sha1-file.c:1827
+#: sha1-file.c:1871
 msgid "unable to write loose object file"
 msgstr ""
 
-#: sha1-file.c:1833
+#: sha1-file.c:1877
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr ""
 
-#: sha1-file.c:1837
+#: sha1-file.c:1881
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr ""
 
-#: sha1-file.c:1841
+#: sha1-file.c:1885
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr ""
 
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
 #, c-format
 msgid "failed utime() on %s"
 msgstr ""
 
-#: sha1-file.c:1926
+#: sha1-file.c:1972
 #, c-format
 msgid "cannot read object for %s"
 msgstr ""
 
-#: sha1-file.c:1966
+#: sha1-file.c:2011
 msgid "corrupt commit"
 msgstr ""
 
-#: sha1-file.c:1974
+#: sha1-file.c:2019
 msgid "corrupt tag"
 msgstr ""
 
-#: sha1-file.c:2073
+#: sha1-file.c:2119
 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 
-#: sha1-file.c:2076
+#: sha1-file.c:2122
 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2195 sha1-file.c:2205
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 
-#: sha1-file.c:2164
+#: sha1-file.c:2211
 #, c-format
 msgid "%s: unsupported file type"
 msgstr ""
 
-#: sha1-file.c:2188
+#: sha1-file.c:2235
 #, c-format
 msgid "%s is not a valid object"
 msgstr ""
 
-#: sha1-file.c:2190
+#: sha1-file.c:2237
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr ""
 
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2454 sha1-file.c:2507
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr ""
 
-#: sha1-file.c:2431
+#: sha1-file.c:2478
 #, c-format
 msgid "unable to mmap %s"
 msgstr ""
 
-#: sha1-file.c:2436
+#: sha1-file.c:2483
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 
-#: sha1-file.c:2442
+#: sha1-file.c:2489
 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 
-#: sha1-file.c:2453
+#: sha1-file.c:2500
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr ""
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr ""
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -6609,44 +7256,104 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr ""
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr ""
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr ""
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr ""
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr ""
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr ""
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr ""
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:837
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:839
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:847
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:849
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:856
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:864
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -6654,13 +7361,18 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:866
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] ""
 msgstr[1] ""
 
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr ""
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -6689,62 +7401,137 @@ msgstr ""
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr ""
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+
 #: submodule.c:910
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr ""
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1161
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr ""
+
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1637
 #, c-format
-msgid "Could not access submodule '%s'"
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
 msgstr ""
 
-#: submodule.c:1651
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr ""
 
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr ""
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1817
+#: submodule.c:1828
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr ""
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr ""
+
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr ""
 
-#: submodule.c:1959
+#: submodule.c:1970
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr ""
 
-#: submodule.c:2007
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 
-#: submodule.c:2026
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr ""
+
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -6752,40 +7539,35 @@ msgid ""
 "'%s'\n"
 msgstr ""
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr ""
-
-#: submodule.c:2153
+#: submodule.c:2209
 msgid "could not start ls-files in .."
 msgstr ""
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""
 
-#: submodule-config.c:232
+#: submodule-config.c:236
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr ""
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr ""
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr ""
 
-#: submodule-config.c:755
+#: submodule-config.c:765
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr ""
@@ -6801,7 +7583,7 @@ msgstr ""
 msgid "unknown value '%s' for key '%s'"
 msgstr ""
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr ""
@@ -6820,7 +7602,7 @@ msgstr ""
 msgid "could not read from stdin"
 msgstr ""
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr ""
@@ -6849,54 +7631,54 @@ msgstr ""
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr ""
 
-#: transport.c:142
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr ""
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr ""
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr ""
 
-#: transport.c:625
+#: transport.c:632
 msgid "could not parse transport.color.* config"
 msgstr ""
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr ""
 
-#: transport.c:825
+#: transport.c:831
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr ""
 
-#: transport.c:891
+#: transport.c:897
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr ""
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr ""
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr ""
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -6912,289 +7694,294 @@ msgid ""
 "\n"
 msgstr ""
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr ""
 
-#: transport.c:1193
+#: transport.c:1201
 msgid "failed to push all needed submodules"
 msgstr ""
 
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:657
 msgid "operation not supported by protocol"
 msgstr ""
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 msgid "full write to remote helper failed"
 msgstr ""
 
-#: transport-helper.c:134
+#: transport-helper.c:144
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr ""
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:571
 msgid "can't dup helper output fd"
 msgstr ""
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr ""
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr ""
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:425
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr ""
 
-#: transport-helper.c:403
+#: transport-helper.c:414
 #, c-format
 msgid "%s also locked %s"
 msgstr ""
 
-#: transport-helper.c:481
+#: transport-helper.c:493
 msgid "couldn't run fast-import"
 msgstr ""
 
-#: transport-helper.c:504
+#: transport-helper.c:516
 msgid "error while running fast-import"
 msgstr ""
 
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:545 transport-helper.c:1134
 #, c-format
 msgid "could not read ref %s"
 msgstr ""
 
-#: transport-helper.c:578
+#: transport-helper.c:590
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr ""
 
-#: transport-helper.c:600
+#: transport-helper.c:612
 msgid "setting remote service path not supported by protocol"
 msgstr ""
 
-#: transport-helper.c:602
+#: transport-helper.c:614
 msgid "invalid remote service path"
 msgstr ""
 
-#: transport-helper.c:648
+#: transport-helper.c:660
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr ""
 
-#: transport-helper.c:720
+#: transport-helper.c:736
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr ""
 
-#: transport-helper.c:773
+#: transport-helper.c:789
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr ""
 
-#: transport-helper.c:834
+#: transport-helper.c:850
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr ""
 
-#: transport-helper.c:837
+#: transport-helper.c:853
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr ""
 
-#: transport-helper.c:840
+#: transport-helper.c:856
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 
-#: transport-helper.c:847
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr ""
+
+#: transport-helper.c:867
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr ""
 
-#: transport-helper.c:945
+#: transport-helper.c:965
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
-#: transport-helper.c:950
+#: transport-helper.c:970
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr ""
 
-#: transport-helper.c:997
+#: transport-helper.c:1017
 msgid "couldn't run fast-export"
 msgstr ""
 
-#: transport-helper.c:1002
+#: transport-helper.c:1022
 msgid "error while running fast-export"
 msgstr ""
 
-#: transport-helper.c:1027
+#: transport-helper.c:1047
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 "Perhaps you should specify a branch such as 'master'.\n"
 msgstr ""
 
-#: transport-helper.c:1091
+#: transport-helper.c:1120
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr ""
 
-#: transport-helper.c:1244
+#: transport-helper.c:1272
 #, c-format
 msgid "read(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1271
+#: transport-helper.c:1299
 #, c-format
 msgid "write(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1320
+#: transport-helper.c:1348
 #, c-format
 msgid "%s thread failed"
 msgstr ""
 
-#: transport-helper.c:1324
+#: transport-helper.c:1352
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr ""
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1371 transport-helper.c:1375
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr ""
 
-#: transport-helper.c:1384
+#: transport-helper.c:1412
 #, c-format
 msgid "%s process failed to wait"
 msgstr ""
 
-#: transport-helper.c:1388
+#: transport-helper.c:1416
 #, c-format
 msgid "%s process failed"
 msgstr ""
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1434 transport-helper.c:1443
 msgid "can't start thread for copying data"
 msgstr ""
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr ""
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr ""
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr ""
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr ""
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7202,7 +7989,7 @@ msgid ""
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7210,47 +7997,47 @@ msgid ""
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -7258,7 +8045,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -7266,29 +8053,33 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr ""
 
-#: unpack-trees.c:318
+#: unpack-trees.c:317
 msgid "Updating files"
 msgstr ""
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
 "colliding group is in the working tree:\n"
 msgstr ""
 
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr ""
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr ""
@@ -7318,47 +8109,51 @@ msgstr ""
 msgid "invalid '..' path segment"
 msgstr ""
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr ""
+
+#: worktree.c:259 builtin/am.c:2099
 #, c-format
 msgid "failed to read '%s'"
 msgstr ""
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr ""
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr ""
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr ""
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr ""
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr ""
 
@@ -7676,80 +8471,88 @@ msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 
-#: wt-status.c:1447
+#: wt-status.c:1449
 msgid "Revert currently in progress."
 msgstr ""
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1459
+#: wt-status.c:1461
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr ""
 
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr ""
 
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr ""
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr ""
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr ""
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
 msgstr ""
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr ""
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr ""
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7757,216 +8560,225 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr ""
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr ""
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr ""
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr ""
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr ""
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr ""
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr ""
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr ""
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr ""
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
 msgid "updating files failed"
 msgstr ""
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr ""
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:266 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr ""
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr ""
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr ""
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr ""
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr ""
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr ""
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr ""
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr ""
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr ""
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr ""
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr ""
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr ""
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr ""
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr ""
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr ""
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr ""
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr ""
 
-#: builtin/add.c:326
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr ""
+
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -7984,169 +8796,187 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr ""
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
 msgstr ""
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr ""
 
-#: builtin/add.c:419
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr ""
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr ""
+
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr ""
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 
-#: builtin/add.c:445
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr ""
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr ""
+
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
 msgstr ""
 
-#: builtin/am.c:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr ""
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr ""
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr ""
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr ""
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr ""
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr ""
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr ""
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr ""
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr ""
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr ""
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr ""
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
+msgid "missing author line in commit %s"
 msgstr ""
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
+msgid "invalid ident line: %.*s"
 msgstr ""
 
-#: builtin/am.c:1496
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
-#: builtin/am.c:1498
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
-#: builtin/am.c:1517
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 
-#: builtin/am.c:1523
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
-#: builtin/am.c:1549
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr ""
 
-#: builtin/am.c:1581
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr ""
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
-#: builtin/am.c:1650
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr ""
 
@@ -8154,42 +8984,46 @@ msgstr ""
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 
-#: builtin/am.c:1710
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/am.c:1704
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1744 builtin/am.c:1812
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
-#: builtin/am.c:1767
+#: builtin/am.c:1761
 msgid "No changes -- Patch already applied."
 msgstr ""
 
-#: builtin/am.c:1773
+#: builtin/am.c:1767
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 
-#: builtin/am.c:1821
+#: builtin/am.c:1815
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
 
-#: builtin/am.c:1828
+#: builtin/am.c:1822
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -8197,185 +9031,195 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 
-#: builtin/am.c:1987
+#: builtin/am.c:1981
 msgid "failed to clean index"
 msgstr ""
 
-#: builtin/am.c:2031
+#: builtin/am.c:2025
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 
-#: builtin/am.c:2128
+#: builtin/am.c:2132
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
-#: builtin/am.c:2164
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr ""
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+
+#: builtin/am.c:2207
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
-#: builtin/am.c:2165
+#: builtin/am.c:2208
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
-#: builtin/am.c:2171
+#: builtin/am.c:2214
 msgid "run interactively"
 msgstr ""
 
-#: builtin/am.c:2173
+#: builtin/am.c:2216
 msgid "historical option -- no-op"
 msgstr ""
 
-#: builtin/am.c:2175
+#: builtin/am.c:2218
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
 msgid "be quiet"
 msgstr ""
 
-#: builtin/am.c:2178
+#: builtin/am.c:2221
 msgid "add a Signed-off-by line to the commit message"
 msgstr ""
 
-#: builtin/am.c:2181
+#: builtin/am.c:2224
 msgid "recode into utf8 (default)"
 msgstr ""
 
-#: builtin/am.c:2183
+#: builtin/am.c:2226
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2185
+#: builtin/am.c:2228
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2187
+#: builtin/am.c:2230
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2189
+#: builtin/am.c:2232
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
-#: builtin/am.c:2192
+#: builtin/am.c:2235
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
-#: builtin/am.c:2195
+#: builtin/am.c:2238
 msgid "strip everything before a scissors line"
 msgstr ""
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
 msgid "pass it through git-apply"
 msgstr ""
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr ""
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr ""
 
-#: builtin/am.c:2221
+#: builtin/am.c:2264
 msgid "format the patch(es) are in"
 msgstr ""
 
-#: builtin/am.c:2227
+#: builtin/am.c:2270
 msgid "override error message when patch failure occurs"
 msgstr ""
 
-#: builtin/am.c:2229
+#: builtin/am.c:2272
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
-#: builtin/am.c:2232
+#: builtin/am.c:2275
 msgid "synonyms for --continue"
 msgstr ""
 
-#: builtin/am.c:2235
+#: builtin/am.c:2278
 msgid "skip the current patch"
 msgstr ""
 
-#: builtin/am.c:2238
+#: builtin/am.c:2281
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 
-#: builtin/am.c:2241
+#: builtin/am.c:2284
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr ""
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
+#: builtin/am.c:2288
+msgid "show the patch being applied"
 msgstr ""
 
-#: builtin/am.c:2248
+#: builtin/am.c:2293
 msgid "lie about committer date"
 msgstr ""
 
-#: builtin/am.c:2250
+#: builtin/am.c:2295
 msgid "use current timestamp for author date"
 msgstr ""
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr ""
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
 msgid "GPG-sign commits"
 msgstr ""
 
-#: builtin/am.c:2256
+#: builtin/am.c:2301
 msgid "(internal use for git-rebase)"
 msgstr ""
 
-#: builtin/am.c:2274
+#: builtin/am.c:2319
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr ""
 
-#: builtin/am.c:2281
+#: builtin/am.c:2326
 msgid "failed to read the index"
 msgstr ""
 
-#: builtin/am.c:2296
+#: builtin/am.c:2341
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
-#: builtin/am.c:2320
+#: builtin/am.c:2365
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 
-#: builtin/am.c:2326
+#: builtin/am.c:2371
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
-#: builtin/am.c:2336
+#: builtin/am.c:2381
 msgid "interactive mode requires patches on the command line"
 msgstr ""
 
@@ -8490,40 +9334,40 @@ msgstr ""
 msgid "'%s' is not a valid commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr ""
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr ""
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -8531,7 +9375,7 @@ msgid ""
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:310
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr ""
@@ -8540,288 +9384,284 @@ msgstr ""
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr ""
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr ""
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:382
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:392
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
 msgstr ""
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:478
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:482
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr ""
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:514
 msgid "bad HEAD - I need a HEAD"
 msgstr ""
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:529
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:553
 msgid "bad HEAD - strange symbolic ref"
 msgstr ""
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:577
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr ""
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr ""
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr ""
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr ""
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:641
 msgid "reset the bisection state"
 msgstr ""
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:643
 msgid "write out the bisection state in BISECT_LOG"
 msgstr ""
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:645
 msgid "check and set terms in a bisection state"
 msgstr ""
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:647
 msgid "check whether bad or good terms exist"
 msgstr ""
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:649
 msgid "print out the bisect terms"
 msgstr ""
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:651
 msgid "start the bisect session"
 msgstr ""
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:655
 msgid "no log for BISECT_WRITE"
 msgstr ""
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:684
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:688
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:694
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:700
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:706
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr ""
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr ""
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr ""
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, c-format
 msgid "expecting a color: %s"
 msgstr ""
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr ""
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr ""
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 msgid "invalid value for blame.coloring"
 msgstr ""
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr ""
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr ""
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr ""
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr ""
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr ""
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr ""
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr ""
 
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr ""
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 msgid "Ignore <rev> when blaming"
 msgstr ""
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 msgid "Ignore revisions from <file>"
 msgstr ""
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr ""
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr ""
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr ""
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr ""
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr ""
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr ""
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr ""
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr ""
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
@@ -8833,18 +9673,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr ""
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr ""
 
@@ -9044,7 +9884,7 @@ msgstr ""
 msgid "do not use"
 msgstr ""
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:513
 msgid "upstream"
 msgstr ""
 
@@ -9053,7 +9893,7 @@ msgid "change the upstream info"
 msgstr ""
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
+msgid "unset the upstream info"
 msgstr ""
 
 #: builtin/branch.c:628
@@ -9155,7 +9995,7 @@ msgstr ""
 msgid "format to use for the output"
 msgstr ""
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:785
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
@@ -9238,96 +10078,141 @@ msgid ""
 "'--set-upstream-to' instead."
 msgstr ""
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr ""
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr ""
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
 msgstr ""
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr ""
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr ""
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr ""
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr ""
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgstr ""
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 msgid "only one batch option may be specified"
 msgstr ""
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr ""
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr ""
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr ""
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr ""
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:1002
 msgid "blob"
 msgstr ""
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr ""
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr ""
 
@@ -9355,8 +10240,8 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
 msgid "suppress progress reporting"
 msgstr ""
 
@@ -9368,27 +10253,27 @@ msgstr ""
 msgid "ignore index when checking"
 msgstr ""
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr ""
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr ""
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr ""
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr ""
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr ""
 
@@ -9446,9 +10331,9 @@ msgid "write the content to temporary files"
 msgstr ""
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
 msgid "string"
 msgstr ""
 
@@ -9476,153 +10361,148 @@ msgstr ""
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr ""
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr ""
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr ""
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr ""
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr ""
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr ""
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr ""
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:389
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr ""
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr ""
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr ""
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr ""
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr ""
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
 msgid "you need to resolve your current index first"
 msgstr ""
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:734
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
 
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:837
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr ""
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:879
 msgid "HEAD is now at"
 msgstr ""
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:883 builtin/clone.c:717
 msgid "unable to update HEAD"
 msgstr ""
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:887
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:894
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:896 builtin/checkout.c:1320
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:898
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:949
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:955
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -9637,7 +10517,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:974
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -9654,306 +10534,315 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1009
 msgid "internal error in revision walk"
 msgstr ""
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1013
 msgid "Previous HEAD position was"
 msgstr ""
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
 msgid "You are on a branch yet to be born"
 msgstr ""
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
+#: builtin/checkout.c:1128
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
 msgstr ""
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/checkout.c:1145
 #, c-format
-msgid "only one reference expected, %d given."
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr ""
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
 msgstr ""
 
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1228
 #, c-format
-msgid ""
-"'%s' could be both a local file and a tracking branch.\n"
-"Please use -- (and optionally --no-guess) to disambiguate"
+msgid "only one reference expected, %d given."
 msgstr ""
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
 #, c-format
 msgid "invalid reference: %s"
 msgstr ""
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1334
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1336
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1340
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1356
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1360
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1364
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1368
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1372
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1376
 msgid "you are switching branch while bisecting"
 msgstr ""
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1383
 msgid "paths cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1411
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr ""
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1419
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1426
 msgid "missing branch or commit argument"
 msgstr ""
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr ""
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1469
 msgid "perform a 3-way merge with the new branch"
 msgstr ""
 
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr ""
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1471
 msgid "conflict style (merge or diff3)"
 msgstr ""
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1483 builtin/worktree.c:496
 msgid "detach HEAD at named commit"
 msgstr ""
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1484
 msgid "set upstream info for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1486
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new-branch"
 msgstr ""
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new unparented branch"
 msgstr ""
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
 msgid "update ignored files (default)"
 msgstr ""
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1493
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1506
 msgid "checkout our version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1509
 msgid "checkout their version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1513
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1568
 msgid "-p and --overlay are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1605
 msgid "--track needs a branch name"
 msgstr ""
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1610
 msgid "missing branch name; try -b"
 msgstr ""
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1642
 #, c-format
 msgid "could not resolve %s"
 msgstr ""
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr ""
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
 msgid "invalid path specification"
 msgstr ""
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr ""
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr ""
+
+#: builtin/checkout.c:1692
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
 msgstr ""
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
 msgid "branch"
 msgstr ""
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1724
 msgid "create and checkout a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1726
 msgid "create/reset and checkout a branch"
 msgstr ""
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1727
 msgid "create reflog for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1729
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1730
 msgid "use overlay mode (default)"
 msgstr ""
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1775
 msgid "create and switch to a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1777
 msgid "create/reset and switch to a branch"
 msgstr ""
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1779
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1781
 msgid "throw away local modifications"
 msgstr ""
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1813
 msgid "which tree-ish to checkout from"
 msgstr ""
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1815
 msgid "restore the index"
 msgstr ""
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1817
 msgid "restore the working tree (default)"
 msgstr ""
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1819
 msgid "ignore unmerged entries"
 msgstr ""
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
 msgid "use overlay mode"
 msgstr ""
 
@@ -9992,7 +10881,7 @@ msgstr ""
 msgid "could not lstat %s\n"
 msgstr ""
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10001,7 +10890,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr ""
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10014,38 +10903,33 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr ""
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr ""
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr ""
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr ""
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr ""
 
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr ""
-
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10056,76 +10940,68 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr ""
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr ""
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr ""
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr ""
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr ""
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr ""
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr ""
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr ""
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr ""
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr ""
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr ""
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr ""
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 
@@ -10173,18 +11049,18 @@ msgstr ""
 msgid "directory from which templates will be used"
 msgstr ""
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr ""
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr ""
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
 msgid "name"
 msgstr ""
 
@@ -10200,8 +11076,8 @@ msgstr ""
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
 msgid "depth"
 msgstr ""
 
@@ -10209,7 +11085,7 @@ msgstr ""
 msgid "create a shallow clone of that depth"
 msgstr ""
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
 msgid "time"
 msgstr ""
 
@@ -10217,16 +11093,17 @@ msgstr ""
 msgid "create a shallow clone since a specific time"
 msgstr ""
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
 msgid "revision"
 msgstr ""
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
@@ -10254,23 +11131,23 @@ msgstr ""
 msgid "set config inside the new repository"
 msgstr ""
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr ""
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr ""
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr ""
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr ""
 
@@ -10278,183 +11155,186 @@ msgstr ""
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr ""
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr ""
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr ""
 
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr ""
-
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr ""
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr ""
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr ""
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr ""
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry with 'git restore --source=HEAD :/'\n"
 msgstr ""
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
-#: builtin/clone.c:702
+#: builtin/clone.c:705
 #, c-format
 msgid "unable to update %s"
 msgstr ""
 
-#: builtin/clone.c:752
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr ""
+
+#: builtin/clone.c:776
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 
-#: builtin/clone.c:783
+#: builtin/clone.c:807
 msgid "unable to checkout working tree"
 msgstr ""
 
-#: builtin/clone.c:833
+#: builtin/clone.c:862
 msgid "unable to write parameters to config file"
 msgstr ""
 
-#: builtin/clone.c:896
+#: builtin/clone.c:925
 msgid "cannot repack to clean up"
 msgstr ""
 
-#: builtin/clone.c:898
+#: builtin/clone.c:927
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
 msgid "Too many arguments."
 msgstr ""
 
-#: builtin/clone.c:942
+#: builtin/clone.c:969
 msgid "You must specify a repository to clone."
 msgstr ""
 
-#: builtin/clone.c:955
+#: builtin/clone.c:982
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 
-#: builtin/clone.c:958
+#: builtin/clone.c:985
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
-#: builtin/clone.c:971
+#: builtin/clone.c:998
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:1004 builtin/fetch.c:1796
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1014
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1024
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1044
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1064
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1066
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1090
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1154
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1156
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1158
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1160
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1163
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1168
 msgid "--local is ignored"
 msgstr ""
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1243 builtin/clone.c:1251
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1254
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
@@ -10501,7 +11381,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr ""
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, c-format
 msgid "not a valid object name %s"
 msgstr ""
@@ -10529,13 +11409,13 @@ msgstr ""
 msgid "id of a parent commit object"
 msgstr ""
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
 #: builtin/tag.c:412
 msgid "message"
 msgstr ""
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
 msgid "commit message"
 msgstr ""
 
@@ -10543,8 +11423,8 @@ msgstr ""
 msgid "read commit log message from file"
 msgstr ""
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr ""
 
@@ -10601,94 +11481,102 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr ""
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr ""
 
-#: builtin/commit.c:362
+#: builtin/commit.c:385
 msgid "interactive add failed"
 msgstr ""
 
-#: builtin/commit.c:376
+#: builtin/commit.c:400
 msgid "unable to update temporary index"
 msgstr ""
 
-#: builtin/commit.c:378
+#: builtin/commit.c:402
 msgid "Failed to update main cache tree"
 msgstr ""
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
 msgid "unable to write new_index file"
 msgstr ""
 
-#: builtin/commit.c:455
+#: builtin/commit.c:479
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
-#: builtin/commit.c:457
+#: builtin/commit.c:481
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 
-#: builtin/commit.c:465
+#: builtin/commit.c:489
 msgid "cannot read the index"
 msgstr ""
 
-#: builtin/commit.c:484
+#: builtin/commit.c:508
 msgid "unable to write temporary index file"
 msgstr ""
 
-#: builtin/commit.c:582
+#: builtin/commit.c:606
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
-#: builtin/commit.c:584
+#: builtin/commit.c:608
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
-#: builtin/commit.c:603
+#: builtin/commit.c:627
 msgid "malformed --author parameter"
 msgstr ""
 
-#: builtin/commit.c:656
+#: builtin/commit.c:680
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr ""
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 
-#: builtin/commit.c:708
+#: builtin/commit.c:732
 msgid "could not read log from standard input"
 msgstr ""
 
-#: builtin/commit.c:712
+#: builtin/commit.c:736
 #, c-format
 msgid "could not read log file '%s'"
 msgstr ""
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:767 builtin/commit.c:783
 msgid "could not read SQUASH_MSG"
 msgstr ""
 
-#: builtin/commit.c:750
+#: builtin/commit.c:774
 msgid "could not read MERGE_MSG"
 msgstr ""
 
-#: builtin/commit.c:810
+#: builtin/commit.c:834
 msgid "could not write commit template"
 msgstr ""
 
-#: builtin/commit.c:829
+#: builtin/commit.c:853
 #, c-format
 msgid ""
 "\n"
@@ -10698,7 +11586,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
-#: builtin/commit.c:834
+#: builtin/commit.c:858
 #, c-format
 msgid ""
 "\n"
@@ -10708,14 +11596,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
-#: builtin/commit.c:847
+#: builtin/commit.c:871
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:855
+#: builtin/commit.c:879
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -10723,393 +11611,386 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:872
+#: builtin/commit.c:896
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:880
+#: builtin/commit.c:904
 #, c-format
 msgid "%sDate:      %s"
 msgstr ""
 
-#: builtin/commit.c:887
+#: builtin/commit.c:911
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:905
+#: builtin/commit.c:929
 msgid "Cannot read index"
 msgstr ""
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr ""
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1327
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr ""
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr ""
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1188
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1198
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1200
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1208
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1225
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr ""
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1231
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1362 builtin/commit.c:1524
 msgid "show status concisely"
 msgstr ""
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1364 builtin/commit.c:1526
 msgid "show branch information"
 msgstr ""
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1366
 msgid "show stash information"
 msgstr ""
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1368 builtin/commit.c:1528
 msgid "compute full ahead/behind values"
 msgstr ""
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1370
 msgid "version"
 msgstr ""
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
 msgid "machine-readable output"
 msgstr ""
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1373 builtin/commit.c:1532
 msgid "show status in long format (default)"
 msgstr ""
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1376 builtin/commit.c:1535
 msgid "terminate entries with NUL"
 msgstr ""
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
 msgid "mode"
 msgstr ""
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1379 builtin/commit.c:1538
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1383
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1385 parse-options.h:192
 msgid "when"
 msgstr ""
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1386
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1388
 msgid "list untracked files in columns"
 msgstr ""
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1389
 msgid "do not detect renames"
 msgstr ""
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1391
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1411
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "suppress summary after successful commit"
 msgstr ""
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1495
 msgid "show diff in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1497
 msgid "Commit message options"
 msgstr ""
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
 msgid "read message from file"
 msgstr ""
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "author"
 msgstr ""
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "override author for commit"
 msgstr ""
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1500 builtin/gc.c:538
 msgid "date"
 msgstr ""
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1500
 msgid "override date for commit"
 msgstr ""
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr ""
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1502
 msgid "reuse and edit message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1503
 msgid "reuse message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1504
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1505
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1506
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr ""
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1508
 msgid "use specified template file"
 msgstr ""
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1509
 msgid "force edit of commit"
 msgstr ""
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1511
 msgid "include status in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1516
 msgid "Commit contents options"
 msgstr ""
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1517
 msgid "commit all changed files"
 msgstr ""
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1518
 msgid "add specified files to index for commit"
 msgstr ""
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1519
 msgid "interactively add files"
 msgstr ""
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1520
 msgid "interactively add changes"
 msgstr ""
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1521
 msgid "commit only specified files"
 msgstr ""
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1522
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1523
 msgid "show what would be committed"
 msgstr ""
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1536
 msgid "amend previous commit"
 msgstr ""
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1537
 msgid "bypass post-rewrite hook"
 msgstr ""
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1544
 msgid "ok to record an empty change"
 msgstr ""
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1546
 msgid "ok to record a change with an empty message"
 msgstr ""
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1619
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
 msgid "could not read MERGE_MODE"
 msgstr ""
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1645
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr ""
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1691
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
 "not exceeded, and then \"git restore --staged :/\" to recover."
 msgstr ""
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr ""
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr ""
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
+msgstr ""
+
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
 msgstr ""
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr ""
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
 msgid "The object directory to store the graph"
 msgstr ""
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:71
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr ""
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:128
 msgid "start walk at all refs"
 msgstr ""
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:130
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:132
 msgid "start walk at commits listed by stdin"
 msgstr ""
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:134
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:137
 msgid "allow writing an incremental commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:141
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:159
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 
@@ -11117,205 +11998,209 @@ msgstr ""
 msgid "git config [<options>]"
 msgstr ""
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr ""
 
-#: builtin/config.c:115
+#: builtin/config.c:116
 msgid "only one type at a time"
 msgstr ""
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr ""
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr ""
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr ""
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr ""
 
-#: builtin/config.c:128
+#: builtin/config.c:129
 msgid "use per-worktree config file"
 msgstr ""
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr ""
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr ""
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr ""
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr ""
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr ""
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr ""
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr ""
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr ""
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr ""
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr ""
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr ""
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr ""
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr ""
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr ""
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr ""
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr ""
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr ""
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr ""
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
 msgid "value is given this type"
 msgstr ""
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr ""
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr ""
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr ""
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr ""
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr ""
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr ""
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr ""
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr ""
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr ""
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+
+#: builtin/config.c:160 builtin/env--helper.c:40
 msgid "value"
 msgstr ""
 
-#: builtin/config.c:158
+#: builtin/config.c:160
 msgid "with --get, use default value when missing entry"
 msgstr ""
 
-#: builtin/config.c:172
+#: builtin/config.c:174
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr ""
 
-#: builtin/config.c:174
+#: builtin/config.c:176
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr ""
 
-#: builtin/config.c:308
+#: builtin/config.c:324
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr ""
 
-#: builtin/config.c:344
+#: builtin/config.c:360
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr ""
 
-#: builtin/config.c:401
+#: builtin/config.c:417
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr ""
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr ""
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
 msgid "not in a git directory"
 msgstr ""
 
-#: builtin/config.c:499
+#: builtin/config.c:515
 msgid "writing to stdin is not supported"
 msgstr ""
 
-#: builtin/config.c:502
+#: builtin/config.c:518
 msgid "writing config blobs is not supported"
 msgstr ""
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -11325,81 +12210,81 @@ msgid ""
 "#\temail = %s\n"
 msgstr ""
 
-#: builtin/config.c:611
+#: builtin/config.c:627
 msgid "only one config file at a time"
 msgstr ""
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr ""
 
-#: builtin/config.c:619
+#: builtin/config.c:635
 msgid "--blob can only be used inside a git repository"
 msgstr ""
 
-#: builtin/config.c:638
+#: builtin/config.c:655
 msgid "$HOME not set"
 msgstr ""
 
-#: builtin/config.c:658
+#: builtin/config.c:679
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
 "section in \"git help worktree\" for details"
 msgstr ""
 
-#: builtin/config.c:688
+#: builtin/config.c:714
 msgid "--get-color and variable type are incoherent"
 msgstr ""
 
-#: builtin/config.c:693
+#: builtin/config.c:719
 msgid "only one action at a time"
 msgstr ""
 
-#: builtin/config.c:706
+#: builtin/config.c:732
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr ""
 
-#: builtin/config.c:712
+#: builtin/config.c:738
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 
-#: builtin/config.c:718
+#: builtin/config.c:744
 msgid "--default is only applicable to --get"
 msgstr ""
 
-#: builtin/config.c:731
+#: builtin/config.c:757
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr ""
 
-#: builtin/config.c:734
+#: builtin/config.c:760
 msgid "error processing config file(s)"
 msgstr ""
 
-#: builtin/config.c:744
+#: builtin/config.c:770
 msgid "editing stdin is not supported"
 msgstr ""
 
-#: builtin/config.c:746
+#: builtin/config.c:772
 msgid "editing blobs is not supported"
 msgstr ""
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr ""
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
 #, c-format
 msgid "no such section: %s"
 msgstr ""
@@ -11412,166 +12297,166 @@ msgstr ""
 msgid "print sizes in human readable format"
 msgstr ""
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr ""
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr ""
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr ""
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr ""
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr ""
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr ""
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr ""
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 
-#: builtin/describe.c:379
+#: builtin/describe.c:394
 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 
-#: builtin/describe.c:405
+#: builtin/describe.c:421
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
 
-#: builtin/describe.c:409
+#: builtin/describe.c:425
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
 
-#: builtin/describe.c:439
+#: builtin/describe.c:455
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 
-#: builtin/describe.c:442
+#: builtin/describe.c:458
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
 
-#: builtin/describe.c:510
+#: builtin/describe.c:526
 #, c-format
 msgid "describe %s\n"
 msgstr ""
 
-#: builtin/describe.c:513
+#: builtin/describe.c:529
 #, c-format
 msgid "Not a valid object name %s"
 msgstr ""
 
-#: builtin/describe.c:521
+#: builtin/describe.c:537
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr ""
 
-#: builtin/describe.c:535
+#: builtin/describe.c:551
 msgid "find the tag that comes after the commit"
 msgstr ""
 
-#: builtin/describe.c:536
+#: builtin/describe.c:552
 msgid "debug search strategy on stderr"
 msgstr ""
 
-#: builtin/describe.c:537
+#: builtin/describe.c:553
 msgid "use any ref"
 msgstr ""
 
-#: builtin/describe.c:538
+#: builtin/describe.c:554
 msgid "use any tag, even unannotated"
 msgstr ""
 
-#: builtin/describe.c:539
+#: builtin/describe.c:555
 msgid "always use long format"
 msgstr ""
 
-#: builtin/describe.c:540
+#: builtin/describe.c:556
 msgid "only follow first parent"
 msgstr ""
 
-#: builtin/describe.c:543
+#: builtin/describe.c:559
 msgid "only output exact matches"
 msgstr ""
 
-#: builtin/describe.c:545
+#: builtin/describe.c:561
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 
-#: builtin/describe.c:547
+#: builtin/describe.c:563
 msgid "only consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:549
+#: builtin/describe.c:565
 msgid "do not consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:567 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:568 builtin/describe.c:571
 msgid "mark"
 msgstr ""
 
-#: builtin/describe.c:553
+#: builtin/describe.c:569
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 
-#: builtin/describe.c:556
+#: builtin/describe.c:572
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 
-#: builtin/describe.c:574
+#: builtin/describe.c:590
 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 
-#: builtin/describe.c:603
+#: builtin/describe.c:619
 msgid "No names found, cannot describe anything."
 msgstr ""
 
-#: builtin/describe.c:654
+#: builtin/describe.c:670
 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
-#: builtin/describe.c:656
+#: builtin/describe.c:672
 msgid "--broken is incompatible with commit-ishes"
 msgstr ""
 
@@ -11608,109 +12493,109 @@ msgstr ""
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr ""
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr ""
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr ""
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr ""
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr ""
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr ""
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr ""
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr ""
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr ""
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr ""
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr ""
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr ""
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr ""
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr ""
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr ""
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr ""
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr ""
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr ""
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr ""
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr ""
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr ""
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr ""
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr ""
 
@@ -11746,251 +12631,279 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr ""
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr ""
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
 msgstr ""
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
 msgstr ""
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr ""
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr ""
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr ""
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr ""
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr ""
 
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr ""
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr ""
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr ""
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
 msgstr ""
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr ""
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr ""
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr ""
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr ""
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr ""
+
+#: builtin/fetch.c:139 builtin/pull.c:184
 msgid "fetch from all remotes"
 msgstr ""
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr ""
+
+#: builtin/fetch.c:143 builtin/pull.c:187
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:190
 msgid "path to upload pack on remote end"
 msgstr ""
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr ""
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr ""
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:194
 msgid "fetch all tags and associated objects"
 msgstr ""
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr ""
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:197
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
 msgid "on-demand"
 msgstr ""
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr ""
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:205
 msgid "keep downloaded pack"
 msgstr ""
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr ""
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
 msgid "deepen history of shallow clone"
 msgstr ""
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:211
 msgid "convert to a complete repository"
 msgstr ""
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr ""
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:214
 msgid "accept refs that update .git/shallow"
 msgstr ""
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:216
 msgid "refmap"
 msgstr ""
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:217
 msgid "specify fetch refmap"
 msgstr ""
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 msgid "run 'gc --auto' after fetching"
 msgstr ""
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:226
 msgid "check for forced-updates on all updated branches"
 msgstr ""
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr ""
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr ""
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr ""
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr ""
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr ""
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr ""
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr ""
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr ""
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr ""
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr ""
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr ""
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr ""
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr ""
 
-#: builtin/fetch.c:854
+#: builtin/fetch.c:877
 msgid ""
 "Fetch normally indicates which branches had a forced update,\n"
 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
 "flag or run 'git config fetch.showForcedUpdates true'."
 msgstr ""
 
-#: builtin/fetch.c:858
+#: builtin/fetch.c:881
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -11999,121 +12912,142 @@ msgid ""
 " to avoid this check.\n"
 msgstr ""
 
-#: builtin/fetch.c:888
+#: builtin/fetch.c:920
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr ""
 
-#: builtin/fetch.c:909
+#: builtin/fetch.c:941
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
 #, c-format
 msgid "From %.*s\n"
 msgstr ""
 
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1037
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
 " 'git remote prune %s' to remove any old, conflicting branches"
 msgstr ""
 
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1134
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1135
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1167
 msgid "[deleted]"
 msgstr ""
 
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1168 builtin/remote.c:1112
 msgid "(none)"
 msgstr ""
 
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1191
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1210
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr ""
 
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1213
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr ""
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr ""
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr ""
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr ""
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr ""
 
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1693
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
 msgstr ""
 
-#: builtin/fetch.c:1593
+#: builtin/fetch.c:1730
 msgid "You need to specify a tag name."
 msgstr ""
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1780
 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1782
 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1787
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1789
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1805
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1807
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1816
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr ""
 
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1823
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1841
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -12124,23 +13058,23 @@ msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:671
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:674
 msgid "alias for --log (deprecated)"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:677
 msgid "text"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:678
 msgid "use <text> as start of message"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:679
 msgid "file to read from"
 msgstr ""
 
@@ -12204,248 +13138,248 @@ msgstr ""
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr ""
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr ""
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr ""
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr ""
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr ""
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, c-format
 msgid "dangling %s %s"
 msgstr ""
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 msgid "could not create lost-found"
 msgstr ""
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr ""
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr ""
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr ""
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr ""
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr ""
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr ""
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr ""
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr ""
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr ""
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr ""
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr ""
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr ""
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr ""
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr ""
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr ""
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr ""
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr ""
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr ""
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr ""
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr ""
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr ""
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr ""
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr ""
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr ""
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr ""
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr ""
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr ""
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr ""
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr ""
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr ""
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
 msgstr ""
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr ""
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr ""
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr ""
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr ""
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr ""
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, c-format
 msgid "%s: object missing"
 msgstr ""
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr ""
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr ""
 
@@ -12459,17 +13393,17 @@ msgstr ""
 msgid "failed to parse '%s' value '%s'"
 msgstr ""
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr ""
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -12479,63 +13413,63 @@ msgid ""
 "%s"
 msgstr ""
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr ""
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr ""
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr ""
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr ""
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr ""
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr ""
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
@@ -12553,258 +13487,258 @@ msgstr ""
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
-#: builtin/grep.c:648
+#: builtin/grep.c:633
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr ""
 
-#: builtin/grep.c:714
+#: builtin/grep.c:704
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
-#: builtin/grep.c:813
+#: builtin/grep.c:803
 msgid "search in index instead of in the work tree"
 msgstr ""
 
-#: builtin/grep.c:815
+#: builtin/grep.c:805
 msgid "find in contents not managed by git"
 msgstr ""
 
-#: builtin/grep.c:817
+#: builtin/grep.c:807
 msgid "search in both tracked and untracked files"
 msgstr ""
 
-#: builtin/grep.c:819
+#: builtin/grep.c:809
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
-#: builtin/grep.c:821
+#: builtin/grep.c:811
 msgid "recursively search in each submodule"
 msgstr ""
 
-#: builtin/grep.c:824
+#: builtin/grep.c:814
 msgid "show non-matching lines"
 msgstr ""
 
-#: builtin/grep.c:826
+#: builtin/grep.c:816
 msgid "case insensitive matching"
 msgstr ""
 
-#: builtin/grep.c:828
+#: builtin/grep.c:818
 msgid "match patterns only at word boundaries"
 msgstr ""
 
-#: builtin/grep.c:830
+#: builtin/grep.c:820
 msgid "process binary files as text"
 msgstr ""
 
-#: builtin/grep.c:832
+#: builtin/grep.c:822
 msgid "don't match patterns in binary files"
 msgstr ""
 
-#: builtin/grep.c:835
+#: builtin/grep.c:825
 msgid "process binary files with textconv filters"
 msgstr ""
 
-#: builtin/grep.c:837
+#: builtin/grep.c:827
 msgid "search in subdirectories (default)"
 msgstr ""
 
-#: builtin/grep.c:839
+#: builtin/grep.c:829
 msgid "descend at most <depth> levels"
 msgstr ""
 
-#: builtin/grep.c:843
+#: builtin/grep.c:833
 msgid "use extended POSIX regular expressions"
 msgstr ""
 
-#: builtin/grep.c:846
+#: builtin/grep.c:836
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
-#: builtin/grep.c:849
+#: builtin/grep.c:839
 msgid "interpret patterns as fixed strings"
 msgstr ""
 
-#: builtin/grep.c:852
+#: builtin/grep.c:842
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
-#: builtin/grep.c:855
+#: builtin/grep.c:845
 msgid "show line numbers"
 msgstr ""
 
-#: builtin/grep.c:856
+#: builtin/grep.c:846
 msgid "show column number of first match"
 msgstr ""
 
-#: builtin/grep.c:857
+#: builtin/grep.c:847
 msgid "don't show filenames"
 msgstr ""
 
-#: builtin/grep.c:858
+#: builtin/grep.c:848
 msgid "show filenames"
 msgstr ""
 
-#: builtin/grep.c:860
+#: builtin/grep.c:850
 msgid "show filenames relative to top directory"
 msgstr ""
 
-#: builtin/grep.c:862
+#: builtin/grep.c:852
 msgid "show only filenames instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:864
+#: builtin/grep.c:854
 msgid "synonym for --files-with-matches"
 msgstr ""
 
-#: builtin/grep.c:867
+#: builtin/grep.c:857
 msgid "show only the names of files without match"
 msgstr ""
 
-#: builtin/grep.c:869
+#: builtin/grep.c:859
 msgid "print NUL after filenames"
 msgstr ""
 
-#: builtin/grep.c:872
+#: builtin/grep.c:862
 msgid "show only matching parts of a line"
 msgstr ""
 
-#: builtin/grep.c:874
+#: builtin/grep.c:864
 msgid "show the number of matches instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:875
+#: builtin/grep.c:865
 msgid "highlight matches"
 msgstr ""
 
-#: builtin/grep.c:877
+#: builtin/grep.c:867
 msgid "print empty line between matches from different files"
 msgstr ""
 
-#: builtin/grep.c:879
+#: builtin/grep.c:869
 msgid "show filename only once above matches from same file"
 msgstr ""
 
-#: builtin/grep.c:882
+#: builtin/grep.c:872
 msgid "show <n> context lines before and after matches"
 msgstr ""
 
-#: builtin/grep.c:885
+#: builtin/grep.c:875
 msgid "show <n> context lines before matches"
 msgstr ""
 
-#: builtin/grep.c:887
+#: builtin/grep.c:877
 msgid "show <n> context lines after matches"
 msgstr ""
 
-#: builtin/grep.c:889
+#: builtin/grep.c:879
 msgid "use <n> worker threads"
 msgstr ""
 
-#: builtin/grep.c:890
+#: builtin/grep.c:880
 msgid "shortcut for -C NUM"
 msgstr ""
 
-#: builtin/grep.c:893
+#: builtin/grep.c:883
 msgid "show a line with the function name before matches"
 msgstr ""
 
-#: builtin/grep.c:895
+#: builtin/grep.c:885
 msgid "show the surrounding function"
 msgstr ""
 
-#: builtin/grep.c:898
+#: builtin/grep.c:888
 msgid "read patterns from file"
 msgstr ""
 
-#: builtin/grep.c:900
+#: builtin/grep.c:890
 msgid "match <pattern>"
 msgstr ""
 
-#: builtin/grep.c:902
+#: builtin/grep.c:892
 msgid "combine patterns specified with -e"
 msgstr ""
 
-#: builtin/grep.c:914
+#: builtin/grep.c:904
 msgid "indicate hit with exit status without output"
 msgstr ""
 
-#: builtin/grep.c:916
+#: builtin/grep.c:906
 msgid "show only matches from files that match all patterns"
 msgstr ""
 
-#: builtin/grep.c:918
+#: builtin/grep.c:908
 msgid "show parse tree for grep expression"
 msgstr ""
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "pager"
 msgstr ""
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "show matching files in the pager"
 msgstr ""
 
-#: builtin/grep.c:926
+#: builtin/grep.c:916
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 
-#: builtin/grep.c:990
+#: builtin/grep.c:983
 msgid "no pattern given"
 msgstr ""
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1019
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1027
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1061
 msgid "invalid option combination, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
 msgid "no threads support, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1101
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
-#: builtin/grep.c:1117
-msgid "option not supported with --recurse-submodules"
-msgstr ""
-
-#: builtin/grep.c:1123
+#: builtin/grep.c:1127
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr ""
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1133
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1141
 msgid "both --cached and trees are given"
 msgstr ""
 
@@ -12982,11 +13916,11 @@ msgstr ""
 msgid "used more bytes than were available"
 msgstr ""
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
 msgid "pack too large for current definition of off_t"
 msgstr ""
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 
@@ -13042,191 +13976,191 @@ msgstr[1] ""
 msgid "serious inflate inconsistency"
 msgstr ""
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
 #, c-format
 msgid "unable to read %s"
 msgstr ""
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr ""
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr ""
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
 msgid "fsck error in packed object"
 msgstr ""
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr ""
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr ""
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr ""
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr ""
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr ""
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr ""
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr ""
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
 #, c-format
 msgid "unable to create thread: %s"
 msgstr ""
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr ""
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr ""
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
 msgid "error while closing pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
 msgid "cannot store pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
 msgid "cannot store index file"
 msgstr ""
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
 msgid "Cannot come back to cwd"
 msgstr ""
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
 #, c-format
 msgid "bad %s"
 msgstr ""
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
 msgid "--stdin requires a git repository"
 msgstr ""
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
 msgid "--verify with no packfile name given"
 msgstr ""
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr ""
 
@@ -13403,388 +14337,401 @@ msgstr ""
 msgid "no input file given for in-place editing"
 msgstr ""
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr ""
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr ""
 
-#: builtin/log.c:173
+#: builtin/log.c:174
 msgid "show source"
 msgstr ""
 
-#: builtin/log.c:174
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr ""
 
-#: builtin/log.c:176
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr ""
 
-#: builtin/log.c:178
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr ""
 
-#: builtin/log.c:179
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr ""
 
-#: builtin/log.c:182
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 
-#: builtin/log.c:280
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
-#: builtin/log.c:534
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:550 builtin/log.c:645
 #, c-format
 msgid "could not read object %s"
 msgstr ""
 
-#: builtin/log.c:668
+#: builtin/log.c:670
 #, c-format
 msgid "unknown type: %d"
 msgstr ""
 
-#: builtin/log.c:791
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr ""
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr ""
 
-#: builtin/log.c:908
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr ""
 
-#: builtin/log.c:924
+#: builtin/log.c:952
 #, c-format
 msgid "cannot open patch file %s"
 msgstr ""
 
-#: builtin/log.c:941
+#: builtin/log.c:969
 msgid "need exactly one range"
 msgstr ""
 
-#: builtin/log.c:951
+#: builtin/log.c:979
 msgid "not a range"
 msgstr ""
 
-#: builtin/log.c:1074
+#: builtin/log.c:1143
 msgid "cover letter needs email format"
 msgstr ""
 
-#: builtin/log.c:1080
+#: builtin/log.c:1149
 msgid "failed to create cover-letter file"
 msgstr ""
 
-#: builtin/log.c:1159
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
-#: builtin/log.c:1186
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
-#: builtin/log.c:1244
+#: builtin/log.c:1313
 msgid "two output directories?"
 msgstr ""
 
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, c-format
 msgid "unknown commit %s"
 msgstr ""
 
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr ""
 
-#: builtin/log.c:1370
+#: builtin/log.c:1439
 msgid "could not find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1374
+#: builtin/log.c:1443
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
 "Or you could specify base commit by --base=<base-commit-id> manually"
 msgstr ""
 
-#: builtin/log.c:1394
+#: builtin/log.c:1463
 msgid "failed to find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1405
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr ""
 
-#: builtin/log.c:1409
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr ""
 
-#: builtin/log.c:1462
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr ""
 
-#: builtin/log.c:1514
+#: builtin/log.c:1583
 msgid "failed to infer range-diff ranges"
 msgstr ""
 
-#: builtin/log.c:1559
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 
-#: builtin/log.c:1562
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
-#: builtin/log.c:1566
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr ""
 
-#: builtin/log.c:1568
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr ""
 
-#: builtin/log.c:1570
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr ""
 
-#: builtin/log.c:1571
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr ""
 
-#: builtin/log.c:1572
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
-#: builtin/log.c:1574
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
-#: builtin/log.c:1576
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr ""
 
-#: builtin/log.c:1578
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1581
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr ""
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1584
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr ""
 
-#: builtin/log.c:1587
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1590
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr ""
 
-#: builtin/log.c:1592
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr ""
 
-#: builtin/log.c:1594
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 
-#: builtin/log.c:1596
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
-#: builtin/log.c:1598
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr ""
 
-#: builtin/log.c:1599
+#: builtin/log.c:1672
 msgid "header"
 msgstr ""
 
-#: builtin/log.c:1600
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr ""
 
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr ""
 
-#: builtin/log.c:1601
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr ""
 
-#: builtin/log.c:1603
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr ""
 
-#: builtin/log.c:1605
+#: builtin/log.c:1678
 msgid "ident"
 msgstr ""
 
-#: builtin/log.c:1606
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 
-#: builtin/log.c:1608
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr ""
 
-#: builtin/log.c:1609
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr ""
 
-#: builtin/log.c:1611
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr ""
 
-#: builtin/log.c:1614
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr ""
 
-#: builtin/log.c:1618
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
-#: builtin/log.c:1620
+#: builtin/log.c:1693
 msgid "signature"
 msgstr ""
 
-#: builtin/log.c:1621
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr ""
 
-#: builtin/log.c:1622
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr ""
 
-#: builtin/log.c:1623
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 
-#: builtin/log.c:1625
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr ""
 
-#: builtin/log.c:1626
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr ""
 
-#: builtin/log.c:1628
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr ""
 
-#: builtin/log.c:1630
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1633
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1635
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/log.c:1710
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 
-#: builtin/log.c:1725
+#: builtin/log.c:1807
 msgid "-n and -k are mutually exclusive"
 msgstr ""
 
-#: builtin/log.c:1727
+#: builtin/log.c:1809
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr ""
 
-#: builtin/log.c:1735
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr ""
 
-#: builtin/log.c:1737
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr ""
 
-#: builtin/log.c:1739
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr ""
 
-#: builtin/log.c:1771
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
 msgstr ""
 
-#: builtin/log.c:1860
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1864
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr ""
 
-#: builtin/log.c:1865
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 
-#: builtin/log.c:1871
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr ""
 
-#: builtin/log.c:1875
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1883
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr ""
 
-#: builtin/log.c:1884
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 
-#: builtin/log.c:1895
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr ""
 
-#: builtin/log.c:1931
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr ""
 
-#: builtin/log.c:1975
+#: builtin/log.c:2073
 msgid "failed to create output files"
 msgstr ""
 
-#: builtin/log.c:2034
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
-#: builtin/log.c:2088
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -13905,7 +14852,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr ""
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
 msgid "exec"
 msgstr ""
 
@@ -13990,148 +14937,148 @@ msgstr ""
 msgid "git merge --continue"
 msgstr ""
 
-#: builtin/merge.c:118
+#: builtin/merge.c:119
 msgid "switch `m' requires a value"
 msgstr ""
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "option `%s' requires a value"
 msgstr ""
 
-#: builtin/merge.c:187
+#: builtin/merge.c:188
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
-#: builtin/merge.c:188
+#: builtin/merge.c:189
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
-#: builtin/merge.c:193
+#: builtin/merge.c:194
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:245 builtin/pull.c:132
 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:248 builtin/pull.c:135
 msgid "show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:249 builtin/pull.c:138
 msgid "(synonym to --stat)"
 msgstr ""
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:251 builtin/pull.c:141
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:254 builtin/pull.c:147
 msgid "create a single commit instead of doing a merge"
 msgstr ""
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:256 builtin/pull.c:150
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:258 builtin/pull.c:153
 msgid "edit message before committing"
 msgstr ""
 
-#: builtin/merge.c:259
+#: builtin/merge.c:260
 msgid "allow fast-forward (default)"
 msgstr ""
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:262 builtin/pull.c:160
 msgid "abort if fast-forward is not possible"
 msgstr ""
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:266 builtin/pull.c:163
 msgid "verify that the named commit has a valid GPG signature"
 msgstr ""
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
 msgid "strategy"
 msgstr ""
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:268 builtin/pull.c:168
 msgid "merge strategy to use"
 msgstr ""
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:171
 msgid "option=value"
 msgstr ""
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option for selected merge strategy"
 msgstr ""
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 
-#: builtin/merge.c:278
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:280
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr ""
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:285 builtin/pull.c:179
 msgid "allow merging unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/merge.c:307
+#: builtin/merge.c:308
 msgid "could not run stash."
 msgstr ""
 
-#: builtin/merge.c:312
+#: builtin/merge.c:313
 msgid "stash failed"
 msgstr ""
 
-#: builtin/merge.c:317
+#: builtin/merge.c:318
 #, c-format
 msgid "not a valid object: %s"
 msgstr ""
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
 msgid "read-tree failed"
 msgstr ""
 
-#: builtin/merge.c:386
+#: builtin/merge.c:387
 msgid " (nothing to squash)"
 msgstr ""
 
-#: builtin/merge.c:397
+#: builtin/merge.c:398
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:447
+#: builtin/merge.c:448
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:498
+#: builtin/merge.c:499
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr ""
 
-#: builtin/merge.c:585
+#: builtin/merge.c:586
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
@@ -14178,173 +15125,173 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:853
+#: builtin/merge.c:865
 msgid "Empty commit message."
 msgstr ""
 
-#: builtin/merge.c:872
+#: builtin/merge.c:880
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
-#: builtin/merge.c:933
+#: builtin/merge.c:941
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 
-#: builtin/merge.c:972
+#: builtin/merge.c:980
 msgid "No current branch."
 msgstr ""
 
-#: builtin/merge.c:974
+#: builtin/merge.c:982
 msgid "No remote for the current branch."
 msgstr ""
 
-#: builtin/merge.c:976
+#: builtin/merge.c:984
 msgid "No default upstream defined for the current branch."
 msgstr ""
 
-#: builtin/merge.c:981
+#: builtin/merge.c:989
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr ""
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1046
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1149
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr ""
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1183
 msgid "not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1286
 msgid "--abort expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1290
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1299
 msgid "--quit expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1312
 msgid "--continue expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1316
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1332
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1339
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1342
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1356
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1358
 msgid "You cannot combine --squash with --commit."
 msgstr ""
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1374
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1391
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1393
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1398
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1400
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1481
 msgid "refusing to merge unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1490
 msgid "Already up to date."
 msgstr ""
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1500
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1549
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1574
 msgid "Already up to date. Yeeah!"
 msgstr ""
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1580
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1603 builtin/merge.c:1668
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1607
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1659
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1661
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1670
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1682
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -14427,33 +15374,33 @@ msgstr ""
 msgid "set labels for file1/orig-file/file2"
 msgstr ""
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr ""
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr ""
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr ""
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr ""
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr ""
@@ -14476,29 +15423,29 @@ msgstr ""
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
 msgstr ""
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr ""
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr ""
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr ""
@@ -14590,52 +15537,52 @@ msgstr ""
 msgid "Renaming %s to %s\n"
 msgstr ""
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr ""
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr ""
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr ""
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr ""
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr ""
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr ""
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr ""
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr ""
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr ""
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr ""
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr ""
 
@@ -15014,7 +15961,7 @@ msgstr ""
 msgid "read object names from the standard input"
 msgstr ""
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr ""
 
@@ -15030,7 +15977,7 @@ msgstr ""
 msgid "use notes from <notes-ref>"
 msgstr ""
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1643
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr ""
@@ -15045,375 +15992,338 @@ msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:430
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:441
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:572
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr ""
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr ""
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:972
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:985
 msgid "Writing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1099
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1297
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1724
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1733
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:2004
 msgid "Counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2005
-#, c-format
-msgid "unable to get size of %s"
-msgstr ""
-
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2149
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
 #, c-format
 msgid "object %s cannot be read"
 msgstr ""
 
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2259
 msgid "suboptimal pack - out of memory"
 msgstr ""
 
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2574
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr ""
 
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2713
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2801
 msgid "Compressing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2807
 msgid "inconsistency with delta count"
 msgstr ""
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2888
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2894
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2992
 msgid "invalid value for --missing"
 msgstr ""
 
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
 msgid "cannot open pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:3082
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3167
 msgid "unable to force loose object"
 msgstr ""
 
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3260
 #, c-format
 msgid "not a rev '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3263
 #, c-format
 msgid "bad revision '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3288
 msgid "unable to add recent objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3341
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3248
-msgid "do not show progress meter"
-msgstr ""
-
-#: builtin/pack-objects.c:3250
-msgid "show progress meter"
-msgstr ""
-
-#: builtin/pack-objects.c:3252
-msgid "show progress meter during object writing phase"
-msgstr ""
-
-#: builtin/pack-objects.c:3255
-msgid "similar to --all-progress when progress meter is shown"
-msgstr ""
-
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3383
 msgid "<version>[,<offset>]"
 msgstr ""
 
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3384
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3387
 msgid "maximum size of each output pack file"
 msgstr ""
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3389
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3391
 msgid "ignore packed objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3393
 msgid "limit pack window by objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3395
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3397
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3399
 msgid "reuse existing deltas"
 msgstr ""
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3401
 msgid "reuse existing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3403
 msgid "use OFS_DELTA objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3405
 msgid "use threads when searching for best delta matches"
 msgstr ""
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3407
 msgid "do not create an empty pack output"
 msgstr ""
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3409
 msgid "read revision arguments from standard input"
 msgstr ""
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3411
 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3414
 msgid "include objects reachable from any reference"
 msgstr ""
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3417
 msgid "include objects referred by reflog entries"
 msgstr ""
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3420
 msgid "include objects referred to by the index"
 msgstr ""
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3423
 msgid "output pack to stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3425
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3427
 msgid "keep unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3429
 msgid "pack loose unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3431
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3434
 msgid "use the sparse reachability algorithm"
 msgstr ""
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3436
 msgid "create thin packs"
 msgstr ""
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3438
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3440
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3442
 msgid "ignore this pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3444
 msgid "pack compression level"
 msgstr ""
 
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3446
 msgid "do not hide commits by grafts"
 msgstr ""
 
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3448
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3450
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3454
 msgid "write a bitmap index if possible"
 msgstr ""
 
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3458
 msgid "handling for missing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3461
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3463
 msgid "respect islands during delta compression"
 msgstr ""
 
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3492
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3497
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3551
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3553
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3558
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3561
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr ""
 
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3567
 msgid "cannot use --filter without --stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3627
 msgid "Enumerating objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3657
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 msgstr ""
 
 #: builtin/pack-refs.c:8
@@ -15456,70 +16366,70 @@ msgstr ""
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr ""
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
-#: builtin/pull.c:141
+#: builtin/pull.c:122
 msgid "control for recursive fetching of submodules"
 msgstr ""
 
-#: builtin/pull.c:145
+#: builtin/pull.c:126
 msgid "Options related to merging"
 msgstr ""
 
-#: builtin/pull.c:148
+#: builtin/pull.c:129
 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr ""
 
-#: builtin/pull.c:185
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr ""
 
-#: builtin/pull.c:201
+#: builtin/pull.c:182
 msgid "Options related to fetching"
 msgstr ""
 
-#: builtin/pull.c:211
+#: builtin/pull.c:192
 msgid "force overwrite of local branch"
 msgstr ""
 
-#: builtin/pull.c:219
+#: builtin/pull.c:200
 msgid "number of submodules pulled in parallel"
 msgstr ""
 
-#: builtin/pull.c:316
+#: builtin/pull.c:300
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 
-#: builtin/pull.c:433
+#: builtin/pull.c:426
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 
-#: builtin/pull.c:435
+#: builtin/pull.c:428
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 
-#: builtin/pull.c:436
+#: builtin/pull.c:429
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
 
-#: builtin/pull.c:439
+#: builtin/pull.c:432
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -15527,74 +16437,74 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr ""
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr ""
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:442 builtin/pull.c:457
 msgid "See git-pull(1) for details."
 msgstr ""
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr ""
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr ""
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr ""
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 
-#: builtin/pull.c:473
+#: builtin/pull.c:466
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
 
-#: builtin/pull.c:581
+#: builtin/pull.c:576
 #, c-format
 msgid "unable to access commit %s"
 msgstr ""
 
-#: builtin/pull.c:861
+#: builtin/pull.c:857
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
-#: builtin/pull.c:916
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 
-#: builtin/pull.c:924
+#: builtin/pull.c:920
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 
-#: builtin/pull.c:928
+#: builtin/pull.c:924
 msgid "pull with rebase"
 msgstr ""
 
-#: builtin/pull.c:929
+#: builtin/pull.c:925
 msgid "please commit or stash them."
 msgstr ""
 
-#: builtin/pull.c:954
+#: builtin/pull.c:950
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -15602,7 +16512,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
-#: builtin/pull.c:960
+#: builtin/pull.c:956
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -15613,15 +16523,15 @@ msgid ""
 "to recover."
 msgstr ""
 
-#: builtin/pull.c:975
+#: builtin/pull.c:971
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
-#: builtin/pull.c:979
+#: builtin/pull.c:975
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
-#: builtin/pull.c:986
+#: builtin/pull.c:982
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
@@ -15629,21 +16539,21 @@ msgstr ""
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr ""
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr ""
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -15658,7 +16568,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -15668,7 +16578,7 @@ msgid ""
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -15677,12 +16587,12 @@ msgid ""
 "    git push --set-upstream %s %s\n"
 msgstr ""
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -15690,12 +16600,12 @@ msgid ""
 "to update which remote branch."
 msgstr ""
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -15703,7 +16613,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -15711,7 +16621,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -15720,143 +16630,143 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
 msgstr ""
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr ""
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr ""
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr ""
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr ""
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr ""
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr ""
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr ""
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
 msgstr ""
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr ""
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr ""
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr ""
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr ""
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr ""
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
 msgstr ""
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr ""
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr ""
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr ""
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr ""
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr ""
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr ""
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr ""
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr ""
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr ""
 
@@ -15872,24 +16782,32 @@ msgstr ""
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr ""
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr ""
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr ""
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr ""
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr ""
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr ""
 
@@ -15968,10 +16886,14 @@ msgstr ""
 msgid "suppress feedback messages"
 msgstr ""
 
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr ""
+
 #: builtin/rebase.c:32
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
 
 #: builtin/rebase.c:34
@@ -15983,216 +16905,207 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr ""
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr ""
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr ""
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:292
 #, c-format
 msgid "could not create temporary %s"
 msgstr ""
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:298
 msgid "could not mark as interactive"
 msgstr ""
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:352
 msgid "could not generate todo list"
 msgstr ""
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:391
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:461
 msgid "git rebase--interactive [<options>]"
 msgstr ""
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
 msgstr ""
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr ""
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:480
 msgid "rebase merge commits"
 msgstr ""
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:482
 msgid "keep original branch points of cousins"
 msgstr ""
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:484
 msgid "move commits that begin with squash!/fixup!"
 msgstr ""
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:485
 msgid "sign commits"
 msgstr ""
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:487 builtin/rebase.c:1490
 msgid "display a diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:489
 msgid "continue rebase"
 msgstr ""
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:491
 msgid "skip commit"
 msgstr ""
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:492
 msgid "edit the todo list"
 msgstr ""
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:494
 msgid "show the current patch"
 msgstr ""
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:497
 msgid "shorten commit ids in the todo list"
 msgstr ""
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:499
 msgid "expand commit ids in the todo list"
 msgstr ""
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:501
 msgid "check the todo list"
 msgstr ""
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:503
 msgid "rearrange fixup/squash lines"
 msgstr ""
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:505
 msgid "insert exec commands in todo list"
 msgstr ""
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:506
 msgid "onto"
 msgstr ""
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict-revision"
 msgstr ""
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict revision"
 msgstr ""
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:511
 msgid "squash-onto"
 msgstr ""
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:512
 msgid "squash onto"
 msgstr ""
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:514
 msgid "the upstream commit"
 msgstr ""
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head-name"
 msgstr ""
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head name"
 msgstr ""
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:521
 msgid "rebase strategy"
 msgstr ""
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:522
 msgid "strategy-opts"
 msgstr ""
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:523
 msgid "strategy options"
 msgstr ""
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:524
 msgid "switch-to"
 msgstr ""
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:525
 msgid "the branch or commit to checkout"
 msgstr ""
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto-name"
 msgstr ""
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto name"
 msgstr ""
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "cmd"
 msgstr ""
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "the command to run"
 msgstr ""
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:530 builtin/rebase.c:1584
 msgid "automatically re-schedule any `exec` that fails"
 msgstr ""
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:546
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr ""
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:562
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr ""
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:612
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr ""
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:627
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:652
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:728
 #, c-format
 msgid "Could not read '%s'"
 msgstr ""
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:746
 #, c-format
 msgid "Cannot store %s"
 msgstr ""
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:853
 msgid "could not determine HEAD revision"
 msgstr ""
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -16201,7 +17114,7 @@ msgid ""
 "abort\"."
 msgstr ""
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -16213,7 +17126,14 @@ msgid ""
 "As a result, git cannot rebase them."
 msgstr ""
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "%s\n"
@@ -16224,7 +17144,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1417
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -16233,169 +17153,185 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1447
 msgid "exec commands cannot contain newlines"
 msgstr ""
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1451
 msgid "empty exec command"
 msgstr ""
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1481
 msgid "rebase onto given branch instead of upstream"
 msgstr ""
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr ""
+
+#: builtin/rebase.c:1485
 msgid "allow pre-rebase hook to run"
 msgstr ""
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1487
 msgid "be quiet. implies --no-stat"
 msgstr ""
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1493
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1496
 msgid "add a Signed-off-by: line to each commit"
 msgstr ""
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
 msgid "passed to 'git am'"
 msgstr ""
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
 msgid "passed to 'git apply'"
 msgstr ""
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1515
 msgid "continue"
 msgstr ""
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1518
 msgid "skip current patch and continue"
 msgstr ""
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1520
 msgid "abort and check out the original branch"
 msgstr ""
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1523
 msgid "abort but keep HEAD where it is"
 msgstr ""
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1524
 msgid "edit the todo list during an interactive rebase"
 msgstr ""
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1527
 msgid "show the patch file being applied or merged"
 msgstr ""
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1534
 msgid "use merging strategies to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1538
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1542
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr ""
 
-#: builtin/rebase.c:1455
-msgid "preserve empty commits during rebase"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
 msgstr ""
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1554
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1560
 msgid "automatically stash/stash pop before and after"
 msgstr ""
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1562
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1566
 msgid "allow rebasing commits with empty messages"
 msgstr ""
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1570
 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1573
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1575
 msgid "use the given merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
 msgid "option"
 msgstr ""
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1578
 msgid "pass the argument through to the merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1581
 msgid "rebase all reachable commits up to the root(s)"
 msgstr ""
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1598
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
 msgstr ""
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1604
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1645
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr ""
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr ""
+
+#: builtin/rebase.c:1656
 msgid "No rebase in progress?"
 msgstr ""
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1660
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1683
 msgid "Cannot read HEAD"
 msgstr ""
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1695
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1714
 msgid "could not discard worktree changes"
 msgstr ""
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1733
 #, c-format
 msgid "could not move back to %s"
 msgstr ""
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1778
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -16408,171 +17344,163 @@ msgid ""
 "valuable there.\n"
 msgstr ""
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1806
 msgid "switch `C' expects a numerical value"
 msgstr ""
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1847
 #, c-format
 msgid "Unknown mode: %s"
 msgstr ""
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1869
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1797
-msgid "--reschedule-failed-exec requires --exec or --interactive"
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr ""
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
 msgstr ""
 
-#: builtin/rebase.c:1809
-msgid "cannot combine am options with either interactive or merge options"
+#: builtin/rebase.c:1937
+msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1957
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr ""
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1961
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr ""
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr ""
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1985
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1991
 msgid "Could not create new root commit"
 msgstr ""
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr ""
+
+#: builtin/rebase.c:2020
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr ""
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:2028
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:2054
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2073
 msgid "Could not resolve HEAD to a revision"
 msgstr ""
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2111
 msgid "Cannot autostash"
 msgstr ""
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2114
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2120
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2123
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr ""
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2126
 msgid "could not reset --hard"
 msgstr ""
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr ""
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2135
 msgid "Please commit or stash them."
 msgstr ""
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr ""
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2169
 #, c-format
 msgid "could not switch to %s"
 msgstr ""
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2180
 msgid "HEAD is up to date."
 msgstr ""
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2182
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr ""
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2190
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr ""
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2200
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2207
 #, c-format
 msgid "Changes to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2210
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2235
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2244
 msgid "Could not detach HEAD"
 msgstr ""
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2253
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr ""
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
 msgid "git receive-pack <git-dir>"
 msgstr ""
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:821
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -16589,7 +17517,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -16626,210 +17554,223 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr ""
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr ""
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr ""
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr ""
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr ""
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr ""
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr ""
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr ""
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr ""
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr ""
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
 msgstr ""
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr ""
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr ""
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr ""
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr ""
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr ""
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr ""
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr ""
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr ""
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr ""
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr ""
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr ""
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr ""
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr ""
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr ""
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr ""
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr ""
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr ""
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
 msgstr ""
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr ""
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr ""
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr ""
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr ""
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr ""
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr ""
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr ""
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr ""
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr ""
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr ""
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr ""
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr ""
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
 #, c-format
 msgid "No such remote: '%s'"
 msgstr ""
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr ""
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -16837,17 +17778,17 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr ""
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr ""
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -16857,118 +17798,118 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr ""
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr ""
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr ""
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1052
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr ""
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr ""
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr ""
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr ""
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr ""
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr ""
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr ""
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr ""
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr ""
 
@@ -16976,303 +17917,294 @@ msgstr ""
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr ""
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr ""
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr ""
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr ""
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr ""
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr ""
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr ""
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr ""
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr ""
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr ""
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr ""
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr ""
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr ""
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr ""
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr ""
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr ""
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr ""
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr ""
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr ""
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr ""
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 
-#: builtin/repack.c:190
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 
-#: builtin/repack.c:246
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:284
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr ""
 
-#: builtin/repack.c:286
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
-#: builtin/repack.c:289
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
-#: builtin/repack.c:291
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:293
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:295
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr ""
 
-#: builtin/repack.c:298
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:300
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr ""
 
-#: builtin/repack.c:302
+#: builtin/repack.c:310
 msgid "pass --delta-islands to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:303
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr ""
 
-#: builtin/repack.c:304
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 
-#: builtin/repack.c:306
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr ""
 
-#: builtin/repack.c:308
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr ""
 
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr ""
 
-#: builtin/repack.c:310
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 
-#: builtin/repack.c:312
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr ""
 
-#: builtin/repack.c:314
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr ""
 
-#: builtin/repack.c:316
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr ""
 
-#: builtin/repack.c:318
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
-#: builtin/repack.c:320
+#: builtin/repack.c:328
 msgid "do not repack this pack"
 msgstr ""
 
-#: builtin/repack.c:330
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 
-#: builtin/repack.c:334
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 
-#: builtin/repack.c:417
+#: builtin/repack.c:425
 msgid "Nothing new to pack."
 msgstr ""
 
-#: builtin/repack.c:478
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -17284,7 +18216,7 @@ msgid ""
 "WARNING: Please rename them in %s manually:\n"
 msgstr ""
 
-#: builtin/repack.c:526
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr ""
@@ -17387,8 +18319,8 @@ msgstr ""
 msgid "unable to write object to database"
 msgstr ""
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr ""
@@ -17407,124 +18339,124 @@ msgstr ""
 msgid "new object is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr ""
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr ""
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr ""
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr ""
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr ""
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr ""
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr ""
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr ""
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr ""
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr ""
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr ""
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr ""
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr ""
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr ""
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr ""
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr ""
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr ""
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr ""
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr ""
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr ""
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr ""
 
@@ -17551,113 +18483,123 @@ msgid ""
 msgstr ""
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr ""
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr ""
+
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr ""
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr ""
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr ""
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 
-#: builtin/reset.c:193
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr ""
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr ""
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr ""
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr ""
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr ""
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
 msgstr ""
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr ""
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -17666,34 +18608,29 @@ msgid ""
 "to make this the default.\n"
 msgstr ""
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr ""
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr ""
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr ""
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr ""
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
 msgstr ""
 
 #: builtin/rev-parse.c:408
@@ -17845,36 +18782,40 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr ""
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr ""
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr ""
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr ""
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr ""
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""
@@ -18111,15 +19052,82 @@ msgstr ""
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr ""
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr ""
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr ""
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr ""
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr ""
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr ""
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr ""
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr ""
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr ""
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr ""
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr ""
 
@@ -18127,207 +19135,215 @@ msgstr ""
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr ""
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr ""
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr ""
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr ""
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr ""
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr ""
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr ""
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr ""
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr ""
 
-#: builtin/stash.c:421
+#: builtin/stash.c:422
 msgid "conflicts in index.Try without --index."
 msgstr ""
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr ""
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr ""
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr ""
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
 msgstr ""
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
 msgid "attempt to recreate the index"
 msgstr ""
 
-#: builtin/stash.c:549
+#: builtin/stash.c:555
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr ""
 
-#: builtin/stash.c:552
+#: builtin/stash.c:558
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr ""
 
-#: builtin/stash.c:577
+#: builtin/stash.c:583
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr ""
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr ""
 
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr ""
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
 msgid "stash message"
 msgstr ""
 
-#: builtin/stash.c:818
+#: builtin/stash.c:824
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr ""
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr ""
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr ""
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr ""
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr ""
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr ""
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr ""
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 
-#: builtin/stash.c:1285
+#: builtin/stash.c:1298
 msgid "Did you forget to 'git add'?"
 msgstr ""
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr ""
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr ""
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr ""
 
-#: builtin/stash.c:1327
+#: builtin/stash.c:1340
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr ""
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr ""
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "keep index"
 msgstr ""
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash in patch mode"
 msgstr ""
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1472 builtin/stash.c:1537
 msgid "quiet mode"
 msgstr ""
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1474 builtin/stash.c:1539
 msgid "include untracked files in stash"
 msgstr ""
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1476 builtin/stash.c:1541
 msgid "include ignore files"
 msgstr ""
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1600
 #, c-format
 msgid "could not exec %s"
 msgstr ""
@@ -18348,47 +19364,47 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr ""
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -18396,346 +19412,369 @@ msgid ""
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr ""
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr ""
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr ""
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
 "really want to remove it including all of its history)"
 msgstr ""
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
 msgstr ""
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr ""
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr ""
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr ""
+
+#: builtin/submodule--helper.c:1424
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr ""
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1516
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr ""
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr ""
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr ""
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 "the superproject is not on any branch"
 msgstr ""
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2117
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2156
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2212
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2215
 msgid "unset the config in the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2220
 msgid "git submodule--helper config <name> [<value>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2221
 msgid "git submodule--helper config --unset <name>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2222
 msgid "git submodule--helper config --check-writeable"
 msgstr ""
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2297
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
@@ -18971,246 +20010,250 @@ msgstr ""
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr ""
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr ""
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr ""
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr ""
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr ""
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr ""
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr ""
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr ""
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr ""
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr ""
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr ""
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr ""
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr ""
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr ""
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr ""
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr ""
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr ""
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr ""
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr ""
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr ""
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr ""
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr ""
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr ""
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr ""
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr ""
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr ""
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr ""
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr ""
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr ""
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr ""
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr ""
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr ""
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr ""
 
@@ -19302,272 +20345,272 @@ msgstr ""
 msgid "print tag contents"
 msgstr ""
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr ""
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr ""
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr ""
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr ""
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr ""
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr ""
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr ""
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:891
 #, c-format
 msgid "failed to delete '%s'"
 msgstr ""
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr ""
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr ""
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr ""
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr ""
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:244
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr ""
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:249
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
 "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:251
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
 "use 'add -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:432 builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:434
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:443
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:449
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:490
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:493
 msgid "create a new branch"
 msgstr ""
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:495
 msgid "create or reset a branch"
 msgstr ""
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:497
 msgid "populate the new working tree"
 msgstr ""
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:498
 msgid "keep the new working tree locked"
 msgstr ""
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:501
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:504
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:512
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:573
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:673
 msgid "reason for locking"
 msgstr ""
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:687 builtin/worktree.c:720
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:692
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:694
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:722
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:763
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:771
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:794 builtin/worktree.c:921
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:799
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:805
 #, c-format
 msgid "target '%s' already exists"
 msgstr ""
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:813
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:815
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:818
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:823
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:871
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:875
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:880
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
-#: builtin/worktree.c:911
+#: builtin/worktree.c:903
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:926
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:928
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:931
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
@@ -19588,6 +20631,21 @@ msgstr ""
 msgid "only useful for debugging"
 msgstr ""
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -19683,25 +20741,25 @@ msgid ""
 "You can use '!git' in the alias to do this"
 msgstr ""
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr ""
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr ""
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr ""
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr ""
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr ""
 
@@ -19753,22 +20811,22 @@ msgstr ""
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr ""
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 
-#: http.c:1096
+#: http.c:1097
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -19776,147 +20834,156 @@ msgid ""
 "   redirect: %s"
 msgstr ""
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr ""
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr ""
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr ""
 
-#: remote-curl.c:446
+#: remote-curl.c:455
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""
 
-#: remote-curl.c:450
+#: remote-curl.c:459
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr ""
 
-#: remote-curl.c:454
+#: remote-curl.c:463
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr ""
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, c-format
 msgid "RPC failed; %s"
 msgstr ""
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 msgid "cannot handle pushes this big"
 msgstr ""
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 msgid "dumb http transport does not support shallow capabilities"
 msgstr ""
 
-#: remote-curl.c:1028
+#: remote-curl.c:1038
 msgid "fetch failed."
 msgstr ""
 
-#: remote-curl.c:1076
+#: remote-curl.c:1086
 msgid "cannot fetch by sha1 over smart http"
 msgstr ""
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1130 remote-curl.c:1136
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr ""
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1148 remote-curl.c:1263
 #, c-format
 msgid "http transport does not support %s"
 msgstr ""
 
-#: remote-curl.c:1174
+#: remote-curl.c:1184
 msgid "git-http-push failed"
 msgstr ""
 
-#: remote-curl.c:1360
+#: remote-curl.c:1369
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr ""
 
-#: remote-curl.c:1392
+#: remote-curl.c:1401
 msgid "remote-curl: error reading command stream from git"
 msgstr ""
 
-#: remote-curl.c:1399
+#: remote-curl.c:1408
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr ""
 
-#: remote-curl.c:1439
+#: remote-curl.c:1448
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr ""
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr ""
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr ""
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr ""
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr ""
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr ""
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr ""
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr ""
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+
 #: ref-filter.h:101
 msgid "key"
 msgstr ""
@@ -20422,162 +21489,170 @@ msgid "Common Git shell script setup code"
 msgstr ""
 
 #: command-list.h:171
-msgid "Stash the changes in a dirty working directory away"
+msgid "Initialize and modify the sparse-checkout"
 msgstr ""
 
 #: command-list.h:172
-msgid "Add file contents to the staging area"
+msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 
 #: command-list.h:173
-msgid "Show the working tree status"
+msgid "Add file contents to the staging area"
 msgstr ""
 
 #: command-list.h:174
-msgid "Remove unnecessary whitespace"
+msgid "Show the working tree status"
 msgstr ""
 
 #: command-list.h:175
-msgid "Initialize, update or inspect submodules"
+msgid "Remove unnecessary whitespace"
 msgstr ""
 
 #: command-list.h:176
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Initialize, update or inspect submodules"
 msgstr ""
 
 #: command-list.h:177
-msgid "Switch branches"
+msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
 #: command-list.h:178
-msgid "Read, modify and delete symbolic refs"
+msgid "Switch branches"
 msgstr ""
 
 #: command-list.h:179
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Read, modify and delete symbolic refs"
 msgstr ""
 
 #: command-list.h:180
-msgid "Creates a temporary file with a blob's contents"
+msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
 #: command-list.h:181
-msgid "Unpack objects from a packed archive"
+msgid "Creates a temporary file with a blob's contents"
 msgstr ""
 
 #: command-list.h:182
-msgid "Register file contents in the working tree to the index"
+msgid "Unpack objects from a packed archive"
 msgstr ""
 
 #: command-list.h:183
-msgid "Update the object name stored in a ref safely"
+msgid "Register file contents in the working tree to the index"
 msgstr ""
 
 #: command-list.h:184
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Update the object name stored in a ref safely"
 msgstr ""
 
 #: command-list.h:185
-msgid "Send archive back to git-archive"
+msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 
 #: command-list.h:186
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Send archive back to git-archive"
 msgstr ""
 
 #: command-list.h:187
-msgid "Show a Git logical variable"
+msgid "Send objects packed back to git-fetch-pack"
 msgstr ""
 
 #: command-list.h:188
-msgid "Check the GPG signature of commits"
+msgid "Show a Git logical variable"
 msgstr ""
 
 #: command-list.h:189
-msgid "Validate packed Git archive files"
+msgid "Check the GPG signature of commits"
 msgstr ""
 
 #: command-list.h:190
-msgid "Check the GPG signature of tags"
+msgid "Validate packed Git archive files"
 msgstr ""
 
 #: command-list.h:191
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Check the GPG signature of tags"
 msgstr ""
 
 #: command-list.h:192
-msgid "Show logs with difference each commit introduces"
+msgid "Git web interface (web frontend to Git repositories)"
 msgstr ""
 
 #: command-list.h:193
-msgid "Manage multiple working trees"
+msgid "Show logs with difference each commit introduces"
 msgstr ""
 
 #: command-list.h:194
-msgid "Create a tree object from the current index"
+msgid "Manage multiple working trees"
 msgstr ""
 
 #: command-list.h:195
-msgid "Defining attributes per path"
+msgid "Create a tree object from the current index"
 msgstr ""
 
 #: command-list.h:196
-msgid "Git command-line interface and conventions"
+msgid "Defining attributes per path"
 msgstr ""
 
 #: command-list.h:197
-msgid "A Git core tutorial for developers"
+msgid "Git command-line interface and conventions"
 msgstr ""
 
 #: command-list.h:198
-msgid "Git for CVS users"
+msgid "A Git core tutorial for developers"
 msgstr ""
 
 #: command-list.h:199
-msgid "Tweaking diff output"
+msgid "Git for CVS users"
 msgstr ""
 
 #: command-list.h:200
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "Tweaking diff output"
 msgstr ""
 
 #: command-list.h:201
-msgid "A Git Glossary"
+msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 
 #: command-list.h:202
-msgid "Hooks used by Git"
+msgid "A Git Glossary"
 msgstr ""
 
 #: command-list.h:203
-msgid "Specifies intentionally untracked files to ignore"
+msgid "Hooks used by Git"
 msgstr ""
 
 #: command-list.h:204
-msgid "Defining submodule properties"
+msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
 
 #: command-list.h:205
-msgid "Git namespaces"
+msgid "Defining submodule properties"
 msgstr ""
 
 #: command-list.h:206
-msgid "Git Repository Layout"
+msgid "Git namespaces"
 msgstr ""
 
 #: command-list.h:207
-msgid "Specifying revisions and ranges for Git"
+msgid "Git Repository Layout"
 msgstr ""
 
 #: command-list.h:208
-msgid "A tutorial introduction to Git: part two"
+msgid "Specifying revisions and ranges for Git"
 msgstr ""
 
 #: command-list.h:209
-msgid "A tutorial introduction to Git"
+msgid "Mounting one repository inside another"
 msgstr ""
 
 #: command-list.h:210
+msgid "A tutorial introduction to Git: part two"
+msgstr ""
+
+#: command-list.h:211
+msgid "A tutorial introduction to Git"
+msgstr ""
+
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr ""
 
@@ -20698,136 +21773,128 @@ msgstr ""
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr ""
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr ""
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr ""
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr ""
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr ""
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr ""
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr ""
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr ""
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr ""
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr ""
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
-#: git-submodule.sh:200
+#: git-submodule.sh:203
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 
-#: git-submodule.sh:210
+#: git-submodule.sh:213
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 
-#: git-submodule.sh:229
+#: git-submodule.sh:232
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr ""
 
-#: git-submodule.sh:232
+#: git-submodule.sh:235
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr ""
 
-#: git-submodule.sh:239
+#: git-submodule.sh:242
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr ""
 
-#: git-submodule.sh:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-
-#: git-submodule.sh:268
+#: git-submodule.sh:273
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr ""
 
-#: git-submodule.sh:270
+#: git-submodule.sh:275
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr ""
 
-#: git-submodule.sh:278
+#: git-submodule.sh:283
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 
-#: git-submodule.sh:280
+#: git-submodule.sh:285
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -20838,122 +21905,122 @@ msgid ""
 "option."
 msgstr ""
 
-#: git-submodule.sh:286
+#: git-submodule.sh:291
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 
-#: git-submodule.sh:298
+#: git-submodule.sh:303
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:303
+#: git-submodule.sh:308
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:312
+#: git-submodule.sh:317
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:573
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:583
+#: git-submodule.sh:600
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:588
+#: git-submodule.sh:605
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:606
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
 "$sha1:"
 msgstr ""
 
-#: git-submodule.sh:612
+#: git-submodule.sh:629
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr ""
 
-#: git-submodule.sh:619
+#: git-submodule.sh:636
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:620
+#: git-submodule.sh:637
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:624
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:625
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:630
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:631
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:636
+#: git-submodule.sh:653
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:637
+#: git-submodule.sh:654
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
-#: git-submodule.sh:668
+#: git-submodule.sh:685
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:830
+#: git-submodule.sh:896
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 
-#: git-submodule.sh:882
+#: git-submodule.sh:948
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 
-#: git-submodule.sh:902
+#: git-submodule.sh:968
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 
-#: git-submodule.sh:905
+#: git-submodule.sh:971
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 
-#: git-submodule.sh:908
+#: git-submodule.sh:974
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
@@ -21217,6 +22284,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] ""
 msgstr[1] ""
 
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr ""
+
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
 msgstr ""
@@ -21279,122 +22350,56 @@ msgid "Unable to determine absolute path of git directory"
 msgstr ""
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr ""
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr ""
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr ""
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr ""
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr ""
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr ""
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr ""
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr ""
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr ""
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr ""
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -21403,31 +22408,12 @@ msgid ""
 "Lines starting with %s will be removed.\n"
 msgstr ""
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -21436,7 +22422,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -21445,7 +22431,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -21454,7 +22440,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -21463,7 +22449,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -21472,7 +22458,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -21481,7 +22467,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -21490,7 +22476,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -21499,7 +22485,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -21512,226 +22498,85 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr ""
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr ""
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1468
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1469
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1470
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr ""
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr ""
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr ""
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr ""
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr ""
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
 msgstr ""
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr ""
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -21742,19 +22587,19 @@ msgid ""
 "changes\n"
 msgstr ""
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr ""
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""
diff --git a/third_party/git/po/it.po b/third_party/git/po/it.po
index 30ec99c74462..e9f596b8fdc7 100644
--- a/third_party/git/po/it.po
+++ b/third_party/git/po/it.po
@@ -6,13 +6,13 @@
 # Thanks to the former translators, Marco Paolone <marcopaolone AT gmail.com>
 # and Stefano Lattarini <stefano.lattarini AT gmail.com>, for their
 # contributions.
-# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2019.
+# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2019, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 20:12+0800\n"
-"PO-Revision-Date: 2019-08-11 11:48+0200\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-12 07:52+0100\n"
 "Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n"
 "Language-Team: Italian <>\n"
 "Language: it\n"
@@ -20,51 +20,758 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 19.04.3\n"
+"X-Generator: Lokalize 19.12.3\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Eh (%s)?"
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "impossibile leggere l'indice"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binario"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "non fare nulla"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "non modificato"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "Aggiorna"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "impossibile aggiungere '%s' all'area di staging"
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "impossibile scrivere l'indice"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "aggiornato %d percorso\n"
+msgstr[1] "aggiornati %d percorsi\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "nota: %s ora non รจ tracciato.\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry non riuscito per il percorso '%s'"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "Esegui il revert"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "Impossibile analizzare HEAD^{tree}"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "ripristinato %d percorso\n"
+msgstr[1] "ripristinati %d percorsi\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Nessun file non tracciato.\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "Aggiungi file non tracciati"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "aggiunto %d percorso\n"
+msgstr[1] "aggiunti %d percorsi\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignoro ciรฒ che non รจ stato sottoposto a merge: %s"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Sono stati modificati solo file binari.\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "Nessuna modifica.\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "Aggiornamento patch"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "Rivedi diff"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "visualizza i percorsi modificati"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+"aggiungi lo stato dall'albero di lavoro all'insieme delle modifiche "
+"nell'area di staging"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr ""
+"ripristina l'insieme delle modifiche nell'area di staging alla versione HEAD"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr ""
+"seleziona gli hunk in modalitร  interattiva ed esegui l'aggiornamento in modo "
+"selettivo"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "visualizza il diff fra HEAD e l'indice"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+"aggiungi i contenuti dei file non tracciati all'insieme delle modifiche "
+"nell'area di staging"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "Guida prompt:"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "seleziona un singolo elemento"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "seleziona un intervallo di elementi"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "seleziona piรน intervalli"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "seleziona un elemento basandoti su un prefisso univoco"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "deseleziona gli elementi specificati"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "seleziona tutti gli elementi"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "(vuoto) termina la selezione"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "seleziona un elemento numerato"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "(vuoto) non selezionare nulla"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** Comandi ***"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "Cosa faccio ora"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "nell'area di staging"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "rimosso dall'area di staging"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "percorso"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "impossibile aggiornare l'indice"
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "Ciao.\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Modifica modo stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Eliminazione stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarร  "
+"contrassegnato immediatamente per l'aggiunta all'area di staging."
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aggiungi quest'hunk all'area di staging\n"
+"n - non aggiungere quest'hunk all'area di staging\n"
+"q - esci; non aggiungere nรฉ quest'hunk nรฉ quelli rimanenti all'area di "
+"staging\n"
+"a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di "
+"staging\n"
+"d - non aggiungere nรฉ quest'hunk nรฉ quelli successivi nel file all'area di "
+"staging\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Modifica modo stash [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Eliminazione stash [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarร  "
+"contrassegnato immediatamente per lo stash."
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - esegui lo stash di quest'hunk\n"
+"n - non eseguire lo stash di quest'hunk\n"
+"q - esci; non eseguire lo stash di quest'hunk nรฉ di quelli rimanenti\n"
+"a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n"
+"d - non eseguire lo stash nรฉ di quest'hunk nรฉ di quelli successivi nel file\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarร  "
+"contrassegnato immediatamente per la rimozione dall'area di staging."
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - rimuovi quest'hunk dall'area di staging\n"
+"n - non rimuovere quest'hunk dall'area di staging\n"
+"q - esci; non rimuovere nรฉ quest'hunk nรฉ quelli rimanenti dall'area di "
+"staging\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file dall'area di "
+"staging\n"
+"d - non rimuovere nรฉ quest'hunk nรฉ quelli successivi nel file dall'area di "
+"staging\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarร  "
+"contrassegnato immediatamente per l'applicazione."
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applica quest'hunk all'indice\n"
+"n - non applicare quest'hunk all'indice\n"
+"q - esci; non applicare nรฉ quest'hunk nรฉ quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare nรฉ quest'hunk nรฉ quelli successivi nel file\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarร  "
+"contrassegnato immediatamente per la rimozione."
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - rimuovi quest'hunk dall'albero di lavoro\n"
+"n - non rimuovere quest'hunk dall'albero di lavoro\n"
+"q - esci; non rimuovere nรฉ quest'hunk nรฉ quelli rimanenti\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
+"d - non rimuovere nรฉ quest'hunk nรฉ quelli successivi nel file\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - rimuovi quest'hunk dall'indice e dall'albero di lavoro\n"
+"n - non rimuovere quest'hunk dall'indice e dall'albero di lavoro\n"
+"q - esci; non rimuovere nรฉ quest'hunk nรฉ quelli rimanenti\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
+"d - non rimuovere nรฉ quest'hunk nรฉ quelli successivi nel file\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applica quest'hunk all'indice e all'albero di lavoro\n"
+"n - non applicare quest'hunk all'indice e all'albero di lavoro\n"
+"q - esci; non applicare nรฉ quest'hunk nรฉ quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare nรฉ quest'hunk nรฉ quelli successivi nel file\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applica quest'hunk all'albero di lavoro\n"
+"n - non applicare quest'hunk all'albero di lavoro\n"
+"q - esci; non applicare nรฉ quest'hunk nรฉ quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare nรฉ quest'hunk nรฉ quelli successivi nel file\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "impossibile analizzare l'header hunk '%.*s'"
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "impossibile analizzare l'header hunk colorato '%.*s'"
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "impossibile analizzare il diff"
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "impossibile analizzare il diff colorato"
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "esecuzione di '%s' non riuscita"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "output di interactive.diffFilter non corrispondente"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Il filtro deve mantenere una corrispondenza uno a uno\n"
+"fra le righe di input e di output."
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"attesa riga contesto %d in\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"gli hunk non si sovrappongono:\n"
+"%.*s\n"
+"\tnon termina con:\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+"Modalitร  manuale modifica hunt - vedi la fine del file per una guida "
+"veloce.\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Per rimuovere '%c' righe, rendile righe ' ' (contesto).\n"
+"Per rimuovere '%c' righe, eliminale.\n"
+"Le righe che iniziano con %c saranno rimosse.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Se non puรฒ essere applicata senza problemi, ti sarร  data la possibilitร \n"
+"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n"
+"rimosse, la modifica sarร  interrotta e l'hunk non sarร  modificato.\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "impossibile analizzare l'header hunk"
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' non riuscito"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"L'hunk modificato non puรฒ essere applicato senza problemi. Modificarlo di "
+"nuovo (se rispondi \"no\", sarร  eliminato!) [y/n]? "
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "Vuoi comunque applicarli all'albero di lavoro? "
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "Non รจ stato applicato nulla.\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - non decidere in merito a quest'hunk, vai al successivo hunk per cui non "
+"รจ stata presa una decisione\n"
+"J - non decidere in merito a quest'hunk, vai all'hunk successivo\n"
+"k - non decidere in merito a quest'hunk, vai al precedente hunk per cui non "
+"รจ stata presa una decisione\n"
+"K - non decidere in merito a quest'hunk, vai all'hunk precedente\n"
+"g - seleziona un hunk a cui andare\n"
+"/ - cerca un hunk corrispondente all'espressione regolare data\n"
+"s - suddividi l'hunk corrente in hunk piรน piccoli\n"
+"e - modifica manualmente l'hunk corrente\n"
+"? - stampa una guida\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "Nessun hunk precedente"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "Nessun hunk successivo"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "Nessun altro hunk a cui andare"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "a quale hunk desideri andare? "
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Numero non valido: '%s'"
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Mi dispiace, รจ disponibile solo %d hunk."
+msgstr[1] "Mi dispiace, sono disponibili solo %d hunk."
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "Nessun altro hunk in cui eseguire la ricerca"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "cercare un'espressione regolare? "
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Espressione regolare di ricerca %s malformata: %s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "Nessun hunk corrisponde al pattern fornito"
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "Mi dispiace, non posso suddividere quest'hunk"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Suddiviso in %d hunk."
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "Mi dispiace, non posso modificare quest'hunk"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "'git apply' non riuscito"
+
+#: advice.c:115
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%ssuggerimento: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:168
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "Il cherry picking non รจ possibile perchรฉ ci sono file di cui non รจ stato "
 "eseguito il merge."
 
-#: advice.c:164
+#: advice.c:170
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 "Il commit non รจ possibile perchรฉ ci sono file di cui non รจ stato eseguito il "
 "merge."
 
-#: advice.c:166
+#: advice.c:172
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 "Il merge non รจ possibile perchรฉ ci sono file di cui non รจ stato eseguito il "
 "merge."
 
-#: advice.c:168
+#: advice.c:174
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 "Il pull non รจ possibile perchรฉ ci sono file di cui non รจ stato eseguito il "
 "merge."
 
-#: advice.c:170
+#: advice.c:176
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 "Il revert non รจ possibile perchรฉ ci sono file di cui non รจ stato eseguito il "
 "merge."
 
-#: advice.c:172
+#: advice.c:178
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 "Impossibile eseguire il %s perchรฉ ci sono file di cui non รจ stato eseguito "
 "il merge."
 
-#: advice.c:180
+#: advice.c:186
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -72,23 +779,23 @@ msgstr ""
 "Correggili nell'albero di lavoro, quindi usa 'git add/rm <file>...' come "
 "appropriato per risolverli ed esegui un commit."
 
-#: advice.c:188
+#: advice.c:194
 msgid "Exiting because of an unresolved conflict."
 msgstr "Esco a causa di un conflitto non risolto."
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:199 builtin/merge.c:1335
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Il merge non รจ stato concluso (esiste MERGE_HEAD)."
 
-#: advice.c:195
+#: advice.c:201
 msgid "Please, commit your changes before merging."
 msgstr "Esegui il commit delle modifiche prima di eseguire il merge."
 
-#: advice.c:196
+#: advice.c:202
 msgid "Exiting because of unfinished merge."
 msgstr "Esco a causa di un merge non terminato."
 
-#: advice.c:202
+#: advice.c:208
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -219,17 +926,7 @@ msgstr "modo non valido alla riga %d: %s"
 msgid "inconsistent header lines %d and %d"
 msgstr "righe di intestazione %d e %d inconsistenti"
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: riga inattesa: %.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "frammento di patch senza intestazione alla riga %d: %.*s"
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -244,82 +941,92 @@ msgstr[1] ""
 "l'intestazione git diff non riporta le informazioni sul file una volta "
 "rimossi %d componenti iniziali del percorso (riga %d)"
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "l'intestazione git diff non riporta le informazioni sul file (riga %d)"
 
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: riga inattesa: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "frammento di patch senza intestazione alla riga %d: %.*s"
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "il nuovo file dipende da vecchi contenuti"
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "il file eliminato ha ancora dei contenuti"
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "patch corrotta alla riga %d"
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "il nuovo file %s dipende da vecchi contenuti"
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "il file eliminato %s ha ancora dei contenuti"
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** attenzione: il file %s diventa vuoto ma non รจ eliminato"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binaria corrotta alla riga %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binaria non riconosciuta alla riga %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch con soli contenuti garbage alla riga %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "impossibile leggere il collegamento simbolico %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "impossibile aprire o leggere %s"
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "inizio della riga non valido: '%c'"
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Applicazione frammento %d riuscita alla riga %d (offset: %d riga)."
 msgstr[1] "Applicazione frammento %d riuscita alla riga %d (offset: %d righe)."
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contesto ridotto a (%ld/%ld) per applicare il frammento alla riga %d"
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -328,26 +1035,26 @@ msgstr ""
 "durante la ricerca di:\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "dati della patch binaria mancanti per '%s'"
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "impossibile applicare una patch binaria al contrario senza l'hunk contrario "
 "per '%s'"
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "impossibile applicare una patch binaria a '%s' senza la riga d'indice "
 "completa"
 
-#: apply.c:3151
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -355,432 +1062,418 @@ msgstr ""
 "la patch si applica a '%s' (%s), che non corrisponde ai contenuti correnti "
 "del file."
 
-#: apply.c:3159
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "la patch si applica a un file vuoto '%s' ma il file non รจ vuoto"
 
-#: apply.c:3177
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "impossibile leggere la postimmagine %s necessaria per '%s'"
 
-#: apply.c:3190
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "la patch binaria non si applica correttamente a '%s'"
 
-#: apply.c:3196
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)"
 
-#: apply.c:3217
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "patch non riuscita: %s:%ld"
 
-#: apply.c:3340
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "impossibile eseguire il checkout di '%s'"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
 #, c-format
 msgid "failed to read %s"
 msgstr "lettura di %s non riuscita"
 
-#: apply.c:3400
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lettura di '%s' oltre un collegamento simbolico"
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "il percorso %s รจ stato rinominato/eliminato"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: non esiste nell'indice"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: non corrisponde all'indice"
 
-#: apply.c:3559
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "dal repository manca il blob necessario per ripiegare sul merge a tre vie."
 
-#: apply.c:3562
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Ripiego sul merge a tre vie...\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "impossibile leggere i contenuti correnti di '%s'"
 
-#: apply.c:3594
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Ripiego sul merge a tre vie non riuscito...\n"
 
-#: apply.c:3608
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch applicata a '%s' con conflitti.\n"
 
-#: apply.c:3613
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch '%s' applicata correttamente.\n"
 
-#: apply.c:3639
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "la rimozione della patch lascia contenuti del file"
 
-#: apply.c:3712
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo errato"
 
-#: apply.c:3714
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ha il tipo %o, atteso %o"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr "percorso '%s' non valido"
 
-#: apply.c:3923
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: esiste giร  nell'indice"
 
-#: apply.c:3926
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: esiste giร  nella directory di lavoro"
 
-#: apply.c:3946
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o)"
 
-#: apply.c:3951
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o) di %s"
 
-#: apply.c:3971
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "il file interessato '%s' si trova oltre un collegamento simbolico"
 
-#: apply.c:3975
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: la patch non si applica correttamente"
 
-#: apply.c:3990
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Controllo della patch %s in corso..."
 
-#: apply.c:4082
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "le informazioni SHA1 per il sottomodulo %s sono mancanti o inutili"
 
-#: apply.c:4089
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "modifica modo per %s che non รจ nell'HEAD corrente"
 
-#: apply.c:4092
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "le informazioni SHA1 sono mancanti o inutili (%s)."
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry non riuscito per il percorso '%s'"
-
-#: apply.c:4101
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "impossibile aggiungere %s all'indice temporaneo"
 
-#: apply.c:4111
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "impossibile scrivere l'indice temporaneo in %s"
 
-#: apply.c:4249
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "impossibile rimuovere %s dall'indice"
 
-#: apply.c:4283
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrotta per il sottomodulo %s"
 
-#: apply.c:4289
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "impossibile eseguire lo stat del file appena creato '%s'"
 
-#: apply.c:4297
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "impossibile creare l'archivio di backup per il file appena creato %s"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "impossibile aggiungere la voce della cache per %s"
 
-#: apply.c:4346
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "scrittura in '%s' non riuscita"
 
-#: apply.c:4350
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr "chiusura del file '%s' in corso"
 
-#: apply.c:4420
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "impossibile scrivere il file '%s' con modo %o"
 
-#: apply.c:4518
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s applicata correttamente."
 
-#: apply.c:4526
+#: apply.c:4539
 msgid "internal error"
 msgstr "errore interno"
 
-#: apply.c:4529
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Applicazione della patch %%s con %d frammento respinto..."
 msgstr[1] "Applicazione della patch %%s con %d frammenti respinti..."
 
-#: apply.c:4540
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "nome file .rej troncato a %.*s.rej"
 
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
 #, c-format
 msgid "cannot open %s"
 msgstr "impossibile aprire %s"
 
-#: apply.c:4562
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Frammento %d applicato correttamente."
 
-#: apply.c:4566
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Frammento %d respinto."
 
-#: apply.c:4676
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ignorata."
 
-#: apply.c:4684
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr "input non riconosciuto"
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr "impossibile leggere il file index"
 
-#: apply.c:4859
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "impossibile aprire la patch '%s': %s"
 
-#: apply.c:4886
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d errore di spazi bianchi soppresso"
 msgstr[1] "%d errori di spazi bianchi soppressi"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d riga aggiunge errori di spazi bianchi."
 msgstr[1] "%d righe aggiungono errori di spazi bianchi."
 
-#: apply.c:4900
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d riga applicata dopo la correzione di errori di spazi bianchi."
 msgstr[1] "%d righe applicate dopo la correzione di errori di spazi bianchi."
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "Impossibile scrivere il nuovo file index"
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "percorso"
-
-#: apply.c:4944
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr "non applicare le modifiche corrispondenti al percorso specificato"
 
-#: apply.c:4947
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr "applica le modifiche corrispondenti al percorso specificato"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4973 builtin/am.c:2260
 msgid "num"
 msgstr "num"
 
-#: apply.c:4950
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali"
 
-#: apply.c:4953
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr "ignora le aggiunte create dalla patch"
 
-#: apply.c:4955
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "invece di applicare la patch, visualizza l'output di diffstat per l'input"
 
-#: apply.c:4959
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "visualizza il numero di righe aggiunte ed eliminate in notazione decimale"
 
-#: apply.c:4961
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "invece di applicare la patch, visualizza un riassunto per l'input"
 
-#: apply.c:4963
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "invece di applicare la patch, verifica se puรฒ essere applicata"
 
-#: apply.c:4965
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr "assicura che la patch sia applicabile all'indice corrente"
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "contrassegna i nuovi file con `git add --intent-to-add`"
 
-#: apply.c:4969
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr "applica una patch senza modificare l'albero di lavoro"
 
-#: apply.c:4971
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 "accetta una patch che apporta modifiche al di fuori dell'area di lavoro"
 
-#: apply.c:4974
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "applica anche la patch (da usare con --stat/--summary/--check)"
 
-#: apply.c:4976
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "prova un merge a tre vie se la patch non si applica correttamente"
 
-#: apply.c:4978
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr "compila un index temporaneo basato sulle informazioni indice incluse"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr "i percorsi sono separati con un carattere NUL"
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
 msgstr "assicura che almeno <n> righe di contesto corrispondano"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
 msgid "action"
 msgstr "azione"
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi"
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignora modifiche agli spazi bianchi durante la ricerca dei contesti"
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr "applica la patch in maniera inversa"
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "don't expect at least one line of context"
 msgstr "non aspettare almeno una riga di contesto"
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lascia i frammenti respinti nei file *.rej corrispondenti"
 
-#: apply.c:5000
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr "consenti la sovrapposizione dei frammenti"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "visualizza ulteriori dettagli"
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tollera carattere fine riga rilevato erroneamente come mancante alla fine "
 "del file"
 
-#: apply.c:5006
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 "non fare affidamento sul numero di righe nelle intestazioni dei frammenti"
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5032 builtin/am.c:2248
 msgid "root"
 msgstr "radice"
 
-#: apply.c:5009
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr "anteponi <radice> a tutti i nomi file"
 
@@ -803,7 +1496,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repository> [--exec <comando>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file"
@@ -835,7 +1528,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "formato archivio"
 
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr "prefisso"
 
@@ -843,11 +1536,12 @@ msgstr "prefisso"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr "file"
 
@@ -880,7 +1574,7 @@ msgid "list supported archive formats"
 msgstr "elenca i formati archivio supportati"
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr "repository"
 
@@ -888,7 +1582,7 @@ msgstr "repository"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "recupera l'archivio dal repository remoto <repository>"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "comando"
@@ -919,66 +1613,66 @@ msgstr "Formato archivio '%s' sconosciuto"
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argomento non supportato per il formato '%s': -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:351
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "impossibile eseguire lo streaming del blob %s"
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:369
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "modo file non supportato: 0%o (SHA1: %s)"
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:359
 #, c-format
 msgid "cannot read %s"
 msgstr "impossibile leggere %s"
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "impossibile avviare il filtro '%s'"
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr "impossibile ridirezionare il descrittore"
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "il filtro '%s' ha segnalato un errore"
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "il percorso non รจ codificato validamente in UTF-8: %s"
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s"
 
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
 #, c-format
 msgid "deflate error (%d)"
 msgstr "errore deflate (%d)"
 
-#: archive-zip.c:609
+#: archive-zip.c:615
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>"
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s non รจ un nome attributo valido"
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s non consentito: %s:%d"
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -996,12 +1690,12 @@ msgstr "Contenuto mal racchiuso fra virgolette nel file '%s': %s"
 msgid "We cannot bisect more!\n"
 msgstr "Impossibile eseguire un'ulteriore bisezione!\n"
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s non รจ un nome commit valido"
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1010,7 +1704,7 @@ msgstr ""
 "La base del merge %s non funziona.\n"
 "Ciรฒ significa che il bug รจ stato corretto fra %s e [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1019,7 +1713,7 @@ msgstr ""
 "La base del merge %s รจ nuova.\n"
 "La proprietร  รจ stata modificata fra %s e [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1028,7 +1722,7 @@ msgstr ""
 "La base del merge %s รจ %s.\n"
 "Ciรฒ significa che il primo commit '%s' รจ fra %s e [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1039,7 +1733,7 @@ msgstr ""
 "git bisect non puรฒ funzionare correttamente in questo caso.\n"
 "Forse hai confuso le revisioni %s con quelle %s?\n"
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1050,36 +1744,36 @@ msgstr ""
 "Non รจ possibile essere sicuri che il primo commit %s sia fra %s e %s.\n"
 "Continuo comunque."
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisezione: dev'essere testata una base del merge\n"
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr "รจ richiesta una revisione %s"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
 #, c-format
 msgid "could not create file '%s'"
 msgstr "impossibile creare il file '%s'"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossibile leggere il file '%s'"
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr "lettura riferimenti della bisezione non riuscita"
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s era sia %s sia %s\n"
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1088,7 +1782,7 @@ msgstr ""
 "Nessun commit testabile trovato.\n"
 "Forse hai iniziato il procedimento specificando parametri percorso errati?\n"
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1098,7 +1792,7 @@ msgstr[1] "(circa %d passi)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1107,41 +1801,41 @@ msgstr[0] ""
 msgstr[1] ""
 "Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n"
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents e --reverse non sono compatibili."
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr "impossibile usare --contents con il nome oggetto del commit finale"
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "le opzioni --reverse e --first-parent se usate insieme richiedono che sia "
 "specificato l'ultimo commit"
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "impostazione percorso revisioni non riuscita"
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "le opzioni --reverse e --first-parent se usate insieme richiedono che sia "
 "specificato un intervallo nella catena del primo commit genitore"
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr "il percorso %s in %s non esiste"
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "impossibile leggere il blob %s per il percorso %s"
@@ -1303,8 +1997,8 @@ msgstr "'%s' non sembra essere un file bundle v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "intestazione non riconosciuta: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
 #, c-format
 msgid "could not open '%s'"
 msgstr "impossibile aprire '%s'"
@@ -1335,62 +2029,62 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Il bundle richiede questo riferimento:"
 msgstr[1] "Il bundle richiede questi %d riferimenti:"
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr "impossibile duplicare il descrittore bundle"
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "Impossibile avviare pack-objects"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "comando pack-objects morto"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "comando rev-list morto"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "il riferimento '%s' รจ escluso dalle opzioni di rev-list"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argomento non riconosciuto: %s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "Mi rifiuto di creare un bundle vuoto."
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "impossibile creare '%s'"
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "comando index-pack morto"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "valore colore non valido: %.*s"
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "impossibile analizzare %s"
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s non รจ un commit!"
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1410,27 +2104,27 @@ msgstr ""
 "Per disabilitare questo messaggio, esegui\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1127
+#: commit.c:1153
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Il commit %s ha una firma GPG non affidabile, presumibilmente di %s."
 
-#: commit.c:1130
+#: commit.c:1157
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Il commit %s ha una firma GPG non valida presumibilmente di %s."
 
-#: commit.c:1133
+#: commit.c:1160
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Il commit %s non ha una firma GPG."
 
-#: commit.c:1136
+#: commit.c:1163
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Il commit %s ha una firma GPG valida di %s\n"
 
-#: commit.c:1390
+#: commit.c:1417
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1441,108 +2135,113 @@ msgstr ""
 "la variabile di configurazione i18n.commitencoding alla codifica usata\n"
 "dal tuo progetto.\n"
 
-#: commit-graph.c:127
+#: commit-graph.c:122
 msgid "commit-graph file is too small"
 msgstr "il file grafo dei commit %s รจ troppo piccolo"
 
-#: commit-graph.c:192
+#: commit-graph.c:189
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "la firma del grafo dei commit %X non corrisponde alla firma %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:196
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "la versione del grafo dei commit %X non corrisponde alla versione %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:203
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr ""
 "la versione hash del grafo dei commit %X non corrisponde alla versione %X"
 
-#: commit-graph.c:229
+#: commit-graph.c:226
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr ""
 "voce blocco grafo dei commit mancante nella tabella di ricerca; il file "
 "potrebbe non essere completo"
 
-#: commit-graph.c:240
+#: commit-graph.c:237
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "offset blocco grafo dei commit improprio %08x%08x"
 
-#: commit-graph.c:283
+#: commit-graph.c:280
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "l'ID del blocco grafo dei commit %08x compare piรน volte"
 
-#: commit-graph.c:347
+#: commit-graph.c:343
 msgid "commit-graph has no base graphs chunk"
 msgstr "il grafo dei commit non ha un blocco grafi di base"
 
-#: commit-graph.c:357
+#: commit-graph.c:353
 msgid "commit-graph chain does not match"
 msgstr "la catena del grafo dei commit non corrisponde"
 
-#: commit-graph.c:404
+#: commit-graph.c:401
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "catena grafo dei commit non valida: la riga '%s' non รจ un hash"
 
-#: commit-graph.c:430
+#: commit-graph.c:425
 msgid "unable to find all commit-graph files"
 msgstr "impossibile trovare tutti i file grafo dei commit"
 
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:558 commit-graph.c:618
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "posizione commit non valida. Il grafo dei commit รจ probabilmente corrotto"
 
-#: commit-graph.c:575
+#: commit-graph.c:579
 #, c-format
 msgid "could not find commit %s"
 msgstr "impossibile trovare il commit %s"
 
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "impossibile analizzare il commit %s"
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "impossibile recuperare il tipo dell'oggetto %s"
 
-#: commit-graph.c:1034
+#: commit-graph.c:1043
 msgid "Loading known commits in commit graph"
 msgstr "Caricamento commit noti nel grafo dei commit in corso"
 
-#: commit-graph.c:1051
+#: commit-graph.c:1060
 msgid "Expanding reachable commits in commit graph"
 msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso"
 
-#: commit-graph.c:1070
+#: commit-graph.c:1079
 msgid "Clearing commit marks in commit graph"
 msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso"
 
-#: commit-graph.c:1089
+#: commit-graph.c:1098
 msgid "Computing commit graph generation numbers"
 msgstr "Calcolo numeri generazione del grafo dei commit in corso"
 
-#: commit-graph.c:1163
+#: commit-graph.c:1173
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
 msgstr[1] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
 
-#: commit-graph.c:1176
+#: commit-graph.c:1186
 #, c-format
 msgid "error adding pack %s"
 msgstr "errore durante l'aggiunta del pack %s"
 
-#: commit-graph.c:1180
+#: commit-graph.c:1190
 #, c-format
 msgid "error opening index for %s"
 msgstr "errore durante l'apertura dell'indice per %s"
 
-#: commit-graph.c:1204
+#: commit-graph.c:1214
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
@@ -1551,62 +2250,67 @@ msgstr[0] ""
 msgstr[1] ""
 "Ricerca dei commit per il grafo dei commit da %d riferimenti in corso"
 
-#: commit-graph.c:1238
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "ID oggetto commit non valido: %s"
+
+#: commit-graph.c:1249
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 "Ricerca dei commit per il grafo dei commit fra gli oggetti nei pack in corso"
 
-#: commit-graph.c:1253
+#: commit-graph.c:1264
 msgid "Counting distinct commits in commit graph"
 msgstr "Conteggio commit distinti nel grafo dei commit in corso"
 
-#: commit-graph.c:1284
+#: commit-graph.c:1294
 msgid "Finding extra edges in commit graph"
 msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso"
 
-#: commit-graph.c:1332
+#: commit-graph.c:1340
 msgid "failed to write correct number of base graph ids"
 msgstr "impossibile scrivere il numero esatto degli ID grafo di base"
 
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1373 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "impossibile creare le prime directory di %s"
 
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr "impossibile creare '%s'"
 
-#: commit-graph.c:1437
+#: commit-graph.c:1445
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Scrittura in %d passaggio del grafo dei commit in corso"
 msgstr[1] "Scrittura in %d passaggi del grafo dei commit in corso"
 
-#: commit-graph.c:1478
+#: commit-graph.c:1486
 msgid "unable to open commit-graph chain file"
 msgstr "impossibile aprire il file catena grafo dei commit"
 
-#: commit-graph.c:1490
+#: commit-graph.c:1498
 msgid "failed to rename base commit-graph file"
 msgstr "impossibile ridenominare il file di base grafo dei commit"
 
-#: commit-graph.c:1510
+#: commit-graph.c:1518
 msgid "failed to rename temporary commit-graph file"
 msgstr "impossibile ridenominare il file temporaneo grafo dei commit"
 
-#: commit-graph.c:1621
+#: commit-graph.c:1631
 msgid "Scanning merged commits"
 msgstr "Scansione dei commit sottoposti a merge in corso"
 
-#: commit-graph.c:1632
+#: commit-graph.c:1642
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "ID commit duplicato inatteso: %s"
 
-#: commit-graph.c:1657
+#: commit-graph.c:1665
 msgid "Merging commit-graph"
 msgstr "Merge del grafo dei commit in corso"
 
@@ -1620,24 +2324,24 @@ msgstr ""
 msgid "too many commits to write graph"
 msgstr "troppi commit da scrivere nel grafo"
 
-#: commit-graph.c:1945
+#: commit-graph.c:1944
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "il file del grafo dei commit ha un checksum non corretto e probabilmente รจ "
 "corrotto"
 
-#: commit-graph.c:1955
+#: commit-graph.c:1954
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "il grafo dei commit ha un ordine OID non corretto: %s seguito da %s"
 
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1964 commit-graph.c:1979
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "il grafo dei commit ha un valore fanout non corretto: fanout[%d] = %u != %u"
 
-#: commit-graph.c:1972
+#: commit-graph.c:1971
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "impossibile analizzare il commit %s nel grafo dei commit"
@@ -1646,37 +2350,37 @@ msgstr "impossibile analizzare il commit %s nel grafo dei commit"
 msgid "Verifying commits in commit graph"
 msgstr "Verifica dei commit nel grafo dei commit in corso"
 
-#: commit-graph.c:2002
+#: commit-graph.c:2003
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "impossibile analizzare il commit %s dal database oggetti per il grafo dei "
 "commit"
 
-#: commit-graph.c:2009
+#: commit-graph.c:2010
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "l'OID dell'albero radice per il commit %s nel grafo dei commit รจ %s != %s"
 
-#: commit-graph.c:2019
+#: commit-graph.c:2020
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "l'elenco genitori nel grafo dei commit per il commit %s รจ troppo lungo"
 
-#: commit-graph.c:2028
+#: commit-graph.c:2029
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "il genitore nel grafo dei commit per %s รจ %s != %s"
 
-#: commit-graph.c:2041
+#: commit-graph.c:2042
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 "l'elenco genitori nel grafo dei commit per il commit %s รจ finito prima del "
 "previsto"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2047
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1684,7 +2388,7 @@ msgstr ""
 "il grafo dei commit ha un numero generazione zero per il commit %s ma non "
 "pari a zero per gli altri"
 
-#: commit-graph.c:2050
+#: commit-graph.c:2051
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1692,12 +2396,12 @@ msgstr ""
 "il grafo dei commit ha un numero generazione non pari a zero per il commit "
 "%s ma pari a zero per gli altri"
 
-#: commit-graph.c:2065
+#: commit-graph.c:2066
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "il numero generazione nel grafo dei commit per il commit %s รจ %u != %u"
 
-#: commit-graph.c:2071
+#: commit-graph.c:2072
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
@@ -1746,7 +2450,7 @@ msgstr "la chiave non contiene una sezione: %s"
 msgid "key does not contain variable name: %s"
 msgstr "la chiave non contiene un nome variabile: %s"
 
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2444
 #, c-format
 msgid "invalid key: %s"
 msgstr "chiave non valida: %s"
@@ -1887,7 +2591,7 @@ msgstr "valore malformato per %s: %s"
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "dev'essere nothing, matching, simple, upstream o current"
 
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1518 builtin/pack-objects.c:3541
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "livello compressione pack %d non valido"
@@ -1912,116 +2616,109 @@ msgstr "impossibile risolvere il blob configurazione '%s'"
 msgid "failed to parse %s"
 msgstr "analisi di %s non riuscita"
 
-#: config.c:1745
+#: config.c:1743
 msgid "unable to parse command-line config"
 msgstr "impossibile analizzare la configurazione a riga di comando"
 
-#: config.c:2094
+#: config.c:2097
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "si รจ verificato un errore imprevisto durante la lettura dei file di "
 "configurazione"
 
-#: config.c:2264
+#: config.c:2267
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s non valido: '%s'"
 
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-"valore core.untrackedCache '%s' non valido; utilizzerรฒ il valore predefinito "
-"'keep'"
-
-#: config.c:2333
+#: config.c:2312
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "il valore splitIndex.maxPercentChange '%d' dovrebbe essere compreso fra 0 e "
 "100"
 
-#: config.c:2379
+#: config.c:2358
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "impossibile analizzare '%s' dalla configurazione a riga di comando"
 
-#: config.c:2381
+#: config.c:2360
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "variabile configurazione '%s' errata nel file '%s' alla riga %d"
 
-#: config.c:2462
+#: config.c:2441
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nome sezione '%s' non valido"
 
-#: config.c:2494
+#: config.c:2473
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s ha piรน valori"
 
-#: config.c:2523
+#: config.c:2502
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "scrittura del nuovo file di configurazione %s non riuscita"
 
-#: config.c:2775 config.c:3099
+#: config.c:2754 config.c:3078
 #, c-format
 msgid "could not lock config file %s"
 msgstr "impossibile bloccare il file di configurazione %s"
 
-#: config.c:2786
+#: config.c:2765
 #, c-format
 msgid "opening %s"
 msgstr "apertura di %s in corso"
 
-#: config.c:2821 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "pattern non valido: %s"
 
-#: config.c:2846
+#: config.c:2825
 #, c-format
 msgid "invalid config file %s"
 msgstr "file di configurazione %s non valido"
 
-#: config.c:2859 config.c:3112
+#: config.c:2838 config.c:3091
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat di %s non riuscita"
 
-#: config.c:2870
+#: config.c:2849
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "impossibile eseguire mmap su '%s'"
 
-#: config.c:2879 config.c:3117
+#: config.c:2858 config.c:3096
 #, c-format
 msgid "chmod on %s failed"
 msgstr "esecuzione chmod su %s non riuscita"
 
-#: config.c:2964 config.c:3214
+#: config.c:2943 config.c:3193
 #, c-format
 msgid "could not write config file %s"
 msgstr "impossibile scrivere il file di configurazione %s"
 
-#: config.c:2998
+#: config.c:2977
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "impossibile impostare '%s' a '%s'"
 
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr "impossibile eliminare l'impostazione di '%s'"
 
-#: config.c:3090
+#: config.c:3069
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nome sezione non valido: %s"
 
-#: config.c:3257
+#: config.c:3236
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valore mancante per '%s'"
@@ -2146,7 +2843,7 @@ msgstr "impossibile risolvere %s (%s)"
 msgid "unknown port %s"
 msgstr "porta %s sconosciuta"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "nome host strano '%s' bloccato"
@@ -2161,60 +2858,60 @@ msgstr "porta strana '%s' bloccata"
 msgid "cannot start proxy %s"
 msgstr "impossibile avviare il proxy %s"
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "nessun percorso specificato; vedere 'git help pull' per le sintassi URL "
 "valide"
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr "la variante SSH 'simple' non supporta -4"
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr "la variante SSH 'simple' non supporta -6"
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "la variante SSH 'simple' non supporta l'impostazione della porta"
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "percorso strano '%s' bloccato"
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr "impossibile eseguire fork"
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr "Controllo connessione in corso"
 
-#: connected.c:98
+#: connected.c:110
 msgid "Could not run 'git rev-list'"
 msgstr "Impossibile eseguire 'git-rev-list'"
 
-#: connected.c:118
+#: connected.c:130
 msgid "failed write to rev-list"
 msgstr "scrittura nella rev-list non riuscita"
 
-#: connected.c:125
+#: connected.c:137
 msgid "failed to close rev-list's stdin"
 msgstr "chiusura standard input della rev-list non riuscita"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "crlf_action %d illecita"
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF sarebbe sostituito da LF in %s"
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2223,12 +2920,12 @@ msgstr ""
 "CRLF sarร  sostituito da LF in %s.\n"
 "Il file avrร  i suoi fine riga originari nella propria directory di lavoro"
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF sarebbe sostituito da CRLF in %s"
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2237,19 +2934,19 @@ msgstr ""
 "LF sarร  sostituito da CRLF in %s.\n"
 "Il file avrร  i suoi fine riga originari nella propria directory di lavoro"
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "Il BOM รจ vietato in '%s' se il file รจ codificato come %s"
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
-"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-%s "
-"come codifica dell'albero di lavoro."
+"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-"
+"%.*s come codifica dell'albero di lavoro."
 
 #: convert.c:304
 #, c-format
@@ -2266,51 +2963,51 @@ msgstr ""
 "o UTF-%sLE (a seconda dell'ordine dei byte) come codifica dell'albero di "
 "lavoro."
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "conversione della codifica '%s' da %s a %s non riuscita"
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 "il risultato della codifica di '%s' da %s a %s e viceversa non รจ lo stesso"
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "impossibile eseguire fork per eseguire il filtro esterno '%s'"
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "impossibile fornire l'input al filtro esterno '%s'"
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "esecuzione del filtro esterno '%s' non riuscita: %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "lettura dal filtro esterno '%s' non riuscita"
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "esecuzione del filtro esterno '%s' non riuscita"
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr "tipo filtro inatteso"
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr "nome percorso troppo lungo per il filtro esterno"
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2319,67 +3016,67 @@ msgstr ""
 "il filtro esterno '%s' non รจ piรน disponibile nonostante non tutti i percorsi "
 "siano stati filtrati"
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false non sono codifiche dell'albero di lavoro valide"
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: esecuzione del filtro clean '%s' non riuscita"
 
-#: convert.c:1476
+#: convert.c:1489
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: esecuzione del filtro smudge '%s' non riuscita"
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr "in futuro"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "%<PRIuMAX> secondo fa"
 msgstr[1] "%<PRIuMAX> secondi fa"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "%<PRIuMAX> minuto fa"
 msgstr[1] "%<PRIuMAX> minuti fa"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "%<PRIuMAX> ora fa"
 msgstr[1] "%<PRIuMAX> ore fa"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "%<PRIuMAX> giorno fa"
 msgstr[1] "%<PRIuMAX> giorni fa"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "%<PRIuMAX> settimana fa"
 msgstr[1] "%<PRIuMAX> settimane fa"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "%<PRIuMAX> mese fa"
 msgstr[1] "%<PRIuMAX> mesi fa"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2387,14 +3084,14 @@ msgstr[0] "%<PRIuMAX> anno"
 msgstr[1] "%<PRIuMAX> anni"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "%s, %<PRIuMAX> mese fa"
 msgstr[1] "%s, %<PRIuMAX> mesi fa"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2433,7 +3130,7 @@ msgstr "Contrassegnate %d isole, fatto.\n"
 msgid "failed to read orderfile '%s'"
 msgstr "lettura dell'orderfile '%s' non riuscita"
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr "Rilevamento ridenominazione non esatta in corso"
 
@@ -2502,36 +3199,36 @@ msgstr ""
 "Trovati errori nella variabile di configurazione 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "processo esterno diff morto, mi fermo a %s"
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "le opzioni --name-only, --name-status, --check e -s sono mutuamente esclusive"
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "le opzioni -G, -S e --find-object sono mutuamente esclusive"
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow richiede esattamente uno specificatore percorso"
 
-#: diff.c:4689
+#: diff.c:4676
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valore non valido per --stat: %s"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s richiede un valore numerico"
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2540,42 +3237,42 @@ msgstr ""
 "Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "classe modifica '%c' sconosciuta in --diff-filter=%s"
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valore sconosciuto dopo ws-error-highlight=%.*s"
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "impossibile risolvere '%s'"
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s richiede il formato <n>/<m>"
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s richiede un carattere, ricevuto '%s'"
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "argomento --color-moved errato: %s"
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "modo non valido '%s' in --color-moved-ws"
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2583,151 +3280,151 @@ msgstr ""
 "l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience"
 "\" e \"histogram\""
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argomento non valido per %s"
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "analisi del parametro dell'opzione --submodule non riuscita: '%s'"
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "argomento --word-diff errato: %s"
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr "Opzioni formato output diff"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr "genera patch"
 
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr "non visualizzare l'output del diff"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr "genera diff con <n> righe di contesto"
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr "genera il diff in formato grezzo"
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr "sinonimo di '-p --raw'"
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr "sinonimo di '-p --stat'"
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr "--stat leggibile da una macchina"
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr "emetti in output solo l'ultima riga di --stat"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr "<parametro1,parametro2>..."
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "emetti in output la distribuzione del numero di modifiche relativo a ogni "
 "sottodirectory"
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinonimo di --dirstat=cumulative"
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "sinonimo di --dirstat=files,parametro1,parametro2..."
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "avvisa se le modifiche introducono marcatori conflitto o errori spazi bianchi"
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "riassunto conciso (ad es. elementi creati, ridenominati e modifiche modi)"
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr "visualizza solo i nomi dei file modificati"
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr "visualizza solo i nomi e lo stato dei file modificati"
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]"
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr "genera diffstat"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr "<ampiezza>"
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr "genera il diffstat con un'ampiezza specificata"
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr "genera il diffstat con un'ampiezza nomi specificata"
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr "genera il diffstat con un'ampiezza grafo specificata"
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr "<numero>"
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr "genera il diffstat con righe limitate"
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr "genera riassunto conciso nel diffstat"
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr "stampa in output un diff binario che puรฒ essere applicato"
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "visualizza i nomi oggetto pre e post immagine nelle righe \"indice\""
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr "visualizza diff colorato"
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr "<tipo>"
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2735,7 +3432,7 @@ msgstr ""
 "evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o "
 "'nuove' nel diff"
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2743,91 +3440,91 @@ msgstr ""
 "non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo "
 "in --raw o --numstat"
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr "<prefisso>"
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr "visualizza il prefisso sorgente specificato invece di \"a/\""
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "visualizza il prefisso destinazione specificato invece di \"b/\""
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output"
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr "non visualizzare alcun prefisso sorgente o destinazione"
 
-#: diff.c:5371
+#: diff.c:5358
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "visualizza il contesto tra gli hunk del diff fino al numero di righe "
 "specificato"
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr "<carattere>"
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "specifica il carattere che indica una nuova riga al posto di '+'"
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "specifica il carattere che indica una vecchia riga al posto di '-'"
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "specifica il carattere che indica un contesto al posto di ' '"
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr "Opzioni rinominazione diff"
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "spezza modifiche di riscrittura completa in coppie eliminazione/creazione"
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr "rileva le ridenominazioni"
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr "ometti la preimmagine per le eliminazioni"
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr "rileva le copie"
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr "usa file non modificati come sorgente per trovare copie"
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr "disabilita rilevamento ridenominazione"
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
 msgstr "usa blob vuoti come sorgente ridenominazione"
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 "continua a elencare la cronologia di un file al di lร  delle ridenominazioni"
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2835,159 +3532,159 @@ msgstr ""
 "impedisci il rilevamento ridenominazione/copia se il numero delle "
 "destinazioni ridenominazione/copia eccede il limite specificato"
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr "Opzioni algoritmo diff"
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr "produci il diff piรน piccolo possibile"
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr "ignora gli spazi bianchi durante il confronto delle righe"
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr "ignora le modifiche al numero degli spazi bianchi"
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignora modifiche agli spazi bianchi a fine riga"
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr "ignora carattere ritorno a capo a fine riga"
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr "ignora modifiche che riguardano solo righe vuote"
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "euristica per spostare i limiti degli hunk nel diff per una lettura agevole"
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "genera il diff usando l'algoritmo \"patience diff\""
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "genera il diff usando l'algoritmo \"histogram diff\""
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr "<algoritmo>"
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr "seleziona un algoritmo diff"
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr "<testo>"
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "genera il diff usando l'algoritmo \"anchored diff\""
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr "<modalitร >"
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "visualizza il diff parola per parola usando <modalitร > per delimitare le "
 "parole modificate"
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr "<espressione regolare>"
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr "usa <espressione regolare> per decidere cosa costituisce una parola"
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr ""
 "equivalente di --word-diff=color --word-diff-regex=<espressione regolare>"
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
 msgstr "le righe di codice spostate sono colorate in modo diverso"
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
 msgstr "modo in cui sono ignorati gli spazi bianchi in --color-moved"
 
-#: diff.c:5469
+#: diff.c:5456
 msgid "Other diff options"
 msgstr "Altre opzioni diff"
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "se eseguito da una sottodirectory, escludi le modifiche esterne ad essa e "
 "visualizza i percorsi relativi"
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr "tratta tutti i file come se fossero di testo"
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
 msgstr "scambia i due input, genera un diff al contrario"
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "esci con codice 1 se ci sono differenze, con 0 altrimenti"
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr "disabilita l'intero output del programma"
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr "consenti l'esecuzione di un helper diff esterno"
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "esegui filtri di conversione in testo esterni quando si confrontano file "
 "binari"
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr "<quando>"
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignora le modifiche ai sottomoduli durante la generazione del diff"
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr "<formato>"
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr "specifica come verranno visualizzate le differenze nei sottomoduli"
 
-#: diff.c:5496
+#: diff.c:5483
 msgid "hide 'git add -N' entries from the index"
 msgstr "nascondi le voci 'git add -N' nell'indice"
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "tratta le voci 'git add -N' come reali nell'indice"
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr "<stringa>"
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -2995,7 +3692,7 @@ msgstr ""
 "cerca differenze che modificano il numero di occorrenze della stringa "
 "specificata"
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3003,24 +3700,24 @@ msgstr ""
 "cerca differenze che modificano il numero di occorrenze dell'espressione "
 "regolare specificata"
 
-#: diff.c:5508
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
 msgstr "visualizza tutte le modifiche nel changeset con -S o -G"
 
-#: diff.c:5511
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 "tratta la <stringa> nell'opzione -S come un'espressione regolare POSIX estesa"
 
-#: diff.c:5514
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
 msgstr "controlla l'ordine con cui i file appariranno nell'output"
 
-#: diff.c:5515
+#: diff.c:5502
 msgid "<object-id>"
 msgstr "<ID oggetto>"
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3028,34 +3725,34 @@ msgstr ""
 "cerca differenze che modificano il numero di occorrenze dell'oggetto "
 "specificato"
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
 msgstr "seleziona file in base al tipo diff"
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr "<file>"
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr "Salva l'output in un file specifico"
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "il rilevamento ridenominazione non esatta รจ stato omesso per la presenza di "
 "troppi file."
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "trovate solo copie dai percorsi modificati per la presenza di troppi file."
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3063,41 +3760,62 @@ msgstr ""
 "potresti voler impostare la variabile %s ad almeno %d e riprovare ad "
 "eseguire il comando."
 
-#: dir.c:537
+#: dir.c:555
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 "lo specificatore percorso '%s' non corrisponde ad alcun file noto a git"
 
-#: dir.c:926
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "pattern non riconosciuto: '%s'"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "pattern negativo non riconosciuto: '%s'"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"il file sparse-checkout potrebbe avere dei problemi: il pattern '%s' รจ "
+"ripetuto"
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "disabilito il pattern matching di tipo cone"
+
+#: dir.c:1173
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "impossibile usare %s come file di esclusione"
 
-#: dir.c:1843
+#: dir.c:2144
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "impossibile aprire la directory '%s'"
 
-#: dir.c:2085
+#: dir.c:2479
 msgid "failed to get kernel name and information"
 msgstr "impossibile ottenere il nome e le informazioni sul kernel"
 
-#: dir.c:2209
+#: dir.c:2603
 msgid "untracked cache is disabled on this system or location"
 msgstr "la cache non tracciata รจ disabilitata su questo sistema o percorso"
 
-#: dir.c:3013
+#: dir.c:3407
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "file index corrotto nel repository %s"
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3452 dir.c:3457
 #, c-format
 msgid "could not create directories for %s"
 msgstr "impossibile creare le directory per %s"
 
-#: dir.c:3092
+#: dir.c:3486
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "impossibile migrare la directory git da '%s' a '%s'"
@@ -3117,12 +3835,12 @@ msgstr "Filtraggio contenuto in corso"
 msgid "could not stat file '%s'"
 msgstr "impossibile eseguire stat sul file '%s'"
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "percorso spazio dei nomi git \"%s\" non valido"
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "impossibile impostare GIT_DIR a '%s'"
@@ -3132,268 +3850,272 @@ msgstr "impossibile impostare GIT_DIR a '%s'"
 msgid "too many args to run %s"
 msgstr "troppi argomenti per eseguire %s"
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Remoto senza URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: attesa lista shallow"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: atteso pacchetto flush dopo lista shallow"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: attesi ACK/NAK, ricevuto pacchetto flush"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: attesi ACK/NAK, ricevuto '%s'"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr "impossibile scrivere sul remoto"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc richiede multi_ack_detailed"
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "riga shallow non valida: '%s'"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "riga unshallow non valida: '%s'"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr "oggetto non trovato: %s"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr "errore nell'oggetto: %s"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr "nessuno shallow trovato: %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "attesi shallow/unshallow, ricevuto %s"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr "ricevuto %s %d %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit non valido: %s"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr "smetto di provare"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr "fatto"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "ricevuto %s (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Contrassegno %s come completo"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ho giร  %s (%s)"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 "fetch-pack: impossibile eseguire il fork del demultiplexer della banda "
 "laterlae"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr "errore protocollo: intestazione pack non valida"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: impossibile eseguire il fork di %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr "%s non riuscito"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr "errore nel demultiplexer della banda laterale"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La versione del server รจ %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr "Il server supporta %s"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr "Il server non supporta client shallow"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr "Il server non supporta --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr "Il server non supporta --shallow-exclude"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr "Il server non supporta --deepen"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr "nessun commit in comune"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: recupero non riuscito."
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr "Il server non supporta le richieste shallow"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr "Il server supporta filter"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr "impossibile scrivere la richiesta sul remoto"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "errore durante la lettura dell'intestazione di sezione '%s'"
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "atteso '%s', ricevuto '%s'"
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "riga di conferma inattesa: '%s'"
 
-#: fetch-pack.c:1252
+#: fetch-pack.c:1308
 #, c-format
 msgid "error processing acks: %d"
 msgstr "errore durante l'elaborazione degli ack: %d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr "ci si attendeva che il packfile fosse inviato dopo 'ready'"
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 "ci si attendeva che nessun'altra sezione fosse inviata in assenza di 'ready'"
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "errore durante l'elaborazione delle informazioni shallow: %d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "atteso wanted-ref, ricevuto '%s'"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inatteso: '%s'"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d"
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr "nessun head remoto corrispondente"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:689
 msgid "remote did not send all necessary objects"
 msgstr "il remoto non ha inviato tutti gli oggetti necessari"
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr "riferimento remoto non esistente: %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Il server non consente richieste per l'oggetto non pubblicizzato %s"
 
-#: gpg-interface.c:321
+#: gpg-interface.c:408
 msgid "gpg failed to sign the data"
 msgstr "gpg non รจ riuscito a firmare i dati"
 
-#: gpg-interface.c:347
+#: gpg-interface.c:434
 msgid "could not create temporary file"
 msgstr "impossibile creare il file temporaneo"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:437
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "scrittura della firma separata in '%s' non riuscita"
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignoro il colore non valido '%.*s' in log.graphColors"
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"il pattern fornito (con -f <file>) contiene un byte NULL. Ciรฒ รจ supportato "
+"solo con -P usando PCRE v2"
+
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': impossibile leggere %s"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "stat di '%s' non riuscito"
 
-#: grep.c:2145
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': lettura troppo breve"
@@ -3443,7 +4165,7 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Comandi / operazioni di interrogazione di basso livello"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Comandi di basso livello / Sincronizzazione repository"
 
 #: help.c:38
@@ -3536,12 +4258,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr "git version [<opzioni>]"
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3611,46 +4333,63 @@ msgstr "nome ident vuoto (per <%s>) non consentito"
 msgid "name consists only of disallowed characters: %s"
 msgstr "il nome รจ composto solo da caratteri non consentiti: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:635
 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato data non valido: %s"
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "la voce '%s' nell'albero %s ha la modalitร  albero, ma non รจ un albero"
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "la voce '%s' nell'albero %s ha la modalitร  blob, ma non รจ un blob"
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "impossibile caricare l'albero radice per il commit %s"
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "non รจ possibile combinare piรน specificatori filtro"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "impossibile accedere al blob sparse in '%s'"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "impossibile analizzare i dati filtro sparse in %s"
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr "atteso 'tree:<profonditร >'"
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr "il supporto per i filtri sparse:percorso รจ stato rimosso"
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "specificatore filtro '%s' non valido"
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "impossibile modificare il remoto promettente del clone parziale"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+"รจ necessario eseguire l'escape del carattere nello specificatore del "
+"sottofiltro: '%c'"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "atteso qualcosa dopo la ricombinazione:"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "non รจ possibile combinare piรน specificatori filtro"
 
 #: lockfile.c:151
 #, c-format
@@ -3681,119 +4420,115 @@ msgstr "Impossibile creare '%s.lock': %s"
 msgid "failed to read the cache"
 msgstr "lettura della cache non riuscita"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "impossibile scrivere il nuovo file index"
 
-#: merge-recursive.c:322
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(commit non valido)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo non riuscito per il percorso '%s'; interrompo il merge."
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "aggiornamento add_cacheinfo non riuscito per il percorso '%s'; interrompo il "
 "merge."
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "errore durante la costruzione degli alberi"
-
-#: merge-recursive.c:863
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "creazione del percorso '%s' non riuscita%s"
 
-#: merge-recursive.c:874
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Rimuovo %s per fare spazio alla sottodirectory\n"
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr ": forse si tratta di un conflitto D/F?"
 
-#: merge-recursive.c:897
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "mi rifiuto di perdere un file non tracciato in '%s'"
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "impossibile leggere l'oggetto %s '%s'"
 
-#: merge-recursive.c:941
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "atteso blob per %s '%s'"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "apertura di '%s' non riuscita: %s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "creazione del collegamento simbolico '%s' non riuscita: %s"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "non so che fare con %06o %s '%s'"
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Merge del sottomodulo %s non riuscito (checkout non eseguito)"
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Merge del sottomodulo %s non riuscito (commit non presenti)"
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "Merge del sottomodulo %s non riuscito (i commit non seguono la base del "
 "merge)"
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Eseguo il fast forward del sottomodulo %s al seguente commit:"
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Eseguo il fast forward del sottomodulo %s"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Merge del sottomodulo %s non riuscito (merge dopo i commit non trovato)"
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Merge del sottomodulo %s non riuscito (non fast forward)"
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Trovata possibile risoluzione merge per il sottomodulo:\n"
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3810,32 +4545,32 @@ msgstr ""
 "\n"
 "per accettare questo suggerimento.\n"
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Merge del sottomodulo %s non riuscito (piรน merge trovati)"
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "Esecuzione del merge interno non riuscita"
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Impossibile aggiungere %s al database"
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Merge automatico di %s in corso"
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Errore: mi rifiuto di perdere il file non tracciato %s; scrivo invece in %s."
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3844,7 +4579,7 @@ msgstr ""
 "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di "
 "%s lasciata nell'albero."
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3853,7 +4588,7 @@ msgstr ""
 "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione "
 "%s di %s lasciata nell'albero."
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3862,7 +4597,7 @@ msgstr ""
 "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di "
 "%s lasciata nell'albero in %s."
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3871,43 +4606,43 @@ msgstr ""
 "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione "
 "%s di %s lasciata nell'albero in %s."
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "ridenominazione"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "rinominato"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Mi rifiuto di perdere un file sporco in %s"
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Mi rifiuto di perdere un file non tracciato in %s, benchรฉ sia d'ostacolo."
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "CONFLITTO (ridenominazione/aggiunta): elemento ridenominato %s->%s in %s. %s "
 "aggiunto in %s"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s รจ una directory in %s; la aggiungo come %s"
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "Mi rifiuto di perdere un file non tracciato in %s; lo aggiungo come %s"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3916,18 +4651,18 @@ msgstr ""
 "CONFLITTO (ridenominazione/ridenominazione): file ridenominato \"%s\"->\"%s"
 "\" nel branch \"%s\", ridenominato \"%s\"->\"%s\" in \"%s\"%s"
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " (lasciato irrisolto)"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1793
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLITTO (ridenominazione/ridenominazione): file ridenominato %s->%s in %s. "
 "Ridenominato %s->%s in %s"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3938,7 +4673,7 @@ msgstr ""
 "perchรฉ la directory %s รจ stata ridenominata in piรน directory diverse e "
 "nessuna directory di destinazione contiene la maggior parte dei file."
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3948,7 +4683,7 @@ msgstr ""
 "%s รจ d'ostacolo alle seguenti ridenominazioni directory che spostano in tale "
 "posizione i seguenti percorsi: %s."
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3958,7 +4693,7 @@ msgstr ""
 "un percorso in %s; delle ridenominazioni directory implicite hanno tentato "
 "di spostare in tale posizione i seguenti percorsi: %s"
 
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3967,7 +4702,7 @@ msgstr ""
 "CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s "
 "in %s. Directory ridenominata %s->%s in %s"
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3976,52 +4711,52 @@ msgstr ""
 "ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perchรฉ %s "
 "stesso รจ stato ridenominato."
 
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
 #, c-format
 msgid "cannot read object %s"
 msgstr "impossibile leggere l'oggetto %s"
 
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'oggetto %s non รจ un blob"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modify"
 msgstr "modifica"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modified"
 msgstr "modificato"
 
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
 msgid "content"
 msgstr "contenuto"
 
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
 msgid "add/add"
 msgstr "aggiunta/aggiunta"
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)"
 
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:1003
 msgid "submodule"
 msgstr "sottomodulo"
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLITTO (%s): conflitto di merge in %s"
 
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Lo aggiungo come %s"
 
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4030,7 +4765,7 @@ msgstr ""
 "Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; "
 "lo sposto in %s."
 
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4039,7 +4774,7 @@ msgstr ""
 "CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata "
 "in %s, il che suggerisce che forse dovrebbe essere spostato in %s."
 
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4048,7 +4783,7 @@ msgstr ""
 "Percorso aggiornato: %s ridenominato in %s in %s in una directory "
 "ridenominata in %s; lo sposto in %s."
 
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4058,228 +4793,244 @@ msgstr ""
 "ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in "
 "%s."
 
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
 #, c-format
 msgid "Removing %s"
 msgstr "Rimozione di %s"
 
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
 msgid "file/directory"
 msgstr "file/directory"
 
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
 msgid "directory/file"
 msgstr "directory/file"
 
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLITTO (%s): una directory denominata %s esiste giร  in %s. Aggiungo %s "
 "come %s"
 
-#: merge-recursive.c:3347
+#: merge-recursive.c:3371
 #, c-format
 msgid "Adding %s"
 msgstr "Aggiunta %s"
 
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s"
 
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n"
-"  %s"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
 msgid "Already up to date!"
 msgstr "Giร  aggiornato!"
 
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "merge degli alberi %s e %s non riuscito"
 
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
 msgid "Merging:"
 msgstr "Merge in corso:"
 
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "trovato %u antenato comune:"
 msgstr[1] "trovati %u antenati comuni:"
 
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
 msgid "merge returned no commit"
 msgstr "il merge non ha restituito alcun commit"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n"
+"  %s"
+
+#: merge-recursive.c:3756
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossibile analizzare l'oggetto '%s'"
 
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
 msgid "Unable to write index."
 msgstr "Impossibile scrivere l'indice."
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "il file multi-pack-index %s รจ troppo piccolo"
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "la firma del multi-pack-index 0x%08x non corrisponde alla firma 0x%08x"
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "versione %d multi-pack-index non riconosciuta"
 
-#: midx.c:95
+#: midx.c:94
 #, c-format
 msgid "hash version %u does not match"
 msgstr "la versione dell'hash %u non corrisponde"
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr "offset blocco non valido (troppo grande)"
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr "l'ID blocco finale multi-pack-index compare prima di quanto previsto"
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "dal multi-pack-index manca il blocco richiesto pack-name"
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "dal multi-pack-index manca il blocco richiesto fanout OID"
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "dal multi-pack-index manca il blocco richiesto lookup OID"
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "dal multi-pack-index manca il blocco richiesto offset oggetti"
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "nomi pack multi-pack-index in disordine: '%s' appare prima di '%s'"
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "pack-int-id non valido: %u (%u pack totali)"
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "nel multi-pack-index รจ salvato un offset a 64 bit, ma off_t รจ troppo piccolo"
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr "errore durante la preparazione del packfile dal multi-pack-index"
 
-#: midx.c:470
+#: midx.c:472
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "aggiunta del packfile '%s' non riuscita"
 
-#: midx.c:476
+#: midx.c:478
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "apertura del pack-index '%s' non riuscita"
 
-#: midx.c:536
+#: midx.c:538
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "ricerca dell'oggetto %d nel packfile non riuscita"
 
-#: midx.c:865
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Aggiunta dei file pack al multi-pack-index in corso"
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "non ho visto il file pack %s da scartare"
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "Scrittura dei chunk nel multi-pack-index in corso"
+
+#: midx.c:1052
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "pulizia del multi-pack-index %s non riuscita"
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr "Ricerca di file pack referenziati in corso"
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 "fanout oid in disordine: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
-msgstr "Verifica ordine OID in MIDX in corso"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verifica ordine OID nel multi-pack-index in corso"
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "lookup oid in disordine: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr "Ordinamento degli oggetti nel packfile in corso"
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr "Verifica offset oggetti in corso"
 
-#: midx.c:1160
+#: midx.c:1180
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "caricamento voce pack per oid[%d] = %s non riuscito"
 
-#: midx.c:1166
+#: midx.c:1186
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "caricamento pack-index per il packfile %s non riuscito"
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "offset oggetto non corretto per oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "Conteggio degli oggetti referenziati in corso"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Ricerca ed eliminazione dei file pack non referenziati in corso"
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr "impossibile avviare pack-objects"
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr "impossibile finire pack-objects"
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "impossibile creare il thread lazy_dir: %s"
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "impossibile creare il thread lazy_name: %s"
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "impossibile bloccare il thread lazy_name: %s"
@@ -4326,32 +5077,32 @@ msgstr "Mi rifiuto di riscrivere le note in %s (al di fuori di refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Valore di %s errato: '%s'"
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "tipo oggetto \"%s\" non valido"
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "l'oggetto %s รจ un %s, non un %s"
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "l'oggetto %s ha l'ID tipo sconosciuto %d"
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "impossibile analizzare l'oggetto: %s"
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr "hash non corrispondente: %s"
 
-#: packfile.c:648
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset collocato prima della fine del packfile (.idx corrotto?)"
 
@@ -4367,6 +5118,11 @@ msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset collocato dopo la fine dell'indice pack per %s (indice troncato?)"
 
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "impossibile recuperare le dimensioni di %s"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4382,7 +5138,7 @@ msgstr "%s non รจ compatibile con %s"
 msgid "%s : incompatible with something else"
 msgstr "%s non รจ compatibile con qualcos'altro"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s non richiede un valore"
@@ -4392,42 +5148,42 @@ msgstr "%s non richiede un valore"
 msgid "%s isn't available"
 msgstr "%s non รจ disponibile"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 "%s richiede un valore intero non negativo con un suffisso k/m/g facoltativo"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "opzione ambigua: %s (potrebbe essere --%s%s o --%s%s)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr "forse intendevi `--%s` (con due trattini)?"
 
-#: parse-options.c:859
+#: parse-options.c:857
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opzione sconosciuta `%s'"
 
-#: parse-options.c:861
+#: parse-options.c:859
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "opzione `%c` sconosciuta"
 
-#: parse-options.c:863
+#: parse-options.c:861
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "opzione non ASCII sconosciuta presente nella stringa: `%s'"
 
-#: parse-options.c:887
+#: parse-options.c:885
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:906
+#: parse-options.c:904
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
@@ -4435,21 +5191,21 @@ msgstr "uso: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:910
 #, c-format
 msgid "   or: %s"
 msgstr "  oppure: %s"
 
-#: parse-options.c:915
+#: parse-options.c:913
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:952
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:968
+#: parse-options.c:966
 #, c-format
 msgid "alias of --%s"
 msgstr "alias di --%s"
@@ -4474,37 +5230,37 @@ msgstr "l'opzione `%s' richiede \"always\", \"auto\" o \"never\""
 msgid "malformed object name '%s'"
 msgstr "nome oggetto '%s' malformato"
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Impossibile rendere %s scrivibile dal gruppo"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Carattere di escape '\\' non consentito come ultimo carattere del valore "
 "attributo"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "รˆ consentita solo una specifica 'attr:'."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "la specifica attr non deve essere vuota"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nome attributo %s non valido"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "le impostazioni globali specificatore percorso 'glob' e 'noglob' non sono "
 "compatibili"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4512,51 +5268,56 @@ msgstr ""
 "l'impostazione globale specificatore percorso 'literal' รจ incompatibile con "
 "tutte le altre impostazioni globali specificatore percorso"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "parametro per il magic specificatore percorso 'prefix' non valido"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Magic specificatore percorso '%.*s' in '%s' non valido"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "')' mancante alla fine del magic specificatore percorso in '%s'"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Magic specificatore percorso '%c' in '%s' non implementato"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' e 'glob' non sono compatibili"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' รจ al di fuori del repository"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' รจ al di fuori del repository in '%s'"
 
-#: pathspec.c:514
+#: pathspec.c:517
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (opzione mnemonica: '%c')"
 
-#: pathspec.c:524
+#: pathspec.c:527
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: magic specificatore percorso non supportato da questo comando: %s"
 
-#: pathspec.c:591
+#: pathspec.c:594
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr ""
 "lo specificatore percorso '%s' si trova oltre un collegamento simbolico"
 
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la riga non รจ ben racchiusa tra virgolette: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "impossibile scrivere il pacchetto flush"
@@ -4619,33 +5380,42 @@ msgstr "Aggiornamento indice in corso"
 msgid "unable to create threaded lstat: %s"
 msgstr "impossibile creare lstat in versione threaded: %s"
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr "impossibile analizzare il formato --pretty"
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "Remoto senza URL"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "il nome del remoto promettente non puรฒ iniziare con '/': %s"
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "impossibile avviare `log`"
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr "impossibile leggere l'output di `log`"
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5020
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "impossibile analizzare il commit '%s'"
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "impossibile analizzare l'header Git '%.*s'"
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr "generazione del diff non riuscita"
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "impossibile analizzare il registro di '%s'"
@@ -4686,16 +5456,16 @@ msgstr "impossibile aggiungere '%s' all'indice"
 msgid "unable to stat '%s'"
 msgstr "impossibile eseguire stat su '%s'"
 
-#: read-cache.c:1314
+#: read-cache.c:1330
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' compare sia come file sia come directory"
 
-#: read-cache.c:1499
+#: read-cache.c:1536
 msgid "Refresh index"
 msgstr "Aggiornamento indice"
 
-#: read-cache.c:1613
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4704,7 +5474,7 @@ msgstr ""
 "index.version impostato, ma il valore non รจ valido.\n"
 "Uso la versione %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4713,143 +5483,154 @@ msgstr ""
 "GIT_INDEX_VERSION impostato, ma il valore non รจ valido.\n"
 "Uso la versione %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1717
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "firma non valida: 0x%08x"
 
-#: read-cache.c:1682
+#: read-cache.c:1720
 #, c-format
 msgid "bad index version %d"
 msgstr "versione indice non valida: %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1729
 msgid "bad index file sha1 signature"
 msgstr "firma SHA1 file indice non valida"
 
-#: read-cache.c:1721
+#: read-cache.c:1759
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "l'indice usa l'estensione %.4s che non comprendiamo"
 
-#: read-cache.c:1723
+#: read-cache.c:1761
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "estensione %.4s ignorata"
 
-#: read-cache.c:1760
+#: read-cache.c:1798
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "formato voce indice sconosciuto: 0x%08x"
 
-#: read-cache.c:1776
+#: read-cache.c:1814
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "campo nome malformato nell'indice, vicino al percorso '%s'"
 
-#: read-cache.c:1833
+#: read-cache.c:1871
 msgid "unordered stage entries in index"
 msgstr "voci stage non ordinate nell'indice"
 
-#: read-cache.c:1836
+#: read-cache.c:1874
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "voci stage multiple per il file sottoposto a merge '%s'"
 
-#: read-cache.c:1839
+#: read-cache.c:1877
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "voci stage non ordinate per '%s'"
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "file indice corrotto"
 
-#: read-cache.c:2087
+#: read-cache.c:2124
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "impossibile creare il thread load_cache_entries: %s"
 
-#: read-cache.c:2100
+#: read-cache.c:2137
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "impossibile bloccare il thread load_cache_entries: %s"
 
-#: read-cache.c:2133
+#: read-cache.c:2170
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: apertura del file indice non riuscita"
 
-#: read-cache.c:2137
+#: read-cache.c:2174
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: impossibile eseguire stat sull'indice aperto"
 
-#: read-cache.c:2141
+#: read-cache.c:2178
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: file indice piรน piccolo della dimensione attesa"
 
-#: read-cache.c:2145
+#: read-cache.c:2182
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s: impossibile mappare il file indice"
 
-#: read-cache.c:2187
+#: read-cache.c:2224
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "impossibile creare il thread load_index_extensions: %s"
 
-#: read-cache.c:2214
+#: read-cache.c:2251
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "impossibile bloccare il thread load_index_extensions: %s"
 
-#: read-cache.c:2246
+#: read-cache.c:2283
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "impossibile aggiornare l'indice condiviso '%s'"
 
-#: read-cache.c:2293
+#: read-cache.c:2330
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "indice corrotto, atteso %s in %s, presente %s"
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
 #, c-format
 msgid "could not close '%s'"
 msgstr "impossibile chiudere '%s'"
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
 #, c-format
 msgid "could not stat '%s'"
 msgstr "impossibile eseguire lo stat di '%s'"
 
-#: read-cache.c:3105
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "impossibile aprire la directory git: %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "impossibile eseguire unlink: %s"
 
-#: read-cache.c:3142
+#: read-cache.c:3179
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "impossibile correggere i permessi di '%s'"
 
-#: read-cache.c:3291
+#: read-cache.c:3328
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: impossibile ripiegare sullo stadio 0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Puoi correggere questa situazione con 'git rebase --edit-todo' e quindi "
+"eseguire 'git rebase --continue'.\n"
+"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
@@ -4857,7 +5638,7 @@ msgstr ""
 "impostazione %s non riconosciuta per l'opzione rebase.missingCommitsCheck. "
 "La ignoro."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4902,14 +5683,14 @@ msgstr ""
 "Queste righe possono essere riordinate; saranno eseguite dalla prima "
 "all'ultima.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebase di %s su %s (%d comando)"
 msgstr[1] "Rebase di %s su %s (%d comandi)"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -4918,7 +5699,7 @@ msgstr ""
 "Non eliminare alcuna riga. Usa esplicitamente 'drop' per rimuovere un "
 "commit.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4926,7 +5707,7 @@ msgstr ""
 "\n"
 "Rimuovendo una riga da qui IL COMMIT CORRISPONDENTE ANDRร€ PERDUTO.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4940,7 +5721,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4950,22 +5731,19 @@ msgstr ""
 "Ciรฒ nonostante, se rimuovi tutto, il rebase sarร  annullato.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Nota che i commit vuoti sono commentati"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
 #, c-format
 msgid "could not write '%s'"
 msgstr "impossibile scrivere '%s'"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "impossibile copiare '%s' in '%s'."
+msgid "could not write '%s'."
+msgstr "impossibile scrivere '%s'."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4975,7 +5753,7 @@ msgstr ""
 "accidentalmente.\n"
 "Commit scartati (dal piรน al meno recente):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4993,6 +5771,13 @@ msgstr ""
 "I comportamenti possibili sono ignore, warn, error.\n"
 "\n"
 
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "impossibile leggere '%s'."
+
 #: refs.c:262
 #, c-format
 msgid "%s does not point to a valid object!"
@@ -5003,7 +5788,7 @@ msgstr "%s non punta a un oggetto valido!"
 msgid "ignoring dangling symref %s"
 msgstr "ignoro il riferimento simbolico pendente %s"
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignoro il riferimento rotto %s"
@@ -5028,14 +5813,15 @@ msgstr "il riferimento '%s' esiste giร "
 msgid "unexpected object ID when writing '%s'"
 msgstr "ID oggetto inatteso durante la scrittura di '%s'"
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "impossibile scrivere su '%s'"
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "impossibile aprire '%s' in scrittura"
@@ -5070,37 +5856,37 @@ msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'"
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref per il riferimento '%s' non riuscita: %s"
 
-#: refs.c:2012
+#: refs.c:2023
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti"
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena"
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' esiste giร ; impossibile creare '%s'"
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "impossibile gestire '%s' e '%s' contemporaneamente"
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr "impossibile rimuovere il riferimento %s"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "impossibile eliminare il riferimento %s: %s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "impossibile eliminare i riferimenti: %s"
@@ -5110,7 +5896,7 @@ msgstr "impossibile eliminare i riferimenti: %s"
 msgid "invalid refspec '%s'"
 msgstr "specificatore riferimento '%s' non valido"
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr "sparito"
 
@@ -5129,122 +5915,122 @@ msgstr "prima di %d"
 msgid "ahead %d, behind %d"
 msgstr "dopo %d, prima di %d"
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "formato atteso: %%(color:<colore>)"
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "colore non riconosciuto: %%(color:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Atteso valore intero: refname:lstrip=%s"
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Atteso valore intero: refname:rstrip=%s"
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argomento %%(%s) non riconosciuto: %s"
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) non accetta argomenti"
 
-#: ref-filter.c:269
+#: ref-filter.c:272
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "argomento %%(objectsize) non riconosciuto: %s"
 
-#: ref-filter.c:277
+#: ref-filter.c:280
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) non accetta argomenti"
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) non accetta argomenti"
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) non accetta argomenti"
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "argomento %%(trailers) sconosciuto: %s"
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "atteso valore positivo in contents:lines=%s"
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argomento %%(contents) non riconosciuto: %s"
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "atteso valore positivo in objectname:short=%s"
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "argomento %%(objectname) non riconosciuto: %s"
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "formato atteso: %%(align:<ampiezza>,<posizione>)"
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "valore non riconosciuto: position:%s"
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "valore non riconosciuto: width:%s"
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argomento %%(align) non riconosciuto: %s"
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "attesa ampiezza positiva con l'atom %%(align)"
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argomento %%(if) non riconosciuto: %s"
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nome campo malformato: %.*s"
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nome campo sconosciuto: %.*s"
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
@@ -5252,160 +6038,160 @@ msgstr ""
 "non รจ un repository git, ma il campo '%.*s' richiede l'accesso ai dati "
 "oggetto"
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "formato: atomo %%(if) usato senza un atomo %%(then)"
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "formato: atomo %%(then) usato senza un atomo %%(if)"
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "formato: atomo %%(then) usato piรน di una volta"
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "formato: atomo %%(then) usato dopo %%(else)"
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "formato: atomo %%(else) usato senza un atomo %%(if)"
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "formato: atomo %%(else) usato senza un atomo %%(then)"
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "formato: atomo %%(else) usato piรน di una volta"
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "formato: atomo %%(end) usato senza l'atomo corrispondente"
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr "stringa di formato %s malformata"
 
-#: ref-filter.c:1485
+#: ref-filter.c:1488
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr "nessun branch, eseguo il rebase di %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1491
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr "nessun branch, eseguo il rebase dell'HEAD scollegato %s"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr "nessun branch, bisezione avviata su %s"
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr "nessun branch"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr "oggetto %s mancante per %s"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer non riuscito su %s per %s"
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "oggetto malformato in '%s'"
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignoro il riferimento con il nome malformato %s"
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "formato: atomo %%(end) mancante"
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr "l'opzione `%s' non รจ compatibile con --merged"
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr "l'opzione `%s' non รจ compatibile con --no-merged"
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr "nome dell'oggetto %s malformato"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'opzione `%s' deve puntare ad un commit"
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "la forma breve della configurazione del remoto non puรฒ iniziare con '/': %s"
 
-#: remote.c:410
+#: remote.c:414
 msgid "more than one receivepack given, using the first"
 msgstr "รจ stata specificata piรน di una direttiva receivepack, uso la prima"
 
-#: remote.c:418
+#: remote.c:422
 msgid "more than one uploadpack given, using the first"
 msgstr "รจ stata specificata piรน di una direttiva uploadpack, uso la prima"
 
-#: remote.c:608
+#: remote.c:612
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Impossibile recuperare sia %s sia %s in %s"
 
-#: remote.c:612
+#: remote.c:616
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s solitamente traccia %s, non %s"
 
-#: remote.c:616
+#: remote.c:620
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s traccia sia %s sia %s"
 
-#: remote.c:684
+#: remote.c:688
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "la chiave '%s' del pattern non aveva un '*'"
 
-#: remote.c:694
+#: remote.c:698
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "il valore '%s' del pattern non ha un '*'"
 
-#: remote.c:1000
+#: remote.c:1004
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s"
 
-#: remote.c:1005
+#: remote.c:1009
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -5416,7 +6202,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1024
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5442,7 +6228,7 @@ msgstr ""
 "Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n"
 "Devi specificare un riferimento completamente qualificato."
 
-#: remote.c:1040
+#: remote.c:1044
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5453,7 +6239,7 @@ msgstr ""
 "รจ un oggetto tag. Forse intendevi creare un nuovo\n"
 "branch eseguendo il push a '%s:refs/heads/%s'?"
 
-#: remote.c:1045
+#: remote.c:1049
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5464,7 +6250,7 @@ msgstr ""
 "รจ un oggetto tag. Forse intendevi creare un nuovo\n"
 "branch eseguendo il push a '%s:refs/tags/%s'?"
 
-#: remote.c:1050
+#: remote.c:1054
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5476,7 +6262,7 @@ msgstr ""
 "tag a un nuovo albero eseguendo il push a\n"
 "'%s:refs/tags/%s'?"
 
-#: remote.c:1055
+#: remote.c:1059
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5488,121 +6274,121 @@ msgstr ""
 "tag a un nuovo blob eseguendo il push a\n"
 "'%s:refs/tags/%s'?"
 
-#: remote.c:1091
+#: remote.c:1095
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s non puรฒ essere risolto in un branch"
 
-#: remote.c:1102
+#: remote.c:1106
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "impossibile eliminare '%s': il riferimento remoto non esiste"
 
-#: remote.c:1114
+#: remote.c:1118
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 "sono state trovate piรน corrispondenze per lo specificatore riferimento "
 "destinazione %s"
 
-#: remote.c:1121
+#: remote.c:1125
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 "lo specificatore riferimento destinazione %s riceve dati da piรน di una "
 "sorgente"
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1628 remote.c:1729
 msgid "HEAD does not point to a branch"
 msgstr "HEAD non punta ad un branch"
 
-#: remote.c:1633
+#: remote.c:1637
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "branch '%s' non esistente"
 
-#: remote.c:1636
+#: remote.c:1640
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "nessun upstream configurato per il branch '%s'"
 
-#: remote.c:1642
+#: remote.c:1646
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 "branch upstream '%s' non memorizzato come branch che ne traccia uno remoto"
 
-#: remote.c:1657
+#: remote.c:1661
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "la destinazione del push '%s' sul remoto '%s' non ha un branch locale che la "
 "traccia"
 
-#: remote.c:1669
+#: remote.c:1673
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "il branch '%s' non ha un remoto per il push"
 
-#: remote.c:1679
+#: remote.c:1683
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "gli specificatori riferimento per '%s' non includono '%s'"
 
-#: remote.c:1692
+#: remote.c:1696
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "il push non ha una destinazione (push.default รจ 'nothing')"
 
-#: remote.c:1714
+#: remote.c:1718
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "impossibile risolvere il push 'simple' a una singola destinazione"
 
-#: remote.c:1840
+#: remote.c:1844
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "impossibile trovare il riferimento remoto %s"
 
-#: remote.c:1853
+#: remote.c:1857
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Ignoro localmente il riferimento strano '%s'"
 
-#: remote.c:2016
+#: remote.c:2020
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Il tuo branch รจ basato su '%s', ma l'upstream รจ scomparso.\n"
 
-#: remote.c:2020
+#: remote.c:2024
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (usa \"git branch --unset-upstream\" per correggere la situazione)\n"
 
-#: remote.c:2023
+#: remote.c:2027
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Il tuo branch รจ aggiornato rispetto a '%s'.\n"
 
-#: remote.c:2027
+#: remote.c:2031
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Il tuo branch e '%s' fanno riferimento a commit differenti.\n"
 
-#: remote.c:2030
+#: remote.c:2034
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (usa \"%s\" per visualizzare i dettagli)\n"
 
-#: remote.c:2034
+#: remote.c:2038
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Il tuo branch รจ avanti rispetto a '%s' di %d commit.\n"
 msgstr[1] "Il tuo branch รจ avanti rispetto a '%s' di %d commit.\n"
 
-#: remote.c:2040
+#: remote.c:2044
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (usa \"git push\" per pubblicare i tuoi commit locali)\n"
 
-#: remote.c:2043
+#: remote.c:2047
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5614,11 +6400,11 @@ msgstr[1] ""
 "Il tuo branch, rispetto a '%s', รจ indietro di %d commit e ne posso eseguire "
 "il fast forward.\n"
 
-#: remote.c:2051
+#: remote.c:2055
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (usa \"git pull\" per aggiornare il tuo branch locale)\n"
 
-#: remote.c:2054
+#: remote.c:2058
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5633,11 +6419,11 @@ msgstr[1] ""
 "Il tuo branch e '%s' sono diventati divergenti\n"
 "e hanno rispettivamente %d e %d commit differenti.\n"
 
-#: remote.c:2064
+#: remote.c:2068
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (usa \"git pull\" per eseguire il merge del branch remoto nel tuo)\n"
 
-#: remote.c:2247
+#: remote.c:2251
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "impossibile analizzare il nome oggetto atteso '%s'"
@@ -5652,7 +6438,7 @@ msgstr "nome riferimento sostitutivo non valido: %s"
 msgid "duplicate replace ref: %s"
 msgstr "riferimento sostitutivo duplicato: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "profonditร  sostituzione troppo elevata per l'oggetto %s"
@@ -5715,8 +6501,8 @@ msgstr "impossibile eseguire l'unlink dell'oggetto smarrito '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "Salvata preimmagine di '%s'"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossibile creare la directory '%s'"
@@ -5750,20 +6536,20 @@ msgstr "Risoluzione per '%s' dimenticata\n"
 msgid "unable to open rr-cache directory"
 msgstr "impossibile aprire la directory cache rr"
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr "sembra che il tuo branch corrente sia rotto"
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "il tuo branch corrente '%s' non ha ancora commit"
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent non รจ compatibile con --bisect"
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L non supporta ancora formati diff oltre a -p e -s"
 
@@ -5785,31 +6571,31 @@ msgstr ""
 "L'hook '%s' รจ stato ignorato perchรฉ non รจ impostato come eseguibile.\n"
 "Puoi disabilitare quest'avviso con `git config advice.ignoredHook false`."
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "pacchetto flush inatteso durante la lettura dello stato decompressione del "
 "remoto"
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "impossibile analizzare lo stato decompressione del remoto: %s"
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "decompressione sul remoto non riuscita: %s"
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr "firma del certificato per il push non riuscita"
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr "il ricevente non supporta i push --signed"
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5817,47 +6603,47 @@ msgstr ""
 "non invio un certificato push perchรฉ il ricevente non supporta i push --"
 "signed"
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr "il ricevente non supporta i push --atomic"
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr "il ricevente non supporta le opzioni push"
 
-#: sequencer.c:187
+#: sequencer.c:191
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "modalitร  pulizia messaggio commit non valida: '%s'"
 
-#: sequencer.c:292
+#: sequencer.c:296
 #, c-format
 msgid "could not delete '%s'"
 msgstr "impossibile eliminare '%s'"
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "impossibile rimuovere '%s'"
 
-#: sequencer.c:321
+#: sequencer.c:325
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:323
+#: sequencer.c:327
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:329
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:331
 #, c-format
 msgid "unknown action: %d"
 msgstr "azione sconosciuta: %d"
 
-#: sequencer.c:385
+#: sequencer.c:389
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5865,7 +6651,7 @@ msgstr ""
 "dopo aver risolto i conflitti, contrassegna i percorsi corretti\n"
 "con 'git add <path>' o 'git rm <path>'"
 
-#: sequencer.c:388
+#: sequencer.c:392
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5875,115 +6661,110 @@ msgstr ""
 "con 'git add <path>' o 'git rm <path>' ed esegui\n"
 "il commit del risultato con 'git commit'"
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:405 sequencer.c:2901
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossibile bloccare '%s'"
 
-#: sequencer.c:408
+#: sequencer.c:412
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "impossibile scrivere il carattere di fine riga in '%s'"
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "finalizzazione di '%s' non riuscita"
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
 #, c-format
 msgid "could not read '%s'"
 msgstr "impossibile leggere '%s'"
 
-#: sequencer.c:462
+#: sequencer.c:466
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "le tue modifiche locali sarebbero sovrascritte da %s."
 
-#: sequencer.c:466
+#: sequencer.c:470
 msgid "commit your changes or stash them to proceed."
 msgstr "esegui il commit delle modifiche o lo stash per procedere."
 
-#: sequencer.c:498
+#: sequencer.c:502
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: fast forward"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modalitร  pulizia non valida: %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:635
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: impossibile scrivere il nuovo file indice"
 
-#: sequencer.c:649
+#: sequencer.c:652
 msgid "unable to update cache tree"
 msgstr "impossibile aggiornare l'albero cache"
 
-#: sequencer.c:663
+#: sequencer.c:666
 msgid "could not resolve HEAD commit"
 msgstr "impossibile risolvere il commit HEAD"
 
-#: sequencer.c:743
+#: sequencer.c:746
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "nessuna chiave presente in '%.*s'"
 
-#: sequencer.c:754
+#: sequencer.c:757
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "impossibile rimuovere gli apici dal valore di '%s'"
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "impossibile aprire '%s' in lettura"
 
-#: sequencer.c:801
+#: sequencer.c:804
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' giร  specificato"
 
-#: sequencer.c:806
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' giร  specificato"
 
-#: sequencer.c:811
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' giร  specificato"
 
-#: sequencer.c:815
+#: sequencer.c:818
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variabile '%s' sconosciuta"
 
-#: sequencer.c:820
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "'GIT_AUTHOR_NAME' mancante"
 
-#: sequencer.c:822
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "'GIT_AUTHOR_EMAIL' mancante"
 
-#: sequencer.c:824
+#: sequencer.c:827
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "'GIT_AUTHOR_DATE' mancante"
 
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "formato data '%s' non valido in '%s'"
-
-#: sequencer.c:901
+#: sequencer.c:876
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -6013,15 +6794,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr "scrittura commit radice in corso"
-
-#: sequencer.c:1216
+#: sequencer.c:1148
 msgid "'prepare-commit-msg' hook failed"
 msgstr "hook 'prepare-commit-msg' non riuscito"
 
-#: sequencer.c:1223
+#: sequencer.c:1154
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6048,7 +6825,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: sequencer.c:1167
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6074,329 +6851,328 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1209
 msgid "couldn't look up newly created commit"
 msgstr "impossibile trovare il commit appena creato"
 
-#: sequencer.c:1280
+#: sequencer.c:1211
 msgid "could not parse newly created commit"
 msgstr "impossibile analizzare il commit appena creato"
 
-#: sequencer.c:1326
+#: sequencer.c:1257
 msgid "unable to resolve HEAD after creating commit"
 msgstr "impossibile risolvere HEAD dopo la creazione del commit"
 
-#: sequencer.c:1328
+#: sequencer.c:1259
 msgid "detached HEAD"
 msgstr "HEAD scollegato"
 
-#: sequencer.c:1332
+#: sequencer.c:1263
 msgid " (root-commit)"
 msgstr " (commit radice)"
 
-#: sequencer.c:1353
+#: sequencer.c:1284
 msgid "could not parse HEAD"
 msgstr "impossibile analizzare HEAD"
 
-#: sequencer.c:1355
+#: sequencer.c:1286
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "L'HEAD %s non รจ un commit!"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
 msgid "could not parse HEAD commit"
 msgstr "impossibile analizzare il commit HEAD"
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1342 sequencer.c:1968
 msgid "unable to parse commit author"
 msgstr "impossibile analizzare l'autore del commit"
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree non รจ riuscito a scrivere un albero"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1386 sequencer.c:1447
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "impossibile leggere il messaggio di commit da '%s'"
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
 msgid "failed to write commit object"
 msgstr "scrittura dell'oggetto del commit non riuscita"
 
-#: sequencer.c:1526
+#: sequencer.c:1474
 #, c-format
 msgid "could not parse commit %s"
 msgstr "impossibile analizzare il commit %s"
 
-#: sequencer.c:1531
+#: sequencer.c:1479
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "impossibile analizzare il commit genitore %s"
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1562 sequencer.c:1673
 #, c-format
 msgid "unknown command: %d"
 msgstr "comando sconosciuto: %d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1620 sequencer.c:1645
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Questa รจ una combinazione di %d commit."
 
-#: sequencer.c:1672
+#: sequencer.c:1630
 msgid "need a HEAD to fixup"
 msgstr "รจ necessaria un'HEAD per il fixup"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1632 sequencer.c:3212
 msgid "could not read HEAD"
 msgstr "impossibile leggere l'HEAD"
 
-#: sequencer.c:1676
+#: sequencer.c:1634
 msgid "could not read HEAD's commit message"
 msgstr "impossibile leggere il messaggio di commit dell'HEAD"
 
-#: sequencer.c:1682
+#: sequencer.c:1640
 #, c-format
 msgid "cannot write '%s'"
 msgstr "impossibile scrivere '%s'"
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "Questo รจ il primo messaggio di commit:"
 
-#: sequencer.c:1697
+#: sequencer.c:1655
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "impossibile leggere il messaggio di commit di %s"
 
-#: sequencer.c:1704
+#: sequencer.c:1662
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Questo รจ il messaggio di commit numero %d:"
 
-#: sequencer.c:1710
+#: sequencer.c:1668
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Il messaggio di commit numero %d sarร  saltato:"
 
-#: sequencer.c:1798
+#: sequencer.c:1756
 msgid "your index file is unmerged."
 msgstr "il file indice non รจ stato sottoposto a merge."
 
-#: sequencer.c:1805
+#: sequencer.c:1763
 msgid "cannot fixup root commit"
 msgstr "impossibile eseguire il fixup sul commit radice"
 
-#: sequencer.c:1824
+#: sequencer.c:1782
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "il commit %s รจ un merge ma non รจ stata specificata l'opzione -m."
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1790 sequencer.c:1798
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "il commit %s non ha il genitore %d"
 
-#: sequencer.c:1846
+#: sequencer.c:1804
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "impossibile ottenere il messaggio di commit per %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1823
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: impossibile analizzare il commit genitore %s"
 
-#: sequencer.c:1930
+#: sequencer.c:1888
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossibile ridenominare '%s' in '%s'"
 
-#: sequencer.c:1985
+#: sequencer.c:1943
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "non รจ stato possibile eseguire il revert di %s... %s"
 
-#: sequencer.c:1986
+#: sequencer.c:1944
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "non รจ stato possibile applicare %s... %s"
 
-#: sequencer.c:2045
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "scarto %s %s - i contenuti della patch sono giร  upstream\n"
+
+#: sequencer.c:2018
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: lettura dell'indice non riuscita"
 
-#: sequencer.c:2052
+#: sequencer.c:2025
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: aggiornamento dell'indice non riuscito"
 
-#: sequencer.c:2128
+#: sequencer.c:2102
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s non accetta argomenti: '%s'"
 
-#: sequencer.c:2137
+#: sequencer.c:2111
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argomenti mancanti per %s"
 
-#: sequencer.c:2174
+#: sequencer.c:2142
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "impossibile analizzare '%.*s'"
+msgid "could not parse '%s'"
+msgstr "impossibile analizzare '%s'"
 
-#: sequencer.c:2228
+#: sequencer.c:2203
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "riga %d non valida: %.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2214
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "impossibile eseguire '%s' senza un commit precedente"
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "impossibile leggere '%s'."
-
-#: sequencer.c:2323
+#: sequencer.c:2298
 msgid "cancelling a cherry picking in progress"
 msgstr "annullo un'operazione di cherry-pick in corso"
 
-#: sequencer.c:2330
+#: sequencer.c:2305
 msgid "cancelling a revert in progress"
 msgstr "annullo un'operazione di revert in corso"
 
-#: sequencer.c:2364
+#: sequencer.c:2349
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "correggi la situazione usando 'git rebase --edit-todo'."
 
-#: sequencer.c:2366
+#: sequencer.c:2351
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "foglio istruzioni inutilizzabile: '%s'"
 
-#: sequencer.c:2371
+#: sequencer.c:2356
 msgid "no commits parsed."
 msgstr "nessun commit analizzato."
 
-#: sequencer.c:2382
+#: sequencer.c:2367
 msgid "cannot cherry-pick during a revert."
 msgstr "impossibile eseguire un cherry-pick durante un revert."
 
-#: sequencer.c:2384
+#: sequencer.c:2369
 msgid "cannot revert during a cherry-pick."
 msgstr "impossibile eseguire un revert durante un cherry-pick."
 
-#: sequencer.c:2466
+#: sequencer.c:2447
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valore non valido per %s: %s"
 
-#: sequencer.c:2553
+#: sequencer.c:2540
 msgid "unusable squash-onto"
 msgstr "squash-onto inutilizzabile"
 
-#: sequencer.c:2569
+#: sequencer.c:2556
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "foglio opzioni malformati: '%s'"
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2644 sequencer.c:4361
 msgid "empty commit set passed"
 msgstr "รจ stato passato un insieme di commit vuoto"
 
-#: sequencer.c:2668
+#: sequencer.c:2660
 msgid "revert is already in progress"
 msgstr "un'operazione di revert รจ giร  in corso"
 
-#: sequencer.c:2670
+#: sequencer.c:2662
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "prova \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2673
+#: sequencer.c:2665
 msgid "cherry-pick is already in progress"
 msgstr "un'operazione di cherry-pick รจ giร  in corso"
 
-#: sequencer.c:2675
+#: sequencer.c:2667
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "prova \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2689
+#: sequencer.c:2681
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossibile creare la directory sequencer '%s'"
 
-#: sequencer.c:2704
+#: sequencer.c:2696
 msgid "could not lock HEAD"
 msgstr "impossibile bloccare HEAD"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2756 sequencer.c:4099
 msgid "no cherry-pick or revert in progress"
 msgstr "nessuna operazione di cherry-pick o revert in corso"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2758 sequencer.c:2769
 msgid "cannot resolve HEAD"
 msgstr "impossibile risolvere HEAD"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2760 sequencer.c:2804
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 "impossibile interrompere l'operazione da un branch che deve essere ancora "
 "creato"
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2790 builtin/grep.c:724
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossibile aprire '%s'"
 
-#: sequencer.c:2800
+#: sequencer.c:2792
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossibile leggere '%s': %s"
 
-#: sequencer.c:2801
+#: sequencer.c:2793
 msgid "unexpected end of file"
 msgstr "fine del file inattesa"
 
-#: sequencer.c:2807
+#: sequencer.c:2799
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 "il file '%s' in cui รจ stato salvato l'HEAD prima del cherry pick รจ corrotto"
 
-#: sequencer.c:2818
+#: sequencer.c:2810
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Sembra che tu abbia spostato l'HEAD. Non eseguo il rewind, controlla l'HEAD!"
 
-#: sequencer.c:2859
+#: sequencer.c:2851
 msgid "no revert in progress"
 msgstr "nessun revert in corso"
 
-#: sequencer.c:2867
+#: sequencer.c:2859
 msgid "no cherry-pick in progress"
 msgstr "nessun cherry-pick in corso"
 
-#: sequencer.c:2877
+#: sequencer.c:2869
 msgid "failed to skip the commit"
 msgstr "salto del commit non riuscito"
 
-#: sequencer.c:2884
+#: sequencer.c:2876
 msgid "there is nothing to skip"
 msgstr "non c'รจ nulla da saltare"
 
-#: sequencer.c:2887
+#: sequencer.c:2879
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6405,21 +7181,21 @@ msgstr ""
 "hai giร  eseguito il commit?\n"
 "prova \"git %s --continue\""
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3003 sequencer.c:4011
 #, c-format
 msgid "could not update %s"
 msgstr "impossibile aggiornare %s"
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3042 sequencer.c:3991
 msgid "cannot read HEAD"
 msgstr "impossibile leggere l'HEAD"
 
-#: sequencer.c:3066
+#: sequencer.c:3059
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "impossibile copiare '%s' in '%s'"
 
-#: sequencer.c:3074
+#: sequencer.c:3067
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6438,27 +7214,22 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3077
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Impossibile applicare %s... %.*s"
 
-#: sequencer.c:3091
+#: sequencer.c:3084
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Impossibile eseguire il merge di %.*s"
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossibile copiare '%s' in '%s'"
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "impossibile leggere l'indice"
-
-#: sequencer.c:3136
+#: sequencer.c:3129
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6473,11 +7244,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3135
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro\n"
 
-#: sequencer.c:3148
+#: sequencer.c:3141
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6494,76 +7265,72 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3202
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nome etichetta illecito: '%.*s'"
 
-#: sequencer.c:3263
+#: sequencer.c:3256
 msgid "writing fake root commit"
 msgstr "scrittura commit radice falso in corso"
 
-#: sequencer.c:3268
+#: sequencer.c:3261
 msgid "writing squash-onto"
 msgstr "scrittura squash-onto in corso"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "impossibile trovare l'albero di %s"
 
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "impossibile scrivere l'indice"
-
-#: sequencer.c:3351
+#: sequencer.c:3344
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "impossibile risolvere '%s'"
 
-#: sequencer.c:3379
+#: sequencer.c:3375
 msgid "cannot merge without a current revision"
 msgstr "impossibile eseguire il merge senza una revisione corrente"
 
-#: sequencer.c:3401
+#: sequencer.c:3397
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "impossibile analizzare '%.*s'"
 
-#: sequencer.c:3410
+#: sequencer.c:3406
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "non c'รจ nulla di cui eseguire il merge: '%.*s'"
 
-#: sequencer.c:3422
+#: sequencer.c:3418
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "il merge octopus non puรฒ essere eseguito su un [nuovo commit radice]"
 
-#: sequencer.c:3437
+#: sequencer.c:3434
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "impossibile ottenere il messaggio di commit per '%s'"
 
-#: sequencer.c:3590
+#: sequencer.c:3594
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "non รจ stato nemmeno possibile tentare di eseguire il merge di '%.*s'"
 
-#: sequencer.c:3606
+#: sequencer.c:3610
 msgid "merge: Unable to write new index file"
 msgstr "merge: impossibile scrivere il nuovo file indice"
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3679 builtin/rebase.c:737
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Stash automatico applicato.\n"
 
-#: sequencer.c:3687
+#: sequencer.c:3691
 #, c-format
 msgid "cannot store %s"
 msgstr "impossibile memorizzare %s"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6574,31 +7341,26 @@ msgstr ""
 "Le tue modifiche sono al sicuro nello stash.\n"
 "Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n"
 
-#: sequencer.c:3751
-#, c-format
-msgid "could not checkout %s"
-msgstr "impossibile eseguire il checkout di %s"
-
-#: sequencer.c:3765
+#: sequencer.c:3755
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s: non รจ un OID valido"
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "impossibile scollegare l'HEAD"
 
-#: sequencer.c:3785
+#: sequencer.c:3775
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Fermato a HEAD\n"
 
-#: sequencer.c:3787
+#: sequencer.c:3777
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Fermato a %s\n"
 
-#: sequencer.c:3795
+#: sequencer.c:3785
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6620,49 +7382,49 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3877
+#: sequencer.c:3869
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Fermato a %s... %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:3940
 #, c-format
 msgid "unknown command %d"
 msgstr "comando %d sconosciuto"
 
-#: sequencer.c:4003
+#: sequencer.c:3999
 msgid "could not read orig-head"
 msgstr "impossibile leggere orig-head"
 
-#: sequencer.c:4008
+#: sequencer.c:4004
 msgid "could not read 'onto'"
 msgstr "impossibile leggere 'onto'"
 
-#: sequencer.c:4022
+#: sequencer.c:4018
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossibile aggiornare l'HEAD a %s"
 
-#: sequencer.c:4115
+#: sequencer.c:4111
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 "impossibile eseguire il rebase: ci sono delle modifiche non in staging."
 
-#: sequencer.c:4124
+#: sequencer.c:4120
 msgid "cannot amend non-existing commit"
 msgstr "impossibile modificare un commit inesistente"
 
-#: sequencer.c:4126
+#: sequencer.c:4122
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "file non valido: '%s'"
 
-#: sequencer.c:4128
+#: sequencer.c:4124
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenuti non validi: '%s'"
 
-#: sequencer.c:4131
+#: sequencer.c:4127
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6673,69 +7435,59 @@ msgstr ""
 "di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n"
 "--continue'."
 
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4163 sequencer.c:4202
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "impossibile scrivere il file: '%s'"
 
-#: sequencer.c:4220
+#: sequencer.c:4217
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossibile rimuovere CHERRY_PICK_HEAD"
 
-#: sequencer.c:4227
+#: sequencer.c:4224
 msgid "could not commit staged changes."
 msgstr "impossibile eseguire il commit delle modifiche in staging."
 
-#: sequencer.c:4328
+#: sequencer.c:4338
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: impossibile eseguire il cherry pick di un %s"
 
-#: sequencer.c:4332
+#: sequencer.c:4342
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisione non valida"
 
-#: sequencer.c:4367
+#: sequencer.c:4377
 msgid "can't revert as initial commit"
 msgstr "impossibile eseguire il revert come commit iniziale"
 
-#: sequencer.c:4810
+#: sequencer.c:4846
 msgid "make_script: unhandled options"
 msgstr "make_script: opzioni non gestite"
 
-#: sequencer.c:4813
+#: sequencer.c:4849
 msgid "make_script: error preparing revisions"
 msgstr "make_script: errore durante la preparazione delle revisioni"
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Puoi correggere questa situazione con 'git rebase --edit-todo' e quindi "
-"eseguire 'git rebase --continue'.\n"
-"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n"
-
 #: sequencer.c:5083 sequencer.c:5100
 msgid "nothing to do"
 msgstr "nulla da fare"
 
-#: sequencer.c:5114
+#: sequencer.c:5119
 msgid "could not skip unnecessary pick commands"
 msgstr "impossibile saltare i comandi pick non necessari"
 
-#: sequencer.c:5197
+#: sequencer.c:5213
 msgid "the script was already rearranged."
 msgstr "lo script รจ giร  stato riordinato."
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' รจ al di fuori del repository"
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' รจ al di fuori del repository in '%s'"
 
-#: setup.c:173
+#: setup.c:175
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6745,7 +7497,7 @@ msgstr ""
 "Usa 'git <comando> -- <percorso>...' per specificare percorsi non esistenti "
 "localmente."
 
-#: setup.c:186
+#: setup.c:188
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6757,14 +7509,14 @@ msgstr ""
 "Usa '--' per separare i percorsi dalle revisioni, come segue:\n"
 "'git <comando> [<revisione>...] -- [<file>...]'"
 
-#: setup.c:235
+#: setup.c:254
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 "l'opzione '%s' deve essere specificata prima degli argomenti che non "
 "costituiscono un'opzione"
 
-#: setup.c:254
+#: setup.c:273
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6775,93 +7527,93 @@ msgstr ""
 "Usa '--' per separare i percorsi dalle revisioni, come segue:\n"
 "'git <comando> [<revisione>...] -- [<file>...]'"
 
-#: setup.c:390
+#: setup.c:409
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "impossibile preparare l'albero di lavoro usando una configurazione non valida"
 
-#: setup.c:394
+#: setup.c:413
 msgid "this operation must be run in a work tree"
 msgstr "quest'operazione deve essere eseguita in un albero di lavoro"
 
-#: setup.c:540
+#: setup.c:559
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Attesa versione repository Git <= %d, trovata %d"
 
-#: setup.c:548
+#: setup.c:567
 msgid "unknown repository extensions found:"
 msgstr "trovate estensioni repository sconosciute:"
 
-#: setup.c:567
+#: setup.c:586
 #, c-format
 msgid "error opening '%s'"
 msgstr "errore durante l'apertura di '%s'"
 
-#: setup.c:569
+#: setup.c:588
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "'%s' troppo grande per essere un file .git"
 
-#: setup.c:571
+#: setup.c:590
 #, c-format
 msgid "error reading %s"
 msgstr "errore durante la lettura di %s"
 
-#: setup.c:573
+#: setup.c:592
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "formato file Git non valido: %s"
 
-#: setup.c:575
+#: setup.c:594
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "nessun percorso presente nel file Git: %s"
 
-#: setup.c:577
+#: setup.c:596
 #, c-format
 msgid "not a git repository: %s"
 msgstr "%s non รจ un repository Git"
 
-#: setup.c:676
+#: setup.c:695
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' รจ troppo grande"
 
-#: setup.c:690
+#: setup.c:709
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "'%s' non รจ un repository Git"
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:738 setup.c:740 setup.c:771
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "impossibile modificare la directory corrente in '%s'"
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
 msgid "cannot come back to cwd"
 msgstr "impossibile tornare alla directory di lavoro corrente"
 
-#: setup.c:851
+#: setup.c:870
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "stat di '%*s%s%s' non riuscito"
 
-#: setup.c:1083
+#: setup.c:1108
 msgid "Unable to read current working directory"
 msgstr "Impossibile leggere la directory di lavoro corrente"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1117 setup.c:1123
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "impossibile entrare in '%s'"
 
-#: setup.c:1103
+#: setup.c:1128
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "%s non รจ un repository Git (nรฉ lo รจ alcuna delle directory genitrici)"
 
-#: setup.c:1109
+#: setup.c:1134
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6871,7 +7623,7 @@ msgstr ""
 "Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "non รจ impostata)."
 
-#: setup.c:1220
+#: setup.c:1245
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6881,289 +7633,289 @@ msgstr ""
 "(0%.3o).\n"
 "Il proprietario dei file deve avere sempre i permessi di lettura e scrittura."
 
-#: setup.c:1264
+#: setup.c:1289
 msgid "open /dev/null or dup failed"
 msgstr "apertura di /dev/null o dup non riuscita"
 
-#: setup.c:1279
+#: setup.c:1304
 msgid "fork failed"
 msgstr "fork non riuscita"
 
-#: setup.c:1284
+#: setup.c:1309
 msgid "setsid failed"
 msgstr "setsid non riuscita"
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "la directory oggetti %s non esiste; controlla .git/objects/info/alternates"
 
-#: sha1-file.c:504
+#: sha1-file.c:503
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "impossibile normalizzare il percorso alternativo oggetto: %s"
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 "%s: ignoro gli archivi oggetto alternativi, la nidificazione รจ troppo "
 "profonda"
 
-#: sha1-file.c:583
+#: sha1-file.c:582
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "impossibile normalizzare la directory oggetti: %s"
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 msgid "unable to fdopen alternates lockfile"
 msgstr "impossibile eseguire fdopen sul file di lock alternates"
 
-#: sha1-file.c:644
+#: sha1-file.c:643
 msgid "unable to read alternates file"
 msgstr "impossibile leggere il file alternates"
 
-#: sha1-file.c:651
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
 msgstr "impossibile spostare il nuovo file alternates nella posizione corretta"
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "il percorso '%s' non esiste"
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "l'aggiunta del repository di riferimento '%s' come checkout collegato non รจ "
 "ancora supportata."
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "il repository di riferimento '%s' non รจ un repository locale."
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "il repository di riferimento '%s' รจ shallow"
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "il repository di riferimento '%s' รจ un graft"
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s"
 
-#: sha1-file.c:944
+#: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "tento di eseguire mmap %<PRIuMAX> al di sopra del limite %<PRIuMAX>"
 
-#: sha1-file.c:969
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr "mmap non riuscita"
 
-#: sha1-file.c:1133
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr "l'oggetto %s รจ vuoto"
 
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1263 sha1-file.c:2443
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "oggetto sciolto '%s' corrotto"
 
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1265 sha1-file.c:2447
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "dati inutilizzabili presenti alla fine dell'oggetto sciolto '%s'"
 
-#: sha1-file.c:1301
+#: sha1-file.c:1307
 msgid "invalid object type"
 msgstr "tipo oggetto non valido"
 
-#: sha1-file.c:1385
+#: sha1-file.c:1391
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "impossibile decomprimere l'intestazione %s con --allow-unknown-type"
 
-#: sha1-file.c:1388
+#: sha1-file.c:1394
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "impossibile decomprimere l'intestazione %s"
 
-#: sha1-file.c:1394
+#: sha1-file.c:1400
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "impossibile analizzare l'intestazione %s con --allow-unknown-type"
 
-#: sha1-file.c:1397
+#: sha1-file.c:1403
 #, c-format
 msgid "unable to parse %s header"
 msgstr "impossibile analizzare l'intestazione %s"
 
-#: sha1-file.c:1588
+#: sha1-file.c:1629
 #, c-format
 msgid "failed to read object %s"
 msgstr "lettura dell'oggetto %s non riuscita"
 
-#: sha1-file.c:1592
+#: sha1-file.c:1633
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "%s sostitutivo non trovato per %s"
 
-#: sha1-file.c:1596
+#: sha1-file.c:1637
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "l'oggetto sciolto %s (salvato in %s) รจ corrotto"
 
-#: sha1-file.c:1600
+#: sha1-file.c:1641
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "l'oggetto archiviato %s (salvato in %s) รจ corrotto"
 
-#: sha1-file.c:1703
+#: sha1-file.c:1746
 #, c-format
 msgid "unable to write file %s"
 msgstr "impossibile scrivere il file %s"
 
-#: sha1-file.c:1710
+#: sha1-file.c:1753
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "impossibile impostare i permessi a '%s'"
 
-#: sha1-file.c:1717
+#: sha1-file.c:1760
 msgid "file write error"
 msgstr "errore di scrittura del file"
 
-#: sha1-file.c:1736
+#: sha1-file.c:1780
 msgid "error when closing loose object file"
 msgstr "errore durante la chiusura del file oggetto sciolto"
 
-#: sha1-file.c:1801
+#: sha1-file.c:1845
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "permessi non sufficienti per l'aggiunta di un oggetto al database repository "
 "%s"
 
-#: sha1-file.c:1803
+#: sha1-file.c:1847
 msgid "unable to create temporary file"
 msgstr "impossibile creare il file temporaneo"
 
-#: sha1-file.c:1827
+#: sha1-file.c:1871
 msgid "unable to write loose object file"
 msgstr "impossibile scrivere il file oggetto sciolto"
 
-#: sha1-file.c:1833
+#: sha1-file.c:1877
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "impossibile comprimere con deflate il nuovo oggetto %s (%d)"
 
-#: sha1-file.c:1837
+#: sha1-file.c:1881
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd non riuscita sull'oggetto %s (%d)"
 
-#: sha1-file.c:1841
+#: sha1-file.c:1885
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "sono confuso dall'origine dati oggetto non stabile per %s"
 
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
 #, c-format
 msgid "failed utime() on %s"
 msgstr "utime() di %s non riuscita"
 
-#: sha1-file.c:1926
+#: sha1-file.c:1972
 #, c-format
 msgid "cannot read object for %s"
 msgstr "impossibile leggere l'oggetto per %s"
 
-#: sha1-file.c:1966
+#: sha1-file.c:2011
 msgid "corrupt commit"
 msgstr "commit corrotto"
 
-#: sha1-file.c:1974
+#: sha1-file.c:2019
 msgid "corrupt tag"
 msgstr "tag corrotto"
 
-#: sha1-file.c:2073
+#: sha1-file.c:2119
 #, c-format
 msgid "read error while indexing %s"
 msgstr "errore di lettura durante l'indicizzazione di %s"
 
-#: sha1-file.c:2076
+#: sha1-file.c:2122
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lettura troppo breve durante l'indicizzazione di %s"
 
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2195 sha1-file.c:2205
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: inserimento del record nel database non riuscito"
 
-#: sha1-file.c:2164
+#: sha1-file.c:2211
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: tipo di file non supportato"
 
-#: sha1-file.c:2188
+#: sha1-file.c:2235
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s non รจ un oggetto valido"
 
-#: sha1-file.c:2190
+#: sha1-file.c:2237
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s non รจ un oggetto '%s' valido"
 
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "impossibile aprire %s"
 
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2454 sha1-file.c:2507
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "mancata corrispondenza per %s (atteso %s)"
 
-#: sha1-file.c:2431
+#: sha1-file.c:2478
 #, c-format
 msgid "unable to mmap %s"
 msgstr "impossibile eseguire mmap su %s"
 
-#: sha1-file.c:2436
+#: sha1-file.c:2483
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "impossibile decomprimere l'intestazione di %s"
 
-#: sha1-file.c:2442
+#: sha1-file.c:2489
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "impossibile analizzare l'intestazione di %s"
 
-#: sha1-file.c:2453
+#: sha1-file.c:2500
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "impossibile decomprimere i contenuti di %s"
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "lo SHA1 breve %s รจ ambiguo"
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "I candidati sono:"
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7187,44 +7939,112 @@ msgstr ""
 "riferimenti ed eliminali se necessario. Disabilita questo\n"
 "messaggio eseguendo \"git config advice.objectNameWarning false\""
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "il log per '%.*s' รจ disponibile solo fino al %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "il log per '%.*s' ha solo %d voci"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "il percorso '%s' esiste su disco, ma non in '%.*s'"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"il percorso '%s' esiste, ma non '%s'\n"
+"suggerimento: forse intendevi '%.*s:%s' ossia '%.*s:./%s'?"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "il percorso '%s' non esiste in '%.*s'"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"il percorso '%s' รจ nell'indice, ma non nel passo %d\n"
+"suggerimento: Forse intendevi ':%d:%s'?"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"il percorso '%s' รจ nell'indice, ma non '%s'\n"
+"suggerimento: Forse intendevi ':%d:%s' ossia ':%d:./%s'?"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "il percorso '%s' esiste su disco, ma non nell'indice"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "il percorso '%s' non esiste (nรฉ su disco nรฉ nell'indice)"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"la sintassi per i percorsi relativi non puรฒ essere usata al di fuori "
+"dell'albero di lavoro"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nome oggetto non valido: '%.*s'."
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:837
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:839
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:847
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:849
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:856
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:864
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7232,13 +8052,18 @@ msgstr[0] "%u byte"
 msgstr[1] "%u byte"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:866
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/s"
 msgstr[1] "%u byte/s"
 
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "impossibile modificare '%s'"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7269,53 +8094,132 @@ msgstr "nel sottomodulo non popolato '%s'"
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Lo specificatore percorso '%s' รจ nel sottomodulo '%.*s'"
 
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "argomento --ignore-submodules errato: %s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Il sottomodulo nel commit %s e nel percorso '%s' collide con un sottomodulo "
+"con lo stesso nome. Lo salto."
+
 #: submodule.c:910
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "la voce sottomodulo '%s' (%s) รจ un %s, non un commit"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Impossibile eseguire il comando 'git rev-list <commit> --not --remotes -n 1' "
+"nel sottomodulo %s"
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "il processo per il sottomodulo '%s' non รจ uscito con successo"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Impossibile risolvere HEAD come riferimento valido."
 
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Push del sottomodulo '%s' in corso\n"
+
+#: submodule.c:1161
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "Impossibile accedere al sottomodulo '%s'"
+msgid "Unable to push submodule '%s'\n"
+msgstr "Impossibile eseguire il push del sottomodulo '%s'\n"
 
-#: submodule.c:1651
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Recupero del sottomodulo %s%s in corso\n"
+
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Impossibile accedere al sottomodulo '%s'\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Errore durante il recupero del sottomodulo:\n"
+"%s"
+
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' non riconosciuto come repository Git"
 
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "Impossibile eseguire 'git status --porcelain=2' nel sottomodulo %s"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+"Esecuzione di 'git status --porcelain=2' non riuscita nel sottomodulo %s"
+
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "impossibile avviare 'git status' nel sottomodulo '%s'"
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "impossibile eseguire 'git status' nel sottomodulo '%s'"
 
-#: submodule.c:1817
+#: submodule.c:1828
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr ""
 "Impossibile annullare l'impostazione dell'opzione core.worktree nel "
 "sottomodulo '%s'"
 
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "impossibile ripristinare l'indice del sottomodulo"
+
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "il sottomodulo '%s' ha l'indice sporco"
 
-#: submodule.c:1959
+#: submodule.c:1970
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Impossibile aggiornare il sottomodulo '%s'."
 
-#: submodule.c:2007
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+"la directory Git del sottomodulo '%s' รจ all'interno della directory Git "
+"'%.*s'"
+
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7323,12 +8227,17 @@ msgstr ""
 "relocate_gitdir non รจ supportata per il sottomodulo '%s' con piรน di un "
 "albero di lavoro"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "impossibile ricercare il nome per il sottomodulo '%s'"
 
-#: submodule.c:2026
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "mi rifiuto di spostare '%s' in una directory Git esistente"
+
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7339,42 +8248,37 @@ msgstr ""
 "'%s' a\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2209
 msgid "could not start ls-files in .."
 msgstr "impossibile avviare ls-files in .."
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree ha restituito il valore di ritorno inatteso %d"
 
-#: submodule-config.c:232
+#: submodule-config.c:236
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "ignoro un nome sottomodulo sospetto: %s"
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "i valori negativi non sono consentiti per submodule.fetchjobs"
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 "ignoro '%s' che potrebbe essere interpretato come argomento della riga di "
 "comando: %s"
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr "valore non valido per %s"
 
-#: submodule-config.c:755
+#: submodule-config.c:765
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Impossibile aggiornare la voce .gitmodules %s"
@@ -7390,7 +8294,7 @@ msgstr "esecuzione del comando finale '%s' non riuscita"
 msgid "unknown value '%s' for key '%s'"
 msgstr "valore '%s' sconosciuto per la chiave '%s'"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "piรน di un %s"
@@ -7409,7 +8313,7 @@ msgstr "impossibile leggere il file di input '%s'"
 msgid "could not read from stdin"
 msgstr "impossibile leggere dallo standard input"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr "impossibile eseguire lo stat di '%s'"
@@ -7438,47 +8342,47 @@ msgstr "impossibile ridenominare il file temporaneo in %s"
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "L'upstream di '%s' sarebbe impostato a '%s' di '%s'\n"
 
-#: transport.c:142
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr "impossibile leggere il bundle '%s'"
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "trasporto: opzione profonditร  '%s' non valida"
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "vedi protocol.version in 'git help config' per maggiori dettagli"
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo"
 
-#: transport.c:625
+#: transport.c:632
 msgid "could not parse transport.color.* config"
 msgstr "impossibile analizzare la configurazione transport.color.*"
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr "supporto alla versione 2 del protocollo non ancora implementato"
 
-#: transport.c:825
+#: transport.c:831
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "valore sconosciuto per la configurazione '%s': %s"
 
-#: transport.c:891
+#: transport.c:897
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "trasporto '%s' non consentito"
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync non รจ piรน supportato"
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -7487,7 +8391,7 @@ msgstr ""
 "I seguenti percorsi sottomodulo contengono modifiche\n"
 "non trovate su nessun remoto:\n"
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -7514,32 +8418,32 @@ msgstr ""
 "per eseguirne il push a un remoto.\n"
 "\n"
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr "Interrompo l'operazione."
 
-#: transport.c:1193
+#: transport.c:1201
 msgid "failed to push all needed submodules"
 msgstr "push di tutti i sottomoduli richiesti non riuscito"
 
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:657
 msgid "operation not supported by protocol"
 msgstr "operazione non supportata dal protocollo"
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 msgid "full write to remote helper failed"
 msgstr "scrittura completa verso l'helper remoto non riuscita"
 
-#: transport-helper.c:134
+#: transport-helper.c:144
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "impossibile trovare l'helper remoto per '%s'"
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:571
 msgid "can't dup helper output fd"
 msgstr "impossibile duplicare il descrittore file dell'output helper"
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7548,103 +8452,108 @@ msgstr ""
 "capability necessaria %s sconosciuta; quest'helper remoto probabilmente "
 "richiede una versione di Git piรน recente"
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr "questo helper remoto dovrebbe implementare la capability refspec"
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:425
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s ha inviato un messaggio inatteso: '%s'"
 
-#: transport-helper.c:403
+#: transport-helper.c:414
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s ha bloccato anche %s"
 
-#: transport-helper.c:481
+#: transport-helper.c:493
 msgid "couldn't run fast-import"
 msgstr "impossibile eseguire fast-import"
 
-#: transport-helper.c:504
+#: transport-helper.c:516
 msgid "error while running fast-import"
 msgstr "errore durante l'esecuzione di fast-import"
 
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:545 transport-helper.c:1134
 #, c-format
 msgid "could not read ref %s"
 msgstr "impossibile leggere il riferimento %s"
 
-#: transport-helper.c:578
+#: transport-helper.c:590
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "risposta inattesa a connect: %s"
 
-#: transport-helper.c:600
+#: transport-helper.c:612
 msgid "setting remote service path not supported by protocol"
 msgstr ""
 "l'impostazione del percorso del servizio remoto non รจ supportata dal "
 "protocollo"
 
-#: transport-helper.c:602
+#: transport-helper.c:614
 msgid "invalid remote service path"
 msgstr "percorso servizio remoto non valido"
 
-#: transport-helper.c:648
+#: transport-helper.c:660
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "impossibile connettersi al sottoservizio %s"
 
-#: transport-helper.c:720
+#: transport-helper.c:736
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "attesi ok/error, l'helper ha inviato '%s'"
 
-#: transport-helper.c:773
+#: transport-helper.c:789
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "l'helper ha segnalato uno stato inatteso di %s"
 
-#: transport-helper.c:834
+#: transport-helper.c:850
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "l'helper %s non supporta dry-run"
 
-#: transport-helper.c:837
+#: transport-helper.c:853
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "l'helper %s non supporta --signed"
 
-#: transport-helper.c:840
+#: transport-helper.c:856
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "l'helper %s non supporta --signed=if-asked"
 
-#: transport-helper.c:847
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "l'helper %s non supporta --atomic"
+
+#: transport-helper.c:867
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "l'helper %s non supporta 'push-option'"
 
-#: transport-helper.c:945
+#: transport-helper.c:965
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 "l'helper remoto non supporta il push; รจ necessario uno specificatore "
 "riferimento"
 
-#: transport-helper.c:950
+#: transport-helper.c:970
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "l'helper %s non supporta 'force'"
 
-#: transport-helper.c:997
+#: transport-helper.c:1017
 msgid "couldn't run fast-export"
 msgstr "impossibile eseguire fast-export"
 
-#: transport-helper.c:1002
+#: transport-helper.c:1022
 msgid "error while running fast-export"
 msgstr "errore durante l'esecuzione di fast-export"
 
-#: transport-helper.c:1027
+#: transport-helper.c:1047
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -7653,67 +8562,67 @@ msgstr ""
 "Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n"
 "Forse dovresti specificare un branch come 'master'.\n"
 
-#: transport-helper.c:1091
+#: transport-helper.c:1120
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "risposta malformata nell'elenco riferimenti: %s"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1272
 #, c-format
 msgid "read(%s) failed"
 msgstr "read(%s) non riuscita"
 
-#: transport-helper.c:1271
+#: transport-helper.c:1299
 #, c-format
 msgid "write(%s) failed"
 msgstr "write(%s) non riuscita"
 
-#: transport-helper.c:1320
+#: transport-helper.c:1348
 #, c-format
 msgid "%s thread failed"
 msgstr "thread %s non riuscito"
 
-#: transport-helper.c:1324
+#: transport-helper.c:1352
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "join non riuscita per il thread %s: %s"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1371 transport-helper.c:1375
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "impossibile avviare il thread per la copia dei dati: %s"
 
-#: transport-helper.c:1384
+#: transport-helper.c:1412
 #, c-format
 msgid "%s process failed to wait"
 msgstr "wait non riuscita per il processo %s"
 
-#: transport-helper.c:1388
+#: transport-helper.c:1416
 #, c-format
 msgid "%s process failed"
 msgstr "processo %s non riuscito"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1434 transport-helper.c:1443
 msgid "can't start thread for copying data"
 msgstr "impossibile avviare il thread per la copia dei dati"
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "oggetto albero troppo corto"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "modo malformato nella voce dell'albero"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "nome file vuoto nella voce dell'albero"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "file alber troppo corto"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7723,7 +8632,7 @@ msgstr ""
 "checkout:\n"
 "%%sEsegui il commit o lo stash delle modifiche prima di cambiare branch."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7733,7 +8642,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7743,7 +8652,7 @@ msgstr ""
 "merge:\n"
 "%%sEsegui il commit o lo stash delle modifiche prima di eseguire il merge."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7753,7 +8662,7 @@ msgstr ""
 "merge:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7764,7 +8673,7 @@ msgstr ""
 "%%sEsegui il commit o lo stash delle modifiche prima di eseguire "
 "l'operazione di %s."
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7774,7 +8683,7 @@ msgstr ""
 "l'operazione di %s:\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7784,7 +8693,7 @@ msgstr ""
 "tracciati in esse contenuti vengano persi:\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7794,7 +8703,7 @@ msgstr ""
 "eliminati con il checkout:\n"
 "%%sSpostali o eliminali prima di cambiare branch."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7804,7 +8713,7 @@ msgstr ""
 "eliminati con il checkout:\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7814,7 +8723,7 @@ msgstr ""
 "eliminati dal merge:\n"
 "%%sSpostali o eliminali prima di eseguire il merge."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7824,7 +8733,7 @@ msgstr ""
 "eliminati dal merge:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7834,7 +8743,7 @@ msgstr ""
 "eliminati con l'operazione di %s:\n"
 "%%sSpostali o eliminali prima di eseguire l'operazione di %s."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7844,7 +8753,7 @@ msgstr ""
 "eliminati con l'operazione di %s:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7855,7 +8764,7 @@ msgstr ""
 "sovrascritti con il checkout:\n"
 "%%sSpostali o eliminali prima di cambiare branch."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7866,7 +8775,7 @@ msgstr ""
 "sovrascritti con il checkout:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7876,7 +8785,7 @@ msgstr ""
 "sovrascritti dal merge:\n"
 "%%sSpostali o eliminali prima di eseguire il merge."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7886,7 +8795,7 @@ msgstr ""
 "sovrascritti dal merge:\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7896,7 +8805,7 @@ msgstr ""
 "sovrascritti con l'operazione di %s:\n"
 "%%sSpostali o eliminali prima di eseguire l'operazione di %s."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7906,13 +8815,13 @@ msgstr ""
 "sovrascritti con l'operazione di %s:\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 "La voce '%s' si sovrappone a '%s'. Impossibile eseguire il collegamento."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -7922,7 +8831,7 @@ msgstr ""
 "aggiornate:\n"
 "%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -7933,7 +8842,7 @@ msgstr ""
 "l'aggiornamento del checkout sparse:\n"
 "%s"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -7944,7 +8853,7 @@ msgstr ""
 "l'aggiornamento del checkout sparse:\n"
 "%s"
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -7953,16 +8862,16 @@ msgstr ""
 "Impossibile aggiornare il sottomodulo:\n"
 "%s"
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr "Interrompo l'operazione\n"
 
-#: unpack-trees.c:318
+#: unpack-trees.c:317
 msgid "Updating files"
 msgstr "Aggiornamento dei file in corso"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -7973,6 +8882,10 @@ msgstr ""
 "su un filesystem non sensibile a tale differenza) e solo uno\n"
 "per gruppo in conflitto รจ nell'albero di lavoro:\n"
 
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "Aggiornamento dei contrassegni indice in corso"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "nome schema URL non valido o suffisso '://' mancante"
@@ -8002,50 +8915,54 @@ msgstr "numero di porta non valido"
 msgid "invalid '..' path segment"
 msgstr "parte percorso '..' non valida"
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Recupero oggetti in corso"
+
+#: worktree.c:259 builtin/am.c:2099
 #, c-format
 msgid "failed to read '%s'"
 msgstr "lettura di '%s' non riuscita"
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 "'%s' nell'albero di lavoro principale non รจ la directory del repository"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "il file '%s' non contiene il percorso assoluto alla posizione dell'albero di "
 "lavoro"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' non esiste"
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' non รจ un file .git, codice d'errore %d"
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' non punta a '%s'"
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "impossibile aprire '%s' in lettura e scrittura"
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr "impossibile accedere a '%s'"
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr "impossibile ottenere la directory di lavoro corrente"
 
@@ -8402,82 +9319,90 @@ msgstr ""
 "\")"
 
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (usa \"git cherry-pick --skip\" per saltare questa patch)"
+
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry-pick)"
 
-#: wt-status.c:1447
+#: wt-status.c:1449
 msgid "Revert currently in progress."
 msgstr "Revert in corso."
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Attualmente stai eseguendo il revert del commit %s."
 
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (risolvi i conflitti ed esegui \"git revert --continue\")"
 
-#: wt-status.c:1459
+#: wt-status.c:1461
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (esegui \"git revert --continue\" per continuare)"
 
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 "  (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")"
 
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (usa \"git revert --skip\" per saltare questa patch)"
+
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (usa \"git revert --abort\" per annullare l'operazione di revert)"
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Attualmente stai eseguendo una bisezione partendo dal branch '%s'."
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr "Attualmente stai eseguendo una bisezione."
 
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (usa \"git bisect reset\" per tornare al branch originario)"
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr "Sul branch "
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr "rebase interattivo in corso su "
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr "rebase in corso su "
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr "Attualmente non sei su alcun branch."
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr "Commit iniziale"
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
 msgstr "Non ci sono ancora commit"
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr "File non tracciati"
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr "File ignorati"
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8489,31 +9414,31 @@ msgstr ""
 "ma devi stare attento a non dimenticarti di aggiungere\n"
 "autonomamente i file nuovi (vedi 'git help status')."
 
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "File non tracciati non elencati%s"
 
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr " (usa l'opzione -u per visualizzare i file non tracciati)"
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr "Nessuna modifica"
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "nessuna modifica aggiunta al commit (usa \"git add\" e/o \"git commit -a\")\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "nessuna modifica aggiunta al commit\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8522,197 +9447,206 @@ msgstr ""
 "non รจ stato aggiunto nulla al commit ma sono presenti file non tracciati "
 "(usa \"git add\" per tracciarli)\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "non รจ stato aggiunto nulla al commit ma sono presenti file non tracciati\n"
 
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "non c'รจ nulla di cui eseguire il commit (crea/copia dei file e usa \"git add"
 "\" per tracciarli)\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr "non c'รจ nulla di cui eseguire il commit\n"
 
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "non c'รจ nulla di cui eseguire il commit (usa -u per visualizzare i file non "
 "tracciati)\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "non c'รจ nulla di cui eseguire il commit, l'albero di lavoro รจ pulito\n"
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr "Non ci sono ancora commit su"
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr "HEAD (nessun branch)"
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr "differente"
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr "indietro "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr "avanti "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "impossibile eseguire %s: ci sono delle modifiche non in staging."
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 "inoltre, l'indice contiene modifiche di cui non รจ stato eseguito il commit."
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "impossibile eseguire %s: l'indice contiene modifiche di cui non รจ stato "
 "eseguito il commit."
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "unlink di '%s' non riuscito"
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opzioni>] [--] <specificatore percorso>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "stato diff inatteso %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
 msgid "updating files failed"
 msgstr "aggiornamento dei file non riuscito"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "elimina '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifiche non nell'area di staging dopo l'aggiornamento dell'indice:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:266 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr "Impossibile leggere l'indice"
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Impossibile aprire '%s' in scrittura."
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr "Impossibile scrivere la patch"
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr "modifica della patch non riuscita"
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Impossibile eseguire lo stat di '%s'"
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr "Patch vuota. Operazione interrotta."
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossibile applicare '%s'"
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "I seguenti percorsi sono ignorati da uno dei file .gitignore:\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "test controllato"
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr "scelta interattiva"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr "seleziona gli hunk in modalitร  interattiva"
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr "modifica il diff corrente e applicalo"
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr "consenti l'aggiunta di file altrimenti ignorati"
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr "aggiorna i file tracciati"
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "rinormalizza i fine riga dei file tracciati (implica -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr "salva solo il fatto che il percorso sarร  aggiunto successivamente"
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr "aggiungi le modifiche da tutti i file tracciati e non"
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "ignora i percorsi eliminati nell'albero di lavoro (come --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr "non eseguire l'aggiunta, aggiorna solo l'indice"
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "salta semplicemente i file che non possono essere aggiunti a causa di errori"
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "controlla se i file - anche quelli mancanti - sono ignorati durante il test "
 "controllato"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "esegui l'override del bit eseguibile dei file elencati"
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr "emetti un avviso quando si aggiunge un repository incorporato"
 
-#: builtin/add.c:326
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "backend per `git stash -p`"
+
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8743,152 +9677,178 @@ msgstr ""
 "\n"
 "Vedi \"git help submodule\" per ulteriori informazioni."
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "aggiunta repository Git incorporato in corso: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Usa -f se vuoi davvero aggiungerli.\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Usa -f se vuoi veramente aggiungerli.\n"
+"Per disabilitare questo messaggio, esegui\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr "aggiunta dei file non riuscita"
 
-#: builtin/add.c:419
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file non รจ compatibile con --interactive/--patch"
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file non รจ compatibile con --edit"
+
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr "-A e -u non sono compatibili fra loro"
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "L'opzione --ignore-missing puรฒ essere usata solo con --dry-run"
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "Il parametro --chmod '%s' deve essere -x o +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr ""
+"--pathspec-from-file non รจ compatibile con gli argomenti specificatore "
+"percorso"
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul richiede --pathspec-from-file"
+
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Non รจ stato specificato nulla, non รจ stato aggiunto nulla.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Forse intendevi dire 'git add .'?\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"Forse volevi dire 'git add .'?\n"
+"Per disabilitare questo messaggio, esegui\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "impossibile analizzare lo script author"
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' รจ stato eliminato dall'hook applypatch-msg"
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Riga di input malformata: '%s'."
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Copia delle note da '%s' a '%s' non riuscita"
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "fseek non riuscita"
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "impossibile analizzare la patch '%s'"
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Puรฒ essere applicata solo una serie di patch StGIT per volta"
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "timestamp non valido"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "riga Date non valida"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "offset fuso orario non valido"
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "Rilevamento del formato della patch non riuscito."
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "creazione della directory '%s' non riuscita"
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "Divisione delle patch non riuscita."
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "impossibile scrivere il file indice"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Una volta risolto questo problema, esegui \"%s --continue\"."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Se preferisci saltare questa patch, esegui invece \"%s --skip\"."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Per ripristinare il branch originario e terminare il patching, esegui \"%s --"
 "abort\"."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Patch inviata con format=flowed; gli spazi al termine delle righe potrebbero "
 "essere andati perduti."
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "La patch รจ vuota."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "riga ident non valida: %.*s"
+msgid "missing author line in commit %s"
+msgstr "riga autore mancante nel commit %s"
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "impossibile analizzare il commit %s"
+msgid "invalid ident line: %.*s"
+msgstr "riga ident non valida: %.*s"
 
-#: builtin/am.c:1496
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Dal repository mancano i blob necessari per ripiegare sul merge a tre vie."
 
-#: builtin/am.c:1498
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Utilizzo le informazioni dell'indice per ricostruire un albero di base..."
 
-#: builtin/am.c:1517
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8896,24 +9856,24 @@ msgstr ""
 "Hai modificato manualmente la patch?\n"
 "Non puรฒ essere applicata ai blob registrati nel suo indice."
 
-#: builtin/am.c:1523
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Ripiego sul patching della base e sul merge a tre vie..."
 
-#: builtin/am.c:1549
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "Merge delle modifiche non riuscito."
 
-#: builtin/am.c:1581
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "applicazione a una cronologia vuota"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossibile riprendere l'attivitร : %s non esiste."
 
-#: builtin/am.c:1650
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr "Il corpo del commit รจ:"
 
@@ -8921,37 +9881,41 @@ msgstr "Il corpo del commit รจ:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Applico? Sรฌ [y]/No [n]/Modifica [e]/[V]isualizza patch/[A]ccetta tutto:"
 
-#: builtin/am.c:1710
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "impossibile scrivere il file indice"
+
+#: builtin/am.c:1704
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Indice sporco: impossibile applicare le patch (elemento sporco: %s)"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1744 builtin/am.c:1812
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Applicazione in corso: %.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1761
 msgid "No changes -- Patch already applied."
 msgstr "Nessuna modifica -- patch giร  applicata."
 
-#: builtin/am.c:1773
+#: builtin/am.c:1767
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch non riuscita a %s %.*s"
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
-"Usa 'git am --show-current-patch' per visualizzare la patch non riuscita"
+"Usa 'git am --show-current-patch=diff' per visualizzare la patch non riuscita"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1815
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -8961,7 +9925,7 @@ msgstr ""
 "Se non rimane nulla da aggiungere all'area di staging, forse qualcos'altro\n"
 "ha giร  introdotto le stesse modifiche; potresti voler saltare questa patch."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1822
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -8974,17 +9938,17 @@ msgstr ""
 "Potresti eseguire `git rm` su un file per accettarne la risoluzione "
 "\"eliminato da loro\"."
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossibile analizzare l'oggetto '%s'."
 
-#: builtin/am.c:1987
+#: builtin/am.c:1981
 msgid "failed to clean index"
 msgstr "pulizia dell'indice non riuscita"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2025
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -8993,148 +9957,158 @@ msgstr ""
 "'am'.\n"
 "Non ritorno indietro a ORIG_HEAD"
 
-#: builtin/am.c:2128
+#: builtin/am.c:2132
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valore non valido per --patch-format: %s"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valore non valido per --show-current-patch: %s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s non รจ compatibile con --show-current-patch=%s"
+
+#: builtin/am.c:2207
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2208
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opzioni>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2214
 msgid "run interactively"
 msgstr "esegui in modalitร  interattiva"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2216
 msgid "historical option -- no-op"
 msgstr "opzione storica -- non esegue nulla"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2218
 msgid "allow fall back on 3way merging if needed"
 msgstr "consenti il ripiego sul merge a tre vie se necessario"
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
 msgid "be quiet"
 msgstr "non visualizzare messaggi"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2221
 msgid "add a Signed-off-by line to the commit message"
 msgstr "aggiungi una riga Signed-off-by al messaggio di commit"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2224
 msgid "recode into utf8 (default)"
 msgstr "converti codifica in UTF-8 (impostazione predefinita)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2226
 msgid "pass -k flag to git-mailinfo"
 msgstr "fornisci l'argomento -k a git-mailinfo"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2228
 msgid "pass -b flag to git-mailinfo"
 msgstr "fornisci l'argomento -b a git-mailinfo"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2230
 msgid "pass -m flag to git-mailinfo"
 msgstr "fornisci l'argomento -m a git-mailinfo"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2232
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "fornisci a git-mailsplit l'argomento --keep-cr per il formato mbox"
 
-#: builtin/am.c:2192
+#: builtin/am.c:2235
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "non fornire l'argomento --keep-cr a git-mailsplit indipendentemente dal "
 "valore di am.keepcr"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2238
 msgid "strip everything before a scissors line"
 msgstr "rimuovi tutte le righe prima di una riga \"taglia qui\""
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
 msgid "pass it through git-apply"
 msgstr "passa l'argomento a git-apply"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr "formato"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2264
 msgid "format the patch(es) are in"
 msgstr "il formato delle patch"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2270
 msgid "override error message when patch failure occurs"
 msgstr ""
 "esegui l'override del messaggio d'errore quando si verifica un errore legato "
 "alle patch"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2272
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 "continua l'applicazione delle patch dopo la risoluzione di un conflitto"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2275
 msgid "synonyms for --continue"
 msgstr "sinonimi di --continue"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2278
 msgid "skip the current patch"
 msgstr "salta la patch corrente"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2281
 msgid "restore the original branch and abort the patching operation."
 msgstr "ripristina il branch originario e interrompi l'operazione di patching."
 
-#: builtin/am.c:2241
+#: builtin/am.c:2284
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "interrompi l'operazione di patching ma mantieni HEAD dov'รจ."
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
-msgstr "visualizza la patch in fase di applicazione."
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "visualizza la patch in fase di applicazione"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2293
 msgid "lie about committer date"
 msgstr "menti sulla data del commit"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2295
 msgid "use current timestamp for author date"
 msgstr "usa il timestamp corrente come data autore"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr "ID chiave"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
 msgid "GPG-sign commits"
 msgstr "firma i commit con GPG"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2301
 msgid "(internal use for git-rebase)"
 msgstr "(a uso interno per git-rebase)"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2319
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -9142,18 +10116,18 @@ msgstr ""
 "L'opzione -b/--binary non esegue nulla da molto tempo e\n"
 "sarร  rimossa. Non usarla piรน."
 
-#: builtin/am.c:2281
+#: builtin/am.c:2326
 msgid "failed to read the index"
 msgstr "lettura dell'indice non riuscita"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2341
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "la directory di rebase precedente %s esiste ancora ma รจ stata specificata "
 "un'mbox."
 
-#: builtin/am.c:2320
+#: builtin/am.c:2365
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9162,11 +10136,11 @@ msgstr ""
 "Trovata directory smarrita %s.\n"
 "Usa \"git am --abort\" per eliminarla."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2371
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Operazione di risoluzione non in corso, non riprendiamo."
 
-#: builtin/am.c:2336
+#: builtin/am.c:2381
 msgid "interactive mode requires patches on the command line"
 msgstr ""
 "la modalitร  interattiva richiede che le patch siano fornite sulla riga di "
@@ -9296,7 +10270,7 @@ msgstr "Non stiamo eseguendo un bisect.\n"
 msgid "'%s' is not a valid commit"
 msgstr "'%s' non รจ un commit valido"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9304,27 +10278,27 @@ msgstr ""
 "impossibile eseguire il checkout dell'HEAD originario '%s'. Prova con 'git "
 "bisect reset <commit>'."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Argomento bisect_write errato: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "impossibile recuperare l'OID della revisione '%s'"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "impossibile aprire il file '%s'"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Comando non valido: attualmente stai eseguendo una bisezione %s/%s"
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9333,7 +10307,7 @@ msgstr ""
 "Devi specificare almeno una revisione %s ed una %s.\n"
 "Puoi usare \"git bisect %s\" e \"git bisect %s\" per questo scopo."
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9344,7 +10318,7 @@ msgstr ""
 "Quindi devi specificare almeno una revisione %s ed una %s.\n"
 "Puoi usare \"git bisect %s\" e \"git bisect %s\" a questo scopo."
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:310
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "eseguo la bisezione solo con un commit %s"
@@ -9353,15 +10327,15 @@ msgstr "eseguo la bisezione solo con un commit %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr "Sei sicuro? [Y/n] "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr "nessun termine definito"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:382
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9370,7 +10344,7 @@ msgstr ""
 "I tuoi termini correnti sono %s per lo stato vecchio\n"
 "e %s per lo stato nuovo.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:392
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9379,286 +10353,282 @@ msgstr ""
 "argomento %s non valido per 'git bisect terms'.\n"
 "Le opzioni supportate sono: --term-good|--term-old e --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:478
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "opzione non riconosciuta: '%s'"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:482
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "sembra che '%s' non sia una revisione valida"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:514
 msgid "bad HEAD - I need a HEAD"
 msgstr "HEAD non valida - ho bisogno di un'HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:529
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "checkout di '%s' non riuscito. Prova con 'git bisect start <branch valido>'."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "non eseguirรฒ la bisezione su un albero sottoposto a cg-seek"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:553
 msgid "bad HEAD - strange symbolic ref"
 msgstr "head non valida - riferimento simbolico strano"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:577
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "riferimento non valido: '%s'"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr "esegui 'git bisect next'"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "scrivi i termini in .git/BISECT_TERMS"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr "pulisci lo stato bisezione"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr "controlla se le revisioni attese sono presenti"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:641
 msgid "reset the bisection state"
 msgstr "reimposta lo stato della bisezione"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:643
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "scrivi lo stato della bisezione in BISECT_LOG"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:645
 msgid "check and set terms in a bisection state"
 msgstr "controlla e imposta i termini in uno stato bisezione"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:647
 msgid "check whether bad or good terms exist"
 msgstr ""
 "controlla se esistono termini per revisioni non funzionanti o funzionanti"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:649
 msgid "print out the bisect terms"
 msgstr "stampa i termini della bisezione"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:651
 msgid "start the bisect session"
 msgstr "inizia la sessione di bisezione"
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "aggiorna BISECT_HEAD anzichรฉ eseguire il checkout del commit corrente"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:655
 msgid "no log for BISECT_WRITE"
 msgstr "non registrare le operazioni eseguite per BISECT_WRITE"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms richiede due argomenti"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state non richiede argomenti"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:684
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset richiede o nessun argomento o un commit"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:688
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write richiede o quattro o cinque argomenti"
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:694
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--check-and-set-terms richiede tre argomenti"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:700
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check richiede due o tre argomenti"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:706
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms richiede zero o un argomento"
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opzioni>] [<opzioni revisione>] [<revisione>] [--] <file>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "le <opzioni revisione> sono documentate in git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, c-format
 msgid "expecting a color: %s"
 msgstr "atteso colore: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr "deve terminare con un colore"
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "colore '%s' non valido in color.blame.repeatedLines"
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 msgid "invalid value for blame.coloring"
 msgstr "valore non valido per blame.coloring"
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "impossibile trovare la revisione %s da ignorare"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 "Visualizza le voci blame incrementalmente, a mano a mano che le troviamo"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 "Visualizza un hash SHA-1 vuoto per i commit limite (impostazione "
 "predefinita: off)"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "Non gestire i commit radice come commit limite (impostazione predefinita: "
 "off)"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr "Visualizza le statistiche sul costo dell'operazione"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr "Forza l'indicazione d'avanzamento dell'operazione"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr "Visualizza il punteggio di output per le voci blame"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr ""
 "Visualizza il nome file originario (impostazione predefinita: automatico)"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 "Visualizza il numero di riga originario (impostazione predefinita: off)"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr ""
 "Visualizza l'output in un formato progettato per l'utilizzo da parte di una "
 "macchina"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 "Visualizza il formato porcelain con le informazioni sul commit per ogni riga"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Usa la stessa modalitร  di output di git-annotate (impostazione predefinita: "
 "off)"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 "Visualizza l'hash SHA1 del commit in forma lunga (impostazione predefinita: "
 "off)"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 "Non visualizzare il nome autore e il timestamp (impostazione predefinita: "
 "off)"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "Visualizza l'indirizzo e-mail dell'autore invece del nome (impostazione "
 "predefinita: off)"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr "Ignora le differenze relative agli spazi bianchi"
 
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr "revisione"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 msgid "Ignore <rev> when blaming"
 msgstr "Ignora <revisione> durante l'esecuzione del blame"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 msgid "Ignore revisions from <file>"
 msgstr "Ignora le revisioni specificate in <file>"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr "colora in modo differente i metadati ridondanti della riga precedente"
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr "colora le righe in base all'etร "
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Usa un'euristica sperimentale per migliorare i diff"
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr "Usa cicli extra per trovare una corrispondenza migliore"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Usa le revisioni salvate in <file> anzichรฉ richiamare git-rev-list"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "Usa i contenuti di <file> come immagine finale"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "punteggio"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr "Trova copie delle righe all'interno e fra file"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr "Trova righe spostate all'interno e fra file"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr "Elabora solo l'intervallo righe n,m, contandole da 1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress non puรฒ essere usato con --incremental o con i formati porcelain"
@@ -9671,18 +10641,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "4 anni, 11 giorni fa"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "il file %s ha solo %lu riga"
 msgstr[1] "il file %s ha solo %lu righe"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr "Eseguo il blame sulle righe"
 
@@ -9900,7 +10870,7 @@ msgstr "imposta la modalitร  tracking (vedi git-pull(1))"
 msgid "do not use"
 msgstr "non usare"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:513
 msgid "upstream"
 msgstr "upstream"
 
@@ -9909,8 +10879,8 @@ msgid "change the upstream info"
 msgstr "modifica le informazioni sull'upstream"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Rimuovi le informazioni sull'upstream"
+msgid "unset the upstream info"
+msgstr "rimuovi le informazioni sull'upstream"
 
 #: builtin/branch.c:628
 msgid "use colored output"
@@ -10012,7 +10982,7 @@ msgstr ""
 msgid "format to use for the output"
 msgstr "formato da usare per l'output"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:785
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trovato fra i riferimenti/head!"
 
@@ -10108,20 +11078,67 @@ msgstr ""
 "l'opzione '--set-upstream' non รจ piรน supportata. Usa '--track' o '--set-"
 "upstream-to'."
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr "%s รจ corretto\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<opzioni>] <file> <argomenti git-rev-list>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<opzioni>] <file>"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <file> [<nome riferimento>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <file> [<nome riferimento>...]"
+
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "non visualizzare la barra di avanzamento"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "visualizza la barra di avanzamento"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr ""
+"visualizza la barra di avanzamento durante la fase di scrittura oggetti"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "simile a --all-progress quando รจ visualizzata la barra di avanzamento"
+
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "Per creare un bundle รจ necessario un repository."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "non visualizzare i dettagli sul bundle"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s รจ corretto\n"
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "Per decomprimere un bundle รจ necessario un repository."
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sottocomando sconosciuto: %s"
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -10129,7 +11146,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<percorso>] <oggetto>"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -10137,75 +11154,75 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 msgid "only one batch option may be specified"
 msgstr "puรฒ essere specificata solo un'opzione batch"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipo> puรฒ essere uno fra blob, tree, commit, tag"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr "visualizza tipo oggetto"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr "visualizza dimensioni oggetto"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr "esci con codice d'uscita zero se non si sono verificati errori"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr "stampa il contenuto dell'oggetto con un formato leggibile"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr "esegui textconv sul contenuto dell'oggetto (per gli oggetti blob)"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr "esegui i filtri sul contenuto dell'oggetto (per gli oggetti blob)"
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:1002
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr "usa un percorso specifico per --textconv/--filters"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "consenti a -s e -t di funzionare con oggetti malformati/corrotti"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr "esegui il buffering dell'output di --batch"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "visualizza le informazioni e il contenuto degli oggetti forniti nello "
 "standard input"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr "visualizza le informazioni degli oggetti forniti nello standard input"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "segui i collegamenti simbolici entro l'albero (usato con --batch o --batch-"
 "check)"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr "visualizza tutti gli oggetti con --batch o --batch-check"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr "non ordinare l'output di --batch-all-objects"
 
@@ -10233,8 +11250,8 @@ msgstr "leggi i nomi dei file dallo standard input"
 msgid "terminate input and output records by a NUL character"
 msgstr "termina i record di input e output con un carattere NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
 msgid "suppress progress reporting"
 msgstr "non visualizzare l'avanzamento dell'operazione"
 
@@ -10246,27 +11263,27 @@ msgstr "visualizza i percorsi di input non corrispondenti"
 msgid "ignore index when checking"
 msgstr "ignora l'indice durante il controllo"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "impossibile specificare i nomi percorso con --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z ha senso solo con --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "nessun percorso specificato"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet รจ valido solo con un nome percorso singolo"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "non รจ possibile usare sia --quiet sia --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching รจ valido solo con --verbose"
 
@@ -10324,9 +11341,9 @@ msgid "write the content to temporary files"
 msgstr "scrivi il contenuto in file temporanei"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
 msgid "string"
 msgstr "stringa"
 
@@ -10354,100 +11371,100 @@ msgstr "git switch [<opzioni>] <branch>"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opzioni>] [--source=<branch>] <file>..."
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "il percorso '%s' non ha la nostra versione"
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "il percorso '%s' non ha la loro versione"
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "il percorso '%s' non ha tutte le versioni necessarie"
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "il percorso '%s' non ha le versioni necessarie"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "percorso '%s': impossibile eseguire il merge"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossibile aggiungere il risultato del merge per '%s'"
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Ricreato %d conflitto di merge"
 msgstr[1] "Ricreati %d conflitti di merge"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "Aggiornato %d percorso da %s"
 msgstr[1] "Aggiornati %d percorsi da %s"
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:389
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "Aggiornato %d percorso dall'indice"
 msgstr[1] "Aggiornati %d percorsi dall'indice"
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' non puรฒ essere usato con i percorsi in fase di aggiornamento"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' non puรฒ essere usato con %s"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Impossibile aggiornare dei percorsi e passare al branch '%s' "
 "contemporaneamente."
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "nรฉ '%s' nรฉ '%s' sono stati specificati"
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' dev'essere usato quando '%s' non รจ specificato"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' o '%s' non possono essere usati con %s"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "il percorso '%s' non รจ stato sottoposto a merge"
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
 msgid "you need to resolve your current index first"
 msgstr "prima devi risolvere l'indice corrente"
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:734
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10456,55 +11473,50 @@ msgstr ""
 "impossibile continuare con modifiche in stage nei file seguenti:\n"
 "%s"
 
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr "le modifiche in stage nei seguenti file potrebbero andare perdute: %s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:837
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossibile esaminare il registro dei riferimenti per '%s': %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:879
 msgid "HEAD is now at"
 msgstr "HEAD si trova ora a"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:883 builtin/clone.c:717
 msgid "unable to update HEAD"
 msgstr "impossibile aggiornare HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:887
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Ripristina il branch '%s'\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Si รจ giร  su '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:894
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Si รจ passati al branch '%s' e lo si รจ reimpostato\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:896 builtin/checkout.c:1320
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Si รจ passati a un nuovo branch '%s'\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:898
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Si รจ passati al branch '%s'\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:949
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ...e altri %d.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:955
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10527,7 +11539,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:974
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10554,28 +11566,19 @@ msgstr[1] ""
 " git branch <nome del nuovo branch> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1009
 msgid "internal error in revision walk"
 msgstr "errore interno durante la visita delle revisioni"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1013
 msgid "Previous HEAD position was"
 msgstr "La precedente posizione di HEAD era"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
 msgid "You are on a branch yet to be born"
 msgstr "Sei su un branch che deve ancora essere creato"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "atteso solo un riferimento"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "atteso solo un riferimento, %d specificati."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1128
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10584,37 +11587,72 @@ msgstr ""
 "'%s' potrebbe essere sia un file locale, sia un branch da tracciare.\n"
 "Usa -- (e facoltativamente --no-guess) per rimuovere l'ambiguitร "
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n"
+"puoi farlo usando la versione completamente qualificata del nome\n"
+"con l'opzione --track:\n"
+"\n"
+"    git checkout --track origin/<nome>\n"
+"\n"
+"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n"
+"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n"
+"impostare checkout.defaultRemote=origin nel tuo file di configurazione."
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' corrisponde a piรน (%d) branch che ne tracciano uno remoto"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "atteso solo un riferimento"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "atteso solo un riferimento, %d specificati."
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
 #, c-format
 msgid "invalid reference: %s"
 msgstr "riferimento non valido: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "il riferimento non รจ un albero: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1334
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "atteso branch, ricevuto tag '%s'"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1336
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "atteso branch, ricevuto branch remoto '%s'"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "atteso branch, ricevuto '%s'"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1340
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "atteso branch, ricevuto commit '%s'"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1356
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10622,7 +11660,7 @@ msgstr ""
 "impossibile cambiare branch durante un merge\n"
 "Considera l'uso di \"git merge --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1360
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10630,7 +11668,7 @@ msgstr ""
 "impossibile cambiare branch nel bel mezzo di una sessione am\n"
 "Considera l'uso di \"git am --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1364
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10638,7 +11676,7 @@ msgstr ""
 "impossibile cambiare branch durante un rebase\n"
 "Considera l'uso di \"git rebase --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1368
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10646,7 +11684,7 @@ msgstr ""
 "impossibile cambiare branch durante un cherry-pick\n"
 "Considera l'uso di \"git cherry-pick --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1372
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10654,142 +11692,147 @@ msgstr ""
 "impossibile cambiare branch durante un revert\n"
 "Considera l'uso di \"git revert --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1376
 msgid "you are switching branch while bisecting"
 msgstr "stai cambiando branch durante una bisezione"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1383
 msgid "paths cannot be used with switching branches"
 msgstr "i percorsi non possono essere usati passando da un branch a un altro"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' non puรฒ essere usato passando da un branch a un altro"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' non puรฒ essere usato con '%s'"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1411
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' non accetta l'argomento <punto di partenza>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1419
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Impossibile cambiare branch per passare a '%s' che non รจ un commit"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1426
 msgid "missing branch or commit argument"
 msgstr "argomento branch o commit mancante"
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "forza l'indicazione d'avanzamento dell'operazione"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1469
 msgid "perform a 3-way merge with the new branch"
 msgstr "esegui un merge a tre vie con il nuovo branch"
 
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr "stile"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1471
 msgid "conflict style (merge or diff3)"
 msgstr "stile conflitti (merge o diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1483 builtin/worktree.c:496
 msgid "detach HEAD at named commit"
 msgstr "scollega l'HEAD al commit specificato"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1484
 msgid "set upstream info for new branch"
 msgstr "imposta le informazioni sull'upstream per il nuovo branch"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1486
 msgid "force checkout (throw away local modifications)"
 msgstr "esegui forzatamente il checkout (scarta le modifiche locali)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new-branch"
 msgstr "nuovo branch"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new unparented branch"
 msgstr "nuovo branch senza genitore"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
 msgid "update ignored files (default)"
 msgstr "aggiorna i file ignorati (impostazione predefinita)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1493
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "non controllare se un altro albero di lavoro contiene il riferimento "
 "specificato"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1506
 msgid "checkout our version for unmerged files"
 msgstr ""
 "esegui il checkout della nostra versione per i file non sottoposti a merge"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1509
 msgid "checkout their version for unmerged files"
 msgstr ""
 "esegui il checkout della loro versione per i file non sottoposti a merge"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1513
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "non limitare gli specificatori percorso solo alle voci sparse"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "le opzioni -b, -B e --orphan sono mutuamente esclusive"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1568
 msgid "-p and --overlay are mutually exclusive"
 msgstr "le opzioni -p e --overlay sono mutualmente esclusive"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1605
 msgid "--track needs a branch name"
 msgstr "--track richiede il nome di un branch"
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1610
 msgid "missing branch name; try -b"
 msgstr "nome del branch mancante; prova con -b"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1642
 #, c-format
 msgid "could not resolve %s"
 msgstr "impossibile risolvere %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "devi specificare il percorso/i percorsi da ripristinare"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
 msgid "invalid path specification"
 msgstr "specificatore percorso non valido"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "'%s' non รจ un commit e non si puรฒ creare un branch '%s' che parta da esso"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach non accetta un percorso '%s' come argomento"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file non รจ compatibile con --detach"
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file non รจ compatibile con --patch"
+
+#: builtin/checkout.c:1692
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10797,96 +11840,69 @@ msgstr ""
 "git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n"
 "si esegue il checkout dell'indice."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' corrisponde a piรน di un branch remoto.\n"
-"Abbiamo trovato %d remoti con un riferimento corrispondente, per cui\n"
-"abbiamo ripiegato tentando di risolvere l'argomento come percorso, ma\n"
-"non siamo riusciti nemmeno a portare a termine tale operazione!\n"
-"\n"
-"Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n"
-"puoi farlo usando la versione completamente qualificata del nome\n"
-"con l'opzione --track:\n"
-"\n"
-"    git checkout --track origin/<nome>\n"
-"\n"
-"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n"
-"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n"
-"impostare checkout.defaultRemote=origin nel tuo file di configurazione."
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "devi specificare il percorso/i percorsi da ripristinare"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
 msgid "branch"
 msgstr "branch"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1724
 msgid "create and checkout a new branch"
 msgstr "crea un nuovo branch ed eseguine il checkout"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1726
 msgid "create/reset and checkout a branch"
 msgstr "crea/reimposta un branch ed eseguine il checkout"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1727
 msgid "create reflog for new branch"
 msgstr "crea il registro dei riferimenti per il nuovo branch"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1729
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1730
 msgid "use overlay mode (default)"
 msgstr "usa modalitร  overlay (impostazione predefinita)"
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1775
 msgid "create and switch to a new branch"
 msgstr "crea un nuovo branch e passa a quest'ultimo"
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1777
 msgid "create/reset and switch to a branch"
 msgstr "crea/reimposta un branch e passa a quest'ultimo"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1779
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "prevedi 'git switch <branch inesistente>'"
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1781
 msgid "throw away local modifications"
 msgstr "scarta le modifiche locali"
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1813
 msgid "which tree-ish to checkout from"
 msgstr "albero da cui eseguire il checkout"
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1815
 msgid "restore the index"
 msgstr "ripristina l'indice"
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1817
 msgid "restore the working tree (default)"
 msgstr "ripristina l'albero di lavoro (impostazione predefinita)"
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1819
 msgid "ignore unmerged entries"
 msgstr "ignora voci non sottoposte a merge"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
 msgid "use overlay mode"
 msgstr "usa modalitร  overlay"
 
@@ -10927,7 +11943,7 @@ msgstr "eliminazione di %s non riuscita"
 msgid "could not lstat %s\n"
 msgstr "impossibile eseguire l'lstat di %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10940,7 +11956,7 @@ msgstr ""
 "pippo      - seleziona un elemento basandoti su un prefisso univoco\n"
 "           - (vuoto) non selezionare niente\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10961,38 +11977,33 @@ msgstr ""
 "*          - seleziona tutti gli elementi\n"
 "           - (vuoto) termina il processo di selezione\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Eh (%s)?\n"
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Immetti i pattern da ignorare>> "
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ATTENZIONE: Impossibile trovare elementi corrispondenti a %s"
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Seleziona gli elementi da eliminare"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Eliminare %s [y/N]? "
 
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Ciao.\n"
-
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11011,64 +12022,56 @@ msgstr ""
 "help                - visualizza questa schermata\n"
 "?                   - guida al prompt di selezione"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Comandi ***"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Cosa faccio ora"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Eliminerei il seguente elemento:"
 msgstr[1] "Eliminerei i seguenti elementi:"
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Non ci sono piรน file da ripulire, esco."
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "non stampare i nomi dei file eliminati"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr "forza l'operazione"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "pulizia interattiva"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "rimuovi intere directory"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "pattern"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "aggiungi <pattern> alle regole usate per ignorare i file"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "elimina anche i file ignorati"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "elimina solo i file ignorati"
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x e -X non possono essere usati insieme"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -11076,7 +12079,7 @@ msgstr ""
 "clean.requireForce รจ impostato a true e nรฉ -i, nรฉ -n, nรฉ -f sono stati "
 "specificati; mi rifiuto di eseguire la pulizia"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -11084,7 +12087,7 @@ msgstr ""
 "clean.requireForce รจ true per impostazione predefinita e nรฉ -i, nรฉ -n, nรฉ -f "
 "sono stati specificati; mi rifiuto di eseguire la pulizia"
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opzioni>] [--] <repository> [<directory>]"
 
@@ -11132,18 +12135,18 @@ msgstr "directory modelli"
 msgid "directory from which templates will be used"
 msgstr "directory da cui saranno recuperati i modelli"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr "repository di riferimento"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr "usa --reference solo durante la clonazione"
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
 msgid "name"
 msgstr "nome"
 
@@ -11159,8 +12162,8 @@ msgstr "esegui il checkout di <branch> anzichรฉ dell'HEAD del remoto"
 msgid "path to git-upload-pack on the remote"
 msgstr "percorso al comando remoto git-upload-pack"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
 msgid "depth"
 msgstr "profonditร "
 
@@ -11168,7 +12171,7 @@ msgstr "profonditร "
 msgid "create a shallow clone of that depth"
 msgstr "crea un clone shallow con questa profonditร "
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
 msgid "time"
 msgstr "tempo"
 
@@ -11176,18 +12179,19 @@ msgstr "tempo"
 msgid "create a shallow clone since a specific time"
 msgstr "crea un clone shallow a partire dall'istante specificato"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
 msgid "revision"
 msgstr "revisione"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "aumenta la profonditร  della cronologia del clone shallow fino alla revisione "
 "specificata esclusa"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clona solo un branch, HEAD o quello specificato con --branch"
 
@@ -11215,23 +12219,23 @@ msgstr "chiave=valore"
 msgid "set config inside the new repository"
 msgstr "imposta la configurazione nel nuovo repository"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "specifica del server"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "opzione da trasmettere"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr "usa solo indirizzi IPv4"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr "usa solo indirizzi IPv6"
 
@@ -11241,7 +12245,13 @@ msgstr ""
 "tutti i sottomoduli clonati useranno il loro rispettivo branch remoto "
 "tracciato"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"inizializza il file sparse-checkout per includere solo i file nel percorso "
+"radice"
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11249,47 +12259,42 @@ msgstr ""
 "Non รจ stato possibile indovinare alcun nome directory.\n"
 "Specifica una directory tramite la riga di comando"
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "informazione: Impossibile aggiungere un alternato a '%s': %s\n"
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s esiste e non รจ una directory"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "impossibile avviare l'iteratore su '%s'"
 
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "unlink di '%s' non riuscito"
-
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "creazione del collegamento '%s' non riuscita"
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "copia del file in '%s' non riuscita"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "iterazione su '%s' non riuscita"
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11300,98 +12305,102 @@ msgstr ""
 "con 'git status' e riprovare ad eseguire il checkout con\n"
 "'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossibile trovare il branch remoto %s da clonare."
 
-#: builtin/clone.c:702
+#: builtin/clone.c:705
 #, c-format
 msgid "unable to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: builtin/clone.c:752
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "inizializzazione del file sparse-checkout non riuscita"
+
+#: builtin/clone.c:776
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "l'HEAD remoto fa riferimento a un riferimento inesistente, impossibile "
 "eseguire il checkout.\n"
 
-#: builtin/clone.c:783
+#: builtin/clone.c:807
 msgid "unable to checkout working tree"
 msgstr "impossibile eseguire il checkout dell'albero di lavoro"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:862
 msgid "unable to write parameters to config file"
 msgstr "impossibile scrivere i parametri nel file di configurazione"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:925
 msgid "cannot repack to clean up"
 msgstr "impossibile eseguire il repack per pulire l'area di lavoro"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:927
 msgid "cannot unlink temporary alternates file"
 msgstr "impossibile eseguire l'unlink del file alternates temporaneo"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
 msgid "Too many arguments."
 msgstr "Troppi argomenti."
 
-#: builtin/clone.c:942
+#: builtin/clone.c:969
 msgid "You must specify a repository to clone."
 msgstr "Devi specificare un repository da clonare."
 
-#: builtin/clone.c:955
+#: builtin/clone.c:982
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "le opzioni --bare e --origin %s non sono compatibili."
 
-#: builtin/clone.c:958
+#: builtin/clone.c:985
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "le opzioni --bare e --separate-git-dir non sono compatibili."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:998
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "il repository '%s' non esiste"
 
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:1004 builtin/fetch.c:1796
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profonditร  %s non รจ un numero positivo"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1014
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 "il percorso di destinazione '%s' esiste giร  e non รจ una directory vuota."
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1024
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "l'albero di lavoro '%s' esiste giร ."
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "impossibile creare le prime directory di '%s'"
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1044
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "impossibile creare la directory dell'albero di lavoro '%s'"
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1064
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clone nel repository spoglio '%s' in corso...\n"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1066
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clone in '%s' in corso...\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1090
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11399,36 +12408,36 @@ msgstr ""
 "il clone --recursive non รจ compatibile nรฉ con --reference nรฉ con --reference-"
 "if-able"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1154
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "L'opzione --depth รจ ignorata nei cloni locali; usa file://."
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1156
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "L'opzione --shallow-since รจ ignorata nei cloni locali; usa file://."
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1158
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "L'opzione --shallow-exclude รจ ignorata nei cloni locali; usa file://."
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1160
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "L'opzione --filter รจ ignorata nei cloni locali; usa file://."
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1163
 msgid "source repository is shallow, ignoring --local"
 msgstr "il repository sorgente รจ shallow, ignoro l'opzione --local"
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1168
 msgid "--local is ignored"
 msgstr "l'opzione --local รจ ignorata"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1243 builtin/clone.c:1251
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Il branch remoto %s non รจ stato trovato nell'upstream %s"
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1254
 msgid "You appear to have cloned an empty repository."
 msgstr "Sembra che tu abbia clonato un repository vuoto."
 
@@ -11477,7 +12486,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "genitore duplicato %s ignorato"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, c-format
 msgid "not a valid object name %s"
 msgstr "%s non รจ un nome oggetto valido"
@@ -11505,13 +12514,13 @@ msgstr "genitore"
 msgid "id of a parent commit object"
 msgstr "ID di un oggetto commit genitore"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
 #: builtin/tag.c:412
 msgid "message"
 msgstr "messaggio"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
 msgid "commit message"
 msgstr "messaggio di commit"
 
@@ -11519,8 +12528,8 @@ msgstr "messaggio di commit"
 msgid "read commit log message from file"
 msgstr "leggi il messaggio di log del commit da un file"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "firma il commit con GPG"
 
@@ -11596,57 +12605,66 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "decompressione dell'oggetto HEAD dell'albero non riuscita"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "l'opzione --pathspec-from-file non ha senso con -a"
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+"Non specificare un percorso con le opzioni --include/--only non ha senso."
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr "impossibile creare l'indice temporaneo"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:385
 msgid "interactive add failed"
 msgstr "aggiunta interattiva non riuscita"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:400
 msgid "unable to update temporary index"
 msgstr "impossibile aggiornare l'indice temporaneo"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:402
 msgid "Failed to update main cache tree"
 msgstr "Impossibile aggiornare l'albero cache principale"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
 msgid "unable to write new_index file"
 msgstr "impossibile scrivere il file new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:479
 msgid "cannot do a partial commit during a merge."
 msgstr "impossibile eseguire un commit parziale durante un merge."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:481
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossibile eseguire un commit parziale durante un cherry-pick."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:489
 msgid "cannot read the index"
 msgstr "impossibile leggere l'indice"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:508
 msgid "unable to write temporary index file"
 msgstr "impossibile scrivere il file indice temporaneo"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:606
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "dal commit '%s' manca l'intestazione autore"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:608
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "il commit '%s' ha una riga autore malformata"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:627
 msgid "malformed --author parameter"
 msgstr "parametro --author malformato"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:680
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11654,38 +12672,38 @@ msgstr ""
 "impossibile selezionare un carattere commento non usato\n"
 "nel messaggio di commit corrente"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossibile trovare il commit %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lettura del messaggio di log dallo standard input)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:732
 msgid "could not read log from standard input"
 msgstr "impossibile leggere il log dallo standard input"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:736
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossibile leggere il file di log '%s'"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:767 builtin/commit.c:783
 msgid "could not read SQUASH_MSG"
 msgstr "impossibile leggere SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:774
 msgid "could not read MERGE_MSG"
 msgstr "impossibile leggere MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:834
 msgid "could not write commit template"
 msgstr "impossibile scrivere il modello di commit"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:853
 #, c-format
 msgid ""
 "\n"
@@ -11700,7 +12718,7 @@ msgstr ""
 "\t%s\n"
 "e riprova.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:858
 #, c-format
 msgid ""
 "\n"
@@ -11715,7 +12733,7 @@ msgstr ""
 "\t%s\n"
 "e riprova.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:871
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11724,7 +12742,7 @@ msgstr ""
 "Immetti il messaggio di commit per le modifiche. Le righe che iniziano\n"
 "con '%c' saranno ignorate e un messaggio vuoto interromperร  il commit.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:879
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11735,149 +12753,144 @@ msgstr ""
 "con '%c' saranno mantenute; puoi rimuoverle autonomamente se lo desideri.\n"
 "Un messaggio vuoto interromperร  il commit.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:896
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutore:           %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:904
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:             %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:911
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sEsecutore commit: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:929
 msgid "Cannot read index"
 msgstr "Impossibile leggere l'indice"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "Errore durante la costruzione degli alberi"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Fornisci il messaggio usando l'opzione -m o -F.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' non รจ nel formato 'Nome <e-mail>' e non corrisponde ad alcun "
 "autore esistente"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Modo non valido ignorato: '%s'"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1327
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Modo file non tracciati non valido: '%s'"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "--long e -z non sono compatibili"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "Non c'รจ nulla da modificare."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Sei nel bel mezzo di un merge - impossibile eseguire l'amend."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Sei nel bel mezzo di un cherry-pick - impossibile eseguire l'amend."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1188
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Le opzioni --squash e --fixup non possono essere usate insieme"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1198
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Solo una delle opzioni -c/-C/-F/--fixup puรฒ essere usata."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1200
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "L'opzione -m non puรฒ essere combinata con -c/-C/-F."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1208
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "L'opzione --reset-author puรฒ essere usata solo con -C, -c o --amend."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1225
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Puรฒ essere usata solo una delle opzioni --include/--only/--all/--"
 "interactive/--patch."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr ""
-"Non specificare un percorso con le opzioni --include/--only non ha senso."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1231
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "i percorsi '%s ...' non hanno senso con -a"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1362 builtin/commit.c:1524
 msgid "show status concisely"
 msgstr "visualizza concisamente lo stato"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1364 builtin/commit.c:1526
 msgid "show branch information"
 msgstr "visualizza le informazioni sul branch"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1366
 msgid "show stash information"
 msgstr "visualizza le informazioni sullo stash"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1368 builtin/commit.c:1528
 msgid "compute full ahead/behind values"
 msgstr "calcola tutti i valori dopo/prima di"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1370
 msgid "version"
 msgstr "versione"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
 msgid "machine-readable output"
 msgstr "output leggibile da una macchina"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1373 builtin/commit.c:1532
 msgid "show status in long format (default)"
 msgstr "visualizza lo stato in forma lunga (impostazione predefinita)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1376 builtin/commit.c:1535
 msgid "terminate entries with NUL"
 msgstr "termina le voci con NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
 msgid "mode"
 msgstr "modo"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1379 builtin/commit.c:1538
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "visualizza file non tracciati, modalitร  facoltative: all, normal, no. "
 "(Impostazione predefinita: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1383
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11885,11 +12898,11 @@ msgstr ""
 "visualizza file ignorati, modalitร  facoltative: traditional, matching, no. "
 "(Impostazione predefinita: traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1385 parse-options.h:192
 msgid "when"
 msgstr "quando"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1386
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11897,175 +12910,175 @@ msgstr ""
 "ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, "
 "untracked. (Impostazione predefinita: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1388
 msgid "list untracked files in columns"
 msgstr "elenca i file non tracciati in colonne"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1389
 msgid "do not detect renames"
 msgstr "non rilevare le ridenominazioni"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1391
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 "rileva le ridenominazioni, imposta facoltativamente l'indice di similaritร "
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1411
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinazione di argomenti sui file ignorati e non tracciati non supportata"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "suppress summary after successful commit"
 msgstr ""
 "ometti di visualizzare il riepilogo dopo un commit completato con successo"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1495
 msgid "show diff in commit message template"
 msgstr "visualizza il diff nel modello del messaggio di commit"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1497
 msgid "Commit message options"
 msgstr "Opzioni messaggio di commit"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
 msgid "read message from file"
 msgstr "leggi il messaggio da un file"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "author"
 msgstr "autore"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "override author for commit"
 msgstr "sovrascrivi l'autore per il commit"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1500 builtin/gc.c:538
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1500
 msgid "override date for commit"
 msgstr "sovrascrivi la data per il commit"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1502
 msgid "reuse and edit message from specified commit"
 msgstr "riusa il messaggio del commit specificato per poi modificarlo"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1503
 msgid "reuse message from specified commit"
 msgstr "riusa il messaggio del commit specificato"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1504
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usa il messaggio in formato autosquash per correggere il commit specificato"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1505
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usa il messaggio in formato autosquash per eseguire lo squash del commit "
 "specificato"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1506
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "il commit ora ha me come autore (opzione usata con -C/-c/--amend)"
 
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "aggiungi Signed-off-by:"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1508
 msgid "use specified template file"
 msgstr "usa il file modello specificato"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1509
 msgid "force edit of commit"
 msgstr "forza la modifica del commit"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1511
 msgid "include status in commit message template"
 msgstr "includi lo stato nel modello del messaggio di commit"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1516
 msgid "Commit contents options"
 msgstr "Opzioni contenuto commit"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1517
 msgid "commit all changed files"
 msgstr "esegui il commit di tutti i file modificati"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1518
 msgid "add specified files to index for commit"
 msgstr "aggiungi i file specificati all'indice per il commit"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1519
 msgid "interactively add files"
 msgstr "aggiungi i file in modalitร  interattiva"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1520
 msgid "interactively add changes"
 msgstr "aggiungi le modifiche in modalitร  interattiva"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1521
 msgid "commit only specified files"
 msgstr "esegui il commit solo dei file specificati"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1522
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "ignora gli hook pre-commit e commit-msg"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1523
 msgid "show what would be committed"
 msgstr "visualizza gli elementi di cui sarebbe eseguito il commit"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1536
 msgid "amend previous commit"
 msgstr "modifica il commit precedente"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1537
 msgid "bypass post-rewrite hook"
 msgstr "ignora l'hook post-rewrite"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1544
 msgid "ok to record an empty change"
 msgstr "accetta di registrare una modifica vuota"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1546
 msgid "ok to record a change with an empty message"
 msgstr "accetta di registrare una modifica con un messaggio vuoto"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1619
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "File MERGE_HEAD corrotto (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
 msgid "could not read MERGE_MODE"
 msgstr "impossibile leggere MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1645
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "impossibile leggere il messaggio di commit: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Interrompo il commit a causa di un messaggio di commit vuoto.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Interrompo il commit; non hai modificato il messaggio.\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1691
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -12077,76 +13090,75 @@ msgstr ""
 "superata, quindi esegui \"git restore --staged :/\" per\n"
 "procedere al ripristino."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <directory oggetti>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <directory oggetti>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-msgstr "git commit-graph verify [--object-dir <directory oggetti>] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <directory oggetti>] [--shallow] [--"
+"[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
 msgstr ""
 "git commit-graph write [--object-dir <directory oggetti>] [--append|--split] "
-"[--reachable|--stdin-packs|--stdin-commits] <opzioni split>"
+"[--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opzioni split>"
+
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "impossibile trovare la directory oggetti corrispondente a %s"
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr "directory"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
 msgid "The object directory to store the graph"
 msgstr "La directory oggetti in cui memorizzare il grafo"
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:71
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "se il grafo dei commit รจ diviso, verifica solo l'ultimo file"
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Impossibile aprire il grafo dei commit '%s'"
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:128
 msgid "start walk at all refs"
 msgstr "inizia la visita da tutti i riferimenti"
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:130
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 "esamina i pack-index elencati sullo standard input alla ricerca di commit"
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:132
 msgid "start walk at commits listed by stdin"
 msgstr "inizia la visita ai commit elencati sullo standard input"
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:134
 msgid "include all commits already in the commit-graph file"
 msgstr "includi tutti i commit giร  presenti nel file commit-graph"
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:137
 msgid "allow writing an incremental commit-graph file"
 msgstr "consenti la scrittura di un file grafo dei commit incrementale"
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "numero massimo di commit in un grafo dei commit diviso non di base"
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:141
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "rapporto massimo fra due livelli di un grafo dei commit diviso"
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:159
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "usa al piรน un'opzione fra --reachable, --stdin-commits o --stdin-packs"
 
@@ -12154,212 +13166,218 @@ msgstr "usa al piรน un'opzione fra --reachable, --stdin-commits o --stdin-packs"
 msgid "git config [<options>]"
 msgstr "git config [<opzioni>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argomento --type non riconosciuto: %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:116
 msgid "only one type at a time"
 msgstr "solo un tipo per volta"
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr "Percorso file di configurazione"
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr "usa il file di configurazione globale"
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr "usa il file di configurazione di sistema"
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr "usa il file di configurazione del repository"
 
-#: builtin/config.c:128
+#: builtin/config.c:129
 msgid "use per-worktree config file"
 msgstr "usa il file di configurazione per albero di lavoro"
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr "usa il file di configurazione specificato"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr "ID blob"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr "leggi la configurazione dall'oggetto blob specificato"
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr "Azione"
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr "ottieni valore: nome [espressione-regolare-valore]"
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr "ottieni tutti i valori: chiave [espressione-regolare-valore]"
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr ""
 "ottieni i valori in base a un'espressione regolare: espressione-regolare-"
 "nome [espressione-regolare-valore]"
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "ottieni il valore specifico per l'URL: sezione[.variabile] URL"
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 "sostituisci tutte le variabili corrispondenti: nome-valore [espressione-"
 "regolare-valore]"
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr "aggiungi una nuova variabile: nome valore"
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr "rimuovi una variabile: nome [espressione-regolare-valore]"
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr "rimuovi tutte le corrispondenze: nome [espressione-regolare-valore]"
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr "rinomina sezione: vecchio-nome nuovo-nome"
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr "rimuovi una sezione: nome"
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr "elenca tutti"
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr "apri un editor"
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr "trova il colore configurato: slot [valore-predefinito]"
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "trova l'impostazione colore: slot [standard-output-รจ-una-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr "Tipo"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
 msgid "value is given this type"
 msgstr "al valore รจ assegnato questo tipo"
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr "il valore รจ \"true\" o \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr "il valore รจ un numero decimale"
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr "il valore รจ --bool o --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr "il valore รจ un percorso (nome file o directory)"
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr "il valore รจ una data di scadenza"
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr "Altro"
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr "termina i valori con un byte NUL"
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr "visualizza solo i nomi delle variabili"
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr ""
 "rispetta le directory di inclusione durante il recupero delle variabili"
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "visualizza l'origine del file di configurazione (file, standard input, blob, "
 "riga di comando)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"visualizza l'ambito della configurazione (albero di lavoro, locale, globale, "
+"sistema, comando)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
 msgid "value"
 msgstr "valore"
 
-#: builtin/config.c:158
+#: builtin/config.c:160
 msgid "with --get, use default value when missing entry"
 msgstr "con --get, usa il valore predefinito se la voce รจ mancante"
 
-#: builtin/config.c:172
+#: builtin/config.c:174
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "numero di argomenti errato, dovrebbero essere %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:176
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "numero di argomenti errato, dovrebbero essere da %d a %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:324
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "pattern chiave non valido: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:360
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "formattazione del valore configurazione predefinito non riuscita: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:417
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "impossibile analizzare il colore '%s'"
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr "impossibile analizzare il valore colore predefinito"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
 msgid "not in a git directory"
 msgstr "non si รจ in una directory git"
 
-#: builtin/config.c:499
+#: builtin/config.c:515
 msgid "writing to stdin is not supported"
 msgstr "la scrittura su standard input non รจ supportata"
 
-#: builtin/config.c:502
+#: builtin/config.c:518
 msgid "writing config blobs is not supported"
 msgstr "la scrittura di blob di configurazione non รจ supportata"
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12374,23 +13392,23 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:627
 msgid "only one config file at a time"
 msgstr "solo un file di configurazione per volta"
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr "--local puรฒ essere usato solo in un repository Git"
 
-#: builtin/config.c:619
+#: builtin/config.c:635
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob puรฒ essere usato solo in un repository Git"
 
-#: builtin/config.c:638
+#: builtin/config.c:655
 msgid "$HOME not set"
 msgstr "$HOME non impostata"
 
-#: builtin/config.c:658
+#: builtin/config.c:679
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12401,52 +13419,52 @@ msgstr ""
 "Leggi la sezione \"FILE DI CONFIGURAZIONE\" in \"git help worktree\" per\n"
 "i dettagli"
 
-#: builtin/config.c:688
+#: builtin/config.c:714
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color e il tipo della variabile non sono coerenti"
 
-#: builtin/config.c:693
+#: builtin/config.c:719
 msgid "only one action at a time"
 msgstr "solo un'azione per volta"
 
-#: builtin/config.c:706
+#: builtin/config.c:732
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only รจ applicabile solo a --list o --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:738
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin รจ applicabile solo a --get, --get-all, --get-regexp e --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:744
 msgid "--default is only applicable to --get"
 msgstr "--default รจ applicabile solo a --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:757
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "impossibile leggere il file di configurazione '%s'"
 
-#: builtin/config.c:734
+#: builtin/config.c:760
 msgid "error processing config file(s)"
 msgstr "errore durante l'elaborazione del/dei file di configurazione"
 
-#: builtin/config.c:744
+#: builtin/config.c:770
 msgid "editing stdin is not supported"
 msgstr "la modifica dello standard input non รจ supportata"
 
-#: builtin/config.c:746
+#: builtin/config.c:772
 msgid "editing blobs is not supported"
 msgstr "la modifica dei blob non รจ supportata"
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "impossibile creare il file di configurazione %s"
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12455,7 +13473,7 @@ msgstr ""
 "impossibile sovrascrivere valori multipli con un singolo valore\n"
 "       Usa un'espressione regolare, --add o --replace-all per modificare %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
 #, c-format
 msgid "no such section: %s"
 msgstr "sezione %s non esistente"
@@ -12468,59 +13486,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "stampa le dimensioni in un formato leggibile"
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opzioni>] [<espressione commit>...]"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opzioni>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr "head"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr "leggero"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr "annotato"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "il tag annotato %s non รจ disponibile"
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "il tag annotato %s non ha un nome incorporato"
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "il tag '%s' in realtร  qui รจ '%s'"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "nessun tag corrisponde esattamente a '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Nessuna corrispondenza esatta sui riferimenti o sui tag, sto eseguendo una "
 "ricerca per descrivere il commit\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:394
 #, c-format
 msgid "finished search at %s\n"
 msgstr "ricerca terminata in %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:421
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12529,7 +13547,7 @@ msgstr ""
 "Nessun tag annotato puรฒ descrivere '%s'.\n"
 "Ciรฒ nonostante, c'erano dei tag non annotati: prova con --tags."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:425
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12538,12 +13556,12 @@ msgstr ""
 "Nessun tag puรฒ descrivere '%s'.\n"
 "Prova con --always o crea dei tag."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:455
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "ho attraversato %lu commit\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:458
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12552,94 +13570,94 @@ msgstr ""
 "trovati piรน di %i tag; ho elencato i %i piรน recenti\n"
 "ho terminato la ricerca in %s\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:526
 #, c-format
 msgid "describe %s\n"
 msgstr "descrivi %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:529
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s non รจ un nome oggetto valido"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:537
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s non รจ nรฉ un commit nรฉ un blob"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:551
 msgid "find the tag that comes after the commit"
 msgstr "trova il tag successivo al commit"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:552
 msgid "debug search strategy on stderr"
 msgstr "esegui il debug della strategia di ricerca sullo standard error"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:553
 msgid "use any ref"
 msgstr "usa qualunque riferimento"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:554
 msgid "use any tag, even unannotated"
 msgstr "usa qualunque tag, anche quelli non annotati"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:555
 msgid "always use long format"
 msgstr "usa sempre il formato lungo"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:556
 msgid "only follow first parent"
 msgstr "segui solo il primo genitore"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:559
 msgid "only output exact matches"
 msgstr "visualizza solo le corrispondenze esatte"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:561
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considera gli <n> tag piรน recenti (impostazione predefinita: 10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:563
 msgid "only consider tags matching <pattern>"
 msgstr "considera solo i tag corrispondenti al <pattern>"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:565
 msgid "do not consider tags matching <pattern>"
 msgstr "non considerare i tag corrispondenti al <pattern>"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:567 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "visualizza l'oggetto commit abbreviato come fallback"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:568 builtin/describe.c:571
 msgid "mark"
 msgstr "contrassegno"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:569
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 "aggiungi <contrassegno> all'albero di lavoro sporco (impostazione "
 "predefinita: \"-dirty\")"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:572
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "aggiungi <contrassegno> all'albero di lavoro rotto (impostazione "
 "predefinita: \"-broken\")"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:590
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long non รจ compatibile con --abbrev=0"
 
-#: builtin/describe.c:603
+#: builtin/describe.c:619
 msgid "No names found, cannot describe anything."
 msgstr "Nessun nome trovato, non รจ possibile descrivere nulla."
 
-#: builtin/describe.c:654
+#: builtin/describe.c:670
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty non รจ compatibile con le espressioni commit"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:672
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken non รจ compatibile con le espressioni commit"
 
@@ -12676,27 +13694,27 @@ msgstr "specificato oggetto non gestito '%s'."
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "non riuscito: %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "impossibile leggere il collegamento simbolico %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "impossibile leggere il file collegamento simbolico %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "impossibile leggere l'oggetto %s per il collegamento simbolico %s"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -12704,54 +13722,54 @@ msgstr ""
 "i formati diff combinati ('-c' e '--cc') non sono supportati in\n"
 "modalitร  diff directory ('-d' e '--dir-diff')."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "entrambi i file risultano modificati: '%s' e '%s'."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr "il file nell'albero di lavoro รจ stato mantenuto."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "esistono file temporanei in '%s'."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr "potresti voler ripulirli o ripristinarli."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "usa `diff.guitool` anzichรฉ `diff.tool`"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr "esegui un diff directory completo"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr "non chiedere conferma prima di lanciare un tool diff"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "usa collegamenti simbolici in modalitร  diff directory"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr "strumento"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "usa lo strumento diff specificato"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "stampa un elenco di strumenti diff che possono essere usati con `--tool`"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12759,31 +13777,31 @@ msgstr ""
 "fai sรฌ che 'git-difftool' esca quando uno strumento diff invocato "
 "restituisce un codice d'uscita diverso da zero"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "specifica un comando personalizzato per visualizzare i diff"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr "fornito a `diff`"
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool richiede un albero di lavoro o --no-index"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff non รจ compatibile con --no-index"
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "le opzioni --gui, --tool ed --extcmd sono mutualmente esclusive"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "nessuno <strumento> specificato per --tool=<strumento>"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "nessun <comando> specificato per --extcmd=<comando>"
 
@@ -12825,161 +13843,189 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [opzioni-elenco-rev]"
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+"Errore: Impossibile esportare i tag nidificati a meno che non sia "
+"specificata l'opzione --mark-tags."
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr "visualizza l'avanzamento dopo <n> oggetti"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr "seleziona la gestione dei tag firmati"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr "seleziona la gestione dei tag che contrassegnano oggetti filtrati"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "seleziona la gestione dei messaggi di commit in una codifica alternativa"
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
 msgstr "Esegui il dump dei contrassegni in questo file"
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
 msgstr "Importa i contrassegni da questo file"
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "Importa i contrassegni da questo file se esiste"
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr "Usa un tagger falso se i tag non ne hanno uno"
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr "Visualizza in output l'albero completo per ogni commit"
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr "Usa la funzionalitร  \"fatto\" per terminare il flusso"
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr "Ometti l'output dei dati dei blob"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr "specificatore riferimento"
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr "Applica lo specificatore riferimento ai riferimenti esportati"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr "rendi anonimo l'output"
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 "Fai riferimento ai genitori non nel flusso fast-export tramite l'ID oggetto"
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
 msgstr "Visualizza gli ID oggetto originari dei blob/commit"
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "Etichetta i tag con ID contrassegno"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr ""
+"Impossibile fornire entrambe le opzioni --import-marks e --import-marks-if-"
+"exists"
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opzioni>] [<repository> [<specificatore riferimento>...]]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opzioni>] <gruppo>"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]"
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opzioni>]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel non puรฒ essere negativo"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
 msgid "fetch from all remotes"
 msgstr "esegui il fetch da tutti i remoti"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "imposta l'upstream per git pull/fetch"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "aggiungi i dati a .git/FETCH_HEAD anzichรฉ sovrascriverli"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:190
 msgid "path to upload pack on remote end"
 msgstr "percorso in cui caricare il pack sul remoto"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr "forza la sovrascrittura del riferimento locale"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr "esegui il fetch da piรน remoti"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:194
 msgid "fetch all tags and associated objects"
 msgstr "esegui il fetch di tutti i tag e degli oggetti associati"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr "non eseguire il fetch di alcun tag (--no-tags)"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr "numero di sottomoduli recuperati in parallelo"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:197
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "elimina i branch che ne tracciano uno remoto ma non piรน presenti sul remoto"
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "elimina i tag locali non piรน presenti sul remoto e sovrascrivi i tag "
 "modificati"
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
 msgid "on-demand"
 msgstr "a richiesta"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr "controlla il recupero ricorsivo dei sottomoduli"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:205
 msgid "keep downloaded pack"
 msgstr "mantieni il pack scaricato"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr "consenti l'aggiornamento del riferimento HEAD"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
 msgid "deepen history of shallow clone"
 msgstr "aumenta la profonditร  della cronologia di un clone shallow"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 "aumenta la profonditร  della cronologia di un clone shallow in base al tempo"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:211
 msgid "convert to a complete repository"
 msgstr "converti in un repository completo"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr "anteponi questo prefisso all'output del percorso del sottomodulo"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -12987,90 +14033,94 @@ msgstr ""
 "impostazione predefinita per il recupero ricorsivo dei sottomoduli (a "
 "prioritร  minore rispetto ai file di configurazione)"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:214
 msgid "accept refs that update .git/shallow"
 msgstr "accetta i riferimenti che aggiornano .git/shallow"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:216
 msgid "refmap"
 msgstr "mappa riferimenti"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:217
 msgid "specify fetch refmap"
 msgstr "specifica la mappa dei riferimenti per il fetch"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr "segnala che abbiamo solo oggetti raggiungibili da quest'oggetto"
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 msgid "run 'gc --auto' after fetching"
 msgstr "esegui 'gc --auto' dopo il fetch"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:226
 msgid "check for forced-updates on all updated branches"
 msgstr "controlla aggiornamenti forzati su tutti i branch aggiornati"
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "scrivi il grafo dei commit dopo il fetch"
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr "Impossibile trovare l'HEAD del riferimento remoto"
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "il valore dell'opzione fetch.output contiene il valore non valido %s"
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr "oggetto %s non trovato"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr "[aggiornato]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr "[rifiutato]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr "impossibile eseguire il fetch nel branch corrente"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr "[tag aggiornato]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr "impossibile aggiornare il riferimento locale"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr "sovrascriverebbe il tag esistente"
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr "[nuovo tag]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr "[nuovo branch]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr "[nuovo riferimento]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr "aggiornamento forzato"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr "non fast forward"
 
-#: builtin/fetch.c:854
+#: builtin/fetch.c:877
 msgid ""
 "Fetch normally indicates which branches had a forced update,\n"
 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -13081,7 +14131,7 @@ msgstr ""
 "riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n"
 "fetch.showForcedUpdates true'."
 
-#: builtin/fetch.c:858
+#: builtin/fetch.c:881
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -13093,22 +14143,22 @@ msgstr ""
 "aggiornamenti forzati. Puoi usare '--no-show-forced-updates' o eseguire\n"
 "'git config fetch.showForcedUpdates false' per omettere questo controllo.\n"
 
-#: builtin/fetch.c:888
+#: builtin/fetch.c:920
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s non ha inviato tutti gli oggetti necessari\n"
 
-#: builtin/fetch.c:909
+#: builtin/fetch.c:941
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "%s rifiutato perchรฉ non รจ consentito aggiornare radici shallow"
 
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
 #, c-format
 msgid "From %.*s\n"
 msgstr "Da %.*s\n"
 
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1037
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -13118,60 +14168,81 @@ msgstr ""
 "eseguire\n"
 " 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto"
 
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1134
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s diventerร  pendente)"
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1135
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s รจ diventato pendente)"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1167
 msgid "[deleted]"
 msgstr "[eliminato]"
 
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1168 builtin/remote.c:1112
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1191
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 "Mi rifiuto di eseguire il fetch nel branch corrente %s di un repository non "
 "bare"
 
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1210
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "L'opzione \"%s\" con il valore \"%s\" non รจ valida per %s"
 
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1213
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "L'opzione \"%s\" รจ ignorata per %s\n"
 
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "rilevati branch multipli, stato incompatibile con --set-upstream"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "non imposto l'upstream per un branch remoto che ne traccia uno remoto"
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "non imposto l'upstream per un tag remoto"
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "tipo branch sconosciuto"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"nessun branch sorgente trovato.\n"
+"devi specificare esattamente un branch con l'opzione --set-upstream."
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Recupero di %s in corso\n"
 
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Impossibile recuperare %s"
 
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr ""
-"--filter puรฒ essere usato solo con il remoto configurato nelle estensioni."
-"partialClone"
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "impossibile recuperare '%s' (codice di uscita: %d)\n"
 
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1693
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -13179,45 +14250,45 @@ msgstr ""
 "Non รจ stato specificato alcun repository remoto. Specifica un URL o il\n"
 "nome di un remoto da cui dovranno essere recuperate le nuove revisioni."
 
-#: builtin/fetch.c:1593
+#: builtin/fetch.c:1730
 msgid "You need to specify a tag name."
 msgstr "Devi specificare il nome di un tag."
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1780
 msgid "Negative depth in --deepen is not supported"
 msgstr "Le profonditร  negative in --deepen non sono supportate"
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1782
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "le opzioni --deepen e --depth sono mutualmente esclusive"
 
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1787
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth e --unshallow non possono essere usati insieme."
 
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1789
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow su un repository completo non ha senso"
 
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1805
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all non richiede un repository come argomento"
 
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1807
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all non ha senso con degli specificatori riferimento"
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1816
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Remoto o gruppo remoti non esistente: %s"
 
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1823
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "Recuperare un gruppo e specificare gli specificatori riferimento non ha senso"
 
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1841
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -13231,23 +14302,23 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <messaggio>] [--log[=<n>] | --no-log] [--file <file>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:671
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "popola il registro con al piรน <n> voci del registro breve"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:674
 msgid "alias for --log (deprecated)"
 msgstr "alias di --log (deprecato)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:677
 msgid "text"
 msgstr "testo"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:678
 msgid "use <text> as start of message"
 msgstr "usa <testo> come stringa iniziale del messaggio"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:679
 msgid "file to read from"
 msgstr "file da cui leggere"
 
@@ -13314,32 +14385,32 @@ msgstr "stampa solo i riferimenti contenenti il commit"
 msgid "print only refs which don't contain the commit"
 msgstr "stampa solo i riferimenti che non contengono il commit"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr "sconosciuto"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "errore in %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "avviso in %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "collegamento rotto da %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr "tipo oggetto errato nel collegamento"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13348,216 +14419,216 @@ msgstr ""
 "collegamento rotto da %7s %s\n"
 "                   a %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr "%s mancante %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr "%s non raggiungibile %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, c-format
 msgid "dangling %s %s"
 msgstr "%s pendente %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 msgid "could not create lost-found"
 msgstr "impossibile creare lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr "impossibile terminare '%s'"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr "Controllo di %s in corso"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Controllo connessione in corso (%d oggetti)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr "Controllo di %s in corso %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr "collegamenti rotti"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr "radice %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "eseguito tag di %s %s (%s) in %s"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: oggetto corrotto o mancante"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: voce registro riferimenti non valida: %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Controllo registro riferimenti %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: puntatore SHA1 non valido: %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: non รจ un commit"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr "avviso: nessun riferimento predefinito"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: oggetto corrotto o mancante: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: impossibile analizzare l'oggetto: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "file SHA1 non valido: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr "Controllo directory oggetti in corso"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr "Controllo directory oggetti in corso"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr "Controllo collegamento %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr "%s non valido"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s punta a qualcosa di strano (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: l'HEAD scollegato non punta a niente"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "avviso: %s punta a un branch non nato (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr "Controllo cache albero in corso"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: puntatore SHA1 non valido nella cache alberi"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr "oggetto non albero nella cache alberi"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opzioni>] [<oggetto>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr "visualizza oggetti non raggiungibili"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr "visualizza oggetti pendenti"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr "segnala i tag"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr "segnala i nodi radice"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr "rendi gli oggetti indice nodi head"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr "rendi i registri dei riferimenti nodi head (impostazione predefinita)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
 msgstr "considera anche i pack e gli oggetti alternativi"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr "controlla solo la connessione"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr "abilita controlli piรน restrittivi"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr "scrivi oggetti pendenti in .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr "visualizza l'avanzamento"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "Controllo oggetti in corso"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: oggetto mancante"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "parametro non valido: atteso SHA1, presente '%s'"
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr "git gc [<opzioni>]"
 
@@ -13571,17 +14642,17 @@ msgstr "fstat di %s non riuscito: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "analisi dell'opzione '%s' con valore '%s' non riuscita"
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "impossibile eseguire lo stat di '%s'"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr "impossibile leggere '%s'"
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13597,56 +14668,56 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr "elimina oggetti non referenziati"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr "sii piรน accurato (tempi di esecuzione maggiori)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr "abilita modalitร  garbage collector automatica"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "forza l'esecuzione del garbage collector anche nel caso in cui ve ne "
 "potrebbe essere un altro in esecuzione"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr ""
 "esegui il repack di tutti gli altri pack ad eccezione di quello piรน grande"
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "analisi del valore %s di gc.logexpiry non riuscita"
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "analisi del valore %s per la scadenza delle eliminazioni non riuscita"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Comprimo il repository in background per ottenere le migliori prestazioni.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Comprimo il repository per ottenere le migliori prestazioni.\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vedi \"git help gc\" per le operazioni di manutenzione manuali.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13654,14 +14725,14 @@ msgstr ""
 "gc รจ giร  in esecuzione sul computer '%s' con PID %<PRIuMAX> (usa --force se "
 "non lo รจ)"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Ci sono troppi oggetti sparsi non raggiungibili; esegui 'git prune' per "
 "eliminarli."
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 "git grep [<opzioni>] [-e] <pattern> [<revisione>...] [[--] <percorso>...]"
@@ -13680,263 +14751,263 @@ msgstr "specificato numero non valido di thread (%d) per %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "non vi รจ supporto per i thread, ignoro %s"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "impossibile leggere il tree (%s)"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:633
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "impossibile eseguire grep su un oggetto di tipo %s"
 
-#: builtin/grep.c:714
+#: builtin/grep.c:704
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "switch '%c' richiede un valore numerico"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:803
 msgid "search in index instead of in the work tree"
 msgstr "cerca nell'index anzichรฉ nell'albero di lavoro"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:805
 msgid "find in contents not managed by git"
 msgstr "la ricerca nei contenuti non รจ gestita da Git"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:807
 msgid "search in both tracked and untracked files"
 msgstr "cerca sia nei file tracciati sia in quelli non tracciati"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:809
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignora i file specificati in '.gitignore'"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:811
 msgid "recursively search in each submodule"
 msgstr "cerca ricorsivamente in ogni sottomodulo"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:814
 msgid "show non-matching lines"
 msgstr "visualizza le righe non corrispondenti"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:816
 msgid "case insensitive matching"
 msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:818
 msgid "match patterns only at word boundaries"
 msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:820
 msgid "process binary files as text"
 msgstr "elabora i file binari come testuali"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:822
 msgid "don't match patterns in binary files"
 msgstr "non cercare corrispondenze ai pattern nei file binari"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:825
 msgid "process binary files with textconv filters"
 msgstr "elabora i file binari con filtri di conversione in testo"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:827
 msgid "search in subdirectories (default)"
 msgstr "cerca nelle sottodirectory (impostazione predefinita)"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:829
 msgid "descend at most <depth> levels"
 msgstr "scendi al piรน di <profonditร > livelli"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:833
 msgid "use extended POSIX regular expressions"
 msgstr "usa espressioni regolari POSIX estese"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:836
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:839
 msgid "interpret patterns as fixed strings"
 msgstr "interpreta i pattern come stringhe fisse"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:842
 msgid "use Perl-compatible regular expressions"
 msgstr "usa espressioni regolari compatibili con Perl"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:845
 msgid "show line numbers"
 msgstr "visualizza numeri di riga"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:846
 msgid "show column number of first match"
 msgstr "visualizza il numero di colonna della prima corrispondenza"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:847
 msgid "don't show filenames"
 msgstr "non visualizzare i nomi file"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:848
 msgid "show filenames"
 msgstr "visualizza i nomi file"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:850
 msgid "show filenames relative to top directory"
 msgstr "visualizza i nomi file relativi alla directory di primo livello"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:852
 msgid "show only filenames instead of matching lines"
 msgstr "visualizza solo i nomi file anzichรฉ le righe corrispondenti"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:854
 msgid "synonym for --files-with-matches"
 msgstr "sinonimo di --files-with-matches"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:857
 msgid "show only the names of files without match"
 msgstr "visualizza solo i nomi dei file non corrispondenti"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:859
 msgid "print NUL after filenames"
 msgstr "stampa NUL dopo i nomi file"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:862
 msgid "show only matching parts of a line"
 msgstr "visualizza solo le parti corrispondenti di una riga"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:864
 msgid "show the number of matches instead of matching lines"
 msgstr "visualizza il numero di corrispondenze anzichรฉ le righe corrispondenti"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:865
 msgid "highlight matches"
 msgstr "evidenzia corrispondenze"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:867
 msgid "print empty line between matches from different files"
 msgstr "stampa una riga vuota fra le corrispondenze in file differenti"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:869
 msgid "show filename only once above matches from same file"
 msgstr ""
 "visualizza il nome file solo una volta prima delle corrispondenze nello "
 "stesso file"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:872
 msgid "show <n> context lines before and after matches"
 msgstr "visualizza <n> righe di contesto prima e dopo le corrispondenze"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:875
 msgid "show <n> context lines before matches"
 msgstr "visualizza <n> righe di contesto prima delle corrispondenze"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:877
 msgid "show <n> context lines after matches"
 msgstr "visualizza <n> righe di contesto dopo le corrispondenze"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:879
 msgid "use <n> worker threads"
 msgstr "usa <n> thread di lavoro"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:880
 msgid "shortcut for -C NUM"
 msgstr "scorciatoia per -C NUM"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:883
 msgid "show a line with the function name before matches"
 msgstr "visualizza una riga con il nome funzione prima delle corrispondenze"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:885
 msgid "show the surrounding function"
 msgstr "visualizza la funzione circostante"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:888
 msgid "read patterns from file"
 msgstr "leggi le corrispondenze da un file"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:890
 msgid "match <pattern>"
 msgstr "cerca corrispondenze con <pattern>"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:892
 msgid "combine patterns specified with -e"
 msgstr "combina i pattern specificati con -e"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:904
 msgid "indicate hit with exit status without output"
 msgstr ""
 "segnala una corrispondenza con il codice di uscita senza emettere output"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:906
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "visualizza solo le corrispondenze nei file in cui vi sono corrispondenze per "
 "tutti i pattern"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:908
 msgid "show parse tree for grep expression"
 msgstr "visualizza l'albero di analisi per l'espressione grep"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "pager"
 msgstr "pager"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "show matching files in the pager"
 msgstr "visualizza i file corrispondenti nel pager"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:916
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "consenti"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:983
 msgid "no pattern given"
 msgstr "nessun pattern specificato"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1019
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked non possono essere usate con le revisioni"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1027
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "impossibile risolvere la revisione %s"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "l'opzione --untracked non รจ supportata con --recurse-submodules"
+
+#: builtin/grep.c:1061
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinazione di opzioni non valida, ignoro --threads"
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
 msgid "no threads support, ignoring --threads"
 msgstr "non vi รจ supporto per i thread, ignoro --threads"
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "specificato numero non valido di thread (%d)"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1101
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager funziona solo sull'albero di lavoro"
 
-#: builtin/grep.c:1117
-msgid "option not supported with --recurse-submodules"
-msgstr "opzione non supportata con --recurse-submodules"
-
-#: builtin/grep.c:1123
+#: builtin/grep.c:1127
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached o --untracked non possono essere usate con --no-index"
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1133
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard non puรฒ essere usata per i contenuti tracciati"
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1141
 msgid "both --cached and trees are given"
 msgstr "sono specificati sia --cached sia degli alberi"
 
@@ -14122,11 +15193,11 @@ msgstr "errore di lettura in input"
 msgid "used more bytes than were available"
 msgstr "usati piรน byte di quelli disponibili"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
 msgid "pack too large for current definition of off_t"
 msgstr "pack troppo largo per la definizione corrente di off_t"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "il pack supera la dimensione massima consentita"
 
@@ -14182,191 +15253,191 @@ msgstr[1] "fine del file pack prematura, %<PRIuMAX> byte mancanti"
 msgid "serious inflate inconsistency"
 msgstr "inconsistenza grave di inflate"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "TROVATA COLLISIONE SHA1 CON %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
 #, c-format
 msgid "unable to read %s"
 msgstr "impossibile leggere %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "impossibile leggere le informazioni sull'oggetto esistente: %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "non รจ possibile leggere l'oggetto %s esistente"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr "oggetto blob %s non valido"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
 msgid "fsck error in packed object"
 msgstr "errore fsck nell'oggetto sottoposto a pack"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Non tutti gli oggetti figlio di %s sono raggiungibili"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr "applicazione del delta non riuscita"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr "Ricezione degli oggetti"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr "Indicizzazione degli oggetti"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "il pack รจ corrotto (SHA1 non corrisponde)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr "impossibile eseguire fstat sul file pack"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr "il pack ha dati inutili alla fine"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusione oltre ogni follia in parse_pack_objects()"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr "Risoluzione dei delta"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "impossibile creare il thread: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr "confusione oltre ogni follia"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "completato con %d oggetto locale"
 msgstr[1] "completato con %d oggetti locali"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Checksum in coda inatteso per %s (disco corrotto?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "pack ha %d delta irrisolto"
 msgstr[1] "pack ha %d delta irrisolti"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "impossibile eseguire deflate sull'oggetto aggiunto alla fine (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'oggetto locale %s รจ corrotto"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "il nome del file pack '%s' non termina con '.pack'"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "impossibile scrivere il file %s '%s'"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "impossibile chiudere il file %s scritto '%s'"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
 msgid "error while closing pack file"
 msgstr "errore nella chiusura del file pack"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
 msgid "cannot store pack file"
 msgstr "impossibile archiviare il file pack"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
 msgid "cannot store index file"
 msgstr "impossibile archiviare index file"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> non valida"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossibile aprire il file pack '%s' esistente"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Impossibile aprire il file pack idx esistente per '%s'"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "non delta: %d oggetto"
 msgstr[1] "non delta: %d oggetti"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "lunghezza della catena = %d: %lu oggetto"
 msgstr[1] "lunghezza della catena = %d: %lu oggetti"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
 msgid "Cannot come back to cwd"
 msgstr "impossibile tornare alla directory di lavoro corrente"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
 #, c-format
 msgid "bad %s"
 msgstr "%s errato"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin non puรฒ essere usato senza --stdin"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
 msgid "--stdin requires a git repository"
 msgstr "--stdin richiede un repository Git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
 msgid "--verify with no packfile name given"
 msgstr "--verify senza un nome del file pack specificato"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "errore fsck negli oggetti sottoposti a pack"
 
@@ -14549,121 +15620,126 @@ msgstr "--trailer con --only-input non ha senso"
 msgid "no input file given for in-place editing"
 msgstr "nessun file di input specificato per la modifica sul posto"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opzioni>] [<intervallo-revisioni>] [[--] <percorso>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opzioni>] <oggetto>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opzione --decorate non valida: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:174
 msgid "show source"
 msgstr "visualizza sorgente"
 
-#: builtin/log.c:174
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr "Usa il file mappatura e-mail"
 
-#: builtin/log.c:176
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr "decora solo i riferimenti corrispondenti a <pattern>"
 
-#: builtin/log.c:178
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr "non decorare i riferimenti corrispondenti a <pattern>"
 
-#: builtin/log.c:179
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr "opzioni decorazione"
 
-#: builtin/log.c:182
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Elabora l'intervallo righe n,m nel file, contandole da 1"
 
-#: builtin/log.c:280
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Output finale: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: file non valido"
 
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:550 builtin/log.c:645
 #, c-format
 msgid "could not read object %s"
 msgstr "impossibile leggere l'oggetto %s"
 
-#: builtin/log.c:668
+#: builtin/log.c:670
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipo sconosciuto: %d"
 
-#: builtin/log.c:791
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: modo lettera da descrizione non valido"
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr "format.headers non ha alcun valore"
 
-#: builtin/log.c:908
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr "il nome della directory di output รจ troppo lungo"
 
-#: builtin/log.c:924
+#: builtin/log.c:952
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "impossibile aprire il file patch %s"
 
-#: builtin/log.c:941
+#: builtin/log.c:969
 msgid "need exactly one range"
 msgstr "รจ necessario specificare esattamente un intervallo"
 
-#: builtin/log.c:951
+#: builtin/log.c:979
 msgid "not a range"
 msgstr "il valore non รจ un intervallo"
 
-#: builtin/log.c:1074
+#: builtin/log.c:1143
 msgid "cover letter needs email format"
 msgstr "la lettera di accompagnamento dev'essere in formato e-mail"
 
-#: builtin/log.c:1080
+#: builtin/log.c:1149
 msgid "failed to create cover-letter file"
 msgstr "creazione del file lettera di accompagnamento non riuscita"
 
-#: builtin/log.c:1159
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "valore in-reply-to folle: %s"
 
-#: builtin/log.c:1186
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1313
 msgid "two output directories?"
 msgstr "due directory di output?"
 
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, c-format
 msgid "unknown commit %s"
 msgstr "commit %s sconosciuto"
 
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "impossibile risolvere '%s' come riferimento valido"
 
-#: builtin/log.c:1370
+#: builtin/log.c:1439
 msgid "could not find exact merge base"
 msgstr "impossibile trovare esattamente la base del merge"
 
-#: builtin/log.c:1374
+#: builtin/log.c:1443
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -14675,278 +15751,288 @@ msgstr ""
 "In alternativa puoi specificare manualmente il commit di base con\n"
 "--base=<ID commit di base>"
 
-#: builtin/log.c:1394
+#: builtin/log.c:1463
 msgid "failed to find exact merge base"
 msgstr "impossibile trovare esattamente la base del merge"
 
-#: builtin/log.c:1405
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr "il commit di base dovrebbe essere l'antenato dell'elenco revisioni"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr "il commit di base non dovrebbe essere nell'elenco revisioni"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr "impossibile ottenere l'ID della patch"
 
-#: builtin/log.c:1514
+#: builtin/log.c:1583
 msgid "failed to infer range-diff ranges"
 msgstr "inferenza degli intervalli range-diff non riuscita"
 
-#: builtin/log.c:1559
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "usa [PATCH n/m] anche con una singola patch"
 
-#: builtin/log.c:1562
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr "usa [PATCH] anche con piรน patch"
 
-#: builtin/log.c:1566
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr "stampa le patch sullo standard output"
 
-#: builtin/log.c:1568
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr "genera una lettera di accompagnamento"
 
-#: builtin/log.c:1570
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr "usa una sequenza numerica semplice per i nomi file di output"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr "suff"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr "usa <suff> anzichรฉ '.patch'"
 
-#: builtin/log.c:1574
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr "inizia a numerare le patch da <n> anzichรฉ da 1"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr "contrassegna la serie come l'n-esima versione revisionata"
 
-#: builtin/log.c:1578
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Usa [RFC PATCH] anzichรฉ [PATCH]"
 
-#: builtin/log.c:1581
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "modo-lettera-da-descrizione"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"genera parti di una lettera d'accompagnamento basandosi sulla descrizione di "
+"un branch"
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Usa [<prefisso>] anzichรฉ [PATCH]"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr "salva i file risultanti in <dir>"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr "non eliminare/aggiungere [PATCH]"
 
-#: builtin/log.c:1590
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr "non mandare in output diff binari"
 
-#: builtin/log.c:1592
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr "manda in output un hash costituito da soli zeri nell'intestazione From"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr "non includere una patch corrispondente a un commit upstream"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "visualizza il formato della patch anzichรฉ l'impostazione predefinita (patch "
 "+ stat)"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr "Messaggistica"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1672
 msgid "header"
 msgstr "intestazione"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr "aggiungi intestazione e-mail"
 
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr "e-mail"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr "aggiungi intestazione A:"
 
-#: builtin/log.c:1603
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr "aggiungi intestazione Cc:"
 
-#: builtin/log.c:1605
+#: builtin/log.c:1678
 msgid "ident"
 msgstr "identitร "
 
-#: builtin/log.c:1606
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "imposta l'indirizzo Da a <identitร > (o all'identitร  di chi ha creato il "
 "commit se assente)"
 
-#: builtin/log.c:1608
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr "ID messaggio"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr "rendi la prima e-mail una risposta a <ID messaggio>"
 
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr "delimitatore"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr "allega la patch"
 
-#: builtin/log.c:1614
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr "includi la patch nel messaggio"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "abilita il raggruppamento messaggi per conversazione, stili: superficiale, "
 "profondo"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1693
 msgid "signature"
 msgstr "firma"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr "aggiungi una firma"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr "commit di base"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 "aggiungi le informazioni prerequisito per l'albero alla serie delle patch"
 
-#: builtin/log.c:1625
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr "aggiungi una firma da file"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr "non stampare i nomi file delle patch"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr "visualizza l'avanzamento dell'operazione di generazione patch"
 
-#: builtin/log.c:1630
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "visualizza le modifiche rispetto a <revisione> nella lettera di "
 "accompagnamento o in una patch singola"
 
-#: builtin/log.c:1633
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "visualizza le modifiche rispetto a <specificatore revisione> nella lettera "
 "di accompagnamento o in una patch singola"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr "percentuale in base a cui viene pesata la creazione"
 
-#: builtin/log.c:1710
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "riga ident non valida: %s"
 
-#: builtin/log.c:1725
+#: builtin/log.c:1807
 msgid "-n and -k are mutually exclusive"
 msgstr "le opzioni -n e -k sono mutuamente esclusive"
 
-#: builtin/log.c:1727
+#: builtin/log.c:1809
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "le opzioni --subject-prefix/--rfc e -k sono mutuamente esclusive"
 
-#: builtin/log.c:1735
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr "--name-only non ha senso"
 
-#: builtin/log.c:1737
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr "--name-status non ha senso"
 
-#: builtin/log.c:1739
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr "--check non ha senso"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
 msgstr "standard output, o directory, quale dei due?"
 
-#: builtin/log.c:1860
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff richiede --cover-letter o una singola patch"
 
-#: builtin/log.c:1864
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1865
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff rispetto alla versione %d:"
 
-#: builtin/log.c:1871
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor richiede --range-diff"
 
-#: builtin/log.c:1875
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff richiede --cover-letter o una singola patch"
 
-#: builtin/log.c:1883
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:1884
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff rispetto alla versione %d:"
 
-#: builtin/log.c:1895
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "impossibile leggere il file firma '%s'"
 
-#: builtin/log.c:1931
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr "Generazione delle patch in corso"
 
-#: builtin/log.c:1975
+#: builtin/log.c:2073
 msgid "failed to create output files"
 msgstr "creazione dei file di output non riuscita"
 
-#: builtin/log.c:2034
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]"
 
-#: builtin/log.c:2088
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15078,7 +16164,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "non stampare l'URL del remoto"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
 msgid "exec"
 msgstr "eseguibile"
 
@@ -15166,150 +16252,150 @@ msgstr "git merge --abort"
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:119
 msgid "switch `m' requires a value"
 msgstr "lo switch 'm' richiede un valore"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "l'opzione `%s' richiede un valore"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:188
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Non รจ stato possibile trovare la strategia di merge '%s'.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:189
 #, c-format
 msgid "Available strategies are:"
 msgstr "Le strategie disponibili sono:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:194
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Le strategie personalizzate disponibili sono:"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:245 builtin/pull.c:132
 msgid "do not show a diffstat at the end of the merge"
 msgstr "non visualizzare un diffstat al termine del merge"
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:248 builtin/pull.c:135
 msgid "show a diffstat at the end of the merge"
 msgstr "visualizza un diffstat al termine del merge"
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:249 builtin/pull.c:138
 msgid "(synonym to --stat)"
 msgstr "(sinonimo di --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:251 builtin/pull.c:141
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "aggiungi (al piรน <n>) voci dal registro breve al messaggio di commit del "
 "merge"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:254 builtin/pull.c:147
 msgid "create a single commit instead of doing a merge"
 msgstr "crea un singolo commit anzichรฉ eseguire un merge"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:256 builtin/pull.c:150
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "esegui un commit se il merge ha successo (impostazione predefinita)"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:258 builtin/pull.c:153
 msgid "edit message before committing"
 msgstr "modifica il messaggio prima di eseguire il commit"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:260
 msgid "allow fast-forward (default)"
 msgstr "consenti fast forward (impostazione predefinita)"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:262 builtin/pull.c:160
 msgid "abort if fast-forward is not possible"
 msgstr "interrompi se il fast forward non รจ possibile"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:266 builtin/pull.c:163
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verifica che il commit specificato abbia una firma GPG valida"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
 msgid "strategy"
 msgstr "strategia"
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:268 builtin/pull.c:168
 msgid "merge strategy to use"
 msgstr "strategia di merge da usare"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:171
 msgid "option=value"
 msgstr "opzione=valore"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option for selected merge strategy"
 msgstr "opzione per la strategia di merge selezionata"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "messaggio di commit del merge (per un merge non fast forward)"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr "interrompi il merge attualmente in corso"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr "esegui --abort ma mantieni immutati l'indice e l'albero di lavoro"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr "continua il merge attualmente in corso"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:285 builtin/pull.c:179
 msgid "allow merging unrelated histories"
 msgstr "consenti di unire cronologie non correlate"
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "verifica hook commit-msg"
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "ignora gli hook pre-merge-commit e commit-msg"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:308
 msgid "could not run stash."
 msgstr "non รจ stato possibile eseguire stash."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:313
 msgid "stash failed"
 msgstr "esecuzione di stash non riuscita"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:318
 #, c-format
 msgid "not a valid object: %s"
 msgstr "non รจ un oggetto valido: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
 msgid "read-tree failed"
 msgstr "read-tree non riuscito"
 
-#: builtin/merge.c:386
+#: builtin/merge.c:387
 msgid " (nothing to squash)"
 msgstr " (nulla di cui eseguire lo squash)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:398
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Commit di squash -- non aggiorno HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:448
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:499
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' non punta ad un commit"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:586
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Stringa branch.%s.mergeoptions errata: %s"
@@ -15363,74 +16449,74 @@ msgstr ""
 "Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n"
 "interromperร  il commit.\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:865
 msgid "Empty commit message."
 msgstr "Messaggio di commit vuoto."
 
-#: builtin/merge.c:872
+#: builtin/merge.c:880
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Splendido.\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:941
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Merge automatico fallito; risolvi i conflitti ed esegui il commit\n"
 "del risultato.\n"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:980
 msgid "No current branch."
 msgstr "Nessun branch corrente."
 
-#: builtin/merge.c:974
+#: builtin/merge.c:982
 msgid "No remote for the current branch."
 msgstr "Nessun remote per il branch corrente."
 
-#: builtin/merge.c:976
+#: builtin/merge.c:984
 msgid "No default upstream defined for the current branch."
 msgstr "Nessun upstream di default definito per il branch corrente."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:989
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Nessun branch che tracci un remoto per %s da %s"
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1046
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valore errato '%s' nell'ambiente '%s'"
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1149
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "non รจ qualcosa di cui possiamo eseguire il merge in %s: %s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1183
 msgid "not something we can merge"
 msgstr "non รจ qualcosa di cui possiamo eseguire il merge"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1286
 msgid "--abort expects no arguments"
 msgstr "--abort non richiede argomenti"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1290
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Non c'รจ nessun merge da interrompere (MERGE_HEAD mancante)."
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1299
 msgid "--quit expects no arguments"
 msgstr "--quit non richiede argomenti"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1312
 msgid "--continue expects no arguments"
 msgstr "--continue non richiede argomenti"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1316
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Non c'รจ nessun merge in corso (MERGE_HEAD mancante)."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1332
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15438,7 +16524,7 @@ msgstr ""
 "Non hai concluso il merge (MERGE_HEAD esiste).\n"
 "Esegui il commit delle modifiche prima di eseguire il merge."
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1339
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15446,96 +16532,96 @@ msgstr ""
 "Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n"
 "Esegui il commit delle modifiche prima di eseguire il merge."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1342
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Il cherry-pick non รจ stato concluso (CHERRY_PICK_HEAD esiste)."
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1356
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Non รจ possibile combinare --squash con --no-ff."
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1358
 msgid "You cannot combine --squash with --commit."
 msgstr "Non รจ possibile combinare --squash con --commit."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1374
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1391
 msgid "Squash commit into empty head not supported yet"
 msgstr "Lo squash di un commit in un'head vuota non รจ ancora supportato"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1393
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Un commit non fast forward non ha senso in un'head vuota"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1398
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - non รจ qualcosa per cui possiamo eseguire il merge"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1400
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Si puรฒ eseguire solo il merge di uno e un solo commit in un'head vuota"
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1481
 msgid "refusing to merge unrelated histories"
 msgstr "mi rifiuto di eseguire il merge di cronologie non correlate"
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1490
 msgid "Already up to date."
 msgstr "Giร  aggiornato."
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1500
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aggiornamento di %s..%s\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Provo con un merge veramente banale dentro l'indice...\n"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1549
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1574
 msgid "Already up to date. Yeeah!"
 msgstr "Giร  aggiornato. Oh sรฌ!"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1580
 msgid "Not possible to fast-forward, aborting."
 msgstr "Fast forward non possibile, interrompo l'operazione."
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1603 builtin/merge.c:1668
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Ripristino l'albero in uno stato pulito...\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1607
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Tentativo con la strategia di merge %s...\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1659
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Nessuna strategia di merge ha gestito il merge.\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1661
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge con la strategia %s fallito.\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1670
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Uso %s per preparare una risoluzione manuale.\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1682
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -15624,33 +16710,33 @@ msgstr "non emettere avvisi in caso di conflitti"
 msgid "set labels for file1/orig-file/file2"
 msgstr "imposta etichette per file1/file originale/file2"
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "opzione sconosciuta %s"
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "impossibile analizzare l'oggetto '%s'"
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "impossibile gestire piรน di %d base. Ignoro %s."
 msgstr[1] "impossibile gestire piรน di %d basi. Ignoro %s."
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "non gestisco nulla che non sia il merge di due head."
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "impossibile risolvere il riferimento '%s'"
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Merge di %s con %s in corso\n"
@@ -15673,18 +16759,18 @@ msgstr "consenti la creazione di piรน di un albero"
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
-"git multi-pack-index [--object-dir=<directory>] (write|verify|expire|repack "
-"--batch-size=<dimensione>)"
+"git multi-pack-index [<opzioni>] (write|verify|expire|repack --batch-"
+"size=<dimensione>)"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "directory oggetti contenente un insieme di coppie packfile e pack-index"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15692,15 +16778,15 @@ msgstr ""
 "durante il repack, raccogli i file pack di dimensioni piรน piccole in un "
 "gruppo piรน grande di queste dimensioni"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr "l'opzione --batch-size รจ consentita solo per il sottocomando 'repack'"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "sottocomando sconosciuto: %s"
@@ -15794,52 +16880,52 @@ msgstr "%s, sorgente=%s, destinazione=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Rinominazione di %s in %s in corso\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "rinomina di '%s' non riuscita"
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opzioni>] <commit>..."
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opzioni>] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opzioni>] --stdin"
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr "stampa solo i nomi (non lo SHA-1)"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "usa solo tag per denominare i commit"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "usa solo i riferimenti corrispondenti a <pattern>"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignora i riferimenti corrispondenti a <pattern>"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "elenca tutti i commit raggiungibili da tutti i riferimenti"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "leggi dallo standard input"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "consenti di stampare nomi `non definito` (impostazione predefinita)"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "dereferenzia tag nell'input (uso interno)"
 
@@ -16243,7 +17329,7 @@ msgstr "il tentativo di rimuovere una nota inesistente non รจ un errore"
 msgid "read object names from the standard input"
 msgstr "leggi i nomi degli oggetti dallo standard input"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "non rimuovere, limitati a visualizzare"
 
@@ -16259,7 +17345,7 @@ msgstr "riferimento note"
 msgid "use notes from <notes-ref>"
 msgstr "usa le note in <riferimento note>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1643
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "sottocomando sconosciuto: %s"
@@ -16278,129 +17364,106 @@ msgstr ""
 "git pack-objects [<opzioni>...] <nome base> [< <elenco riferimenti> | < "
 "<elenco oggetti>]"
 
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:430
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "CRC oggetto sottoposto a pack %s errato"
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:441
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "oggetto sottoposto a pack %s corrotto"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:572
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "rilevato delta ricorsivo per l'oggetto %s"
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u oggetti ordinati, attesi %<PRIu32>"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "packfile non valido: %s"
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "impossibile aprire il packfile per il suo riuso: %s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "impossibile eseguire seek nel packfile riusato"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "impossibile leggere dal packfile riusato"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:972
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "disabilito la scrittura delle bitmap, i pack sono divisi a causa "
 "dell'impostazione pack.packSizeLimit"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:985
 msgid "Writing objects"
 msgstr "Scrittura degli oggetti in corso"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "stat di %s non riuscito"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1099
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "scritti %<PRIu32> oggetti quando me ne attendevo %<PRIu32>"
 
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1297
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "disabilito la scrittura delle bitmap perchรฉ alcuni oggetti non saranno "
 "sottoposti a pack"
 
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1724
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "overflow dell'offset base del delta nel pack per %s"
 
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1733
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "offset base del delta fuori dall'intervallo consentito per %s"
 
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:2004
 msgid "Counting objects"
 msgstr "Conteggio degli oggetti in corso"
 
-#: builtin/pack-objects.c:2005
-#, c-format
-msgid "unable to get size of %s"
-msgstr "impossibile recuperare le dimensioni di %s"
-
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2149
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "impossibile analizzare l'intestazione oggetto di %s"
 
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
 #, c-format
 msgid "object %s cannot be read"
 msgstr "impossibile leggere l'oggetto %s"
 
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "oggetto %s: lunghezza oggetto inconsistente (%<PRIuMAX> contro %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2259
 msgid "suboptimal pack - out of memory"
 msgstr "pack subottimo - memoria esaurita"
 
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2574
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compressione delta in corso, uso fino a %d thread"
 
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2713
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "impossibile eseguire il pack degli oggetti raggiungibili dal tag %s"
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2801
 msgid "Compressing objects"
 msgstr "Compressione oggetti in corso"
 
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2807
 msgid "inconsistency with delta count"
 msgstr "inconsistenza con il numero dei delta"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2888
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16409,7 +17472,7 @@ msgstr ""
 "atteso ID oggetto arco, ricevuti dati errati:\n"
 " %s"
 
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2894
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16418,256 +17481,241 @@ msgstr ""
 "atteso ID oggetto, ricevuti dati errati:\n"
 " %s"
 
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2992
 msgid "invalid value for --missing"
 msgstr "valore non valido per --missing"
 
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
 msgid "cannot open pack index"
 msgstr "impossibile aprire l'indice pack"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:3082
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "impossibile esaminare l'oggetto sciolto %s"
 
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3167
 msgid "unable to force loose object"
 msgstr "impossibile forzare l'oggetto sciolto"
 
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3260
 #, c-format
 msgid "not a rev '%s'"
 msgstr "'%s' non รจ una revisione"
 
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3263
 #, c-format
 msgid "bad revision '%s'"
 msgstr "revisione '%s' errata"
 
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3288
 msgid "unable to add recent objects"
 msgstr "impossibile aggiungere gli oggetti recenti"
 
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3341
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versione %s di index non supportata"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "bad index version '%s'"
 msgstr "versione '%s' di index errata"
 
-#: builtin/pack-objects.c:3248
-msgid "do not show progress meter"
-msgstr "non visualizzare la barra di avanzamento"
-
-#: builtin/pack-objects.c:3250
-msgid "show progress meter"
-msgstr "visualizza la barra di avanzamento"
-
-#: builtin/pack-objects.c:3252
-msgid "show progress meter during object writing phase"
-msgstr ""
-"visualizza la barra di avanzamento durante la fase di scrittura oggetti"
-
-#: builtin/pack-objects.c:3255
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "simile a --all-progress quando รจ visualizzata la barra di avanzamento"
-
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3383
 msgid "<version>[,<offset>]"
 msgstr "<versione>[,<offset>]"
 
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3384
 msgid "write the pack index file in the specified idx format version"
 msgstr "scrivi il file indice pack usando la versione formato idx specificata"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3387
 msgid "maximum size of each output pack file"
 msgstr "dimensione massima di ogni file pack in output"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3389
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignora gli oggetti presi in prestito dallo store oggetti alternativo"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3391
 msgid "ignore packed objects"
 msgstr "ignora gli oggetti sottoposti a pack"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3393
 msgid "limit pack window by objects"
 msgstr "limita la finestra di pack al numero di oggetti specificato"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3395
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limita la finestra di pack alla memoria specificata in aggiunta al limite "
 "sugli oggetti"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3397
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "lunghezza massima della catena di delta consentita nel pack risultante"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3399
 msgid "reuse existing deltas"
 msgstr "riusa i delta esistenti"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3401
 msgid "reuse existing objects"
 msgstr "riusa gli oggetti esistenti"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3403
 msgid "use OFS_DELTA objects"
 msgstr "usa oggetti OFS_DELTA"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3405
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "usa piรน thread durante la ricerca delle migliori corrispondenze per i delta"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3407
 msgid "do not create an empty pack output"
 msgstr "non creare un output pack vuoto"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3409
 msgid "read revision arguments from standard input"
 msgstr "leggi gli argomenti revisione dallo standard input"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3411
 msgid "limit the objects to those that are not yet packed"
 msgstr "limita gli oggetti a quelli non ancora sottoposti a pack"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3414
 msgid "include objects reachable from any reference"
 msgstr "includi gli oggetti raggiungibili da qualunque riferimento"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3417
 msgid "include objects referred by reflog entries"
 msgstr "includi gli oggetti referenziati da voci del log riferimenti"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3420
 msgid "include objects referred to by the index"
 msgstr "includi gli oggetti referenziati dall'indice"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3423
 msgid "output pack to stdout"
 msgstr "invia il pack in output sullo standard output"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3425
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "includi gli oggetti tag che fanno riferimento agli oggetti da sottoporre a "
 "pack"
 
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3427
 msgid "keep unreachable objects"
 msgstr "mantieni gli oggetti non raggiungibili"
 
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3429
 msgid "pack loose unreachable objects"
 msgstr "esegui il pack degli oggetti non raggiungibili sciolti"
 
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3431
 msgid "unpack unreachable objects newer than <time>"
 msgstr "decomprimi gli oggetti non raggiungibili piรน recenti di <tempo>"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3434
 msgid "use the sparse reachability algorithm"
 msgstr "usa l'algoritmo di raggiungibilitร  sparse"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3436
 msgid "create thin packs"
 msgstr "crea pack thin"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3438
 msgid "create packs suitable for shallow fetches"
 msgstr "crea pack adatti per fetch shallow"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3440
 msgid "ignore packs that have companion .keep file"
 msgstr "ignora i pack che hanno un file .keep che li accompagna"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3442
 msgid "ignore this pack"
 msgstr "ignora questo pack"
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3444
 msgid "pack compression level"
 msgstr "livello compressione pack"
 
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3446
 msgid "do not hide commits by grafts"
 msgstr "non nascondere i commit innestati"
 
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3448
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "usa un indice bitmap se disponibile per velocizzare il conteggio degli "
 "oggetti"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3450
 msgid "write a bitmap index together with the pack index"
 msgstr "scrivi un indice bitmap insieme all'indice pack"
 
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3454
 msgid "write a bitmap index if possible"
 msgstr "scrivi un indice bitmap se possibile"
 
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3458
 msgid "handling for missing objects"
 msgstr "azione da eseguire sugli oggetti mancanti"
 
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3461
 msgid "do not pack objects in promisor packfiles"
 msgstr "non eseguire il pack degli oggetti nei file pack promettenti"
 
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3463
 msgid "respect islands during delta compression"
 msgstr "rispetta le isole durante la compressione delta"
 
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3492
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "la profonditร  della catena dei delta (%d) รจ troppo elevata, forzo %d"
 
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3497
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "il valore pack.deltaCacheLimit รจ troppo elevato, forzo %d"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3551
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size non puรฒ essere usato per generare un pack da trasferire"
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3553
 msgid "minimum pack size limit is 1 MiB"
 msgstr "il limite minimo delle dimensioni dei pack รจ 1 MiB"
 
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3558
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin non puรฒ essere usato per generare un pack indicizzabile"
 
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3561
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable e --unpack-unreachable non sono compatibili"
 
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3567
 msgid "cannot use --filter without --stdout"
 msgstr "impossibile usare --filter senza --stdout"
 
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3627
 msgid "Enumerating objects"
 msgstr "Enumerazione degli oggetti in corso"
 
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3657
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 msgstr ""
 "%<PRIu32> oggetti totali (%<PRIu32> delta), %<PRIu32> riutilizzati "
-"(%<PRIu32> delta)"
+"(%<PRIu32> delta), %<PRIu32> riutilizzati nel file pack"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16710,53 +17758,53 @@ msgid "cannot prune in a precious-objects repo"
 msgstr ""
 "impossibile eseguire l'eliminazione in un repository 'oggetti preziosi'"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valore non valido per %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]"
 
-#: builtin/pull.c:141
+#: builtin/pull.c:122
 msgid "control for recursive fetching of submodules"
 msgstr "controlla il recupero ricorsivo dei sottomoduli"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:126
 msgid "Options related to merging"
 msgstr "Opzioni relative al merge"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:129
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorpora le modifiche eseguendo un rebase anzichรฉ un merge"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "consenti fast forward"
 
-#: builtin/pull.c:185
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:182
 msgid "Options related to fetching"
 msgstr "Opzioni relative al fetch"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:192
 msgid "force overwrite of local branch"
 msgstr "forza la sovrascrittura del branch locale"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:200
 msgid "number of submodules pulled in parallel"
 msgstr "numero di sottomoduli recuperati in parallelo"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:300
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valore non valido per pull.ff: %s"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:426
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16764,14 +17812,14 @@ msgstr ""
 "Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti "
 "appena recuperati."
 
-#: builtin/pull.c:435
+#: builtin/pull.c:428
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Non ci sono candidati in base ai quali eseguire il merge fra i riferimenti "
 "appena recuperati."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:429
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16779,7 +17827,7 @@ msgstr ""
 "In generale, questo significa che hai fornito uno specificatore\n"
 "riferimento che non aveva corrispondenze nel remoto."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:432
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16791,44 +17839,44 @@ msgstr ""
 "configurato come predefinito per il branch corrente, devi\n"
 "specificare un branch sulla riga di comando."
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Attualmente non sei su un branch."
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Specifica il branch in base a cui vuoi effettuare il rebase."
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Specifica il branch in base a cui vuoi effettuare il merge."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:442 builtin/pull.c:457
 msgid "See git-pull(1) for details."
 msgstr "Vedi git-pull(1) per ulteriori dettagli."
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<remoto>"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branch>"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Non ci sono informazioni di tracciamento per il branch corrente."
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Se vuoi impostare le informazioni di tracciamento per questo branch puoi "
 "farlo con:"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:466
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16838,32 +17886,32 @@ msgstr ""
 "il merge con il riferimento '%s' del remoto, ma un tale\n"
 "riferimento non รจ stato recuperato."
 
-#: builtin/pull.c:581
+#: builtin/pull.c:576
 #, c-format
 msgid "unable to access commit %s"
 msgstr "impossibile accedere al commit %s"
 
-#: builtin/pull.c:861
+#: builtin/pull.c:857
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignoro --verify-signature per il rebase"
 
-#: builtin/pull.c:916
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "l'opzione --[no-]autostash option รจ valida solo con --rebase."
 
-#: builtin/pull.c:924
+#: builtin/pull.c:920
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Aggiorno un branch non nato con le modifiche aggiunte all'indice."
 
-#: builtin/pull.c:928
+#: builtin/pull.c:924
 msgid "pull with rebase"
 msgstr "pull con rebase"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:925
 msgid "please commit or stash them."
 msgstr "eseguine il commit o lo stash."
 
-#: builtin/pull.c:954
+#: builtin/pull.c:950
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16875,7 +17923,7 @@ msgstr ""
 "Eseguo il fast forward dell'albero\n"
 "di lavoro dal commit %s."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:956
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16894,15 +17942,15 @@ msgstr ""
 "$ git reset --hard\n"
 "per eseguire il ripristino."
 
-#: builtin/pull.c:975
+#: builtin/pull.c:971
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossibile eseguire il merge di piรน branch in un head vuoto."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:975
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossibile eseguire il rebase su piรน branch."
 
-#: builtin/pull.c:986
+#: builtin/pull.c:982
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "impossibile eseguire il rebase se ci sono delle modifiche registrate "
@@ -16912,15 +17960,15 @@ msgstr ""
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<opzioni>] [<repository> [<specificatore riferimento>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "esegui il tag della forma breve senza <tag>"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete accetta solo nomi dei ref di destinazione in chiaro"
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16929,7 +17977,7 @@ msgstr ""
 "Per scegliere permanentemente una delle due opzioni, vedi push.default in "
 "'git help config'."
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16954,7 +18002,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16969,7 +18017,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nome del branch remoto>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16983,13 +18031,13 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "Il branch corrente %s ha piรน branch upstream, mi rifiuto di eseguire il push."
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -17000,14 +18048,14 @@ msgstr ""
 "branch corrente '%s', senza dirmi di cosa devo eseguire il push\n"
 "per aggiornare quale branch remoto."
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Non รจ stato specificato alcun refspec per il push, e push.default รจ \"nothing"
 "\"."
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -17021,7 +18069,7 @@ msgstr ""
 "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
 "dettagli."
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -17036,7 +18084,7 @@ msgstr ""
 "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
 "dettagli."
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -17052,12 +18100,12 @@ msgstr ""
 "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
 "dettagli."
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Gli aggiornamenti sono stati rifiutati perchรฉ il tag esiste giร  nel remoto."
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -17068,142 +18116,142 @@ msgstr ""
 "puntare a un oggetto diverso da un commit senza usare l'opzione\n"
 "'--force'.\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Push su %s in corso\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "push di alcuni riferimenti su '%s' non riuscito"
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "repository '%s' errato"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"Nessuna destinazione per il push configurata.\n"
-"Specifica un URL dalla riga di comando oppure configurare un repository "
-"remoto usando\n"
-"\n"
-"    git remote add <nome> <url>\n"
-"\n"
-"e poi eseguire il push usando il nome del remote\n"
-"\n"
-"    git push <nome>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr "repository"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "esegui il push di tutti i riferimenti"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "esegui il mirror di tutti i riferimenti"
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "elimina riferimenti"
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "esegui il push dei tag (non puรฒ essere usato con --all o --mirror)"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "forza gli aggiornamenti"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
 msgstr "<nome riferimento>:<valore atteso>"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr ""
 "richiedi che il vecchio valore del riferimento corrisponda a questo valore"
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr "controlla il push ricorsivo dei sottomoduli"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr "usa un thin pack"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "programma ricezione pack"
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr "imposta l'upstream per git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
 msgstr "elimina i riferimenti rimossi localmente"
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr "ignora l'hook pre-push"
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr "esegui il push dei tag mancanti ma rilevanti"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr "firma il push con GPG"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr "richiedi l'atomicitร  della transazione al remoto"
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete non รจ compatibile con --all, --mirror e --tags"
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete non ha senso senza alcun ref"
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "repository '%s' errato"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"Nessuna destinazione per il push configurata.\n"
+"Specifica un URL dalla riga di comando oppure configurare un repository "
+"remoto usando\n"
+"\n"
+"    git remote add <nome> <url>\n"
+"\n"
+"e poi eseguire il push usando il nome del remote\n"
+"\n"
+"    git push <nome>\n"
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr "--all e --tags non sono compatibili"
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr "--all non puรฒ essere combinato con degli specificatori riferimento"
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror e --tags non sono compatibili"
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror non puรฒ essere combinato con degli specificatori riferimento"
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr "--all e --mirror non sono compatibili"
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr "le opzioni push non devono avere caratteri di fine riga"
 
@@ -17224,24 +18272,32 @@ msgstr ""
 "git range-diff [<opzioni>] <base> <vecchio ultimo commit> <nuovo ultimo "
 "commit>"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr "Percentuale in base a cui viene pesata la creazione"
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "usa colori semplici per il diff"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "note"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "passato a 'git log'"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr "nessun .. nell'intervallo: '%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "il formato dell'unico argomento dev'essere un intervallo simmetrico"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "devono essere specificati due intervalli commit"
 
@@ -17324,13 +18380,17 @@ msgstr "esegui il debug di unpack-trees"
 msgid "suppress feedback messages"
 msgstr "non visualizzare i messaggi di feedback"
 
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Prima devi risolvere l'indice corrente"
+
 #: builtin/rebase.c:32
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] "
-"[<upstream>] [<branch>]"
+"git rebase [-i] [opzioni] [--exec <comando>] [--onto <nuova base> | --keep-"
+"base] [<upstream> [<branch>]]"
 
 #: builtin/rebase.c:34
 msgid ""
@@ -17343,217 +18403,208 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "elenco todo inutilizzabile: '%s'"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "impossibile scrivere '%s'."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "nessun'HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:292
 #, c-format
 msgid "could not create temporary %s"
 msgstr "impossibile creare un %s temporaneo"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:298
 msgid "could not mark as interactive"
 msgstr "impossibile contrassegnare come interattivo"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:352
 msgid "could not generate todo list"
 msgstr "impossibile generare l'elenco todo"
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:391
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 "le opzioni --upstream o --onto richiedono che sia fornito un commit di base"
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:461
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase --interactive [<opzioni>]"
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "mantieni i commit vuoti"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(DEPRECATO) mantieni i commit vuoti"
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "consenti commit con messaggi vuoti"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:480
 msgid "rebase merge commits"
 msgstr "esegui il rebase dei commit di merge"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:482
 msgid "keep original branch points of cousins"
 msgstr "mantieni i punti di branch originali dei cugini"
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:484
 msgid "move commits that begin with squash!/fixup!"
 msgstr "sposta i commit che iniziano con squash!/fixup!"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:485
 msgid "sign commits"
 msgstr "firma i commit"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:487 builtin/rebase.c:1490
 msgid "display a diffstat of what changed upstream"
 msgstr "visualizza un diffstat delle modifiche upstream"
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:489
 msgid "continue rebase"
 msgstr "continua il rebase"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:491
 msgid "skip commit"
 msgstr "salta il commit"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:492
 msgid "edit the todo list"
 msgstr "modifica l'elenco todo"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:494
 msgid "show the current patch"
 msgstr "visualizza la patch corrente"
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:497
 msgid "shorten commit ids in the todo list"
 msgstr "abbrevia gli ID dei commit nell'elenco todo"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:499
 msgid "expand commit ids in the todo list"
 msgstr "espandi gli ID dei commit nell'elenco todo"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:501
 msgid "check the todo list"
 msgstr "controlla l'elenco todo"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:503
 msgid "rearrange fixup/squash lines"
 msgstr "ridisponi le righe fixup/squash"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:505
 msgid "insert exec commands in todo list"
 msgstr "inserisci i comandi exec nell'elenco todo"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:506
 msgid "onto"
 msgstr "su"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict-revision"
 msgstr "revisioni-limite"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict revision"
 msgstr "limita la revisione"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:511
 msgid "squash-onto"
 msgstr "squash-su"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:512
 msgid "squash onto"
 msgstr "esegui lo squash su"
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:514
 msgid "the upstream commit"
 msgstr "il commit upstream"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head-name"
 msgstr "nome head"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head name"
 msgstr "nome head"
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:521
 msgid "rebase strategy"
 msgstr "strategia di rebase"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:522
 msgid "strategy-opts"
 msgstr "opzioni strategia"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:523
 msgid "strategy options"
 msgstr "opzioni strategia"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:524
 msgid "switch-to"
 msgstr "passa a"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:525
 msgid "the branch or commit to checkout"
 msgstr "il branch o il commit di cui eseguire il checkout"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto-name"
 msgstr "nome"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto name"
 msgstr "sul nome"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "cmd"
 msgstr "comando"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "the command to run"
 msgstr "il comando da eseguire"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:530 builtin/rebase.c:1584
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente"
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:546
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins non ha effetto senza --rebase-merges"
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:562
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s richiede un rebase interattivo"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:612
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "impossibile ottenere 'onto': '%s'"
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:627
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head non valida: '%s'"
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:652
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignoro il valore non valido per allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:728
 #, c-format
 msgid "Could not read '%s'"
 msgstr "Impossibile leggere '%s'"
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:746
 #, c-format
 msgid "Cannot store %s"
 msgstr "Impossibile memorizzare %s"
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:853
 msgid "could not determine HEAD revision"
 msgstr "impossibile determinare la revisione HEAD"
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17569,7 +18620,7 @@ msgstr ""
 "Per interrompere l'operazione e tornare allo stato precedente\n"
 "il \"git rebase\", esegui \"git rebase --abort\"."
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -17588,7 +18639,16 @@ msgstr ""
 "\n"
 "Di conseguenza, Git non puรฒ eseguirne il rebase."
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"tipo vuoto '%s' non riconosciuto; i valori validi sono \"drop\", \"keep\" e "
+"\"ask\"."
+
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "%s\n"
@@ -17605,7 +18665,7 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1417
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17619,131 +18679,139 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1447
 msgid "exec commands cannot contain newlines"
 msgstr "i comandi exec non possono contenere caratteri di fine riga"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1451
 msgid "empty exec command"
 msgstr "comando exec vuoto"
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1481
 msgid "rebase onto given branch instead of upstream"
 msgstr "esegui il rebase sul branch specificato anzichรฉ su quello upstream"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "usa la base del merge dell'upstream e del branch come base corrente"
+
+#: builtin/rebase.c:1485
 msgid "allow pre-rebase hook to run"
 msgstr "consenti l'esecuzione dell'hook pre-rebase"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1487
 msgid "be quiet. implies --no-stat"
 msgstr "sii silenzioso. implica --no-stat"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1493
 msgid "do not show diffstat of what changed upstream"
 msgstr "non visualizzare un diffstat delle modifiche upstream"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1496
 msgid "add a Signed-off-by: line to each commit"
 msgstr "aggiungi una riga Signed-off-by: a ogni commit"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
 msgid "passed to 'git am'"
 msgstr "passato a 'git am'"
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
 msgid "passed to 'git apply'"
 msgstr "passato a 'git apply'"
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "esegui il cherry-pick di tutti i commit, anche se non modificati"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1515
 msgid "continue"
 msgstr "continua"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1518
 msgid "skip current patch and continue"
 msgstr "salta la patch corrente e continua"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1520
 msgid "abort and check out the original branch"
 msgstr "interrompi ed esegui il checkout del branch originario"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1523
 msgid "abort but keep HEAD where it is"
 msgstr "interrompi ma mantieni l'HEAD dov'รจ"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1524
 msgid "edit the todo list during an interactive rebase"
 msgstr "modifica l'elenco todo durante un rebase interattivo"
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1527
 msgid "show the patch file being applied or merged"
 msgstr ""
 "visualizza il file patch che sta per essere applicato o sottoposto a merge"
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "usa le strategie di apply per eseguire il rebase"
+
+#: builtin/rebase.c:1534
 msgid "use merging strategies to rebase"
 msgstr "usa le strategie di merge per eseguire il rebase"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1538
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 "consenti all'utente di modificare l'elenco dei commit di cui eseguire il "
 "rebase"
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1542
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(DEPRECATO) prova a ricreare i merge anzichรฉ ignorarli"
 
-#: builtin/rebase.c:1455
-msgid "preserve empty commits during rebase"
-msgstr "mantieni i commit vuoti durante il rebase"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "come gestire i commit che diventano vuoti"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1554
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "sposta i commit che iniziano con squash!/fixup! in -i"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1560
 msgid "automatically stash/stash pop before and after"
 msgstr "esegui stash/stash pop automaticamente prima e dopo"
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1562
 msgid "add exec lines after each commit of the editable list"
 msgstr "aggiungi righe exec dopo ogni commit della lista modificabile"
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1566
 msgid "allow rebasing commits with empty messages"
 msgstr "consenti il rebase di commit con messaggi vuoti"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1570
 msgid "try to rebase merges instead of skipping them"
 msgstr "prova ad eseguire il rebase dei merge anzichรฉ saltarli"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1573
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 "usa 'merge-base --fork-point' per ridefinire piรน precisamente l'upstream"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1575
 msgid "use the given merge strategy"
 msgstr "usa la strategia di merge specificata"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
 msgid "option"
 msgstr "opzione"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1578
 msgid "pass the argument through to the merge strategy"
 msgstr "passa l'argomento alla strategia di merge"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1581
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "esegui il rebase di tutti i commit raggiungibili fino a quelli radice"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1598
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -17751,29 +18819,37 @@ msgstr ""
 "il supporto per rebase.useBuiltin รจ stato rimosso!\n"
 "Vedi la voce relativa in 'git help config' per i dettagli."
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1604
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Sembra che 'git am' sia in corso. Impossibile eseguire il rebase."
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1645
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr "git rebase --preserve-merges รจ deprecato. Usa --rebase-merges."
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "impossibile combinare '--keep-base' con '--onto'"
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "impossibile combinare '--keep-base' con '--root'"
+
+#: builtin/rebase.c:1656
 msgid "No rebase in progress?"
 msgstr "Nessun rebase in corso?"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1660
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "L'azione --edit-todo puรฒ essere usata solo durante un rebase interattivo."
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1683
 msgid "Cannot read HEAD"
 msgstr "Impossibile leggere l'HEAD"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1695
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17782,16 +18858,16 @@ msgstr ""
 "quindi contrassegnarli come risolti usando\n"
 "git add"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1714
 msgid "could not discard worktree changes"
 msgstr "impossibile scartare le modifiche all'albero di lavoro"
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1733
 #, c-format
 msgid "could not move back to %s"
 msgstr "impossibile ritornare a %s"
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1778
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17812,175 +18888,169 @@ msgstr ""
 "ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n"
 "salvato qualcosa di importante lรฌ.\n"
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1806
 msgid "switch `C' expects a numerical value"
 msgstr "l'opzione `C` richiede un valore numerico"
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1847
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Modo sconosciuto: %s"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1869
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy richiede --merge o --interactive"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr "non รจ possibile combinare le opzioni apply con quelle merge"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Backend di rebase sconosciuto: %s"
+
+#: builtin/rebase.c:1937
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec richiede --exec o --interactive"
 
-#: builtin/rebase.c:1809
-msgid "cannot combine am options with either interactive or merge options"
-msgstr "non รจ possibile combinare le opzioni am con quelle interactive o merge"
-
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1957
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'"
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1961
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "errore: impossibile combinare '--preserve-merges' con '--reschedule-failed-"
 "exec'"
 
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'"
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "impossibile combinare '--rebase-merges' con '--strategy'"
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1985
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "upstream non valido: '%s'"
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1991
 msgid "Could not create new root commit"
 msgstr "Impossibile creare il nuovo commit radice"
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr ""
+"'%s': รจ necessario specificare esattamente una base per il merge con il "
+"branch"
+
+#: builtin/rebase.c:2020
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': รจ necessario specificare esattamente una base per il merge"
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:2028
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "'%s' non punta a un commit valido"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:2054
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "errore fatale: branch/commit '%s' inesistente"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr "Riferimento non esistente: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2073
 msgid "Could not resolve HEAD to a revision"
 msgstr "Impossibile risolvere HEAD come revisione"
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2111
 msgid "Cannot autostash"
 msgstr "Impossibile eseguire lo stash automatico"
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2114
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Risposta stash non attesa: '%s'"
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2120
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Impossibile creare la directory '%s'"
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2123
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Stash automatico creato: %s\n"
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2126
 msgid "could not reset --hard"
 msgstr "impossibile eseguire reset --hard"
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD ora si trova a %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2135
 msgid "Please commit or stash them."
 msgstr "Eseguine il commit o lo stash."
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr "impossibile analizzare '%s'"
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2169
 #, c-format
 msgid "could not switch to %s"
 msgstr "impossibile passare a %s"
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2180
 msgid "HEAD is up to date."
 msgstr "HEAD รจ aggiornato."
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2182
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Il branch corrente %s รจ aggiornato.\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2190
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD รจ aggiornato, forzo il rebase."
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Il branch corrente %s รจ aggiornato, forzo il rebase.\n"
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2200
 msgid "The pre-rebase hook refused to rebase."
 msgstr "L'hook pre-rebase ha rifiutato di consentire il rebase."
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2207
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Modifiche a %s:\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2210
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Modifiche da %s a %s:\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2235
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Per prima cosa, ripristino l'head per riapplicare le tue modifiche su di "
 "esso...\n"
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2244
 msgid "Could not detach HEAD"
 msgstr "Impossibile scollegare l'HEAD"
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2253
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Fast forward da %s a %s eseguito.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <directory Git>"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:821
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -18013,7 +19083,7 @@ msgstr ""
 "il comportamento predefinito, imposta la variabile di\n"
 "configurazione 'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -18066,49 +19136,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <riferimento>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' non รจ un timestamp valido"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Contrassegno gli oggetti raggiungibili..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s non punta a niente!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr "nessun registro riferimenti da eliminare specificato"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr "non รจ un registro riferimenti: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "log riferimenti non esistente per '%s'"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "formato riferimento non valido: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -18116,82 +19186,82 @@ msgstr ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nome> <URL>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <vecchio> <nuovo>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <nome>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nome> (-a | --auto | -d | --delete | <branch>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nome>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nome>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<gruppo> | <remoto>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nome> <branch>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nome>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nome> <nuovo URL> [<vecchio URL>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nome> <nuovo URL>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nome> <URL>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opzioni>] <nome> <URL>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nome> <branch>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nome> <branch>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opzioni>] <nome>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opzioni>] <nome>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opzioni>] [<gruppo> | <remoto>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Aggiornamento di %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18199,88 +19269,104 @@ msgstr ""
 "--mirror รจ pericoloso e deprecato; per favore\n"
 "\t usa invece --mirror-fetch o --mirror-push"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argomento di mirror sconosciuto: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "recupera i branch remoti"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "importa tutti i tag e gli oggetti associati durante il recupero"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "o non recuperare alcun tag (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "branch da tracciare"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "branch master"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "imposta il remoto come mirror su cui eseguire push o da cui recuperare dati"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "specificare un branch master con --mirror non ha senso"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "specificare i branch da tracciare ha senso solo con i mirror da cui "
 "recuperare dati"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr "il remoto %s esiste giร ."
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' non รจ un nome di remoto valido"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Impossibile configurare il master '%s'"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 "Impossibile ottenere la mappa di recupero per lo specificatore riferimento %s"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "(corrispondente)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "(elimina)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "impossibile impostare '%s'"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"La configurazione remote.pushDefault %s in:\n"
+"\t%s:%d\n"
+"ora dร  il nome al remoto inesistente '%s'"
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Remoto non esistente: '%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr ""
 "Non รจ stato possibile ridenominare la sezione di configurazione da '%s' in "
 "'%s'"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18291,17 +19377,17 @@ msgstr ""
 "\t%s\n"
 "\tAggiorna la configurazione manualmente se necessario."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "eliminazione di '%s' non riuscita"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr "creazione di '%s' non riuscita"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18317,120 +19403,120 @@ msgstr[1] ""
 "eliminati;\n"
 "per eliminarli, usa:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Impossibile rimuovere la sezione di configurazione '%s'"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nuovo (il prossimo fetch lo salverร  in remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr " tracciato"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " vecchio (usa 'git remote prune' per rimuoverlo)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 "valore branch.%s.merge non valido; impossibile eseguire il rebase su piรน di "
 "un branch"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebase interattivo sul remoto %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1052
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "rebase interattivo (con merge) sul remoto %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebase sul remoto %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr " merge con il remote %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr "merge con il remote %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    e con il remoto %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr "crea"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr "elimina"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr "aggiornato"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr "fast forward possibile"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr "locale non aggiornato"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s esegue un aggiornamento forzato su %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s esegue il push su %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s esegue un aggiornamento forzato su %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s esegue il push su %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr "non interrogare i remoti"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL recupero: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr "(nessun URL)"
 
@@ -18438,195 +19524,185 @@ msgstr "(nessun URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "      URL push: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  branch HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr "(non interrogato)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr "(sconosciuto)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 "  branch HEAD (l'HEAD remoto รจ ambiguo, potrebbe essere uno dei seguenti):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branch remoto:%s"
 msgstr[1] "  Branch remoti:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr " (stato non richiesto)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branch locale configurato per 'git pull':"
 msgstr[1] "  Branch locali configurati per 'git pull':"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  I riferimenti locali saranno copiati da 'git push'"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Ref locale configurato per 'git push'%s:"
 msgstr[1] "  Ref locali configurati per 'git push'%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "imposta refs/remotes/<nome>/HEAD in base al remoto"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "elimina refs/remotes/<nome>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr "Impossibile determinare l'HEAD remoto"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Branch HEAD remoti multipli. Scegline uno esplicitamente con:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr "Non รจ stato possibile eliminare %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Non รจ un ref valido: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr "Non รจ stato possibile configurare %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s diventerร  pendente!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s รจ diventato pendente!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr "Eliminazione di %s in corso"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [sarebbe eliminato] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [eliminato] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr "elimina remoti dopo il fetch"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Remote '%s' non esistente"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr "aggiungi branch"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr "nessun remote specificato"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr "interroga gli URL per il push anzichรฉ gli URL per il fetch"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr "restituisci tutti gli URL"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "nessun URL configurato per il remoto '%s'"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr "manipola gli URL per il push"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr "aggiungi URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr "elimina URL"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete non ha senso"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Pattern URL vecchio non valido: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Nessuna URL trovata: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr "Non eliminerรฒ tutti gli URL non push"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
-"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Sottocomando sconosciuto: %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr "git repack [<opzioni>]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18635,118 +19711,118 @@ msgstr ""
 "Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n"
 "pack.writebitmaps."
 
-#: builtin/repack.c:190
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "impossibile avviare pack-objects per eseguire il repack degli oggetti "
 "promettenti"
 
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: Da pack-objects mi attendevo solo righe con gli ID completi "
 "esadecimali degli oggetti."
 
-#: builtin/repack.c:246
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "impossibile portare a termine pack-objects per eseguire il repack degli "
 "oggetti promettenti"
 
-#: builtin/repack.c:284
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr "esegui il pack di tutto in un singolo pack"
 
-#: builtin/repack.c:286
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "come -a e rendi sciolti gli oggetti non raggiungibili"
 
-#: builtin/repack.c:289
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "rimuovi i pack ridondanti ed esegui git-prune-packed"
 
-#: builtin/repack.c:291
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "fornisci l'opzione --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:293
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "fornisci l'opzione --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:295
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr "non eseguire git-update-server-info"
 
-#: builtin/repack.c:298
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr "fornisci l'opzione --local a git-pack-objects"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr "scrivi l'indice bitmap"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:310
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "fornisci l'opzione --delta-islands a git-pack-objects"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr "data approssimativa"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr "con -A, non rendere sciolti gli oggetti meno recenti di questa data"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr "con -a, esegui il repack degli oggetti non raggiungibili"
 
-#: builtin/repack.c:308
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr "dimensione della finestra usata per la compressione delta"
 
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:310
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "come sopra, ma limita le dimensioni della memoria invece del numero di voci"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr "limita la profonditร  massima dei delta"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr "limita il numero massimo di thread"
 
-#: builtin/repack.c:316
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr "dimensione massima di ogni file pack"
 
-#: builtin/repack.c:318
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr "esegui il repack degli oggetti nei pack contrassegnati con .keep"
 
-#: builtin/repack.c:320
+#: builtin/repack.c:328
 msgid "do not repack this pack"
 msgstr "non eseguire il repack di questo pack"
 
-#: builtin/repack.c:330
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "impossibile eliminare i pack in un repository 'oggetti preziosi'"
 
-#: builtin/repack.c:334
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable e -A non sono compatibili"
 
-#: builtin/repack.c:417
+#: builtin/repack.c:425
 msgid "Nothing new to pack."
 msgstr "Non ci sono oggetti nuovi di cui eseguire il pack."
 
-#: builtin/repack.c:478
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -18766,7 +19842,7 @@ msgstr ""
 "AVVISO: non รจ riuscito. Ridenominali manualmente\n"
 "AVVISO: entro %s:\n"
 
-#: builtin/repack.c:526
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "eliminazione di '%s' non riuscita"
@@ -18874,8 +19950,8 @@ msgstr "impossibile eseguire fstat su %s"
 msgid "unable to write object to database"
 msgstr "impossibile scrivere l'oggetto nel database"
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "nome oggetto non valido: '%s'"
@@ -18894,22 +19970,22 @@ msgstr "modifica del file oggetto non riuscita"
 msgid "new object is the same as the old one: '%s'"
 msgstr "il nuovo oggetto รจ lo stesso di quello vecchio: '%s'"
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "impossibile analizzare %s come commit"
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "tag merge non valido nel commit '%s'"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "tag merge malformato nel commit '%s'"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18918,31 +19994,31 @@ msgstr ""
 "il commit originario '%s' contiene il tag merge '%s' che รจ stato scartato; "
 "usa --edit anzichรฉ --graft"
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "il commit originario '%s' ha una firma GPG"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "la firma sarร  rimossa nel commit sostitutivo!"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "impossibile scrivere il commit sostitutivo per '%s'"
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft per '%s' non necessario"
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "il nuovo commit รจ lo stesso di quello vecchio: '%s'"
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18951,71 +20027,71 @@ msgstr ""
 "impossibile convertire i seguenti graft:\n"
 "%s"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "elenca i riferimenti sostitutivi"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "elimina i riferimenti sostitutivi"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "modifica l'oggetto esistente"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "cambia i genitori di un commit"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "converti un file graft esistente"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "sostituisci il riferimento se esiste"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "non stampare i contenuti in un formato leggibile (per --edit)"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "usa questo formato"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format non puรฒ essere usato quando non si elencano voci"
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f ha senso solo se si sta scrivendo un oggetto sostitutivo"
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw ha senso solo con --edit"
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d richiede almeno un argomento"
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "numero di argomenti errato"
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e richiede esattamente un argomento"
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g richiede almeno un argomento"
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file non richiede argomenti"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "con -l puรฒ essere specificato solo un pattern"
 
@@ -19044,114 +20120,127 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<espressione albero>] [--] <percorsi>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<espressione albero>] [--] <specificatore percorso>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<espressione albero>] [--] [<percorsi>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<espressione "
+"albero>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr ""
+"git reset --patch [<espressione albero>] [--] [<specificatore percorso>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "misto"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "merge"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr "Non hai un HEAD valido."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr "Impossibile trovare l'albero di HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Impossibile trovare l'albero di %s."
 
-#: builtin/reset.c:193
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ora si trova a %s"
+
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Impossibile eseguire un %s reset nel corso di un merge."
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "non visualizzare messaggi, segnala solo gli errori"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr "reimposta l'HEAD e l'indice"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr "reimposta solo l'HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr "reimposta l'HEAD, l'indice e l'albero di lavoro"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr "reimposta l'HEAD ma mantieni le modifiche locali"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "salva solo il fatto che i percorsi rimossi saranno aggiunti successivamente"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Risoluzione di '%s' come revisione valida non riuscita."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Risoluzione di '%s' come albero valido non riuscita."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch non รจ compatibile con --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed con i path รจ deprecata; usa invece 'git reset -- <path>'."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Impossibile eseguire un %s reset con dei percorsi."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s reset non รจ consentito in un repository spoglio"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
 msgstr "-N puรฒ essere usato solo con --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr "Modifiche non nell'area di staging dopo il reset:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -19165,35 +20254,30 @@ msgstr ""
 "messaggio. Imposta l'opzione di configurazione reset.quiet a true per\n"
 "rendere tale comportamento quello predefinito.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Impossibile ripristinare il file indice alla revisione '%s'."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr "Impossibile scrivere il nuovo file indice."
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "impossibile combinare --exclude-promisor-objects e --missing"
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "il filtraggio oggetti richiede --objects"
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "valore sparse non valido: '%s'"
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list non supporta la visualizzazione delle note"
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "il conteggio contrassegnato non รจ compatibile con --objects"
 
 #: builtin/rev-parse.c:408
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -19360,40 +20444,45 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "il seguente file ha delle modifiche locali:"
 msgstr[1] "i seguenti file hanno delle modifiche locali:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "non elencare i file rimossi"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "rimuovi solo dall'indice"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "ignora il controllo sullo stato di aggiornamento"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "consenti rimozioni ricorsive"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 "esci con codice d'uscita zero anche nel caso in cui non vi siano "
 "corrispondenze"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr ""
+"Non รจ stato fornito uno specificatore percorso. Quali file devo rimuovere?"
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "esegui lo stage delle modifiche a .gitmodules o eseguine lo stash per "
 "procedere"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "non rimuovo '%s' ricorsivamente senza -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: non รจ possibile eliminare %s"
@@ -19648,15 +20737,84 @@ msgstr ""
 "visualizza i riferimenti dati sullo standard input che non sono nel "
 "repository locale"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <opzioni>"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"questo albero di lavoro non รจ sparse (il file sparse-checkout potrebbe non "
+"esistere)"
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "creazione della directory per il file sparse-checkout non riuscita"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "impostazione dell'opzione extensions.worktreeConfig non riuscita"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "inizializza il checkout sparse in modalitร  cone"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "inizializza sparse-checkout"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "apertura di '%s' non riuscita"
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "impossibile normalizzare il percorso '%s'"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <pattern>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "impossibile rimuovere le virgolette dalla stringa in stile C '%s'"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "impossibile caricare i pattern sparse-checkout esistenti"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "leggi i pattern dallo standard input"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "imposta i pattern sparse-checkout"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "disabilita sparse-checkout"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "errore durante l'aggiornamento della directory di lavoro"
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<opzioni>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<opzioni>] [<stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
@@ -19664,25 +20822,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nome branch> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <messaggio>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<specificatore percorso>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19690,188 +20850,198 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<messaggio>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <messaggio>] [-q|--quiet] <commit>"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <messaggio>]\n"
+"          [--] [<specificatore percorso>...]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' non รจ un commit simile a uno stash"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Troppe revisioni specificate:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr "Nessuna voce di stash trovata."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s non รจ un riferimento valido"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear con parametri non รจ implementato"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "impossibile applicare uno stash nel mezzo di un merge"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "impossibile generare il diff %s^!"
 
-#: builtin/stash.c:421
+#: builtin/stash.c:422
 msgid "conflicts in index.Try without --index."
 msgstr "ci sono conflitti nell'indice. Prova senza --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "impossibile salvare l'albero indice"
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "non รจ stato possibile ripristinare i file non tracciati dallo stash"
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Merge di %s con %s in corso"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
 msgstr "L'indice non รจ stato rimosso dallo stash."
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
 msgid "attempt to recreate the index"
 msgstr "tenta di ricreare l'indice"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:555
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Ho scartato %s (%s)"
 
-#: builtin/stash.c:552
+#: builtin/stash.c:558
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Impossibile scartare la voce di stash"
 
-#: builtin/stash.c:577
+#: builtin/stash.c:583
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' non รจ un riferimento stash"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 "La voce di stash รจ mantenuta nel caso in cui tu ne abbia nuovamente bisogno."
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr "Nome del branch non specificato"
 
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Impossibile aggiornare %s con %s"
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
 msgid "stash message"
 msgstr "messaggio di stash"
 
-#: builtin/stash.c:818
+#: builtin/stash.c:824
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" richiede un argomento <commit>"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr "Nessuna modifica selezionata"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr "Non hai ancora un commit iniziale"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr "Impossibile salvare lo stato corrente di index"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr "Impossibile salvare i file non tracciati"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr "Impossibile salvare lo stato corrente dell'albero di lavoro"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr "Impossibile registrare lo stato dell'albero di lavoro"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Impossibile usare --patch e --include-untracked o --all allo stesso tempo"
 
-#: builtin/stash.c:1285
+#: builtin/stash.c:1298
 msgid "Did you forget to 'git add'?"
 msgstr "Ti sei scordato di eseguire 'git add'?"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr "Nessuna modifica locale da salvare"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr "Impossibile inizializzare stash"
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr "Impossibile salvare lo stato attuale"
 
-#: builtin/stash.c:1327
+#: builtin/stash.c:1340
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Directory di lavoro e stato indice salvati: %s"
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr "Impossibile rimuovere le modifiche all'albero di lavoro"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "keep index"
 msgstr "mantieni l'indice"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash in patch mode"
 msgstr "esegui lo stash in modalitร  patch"
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1472 builtin/stash.c:1537
 msgid "quiet mode"
 msgstr "modalitร  silenziosa"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1474 builtin/stash.c:1539
 msgid "include untracked files in stash"
 msgstr "includi i file non tracciati nello stash"
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1476 builtin/stash.c:1541
 msgid "include ignore files"
 msgstr "includi i file ignorati"
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1600
 #, c-format
 msgid "could not exec %s"
 msgstr "impossibile eseguire %s"
@@ -19892,40 +21062,40 @@ msgstr "salta e rimuovi tutte le righe che iniziano con un carattere commento"
 msgid "prepend comment character and space to each line"
 msgstr "anteponi il carattere commento e uno spazio a ogni riga"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Atteso nome riferimento completo, ricevuto %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote non richiede argomenti"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "impossibile rimuovere un componente dall'URL '%s'"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr "ancoraggio alternativo per i percorsi relativi"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<percorso>] [<percorso>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Nessun URL trovato in .gitmodules per il percorso del sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entro in '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -19934,7 +21104,7 @@ msgstr ""
 "run_command ha restituito un codice diverso da zero per %s\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19945,19 +21115,19 @@ msgstr ""
 "nei sottomoduli innestati di %s\n"
 "."
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr "Non visualizzare l'output dei comandi eseguiti in ogni sottomodulo"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr "Esegui ricorsivamente sui sottomoduli innestati"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -19966,56 +21136,56 @@ msgstr ""
 "impossibile trovare la configurazione '%s'. Assumo che questo repository sia "
 "il proprio repository autoritativo upstream."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Registrazione dell'URL per il percorso sottomodulo '%s' non riuscita"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Sottomodulo '%s' (%s) registrato per il percorso '%s'\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "avviso: suggerita modalitร  comando aggiornamento per il sottomodulo '%s'\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Registrazione della modalitร  aggiornamento per il percorso sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "Non visualizzare l'output dell'inizializzazione del sottomodulo"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opzioni>] [<percorso>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "mapping sottomodulo per il percorso '%s' non trovato in .gitmodules"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "impossibile risolvere il riferimento HEAD nel sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "ricorsione nel sottomodulo '%s' non riuscita"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr "Non visualizzare l'output dello stato del sottomodulo"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -20023,49 +21193,49 @@ msgstr ""
 "Usa il commit salvato nell'indice anzichรฉ quello salvato nell'HEAD del "
 "sottomodulo"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr "esegui ricorsivamente sui sottomoduli innestati"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 "git submodule status [--quiet] [--cached] [--recursive] [<percorso>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <percorso>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Sincronizzazione URL sottomodulo per '%s' in corso\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "registrazione dell'URL per il percorso sottomodulo '%s' non riuscita"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "recupero del remoto predefinito per il sottomodulo '%s' non riuscito"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "aggiornamento del remoto per il sottomodulo '%s' non riuscito"
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 "Non visualizzare l'output della sincronizzazione dell'URL del sottomodulo"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<percorso>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20074,7 +21244,7 @@ msgstr ""
 "L'albero di lavoro del sottomodulo ('%s') contiene una directory .git (usa "
 "'rm -rf' se vuoi veramente rimuoverla, inclusa l'intera sua cronologia)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20083,182 +21253,213 @@ msgstr ""
 "L'albero di lavoro del sottomodulo ('%s') contiene modifiche locali; usa '-"
 "f' per scartarle"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Directory '%s' ripulita\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Impossibile rimuovere l'albero di lavoro del sottomodulo '%s'\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "impossibile creare la directory vuota del sottomodulo %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Rimossa registrazione sottomodulo '%s' (%s) per il percorso '%s'\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "Rimuovi gli alberi di lavoro dei sottomoduli anche se contengono modifiche "
 "locali"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr "Annulla la registrazione di tutti i sottomoduli"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<percorso>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Usa '--all' se vuoi veramente deinizializzare tutti i sottomoduli"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Un alternato calcolato a partire dall'alternato di un progetto di livello\n"
+"superiore non รจ valido.\n"
+"Per consentire a Git di eseguire il clone senza alternati in tal caso, "
+"imposta\n"
+"submodule.alternateErrorStrategy a 'info' o, equivalentemente, esegui il "
+"clone\n"
+"con l'opzione '--reference-if-able' anzichรฉ '--reference'."
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "non รจ possibile aggiungere un alternato per il sottomodulo '%s': %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Valore '%s' per submodule.alternateErrorStrategy non riconosciuto"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Valore '%s' per submodule.alternateLocation non riconosciuto"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
 msgstr "percorso in cui sarร  clonato il nuovo sottomodulo"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr "nome del nuovo sottomodulo"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr "URL da cui clonare il sottomodulo"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr "profonditร  per i cloni shallow"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr "forza l'indicazione d'avanzamento della clonazione"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "disabilita il clone in una directory non vuota"
+
+#: builtin/submodule--helper.c:1424
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<percorso>] [--quiet] [--reference "
-"<repository>] [--name <nome>] [--depth <profonditร >] --url <URL> --path "
-"<percorso>"
+"<repository>] [--name <nome>] [--depth <profonditร >] [--single-branch] --url "
+"<URL> --path <percorso>"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+"mi rifiuto di creare/usare '%s' nella directory Git di un altro sottomodulo"
+
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "clone di '%s' nel percorso del sottomodulo ('%s') non riuscito"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "directory non vuota: '%s'"
+
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "impossibile recuperare la directory del sottomodulo per '%s'"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 "Modalitร  aggiornamento '%s' non valida per il percorso del sottomodulo ('%s')"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1516
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "รˆ stata configurata una modalitร  aggiornamento '%s' non valida per il "
 "percorso del sottomodulo ('%s')"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Percorso del sottomodulo ('%s') non inizializzato"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Potresti voler usare 'update --init'."
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Ignoro il sottomodulo %s non sottoposto a merge"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Ignoro il sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Clone di '%s' non riuscito. Nuovo tentativo programmato"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 "Clone di '%s' non riuscito per la seconda volta, interrompo l'operazione"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr "percorso nell'albero di lavoro"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "percorso nell'albero di lavoro attraverso i confini dei sottomoduli innestati"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Crea un clone shallow limitato al numero di revisioni specificato"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr "processi da eseguire in parallelo"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "determina se il clone iniziale sarร  shallow come raccomandato"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr "non stampare l'indicazione di avanzamento della clonazione"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr ""
-"git submodule--helper update_clone [--prefix=<percorso>] [<percorso>...]"
+"git submodule--helper update-clone [--prefix=<percorso>] [<percorso>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr "valore parametro aggiornamento errato"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20267,50 +21468,50 @@ msgstr ""
 "Il branch del sottomodulo (%s) รจ configurato in modo da ereditare il branch "
 "dal progetto al livello superiore, ma questo non รจ su alcun branch"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2117
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "impossibile recuperare un handle repository per il sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr "esegui ricorsivamente sui sottomoduli"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2156
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opzioni>] [<percorso>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2212
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "controlla se รจ sicuro scrivere sul file .gitmodules"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2215
 msgid "unset the config in the .gitmodules file"
 msgstr "rimuovi la configurazione nel file .gitmodules"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2220
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nome> [<valore>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2221
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nome>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2222
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "assicurati che il file .gitmodules sia nell'albero di lavoro"
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s non supporta --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2297
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' non รจ un sottocomando submodule--helper valido"
@@ -20568,218 +21769,222 @@ msgstr "il tag '%s' esiste giร "
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aggiornato (era %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "Decompressione degli oggetti in corso"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "creazione della directory %s non riuscita"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "creazione del file %s non riuscita"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "eliminazione del file %s non riuscita"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "eliminazione della directory %s non riuscita"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Test di mtime in '%s' in corso "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "le informazioni stat della directory non cambiano dopo l'aggiunta di un "
 "nuovo file"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "le informazioni stat della directory non cambiano dopo l'aggiunta di una "
 "nuova directory"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "le informazioni stat della directory cambiano dopo l'aggiornamento di un file"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "le informazioni stat della directory cambiano dopo l'aggiunta di un file in "
 "una sottodirectory"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "le informazioni stat della directory non cambiano dopo l'eliminazione di un "
 "file"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "le informazioni stat della directory non cambiano dopo l'eliminazione di una "
 "directory"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opzioni>] [--] [<file>...]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "continua l'aggiornamento anche nel caso in cui l'indice richieda di essere "
 "aggiornato"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "aggiornamento: ignora i sottomoduli"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "non ignorare i nuovi file"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "consenti che dei file sostituiscano delle directory e viceversa"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "nota se dei file mancano dall'albero di lavoro"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "esegui l'aggiornamento anche se l'indice contiene delle voci non sottoposte "
 "a merge"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "aggiorna le informazioni stat"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "come --refresh, ma ignora l'impostazione assume-unchanged"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<oggetto>,<percorso>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "aggiunge la voce specificata all'indice"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "contrassegna i file come \"non saranno modificati\""
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "reimposta a zero il bit \"non saranno modificati\""
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "contrassegna i file come \"solamente da indicizzare\""
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "reimposta a zero il bit \"solamente da indicizzare\""
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "non eseguire il touch di voci presenti solo nell'indice"
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "aggiungi solo all'indice; non aggiungere il contenuto al database oggetti"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "rimuovi i percorsi specificati anche se presenti nell'albero di lavoro"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "con --stdin: le righe di input sono terminate da byte NULL"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "leggi l'elenco dei percorsi da aggiornare dallo standard input"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "aggiungi le voci specificate sullo standard input all'indice"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "ripopola le fasi 2 e 3 per i percorsi elencati"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "aggiorna solo le voci differenti rispetto all'HEAD"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignora i file mancanti nell'albero di lavoro"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "stampa le azioni sullo standard output"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 "(per i comandi ad alto livello) dimentica i conflitti non risolti salvati"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "scrivi l'indice in questo formato"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "abilita o disabilita l'indice suddiviso"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "abilita/disabilita la cache non tracciata"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "verifica se il filesystem supporta la cache non tracciata"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "abilita la cache non tracciata senza testare il filesystem"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "scrivi l'indice anche se non รจ stato contrassegnato come modificato"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "abilita o disabilita il monitor del filesystem"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "contrassegna i file come validi rispetto al monitor del filesystem"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr ""
 "reimposta a zero il bit \"file validi rispetto al monitor del filesystem\""
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20787,7 +21992,7 @@ msgstr ""
 "core.splitIndex รจ impostato a false; rimuovilo o modificalo se vuoi "
 "veramente abilitare l'indice suddiviso"
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20795,7 +22000,7 @@ msgstr ""
 "core.splitIndex รจ impostato a true; rimuovilo o modificalo se vuoi veramente "
 "disabilitare l'indice suddiviso"
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -20803,11 +22008,11 @@ msgstr ""
 "core.untrackedCache รจ impostato a true; rimuovilo o modificalo se vuoi "
 "veramente disabilitare la cache non tracciata"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Cache non tracciata disabilitata"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -20815,29 +22020,29 @@ msgstr ""
 "core.untrackedCache รจ impostato a false; rimuovilo o modificalo se vuoi "
 "veramente abilitare la cache non tracciata"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Cache non tracciata abilitata per '%s'"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor non รจ impostato; impostalo se vuoi veramente abilitare il "
 "monitor del filesystem"
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "monitor filesystem abilitato"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor รจ impostato; rimuovi tale impostazione se vuoi veramente "
 "disabilitare il monitor del filesystem"
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "monitor filesystem disabilitato"
 
@@ -20933,55 +22138,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
 msgid "print tag contents"
 msgstr "stampa i contenuti del tag"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opzioni>] <percorso> [<espressione commit>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opzioni>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opzioni>] <percorso>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <albero di lavoro> <nuovo percorso>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opzioni>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opzioni>] <albero di lavoro>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <percorso>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:891
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "eliminazione di '%s' non riuscita"
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Rimuovo worktrees/%s: non รจ una directory valida"
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Rimuovo worktrees/%s: il file gitdir non esiste"
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)"
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -20990,35 +22195,35 @@ msgstr ""
 "Rimuovo worktrees/%s: letti meno dati del previsto (attesi %<PRIuMAX>byte, "
 "%<PRIuMAX> letti)"
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Rimuovo worktrees/%s: file gitdir non valido"
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Rimuovo worktrees/%s: il file gitdir punta a un percorso non esistente"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr "segnala gli alberi di lavoro eliminati"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr "fai scadere gli alberi di lavoro piรน vecchi di <tempo>"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' esiste giร "
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:244
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'"
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:249
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -21028,7 +22233,7 @@ msgstr ""
 "usa 'add -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per "
 "rimuoverlo"
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:251
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -21037,129 +22242,129 @@ msgstr ""
 "'%s' รจ un albero di lavoro mancante ma giร  registrato;\n"
 "usa 'add -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo"
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossibile creare la directory di '%s'"
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:432 builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Preparazione dell'albero di lavoro in corso (nuovo branch '%s')"
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:434
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Preparazione dell'albero di lavoro in corso (reimposto il branch '%s'; era a "
 "%s)"
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:443
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Preparazione dell'albero di lavoro in corso (checkout di '%s')"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:449
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Preparazione dell'albero di lavoro in corso (HEAD scollegato %s)"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:490
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "esegui il checkout di <branch> anche se tale operazione รจ stata eseguita in "
 "un altro albero di lavoro"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:493
 msgid "create a new branch"
 msgstr "crea un nuovo branch"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:495
 msgid "create or reset a branch"
 msgstr "crea o reimposta un branch"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:497
 msgid "populate the new working tree"
 msgstr "popola il nuovo albero di lavoro"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:498
 msgid "keep the new working tree locked"
 msgstr "mantieni bloccato il nuovo albero di lavoro"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:501
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "imposta la modalitร  tracking (vedi git-branch(1))"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:504
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "tenta di cercare una corrispondenza fra il nome del nuovo branch e un branch "
 "remoto da tracciare"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:512
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "le opzioni -b, -B e --detach sono mutualmente esclusive"
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:573
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 "l'opzione --[no-]track puรฒ essere usata solo se viene creato un nuovo branch"
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:673
 msgid "reason for locking"
 msgstr "motivo di blocco"
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' non รจ un albero di lavoro"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:687 builtin/worktree.c:720
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Non รจ possibile bloccare o sbloccare l'albero di lavoro principale"
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:692
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' รจ giร  bloccato per questo motivo: %s"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:694
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' รจ giร  bloccato"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:722
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' non รจ bloccato"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:763
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "gli alberi di lavoro contenenti sottomoduli non possono essere spostati o "
 "rimossi"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:771
 msgid "force move even if worktree is dirty or locked"
 msgstr "forza lo spostamento anche se l'albero di lavoro รจ sporco o bloccato"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:794 builtin/worktree.c:921
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' รจ un albero di lavoro principale"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:799
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "impossibile determinare il nome destinazione da '%s'"
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:805
 #, c-format
 msgid "target '%s' already exists"
 msgstr "la destinazione '%s' esiste giร "
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:813
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -21169,7 +22374,7 @@ msgstr ""
 "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
 "l'operazione"
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:815
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -21178,36 +22383,37 @@ msgstr ""
 "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
 "l'operazione"
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:818
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "validazione non riuscita, impossibile spostare l'albero di lavoro: %s"
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:823
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "spostamento di '%s' in '%s' non riuscito"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:871
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "esecuzione di 'git status' su '%s' non riuscita"
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:875
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
-msgstr "'%s' รจ sporco, usa --force per eliminarlo"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"'%s' contiene file modificati o non tracciati, usa --force per eliminarlo"
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:880
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "esecuzione di 'git status' su '%s' non riuscita, codice %d"
 
-#: builtin/worktree.c:911
+#: builtin/worktree.c:903
 msgid "force removal even if worktree is dirty or locked"
 msgstr "forza la rimozione anche se l'albero di lavoro รจ sporco o bloccato"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:926
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -21217,7 +22423,7 @@ msgstr ""
 "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
 "l'operazione"
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:928
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -21226,7 +22432,7 @@ msgstr ""
 "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
 "l'operazione"
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:931
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "validazione non riuscita, impossibile rimuovere l'albero di lavoro: %s"
@@ -21247,6 +22453,21 @@ msgstr "scrivi l'oggetto albero per una sottodirectory <prefisso>"
 msgid "only useful for debugging"
 msgstr "utile solo per il debug"
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Atteso comando 'mark', ricevuto %s"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Atteso comando 'to', ricevuto %s"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "funzionalitร  '%s' vietata nell'input senza --allow-unsafe-features"
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -21362,25 +22583,25 @@ msgstr ""
 "l'alias '%s' modifica le variabili d'ambiente.\n"
 "Puoi usare '!git' nell'alias per farlo"
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr "alias vuoto per %s"
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr "alias ricorsivo: %s"
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr "errore di scrittura sullo standard output"
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr "errore di scrittura sconosciuto sullo standard output"
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr "chiusura dello standard output non riuscita"
 
@@ -21434,24 +22655,24 @@ msgstr "CURLSSLOPT_NO_REVOKE non รจ supportato con cURL < 7.44.0"
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Le restrizioni protocollo non sono supportate con cURL < 7.19.4"
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:"
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "Impossibile impostare il backend SSL a '%s': cURL รจ stato compilato senza "
 "backend SSL"
 
-#: http.c:1096
+#: http.c:1097
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Impossibile impostare il backend SSL a '%s': giร  impostato"
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21462,155 +22683,166 @@ msgstr ""
 "  richiesta: %s\n"
 "   redirect: %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "virgolette non valide nel valore push-option: '%s'"
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs non valido: รจ un repository Git?"
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "risposta del server non valida; atteso servizio, ricevuto pacchetto flush"
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "risposta del server non valida; ricevuto '%s'"
 
-#: remote-curl.c:446
+#: remote-curl.c:455
 #, c-format
 msgid "repository '%s' not found"
 msgstr "repository '%s' non trovato"
 
-#: remote-curl.c:450
+#: remote-curl.c:459
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Autenticazione non riuscita per '%s'"
 
-#: remote-curl.c:454
+#: remote-curl.c:463
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "impossibile accedere a '%s': %s"
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirezione a %s in corso"
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 "non dovrebbe esserci un pacchetto fine file se non si รจ accomodanti con "
 "questi ultimi"
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "impossibile ritornare a un punto precedente dei dati POST RPC - prova ad "
 "aumentare il valore di http.postBuffer"
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC non riuscita; %s"
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 msgid "cannot handle pushes this big"
 msgstr "impossibile gestire push cosรฌ grandi"
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 "impossibile eseguire il deflate della richiesta; errore deflate zlib %d"
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "impossibile eseguire il deflate della richiesta; errore fine zlib %d"
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "il trasporto http stupido non supporta le funzionalitร  shallow"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1038
 msgid "fetch failed."
 msgstr "recupero non riuscito."
 
-#: remote-curl.c:1076
+#: remote-curl.c:1086
 msgid "cannot fetch by sha1 over smart http"
 msgstr ""
 "impossibile recuperare i dati in base allo SHA1 con il trasporto HTTP "
 "intelligente"
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1130 remote-curl.c:1136
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "errore protocollo: atteso SHA/riferimento, ricevuto '%s'"
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1148 remote-curl.c:1263
 #, c-format
 msgid "http transport does not support %s"
 msgstr "il trasporto HTTP non supporta %s"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1184
 msgid "git-http-push failed"
 msgstr "git-http-push non riuscito"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1369
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: uso: git remote-curl <remoto> [<URL>]"
 
-#: remote-curl.c:1392
+#: remote-curl.c:1401
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: errore durante la lettura del flusso dei comandi da Git"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1408
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: tentato un fetch senza un repository locale"
 
-#: remote-curl.c:1439
+#: remote-curl.c:1448
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: ricevuto comando sconosciuto '%s' da Git"
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr "argomenti"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr "filtraggio oggetti"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "data-scadenza"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "no-op (retrocompatibilitร )"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "visualizza piรน dettagli"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "visualizza meno dettagli"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "usa <n> cifre per mostrare gli hash SHA-1"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "come rimuovere gli spazi e i #commenti dal messaggio"
 
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "leggi gli specificatori percorso da un file"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"con --pathspec-from-file gli elementi specificatori percorso sono separati "
+"da un carattere NUL"
+
 #: ref-filter.h:101
 msgid "key"
 msgstr "chiave"
@@ -22140,163 +23372,171 @@ msgid "Common Git shell script setup code"
 msgstr "Codice comune di inizializzazione di Git per gli script shell"
 
 #: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Inizializza e modifica sparse-checkout"
+
+#: command-list.h:172
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Mette da parte le modifiche in una directory di lavoro sporca"
 
-#: command-list.h:172
+#: command-list.h:173
 msgid "Add file contents to the staging area"
 msgstr "Aggiunge i contenuti dei file all'area di staging"
 
-#: command-list.h:173
+#: command-list.h:174
 msgid "Show the working tree status"
 msgstr "Visualizza lo stato dell'albero di lavoro"
 
-#: command-list.h:174
+#: command-list.h:175
 msgid "Remove unnecessary whitespace"
 msgstr "Rimuove spazi bianchi non necessari"
 
-#: command-list.h:175
+#: command-list.h:176
 msgid "Initialize, update or inspect submodules"
 msgstr "Inizializza, aggiorna o esamina sottomoduli"
 
-#: command-list.h:176
+#: command-list.h:177
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operativitร  bidirezionale tra un repository Subversion e Git"
 
-#: command-list.h:177
+#: command-list.h:178
 msgid "Switch branches"
 msgstr "Passa da un branch a un altro"
 
-#: command-list.h:178
+#: command-list.h:179
 msgid "Read, modify and delete symbolic refs"
 msgstr "Legge, modifica ed elimina riferimenti simbolici"
 
-#: command-list.h:179
+#: command-list.h:180
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG"
 
-#: command-list.h:180
+#: command-list.h:181
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un file temporaneo con i contenuti di un blob"
 
-#: command-list.h:181
+#: command-list.h:182
 msgid "Unpack objects from a packed archive"
 msgstr "Decomprime gli oggetti da un archivio sottoposto a pack"
 
-#: command-list.h:182
+#: command-list.h:183
 msgid "Register file contents in the working tree to the index"
 msgstr "Registra i contenuti dei file dell'albero di lavoro nell'indice"
 
-#: command-list.h:183
+#: command-list.h:184
 msgid "Update the object name stored in a ref safely"
 msgstr "Aggiorna in modo sicuro il nome oggetto salvato in un riferimento"
 
-#: command-list.h:184
+#: command-list.h:185
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Aggiorna il file informazioni aggiuntive per aiutare i server stupidi"
 
-#: command-list.h:185
+#: command-list.h:186
 msgid "Send archive back to git-archive"
 msgstr "Reinvia l'archivio a git-archive"
 
-#: command-list.h:186
+#: command-list.h:187
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Reinvia gli oggetti sottoposti a pack a git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:188
 msgid "Show a Git logical variable"
 msgstr "Visualizza una variabile logica di Git"
 
-#: command-list.h:188
+#: command-list.h:189
 msgid "Check the GPG signature of commits"
 msgstr "Verifica la firma GPG dei commit"
 
-#: command-list.h:189
+#: command-list.h:190
 msgid "Validate packed Git archive files"
 msgstr "Convalida i file archivio sottoposti a pack di Git"
 
-#: command-list.h:190
+#: command-list.h:191
 msgid "Check the GPG signature of tags"
 msgstr "Verifica la firma GPG dei tag"
 
-#: command-list.h:191
+#: command-list.h:192
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interfaccia Web per Git (frontend Web ai repository Git)"
 
-#: command-list.h:192
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr ""
 "Visualizza i registri insieme alle differenze introdotte da ciascun commit"
 
-#: command-list.h:193
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Gestisce alberi di lavoro multipli"
 
-#: command-list.h:194
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Crea un oggetto albero dall'indice corrente"
 
-#: command-list.h:195
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Definizione di attributi per percorso"
 
-#: command-list.h:196
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Interfaccia a riga di comando di Git e convenzioni"
 
-#: command-list.h:197
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial Git di base per gli sviluppatori"
 
-#: command-list.h:198
+#: command-list.h:199
 msgid "Git for CVS users"
 msgstr "Git per utenti CVS"
 
-#: command-list.h:199
+#: command-list.h:200
 msgid "Tweaking diff output"
 msgstr "Messa a punto dell'output di diff"
 
-#: command-list.h:200
+#: command-list.h:201
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un insieme di comandi utile e minimale per l'uso quotidiano di Git"
 
-#: command-list.h:201
+#: command-list.h:202
 msgid "A Git Glossary"
 msgstr "Un glossario di Git"
 
-#: command-list.h:202
+#: command-list.h:203
 msgid "Hooks used by Git"
 msgstr "Hook usati da Git"
 
-#: command-list.h:203
+#: command-list.h:204
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Specifica i file intenzionalmente non tracciati da ignorare"
 
-#: command-list.h:204
+#: command-list.h:205
 msgid "Defining submodule properties"
 msgstr "Definizione proprietร  sottomodulo"
 
-#: command-list.h:205
+#: command-list.h:206
 msgid "Git namespaces"
 msgstr "Spazi dei nomi Git"
 
-#: command-list.h:206
+#: command-list.h:207
 msgid "Git Repository Layout"
 msgstr "Struttura repository Git"
 
-#: command-list.h:207
+#: command-list.h:208
 msgid "Specifying revisions and ranges for Git"
 msgstr "Come specificare revisioni e intervalli in Git"
 
-#: command-list.h:208
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "Monto un repository dentro un altro"
+
+#: command-list.h:210
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial introduttivo per Git: seconda parte"
 
-#: command-list.h:209
+#: command-list.h:211
 msgid "A tutorial introduction to Git"
 msgstr "Un tutorial introduttivo per Git"
 
-#: command-list.h:210
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr "Una panoramica dei flussi di lavoro raccomandati in Git"
 
@@ -22423,144 +23663,133 @@ msgstr "Provo un merge semplice con $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Il merge semplice non ha funzionato, provo il merge automatico."
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Impossibile rimuovere l'indice temporaneo (non puรฒ succedere)"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Impossibile aggiornare $ref_stash con $w_commit"
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "errore: opzione sconosciuta per 'stash push': $option"
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Directory di lavoro e stato indice salvati: $stash_msg"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opzione sconosciuta: $opt"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Troppe revisioni specificate: $REV"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference non รจ un riferimento valido"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' non รจ un commit di tipo stash"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' non รจ un riferimento a uno stash"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "impossibile aggiornare l'indice"
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Impossibile applicare uno stash nel mezzo di un merge"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr "Ci sono conflitti in index. Prova senza --index."
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "Non รจ stato possibile salvare l'albero indice"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 "Non รจ stato possibile ripristinare i file non tracciati dalla voce stash"
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "Non รจ stato possibile rimuovere i file modificati dall'area di staging"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} eliminata ($s)"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: non รจ stato possibile rimuovere la voce di stash"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Per ripristinarli digita \"git stash apply\")"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:203
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Il percorso relativo puรฒ essere usato solo dal primo livello dell'albero di "
 "lavoro"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:213
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "URL repository:: '$repo' deve essere assoluto o iniziare con ./|../"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:232
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' esiste giร  nell'indice"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:235
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' esiste giร  nell'indice e non รจ un sottomodulo"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:242
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "'$sm_path' non ha un commit di cui รจ stato eseguito il checkout"
 
-#: git-submodule.sh:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"Il seguente percorso รจ ignorato da uno dei tuoi file .gitignore:\n"
-"$sm_path\n"
-"Usa -f se vuoi davvero aggiungerlo."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:273
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Aggiunta del repository esistente in '$sm_path' all'indice"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:275
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' esiste giร  e non รจ un repository Git valido"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:283
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "รˆ stata trovata localmente una directory Git per '$sm_name' con i seguenti "
 "remoti:"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:285
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22577,39 +23806,39 @@ msgstr ""
 "altro\n"
 "nome con l'opzione '--name'."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:291
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Riattivo la directory Git locale per il sottomodulo '$sm_name'."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:303
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Impossibile eseguire il checkout del sottomodulo '$sm_path'"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:308
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Aggiunta del sottomodulo '$sm_path' non riuscita"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:317
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Registrazione del sottomodulo '$sm_path' non riuscita"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Impossibile trovare la revisione corrente nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:600
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Impossibile eseguire il fetch nel percorso del sottomodulo '$sm_path'"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:605
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22618,7 +23847,7 @@ msgstr ""
 "Impossibile trovare la revisione corrente per ${remote_name}/${branch} nel "
 "percorso del sottomodulo '$sm_path'"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22627,7 +23856,7 @@ msgstr ""
 "Impossibile eseguire il fetch nel percorso del sottomodulo '$displaypath'; "
 "provo a recuperare direttamente $sha1:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:629
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22636,79 +23865,79 @@ msgstr ""
 "Fetch eseguito nel percorso del sottomodulo '$displaypath', ma non conteneva "
 "$sha1. Fetch diretto di tale commit non riuscito."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:636
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossibile eseguire il checkout di '$sha1' nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:637
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Percorso del sottomodulo '$displaypath': eseguito checkout di '$sha1'"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossibile eseguire il rebase di '$sha1' nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Percorso del sottomodulo '$displaypath': eseguito rebase su '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossibile eseguire il merge di '$sha1' nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Percorso del sottomodulo '$displaypath': eseguito merge in '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:653
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Esecuzione di '$command $sha1' non riuscita nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:654
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Percorso del sottomodulo '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:685
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Ricorsione nel percorso del sottomodulo '$displaypath' non riuscita"
 
-#: git-submodule.sh:830
+#: git-submodule.sh:896
 msgid "The --cached option cannot be used with the --files option"
 msgstr "L'opzione --cached non puรฒ essere usata con l'opzione --files"
 
-#: git-submodule.sh:882
+#: git-submodule.sh:948
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "modalitร  $mod_dst inattesa"
 
-#: git-submodule.sh:902
+#: git-submodule.sh:968
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Attenzione: $display_name non contiene il commit $sha1_src"
 
-#: git-submodule.sh:905
+#: git-submodule.sh:971
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Attenzione: $display_name non contiene il commit $sha1_dst"
 
-#: git-submodule.sh:908
+#: git-submodule.sh:974
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
@@ -23034,6 +24263,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Rebase di $shortrevisions su $shortonto ($todocount comando)"
 msgstr[1] "Rebase di $shortrevisions su $shortonto ($todocount comandi)"
 
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "Nota che i commit vuoti sono commentati"
+
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
 msgstr "Impossibile inizializzare i commit riscritti"
@@ -23110,81 +24343,19 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Impossibile determinare il percorso assoluto della directory Git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%20s %32s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "nell'area di staging"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "rimosso dall'area di staging"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binario"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "non fare nulla"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "non modificato"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "aggiunto %d percorso\n"
-msgstr[1] "aggiunti %d percorsi\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "aggiornato %d percorso\n"
-msgstr[1] "aggiornati %d percorsi\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "ripristinato %d percorso\n"
-msgstr[1] "ripristinati %d percorsi\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "eseguito touch su %d percorso\n"
 msgstr[1] "eseguito touch su %d percorsi\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Aggiorna"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Esegui il revert"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "nota: %s ora non รจ tracciato.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Aggiungi file non tracciati"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Nessun file non tracciato.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -23192,7 +24363,7 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarร \n"
 "contrassegnato immediatamente per l'aggiunta all'area di staging."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -23200,7 +24371,7 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarร \n"
 "contrassegnato immediatamente per lo stash."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -23208,8 +24379,8 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarร \n"
 "contrassegnato immediatamente per la rimozione dall'area di staging."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -23217,8 +24388,8 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarร \n"
 "contrassegnato immediatamente per l'applicazione."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -23226,18 +24397,12 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarร \n"
 "contrassegnato immediatamente per la rimozione."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "apertura del file di modifica hunk in scrittura non riuscita: %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-"Modalitร  manuale modifica hunt - vedi la fine del file per una guida "
-"veloce.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -23250,36 +24415,12 @@ msgstr ""
 "Per rimuovere '%s' righe, eliminale.\n"
 "Le righe che iniziano con %s saranno rimosse.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"Se non puรฒ essere applicata senza problemi, ti sarร  data la possibilitร \n"
-"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n"
-"rimosse, la modifica sarร  interrotta e l'hunk non sarร  modificato.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "apertura del file di modifica hunk in lettura non riuscita: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"L'hunk modificato non puรฒ essere applicato senza problemi. Modificarlo di "
-"nuovo (se rispondi \"no\", sarร  eliminato!) [y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23296,7 +24437,7 @@ msgstr ""
 "d - non aggiungere nรฉ quest'hunk nรฉ quelli successivi nel file all'area di "
 "staging"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23310,7 +24451,7 @@ msgstr ""
 "a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n"
 "d - non eseguire lo stash nรฉ di quest'hunk nรฉ di quelli successivi nel file"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23327,7 +24468,7 @@ msgstr ""
 "d - non rimuovere nรฉ quest'hunk nรฉ quelli successivi nel file dall'area di "
 "staging"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23341,7 +24482,7 @@ msgstr ""
 "a - applica quest'hunk e tutti quelli successivi nel file\n"
 "d - non applicare nรฉ quest'hunk nรฉ quelli successivi nel file"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23355,7 +24496,7 @@ msgstr ""
 "a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
 "d - non rimuovere nรฉ quest'hunk nรฉ quelli successivi nel file"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23369,7 +24510,7 @@ msgstr ""
 "a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
 "d - non rimuovere nรฉ quest'hunk nรฉ quelli successivi nel file"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23383,7 +24524,7 @@ msgstr ""
 "a - applica quest'hunk e tutti quelli successivi nel file\n"
 "d - non applicare nรฉ quest'hunk nรฉ quelli successivi nel file"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23397,7 +24538,7 @@ msgstr ""
 "a - applica quest'hunk e tutti quelli successivi nel file\n"
 "d - non applicare nรฉ quest'hunk nรฉ quelli successivi nel file"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23421,234 +24562,85 @@ msgstr ""
 "e - modifica manualmente l'hunk corrente\n"
 "? - stampa una guida\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Vuoi comunque applicarli all'albero di lavoro? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Non รจ stato applicato nulla.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignoro ciรฒ che non รจ stato sottoposto a merge: %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Sono stati modificati solo file binari.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Nessuna modifica.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Aggiornamento patch"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Modifica modo stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Eliminazione stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Modifica modo stash [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Eliminazione stash [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1468
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicare la modifica modo all'albero di lavoro [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1469
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicare l'eliminazione all'albero di lavoro [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1470
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicare quest'hunk all'albero di lavoro [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "Nessun altro hunk a cui andare\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "a quale hunk desideri andare? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Numero non valido: '%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Mi dispiace, รจ disponibile solo %d hunk.\n"
 msgstr[1] "Mi dispiace, sono disponibili solo %d hunk.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "Nessun altro hunk in cui ricercare\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "cercare un'espressione regolare? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Espressione regolare di ricerca %s malformata: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
 msgstr "Nessun hunk corrisponde al pattern fornito\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "Nessun hunk precedente\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "Nessun hunk successivo\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Mi dispiace, non posso suddividere quest'hunk\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Suddiviso in %d hunk.\n"
 msgstr[1] "Suddiviso in %d hunk.\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Mi dispiace, non posso modificare quest'hunk\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Rivedi diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23668,19 +24660,19 @@ msgstr ""
 "add untracked - aggiunge i contenuti dei file non tracciati all'insieme di\n"
 "                modifiche nell'area di staging\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "-- mancante"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "modalitร  --patch sconosciuta: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argomento %s non valido, atteso --"
@@ -24060,6 +25052,175 @@ msgstr "Salto %s con il suffisso di backup '%s'.\n"
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Inviare %s? [y|N]: "
 
+#~ msgid "{drop,keep,ask}"
+#~ msgstr "{drop,keep,ask}"
+
+#, c-format
+#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
+#~ msgstr "Modifica modo stage [y,n,a,q,d%s,?]? "
+
+#, c-format
+#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
+#~ msgstr "Eliminazione stage [y,n,a,q,d%s,?]? "
+
+#, c-format
+#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
+#~ msgstr "Eseguire lo stage di quest'hunk [y,n,a,q,d%s,?]? "
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for staging.\n"
+#~ msgstr ""
+#~ "Se la patch viene applicata senza problemi, l'hunk modificato sarร \n"
+#~ "contrassegnato immediatamente per l'aggiunta all'area di staging.\n"
+
+#~ msgid ""
+#~ "y - stage this hunk\n"
+#~ "n - do not stage this hunk\n"
+#~ "q - quit; do not stage this hunk or any of the remaining ones\n"
+#~ "a - stage this and all the remaining hunks\n"
+#~ "d - do not stage this hunk nor any of the remaining hunks\n"
+#~ msgstr ""
+#~ "y - aggiungi quest'hunk all'area di staging\n"
+#~ "n - non aggiungere quest'hunk all'area di staging\n"
+#~ "q - esci; non aggiungere nรฉ quest'hunk nรฉ quelli rimanenti all'area di "
+#~ "staging\n"
+#~ "a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di "
+#~ "staging\n"
+#~ "d - non aggiungere nรฉ quest'hunk nรฉ quelli successivi nel file all'area "
+#~ "di staging\n"
+
+#, c-format
+#~ msgid "could not copy '%s' to '%s'."
+#~ msgstr "impossibile copiare '%s' in '%s'."
+
+#~ msgid "malformed ident line"
+#~ msgstr "riga ident malformata"
+
+#~ msgid "corrupted author without date information"
+#~ msgstr "informazioni sull'autore corrotte (senza data)"
+
+#, c-format
+#~ msgid "could not parse '%.*s'"
+#~ msgstr "impossibile analizzare '%.*s'"
+
+#, c-format
+#~ msgid "could not checkout %s"
+#~ msgstr "impossibile eseguire il checkout di %s"
+
+#, c-format
+#~ msgid "filename in tree entry contains backslash: '%s'"
+#~ msgstr "il nome file nella voce albero contiene una barra rovesciata: '%s'"
+
+#, c-format
+#~ msgid "Use -f if you really want to add them.\n"
+#~ msgstr "Usa -f se vuoi davvero aggiungerli.\n"
+
+#, c-format
+#~ msgid "Maybe you wanted to say 'git add .'?\n"
+#~ msgstr "Forse intendevi dire 'git add .'?\n"
+
+#, c-format
+#~ msgid "packfile is invalid: %s"
+#~ msgstr "packfile non valido: %s"
+
+#, c-format
+#~ msgid "unable to open packfile for reuse: %s"
+#~ msgstr "impossibile aprire il packfile per il suo riuso: %s"
+
+#~ msgid "unable to seek in reused packfile"
+#~ msgstr "impossibile eseguire seek nel packfile riusato"
+
+#~ msgid "unable to read from reused packfile"
+#~ msgstr "impossibile leggere dal packfile riusato"
+
+#~ msgid "no HEAD?"
+#~ msgstr "nessun'HEAD?"
+
+#~ msgid "make committer date match author date"
+#~ msgstr ""
+#~ "fai corrispondere la data della persona che ha eseguito il commit alla "
+#~ "data autore"
+
+#~ msgid "ignore author date and use current date"
+#~ msgstr "ignora la data autore e usa la data corrente"
+
+#~ msgid "synonym of --reset-author-date"
+#~ msgstr "sinonimo di --reset-author-date"
+
+#~ msgid "ignore changes in whitespace"
+#~ msgstr "ignora modifiche agli spazi bianchi"
+
+#~ msgid "preserve empty commits during rebase"
+#~ msgstr "mantieni i commit vuoti durante il rebase"
+
+#~ msgid "cannot combine --use-bitmap-index with object filtering"
+#~ msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti"
+
+#, sh-format
+#~ msgid ""
+#~ "The following path is ignored by one of your .gitignore files:\n"
+#~ "$sm_path\n"
+#~ "Use -f if you really want to add it."
+#~ msgstr ""
+#~ "Il seguente percorso รจ ignorato da uno dei tuoi file .gitignore:\n"
+#~ "$sm_path\n"
+#~ "Usa -f se vuoi davvero aggiungerlo."
+
+#, c-format
+#~ msgid "unable to get tree for %s"
+#~ msgstr "impossibile recuperare l'albero per %s"
+
+#~ msgid "Use an experimental heuristic to improve diffs"
+#~ msgstr "Usa un'euristica sperimentale per migliorare i diff"
+
+#~ msgid "git commit-graph [--object-dir <objdir>]"
+#~ msgstr "git commit-graph [--object-dir <directory oggetti>]"
+
+#~ msgid "git commit-graph read [--object-dir <objdir>]"
+#~ msgstr "git commit-graph read [--object-dir <directory oggetti>]"
+
+#, c-format
+#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+#~ msgstr ""
+#~ "valore core.untrackedCache '%s' non valido; utilizzerรฒ il valore "
+#~ "predefinito 'keep'"
+
+#~ msgid "cannot change partial clone promisor remote"
+#~ msgstr "impossibile modificare il remoto promettente del clone parziale"
+
+#~ msgid "error building trees"
+#~ msgstr "errore durante la costruzione degli alberi"
+
+#, c-format
+#~ msgid "invalid date format '%s' in '%s'"
+#~ msgstr "formato data '%s' non valido in '%s'"
+
+#~ msgid "writing root commit"
+#~ msgstr "scrittura commit radice in corso"
+
+#, c-format
+#~ msgid "staged changes in the following files may be lost: %s"
+#~ msgstr ""
+#~ "le modifiche in stage nei seguenti file potrebbero andare perdute: %s"
+
+#~ msgid ""
+#~ "--filter can only be used with the remote configured in extensions."
+#~ "partialClone"
+#~ msgstr ""
+#~ "--filter puรฒ essere usato solo con il remoto configurato nelle estensioni."
+#~ "partialClone"
+
+#~ msgid "verify commit-msg hook"
+#~ msgstr "verifica hook commit-msg"
+
+#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'"
+
+#, c-format
+#~ msgid "invalid sparse value '%s'"
+#~ msgstr "valore sparse non valido: '%s'"
+
 #~ msgid ""
 #~ "Fetch normally indicates which branches had a forced update, but that "
 #~ "check has been disabled."
@@ -24133,9 +25294,6 @@ msgstr "Inviare %s? [y|N]: "
 #~ "impossibile eseguire l'attivitร  in modalitร  interattiva con lo standard "
 #~ "input non collegato a un terminale."
 
-#~ msgid "failed to open '%s'"
-#~ msgstr "apertura di '%s' non riuscita"
-
 #~ msgid "failed to stat %s\n"
 #~ msgstr "stat di %s non riuscito\n"
 
diff --git a/third_party/git/po/sv.po b/third_party/git/po/sv.po
index 4ad206df703f..06a586a21553 100644
--- a/third_party/git/po/sv.po
+++ b/third_party/git/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish translations for Git.
-# Copyright (C) 2010-2019 Peter Krefting <peter@softwolves.pp.se>
+# Copyright (C) 2010-2020 Peter Krefting <peter@softwolves.pp.se>
 # This file is distributed under the same license as the Git package.
-# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
+# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git 2.23.0\n"
+"Project-Id-Version: git 2.26.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-07-30 09:59+0800\n"
-"PO-Revision-Date: 2019-07-31 12:40+0200\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-17 18:30+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -16,49 +16,731 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.2\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Vadรฅ (%s)?"
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "kunde inte lรคsa indexet"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binรคr"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "ingenting"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "oรคndrad"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "Uppdatera"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "kunde inte kรถa \"%s\""
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "kunde inte skriva indexet"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "uppdaterade %d sรถkvรคg\n"
+msgstr[1] "uppdaterade %d sรถkvรคgar\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "observera: %s spรฅras inte lรคngre.\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry misslyckades fรถr sรถkvรคgen \"%s\""
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "ร…terstรคll"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "kunde inte tolka HEAD^{tree}"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "รฅterstรคllde %d sรถkvรคg\n"
+msgstr[1] "รฅterstรคllde %d sรถkvรคgar\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Inga ospรฅrade filer.\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "Lรคgg till ospรฅrad"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "lade till %d sรถkvรคg\n"
+msgstr[1] "lade till %d sรถkvรคgar\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignorerar ej sammanslagen: %s"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Endast binรคra filer รคndrade.\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "Inga รคndringar.\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "Uppdatera patch"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "Granska diff"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "visa sรถkvรคgar med รคndringar"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr "lรคgg arbetskatalogens tillstรฅnd till kรถade รคndringar"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "รฅterstรคll kรถade รคndringar tillbaka till HEAD-versionen"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr "vรคlj stycken och uppdatera selektivt"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "visa skillnad mellan HEAD och index"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "lรคgg innehรฅll i ospรฅrade filer till kรถade รคndringar"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "Kommandoradshjรคlp:"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "markera en post"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "markera intervall av poster"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "markera flera intervall"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "markera post baserad pรฅ unikt prefix"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "avmarkera angivna poster"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "vรคlj alla poster"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "(tomt) avsluta markering"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "markera en numrerad post"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "(tomt) markera ingenting"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** Kommandon ***"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "Vad nu"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "kรถad"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "ej kรถad"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "sรถkvรคg"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "kunde inte uppdatera indexet"
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "Hej dรฅ.\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Kรถa รคndrat lรคge [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Kรถa borttagning [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Kรถa stycket [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att kรถas "
+"omedelbart."
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - kรถa stycket\n"
+"n - kรถa inte stycket\n"
+"q - avsluta; kรถa inte stycket eller nรฅgot av de fรถljande\n"
+"a - kรถa stycket och alla fรถljande i filen\n"
+"d - kรถa inte stycket eller nรฅgot av de fรถljande i filen\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Stash:a รคndrat lรคge [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att lรคggas till "
+"i \"stash\" omedelbart."
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - \"stash\":a stycket\n"
+"n - \"stash\":a inte stycket\n"
+"q - avsluta; \"stash\":a inte stycket eller nรฅgot av de fรถljande\n"
+"a - \"stash\":a stycket och alla fรถljande i filen\n"
+"d - \"stash\":a inte stycket eller nรฅgot av de fรถljande i filen\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Ta bort รคndrat lรคge frรฅn kรถn [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Ta bort borttagning frรฅn kรถn [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Ta bort stycket frรฅn kรถn [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att tas bort "
+"frรฅn kรถn omedelbart."
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ta bort stycket frรฅn kรถn\n"
+"n - ta inte bort stycket frรฅn kรถn\n"
+"q - avsluta; ta inte bort stycket eller nรฅgot av de fรถljande frรฅn kรถn\n"
+"a - ta bort stycket och alla fรถljande i filen frรฅn kรถn\n"
+"d - ta inte bort stycket eller nรฅgot av de fรถljande i filen frรฅn kรถn\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Applicera รคndrat lรคge pรฅ indexet [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Applicera borttagning pรฅ indexet [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Applicera stycket pรฅ indexet [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
+"fรถr applicering omedelbart."
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applicera stycket pรฅ indexet\n"
+"n - applicera inte stycket pรฅ indexet\n"
+"q - avsluta; applicera inte stycket eller nรฅgot av de fรถljande\n"
+"a - applicera stycket och alla fรถljande i filen\n"
+"d - applicera inte stycket eller nรฅgot av de fรถljande i filen\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta รคndrat lรคge frรฅn arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta borttagning frรฅn arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta stycket frรฅn arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
+"fรถr kasta omedelbart."
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - fรถrkasta stycket frรฅn arbetskatalogen\n"
+"n - fรถrkasta inte stycket frรฅn arbetskatalogen\n"
+"q - avsluta; fรถrkasta inte stycket eller nรฅgot av de fรถljande\n"
+"a - fรถrkasta stycket och alla fรถljande i filen\n"
+"d - fรถrkasta inte stycket eller nรฅgot av de fรถljande i filen\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta รคndrat lรคge frรฅn indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta borttagning frรฅn indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta stycket frรฅn indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - fรถrkasta stycket frรฅn indexet och arbetskatalogen\n"
+"n - fรถrkasta inte stycket frรฅn indexet och arbetskatalogen\n"
+"q - avsluta; fรถrkasta inte stycket eller nรฅgot av de fรถljande\n"
+"a - fรถrkasta stycket och alla fรถljande i filen\n"
+"d - fรถrkasta inte stycket eller nรฅgot av de fรถljande i filen\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera รคndrat lรคge pรฅ indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera borttagning pรฅ indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera stycket pรฅ indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applicera stycket pรฅ indexet och arbetskatalogen\n"
+"n - applicera inte stycket pรฅ indexet och arbetskatalogen\n"
+"q - avsluta; applicera inte stycket eller nรฅgot av de fรถljande\n"
+"a - applicera stycket och alla fรถljande i filen\n"
+"d - applicera inte stycket eller nรฅgot av de fรถljande i filen\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applicera stycket pรฅ arbetskatalogen\n"
+"n - applicera inte stycket pรฅ arbetskatalogen\n"
+"q - avsluta; applicera inte stycket eller nรฅgot av de fรถljande\n"
+"a - applicera stycket och alla fรถljande i filen\n"
+"d - applicera inte stycket eller nรฅgot av de fรถljande i filen\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "kunde inte tolka styckehuvudet \"%.*s\""
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "kunde inte tolka fรคrgat styckehuvud \"%.*s\""
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "kunde inte tolka diff"
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "kunde inte tolka fรคrgad diff"
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "misslyckades att kรถra \"%s\""
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "omaka utdata frรฅn interactive.diffFilter"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Alla rader i indata mรฅste ha en motsvarande rad i utdata frรฅn\n"
+"ditt filter."
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"fรถrvรคntade sammanhangsrad %d i\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"stycken รถverlappar inte:\n"
+"%.*s\n"
+"\tavslutas inte med:\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Manuellt styckeredigeringslรคge -- se nederst fรถr snabbguide.\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Ta bort \"%c\" rader genom att gรถra dem \" \"-rader (sammanhang).\n"
+"Ta bort \"%c\" rader genom att radera dem.\n"
+"Rader som bรถrjar med %c kommer att tas bort.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Om patchen inte kan appliceras rent kommer du fรฅ en mรถjlighet att\n"
+"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
+"redigeringen och stycket lรคmnas ofรถrรคndrat.\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "kunde inte tolka styckehuvud"
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "\"git apply --cached\" misslyckades"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
+"[y/n]? "
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "Markerade stycken kan inte appliceras pรฅ indexet!"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "Applicera dem pรฅ arbetskatalogen trots det? "
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "Ingenting applicerades.\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - lรคmna stycket obestรคmt, se nรคsta obestรคmda stycke\n"
+"J - lรคmna stycket obestรคmt, se nรคsta stycke\n"
+"k - lรคmna stycket obestรคmt, se fรถregรฅende obestรคmda stycke\n"
+"K - lรคmna stycket obestรคmt, se fรถregรฅende stycke\n"
+"g - vรคlj ett stycke att gรฅ till\n"
+"/ - sรถk efter stycke som motsvarar angivet reguljรคrt uttryck\n"
+"s - dela aktuellt stycke i mindre styckens\n"
+"e - redigera aktuellt stycke manuellt\n"
+"? - visa hjรคlp\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "Inget fรถregรฅende stycke"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "Inget fรถljande stycke"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "Inga andra stycken att gรฅ till"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "gรฅ till vilket stycke (<ret> fรถr att se fler)? "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "gรฅ till vilket stycke? "
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Ogiltigt siffervรคrde: \"%s\""
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Beklagar, det finns bara %d stycke."
+msgstr[1] "Beklagar, det finns bara %d stycken."
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "Inga andra stycken att sรถka efter"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "sรถk efter reguljรคrt uttryck? "
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Felaktigt format pรฅ reguljรคrt sรถkuttryck %s: %s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "Inga stycken motsvarar givet mรถnster"
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "Beklagar, kan inte dela stycket"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Dela i %d stycken."
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "Beklagar, kan inte redigera stycket"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "\"git apply\" misslyckades"
+
+#: advice.c:115
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%stips: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:168
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utfรถra en cherry-pick eftersom du har filer som inte slagits "
 "samman."
 
-#: advice.c:164
+#: advice.c:170
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utfรถra en incheckning eftersom du har filer som inte slagits "
 "samman."
 
-#: advice.c:166
+#: advice.c:172
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utfรถra en sammanslagning eftersom du har filer som inte slagits "
 "samman."
 
-#: advice.c:168
+#: advice.c:174
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utfรถra en \"pull\" eftersom du har filer som inte slagits samman."
 
-#: advice.c:170
+#: advice.c:176
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utfรถra en \"revert\" eftersom du har filer som inte slagits "
 "samman."
 
-#: advice.c:172
+#: advice.c:178
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 "Du kan inte utfรถra en \"%s\" eftersom du har filer som inte slagits samman."
 
-#: advice.c:180
+#: advice.c:186
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -66,23 +748,23 @@ msgstr ""
 "Rรคtta dem i din arbetskatalog och anvรคnd sedan \"git add/rm <fil>\"\n"
 "som lรคmpligt fรถr att ange lรถsning och checka in."
 
-#: advice.c:188
+#: advice.c:194
 msgid "Exiting because of an unresolved conflict."
 msgstr "Avslutar pรฅ grund av olรถst konflikgt."
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:199 builtin/merge.c:1335
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
 
-#: advice.c:195
+#: advice.c:201
 msgid "Please, commit your changes before merging."
 msgstr "Checka in dina รคndringar innan du utfรถr sammanslagningen."
 
-#: advice.c:196
+#: advice.c:202
 msgid "Exiting because of unfinished merge."
 msgstr "Avslutar pรฅ grund av ofullbordad sammanslagning."
 
-#: advice.c:202
+#: advice.c:208
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -208,17 +890,7 @@ msgstr "ogiltigt lรคge pรฅ rad %d: %s"
 msgid "inconsistent header lines %d and %d"
 msgstr "huvudet รคr inkonsekvent mellan rad %d och %d"
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: fรถrvรคntade rad: %.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "patch-fragment utan huvud pรฅ rad %d: %.*s"
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -234,82 +906,92 @@ msgstr[1] ""
 "sรถkvรคgskomponenter\n"
 "tas bort (rad %d)"
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
 
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: fรถrvรคntade rad: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "patch-fragment utan huvud pรฅ rad %d: %.*s"
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "ny fil beror pรฅ gammalt innehรฅll"
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "borttagen fil har fortfarande innehรฅll"
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "trasig patch pรฅ rad %d"
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nya filen %s beror pรฅ gammalt innehรฅll"
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "borttagna filen %s har fortfarande innehรฅll"
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** varning: filen %s blir tom men har inte tagits bort"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "trasig binรคrpatch pรฅ rad %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "binรคrpatchen pรฅ rad %d kรคnns inte igen"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch med bara skrรคp pรฅ rad %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "kunde inte lรคsa symboliska lรคnken %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "kunde inte รถppna eller lรคsa %s"
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "felaktig inledning pรฅ rad: \"%c\""
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Stycke %d lyckades pรฅ %d (offset %d rad)."
 msgstr[1] "Stycke %d lyckades pรฅ %d (offset %d rader)."
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Sammanhang reducerat till (%ld/%ld) fรถr att tillรคmpa fragment vid %d"
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -318,25 +1000,25 @@ msgstr ""
 "vid sรถkning efter:\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "saknar binรคra patchdata fรถr \"%s\""
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "kan inte applicera en binรคrpatch baklรคnges utan den omvรคnda patchen fรถr \"%s"
 "\""
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "kan inte applicera binรคrpatch pรฅ \"%s\" utan den fullstรคndiga indexraden"
 
-#: apply.c:3151
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -344,426 +1026,412 @@ msgstr ""
 "patchen appliceras pรฅ \"%s\" (%s), som inte motsvarar det nuvarande "
 "innehรฅllet."
 
-#: apply.c:3159
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "patchen appliceras pรฅ en tom \"%s\", men den รคr inte tom"
 
-#: apply.c:3177
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "nรถdvรคndig efterbild %s fรถr \"%s\" kan inte lรคsas"
 
-#: apply.c:3190
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "binรคrpatchen kan inte tillรคmpas pรฅ \"%s\""
 
-#: apply.c:3196
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "binรคrpatchen pรฅ \"%s\" ger felaktigt resultat (fรถrvรคntade %s, fick %s)"
 
-#: apply.c:3217
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "patch misslyckades: %s:%ld"
 
-#: apply.c:3340
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kan inte checka ut %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
 #, c-format
 msgid "failed to read %s"
 msgstr "misslyckades lรคsa %s"
 
-#: apply.c:3400
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lรคser frรฅn \"%s\" som รคr pรฅ andra sidan av en symbolisk lรคnk"
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "sรถkvรคgen %s har รคndrat namn/tagits bort"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: finns inte i indexet"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: motsvarar inte indexet"
 
-#: apply.c:3559
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "arkivet saknar objekt som behรถvs fรถr att falla tillbaka pรฅ 3-"
 "vรคgssammanslagning."
 
-#: apply.c:3562
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Faller tillbaka pรฅ trevรคgssammanslagning...\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kunde inte lรคsa aktuellt innehรฅll i \"%s\""
 
-#: apply.c:3594
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Misslyckades falla tillbaka pรฅ trevรคgssammanslagning...\n"
 
-#: apply.c:3608
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Applicerade patchen pรฅ \"%s\" med konflikter.\n"
 
-#: apply.c:3613
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Tillรคmpade patchen pรฅ  \"%s\" rent.\n"
 
-#: apply.c:3639
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "patch fรถr borttagning lรคmnar kvar filinnehรฅll"
 
-#: apply.c:3712
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: fel typ"
 
-#: apply.c:3714
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s har typen %o, fรถrvรคntade %o"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ogiltig sรถkvรคg \"%s\""
 
-#: apply.c:3923
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: finns redan i indexet"
 
-#: apply.c:3926
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: finns redan i arbetskatalogen"
 
-#: apply.c:3946
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "nytt lรคge (%o) fรถr %s motsvarar inte gammalt lรคge (%o)"
 
-#: apply.c:3951
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "nytt lรคge (%o) fรถr %s motsvarar inte gammalt lรคge (%o) fรถr %s"
 
-#: apply.c:3971
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "den berรถrda filen \"%s\" รคr pรฅ andra sidan av en symbolisk lรคnk"
 
-#: apply.c:3975
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: patchen kan inte tillรคmpas"
 
-#: apply.c:3990
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Kontrollerar patchen %s..."
 
-#: apply.c:4082
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "sha1-informationen saknas eller รคr oanvรคndbar fรถr undermodulen %s"
 
-#: apply.c:4089
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "nytt lรคge fรถr %s, som inte finns i nuvarande HEAD"
 
-#: apply.c:4092
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1-informationen saknas eller รคr oanvรคndbar (%s)."
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry misslyckades fรถr sรถkvรคgen \"%s\""
-
-#: apply.c:4101
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "kunde inte lรคgga till %s till temporรคrt index"
 
-#: apply.c:4111
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "kunde inte skriva temporรคrt index till %s"
 
-#: apply.c:4249
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "kan inte ta bort %s frรฅn indexet"
 
-#: apply.c:4283
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "trasig patch fรถr undermodulen %s"
 
-#: apply.c:4289
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "kan inte ta status pรฅ nyligen skapade filen \"%s\""
 
-#: apply.c:4297
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "kan inte skapa sรคkerhetsminne fรถr nyligen skapade filen %s"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kan inte lรคgga till cachepost fรถr %s"
 
-#: apply.c:4346
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "misslyckades skriva till \"%s\""
 
-#: apply.c:4350
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr "stรคnger filen \"%s\""
 
-#: apply.c:4420
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "kan inte skriva filen \"%s\" lรคge %o"
 
-#: apply.c:4518
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Tillรคmpade patchen %s rent."
 
-#: apply.c:4526
+#: apply.c:4539
 msgid "internal error"
 msgstr "internt fel"
 
-#: apply.c:4529
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Tillรคmpade patchen %%s med %d refuserad..."
 msgstr[1] "Tillรคmpade patchen %%s med %d refuserade..."
 
-#: apply.c:4540
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
 
-#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte รถppna %s"
 
-#: apply.c:4562
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Stycke %d tillรคmpades rent."
 
-#: apply.c:4566
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Refuserar stycke %d."
 
-#: apply.c:4676
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Ignorerar patch \"%s\"."
 
-#: apply.c:4684
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr "indata kรคnns inte igen"
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr "kan inte lรคsa indexfilen"
 
-#: apply.c:4859
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kan inte รถppna patchen \"%s\": %s"
 
-#: apply.c:4886
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "undertryckte %d fel i blanksteg"
 msgstr[1] "undertryckte %d fel i blanksteg"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d rad lรคgger till fel i blanksteg."
 msgstr[1] "%d rader lรคgger till fel i blanksteg."
 
-#: apply.c:4900
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d rad applicerade efter att ha rรคttat fel i blanksteg."
 msgstr[1] "%d rader applicerade efter att ha rรคttat fel i blanksteg."
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "Kunde inte skriva ny indexfil"
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "sรถkvรคg"
-
-#: apply.c:4944
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr "tillรคmpa inte รคndringar som motsvarar given sรถkvรคg"
 
-#: apply.c:4947
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr "tillรคmpa รคndringar som motsvarar given sรถkvรคg"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4973 builtin/am.c:2260
 msgid "num"
 msgstr "antal"
 
-#: apply.c:4950
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "ta bort <antal> inledande snedstreck frรฅn traditionella diff-sรถkvรคgar"
 
-#: apply.c:4953
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr "ignorera tillรคgg gjorda av patchen"
 
-#: apply.c:4955
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "istรคllet fรถr att tillรคmpa patchen, skriv ut diffstat fรถr indata"
 
-#: apply.c:4959
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "visa antal tillagda och borttagna rader decimalt"
 
-#: apply.c:4961
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "istรคllet fรถr att tillรคmpa patchen, skriv ut en summering av indata"
 
-#: apply.c:4963
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "istรคllet fรถr att tillรคmpa patchen, se om patchen kan tillรคmpas"
 
-#: apply.c:4965
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr "se till att patchen kan tillรคmpas pรฅ aktuellt index"
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "markera nya filer med \"git add --intent-to-add\""
 
-#: apply.c:4969
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr "tillรคmpa en patch utan att rรถra arbetskatalogen"
 
-#: apply.c:4971
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr "godta en patch som rรถr filer utanfรถr arbetskatalogen"
 
-#: apply.c:4974
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "tillรคmpa ocksรฅ patchen (anvรคnd med --stat/--summary/--check)"
 
-#: apply.c:4976
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "fรถrsรถk en trevรคgssammanslagning om patchen inte kan tillรคmpas"
 
-#: apply.c:4978
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr "bygg ett temporรคrt index baserat pรฅ inbyggd indexinformation"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr "sรถkvรคgar avdelas med NUL-tecken"
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
 msgstr "se till att รฅtminstone <n> rader sammanhang รคr lika"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
 msgid "action"
 msgstr "รฅtgรคrd"
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "detektera nya eller รคndrade rader som har fel i blanktecken"
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorera รคndringar i blanktecken fรถr sammanhang"
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr "tillรคmpa patchen baklรคnges"
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "don't expect at least one line of context"
 msgstr "fรถrvรคnta inte minst en rad sammanhang"
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lรคmna refuserade stycken i motsvarande *.rej-filer"
 
-#: apply.c:5000
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr "tillรฅt รถverlappande stycken"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "var pratsam"
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
 
-#: apply.c:5006
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr "lite inte pรฅ antalet linjer i styckehuvuden"
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5032 builtin/am.c:2248
 msgid "root"
 msgstr "rot"
 
-#: apply.c:5009
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr "lรคgg till <rot> i alla filnamn"
 
@@ -786,7 +1454,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "sรถkvรคgsangivelsen \"%s\" motsvarade inte nรฅgra filer"
@@ -818,7 +1486,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "arkivformat"
 
-#: archive.c:458 builtin/log.c:1597
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr "prefix"
 
@@ -826,11 +1494,12 @@ msgstr "prefix"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "lรคgg till prefix till varje sรถkvรคg i arkivet"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr "fil"
 
@@ -863,7 +1532,7 @@ msgid "list supported archive formats"
 msgstr "visa understรถdda arkivformat"
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr "arkiv"
 
@@ -871,7 +1540,7 @@ msgstr "arkiv"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "hรคmta arkivet frรฅn fjรคrrarkivet <arkiv>"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "kommando"
@@ -902,66 +1571,66 @@ msgstr "Okรคnt arkivformat \"%s\""
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumentet stรถd inte fรถr formatet \"%s\": -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:351
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "kan inte strรถmma blob:en %s"
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:369
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "filens lรคge stรถds ej: 0%o (SHA1: %s)"
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:359
 #, c-format
 msgid "cannot read %s"
 msgstr "kan inte lรคsa %s"
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "kunde inte starta filtret \"%s\""
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr "kan inte omdirigera handtag"
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "filtret \"%s\" rapporterade fel"
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "sรถkvรคgen รคr inte giltig UTF-8: %s"
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "sรถkvรคgen fรถr lรฅng (%d tecken, SHA1: %s): %s"
 
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
 #, c-format
 msgid "deflate error (%d)"
 msgstr "fel i deflate (%d)"
 
-#: archive-zip.c:609
+#: archive-zip.c:615
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "tidsstรคmpeln fรถr stor fรถr detta system: %<PRIuMAX>"
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%-*s รคr inte ett giltigt namn pรฅ attribut"
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s inte tillรฅtet: %s:%d"
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -979,12 +1648,12 @@ msgstr "Felaktigt citerat innehรฅll i filen \"%s\": %s"
 msgid "We cannot bisect more!\n"
 msgstr "Det finns inte mer att gรถra \"bisect\" pรฅ!\n"
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Namnet pรฅ incheckningen รคr inte giltigt: %s"
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -993,7 +1662,7 @@ msgstr ""
 "Sammanslagningsbasen %s รคr trasig.\n"
 "Det betyder att felet har rรคttats mellan %s och [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1002,7 +1671,7 @@ msgstr ""
 "Sammanslagningsbasen %s รคr ny.\n"
 "Egenskapen har รคndrats mellan %s och [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1011,7 +1680,7 @@ msgstr ""
 "Sammanslagningsbasen %s รคr %s.\n"
 "Det betyder att den fรถrsta \"%s\" incheckningen รคr mellan %s och [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1022,7 +1691,7 @@ msgstr ""
 "git bisect kan inte fungera korrekt i detta fall.\n"
 "Kanske du skrev fel %s- och %s-revisioner?\n"
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1034,36 +1703,36 @@ msgstr ""
 "%s.\n"
 "Vi fortsรคtter รคndรฅ."
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisect: en sammanslagningsbas mรฅste testas\n"
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr "en %s-revision behรถvs"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
 #, c-format
 msgid "could not create file '%s'"
 msgstr "kunde inte skapa filen \"%s\""
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
 #, c-format
 msgid "could not read file '%s'"
 msgstr "kunde inte lรคsa filen \"%s\""
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr "misslyckades lรคsa bisect-referenser"
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s var bรฅde %s och %s\n"
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1072,7 +1741,7 @@ msgstr ""
 "Ingen testbar incheckning hittades.\n"
 "Kanske du startade med felaktiga sรถkvรคgsparametrar?\n"
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1082,48 +1751,48 @@ msgstr[1] "(ungefรคr %d steg)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
 msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents och --reverse fungerar inte sรฅ bra tillsammans."
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr "kan inte anvรคnda --contents med namn pรฅ slutgiltigt incheckningsobjekt"
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse och --first-parent tillsammans krรคver att du anger senaste "
 "incheckningen"
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
-#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "misslyckades skapa revisionstraversering"
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent tillsammans krรคver ett intervall pรฅ fรถrsta-fรถrรคlder-"
 "kedjan"
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr "sรถkvรคgen %s i %s finns inte"
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "kan inte lรคsa objektet %s fรถr sรถkvรคgen %s"
@@ -1242,7 +1911,7 @@ msgstr ""
 "som redan finns pรฅ fjรคrren kan du behรถva kรถra \"git fetch\"\n"
 "fรถr att hรคmta den.\n"
 "\n"
-"Om du har tรคnkt sรคnda in en ny lokal gren som skall\n"
+"Om du har tรคnkt sรคnda in en ny lokal gren som ska\n"
 "spรฅra dess fjรคrrmotsvarighet kan du anvรคnda \"git push -u\"\n"
 "fรถr att stรคlla in uppstrรถmskonfigurationen nรคr du sรคnder in."
 
@@ -1281,8 +1950,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "okรคnt huvud: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
 #, c-format
 msgid "could not open '%s'"
 msgstr "kunde inte รถppna \"%s\""
@@ -1313,62 +1982,62 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Paketet (bundlen) krรคver denna referens:"
 msgstr[1] "Paketet (bundlen) krรคver dessa %d referenser:"
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr "kan inte duplicera pakethandtag"
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "Kunde inte starta pack-objects"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "pack-objects misslyckades"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "rev-list dog"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
 
-#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "okรคnt argument: %s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "Vรคgrar skapa ett tomt paket (bundle)."
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kan inte skapa \"%s\""
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "index-pack dog"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "felaktigt fรคrgvรคrde: %.*s"
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "kunde inte tolka %s"
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s รคr inte en incheckning!"
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1388,29 +2057,29 @@ msgstr ""
 "Slรฅ av detta meddelande genom att skriva\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1127
+#: commit.c:1153
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Incheckningen %s har en obetrodd GPG-signatur som pรฅstรฅs vara gjord av %s."
 
-#: commit.c:1130
+#: commit.c:1157
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "Incheckningen %s har en felaktig GPG-signatur som pรฅstรฅs vara gjord av %s."
 
-#: commit.c:1133
+#: commit.c:1160
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Incheckning %s har inte nรฅgon GPG-signatur."
 
-#: commit.c:1136
+#: commit.c:1163
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
 
-#: commit.c:1390
+#: commit.c:1417
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1420,232 +2089,242 @@ msgstr ""
 "Uppdatera det efter att ha rรคttat meddelandet, eller รคndra variabeln\n"
 "i18n.commitencoding till den teckenkodning som anvรคnds i ditt projekt.\n"
 
-#: commit-graph.c:127
+#: commit-graph.c:122
 msgid "commit-graph file is too small"
 msgstr "incheckningsgraffilen %s รคr fรถr liten"
 
-#: commit-graph.c:192
+#: commit-graph.c:189
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "incheckningsgrafens signatur %X stรคmmer inte med signaturen %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:196
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "incheckningsgrafens version %X stรคmmer inte med versionen %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:203
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "incheckningsgrafens hashversion %X stรคmmer inte med versionen %X"
 
-#: commit-graph.c:229
+#: commit-graph.c:226
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr ""
 "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "
 "ofullstรคndig"
 
-#: commit-graph.c:240
+#: commit-graph.c:237
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "felaktigt offset fรถr stycke %08x%08x i incheckningsgraffilen"
 
-#: commit-graph.c:283
+#: commit-graph.c:280
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "incheckningsgrafens stycke-id %08x fรถrekommer flera gรฅnger"
 
-#: commit-graph.c:347
+#: commit-graph.c:343
 msgid "commit-graph has no base graphs chunk"
 msgstr "incheckningsgrafen har inga bas-graf-stycken"
 
-#: commit-graph.c:357
+#: commit-graph.c:353
 msgid "commit-graph chain does not match"
 msgstr "incheckningsgrafens kedja stรคmmer inte"
 
-#: commit-graph.c:404
+#: commit-graph.c:401
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" รคr inte ett hash-vรคrde"
 
-#: commit-graph.c:430
+#: commit-graph.c:425
 msgid "unable to find all commit-graph files"
 msgstr "kan inte hitta alla incheckingsgraffiler"
 
-#: commit-graph.c:553 commit-graph.c:613
+#: commit-graph.c:558 commit-graph.c:618
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "ogiltig incheckningsposition. incheckningsgrafen รคr troligtvis trasig"
 
-#: commit-graph.c:574
+#: commit-graph.c:579
 #, c-format
 msgid "could not find commit %s"
 msgstr "kunde inte hitta incheckningen %s"
 
-#: commit-graph.c:1001 builtin/pack-objects.c:2651
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "kunde inte hรคmta typ fรถr objektet %s"
 
-#: commit-graph.c:1033
+#: commit-graph.c:1043
 msgid "Loading known commits in commit graph"
 msgstr "Lรคser in kรคnda incheckningar i incheckningsgraf"
 
-#: commit-graph.c:1050
+#: commit-graph.c:1060
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expanderar nรฅbara incheckningar i incheckningsgraf"
 
-#: commit-graph.c:1069
+#: commit-graph.c:1079
 msgid "Clearing commit marks in commit graph"
 msgstr "Rensar incheckningsmรคrken i incheckningsgraf"
 
-#: commit-graph.c:1088
+#: commit-graph.c:1098
 msgid "Computing commit graph generation numbers"
 msgstr "Berรคknar generationsvรคrden fรถr incheckningsgraf"
 
-#: commit-graph.c:1162
+#: commit-graph.c:1173
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Sรถker incheckningar fรถr incheckingsgraf i %d paket"
 msgstr[1] "Sรถker incheckningar fรถr incheckingsgraf i %d paket"
 
-#: commit-graph.c:1175
+#: commit-graph.c:1186
 #, c-format
 msgid "error adding pack %s"
 msgstr "fel vid tillรคgg av paketet %s"
 
-#: commit-graph.c:1179
+#: commit-graph.c:1190
 #, c-format
 msgid "error opening index for %s"
 msgstr "fel vid รถppning av indexet fรถr %s"
 
-#: commit-graph.c:1203
+#: commit-graph.c:1214
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
 msgstr[0] "Sรถker incheckningar fรถr incheckingsgraf frรฅn %d referens"
 msgstr[1] "Sรถker incheckningar fรถr incheckingsgraf frรฅn %d referenser"
 
-#: commit-graph.c:1237
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "ogiltigt inchecknings-objekt-id %s"
+
+#: commit-graph.c:1249
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Sรถker incheckningar fรถr incheckingsgraf i packade objekt"
 
-#: commit-graph.c:1252
+#: commit-graph.c:1264
 msgid "Counting distinct commits in commit graph"
 msgstr "Rรคknar olika incheckningar i incheckningsgraf"
 
-#: commit-graph.c:1283
+#: commit-graph.c:1294
 msgid "Finding extra edges in commit graph"
 msgstr "Sรถker ytterligare kanter i incheckingsgraf"
 
-#: commit-graph.c:1331
+#: commit-graph.c:1340
 msgid "failed to write correct number of base graph ids"
 msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
 
-#: commit-graph.c:1364 midx.c:811
+#: commit-graph.c:1373 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "kunde inte skapa inledande kataloger fรถr %s"
 
-#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr "kunde inte skapa \"%s\""
 
-#: commit-graph.c:1436
+#: commit-graph.c:1445
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Skriver ut incheckningsgraf i %d pass"
 msgstr[1] "Skriver ut incheckningsgraf i %d pass"
 
-#: commit-graph.c:1477
+#: commit-graph.c:1486
 msgid "unable to open commit-graph chain file"
 msgstr "Kunde inte รถppna incheckningsgrafkedjefilen"
 
-#: commit-graph.c:1489
+#: commit-graph.c:1498
 msgid "failed to rename base commit-graph file"
 msgstr "kunde inte byta namn pรฅ bas-incheckingsgraffilen"
 
-#: commit-graph.c:1509
+#: commit-graph.c:1518
 msgid "failed to rename temporary commit-graph file"
 msgstr "kunde inte byta namn pรฅ temporรคr incheckningsgraffil"
 
-#: commit-graph.c:1620
+#: commit-graph.c:1631
 msgid "Scanning merged commits"
 msgstr "Sรถker sammanslagna incheckningar"
 
-#: commit-graph.c:1631
+#: commit-graph.c:1642
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "ovรคntat duplicerat inchecknings-id %s"
 
-#: commit-graph.c:1656
+#: commit-graph.c:1665
 msgid "Merging commit-graph"
 msgstr "Slรฅr ihop incheckningsgraf"
 
-#: commit-graph.c:1842
+#: commit-graph.c:1844
 #, c-format
 msgid "the commit graph format cannot write %d commits"
 msgstr "formatet pรฅ incheckningsgrafen kan inte visa %d incheckningar"
 
-#: commit-graph.c:1853
+#: commit-graph.c:1855
 msgid "too many commits to write graph"
 msgstr "fรถr mรฅnga incheckningar fรถr att skriva graf"
 
-#: commit-graph.c:1943
+#: commit-graph.c:1944
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "filen med incheckningsgraf har felaktig checksumma och รคr troligtvis trasig"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1954
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "incheckningsgrafen har felaktig OID-ordning: %s sรฅ %s"
 
-#: commit-graph.c:1963 commit-graph.c:1978
+#: commit-graph.c:1964 commit-graph.c:1979
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "incheckningsgrafen har felaktig utbredningsvรคrde: fanout[%d] = %u != %u"
 
-#: commit-graph.c:1970
+#: commit-graph.c:1971
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "kunde inte tolka incheckning %s frรฅn incheckningsgraf"
 
-#: commit-graph.c:1987
+#: commit-graph.c:1989
 msgid "Verifying commits in commit graph"
 msgstr "Bekrรคftar incheckningar i incheckningsgrafen"
 
-#: commit-graph.c:2000
+#: commit-graph.c:2003
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "misslyckades tolka incheckning %s frรฅn objektdatabasen fรถr incheckningsgraf"
 
-#: commit-graph.c:2007
+#: commit-graph.c:2010
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "rot-trรคdets OID fรถr incheckningen %s i incheckningsgrafen รคr %s != %s"
 
-#: commit-graph.c:2017
+#: commit-graph.c:2020
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "incheckningsgrafens fรถrรคldralista fรถr incheckningen %s รคr fรถr lรฅng"
 
-#: commit-graph.c:2026
+#: commit-graph.c:2029
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "incheckningsgrafens fรถrรคlder fรถr %s รคr %s != %s"
 
-#: commit-graph.c:2039
+#: commit-graph.c:2042
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 "incheckningsgrafens fรถrรคldralista fรถr incheckningen %s avslutas fรถr tidigt"
 
-#: commit-graph.c:2044
+#: commit-graph.c:2047
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1653,7 +2332,7 @@ msgstr ""
 "incheckningsgrafen har generationsnummer noll fรถr incheckningen %s, men icke-"
 "noll pรฅ annan plats"
 
-#: commit-graph.c:2048
+#: commit-graph.c:2051
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1661,12 +2340,12 @@ msgstr ""
 "incheckningsgrafen har generationsnummer skilt frรฅn noll fรถr incheckningen "
 "%s, men noll pรฅ annan plats"
 
-#: commit-graph.c:2063
+#: commit-graph.c:2066
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "incheckningsgrafens generation fรถr incheckningen %s รคr %u != %u"
 
-#: commit-graph.c:2069
+#: commit-graph.c:2072
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
@@ -1705,289 +2384,283 @@ msgstr "relativa konfigureringsinkluderingar mรฅste komma frรฅn filer"
 msgid "relative config include conditionals must come from files"
 msgstr "relativa konfigureringsinkluderingsvillkor mรฅste komma frรฅn filer"
 
-#: config.c:375
+#: config.c:376
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "nyckeln innehรฅller inte ett stycke: %s"
 
-#: config.c:381
+#: config.c:382
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "nyckeln innehรฅller inte variabelnamn: %s"
 
-#: config.c:405 sequencer.c:2463
+#: config.c:406 sequencer.c:2444
 #, c-format
 msgid "invalid key: %s"
 msgstr "felaktig nyckel: %s"
 
-#: config.c:411
+#: config.c:412
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "ogiltig nyckel (nyradstecken): %s"
 
-#: config.c:447 config.c:459
+#: config.c:448 config.c:460
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "falsk konfigureringsparameter: %s"
 
-#: config.c:494
+#: config.c:495
 #, c-format
 msgid "bogus format in %s"
 msgstr "felaktigt format i %s"
 
-#: config.c:820
+#: config.c:821
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
 
-#: config.c:824
+#: config.c:825
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "felaktig konfigurationsfil rad %d i filen %s"
 
-#: config.c:828
+#: config.c:829
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "felaktig konfigurationsfil rad %d i standard in"
 
-#: config.c:832
+#: config.c:833
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
 
-#: config.c:836
+#: config.c:837
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
 
-#: config.c:840
+#: config.c:841
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "felaktig konfigurationsfil rad %d i %s"
 
-#: config.c:977
+#: config.c:978
 msgid "out of range"
 msgstr "utanfรถr intervallet"
 
-#: config.c:977
+#: config.c:978
 msgid "invalid unit"
 msgstr "ogiltig enhet"
 
-#: config.c:978
+#: config.c:979
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "felaktigt numeriskt konfigurationsvรคrde \"%s\" fรถr \"%s\": %s"
 
-#: config.c:997
+#: config.c:998
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvรคrde \"%s\" fรถr \"%s\" i blob:en %s: %s"
 
-#: config.c:1000
+#: config.c:1001
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvรคrde \"%s\" fรถr \"%s\" i filen %s: %s"
 
-#: config.c:1003
+#: config.c:1004
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvรคrde \"%s\" fรถr \"%s\" i standard in: %s"
 
-#: config.c:1006
+#: config.c:1007
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvรคrde \"%s\" fรถr \"%s\" i undermodul-blob:"
 "en %s: %s"
 
-#: config.c:1009
+#: config.c:1010
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvรคrde \"%s\" fรถr \"%s\" i kommandoraden "
 "%s: %s"
 
-#: config.c:1012
+#: config.c:1013
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "felaktigt numeriskt konfigurationsvรคrde \"%s\" fรถr \"%s\" i %s: %s"
 
-#: config.c:1107
+#: config.c:1108
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "misslyckades expandera anvรคndarkatalog i: \"%s\""
 
-#: config.c:1116
+#: config.c:1117
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "\"%s\" fรถr \"%s\" รคr inte en giltig tidsstรคmpel"
 
-#: config.c:1207
+#: config.c:1208
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "fรถrkortningslรคngd utanfรถr intervallet: %d"
 
-#: config.c:1221 config.c:1232
+#: config.c:1222 config.c:1233
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "felaktigt zlib-komprimeringsgrad %d"
 
-#: config.c:1324
+#: config.c:1325
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar kan bara vara ett tecken"
 
-#: config.c:1357
+#: config.c:1358
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "felaktigt lรคge fรถr skapande av objekt: %s"
 
-#: config.c:1429
+#: config.c:1430
 #, c-format
 msgid "malformed value for %s"
 msgstr "felformat vรคrde fรถr %s"
 
-#: config.c:1455
+#: config.c:1456
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "felformat vรคrde fรถr %s: %s"
 
-#: config.c:1456
+#: config.c:1457
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "mรฅste vara en av nothing, matching, simple, upstream eller current"
 
-#: config.c:1517 builtin/pack-objects.c:3399
+#: config.c:1518 builtin/pack-objects.c:3541
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "felaktig paketkomprimeringsgrad %d"
 
-#: config.c:1638
+#: config.c:1639
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "kunde inte lรคsa konfigurerings-blobobjektet \"%s\""
 
-#: config.c:1641
+#: config.c:1642
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referensen \"%s\" pekar inte pรฅ en blob"
 
-#: config.c:1658
+#: config.c:1659
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "kan inte slรฅ upp konfigurerings-bloben \"%s\""
 
-#: config.c:1688
+#: config.c:1689
 #, c-format
 msgid "failed to parse %s"
 msgstr "kunde inte tolka %s"
 
-#: config.c:1744
+#: config.c:1743
 msgid "unable to parse command-line config"
 msgstr "kan inte tolka kommandoradskonfiguration"
 
-#: config.c:2093
+#: config.c:2097
 msgid "unknown error occurred while reading the configuration files"
 msgstr "okรคnt fel uppstod vid lรคsning av konfigurationsfilerna"
 
-#: config.c:2263
+#: config.c:2267
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Felaktigt %s: \"%s\""
 
-#: config.c:2306
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-"okรคnt vรคrde \"%s\" fรถr core.untrackedCache; anvรคnder standardvรคrdet \"keep\""
-
-#: config.c:2332
+#: config.c:2312
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "vรคrdet \"%d\" fรถr splitIndex.maxPercentage borde vara mellan 0 och 100"
 
-#: config.c:2378
+#: config.c:2358
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "kunde inte tolka vรคrdet \"%s\" frรฅn kommandoradskonfiguration"
 
-#: config.c:2380
+#: config.c:2360
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" pรฅ rad %d"
 
-#: config.c:2461
+#: config.c:2441
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "felaktigt sektionsnamn \"%s\""
 
-#: config.c:2493
+#: config.c:2473
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s har flera vรคrden"
 
-#: config.c:2522
+#: config.c:2502
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
 
-#: config.c:2774 config.c:3098
+#: config.c:2754 config.c:3078
 #, c-format
 msgid "could not lock config file %s"
 msgstr "kunde inte lรฅsa konfigurationsfilen %s"
 
-#: config.c:2785
+#: config.c:2765
 #, c-format
 msgid "opening %s"
 msgstr "รถppnar %s"
 
-#: config.c:2820 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "ogiltigt mรถnster: %s"
 
-#: config.c:2845
+#: config.c:2825
 #, c-format
 msgid "invalid config file %s"
 msgstr "ogiltig konfigurationsfil: \"%s\""
 
-#: config.c:2858 config.c:3111
+#: config.c:2838 config.c:3091
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat misslyckades pรฅ %s"
 
-#: config.c:2869
+#: config.c:2849
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "kunde inte utfรถra mmap pรฅ \"%s\""
 
-#: config.c:2878 config.c:3116
+#: config.c:2858 config.c:3096
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod misslyckades pรฅ %s"
 
-#: config.c:2963 config.c:3213
+#: config.c:2943 config.c:3193
 #, c-format
 msgid "could not write config file %s"
 msgstr "kunde inte skriva konfigurationsfilen %s"
 
-#: config.c:2997
+#: config.c:2977
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "kunde inte stรคlla in \"%s\" till \"%s\""
 
-#: config.c:2999 builtin/remote.c:782
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr "kunde inte ta bort instรคllning fรถr \"%s\""
 
-#: config.c:3089
+#: config.c:3069
 #, c-format
 msgid "invalid section name: %s"
 msgstr "felaktigt namn pรฅ stycke: %s"
 
-#: config.c:3256
+#: config.c:3236
 #, c-format
 msgid "missing value for '%s'"
 msgstr "vรคrde saknas fรถr \"%s\""
@@ -2111,7 +2784,7 @@ msgstr "kunde inte slรฅ upp %s (%s)"
 msgid "unknown port %s"
 msgstr "okรคnd port %s"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "konstigt vรคrdnamn \"%s\" blockerat"
@@ -2126,60 +2799,60 @@ msgstr "konstig port \"%s\" blockerad"
 msgid "cannot start proxy %s"
 msgstr "kan inte starta mellanserver (proxy) %s"
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "ingen sรถkvรคg angavs; se \"git help pull\" fรถr giltig URL-syntax"
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh-varianten \"simple\" stรถder inte -4"
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh-varianten \"simple\" stรถder inte -6"
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh-varianten \"simple\" stรถder inte val av port"
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "konstigt sรถkvรคgsnamn \"%s\" blockerat"
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr "kunde inte grena (fork)"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr "Kontrollerar konnektivitet"
 
-#: connected.c:98
+#: connected.c:110
 msgid "Could not run 'git rev-list'"
 msgstr "Kunde inte kรถra \"git rev-list\""
 
-#: connected.c:118
+#: connected.c:130
 msgid "failed write to rev-list"
 msgstr "kunde inte skriva till rev-list"
 
-#: connected.c:125
+#: connected.c:137
 msgid "failed to close rev-list's stdin"
 msgstr "kunde inte stรคnga rev-list:s standard in"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "felaktig crlf_action %d"
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF skulle ersรคttas av LF i %s"
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2188,12 +2861,12 @@ msgstr ""
 "CRLF kommer att ersรคttas av LF i %s.\n"
 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF skulle ersรคttas av CRLF i %s"
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2202,18 +2875,18 @@ msgstr ""
 "LF kommer att ersรคttas av CRLF i %s.\n"
 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM รคr fรถrbjudet i \"%s\" om kodat som %s"
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
-"Filen \"%s\" innehรฅller byte order mark (BOM). Anvรคnd UTF-%s som "
+"Filen \"%s\" innehรฅller byte order mark (BOM). Anvรคnd UTF-%.*s som "
 "teckenkodning i arbetskatalogen."
 
 #: convert.c:304
@@ -2230,51 +2903,51 @@ msgstr ""
 "Filen \"%s\" saknar byte order mark (BOM). Anvรคnd UTF-%sBE eller UTF-%sLE "
 "(beroende pรฅ byteordning) som teckenkodning i arbetskatalogen."
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "misslyckades omkoda \"%s\" frรฅn %s till %s"
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 "omkodning av \"%s\" frรฅn %s till %s och tillbaka ger inte samma resultat"
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "kan inte grena (fork) fรถr att kรถra externt filter \"%s\""
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "kunde inte skicka indata till externt filter \"%s\""
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "externt filter \"%s\" misslyckades %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "lรคsning frรฅn externt filter \"%s\" misslyckades"
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "externt filter \"%s\" misslyckades"
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr "ovรคntad filtertyp"
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr "sรถkvรคgen fรถr lรฅng fรถr externt filter"
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2283,67 +2956,67 @@ msgstr ""
 "externt filter \"%s\" รคr inte lรคngre tillgรคngligt trots att alla sรถkvรคgar "
 "inte har filtrerats"
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false รคr inte giltig teckenkodning fรถr arbetskatalogen"
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
 
-#: convert.c:1476
+#: convert.c:1489
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr "i framtiden"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "%<PRIuMAX> sekund sedan"
 msgstr[1] "%<PRIuMAX> sekunder sedan"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "%<PRIuMAX> minut sedan"
 msgstr[1] "%<PRIuMAX> minuter sedan"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "%<PRIuMAX> timme sedan"
 msgstr[1] "%<PRIuMAX> timmar sedan"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "%<PRIuMAX> dag sedan"
 msgstr[1] "%<PRIuMAX> dagar sedan"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "%<PRIuMAX> vecka sedan"
 msgstr[1] "%<PRIuMAX> veckor sedan"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "%<PRIuMAX> mรฅnad sedan"
 msgstr[1] "%<PRIuMAX> mรฅnader sedan"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2351,14 +3024,14 @@ msgstr[0] "%<PRIuMAX> รฅr"
 msgstr[1] "%<PRIuMAX> รฅr"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "%s, %<PRIuMAX> mรฅnad sedan"
 msgstr[1] "%s, %<PRIuMAX> mรฅnader sedan"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2394,7 +3067,7 @@ msgstr "Markerade %d รถar, klar.\n"
 msgid "failed to read orderfile '%s'"
 msgstr "kunde inte lรคsa orderfilen \"%s\""
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr "Utfรถr onรถjaktig namnbytesdetektering"
 
@@ -2460,35 +3133,35 @@ msgstr ""
 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "extern diff dog, stannar vid %s"
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, -check och -s รคr รถmsesidigt uteslutande"
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S och --find-object รคr รถmsesidigt uteslutande"
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow krรคver exakt en sรถkvรคgsangivelse"
 
-#: diff.c:4689
+#: diff.c:4676
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "ogiltigt vรคrde fรถr --stat: %s"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s fรถrvรคntar ett numeriskt vรคrde"
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2497,42 +3170,42 @@ msgstr ""
 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "okรคnd รคndringsklass \"%c\" i --diff-filter=%s"
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "okรคnt vรคrde efter ws-error-highlight=%.*s"
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "kunde inte slรฅ upp \"%s\""
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s fรถrvรคntar formen <n>/<m>"
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s fรถrvรคntar ett tecken, fick \"%s\""
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "felaktigt argument till --color-moved: %s"
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "ogiltigt lรคge %s\" i --color-moved-ws"
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2540,149 +3213,149 @@ msgstr ""
 "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
 "\"histogram\""
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr "ogiltigt argument fรถr %s"
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "felaktigt argument --word-diff: %s"
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr "Formatflaggor fรถr diff-utdata"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr "skapar patch"
 
-#: diff.c:5275 builtin/log.c:182
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr "undertryck diff-utdata"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr "skapa diffar med <n> rader sammanhang"
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr "generera diff i rรฅformat"
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr "synonym till \"-p --raw\""
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr "synonym till \"-p --stat\""
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr "maskinlรคsbar --stat"
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr "skriv bara ut den sista raden fรถr --stat"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "skriv ut distributionen av relativa mรคngder รคndringar fรถr varje underkatalog"
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr "synonym fรถr --dirstat=cumulative"
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "synonym fรถr --dirstat=filer,param1,param2..."
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "varna om รคndringar introducerar konfliktmarkรถrer eller blankstegsfel"
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "kortfattad summering sรฅsom skapade, namnbyten och รคndrade lรคgen"
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr "visa endast namnen pรฅ รคndrade filer"
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr "visa endast namn och status fรถr รคndrade filer"
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr "skapa diffstat"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr "<bredd>"
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr "generera en diffstat med given bredd"
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr "generera en diffstat med given namnbredd"
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr "generera en diffstat med given grafbredd"
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr "<antal>"
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr "generera diffstat med begrรคnsade rader"
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr "skapa kompakt รถversikt i diffstat"
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr "skapa en binรคrdiff som kan appliceras"
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "visa fullstรคndiga objektnamn i \"index\"-rader fรถr lรคget bรฅde fรถre och efter"
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr "visa fรคrgad diff"
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr "<typ>"
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2690,7 +3363,7 @@ msgstr ""
 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
 "\"new\" (nya) rader i diffen"
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2698,87 +3371,87 @@ msgstr ""
 "skriv inte om sรถkvรคgsnamn och anvรคnd NUL-tecken som fรคltseparerare i --raw "
 "eller --numstat"
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr "<prefix>"
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr "visa givet kรคllprefix istรคllet fรถr \"a/\""
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "visa givet mรฅlprefix istรคllet fรถr \"b/\""
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr "lรคgg till ytterligare prefix pรฅ alla rader i utdata"
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr "visa inte kรคll- eller mรฅlprefix"
 
-#: diff.c:5371
+#: diff.c:5358
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr "<tecken>"
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "ange tecken fรถr att ange ny rad istรคllet fรถr \"+\""
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "ange tecken fรถr att ange gammal rad istรคllet fรถr \"-\""
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "ange tecken fรถr att ange sammanhang istรคllet fรถr \" \""
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr "Diff-namnbytesflaggor"
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr "detektera namnรคndringar"
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr "ta bort fรถr-version fรถr borttagningar"
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr "detektera kopior"
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr "anvรคnd ofรถrรคndrade som kรคlla fรถr att hitta kopior"
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr "inaktivera detektering av namnbyten"
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
 msgstr "anvรคnd tomma blob:ar som namnรคndringskรคlla"
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
 msgstr "fortsรคtt lista historiken fรถr en fil bortom namnรคndringar"
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2786,159 +3459,159 @@ msgstr ""
 "fรถrhindra namnbyte/kopie-detektering om antalet namnbyten/kopior รถverskriver "
 "given grรคns"
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr "Alternativ fรถr diff-algoritm"
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr "skapa minsta mรถjliga diff"
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorera blanktecken vid radjรคmfรถrelse"
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorera รคndringar i antal blanktecken vid radjรคmfรถrelse"
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorera blanktecken vid radslut"
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr "ignorera CR-tecken vid radslut"
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr "ignorera รคndringar i rader som รคr helt blanka"
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "heuristik fรถr att flytta diff-grรคnser fรถr lรคttare lรคsning"
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"patience diff\""
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"histogram diff\""
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr "<algoritm>"
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr "vรคlj en diff-algoritm"
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr "<text>"
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"anchored diff\""
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr "<lรคge>"
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "visa orddiff, dรคr <lรคge> avgrรคnsar รคndrade ord"
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr "<reguttr>"
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr "anvรคnd <reguttr> fรถr att bestรคmma vad som รคr ett ord"
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
 msgstr "flyttade kodrader fรคrgas pรฅ annat sรคtt"
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
 msgstr "hur blanktecken ignoreras i --color-moved"
 
-#: diff.c:5469
+#: diff.c:5456
 msgid "Other diff options"
 msgstr "Andra diff-flaggor"
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "vid start frรฅn underkatalog, uteslut รคndringar utanfรถr och visa relativa "
 "sรถkvรคgar"
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr "hantera alla filer som text"
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
 msgstr "vรคxla tvรฅ indatafiler, vรคnd diffen"
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "avsluta med 1 vid รคndringar, annars 0"
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr "slรฅ av alla utdata frรฅn programmet"
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr "tillรฅt kรถra en extern diff-hjรคlpare"
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr "kรถr externt textkonverteringsfiler nรคr binรคrfiler jรคmfรถrs"
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr "<nรคr>"
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignorera รคndringar i undermoduler nรคr diffen skapas"
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr "ange hur รคndringar i undermoduler visas"
 
-#: diff.c:5496
+#: diff.c:5483
 msgid "hide 'git add -N' entries from the index"
 msgstr "dรถlj \"git add -N\"-poster frรฅn indexet"
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "tolka \"git add -N\"-poster som รคkta i indexet"
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr "<strรคng>"
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "se efter รคndringar som รคndrar antalet fรถrekomster av angiven strรคng"
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -2946,94 +3619,115 @@ msgstr ""
 "se efter รคndringar som รคndrar antalet fรถrekomster av angivet reguljรคrt "
 "uttryck"
 
-#: diff.c:5508
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
 msgstr "visa alla รคndringar i รคndringsuppsรคttningen med -S eller -G"
 
-#: diff.c:5511
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "tolka <strรคng> i -S som utรถkade POSIX-reguljรคra uttryck"
 
-#: diff.c:5514
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
 msgstr "styr ordningen i vilken filer visas i utdata"
 
-#: diff.c:5515
+#: diff.c:5502
 msgid "<object-id>"
 msgstr "<objekt-id>"
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "se efter รคndringar som รคndrar antalet fรถrekomster av angivet objekt"
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
 msgstr "vรคlj filter efter diff-typ"
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr "<fil>"
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr "Skriv utdata till en specifik fil"
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "onรถjaktig namnbytesdetektering utfรถrdes inte pรฅ grund av fรถr mรฅnga filer."
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr "hittade bara kopior frรฅn รคndrade sรถkvรคgar pรฅ grund av fรถr mรฅnga filer."
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 "du kan sรคtta variabeln %s till รฅtminstone %d och fรถrsรถka kommandot pรฅ nytt."
 
-#: dir.c:537
+#: dir.c:555
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "sรถkvรคgsangivelsen \"%s\" motsvarade inte nรฅgra av git kรคnda filer"
 
-#: dir.c:926
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "okรคnt mรถnster: %s"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "okรคnt negativt mรถnster: %s"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"din \"sparse-checkout\"-fil kan ha problem: mรถnstret \"%s\" fรถrekommer flera "
+"gรฅnger"
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "inaktiverar konmรถnstermatchning"
+
+#: dir.c:1173
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "kan inte anvรคnda %s som exkluderingsfil"
 
-#: dir.c:1843
+#: dir.c:2144
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "kunde inte รถppna katalogen \"%s\""
 
-#: dir.c:2085
+#: dir.c:2479
 msgid "failed to get kernel name and information"
 msgstr "misslyckades hรคmta kรคrnans namn och information"
 
-#: dir.c:2209
+#: dir.c:2603
 msgid "untracked cache is disabled on this system or location"
 msgstr "ospรฅrad cache รคr inaktiverad pรฅ systemet eller platsen"
 
-#: dir.c:3013
+#: dir.c:3407
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "indexfilen trasig i arkivet %s"
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3452 dir.c:3457
 #, c-format
 msgid "could not create directories for %s"
 msgstr "kunde inte skapa kataloger fรถr %s"
 
-#: dir.c:3092
+#: dir.c:3486
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "kunde inte migrera git-katalog frรฅn \"%s\" till \"%s\""
@@ -3041,7 +3735,7 @@ msgstr "kunde inte migrera git-katalog frรฅn \"%s\" till \"%s\""
 #: editor.c:73
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "tips: Vรคntar pรฅ att textredigeringsprogrammet skall stรคnga filen...%c"
+msgstr "tips: Vรคntar pรฅ att textredigeringsprogrammet ska stรคnga filen...%c"
 
 #: entry.c:178
 msgid "Filtering content"
@@ -3052,12 +3746,12 @@ msgstr "Filtrerar innehรฅll"
 msgid "could not stat file '%s'"
 msgstr "kunde inte ta status pรฅ filen \"%s\""
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "felaktig git-namnrymdssรถkvรคg \"%s\""
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "kunde inte stรคlla in GIT_DIR till \"%s\""
@@ -3067,266 +3761,270 @@ msgstr "kunde inte stรคlla in GIT_DIR till \"%s\""
 msgid "too many args to run %s"
 msgstr "fรถr mรฅnga flaggor fรถr att kรถra %s"
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Fjรคrr utan URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: fรถrvรคntade grund lista"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: fรถrvรคntade ett flush-paket efter grund lista"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: fรถrvรคntade ACK/NAK, fick flush-paket"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: fรถrvรคntade ACK/NAK, fick \"%s\""
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr "kunde inte skriva till fjรคrren"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc krรคver \"multi_ack_detailed\""
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ogiltig \"shallow\"-rad: %s"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ogiltig \"unshallow\"-rad: %s"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr "objektet hittades inte: %s"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr "fel i objekt: %s"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ingen \"shallow\" hittades: %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "fรถrvรคntade shallow/unshallow, fick %s"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr "fick %s %d %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr "ogiltig incheckning %s"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr "ger upp"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr "klart"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "fick %s (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markerar %s som komplett"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr "har redan %s (%s)"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr "protokollfel: felaktigt packhuvud"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-patch: kunde inte grena av %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr "%s misslyckades"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr "fel i sidbands-avmultiplexare"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Serverversionen รคr %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr "Servern stรถder %s"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr "Servern stรถder inte klienter med grunda arkiv"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr "Servern stรถder inte --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr "Servern stรถder inte --shallow-exclude"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr "Servern stรถder inte --deepen"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr "inga gemensamma incheckningar"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-patch: hรคmtning misslyckades."
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr "Servern stรถder inte grunda fรถrfrรฅgningar"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr "Servern stรถder filter"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr "kunde inte skriva anrop till fjรคrren"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "fel vid lรคsning av styckehuvudet \"%s\""
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "fรถrvรคntade \"%s\", tog emot \"%s\""
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "fรถrvรคntade bekrรคftelserad: \"%s\""
 
-#: fetch-pack.c:1252
+#: fetch-pack.c:1308
 #, c-format
 msgid "error processing acks: %d"
 msgstr "fel vid hantering av bekrรคftelser: %d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr "vรคntade att paketfil skulle sรคndas efter \"ready\""
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 "vรคntade inte att nรฅgra ytterligare sektioner skulle sรคndas efter \"ready\""
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "fel vid hantering av grund (\"shallow\") info: %d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "fรถrvรคntade wanted-ref, fick %s"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "ovรคntad wanted-ref: \"%s\""
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "fel vid hantering av รถnskade referenser: %d"
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr "inget motsvarande fjรคrrhuvud"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:689
 msgid "remote did not send all necessary objects"
 msgstr "fjรคrren sรคnde inte alla nรถdvรคndiga objekt"
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr "ingen sรฅdan fjรคrreferens: %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Servern tillรฅter inte fรถrfrรฅgan om ej tillkรคnnagivet objekt %s"
 
-#: gpg-interface.c:321
+#: gpg-interface.c:408
 msgid "gpg failed to sign the data"
 msgstr "gpg misslyckades signera data"
 
-#: gpg-interface.c:347
+#: gpg-interface.c:434
 msgid "could not create temporary file"
 msgstr "kunde inte skapa temporรคra fil"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:437
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "misslyckades skriva fristรฅende signatur till \"%s\""
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignorera felaktig fรคrg \"%.*s\" i log.graphColors"
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"angivet mรถnster innehรฅller NULL-byte (via -f <fil>). Detta stรถds endast med -"
+"P under PCRE v2"
+
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "\"%s\" kunde inte lรคsa %s"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "misslyckades ta status pรฅ \"%s\""
 
-#: grep.c:2145
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "\"%s\": kort lรคsning"
@@ -3376,7 +4074,7 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Lรฅgnivรฅkommandon / frรฅgare"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Lรฅgnivรฅkommandon / synka arkiv"
 
 #: help.c:38
@@ -3469,12 +4167,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr "git version [<flaggor>]"
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3542,46 +4240,61 @@ msgstr "tomt ident-namn (fรถr <%s>) ej tillรฅtet"
 msgid "name consists only of disallowed characters: %s"
 msgstr "namnet bestรฅr enbart av ej tillรฅtna tecken: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:635
 #, c-format
 msgid "invalid date format: %s"
 msgstr "felaktigt datumformat: %s"
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "posten \"%s\" i trรคdet %s har trรคd-lรคge, men รคr inte ett trรคd"
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "posten \"%s\" i trรคdet %s har blob-lรคge, men รคr inte en blob"
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "kunde inte lรคsa in rot-trรคdet fรถr incheckningen %s"
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "flera filterspecifikationer kan inte kombineras"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "kunde inte nรฅ gles blob pรฅ \"%s\""
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "kunde inte tolka gles filterdata i %s"
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr "fรถrvรคntade \"tree:<djup>\""
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr "sparse:sรถkvรคg-filter stรถds inte lรคngre"
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "felaktig filterspecifikation: \"%s\""
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "kan inte รคndra kontraktsfjรคrr fรถr delvis kloning"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "mรฅste anvรคnda specialsekvens i delfilter-spec: \"%c\""
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "fรถrvรคntade nรฅgonting efter combine:"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "flera filterspecifikationer kan inte kombineras"
 
 #: lockfile.c:151
 #, c-format
@@ -3612,121 +4325,117 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"
 msgid "failed to read the cache"
 msgstr "misslyckades lรคsa cachen"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "kunde inte skriva ny indexfil"
 
-#: merge-recursive.c:322
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(felaktig incheckning)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 "add_cahceinfo misslyckades fรถr sรถkvรคgen \"%s\"; avslutar sammanslagningen."
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "add_cacheinfo misslyckades uppdatera fรถr sรถkvรคgen \"%s\"; avslutar "
 "sammanslagningen."
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "fel vid byggande av trรคd"
-
-#: merge-recursive.c:863
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "misslyckades skapa sรถkvรคgen \"%s\"%s"
 
-#: merge-recursive.c:874
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Tar bort %s fรถr att gรถra plats fรถr underkatalog\n"
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr ": kanske en K/F-konflikt?"
 
-#: merge-recursive.c:897
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "vรคgrar fรถrlora ospรฅrad fil vid \"%s\""
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kan inte lรคsa objektet %s: \"%s\""
 
-#: merge-recursive.c:941
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob fรถrvรคntades fรถr %s \"%s\""
 
-#: merge-recursive.c:965
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "misslyckades รถppna \"%s\": %s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "misslyckades skapa symboliska lรคnken \"%s\": %s"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
-msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
+msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Misslyckades slรฅ ihop undermodulen %s (ej utcheckad)"
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Misslyckades slรฅ ihop undermodulen %s (incheckningar saknas)"
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "Misslyckades slรฅ ihop undermodulen %s (incheckningar fรถljer inte "
 "sammanslagningsbasen)"
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Snabbspolar undermodulen %s till fรถljande incheckning:"
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Snabbspolar undermodulen %s"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Misslyckades slรฅ ihop undermodulen %s (sammanslagning efter incheckningar "
 "hittades inte)"
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Misslyckades slรฅ ihop undermodulen %s (ej snabbspolning)"
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Hittade en mรถjlig lรถsning av sammanslagning fรถr undermodulen:\n"
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3743,32 +4452,32 @@ msgstr ""
 "\n"
 "vilket godtar lรถsningen.\n"
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 "Misslyckades slรฅ ihop undermodulen %s (flera sammanslagningar hittades)"
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "Misslyckades exekvera intern sammanslagning"
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Kunde inte lรคgga till %s till databasen"
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Slรฅr ihop %s automatiskt"
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "Fel: Vรคgrar fรถrlora ospรฅrad fil vid %s; skriver till %s istรคllet."
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3777,7 +4486,7 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lรคmnad "
 "i trรคdet."
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3786,7 +4495,7 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
 "%s lรคmnad i trรคdet."
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3795,7 +4504,7 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lรคmnad "
 "i trรคdet vid %s."
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3804,40 +4513,40 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
 "%s lรคmnad i trรคdet vid %s."
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "namnbyte"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "namnbytt"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Vรคgrar fรถrlora lortig fil vid \"%s\""
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "Vรคgrar fรถrlora ospรฅrad fil vid %s, trots att den รคr i vรคgen."
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr "KONFLIKT (namnbyte/tillรคgg): Namnbyte %s->%s i %s. Lade till %s i %s"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s รคr en katalog i %s lรคgger till som %s istรคllet"
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "Vรคgrar fรถrlora ospรฅrad fil vid %s; lรคgger till som %s istรคllet"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3846,28 +4555,28 @@ msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" pรฅ grenen \"%s\" "
 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " (lรคmnad olรถst)"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1793
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
 "directory %s was renamed to multiple other directories, with no destination "
 "getting a majority of the files."
 msgstr ""
-"KONFLIKT (namnรคndrad delad katalog): Osรคker pรฅ var %s skall placeras dรฅ "
+"KONFLIKT (namnรคndrad delad katalog): Osรคker pรฅ var %s ska placeras dรฅ "
 "katalogen %s bytte namn till flera andra kataloger, utan att nรฅgon "
 "destination fick en majoritet av filerna."
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3876,7 +4585,7 @@ msgstr ""
 "KONFLIKT (implicit nรคmnรคndrad kat): Befintlig fil/kat vid %s รคr i vรคgen fรถr "
 "implicit namnรคndrad(e) katalog(er) som lรคgger dit fรถljande sรถkvรคg(ar): %s."
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3885,7 +4594,7 @@ msgstr ""
 "KONFLIKT (implicit namnรคndrad kat): Kan inte koppla mer รคn en sรถkvรคg till "
 "%s; implicita katalognamnรคndringar fรถrsรถkte lรคgga fรถljande sรถkvรคgar dรคr: %s"
 
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3894,7 +4603,7 @@ msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
 "%s->%s i %s"
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3903,52 +4612,52 @@ msgstr ""
 "VARNING: Undviker att applicera namnรคndring %s -> %s pรฅ %s, dรฅ %s sjรคlv har "
 "bytt namn."
 
-#: merge-recursive.c:2937
+#: merge-recursive.c:2961
 #, c-format
 msgid "cannot read object %s"
 msgstr "kan inte lรคsa objektet %s"
 
-#: merge-recursive.c:2940
+#: merge-recursive.c:2964
 #, c-format
 msgid "object %s is not a blob"
 msgstr "objektet %s รคr inte en blob"
 
-#: merge-recursive.c:3004
+#: merge-recursive.c:3028
 msgid "modify"
 msgstr "รคndra"
 
-#: merge-recursive.c:3004
+#: merge-recursive.c:3028
 msgid "modified"
 msgstr "รคndrad"
 
-#: merge-recursive.c:3016
+#: merge-recursive.c:3040
 msgid "content"
 msgstr "innehรฅll"
 
-#: merge-recursive.c:3020
+#: merge-recursive.c:3044
 msgid "add/add"
 msgstr "tillรคgg/tillรคgg"
 
-#: merge-recursive.c:3043
+#: merge-recursive.c:3067
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Hoppade รถver %s (sammanslagen samma som befintlig)"
 
-#: merge-recursive.c:3065 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:1003
 msgid "submodule"
 msgstr "undermodul"
 
-#: merge-recursive.c:3066
+#: merge-recursive.c:3090
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
 
-#: merge-recursive.c:3096
+#: merge-recursive.c:3120
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Lรคgger till som %s istรคllet"
 
-#: merge-recursive.c:3178
+#: merge-recursive.c:3203
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -3957,7 +4666,7 @@ msgstr ""
 "Uppdaterad sรถkvรคg: %s lade till %s inuti en katalog som bytte namn i %s; "
 "flyttar den till %s."
 
-#: merge-recursive.c:3181
+#: merge-recursive.c:3206
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -3966,7 +4675,7 @@ msgstr ""
 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
 "%s, fรถreslรฅr att den bรถr flyttas till%s."
 
-#: merge-recursive.c:3185
+#: merge-recursive.c:3210
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -3975,7 +4684,7 @@ msgstr ""
 "Uppdaterad sรถkvรคg: %s bytte namn till %s i %s, inuti en katalog som bytte "
 "namn i %s; flyttar den till %s."
 
-#: merge-recursive.c:3188
+#: merge-recursive.c:3213
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -3984,227 +4693,243 @@ msgstr ""
 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
 "bytte namn i %s; flyttar den till %s."
 
-#: merge-recursive.c:3302
+#: merge-recursive.c:3327
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: merge-recursive.c:3325
+#: merge-recursive.c:3350
 msgid "file/directory"
 msgstr "fil/katalog"
 
-#: merge-recursive.c:3330
+#: merge-recursive.c:3355
 msgid "directory/file"
 msgstr "katalog/fil"
 
-#: merge-recursive.c:3337
+#: merge-recursive.c:3362
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lรคgger till %s som %s"
 
-#: merge-recursive.c:3346
+#: merge-recursive.c:3371
 #, c-format
 msgid "Adding %s"
 msgstr "Lรคgger till %s"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3380
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "KONFLIKT (tillรคgg/tillรคgg): Sammanslagningskonflikt i %s"
 
-#: merge-recursive.c:3393
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Dina lokala รคndringar av fรถljande filer skulle skrivas รถver av "
-"sammanslagning:\n"
-"  %s"
-
-#: merge-recursive.c:3404
+#: merge-recursive.c:3424
 msgid "Already up to date!"
 msgstr "Redan ร  jour!"
 
-#: merge-recursive.c:3413
+#: merge-recursive.c:3433
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "sammanslagning av trรคden %s och %s misslyckades"
 
-#: merge-recursive.c:3512
+#: merge-recursive.c:3537
 msgid "Merging:"
 msgstr "Slรฅr ihop:"
 
-#: merge-recursive.c:3525
+#: merge-recursive.c:3550
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "hittade %u gemensam fรถrfader:"
 msgstr[1] "hittade %u gemensamma fรถrfรคder:"
 
-#: merge-recursive.c:3564
+#: merge-recursive.c:3600
 msgid "merge returned no commit"
 msgstr "sammanslagningen returnerade ingen incheckning"
 
-#: merge-recursive.c:3630
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Dina lokala รคndringar av fรถljande filer skulle skrivas รถver av "
+"sammanslagning:\n"
+"  %s"
+
+#: merge-recursive.c:3756
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Kunde inte tolka objektet \"%s\""
 
-#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
 msgid "Unable to write index."
 msgstr "Kunde inte skriva indexet."
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "multi-pack-indexfilen %s รคr fรถr liten"
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "multi-pack-indexsignaturen 0x%08x stรคmmer inte med signaturen 0x%08x"
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-indexversionen %d stรถds inte"
 
-#: midx.c:95
+#: midx.c:94
 #, c-format
 msgid "hash version %u does not match"
 msgstr "hash-versionen %u stรคmmer inte"
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr "felaktigt offset fรถr stycke (fรถr stort)"
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "avslutande multi-pack-index-stycke-ID fรถrekommer tidigare รคn fรถrvรคntat"
+msgstr "avslutande multi-pack-index-stycke-id fรถrekommer tidigare รคn fรถrvรคntat"
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index saknar krรคvd paketnamn-stycke"
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index saknar krรคvt OID-utbredningsstycke"
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index saknar krรคvt OID-uppslagnignsstycke"
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index saknar krรคvt objekt-offsetstycke"
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" fรถre \"%s\""
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "bad pack-int-id: %u (%u paket totalt)"
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "multi-pack-index skriver 64-bitars offset, men off_t รคr fรถr liten"
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr "fel nรคr paketfiler frรฅn multi-pack-index skulle fรถrberedas"
 
-#: midx.c:470
+#: midx.c:472
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "misslyckades lรคsa paketfilen \"%s\""
 
-#: midx.c:476
+#: midx.c:478
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "misslyckades รถppna paketindexet \"%s\""
 
-#: midx.c:536
+#: midx.c:538
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "misslyckades hitta objekt %d i paketfilen"
 
-#: midx.c:865
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Lรคgger till paketfiler till multi-pack-index"
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "sรฅg inte paketfilen %s som skulle kastas"
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "Skriver stycken till multi-pack-index"
+
+#: midx.c:1052
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "misslyckades stรคda multi-pack-index pรฅ %s"
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr "Ser efter refererade packfiler"
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
-msgstr "Bekrรคftar OID-ordning i MIDX"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Bekrรคftar OID-ordning i multi-pack-index"
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr "Sorterar objekt efter packfil"
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr "Bekrรคftar offset fรถr objekt"
 
-#: midx.c:1160
+#: midx.c:1180
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "misslyckades lรคsa paketpost fรถr oid[%d] = %s"
 
-#: midx.c:1166
+#: midx.c:1186
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "misslyckades lรคsa paketindex fรถr paketfil %s"
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "felaktigt objekt-offset fรถr oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "Rรคknar refererade objekt"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Ser efter och tar bort orefererade packfiler"
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr "kunde inte starta pack-objects"
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr "kunde inte avsluta pack-objects"
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "misslyckades skapa lazy_dir-trรฅd: %s"
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "misslyckades skapa lazy_name-trรฅd: %s"
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "misslyckades utfรถra join pรฅ lazy_name-trรฅd: %s"
@@ -4249,32 +4974,32 @@ msgstr "Vรคgrar skriva รถver anteckningar i %s (utanfรถr refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Felaktigt vรคrde pรฅ %s: \"%s\""
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "ogiltig objekttyp \"%s\""
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "objektet %s รคr en %s, inte en %s"
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "objektet %s har okรคnd typ-id %d"
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "kunde inte tolka objektet: %s"
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr "hashvรคrde stรคmmer inte รถverens %s"
 
-#: packfile.c:648
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset fรถre slutet av packfilen (trasig .idx?)"
 
@@ -4288,6 +5013,11 @@ msgstr "offset fรถre slutet av packindex fรถr %s (trasigt index?)"
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "offset borton slutet av packindex fรถr %s (trunkerat index?)"
 
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "kan inte hรคmta storlek pรฅ %s"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4303,7 +5033,7 @@ msgstr "%s รคr inkompatibel med %s"
 msgid "%s : incompatible with something else"
 msgstr "%s: inkompatibelt med nรฅgot annat"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s tar inget vรคrde"
@@ -4313,41 +5043,41 @@ msgstr "%s tar inget vรคrde"
 msgid "%s isn't available"
 msgstr "%s รคr inte tillgรคngligt"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s fรถrvรคntar ett icke-negativt heltalsvรคrde, med valfritt k/m/g-suffix"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr "menade du \"--%s\" (med tvรฅ bindestreck?)"
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "menade du \"--%s\" (med tvรฅ bindestreck)?"
 
-#: parse-options.c:859
+#: parse-options.c:857
 #, c-format
 msgid "unknown option `%s'"
 msgstr "okรคnd flagga \"%s\""
 
-#: parse-options.c:861
+#: parse-options.c:859
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "okรคnd flagga \"%c\""
 
-#: parse-options.c:863
+#: parse-options.c:861
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "okรคnd icke-ascii-flagga i strรคngen: \"%s\""
 
-#: parse-options.c:887
+#: parse-options.c:885
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:906
+#: parse-options.c:904
 #, c-format
 msgid "usage: %s"
 msgstr "anvรคndning: %s"
@@ -4355,21 +5085,21 @@ msgstr "anvรคndning: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:910
 #, c-format
 msgid "   or: %s"
 msgstr "     eller: %s"
 
-#: parse-options.c:915
+#: parse-options.c:913
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:952
 msgid "-NUM"
 msgstr "-TAL"
 
-#: parse-options.c:968
+#: parse-options.c:966
 #, c-format
 msgid "alias of --%s"
 msgstr "alias fรถr --%s"
@@ -4395,34 +5125,34 @@ msgstr ""
 msgid "malformed object name '%s'"
 msgstr "felformat objektnamn \"%s\""
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Kunde inte gรถra %s skrivbar fรถr gruppen"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Specialtecknet \"\\\" tillรฅts inte som sista tecken i attributvรคrde"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Endast en \"attr:\"-angivelse tillรฅten."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "attr-angivelse kan inte vara tom"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "ogiltigt attributnamn %s"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "de globala sรถkvรคgsinstรคllningarna \"glob\" och \"noglob\" รคr inkompatibla"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4430,50 +5160,55 @@ msgstr ""
 "den globala sรถkvรคgsinstรคllningen \"literal\" รคr inkompatibel med alla andra "
 "globala sรถkvรคgsinstรคllningar"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "ogiltig parameter fรถr sรถkvรคgsuttrycket fรถr \"prefix\""
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Felaktigt sรถkvรคgsuttryck \"%.*s\" i \"%s\""
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "\")\" saknas i slutet av sรถkvรคgsuttrycket fรถr \"%s\""
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Ej implementerat sรถkvรคgsuttryckmagi \"%c\" i \"%s\""
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: \"literal\" och \"glob\" รคr inkompatibla"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: \"%s\" รคr utanfรถr arkivet"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: \"%s\" รคr utanfรถr arkivet pรฅ \"%s\""
 
-#: pathspec.c:514
+#: pathspec.c:517
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "\"%s\" (minnesstรถd: \"%c\")"
 
-#: pathspec.c:524
+#: pathspec.c:527
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: sรถkvรคgsuttrycket hanteras inte av det hรคr kommandot: %s"
 
-#: pathspec.c:591
+#: pathspec.c:594
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "sรถkvรคgsangivelsen \"%s\" รคr pรฅ andra sidan av en symbolisk lรคnk"
 
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "linjen er felaktigt citerad: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "kan inte skriva flush-paket"
@@ -4534,33 +5269,42 @@ msgstr "Uppdaterar indexet"
 msgid "unable to create threaded lstat: %s"
 msgstr "kunde inte skapa trรฅdad lstat: %s"
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr "kunde inte tolka format fรถr --pretty"
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "Fjรคrr utan URL"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "kontraktsfjรคrr kan inte bรถrja med \"/\": %s"
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "kunde inte starta \"log\""
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr "kunde inte lรคsa utdata frรฅn \"log\""
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5020
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "kunde inte tolka incheckningen \"%s\""
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "kunde inte tolka git-huvudet \"%.*s\""
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr "misslyckades skapa diff"
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "kunde inte tolka loggen fรถr \"%s\""
@@ -4600,16 +5344,16 @@ msgstr "kan inte lรคgga till \"%s\" till indexet"
 msgid "unable to stat '%s'"
 msgstr "kan inte ta status pรฅ \"%s\""
 
-#: read-cache.c:1314
+#: read-cache.c:1330
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "\"%s\" finns bรฅde som en fil och en katalog"
 
-#: read-cache.c:1499
+#: read-cache.c:1536
 msgid "Refresh index"
 msgstr "Uppdatera indexet"
 
-#: read-cache.c:1613
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4618,7 +5362,7 @@ msgstr ""
 "index.version satt, men vรคrdet รคr ogiltigt.\n"
 "Anvรคnder version %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4627,150 +5371,161 @@ msgstr ""
 "GIT_INDEX_VERSION satt, men vรคrdet รคr ogiltigt.\n"
 "Anvรคnder version %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1717
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "felaktig signatur 0x%08x"
 
-#: read-cache.c:1682
+#: read-cache.c:1720
 #, c-format
 msgid "bad index version %d"
 msgstr "felaktig indexversion %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1729
 msgid "bad index file sha1 signature"
 msgstr "felaktig sha1-signatur fรถr indexfil"
 
-#: read-cache.c:1721
+#: read-cache.c:1759
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "index anvรคnder filtillรคgget %.4s, vilket vi inte fรถrstรฅr"
 
-#: read-cache.c:1723
+#: read-cache.c:1761
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ignorerar filtillรคgget %.4s"
 
-#: read-cache.c:1760
+#: read-cache.c:1798
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "okรคnt format 0x%08x pรฅ indexpost"
 
-#: read-cache.c:1776
+#: read-cache.c:1814
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "felformat namnfรคlt i indexet, nรคra sรถkvรคgen \"%s\""
 
-#: read-cache.c:1833
+#: read-cache.c:1871
 msgid "unordered stage entries in index"
 msgstr "osorterade kรถposter i index"
 
-#: read-cache.c:1836
+#: read-cache.c:1874
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "flera kรถposter fรถr den sammanslagna filen \"%s\""
 
-#: read-cache.c:1839
+#: read-cache.c:1877
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "osorterade kรถposter fรถr \"%s\""
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "indexfilen trasig"
 
-#: read-cache.c:2087
+#: read-cache.c:2124
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "kunde inte lรคsa in cache_entries-trรฅden: %s"
 
-#: read-cache.c:2100
+#: read-cache.c:2137
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "kunde inte utfรถra join pรฅ cache_entries-trรฅden: %s"
 
-#: read-cache.c:2133
+#: read-cache.c:2170
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: รถppning av indexfilen misslyckades"
 
-#: read-cache.c:2137
+#: read-cache.c:2174
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: kan inte ta startus pรฅ det รถppna indexet"
 
-#: read-cache.c:2141
+#: read-cache.c:2178
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: indexfilen mindre รคn fรถrvรคntat"
 
-#: read-cache.c:2145
+#: read-cache.c:2182
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s: kan inte koppla indexfilen"
 
-#: read-cache.c:2187
+#: read-cache.c:2224
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "kunde inte skapa load_index_extensions-trรฅden: %s"
 
-#: read-cache.c:2214
+#: read-cache.c:2251
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "kunde inte utfรถra join pรฅ load_index_extensions-trรฅden: %s"
 
-#: read-cache.c:2246
+#: read-cache.c:2283
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "kunde inte uppdatera delat index \"%s\""
 
-#: read-cache.c:2293
+#: read-cache.c:2330
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "trasigt index, fรถrvรคntade %s i %s, fick %s"
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
 #, c-format
 msgid "could not close '%s'"
 msgstr "kunde inte stรคnga \"%s\""
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
 #, c-format
 msgid "could not stat '%s'"
 msgstr "kunde inte ta status pรฅ \"%s\""
 
-#: read-cache.c:3105
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "kunde inte รถppna git-katalog: %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "misslyckades ta bort lรคnken: %s"
 
-#: read-cache.c:3142
+#: read-cache.c:3179
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "kan inte rรคtta behรถrighetsbitar pรฅ \"%s\""
 
-#: read-cache.c:3291
+#: read-cache.c:3328
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: kan inte รฅtergรฅ till kรถ 0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Du kan rรคtta detta med \"git rebase --edit-todo\" fรถljt av \"git rebase --"
+"continue\".\n"
+"Avbryt ombaseringen med \"git rebase --abort\".\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "okรคnd instรคllning %s fรถr flaggan rebase.missingCommitsCheck. Ignorerar."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4814,14 +5569,14 @@ msgstr ""
 "\n"
 "Du kan byta ordning pรฅ raderna; de utfรถrs uppifrรฅn och ned.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Ombasera %s pรฅ %s (%d kommando)"
 msgstr[1] "Ombasera %s pรฅ %s (%d kommandon)"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -4830,7 +5585,7 @@ msgstr ""
 "Ta inte bort rader. Anvรคnd \"drop\" fรถr att specifikt fรถrkasta en "
 "incheckning.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4838,7 +5593,7 @@ msgstr ""
 "\n"
 "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT Fร–RLORAS.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4852,7 +5607,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4862,22 +5617,19 @@ msgstr ""
 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Observera att tomma incheckningar รคr utkommenterade"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
 #, c-format
 msgid "could not write '%s'"
 msgstr "kunde inte skriva \"%s\""
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "kunde inte kopiera \"%s\" till \"%s\"."
+msgid "could not write '%s'."
+msgstr "kunde inte skriva \"%s\"."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4886,7 +5638,7 @@ msgstr ""
 "Varning: vissa incheckningar kan av misstag ha tappats.\n"
 "Tappade incheckningar (nyaste fรถrst):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4906,6 +5658,13 @@ msgstr ""
 "\" (fel).\n"
 "\n"
 
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "kunde inte lรคsa \"%s\"."
+
 #: refs.c:262
 #, c-format
 msgid "%s does not point to a valid object!"
@@ -4916,7 +5675,7 @@ msgstr "\"%s\" pekar inte pรฅ ett giltigt objekt!"
 msgid "ignoring dangling symref %s"
 msgstr "ignorerar dinglande symbolisk referens %s"
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorerar trasig referens %s"
@@ -4941,14 +5700,15 @@ msgstr "referensen \"%s\" finns redan"
 msgid "unexpected object ID when writing '%s'"
 msgstr "ovรคntat objekt-id vid skrivning \"%s\""
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "kunde inte skriva till \"%s\""
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "kunde inte รถppna \"%s\" fรถr skrivning"
@@ -4983,37 +5743,37 @@ msgstr "vรคgrar uppdatera referens med trasigt namn \"%s\""
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref misslyckades fรถr referensen \"%s\": %s"
 
-#: refs.c:2012
+#: refs.c:2023
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "flera uppdateringar fรถr referensen \"%s\" tillรฅts inte"
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "referensuppdateringar fรถrbjudna i karantรคnmiljรถ"
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "\"%s\" finns; kan inte skapa \"%s\""
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr "kunde inte ta bort referensen %s"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "kunde inte ta bort referensen %s: %s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "kunde inte ta bort referenser: %s"
@@ -5023,7 +5783,7 @@ msgstr "kunde inte ta bort referenser: %s"
 msgid "invalid refspec '%s'"
 msgstr "felaktig referensspecifikation: \"%s\""
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr "fรถrsvunnen"
 
@@ -5042,281 +5802,281 @@ msgstr "bakom %d"
 msgid "ahead %d, behind %d"
 msgstr "fรถre %d, bakom %d"
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "fรถrvรคntat format: %%(color:<color>)"
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "okรคnd fรคrg: %%(color:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Heltalsvรคrde fรถrvรคntades refname:lstrip=%s"
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Heltalsvรคrde fรถrvรคntades refname:rstrip=%s"
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "okรคnt %%(%s)-argument: %s"
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) tar inte argument"
 
-#: ref-filter.c:269
+#: ref-filter.c:272
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "okรคnt %%(objectsize)-argument: %s"
 
-#: ref-filter.c:277
+#: ref-filter.c:280
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) tar inte argument"
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) tar inte argument"
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) tar inte argument"
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "okรคnt %%(trailers)-argument: %s"
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "positivt vรคrde fรถrvรคntat contents:lines=%s"
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "okรคnt %%(contents)-argument: %s"
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "positivt vรคrde fรถrvรคntat objectname:short=%s"
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "okรคnt %%(objectname)-argument: %s"
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "fรถrvรคntat format: %%(align:<bredd>,<position>)"
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "okรคnd position:%s"
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "okรคnd bredd:%s"
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "okรคnt %%(align)-argument: %s"
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "positiv bredd fรถrvรคntad med atomen %%(align)"
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "okรคnt %%(if)-argument: %s"
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "felformat fรคltnamn: %.*s"
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "okรคnt fรคltnamn: %.*s"
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 "inte ett git-arkiv, men fรคltet \"%.*s\" krรคver tillgรฅng till objektdata"
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: atomen %%(if) anvรคnd utan en %%(then)-atom"
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: atomen %%(then) anvรคnd utan en %%(if)-atom"
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: atomen %%(then) anvรคnd mer รคn en gรฅng"
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atomen %%(then) anvรคnd efter %%(else)"
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: atomen %%(else) anvรคnd utan en %%(if)-atom"
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format: atomen %%(else) anvรคnd utan en %%(then)-atom"
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: atomen %%(else) anvรคnd mer รคn en gรฅng"
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: atomen %%(end) anvรคnd utan motsvarande atom"
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr "felformad formatstrรคng %s"
 
-#: ref-filter.c:1485
+#: ref-filter.c:1488
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr "ingen gren, ombaserar %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1491
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr "ingen gren, ombaserar frรฅnkopplat HEAD %s"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr "ingen gren, \"bisect\" startad pรฅ %s"
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr "ingen gren"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objektet %s saknas fรถr %s"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer misslyckades pรฅ %s fรถr %s"
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "felformat objekt vid \"%s\""
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorerar referens med trasigt namn %s"
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atomen %%(end) saknas"
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr "flaggan \"%s\" รคr inkompatibel med --merged"
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr "flaggan \"%s\" รคr inkompatibel med --no-merged"
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr "felformat objektnamn %s"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "flaggan \"%s\" mรฅste peka pรฅ en incheckning"
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "konfigurerad kortform fรถr fjรคrr kan inte bรถrja med \"/\": %s"
 
-#: remote.c:410
+#: remote.c:414
 msgid "more than one receivepack given, using the first"
 msgstr "mer รคn en receivepack angavs, anvรคnder den fรถrsta"
 
-#: remote.c:418
+#: remote.c:422
 msgid "more than one uploadpack given, using the first"
 msgstr "mer รคn en uploadpack angavs, anvรคnder den fรถrsta"
 
-#: remote.c:608
+#: remote.c:612
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Kan inte hรคmta bรฅde %s och %s till %s"
 
-#: remote.c:612
+#: remote.c:616
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s spรฅrar vanligtvis %s, inte %s"
 
-#: remote.c:616
+#: remote.c:620
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s spรฅrar bรฅde %s och %s"
 
-#: remote.c:684
+#: remote.c:688
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "nyckeln \"%s\" i mรถnstret innehรฅller ingen \"*\""
 
-#: remote.c:694
+#: remote.c:698
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "vรคrdet \"%s\" i mรถnstret innehรฅller ingen \"*\""
 
-#: remote.c:1000
+#: remote.c:1004
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "kรคll-referensspecifikationen %s motsvarar ingen"
 
-#: remote.c:1005
+#: remote.c:1009
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "kรคll-referensspecifikationen %s motsvarar mer รคn en"
@@ -5325,7 +6085,7 @@ msgstr "kรคll-referensspecifikationen %s motsvarar mer รคn en"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1024
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5348,7 +6108,7 @@ msgstr ""
 "\n"
 "Inget av dem fungerade, sรฅ vi gav upp. Ange fullstรคndig referens."
 
-#: remote.c:1040
+#: remote.c:1044
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5359,7 +6119,7 @@ msgstr ""
 "Var det meningen att skapa en ny gren genom att sรคnda\n"
 "till \"%s:refs/heads/%s\"?"
 
-#: remote.c:1045
+#: remote.c:1049
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5370,7 +6130,7 @@ msgstr ""
 "Var det meningen att skapa en ny tagg genom att sรคnda\n"
 "till \"%s:refs/tags/%s\"?"
 
-#: remote.c:1050
+#: remote.c:1054
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5381,7 +6141,7 @@ msgstr ""
 "Var det meningen att tagga ett nytt trรคd genom att sรคnda\n"
 "till \"%s:refs/tags/%s\"?"
 
-#: remote.c:1055
+#: remote.c:1059
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5392,114 +6152,114 @@ msgstr ""
 "Var det meningen att tagga en ny blob genom att sรคnda\n"
 "till \"%s:refs/tags/%s\"?"
 
-#: remote.c:1091
+#: remote.c:1095
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s kan inte slรฅs upp till en gren"
 
-#: remote.c:1102
+#: remote.c:1106
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "kan inte ta bort \"%s\": fjรคrreferensen finns inte"
 
-#: remote.c:1114
+#: remote.c:1118
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "fjรคrr-referensspecifikationen \"%s\" motsvarar mer รคn en"
 
-#: remote.c:1121
+#: remote.c:1125
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "fjรคrr-referensen \"%s\" hรคmtar frรฅn mer รคn en kรคlla"
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1628 remote.c:1729
 msgid "HEAD does not point to a branch"
 msgstr "HEAD pekar inte pรฅ en gren"
 
-#: remote.c:1633
+#: remote.c:1637
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "okรคnd gren: \"%s\""
 
-#: remote.c:1636
+#: remote.c:1640
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "ingen standarduppstrรถm angiven fรถr grenen \"%s\""
 
-#: remote.c:1642
+#: remote.c:1646
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "uppstrรถmsgrenen \"%s\" รคr inte lagrad som en fjรคrrspรฅrande gren"
 
-#: remote.c:1657
+#: remote.c:1661
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "push-mรฅlet \"%s\" pรฅ fjรคrren \"%s\" har ingen lokalt spรฅrande gren"
 
-#: remote.c:1669
+#: remote.c:1673
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "grenen \"%s\" har ingen fjรคrr fรถr \"push\""
 
-#: remote.c:1679
+#: remote.c:1683
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "\"push\"-referensspecifikation fรถr \"%s\" innehรฅller inte \"%s\""
 
-#: remote.c:1692
+#: remote.c:1696
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "\"push\" har inget mรฅl (push.default รคr \"ingenting\")"
 
-#: remote.c:1714
+#: remote.c:1718
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "\"enkel push\" motsvarar flera olika mรฅl"
 
-#: remote.c:1840
+#: remote.c:1844
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "Kunde inte hitta fjรคrr-referensen %s"
 
-#: remote.c:1853
+#: remote.c:1857
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Ignorerar mรคrklig referens \"%s\" lokalt"
 
-#: remote.c:2016
+#: remote.c:2020
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Din gren รคr baserad pรฅ \"%s\", men den har fรถrsvunnit uppstrรถms.\n"
 
-#: remote.c:2020
+#: remote.c:2024
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (anvรคnd \"git branch --unset-upstream\" fรถr att rรคtta)\n"
 
-#: remote.c:2023
+#: remote.c:2027
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Din gren รคr ร  jour med \"%s\".\n"
 
-#: remote.c:2027
+#: remote.c:2031
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Din gren och \"%s\" pekar pรฅ olika incheckningar.\n"
 
-#: remote.c:2030
+#: remote.c:2034
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (anvรคnd \"%s\" fรถr detaljer)\n"
 
-#: remote.c:2034
+#: remote.c:2038
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Din gren ligger fรถre \"%s\" med %d incheckning.\n"
 msgstr[1] "Din gren ligger fรถre \"%s\" med %d incheckningar.\n"
 
-#: remote.c:2040
+#: remote.c:2044
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (anvรคnd \"git push\" fรถr att publicera dina lokala incheckningar)\n"
 
-#: remote.c:2043
+#: remote.c:2047
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5509,11 +6269,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
 
-#: remote.c:2051
+#: remote.c:2055
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (anvรคnd \"git pull\" fรถr att uppdatera din lokala gren)\n"
 
-#: remote.c:2054
+#: remote.c:2058
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5528,11 +6288,11 @@ msgstr[1] ""
 "Din gren och \"%s\" har divergerat,\n"
 "och har %d respektive %d olika incheckningar.\n"
 
-#: remote.c:2064
+#: remote.c:2068
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (anvรคnd \"git pull\" fรถr att slรฅ ihop fjรคrrgrenen med din egen)\n"
 
-#: remote.c:2247
+#: remote.c:2251
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "kan inte tolka fรถrvรคntat objektnamn \"%s\""
@@ -5547,7 +6307,7 @@ msgstr "felaktig ersรคttningsreferensnamn: %s"
 msgid "duplicate replace ref: %s"
 msgstr "duplicerat ersรคttningsreferensnamn: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "ersรคttningsdjupet fรถr hรถgt fรถr objektet %s"
@@ -5610,8 +6370,8 @@ msgstr "kan inte ta bort lรถs lรคnk \"%s\""
 msgid "Recorded preimage for '%s'"
 msgstr "Sparade fรถrhandsbild fรถr \"%s\""
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
@@ -5645,20 +6405,20 @@ msgstr "Glรถmde lรถsning fรถr \"%s\"\n"
 msgid "unable to open rr-cache directory"
 msgstr "kan inte uppdatera katalogen rr-cache"
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr "din nuvarande gren verkar vara trasig"
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "din nuvarande gren \"%s\" innehรฅller รคnnu inte nรฅgra incheckningar"
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent รคr inkompatibelt med --bisect"
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L stรถder รคnnu inte andra diff-format รคn -p och -s"
 
@@ -5680,29 +6440,29 @@ msgstr ""
 "Kroken \"%s\" ignorerades eftersom den inte รคr markerad som kรถrbar.\n"
 "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "ovรคntat flush-paket vid lรคsning av fjรคrruppackningsstatus"
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "kunde inte tolka fjรคrruppackningsstatus: %s"
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "fjรคrruppackning misslyckades: %s"
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr "misslyckades underteckna push-certifikatet"
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr "mottagarsidan stรถder inte push med --signed"
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5710,47 +6470,47 @@ msgstr ""
 "sรคnder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
 "signed"
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr "mottagarsidan stรถder inte push med --atomic"
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr "mottagarsidan stรถder inte push-flaggor"
 
-#: sequencer.c:187
+#: sequencer.c:191
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "felaktigt incheckningsmeddelandestรคdningslรคge \"%s\""
 
-#: sequencer.c:292
+#: sequencer.c:296
 #, c-format
 msgid "could not delete '%s'"
 msgstr "kunde inte ta bort \"%s\""
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "kunde inte ta bort \"%s\""
 
-#: sequencer.c:321
+#: sequencer.c:325
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:323
+#: sequencer.c:327
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:329
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:331
 #, c-format
 msgid "unknown action: %d"
 msgstr "okรคnd funktion: %d"
 
-#: sequencer.c:385
+#: sequencer.c:389
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5758,7 +6518,7 @@ msgstr ""
 "efter att ha lรถst konflikterna, markera de rรคttade sรถkvรคgarna\n"
 "med \"git add <sรถkvรคgar>\" eller \"git rm <sรถkvรคgar>\""
 
-#: sequencer.c:388
+#: sequencer.c:392
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5768,115 +6528,110 @@ msgstr ""
 "med \"git add <sรถkvรคgar>\" eller \"git rm <sรถkvรคgar>\"\n"
 "och checka in resultatet med \"git commit\""
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:405 sequencer.c:2901
 #, c-format
 msgid "could not lock '%s'"
 msgstr "kunde inte lรฅsa \"%s\""
 
-#: sequencer.c:408
+#: sequencer.c:412
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "kunde inte skriva radslut till \"%s\""
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "misslyckades fรคrdigstรคlla \"%s\""
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
 #, c-format
 msgid "could not read '%s'"
 msgstr "kunde inte lรคsa \"%s\""
 
-#: sequencer.c:462
+#: sequencer.c:466
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "dina lokala รคndringar skulle skrivas รถver av %s."
 
-#: sequencer.c:466
+#: sequencer.c:470
 msgid "commit your changes or stash them to proceed."
 msgstr "checka in dina รคndringar eller anvรคnd \"stash\" fรถr att fortsรคtta."
 
-#: sequencer.c:498
+#: sequencer.c:502
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: snabbspola"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Felaktigt stรคdningslรคge %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:635
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Kunde inte skriva ny indexfil"
 
-#: sequencer.c:649
+#: sequencer.c:652
 msgid "unable to update cache tree"
 msgstr "kan inte uppdatera cachetrรคd"
 
-#: sequencer.c:663
+#: sequencer.c:666
 msgid "could not resolve HEAD commit"
 msgstr "kunde inte bestรคmma HEAD:s incheckning"
 
-#: sequencer.c:743
+#: sequencer.c:746
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "ingen nyckel i  \"%.*s\""
 
-#: sequencer.c:754
+#: sequencer.c:757
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "kan inte ta bort citering av vรคrdet \"%s\""
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "kunde inte รถppna \"%s\" fรถr lรคsning"
 
-#: sequencer.c:801
+#: sequencer.c:804
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
 
-#: sequencer.c:806
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
 
-#: sequencer.c:811
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
 
-#: sequencer.c:815
+#: sequencer.c:818
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "okรคnd variabel \"%s\""
 
-#: sequencer.c:820
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "\"GIT_AUTHOR_NAME\" saknas"
 
-#: sequencer.c:822
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
 
-#: sequencer.c:824
+#: sequencer.c:827
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "\"GIT_AUTHOR_DATE\" saknas"
 
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "ogiltigt datumformat \"%s\" i \"%s\""
-
-#: sequencer.c:901
+#: sequencer.c:876
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5893,11 +6648,11 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 "du har kรถade รคndringar i din arbetskatalog.\n"
-"Om รคndringarna skall lรคggas in i fรถregรฅende incheckning, kรถr:\n"
+"Om รคndringarna ska lรคggas in i fรถregรฅende incheckning, kรถr:\n"
 "\n"
 "  git commit --amend %s\n"
 "\n"
-"Om de skall checkas in i en egen incheckning, kรถr:\n"
+"Om de ska checkas in i en egen incheckning, kรถr:\n"
 "\n"
 "  git commit %s\n"
 "\n"
@@ -5905,15 +6660,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr "skriver rotincheckning"
-
-#: sequencer.c:1216
+#: sequencer.c:1148
 msgid "'prepare-commit-msg' hook failed"
 msgstr "kroken \"prepare-commit-msg\" misslyckades"
 
-#: sequencer.c:1223
+#: sequencer.c:1154
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5940,7 +6691,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: sequencer.c:1167
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5965,327 +6716,326 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1209
 msgid "couldn't look up newly created commit"
 msgstr "kunde inte slรฅ upp en precis skapad incheckning"
 
-#: sequencer.c:1280
+#: sequencer.c:1211
 msgid "could not parse newly created commit"
 msgstr "kunde inte tolka en precis skapad incheckning"
 
-#: sequencer.c:1326
+#: sequencer.c:1257
 msgid "unable to resolve HEAD after creating commit"
 msgstr "kunde inte bestรคmma HEAD efter att ha skapat incheckning"
 
-#: sequencer.c:1328
+#: sequencer.c:1259
 msgid "detached HEAD"
 msgstr "frรฅnkopplad HEAD"
 
-#: sequencer.c:1332
+#: sequencer.c:1263
 msgid " (root-commit)"
 msgstr " (rotincheckning)"
 
-#: sequencer.c:1353
+#: sequencer.c:1284
 msgid "could not parse HEAD"
 msgstr "kunde inte tolka HEAD"
 
-#: sequencer.c:1355
+#: sequencer.c:1286
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s รคr inte en incheckning!"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
 msgid "could not parse HEAD commit"
 msgstr "kunde inte tolka HEAD:s incheckning"
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1342 sequencer.c:1968
 msgid "unable to parse commit author"
 msgstr "kunde inte tolka incheckningens fรถrfattare"
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree misslyckades skriva ett trรคd"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1386 sequencer.c:1447
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "kunde inte lรคsa incheckningsmeddelande frรฅn \"%s\""
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
 msgid "failed to write commit object"
 msgstr "kunde inte skriva incheckningsobjekt"
 
-#: sequencer.c:1526
+#: sequencer.c:1474
 #, c-format
 msgid "could not parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: sequencer.c:1531
+#: sequencer.c:1479
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "kunde inte tolka fรถrรคldraincheckningen %s"
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1562 sequencer.c:1673
 #, c-format
 msgid "unknown command: %d"
 msgstr "okรคnt kommando: %d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1620 sequencer.c:1645
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Det hรคr รคr en kombination av %d incheckningar."
 
-#: sequencer.c:1672
+#: sequencer.c:1630
 msgid "need a HEAD to fixup"
 msgstr "behรถver en HEAD-incheckning att rรคtta"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1632 sequencer.c:3212
 msgid "could not read HEAD"
 msgstr "kunde inte lรคsa HEAD"
 
-#: sequencer.c:1676
+#: sequencer.c:1634
 msgid "could not read HEAD's commit message"
 msgstr "kunde inte lรคsa HEAD:s incheckningsmeddelande"
 
-#: sequencer.c:1682
+#: sequencer.c:1640
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kan inte skriva \"%s\""
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "Det hรคr รคr 1:a incheckningsmeddelandet:"
 
-#: sequencer.c:1697
+#: sequencer.c:1655
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "kunde inte lรคsa incheckningsmeddelande fรถr %s"
 
-#: sequencer.c:1704
+#: sequencer.c:1662
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Det hรคr รคr incheckningsmeddelande %d:"
 
-#: sequencer.c:1710
+#: sequencer.c:1668
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Incheckningsmeddelande %d kommer hoppas รถver:"
 
-#: sequencer.c:1798
+#: sequencer.c:1756
 msgid "your index file is unmerged."
 msgstr "din indexfil har inte slagits ihop."
 
-#: sequencer.c:1805
+#: sequencer.c:1763
 msgid "cannot fixup root commit"
 msgstr "kan inte gรถra \"fixup\" pรฅ rotincheckning"
 
-#: sequencer.c:1824
+#: sequencer.c:1782
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "incheckning %s รคr en sammanslagning, men flaggan -m angavs inte."
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1790 sequencer.c:1798
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "incheckning %s har inte fรถrรคlder %d"
 
-#: sequencer.c:1846
+#: sequencer.c:1804
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "kan inte hรคmta incheckningsmeddelande fรถr %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1823
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kan inte tolka fรถrรคldraincheckningen %s"
 
-#: sequencer.c:1930
+#: sequencer.c:1888
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "kunde inte byta namn pรฅ \"%s\" till \"%s\""
 
-#: sequencer.c:1985
+#: sequencer.c:1943
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "kunde inte รฅngra %s... %s"
 
-#: sequencer.c:1986
+#: sequencer.c:1944
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "kunde inte tillรคmpa %s... %s"
 
-#: sequencer.c:2045
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "utelรคmnar %s %s -- patchinnehรฅllet finns redan uppstrรถms\n"
+
+#: sequencer.c:2018
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: misslyckades lรคsa indexet"
 
-#: sequencer.c:2052
+#: sequencer.c:2025
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: misslyckades uppdatera indexet"
 
-#: sequencer.c:2128
+#: sequencer.c:2102
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s tar inte argument: \"%s\""
 
-#: sequencer.c:2137
+#: sequencer.c:2111
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument saknas fรถr %s"
 
-#: sequencer.c:2174
+#: sequencer.c:2142
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "kunde inte tolka \"%.*s\""
+msgid "could not parse '%s'"
+msgstr "kunde inte tolka \"%s\""
 
-#: sequencer.c:2228
+#: sequencer.c:2203
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ogiltig rad %d: %.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2214
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "kan inte utfรถra \"%s\" utan en fรถregรฅende incheckning"
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "kunde inte lรคsa \"%s\"."
-
-#: sequencer.c:2323
+#: sequencer.c:2298
 msgid "cancelling a cherry picking in progress"
 msgstr "avbryter pรฅgรฅende \"cherry-pick\""
 
-#: sequencer.c:2330
+#: sequencer.c:2305
 msgid "cancelling a revert in progress"
 msgstr "avbryter pรฅgรฅende \"revert\""
 
-#: sequencer.c:2364
+#: sequencer.c:2349
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "rรคtta det med \"git rebase --edit-todo\"."
 
-#: sequencer.c:2366
+#: sequencer.c:2351
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "oanvรคndbart manus: \"%s\""
 
-#: sequencer.c:2371
+#: sequencer.c:2356
 msgid "no commits parsed."
 msgstr "inga incheckningar lรคstes."
 
-#: sequencer.c:2382
+#: sequencer.c:2367
 msgid "cannot cherry-pick during a revert."
 msgstr "kan inte utfรถra \"cherry-pick\" under en \"revert\"."
 
-#: sequencer.c:2384
+#: sequencer.c:2369
 msgid "cannot revert during a cherry-pick."
 msgstr "kan inte utfรถra \"revert\" under en \"cherry-pick\"."
 
-#: sequencer.c:2466
+#: sequencer.c:2447
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "felaktigt vรคrde fรถr %s: %s"
 
-#: sequencer.c:2553
+#: sequencer.c:2540
 msgid "unusable squash-onto"
 msgstr "oanvรคndbar squash-onto"
 
-#: sequencer.c:2569
+#: sequencer.c:2556
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "trasigt manus: \"%s\""
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2644 sequencer.c:4361
 msgid "empty commit set passed"
 msgstr "den angivna uppsรคttningen incheckningar รคr tom"
 
-#: sequencer.c:2668
+#: sequencer.c:2660
 msgid "revert is already in progress"
 msgstr "en \"revert\" pรฅgรฅr redan"
 
-#: sequencer.c:2670
+#: sequencer.c:2662
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2673
+#: sequencer.c:2665
 msgid "cherry-pick is already in progress"
 msgstr "en \"cherry-pick\" pรฅgรฅr redan"
 
-#: sequencer.c:2675
+#: sequencer.c:2667
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2689
+#: sequencer.c:2681
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
 
-#: sequencer.c:2704
+#: sequencer.c:2696
 msgid "could not lock HEAD"
 msgstr "kunde inte lรฅsa HEAD"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2756 sequencer.c:4099
 msgid "no cherry-pick or revert in progress"
 msgstr "ingen \"cherry-pick\" eller \"revert\" pรฅgรฅr"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2758 sequencer.c:2769
 msgid "cannot resolve HEAD"
 msgstr "kan inte bestรคmma HEAD"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2760 sequencer.c:2804
 msgid "cannot abort from a branch yet to be born"
 msgstr "kan inte avbryta frรฅn en gren som รคnnu inte รคr fรถdd"
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2790 builtin/grep.c:724
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kan inte รถppna \"%s\""
 
-#: sequencer.c:2800
+#: sequencer.c:2792
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "kan inte lรคsa \"%s\": %s"
 
-#: sequencer.c:2801
+#: sequencer.c:2793
 msgid "unexpected end of file"
 msgstr "ovรคntat filslut"
 
-#: sequencer.c:2807
+#: sequencer.c:2799
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "sparad HEAD-fil frรฅn fรถre \"cherry-pick\", \"%s\", รคr trasig"
 
-#: sequencer.c:2818
+#: sequencer.c:2810
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Du verkar ha flyttat HEAD.\n"
 "Spolar inte tillbaka, kontrollera HEAD!"
 
-#: sequencer.c:2859
+#: sequencer.c:2851
 msgid "no revert in progress"
 msgstr "ingen \"revers\" pรฅgรฅr"
 
-#: sequencer.c:2867
+#: sequencer.c:2859
 msgid "no cherry-pick in progress"
 msgstr "ingen \"cherry-pick\" pรฅgรฅr"
 
-#: sequencer.c:2877
+#: sequencer.c:2869
 msgid "failed to skip the commit"
 msgstr "kunde inte hoppa รถver incheckningen"
 
-#: sequencer.c:2884
+#: sequencer.c:2876
 msgid "there is nothing to skip"
 msgstr "ingenting att hoppa รถver"
 
-#: sequencer.c:2887
+#: sequencer.c:2879
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6294,21 +7044,21 @@ msgstr ""
 "har du redan checkat in?\n"
 "testa \"git %s --continue\""
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3003 sequencer.c:4011
 #, c-format
 msgid "could not update %s"
 msgstr "kunde inte uppdatera %s"
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3042 sequencer.c:3991
 msgid "cannot read HEAD"
 msgstr "kan inte lรคsa HEAD"
 
-#: sequencer.c:3066
+#: sequencer.c:3059
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "kan inte kopiera in \"%s\" till \"%s\""
 
-#: sequencer.c:3074
+#: sequencer.c:3067
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6327,27 +7077,22 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3077
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Kunde inte tillรคmpa %s... %.*s"
 
-#: sequencer.c:3091
+#: sequencer.c:3084
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Kunde inte slรฅ ihop %.*s"
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "kunde inte kopiera in \"%s\" till \"%s\""
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "kunde inte lรคsa indexet"
-
-#: sequencer.c:3136
+#: sequencer.c:3129
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6362,11 +7107,11 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3135
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "och gjorde รคndringar till indexet och/eller arbetskatalogen\n"
 
-#: sequencer.c:3148
+#: sequencer.c:3141
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6383,76 +7128,72 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3202
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "ogiltigt etikettnamn: \"%.*s\""
 
-#: sequencer.c:3263
+#: sequencer.c:3256
 msgid "writing fake root commit"
 msgstr "skriver fejkad rotincheckning"
 
-#: sequencer.c:3268
+#: sequencer.c:3261
 msgid "writing squash-onto"
 msgstr "skriver squash-onto"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "kunde inte hitta trรคdet fรถr %s."
 
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "kunde inte skriva indexet"
-
-#: sequencer.c:3351
+#: sequencer.c:3344
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "kunde inte upplรถsa \"%s\""
 
-#: sequencer.c:3379
+#: sequencer.c:3375
 msgid "cannot merge without a current revision"
 msgstr "kan inte slรฅ ihop utan en aktuell incheckning"
 
-#: sequencer.c:3401
+#: sequencer.c:3397
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "kan inte tolka \"%.*s\""
 
-#: sequencer.c:3410
+#: sequencer.c:3406
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "inget att slรฅ samman: \"%.*s\""
 
-#: sequencer.c:3422
+#: sequencer.c:3418
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "\"octopus\"-sammanslagning kan inte kรถras ovanpรฅ en [ny rot]"
 
-#: sequencer.c:3437
+#: sequencer.c:3434
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "kunde inte lรคsa incheckningsmeddelande fรถr \"%s\""
 
-#: sequencer.c:3590
+#: sequencer.c:3594
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "kunde inte ens fรถrsรถka slรฅ ihop \"%.*s\""
 
-#: sequencer.c:3606
+#: sequencer.c:3610
 msgid "merge: Unable to write new index file"
 msgstr "sammanslagning: Kunde inte skriva ny indexfil"
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3679 builtin/rebase.c:737
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Tillรคmpade autostash.\n"
 
-#: sequencer.c:3687
+#: sequencer.c:3691
 #, c-format
 msgid "cannot store %s"
 msgstr "kan inte spara %s"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6463,31 +7204,26 @@ msgstr ""
 "Dina รคndringar รคr sรคkra i stashen.\n"
 "Du kan nรคr som helst anvรคnda \"git stash pop\" eller \"git stash drop\".\n"
 
-#: sequencer.c:3751
-#, c-format
-msgid "could not checkout %s"
-msgstr "kunde inte checka ut %s"
-
-#: sequencer.c:3765
+#: sequencer.c:3755
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s: inte ett giltigt OID"
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "kunde inte koppla frรฅn HEAD"
 
-#: sequencer.c:3785
+#: sequencer.c:3775
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Stoppade pรฅ HEAD\n"
 
-#: sequencer.c:3787
+#: sequencer.c:3777
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Stoppade pรฅ %s\n"
 
-#: sequencer.c:3795
+#: sequencer.c:3785
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6508,48 +7244,48 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3877
+#: sequencer.c:3869
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Stoppade pรฅ %s... %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:3940
 #, c-format
 msgid "unknown command %d"
 msgstr "okรคnt kommando %d"
 
-#: sequencer.c:4003
+#: sequencer.c:3999
 msgid "could not read orig-head"
 msgstr "kunde inte lรคsa orig-head"
 
-#: sequencer.c:4008
+#: sequencer.c:4004
 msgid "could not read 'onto'"
 msgstr "kunde inte lรคsa \"onto\""
 
-#: sequencer.c:4022
+#: sequencer.c:4018
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "kunde inte uppdatera HEAD till %s"
 
-#: sequencer.c:4115
+#: sequencer.c:4111
 msgid "cannot rebase: You have unstaged changes."
 msgstr "kan inte ombasera: Du har okรถade รคndringar."
 
-#: sequencer.c:4124
+#: sequencer.c:4120
 msgid "cannot amend non-existing commit"
 msgstr "kan inte lรคgga till incheckning som inte finns"
 
-#: sequencer.c:4126
+#: sequencer.c:4122
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "ogiltig fil: \"%s\""
 
-#: sequencer.c:4128
+#: sequencer.c:4124
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "ogiltigt innehรฅll: \"%s\""
 
-#: sequencer.c:4131
+#: sequencer.c:4127
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6559,69 +7295,59 @@ msgstr ""
 "Du har รคndringar i arbetskatalogen som inte checkats in. Checka in dem\n"
 "fรถrst och kรถr sedan \"git rebase --continue\" igen."
 
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4163 sequencer.c:4202
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "kunde inte skriva fil: \"%s\""
 
-#: sequencer.c:4220
+#: sequencer.c:4217
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
 
-#: sequencer.c:4227
+#: sequencer.c:4224
 msgid "could not commit staged changes."
 msgstr "kunde inte checka in kรถade รคndringar."
 
-#: sequencer.c:4328
+#: sequencer.c:4338
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: kan inte gรถra \"cherry-pick\" pรฅ typen \"%s\""
 
-#: sequencer.c:4332
+#: sequencer.c:4342
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: felaktig revision"
 
-#: sequencer.c:4367
+#: sequencer.c:4377
 msgid "can't revert as initial commit"
 msgstr "kan inte รฅngra som fรถrsta incheckning"
 
-#: sequencer.c:4810
+#: sequencer.c:4846
 msgid "make_script: unhandled options"
 msgstr "make_script: flaggor som inte stรถds"
 
-#: sequencer.c:4813
+#: sequencer.c:4849
 msgid "make_script: error preparing revisions"
 msgstr "make_script: fel nรคr revisioner skulle fรถrberedas"
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Du kan rรคtta detta med \"git rebase --edit-todo\" fรถljt av \"git rebase --"
-"continue\".\n"
-"Avbryt ombaseringen med \"git rebase --abort\".\n"
-
 #: sequencer.c:5083 sequencer.c:5100
 msgid "nothing to do"
 msgstr "inget att gรถra"
 
-#: sequencer.c:5114
+#: sequencer.c:5119
 msgid "could not skip unnecessary pick commands"
 msgstr "kunde inte hoppa รถver onรถdiga \"pick\"-kommandon"
 
-#: sequencer.c:5197
+#: sequencer.c:5213
 msgid "the script was already rearranged."
 msgstr "skriptet har redan omordnats."
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "\"%s\" รคr utanfรถr arkivet"
+msgid "'%s' is outside repository at '%s'"
+msgstr "\"%s\" รคr utanfรถr arkivet pรฅ \"%s\""
 
-#: setup.c:173
+#: setup.c:175
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6631,7 +7357,7 @@ msgstr ""
 "Anvรคnd \"git <kommando> -- <sรถkvรคg>..\" fรถr att ange sรถkvรคgar som inte finns "
 "lokalt."
 
-#: setup.c:186
+#: setup.c:188
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6643,12 +7369,12 @@ msgstr ""
 "Anvรคnd \"--\" fรถr att skilja sรถkvรคgar frรฅn revisioner, sรฅ hรคr:\n"
 "\"git <kommando> [<revision>...] -- [<fil>...]\""
 
-#: setup.c:235
+#: setup.c:254
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "flaggan \"%s\" mรฅste anges fรถre argument som inte รคr flaggor"
 
-#: setup.c:254
+#: setup.c:273
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6659,92 +7385,92 @@ msgstr ""
 "Anvรคnd \"--\" fรถr att skilja sรถkvรคgar frรฅn revisioner, sรฅ hรคr:\n"
 "\"git <kommando> [<revision>...] -- [<fil>...]\""
 
-#: setup.c:390
+#: setup.c:409
 msgid "unable to set up work tree using invalid config"
 msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
 
-#: setup.c:394
+#: setup.c:413
 msgid "this operation must be run in a work tree"
 msgstr "funktionen mรฅste kรถras i en arbetskatalog"
 
-#: setup.c:540
+#: setup.c:559
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Fรถrvรคntade git-arkivversion <= %d, hittade %d"
 
-#: setup.c:548
+#: setup.c:567
 msgid "unknown repository extensions found:"
 msgstr "okรคnda arkivutรถkningar hittades:"
 
-#: setup.c:567
+#: setup.c:586
 #, c-format
 msgid "error opening '%s'"
 msgstr "fel vid รถppning av \"%s\""
 
-#: setup.c:569
+#: setup.c:588
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "fรถr stor fรถr att vara en .git-fil: \"%s\""
 
-#: setup.c:571
+#: setup.c:590
 #, c-format
 msgid "error reading %s"
 msgstr "fel vid lรคsning av %s"
 
-#: setup.c:573
+#: setup.c:592
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "ogiltigt gitfilformat: %s"
 
-#: setup.c:575
+#: setup.c:594
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "ingen sรถkvรคg i gitfil: %s"
 
-#: setup.c:577
+#: setup.c:596
 #, c-format
 msgid "not a git repository: %s"
 msgstr "inte ett git-arkiv: %s"
 
-#: setup.c:676
+#: setup.c:695
 #, c-format
 msgid "'$%s' too big"
 msgstr "\"$%s\" fรถr stor"
 
-#: setup.c:690
+#: setup.c:709
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "inte ett git-arkiv: \"%s\""
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:738 setup.c:740 setup.c:771
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "kan inte byta katalog (chdir) till \"%s\""
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
 msgid "cannot come back to cwd"
 msgstr "kan inte gรฅ tillbaka till arbetskatalogen (cwd)"
 
-#: setup.c:851
+#: setup.c:870
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "misslyckades ta status pรฅ \"%*ss%s%s\""
 
-#: setup.c:1083
+#: setup.c:1108
 msgid "Unable to read current working directory"
 msgstr "Kan inte lรคsa aktuell arbetskatalog"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1117 setup.c:1123
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "kan inte byta till \"%s\""
 
-#: setup.c:1103
+#: setup.c:1128
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "inte ett git-arkiv (eller nรฅgon av fรถrรคldrakatalogerna): %s"
 
-#: setup.c:1109
+#: setup.c:1134
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6754,7 +7480,7 @@ msgstr ""
 "monteringspunkten %s)\n"
 "Stoppar vid filsystemsgrรคns (GIT_DISCOVERY_ACROSS_FILESYSTEM รคr inte satt)."
 
-#: setup.c:1220
+#: setup.c:1245
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6763,283 +7489,283 @@ msgstr ""
 "problem med fillรคges-vรคrdet i core.sharedRepository (0%.3o).\n"
 "ร„garen av filerna mรฅste alltid ha lรคs- och skrivbehรถrighet."
 
-#: setup.c:1264
+#: setup.c:1289
 msgid "open /dev/null or dup failed"
 msgstr "misslyckades รถppna /dev/null eller \"dup\""
 
-#: setup.c:1279
+#: setup.c:1304
 msgid "fork failed"
 msgstr "\"fork\" misslyckades"
 
-#: setup.c:1284
+#: setup.c:1309
 msgid "setsid failed"
 msgstr "\"setsid\" misslyckades"
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
 
-#: sha1-file.c:504
+#: sha1-file.c:503
 #, c-format
 msgid "unable to normalize alternate object path: %s"
-msgstr "kunde inte normalisera alternativ objektsรถkvรคg: %s"
+msgstr "kunde inte normalisera supplerande objektsรถkvรคg: %s"
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignorerar alternativa objektlagringar, fรถr djup nรคstling"
+msgstr "%s: ignorerar supplerande objektlager, fรถr djup nรคstling"
 
-#: sha1-file.c:583
+#: sha1-file.c:582
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "kan inte normalisera objektkatalogen: %s"
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 msgid "unable to fdopen alternates lockfile"
-msgstr "kan inte utfรถra \"fdopen\" pรฅ lรฅsfil fรถr \"alternates\""
+msgstr "kan inte utfรถra \"fdopen\" pรฅ suppleantlรฅsfil"
 
-#: sha1-file.c:644
+#: sha1-file.c:643
 msgid "unable to read alternates file"
 msgstr "kan inte lรคsa \"alternates\"-filen"
 
-#: sha1-file.c:651
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
 msgstr "kan inte flytta ny \"alternates\"-fil pรฅ plats"
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "sรถkvรคgen \"%s\" finns inte"
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "referensarkivet \"%s\" som en lรคnkad utcheckning stรถds inte รคnnu."
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "referensarkivet \"%s\" รคr inte ett lokalt arkiv."
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "referensarkivet \"%s\" รคr grunt"
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "referensarkivet \"%s\" รคr ympat"
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
-msgstr "felaktig rad vid tolkning av alternativa referenser: %s"
+msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
 
 #: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "fรถrsรถk att utfรถra \"mmap\" pรฅ %<PRIuMAX> รถver grรคnsen %<PRIuMAX>"
 
-#: sha1-file.c:968
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr "mmap misslyckades"
 
-#: sha1-file.c:1132
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr "objektfilen %s รคr tom"
 
-#: sha1-file.c:1256 sha1-file.c:2395
+#: sha1-file.c:1263 sha1-file.c:2443
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "trasigt lรถst objekt \"%s\""
 
-#: sha1-file.c:1258 sha1-file.c:2399
+#: sha1-file.c:1265 sha1-file.c:2447
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "skrรคp i slutet av lรถst objekt \"%s\""
 
-#: sha1-file.c:1300
+#: sha1-file.c:1307
 msgid "invalid object type"
 msgstr "felaktig objekttyp"
 
-#: sha1-file.c:1384
+#: sha1-file.c:1391
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
 
-#: sha1-file.c:1387
+#: sha1-file.c:1394
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "kan inte packa upp %s-huvudet"
 
-#: sha1-file.c:1393
+#: sha1-file.c:1400
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
 
-#: sha1-file.c:1396
+#: sha1-file.c:1403
 #, c-format
 msgid "unable to parse %s header"
 msgstr "kan inte tolka %s-huvud"
 
-#: sha1-file.c:1587
+#: sha1-file.c:1629
 #, c-format
 msgid "failed to read object %s"
 msgstr "misslyckades lรคsa objektet %s"
 
-#: sha1-file.c:1591
+#: sha1-file.c:1633
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "ersรคttningen %s hittades inte fรถr %s"
 
-#: sha1-file.c:1595
+#: sha1-file.c:1637
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "lรถst objekt %s (lagrat i %s) รคr trasigt"
 
-#: sha1-file.c:1599
+#: sha1-file.c:1641
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "packat objekt %s (lagrat i %s) รคr trasigt"
 
-#: sha1-file.c:1702
+#: sha1-file.c:1746
 #, c-format
 msgid "unable to write file %s"
 msgstr "kunde inte skriva filen %s"
 
-#: sha1-file.c:1709
+#: sha1-file.c:1753
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "kan inte sรคtta behรถrigheten till \"%s\""
 
-#: sha1-file.c:1716
+#: sha1-file.c:1760
 msgid "file write error"
 msgstr "fel vid skrivning av fil"
 
-#: sha1-file.c:1735
+#: sha1-file.c:1780
 msgid "error when closing loose object file"
 msgstr "fel vid stรคngning av fil fรถr lรถst objekt"
 
-#: sha1-file.c:1800
+#: sha1-file.c:1845
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "otillrรคcklig behรถrighet fรถr att lรคgga till objekt till arkivdatabasen %s"
 
-#: sha1-file.c:1802
+#: sha1-file.c:1847
 msgid "unable to create temporary file"
 msgstr "kan inte skapa temporรคr fil"
 
-#: sha1-file.c:1826
+#: sha1-file.c:1871
 msgid "unable to write loose object file"
 msgstr "kunde inte skriva fil fรถr lรถst objekt"
 
-#: sha1-file.c:1832
+#: sha1-file.c:1877
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "kan inte utfรถra \"deflate\" pรฅ nytt objekt %s (%d)"
 
-#: sha1-file.c:1836
+#: sha1-file.c:1881
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "\"deflateend\" pรฅ objektet %s misslyckades (%d)"
 
-#: sha1-file.c:1840
+#: sha1-file.c:1885
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "fรถrvirrad av instabil objektkรคlldata fรถr %s"
 
-#: sha1-file.c:1850 builtin/pack-objects.c:920
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
 #, c-format
 msgid "failed utime() on %s"
 msgstr "\"utime()\" misslyckades pรฅ %s"
 
-#: sha1-file.c:1925
+#: sha1-file.c:1972
 #, c-format
 msgid "cannot read object for %s"
 msgstr "kan inte lรคsa objekt fรถr %s"
 
-#: sha1-file.c:1965
+#: sha1-file.c:2011
 msgid "corrupt commit"
 msgstr "trasik incheckning"
 
-#: sha1-file.c:1973
+#: sha1-file.c:2019
 msgid "corrupt tag"
 msgstr "trasig tagg"
 
-#: sha1-file.c:2072
+#: sha1-file.c:2119
 #, c-format
 msgid "read error while indexing %s"
 msgstr "lรคsfel vid indexering av %s"
 
-#: sha1-file.c:2075
+#: sha1-file.c:2122
 #, c-format
 msgid "short read while indexing %s"
 msgstr "fรถr lite lรคstes vid indexering av %s"
 
-#: sha1-file.c:2148 sha1-file.c:2157
+#: sha1-file.c:2195 sha1-file.c:2205
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: misslyckades lรคgga in i databasen"
 
-#: sha1-file.c:2163
+#: sha1-file.c:2211
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: filtypen stรถds ej"
 
-#: sha1-file.c:2187
+#: sha1-file.c:2235
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s รคr inte ett giltigt objekt"
 
-#: sha1-file.c:2189
+#: sha1-file.c:2237
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s รคr inte ett giltigt \"%s\"-objekt"
 
-#: sha1-file.c:2216 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "kan inte รถppna %s"
 
-#: sha1-file.c:2406 sha1-file.c:2458
+#: sha1-file.c:2454 sha1-file.c:2507
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "hash stรคmmer inte fรถr %s (fรถrvรคntade %s)"
 
-#: sha1-file.c:2430
+#: sha1-file.c:2478
 #, c-format
 msgid "unable to mmap %s"
 msgstr "kan inte utfรถra \"mmap\" fรถr %s"
 
-#: sha1-file.c:2435
+#: sha1-file.c:2483
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "kan inte packa upp huvud fรถr %s"
 
-#: sha1-file.c:2441
+#: sha1-file.c:2489
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "kan inte tolka huvud fรถr %s"
 
-#: sha1-file.c:2452
+#: sha1-file.c:2500
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "kan inte tolka innehรฅll i %s"
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "kort SHA1 %s รคr tvetydig"
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "Kandidaterna รคr:"
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7061,44 +7787,110 @@ msgstr ""
 "Undersรถk referenserna och ta kanske bort dem. Stรคng av meddelandet\n"
 "genom att kรถra \"git config advice.objectNameWarning false\""
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "loggen fรถr \"%.*s\" rรคcker bara tillbaka till %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "loggen fรถr \"%.*s\" har bara %d poster"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "Sรถkvรคgen \"%s\" finns pรฅ disken, men inte i \"%.*s\""
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"sรถkvรคgen \"%s\" finns, men inte i \"%s\"\n"
+"tips: Menade du \"%.*s:%s\", รคven kรคnd som \"%.*s:./%s\"?"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "sรถkvรคgen \"%s\" finns inte i \"%.*s\""
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"sรถkvรคgen \"%s\" finns i indexet men inte i etapp %d\n"
+"tips: Menade du \":%d:%s\"?"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"sรถkvรคgen \"%s\" finns i indexet, men inte i \"%s\"\n"
+"tips: Menade du \":%d:%s\", รคven kรคnd som \":%d:./%s\"?"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "sรถkvรคgen \"%s\" finns pรฅ disk, men inte i indexet"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "sรถkvรคgen \"%s\" finns inte (varken i disken eller i indexet)"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr "relativ sรถkvรคg kan inte anvรคndas utanfรถr arbetskatalogen"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "felaktigt objektnamn \"%.*s\"."
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:837
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u,%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:839
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u,%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:847
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u,%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:849
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u,%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:856
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u,%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u,%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:864
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7106,13 +7898,18 @@ msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:866
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/s"
 msgstr[1] "%u bytes/s"
 
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "kunde inte redigera \"%s\""
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7143,51 +7940,127 @@ msgstr "i ej utcheckad undermodul \"%s\""
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Sรถkvรคgsangivelsen \"%s\" รคr i undermodulen \"%.*s\""
 
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "felaktigt argument till --ignore-submodules: %s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Undermodulen i incheckning %s pรฅ sรถkvรคgen: \"%s\" krockar med en undermodul "
+"med samma namn. Hoppar รถver den."
+
 #: submodule.c:910
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "undermodulposten \"%s\" (%s) รคr en %s, inte en incheckning"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"kunde inte kรถra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
+"undermodulen \"%s\""
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "process fรถr undermodulen \"%s\" misslyckades"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Misslyckades slรฅ upp HEAD som giltig referens."
 
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Sรคnder undermodulen \"%s\"\n"
+
+#: submodule.c:1161
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "kunde inte komma รฅt undermodulen \"%s\""
+msgid "Unable to push submodule '%s'\n"
+msgstr "Kunde inte sรคnda undermodulen \"%s\"\n"
 
-#: submodule.c:1651
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Hรคmtar undermodulen %s%s\n"
+
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Kunde inte komma รฅt undermodulen \"%s\"\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Fel vid hรคmtning av undermodul:\n"
+"%s"
+
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "\"%s\" kรคnns inte igen som ett git-arkiv"
 
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "Kunde inte kรถra \"git status --porcelain=2\" i undermodulen \"%s\""
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
+
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "kunde inte kรถra \"git status\" i undermodulen \"%s\""
 
-#: submodule.c:1817
+#: submodule.c:1828
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Kunde inte ta bort instรคllningen core.worktree i undermodulen \"%s\""
 
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "kunde inte rekursera in i undermodulen \"%s\""
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "kunde inte รฅterstรคlla indexet i undermodul"
+
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "undermodulen \"%s\" har ett smutsigt index"
 
-#: submodule.c:1959
+#: submodule.c:1970
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Undermoduler \"%s\" kunde inte uppdateras."
 
-#: submodule.c:2007
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "undermodul-gitkatalogen \"%s\" รคr inuti gitkatalogen \"%.*s\""
+
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7195,12 +8068,17 @@ msgstr ""
 "relocate_gitdir fรถr undermodulen \"%s\", som har mer รคn en arbetskatalog, "
 "stรถds ej"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "kunde inte slรฅ upp namnet fรถr undermodulen \"%s\""
 
-#: submodule.c:2026
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "vรคgrar flytta \"%s\" till en befintlig gitkatalog"
+
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7211,40 +8089,35 @@ msgstr ""
 "\"%s\" till\n"
 "\"%s\"\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "kunde inte rekursera in i undermodulen \"%s\""
-
-#: submodule.c:2153
+#: submodule.c:2209
 msgid "could not start ls-files in .."
 msgstr "kunde inte starta ls-files i .."
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree returnerade en ovรคntad returkod %d"
 
-#: submodule-config.c:232
+#: submodule-config.c:236
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "ignorerar misstรคnkt undermodulnamn: %s"
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "negativa vรคrden รคr inte tillรฅtna fรถr submodule.fetchjobs"
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr "ogiltigt vรคrde fรถr %s"
 
-#: submodule-config.c:755
+#: submodule-config.c:765
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Kunde inte uppdatera .gitmodules-posten %s"
@@ -7260,7 +8133,7 @@ msgstr "misslyckades utfรถra \"trailer\"-kommandot \"%s\""
 msgid "unknown value '%s' for key '%s'"
 msgstr "okรคnt vรคrde \"%s\" fรถr nyckeln \"%s\""
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "mer รคn en %s"
@@ -7279,7 +8152,7 @@ msgstr "kunde inte lรคsa indatafilen \"%s\""
 msgid "could not read from stdin"
 msgstr "kunde inte lรคsa frรฅn standard in"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr "kunde inte ta status pรฅ %s"
@@ -7308,47 +8181,47 @@ msgstr "kunde inte byta namn pรฅ temporรคr fil till %s"
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Skulle sรคtta uppstrรถms fรถr \"%s\" till \"%s\" frรฅn \"%s\"\n"
 
-#: transport.c:142
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr "kunde inte lรคsa paketet (bundlen) \"%s\""
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: ogiltig flagga fรถr depth: \"%s\""
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "se protocol.version i \"git help config\" fรถr mer information"
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr "serverflaggor krรคver protokollversion 2 eller senare"
 
-#: transport.c:625
+#: transport.c:632
 msgid "could not parse transport.color.* config"
 msgstr "kunde inte tolka instรคllningen fรถr transport.color.*"
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr "stรถd fรถr protokoll v2 รคnnu ej implementerat"
 
-#: transport.c:825
+#: transport.c:831
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "okรคnt vรคrde fรถr instรคllningen \"%s\": %s"
 
-#: transport.c:891
+#: transport.c:897
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "transporten \"%s\" tillรฅts inte"
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync stรถds inte lรคngre"
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -7357,7 +8230,7 @@ msgstr ""
 "Fรถljande undermodulsรถkvรคgar innehรฅller รคndringar som\n"
 "inte kan hittas av fjรคrrarna:\n"
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -7384,32 +8257,32 @@ msgstr ""
 "fรถr att sรคnda dem till fjรคrren.\n"
 "\n"
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr "Avbryter."
 
-#: transport.c:1193
+#: transport.c:1201
 msgid "failed to push all needed submodules"
 msgstr "kunde inte sรคnda alla nรถdvรคndiga undermoduler"
 
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:657
 msgid "operation not supported by protocol"
 msgstr "funktionen stรถds inte av protokollet"
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 msgid "full write to remote helper failed"
 msgstr "komplett skrivning till fjรคrrhjรคlpare misslyckades"
 
-#: transport-helper.c:134
+#: transport-helper.c:144
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "kan inte hitta fjรคrrhjรคlpare fรถr \"%s\""
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:571
 msgid "can't dup helper output fd"
 msgstr "kunde inte duplicera utdata-filhandtag"
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7418,101 +8291,106 @@ msgstr ""
 "okรคnd krรคvd fรถrmรฅga (capability) %s; fjรคrrhjรคlparen behรถver antagligen en "
 "nyare version av Git"
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr ""
 "fjรคrrhjรคlparen behรถver implementera fรถrmรฅga fรถr referensspecifikationer "
 "(refspec)"
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:425
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s sade ovรคntat: \"%s\""
 
-#: transport-helper.c:403
+#: transport-helper.c:414
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s lรฅste ocksรฅ %s"
 
-#: transport-helper.c:481
+#: transport-helper.c:493
 msgid "couldn't run fast-import"
 msgstr "kunde inte kรถra fast-import"
 
-#: transport-helper.c:504
+#: transport-helper.c:516
 msgid "error while running fast-import"
 msgstr "fel nรคr fast-import kรถrdes"
 
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:545 transport-helper.c:1134
 #, c-format
 msgid "could not read ref %s"
 msgstr "kunde inte lรคsa referensen %s"
 
-#: transport-helper.c:578
+#: transport-helper.c:590
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "okรคnt svar pรฅ ansluntning: %s"
 
-#: transport-helper.c:600
+#: transport-helper.c:612
 msgid "setting remote service path not supported by protocol"
 msgstr "protkollet stรถder inte att sรคtta sรถkvรคg till fjรคrrtjรคnst"
 
-#: transport-helper.c:602
+#: transport-helper.c:614
 msgid "invalid remote service path"
 msgstr "felaktig sรถkvรคg till fjรคrrtjรคnst"
 
-#: transport-helper.c:648
+#: transport-helper.c:660
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "kan inte ansluta till undertjรคnsten %s"
 
-#: transport-helper.c:720
+#: transport-helper.c:736
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "fรถrvรคntade ok/error, hjรคlpprogrammet svarade \"%s\""
 
-#: transport-helper.c:773
+#: transport-helper.c:789
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "hjรคlparen returnerade ovรคntad status %s"
 
-#: transport-helper.c:834
+#: transport-helper.c:850
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "hjรคlparen %s stรถder inte dry-run"
 
-#: transport-helper.c:837
+#: transport-helper.c:853
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "hjรคlparen %s stรถder inte --signed"
 
-#: transport-helper.c:840
+#: transport-helper.c:856
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "hjรคlparen %s stรถder inte --signed=if-asked"
 
-#: transport-helper.c:847
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "hjรคlparen %s stรถder inte --atomic"
+
+#: transport-helper.c:867
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "hjรคlparen %s stรถder inte \"push-option\""
 
-#: transport-helper.c:945
+#: transport-helper.c:965
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "fjรคrrhjรคlparen stรถder inte push; referensspecifikation krรคvs"
 
-#: transport-helper.c:950
+#: transport-helper.c:970
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "hjรคlparen %s stรถder inte \"force\""
 
-#: transport-helper.c:997
+#: transport-helper.c:1017
 msgid "couldn't run fast-export"
 msgstr "kunde inte kรถra fast-export"
 
-#: transport-helper.c:1002
+#: transport-helper.c:1022
 msgid "error while running fast-export"
 msgstr "fel vid kรถrning av fast-export"
 
-#: transport-helper.c:1027
+#: transport-helper.c:1047
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -7521,67 +8399,67 @@ msgstr ""
 "Inga gemensamma referenser och inga angavs; gรถr inget.\n"
 "Du kanske borde ange en gren sรฅsom \"master\".\n"
 
-#: transport-helper.c:1091
+#: transport-helper.c:1120
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "felformat svar i referenslistan: %s"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1272
 #, c-format
 msgid "read(%s) failed"
 msgstr "lรคs(%s) misslyckades"
 
-#: transport-helper.c:1271
+#: transport-helper.c:1299
 #, c-format
 msgid "write(%s) failed"
 msgstr "skriv(%s) misslyckades"
 
-#: transport-helper.c:1320
+#: transport-helper.c:1348
 #, c-format
 msgid "%s thread failed"
 msgstr "%s-trรฅden misslyckades"
 
-#: transport-helper.c:1324
+#: transport-helper.c:1352
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s-trรฅden misslyckades ansluta: %s"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1371 transport-helper.c:1375
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "kan inte starta trรฅd fรถr kopiering av data: %s"
 
-#: transport-helper.c:1384
+#: transport-helper.c:1412
 #, c-format
 msgid "%s process failed to wait"
 msgstr "processen %s misslyckades vรคnta"
 
-#: transport-helper.c:1388
+#: transport-helper.c:1416
 #, c-format
 msgid "%s process failed"
 msgstr "processen %s misslyckades"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1434 transport-helper.c:1443
 msgid "can't start thread for copying data"
 msgstr "kan inte skapa trรฅd fรถr kopiering av data"
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "trรคdobjekt fรถr kort"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "felformat lรคge i trรคdpost"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "tomt filnamn i trรคdpost"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "trรคdfil fรถr kort"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7590,7 +8468,7 @@ msgstr ""
 "Dina lokala รคndringar av fรถljande filer skulle skrivas รถver av utcheckning:\n"
 "%%sChecka in dina รคndringar eller anvรคnd \"stash\" innan du byter gren."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7599,7 +8477,7 @@ msgstr ""
 "Dina lokala รคndringar av fรถljande filer skulle skrivas รถver av utcheckning:\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7609,7 +8487,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%sChecka in dina รคndringar eller anvรคnd \"stash\" innan du byter gren."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7619,7 +8497,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7628,7 +8506,7 @@ msgstr ""
 "Dina lokala รคndringar av fรถljande filer skulle skrivas รถver av \"%s\":\n"
 "%%sChecka in dina รคndringar eller anvรคnd \"stash\" innan du \"%s\"."
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7637,7 +8515,7 @@ msgstr ""
 "Dina lokala รคndringar av fรถljande filer skulle skrivas รถver av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7647,7 +8525,7 @@ msgstr ""
 "dem:\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7656,7 +8534,7 @@ msgstr ""
 "Fรถljande ospรฅrade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7665,7 +8543,7 @@ msgstr ""
 "Fรถljande ospรฅrade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7675,7 +8553,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du slรฅr samman."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7685,7 +8563,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7694,7 +8572,7 @@ msgstr ""
 "Fรถljande ospรฅrade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
 "%%sFlytta eller ta bort dem innan du \"%s\"."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7703,7 +8581,7 @@ msgstr ""
 "Fรถljande ospรฅrade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7714,7 +8592,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7725,7 +8603,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7735,7 +8613,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7745,7 +8623,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7754,7 +8632,7 @@ msgstr ""
 "Fรถljande ospรฅrade filer i arbetskatalogen skulle skrivas รถver av \"%s\":\n"
 "%%sFlytta eller ta bort dem innan du \"%s\"."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7763,12 +8641,12 @@ msgstr ""
 "Fรถljande ospรฅrade filer i arbetskatalogen skulle skrivas รถver av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Posten \"%s\" รถverlappar \"%s\". Kan inte binda."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -7777,7 +8655,7 @@ msgstr ""
 "Kan inte uppdatera gles utcheckning: fรถljande poster รคr inte ร  jour:\n"
 "%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -7788,7 +8666,7 @@ msgstr ""
 "utcheckning:\n"
 "%s"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -7799,7 +8677,7 @@ msgstr ""
 "utcheckning:\n"
 "%s"
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -7808,16 +8686,16 @@ msgstr ""
 "Kan inte uppdatera undermodul:\n"
 "%s"
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr "Avbryter\n"
 
-#: unpack-trees.c:318
+#: unpack-trees.c:317
 msgid "Updating files"
 msgstr "Uppdaterar filer"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -7827,6 +8705,10 @@ msgstr ""
 "sรถkvรคgar pรฅ ett okรคnsligt filsystem) och endast en frรฅn samma\n"
 "kollisionsgrupp finns i arbetskatalogen:\n"
 
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "Uppdaterar indexflaggor"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
@@ -7856,47 +8738,51 @@ msgstr "felaktigt portnummer"
 msgid "invalid '..' path segment"
 msgstr "felaktigt \"..\"-sรถkvรคgssegment"
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Hรคmtar objekt"
+
+#: worktree.c:259 builtin/am.c:2099
 #, c-format
 msgid "failed to read '%s'"
 msgstr "misslyckades lรคsa \"%s\""
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "\"%s\" i huvudarbetskatalogen รคr inte arkivkatalogen"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "filen \"%s\" innehรฅller inte absolut sรถkvรคg till arbetskatalogen"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "\"%s\" finns inte"
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "\"%s\" รคr inte en .git-fil, felkod %d"
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "\"%s\" pekar inte tillbaka till \"%s\""
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "kunde inte รถppna \"%s\" fรถr lรคsning och skrivning"
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr "kan inte komma รฅt \"%s\""
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr "kan inte hรคmta aktuell arbetskatalog"
 
@@ -7942,12 +8828,12 @@ msgstr "ร„ndringar ej i incheckningskรถn:"
 #: wt-status.c:238
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
-"  (anvรคnd \"git add <fil>...\" fรถr att uppdatera vad som skall checkas in)"
+"  (anvรคnd \"git add <fil>...\" fรถr att uppdatera vad som ska checkas in)"
 
 #: wt-status.c:240
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
-"  (anvรคnd \"git add/rm <fil>...\" fรถr att uppdatera vad som skall checkas in)"
+"  (anvรคnd \"git add/rm <fil>...\" fรถr att uppdatera vad som ska checkas in)"
 
 #: wt-status.c:241
 msgid ""
@@ -7965,7 +8851,7 @@ msgstr ""
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
-"  (anvรคnd \"git %s <fil>...\" fรถr att ta med i det som skall checkas in)"
+"  (anvรคnd \"git %s <fil>...\" fรถr att ta med i det som ska checkas in)"
 
 #: wt-status.c:268
 msgid "both deleted:"
@@ -8232,83 +9118,91 @@ msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  (alla konflikter rรคttade: kรถr \"git cherry-pick --continue\")"
 
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (anvรคnd \"git cherry-pick --skip\" fรถr att hoppa รถver patchen)"
+
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (anvรคnd \"git cherry-pick --abort\" fรถr att avbryta \"cherry-pick\"-"
 "operationen)"
 
-#: wt-status.c:1447
+#: wt-status.c:1449
 msgid "Revert currently in progress."
 msgstr "ร…ngring pรฅgรฅr."
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Du hรฅller pรฅ med att รฅngra incheckningen %s."
 
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (rรคtta konflikter och kรถr sedan \"git revert --continue\")"
 
-#: wt-status.c:1459
+#: wt-status.c:1461
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (kรถr \"git revert --continue\" fรถr att fortsรคtta)"
 
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (alla konflikter rรคttade: kรถr \"git revert --continue\")"
 
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (anvรคnd \"git revert --skip\" fรถr att hoppa รถver patchen)"
+
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (anvรคnd \"git revert --abort\" fรถr att avbryta รฅngrandet)"
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Du hรฅller pรฅ med en \"bisect\", startad frรฅn grenen \"%s\"."
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr "Du hรฅller pรฅ med en \"bisect\"."
 
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (anvรคnd \"git bisect reset\" fรถr att komma tillbaka till ursprungsgrenen)"
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr "Pรฅ grenen "
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr "interaktiv ombasering pรฅgรฅr; ovanpรฅ "
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr "ombasering pรฅgรฅr; ovanpรฅ "
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr "Inte pรฅ nรฅgon gren fรถr nรคrvarande."
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr "Fรถrsta incheckning"
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
 msgstr "Inga incheckningar รคnnu"
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr "Ospรฅrade filer"
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr "Ignorerade filer"
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8320,32 +9214,32 @@ msgstr ""
 "lรคgga till nya filer sjรคlv (se \"git help status\")."
 
 # %s รคr nรคsta strรคng eller tom.
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Ospรฅrade filer visas ej%s"
 
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr " (anvรคnd flaggan -u fรถr att visa ospรฅrade filer)"
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr "Inga รคndringar"
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "inga รคndringar att checka in (anvรคnd \"git add\" och/eller \"git commit -a"
 "\")\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "inga รคndringar att checka in\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8354,186 +9248,195 @@ msgstr ""
 "inget kรถat fรถr incheckning, men ospรฅrade filer finns (spรฅra med \"git add"
 "\")\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "inget kรถat fรถr incheckning, men ospรฅrade filer finns\n"
 
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "inget att checka in (skapa/kopiera filer och spรฅra med \"git add\")\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr "inget att checka in\n"
 
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "inget att checka in (anvรคnd -u fรถr att visa ospรฅrade filer)\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "inget att checka in, arbetskatalogen ren\n"
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr "Inga incheckningar รคnnu pรฅ "
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr "HEAD (ingen gren)"
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr "olika"
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr "efter "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr "fรถre "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "kan inte %s: Du har okรถade รคndringar."
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr "dessutom innehรฅller dit index รคndringar som inte har checkats in."
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "kan inte %s: Ditt index innehรฅller รคndringar som inte checkats in."
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "misslyckades ta bort lรคnken \"%s\""
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<flaggor>] [--] <sรถkvรคg>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff-status %c fรถrvรคntades inte"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
 msgid "updating files failed"
 msgstr "misslyckades uppdatera filer"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "ta bort \"%s\"\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Okรถade รคndringar efter att ha uppdaterat indexet:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:266 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr "Kunde inte lรคsa indexet"
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Kunde inte รถppna \"%s\" fรถr skrivning."
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr "Kunde inte skriva patch"
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr "redigering av patch misslyckades"
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Kunde inte ta status pรฅ \"%s\""
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr "Tom patch. Avbryter."
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Kunde inte tillรคmpa \"%s\""
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Fรถljande sรถkvรคgar ignoreras av en av dina .gitignore-filer:\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "testkรถrning"
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr "plocka interaktivt"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr "vรคlj stycken interaktivt"
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr "redigera aktuell diff och applicera"
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr "tillรฅt lรคgga till annars ignorerade filer"
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr "uppdatera spรฅrade filer"
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "รฅternormalisera radslut i spรฅrade filer (implicerar -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr "registrera endast att sรถkvรคgen kommer lรคggas till senare"
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr "lรคgg till รคndringar frรฅn alla spรฅrade och ospรฅrade filer"
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "ignorera sรถkvรคgar borttagna i arbetskatalogen (samma som --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr "lรคgg inte till, uppdatera endast indexet"
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr "hoppa bara รถver filer som inte kan lรคggas till pรฅ grund av fel"
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "se om - รคven saknade - filer ignoreras i testkรถrning"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "รถverstyr exekveringsbiten fรถr angivna filer"
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr "varna nรคr ett inbyggt arkiv lรคggs till"
 
-#: builtin/add.c:326
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "bakรคnda fรถr \"git stash -p\""
+
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8564,150 +9467,174 @@ msgstr ""
 "\n"
 "Se \"git help submodule\" fรถr ytterligare information."
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "lรคgger till inbรคddat git-arkiv: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Anvรคnd -f om du verkligen vill lรคgga till dem.\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Anvรคnd -f om du verkligen vill lรคgga till dem.\n"
+"Slรฅ av detta meddelande med\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr "misslyckades lรคgga till filer"
 
-#: builtin/add.c:419
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file รคr inkompatibelt med --interactive/--patch"
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file รคr inkompatibelt med --edit"
+
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr "-A och -u รคr รถmsesidigt inkompatibla"
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Flaggan --ignore-missing kan endast anvรคndas tillsammans med --dry-run"
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod-parametern \"%s\" mรฅste antingen vara -x eller +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--pathspec-from-file รคr inkompatibelt med sรถkvรคgsangivelsesparametrar"
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul krรคver --pathspec-from-file"
+
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Inget angivet, inget tillagt.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Kanske menade du att skriva \"git add .\"?\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"Tรคnkte du kanske sรคga \"git add .\"?\n"
+"Slรฅ av detta meddelande genom att kรถra\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "kunde inte tolka fรถrfattarskript"
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "\"%s\" togs bort av kroken applypatch-msg"
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Felaktig indatarad: \"%s\"."
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Misslyckades kopiera anteckningar frรฅn \"%s\" till \"%s\""
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "\"fseek\" misslyckades"
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "kunde inte tolka patchen \"%s\""
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Endast en StGIT-patchserie kan tillรคmpas รฅt gรฅngen"
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "ogiltig tidsstรคmpel"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "ogiltig \"Date\"-rad"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "ogiltig tidszons-offset"
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "Misslyckades detektera patchformat."
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "misslyckades skapa katalogen \"%s\""
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "Misslyckades dela patchar."
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "kan inte skriva indexfil"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Nรคr du har lรถst problemet, kรถr \"%s --continue\"."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Om du hellre vill hoppa รถver patchen, kรถr \"%s --skip\" i stรคllet."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Fรถr att รฅtergรฅ till ursprunglig gren och sluta patcha, kรถr \"%s --abort\"."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Patch sรคnd med format=flowed; blanksteg pรฅ slut av rader kan ha tappats."
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "Patchen รคr tom."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "ogiltig ident-rad: %.*s"
+msgid "missing author line in commit %s"
+msgstr "saknad \"author\"-rad i incheckningen %s"
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "kunde inte tolka incheckningen %s"
+msgid "invalid ident line: %.*s"
+msgstr "ogiltig ident-rad: %.*s"
 
-#: builtin/am.c:1496
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Arkivet saknar objekt som behรถvs fรถr att falla tillbaka pรฅ 3-"
 "vรคgssammanslagning."
 
-#: builtin/am.c:1498
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Anvรคnder indexinfo fรถr att รฅterskapa ett bastrรคd..."
 
-#: builtin/am.c:1517
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8715,25 +9642,25 @@ msgstr ""
 "Har du handredigerat din patch?\n"
 "Den kan inte tillรคmpas pรฅ blobbar som antecknats i dess index."
 
-#: builtin/am.c:1523
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 "Faller tillbaka pรฅ att patcha grundversionen och trevรคgssammanslagning..."
 
-#: builtin/am.c:1549
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "Misslyckades slรฅ ihop รคndringarna."
 
-#: builtin/am.c:1581
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "tillรคmpar pรฅ en tom historik"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "kan inte รฅteruppta: %s finns inte."
 
-#: builtin/am.c:1650
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr "Incheckningskroppen รคr:"
 
@@ -8741,36 +9668,41 @@ msgstr "Incheckningskroppen รคr:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Tillรคmpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
 
-#: builtin/am.c:1710
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "kan inte skriva indexfil"
+
+#: builtin/am.c:1704
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Smutsigt index: kan inte tillรคmpa patchar (smutsiga: %s)"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1744 builtin/am.c:1812
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Tillรคmpar: %.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1761
 msgid "No changes -- Patch already applied."
 msgstr "Inga รคndringar -- Patchen har redan tillรคmpats."
 
-#: builtin/am.c:1773
+#: builtin/am.c:1767
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch misslyckades pรฅ %s %.*s"
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
-"Anvรคnd \"git am --show-current-patch\" fรถr att se patchen som misslyckades"
+"Anvรคnd \"git am --show-current-patch=diff\" fรถr att se patchen som "
+"misslyckades"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1815
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -8780,7 +9712,7 @@ msgstr ""
 "Om det inte รคr nรฅgot kvar att kรถa kan det hรคnda att nรฅgot annat redan\n"
 "introducerat samma รคndringar; kanske du bรถr hoppa รถver patchen."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1822
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -8792,17 +9724,17 @@ msgstr ""
 "lรถsta.\n"
 "Du kan kรถra \"git rm\" fรถr att godta \"borttagen av dem\" fรถr den."
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Kan inte tolka objektet \"%s\"."
 
-#: builtin/am.c:1987
+#: builtin/am.c:1981
 msgid "failed to clean index"
 msgstr "misslyckades stรคda upp indexet"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2025
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -8810,143 +9742,153 @@ msgstr ""
 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
 "ร…terstรคller inte till ORIG_HEAD"
 
-#: builtin/am.c:2128
+#: builtin/am.c:2132
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Felaktigt vรคrde fรถr --patch-format: %s"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Felaktigt vรคrde fรถr --show-current-patch: %s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s รคr inkompatibelt med --show-current-patch=%s"
+
+#: builtin/am.c:2207
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2208
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2214
 msgid "run interactively"
 msgstr "kรถr interaktivt"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2216
 msgid "historical option -- no-op"
 msgstr "historisk flagga -- no-op"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2218
 msgid "allow fall back on 3way merging if needed"
 msgstr "tillรฅt falla tillbaka pรฅ trevรคgssammanslagning om nรถdvรคndigt"
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:307 builtin/stash.c:806
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
 msgid "be quiet"
 msgstr "var tyst"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2221
 msgid "add a Signed-off-by line to the commit message"
 msgstr "lรคgg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2224
 msgid "recode into utf8 (default)"
 msgstr "koda om till utf8 (standard)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2226
 msgid "pass -k flag to git-mailinfo"
 msgstr "sรคnd flaggan -k till git-mailinfo"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2228
 msgid "pass -b flag to git-mailinfo"
 msgstr "sรคnd flaggan -b till git-mailinfo"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2230
 msgid "pass -m flag to git-mailinfo"
 msgstr "sรคnd flaggan -m till git-mailinfo"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2232
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "sรคnd flaggan --keep-cr till git-mailsplit fรถr mbox-formatet"
 
-#: builtin/am.c:2192
+#: builtin/am.c:2235
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "sรคnd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2238
 msgid "strip everything before a scissors line"
 msgstr "ta bort allting fรถre en saxlinje"
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
 msgid "pass it through git-apply"
 msgstr "sรคnd det genom git-apply"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2264
 msgid "format the patch(es) are in"
 msgstr "format fรถr patch(ar)"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2270
 msgid "override error message when patch failure occurs"
 msgstr "รถverstyr felmeddelanden nรคr patchfel uppstรฅr"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2272
 msgid "continue applying patches after resolving a conflict"
 msgstr "fortsรคtt applicera patchar efter att ha lรถst en konflikt"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2275
 msgid "synonyms for --continue"
 msgstr "synonymer till --continue"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2278
 msgid "skip the current patch"
 msgstr "hoppa รถver den aktuella grenen"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2281
 msgid "restore the original branch and abort the patching operation."
 msgstr "รฅterstรคll originalgrenen och avbryt patchningen."
 
-#: builtin/am.c:2241
+#: builtin/am.c:2284
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "avbryt patchningen men behรฅll HEAD dรคr det รคr."
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
-msgstr "visa patchen som tillรคmpas."
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "visa patchen som tillรคmpas"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2293
 msgid "lie about committer date"
 msgstr "ljug om incheckningsdatum"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2295
 msgid "use current timestamp for author date"
 msgstr "anvรคnd nuvarande tidsstรคmpel fรถr fรถrfattardatum"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr "nyckel-id"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
 msgid "GPG-sign commits"
 msgstr "GPG-signera incheckningar"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2301
 msgid "(internal use for git-rebase)"
 msgstr "(anvรคnds internt av git-rebase)"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2319
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -8954,16 +9896,16 @@ msgstr ""
 "Flaggan -b/--binary har varit utan funktion lรคnge, och\n"
 "kommer tas bort. Vi ber dig att inte anvรคnda den lรคngre."
 
-#: builtin/am.c:2281
+#: builtin/am.c:2326
 msgid "failed to read the index"
 msgstr "misslyckades lรคsa indexet"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2341
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
 
-#: builtin/am.c:2320
+#: builtin/am.c:2365
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -8972,11 +9914,11 @@ msgstr ""
 "Kvarbliven katalog %s hittades.\n"
 "Anvรคnd \"git am --abort\" fรถr att ta bort den."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2371
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Lรถsningsoperation pรฅgรฅr inte, vi รฅterupptar inte."
 
-#: builtin/am.c:2336
+#: builtin/am.c:2381
 msgid "interactive mode requires patches on the command line"
 msgstr "interaktivt lรคge krรคver patchar pรฅ kommandoraden"
 
@@ -9100,7 +10042,7 @@ msgstr "Vi utfรถr ingen bisect fรถr tillfรคllet.\n"
 msgid "'%s' is not a valid commit"
 msgstr "\"%s\" รคr inte en giltig incheckning"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9108,27 +10050,27 @@ msgstr ""
 "Kunde inte checka ut original-HEAD \"%s\". Fรถrsรถk \"git bisect reset "
 "<incheckning>\"."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Felaktigt argument till bisect_write: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "kan inte lรคsa oid fรถr referensen \"%s\""
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "kunde inte รถppna filen \"%s\""
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Ogiltigt kommando: du utfรถr just nu en \"bisect\" med %s/%s."
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9137,7 +10079,7 @@ msgstr ""
 "Du mรฅste ange รฅtminstone en %s och en %s version.\n"
 "(Du kan anvรคnda \"git bisect %s\" och \"git bisect %s\" fรถr detta.)"
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9148,7 +10090,7 @@ msgstr ""
 "Du mรฅste sedan ange รฅtminstone en %s och en %s version.\n"
 "(Du kan anvรคnda \"git bisect %s\" och \"git bisect %s\" fรถr detta.)"
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:310
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "utfรถr bisect med endast en %s incheckning"
@@ -9157,15 +10099,15 @@ msgstr "utfรถr bisect med endast en %s incheckning"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr "ร„r du sรคker [Y=ja/N=nej]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr "inga termer angivna"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:382
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9174,7 +10116,7 @@ msgstr ""
 "Aktuella termer รคr %s fรถr det gamla tillstรฅndet\n"
 "och %s fรถr det nya tillstรฅndet.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:392
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9183,267 +10125,264 @@ msgstr ""
 "ogiltigt argument %s fรถr \"git bisect terms\".\n"
 "Flaggor som stรถds รคr: --term-good|--term-old och --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:478
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "okรคnd flagga: %s"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:482
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "\"%s\" verkar inte vara en giltig revision"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:514
 msgid "bad HEAD - I need a HEAD"
 msgstr "felaktigt HEAD - Jag behรถver ett HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:529
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr "misslyckades checka ut \"%s\". Fรถrsรถk \"git bisect reset <giltig_gren>\"."
+msgstr ""
+"misslyckades checka ut \"%s\". Fรถrsรถk \"git bisect reset <giltig_gren>\"."
 
 # cogito-relaterat
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "kรถr inte \"bisect\" pรฅ trรคd dรคr \"cg-seek\" anvรคnts"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:553
 msgid "bad HEAD - strange symbolic ref"
 msgstr "felaktigt HEAD - konstig symbolisk referens"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:577
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ogiltig referens: \"%s\""
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr "utfรถr 'git bisect next'"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "skriv termerna i .git/BISECT_TERMS"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr "stรคdar upp bisect-tillstรฅnd"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr "kontrollera fรถr fรถrvรคntade versioner"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:641
 msgid "reset the bisection state"
 msgstr "รฅterstรคll bisect-tillstรฅnd"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:643
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "skriver bisect-tillstรฅndet i BISECT_LOG"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:645
 msgid "check and set terms in a bisection state"
 msgstr "visa och ange termer fรถr bisect-tillstรฅnd"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:647
 msgid "check whether bad or good terms exist"
 msgstr "se efter om termer fรถr rรคtt och fel finns"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:649
 msgid "print out the bisect terms"
 msgstr "skriv ut termer fรถr bisect"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:651
 msgid "start the bisect session"
 msgstr "pรฅbรถrja bisect-kรถrningen"
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "uppdatera BISECT_HEAD istรคllet fรถr att checka ut aktuell incheckning"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:655
 msgid "no log for BISECT_WRITE"
 msgstr "ingen logg fรถr BISECT_WRITE"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms krรคver tvรฅ argument"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state tar inga argument"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:684
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset krรคver antingen inget argument eller en incheckning"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:688
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write krรคver antingen 4 eller 5 argument"
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:694
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--check-and-set-terms krรคver tre argument"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:700
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check krรคver 2 eller 3 argument"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:706
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms krรคver noll eller ett argument"
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, c-format
 msgid "expecting a color: %s"
 msgstr "fรถrvรคntade en fรคrg: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr "mรฅste sluta med en fรคrg"
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "felaktig fรคrg \"%s\" i color.blame.repeatedLines"
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 msgid "invalid value for blame.coloring"
 msgstr "ogiltigt vรคrde fรถr blame.coloring"
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "kan inte hitta revision %s att ignorera"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Visa klandringsposter nรคr vi hittar dem, interaktivt"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Visa blank SHA-1 fรถr grรคnsincheckningar (Standard: av)"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Behandla inte rotincheckningar som grรคnser (Standard: av)"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr "Visa statistik รถver arbetskostnad"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr "Tvinga fรถrloppsrapportering"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr "Visa utdatapoรคng fรถr klandringsposter"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr "Visa originalfilnamn (Standard: auto)"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr "Visa ursprungligt radnummer (Standard: av)"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr "Visa i ett format avsett fรถr maskinkonsumtion"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Anvรคnd samma utdatalรคge som git-annotate (Standard: av)"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr "Visa rรฅ tidsstรคmpel (Standard: av)"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Visa lรฅng inchecknings-SHA1 (Standard: av)"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Undertryck fรถrfattarnamn och tidsstรคmpel (Standard: av)"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr "Visa fรถrfattarens e-post istรคllet fรถr namn (Standard: av)"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr "Ignorera รคndringar i blanksteg"
 
-#: builtin/blame.c:861 builtin/log.c:1646
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 msgid "Ignore <rev> when blaming"
 msgstr "ignorera <rev> vid klandren"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 msgid "Ignore revisions from <file>"
 msgstr "ignorera revisioner frรฅn <fil>"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr "fรคrglรคgg redundant metadata frรฅn tidigare rader annorlunda"
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr "fรคrglรคgg rader efter รฅlder"
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Anvรคnd en experimentell algoritm fรถr att fรถrbรคttra diffar"
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr "Slรถsa extra cykler med att hitta bรคttre trรคff"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Anvรคnd revisioner frรฅn <fil> istรคllet fรถr att anropa git-rev-list"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "Anvรคnd <fil>s innehรฅll som slutgiltig bild"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "poรคng"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr "Hitta kopierade rader inuti och mellan filer"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr "Hitta flyttade rader inuti och mellan filer"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr "Behandla endast radintervallet n,m, med bรถrjan pรฅ 1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress kan inte anvรคndas med --incremental eller porslinsformat"
 
@@ -9455,18 +10394,18 @@ msgstr "--progress kan inte anvรคndas med --incremental eller porslinsformat"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "4 รฅr, 11 mรฅnader sedan"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "filen %s har bara %lu rad"
 msgstr[1] "filen %s har bara %lu rader"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr "Klandra rader"
 
@@ -9676,7 +10615,7 @@ msgstr "stรคll in spรฅrningslรคge (se git-pull(1))"
 msgid "do not use"
 msgstr "anvรคnd ej"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:513
 msgid "upstream"
 msgstr "uppstrรถms"
 
@@ -9685,8 +10624,8 @@ msgid "change the upstream info"
 msgstr "รคndra uppstrรถmsinformationen"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Ta bort uppstrรถmsinformationen"
+msgid "unset the upstream info"
+msgstr "ta bort uppstrรถmsinformationen"
 
 #: builtin/branch.c:628
 msgid "use colored output"
@@ -9783,11 +10722,11 @@ msgid "sorting and filtering are case insensitive"
 msgstr "sortering och filtrering skiljer gemener och VERSALER"
 
 #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
-#: builtin/verify-tag.c:39
+#: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format att anvรคnda fรถr utdata"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:785
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD hittades inte under refs/heads!"
 
@@ -9876,20 +10815,65 @@ msgstr ""
 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Anvรคnd --track "
 "eller --set-upstream-to istรคllet."
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr "%s รคr okej\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<flaggor>] <fil> <git-rev-list-flaggor>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<flaggor>] <fil>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <fil> [<refnamn>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <fil> [<refnamn>...]"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "visa inte fรถrloppsindikator"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "visa fรถrloppsindikator"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr "visa fรถrloppsindikator under objektskrivningsfasen"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "som --all-progress nรคr fรถrloppsindikatorn visas"
+
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "Behรถver ett arkiv fรถr att skapa ett paket (bundle)."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "visa inte paketdetaljer"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s รคr okej\n"
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "Behรถver ett arkiv fรถr att packa upp ett paket (bundle)."
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr "var pratsam; mรฅste skrivas fรถre ett underkommando"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Okรคnt underkommando: %s"
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -9897,7 +10881,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <typ> | --textconv | --filters) [--path=<sรถkvรคg>] <objekt>"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -9905,72 +10889,72 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 msgid "only one batch option may be specified"
 msgstr "endast en buntflagga kan anges"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<typ> kan vara en av: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr "visa objekttyp"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr "visa objektstorlek"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr "avsluta med noll nรคr det inte uppstรฅtt nรฅgot fel"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr "visa objektets innehรฅll snyggt"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr "fรถr blob-objekt, kรถr filter pรฅ objektets innehรฅll"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr "fรถr blob-objekt, kรถr filger pรฅ objektets innehรฅll"
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:1002
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr "anvรคnd specifik sรถkvรคg fรถr --textconv/--filters"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "lรฅter -s och -t att fungera med trasiga/sรถnderskrivna objekt"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr "buffra utdata frรฅn --batch"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr "visa information och innehรฅll fรถr objekt som listas pรฅ standard in"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr "visa information fรถr objekt som listas pรฅ standard in"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "fรถlj symboliska lรคnkar i trรคdet (anvรคnd med --batch eller --batch-check)"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr "visa alla objekt med --batch eller --batch-check"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr "ordna inte --batch-all-objects output"
 
@@ -9998,8 +10982,8 @@ msgstr "lรคs filnamn frรฅn standard in"
 msgid "terminate input and output records by a NUL character"
 msgstr "avsluta in- och utdataposter med NUL-tecken"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
 msgid "suppress progress reporting"
 msgstr "undertryck fรถrloppsrapportering"
 
@@ -10011,27 +10995,27 @@ msgstr "visa indatasรถkvรคgar som inte trรคffas"
 msgid "ignore index when checking"
 msgstr "ignorera index vid kontroll"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "kan inte ange sรถkvรคgsnamn med --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z kan endast anvรคndas tillsammans med --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "ingen sรถkvรคg angavs"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet kan endast anvรคndas med ett enkelt sรถkvรคgsnamn"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "kan inte anvรคnda bรฅde --quiet och --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching รคr endast giltig med --verbose"
 
@@ -10089,9 +11073,9 @@ msgid "write the content to temporary files"
 msgstr "skriv innehรฅll till temporรคra filer"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
 msgid "string"
 msgstr "strรคng"
 
@@ -10119,98 +11103,98 @@ msgstr "git switch [<flaggor>] [<gren>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "sรถkvรคgen \"%s\" har inte vรฅr version"
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "sรถkvรคgen \"%s\" har inte deras version"
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "sรถkvรคgen \"%s\" innehรฅller inte alla nรถdvรคndiga versioner"
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "sรถkvรคgen \"%s\" innehรฅller inte nรถdvรคndiga versioner"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "sรถkvรคg \"%s\": kan inte slรฅ ihop"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Kunde inte lรคgga till sammanslagningsresultat fรถr \"%s\""
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "ร…terskapade %d sammanslagningskonflikt"
 msgstr[1] "ร…terskapade %d sammanslagningskonflikter"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "Uppdaterade %d sรถkvรคg frรฅn %s"
 msgstr[1] "Uppdaterade %d sรถkvรคgar frรฅn %s"
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:389
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "Uppdaterade %d sรถkvรคg frรฅn indexet"
 msgstr[1] "Uppdaterade %d sรถkvรคgar frรฅn indexet"
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "\"%s\" kan inte anvรคndas vid uppdatering av sรถkvรคgar"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "\"%s\" kan inte anvรคndas med %s"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Kan inte uppdatera sรถkvรคgar och vรคxla till grenen \"%s\" samtidigt."
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "varken \"%s\" eller \"%s\" har angivits"
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "\"%s\" mรฅste anvรคndas nรคr \"%s\" inte anges"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "\"%s\" eller \"%s\" kan inte anvรคndas med %s"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "sรถkvรคgen \"%s\" har inte slagits ihop"
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
 msgid "you need to resolve your current index first"
 msgstr "du mรฅste lรถsa ditt befintliga index fรถrst"
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:734
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10219,55 +11203,50 @@ msgstr ""
 "kan inte fortsรคtta med kรถade รคndringar i fรถljande filer:\n"
 "%s"
 
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr "kรถade รคndringar i fรถljande filer kan gรฅ fรถrlorade: %s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:837
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kan inte skapa referenslogg fรถr \"%s\": %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:879
 msgid "HEAD is now at"
 msgstr "HEAD รคr nu pรฅ"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:883 builtin/clone.c:717
 msgid "unable to update HEAD"
 msgstr "kan inte uppdatera HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:887
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "ร…terstรคll gren \"%s\"\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Redan pรฅ \"%s\"\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:894
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Vรคxlade till och nollstรคllde grenen \"%s\"\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:896 builtin/checkout.c:1320
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Vรคxlade till en ny gren \"%s\"\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:898
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Vรคxlade till grenen \"%s\"\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:949
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... och %d till.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:955
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10290,7 +11269,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:974
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10317,28 +11296,19 @@ msgstr[1] ""
 " git branch <nytt_grennamn> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1009
 msgid "internal error in revision walk"
 msgstr "internt fel vid genomgรฅng av revisioner (revision walk)"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1013
 msgid "Previous HEAD position was"
 msgstr "Tidigare position fรถr HEAD var"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
 msgid "You are on a branch yet to be born"
 msgstr "Du รคr pรฅ en gren som รคnnu inte รคr fรถdd"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "endast en referens fรถrvรคntades"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "endast en referens fรถrvรคntades, %d gavs."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1128
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10347,37 +11317,71 @@ msgstr ""
 "\"%s\" kan vara bรฅde en lokal fil och en spรฅrande gren.\n"
 "Anvรคnd -- (och mรถjligen --no-guess) fรถr att gรถra otvetydig"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Om du menade checka ut en spรฅrad fjรคrrgren pรฅ t.ex \"origin\", kan du\n"
+"gรถra det genom att ange hela namnet med flaggan --track:\n"
+"\n"
+"    git checkout --track origin/<namn>\n"
+"\n"
+"Om du alltid vill att utcheckningar med tvetydiga <namn> ska\n"
+"fรถredra en fjรคrr, t.ex fjรคrren \"origin\" kan du stรคlla in\n"
+"checkout.defaultRemote=origin i din konfiguration."
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "\"%s\" motsvarar flera (%d) spรฅrade fjรคrrgrenar"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "endast en referens fรถrvรคntades"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "endast en referens fรถrvรคntades, %d gavs."
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
 #, c-format
 msgid "invalid reference: %s"
 msgstr "felaktig referens: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referensen รคr inte ett trรคd: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1334
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "fรถrvรคntade gren, fick taggen \"%s\""
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1336
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "fรถrvรคntade gren, fick fjรคrrgrenen \"%s\""
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "fรถrvรคntade gren, fick \"%s\""
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1340
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "fรถrvรคntade gren, fick incheckningen \"%s\""
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1356
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10385,7 +11389,7 @@ msgstr ""
 "kan inte vรคxla gren vid sammanslagning\n"
 "ร–vervรคg \"git merge --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1360
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10393,7 +11397,7 @@ msgstr ""
 "kan inte vรคxla gren mitt i en \"am\"-kรถrning\n"
 "ร–vervรคg \"git am --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1364
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10401,7 +11405,7 @@ msgstr ""
 "kan inte vรคxla gren vid ombasering\n"
 "ร–vervรคg \"git rebase --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1368
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10409,7 +11413,7 @@ msgstr ""
 "kan inte vรคxla gren i en \"cherry-pick\"\n"
 "ร–vervรคg \"git cherry-pick --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1372
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10417,138 +11421,144 @@ msgstr ""
 "kan inte vรคxla gren i en \"revert\"\n"
 "ร–vervรคg \"git revert --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1376
 msgid "you are switching branch while bisecting"
 msgstr "dรฅ vรคxlar grenar medan du gรถr en \"bisect\""
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1383
 msgid "paths cannot be used with switching branches"
 msgstr "sรถkvรคgar kan inte anvรคndas vid byte av gren"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "\"%s\" kan inte anvรคndas vid byte av gren"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "\"%s\" kan inte anvรคndas med \"%s\""
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1411
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "\"%s\" kan inte ta <startpunkt>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1419
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kan inte vรคxla gren till icke-incheckningen \"%s\""
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1426
 msgid "missing branch or commit argument"
 msgstr "saknar gren- eller incheckingsargument"
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "tvinga fรถrloppsrapportering"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1469
 msgid "perform a 3-way merge with the new branch"
 msgstr "utfรถr en 3-vรคgssammanslagning fรถr den nya grenen"
 
-#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1471
 msgid "conflict style (merge or diff3)"
 msgstr "konfliktstil (merge eller diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1483 builtin/worktree.c:496
 msgid "detach HEAD at named commit"
 msgstr "koppla frรฅn HEAD vid namngiven incheckning"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1484
 msgid "set upstream info for new branch"
 msgstr "sรคtt uppstrรถmsinformation fรถr ny gren"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1486
 msgid "force checkout (throw away local modifications)"
 msgstr "tvinga utcheckning (kasta bort lokala รคndringar)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new-branch"
 msgstr "ny-gren"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new unparented branch"
 msgstr "ny gren utan fรถrรคlder"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
 msgid "update ignored files (default)"
 msgstr "uppdatera ignorerade filer (standard)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1493
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "kontrollera inte om en annan arbetskatalog hรฅller den angivna referensen"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1506
 msgid "checkout our version for unmerged files"
 msgstr "checka ut vรฅr version fรถr ej sammanslagna filer"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1509
 msgid "checkout their version for unmerged files"
 msgstr "checka ut deras version fรถr ej sammanslagna filer"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1513
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "begrรคnsa inte sรถkvรคgar till endast glesa poster"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B och --orphan รคr รถmsesidigt uteslutande"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1568
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p och --overlay รคr รถmsesidigt uteslutande"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1605
 msgid "--track needs a branch name"
 msgstr "--track behรถver ett namn pรฅ en gren"
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1610
 msgid "missing branch name; try -b"
 msgstr "grennamn saknas; fรถrsรถk med -b"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1642
 #, c-format
 msgid "could not resolve %s"
 msgstr "kunde inte upplรถsa %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "du mรฅste ange katalog(er) att รฅterstรคlla"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
 msgid "invalid path specification"
 msgstr "felaktig sรถkvรคgsangivelse"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "\"%s\" รคr inte en incheckning och grenen \"%s\" kan inte skapas frรฅn den"
+msgstr ""
+"\"%s\" รคr inte en incheckning och grenen \"%s\" kan inte skapas frรฅn den"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach tar inte en sรถkvรคg som argument \"%s\""
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file รคr inkompatibelt med --detach"
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file รคr inkompatibelt med --patch"
+
+#: builtin/checkout.c:1692
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10556,94 +11566,69 @@ msgstr ""
 "git checkout: --ours/--theirs, --force och --merge รคr inkompatibla nรคr\n"
 "du checkar ut frรฅn indexet."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"\"%s\" motsvarar mer รคn en spรฅrad fjรคrrgren.\n"
-"Vi hittade %d fjรคrrar med en motsvarande referens. Sรฅ vi fรถrรถsรถkte\n"
-"istรคllet tolka argumentet som en sรถkvรคg, men misslyckades ocksรฅ dรคr!\n"
-"\n"
-"Om du menade checka ut en spรฅrad fjรคrrgren pรฅ t.ex \"origin\", kan du\n"
-"gรถra det genom att ange hela namnet med flaggan --track:\n"
-"\n"
-"    git checkout --track origin/<namn>\n"
-"\n"
-"Om du alltid vill att utcheckningar med tvetydiga <namn> skall\n"
-"fรถredra en fjรคrr, t.ex fjรคrren \"origin\" kan du stรคlla in\n"
-"checkout.defaultRemote=origin i din konfiguration."
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "du mรฅste ange katalog(er) att รฅterstรคlla"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
 msgid "branch"
 msgstr "gren"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1724
 msgid "create and checkout a new branch"
 msgstr "skapa och checka ut en ny gren"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1726
 msgid "create/reset and checkout a branch"
 msgstr "skapa/nollstรคll och checka ut en gren"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1727
 msgid "create reflog for new branch"
 msgstr "skapa reflogg fรถr ny gren"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1729
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "fรถrutspรฅ \"git checkout <gren-saknas>\" (fรถrval)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1730
 msgid "use overlay mode (default)"
 msgstr "anvรคnd รถverlรคggslรคge (standard)"
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1775
 msgid "create and switch to a new branch"
 msgstr "skapa och vรคxla till en ny gren"
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1777
 msgid "create/reset and switch to a branch"
 msgstr "skapa/nollstรคll och vรคxla till en gren"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1779
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "fรถrutspรฅ \"git checkout <gren-saknas>\""
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1781
 msgid "throw away local modifications"
 msgstr "kasta bort lokala รคndringar"
 
-#: builtin/checkout.c:1772
-msgid "where the checkout from"
-msgstr "kรคlla till utcheckning"
+#: builtin/checkout.c:1813
+msgid "which tree-ish to checkout from"
+msgstr "vilken trรคd-igt att checka ut frรฅn"
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1815
 msgid "restore the index"
 msgstr "รฅterstรคll indexet"
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1817
 msgid "restore the working tree (default)"
 msgstr "รฅterstรคll arbetskatalogen (fรถrval)"
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1819
 msgid "ignore unmerged entries"
 msgstr "ignorera ej sammanslagna poster"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
 msgid "use overlay mode"
 msgstr "anvรคnd รถverlรคggslรคge"
 
@@ -10684,7 +11669,7 @@ msgstr "misslyckades ta bort %s"
 msgid "could not lstat %s\n"
 msgstr "kunde inte ta status (\"lstat\") pรฅ %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10697,7 +11682,7 @@ msgstr ""
 "foo        - markera post baserad pรฅ unikt prefix\n"
 "           - (tomt) markera ingenting\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10718,38 +11703,33 @@ msgstr ""
 "*          - vรคlj alla poster\n"
 "           - (tomt) avsluta markering\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Vadรฅ (%s)?\n"
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ange ignoreringsmรถnster>>"
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "VARNING: Hittar inte poster som motsvarar: %s"
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Vรคlj poster att ta bort"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Ta bort %s [Y=ja / N=nej]? "
 
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Hej dรฅ.\n"
-
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10767,64 +11747,56 @@ msgstr ""
 "help                - denna skรคrm\n"
 "?                   - hjรคlp fรถr kommandoval"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Kommandon ***"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Vad nu"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Skulle ta bort fรถljande post:"
 msgstr[1] "Skulle ta bort fรถljande poster:"
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Inga fler filer att stรคda, avslutar."
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "skriv inte ut namn pรฅ borttagna filer"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr "tvinga"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "stรคda interaktivt"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "ta bort hela kataloger"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "mรถnster"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "lรคgg till <mรถnster> till ignoreringsregler"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "ta รคven bort ignorerade filer"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "ta endast bort ignorerade filer"
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x och -X kan inte anvรคndas samtidigt"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -10832,7 +11804,7 @@ msgstr ""
 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vรคgrar "
 "stรคda"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -10840,7 +11812,7 @@ msgstr ""
 "clean.requireForce har standardvรคrdet true och varken -i, -n eller -f "
 "angavs; vรคgrar stรคda"
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
 
@@ -10888,18 +11860,18 @@ msgstr "mallkatalog"
 msgid "directory from which templates will be used"
 msgstr "katalog att anvรคnda mallar frรฅn"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr "referensarkiv"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr "anvรคnd --reference endast under kloningen"
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3308 builtin/repack.c:330
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
 msgid "name"
 msgstr "namn"
 
@@ -10915,8 +11887,8 @@ msgstr "checka ut <gren> istรคllet fรถr fjรคrrens HEAD"
 msgid "path to git-upload-pack on the remote"
 msgstr "sรถkvรคg till git-upload-pack pรฅ fjรคrren"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
 msgid "depth"
 msgstr "djup"
 
@@ -10924,7 +11896,7 @@ msgstr "djup"
 msgid "create a shallow clone of that depth"
 msgstr "skapa en grund klon pรฅ detta djup"
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
 msgid "time"
 msgstr "tid"
 
@@ -10932,16 +11904,17 @@ msgstr "tid"
 msgid "create a shallow clone since a specific time"
 msgstr "skapa en grund klon frรฅn en angiven tidpunkt"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
 msgid "revision"
 msgstr "revision"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "fรถrdjupa historik fรถr grund klon, exkludera revisionen"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr "klona endast en gren, HEAD eller --branch"
 
@@ -10969,25 +11942,25 @@ msgstr "nyckel=vรคrde"
 msgid "set config inside the new repository"
 msgstr "stรคll in konfiguration i det nya arkivet"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "serverspecifik"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr ""
 "inget att checka in\n"
 "flagga att sรคnda"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr "anvรคnd endast IPv4-adresser"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr "anvรคnd endast IPv6-adresser"
 
@@ -10995,7 +11968,11 @@ msgstr "anvรคnd endast IPv6-adresser"
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "klonade undermoduler kommer anvรคnda sin fjรคrrspรฅrningsgren"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten"
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11003,47 +11980,42 @@ msgstr ""
 "Kunde inte gissa katalognamn.\n"
 "Ange en katalog pรฅ kommandoraden"
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
-msgstr "info: Kan inte skapa alternativ fรถr \"%s\": %s\n"
+msgstr "info: Kan inte skapa suppleant fรถr \"%s\": %s\n"
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s finns och รคr ingen katalog"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "misslyckades starta iterator รถver \"%s\""
 
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "misslyckades ta bort lรคnken \"%s\""
-
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "misslyckades skapa lรคnken \"%s\""
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "misslyckades kopiera filen till \"%s\""
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "misslyckades iterera รถver \"%s\""
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr "klart.\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11053,133 +12025,137 @@ msgstr ""
 "Du kan inspektera det som checkades ut med \"git status\"\n"
 "och fรถrsรถka med \"git restore -source=HEAD :/\"\n"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Kunde inte hitta fjรคrrgrenen %s fรถr att klona."
 
-#: builtin/clone.c:702
+#: builtin/clone.c:705
 #, c-format
 msgid "unable to update %s"
 msgstr "kan inte uppdatera %s"
 
-#: builtin/clone.c:752
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "misslyckades initiera sparse-checkout"
+
+#: builtin/clone.c:776
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "HEAD hos fjรคrren pekar pรฅ en obefintlig referens, kan inte checka ut.\n"
 
-#: builtin/clone.c:783
+#: builtin/clone.c:807
 msgid "unable to checkout working tree"
 msgstr "kunde inte checka ut arbetskatalogen"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:862
 msgid "unable to write parameters to config file"
 msgstr "kunde inte skriva parametrar till konfigurationsfilen"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:925
 msgid "cannot repack to clean up"
 msgstr "kan inte packa om fรถr att stรคda upp"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:927
 msgid "cannot unlink temporary alternates file"
 msgstr "kunde inte ta bort temporรคr \"alternates\"-fil"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
 msgid "Too many arguments."
 msgstr "Fรถr mรฅnga argument."
 
-#: builtin/clone.c:942
+#: builtin/clone.c:969
 msgid "You must specify a repository to clone."
 msgstr "Du mรฅste ange ett arkiv att klona."
 
-#: builtin/clone.c:955
+#: builtin/clone.c:982
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "flaggorna --bare och --origin %s รคr inkompatibla."
 
-#: builtin/clone.c:958
+#: builtin/clone.c:985
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "flaggorna --bare och --separate-git-dir รคr inkompatibla."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:998
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "arkivet \"%s\" finns inte"
 
-#: builtin/clone.c:977 builtin/fetch.c:1653
+#: builtin/clone.c:1004 builtin/fetch.c:1796
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "djupet %s รคr inte ett positivt tal"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1014
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "destinationssรถkvรคgen \"%s\" finns redan och รคr inte en tom katalog."
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1024
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "arbetstrรคdet \"%s\" finns redan."
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "kunde inte skapa inledande kataloger fรถr \"%s\""
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1044
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "kunde inte skapa arbetskatalogen \"%s\""
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1064
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klonar till ett naket arkiv \"%s\"...\n"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1066
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonar till \"%s\"...\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1090
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 "clone --recursive รคr inte kompatibel med --reference och --reference-if-able"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1154
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth ignoreras i lokala kloningar; anvรคnd file:// istรคllet."
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1156
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since ignoreras i lokala kloningar; anvรคnd file:// istรคllet."
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1158
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude ignoreras i lokala kloningar; anvรคnd file:// istรคllet."
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1160
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter ignoreras i lokala kloningar; anvรคnd file:// istรคllet."
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1163
 msgid "source repository is shallow, ignoring --local"
 msgstr "kรคllarkivet รคr grunt, ignorerar --local"
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1168
 msgid "--local is ignored"
 msgstr "--local ignoreras"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1243 builtin/clone.c:1251
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Fjรคrrgrenen %s hittades inte i uppstrรถmsarkivet %s"
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1254
 msgid "You appear to have cloned an empty repository."
 msgstr "Du verkar ha klonat ett tomt arkiv."
 
@@ -11228,7 +12204,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "duplicerad fรถrรคlder %s ignorerades"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, c-format
 msgid "not a valid object name %s"
 msgstr "objektnamnet รคr inte giltigt: %s"
@@ -11256,13 +12232,13 @@ msgstr "fรถrรคlder"
 msgid "id of a parent commit object"
 msgstr "id pรฅ ett fรถrรคlderincheckningsobjekt"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
 #: builtin/tag.c:412
 msgid "message"
 msgstr "meddelande"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
 msgid "commit message"
 msgstr "incheckningsmeddelande"
 
@@ -11270,8 +12246,8 @@ msgstr "incheckningsmeddelande"
 msgid "read commit log message from file"
 msgstr "lรคs incheckningsloggmeddelande frรฅn fil"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "GPG-signera incheckning"
 
@@ -11345,57 +12321,65 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "misslyckades packa upp HEAD:s trรคdobjekt"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file med -a ger ingen mening"
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "Du mรฅste ange sรถkvรคgar tillsammans med --include/--only."
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr "kunde inte skapa temporรคr indexfil"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:385
 msgid "interactive add failed"
 msgstr "interaktiv tillรคggning misslyckades"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:400
 msgid "unable to update temporary index"
 msgstr "kan inte uppdatera temporรคrt index"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:402
 msgid "Failed to update main cache tree"
 msgstr "Misslyckades uppdatera huvud-cachetrรคdet"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
 msgid "unable to write new_index file"
 msgstr "kunde inte skriva filen new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:479
 msgid "cannot do a partial commit during a merge."
 msgstr "kan inte utfรถra en delvis incheckning under en sammanslagning."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:481
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "kan inte utfรถra en delvis incheckning under en cherry-pick."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:489
 msgid "cannot read the index"
 msgstr "kan inte lรคsa indexet"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:508
 msgid "unable to write temporary index file"
 msgstr "kunde inte skriva temporรคr indexfil"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:606
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "incheckningen \"%s\" saknar fรถrfattarhuvud"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:608
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "incheckningen \"%s\" har felformaterat fรถrfattarhuvud"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:627
 msgid "malformed --author parameter"
 msgstr "felformad \"--author\"-flagga"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:680
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11403,38 +12387,38 @@ msgstr ""
 "kunde inte vรคlja ett kommentarstecken som inte anvรคnts\n"
 "i det befintliga incheckningsmeddelandet"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "kunde inte slรฅ upp incheckningen %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lรคser loggmeddelande frรฅn standard in)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:732
 msgid "could not read log from standard input"
 msgstr "kunde inte lรคsa logg frรฅn standard in"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:736
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "kunde inte lรคsa loggfilen \"%s\""
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:767 builtin/commit.c:783
 msgid "could not read SQUASH_MSG"
 msgstr "kunde inte lรคsa SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:774
 msgid "could not read MERGE_MSG"
 msgstr "kunde inte lรคsa MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:834
 msgid "could not write commit template"
 msgstr "kunde inte skriva incheckningsmall"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:853
 #, c-format
 msgid ""
 "\n"
@@ -11449,7 +12433,7 @@ msgstr ""
 "\t%s\n"
 "och fรถrsรถker igen.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:858
 #, c-format
 msgid ""
 "\n"
@@ -11464,7 +12448,7 @@ msgstr ""
 "\t%s\n"
 "och fรถrsรถker igen.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:871
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11474,7 +12458,7 @@ msgstr ""
 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
 "incheckningen.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:879
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11485,144 +12469,140 @@ msgstr ""
 "med \"%c\" kommer behรฅllas; du kan sjรคlv ta bort dem om du vill.\n"
 "Ett tomt meddelande avbryter incheckningen.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:896
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sFรถrfattare: %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:904
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:      %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:911
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sIncheckare: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:929
 msgid "Cannot read index"
 msgstr "Kan inte lรคsa indexet"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "Fel vid byggande av trรคd"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' รคr inte 'Namn <epost>' och matchar ingen befintlig fรถrfattare"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ogiltigt ignorerat lรคge \"%s\""
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1327
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ogiltigt lรคge fรถr ospรฅrade filer: \"%s\""
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "--long och -z รคr inkompatibla"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Kan inte anvรคnda bรฅde --reset-author och --author"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "Du har inget att utรถka."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Du รคr i mitten av en sammanslagning -- kan inte utรถka."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Du รคr i mitten av en cherry-pick -- kan inte utรถka."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1188
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Flaggorna --squash och --fixup kan inte anvรคndas samtidigt"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1198
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Endast en av -c/-C/-F/--fixup kan anvรคndas."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1200
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1208
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author kan endast anvรคndas med -C, -c eller --amend."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1225
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Endast en av --include/--only/--all/--interactive/--patch kan anvรคndas."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "Du mรฅste ange sรถkvรคgar tillsammans med --include/--only."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1231
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "sรถkvรคgarna \"%s ...\" med -a ger ingen mening"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1362 builtin/commit.c:1524
 msgid "show status concisely"
 msgstr "visa koncis status"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1364 builtin/commit.c:1526
 msgid "show branch information"
 msgstr "visa information om gren"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1366
 msgid "show stash information"
 msgstr "visa information om stash"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1368 builtin/commit.c:1528
 msgid "compute full ahead/behind values"
 msgstr "berรคkna fullstรคndiga fรถre-/efter-vรคrden"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1370
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
 msgid "machine-readable output"
 msgstr "maskinlรคsbar utdata"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1373 builtin/commit.c:1532
 msgid "show status in long format (default)"
 msgstr "visa status i lรฅngt format (standard)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1376 builtin/commit.c:1535
 msgid "terminate entries with NUL"
 msgstr "terminera poster med NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
 msgid "mode"
 msgstr "lรคge"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1379 builtin/commit.c:1538
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "visa ospรฅrade filer, valfria lรคgen: all, normal, no. (Standard: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1383
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11630,11 +12610,11 @@ msgstr ""
 "visa ignorerade filer, valfria lรคgen: traditional, matching, no (Standard: "
 "traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1385 parse-options.h:192
 msgid "when"
 msgstr "nรคr"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1386
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11642,172 +12622,172 @@ msgstr ""
 "ignorera รคndringar i undermoduler, valfritt nรคr: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1388
 msgid "list untracked files in columns"
 msgstr "visa ospรฅrade filer i spalter"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1389
 msgid "do not detect renames"
 msgstr "detektera inte namnรคndringar"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1391
 msgid "detect renames, optionally set similarity index"
 msgstr "detektera namnรคndringar, mรถjligen sรคtt likhetsindex"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1411
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "Kombinationen av argument fรถr ignorerade och ospรฅrade filer stรถds ej"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "suppress summary after successful commit"
 msgstr "undertryck sammanfattning efter framgรฅngsrik incheckning"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1495
 msgid "show diff in commit message template"
 msgstr "visa diff i mallen fรถr incheckningsmeddelandet"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1497
 msgid "Commit message options"
 msgstr "Alternativ fรถr incheckningsmeddelande"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
 msgid "read message from file"
 msgstr "lรคs meddelande frรฅn fil"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "author"
 msgstr "fรถrfattare"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "override author for commit"
 msgstr "รถverstyr fรถrfattare fรถr incheckningen"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1500 builtin/gc.c:538
 msgid "date"
 msgstr "datum"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1500
 msgid "override date for commit"
 msgstr "รถverstyr datum fรถr incheckningen"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "incheckning"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1502
 msgid "reuse and edit message from specified commit"
 msgstr "รฅteranvรคnd och redigera meddelande frรฅn angiven incheckning"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1503
 msgid "reuse message from specified commit"
 msgstr "รฅteranvรคnd meddelande frรฅn angiven incheckning"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1504
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "anvรคnd autosquash-formaterat meddelande fรถr att fixa angiven incheckning"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1505
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "anvรคnd autosquash-formaterat meddelande fรถr att slรฅ ihop med angiven "
 "incheckning"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1506
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "jag รคr nu fรถrfattare av incheckningen (anvรคnds med -C/-c/--amend)"
 
-#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "lรคgg till Signed-off-by:"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1508
 msgid "use specified template file"
 msgstr "anvรคnd angiven mallfil"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1509
 msgid "force edit of commit"
 msgstr "tvinga redigering av incheckning"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1511
 msgid "include status in commit message template"
 msgstr "inkludera status i mallen fรถr incheckningsmeddelandet"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1516
 msgid "Commit contents options"
 msgstr "Alternativ fรถr incheckningens innehรฅll"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1517
 msgid "commit all changed files"
 msgstr "checka in alla รคndrade filer"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1518
 msgid "add specified files to index for commit"
 msgstr "lรคgg till angivna filer till indexet fรถr incheckning"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1519
 msgid "interactively add files"
 msgstr "lรคgg till filer interaktivt"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1520
 msgid "interactively add changes"
 msgstr "lรคgg till รคndringar interaktivt"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1521
 msgid "commit only specified files"
 msgstr "checka endast in angivna filer"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1522
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "fรถrbigรฅ pre-commit- och commit-msg-krokar"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1523
 msgid "show what would be committed"
 msgstr "visa vad som skulle checkas in"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1536
 msgid "amend previous commit"
 msgstr "lรคgg till fรถregรฅende incheckning"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1537
 msgid "bypass post-rewrite hook"
 msgstr "fรถrbigรฅ post-rewrite-krok"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1544
 msgid "ok to record an empty change"
 msgstr "ok att registrera en tom รคndring"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1546
 msgid "ok to record a change with an empty message"
 msgstr "ok att registrera en รคndring med tomt meddelande"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1619
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Trasig MERGE_HEAD-fil (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
 msgid "could not read MERGE_MODE"
 msgstr "kunde inte lรคsa MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1645
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "kunde inte lรคsa incheckningsmeddelande: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Avbryter pรฅ grund av tomt incheckningsmeddelande.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1691
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -11818,76 +12798,74 @@ msgstr ""
 "att kvoten inte har รถverskridits, och kรถr sedan\n"
 "\"git restore --staged :/\" fรถr att รฅterstรคlla."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <objkat>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <objkat>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-msgstr "git commit-graph verify [--object-dir <objkat>] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
 msgstr ""
 "git commit-graph write [--object-dir <objkat>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <delnings-flaggor>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <delnings-flaggor>"
+
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "kunde inte hitta objektkatalog fรถr %s"
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1601
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr "kat"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
 msgid "The object directory to store the graph"
-msgstr "Objektkatalogen dรคr grafen skall lagras"
+msgstr "Objektkatalogen dรคr grafen ska lagras"
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:71
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "om inchecknignsgrafen รคr delad, kontrollera bara spetsfilen"
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Kunde inte รถppna incheckningsgrafen \"%s\""
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:128
 msgid "start walk at all refs"
 msgstr "starta traversering vid alla referenser"
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:130
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "sรถk paketindex listade pรฅ standard in efter incheckningar"
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:132
 msgid "start walk at commits listed by stdin"
 msgstr "bรถrja gรฅ genom incheckningar listade pรฅ standard in"
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:134
 msgid "include all commits already in the commit-graph file"
 msgstr "ta med alla incheckningar redan i filen commit-graph"
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:137
 msgid "allow writing an incremental commit-graph file"
 msgstr "tillรฅt skriva en inkrementell incheckningsgraffil"
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 "maximalt antal incheckningar i en delad incheckingsgraf som inte รคr bad"
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:141
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "maximalt fรถrhรฅllande mellan tvรฅ nivรฅer av en delad incheckningsgraf"
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:159
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "anvรคnd som mest en av --reachable, --stdin-commit och --stdin-packs"
 
@@ -11895,205 +12873,211 @@ msgstr "anvรคnd som mest en av --reachable, --stdin-commit och --stdin-packs"
 msgid "git config [<options>]"
 msgstr "git config [<flaggor>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "okรคnt argument fรถr --type, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:116
 msgid "only one type at a time"
 msgstr "endast en typ รฅt gรฅngen"
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr "Konfigurationsfilens plats"
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr "anvรคnd global konfigurationsfil"
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr "anvรคnd systemets konfigurationsfil"
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr "anvรคnd arkivets konfigurationsfil"
 
-#: builtin/config.c:128
+#: builtin/config.c:129
 msgid "use per-worktree config file"
 msgstr "anvรคnd arbetskatalogens konfigurationsfil"
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr "anvรคnd angiven konfigurationsfil"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr "lรคs konfiguration frรฅn givet blob-objekt"
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr "ร…tgรคrd"
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr "hรคmta vรคrde: namn [vรคrde-reguttr]"
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr "hรคmta alla vรคrden: nyckel [vรคrde-reguttr]"
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "hรคmta vรคrden fรถr reguttr: namn-reguttr [vรคrde-reguttr]"
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "hรคmta vรคrde specifikt URL:en: sektion[.var] URL"
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr "ersรคtt alla motsvarande variabler: namn vรคrde [vรคrde-reguttr]"
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr "lรคgg till en ny variabel: namn vรคrde"
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr "ta bort en variabel: namn [vรคrde-reguttr]"
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr "ta bort alla trรคffar: namn [vรคrde-reguttr]"
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr "byt namn pรฅ sektion: gammalt-namn nytt-namn"
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr "ta bort en sektion: namn"
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr "visa alla"
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr "รถppna textredigeringsprogram"
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr "hitta den instรคllda fรคrgen: slot [default]"
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "hitta fรคrginstรคllningen: slot [stdout-is-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr "Typ"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
 msgid "value is given this type"
 msgstr "vรคrdet har givits denna typ"
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr "vรคrdet รคr \"true\" eller \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr "vรคrdet รคr ett decimalt tal"
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr "vรคrdet รคr --bool eller --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr "vรคrdet รคr en sรถkvรคg (fil- eller katalognamn)"
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr "vรคrdet รคr ett utgรฅngsdatum"
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr "Andra"
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr "terminera vรคrden med NUL-byte"
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr "visa endast variabelnamn"
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr "respektera inkluderingsdirektiv vid uppslag"
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "visa konfigurationskรคlla (fil, standard in, blob, kommandorad)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"visa omfรฅng fรถr konfiguration (arbetskatalog, lokalt, globalt, system, "
+"kommando)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
 msgid "value"
 msgstr "vรคrde"
 
-#: builtin/config.c:158
+#: builtin/config.c:160
 msgid "with --get, use default value when missing entry"
 msgstr "med --get, anvรคnd standardvรคrde vid saknad post"
 
-#: builtin/config.c:172
+#: builtin/config.c:174
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "fel antal argument, skulle vara %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:176
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "fel antal argument, skulle vara frรฅn %d till %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:324
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "felaktigt nyckelmรถnster: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:360
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "misslyckades formatera standardkonfigurationsvรคrde: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:417
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "kan inte tolka fรคrgen \"%s\""
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr "kan inte tolka standardfรคrgvรคrde"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
 msgid "not in a git directory"
 msgstr "inte i en git-katalog"
 
-#: builtin/config.c:499
+#: builtin/config.c:515
 msgid "writing to stdin is not supported"
 msgstr "skriva till standard in stรถds inte"
 
-#: builtin/config.c:502
+#: builtin/config.c:518
 msgid "writing config blobs is not supported"
 msgstr "skriva konfigurations-blobbar stรถds inte"
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12108,23 +13092,23 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:627
 msgid "only one config file at a time"
 msgstr "endast en konfigurationsfil รฅt gรฅngen"
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr "--local kan bara anvรคndas inuti ett git-arkiv"
 
-#: builtin/config.c:619
+#: builtin/config.c:635
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob kan bara anvรคndas inuti ett git-arkiv"
 
-#: builtin/config.c:638
+#: builtin/config.c:655
 msgid "$HOME not set"
 msgstr "$HOME inte satt"
 
-#: builtin/config.c:658
+#: builtin/config.c:679
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12134,52 +13118,52 @@ msgstr ""
 "konfigurationsutรถknignen worktreeConfig har aktiverats. Lรคsa stycket\n"
 "\"KONFIGURATIONSFIL\" i \"git help worktree\" fรถr detaljer"
 
-#: builtin/config.c:688
+#: builtin/config.c:714
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color och variabeltyp stรคmmer inte รถverens"
 
-#: builtin/config.c:693
+#: builtin/config.c:719
 msgid "only one action at a time"
 msgstr "endast en รฅtgรคrd รฅt gรฅngen"
 
-#: builtin/config.c:706
+#: builtin/config.c:732
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only gรคller bara fรถr --list eller --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:738
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin gรคller bara fรถr --get, --get-all, --get-regexp och --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:744
 msgid "--default is only applicable to --get"
 msgstr "--default gรคller bara fรถr --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:757
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "kan inte konfigurationsfil \"%s\""
 
-#: builtin/config.c:734
+#: builtin/config.c:760
 msgid "error processing config file(s)"
 msgstr "fel vid hantering av konfigurationsfil(er)"
 
-#: builtin/config.c:744
+#: builtin/config.c:770
 msgid "editing stdin is not supported"
 msgstr "redigering av standard in stรถds ej"
 
-#: builtin/config.c:746
+#: builtin/config.c:772
 msgid "editing blobs is not supported"
 msgstr "redigering av blobbar stรถds ej"
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "kan inte skapa konfigurationsfilen \"%s\""
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12188,7 +13172,7 @@ msgstr ""
 "kan inte skriva รถver flera vรคrden med ett ensamt vรคrde\n"
 "       Anvรคnd en regexp, --add eller --replace-all fรถr att รคndra %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
 #, c-format
 msgid "no such section: %s"
 msgstr "ingen sรฅdan sektion: %s"
@@ -12201,58 +13185,58 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "skriv storlekar i mรคnniskolรคsbart format"
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<flaggor>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr "huvud"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr "lรคttviktig"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr "annoterad"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "den annoterade taggen %s inte tillgรคnglig"
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "den annoterade taggen %s har inget inbรคddat namn"
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "taggen \"%s\" รคr i verkligheten \"%s\" hรคr"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "ingen tagg motsvarar \"%s\" exakt"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Ingen exakt trรคff mot referenser eller taggar, sรถker fรถr att beskriva\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:394
 #, c-format
 msgid "finished search at %s\n"
 msgstr "avslutade sรถkning pรฅ %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:421
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12261,7 +13245,7 @@ msgstr ""
 "Inga annoterade taggar kan beskriva \"%s\".\n"
 "Det finns dock oannoterade taggar: testa --tags."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:425
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12270,12 +13254,12 @@ msgstr ""
 "Inga taggar kan beskriva \"%s\".\n"
 "Testa --always, eller skapa nรฅgra taggar."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:455
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "traverserade %lu incheckningar\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:458
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12284,90 +13268,90 @@ msgstr ""
 "mer รคn %i taggar hittades; listar de %i senaste\n"
 "gav upp sรถkningen vid %s\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:526
 #, c-format
 msgid "describe %s\n"
 msgstr "beskriva %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:529
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Objektnamnet รคr inte giltigt: %s"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:537
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s รคr varken incheckning eller blob"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:551
 msgid "find the tag that comes after the commit"
 msgstr "hitta taggen som kommer efter incheckningen"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:552
 msgid "debug search strategy on stderr"
 msgstr "felsรถk sรถkstrategin pรฅ standard fel"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:553
 msgid "use any ref"
 msgstr "anvรคnd alla referenser"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:554
 msgid "use any tag, even unannotated"
 msgstr "anvรคnd alla taggar, รคven oannoterade"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:555
 msgid "always use long format"
 msgstr "anvรคnd alltid lรฅngt format"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:556
 msgid "only follow first parent"
 msgstr "fรถlj endast fรถrsta fรถrรคldern"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:559
 msgid "only output exact matches"
 msgstr "skriv endast ut exakta trรคffar"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:561
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "รถvervรคg de <n> nyaste taggarna (standard: 10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:563
 msgid "only consider tags matching <pattern>"
 msgstr "รถvervรคg endast taggar som motsvarar <mรถnster>"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:565
 msgid "do not consider tags matching <pattern>"
 msgstr "รถvervรคg inte taggar som motsvarar <mรถnster>"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:567 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "visa fรถrkortade incheckningsobjekt som standard"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:568 builtin/describe.c:571
 msgid "mark"
 msgstr "mรคrke"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:569
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "lรคgg till <mรคrke> pรฅ lortigt arbetstrรคd (standard: \"-dirty\")"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:572
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "lรคgg till <mรคrke> pรฅ trasigt arbetstrรคd (standard: \"-broken\")"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:590
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long รคr inkompatibel med --abbrev=0"
 
-#: builtin/describe.c:603
+#: builtin/describe.c:619
 msgid "No names found, cannot describe anything."
 msgstr "Inga namn hittades, kan inte beskriva nรฅgot."
 
-#: builtin/describe.c:654
+#: builtin/describe.c:670
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty รคr inkompatibelt med \"commit-ish\"-vรคrden"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:672
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken รคr inkompatibelt med \"commit-ish\"-vรคrden"
 
@@ -12405,27 +13389,27 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sรถkvรคg>...]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "misslyckades: %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "kunde inte lรคsa symboliska lรคnken %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "kunde inte lรคsa symbolisk lรคnk-fil %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "kunde inte lรคsa objektet %s fรถr symboliska lรคnken %s"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -12433,53 +13417,53 @@ msgstr ""
 "kombinerade diff-format (\"-c\" och \"--cc\") stรถds inte i\n"
 "katalogdifflรคge (\"-d\" och \"--dir-diff\")."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "bรคgge filerna รคndrade: \"%s\" och \"%s\"."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr "filen i arbetskatalogen lรคmnades kvar."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "temporรคra filer finns i \"%s\"."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr "du kanske vill stรคda eller rรคdda dem."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "anvรคnd \"diff.guitool\" istรคllet fรถr \"diff.tool\""
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr "utfรถr diff fรถr hela katalogen"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr "frรฅga inte vid start av diff-verktyg"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "anvรคnd symboliska lรคnkar i katalogdifflรคge"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr "verktyg"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "anvรคnd angivet diff-verktyg"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "visa en lista รถver diff-verktyg som kan anvรคndas med \"--tool\""
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12487,31 +13471,31 @@ msgstr ""
 "lรฅt \"git-difftool\" avbryta nรคr ett anropat diff-verktyg ger returvรคrde "
 "skilt frรฅn noll"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "ange eget kommando fรถr att visa diffar"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr "sรคndes till \"diff\""
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool krรคver en arbetskatalog eller --no-index"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff รคr inkompatibelt med --no-index"
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool och --extcmd รคr รถmsesidigt uteslutande"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "inget <verktyg> angavs fรถr --tool=<verktyg>"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "inget <kommando> angavs fรถr --extcmd=<kommando>"
 
@@ -12551,156 +13535,180 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-flaggor]"
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr "Fel: Kan inte exportera nรคstlade taggar sรฅvida inte --mark-tags anges."
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr "visa fรถrlopp efter <n> objekt"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr "vรคlj hantering av signerade taggar"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr "vรคlj hantering av taggar som har taggfiltrerade objekt"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "vรคlj hantering av incheckningsmeddelanden i alternativ teckenkodning"
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
 msgstr "Dumpa mรคrken till filen"
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
 msgstr "Importera mรคrken frรฅn filen"
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "Importera mรคrken frรฅn filen, om den finns"
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr "Fejka taggare nรคr taggen saknar en"
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr "Skriv ut hela trรคdet fรถr varje incheckning"
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr "Anvรคnd done-funktionen fรถr att avsluta strรถmmen"
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr "Hoppa รถver skrivning av blob-data"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1649
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr "referensspecifikation"
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr "Applicera referensspecifikation pรฅ exporterade referenser"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr "anonymisera utdata"
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr "Referera fรถrรคldrar som inte finns i fast-export-strรถm med objekt-id"
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
-msgstr "Visa ursprungliga objekt-ID fรถr blobbar/incheckningar"
+msgstr "Visa ursprungliga objekt-id fรถr blobbar/incheckningar"
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "Mรคrk taggar med mรคrke-id"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr "Kan inte ange bรฅde --import-marks och --import-marks-if-exists"
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<flaggor>] <grupp>"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<flaggor>]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel kan inte vara negativt"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
 msgid "fetch from all remotes"
 msgstr "hรคmta frรฅn alla fjรคrrar"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "stรคll in uppstrรถm fรถr git pull/fetch"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "lรคgg till i .git/FETCH_HEAD istรคllet fรถr att skriva รถver"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:190
 msgid "path to upload pack on remote end"
 msgstr "sรถkvรคg till upload pack pรฅ fjรคrren"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr "tvinga รถverskrivning av lokal referens"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr "hรคmta frรฅn flera fjรคrrar"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:194
 msgid "fetch all tags and associated objects"
 msgstr "hรคmta alla taggar och associerade objekt"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr "hรคmta inte alla taggar (--no-tags)"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr "antal undermoduler som hรคmtas parallellt"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:197
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "rensa fjรคrrspรฅrande grenar ej lรคngre pรฅ fjรคrren"
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "rensa lokala taggar inte lรคngre pรฅ fjรคrren och skriv รถver รคndrade taggar"
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr "styr rekursiv hรคmtning av undermoduler"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:205
 msgid "keep downloaded pack"
 msgstr "behรฅll hรคmtade paket"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr "tillรฅt uppdatering av HEAD-referens"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
 msgid "deepen history of shallow clone"
 msgstr "fรถrdjupa historik fรถr grund klon"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr "fรถrdjupa historik fรถr grund klon baserad pรฅ tid"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:211
 msgid "convert to a complete repository"
 msgstr "konvertera till komplett arkiv"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr "lรคgg till i bรถrjan av undermodulens sรถkvรคgsutdata"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -12708,105 +13716,133 @@ msgstr ""
 "standard fรถr rekursiv hรคmtning av undermoduler (lรคgre prioritet รคn "
 "konfigurationsfiler)"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:214
 msgid "accept refs that update .git/shallow"
 msgstr "tar emot referenser som uppdaterar .git/shallow"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:216
 msgid "refmap"
 msgstr "referenskarta"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:217
 msgid "specify fetch refmap"
 msgstr "ange referenskarta fรถr \"fetch\""
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr "rapportera att vi bara har objekt nรฅbara frรฅn detta objektet"
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 msgid "run 'gc --auto' after fetching"
 msgstr "kรถr \"gc --auto\" efter hรคmtning"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:226
 msgid "check for forced-updates on all updated branches"
 msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "skriv incheckingsgrafen efter hรคmtning"
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr "Kunde inte hitta fjรคrr-referensen HEAD"
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "konfigurationen fรถr fetch.output innehรฅller ogiltigt vรคrde %s"
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr "objektet %s hittades inte"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr "[ร jour]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr "[refuserad]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr "kan inte hรคmta i aktuell gren"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr "[uppdaterad tagg]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr "kunde inte uppdatera lokal ref"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr "skulle skriva รถver befintlig tagg"
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr "[ny tagg]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr "[ny gren]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr "[ny ref]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr "tvingad uppdatering"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr "ej snabbspolad"
 
-#: builtin/fetch.c:879
+#: builtin/fetch.c:877
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"Fetch visar normalt vilka grenar som tvรฅngsuppdaterats, men testet har "
+"slagits\n"
+"av. Fรถr att slรฅ pรฅ igen, anvรคnd flaggan \"--show-forced-updates\" eller kรถr\n"
+"\"git config fetch.showForcedUpdates true\"."
+
+#: builtin/fetch.c:881
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"Det tog %.2f sekunder att se efter tvรฅngsuppdateringar. Du kan anvรคnda\n"
+"\"--no-show-forced-updates\" eller kรถra \"git config fetch."
+"showForcedUpdates\n"
+"false\" fรถr att undvika testet.\n"
+
+#: builtin/fetch.c:920
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s sรคnde inte alla nรถdvรคndiga objekt\n"
 
-#: builtin/fetch.c:900
+#: builtin/fetch.c:941
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "avvisa %s dรฅ grunda rรถtter inte kan uppdateras"
 
-#: builtin/fetch.c:991 builtin/fetch.c:1124
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
 #, c-format
 msgid "From %.*s\n"
 msgstr "Frรฅn %.*s\n"
 
-#: builtin/fetch.c:1002
+#: builtin/fetch.c:1037
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -12815,134 +13851,124 @@ msgstr ""
 "vissa lokala referenser kunde inte uppdateras; testa att kรถra\n"
 " \"git remote prune %s\" fรถr att ta bort gamla grenar som stรฅr i konflikt"
 
-#: builtin/fetch.c:1008
-msgid ""
-"Fetch normally indicates which branches had a forced update, but that check "
-"has been disabled."
-msgstr ""
-"Hรคmtning visar vanligtvis vilka grenar som har en tvingad uppdatering, men "
-"det testet har slagits av."
-
-#: builtin/fetch.c:1009
-msgid ""
-"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
-"showForcedUpdates true'."
-msgstr ""
-"Fรถr att slรฅ pรฅ igen, anvรคnd flaggan \"--show-forced-updates\" eller kรถr "
-"\"git config fetch.showForcedUpdates true\"."
-
-#: builtin/fetch.c:1011
-#, c-format
-msgid ""
-"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
-"updates'\n"
-msgstr ""
-"Det tog %.2f sekunder att se efter tvingade uppdateringar. Du kan anvรคnda "
-"\"--no-show-forced-updates\"\n"
-
-#: builtin/fetch.c:1013
-msgid ""
-"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
-msgstr ""
-"eller kรถr \"git config fetch.showForcedUpdates false\" fรถr undvika testet.\n"
-
-#: builtin/fetch.c:1094
+#: builtin/fetch.c:1134
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s kommer bli dinglande)"
 
-#: builtin/fetch.c:1095
+#: builtin/fetch.c:1135
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s har blivit dinglande)"
 
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1167
 msgid "[deleted]"
 msgstr "[borttagen]"
 
-#: builtin/fetch.c:1128 builtin/remote.c:1036
+#: builtin/fetch.c:1168 builtin/remote.c:1112
 msgid "(none)"
 msgstr "(ingen)"
 
-#: builtin/fetch.c:1151
+#: builtin/fetch.c:1191
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Vรคgrar hรคmta till aktuell gren %s i ett icke-naket arkiv"
 
-#: builtin/fetch.c:1170
+#: builtin/fetch.c:1210
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Flaggan \"%s\" och vรคrdet \"%s\" รคr inte giltigt fรถr %s"
 
-#: builtin/fetch.c:1173
+#: builtin/fetch.c:1213
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Flaggan \"%s\" ignoreras fรถr %s\n"
 
-#: builtin/fetch.c:1477
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "flera grenar upptรคcktes, inkompatibelt med --set-upstream"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "stรคller inte in uppstrรถmsgren fรถr en fjรคrrspรฅrande gren pรฅ fjรคrren"
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "stรคller inte in uppstrรถm fรถr en fjรคrrtag"
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "okรคnd grentyp"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"hittade ingen kรคllgren.\n"
+"du mรฅste ange exakt en gren med flaggan --set-upstream."
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Hรคmtar %s\n"
 
-#: builtin/fetch.c:1479 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Kunde inte hรคmta %s"
 
-#: builtin/fetch.c:1525
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr ""
-"--filter kan endast anvรคndas med fjรคrren konfigurerad i extensions."
-"partialClone"
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "kunde inte hรคmta \"%s\" (felkod: %d)\n"
 
-#: builtin/fetch.c:1549
+#: builtin/fetch.c:1693
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
 msgstr ""
 "Inget fjรคrrarkiv angavs. Ange antingen en URL eller namnet pรฅ ett\n"
-"fjรคrrarkiv som nya incheckningar skall hรคmtas frรฅn."
+"fjรคrrarkiv som nya incheckningar ska hรคmtas frรฅn."
 
-#: builtin/fetch.c:1586
+#: builtin/fetch.c:1730
 msgid "You need to specify a tag name."
 msgstr "Du mรฅste ange namnet pรฅ en tagg."
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1780
 msgid "Negative depth in --deepen is not supported"
 msgstr "Negativa djup stรถds inte i --deepen"
 
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1782
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen och --depth รคr รถmsesidigt uteslutande"
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1787
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth och --unshallow kan inte anvรคndas samtidigt"
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1789
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow kan inte anvรคndas pรฅ ett komplett arkiv"
 
-#: builtin/fetch.c:1662
+#: builtin/fetch.c:1805
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all tar inte namnet pรฅ ett arkiv som argument"
 
-#: builtin/fetch.c:1664
+#: builtin/fetch.c:1807
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kan inte anges med referensspecifikationer"
 
-#: builtin/fetch.c:1673
+#: builtin/fetch.c:1816
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Fjรคrren eller fjรคrrgruppen finns inte: %s"
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1823
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Kan inte hรคmta frรฅn grupp och ange referensspecifikationer"
 
-#: builtin/fetch.c:1696
+#: builtin/fetch.c:1841
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -12956,23 +13982,23 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:671
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "fyll i loggen med som mest <n> poster frรฅn shortlog"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:674
 msgid "alias for --log (deprecated)"
 msgstr "alias fรถr --log (avrรฅds)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:677
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:678
 msgid "use <text> as start of message"
 msgstr "inled meddelande med <text>"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:679
 msgid "file to read from"
 msgstr "fil att lรคsa frรฅn"
 
@@ -13037,32 +14063,32 @@ msgstr "visa endast referenser som innehรฅller incheckningen"
 msgid "print only refs which don't contain the commit"
 msgstr "visa endast referenser som inte innehรฅller incheckningen"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr "okรคnd"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "fel i %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "varning i %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "trasig lรคnk frรฅn %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr "fel objekttyp i lรคnk"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13071,220 +14097,220 @@ msgstr ""
 "trasig lรคnk frรฅn %7s %s\n"
 "            till %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr "saknat %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr "onรฅbart %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, c-format
 msgid "dangling %s %s"
 msgstr "hรคngande %s %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 msgid "could not create lost-found"
 msgstr "kunde inte skapa lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr "kunde inte avsluta \"%s\""
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr "Kontrollerar %s"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Kontrollerar konnektivitet (%d objekt)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr "Kontrollerar %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr "trasiga lรคnkar"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr "roten %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "taggad %s %s (%s) i %s"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objekt trasigt eller saknas"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: ogiltig reflog-post %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Kontrollerar reflog %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: ogiltig sha1-pekare %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: inte en incheckning!"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr "obs: Inga fรถrvalda referenser"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objektet trasigt eller saknas: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: objektet kunde inte tolkas: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "ogiltig sha1-fil: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr "Kontrollerar objektkatalog"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr "Kontrollerar objektkataloger"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr "Kontrollerar %s-lรคnk"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr "ogiltigt %s"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pekar pรฅ nรฅgot konstigt (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: frรฅnkopplat HEAD pekar pรฅ ingenting"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "obs: %s pekar pรฅ en ofรถdd gren (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr "Kontrollerar cachetrรคd"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: ogiltig sha1-pekare i cachetrรคd"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr "icke-trรคd i cachetrรคd"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<flaggor>] [<objekt>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr "visa onรฅbara objekt"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr "visa dinglande objekt"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr "rapportera taggar"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr "rapportera rotnoder"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr "gรถr indexojekt till huvudnoder"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr "gรถr refloggar till huvudnoder (standard)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
-msgstr "ta รคven hรคnsyn till paket och alternativa objekt"
+msgstr "ta รคven hรคnsyn till paket och supplerande objekt"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr "kontrollera endast konnektivitet"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr "aktivera striktare kontroll"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr "skriv dinglande objekt i .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr "visa fรถrlopp"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr "visa ordrika namn fรถr nรฅbara objekt"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "Kontrollerar objekt"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objekt saknas"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "ogiltig parameter: fรถrvรคntade sha1, fick \"%s\""
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr "git gc [<flaggor>]"
 
@@ -13298,17 +14324,17 @@ msgstr "Misslyckades ta status (fstat) pรฅ %s: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "misslyckades tolka \"%s\" vรคrde \"%s\""
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "kan inte ta status pรฅ \"%s\""
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kunde inte lรคsa \"%s\""
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13323,52 +14349,52 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr "rensa ej refererade objekt"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr "var mer grundlig (รถkar kรถrtiden)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr "aktivera auto-gc-lรคge"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr "tvinga gc-kรถrning รคven om en annan gc kanske kรถrs"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr "packa om alla paket fรถrutom det stรถrsta paketet"
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "kunde inte tolka vรคrdet %s fรถr gc.logexpiry"
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "kunde inte tolka vรคrdet %s fรถr prune expiry"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "Packar arkivet automatiskt i bakgrunden fรถr optimal prestanda.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Packar arkivet automatiskt fรถr optimal prestanda.\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Se \"git help gc\" fรถr manuell hushรฅllning.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13376,14 +14402,14 @@ msgstr ""
 "gc kรถrs redan pรฅ maskinen \"%s\" pid %<PRIuMAX> (anvรคnd --force om sรฅ inte "
 "รคr fallet)"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Det finns fรถr mรฅnga onรฅbara lรถsa objekt; kรถr \"git prune\" fรถr att ta bort "
 "dem."
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<flaggor>] [-e] <mรถnster> [<rev>...] [[--] <sรถkvรคg>...]"
 
@@ -13401,258 +14427,258 @@ msgstr "felaktigt antal trรฅdar angivet (%d) fรถr %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2722
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "trรฅdstรถd saknas, ignorerar %s"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "kunde inte lรคsa trรคd (%s)"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:633
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kunde inte \"grep\" frรฅn objekt av typen %s"
 
-#: builtin/grep.c:714
+#: builtin/grep.c:704
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "flaggan \"%c\" antar ett numeriskt vรคrde"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:803
 msgid "search in index instead of in the work tree"
 msgstr "sรถk i indexet istรคllet fรถr i arbetskatalogen"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:805
 msgid "find in contents not managed by git"
 msgstr "sรถk i innehรฅll som inte hanteras av git"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:807
 msgid "search in both tracked and untracked files"
 msgstr "sรถk i bรฅde spรฅrade och ospรฅrade filer"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:809
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorera filer angivna i \".gitignore\""
 
-#: builtin/grep.c:821
+#: builtin/grep.c:811
 msgid "recursively search in each submodule"
 msgstr "sรถk varje undermodul rekursivt"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:814
 msgid "show non-matching lines"
 msgstr "visa rader som inte trรคffas"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:816
 msgid "case insensitive matching"
 msgstr "skiftlรคgesokรคnslig sรถkning"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:818
 msgid "match patterns only at word boundaries"
 msgstr "matcha endast mรถnster vid ordgrรคnser"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:820
 msgid "process binary files as text"
 msgstr "hantera binรคrfiler som text"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:822
 msgid "don't match patterns in binary files"
 msgstr "trรคffa inte mรถnster i binรคrfiler"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:825
 msgid "process binary files with textconv filters"
 msgstr "hantera binรคrfiler med textconv-filter"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:827
 msgid "search in subdirectories (default)"
 msgstr "sรถk i underkataloger (standard)"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:829
 msgid "descend at most <depth> levels"
 msgstr "gรฅ som mest ned <djup> nivรฅer"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:833
 msgid "use extended POSIX regular expressions"
 msgstr "anvรคnd utรถkade POSIX-reguljรคra uttryck"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:836
 msgid "use basic POSIX regular expressions (default)"
 msgstr "anvรคnd grundlรคggande POSIX-reguljรคra uttryck (standard)"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:839
 msgid "interpret patterns as fixed strings"
 msgstr "tolka mรถnster som fixerade strรคngar"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:842
 msgid "use Perl-compatible regular expressions"
 msgstr "anvรคnd Perlkompatibla reguljรคra uttryck"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:845
 msgid "show line numbers"
 msgstr "visa radnummer"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:846
 msgid "show column number of first match"
 msgstr "visa kolumnnummer fรถr fรถrsta trรคff"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:847
 msgid "don't show filenames"
 msgstr "visa inte filnamn"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:848
 msgid "show filenames"
 msgstr "visa filnamn"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:850
 msgid "show filenames relative to top directory"
 msgstr "visa filnamn relativa till toppkatalogen"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:852
 msgid "show only filenames instead of matching lines"
 msgstr "visa endast filnamn istรคllet fรถr trรคffade rader"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:854
 msgid "synonym for --files-with-matches"
 msgstr "synonym fรถr --files-with-matches"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:857
 msgid "show only the names of files without match"
 msgstr "visa endast namn pรฅ filer utan trรคffar"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:859
 msgid "print NUL after filenames"
 msgstr "skriv NUL efter filnamn"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:862
 msgid "show only matching parts of a line"
 msgstr "visa endast trรคffade delar av rader"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:864
 msgid "show the number of matches instead of matching lines"
 msgstr "visa antal trรคffar istรคllet fรถr trรคffade rader"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:865
 msgid "highlight matches"
 msgstr "ljusmarkera trรคffar"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:867
 msgid "print empty line between matches from different files"
 msgstr "skriv tomma rader mellan trรคffar frรฅn olika filer"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:869
 msgid "show filename only once above matches from same file"
 msgstr "visa filnamn endast en gรฅng ovanfรถr trรคffar frรฅn samma fil"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:872
 msgid "show <n> context lines before and after matches"
 msgstr "visa <n> rader sammanhang fรถre och efter trรคffar"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:875
 msgid "show <n> context lines before matches"
 msgstr "visa <n> rader sammanhang fรถre trรคffar"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:877
 msgid "show <n> context lines after matches"
 msgstr "visa <n> rader sammanhang efter trรคffar"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:879
 msgid "use <n> worker threads"
 msgstr "anvรคnd <n> jobbtrรฅdar"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:880
 msgid "shortcut for -C NUM"
 msgstr "genvรคg fรถr -C NUM"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:883
 msgid "show a line with the function name before matches"
 msgstr "visa en rad med funktionsnamnet fรถre trรคffen"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:885
 msgid "show the surrounding function"
 msgstr "visa den omkringliggande funktionen"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:888
 msgid "read patterns from file"
 msgstr "lรคs mรถnster frรฅn fil"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:890
 msgid "match <pattern>"
 msgstr "trรคffa <mรถnster>"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:892
 msgid "combine patterns specified with -e"
 msgstr "kombinera mรถnster som anges med -e"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:904
 msgid "indicate hit with exit status without output"
 msgstr "ange trรคff med slutstatuskod utan utdata"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:906
 msgid "show only matches from files that match all patterns"
 msgstr "visa endast trรคffar frรฅn filer som trรคffar alla mรถnster"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:908
 msgid "show parse tree for grep expression"
 msgstr "visa analystrรคd fรถr grep-uttryck"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "pager"
 msgstr "blรคddrare"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "show matching files in the pager"
 msgstr "visa trรคffade filer i filblรคddraren"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:916
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "tillรฅt anropa grep(1) (ignoreras av detta bygge)"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:983
 msgid "no pattern given"
 msgstr "inget mรถnster angavs"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1019
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index och --untracked kan inte anvรคndas med revisioner"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1027
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "kan inte slรฅ upp revision: %s"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked stรถds inte med --recurse-submodules"
+
+#: builtin/grep.c:1061
 msgid "invalid option combination, ignoring --threads"
 msgstr "ogiltig kombination av flaggor, ignorerar --threads"
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3405
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
 msgid "no threads support, ignoring --threads"
 msgstr "trรฅdstรถd saknas, ignorerar --threads"
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "felaktigt antal trรฅdar angivet (%d)"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1101
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
 
-#: builtin/grep.c:1117
-msgid "option not supported with --recurse-submodules"
-msgstr "flaggan stรถds inte med --recurse-submodules"
-
-#: builtin/grep.c:1123
+#: builtin/grep.c:1127
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached och --untracked kan inte anvรคndas med --no-index"
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1133
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard kan inte anvรคndas fรถr spรฅrat innehรฅll"
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1141
 msgid "both --cached and trees are given"
 msgstr "bรฅde --cached och trรคd angavs"
 
@@ -13837,11 +14863,11 @@ msgstr "indatalรคsfel"
 msgid "used more bytes than were available"
 msgstr "anvรคnde fler byte รคn tillgรคngligt"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
 msgid "pack too large for current definition of off_t"
 msgstr "paket fรถr stort fรถr nuvarande definition av off_t"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "paket รคr stรถrre รคn tillรฅten maximal storlek"
 
@@ -13897,191 +14923,191 @@ msgstr[1] "fรถr tidigt slut pรฅ paketfilen, %<PRIuMAX> byte saknas"
 msgid "serious inflate inconsistency"
 msgstr "allvarlig inflate-inkonsekvens"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1-KOLLISION UPPTร„CKT VID %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
 #, c-format
 msgid "unable to read %s"
 msgstr "kunde inte lรคsa %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "kan inte lรคsa information om befintligt objekt %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "kan inte lรคsa befintligt objekt %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ogiltigt blob-objekt %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
 msgid "fsck error in packed object"
 msgstr "fsck-fel i packat objekt"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Inte alla barnobjekt fรถr %s kan nรฅs"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr "misslyckades tillรคmpa delta"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr "Tar emot objekt"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr "Skapar index fรถr objekt"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paketet รคr trasigt (SHA1 stรคmmer inte)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr "kan inte utfรถra \"fstat\" pรฅ paketfil"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr "paket har skrรคp i slutet"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "fรถrvirrad bortom vanvett i parse_pack_objects()"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr "Analyserar delta"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kunde inte skapa trรฅd: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr "fรถrvirrad bortom vanvett"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "slutfรถrdes med %d lokalt objekt"
 msgstr[1] "slutfรถrdes med %d lokala objekt"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Ovรคntad svanschecksumma fรถr %s (trasig disk?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "paketet har %d oanalyserat delta"
 msgstr[1] "paketet har %d oanalyserade delta"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "kunde inte utfรถra \"deflate\" pรฅ tillagt objekt (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokalt objekt %s รคr trasigt"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "kan inte ta skriva %s-fil \"%s\""
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "kan inte stรคnga skriven %s-fil \"%s\""
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
 msgid "error while closing pack file"
 msgstr "fel vid stรคngning av paketfil"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
 msgid "cannot store pack file"
 msgstr "kan inte spara paketfil"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
 msgid "cannot store index file"
 msgstr "kan inte spara indexfil"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "felaktig pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kan inte รถppna befintlig paketfil \"%s\""
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Kan inte รถppna befintlig paket-idx-fil fรถr \"%s\""
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "icke-delta: %d objekt"
 msgstr[1] "icke-delta: %d objekt"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "kedjelรคngd = %d: %lu objekt"
 msgstr[1] "kedjelรคngd = %d: %lu objekt"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
 msgid "Cannot come back to cwd"
 msgstr "Kan inte gรฅ tillbaka till arbetskatalogen (cwd)"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
 #, c-format
 msgid "bad %s"
 msgstr "felaktig %s"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin kan inte anvรคndas med --stdin"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
 msgid "--stdin requires a git repository"
 msgstr "--stdin krรคver ett git-arkiv"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
 msgid "--verify with no packfile name given"
 msgstr "--verify angavs utan paketfilnamn"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "fsck-fel i packat objekt"
 
@@ -14174,7 +15200,7 @@ msgstr "behรถrigheter"
 
 #: builtin/init-db.c:492
 msgid "specify that the git repository is to be shared amongst several users"
-msgstr "ange att git-arkivet skall delas bland flera anvรคndare"
+msgstr "ange att git-arkivet ska delas bland flera anvรคndare"
 
 #: builtin/init-db.c:529 builtin/init-db.c:534
 #, c-format
@@ -14218,7 +15244,7 @@ msgstr "ta bort tomma slรคprader"
 
 #: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
-msgstr "var nya slรคprader skall placeras"
+msgstr "var nya slรคprader ska placeras"
 
 #: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
@@ -14264,141 +15290,126 @@ msgstr "--trailer med --only-input ger ingen mening"
 msgid "no input file given for in-place editing"
 msgstr "ingen indatafil angiven fรถr redigering pรฅ plats"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sรถkvรคg>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<flaggor>] <objekt>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "ogiltig flagga fรถr --decorate: %s"
 
-#: builtin/log.c:160
-msgid ""
-"log.mailmap is not set; its implicit value will change in an\n"
-"upcoming release. To squelch this message and preserve current\n"
-"behaviour, set the log.mailmap configuration value to false.\n"
-"\n"
-"To squelch this message and adopt the new behaviour now, set the\n"
-"log.mailmap configuration value to true.\n"
-"\n"
-"See 'git help config' and search for 'log.mailmap' for further information."
-msgstr ""
-"log.mailmap har inte satts: fรถrvalet kommer รคndras i en kommande\n"
-"version. Fรถr att dรถlja det hรคr meddelandet och behรฅlla nuvarande\n"
-"beteende, sรคtt konfigurationsvariabeln log.mailmap till false.\n"
-"\n"
-"Fรถr att dรถlja det hรคr meddelandet och anvรคnda det nya beteendet,\n"
-"sรคtt konfigurationsvariabeln log.mailmap till true.\n"
-"\n"
-"Se \"git help config\" och sรถk efter \"log.mailmap\" fรถr mer information."
-
-#: builtin/log.c:183
+#: builtin/log.c:174
 msgid "show source"
 msgstr "visa kรคllkod"
 
-#: builtin/log.c:184
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr "Anvรคnd e-postmappningsfil"
 
-#: builtin/log.c:186
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr "dekorera endast referenser som motsvarar <mรถnster>"
 
-#: builtin/log.c:188
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr "dekorera inte referenser som motsvarar <mรถnster>"
 
-#: builtin/log.c:189
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr "dekoreringsflaggor"
 
-#: builtin/log.c:192
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Behandla radintervallet n,m i filen, med bรถrjan pรฅ 1"
 
-#: builtin/log.c:297
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Slututdata: %d %s\n"
 
-#: builtin/log.c:551
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: felaktig fil"
 
-#: builtin/log.c:566 builtin/log.c:660
+#: builtin/log.c:550 builtin/log.c:645
 #, c-format
 msgid "could not read object %s"
 msgstr "kunde inte lรคsa objektet %s"
 
-#: builtin/log.c:685
+#: builtin/log.c:670
 #, c-format
 msgid "unknown type: %d"
 msgstr "okรคnd typ: %d"
 
-#: builtin/log.c:808
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: ogiltigt omslag frรฅn beskrivningslรคge"
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr "format.headers utan vรคrde"
 
-#: builtin/log.c:925
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr "namnet pรฅ utdatakatalogen รคr fรถr lรฅngt"
 
-#: builtin/log.c:941
+#: builtin/log.c:952
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "kan inte รถppna patchfilen %s"
 
-#: builtin/log.c:958
+#: builtin/log.c:969
 msgid "need exactly one range"
 msgstr "behรถver precis ett intervall"
 
-#: builtin/log.c:968
+#: builtin/log.c:979
 msgid "not a range"
 msgstr "inte ett intervall"
 
-#: builtin/log.c:1091
+#: builtin/log.c:1143
 msgid "cover letter needs email format"
 msgstr "omslagsbrevet behรถver e-postformat"
 
-#: builtin/log.c:1097
+#: builtin/log.c:1149
 msgid "failed to create cover-letter file"
 msgstr "misslyckades skapa fil fรถr omslagsbrev"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "tokigt in-reply-to: %s"
 
-#: builtin/log.c:1203
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1313
 msgid "two output directories?"
 msgstr "tvรฅ utdatakataloger?"
 
-#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, c-format
 msgid "unknown commit %s"
 msgstr "okรคnd incheckning %s"
 
-#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "misslyckades slรฅ upp \"%s\" som en giltig referens"
 
-#: builtin/log.c:1387
+#: builtin/log.c:1439
 msgid "could not find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1391
+#: builtin/log.c:1443
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -14408,267 +15419,275 @@ msgstr ""
 "anvรคnd git branch --set-upstream-to fรถr att spรฅra en fjรคrrgren.\n"
 "Eller sรฅ kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt"
 
-#: builtin/log.c:1411
+#: builtin/log.c:1463
 msgid "failed to find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1422
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr "basincheckningen bรถr vara fรถrfader till revisionslistan"
 
-#: builtin/log.c:1426
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr "basincheckningen bรถr inte vara i revisionslistan"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr "kan inte hรคmta patch-id"
 
-#: builtin/log.c:1531
+#: builtin/log.c:1583
 msgid "failed to infer range-diff ranges"
 msgstr "misslyckades rรคkna ut intervall range-diff"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "anvรคnd [PATCH n/m] รคven fรถr en ensam patch"
 
-#: builtin/log.c:1579
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr "anvรคnd [PATCH] รคven fรถr flera patchar"
 
-#: builtin/log.c:1583
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr "skriv patcharna pรฅ standard ut"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr "generera ett fรถljebrev"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr "anvรคnd enkel nummersekvens fรถr utdatafilnamn"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1589
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr "anvรคnd <sfx> istรคllet fรถr \".patch\""
 
-#: builtin/log.c:1591
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr "bรถrja numrera patchar pรฅ <n> istรคllet fรถr 1"
 
-#: builtin/log.c:1593
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr "markera serien som N:te fรถrsรถk"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Anvรคnd  [RFC PATCH] istรคllet fรถr [PATCH]"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "cover-from-description-lรคge"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "skapa delar av omslagsbrevet baserat pรฅ grenbeskrivelsen"
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Anvรคnd [<prefix>] istรคllet fรถr [PATCH]"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr "spara filerna i <katalog>"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr "ta inte bort eller lรคgg till [PATCH]"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr "skriv inte binรคra diffar"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr "anvรคnd hashvรคrde med nollor i From-huvud"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr "ta inte med patchar som motsvarar en uppstrรถmsincheckning"
 
-#: builtin/log.c:1613
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr "visa patchformat istรคllet fรถr standard (patch + stat)"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr "E-post"
 
-#: builtin/log.c:1616
+#: builtin/log.c:1672
 msgid "header"
 msgstr "huvud"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr "lรคgg till e-posthuvud"
 
-#: builtin/log.c:1618 builtin/log.c:1620
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr "epost"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr "lรคgg till mottagarhuvud (\"To:\")"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr "lรคgg till kopiehuvud (\"Cc:\")"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1678
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "sรคtt Frรฅn-adress till <ident> (eller incheckare om ident saknas)"
 
-#: builtin/log.c:1625
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr "meddelande-id"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr "gรถr det fรถrsta brevet ett svar till <meddelande-id>"
 
-#: builtin/log.c:1627 builtin/log.c:1630
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr "grรคns"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr "bifoga patchen"
 
-#: builtin/log.c:1631
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr "gรถr patchen ett inline-objekt"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktivera brevtrรฅdning, typer: shallow, deep"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1693
 msgid "signature"
 msgstr "signatur"
 
-#: builtin/log.c:1638
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr "lรคgg till signatur"
 
-#: builtin/log.c:1639
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr "basincheckning"
 
-#: builtin/log.c:1640
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr "lรคgg till fรถrhandskrรคvd trรคdinfo i patchserien"
 
-#: builtin/log.c:1642
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr "lรคgg till signatur frรฅn fil"
 
-#: builtin/log.c:1643
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr "visa inte filnamn fรถr patchar"
 
-#: builtin/log.c:1645
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr "visa fรถrloppsindikator medan patchar skapas"
 
-#: builtin/log.c:1647
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "visa รคndringar mot <rev> i omslagsbrev eller ensam patch"
 
-#: builtin/log.c:1650
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "visa รคndringar mot <refspec> i omslagsbrev eller ensam patch"
 
-#: builtin/log.c:1652
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr "procent som skapelse vรคgs med"
 
-#: builtin/log.c:1727
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ogiltig ident-rad: %s"
 
-#: builtin/log.c:1742
+#: builtin/log.c:1807
 msgid "-n and -k are mutually exclusive"
 msgstr "-n och -k kan inte anvรคndas samtidigt"
 
-#: builtin/log.c:1744
+#: builtin/log.c:1809
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc och -k kan inte anvรคndas samtidigt"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr "kan inte anvรคnda --name-only"
 
-#: builtin/log.c:1754
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr "kan inte anvรคnda --name-status"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr "kan inte anvรคnda --check"
 
-#: builtin/log.c:1788
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
-msgstr "standard ut, eller katalog, vilken skall det vara?"
+msgstr "standard ut, eller katalog, vilken ska det vara?"
 
-#: builtin/log.c:1877
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff krรคver --cover-letter eller ensam patch"
 
-#: builtin/log.c:1881
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1882
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff mot v%d:"
 
-#: builtin/log.c:1888
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor krรคver --range-diff"
 
-#: builtin/log.c:1892
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff krรคver --cover-letter eller ensam patch"
 
-#: builtin/log.c:1900
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr "Intervall-diff:"
 
-#: builtin/log.c:1901
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Intervall-diff mot v%d:"
 
-#: builtin/log.c:1912
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "kunde inte lรคsa signaturfil \"%s\""
 
-#: builtin/log.c:1948
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr "Skapar patchar"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2073
 msgid "failed to create output files"
 msgstr "misslyckades skapa utdatafiler"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<uppstrรถm> [<huvud> [<grรคns>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -14792,7 +15811,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "visa inte fjรคrr-URL"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
 msgid "exec"
 msgstr "exec"
 
@@ -14877,149 +15896,149 @@ msgstr "git merge --abort"
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:119
 msgid "switch `m' requires a value"
 msgstr "flaggan \"m\" behรถver ett vรคrde"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "flaggan \"%s\" behรถver ett vรคrde"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:188
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:189
 #, c-format
 msgid "Available strategies are:"
 msgstr "Tillgรคngliga strategier รคr:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:194
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Tillgรคngliga skrรคddarsydda strategier รคr:"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:245 builtin/pull.c:132
 msgid "do not show a diffstat at the end of the merge"
 msgstr "visa inte en diffstat nรคr sammanslagningen รคr fรคrdig"
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:248 builtin/pull.c:135
 msgid "show a diffstat at the end of the merge"
 msgstr "visa en diffstat nรคr sammanslagningen รคr fรคrdig"
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:249 builtin/pull.c:138
 msgid "(synonym to --stat)"
 msgstr "(synonym till --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:251 builtin/pull.c:141
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "lรคgg till (som mest <n>) poster frรฅn shortlog till incheckningsmeddelandet"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:254 builtin/pull.c:147
 msgid "create a single commit instead of doing a merge"
 msgstr "skapa en ensam incheckning istรคllet fรถr en sammanslagning"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:256 builtin/pull.c:150
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "utfรถr en incheckning om sammanslagningen lyckades (standard)"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:258 builtin/pull.c:153
 msgid "edit message before committing"
 msgstr "redigera meddelande innan incheckning"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:260
 msgid "allow fast-forward (default)"
 msgstr "tillรฅt snabbspolning (standard)"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:262 builtin/pull.c:160
 msgid "abort if fast-forward is not possible"
 msgstr "avbryt om snabbspolning inte รคr mรถjlig"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:266 builtin/pull.c:163
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "bekrรคfta att den namngivna incheckningen har en giltig GPG-signatur"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
 msgid "strategy"
 msgstr "strategi"
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:268 builtin/pull.c:168
 msgid "merge strategy to use"
 msgstr "sammanslagningsstrategi att anvรคnda"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:171
 msgid "option=value"
 msgstr "alternativ=vรคrde"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option for selected merge strategy"
 msgstr "alternativ fรถr vald sammanslagningsstrategi"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "incheckningsmeddelande fรถr (icke snabbspolande) sammanslagning"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr "avbryt den pรฅgรฅende sammanslagningen"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort men lรคmna index och arbetskatalog ensamma"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr "fortsรคtt den pรฅgรฅende sammanslagningen"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:285 builtin/pull.c:179
 msgid "allow merging unrelated histories"
 msgstr "tillรฅt sammanslagning av orelaterade historier"
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "bekrรคfta commit-msg-krok"
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "fรถrbigรฅ pre-merge-commit- och commit-msg-krokar"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:308
 msgid "could not run stash."
 msgstr "kunde kรถra stash."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:313
 msgid "stash failed"
 msgstr "stash misslyckades"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:318
 #, c-format
 msgid "not a valid object: %s"
 msgstr "inte ett giltigt objekt: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
 msgid "read-tree failed"
 msgstr "read-tree misslyckades"
 
-#: builtin/merge.c:386
+#: builtin/merge.c:387
 msgid " (nothing to squash)"
 msgstr " (inget att platta till)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:398
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:448
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:499
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "\"%s\" verkar inte peka pรฅ en incheckning"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:586
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Felaktig branch.%s.mergeoptions-strรคng: %s"
@@ -15074,73 +16093,73 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
 "avbryter incheckningen.\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:865
 msgid "Empty commit message."
 msgstr "Tomt incheckningsmeddelande."
 
-#: builtin/merge.c:872
+#: builtin/merge.c:880
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Underbart.\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:941
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Kunde inte slรฅ ihop automatiskt; fixa konflikter och checka in resultatet.\n"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:980
 msgid "No current branch."
 msgstr "Inte pรฅ nรฅgon gren."
 
-#: builtin/merge.c:974
+#: builtin/merge.c:982
 msgid "No remote for the current branch."
 msgstr "Ingen fjรคrr fรถr aktuell gren."
 
-#: builtin/merge.c:976
+#: builtin/merge.c:984
 msgid "No default upstream defined for the current branch."
 msgstr "Ingen standarduppstrรถm angiven fรถr aktuell gren."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:989
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Ingen fjรคrrspรฅrande gren fรถr %s frรฅn %s"
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1046
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Felaktigt vรคrde \"%s\" i miljรถvariabeln \"%s\""
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1149
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "inte nรฅgot vi kan slรฅ ihop med %s: %s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1183
 msgid "not something we can merge"
 msgstr "inte nรฅgot vi kan slรฅ ihop"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1286
 msgid "--abort expects no arguments"
 msgstr "--abort tar inga argument"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1290
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1299
 msgid "--quit expects no arguments"
 msgstr "--quit tar inga argument"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1312
 msgid "--continue expects no arguments"
 msgstr "--continue tar inga argument"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1316
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning pรฅgรฅr (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1332
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15148,7 +16167,7 @@ msgstr ""
 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
 "Checka in dina รคndringar innan du slรฅr ihop."
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1339
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15156,96 +16175,96 @@ msgstr ""
 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
 "Checka in dina รคndringar innan du slรฅr ihop."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1342
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1356
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Du kan inte kombinera --squash med --no-ff."
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1358
 msgid "You cannot combine --squash with --commit."
 msgstr "Du kan inte kombinera --squash med --commit."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1374
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Ingen incheckning angiven och merge.defaultToUpstream รคr ej satt."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1391
 msgid "Squash commit into empty head not supported yet"
 msgstr "Stรถder inte en tillplattningsincheckning pรฅ ett tomt huvud รคnnu"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1393
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Icke-snabbspolad incheckning kan inte anvรคndas med ett tomt huvud"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1398
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - inte nรฅgot vi kan slรฅ ihop"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1400
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Kan endast slรฅ ihop en enda incheckning i ett tomt huvud"
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1481
 msgid "refusing to merge unrelated histories"
 msgstr "vรคgrar slรฅ samman orelaterad historik"
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1490
 msgid "Already up to date."
 msgstr "Redan ร  jour."
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1500
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Uppdaterar %s..%s\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Fรถrsรถker riktigt enkel sammanslagning i indexet...\n"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1549
 #, c-format
 msgid "Nope.\n"
 msgstr "Nej.\n"
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1574
 msgid "Already up to date. Yeeah!"
 msgstr "Redan ร  jour. Toppen!"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1580
 msgid "Not possible to fast-forward, aborting."
 msgstr "Kan inte snabbspola, avbryter."
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1603 builtin/merge.c:1668
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "ร…terspolar trรคdet till orรถrt...\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1607
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Fรถrsรถker sammanslagningsstrategin %s...\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1659
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1661
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Sammanslagning med strategin %s misslyckades.\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1670
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Anvรคnder %s fรถr att fรถrbereda lรถsning fรถr hand.\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1682
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -15331,33 +16350,33 @@ msgstr "varna inte om konflikter"
 msgid "set labels for file1/orig-file/file2"
 msgstr "sรคtt etiketter fรถr fil1/origfil/fil2"
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "okรคnd flagga %s"
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "kunde inte tolka objektet \"%s\""
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "kan inte hantera mer รคn %d bas. Ignorerar %s."
 msgstr[1] "kan inte hantera mer รคn %d baser. Ignorerar %s."
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "hanterar inte nรฅgot annat รคn en sammanslagning av tvรฅ huvuden."
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "kunde inte bestรคmma referensen \"%s\""
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Slรฅr ihop %s med %s\n"
@@ -15380,17 +16399,17 @@ msgstr "tillรฅt skapa mer รคn ett trรคd"
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
-"git multi-pack-index [--object-dir=<kat>] (write|verify|expire|repack --"
-"batch-size=<storlek>)"
+"git multi-pack-index [<flaggor>] (write|verify|expire|repack --batch-"
+"size=<storlek>)"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "objektkatalog med uppsรคttning av par med paketfiler och pack-index"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15398,15 +16417,15 @@ msgstr ""
 "vid ompackning, samla mindre paketfiler i en bunt som รคr stรถrre รคn denna "
 "storlekt"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr "fรถr mรฅnga argument"
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr "flaggan --batch-size anvรคnds bara i underkommandot \"repack\""
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "okรคnt underkommando: %s"
@@ -15499,52 +16518,52 @@ msgstr "%s, kรคlla=%s, mรฅl=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Byter namn pรฅ %s till %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "misslyckades byta namn pรฅ \"%s\""
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<flaggor>] <incheckning>..."
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<flaggor>] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<flaggor>] --stdin"
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr "skriv endast namn (ingen SHA-1)"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "anvรคnd endast taggar fรถr att namnge incheckningar"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "anvรคnd endast referenser som motsvarar <mรถnster>"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignorera referenser som motsvarar <mรถnster>"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "lista alla incheckningar som kan nรฅs alla referenser"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "lรคs frรฅn standard in"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "tillรฅt att skriva \"odefinierade\" namn (standard)"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "avreferera taggar i indata (anvรคnds internt)"
 
@@ -15943,7 +16962,7 @@ msgstr "fรถrsรถk att ta bort icke-existerande anteckningar รคr inte ett fel"
 msgid "read object names from the standard input"
 msgstr "lรคs objektnamn frรฅn standard in"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "ta inte bort, bara visa"
 
@@ -15959,7 +16978,7 @@ msgstr "anteckningar-ref"
 msgid "use notes from <notes-ref>"
 msgstr "anvรคnd anteckningar frรฅn <anteckningsref>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1643
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "okรคnt underkommando: %s"
@@ -15976,125 +16995,102 @@ msgid ""
 msgstr ""
 "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
 
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:430
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "felaktig CRC fรถr packat objekt %s"
 
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:441
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "trasigt packat objekt fรถr %s"
 
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:572
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "rekursivt delta upptรคcktes fรถr objektet %s"
 
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:783
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "ordnade %u objekt, fรถrvรคntade %<PRIu32>"
 
-#: builtin/pack-objects.c:790
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "packfil รคr ogiltig: %s"
-
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "kan inte รถppna packfil fรถr รฅteranvรคndning: %s"
-
-#: builtin/pack-objects.c:798
-msgid "unable to seek in reused packfile"
-msgstr "kan inte sรถka i รฅteranvรคnd packfil"
-
-#: builtin/pack-objects.c:809
-msgid "unable to read from reused packfile"
-msgstr "kan inte lรคsa frรฅn รฅteranvรคnd packfil"
-
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:972
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "inaktiverar skrivning av bitkarta, paket delas pรฅ grund av pack.packSizeLimit"
 
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:985
 msgid "Writing objects"
 msgstr "Skriver objekt"
 
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "misslyckades ta status pรฅ %s"
 
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:1099
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "skrev %<PRIu32> objekt medan %<PRIu32> fรถrvรคntades"
 
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1297
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "inaktiverar skrivning av bitkarta dรฅ nรฅgra objekt inte packas"
 
-#: builtin/pack-objects.c:1591
+#: builtin/pack-objects.c:1724
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "deltabasoffset utanfรถr grรคnsen i pack fรถr %s"
 
-#: builtin/pack-objects.c:1600
+#: builtin/pack-objects.c:1733
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "deltabasoffset utanfรถr grรคnsvรคrden fรถr %s"
 
-#: builtin/pack-objects.c:1869
+#: builtin/pack-objects.c:2004
 msgid "Counting objects"
 msgstr "Rรคknar objekt"
 
-#: builtin/pack-objects.c:1999
-#, c-format
-msgid "unable to get size of %s"
-msgstr "kan inte hรคmta storlek pรฅ %s"
-
-#: builtin/pack-objects.c:2014
+#: builtin/pack-objects.c:2149
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "kunde inte tolka objekthuvud fรถr %s"
 
-#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
-#: builtin/pack-objects.c:2110
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
 #, c-format
 msgid "object %s cannot be read"
 msgstr "objektet %s kunde inte lรคsas"
 
-#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "objektet %s har inkonsistent objektlรคngd (%<PRIuMAX> mot %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2124
+#: builtin/pack-objects.c:2259
 msgid "suboptimal pack - out of memory"
 msgstr "icke-optimalt pack - minnet slut"
 
-#: builtin/pack-objects.c:2450
+#: builtin/pack-objects.c:2574
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Deltakomprimering anvรคnder upp till %d trรฅdar"
 
-#: builtin/pack-objects.c:2582
+#: builtin/pack-objects.c:2713
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "kan inte packa objekt nรฅbara frรฅn taggen %s"
 
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2801
 msgid "Compressing objects"
 msgstr "Komprimerar objekt"
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2807
 msgid "inconsistency with delta count"
 msgstr "deltarรคknaren รคr inkonsekvent"
 
-#: builtin/pack-objects.c:2756
+#: builtin/pack-objects.c:2888
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16103,7 +17099,7 @@ msgstr ""
 "fรถrvรคntade kant-objekt-id, fick skrรคp:\n"
 " %s"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2894
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16112,243 +17108,234 @@ msgstr ""
 "fรถrvรคntade objekt-id, fick skrรคp:\n"
 " %s"
 
-#: builtin/pack-objects.c:2860
+#: builtin/pack-objects.c:2992
 msgid "invalid value for --missing"
 msgstr "ogiltigt vรคrde fรถr --missing"
 
-#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
 msgid "cannot open pack index"
 msgstr "kan inte รถppna paketfilen"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:3082
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "lรถsa objekt pรฅ %s kunde inte underรถkas"
 
-#: builtin/pack-objects.c:3035
+#: builtin/pack-objects.c:3167
 msgid "unable to force loose object"
 msgstr "kan inte tvinga lรถsa objekt"
 
-#: builtin/pack-objects.c:3127
+#: builtin/pack-objects.c:3260
 #, c-format
 msgid "not a rev '%s'"
 msgstr "inte en referens \"%s\""
 
-#: builtin/pack-objects.c:3130
+#: builtin/pack-objects.c:3263
 #, c-format
 msgid "bad revision '%s'"
 msgstr "felaktig revision \"%s\""
 
-#: builtin/pack-objects.c:3155
+#: builtin/pack-objects.c:3288
 msgid "unable to add recent objects"
 msgstr "kan inte lรคgga till nya objekt"
 
-#: builtin/pack-objects.c:3208
+#: builtin/pack-objects.c:3341
 #, c-format
 msgid "unsupported index version %s"
 msgstr "indexversionen %s stรถds ej"
 
-#: builtin/pack-objects.c:3212
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "bad index version '%s'"
 msgstr "felaktig indexversion \"%s\""
 
-#: builtin/pack-objects.c:3242
-msgid "do not show progress meter"
-msgstr "visa inte fรถrloppsindikator"
-
-#: builtin/pack-objects.c:3244
-msgid "show progress meter"
-msgstr "visa fรถrloppsindikator"
-
-#: builtin/pack-objects.c:3246
-msgid "show progress meter during object writing phase"
-msgstr "visa fรถrloppsindikator under objektskrivningsfasen"
-
-#: builtin/pack-objects.c:3249
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "som --all-progress nรคr fรถrloppsindikatorn visas"
-
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3383
 msgid "<version>[,<offset>]"
 msgstr "<version>[,<offset>]"
 
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3384
 msgid "write the pack index file in the specified idx format version"
 msgstr "skriv paketindexfilen i angiven indexformatversion"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3387
 msgid "maximum size of each output pack file"
 msgstr "maximal storlek pรฅ varje utdatapaketfil"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3389
 msgid "ignore borrowed objects from alternate object store"
-msgstr "ignorera lรฅnade objekt frรฅn alternativa objektlager"
+msgstr "ignorera lรฅnade objekt frรฅn supplerande objektlager"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3391
 msgid "ignore packed objects"
 msgstr "ignorera packade objekt"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3393
 msgid "limit pack window by objects"
 msgstr "begrรคnsa paketfรถnster efter objekt"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3395
 msgid "limit pack window by memory in addition to object limit"
 msgstr "begrรคnsa paketfรถnster efter minne fรถrutom objektgrรคns"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3397
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "maximal lรคngd pรฅ deltakedja tillรฅten i slutligt paket"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3399
 msgid "reuse existing deltas"
 msgstr "รฅteranvรคnd befintliga delta"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3401
 msgid "reuse existing objects"
 msgstr "รฅteranvรคnd befintliga objekt"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3403
 msgid "use OFS_DELTA objects"
 msgstr "anvรคnd OFS_DELTA-objekt"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3405
 msgid "use threads when searching for best delta matches"
 msgstr "anvรคnd trรฅdar vid sรถkning efter bรคsta deltatrรคffar"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3407
 msgid "do not create an empty pack output"
 msgstr "fรถrsรถk inte skapa tom paketutdata"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3409
 msgid "read revision arguments from standard input"
 msgstr "lรคs revisionsargument frรฅn standard in"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3411
 msgid "limit the objects to those that are not yet packed"
 msgstr "begrรคnsa objekt till dem som รคnnu inte packats"
 
-#: builtin/pack-objects.c:3281
+#: builtin/pack-objects.c:3414
 msgid "include objects reachable from any reference"
 msgstr "inkludera objekt som kan nรฅs frรฅn nรฅgon referens"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3417
 msgid "include objects referred by reflog entries"
 msgstr "inkludera objekt som refereras frรฅn referensloggposter"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3420
 msgid "include objects referred to by the index"
 msgstr "inkludera objekt som refereras frรฅn indexet"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3423
 msgid "output pack to stdout"
 msgstr "skriv paket pรฅ standard ut"
 
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3425
 msgid "include tag objects that refer to objects to be packed"
-msgstr "inkludera taggobjekt som refererar objekt som skall packas"
+msgstr "inkludera taggobjekt som refererar objekt som ska packas"
 
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3427
 msgid "keep unreachable objects"
 msgstr "behรฅll onรฅbara objekt"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3429
 msgid "pack loose unreachable objects"
 msgstr "packa lรถsa onรฅbara objekt"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3431
 msgid "unpack unreachable objects newer than <time>"
 msgstr "packa upp onรฅbara objekt nyare รคn <tid>"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3434
 msgid "use the sparse reachability algorithm"
 msgstr "anvรคnd gles-nรฅbarhetsalgoritmen"
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3436
 msgid "create thin packs"
 msgstr "skapa tunna paket"
 
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3438
 msgid "create packs suitable for shallow fetches"
 msgstr "skapa packfiler lรคmpade fรถr grunda hรคmtningar"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3440
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorera paket som har tillhรถrande .keep-fil"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3442
 msgid "ignore this pack"
 msgstr "ignorera detta paket"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3444
 msgid "pack compression level"
 msgstr "komprimeringsgrad fรถr paket"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3446
 msgid "do not hide commits by grafts"
 msgstr "gรถm inte incheckningar med ympningar (\"grafts\")"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3448
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "anvรคnd bitkartindex om tillgรคngligt fรถr att rรคkna objekt snabbare"
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3450
 msgid "write a bitmap index together with the pack index"
 msgstr "anvรคnd bitkartindex tillsammans med packindexet"
 
-#: builtin/pack-objects.c:3320
+#: builtin/pack-objects.c:3454
+msgid "write a bitmap index if possible"
+msgstr "skriv bitkartindex om mรถjligt"
+
+#: builtin/pack-objects.c:3458
 msgid "handling for missing objects"
 msgstr "hantering av saknade objekt"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3461
 msgid "do not pack objects in promisor packfiles"
 msgstr "packa inte objekt i kontraktspackfiler"
 
-#: builtin/pack-objects.c:3325
+#: builtin/pack-objects.c:3463
 msgid "respect islands during delta compression"
 msgstr "respektera รถar under deltakomprimering"
 
-#: builtin/pack-objects.c:3350
+#: builtin/pack-objects.c:3492
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "deltakedjedjupet %d รคr fรถr djupt, pรฅtvingar %d"
 
-#: builtin/pack-objects.c:3355
+#: builtin/pack-objects.c:3497
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit รคr fรถr hรถgt, pรฅtvingar %d"
 
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3551
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
-"--max-pack-size kan inte anvรคndas fรถr att bygga ett paket som skall รถverfรถras"
+"--max-pack-size kan inte anvรคndas fรถr att bygga ett paket som ska รถverfรถras"
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3553
 msgid "minimum pack size limit is 1 MiB"
 msgstr "minsta packstorlek รคr 1 MiB"
 
-#: builtin/pack-objects.c:3416
+#: builtin/pack-objects.c:3558
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin kan inte anvรคndas fรถr att bygga ett indexerbart paket"
 
-#: builtin/pack-objects.c:3419
+#: builtin/pack-objects.c:3561
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable och -unpack-unreachable kan inte anvรคndas samtidigt"
 
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3567
 msgid "cannot use --filter without --stdout"
 msgstr "kan inte anvรคnda --filter utan --stdout"
 
-#: builtin/pack-objects.c:3486
+#: builtin/pack-objects.c:3627
 msgid "Enumerating objects"
 msgstr "Rรคknar upp objekt"
 
-#: builtin/pack-objects.c:3516
+#: builtin/pack-objects.c:3657
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 msgstr ""
-"Totalt %<PRIu32> (delta %<PRIu32>), รฅteranvรคnde %<PRIu32> (delta %<PRIu32>)"
+"Totalt %<PRIu32> (delta %<PRIu32>), รฅteranvรคnde %<PRIu32> (delta %<PRIu32>), "
+"paket-รฅteranvรคnda %<PRIu32>"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16390,53 +17377,53 @@ msgstr "begrรคnsa vandring av objekt utanfรถr kontraktspackfiler."
 msgid "cannot prune in a precious-objects repo"
 msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Felaktigt vรคrde fรถr %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/pull.c:141
+#: builtin/pull.c:122
 msgid "control for recursive fetching of submodules"
 msgstr "styrning fรถr rekursiv hรคmtning av undermoduler"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:126
 msgid "Options related to merging"
 msgstr "Alternativ gรคllande sammanslagning"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:129
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "inlemma รคndringar genom ombasering i stรคllet fรถr sammanslagning"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "tillรฅt snabbspolning"
 
-#: builtin/pull.c:185
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "utfรถr automatiskt stash/stash pop fรถre och efter ombasering"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:182
 msgid "Options related to fetching"
 msgstr "Alternativ gรคllande hรคmtningar"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:192
 msgid "force overwrite of local branch"
 msgstr "tvinga รถverskrivning av lokal gren"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:200
 msgid "number of submodules pulled in parallel"
 msgstr "antal undermoduler som hรคmtas parallellt"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:300
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Felaktigt vรคrde fรถr pull.ff: %s"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:426
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16444,14 +17431,14 @@ msgstr ""
 "Det finns ingen kandidat fรถr ombasering bland referenserna du precis har "
 "hรคmtat."
 
-#: builtin/pull.c:435
+#: builtin/pull.c:428
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Det finns ingen kandidat fรถr sammanslagning bland referenserna du precis har "
 "hรคmtat."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:429
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16459,7 +17446,7 @@ msgstr ""
 "Det betyder vanligtvis att du anvรคnt en jokertecken-refspec som inte\n"
 "motsvarade nรฅgot i fjรคrrรคnden."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:432
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16470,42 +17457,42 @@ msgstr ""
 "gren. Eftersom det inte รคr den fjรคrr som รคr konfigurerad som\n"
 "standard fรถr aktuell gren mรฅste du ange en gren pรฅ kommandoraden."
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Du รคr inte pรฅ nรฅgon gren fรถr nรคrvarande."
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Ange vilken gren du vill ombasera mot."
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Ange vilken gren du vill slรฅ samman med."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:442 builtin/pull.c:457
 msgid "See git-pull(1) for details."
 msgstr "Se git-pull(1) fรถr detaljer."
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<fjรคrr>"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<gren>"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Det finns ingen spรฅrningsinformation fรถr aktuell gren."
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "Om du vill ange spรฅrningsinformation fรถr grenen kan du gรถra det med:"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:466
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16514,32 +17501,32 @@ msgstr ""
 "Dina instรคllningar anger sammanslagning med referensen \"%s\"\n"
 "frรฅn fjรคrren, men nรฅgon sรฅdan referens togs inte emot."
 
-#: builtin/pull.c:581
+#: builtin/pull.c:576
 #, c-format
 msgid "unable to access commit %s"
 msgstr "kunde inte komma รฅt incheckningen %s"
 
-#: builtin/pull.c:861
+#: builtin/pull.c:857
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorera --verify-signatures fรถr ombasering"
 
-#: builtin/pull.c:916
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash รคr endast giltig med --rebase."
 
-#: builtin/pull.c:924
+#: builtin/pull.c:920
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Uppdaterar en ofรถdd gren med รคndringar som lagts till i indexet."
 
-#: builtin/pull.c:928
+#: builtin/pull.c:924
 msgid "pull with rebase"
 msgstr "pull med ombasering"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:925
 msgid "please commit or stash them."
 msgstr "checka in eller anvรคnd \"stash\" pรฅ dem."
 
-#: builtin/pull.c:954
+#: builtin/pull.c:950
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16550,7 +17537,7 @@ msgstr ""
 "snabbspolar din arbetskatalog frรฅn\n"
 "incheckningen %s."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:956
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16567,15 +17554,15 @@ msgstr ""
 "$ git reset --hard\n"
 "fรถr att รฅtergรฅ."
 
-#: builtin/pull.c:975
+#: builtin/pull.c:971
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kan inte slรฅ ihop flera grenar i ett tomt huvud."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:975
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kan inte ombasera ovanpรฅ flera grenar."
 
-#: builtin/pull.c:986
+#: builtin/pull.c:982
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "kan inte ombasera med lokalt lagrade รคndringar i undermoful"
 
@@ -16583,15 +17570,15 @@ msgstr "kan inte ombasera med lokalt lagrade รคndringar i undermoful"
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "taggfรถrkortning utan <tagg>"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete godtar endast enkla mรฅlreferensnamn"
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16600,7 +17587,7 @@ msgstr ""
 "Fรถr att vรคlja ett av alternativen permanent, se push.default i \"git help "
 "config\"."
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16625,7 +17612,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16640,7 +17627,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<namn-pรฅ-fjรคrrgren>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16653,12 +17640,12 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Den aktuella grenen %s har flera uppstrรถmsgrenar, vรคgrar sรคnda."
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -16667,16 +17654,16 @@ msgid ""
 msgstr ""
 "Du sรคnder till fjรคrren \"%s\", som inte รคr uppstrรถms fรถr den\n"
 "aktuella grenen \"%s\", utan att tala om fรถr mig vad som\n"
-"skall sรคndas fรถr att uppdatera fjรคrrgrenen."
+"ska sรคndas fรถr att uppdatera fjรคrrgrenen."
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Du angav inga referensspecifikationer att sรคnda, och push.default รคr "
 "\"nothing\"."
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -16688,7 +17675,7 @@ msgstr ""
 "\"git pull ....\") innan du sรคnder igen.\n"
 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" fรถr detaljer."
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -16700,7 +17687,7 @@ msgstr ""
 "\"git pull ...\") innan du sรคnder igen.\n"
 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" fรถr detaljer."
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -16714,11 +17701,11 @@ msgstr ""
 "(t.ex. \"git pull ...\") innan du sรคnder igen.\n"
 "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" fรถr detaljer."
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Uppdateringarna avvisades eftersom taggen redan finns pรฅ fjรคrren."
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -16729,140 +17716,140 @@ msgstr ""
 "pekar pรฅ nรฅgot som inte รคr en incheckning, utan att anvรคnda flaggan\n"
 "\"--force\".\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Sรคnder till %s\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "misslyckades sรคnda vissa referenser till \"%s\""
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "felaktigt arkiv \"%s\""
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"Ingen destination har angivits.\n"
-"Ange antingen URL:en pรฅ kommandoraden eller stรคll in ett uppstrรถmsarkiv med\n"
-"\n"
-"    git remote add <namn> <url>\n"
-"\n"
-"och sรคnd sedan med hjรคlp av fjรคrrnamnet\n"
-"\n"
-"    git push <namn>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr "arkiv"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "sรคnd alla referenser"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "spegla alla referenser"
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "ta bort referenser"
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "sรคnd taggar (kan inte anvรคndas med --all eller --mirror)"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "tvinga uppdateringar"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
 msgstr "<refnamn>:<fรถrvรคnta>"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr "krรคv att ref:s tidigare vรคrde รคr detta"
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr "styr rekursiv insรคndning av undermoduler"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr "anvรคnd tunna paket"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "program fรถr att ta emot paket"
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr "stรคll in uppstrรถm fรถr git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
 msgstr "ta bort lokalt borttagna referenser"
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr "fรถrbigรฅ pre-push-krok"
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr "sรคnd in saknade men relevanta taggar"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr "GPG-signera insรคndningen"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr "begรคr atomiska transaktioner pรฅ fjรคrrsidan"
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete รคr inkompatibel med --all, --mirror och --tags"
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete kan inte anvรคndas utan referenser"
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "felaktigt arkiv \"%s\""
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"Ingen destination har angivits.\n"
+"Ange antingen URL:en pรฅ kommandoraden eller stรคll in ett uppstrรถmsarkiv med\n"
+"\n"
+"    git remote add <namn> <url>\n"
+"\n"
+"och sรคnd sedan med hjรคlp av fjรคrrnamnet\n"
+"\n"
+"    git push <namn>\n"
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr "--all och --tags รคr inkompatibla"
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr "--all kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror och --tags รคr inkompatibla"
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr "--all och --mirror รคr inkompatibla"
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr "push-flaggor kan inte innehรฅlla radbrytning"
 
@@ -16879,24 +17866,32 @@ msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-รคnda>"
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<flaggor>] <bas> <gammal-รคnda> <ny-รคnda>"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr "Procent som skapelse vรคgs med"
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "anvรคnd enkla diff-fรคrger"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "anteckningar"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "sรคnds till \"git log\""
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr ".. saknas i intervall: \"%s\""
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "ensamt argument mรฅste vara symmetriskt intervall"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "behรถver tvรฅ incheckningsintervall"
 
@@ -16978,13 +17973,17 @@ msgstr "felsรถk unpack-trees"
 msgid "suppress feedback messages"
 msgstr "undertryck รฅterkopplingsmeddelanden"
 
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Du mรฅste lรถsa ditt befintliga index fรถrst"
+
 #: builtin/rebase.c:32
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] [<uppstrรถm>] "
-"[<gren>]"
+"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas> | --keep-base] "
+"[<uppstrรถm> [<gren>]]"
 
 #: builtin/rebase.c:34
 msgid ""
@@ -16996,216 +17995,207 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "oanvรคndbar todo-lista: %s"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "kunde inte skriva \"%s\"."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "inget HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:292
 #, c-format
 msgid "could not create temporary %s"
 msgstr "kunde inte skapa temporรคr %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:298
 msgid "could not mark as interactive"
 msgstr "kunde inte markera som interaktiv"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:352
 msgid "could not generate todo list"
 msgstr "Kunde inte skapa attgรถra-lista"
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:391
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "en basincheckning mรฅste anges med --upstream eller --onto"
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:461
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<flaggor>]"
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "behรฅll tomma incheckningar"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(Fร–Rร…LDRAD) behรฅll tomma incheckningar"
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "tillรฅt incheckningar med tomt meddelande"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:480
 msgid "rebase merge commits"
 msgstr "ombasera sammanslagningar"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:482
 msgid "keep original branch points of cousins"
 msgstr "behรฅll ursprungliga fรถrgreningspunkter fรถr kusiner"
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:484
 msgid "move commits that begin with squash!/fixup!"
 msgstr "flytta incheckningar som inleds med squash!/fixup!"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:485
 msgid "sign commits"
 msgstr "signera incheckningar"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:487 builtin/rebase.c:1490
 msgid "display a diffstat of what changed upstream"
 msgstr "vis diffstat fรถr vad som รคndrats uppstrรถms"
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:489
 msgid "continue rebase"
 msgstr "fortsรคtt ombasering"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:491
 msgid "skip commit"
 msgstr "hoppa รถver incheckning"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:492
 msgid "edit the todo list"
 msgstr "redigera attgรถra-listan"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:494
 msgid "show the current patch"
 msgstr "visa nuvarande patch"
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:497
 msgid "shorten commit ids in the todo list"
 msgstr "fรถrkorta inchecknings-id i todo-listan"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:499
 msgid "expand commit ids in the todo list"
 msgstr "utรถka inchecknings-id i todo-listan"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:501
 msgid "check the todo list"
 msgstr "kontrollera todo-listan"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:503
 msgid "rearrange fixup/squash lines"
 msgstr "ordna om fixup-/squash-rader"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:505
 msgid "insert exec commands in todo list"
 msgstr "lรคgg in exec-kommandon i todo-listan"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:506
 msgid "onto"
 msgstr "ovanpรฅ"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict-revision"
 msgstr "restrict-revision"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict revision"
 msgstr "begrรคnsa revision"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:511
 msgid "squash-onto"
 msgstr "squash-onto"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:512
 msgid "squash onto"
 msgstr "tryck ihop ovanpรฅ"
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:514
 msgid "the upstream commit"
 msgstr "uppstrรถmsincheckningen"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head-name"
 msgstr "head-name"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head name"
 msgstr "namn pรฅ huvud"
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:521
 msgid "rebase strategy"
 msgstr "sammanslagningsstrategi"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:522
 msgid "strategy-opts"
 msgstr "strategy-opts"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:523
 msgid "strategy options"
 msgstr "strategiflaggor"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:524
 msgid "switch-to"
 msgstr "switch-to"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:525
 msgid "the branch or commit to checkout"
 msgstr "gren eller inchecking att checka ut"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto-name"
 msgstr "onto-name"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto name"
 msgstr "pรฅ-namn"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "cmd"
 msgstr "kmd"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "the command to run"
 msgstr "kommando att kรถra"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:530 builtin/rebase.c:1584
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "kรถr automatiskt alla \"exec\" som misslyckas pรฅ nytt"
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:546
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:562
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s krรคver en interaktiv ombasering"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:612
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "kunde inte hรคmta \"onto\": \"%s\""
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:627
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "ogiltigt orig-head: \"%s\""
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:652
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\""
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:728
 #, c-format
 msgid "Could not read '%s'"
 msgstr "Kunde inte lรคsa \"%s\""
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:746
 #, c-format
 msgid "Cannot store %s"
 msgstr "Kan inte spara %s"
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:853
 msgid "could not determine HEAD revision"
 msgstr "kunde inte bestรคmma HEAD-revision"
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17219,7 +18209,7 @@ msgstr ""
 "Fรถr att avbryta och รฅtergรฅ till dรคr du var fรถre ombaseringen, kรถr \"git "
 "rebase --abort\"."
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -17238,7 +18228,15 @@ msgstr ""
 "\n"
 "Dรคrfรถr kan inte git ombasera dessa."
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"okรคnd tom-typ \"%s\"; giltiga vรคrden รคr \"drop\", \"keep\" och \"ask\"."
+
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "%s\n"
@@ -17255,7 +18253,7 @@ msgstr ""
 "    git rebase '<gren>'\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1417
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17268,128 +18266,136 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<gren> %s\n"
 "\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1447
 msgid "exec commands cannot contain newlines"
 msgstr "exec-kommandon kan inte innehรฅlla nyradstecken"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1451
 msgid "empty exec command"
 msgstr "tomt exec-kommando"
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1481
 msgid "rebase onto given branch instead of upstream"
 msgstr "ombasera mot given grenen istรคllet fรถr uppstrรถm"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "anvรคnd sammanslagningsbasen mellan uppstrรถms och gren som aktuell bas"
+
+#: builtin/rebase.c:1485
 msgid "allow pre-rebase hook to run"
 msgstr "tillรฅt pre-rebase-krok att kรถra"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1487
 msgid "be quiet. implies --no-stat"
 msgstr "var tyst. implicerar --no-stat"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1493
 msgid "do not show diffstat of what changed upstream"
 msgstr "visa inte en diffstat fรถr vad som รคndrats uppstrรถms"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1496
 msgid "add a Signed-off-by: line to each commit"
 msgstr "lรคgg \"Signed-off-by:\"-rad till varje incheckning"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
 msgid "passed to 'git am'"
 msgstr "sรคnds till \"git am\""
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
 msgid "passed to 'git apply'"
 msgstr "sรคnds till \"git apply\""
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "utfรถr cherry-pick pรฅ alla incheckningar, รคven om oรคndrad"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1515
 msgid "continue"
 msgstr "fortsรคtt"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1518
 msgid "skip current patch and continue"
 msgstr "hoppa รถver nuvarande patch och fortsรคtt"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1520
 msgid "abort and check out the original branch"
 msgstr "avbryt och checka ut ursprungsgrenen"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1523
 msgid "abort but keep HEAD where it is"
 msgstr "avbryt men behรฅll HEAD dรคr det รคr"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1524
 msgid "edit the todo list during an interactive rebase"
 msgstr "redigera attgรถra-listan under interaktiv ombasering."
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1527
 msgid "show the patch file being applied or merged"
 msgstr "visa patchen som tillรคmpas eller slรฅs samman"
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "anvรคnd appliceringstrategier fรถr ombasering"
+
+#: builtin/rebase.c:1534
 msgid "use merging strategies to rebase"
-msgstr "anvรคnd sammanslagningsstrategier fรถr sammanslagning"
+msgstr "anvรคnd sammanslagningsstrategier fรถr ombasering"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1538
 msgid "let the user edit the list of commits to rebase"
 msgstr "lรฅt anvรคndaren redigera listan รถver incheckningar att ombasera"
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1542
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr ""
 "(AVRร…DS) fรถrsรถk รฅterskapa sammanslagningar istรคllet fรถr att ignorera dem"
 
-#: builtin/rebase.c:1455
-msgid "preserve empty commits during rebase"
-msgstr "behรฅll tomma incheckningar under ombasering"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "hur incheckningar som blir tomma ska hanteras"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1554
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "flytta incheckningar som bรถrjar med squash!/fixup! under -i"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1560
 msgid "automatically stash/stash pop before and after"
 msgstr "utfรถr automatiskt stash/stash pop fรถre och efter"
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1562
 msgid "add exec lines after each commit of the editable list"
 msgstr "lรคgg till exec-rader efter varje incheckning i den redigerbara listan"
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1566
 msgid "allow rebasing commits with empty messages"
 msgstr "tillรฅt ombasering av incheckningar med tomt meddelande"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1570
 msgid "try to rebase merges instead of skipping them"
 msgstr "fรถrsรถk ombasera sammanslagningar istรคllet fรถr att ignorera dem"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1573
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "anvรคnd \"merge-base --fork-point\" fรถr att fรถrfina uppstrรถm"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1575
 msgid "use the given merge strategy"
 msgstr "anvรคnd angiven sammanslagningsstrategi"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
 msgid "option"
 msgstr "alternativ"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1578
 msgid "pass the argument through to the merge strategy"
 msgstr "sรคnd flaggan till sammanslagningsstrategin"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1581
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "ombasera alla nรฅbara incheckningar upp till roten/rรถtterna"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1598
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -17397,29 +18403,37 @@ msgstr ""
 "stรถdet fรถr rebase.useBuiltin har tagits bort!\n"
 "Se posten fรถr det i \"git help config\" fรถr detaljer."
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1604
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Det verkar som en \"git am\" kรถrs. Kan inte ombasera."
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1645
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 "git rebase --preserve-merges avrรฅds frรฅn. Anvรคnd --rebase-merges istรคllet."
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
+
+#: builtin/rebase.c:1656
 msgid "No rebase in progress?"
 msgstr "Ingen ombasering pรฅgรฅr?"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1660
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "ร…tgรคrden --edit-todo kan endast anvรคndas under interaktiv ombasering."
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1683
 msgid "Cannot read HEAD"
 msgstr "Kan inte lรคsa HEAD"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1695
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17427,16 +18441,16 @@ msgstr ""
 "Du mรฅste redigera alla sammanslagningskonflikter och\n"
 "dรคrefter markera dem som lรถsta med git add"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1714
 msgid "could not discard worktree changes"
 msgstr "kunde inte kasta รคndringar i arbetskatalogen"
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1733
 #, c-format
 msgid "could not move back to %s"
 msgstr "kunde inte flytta tillbaka till %s"
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1778
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17457,176 +18471,166 @@ msgstr ""
 "och kรถr programmet igen. Jag avslutar ifall du fortfarande har\n"
 "nรฅgot av vรคrde dรคr.\n"
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1806
 msgid "switch `C' expects a numerical value"
 msgstr "flaggan \"C\" fรถrvรคntar ett numeriskt vรคrde"
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1847
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Okรคnt lรคge: %s"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1869
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy krรคver --merge eller --interactive"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Okรคnd rebase-bakรคnda: %s"
+
+#: builtin/rebase.c:1937
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec krรคver --exec eller --interactive"
 
-#: builtin/rebase.c:1809
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"kan inte kombinera am-flaggor med varken interaktiv- eller "
-"sammanslagningsflaggor"
-
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1957
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1961
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec"
 "\""
 
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\""
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy\""
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1985
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "felaktig uppstrรถm \"%s\""
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1991
 msgid "Could not create new root commit"
 msgstr "kunde inte skapa ny rotincheckning"
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "\"%s\": behรถver precis en sammanslagningsbas med gren"
+
+#: builtin/rebase.c:2020
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "\"%s\": behรถver precis en sammanslagningsbas"
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:2028
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Pekar inte pรฅ en giltig incheckning: \"%s\""
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:2054
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "รถdesdigert: ingen sรฅdan gren/incheckning: \"%s\""
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr "Ingen sรฅdan referens: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2073
 msgid "Could not resolve HEAD to a revision"
 msgstr "Kunde inte bestรคmma HEAD:s incheckning"
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2111
 msgid "Cannot autostash"
 msgstr "Kan inte utfรถra \"autostash\""
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2114
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Ovรคntat svar frรฅn stash: \"%s\""
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2120
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Kunde inte skapa katalog fรถr \"%s\""
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2123
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Skapade autostash: %s\n"
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2126
 msgid "could not reset --hard"
 msgstr "kunde inte utfรถra \"reset --hard\""
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD รคr nu pรฅ %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2135
 msgid "Please commit or stash them."
 msgstr "Checka in eller anvรคnd \"stash\" pรฅ dem."
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr "kunde inte tolka \"%s\""
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2169
 #, c-format
 msgid "could not switch to %s"
 msgstr "kunde inte vรคxla till %s"
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2180
 msgid "HEAD is up to date."
 msgstr "HEAD รคr ร  jour."
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2182
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Aktuell gren %s รคr ร  jour.\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2190
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD รคr ร  jour, ombasering framtvingad."
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Aktuell gren %s รคr ร  jour, ombasering framtvingad.\n"
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2200
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Kroken pre-rebase vรคgrade ombaseringen."
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2207
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "ร„ndringar till %s:\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2210
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "ร„ndringar frรฅn %s till %s:\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2235
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Fรถrst, spolar tillbaka huvudet fรถr att spela av ditt arbete ovanpรฅ det...\n"
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2244
 msgid "Could not detach HEAD"
 msgstr "Kunde inte koppla frรฅn HEAD"
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2253
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Snabbspolade %s till %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-katalog>"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:821
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -17656,7 +18660,7 @@ msgstr ""
 "Fรถr att undvika detta meddelande och fortfarande behรฅlla det\n"
 "normala beteendet, sรคtt \"receive.denyCurrentBranch\" till \"refuse\"."
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -17707,49 +18711,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <referens>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "\"%s\" รคr inte en giltig tidsstรคmpel"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Markerar nรฅbara objekt..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s pekar ingenstans!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr "ingen referenslogg att ta bort angavs"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr "inte en referenslogg: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "ingen referenslogg fรถr \"%s\""
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "felaktigt referensformat: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -17757,82 +18761,82 @@ msgstr ""
 "git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <namn> <url>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <gammal> <ny>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <namn>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <namn>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <namn>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjรคrr>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <namn> <gren>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <namn>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <namn> <nyurl>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <namn> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<flaggor>] <namn> <url>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <namn> <gren>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <namn> <gren>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<flaggor>] <namn>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<flaggor>] <namn>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<flaggor>] [<grupp> | <fjรคrr>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Uppdaterar %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -17840,82 +18844,98 @@ msgstr ""
 "--mirror รคr farlig och fรถrรฅldrad; anvรคnd\n"
 "\t --mirror=fetch eller --mirror=push istรคllet"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "okรคnt argument till mirror: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "hรคmta fjรคrrgrenarna"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "importera alla taggar och associerade objekt vid hรคmtning"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "eller hรคmta inte nรฅgra taggar alls (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "gren(ar) att spรฅra"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "huvudgren"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "stรคll in arkiv som spegel att sรคnda eller ta emot frรฅn"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "att ange en master-gren ger ingen mening med --mirror"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "att ange grenar att spรฅra ger mening bara med hรคmtningsspeglar"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr "fjรคrrarkivet %s finns redan."
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "\"%s\" รคr inte ett giltigt namn pรฅ fjรคrrarkiv"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Kunde inte skapa master \"%s\""
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Kunde inte hรคmta mappning fรถr referensspecifikation %s"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "(matchande)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "(ta bort)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "kunde inte stรคlla in \"%s\""
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Konfigurationen fรถr %s fรถr remote.pushDefault i:\n"
+"\t%s:%d\n"
+"anger nu den icke-existerande fjรคrren \"%s\""
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Ingen sรฅdan fjรคrr: \"%s\""
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Kunde inte byta namn pรฅ konfigurationssektionen \"%s\" till \"%s\""
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -17926,17 +18946,17 @@ msgstr ""
 "\t%s\n"
 "\tUppdatera konfigurationen manuellt om nรถdvรคndigt."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr "misslyckades skapa \"%s\""
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -17950,118 +18970,118 @@ msgstr[1] ""
 "Observera: Nรฅgra grenar utanfรถr hierarkin refs/remotes/ togs inte bort;\n"
 "fรถr att ta bort dem, anvรคnd:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " ny (nรคsta hรคmtning sparar i remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr " spรฅrad"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " fรถrlegad (anvรคnd \"git remote prune\" fรถr att ta bort)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "ogiltig branch.%s.merge; kan inte ombasera รถver > 1 gren"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "ombaseras interaktivt pรฅ fjรคrren %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1052
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "ombaseras interaktivt (med sammanslagningar) pรฅ fjรคrren %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "ombaseras pรฅ fjรคrren %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr " sammanslรฅs med fjรคrren %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr "sammanslรฅs med fjรคrren %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    och med fjรคrren %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr "skapa"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr "ta bort"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr "ร jour"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr "kan snabbspolas"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr "lokal fรถrรฅldrad"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s tvingar till %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s sรคnder till %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s tvingar till %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s sรคnder till %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr "frรฅga inte fjรคrrar"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr "* fjรคrr %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  Hรคmt-URL: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr "(ingen URL)"
 
@@ -18069,193 +19089,184 @@ msgstr "(ingen URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  Sรคnd-URL: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD-gren: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr "(inte fรถrfrรฅgad)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr "(okรคnd)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD-gren (HEAD pรฅ fjรคrr รคr tvetydig, kan vara en av fรถljande):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Fjรคrrgren:%s"
 msgstr[1] "  Fjรคrrgrenar:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr " (status inte fรถrfrรฅgad)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokal gren konfigurerad fรถr \"git pull\":"
 msgstr[1] "  Lokala grenar konfigurerade fรถr \"git pull\":"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokala referenser speglas av \"git push\""
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Lokal referens konfigurerad fรถr \"git push\"%s:"
 msgstr[1] "  Lokala referenser konfigurerade fรถr \"git push\"%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "sรคtt refs/remotes/<namn>/HEAD enligt fjรคrren"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "ta bort refs/remotes/<namn>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr "Kan inte bestรคmma HEAD pรฅ fjรคrren"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Flera HEAD-grenar pรฅ fjรคrren. Vรคlj en explicit med:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr "Kunde inte ta bort %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Inte en giltig referens: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr "Kunde inte stรคlla in %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s kommer bli dinglande!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s har blivit dinglande!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr "Rensar %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [skulle rensa] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [rensad] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr "rensa fjรคrrar efter hรคmtning"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Ingen sรฅdan fjรคrr \"%s\""
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr "lรคgg till gren"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr "ingen fjรคrr angavs"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr "frรฅga sรคnd-URL:er istรคllet fรถr hรคmta-URL:er"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr "returnera alla URL:er"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "ingen URL:er angivna fรถr fjรคrren \"%s\""
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr "manipulera URL:ar fรถr sรคndning"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr "lรคgg till URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr "ta bort URL:ar"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete ger ingen mening"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Felaktig gammalt URL-mรถnster: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Ingen sรฅdan URL hittades: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr "Kommer inte ta bort alla icke-sรคnd-URL:er"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "var pratsam; mรฅste skrivas fรถre ett underkommando"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Okรคnt underkommando: %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr "git repack [<flaggor>]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18264,112 +19275,112 @@ msgstr ""
 "Anvรคnd --no-write-bitmap-index eller inaktivera instรคllningen\n"
 "pack.writebitmaps"
 
-#: builtin/repack.c:201
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "kunde inte starta pack-objects fรถr att packa om kontraktsobjekt"
 
-#: builtin/repack.c:240 builtin/repack.c:418
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
-"repack: Fรถrvรคntar kompletta hex-objekt-ID-rader endast frรฅn pack-objects."
+"repack: Fรถrvรคntar kompletta hex-objekt-id-rader endast frรฅn pack-objects."
 
-#: builtin/repack.c:257
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "kunde inte avsluta pack-objects fรถr att packa om kontraktsobjekt"
 
-#: builtin/repack.c:295
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr "packa allt i ett enda paket"
 
-#: builtin/repack.c:297
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "samma som -a, och gรถr onรฅbara objekt lรถsa"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "ta bort รถverflรถdiga paket, och kรถr git-prune-packed"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "sรคnd --no-reuse-delta till git-pack-objects"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "sรคnd --no-reuse-object till git-pack-objects"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr "kรถr inte git-update-server-info"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr "sรคnd --local till git-pack-objects"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr "skriv bitkartindex"
 
-#: builtin/repack.c:313
+#: builtin/repack.c:310
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "sรคnd --delta-islands till git-pack-objects"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr "cirkadatum"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr "med -A, lรถs inte upp objekt รคldre รคn detta"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr "med -a, packa om onรฅbara objekt"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr "storlek pรฅ fรถnster anvรคnt fรถr deltakomprimering"
 
-#: builtin/repack.c:320 builtin/repack.c:326
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:321
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "samma som ovan, men begrรคnsa minnesstorleken istรคllet fรถr postantal"
 
-#: builtin/repack.c:323
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr "begrรคnsa maximalt deltadjup"
 
-#: builtin/repack.c:325
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr "begrรคnsar maximalt antal trรฅdar"
 
-#: builtin/repack.c:327
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr "maximal storlek pรฅ varje paketfil"
 
-#: builtin/repack.c:329
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr "packa om objekt i paket mรคrkta med .keep"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:328
 msgid "do not repack this pack"
 msgstr "packa inte om detta paket"
 
-#: builtin/repack.c:341
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
 
-#: builtin/repack.c:345
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable och -A kan inte anvรคndas samtidigt"
 
-#: builtin/repack.c:427
+#: builtin/repack.c:425
 msgid "Nothing new to pack."
 msgstr "Inget nytt att packa."
 
-#: builtin/repack.c:488
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -18388,7 +19399,7 @@ msgstr ""
 "VARNING: namnet misslyckades ocksรฅ.\n"
 "VARNING: Byt namn pรฅ dem i %s manuellt:\n"
 
-#: builtin/repack.c:536
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "misslyckades ta bort \"%s\""
@@ -18496,8 +19507,8 @@ msgstr "kan inte utfรถra \"fstat\" pรฅ %s"
 msgid "unable to write object to database"
 msgstr "kan inte skriva objektet till databasen"
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "objektnamnet รคr inte giltigt: \"%s\""
@@ -18516,22 +19527,22 @@ msgstr "misslyckades redigera objektfilen"
 msgid "new object is the same as the old one: '%s'"
 msgstr "nytt objekt รคr samma som det gamla: \"%s\""
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "kunde inte tolka %s som incheckning"
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18540,31 +19551,31 @@ msgstr ""
 "den ursprungliga incheckningen \"%s\" innehรฅller sammanslagningstaggen \"%s"
 "\" som har fรถrkastats; anvรคnd --edit istรคllet fรถr --graft"
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "signaturen kommer att tas bort i ersรคttningsincheckningen!"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "kunde inte skriva ersรคttningsincheckning fรถr: \"%s\""
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "ympning fรถr \"%s\" behรถvs inte"
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "ny incheckning รคr samma som den gamla: \"%s\""
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18573,71 +19584,71 @@ msgstr ""
 "kunde inte konvertera fรถljande ympning(ar):\n"
 "%s"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "visa ersรคttningsreferenser"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "ta bort ersรคttningsreferenser"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "redigera befintligt objekt"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "รคndra en inchecknings fรถrรคldrar"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "konvertera befintlig ympningsfil"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "ersรคtt referensen om den finns"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "anvรคnd inte snygg visning av innehรฅll fรถr --edit"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "anvรคnd detta format"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format kan inte anvรคndas utanfรถr listning"
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f kan endast anvรคndas vid skrivning av ersรคttning"
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw kan bara anvรคndas med --edit"
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d behรถver minst ett argument"
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "fel antal argument"
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e tar exakt ett argument"
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g tar minst ett argument"
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file tar inga argument"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "endast ett mรถnster kan anges med -l"
 
@@ -18665,114 +19676,125 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<trรคd-igt>] [--] <sรถkvรคgar>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<trรคd-igt>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<trรคd-igt>] [--] [<sรถkvรคgar>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "blandad"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "mjuk"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "hรฅrd"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "sammanslagning"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "behรฅll"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr "Du har inte en giltig HEAD."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr "Kunde inte hitta trรคdet fรถr HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Kunde inte hitta trรคdet fรถr %s."
 
-#: builtin/reset.c:193
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD รคr nu pรฅ %s"
+
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Kan inte utfรถra en %s รฅterstรคllning mitt i en sammanslagning."
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "var tyst, rapportera endast fel"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr "รฅterstรคll HEAD och index"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr "รฅterstรคll endast HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr "รฅterstรคll HEAD, index och arbetskatalog"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr "รฅterstรคll HEAD men behรฅll lokala รคndringar"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr "registrera endast att borttagna sรถkvรคgar kommer lรคggas till senare"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Kunde inte slรฅ upp \"%s\" som en giltig revision."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Kunde inte slรฅ upp \"%s\" som ett giltigt trรคd."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch รคr inkompatibel med --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed rekommenderas inte med sรถkvรคgar; anvรคnd \"git reset -- <sรถkvรคgar>\"."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Kan inte gรถra %s รฅterstรคllning med sรถkvรคgar."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s รฅterstรคllning tillรฅts inte i ett naket arkiv"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
 msgstr "-N kan endast anvรคndas med --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr "Okรถade รคndringar efter รฅterstรคllning:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -18786,35 +19808,30 @@ msgstr ""
 "konfigurationsvariabeln\n"
 "reset.quiet till true fรถr att gรถra detta till fรถrval.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Kunde inte รฅterstรคlla indexfilen till versionen \"%s\"."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr "Kunde inte skriva ny indexfil."
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "objektfiltrering krรคver --objects"
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "ogiltigt vรคrde fรถr sparse: \"%s\""
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list stรถder inte visning av anteckningar"
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "markerad rรคkning รคr inkompatibelt med --objects"
 
 #: builtin/rev-parse.c:408
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -18977,37 +19994,41 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "fรถljande fil har lokala รคndringar:"
 msgstr[1] "fรถljande filer har lokala รคndringar:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "lista inte borttagna filer"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "ta bara bort frรฅn indexet"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "รถverstyr ร jour-testet"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "tillรฅt rekursiv borttagning"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "avsluta med nollstatus รคven om inget trรคffades"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Ingen sรถkvรคgsangivelse gavs. Vilka filer ska jag ta bort?"
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "lรถa dina รคndringar i .gitmodules eller anvรคnd \"stash\" fรถr att fortsรคtta"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "tar inte bort \"%s\" rekursivt utan -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: kan inte ta bort %s"
@@ -19256,15 +20277,83 @@ msgstr "visa inte resultat pรฅ standard ut (anvรคndbart med --verify)"
 msgid "show refs from stdin that aren't in local repository"
 msgstr "visa referenser frรฅn standard in som inte finns i lokalt arkiv"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <flaggor>"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"arbetskatalogen รคr inte glest (sparse-checkout-filen kanske inte finns)"
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "misslyckades skapa katalog fรถr \"sparse-checkout\"-filen"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "misslyckades รคndra instรคllningen extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "initiera sparse-checkout i konlรคge"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "initiera sparse-checkout"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "misslyckades รถppna \"%s\""
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "kunde inte normalisera sรถkvรคgen \"%s\""
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <mรถnster>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "kan inte ta bort citering av C-strรคng \"%s\""
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "kunde inte lรคsa in existerande mรถnster fรถr gles utcheckning"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "lรคs mรถnster frรฅn standard in"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "stรคll in filter fรถr gles utcheckning"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "inaktivera gles utcheckning"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "fel vid uppdatering av arbetskatalog"
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<flaggor>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<flaggor>] [<stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
@@ -19272,25 +20361,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <grennamn> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
+"          [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"
 "          [--] [<sรถkvรคg>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19298,186 +20389,196 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<meddelande>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
+"          [--] [<sรถkvรคg>...]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "\"%s\" รคr inte en \"stash\"-liknande incheckning"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Fรถr mรฅnga revisioner angivna:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr "Inga \"stash\"-poster hittades."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s รคr inte en giltigt referens"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr "\"git stash clear\" med parametrar har inte implementerats"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "kan inte tillรคmpa en \"stash\" mitt i en sammanslagning"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "kunde inte skapa diff %s^!."
 
-#: builtin/stash.c:421
+#: builtin/stash.c:422
 msgid "conflicts in index.Try without --index."
 msgstr "konflikter i indexet. Testa utan --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "kunde inte spara indextrรคd"
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "kunde inte รฅterstรคlla ospรฅrade filer frรฅn stash-post"
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Slรฅr ihop %s med %s"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
 msgstr "Indexet har inte tagits upp ur \"stash\":en"
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
 msgid "attempt to recreate the index"
 msgstr "fรถrsรถk รฅterskapa indexet"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:555
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Kastade %s (%s)"
 
-#: builtin/stash.c:552
+#: builtin/stash.c:558
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Kunde inte kasta \"stash\"-post"
 
-#: builtin/stash.c:577
+#: builtin/stash.c:583
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "\"%s\" รคr inte en \"stash\"-referens"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr "Stash-posten behรฅlls ifall du behรถver den igen."
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr "Inget grennamn angavs"
 
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Kan inte uppdatera %s med %s"
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
 msgid "stash message"
 msgstr "\"stash\"-meddelande"
 
-#: builtin/stash.c:818
+#: builtin/stash.c:824
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" krรคver ett <incheckning>-argument"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr "Inga รคndringar valda"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr "Du har inte den fรถrsta incheckningen รคnnu"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr "Kan inte spara aktuellt tillstรฅnd fรถr indexet"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr "Kan inte spara ospรฅrade filer"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr "Kan inte spara aktuellt tillstรฅnd fรถr arbetskatalogen"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr "Kan inte registrera tillstรฅnd fรถr arbetskatalog"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "Kan inte anvรคnda --patch och --include-untracked eller --all samtidigt"
 
-#: builtin/stash.c:1285
+#: builtin/stash.c:1298
 msgid "Did you forget to 'git add'?"
 msgstr "Glรถmde du anvรคnda \"git add\"?"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr "Inga lokala รคndringar att spara"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr "Kan inte initiera \"stash\""
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr "Kan inte spara aktuell status"
 
-#: builtin/stash.c:1327
+#: builtin/stash.c:1340
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Sparade arbetskatalogen och indexstatus %s"
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr "Kan inte ta bort รคndringar i arbetskatalogen"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "keep index"
 msgstr "behรฅll indexet"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash in patch mode"
 msgstr "\"stash\" i \"patch\"-lรคge"
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1472 builtin/stash.c:1537
 msgid "quiet mode"
 msgstr "tyst lรคge"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1474 builtin/stash.c:1539
 msgid "include untracked files in stash"
 msgstr "ta med ospรฅrade filer i \"stash\""
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1476 builtin/stash.c:1541
 msgid "include ignore files"
 msgstr "ta med ignorerade filer"
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1600
 #, c-format
 msgid "could not exec %s"
 msgstr "kunde inte kรถra %s"
@@ -19498,40 +20599,40 @@ msgstr "hoppa รถver och ta bort alla rader som inleds med kommentarstecken"
 msgid "prepend comment character and space to each line"
 msgstr "lรคgg in kommentarstecken och blanksteg fรถrst pรฅ varje rad"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Fรถrvรคntade fullt referensnamn, fick %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote tar inga argument"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "kan inte ta bort en komponent frรฅn url:en \"%s\""
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr "alternativa ankare fรถr relativa sรถkvรคgar"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<sรถkvรคg>] [<sรถkvรคg>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Hittade ingen url fรถr undermodulsรถkvรคgen \"%s\" i .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Gรฅr in i \"%s\"\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -19540,7 +20641,7 @@ msgstr ""
 "run_command returnerade icke-nollstatus fรถr %s\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19551,19 +20652,19 @@ msgstr ""
 "undermoduler fรถr %s\n"
 "."
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr "Dรถlj utdata frรฅn fรถr varje undermodulskommando som startas"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr "Rekursera in i nรคstlade undermoduler"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -19572,54 +20673,54 @@ msgstr ""
 "kunde inte slรฅ upp konfigurationen \"%s\". Antar att arkivet รคr sin eget "
 "officiella uppstrรถm."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Misslyckades registrera url fรถr undermodulsรถkvรคg \"%s\""
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Undermodulen \"%s\" (%s) registrerad fรถr sรถkvรคgen \"%s\"\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "varning: kommandouppdateringslรคge fรถreslogs fรถr undermodulen \"%s\"\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Misslyckades registrera uppdateringslรคge fรถr undermodulsรถkvรคg \"%s\""
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "Dรถlj utdata frรฅn initiering av undermodul"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<flaggor>] [<sรถkvรคg>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "hittade ingen undermodulmappning i .gitmodules fรถr sรถkvรคgen \"%s\""
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "kunde inte bestรคmma HEAD:s incheckning i undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "misslyckades rekursera in i undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr "Hindra statusutskrift fรถr undermodul"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -19627,47 +20728,47 @@ msgstr ""
 "Visa incheckning frรฅn indexet istรคllet fรถr den som lagrats i undermodulens "
 "HEAD"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr "rekursera in i nรคstlade undermoduler"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sรถkvรคg>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <sรถkvรคg>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synkroniserar undermodul-url fรถr \"%s\"\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "misslyckades registrera url fรถr undermodulsรถkvรคg \"%s\""
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "misslyckades hรคmta standardfjรคrr fรถr undermodulsรถkvรคg \"%s\""
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "misslyckades uppdatera fjรคrr fรถr undermodulsรถkvรคg \"%s\""
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr "Dรถlj utdata frรฅn synkroniering av undermodul-url"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<sรถkvรคg>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -19676,7 +20777,7 @@ msgstr ""
 "Undermodulsarbetskatalogen \"%s\" innehรฅller en .git-katalog (anvรคnd \"rm -rf"
 "\" om du verkligen vill ta bort den och all dess historik)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -19685,175 +20786,203 @@ msgstr ""
 "Undermodulens arbetskatalog \"%s\" har lokala รคndringar; \"-f\" kastar bort "
 "dem"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Rensade katalogen \"%s\"\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "kunde inte skapa tom undermodulskatalog %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Undermodulen \"%s\" (%s) registrerad fรถr sรถkvรคgen \"%s\"\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "Ta bort undermodulers arbetskataloger รคven om de innehรฅller lokala รคndringar"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr "Avregistrera alla undermoduler"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sรถkvรคg>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Anvรคnd \"--all\" om du verkligen vill avinitiera alla undermoduler"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"En suppleant berรคknad frรฅn รถverprojektets suppleant รคr ogiltig.\n"
+"Fรถr att i sรฅ fall lรฅta Git klona utan ett suppleant, sรคtt\n"
+"submodule.alternateErrorStrategy till \"info\" eller, likvรคrdigt, klona\n"
+"med \"--reference-if-able\" istรคllet fรถr \"--reference\"."
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
-msgstr "undermodulen \"%s\" kan inte lรคgga till alternativ: %s"
+msgstr "undermodulen \"%s\" kan inte lรคgga till suppleant: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Vรคrdet \"%s\" i submodule.alternateErrorStrategy fรถrstรฅs inte"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Vรคrdet \"%s\" i submodule.alternateLocation fรถrstรฅs inte"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
-msgstr "var den nya undermodulen skall klonas till"
+msgstr "var den nya undermodulen ska klonas till"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr "namn pรฅ den nya undermodulen"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr "URL att klona undermodulen frรฅn"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr "djup fรถr grunda kloner"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr "tvinga kloningsfรถrlopp"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "fรถrhindra kloning till icke-tom katalog"
+
+#: builtin/submodule--helper.c:1424
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<sรถkvรคg>] [--quiet] [--reference "
-"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sรถkvรคg>"
+"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
+"path <sรถkvรคg>"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "vรคgrar skapa/anvรคnda \"%s\" i en annan undermoduls gitkatalog"
+
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "misslyckades klona \"%s\" till undermodulsรถkvรคgen \"%s\""
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "katalogen inte tom: \"%s\""
+
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "kunde inte fรฅ tag i undermodulkatalog fรถr \"%s\""
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Ogiltigt uppdateringslรคge \"%s\" fรถr undermodulsรถkvรคg \"%s\""
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1516
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Ogiltigt uppdateringslรคge \"%s\" konfigurerat fรถr undermodulsรถkvรคg \"%s\""
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Undermodulsรถkvรคgen \"%s\" har inte initierats"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Kanske menade du att anvรคnda \"update --init\"?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Hoppar รถver ej sammanslagen undermodul %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Hoppar รถver undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Misslyckades klona \"%s\". Nytt fรถrsรถk planlagt"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Misslyckades klona \"%s\" fรถr andra gรฅngen, avbryter"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr "sรถkvรคg inuti arbetskatalogen"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "sรถkvรคg inuti arbetskatalogen, genom nรคstlade undermodulgrรคnser"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout eller none"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr "parallella jobb"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "om den fรถrsta klonen skall fรถlja rekommendation fรถr grund kloning"
+msgstr "om den fรถrsta klonen ska fรถlja rekommendation fรถr grund kloning"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr "skriv inte klonfรถrlopp"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<sรถkvรคg>] [<sรถkvรคg>...]"
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<sรถkvรคg>] [<sรถkvรคg>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr "felaktigt vรคrde fรถr parametern update"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -19862,50 +20991,50 @@ msgstr ""
 "Undermodulens (%s) gren instรคlld pรฅ att รคrva gren frรฅn huvudprojektet, men "
 "huvudprojektet รคr inte pรฅ nรฅgon gren"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2117
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "kunde inte fรฅ tag i arkivhandtag fรถr undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2156
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sรถkvรคg>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2212
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "se om det รคr sรคkert att skriva till .gitmodules-filen"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2215
 msgid "unset the config in the .gitmodules file"
 msgstr "ta bort konfigurationen frรฅn .gitmodules-filen"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2220
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <namn> [<vรคrde>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2221
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <namn>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2222
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "se till att .gitmodules finns i arbetskatalogen"
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s stรถder inte --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2297
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "\"%s\" รคr inte ett giltigt underkommando till submodule--helper"
@@ -20160,203 +21289,207 @@ msgstr "taggen \"%s\" finns redan"
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "Packar upp objekt"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "misslyckades skapa katalogen %s"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "misslyckades skapa filen %s"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "misslyckades ta bort filen %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "misslyckades ta bort katalogen %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Testar mtime i \"%s\" "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr "stat-informationen fรถr en katalog รคndras inte nรคr nya filer lรคggs till"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "stat-informationen fรถr en katalog รคndras inte nรคr nya kataloger lรคggs till"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr "stat-informationen fรถr en katalog รคndras nรคr filer uppdateras"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "stat-informationen fรถr en katalog รคndras nรคr filer lรคggs till i en "
 "underkatalog"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr "stat-informationen fรถr en katalog รคndras inte nรคr en fil tas bort"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr "stat-informationen fรถr en katalog รคndras inte nรคr en katalog tas bort"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<flaggor>] [--] [<fil>...]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "fortsรคtt uppdatera รคven nรคr index inte รคr ร jour"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignorera undermoduler"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "ignorera inte nya filer"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "lรฅt filer ersรคtta kataloger och omvรคnt"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "lรคgg mรคrke till filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "uppdatera รคven om indexet innehรฅller ej sammanslagna poster"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "uppdatera statusinformation"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "som --refresh, men ignorera assume-unchanged-instรคllning"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<lรคge>,<objekt>,<sรถkvรคg>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "lรคgg till angiven post i indexet"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "markera filer som \"รคndras inte\""
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "rensa \"assume-unchanged\"-biten"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "markera filer som \"endast index\""
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "tรถm \"skip-worktree\"-biten"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "rรถr inte \"endast index\"-poster"
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "lรคgg endast till indexet; lรคgg inte till innehรฅllet i objektdatabasen"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "ta bort namngivna sรถkvรคgar รคven om de finns i arbetskatalogen"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "med --stdin: indatarader termineras med null-byte"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "lรคs lista รถver sรถkvรคgar att uppdatera frรฅn standard in"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "lรคgg poster frรฅn standard in till indexet"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "รฅterfyll etapp 2 och 3 frรฅn angivna sรถkvรคgar"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "uppdatera endast poster som skiljer sig frรฅn HEAD"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignorera filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "rapportera รฅtgรคrder pรฅ standard ut"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(fรถr porslin) glรถm sparade olรถsta konflikter"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "skriv index i detta format"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "aktivera eller inaktivera delat index"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "aktivera/inaktivera ospรฅrad cache"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "testa om filsystemet stรถder ospรฅrad cache"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "aktivera ospรฅrad cache utan att testa filsystemet"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "skriv ut indexet รคven om det inte angivits som รคndrat"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "aktivera eller inaktivera filsystemsรถvervakning"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "markera filer som \"fsmonitor valid\""
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "tรถm \"fsmonitor valid\"-bit"
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20364,7 +21497,7 @@ msgstr ""
 "core.splitIndex รคr satt till false; ta bort eller รคndra det om du verkligen "
 "vill aktivera delat index"
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20372,7 +21505,7 @@ msgstr ""
 "core.splitIndex รคr satt till true; ta bort eller รคndra det om du verkligen "
 "vill inaktivera delat index"
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -20380,11 +21513,11 @@ msgstr ""
 "core.untrackedCache รคr satt till true; ta bort eller รคndra det om du "
 "verkligen vill inaktivera den ospรฅrade cachen"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Ospรฅrad cache รคr inaktiverad"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -20392,26 +21525,26 @@ msgstr ""
 "core.untrackedCache รคr satt till false; ta bort eller รคndra det om du "
 "verkligen vill aktivera den ospรฅrade cachen"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Ospรฅrad cache รคr aktiverad fรถr \"%s\""
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor inte satt; sรคtt om du verkligen vill aktivera fsmonitor"
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor aktiverat"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor รคr satt; ta bort om du verkligen vill inaktivera fsmonitor"
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor inaktiverat"
 
@@ -20471,15 +21604,15 @@ msgstr "testa inte <katalog>/.git/ om <katalog> inte รคr en Git-katalog"
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "avbryt รถverfรถringen efter <n> sekunders inaktivitet"
 
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <incheckning>..."
 
-#: builtin/verify-commit.c:69
+#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "visa innehรฅll fรถr incheckning"
 
-#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "visa rรฅa gpg-statusdata"
 
@@ -20495,63 +21628,63 @@ msgstr "pratsam"
 msgid "show statistics only"
 msgstr "visa endast statistik"
 
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..."
 
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "visa innehรฅll fรถr tag"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<flaggor>] <sรถkvรคg> [<incheckning-igt>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<flaggor>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<flaggor>] <sรถkvรคg>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbetskatalog> <ny-sรถkvรคg>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<flaggor>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <sรถkvรคg>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:891
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Tar bort worktrees/%s: inte en giltig katalog"
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Tar bort worktrees/%s: kan inte lรคsa gitdir-filen (%s)"
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -20560,35 +21693,35 @@ msgstr ""
 "Tar bort worktrees/%s: kort lรคsning (fรถrvรคntade %<PRIuMAX> byte, lรคste "
 "%<PRIuMAX>)"
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Tar bort worktrees/%s: gitdir-filen pekar pรฅ en ickeexisterande plats"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr "rapportera borttagna arbetskataloger"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr "lรฅt tid gรฅ ut fรถr arbetskataloger รคldre รคn <tid>"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr "\"%s\" finns redan"
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:244
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "kunde inte lรคgga in arbetskatalogen \"%s\" igen"
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:249
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -20598,7 +21731,7 @@ msgstr ""
 "anvรคnd \"add -f -f\" fรถr att รถverstyra, eller \"unlock\" och \"prune\" eller "
 "\"remove\" fรถr att rensa"
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:251
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -20608,121 +21741,121 @@ msgstr ""
 "anvรคnd \"add -f\" fรถr att รถverstyra, eller \"prune\" eller \"remove\" fรถr "
 "att rensa"
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:432 builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Fรถrbereder arbetskatalog (ny gren \"%s\")"
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:434
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Fรถrbereder arbetskatalog (รฅterstรคller gren \"%s\"; var pรฅ %s)"
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:443
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Fรถrbereder arbetskatalog (checkar ut \"%s\")"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:449
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Fรถrbereder arbetskatalog (frรฅnkopplat HEAD %s)"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:490
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "checka ut <gren> รคven om den redan รคr utcheckad i en annan arbetskatalog"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:493
 msgid "create a new branch"
 msgstr "skapa en ny gren"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:495
 msgid "create or reset a branch"
 msgstr "skapa eller รฅterstรคll en gren"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:497
 msgid "populate the new working tree"
 msgstr "befolka den nya arbetskatalogen"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:498
 msgid "keep the new working tree locked"
 msgstr "lรฅt arbetskatalogen fรถrbli lรฅst"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:501
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "stรคll in spรฅrningslรคge (se git-branch(1))"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:504
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "fรถrsรถk matcha namn pรฅ ny gren mot en fjรคrrspรฅrande gren"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:512
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B och --detach รคr รถmsesidigt uteslutande"
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:573
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track kan endast anvรคndas nรคr ny gran skapas"
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:673
 msgid "reason for locking"
 msgstr "orsak till lรฅs"
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "\"%s\" รคr inte en arbetskatalog"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:687 builtin/worktree.c:720
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Huvudarbetskatalogen kan inte lรฅsas eller lรฅsas upp"
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:692
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "\"%s\" รคr redan lรฅst, orsak: %s"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:694
 #, c-format
 msgid "'%s' is already locked"
 msgstr "\"%s\" รคr redan lรฅst"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:722
 #, c-format
 msgid "'%s' is not locked"
 msgstr "\"%s\" รคr inte lรฅst"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:763
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:771
 msgid "force move even if worktree is dirty or locked"
 msgstr "tvinga flyttning รคven om arbetskatalogen รคr smutsig eller lรฅst"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:794 builtin/worktree.c:921
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "\"%s\" รคr inte en huvudarbetskatalog"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:799
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "kunde inte lista ut mรฅlnamn frรฅn \"%s\""
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:805
 #, c-format
 msgid "target '%s' already exists"
 msgstr "mรฅlet \"%s\" finns redan"
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:813
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -20731,7 +21864,7 @@ msgstr ""
 "kan inte flytta en lรฅst arbetskatalog, orsak till lรฅs: %s\n"
 "anvรคnd \"move -f -f\" fรถr att รถverstyra, eller lรฅs upp fรถrst"
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:815
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -20739,36 +21872,38 @@ msgstr ""
 "kan inte flytta en lรฅst arbetskatalog;\n"
 "anvรคnd \"move -f -f\" fรถr att รถverstyra, eller lรฅs upp fรถrst"
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:818
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:823
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "misslyckades flytta \"%s\" till \"%s\""
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:871
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "misslyckades kรถra \"git status\" pรฅ \"%s\""
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:875
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
-msgstr "\"%s\" รคr smutsigt, anvรคnd --force fรถr att ta bort det"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"\"%s\" innehรฅller รคndrade eller ospรฅrade filer, anvรคnd --force fรถr att ta "
+"bort det"
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:880
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "misslyckades kรถra \"git status\" pรฅ \"%s\", kod %d"
 
-#: builtin/worktree.c:911
+#: builtin/worktree.c:903
 msgid "force removal even if worktree is dirty or locked"
 msgstr "tvinga ta bort รคven om arbetskatalogen รคr smutsig eller lรฅst"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:926
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -20777,7 +21912,7 @@ msgstr ""
 "kan inte ta bort en lรฅst arbetskatalog, orsak till lรฅset: %s\n"
 "anvรคnd \"remove -f -f\" fรถr att รถverstyra, eller lรฅs upp fรถrst"
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:928
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -20785,7 +21920,7 @@ msgstr ""
 "kan inte ta bort en lรฅst arbetskatalog;\n"
 "anvรคnd \"remove -f -f\" fรถr att รถverstyra, eller lรฅs upp fรถrst"
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:931
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
@@ -20806,6 +21941,21 @@ msgstr "visa trรคdobjekt fรถr underkatalogen <prefix>"
 msgid "only useful for debugging"
 msgstr "endast anvรคndbart vid felsรถkning"
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Fรถrvรคntade \"mark\"-kommando, fick %s"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Fรถrvรคntade \"to\"-kommando, fick %s"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "funktionen \"%s\" fรถrbjuden i indata utan --allow-unsafe-features"
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -20918,39 +22068,39 @@ msgstr ""
 "aliaset \"%s\" รคndrar miljรถvariabler.\n"
 "Du kan anvรคnda \"!git\" i aliaset fรถr att gรถra det"
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr "tomt alias fรถr %s"
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr "rekursivt alias: %s"
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr "skrivfel pรฅ standard ut"
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr "okรคnt skrivfel pรฅ standard ut"
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr "stรคng misslyckades pรฅ standard ut"
 
-#: git.c:796
+#: git.c:793
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
 
-#: git.c:846
+#: git.c:843
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "kan inte hantera %s som inbyggd"
 
-#: git.c:859
+#: git.c:856
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -20959,13 +22109,13 @@ msgstr ""
 "anvรคndning: %s\n"
 "\n"
 
-#: git.c:879
+#: git.c:876
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 "expandering av alias \"%s\" misslyckades; \"%s\" รคr inte ett git-kommando\n"
 
-#: git.c:891
+#: git.c:888
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "misslyckades kรถra kommandot \"%s\": %s\n"
@@ -20991,22 +22141,22 @@ msgstr "CURLSSLOPT_NO_REVOKE stรถds inte av cURL < 7.44.0"
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Prtokollbegrรคnsningar stรถds inte av cURL < 7.19.4"
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "SSL-bakรคndan \"%s\" stรถds inte. Dessa SSL-bakรคndor stรถds:"
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr "Kan inte sรคtta SSL-bakรคnda till \"%s\": cURL byggdes utan SSL-bakรคndor"
 
-#: http.c:1096
+#: http.c:1097
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Kunde inte sรคtta SSL-bakรคnda till \"%s\": redan valt"
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21017,146 +22167,155 @@ msgstr ""
 "        bad om: %s\n"
 "  omdirigering: %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "felaktig citering pรฅ vรคrde fรถr push-option: \"%s\""
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs inte giltig: รคr detta ett git-arkiv?"
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 msgid "invalid server response; expected service, got flush packet"
 msgstr "ogiltigt svar frรฅn servern; fรถrvรคntade tjรคnst, fick flush-paket"
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "ogiltigt svar frรฅn servern; fick \"%s\""
 
-#: remote-curl.c:446
+#: remote-curl.c:455
 #, c-format
 msgid "repository '%s' not found"
 msgstr "arkivet \"%s\" hittades inte"
 
-#: remote-curl.c:450
+#: remote-curl.c:459
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Autentisering misslyckades \"%s\""
 
-#: remote-curl.c:454
+#: remote-curl.c:463
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "kan inte komma รฅt \"%s\": %s"
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr "omdirigerar till %s"
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "borde inte ha EOF nรคr inte fรถrsiktig pรฅ EOF"
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "kunde inte spola tillbaka rpc-postdata - fรถrsรถk รถka http.postBuffer"
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC misslyckades; %s"
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 msgid "cannot handle pushes this big"
 msgstr "kan inte hantera sรฅ stora sรคndningar"
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "kan inte packa upp anrop; zlib-slutfel %d"
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "dum http-transport stรถder inte grunda arkiv"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1038
 msgid "fetch failed."
 msgstr "mottagning misslyckades."
 
-#: remote-curl.c:1076
+#: remote-curl.c:1086
 msgid "cannot fetch by sha1 over smart http"
 msgstr "kan inte hรคmta med sha1 รถver smart http"
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1130 remote-curl.c:1136
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "protokollfel: fรถrvรคntade sha/ref, fick \"%s\""
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1148 remote-curl.c:1263
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http-transporten stรถder inte %s"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1184
 msgid "git-http-push failed"
 msgstr "git-http-push misslyckades"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1369
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: anvรคndning: git remote-curl <fjรคrr> [<url>]"
 
-#: remote-curl.c:1392
+#: remote-curl.c:1401
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: fel vid lรคsning av kommandostrรถm frรฅn git"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1408
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: fรถrsรถkte ta emot utan lokalt arkiv"
 
-#: remote-curl.c:1439
+#: remote-curl.c:1448
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: okรคnt kommando \"%s\" frรฅn git"
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr "argument"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr "objektfiltrering"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "giltig-till"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "ingen funktion (bakรฅtkompatibilitet)"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "var mer pratsam"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "var mer tyst"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "anvรคnd <n> siffror fรถr att visa SHA-1:or"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
-msgstr "hur blanksteg och #kommentarer skall tas bort frรฅn meddelande"
+msgstr "hur blanksteg och #kommentarer ska tas bort frรฅn meddelande"
+
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "lรคs sรถkvรคgsangivelse frรฅn fil"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "med --pathspec-from-file, sรถkvรคgsangivelser avdelas med NUL-tecken"
 
 #: ref-filter.h:101
 msgid "key"
@@ -21170,11 +22329,11 @@ msgstr "fรคltnamn att sortera pรฅ"
 msgid "update the index with reused conflict resolution if possible"
 msgstr "uppdatera indexet med รฅteranvรคnd konfliktlรถsning om mรถjligt"
 
-#: wt-status.h:68
+#: wt-status.h:67
 msgid "HEAD detached at "
 msgstr "HEAD frรฅnkopplad vid "
 
-#: wt-status.h:69
+#: wt-status.h:68
 msgid "HEAD detached from "
 msgstr "HEAD frรฅnkopplad frรฅn "
 
@@ -21385,7 +22544,7 @@ msgstr "Stรคda onรถdiga filer och optimera det lokala arkivet"
 
 #: command-list.h:101
 msgid "Extract commit ID from an archive created using git-archive"
-msgstr "Hรคmta inchecknings-ID frรฅn ett arkiv skapat med git-archive"
+msgstr "Hรคmta inchecknings-id frรฅn ett arkiv skapat med git-archive"
 
 #: command-list.h:102
 msgid "Print lines matching a pattern"
@@ -21397,7 +22556,7 @@ msgstr "Ett portabelt grafiskt grรคnssnitt fรถr Git"
 
 #: command-list.h:104
 msgid "Compute object ID and optionally creates a blob from a file"
-msgstr "Berรคkna objekt-ID och mรถjligen skapa en blob frรฅn en fil"
+msgstr "Berรคkna objekt-id och mรถjligen skapa en blob frรฅn en fil"
 
 #: command-list.h:105
 msgid "Display help information about Git"
@@ -21666,162 +22825,170 @@ msgid "Common Git shell script setup code"
 msgstr "Gemensam skriptstartkod fรถr Git"
 
 #: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Initiera och modifiera sparse-checkout"
+
+#: command-list.h:172
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Spara undan รคndringar i en lortig arbetskatalog"
 
-#: command-list.h:172
+#: command-list.h:173
 msgid "Add file contents to the staging area"
 msgstr "Lรคgg filinnehรฅllet till indexet"
 
-#: command-list.h:173
+#: command-list.h:174
 msgid "Show the working tree status"
 msgstr "Visa status fรถr arbetskatalogen"
 
-#: command-list.h:174
+#: command-list.h:175
 msgid "Remove unnecessary whitespace"
 msgstr "Ta bort onรถdiga blanksteg"
 
-#: command-list.h:175
+#: command-list.h:176
 msgid "Initialize, update or inspect submodules"
 msgstr "Initiera, uppdatera eller inspektera undermoduler"
 
-#: command-list.h:176
+#: command-list.h:177
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"
 
-#: command-list.h:177
+#: command-list.h:178
 msgid "Switch branches"
 msgstr "Byt gren"
 
-#: command-list.h:178
+#: command-list.h:179
 msgid "Read, modify and delete symbolic refs"
 msgstr "Lรคs, modifiera eller ta bort symbolisk referens"
 
-#: command-list.h:179
+#: command-list.h:180
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
 
-#: command-list.h:180
+#: command-list.h:181
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Skapar temporรคra filer med innehรฅllet frรฅn en blob"
 
-#: command-list.h:181
+#: command-list.h:182
 msgid "Unpack objects from a packed archive"
 msgstr "Packa upp objekt frรฅn ett pakat arkiv"
 
-#: command-list.h:182
+#: command-list.h:183
 msgid "Register file contents in the working tree to the index"
 msgstr "Registrera filinnehรฅllet frรฅn arbetskatalogen i indexet"
 
-#: command-list.h:183
+#: command-list.h:184
 msgid "Update the object name stored in a ref safely"
 msgstr "Uppdatera objektnamnet i en referens pรฅ ett sรคkert sรคtt"
 
-#: command-list.h:184
+#: command-list.h:185
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Uppdatera tillรคggsinfofil fรถr att hjรคlpa dumma servrar"
 
-#: command-list.h:185
+#: command-list.h:186
 msgid "Send archive back to git-archive"
 msgstr "Sรคnd arkivet tillbaka till git-archive"
 
-#: command-list.h:186
+#: command-list.h:187
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Sรคnd packade objekt tillbaka till git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:188
 msgid "Show a Git logical variable"
 msgstr "Visa en logisk Git-variabel"
 
-#: command-list.h:188
+#: command-list.h:189
 msgid "Check the GPG signature of commits"
 msgstr "Kontrollera GPG-signaturer fรถr incheckningar"
 
-#: command-list.h:189
+#: command-list.h:190
 msgid "Validate packed Git archive files"
 msgstr "Bekrรคfta packade Git-arkivfiler"
 
-#: command-list.h:190
+#: command-list.h:191
 msgid "Check the GPG signature of tags"
 msgstr "Kontrollera GPG-signaturer i taggar"
 
-#: command-list.h:191
+#: command-list.h:192
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git-webbgrรคnssnitt (webbframรคnda fรถr Git-arkiv)"
 
-#: command-list.h:192
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Visa loggar med differenser varje incheckning introducerar"
 
-#: command-list.h:193
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Hantera ytterligare arbetskataloger"
 
-#: command-list.h:194
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Skapa ett trรคdobjekt frรฅn aktuellt index"
 
-#: command-list.h:195
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Definierar attribut per sรถkvรคg"
 
-#: command-list.h:196
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Gits kommandoradsgrรคnssnitt och -konventioner"
 
-#: command-list.h:197
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Grundlรคggande Git-handledning fรถr utvecklare"
 
-#: command-list.h:198
+#: command-list.h:199
 msgid "Git for CVS users"
 msgstr "Git fรถr CVS-anvรคndare"
 
-#: command-list.h:199
+#: command-list.h:200
 msgid "Tweaking diff output"
 msgstr "Justrea diff-utdata"
 
-#: command-list.h:200
+#: command-list.h:201
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Ett anvรคndbart minsta uppsรคttning kommandon fรถr vardags-Git"
 
-#: command-list.h:201
+#: command-list.h:202
 msgid "A Git Glossary"
 msgstr "En Git-ordlista"
 
-#: command-list.h:202
+#: command-list.h:203
 msgid "Hooks used by Git"
 msgstr "Krokar som anvรคnds av Git"
 
-#: command-list.h:203
+#: command-list.h:204
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Ange avsiktligen ospรฅrade filer att ignorera"
 
-#: command-list.h:204
+#: command-list.h:205
 msgid "Defining submodule properties"
 msgstr "Ange egenskaper fรถr undermoduler"
 
-#: command-list.h:205
+#: command-list.h:206
 msgid "Git namespaces"
 msgstr "Git-namnrymder"
 
-#: command-list.h:206
+#: command-list.h:207
 msgid "Git Repository Layout"
 msgstr "Gits arkivlayout"
 
-#: command-list.h:207
+#: command-list.h:208
 msgid "Specifying revisions and ranges for Git"
 msgstr "Ange versioner och intervall i Git"
 
-#: command-list.h:208
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "Monterar ett arkiv inuti ett annat"
+
+#: command-list.h:210
 msgid "A tutorial introduction to Git: part two"
 msgstr "Introduktion till Git: del tvรฅ"
 
-#: command-list.h:209
+#: command-list.h:211
 msgid "A tutorial introduction to Git"
 msgstr "Introduktion till Git"
 
-#: command-list.h:210
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr "ร–versikt รถver rekommenderade arbetsflรถden med Git"
 
@@ -21948,139 +23115,128 @@ msgstr "Fรถrsรถk enkel sammanslagning med $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Enkel sammanslagning misslyckades, fรถrsรถker automatisk sammanslagning."
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Kan inte ta bort temporรคrt index (kan inte intrรคffa)"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Kan inte uppdatera $ref_stash med $w_commit"
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "fel: okรคnd flagga fรถr \"stash push\": $option"
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "okรคnd flagga: $opt"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Fรถr mรฅnga revisioner angivna: $REV"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference รคr inte en giltig referens"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "\"$args\" รคr inte en \"stash\"-liknande incheckning"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "\"$args\" รคr inte en \"stash\"-referens"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "kan inte uppdatera indexet"
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Kan inte tillรคmpa en \"stash\" mitt i en sammanslagning"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr "Konflikter i indexet. Testa utan --index."
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "Kunde inte spara indextrรคd"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr "Kunde inte รฅterstรคlla ospรฅrade filer frรฅn stash-post"
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "Kan inte ta bort รคndrade filer ur kรถn"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Kastade ${REV} ($s)"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Kunde inte kasta \"stash\"-post"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Fรถr att รฅterstรคlla dem, skriv \"git stash apply\")"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:203
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "Relativ sรถkvรคg kan endast anvรคndas frรฅn arbetskatalogens toppnivรฅ"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:213
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "arkiv-URL: \"$repo\" mรฅste vara absolut eller bรถrja med ./|../"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:232
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "\"$sm_path\" finns redan i indexet"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:235
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "\"$sm_path\" finns redan i indexet och รคr inte en undermodul"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:242
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "\"$sm_path\" har inte nรฅgon utcheckad incheckning"
 
-#: git-submodule.sh:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"Fรถljande sรถkvรคgar ignoreras av en av dina .gitignore-filer:\n"
-"$sm_path\n"
-"Anvรคnd -f om du verkligen vill lรคgga till den."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:273
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Lรคgger till befintligt arkiv i \"$sm_path\" i indexet"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:275
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "\"$sm_path\" finns redan och รคr inte ett giltigt git-arkiv"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:283
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr "En git-katalog fรถr \"$sm_name\" hittades lokalt med fjรคrr(ar):"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:285
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22098,37 +23254,37 @@ msgstr ""
 "arkiv eller om du รคr osรคker pรฅ vad det hรคr betyder, vรคlj ett annat namn med\n"
 "flaggan \"--name\"."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:291
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Aktiverar lokal git-katalog fรถr undermodulen \"$sm_name\" pรฅ nytt."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:303
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Kan inte checka ut undermodulen \"$sm_path\""
 
-#: git-submodule.sh:303
+#: git-submodule.sh:308
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Misslyckades lรคgga till undermodulen \"$sm_path\""
 
-#: git-submodule.sh:312
+#: git-submodule.sh:317
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Misslyckades registrera undermodulen \"$sm_path\""
 
-#: git-submodule.sh:573
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Kan inte hitta aktuell revision i undermodulsรถkvรคgen \"$displaypath\""
 
-#: git-submodule.sh:583
+#: git-submodule.sh:600
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Kan inte hรคmta i undermodulsรถkvรคg \"$sm_path\""
 
-#: git-submodule.sh:588
+#: git-submodule.sh:605
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22137,7 +23293,7 @@ msgstr ""
 "Kan inte hitta aktuell revision fรถr ${remote_name}/${branch} i "
 "undermodulsรถkvรคgen \"$sm_path\""
 
-#: git-submodule.sh:606
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22146,7 +23302,7 @@ msgstr ""
 "Kan inte hรคmta i undermodulsรถkvรคg \"$displaypath\"; fรถrsรถkte hรคmta $sha1 "
 "direkt:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:629
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22155,72 +23311,72 @@ msgstr ""
 "Hรคmtade i undermodulssรถkvรคgen \"$displaypath\", men den innehรถll inte $sha1. "
 "Direkt hรคmtning av incheckningen misslyckades."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:636
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte checka ut \"$sha1\" i undermodulsรถkvรคgen \"$displaypath\""
 
-#: git-submodule.sh:620
+#: git-submodule.sh:637
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Undermodulsรถkvรคgen \"$displaypath\": checkade ut \"$sha1\""
 
-#: git-submodule.sh:624
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte ombasera \"$sha1\" i undermodulsรถkvรคgen \"$displaypath\""
 
-#: git-submodule.sh:625
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Undermodulsรถkvรคgen \"$displaypath\": ombaserade in i \"$sha1\""
 
-#: git-submodule.sh:630
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte slรฅ ihop \"$sha1\" i undermodulsรถkvรคgen \"$displaypath\""
 
-#: git-submodule.sh:631
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Undermodulsรถkvรคgen \"$displaypath\": sammanslagen i \"$sha1\""
 
-#: git-submodule.sh:636
+#: git-submodule.sh:653
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Misslyckades kรถra \"$command $sha1\" i undermodulsรถkvรคgen \"$displaypath\""
 
-#: git-submodule.sh:637
+#: git-submodule.sh:654
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Undermodulsรถkvรคgen \"$displaypath\": \"$command $sha1\""
 
-#: git-submodule.sh:668
+#: git-submodule.sh:685
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Misslyckades rekursera in i undermodulsรถkvรคgen \"$displaypath\""
 
-#: git-submodule.sh:830
+#: git-submodule.sh:896
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Flaggan --cached kan inte anvรคndas med flaggan --files"
 
-#: git-submodule.sh:882
+#: git-submodule.sh:948
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "ovรคntat lรคge $mod_dst"
 
-#: git-submodule.sh:902
+#: git-submodule.sh:968
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Varning: $display_name innehรฅller inte incheckningen $sha1_src"
 
-#: git-submodule.sh:905
+#: git-submodule.sh:971
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Varning: $display_name innehรฅller inte incheckningen $sha1_dst"
 
-#: git-submodule.sh:908
+#: git-submodule.sh:974
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
@@ -22483,11 +23639,11 @@ msgid ""
 msgstr ""
 "Du har kรถade รคndringar i din arbetskatalog.\n"
 "Om det รคr meningen att รคndringarna\n"
-"skall lรคggas in i fรถregรฅende incheckning, kรถr:\n"
+"ska lรคggas in i fรถregรฅende incheckning, kรถr:\n"
 "\n"
 "  git commit --amend $gpg_sign_opt_quoted\n"
 "\n"
-"Om de skall checkas in i en egen incheckning, kรถr:\n"
+"Om de ska checkas in i en egen incheckning, kรถr:\n"
 "\n"
 "  git commit $gpg_sign_opt_quoted\n"
 "\n"
@@ -22540,6 +23696,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Ombasera $shortrevisions pรฅ $shortonto ($todocount incheckning)"
 msgstr[1] "Ombasera $shortrevisions pรฅ $shortonto ($todocount incheckningar)"
 
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "Observera att tomma incheckningar รคr utkommenterade"
+
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
 msgstr "Kunde inte initiera omskrivna incheckningar"
@@ -22605,81 +23765,19 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Kunde inte bestรคmma absolut sรถkvรคg till git-katalogen"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "kรถad"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "ej kรถad"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binรคr"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "ingenting"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "oรคndrad"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "lade till %d sรถkvรคg\n"
-msgstr[1] "lade till %d sรถkvรคgar\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "uppdaterade %d sรถkvรคg\n"
-msgstr[1] "uppdaterade %d sรถkvรคgar\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "รฅterstรคllde %d sรถkvรคg\n"
-msgstr[1] "รฅterstรคllde %d sรถkvรคgar\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "rรถrde %d sรถkvรคg\n"
 msgstr[1] "rรถrde %d sรถkvรคgar\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Uppdatera"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "ร…terstรคll"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "observera: %s spรฅras inte lรคngre.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Lรคgg till ospรฅrad"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Inga ospรฅrade filer.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -22687,7 +23785,7 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "kรถas omedelbart."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -22695,7 +23793,7 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "lรคggas till i \"stash\" omedelbart."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -22703,8 +23801,8 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "tas bort frรฅn kรถn omedelbart."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -22712,8 +23810,8 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "markeras fรถr applicering omedelbart."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -22721,16 +23819,12 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "markeras fรถr kasta omedelbart."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "misslyckades รถppna styckeredigeringsfil fรถr skrivning: %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Manuellt styckeredigeringslรคge -- se nederst fรถr snabbguide.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -22743,36 +23837,12 @@ msgstr ""
 "Ta bort \"%s\" rader genom att radera dem.\n"
 "Rader som bรถrjar med %s kommer att tas bort.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"Om patchen inte kan appliceras rent kommer du fรฅ en mรถjlighet att\n"
-"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
-"redigeringen och stycket lรคmnas ofรถrรคndrat.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "misslyckades รถppna styckesredigeringsfil fรถr lรคsning: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
-"[y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -22786,7 +23856,7 @@ msgstr ""
 "a - kรถa stycket och alla fรถljande i filen\n"
 "d - kรถa inte stycket eller nรฅgot av de fรถljande i filen"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -22800,7 +23870,7 @@ msgstr ""
 "a - \"stash\":a stycket och alla fรถljande i filen\n"
 "d - \"stash\":a inte stycket eller nรฅgot av de fรถljande i filen"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -22814,7 +23884,7 @@ msgstr ""
 "a - ta bort stycket och alla fรถljande i filen frรฅn kรถn\n"
 "d - ta inte bort stycket eller nรฅgot av de fรถljande i filen frรฅn kรถn"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -22828,7 +23898,7 @@ msgstr ""
 "a - applicera stycket och alla fรถljande i filen\n"
 "d - applicera inte stycket eller nรฅgot av de fรถljande i filen"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -22842,7 +23912,7 @@ msgstr ""
 "a - fรถrkasta stycket och alla fรถljande i filen\n"
 "d - fรถrkasta inte stycket eller nรฅgot av de fรถljande i filen"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -22856,7 +23926,7 @@ msgstr ""
 "a - fรถrkasta stycket och alla fรถljande i filen\n"
 "d - fรถrkasta inte stycket eller nรฅgot av de fรถljande i filen"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -22870,7 +23940,7 @@ msgstr ""
 "a - applicera stycket och alla fรถljande i filen\n"
 "d - applicera inte stycket eller nรฅgot av de fรถljande i filen"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -22884,7 +23954,7 @@ msgstr ""
 "a - applicera stycket och alla fรถljande i filen\n"
 "d - applicera inte stycket eller nรฅgot av de fรถljande i filen"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -22906,226 +23976,85 @@ msgstr ""
 "e - redigera aktuellt stycke manuellt\n"
 "? - visa hjรคlp\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Markerade stycken kan inte appliceras pรฅ indexet!\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Applicera dem pรฅ arbetskatalogen trots det? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Ingenting applicerades.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorerar ej sammanslagen: %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Endast binรคra filer รคndrade.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Inga รคndringar.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Uppdatera patch"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Kรถa รคndrat lรคge [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Kรถa borttagning [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Kรถa stycket [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Stash:a รคndrat lรคge [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Ta bort รคndrat lรคge frรฅn kรถn [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Ta bort borttagning frรฅn kรถn [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Ta bort stycket frรฅn kรถn [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "Applicera รคndrat lรคge pรฅ indexet [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Applicera borttagning pรฅ indexet [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Applicera stycket pรฅ indexet [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Kasta รคndrat lรคge frรฅn arbetskatalogen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Kasta borttagning frรฅn arbetskatalogen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Kasta stycket frรฅn arbetskatalogen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Kasta รคndrat lรคge frรฅn indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Kasta borttagning frรฅn indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Kasta stycket frรฅn indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Applicera รคndrat lรคge pรฅ indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Applicera borttagning pรฅ indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Applicera stycket pรฅ indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1468
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera รคndrat lรคge pรฅ arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1469
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera borttagning pรฅ arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1470
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera stycket pรฅ arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "Inga andra stycken att gรฅ till\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "gรฅ till vilket stycke (<ret> fรถr att se fler)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "gรฅ till vilket stycke? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ogiltigt siffervรคrde: \"%s\"\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Beklagar, det finns bara %d stycke.\n"
 msgstr[1] "Beklagar, det finns bara %d stycken.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "Inga andra stycken att sรถka efter\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "sรถk efter reguljรคrt uttryck? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Felaktigt format pรฅ reguljรคrt sรถkuttryck %s: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
 msgstr "Inga stycken motsvarar givet mรถnster\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "Inget fรถregรฅende stycke\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "Inget fรถljande stycke\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Beklagar, kan inte dela stycket\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Dela i %d stycke.\n"
 msgstr[1] "Dela i %d stycken.\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Beklagar, kan inte redigera stycket\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Granska diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23142,19 +24071,19 @@ msgstr ""
 "diff          - visa diff mellan HEAD och index\n"
 "add untracked - lรคgg till innehรฅll i ospรฅrade filer till kรถade รคndringar\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "saknad --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "okรคnt lรคge fรถr --patch: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "felaktigt argument %s, fรถrvรคntar --"
@@ -23321,7 +24250,7 @@ msgstr ""
 
 #: git-send-email.perl:918
 msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "Vilken รฅttabitarsteckenkodning skall jag ange [UTF-8]? "
+msgstr "Vilken รฅttabitarsteckenkodning ska jag ange [UTF-8]? "
 
 #: git-send-email.perl:926
 #, perl-format
@@ -23338,7 +24267,7 @@ msgstr ""
 
 #: git-send-email.perl:945
 msgid "To whom should the emails be sent (if anyone)?"
-msgstr "Till vem skall breven sรคndas (om nรฅgon)?"
+msgstr "Till vem ska breven sรคndas (om nรฅgon)?"
 
 #: git-send-email.perl:963
 #, perl-format
@@ -23524,6 +24453,185 @@ msgstr ""
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: "
 
+#~ msgid "{drop,keep,ask}"
+#~ msgstr "{drop,keep,ask}"
+
+#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
+#~ msgstr "Kรถa รคndrat lรคge [y,n,a,q,d%s,?]? "
+
+#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
+#~ msgstr "Kรถa borttagning [y,n,a,q,d%s,?]? "
+
+#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
+#~ msgstr "Kรถa stycket [y,n,a,q,d%s,?]? "
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for staging.\n"
+#~ msgstr ""
+#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
+#~ "kรถas omedelbart.\n"
+
+#~ msgid ""
+#~ "y - stage this hunk\n"
+#~ "n - do not stage this hunk\n"
+#~ "q - quit; do not stage this hunk or any of the remaining ones\n"
+#~ "a - stage this and all the remaining hunks\n"
+#~ "d - do not stage this hunk nor any of the remaining hunks\n"
+#~ msgstr ""
+#~ "y - kรถa stycket\n"
+#~ "n - kรถa inte stycket\n"
+#~ "q - avsluta; kรถa inte stycket eller nรฅgot av de fรถljande\n"
+#~ "a - kรถa detta och alla fรถljande stycken\n"
+#~ "d - kรถa inte stycket eller nรฅgot av de stycken som fรถljer\n"
+
+#~ msgid "could not copy '%s' to '%s'."
+#~ msgstr "kunde inte kopiera \"%s\" till \"%s\"."
+
+#~ msgid "malformed ident line"
+#~ msgstr "felaktig ident-rad"
+
+#~ msgid "corrupted author without date information"
+#~ msgstr "trasig fรถrfattare utan datuminformation"
+
+#~ msgid "could not parse '%.*s'"
+#~ msgstr "kunde inte tolka \"%.*s\""
+
+#~ msgid "could not checkout %s"
+#~ msgstr "kunde inte checka ut %s"
+
+#~ msgid "filename in tree entry contains backslash: '%s'"
+#~ msgstr "filnamnet i trรคdet innehรฅller omvรคnt snedstreck: \"%s\""
+
+#~ msgid "Use -f if you really want to add them.\n"
+#~ msgstr "Anvรคnd -f om du verkligen vill lรคgga till dem.\n"
+
+#~ msgid "Maybe you wanted to say 'git add .'?\n"
+#~ msgstr "Kanske menade du att skriva \"git add .\"?\n"
+
+#~ msgid "packfile is invalid: %s"
+#~ msgstr "packfil รคr ogiltig: %s"
+
+#~ msgid "unable to open packfile for reuse: %s"
+#~ msgstr "kan inte รถppna packfil fรถr รฅteranvรคndning: %s"
+
+#~ msgid "unable to seek in reused packfile"
+#~ msgstr "kan inte sรถka i รฅteranvรคnd packfil"
+
+#~ msgid "unable to read from reused packfile"
+#~ msgstr "kan inte lรคsa frรฅn รฅteranvรคnd packfil"
+
+#~ msgid "no HEAD?"
+#~ msgstr "inget HEAD?"
+
+#~ msgid "make committer date match author date"
+#~ msgstr "sรคtt incheckningsdatum till fรถrfattardatum"
+
+#~ msgid "ignore author date and use current date"
+#~ msgstr "ignorera fรถrfattardatum och anvรคnd nuvarande"
+
+#~ msgid "synonym of --reset-author-date"
+#~ msgstr "synonym fรถr --reset-author-date"
+
+#~ msgid "ignore changes in whitespace"
+#~ msgstr "ignorera รคndringar i blanksteg"
+
+#~ msgid "preserve empty commits during rebase"
+#~ msgstr "behรฅll tomma incheckningar under ombasering"
+
+#~ msgid "cannot combine --use-bitmap-index with object filtering"
+#~ msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
+
+#~ msgid ""
+#~ "The following path is ignored by one of your .gitignore files:\n"
+#~ "$sm_path\n"
+#~ "Use -f if you really want to add it."
+#~ msgstr ""
+#~ "Fรถljande sรถkvรคgar ignoreras av en av dina .gitignore-filer:\n"
+#~ "$sm_path\n"
+#~ "Anvรคnd -f om du verkligen vill lรคgga till den."
+
+#~ msgid "unable to get tree for %s"
+#~ msgstr "kunde inte hรคmta trรคdet pรฅ %s"
+
+#~ msgid "Use an experimental heuristic to improve diffs"
+#~ msgstr "Anvรคnd en experimentell algoritm fรถr att fรถrbรคttra diffar"
+
+#~ msgid "git commit-graph [--object-dir <objdir>]"
+#~ msgstr "git commit-graph [--object-dir <objkat>]"
+
+#~ msgid "git commit-graph read [--object-dir <objdir>]"
+#~ msgstr "git commit-graph read [--object-dir <objkat>]"
+
+#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+#~ msgstr ""
+#~ "okรคnt vรคrde \"%s\" fรถr core.untrackedCache; anvรคnder standardvรคrdet \"keep"
+#~ "\""
+
+#~ msgid "cannot change partial clone promisor remote"
+#~ msgstr "kan inte รคndra kontraktsfjรคrr fรถr delvis kloning"
+
+#~ msgid "error building trees"
+#~ msgstr "fel vid byggande av trรคd"
+
+#~ msgid "invalid date format '%s' in '%s'"
+#~ msgstr "ogiltigt datumformat \"%s\" i \"%s\""
+
+#~ msgid "writing root commit"
+#~ msgstr "skriver rotincheckning"
+
+#~ msgid "staged changes in the following files may be lost: %s"
+#~ msgstr "kรถade รคndringar i fรถljande filer kan gรฅ fรถrlorade: %s"
+
+#~ msgid ""
+#~ "--filter can only be used with the remote configured in extensions."
+#~ "partialClone"
+#~ msgstr ""
+#~ "--filter kan endast anvรคndas med fjรคrren konfigurerad i extensions."
+#~ "partialClone"
+
+#~ msgid "verify commit-msg hook"
+#~ msgstr "bekrรคfta commit-msg-krok"
+
+#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\""
+
+#~ msgid "invalid sparse value '%s'"
+#~ msgstr "ogiltigt vรคrde fรถr sparse: \"%s\""
+
+#~ msgid ""
+#~ "Fetch normally indicates which branches had a forced update, but that "
+#~ "check has been disabled."
+#~ msgstr ""
+#~ "Hรคmtning visar vanligtvis vilka grenar som har en tvingad uppdatering, "
+#~ "men det testet har slagits av."
+
+#~ msgid ""
+#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+#~ msgstr ""
+#~ "eller kรถr \"git config fetch.showForcedUpdates false\" fรถr undvika "
+#~ "testet.\n"
+
+#~ msgid ""
+#~ "log.mailmap is not set; its implicit value will change in an\n"
+#~ "upcoming release. To squelch this message and preserve current\n"
+#~ "behaviour, set the log.mailmap configuration value to false.\n"
+#~ "\n"
+#~ "To squelch this message and adopt the new behaviour now, set the\n"
+#~ "log.mailmap configuration value to true.\n"
+#~ "\n"
+#~ "See 'git help config' and search for 'log.mailmap' for further "
+#~ "information."
+#~ msgstr ""
+#~ "log.mailmap har inte satts: fรถrvalet kommer รคndras i en kommande\n"
+#~ "version. Fรถr att dรถlja det hรคr meddelandet och behรฅlla nuvarande\n"
+#~ "beteende, sรคtt konfigurationsvariabeln log.mailmap till false.\n"
+#~ "\n"
+#~ "Fรถr att dรถlja det hรคr meddelandet och anvรคnda det nya beteendet,\n"
+#~ "sรคtt konfigurationsvariabeln log.mailmap till true.\n"
+#~ "\n"
+#~ "Se \"git help config\" och sรถk efter \"log.mailmap\" fรถr mer information."
+
 #~ msgid "Server supports multi_ack_detailed"
 #~ msgstr "Servern stรถder \"multi_ack_detailed\""
 
@@ -23561,9 +24669,6 @@ msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: "
 #~ msgstr ""
 #~ "kan inte vara interaktiv om standard in inte รคr ansluten till en terminal."
 
-#~ msgid "failed to open '%s'"
-#~ msgstr "misslyckades รถppna \"%s\""
-
 #~ msgid "failed to stat %s\n"
 #~ msgstr "misslyckades ta status pรฅ %s\n"
 
@@ -24080,9 +25185,6 @@ msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: "
 #~ msgid "Cannot cherry-pick during another cherry-pick."
 #~ msgstr "Kan inte utfรถra \"cherry-pick\" under en annan \"cherry-pick\"."
 
-#~ msgid "Could not parse line %d."
-#~ msgstr "Kan inte tolka rad %d."
-
 #~ msgid "Could not open %s"
 #~ msgstr "Kunde inte รถppna %s"
 
@@ -24405,9 +25507,6 @@ msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: "
 #~ msgid "Could not append '%s'"
 #~ msgstr "Kunde inte lรคgga till pรฅ \"%s\""
 
-#~ msgid "Missing author: %s"
-#~ msgstr "Fรถrfattare saknas: %s"
-
 #~ msgid "Testing "
 #~ msgstr "Testar"
 
@@ -24465,9 +25564,6 @@ msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: "
 #~ msgid "option %s does not accept negative form"
 #~ msgstr "flaggan %s godtar inte negativ form"
 
-#~ msgid "unable to parse value '%s' for option %s"
-#~ msgstr "kunde inte tolka vรคrdet \"%s\" fรถr flaggan %s"
-
 #~ msgid "-b and -B are mutually exclusive"
 #~ msgstr "-b och -B kan inte anvรคndas samtidigt"
 
diff --git a/third_party/git/po/tr.po b/third_party/git/po/tr.po
new file mode 100644
index 000000000000..1748297afbfe
--- /dev/null
+++ b/third_party/git/po/tr.po
@@ -0,0 +1,24563 @@
+# Turkish translations for Git
+# Git Tรผrkรงe รงevirileri
+# Copyright (C) 2020 Emir SARI <bitigchi@me.com>
+# This file is distributed under the same license as the Git package.
+# Emir SARI <bitigchi@me.com>, 2020
+#
+# ######################################################### #
+#     Git Tรผrkรงe kavramlar dizini / Git Turkish Glossary    #
+#                                                           #
+# ฤฐngilizce                   | Tรผrkรงe                      #
+# โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“โ€“#
+# 3-way merge                 | 3 yรถnlรผ birleลŸtirme         #
+# bare repository             | รงฤฑplak depo                 #
+# blob object                 | ikili nesne                 #
+# branch                      | dal                         #
+# bundle                      | demet                       #
+# checkout                    | รงฤฑkฤฑลŸ yapฤฑm/yapmak          #
+# chunk                       | iri parรงa                   #
+# clone                       | klon(lamak)                 #
+# commit (ad)                 | gรถnderi                     #
+# commit (eyl.)               | gรถndermek                   #
+# commitish                   | gรถnderimsi                  #
+# conflict                    | รงakฤฑลŸma                     #
+# dangling object             | sallanan nesne              #
+# detached HEAD               | ayrฤฑk HEAD                  #
+# dirty                       | kirli                       #
+# evil merge                  | uฤŸursuz birleลŸtirme         #
+# fast-forward                | ileri sarฤฑm/sarmak          #
+# fetch                       | getirme(k)                  #
+# fixup                       | dรผzeltmek                   #
+# graft                       | aลŸฤฑ                         #
+# hash                        | saฤŸlama                     #
+# head                        | dal ucu                     #
+# hunk                        | parรงa                       #
+# inflate                     | sรถndรผrmek                   #
+# init                        | ilklendirmek                #
+# mark                        | im(lemek)                   #
+# merge                       | birleลŸtirme(k)              #
+# octopus                     | ahtapot                     #
+# overlay                     | yerpaylaลŸฤฑm                 #
+# pack                        | paket                       #
+# parent                      | รผst รถge                     #
+# patch                       | yama                        #
+# pathspec                    | yol belirteci               #
+# pattern                     | dizgi                       #
+# porcelain                   | okunabilir                  #
+# prune                       | budamak                     #
+# pseudoref                   | yalancฤฑktan baลŸvuru         #
+# pull                        | รงekme(k)                    #
+# push                        | itme(k)                     #
+# rebase                      | yeniden temellendirme(k)    #
+# record                      | kayฤฑt yaz(mak)              #
+# ref                         | baลŸvuru                     #
+# reflog                      | baลŸvuru gรผnlรผฤŸรผ             #
+# refspec                     | baลŸvuru belirteci           #
+# register                    | kayฤฑt yap(mak)              #
+# remote                      | uzak konum                  #
+# remote repository           | uzak depo                   #
+# remote-tracking branch      | uzak izleme dalฤฑ            #
+# repository                  | depo                        #
+# resolve                     | รงรถzรผm/รงรถzmek                #
+# revert                      | geri al(mak)                #
+# rewind                      | geri sar(mak)               #
+# save                        | kaydet(mek)                 #
+# shallow clone               | sฤฑฤŸ klon                    #
+# shallow repository          | sฤฑฤŸ depo                    #
+# sparse-checkout             | aralฤฑklฤฑ รงฤฑkฤฑลŸ              #
+# squash                      | tฤฑkฤฑลŸtฤฑr(mak)               #
+# stage                       | hazฤฑrla(mak)                #
+# staging area                | (gรถnderi) hazฤฑrlama alanฤฑ   #
+# stash                       | zula(lamak)                 #
+# string                      | dizi                        #
+# subdirectory                | altdizin                    #
+# submodule                   | altmodรผl                    #
+# symlink                     | sembolik baฤŸ                #
+# symref                      | sembolik baลŸvuru            #
+# tag                         | etiket                      #
+# template                    | ลŸablon                      #
+# topic branch                | kiลŸisel dal                 #
+# trailer                     | artbilgi                    #
+# tree                        | aฤŸaรง                        #
+# treeish                     | aฤŸacฤฑmsฤฑ                    #
+# unstage                     | hazฤฑrlฤฑktan รงฤฑkar(mak)      #
+# upstream                    | รผstkaynak                   #
+# worktree/working tree       | รงalฤฑลŸma aฤŸacฤฑ               #
+# ######################################################### #
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Git Turkish Localization Project\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-10 23:00+0300\n"
+"Last-Translator: Emir SARI <bitigchi@me.com>\n"
+"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Pardon (%s)?"
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "indeks okunamadฤฑ"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "ikili"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "hiรงbir ลŸey"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "deฤŸiลŸtirilmemiลŸ"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "Gรผncelle"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "'%s' hazฤฑrlanamadฤฑ"
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "indeks yazฤฑlamadฤฑ"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "%d yol gรผncellendi\n"
+msgstr[1] "%d yol gรผncellendi\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "not: %s artฤฑk izlenmiyor.\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "'%s' yolu iรงin make_cache_entry baลŸarฤฑsฤฑz oldu"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "Geri al"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "HEAD^{tree} ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "%d yol geri alฤฑndฤฑ\n"
+msgstr[1] "%d yol geri alฤฑndฤฑ\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "ฤฐzlenmeyen dosya yok.\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "ฤฐzlenmeyenleri ekle"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "%d yol eklendi\n"
+msgstr[1] "%d yol eklendi\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "birleลŸtirilmeyenler yok sayฤฑlฤฑyor: %s"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Yalnฤฑzca ikili dosyalar deฤŸiลŸtirildi.\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "DeฤŸiลŸiklik yok.\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "Yama gรผncellemesi"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "diff'i gรถzden geรงir"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "deฤŸiลŸtirilmiลŸ yollarฤฑ gรถster"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr "hazฤฑrlanan deฤŸiลŸikliklere รงalฤฑลŸma aฤŸacฤฑ durumunu ekle"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "hazฤฑrlanan deฤŸiลŸiklikleri HEAD sรผrรผmรผne geri al"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr "parรงalarฤฑ seรง ve seรงerek gรผncelle"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "HEAD ve indeks arasฤฑndaki diff'i gรถr"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "izlenmeyen dosyalarฤฑn iรงeriฤŸini hazฤฑrlanan deฤŸiลŸikliklere ekle"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "ฤฐstem yardฤฑmฤฑ:"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "tek bir รถge seรง"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "bir รถge erimi seรง"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "birden รงok erim seรง"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "benzersiz รถneke dayanarak รถge seรง"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "belirtilen รถgelerin seรงimini kaldฤฑr"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "tรผm รถgeleri seรง"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "(boลŸ) seรงimi bitir"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "numaralandฤฑrฤฑlmฤฑลŸ bir รถge seรง"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "(boลŸ) hiรงbir ลŸey seรงme"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** Komutlar ***"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "ลžimdi ne"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "hazฤฑrlanmฤฑลŸ"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "hazฤฑrlanmamฤฑลŸ"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "yol"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "indeks yenilenemedi"
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "HoลŸรงa kal.\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Kip deฤŸiลŸimi hazฤฑrlansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Silme hazฤฑrlansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Bu parรงa hazฤฑrlansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa dรผzenlenen parรงa derhal hazฤฑrlama iรงin "
+"imlenecektir."
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parรงayฤฑ hazฤฑrla\n"
+"n - bu parรงayฤฑ hazฤฑrlama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini hazฤฑrlama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ hazฤฑrla\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini hazฤฑrlama\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Kip deฤŸiลŸimi zulalansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Silme zulalansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Bu parรงa zulalansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa dรผzenlenen parรงa derhal zulalama iรงin "
+"imlenecektir."
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parรงayฤฑ zulala\n"
+"n - bu parรงayฤฑ zulalama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini zulalama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ zulala\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini zulalama\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Kip deฤŸiลŸimi hazฤฑrlฤฑktan รงฤฑkarฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Silme hazฤฑrlฤฑktan รงฤฑkarฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Bu parรงa hazฤฑrlฤฑktan รงฤฑkarฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa, dรผzenlenen parรงa derhal hazฤฑrlฤฑktan "
+"รงฤฑkarฤฑm iรงin imlenecektir."
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parรงayฤฑ hazฤฑrlฤฑktan รงฤฑkar\n"
+"n - bu parรงayฤฑ hazฤฑrlฤฑktan รงฤฑkarma\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini hazฤฑrlฤฑktan รงฤฑkarma\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ hazฤฑrlฤฑktan รงฤฑkar\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini hazฤฑrlฤฑktan รงฤฑkarma\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Kip deฤŸiลŸimi indekse uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Silme indekse uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Bu parรงa indekse uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa dรผzenlenen parรงa derhal uygulama iรงin "
+"imlenecektir."
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parรงayฤฑ indekse uygula\n"
+"n - bu parรงayฤฑ indekse uygulama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini uygulama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ uygula\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini uygulama\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kip deฤŸiลŸimi รงalฤฑลŸma aฤŸacฤฑndan atฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Silme รงalฤฑลŸma aฤŸacฤฑndan atฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Bu parรงa รงalฤฑลŸma aฤŸacฤฑndan atฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa dรผzenlenen parรงa derhal ฤฑskartaya รงฤฑkarฤฑm "
+"iรงin imlenecektir."
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑndan at\n"
+"n - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑndan atma\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini atma\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ at\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini atma\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Kip deฤŸiลŸimi indeksten ve รงalฤฑลŸma aฤŸacฤฑndan atฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Silme indeksten ve รงalฤฑลŸma aฤŸacฤฑndan atฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Bu parรงa indeksten ve รงalฤฑลŸma aฤŸacฤฑndan atฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑndan ve indeksten at\n"
+"n - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑndan ve indeksten atma\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini atma\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ at\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini atma\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Kip deฤŸiลŸimi indekse ve รงalฤฑลŸma aฤŸacฤฑna uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Silme indekse ve รงalฤฑลŸma aฤŸacฤฑna uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Bu parรงa indekse ve รงalฤฑลŸma aฤŸacฤฑna uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parรงayฤฑ indekse ve รงalฤฑลŸma aฤŸacฤฑna uygula\n"
+"n - bu parรงayฤฑ indekse ve รงalฤฑลŸma aฤŸacฤฑna uygulama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini uygulama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ uygula\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini uygulama\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑna uygula\n"
+"n - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑna uygulama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini uygulama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ uygula\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini uygulama\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "parรงa รผstbilgisi '%.*s' ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "renklendirilmiลŸ parรงa รผstbilgisi '%.*s' ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "diff ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "renklendirilmiลŸ diff ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "'%s' รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "interactive.diffFilter รถgesinden eลŸleลŸmeyen รงฤฑktฤฑ"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Sรผzgeciniz kendisinin girdi ve รงฤฑktฤฑ satฤฑrlarฤฑ arasฤฑnda\n"
+"birebir karลŸฤฑlฤฑk saฤŸlamalฤฑdฤฑr."
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"ลŸurada baฤŸlam satฤฑrฤฑ #%d bekleniyordu:\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"parรงalar รผst รผste binmiyor:\n"
+"%.*s\n"
+"\tลŸununla bitmiyor:\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "El ile parรงa dรผzenleme kipi -- hฤฑzlฤฑca รถฤŸrenmek iรงin aลŸaฤŸฤฑya bakฤฑn.\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"'%c' satฤฑr kaldฤฑrmak iรงin onlarฤฑ ' ' satฤฑr yapฤฑn (baฤŸlam).\n"
+"'%c' satฤฑr kaldฤฑrmak iรงin onlarฤฑ silin.\n"
+"%c kaldฤฑrฤฑlacak.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"EฤŸer sorunsuzca uygulanamazsa yeniden dรผzenlemeniz iรงin bir olanak\n"
+"sunulacaktฤฑr. Parรงanฤฑn tรผm satฤฑrlarฤฑ kaldฤฑrฤฑlฤฑrsa dรผzenleme durdurulur\n"
+"ve parรงa deฤŸiลŸtirilmeden bฤฑrakฤฑlฤฑr.\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "parรงa รผstbilgisi ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' baลŸarฤฑsฤฑz oldu"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"DรผzenlediฤŸiniz parรงa uygulanamฤฑyor. Yeniden dรผzenlensin mi (\"n (hayฤฑr)\" "
+"demek iptal eder!) [y/n]? "
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "Seรงili parรงalar indekse uygulanamฤฑyor!"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑna yine de uygulansฤฑn mฤฑ? "
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "Hiรงbir ลŸey uygulanmadฤฑ.\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - bu parรงa iรงin sonra karar ver, bir sonraki karar verilmemiลŸ parรงayฤฑ gรถr\n"
+"J - bu parรงa iรงin sonra karar ver, bir sonraki parรงayฤฑ gรถr\n"
+"k - bu parรงa iรงin sonra karar ver, bir รถnceki karar verilmemiลŸ parรงayฤฑ gรถr\n"
+"K - bu parรงa iรงin sonra karar ver, bir รถnceki parรงayฤฑ gรถr\n"
+"g - gidilecek bir parรงa seรง\n"
+"/ - verilen dรผzenli ifade ile eลŸleลŸen bir parรงa ara\n"
+"s - geรงerli parรงayฤฑ daha ufak parรงalara bรถl\n"
+"e - geรงerli parรงayฤฑ el ile dรผzenle\n"
+"? - yardฤฑmฤฑ yazdฤฑr\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "ร–ncesinde parรงa yok"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "Sonrasฤฑnda parรงa yok"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "Gidilecek baลŸka bir parรงa yok"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "hangi parรงaya gidilsin (daha fazla gรถrmek iรงin <ret>)? "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "hangi parรงaya gidilsin? "
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Geรงersiz sayฤฑ: '%s'"
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "รœzgรผnรผm, yalnฤฑzca %d parรงa kullanฤฑlabilir."
+msgstr[1] "รœzgรผnรผm, yalnฤฑzca %d parรงa kullanฤฑlabilir."
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "Aranacak baลŸka parรงa yok"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "dรผzenli ifade aransฤฑn mฤฑ? "
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Hatalฤฑ oluลŸturulmuลŸ dรผzenli ifade %s: %s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "Verilen dizgi ile eลŸleลŸen bir parรงa yok"
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "รœzgรผnรผm, bu parรงa bรถlรผnemiyor"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "%d parรงaya bรถlรผndรผ."
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "รœzgรผnรผm, bu parรงa dรผzenlenemiyor"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "'git apply' baลŸarฤฑsฤฑz oldu"
+
+#: advice.c:115
+#, c-format
+msgid "%shint: %.*s%s\n"
+msgstr "%sipucu: %.*s%s\n"
+
+#: advice.c:168
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "Seรง-al yapฤฑlamฤฑyor รงรผnkรผ birleลŸtirilmemiลŸ dosyalarฤฑnฤฑz var."
+
+#: advice.c:170
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Gรถnderi yapฤฑlamฤฑyor รงรผnkรผ birleลŸtirilmemiลŸ dosyalarฤฑnฤฑz var."
+
+#: advice.c:172
+msgid "Merging is not possible because you have unmerged files."
+msgstr "BirleลŸtirme yapฤฑlamฤฑyor รงรผnkรผ birleลŸtirilmemiลŸ dosyalarฤฑnฤฑz var."
+
+#: advice.c:174
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "ร‡ekme yapฤฑlamฤฑyor รงรผnkรผ birleลŸtirilmemiลŸ dosyalarฤฑnฤฑz var."
+
+#: advice.c:176
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "Geriye alma yapฤฑlamฤฑyor รงรผnkรผ birleลŸtirilmemiลŸ dosyalarฤฑnฤฑz var."
+
+#: advice.c:178
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "%s yapฤฑlamฤฑyor รงรผnkรผ birleลŸtirilmemiลŸ dosyalarฤฑnฤฑz var."
+
+#: advice.c:186
+msgid ""
+"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution and make a commit."
+msgstr ""
+"Onlarฤฑ รงalฤฑลŸma aฤŸacฤฑnda onarฤฑn, ardฤฑndan hazฤฑrlฤฑฤŸฤฑ bitirmek iรงin uygun\n"
+"gรถrรผldรผฤŸรผ biรงimde 'git add/rm <dosya>' yaptฤฑktan sonra bir gรถnderi yapฤฑn."
+
+#: advice.c:194
+msgid "Exiting because of an unresolved conflict."
+msgstr "ร‡รถzรผme kavuลŸturulmamฤฑลŸ bir รงakฤฑลŸmadan dolayฤฑ รงฤฑkฤฑlฤฑyor."
+
+#: advice.c:199 builtin/merge.c:1335
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "BirleลŸtirmenizi sonuรงlandฤฑrmadฤฑnฤฑz (MERGE_HEAD mevcut)."
+
+#: advice.c:201
+msgid "Please, commit your changes before merging."
+msgstr "BirleลŸtirme รถncesinde deฤŸiลŸikliklerinizi gรถnderin."
+
+#: advice.c:202
+msgid "Exiting because of unfinished merge."
+msgstr "TamamlanmamฤฑลŸ birleลŸtirmeden dolayฤฑ รงฤฑkฤฑlฤฑyor."
+
+#: advice.c:208
+#, c-format
+msgid ""
+"Note: switching to '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by switching back to a branch.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+"  git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
+"\n"
+msgstr ""
+"Not: ลžuraya geรงiliyor: '%s'.\n"
+"\n"
+"ลžu anda 'ayrฤฑk HEAD' durumundasฤฑnฤฑz. Oraya buraya bakabilir, deneysel\n"
+"deฤŸiลŸiklikler yapฤฑp gรถnderebilir veya baลŸka bir dala geรงerek yaptฤฑฤŸฤฑnฤฑz\n"
+"tรผm gรถnderileri baลŸka hiรงbir dala etki etmeden geri alabilirsiniz.\n"
+"\n"
+"YaptฤฑฤŸฤฑnฤฑz gรถnderileri tutmak iรงin yeni bir dal oluลŸturmak isterseniz bunu\n"
+"ลŸimdi veya daha sonra switch komutuna -c ekleyerek yapabilirsiniz. ร–rnek:\n"
+"\n"
+"\tgit switch -c <yeni-dal-adฤฑ>\n"
+"\n"
+"Bu iลŸlemi ลŸununla geri alabilirsiniz:\n"
+"\n"
+"\tgit switch -\n"
+"\n"
+"Bu รถฤŸรผdรผ advice.detachedHead yapฤฑlandฤฑrma deฤŸiลŸkenini false yaparak\n"
+"kapatabilirsiniz.\n"
+"\n"
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "komut satฤฑrฤฑ \\ ile bitiyor"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "kapatฤฑlmamฤฑลŸ tฤฑrnak"
+
+#: apply.c:69
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "tanฤฑmlanamayan boลŸluk seรงeneฤŸi '%s'"
+
+#: apply.c:85
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "tanฤฑmlanamayan boลŸluk yok sayma seรงeneฤŸi '%s'"
+
+#: apply.c:135
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject ve --3way birlikte kullanฤฑlamaz."
+
+#: apply.c:137
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached ve --3way birlikte kullanฤฑlamaz."
+
+#: apply.c:140
+msgid "--3way outside a repository"
+msgstr "-3way bir depo dฤฑลŸฤฑnda"
+
+#: apply.c:151
+msgid "--index outside a repository"
+msgstr "--index bir depo dฤฑลŸฤฑnda"
+
+#: apply.c:154
+msgid "--cached outside a repository"
+msgstr "--cached bir depo dฤฑลŸฤฑnda"
+
+#: apply.c:801
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Zaman damgasฤฑ dรผzenli ifadesi %s hazฤฑrlanamฤฑyor"
+
+#: apply.c:810
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "dรผzenli ifade girdi iรงin %d dรถndรผrdรผ: %s"
+
+#: apply.c:884
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "yamanฤฑn %d. satฤฑrฤฑnda dosya adฤฑ bulunamฤฑyor "
+
+#: apply.c:922
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: hatalฤฑ git-diff - /dev/null bekleniyordu, %s alฤฑndฤฑ, satฤฑr %d"
+
+#: apply.c:928
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply: hatalฤฑ git-diff - %d. satฤฑrda tutarsฤฑz yeni dosya adฤฑ"
+
+#: apply.c:929
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply: hatalฤฑ git-diff - %d. satฤฑrda tutarsฤฑz eski dosya adฤฑ"
+
+#: apply.c:934
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: hatalฤฑ git-diff - %d. satฤฑrda /dev/null bekleniyordu"
+
+#: apply.c:963
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "%d. satฤฑrda geรงersiz kip: %s"
+
+#: apply.c:1282
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "tutarsฤฑz รผstbilgi satฤฑrlarฤฑ %d ve %d"
+
+#: apply.c:1372
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"%d รถncรผ yol adฤฑ bileลŸeni kaldฤฑrฤฑlฤฑrken git diff รผstbilgisi dosya adฤฑ "
+"bilgisine iye deฤŸil (%d. satฤฑr)"
+msgstr[1] ""
+"%d รถncรผ yol adฤฑ bileลŸeni kaldฤฑrฤฑlฤฑrken git diff รผstbilgisi dosya adฤฑ "
+"bilgisine iye deฤŸil (%d. satฤฑr)"
+
+#: apply.c:1385
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "git diff รผstbilgisi dosya adฤฑ bilgisine iye deฤŸil (%d. satฤฑr)"
+
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: beklenmedik satฤฑr: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "%d. satฤฑrda รผstbilgisi olmayan yama parรงacฤฑฤŸฤฑ: %.*s"
+
+#: apply.c:1753
+msgid "new file depends on old contents"
+msgstr "yeni dosya eski iรงeriฤŸe gereksinim duyuyor"
+
+#: apply.c:1755
+msgid "deleted file still has contents"
+msgstr "silinen dosya iรงinde hรขlรข bir ลŸeyler var"
+
+#: apply.c:1789
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "hasarlฤฑ yama, %d. satฤฑr"
+
+#: apply.c:1826
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "%s yeni dosyasฤฑ eski iรงeriฤŸe gereksinim duyuyor"
+
+#: apply.c:1828
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "%s silinen dosyasฤฑnฤฑn iรงinde hรขlรข bir ลŸeyler var"
+
+#: apply.c:1831
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** uyarฤฑ: %s dosyasฤฑ boลŸ duruma gelir ancak silinmez"
+
+#: apply.c:1978
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "hasarlฤฑ ikili yama, %d. satฤฑr: %.*s"
+
+#: apply.c:2015
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "tanฤฑmlanamayan ikili yama, %d. satฤฑr"
+
+#: apply.c:2177
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "yalnฤฑzca anlamsฤฑz veri iรงeren yama, %d. satฤฑr"
+
+#: apply.c:2263
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "%s sembolik baฤŸฤฑ okunamฤฑyor"
+
+#: apply.c:2267
+#, c-format
+msgid "unable to open or read %s"
+msgstr "%s aรงฤฑlamฤฑyor veya okunamฤฑyor"
+
+#: apply.c:2936
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "geรงersiz satฤฑr baลŸlangฤฑcฤฑ: '%c'"
+
+#: apply.c:3057
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "Parรงa #%d baลŸarฤฑlฤฑ oldu, %d (%d satฤฑr ofset)."
+msgstr[1] "Parรงa #%d baลŸarฤฑlฤฑ oldu, %d (%d satฤฑr ofset)."
+
+#: apply.c:3069
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr ""
+"BaฤŸlam ลŸuna indirildi: (%ld/%ld) (%d konumundaki parรงacฤฑฤŸฤฑ uygulamak iรงin)"
+
+#: apply.c:3075
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"ลŸunu ararken:\n"
+"%.*s"
+
+#: apply.c:3097
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "'%s' iรงin ikili yama verisi eksik"
+
+#: apply.c:3105
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr "'%s' parรงasฤฑ geri alฤฑnmadan bir ikili yama reverse-apply yapฤฑlamฤฑyor"
+
+#: apply.c:3152
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr "tam indeks satฤฑrฤฑ olmadan '%s' รผzerine bir ikili yama uygulanamฤฑyor"
+
+#: apply.c:3163
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "Bu yama geรงerli iรงerik ile eลŸleลŸmeyen '%s' รผzerine uygulanฤฑr (%s)."
+
+#: apply.c:3171
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "yama boลŸ bir '%s' รผzerine uygulanฤฑr, ancak o boลŸ deฤŸil"
+
+#: apply.c:3189
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "gereken songรถrรผntรผ %s ('%s' iรงin) okunamฤฑyor"
+
+#: apply.c:3202
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "ikili yama '%s' รผzerine uygulanamฤฑyor"
+
+#: apply.c:3209
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"'%s' รผzerine ikili yama yanlฤฑลŸ sonuรง doฤŸuruyor (%s bekleniyordu, %s alฤฑndฤฑ)"
+
+#: apply.c:3230
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "yama baลŸarฤฑsฤฑz oldu: %s:%ld"
+
+#: apply.c:3353
+#, c-format
+msgid "cannot checkout %s"
+msgstr "%s รงฤฑkฤฑลŸฤฑ yapฤฑlamฤฑyor"
+
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#, c-format
+msgid "failed to read %s"
+msgstr "%s okunamadฤฑ"
+
+#: apply.c:3413
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "'%s' bir sembolik baฤŸฤฑn รถtesinden okunuyor"
+
+#: apply.c:3442 apply.c:3685
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "%s yolu yeniden adlandฤฑrฤฑldฤฑ/silindi"
+
+#: apply.c:3528 apply.c:3700
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: indekste bulunmuyor"
+
+#: apply.c:3537 apply.c:3708
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: indeks ile eลŸleลŸmiyor"
+
+#: apply.c:3572
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr ""
+"Depo 3 yรถnlรผ birleลŸtirmeye geri รงekilebilme iรงin gereken ikili nesneye iye "
+"deฤŸil."
+
+#: apply.c:3575
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "3 yรถnlรผ birleลŸtirmeye geri รงekiliniyor...\n"
+
+#: apply.c:3591 apply.c:3595
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "'%s' รถgesinin geรงerli iรงeriฤŸi okunamฤฑyor"
+
+#: apply.c:3607
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "3 yรถnlรผ birleลŸtirmeye geri รงekinilemedi...\n"
+
+#: apply.c:3621
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "'%s' รผzerine yama รงakฤฑลŸmalarla birlikte uygulandฤฑ.\n"
+
+#: apply.c:3626
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "'%s' รผzerine yama sorunsuzca uygulandฤฑ.\n"
+
+#: apply.c:3652
+msgid "removal patch leaves file contents"
+msgstr "kaldฤฑrma yamasฤฑ dosya iรงeriฤŸini bฤฑrakฤฑr"
+
+#: apply.c:3725
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: yanlฤฑลŸ tรผr"
+
+#: apply.c:3727
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s, %o tรผrรผne iye, %o bekleniyordu"
+
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
+#, c-format
+msgid "invalid path '%s'"
+msgstr "geรงersiz yol '%s'"
+
+#: apply.c:3936
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: indekste halihazฤฑrda var"
+
+#: apply.c:3939
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: รงalฤฑลŸma dizininde halihazฤฑrda var"
+
+#: apply.c:3959
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "ลŸunun yeni kipi (%o): %s, eski kip (%o) ile eลŸleลŸmiyor "
+
+#: apply.c:3964
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "ลŸunun yeni kipi (%o): %s, ลŸunun eski kipi (%o): %s, ile eลŸleลŸmiyor"
+
+#: apply.c:3984
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "etkilenen dosya '%s' bir sembolik baฤŸฤฑn รถtesinde"
+
+#: apply.c:3988
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: yama uygulanamฤฑyor"
+
+#: apply.c:4003
+#, c-format
+msgid "Checking patch %s..."
+msgstr "%s yamasฤฑ denetleniyor..."
+
+#: apply.c:4095
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "%s altmodรผlรผ iรงin sha1 bilgisi eksik veya yararsฤฑz"
+
+#: apply.c:4102
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "geรงerli HEAD'de olmayan %s iรงin kip deฤŸiลŸimi"
+
+#: apply.c:4105
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1 bilgisi eksik veya yararsฤฑz (%s)."
+
+#: apply.c:4114
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "%s geรงici indekse eklenemedi"
+
+#: apply.c:4124
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "geรงici indeks ลŸuraya yazฤฑlamadฤฑ: %s"
+
+#: apply.c:4262
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "%s indeksten kaldฤฑrฤฑlamฤฑyor"
+
+#: apply.c:4296
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "%s altmodรผlรผ iรงin hasarlฤฑ yama"
+
+#: apply.c:4302
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "yeni oluลŸturulan '%s' dosyasฤฑnฤฑn bilgileri alฤฑnamฤฑyor"
+
+#: apply.c:4310
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "yeni oluลŸturulan %s dosyasฤฑ iรงin yardฤฑmcฤฑ bellek oluลŸturulamฤฑyor"
+
+#: apply.c:4316 apply.c:4461
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "%s iรงin รถnbellek girdisi eklenemiyor"
+
+#: apply.c:4359
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "ลŸuraya yazฤฑlamadฤฑ: '%s'"
+
+#: apply.c:4363
+#, c-format
+msgid "closing file '%s'"
+msgstr "'%s' dosyasฤฑ kapatฤฑlฤฑyor"
+
+#: apply.c:4433
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "'%s' dosyasฤฑ yazฤฑlamฤฑyor, %o kipi"
+
+#: apply.c:4531
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "%s yamasฤฑ sorunsuzca uygulandฤฑ."
+
+#: apply.c:4539
+msgid "internal error"
+msgstr "iรง hata"
+
+#: apply.c:4542
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "%%s yamasฤฑ %d geri รงevirme ile uygulanฤฑyor..."
+msgstr[1] "%%s yamasฤฑ %d geri รงevirme ile uygulanฤฑyor..."
+
+#: apply.c:4553
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr ".rej dosya adฤฑ %.*s.rej olarak kฤฑsaltฤฑlฤฑyor"
+
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#, c-format
+msgid "cannot open %s"
+msgstr "%s aรงฤฑlamฤฑyor"
+
+#: apply.c:4575
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Parรงa #%d sorunsuzca uygulandฤฑ."
+
+#: apply.c:4579
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Parรงa %d geri รงevrildi."
+
+#: apply.c:4698
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "'%s' yamasฤฑ atlandฤฑ."
+
+#: apply.c:4706
+msgid "unrecognized input"
+msgstr "tanฤฑmlanamayan girdi"
+
+#: apply.c:4726
+msgid "unable to read index file"
+msgstr "indeks dosyasฤฑ okunamฤฑyor"
+
+#: apply.c:4883
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "'%s' yamasฤฑ aรงฤฑlamฤฑyor: %s"
+
+#: apply.c:4910
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "%d boลŸluk hatasฤฑ susturuldu"
+msgstr[1] "%d boลŸluk hatasฤฑ susturuldu"
+
+#: apply.c:4916 apply.c:4931
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d satฤฑr boลŸluk hatasฤฑ ekliyor."
+msgstr[1] "%d satฤฑr boลŸluk hatasฤฑ ekliyor."
+
+#: apply.c:4924
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "BoลŸluk hatalarฤฑ dรผzeltildikten sonra %d satฤฑr uygulandฤฑ."
+msgstr[1] "BoลŸluk hatalarฤฑ dรผzeltildikten sonra %d satฤฑr uygulandฤฑ."
+
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+msgid "Unable to write new index file"
+msgstr "Yeni indeks dosyasฤฑ yazฤฑlamฤฑyor"
+
+#: apply.c:4968
+msgid "don't apply changes matching the given path"
+msgstr "verilen yol ile eลŸleลŸen deฤŸiลŸiklikleri uygulama"
+
+#: apply.c:4971
+msgid "apply changes matching the given path"
+msgstr "verilen yol ile eลŸleลŸen deฤŸiลŸiklikleri uygula"
+
+#: apply.c:4973 builtin/am.c:2260
+msgid "num"
+msgstr "sayฤฑ"
+
+#: apply.c:4974
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "geleneksel diff yollarฤฑndan <sayฤฑ> รถncรผ eฤŸik รงizgiyi kaldฤฑr"
+
+#: apply.c:4977
+msgid "ignore additions made by the patch"
+msgstr "yamanฤฑn yaptฤฑฤŸฤฑ eklemeleri yok say"
+
+#: apply.c:4979
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "yamayฤฑ uygulama yerine girdi iรงin diffstat'ฤฑ รงฤฑktฤฑ ver"
+
+#: apply.c:4983
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "eklenen ve silinen satฤฑrlarฤฑn sayฤฑsฤฑnฤฑ onluk birimde gรถster"
+
+#: apply.c:4985
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "yamayฤฑ uygulama yerine girdi iรงin bir รถzet รงฤฑktฤฑsฤฑ ver"
+
+#: apply.c:4987
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "yamayฤฑ uygulama yerine yamanฤฑn uygulanabilir olup olmadฤฑฤŸฤฑna bak"
+
+#: apply.c:4989
+msgid "make sure the patch is applicable to the current index"
+msgstr "yamanฤฑn geรงerli indekse uygulanabilir olduฤŸundan emin ol"
+
+#: apply.c:4991
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "yeni dosyalarฤฑ `git add --intent-to-add` ile imle"
+
+#: apply.c:4993
+msgid "apply a patch without touching the working tree"
+msgstr "รงalฤฑลŸma aฤŸacฤฑna dokunmadan bir yama uygula"
+
+#: apply.c:4995
+msgid "accept a patch that touches outside the working area"
+msgstr "รงalฤฑลŸma aฤŸacฤฑnฤฑn dฤฑลŸฤฑna dokunan bir yamayฤฑ kabul et"
+
+#: apply.c:4998
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "ek olarak yamayฤฑ da uygula (--stat/--summary/--check ile kullan)"
+
+#: apply.c:5000
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "bir yama uygulanamฤฑyorsa 3 yรถnlรผ birleลŸtirme dene"
+
+#: apply.c:5002
+msgid "build a temporary index based on embedded index information"
+msgstr "gรถmรผlรผ indeks bilgisini temel alan geรงici bir indeks oluลŸtur"
+
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+msgid "paths are separated with NUL character"
+msgstr "yollar NUL karakteri ile ayrฤฑlฤฑr"
+
+#: apply.c:5007
+msgid "ensure at least <n> lines of context match"
+msgstr "en az <n> baฤŸlam satฤฑrฤฑnฤฑn eลŸleลŸtiฤŸinden emin ol"
+
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+msgid "action"
+msgstr "eylem"
+
+#: apply.c:5009
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "boลŸluk hatasฤฑ iรงeren yeni veya deฤŸiลŸtirilmiลŸ satฤฑrlarฤฑ algฤฑla"
+
+#: apply.c:5012 apply.c:5015
+msgid "ignore changes in whitespace when finding context"
+msgstr "baฤŸlam bulurken boลŸluk deฤŸiลŸikliklerini yok say"
+
+#: apply.c:5018
+msgid "apply the patch in reverse"
+msgstr "yamayฤฑ tersten uygula"
+
+#: apply.c:5020
+msgid "don't expect at least one line of context"
+msgstr "en az bir satฤฑr baฤŸlam bekleme"
+
+#: apply.c:5022
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "reddedilmiลŸ parรงalarฤฑ ilgili *.rej dosyalarฤฑnda bฤฑrak"
+
+#: apply.c:5024
+msgid "allow overlapping hunks"
+msgstr "รผst รผste binen parรงalara izin ver"
+
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+msgid "be verbose"
+msgstr "ayrฤฑntฤฑ ver"
+
+#: apply.c:5027
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "dosya sonunda yanlฤฑลŸlฤฑkla algฤฑlanan eksik yenisatฤฑrฤฑ hoลŸ gรถr"
+
+#: apply.c:5030
+msgid "do not trust the line counts in the hunk headers"
+msgstr "parรงa รผstbilgisindeki satฤฑr sayฤฑmฤฑna gรผvenme"
+
+#: apply.c:5032 builtin/am.c:2248
+msgid "root"
+msgstr "kรถk"
+
+#: apply.c:5033
+msgid "prepend <root> to all filenames"
+msgstr "tรผm dosya adlarฤฑnฤฑn baลŸฤฑna <kรถk> ekle"
+
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<seรงenekler>] <aฤŸacฤฑmsฤฑ> [<yol>...]"
+
+#: archive.c:15
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:16
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <depo> [--exec <komut>] [<sรงnklr>] <aฤŸacฤฑmsฤฑ> [<yol>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <depo> [--exec <komut>] --list"
+
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "yol belirteci '%s' hiรงbir dosya ile eลŸleลŸmedi"
+
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "bรถyle bir baลŸvuru yok: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "geรงerli bir nesne adฤฑ deฤŸil: %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "bir aฤŸaรง nesnesi deฤŸil: %s"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "geรงerli รงalฤฑลŸma dizini izlenmiyor"
+
+#: archive.c:457
+msgid "fmt"
+msgstr "biรงim"
+
+#: archive.c:457
+msgid "archive format"
+msgstr "arลŸiv biรงimi"
+
+#: archive.c:458 builtin/log.c:1653
+msgid "prefix"
+msgstr "รถnek"
+
+#: archive.c:459
+msgid "prepend prefix to each pathname in the archive"
+msgstr "รถneki arลŸivdeki tรผm yol adlarฤฑnฤฑn baลŸฤฑna ekle"
+
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
+msgid "file"
+msgstr "dosya"
+
+#: archive.c:461 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "arลŸivi bu dosyaya yaz"
+
+#: archive.c:463
+msgid "read .gitattributes in working directory"
+msgstr "รงalฤฑลŸma dizinindeki .gitattributes'u oku"
+
+#: archive.c:464
+msgid "report archived files on stderr"
+msgstr "arลŸivlenmiลŸ dosyalarฤฑ stderr'de raporla"
+
+#: archive.c:465
+msgid "store only"
+msgstr "yalnฤฑzca depola"
+
+#: archive.c:466
+msgid "compress faster"
+msgstr "daha hฤฑzlฤฑ sฤฑkฤฑลŸtฤฑr"
+
+#: archive.c:474
+msgid "compress better"
+msgstr "daha iyi sฤฑkฤฑลŸtฤฑr"
+
+#: archive.c:477
+msgid "list supported archive formats"
+msgstr "desteklenen arลŸiv biรงimlerini listele"
+
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
+msgid "repo"
+msgstr "depo"
+
+#: archive.c:480 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "arลŸivi uzak konum deposu <depo>'dan al"
+
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr "komut"
+
+#: archive.c:482 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "uzak konum komutu git-upload-archive'e olan yol"
+
+#: archive.c:489
+msgid "Unexpected option --remote"
+msgstr "Beklenmedik seรงenek --remote"
+
+#: archive.c:491
+msgid "Option --exec can only be used together with --remote"
+msgstr "--exec seรงeneฤŸi yalnฤฑzca --remote ile birlikte kullanฤฑlabilir"
+
+#: archive.c:493
+msgid "Unexpected option --output"
+msgstr "Beklenmedik seรงenek --output"
+
+#: archive.c:515
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Bilinmeyen arลŸiv biรงimi '%s'"
+
+#: archive.c:522
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "'%s' biรงimi iรงin desteklenmeyen deฤŸiลŸken: -%d"
+
+#: archive-tar.c:125 archive-zip.c:351
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "%s ikili nesnesi akฤฑtฤฑlamฤฑyor"
+
+#: archive-tar.c:266 archive-zip.c:369
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)"
+
+#: archive-tar.c:293 archive-zip.c:359
+#, c-format
+msgid "cannot read %s"
+msgstr "%s okunamฤฑyor"
+
+#: archive-tar.c:465
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "'%s' sรผzgeci baลŸlatฤฑlamฤฑyor"
+
+#: archive-tar.c:468
+msgid "unable to redirect descriptor"
+msgstr "aรงฤฑklayฤฑcฤฑ yeniden yรถnlendirilemiyor"
+
+#: archive-tar.c:475
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "'%s' sรผzgeci hata bildirdi"
+
+#: archive-zip.c:319
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "yol geรงerli UTF-8 deฤŸil: %s"
+
+#: archive-zip.c:323
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "yol รงok uzun (%d karakter, SHA1: %s): %s"
+
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#, c-format
+msgid "deflate error (%d)"
+msgstr "sรถndรผrme hatasฤฑ (%d)"
+
+#: archive-zip.c:615
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "zaman damgasฤฑ bu sistem iรงin รงok bรผyรผk: %<PRIuMAX>"
+
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s geรงerli bir รถznitelik adฤฑ deฤŸil"
+
+#: attr.c:369
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s izin verilmiyor: %s:%d"
+
+#: attr.c:409
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Negatif dizgiler git รถzniteliklerinde yok sayฤฑlฤฑr.\n"
+"Gerรงek รถncรผ รผnlem iรงin '\\!' kullanฤฑn."
+
+#: bisect.c:468
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "'%s' dosyasฤฑnda hatalฤฑ tฤฑrnaฤŸa alฤฑnmฤฑลŸ iรงerik: %s"
+
+#: bisect.c:678
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Daha fazla ikili arama yapamฤฑyoruz!\n"
+
+#: bisect.c:745
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Geรงerli bir gรถnderi adฤฑ deฤŸil: %s"
+
+#: bisect.c:770
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"BirleลŸtirme temeli %s hatalฤฑ.\n"
+"Bu demek oluyor ki hata %s ve [%s] arasฤฑnda dรผzeltilmiลŸ.\n"
+
+#: bisect.c:775
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"BirleลŸtirme temeli %s yeni.\n"
+"ร–zellik %s ve [%s] arasฤฑnda deฤŸiลŸmiลŸ.\n"
+
+#: bisect.c:780
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"BirleลŸtirme temeli %s %s.\n"
+"Bu demek oluyor ki ilk '%s' gรถnderisi %s ve [%s] arasฤฑnda.\n"
+
+#: bisect.c:788
+#, c-format
+msgid ""
+"Some %s revs are not ancestors of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Bazฤฑ %s revizyonlarฤฑ %s revizyonunun atasฤฑ deฤŸil.\n"
+"git bisect bu durumda dรผzgรผnce รงalฤฑลŸamaz.\n"
+"%s ve %s revizyonlarฤฑnฤฑ birbirine mi karฤฑลŸtฤฑrdฤฑnฤฑz?\n"
+
+#: bisect.c:801
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"%s ve [%s] arasฤฑndaki birleลŸtirme temeli atlanmalฤฑ.\n"
+"%s gรถnderisinin %s ve [%s] arasฤฑnda olduฤŸundan emin olamฤฑyoruz.\n"
+"Yine de sรผrdรผreceฤŸiz."
+
+#: bisect.c:840
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "ฤฐkili arama: Bir birleลŸtirme temeli sฤฑnanmalฤฑ\n"
+
+#: bisect.c:890
+#, c-format
+msgid "a %s revision is needed"
+msgstr "bir %s revizyonu gerekiyor"
+
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#, c-format
+msgid "could not create file '%s'"
+msgstr "'%s' dosyasฤฑ oluลŸturulamadฤฑ"
+
+#: bisect.c:966 builtin/merge.c:149
+#, c-format
+msgid "could not read file '%s'"
+msgstr "'%s' dosyasฤฑ okunamadฤฑ"
+
+#: bisect.c:997
+msgid "reading bisect refs failed"
+msgstr "ikili arama baลŸvurularฤฑnฤฑ okuma baลŸarฤฑsฤฑz oldu"
+
+#: bisect.c:1019
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s hem %s hem %s idi\n"
+
+#: bisect.c:1028
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"Sฤฑnanabilir bir gรถnderi bulunamadฤฑ.\n"
+"Hatalฤฑ yol parametreleri ile mi baลŸladฤฑnฤฑz?\n"
+
+#: bisect.c:1057
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(aลŸaฤŸฤฑ yukarฤฑ %d adฤฑm)"
+msgstr[1] "(aลŸaฤŸฤฑ yukarฤฑ %d adฤฑm)"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1063
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "ฤฐkili arama: ลžundan sonra sฤฑnanacak %d revizyon kaldฤฑ: %s\n"
+msgstr[1] "ฤฐkili arama: ลžundan sonra sฤฑnanacak %d revizyon kaldฤฑ: %s\n"
+
+#: blame.c:2700
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents ve --reverse birlikte pek iyi gitmiyor."
+
+#: blame.c:2714
+msgid "cannot use --contents with final commit object name"
+msgstr "--contents son gรถnderi nesnesi adฤฑ ile kullanฤฑlamฤฑyor"
+
+#: blame.c:2735
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse ve --first-parent birlikte en son gรถnderinin belirtilmesi gerek"
+
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
+#: builtin/shortlog.c:192
+msgid "revision walk setup failed"
+msgstr "revizyonda gezinme ayarlamasฤฑ baลŸarฤฑsฤฑz oldu"
+
+#: blame.c:2762
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent birlikte ilk รผst รถge zincirinin yanฤฑnda erim "
+"gerektiriyor"
+
+#: blame.c:2773
+#, c-format
+msgid "no such path %s in %s"
+msgstr "ลŸurada %s yolu bulunamadฤฑ: %s"
+
+#: blame.c:2784
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "%s ikili nesnesi %s yolunda okunamฤฑyor"
+
+#: branch.c:53
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+"\n"
+"Hata nedenini ortadan kaldฤฑrdฤฑktan sonra uzak konum izleme\n"
+"bilgisini onarmayฤฑ ลŸunu รงalฤฑลŸtฤฑrarak deneyebilirsiniz:\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "%s dalฤฑ kendi รผst kaynaฤŸฤฑ olarak ayarlanamaz."
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+"'%s' dalฤฑ '%s' uzak dalฤฑnฤฑ yeniden temellendirme ile %s konumundan izlemek "
+"รผzere ayarlandฤฑ."
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "'%s' dalฤฑ '%s' uzak dalฤฑnฤฑ %s konumundan izlemek รผzere ayarlandฤฑ."
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+"'%s' dalฤฑ '%s' yerel dalฤฑnฤฑ yeniden temellendirme ile izlemek รผzere ayarlandฤฑ"
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "'%s' dalฤฑ '%s' yerel dalฤฑnฤฑ izlemek รผzere ayarlandฤฑ."
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"'%s' dalฤฑ '%s' uzak baลŸvurusunu yeniden temellendirme ile izlemek รผzere "
+"ayarlandฤฑ."
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "'%s' dalฤฑ '%s' uzak baลŸvurusunu izlemek รผzere ayarlandฤฑ."
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+"'%s' dalฤฑ '%s' yerel baลŸvurusunu yeniden temellendirme ile izlemek รผzere "
+"ayarlandฤฑ."
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "'%s' dalฤฑ '%s' yerel baลŸvurusunu izlemek รผzere ayarlandฤฑ."
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "รœstkaynak dal yapฤฑlandฤฑrmasฤฑ yazฤฑlamฤฑyor"
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "ฤฐzlenmiyor: %s baลŸvurusu iรงin belirsiz bilgi"
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' geรงerli bir dal adฤฑ deฤŸil."
+
+#: branch.c:208
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "'%s' adฤฑnda bir dal halihazฤฑrda var."
+
+#: branch.c:213
+msgid "Cannot force update the current branch."
+msgstr "Geรงerli dal zorla gรผncellenemiyor."
+
+#: branch.c:233
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr "ฤฐzleme bilgisi ayarlanamฤฑyor; baลŸlangฤฑรง noktasฤฑ '%s' bir dal deฤŸil."
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "istenen รผstkaynak dalฤฑ '%s' mevcut deฤŸil"
+
+#: branch.c:237
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"EฤŸer รงalฤฑลŸmanฤฑzฤฑ uzak konumda halihazฤฑrda var olan bir dal\n"
+"รผzerine temellendirmeyi tasarlฤฑyorsanฤฑz รถnce \"git fetch\"\n"
+"รงalฤฑลŸtฤฑrarak onu getirmeniz gerekebilir.\n"
+"\n"
+"EฤŸer uzak konumdaki eลŸini izleyecek yerel bir dal itmeyi\n"
+"tasarlฤฑyorsanฤฑz itme sฤฑrasฤฑnda รผstkaynak yapฤฑlandฤฑrmasฤฑnฤฑ\n"
+"da ayarlamak iรงin \"git push -u\" kullanmak isteyebilirsiniz."
+
+#: branch.c:281
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "Geรงerli bir nesne adฤฑ deฤŸil: '%s'."
+
+#: branch.c:301
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Belirsiz nesne adฤฑ: '%s'."
+
+#: branch.c:306
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Geรงerli bir dal noktasฤฑ deฤŸil: '%s'."
+
+#: branch.c:364
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' รงฤฑkฤฑลŸฤฑ '%s' konumunda halihazฤฑrda yapฤฑlmฤฑลŸ"
+
+#: branch.c:387
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "%s รงalฤฑลŸma aฤŸacฤฑnฤฑn HEAD'i gรผncellenmemiลŸ"
+
+#: bundle.c:36
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' bir v2 demet dosyasฤฑ gibi gรถrรผnmรผyor"
+
+#: bundle.c:64
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "tanฤฑmlanamayan รผstbilgi: %s%s (%d)"
+
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
+#, c-format
+msgid "could not open '%s'"
+msgstr "'%s' aรงฤฑlamadฤฑ"
+
+#: bundle.c:143
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Depo aลŸaฤŸฤฑdaki รถnceden gereken gรถnderilere iye deฤŸil:"
+
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "bir demeti doฤŸrulamak iรงin bir depo gerekiyor"
+
+#: bundle.c:197
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "Demet ลŸu baลŸvuruyu iรงeriyor:"
+msgstr[1] "Demet ลŸu %d baลŸvuruyu iรงeriyor:"
+
+#: bundle.c:204
+msgid "The bundle records a complete history."
+msgstr "Demet tam bir geรงmiลŸ kaydฤฑnฤฑ yazar."
+
+#: bundle.c:206
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "Demet ลŸu gรถnderiyi gerektiriyor:"
+msgstr[1] "Demet ลŸu %d gรถnderiyi gerektiriyor:"
+
+#: bundle.c:273
+msgid "unable to dup bundle descriptor"
+msgstr "demet aรงฤฑklayฤฑcฤฑsฤฑ รงoฤŸaltฤฑlamฤฑyor"
+
+#: bundle.c:280
+msgid "Could not spawn pack-objects"
+msgstr "pack-objects ortaya รงฤฑkarฤฑlamadฤฑ"
+
+#: bundle.c:291
+msgid "pack-objects died"
+msgstr "pack-objects sonlandฤฑ"
+
+#: bundle.c:333
+msgid "rev-list died"
+msgstr "rev-list sonlandฤฑ"
+
+#: bundle.c:382
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "'%s' baลŸvurusu revizyon listesi seรงenekleri tarafฤฑndan dฤฑลŸlandฤฑ"
+
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "tanฤฑmlanamayan deฤŸiลŸken: %s"
+
+#: bundle.c:469
+msgid "Refusing to create empty bundle."
+msgstr "BoลŸ demet oluลŸturma reddediliyor."
+
+#: bundle.c:479
+#, c-format
+msgid "cannot create '%s'"
+msgstr "'%s' oluลŸturulamฤฑyor"
+
+#: bundle.c:504
+msgid "index-pack died"
+msgstr "index-pack sonlandฤฑ"
+
+#: color.c:329
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "geรงersiz renk deฤŸeri: %.*s"
+
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#, c-format
+msgid "could not parse %s"
+msgstr "%s ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: commit.c:53
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s bir gรถnderi deฤŸil!"
+
+#: commit.c:193
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"<GIT_DIR>/info/grafts desteฤŸi artฤฑk kullanฤฑm dฤฑลŸฤฑ\n"
+"ve ileriki bir Git sรผrรผmรผnde kaldฤฑrฤฑlacak.\n"
+"\n"
+"AลŸฤฑlarฤฑ deฤŸiลŸtirme baลŸvurularฤฑna dรถnรผลŸtรผrmek iรงin\n"
+"lรผtfen \"git replace --convert-graft-file\" kullanฤฑn.\n"
+"\n"
+"\"git config advice.graftFileDeprecated false\"\n"
+"kullanarak bu iletiyi kapatabilirsiniz."
+
+#: commit.c:1153
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+"%s gรถnderisinin gรผvenilmeyen bir GPG imzasฤฑ var, iddiaya gรถre %s tarafฤฑndan."
+
+#: commit.c:1157
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "%s gรถnderisinin hatalฤฑ bir GPG imzasฤฑ var, iddiaya gรถre %s tarafฤฑndan."
+
+#: commit.c:1160
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "%s gรถnderisinin bir GPG imzasฤฑ yok."
+
+#: commit.c:1163
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "%s gรถnderisinin %s tarafฤฑndan saฤŸlanan dรผzgรผn bir GPG imzasฤฑ var\n"
+
+#: commit.c:1417
+msgid ""
+"Warning: commit message did not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"Uyarฤฑ: Gรถnderi iletisi UTF-8'e uymadฤฑ.\n"
+"ฤฐletiyi dรผzelttikten sonra bunu deฤŸiลŸtirmek isteyebilir veya\n"
+"i18n.commitencoding yapฤฑlandฤฑrma deฤŸiลŸkenini projenizin kullandฤฑฤŸฤฑ\n"
+"kodlama ile deฤŸiลŸtirmek isteyebilirsiniz.\n"
+
+#: commit-graph.c:122
+msgid "commit-graph file is too small"
+msgstr "commit-graph dosyasฤฑ pek kรผรงรผk"
+
+#: commit-graph.c:189
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "commit-graph imzasฤฑ %X, %X ile eลŸleลŸmiyor"
+
+#: commit-graph.c:196
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "commit-graph sรผrรผmรผ %x, %X ile eลŸleลŸmiyor"
+
+#: commit-graph.c:203
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "commit-graph saฤŸlama sรผrรผmรผ %X, %X ile eลŸleลŸmiyor"
+
+#: commit-graph.c:226
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+"commit-graph iri parรงa arama tablosu girdisi eksik; dosya tam olmayabilir"
+
+#: commit-graph.c:237
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "commit-graph biรงimsiz iri parรงa ofseti %08x%08x"
+
+#: commit-graph.c:280
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "commit-graph iri parรงa numarasฤฑ %08x birden รงok gรถrรผnรผyor"
+
+#: commit-graph.c:343
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph temel grafiฤŸi iri parรงasฤฑna iye deฤŸil"
+
+#: commit-graph.c:353
+msgid "commit-graph chain does not match"
+msgstr "commit-graph zinciri eลŸleลŸmiyor"
+
+#: commit-graph.c:401
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "geรงersiz commit-graph zinciri: '%s'. satฤฑr bir saฤŸlama deฤŸil"
+
+#: commit-graph.c:425
+msgid "unable to find all commit-graph files"
+msgstr "tรผm commit-graph dosyalarฤฑ bulunamฤฑyor"
+
+#: commit-graph.c:558 commit-graph.c:618
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "geรงersiz gรถnderi konumu. commit-graph bรผyรผk olasฤฑlฤฑkla hasar gรถrmรผลŸ"
+
+#: commit-graph.c:579
+#, c-format
+msgid "could not find commit %s"
+msgstr "%s gรถnderisi bulunamadฤฑ"
+
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "%s gรถnderisi ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "%s nesnesinin tรผrรผ alฤฑnamฤฑyor"
+
+#: commit-graph.c:1043
+msgid "Loading known commits in commit graph"
+msgstr "Gรถnderi grafiฤŸindeki bilinen gรถnderiler yรผkleniyor"
+
+#: commit-graph.c:1060
+msgid "Expanding reachable commits in commit graph"
+msgstr "Gรถnderi grafiฤŸindeki ulaลŸฤฑlabilir gรถnderiler geniลŸletiliyor"
+
+#: commit-graph.c:1079
+msgid "Clearing commit marks in commit graph"
+msgstr "Gรถnderi grafiฤŸindeki gรถnderi imleri temizleniyor"
+
+#: commit-graph.c:1098
+msgid "Computing commit graph generation numbers"
+msgstr "Gรถnderi grafiฤŸi kuลŸak sayฤฑlarฤฑ hesaplanฤฑyor"
+
+#: commit-graph.c:1173
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Gรถnderi grafiฤŸi iรงin gรถnderiler %d pakette bulunuyor"
+msgstr[1] "Gรถnderi grafiฤŸi iรงin gรถnderiler %d pakette bulunuyor"
+
+#: commit-graph.c:1186
+#, c-format
+msgid "error adding pack %s"
+msgstr "%s paketi eklenirken hata"
+
+#: commit-graph.c:1190
+#, c-format
+msgid "error opening index for %s"
+msgstr "%s iรงin indeks aรงฤฑlฤฑrken hata"
+
+#: commit-graph.c:1214
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "Gรถnderi grafiฤŸi iรงin gรถnderiler %d baลŸvurudan bulunuyor"
+msgstr[1] "Gรถnderi grafiฤŸi iรงin gรถnderiler %d baลŸvurudan bulunuyor"
+
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "geรงersiz gรถnderi nesne numarasฤฑ: %s"
+
+#: commit-graph.c:1249
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+"Gรถnderi grafiฤŸi iรงin gรถnderiler paketlenmiลŸ nesneler arasฤฑndan bulunuyor"
+
+#: commit-graph.c:1264
+msgid "Counting distinct commits in commit graph"
+msgstr "Gรถnderi grafiฤŸindeki belirgin gรถnderiler sayฤฑlฤฑyor"
+
+#: commit-graph.c:1294
+msgid "Finding extra edges in commit graph"
+msgstr "Gรถnderi grafiฤŸindeki ek sฤฑnฤฑrlar bulunuyor"
+
+#: commit-graph.c:1340
+msgid "failed to write correct number of base graph ids"
+msgstr "temel grafiฤŸi numaralarฤฑnฤฑn doฤŸru sayฤฑsฤฑ yazฤฑlamadฤฑ"
+
+#: commit-graph.c:1373 midx.c:814
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "%s รถncรผ dizinleri oluลŸturulamฤฑyor"
+
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
+#, c-format
+msgid "unable to create '%s'"
+msgstr "'%s' oluลŸturulamฤฑyor"
+
+#: commit-graph.c:1445
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Gรถnderi grafiฤŸi %d geรงiลŸte yazฤฑlฤฑyor"
+msgstr[1] "Gรถnderi grafiฤŸi %d geรงiลŸte yazฤฑlฤฑyor"
+
+#: commit-graph.c:1486
+msgid "unable to open commit-graph chain file"
+msgstr "commit-graph zincir dosyasฤฑ aรงฤฑlamฤฑyor"
+
+#: commit-graph.c:1498
+msgid "failed to rename base commit-graph file"
+msgstr "temel commit-graph dosyasฤฑ yeniden adlandฤฑrฤฑlamadฤฑ"
+
+#: commit-graph.c:1518
+msgid "failed to rename temporary commit-graph file"
+msgstr "geรงici commit-graph dosyasฤฑ yeniden adlandฤฑrฤฑlamadฤฑ"
+
+#: commit-graph.c:1631
+msgid "Scanning merged commits"
+msgstr "BirleลŸtirilen gรถnderiler taranฤฑyor"
+
+#: commit-graph.c:1642
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "beklenmedik yinelenmiลŸ gรถnderi numarasฤฑ %s"
+
+#: commit-graph.c:1665
+msgid "Merging commit-graph"
+msgstr "commit-graph birleลŸtiriliyor"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "gรถnderi grafiฤŸi biรงimi %d gรถnderiyi yazamฤฑyor"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "grafik yazabilmek iรงin รงok fazla gรถnderi"
+
+#: commit-graph.c:1944
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+"commit-graph dosyasฤฑnฤฑn saฤŸlama toplamฤฑ yanlฤฑลŸ ve bรผyรผk olasฤฑlฤฑkla hasar "
+"gรถrmรผลŸ"
+
+#: commit-graph.c:1954
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "commit-graph hatalฤฑ nesne tanฤฑmlayฤฑcฤฑ sฤฑrasฤฑna iye: %s, sonra %s"
+
+#: commit-graph.c:1964 commit-graph.c:1979
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "commit-graph hatalฤฑ fanout deฤŸerine iye: fanout[%d] = %u != %u"
+
+#: commit-graph.c:1971
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "%s gรถnderisi commit-graph'tan ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: commit-graph.c:1989
+msgid "Verifying commits in commit graph"
+msgstr "Gรถnderi grafiฤŸindeki gรถnderiler doฤŸrulanฤฑyor"
+
+#: commit-graph.c:2003
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"%s gรถnderisi commit-graph iรงin olan nesne veritabanฤฑndan ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: commit-graph.c:2010
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+"commit-graph'teki %s gรถnderisi iรงin olan kรถk aฤŸaรง nesne tanฤฑmlayฤฑcฤฑsฤฑ %s != "
+"%s"
+
+#: commit-graph.c:2020
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "%s gรถnderisi iรงin olan commit-graph รผst รถge listesi รงok uzun"
+
+#: commit-graph.c:2029
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s iรงin olan commit-graph รผst รถgesi %s != %s"
+
+#: commit-graph.c:2042
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+"%s gรถnderisi iรงin olan commit-graph รผst รถge listesi erkenden sonlanฤฑyor"
+
+#: commit-graph.c:2047
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"%s gรถnderisi iรงin commit-graph kuลŸak sayฤฑsฤฑ sฤฑfฤฑr ancak baลŸka yerlerde "
+"sฤฑfฤฑrdan farklฤฑ"
+
+#: commit-graph.c:2051
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"%s gรถnderisi iรงin commit-graph kuลŸak sayฤฑsฤฑ sฤฑfฤฑrdan farklฤฑ, ancak baลŸka "
+"yerlerde sฤฑfฤฑr"
+
+#: commit-graph.c:2066
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "%s gรถnderisi iรงin commit-graph kuลŸaฤŸฤฑ %u != %u"
+
+#: commit-graph.c:2072
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"%s gรถnderisi iรงin commit-graph iรงindeki gรถnderi tarihi %<PRIuMAX> != "
+"%<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "bellek tรผkendi"
+
+#: config.c:124
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"ลŸu iรงerilirken olabilecek en รงok iรงerme derinliฤŸi (%d) aลŸฤฑldฤฑ\n"
+"\t%s\n"
+"ลŸuradan:\n"
+"\t%s\n"
+"Bu dairesel iรงermelerden dolayฤฑ olabilir."
+
+#: config.c:140
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "iรงerme yolu '%s' geniลŸletilemedi"
+
+#: config.c:151
+msgid "relative config includes must come from files"
+msgstr "gรถreceli yapฤฑlandฤฑrma iรงermeleri dosyalardan gelmeli"
+
+#: config.c:197
+msgid "relative config include conditionals must come from files"
+msgstr "gรถreceli yapฤฑlandฤฑrma iรงerme koลŸullularฤฑ dosyalardan gelmeli"
+
+#: config.c:376
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "anahtar bir bรถlรผm iรงermiyor: %s"
+
+#: config.c:382
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "anahtar bir deฤŸiลŸken adฤฑ iรงermiyor: %s"
+
+#: config.c:406 sequencer.c:2444
+#, c-format
+msgid "invalid key: %s"
+msgstr "geรงersiz anahtar: %s"
+
+#: config.c:412
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "geรงersiz anahtar (yenisatฤฑr): %s"
+
+#: config.c:448 config.c:460
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "dรผzmece yapฤฑlandฤฑrma parametresi: %s"
+
+#: config.c:495
+#, c-format
+msgid "bogus format in %s"
+msgstr "%s iรงinde dรผzmece biรงim"
+
+#: config.c:821
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "hatalฤฑ yapฤฑlandฤฑrma satฤฑrฤฑ %d, %s ikili nesnesi iรงinde"
+
+#: config.c:825
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "hatalฤฑ yapฤฑlandฤฑrma satฤฑrฤฑ %d, %s dosyasฤฑ iรงinde"
+
+#: config.c:829
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "standart girdi iรงinde hatalฤฑ yapฤฑlandฤฑrma satฤฑrฤฑ %d"
+
+#: config.c:833
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "hatalฤฑ yapฤฑlandฤฑrma satฤฑrฤฑ %d, %s altmodรผl ikili nesnesi iรงinde"
+
+#: config.c:837
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "hatalฤฑ yapฤฑlandฤฑrma satฤฑrฤฑ %d, %s komut satฤฑrฤฑ iรงinde"
+
+#: config.c:841
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "hatalฤฑ yapฤฑlandฤฑrma satฤฑrฤฑ %d, %s iรงinde"
+
+#: config.c:978
+msgid "out of range"
+msgstr "erim dฤฑลŸฤฑ"
+
+#: config.c:978
+msgid "invalid unit"
+msgstr "geรงersiz birim"
+
+#: config.c:979
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "hatalฤฑ sayฤฑsal yapฤฑlandฤฑrma deฤŸeri '%s', '%s' iรงin: %s"
+
+#: config.c:998
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr ""
+"hatalฤฑ sayฤฑsal yapฤฑlandฤฑrma deฤŸeri '%s', '%s' iรงin, %s ikili nesnesi iรงinde: "
+"%s"
+
+#: config.c:1001
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr ""
+"hatalฤฑ sayฤฑsal yapฤฑlandฤฑrma deฤŸeri '%s', '%s' iรงin, %s dosyasฤฑ iรงinde: %s"
+
+#: config.c:1004
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"hatalฤฑ sayฤฑsal yapฤฑlandฤฑrma deฤŸeri '%s', '%s' iรงin, standart girdi iรงinde: %s"
+
+#: config.c:1007
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"hatalฤฑ sayฤฑsal yapฤฑlandฤฑrma deฤŸeri '%s', '%s' iรงin, %s altmodรผl ikili "
+"nesnesi iรงinde: %s"
+
+#: config.c:1010
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"hatalฤฑ sayฤฑsal yapฤฑlandฤฑrma deฤŸeri '%s', '%s' iรงin, %s komut satฤฑrฤฑ iรงinde: "
+"%s"
+
+#: config.c:1013
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "hatalฤฑ sayฤฑsal yapฤฑlandฤฑrma deฤŸeri '%s', '%s' iรงin, %s iรงinde: %s"
+
+#: config.c:1108
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "ลŸuradaki kullanฤฑcฤฑ dizini geniลŸletilemedi: '%s'"
+
+#: config.c:1117
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "%s', '%s' iรงin geรงerli bir zaman damgasฤฑ deฤŸil"
+
+#: config.c:1208
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "kฤฑsaltma uzunluฤŸu erim dฤฑลŸฤฑnda: %d"
+
+#: config.c:1222 config.c:1233
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "hatalฤฑ zlib sฤฑkฤฑลŸtฤฑrma dรผzeyi %d"
+
+#: config.c:1325
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar yalnฤฑzca bir karakter olmalฤฑ"
+
+#: config.c:1358
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "nesne oluลŸturma iรงin geรงersiz kip: %s"
+
+#: config.c:1430
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s iรงin hatalฤฑ oluลŸturulmuลŸ deฤŸer"
+
+#: config.c:1456
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s iรงin hatalฤฑ oluลŸturulmuลŸ deฤŸer: %s"
+
+#: config.c:1457
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "nothing, matching, simple, upstream veya current iรงinden biri olmalฤฑ"
+
+#: config.c:1518 builtin/pack-objects.c:3541
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "hatalฤฑ paket sฤฑkฤฑลŸtฤฑrma dรผzeyi %d"
+
+#: config.c:1639
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "'%s' yapฤฑlandฤฑrma ikili nesnesi yรผklenemiyor"
+
+#: config.c:1642
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "'%s' baลŸvurusu ikili bir nesneye iลŸaret etmiyor"
+
+#: config.c:1659
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "'%s' yapฤฑlandฤฑrma ikili nesnesi รงรถzรผlemiyor"
+
+#: config.c:1689
+#, c-format
+msgid "failed to parse %s"
+msgstr "%s ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: config.c:1743
+msgid "unable to parse command-line config"
+msgstr "komut satฤฑrฤฑ yapฤฑlandฤฑrmasฤฑ ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: config.c:2097
+msgid "unknown error occurred while reading the configuration files"
+msgstr "yapฤฑlandฤฑrma dosyalarฤฑ okunurken beklenmedik bir hata oluลŸtu"
+
+#: config.c:2267
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Geรงersiz %s: '%s'"
+
+#: config.c:2312
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "splitIndex.maxPercentChange deฤŸeri '%d' 0 ve 100 arasฤฑnda olmalฤฑ"
+
+#: config.c:2358
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "'%s' komut satฤฑrฤฑ yapฤฑlandฤฑrmasฤฑndan ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: config.c:2360
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "hatalฤฑ yapฤฑlandฤฑrma deฤŸiลŸkeni '%s', '%s' dosyasฤฑ %d. satฤฑrda"
+
+#: config.c:2441
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "geรงersiz bรถlรผm adฤฑ '%s'"
+
+#: config.c:2473
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s birden รงok deฤŸere iye"
+
+#: config.c:2502
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "yeni yapฤฑlandฤฑrma dosyasฤฑ %s yazฤฑlamadฤฑ"
+
+#: config.c:2754 config.c:3078
+#, c-format
+msgid "could not lock config file %s"
+msgstr "%s yapฤฑlandฤฑrma dosyasฤฑ kilitlenemedi"
+
+#: config.c:2765
+#, c-format
+msgid "opening %s"
+msgstr "%s aรงฤฑlฤฑyor"
+
+#: config.c:2800 builtin/config.c:344
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "geรงersiz dizgi: %s"
+
+#: config.c:2825
+#, c-format
+msgid "invalid config file %s"
+msgstr "geรงersiz yapฤฑlandฤฑrma dosyasฤฑ %s"
+
+#: config.c:2838 config.c:3091
+#, c-format
+msgid "fstat on %s failed"
+msgstr "%s รผzerinde fstat baลŸarฤฑsฤฑz oldu"
+
+#: config.c:2849
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr "'%s' mmap yapฤฑlamฤฑyor"
+
+#: config.c:2858 config.c:3096
+#, c-format
+msgid "chmod on %s failed"
+msgstr "%s รผzerinde chmod baลŸarฤฑsฤฑz oldu"
+
+#: config.c:2943 config.c:3193
+#, c-format
+msgid "could not write config file %s"
+msgstr "%s yapฤฑlandฤฑrma dosyasฤฑ yazฤฑlamadฤฑ"
+
+#: config.c:2977
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "'%s', '%s' olarak ayarlanamadฤฑ"
+
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#, c-format
+msgid "could not unset '%s'"
+msgstr "'%s' ayarฤฑ geri alฤฑnamadฤฑ"
+
+#: config.c:3069
+#, c-format
+msgid "invalid section name: %s"
+msgstr "geรงersiz bรถlรผm adฤฑ: %s"
+
+#: config.c:3236
+#, c-format
+msgid "missing value for '%s'"
+msgstr "'%s' iรงin deฤŸer eksik"
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr "uzak uรง ilk iletiลŸimle birlikte hattฤฑ kapattฤฑ"
+
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Uzak konum deposu okunamadฤฑ.\n"
+"\n"
+"Lรผtfen doฤŸru eriลŸim haklarฤฑna iye olduฤŸunuzdan ve\n"
+"deponun var olduฤŸundan emin olun."
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "sunucu '%s' desteklemiyor"
+
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "sunucu '%s' รถzelliฤŸini desteklemiyor"
+
+#: connect.c:114
+msgid "expected flush after capabilities"
+msgstr "yeteneklerden sonra floลŸ bekleniyordu"
+
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "'%s' ilk satฤฑrฤฑndan sonra yetenekler yok sayฤฑlฤฑyor"
+
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "protokol hatasฤฑ: beklenmedik yetenekler^{}"
+
+#: connect.c:273
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "protokol hatasฤฑ: sฤฑฤŸ sha-1 bekleniyordu, '%s' alฤฑndฤฑ"
+
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
+msgstr "diฤŸer uรงtaki depo sฤฑฤŸ olamaz"
+
+#: connect.c:313
+msgid "invalid packet"
+msgstr "geรงersiz paket"
+
+#: connect.c:333
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "protokol hatasฤฑ: beklenmedik '%s'"
+
+#: connect.c:441
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "geรงersiz ls-refs yanฤฑtฤฑ: %s"
+
+#: connect.c:445
+msgid "expected flush after ref listing"
+msgstr "baลŸvuru listelemesinden sonra floลŸ bekleniyordu"
+
+#: connect.c:544
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "'%s' protokolรผ desteklenmiyor"
+
+#: connect.c:595
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "soket รผzerinde SO_KEEPALIVE ayarlanamฤฑyor"
+
+#: connect.c:635 connect.c:698
+#, c-format
+msgid "Looking up %s ... "
+msgstr "%s aranฤฑyor..."
+
+#: connect.c:639
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr "%s aranamฤฑyor (kapฤฑ %s) (%s)"
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:643 connect.c:714
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"bitti.\n"
+"ลžuraya baฤŸlanฤฑyor: %s (kapฤฑ %s)..."
+
+#: connect.c:665 connect.c:742
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"ลŸuraya baฤŸlanamฤฑyor: %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:671 connect.c:748
+msgid "done."
+msgstr "bitti."
+
+#: connect.c:702
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "%s aranamฤฑyor (%s)"
+
+#: connect.c:708
+#, c-format
+msgid "unknown port %s"
+msgstr "bilinmeyen kapฤฑ %s"
+
+#: connect.c:845 connect.c:1175
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "garip makine adฤฑ '%s' engellendi"
+
+#: connect.c:847
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "garip kapฤฑ '%s' engellendi"
+
+#: connect.c:857
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "vekil %s baลŸlatฤฑlamฤฑyor"
+
+#: connect.c:928
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr "yol belirtilmedi; geรงerli url sรถzdizimi iรงin 'git help pull' yazฤฑn"
+
+#: connect.c:1123
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh deฤŸiลŸik biรงimi 'simple' -4 desteklemiyor"
+
+#: connect.c:1135
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh deฤŸiลŸik biรงimi 'simple' -6 desteklemiyor"
+
+#: connect.c:1152
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh deฤŸiลŸik biรงimi 'simple' kapฤฑ ayarlamayฤฑ desteklemiyor"
+
+#: connect.c:1264
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "garip yol adฤฑ '%s' engellendi"
+
+#: connect.c:1311
+msgid "unable to fork"
+msgstr "รงatallanamฤฑyor"
+
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+msgid "Checking connectivity"
+msgstr "BaฤŸlantฤฑ denetleniyor"
+
+#: connected.c:110
+msgid "Could not run 'git rev-list'"
+msgstr "'git rev-list' รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: connected.c:130
+msgid "failed write to rev-list"
+msgstr "rev-list yazฤฑlamadฤฑ"
+
+#: connected.c:137
+msgid "failed to close rev-list's stdin"
+msgstr "rev-list'in stdin'i kapatฤฑlamadฤฑ"
+
+#: convert.c:194
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "izin verilmeyen crlf_action %d"
+
+#: convert.c:207
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF %s iรงinde LF ile deฤŸiลŸtirilecek"
+
+#: convert.c:209
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"CRLF %s iรงinde LF ile deฤŸiลŸtirilecek.\n"
+"Dosya sizin รงalฤฑลŸma dizininizde kendi orijinal satฤฑr sonlarฤฑna iye olacak."
+
+#: convert.c:217
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF %s iรงinde CRLF ile deฤŸiลŸtirilecek"
+
+#: convert.c:219
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"LF %s iรงinde CRLF ile deฤŸiลŸtirilecek.\n"
+"Dosya sizin รงalฤฑลŸma dizininizde kendi orijinal satฤฑr sonlarฤฑna iye olacak."
+
+#: convert.c:284
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM '%s' iรงinde yasaklฤฑ, eฤŸer %s olarak kodlanmฤฑลŸsa"
+
+#: convert.c:291
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"'%s' dosyasฤฑ bir bayt sฤฑra imi (BOM) iรงeriyor. Lรผtfen รงalฤฑลŸma aฤŸacฤฑ "
+"kodlamasฤฑ iรงin UTF-%.*s kullanฤฑn."
+
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM '%s' iรงinde gerekli, eฤŸer %s olarak kodlanmฤฑลŸsa"
+
+#: convert.c:306
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+"'%s' dosyasฤฑnda bir bayt sฤฑra imi (BOM) eksik. Lรผtfen รงalฤฑลŸma aฤŸacฤฑ "
+"kodlamasฤฑ iรงin UTF-%sBE veya UTF-%sLE (bayt sฤฑrasฤฑna gรถre) kullanฤฑn."
+
+#: convert.c:419 convert.c:490
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "'%s', %s deฤŸerinden %s deฤŸerine kodlanamadฤฑ"
+
+#: convert.c:462
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+"'%s' kodlamasฤฑnฤฑ %s -> %s biรงiminde yapฤฑp tersine dรถndรผrmek aynฤฑ ลŸey deฤŸil"
+
+#: convert.c:668
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "'%s' dฤฑลŸ sรผzgecini รงalฤฑลŸtฤฑrmak iรงin รงatallama yapฤฑlamฤฑyor"
+
+#: convert.c:688
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "girdi '%s' dฤฑลŸ sรผzgecine beslenemiyor"
+
+#: convert.c:695
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "'%s' dฤฑลŸ sรผzgeci %d iรงin baลŸarฤฑsฤฑz oldu"
+
+#: convert.c:730 convert.c:733
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "'%s' dฤฑลŸ sรผzgecinden okuma baลŸarฤฑsฤฑz oldu"
+
+#: convert.c:736 convert.c:791
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "'%s' dฤฑลŸ sรผzgeci baลŸarฤฑsฤฑz oldu"
+
+#: convert.c:839
+msgid "unexpected filter type"
+msgstr "beklenmedik sรผzgeรง tรผrรผ"
+
+#: convert.c:850
+msgid "path name too long for external filter"
+msgstr "dฤฑลŸ sรผzgeรง iรงin yol adฤฑ pek uzun"
+
+#: convert.c:924
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"'%s' dฤฑลŸ sรผzgeci artฤฑk kullanฤฑlamฤฑyor, ancak tรผm yollarฤฑn sรผzรผmรผ bitmedi"
+
+#: convert.c:1223
+msgid "true/false are no valid working-tree-encodings"
+msgstr "doฤŸru/yanlฤฑลŸ geรงerli bir รงalฤฑลŸma aฤŸacฤฑ kodlamasฤฑ deฤŸil"
+
+#: convert.c:1411 convert.c:1445
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: temiz sรผzgeรง '%s' baลŸarฤฑsฤฑz oldu"
+
+#: convert.c:1489
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: kir sรผzgeci %s baลŸarฤฑsฤฑz oldu"
+
+#: date.c:138
+msgid "in the future"
+msgstr "gelecekte"
+
+#: date.c:144
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> saniye รถnce"
+msgstr[1] "%<PRIuMAX> saniye รถnce"
+
+#: date.c:151
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> dakika รถnce"
+msgstr[1] "%<PRIuMAX> dakika รถnce"
+
+#: date.c:158
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> saat รถnce"
+msgstr[1] "%<PRIuMAX> saat รถnce"
+
+#: date.c:165
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> gรผn รถnce"
+msgstr[1] "%<PRIuMAX> gรผn รถnce"
+
+#: date.c:171
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> hafta รถnce"
+msgstr[1] "%<PRIuMAX> hafta รถnce"
+
+#: date.c:178
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> ay รถnce"
+msgstr[1] "%<PRIuMAX> ay รถnce"
+
+#: date.c:189
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> yฤฑl"
+msgstr[1] "%<PRIuMAX> yฤฑl"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:192
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> ay รถnce"
+msgstr[1] "%s, %<PRIuMAX> ay รถnce"
+
+#: date.c:197 date.c:202
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> yฤฑl รถnce"
+msgstr[1] "%<PRIuMAX> yฤฑl รถnce"
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr "Delta adasฤฑ imleri yayฤฑlฤฑyor"
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr "hatalฤฑ aฤŸaรง nesnesi %s"
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "'%s' iรงin delta adasฤฑ dรผzenli ifadesi yรผklenemedi: %s"
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"yapฤฑlandฤฑrmanฤฑn delta adasฤฑ dรผzenli ifadesinde รงok fazla yakalama grubu var "
+"(en รงok %d)"
+
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "%d delta adasฤฑ imlendi, bitti.\n"
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "orderfile '%s' okunamadฤฑ"
+
+#: diffcore-rename.c:543
+msgid "Performing inexact rename detection"
+msgstr "Kesin olmayan yeniden adlandฤฑrma algฤฑlamasฤฑ gerรงekleลŸtiriliyor"
+
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<seรงenekler>] <yol> <yol>"
+
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Bir git deposu deฤŸil. Bir รงalฤฑลŸma aฤŸacฤฑnฤฑn dฤฑลŸฤฑndaki iki yolu karลŸฤฑlaลŸtฤฑrmak "
+"iรงin --no-index kullanฤฑn."
+
+#: diff.c:155
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  dirstat kesim yรผzdesi '%s' ayrฤฑลŸtฤฑrฤฑlamadฤฑ\n"
+
+#: diff.c:160
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Bilinmeyen dirstat parametresi '%s'\n"
+
+#: diff.c:296
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"\"color-moved\" ayarฤฑ 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
+"'plain' seรงeneklerinden biri olmalฤฑdฤฑr"
+
+#: diff.c:324
+#, c-format
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"bilinmeyen color-moved-ws kipi '%s', olabilecek deฤŸerler: 'ignore-space-"
+"change', 'ignore-space-at-eol', 'ignore-all-space' 'allow-indentation-change'"
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws: allow-indentation-change diฤŸer boลŸluk kipleri ile birlikte "
+"kullanฤฑlamaz"
+
+#: diff.c:405
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "'diff.submodule' yapฤฑlandฤฑrma deฤŸiลŸkeni iรงin bilinmeyen deฤŸer: '%s'"
+
+#: diff.c:465
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"'diff.dirstat' yapฤฑlandฤฑrma deฤŸiลŸkeninde hatalar bulundu:\n"
+"%s"
+
+#: diff.c:4202
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "dฤฑลŸ diff sonlandฤฑ, %s konumunda durdu"
+
+#: diff.c:4547
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check ve -s birlikte kullanฤฑlmaz"
+
+#: diff.c:4550
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S ve --find-object birlikte kullanฤฑlmaz"
+
+#: diff.c:4628
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow tam olarak yalnฤฑzca bir yol belirteci gerektiriyor"
+
+#: diff.c:4676
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "geรงersiz --stat deฤŸeri: %s"
+
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s bir sayฤฑsal deฤŸer bekliyor"
+
+#: diff.c:4713
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"--dirstat/-X seรงenek parametresi ayrฤฑลŸtฤฑrฤฑlamadฤฑ:\n"
+"%s"
+
+#: diff.c:4798
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "ลŸurada bilinmeyen deฤŸiลŸiklik sฤฑnฤฑfฤฑ '%c': -diff-filter=%s"
+
+#: diff.c:4822
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "ลŸundan sonra bilinmeyen deฤŸer: ws-error-highlight=%.*s"
+
+#: diff.c:4836
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "'%s' รงรถzรผlemiyor"
+
+#: diff.c:4886 diff.c:4892
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s <n>/<m> biรงimi bekliyor"
+
+#: diff.c:4904
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s bir karakter bekliyor, '%s' aldฤฑ"
+
+#: diff.c:4925
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "hatalฤฑ --color-moved deฤŸiลŸkeni: %s"
+
+#: diff.c:4944
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "--color-moved-ws iรงinde geรงersiz kip '%s'"
+
+#: diff.c:4984
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"diff-algorithm seรงeneฤŸi ลŸunlarฤฑ kabul eder: \"myers\", \"minimal\", "
+"\"patience\" ve \"histogram\""
+
+#: diff.c:5020 diff.c:5040
+#, c-format
+msgid "invalid argument to %s"
+msgstr "%s iรงin geรงersiz deฤŸiลŸken"
+
+#: diff.c:5178
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "--submodule seรงenek parametresi ayrฤฑลŸtฤฑrฤฑlamadฤฑ: '%s'"
+
+#: diff.c:5234
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "hatalฤฑ --word-diff deฤŸiลŸkeni: %s"
+
+#: diff.c:5257
+msgid "Diff output format options"
+msgstr "Diff รงฤฑktฤฑsฤฑ biรงimlendirme seรงenekleri"
+
+#: diff.c:5259 diff.c:5265
+msgid "generate patch"
+msgstr "yama oluลŸtur"
+
+#: diff.c:5262 builtin/log.c:173
+msgid "suppress diff output"
+msgstr "diff รงฤฑktฤฑsฤฑnฤฑ gizle"
+
+#: diff.c:5267 diff.c:5381 diff.c:5388
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5268 diff.c:5271
+msgid "generate diffs with <n> lines context"
+msgstr "diff'leri <n> satฤฑr baฤŸlamlฤฑ oluลŸtur"
+
+#: diff.c:5273
+msgid "generate the diff in raw format"
+msgstr "diff'i ham biรงimde oluลŸtur"
+
+#: diff.c:5276
+msgid "synonym for '-p --raw'"
+msgstr "'-p --raw eลŸanlamlฤฑsฤฑ"
+
+#: diff.c:5280
+msgid "synonym for '-p --stat'"
+msgstr "'-p --stat eลŸanlamlฤฑsฤฑ"
+
+#: diff.c:5284
+msgid "machine friendly --stat"
+msgstr "makinede okunabilen --stat"
+
+#: diff.c:5287
+msgid "output only the last line of --stat"
+msgstr "--stat'ฤฑn yalnฤฑzca son satฤฑrฤฑnฤฑ รงฤฑktฤฑ ver"
+
+#: diff.c:5289 diff.c:5297
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+#: diff.c:5290
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"her alt dizin iรงin gรถreceli bir miktar deฤŸiลŸikliฤŸin daฤŸฤฑtฤฑmฤฑnฤฑ รงฤฑktฤฑ ver"
+
+#: diff.c:5294
+msgid "synonym for --dirstat=cumulative"
+msgstr "--dirstat-cumulative eลŸanlamlฤฑsฤฑ"
+
+#: diff.c:5298
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "--dirstat=files,param1,param2... eลŸanlamlฤฑsฤฑ"
+
+#: diff.c:5302
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"deฤŸiลŸiklikler รงakฤฑลŸma imleyicileri veya boลŸluk hatalarฤฑ doฤŸuruyorsa uyar"
+
+#: diff.c:5305
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"sฤฑkฤฑลŸฤฑk รถzet; รถrn. oluลŸumlar, yeniden adlandฤฑrmalar ve kip deฤŸiลŸiklikleri"
+
+#: diff.c:5308
+msgid "show only names of changed files"
+msgstr "yalnฤฑzca deฤŸiลŸtirilen dosyalarฤฑn adlarฤฑnฤฑ gรถster"
+
+#: diff.c:5311
+msgid "show only names and status of changed files"
+msgstr "yalnฤฑzca deฤŸiลŸtirilen dosyalarฤฑn adlarฤฑnฤฑ ve durumlarฤฑnฤฑ gรถster"
+
+#: diff.c:5313
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<geniลŸlik>[,<ad-geniลŸlik>[,<sayฤฑm>]]"
+
+#: diff.c:5314
+msgid "generate diffstat"
+msgstr "diffstat oluลŸtur"
+
+#: diff.c:5316 diff.c:5319 diff.c:5322
+msgid "<width>"
+msgstr "<geniลŸlik>"
+
+#: diff.c:5317
+msgid "generate diffstat with a given width"
+msgstr "diffstat'ฤฑ verilmiลŸ bir geniลŸlik ile oluลŸtur"
+
+#: diff.c:5320
+msgid "generate diffstat with a given name width"
+msgstr "diffstat'ฤฑ verilmiลŸ bir ad geniลŸliฤŸi ile oluลŸtur"
+
+#: diff.c:5323
+msgid "generate diffstat with a given graph width"
+msgstr "diffstat'ฤฑ verilmiลŸ bir grafik geniลŸliฤŸi ile oluลŸtur"
+
+#: diff.c:5325
+msgid "<count>"
+msgstr "<sayฤฑm>"
+
+#: diff.c:5326
+msgid "generate diffstat with limited lines"
+msgstr "diffstat'ฤฑ kฤฑsฤฑtlฤฑ satฤฑrlarla oluลŸtur"
+
+#: diff.c:5329
+msgid "generate compact summary in diffstat"
+msgstr "diffstat iรงinde ufak รถzet oluลŸtur"
+
+#: diff.c:5332
+msgid "output a binary diff that can be applied"
+msgstr "uygulanabilir bir ikili diff รงฤฑktฤฑsฤฑ ver"
+
+#: diff.c:5335
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "\"index\" satฤฑrlarฤฑnda tam รถn ve songรถrรผntรผ nesne adlarฤฑnฤฑ gรถster"
+
+#: diff.c:5337
+msgid "show colored diff"
+msgstr "renkli diff gรถster"
+
+#: diff.c:5338
+msgid "<kind>"
+msgstr "<tรผr>"
+
+#: diff.c:5339
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"diff'teki boลŸluk hatalarฤฑnฤฑ 'context', 'old' veya 'new' satฤฑrlarฤฑnda vurgula"
+
+#: diff.c:5342
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"--raw veya --numstat iรงinde yol adlarฤฑnฤฑ tahrip etme ve รงฤฑktฤฑ alanฤฑ "
+"sonlandฤฑrฤฑcฤฑlarฤฑ olarak NUL'larฤฑ kullan"
+
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+msgid "<prefix>"
+msgstr "<รถnek>"
+
+#: diff.c:5346
+msgid "show the given source prefix instead of \"a/\""
+msgstr "\"a/\" yerine verilmiลŸ kaynak รถnekini gรถster"
+
+#: diff.c:5349
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "\"b/\"yerine verilmiลŸ kaynak รถnekini gรถster"
+
+#: diff.c:5352
+msgid "prepend an additional prefix to every line of output"
+msgstr "รงฤฑktฤฑnฤฑn her satฤฑrฤฑnฤฑn baลŸฤฑna ek bir รถnek ekle"
+
+#: diff.c:5355
+msgid "do not show any source or destination prefix"
+msgstr "hiรงbir kaynak ve hedef รถnekini gรถsterme"
+
+#: diff.c:5358
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "diff parรงalarฤฑ arasฤฑndaki baฤŸlamฤฑ belirtilen satฤฑr sayฤฑsฤฑ kadar gรถster"
+
+#: diff.c:5362 diff.c:5367 diff.c:5372
+msgid "<char>"
+msgstr "<karakter>"
+
+#: diff.c:5363
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "yeni satฤฑrฤฑ belirtmek iรงin '+' yerine kullanฤฑlacak karakteri belirle"
+
+#: diff.c:5368
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "eski satฤฑrฤฑ belirtmek iรงin '-' yerine kullanฤฑlacak karakteri belirle"
+
+#: diff.c:5373
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "baฤŸlam belirtmek iรงin ' ' yerine kullanฤฑlacak karakteri belirle"
+
+#: diff.c:5376
+msgid "Diff rename options"
+msgstr "Diff yeniden adlandฤฑrma seรงenekleri"
+
+#: diff.c:5377
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5378
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "tam yeniden yazฤฑm deฤŸiลŸikliklerini silme ve oluลŸturma olarak ayฤฑr"
+
+#: diff.c:5382
+msgid "detect renames"
+msgstr "yeniden adlandฤฑrmalarฤฑ algฤฑla"
+
+#: diff.c:5386
+msgid "omit the preimage for deletes"
+msgstr "silmeler iรงin รถngรถrรผntรผyรผ atla"
+
+#: diff.c:5389
+msgid "detect copies"
+msgstr "kopyalarฤฑ algฤฑla"
+
+#: diff.c:5393
+msgid "use unmodified files as source to find copies"
+msgstr "deฤŸiลŸtirilmemiลŸ dosyalarฤฑ kopyalarฤฑ bulmak iรงin kaynak olarak kullan"
+
+#: diff.c:5395
+msgid "disable rename detection"
+msgstr "yeniden adlandฤฑrma algฤฑlamasฤฑnฤฑ devre dฤฑลŸฤฑ bฤฑrak"
+
+#: diff.c:5398
+msgid "use empty blobs as rename source"
+msgstr "boลŸ ikili nesneleri yeniden adlandฤฑrma kaynaฤŸฤฑ olarak kullan"
+
+#: diff.c:5400
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+"bir dosyanฤฑn geรงmiลŸini listelemeyi yeniden adlandฤฑrmalarฤฑn รถtesinde sรผrdรผr"
+
+#: diff.c:5403
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"eฤŸer yeniden adlandฤฑrma/kopyalama hedeflerinin sayฤฑsฤฑ verilen sฤฑnฤฑrฤฑ aลŸarsa "
+"yeniden adlandฤฑrma/kopyalama algฤฑlamasฤฑnฤฑ รถnle"
+
+#: diff.c:5405
+msgid "Diff algorithm options"
+msgstr "Diff algoritma seรงenekleri"
+
+#: diff.c:5407
+msgid "produce the smallest possible diff"
+msgstr "olabilecek en kรผรงรผk diff'i รผret"
+
+#: diff.c:5410
+msgid "ignore whitespace when comparing lines"
+msgstr "satฤฑrlarฤฑ karลŸฤฑlaลŸtฤฑrฤฑrken boลŸluklarฤฑ yok say"
+
+#: diff.c:5413
+msgid "ignore changes in amount of whitespace"
+msgstr "boลŸluk sayฤฑsฤฑndaki deฤŸiลŸiklikleri yok say"
+
+#: diff.c:5416
+msgid "ignore changes in whitespace at EOL"
+msgstr "satฤฑr sonundaki boลŸluk deฤŸiลŸikliklerini yok say"
+
+#: diff.c:5419
+msgid "ignore carrier-return at the end of line"
+msgstr "satฤฑr sonundaki satฤฑrbaลŸฤฑ karakterini yok say"
+
+#: diff.c:5422
+msgid "ignore changes whose lines are all blank"
+msgstr "satฤฑrlarฤฑnฤฑn tรผmรผ boลŸ olan deฤŸiลŸiklikleri yok say"
+
+#: diff.c:5425
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "diff parรงa sฤฑnฤฑrlarฤฑnฤฑ kolay okuma iรงin bulgusal olarak kaydฤฑr"
+
+#: diff.c:5428
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "diff'i \"patience diff\" algoritmasฤฑnฤฑ kullanarak oluลŸtur"
+
+#: diff.c:5432
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "diff'i \"histogram diff\" algoritmasฤฑnฤฑ kullanarak oluลŸtur"
+
+#: diff.c:5434
+msgid "<algorithm>"
+msgstr "<algoritma>"
+
+#: diff.c:5435
+msgid "choose a diff algorithm"
+msgstr "bir diff algoritmasฤฑ seรง"
+
+#: diff.c:5437
+msgid "<text>"
+msgstr "<metin>"
+
+#: diff.c:5438
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "diff'i \"anchored diff\" algoritmasฤฑnฤฑ kullanarak oluลŸtur"
+
+#: diff.c:5440 diff.c:5449 diff.c:5452
+msgid "<mode>"
+msgstr "<kip>"
+
+#: diff.c:5441
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"sรถzcรผk diff'ini deฤŸiลŸtirilen sรถzcรผkleri sฤฑnฤฑrlandฤฑrmak iรงin <kip> kullanarak "
+"gรถster"
+
+#: diff.c:5443 diff.c:5446 diff.c:5491
+msgid "<regex>"
+msgstr "<ifade>"
+
+#: diff.c:5444
+msgid "use <regex> to decide what a word is"
+msgstr "bir sรถzcรผฤŸรผn ne olduฤŸuna karar vermek iรงin <ifade> kullan"
+
+#: diff.c:5447
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "ลŸuna eลŸdeฤŸer: --word-diff=color --word-diff-regex=<ifade>"
+
+#: diff.c:5450
+msgid "moved lines of code are colored differently"
+msgstr "taลŸฤฑnan kod satฤฑrlarฤฑ farklฤฑ renklendirilir"
+
+#: diff.c:5453
+msgid "how white spaces are ignored in --color-moved"
+msgstr "boลŸluklar --color-moved iรงinde nasฤฑl yok sayฤฑlฤฑr"
+
+#: diff.c:5456
+msgid "Other diff options"
+msgstr "DiฤŸer diff seรงenekleri"
+
+#: diff.c:5458
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"altdizinden รงalฤฑลŸtฤฑrฤฑldฤฑฤŸฤฑnda dฤฑลŸarฤฑdaki deฤŸiลŸiklikleri hariรง tut ve "
+"gรถreceli yollarฤฑ gรถster"
+
+#: diff.c:5462
+msgid "treat all files as text"
+msgstr "tรผm dosyalarฤฑ metin olarak varsay"
+
+#: diff.c:5464
+msgid "swap two inputs, reverse the diff"
+msgstr "iki girdiyi deฤŸiลŸtir, diff'i tersine dรถndรผr"
+
+#: diff.c:5466
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "ayrฤฑmlar varsa 1 ile, yoksa 0 ile รงฤฑk"
+
+#: diff.c:5468
+msgid "disable all output of the program"
+msgstr "tรผm program รงฤฑktฤฑsฤฑnฤฑ devre dฤฑลŸฤฑ bฤฑrak"
+
+#: diff.c:5470
+msgid "allow an external diff helper to be executed"
+msgstr "bir dฤฑลŸ diff yardฤฑmcฤฑsฤฑnฤฑn รงalฤฑลŸtฤฑrฤฑlmasฤฑna izin ver"
+
+#: diff.c:5472
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"ikili dosyalarฤฑ karลŸฤฑlaลŸtฤฑrฤฑrken dฤฑลŸ metin dรถnรผลŸtรผrme sรผzgeรงlerini รงalฤฑลŸtฤฑr"
+
+#: diff.c:5474
+msgid "<when>"
+msgstr "<ne-zaman>"
+
+#: diff.c:5475
+msgid "ignore changes to submodules in the diff generation"
+msgstr "diff oluลŸtururken altmodรผllere olan deฤŸiลŸiklikleri yok say"
+
+#: diff.c:5478
+msgid "<format>"
+msgstr "<biรงim>"
+
+#: diff.c:5479
+msgid "specify how differences in submodules are shown"
+msgstr "altmodรผllerdeki deฤŸiลŸikliklerin nasฤฑl gรถsterileceฤŸini belirt"
+
+#: diff.c:5483
+msgid "hide 'git add -N' entries from the index"
+msgstr "indeksten 'git add -N' girdilerini gizle"
+
+#: diff.c:5486
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "indekste 'git add -N' girdilerine gerรงekmiลŸ gibi davran"
+
+#: diff.c:5488
+msgid "<string>"
+msgstr "<dizi>"
+
+#: diff.c:5489
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "belirtilen dizinin gรถrรผlme sayฤฑsฤฑnฤฑ deฤŸiลŸtiren ayrฤฑmlara bak"
+
+#: diff.c:5492
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr "belirtilen dรผzenli ifadenin gรถrรผlme sayฤฑsฤฑnฤฑ deฤŸiลŸtiren ayrฤฑmlara bak"
+
+#: diff.c:5495
+msgid "show all changes in the changeset with -S or -G"
+msgstr "deฤŸiลŸiklik setinde -S veya -G iรงeren tรผm deฤŸiลŸiklikleri gรถster"
+
+#: diff.c:5498
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "-S iรงindeki <dizi>'yi geniลŸletilmiลŸ POSIX dรผzenli ifadesi olarak iลŸle"
+
+#: diff.c:5501
+msgid "control the order in which files appear in the output"
+msgstr "dosyalarฤฑn รงฤฑktฤฑda hangi sฤฑrayla gรถrรผneceฤŸini denetle"
+
+#: diff.c:5502
+msgid "<object-id>"
+msgstr "<nesne-no>"
+
+#: diff.c:5503
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "belirtilen nesnenin gรถrรผlme sayฤฑsฤฑnฤฑ deฤŸiลŸtiren ayrฤฑmlara bak"
+
+#: diff.c:5505
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5506
+msgid "select files by diff type"
+msgstr "dosyalarฤฑ diff tรผrรผne gรถre seรง"
+
+#: diff.c:5508
+msgid "<file>"
+msgstr "<dosya>"
+
+#: diff.c:5509
+msgid "Output to a specific file"
+msgstr "belirli bir dosyaya รงฤฑktฤฑ ver"
+
+#: diff.c:6164
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+"Kesin olmayan yeniden adlandฤฑrma algฤฑlamasฤฑ รงok fazla dosya olmasฤฑndan "
+"dolayฤฑ atlandฤฑ."
+
+#: diff.c:6167
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"ร‡ok fazla dosya olmasฤฑndan dolayฤฑ yalnฤฑzca deฤŸiลŸtirilen yollardan kopyalar "
+"bulundu."
+
+#: diff.c:6170
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"%s deฤŸiลŸkeninizi en azฤฑndan %d olarak ayarlamak ve komutu yeniden denemek "
+"isteyebilirsiniz."
+
+#: dir.c:555
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "yol belirteci '%s' git'in tanฤฑdฤฑฤŸฤฑ herhangi bir dosya ile eลŸleลŸmedi"
+
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "tanฤฑmlanamayan dizgi: '%s'"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "tanฤฑmlanamayan negatif dizgi: '%s'"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "sparse-checkout dosyanฤฑzฤฑn sorunlarฤฑ olabilir: '%s' dizgisi yinelenmiลŸ"
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "koni dizgi eลŸleลŸmesi devre dฤฑลŸฤฑ bฤฑrakฤฑlฤฑyor"
+
+#: dir.c:1173
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "%s bir 'exclude' dosyasฤฑ olarak kullanฤฑlamฤฑyor"
+
+#: dir.c:2144
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "'%s' dizini aรงฤฑlamadฤฑ"
+
+#: dir.c:2479
+msgid "failed to get kernel name and information"
+msgstr "รงekirdek adฤฑ ve bilgisi alฤฑnamadฤฑ"
+
+#: dir.c:2603
+msgid "untracked cache is disabled on this system or location"
+msgstr "izlenmeyen รถnbellek bu sistemde veya konumda devre dฤฑลŸฤฑ bฤฑrakฤฑlmฤฑลŸ"
+
+#: dir.c:3407
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "%s deposundaki indeks dosyasฤฑ hasarlฤฑ"
+
+#: dir.c:3452 dir.c:3457
+#, c-format
+msgid "could not create directories for %s"
+msgstr "%s iรงin dizinler oluลŸturulamadฤฑ"
+
+#: dir.c:3486
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "git dizini '%s' konumundan '%s' konumuna gรถรง ettirilemedi"
+
+#: editor.c:73
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "ฤฐpucu: Dรผzenleyicinizin dosyayฤฑ kapatmasฤฑ bekleniyor...%c"
+
+#: entry.c:178
+msgid "Filtering content"
+msgstr "ฤฐรงerik sรผzรผlรผyor"
+
+#: entry.c:476
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "'%s' dosyasฤฑnฤฑn bilgileri alฤฑnamadฤฑ"
+
+#: environment.c:149
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "hatalฤฑ git ad alanฤฑ yolu \"%s\""
+
+#: environment.c:331
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr "GIT_DIR ลŸuna ayarlanamadฤฑ: '%s'"
+
+#: exec-cmd.c:363
+#, c-format
+msgid "too many args to run %s"
+msgstr "%s รงalฤฑลŸtฤฑrmak iรงin รงok fazla deฤŸiลŸken"
+
+#: fetch-pack.c:150
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: sฤฑฤŸ bir liste bekleniyordu"
+
+#: fetch-pack.c:153
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: sฤฑฤŸ listeden sonra floลŸ paketi bekleniyordu"
+
+#: fetch-pack.c:164
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: ACK/NAK bekleniyordu, floลŸ paket alฤฑndฤฑ"
+
+#: fetch-pack.c:184
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alฤฑndฤฑ"
+
+#: fetch-pack.c:195
+msgid "unable to write to remote"
+msgstr "uzak konuma yazฤฑlamฤฑyor"
+
+#: fetch-pack.c:257
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc multi_ack_detailed gerektiriyor"
+
+#: fetch-pack.c:356 fetch-pack.c:1340
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "geรงersiz sฤฑฤŸ satฤฑr: %s"
+
+#: fetch-pack.c:362 fetch-pack.c:1346
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "geรงersiz sฤฑฤŸ olmayan satฤฑr: %s"
+
+#: fetch-pack.c:364 fetch-pack.c:1348
+#, c-format
+msgid "object not found: %s"
+msgstr "nesne bulunamadฤฑ: %s"
+
+#: fetch-pack.c:367 fetch-pack.c:1351
+#, c-format
+msgid "error in object: %s"
+msgstr "nesne iรงinde hata: %s"
+
+#: fetch-pack.c:369 fetch-pack.c:1353
+#, c-format
+msgid "no shallow found: %s"
+msgstr "sฤฑฤŸ bulunamadฤฑ: %s"
+
+#: fetch-pack.c:372 fetch-pack.c:1357
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "sฤฑฤŸ/sฤฑฤŸ olmayan bekleniyordu, %s alฤฑndฤฑ"
+
+#: fetch-pack.c:414
+#, c-format
+msgid "got %s %d %s"
+msgstr "%s %d %s alฤฑndฤฑ"
+
+#: fetch-pack.c:431
+#, c-format
+msgid "invalid commit %s"
+msgstr "geรงersiz gรถnderi %s"
+
+#: fetch-pack.c:462
+msgid "giving up"
+msgstr "vazgeรงiliyor"
+
+#: fetch-pack.c:475 progress.c:323
+msgid "done"
+msgstr "bitti"
+
+#: fetch-pack.c:487
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "%s (%d) %s alฤฑndฤฑ"
+
+#: fetch-pack.c:533
+#, c-format
+msgid "Marking %s as complete"
+msgstr "%s tamam olarak imleniyor"
+
+#: fetch-pack.c:754
+#, c-format
+msgid "already have %s (%s)"
+msgstr "%s halihazฤฑrda var (%s)"
+
+#: fetch-pack.c:818
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: yanbant รงoฤŸullama รงรถzรผcรผsรผ ayrฤฑ รงatallanamฤฑyor"
+
+#: fetch-pack.c:826
+msgid "protocol error: bad pack header"
+msgstr "protokol hatasฤฑ: hatalฤฑ paket รผstbilgisi"
+
+#: fetch-pack.c:900
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: %s ayrฤฑ รงatallanamฤฑyor"
+
+#: fetch-pack.c:916
+#, c-format
+msgid "%s failed"
+msgstr "%s baลŸarฤฑsฤฑz oldu"
+
+#: fetch-pack.c:918
+msgid "error in sideband demultiplexer"
+msgstr "yanbant รงoฤŸullama รงรถzรผcรผsรผnde hata"
+
+#: fetch-pack.c:965
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Sunucu sรผrรผmรผ %.*s"
+
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#, c-format
+msgid "Server supports %s"
+msgstr "Sunucu %s destekliyor"
+
+#: fetch-pack.c:972
+msgid "Server does not support shallow clients"
+msgstr "Sunucu sฤฑฤŸ istemcileri desteklemiyor"
+
+#: fetch-pack.c:1032
+msgid "Server does not support --shallow-since"
+msgstr "Sunucu --shallow-since desteklemiyor"
+
+#: fetch-pack.c:1037
+msgid "Server does not support --shallow-exclude"
+msgstr "Sunucu --shallow-exclude desteklemiyor"
+
+#: fetch-pack.c:1041
+msgid "Server does not support --deepen"
+msgstr "Sunucu --deepen desteklemiyor"
+
+#: fetch-pack.c:1058
+msgid "no common commits"
+msgstr "ortak gรถnderi yok"
+
+#: fetch-pack.c:1070 fetch-pack.c:1536
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: getirme baลŸarฤฑsฤฑz"
+
+#: fetch-pack.c:1209
+msgid "Server does not support shallow requests"
+msgstr "Sunucu sฤฑฤŸ istekleri desteklemiyor"
+
+#: fetch-pack.c:1216
+msgid "Server supports filter"
+msgstr "Sunucu sรผzgeรง destekliyor"
+
+#: fetch-pack.c:1239
+msgid "unable to write request to remote"
+msgstr "uzak konuma istek yazฤฑlamฤฑyor"
+
+#: fetch-pack.c:1257
+#, c-format
+msgid "error reading section header '%s'"
+msgstr "bรถlรผm รผstbilgisi '%s' okunurken hata"
+
+#: fetch-pack.c:1263
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "'%s' bekleniyordu, '%s' alฤฑndฤฑ"
+
+#: fetch-pack.c:1303
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "beklenmedik alฤฑndฤฑ satฤฑrฤฑ: '%s'"
+
+#: fetch-pack.c:1308
+#, c-format
+msgid "error processing acks: %d"
+msgstr "alฤฑndฤฑlar iลŸlenirken hata: %d"
+
+#: fetch-pack.c:1318
+msgid "expected packfile to be sent after 'ready'"
+msgstr "paket dosyasฤฑnฤฑn 'ready'den sonra gรถnderilmesi gerekiyordu"
+
+#: fetch-pack.c:1320
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr "'ready' \"yok\" iken baลŸka hiรงbir bรถlรผmรผn gรถnderilmemesi gerekiyordu"
+
+#: fetch-pack.c:1362
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "sฤฑฤŸ bilgi iลŸlenirken hata: %d"
+
+#: fetch-pack.c:1409
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "wanted-ref bekleniyordu, '%s' alฤฑndฤฑ"
+
+#: fetch-pack.c:1414
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "beklenmedik wanted-ref: '%s'"
+
+#: fetch-pack.c:1419
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "aranan baลŸvurular iลŸlenirken hata: %d"
+
+#: fetch-pack.c:1762
+msgid "no matching remote head"
+msgstr "eลŸleลŸen uzak dal ucu yok"
+
+#: fetch-pack.c:1785 builtin/clone.c:689
+msgid "remote did not send all necessary objects"
+msgstr "uzak konum gereken tรผm nesneleri gรถndermedi"
+
+#: fetch-pack.c:1812
+#, c-format
+msgid "no such remote ref %s"
+msgstr "bรถyle bir uzak baลŸvuru yok: %s"
+
+#: fetch-pack.c:1815
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Sunucu %s tanฤฑtฤฑlmamฤฑลŸ nesnesi iรงin isteฤŸe izin vermiyor"
+
+#: gpg-interface.c:408
+msgid "gpg failed to sign the data"
+msgstr "gpg veriyi imzalayamadฤฑ"
+
+#: gpg-interface.c:434
+msgid "could not create temporary file"
+msgstr "geรงici dosya oluลŸturulamadฤฑ"
+
+#: gpg-interface.c:437
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "ลŸuna ayrฤฑk imza yazฤฑlamadฤฑ: '%s'"
+
+#: graph.c:98
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "log.graphColors iรงindeki '%.*s' geรงersiz rengini yok say"
+
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"verilen dizgi NULL baytฤฑ iรงeriyor (-f <dosya> ile). Bu yalnฤฑzca PCRE v2 "
+"altฤฑnda -P ile desteklenir"
+
+#: grep.c:2128
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': %s okunamฤฑyor"
+
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "'%s' dosyasฤฑnฤฑn bilgileri alฤฑnamadฤฑ"
+
+#: grep.c:2156
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': kฤฑsa okuma"
+
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "bir รงalฤฑลŸma alanฤฑ baลŸlatฤฑn (ayrฤฑca bkz: git help tutorial)"
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "gรผncel deฤŸiลŸiklikler รผzerinde รงalฤฑลŸฤฑn (ayrฤฑca bkz: git help everyday)"
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "geรงmiลŸi ve durumu gรถzden geรงirin (ayrฤฑca bkz: git help revisions)"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "ortak geรงmiลŸinizi bรผyรผtรผn, imleyin ve geliลŸtirin"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "birlikte รงalฤฑลŸฤฑn (ayrฤฑca bkz: git help workflows)"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "Ana Komutlar"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "Yan Komutlar / Yรถnlendiriciler"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "Yan Komutlar / Sorgucular"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "BaลŸkalarฤฑ ile EtkileลŸim"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "DรผลŸรผk Dรผzeyli Komutlar / Yรถnlendiriciler"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "DรผลŸรผk Dรผzeyli Komutlar / Sorgucular"
+
+#: help.c:37
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "DรผลŸรผk Dรผzeyli Komutlar / Depo EลŸitleme"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "DรผลŸรผk Dรผzeyli Komutlar / ฤฐรง Yardฤฑmcฤฑlar"
+
+#: help.c:298
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "'%s' iรงindeki kullanฤฑlabilir git komutlarฤฑ"
+
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "$PATH iรงindeki baลŸka yerlerden kullanฤฑlabilen git komutlarฤฑ"
+
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
+msgstr "ร‡eลŸitli durumlarda kullanฤฑlan temel Git komutlarฤฑ aลŸaฤŸฤฑdadฤฑr:"
+
+#: help.c:363 git.c:98
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "desteklenmeyen komut listeleme tรผrรผ '%s'"
+
+#: help.c:403
+msgid "The common Git guides are:"
+msgstr "Yaygฤฑn Git kฤฑlavuzlarฤฑ:"
+
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Belirli bir altkomut รผzerine okumak iรงin 'git help <komut>' kullanฤฑn"
+
+#: help.c:517
+msgid "External commands"
+msgstr "DฤฑลŸ komutlar"
+
+#: help.c:532
+msgid "Command aliases"
+msgstr "Komut armalarฤฑ"
+
+#: help.c:596
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' bir git komutu gibi gรถrรผnรผyor, ancak biz onu\n"
+"รงalฤฑลŸtฤฑramadฤฑk. git-%s bozuk olabilir mi?"
+
+#: help.c:655
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Tรผh. Sisteminiz hiรงbir Git komutunu bildirmiyor."
+
+#: help.c:677
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr ""
+"UYARI: '%s' adฤฑnda bir Git komutunu รงaฤŸฤฑrdฤฑnฤฑz, ancak bรถyle bir komut yok."
+
+#: help.c:682
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "'%s' demek istediฤŸiniz varsayฤฑlarak sรผrdรผrรผlรผyor."
+
+#: help.c:687
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "%0.1f saniye iรงinde sรผrdรผrรผlรผyor, '%s' demek istediฤŸiniz varsayฤฑlacak."
+
+#: help.c:695
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' bir git komutu deฤŸil. Yardฤฑm iรงin: 'git --help'."
+
+#: help.c:699
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Buna en yakฤฑn komut:"
+msgstr[1] ""
+"\n"
+"Buna en yakฤฑn komutlar:"
+
+#: help.c:714
+msgid "git version [<options>]"
+msgstr "git version [<seรงenekler>]"
+
+#: help.c:783
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c:787
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"ลžunu mu demek istediniz?"
+msgstr[1] ""
+"\n"
+"ลžunlardan birini mi demek istediniz?"
+
+#: ident.c:349
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Lรผtfen bana kim olduฤŸunuzu sรถyleyin.\n"
+"\n"
+"Hesabฤฑnฤฑzฤฑn รถntanฤฑmlฤฑ kimliฤŸini ayarlamak iรงin\n"
+"\n"
+"\tgit config --global user.name \"Adฤฑnฤฑz\"\n"
+"\tgit config --global user.email \"siz@e-posta.com\"\n"
+"\n"
+"komutlarฤฑnฤฑ รงalฤฑลŸtฤฑrฤฑn.\n"
+"KimliฤŸinizi yalnฤฑzca bu depo iรงin geรงerli kฤฑlmak isterseniz --global\n"
+"deฤŸiลŸkenini kullanmayฤฑn.\n"
+"\n"
+
+#: ident.c:379
+msgid "no email was given and auto-detection is disabled"
+msgstr "bir e-posta verilmedi ve kendiliฤŸinden algฤฑlama devre dฤฑลŸฤฑ"
+
+#: ident.c:384
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "e-posta adresi kendiliฤŸinden algฤฑlanamฤฑyor ('%s' alฤฑndฤฑ)"
+
+#: ident.c:401
+msgid "no name was given and auto-detection is disabled"
+msgstr "bir ad verilmedi ve kendiliฤŸinden algฤฑlama devre dฤฑลŸฤฑ"
+
+#: ident.c:407
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "ad kendiliฤŸinden algฤฑlanamฤฑyor ('%s' alฤฑndฤฑ)"
+
+#: ident.c:415
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "boลŸ tanฤฑmlayฤฑcฤฑ adฤฑna (<%s> iรงin) izin verilmiyor"
+
+#: ident.c:421
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "ad yalnฤฑzca izin verilmeyen karakterlerden oluลŸuyor: %s"
+
+#: ident.c:436 builtin/commit.c:635
+#, c-format
+msgid "invalid date format: %s"
+msgstr "geรงersiz tarih biรงimi: %s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "'%s' girdisi (%s aฤŸacฤฑnda) aฤŸaรง kipine iye, ancak bir aฤŸaรง deฤŸil"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+"'%s' girdisi (%s aฤŸacฤฑnda) ikili nesne kipine iye, ancak bir ikili geniลŸ "
+"nesne deฤŸil"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "%s gรถnderisi iรงin kรถk aฤŸacฤฑ yรผklenemiyor"
+
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "'%s' iรงindeki aralฤฑklฤฑ ikili nesneye eriลŸilemiyor"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "%s iรงindeki aralฤฑklฤฑ sรผzgeรง verisi ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
+msgstr "'tree:<derinlik>' bekleniyordu"
+
+#: list-objects-filter-options.c:73
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:path sรผzgeรงleri desteฤŸi artฤฑk yok"
+
+#: list-objects-filter-options.c:86
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "geรงersiz filter-spec '%s'"
+
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "sub-filter-spec iรงinde kaรงฤฑลŸ karakteri olmalฤฑ: '%c'"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "birlikte kullanฤฑmdan sonra bir ลŸeyler bekleniyordu:"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "รงoklu filter-specs birlikte kullanฤฑlamaz"
+
+#: lockfile.c:151
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"'%s.lock' oluลŸturulamฤฑyor: %s.\n"
+"\n"
+"Bu depoda baลŸka bir git iลŸlemi รงalฤฑลŸฤฑyor gibi gรถrรผnรผyor, รถrneฤŸin\n"
+"'git commit' kullanฤฑlarak aรงฤฑlmฤฑลŸ bir dรผzenleyici. Lรผtfen tรผm iลŸlemlerin\n"
+"sonlandฤฑrฤฑldฤฑฤŸฤฑndan emin olun ve yeniden deneyin. EฤŸer hรขlรข baลŸarฤฑsฤฑz\n"
+"oluyorsa bir git iลŸlemi bu depo iรงinde daha รถnceden รงakฤฑlmฤฑลŸ olabilir:\n"
+"Sรผrdรผrmek iรงin dosyayฤฑ el ile kaldฤฑrฤฑn."
+
+#: lockfile.c:159
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "'%s.lock' oluลŸturulamฤฑyor: %s"
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "รถnbellek okunamadฤฑ"
+
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "yeni indeks dosyasฤฑ yazฤฑlamฤฑyor"
+
+#: merge-recursive.c:356
+msgid "(bad commit)\n"
+msgstr "(hatalฤฑ gรถnderi)\n"
+
+#: merge-recursive.c:379
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr ""
+"add_cacheinfo '%s' yolu iรงin baลŸarฤฑsฤฑz oldu; birleลŸtirme iptal ediliyor."
+
+#: merge-recursive.c:388
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr "add_cacheinfo '%s' yolu iรงin yenilenemedi; birleลŸtirme iptal ediliyor."
+
+#: merge-recursive.c:874
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "'%s'%s yolu oluลŸturulamadฤฑ"
+
+#: merge-recursive.c:885
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Altdizine yer aรงmak iรงin %s kaldฤฑrฤฑlฤฑyor\n"
+
+#: merge-recursive.c:899 merge-recursive.c:918
+msgid ": perhaps a D/F conflict?"
+msgstr ": bir D/F รงakฤฑลŸmasฤฑ olabilir mi?"
+
+#: merge-recursive.c:908
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "'%s' konumundaki izlenmeyen dosyayฤฑ kaybetme reddediliyor"
+
+#: merge-recursive.c:949 builtin/cat-file.c:41
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "%s '%s' nesnesi okunamฤฑyor"
+
+#: merge-recursive.c:954
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' iรงin ikili nesne bekleniyordu"
+
+#: merge-recursive.c:979
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "'%s' aรงฤฑlamadฤฑ: %s"
+
+#: merge-recursive.c:990
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "'%s' iรงin sembolik baฤŸ oluลŸturulamadฤฑ: %s"
+
+#: merge-recursive.c:995
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "ลŸununla ne yapฤฑlacaฤŸฤฑ bilinmiyor: %06o %s '%s'"
+
+#: merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "%s altmodรผlรผ birleลŸtirilemedi (รงฤฑkฤฑลŸ yapฤฑlmadฤฑ)"
+
+#: merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "%s altmodรผlรผ birleลŸtirilemedi (gรถnderiler mevcut deฤŸil)"
+
+#: merge-recursive.c:1205
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "%s altmodรผlรผ birleลŸtirilemedi (gรถnderiler merge-base'i takip etmiyor)"
+
+#: merge-recursive.c:1213 merge-recursive.c:1225
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "%s altmodรผlรผ ลŸu gรถnderiye ileri sarฤฑlฤฑyor:"
+
+#: merge-recursive.c:1216 merge-recursive.c:1228
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "%s altmodรผlรผ ileri sarฤฑlฤฑyor"
+
+#: merge-recursive.c:1251
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+"%s altmodรผlรผ birleลŸtirilemedi (gรถnderileri takip eden birleลŸtirme bulunamadฤฑ)"
+
+#: merge-recursive.c:1255
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "%s altmodรผlรผ birleลŸtirilemedi (ileri sarฤฑm deฤŸil)"
+
+#: merge-recursive.c:1256
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "ลžu altmodรผl iรงin olasฤฑ bir birleลŸtirme รงรถzรผmรผ bulundu:\n"
+
+#: merge-recursive.c:1259
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"EฤŸer bu doฤŸruysa yalnฤฑzca indekse ekleyin, รถrneฤŸinbu รถneriyi kabul edecek:\n"
+"\n"
+"\tgit update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"komutunu kullanmanฤฑz yeterlidir.\n"
+
+#: merge-recursive.c:1268
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "%s altmodรผlรผ birleลŸtirilemedi (birden รงok birleลŸtirme bulundu)"
+
+#: merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "ฤฐรง birleลŸtirme รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "%s veritabanฤฑna eklenemedi"
+
+#: merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "%s kendiliฤŸinden birleลŸtiriliyor"
+
+#: merge-recursive.c:1402
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+"Hata: %s konumundaki izlenmeyen dosyayฤฑ kaybetme reddediliyor, bunun yerine "
+"%s konumuna yazฤฑlacak."
+
+#: merge-recursive.c:1474
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"ร‡AKIลžMA (%s/silme): %s silindi (%s iรงinde) ve %s (%s iรงinde). %s (%s) sรผrรผmรผ "
+"aฤŸaรงta bฤฑrakฤฑldฤฑ."
+
+#: merge-recursive.c:1479
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"ร‡AKIลžMA (%s/silme): %s silindi (%s iรงinde) ve %s ลŸuraya: %s (%s iรงinde). %s "
+"(%s) sรผrรผmรผ aฤŸaรงta bฤฑrakฤฑldฤฑ."
+
+#: merge-recursive.c:1486
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"ร‡AKIลžMA (%s/silme): %s silindi (%s iรงinde) ve %s (%s iรงinde). %s (%s) sรผrรผmรผ "
+"aฤŸaรงta %s konumunda bฤฑrakฤฑldฤฑ."
+
+#: merge-recursive.c:1491
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
+msgstr ""
+"ร‡AKIลžMA (%s/silme): %s silindi (%s iรงinde) ve %s ลŸuraya: %s (%s iรงinde). %s "
+"(%s) sรผrรผmรผ aฤŸaรงta %s konumunda bฤฑrakฤฑldฤฑ."
+
+#: merge-recursive.c:1526
+msgid "rename"
+msgstr "yeniden adlandฤฑr"
+
+#: merge-recursive.c:1526
+msgid "renamed"
+msgstr "yeniden adlandฤฑrฤฑldฤฑ"
+
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "%s konumundaki kirli dosyayฤฑ kaybetme reddediliyor"
+
+#: merge-recursive.c:1587
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+"Engel olduฤŸu halde %s konumundaki izlenmeyen dosyayฤฑ kaybetme reddediliyor."
+
+#: merge-recursive.c:1645
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
+msgstr ""
+"ร‡AKIลžMA (yeniden adlandฤฑr/ekle): %s->%s olarak adlandฤฑrฤฑldฤฑ (%s iรงinde). %s "
+"eklendi (%s iรงinde)."
+
+#: merge-recursive.c:1676
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s bir dizin (%s iรงinde), bunun yerine %s olarak ekleniyor"
+
+#: merge-recursive.c:1681
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+"%s konumundaki izlenmeyen dosyayฤฑ kaybetme reddediliyor, bunun yerine %s "
+"olarak ekleniyor"
+
+#: merge-recursive.c:1708
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"ร‡AKIลžMA (y. adlandฤฑr/y. adlandฤฑr): \"%s\"->\"%s\" olarak adlandฤฑr (\"%s\" "
+"dalฤฑnda), \"%s\"->\"%s\" olarak adlandฤฑr (\"%s\"%s iรงinde)"
+
+#: merge-recursive.c:1713
+msgid " (left unresolved)"
+msgstr " (รงรถzรผlmeden bฤฑrakฤฑldฤฑ)"
+
+#: merge-recursive.c:1793
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"ร‡AKIลžMA (y. adlandฤฑr/y. adlandฤฑr): %s->%s olarak adlandฤฑr (%s iรงinde). %s->"
+"%s olarak adlandฤฑr (%s iรงinde)"
+
+#: merge-recursive.c:2056
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"ร‡AKIลžMA: (dizin yeniden adlandฤฑrma ayrฤฑlmasฤฑ): %s รถgesinin nereye "
+"yerleลŸtirileceฤŸi belirsiz รงรผnkรผ %s dizini birden รงok baลŸka dizine yeniden "
+"adlandฤฑrฤฑlฤฑrken hiรงbir hedef dosyalarฤฑn bรผyรผk รงoฤŸunluฤŸunu almadฤฑ."
+
+#: merge-recursive.c:2088
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+"ร‡AKIลžMA (รถrtรผlรผ dizin yeniden adlandฤฑrma): %s konumundaki mevcut dosya/dizin "
+"รถrtรผlรผ yeniden adlandฤฑrmanฤฑn aลŸaฤŸฤฑdaki yollarฤฑ oraya koymasฤฑna engel oluyor: "
+"%s."
+
+#: merge-recursive.c:2098
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+"ร‡AKIลžMA (รถrtรผlรผ dizin yeniden adlandฤฑrma): %s iรงin birden รงok yol "
+"eลŸlemlenemiyor; รถrtรผlรผ dizin yeniden adlandฤฑrmalarฤฑ aลŸaฤŸฤฑdaki yollarฤฑ oraya "
+"koymayฤฑ denedi: %s."
+
+#: merge-recursive.c:2190
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"ร‡AKIลžMA (y. adlandฤฑr/y. adlandฤฑr): Dizini %s->%s olarak adlandฤฑr (%s "
+"iรงinde). Dizini %s->%s olarak adlandฤฑr (%s iรงinde)."
+
+#: merge-recursive.c:2435
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"UYARI: %s -> %s yeniden adlandฤฑrmasฤฑnฤฑ %s รถgesine uygulamadan kaรงฤฑnฤฑlฤฑyor, "
+"รงรผnkรผ %s รถgesinin kendisi yeniden adlandฤฑrฤฑldฤฑ."
+
+#: merge-recursive.c:2961
+#, c-format
+msgid "cannot read object %s"
+msgstr "%s nesnesi okunamฤฑyor"
+
+#: merge-recursive.c:2964
+#, c-format
+msgid "object %s is not a blob"
+msgstr "%s nesnesi ikili bir nesne deฤŸil"
+
+#: merge-recursive.c:3028
+msgid "modify"
+msgstr "deฤŸiลŸtir"
+
+#: merge-recursive.c:3028
+msgid "modified"
+msgstr "deฤŸiลŸtirilmiลŸ"
+
+#: merge-recursive.c:3040
+msgid "content"
+msgstr "iรงerik"
+
+#: merge-recursive.c:3044
+msgid "add/add"
+msgstr "ekle/ekle"
+
+#: merge-recursive.c:3067
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "%s atlandฤฑ (mevcut ile aynฤฑ biรงimde birleลŸtirildi)"
+
+#: merge-recursive.c:3089 git-submodule.sh:1003
+msgid "submodule"
+msgstr "altmodรผl"
+
+#: merge-recursive.c:3090
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "ร‡AKIลžMA (%s): %s iรงinde birleลŸtirme รงakฤฑลŸmasฤฑ"
+
+#: merge-recursive.c:3120
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Bunun yerine %s olarak ekleniyor"
+
+#: merge-recursive.c:3203
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Yol gรผncellendi: %s, (%s iรงinde eklenen) %s iรงinde yeniden adlandฤฑrฤฑlan bir "
+"dizinde; onu %s konumuna taลŸฤฑdฤฑ."
+
+#: merge-recursive.c:3206
+#, c-format
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+"ร‡AKIลžMA (dosya konumu): %s, (%s iรงinde eklenen) %s iรงinde yeniden "
+"adlandฤฑrฤฑlan bir dizinde, belki de %s konumuna taลŸฤฑnmalฤฑ."
+
+#: merge-recursive.c:3210
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Yol gรผncellendi: %s, %s olarak yeniden adlandฤฑrฤฑldฤฑ (%s iรงinde), %s iรงinde "
+"yeniden adlandฤฑrฤฑlan bir dizinde; onu %s konumuna taลŸฤฑdฤฑ."
+
+#: merge-recursive.c:3213
+#, c-format
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+"ร‡AKIลžMA (dosya konumu): %s, %s olarak yeniden adlandฤฑrฤฑldฤฑ (%s iรงinde), %s "
+"iรงinde yeniden adlandฤฑrฤฑlan bir dizinde, belki de %s konumuna taลŸฤฑnmalฤฑ."
+
+#: merge-recursive.c:3327
+#, c-format
+msgid "Removing %s"
+msgstr "%s kaldฤฑrฤฑlฤฑyor"
+
+#: merge-recursive.c:3350
+msgid "file/directory"
+msgstr "dosya/dizin"
+
+#: merge-recursive.c:3355
+msgid "directory/file"
+msgstr "dizin/dosya"
+
+#: merge-recursive.c:3362
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+"ร‡AKIลžMA (%s): %s adฤฑyla bir dizin var (%s iรงinde). %s, %s olarak ekleniyor."
+
+#: merge-recursive.c:3371
+#, c-format
+msgid "Adding %s"
+msgstr "%s ekleniyor"
+
+#: merge-recursive.c:3380
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "ร‡AKIลžMA (ekle/ekle): %s iรงinde birleลŸtirme รงakฤฑลŸmasฤฑ"
+
+#: merge-recursive.c:3424
+msgid "Already up to date!"
+msgstr "Her ลŸey gรผncel!"
+
+#: merge-recursive.c:3433
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "%s ve %s aฤŸaรงlarฤฑnฤฑn birleลŸtirilmesi baลŸarฤฑsฤฑz"
+
+#: merge-recursive.c:3537
+msgid "Merging:"
+msgstr "BirleลŸtiriliyor:"
+
+#: merge-recursive.c:3550
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "%u ortak ata bulundu:"
+msgstr[1] "%u ortak ata bulundu:"
+
+#: merge-recursive.c:3600
+msgid "merge returned no commit"
+msgstr "birleลŸtirme herhangi bir gรถnderi dรถndรผrmedi"
+
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"BirleลŸtirme ile aลŸaฤŸฤฑdaki dosyalardaki yerel deฤŸiลŸikliklerin รผzerine "
+"yazฤฑlacak:\n"
+"\t%s"
+
+#: merge-recursive.c:3756
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "'%s' nesnesi ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+msgid "Unable to write index."
+msgstr "ฤฐndeks yazฤฑlamadฤฑ."
+
+#: midx.c:68
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "multi-pack-index dosyasฤฑ %s pek kรผรงรผk"
+
+#: midx.c:84
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr "multi-pack-index imzasฤฑ 0x%08x, 0x%08x imzasฤฑ ile eลŸleลŸmiyor"
+
+#: midx.c:89
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-pack-index sรผrรผmรผ %d tanฤฑmlanamฤฑyor"
+
+#: midx.c:94
+#, c-format
+msgid "hash version %u does not match"
+msgstr "saฤŸlama sรผrรผmรผ %u eลŸleลŸmiyor"
+
+#: midx.c:108
+msgid "invalid chunk offset (too large)"
+msgstr "geรงersiz iri parรงa ofseti (รงok geniลŸ)"
+
+#: midx.c:132
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr ""
+"multi-pack-index iri parรงasฤฑ sonlandฤฑrฤฑlฤฑyor, numarasฤฑ beklenenden รถnce "
+"gรถrรผnรผyor"
+
+#: midx.c:145
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "multi-pack-index'ten gerekli pack-name iri parรงasฤฑ eksik"
+
+#: midx.c:147
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "multi-pack-index'ten gerekli OID fanout iri parรงasฤฑ eksik"
+
+#: midx.c:149
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "multi-pack-index'ten gerekli OID arama iri parรงasฤฑ eksik"
+
+#: midx.c:151
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parรงasฤฑ eksik"
+
+#: midx.c:165
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "multi-pack-index paket adlarฤฑnฤฑn sฤฑrasฤฑz: '%s' ลŸundan รถnce: '%s'"
+
+#: midx.c:210
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "hatalฤฑ pack-int-id: %u (%u toplam paket)"
+
+#: midx.c:260
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr "multi-pack-index bir 64 bit ofset depoluyor, ancak off_t pek kรผรงรผk"
+
+#: midx.c:288
+msgid "error preparing packfile from multi-pack-index"
+msgstr "paket dosyasฤฑ multi-pack-index'ten hazฤฑrlanฤฑrken hata"
+
+#: midx.c:472
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "paket dosyasฤฑ '%s' eklenemedi"
+
+#: midx.c:478
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "pack-index '%s' aรงฤฑlamadฤฑ"
+
+#: midx.c:538
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "%d nesnesi paket dosyasฤฑnda bulunamadฤฑ"
+
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Paket dosyalarฤฑ multi-pack-index'e ekleniyor"
+
+#: midx.c:875
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "bฤฑrakฤฑlacak pack-file %s gรถrรผlmedi"
+
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "ฤฐri parรงalar multi-pack-index'e yazฤฑlฤฑyor"
+
+#: midx.c:1052
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "multi-pack-index %s konumunda temizlenemedi"
+
+#: midx.c:1108
+msgid "Looking for referenced packfiles"
+msgstr "BaลŸvurulmuลŸ paket dosyalarฤฑ aranฤฑyor"
+
+#: midx.c:1123
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr "oid fanout sฤฑrasฤฑz: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
+msgstr "multi-pack-index iรงindeki OID sฤฑrasฤฑ doฤŸrulanฤฑyor"
+
+#: midx.c:1137
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "oid aramasฤฑ sฤฑrasฤฑz: oid[%d] = %s >= %s = oid[%d]"
+
+#: midx.c:1157
+msgid "Sorting objects by packfile"
+msgstr "Nesneler paket dosyasฤฑna gรถre sฤฑralanฤฑyor"
+
+#: midx.c:1164
+msgid "Verifying object offsets"
+msgstr "Nesne ofsetleri doฤŸrulanฤฑyor"
+
+#: midx.c:1180
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "ลŸunun iรงin paket girdisi yรผklenemedi: oid[%d] = %s"
+
+#: midx.c:1186
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "paket dosyasฤฑ %s iรงin pack-index yรผklenemedi"
+
+#: midx.c:1195
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "ลŸunun iรงin yanlฤฑลŸ nesne ofseti: oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "BaลŸvurulmuลŸ nesneler sayฤฑlฤฑyor"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "BaลŸvurulmamฤฑลŸ paket dosyalarฤฑ bulunuyor ve siliniyor"
+
+#: midx.c:1388
+msgid "could not start pack-objects"
+msgstr "pack-objects baลŸlatฤฑlamadฤฑ"
+
+#: midx.c:1407
+msgid "could not finish pack-objects"
+msgstr "pack-objects bitirilemedi"
+
+#: name-hash.c:537
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "lazy_dir iลŸ parรงacฤฑฤŸฤฑ oluลŸturulamฤฑyor: %s"
+
+#: name-hash.c:559
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "lazy_name oluลŸturulamฤฑyor: %s"
+
+#: name-hash.c:565
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "lazy_name iลŸ parรงacฤฑฤŸฤฑ ucu birleลŸtirilemiyor: %s"
+
+#: notes-merge.c:277
+#, c-format
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
+msgstr ""
+"Bir รถnceki not birleลŸtirmenizi sonuรงlandฤฑrmadฤฑnฤฑz (%s var).\n"
+"Lรผtfen baลŸka bir not birleลŸtirmesine baลŸlamadan รถnce 'git notes merge --"
+"commit' veya 'git notes merge --abort' kullanarak bir รถnceki birleลŸtirmeyi "
+"gรถnderin/durdurun."
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Notlar birleลŸtirmenizi sonuรงlandฤฑrmadฤฑnฤฑz (%s var)."
+
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "ฤฐlklendirilmemiลŸ/BaลŸvurulmamฤฑลŸ not aฤŸacฤฑ gรถnderilemiyor"
+
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Hatalฤฑ notes.rewriteMode deฤŸeri: '%s'"
+
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "%s iรงindeki notlarฤฑ yeniden yazma reddediliyor (refs/notes/ dฤฑลŸฤฑnda)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Hatalฤฑ %s deฤŸeri: '%s'"
+
+#: object.c:53
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "geรงersiz nesne tรผrรผ \"%s\""
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "%s nesnesi bir %s, %s deฤŸil"
+
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "%s nesnesi %d bilinmeyen tรผr numarasฤฑna iye"
+
+#: object.c:246
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "nesne ayrฤฑลŸtฤฑrฤฑlamฤฑyor: %s"
+
+#: object.c:266 object.c:278
+#, c-format
+msgid "hash mismatch %s"
+msgstr "saฤŸlama uyuลŸmazlฤฑฤŸฤฑ %s"
+
+#: packfile.c:629
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "ofset paket dosyasฤฑnฤฑn sonundan รถnce (bozuk .idx?)"
+
+#: packfile.c:1899
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "ofset %s iรงin paket indeksinin baลŸlangฤฑcฤฑndan รถnce (hasarlฤฑ indeks?)"
+
+#: packfile.c:1903
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "ofset %s iรงin paket indeksinin sonundan รถtede (kฤฑrpฤฑlmฤฑลŸ index?)"
+
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "%s boyutu alฤฑnamฤฑyor"
+
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s bir deฤŸer gerektiriyor"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s, %s ile uyumsuz"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s: baลŸka bir ลŸeyle uyumsuz"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#, c-format
+msgid "%s takes no value"
+msgstr "%s bir deฤŸer almฤฑyor"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s kullanฤฑlabilir deฤŸil"
+
+#: parse-options.c:217
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s negatif olmayan bir tamsayฤฑ bekliyor, isteฤŸe baฤŸlฤฑ k/m/g eki ile"
+
+#: parse-options.c:386
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "belirsiz seรงenek: %s (--%s%s veya --%s%s olabilir)"
+
+#: parse-options.c:420 parse-options.c:428
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "ลŸunu mu demek istediniz: '--%s' (iki tire ile)?"
+
+#: parse-options.c:857
+#, c-format
+msgid "unknown option `%s'"
+msgstr "bilinmeyen seรงenek '%s'"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "bilinmeyen anahtar '%c'"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "dizi iรงinde bilinmeyen ascii dฤฑลŸฤฑ seรงenek: '%s'"
+
+#: parse-options.c:885
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:904
+#, c-format
+msgid "usage: %s"
+msgstr "kullanฤฑm: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:910
+#, c-format
+msgid "   or: %s"
+msgstr "    veya: %s"
+
+#: parse-options.c:913
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+#: parse-options.c:952
+msgid "-NUM"
+msgstr "-SAYI"
+
+#: parse-options.c:966
+#, c-format
+msgid "alias of --%s"
+msgstr "ลŸunun armasฤฑ: --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "'%s' seรงeneฤŸi sayฤฑsal bir deฤŸer bekliyor"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "hatalฤฑ oluลŸturulmuลŸ son kullanฤฑm tarihi '%s'"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "'%s' seรงeneฤŸi \"always\", \"auto\" veya \"never\" bekliyor"
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "hatalฤฑ oluลŸturulmuลŸ nesne adฤฑ '%s'"
+
+#: path.c:915
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "%s grup ile yazฤฑlabilir yapฤฑlamadฤฑ"
+
+#: pathspec.c:130
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "KaรงฤฑลŸ karakteri '\\' attr deฤŸerindeki son karakter olarak kullanฤฑlamaz"
+
+#: pathspec.c:148
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Yalnฤฑzca bir 'attr:' belirtimine izin verilir."
+
+#: pathspec.c:151
+msgid "attr spec must not be empty"
+msgstr "attr belirteci boลŸ olmamalฤฑ"
+
+#: pathspec.c:194
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "geรงersiz รถznitelik adฤฑ %s"
+
+#: pathspec.c:259
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "global 'glob' ve 'noglob' yol belirteci ayarlarฤฑ birbiriyle uyumsuz"
+
+#: pathspec.c:266
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"global 'literal' yol belirteci ayarฤฑ diฤŸer tรผm global yol belirteci "
+"ayarlarฤฑyla uyumsuz"
+
+#: pathspec.c:306
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "yol belirteci sihri 'prefix' iรงin geรงersiz parametre"
+
+#: pathspec.c:327
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Geรงersiz yol belirteci sihri '%.*s' (%s iรงinde)"
+
+#: pathspec.c:332
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "'%s' iรงindeki yol belirteci sihrinin sonunda eksik ')'"
+
+#: pathspec.c:370
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Yerine getirilmemiลŸ yol belirteci sihri '%c' ('%s' iรงinde)"
+
+#: pathspec.c:429
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz"
+
+#: pathspec.c:442
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s', '%s' konumunda depo dฤฑลŸฤฑnda"
+
+#: pathspec.c:517
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (belleten: '%c')"
+
+#: pathspec.c:527
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: yol belirteci sihri bu komut tarafฤฑndan desteklenmiyor: %s"
+
+#: pathspec.c:594
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "yol belirteci '%s' bir sembolik baฤŸฤฑn รถtesinde"
+
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "satฤฑrda hatalฤฑ tฤฑrnaklar: %s"
+
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "floลŸ paketi yazฤฑlamฤฑyor"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "sฤฑnฤฑrlandฤฑran paket yazฤฑlamฤฑyor"
+
+#: pkt-line.c:106
+msgid "flush packet write failed"
+msgstr "floลŸ paketi yazฤฑmฤฑ baลŸarฤฑsฤฑz"
+
+#: pkt-line.c:146 pkt-line.c:232
+msgid "protocol error: impossibly long line"
+msgstr "protokol hatasฤฑ: olanaksฤฑz uzun satฤฑr"
+
+#: pkt-line.c:162 pkt-line.c:164
+msgid "packet write with format failed"
+msgstr "biรงimlendirilmiลŸ paket yazฤฑmฤฑ baลŸarฤฑsฤฑz"
+
+#: pkt-line.c:196
+msgid "packet write failed - data exceeds max packet size"
+msgstr "paket yazฤฑmฤฑ baลŸarฤฑsฤฑz - veri olabilecek en รงok paket boyutunu aลŸฤฑyor"
+
+#: pkt-line.c:203 pkt-line.c:210
+msgid "packet write failed"
+msgstr "paket yazฤฑmฤฑ baลŸarฤฑsฤฑz"
+
+#: pkt-line.c:295
+msgid "read error"
+msgstr "okuma hatasฤฑ"
+
+#: pkt-line.c:303
+msgid "the remote end hung up unexpectedly"
+msgstr "uzak konum beklenmedik biรงimde hattฤฑ kapattฤฑ"
+
+#: pkt-line.c:331
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "protokol hatasฤฑ: hatalฤฑ satฤฑr uzunluฤŸu karakteri: %.4s"
+
+#: pkt-line.c:341 pkt-line.c:346
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "protokol hatasฤฑ: hatalฤฑ satฤฑr uzunluฤŸu %d"
+
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "uzak konum hatasฤฑ: %s"
+
+#: preload-index.c:119
+msgid "Refreshing index"
+msgstr "ฤฐndeks yenileniyor"
+
+#: preload-index.c:138
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "iลŸ parรงacฤฑklarฤฑna ayrฤฑlmฤฑลŸ 'lstat' oluลŸturulamฤฑyor: %s"
+
+#: pretty.c:981
+msgid "unable to parse --pretty format"
+msgstr "--pretty biรงimi ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "URL'si olmayan uzak konum"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "vaatรงi uzak konum adฤฑ '/' ile baลŸlayamaz: %s"
+
+#: range-diff.c:75
+msgid "could not start `log`"
+msgstr "'log' baลŸlatฤฑlamadฤฑ"
+
+#: range-diff.c:77
+msgid "could not read `log` output"
+msgstr "'log' รงฤฑktฤฑsฤฑ okunamadฤฑ"
+
+#: range-diff.c:96 sequencer.c:5020
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "'%s' gรถnderisi ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: range-diff.c:122
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "git รผstbilgisi '%.*s' ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: range-diff.c:285
+msgid "failed to generate diff"
+msgstr "diff oluลŸturulamadฤฑ"
+
+#: range-diff.c:518 range-diff.c:520
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "'%s' gรผnlรผฤŸรผ ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "dosya armasฤฑ '%s' eklenmeyecek ('%s' indekste halihazฤฑrda var)"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "nesne veritabanฤฑnda boลŸ ikili bir nesne oluลŸturulamฤฑyor"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: yalnฤฑzca sฤฑradan dosyalar, sembolik baฤŸlar ve git dizinleri eklenebilir"
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' รงฤฑkฤฑลŸฤฑ yapฤฑlmฤฑลŸ bir gรถnderiye iye deฤŸil"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "'%s' dosyasฤฑ indekslenemiyor"
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "'%s' indekse eklenemiyor"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "'%s' dosyasฤฑnฤฑn bilgileri alฤฑnamฤฑyor"
+
+#: read-cache.c:1330
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' hem bir dosya hem de bir dizin olarak gรถrรผnรผyor"
+
+#: read-cache.c:1536
+msgid "Refresh index"
+msgstr "ฤฐndeksi yenile"
+
+#: read-cache.c:1651
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version ayarlanmฤฑลŸ, ancak deฤŸer geรงersiz.\n"
+"%i sรผrรผmรผ kullanฤฑlฤฑyor"
+
+#: read-cache.c:1661
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION ayarlanmฤฑลŸ, ancak deฤŸer geรงersiz.\n"
+"%i sรผrรผmรผ kullanฤฑlฤฑyor"
+
+#: read-cache.c:1717
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "hatalฤฑ imza 0x%08x"
+
+#: read-cache.c:1720
+#, c-format
+msgid "bad index version %d"
+msgstr "hatalฤฑ indeks sรผrรผmรผ %d"
+
+#: read-cache.c:1729
+msgid "bad index file sha1 signature"
+msgstr "hatalฤฑ indeks dosyasฤฑ sha1 imzasฤฑ"
+
+#: read-cache.c:1759
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "indeks bizim anlamadฤฑฤŸฤฑmฤฑz %.4s imzasฤฑ kullanฤฑyor"
+
+#: read-cache.c:1761
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "%.4s uzantฤฑsฤฑ yok sayฤฑlฤฑyor"
+
+#: read-cache.c:1798
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "bilinmeyen indeks girdisi biรงimi 0x%08x"
+
+#: read-cache.c:1814
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "indekste hatalฤฑ oluลŸturulmuลŸ ad alanฤฑ, '%s' yolu yakฤฑnฤฑnda"
+
+#: read-cache.c:1871
+msgid "unordered stage entries in index"
+msgstr "indekste sฤฑrasฤฑz hazฤฑrlama alanฤฑ girdileri"
+
+#: read-cache.c:1874
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "birleลŸtirilmiลŸ dosya '%s' iรงin รงoklu hazฤฑrlama alanฤฑ girdileri"
+
+#: read-cache.c:1877
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "'%s' iรงin sฤฑrasฤฑz hazฤฑrlama alanฤฑ girdileri"
+
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
+msgid "index file corrupt"
+msgstr "indeks dosyasฤฑ hasar gรถrmรผลŸ"
+
+#: read-cache.c:2124
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "load_cache_entries iลŸ parรงacฤฑฤŸฤฑ oluลŸturulamฤฑyor: %s"
+
+#: read-cache.c:2137
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "load_cache_entries iลŸ parรงacฤฑฤŸฤฑ ucu birleลŸtirilemiyor: %s"
+
+#: read-cache.c:2170
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: indeks dosyasฤฑ aรงฤฑlamadฤฑ"
+
+#: read-cache.c:2174
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: aรงฤฑk indeksin bilgileri alฤฑnamฤฑyor"
+
+#: read-cache.c:2178
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: indeks dosyasฤฑ beklenenden daha kรผรงรผk"
+
+#: read-cache.c:2182
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: indeks dosyasฤฑ eลŸlemlenemiyor"
+
+#: read-cache.c:2224
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "load_index_extensions iลŸ parรงacฤฑฤŸฤฑ oluลŸturulamฤฑyor: %s"
+
+#: read-cache.c:2251
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "load_index_extensions iลŸ parรงacฤฑฤŸฤฑ ucu birleลŸtirilemiyor: %s"
+
+#: read-cache.c:2283
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "paylaลŸฤฑlan indeks '%s' tazelenemedi"
+
+#: read-cache.c:2330
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "bozuk indeks, %s bekleniyordu (%s iรงinde), %s alฤฑndฤฑ"
+
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#, c-format
+msgid "could not close '%s'"
+msgstr "'%s' kapatฤฑlamadฤฑ"
+
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#, c-format
+msgid "could not stat '%s'"
+msgstr "'%s' bilgileri alฤฑnamadฤฑ"
+
+#: read-cache.c:3142
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "git dizini aรงฤฑlamฤฑyor: %s"
+
+#: read-cache.c:3154
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "baฤŸlantฤฑ kesilemiyor: %s"
+
+#: read-cache.c:3179
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "'%s' รผzerindeki izin bitleri onarฤฑlamฤฑyor"
+
+#: read-cache.c:3328
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: #0 numaralฤฑ hazฤฑrlama alanฤฑna bฤฑrakฤฑlamฤฑyor"
+
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Bunu 'git rebase --edit-todo' ile dรผzeltebilir ve ardฤฑndan 'git rebase --"
+"continue' yapabilirsiniz.\n"
+"Yeniden temellendirmeyi durdurmak isterseniz 'git rebase --abort' yapฤฑn.\n"
+
+#: rebase-interactive.c:33
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"rebase.missingCommitsCheck seรงeneฤŸi iรงin tanฤฑmlanamayan %s ayarฤฑ. Yok "
+"sayฤฑlฤฑyor."
+
+#: rebase-interactive.c:42
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       create a merge commit using the original merge commit's\n"
+".       message (or the oneline, if no original merge commit was\n"
+".       specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Komutlar:\n"
+"p, pick <gรถnderi> = gรถnderiyi kullan\n"
+"r, reword <gรถnderi> = gรถnderiyi kullan, ancak gรถnderi iletisini dรผzenle\n"
+"e, edit <gรถnderi> = gรถnderiyi kullan, ancak deฤŸiลŸtirmek iรงin dur\n"
+"s, squash <gรถnderi> = gรถnderiyi kullan, ancak รถnceki gรถnderi iรงine karฤฑลŸtฤฑr\n"
+"f, fixup <gรถnderi> = \"squash\" gibi, ancak bu gรถnderinin gรผnlรผk iletisini "
+"at\n"
+"x, exec <komut> = komutu (satฤฑrฤฑn geri kalanฤฑ) kabuk kullanarak รงalฤฑลŸtฤฑr\n"
+"b, break = burada dur (daha sonra sรผrdรผrmek iรงin 'git rebase --continue')\n"
+"d, drop <gรถnderi> = gรถnderiyi kaldฤฑr\n"
+"l, label <etiket> = geรงerli HEAD'i bir ad ile etiketle\n"
+"t, reset <etiket> = HEAD'i bir etikete sฤฑfฤฑrla\n"
+"m, merge [-C <gรถnderi> | -c <gรถnderi>] <etiket> [# <teksatฤฑr>]\n"
+".       orijinal birleลŸtirme gรถnderisi iletisini kullanarak bir\n"
+".       birleลŸtirme gรถnderisi oluลŸtur (veya teksatฤฑr, eฤŸer bir orijinal\n"
+".       birleลŸtirme gรถnderisi belirtilmemiลŸse). Gรถnderi iletisini yeniden\n"
+".       yazmak iรงin -c <gรถnderi> kullanฤฑn.\n"
+"\n"
+"Bu satฤฑrlar yeniden sฤฑralanabilirler, yukarฤฑdan aลŸaฤŸฤฑya รงalฤฑลŸtฤฑrฤฑlฤฑrlar.\n"
+
+#: rebase-interactive.c:63
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "%s รถgesini %s รผzerine yeniden temellendir (%d komut)"
+msgstr[1] "%s รถgesini %s รผzerine yeniden temellendir (%d komut)"
+
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Hiรงbir satฤฑrฤฑ kaldฤฑrmayฤฑn. Bir gรถnderiyi kaldฤฑrmak iรงin 'drop'u aรงฤฑkรงa "
+"kullanฤฑn.\n"
+
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Buradaki bir satฤฑrฤฑ kaldฤฑrฤฑrsanฤฑz O Gร–NDERฤฐ TรœMรœYLE KAYBOLACAK.\n"
+
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Sรผrmekte olan bir etkileลŸimli yeniden temellendirmenin yapฤฑlacaklar "
+"dosyasฤฑnฤฑ dรผzenlemektesiniz.\n"
+"Dรผzenlemenin ardฤฑndan yeniden temellendirmeyi sรผrdรผrmek iรงin ลŸunu kullanฤฑn:\n"
+"\tgit rebase --continue\n"
+"\n"
+
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"EฤŸer ki, her ลŸeyi kaldฤฑrฤฑrsanฤฑz yeniden temellendirme iptal edilecektir.\n"
+"\n"
+
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#, c-format
+msgid "could not write '%s'"
+msgstr "'%s' yazฤฑlamadฤฑ"
+
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
+#, c-format
+msgid "could not write '%s'."
+msgstr "'%s' yazฤฑlamadฤฑ."
+
+#: rebase-interactive.c:193
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Uyarฤฑ: Bazฤฑ gรถnderiler yanlฤฑลŸlฤฑkla bฤฑrakฤฑlmฤฑลŸ olabilir.\n"
+"Bฤฑrakฤฑlan gรถnderiler: (yeniden eskiye):\n"
+
+#: rebase-interactive.c:200
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Bu iletiden kaรงฤฑnmak iรงin, bir gรถnderiyi kaldฤฑrฤฑrken aรงฤฑkรงa \"drop\" "
+"kullanฤฑn.\n"
+"Uyarฤฑlarฤฑn dรผzeyini deฤŸiลŸtirmek iรงin 'git config rebase.missingCommitsCheck' "
+"kullanฤฑn.\n"
+"Kullanฤฑlabilir davranฤฑลŸlar: ignore, warn, error.\n"
+"\n"
+
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "'%s' okunamadฤฑ."
+
+#: refs.c:262
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s geรงerli bir nesneye iลŸaret etmiyor!"
+
+#: refs.c:667
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "sarkan sembolik baลŸvuru %s yok sayฤฑlฤฑyor"
+
+#: refs.c:669 ref-filter.c:2098
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "bozuk baลŸvuru %s yok sayฤฑlฤฑyor"
+
+#: refs.c:804
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "'%s' yazma iรงin aรงฤฑlamadฤฑ: %s"
+
+#: refs.c:814 refs.c:865
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "'%s' baลŸvurusu okunamadฤฑ"
+
+#: refs.c:820
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "'%s' baลŸvurusu halihazฤฑrda var"
+
+#: refs.c:825
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "'%s' yazฤฑlฤฑrken beklenmedik nesne numarasฤฑ"
+
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr "ลŸuraya yazฤฑlamadฤฑ: '%s'"
+
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "'%s' yazma iรงin aรงฤฑlamadฤฑ"
+
+#: refs.c:867
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "'%s' silinirken beklenmedik nesne numarasฤฑ"
+
+#: refs.c:998
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "%s baลŸvurusu iรงin olan gรผnlรผkte %s sonrasฤฑnda boลŸluk var"
+
+#: refs.c:1004
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+"%s baลŸvurusu iรงin olan gรผnlรผk %s konumunda beklenmedik bir biรงimde sonlandฤฑ"
+
+#: refs.c:1063
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s iรงin olan gรผnlรผk boลŸ"
+
+#: refs.c:1155
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "hatalฤฑ ada iye '%s' baลŸvurusunu gรผncelleme reddediliyor"
+
+#: refs.c:1231
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "'%s' baลŸvurusu iรงin update_ref baลŸarฤฑsฤฑz oldu: %s"
+
+#: refs.c:2023
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "'%s' baลŸvurusu iรงin birden รงok gรผncellemeye izin verilmiyor"
+
+#: refs.c:2055
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "baลŸvuru gรผncellemeleri karantina ortamฤฑ iรงinde yasak"
+
+#: refs.c:2151 refs.c:2181
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' mevcut; '%s' oluลŸturulamฤฑyor"
+
+#: refs.c:2157 refs.c:2192
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "'%s' ve '%s' aynฤฑ anda iลŸlenemiyor"
+
+#: refs/files-backend.c:1233
+#, c-format
+msgid "could not remove reference %s"
+msgstr "%s baลŸvurusu kaldฤฑrฤฑlamadฤฑ"
+
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "%s baลŸvurusu silinemedi: %s"
+
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
+#, c-format
+msgid "could not delete references: %s"
+msgstr "baลŸvurular silinemedi: %s"
+
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "geรงersiz baลŸvuru belirteci '%s'"
+
+#: ref-filter.c:42 wt-status.c:1938
+msgid "gone"
+msgstr "gitti"
+
+#: ref-filter.c:43
+#, c-format
+msgid "ahead %d"
+msgstr "%d รถnรผnde"
+
+#: ref-filter.c:44
+#, c-format
+msgid "behind %d"
+msgstr "%d arkasฤฑnda"
+
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "%d รถnรผnde, %d arkasฤฑnda"
+
+#: ref-filter.c:165
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "beklenen biรงim: %%(color:<renk>)"
+
+#: ref-filter.c:167
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "tanฤฑmlanamayan renk: %%(color:%s)"
+
+#: ref-filter.c:189
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Tamsayฤฑ deฤŸeri ลŸunu bekliyordu: refname:lstrip=%s"
+
+#: ref-filter.c:193
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Tamsayฤฑ deฤŸeri ลŸunu bekliyordu: refname:rstrip=%s"
+
+#: ref-filter.c:195
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "tanฤฑmlanamayan %%(%s) deฤŸiลŸkeni: %s"
+
+#: ref-filter.c:250
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) deฤŸiลŸken almฤฑyor"
+
+#: ref-filter.c:272
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "tanฤฑmlanamayan %%(objectsize) deฤŸiลŸkeni: %s"
+
+#: ref-filter.c:280
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) deฤŸiลŸken almฤฑyor"
+
+#: ref-filter.c:292
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) deฤŸiลŸken almฤฑyor"
+
+#: ref-filter.c:301
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) deฤŸiลŸken almฤฑyor"
+
+#: ref-filter.c:323
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "bilinmeyen %%(trailers) deฤŸiลŸkeni: %s"
+
+#: ref-filter.c:352
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "pozitif deฤŸer ลŸunu bekliyordu: contents:lines=%s"
+
+#: ref-filter.c:354
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "tanฤฑmlanamayan %%(contents) deฤŸiลŸkeni: %s"
+
+#: ref-filter.c:369
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "pozitif deฤŸer ลŸunu bekliyordu: objectname:short=%s"
+
+#: ref-filter.c:373
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "tanฤฑmlanamayan %%(objectname) deฤŸiลŸkeni: %s"
+
+#: ref-filter.c:403
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "beklenen biรงim: %%(align:<geniลŸlik>,<konum>)"
+
+#: ref-filter.c:415
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "tanฤฑmlanamayan konum:%s"
+
+#: ref-filter.c:422
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "tanฤฑmlanamayan geniลŸlik:%s"
+
+#: ref-filter.c:431
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "tanฤฑmlanamayan %%(align) deฤŸiลŸkeni: %s"
+
+#: ref-filter.c:439
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "pozitif geniลŸlik %%(align) รถgeciฤŸi ile birlikte bekleniyordu"
+
+#: ref-filter.c:457
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "tanฤฑmlanamayan %%(if) deฤŸiลŸkeni: %s"
+
+#: ref-filter.c:559
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "hatalฤฑ oluลŸturulmuลŸ alan adฤฑ: %.*s"
+
+#: ref-filter.c:586
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "bilinmeyen alan adฤฑ: %.*s"
+
+#: ref-filter.c:590
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"bir git deposu deฤŸil, ancak '%.*s' alanฤฑ nesne verisine eriลŸim gerektiriyor"
+
+#: ref-filter.c:714
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "biรงim: %%(if) รถgeciฤŸi bir %%(then) รถgeciฤŸi olmadan kullanฤฑldฤฑ"
+
+#: ref-filter.c:777
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "biรงim: %%(then) รถgeciฤŸi bir %%(if) รถgeciฤŸi olmadan kullanฤฑldฤฑ"
+
+#: ref-filter.c:779
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "biรงim: %%(then) รถgeciฤŸi birden รงok kez kullanฤฑldฤฑ"
+
+#: ref-filter.c:781
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "biรงim: %%(then) รถgeciฤŸi %%(else) รถgeciฤŸinden sonra kullanฤฑldฤฑ"
+
+#: ref-filter.c:809
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "biรงim: %%(else) รถgeciฤŸi bir %%(if) รถgeciฤŸi olmadan kullanฤฑldฤฑ"
+
+#: ref-filter.c:811
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "biรงim: %%(else) รถgeciฤŸi bir %%(then) รถgeciฤŸi olmadan kullanฤฑldฤฑ"
+
+#: ref-filter.c:813
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "biรงim: %%(else) รถgeciฤŸi birden รงok kez kullanฤฑldฤฑ"
+
+#: ref-filter.c:828
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "biรงim: %%(end) รถgeciฤŸi eลŸ รถgeciฤŸi olmadan kullanฤฑldฤฑ"
+
+#: ref-filter.c:885
+#, c-format
+msgid "malformed format string %s"
+msgstr "hatalฤฑ oluลŸturulmuลŸ biรงim dizisi %s"
+
+#: ref-filter.c:1488
+#, c-format
+msgid "no branch, rebasing %s"
+msgstr "dal yok, %s yeniden temellendiriliyor"
+
+#: ref-filter.c:1491
+#, c-format
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "dal yok, ayrฤฑk HEAD %s yeniden temellendiriliyor"
+
+#: ref-filter.c:1494
+#, c-format
+msgid "no branch, bisect started on %s"
+msgstr "dal yok, ikili arama %s รผzerinde baลŸladฤฑ"
+
+#: ref-filter.c:1504
+msgid "no branch"
+msgstr "dal yok"
+
+#: ref-filter.c:1540 ref-filter.c:1749
+#, c-format
+msgid "missing object %s for %s"
+msgstr "eksik nesne %s (%s iรงin)"
+
+#: ref-filter.c:1550
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer %s รผzerinde baลŸarฤฑsฤฑz oldu (%s iรงin)"
+
+#: ref-filter.c:2004
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "'%s' konumunda hatalฤฑ oluลŸturulmuลŸ nesne"
+
+#: ref-filter.c:2093
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "bozuk ada iye %s baลŸvurusu yok sayฤฑlฤฑyor"
+
+#: ref-filter.c:2389
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "biรงim: %%(end) รถgeciฤŸi eksik"
+
+#: ref-filter.c:2489
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "'%s' seรงeneฤŸi --merged ile uyumsuz"
+
+#: ref-filter.c:2492
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "'%s' seรงeneฤŸi --no-merged ile uyumsuz"
+
+#: ref-filter.c:2502
+#, c-format
+msgid "malformed object name %s"
+msgstr "hatalฤฑ oluลŸturulmuลŸ nesne adฤฑ %s"
+
+#: ref-filter.c:2507
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "'%s' bir gรถnderiye iลŸaret etmeli"
+
+#: remote.c:366
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "uzak konum yapฤฑlandฤฑrma stenografisi '/' ile baลŸlayamaz: %s"
+
+#: remote.c:414
+msgid "more than one receivepack given, using the first"
+msgstr "birden fazla receivepack verildi, birincisi kullanฤฑlฤฑyor"
+
+#: remote.c:422
+msgid "more than one uploadpack given, using the first"
+msgstr "birden fazla uploadpack verildi, birincisi kullanฤฑlฤฑyor"
+
+#: remote.c:612
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Hem %s hem %s ลŸuraya getirilemiyor: %s"
+
+#: remote.c:616
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s genelde %s รถgesini izler, %s deฤŸil"
+
+#: remote.c:620
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s hem %s hem %s รถgelerini izler"
+
+#: remote.c:688
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "dizginin '%s' anahtarฤฑnda'*' yoktu"
+
+#: remote.c:698
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "dizginin '%s' deฤŸerinde '*' yok"
+
+#: remote.c:1004
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "kaynak baลŸvuru belirteci %s baลŸka hiรงbir ลŸeyle eลŸleลŸmiyor"
+
+#: remote.c:1009
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "kaynak baลŸvuru belirteci %s birden fazlasฤฑ ile eลŸleลŸiyor"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1024
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"SaฤŸladฤฑฤŸฤฑnฤฑz kaynak tam bir baลŸvuru belirteci deฤŸil (รถrneฤŸin \"refs/\"\n"
+"ile baลŸlamฤฑyor. Bununla ne demek istediฤŸinizi bulabilmek iรงin:\n"
+"\n"
+"- Uzak konumda '%s' ile eลŸleลŸen bir baลŸvuru aradฤฑk.\n"
+"- ฤฐtilen <kaynak>'ฤฑn ('%s') \"refs/{heads,tags}/\" iรงinde bir\n"
+"  baลŸvuru olup olmadฤฑฤŸฤฑna baktฤฑk. EฤŸer รถyleyse uzak konum tarafฤฑnda\n"
+"  eลŸleลŸen bir refs/{heads,tags}/ รถneki ekledik.\n"
+"\n"
+"Hiรงbiri iลŸe yaramadฤฑ, biz de bฤฑraktฤฑk. BaลŸvuruyu tam olarak "
+"nitelendirmelisiniz."
+
+#: remote.c:1044
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"BaลŸvuru belirtecinin <kaynak> kฤฑsmฤฑ bir gรถnderi nesnesi.\n"
+"'%s:refs/heads/%s' konumuna iterek yeni bir dal mฤฑ\n"
+"oluลŸturmak istediniz?"
+
+#: remote.c:1049
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"BaลŸvuru belirtecinin <kaynak> kฤฑsmฤฑ bir etiket nesnesi.\n"
+"'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n"
+"oluลŸturmak istediniz?"
+
+#: remote.c:1054
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"BaลŸvuru belirtecinin <kaynak> kฤฑsmฤฑ bir aฤŸaรง nesnesi.\n"
+"'%s:refs/tags/%s' konumuna iterek yeni bir aฤŸaรง mฤฑ\n"
+"etiketlemek istediniz?"
+
+#: remote.c:1059
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"BaลŸvuru belirtecinin <kaynak> kฤฑsmฤฑ ikili bir nesne.\n"
+"'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n"
+"etiketlemek istediniz?"
+
+#: remote.c:1095
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s dala รงรถzรผlemiyor"
+
+#: remote.c:1106
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "'%s' silinemiyor: uzak baลŸvuru yok"
+
+#: remote.c:1118
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "hedef baลŸvuru belirteci %s birden fazlasฤฑ ile eลŸleลŸiyor"
+
+#: remote.c:1125
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "hedef baลŸvurusu %s birden รงok kaynaktan alฤฑyor"
+
+#: remote.c:1628 remote.c:1729
+msgid "HEAD does not point to a branch"
+msgstr "HEAD bir dala iลŸaret etmiyor"
+
+#: remote.c:1637
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "bรถyle bir dal yok: '%s'"
+
+#: remote.c:1640
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "'%s' dalฤฑ iรงin รผstkaynak yapฤฑlandฤฑrmasฤฑ yok"
+
+#: remote.c:1646
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "รผstkaynak dalฤฑ '%s' bir uzak izleme dalฤฑ olarak depolanmฤฑyor"
+
+#: remote.c:1661
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "itme hedefi '%s' ('%s' uzak konumunda) yerel izleme dalฤฑna iye deฤŸil"
+
+#: remote.c:1673
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "'%s' dalฤฑnฤฑn itme iรงin uzak konumu yok"
+
+#: remote.c:1683
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "'%s' iรงin olan baลŸvuru belirteรงleri '%s' iรงermiyor"
+
+#: remote.c:1696
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "itilecek bir hedef yok (push.default: 'nothing')"
+
+#: remote.c:1718
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "tek bir konuma 'simple' itme รงรถzรผlemiyor"
+
+#: remote.c:1844
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "uzak baลŸvuru %s bulunamadฤฑ"
+
+#: remote.c:1857
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* EฤŸlenceli baลŸvuru '%s' yerel olarak yok sayฤฑlฤฑyor"
+
+#: remote.c:2020
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Dalฤฑnฤฑz '%s' temelli, ancak รผstkaynak gitmiลŸ.\n"
+
+#: remote.c:2024
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (dรผzeltmek iรงin \"git branch --unset-upstream\" kullan)\n"
+
+#: remote.c:2027
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Dalฤฑnฤฑz '%s' ile gรผncel.\n"
+
+#: remote.c:2031
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Sizin dalฤฑnฤฑz ve '%s' baลŸka gรถnderilere baลŸvuruyor.\n"
+
+#: remote.c:2034
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (ayrฤฑntฤฑlar iรงin \"%s\" kullanฤฑn)\n"
+
+#: remote.c:2038
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Dalฤฑnฤฑz '%s' dalฤฑndan %d gรถnderi ileride.\n"
+msgstr[1] "Dalฤฑnฤฑz '%s' dalฤฑndan %d gรถnderi ileride.\n"
+
+#: remote.c:2044
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (yerel gรถnderilerinizi yayฤฑmlamak iรงin \"git push\" kullanฤฑn)\n"
+
+#: remote.c:2047
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "Dalฤฑnฤฑz '%s' dalฤฑndan %d gรถnderi geride ve ileri sarฤฑlabilir.\n"
+msgstr[1] "Dalฤฑnฤฑz '%s' dalฤฑndan %d gรถnderi geride ve ileri sarฤฑlabilir.\n"
+
+#: remote.c:2055
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (yerel dalฤฑnฤฑzฤฑ gรผncellemek iรงin \"git pull\" kullanฤฑn)\n"
+
+#: remote.c:2058
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Sizin dalฤฑnฤฑz ve '%s' birbirinden uzaklaลŸmฤฑลŸ ve sฤฑrasฤฑyla\n"
+"her birinde %d ve %d gรถnderi var.\n"
+msgstr[1] ""
+"Sizin dalฤฑnฤฑz ve '%s' birbirinden uzaklaลŸmฤฑลŸ ve sฤฑrasฤฑyla\n"
+"her birinde %d ve %d gรถnderi var.\n"
+
+#: remote.c:2068
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  (uzak dalฤฑ kendi dalฤฑnฤฑza birleลŸtirmek iรงin \"git pull\" kullanฤฑn)\n"
+
+#: remote.c:2251
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "beklenen nesne adฤฑ '%s' ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "hatalฤฑ deฤŸiลŸtirme baลŸvurusu adฤฑ: %s"
+
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "yinelenmiลŸ deฤŸiลŸtirme baลŸvurusu: %s"
+
+#: replace-object.c:82
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "%s nesnesi iรงin deฤŸiลŸtirme derinliฤŸi pek yรผksek"
+
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
+msgstr "hasar gรถrmรผลŸ MERGE_RR"
+
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
+msgstr "rerere kaydฤฑ yazฤฑlamฤฑyor"
+
+#: rerere.c:495
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "'%s' yazฤฑlฤฑrken hatalar vardฤฑ (%s)"
+
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "'%s' floลŸ yapฤฑlamadฤฑ"
+
+#: rerere.c:503 rerere.c:1039
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "'%s' iรงindeki รงakฤฑลŸan parรงalar ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "'%s' รผzerinde utime() baลŸarฤฑsฤฑz"
+
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
+msgstr "'%s' yazฤฑlamadฤฑ"
+
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "'%s' bir รถnceki รงรถzรผm kullanฤฑlarak hazฤฑrlama alanฤฑna alฤฑndฤฑ"
+
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "'%s' iรงin รงรถzรผm kaydedildi."
+
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "'%s' bir รถnceki รงรถzรผm kullanฤฑlarak รงรถzรผldรผ."
+
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "'%s' baลŸฤฑboลŸunun baฤŸlantฤฑsฤฑ kesilemiyor"
+
+#: rerere.c:807
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "'%s' iรงin รถngรถrรผntรผ kaydedildi"
+
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "'%s' dizini oluลŸturulamadฤฑ"
+
+#: rerere.c:1057
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "'%s' iรงindeki รงakฤฑลŸan durum gรผncellenemedi"
+
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "'%s' iรงin hatฤฑrlanan รงรถzรผm yok"
+
+#: rerere.c:1077
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "'%s' baฤŸlantฤฑsฤฑ kesilemiyor"
+
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "'%s' iรงin รถngรถrรผntรผ gรผncellendi"
+
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "'%s' iรงin รงรถzรผm unutuldu\n"
+
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
+msgstr "rr-cache dizini aรงฤฑlamฤฑyor"
+
+#: revision.c:2497
+msgid "your current branch appears to be broken"
+msgstr "geรงerli dalฤฑnฤฑz bozuk gibi gรถrรผnรผyor"
+
+#: revision.c:2500
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "geรงerli dalฤฑnฤฑz '%s' iรงinde henรผz bir gรถnderi yok"
+
+#: revision.c:2708
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent, --bisect ile uyumsuz"
+
+#: revision.c:2712
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L, -p ve -s dฤฑลŸฤฑnda baลŸka diff biรงimlerini henรผz desteklemiyor"
+
+#: run-command.c:763
+msgid "open /dev/null failed"
+msgstr "/dev/null aรงฤฑlamadฤฑ"
+
+#: run-command.c:1269
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "async iลŸ parรงacฤฑฤŸฤฑ oluลŸturulamadฤฑ: %s"
+
+#: run-command.c:1333
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"'%s' kancasฤฑ yok sayฤฑldฤฑ รงรผnkรผ bir รงalฤฑลŸtฤฑrฤฑlabilir olarak ayarlanmamฤฑลŸ.\n"
+"Bu uyarฤฑyฤฑ 'git config advice.ignoredHook false' ile kapatabilirsiniz."
+
+#: send-pack.c:144
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "uzak konum aรงฤฑm durumu okunurken beklenmedik floลŸ paketi"
+
+#: send-pack.c:146
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "uzak konum aรงฤฑm durumu ayrฤฑลŸtฤฑrฤฑlamadฤฑ: %s"
+
+#: send-pack.c:148
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "uzak konum aรงฤฑmฤฑ baลŸarฤฑsฤฑz: %s"
+
+#: send-pack.c:309
+msgid "failed to sign the push certificate"
+msgstr "itme sertifikasฤฑ imzalanamadฤฑ"
+
+#: send-pack.c:423
+msgid "the receiving end does not support --signed push"
+msgstr "alฤฑcฤฑ uรง --signed itmeyi desteklemiyor"
+
+#: send-pack.c:425
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"alฤฑcฤฑ uรง --signed itmeyi desteklemediฤŸinden dolayฤฑ bir itme sertifikasฤฑ "
+"gรถnderilmiyor"
+
+#: send-pack.c:437
+msgid "the receiving end does not support --atomic push"
+msgstr "alฤฑcฤฑ uรง --atomic itmeyi desteklemiyor"
+
+#: send-pack.c:442
+msgid "the receiving end does not support push options"
+msgstr "alฤฑcฤฑ uรง itme seรงeneklerini desteklemiyor"
+
+#: sequencer.c:191
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "geรงersiz gรถnderi iletisi temizleme kipi '%s'"
+
+#: sequencer.c:296
+#, c-format
+msgid "could not delete '%s'"
+msgstr "'%s' silinemedi"
+
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#, c-format
+msgid "could not remove '%s'"
+msgstr "'%s' kaldฤฑrฤฑlamadฤฑ"
+
+#: sequencer.c:325
+msgid "revert"
+msgstr "geri al"
+
+#: sequencer.c:327
+msgid "cherry-pick"
+msgstr "seรง-al"
+
+#: sequencer.c:329
+msgid "rebase"
+msgstr "yeniden temellendir"
+
+#: sequencer.c:331
+#, c-format
+msgid "unknown action: %d"
+msgstr "bilinmeyen eylem: %d"
+
+#: sequencer.c:389
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"รงakฤฑลŸmalarฤฑ รงรถzdรผkten sonra doฤŸrusu verilen yollarฤฑ 'git add <yollar>'\n"
+"veya 'git rm <yollar>' ile imleyin"
+
+#: sequencer.c:392
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'\n"
+"and commit the result with 'git commit'"
+msgstr ""
+"รงakฤฑลŸmalarฤฑ รงรถzdรผkten sonra doฤŸrusu verilen yollarฤฑ 'git add <yollar>'\n"
+"veya 'git rm <yollar>' ile imleyin ve รงฤฑkan sonucu\n"
+"'git commit' ile gรถnderin"
+
+#: sequencer.c:405 sequencer.c:2901
+#, c-format
+msgid "could not lock '%s'"
+msgstr "'%s' kilitlenemedi"
+
+#: sequencer.c:412
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "satฤฑr sonu ลŸuraya yazฤฑlamadฤฑ: '%s'"
+
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "'%s' tamamlanamadฤฑ"
+
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
+#, c-format
+msgid "could not read '%s'"
+msgstr "'%s' okunamadฤฑ"
+
+#: sequencer.c:466
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "%s ile yerel deฤŸiลŸikliklerinizin รผzerine yazฤฑlacaktฤฑr."
+
+#: sequencer.c:470
+msgid "commit your changes or stash them to proceed."
+msgstr "ฤฐlerlemek iรงin deฤŸiลŸikliklerinizi gรถnderin veya zulalayฤฑn."
+
+#: sequencer.c:502
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: ileri sar"
+
+#: sequencer.c:541 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Geรงersiz temizlik kipi %s"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c:635
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Yeni indeks dosyasฤฑ yazฤฑlamฤฑyor"
+
+#: sequencer.c:652
+msgid "unable to update cache tree"
+msgstr "รถnbellek aฤŸacฤฑ gรผncellenemiyor"
+
+#: sequencer.c:666
+msgid "could not resolve HEAD commit"
+msgstr "HEAD gรถnderisi รงรถzรผlemedi"
+
+#: sequencer.c:746
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "'%.*s' iรงinde bir anahtar yok"
+
+#: sequencer.c:757
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "'%s' รถgesinin tฤฑrnaklarฤฑ kaldฤฑrฤฑlamฤฑyor"
+
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "'%s' okuma iรงin aรงฤฑlamadฤฑ"
+
+#: sequencer.c:804
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' halihazฤฑrda verilmiลŸ"
+
+#: sequencer.c:809
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' halihazฤฑrda verilmiลŸ"
+
+#: sequencer.c:814
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' halihazฤฑrda verilmiลŸ"
+
+#: sequencer.c:818
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "bilinmeyen deฤŸiลŸken '%s'"
+
+#: sequencer.c:823
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "'GIT_AUTHOR_NAME' eksik"
+
+#: sequencer.c:825
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "'GIT_AUTHOR_EMAIL' eksik"
+
+#: sequencer.c:827
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "'GIT_AUTHOR_DATE' eksik"
+
+#: sequencer.c:876
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"ร‡alฤฑลŸma aฤŸacฤฑnฤฑzda hazฤฑrlanmฤฑลŸ deฤŸiลŸiklikleriniz var.\n"
+"Bu deฤŸiลŸikliklerin bir รถnceki gรถnderiyle gitmiลŸ olmasฤฑ gerekiyorsa:\n"
+"\n"
+"\tgit commit --amend %s komutunu รงalฤฑลŸtฤฑrฤฑn.\n"
+"\n"
+"Bunlar iรงin yeni bir gรถnderi hazฤฑrlamak istiyorsanฤฑz:\n"
+"\n"
+"\tgit commit %s komutunu รงalฤฑลŸtฤฑrฤฑn.\n"
+"\n"
+"Her iki durumda da iลŸiniz bittikten sonra:\n"
+"\n"
+"\tgit rebase --continue komutu ile sรผrdรผrรผn.\n"
+
+#: sequencer.c:1148
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' baลŸarฤฑsฤฑz oldu"
+
+#: sequencer.c:1154
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Adฤฑnฤฑz ve e-posta adresiniz kullanฤฑcฤฑ adฤฑnฤฑz ve makine adฤฑ temel alฤฑnarak\n"
+"kendiliฤŸinden yapฤฑlandฤฑrฤฑldฤฑ. Lรผtfen doฤŸru olup olmadฤฑฤŸฤฑnฤฑ denetleyin.\n"
+"Bu iletiyi onlarฤฑ el ile belirterek gizleyebilirsiniz. AลŸaฤŸฤฑdaki komutu\n"
+"รงalฤฑลŸtฤฑrฤฑn ve yapฤฑlandฤฑrma dosyanฤฑzฤฑ dรผzenlemek iรงin dรผzenleyicinizdeki\n"
+"yรถnergeleri izleyin:\n"
+"\n"
+"\tgit config --global --edit\n"
+"\n"
+"Bundan sonra bu gรถnderi iรงin kullanฤฑlan kimliฤŸi dรผzeltmek isteyebilirsiniz:\n"
+"\n"
+"\tgit commit --amend --reset-author\n"
+
+#: sequencer.c:1167
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Adฤฑnฤฑz ve e-posta adresiniz kullanฤฑcฤฑ adฤฑnฤฑz ve makine adฤฑ temel alฤฑnarak\n"
+"kendiliฤŸinden yapฤฑlandฤฑrฤฑldฤฑ. Lรผtfen doฤŸru olup olmadฤฑฤŸฤฑnฤฑ denetleyin.\n"
+"Bu iletiyi onlarฤฑ el ile belirterek gizleyebilirsiniz:\n"
+"\n"
+"\tgit config --global user.name \"Adฤฑnฤฑz\"\n"
+"\tgit config --global user.email \"siz@e-posta.com\"\n"
+"\n"
+"Bundan sonra bu gรถnderi iรงin kullanฤฑlan kimliฤŸi dรผzeltmek isteyebilirsiniz:\n"
+"\n"
+"\tgit commit --amend --reset-author\n"
+
+#: sequencer.c:1209
+msgid "couldn't look up newly created commit"
+msgstr "yeni oluลŸturulan gรถnderi aranamadฤฑ"
+
+#: sequencer.c:1211
+msgid "could not parse newly created commit"
+msgstr "yeni oluลŸturulan gรถnderi ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: sequencer.c:1257
+msgid "unable to resolve HEAD after creating commit"
+msgstr "HEAD, gรถnderi oluลŸturduktan sonra รงรถzรผlemiyor"
+
+#: sequencer.c:1259
+msgid "detached HEAD"
+msgstr "ayrฤฑk HEAD"
+
+#: sequencer.c:1263
+msgid " (root-commit)"
+msgstr " (kรถk gรถnderi)"
+
+#: sequencer.c:1284
+msgid "could not parse HEAD"
+msgstr "HEAD ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: sequencer.c:1286
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s bir gรถnderi deฤŸil"
+
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+msgid "could not parse HEAD commit"
+msgstr "HEAD gรถnderisi ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: sequencer.c:1342 sequencer.c:1968
+msgid "unable to parse commit author"
+msgstr "gรถnderi yazarฤฑ ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree bir aฤŸaca yazamadฤฑ"
+
+#: sequencer.c:1386 sequencer.c:1447
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "'%s' konumundan gรถnderi iletisi okunamฤฑyor"
+
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
+msgid "failed to write commit object"
+msgstr "gรถnderi nesnesi yazฤฑlamadฤฑ"
+
+#: sequencer.c:1474
+#, c-format
+msgid "could not parse commit %s"
+msgstr "%s gรถnderisi ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: sequencer.c:1479
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "รผst gรถnderi %s ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: sequencer.c:1562 sequencer.c:1673
+#, c-format
+msgid "unknown command: %d"
+msgstr "bilinmeyen komut: %d"
+
+#: sequencer.c:1620 sequencer.c:1645
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Bu %d gรถnderinin bir birleลŸimi."
+
+#: sequencer.c:1630
+msgid "need a HEAD to fixup"
+msgstr "dรผzeltmek iรงin bir HEAD gerekiyor"
+
+#: sequencer.c:1632 sequencer.c:3212
+msgid "could not read HEAD"
+msgstr "HEAD okunamadฤฑ"
+
+#: sequencer.c:1634
+msgid "could not read HEAD's commit message"
+msgstr "HEAD'in gรถnderi iletisi okunamadฤฑ"
+
+#: sequencer.c:1640
+#, c-format
+msgid "cannot write '%s'"
+msgstr "'%s' yazฤฑlamฤฑyor"
+
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+msgid "This is the 1st commit message:"
+msgstr "Birinci gรถnderi iletisi bu:"
+
+#: sequencer.c:1655
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "%s gรถnderi iletisi okunamadฤฑ"
+
+#: sequencer.c:1662
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Gรถnderi iletisi #%d bu:"
+
+#: sequencer.c:1668
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Gรถnderi iletisi #%d atlanacak:"
+
+#: sequencer.c:1756
+msgid "your index file is unmerged."
+msgstr "indeks dosyanฤฑz birleลŸtirilmemiลŸ"
+
+#: sequencer.c:1763
+msgid "cannot fixup root commit"
+msgstr "kรถk gรถnderi dรผzeltilemiyor"
+
+#: sequencer.c:1782
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "%s gรถnderisi bir birleลŸtirme, ancak bir -m seรงeneฤŸi verilmedi."
+
+#: sequencer.c:1790 sequencer.c:1798
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "%s gรถnderisinin %d diye bir รผst รถgesi yok"
+
+#: sequencer.c:1804
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "%s gรถnderi iletisi alฤฑnamฤฑyor"
+
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1823
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: รผst gรถnderi %s ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: sequencer.c:1888
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "'%s', '%s' olarak yeniden adlandฤฑrฤฑlamadฤฑ"
+
+#: sequencer.c:1943
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "%s geri alฤฑnamadฤฑ... %s"
+
+#: sequencer.c:1944
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "%s uygulanamadฤฑ... %s"
+
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "%s %s bฤฑrakฤฑlฤฑyor -- yama iรงeriฤŸi halihazฤฑrda รผstkaynakta\n"
+
+#: sequencer.c:2018
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: indeks okunamadฤฑ"
+
+#: sequencer.c:2025
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: indeks yenilenemedi"
+
+#: sequencer.c:2102
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s deฤŸiลŸken kabul etmiyor: '%s'"
+
+#: sequencer.c:2111
+#, c-format
+msgid "missing arguments for %s"
+msgstr "%s iรงin eksik deฤŸiลŸken"
+
+#: sequencer.c:2142
+#, c-format
+msgid "could not parse '%s'"
+msgstr "'%s' ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: sequencer.c:2203
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "geรงersiz satฤฑr %d: %.*s"
+
+#: sequencer.c:2214
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "รถncesinde bir gรถnderi olmadan '%s' yapฤฑlamฤฑyor"
+
+#: sequencer.c:2298
+msgid "cancelling a cherry picking in progress"
+msgstr "sรผrmekte olan bir seรง-al iptal ediliyor"
+
+#: sequencer.c:2305
+msgid "cancelling a revert in progress"
+msgstr "sรผrmekte olan bir geri al iptal ediliyor"
+
+#: sequencer.c:2349
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "lรผtfen bunu 'git rebase --edit-todo' kullanarak onarฤฑn."
+
+#: sequencer.c:2351
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "kullanฤฑlabilir olmayan yรถnerge tablosu: '%s'"
+
+#: sequencer.c:2356
+msgid "no commits parsed."
+msgstr "Hiรงbir gรถnderi ayrฤฑลŸtฤฑrฤฑlmadฤฑ."
+
+#: sequencer.c:2367
+msgid "cannot cherry-pick during a revert."
+msgstr "bir geri al sฤฑrasฤฑnda seรง-al yapฤฑlamฤฑyor"
+
+#: sequencer.c:2369
+msgid "cannot revert during a cherry-pick."
+msgstr "bir seรง-al sฤฑrasฤฑnda geri al yapฤฑlamฤฑyor"
+
+#: sequencer.c:2447
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "%s iรงin geรงersiz deฤŸer: %s"
+
+#: sequencer.c:2540
+msgid "unusable squash-onto"
+msgstr "kullanฤฑlabilir olmayan squash-onto"
+
+#: sequencer.c:2556
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "hatalฤฑ oluลŸturulmuลŸ seรงenekler tablosu: '%s'"
+
+#: sequencer.c:2644 sequencer.c:4361
+msgid "empty commit set passed"
+msgstr "boลŸ gรถnderi seti aktarฤฑldฤฑ"
+
+#: sequencer.c:2660
+msgid "revert is already in progress"
+msgstr "geri al halihazฤฑrda sรผrรผyor"
+
+#: sequencer.c:2662
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
+
+#: sequencer.c:2665
+msgid "cherry-pick is already in progress"
+msgstr "seรง-al halihazฤฑrda sรผrรผyor"
+
+#: sequencer.c:2667
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin"
+
+#: sequencer.c:2681
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "ardฤฑลŸtฤฑrฤฑcฤฑ dizini '%s' oluลŸturulamadฤฑ"
+
+#: sequencer.c:2696
+msgid "could not lock HEAD"
+msgstr "HEAD kilitlenemedi"
+
+#: sequencer.c:2756 sequencer.c:4099
+msgid "no cherry-pick or revert in progress"
+msgstr "sรผren bir seรง-al veya geri al yok"
+
+#: sequencer.c:2758 sequencer.c:2769
+msgid "cannot resolve HEAD"
+msgstr "HEAD รงรถzรผlemiyor"
+
+#: sequencer.c:2760 sequencer.c:2804
+msgid "cannot abort from a branch yet to be born"
+msgstr "daha doฤŸmamฤฑลŸ bir daldan iptal edilemiyor"
+
+#: sequencer.c:2790 builtin/grep.c:724
+#, c-format
+msgid "cannot open '%s'"
+msgstr "'%s' aรงฤฑlamฤฑyor"
+
+#: sequencer.c:2792
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "'%s' okunamฤฑyor: %s"
+
+#: sequencer.c:2793
+msgid "unexpected end of file"
+msgstr "beklenmedik dosya sonu"
+
+#: sequencer.c:2799
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "depolanmฤฑลŸ seรง-al รถncesi HEAD dosyasฤฑ '%s' hasar gรถrmรผลŸ"
+
+#: sequencer.c:2810
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "HEAD'i taลŸฤฑmฤฑลŸ gรถrรผnรผyorsunuz. Geri sarฤฑlmฤฑyor, HEAD'inizi denetleyin!"
+
+#: sequencer.c:2851
+msgid "no revert in progress"
+msgstr "sรผren bir geri al yok"
+
+#: sequencer.c:2859
+msgid "no cherry-pick in progress"
+msgstr "sรผren bir seรง-al yok"
+
+#: sequencer.c:2869
+msgid "failed to skip the commit"
+msgstr "gรถnderi atlanamadฤฑ"
+
+#: sequencer.c:2876
+msgid "there is nothing to skip"
+msgstr "atlanacak bir ลŸey yok"
+
+#: sequencer.c:2879
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"Gรถnderiyi yaptฤฑnฤฑz mฤฑ?\n"
+"\"git %s --continue\" deneyin.\""
+
+#: sequencer.c:3003 sequencer.c:4011
+#, c-format
+msgid "could not update %s"
+msgstr "%s gรผncellenemedi"
+
+#: sequencer.c:3042 sequencer.c:3991
+msgid "cannot read HEAD"
+msgstr "HEAD okunamฤฑyor"
+
+#: sequencer.c:3059
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "'%s', '%s' konumuna kopyalanamฤฑyor"
+
+#: sequencer.c:3067
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Gรถnderiyi ลŸimdi ลŸu komutla deฤŸiลŸtirebilirsiniz:\n"
+"\n"
+"\tgit commit --amend %s\n"
+"\n"
+"DeฤŸiลŸikliklerinizden memnunsanฤฑz ลŸu komutla sรผrdรผrรผn:\n"
+"\n"
+"\tgit rebase --continue\n"
+
+#: sequencer.c:3077
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "%s uygulanamฤฑyor... %.*s"
+
+#: sequencer.c:3084
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "%.*s birleลŸtirilemedi"
+
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "'%s', '%s' konumuna kopyalanamadฤฑ"
+
+#: sequencer.c:3129
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ร‡alฤฑลŸtฤฑrma baลŸarฤฑsฤฑz: %s\n"
+"%sSorunu รงรถzรผp sรผrdรผrmek iรงin ลŸunu รงalฤฑลŸtฤฑrฤฑn:\n"
+"\n"
+"\tgit rebase --continue\n"
+"\n"
+
+#: sequencer.c:3135
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "ve indekse ve/veya รงalฤฑลŸma aฤŸacฤฑna deฤŸiลŸiklikler yapฤฑldฤฑ\n"
+
+#: sequencer.c:3141
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ร‡alฤฑลŸtฤฑrma baลŸarฤฑlฤฑ oldu: %s,\n"
+"ancak indeksinize ve/veya รงalฤฑลŸma aฤŸacฤฑnฤฑza deฤŸiลŸiklikler bฤฑraktฤฑ\n"
+"DeฤŸiลŸikliklerinizi gรถnderin veya zulalayฤฑn, ardฤฑndan ลŸunu รงalฤฑลŸtฤฑrฤฑn:\n"
+"\n"
+"\tgit rebase --continue\n"
+"\n"
+
+#: sequencer.c:3202
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "izin verilmeyen etiket adฤฑ: '%.*s'"
+
+#: sequencer.c:3256
+msgid "writing fake root commit"
+msgstr "sahte kรถk gรถnderi yazฤฑlฤฑyor"
+
+#: sequencer.c:3261
+msgid "writing squash-onto"
+msgstr "squash-onto yazฤฑlฤฑyor"
+
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "ลŸunun aฤŸacฤฑ bulunamadฤฑ: %s"
+
+#: sequencer.c:3344
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "'%s' รงรถzรผlemedi"
+
+#: sequencer.c:3375
+msgid "cannot merge without a current revision"
+msgstr "gรผncel bir revizyon olmadan birleลŸtirilemiyor"
+
+#: sequencer.c:3397
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "'%.*s' ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: sequencer.c:3406
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "birleลŸtirilecek bir ลŸey yok: '%.*s'"
+
+#: sequencer.c:3418
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "ahtapot birleลŸtirmesi bir [yeni kรถk]รผn รผzerinde รงalฤฑลŸtฤฑrฤฑlamaz"
+
+#: sequencer.c:3434
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "'%s' gรถnderisinin gรถnderi iletisi alฤฑnamadฤฑ"
+
+#: sequencer.c:3594
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "ลŸunu birleลŸtirme giriลŸiminde bulunulamadฤฑ bile: '%.*s'"
+
+#: sequencer.c:3610
+msgid "merge: Unable to write new index file"
+msgstr "merge: Yeni indeks dosyasฤฑ yazฤฑlamฤฑyor"
+
+#: sequencer.c:3679 builtin/rebase.c:737
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "KendiliฤŸinden zulalama uygulandฤฑ.\n"
+
+#: sequencer.c:3691
+#, c-format
+msgid "cannot store %s"
+msgstr "%s depolanamฤฑyor"
+
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#, c-format
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"KendiliฤŸinden zulalama uygulamasฤฑ รงakฤฑลŸmalara neden oldu.\n"
+"DeฤŸiลŸiklikleriniz zula iรงerisinde gรผvende.\n"
+"ฤฐstediฤŸiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
+
+#: sequencer.c:3755
+#, c-format
+msgid "%s: not a valid OID"
+msgstr "%s: geรงerli bir OID deฤŸil"
+
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+msgid "could not detach HEAD"
+msgstr "HEAD ayrฤฑlamadฤฑ"
+
+#: sequencer.c:3775
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "HEAD'de duruldu\n"
+
+#: sequencer.c:3777
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "%s konumunda duruldu\n"
+
+#: sequencer.c:3785
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"todo komutu รงalฤฑลŸtฤฑrฤฑlamadฤฑ.\n"
+"\n"
+"\t%.*s\n"
+"Yeniden zamanlandฤฑ; sรผrdรผrmeden รถnce komutu dรผzenlemek iรงin lรผtfen\n"
+"รถnce yapฤฑlacaklar listesini dรผzenleyin:\n"
+"\n"
+"\tgit rebase --edit-todo\n"
+"\tgit rebase --continue\n"
+
+#: sequencer.c:3869
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "%s konumunda duruldu... %.*s\n"
+
+#: sequencer.c:3940
+#, c-format
+msgid "unknown command %d"
+msgstr "bilinmeyen komut %d"
+
+#: sequencer.c:3999
+msgid "could not read orig-head"
+msgstr "orig-head okunamadฤฑ"
+
+#: sequencer.c:4004
+msgid "could not read 'onto'"
+msgstr "'onto' okunamadฤฑ"
+
+#: sequencer.c:4018
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "HEAD ลŸuraya gรผncellenemedi: %s"
+
+#: sequencer.c:4111
+msgid "cannot rebase: You have unstaged changes."
+msgstr "Yeniden temellendirilemiyor: HazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikleriniz var."
+
+#: sequencer.c:4120
+msgid "cannot amend non-existing commit"
+msgstr "var olmayan gรถnderi deฤŸiลŸtirilemiyor"
+
+#: sequencer.c:4122
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "geรงersiz dosya: '%s'"
+
+#: sequencer.c:4124
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "geรงersiz iรงerik: '%s'"
+
+#: sequencer.c:4127
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"ร‡alฤฑลŸma aฤŸacฤฑnฤฑzda gรถnderilmemiลŸ deฤŸiลŸiklikleriniz var. Lรผtfen รถnce\n"
+"onlarฤฑ gรถnderin ve ardฤฑndan 'git rebase --continue' yapฤฑn."
+
+#: sequencer.c:4163 sequencer.c:4202
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "dosya yazฤฑlamadฤฑ: '%s'"
+
+#: sequencer.c:4217
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "CHERRY_PICK_HEAD kaldฤฑrฤฑlamadฤฑ"
+
+#: sequencer.c:4224
+msgid "could not commit staged changes."
+msgstr "HazฤฑrlanmฤฑลŸ deฤŸiลŸiklikler gรถnderilemedi."
+
+#: sequencer.c:4338
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: Bir %s seรงip alฤฑnamฤฑyor"
+
+#: sequencer.c:4342
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s hatalฤฑ revizyon"
+
+#: sequencer.c:4377
+msgid "can't revert as initial commit"
+msgstr "ilk gรถnderi geri alฤฑnamaz"
+
+#: sequencer.c:4846
+msgid "make_script: unhandled options"
+msgstr "make_script: ele alฤฑnmayan seรงenekler"
+
+#: sequencer.c:4849
+msgid "make_script: error preparing revisions"
+msgstr "make_script: revizyonlar hazฤฑrlanฤฑrken hata"
+
+#: sequencer.c:5083 sequencer.c:5100
+msgid "nothing to do"
+msgstr "yapฤฑlacak bir ลŸey yok"
+
+#: sequencer.c:5119
+msgid "could not skip unnecessary pick commands"
+msgstr "gerekli olmayan seรงim komutlarฤฑ atlanamadฤฑ"
+
+#: sequencer.c:5213
+msgid "the script was already rearranged."
+msgstr "betik halihazฤฑrda yeniden dรผzenlenmiลŸti"
+
+#: setup.c:124
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s', '%s' konumunda depo dฤฑลŸฤฑnda"
+
+#: setup.c:175
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: ร‡alฤฑลŸma aฤŸacฤฑnda bรถyle bir yol yok.\n"
+"Yerelde var olmayan yollarฤฑ belirtmek iรงin 'git <komut> -- <yol>... kullanฤฑn."
+
+#: setup.c:188
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"Belirsiz deฤŸiลŸken '%s': ร‡alฤฑลŸma aฤŸacฤฑnda olmayan bilinmeyen revizyon veya "
+"yol.\n"
+"Yollarฤฑ revizyonlardan ayฤฑrmak iรงin '--' kullanฤฑn, ลŸรถyle:\n"
+"'git <komut> [<revizyon>...] -- [<dosya>...]'"
+
+#: setup.c:254
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "'%s' seรงeneฤŸi seรงenek olmayan deฤŸiลŸkenlerden รถnce gelmeli"
+
+#: setup.c:273
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"Belirsiz deฤŸiลŸken '%s': Hem deฤŸiลŸken hem dosya adฤฑ.\n"
+"Yollarฤฑ revizyonlardan ayฤฑrmak iรงin '--' kullanฤฑn, ลŸรถyle:\n"
+"'git <komut> [<revizyon>...] -- [<dosya>...]'"
+
+#: setup.c:409
+msgid "unable to set up work tree using invalid config"
+msgstr "geรงersiz yapฤฑlandฤฑrma kullanฤฑlarak รงalฤฑลŸma aฤŸacฤฑ kurulamฤฑyor"
+
+#: setup.c:413
+msgid "this operation must be run in a work tree"
+msgstr "bu iลŸlem bir รงalฤฑลŸma aฤŸacฤฑ iรงinde รงalฤฑลŸtฤฑrฤฑlmalฤฑ"
+
+#: setup.c:559
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Beklenen git repo sรผrรผmรผ <= %d, %d bulundu"
+
+#: setup.c:567
+msgid "unknown repository extensions found:"
+msgstr "bilinmeyen depo geniลŸletmeleri bulundu:"
+
+#: setup.c:586
+#, c-format
+msgid "error opening '%s'"
+msgstr "'%s' aรงฤฑlฤฑrken hata"
+
+#: setup.c:588
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "bir .git dosyasฤฑ olabilmek iรงin รงok bรผyรผk: '%s'"
+
+#: setup.c:590
+#, c-format
+msgid "error reading %s"
+msgstr "%s okunurken hata"
+
+#: setup.c:592
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "geรงersiz gitfile biรงimi: %s"
+
+#: setup.c:594
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "gitfile iรงinde yol yok: %s"
+
+#: setup.c:596
+#, c-format
+msgid "not a git repository: %s"
+msgstr "bir git deposu deฤŸil: %s"
+
+#: setup.c:695
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' รงok bรผyรผk"
+
+#: setup.c:709
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "bir git deposu deฤŸil: '%s'"
+
+#: setup.c:738 setup.c:740 setup.c:771
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "'%s' konumuna chdir yapฤฑlamฤฑyor"
+
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+msgid "cannot come back to cwd"
+msgstr "cwd'ye geri dรถnรผlemiyor"
+
+#: setup.c:870
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "'%*s%s%s' bilgileri alฤฑnamadฤฑ"
+
+#: setup.c:1108
+msgid "Unable to read current working directory"
+msgstr "ลžu anki รงalฤฑลŸma dizini okunamฤฑyor"
+
+#: setup.c:1117 setup.c:1123
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "ลŸuraya deฤŸiลŸtirilemiyor: '%s'"
+
+#: setup.c:1128
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "bir git deposu (veya รผst dizinlerinden birisi) deฤŸil: %s"
+
+#: setup.c:1134
+#, c-format
+msgid ""
+"not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"Bir git deposu veya (%s baฤŸlama noktasฤฑna kadar olan รผstรผ) deฤŸil\n"
+"Dosya sistemi sฤฑnฤฑrฤฑnda duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"ayarlanmamฤฑลŸ)."
+
+#: setup.c:1245
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"core.sharedRepository dosya kipi deฤŸeri ile sorun (0%.3o).\n"
+"Dosyalarฤฑn sahibinin her zaman okuma ve yazma izni olmasฤฑ gerekir."
+
+#: setup.c:1289
+msgid "open /dev/null or dup failed"
+msgstr "/dev/null aรงฤฑlmasฤฑ veya aรงฤฑklayฤฑcฤฑ รงoฤŸaltฤฑlmasฤฑ baลŸarฤฑsฤฑz"
+
+#: setup.c:1304
+msgid "fork failed"
+msgstr "รงatallama baลŸarฤฑsฤฑz"
+
+#: setup.c:1309
+msgid "setsid failed"
+msgstr "setsid baลŸarฤฑsฤฑz"
+
+#: sha1-file.c:452
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "nesne dizini %s yok; ลŸurayฤฑ denetleyin: .git/objects/info/alternates"
+
+#: sha1-file.c:503
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "alternatif nesne yolu olaฤŸanlaลŸtฤฑrฤฑlamฤฑyor: %s"
+
+#: sha1-file.c:575
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: alternatif nesne depolarฤฑ yok sayฤฑlฤฑyor, iรง iรงe geรงme pek derin"
+
+#: sha1-file.c:582
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "nesne dizini olaฤŸanlaลŸtฤฑrฤฑlamฤฑyor: %s"
+
+#: sha1-file.c:625
+msgid "unable to fdopen alternates lockfile"
+msgstr "alternatifler kilit dosyasฤฑ fdopen yapฤฑlamฤฑyor"
+
+#: sha1-file.c:643
+msgid "unable to read alternates file"
+msgstr "alternatifler dosyasฤฑ okunamฤฑyor"
+
+#: sha1-file.c:650
+msgid "unable to move new alternates file into place"
+msgstr "yeni alternatifler dosyasฤฑ yerine taลŸฤฑnamฤฑyor"
+
+#: sha1-file.c:685
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "'%s' diye bir yol yok"
+
+#: sha1-file.c:711
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"BaฤŸlantฤฑ yapฤฑlmฤฑลŸ รงฤฑkฤฑลŸ olarak '%s' baลŸvuru deposu henรผz desteklenmiyor."
+
+#: sha1-file.c:717
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "BaลŸvuru deposu '%s' yerel bir depo deฤŸil."
+
+#: sha1-file.c:723
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "baลŸvuru deposu '%s' sฤฑฤŸ"
+
+#: sha1-file.c:731
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "baลŸvuru deposu '%s' aลŸฤฑlฤฑ"
+
+#: sha1-file.c:791
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "alternatif baลŸvurular ayrฤฑลŸtฤฑrฤฑlฤฑrken geรงersiz satฤฑr: %s"
+
+#: sha1-file.c:943
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "%<PRIuMAX>, %<PRIuMAX> sฤฑnฤฑrฤฑ รผzerinden mmap yapฤฑlmaya รงalฤฑลŸฤฑlฤฑyor"
+
+#: sha1-file.c:964
+msgid "mmap failed"
+msgstr "mmap baลŸarฤฑsฤฑz"
+
+#: sha1-file.c:1128
+#, c-format
+msgid "object file %s is empty"
+msgstr "nesne dosyasฤฑ %s boลŸ"
+
+#: sha1-file.c:1263 sha1-file.c:2443
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "hasar gรถrmรผลŸ gevลŸek nesne '%s'"
+
+#: sha1-file.c:1265 sha1-file.c:2447
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "gevลŸek nesne '%s' sonunda anlamsฤฑz veri"
+
+#: sha1-file.c:1307
+msgid "invalid object type"
+msgstr "geรงersiz nesne tรผrรผ"
+
+#: sha1-file.c:1391
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "%s รผstbilgisi --allow-unknown-type ile aรงฤฑlamฤฑyor"
+
+#: sha1-file.c:1394
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "%s รผstbilgisi aรงฤฑlamฤฑyor"
+
+#: sha1-file.c:1400
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "%s รผstbilgisi paketi --allow-unknown-type ile ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: sha1-file.c:1403
+#, c-format
+msgid "unable to parse %s header"
+msgstr "%s รผstbilgisi ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: sha1-file.c:1629
+#, c-format
+msgid "failed to read object %s"
+msgstr "%s nesnesi okunamadฤฑ"
+
+#: sha1-file.c:1633
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "%s yedeฤŸi %s iรงin bulunamadฤฑ"
+
+#: sha1-file.c:1637
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "%s gevลŸek nesnesi (%s iรงinde depolanฤฑyor) hasar gรถrmรผลŸ"
+
+#: sha1-file.c:1641
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "paketlenmiลŸ nesne %s (%s iรงinde depolanฤฑyor) hasar gรถrmรผลŸ"
+
+#: sha1-file.c:1746
+#, c-format
+msgid "unable to write file %s"
+msgstr "%s dosyasฤฑ yazฤฑlamฤฑyor"
+
+#: sha1-file.c:1753
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "'%s' รถgesine izin ayarlanamฤฑyor"
+
+#: sha1-file.c:1760
+msgid "file write error"
+msgstr "dosya yazฤฑm hatasฤฑ"
+
+#: sha1-file.c:1780
+msgid "error when closing loose object file"
+msgstr "gevลŸek nesne dosyasฤฑ kapatฤฑlฤฑrken hata"
+
+#: sha1-file.c:1845
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "%s depo veritabanฤฑna nesne eklemek iรงin yetersiz izin"
+
+#: sha1-file.c:1847
+msgid "unable to create temporary file"
+msgstr "geรงici dosya oluลŸturulamฤฑyor"
+
+#: sha1-file.c:1871
+msgid "unable to write loose object file"
+msgstr "gevลŸek nesne dosyasฤฑ yazฤฑlamฤฑyor"
+
+#: sha1-file.c:1877
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "yeni nesne %s sรถndรผrรผlemiyor (%d)"
+
+#: sha1-file.c:1881
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "%s nesnesi รผzerinde deflateEnd baลŸarฤฑsฤฑz oldu (%d)"
+
+#: sha1-file.c:1885
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "%s iรงin olan nesne kaynak verisinden dolayฤฑ kafa karฤฑลŸฤฑklฤฑฤŸฤฑ"
+
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
+#, c-format
+msgid "failed utime() on %s"
+msgstr "%s รผzerinde utime() baลŸarฤฑsฤฑz"
+
+#: sha1-file.c:1972
+#, c-format
+msgid "cannot read object for %s"
+msgstr "%s iรงin nesne okunamฤฑyor"
+
+#: sha1-file.c:2011
+msgid "corrupt commit"
+msgstr "hasar gรถrmรผลŸ gรถnderi"
+
+#: sha1-file.c:2019
+msgid "corrupt tag"
+msgstr "hasar gรถrmรผลŸ etiket"
+
+#: sha1-file.c:2119
+#, c-format
+msgid "read error while indexing %s"
+msgstr "%s indekslenirken okuma hatasฤฑ"
+
+#: sha1-file.c:2122
+#, c-format
+msgid "short read while indexing %s"
+msgstr "%s indekslenirken kฤฑsa read"
+
+#: sha1-file.c:2195 sha1-file.c:2205
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: veritabanฤฑna ekleme baลŸarฤฑsฤฑz"
+
+#: sha1-file.c:2211
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: desteklenmeyen dosya tรผrรผ"
+
+#: sha1-file.c:2235
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s geรงerli bir nesne deฤŸil"
+
+#: sha1-file.c:2237
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s geรงerli bir '%s' nesnesi deฤŸil"
+
+#: sha1-file.c:2264 builtin/index-pack.c:155
+#, c-format
+msgid "unable to open %s"
+msgstr "%s aรงฤฑlamฤฑyor"
+
+#: sha1-file.c:2454 sha1-file.c:2507
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s iรงin saฤŸlama uyuลŸmazlฤฑฤŸฤฑ (%s bekleniyordu)"
+
+#: sha1-file.c:2478
+#, c-format
+msgid "unable to mmap %s"
+msgstr "%s mmap yapฤฑlamadฤฑ"
+
+#: sha1-file.c:2483
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "%s รผstbilgisi aรงฤฑlamฤฑyor"
+
+#: sha1-file.c:2489
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "%s รผstbilgisi ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: sha1-file.c:2500
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "%s iรงeriฤŸi aรงฤฑlamฤฑyor"
+
+#: sha1-name.c:486
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "kฤฑsa SHA1 %s belirsiz"
+
+#: sha1-name.c:497
+msgid "The candidates are:"
+msgstr "Adaylar:"
+
+#: sha1-name.c:796
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git normalde hiรงbir zaman 40 onaltฤฑlฤฑ karakterlerle biten bir baลŸvuru\n"
+"oluลŸturmaz, รงรผnkรผ 40 onaltฤฑlฤฑ bir baลŸvuru, onu belirlediฤŸiniz zaman yok\n"
+"sayฤฑlacaktฤฑr. Bu baลŸvurular yanlฤฑลŸlฤฑkla oluลŸturulmuลŸ olabilir. ร–rneฤŸin:\n"
+"\n"
+"\tgit switch -c $br $(git rev-parse ...)\n"
+"\n"
+"komutunda \"$br\" bir ลŸekilde boลŸ kalmฤฑลŸ ve 40 onaltฤฑlฤฑ bir baลŸvuru\n"
+"oluลŸturulmuลŸ. Lรผtfen bu baลŸvurularฤฑ inceleyin ve gerekirse silin. Bu "
+"iletiyi\n"
+"kapatmak iรงin \"git config advice.objectNameWarning\" yapฤฑn."
+
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' gรผnlรผฤŸรผ yalnฤฑzca ลŸuna geri gider: %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' gรผnlรผฤŸรผnde yalnฤฑzca %d girdi var"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "'%s' yolu disk รผzerinde mevcut, ancak '%.*s' iรงinde deฤŸil"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"'%s' yolu mevcut, ancak '%s' deฤŸil\n"
+"ฤฐpucu: ลžunu mu demek istediniz: '%.*s:%s', nam-ฤฑ diฤŸer '%.*s:./%s'?"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "'%s' yolu '%.*s' iรงinde mevcut deฤŸil"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"'%s' yolu indekste, ancak %d numaralฤฑ alanda deฤŸil\n"
+"ฤฐpucu: ลžunu mu demek istediniz: ':%d:%s'?"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"'%s' yolu indekste, ancak '%s' deฤŸil\n"
+"ฤฐpucu: ลžunu mu demek istediniz: '%d:%s', nam-ฤฑ diฤŸer ':%d:./%s'?"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "'%s' yolu diskte mevcut, ancak indekste deฤŸil"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "'%s' diye bir yol yok (ne diskte ne de indekste)"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr "gรถreceli yol sรถzdizimi รงalฤฑลŸma aฤŸacฤฑ dฤฑลŸฤฑnda kullanฤฑlamaz"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "geรงersiz nesne adฤฑ: '%.*s'"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:837
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:839
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/sn"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:847
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:849
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/sn"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:856
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:858
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/sn"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:864
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u bayt"
+msgstr[1] "%u bayt"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:866
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u bayt/sn"
+msgstr[1] "%u bayt/sn"
+
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "'%s' dรผzenlenemedi"
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"BirleลŸtirilmemiลŸ .gitmodules deฤŸiลŸtirilemiyor, รถnce birleลŸtirme "
+"รงakฤฑลŸmalarฤฑnฤฑ รงรถzรผn"
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr ".gitmodules iรงinde path=%s olan bรถlรผm bulunamadฤฑ"
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "%s iรงin .gitmodules girdisi kaldฤฑrฤฑlamadฤฑ"
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "gรผncellenmiลŸ .gitmodules'u hazฤฑrlama baลŸarฤฑsฤฑz oldu"
+
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "iรงi doldurulmamฤฑลŸ '%s' altmodรผlรผnde"
+
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Yol belirteci '%s' '%.*s' altmodรผlรผnde"
+
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "hatalฤฑ --ignore-submodules deฤŸiลŸkeni: %s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"%s gรถnderisinde '%s' yolunda bulunan altmodรผl, aynฤฑ adlฤฑ bir altmodรผlle "
+"รงarpฤฑลŸฤฑyor. Atlanฤฑyor."
+
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "altmodรผl girdisi '%s' (%s) bir %s, gรถnderi deฤŸil"
+
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"'%s' altmodรผlรผnde 'git rev-list <commits> --not --remotes -n 1' "
+"รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "'%s' altmodรผlรผ iรงin iลŸlem baลŸarฤฑsฤฑz oldu"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "HEAD geรงerli bir baลŸvuru olarak รงรถzรผlemedi."
+
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "'%s' altmodรผlรผ itiliyor\n"
+
+#: submodule.c:1161
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "'%s' altmodรผlรผ itilemiyor\n"
+
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "%s%s altmodรผlรผ getiriliyor\n"
+
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "'%s' altmodรผlรผne eriลŸilemedi\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Altmodรผl getirilirken hata:\n"
+"%s"
+
+#: submodule.c:1662
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' bir git deposu olarak tanฤฑmlanamadฤฑ"
+
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "'%s' altmodรผlรผ iรงinde 'git status --porcelain=2' รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'%s' altmodรผlรผ iรงinde 'git status --porcelain=2' baลŸarฤฑsฤฑz oldu"
+
+#: submodule.c:1800
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "'%s' altmodรผlรผ iรงinde 'git status' baลŸlatฤฑlamadฤฑ"
+
+#: submodule.c:1813
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "'%s' altmodรผlรผ iรงinde 'git status' รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: submodule.c:1828
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "'%s' altmodรผlรผ iรงinde core.worktree ayarฤฑ kapatฤฑlamadฤฑ"
+
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "'%s' altmodรผlรผne รถzyinelenemedi"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "altmodรผl indeksi sฤฑfฤฑrlanamadฤฑ"
+
+#: submodule.c:1918
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "'%s' altmodรผlรผ indeksi kirli"
+
+#: submodule.c:1970
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "'%s' altmodรผlรผ gรผncellenemedi."
+
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "altmodรผl git dizini '%s', '%.*s' git dizini iรงinde"
+
+#: submodule.c:2059
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir birden รงok รงalฤฑลŸma aฤŸaรงlฤฑ '%s' altmodรผlรผ iรงin desteklenmiyor"
+
+#: submodule.c:2071 submodule.c:2130
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "'%s' altmodรผlรผ adฤฑ bakฤฑlamadฤฑ"
+
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "'%s' รถgesini mevcut bir git dizinine taลŸฤฑma reddediliyor"
+
+#: submodule.c:2082
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"'%s%s' git dizini gรถรง ettiriliyor:\n"
+"ลŸuradan: '%s'\n"
+"ลŸuraya: '%s'\n"
+
+#: submodule.c:2209
+msgid "could not start ls-files in .."
+msgstr "ls-files ลŸurada baลŸlatฤฑlamadฤฑ .."
+
+#: submodule.c:2248
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree beklenmedik bir biรงimde %d kodu ile รงฤฑktฤฑ"
+
+#: submodule-config.c:236
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "kuลŸku doฤŸuran altmodรผl yok sayฤฑlฤฑyor: %s"
+
+#: submodule-config.c:303
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs iรงin negatif deฤŸerlere izin verilmiyor"
+
+#: submodule-config.c:401
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"'%s' bir komut satฤฑrฤฑ seรงeneฤŸi olarak yorumlanabileceฤŸinden yok sayฤฑlฤฑyor: %s"
+
+#: submodule-config.c:498
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s iรงin geรงersiz deฤŸer"
+
+#: submodule-config.c:765
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ".gitmodules girdisi %s gรผncellenemedi"
+
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "'%s' artbilgi komutunu รงalฤฑลŸtฤฑrma baลŸarฤฑsฤฑz oldu"
+
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "bilinmeyen deฤŸer '%s' ('%s' anahtarฤฑ iรงin)"
+
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
+#, c-format
+msgid "more than one %s"
+msgstr "birden รงok %s"
+
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "'%.*s' artbilgisi iรงinde boลŸ artbilgi simgesi"
+
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "'%s' girdi dosyasฤฑ okunamadฤฑ"
+
+#: trailer.c:753
+msgid "could not read from stdin"
+msgstr "stdin'den okunamadฤฑ"
+
+#: trailer.c:1011 wrapper.c:665
+#, c-format
+msgid "could not stat %s"
+msgstr "%s dosya bilgileri alฤฑnamadฤฑ"
+
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "%s dosyasฤฑ sฤฑradan bir dosya deฤŸil"
+
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "%s dosyasฤฑ kullanฤฑcฤฑ tarafฤฑndan yazฤฑlabilir deฤŸil"
+
+#: trailer.c:1027
+msgid "could not open temporary file"
+msgstr "geรงici dosya aรงฤฑlamadฤฑ"
+
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "geรงici dosya adฤฑ %s olarak deฤŸiลŸtirilemedi"
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "'%s' รผst kaynaฤŸฤฑ '%s' (kaynak: '%s') olarak ayarlanacak\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "'%s' demeti okunamadฤฑ"
+
+#: transport.c:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: Geรงersiz derinlik seรงeneฤŸi '%s'"
+
+#: transport.c:266
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "ayrฤฑntฤฑlar iรงin 'git help config' iรงinde protocol.version'a bakฤฑn"
+
+#: transport.c:267
+msgid "server options require protocol version 2 or later"
+msgstr "sunucu seรงenekleri protokol sรผrรผm 2 veya sonrasฤฑnฤฑ gerektirir"
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr "transport.color.* yapฤฑlandฤฑrmasฤฑ ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr "protokol v2 desteฤŸi henรผz yerine getirilmedi"
+
+#: transport.c:831
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "'%s' yapฤฑlandฤฑrmasฤฑ iรงin bilinmeyen deฤŸer: %s"
+
+#: transport.c:897
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "'%s' taลŸฤฑyฤฑcฤฑsฤฑna izin verilmiyor"
+
+#: transport.c:949
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync artฤฑk desteklenmiyor"
+
+#: transport.c:1044
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"AลŸaฤŸฤฑdaki altmodรผl yollarฤฑ baลŸka hiรงbir uzak konumda bulunamayan\n"
+"deฤŸiลŸiklikler iรงeriyor:\n"
+
+#: transport.c:1048
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Lรผtfen\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"deneyin veya bir uzak konuma itmek iรงin yola cd yapฤฑp\n"
+"\n"
+"\tgit push\n"
+"\n"
+"kullanฤฑn.\n"
+"\n"
+
+#: transport.c:1056
+msgid "Aborting."
+msgstr "ฤฐptal ediliyor"
+
+#: transport.c:1201
+msgid "failed to push all needed submodules"
+msgstr "gereken tรผm altmodรผller itilemedi"
+
+#: transport.c:1345 transport-helper.c:657
+msgid "operation not supported by protocol"
+msgstr "iลŸlem protokol tarafฤฑndan desteklenmiyor"
+
+#: transport-helper.c:61 transport-helper.c:90
+msgid "full write to remote helper failed"
+msgstr "uzak konum yardฤฑmcฤฑsฤฑna tam yazฤฑm baลŸarฤฑsฤฑz"
+
+#: transport-helper.c:144
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "'%s' iรงin uzak konum yardฤฑmcฤฑsฤฑ bulunamadฤฑ"
+
+#: transport-helper.c:160 transport-helper.c:571
+msgid "can't dup helper output fd"
+msgstr "uzak konum yardฤฑmcฤฑsฤฑ รงฤฑktฤฑsฤฑ iรงin dosya aรงฤฑklayฤฑcฤฑsฤฑ รงoฤŸaltฤฑlamฤฑyor"
+
+#: transport-helper.c:211
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"bilinmeyen zorunlu %s yeteneฤŸi; bu uzak konum yardฤฑmcฤฑsฤฑ bรผyรผk olasฤฑlฤฑkla "
+"Git'in daha yeni bir sรผrรผmรผne gereksinim duyuyor"
+
+#: transport-helper.c:217
+msgid "this remote helper should implement refspec capability"
+msgstr "bu uzak konum yardฤฑmcฤฑsฤฑ refspec yapabilirliฤŸini yerine getirmeli"
+
+#: transport-helper.c:284 transport-helper.c:425
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s beklenmedik bir biรงimde ลŸunu sรถyledi: '%s'"
+
+#: transport-helper.c:414
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s ayrฤฑca ลŸunu kilitledi: %s"
+
+#: transport-helper.c:493
+msgid "couldn't run fast-import"
+msgstr "fast-import รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: transport-helper.c:516
+msgid "error while running fast-import"
+msgstr "fast-import รงalฤฑลŸtฤฑrฤฑlฤฑrken hata"
+
+#: transport-helper.c:545 transport-helper.c:1134
+#, c-format
+msgid "could not read ref %s"
+msgstr "%s baลŸvurusu okunamadฤฑ"
+
+#: transport-helper.c:590
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "'connect'e bilinmeyen yanฤฑt: %s"
+
+#: transport-helper.c:612
+msgid "setting remote service path not supported by protocol"
+msgstr "uzak servis yolu ayarlama protokolce desteklenmiyor"
+
+#: transport-helper.c:614
+msgid "invalid remote service path"
+msgstr "geรงersiz uzak konum servis yolu"
+
+#: transport-helper.c:660
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "%s altservisine baฤŸlanamฤฑyor"
+
+#: transport-helper.c:736
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "tamam/hata bekleniyordu, yardฤฑmcฤฑ ลŸunu sรถyledi: '%s'"
+
+#: transport-helper.c:789
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "yardฤฑmcฤฑ %s beklenmedik durumu bildirdi"
+
+#: transport-helper.c:850
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "%s yardฤฑmcฤฑsฤฑ 'dry-run' desteklemiyor"
+
+#: transport-helper.c:853
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "%s yardฤฑmcฤฑsฤฑ --signed desteklemiyor"
+
+#: transport-helper.c:856
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "%s yardฤฑmcฤฑsฤฑ --signed=if-asked desteklemiyor"
+
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "%s yardฤฑmcฤฑsฤฑ --atomic desteklemiyor"
+
+#: transport-helper.c:867
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "%s yardฤฑmcฤฑsฤฑ 'push-option' desteklemiyor"
+
+#: transport-helper.c:965
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-helper itme desteklemiyor; baลŸvuru belirteci gerekli"
+
+#: transport-helper.c:970
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "%s yardฤฑmcฤฑsฤฑ 'force' desteklemiyor"
+
+#: transport-helper.c:1017
+msgid "couldn't run fast-export"
+msgstr "fast-export รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: transport-helper.c:1022
+msgid "error while running fast-export"
+msgstr "fast-export รงalฤฑลŸtฤฑrฤฑlฤฑrken hata"
+
+#: transport-helper.c:1047
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
+msgstr ""
+"Ortak baลŸvuru yok ve hiรง belirtilmemiลŸ; bir ลŸey yapฤฑlmayacak.\n"
+"Belki de bir dal belirtmelisiniz, รถrneฤŸin: 'master'.\n"
+
+#: transport-helper.c:1120
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "baลŸvuru listesinde hatalฤฑ oluลŸturulmuลŸ yanฤฑt: %s"
+
+#: transport-helper.c:1272
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) baลŸarฤฑsฤฑz oldu"
+
+#: transport-helper.c:1299
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) baลŸarฤฑsฤฑz oldu"
+
+#: transport-helper.c:1348
+#, c-format
+msgid "%s thread failed"
+msgstr "%s iลŸ parรงacฤฑฤŸฤฑ baลŸarฤฑsฤฑz oldu"
+
+#: transport-helper.c:1352
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s iลŸ parรงacฤฑฤŸฤฑ eklenemedi: %s"
+
+#: transport-helper.c:1371 transport-helper.c:1375
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "veri kopyalama iรงin iลŸ parรงacฤฑฤŸฤฑ baลŸlatฤฑlamฤฑyor: %s"
+
+#: transport-helper.c:1412
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s iลŸlemi bekleyemedi"
+
+#: transport-helper.c:1416
+#, c-format
+msgid "%s process failed"
+msgstr "%s iลŸlemi baลŸarฤฑsฤฑz oldu"
+
+#: transport-helper.c:1434 transport-helper.c:1443
+msgid "can't start thread for copying data"
+msgstr "veri kopyalama iรงin iลŸ parรงacฤฑฤŸฤฑ baลŸlatฤฑlamฤฑyor"
+
+#: tree-walk.c:32
+msgid "too-short tree object"
+msgstr "aฤŸaรง nesnesi รงok kฤฑsa"
+
+#: tree-walk.c:38
+msgid "malformed mode in tree entry"
+msgstr "aฤŸaรง girdisinde hatalฤฑ oluลŸturulmuลŸ kip"
+
+#: tree-walk.c:42
+msgid "empty filename in tree entry"
+msgstr "aฤŸaรง girdisinde boลŸ dosya adฤฑ"
+
+#: tree-walk.c:117
+msgid "too-short tree file"
+msgstr "aฤŸaรง dosyasฤฑ รงok kฤฑsa"
+
+#: unpack-trees.c:110
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
+msgstr ""
+"ร‡ฤฑkฤฑลŸ yapฤฑlarak aลŸaฤŸฤฑdaki dosyalardaki yerel deฤŸiลŸikliklerin รผzerine "
+"yazฤฑlacak:\n"
+"%%sLรผtfen dal deฤŸiลŸtirmeden รถnce deฤŸiลŸikliklerinizi gรถnderin veya zulalayฤฑn."
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"ร‡ฤฑkฤฑลŸ yapฤฑlarak aลŸaฤŸฤฑdaki dosyalardaki yerel deฤŸiลŸikliklerin รผzerine "
+"yazฤฑlacak:\n"
+"%%s"
+
+#: unpack-trees.c:115
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"BirleลŸtirme ile aลŸaฤŸฤฑdaki dosyalardaki yerel deฤŸiลŸikliklerin รผzerine "
+"yazฤฑlacak:\n"
+"%%sLรผtfen birleลŸtirmeden รถnce deฤŸiลŸikliklerinizi gรถnderin veya zulalayฤฑn."
+
+#: unpack-trees.c:117
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"BirleลŸtirme ile aลŸaฤŸฤฑdaki dosyalardaki yerel deฤŸiลŸikliklerin รผzerine "
+"yazฤฑlacak:\n"
+"%%s"
+
+#: unpack-trees.c:120
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"%s ile aลŸaฤŸฤฑdaki dosyalardaki yerel deฤŸiลŸikliklerin รผzerine yazฤฑlacak:\n"
+"%%sLรผtfen %s yapmadan รถnce deฤŸiลŸikliklerinizi gรถnderin veya zulalayฤฑn."
+
+#: unpack-trees.c:122
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aลŸaฤŸฤฑdaki dosyalardaki yerel deฤŸiลŸikliklerin รผzerine yazฤฑlacak:\n"
+"%%s"
+
+#: unpack-trees.c:127
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"AลŸaฤŸฤฑdaki dizinler gรผncellenerek iรงlerindeki izlenmeyen dosyalar "
+"kaybedilecek:\n"
+"%s"
+
+#: unpack-trees.c:131
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"ร‡ฤฑkฤฑลŸ yapฤฑlarak aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑ kaldฤฑrฤฑlacak:\n"
+"%%sLรผtfen dal deฤŸiลŸtirmeden รถnce onlarฤฑ taลŸฤฑyฤฑn veya kaldฤฑrฤฑn."
+
+#: unpack-trees.c:133
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"ร‡ฤฑkฤฑลŸ yapฤฑlarak aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑ kaldฤฑrฤฑlacak:\n"
+"%%s"
+
+#: unpack-trees.c:136
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"BirleลŸtirme ile aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑ kaldฤฑrฤฑlacak:\n"
+"%%sLรผtfen birleลŸtirmeden รถnce onlarฤฑ taลŸฤฑyฤฑn veya kaldฤฑrฤฑn."
+
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"BirleลŸtirme ile aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑ kaldฤฑrฤฑlacak:\n"
+"%%s"
+
+#: unpack-trees.c:141
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"%s ile aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑ kaldฤฑrฤฑlacak:\n"
+"%%sLรผtfen %s yapmadan รถnce onlarฤฑ taลŸฤฑyฤฑn veya kaldฤฑrฤฑn."
+
+#: unpack-trees.c:143
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑ kaldฤฑrฤฑlacak:\n"
+"%%s"
+
+#: unpack-trees.c:149
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"ร‡ฤฑkฤฑลŸ yapฤฑlarak aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑnฤฑn รผzerine "
+"yazฤฑlacak:\n"
+"%%sLรผtfen dal deฤŸiลŸtirmeden รถnce onlarฤฑ taลŸฤฑyฤฑn veya kaldฤฑrฤฑn."
+
+#: unpack-trees.c:151
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"ร‡ฤฑkฤฑลŸ yapฤฑlarak aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑnฤฑn รผzerine "
+"yazฤฑlacak:\n"
+"%%s"
+
+#: unpack-trees.c:154
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"BirleลŸtirme ile aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑnฤฑn รผzerine "
+"yazฤฑlacak:\n"
+"%%sLรผtfen birleลŸtirmeden รถnce onlarฤฑ taลŸฤฑyฤฑn veya kaldฤฑrฤฑn."
+
+#: unpack-trees.c:156
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"BirleลŸtirme ile aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑnฤฑn รผzerine "
+"yazฤฑlacak:\n"
+"%%s"
+
+#: unpack-trees.c:159
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"%s ile aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑnฤฑn รผzerine yazฤฑlacak:\n"
+"%%sLรผtfen %s yapmadan รถnce onlarฤฑ taลŸฤฑyฤฑn veya kaldฤฑrฤฑn."
+
+#: unpack-trees.c:161
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aลŸaฤŸฤฑdaki izlenmeyen รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑnฤฑn รผzerine yazฤฑlacak:\n"
+"%%s"
+
+#: unpack-trees.c:169
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "'%s' girdisi '%s' ile รผst รผste biniyor. BaฤŸlanamฤฑyor."
+
+#: unpack-trees.c:172
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
+msgstr ""
+"Aralฤฑklฤฑ รงฤฑkฤฑลŸ gรผncellenemiyor: AลŸaฤŸฤฑdaki girdiler gรผncel deฤŸil:\n"
+"%s"
+
+#: unpack-trees.c:174
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Aralฤฑklฤฑ รงฤฑkฤฑลŸ gรผncellemesi ile aลŸaฤŸฤฑdaki รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑnฤฑn รผzerine "
+"yazฤฑlacak:\n"
+"%s"
+
+#: unpack-trees.c:176
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Aralฤฑklฤฑ รงฤฑkฤฑลŸ gรผncellemesi ile aลŸaฤŸฤฑdaki รงalฤฑลŸma aฤŸacฤฑ dosyalarฤฑ "
+"kaldฤฑrฤฑlacak:\n"
+"%s"
+
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Altmodรผl gรผncellenemiyor:\n"
+"%s"
+
+#: unpack-trees.c:255
+#, c-format
+msgid "Aborting\n"
+msgstr "ฤฐptal ediliyor\n"
+
+#: unpack-trees.c:317
+msgid "Updating files"
+msgstr "Dosyalar gรผncelleniyor"
+
+#: unpack-trees.c:349
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"AลŸaฤŸฤฑdaki yollar birbiriyle รงarpฤฑลŸtฤฑ (รถrn. BรœYรœK/kรผรงรผk harf duyarlฤฑ\n"
+"olmayan dosya sisteminde BรœYรœK/kรผรงรผk harf duyarlฤฑ yollar) ve aynฤฑ รงarpฤฑลŸan\n"
+"gruptan yalnฤฑzca bir tanesi รงalฤฑลŸma aฤŸacฤฑnda:\n"
+
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "ฤฐndeks bayraklarฤฑ gรผncelleniyor"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "geรงersiz URL ลŸemasฤฑ veya eksik '://' eki"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "geรงersiz %XX kaรงฤฑลŸ sฤฑrasฤฑ"
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "ana bilgisayar eksik ve ลŸema 'file:' deฤŸil"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "bir 'file:' URL'sinin kapฤฑ numarasฤฑ olmayabilir"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "ana bilgisayar adฤฑnda geรงersiz karakter"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "geรงersiz kapฤฑ numarasฤฑ"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "geรงersiz '..' yol kesimi"
+
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Nesneler getiriliyor"
+
+#: worktree.c:259 builtin/am.c:2099
+#, c-format
+msgid "failed to read '%s'"
+msgstr "'%s' okunamadฤฑ"
+
+#: worktree.c:305
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "ana รงalฤฑลŸma aฤŸacฤฑndaki '%s' depo dizini deฤŸil"
+
+#: worktree.c:316
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "'%s' dosyasฤฑ รงalฤฑลŸma aฤŸacฤฑ konumuna olan tam yolu iรงermiyor"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' mevcut deฤŸil"
+
+#: worktree.c:334
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' bir .git dosyasฤฑ deฤŸil, hata kodu %d"
+
+#: worktree.c:342
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' ลŸuna geri iลŸaret etmiyor: '%s'"
+
+#: wrapper.c:186 wrapper.c:356
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "'%s' okuma ve yazma iรงin aรงฤฑlamadฤฑ"
+
+#: wrapper.c:387 wrapper.c:588
+#, c-format
+msgid "unable to access '%s'"
+msgstr "'%s' eriลŸilemiyor"
+
+#: wrapper.c:596
+msgid "unable to get current working directory"
+msgstr "geรงerli รงalฤฑลŸma dizini alฤฑnamฤฑyor"
+
+#: wt-status.c:158
+msgid "Unmerged paths:"
+msgstr "BirleลŸtirilmemiลŸ yollar:"
+
+#: wt-status.c:187 wt-status.c:219
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+"  (hazฤฑrlฤฑktan รงฤฑkarmak iรงin \"git restore --staged <dosya>...\" kullanฤฑn)"
+
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (hazฤฑrlฤฑktan รงฤฑkarmak iรงin \"git restore --source=%s --staged <dosya>...\" "
+"kullanฤฑn)"
+
+#: wt-status.c:193 wt-status.c:225
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (hazฤฑrlฤฑktan รงฤฑkarmak iรงin \"git rm --cached <dosya>...\" kullanฤฑn)"
+
+#: wt-status.c:197
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (hazฤฑrlฤฑฤŸฤฑ bitirmek iรงin \"git add <dosya>...\" kullanฤฑn)"
+
+#: wt-status.c:199 wt-status.c:203
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (hazฤฑrlฤฑฤŸฤฑ bitirmek iรงin uygun bir biรงimde \"git add/rm <dosya>...\" "
+"kullanฤฑn)"
+
+#: wt-status.c:201
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (hazฤฑrlฤฑฤŸฤฑ bitirmek iรงin \"git rm <dosya>...\" kullanฤฑn)"
+
+#: wt-status.c:211 wt-status.c:1074
+msgid "Changes to be committed:"
+msgstr "Gรถnderilecek deฤŸiลŸiklikler:"
+
+#: wt-status.c:234 wt-status.c:1083
+msgid "Changes not staged for commit:"
+msgstr "Gรถnderi iรงin hazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikler:"
+
+#: wt-status.c:238
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+"  (gรถnderilecekleri gรผncellemek iรงin \"git add <dosya>...\" kullanฤฑn)"
+
+#: wt-status.c:240
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (gรถnderilecekleri gรผncellemek iรงin \"git add/rm <dosya>...\" kullanฤฑn)"
+
+#: wt-status.c:241
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (รงalฤฑลŸma dizinindeki deฤŸiลŸiklikleri atmak iรงin \"git restore <dosya>...\" "
+"kullanฤฑn)"
+
+#: wt-status.c:243
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr "  (altmodรผllerdeki izlenmeyen/deฤŸiลŸtirilen iรงeriฤŸi gรถnder veya at)"
+
+#: wt-status.c:254
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  (gรถnderilecekler arasฤฑna koymak iรงin \"git %s <dosya>...\" kullanฤฑn)"
+
+#: wt-status.c:268
+msgid "both deleted:"
+msgstr "ikimiz de sildik:"
+
+#: wt-status.c:270
+msgid "added by us:"
+msgstr "biz ekledik:"
+
+#: wt-status.c:272
+msgid "deleted by them:"
+msgstr "onlar sildi:"
+
+#: wt-status.c:274
+msgid "added by them:"
+msgstr "onlar ekledi:"
+
+#: wt-status.c:276
+msgid "deleted by us:"
+msgstr "biz sildik:"
+
+#: wt-status.c:278
+msgid "both added:"
+msgstr "ikimiz de ekledik:"
+
+#: wt-status.c:280
+msgid "both modified:"
+msgstr "ikimiz de deฤŸiลŸtirdik:"
+
+#: wt-status.c:290
+msgid "new file:"
+msgstr "yeni dosya:"
+
+#: wt-status.c:292
+msgid "copied:"
+msgstr "kopyalandฤฑ:"
+
+#: wt-status.c:294
+msgid "deleted:"
+msgstr "silindi:"
+
+#: wt-status.c:296
+msgid "modified:"
+msgstr "deฤŸiลŸtirildi:"
+
+#: wt-status.c:298
+msgid "renamed:"
+msgstr "yeniden adlandฤฑrฤฑldฤฑ:"
+
+#: wt-status.c:300
+msgid "typechange:"
+msgstr "tรผrรผ deฤŸiลŸtirildi:"
+
+#: wt-status.c:302
+msgid "unknown:"
+msgstr "bilinmiyor"
+
+#: wt-status.c:304
+msgid "unmerged:"
+msgstr "birleลŸtirilmedi:"
+
+#: wt-status.c:384
+msgid "new commits, "
+msgstr "yeni gรถnderiler, "
+
+#: wt-status.c:386
+msgid "modified content, "
+msgstr "deฤŸiลŸtirilen iรงerik, "
+
+#: wt-status.c:388
+msgid "untracked content, "
+msgstr "izlenmeyen iรงerik, "
+
+#: wt-status.c:906
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Zulanฤฑzda ลŸu anda %d girdi var"
+msgstr[1] "Zulanฤฑzda ลŸu anda %d girdi var"
+
+#: wt-status.c:938
+msgid "Submodules changed but not updated:"
+msgstr "DeฤŸiลŸtirilen ancak gรผncellenmeyen altmodรผller:"
+
+#: wt-status.c:940
+msgid "Submodule changes to be committed:"
+msgstr "Gรถnderilecek altmodรผl deฤŸiลŸiklikleri:"
+
+#: wt-status.c:1022
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Yukarฤฑdaki satฤฑrฤฑ deฤŸiลŸtirmeyin veya kaldฤฑrmayฤฑn.\n"
+"Altฤฑndaki her ลŸey yok sayฤฑlacaktฤฑr."
+
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Dal รถnรผnde/arkasฤฑnda deฤŸerlerini hesaplama %.2f saniye sรผrdรผ.\n"
+"Bundan kaรงฤฑnmak iรงin --no-ahead-behind kullanabilirsiniz.\n"
+
+#: wt-status.c:1144
+msgid "You have unmerged paths."
+msgstr "BirleลŸtirilmemiลŸ yollarฤฑnฤฑz var."
+
+#: wt-status.c:1147
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (รงakฤฑลŸmalarฤฑ onar ve \"git commit\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1149
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (birleลŸtirmeyi iptal etmek iรงin \"git merge --abort\" kullanฤฑn)"
+
+#: wt-status.c:1153
+msgid "All conflicts fixed but you are still merging."
+msgstr "Tรผm รงakฤฑลŸmalar onarฤฑldฤฑ ancak siz hรขlรข birleลŸtiriyorsunuz."
+
+#: wt-status.c:1156
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (birleลŸtirmeyi sonuรงlandฤฑrmak iรงin \"git commit\" kullanฤฑn)"
+
+#: wt-status.c:1165
+msgid "You are in the middle of an am session."
+msgstr "Bir 'am' oturumunun tam ortasฤฑndasฤฑnฤฑz."
+
+#: wt-status.c:1168
+msgid "The current patch is empty."
+msgstr "Mevcut yama boลŸ."
+
+#: wt-status.c:1172
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (รงakฤฑลŸmalarฤฑ onar ve ardฤฑndan \"git am --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1174
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (bu yamayฤฑ atlamak iรงin \"git am --skip\" kullanฤฑn"
+
+#: wt-status.c:1176
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (ilk dalฤฑ eski durumuna getirmek iรงin \"git am --abort\" kullanฤฑn)"
+
+#: wt-status.c:1309
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo eksik"
+
+#: wt-status.c:1311
+msgid "No commands done."
+msgstr "Yerine getirilen bir komut yok."
+
+#: wt-status.c:1314
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Son yerine getirilen komut (toplamda %d komut):"
+msgstr[1] "Son yerine getirilen komutlar (toplamda %d komut):"
+
+#: wt-status.c:1325
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (ek bilgi iรงin %s dosyasฤฑna bakฤฑn)"
+
+#: wt-status.c:1330
+msgid "No commands remaining."
+msgstr "Kalan komut yok."
+
+#: wt-status.c:1333
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Sฤฑradaki yerine getirilecek komut (%d kalan komut):"
+msgstr[1] "Sฤฑradaki yerine getirilecek komutlar (%d kalan komut):"
+
+#: wt-status.c:1341
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (gรถrรผntรผleme ve dรผzenleme iรงin \"git rebase --edit-todo\" kullanฤฑn)"
+
+#: wt-status.c:1353
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "ลžu anda '%s' dalฤฑnฤฑ '%s' รผzerine yeniden temellendiriyorsunuz."
+
+#: wt-status.c:1358
+msgid "You are currently rebasing."
+msgstr "ลžu anda yeniden temellendirme yapmaktasฤฑnฤฑz."
+
+#: wt-status.c:1371
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (รงakฤฑลŸmalarฤฑ รงรถzรผn ve ardฤฑndan \"git rebase --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1373
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (bu yamayฤฑ atlamak iรงin \"git rebase --skip\" kullanฤฑn)"
+
+#: wt-status.c:1375
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (ilk dalฤฑ รงฤฑkฤฑลŸ yapmak iรงin \"git rebase --abort\" kullanฤฑn)"
+
+#: wt-status.c:1382
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (tรผm รงakฤฑลŸmalar onarฤฑldฤฑ: \"git rebase --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1386
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"ลžu anda '%s' dalฤฑnฤฑ '%s' รผzerine yeniden temellendirirken bir gรถnderiyi "
+"parรงalara bรถlรผyorsunuz."
+
+#: wt-status.c:1391
+msgid "You are currently splitting a commit during a rebase."
+msgstr ""
+"ลžu anda bir yeniden temellendirme sฤฑrasฤฑnda bir gรถnderiyi parรงalara "
+"bรถlรผyorsunuz."
+
+#: wt-status.c:1394
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (ร‡alฤฑลŸma dizininiz temizlendiฤŸinde \"git rebase --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1398
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"ลžu anda '%s' dalฤฑnฤฑ '%s' รผzerine yeniden temellendirirken bir gรถnderiyi "
+"dรผzenliyorsunuz."
+
+#: wt-status.c:1403
+msgid "You are currently editing a commit during a rebase."
+msgstr ""
+"ลžu anda bir yeniden temellendirme sฤฑrasฤฑnda bir gรถnderiyi dรผzenliyorsunuz."
+
+#: wt-status.c:1406
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (geรงerli gรถnderiyi deฤŸiลŸtirmek iรงin \"git commit --amend\" kullanฤฑn)"
+
+#: wt-status.c:1408
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (deฤŸiลŸikliklerinizden memnunsanฤฑz \"git rebase --continue\" kullanฤฑn)"
+
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "Seรง-al ลŸu anda sรผrmekte."
+
+#: wt-status.c:1422
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "ลžu anda %s gรถnderisini seรง-al yapฤฑyorsunuz."
+
+#: wt-status.c:1429
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (รงakฤฑลŸmalarฤฑ onar ve \"git cherry-pick --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1432
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (sรผrdรผrmek iรงin \"git cherry-pick --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1435
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  (tรผm รงakฤฑลŸmalar onarฤฑldฤฑ: \"git cherry-pick --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (bu yamayฤฑ atlamak iรงin \"git cherry-pick --skip\" kullanฤฑn)"
+
+#: wt-status.c:1439
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr "  (seรง-al iลŸlemini iptal iรงin \"git cherry-pick --abort\" kullanฤฑn)"
+
+#: wt-status.c:1449
+msgid "Revert currently in progress."
+msgstr "Geriye al ลŸu anda sรผrmekte."
+
+#: wt-status.c:1452
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "ลžu anda %s gรถnderisini geri alฤฑyorsunuz."
+
+#: wt-status.c:1458
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (รงakฤฑลŸmalarฤฑ onar ve \"git revert --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1461
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (sรผrdรผrmek iรงin \"git revert --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1464
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (tรผm รงakฤฑลŸmalar onarฤฑldฤฑ: \"git revert --continue\" รงalฤฑลŸtฤฑr)"
+
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (bu yamayฤฑ atlamak iรงin \"git revert --skip\" kullanฤฑn)"
+
+#: wt-status.c:1468
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (geri al iลŸlemini iptal iรงin \"git revert --abort\" kullanฤฑn)"
+
+#: wt-status.c:1478
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "ลžu anda ikili arama yapฤฑyorsunuz, '%s' dalฤฑndan baลŸlandฤฑ."
+
+#: wt-status.c:1482
+msgid "You are currently bisecting."
+msgstr "ลžu anda ikili arama yapฤฑyorsunuz"
+
+#: wt-status.c:1485
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (ilk dala dรถnmek iรงin \"git bisect reset\" kullanฤฑn)"
+
+#: wt-status.c:1694
+msgid "On branch "
+msgstr "ลžu dalda: "
+
+#: wt-status.c:1701
+msgid "interactive rebase in progress; onto "
+msgstr "ลŸunun รผzerine etkileลŸimli yeniden temellendirme sรผrmekte: "
+
+#: wt-status.c:1703
+msgid "rebase in progress; onto "
+msgstr "ลŸunun รผzerine yeniden temellendirme sรผrmekte: "
+
+#: wt-status.c:1713
+msgid "Not currently on any branch."
+msgstr "ลžu anda bir dal รผzerinde deฤŸil."
+
+#: wt-status.c:1730
+msgid "Initial commit"
+msgstr "ฤฐlk gรถnderi"
+
+#: wt-status.c:1731
+msgid "No commits yet"
+msgstr "Henรผz bir gรถnderi yok"
+
+#: wt-status.c:1745
+msgid "Untracked files"
+msgstr "ฤฐzlenmeyen dosyalar"
+
+#: wt-status.c:1747
+msgid "Ignored files"
+msgstr "Yok sayฤฑlan dosyalar"
+
+#: wt-status.c:1751
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"ฤฐzlenmeyen dosyalarฤฑn sayฤฑp dรถkรผlmesi %.2f saniye sรผrdรผ. 'status -uno' bunu\n"
+"hฤฑzlandฤฑrabilir, ancak yeni dosyalarฤฑ kendinizin eklemeyi unutmamasฤฑ\n"
+"konusunda dikkatli olmalฤฑsฤฑnฤฑz (ek bilgi iรงin 'git help status')."
+
+#: wt-status.c:1757
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "ฤฐzlenmeyen dosyalar listelenmiyor%s"
+
+#: wt-status.c:1759
+msgid " (use -u option to show untracked files)"
+msgstr " (izlenmeyen dosyalarฤฑ gรถstermek iรงin -u seรงeneฤŸini kullanฤฑn)"
+
+#: wt-status.c:1765
+msgid "No changes"
+msgstr "DeฤŸiลŸiklik yok"
+
+#: wt-status.c:1770
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"Gรถnderiye eklenen deฤŸiลŸiklik yok (\"git add\" ve/veya \"git commit -a\" "
+"kullanฤฑn)\n"
+
+#: wt-status.c:1773
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "Gรถnderiye eklenen deฤŸiลŸiklik yok\n"
+
+#: wt-status.c:1776
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"gรถnderiye bir ลŸey eklenmedi ancak izlenmeyen dosyalar var (izlemek iรงin\n"
+"\"git add\" kullanฤฑn)\n"
+
+#: wt-status.c:1779
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "gรถnderiye bir ลŸey eklenmedi ancak izlenmeyen dosyalar var\n"
+
+#: wt-status.c:1782
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"Gรถnderilecek bir ลŸey yok (dosyalar oluลŸturun/kopyalayฤฑn ve izlemek iรงin "
+"\"git add\" kullanฤฑn)\n"
+
+#: wt-status.c:1785 wt-status.c:1790
+#, c-format
+msgid "nothing to commit\n"
+msgstr "Gรถnderilecek bir ลŸey yok\n"
+
+#: wt-status.c:1788
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"Gรถnderilecek bir ลŸey yok (izlenmeyen dosyalarฤฑ gรถstermek iรงin -u kullanฤฑn)\n"
+
+#: wt-status.c:1792
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "Gรถnderilecek bir ลŸey yok, รงalฤฑลŸma aฤŸacฤฑ temiz\n"
+
+#: wt-status.c:1905
+msgid "No commits yet on "
+msgstr "ลžurada henรผz bir gรถnderi yok: "
+
+#: wt-status.c:1909
+msgid "HEAD (no branch)"
+msgstr "HEAD (dal yok)"
+
+#: wt-status.c:1940
+msgid "different"
+msgstr "deฤŸiลŸik"
+
+#: wt-status.c:1942 wt-status.c:1950
+msgid "behind "
+msgstr "ลŸunun arkasฤฑnda: "
+
+#: wt-status.c:1945 wt-status.c:1948
+msgid "ahead "
+msgstr "ลŸunun รถnรผnde: "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2470
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "%s yapฤฑlamฤฑyor: HazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikleriniz var."
+
+#: wt-status.c:2476
+msgid "additionally, your index contains uncommitted changes."
+msgstr "Ek olarak, indeksiniz gรถnderilmemiลŸ deฤŸiลŸiklikler iรงeriyor."
+
+#: wt-status.c:2478
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "%s yapฤฑlamฤฑyor: ฤฐndeksiniz gรถnderilmemiลŸ deฤŸiลŸiklikler iรงeriyor."
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "'%s' baฤŸlantฤฑsฤฑ kesilemedi"
+
+#: builtin/add.c:26
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<seรงenekler>] [--] <yol-blrtรง>..."
+
+#: builtin/add.c:88
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "beklenmedik diff durumu %c"
+
+#: builtin/add.c:93 builtin/commit.c:288
+msgid "updating files failed"
+msgstr "dosyalarฤฑ gรผncelleme baลŸarฤฑsฤฑz"
+
+#: builtin/add.c:103
+#, c-format
+msgid "remove '%s'\n"
+msgstr "kaldฤฑr: '%s'\n"
+
+#: builtin/add.c:178
+msgid "Unstaged changes after refreshing the index:"
+msgstr "ฤฐndeksi yeniledikten sonra hazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikler:"
+
+#: builtin/add.c:266 builtin/rev-parse.c:899
+msgid "Could not read the index"
+msgstr "ฤฐndeks okunamadฤฑ"
+
+#: builtin/add.c:277
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "'%s' yazฤฑm iรงin aรงฤฑlamadฤฑ."
+
+#: builtin/add.c:281
+msgid "Could not write patch"
+msgstr "Yama yazฤฑlamadฤฑ"
+
+#: builtin/add.c:284
+msgid "editing patch failed"
+msgstr "yamayฤฑ dรผzenleme baลŸarฤฑsฤฑz"
+
+#: builtin/add.c:287
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "'%s' dosya bilgileri alฤฑnamadฤฑ"
+
+#: builtin/add.c:289
+msgid "Empty patch. Aborted."
+msgstr "BoลŸ yama. ฤฐptal edildi."
+
+#: builtin/add.c:294
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "'%s' uygulanamadฤฑ"
+
+#: builtin/add.c:302
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr ""
+"AลŸaฤŸฤฑdaki yollar sizin .gitignore dosyalarฤฑnฤฑzฤฑn biri tarafฤฑndan yok "
+"sayฤฑlฤฑyor:\n"
+
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+msgid "dry run"
+msgstr "sฤฑnama turu"
+
+#: builtin/add.c:325
+msgid "interactive picking"
+msgstr "etkileลŸimli seรงim"
+
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+msgid "select hunks interactively"
+msgstr "parรงalarฤฑ etkileลŸimli olarak seรง"
+
+#: builtin/add.c:327
+msgid "edit current diff and apply"
+msgstr "geรงerli diff'i dรผzenle ve uygula"
+
+#: builtin/add.c:328
+msgid "allow adding otherwise ignored files"
+msgstr "baลŸka tรผrlรผ yok sayฤฑlan dosyalarฤฑn eklenmesine izin ver"
+
+#: builtin/add.c:329
+msgid "update tracked files"
+msgstr "izlenen dosyalarฤฑ gรผncelle"
+
+#: builtin/add.c:330
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "izlenen dosyalarฤฑn satฤฑr sonlarฤฑnฤฑ yeniden olaฤŸanlaลŸtฤฑr (-u ima eder)"
+
+#: builtin/add.c:331
+msgid "record only the fact that the path will be added later"
+msgstr "yalnฤฑzca yolun sonra ekleneceฤŸi gerรงeฤŸinin kaydฤฑnฤฑ yaz"
+
+#: builtin/add.c:332
+msgid "add changes from all tracked and untracked files"
+msgstr "tรผm izlenen/izlenmeyen dosyalardan deฤŸiลŸiklikleri ekle"
+
+#: builtin/add.c:335
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "รงalฤฑลŸma aฤŸacฤฑnda kaldฤฑrฤฑlan yollarฤฑ yok say (--no-all ile aynฤฑ)"
+
+#: builtin/add.c:337
+msgid "don't add, only refresh the index"
+msgstr "ekleme, yalnฤฑzca indeksi yenile"
+
+#: builtin/add.c:338
+msgid "just skip files which cannot be added because of errors"
+msgstr "yalnฤฑzca hatalardan dolayฤฑ eklenemeyen dosyalarฤฑ atla"
+
+#: builtin/add.c:339
+msgid "check if - even missing - files are ignored in dry run"
+msgstr ""
+"dosyalarฤฑn -eksik olsalar bile- sฤฑnama turunda yok sayฤฑlฤฑp sayฤฑlmadฤฑฤŸฤฑnฤฑ "
+"denetle"
+
+#: builtin/add.c:341 builtin/update-index.c:1004
+msgid "override the executable bit of the listed files"
+msgstr "listelenen dosyalarฤฑn รงalฤฑลŸtฤฑrฤฑlabilir kฤฑsฤฑmlarฤฑnฤฑ geรงersiz kฤฑl"
+
+#: builtin/add.c:343
+msgid "warn when adding an embedded repository"
+msgstr "gรถmรผlรผ bir depo eklenirken uyar"
+
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "'git stash -p' iรงin arka uรง"
+
+#: builtin/add.c:363
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"Mevcut deponuzun iรงine baลŸka bir git deposu eklediniz.\n"
+"DฤฑลŸ deponun klonlarฤฑ gรถmรผlen deponun iรงeriฤŸini iรงermez ve onlarฤฑ\n"
+"nasฤฑl alabileceฤŸini bilemez. EฤŸer bir altmodรผl eklemek istediyseniz\n"
+"ลŸunu kullanฤฑn:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"EฤŸer bu yolu yanlฤฑลŸlฤฑkla eklediyseniz aลŸaฤŸฤฑdaki komutla indeksten\n"
+"kaldฤฑrabilirsiniz:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Ek bilgi iรงin: \"git help submodule\"."
+
+#: builtin/add.c:391
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "gรถmรผlรผ git deposu ekleniyor: %s"
+
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Gerรงekten eklemek istiyorsanฤฑz -f kullanฤฑn.\n"
+"Bu iletiyi 'git config advice.addIgnoredFile false'\n"
+"kullanarak kapatabilirsiniz."
+
+#: builtin/add.c:419
+msgid "adding files failed"
+msgstr "dosya ekleme baลŸarฤฑsฤฑz"
+
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz"
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file, --edit ile uyumsuz"
+
+#: builtin/add.c:476
+msgid "-A and -u are mutually incompatible"
+msgstr "-A ve -u karลŸฤฑlฤฑklฤฑ olarak uyumlu"
+
+#: builtin/add.c:479
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+"--ignore-missing seรงeneฤŸi yalnฤฑzca --dry-run seรงeneฤŸi ile birlikte "
+"kullanฤฑlabilir"
+
+#: builtin/add.c:483
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "--chmod param '%s' ya -x ya da +x olmalฤฑdฤฑr"
+
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--pathspec-from-file yol belirteci deฤŸiลŸkenleri ile uyumsuz"
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor"
+
+#: builtin/add.c:512
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Hiรงbir ลŸey belirtilmedi, hiรงbir ลŸey eklenmedi.\n"
+
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"'git add .' mฤฑ demek istediniz?\n"
+"Bu iletiyi 'git config advice.addEmptyPathspec false'\n"
+"yaparak kapatabilirsiniz."
+
+#: builtin/am.c:352
+msgid "could not parse author script"
+msgstr "yazar betiฤŸi ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/am.c:436
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' applypatch-msg kancasฤฑ tarafฤฑndan silindi"
+
+#: builtin/am.c:478
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "Hatalฤฑ oluลŸturulmuลŸ girdi satฤฑrฤฑ: '%s'."
+
+#: builtin/am.c:516
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Notlarฤฑn '%s' konumundan '%s' konumuna kopyalanmasฤฑ baลŸarฤฑsฤฑz"
+
+#: builtin/am.c:542
+msgid "fseek failed"
+msgstr "fseek baลŸarฤฑsฤฑz oldu"
+
+#: builtin/am.c:730
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "'%s' yamasฤฑ ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/am.c:795
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Bir kerede yalnฤฑzca bir StGIT yama serisi uygulanabilir"
+
+#: builtin/am.c:843
+msgid "invalid timestamp"
+msgstr "geรงersiz zaman damgasฤฑ"
+
+#: builtin/am.c:848 builtin/am.c:860
+msgid "invalid Date line"
+msgstr "geรงersiz tarih satฤฑrฤฑ"
+
+#: builtin/am.c:855
+msgid "invalid timezone offset"
+msgstr "geรงersiz zaman dilimi ofseti"
+
+#: builtin/am.c:948
+msgid "Patch format detection failed."
+msgstr "Yama biรงimi algฤฑlamasฤฑ baลŸarฤฑsฤฑz."
+
+#: builtin/am.c:953 builtin/clone.c:409
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "'%s' dizini oluลŸturulamadฤฑ"
+
+#: builtin/am.c:958
+msgid "Failed to split patches."
+msgstr "Yamalar parรงalanฤฑp bรถlรผnemedi."
+
+#: builtin/am.c:1089
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Bu sorunu รงรถzdรผฤŸรผnรผzde \"%s --continue\" รงalฤฑลŸtฤฑrฤฑn."
+
+#: builtin/am.c:1090
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "EฤŸer bu yamayฤฑ atlamayฤฑ yeฤŸliyorsanฤฑz \"%s --skip\" รงalฤฑลŸtฤฑrฤฑn."
+
+#: builtin/am.c:1091
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"ฤฐlk dalฤฑ eski durumuna getirip yamalamayฤฑ durdurmak iรงin \"%s --abort\" "
+"รงalฤฑลŸtฤฑr."
+
+#: builtin/am.c:1174
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+"Yama format=flowed ile gรถnderildi; satฤฑr sonlarฤฑndaki boลŸluk kaybolmuลŸ "
+"olabilir."
+
+#: builtin/am.c:1202
+msgid "Patch is empty."
+msgstr "Yama boลŸ."
+
+#: builtin/am.c:1267
+#, c-format
+msgid "missing author line in commit %s"
+msgstr "%s gรถnderisinde yazar satฤฑrฤฑ eksik"
+
+#: builtin/am.c:1270
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "geรงersiz tanฤฑmlama satฤฑrฤฑ: %.*s"
+
+#: builtin/am.c:1489
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+"Depo 3 yรถnlรผ birleลŸtirmeye geri รงekilebilme iรงin gereken ikili nesnelere iye "
+"deฤŸil."
+
+#: builtin/am.c:1491
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Bir temel aฤŸacฤฑnฤฑ yeniden yapmak iรงin indeks bilgisi kullanฤฑlฤฑyor..."
+
+#: builtin/am.c:1510
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Yamanฤฑzฤฑ elle mi dรผzenlediniz?\n"
+"Kendi indeksinde kaydฤฑ yazฤฑlan ikili nesnelere uygulanamฤฑyor."
+
+#: builtin/am.c:1516
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Temeli yamalamaya ve 3 yรถnlรผ birleลŸtirmeye geri รงekiliniyor..."
+
+#: builtin/am.c:1542
+msgid "Failed to merge in the changes."
+msgstr "DeฤŸiลŸiklikler birleลŸtirilemedi."
+
+#: builtin/am.c:1574
+msgid "applying to an empty history"
+msgstr "boลŸ bir geรงmiลŸe uygulanฤฑyor"
+
+#: builtin/am.c:1621 builtin/am.c:1625
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "sรผrdรผrรผlemiyor: %s yok"
+
+#: builtin/am.c:1643
+msgid "Commit Body is:"
+msgstr "Gรถnderi gรถvdesi:"
+
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1653
+#, c-format
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr ""
+"Uygula? [y]evet/[n]hayฤฑr/dรผz[e]nle/[v]yamayฤฑ gรถrรผntรผle/tรผmรผnรผ k[a]bul et: "
+
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "indeks dosyasฤฑ yazฤฑlamฤฑyor"
+
+#: builtin/am.c:1704
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Kirli indeks: Yamalar uygulanamฤฑyor (kirli: %s)"
+
+#: builtin/am.c:1744 builtin/am.c:1812
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Uygulanฤฑyor: %.*s"
+
+#: builtin/am.c:1761
+msgid "No changes -- Patch already applied."
+msgstr "DeฤŸiลŸiklik yok -- Yama halihazฤฑrda uygulandฤฑ."
+
+#: builtin/am.c:1767
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "Yama ลŸurada baลŸarฤฑsฤฑz oldu: %s %.*s"
+
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr ""
+"BaลŸarฤฑsฤฑz olan yamayฤฑ gรถrmek iรงin 'git am --show-current-patch=diff' kullanฤฑn"
+
+#: builtin/am.c:1815
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"DeฤŸiลŸiklik yok - 'git add' yapmayฤฑ mฤฑ unuttunuz?\n"
+"Hazฤฑrlanacak baลŸka bir ลŸey kalmadฤฑysa bรผyรผk olasฤฑlฤฑkla baลŸka bir ลŸey\n"
+"aynฤฑ deฤŸiลŸiklikleri uygulamฤฑลŸ olabilir; bu yamayฤฑ atlamak isteyebilirsiniz."
+
+#: builtin/am.c:1822
+msgid ""
+"You still have unmerged paths in your index.\n"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
+msgstr ""
+"ฤฐndeksinizde hรขlรข birleลŸtirilmemiลŸ yollar var.\n"
+"ร‡akฤฑลŸmalarฤฑ รงรถzรผlen tรผm dosyalarฤฑ 'git add' ile รงรถzรผldรผ olarak "
+"imlemelisiniz.\n"
+"Bir dosyanฤฑn \"onlar sildi\" olduฤŸunu kabul etmek iรงin dosya ile 'git rm' "
+"yapabilirsiniz."
+
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "'%s' nesnesi ayrฤฑลŸtฤฑrฤฑlamadฤฑ."
+
+#: builtin/am.c:1981
+msgid "failed to clean index"
+msgstr "indeks temizlenemedi"
+
+#: builtin/am.c:2025
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Son 'am' baลŸarฤฑsฤฑzlฤฑฤŸฤฑndan bu yana HEAD'i hareket ettirmiลŸ gรถrรผnรผyorsunuz.\n"
+"ORIG_HEAD'e geri sarฤฑlmฤฑyor."
+
+#: builtin/am.c:2132
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "Geรงersiz --patch-format deฤŸeri: %s"
+
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "--show-current-patch iรงin geรงersiz deฤŸer: %s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s, --show-current-patch=%s ile uyumsuz"
+
+#: builtin/am.c:2207
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<seรงenekler>] [(<mbox> | <posta-dizin>)...]"
+
+#: builtin/am.c:2208
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<seรงenekler>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2214
+msgid "run interactively"
+msgstr "etkileลŸimli olarak รงalฤฑลŸtฤฑr"
+
+#: builtin/am.c:2216
+msgid "historical option -- no-op"
+msgstr "tarihi seรงenek -- no-op"
+
+#: builtin/am.c:2218
+msgid "allow fall back on 3way merging if needed"
+msgstr "gerekirse 3 yรถnlรผ birleลŸtirmeye geri รงekilmeye izin ver"
+
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
+msgid "be quiet"
+msgstr "sessiz ol"
+
+#: builtin/am.c:2221
+msgid "add a Signed-off-by line to the commit message"
+msgstr "gรถnderi iletisine bir Signed-off-by satฤฑrฤฑ ekle"
+
+#: builtin/am.c:2224
+msgid "recode into utf8 (default)"
+msgstr "utf8 olarak yeniden kodla (รถntanฤฑmlฤฑ)"
+
+#: builtin/am.c:2226
+msgid "pass -k flag to git-mailinfo"
+msgstr "'git-mailinfo'ya -k bayraฤŸฤฑnฤฑ geรงir"
+
+#: builtin/am.c:2228
+msgid "pass -b flag to git-mailinfo"
+msgstr "'git-mailinfo'ya -b bayraฤŸฤฑnฤฑ geรงir"
+
+#: builtin/am.c:2230
+msgid "pass -m flag to git-mailinfo"
+msgstr "'git-mailinfo'ya -m bayraฤŸฤฑnฤฑ geรงir"
+
+#: builtin/am.c:2232
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "'git-mailsplit'e mbox biรงimi iรงin --keep-cr bayraฤŸฤฑnฤฑ geรงir"
+
+#: builtin/am.c:2235
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+"'git-mailsplit'e 'am.keepcr'dan baฤŸฤฑmsฤฑz olarak --keep-cr bayraฤŸฤฑnฤฑ geรงirme"
+
+#: builtin/am.c:2238
+msgid "strip everything before a scissors line"
+msgstr "bir kesim รงizgisinden รถnceki her ลŸeyi รงฤฑkar"
+
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
+msgid "pass it through git-apply"
+msgstr "git-apply aracฤฑlฤฑฤŸฤฑyla geรงir"
+
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+msgid "n"
+msgstr "n"
+
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+msgid "format"
+msgstr "biรงim"
+
+#: builtin/am.c:2264
+msgid "format the patch(es) are in"
+msgstr "yama biรงimi"
+
+#: builtin/am.c:2270
+msgid "override error message when patch failure occurs"
+msgstr "yama baลŸarฤฑsฤฑz olduฤŸunda hata iletisini geรงersiz kฤฑl"
+
+#: builtin/am.c:2272
+msgid "continue applying patches after resolving a conflict"
+msgstr "bir รงakฤฑลŸmayฤฑ รงรถzdรผkten sonra yamalarฤฑ uygulamayฤฑ sรผrdรผr"
+
+#: builtin/am.c:2275
+msgid "synonyms for --continue"
+msgstr "--continue eลŸanlamlฤฑlarฤฑ"
+
+#: builtin/am.c:2278
+msgid "skip the current patch"
+msgstr "geรงerli yamayฤฑ atla"
+
+#: builtin/am.c:2281
+msgid "restore the original branch and abort the patching operation."
+msgstr "ilk dalฤฑ eski durumuna getir ve yamalama iลŸlemini iptal et"
+
+#: builtin/am.c:2284
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "yamalama iลŸlemini iptal et ancak HEAD'i olduฤŸu yerde bฤฑrak"
+
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "uygulanmakta olan yamayฤฑ gรถster"
+
+#: builtin/am.c:2293
+msgid "lie about committer date"
+msgstr "gรถnderici tarihi hakkฤฑnda yalan sรถyle"
+
+#: builtin/am.c:2295
+msgid "use current timestamp for author date"
+msgstr "yazar tarihi iรงin geรงerli zaman damgasฤฑnฤฑ kullan"
+
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+msgid "key-id"
+msgstr "key-id"
+
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+msgid "GPG-sign commits"
+msgstr "GPG imzalฤฑ gรถnderiler"
+
+#: builtin/am.c:2301
+msgid "(internal use for git-rebase)"
+msgstr "(git-rebase iรงin iรง kullanฤฑm)"
+
+#: builtin/am.c:2319
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
+msgstr ""
+"-b/--binary seรงeneฤŸi uzunca bir sรผredir dรผzgรผn รงalฤฑลŸmฤฑyordu ve\n"
+"yakฤฑnda kaldฤฑrฤฑlacak. Lรผtfen artฤฑk kullanmayฤฑn."
+
+#: builtin/am.c:2326
+msgid "failed to read the index"
+msgstr "indeks okunamadฤฑ"
+
+#: builtin/am.c:2341
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+"Bir รถnceki yeniden temellendirme dizini %s hรขlรข mevcut ancak mbox verildi."
+
+#: builtin/am.c:2365
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"BaลŸฤฑboลŸ %s dizini bulundu.\n"
+"Kaldฤฑrmak iรงin \"git am --abort\" kullanฤฑn."
+
+#: builtin/am.c:2371
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Yapฤฑlmakta olan bir รงรถzรผm iลŸlemi yok, sรผrdรผrmรผyoruz."
+
+#: builtin/am.c:2381
+msgid "interactive mode requires patches on the command line"
+msgstr "etkileลŸimli kip yamanฤฑn komut satฤฑrฤฑnda olmasฤฑnฤฑ gerektirir"
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<seรงenekler>] [<patch>...]"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "arลŸiv dosyasฤฑ '%s' oluลŸturulamadฤฑ"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "รงฤฑktฤฑ yeniden yรถnlendirilemedi"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive: URL'si olmayan uzak konum"
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: ACK/NAK bekleniyordu, floลŸ paketi alฤฑndฤฑ"
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive NACK %s"
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr "git archive: Protokol hatasฤฑ"
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive: floลŸ bekleniyordu"
+
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <kรถtรผ_terim> <iyi_terim>"
+
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<gรถnderi>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <durum> <revizyon> <iyi_terim> "
+"<kรถtรผ_terim>"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <komut> <iyi_terim> "
+"<kรถtรผ_terim>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+"git bisect--helper --bisect-next-check <iyi_terim> <kรถtรผ_terim> [<terim>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<terim> --term-{new,bad}"
+"=<terim>][--no-checkout] [<kรถtรผ> [<iyi>...]] [--] [<yollar>...]"
+
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' geรงerli bir terim deฤŸil"
+
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "'%s yerleลŸik komutu bir terim olarak kullanฤฑlamฤฑyor"
+
+#: builtin/bisect--helper.c:100
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "'%s' teriminin anlamฤฑ deฤŸiลŸtirilemiyor"
+
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
+msgstr "lรผtfen iki deฤŸiลŸik terim kullanฤฑn"
+
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
+msgstr "BISECT_TERMS dosyasฤฑ aรงฤฑlamadฤฑ"
+
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "ฤฐkili arama yapmฤฑyoruz.\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' geรงerli bir gรถnderi deฤŸil"
+
+#: builtin/bisect--helper.c:172
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"Orijinal HEAD '%s' รงฤฑkฤฑลŸฤฑ yapฤฑlamadฤฑ. 'git bisect reset <gรถnderi>' deneyin."
+
+#: builtin/bisect--helper.c:216
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Hatalฤฑ bisect_write deฤŸiลŸkeni: %s"
+
+#: builtin/bisect--helper.c:221
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "'%s' revizyonunun oid'si alฤฑnamadฤฑ"
+
+#: builtin/bisect--helper.c:233
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "'%s' dosyasฤฑ aรงฤฑlamadฤฑ"
+
+#: builtin/bisect--helper.c:259
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Geรงersiz komut: ลžu anda bir %s/%s ikili aramasฤฑndasฤฑnฤฑz"
+
+#: builtin/bisect--helper.c:286
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"Bana en azฤฑndan bir %s ve %s revizyonu vermeniz gerekiyor.\n"
+"Bunun iรงin \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
+
+#: builtin/bisect--helper.c:290
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"\"git bisect start\" ile baลŸlamalฤฑsฤฑnฤฑz.\n"
+"Bundan sonra bana en azฤฑndan bir %s ve %s revizyonu vermeniz gerekiyor.\n"
+"Bunun iรงin \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
+
+#: builtin/bisect--helper.c:310
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "yalnฤฑzca bir %s gรถnderisi ile ikili arama yapฤฑlฤฑyor"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:318
+msgid "Are you sure [Y/n]? "
+msgstr "Emin misiniz [Y/n]? "
+
+#: builtin/bisect--helper.c:379
+msgid "no terms defined"
+msgstr "hiรงbir terim tanฤฑmlanmadฤฑ"
+
+#: builtin/bisect--helper.c:382
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Mevcut terimleriniz eski durum iรงin %s ve\n"
+"yeni durum iรงin %s.\n"
+
+#: builtin/bisect--helper.c:392
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"'git bisect terms' iรงin geรงersiz deฤŸiลŸken %s.\n"
+"Desteklenen seรงenekler: --term-good|--term-old ve --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:478
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "tanฤฑmlanamayan seรงenek: '%s'"
+
+#: builtin/bisect--helper.c:482
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' geรงerli bir revizyon deฤŸil gibi gรถrรผnรผyor"
+
+#: builtin/bisect--helper.c:514
+msgid "bad HEAD - I need a HEAD"
+msgstr "hatalฤฑ HEAD - Bana bir HEAD gerek"
+
+#: builtin/bisect--helper.c:529
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr "'%s' รงฤฑkฤฑลŸ yapฤฑmฤฑ baลŸarฤฑsฤฑz. 'git bisect start <geรงerli-dal>' deneyin."
+
+#: builtin/bisect--helper.c:550
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "cg-seek yapฤฑlmฤฑลŸ bir aฤŸaรงta ikili arama yapฤฑlmayacak"
+
+#: builtin/bisect--helper.c:553
+msgid "bad HEAD - strange symbolic ref"
+msgstr "hatalฤฑ HEAD - tuhaf sembolik baลŸvuru"
+
+#: builtin/bisect--helper.c:577
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "geรงersiz baลŸvuru: '%s'"
+
+#: builtin/bisect--helper.c:633
+msgid "perform 'git bisect next'"
+msgstr "'git bisect next' gerรงekleลŸtir"
+
+#: builtin/bisect--helper.c:635
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "terimleri .git/BISECT_TERMS konumuna yaz"
+
+#: builtin/bisect--helper.c:637
+msgid "cleanup the bisection state"
+msgstr "ikili arama durumunu temizle"
+
+#: builtin/bisect--helper.c:639
+msgid "check for expected revs"
+msgstr "beklenen baลŸvurular iรงin denetle"
+
+#: builtin/bisect--helper.c:641
+msgid "reset the bisection state"
+msgstr "ikili arama durumunu sฤฑfฤฑrla"
+
+#: builtin/bisect--helper.c:643
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "ikili arama durumunu BISECT_LOG iรงine yaz"
+
+#: builtin/bisect--helper.c:645
+msgid "check and set terms in a bisection state"
+msgstr "bir ikili arama durumundaki terimleri denetle ve ayarla"
+
+#: builtin/bisect--helper.c:647
+msgid "check whether bad or good terms exist"
+msgstr "iyi veya kรถtรผ terimlerin olup olmadฤฑฤŸฤฑnฤฑ denetle"
+
+#: builtin/bisect--helper.c:649
+msgid "print out the bisect terms"
+msgstr "ikili arama terimlerini yazdฤฑr"
+
+#: builtin/bisect--helper.c:651
+msgid "start the bisect session"
+msgstr "ikili arama oturumunu baลŸlat"
+
+#: builtin/bisect--helper.c:653
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "geรงerli gรถnderiyi รงฤฑkฤฑลŸ yapmak yerine BISECT_HEAD gรผncelle"
+
+#: builtin/bisect--helper.c:655
+msgid "no log for BISECT_WRITE"
+msgstr "BISECT_WRITE iรงin gรผnlรผk yok"
+
+#: builtin/bisect--helper.c:673
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms iki deฤŸiลŸken gerektiriyor"
+
+#: builtin/bisect--helper.c:677
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state bir deฤŸiลŸken gerektirmiyor"
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset bir deฤŸiลŸken veya gรถnderi gerektirmiyor"
+
+#: builtin/bisect--helper.c:688
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write 4 veya 5 deฤŸiลŸken gerektiriyor"
+
+#: builtin/bisect--helper.c:694
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--check-and-set-terms 3 deฤŸiลŸken gerektiriyor"
+
+#: builtin/bisect--helper.c:700
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check 2 veya 3 deฤŸiลŸken gerektiriyor"
+
+#: builtin/bisect--helper.c:706
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms 0 veya 1 deฤŸiลŸken gerektiriyor"
+
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<seรงenekler>] [<rev-sรงnk>] [<rev>] [--] <dosya>"
+
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<rev-sรงnk>, git-rev-list(1) iรงinde belgelendirilmiลŸtir"
+
+#: builtin/blame.c:409
+#, c-format
+msgid "expecting a color: %s"
+msgstr "bir renk bekleniyor: %s"
+
+#: builtin/blame.c:416
+msgid "must end with a color"
+msgstr "bir renk ile bitmeli"
+
+#: builtin/blame.c:729
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "color.blame.repeatedLines iรงinde geรงersiz renk '%s'"
+
+#: builtin/blame.c:747
+msgid "invalid value for blame.coloring"
+msgstr "blame.coloring iรงin geรงersiz deฤŸer"
+
+#: builtin/blame.c:822
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "yok saymak iรงin %s revizyonu bulunamฤฑyor"
+
+#: builtin/blame.c:844
+msgid "Show blame entries as we find them, incrementally"
+msgstr "genel bakฤฑลŸ girdilerini buldukรงa artan biรงimde gรถster"
+
+#: builtin/blame.c:845
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr "sฤฑnฤฑr gรถnderileri iรงin boลŸ SHA-1 gรถster (ร–ntanฤฑmlฤฑ: Kapalฤฑ)"
+
+#: builtin/blame.c:846
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr "kรถk gรถnderilerini sฤฑnฤฑr olarak varsayma (ร–ntanฤฑmlฤฑ: Kapalฤฑ)"
+
+#: builtin/blame.c:847
+msgid "Show work cost statistics"
+msgstr "iลŸ maliyet istatistiklerini gรถster"
+
+#: builtin/blame.c:848
+msgid "Force progress reporting"
+msgstr "durum bildirmeyi zorla"
+
+#: builtin/blame.c:849
+msgid "Show output score for blame entries"
+msgstr "genel bakฤฑลŸ girdileri iรงin รงฤฑktฤฑ skorunu gรถster"
+
+#: builtin/blame.c:850
+msgid "Show original filename (Default: auto)"
+msgstr "orijinal dosya adฤฑnฤฑ gรถster (ร–ntanฤฑmlฤฑ: Otomatik)"
+
+#: builtin/blame.c:851
+msgid "Show original linenumber (Default: off)"
+msgstr "orijinal satฤฑr numarasฤฑnฤฑ gรถster (ร–ntanฤฑmlฤฑ: Kapalฤฑ)"
+
+#: builtin/blame.c:852
+msgid "Show in a format designed for machine consumption"
+msgstr "makine iลŸlemesi iรงin tasarlanmฤฑลŸ bir biรงimde gรถster"
+
+#: builtin/blame.c:853
+msgid "Show porcelain format with per-line commit information"
+msgstr "okunabilir biรงimde her satฤฑr iรงin gรถnderi bilgisi ile gรถster"
+
+#: builtin/blame.c:854
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr "git-annotate ile aynฤฑ รงฤฑktฤฑ kipini kullan (ร–ntanฤฑmlฤฑ: Kapalฤฑ)"
+
+#: builtin/blame.c:855
+msgid "Show raw timestamp (Default: off)"
+msgstr "ham zaman damgasฤฑnฤฑ gรถster (ร–ntanฤฑmlฤฑ: Kapalฤฑ)"
+
+#: builtin/blame.c:856
+msgid "Show long commit SHA1 (Default: off)"
+msgstr "uzun gรถnderi SHA1'ini gรถster (ร–ntanฤฑmlฤฑ: Kapalฤฑ)"
+
+#: builtin/blame.c:857
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr "yazar adฤฑnฤฑ ve zaman damgasฤฑnฤฑ gizle (ร–ntanฤฑmlฤฑ: Kapalฤฑ)"
+
+#: builtin/blame.c:858
+msgid "Show author email instead of name (Default: off)"
+msgstr "yazar adฤฑ yerine e-postasฤฑnฤฑ gรถster (ร–ntanฤฑmlฤฑ: Kapalฤฑ)"
+
+#: builtin/blame.c:859
+msgid "Ignore whitespace differences"
+msgstr "boลŸluk ayrฤฑmlarฤฑnฤฑ yok say"
+
+#: builtin/blame.c:860 builtin/log.c:1702
+msgid "rev"
+msgstr "revizyon"
+
+#: builtin/blame.c:860
+msgid "Ignore <rev> when blaming"
+msgstr "suรงlarken <revizyon>'u yok say"
+
+#: builtin/blame.c:861
+msgid "Ignore revisions from <file>"
+msgstr "<dosya>'dan olan revizyonlarฤฑ yok say"
+
+#: builtin/blame.c:862
+msgid "color redundant metadata from previous line differently"
+msgstr "bir รถnceki dosyadan gereksiz รผstveriyi baลŸka biรงimde renklendir"
+
+#: builtin/blame.c:863
+msgid "color lines by age"
+msgstr "satฤฑrlarฤฑ yaลŸฤฑna gรถre renklendir"
+
+#: builtin/blame.c:864
+msgid "Spend extra cycles to find better match"
+msgstr "daha iyi eลŸleลŸme bulmak iรงin ek dรถngรผler harca"
+
+#: builtin/blame.c:865
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr "git-rev-list รงaฤŸฤฑrma yerine <dosya>'dan olan revizyonlarฤฑ kullan"
+
+#: builtin/blame.c:866
+msgid "Use <file>'s contents as the final image"
+msgstr "<dosya>'nฤฑn iรงeriฤŸini son gรถrรผntรผ olarak kullan"
+
+#: builtin/blame.c:867 builtin/blame.c:868
+msgid "score"
+msgstr "skor"
+
+#: builtin/blame.c:867
+msgid "Find line copies within and across files"
+msgstr "satฤฑr kopyalarฤฑnฤฑ dosyalar iรงinde ve arasฤฑnda ara"
+
+#: builtin/blame.c:868
+msgid "Find line movements within and across files"
+msgstr "satฤฑr hareketlerini dosyalar iรงinde ve arasฤฑnda ara"
+
+#: builtin/blame.c:869
+msgid "n,m"
+msgstr "n,m"
+
+#: builtin/blame.c:869
+msgid "Process only line range n,m, counting from 1"
+msgstr "1'den saymaya baลŸlayarak yalnฤฑzca n,m satฤฑr aralฤฑฤŸฤฑnฤฑ iลŸle"
+
+#: builtin/blame.c:921
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress, --incremental veya okunabilir biรงimlerle kullanฤฑlamaz"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:972
+msgid "4 years, 11 months ago"
+msgstr "4 yฤฑl 11 ay รถnce"
+
+#: builtin/blame.c:1079
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "%s dosyasฤฑnda yalnฤฑzca %lu satฤฑr var"
+msgstr[1] "%s dosyasฤฑnda yalnฤฑzca %lu satฤฑr var"
+
+#: builtin/blame.c:1125
+msgid "Blaming lines"
+msgstr "Genel bakฤฑลŸ satฤฑrlarฤฑ"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<seรงenekler>] [-r | -a] [--merged | --no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<seรงenekler>] [-l] [-f] <dal-adฤฑ> [<baลŸlama-noktasฤฑ>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<seรงenekler>] [-r] (-d | -D) <dal-adฤฑ>..."
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<seรงenekler>] (-m | -M) [<eski-dal>] <yeni-dal>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<seรงenekler>] (-c | -C) [<eski-dal>] <yeni-dal>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<seรงenekler>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<seรงenekler>] [-r | -a] [--format]"
+
+#: builtin/branch.c:154
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD."
+msgstr ""
+"'%s' dalฤฑ siliniyor: Bu dal '%s'\n"
+"         dalฤฑna birleลŸtirilmiลŸ, ancak HEAD'e henรผz birleลŸtirilmemiลŸ"
+
+#: builtin/branch.c:158
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD."
+msgstr ""
+"'%s' dalฤฑ silinmiyor: Bu dal HEAD'e birleลŸtirilmiลŸ olmasฤฑna raฤŸmen\n"
+"         '%s' dalฤฑna birleลŸtirilmemiลŸ."
+
+#: builtin/branch.c:172
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "'%s' iรงin gรถnderi nesnesi aranamadฤฑ"
+
+#: builtin/branch.c:176
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"'%s' dalฤฑ tรผmรผyle birleลŸtirilmemiลŸ.\n"
+"EฤŸer silmek istediฤŸinizden eminseniz 'git branch -D %s' รงalฤฑลŸtฤฑrฤฑn."
+
+#: builtin/branch.c:189
+msgid "Update of config-file failed"
+msgstr "config-file gรผncellemesi baลŸarฤฑsฤฑz"
+
+#: builtin/branch.c:220
+msgid "cannot use -a with -d"
+msgstr "-a, -d ile kullanฤฑlamฤฑyor"
+
+#: builtin/branch.c:226
+msgid "Couldn't look up commit object for HEAD"
+msgstr "HEAD iรงin gรถnderi nesnesi aranamadฤฑ"
+
+#: builtin/branch.c:240
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "ลžurada รงฤฑkฤฑลŸ yapฤฑlmฤฑลŸ '%s' dalฤฑ silinemiyor: '%s'"
+
+#: builtin/branch.c:255
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "uzak izleme dalฤฑ '%s' bulunamadฤฑ"
+
+#: builtin/branch.c:256
+#, c-format
+msgid "branch '%s' not found."
+msgstr "'%s' dalฤฑ bulunamadฤฑ"
+
+#: builtin/branch.c:271
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "Uzak izleme dalฤฑ '%s' silinirken hata"
+
+#: builtin/branch.c:272
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "'%s' dalฤฑ silinirken hata"
+
+#: builtin/branch.c:279
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Uzak izleme dalฤฑ %s silindi (%s idi).\n"
+
+#: builtin/branch.c:280
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "%s dalฤฑ silindi (%s idi).\n"
+
+#: builtin/branch.c:429 builtin/tag.c:61
+msgid "unable to parse format string"
+msgstr "biรงim dizisi ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "HEAD รงรถzรผlemedi"
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s), refs/heads/ dฤฑลŸฤฑna iลŸaret ediyor"
+
+#: builtin/branch.c:481
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "%s dalฤฑ %s konumunda yeniden temellendiriliyor"
+
+#: builtin/branch.c:485
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "%s dalฤฑ %s konumunda ikili aranฤฑyor"
+
+#: builtin/branch.c:502
+msgid "cannot copy the current branch while not on any."
+msgstr "bir dalฤฑn รผzerinde deฤŸilken geรงerli dal kopyalanamaz"
+
+#: builtin/branch.c:504
+msgid "cannot rename the current branch while not on any."
+msgstr "bir dalฤฑn รผzerinde deฤŸilken geรงerli dal yeniden adlandฤฑrฤฑlamaz"
+
+#: builtin/branch.c:515
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Geรงersiz dal adฤฑ: '%s'"
+
+#: builtin/branch.c:542
+msgid "Branch rename failed"
+msgstr "Dal yeniden adlandฤฑrmasฤฑ baลŸarฤฑsฤฑz"
+
+#: builtin/branch.c:544
+msgid "Branch copy failed"
+msgstr "Dal kopyalamasฤฑ baลŸarฤฑsฤฑz"
+
+#: builtin/branch.c:548
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "YanlฤฑลŸ adlandฤฑrฤฑlan '%s' dalฤฑnฤฑn bir kopyasฤฑ oluลŸturuldu"
+
+#: builtin/branch.c:551
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "YanlฤฑลŸ adlandฤฑrฤฑlan '%s' dalฤฑ yeniden adlandฤฑrฤฑldฤฑ"
+
+#: builtin/branch.c:557
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "Dal %s olarak yeniden adlandฤฑrฤฑldฤฑ, ancak HEAD gรผncellenmedi!"
+
+#: builtin/branch.c:566
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "Dal yeniden adlandฤฑrฤฑldฤฑ, ancak config-file gรผncellemesi baลŸarฤฑsฤฑz"
+
+#: builtin/branch.c:568
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Dal kopyalandฤฑ, ancak config-file gรผncellemesi baลŸarฤฑsฤฑz"
+
+#: builtin/branch.c:584
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Lรผtfen dal aรงฤฑklamasฤฑnฤฑ dรผzenleyin:\n"
+"\t%s\n"
+"'%c' ile baลŸlayan satฤฑrlar รงฤฑkarฤฑlacaktฤฑr.\n"
+
+#: builtin/branch.c:618
+msgid "Generic options"
+msgstr "Genel seรงenekler"
+
+#: builtin/branch.c:620
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "saฤŸlamayฤฑ ve konuyu gรถster, รผstkaynak dalฤฑ iรงin iki kez ver"
+
+#: builtin/branch.c:621
+msgid "suppress informational messages"
+msgstr "bilgi iletilerini gizle"
+
+#: builtin/branch.c:622
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "izleme kipini ayarla (bilgi iรงin: git-pull(1))"
+
+#: builtin/branch.c:624
+msgid "do not use"
+msgstr "kullanma"
+
+#: builtin/branch.c:626 builtin/rebase.c:513
+msgid "upstream"
+msgstr "รผstkaynak"
+
+#: builtin/branch.c:626
+msgid "change the upstream info"
+msgstr "รผstkaynak bilgisini deฤŸiลŸtir"
+
+#: builtin/branch.c:627
+msgid "unset the upstream info"
+msgstr "รผstkaynak bilgisini kaldฤฑr"
+
+#: builtin/branch.c:628
+msgid "use colored output"
+msgstr "renklendirilmiลŸ รงฤฑktฤฑ kullan"
+
+#: builtin/branch.c:629
+msgid "act on remote-tracking branches"
+msgstr "uzak izleyen dallarda iลŸ yap"
+
+#: builtin/branch.c:631 builtin/branch.c:633
+msgid "print only branches that contain the commit"
+msgstr "yalnฤฑzca gรถnderiyi iรงeren dallarฤฑ yazdฤฑr"
+
+#: builtin/branch.c:632 builtin/branch.c:634
+msgid "print only branches that don't contain the commit"
+msgstr "yalnฤฑzca gรถnderiyi iรงermeyen dallarฤฑ yazdฤฑr"
+
+#: builtin/branch.c:637
+msgid "Specific git-branch actions:"
+msgstr "ร–zel git-branch eylemleri:"
+
+#: builtin/branch.c:638
+msgid "list both remote-tracking and local branches"
+msgstr "hem uzak izleyen hem de yerel dallarฤฑ listele"
+
+#: builtin/branch.c:640
+msgid "delete fully merged branch"
+msgstr "tรผmรผyle birleลŸtirilen dalฤฑ sil"
+
+#: builtin/branch.c:641
+msgid "delete branch (even if not merged)"
+msgstr "dalฤฑ sil (birleลŸtirilmemiลŸ olsa bile)"
+
+#: builtin/branch.c:642
+msgid "move/rename a branch and its reflog"
+msgstr "bir dalฤฑ ve onun baลŸvuru gรผnlรผฤŸรผnรผ taลŸฤฑ/yeniden adlandฤฑr"
+
+#: builtin/branch.c:643
+msgid "move/rename a branch, even if target exists"
+msgstr "bir dalฤฑ taลŸฤฑ/yeniden adlandฤฑr, hedef var olsa bile"
+
+#: builtin/branch.c:644
+msgid "copy a branch and its reflog"
+msgstr "bir dalฤฑ ve onun baลŸvuru gรผnlรผฤŸรผnรผ kopyala"
+
+#: builtin/branch.c:645
+msgid "copy a branch, even if target exists"
+msgstr "bir dalฤฑ kopyala, hedef var olsa bile"
+
+#: builtin/branch.c:646
+msgid "list branch names"
+msgstr "dal adlarฤฑnฤฑ listele"
+
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "geรงerli dal adฤฑnฤฑ gรถster"
+
+#: builtin/branch.c:648
+msgid "create the branch's reflog"
+msgstr "dalฤฑn baลŸvuru gรผnlรผฤŸรผnรผ oluลŸtur"
+
+#: builtin/branch.c:650
+msgid "edit the description for the branch"
+msgstr "dalฤฑn aรงฤฑklamasฤฑnฤฑ dรผzenle"
+
+#: builtin/branch.c:651
+msgid "force creation, move/rename, deletion"
+msgstr "zorla oluลŸtur, taลŸฤฑ/yeniden adlandฤฑr, sil"
+
+#: builtin/branch.c:652
+msgid "print only branches that are merged"
+msgstr "yalnฤฑzca birleลŸtirilen dallarฤฑ yazdฤฑr"
+
+#: builtin/branch.c:653
+msgid "print only branches that are not merged"
+msgstr "yalnฤฑzca birleลŸtirilmeyen dallarฤฑ yazdฤฑr"
+
+#: builtin/branch.c:654
+msgid "list branches in columns"
+msgstr "dallarฤฑ sรผtunlarla listele"
+
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:433
+msgid "object"
+msgstr "nesne"
+
+#: builtin/branch.c:658
+msgid "print only branches of the object"
+msgstr "yalnฤฑzca nesnenin dallarฤฑnฤฑ yazdฤฑr"
+
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+msgid "sorting and filtering are case insensitive"
+msgstr "sฤฑralama ve sรผzme BรœYรœK/kรผรงรผk harf duyarlฤฑ deฤŸildir"
+
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "รงฤฑktฤฑ iรงin kullanฤฑlacak biรงim"
+
+#: builtin/branch.c:684 builtin/clone.c:785
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD, refs/heads altฤฑnda bulunamadฤฑ!"
+
+#: builtin/branch.c:708
+msgid "--column and --verbose are incompatible"
+msgstr "--column ve --verbose birbiriyle uyumsuz"
+
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+msgid "branch name required"
+msgstr "dal adฤฑ gerekli"
+
+#: builtin/branch.c:753
+msgid "Cannot give description to detached HEAD"
+msgstr "AyrฤฑlmฤฑลŸ HEAD'e aรงฤฑklama verilemiyor"
+
+#: builtin/branch.c:758
+msgid "cannot edit description of more than one branch"
+msgstr "birden รงok dalฤฑn aรงฤฑklamasฤฑ dรผzenlenemiyor"
+
+#: builtin/branch.c:765
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "'%s' dalฤฑnda henรผz bir gรถnderi yok."
+
+#: builtin/branch.c:768
+#, c-format
+msgid "No branch named '%s'."
+msgstr "'%s' adฤฑnda bir dal yok."
+
+#: builtin/branch.c:783
+msgid "too many branches for a copy operation"
+msgstr "bir kopyalama iลŸlemi iรงin รงok fazla dal"
+
+#: builtin/branch.c:792
+msgid "too many arguments for a rename operation"
+msgstr "bir yeniden adlandฤฑrma iลŸlemi iรงin รงok fazla deฤŸiลŸken"
+
+#: builtin/branch.c:797
+msgid "too many arguments to set new upstream"
+msgstr "yeni รผstkaynak ayarlamak iรงin รงok fazla deฤŸiลŸken"
+
+#: builtin/branch.c:801
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"HEAD'in รผst kaynaฤŸฤฑ %s olarak ayarlanamadฤฑ, รงรผnkรผ herhangi bir dala iลŸaret "
+"etmiyor."
+
+#: builtin/branch.c:804 builtin/branch.c:827
+#, c-format
+msgid "no such branch '%s'"
+msgstr "'%s' diye bir dal yok"
+
+#: builtin/branch.c:808
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "'%s' diye bir dal mevcut deฤŸil"
+
+#: builtin/branch.c:821
+msgid "too many arguments to unset upstream"
+msgstr "รผst kaynaฤŸฤฑ kaldฤฑrmak iรงin รงok fazla deฤŸiลŸken"
+
+#: builtin/branch.c:825
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr ""
+"HEAD'in รผst kaynaฤŸฤฑ kaldฤฑrฤฑlamadฤฑ, รงรผnkรผ herhangi bir dala iลŸaret etmiyor."
+
+#: builtin/branch.c:831
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "'%s' dalฤฑnฤฑn รผstkaynak bilgisi yok"
+
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
+msgstr ""
+"'git branch'in -a ve -r seรงenekleri bir dal adฤฑ almaz.\n"
+"ลžunu mu demek istediniz: -a|-r --list <dizgi>?"
+
+#: builtin/branch.c:845
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+"--set-upstream seรงeneฤŸi artฤฑk desteklenmiyor. Lรผtfen --track veya --set-"
+"upstream-to kullanฤฑn."
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<seรงenekler>] <dosya> <git-rev-liste deฤŸiลŸkenler>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<seรงenekler>] <dosya>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <dosya> [<baลŸvuru-adฤฑ>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <dosya> [<baลŸvuru-adฤฑ>...]"
+
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "ilerleme รงubuฤŸunu gรถsterme"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "ilerleme รงubuฤŸunu gรถster"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr "ilerleme รงubuฤŸunu nesne yazฤฑmฤฑ aลŸamasฤฑ sฤฑrasฤฑnda gรถster"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "ilerleme รงubuฤŸu gรถsterildiฤŸinde --all-progress'e benzer"
+
+#: builtin/bundle.c:93
+msgid "Need a repository to create a bundle."
+msgstr "Bir demet oluลŸturmak iรงin bir depo gerekli."
+
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "demet ayrฤฑntฤฑlarฤฑnฤฑ gรถsterme"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s tamam\n"
+
+#: builtin/bundle.c:160
+msgid "Need a repository to unbundle."
+msgstr "Demeti รงรถzmek iรงin bir depo gerekli"
+
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ayrฤฑntฤฑlฤฑ anlat; bir altkomuttan รถnce yerleลŸtirilmelidir"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Bilinmeyen altkomut: %s"
+
+#: builtin/cat-file.c:595
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tรผr> | --textconv | --filters) [--path=<yol>] <nesne>"
+
+#: builtin/cat-file.c:596
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+
+#: builtin/cat-file.c:617
+msgid "only one batch option may be specified"
+msgstr "yalnฤฑzca bir toplu iลŸ seรงeneฤŸi belirtilebilir"
+
+#: builtin/cat-file.c:635
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<tรผr> yalnฤฑzca ลŸunlardan biri olabilir: blob, tree, commit, tag"
+
+#: builtin/cat-file.c:636
+msgid "show object type"
+msgstr "nesne tรผrรผnรผ gรถster"
+
+#: builtin/cat-file.c:637
+msgid "show object size"
+msgstr "nesne boyutunu gรถster"
+
+#: builtin/cat-file.c:639
+msgid "exit with zero when there's no error"
+msgstr "hata yoksa sฤฑfฤฑr koduyla รงฤฑk"
+
+#: builtin/cat-file.c:640
+msgid "pretty-print object's content"
+msgstr "nesne iรงeriฤŸini hoลŸ biรงimde gรถster"
+
+#: builtin/cat-file.c:642
+msgid "for blob objects, run textconv on object's content"
+msgstr "ikili nesneler iรงin nesne iรงeriฤŸi รผzerinde textconv รงalฤฑลŸtฤฑr"
+
+#: builtin/cat-file.c:644
+msgid "for blob objects, run filters on object's content"
+msgstr "ikili nesneler iรงin nesne iรงeriฤŸi รผzerinde sรผzgeรงler รงalฤฑลŸtฤฑr"
+
+#: builtin/cat-file.c:645 git-submodule.sh:1002
+msgid "blob"
+msgstr "ikili nesne"
+
+#: builtin/cat-file.c:646
+msgid "use a specific path for --textconv/--filters"
+msgstr "--textconv/--filters iรงin belirli bir yol kullan"
+
+#: builtin/cat-file.c:648
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "-s ve -t'nin bozuk/hasar gรถrmรผลŸ nesnelerle รงalฤฑลŸmasฤฑna izin ver"
+
+#: builtin/cat-file.c:649
+msgid "buffer --batch output"
+msgstr "--batch รงฤฑktฤฑsฤฑnฤฑ arabelleฤŸe al"
+
+#: builtin/cat-file.c:651
+msgid "show info and content of objects fed from the standard input"
+msgstr "standart girdi'den beslenen nesnelerin bilgisini ve iรงeriฤŸini gรถster"
+
+#: builtin/cat-file.c:655
+msgid "show info about objects fed from the standard input"
+msgstr "standart girdi'den beslenen nesneler hakkฤฑnda bilgi gรถster"
+
+#: builtin/cat-file.c:659
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr ""
+"aฤŸaรง iรงi sembolik baฤŸlarฤฑ izle (--batch veya --batch-check ile kullanฤฑlฤฑr)"
+
+#: builtin/cat-file.c:661
+msgid "show all objects with --batch or --batch-check"
+msgstr "--batch veya --batch-check ile olan tรผm nesneleri gรถster"
+
+#: builtin/cat-file.c:663
+msgid "do not order --batch-all-objects output"
+msgstr "--batch-all-objects รงฤฑktฤฑsฤฑnฤฑ sฤฑralama"
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <รถznitelik>...] [--] <yol-adฤฑ>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <รถznitelik>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "tรผm dosya รถzniteliklerini bildir"
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr "yalnฤฑzca indeksteki .gitattributes'u kullan"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr "dosya adlarฤฑnฤฑ stdin'den oku"
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr "girdi ve รงฤฑktฤฑ kayฤฑtlarฤฑnฤฑ bir NUL karakteri ile sonlandฤฑr"
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
+msgid "suppress progress reporting"
+msgstr "ilerleme bildirimini gizle"
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr "eลŸleลŸmeyen girdi yollarฤฑnฤฑ gรถster"
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr "denetlerken indeksi yok say"
+
+#: builtin/check-ignore.c:163
+msgid "cannot specify pathnames with --stdin"
+msgstr "yol adlarฤฑ --stdin ile belirtilemiyor"
+
+#: builtin/check-ignore.c:166
+msgid "-z only makes sense with --stdin"
+msgstr "-z yalnฤฑzca --stdin ile bir anlam ifade eder"
+
+#: builtin/check-ignore.c:168
+msgid "no path specified"
+msgstr "bir yol belirtilmedi"
+
+#: builtin/check-ignore.c:172
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet yalnฤฑzca tek bir yol adฤฑ ile geรงerlidir"
+
+#: builtin/check-ignore.c:174
+msgid "cannot have both --quiet and --verbose"
+msgstr "hem --quiet hem --verbose birlikte kullanฤฑlamaz"
+
+#: builtin/check-ignore.c:177
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching yalnฤฑzca --verbose ile geรงerlidir"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<seรงenekler>] <contact>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "stdin'den kiลŸileri de oku"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "kiลŸi ayrฤฑลŸtฤฑrฤฑlamadฤฑ: %s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "kiลŸi belirtilmedi"
+
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<seรงenekler>] [--] [<dosya>...]"
+
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
+msgstr "stage 1 ve 3 arasฤฑnda veya tรผmรผ olmalฤฑdฤฑr"
+
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
+msgstr "indeksteki tรผm dosyalarฤฑ รงฤฑkฤฑลŸ yap"
+
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
+msgstr "mevcut dosyalarฤฑn รผzerine yazฤฑlmasฤฑnฤฑ zorla"
+
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
+msgstr "mevcut dosyalar ve indekste olmayan dosyalar iรงin uyarma"
+
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
+msgstr "yeni dosyalarฤฑ รงฤฑkฤฑลŸ yapma"
+
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
+msgstr "indeks dosyasฤฑndaki dosya bilgilerini gรผncelle"
+
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
+msgstr "yollarฤฑn listesini standart girdi'den oku"
+
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
+msgstr "iรงeriฤŸi geรงici dosyalara yaz"
+
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
+msgid "string"
+msgstr "dizi"
+
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
+msgstr "dosyalar oluลŸtururken baลŸฤฑna <dizi> ekle"
+
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
+msgstr "dosyalarฤฑ adฤฑ verilen alandan kopyala"
+
+#: builtin/checkout.c:31
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<seรงenekler>] <dal>"
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<seรงenekler>] [<dal>] -- <dosya>..."
+
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<seรงenekler>] [<dal>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<seรงenekler>] [--source=<dal>] <dosya>..."
+
+#: builtin/checkout.c:175 builtin/checkout.c:214
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "'%s' yolu bizdeki sรผrรผme iye deฤŸil"
+
+#: builtin/checkout.c:177 builtin/checkout.c:216
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "'%s' yolu onlardaki sรผrรผme iye deฤŸil"
+
+#: builtin/checkout.c:193
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "'%s' yolu gereken tรผm sรผrรผmlere iye deฤŸil"
+
+#: builtin/checkout.c:243
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "'%s' yolu gereken sรผrรผmlere iye deฤŸil"
+
+#: builtin/checkout.c:261
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "'%s' yolu: BirleลŸtirilemiyor"
+
+#: builtin/checkout.c:277
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "'%s' iรงin birleลŸtirme sonuรงlarฤฑ eklenemiyor"
+
+#: builtin/checkout.c:377
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "%d birleลŸtirme รงakฤฑลŸmasฤฑ yeniden oluลŸturuldu"
+msgstr[1] "%d birleลŸtirme รงakฤฑลŸmasฤฑ yeniden oluลŸturuldu"
+
+#: builtin/checkout.c:382
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "%d yol ลŸuradan gรผncellendi: %s"
+msgstr[1] "%d yol ลŸuradan gรผncellendi: %s"
+
+#: builtin/checkout.c:389
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "%d yol indeksten gรผncellendi"
+msgstr[1] "%d yol indeksten gรผncellendi"
+
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' gรผncellenmekte olan yollarla kullanฤฑlamaz"
+
+#: builtin/checkout.c:425 builtin/checkout.c:428
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s', %s ile birlikte kullanฤฑlamaz"
+
+#: builtin/checkout.c:432
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "Aynฤฑ anda hem yollarฤฑ gรผncelleyip hem de '%s' dalฤฑna geรงilemiyor."
+
+#: builtin/checkout.c:436
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "ne '%s' ne de '%s' belirtilmiลŸ"
+
+#: builtin/checkout.c:440
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s', '%s' รถgesinin belirtilmediฤŸi durumlarda kullanฤฑlmalฤฑdฤฑr"
+
+#: builtin/checkout.c:445 builtin/checkout.c:450
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' veya '%s', %s ile birlikte kullanฤฑlamaz"
+
+#: builtin/checkout.c:509 builtin/checkout.c:516
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "'%s' yolu birleลŸtirilmemiลŸ"
+
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+msgid "you need to resolve your current index first"
+msgstr "รถnce geรงerli indeksinizi รงรถzmelisiniz"
+
+#: builtin/checkout.c:734
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"aลŸaฤŸฤฑdaki hazฤฑrlanmฤฑลŸ deฤŸiลŸiklikler iรงeren dosyalarla sรผrdรผrรผlemiyor:\n"
+"%s"
+
+#: builtin/checkout.c:837
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "'%s' iรงin baลŸvuru gรผnlรผฤŸรผ yapฤฑlamฤฑyor: %s\n"
+
+#: builtin/checkout.c:879
+msgid "HEAD is now at"
+msgstr "HEAD ลŸimdi ลŸurada:"
+
+#: builtin/checkout.c:883 builtin/clone.c:717
+msgid "unable to update HEAD"
+msgstr "HEAD gรผncellenemiyor"
+
+#: builtin/checkout.c:887
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "'%s' dalฤฑ sฤฑfฤฑrlandฤฑ.\n"
+
+#: builtin/checkout.c:890
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Halihazฤฑrda '%s' รผzerinde\n"
+
+#: builtin/checkout.c:894
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "'%s' dalฤฑna geรงildi ve sฤฑfฤฑrlandฤฑ.\n"
+
+#: builtin/checkout.c:896 builtin/checkout.c:1320
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Yeni '%s' dalฤฑna geรงildi.\n"
+
+#: builtin/checkout.c:898
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "'%s' dalฤฑna geรงildi.\n"
+
+#: builtin/checkout.c:949
+#, c-format
+msgid " ... and %d more.\n"
+msgstr "... ve %d daha.\n"
+
+#: builtin/checkout.c:955
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"Uyarฤฑ: Arkanฤฑzda dallarฤฑnฤฑzdan hiรงbirine baฤŸlฤฑ olmayฤฑn %d gรถnderi\n"
+"bฤฑrakฤฑyorsunuz:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Uyarฤฑ: Arkanฤฑzda dallarฤฑnฤฑzdan hiรงbirine baฤŸlฤฑ olmayฤฑn %d gรถnderi\n"
+"bฤฑrakฤฑyorsunuz:\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:974
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"EฤŸer bunu yeni bir dal oluลŸturup tutmak istiyorsanฤฑz ลŸimdi bunu yapmak\n"
+"iรงin iyi bir zaman olabilir:\n"
+"\n"
+"\tgit branch <yeni-dal-adฤฑ> %s\n"
+"\n"
+msgstr[1] ""
+"EฤŸer bunlarฤฑ yeni bir dal oluลŸturup tutmak istiyorsanฤฑz ลŸimdi bunu yapmak\n"
+"iรงin iyi bir zaman olabilir:\n"
+"\n"
+"\tgit branch <yeni-dal-adฤฑ> %s\n"
+"\n"
+
+#: builtin/checkout.c:1009
+msgid "internal error in revision walk"
+msgstr "revizyonlarda gezinirken iรง hata"
+
+#: builtin/checkout.c:1013
+msgid "Previous HEAD position was"
+msgstr "ร–nceki HEAD konumu ลŸuydu:"
+
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
+msgid "You are on a branch yet to be born"
+msgstr "Henรผz doฤŸmamฤฑลŸ bir dal รผzerindesiniz"
+
+#: builtin/checkout.c:1128
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"'%s' hem bir yerel dosya hem de bir izleme dalฤฑ olabilir.\n"
+"Lรผtfen -- (ve isteฤŸe baฤŸlฤฑ olarak --no-guess) kullanฤฑp belirsizliฤŸi giderin."
+
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"EฤŸer bir uzak izleme dalฤฑnฤฑ รงฤฑkฤฑลŸ yapmak istediyseniz รถrn. 'origin',\n"
+"bunu adฤฑ --track seรงeneฤŸi ile tam olarak nitelendirip yapabilirsiniz.\n"
+"\n"
+"\tgit checkout --track origin/<ad>\n"
+"\n"
+"EฤŸer her zaman belirsiz <ad> รงฤฑkฤฑลŸlarฤฑnฤฑn bir uzak konumu tercih etmesini\n"
+"isterseniz, รถrn. 'origin', yapฤฑlandฤฑrmanฤฑzda checkout.defaultsRemote=origin\n"
+"ayarฤฑnฤฑ yapmayฤฑ dรผลŸรผnรผn."
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' birden รงok (%d) uzak izleme dalฤฑyla eลŸleลŸti"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "yalnฤฑzca bir baลŸvuru bekleniyordu"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "yalnฤฑzca bir baลŸvuru bekleniyordu, %d verildi"
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#, c-format
+msgid "invalid reference: %s"
+msgstr "geรงersiz baลŸvuru: %s"
+
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "baลŸvuru bir aฤŸaca deฤŸil: %s"
+
+#: builtin/checkout.c:1334
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "bir dal bekleniyordu, '%s' etiketi alฤฑndฤฑ"
+
+#: builtin/checkout.c:1336
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "bir dal bekleniyordu, '%s' uzak dal alฤฑndฤฑ"
+
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "bir dal bekleniyordu, '%s' alฤฑndฤฑ"
+
+#: builtin/checkout.c:1340
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "bir dal bekleniyordu, '%s' gรถnderisi alฤฑndฤฑ"
+
+#: builtin/checkout.c:1356
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"BirleลŸtirme yaparken dal deฤŸiลŸtirilemiyor.\n"
+"\"git merge --quit\" veya \"git worktree add\" yapmayฤฑ dรผลŸรผnรผn."
+
+#: builtin/checkout.c:1360
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"Bir \"am\" oturumunun ortasฤฑnda dal deฤŸiลŸtirilemiyor.\n"
+"\"git am --quit\" veya \"git worktree add\" yapmayฤฑ dรผลŸรผnรผn."
+
+#: builtin/checkout.c:1364
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"Yeniden temellendirme yaparken dal deฤŸiลŸtirilemiyor.\n"
+"\"git rebase --quit\" veya \"git worktree add\" yapmayฤฑ dรผลŸรผnรผn."
+
+#: builtin/checkout.c:1368
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"Seรง-al yaparken dal deฤŸiลŸtirilemiyor.\n"
+"\"git cherry-pick --quit\" veya \"git worktree add\" yapmayฤฑ dรผลŸรผnรผn."
+
+#: builtin/checkout.c:1372
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"Geri al yaparken dal deฤŸiลŸtirilemiyor.\n"
+"\"git revert --quit\" veya \"git worktree add\" yapmayฤฑ dรผลŸรผnรผn."
+
+#: builtin/checkout.c:1376
+msgid "you are switching branch while bisecting"
+msgstr "ikili arama yaparken dal deฤŸiลŸtiriyorsunuz"
+
+#: builtin/checkout.c:1383
+msgid "paths cannot be used with switching branches"
+msgstr "dal deฤŸiลŸtirilirken yollar kullanฤฑlamaz"
+
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "dal deฤŸiลŸtirilirken '%s' kullanฤฑlamaz"
+
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s', '%s' ile birlikte kullanฤฑlamaz"
+
+#: builtin/checkout.c:1411
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s', <baลŸlama-noktasฤฑ> alamaz"
+
+#: builtin/checkout.c:1419
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Dal gรถnderi olmayan '%s' รถgesine deฤŸiลŸtirilemez"
+
+#: builtin/checkout.c:1426
+msgid "missing branch or commit argument"
+msgstr "dal veya gรถnderi deฤŸiลŸkeni eksik"
+
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "durum belirtmeyi zorla"
+
+#: builtin/checkout.c:1469
+msgid "perform a 3-way merge with the new branch"
+msgstr "yeni dal ile bir 3 yรถnlรผ birleลŸtirme gerรงekleลŸtir"
+
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+msgid "style"
+msgstr "stil"
+
+#: builtin/checkout.c:1471
+msgid "conflict style (merge or diff3)"
+msgstr "รงakฤฑลŸma stili (birleลŸtirme veya diff3)"
+
+#: builtin/checkout.c:1483 builtin/worktree.c:496
+msgid "detach HEAD at named commit"
+msgstr "adฤฑ verilen gรถnderide HEAD'i ayฤฑr"
+
+#: builtin/checkout.c:1484
+msgid "set upstream info for new branch"
+msgstr "yeni dal iรงin รผstkaynak bilgisi ayarla"
+
+#: builtin/checkout.c:1486
+msgid "force checkout (throw away local modifications)"
+msgstr "zorla รงฤฑkฤฑลŸ yap (yerel deฤŸiลŸiklikleri รงรถpe at)"
+
+#: builtin/checkout.c:1488
+msgid "new-branch"
+msgstr "yeni dal"
+
+#: builtin/checkout.c:1488
+msgid "new unparented branch"
+msgstr "yeni รผst รถgesi olmayan dal"
+
+#: builtin/checkout.c:1490 builtin/merge.c:289
+msgid "update ignored files (default)"
+msgstr "yok sayฤฑlan dosyalarฤฑ gรผncelle (รถntanฤฑmlฤฑ)"
+
+#: builtin/checkout.c:1493
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+"verilen baลŸvuruyu baลŸka bir รงalฤฑลŸma aฤŸacฤฑnฤฑn tutup tutmadฤฑฤŸฤฑnฤฑ denetleme"
+
+#: builtin/checkout.c:1506
+msgid "checkout our version for unmerged files"
+msgstr "birleลŸtirilmeyen dosyalar iรงin bizim sรผrรผmรผ รงฤฑkฤฑลŸ yap"
+
+#: builtin/checkout.c:1509
+msgid "checkout their version for unmerged files"
+msgstr "birleลŸtirilmeyen dosyalar iรงin onlarฤฑn sรผrรผmรผnรผ รงฤฑkฤฑลŸ yap"
+
+#: builtin/checkout.c:1513
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "yol belirteรงlerini yalnฤฑzca aralฤฑklฤฑ girdilere kฤฑsฤฑtlama"
+
+#: builtin/checkout.c:1565
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "-b, -B ve --orphan birlikte kullanฤฑlmaz"
+
+#: builtin/checkout.c:1568
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p ve --overlay birlikte kullanฤฑlmaz"
+
+#: builtin/checkout.c:1605
+msgid "--track needs a branch name"
+msgstr "--track iรงin bir dal adฤฑ gerekli"
+
+#: builtin/checkout.c:1610
+msgid "missing branch name; try -b"
+msgstr "eksik dal adฤฑ; -b deneyin"
+
+#: builtin/checkout.c:1642
+#, c-format
+msgid "could not resolve %s"
+msgstr "%s รงรถzรผlemedi"
+
+#: builtin/checkout.c:1658
+msgid "invalid path specification"
+msgstr "geรงersiz yol belirtimi"
+
+#: builtin/checkout.c:1665
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "'%s' bir gรถnderi deฤŸil ve ondan bir '%s' dalฤฑ oluลŸturulamaz"
+
+#: builtin/checkout.c:1669
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach bir '%s' yol deฤŸiลŸkeni almฤฑyor"
+
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file, --detach ile uyumsuz"
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file, --patch ile uyumsuz"
+
+#: builtin/checkout.c:1692
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force ve --merge indeks รงฤฑkฤฑลŸฤฑ yapฤฑlฤฑrken\n"
+"birlikte kullanฤฑlamaz"
+
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "eski durumuna getirilecek yollarฤฑ belirtmelisiniz"
+
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+msgid "branch"
+msgstr "dal"
+
+#: builtin/checkout.c:1724
+msgid "create and checkout a new branch"
+msgstr "yeni bir dal oluลŸtur ve รงฤฑkฤฑลŸ yap"
+
+#: builtin/checkout.c:1726
+msgid "create/reset and checkout a branch"
+msgstr "bir dal oluลŸtur/sฤฑfฤฑrla ve รงฤฑkฤฑลŸ yap"
+
+#: builtin/checkout.c:1727
+msgid "create reflog for new branch"
+msgstr "yeni dal iรงin baลŸvuru gรผnlรผฤŸรผ oluลŸtur"
+
+#: builtin/checkout.c:1729
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "'git checkout <bรถyle-bir-dal-yok>'a temkinli yaklaลŸ (รถntanฤฑmlฤฑ)"
+
+#: builtin/checkout.c:1730
+msgid "use overlay mode (default)"
+msgstr "yerpaylaลŸฤฑm kipini kullan (รถntanฤฑmlฤฑ)"
+
+#: builtin/checkout.c:1775
+msgid "create and switch to a new branch"
+msgstr "yeni bir dal oluลŸtur ve ona geรง"
+
+#: builtin/checkout.c:1777
+msgid "create/reset and switch to a branch"
+msgstr "bir dal oluลŸtur/sฤฑfฤฑrla ve ona geรง"
+
+#: builtin/checkout.c:1779
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "'git switch <bรถyle-bir-dal-yok>'a temkinli yaklaลŸ"
+
+#: builtin/checkout.c:1781
+msgid "throw away local modifications"
+msgstr "yerel deฤŸiลŸiklikleri รงรถpe at"
+
+#: builtin/checkout.c:1813
+msgid "which tree-ish to checkout from"
+msgstr "รงฤฑkฤฑลŸ yapฤฑlacak aฤŸacฤฑmsฤฑ"
+
+#: builtin/checkout.c:1815
+msgid "restore the index"
+msgstr "indeksi eski durumuna getir"
+
+#: builtin/checkout.c:1817
+msgid "restore the working tree (default)"
+msgstr "รงalฤฑลŸma aฤŸacฤฑnฤฑ eski durumuna getir"
+
+#: builtin/checkout.c:1819
+msgid "ignore unmerged entries"
+msgstr "birleลŸtirilmemiลŸ girdileri yok say"
+
+#: builtin/checkout.c:1820
+msgid "use overlay mode"
+msgstr "yerpaylaลŸฤฑm kipini kullan"
+
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <dizgi>] [-x | -X] [--] <yollar>..."
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
+msgstr "%s kaldฤฑrฤฑlฤฑyor\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
+msgstr "%s kaldฤฑrฤฑlacak\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "%s dizini atlanฤฑyor\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "%s dizini atlanacak\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
+msgstr "%s kaldฤฑrฤฑlamadฤฑ"
+
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "%s 'lstat' yapฤฑlamadฤฑ\n"
+
+#: builtin/clean.c:301 git-add--interactive.perl:595
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a numbered item\n"
+"foo        - select item based on unique prefix\n"
+"           - (empty) select nothing\n"
+msgstr ""
+"ฤฐstem yardฤฑmฤฑ:\n"
+"1          - numaralandฤฑrฤฑlmฤฑลŸ bir รถge seรง\n"
+"foo        - benzersiz รถneke dayanarak bir รถge seรง\n"
+"           - (boลŸ) hiรงbir ลŸey seรงme\n"
+
+#: builtin/clean.c:305 git-add--interactive.perl:604
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a single item\n"
+"3-5        - select a range of items\n"
+"2-3,6-9    - select multiple ranges\n"
+"foo        - select item based on unique prefix\n"
+"-...       - unselect specified items\n"
+"*          - choose all items\n"
+"           - (empty) finish selecting\n"
+msgstr ""
+"ฤฐstem yardฤฑmฤฑ:1          - tek bir รถge seรง\n"
+"3-5        - bir รถge aralฤฑฤŸฤฑ seรง\n"
+"2-3,6-9    - birden รงok erim seรง\n"
+"foo        - benzersiz รถneke dayanarak bir รถge seรง\n"
+"-...       - belirtilen รถgelerin seรงimini kaldฤฑr\n"
+"*          - tรผm รถgeleri seรง\n"
+"           - (boลŸ) seรงimi bitir\n"
+
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Pardon (%s)?\n"
+
+#: builtin/clean.c:663
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Girdi yok sayma dizgileri>> "
+
+#: builtin/clean.c:700
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "UYARI: ลžununla eลŸleลŸen รถgeler bulunamฤฑyor: %s"
+
+#: builtin/clean.c:721
+msgid "Select items to delete"
+msgstr "Silinecek รถgeleri seรงin"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:762
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "%s kaldฤฑrฤฑlsฤฑn mฤฑ [y/N]? "
+
+#: builtin/clean.c:795
+msgid ""
+"clean               - start cleaning\n"
+"filter by pattern   - exclude items from deletion\n"
+"select by numbers   - select items to be deleted by numbers\n"
+"ask each            - confirm each deletion (like \"rm -i\")\n"
+"quit                - stop cleaning\n"
+"help                - this screen\n"
+"?                   - help for prompt selection"
+msgstr ""
+"clean               - temizliฤŸe baลŸla\n"
+"filter by pattern   - silinmeyecek รถgeleri belirle\n"
+"select by numbers   - silinecek รถgeleri sayฤฑlarฤฑ ile seรง\n"
+"ask each            - her silmeyi onayla (\"rm -i\" gibi)\n"
+"quit                - temizliฤŸi durdur\n"
+"help                - bu ekranฤฑ gรถrรผntรผle\n"
+"?                   - istem seรงimi iรงin yardฤฑm"
+
+#: builtin/clean.c:831
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "AลŸaฤŸฤฑdaki รถge kaldฤฑrฤฑlacak:"
+msgstr[1] "AลŸaฤŸฤฑdaki รถgeler kaldฤฑrฤฑlacak:"
+
+#: builtin/clean.c:847
+msgid "No more files to clean, exiting."
+msgstr "Temizlenecek baลŸka dosya yok, รงฤฑkฤฑlฤฑyor."
+
+#: builtin/clean.c:909
+msgid "do not print names of files removed"
+msgstr "kaldฤฑrฤฑlan dosyalarฤฑn adlarฤฑnฤฑ yazdฤฑrma"
+
+#: builtin/clean.c:911
+msgid "force"
+msgstr "zorla"
+
+#: builtin/clean.c:912
+msgid "interactive cleaning"
+msgstr "etkileลŸimli temizlik"
+
+#: builtin/clean.c:914
+msgid "remove whole directories"
+msgstr "dizinleri tรผmรผyle kaldฤฑr"
+
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/show-ref.c:179
+msgid "pattern"
+msgstr "dizgi"
+
+#: builtin/clean.c:916
+msgid "add <pattern> to ignore rules"
+msgstr "yok sayma kurallarฤฑna <dizgi> ekle"
+
+#: builtin/clean.c:917
+msgid "remove ignored files, too"
+msgstr "yok sayฤฑlan dosyalar da kaldฤฑrฤฑldฤฑ"
+
+#: builtin/clean.c:919
+msgid "remove only ignored files"
+msgstr "yalnฤฑzca yok sayฤฑlan dosyalarฤฑ kaldฤฑr"
+
+#: builtin/clean.c:937
+msgid "-x and -X cannot be used together"
+msgstr "-x ve -X birlikte kullanฤฑlamaz"
+
+#: builtin/clean.c:941
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce 'true' olarak ayarlanmฤฑลŸ ve ne -i, ne -n, ne de -f "
+"verilmiลŸ; temizleme reddediliyor"
+
+#: builtin/clean.c:944
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce รถntanฤฑmlฤฑ olarak 'true' ve ne -i, ne -n, ne de -f "
+"verilmiลŸ; temizleme reddediliyor"
+
+#: builtin/clone.c:45
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<seรงenekler>] [--] <depo> [<dizin>]"
+
+#: builtin/clone.c:93
+msgid "don't create a checkout"
+msgstr "รงฤฑkฤฑลŸ yapma!"
+
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+msgid "create a bare repository"
+msgstr "รงฤฑplak bir depo oluลŸtur"
+
+#: builtin/clone.c:98
+msgid "create a mirror repository (implies bare)"
+msgstr "bir yansฤฑ depo oluลŸtur (รงฤฑplak ima eder)"
+
+#: builtin/clone.c:100
+msgid "to clone from a local repository"
+msgstr "bir yerel depodan klonla"
+
+#: builtin/clone.c:102
+msgid "don't use local hardlinks, always copy"
+msgstr "yerel sabit baฤŸlarฤฑ kullanma, her zaman kopyala"
+
+#: builtin/clone.c:104
+msgid "setup as shared repository"
+msgstr "paylaลŸฤฑlan depo ayarla"
+
+#: builtin/clone.c:107
+msgid "pathspec"
+msgstr "yol belirteci"
+
+#: builtin/clone.c:107
+msgid "initialize submodules in the clone"
+msgstr "klon iรงerisindeki altmodรผlleri ilklendir"
+
+#: builtin/clone.c:110
+msgid "number of submodules cloned in parallel"
+msgstr "paralelde klonlanan altmodรผllerin sayฤฑsฤฑ"
+
+#: builtin/clone.c:111 builtin/init-db.c:486
+msgid "template-directory"
+msgstr "ลŸablon dizini"
+
+#: builtin/clone.c:112 builtin/init-db.c:487
+msgid "directory from which templates will be used"
+msgstr "ลŸablonlarฤฑn kullanฤฑlacaฤŸฤฑ dizin"
+
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
+msgid "reference repository"
+msgstr "baลŸvuru deposu"
+
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
+msgid "use --reference only while cloning"
+msgstr "--reference'ฤฑ yalnฤฑzca klonlarken kullan"
+
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
+msgid "name"
+msgstr "ad"
+
+#: builtin/clone.c:120
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "รผstkaynaฤŸฤฑ izlemek iรงin 'origin' yerine <ad> kullan"
+
+#: builtin/clone.c:122
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "uzak konumun HEAD'i yerine <dal>'ฤฑ รงฤฑkฤฑลŸ yap"
+
+#: builtin/clone.c:124
+msgid "path to git-upload-pack on the remote"
+msgstr "uzak konumdaki git-upload-pack'e olan yol"
+
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
+msgid "depth"
+msgstr "derinlik"
+
+#: builtin/clone.c:126
+msgid "create a shallow clone of that depth"
+msgstr "verilen derinlikte sฤฑฤŸ bir depo oluลŸtur"
+
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+msgid "time"
+msgstr "zaman"
+
+#: builtin/clone.c:128
+msgid "create a shallow clone since a specific time"
+msgstr "verilen zamandan sonrasฤฑnฤฑ iรงeren bir sฤฑฤŸ depo oluลŸtur"
+
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
+msgid "revision"
+msgstr "revizyon"
+
+#: builtin/clone.c:130 builtin/fetch.c:173
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "revizyonu hariรง tutarak sฤฑฤŸ klonun geรงmiลŸini derinleลŸtir"
+
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
+msgid "clone only one branch, HEAD or --branch"
+msgstr "yalnฤฑzca bir dal klonla, HEAD veya --branch"
+
+#: builtin/clone.c:134
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "etiket klonlama ve sonraki getirmeler de onlarฤฑ izlemesin"
+
+#: builtin/clone.c:136
+msgid "any cloned submodules will be shallow"
+msgstr "klonlanan altmodรผller sฤฑฤŸ olacak"
+
+#: builtin/clone.c:137 builtin/init-db.c:495
+msgid "gitdir"
+msgstr "git dizini"
+
+#: builtin/clone.c:138 builtin/init-db.c:496
+msgid "separate git dir from working tree"
+msgstr "git dizinini รงalฤฑลŸma aฤŸacฤฑndan ayฤฑr"
+
+#: builtin/clone.c:139
+msgid "key=value"
+msgstr "anahtar=deฤŸer"
+
+#: builtin/clone.c:140
+msgid "set config inside the new repository"
+msgstr "yapฤฑlandฤฑrmayฤฑ yeni deponun iรงinde ayarla"
+
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "sunucuya รถzel"
+
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "iletme seรงeneฤŸi"
+
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
+msgid "use IPv4 addresses only"
+msgstr "yalnฤฑzca IPv4 adresleri kullan"
+
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
+msgid "use IPv6 addresses only"
+msgstr "yalnฤฑzca IPv6 adresleri kullan"
+
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "klonlanan herhangi bir altmodรผl kendi uzak izleme dallarฤฑnฤฑ kullanacak"
+
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"sparse-checkout dosyasฤฑnฤฑ yalnฤฑzca kรถkteki dosyalarฤฑ iรงerecek biรงimde "
+"ilklendir"
+
+#: builtin/clone.c:287
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Bir dizin adฤฑ tahmin edilemedi.\n"
+"Lรผtfen komut satฤฑrฤฑnda bir dizin belirtin."
+
+#: builtin/clone.c:340
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: '%s' iรงin alternatif eklenemedi: %s\n"
+
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s var ve bir dizin deฤŸil"
+
+#: builtin/clone.c:430
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "yineleyici '%s' รผzerinden รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/clone.c:460
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "'%s' baฤŸฤฑ oluลŸturulamadฤฑ"
+
+#: builtin/clone.c:464
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "dosya ลŸuraya kopyalanamadฤฑ: '%s'"
+
+#: builtin/clone.c:469
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "'%s' รผzerinde yinelenemedi"
+
+#: builtin/clone.c:494
+#, c-format
+msgid "done.\n"
+msgstr "bitti.\n"
+
+#: builtin/clone.c:508
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
+msgstr ""
+"Klonlama baลŸarฤฑlฤฑ oldu, ancak รงฤฑkฤฑลŸ yapฤฑlamadฤฑ.\n"
+"Neyin รงฤฑkฤฑลŸ yapฤฑlฤฑp yapฤฑlmadฤฑฤŸฤฑnฤฑ 'git status' ile inceleyebilir\n"
+"ve 'git restore --source=HEAD' ile yeniden deneyebilirsiniz.\n"
+
+#: builtin/clone.c:585
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "Klonlanacak %s uzak dal bulunamadฤฑ."
+
+#: builtin/clone.c:705
+#, c-format
+msgid "unable to update %s"
+msgstr "%s gรผncellenemiyor"
+
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "sparse-checkout ilklendirilemedi"
+
+#: builtin/clone.c:776
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+"uzak konum HEAD'i var olmayan baลŸvuruya baฤŸlanฤฑyor, รงฤฑkฤฑลŸ yapฤฑlamฤฑyor.\n"
+
+#: builtin/clone.c:807
+msgid "unable to checkout working tree"
+msgstr "รงalฤฑลŸma aฤŸacฤฑ รงฤฑkฤฑลŸ yapฤฑlamฤฑyor"
+
+#: builtin/clone.c:862
+msgid "unable to write parameters to config file"
+msgstr "parametreler yapฤฑlandฤฑrma dosyasฤฑna yazฤฑlamฤฑyor"
+
+#: builtin/clone.c:925
+msgid "cannot repack to clean up"
+msgstr "temizlik iรงin yeniden paketlenemiyor"
+
+#: builtin/clone.c:927
+msgid "cannot unlink temporary alternates file"
+msgstr "geรงici alternatifler dosyasฤฑnฤฑn baฤŸlantฤฑsฤฑ kesilemiyor"
+
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
+msgid "Too many arguments."
+msgstr "ร‡ok fazla deฤŸiลŸken."
+
+#: builtin/clone.c:969
+msgid "You must specify a repository to clone."
+msgstr "Klonlamak iรงin bir depo belirtmelisiniz."
+
+#: builtin/clone.c:982
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "--bare ve --origin %s seรงenekleri birbiriyle uyumsuz."
+
+#: builtin/clone.c:985
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz."
+
+#: builtin/clone.c:998
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "'%s' deposu mevcut deฤŸil"
+
+#: builtin/clone.c:1004 builtin/fetch.c:1796
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "%s derinliฤŸi pozitif bir sayฤฑ deฤŸil"
+
+#: builtin/clone.c:1014
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "Hedef yolu '%s' halihazฤฑrda mevcut ve boลŸ bir dizin deฤŸil."
+
+#: builtin/clone.c:1024
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ '%s' halihazฤฑrda mevcut."
+
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "ลŸunun รถncรผ dizinleri oluลŸturulamadฤฑ: '%s'"
+
+#: builtin/clone.c:1044
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "'%s' รงalฤฑลŸma aฤŸacฤฑ dizini oluลŸturulamadฤฑ"
+
+#: builtin/clone.c:1064
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "'%s' รงฤฑplak deposuna klonlanฤฑyor...\n"
+
+#: builtin/clone.c:1066
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "ลžuraya klonlanฤฑyor: '%s'...\n"
+
+#: builtin/clone.c:1090
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive hem --reference hem --reference-if-able ile uyumlu deฤŸil"
+
+#: builtin/clone.c:1154
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth yerel klonlarda yok sayฤฑlฤฑr; yerine file:// kullanฤฑn."
+
+#: builtin/clone.c:1156
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since yerel klonlarda yok sayฤฑlฤฑr; yerine file:// kullanฤฑn."
+
+#: builtin/clone.c:1158
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-exclude yerel klonlarda yok sayฤฑlฤฑr; yerine file:// kullanฤฑn."
+
+#: builtin/clone.c:1160
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter yerel klonlarda yok sayฤฑlฤฑr; yerine file:// kullanฤฑn."
+
+#: builtin/clone.c:1163
+msgid "source repository is shallow, ignoring --local"
+msgstr "kaynak depo sฤฑฤŸ, --local yok sayฤฑlฤฑyor"
+
+#: builtin/clone.c:1168
+msgid "--local is ignored"
+msgstr "--local yok sayฤฑldฤฑ"
+
+#: builtin/clone.c:1243 builtin/clone.c:1251
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "%s uzak dalฤฑ %s รผstkaynaฤŸฤฑnda bulunamadฤฑ"
+
+#: builtin/clone.c:1254
+msgid "You appear to have cloned an empty repository."
+msgstr "BoลŸ bir depoyu klonlamฤฑลŸ gรถrรผnรผyorsunuz."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<seรงenekler>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "yapฤฑlandฤฑrma deฤŸiลŸkenlerini ara"
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "kullanฤฑlacak yerleลŸim"
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr "olabilecek en รงok geniลŸlik"
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr "sol kenardaki dolgu boลŸluฤŸu"
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr "saฤŸ kenardaki dolgu boลŸluฤŸu"
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr "sรผtunlar arasฤฑndaki dolgu boลŸluฤŸu"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command ilk deฤŸiลŸken olmalฤฑ"
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <รผst-รถge>)...] [-S[<anahtor-no>]] [(-m <ileti>)...] [(-"
+"F <dosya>)...] <aฤŸaรง>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "yinelenmiลŸ รผst รถge %s yok sayฤฑldฤฑ"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#, c-format
+msgid "not a valid object name %s"
+msgstr "%s geรงerli bir nesne adฤฑ deฤŸil"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree: '%s' aรงฤฑlamadฤฑ"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: '%s' okunamadฤฑ"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: '%s' kapatฤฑlamadฤฑ"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "รผst รถge"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "bir รผst gรถnderi รถgesinin no'su"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
+#: builtin/tag.c:412
+msgid "message"
+msgstr "ileti"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
+msgid "commit message"
+msgstr "gรถnderi iletisi"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "gรถnderi gรผnlรผk iletisini dosyadan oku"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "gรถnderiyi GPG ile imzala"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "bir tam aฤŸaรง vermeli"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: okunamadฤฑ"
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<seรงenekler>] [--] <yol-blrtรง>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<seรงenekler>] [--] <yol-blrtรง>..."
+
+#: builtin/commit.c:51
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+"En son yapฤฑlan gรถnderiyi deฤŸiลŸtirmek istediniz, ancak bu onu\n"
+"boลŸaltacaktฤฑr. Komutunuzu --allow-empty ile yineleyebilir veya\n"
+"gรถnderiyi \"git reset HEAD^\" ile tรผmรผyle kaldฤฑrabilirsiniz.\n"
+
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+msgstr ""
+"Bir รถnceki seรง-al bรผyรผk olasฤฑlฤฑkla รงakฤฑลŸma รงรถzรผmรผnden dolayฤฑ ลŸu anda boลŸ.\n"
+"Yine de gรถndermek isterseniz ลŸunu kullanฤฑn:\n"
+"\n"
+"\tgit commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Aksi durumda lรผtfen 'git cherry-pick --skip' kullanฤฑn.\n"
+
+#: builtin/commit.c:66
+msgid ""
+"and then use:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+msgstr ""
+"ve sonra geri kalan gรถnderileri seรง-al yapmayฤฑ sรผrdรผrmek iรงin:\n"
+"\n"
+"\tgit cherry-pick --continue\n"
+"\n"
+"kullanฤฑn.\n"
+"Bu gรถnderiyi atlamak isterseniz ลŸunu kullanฤฑn:\n"
+"\n"
+"\tgit cherry-pick --continue\n"
+"\n"
+
+#: builtin/commit.c:315
+msgid "failed to unpack HEAD tree object"
+msgstr "HEAD aฤŸaรง nesnesi aรงฤฑlamadฤฑ"
+
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file, -a ile bir anlam ifade etmiyor"
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "--include/--only iรงermeyen yollar bir anlam ifade etmiyor."
+
+#: builtin/commit.c:376
+msgid "unable to create temporary index"
+msgstr "geรงici indeks oluลŸturulamฤฑyor"
+
+#: builtin/commit.c:385
+msgid "interactive add failed"
+msgstr "etkileลŸimli ekleme baลŸarฤฑsฤฑz"
+
+#: builtin/commit.c:400
+msgid "unable to update temporary index"
+msgstr "geรงici indeks gรผncellenemiyor"
+
+#: builtin/commit.c:402
+msgid "Failed to update main cache tree"
+msgstr "Ana รถnbellek aฤŸacฤฑ gรผncellenemedi"
+
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+msgid "unable to write new_index file"
+msgstr "new_index_file yazฤฑlamฤฑyor"
+
+#: builtin/commit.c:479
+msgid "cannot do a partial commit during a merge."
+msgstr "Bir birleลŸtirme sฤฑrasฤฑnda kฤฑsmi gรถnderi yapฤฑlamaz."
+
+#: builtin/commit.c:481
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "Bir seรง-al sฤฑrasฤฑnda kฤฑsmi gรถnderi yapฤฑlamaz."
+
+#: builtin/commit.c:489
+msgid "cannot read the index"
+msgstr "indeks okunamฤฑyor"
+
+#: builtin/commit.c:508
+msgid "unable to write temporary index file"
+msgstr "geรงici indeks dosyasฤฑ yazฤฑlamฤฑyor"
+
+#: builtin/commit.c:606
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "'%s' gรถnderisinde yazar รผstbilgisi yok"
+
+#: builtin/commit.c:608
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "'%s' gรถnderisindeki yazar satฤฑrฤฑ hatalฤฑ oluลŸturulmuลŸ"
+
+#: builtin/commit.c:627
+msgid "malformed --author parameter"
+msgstr "hatalฤฑ oluลŸturulmuลŸ --author parametresi"
+
+#: builtin/commit.c:680
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"mevcut gรถnderi iletisinde kullanฤฑlmayan bir yorum\n"
+"karakteri seรงilemiyor"
+
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "%s gรถnderisi aranamadฤฑ"
+
+#: builtin/commit.c:730 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(gรผnlรผk iletisi standart girdi'den okunuyor)\n"
+
+#: builtin/commit.c:732
+msgid "could not read log from standard input"
+msgstr "gรผnlรผk standart girdi'den okunamadฤฑ"
+
+#: builtin/commit.c:736
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "gรผnlรผk dosyasฤฑ '%s' okunamadฤฑ"
+
+#: builtin/commit.c:767 builtin/commit.c:783
+msgid "could not read SQUASH_MSG"
+msgstr "SQUASH_MSG okunamadฤฑ"
+
+#: builtin/commit.c:774
+msgid "could not read MERGE_MSG"
+msgstr "MERGE_MSG okunamadฤฑ"
+
+#: builtin/commit.c:834
+msgid "could not write commit template"
+msgstr "gรถnderi ลŸablonu yazฤฑlamadฤฑ"
+
+#: builtin/commit.c:853
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"GรถrรผnรผลŸe bakฤฑlฤฑrsa bir birleลŸtirme gรถnderiyorsunuz.\n"
+"EฤŸer bu doฤŸru deฤŸilse lรผtfen ลŸu dosyayฤฑ kaldฤฑrฤฑn:\n"
+"\t%s\n"
+"ve yeniden deneyin.\n"
+
+#: builtin/commit.c:858
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"GรถrรผnรผลŸe gรถre bir seรง-al gรถnderiyorsunuz.\n"
+"EฤŸer bu doฤŸru deฤŸilse lรผtfen ลŸu dosyayฤฑ kaldฤฑrฤฑn:\n"
+"\t%s\n"
+"ve yeniden deneyin.\n"
+
+#: builtin/commit.c:871
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Lรผtfen deฤŸiลŸiklikleriniz iรงin bir gรถnderi iletisi girin. '%c' ile baลŸlayan\n"
+"satฤฑrlar yok sayฤฑlacaktฤฑr. BoลŸ bir ileti gรถnderiyi iptal eder.\n"
+
+#: builtin/commit.c:879
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Lรผtfen deฤŸiลŸiklikleriniz iรงin bir gรถnderi iletisi girin. '%c' ile baลŸlayan\n"
+"satฤฑrlar tutulacaktฤฑr; isterseniz onlarฤฑ kaldฤฑrabilirsiniz.\n"
+"BoลŸ bir ileti gรถnderiyi iptal eder.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr "%sYazar:     %.*s <%.*s>"
+
+#: builtin/commit.c:904
+#, c-format
+msgid "%sDate:      %s"
+msgstr "%sTarih:     %s"
+
+#: builtin/commit.c:911
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sGรถnderen:  %.*s <%.*s>"
+
+#: builtin/commit.c:929
+msgid "Cannot read index"
+msgstr "ฤฐndeks okunamฤฑyor"
+
+#: builtin/commit.c:997
+msgid "Error building trees"
+msgstr "AฤŸaรงlar yapฤฑlฤฑrken hata"
+
+#: builtin/commit.c:1011 builtin/tag.c:275
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "Lรผtfen iletiyi -m veya -F seรงeneฤŸini kullanarak destekleyin.\n"
+
+#: builtin/commit.c:1055
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+"--author '%s', 'Ad <e-posta>' biรงiminde deฤŸil ve mevcut bir yazarla "
+"eลŸleลŸmiyor"
+
+#: builtin/commit.c:1069
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Geรงersiz yok sayฤฑlanlarฤฑ gรถster kipi '%s'"
+
+#: builtin/commit.c:1087 builtin/commit.c:1327
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Geรงersiz izlenmeyen dosyalarฤฑ gรถster kipi '%s'"
+
+#: builtin/commit.c:1127
+msgid "--long and -z are incompatible"
+msgstr "--long ve -z birbiriyle uyumsuz"
+
+#: builtin/commit.c:1171
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "Hem --reset-author ve hem --author birlikte bir anlam ifade etmiyor"
+
+#: builtin/commit.c:1180
+msgid "You have nothing to amend."
+msgstr "DeฤŸiลŸtirecek bir ลŸeyiniz yok."
+
+#: builtin/commit.c:1183
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Bir birleลŸtirmenin tam ortasฤฑndasฤฑnฤฑz -- deฤŸiลŸtirme yapฤฑlamฤฑyor."
+
+#: builtin/commit.c:1185
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "Bir seรง-al'ฤฑn tam ortasฤฑndasฤฑnฤฑz -- deฤŸiลŸtirme yapฤฑlamฤฑyor."
+
+#: builtin/commit.c:1188
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "--squash ve --fixup seรงenekleri birlikte kullanฤฑlamaz"
+
+#: builtin/commit.c:1198
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "-c/-C/-F/--fixup arasฤฑndan yalnฤฑzca bir tanesi kullanฤฑlabilir."
+
+#: builtin/commit.c:1200
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "-m seรงeneฤŸi -c/-C/-F ile birlikte kullanฤฑlamaz."
+
+#: builtin/commit.c:1208
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+"--reset-author yalnฤฑzca -C, -c veya --amend ile birlikte kullanฤฑlabilir."
+
+#: builtin/commit.c:1225
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+"--include/--only/--all/--interactive/--patch arasฤฑndan yalnฤฑzca bir tanesi "
+"kullanฤฑlabilir."
+
+#: builtin/commit.c:1231
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "'%s ...' yollarฤฑ -a ile bir anlam ifade etmiyor"
+
+#: builtin/commit.c:1362 builtin/commit.c:1524
+msgid "show status concisely"
+msgstr "durumu kฤฑsaca gรถster"
+
+#: builtin/commit.c:1364 builtin/commit.c:1526
+msgid "show branch information"
+msgstr "dal bilgisini gรถster"
+
+#: builtin/commit.c:1366
+msgid "show stash information"
+msgstr "zula bilgisini gรถster"
+
+#: builtin/commit.c:1368 builtin/commit.c:1528
+msgid "compute full ahead/behind values"
+msgstr "tam รถnรผnde/arkasฤฑnda deฤŸerlerini hesapla"
+
+#: builtin/commit.c:1370
+msgid "version"
+msgstr "sรผrรผm"
+
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
+msgid "machine-readable output"
+msgstr "makine tarafฤฑndan okunabilir รงฤฑktฤฑ"
+
+#: builtin/commit.c:1373 builtin/commit.c:1532
+msgid "show status in long format (default)"
+msgstr "durumu uzun biรงimde gรถster (รถntanฤฑmlฤฑ)"
+
+#: builtin/commit.c:1376 builtin/commit.c:1535
+msgid "terminate entries with NUL"
+msgstr "girdileri NUL ile sonlandฤฑr"
+
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+msgid "mode"
+msgstr "kip"
+
+#: builtin/commit.c:1379 builtin/commit.c:1538
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr ""
+"izlenmeyen dosyalarฤฑ gรถster, ist. baฤŸlฤฑ kipler: all, normal, no (ร–ntanฤฑm.: "
+"all)"
+
+#: builtin/commit.c:1383
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"yok sayฤฑlan dosyalarฤฑ gรถster, isteฤŸe baฤŸlฤฑ kipler: traditional (geleneksel) "
+"matching (eลŸleลŸen), no (hayฤฑr) (ร–ntanฤฑmlฤฑ: traditional)."
+
+#: builtin/commit.c:1385 parse-options.h:192
+msgid "when"
+msgstr "ne zaman"
+
+#: builtin/commit.c:1386
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"altmodรผllere olan deฤŸiลŸiklikleri yok say, isteฤŸe baฤŸlฤฑ ne zaman: all "
+"(hepsi), dirty (kirli), untracked (izlenmeyen) (ร–ntanฤฑmlฤฑ: all)."
+
+#: builtin/commit.c:1388
+msgid "list untracked files in columns"
+msgstr "izlenmeyen dosyalarฤฑ sรผtunlarla gรถster"
+
+#: builtin/commit.c:1389
+msgid "do not detect renames"
+msgstr "yeniden adlandฤฑrmalarฤฑ algฤฑlama"
+
+#: builtin/commit.c:1391
+msgid "detect renames, optionally set similarity index"
+msgstr ""
+"yeniden adlandฤฑrmalarฤฑ algฤฑla, isteฤŸe baฤŸlฤฑ olarak benzerlik indeksi ayarla"
+
+#: builtin/commit.c:1411
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
+"Yok sayฤฑlan ve izlenmeyen dosyalar deฤŸiลŸkenlerinin desteklenmeyen birlikte "
+"kullanฤฑmฤฑ"
+
+#: builtin/commit.c:1494
+msgid "suppress summary after successful commit"
+msgstr "baลŸarฤฑlฤฑ gรถnderinin ardฤฑndan รถzeti gizle"
+
+#: builtin/commit.c:1495
+msgid "show diff in commit message template"
+msgstr "diff'i gรถnderi iletisi ลŸablonunda gรถster"
+
+#: builtin/commit.c:1497
+msgid "Commit message options"
+msgstr "Gรถnderi iletisi seรงenekleri"
+
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+msgid "read message from file"
+msgstr "iletiyi dosyadan oku"
+
+#: builtin/commit.c:1499
+msgid "author"
+msgstr "yazar"
+
+#: builtin/commit.c:1499
+msgid "override author for commit"
+msgstr "gรถnderi yazarฤฑnฤฑ geรงersiz kฤฑl"
+
+#: builtin/commit.c:1500 builtin/gc.c:538
+msgid "date"
+msgstr "tarih"
+
+#: builtin/commit.c:1500
+msgid "override date for commit"
+msgstr "gรถnderi tarihini geรงersiz kฤฑl"
+
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+msgid "commit"
+msgstr "gรถnderi"
+
+#: builtin/commit.c:1502
+msgid "reuse and edit message from specified commit"
+msgstr "belirtilen gรถnderinin iletisini dรผzenle ve yeniden kullan"
+
+#: builtin/commit.c:1503
+msgid "reuse message from specified commit"
+msgstr "belirtilen gรถnderinin iletisini yeniden kullan"
+
+#: builtin/commit.c:1504
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+"belirtilen gรถnderiyi dรผzeltmek iรงin kendiliฤŸinden tฤฑkฤฑลŸtฤฑrma tarafฤฑndan "
+"biรงimlendirilen iletiyi kullan"
+
+#: builtin/commit.c:1505
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+"belirtilen gรถnderiyi tฤฑkฤฑลŸtฤฑrmak iรงin kendiliฤŸinden tฤฑkฤฑลŸtฤฑrma tarafฤฑndan "
+"biรงimlendirilen iletiyi kullan"
+
+#: builtin/commit.c:1506
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr ""
+"gรถnderinin yazarฤฑ ลŸu andan itibaren benim (-C/-c/--amend ile kullanฤฑldฤฑ)"
+
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
+msgid "add Signed-off-by:"
+msgstr "Signed-off-by: ekle"
+
+#: builtin/commit.c:1508
+msgid "use specified template file"
+msgstr "belirtilen ลŸablon dosyasฤฑnฤฑ kullan"
+
+#: builtin/commit.c:1509
+msgid "force edit of commit"
+msgstr "gรถnderiyi zorla dรผzenle"
+
+#: builtin/commit.c:1511
+msgid "include status in commit message template"
+msgstr "gรถnderi iletisi ลŸablonunda durumu iรงer"
+
+#: builtin/commit.c:1516
+msgid "Commit contents options"
+msgstr "Gรถnderi iรงeriฤŸi seรงenekleri"
+
+#: builtin/commit.c:1517
+msgid "commit all changed files"
+msgstr "deฤŸiลŸtirilen tรผm dosyalarฤฑ gรถnder"
+
+#: builtin/commit.c:1518
+msgid "add specified files to index for commit"
+msgstr "belirtilen dosyalarฤฑ gรถnderi iรงin indekse ekle"
+
+#: builtin/commit.c:1519
+msgid "interactively add files"
+msgstr "dosyalarฤฑ etkileลŸimli olarak ekle"
+
+#: builtin/commit.c:1520
+msgid "interactively add changes"
+msgstr "deฤŸiลŸiklikleri etkileลŸimli olarak ekle"
+
+#: builtin/commit.c:1521
+msgid "commit only specified files"
+msgstr "yalnฤฑzca belirtilen dosyalarฤฑ gรถnder"
+
+#: builtin/commit.c:1522
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "pre-commit ve commit-msg kancalarฤฑnฤฑ atla"
+
+#: builtin/commit.c:1523
+msgid "show what would be committed"
+msgstr "neyin gรถnderileceฤŸini gรถster"
+
+#: builtin/commit.c:1536
+msgid "amend previous commit"
+msgstr "รถnceki gรถnderiyi deฤŸiลŸtir"
+
+#: builtin/commit.c:1537
+msgid "bypass post-rewrite hook"
+msgstr "post-rewrite kancasฤฑnฤฑ atla"
+
+#: builtin/commit.c:1544
+msgid "ok to record an empty change"
+msgstr "boลŸ bir deฤŸiลŸikliฤŸin kaydฤฑ yazฤฑlabilir"
+
+#: builtin/commit.c:1546
+msgid "ok to record a change with an empty message"
+msgstr "boลŸ iletili bir deฤŸiลŸikliฤŸin kaydฤฑ yazฤฑlabilir"
+
+#: builtin/commit.c:1619
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Hasar gรถrmรผลŸ MERGE_HEAD dosyasฤฑ (%s)"
+
+#: builtin/commit.c:1626
+msgid "could not read MERGE_MODE"
+msgstr "MERGE_MODE okunamadฤฑ"
+
+#: builtin/commit.c:1645
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "gรถnderi iletisi okunamadฤฑ: %s"
+
+#: builtin/commit.c:1652
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Gรถnderi iletisinin boลŸ olmasฤฑ nedeniyle gรถnderi iptal ediliyor.\n"
+
+#: builtin/commit.c:1657
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Gรถnderi iptal ediliyor; iletiyi dรผzenlemediniz.\n"
+
+#: builtin/commit.c:1691
+msgid ""
+"repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git restore --staged :/\" to recover."
+msgstr ""
+"Depo gรผncellendi, ancak new_index dosyasฤฑ yazฤฑlamฤฑyor.\n"
+"Diskin dolu olup olmadฤฑฤŸฤฑnฤฑ ve kotanฤฑzฤฑ aลŸฤฑp aลŸmadฤฑฤŸฤฑnฤฑzฤฑ denetleyin,\n"
+"sonra kurtarmak iรงin \"git restore --staged :/\" kullanฤฑn."
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <nsndzn>] [--shallow] [--[no-]progress]"
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <nsndzn>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <bรถlรผm-sรงnklr>"
+
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "'%s' ile eลŸleลŸen nesne dizini bulunamadฤฑ"
+
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
+msgid "dir"
+msgstr "dizin"
+
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
+msgid "The object directory to store the graph"
+msgstr "GrafiฤŸin depolanacaฤŸฤฑ nesne dizini"
+
+#: builtin/commit-graph.c:71
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "commit-graph parรงalara bรถlรผnmรผลŸse yalnฤฑzca uรง dosyayฤฑ doฤŸrula"
+
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "commit-graph '%s' aรงฤฑlamadฤฑ"
+
+#: builtin/commit-graph.c:128
+msgid "start walk at all refs"
+msgstr "tรผm baลŸvurularda gezinmeyi baลŸlat"
+
+#: builtin/commit-graph.c:130
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "stdin tarafฤฑndan listelenen paket indekslerini tara"
+
+#: builtin/commit-graph.c:132
+msgid "start walk at commits listed by stdin"
+msgstr "stdin tarafฤฑndan listelenen tรผm gรถnderilerde gezinmeyi baลŸlat"
+
+#: builtin/commit-graph.c:134
+msgid "include all commits already in the commit-graph file"
+msgstr "halihazฤฑrda commit-graph dosyasฤฑnda bulunan tรผm gรถnderileri iรงer"
+
+#: builtin/commit-graph.c:137
+msgid "allow writing an incremental commit-graph file"
+msgstr "artan bir commit-graph dosyasฤฑnฤฑn yazฤฑmฤฑna izin ver"
+
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+"bir temel olmayan parรงalara bรถlรผnmรผลŸ commit-graph iรงinde en รงok olabilecek "
+"gรถnderi sayฤฑsฤฑ"
+
+#: builtin/commit-graph.c:141
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+"bรถlรผnmรผลŸ bir commit-graph'ฤฑn iki dรผzeyi arasฤฑnda olabilecek en bรผyรผk oran"
+
+#: builtin/commit-graph.c:159
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+"--reachable, --stdin-commits veya --stdin-packs'ten en รงok birini kullan"
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<seรงenekler>]"
+
+#: builtin/config.c:104 builtin/env--helper.c:23
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "tanฤฑmlanamayan --type deฤŸiลŸkeni, %s"
+
+#: builtin/config.c:116
+msgid "only one type at a time"
+msgstr "bir kerede yalnฤฑzca bir tรผr"
+
+#: builtin/config.c:125
+msgid "Config file location"
+msgstr "Yapฤฑlandฤฑrma dosyasฤฑ konumu"
+
+#: builtin/config.c:126
+msgid "use global config file"
+msgstr "global yapฤฑlandฤฑrma dosyasฤฑ kullan"
+
+#: builtin/config.c:127
+msgid "use system config file"
+msgstr "sistem yapฤฑlandฤฑrma dosyasฤฑ kullan"
+
+#: builtin/config.c:128
+msgid "use repository config file"
+msgstr "depo yapฤฑlandฤฑrma dosyasฤฑ kullan"
+
+#: builtin/config.c:129
+msgid "use per-worktree config file"
+msgstr "her รงalฤฑลŸma aฤŸacฤฑna รถzel bir yapฤฑlandฤฑrma dosyasฤฑ kullan"
+
+#: builtin/config.c:130
+msgid "use given config file"
+msgstr "verilen yapฤฑlandฤฑrma dosyasฤฑnฤฑ kullan"
+
+#: builtin/config.c:131
+msgid "blob-id"
+msgstr "ikili nesne numarasฤฑ"
+
+#: builtin/config.c:131
+msgid "read config from given blob object"
+msgstr "verilen ikili nesneden yapฤฑlandฤฑrmayฤฑ oku"
+
+#: builtin/config.c:132
+msgid "Action"
+msgstr "Eylem"
+
+#: builtin/config.c:133
+msgid "get value: name [value-regex]"
+msgstr "deฤŸer al: ad [dรผzenli ifade deฤŸeri]"
+
+#: builtin/config.c:134
+msgid "get all values: key [value-regex]"
+msgstr "tรผm deฤŸerleri al: anahtar [dรผzenli ifade deฤŸeri]"
+
+#: builtin/config.c:135
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr ""
+"dรผzenli ifade iรงin deฤŸerleri al: dรผzenli ifade adฤฑ [dรผzenli ifade deฤŸeri]"
+
+#: builtin/config.c:136
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "URL iรงin รถzel olan deฤŸeri al: bรถlรผm[.var] URL"
+
+#: builtin/config.c:137
+msgid "replace all matching variables: name value [value_regex]"
+msgstr "tรผm eลŸleลŸen deฤŸiลŸkenleri deฤŸiลŸtir: ad deฤŸer [dรผzenli ifade deฤŸeri]"
+
+#: builtin/config.c:138
+msgid "add a new variable: name value"
+msgstr "yeni bir deฤŸiลŸken ekle: ad deฤŸer"
+
+#: builtin/config.c:139
+msgid "remove a variable: name [value-regex]"
+msgstr "bir deฤŸiลŸken kaldฤฑr: ad [dรผzenli ifade deฤŸeri]"
+
+#: builtin/config.c:140
+msgid "remove all matches: name [value-regex]"
+msgstr "tรผm eลŸleลŸmeleri kaldฤฑr: ad [dรผzenli ifade deฤŸeri]"
+
+#: builtin/config.c:141
+msgid "rename section: old-name new-name"
+msgstr "bรถlรผmรผ yeniden adlandฤฑr: eski_ad yeni_ad"
+
+#: builtin/config.c:142
+msgid "remove a section: name"
+msgstr "bir bรถlรผmรผ kaldฤฑr: ad"
+
+#: builtin/config.c:143
+msgid "list all"
+msgstr "tรผmรผnรผ listele"
+
+#: builtin/config.c:144
+msgid "open an editor"
+msgstr "bir dรผzenleyici aรง"
+
+#: builtin/config.c:145
+msgid "find the color configured: slot [default]"
+msgstr "yapฤฑlandฤฑrฤฑlan rengi bul: yuva [รถntanฤฑmlฤฑ]"
+
+#: builtin/config.c:146
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "renk ayarฤฑnฤฑ bul: yuva [stdout tty]"
+
+#: builtin/config.c:147
+msgid "Type"
+msgstr "Tรผr"
+
+#: builtin/config.c:148 builtin/env--helper.c:38
+msgid "value is given this type"
+msgstr "deฤŸer bu tรผrde verildi"
+
+#: builtin/config.c:149
+msgid "value is \"true\" or \"false\""
+msgstr "deฤŸer \"true\" (doฤŸru) veya \"false\" (yanlฤฑลŸ)"
+
+#: builtin/config.c:150
+msgid "value is decimal number"
+msgstr "deฤŸer ondalฤฑk sayฤฑ"
+
+#: builtin/config.c:151
+msgid "value is --bool or --int"
+msgstr "deฤŸer --bool veya --int"
+
+#: builtin/config.c:152
+msgid "value is a path (file or directory name)"
+msgstr "deฤŸer bir yol (dosya veya dizin adฤฑ)"
+
+#: builtin/config.c:153
+msgid "value is an expiry date"
+msgstr "deฤŸer bir son kullanฤฑm tarihi"
+
+#: builtin/config.c:154
+msgid "Other"
+msgstr "DiฤŸer"
+
+#: builtin/config.c:155
+msgid "terminate values with NUL byte"
+msgstr "deฤŸerleri NUL baytฤฑ ile sonlandฤฑr"
+
+#: builtin/config.c:156
+msgid "show variable names only"
+msgstr "yalnฤฑzca deฤŸiลŸken adlarฤฑnฤฑ gรถster"
+
+#: builtin/config.c:157
+msgid "respect include directives on lookup"
+msgstr "arama sฤฑrasฤฑnda iรงerme yรถnergelerine uy"
+
+#: builtin/config.c:158
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"yapฤฑlandฤฑrmanฤฑn kรถkenini gรถster (dosya, stdin, ikili nesne, komut satฤฑrฤฑ)"
+
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"yapฤฑlandฤฑrmanฤฑn kapsamฤฑnฤฑ gรถster (รงalฤฑลŸma aฤŸacฤฑ, yerel, global, sistem, "
+"komut)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
+msgid "value"
+msgstr "deฤŸer"
+
+#: builtin/config.c:160
+msgid "with --get, use default value when missing entry"
+msgstr "--get ile girdi verilmemiลŸse รถntanฤฑmlฤฑ deฤŸeri kullan"
+
+#: builtin/config.c:174
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "yanlฤฑลŸ deฤŸiลŸken sayฤฑsฤฑ, %d olmalฤฑ"
+
+#: builtin/config.c:176
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "yanlฤฑลŸ deฤŸiลŸken sayฤฑsฤฑ, %d ile %d arasฤฑnda olmalฤฑ"
+
+#: builtin/config.c:324
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "geรงersiz anahtar dizgisi: %s"
+
+#: builtin/config.c:360
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "รถntanฤฑmlฤฑ yapฤฑlandฤฑrma deฤŸeri biรงimlendirilemedi: %s"
+
+#: builtin/config.c:417
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "renk ayrฤฑลŸtฤฑrฤฑlamฤฑyor: '%s'"
+
+#: builtin/config.c:459
+msgid "unable to parse default color value"
+msgstr "รถntanฤฑmlฤฑ renk deฤŸeri ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: builtin/config.c:512 builtin/config.c:768
+msgid "not in a git directory"
+msgstr "bir git dizininde deฤŸil"
+
+#: builtin/config.c:515
+msgid "writing to stdin is not supported"
+msgstr "stdin'e yazma desteklenmiyor"
+
+#: builtin/config.c:518
+msgid "writing config blobs is not supported"
+msgstr "yapฤฑlandฤฑrma ikili nesneleri yazฤฑmฤฑ desteklenmiyor"
+
+#: builtin/config.c:603
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# Bu Git'in kullanฤฑcฤฑya รถzel yapฤฑlandฤฑrma dosyasฤฑdฤฑr.\n"
+"[kullanฤฑcฤฑ]\n"
+"Lรผtfen aลŸaฤŸฤฑdaki satฤฑrlarฤฑ yorumdan รงฤฑkarฤฑn ve รถzelleลŸtirin:\n"
+"#\tad = %s\n"
+"#\te-posta = %s\n"
+
+#: builtin/config.c:627
+msgid "only one config file at a time"
+msgstr "bir kerede yalnฤฑzca bir yapฤฑlandฤฑrma dosyasฤฑ"
+
+#: builtin/config.c:632
+msgid "--local can only be used inside a git repository"
+msgstr "--local yalnฤฑzca bir git deposu iรงinde kullanฤฑlabilir"
+
+#: builtin/config.c:635
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob yalnฤฑzca bir git deposu iรงinde kullanฤฑlabilir"
+
+#: builtin/config.c:655
+msgid "$HOME not set"
+msgstr "$HOME ayarlanmamฤฑลŸ"
+
+#: builtin/config.c:679
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
+msgstr ""
+"--worktree, worktreeConfig yapฤฑlandฤฑrma geniลŸletmesi etkinleลŸtirilmediฤŸi\n"
+"sรผrece birden รงok รงalฤฑลŸma aฤŸacฤฑ ile birlikte kullanฤฑlamaz. Ayrฤฑntฤฑlar iรงin\n"
+"lรผtfen \"git help worktree\" iรงindeki \"CONFIGURATION FILE\" bรถlรผmรผnรผ okuyun."
+
+#: builtin/config.c:714
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color ve deฤŸiลŸken tรผrรผ tutarsฤฑz"
+
+#: builtin/config.c:719
+msgid "only one action at a time"
+msgstr "bir kerede yalnฤฑzca bir eylem"
+
+#: builtin/config.c:732
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only yalnฤฑzca ลŸunlara uygulanabilir: --list, --get-regexp"
+
+#: builtin/config.c:738
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin yalnฤฑzca ลŸunlara uygulanabilir: --get, --get-all, --get-regexp "
+"ve --list"
+
+#: builtin/config.c:744
+msgid "--default is only applicable to --get"
+msgstr "--default yalnฤฑzca ลŸuna uygulanabilir: --get"
+
+#: builtin/config.c:757
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "'%s' yapฤฑlandฤฑrma dosyasฤฑ okunamฤฑyor"
+
+#: builtin/config.c:760
+msgid "error processing config file(s)"
+msgstr "yapฤฑlandฤฑrma dosyalarฤฑ iลŸlenirken hata"
+
+#: builtin/config.c:770
+msgid "editing stdin is not supported"
+msgstr "stdin'i dรผzenleme desteklenmiyor"
+
+#: builtin/config.c:772
+msgid "editing blobs is not supported"
+msgstr "ikili nesneleri dรผzenleme desteklenmiyor"
+
+#: builtin/config.c:786
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "%s yapฤฑlandฤฑrma dosyasฤฑ oluลŸturulamฤฑyor"
+
+#: builtin/config.c:799
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"Tek bir deฤŸer ile birden รงok deฤŸerin รผzerine yazฤฑlamฤฑyor.\n"
+"       %s deฤŸerini deฤŸiลŸtirmek iรงin bir dรผzenli ifade, --add veya --replace-"
+"all kullanฤฑn."
+
+#: builtin/config.c:873 builtin/config.c:884
+#, c-format
+msgid "no such section: %s"
+msgstr "bรถyle bir bรถlรผm yok: %s"
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr "yazdฤฑrma boyutlarฤฑ kiลŸi tarafฤฑndan okunabilir biรงimde"
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<seรงenekler>] [<gรถnderimsi>...]"
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<seรงenekler>] --dirty"
+
+#: builtin/describe.c:62
+msgid "head"
+msgstr "dal ucu"
+
+#: builtin/describe.c:62
+msgid "lightweight"
+msgstr "hafif"
+
+#: builtin/describe.c:62
+msgid "annotated"
+msgstr "ek aรงฤฑklamalฤฑ"
+
+#: builtin/describe.c:275
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "%s ek aรงฤฑklamalฤฑ etiketi mevcut deฤŸil"
+
+#: builtin/describe.c:279
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "%s ek aรงฤฑklamalฤฑ etiketinde gรถmรผlรผ ad yok"
+
+#: builtin/describe.c:281
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "'%s' etiketi gerรงekte burada '%s'"
+
+#: builtin/describe.c:325
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "'%s' ile herhangi bir etiket tam olarak eลŸleลŸmiyor"
+
+#: builtin/describe.c:327
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+"Kesin olarak eลŸleลŸen baลŸvuru veya etiket yok, betimlemek iรงin aranฤฑyor\n"
+
+#: builtin/describe.c:394
+#, c-format
+msgid "finished search at %s\n"
+msgstr "arama ลŸurada bitirildi: %s\n"
+
+#: builtin/describe.c:421
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"Hiรงbir ek aรงฤฑklamalฤฑ etiket ลŸunu betimleyemiyor: '%s'.\n"
+"Bunun yanฤฑnda ek aรงฤฑklamasฤฑ olmayan etiketler vardฤฑ, --tags deneyin."
+
+#: builtin/describe.c:425
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"ลžunu hiรงbir etiket betimleyemez: '%s'.\n"
+"--always deneyin veya birkaรง etiket oluลŸturun."
+
+#: builtin/describe.c:455
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "%lu gรถnderi katedildi\n"
+
+#: builtin/describe.c:458
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+"%i etiketten fazla etiket bulundu; en son %i listelendi\n"
+"ลŸu konumda arama bฤฑrakฤฑldฤฑ: %s\n"
+
+#: builtin/describe.c:526
+#, c-format
+msgid "describe %s\n"
+msgstr "ลŸunu tanฤฑmla: %s\n"
+
+#: builtin/describe.c:529
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "%s geรงerli bir nesne adฤฑ deฤŸil"
+
+#: builtin/describe.c:537
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s ne bir gรถnderi ne de ikili nesne"
+
+#: builtin/describe.c:551
+msgid "find the tag that comes after the commit"
+msgstr "gรถnderinin ardฤฑndan gelen etiketi bul"
+
+#: builtin/describe.c:552
+msgid "debug search strategy on stderr"
+msgstr "stderr'deki arama stratejisini ayฤฑkla"
+
+#: builtin/describe.c:553
+msgid "use any ref"
+msgstr "herhangi bir baลŸvuruyu kullan"
+
+#: builtin/describe.c:554
+msgid "use any tag, even unannotated"
+msgstr "herhangi bir etiketi kullan, ek aรงฤฑklamasฤฑ olmasa bile"
+
+#: builtin/describe.c:555
+msgid "always use long format"
+msgstr "her zaman uzun biรงimi kullan"
+
+#: builtin/describe.c:556
+msgid "only follow first parent"
+msgstr "yalnฤฑzca ilk รผst รถgeyi izle"
+
+#: builtin/describe.c:559
+msgid "only output exact matches"
+msgstr "yalnฤฑzca kesin eลŸleลŸmeleri รงฤฑktฤฑ ver"
+
+#: builtin/describe.c:561
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "<n> en son etiketi dikkate al (รถntanฤฑmlฤฑ: 10)"
+
+#: builtin/describe.c:563
+msgid "only consider tags matching <pattern>"
+msgstr "yalnฤฑzca <dizgi> ile eลŸleลŸen etiketleri dikkate al"
+
+#: builtin/describe.c:565
+msgid "do not consider tags matching <pattern>"
+msgstr "<dizgi> ile eลŸleลŸen etiketleri dikkate alma"
+
+#: builtin/describe.c:567 builtin/name-rev.c:535
+msgid "show abbreviated commit object as fallback"
+msgstr "kฤฑsaltฤฑlmฤฑลŸ gรถnderi nesnesini geri รงekilinecek nesne olarak gรถster"
+
+#: builtin/describe.c:568 builtin/describe.c:571
+msgid "mark"
+msgstr "im"
+
+#: builtin/describe.c:569
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "<im>'i kirli รงalฤฑลŸma aฤŸacฤฑna iliลŸtir (รถntanฤฑmlฤฑ: \"-dirty\")"
+
+#: builtin/describe.c:572
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "<im>'i bozuk รงalฤฑลŸma aฤŸacฤฑna iliลŸtir (รถntanฤฑmlฤฑ: \"-broken\")"
+
+#: builtin/describe.c:590
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long, --abbrev=0 ile uyumsuz"
+
+#: builtin/describe.c:619
+msgid "No names found, cannot describe anything."
+msgstr "Hiรงbir ad bulunamadฤฑ, hiรงbir ลŸey betimlenemiyor."
+
+#: builtin/describe.c:670
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty, gรถnderimsilerle uyumsuz"
+
+#: builtin/describe.c:672
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken, gรถnderimsilerle uyumsuz"
+
+#: builtin/diff.c:84
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s': Sฤฑradan bir dosya veya sembolik baฤŸ deฤŸil"
+
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
+msgstr "geรงersiz seรงenek: %s"
+
+#: builtin/diff.c:350
+msgid "Not a git repository"
+msgstr "Bir git deposu deฤŸil"
+
+#: builtin/diff.c:394
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "geรงersiz nesne '%s' verildi"
+
+#: builtin/diff.c:403
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "ikiden รงok ikili nesne verildi: '%s'"
+
+#: builtin/diff.c:408
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "ele alฤฑnmayan nesne '%s' verildi"
+
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<seรงenekler>] [<gรถnderi> [<gรถnderi>]] [--] [<yol>...]"
+
+#: builtin/difftool.c:260
+#, c-format
+msgid "failed: %d"
+msgstr "baลŸarฤฑsฤฑz: %d"
+
+#: builtin/difftool.c:302
+#, c-format
+msgid "could not read symlink %s"
+msgstr "%s sembolik baฤŸฤฑ okunamadฤฑ"
+
+#: builtin/difftool.c:304
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "%s sembolik baฤŸ dosyasฤฑ okunamadฤฑ"
+
+#: builtin/difftool.c:312
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "%s nesnesi %s sembolik baฤŸฤฑ iรงin okunamadฤฑ"
+
+#: builtin/difftool.c:413
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+"BirleลŸtirilmiลŸ diff biรงimleri (-c ve --cc) dizin diff kipinde\n"
+"(-d ve --dir-diff) desteklenmiyor."
+
+#: builtin/difftool.c:634
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "Her iki dosya da deฤŸiลŸtirildi: '%s' ve '%s'."
+
+#: builtin/difftool.c:636
+msgid "working tree file has been left."
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ dosyasฤฑ bฤฑrakฤฑldฤฑ."
+
+#: builtin/difftool.c:647
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "'%s' konumunda geรงici dosyalar var."
+
+#: builtin/difftool.c:648
+msgid "you may want to cleanup or recover these."
+msgstr "Bunlarฤฑ temizlemek veya kurtarmak isteyebilirsiniz."
+
+#: builtin/difftool.c:697
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "'diff.tool' yerine 'diff.guitool' kullan"
+
+#: builtin/difftool.c:699
+msgid "perform a full-directory diff"
+msgstr "bir tam dizin diff'i gerรงekleลŸtir"
+
+#: builtin/difftool.c:701
+msgid "do not prompt before launching a diff tool"
+msgstr "bir diff aracฤฑ รงalฤฑลŸtฤฑrmadan รถnce sorma"
+
+#: builtin/difftool.c:706
+msgid "use symlinks in dir-diff mode"
+msgstr "dir-diff kipinde sembolik baฤŸlar kullan"
+
+#: builtin/difftool.c:707
+msgid "tool"
+msgstr "araรง"
+
+#: builtin/difftool.c:708
+msgid "use the specified diff tool"
+msgstr "belirtilen diff aracฤฑnฤฑ kullan"
+
+#: builtin/difftool.c:710
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "'-tool' ile birlikte kullanฤฑlabilecek diff araรงlarฤฑnฤฑn listesini รงฤฑkar"
+
+#: builtin/difftool.c:713
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+"รงalฤฑลŸtฤฑrฤฑlan bir diff aracฤฑ sฤฑfฤฑr olmayan bir รงฤฑkฤฑลŸ kodu dรถndรผrdรผฤŸรผnde 'git-"
+"difftool'un รงฤฑkฤฑลŸ yapmasฤฑnฤฑ saฤŸla"
+
+#: builtin/difftool.c:716
+msgid "specify a custom command for viewing diffs"
+msgstr "diff'leri gรถrรผntรผlemek iรงin รถzel bir komut belirle"
+
+#: builtin/difftool.c:717
+msgid "passed to `diff`"
+msgstr "'diff'e aktarฤฑldฤฑ"
+
+#: builtin/difftool.c:732
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool, รงalฤฑลŸma aฤŸacฤฑ veya --no-index gerektiriyor"
+
+#: builtin/difftool.c:739
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "-dir-diff, --no-index ile uyumsuz"
+
+#: builtin/difftool.c:742
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool ve --extcmd birlikte kullanฤฑlamaz"
+
+#: builtin/difftool.c:750
+msgid "no <tool> given for --tool=<tool>"
+msgstr "--tool=<araรง> iรงin bir <araรง> verilmedi"
+
+#: builtin/difftool.c:757
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "--extcmd=<komut> iรงin bir <komut> verilmedi"
+
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <seรงenekler> <ortam-dฤŸลŸkn>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "tรผr"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "git_env_*(...)'ฤฑn geri รงekileceฤŸi รถntanฤฑmlฤฑ"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "sessiz ol, yalnฤฑzca git_env*() deฤŸerini รงฤฑkฤฑลŸ kodu olarak kullan"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"--default seรงeneฤŸi, --type=bool ile birlikte bir Boole deฤŸeri bekliyor, '%s' "
+"deฤŸil"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"--default seรงeneฤŸi, --type=ulong ile birlikte bir imzalanmamฤฑลŸ uzun deฤŸer "
+"bekliyor, '%s' deฤŸil"
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [rev-list-opts]"
+
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+"Hata: ฤฐรง iรงe geรงmiลŸ etiketler --mark-tags belirtilmediฤŸi sรผrece dฤฑลŸa "
+"aktarฤฑlamaz."
+
+#: builtin/fast-export.c:1152
+msgid "show progress after <n> objects"
+msgstr "<n> nesneden sonra ilerlemeyi gรถster"
+
+#: builtin/fast-export.c:1154
+msgid "select handling of signed tags"
+msgstr "imzalanan etiketlerin nasฤฑl iลŸleneceฤŸini seรงin"
+
+#: builtin/fast-export.c:1157
+msgid "select handling of tags that tag filtered objects"
+msgstr "nesnelerce sรผzรผlen etiketlerin nasฤฑl iลŸleneceฤŸini seรงin"
+
+#: builtin/fast-export.c:1160
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "baลŸka bir kodlamaya iye gรถnderi iletilerinin nasฤฑl iลŸleneceฤŸini seรงin"
+
+#: builtin/fast-export.c:1163
+msgid "Dump marks to this file"
+msgstr "imleri bu dosyaya boลŸalt"
+
+#: builtin/fast-export.c:1165
+msgid "Import marks from this file"
+msgstr "imleri bu dosyadan iรงe aktar"
+
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "eฤŸer varsa bu dosyadan imleri iรงe aktar"
+
+#: builtin/fast-export.c:1171
+msgid "Fake a tagger when tags lack one"
+msgstr "etiketlerin bir etiketleyicisi yoksa varmฤฑลŸ gibi davran"
+
+#: builtin/fast-export.c:1173
+msgid "Output full tree for each commit"
+msgstr "her gรถnderi iรงin tรผm aฤŸacฤฑn รงฤฑktฤฑsฤฑnฤฑ ver"
+
+#: builtin/fast-export.c:1175
+msgid "Use the done feature to terminate the stream"
+msgstr "akฤฑลŸฤฑ sonlandฤฑrmak iรงin 'done' รถzelliฤŸini kullan"
+
+#: builtin/fast-export.c:1176
+msgid "Skip output of blob data"
+msgstr "ikili nesne verisi รงฤฑktฤฑsฤฑnฤฑ atla"
+
+#: builtin/fast-export.c:1177 builtin/log.c:1705
+msgid "refspec"
+msgstr "baลŸvuru belirteci"
+
+#: builtin/fast-export.c:1178
+msgid "Apply refspec to exported refs"
+msgstr "baลŸvuru belirtecini dฤฑลŸa aktarฤฑlan baลŸvurulara aktar"
+
+#: builtin/fast-export.c:1179
+msgid "anonymize output"
+msgstr "รงฤฑktฤฑ kimliฤŸini gizle"
+
+#: builtin/fast-export.c:1181
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr "'fast-export' akฤฑลŸฤฑnda olmayan รผst รถgelere nesne numarasฤฑ ile baลŸvur"
+
+#: builtin/fast-export.c:1183
+msgid "Show original object ids of blobs/commits"
+msgstr "ikili nesnelerin/gรถnderilerin orijinal nesne numaralarฤฑnฤฑ gรถster"
+
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "etiketleri im numaralarฤฑyla adlandฤฑr"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr "Hem --import-marks ve hem --import-marks-if-exists aktarฤฑlamadฤฑ"
+
+#: builtin/fetch.c:34
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<seรงenekler>] [<depo> [<bลŸvr-blrtรง>...]]"
+
+#: builtin/fetch.c:35
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<seรงenekler>] <grup>"
+
+#: builtin/fetch.c:36
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<seรงenekler>] [(<depo> | <grup>)...]"
+
+#: builtin/fetch.c:37
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<seรงenekler>]"
+
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel negatif olamaz"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
+msgid "fetch from all remotes"
+msgstr "tรผm uzak konumlardan getir"
+
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "git pull/fetch iรงin รผstkaynak ayarla"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr ".git/FETCH_HEAD'in รผzerine yazmak yerine ona iliลŸtir"
+
+#: builtin/fetch.c:145 builtin/pull.c:190
+msgid "path to upload pack on remote end"
+msgstr "uzak uรงtaki yรผkleme paketine olan yol"
+
+#: builtin/fetch.c:146
+msgid "force overwrite of local reference"
+msgstr "yerel baลŸvurunun รผzerine zorla yaz"
+
+#: builtin/fetch.c:148
+msgid "fetch from multiple remotes"
+msgstr "birden รงok uzak konumdan getir"
+
+#: builtin/fetch.c:150 builtin/pull.c:194
+msgid "fetch all tags and associated objects"
+msgstr "tรผm etiketleri ve iliลŸkilendirilen nesneleri getir"
+
+#: builtin/fetch.c:152
+msgid "do not fetch all tags (--no-tags)"
+msgstr "tรผm etiketleri getirme (--no-tags)"
+
+#: builtin/fetch.c:154
+msgid "number of submodules fetched in parallel"
+msgstr "paralelde getirilen altmodรผllerin sayฤฑsฤฑ"
+
+#: builtin/fetch.c:156 builtin/pull.c:197
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "artฤฑk uzak konumda olmayan uzak izleme dallarฤฑnฤฑ buda"
+
+#: builtin/fetch.c:158
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+"artฤฑk uzak konumda olmayan yerel etiketleri buda ve deฤŸiลŸtirilen etiketleri "
+"gรผncelle"
+
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+msgid "on-demand"
+msgstr "istek รผzerine"
+
+#: builtin/fetch.c:160
+msgid "control recursive fetching of submodules"
+msgstr "altmodรผllerin รถzyineli getirilmesini denetle"
+
+#: builtin/fetch.c:164 builtin/pull.c:205
+msgid "keep downloaded pack"
+msgstr "indirilen paketi tut"
+
+#: builtin/fetch.c:166
+msgid "allow updating of HEAD ref"
+msgstr "HEAD baลŸvurusunun gรผncellenmesine izin ver"
+
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+msgid "deepen history of shallow clone"
+msgstr "sฤฑฤŸ klonun geรงmiลŸini derinleลŸtir"
+
+#: builtin/fetch.c:171
+msgid "deepen history of shallow repository based on time"
+msgstr "zamana baฤŸlฤฑ olarak sฤฑฤŸ deponun geรงmiลŸini derinleลŸtir"
+
+#: builtin/fetch.c:177 builtin/pull.c:211
+msgid "convert to a complete repository"
+msgstr "tam bir depoya dรถnรผลŸtรผr"
+
+#: builtin/fetch.c:180
+msgid "prepend this to submodule path output"
+msgstr "bunu altmodรผl yol รงฤฑktฤฑsฤฑnฤฑn baลŸฤฑna ekle"
+
+#: builtin/fetch.c:183
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"altmodรผllerin รถzyineli getirilmesi iรงin รถntanฤฑmlฤฑ (yapฤฑlandฤฑrma "
+"dosyalarฤฑndan daha az รถnceliฤŸe iye)"
+
+#: builtin/fetch.c:187 builtin/pull.c:214
+msgid "accept refs that update .git/shallow"
+msgstr ".git/shallow'u gรผncelleyen baลŸvurularฤฑ kabul et"
+
+#: builtin/fetch.c:188 builtin/pull.c:216
+msgid "refmap"
+msgstr "ilgili baลŸvuru"
+
+#: builtin/fetch.c:189 builtin/pull.c:217
+msgid "specify fetch refmap"
+msgstr "getirme ile ilgili baลŸvurularฤฑ belirt"
+
+#: builtin/fetch.c:196
+msgid "report that we have only objects reachable from this object"
+msgstr "yalnฤฑzca bu nesneden ulaลŸฤฑlabilir nesnelerimiz olduฤŸunu bildir"
+
+#: builtin/fetch.c:199
+msgid "run 'gc --auto' after fetching"
+msgstr "getirme sonrasฤฑnda 'gc --auto' รงalฤฑลŸtฤฑr"
+
+#: builtin/fetch.c:201 builtin/pull.c:226
+msgid "check for forced-updates on all updated branches"
+msgstr "tรผm gรผncellenmiลŸ dallarฤฑ zorlanmฤฑลŸ gรผncellemeler iรงin denetle"
+
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "getirdikten sonra gรถnderi grafiฤŸini yaz"
+
+#: builtin/fetch.c:513
+msgid "Couldn't find remote ref HEAD"
+msgstr "Uzak HEAD baลŸvurusu bulunamadฤฑ"
+
+#: builtin/fetch.c:653
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "fetch.output yapฤฑlandฤฑrmasฤฑ geรงersiz deฤŸer iรงeriyor: %s"
+
+#: builtin/fetch.c:751
+#, c-format
+msgid "object %s not found"
+msgstr "%s nesnesi bulunamadฤฑ"
+
+#: builtin/fetch.c:755
+msgid "[up to date]"
+msgstr "[gรผncel]"
+
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+msgid "[rejected]"
+msgstr "[reddedildi]"
+
+#: builtin/fetch.c:769
+msgid "can't fetch in current branch"
+msgstr "geรงerli dalda getirme yapฤฑlamฤฑyor"
+
+#: builtin/fetch.c:779
+msgid "[tag update]"
+msgstr "[etiket gรผncellemesi]"
+
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
+msgid "unable to update local ref"
+msgstr "yerel baลŸvuru gรผncellenemiyor"
+
+#: builtin/fetch.c:784
+msgid "would clobber existing tag"
+msgstr "var olan etiketi deฤŸiลŸtirecektir"
+
+#: builtin/fetch.c:806
+msgid "[new tag]"
+msgstr "[yeni etiket]"
+
+#: builtin/fetch.c:809
+msgid "[new branch]"
+msgstr "[yeni dal]"
+
+#: builtin/fetch.c:812
+msgid "[new ref]"
+msgstr "[yeni baลŸvuru]"
+
+#: builtin/fetch.c:851
+msgid "forced update"
+msgstr "zorlanmฤฑลŸ gรผncelleme"
+
+#: builtin/fetch.c:856
+msgid "non-fast-forward"
+msgstr "ileri sarฤฑm deฤŸil"
+
+#: builtin/fetch.c:877
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"Getirme normalde hangi dallarda zorla gรผncelleme yapฤฑldฤฑฤŸฤฑnฤฑ belirtir,\n"
+"ancak bu denetleme kapatฤฑlmฤฑลŸ. Yeniden aรงmak iรงin --show-forced-updates\n"
+"bayraฤŸฤฑnฤฑ kullanฤฑn veya 'git config fetch.showForcedUpdates true' รงalฤฑลŸtฤฑrฤฑn."
+
+#: builtin/fetch.c:881
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"Zorla gรผncellemeleri denetleme %.2f saniye sรผrdรผ. --no-show-forced-updates\n"
+"kullanarak veya 'git config fetch.showForcedUpdates false' รงalฤฑลŸtฤฑrarak\n"
+"bu denetlemeden kaรงฤฑnabilirsiniz.\n"
+
+#: builtin/fetch.c:920
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s tรผm gerekli nesneleri gรถndermedi\n"
+
+#: builtin/fetch.c:941
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "%s reddedilmeli, รงรผnkรผ sฤฑฤŸ kรถklerin gรผncellenmesine izin verilmiyor"
+
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#, c-format
+msgid "From %.*s\n"
+msgstr "ลžuradan: %.*s\n"
+
+#: builtin/fetch.c:1037
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"bazฤฑ yerel baลŸvurular gรผncellenemedi; 'git remote prune %s'\n"
+"kullanarak eski ve รงakฤฑลŸan dallarฤฑ kaldฤฑrmayฤฑ deneyin"
+
+#: builtin/fetch.c:1134
+#, c-format
+msgid "   (%s will become dangling)"
+msgstr "   (%s sarkacak)"
+
+#: builtin/fetch.c:1135
+#, c-format
+msgid "   (%s has become dangling)"
+msgstr "   (%s sarkmaya baลŸladฤฑ)"
+
+#: builtin/fetch.c:1167
+msgid "[deleted]"
+msgstr "[silindi]"
+
+#: builtin/fetch.c:1168 builtin/remote.c:1112
+msgid "(none)"
+msgstr "(yok)"
+
+#: builtin/fetch.c:1191
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "ร‡ฤฑplak olmayan deponun geรงerli %s dalฤฑna getirme reddediliyor"
+
+#: builtin/fetch.c:1210
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "\"%s\" seรงeneฤŸi \"%s\" deฤŸeri %s iรงin geรงerli deฤŸil"
+
+#: builtin/fetch.c:1213
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "\"%s\" seรงeneฤŸi %s iรงin yok sayฤฑlฤฑyor\n"
+
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "birden รงok dal algฤฑlandฤฑ, --set-upstream ile uyumsuz"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "bir uzak konum uzak izleme dalฤฑ iรงin รผstkaynak ayarlanmฤฑyor"
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "bir uzak konum etiketi iรงin รผstkaynak ayarlanmฤฑyor"
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "bilinmeyen dal tรผrรผ"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"Kaynak dal bulunamadฤฑ.\n"
+"--set-upstream-option ile tam olarak bir dal belirtmeniz gerekiyor."
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#, c-format
+msgid "Fetching %s\n"
+msgstr "%s getiriliyor\n"
+
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "%s getirilemedi"
+
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "'%s' getirilemedi (รงฤฑkฤฑลŸ kodu: %d)\n"
+
+#: builtin/fetch.c:1693
+msgid ""
+"No remote repository specified.  Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+"Bir uzak dal belirtilmedi. Lรผtfen yeni revizyonlarฤฑn\n"
+"alฤฑnacaฤŸฤฑ bir URL veya uzak konum adฤฑ belirtin."
+
+#: builtin/fetch.c:1730
+msgid "You need to specify a tag name."
+msgstr "Bir etiket adฤฑ belirtmeniz gerekiyor."
+
+#: builtin/fetch.c:1780
+msgid "Negative depth in --deepen is not supported"
+msgstr "--deepen iรงin negatif derinlik desteklenmiyor"
+
+#: builtin/fetch.c:1782
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen ve --depth birlikte kullanฤฑlamaz"
+
+#: builtin/fetch.c:1787
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth ve --unshallow birlikte kullanฤฑlamaz"
+
+#: builtin/fetch.c:1789
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "tam bir depo รผzerinde --unshallow bir anlam ifade etmiyor"
+
+#: builtin/fetch.c:1805
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all bir depo deฤŸiลŸkeni almฤฑyor"
+
+#: builtin/fetch.c:1807
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all baลŸvuru belirteรงleri ile birlikte bir anlam ifade etmiyor"
+
+#: builtin/fetch.c:1816
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "Bรถyle bir uzak konum veya uzak konum grubu yok: %s"
+
+#: builtin/fetch.c:1823
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr ""
+"Bir grubu getirme ve baลŸvuru belirteรงleri tanฤฑmlama bir anlam ifade etmiyor"
+
+#: builtin/fetch.c:1841
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter yalnฤฑzca extensions.partialclone iรงinde yapฤฑlandฤฑrฤฑlmฤฑลŸ uzak konum "
+"ile kullanฤฑlabilir."
+
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+"git fmt-merge-msg [-m <ileti>] [--log[=<n>] | --no-log] [--file <dosya>]"
+
+#: builtin/fmt-merge-msg.c:671
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "gรผnlรผฤŸรผ kฤฑsa gรผnlรผkten en az <n> girdi ile doldur"
+
+#: builtin/fmt-merge-msg.c:674
+msgid "alias for --log (deprecated)"
+msgstr "--log iรงin arma (kullanฤฑm dฤฑลŸฤฑ)"
+
+#: builtin/fmt-merge-msg.c:677
+msgid "text"
+msgstr "metin"
+
+#: builtin/fmt-merge-msg.c:678
+msgid "use <text> as start of message"
+msgstr "iletinin baลŸlangฤฑcฤฑ olarak <metin> kullan"
+
+#: builtin/fmt-merge-msg.c:679
+msgid "file to read from"
+msgstr "okunacak dosya"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<seรงenekler>] [<dizgi>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <nesne>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<gรถnderi>]]"
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<gรถnderi>]] [--no-contains [<gรถnderi>]]"
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr "yer tutucularฤฑ kabuฤŸun anlayabileceฤŸi biรงimde tฤฑrnak iรงine al"
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr "yer tutucularฤฑ perl'in anlayabileceฤŸi biรงimde tฤฑrnak iรงine al"
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr "yer tutucularฤฑ python'un anlayabileceฤŸi biรงimde tฤฑrnak iรงine al"
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr "yer tutucularฤฑ Tcl'nin anlayabileceฤŸi biรงimde tฤฑrnak iรงine al"
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr "yalnฤฑzca <n> eลŸleลŸen baลŸvuruyu gรถster"
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
+msgid "respect format colors"
+msgstr "biรงim renklerine uy"
+
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
+msgstr "yalnฤฑzca verilen nesneye iลŸaret eden baลŸvurularฤฑ yazdฤฑr"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
+msgstr "yalnฤฑzca birleลŸtirilen baลŸvurularฤฑ yazdฤฑr"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
+msgstr "yalnฤฑzca birleลŸtirilmemiลŸ baลŸvurularฤฑ yazdฤฑr"
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
+msgstr "yalnฤฑzca gรถnderiyi iรงeren baลŸvurularฤฑ yazdฤฑr"
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr "yalnฤฑzca gรถnderiyi iรงermeyen baลŸvurularฤฑ yazdฤฑr"
+
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+msgid "unknown"
+msgstr "bilinmeyen"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:100 builtin/fsck.c:120
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "%s %s iรงinde hata: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:114
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "%s %s iรงinde uyarฤฑ: %s"
+
+#: builtin/fsck.c:143 builtin/fsck.c:146
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "ลŸuradan kฤฑrฤฑk baฤŸ: %7s %s"
+
+#: builtin/fsck.c:155
+msgid "wrong object type in link"
+msgstr "baฤŸda yanlฤฑลŸ nesne tรผrรผ"
+
+#: builtin/fsck.c:171
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+"ลŸuradan kฤฑrฤฑk baฤŸ: %7s %s\n"
+"           ลŸuraya: %7s %s"
+
+#: builtin/fsck.c:282
+#, c-format
+msgid "missing %s %s"
+msgstr "eksik %s %s"
+
+#: builtin/fsck.c:309
+#, c-format
+msgid "unreachable %s %s"
+msgstr "ulaลŸฤฑlamayan %s %s"
+
+#: builtin/fsck.c:329
+#, c-format
+msgid "dangling %s %s"
+msgstr "sarkan %s %s"
+
+#: builtin/fsck.c:339
+msgid "could not create lost-found"
+msgstr "lost-found oluลŸturulamadฤฑ"
+
+#: builtin/fsck.c:350
+#, c-format
+msgid "could not finish '%s'"
+msgstr "'%s' bitirilemedi"
+
+#: builtin/fsck.c:367
+#, c-format
+msgid "Checking %s"
+msgstr "%s denetleniyor"
+
+#: builtin/fsck.c:405
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "BaฤŸlanabilirlik denetleniyor (%d nesne)"
+
+#: builtin/fsck.c:424
+#, c-format
+msgid "Checking %s %s"
+msgstr "%s %s denetleniyor"
+
+#: builtin/fsck.c:429
+msgid "broken links"
+msgstr "kฤฑrฤฑk baฤŸlar"
+
+#: builtin/fsck.c:438
+#, c-format
+msgid "root %s"
+msgstr "kรถk %s"
+
+#: builtin/fsck.c:446
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "%s %s (%s) ลŸurada etiketlendi: %s"
+
+#: builtin/fsck.c:475
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: nesne hasar gรถrmรผลŸ veya kayฤฑp"
+
+#: builtin/fsck.c:500
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: geรงersiz baลŸvuru gรผnlรผฤŸรผ girdisi %s"
+
+#: builtin/fsck.c:514
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "BaลŸvuru gรผnlรผฤŸรผ denetleniyor: %s->%s"
+
+#: builtin/fsck.c:548
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: geรงersiz sha1 iลŸaretรงisi %s"
+
+#: builtin/fsck.c:555
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: bir gรถnderi deฤŸil"
+
+#: builtin/fsck.c:609
+msgid "notice: No default references"
+msgstr "Uyarฤฑ: ร–ntanฤฑmlฤฑ baลŸvurular yok"
+
+#: builtin/fsck.c:624
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: nesne hasar gรถrmรผลŸ veya kayฤฑp: %s"
+
+#: builtin/fsck.c:637
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: nesne ayrฤฑลŸtฤฑrฤฑlamadฤฑ: %s"
+
+#: builtin/fsck.c:657
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "hatalฤฑ sha1 dosyasฤฑ: %s"
+
+#: builtin/fsck.c:672
+msgid "Checking object directory"
+msgstr "Nesne dizini denetleniyor"
+
+#: builtin/fsck.c:675
+msgid "Checking object directories"
+msgstr "Nesne dizinleri denetleniyor"
+
+#: builtin/fsck.c:690
+#, c-format
+msgid "Checking %s link"
+msgstr "%s baฤŸ denetleniyor"
+
+#: builtin/fsck.c:695 builtin/index-pack.c:843
+#, c-format
+msgid "invalid %s"
+msgstr "geรงersiz %s"
+
+#: builtin/fsck.c:702
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s garip bir ลŸeye iลŸaret ediyor (%s)"
+
+#: builtin/fsck.c:708
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: ayrฤฑk HEAD bir ลŸeye iลŸaret etmiyor"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "Uyarฤฑ: %s henรผz doฤŸmamฤฑลŸ bir dala iลŸaret ediyor (%s)"
+
+#: builtin/fsck.c:724
+msgid "Checking cache tree"
+msgstr "ร–nbellek aฤŸacฤฑ denetleniyor"
+
+#: builtin/fsck.c:729
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s: cache-tree iรงinde geรงersiz sha1 iลŸaretรงisi"
+
+#: builtin/fsck.c:738
+msgid "non-tree in cache-tree"
+msgstr "cache-tree iรงinde aฤŸaรง olmayan รถge"
+
+#: builtin/fsck.c:769
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<seรงenekler>] [<nesne>...]"
+
+#: builtin/fsck.c:775
+msgid "show unreachable objects"
+msgstr "ulaลŸฤฑlamayan nesneleri gรถster"
+
+#: builtin/fsck.c:776
+msgid "show dangling objects"
+msgstr "sarkan nesneleri gรถster"
+
+#: builtin/fsck.c:777
+msgid "report tags"
+msgstr "etiketleri bildir"
+
+#: builtin/fsck.c:778
+msgid "report root nodes"
+msgstr "kรถk dรผฤŸรผmleri bildir"
+
+#: builtin/fsck.c:779
+msgid "make index objects head nodes"
+msgstr "indeks nesnelerini dal ucu dรผฤŸรผmรผ yap"
+
+#: builtin/fsck.c:780
+msgid "make reflogs head nodes (default)"
+msgstr "baลŸvuru gรผnlรผklerini dal ucu dรผฤŸรผmรผ yap (รถntanฤฑmlฤฑ)"
+
+#: builtin/fsck.c:781
+msgid "also consider packs and alternate objects"
+msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al"
+
+#: builtin/fsck.c:782
+msgid "check only connectivity"
+msgstr "yalnฤฑzca baฤŸlanabilirliฤŸi denetle"
+
+#: builtin/fsck.c:783
+msgid "enable more strict checking"
+msgstr "daha kesin denetlemeyi etkinleลŸtir"
+
+#: builtin/fsck.c:785
+msgid "write dangling objects in .git/lost-found"
+msgstr "sarkan nesneleri .git/lost-found'a yaz"
+
+#: builtin/fsck.c:786 builtin/prune.c:132
+msgid "show progress"
+msgstr "ilerlemeyi gรถster"
+
+#: builtin/fsck.c:787
+msgid "show verbose names for reachable objects"
+msgstr "ulaลŸฤฑlabilir nesneler iรงin ayrฤฑntฤฑlฤฑ adlarฤฑ gรถster"
+
+#: builtin/fsck.c:846 builtin/index-pack.c:225
+msgid "Checking objects"
+msgstr "Nesneler denetleniyor"
+
+#: builtin/fsck.c:874
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: nesne kayฤฑp"
+
+#: builtin/fsck.c:885
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "geรงersiz parametre: sha1 bekleniyordu, '%s' alฤฑndฤฑ"
+
+#: builtin/gc.c:35
+msgid "git gc [<options>]"
+msgstr "git gc [<seรงenekler>]"
+
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "%s fstat yapฤฑlamadฤฑ: %s"
+
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "'%s' deฤŸeri '%s' ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/gc.c:475 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "'%s' bilgileri alฤฑnamฤฑyor"
+
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#, c-format
+msgid "cannot read '%s'"
+msgstr "'%s' okunamฤฑyor"
+
+#: builtin/gc.c:491
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"En son yapฤฑlan 'gc' iลŸlemi aลŸaฤŸฤฑdakileri bildirdi. Lรผtfen sorunun ana\n"
+"nedenini dรผzeltin ve %s รถgesini kaldฤฑrฤฑn.\n"
+"KendiliฤŸinden temizlik dosya kaldฤฑrฤฑlana deฤŸin gerรงekleลŸtirilmeyecektir.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:539
+msgid "prune unreferenced objects"
+msgstr "baลŸvurulmayan nesneleri buda"
+
+#: builtin/gc.c:541
+msgid "be more thorough (increased runtime)"
+msgstr "biraz daha titiz ol (artฤฑrฤฑlmฤฑลŸ iลŸleyiลŸ sรผresi)"
+
+#: builtin/gc.c:542
+msgid "enable auto-gc mode"
+msgstr "auto-gc kipini etkinleลŸtir"
+
+#: builtin/gc.c:545
+msgid "force running gc even if there may be another gc running"
+msgstr "baลŸka bir gc รงalฤฑลŸฤฑyor olsa bile zorla gc รงalฤฑลŸtฤฑr"
+
+#: builtin/gc.c:548
+msgid "repack all other packs except the largest pack"
+msgstr "en bรผyรผk paket dฤฑลŸฤฑndaki diฤŸer tรผm paketleri yeniden paketle"
+
+#: builtin/gc.c:565
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "gc.logexpiry deฤŸeri %s ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/gc.c:576
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "'prune expiry' deฤŸeri %s ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/gc.c:596
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "En iyi baลŸarฤฑm iรงin depo arka planda kendiliฤŸinden paketleniyor.\n"
+
+#: builtin/gc.c:598
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "En iyi baลŸarฤฑm iรงin depo kendiliฤŸinden paketleniyor.\n"
+
+#: builtin/gc.c:599
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "El ile ortalฤฑk temizliฤŸi iรงin \"git help gc\"ye bakฤฑn.\n"
+
+#: builtin/gc.c:639
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc %s makinesinde halihazฤฑrda รงalฤฑลŸฤฑyor (pid %<PRIuMAX> - รงalฤฑลŸmฤฑyorsa --"
+"force kullanฤฑn)"
+
+#: builtin/gc.c:694
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"ร‡ok fazla ulaลŸฤฑlabilir boลŸta nesne var; kaldฤฑrmak iรงin 'git prune' kullanฤฑn."
+
+#: builtin/grep.c:30
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<seรงenekler>] [-e] <dizgi> [<rev>...] [[--] <yol>...]"
+
+#: builtin/grep.c:225
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: iลŸ parรงacฤฑฤŸฤฑ oluลŸturulamadฤฑ: %s"
+
+#: builtin/grep.c:279
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "geรงersiz belirtilen iลŸ parรงacฤฑฤŸฤฑ sayฤฑsฤฑ (%d), %s iรงin"
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "iลŸ parรงacฤฑฤŸฤฑ desteฤŸi yok, %s yok sayฤฑlฤฑyor"
+
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "aฤŸaรง okunamฤฑyor (%s)"
+
+#: builtin/grep.c:633
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "%s tรผrรผndeki bir nesneden grep yapฤฑlamฤฑyor"
+
+#: builtin/grep.c:704
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "'%c' anahtarฤฑ sayฤฑsal bir deฤŸer bekliyor"
+
+#: builtin/grep.c:803
+msgid "search in index instead of in the work tree"
+msgstr "รงalฤฑลŸma aฤŸacฤฑ yerine indekste ara"
+
+#: builtin/grep.c:805
+msgid "find in contents not managed by git"
+msgstr "git tarafฤฑndan yรถnetilmeyen iรงerikte bul"
+
+#: builtin/grep.c:807
+msgid "search in both tracked and untracked files"
+msgstr "hem izlenen hem izlenmeyen dosyalar iรงinde ara"
+
+#: builtin/grep.c:809
+msgid "ignore files specified via '.gitignore'"
+msgstr "'.gitignore'da belirtilen dosyalarฤฑ yok say"
+
+#: builtin/grep.c:811
+msgid "recursively search in each submodule"
+msgstr "her altmodรผlde รถzyineli olarak ara"
+
+#: builtin/grep.c:814
+msgid "show non-matching lines"
+msgstr "eลŸleลŸmeyen satฤฑrlarฤฑ gรถster"
+
+#: builtin/grep.c:816
+msgid "case insensitive matching"
+msgstr "BรœYรœK/kรผรงรผk harf duyarsฤฑz eลŸleลŸme"
+
+#: builtin/grep.c:818
+msgid "match patterns only at word boundaries"
+msgstr "yalnฤฑzca sรถzcรผk sฤฑnฤฑrlarฤฑndaki dizgileri eลŸleลŸtir"
+
+#: builtin/grep.c:820
+msgid "process binary files as text"
+msgstr "ikili dosyalarฤฑ metin olarak iลŸle"
+
+#: builtin/grep.c:822
+msgid "don't match patterns in binary files"
+msgstr "ikili dosyalardaki dizgileri eลŸleลŸtirme"
+
+#: builtin/grep.c:825
+msgid "process binary files with textconv filters"
+msgstr "ikili dosyalarฤฑ textconv sรผzgeรงleri ile iลŸle"
+
+#: builtin/grep.c:827
+msgid "search in subdirectories (default)"
+msgstr "altdizinlerde ara (รถntanฤฑmlฤฑ)"
+
+#: builtin/grep.c:829
+msgid "descend at most <depth> levels"
+msgstr "en รงok <derinlik> dรผzeyine in"
+
+#: builtin/grep.c:833
+msgid "use extended POSIX regular expressions"
+msgstr "geniลŸletilmiลŸ POSIX dรผzenli ifadelerini kullan"
+
+#: builtin/grep.c:836
+msgid "use basic POSIX regular expressions (default)"
+msgstr "temel POSIX dรผzenli ifadelerini kullan (รถntanฤฑmlฤฑ)"
+
+#: builtin/grep.c:839
+msgid "interpret patterns as fixed strings"
+msgstr "dizgileri sabit diziler olarak yorumla"
+
+#: builtin/grep.c:842
+msgid "use Perl-compatible regular expressions"
+msgstr "Perl uyumlu dรผzenli ifadeler kullan"
+
+#: builtin/grep.c:845
+msgid "show line numbers"
+msgstr "satฤฑr numaralarฤฑnฤฑ gรถster"
+
+#: builtin/grep.c:846
+msgid "show column number of first match"
+msgstr "ilk eลŸleลŸmenin sรผtun numarasฤฑnฤฑ gรถster"
+
+#: builtin/grep.c:847
+msgid "don't show filenames"
+msgstr "dosya adlarฤฑnฤฑ gรถsterme"
+
+#: builtin/grep.c:848
+msgid "show filenames"
+msgstr "dosya adlarฤฑnฤฑ gรถster"
+
+#: builtin/grep.c:850
+msgid "show filenames relative to top directory"
+msgstr "dosya adlarฤฑnฤฑ en รผst dizine gรถreceli olarak gรถster"
+
+#: builtin/grep.c:852
+msgid "show only filenames instead of matching lines"
+msgstr "eลŸleลŸen satฤฑrlar yerine yalnฤฑzca dosya adlarฤฑnฤฑ gรถster"
+
+#: builtin/grep.c:854
+msgid "synonym for --files-with-matches"
+msgstr "--files-with-matches eลŸanlamlฤฑsฤฑ"
+
+#: builtin/grep.c:857
+msgid "show only the names of files without match"
+msgstr "eลŸleลŸme olmadan yalnฤฑzca dosya adlarฤฑnฤฑ gรถster"
+
+#: builtin/grep.c:859
+msgid "print NUL after filenames"
+msgstr "dosya adlarฤฑndan sonra NUL yazdฤฑr"
+
+#: builtin/grep.c:862
+msgid "show only matching parts of a line"
+msgstr "yalnฤฑzca bir satฤฑrฤฑn eลŸleลŸen kฤฑsฤฑmlarฤฑnฤฑ gรถster"
+
+#: builtin/grep.c:864
+msgid "show the number of matches instead of matching lines"
+msgstr "eลŸleลŸen satฤฑrlar yerine eลŸleลŸme sayฤฑsฤฑnฤฑ gรถster"
+
+#: builtin/grep.c:865
+msgid "highlight matches"
+msgstr "eลŸleลŸmeleri vurgula"
+
+#: builtin/grep.c:867
+msgid "print empty line between matches from different files"
+msgstr "baลŸka dosyalardan olan eลŸleลŸmelerin arasฤฑna boลŸ satฤฑr yazdฤฑr"
+
+#: builtin/grep.c:869
+msgid "show filename only once above matches from same file"
+msgstr ""
+"aynฤฑ dosyadan olan eลŸleลŸmelerin รผzerinde dosya adฤฑnฤฑ yalnฤฑzca bir kez gรถster"
+
+#: builtin/grep.c:872
+msgid "show <n> context lines before and after matches"
+msgstr "eลŸleลŸmelerden รถnce ve sonra <n> satฤฑr baฤŸlam gรถster"
+
+#: builtin/grep.c:875
+msgid "show <n> context lines before matches"
+msgstr "eลŸleลŸmelerden รถnce <n> satฤฑr baฤŸlam gรถster"
+
+#: builtin/grep.c:877
+msgid "show <n> context lines after matches"
+msgstr "eลŸleลŸmelerden sonra <n> satฤฑr baฤŸlam gรถster"
+
+#: builtin/grep.c:879
+msgid "use <n> worker threads"
+msgstr "<n> iลŸ parรงacฤฑฤŸฤฑ kullan"
+
+#: builtin/grep.c:880
+msgid "shortcut for -C NUM"
+msgstr "-C NUM iรงin kฤฑsayol"
+
+#: builtin/grep.c:883
+msgid "show a line with the function name before matches"
+msgstr "eลŸleลŸmelerden รถnce iลŸlev adฤฑnฤฑn olduฤŸu bir satฤฑr gรถster"
+
+#: builtin/grep.c:885
+msgid "show the surrounding function"
+msgstr "รงevresindeki iลŸlevi gรถster"
+
+#: builtin/grep.c:888
+msgid "read patterns from file"
+msgstr "dizgileri dosyadan oku"
+
+#: builtin/grep.c:890
+msgid "match <pattern>"
+msgstr "<dizgi> ile eลŸleลŸ"
+
+#: builtin/grep.c:892
+msgid "combine patterns specified with -e"
+msgstr "-e ile belirtilen dizgileri birleลŸtir"
+
+#: builtin/grep.c:904
+msgid "indicate hit with exit status without output"
+msgstr "รงฤฑkฤฑลŸ durumu ile olan eลŸleลŸmelerde รงฤฑktฤฑ verme"
+
+#: builtin/grep.c:906
+msgid "show only matches from files that match all patterns"
+msgstr "yalnฤฑzca tรผm dizgilerle eลŸleลŸen dosyalardan eลŸleลŸmeleri gรถster"
+
+#: builtin/grep.c:908
+msgid "show parse tree for grep expression"
+msgstr "grep ifadesi iรงin ayrฤฑลŸtฤฑrma aฤŸacฤฑnฤฑ gรถster"
+
+#: builtin/grep.c:912
+msgid "pager"
+msgstr "sayfalayฤฑcฤฑ"
+
+#: builtin/grep.c:912
+msgid "show matching files in the pager"
+msgstr "sayfalayฤฑcฤฑda eลŸleลŸen dosyalarฤฑ gรถster"
+
+#: builtin/grep.c:916
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "grep(1)'in รงaฤŸrฤฑlmasฤฑna izin ver (bu yapฤฑm tarafฤฑndan yok sayฤฑldฤฑ)"
+
+#: builtin/grep.c:983
+msgid "no pattern given"
+msgstr "bir dizgi verilmedi"
+
+#: builtin/grep.c:1019
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index veya --untracked revizyonlarla birlikte kullanฤฑlamaz"
+
+#: builtin/grep.c:1027
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "revizyon รงรถzรผlemiyor: %s"
+
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked, --recurse-submodules ile desteklenmiyor"
+
+#: builtin/grep.c:1061
+msgid "invalid option combination, ignoring --threads"
+msgstr "geรงersiz seรงenek birleลŸtirmesi, --threads yok sayฤฑlฤฑyor"
+
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+msgid "no threads support, ignoring --threads"
+msgstr "iลŸ parรงacฤฑฤŸฤฑ desteฤŸi yok, --threads yok sayฤฑlฤฑyor"
+
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "geรงersiz belirtilen iลŸ parรงacฤฑฤŸฤฑ sayฤฑsฤฑ (%d)"
+
+#: builtin/grep.c:1101
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager yalnฤฑzca รงalฤฑลŸma aฤŸacฤฑnda รงalฤฑลŸฤฑr"
+
+#: builtin/grep.c:1127
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached veya --untracked, --no-index ile birlikte kullanฤฑlamฤฑyor"
+
+#: builtin/grep.c:1133
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr "--[no-]exclude-standard, izlenen iรงerik iรงin kullanฤฑlamฤฑyor"
+
+#: builtin/grep.c:1141
+msgid "both --cached and trees are given"
+msgstr "hem --cached hem aฤŸaรงlar verilmiลŸ"
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <tรผr>] [-w] [--path=<dosya> | --no-filters] [--stdin] "
+"[--] <dosya>..."
+
+#: builtin/hash-object.c:86
+msgid "git hash-object  --stdin-paths"
+msgstr "git hash-object  --stdin-paths"
+
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr "nesne tรผrรผ"
+
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr "nesneyi nesne veritabanฤฑna yaz"
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr "nesneyi stdin'den oku"
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr "dosyayฤฑ sรผzgeรงler olmadan olduฤŸu gibi depola"
+
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+"Git hata ayฤฑklamasฤฑnda kullanmak iรงin รงer รงรถp toplayarak hasarlฤฑ nesneler "
+"oluลŸtur"
+
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr "dosyayฤฑ sanki bu yoldanmฤฑลŸ gibi iลŸle"
+
+#: builtin/help.c:46
+msgid "print all available commands"
+msgstr "tรผm kullanฤฑlabilir komutlar yazdฤฑr"
+
+#: builtin/help.c:47
+msgid "exclude guides"
+msgstr "kฤฑlavuzlarฤฑ hariรง tut"
+
+#: builtin/help.c:48
+msgid "print list of useful guides"
+msgstr "kullanฤฑลŸlฤฑ kฤฑlavuzlarฤฑn listesini รงฤฑkar"
+
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr "tรผm yapฤฑlandฤฑrma deฤŸiลŸkenleri adlarฤฑnฤฑ yazdฤฑr"
+
+#: builtin/help.c:51
+msgid "show man page"
+msgstr "man sayfasฤฑnฤฑ gรถster"
+
+#: builtin/help.c:52
+msgid "show manual in web browser"
+msgstr "kฤฑlavuzu web tarayฤฑcฤฑsฤฑnda gรถster"
+
+#: builtin/help.c:54
+msgid "show info page"
+msgstr "bilgi sayfasฤฑnฤฑ gรถster"
+
+#: builtin/help.c:56
+msgid "print command description"
+msgstr "komut aรงฤฑklamasฤฑnฤฑ yazdฤฑr"
+
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<komut>]"
+
+#: builtin/help.c:77
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "tanฤฑmlanamayan yardฤฑm biรงimi '%s'"
+
+#: builtin/help.c:104
+msgid "Failed to start emacsclient."
+msgstr "emacsclient baลŸlatฤฑlamadฤฑ."
+
+#: builtin/help.c:117
+msgid "Failed to parse emacsclient version."
+msgstr "emacsclient sรผrรผmรผ ayrฤฑลŸtฤฑrฤฑlamadฤฑ."
+
+#: builtin/help.c:125
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "emacsclient sรผrรผmรผ '%d' pek eski (<22)."
+
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "'%s' รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/help.c:221
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s': desteklenmeyen man gรถrรผntรผleyicisi yolu.\n"
+"Bunun yerine 'man.<araรง>.cmd' kullanmayฤฑ dรผลŸรผnรผn."
+
+#: builtin/help.c:233
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': desteklenmeyen man gรถrรผntรผleyicisi komutu.\n"
+"Bunun yerine 'man.<araรง>.path' kullanmayฤฑ dรผลŸรผnรผn."
+
+#: builtin/help.c:350
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s': Bilinmeyen man gรถrรผntรผleyicisi."
+
+#: builtin/help.c:367
+msgid "no man viewer handled the request"
+msgstr "isteฤŸe hiรงbir man gรถrรผntรผleyicisi ele almadฤฑ"
+
+#: builtin/help.c:375
+msgid "no info viewer handled the request"
+msgstr "isteฤŸe hiรงbir bilgi gรถrรผntรผleyicisi ele almadฤฑ"
+
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s', '%s' olarak armalanmฤฑลŸ"
+
+#: builtin/help.c:448 git.c:365
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "hatalฤฑ alias.%s dizisi: %s"
+
+#: builtin/help.c:477 builtin/help.c:507
+#, c-format
+msgid "usage: %s%s"
+msgstr "kullanฤฑm: %s%s"
+
+#: builtin/help.c:491
+msgid "'git help config' for more information"
+msgstr "ek bilgi iรงin: 'git help config'"
+
+#: builtin/index-pack.c:185
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "%s konumunda nesne tรผrรผ uyuลŸmazlฤฑฤŸฤฑ"
+
+#: builtin/index-pack.c:205
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "beklenen nesne %s alฤฑnmadฤฑ"
+
+#: builtin/index-pack.c:208
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "nesne %s: beklenen tรผr %s, bulunan %s"
+
+#: builtin/index-pack.c:258
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "%d bayt doldurulamฤฑyor"
+msgstr[1] "%d bayt doldurulamฤฑyor"
+
+#: builtin/index-pack.c:268
+msgid "early EOF"
+msgstr "erken dosya sonu"
+
+#: builtin/index-pack.c:269
+msgid "read error on input"
+msgstr "girdide okuma hatasฤฑ"
+
+#: builtin/index-pack.c:281
+msgid "used more bytes than were available"
+msgstr "kullanฤฑlabilir olandan daha รงok bayt kullanฤฑldฤฑ"
+
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
+msgid "pack too large for current definition of off_t"
+msgstr "paket off_t'nin geรงerli tanฤฑmฤฑ iรงin รงok bรผyรผk"
+
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "paket izin verilen en bรผyรผk boyutu aลŸฤฑyor"
+
+#: builtin/index-pack.c:312
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "'%s' paket dosyasฤฑ aรงฤฑlamฤฑyor"
+
+#: builtin/index-pack.c:326
+msgid "pack signature mismatch"
+msgstr "paket imzasฤฑ uyuลŸmazlฤฑฤŸฤฑ"
+
+#: builtin/index-pack.c:328
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "paket sรผrรผmรผ %<PRIu32> desteklenmiyor"
+
+#: builtin/index-pack.c:346
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "paketin %<PRIuMAX> ofsetinde hatalฤฑ nesne var: %s"
+
+#: builtin/index-pack.c:466
+#, c-format
+msgid "inflate returned %d"
+msgstr "ลŸiลŸirme programฤฑ %d dรถndรผrdรผ"
+
+#: builtin/index-pack.c:515
+msgid "offset value overflow for delta base object"
+msgstr "delta tabanฤฑ nesnesi iรงin ofset deฤŸeri taลŸฤฑmฤฑ"
+
+#: builtin/index-pack.c:523
+msgid "delta base offset is out of bound"
+msgstr "delta tabanฤฑ ofseti sฤฑnฤฑrlar dฤฑลŸฤฑnda"
+
+#: builtin/index-pack.c:531
+#, c-format
+msgid "unknown object type %d"
+msgstr "bilinmeyen nesne tรผrรผ %d"
+
+#: builtin/index-pack.c:562
+msgid "cannot pread pack file"
+msgstr "paket dosyasฤฑ 'pread' yapฤฑlamฤฑyor"
+
+#: builtin/index-pack.c:564
+#, c-format
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "zamansฤฑz paket dosyasฤฑ sonu, %<PRIuMAX> bayt eksik"
+msgstr[1] "zamansฤฑz paket dosyasฤฑ sonu, %<PRIuMAX> bayt eksik"
+
+#: builtin/index-pack.c:590
+msgid "serious inflate inconsistency"
+msgstr "ciddi ลŸiลŸirme programฤฑ tutarsฤฑzlฤฑฤŸฤฑ"
+
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "%s ฤฐLE SHA1 ร‡ARPIลžMASI BULUNDU!"
+
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#, c-format
+msgid "unable to read %s"
+msgstr "%s okunamฤฑyor"
+
+#: builtin/index-pack.c:802
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "mevcut %s nesne bilgisi okunamฤฑyor"
+
+#: builtin/index-pack.c:810
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "mevcut %s nesnesi okunamฤฑyor"
+
+#: builtin/index-pack.c:824
+#, c-format
+msgid "invalid blob object %s"
+msgstr "geรงersiz %s ikili nesnesi"
+
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
+msgid "fsck error in packed object"
+msgstr "paketlenmiลŸ nesne iรงinde fsck hatasฤฑ"
+
+#: builtin/index-pack.c:848
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "%s รถgesinin tรผm alt รถgeleri ulaลŸฤฑlabilir deฤŸil"
+
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
+msgid "failed to apply delta"
+msgstr "delta uygulanamadฤฑ"
+
+#: builtin/index-pack.c:1121
+msgid "Receiving objects"
+msgstr "Nesneler alฤฑnฤฑyor"
+
+#: builtin/index-pack.c:1121
+msgid "Indexing objects"
+msgstr "Nesneler indeksleniyor"
+
+#: builtin/index-pack.c:1155
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "paket hasar gรถrmรผลŸ (SHA1 uyumsuzluฤŸu)"
+
+#: builtin/index-pack.c:1160
+msgid "cannot fstat packfile"
+msgstr "paket dosyasฤฑ fstat yapฤฑlamฤฑyor"
+
+#: builtin/index-pack.c:1163
+msgid "pack has junk at the end"
+msgstr "paket sonunda dรถkรผntรผler var"
+
+#: builtin/index-pack.c:1175
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "parse_pack_objects() iรงindeki karmaลŸa akฤฑl almaz dรผzeyde"
+
+#: builtin/index-pack.c:1198
+msgid "Resolving deltas"
+msgstr "Deltalar รงรถzรผlรผyor"
+
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "iลŸ parรงacฤฑฤŸฤฑ oluลŸturulamadฤฑ: %s"
+
+#: builtin/index-pack.c:1249
+msgid "confusion beyond insanity"
+msgstr "karmaลŸa akฤฑl almaz dรผzeyde"
+
+#: builtin/index-pack.c:1255
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "%d yerel nesneyle tamamlandฤฑ"
+msgstr[1] "%d yerel nesneyle tamamlandฤฑ"
+
+#: builtin/index-pack.c:1267
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "%s iรงin beklenmedik kuyruk saฤŸlamasฤฑ (disk hasarฤฑ?)"
+
+#: builtin/index-pack.c:1271
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "paketin %d รงรถzรผlmemiลŸ deltasฤฑ var"
+msgstr[1] "paketin %d รงรถzรผlmemiลŸ deltasฤฑ var"
+
+#: builtin/index-pack.c:1295
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "iliลŸtirilen nesne sรถndรผrรผlemedi (%d)"
+
+#: builtin/index-pack.c:1392
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "yerel nesne %s hasarlฤฑ"
+
+#: builtin/index-pack.c:1406
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "paket dosyasฤฑ adฤฑ '%s', '.pack' ile bitmiyor"
+
+#: builtin/index-pack.c:1431
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "%s dosyasฤฑ '%s' yazฤฑlamฤฑyor"
+
+#: builtin/index-pack.c:1439
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "yazฤฑlmฤฑลŸ %s dosyasฤฑ '%s' kapatฤฑlamฤฑyor"
+
+#: builtin/index-pack.c:1463
+msgid "error while closing pack file"
+msgstr "paket dosyasฤฑ kapatฤฑlฤฑrken hata"
+
+#: builtin/index-pack.c:1477
+msgid "cannot store pack file"
+msgstr "paket dosyasฤฑ depolanamฤฑyor"
+
+#: builtin/index-pack.c:1485
+msgid "cannot store index file"
+msgstr "indeks dosyasฤฑ depolanamฤฑyor"
+
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "hatalฤฑ pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1597
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "Mevcut paket dosyasฤฑ '%s' aรงฤฑlamฤฑyor"
+
+#: builtin/index-pack.c:1599
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "'%s' iรงin mevcut paket idx dosyasฤฑ aรงฤฑlamฤฑyor"
+
+#: builtin/index-pack.c:1647
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "delta deฤŸil: %d nesne"
+msgstr[1] "delta deฤŸil: %d nesne"
+
+#: builtin/index-pack.c:1654
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "zincir uzunluฤŸu = %d: %lu nesne"
+msgstr[1] "zincir uzunluฤŸu = %d: %lu nesne"
+
+#: builtin/index-pack.c:1693
+msgid "Cannot come back to cwd"
+msgstr "ลžu anki รงalฤฑลŸma dizinine geri gelinemiyor"
+
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#, c-format
+msgid "bad %s"
+msgstr "hatalฤฑ %s"
+
+#: builtin/index-pack.c:1781
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin, --stdin olmadan kullanฤฑlamaz"
+
+#: builtin/index-pack.c:1783
+msgid "--stdin requires a git repository"
+msgstr "--stdin bir git dizini gerektirir"
+
+#: builtin/index-pack.c:1789
+msgid "--verify with no packfile name given"
+msgstr "--verify ile bir paket dosyasฤฑ adฤฑ verilmedi"
+
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+msgid "fsck error in pack objects"
+msgstr "paket nesnelerinde fsck hatasฤฑ"
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "'%s' ลŸablonunun bilgileri alฤฑnamฤฑyor"
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "'%s' opendir yapฤฑlamฤฑyor"
+
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "'%s' readlink yapฤฑlamฤฑyor"
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "'%s', '%s' รถgesine sembolik baฤŸla baฤŸlanamฤฑyor"
+
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "'%s' ลŸuraya kopyalanamฤฑyor: '%s'"
+
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
+msgstr "%s ลŸablonu yok sayฤฑlฤฑyor"
+
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
+msgstr "ลŸablonlar %s iรงinde bulunamadฤฑ"
+
+#: builtin/init-db.c:136
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "ลŸablonlar '%s' konumundan kopyalanmฤฑyor: %s"
+
+#: builtin/init-db.c:334
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "%d dosya tรผrรผ iลŸlenemiyor"
+
+#: builtin/init-db.c:337
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "%s ลŸuraya taลŸฤฑnamฤฑyor: %s"
+
+#: builtin/init-db.c:354 builtin/init-db.c:357
+#, c-format
+msgid "%s already exists"
+msgstr "%s halihazฤฑrda var"
+
+#: builtin/init-db.c:413
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "%s%s iรงindeki mevcut paylaลŸฤฑlan Git deposu yeniden ilklendirildi\n"
+
+#: builtin/init-db.c:414
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "%s%s iรงindeki mevcut Git deposu yeniden ilklendirildi\n"
+
+#: builtin/init-db.c:418
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "%s%s iรงinde paylaลŸฤฑlan boลŸ Git deposu ilklendirildi\n"
+
+#: builtin/init-db.c:419
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "%s%s iรงinde boลŸ Git deposu ilklendirildi\n"
+
+#: builtin/init-db.c:468
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<ลŸablon-dizini>] [--"
+"shared[=<izinler>]] [<dizin>]"
+
+#: builtin/init-db.c:491
+msgid "permissions"
+msgstr "izinler"
+
+#: builtin/init-db.c:492
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr "git deposunun kullanฤฑcฤฑlar arasฤฑnda paylaลŸฤฑp paylaลŸฤฑlmayacaฤŸฤฑnฤฑ belirt"
+
+#: builtin/init-db.c:529 builtin/init-db.c:534
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "%s mkdir yapฤฑlamฤฑyor"
+
+#: builtin/init-db.c:538
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "%s รถgesine chdir yapฤฑlamฤฑyor"
+
+#: builtin/init-db.c:559
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (veya --work-tree=<dizin>), %s (veya --git-dir=<dizin>) belirlenmeden "
+"izin verilmiyor"
+
+#: builtin/init-db.c:587
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "'%s' รงalฤฑลŸma aฤŸacฤฑna eriลŸilemiyor"
+
+#: builtin/interpret-trailers.c:16
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<deฤŸer>])...] [<dosya>...]"
+
+#: builtin/interpret-trailers.c:95
+msgid "edit files in place"
+msgstr "dosyalarฤฑ yerinde dรผzenle"
+
+#: builtin/interpret-trailers.c:96
+msgid "trim empty trailers"
+msgstr "boลŸ artbilgileri kฤฑrp"
+
+#: builtin/interpret-trailers.c:99
+msgid "where to place the new trailer"
+msgstr "yeni artbilgiler nereye yerleลŸtirilecek"
+
+#: builtin/interpret-trailers.c:101
+msgid "action if trailer already exists"
+msgstr "artbilgi halihazฤฑrda varsa yapฤฑlacak eylem"
+
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
+msgstr "artbilgi eksikse yapฤฑlacak eylem"
+
+#: builtin/interpret-trailers.c:105
+msgid "output only the trailers"
+msgstr "yalnฤฑzca artbilgileri รงฤฑktฤฑ ver"
+
+#: builtin/interpret-trailers.c:106
+msgid "do not apply config rules"
+msgstr "yapฤฑlandฤฑrma kurallarฤฑnฤฑ uygulama"
+
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
+msgstr "boลŸluk ile sรผrdรผrรผlen deฤŸerleri uรง uca ekle"
+
+#: builtin/interpret-trailers.c:108
+msgid "set parsing options"
+msgstr "ayrฤฑลŸtฤฑrma seรงeneklerini ayarla"
+
+#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
+msgstr "ลŸuna รถzel davranma: ---"
+
+#: builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "artbilgi"
+
+#: builtin/interpret-trailers.c:112
+msgid "trailer(s) to add"
+msgstr "eklenecek artbilgi(ler)"
+
+#: builtin/interpret-trailers.c:123
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer ile --only-input bir anlam ifade etmiyor"
+
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr "yerinde dรผzenleme iรงin girdi dosyasฤฑ verilmedi"
+
+#: builtin/log.c:56
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<seรงenekler>] [<revizyon-erimi>] [[--] <yol>...]"
+
+#: builtin/log.c:57
+msgid "git show [<options>] <object>..."
+msgstr "git show [<seรงenekler>] <nesne>..."
+
+#: builtin/log.c:110
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "geรงersiz --decorate seรงeneฤŸi: %s"
+
+#: builtin/log.c:174
+msgid "show source"
+msgstr "kaynaฤŸฤฑ gรถster"
+
+#: builtin/log.c:175
+msgid "Use mail map file"
+msgstr "posta eลŸlem dosyasฤฑnฤฑ kullan"
+
+#: builtin/log.c:177
+msgid "only decorate refs that match <pattern>"
+msgstr "yalnฤฑzca <dizgi> ile eลŸleลŸen baลŸvurularฤฑ sรผsle"
+
+#: builtin/log.c:179
+msgid "do not decorate refs that match <pattern>"
+msgstr "<dizgi> ile eลŸleลŸen baลŸvurularฤฑ sรผsleme"
+
+#: builtin/log.c:180
+msgid "decorate options"
+msgstr "sรผsleme seรงenekleri"
+
+#: builtin/log.c:183
+msgid "Process line range n,m in file, counting from 1"
+msgstr "dosya iรงindeki n,m satฤฑr aralฤฑฤŸฤฑnฤฑ 1'den sayarak iลŸle"
+
+#: builtin/log.c:281
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "Son รงฤฑktฤฑ: %d %s\n"
+
+#: builtin/log.c:535
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: hatalฤฑ dosya"
+
+#: builtin/log.c:550 builtin/log.c:645
+#, c-format
+msgid "could not read object %s"
+msgstr "%s nesnesi okunamadฤฑ"
+
+#: builtin/log.c:670
+#, c-format
+msgid "unknown type: %d"
+msgstr "bilinmeyen tรผr: %d"
+
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: aรงฤฑklama kipinden geรงersiz kapak sayfasฤฑ"
+
+#: builtin/log.c:821
+msgid "format.headers without value"
+msgstr "format.headers deฤŸere iye deฤŸil"
+
+#: builtin/log.c:936
+msgid "name of output directory is too long"
+msgstr "รงฤฑktฤฑ dizininin adฤฑ pek uzun"
+
+#: builtin/log.c:952
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "%s yama dosyasฤฑ okunamฤฑyor"
+
+#: builtin/log.c:969
+msgid "need exactly one range"
+msgstr "bir tam erim gerekiyor"
+
+#: builtin/log.c:979
+msgid "not a range"
+msgstr "bir erim deฤŸil"
+
+#: builtin/log.c:1143
+msgid "cover letter needs email format"
+msgstr "niyet mektubu iรงin e-posta biรงimi gerekli"
+
+#: builtin/log.c:1149
+msgid "failed to create cover-letter file"
+msgstr "cover-letter dosyasฤฑ oluลŸturulamadฤฑ"
+
+#: builtin/log.c:1228
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "akฤฑl almaz in-reply-to: %s"
+
+#: builtin/log.c:1255
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<seรงenekler>] [<-beri> | <revizyon-erimi>]"
+
+#: builtin/log.c:1313
+msgid "two output directories?"
+msgstr "iki รงฤฑktฤฑ dizini?"
+
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#, c-format
+msgid "unknown commit %s"
+msgstr "bilinmeyen gรถnderi %s"
+
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "'%s' geรงerli bir baลŸvuru olarak รงรถzรผlemedi"
+
+#: builtin/log.c:1439
+msgid "could not find exact merge base"
+msgstr "kesin birleลŸtirme temeli bulunamadฤฑ"
+
+#: builtin/log.c:1443
+msgid ""
+"failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually"
+msgstr ""
+"รœstkaynak alฤฑnamadฤฑ; taban gรถnderisinin kaydฤฑnฤฑ kendiliฤŸinden yazmak\n"
+"istiyorsanฤฑz lรผtfen git branch --set-upstream-to kullanarak bir uzak dalฤฑ\n"
+"izleyin. Bunun dฤฑลŸฤฑnda taban gรถnderisini kendiniz --base=<taban-gรถnderisi-"
+"no>\n"
+"kullanarak el ile belirtebilirsiniz."
+
+#: builtin/log.c:1463
+msgid "failed to find exact merge base"
+msgstr "kesin birleลŸtirme temeli bulunamadฤฑ"
+
+#: builtin/log.c:1474
+msgid "base commit should be the ancestor of revision list"
+msgstr "taban gรถnderisi revizyon listesinin atasฤฑ olmalฤฑ"
+
+#: builtin/log.c:1478
+msgid "base commit shouldn't be in revision list"
+msgstr "taban gรถnderisi revizyon listesinde olmamalฤฑ"
+
+#: builtin/log.c:1531
+msgid "cannot get patch id"
+msgstr "yama numarasฤฑ alฤฑnamฤฑyor"
+
+#: builtin/log.c:1583
+msgid "failed to infer range-diff ranges"
+msgstr "range-diff erimlerinden bir anlam รงฤฑkarฤฑlamadฤฑ"
+
+#: builtin/log.c:1629
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "bir yamayla bile olsa [PATCH n/m] kullan"
+
+#: builtin/log.c:1632
+msgid "use [PATCH] even with multiple patches"
+msgstr "birden รงok yama bile olsa [PATCH] kullan"
+
+#: builtin/log.c:1636
+msgid "print patches to standard out"
+msgstr "yamalarฤฑ standart รงฤฑktฤฑya yazdฤฑr"
+
+#: builtin/log.c:1638
+msgid "generate a cover letter"
+msgstr "bir niyet mektubu oluลŸtur"
+
+#: builtin/log.c:1640
+msgid "use simple number sequence for output file names"
+msgstr "รงฤฑktฤฑ dosya adlarฤฑ iรงin yalฤฑn sayฤฑ dizisi oluลŸtur"
+
+#: builtin/log.c:1641
+msgid "sfx"
+msgstr "sonek"
+
+#: builtin/log.c:1642
+msgid "use <sfx> instead of '.patch'"
+msgstr "'.patch' yerine <sonek> kullan"
+
+#: builtin/log.c:1644
+msgid "start numbering patches at <n> instead of 1"
+msgstr "yamalarฤฑ 1 yerine <n>'de numaralandฤฑrmaya baลŸla"
+
+#: builtin/log.c:1646
+msgid "mark the series as Nth re-roll"
+msgstr "diziyi n. deneme olarak imle"
+
+#: builtin/log.c:1648
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "[PATCH] yerine [RFC PATCH] kullan"
+
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "aรงฤฑklama kipinden kapak sayfasฤฑ kipi"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "niyet mektubunun bazฤฑ kฤฑsฤฑmlarฤฑnฤฑ dalฤฑn aรงฤฑklamasฤฑndan oluลŸtur"
+
+#: builtin/log.c:1654
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "[PATCH] yerine [<รถnek>] kullan"
+
+#: builtin/log.c:1657
+msgid "store resulting files in <dir>"
+msgstr "ortaya รงฤฑkan dosyalarฤฑ <dizin>'de depola"
+
+#: builtin/log.c:1660
+msgid "don't strip/add [PATCH]"
+msgstr "[PATCH]'i soyma/ekleme"
+
+#: builtin/log.c:1663
+msgid "don't output binary diffs"
+msgstr "ikili diff'leri รงฤฑktฤฑ verme"
+
+#: builtin/log.c:1665
+msgid "output all-zero hash in From header"
+msgstr "From baลŸlฤฑฤŸฤฑnda tรผmรผ sฤฑfฤฑrdan oluลŸan saฤŸlama รงฤฑktฤฑsฤฑ ver"
+
+#: builtin/log.c:1667
+msgid "don't include a patch matching a commit upstream"
+msgstr "รผstkaynaktaki bir gรถnderi ile eลŸleลŸen bir yamayฤฑ iรงerme"
+
+#: builtin/log.c:1669
+msgid "show patch format instead of default (patch + stat)"
+msgstr "รถntanฤฑmlฤฑ yerine yama biรงimini gรถster (patch + stat)"
+
+#: builtin/log.c:1671
+msgid "Messaging"
+msgstr "ฤฐletileลŸme"
+
+#: builtin/log.c:1672
+msgid "header"
+msgstr "baลŸlฤฑk"
+
+#: builtin/log.c:1673
+msgid "add email header"
+msgstr "e-posta baลŸlฤฑฤŸฤฑ ekle"
+
+#: builtin/log.c:1674 builtin/log.c:1676
+msgid "email"
+msgstr "e-posta"
+
+#: builtin/log.c:1674
+msgid "add To: header"
+msgstr "To: baลŸlฤฑฤŸฤฑ ekle"
+
+#: builtin/log.c:1676
+msgid "add Cc: header"
+msgstr "Cc: baลŸlฤฑฤŸฤฑ ekle"
+
+#: builtin/log.c:1678
+msgid "ident"
+msgstr "tanฤฑmlayฤฑcฤฑ"
+
+#: builtin/log.c:1679
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+"From adresini <tanฤฑmlayฤฑcฤฑ> olarak ayarla (veya yoksa gรถnderici "
+"tanฤฑmlayฤฑcฤฑsฤฑ)"
+
+#: builtin/log.c:1681
+msgid "message-id"
+msgstr "ileti no"
+
+#: builtin/log.c:1682
+msgid "make first mail a reply to <message-id>"
+msgstr "ilk postayฤฑ <ileti no>'ya bir yanฤฑt yap"
+
+#: builtin/log.c:1683 builtin/log.c:1686
+msgid "boundary"
+msgstr "sฤฑnฤฑr"
+
+#: builtin/log.c:1684
+msgid "attach the patch"
+msgstr "yamayฤฑ ekle"
+
+#: builtin/log.c:1687
+msgid "inline the patch"
+msgstr "yamayฤฑ iletiye koy"
+
+#: builtin/log.c:1691
+msgid "enable message threading, styles: shallow, deep"
+msgstr "iletileri kataloglamayฤฑ etkinleลŸtir, stiller: shallow, deep"
+
+#: builtin/log.c:1693
+msgid "signature"
+msgstr "imza"
+
+#: builtin/log.c:1694
+msgid "add a signature"
+msgstr "imza ekle"
+
+#: builtin/log.c:1695
+msgid "base-commit"
+msgstr "taban gรถnderi"
+
+#: builtin/log.c:1696
+msgid "add prerequisite tree info to the patch series"
+msgstr "yama dizisine รถnkoลŸulan aฤŸaรง bilgisini ekle"
+
+#: builtin/log.c:1698
+msgid "add a signature from a file"
+msgstr "dosyadan bir imza ekle"
+
+#: builtin/log.c:1699
+msgid "don't print the patch filenames"
+msgstr "yama dosya adlarฤฑnฤฑ yazdฤฑrma"
+
+#: builtin/log.c:1701
+msgid "show progress while generating patches"
+msgstr "yamalar oluลŸturulurken ilerlemeyi gรถster"
+
+#: builtin/log.c:1703
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+"<rev> karลŸฤฑsฤฑndaki deฤŸiลŸiklikleri niyet mektubunda veya tek bir yamada gรถster"
+
+#: builtin/log.c:1706
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+"<bลŸvr-blrtรง> karลŸฤฑsฤฑndaki deฤŸiลŸiklikleri niyet mektubunda veya tek bir "
+"yamada gรถster"
+
+#: builtin/log.c:1708
+msgid "percentage by which creation is weighted"
+msgstr "oluลŸumun tartฤฑldฤฑฤŸฤฑ yรผzde"
+
+#: builtin/log.c:1792
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "geรงersiz tanฤฑmlayฤฑcฤฑ satฤฑrฤฑ: %s"
+
+#: builtin/log.c:1807
+msgid "-n and -k are mutually exclusive"
+msgstr "-n ve -k birlikte kullanฤฑlamaz"
+
+#: builtin/log.c:1809
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "--subject-prefix/--rfc ve -k birlikte kullanฤฑlamaz"
+
+#: builtin/log.c:1817
+msgid "--name-only does not make sense"
+msgstr "--name-only bir anlam ifade etmiyor"
+
+#: builtin/log.c:1819
+msgid "--name-status does not make sense"
+msgstr "--name-status bir anlam ifade etmiyor"
+
+#: builtin/log.c:1821
+msgid "--check does not make sense"
+msgstr "--check bir anlam ifade etmiyor"
+
+#: builtin/log.c:1854
+msgid "standard output, or directory, which one?"
+msgstr "standart รงฤฑktฤฑ veya dizin, hangisi?"
+
+#: builtin/log.c:1958
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor"
+
+#: builtin/log.c:1962
+msgid "Interdiff:"
+msgstr "Interdiff:"
+
+#: builtin/log.c:1963
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr "Interdiff v%d karลŸฤฑsฤฑnda:"
+
+#: builtin/log.c:1969
+msgid "--creation-factor requires --range-diff"
+msgstr "--creation-factor, --range-diff gerektiriyor"
+
+#: builtin/log.c:1973
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor"
+
+#: builtin/log.c:1981
+msgid "Range-diff:"
+msgstr "Range-diff:"
+
+#: builtin/log.c:1982
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "Range-diff v%d karลŸฤฑsฤฑnda:"
+
+#: builtin/log.c:1993
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "'%s' imza dosyasฤฑ okunamฤฑyor"
+
+#: builtin/log.c:2029
+msgid "Generating patches"
+msgstr "Yamalar oluลŸturuluyor"
+
+#: builtin/log.c:2073
+msgid "failed to create output files"
+msgstr "รงฤฑktฤฑ dosyalarฤฑ oluลŸturulamadฤฑ"
+
+#: builtin/log.c:2132
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<รผstkaynak> [<dal-ucu> [<sฤฑnฤฑr>]]]"
+
+#: builtin/log.c:2186
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr "ฤฐzlenen bir uzak dal bulunamadฤฑ, lรผtfen el ile <รผstkaynak> belirtin.\n"
+
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<seรงenekler>] [<dosya>...]"
+
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
+msgstr "dosya durumunu etiketlerle tanฤฑmla"
+
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "'deฤŸiลŸtirilmediฤŸi dรผลŸรผnรผlen' dosyalarฤฑ kรผรงรผk harflerle gรถster"
+
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "'fsmonitor clean' dosyalarฤฑnฤฑ kรผรงรผk harflerle gรถster"
+
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
+msgstr "รถnbelleฤŸe alฤฑnan dosyalarฤฑ รงฤฑktฤฑda gรถster (รถntanฤฑmlฤฑ)"
+
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
+msgstr "silinen dosyalarฤฑ รงฤฑktฤฑda gรถster"
+
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
+msgstr "deฤŸiลŸtirilen dosyalarฤฑ รงฤฑktฤฑda gรถster"
+
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
+msgstr "diฤŸer dosyalarฤฑ รงฤฑktฤฑda gรถster"
+
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
+msgstr "yok sayฤฑlan dosyalarฤฑ รงฤฑktฤฑda gรถster"
+
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
+msgstr "hazฤฑrlanan iรงeriฤŸin nesne adฤฑnฤฑ รงฤฑktฤฑda gรถster"
+
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
+msgstr "dosya sistemindeki kaldฤฑrฤฑlmasฤฑ gereken dosyalarฤฑ gรถster"
+
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
+msgstr "'diฤŸer' dizinlerin yalnฤฑzca adฤฑnฤฑ gรถster"
+
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
+msgstr "dosyalarฤฑn satฤฑr sonlarฤฑnฤฑ gรถster"
+
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
+msgstr "boลŸ dizinleri gรถsterme"
+
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
+msgstr "birleลŸtirilmemiลŸ dosyalarฤฑ รงฤฑktฤฑda gรถster"
+
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
+msgstr "'resolve-undo' bilgisini gรถster"
+
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
+msgstr "dizgi ile eลŸleลŸen dosyalarฤฑ atla"
+
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
+msgstr "hariรง tutma dizgileri <dosya>'dan okunuyor"
+
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "ek dizin baลŸฤฑ hariรง tutma dizgilerini <dosya>'dan oku"
+
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
+msgstr "standart git hariรง tutmalarฤฑnฤฑ ekle"
+
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
+msgstr "รงฤฑktฤฑyฤฑ en รผst proje dizinine gรถreceli olarak yap"
+
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
+msgstr "altmodรผller iรงinden รถzyinele"
+
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "eฤŸer bir <dosya> indekste deฤŸilse bunu bir hata olarak gรถr"
+
+#: builtin/ls-files.c:576
+msgid "tree-ish"
+msgstr "aฤŸacฤฑmsฤฑ"
+
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "<aฤŸacฤฑmsฤฑ>'dan bu yana kaldฤฑrฤฑlan yollarฤฑn hรขlรข var olduฤŸunu varsay"
+
+#: builtin/ls-files.c:579
+msgid "show debugging data"
+msgstr "hata ayฤฑklama verisini gรถster"
+
+#: builtin/ls-remote.c:9
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"                     [-q | --quiet] [--exit-code] [--get-url]\n"
+"                     [--symref] [<repository> [<refs>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"                     [-q | --quiet] [--exit-code] [--get-url]\n"
+"                     [--symref] [<depo> [<baลŸvurular>...]]"
+
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
+msgstr "uzak konum URL'sini yazdฤฑrma"
+
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+msgid "exec"
+msgstr "รงalฤฑลŸtฤฑr"
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
+msgstr "uzak konum makinesindeki git-upload-pack yolu"
+
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
+msgstr "etiketlere kฤฑsฤฑtla"
+
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
+msgstr "uรง gรถnderilere kฤฑsฤฑtla"
+
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
+msgstr "soyulmuลŸ etiketleri gรถsterme"
+
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
+msgstr "url.<temel>.insteadOf'u dikkate al"
+
+#: builtin/ls-remote.c:72
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "eลŸleลŸen baลŸvuru bulunamazsa 2 numaralฤฑ รงฤฑkฤฑลŸ koduyla รงฤฑk"
+
+#: builtin/ls-remote.c:75
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "iลŸaret ettiฤŸi nesneye ek olarak altฤฑnda yatan baลŸvuruyu gรถster"
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<seรงenekler>] <aฤŸacฤฑmsฤฑ> [<yol>...]"
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "yalnฤฑzca aฤŸaรงlarฤฑ gรถster"
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "altaฤŸaรงlara รถzyinele"
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "รถzyinelerken aฤŸaรงlarฤฑ gรถster"
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "girdileri NUL baytฤฑ ile sonlandฤฑr"
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "nesne boyutunu iรงer"
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "yalnฤฑzca dosya adlarฤฑnฤฑ listele"
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr "tam yol adlarฤฑnฤฑ kullan"
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "yalnฤฑzca geรงerli dizini deฤŸil tรผm aฤŸacฤฑ listele (--full-name ima eder)"
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "boลŸ mbox: '%s'"
+
+#: builtin/merge.c:55
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<seรงenekler>] [<gรถnderi>...]"
+
+#: builtin/merge.c:56
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:57
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:119
+msgid "switch `m' requires a value"
+msgstr "'m' anahtarฤฑ bir deฤŸer gerektiriyor"
+
+#: builtin/merge.c:142
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "'%s' seรงeneฤŸi bir deฤŸer gerektiriyor"
+
+#: builtin/merge.c:188
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "BirleลŸtirme stratejisi '%s' bulunamadฤฑ.\n"
+
+#: builtin/merge.c:189
+#, c-format
+msgid "Available strategies are:"
+msgstr "Kullanฤฑlabilir stratejiler:"
+
+#: builtin/merge.c:194
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Kullanฤฑlabilir รถzel stratejiler:"
+
+#: builtin/merge.c:245 builtin/pull.c:132
+msgid "do not show a diffstat at the end of the merge"
+msgstr "birleลŸtirmenin sonunda bir diffstat gรถsterme"
+
+#: builtin/merge.c:248 builtin/pull.c:135
+msgid "show a diffstat at the end of the merge"
+msgstr "birleลŸtirmenin sonunda bir diffstat gรถster"
+
+#: builtin/merge.c:249 builtin/pull.c:138
+msgid "(synonym to --stat)"
+msgstr "(--stat eลŸanlamlฤฑsฤฑ)"
+
+#: builtin/merge.c:251 builtin/pull.c:141
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+"kฤฑsa gรผnlรผkten birleลŸtirme gรถnderisi iletisine girdiler (en รงok <n>) ekle"
+
+#: builtin/merge.c:254 builtin/pull.c:147
+msgid "create a single commit instead of doing a merge"
+msgstr "bir birleลŸtirme yerine tek bir gรถnderi oluลŸtur"
+
+#: builtin/merge.c:256 builtin/pull.c:150
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "birleลŸtirme baลŸarฤฑlฤฑ olursa bir gรถnderi gerรงekleลŸtir (รถntanฤฑmlฤฑ)"
+
+#: builtin/merge.c:258 builtin/pull.c:153
+msgid "edit message before committing"
+msgstr "gรถndermeden รถnce iletiyi dรผzenle"
+
+#: builtin/merge.c:260
+msgid "allow fast-forward (default)"
+msgstr "ileri sarฤฑma izin ver (รถntanฤฑmlฤฑ)"
+
+#: builtin/merge.c:262 builtin/pull.c:160
+msgid "abort if fast-forward is not possible"
+msgstr "ileri sarฤฑm olanaklฤฑ deฤŸilse iptal et"
+
+#: builtin/merge.c:266 builtin/pull.c:163
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "adฤฑ verilen gรถnderinin geรงerli bir GPG imzasฤฑ olduฤŸunu doฤŸrula"
+
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
+msgid "strategy"
+msgstr "strateji"
+
+#: builtin/merge.c:268 builtin/pull.c:168
+msgid "merge strategy to use"
+msgstr "kullanฤฑlacak birleลŸtirme stratejisi"
+
+#: builtin/merge.c:269 builtin/pull.c:171
+msgid "option=value"
+msgstr "seรงenek=deฤŸer"
+
+#: builtin/merge.c:270 builtin/pull.c:172
+msgid "option for selected merge strategy"
+msgstr "seรงili birleลŸtirme stratejisi iรงin seรงenekler"
+
+#: builtin/merge.c:272
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+"birleลŸtirme gรถnderisi iletisi (ileri sarฤฑm olmayan bir birleลŸtirme iรงin)"
+
+#: builtin/merge.c:279
+msgid "abort the current in-progress merge"
+msgstr "ilerlemekte olan geรงerli birleลŸtirmeyi iptal et"
+
+#: builtin/merge.c:281
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort, ancak indeksi ve รงalฤฑลŸma aฤŸacฤฑnฤฑ deฤŸiลŸtirmeden bฤฑrakฤฑn"
+
+#: builtin/merge.c:283
+msgid "continue the current in-progress merge"
+msgstr "ilerlemekte olan geรงerli birleลŸtirmeyi sรผrdรผrรผn"
+
+#: builtin/merge.c:285 builtin/pull.c:179
+msgid "allow merging unrelated histories"
+msgstr "birbiriyle iliลŸkisi olmayan geรงmiลŸlerin birleลŸtirilmesine izin ver"
+
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "pre-merge-commit ve commit-msg kancalarฤฑnฤฑ atla"
+
+#: builtin/merge.c:308
+msgid "could not run stash."
+msgstr "zula alฤฑnamadฤฑ"
+
+#: builtin/merge.c:313
+msgid "stash failed"
+msgstr "zula baลŸarฤฑsฤฑz oldu"
+
+#: builtin/merge.c:318
+#, c-format
+msgid "not a valid object: %s"
+msgstr "geรงerli bir nesne deฤŸil: %s"
+
+#: builtin/merge.c:340 builtin/merge.c:357
+msgid "read-tree failed"
+msgstr "read-tree baลŸarฤฑsฤฑz oldu"
+
+#: builtin/merge.c:387
+msgid " (nothing to squash)"
+msgstr " (tฤฑkฤฑลŸtฤฑrฤฑlacak bir ลŸey yok)"
+
+#: builtin/merge.c:398
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "TฤฑkฤฑลŸtฤฑrma gรถnderisi -- HEAD gรผncellenmiyor\n"
+
+#: builtin/merge.c:448
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "BirleลŸtirme iletisi yok -- HEAD gรผncellenmiyor\n"
+
+#: builtin/merge.c:499
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' bir gรถnderiye iลŸaret etmiyor"
+
+#: builtin/merge.c:586
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Hatalฤฑ branch.%s.mergeoptions dizisi: %s"
+
+#: builtin/merge.c:708
+msgid "Not handling anything other than two heads merge."
+msgstr "ฤฐki uรง gรถnderi birleลŸtirmesi dฤฑลŸฤฑnda bir ลŸey yapฤฑlmฤฑyor."
+
+#: builtin/merge.c:722
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive iรงin geรงersiz seรงenek: -X%s"
+
+#: builtin/merge.c:737
+#, c-format
+msgid "unable to write %s"
+msgstr "%s yazฤฑlamฤฑyor"
+
+#: builtin/merge.c:789
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "ลžuradan okunamadฤฑ: '%s'"
+
+#: builtin/merge.c:798
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "BirleลŸtirme gรถnderilmiyor, tamamlamak iรงin 'git commit' kullanฤฑn.\n"
+
+#: builtin/merge.c:804
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+msgstr ""
+"Bu birleลŸtirmenin neden gerekli olduฤŸunu aรงฤฑklamak iรงin bir gรถnderi iletisi\n"
+"girin, รถzellikle gรผncellenmiลŸ bir รผstkaynaฤŸฤฑ kiลŸisel dala birleลŸtiriyorsa.\n"
+"\n"
+
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "BoลŸ bir ileti gรถnderiyi iptal eder.\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"'%c' ile baลŸlayan satฤฑrlar yok sayฤฑlacaktฤฑr. BoลŸ bir ileti gรถnderiyi\n"
+"iptal eder.\n"
+
+#: builtin/merge.c:865
+msgid "Empty commit message."
+msgstr "BoลŸ gรถnderi iletisi."
+
+#: builtin/merge.c:880
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Harika.\n"
+
+#: builtin/merge.c:941
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+"Otomatik birleลŸtirme baลŸarฤฑsฤฑz; รงakฤฑลŸmalarฤฑ รงรถzรผn ve sonucu gรถnderin.\n"
+
+#: builtin/merge.c:980
+msgid "No current branch."
+msgstr "Geรงerli dal yok."
+
+#: builtin/merge.c:982
+msgid "No remote for the current branch."
+msgstr "Geรงerli dal iรงin uzak konum yok."
+
+#: builtin/merge.c:984
+msgid "No default upstream defined for the current branch."
+msgstr "Geรงerli dal iรงin รถntanฤฑmlฤฑ รผstkaynak tanฤฑmlanmamฤฑลŸ."
+
+#: builtin/merge.c:989
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "%s iรงin %s konumundan uzak izleyen dal yok"
+
+#: builtin/merge.c:1046
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Hatalฤฑ deฤŸer '%s', '%s' ortamฤฑnda"
+
+#: builtin/merge.c:1149
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "%s iรงinde birleลŸtirebileceฤŸimiz bir ลŸey deฤŸil: %s"
+
+#: builtin/merge.c:1183
+msgid "not something we can merge"
+msgstr "birleลŸtirebileceฤŸimiz bir ลŸey deฤŸil"
+
+#: builtin/merge.c:1286
+msgid "--abort expects no arguments"
+msgstr "--abort bir deฤŸiลŸken beklemez"
+
+#: builtin/merge.c:1290
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "ฤฐptal edilecek bir birleลŸtirme yok (MERGE_HEAD eksik)."
+
+#: builtin/merge.c:1299
+msgid "--quit expects no arguments"
+msgstr "--quit bir deฤŸiลŸken beklemez"
+
+#: builtin/merge.c:1312
+msgid "--continue expects no arguments"
+msgstr "--continue bir deฤŸiลŸken beklemez"
+
+#: builtin/merge.c:1316
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "ฤฐlerlemekte olan bir birleลŸtirme yok (MERGE_HEAD eksik)."
+
+#: builtin/merge.c:1332
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"BirleลŸtirmenizi sonuรงlandฤฑrmadฤฑnฤฑz (MERGE_HEAD mevcut).\n"
+"Lรผtfen birleลŸtirmeden รถnce deฤŸiลŸikliklerinizi gรถnderin."
+
+#: builtin/merge.c:1339
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Seรง-al'ฤฑnฤฑzฤฑ sonuรงlandฤฑrmadฤฑnฤฑz (CHERRY_PICK_HEAD mevcut).\n"
+"Lรผtfen birleลŸtirmeden รถnce deฤŸiลŸikliklerinizi gรถnderin."
+
+#: builtin/merge.c:1342
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "Seรง-al'ฤฑnฤฑzฤฑ sonuรงlandฤฑrmadฤฑnฤฑz (CHERRY_PICK_HEAD mevcut)."
+
+#: builtin/merge.c:1356
+msgid "You cannot combine --squash with --no-ff."
+msgstr "--squash ile --no-ff birlikte kullanฤฑlamaz."
+
+#: builtin/merge.c:1358
+msgid "You cannot combine --squash with --commit."
+msgstr "--squash ile --commit birlikte kullanฤฑlamaz."
+
+#: builtin/merge.c:1374
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Belirtilen bir gรถnderi yok ve merge.defaultToUpstream ayarlanmamฤฑลŸ."
+
+#: builtin/merge.c:1391
+msgid "Squash commit into empty head not supported yet"
+msgstr "Gรถnderiyi boลŸ dal ucuna tฤฑkฤฑลŸtฤฑrma henรผz desteklenmiyor"
+
+#: builtin/merge.c:1393
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+"ฤฐleri sarฤฑm olmayan gรถnderiyi boลŸ dal ucuna yapmak bir anlam ifade etmiyor"
+
+#: builtin/merge.c:1398
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - birleลŸtirebileceฤŸimiz bir ลŸey deฤŸil"
+
+#: builtin/merge.c:1400
+msgid "Can merge only exactly one commit into empty head"
+msgstr "BoลŸ dal ucuna tam olarak yalnฤฑzca bir gรถnderi birleลŸtirilebilir"
+
+#: builtin/merge.c:1481
+msgid "refusing to merge unrelated histories"
+msgstr "birbiriyle iliลŸkisi olmayan geรงmiลŸleri birleลŸtirme reddediliyor"
+
+#: builtin/merge.c:1490
+msgid "Already up to date."
+msgstr "Her ลŸey gรผncel."
+
+#: builtin/merge.c:1500
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Gรผncelleniyor: %s..%s\n"
+
+#: builtin/merge.c:1542
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Gerรงekten รถnemsiz indeks iรงi birleลŸtirme deneniyor...\n"
+
+#: builtin/merge.c:1549
+#, c-format
+msgid "Nope.\n"
+msgstr "Yok.\n"
+
+#: builtin/merge.c:1574
+msgid "Already up to date. Yeeah!"
+msgstr "Her ลŸey gรผncel. ฤฐลŸte bu!"
+
+#: builtin/merge.c:1580
+msgid "Not possible to fast-forward, aborting."
+msgstr "ฤฐleri sarma olanaklฤฑ deฤŸil, iptal ediliyor."
+
+#: builtin/merge.c:1603 builtin/merge.c:1668
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "AฤŸaรง bozulmamฤฑลŸ durumuna geri sarฤฑlฤฑyor...\n"
+
+#: builtin/merge.c:1607
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "%s birleลŸtirme stratejisi deneniyor...\n"
+
+#: builtin/merge.c:1659
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "BirleลŸtirmeyi hiรงbir birleลŸtirme stratejisi iลŸlemedi\n"
+
+#: builtin/merge.c:1661
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "%s stratejisi ile birleลŸtirme baลŸarฤฑsฤฑz oldu.\n"
+
+#: builtin/merge.c:1670
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "El ile รงรถzรผmรผ hazฤฑrlamak iรงin %s kullanฤฑlฤฑyor.\n"
+
+#: builtin/merge.c:1682
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Otomatik birleลŸtirme iyi geรงti; istendiฤŸi รผzere gรถnderme รถncesinde durdu.\n"
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <gรถnderi> <gรถnderi>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <gรถnderi>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <gรถnderi>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <gรถnderi> <gรถnderi>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <baลŸvuru> [<gรถnderi>]"
+
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
+msgstr "tรผm ortak atalarฤฑ รงฤฑktฤฑ ver"
+
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
+msgstr "tek bir n yรถnlรผ birleลŸtirme iรงin atalarฤฑ bul"
+
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
+msgstr "baลŸkalarฤฑ tarafฤฑndan ulaลŸฤฑlabilir revizyonlarฤฑ listele"
+
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
+msgstr "ilki diฤŸerlerinin atasฤฑ mฤฑ?"
+
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "<gรถnderi>'nin nerede <baลŸvuru>'nun gรผnlรผฤŸรผnden รงatallandฤฑฤŸฤฑnฤฑ bul"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<seรงenekler>] [-L <ad1> [-L <orij> [-L <ad2>]]] <dosya1> "
+"<orij-dosya> <dosya2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "sonuรงlarฤฑ standart รงฤฑktฤฑya gรถnder"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "diff3 tabanlฤฑ birleลŸtirme kullan"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "รงakฤฑลŸmalarda bizim sรผrรผmรผ kullan"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "รงakฤฑลŸmalarda onlarฤฑn sรผrรผmรผnรผ kullan"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "รงakฤฑลŸmalarda birlik olmuลŸ bir sรผrรผm kullan"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "รงakฤฑลŸmalarda bu imleyici boyutunu kullan"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "รงakฤฑลŸmalar hakkฤฑnda uyarma"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "file1/orig-file/file2 iรงin etiketler yapฤฑลŸtฤฑr"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "bilinmeyen seรงenek %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "'%s' nesnesi ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/merge-recursive.c:57
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "%d tabandan fazlasฤฑ iลŸlenemiyor. %s yok sayฤฑlฤฑyor."
+msgstr[1] "%d tabandan fazlasฤฑ iลŸlenemiyor. %s yok sayฤฑlฤฑyor."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "iki dal ucu birleลŸtirmesinden baลŸka bir ลŸey iลŸlenmiyor"
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "'%s' baลŸvurusu รงรถzรผlemedi"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "%s, %s ile birleลŸtiriliyor\n"
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr "girdi NUL ile sonlandฤฑrฤฑldฤฑ"
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "eksik nesnelere izin ver"
+
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr "birden รงok aฤŸacฤฑn oluลŸturulmasฤฑna izin ver"
+
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
+msgstr ""
+"git multi-pack-index [<seรงenekler>] (write|verify|expire|repack --batch-"
+"size=<boyut>)"
+
+#: builtin/multi-pack-index.c:26
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr "nesne dizini paket dosyasฤฑ seti ve pack-index eลŸleri iรงeriyor"
+
+#: builtin/multi-pack-index.c:29
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"yeniden paketleme sฤฑrasฤฑnda daha kรผรงรผk boyutlu paket dosyalarฤฑnฤฑ bu boyuttan "
+"daha bรผyรผk bir toplu iลŸ olarak toplayฤฑn"
+
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+msgid "too many arguments"
+msgstr "รงok fazla deฤŸiลŸken"
+
+#: builtin/multi-pack-index.c:60
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "--batch-size seรงeneฤŸi yalnฤฑzca 'repack' altkomutu iรงin"
+
+#: builtin/multi-pack-index.c:69
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "tanฤฑmlanamayan altkomut: %s"
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<seรงenekler>] <kaynak>... <hedef>"
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "%s dizini indekste ve altmodรผl deฤŸil mi?"
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"ฤฐlerlemek iรงin lรผtfen deฤŸiลŸikliklerinizi .gitmodules'e hazฤฑrlayฤฑn veya "
+"zulalayฤฑn"
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s indekste"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "hedef var olsa bile zorla taลŸฤฑ/yeniden adlandฤฑr"
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "taลŸฤฑ/yeniden adlandฤฑr hatalarฤฑnฤฑ atla"
+
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "'%s' hedefi bir dizin deฤŸil"
+
+#: builtin/mv.c:180
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "'%s'->'%s' yeniden adlandฤฑrmasฤฑ denetleniyor\n"
+
+#: builtin/mv.c:184
+msgid "bad source"
+msgstr "hatalฤฑ kaynak"
+
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
+msgstr "dizin kendi iรงine taลŸฤฑnamฤฑyor"
+
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
+msgstr "dizin dosya รผzerinden taลŸฤฑnamฤฑyor"
+
+#: builtin/mv.c:199
+msgid "source directory is empty"
+msgstr "kaynak dizin boลŸ"
+
+#: builtin/mv.c:224
+msgid "not under version control"
+msgstr "sรผrรผm denetimi altฤฑnda deฤŸil"
+
+#: builtin/mv.c:227
+msgid "destination exists"
+msgstr "hedef mevcut"
+
+#: builtin/mv.c:235
+#, c-format
+msgid "overwriting '%s'"
+msgstr "รผzerine yazฤฑlฤฑyor: '%s'"
+
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
+msgstr "รœzerine yazฤฑlamฤฑyor"
+
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
+msgstr "aynฤฑ hedef iรงin birden รงok kaynak"
+
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
+msgstr "hedef dizin mevcut deฤŸil"
+
+#: builtin/mv.c:250
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, kaynak=%s, hedef:%s"
+
+#: builtin/mv.c:271
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "%s, %s olarak yeniden adlandฤฑrฤฑlฤฑyor\n"
+
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "'%s' yeniden adlandฤฑrฤฑlamadฤฑ"
+
+#: builtin/name-rev.c:465
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<seรงenekler>] <gรถnderi>..."
+
+#: builtin/name-rev.c:466
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<seรงenekler>] --all"
+
+#: builtin/name-rev.c:467
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<seรงenekler>] --stdin"
+
+#: builtin/name-rev.c:524
+msgid "print only names (no SHA-1)"
+msgstr "yalnฤฑzca adlarฤฑ yazdฤฑr (SHA-1 yok)"
+
+#: builtin/name-rev.c:525
+msgid "only use tags to name the commits"
+msgstr "gรถnderileri adlandฤฑrmak iรงin yalnฤฑzca etiketleri kullan"
+
+#: builtin/name-rev.c:527
+msgid "only use refs matching <pattern>"
+msgstr "yalnฤฑzca <dizgi> ile eลŸleลŸen baลŸvurularฤฑ kullan"
+
+#: builtin/name-rev.c:529
+msgid "ignore refs matching <pattern>"
+msgstr "<dizgi> ile eลŸleลŸen baลŸvurularฤฑ yok say"
+
+#: builtin/name-rev.c:531
+msgid "list all commits reachable from all refs"
+msgstr "tรผm baลŸvurulardan ulaลŸฤฑlabilir olan tรผm gรถnderileri listele"
+
+#: builtin/name-rev.c:532
+msgid "read from stdin"
+msgstr "stdin'den oku"
+
+#: builtin/name-rev.c:533
+msgid "allow to print `undefined` names (default)"
+msgstr "'tanฤฑmlanmayan' adlarฤฑn yazdฤฑrฤฑlmasฤฑna izin ver (รถntanฤฑmlฤฑ)"
+
+#: builtin/name-rev.c:539
+msgid "dereference tags in the input (internal use)"
+msgstr "girdide etiketlerin baลŸvurularฤฑnฤฑ kaldฤฑr (iรง kullanฤฑm)"
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <not-bลŸvr>] [list [<nesne>]]"
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <not-bลŸvr>] add [-f] [--allow-empty] [-m <ileti> | -F "
+"<dosya> | (-c | -C) <nesne>] [<nesne>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <not-bลŸvr>] copy [-f] <nesneden> <nesneye>"
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <not-bลŸvr>] append [--allow-empty] [-m <ileti> | -F <dosya> "
+"| (-c | -C) <nesne>] [<nesne>]"
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <not-bลŸvr>] edit [--allow-empty] [<nesne>]"
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <not-bลŸvr>] show [<nesne>]"
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <not-bลŸvr>] merge [-v | -q] [-s <strateji>] <not-bลŸvr>"
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <not-bลŸvr>] remove [<nesne>...]"
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <not-bลŸvr>] prune [-n] [-v]"
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <not-bลŸvr>] get-ref"
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<nesne>]]"
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<seรงenekler>] [<nesne>]"
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<seรงenekler>] <nesneden> <nesneye>"
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<nesneden> <nesneye>]..."
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<seรงenekler>] [<nesne>]"
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<nesne>]"
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr "git notes show [<nesne>]"
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<seรงenekler>] <not-bลŸvr>"
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<seรงenekler>]"
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<seรงenekler>]"
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<nesne>]"
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<seรงenekler>]"
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr "AลŸaฤŸฤฑdaki nesneler iรงin not yaz/dรผzenle:"
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "'%s' nesnesi iรงin 'show' baลŸlatฤฑlamฤฑyor"
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr "'show' รงฤฑktฤฑsฤฑ okunamadฤฑ"
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "'%s' nesnesi iรงin 'show' bitirilemedi"
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr "not iรงeriฤŸini lรผtfen -m veya -F seรงeneฤŸini kullanarak saฤŸlayฤฑn"
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr "not nesnesi yazฤฑlamฤฑyor"
+
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr "not iรงeriฤŸi %s iรงinde bฤฑrakฤฑldฤฑ"
+
+#: builtin/notes.c:242 builtin/tag.c:532
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "'%s' aรงฤฑlamadฤฑ veya okunamadฤฑ"
+
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "'%s' geรงerli bir baลŸvuru olarak รงรถzรผlemedi"
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "'%s' nesnesi okunamadฤฑ."
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "ฤฐkili nesne olmayan '%s' nesnesinden not verisi okunamฤฑyor."
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "hatalฤฑ oluลŸturulmuลŸ girdi satฤฑrฤฑ: '%s'"
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadฤฑ"
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "notlarฤฑ %s yapma (%s iรงinde) reddediliyor (refs/notes/ dฤฑลŸฤฑnda)"
+
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+msgid "too many parameters"
+msgstr "รงok fazla parametre"
+
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr "%s nesnesi iรงin not bulunamadฤฑ."
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr "not iรงeriฤŸi dizi olarak"
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr "not iรงeriฤŸi bir dosyada"
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr "belirtilen not nesnesini dรผzenle ve yeniden kullan"
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr "belirtilen not nesnesini yeniden kullan"
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr "boลŸ not depolamasฤฑna izin ver"
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr "var olan notlarฤฑ baลŸkalarฤฑyla deฤŸiลŸtir"
+
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Not eklenemiyor. %s nesnesi iรงin halihazฤฑrda var olan notlar bulundu. Bu "
+"notlarฤฑn รผzerine yazmak iรงin '-f' kullanฤฑn."
+
+#: builtin/notes.c:463 builtin/notes.c:544
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "%s nesnesi iรงin var olan notlarฤฑn รผzerine yazฤฑlฤฑyor\n"
+
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "%s nesnesi iรงin olan not kaldฤฑrฤฑlฤฑyor\n"
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr "nesneleri stdin'den oku"
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "<komut> iรงin yapฤฑlandฤฑrma yeniden yazฤฑmฤฑnฤฑ yรผkle (--stdin ima eder)"
+
+#: builtin/notes.c:517
+msgid "too few parameters"
+msgstr "รงok az parametre"
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Notlar kopyalanamฤฑyor. %s nesnesi iรงin halihazฤฑrda var olan notlar bulundu. "
+"Bu notlarฤฑn รผzerine yazmak iรงin '-f' kullanฤฑn."
+
+#: builtin/notes.c:550
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "%s kaynak nesnesi iรงin not eksik. Kopyalanamฤฑyor."
+
+#: builtin/notes.c:603
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+msgstr ""
+"-m/-F/-c/-C seรงenekleri 'edit' komutu iรงin kullanฤฑm dฤฑลŸฤฑ bฤฑrakฤฑldฤฑ.\n"
+"Lรผtfen bunun yerine 'git notes add -f -m/-F/-c/-C' kullanฤฑn.\n"
+
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "NOTES_MERGE_PARTIAL baลŸvurusu silinemedi"
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "NOTES_MERGE_REF baลŸvurusu silinemedi"
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "'git remove merge' รงalฤฑลŸma aฤŸacฤฑ kaldฤฑrฤฑlamadฤฑ"
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "NOTES_MERGE_PARTIAL baลŸvurusu okunamadฤฑ"
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "NOTES_MERGE_PARTIAL รถgesinden gรถnderi bulunamadฤฑ."
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "NOTES_MERGE_PARTIAL รถgesinden gรถnderi ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "NOTES_MERGE_REF รงรถzรผlemedi"
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr "not birleลŸtirilmesi tamamlanamadฤฑ"
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "bilinmeyen not birleลŸtirme stratejisi %s"
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr "Genel seรงenekler"
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr "BirleลŸtirme seรงenekleri"
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"not รงakฤฑลŸmalarฤฑnฤฑ verilen stratejiyi kullanarak รงรถz (el ile/bizimkionlarฤฑnki/"
+"birlik olmuลŸ/cat_sort_uniq)"
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr "BirleลŸtirilmemiลŸ notlar gรถnderiliyor"
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "birleลŸtirilmemiลŸ notlarฤฑ gรถndererek not birleลŸtirmesini tamamla"
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr "Notlar birleลŸtirmesi รงรถzรผmรผ iptal ediliyor"
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr "not birleลŸtirmesini iptal et"
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "--commit, --abort veya -s/--strategy karฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr "birleลŸtirmek iรงin bir not baลŸvurusu belirtilmeli"
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "bilinmeyen -s/--strategy: %s"
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "%s konumuna bir not birleลŸtirmesi halihazฤฑrda %s konumunda sรผrรผyor"
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "geรงerli not baลŸvurusuna baฤŸlantฤฑ depolanamadฤฑ (%s)"
+
+#: builtin/notes.c:878
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+"KendiliฤŸinden not birleลŸtirmesi baลŸarฤฑsฤฑz oldu. %s iรงindeki รงakฤฑลŸmalarฤฑ "
+"รงรถzรผn ve sonucu 'git notes merge --commit' ile gรถnderin. BirleลŸtirmeyi iptal "
+"etmek isterseniz 'git notes merge --abort' kullanarak bunu yapabilirsiniz.\n"
+
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "'%s' geรงerli bir baลŸvuru olarak รงรถzรผlemiyor"
+
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "%s nesnesinin notu yok\n"
+
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr "var olmayan notu kaldฤฑrma denemesi bir hata deฤŸil"
+
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr "nesne adlarฤฑnฤฑ standart girdi'den oku"
+
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+msgid "do not remove, show only"
+msgstr "kaldฤฑrma, yalnฤฑzca gรถster"
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr "budanmฤฑลŸ notlarฤฑ kaldฤฑr"
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr "not baลŸvurusu"
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr "notlarฤฑ <not-bลŸvr>'ndan kullan"
+
+#: builtin/notes.c:1034 builtin/stash.c:1643
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "bilinmeyen altkomut: %s"
+
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [<seรงenekler>...] [< <bลŸvr-liste> | < <nesne-"
+"liste>]"
+
+#: builtin/pack-objects.c:53
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects [<sรงnklr>...] <base-name> [< <bลŸvr-liste> | < <nesne-liste>]"
+
+#: builtin/pack-objects.c:430
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr "%s iรงin hatalฤฑ paketlenmiลŸ nesne CRC'si"
+
+#: builtin/pack-objects.c:441
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "%s iรงin hasar gรถrmรผลŸ paketlenmiลŸ nesne"
+
+#: builtin/pack-objects.c:572
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr "%s nesnesi iรงin รถzyineli delta algฤฑlandฤฑ"
+
+#: builtin/pack-objects.c:783
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "%u nesne sipariลŸ verildi, %<PRIu32> bekleniyordu"
+
+#: builtin/pack-objects.c:972
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"biteลŸlem yazฤฑmฤฑ kapatฤฑlฤฑyor, paketler pack.packSizeLimit dolayฤฑsฤฑyla "
+"parรงalara ayrฤฑlmฤฑลŸ"
+
+#: builtin/pack-objects.c:985
+msgid "Writing objects"
+msgstr "Nesneler yazฤฑlฤฑyor"
+
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#, c-format
+msgid "failed to stat %s"
+msgstr "%s bilgileri alฤฑnamฤฑyor"
+
+#: builtin/pack-objects.c:1099
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "%<PRIu32> nesne yazฤฑldฤฑ (%<PRIu32> bekleniyordu)"
+
+#: builtin/pack-objects.c:1297
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "bazฤฑ nesneler paketlenmediฤŸinden dolayฤฑ biteลŸlem yazฤฑmฤฑ kapatฤฑlฤฑyor"
+
+#: builtin/pack-objects.c:1724
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr "%s iรงin paket iรงinde delta taban ofset taลŸฤฑmฤฑ"
+
+#: builtin/pack-objects.c:1733
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr "%s iรงin delta taban ofseti sฤฑnฤฑrlarฤฑn dฤฑลŸฤฑnda"
+
+#: builtin/pack-objects.c:2004
+msgid "Counting objects"
+msgstr "Nesneler sayฤฑlฤฑyor"
+
+#: builtin/pack-objects.c:2149
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "%s nesne รผstbilgisi ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
+#, c-format
+msgid "object %s cannot be read"
+msgstr "%s nesnesi okunamฤฑyor"
+
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr "%s nesnesi iรงin tutarsฤฑz nesne uzunluฤŸu (%<PRIuMAX> / %<PRIuMAX>)"
+
+#: builtin/pack-objects.c:2259
+msgid "suboptimal pack - out of memory"
+msgstr "standart altฤฑ paket - bellek yetersiz"
+
+#: builtin/pack-objects.c:2574
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "Delta sฤฑkฤฑลŸtฤฑrmasฤฑ %d iลŸ parรงacฤฑฤŸฤฑ kullanฤฑyor"
+
+#: builtin/pack-objects.c:2713
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "%s etiketinden ulaลŸฤฑlabilir nesneler paketlenemiyor"
+
+#: builtin/pack-objects.c:2801
+msgid "Compressing objects"
+msgstr "Nesneler sฤฑkฤฑลŸtฤฑrฤฑlฤฑyor"
+
+#: builtin/pack-objects.c:2807
+msgid "inconsistency with delta count"
+msgstr "delta sayฤฑmฤฑnda tutarsฤฑzlฤฑk"
+
+#: builtin/pack-objects.c:2888
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"sฤฑnฤฑr nesnesi numarasฤฑ bekleniyordu, anlamsฤฑz veri alฤฑndฤฑ:\n"
+" %s"
+
+#: builtin/pack-objects.c:2894
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"nesne numarasฤฑ bekleniyordu, anlamsฤฑz veri alฤฑndฤฑ:\n"
+"%s"
+
+#: builtin/pack-objects.c:2992
+msgid "invalid value for --missing"
+msgstr "--missing iรงin geรงersiz deฤŸer"
+
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+msgid "cannot open pack index"
+msgstr "paket indeksi aรงฤฑlamฤฑyor"
+
+#: builtin/pack-objects.c:3082
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr "%s konumundaki gevลŸek nesne incelenemedi"
+
+#: builtin/pack-objects.c:3167
+msgid "unable to force loose object"
+msgstr "gevลŸek nesne zorlanamฤฑyor"
+
+#: builtin/pack-objects.c:3260
+#, c-format
+msgid "not a rev '%s'"
+msgstr "bir revizyon deฤŸil: '%s'"
+
+#: builtin/pack-objects.c:3263
+#, c-format
+msgid "bad revision '%s'"
+msgstr "hatalฤฑ revizyon: '%s'"
+
+#: builtin/pack-objects.c:3288
+msgid "unable to add recent objects"
+msgstr "en son nesneler eklenemiyor"
+
+#: builtin/pack-objects.c:3341
+#, c-format
+msgid "unsupported index version %s"
+msgstr "desteklenmeyen indeks sรผrรผmรผ %s"
+
+#: builtin/pack-objects.c:3345
+#, c-format
+msgid "bad index version '%s'"
+msgstr "hatalฤฑ indeks sรผrรผmรผ '%s'"
+
+#: builtin/pack-objects.c:3383
+msgid "<version>[,<offset>]"
+msgstr "<sรผrรผm>[,<ofset>]"
+
+#: builtin/pack-objects.c:3384
+msgid "write the pack index file in the specified idx format version"
+msgstr "paket indeks dosyasฤฑnฤฑ belirtilen idx biรงiminde yaz"
+
+#: builtin/pack-objects.c:3387
+msgid "maximum size of each output pack file"
+msgstr "her รงฤฑktฤฑ paketi dosyasฤฑnฤฑn olabilecek en bรผyรผk boyutu"
+
+#: builtin/pack-objects.c:3389
+msgid "ignore borrowed objects from alternate object store"
+msgstr "alternatif nesne maฤŸazasฤฑndan รถdรผnรง alฤฑnan nesneleri yok say"
+
+#: builtin/pack-objects.c:3391
+msgid "ignore packed objects"
+msgstr "paketlenmiลŸ nesneleri yok say"
+
+#: builtin/pack-objects.c:3393
+msgid "limit pack window by objects"
+msgstr "paket penceresini nesnelerle sฤฑnฤฑrla"
+
+#: builtin/pack-objects.c:3395
+msgid "limit pack window by memory in addition to object limit"
+msgstr "paket penceresini nesne limitine ek olarak bellek ile kฤฑsฤฑtla"
+
+#: builtin/pack-objects.c:3397
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "ortaya รงฤฑkan pakette olabilecek en bรผyรผk delta zincirinin uzunluฤŸu"
+
+#: builtin/pack-objects.c:3399
+msgid "reuse existing deltas"
+msgstr "var olan deltalarฤฑ yeniden kullan"
+
+#: builtin/pack-objects.c:3401
+msgid "reuse existing objects"
+msgstr "var olan nesneleri yeniden kullan"
+
+#: builtin/pack-objects.c:3403
+msgid "use OFS_DELTA objects"
+msgstr "OFS_DELTA nesneleri kullan"
+
+#: builtin/pack-objects.c:3405
+msgid "use threads when searching for best delta matches"
+msgstr "en iyi delta eลŸleลŸmelerini ararken iลŸ parรงacฤฑklarฤฑnฤฑ kullan"
+
+#: builtin/pack-objects.c:3407
+msgid "do not create an empty pack output"
+msgstr "boลŸ bir paket รงฤฑktฤฑsฤฑ oluลŸturma"
+
+#: builtin/pack-objects.c:3409
+msgid "read revision arguments from standard input"
+msgstr "revizyon deฤŸiลŸkenlerini standart girdi'den oku"
+
+#: builtin/pack-objects.c:3411
+msgid "limit the objects to those that are not yet packed"
+msgstr "nesneleri henรผz paketlenmeyenlere kฤฑsฤฑtla"
+
+#: builtin/pack-objects.c:3414
+msgid "include objects reachable from any reference"
+msgstr "herhangi bir baลŸvurudan ulaลŸฤฑlabilir olan nesneleri iรงer"
+
+#: builtin/pack-objects.c:3417
+msgid "include objects referred by reflog entries"
+msgstr "baลŸvuru gรผnlรผฤŸรผ tarafฤฑndan baลŸvurulan nesneleri iรงer"
+
+#: builtin/pack-objects.c:3420
+msgid "include objects referred to by the index"
+msgstr "indeks tarafฤฑndan baลŸvurulan nesneleri iรงer"
+
+#: builtin/pack-objects.c:3423
+msgid "output pack to stdout"
+msgstr "paketi stdout'a รงฤฑktฤฑ ver"
+
+#: builtin/pack-objects.c:3425
+msgid "include tag objects that refer to objects to be packed"
+msgstr "paketlenecek nesnelere baลŸvuran etiket nesnelerini iรงer"
+
+#: builtin/pack-objects.c:3427
+msgid "keep unreachable objects"
+msgstr "ulaลŸฤฑlamayan nesneleri tut"
+
+#: builtin/pack-objects.c:3429
+msgid "pack loose unreachable objects"
+msgstr "ulaลŸฤฑlamayan gevลŸek nesneleri paketle"
+
+#: builtin/pack-objects.c:3431
+msgid "unpack unreachable objects newer than <time>"
+msgstr "<zaman>'dan daha yeni ulaลŸฤฑlamayan nesneleri aรง"
+
+#: builtin/pack-objects.c:3434
+msgid "use the sparse reachability algorithm"
+msgstr "aralฤฑklฤฑ ulaลŸฤฑlabilirlik algoritmasฤฑnฤฑ kullan"
+
+#: builtin/pack-objects.c:3436
+msgid "create thin packs"
+msgstr "ince paketler oluลŸtur"
+
+#: builtin/pack-objects.c:3438
+msgid "create packs suitable for shallow fetches"
+msgstr "sฤฑฤŸ getirmelere uygun paketler oluลŸtur"
+
+#: builtin/pack-objects.c:3440
+msgid "ignore packs that have companion .keep file"
+msgstr "eลŸlik eden .keep dosyasฤฑna iye paketleri yok say"
+
+#: builtin/pack-objects.c:3442
+msgid "ignore this pack"
+msgstr "bu paketi yok say"
+
+#: builtin/pack-objects.c:3444
+msgid "pack compression level"
+msgstr "paket sฤฑkฤฑลŸtฤฑrma dรผzeyi"
+
+#: builtin/pack-objects.c:3446
+msgid "do not hide commits by grafts"
+msgstr "aลŸฤฑlarla gelen gรถnderileri gizleme"
+
+#: builtin/pack-objects.c:3448
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+"nesnelerin sayฤฑmฤฑnฤฑ hฤฑzlandฤฑrmak iรงin eฤŸer varsa bir biteลŸlem indeksi kullan"
+
+#: builtin/pack-objects.c:3450
+msgid "write a bitmap index together with the pack index"
+msgstr "paket indeksiyle birlikte bir biteลŸlem indeksi de yaz"
+
+#: builtin/pack-objects.c:3454
+msgid "write a bitmap index if possible"
+msgstr "eฤŸer olanaklฤฑysa bir biteลŸlem indeksi yaz"
+
+#: builtin/pack-objects.c:3458
+msgid "handling for missing objects"
+msgstr "eksik nesneler iรงin iลŸlem"
+
+#: builtin/pack-objects.c:3461
+msgid "do not pack objects in promisor packfiles"
+msgstr "nesneleri vaatรงi paket dosyalarฤฑyla paketleme"
+
+#: builtin/pack-objects.c:3463
+msgid "respect islands during delta compression"
+msgstr "delta sฤฑkฤฑลŸtฤฑrmasฤฑ sฤฑrasฤฑnda adalara uy"
+
+#: builtin/pack-objects.c:3492
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "delta zincir derinliฤŸi %d รงok derin, %d zorlanฤฑyor"
+
+#: builtin/pack-objects.c:3497
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "pack.deltaCacheLimit รงok yรผksek, %d zorlanฤฑyor"
+
+#: builtin/pack-objects.c:3551
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr "--max-pack-size, aktarฤฑm iรงin bir paket yapฤฑmฤฑnda kullanฤฑlamaz"
+
+#: builtin/pack-objects.c:3553
+msgid "minimum pack size limit is 1 MiB"
+msgstr "olabilecek en kรผรงรผk paket boyutu limiti 1 MiB'dฤฑr"
+
+#: builtin/pack-objects.c:3558
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "--thin bir indekslenebilir paket yapฤฑmฤฑnda kullanฤฑlamaz"
+
+#: builtin/pack-objects.c:3561
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz"
+
+#: builtin/pack-objects.c:3567
+msgid "cannot use --filter without --stdout"
+msgstr "--filter, --stdout olmadan kullanฤฑlamaz"
+
+#: builtin/pack-objects.c:3627
+msgid "Enumerating objects"
+msgstr "Nesneler sayฤฑp dรถkรผlรผyor"
+
+#: builtin/pack-objects.c:3657
+#, c-format
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Toplam %<PRIu32> (delta %<PRIu32>), yeniden kullanฤฑlan %<PRIu32> (delta "
+"%<PRIu32>), yeniden kullanฤฑlan paket %<PRIu32>"
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<seรงenekler>]"
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr "her ลŸeyi paketle"
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr "gevลŸek baลŸvurularฤฑ buda (รถntanฤฑmlฤฑ)"
+
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
+msgstr "YinelenmiลŸ nesneler kaldฤฑrฤฑlฤฑyor"
+
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr ""
+"git prune [-n] [-v] [--progress] [--expire <zaman>] [--] [<dal-ucu>...]"
+
+#: builtin/prune.c:131
+msgid "report pruned objects"
+msgstr "budanmฤฑลŸ nesneleri bildir"
+
+#: builtin/prune.c:134
+msgid "expire objects older than <time>"
+msgstr "<zaman>'dan daha eski nesnelerin hรผkmรผnรผ kaldฤฑr"
+
+#: builtin/prune.c:136
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "promisor paket dosyalarฤฑnฤฑn dฤฑลŸฤฑndaki nesnelere taramayฤฑ kฤฑsฤฑtla"
+
+#: builtin/prune.c:150
+msgid "cannot prune in a precious-objects repo"
+msgstr "bir precious-objects deposu iรงinde budama yapฤฑlamฤฑyor"
+
+#: builtin/pull.c:45 builtin/pull.c:47
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "%s iรงin geรงersiz deฤŸer: %s"
+
+#: builtin/pull.c:67
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<seรงenekler>] [<depo> [<bลŸvr-blrtรง>...]]"
+
+#: builtin/pull.c:122
+msgid "control for recursive fetching of submodules"
+msgstr "altmodรผllerin รถzyineli getirilmesi iรงin denetleme"
+
+#: builtin/pull.c:126
+msgid "Options related to merging"
+msgstr "BirleลŸtirme ile ilgili seรงenekler"
+
+#: builtin/pull.c:129
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "deฤŸiลŸiklikleri birleลŸtirme yerine yeniden temellendirme ile kat"
+
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
+msgid "allow fast-forward"
+msgstr "ileri sarฤฑma izin ver"
+
+#: builtin/pull.c:166
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+"yeniden temellendirme รถncesi ve sonrasฤฑnda kendiliฤŸinden zulala/zulayฤฑ patlat"
+
+#: builtin/pull.c:182
+msgid "Options related to fetching"
+msgstr "Getirme ile ilgili seรงenekler"
+
+#: builtin/pull.c:192
+msgid "force overwrite of local branch"
+msgstr "zorla yerel dalฤฑn รผzerine yaz"
+
+#: builtin/pull.c:200
+msgid "number of submodules pulled in parallel"
+msgstr "paralelde รงekilen altmodรผllerin sayฤฑsฤฑ"
+
+#: builtin/pull.c:300
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "pull.ff iรงin geรงersiz deฤŸer: %s"
+
+#: builtin/pull.c:426
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+"Az รถnce getirdiฤŸiniz referanslar arasฤฑnda yeniden temellendirme iรงin aday "
+"yok."
+
+#: builtin/pull.c:428
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr "Az รถnce getirdiฤŸiniz baลŸvurular arasฤฑnda birleลŸtirme iรงin aday yok."
+
+#: builtin/pull.c:429
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Genellikle bu, uzak uรงta eลŸleลŸmesi olmayan bir joker baลŸvuru belirteci\n"
+"saฤŸladฤฑฤŸฤฑnฤฑz anlamฤฑna gelir."
+
+#: builtin/pull.c:432
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+"'%s' uzak konumundan รงekme yapmak istediniz, ancak bir dal belirtmediniz.\n"
+"Bu, geรงerli dalฤฑnฤฑz iรงin รถntanฤฑmlฤฑ yapฤฑlandฤฑrฤฑlmฤฑลŸ uzak konum olmadฤฑฤŸฤฑndan,\n"
+"komut satฤฑrฤฑnda bir dal belirtmeniz gerekir."
+
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr "ลžu anda bir dal รผzerinde deฤŸilsiniz."
+
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+"Lรผtfen hangi dala karลŸฤฑ yeniden temellendirme yapmak istediฤŸinizi belirtin."
+
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr "Lรผtfen hangi dal ile birleลŸtirmek istediฤŸinizi belirtin."
+
+#: builtin/pull.c:442 builtin/pull.c:457
+msgid "See git-pull(1) for details."
+msgstr "Ayrฤฑntฤฑlar iรงin: git-pull(1)"
+
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<uzak-konum>"
+
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<dal>"
+
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr "Geรงerli dal iรงin izleme bilgisi yok."
+
+#: builtin/pull.c:461 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+"EฤŸer bu dal iรงin izleme bilgisi ayarlamak isterseniz ลŸununla yapabilirsiniz:"
+
+#: builtin/pull.c:466
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"Yapฤฑlandฤฑrmanฤฑz uzak konumdan '%s' baลŸvurusu ile birleลŸtirmeyi sรถylรผyor,\n"
+"ancak bรถyle bir baลŸvuru getirilmedi."
+
+#: builtin/pull.c:576
+#, c-format
+msgid "unable to access commit %s"
+msgstr "%s gรถnderisine eriลŸilemedi"
+
+#: builtin/pull.c:857
+msgid "ignoring --verify-signatures for rebase"
+msgstr "yeniden temellendirme iรงin --verify-signature yok sayฤฑlฤฑyor"
+
+#: builtin/pull.c:912
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash seรงeneฤŸi yalnฤฑzca --rebase ile geรงerli."
+
+#: builtin/pull.c:920
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "ฤฐndekse eklenen deฤŸiลŸikliklerle henรผz doฤŸmamฤฑลŸ bir dal gรผncelleniyor."
+
+#: builtin/pull.c:924
+msgid "pull with rebase"
+msgstr "yeniden temellendirme ile รงek"
+
+#: builtin/pull.c:925
+msgid "please commit or stash them."
+msgstr "Lรผtfen onlarฤฑ gรถnderin veya zulalayฤฑn."
+
+#: builtin/pull.c:950
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"Getirme geรงerli dal ucunu gรผncelledi.\n"
+"ร‡alฤฑลŸma aฤŸacฤฑnฤฑz %s gรถnderisinden\n"
+"ileri sarฤฑlฤฑyor."
+
+#: builtin/pull.c:956
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"ร‡alฤฑลŸma aฤŸacฤฑnฤฑz ileri sarฤฑlamฤฑyor.\n"
+"$ git diff %s\n"
+"รงฤฑktฤฑsฤฑndan gerekli olacaฤŸฤฑnฤฑ dรผลŸรผndรผฤŸรผnรผz รถgeleri\n"
+"kaydettiฤŸinizden emin olduktan sonra kurtarma iรงin\n"
+"$ git reset --hard\n"
+"komutunu รงalฤฑลŸtฤฑrฤฑn."
+
+#: builtin/pull.c:971
+msgid "Cannot merge multiple branches into empty head."
+msgstr "BoลŸ dal ucuna birden รงok dal birleลŸtirilemez."
+
+#: builtin/pull.c:975
+msgid "Cannot rebase onto multiple branches."
+msgstr "Birden รงok dala yeniden temellendirme yapฤฑlamaz."
+
+#: builtin/pull.c:982
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+"yerelde kaydฤฑ yazฤฑlmฤฑลŸ altmodรผl deฤŸiลŸiklikleriyle yeniden temellendirme "
+"yapฤฑlamaz"
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<seรงenekler>] [<depo> [<bลŸvr-blrtรง>...]]"
+
+#: builtin/push.c:112
+msgid "tag shorthand without <tag>"
+msgstr "stenografiyi <etiket> olmadan etiketle"
+
+#: builtin/push.c:122
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete yalnฤฑzca dรผz hedef baลŸvuru adlarฤฑnฤฑ kabul eder"
+
+#: builtin/push.c:168
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"Bu seรงeneklerden birini kalฤฑcฤฑ olarak seรงmek iรงin 'git help config' iรงinde "
+"push.default girdisine bakฤฑn."
+
+#: builtin/push.c:171
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch.  To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+msgstr ""
+"Geรงerli dalฤฑnฤฑzฤฑn รผstkaynak dalฤฑ, geรงerli dalฤฑnฤฑzฤฑn adฤฑyla\n"
+"eลŸleลŸmiyor. Uzak konumdaki รผstkaynaฤŸa gitmek iรงin ลŸunu kullanฤฑn:\n"
+"\n"
+"\tgit push %s HEAD:%s\n"
+"\n"
+"Uzak konumdaki aynฤฑ adlฤฑ dala itmek iรงinse ลŸunu kullanฤฑn:\n"
+"\n"
+"\tgit push %s HEAD\n"
+"%s"
+
+#: builtin/push.c:186
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+"    git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"ลžu anda bir dal รผzerinde deฤŸilsiniz.\n"
+"Geรงerli duruma (ayrฤฑk HEAD) yol aรงan geรงmiลŸi ลŸimdi itmek\n"
+"iรงin ลŸunu kullanฤฑn:\n"
+"\n"
+"\tgit push %s HEAD:<uzak-konum-dalฤฑnฤฑn-adฤฑ>\n"
+
+#: builtin/push.c:200
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+msgstr ""
+"Geรงerli %s dalฤฑnฤฑn bir รผstkaynak dalฤฑ yok.\n"
+"Geรงerli dalฤฑ itmek ve uzak konumu รผstkaynak olarak ayarlamak\n"
+"iรงin ลŸunu kullanฤฑn:\n"
+"\n"
+"\tgit push --set-upstream %s %s\n"
+
+#: builtin/push.c:208
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "Geรงerli %s dalฤฑnฤฑn birden รงok รผstkaynaฤŸฤฑ var, itme reddediliyor."
+
+#: builtin/push.c:211
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"'%s' uzak konumuna hangi uzak dalฤฑ gรผncellemek iรงin neyin\n"
+"itileceฤŸini belirtmeden itiyorsunuz, ancak o geรงerli '%s'\n"
+"dalฤฑnฤฑzฤฑn รผstkaynaฤŸฤฑ deฤŸil."
+
+#: builtin/push.c:270
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"ฤฐtmek iรงin bir baลŸvuru belirteci belirtmediniz ve push.default \"nothing\"."
+
+#: builtin/push.c:277
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Gรผncellemeler reddedildi รงรผnkรผ geรงerli dalฤฑnฤฑzฤฑn ucu kendisinin\n"
+"uzak konum karลŸฤฑtฤฑndan geride. Yeniden itmeden รถnce uzak konumdaki\n"
+"deฤŸiลŸiklikleri entegre edin (รถrn. 'git pull'...).\n"
+"Ayrฤฑntฤฑlar iรงin 'git push --help' iรงinde 'Notes about fast-forwards'a bakฤฑn."
+
+#: builtin/push.c:283
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Gรผncellemeler reddedildi รงรผnkรผ itilmiลŸ bir dal ucu kendisinin\n"
+"uzak konum karลŸฤฑtฤฑndan geride. Yeniden itmeden รถnce bu dalฤฑ รงฤฑkฤฑลŸ\n"
+"yapฤฑn ve uzak konumdaki deฤŸiลŸiklikleri entegre edin (รถrn. 'git pull'...).\n"
+"Ayrฤฑntฤฑlar iรงin 'git push --help' iรงinde 'Notes about fast-forwards'a bakฤฑn."
+
+#: builtin/push.c:289
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Gรผncellemeler reddedildi รงรผnkรผ uzak konumda henรผz yerelde iyesi olmadฤฑฤŸฤฑnฤฑz\n"
+"deฤŸiลŸiklikler var. Bu genelde baลŸka bir deponun aynฤฑ baลŸvuruya itmesinden\n"
+"dolayฤฑ olur. Yeniden itmeden รถnce uzak konumdaki deฤŸiลŸiklikleri entegre\n"
+"etmek isteyebilirsiniz (รถrn. 'git pull'...).\n"
+"Ayrฤฑntฤฑlar iรงin 'git push --help' iรงinde 'Notes about fast-forwards'a bakฤฑn."
+
+#: builtin/push.c:296
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "Gรผncellemeler reddedildi รงรผnkรผ etiket uzak konumda halihazฤฑrda var."
+
+#: builtin/push.c:299
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+"Gรถnderi olmayan bir nesneye iลŸaret eden uzak baลŸvuruyu gรผncelleyemez\n"
+"veya --force seรงeneฤŸini kullanmadan bir uzak baลŸvuruyu gรถnderi\n"
+"olmayan bir nesneye iลŸaret etmesini saฤŸlamasฤฑ iรงin gรผncelleyemezsiniz.\n"
+
+#: builtin/push.c:360
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "ลžuraya itiliyor: %s\n"
+
+#: builtin/push.c:367
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "bazฤฑ baลŸvurular '%s' konumuna itilemedi"
+
+#: builtin/push.c:542
+msgid "repository"
+msgstr "depo"
+
+#: builtin/push.c:543 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr "tรผm baลŸvurularฤฑ it"
+
+#: builtin/push.c:544 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr "tรผm baลŸvurularฤฑ yansฤฑla"
+
+#: builtin/push.c:546
+msgid "delete refs"
+msgstr "baลŸvurularฤฑ sil"
+
+#: builtin/push.c:547
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "etiketleri it (--all veya --mirror ile kullanฤฑlamaz)"
+
+#: builtin/push.c:550 builtin/send-pack.c:167
+msgid "force updates"
+msgstr "zorla gรผncelle"
+
+#: builtin/push.c:552 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr "<baลŸvuruadฤฑ>:<bekle>"
+
+#: builtin/push.c:553 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr "baลŸvurunun eski deฤŸerinin bu deฤŸerde olmasฤฑnฤฑ gerektir"
+
+#: builtin/push.c:556
+msgid "control recursive pushing of submodules"
+msgstr "altmodรผllerin รถzyineli itilmesini denetle"
+
+#: builtin/push.c:558 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr "ince paket kullan"
+
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr "paket programฤฑnฤฑ al"
+
+#: builtin/push.c:561
+msgid "set upstream for git pull/status"
+msgstr "git pull/status iรงin รผstkaynak ayarla"
+
+#: builtin/push.c:564
+msgid "prune locally removed refs"
+msgstr "yerelde kaldฤฑrฤฑlan baลŸvurularฤฑ buda"
+
+#: builtin/push.c:566
+msgid "bypass pre-push hook"
+msgstr "pre-push kancasฤฑnฤฑ atla"
+
+#: builtin/push.c:567
+msgid "push missing but relevant tags"
+msgstr "eksik ancak ilgili etiketleri it"
+
+#: builtin/push.c:570 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr "itmeyi GPG ile imzala"
+
+#: builtin/push.c:572 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr "uzak tarafta atomsal iลŸlem iste"
+
+#: builtin/push.c:590
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete; --all, --mirror ve --tags ile uyumsuz"
+
+#: builtin/push.c:592
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete bir baลŸvuru olmadan anlam ifade etmiyor"
+
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "hatalฤฑ depo '%s'"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"Yapฤฑlandฤฑrฤฑlan itme hedefi yok.\n"
+"Ya URL'yi komut satฤฑrฤฑndan belirtin ya da ลŸunu kullanarak bir uzak konum "
+"deposu yapฤฑlandฤฑrฤฑn:\n"
+"\n"
+"\tgit remote add <ad> <url>\n"
+"\n"
+"ardฤฑndan uzak konum adฤฑnฤฑ kullanarak itin:\n"
+"\n"
+"\tgit push <ad>\n"
+
+#: builtin/push.c:628
+msgid "--all and --tags are incompatible"
+msgstr "--all ve --tags birbiriyle uyumsuz"
+
+#: builtin/push.c:630
+msgid "--all can't be combined with refspecs"
+msgstr "--all baลŸvuru belirteรงleriyle birleลŸtirilemez"
+
+#: builtin/push.c:634
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror ve --tags birbiriyle uyumsuz"
+
+#: builtin/push.c:636
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror baลŸvuru belirteรงleriyle birleลŸtirilemez"
+
+#: builtin/push.c:639
+msgid "--all and --mirror are incompatible"
+msgstr "--all ve --mirror birbiriyle uyumsuz"
+
+#: builtin/push.c:643
+msgid "push options must not have new line characters"
+msgstr "itme seรงeneklerinde yeni satฤฑr karakterleri olmamalฤฑ"
+
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+"git range-diff [<seรงenekler>] <old-base>..<old-tip> <new-base>..<new-tip>"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<seรงenekler>] <old-tip>...<new-tip>"
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<seรงenekler>] <base> <old-tip> <new-tip>"
+
+#: builtin/range-diff.c:22
+msgid "Percentage by which creation is weighted"
+msgstr "oluลŸumun tartฤฑldฤฑฤŸฤฑ yรผzde"
+
+#: builtin/range-diff.c:24
+msgid "use simple diff colors"
+msgstr "yalฤฑn diff renklerini kullan"
+
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "notlar"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "'git log'a aktarฤฑldฤฑ"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr "erimde .. yok: '%s'"
+
+#: builtin/range-diff.c:64
+msgid "single arg format must be symmetric range"
+msgstr "tekli deฤŸiลŸken biรงimi simetrik erim olmalฤฑ"
+
+#: builtin/range-diff.c:79
+msgid "need two commit ranges"
+msgstr "iki gรถnderi erimi gerekli"
+
+#: builtin/read-tree.c:41
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<รถnek>) [-"
+"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<dosya>] (--empty | <aฤŸacฤฑmsฤฑ1> [<aฤŸacฤฑmsฤฑ2> [<aฤŸacฤฑmsฤฑ3>]])"
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr "ortaya รงฤฑkan indeksi <dosya>'ya yaz"
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr "yalnฤฑzca indeksi boลŸalt"
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr "BirleลŸtiriliyor"
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr "bir okumaya ek olarak bir birleลŸtirme gerรงekleลŸtir"
+
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr "dosya dรผzeyinde birleลŸtirme gerekmiyorsa 3 yรถnlรผ birleลŸtir"
+
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr "eklemeler ve kaldฤฑrmalar varlฤฑฤŸฤฑnda 3 yรถnlรผ birleลŸtir"
+
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr "-m ile aynฤฑ, ancak birleลŸtirilmeyen girdileri atar"
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr "<altdizin>/"
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "aฤŸacฤฑ indekse <altdizin>/ altฤฑnda oku"
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr "birleลŸtirme sonucuyla รงalฤฑลŸma aฤŸacฤฑnฤฑ gรผncelleลŸtir"
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "aรงฤฑkรงa yok sayฤฑlan dosyalarฤฑn รผzerine yazฤฑlmasฤฑna izin ver"
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr "birleลŸtirmeden sonra รงalฤฑลŸma aฤŸacฤฑnฤฑ denetleme"
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr "indeksi veya รงalฤฑลŸma aฤŸacฤฑnฤฑ gรผncelleme"
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr "aralฤฑklฤฑ รงฤฑkฤฑลŸ sรผzgeci uygulamayฤฑ atla"
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr "unpack-trees hatalarฤฑnฤฑ ayฤฑkla"
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "geribildirim iletilerini gizle"
+
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "ร–ncelikle geรงerli indeksinizi รงรถzmelisiniz"
+
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel> | --keep-"
+"base] [<รผstkaynak> [<dal>]]"
+
+#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel>] --root "
+"[<dal>]"
+
+#: builtin/rebase.c:36
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "kullanฤฑlamaz yapฤฑlacaklar listesi: '%s'"
+
+#: builtin/rebase.c:292
+#, c-format
+msgid "could not create temporary %s"
+msgstr "geรงici %s oluลŸturulamadฤฑ"
+
+#: builtin/rebase.c:298
+msgid "could not mark as interactive"
+msgstr "etkileลŸimli olarak imlenemedi"
+
+#: builtin/rebase.c:352
+msgid "could not generate todo list"
+msgstr "yapฤฑlacaklar listesi oluลŸturulamadฤฑ"
+
+#: builtin/rebase.c:391
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "bir taban gรถnderisi --upstream veya --onto ile saฤŸlanmalฤฑdฤฑr"
+
+#: builtin/rebase.c:461
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<seรงenekler>]"
+
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(KULLANIM DIลžI) boลŸ gรถnderileri tut"
+
+#: builtin/rebase.c:478 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "boลŸ iletili gรถnderilere izin ver"
+
+#: builtin/rebase.c:480
+msgid "rebase merge commits"
+msgstr "birleลŸtirme gรถnderilerini yeniden temellendir"
+
+#: builtin/rebase.c:482
+msgid "keep original branch points of cousins"
+msgstr "kuzenlerin orijinal dal noktalarฤฑnฤฑ tut"
+
+#: builtin/rebase.c:484
+msgid "move commits that begin with squash!/fixup!"
+msgstr "squash!/fixup! ile baลŸlayan gรถnderileri taลŸฤฑ"
+
+#: builtin/rebase.c:485
+msgid "sign commits"
+msgstr "gรถnderileri imzala"
+
+#: builtin/rebase.c:487 builtin/rebase.c:1490
+msgid "display a diffstat of what changed upstream"
+msgstr "รผstkaynakta nelerin deฤŸiลŸtiฤŸini gรถsteren bir diffstat gรถrรผntรผle"
+
+#: builtin/rebase.c:489
+msgid "continue rebase"
+msgstr "yeniden temellendirmeyi sรผrdรผr"
+
+#: builtin/rebase.c:491
+msgid "skip commit"
+msgstr "gรถnderiyi atla"
+
+#: builtin/rebase.c:492
+msgid "edit the todo list"
+msgstr "yapฤฑlacaklar listesini dรผzenle"
+
+#: builtin/rebase.c:494
+msgid "show the current patch"
+msgstr "geรงerli yamayฤฑ gรถster"
+
+#: builtin/rebase.c:497
+msgid "shorten commit ids in the todo list"
+msgstr "yapฤฑlacaklar listesindeki gรถnderi numaralarฤฑnฤฑ kฤฑsalt"
+
+#: builtin/rebase.c:499
+msgid "expand commit ids in the todo list"
+msgstr "yapฤฑlacaklar listesindeki gรถnderi numaralarฤฑnฤฑ geniลŸlet"
+
+#: builtin/rebase.c:501
+msgid "check the todo list"
+msgstr "yapฤฑlacaklar listesini denetle"
+
+#: builtin/rebase.c:503
+msgid "rearrange fixup/squash lines"
+msgstr "fixup/squash satฤฑrlarฤฑnฤฑ yeniden dรผzenle"
+
+#: builtin/rebase.c:505
+msgid "insert exec commands in todo list"
+msgstr "yapฤฑlacaklar listesine 'exec' komutlarฤฑ ekle"
+
+#: builtin/rebase.c:506
+msgid "onto"
+msgstr "รผzerine"
+
+#: builtin/rebase.c:509
+msgid "restrict-revision"
+msgstr "restrict-revision"
+
+#: builtin/rebase.c:509
+msgid "restrict revision"
+msgstr "revizyonu sฤฑnฤฑrla"
+
+#: builtin/rebase.c:511
+msgid "squash-onto"
+msgstr "squash-onto"
+
+#: builtin/rebase.c:512
+msgid "squash onto"
+msgstr "tฤฑkฤฑลŸtฤฑr"
+
+#: builtin/rebase.c:514
+msgid "the upstream commit"
+msgstr "รผstkaynak gรถnderisi"
+
+#: builtin/rebase.c:516
+msgid "head-name"
+msgstr "head-name"
+
+#: builtin/rebase.c:516
+msgid "head name"
+msgstr "dal ucu adฤฑ"
+
+#: builtin/rebase.c:521
+msgid "rebase strategy"
+msgstr "yeniden temellendirme stratejisi"
+
+#: builtin/rebase.c:522
+msgid "strategy-opts"
+msgstr "strategy-opts"
+
+#: builtin/rebase.c:523
+msgid "strategy options"
+msgstr "strateji seรงenekleri"
+
+#: builtin/rebase.c:524
+msgid "switch-to"
+msgstr "switch-to"
+
+#: builtin/rebase.c:525
+msgid "the branch or commit to checkout"
+msgstr "รงฤฑkฤฑลŸ yapฤฑlacak dal veya gรถnderi"
+
+#: builtin/rebase.c:526
+msgid "onto-name"
+msgstr "onto-name"
+
+#: builtin/rebase.c:526
+msgid "onto name"
+msgstr "'onto' adฤฑ:"
+
+#: builtin/rebase.c:527
+msgid "cmd"
+msgstr "komut"
+
+#: builtin/rebase.c:527
+msgid "the command to run"
+msgstr "รงalฤฑลŸtฤฑrฤฑlacak komut"
+
+#: builtin/rebase.c:530 builtin/rebase.c:1584
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "baลŸarฤฑsฤฑz olan her 'exec'i kendiliฤŸinden yeniden zamanla"
+
+#: builtin/rebase.c:546
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+"--[no-]rebase-cousins seรงeneฤŸinin --rebase-merges olmadan hiรงbir etkisi yok"
+
+#: builtin/rebase.c:562
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr "%s bir etkileลŸimli yeniden temellendirme gerektiriyor"
+
+#: builtin/rebase.c:612
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "'onto' alฤฑnamadฤฑ: '%s'"
+
+#: builtin/rebase.c:627
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "geรงersiz orig-head: '%s'"
+
+#: builtin/rebase.c:652
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr "geรงersiz allow_rerere_autoupdate yok sayฤฑlฤฑyor: '%s'"
+
+#: builtin/rebase.c:728
+#, c-format
+msgid "Could not read '%s'"
+msgstr "'%s' okunamadฤฑ"
+
+#: builtin/rebase.c:746
+#, c-format
+msgid "Cannot store %s"
+msgstr "%s depolanamฤฑyor"
+
+#: builtin/rebase.c:853
+msgid "could not determine HEAD revision"
+msgstr "HEAD revizyonu saptanamadฤฑ"
+
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+"Tรผm รงakฤฑลŸmalarฤฑ el ile รงรถzรผn, onlarฤฑ \"git add/rm <รงakฤฑลŸan-dosyalar>\"\n"
+"ile tamam olarak imleyin, ardฤฑndan \"git rebase --continue\" รงalฤฑลŸtฤฑrฤฑn.\n"
+"Bunun yerine bu gรถnderiyi atlayabilirsiniz: \"git rebase --skip\" yapฤฑn.\n"
+"ฤฐptal edip \"git rebase\" รถncesine geri dรถnmek iรงin \"git rebase --abort\"\n"
+"รงalฤฑลŸtฤฑrฤฑn."
+
+#: builtin/rebase.c:1058
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"Git, yamalarฤฑ bu revizyonlarฤฑ yeniden oynatmak iรงin hazฤฑrlarken bir\n"
+"hatayla karลŸฤฑlaลŸtฤฑ:\n"
+"\n"
+"\t%s\n"
+"\n"
+"Bunun sonucu olarak git onlarฤฑ yeniden temellendiremiyor."
+
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"tanฤฑmlanamayan boลŸ tรผr '%s'; geรงerli tรผrler: \"drop\", \"keep\" ve \"ask\""
+
+#: builtin/rebase.c:1401
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+msgstr ""
+"%s\n"
+"Lรผtfen hangi dala karลŸฤฑ yeniden temellendirmek istediฤŸinizi belirtin.\n"
+"Ayrฤฑntฤฑlar iรงin: git-rebase(1)\n"
+"\n"
+"\tgit rebase '<dal>'\n"
+"\n"
+
+#: builtin/rebase.c:1417
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+"EฤŸer bu dal iรงin izleme bilgisi ayarlamak istiyorsanฤฑz ลŸunu kullanฤฑn:\n"
+"\n"
+"\tgit branch --set-upstream-to=%s/<dal> %s\n"
+"\n"
+
+#: builtin/rebase.c:1447
+msgid "exec commands cannot contain newlines"
+msgstr "'exec' komutlarฤฑ yenisatฤฑrlar iรงeremez"
+
+#: builtin/rebase.c:1451
+msgid "empty exec command"
+msgstr "boลŸ 'exec' komutu"
+
+#: builtin/rebase.c:1481
+msgid "rebase onto given branch instead of upstream"
+msgstr "รผstkaynak yerine verilen dalฤฑn รผzerine yeniden temellendir"
+
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "รผstkaynaฤŸฤฑn birleลŸtirme temelini ve dalฤฑnฤฑ geรงerli temel olarak kullan"
+
+#: builtin/rebase.c:1485
+msgid "allow pre-rebase hook to run"
+msgstr "pre-rebase kancasฤฑnฤฑn รงalฤฑลŸmasฤฑna izin ver"
+
+#: builtin/rebase.c:1487
+msgid "be quiet. implies --no-stat"
+msgstr "sessiz ol (--no-stat ima eder)"
+
+#: builtin/rebase.c:1493
+msgid "do not show diffstat of what changed upstream"
+msgstr "รผstkaynakta nelerin deฤŸiลŸtiฤŸini gรถsteren diffstat gรถsterme"
+
+#: builtin/rebase.c:1496
+msgid "add a Signed-off-by: line to each commit"
+msgstr "her gรถnderiye bir Signed-off-by satฤฑrฤฑ ekle"
+
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+msgid "passed to 'git am'"
+msgstr "'git am'a aktarฤฑldฤฑ"
+
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
+msgid "passed to 'git apply'"
+msgstr "'git apply'a aktarฤฑldฤฑ"
+
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "deฤŸiลŸtirilmemiลŸ olsa bile tรผm gรถnderileri seรง-al yap"
+
+#: builtin/rebase.c:1515
+msgid "continue"
+msgstr "sรผrdรผr"
+
+#: builtin/rebase.c:1518
+msgid "skip current patch and continue"
+msgstr "geรงerli yamayฤฑ atla ve sรผrdรผr"
+
+#: builtin/rebase.c:1520
+msgid "abort and check out the original branch"
+msgstr "iptal et ve orijinal dalฤฑ รงฤฑkฤฑลŸ yap"
+
+#: builtin/rebase.c:1523
+msgid "abort but keep HEAD where it is"
+msgstr "iptal et, ancak HEAD'i olduฤŸu yerde bฤฑrak"
+
+#: builtin/rebase.c:1524
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+"bir etkileลŸimli yeniden temellendirme sฤฑrasฤฑnda yapฤฑlacaklar listesini "
+"dรผzenle"
+
+#: builtin/rebase.c:1527
+msgid "show the patch file being applied or merged"
+msgstr "yama dosyasฤฑ uygulanฤฑrken veya birleลŸtirilirken gรถster"
+
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "yeniden temellendirmek iรงin \"apply\" stratejilerini kullan"
+
+#: builtin/rebase.c:1534
+msgid "use merging strategies to rebase"
+msgstr "yeniden temellendirmek iรงin birleลŸtirme stratejilerini kullan"
+
+#: builtin/rebase.c:1538
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+"yeniden temellendirilecek gรถnderilerin listesini kullanฤฑcฤฑnฤฑn dรผzenlemesine "
+"izin ver"
+
+#: builtin/rebase.c:1542
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
+"(KULLANIM DIลžI) birleลŸtirmeleri yok saymak yerine onlarฤฑ yeniden oluลŸturmaya "
+"รงalฤฑลŸ"
+
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "boลŸalan gรถnderiler nasฤฑl iลŸlensin"
+
+#: builtin/rebase.c:1554
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr "-i altฤฑndaki squash!/fixup! ile baลŸlayan gรถnderileri taลŸฤฑ"
+
+#: builtin/rebase.c:1560
+msgid "automatically stash/stash pop before and after"
+msgstr "รถncesinde ve sonrasฤฑnda kendiliฤŸinden zulala/zulalarฤฑ patlat"
+
+#: builtin/rebase.c:1562
+msgid "add exec lines after each commit of the editable list"
+msgstr "dรผzenlenebilir listenin her gรถnderisinden sonra exec satฤฑrlarฤฑ ekle"
+
+#: builtin/rebase.c:1566
+msgid "allow rebasing commits with empty messages"
+msgstr "boลŸ iletili gรถnderilerin yeniden temellendirilmesine izin ver"
+
+#: builtin/rebase.c:1570
+msgid "try to rebase merges instead of skipping them"
+msgstr "birleลŸtirmeleri atlamak yerine onlarฤฑ yeniden temellendirmeyi dene"
+
+#: builtin/rebase.c:1573
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "รผstkaynaฤŸฤฑ arฤฑlaลŸtฤฑrmak iรงin 'merge-base --fork-point' kullan"
+
+#: builtin/rebase.c:1575
+msgid "use the given merge strategy"
+msgstr "verilen birleลŸtirme stratejisini kullan"
+
+#: builtin/rebase.c:1577 builtin/revert.c:115
+msgid "option"
+msgstr "seรงenek"
+
+#: builtin/rebase.c:1578
+msgid "pass the argument through to the merge strategy"
+msgstr "deฤŸiลŸkeni birleลŸtirme stratejisine aktar"
+
+#: builtin/rebase.c:1581
+msgid "rebase all reachable commits up to the root(s)"
+msgstr "ulaลŸฤฑlabilir tรผm gรถnderileri kรถk(ler)e kadar yeniden temellendir"
+
+#: builtin/rebase.c:1598
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"'rebase.useBuiltin' desteฤŸi kaldฤฑrฤฑldฤฑ!\n"
+"Ayrฤฑntฤฑlar iรงin 'git help config' iรงindeki girdisine bakฤฑn."
+
+#: builtin/rebase.c:1604
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "GรถrรผnรผลŸe gรถre 'git am' sรผrmekte. Yeniden temellendirilemiyor."
+
+#: builtin/rebase.c:1645
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+"'git rebase --preserve-merges' kullanฤฑm dฤฑลŸฤฑ. Yerine --rebase-merges "
+"kullanฤฑn."
+
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "--keep-base ile --onto birlikte kullanฤฑlamaz"
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "--keep-base ile --root birlikte kullanฤฑlamaz"
+
+#: builtin/rebase.c:1656
+msgid "No rebase in progress?"
+msgstr "Sรผren bir yeniden temellendirme yok?"
+
+#: builtin/rebase.c:1660
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+"--edit-todo seรงeneฤŸi yalnฤฑzca etkileลŸimli yeniden temellendirme sฤฑrasฤฑnda "
+"kullanฤฑlabilir."
+
+#: builtin/rebase.c:1683
+msgid "Cannot read HEAD"
+msgstr "HEAD okunamฤฑyor"
+
+#: builtin/rebase.c:1695
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"ร–nce tรผm birleลŸtirme รงakฤฑลŸmalarฤฑnฤฑ dรผzenlemeli ve onlarฤฑ\n"
+"git add kullanarak tamamlandฤฑ olarak imlemelisiniz."
+
+#: builtin/rebase.c:1714
+msgid "could not discard worktree changes"
+msgstr "รงalฤฑลŸma aฤŸacฤฑ deฤŸiลŸiklikleri atฤฑlamadฤฑ"
+
+#: builtin/rebase.c:1733
+#, c-format
+msgid "could not move back to %s"
+msgstr "%s konumuna geri taลŸฤฑnamadฤฑ"
+
+#: builtin/rebase.c:1778
+#, c-format
+msgid ""
+"It seems that there is already a %s directory, and\n"
+"I wonder if you are in the middle of another rebase.  If that is the\n"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+"GรถrรผnรผลŸe bakฤฑlฤฑrsa bir %s dizini zaten var ve merak\n"
+"ediyorum acaba siz baลŸka bir yeniden temellendirmenin ortasฤฑnda mฤฑsฤฑnฤฑz?\n"
+"Durum buysa lรผtfen ลŸunu deneyin:\n"
+"\t%s\n"
+"EฤŸer baลŸka bir ลŸeyse, lรผtfen\n"
+"\t%s\n"
+"yapฤฑn ve beni yeniden รงalฤฑลŸtฤฑrฤฑn. Ben sizi belki orada hรขlรข deฤŸerli bir\n"
+"ลŸeyler olabilir diye durdurdum.\n"
+
+#: builtin/rebase.c:1806
+msgid "switch `C' expects a numerical value"
+msgstr "'C' anahtarฤฑ sayฤฑsal bir deฤŸer bekliyor"
+
+#: builtin/rebase.c:1847
+#, c-format
+msgid "Unknown mode: %s"
+msgstr "Bilinmeyen kip: %s"
+
+#: builtin/rebase.c:1869
+msgid "--strategy requires --merge or --interactive"
+msgstr "--strategy, --merge veya --interactive gerektiriyor"
+
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr "\"apply\" seรงenekleri \"merge\" seรงenekleriyle birlikte kullanฤฑlamฤฑyor"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s"
+
+#: builtin/rebase.c:1937
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor"
+
+#: builtin/rebase.c:1957
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "--preserve-merges ile --rebase-merges birlikte kullanฤฑlamฤฑyor"
+
+#: builtin/rebase.c:1961
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+"hata: --preserve-merges ile --reschedule-failed-exec birlikte kullanฤฑlamฤฑyor"
+
+#: builtin/rebase.c:1985
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "geรงersiz รผstkaynak '%s'"
+
+#: builtin/rebase.c:1991
+msgid "Could not create new root commit"
+msgstr "Yeni kรถk gรถnderi oluลŸturulamadฤฑ"
+
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s': tam olarak dallฤฑ bir birleลŸtirme temeli gerekli"
+
+#: builtin/rebase.c:2020
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "'%s': tam olarak bir birleลŸtirme temeli gerekiyor"
+
+#: builtin/rebase.c:2028
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "'%s' geรงerli bir gรถnderiye iลŸaret etmiyor"
+
+#: builtin/rebase.c:2054
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "onulmaz: bรถyle bir dal/gรถnderi yok: '%s'"
+
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
+#, c-format
+msgid "No such ref: %s"
+msgstr "Bรถyle bir baลŸvuru yok: %s"
+
+#: builtin/rebase.c:2073
+msgid "Could not resolve HEAD to a revision"
+msgstr "HEAD bir revizyona รงรถzรผlemedi"
+
+#: builtin/rebase.c:2111
+msgid "Cannot autostash"
+msgstr "KendiliฤŸinden zulalanamฤฑyor"
+
+#: builtin/rebase.c:2114
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Beklenmedik zula yanฤฑtฤฑ: '%s'"
+
+#: builtin/rebase.c:2120
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "'%s' iรงin dizin oluลŸturulamadฤฑ"
+
+#: builtin/rebase.c:2123
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Zula kendiliฤŸinden oluลŸturuldu: %s\n"
+
+#: builtin/rebase.c:2126
+msgid "could not reset --hard"
+msgstr "'reset --hard' yapฤฑlamadฤฑ"
+
+#: builtin/rebase.c:2135
+msgid "Please commit or stash them."
+msgstr "Lรผtfen onlarฤฑ gรถnderin veya zulalayฤฑn."
+
+#: builtin/rebase.c:2169
+#, c-format
+msgid "could not switch to %s"
+msgstr "ลŸuraya geรงilemedi: %s"
+
+#: builtin/rebase.c:2180
+msgid "HEAD is up to date."
+msgstr "HEAD gรผncel."
+
+#: builtin/rebase.c:2182
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "Geรงerli dal %s gรผncel.\n"
+
+#: builtin/rebase.c:2190
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD gรผncel, yeniden temellendirme zorlandฤฑ."
+
+#: builtin/rebase.c:2192
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr "Geรงerli dal %s gรผncel, yeniden temellendirme zorlandฤฑ.\n"
+
+#: builtin/rebase.c:2200
+msgid "The pre-rebase hook refused to rebase."
+msgstr "'pre-rebase' kancasฤฑ yeniden temellendirmeyi reddetti."
+
+#: builtin/rebase.c:2207
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "%s iรงin olan deฤŸiลŸiklikler:\n"
+
+#: builtin/rebase.c:2210
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "%s -> %s deฤŸiลŸiklikleri:\n"
+
+#: builtin/rebase.c:2235
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+"ร–ncelikle dal ucu รผzerindeki รงalฤฑลŸmanฤฑzฤฑ yeniden oynatmak iรงin geri "
+"sarฤฑlฤฑyor...\n"
+
+#: builtin/rebase.c:2244
+msgid "Could not detach HEAD"
+msgstr "HEAD ayrฤฑlamadฤฑ"
+
+#: builtin/rebase.c:2253
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "%s, %s konumuna ileri sarฤฑldฤฑ.\n"
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dizini>"
+
+#: builtin/receive-pack.c:821
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+"ร–ntanฤฑmlฤฑ olarak, รงฤฑplak olmayan bir depodaki geรงerli dalฤฑ gรผncelleme\n"
+"reddedilir, รงรผnkรผ bu indeksi ve รงalฤฑลŸma aฤŸacฤฑnฤฑ ittiฤŸinizle tutarsฤฑz\n"
+"duruma getirir ve รงalฤฑลŸma aฤŸacฤฑnฤฑ HEAD ile eลŸleลŸtirmek iรงin\n"
+"'git reset --hard' gerektirir.\n"
+"Geรงerli dalฤฑna itmeye izin vermek iรงin uzak depodaki 'receive."
+"denyCurrentBranch'\n"
+"yapฤฑlandฤฑrma deฤŸiลŸkenini 'ignore' veya 'warn' olarak ayarlayabilirsiniz,\n"
+"ancak bu onun รงalฤฑลŸma aฤŸacฤฑnฤฑ ittiฤŸinizle eลŸleลŸtirecek bir yol bulmadฤฑฤŸฤฑnฤฑz\n"
+"sรผrece รถnerilmez.\n"
+"Bu iletiyi susturup รถntanฤฑmlฤฑ davranฤฑลŸฤฑ tutmak iรงin 'receive."
+"denyCurrentBranch'\n"
+"yapฤฑlandฤฑrma deฤŸiลŸkenini 'refuse' olarak ayarlayฤฑn."
+
+#: builtin/receive-pack.c:841
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+"ร–ntanฤฑmlฤฑ olarak, geรงerli dalฤฑ silme reddedilir, รงรผnkรผ bir sonraki 'git "
+"clone'\n"
+"hiรงbir dosyanฤฑn รงฤฑkฤฑลŸ yapฤฑlamamasฤฑna neden olup karmaลŸa doฤŸurur.\n"
+"\n"
+"Geรงerli dalฤฑn bir uyarฤฑ iletisiyle veya ileti olmadan silinebilmesine izin\n"
+"vermek iรงin uzak depodaki 'receive.denyDeleteCurrent' yapฤฑlandฤฑrma\n"
+"deฤŸiลŸkenini 'warn' veya 'ignore' olarak ayarlayabilirsiniz.\n"
+"Bu iletiyi susturmak iรงin onu 'refuse' olarak ayarlayฤฑn."
+
+#: builtin/receive-pack.c:1938
+msgid "quiet"
+msgstr "sessiz"
+
+#: builtin/receive-pack.c:1952
+msgid "You must specify a directory."
+msgstr "Bir dizin belirtmelisiniz."
+
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<zaman>] [--expire-unreachable=<zaman>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<baลŸvurular>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<baลŸvurular>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <baลŸvuru>"
+
+#: builtin/reflog.c:568 builtin/reflog.c:573
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' geรงerli bir zaman damgasฤฑ deฤŸil"
+
+#: builtin/reflog.c:606
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "UlaลŸฤฑlabilir nesneler imleniyor..."
+
+#: builtin/reflog.c:644
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s hiรงbir yere iลŸaret etmiyor!"
+
+#: builtin/reflog.c:696
+msgid "no reflog specified to delete"
+msgstr "silmek iรงin bir baลŸvuru gรผnlรผฤŸรผ belirtilmedi"
+
+#: builtin/reflog.c:705
+#, c-format
+msgid "not a reflog: %s"
+msgstr "bir baลŸvuru gรผnlรผฤŸรผ deฤŸil: %s"
+
+#: builtin/reflog.c:710
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "'%s' iรงin baลŸvuru gรผnlรผฤŸรผ yok"
+
+#: builtin/reflog.c:756
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "geรงersiz baลŸvuru biรงimi: %s"
+
+#: builtin/reflog.c:765
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
+#: builtin/remote.c:17
+msgid "git remote [-v | --verbose]"
+msgstr "git remote [-v | --verbose]"
+
+#: builtin/remote.c:18
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <dal>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<getir|it>] <ad> <url>"
+
+#: builtin/remote.c:19 builtin/remote.c:39
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <eski> <yeni>"
+
+#: builtin/remote.c:20 builtin/remote.c:44
+msgid "git remote remove <name>"
+msgstr "git remote remove <ad>"
+
+#: builtin/remote.c:21 builtin/remote.c:49
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <ad> (-a | --auto | -d | --delete | <dal>)"
+
+#: builtin/remote.c:22
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <ad>"
+
+#: builtin/remote.c:23
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <ad>"
+
+#: builtin/remote.c:24
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <uzak-k>)...]"
+
+#: builtin/remote.c:25
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <ad> <dal>..."
+
+#: builtin/remote.c:26 builtin/remote.c:75
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <ad>"
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <ad> <yeni-url> [<eski-url>]"
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <ad> <yeni-url>"
+
+#: builtin/remote.c:29 builtin/remote.c:82
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <ad> <url>"
+
+#: builtin/remote.c:34
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<seรงenekler>] <ad> <url>"
+
+#: builtin/remote.c:54
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <ad> <dal>..."
+
+#: builtin/remote.c:55
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <ad> <dal>..."
+
+#: builtin/remote.c:60
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<seรงenekler>] <ad>"
+
+#: builtin/remote.c:65
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<seรงenekler>] <ad>"
+
+#: builtin/remote.c:70
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<seรงenekler>] [<grup> | <uzak-konum>]..."
+
+#: builtin/remote.c:99
+#, c-format
+msgid "Updating %s"
+msgstr "%s gรผncelleniyor"
+
+#: builtin/remote.c:131
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror tehlikeli ve artฤฑk kullanฤฑm dฤฑลŸฤฑ; lรผtfen\n"
+"\t yerine --mirror-fetch veya --mirror=push kullanฤฑn."
+
+#: builtin/remote.c:148
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "bilinmeyen mirror deฤŸiลŸkeni: %s"
+
+#: builtin/remote.c:164
+msgid "fetch the remote branches"
+msgstr "uzak konum dallarฤฑnฤฑ getir"
+
+#: builtin/remote.c:166
+msgid "import all tags and associated objects when fetching"
+msgstr "getirirken tรผm etiketleri ve iliลŸkili nesneleri iรงe aktar"
+
+#: builtin/remote.c:169
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "veya hiรงbir etiketi getirme (--no-tags)"
+
+#: builtin/remote.c:171
+msgid "branch(es) to track"
+msgstr "izlenecek dal(lar)"
+
+#: builtin/remote.c:172
+msgid "master branch"
+msgstr "ana dal"
+
+#: builtin/remote.c:174
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+"uzak konum deposunu ona itilecek veya ondan getirilecek bir yansฤฑ olarak "
+"ayarla"
+
+#: builtin/remote.c:186
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "--mirror ile bir ana dal belirtmek anlam ifade etmiyor"
+
+#: builtin/remote.c:188
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+"izlemek iรงin dallar belirtmek yalnฤฑzca getirme yansฤฑlarฤฑyla anlamifade ediyor"
+
+#: builtin/remote.c:195 builtin/remote.c:696
+#, c-format
+msgid "remote %s already exists."
+msgstr "%s uzak konumu halihazฤฑrda var."
+
+#: builtin/remote.c:199 builtin/remote.c:700
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' geรงerli bir uzak konum adฤฑ deฤŸil"
+
+#: builtin/remote.c:239
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "'%s' ana dalฤฑ ayarlanamadฤฑ"
+
+#: builtin/remote.c:354
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "%s baลŸvuru belirteci iรงin getirme haritasฤฑ alฤฑnamadฤฑ"
+
+#: builtin/remote.c:453 builtin/remote.c:461
+msgid "(matching)"
+msgstr "(eลŸleลŸiyor)"
+
+#: builtin/remote.c:465
+msgid "(delete)"
+msgstr "(sil)"
+
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "'%s' ayarlanamadฤฑ"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"ลžuradaki %s yapฤฑlandฤฑrmasฤฑ remote.pushDefault:\n"
+"\t%s:%d\n"
+"artฤฑk var olmayan '%s' uzak konumunu adlandฤฑrฤฑyor."
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "Bรถyle bir uzak konum yok: '%s'"
+
+#: builtin/remote.c:706
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "'%s' yapฤฑlandฤฑrma bรถlรผmรผ '%s' olarak yeniden adlandฤฑrฤฑlamadฤฑ"
+
+#: builtin/remote.c:726
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"ร–ntanฤฑmlฤฑ olmayan getirme baลŸvuru belirteci gรผncellenmiyor.\n"
+"\t%s\n"
+"\tLรผtfen gerekirse yapฤฑlandฤฑrmayฤฑ el ile gรผncelleyin."
+
+#: builtin/remote.c:766
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "'%s' silinmesi baลŸarฤฑsฤฑz"
+
+#: builtin/remote.c:800
+#, c-format
+msgid "creating '%s' failed"
+msgstr "'%s' oluลŸturulmasฤฑ baลŸarฤฑsฤฑz"
+
+#: builtin/remote.c:876
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+"Not: refs/remotes hiyerarลŸisi dฤฑลŸฤฑndaki bir dal kaldฤฑrฤฑlmadฤฑ;\n"
+"onu silmek iรงin ลŸunu kullanฤฑn:"
+msgstr[1] ""
+"Not: refs/remotes hiyerarลŸisi dฤฑลŸฤฑndaki bazฤฑ dallar kaldฤฑrฤฑlmadฤฑ;\n"
+"onlarฤฑ silmek iรงin ลŸunu kullanฤฑn:"
+
+#: builtin/remote.c:890
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "'%s' yapฤฑlandฤฑrsa bรถlรผmรผ kaldฤฑrฤฑlamadฤฑ"
+
+#: builtin/remote.c:993
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s"
+
+#: builtin/remote.c:996
+msgid " tracked"
+msgstr " izlendi"
+
+#: builtin/remote.c:998
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " eskimiลŸ (kaldฤฑrmak iรงin 'git remote prune' kullanฤฑn)"
+
+#: builtin/remote.c:1000
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:1041
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "geรงersiz branch.%s.merge; birden รงok dala yeniden temellendirilemiyor"
+
+#: builtin/remote.c:1050
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "%s uzak konumuna etkileลŸimli olarak yeniden temellendirir"
+
+#: builtin/remote.c:1052
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr ""
+"%s uzak konumuna etkileลŸimli olarak (birleลŸtirmelerle birlikte) yeniden "
+"temellendirir"
+
+#: builtin/remote.c:1055
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "%s uzak konumuna yeniden temellendirir"
+
+#: builtin/remote.c:1059
+#, c-format
+msgid " merges with remote %s"
+msgstr " %s uzak konumu ile birleลŸtirir"
+
+#: builtin/remote.c:1062
+#, c-format
+msgid "merges with remote %s"
+msgstr "%s uzak konumu ile birleลŸtirir"
+
+#: builtin/remote.c:1065
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr "%-*s    ve %s uzak konumu ile birlikte\n"
+
+#: builtin/remote.c:1108
+msgid "create"
+msgstr "oluลŸtur"
+
+#: builtin/remote.c:1111
+msgid "delete"
+msgstr "sil"
+
+#: builtin/remote.c:1115
+msgid "up to date"
+msgstr "gรผncel"
+
+#: builtin/remote.c:1118
+msgid "fast-forwardable"
+msgstr "ileri sarฤฑlabilir"
+
+#: builtin/remote.c:1121
+msgid "local out of date"
+msgstr "yerelin tarihi geรงmiลŸ"
+
+#: builtin/remote.c:1128
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr "    %-*s ลŸuna zorluyor: %-*s (%s)"
+
+#: builtin/remote.c:1131
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr "    %-*s ลŸuna itiyor: %-*s (%s)"
+
+#: builtin/remote.c:1135
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr "    %-*s ลŸuna zorluyor: %s"
+
+#: builtin/remote.c:1138
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr "    %-*s ลŸuna itiyor: %s"
+
+#: builtin/remote.c:1206
+msgid "do not query remotes"
+msgstr "uzak konumlarฤฑ sorgulama"
+
+#: builtin/remote.c:1233
+#, c-format
+msgid "* remote %s"
+msgstr "* uzak konum %s"
+
+#: builtin/remote.c:1234
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr "  URL'yi getir: %s"
+
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+msgid "(no URL)"
+msgstr "(URL yok)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1249 builtin/remote.c:1251
+#, c-format
+msgid "  Push  URL: %s"
+msgstr "     URL'yi it: %s"
+
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr "     HEAD dalฤฑ: %s"
+
+#: builtin/remote.c:1253
+msgid "(not queried)"
+msgstr "(sorgulanmadฤฑ"
+
+#: builtin/remote.c:1255
+msgid "(unknown)"
+msgstr "(bilinmiyor)"
+
+#: builtin/remote.c:1259
+#, c-format
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+"  HEAD dalฤฑ (uzak konum HEAD'i belirsiz, aลŸaฤŸฤฑdakilerden biri olabilir):\n"
+
+#: builtin/remote.c:1271
+#, c-format
+msgid "  Remote branch:%s"
+msgid_plural "  Remote branches:%s"
+msgstr[0] "  Uzak dal:%s"
+msgstr[1] "  Uzak dallar:%s"
+
+#: builtin/remote.c:1274 builtin/remote.c:1300
+msgid " (status not queried)"
+msgstr " (durum sorgulanmadฤฑ)"
+
+#: builtin/remote.c:1283
+msgid "  Local branch configured for 'git pull':"
+msgid_plural "  Local branches configured for 'git pull':"
+msgstr[0] "  'git pull' iรงin yapฤฑlandฤฑrฤฑlan yerel dal:"
+msgstr[1] "  'git pull' iรงin yapฤฑlandฤฑrฤฑlan yerel dallar:"
+
+#: builtin/remote.c:1291
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr "  Yerel baลŸvurular 'git pull' tarafฤฑndan yansฤฑlanacak"
+
+#: builtin/remote.c:1297
+#, c-format
+msgid "  Local ref configured for 'git push'%s:"
+msgid_plural "  Local refs configured for 'git push'%s:"
+msgstr[0] "  'git push'%s iรงin yapฤฑlandฤฑrฤฑlan yerel baลŸvuru:"
+msgstr[1] "  'git push'%s iรงin yapฤฑlandฤฑrฤฑlan yerel baลŸvurular:"
+
+#: builtin/remote.c:1318
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "refs/remotes/<ad>/HEAD'i uzak konuma gรถre ayarla"
+
+#: builtin/remote.c:1320
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "refs/remotes/<ad>/HEAD'i sil"
+
+#: builtin/remote.c:1335
+msgid "Cannot determine remote HEAD"
+msgstr "Uzak konum HEAD'i belirlenemiyor"
+
+#: builtin/remote.c:1337
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "Birden รงok uzak konum HEAD dalฤฑ. Lรผtfen birini aรงฤฑkรงa seรงin:"
+
+#: builtin/remote.c:1347
+#, c-format
+msgid "Could not delete %s"
+msgstr "%s silinemedi"
+
+#: builtin/remote.c:1355
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "Geรงerli bir baลŸvuru deฤŸil: %s"
+
+#: builtin/remote.c:1357
+#, c-format
+msgid "Could not setup %s"
+msgstr "%s ayarlanamadฤฑ"
+
+#: builtin/remote.c:1375
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s sarkacak!"
+
+#: builtin/remote.c:1376
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s sarkmaya baลŸladฤฑ!"
+
+#: builtin/remote.c:1386
+#, c-format
+msgid "Pruning %s"
+msgstr "%s budanฤฑyor"
+
+#: builtin/remote.c:1387
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: builtin/remote.c:1403
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * %s [budanacak]"
+
+#: builtin/remote.c:1406
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * %s [budandฤฑ]"
+
+#: builtin/remote.c:1451
+msgid "prune remotes after fetching"
+msgstr "getirme sonrasฤฑnda uzak konumlarฤฑ buda"
+
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#, c-format
+msgid "No such remote '%s'"
+msgstr "Bรถyle bir uzak konum yok '%s'"
+
+#: builtin/remote.c:1530
+msgid "add branch"
+msgstr "dal ekle"
+
+#: builtin/remote.c:1537
+msgid "no remote specified"
+msgstr "uzak konum belirtilmedi"
+
+#: builtin/remote.c:1554
+msgid "query push URLs rather than fetch URLs"
+msgstr "itme URL'lerinden รงok getirme URL'lerini sorgula"
+
+#: builtin/remote.c:1556
+msgid "return all URLs"
+msgstr "tรผm URL'leri dรถndรผr"
+
+#: builtin/remote.c:1584
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "'%s' uzak konumu iรงin URL yapฤฑlandฤฑrฤฑlmamฤฑลŸ"
+
+#: builtin/remote.c:1610
+msgid "manipulate push URLs"
+msgstr "itme URL'lerini deฤŸiลŸtir"
+
+#: builtin/remote.c:1612
+msgid "add URL"
+msgstr "URL ekle"
+
+#: builtin/remote.c:1614
+msgid "delete URLs"
+msgstr "URL'leri sil"
+
+#: builtin/remote.c:1621
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete bir anlam ifade etmiyor"
+
+#: builtin/remote.c:1660
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "Geรงersiz eski URL dizgisi: %s"
+
+#: builtin/remote.c:1668
+#, c-format
+msgid "No such URL found: %s"
+msgstr "Bรถyle bir URL bulunamadฤฑ: %s"
+
+#: builtin/remote.c:1670
+msgid "Will not delete all non-push URLs"
+msgstr "Tรผm itme olmayan URL'ler silinmeyecek"
+
+#: builtin/repack.c:23
+msgid "git repack [<options>]"
+msgstr "git repack [<seรงenekler>]"
+
+#: builtin/repack.c:28
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes.  Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+"Artan yeniden paketlemeler biteลŸlem indeksleri ile uyumsuzdur.\n"
+"--no-write-bitmap-index kullanฤฑn veya pack.writebitmaps yapฤฑlandฤฑrmasฤฑnฤฑ\n"
+"devre dฤฑลŸฤฑ bฤฑrakฤฑn."
+
+#: builtin/repack.c:191
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "vaatรงi nesneleri yeniden paketleme iรงin pack-objects baลŸlatฤฑlamadฤฑ"
+
+#: builtin/repack.c:230 builtin/repack.c:416
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Onaltฤฑlฤฑ tam nesne no satฤฑrlarฤฑ yalnฤฑzca pack-objects'ten bekleniyor."
+
+#: builtin/repack.c:254
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr "vaatรงi nesneleri yeniden paketleme iรงin pack-objects bitirilemedi"
+
+#: builtin/repack.c:292
+msgid "pack everything in a single pack"
+msgstr "her ลŸeyi tek bir pakete sฤฑฤŸdฤฑr"
+
+#: builtin/repack.c:294
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "-a ile aynฤฑ ve ulaลŸฤฑlamayan nesneleri serbest bฤฑrakฤฑr"
+
+#: builtin/repack.c:297
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "gereksiz paketleri kaldฤฑr ve 'git prune-packed' รงalฤฑลŸtฤฑr"
+
+#: builtin/repack.c:299
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "'git-pack-objects'e --no-reuse-delta geรงir"
+
+#: builtin/repack.c:301
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "'git-pack-objects'e --no-reuse-object geรงir"
+
+#: builtin/repack.c:303
+msgid "do not run git-update-server-info"
+msgstr "'git-update-server-info' รงalฤฑลŸtฤฑrma"
+
+#: builtin/repack.c:306
+msgid "pass --local to git-pack-objects"
+msgstr "--local'ฤฑ 'git-pack-objects'e geรงir"
+
+#: builtin/repack.c:308
+msgid "write bitmap index"
+msgstr "biteลŸlem indeksi yaz"
+
+#: builtin/repack.c:310
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "--delta-islands'ฤฑ 'git-pack-objects'e geรงir"
+
+#: builtin/repack.c:311
+msgid "approxidate"
+msgstr "yaklaลŸฤฑk tarih"
+
+#: builtin/repack.c:312
+msgid "with -A, do not loosen objects older than this"
+msgstr "-A ile, bundan daha eski nesneleri bฤฑrakma"
+
+#: builtin/repack.c:314
+msgid "with -a, repack unreachable objects"
+msgstr "-a ile, ulaลŸฤฑlamayan nesneleri yeniden paketle"
+
+#: builtin/repack.c:316
+msgid "size of the window used for delta compression"
+msgstr "delta sฤฑkฤฑลŸtฤฑrmasฤฑ iรงin kullanฤฑlan pencerenin boyutu"
+
+#: builtin/repack.c:317 builtin/repack.c:323
+msgid "bytes"
+msgstr "baytlar"
+
+#: builtin/repack.c:318
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "yukarฤฑdakiyle aynฤฑ, ancak girdi sayฤฑsฤฑ yerine bellek boyutunu kฤฑsฤฑtla"
+
+#: builtin/repack.c:320
+msgid "limits the maximum delta depth"
+msgstr "olabilecek en bรผyรผk delta derinliฤŸini kฤฑsฤฑtlar"
+
+#: builtin/repack.c:322
+msgid "limits the maximum number of threads"
+msgstr "iลŸ parรงacฤฑklarฤฑnฤฑn olabilecek en bรผyรผk sayฤฑsฤฑnฤฑ kฤฑsฤฑtlar"
+
+#: builtin/repack.c:324
+msgid "maximum size of each packfile"
+msgstr "her paket dosyasฤฑnฤฑn olabilecek en bรผyรผk boyutu"
+
+#: builtin/repack.c:326
+msgid "repack objects in packs marked with .keep"
+msgstr "nesneleri .keep ile imlenmiลŸ paketlerde yeniden paketle"
+
+#: builtin/repack.c:328
+msgid "do not repack this pack"
+msgstr "bu paketi yeniden paketleme"
+
+#: builtin/repack.c:338
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "bir precious-objects deposundaki paketler silinemiyor"
+
+#: builtin/repack.c:342
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable ve -A birbiriyle uyumsuz"
+
+#: builtin/repack.c:425
+msgid "Nothing new to pack."
+msgstr "Paketlenecek yeni bir ลŸey yok."
+
+#: builtin/repack.c:486
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file.  But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+"UYARI: Kullanฤฑlan bazฤฑ paketler, dosyanฤฑn yeni\n"
+"UYARI: sรผrรผmรผyle deฤŸiลŸtirilmek รผzere adlarฤฑnฤฑn\n"
+"UYARI: รถnรผne รถnek olarak old- koyularak yeniden\n"
+"UYARI: adlandฤฑrฤฑlmฤฑลŸtฤฑr. Ancak iลŸlem baลŸarฤฑsฤฑz\n"
+"UYARI: oldu ve bunlarฤฑ orijinal adlarฤฑna dรถndรผrme\n"
+"UYARI: giriลŸimi de baลŸarฤฑsฤฑz oldu.\n"
+"UYARI: Lรผtfen bunlarฤฑ %s iรงinde el ile yeniden adlandฤฑrฤฑn:\n"
+
+#: builtin/repack.c:534
+#, c-format
+msgid "failed to remove '%s'"
+msgstr "'%s' kaldฤฑrฤฑlamadฤฑ"
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <nesne> <deฤŸiลŸim>"
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <nesne>"
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <gรถnderi> [<รผst-รถge>...]"
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --convert-graft-file"
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr "git replace -d <nesne>..."
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<biรงim>] [-l [<dizgi>]]"
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"geรงersiz deฤŸiลŸtirme biรงimi '%s'\n"
+"geรงerli biรงimler: 'short' (kฤฑsa), 'medium' (orta) ve 'long' (uzun)"
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "deฤŸiลŸtirme baลŸvurusu '%s' bulunamadฤฑ"
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "DeฤŸiลŸtirme baลŸvurusu '%s' silindi"
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' geรงerli bir baลŸvuru adฤฑ deฤŸil"
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "deฤŸiลŸtirme baลŸvurusu '%s' halihazฤฑrda mevcut"
+
+#: builtin/replace.c:178
+#, c-format
+msgid ""
+"Objects must be of the same type.\n"
+"'%s' points to a replaced object of type '%s'\n"
+"while '%s' points to a replacement object of type '%s'."
+msgstr ""
+"Nesneler aynฤฑ tรผrden olmalฤฑdฤฑr.\n"
+"'%s', '%s' tรผrรผnden deฤŸiลŸtirilmiลŸ bir nesneye iลŸaret ederken\n"
+"'%s' ise yerine geรงecek '%s' tรผrรผnden bir nesneye iลŸaret ediyor."
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "%s yazma iรงin aรงฤฑlamฤฑyor"
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr "cat-file hata bildirdi"
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "%s okuma iรงin aรงฤฑlamฤฑyor"
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr "mktree ortaya รงฤฑkarฤฑlamฤฑyor"
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr "mktree'den okunamฤฑyor"
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr "mktree hata bildirdi"
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr "mktree bir nesne adฤฑ dรถndรผrmedi"
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr "%s 'fstat' yapฤฑlamฤฑyor"
+
+#: builtin/replace.c:303
+msgid "unable to write object to database"
+msgstr "nesne veritabanฤฑna yazฤฑlamฤฑyor"
+
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr "geรงerli bir nesne adฤฑ deฤŸil: '%s'"
+
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "%s iรงin nesne tรผrรผ alฤฑnamadฤฑ"
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr "nesne dosyasฤฑnฤฑ dรผzenleme baลŸarฤฑsฤฑz"
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "yeni nesne eskisiyle aynฤฑ: '%s'"
+
+#: builtin/replace.c:384
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "%s, bir gรถnderi olarak ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/replace.c:416
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "'%s' gรถnderisinde hatalฤฑ birleลŸtirme etiketi"
+
+#: builtin/replace.c:418
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "'%s' gรถnderisinde hatalฤฑ oluลŸturulmuลŸ birleลŸtirme etiketi"
+
+#: builtin/replace.c:430
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+"'%s' orijinal gรถnderisi atฤฑlmฤฑลŸ olan '%s' birleลŸtirme etiketini iรงeriyor; --"
+"graft yerine --edit kullanฤฑn"
+
+#: builtin/replace.c:469
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr "'%s' orijinal gรถnderisinin bir gpg imzasฤฑ var"
+
+#: builtin/replace.c:470
+msgid "the signature will be removed in the replacement commit!"
+msgstr "imza, yerine geรงecek gรถnderide kaldฤฑrฤฑlacak"
+
+#: builtin/replace.c:480
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "ลŸunun yerine geรงecek gรถnderi yazฤฑlamadฤฑ: '%s'"
+
+#: builtin/replace.c:488
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "'%s' iรงin aลŸฤฑ gereksiz"
+
+#: builtin/replace.c:492
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "yeni gรถnderi eskisiyle aynฤฑ: '%s'"
+
+#: builtin/replace.c:527
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"aลŸaฤŸฤฑdaki aลŸฤฑ(lar) dรถnรผลŸtรผrรผlemedi:\n"
+"%s"
+
+#: builtin/replace.c:548
+msgid "list replace refs"
+msgstr "deฤŸiลŸtirme baลŸvurularฤฑnฤฑ listele"
+
+#: builtin/replace.c:549
+msgid "delete replace refs"
+msgstr "deฤŸiลŸtirme baลŸvurularฤฑnฤฑ sil"
+
+#: builtin/replace.c:550
+msgid "edit existing object"
+msgstr "geรงerli nesneyi dรผzenle"
+
+#: builtin/replace.c:551
+msgid "change a commit's parents"
+msgstr "bir gรถnderinin รผst รถgelerini deฤŸiลŸtir"
+
+#: builtin/replace.c:552
+msgid "convert existing graft file"
+msgstr "mevcut aลŸฤฑ dosyasฤฑnฤฑ dรถnรผลŸtรผr"
+
+#: builtin/replace.c:553
+msgid "replace the ref if it exists"
+msgstr "baลŸvuru mevcutsa onu deฤŸiลŸtir"
+
+#: builtin/replace.c:555
+msgid "do not pretty-print contents for --edit"
+msgstr "--edit iรงeriฤŸini hoลŸ biรงimde gรถsterme"
+
+#: builtin/replace.c:556
+msgid "use this format"
+msgstr "bu biรงimi kullan"
+
+#: builtin/replace.c:569
+msgid "--format cannot be used when not listing"
+msgstr "--format, listelemiyorken kullanฤฑlamaz"
+
+#: builtin/replace.c:577
+msgid "-f only makes sense when writing a replacement"
+msgstr "-f yalnฤฑzca yerine geรงecek bir nesne yazฤฑlฤฑrken anlam ifade eder"
+
+#: builtin/replace.c:581
+msgid "--raw only makes sense with --edit"
+msgstr "--raw yalnฤฑzca --edit ile anlam ifade eder"
+
+#: builtin/replace.c:587
+msgid "-d needs at least one argument"
+msgstr "-d iรงin en azฤฑndan bir deฤŸiลŸken gerekli"
+
+#: builtin/replace.c:593
+msgid "bad number of arguments"
+msgstr "hatalฤฑ deฤŸiลŸken sayฤฑsฤฑ"
+
+#: builtin/replace.c:599
+msgid "-e needs exactly one argument"
+msgstr "-e iรงin tam olarak bir deฤŸiลŸken gerekli"
+
+#: builtin/replace.c:605
+msgid "-g needs at least one argument"
+msgstr "-g iรงin en azฤฑndan bir deฤŸiลŸken gerekli"
+
+#: builtin/replace.c:611
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file deฤŸiลŸken almaz"
+
+#: builtin/replace.c:617
+msgid "only one pattern can be given with -l"
+msgstr "-l ile yalnฤฑzca bir dizgi verilebilir"
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <yol>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
+msgstr "indeksteki temiz รงรถzรผmlerin kaydฤฑnฤฑ yap"
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "yol olmadan 'git rerere forget' kullanฤฑm dฤฑลŸฤฑ"
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "'%s' iรงin diff oluลŸturulamฤฑyor"
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<gรถnderi>]"
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<aฤŸacฤฑmsฤฑ>] [--] <yol-blrtรง>..."
+
+#: builtin/reset.c:34
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<aฤŸacฤฑmsฤฑ>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<aฤŸacฤฑmsฤฑ>] [--] [<yol-blrtรง>...]"
+
+#: builtin/reset.c:41
+msgid "mixed"
+msgstr "karฤฑลŸฤฑk"
+
+#: builtin/reset.c:41
+msgid "soft"
+msgstr "yumuลŸak"
+
+#: builtin/reset.c:41
+msgid "hard"
+msgstr "sert"
+
+#: builtin/reset.c:41
+msgid "merge"
+msgstr "birleลŸtir"
+
+#: builtin/reset.c:41
+msgid "keep"
+msgstr "tut"
+
+#: builtin/reset.c:82
+msgid "You do not have a valid HEAD."
+msgstr "Geรงerli bir HEAD'iniz yok."
+
+#: builtin/reset.c:84
+msgid "Failed to find tree of HEAD."
+msgstr "HEAD aฤŸacฤฑ bulunamadฤฑ."
+
+#: builtin/reset.c:90
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "%s aฤŸacฤฑ bulunamadฤฑ."
+
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ลŸimdi ลŸurada: %s"
+
+#: builtin/reset.c:194
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "Bir birleลŸtirmenin ortasฤฑnda %s sฤฑfฤฑrlamasฤฑ yapฤฑlamฤฑyor."
+
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
+msgid "be quiet, only report errors"
+msgstr "sessiz ol, yalnฤฑzca hatalarฤฑ bildir"
+
+#: builtin/reset.c:296
+msgid "reset HEAD and index"
+msgstr "HEAD'i ve indeksi sฤฑfฤฑrla"
+
+#: builtin/reset.c:297
+msgid "reset only HEAD"
+msgstr "yalnฤฑzca HEAD'i sฤฑfฤฑrla"
+
+#: builtin/reset.c:299 builtin/reset.c:301
+msgid "reset HEAD, index and working tree"
+msgstr "HEAD'i, indeksi ve รงalฤฑลŸma aฤŸacฤฑnฤฑ sฤฑfฤฑrla"
+
+#: builtin/reset.c:303
+msgid "reset HEAD but keep local changes"
+msgstr "HEAD'i sฤฑfฤฑrla, ancak yerel deฤŸiลŸiklikleri tut"
+
+#: builtin/reset.c:309
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+"yalnฤฑzca kaldฤฑrฤฑlan yollarฤฑn daha sonra ekleneceฤŸi gerรงeฤŸinin kaydฤฑnฤฑ yaz"
+
+#: builtin/reset.c:343
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "'%s' geรงerli bir revizyon olarak รงรถzรผlemedi."
+
+#: builtin/reset.c:351
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "'%s' geรงerli bir aฤŸaรง olarak รงรถzรผlemedi."
+
+#: builtin/reset.c:360
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch, --{hard,mixed,soft} ile uyumsuz"
+
+#: builtin/reset.c:370
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+"belirtilmiลŸ yol ile --mixed kullanฤฑm dฤฑลŸฤฑ; yerine 'git reset -- <yollar>' "
+"kullanฤฑn."
+
+#: builtin/reset.c:372
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "BelirtilmiลŸ yol varken %s sฤฑfฤฑrlamasฤฑ yapฤฑlamฤฑyor."
+
+#: builtin/reset.c:387
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "%s sฤฑfฤฑrlamasฤฑna รงฤฑplak bir depoda izin verilmiyor"
+
+#: builtin/reset.c:391
+msgid "-N can only be used with --mixed"
+msgstr "-N yalnฤฑzca --mixed ile birlikte kullanฤฑlabilir"
+
+#: builtin/reset.c:412
+msgid "Unstaged changes after reset:"
+msgstr "Sฤฑfฤฑrlama sonrasฤฑnda hazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikler:"
+
+#: builtin/reset.c:415
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset.  You can\n"
+"use '--quiet' to avoid this.  Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+"\n"
+"Sฤฑfฤฑrlama sonrasฤฑnda hazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikleri sayฤฑp dรถkme %.2f saniye\n"
+"sรผrdรผ. Bundan kaรงฤฑnmak iรงin --quiet kullanabilir, รถntanฤฑmlฤฑ yapmak iรงinse\n"
+"reset.quiet yapฤฑlandฤฑrma deฤŸiลŸkenini 'true' olarak deฤŸiลŸtirebilirsiniz.\n"
+
+#: builtin/reset.c:425
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "ฤฐndeks dosyasฤฑ '%s' revizyonuna sฤฑfฤฑrlanamadฤฑ."
+
+#: builtin/reset.c:429
+msgid "Could not write new index file."
+msgstr "Yeni indeks dosyasฤฑ yazฤฑlamadฤฑ."
+
+#: builtin/rev-list.c:499
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "--exclude-promisor-objects ve --missing birlikte kullanฤฑlamฤฑyor"
+
+#: builtin/rev-list.c:560
+msgid "object filtering requires --objects"
+msgstr "nesne sรผzme --objects gerektiriyor"
+
+#: builtin/rev-list.c:610
+msgid "rev-list does not support display of notes"
+msgstr "rev-list not gรถrรผntรผlemesini desteklemiyor"
+
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "imlenmiลŸ sayฤฑm, --objects ile uyumsuz"
+
+#: builtin/rev-parse.c:408
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<seรงenekler>] -- [<deฤŸiลŸkenler>...]"
+
+#: builtin/rev-parse.c:413
+msgid "keep the `--` passed as an arg"
+msgstr "'--'i geรงirilen bir deฤŸiลŸken olarak tut"
+
+#: builtin/rev-parse.c:415
+msgid "stop parsing after the first non-option argument"
+msgstr "seรงenek olmayan ilk deฤŸiลŸkenden sonra ayrฤฑลŸtฤฑrmayฤฑ durdur"
+
+#: builtin/rev-parse.c:418
+msgid "output in stuck long form"
+msgstr "uzun biรงimde รงฤฑktฤฑ ver"
+
+#: builtin/rev-parse.c:551
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+"   or: git rev-parse --sq-quote [<arg>...]\n"
+"   or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<seรงenekler>] -- [<deฤŸiลŸkenler>...]\n"
+"\tor: git rev-parse --sq-quote [<deฤŸiลŸkenler>...]\n"
+"\tor: git rev-parse [<seรงenekler>] [<deฤŸiลŸkenler>...]\n"
+"\n"
+"ฤฐlki hakkฤฑnda ek bilgi iรงin \"git rev-parse --parseopt -h\" รงalฤฑลŸtฤฑrฤฑn."
+
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<seรงenekler>] <gรถnderimsi>..."
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr "git revert <altkomut>"
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<seรงenekler>] <gรถnderimsi>..."
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <altkomut>"
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "'%s' seรงeneฤŸi sฤฑfฤฑrdan bรผyรผk bir sayฤฑ bekliyor"
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s: %s, %s ile birlikte kullanฤฑlamaz"
+
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr "geri al veya seรง-al dizisini sonlandฤฑr"
+
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr "geri al veya seรง-al dizisini sรผrdรผr"
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr "geri al veya seรง-al dizisini iptal et"
+
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "geรงerli gรถnderiyi atla ve sรผrdรผr"
+
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr "kendiliฤŸinden gรถnderme"
+
+#: builtin/revert.c:108
+msgid "edit the commit message"
+msgstr "gรถnderi iletisini dรผzenle"
+
+#: builtin/revert.c:111
+msgid "parent-number"
+msgstr "รผst รถge numarasฤฑ"
+
+#: builtin/revert.c:112
+msgid "select mainline parent"
+msgstr "ana รผst รถgeyi seรง"
+
+#: builtin/revert.c:114
+msgid "merge strategy"
+msgstr "birleลŸtirme stratejisi"
+
+#: builtin/revert.c:116
+msgid "option for merge strategy"
+msgstr "birleลŸtirme stratejisi iรงin seรงenek"
+
+#: builtin/revert.c:125
+msgid "append commit name"
+msgstr "gรถnderi adฤฑnฤฑ iliลŸtir"
+
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
+msgstr "baลŸlangฤฑรงta boลŸ olan gรถnderileri koru"
+
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
+msgstr "gereksiz, boลŸ gรถnderileri tut"
+
+#: builtin/revert.c:232
+msgid "revert failed"
+msgstr "geri al baลŸarฤฑsฤฑz"
+
+#: builtin/revert.c:245
+msgid "cherry-pick failed"
+msgstr "seรง-al baลŸarฤฑsฤฑz"
+
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<seรงenekler>] [--] <dosya>..."
+
+#: builtin/rm.c:207
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+"AลŸaฤŸฤฑdaki dosyanฤฑn hem HEAD'den hem de dosyadan farklฤฑ hazฤฑrlanmฤฑลŸ\n"
+"iรงeriฤŸi mevcut:"
+msgstr[1] ""
+"AลŸaฤŸฤฑdaki dosyalarฤฑn hem HEAD'den hem de dosyadan farklฤฑ hazฤฑrlanmฤฑลŸ\n"
+"iรงeriฤŸi mevcut:"
+
+#: builtin/rm.c:212
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(zorla kaldฤฑrmak iรงin -f kullanฤฑn)"
+
+#: builtin/rm.c:216
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "AลŸaฤŸฤฑdaki dosyanฤฑn indekste hazฤฑrlanmฤฑลŸ deฤŸiลŸiklikleri mevcut:"
+msgstr[1] "AลŸaฤŸฤฑdaki dosyalarฤฑn indekste hazฤฑrlanmฤฑลŸ deฤŸiลŸiklikleri mevcut:"
+
+#: builtin/rm.c:220 builtin/rm.c:229
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"(dosyayฤฑ tutmak iรงin --cached, zorla kaldฤฑrmak iรงin -f kullanฤฑn)"
+
+#: builtin/rm.c:226
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "AลŸaฤŸฤฑdaki dosyanฤฑn yerel deฤŸiลŸiklikleri var:"
+msgstr[1] "AลŸaฤŸฤฑdaki dosyalarฤฑn yerel deฤŸiลŸiklikleri var:"
+
+#: builtin/rm.c:243
+msgid "do not list removed files"
+msgstr "kaldฤฑrฤฑlan dosyalarฤฑ listeleme"
+
+#: builtin/rm.c:244
+msgid "only remove from the index"
+msgstr "yalnฤฑzca indeksten kaldฤฑr"
+
+#: builtin/rm.c:245
+msgid "override the up-to-date check"
+msgstr "gรผncellik denetlemesini geรงersiz kฤฑl"
+
+#: builtin/rm.c:246
+msgid "allow recursive removal"
+msgstr "รถzyineli kaldฤฑrmaya izin ver"
+
+#: builtin/rm.c:248
+msgid "exit with a zero status even if nothing matched"
+msgstr "hiรงbir ลŸey eลŸleลŸmemiลŸ olsa bile sฤฑfฤฑr koduyla รงฤฑk"
+
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Yol belirteci verilmedi. Hangi dosyalarฤฑ kaldฤฑrmalฤฑyฤฑm?"
+
+#: builtin/rm.c:305
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"ilerlemek iรงin lรผtfen deฤŸiลŸikliklerinizi .gitmodules'a hazฤฑrlayฤฑn veya "
+"zulalayฤฑn"
+
+#: builtin/rm.c:323
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "'%s', -r olmadan รถzyineli olarak kaldฤฑrฤฑlmฤฑyor"
+
+#: builtin/rm.c:362
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm: %s kaldฤฑrฤฑlamadฤฑ"
+
+#: builtin/send-pack.c:20
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+"  --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<makine>:]<dizin> "
+"[<baลŸvuru>...]\n"
+"  --all ve aรงฤฑk <baลŸvuru> tanฤฑmlamasฤฑ birlikte kullanฤฑlamaz."
+
+#: builtin/send-pack.c:163
+msgid "remote name"
+msgstr "uzak konum adฤฑ"
+
+#: builtin/send-pack.c:177
+msgid "use stateless RPC protocol"
+msgstr "durumsuz RPC protokolรผnรผ kullan"
+
+#: builtin/send-pack.c:178
+msgid "read refs from stdin"
+msgstr "baลŸvurularฤฑ stdin'den oku"
+
+#: builtin/send-pack.c:179
+msgid "print status from remote helper"
+msgstr "uzak konum yardฤฑmcฤฑsฤฑndan durum yazdฤฑr"
+
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<seรงenekler>] [<revizyon-erimi>] [[--] <yol>...]"
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<seรงenekler>]"
+
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
+msgstr "Yazar yerine gรถnderici ile grupla"
+
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
+msgstr "รงฤฑktฤฑyฤฑ yazar baลŸฤฑna olan gรถnderi sayฤฑsฤฑna gรถre sฤฑrala"
+
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr "Gรถnderi aรงฤฑklamalarฤฑnฤฑ gizle, yalnฤฑzca gรถnderi sayฤฑsฤฑnฤฑ ver"
+
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
+msgstr "Her yazarฤฑn e-posta adresini gรถster"
+
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
+msgstr "ร‡ฤฑktฤฑ satฤฑrlarฤฑnฤฑ kaydฤฑr"
+
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
+msgstr "depo dฤฑลŸฤฑnda รงok fazla deฤŸiลŸken verildi"
+
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<ne-zaman>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<temel>]] [--list] [<baลŸvuru>]"
+
+#: builtin/show-branch.c:395
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "%s yok sayฤฑlฤฑyor; %d baลŸvurudan fazlasฤฑ iลŸlenemiyor"
+msgstr[1] "%s yok sayฤฑlฤฑyor; %d baลŸvurudan fazlasฤฑ iลŸlenemiyor"
+
+#: builtin/show-branch.c:548
+#, c-format
+msgid "no matching refs with %s"
+msgstr "%s ile eลŸleลŸen baลŸvuru yok"
+
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
+msgstr "uzak izleme dallarฤฑnฤฑ ve yerel dallarฤฑ gรถster"
+
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
+msgstr "uzak izleme dallarฤฑnฤฑ gรถster"
+
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
+msgstr "'*!+-'i dala gรถre renklendir"
+
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
+msgstr "ortak atadan sonra <n> gรถnderi daha gรถster"
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr "more=-+ eลŸanlamlฤฑsฤฑ"
+
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
+msgstr "adlandฤฑrma dizilerini gizle"
+
+#: builtin/show-branch.c:656
+msgid "include the current branch"
+msgstr "geรงerli dalฤฑ iรงer"
+
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
+msgstr "gรถnderileri kendi nesne adlarฤฑyla adlandฤฑr"
+
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
+msgstr "olasฤฑ birleลŸtirme temellerini gรถster"
+
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
+msgstr "baลŸka baลŸvurudan eriลŸilemeyen baลŸvurularฤฑ gรถster"
+
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
+msgstr "gรถnderileri ilingesel sฤฑrada gรถster"
+
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
+msgstr "yalnฤฑzca birinci dalda olmayan gรถnderileri gรถster"
+
+#: builtin/show-branch.c:669
+msgid "show merges reachable from only one tip"
+msgstr "yalnฤฑzca bir uรงtan ulaลŸฤฑlabilir olan birleลŸtirmeleri gรถster"
+
+#: builtin/show-branch.c:671
+msgid "topologically sort, maintaining date order where possible"
+msgstr "olabildiฤŸince tarih sฤฑrasฤฑnฤฑ koruyarak ilingesel biรงimde sฤฑrala"
+
+#: builtin/show-branch.c:674
+msgid "<n>[,<base>]"
+msgstr "<n>[,<temel>]"
+
+#: builtin/show-branch.c:675
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr "tabanda baลŸlayarak en yeni <n> baลŸvuru gรผnlรผฤŸรผ girdilerini gรถster"
+
+#: builtin/show-branch.c:711
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog; --all, --remotes, --independent veya --merge-base ile uyumsuz"
+
+#: builtin/show-branch.c:735
+msgid "no branches given, and HEAD is not valid"
+msgstr "dal verilmedi ve HEAD geรงersiz"
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr "--reflog seรงeneฤŸi iรงin bir dal adฤฑ gerekli"
+
+#: builtin/show-branch.c:741
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] "aynฤฑ anda yalnฤฑzca %d girdi gรถsterilebilir"
+msgstr[1] "aynฤฑ anda yalnฤฑzca %d girdi gรถsterilebilir"
+
+#: builtin/show-branch.c:745
+#, c-format
+msgid "no such ref %s"
+msgstr "bรถyle bir baลŸvuru yok: %s"
+
+#: builtin/show-branch.c:831
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "%d revizyondan baลŸkasฤฑ iลŸlenemiyor."
+msgstr[1] "%d revizyondan baลŸkasฤฑ iลŸlenemiyor."
+
+#: builtin/show-branch.c:835
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' geรงerli bir baลŸvuru deฤŸil."
+
+#: builtin/show-branch.c:838
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "%s gรถnderisi bulunamฤฑyor (%s)"
+
+#: builtin/show-ref.c:12
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<dizgi>...]"
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<dizgi>]"
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr "yalnฤฑzca etiketleri gรถster (dal uรงlarฤฑyla birlikte kullanฤฑlabilir)"
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr "yalnฤฑzca dal uรงlarฤฑnฤฑ gรถster (etiketlerle birlikte kullanฤฑlabilir)"
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+msgstr "daha sฤฑkฤฑ baลŸvuru denetlemesi; kesin baลŸvuru yolu gerektirir"
+
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "sรผzรผlรผp dฤฑลŸarฤฑda kalsa bile HEAD baลŸvurusunu gรถster"
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr "etiketleri nesne numaralarฤฑna รงevir"
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr "SHA1 saฤŸlamasฤฑnฤฑ yalnฤฑzca <n> basamak kullanarak gรถster"
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "sonuรงlarฤฑ stdout'a yazdฤฑrma (--verify ile birlikte kullanฤฑลŸlฤฑ)"
+
+#: builtin/show-ref.c:179
+msgid "show refs from stdin that aren't in local repository"
+msgstr "stdin'den yerel bir depoda olmayan baลŸvurularฤฑ gรถster"
+
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <seรงenekler>"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"bu รงalฤฑลŸma aฤŸacฤฑ aralฤฑklฤฑ deฤŸil (sparse-checkout dosyasฤฑ var olmayabilir)"
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "aralฤฑklฤฑ รงฤฑkฤฑลŸ dosyasฤฑ iรงin dizin oluลŸturulamadฤฑ"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "extensions.worktreeConfig yapฤฑlandฤฑrmasฤฑ ayarlanamadฤฑ"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "aralฤฑklฤฑ รงฤฑkฤฑลŸฤฑ koni kipinde ilklendir"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "aralฤฑklฤฑ รงฤฑkฤฑลŸ ilklendir"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "'%s' aรงฤฑlamadฤฑ"
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "'%s' yolu olaฤŸanlaลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "C biรงemli '%s' dizisinin tฤฑrnaklarฤฑ kaldฤฑrฤฑlamฤฑyor"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "mevcut aralฤฑklฤฑ รงฤฑkฤฑลŸ dizgileri yรผklenemiyor"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "dizgileri stdin'den oku"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "aralฤฑklฤฑ รงฤฑkฤฑลŸ dizgileri ayarla"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "aralฤฑklฤฑ รงฤฑkฤฑลŸฤฑ devre dฤฑลŸฤฑ bฤฑrak"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "รงalฤฑลŸma dizini yenilenirken hata"
+
+#: builtin/stash.c:22 builtin/stash.c:38
+msgid "git stash list [<options>]"
+msgstr "git stash list [<seรงenekler>]"
+
+#: builtin/stash.c:23 builtin/stash.c:43
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<seรงenekler>] [<zula>]"
+
+#: builtin/stash.c:24 builtin/stash.c:48
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<zula>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<zula>]"
+
+#: builtin/stash.c:26 builtin/stash.c:63
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <dal-adฤฑ> [<zula>]"
+
+#: builtin/stash.c:27 builtin/stash.c:68
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n"
+"          [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n"
+"          [--] [<yol-blrtรง>...]]"
+
+#: builtin/stash.c:32 builtin/stash.c:85
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<ileti>]"
+
+#: builtin/stash.c:53
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<zula>]"
+
+#: builtin/stash.c:58
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<zula>]"
+
+#: builtin/stash.c:73
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <ileti>] [-q|--quiet] <gรถnderi>"
+
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n"
+"          [--] [<yol-blrtรง>...]]"
+
+#: builtin/stash.c:128
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' zulaya benzer bir gรถnderi deฤŸil"
+
+#: builtin/stash.c:148
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "ร‡ok fazla revizyon belirtildi:%s"
+
+#: builtin/stash.c:162 git-legacy-stash.sh:549
+msgid "No stash entries found."
+msgstr "Zula girdisi bulunamadฤฑ."
+
+#: builtin/stash.c:176
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s geรงerli bir baลŸvuru deฤŸil"
+
+#: builtin/stash.c:225 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "parametreli git stash clear henรผz kullanฤฑlabilir deฤŸil"
+
+#: builtin/stash.c:404
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "bir birleลŸtirmenin ortasฤฑnda zula uygulanamฤฑyor"
+
+#: builtin/stash.c:415
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "diff oluลŸturulamadฤฑ: %s^!."
+
+#: builtin/stash.c:422
+msgid "conflicts in index.Try without --index."
+msgstr "ฤฐndekste รงakฤฑลŸmalar var. --index olmadan deneyin."
+
+#: builtin/stash.c:428
+msgid "could not save index tree"
+msgstr "indeks aฤŸacฤฑ kaydedilemedi"
+
+#: builtin/stash.c:437
+msgid "could not restore untracked files from stash"
+msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
+
+#: builtin/stash.c:451
+#, c-format
+msgid "Merging %s with %s"
+msgstr "%s, %s ile birleลŸtiriliyor"
+
+#: builtin/stash.c:461 git-legacy-stash.sh:681
+msgid "Index was not unstashed."
+msgstr "ฤฐndeks zuladan รงฤฑkartฤฑlmamฤฑลŸtฤฑ."
+
+#: builtin/stash.c:522 builtin/stash.c:621
+msgid "attempt to recreate the index"
+msgstr "indeks yeniden oluลŸturulmaya รงalฤฑลŸฤฑlฤฑyor"
+
+#: builtin/stash.c:555
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "%s bฤฑrakฤฑldฤฑ (%s)"
+
+#: builtin/stash.c:558
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Zula girdisi bฤฑrakฤฑlamadฤฑ"
+
+#: builtin/stash.c:583
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' bir zula baลŸvurusu deฤŸil"
+
+#: builtin/stash.c:633 git-legacy-stash.sh:695
+msgid "The stash entry is kept in case you need it again."
+msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanฤฑyor."
+
+#: builtin/stash.c:656 git-legacy-stash.sh:713
+msgid "No branch name specified"
+msgstr "Dal adฤฑ belirtilmedi"
+
+#: builtin/stash.c:796 builtin/stash.c:833
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "%s, %s ile gรผncellenemiyor"
+
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+msgid "stash message"
+msgstr "zula iletisi"
+
+#: builtin/stash.c:824
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" bir <gรถnderi> deฤŸiลŸkeni gerektirir"
+
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
+msgid "No changes selected"
+msgstr "DeฤŸiลŸiklik seรงilmedi"
+
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Henรผz ilk gรถnderiniz yok"
+
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "Geรงerli indeks durumu kaydedilemiyor"
+
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "ฤฐzlenmeyen dosyalar kaydedilemiyor"
+
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
+msgid "Cannot save the current worktree state"
+msgstr "Geรงerli รงalฤฑลŸma aฤŸacฤฑ durumu kaydedilemiyor"
+
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
+msgid "Cannot record working tree state"
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ durumu kaydฤฑ yazฤฑlamฤฑyor"
+
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "--patch, --include-untracked veya --all hepsi bir anda kullanฤฑlamฤฑyor"
+
+#: builtin/stash.c:1298
+msgid "Did you forget to 'git add'?"
+msgstr "'git add' yapmayฤฑ mฤฑ unuttunuz?"
+
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
+msgid "No local changes to save"
+msgstr "Kaydedilecek yerel deฤŸiลŸiklik yok"
+
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
+msgid "Cannot initialize stash"
+msgstr "Zula ilklendirilemiyor"
+
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
+msgid "Cannot save the current status"
+msgstr "Geรงerli durum kaydedilemiyor"
+
+#: builtin/stash.c:1340
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "ร‡alฤฑลŸma dizini ve indeks durumu %s kaydedildi"
+
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
+msgid "Cannot remove worktree changes"
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ deฤŸiลŸiklikleri kaldฤฑrฤฑlamฤฑyor"
+
+#: builtin/stash.c:1469 builtin/stash.c:1534
+msgid "keep index"
+msgstr "indeksi tut"
+
+#: builtin/stash.c:1471 builtin/stash.c:1536
+msgid "stash in patch mode"
+msgstr "yama kipinde zula"
+
+#: builtin/stash.c:1472 builtin/stash.c:1537
+msgid "quiet mode"
+msgstr "sessiz kip"
+
+#: builtin/stash.c:1474 builtin/stash.c:1539
+msgid "include untracked files in stash"
+msgstr "zulada izlenmeyen dosyalarฤฑ iรงer"
+
+#: builtin/stash.c:1476 builtin/stash.c:1541
+msgid "include ignore files"
+msgstr "yok sayma dosyalarฤฑnฤฑ iรงer"
+
+#: builtin/stash.c:1600
+#, c-format
+msgid "could not exec %s"
+msgstr "%s 'exec' yapฤฑlamadฤฑ"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr "yorum karakteri ile baลŸlayan tรผm satฤฑrlarฤฑ atla ve kaldฤฑr"
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr "her satฤฑrฤฑn baลŸฤฑna yorum karakteri ve boลŸluk koy"
+
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Tam bir baลŸvuru adฤฑ bekleniyordu, %s alฤฑndฤฑ"
+
+#: builtin/submodule--helper.c:64
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote deฤŸiลŸken almaz"
+
+#: builtin/submodule--helper.c:102
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "'%s' url'sinden bir bileลŸen รงฤฑkarฤฑlamฤฑyor"
+
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+msgid "alternative anchor for relative paths"
+msgstr "gรถreceli yollar iรงin alternatif tutturucu"
+
+#: builtin/submodule--helper.c:415
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]"
+
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ".gitmodules iรงinde '%s' altmodรผl yolu iรงin url bulunamadฤฑ"
+
+#: builtin/submodule--helper.c:524
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Giriliyor: '%s'\n"
+
+#: builtin/submodule--helper.c:527
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command, %s iรงin sฤฑfฤฑr olmayan durum dรถndรผrdรผ\n"
+"."
+
+#: builtin/submodule--helper.c:549
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command, %s รถgesinin iรง iรงe geรงmiลŸ altmodรผlleri iรงinde รถzyinelerken "
+"sฤฑfฤฑr olmayan durum dรถndรผrdรผ"
+
+#: builtin/submodule--helper.c:565
+msgid "Suppress output of entering each submodule command"
+msgstr "Her altmodรผl komutu giriลŸinin รงฤฑktฤฑsฤฑnฤฑ gizle"
+
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
+msgid "Recurse into nested submodules"
+msgstr "ฤฐรง iรงe geรงmiลŸ altmodรผller iรงine รถzyinele"
+
+#: builtin/submodule--helper.c:572
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>"
+
+#: builtin/submodule--helper.c:599
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"'%s' yapฤฑlandฤฑrmasฤฑ aranamadฤฑ. Bu deponun kendi yetkili รผstkaynaฤŸฤฑ olduฤŸu "
+"varsayฤฑlฤฑyor."
+
+#: builtin/submodule--helper.c:667
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Altmodรผl yolu url'si '%s' kaydฤฑ yapฤฑlamadฤฑ"
+
+#: builtin/submodule--helper.c:671
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "'%s' altmodรผlรผ (%s), '%s' yoluna kaydฤฑ yapฤฑldฤฑ\n"
+
+#: builtin/submodule--helper.c:681
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "uyarฤฑ: '%s' altmodรผlรผ iรงin komut gรผncellemesi รถnerilmiyor\n"
+
+#: builtin/submodule--helper.c:688
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "'%s' altmodรผlรผ yolu iรงin gรผncelleme kipi kaydฤฑ yapฤฑlamadฤฑ"
+
+#: builtin/submodule--helper.c:710
+msgid "Suppress output for initializing a submodule"
+msgstr "Bir altmodรผl ilklendirmesi รงฤฑktฤฑsฤฑnฤฑ gizle"
+
+#: builtin/submodule--helper.c:715
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<seรงenekler>] [<yol>]"
+
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "'%s' yolu iรงin .gitmodules iรงinde altmodรผl eลŸlemi bulunmadฤฑ"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "'%s' altmodรผlรผ iรงinde HEAD baลŸvurusu รงรถzรผlemedi"
+
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "'%s' altmodรผlรผne รถzyinelenemedi"
+
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
+msgid "Suppress submodule status output"
+msgstr "Altmodรผl durum รงฤฑktฤฑsฤฑnฤฑ gizle"
+
+#: builtin/submodule--helper.c:889
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"Altmodรผl HEAD'i iรงinde depolanan gรถnderi yerine indekste depolanan gรถnderiyi "
+"kullan"
+
+#: builtin/submodule--helper.c:890
+msgid "recurse into nested submodules"
+msgstr "iรง iรงe geรงmiลŸ altmodรผle รถzyinele"
+
+#: builtin/submodule--helper.c:895
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]"
+
+#: builtin/submodule--helper.c:919
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <yol>"
+
+#: builtin/submodule--helper.c:983
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "'%s' iรงin altmodรผl url'si eลŸitleniyor\n"
+
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "'%s' altmodรผlรผ yolu iรงin url kaydฤฑ yapฤฑlamadฤฑ"
+
+#: builtin/submodule--helper.c:1003
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "'%s' altmodรผlรผ iรงin รถntanฤฑmlฤฑ uzak konum alฤฑnamadฤฑ"
+
+#: builtin/submodule--helper.c:1014
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "'%s' altmodรผlรผ iรงin uzak konum gรผncellenemedi"
+
+#: builtin/submodule--helper.c:1061
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Altmodรผl url'si eลŸitleme รงฤฑktฤฑsฤฑnฤฑ gizle"
+
+#: builtin/submodule--helper.c:1068
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]"
+
+#: builtin/submodule--helper.c:1122
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"Altmodรผl รงalฤฑลŸma aฤŸacฤฑ '%s' bir .git dizini iรงeriyor (tรผm geรงmiลŸi dahil "
+"olacak biรงimde kaldฤฑrmak istiyorsanฤฑz 'rm -rf' kullanฤฑn)"
+
+#: builtin/submodule--helper.c:1134
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"Altmodรผl รงalฤฑลŸma aฤŸacฤฑ '%s' yerel deฤŸiลŸiklikler iรงeriyor; onlarฤฑ atmak iรงin "
+"'-f' kullanฤฑn"
+
+#: builtin/submodule--helper.c:1142
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "'%s' dizini temizlendi\n"
+
+#: builtin/submodule--helper.c:1144
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "'%s' altmodรผl รงalฤฑลŸma aฤŸacฤฑ kaldฤฑrฤฑlamadฤฑ\n"
+
+#: builtin/submodule--helper.c:1155
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "boลŸ altmodรผl dizini %s oluลŸturulamadฤฑ"
+
+#: builtin/submodule--helper.c:1171
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "'%s' altmodรผlรผ (%s), '%s' yoluna kaydฤฑ yapฤฑlmamฤฑลŸ\n"
+
+#: builtin/submodule--helper.c:1200
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr "Altmodรผl รงalฤฑลŸma aฤŸaรงlarฤฑnฤฑ yerel deฤŸiลŸiklikler iรงerseler bile kaldฤฑr"
+
+#: builtin/submodule--helper.c:1201
+msgid "Unregister all submodules"
+msgstr "Tรผm altmodรผllerin kaydฤฑnฤฑ kaldฤฑr"
+
+#: builtin/submodule--helper.c:1206
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]"
+
+#: builtin/submodule--helper.c:1220
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+"Tรผm altmodรผllerin ilklendirmesini gerรงekten geri almak istiyorsanฤฑz '-all' "
+"kullanฤฑn"
+
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Bir sรผperprojenin alternatifinden hesaplanan bir alternatif geรงersiz.\n"
+"Bรถyle bir durumda Git'in alternatifsiz klonlamasฤฑna izin vermek iรงin\n"
+"submodule.alternateErrorStrategy ayarฤฑnฤฑ 'info'ya ayarlayฤฑn veya\n"
+"--reference yerine --reference-if-able kullanarak klonlayฤฑn."
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "'%s' altmodรผlรผ alternatif ekleyemiyor: %s"
+
+#: builtin/submodule--helper.c:1367
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "'%s' submodule.alternateErrorStrategy deฤŸeri tanฤฑmlanamadฤฑ"
+
+#: builtin/submodule--helper.c:1374
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "'%s' submodule.alternateLocation deฤŸeri tanฤฑmlanamadฤฑ"
+
+#: builtin/submodule--helper.c:1398
+msgid "where the new submodule will be cloned to"
+msgstr "yeni altmodรผlรผn nereye klonlanacaฤŸฤฑ"
+
+#: builtin/submodule--helper.c:1401
+msgid "name of the new submodule"
+msgstr "yeni altmodรผlรผn adฤฑ"
+
+#: builtin/submodule--helper.c:1404
+msgid "url where to clone the submodule from"
+msgstr "altmodรผlรผn klonlanacaฤŸฤฑ url konumu"
+
+#: builtin/submodule--helper.c:1412
+msgid "depth for shallow clones"
+msgstr "sฤฑฤŸ klonlarฤฑn derinliฤŸi"
+
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+msgid "force cloning progress"
+msgstr "zorla klonla"
+
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "boลŸ olmayan dizine klonlamaya izin verme"
+
+#: builtin/submodule--helper.c:1424
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] "
+"[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>"
+
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+"baลŸka bir altmodรผlรผn git dizininde '%s' oluลŸturma/kullanma reddediliyor"
+
+#: builtin/submodule--helper.c:1460
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "'%s' รถgesinin '%s' altmodรผl yoluna klonlanmasฤฑ baลŸarฤฑsฤฑz"
+
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "dizin boลŸ deฤŸil: '%s'"
+
+#: builtin/submodule--helper.c:1476
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "'%s' iรงin altmodรผl dizini alฤฑnamadฤฑ"
+
+#: builtin/submodule--helper.c:1512
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr "Geรงersiz gรผncelleme kipi '%s', '%s' altmodรผl yolu iรงin"
+
+#: builtin/submodule--helper.c:1516
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr "Geรงersiz gรผncelleme kipi '%s', '%s' altmodรผl yolu iรงin yapฤฑlandฤฑrฤฑlmฤฑลŸ"
+
+#: builtin/submodule--helper.c:1617
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Altmodรผl yolu '%s' ilklendirilmedi"
+
+#: builtin/submodule--helper.c:1621
+msgid "Maybe you want to use 'update --init'?"
+msgstr "'update --init' mi kullanmak istersiniz?"
+
+#: builtin/submodule--helper.c:1651
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "BirleลŸtirilmemiลŸ altmodรผl %s atlanฤฑyor"
+
+#: builtin/submodule--helper.c:1680
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "'%s' altmodรผlรผ atlanฤฑyor"
+
+#: builtin/submodule--helper.c:1830
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "'%s' klonlanamadฤฑ. Yeniden deneme zamanlandฤฑ."
+
+#: builtin/submodule--helper.c:1841
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "'%s' ikinci bir kez klonlanamadฤฑ, iptal ediliyor"
+
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
+msgid "path into the working tree"
+msgstr "รงalฤฑลŸma aฤŸacฤฑna giden yol"
+
+#: builtin/submodule--helper.c:1906
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "iรง iรงe geรงmiลŸ altmodรผl sฤฑnฤฑrlarฤฑ รผzerinden รงalฤฑลŸma aฤŸacฤฑna giden yol"
+
+#: builtin/submodule--helper.c:1910
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout veya none"
+
+#: builtin/submodule--helper.c:1916
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Belirli bir revizyon sayฤฑsฤฑna kฤฑsaltฤฑlmฤฑลŸ sฤฑฤŸ klon oluลŸtur"
+
+#: builtin/submodule--helper.c:1919
+msgid "parallel jobs"
+msgstr "paralel iลŸler"
+
+#: builtin/submodule--helper.c:1921
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "ilk klonun sฤฑฤŸlฤฑk รผzerine olan tavsiyeyi izleyip izlemeyeceฤŸi"
+
+#: builtin/submodule--helper.c:1922
+msgid "don't print cloning progress"
+msgstr "klonlama iลŸlemini yazdฤฑrma"
+
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]"
+
+#: builtin/submodule--helper.c:1946
+msgid "bad value for update parameter"
+msgstr "gรผncelleme parametresi iรงin hatalฤฑ deฤŸer"
+
+#: builtin/submodule--helper.c:1994
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Altmodรผl (%s) dalฤฑ sรผperproje dalฤฑndan devralmak รผzere yapฤฑlandฤฑrฤฑldฤฑ, ancak "
+"sรผperproje herhangi bir dalda deฤŸil"
+
+#: builtin/submodule--helper.c:2117
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "'%s' altmodรผlรผ iรงin depo tutacaฤŸฤฑ alฤฑnamadฤฑ"
+
+#: builtin/submodule--helper.c:2150
+msgid "recurse into submodules"
+msgstr "altmodรผllere รถzyinele"
+
+#: builtin/submodule--helper.c:2156
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<seรงenekler>] [<yol>...]"
+
+#: builtin/submodule--helper.c:2212
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ".gitmodules dosyasฤฑna yazฤฑm gรผvenli mi deฤŸil mi denetle"
+
+#: builtin/submodule--helper.c:2215
+msgid "unset the config in the .gitmodules file"
+msgstr ".gitmodules dosyasฤฑndaki yapฤฑlandฤฑrmayฤฑ kaldฤฑr"
+
+#: builtin/submodule--helper.c:2220
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <ad> [<deฤŸer>]"
+
+#: builtin/submodule--helper.c:2221
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <ad>"
+
+#: builtin/submodule--helper.c:2222
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ".gitmodules dosyasฤฑnฤฑn รงalฤฑลŸma aฤŸacฤฑnda olduฤŸundan lรผtfen emin ol"
+
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s, --super-prefix desteklemiyor"
+
+#: builtin/submodule--helper.c:2297
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' geรงerli bir submodule-helper altkomutu deฤŸil"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<seรงenekler>] <ad> [<baลŸvuru>]"
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <ad>"
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "sembolik olmayan (ayrฤฑk) baลŸvurular iรงin hata iletisini gizle"
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr "sembolik baลŸvuruyu sil"
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "baลŸvuru รงฤฑktฤฑsฤฑnฤฑ kฤฑsalt"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
+msgstr "neden"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
+msgstr "gรผncelleme nedeni"
+
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
+msgstr ""
+"git tag [-a | -s | -u <anahtar-no>] [-f] [-m <ileti> | -F <dosya>]\n"
+"\t\t<etiket-adฤฑ> [<dal-ucu>]"
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <etiket-adฤฑ>..."
+
+#: builtin/tag.c:28
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr ""
+"git tag -l [-n[<sayฤฑ>]] [--contains <gรถnderi>] [--no-contains <gรถnderi>] [--"
+"points-at <nesne>]\n"
+"\t\t[--format=<biรงim>] [--[no-]merged [<gรถnderi>]] [<dizgi>...]"
+
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<biรงim>] <etiket-adฤฑ>..."
+
+#: builtin/tag.c:89
+#, c-format
+msgid "tag '%s' not found."
+msgstr "'%s' etiketi bulunamadฤฑ."
+
+#: builtin/tag.c:105
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "'%s' etiketi silindi (%s idi)\n"
+
+#: builtin/tag.c:135
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"Etiket iรงin bir ileti yazฤฑn:\n"
+"  %s\n"
+"'%c' ile baลŸlayan satฤฑrlar yok sayฤฑlacaktฤฑr.\n"
+
+#: builtin/tag.c:139
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"Etiket iรงin bir ileti yazฤฑn:\n"
+"  %s\n"
+"'%c' ile baลŸlayan satฤฑrlar tutulacaktฤฑr; isterseniz onlarฤฑ "
+"kaldฤฑrabilirsiniz.\n"
+
+#: builtin/tag.c:198
+msgid "unable to sign the tag"
+msgstr "etiket imzalanamฤฑyor"
+
+#: builtin/tag.c:200
+msgid "unable to write tag file"
+msgstr "etiket dosyasฤฑ yazฤฑlamฤฑyor"
+
+#: builtin/tag.c:216
+#, c-format
+msgid ""
+"You have created a nested tag. The object referred to by your new tag is\n"
+"already a tag. If you meant to tag the object that it points to, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+msgstr ""
+"ฤฐรง iรงe geรงmiลŸ bir etiket oluลŸturdunuz. Sizin yeni etiketinizce baลŸvurulan\n"
+"nesne zaten bir etiket. ฤฐลŸaret ettiฤŸi nesneyi etiketlemek istediyseniz:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:232
+msgid "bad object type."
+msgstr "hatalฤฑ nesne tรผrรผ"
+
+#: builtin/tag.c:284
+msgid "no tag message?"
+msgstr "etiket iletisi yok mu?"
+
+#: builtin/tag.c:291
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "Etiket iletisi %s iรงinde bฤฑrakฤฑldฤฑ\n"
+
+#: builtin/tag.c:402
+msgid "list tag names"
+msgstr "etiket adlarฤฑnฤฑ listele"
+
+#: builtin/tag.c:404
+msgid "print <n> lines of each tag message"
+msgstr "her etiket iletisinin <n> satฤฑrฤฑnฤฑ listele"
+
+#: builtin/tag.c:406
+msgid "delete tags"
+msgstr "etiketleri sil"
+
+#: builtin/tag.c:407
+msgid "verify tags"
+msgstr "etiketleri doฤŸrula"
+
+#: builtin/tag.c:409
+msgid "Tag creation options"
+msgstr "Etiket oluลŸturma seรงenekleri"
+
+#: builtin/tag.c:411
+msgid "annotated tag, needs a message"
+msgstr "aรงฤฑklama eklenmiลŸ etiket iรงin bir ileti gerek"
+
+#: builtin/tag.c:413
+msgid "tag message"
+msgstr "etiket iletisi"
+
+#: builtin/tag.c:415
+msgid "force edit of tag message"
+msgstr "etiket iletisini zorla dรผzenle"
+
+#: builtin/tag.c:416
+msgid "annotated and GPG-signed tag"
+msgstr "aรงฤฑklama eklenmiลŸ ve GPG imzalฤฑ etiket"
+
+#: builtin/tag.c:419
+msgid "use another key to sign the tag"
+msgstr "etiketi imzalamak iรงin baลŸka bir anahtar kullanฤฑn"
+
+#: builtin/tag.c:420
+msgid "replace the tag if exists"
+msgstr "eฤŸer varsa etiketi baลŸkasฤฑyla deฤŸiลŸtir"
+
+#: builtin/tag.c:421 builtin/update-ref.c:369
+msgid "create a reflog"
+msgstr "bir baลŸvuru gรผnlรผฤŸรผ oluลŸtur"
+
+#: builtin/tag.c:423
+msgid "Tag listing options"
+msgstr "Etiket listeleme seรงenekleri"
+
+#: builtin/tag.c:424
+msgid "show tag list in columns"
+msgstr "etiket listesini sรผtunlarla gรถster"
+
+#: builtin/tag.c:425 builtin/tag.c:427
+msgid "print only tags that contain the commit"
+msgstr "yalnฤฑzca gรถnderiyi iรงeren etiketleri yazdฤฑr"
+
+#: builtin/tag.c:426 builtin/tag.c:428
+msgid "print only tags that don't contain the commit"
+msgstr "yalnฤฑzca gรถnderi iรงermeyen etiketleri yazdฤฑr"
+
+#: builtin/tag.c:429
+msgid "print only tags that are merged"
+msgstr "yalnฤฑzca birleลŸtirilen etiketleri yazdฤฑr"
+
+#: builtin/tag.c:430
+msgid "print only tags that are not merged"
+msgstr "yalnฤฑzca birleลŸtirilmeyen etiketleri yazdฤฑr"
+
+#: builtin/tag.c:434
+msgid "print only tags of the object"
+msgstr "yalnฤฑzca nesnenin etiketlerini yazdฤฑr"
+
+#: builtin/tag.c:482
+msgid "--column and -n are incompatible"
+msgstr "--column ve -n birbiriyle uyumsuz"
+
+#: builtin/tag.c:504
+msgid "-n option is only allowed in list mode"
+msgstr "-n seรงeneฤŸine yalnฤฑzca liste kipinde izin verilir"
+
+#: builtin/tag.c:506
+msgid "--contains option is only allowed in list mode"
+msgstr "--contains seรงeneฤŸine yalnฤฑzca liste kipinde izin verilir"
+
+#: builtin/tag.c:508
+msgid "--no-contains option is only allowed in list mode"
+msgstr "--no-contains seรงeneฤŸine yalnฤฑzca liste kipinde izin verilir"
+
+#: builtin/tag.c:510
+msgid "--points-at option is only allowed in list mode"
+msgstr "--points-at seรงeneฤŸine yalnฤฑzca liste kipinde izin verilir"
+
+#: builtin/tag.c:512
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+"--merged ve --no-merged seรงeneklerine yalnฤฑzca liste kipinde izin verilir"
+
+#: builtin/tag.c:523
+msgid "only one -F or -m option is allowed."
+msgstr "yalnฤฑzca bir -F veya -m seรงeneฤŸine izin verilir"
+
+#: builtin/tag.c:542
+msgid "too many params"
+msgstr "รงok fazla parametre"
+
+#: builtin/tag.c:548
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' geรงerli bir etiket adฤฑ deฤŸil."
+
+#: builtin/tag.c:553
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "'%s' etiketi halihazฤฑrda var"
+
+#: builtin/tag.c:584
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "'%s' etiketi gรผncellendi (%s idi)\n"
+
+#: builtin/unpack-objects.c:502
+msgid "Unpacking objects"
+msgstr "Nesneler aรงฤฑlฤฑyor"
+
+#: builtin/update-index.c:84
+#, c-format
+msgid "failed to create directory %s"
+msgstr "%s dizini oluลŸturulamadฤฑ"
+
+#: builtin/update-index.c:100
+#, c-format
+msgid "failed to create file %s"
+msgstr "%s dosyasฤฑ oluลŸturulamadฤฑ"
+
+#: builtin/update-index.c:108
+#, c-format
+msgid "failed to delete file %s"
+msgstr "%s dosyasฤฑ silinemedi"
+
+#: builtin/update-index.c:115 builtin/update-index.c:221
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "%s dizini silinemedi"
+
+#: builtin/update-index.c:140
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "'%s' iรงindeki mtime sฤฑnanฤฑyor "
+
+#: builtin/update-index.c:154
+msgid "directory stat info does not change after adding a new file"
+msgstr "dizin bilgileri yeni bir dosya ekledikten sonra deฤŸiลŸmez"
+
+#: builtin/update-index.c:167
+msgid "directory stat info does not change after adding a new directory"
+msgstr "dizin bilgileri yeni bir dizin ekledikten sonra deฤŸiลŸmez"
+
+#: builtin/update-index.c:180
+msgid "directory stat info changes after updating a file"
+msgstr "dizin bilgileri bir dosya gรผncellemesinden sonra deฤŸiลŸir"
+
+#: builtin/update-index.c:191
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr "dizin bilgileri altdizin iรงine yeni bir dosya ekledikten sonra deฤŸiลŸir"
+
+#: builtin/update-index.c:202
+msgid "directory stat info does not change after deleting a file"
+msgstr "dizin bilgileri bir dosya sildikten sonra deฤŸiลŸmez"
+
+#: builtin/update-index.c:215
+msgid "directory stat info does not change after deleting a directory"
+msgstr "dizin bilgileri bir dizin sildikten sonra deฤŸiลŸmez"
+
+#: builtin/update-index.c:222
+msgid " OK"
+msgstr " Tamam"
+
+#: builtin/update-index.c:591
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<seรงenekler>] [--] [<dosya>...]"
+
+#: builtin/update-index.c:974
+msgid "continue refresh even when index needs update"
+msgstr "indeksin gรผncellenmesi gerekse bile yenilemeyi sรผrdรผr"
+
+#: builtin/update-index.c:977
+msgid "refresh: ignore submodules"
+msgstr "refresh: altmodรผlleri yok say"
+
+#: builtin/update-index.c:980
+msgid "do not ignore new files"
+msgstr "yeni dosyalarฤฑ yok sayma"
+
+#: builtin/update-index.c:982
+msgid "let files replace directories and vice-versa"
+msgstr "dosyalarฤฑn dizinlerin yerine geรงmesine ve tersine izin ver"
+
+#: builtin/update-index.c:984
+msgid "notice files missing from worktree"
+msgstr "รงalฤฑลŸma aฤŸacฤฑndan eksik olan dosyalarฤฑ fark et"
+
+#: builtin/update-index.c:986
+msgid "refresh even if index contains unmerged entries"
+msgstr "indekste birleลŸtirilmemiลŸ girdiler olsa bile yenile"
+
+#: builtin/update-index.c:989
+msgid "refresh stat information"
+msgstr "dosya durum bilgisini yenile"
+
+#: builtin/update-index.c:993
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "--refresh gibi, ancak assume-unchanged ayarฤฑnฤฑ yok sayar"
+
+#: builtin/update-index.c:997
+msgid "<mode>,<object>,<path>"
+msgstr "<kip>,<nesne>,<yol>"
+
+#: builtin/update-index.c:998
+msgid "add the specified entry to the index"
+msgstr "belirtilen girdiyi indekse ekle"
+
+#: builtin/update-index.c:1008
+msgid "mark files as \"not changing\""
+msgstr "dosyalarฤฑ \"not changing\" olarak imle"
+
+#: builtin/update-index.c:1011
+msgid "clear assumed-unchanged bit"
+msgstr "assumed-unchanged kฤฑsmฤฑnฤฑ temizle"
+
+#: builtin/update-index.c:1014
+msgid "mark files as \"index-only\""
+msgstr "dosyalarฤฑ \"index-only\" olarak imle"
+
+#: builtin/update-index.c:1017
+msgid "clear skip-worktree bit"
+msgstr "skip-worktree kฤฑsmฤฑnฤฑ atla"
+
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "'index-only' girdilerine dokunma"
+
+#: builtin/update-index.c:1022
+msgid "add to index only; do not add content to object database"
+msgstr "yalnฤฑzca indekse ekle; iรงeriฤŸe nesne veritabanฤฑna ekleme"
+
+#: builtin/update-index.c:1024
+msgid "remove named paths even if present in worktree"
+msgstr "รงalฤฑลŸma aฤŸacฤฑnda mevcut olsa bile ad verilen yollarฤฑ kaldฤฑr"
+
+#: builtin/update-index.c:1026
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "--stdin ile: girdi satฤฑrlarฤฑ boลŸ baytlarla sonlandฤฑrฤฑlฤฑr"
+
+#: builtin/update-index.c:1028
+msgid "read list of paths to be updated from standard input"
+msgstr "gรผncellenecek yol listelerini standart girdi'den oku"
+
+#: builtin/update-index.c:1032
+msgid "add entries from standard input to the index"
+msgstr "indekse standart girdi'den girdiler ekle"
+
+#: builtin/update-index.c:1036
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "#2 ve #3 numaralฤฑ adฤฑmlarฤฑ listelenmiลŸ yollar iรงin yeniden doldur"
+
+#: builtin/update-index.c:1040
+msgid "only update entries that differ from HEAD"
+msgstr "yalnฤฑzca HEAD'den farklฤฑ olan girdileri gรผncelle"
+
+#: builtin/update-index.c:1044
+msgid "ignore files missing from worktree"
+msgstr "รงalฤฑลŸma aฤŸacฤฑndan eksik olan dosyalarฤฑ yok say"
+
+#: builtin/update-index.c:1047
+msgid "report actions to standard output"
+msgstr "eylemleri standart รงฤฑktฤฑ'ya bildir"
+
+#: builtin/update-index.c:1049
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(okunabilir veri iรงin) kaydedilmiลŸ รงรถzรผlmeyen รงakฤฑลŸmalarฤฑ unut"
+
+#: builtin/update-index.c:1053
+msgid "write index in this format"
+msgstr "indeksi bu biรงimle yaz"
+
+#: builtin/update-index.c:1055
+msgid "enable or disable split index"
+msgstr "bรถlรผnmรผลŸ indeksi etkinleลŸtir veya devre dฤฑลŸฤฑ bฤฑrak"
+
+#: builtin/update-index.c:1057
+msgid "enable/disable untracked cache"
+msgstr "izlenmeyen รถnbelleฤŸi etkinleลŸtir/devre dฤฑลŸฤฑ bฤฑrak"
+
+#: builtin/update-index.c:1059
+msgid "test if the filesystem supports untracked cache"
+msgstr "dosya sisteminin izlenmeyen รถnbellek destekleyip desteklemediฤŸini sฤฑna"
+
+#: builtin/update-index.c:1061
+msgid "enable untracked cache without testing the filesystem"
+msgstr "dosya sistemini sฤฑnamadan izlenmeyen รถnbelleฤŸi etkinleลŸtir"
+
+#: builtin/update-index.c:1063
+msgid "write out the index even if is not flagged as changed"
+msgstr "deฤŸiลŸtirilmiลŸ olarak imlenmese bile indeksi yaz"
+
+#: builtin/update-index.c:1065
+msgid "enable or disable file system monitor"
+msgstr "dosya sistemi monitรถrรผnรผ etkinleลŸtir veya devre dฤฑลŸฤฑ bฤฑrak"
+
+#: builtin/update-index.c:1067
+msgid "mark files as fsmonitor valid"
+msgstr "dosyalarฤฑ dosya sistemi monitรถrรผnde geรงerli olarak imle"
+
+#: builtin/update-index.c:1070
+msgid "clear fsmonitor valid bit"
+msgstr "dosya sistemi monitรถrรผnde geรงerli kฤฑsmฤฑnฤฑ temizle"
+
+#: builtin/update-index.c:1173
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex 'false' olarak ayarlanmฤฑลŸ; bรถlรผnmรผลŸ indeksi etkinleลŸtirmeyi "
+"gerรงekten istiyorsanฤฑz bunu kaldฤฑrฤฑn veya deฤŸiลŸtirin"
+
+#: builtin/update-index.c:1182
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex 'true' olarak ayarlanmฤฑลŸ; bรถlรผnmรผลŸ indeksi devre dฤฑลŸฤฑ "
+"bฤฑrakmayฤฑ gerรงekten istiyorsanฤฑz bunu kaldฤฑrฤฑn veya deฤŸiลŸtirin"
+
+#: builtin/update-index.c:1194
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache 'true' olarak ayarlanmฤฑลŸ; izlenmeyen รถnbelleฤŸi gerรงekten "
+"devre dฤฑลŸฤฑ bฤฑrakmayฤฑ istiyorsanฤฑz bunu kaldฤฑrฤฑn veya deฤŸiลŸtirin"
+
+#: builtin/update-index.c:1198
+msgid "Untracked cache disabled"
+msgstr "ฤฐzlenmeyen รถnbellek devre dฤฑลŸฤฑ bฤฑrakฤฑldฤฑ"
+
+#: builtin/update-index.c:1206
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache 'false' olarak ayarlanmฤฑลŸ; izlenmeyen รถnbelleฤŸi "
+"gerรงekten etkinleลŸtirmek istiyorsanฤฑz bunu kaldฤฑrฤฑn veya deฤŸiลŸtirin"
+
+#: builtin/update-index.c:1210
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "ฤฐzlenmeyen รถnbellek '%s' iรงin etkinleลŸtirildi"
+
+#: builtin/update-index.c:1218
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+"core.fsmonitor ayarlanmamฤฑลŸ; dosya sistemin monitรถrรผnรผ gerรงekten "
+"etkinleลŸtirmek istiyorsanฤฑz onu ayarlayฤฑn"
+
+#: builtin/update-index.c:1222
+msgid "fsmonitor enabled"
+msgstr "dosya sistemi monitรถrรผ etkin"
+
+#: builtin/update-index.c:1225
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.fsmonitor ayarlanmฤฑลŸ; dosya sistemi monitรถrรผnรผ gerรงekten devre dฤฑลŸฤฑ "
+"bฤฑrakmak istiyorsanฤฑz onu kaldฤฑrฤฑn"
+
+#: builtin/update-index.c:1229
+msgid "fsmonitor disabled"
+msgstr "dosya sistemi monitรถrรผ devre dฤฑลŸฤฑ"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<seรงenekler>] -d <bลŸvr-adฤฑ> [<eski-deฤŸer>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
+msgstr ""
+"git update-ref [<seรงenekler>]    <bลŸvr-adฤฑ> <yeni-deฤŸer> [<eski-deฤŸer>]"
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<seรงenekler>] --stdin [-z]"
+
+#: builtin/update-ref.c:364
+msgid "delete the reference"
+msgstr "baลŸvuruyu sil"
+
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
+msgstr "<baลŸvuru-adฤฑ>'nฤฑ gรผncelleyin, iลŸaret ettiฤŸini deฤŸil"
+
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
+msgstr "stdin'de NUL ile sonlandฤฑrฤฑlan deฤŸiลŸkenler var"
+
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
+msgstr "gรผncellemeleri stdin'den oku"
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr "bilgi dosyalarฤฑnฤฑ en baลŸtan gรผncelle"
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<seรงenekler>] <dizin>"
+
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "tek bir istek/yanฤฑt deฤŸiลŸ tokuลŸundan sonra รงฤฑk"
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr "ilk baลŸvuru tanฤฑtฤฑmฤฑndan sonra hemen รงฤฑk"
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "eฤŸer <dizin> bir Git dizini deฤŸilse <dizin>/.git/ deneme"
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "aktarฤฑmฤฑ <n> saniye hareketsizlikten sonra kes"
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <gรถnderi>..."
+
+#: builtin/verify-commit.c:68
+msgid "print commit contents"
+msgstr "gรถnderi iรงeriฤŸini yazdฤฑr"
+
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr "ham gpg durum รงฤฑktฤฑsฤฑnฤฑ yazdฤฑr"
+
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..."
+
+#: builtin/verify-pack.c:65
+msgid "verbose"
+msgstr "ayrฤฑntฤฑlฤฑ anlatฤฑm"
+
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
+msgstr "yalnฤฑzca istatistikleri gรถster"
+
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<biรงim>] <etiket>..."
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr "etiket iรงeriฤŸini yazdฤฑr"
+
+#: builtin/worktree.c:17
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<seรงenekler>] <yol> [<gรถnderimsi>]"
+
+#: builtin/worktree.c:18
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<seรงenekler>]"
+
+#: builtin/worktree.c:19
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<seรงenekler>] <yol>"
+
+#: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <รง-aฤŸacฤฑ> <yeni-yol>"
+
+#: builtin/worktree.c:21
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<seรงenekler>]"
+
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<seรงenekler>] <รง-aฤŸacฤฑ>"
+
+#: builtin/worktree.c:23
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <yol>"
+
+#: builtin/worktree.c:60 builtin/worktree.c:891
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "'%s' silinemedi"
+
+#: builtin/worktree.c:79
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr "รงalฤฑลŸma-aฤŸacฤฑ/%s kaldฤฑrฤฑlฤฑyor: geรงerli bir dizin deฤŸil"
+
+#: builtin/worktree.c:85
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr "รงalฤฑลŸma-aฤŸacฤฑ/%s kaldฤฑrฤฑlฤฑyor: gitdir dosyasฤฑ yok"
+
+#: builtin/worktree.c:90 builtin/worktree.c:99
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr "รงalฤฑลŸma-aฤŸacฤฑ/%s kaldฤฑrฤฑlฤฑyor: gitdir dosyasฤฑ okunamฤฑyor (%s)"
+
+#: builtin/worktree.c:109
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"รงalฤฑลŸma-aฤŸacฤฑ/%s kaldฤฑrฤฑlฤฑyor: yetersiz veri (%<PRIuMAX> bayt bekleniyordu, "
+"%<PRIuMAX> okundu"
+
+#: builtin/worktree.c:117
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr "รงalฤฑลŸma-aฤŸacฤฑ/%s kaldฤฑrฤฑlฤฑyor: geรงersiz gitdir dosyasฤฑ"
+
+#: builtin/worktree.c:126
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr ""
+"รงalฤฑลŸma-aฤŸacฤฑ/%s kaldฤฑrฤฑlฤฑyor: gitdir dosyasฤฑ olmayan bir konuma iลŸaret "
+"ediyor"
+
+#: builtin/worktree.c:165
+msgid "report pruned working trees"
+msgstr "budanan รงalฤฑลŸma aฤŸaรงlarฤฑnฤฑ bildir"
+
+#: builtin/worktree.c:167
+msgid "expire working trees older than <time>"
+msgstr "<zaman>'dan eski รงalฤฑลŸma aฤŸaรงlarฤฑnฤฑn hรผkmรผnรผ kaldฤฑr"
+
+#: builtin/worktree.c:234
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' halihazฤฑrda var"
+
+#: builtin/worktree.c:244
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr "'%s' รงalฤฑลŸma aฤŸacฤฑ yeniden eklenemiyor"
+
+#: builtin/worktree.c:249
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+"'%s' eksik ancak kilitli bir รงalฤฑลŸma aฤŸacฤฑ;\n"
+"geรงersiz kฤฑlmak iรงin 'add -f -f', temizlemek iรงin 'unlock', 'prune' veya "
+"'remove' kullanฤฑn"
+
+#: builtin/worktree.c:251
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+"'%s' eksik ancak halihazฤฑrda kaydฤฑ yapฤฑlmฤฑลŸ bir รงalฤฑลŸma aฤŸacฤฑ;\n"
+"geรงersiz kฤฑlmak iรงin 'add -f', temizlemek iรงin 'prune' veya 'remove' kullanฤฑn"
+
+#: builtin/worktree.c:301
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "'%s' dizini oluลŸturulamadฤฑ"
+
+#: builtin/worktree.c:432 builtin/worktree.c:438
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ hazฤฑrlanฤฑyor (yeni dal '%s')"
+
+#: builtin/worktree.c:434
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ hazฤฑrlanฤฑyor ('%s' dalฤฑ sฤฑfฤฑrlanฤฑyor; %s konumundaydฤฑ)"
+
+#: builtin/worktree.c:443
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ hazฤฑrlanฤฑyor ('%s' รงฤฑkฤฑลŸ yapฤฑlฤฑyor)"
+
+#: builtin/worktree.c:449
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ hazฤฑrlanฤฑyor (ayrฤฑk HEAD %s)"
+
+#: builtin/worktree.c:490
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr "diฤŸer รงalฤฑลŸma aฤŸacฤฑnda รงฤฑkฤฑลŸ yapฤฑlmฤฑลŸ olsa bile <dal> รงฤฑkฤฑลŸฤฑnฤฑ yap"
+
+#: builtin/worktree.c:493
+msgid "create a new branch"
+msgstr "yeni bir dal oluลŸtur"
+
+#: builtin/worktree.c:495
+msgid "create or reset a branch"
+msgstr "yeni bir dal oluลŸtur veya sฤฑfฤฑrla"
+
+#: builtin/worktree.c:497
+msgid "populate the new working tree"
+msgstr "yeni รงalฤฑลŸma aฤŸacฤฑnฤฑ doldur"
+
+#: builtin/worktree.c:498
+msgid "keep the new working tree locked"
+msgstr "yeni รงalฤฑลŸma aฤŸacฤฑnฤฑ kilitli tut"
+
+#: builtin/worktree.c:501
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "izleme kipini ayarla (bkz: git-branch(1))"
+
+#: builtin/worktree.c:504
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "yeni dalฤฑn adฤฑnฤฑ bir uzak izleme dalฤฑyla eลŸleลŸtirmeyi dene"
+
+#: builtin/worktree.c:512
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B ve --detach birlikte kullanฤฑlamaz"
+
+#: builtin/worktree.c:573
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "--[no-]track yalnฤฑzca yeni bir dal oluลŸturulmuลŸsa kullanฤฑlabilir"
+
+#: builtin/worktree.c:673
+msgid "reason for locking"
+msgstr "kilitleme nedeni"
+
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' bir รงalฤฑลŸma aฤŸacฤฑ deฤŸil"
+
+#: builtin/worktree.c:687 builtin/worktree.c:720
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "Ana รงalฤฑลŸma aฤŸacฤฑ kilitlenemez veya kilidi aรงฤฑlamaz"
+
+#: builtin/worktree.c:692
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' halihazฤฑrda kilitli, nedeni: %s"
+
+#: builtin/worktree.c:694
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' halihazฤฑrda kilitli"
+
+#: builtin/worktree.c:722
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' kilitli deฤŸil"
+
+#: builtin/worktree.c:763
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "altmodรผl iรงeren รงalฤฑลŸma aฤŸaรงlarฤฑ taลŸฤฑnamaz veya kaldฤฑrฤฑlamaz"
+
+#: builtin/worktree.c:771
+msgid "force move even if worktree is dirty or locked"
+msgstr "รงalฤฑลŸma aฤŸacฤฑ kirli veya kilitli olsa bile zorla taลŸฤฑ"
+
+#: builtin/worktree.c:794 builtin/worktree.c:921
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' bir ana รงalฤฑลŸma aฤŸacฤฑ"
+
+#: builtin/worktree.c:799
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "hedef adฤฑ ลŸuradan anlaลŸฤฑlamadฤฑ: '%s'"
+
+#: builtin/worktree.c:805
+#, c-format
+msgid "target '%s' already exists"
+msgstr "'%s' hedefi halihazฤฑrda var"
+
+#: builtin/worktree.c:813
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"kilitli bir รงalฤฑลŸma aฤŸacฤฑ taลŸฤฑnamฤฑyor, kilit nedeni: %s\n"
+"geรงersiz kฤฑlmak iรงin 'move -f -f' kullanฤฑn veya รถnce kilidini aรงฤฑn"
+
+#: builtin/worktree.c:815
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"kilitli bir รงalฤฑลŸma aฤŸacฤฑ taลŸฤฑnamฤฑyor;\n"
+"geรงersiz kฤฑlmak iรงin 'move -f -f' kullanฤฑn veya รถnce kilidini aรงฤฑn"
+
+#: builtin/worktree.c:818
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "doฤŸrulama baลŸarฤฑsฤฑz, รงalฤฑลŸma aฤŸacฤฑ taลŸฤฑnamฤฑyor: %s"
+
+#: builtin/worktree.c:823
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "'%s' -> '%s' taลŸฤฑmasฤฑ baลŸarฤฑsฤฑz"
+
+#: builtin/worktree.c:871
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "'%s' รผzerinde 'git status' รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: builtin/worktree.c:875
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"'%s' deฤŸiลŸtirilmiลŸ veya izlenmeyen dosyalar iรงeriyor, silmek iรงin --force "
+"kullanฤฑn"
+
+#: builtin/worktree.c:880
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "'%s' รผzerinde 'git status' รงalฤฑลŸtฤฑrฤฑlamadฤฑ, kod %d"
+
+#: builtin/worktree.c:903
+msgid "force removal even if worktree is dirty or locked"
+msgstr "รงalฤฑลŸma aฤŸacฤฑ kirli veya kilitli olsa bile zorla kaldฤฑr"
+
+#: builtin/worktree.c:926
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"kilitli bir รงalฤฑลŸma aฤŸacฤฑ kaldฤฑrฤฑlamฤฑyor, kilit nedeni: %s\n"
+"geรงersiz kฤฑlmak iรงin 'remove -f -f' kullanฤฑn veya รถnce kilidini aรงฤฑn"
+
+#: builtin/worktree.c:928
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"kilitli bir รงalฤฑลŸma aฤŸacฤฑ kaldฤฑrฤฑlamฤฑyor;\n"
+"geรงersiz kฤฑlmak iรงin 'remove -f -f' kullanฤฑn veya รถnce kilidini aรงฤฑn"
+
+#: builtin/worktree.c:931
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "doฤŸrulama baลŸarฤฑsฤฑz, รงalฤฑลŸma aฤŸacฤฑ kaldฤฑrฤฑlamฤฑyor: %s"
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<รถnek>/]"
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr "<รถnek>/"
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "bir <รถnek> altdizini iรงin aฤŸaรง nesnesi yaz"
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr "yalnฤฑzca hata ayฤฑklama iรงin yararlฤฑ"
+
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "'mark' komutu bekleniyordu, %s alฤฑndฤฑ"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "'to' komutu bekleniyordu, %s alฤฑndฤฑ"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "'%s' รถzelliฤŸi --allow-unsafe-features olmadan girdide yasaklฤฑ"
+
+#: credential-cache--daemon.c:223
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Soket dizininizdeki izinler รงok gevลŸek; diฤŸer kullanฤฑcฤฑlar sizin\n"
+"รถnbelleฤŸe alฤฑnmฤฑลŸ yetkilerinizi okuyabilirler. ลžunu รงalฤฑลŸtฤฑrmayฤฑ dรผลŸรผnรผn:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: credential-cache--daemon.c:272
+msgid "print debugging messages to stderr"
+msgstr "hata ayฤฑklama iletilerini stderr'e yazdฤฑr"
+
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "%s gรถnderisi ulaลŸฤฑlabilir olarak imlenmedi"
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr "รงok fazla gรถnderi ulaลŸฤฑlabilir olarak imlenmiลŸ"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<seรงenekler>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "becerileri gรถsterdikten hemen sonra รงฤฑk"
+
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <yol>] [-c <ad>=<deฤŸer>]\n"
+"           [--exec-path[=<yol>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<yol>] [--work-tree=<yol>] [--namespace=<ad>]\n"
+"           <komut> [<deฤŸiลŸkenler>]"
+
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"'git help -a' ve 'git help -g' kullanฤฑlabilir komutlarฤฑ ve bazฤฑ konsept\n"
+"kฤฑlavuzlarฤฑnฤฑ listeler. Belirli bir komut veya konsept รผzerine bilgi almak\n"
+"iรงin 'git help <komut>' veya 'git help <konsept>' yazฤฑn. Genel bir gรถrรผnรผm\n"
+"iรงin 'git help git' kullanabilirsiniz."
+
+#: git.c:186
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "--git-dir iรงin dizin verilmedi\n"
+
+#: git.c:200
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "--namespace iรงin ad alanฤฑ verilmedi\n"
+
+#: git.c:214
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "--work-tree iรงin dizin verilmedi\n"
+
+#: git.c:228
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "--super-prefix iรงin รถnek verilmedi\n"
+
+#: git.c:250
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c bir yapฤฑlandฤฑrma dizisi bekliyor\n"
+
+#: git.c:288
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "-C iรงin dizin verilmedi\n"
+
+#: git.c:314
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "bilinmeyen seรงenek: %s\n"
+
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "'%s' armasฤฑ geniลŸletirilirken: '%s'"
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"'%s' armasฤฑ ortam deฤŸiลŸkenlerini deฤŸiลŸtirir.\n"
+"Bunu yapmak iรงin armada '!git' kullanabilirsiniz."
+
+#: git.c:376
+#, c-format
+msgid "empty alias for %s"
+msgstr "%s iรงin boลŸ arma"
+
+#: git.c:379
+#, c-format
+msgid "recursive alias: %s"
+msgstr "รถzyineli arma: %s"
+
+#: git.c:459
+msgid "write failure on standard output"
+msgstr "standart รงฤฑktฤฑ'da yazma hatasฤฑ"
+
+#: git.c:461
+msgid "unknown write failure on standard output"
+msgstr "standart รงฤฑktฤฑ'da bilinmeyen yazma hatasฤฑ"
+
+#: git.c:463
+msgid "close failed on standard output"
+msgstr "standart รงฤฑktฤฑ'da kapatma baลŸarฤฑsฤฑz"
+
+#: git.c:793
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "arma dรถngรผsรผ algฤฑlandฤฑ: '%s' geniลŸletilmesi sonlanmฤฑyor:%s"
+
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "%s bir yerleลŸik olarak iลŸlenemiyor"
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"kullanฤฑm: %s\n"
+"\n"
+
+#: git.c:876
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+"'%s' armasฤฑnฤฑn geniลŸletilmesi baลŸarฤฑsฤฑz oldu; '%s' bir git komutu deฤŸil\n"
+
+#: git.c:888
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "'%s' komutu รงalฤฑลŸtฤฑrฤฑlamadฤฑ: %s\n"
+
+#: http.c:378
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "http.postbuffer iรงin negatif deฤŸer; %d olarak varsayฤฑlฤฑyor"
+
+#: http.c:399
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Delegasyon denetimi cURL < 7.22.0 tarafฤฑndan desteklenmiyor"
+
+#: http.c:408
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr "Ortak anahtar iฤŸnelemesi cURL < 7.44.0 tarafฤฑndan desteklenmiyor"
+
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE cURL < 7.44.0 tarafฤฑndan desteklenmiyor"
+
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr "Protokol sฤฑnฤฑrlamalarฤฑ cURL < 7.19.4 tarafฤฑndan desteklenmiyor"
+
+#: http.c:1086
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Desteklenmeyen SSL arka ucu '%s'. Desteklenen SSL arka uรงlarฤฑ:"
+
+#: http.c:1093
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+"SSL arka ucu '%s' olarak ayarlanamadฤฑ: cURL, SSL arka uรงlarฤฑ olmadan yapฤฑlmฤฑลŸ"
+
+#: http.c:1097
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "SSL arka ucu '%s' olarak ayarlanamadฤฑ: Halihazฤฑrda ayarlanmฤฑลŸ"
+
+#: http.c:1966
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"yeniden yรถnlendirerek url tabanฤฑ gรผncellenemiyor:\n"
+" ลŸu istendi: %s\n"
+"   yรถnlenen: %s"
+
+#: remote-curl.c:166
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "push-option deฤŸerinde geรงersiz tฤฑrnak iรงine alฤฑm: '%s'"
+
+#: remote-curl.c:263
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs geรงerli deฤŸil: bu bir git deposu mu?"
+
+#: remote-curl.c:364
+msgid "invalid server response; expected service, got flush packet"
+msgstr "geรงersiz sunucu yanฤฑtฤฑ; servis bekleniyordu, floลŸ paketi alฤฑndฤฑ"
+
+#: remote-curl.c:395
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "geรงersiz sunucu yanฤฑtฤฑ; '%s' alฤฑndฤฑ"
+
+#: remote-curl.c:455
+#, c-format
+msgid "repository '%s' not found"
+msgstr "'%s' deposu bulunamadฤฑ"
+
+#: remote-curl.c:459
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "'%s' iรงin kimlik doฤŸrulamasฤฑ baลŸarฤฑsฤฑz"
+
+#: remote-curl.c:463
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "'%s' eriลŸilemiyor: %s"
+
+#: remote-curl.c:469
+#, c-format
+msgid "redirecting to %s"
+msgstr "ลŸuraya yeniden yรถnlendiriliyor: %s"
+
+#: remote-curl.c:593
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalฤฑdฤฑr"
+
+#: remote-curl.c:673
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"rpc sonrasฤฑ verisi geri sarฤฑlamฤฑyor - https.postBuffer'ฤฑ artฤฑrmayฤฑ deneyin"
+
+#: remote-curl.c:733
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC baลŸarฤฑsฤฑz oldu; %s"
+
+#: remote-curl.c:773
+msgid "cannot handle pushes this big"
+msgstr "bu kadar bรผyรผk itmeler iลŸlenemiyor"
+
+#: remote-curl.c:888
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "istek sรถndรผrรผlemiyor; 'zlib deflate' hatasฤฑ %d"
+
+#: remote-curl.c:892
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "istek sรถndรผrรผlemiyor; 'zlib end' hatasฤฑ %d"
+
+#: remote-curl.c:1023
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "programlanamayan http taลŸฤฑyฤฑcฤฑsฤฑ sฤฑฤŸ iลŸlevleri desteklemiyor"
+
+#: remote-curl.c:1038
+msgid "fetch failed."
+msgstr "getirme baลŸarฤฑsฤฑz."
+
+#: remote-curl.c:1086
+msgid "cannot fetch by sha1 over smart http"
+msgstr "akฤฑllฤฑ http รผzerinden sha1 ile getirme yapฤฑlamฤฑyor"
+
+#: remote-curl.c:1130 remote-curl.c:1136
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "protokol hatasฤฑ: sha/ref bekleniyordu, '%s' alฤฑndฤฑ"
+
+#: remote-curl.c:1148 remote-curl.c:1263
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http taลŸฤฑyฤฑcฤฑsฤฑ %s desteklemiyor"
+
+#: remote-curl.c:1184
+msgid "git-http-push failed"
+msgstr "git-http-push baลŸarฤฑsฤฑz"
+
+#: remote-curl.c:1369
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: kullanฤฑm: git remote-curl <uzak-konum> [<url>]"
+
+#: remote-curl.c:1401
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: git'ten komut akฤฑลŸฤฑ okunurken hata"
+
+#: remote-curl.c:1408
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: yerel bir depo olmadan getirme yapฤฑlmaya รงalฤฑลŸฤฑldฤฑ"
+
+#: remote-curl.c:1448
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
+
+#: list-objects-filter-options.h:85
+msgid "args"
+msgstr "deฤŸiลŸkenler"
+
+#: list-objects-filter-options.h:86
+msgid "object filtering"
+msgstr "nesne sรผzรผmรผ"
+
+#: parse-options.h:183
+msgid "expiry-date"
+msgstr "son kullanฤฑm tarihi"
+
+#: parse-options.h:197
+msgid "no-op (backward compatibility)"
+msgstr "iลŸlem yok (geriye dรถnรผk uyumluluk iรงin)"
+
+#: parse-options.h:309
+msgid "be more verbose"
+msgstr "daha ayrฤฑntฤฑlฤฑ anlat"
+
+#: parse-options.h:311
+msgid "be more quiet"
+msgstr "daha sessiz ol"
+
+#: parse-options.h:317
+msgid "use <n> digits to display SHA-1s"
+msgstr "SHA-1'leri gรถrรผntรผlemek iรงin <n> rakam kullan"
+
+#: parse-options.h:336
+msgid "how to strip spaces and #comments from message"
+msgstr "iletiden boลŸluklarฤฑ ve #yorumlarฤฑ รงฤฑkart"
+
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "yol belirtecini dosyadan oku"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"--pathspec-from-file ile, yol belirteci รถgeleri NUL karakteri ile ayrฤฑlฤฑr"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "anahtar"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "รผzerine sฤฑralanacak alan adฤฑ"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"eฤŸer olanaklฤฑysa indeksi yeniden kullanฤฑlmฤฑลŸ รงakฤฑลŸma รงรถzรผmรผ ile gรผncelle"
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD ลŸurada ayrฤฑldฤฑ: "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD ลŸundan ayrฤฑldฤฑ: "
+
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr "Dosya iรงeriฤŸini indekse ekle"
+
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "Bir posta kutusundan bir dizi yama uygula"
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "Gรถnderi bilgisini dosya iรงi aรงฤฑklama olarak ekle"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "ฤฐndekse ve/veya dosyalara bir yama uygula"
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr "Git'e bir GNU Arch deposu iรงe aktar"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "Ad verilmiลŸ aฤŸaรงtan bir dosyalar arลŸivi oluลŸtur"
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "Hatalara neden olan gรถnderiyi bulmada ikili arama kullan"
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr "Dosya satฤฑrlarฤฑnฤฑ son deฤŸiลŸtiren revizyon/yazarฤฑ gรถster"
+
+#: command-list.h:58
+msgid "List, create, or delete branches"
+msgstr "Dallar oluลŸtur, sil veya listele"
+
+#: command-list.h:59
+msgid "Move objects and refs by archive"
+msgstr "Nesneleri ve baลŸvurularฤฑ arลŸive gรถre taลŸฤฑ"
+
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
+msgstr "Depo nesneleri iรงin iรงerik veya tรผr/boyut bilgisi saฤŸla"
+
+#: command-list.h:61
+msgid "Display gitattributes information"
+msgstr "gitattributes bilgisini gรถrรผntรผle"
+
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
+msgstr "gitignore / exclude dosyalarฤฑnda hata ayฤฑkla"
+
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
+msgstr "KiลŸilerin adlarฤฑnฤฑ ve e-posta adreslerini gรถster"
+
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
+msgstr "Dal deฤŸiลŸtir veya รงalฤฑลŸma aฤŸacฤฑnฤฑ eski haline geri getir"
+
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
+msgstr "Dosyalarฤฑ indeksten รงalฤฑลŸma aฤŸacฤฑna kopyala"
+
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
+msgstr "Bir baลŸvuru adฤฑnฤฑn dรผzgรผnce oluลŸturulduฤŸundan emin ol"
+
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
+msgstr "Henรผz รผstkaynaฤŸa uygulanmayan gรถnderileri bul"
+
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
+msgstr "Mevcut bazฤฑ gรถnderilerin getirdiฤŸi deฤŸiลŸiklikleri uygula"
+
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
+msgstr "git-commit iรงin grafik tabanlฤฑ alternatif"
+
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
+msgstr "ฤฐzlenmeyen dosyalarฤฑ รงalฤฑลŸma aฤŸacฤฑndan kaldฤฑr"
+
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
+msgstr "Bir depoyu yeni bir dizine klonla"
+
+#: command-list.h:72
+msgid "Display data in columns"
+msgstr "Verileri sรผtunlarla gรถster"
+
+#: command-list.h:73
+msgid "Record changes to the repository"
+msgstr "DeฤŸiลŸikliklerin kaydฤฑnฤฑ depoya yaz"
+
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
+msgstr "Git commit-graph dosyalarฤฑnฤฑ doฤŸrula ve yaz"
+
+#: command-list.h:75
+msgid "Create a new commit object"
+msgstr "Yeni bir gรถnderi nesnesi oluลŸtur"
+
+#: command-list.h:76
+msgid "Get and set repository or global options"
+msgstr "Depoyu veya global seรงenekleri al ve ayarla"
+
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "AรงฤฑlmamฤฑลŸ nesne sayฤฑsฤฑnฤฑ ve disk kullanฤฑmฤฑnฤฑ hesapla"
+
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
+msgstr "Kullanฤฑcฤฑ yetkilerini al ve depola"
+
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Parolalarฤฑ geรงici olarak bellekte saklamak iรงin yardฤฑmcฤฑ"
+
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
+msgstr "Yetkileri diskte saklamak iรงin yardฤฑmcฤฑ"
+
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
+msgstr "Bir CVS รงฤฑkฤฑลŸฤฑna tek bir gรถnderiyi dฤฑลŸa aktar"
+
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "TiskindiฤŸiniz baลŸka bir KDY'den verileri kurtar"
+
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
+msgstr "Git iรงin bir SCV sunucusu รถykรผnรผcรผsรผ"
+
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
+msgstr "Git depolarฤฑ iรงin gerรงekten yalฤฑn bir sunucu"
+
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
+msgstr "Uygun bir baลŸvuruyu temel alฤฑp nesneye okunabilir ad ver"
+
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "Gรถnderiler, gรถnderi ve aฤŸaรงlar vb. arasฤฑ deฤŸiลŸiklikler"
+
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
+msgstr "ฤฐndeksteki ve รงalฤฑลŸma aฤŸacฤฑndaki dosyalarฤฑ sฤฑkฤฑลŸtฤฑr"
+
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
+msgstr "Bir aฤŸacฤฑ รงalฤฑลŸma aฤŸacฤฑ veya indeks ile karลŸฤฑlaลŸtฤฑr"
+
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+"ฤฐki aฤŸaรง nesnesi ile bulunan ikililerin iรงerik ve kiplerini karลŸฤฑlaลŸtฤฑr"
+
+#: command-list.h:90
+msgid "Show changes using common diff tools"
+msgstr "DeฤŸiลŸiklikleri yaygฤฑn diff araรงlarฤฑyla gรถster"
+
+#: command-list.h:91
+msgid "Git data exporter"
+msgstr "Git veri dฤฑลŸa aktarฤฑcฤฑsฤฑ"
+
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
+msgstr "Hฤฑzlฤฑ Git veri dฤฑลŸa aktarฤฑcฤฑlarฤฑ iรงin arka uรง"
+
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
+msgstr "BaลŸka bir depodan nesneleri ve baลŸvurularฤฑ indir"
+
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
+msgstr "BaลŸka bir depodan eksik nesneleri al"
+
+#: command-list.h:95
+msgid "Rewrite branches"
+msgstr "Dallarฤฑ yeniden yaz"
+
+#: command-list.h:96
+msgid "Produce a merge commit message"
+msgstr "Bir birleลŸtirme gรถnderisi iletisi oluลŸtur"
+
+#: command-list.h:97
+msgid "Output information on each ref"
+msgstr "Her baลŸvuru รผzerine bilgi รงฤฑktฤฑ ver"
+
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
+msgstr "E-posta teslimi iรงin yamalarฤฑ hazฤฑrla"
+
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "Veritab. nesnelerin baฤŸlanฤฑrlฤฑฤŸฤฑnฤฑ ve geรงerliliฤŸini sฤฑna"
+
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "Gereksiz dosyalarฤฑ temizle ve yerel depoyu eniyile"
+
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "Gรถnderi iletisini bir git-archive arลŸivinden รงฤฑkartฤฑp al"
+
+#: command-list.h:102
+msgid "Print lines matching a pattern"
+msgstr "Bir dizgi ile eลŸleลŸen satฤฑrlarฤฑ yazdฤฑr"
+
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
+msgstr "Git iรงin taลŸฤฑnabilir bir grafik arabirim"
+
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "SaฤŸlamayฤฑ hesapla ve isteฤŸe gรถre dosyadan ikili oluลŸtur"
+
+#: command-list.h:105
+msgid "Display help information about Git"
+msgstr "Git yardฤฑm bilgisini gรถrรผntรผle"
+
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
+msgstr "Git'in HTTP รผzerinden sunucu tarafฤฑ uygulamasฤฑ"
+
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
+msgstr "HTTP รผzerinden uzak bir Git deposundan indir"
+
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Nesneleri HTTP/DAV รผzerinden baลŸka bir depoya it"
+
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "stdin'den bir IMAP klasรถrรผne bir yama derlemesi gรถnder"
+
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
+msgstr "Mevcut paketli bir arลŸiv iรงin paket indeks dosyasฤฑ yap"
+
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "BoลŸ bir Git deposu oluลŸtur veya var olanฤฑ yeniden baลŸlat"
+
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
+msgstr "gitweb'deki รงalฤฑลŸma deposuna anฤฑnda gรถz at"
+
+#: command-list.h:113
+msgid "Add or parse structured information in commit messages"
+msgstr "Gรถnderi iletilerine dรผzenli bilgi ekle veya ayrฤฑลŸtฤฑr"
+
+#: command-list.h:114
+msgid "The Git repository browser"
+msgstr "Git depo tarayฤฑcฤฑsฤฑ"
+
+#: command-list.h:115
+msgid "Show commit logs"
+msgstr "Gรถnderi gรผnlรผklerini gรถster"
+
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
+msgstr "ฤฐndeks ve รงalฤฑลŸma aฤŸacฤฑndaki dosya bilgilerini gรถster"
+
+#: command-list.h:117
+msgid "List references in a remote repository"
+msgstr "Uzak bir depodaki baลŸvurularฤฑ listele"
+
+#: command-list.h:118
+msgid "List the contents of a tree object"
+msgstr "Bir aฤŸaรง nesnesinin iรงeriฤŸini listele"
+
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "E-posta iletisinden yama ve yazar bilgisini รงฤฑkart"
+
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
+msgstr "Yalฤฑn UNIX mbox bรถlรผcรผ yazฤฑlฤฑmฤฑ"
+
+#: command-list.h:121
+msgid "Join two or more development histories together"
+msgstr "ฤฐki veya daha fazla geliลŸtirme geรงmiลŸini birleลŸtir"
+
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "BirleลŸtirme iรงin olabildiฤŸince en iyi ortak atalarฤฑ bul"
+
+#: command-list.h:123
+msgid "Run a three-way file merge"
+msgstr "Bir รผรง yรถnlรผ dosya birleลŸtirmesi รงalฤฑลŸtฤฑr"
+
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
+msgstr "BirleลŸtirilmesi gereken dosyalarฤฑ birleลŸtir"
+
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
+msgstr "Bu yardฤฑmcฤฑ program git-merge-index kullanฤฑmฤฑ iรงindir"
+
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr "ร‡akฤฑลŸmalarฤฑ รงรถzmek iรงin รงรถzรผm araรงlarฤฑnฤฑ รงalฤฑลŸtฤฑr"
+
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
+msgstr "ฤฐndekse dokunmadan รผรงlรผ birleลŸtirmeyi gรถster"
+
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
+msgstr "multi-pack-index doฤŸrula ve yaz"
+
+#: command-list.h:129
+msgid "Creates a tag object"
+msgstr "Bir etiket nesnesi oluลŸtur"
+
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "ls-tree biรงimli metinden bir aฤŸaรง nesnesi yap"
+
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "Dosya, dizin veya sembolik baฤŸlarฤฑ taลŸฤฑ/yeniden adlandฤฑr"
+
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
+msgstr "Verilen revizyonlar iรงin sembolik adlarฤฑ bul"
+
+#: command-list.h:133
+msgid "Add or inspect object notes"
+msgstr "Nesne notlarฤฑ ekle veya incele"
+
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
+msgstr "Perforce depolarฤฑndan iรงe aktar ve onlara gรถnder"
+
+#: command-list.h:135
+msgid "Create a packed archive of objects"
+msgstr "PaketlenmiลŸ bir nesne arลŸivi oluลŸtur"
+
+#: command-list.h:136
+msgid "Find redundant pack files"
+msgstr "Gereksiz paket dosyalarฤฑnฤฑ bul"
+
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
+msgstr "Etkili depo eriลŸimi iรงin dal uรงlarฤฑ ve etiketler paketle"
+
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
+msgstr "Uzak depo eriลŸim parametrelerini ayrฤฑลŸtฤฑrmaya yardฤฑmcฤฑ rutinler"
+
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
+msgstr "Bir yama iรงin eลŸi olmayan numara hesapla"
+
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
+msgstr "UlaลŸฤฑlamayan tรผm nesneleri nesne veritabanฤฑndan buda"
+
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
+msgstr "Halihazฤฑrda paket dosyalarฤฑnda olan ek nesneleri kaldฤฑr"
+
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "BaลŸka bir depo veya yerel daldan getir ve entegre et"
+
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
+msgstr "ฤฐliลŸkin nesnelerle birlikte uzak baลŸvurularฤฑ da gรผncelle"
+
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Geรงerli dala bir \"Quilt\" yama seti uygula"
+
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "ฤฐki gรถnderi erimini karลŸฤฑlaลŸtฤฑr (bir dalฤฑn iki sรผrรผmรผ)"
+
+#: command-list.h:146
+msgid "Reads tree information into the index"
+msgstr "AฤŸaรง bilgisini indekse okur"
+
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
+msgstr "Gรถnderileri baลŸka bir temel ucu รผzerine uygula"
+
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
+msgstr "Depoya ne itildiyse al"
+
+#: command-list.h:149
+msgid "Manage reflog information"
+msgstr "BaลŸvuru gรผnlรผฤŸรผ bilgisini yรถnet"
+
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
+msgstr "ฤฐzlenen depolar setini yรถnet"
+
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
+msgstr "Bir depodaki paketlenmemiลŸ nesneleri paketle"
+
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
+msgstr "Nesne deฤŸiลŸtirmek iรงin baลŸvurular oluลŸtur, sil, listele"
+
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
+msgstr "Bekleyen deฤŸiลŸikliklerin bir รถzetini รงฤฑkart"
+
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "ร‡akฤฑลŸan birleลŸtirmelerin kayฤฑtlฤฑ รงรถzรผmlerini yen. kullan"
+
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
+msgstr "Geรงerli HEAD'i belirtilen duruma sฤฑfฤฑrla"
+
+#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ dosyalarฤฑnฤฑ eski durumuna getir"
+
+#: command-list.h:157
+msgid "Revert some existing commits"
+msgstr "Bazฤฑ var olan gรถnderileri geri al"
+
+#: command-list.h:158
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Gรถnderi nesnelerini ters kronolojik sฤฑrada listele"
+
+#: command-list.h:159
+msgid "Pick out and massage parameters"
+msgstr "Parametreleri al ve รผzerinde รงalฤฑลŸ"
+
+#: command-list.h:160
+msgid "Remove files from the working tree and from the index"
+msgstr "Dosyalarฤฑ รงalฤฑลŸma aฤŸacฤฑndan ve indeksten kaldฤฑr"
+
+#: command-list.h:161
+msgid "Send a collection of patches as emails"
+msgstr "Bir yama derlemesini e-posta olarak gรถnder"
+
+#: command-list.h:162
+msgid "Push objects over Git protocol to another repository"
+msgstr "Nesneleri Git protokolรผ รผzerinden baลŸka bir depoya it"
+
+#: command-list.h:163
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Yalnฤฑzca Git SSH eriลŸimi iรงin kฤฑsฤฑtlandฤฑrฤฑlmฤฑลŸ oturum aรงma kabuฤŸu"
+
+#: command-list.h:164
+msgid "Summarize 'git log' output"
+msgstr "'git log' รงฤฑktฤฑsฤฑnฤฑ รถzetle"
+
+#: command-list.h:165
+msgid "Show various types of objects"
+msgstr "ร‡eลŸitli tรผrde nesneleri gรถster"
+
+#: command-list.h:166
+msgid "Show branches and their commits"
+msgstr "Dallarฤฑ ve onlarฤฑn gรถnderilerini gรถster"
+
+#: command-list.h:167
+msgid "Show packed archive index"
+msgstr "PaketlenmiลŸ arลŸiv indeksini gรถster"
+
+#: command-list.h:168
+msgid "List references in a local repository"
+msgstr "Yerel bir depodaki baลŸvurularฤฑ listele"
+
+#: command-list.h:169
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Kabuk betikleri iรงin Git'in i18n kurulum kodu"
+
+#: command-list.h:170
+msgid "Common Git shell script setup code"
+msgstr "Ortak Git kabuk betiฤŸi kurulum kodu"
+
+#: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Aralฤฑklฤฑ รงฤฑkฤฑลŸฤฑ ilklendir ve gรผncelle"
+
+#: command-list.h:172
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Kirli bir รงalฤฑลŸma dizinindeki deฤŸiลŸiklikleri zulala"
+
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Dosya iรงeriฤŸini hazฤฑrlama alanฤฑna ekle"
+
+#: command-list.h:174
+msgid "Show the working tree status"
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑ durumunu gรถster"
+
+#: command-list.h:175
+msgid "Remove unnecessary whitespace"
+msgstr "Gereksiz boลŸluklarฤฑ kaldฤฑr"
+
+#: command-list.h:176
+msgid "Initialize, update or inspect submodules"
+msgstr "Altmodรผlleri ilklendir, gรผncelle veya incele"
+
+#: command-list.h:177
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Bir Subversion ve Git deposu arasฤฑnda iki yรถnlรผ iลŸlemler"
+
+#: command-list.h:178
+msgid "Switch branches"
+msgstr "Dal deฤŸiลŸtir"
+
+#: command-list.h:179
+msgid "Read, modify and delete symbolic refs"
+msgstr "Sembolik baลŸvurularฤฑ oku, dรผzenle ve sil"
+
+#: command-list.h:180
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "GPG imzalฤฑ bir etiket oluลŸtur, sil, listele veya doฤŸrula"
+
+#: command-list.h:181
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Bir ikili nesnenin iรงeriฤŸi ile geรงici bir dosya oluลŸtur"
+
+#: command-list.h:182
+msgid "Unpack objects from a packed archive"
+msgstr "PaketlenmiลŸ bir arลŸivden nesneleri รงฤฑkar"
+
+#: command-list.h:183
+msgid "Register file contents in the working tree to the index"
+msgstr "ร‡alฤฑลŸma aฤŸacฤฑndaki dosya iรงeriฤŸini indekse kaydet"
+
+#: command-list.h:184
+msgid "Update the object name stored in a ref safely"
+msgstr "Gรผvenlice bir baลŸvuruda depolanan nesne adฤฑnฤฑ gรผncelle"
+
+#: command-list.h:185
+msgid "Update auxiliary info file to help dumb servers"
+msgstr ""
+"Programlanamayan sunuculara destek iรงin yardฤฑmcฤฑ veri dosyasฤฑnฤฑ gรผncelle"
+
+#: command-list.h:186
+msgid "Send archive back to git-archive"
+msgstr "ArลŸivi git-archive'e geri gรถnder"
+
+#: command-list.h:187
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Nesneleri git-fetch-pack'e paketlenmiลŸ olarak geri gรถnder"
+
+#: command-list.h:188
+msgid "Show a Git logical variable"
+msgstr "Bir mantฤฑksal Git deฤŸiลŸkeni gรถster"
+
+#: command-list.h:189
+msgid "Check the GPG signature of commits"
+msgstr "Gรถnderilerin GPG imzasฤฑnฤฑ denetle"
+
+#: command-list.h:190
+msgid "Validate packed Git archive files"
+msgstr "PaketlenmiลŸ Git arลŸiv dosyalarฤฑnฤฑ doฤŸrula"
+
+#: command-list.h:191
+msgid "Check the GPG signature of tags"
+msgstr "Etiketlerin GPG imzasฤฑnฤฑ doฤŸrula"
+
+#: command-list.h:192
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web arabirimi (Git depolarฤฑ iรงin web รถn ucu)"
+
+#: command-list.h:193
+msgid "Show logs with difference each commit introduces"
+msgstr "Gรผnlรผkleri her gรถnderinin sunduฤŸu deฤŸiลŸikliklerle gรถster"
+
+#: command-list.h:194
+msgid "Manage multiple working trees"
+msgstr "Birden รงok รงalฤฑลŸma aฤŸacฤฑnฤฑ yรถnet"
+
+#: command-list.h:195
+msgid "Create a tree object from the current index"
+msgstr "Geรงerli indeksten bir aฤŸaรง nesnesi oluลŸtur"
+
+#: command-list.h:196
+msgid "Defining attributes per path"
+msgstr "ร–znitelikleri yola gรถre tanฤฑmla"
+
+#: command-list.h:197
+msgid "Git command-line interface and conventions"
+msgstr "Git komut satฤฑrฤฑ arabirimi ve kurallarฤฑ"
+
+#: command-list.h:198
+msgid "A Git core tutorial for developers"
+msgstr "GeliลŸtiriciler iรงin Git รงekirdeฤŸi eฤŸitmeni"
+
+#: command-list.h:199
+msgid "Git for CVS users"
+msgstr "CVS kullanฤฑcฤฑlarฤฑ iรงin Git"
+
+#: command-list.h:200
+msgid "Tweaking diff output"
+msgstr "diff รงฤฑktฤฑsฤฑ iรงin ince ayarlar"
+
+#: command-list.h:201
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "Gรผnlรผk Git kullanฤฑmฤฑ iรงin yararlฤฑ komutlar"
+
+#: command-list.h:202
+msgid "A Git Glossary"
+msgstr "Git Kavram Dizini"
+
+#: command-list.h:203
+msgid "Hooks used by Git"
+msgstr "Git tarafฤฑndan kullanฤฑlan kancalar"
+
+#: command-list.h:204
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "ร–zellikle yok sayฤฑlmasฤฑ istenen dosyalarฤฑ belirt"
+
+#: command-list.h:205
+msgid "Defining submodule properties"
+msgstr "Altmodรผl รถzelliklerini tanฤฑmlama"
+
+#: command-list.h:206
+msgid "Git namespaces"
+msgstr "Git ad alanlarฤฑ"
+
+#: command-list.h:207
+msgid "Git Repository Layout"
+msgstr "Git Depo YerleลŸimi"
+
+#: command-list.h:208
+msgid "Specifying revisions and ranges for Git"
+msgstr "Git iรงin revizyonlarฤฑ ve erimleri belirtme"
+
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "Bir depoyu bir baลŸkasฤฑnฤฑn iรงine baฤŸlama"
+
+#: command-list.h:210
+msgid "A tutorial introduction to Git: part two"
+msgstr "Git'e GiriลŸ: Bรถlรผm 2"
+
+#: command-list.h:211
+msgid "A tutorial introduction to Git"
+msgstr "Git'e GiriลŸ"
+
+#: command-list.h:212
+msgid "An overview of recommended workflows with Git"
+msgstr "ร–nerilen Git รงalฤฑลŸma akฤฑลŸlarฤฑna genel bakฤฑลŸ"
+
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
+msgstr "\"git bisect start\" ile baลŸlamalฤฑsฤฑnฤฑz"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Bunu sizin yerinize benim yapmamฤฑ ister misiniz [Y/n]? "
+
+#: git-bisect.sh:101
+#, sh-format
+msgid "Bad rev input: $arg"
+msgstr "Hatalฤฑ revizyon girdisi: $arg"
+
+#: git-bisect.sh:121
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Hatalฤฑ revizyon girdisi: $bisected_head"
+
+#: git-bisect.sh:130
+#, sh-format
+msgid "Bad rev input: $rev"
+msgstr "Hatalฤฑ revizyon girdisi: $rev"
+
+#: git-bisect.sh:139
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "'git bisect $TERM_BAD' yalnฤฑzca bir deฤŸiลŸken alabilir."
+
+#: git-bisect.sh:209
+msgid "No logfile given"
+msgstr "Gรผnlรผk dosyasฤฑ verilmedi"
+
+#: git-bisect.sh:210
+#, sh-format
+msgid "cannot read $file for replaying"
+msgstr "$file yeniden oynatฤฑm iรงin okunamฤฑyor"
+
+#: git-bisect.sh:232
+msgid "?? what are you talking about?"
+msgstr "?? neden sรถz ediyorsun?"
+
+#: git-bisect.sh:241
+msgid "bisect run failed: no command provided."
+msgstr "ikili arama baลŸarฤฑsฤฑz: Komut verilmedi."
+
+#: git-bisect.sh:246
+#, sh-format
+msgid "running $command"
+msgstr "$command รงalฤฑลŸtฤฑrฤฑlฤฑyor"
+
+#: git-bisect.sh:253
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+"bisect รงalฤฑลŸtฤฑrฤฑlamadฤฑ:\n"
+"รงฤฑkฤฑลŸ kodu $res, '$command' konumundan, < 0 veya >= 128"
+
+#: git-bisect.sh:279
+msgid "bisect run cannot continue any more"
+msgstr "bisect daha fazla รงalฤฑลŸtฤฑrฤฑlamฤฑyor"
+
+#: git-bisect.sh:285
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
+msgstr ""
+"ikili arama รงalฤฑลŸtฤฑrฤฑlamadฤฑ:\n"
+"'bisect_state $state' $res hata koduyla รงฤฑktฤฑ"
+
+#: git-bisect.sh:292
+msgid "bisect run success"
+msgstr "ikili arama baลŸarฤฑlฤฑ"
+
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "ฤฐkili arama yapmฤฑyoruz."
+
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Hata: BirleลŸtirme ile aลŸaฤŸฤฑdaki dosyalara olan deฤŸiลŸikliklerin รผzerine "
+"yazฤฑlacak"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "OtomatikleลŸtirilmiลŸ birleลŸtirme iลŸe yaramadฤฑ."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "Bir ahtapot birleลŸtirmesi yapฤฑlmamalฤฑ."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "$pretty_name ile olan ortak gรถnderi bulunamฤฑyor"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "$pretty_name ile her ลŸey gรผncel"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "ลžuraya ileri sarฤฑlฤฑyor: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "$pretty_name ile yalฤฑn birleลŸtirme deneniyor"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Yalฤฑn birleลŸtirme iลŸe yaramadฤฑ, otomatik birleลŸtirme deneniyor"
+
+#: git-legacy-stash.sh:221
+msgid "Cannot remove temporary index (can't happen)"
+msgstr "Geรงici indeks kaldฤฑrฤฑlamฤฑyor (olanaklฤฑ deฤŸil)"
+
+#: git-legacy-stash.sh:272
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "$ref_stash, $w_commit ile gรผncellenemiyor"
+
+#: git-legacy-stash.sh:324
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "hata: 'stash push' iรงin bilinmeyen seรงenek: $option"
+
+#: git-legacy-stash.sh:356
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "$stash_msg indeks durumu ve รงalฤฑลŸma dizini kaydedildi"
+
+#: git-legacy-stash.sh:536
+#, sh-format
+msgid "unknown option: $opt"
+msgstr "bilinmeyen seรงenek: $opt"
+
+#: git-legacy-stash.sh:556
+#, sh-format
+msgid "Too many revisions specified: $REV"
+msgstr "ร‡ok fazla revizyon belirtildi: $REV"
+
+#: git-legacy-stash.sh:571
+#, sh-format
+msgid "$reference is not a valid reference"
+msgstr "$reference geรงerli bir baลŸvuru deฤŸil"
+
+#: git-legacy-stash.sh:599
+#, sh-format
+msgid "'$args' is not a stash-like commit"
+msgstr "'$args' zula benzeri bir gรถnderi deฤŸil"
+
+#: git-legacy-stash.sh:610
+#, sh-format
+msgid "'$args' is not a stash reference"
+msgstr "'$args' bir zula baลŸvurusu deฤŸil"
+
+#: git-legacy-stash.sh:618
+msgid "unable to refresh index"
+msgstr "indeks yenilenemiyor"
+
+#: git-legacy-stash.sh:622
+msgid "Cannot apply a stash in the middle of a merge"
+msgstr "Bir birleลŸtirmenin ortasฤฑnda zula uygulanamฤฑyor"
+
+#: git-legacy-stash.sh:630
+msgid "Conflicts in index. Try without --index."
+msgstr "ฤฐndekste รงakฤฑลŸmalar var. --index olmadan deneyin."
+
+#: git-legacy-stash.sh:632
+msgid "Could not save index tree"
+msgstr "ฤฐndeks aฤŸacฤฑ kaydedilemedi"
+
+#: git-legacy-stash.sh:641
+msgid "Could not restore untracked files from stash entry"
+msgstr "ฤฐzlenmeyen dosyalar zuladan eski durumlarฤฑna getirilemedi"
+
+#: git-legacy-stash.sh:666
+msgid "Cannot unstage modified files"
+msgstr "DeฤŸiลŸtirilen dosyalar hazฤฑrlฤฑktan รงฤฑkarฤฑlamaz"
+
+#: git-legacy-stash.sh:704
+#, sh-format
+msgid "Dropped ${REV} ($s)"
+msgstr "${REV} bฤฑrakฤฑldฤฑ ($s)"
+
+#: git-legacy-stash.sh:705
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
+msgstr "${REV}: Zula girdisi bฤฑrakฤฑlamadฤฑ"
+
+#: git-legacy-stash.sh:792
+msgid "(To restore them type \"git stash apply\")"
+msgstr "(Onlarฤฑ eski durumuna getirmek iรงin \"git stash apply\" yazฤฑn)"
+
+#: git-submodule.sh:203
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Gรถreceli yol yalnฤฑzca รงalฤฑลŸma aฤŸacฤฑnฤฑn en รผst dรผzeyinden kullanฤฑlabilir"
+
+#: git-submodule.sh:213
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr "depo URL'si: '$repo' kesin olmalฤฑ veya ./|../ ile baลŸlamalฤฑdฤฑr"
+
+#: git-submodule.sh:232
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr "'$sm_path' indekste halihazฤฑrda var"
+
+#: git-submodule.sh:235
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr "'$sm_path' indekste halihazฤฑrda var ve bir altmodรผl deฤŸil"
+
+#: git-submodule.sh:242
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' รงฤฑkฤฑลŸ yapฤฑlan bir gรถnderiye iye deฤŸil"
+
+#: git-submodule.sh:273
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
+msgstr "'$sm_path' konumundaki mevcut depo indekse ekleniyor"
+
+#: git-submodule.sh:275
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr "'$sm_path' halihazฤฑrda mevcut ve geรงerli bir git deposu deฤŸil"
+
+#: git-submodule.sh:283
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr "'$sm_name' iรงin bir git deposu yerelde ลŸu uzak konumlarla bulundu:"
+
+#: git-submodule.sh:285
+#, sh-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+"  $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
+msgstr ""
+"Bu yerel git dizinini\n"
+"  $realrepo\n"
+"konumundan bir kez daha klonlamak yerine yeniden kullanmak istiyorsanฤฑz\n"
+"--force seรงeneฤŸini kullanฤฑn. EฤŸer bu git dizini doฤŸru depo deฤŸilse veya \n"
+"bunun ne anlama geldiฤŸinden emin deฤŸilseniz --name seรงeneฤŸi ile baลŸka bir\n"
+"ad seรงin."
+
+#: git-submodule.sh:291
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr "'$sm_name' altmodรผlรผ iรงin yerel git dizini yeniden etkinleลŸtiriliyor."
+
+#: git-submodule.sh:303
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr "'$sm_path' altmodรผlรผ รงฤฑkฤฑลŸ yapฤฑlamฤฑyor"
+
+#: git-submodule.sh:308
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "'$sm_path' altmodรผlรผ eklenemedi"
+
+#: git-submodule.sh:317
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "'$sm_path' altmodรผlรผ kaydฤฑ yapฤฑlamadฤฑ"
+
+#: git-submodule.sh:590
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "'$displaypath' altmodรผl yolunda geรงerli revizyon bulunamadฤฑ"
+
+#: git-submodule.sh:600
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr "'$sm_path' altmodรผl yolunda getirme yapฤฑlamadฤฑ"
+
+#: git-submodule.sh:605
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"'$sm_path' altmodรผl yolunda geรงerli ${remote_name}/${branch} revizyonu "
+"bulunamadฤฑ"
+
+#: git-submodule.sh:623
+#, sh-format
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+"'$displaypath' altmodรผl yolunda getirme yapฤฑlamadฤฑ; $sha1 doฤŸrudan "
+"getirilmeye รงalฤฑลŸฤฑlฤฑyor"
+
+#: git-submodule.sh:629
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"'$displaypath' altmodรผl yolunda getirme tamamlandฤฑ, ancak $sha1 iรงermiyor. "
+"Bu gรถnderinin doฤŸrudan getirilmesi baลŸarฤฑsฤฑz oldu."
+
+#: git-submodule.sh:636
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "'$displaypath' altmodรผl yolunda '$sha1' รงฤฑkฤฑลŸฤฑ yapฤฑlamadฤฑ"
+
+#: git-submodule.sh:637
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "Altmodรผl yolu '$displaypath': '$sha1' รงฤฑkฤฑลŸฤฑ yaptฤฑ"
+
+#: git-submodule.sh:641
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "'$sha1', '$displaypath' altmodรผl yolunda yeniden temellendirilemedi"
+
+#: git-submodule.sh:642
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "Altmodรผl yolu '$displaypath': '$sha1' iรงine yeniden temellendirildi"
+
+#: git-submodule.sh:647
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "'$sha1', '$displaypath' altmodรผl yolunda birleลŸtirilemedi"
+
+#: git-submodule.sh:648
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "Altmodรผl yolu '$displaypath': '$sha1' iรงinde birleลŸtirildi"
+
+#: git-submodule.sh:653
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "'$displaypath' altmodรผl yolunda '$command $sha1' รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: git-submodule.sh:654
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Altmodรผl yolu '$displaypath': '$command $sha1'"
+
+#: git-submodule.sh:685
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "'$displaypath' altmodรผl yoluna รถzyinelenemedi"
+
+#: git-submodule.sh:896
+msgid "The --cached option cannot be used with the --files option"
+msgstr "--cached seรงeneฤŸi --files seรงeneฤŸi ile birlikte kullanฤฑlamaz"
+
+#: git-submodule.sh:948
+#, sh-format
+msgid "unexpected mode $mod_dst"
+msgstr "beklenmedik kip $mod_dst"
+
+#: git-submodule.sh:968
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commit $sha1_src"
+msgstr "  Uyarฤฑ: $display_name, $sha1_src gรถnderisini iรงermiyor"
+
+#: git-submodule.sh:971
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr "  Uyarฤฑ: $display_name, $sha1_dst gรถnderisini iรงermiyor"
+
+#: git-submodule.sh:974
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr "  Uyarฤฑ: $display_name, $sha1_src ve $sha1_dst gรถnderilerini iรงermiyor"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Ayrฤฑntฤฑlar iรงin: git-${cmd}(1)"
+
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "KendiliฤŸinden zulalama uygulandฤฑ."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "$stash_sha1 depolanamฤฑyor"
+
+#: git-rebase--preserve-merges.sh:191
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Yeniden temellendiriliyor ($new_count/$total)"
+
+#: git-rebase--preserve-merges.sh:207
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       create a merge commit using the original merge commit's\n"
+".       message (or the oneline, if no original merge commit was\n"
+".       specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Komutlar:\n"
+"p, pick <gรถnderi> = gรถnderiyi kullan\n"
+"r, reword <gรถnderi> = gรถnderiyi kullan, ancak gรถnderi iletisini dรผzenle\n"
+"e, edit <gรถnderi> = gรถnderiyi kullan, ancak deฤŸiลŸtirme iรงin dur\n"
+"s, squash <gรถnderi> = gรถnderiyi kullan, ancak รถnceki gรถnderi iรงine karฤฑลŸtฤฑr\n"
+"f, fixup <gรถnderi> = \"squash\" gibi, ancak bu gรถnderinin gรผnlรผk iletisini "
+"at\n"
+"x, exec <gรถnderi> = komutu (satฤฑrฤฑn geri kalanฤฑ) kabuk kullanarak รงalฤฑลŸtฤฑr\n"
+"d, drop <gรถnderi> = gรถnderiyi kaldฤฑr\n"
+"l, label <etiket> = geรงerli HEAD'i bir ad ile etiketle\n"
+"t, reset <etiket> = HEAD'i bir etikete sฤฑfฤฑrla\n"
+"m, merge [-C <gรถnderi> | -c <gรถnderi>] <etiket> [# <tek-satฤฑr>]\n"
+".       orijinal birleลŸtirme gรถnderisi iletisini kullanarak bir\n"
+".       birleลŸtirme gรถnderisi oluลŸtur (veya teksatฤฑr, eฤŸer bir orijinal\n"
+".       birleลŸtirme gรถnderisi belirtilmemiลŸse). Gรถnderi iletisini yeniden\n"
+".       yazmak iรงin -c <gรถnderi> kullanฤฑn.\n"
+"\n"
+"Bu satฤฑrlar yeniden sฤฑralanabilirler, yukarฤฑdan aลŸaฤŸฤฑya รงalฤฑลŸtฤฑrฤฑlฤฑrlar.\n"
+
+#: git-rebase--preserve-merges.sh:270
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Gรถnderiyi ลŸimdi ลŸu komutla deฤŸiลŸtirebilirsiniz:\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"DeฤŸiลŸikliklerinizden memnunsanฤฑz ลŸu komutla sรผrdรผrรผn:\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--preserve-merges.sh:295
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: seรงilebilecek bir gรถnderi deฤŸil"
+
+#: git-rebase--preserve-merges.sh:334
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Geรงersiz gรถnderi adฤฑ: $sha1"
+
+#: git-rebase--preserve-merges.sh:364
+msgid "Cannot write current commit's replacement sha1"
+msgstr "Geรงerli gรถnderinin yerine geรงecek sha1 yazฤฑlamฤฑyor"
+
+#: git-rebase--preserve-merges.sh:415
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "ลžuraya ileri sar: $sha1"
+
+#: git-rebase--preserve-merges.sh:417
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "ลžuraya ileri sarฤฑlamฤฑyor: $sha1"
+
+#: git-rebase--preserve-merges.sh:426
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "HEAD ลŸuraya taลŸฤฑnamฤฑyor: $first_parent"
+
+#: git-rebase--preserve-merges.sh:431
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Bir birleลŸtirmeyi tฤฑkฤฑลŸtฤฑrma reddediliyor: $sha1"
+
+#: git-rebase--preserve-merges.sh:449
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "$sha1 birleลŸtirmesi yeniden yapฤฑlฤฑrken hata"
+
+#: git-rebase--preserve-merges.sh:458
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "$sha1 seรงilemedi"
+
+#: git-rebase--preserve-merges.sh:467
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Gรถnderi iletisi #${n}:"
+
+#: git-rebase--preserve-merges.sh:472
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "Gรถnderi iletisi #${n} atlanacak:"
+
+#: git-rebase--preserve-merges.sh:483
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "Bu $count gรถnderinin bir birleลŸimidir."
+msgstr[1] "Bu $count gรถnderinin bir birleลŸimidir."
+
+#: git-rebase--preserve-merges.sh:492
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "$fixup_msg yazฤฑlamฤฑyor"
+
+#: git-rebase--preserve-merges.sh:495
+msgid "This is a combination of 2 commits."
+msgstr "Bu 2 gรถnderinin bir birleลŸimidir."
+
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "$sha1... $rest uygulanamadฤฑ"
+
+#: git-rebase--preserve-merges.sh:611
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"$sha1... $rest baลŸarฤฑyla seรงildikten sonra gรถnderi deฤŸiลŸtirilemedi.\n"
+"Bu bรผyรผk olasฤฑlฤฑkla boลŸ bir gรถnderi iletisinden veya pre-commit kancasฤฑnฤฑn\n"
+"baลŸarฤฑsฤฑz olmasฤฑndan kaynaklฤฑdฤฑr. EฤŸer pre-commit kancasฤฑ baลŸarฤฑsฤฑz olduysa\n"
+"gรถnderiyi dรผzenleyebilmeye baลŸlamanฤฑz iรงin bu sorunu รงรถzmeniz gerekebilir."
+
+#: git-rebase--preserve-merges.sh:626
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "ลžurada duruldu: $sha1_abbrev... $rest"
+
+#: git-rebase--preserve-merges.sh:641
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "ร–ncesinde bir gรถnderi olmadan '$squash_style' yapฤฑlamฤฑyor"
+
+#: git-rebase--preserve-merges.sh:683
+#, sh-format
+msgid "Executing: $rest"
+msgstr "ร‡alฤฑลŸtฤฑrฤฑlฤฑyor: $rest"
+
+#: git-rebase--preserve-merges.sh:691
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "ร‡alฤฑลŸtฤฑrma baลŸarฤฑsฤฑz: $rest"
+
+#: git-rebase--preserve-merges.sh:693
+msgid "and made changes to the index and/or the working tree"
+msgstr "ve indekse ve/veya รงalฤฑลŸma aฤŸacฤฑna deฤŸiลŸiklikler yaptฤฑ"
+
+#: git-rebase--preserve-merges.sh:695
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Sorunu รงรถzรผp sรผrdรผrmek iรงin ลŸunu รงalฤฑลŸtฤฑrฤฑn\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--preserve-merges.sh:708
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"ร‡alฤฑลŸtฤฑrma baลŸarฤฑlฤฑ: $rest\n"
+"ancak indekse ve/veya รงalฤฑลŸma aฤŸacฤฑna deฤŸiลŸiklikler bฤฑraktฤฑ.\n"
+"DeฤŸiลŸikliklerinizi gรถnderin veya zulalayฤฑn, ardฤฑndan ลŸunu รงalฤฑลŸtฤฑrฤฑn:\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--preserve-merges.sh:719
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Bilinmeyen komut: $command $sha1 $rest"
+
+#: git-rebase--preserve-merges.sh:720
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Lรผtfen bunu 'git rebase --edit-todo' kullanarak onarฤฑn."
+
+#: git-rebase--preserve-merges.sh:755
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "$head_name baลŸarฤฑyla yeniden temellendirildi ve gรผncellendi."
+
+#: git-rebase--preserve-merges.sh:812
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "CHERRY_PICK_HEAD kaldฤฑrฤฑlamadฤฑ"
+
+#: git-rebase--preserve-merges.sh:817
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"ร‡alฤฑลŸma aฤŸacฤฑnฤฑzda hazฤฑrlanmฤฑลŸ deฤŸiลŸiklikleriniz var.\n"
+"EฤŸer bu deฤŸiลŸiklikleri bir รถnceki gรถnderiye tฤฑkฤฑลŸtฤฑrmak\n"
+"istediyseniz ลŸu komutu รงalฤฑลŸtฤฑrฤฑn:\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"EฤŸer yeni bir gรถnderi iรงinse ลŸunu รงalฤฑลŸtฤฑrฤฑn:\n"
+"\n"
+"\tgit commit $gpg_sign_opt_quoted\n"
+"\n"
+"Her iki durumda da iลŸinizi bitirdikten sonra ลŸununla sรผrdรผrรผn:\n"
+"\n"
+"\tgit rebase --continue\n"
+
+#: git-rebase--preserve-merges.sh:834
+msgid "Error trying to find the author identity to amend commit"
+msgstr "Gรถnderiyi deฤŸiลŸtirmek iรงin yazar kimliฤŸini bulmaya รงalฤฑลŸฤฑrken hata"
+
+#: git-rebase--preserve-merges.sh:839
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"ร‡alฤฑลŸma aฤŸacฤฑnฤฑzda gรถnderilmemiลŸ deฤŸiลŸiklikleriniz var. Lรผtfen รถnce onlarฤฑ\n"
+"gรถnderin ve ardฤฑndan yeniden 'git rebase --continue' รงalฤฑลŸtฤฑrฤฑn."
+
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
+msgid "Could not commit staged changes."
+msgstr "Hazฤฑrlanan deฤŸiลŸiklikler gรถnderilemedi."
+
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
+msgid "Could not execute editor"
+msgstr "Dรผzenleyici รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: git-rebase--preserve-merges.sh:900
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "$switch_to รงฤฑkฤฑลŸฤฑ yapฤฑlamadฤฑ"
+
+#: git-rebase--preserve-merges.sh:907
+msgid "No HEAD?"
+msgstr "HEAD yok mu?"
+
+#: git-rebase--preserve-merges.sh:908
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Geรงici $state_dir oluลŸturulamadฤฑ"
+
+#: git-rebase--preserve-merges.sh:911
+msgid "Could not mark as interactive"
+msgstr "EtkileลŸimli olarak imlenemedi"
+
+#: git-rebase--preserve-merges.sh:943
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] ""
+"$shortrevisions รถgesini $shortonto รผzerine yeniden temelle ($todocount komut)"
+msgstr[1] ""
+"$shortrevisions รถgesini $shortonto รผzerine yeniden temelle ($todocount komut)"
+
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "BoลŸ gรถnderilerin yorum olarak varsayฤฑldฤฑฤŸฤฑnฤฑ kenara yazฤฑn."
+
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
+msgid "Could not init rewritten commits"
+msgstr "Yeniden yazฤฑlan gรถnderiler baลŸlatฤฑlamฤฑyor"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "kullanฤฑm: $dashless $USAGE"
+
+#: git-sh-setup.sh:191
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "$cdup konumuna chdir yapฤฑlamฤฑyor, รงalฤฑลŸma aฤŸacฤฑnฤฑn en รผst dรผzeyi"
+
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "onulmaz: $program_name bir รงalฤฑลŸma aฤŸacฤฑ olmadan kullanฤฑlamaz"
+
+#: git-sh-setup.sh:221
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "Yeniden temellendirilemiyor: HazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikleriniz var."
+
+#: git-sh-setup.sh:224
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "Dallar yeniden yazฤฑlamฤฑyor: HazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikleriniz var."
+
+#: git-sh-setup.sh:227
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+"Yeniden temellendirme ile รงekilemiyor: HazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikleriniz var."
+
+#: git-sh-setup.sh:230
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "$action yapฤฑlamฤฑyor: HazฤฑrlanmamฤฑลŸ deฤŸiลŸiklikleriniz var."
+
+#: git-sh-setup.sh:243
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr ""
+"Yeniden temellendirme yapฤฑlamฤฑyor: ฤฐndeksinizde gรถnderilmemiลŸ "
+"deฤŸiลŸiklikleriniz var."
+
+#: git-sh-setup.sh:246
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"Yeniden temellendirme ile รงekilemiyor: ฤฐndeksinizde gรถnderilmemiลŸ "
+"deฤŸiลŸiklikleriniz var."
+
+#: git-sh-setup.sh:249
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "$action yapฤฑlamฤฑyor: ฤฐndeksinizde gรถnderilmemiลŸ deฤŸiลŸiklikleriniz var."
+
+#: git-sh-setup.sh:253
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Ek olarak, indeksinizde gรถnderilmemiลŸ deฤŸiลŸiklikleriniz var."
+
+#: git-sh-setup.sh:373
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "Bu komutu รงalฤฑลŸma aฤŸacฤฑnฤฑn en รผst dรผzeyinden รงalฤฑลŸtฤฑrmanฤฑz gerekiyor."
+
+#: git-sh-setup.sh:378
+msgid "Unable to determine absolute path of git directory"
+msgstr "Git dizininin kesin yolu algฤฑlanamฤฑyor"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:212
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%12s %12s %s"
+
+#: git-add--interactive.perl:634
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "%d yola dokunuldu\n"
+msgstr[1] "%d yola dokunuldu\n"
+
+#: git-add--interactive.perl:1053
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa dรผzenlenen parรงa derhal hazฤฑrlama\n"
+"iรงin imlenecektir."
+
+#: git-add--interactive.perl:1056
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa dรผzenlenen parรงa derhal zulalama\n"
+"iรงin imlenecektir."
+
+#: git-add--interactive.perl:1059
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa, dรผzenlenen parรงa derhal hazฤฑrlฤฑktan\n"
+"รงฤฑkarฤฑlma iรงin imlenecektir."
+
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa dรผzenlenen parรงa derhal uygulama\n"
+"iรงin imlenecektir."
+
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+"EฤŸer yama sorunsuzca uygulanฤฑrsa dรผzenlenen parรงa derhal ฤฑskartaya\n"
+"รงฤฑkarฤฑm iรงin imlenecektir."
+
+#: git-add--interactive.perl:1111
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "parรงa dรผzenleme dosyasฤฑ yazฤฑm iรงin aรงฤฑlamadฤฑ: %s"
+
+#: git-add--interactive.perl:1118
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"'%s' satฤฑr kaldฤฑrmak iรงin onlarฤฑ ' ' satฤฑr yapฤฑn (baฤŸlam).\n"
+"'%s' satฤฑr kaldฤฑrmak iรงin onlarฤฑ silin.\n"
+"%s ile baลŸlayan satฤฑrlar kaldฤฑrฤฑlacaktฤฑr.\n"
+
+#: git-add--interactive.perl:1140
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "parรงa dรผzenleme dosyasฤฑ okuma iรงin aรงฤฑlamadฤฑ: %s"
+
+#: git-add--interactive.perl:1248
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parรงayฤฑ hazฤฑrla\n"
+"n - bu parรงayฤฑ hazฤฑrlama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini hazฤฑrlama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ hazฤฑrla\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini hazฤฑrlama"
+
+#: git-add--interactive.perl:1254
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parรงayฤฑ zulala\n"
+"n - bu parรงayฤฑ zulalama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini zulalama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ zulala\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini zulalama"
+
+#: git-add--interactive.perl:1260
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parรงayฤฑ hazฤฑrlฤฑktan รงฤฑkar\n"
+"n - bu parรงayฤฑ hazฤฑrlฤฑktan รงฤฑkarma\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini hazฤฑrlฤฑktan รงฤฑkarma\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ hazฤฑrlฤฑktan รงฤฑkar\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini hazฤฑrlฤฑktan รงฤฑkarma"
+
+#: git-add--interactive.perl:1266
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parรงayฤฑ indekse uygula\n"
+"n - bu parรงayฤฑ indekse uygulama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini uygulama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ uygula\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini uygulama"
+
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑndan at\n"
+"n - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑndan atma\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini atma\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ at\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini atma"
+
+#: git-add--interactive.perl:1278
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑndan ve indeksten at\n"
+"n - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑndan ve indeksten atma\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini atma\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ at\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini atma"
+
+#: git-add--interactive.perl:1284
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parรงayฤฑ indekse ve รงalฤฑลŸma aฤŸacฤฑna uygula\n"
+"n - bu parรงayฤฑ indekse ve รงalฤฑลŸma aฤŸacฤฑna uygulama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini uygulama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ uygula\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini uygulama"
+
+#: git-add--interactive.perl:1296
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑna uygula\n"
+"n - bu parรงayฤฑ รงalฤฑลŸma aฤŸacฤฑna uygulama\n"
+"q - รงฤฑk; bu parรงayฤฑ veya kalanlardan herhangi birini uygulama\n"
+"a - bu parรงayฤฑ ve sonraki tรผm parรงalarฤฑ uygula\n"
+"d - bu parรงayฤฑ veya sonraki parรงalardan herhangi birini uygulama"
+
+#: git-add--interactive.perl:1311
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - gidilecek bir parรงa seรง\n"
+"/ - verilen dรผzenli ifade ile eลŸleลŸen bir parรงa ara\n"
+"j - bu parรงa iรงin sonra karar ver, bir sonraki karar verilmemiลŸ parรงayฤฑ gรถr\n"
+"J - bu parรงa iรงin sonra karar ver, bir sonraki parรงayฤฑ gรถr\n"
+"k - bu parรงa iรงin sonra karar ver, bir รถnceki karar verilmemiลŸ parรงayฤฑ gรถr\n"
+"K - bu parรงa iรงin sonra karar ver, bir รถnceki parรงayฤฑ gรถr\n"
+"s - geรงerli parรงayฤฑ daha ufak parรงalara bรถl\n"
+"e - geรงerli parรงayฤฑ el ile dรผzenle\n"
+"? - yardฤฑmฤฑ yazdฤฑr\n"
+
+#: git-add--interactive.perl:1342
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "Seรงili parรงalar indekse uygulanamฤฑyor!\n"
+
+#: git-add--interactive.perl:1357
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "birleลŸtirilmeyenler yok sayฤฑlฤฑyor: %s\n"
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Kip deฤŸiลŸimi รงalฤฑลŸma aฤŸacฤฑna uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1469
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Silme รงalฤฑลŸma aฤŸacฤฑna uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1470
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Bu parรงa รงalฤฑลŸma aฤŸacฤฑna uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1570
+msgid "No other hunks to goto\n"
+msgstr "Gidilecek baลŸka parรงa yok\n"
+
+#: git-add--interactive.perl:1588
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Geรงersiz sayฤฑ: '%s'\n"
+
+#: git-add--interactive.perl:1593
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] "รœzgรผnรผm, yalnฤฑzca %d parรงa kullanฤฑlabilir.\n"
+msgstr[1] "รœzgรผnรผm, yalnฤฑzca %d parรงa kullanฤฑlabilir.\n"
+
+#: git-add--interactive.perl:1619
+msgid "No other hunks to search\n"
+msgstr "Aranacak baลŸka parรงa yok\n"
+
+#: git-add--interactive.perl:1636
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "Hatalฤฑ oluลŸturulmuลŸ arama dรผzenli ifadesi %s: %s\n"
+
+#: git-add--interactive.perl:1646
+msgid "No hunk matches the given pattern\n"
+msgstr "Verilen dizgi ile hiรงbir parรงa eลŸleลŸmiyor\n"
+
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+msgid "No previous hunk\n"
+msgstr "ร–ncesinde parรงa yok\n"
+
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+msgid "No next hunk\n"
+msgstr "Sonrasฤฑnda parรงa yok\n"
+
+#: git-add--interactive.perl:1692
+msgid "Sorry, cannot split this hunk\n"
+msgstr "รœzgรผnรผm, bu parรงa bรถlรผnemiyor\n"
+
+#: git-add--interactive.perl:1698
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "%d parรงaya bรถlรผndรผ.\n"
+msgstr[1] "%d parรงaya bรถlรผndรผ.\n"
+
+#: git-add--interactive.perl:1708
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "รœzgรผnรผm, bu parรงa dรผzenlenemiyor\n"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1773
+msgid ""
+"status        - show paths with changes\n"
+"update        - add working tree state to the staged set of changes\n"
+"revert        - revert staged set of changes back to the HEAD version\n"
+"patch         - pick hunks and update selectively\n"
+"diff          - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status        - deฤŸiลŸiklik iรงeren yollarฤฑ gรถster\n"
+"update        - รงalฤฑลŸma aฤŸacฤฑ durumunu hazฤฑrlanan deฤŸiลŸiklik setine ekle\n"
+"revert        - hazฤฑrlanan deฤŸiลŸiklik setini HEAD sรผrรผmรผne geri al\n"
+"patch         - parรงalarฤฑ seรง ve seรงici olarak gรผncelle\n"
+"diff          - HEAD ve indeks arasฤฑndaki diff'i (ayrฤฑmlarฤฑ) gรถrรผntรผle\n"
+"add untracked - izlenmeyen dosyalarฤฑn iรงeriฤŸini hazฤฑrlanan deฤŸiลŸiklik setine "
+"ekle\n"
+
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+msgid "missing --"
+msgstr "-- eksik"
+
+#: git-add--interactive.perl:1821
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "bilinmeyen --patch kipi: %s"
+
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "geรงersiz deฤŸiลŸken %s, -- bekleniyor"
+
+#: git-send-email.perl:138
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr "yerel dilim GMT'den bir dakikadan az bir aralฤฑkla ayrฤฑmlฤฑ\n"
+
+#: git-send-email.perl:145 git-send-email.perl:151
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "yerel saat ofseti 24 saate eลŸit veya daha bรผyรผk\n"
+
+#: git-send-email.perl:223 git-send-email.perl:229
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "dรผzenleyici dรผzgรผnce รงฤฑkmadฤฑ, her ลŸey iptal ediliyor"
+
+#: git-send-email.perl:310
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr "'%s' yazmakta olduฤŸunuz e-postanฤฑn orta dรผzey bir sรผrรผmรผnรผ iรงeriyor.\n"
+
+#: git-send-email.perl:315
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' yazฤฑlan e-postayฤฑ iรงeriyor.\n"
+
+#: git-send-email.perl:408
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases diฤŸer seรงeneklerle uyumsuz\n"
+
+#: git-send-email.perl:481 git-send-email.perl:683
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "'git format-patch' bir deponun dฤฑลŸฤฑndan รงalฤฑลŸtฤฑrฤฑlamฤฑyor\n"
+
+#: git-send-email.perl:484
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"'batch-size' ve 'relogin' birlikte belirtilmeli (komut satฤฑrฤฑ veya "
+"yapฤฑlandฤฑrma seรงeneklerinden)\n"
+
+#: git-send-email.perl:497
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Bilinmeyen --suppress-cc alanฤฑ: '%s'\n"
+
+#: git-send-email.perl:528
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Bilinmeyen --confirm ayarฤฑ: '%s'\n"
+
+#: git-send-email.perl:556
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "uyarฤฑ: tฤฑrnak iรงine alฤฑnmฤฑลŸ sendmail armasฤฑ desteklenmiyor: %s\n"
+
+#: git-send-email.perl:558
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "uyarฤฑ: ':include:' desteklenmiyor: %s\n"
+
+#: git-send-email.perl:560
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "uyarฤฑ: '/file' veya '|pipe' yeniden yรถnlendirmesi desteklenmiyor: %s\n"
+
+#: git-send-email.perl:565
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "uyarฤฑ: sendmail satฤฑrฤฑ tanฤฑmlanamadฤฑ: %s\n"
+
+#: git-send-email.perl:649
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"'%s' dosyasฤฑ mevcut, ancak aynฤฑ zamanda yama รผretilecek gรถnderilerin\n"
+"bir erimi de olabilir. Lรผtfen ลŸunlarฤฑ kullanarak aรงฤฑklฤฑk getirin:\n"
+"\n"
+"\t* Bir dosya demek istiyorsanฤฑz \"./%s\" diyerek veya\n"
+"\t* Bir erim demek istiyorsanฤฑz --format-patch seรงeneฤŸini vererek\n"
+
+#: git-send-email.perl:670
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "%s opendir yapฤฑlamadฤฑ: %s"
+
+#: git-send-email.perl:694
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"onulmaz: %s: %s\n"
+"uyarฤฑ: hiรงbir yama gรถnderilmedi\n"
+
+#: git-send-email.perl:705
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Hiรงbir yama dosyasฤฑ belirtilmedi!\n"
+"\n"
+
+#: git-send-email.perl:718
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "%s iรงinde konu satฤฑrฤฑ yok mu?"
+
+#: git-send-email.perl:728
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "%s yazma iรงin aรงฤฑlamadฤฑ: %s"
+
+#: git-send-email.perl:739
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"\"GIT:\" ile baลŸlayan satฤฑrlar kaldฤฑrฤฑlacaktฤฑr.\n"
+"YazdฤฑฤŸฤฑnฤฑz yama iรงin genel bir diffstat veya iรงerik tablosu\n"
+"eklemeyi dรผลŸรผnรผn.\n"
+"\n"
+"Bir รถzet gรถndermek istemiyorsanฤฑz gรถvde kฤฑsmฤฑnฤฑ temizleyin.\n"
+
+#: git-send-email.perl:763
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "%s aรงฤฑlamadฤฑ: %s"
+
+#: git-send-email.perl:780
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "%s.final aรงฤฑlamadฤฑ: %s"
+
+#: git-send-email.perl:823
+msgid "Summary email is empty, skipping it\n"
+msgstr "ร–zet e-postasฤฑ boลŸ, atlanฤฑyor\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:858
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "<%s> kullanmak istediฤŸinizden emin misiniz [y/N]? "
+
+#: git-send-email.perl:913
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"AลŸaฤŸฤฑdaki dosyalar 8 bit, ancak Content-Transfer-Encoding desteklemiyorlar.\n"
+
+#: git-send-email.perl:918
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Hangi 8 bit kodlamayฤฑ beyan etmeliyim [UTF-8]? "
+
+#: git-send-email.perl:926
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+"Gรถnderme reddediliyor, รงรผnkรผ\n"
+"\t%s\n"
+"iรงinde '*** SUBJECT HERE ***' konu ลŸablonu var. Yine de gรถndermek "
+"istiyorsanฤฑz --force kullanฤฑn.\n"
+
+#: git-send-email.perl:945
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "E-postalar kime gรถnderilmeli (eฤŸer gerekliyse)?"
+
+#: git-send-email.perl:963
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "onulmaz: '%s' armasฤฑ kendisine geniลŸliyor\n"
+
+#: git-send-email.perl:975
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+"ฤฐlk e-posta iรงin Message-ID, In-Reply-To olarak kullanฤฑlsฤฑn mฤฑ (eฤŸer "
+"gerekliyse)?"
+
+#: git-send-email.perl:1033 git-send-email.perl:1041
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "hata: ลŸuradan geรงerli bir adres รงฤฑkartฤฑlamadฤฑ: %s\n"
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1045
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "Bu adresle ne yapฤฑlsฤฑn? ([q] รงฤฑk|[d] bฤฑrak|dรผz[e]nle): "
+
+#: git-send-email.perl:1362
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "CA yolu \"%s\" mevcut deฤŸil"
+
+#: git-send-email.perl:1445
+msgid ""
+"    The Cc list above has been expanded by additional\n"
+"    addresses found in the patch commit message. By default\n"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+"    Yukarฤฑdaki Cc listesi yama gรถnderi iletisinde bulunan adresler\n"
+"    kullanฤฑlarak geniลŸletilmiลŸtir. Bu gerรงekleลŸtiฤŸinde send-email\n"
+"    รถntanฤฑmlฤฑ olarak iletiyi gรถndermeden รถnce sorar. Bu davranฤฑลŸ\n"
+"    sendemail.confirm yapฤฑlandฤฑrma ayarฤฑyla denetlenir.\n"
+"\n"
+"    Ek bilgi iรงin 'git send-email --help' รงalฤฑลŸtฤฑrฤฑn.\n"
+"    Geรงerli davranฤฑลŸฤฑ korumak, ancak bu iletiyi susturmak iรงin\n"
+"    'git config --global sendemail.confirm auto' รงalฤฑลŸtฤฑrฤฑn.\n"
+"\n"
+
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1460
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr ""
+"Bu e-posta gรถnderilsin mi? ([y] evet|[n] hayฤฑr|dรผz[e]nle|[q] รงฤฑk|[a] tรผmรผ): "
+
+#: git-send-email.perl:1463
+msgid "Send this email reply required"
+msgstr "Bu e-postayฤฑ yanฤฑt gerektirme seรงeneฤŸiyle gรถnder"
+
+#: git-send-email.perl:1491
+msgid "The required SMTP server is not properly defined."
+msgstr "Gerekli SMTP sunucusu dรผzgรผnce tanฤฑmlanmamฤฑลŸ."
+
+#: git-send-email.perl:1538
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Sunucu STARTTLS desteklemiyor! %s"
+
+#: git-send-email.perl:1543 git-send-email.perl:1547
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS baลŸarฤฑsฤฑz oldu! %s"
+
+#: git-send-email.perl:1556
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"SMTP dรผzgรผnce baลŸlatฤฑlamฤฑyor. Yapฤฑlandฤฑrmayฤฑ denetleyin ve --smtp-debug "
+"yapฤฑn."
+
+#: git-send-email.perl:1574
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "%s gรถnderilemedi\n"
+
+#: git-send-email.perl:1577
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "%s gรถnderilir gibi yapฤฑldฤฑ\n"
+
+#: git-send-email.perl:1577
+#, perl-format
+msgid "Sent %s\n"
+msgstr "%s gรถnderildi\n"
+
+#: git-send-email.perl:1579
+msgid "Dry-OK. Log says:\n"
+msgstr "Sฤฑnama tamam. Gรผnlรผk รงฤฑktฤฑsฤฑ:\n"
+
+#: git-send-email.perl:1579
+msgid "OK. Log says:\n"
+msgstr "Tamam. Gรผnlรผk รงฤฑktฤฑsฤฑ:\n"
+
+#: git-send-email.perl:1591
+msgid "Result: "
+msgstr "Sonuรง: "
+
+#: git-send-email.perl:1594
+msgid "Result: OK\n"
+msgstr "Sonuรง: Tamam\n"
+
+#: git-send-email.perl:1612
+#, perl-format
+msgid "can't open file %s"
+msgstr "%s dosyasฤฑ aรงฤฑlamฤฑyor"
+
+#: git-send-email.perl:1659 git-send-email.perl:1679
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Cc: %s, '%s' satฤฑrฤฑndan ekleniyor\n"
+
+#: git-send-email.perl:1665
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) To: %s, '%s' satฤฑrฤฑndan ekleniyor\n"
+
+#: git-send-email.perl:1718
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non-mbox) Cc: %s, '%s' satฤฑrฤฑndan ekleniyor\n"
+
+#: git-send-email.perl:1753
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(body) Cc: %s, '%s' satฤฑrฤฑndan ekleniyor\n"
+
+#: git-send-email.perl:1864
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) '%s' รงalฤฑลŸtฤฑrฤฑlamadฤฑ"
+
+#: git-send-email.perl:1871
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n"
+
+#: git-send-email.perl:1875
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) ลŸuraya olan veri yolu kapatฤฑlamadฤฑ: '%s'"
+
+#: git-send-email.perl:1905
+msgid "cannot send message as 7bit"
+msgstr "ileti 7 bit olarak gรถnderilemiyor"
+
+#: git-send-email.perl:1913
+msgid "invalid transfer encoding"
+msgstr "geรงersiz aktarฤฑm kodlamasฤฑ"
+
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "%s aรงฤฑlamฤฑyor: %s\n"
+
+#: git-send-email.perl:1957
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "%s: yama 998 karakterden daha uzun bir satฤฑr iรงeriyor"
+
+#: git-send-email.perl:1974
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr "%s, yedek sonek '%s' ile atlanฤฑyor.\n"
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:1978
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "%s รถgesini gerรงekten gรถndermek istiyor musunuz? [y|N]: "
diff --git a/third_party/git/po/vi.po b/third_party/git/po/vi.po
index b8aa93a2c719..5459484048ad 100644
--- a/third_party/git/po/vi.po
+++ b/third_party/git/po/vi.po
@@ -2,14 +2,15 @@
 # Bแบฃn dแป‹ch tiแบฟng Viแป‡t dร nh cho GIT-CORE.
 # This file is distributed under the same license as the git-core package.
 # Nguyแป…n Thรกi Ngแปc Duy <pclouds@gmail.com>, 2012.
-# Trแบงn Ngแปc Quรขn <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
+# Trแบงn Ngแปc Quรขn <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
+# ฤoร n Trแบงn Cรดng Danh <congdanhqx@gmail.com>, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git v2.23.0-rc2\n"
+"Project-Id-Version: git v2.26.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 20:12+0800\n"
-"PO-Revision-Date: 2019-08-11 07:08+0700\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-16 08:52+0700\n"
 "Last-Translator: Trแบงn Ngแปc Quรขn <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -22,45 +23,732 @@ msgstr ""
 "X-Poedit-Basepath: ..\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Hแบฃ (%s)?"
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "khรดng thแปƒ ฤ‘แปc bแบฃng mแปฅc lแปฅc"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "nhแป‹ phรขn"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "khรดng cรณ gรฌ"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "khรดng thay ฤ‘แป•i"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "Cแบญp nhแบญt"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "khรดng thแปƒ ฤ‘ฦฐa โ€œ%sโ€ lรชn bแป‡ phรณng"
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "khรดng thแปƒ ghi bแบฃng mแปฅc lแปฅc"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "ฤ‘รฃ cแบญp nhแบญt %d ฤ‘ฦฐแปng dแบซn\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "chรบ รฝ: %s giแป ฤ‘รฃ bแป theo dรตi.\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry gแบทp lแป—i ฤ‘แป‘i vแป›i ฤ‘ฦฐแปng dแบซn โ€œ%sโ€"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "Hoร n nguyรชn"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "Khรดng thแปƒ phรขn tรญch cรบ phรกp HEAD^{tree}"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "ฤ‘รฃ hoร n nguyรชn %d ฤ‘ฦฐแปng dแบซn\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Khรดng cรณ tแบญp tin nร o chฦฐa ฤ‘ฦฐแปฃc theo dรตi.\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "Thรชm cรกc cรกi chฦฐa ฤ‘ฦฐแปฃc theo dรตi"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "ฤ‘รฃ thรชm %d ฤ‘ฦฐแปng dแบซn\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "bแป qua nhแปฏng thแปฉ chฦฐa hรฒa trแป™n: %s"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Chแป‰ cรณ cรกc tแบญp tin nhแป‹ phรขn lร  thay ฤ‘แป•i.\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "Khรดng cรณ thay ฤ‘แป•i nร o.\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "Cแบญp nhแบญt miแบฟng vรก"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "Xem xรฉt lแบกi diff"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "hiแปƒn thแป‹ ฤ‘ฦฐแปng dแบซn vแป›i cรกc thay ฤ‘แป•i"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+"thรชm trแบกng thรกi cรขy lร m viแป‡c vร o tแบญp hแปฃp cรกc thay ฤ‘แป•i ฤ‘รฃ ฤ‘ฦฐแปฃc ฤ‘ฦฐa lรชn bแป‡ "
+"phรณng"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr ""
+"hoร n nguyรชn lแบกi tแบญp hแปฃp cรกc thay ฤ‘แป•i ฤ‘รฃ ฤ‘ฦฐแปฃc ฤ‘ฦฐa lรชn bแป‡ phรณng trแปŸ lแบกi phiรชn "
+"bแบฃn HEAD"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr "chแปn cรกc โ€œkhรบcโ€ vร  cแบญp nhแบญt cรณ tuyแปƒn chแปn"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "xem khรกc biแป‡t giแปฏa HEAD vร  mแปฅc lแปฅc"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+"thรชm nแป™i dung cแปงa cรกc tแบญp tin chฦฐa ฤ‘ฦฐแปฃc theo dรตi vร o tแบญp hแปฃp cรกc thay ฤ‘แป•i ฤ‘รฃ "
+"ฤ‘ฦฐแปฃc ฤ‘ฦฐa lรชn bแป‡ phรณng"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "Trแปฃ giรบp vแป nhแบฏc:"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "chแปn mแป™t mแปฅc ฤ‘ฦกn"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "chแปn mแป™t vรนng cรกc mแปฅc"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "chแปn nhiแปu vรนng"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "chแปn mแปฅc dแปฑa trรชn tiแปn tแป‘ duy nhแบฅt"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "bแป chแปn cรกc mแปฅc ฤ‘รฃ cho"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "chแปn tแบฅt cแบฃ cรกc mแปฅc"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "(ฤ‘แปƒ trแป‘ng) hoร n tแบฅt chแปn lแปฑa"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "tรนy chแปn mแปฅc bแบฑng sแป‘"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "(ฤ‘แปƒ trแป‘ng) khรดng chแปn gรฌ"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** Lแป‡nh ***"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "Giแป thรฌ sao"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "ฤ‘รฃ ฤ‘ฦฐa lรชn bแป‡ phรณng"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "chฦฐa ฤ‘ฦฐa lรชn bแป‡ phรณng"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "ฤ‘ฦฐแปng-dแบซn"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "khรดng thแปƒ ฤ‘แปc lแบกi bแบฃng mแปฅc lแปฅc"
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "Tแบกm biแป‡t.\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Thay ฤ‘แป•i chแบฟ ฤ‘แป™ bแป‡ phรณng [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Xรณa khแปi bแป‡ phรณng [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "ฤฦฐa lรชn bแป‡ phรณng khรบc nร y [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu "
+"ฤ‘แปƒ chuyแปƒn lรชn bแป‡ phรณng."
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y\n"
+"n - ฤ‘แปซng ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y\n"
+"q - thoรกt; ฤ‘แปซng ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi\n"
+"a - ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
+"d - ฤ‘แปซng ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi trong tแบญp "
+"tin\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Thay ฤ‘แป•i chแบฟ ฤ‘แป™ tแบกm cแบฅt ฤ‘i [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Xรณa tแบกm cแบฅt [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Tแบกm cแบฅt khรบc nร y [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu "
+"ฤ‘แปƒ tแบกm cแบฅt."
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - tแบกm cแบฅt khรบc nร y\n"
+"n - ฤ‘แปซng tแบกm cแบฅt khรบc nร y\n"
+"q - thoรกt; ฤ‘แปซng tแบกm cแบฅt khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi\n"
+"a - tแบกm cแบฅt khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
+"d - ฤ‘แปซng tแบกm cแบฅt khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi trong tแบญp tin\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Thay ฤ‘แป•i chแบฟ ฤ‘แป™ bแป ra khแปi bแป‡ phรณng [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Xรณa bแป viแป‡c bแป ra khแปi bแป‡ phรณng [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Bแป ra khแปi bแป‡ phรณng khรบc nร y [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu "
+"ฤ‘แปƒ bแป ra khแปi bแป‡ phรณng."
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ฤ‘ฦฐa ra khแปi bแป‡ phรณng khรบc nร y\n"
+"n - ฤ‘แปซng ฤ‘ฦฐa ra khแปi bแป‡ phรณng khรบc nร y\n"
+"q - thoรกt; ฤ‘แปซng ฤ‘ฦฐa ra khแปi bแป‡ phรณng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn "
+"lแบกi\n"
+"a - ฤ‘ฦฐa ra khแปi bแป‡ phรณng khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
+"d - ฤ‘แปซng ฤ‘ฦฐa ra khแปi bแป‡ phรณng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi trong "
+"tแบญp tin\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "รp dแปฅng thay ฤ‘แป•i chแบฟ ฤ‘แป™ cho mแปฅc lแปฅc [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "รp dแปฅng viแป‡c xรณa vร o mแปฅc lแปฅc [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "รo dแปฅng khรบc nร y vร o mแปฅc lแปฅc [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu "
+"ฤ‘แปƒ รกp dแปฅng."
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - รกp dแปฅng khรบc nร y vร o mแปฅc lแปฅc\n"
+"n - ฤ‘แปซng รกp dแปฅng khรบc nร y vร o mแปฅc lแปฅc\n"
+"q - thoรกt; ฤ‘แปซng รกp dแปฅng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi\n"
+"a - รกp dแปฅng khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
+"d - ฤ‘แปซng รกp dแปฅng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Loแบกi bแป cรกc thay ฤ‘แป•i chแบฟ ฤ‘แป™ tแปซ cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Loแบกi bแป viแป‡c xรณa khแปi cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Loแบกi bแป khรบc nร y khแปi cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu "
+"ฤ‘แปƒ loแบกi bแป."
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - loแบกi bแป khรบc nร y khแปi cรขy lร m viแป‡c\n"
+"n - ฤ‘แปซng loแบกi bแป khรบc khแปi cรขy lร m viแป‡c\n"
+"q - thoรกt; ฤ‘แปซng loแบกi bแป khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi\n"
+"a - loแบกi bแป khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
+"d - ฤ‘แปซng loแบกi bแป khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Loแบกi bแป thay ฤ‘แป•i chแบฟ ฤ‘แป™ tแปซ mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Loแบกi bแป viแป‡c xรณa khแปi mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Loแบกi bแป khรบc nร y khแปi mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - loแบกi bแป khรบc nร y khแปi mแปฅc lแปฅc vร  cรขy lร m viแป‡c\n"
+"n - ฤ‘แปซng loแบกi bแป khรบc khแปi mแปฅc lแปฅc vร  cรขy lร m viแป‡c\n"
+"q - thoรกt; ฤ‘แปซng loแบกi bแป khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi\n"
+"a - loแบกi bแป khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
+"d - ฤ‘แปซng loแบกi bแป khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "รp dแปฅng thay ฤ‘แป•i chแบฟ ฤ‘แป™ cho mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "รp dแปฅng viแป‡c xรณa vร o mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "รp dแปฅng khรบc nร y vร o mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - รกp dแปฅng khรบc nร y vร o mแปฅc lแปฅc vร  cรขy lร m viแป‡c\n"
+"n - ฤ‘แปซng รกp dแปฅng khรบc vร o mแปฅc lแปฅc vร  cรขy lร m viแป‡c\n"
+"q - thoรกt; ฤ‘แปซng รกp dแปฅng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi\n"
+"a - รกp dแปฅng khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
+"d - ฤ‘แปซng รกp dแปฅng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - รกp dแปฅng khรบc nร y vร o cรขy lร m viแป‡c\n"
+"n - ฤ‘แปซng รกp dแปฅng khรบc vร o cรขy lร m viแป‡c\n"
+"q - thoรกt; ฤ‘แปซng รกp dแปฅng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi\n"
+"a - รกp dแปฅng khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
+"d - ฤ‘แปซng รกp dแปฅng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp phแบงn ฤ‘แบงu cแปงa khรบc โ€œ%.*sโ€"
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp phแบงn ฤ‘แบงu khรบc ฤ‘รฃ tรด mร u โ€œ%.*sโ€"
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp khรกc biแป‡t"
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "khรดng thแปƒ phรขn tรญch khรกc biแป‡t ฤ‘ฦฐแปฃc tรด mร u"
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "gแบทp lแป—i khi chแบกy โ€œ%sโ€"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "ฤ‘แบงu ra khรดng khแป›p tแปซ interactive.diffFilter"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Bแป™ lแปc cแปงa bแบกn phแบฃi duy trรฌ mแป™t quan hแป‡ mแป™t-ฤ‘แบฟn-mแป™t\n"
+"giแปฏa cรกc dรฒng ฤ‘แบงu vร o vร  ฤ‘แบงu ra cแปงa nรณ."
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"cแบงn dรฒng ngแปฏ cแบฃnh #%d trong\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"cรกc khแป‘i khรดng chแป“ng ฤ‘รจ lรชn nhau:\n"
+"%.*s\n"
+"\tkhรดng ฤ‘ฦฐแปฃc kแบฟt thรบc bแบฑng:\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Chแบฟ ฤ‘แป™ sแปญa khรบc bแบฑng tay -- xem แปŸ ฤ‘รกy ฤ‘แปƒ cรณ hฦฐแป›ng dแบซn sแปญ dแปฅng nhanh.\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"ฤแปƒ gแปก bแป dรฒng โ€œ%cโ€, sแปญa chรบng thร nh nhแปฏng dรฒng ' ' (ngแปฏ cแบฃnh).\n"
+"ฤแปƒ gรต bแป dรฒng โ€œ%cโ€, xรณa chรบng ฤ‘i.\n"
+"Nhแปฏng dรฒng bแบฏt ฤ‘แบงu bแบฑng %c sแบฝ bแป‹ loแบกi bแป.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Nแบฟu miแบฟng vรก khรดng ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, bแบกn sแบฝ cรณ mแป™t cฦก hแป™i\n"
+"ฤ‘แปƒ sแปญa lแบงn nแปฏa. Nแบฟu mแปi dรฒng cแปงa khรบc bแป‹ xรณa bแป, thแบฟ thรฌ nhแปฏng\n"
+"sแปญa dแป•i sแบฝ bแป‹ loแบกi bแป, vร  khรบc vแบซn giแปฏ nguyรชn.\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp phแบงn ฤ‘แบงu khรบc"
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' gแบทp lแป—i"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Hunk ฤ‘รฃ sแปญa cแปงa bแบกn khรดng ฤ‘ฦฐแปฃc รกp dแปฅng. Sแปญa lแบกi lแบงn nแปฏa (nรณi \"n\" ฤ‘แปƒ loแบกi "
+"bแป!) [y/n]? "
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "Cรกc khรบc ฤ‘รฃ chแปn khรดng ฤ‘ฦฐแปฃc รกp dแปฅng vร o bแบฃng mแปฅc lแปฅc!"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "Vแบซn รกp dแปฅng chรบng cho cรขy lร m viแป‡c? "
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "ฤรฃ khรดng รกp dแปฅng gรฌ cแบฃ.\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - ฤ‘แปƒ lแบกi khรบc nร y lร  chฦฐa quyแบฟt ฤ‘แป‹nh, xem khรบc chฦฐa quyแบฟt ฤ‘แป‹nh kแบฟ tiแบฟp\n"
+"J - ฤ‘แปƒ lแบกi khรบc nร y lร  chฦฐa quyแบฟt ฤ‘แป‹nh, xem khรบc kแบฟ tiแบฟp\n"
+"k - ฤ‘แปƒ lแบกi khรบc nร y lร  chฦฐa quyแบฟt ฤ‘แป‹nh, xem khรบc chฦฐa quyแบฟt ฤ‘แป‹nh kแบฟ trฦฐแป›c\n"
+"K - ฤ‘แปƒ lแบกi khรบc nร y lร  chฦฐa quyแบฟt ฤ‘แป‹nh, xem khรบc kแบฟ trฦฐแป›c\n"
+"g - chแปn mแป™t khรบc muแป‘n tแป›i\n"
+"/ - tรฌm mแป™t khรบc khแป›p vแป›i biแปƒu thแปฉc chรญnh quy ฤ‘ฦฐa ra\n"
+"s - chia khรบc hiแป‡n tแบกi thร nh cรกc khรบc nhแป hฦกn\n"
+"e - sแปญa bแบฑng tay khรบc hiแป‡n hร nh\n"
+"? - hiแปƒn thแป‹ trแปฃ giรบp\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "Khรดng cรณ khรบc kแบฟ trฦฐแป›c"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "Khรดng cรณ khรบc kแบฟ tiแบฟp"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "Khรดng cรฒn khรบc nร o ฤ‘แปƒ mร  nhแบฃy ฤ‘แบฟn"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "nhแบฃy ฤ‘แบฟn khรบc nร o (<ret> ฤ‘แปƒ xem thรชm)? "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "nhแบฃy ฤ‘แบฟn khรบc nร o? "
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Sแป‘ khรดng hแปฃp lแป‡: โ€œ%sโ€"
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Rแบฅt tiแบฟc, chแป‰ cรณ sแบตn %d khรบc."
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "Khรดng cรฒn khรบc nร o ฤ‘แปƒ mร  tรฌm kiแบฟm"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "tรฌm kiแบฟm cho biแปƒu thแปฉc chรญnh quy? "
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "ฤแป‹nh dแบกng tรฌm kiแบฟm cแปงa biแปƒu thแปฉc chรญnh quy khรดng ฤ‘รบng %s: %s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "Khรดng thแบฅy khรบc nร o khแป›p mแบซu ฤ‘รฃ cho"
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "Rแบฅt tiแบฟc, khรดng thแปƒ chia nhแป khรบc nร y"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Chi nhแป thร nh %d khรบc."
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "Rแบฅt tiแบฟc, khรดng thแปƒ sแปญa khรบc nร y"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "'git apply' gแบทp lแป—i"
+
+#: advice.c:115
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sgแปฃi รฝ: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:168
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "Cherry-picking lร  khรดng thแปƒ thแปฑc hiแป‡n bแปŸi vรฌ bแบกn cรณ nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc "
 "hรฒa trแป™n."
 
-#: advice.c:164
+#: advice.c:170
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 "Commit lร  khรดng thแปƒ thแปฑc hiแป‡n bแปŸi vรฌ bแบกn cรณ nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc hรฒa trแป™n."
 
-#: advice.c:166
+#: advice.c:172
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 "Merge lร  khรดng thแปƒ thแปฑc hiแป‡n bแปŸi vรฌ bแบกn cรณ nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc hรฒa trแป™n."
 
-#: advice.c:168
+#: advice.c:174
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 "Pull lร  khรดng thแปƒ thแปฑc hiแป‡n bแปŸi vรฌ bแบกn cรณ nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc hรฒa trแป™n."
 
-#: advice.c:170
+#: advice.c:176
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 "Revert lร  khรดng thแปƒ thแปฑc hiแป‡n bแปŸi vรฌ bแบกn cรณ nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc hรฒa trแป™n."
 
-#: advice.c:172
+#: advice.c:178
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 "Viแป‡c nร y khรดng thแปƒ thแปฑc hiแป‡n vแป›i %s bแปŸi vรฌ bแบกn cรณ nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc "
 "hรฒa trแป™n."
 
-#: advice.c:180
+#: advice.c:186
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -68,23 +756,23 @@ msgstr ""
 "Sแปญa chรบng trong cรขy lร m viแป‡c, vร  sau ฤ‘รณ dรนng lแป‡nh โ€œgit add/rm <tแบญp-tin>โ€\n"
 "dร nh riรชng cho viแป‡c ฤ‘รกnh dแบฅu cแบงn giแบฃi quyแบฟt vร  tแบกo lแบงn chuyแปƒn giao."
 
-#: advice.c:188
+#: advice.c:194
 msgid "Exiting because of an unresolved conflict."
 msgstr "Thoรกt ra bแปŸi vรฌ xung ฤ‘แป™t khรดng thแปƒ giแบฃi quyแบฟt."
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:199 builtin/merge.c:1335
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Bแบกn chฦฐa kแบฟt thรบc viแป‡c hรฒa trแป™n (MERGE_HEAD vแบซn tแป“n tแบกi)."
 
-#: advice.c:195
+#: advice.c:201
 msgid "Please, commit your changes before merging."
 msgstr "Vui lรฒng chuyแปƒn giao cรกc thay ฤ‘แป•i trฦฐแป›c khi hรฒa trแป™n."
 
-#: advice.c:196
+#: advice.c:202
 msgid "Exiting because of unfinished merge."
 msgstr "Thoรกt ra bแปŸi vรฌ viแป‡c hรฒa trแป™n khรดng hoร n tแบฅt."
 
-#: advice.c:202
+#: advice.c:208
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -212,17 +900,7 @@ msgstr "chแบฟ ฤ‘แป™ khรดng hแปฃp lแป‡ trรชn dรฒng %d: %s"
 msgid "inconsistent header lines %d and %d"
 msgstr "phแบงn ฤ‘แบงu mรขu thuแบซn dรฒng %d vร  %d"
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "chi tiแบฟt: dรฒng khรดng cแบงn: %.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "miแบฟng vรก phรขn mแบฃnh mร  khรดng cรณ phแบงn ฤ‘แบงu tแบกi dรฒng %d: %.*s"
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -234,81 +912,91 @@ msgstr[0] ""
 "phแบงn ฤ‘แบงu diff cho git  thiแบฟu thรดng tin tรชn tแบญp tin khi gแปก bแป ฤ‘i %d trong "
 "thร nh phแบงn dแบซn ฤ‘แบงu tรชn cแปงa ฤ‘ฦฐแปng dแบซn (dรฒng %d)"
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "phแบงn ฤ‘แบงu diff cho git thiแบฟu thรดng tin tรชn tแบญp tin (dรฒng %d)"
 
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "chi tiแบฟt: dรฒng khรดng cแบงn: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "miแบฟng vรก phรขn mแบฃnh mร  khรดng cรณ phแบงn ฤ‘แบงu tแบกi dรฒng %d: %.*s"
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "tแบญp tin mแป›i phแปฅ thuแป™c vร o nแป™i dung cลฉ"
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "tแบญp tin ฤ‘รฃ xรณa vแบซn cรฒn nแป™i dung"
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "miแบฟng vรก hแปng tแบกi dรฒng %d"
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "tแบญp tin mแป›i %s phแปฅ thuแป™c vร o nแป™i dung cลฉ"
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "tแบญp tin ฤ‘รฃ xรณa %s vแบซn cรฒn nแป™i dung"
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** cแบฃnh bรกo: tแบญp tin %s trแปŸ nรชn trแป‘ng rแป—ng nhฦฐng khรดng bแป‹ xรณa"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "miแบฟng vรก ฤ‘แป‹nh dแบกng nhแป‹ phรขn sai hแปng tแบกi dรฒng %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "miแบฟng vรก ฤ‘แป‹nh dแบกng nhแป‹ phรขn khรดng ฤ‘ฦฐแปฃc nhแบญn ra tแบกi dรฒng %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "vรก chแป‰ vแป›i โ€œrรกcโ€ tแบกi dรฒng %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "khรดng thแปƒ ฤ‘แปc liรชn kแบฟt mแปm %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "khรดng thแปƒ mแปŸ hay ฤ‘แปc %s"
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "sai khแปŸi ฤ‘แบงu dรฒng: โ€œ%cโ€"
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Khแป‘i dแปฏ liแป‡u #%d thร nh cรดng tแบกi %d (offset %d dรฒng)."
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "Nแป™i dung bแป‹ giแบฃm xuแป‘ng cรฒn (%ld/%ld) ฤ‘แปƒ รกp dแปฅng mแบฃnh dแปฏ liแป‡u tแบกi %d"
+msgstr "Ngแปฏ cแบฃnh bแป‹ giแบฃm xuแป‘ng cรฒn (%ld/%ld) ฤ‘แปƒ รกp dแปฅng mแบฃnh dแปฏ liแป‡u tแบกi %d"
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -317,453 +1005,439 @@ msgstr ""
 "trong khi ฤ‘ang tรฌm kiแบฟm cho:\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "thiแบฟu dแปฏ liแป‡u cแปงa miแบฟng vรก ฤ‘แป‹nh dแบกng nhแป‹ phรขn cho โ€œ%sโ€"
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "khรดng thแปƒ reverse-apply mแป™t miแบฟng vรก nhแป‹ phรขn mร  khรดng ฤ‘แบฃo ngฦฐแปฃc khรบc thร nh "
 "โ€œ%sโ€"
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "khรดng thแปƒ รกp dแปฅng miแบฟng vรก nhแป‹ phรขn thร nh โ€œ%sโ€ mร  khรดng cรณ dรฒng chแป‰ mแปฅc ฤ‘แบงy "
 "ฤ‘แปง"
 
-#: apply.c:3151
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 "miแบฟng vรก รกp dแปฅng cho โ€œ%sโ€ (%s), cรกi mร  khรดng khแป›p vแป›i cรกc nแป™i dung hiแป‡n tแบกi."
 
-#: apply.c:3159
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "miแบฟng vรก รกp dแปฅng cho mแป™t โ€œ%sโ€ trแป‘ng rแป—ng nhฦฐng nรณ lแบกi khรดng trแป‘ng"
 
-#: apply.c:3177
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "khรดng thแปƒ ฤ‘แปc postimage %s cแบงn thiแบฟt cho โ€œ%sโ€"
 
-#: apply.c:3190
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "miแบฟng vรก ฤ‘แป‹nh dแบกng nhแป‹ phรขn khรดng ฤ‘ฦฐแปฃc รกp dแปฅng cho โ€œ%sโ€"
 
-#: apply.c:3196
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "vรก nhแป‹ phรขn cho โ€œ%sโ€ tแบกo ra kแบฟt quแบฃ khรดng chรญnh xรกc (mong chแป %s, lแบกi nhแบญn "
 "%s)"
 
-#: apply.c:3217
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "gแบทp lแป—i khi vรก: %s:%ld"
 
-#: apply.c:3340
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "khรดng thแปƒ lแบฅy ra %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
 #, c-format
 msgid "failed to read %s"
 msgstr "gแบทp lแป—i khi ฤ‘แปc %s"
 
-#: apply.c:3400
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "ฤ‘แปc tแปซ โ€œ%sโ€ vฦฐแปฃt ra ngoร i liรชn kแบฟt mแปm"
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "ฤ‘ฦฐแปng dแบซn %s ฤ‘รฃ bแป‹ xรณa hoแบทc ฤ‘แป•i tรชn"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: khรดng tแป“n tแบกi trong bแบฃng mแปฅc lแปฅc"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: khรดng khแป›p trong mแปฅc lแปฅc"
 
-#: apply.c:3559
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr "kho thiแบฟu ฤ‘แป‘i tฦฐแปฃng blob cแบงn thiแบฟt ฤ‘แปƒ trแปŸ vแป trรชn โ€œ3-way mergeโ€."
 
-#: apply.c:3562
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "ฤang trแปŸ lแบกi hรฒa trแป™n โ€œ3-ฤ‘ฦฐแปngโ€โ€ฆ\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "khรดng thแปƒ ฤ‘แปc nแป™i dung hiแป‡n hร nh cแปงa โ€œ%sโ€"
 
-#: apply.c:3594
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Gแบทp lแป—i khi quay trแปŸ lแบกi ฤ‘แปƒ hรฒa trแป™n kiแปƒu โ€œthree-wayโ€โ€ฆ\n"
 
-#: apply.c:3608
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "ฤรฃ รกp dแปฅng miแบฟng vรก %s vแป›i cรกc xung ฤ‘แป™t.\n"
 
-#: apply.c:3613
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "ฤรฃ รกp dแปฅng miแบฟng vรก %s mแป™t cรกch sแบกch sแบฝ.\n"
 
-#: apply.c:3639
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "loแบกi bแป miแบฟng vรก ฤ‘แปƒ lแบกi nแป™i dung tแบญp tin"
 
-#: apply.c:3712
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: sai kiแปƒu"
 
-#: apply.c:3714
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s cรณ kiแปƒu %o, cแบงn %o"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ฤ‘ฦฐแปng dแบซn khรดng hแปฃp lแป‡ โ€œ%sโ€"
 
-#: apply.c:3923
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ฤ‘รฃ cรณ tแปซ trฦฐแป›c trong bแบฃng mแปฅc lแปฅc"
 
-#: apply.c:3926
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ฤ‘รฃ sแบตn cรณ trong thฦฐ mแปฅc ฤ‘ang lร m viแป‡c"
 
-#: apply.c:3946
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "chแบฟ ฤ‘แป™ mแป›i (%o) cแปงa %s khรดng khแป›p vแป›i chแบฟ ฤ‘แป™ cลฉ (%o)"
 
-#: apply.c:3951
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "chแบฟ ฤ‘แป™ mแป›i (%o) cแปงa %s khรดng khแป›p vแป›i chแบฟ ฤ‘แป™ cลฉ (%o) cแปงa %s"
 
-#: apply.c:3971
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "tแบญp tin chแป‹u tรกc ฤ‘แป™ng โ€œ%sโ€ vฦฐแปฃt ra ngoร i liรชn kแบฟt mแปm"
 
-#: apply.c:3975
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: miแบฟng vรก khรดng ฤ‘ฦฐแปฃc รกp dแปฅng"
 
-#: apply.c:3990
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr "ฤang kiแปƒm tra miแบฟng vรก %sโ€ฆ"
 
-#: apply.c:4082
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "thรดng tin sha1 thiแบฟu hoแบทc khรดng dรนng ฤ‘ฦฐแปฃc cho mรด-ฤ‘un %s"
 
-#: apply.c:4089
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "thay ฤ‘แป•i chแบฟ ฤ‘แป™ cho %s, cรกi mร  khรดng phแบฃi lร  HEAD hiแป‡n tแบกi"
 
-#: apply.c:4092
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "thรดng tin sha1 cรฒn thiแบฟu hay khรดng dรนng ฤ‘ฦฐแปฃc(%s)."
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry gแบทp lแป—i ฤ‘แป‘i vแป›i ฤ‘ฦฐแปng dแบซn โ€œ%sโ€"
-
-#: apply.c:4101
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "khรดng thแปƒ thรชm %s vร o chแป‰ mแปฅc tแบกm thแปi"
 
-#: apply.c:4111
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "khรดng thแปƒ ghi mแปฅc lแปฅc tแบกm vร o %s"
 
-#: apply.c:4249
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "khรดng thแปƒ gแปก bแป %s tแปซ mแปฅc lแปฅc"
 
-#: apply.c:4283
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "miแบฟng vรก sai hแปng cho mรด-ฤ‘un-con %s"
 
-#: apply.c:4289
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "khรดng thแปƒ lแบฅy thแป‘ng kรช vแป tแบญp tin %s mแป›i hฦกn ฤ‘รฃ ฤ‘ฦฐแปฃc tแบกo"
 
-#: apply.c:4297
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "khรดng thแปƒ tแบกo โ€œkho lฦฐu ฤ‘แบฑng sauโ€ cho tแบญp tin ฤ‘ฦฐแปฃc tแบกo mแป›i hฦกn %s"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "khรดng thแปƒ thรชm mแปฅc nhแป› ฤ‘แป‡m cho %s"
 
-#: apply.c:4346
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "gแบทp lแป—i khi ghi vร o โ€œ%sโ€"
 
-#: apply.c:4350
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr "ฤ‘ang ฤ‘รณng tแบญp tin โ€œ%sโ€"
 
-#: apply.c:4420
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "khรดng thแปƒ ghi vร o tแบญp tin โ€œ%sโ€ chแบฟ ฤ‘แป™ %o"
 
-#: apply.c:4518
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "ฤรฃ รกp dแปฅng miแบฟng vรก %s mแป™t cรกch sแบกch sแบฝ."
 
-#: apply.c:4526
+#: apply.c:4539
 msgid "internal error"
 msgstr "lแป—i nแป™i bแป™"
 
-#: apply.c:4529
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "ฤang รกp dแปฅng miแบฟng vรก %%s vแป›i %d lแบงn tแปซ chแป‘iโ€ฆ"
 
-#: apply.c:4540
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "ฤ‘ang cแบฏt ngแบฏn tรชn tแบญp tin .rej thร nh %.*s.rej"
 
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
 #, c-format
 msgid "cannot open %s"
 msgstr "khรดng mแปŸ ฤ‘ฦฐแปฃc โ€œ%sโ€"
 
-#: apply.c:4562
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Khแป‘i nhแป› #%d ฤ‘ฦฐแปฃc รกp dแปฅng gแปn gร ng."
 
-#: apply.c:4566
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "ฤoแบกn dแปฏ liแป‡u #%d bแป‹ tแปซ chแป‘i."
 
-#: apply.c:4676
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Bแป qua ฤ‘ฦฐแปng dแบซn โ€œ%sโ€."
 
-#: apply.c:4684
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr "khรดng thแปซa nhแบญn ฤ‘แบงu vร o"
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr "khรดng thแปƒ ฤ‘แปc tแบญp tin lฦฐu bแบฃng mแปฅc lแปฅc"
 
-#: apply.c:4859
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "khรดng thแปƒ mแปŸ miแบฟng vรก โ€œ%sโ€: %s"
 
-#: apply.c:4886
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "ฤ‘รฃ chแบฅm dแปฉt %d lแป—i khoแบฃng trแบฏng"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d dรฒng thรชm khoแบฃng trแบฏng lแป—i."
 
-#: apply.c:4900
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d dรฒng ฤ‘ฦฐแปฃc รกp dแปฅng sau khi sแปญa cรกc lแป—i khoแบฃng trแบฏng."
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "Khรดng thแปƒ ghi tแบญp tin lฦฐu bแบฃng mแปฅc lแปฅc mแป›i"
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "ฤ‘ฦฐแปng-dแบซn"
-
-#: apply.c:4944
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr "khรดng รกp dแปฅng cรกc thay ฤ‘แป•i khแป›p vแป›i ฤ‘ฦฐแปng dแบซn ฤ‘รฃ cho"
 
-#: apply.c:4947
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr "รกp dแปฅng cรกc thay ฤ‘แป•i khแป›p vแป›i ฤ‘ฦฐแปng dแบซn ฤ‘รฃ cho"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4973 builtin/am.c:2260
 msgid "num"
 msgstr "sแป‘"
 
-#: apply.c:4950
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "gแปก bแป <sแป‘> dแบฅu gแบกch chรฉo dแบซn ฤ‘แบงu tแปซ ฤ‘ฦฐแปng dแบซn diff cแป• ฤ‘iแปƒn"
 
-#: apply.c:4953
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr "lแป ฤ‘i phแบงn bแป• xung ฤ‘ฦฐแปฃc tแบกo ra bแปŸi miแบฟng vรก"
 
-#: apply.c:4955
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "thay vรฌ รกp dแปฅng mแป™t miแบฟng vรก, kแบฟt xuแบฅt kแบฟt quแบฃ tแปซ lแป‡nh diffstat cho ฤ‘แบงu ra"
 
-#: apply.c:4959
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "hiแปƒn thแป‹ sแป‘ lฦฐแปฃng cรกc dรฒng ฤ‘ฦฐแปฃc thรชm vร o vร  xรณa ฤ‘i theo kรฝ hiแป‡u thแบญp phรขn"
 
-#: apply.c:4961
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "thay vรฌ รกp dแปฅng mแป™t miแบฟng vรก, kแบฟt xuแบฅt kแบฟt quแบฃ cho ฤ‘แบงu vร o"
 
-#: apply.c:4963
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "thay vรฌ รกp dแปฅng miแบฟng vรก, hรฃy xem xem miแบฟng vรก cรณ thรญch hแปฃp khรดng"
 
-#: apply.c:4965
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr "hรฃy chแบฏc chแบฏn lร  miแบฟng vรก thรญch hแปฃp vแป›i bแบฃng mแปฅc lแปฅc hiแป‡n hร nh"
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "ฤ‘รกnh dแบฅu cรกc tแบญp tin mแป›i vแป›i โ€œgit add --intent-to-addโ€"
 
-#: apply.c:4969
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr "รกp dแปฅng mแป™t miแบฟng vรก mร  khรดng ฤ‘แป™ng chแบกm ฤ‘แบฟn cรขy lร m viแป‡c"
 
-#: apply.c:4971
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr "chแบฅp nhแบญn mแป™t miแบฟng vรก mร  khรดng ฤ‘แป™ng chแบกm ฤ‘แบฟn cรขy lร m viแป‡c"
 
-#: apply.c:4974
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "ฤ‘แป“ng thแปi รกp dแปฅng miแบฟng vรก (dรนng vแป›i tรนy chแปn --stat/--summary/--check)"
 
-#: apply.c:4976
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "thแปญ hรฒa trแป™n kiแปƒu three-way nแบฟu viแป‡c vรก khรดng thแปƒ thแปฑc hiแป‡n ฤ‘ฦฐแปฃc"
 
-#: apply.c:4978
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "xรขy dแปฑng bแบฃng mแปฅc lแปฅc tแบกm thแปi trรชn cฦก sแปŸ thรดng tin bแบฃng mแปฅc lแปฅc ฤ‘ฦฐแปฃc nhรบng"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr "cรกc ฤ‘ฦฐแปng dแบซn bแป‹ ngฤƒn cรกch bแปŸi kรฝ tแปฑ NULL"
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
-msgstr "ฤ‘แบฃm bแบฃo rแบฑng cรณ รญt nhแบฅt <n> dรฒng nแป™i dung khแป›p"
+msgstr "ฤ‘แบฃm bแบฃo rแบฑng cรณ รญt nhแบฅt <n> dรฒng ngแปฏ cแบฃnh khแป›p"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
 msgid "action"
 msgstr "hร nh ฤ‘แป™ng"
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "tรฌm thแบฅy mแป™t dรฒng mแป›i hoแบทc bแป‹ sแปญa ฤ‘แป•i mร  nรณ cรณ lแป—i do khoแบฃng trแบฏng"
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
-msgstr "lแป ฤ‘i sแปฑ thay ฤ‘แป•i do khoแบฃng trแบฏng gรขy ra khi quรฉt nแป™i dung"
+msgstr "lแป ฤ‘i sแปฑ thay ฤ‘แป•i do khoแบฃng trแบฏng gรขy ra khi tรฌm ngแปฏ cแบฃnh"
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr "รกp dแปฅng miแบฟng vรก theo chiแปu ngฦฐแปฃc"
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "don't expect at least one line of context"
-msgstr "ฤ‘แปซng hy vแปng cรณ รญt nhแบฅt mแป™t dรฒng nแป™i dung"
+msgstr "ฤ‘แปซng hy vแปng cรณ รญt nhแบฅt mแป™t dรฒng ngแปฏ cแบฃnh"
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "ฤ‘แปƒ lแบกi khแป‘i dแปฏ liแป‡u bแป‹ tแปซ chแป‘i trong cรกc tแบญp tin *.rej tฦฐฦกng แปฉng"
 
-#: apply.c:5000
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr "cho phรฉp chแป“ng khแป‘i nhแป›"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "chi tiแบฟt"
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "ฤ‘รฃ dรฒ tรฌm thแบฅy dung sai khรดng chรญnh xรกc thiแบฟu dรฒng mแป›i tแบกi cuแป‘i tแบญp tin"
 
-#: apply.c:5006
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr "khรดng tin sแป‘ lฦฐแปฃng dรฒng trong phแบงn ฤ‘แบงu khแป‘i dแปฏ liแป‡u"
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5032 builtin/am.c:2248
 msgid "root"
 msgstr "gแป‘c"
 
-#: apply.c:5009
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr "treo thรชm <root> vร o tแบฅt cแบฃ cรกc tรชn tแบญp tin"
 
@@ -786,7 +1460,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <kho> [--exec <lแป‡nh>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng khแป›p vแป›i bแบฅt kแปณ tแบญp tin nร o"
@@ -818,7 +1492,7 @@ msgstr "ฤ‘แป‹nh_dแบกng"
 msgid "archive format"
 msgstr "ฤ‘แป‹nh dแบกng lฦฐu trแปฏ"
 
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr "tiแปn_tแป‘"
 
@@ -826,11 +1500,12 @@ msgstr "tiแปn_tแป‘"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "nแป‘i thรชm tiแปn tแป‘ vร o tแปซng ฤ‘ฦฐแปng dแบซn tแบญp tin trong kho lฦฐu"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr "tแบญp_tin"
 
@@ -863,7 +1538,7 @@ msgid "list supported archive formats"
 msgstr "liแป‡t kรช cรกc kiแปƒu nรฉn ฤ‘ฦฐแปฃc hแป— trแปฃ"
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr "kho"
 
@@ -871,7 +1546,7 @@ msgstr "kho"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "nhแบญn kho nรฉn tแปซ kho chแปฉa <kho> trรชn mรกy chแปง"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "lแป‡nh"
@@ -902,66 +1577,66 @@ msgstr "Khรดng hiแปƒu ฤ‘แป‹nh dแบกng โ€œ%sโ€"
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Tham sแป‘ khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ cho ฤ‘แป‹nh dแบกng โ€œ%sโ€: -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:351
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "khรดng thแปƒ stream blob โ€œ%sโ€"
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:369
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "chแบฟ ฤ‘แป™ tแบญp tin lแปฅc khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ: 0%o (SHA1: %s)"
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:359
 #, c-format
 msgid "cannot read %s"
 msgstr "khรดng thแปƒ ฤ‘แปc %s"
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "khรดng thแปƒ bแบฏt ฤ‘แบงu bแป™ lแปc โ€œ%sโ€"
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr "khรดng thแปƒ chuyแปƒn hฦฐแป›ng mรด tแบฃ"
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "bแป™ lแปc โ€œ%sโ€ ฤ‘รฃ bรกo cรกo lแป—i"
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "ฤ‘ฦฐแปng dแบซn khรดng hแปฃp lแป‡ UTF-8: %s"
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "ฤ‘ฦฐแปng dแบซn quรก dร i (%d kรฝ tแปฑ, SHA1: %s): %s"
 
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
 #, c-format
 msgid "deflate error (%d)"
 msgstr "lแป—i giแบฃi nรฉn (%d)"
 
-#: archive-zip.c:609
+#: archive-zip.c:615
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "dแบฅu vแบฟt thแปi gian lร  quรก lแป›n cho hแป‡ thแป‘ng nร y: %<PRIuMAX>"
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s khรดng phแบฃi tรชn thuแป™c tรญnh hแปฃp lแป‡"
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s khรดng ฤ‘ฦฐแปฃc phรฉp: %s:%d"
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -979,12 +1654,12 @@ msgstr "Nแป™i dung ฤ‘ฦฐแปฃc trรญch dแบซn sai trong tแบญp tin โ€œ%sโ€: %s"
 msgid "We cannot bisect more!\n"
 msgstr "Chรบng tรดi khรดng bisect thรชm nแปฏa!\n"
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Khรดng phแบฃi tรชn ฤ‘แป‘i tฦฐแปฃng commit %s hแปฃp lแป‡"
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -993,7 +1668,7 @@ msgstr ""
 "Hรฒa trแป™n trรชn %s lร  sai.\n"
 "ฤiแปu ฤ‘รณ cรณ nghฤฉa lร  lแป—i ฤ‘รฃ ฤ‘ฦฐแปฃc sแปญa chแปฏa giแปฏa %s vร  [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1002,7 +1677,7 @@ msgstr ""
 "Hรฒa trแป™n trรชn %s lร  mแป›i.\n"
 "Gแบงn nhฦฐ chแบฏc chแบฏn lร  cรณ thay ฤ‘แป•i giแปฏa %s vร  [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1011,7 +1686,7 @@ msgstr ""
 "Hรฒa trแป™n trรชn %s lร  %s.\n"
 "ฤiแปu ฤ‘รณ cรณ nghฤฉa lร  lแบงn chuyแปƒn giao โ€œ%sโ€ ฤ‘แบงu tiรชn lร  giแปฏa %s vร  [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1022,7 +1697,7 @@ msgstr ""
 "git bisect khรดng thแปƒ lร m viแป‡c ฤ‘รบng ฤ‘แบฏn trong trฦฐแปng hแปฃp nร y.\n"
 "Liแป‡u cรณ phแบฃi bแบกn nhแบงm lแบซn cรกc ฤ‘iแปƒm %s vร  %s khรดng?\n"
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1034,36 +1709,36 @@ msgstr ""
 "%s.\n"
 "Chรบng tรดi vแบซn cแปฉ tiแบฟp tแปฅc."
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisecting: nแปn hรฒa trแป™n cแบงn phแบฃi ฤ‘ฦฐแปฃc kiแปƒm tra\n"
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr "cแบงn mแป™t ฤ‘iแปƒm xรฉt duyแป‡t %s"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
 #, c-format
 msgid "could not create file '%s'"
 msgstr "khรดng thแปƒ tแบกo tแบญp tin โ€œ%sโ€"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
 #, c-format
 msgid "could not read file '%s'"
 msgstr "khรดng thแปƒ ฤ‘แปc tแบญp tin โ€œ%sโ€"
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr "viแป‡c ฤ‘แปc tham chiแบฟu bisect gแบทp lแป—i"
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s lร  cแบฃ %s vร  %s\n"
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1072,7 +1747,7 @@ msgstr ""
 "Khรดng tรฌm thแบฅy lแบงn chuyแปƒn giao kiแปƒm tra ฤ‘ฦฐแปฃc nร o.\n"
 "Cรณ lแบฝ bแบกn bแบฏt ฤ‘แบงu vแป›i cรกc tham sแป‘ ฤ‘ฦฐแปng dแบซn sai?\n"
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1081,46 +1756,46 @@ msgstr[0] "(ฦฐแป›c chแปซng %d bฦฐแป›c)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisecting: cรฒn %d ฤ‘iแปƒm xรฉt duyแป‡t ฤ‘แปƒ kiแปƒm sau %s nร y\n"
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr "tรนy chแปn--contents vร  --reverse khรดng ฤ‘ฦฐแปฃc trแป™n vร o nhau."
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr "khรดng thแปƒ dรนng --contents vแป›i tรชn ฤ‘แป‘i tฦฐแปฃng chuyแปƒn giao cuแป‘i cรนng"
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "cรนng sแปญ dแปฅng --reverse vร  --first-parent cแบงn chแป‰ ฤ‘แป‹nh lแบงn chuyแปƒn giao cuแป‘i"
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "cร i ฤ‘แบทt viแป‡c di chuyแปƒn qua cรกc ฤ‘iแปƒm xรฉt duyแป‡t gแบทp lแป—i"
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "cรนng sแปญ dแปฅng --reverse --first-parent yรชu cแบงu vรนng cรนng vแป›i chuแป—i cha-mแบน-ฤ‘แบงu-"
 "tiรชn"
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr "khรดng cรณ ฤ‘ฦฐแปng dแบซn %s trong โ€œ%sโ€"
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "khรดng thแปƒ ฤ‘แปc blob %s cho ฤ‘ฦฐแปng dแบซn โ€œ%sโ€"
@@ -1276,8 +1951,8 @@ msgstr "โ€œ%sโ€ khรดng giแป‘ng nhฦฐ tแบญp tin v2 bundle (ฤ‘แป‹nh dแบกng dump cแ
 msgid "unrecognized header: %s%s (%d)"
 msgstr "phแบงn ฤ‘แบงu khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
 #, c-format
 msgid "could not open '%s'"
 msgstr "khรดng thแปƒ mแปŸ โ€œ%sโ€"
@@ -1306,62 +1981,62 @@ msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Lแป‡nh bundle yรชu cแบงu %d tham chiแบฟu nร y:"
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr "khรดng thแปƒ nhรขn ฤ‘รดi bแป™ mรด tแบฃ bundle"
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "Khรดng thแปƒ sแบฃn sinh ฤ‘แป‘i tฦฐแปฃng gรณi"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "ฤ‘แป‘i tฦฐแปฃng gรณi ฤ‘รฃ chแบฟt"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "rev-list ฤ‘รฃ chแบฟt"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "th.chiแบฟu โ€œ%sโ€ bแป‹ loแบกi trแปซ bแปŸi cรกc tรนy chแปn rev-list"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "ฤ‘แป‘i sแป‘ khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn: %s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "Tแปซ chแป‘i tแบกo mแป™t bรณ dแปฏ liแป‡u trแป‘ng rแป—ng."
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "khรดng thแปƒ tแบกo โ€œ%sโ€"
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "mแปฅc lแปฅc gรณi ฤ‘รฃ chแบฟt"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "giรก trแป‹ mร u khรดng hแปฃp lแป‡: %.*s"
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp %s"
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s khรดng phแบฃi lร  mแป™t lแบงn chuyแปƒn giao!"
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1381,28 +2056,28 @@ msgstr ""
 "Tแบฏt lแปi nhแบฏn nร y bแบฑng cรกch chแบกy\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1127
+#: commit.c:1153
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Lแบงn chuyแปƒn giao %s cรณ mแป™t chแปฏ kรฝ GPG khรดng ฤ‘รกng tin, ฤ‘ฦฐแปฃc cho lร  bแปŸi %s."
 
-#: commit.c:1130
+#: commit.c:1157
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Lแบงn chuyแปƒn giao %s cรณ mแป™t chแปฏ kรฝ GPG sai, ฤ‘ฦฐแปฃc cho lร  bแปŸi %s."
 
-#: commit.c:1133
+#: commit.c:1160
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Lแบงn chuyแปƒn giao %s khรดng cรณ chแปฏ kรฝ GPG."
 
-#: commit.c:1136
+#: commit.c:1163
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Lแบงn chuyแปƒn giao %s cรณ mแป™t chแปฏ kรฝ GPG tแป‘t bแปŸi %s\n"
 
-#: commit.c:1390
+#: commit.c:1417
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1412,174 +2087,184 @@ msgstr ""
 "Bแบกn cรณ lแบฝ muแป‘n tu bแป• nรณ sau khi sแปญa lแปi chรบ thรญch, hoแบทc lร  ฤ‘แบทt biแบฟn\n"
 "cแบฅu hรฌnh i18n.commitencoding thร nh bแบฃng mรฃ mร  dแปฑ รกn cแปงa bแบกn muแป‘n dรนng.\n"
 
-#: commit-graph.c:127
+#: commit-graph.c:122
 msgid "commit-graph file is too small"
 msgstr "tแบญp tin ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao quรก nhแป"
 
-#: commit-graph.c:192
+#: commit-graph.c:189
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "chแปฏ kรฝ ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao %X khรดng khแป›p chแปฏ kรฝ %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:196
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "phiรชn bแบฃn ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao %X khรดng khแป›p phiรชn bแบฃn %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:203
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "phiรชn bแบฃn ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao %X khรดng khแป›p phiรชn bแบฃn %X"
 
-#: commit-graph.c:229
+#: commit-graph.c:226
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr ""
 "bแบฃng tรฌm kiแบฟm mแบฃnh ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cรฒn thiแบฟu; tแบญp tin cรณ thแปƒ sแบฝ "
 "khรดng hoร n thiแป‡n"
 
-#: commit-graph.c:240
+#: commit-graph.c:237
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "bรน mแบฃnh ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao khรดng ฤ‘รบng chแป— %08x%08x"
 
-#: commit-graph.c:283
+#: commit-graph.c:280
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "mรฃ mแบฃnh ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao %08x xuแบฅt hiแป‡n nhiแปu lแบงn"
 
-#: commit-graph.c:347
+#: commit-graph.c:343
 msgid "commit-graph has no base graphs chunk"
 msgstr "ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cรณ khรดng cรณ mแบฃnh cรกc ฤ‘แป“ hแปa cฦก sแปŸ"
 
-#: commit-graph.c:357
+#: commit-graph.c:353
 msgid "commit-graph chain does not match"
 msgstr "mรณc xรญch ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao khรดng khแป›p"
 
-#: commit-graph.c:404
+#: commit-graph.c:401
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
 "mรณc xรญch ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao khรดng hแปฃp lแป‡: dรฒng '%s' khรดng phแบฃi lร  "
 "mแป™t mรฃ bฤƒm"
 
-#: commit-graph.c:430
+#: commit-graph.c:425
 msgid "unable to find all commit-graph files"
 msgstr "khรดng thแปƒ tรฌm thแบฅy tแบฅt cแบฃ cรกc tแบญp tin ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao"
 
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:558 commit-graph.c:618
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "vแป‹ trรญ lแบงn chuyแปƒn giao khรดng hแปฃp lแป‡. ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cรณ vแบป nhฦฐ ฤ‘รฃ "
 "bแป‹ hแปng"
 
-#: commit-graph.c:575
+#: commit-graph.c:579
 #, c-format
 msgid "could not find commit %s"
 msgstr "khรดng thแปƒ tรฌm thแบฅy lแบงn chuyแปƒn giao %s"
 
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "khรดng thแปƒ phรขn tรญch lแบงn chuyแปƒn giao โ€œ%sโ€"
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "khรดng thแปƒ lแบฅy kiแปƒu cแปงa ฤ‘แป‘i tฦฐแปฃng โ€œ%sโ€"
 
-#: commit-graph.c:1034
+#: commit-graph.c:1043
 msgid "Loading known commits in commit graph"
 msgstr "ฤang tแบฃi cรกc lแบงn chuyแปƒn giao chฦฐa biแบฟt trong ฤ‘แป“ thแป‹ lแบงn chuyแปƒn giao"
 
-#: commit-graph.c:1051
+#: commit-graph.c:1060
 msgid "Expanding reachable commits in commit graph"
 msgstr ""
 "MแปŸ rแป™ng cรกc lแบงn chuyแปƒn giao cรณ thแปƒ tiแบฟp cแบญn ฤ‘ฦฐแปฃc trong trong ฤ‘แป“ thแป‹ lแบงn "
 "chuyแปƒn giao"
 
-#: commit-graph.c:1070
+#: commit-graph.c:1079
 msgid "Clearing commit marks in commit graph"
 msgstr "ฤang dแปn dแบนp cรกc ฤ‘รกnh dแบฅu lแบงn chuyแปƒn giao trong ฤ‘แป“ thแป‹ lแบงn chuyแปƒn giao"
 
-#: commit-graph.c:1089
+#: commit-graph.c:1098
 msgid "Computing commit graph generation numbers"
 msgstr "ฤang tรญnh toรกn sแป‘ tแบกo ฤ‘แป“ thแป‹ cรกc lแบงn chuyแปƒn giao"
 
-#: commit-graph.c:1163
+#: commit-graph.c:1173
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] ""
 "ฤang tรฌm cรกc lแบงn chuyแปƒn giao cho ฤ‘แป“ thแป‹ lแบงn chuyแปƒn giao trong %d gรณi"
 
-#: commit-graph.c:1176
+#: commit-graph.c:1186
 #, c-format
 msgid "error adding pack %s"
 msgstr "gแบทp lแป—i thรชm gรณi %s"
 
-#: commit-graph.c:1180
+#: commit-graph.c:1190
 #, c-format
 msgid "error opening index for %s"
 msgstr "gแบทp lแป—i khi mแปŸ mแปฅc lแปฅc cho โ€œ%sโ€"
 
-#: commit-graph.c:1204
+#: commit-graph.c:1214
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
 msgstr[0] ""
 "ฤang tรฌm cรกc lแบงn chuyแปƒn giao cho ฤ‘แป“ thแป‹ lแบงn chuyแปƒn giao tแปซ %d tham chiแบฟu"
 
-#: commit-graph.c:1238
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "mรฃ sแป‘ ฤ‘แป‘i tฦฐแปฃng lแบงn chuyแปƒn giao khรดng hแปฃp lแป‡: %s"
+
+#: commit-graph.c:1249
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 "ฤang tรฌm cรกc lแบงn chuyแปƒn giao cho ฤ‘แป“ thแป‹ lแบงn chuyแปƒn giao trong sแป‘ cรกc ฤ‘แป‘i "
 "tฦฐแปฃng ฤ‘รฃ ฤ‘รณng gรณi"
 
-#: commit-graph.c:1253
+#: commit-graph.c:1264
 msgid "Counting distinct commits in commit graph"
 msgstr "ฤang ฤ‘แบฟm cรกc lแบงn chuyแปƒn giao khรกc nhau trong ฤ‘แป“ thแป‹ lแบงn chuyแปƒn giao"
 
-#: commit-graph.c:1284
+#: commit-graph.c:1294
 msgid "Finding extra edges in commit graph"
 msgstr "ฤang tรฌm cรกc cแบกnh mแปŸ tแป™ng trong ฤ‘แป“ thแป‹ lแบงn chuyแปƒn giao"
 
-#: commit-graph.c:1332
+#: commit-graph.c:1340
 msgid "failed to write correct number of base graph ids"
 msgstr "gแบทp lแป—i khi ghi sแป‘ ฤ‘รบng cแปงa mรฃ ฤ‘แป“ hแปa cฦก sแปŸ"
 
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1373 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "khรดng thแปƒ tแบกo cรกc thฦฐ mแปฅc dแบซn ฤ‘แบงu cแปงa โ€œ%sโ€"
 
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr "khรดng thแปƒ tแบกo โ€œ%sโ€"
 
-#: commit-graph.c:1437
+#: commit-graph.c:1445
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "ฤang ghi ra ฤ‘แป“ thแป‹ cรกc lแบงn chuyแปƒn giao trong lแบงn %d"
 
-#: commit-graph.c:1478
+#: commit-graph.c:1486
 msgid "unable to open commit-graph chain file"
 msgstr "khรดng thแปƒ mแปŸ tแบญp tin mแบฏt xรญch ฤ‘แป“ thแป‹ chuyแปƒn giao"
 
-#: commit-graph.c:1490
+#: commit-graph.c:1498
 msgid "failed to rename base commit-graph file"
 msgstr "gแบทp lแป—i khi ฤ‘แป•i tรชn tแบญp tin ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao"
 
-#: commit-graph.c:1510
+#: commit-graph.c:1518
 msgid "failed to rename temporary commit-graph file"
 msgstr "gแบทp lแป—i khi ฤ‘แป•i tรชn tแบญp tin ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao tแบกm thแปi"
 
-#: commit-graph.c:1621
+#: commit-graph.c:1631
 msgid "Scanning merged commits"
 msgstr "ฤang quรฉt cรกc lแบงn chuyแปƒn giao ฤ‘รฃ hรฒa trแป™n"
 
-#: commit-graph.c:1632
+#: commit-graph.c:1642
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "gแบทp mรฃ sแป‘ tรญch lแบงn chuyแปƒn giao bแป‹ trรนng lแบทp โ€œ%sโ€"
 
-#: commit-graph.c:1657
+#: commit-graph.c:1665
 msgid "Merging commit-graph"
 msgstr "ฤang hรฒa trแป™n ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao"
 
@@ -1592,25 +2277,25 @@ msgstr "ฤ‘แป‹nh dแบกng ฤ‘แป“ hแปa cรกc lแบงn chuyแปƒn giao khรดng thแปƒ ghi %d
 msgid "too many commits to write graph"
 msgstr "cรณ quรก nhiแปu lแบงn chuyแปƒn giao ฤ‘แปƒ ghi ฤ‘แป“ thแป‹"
 
-#: commit-graph.c:1945
+#: commit-graph.c:1944
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "tแบญp tin ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cรณ tแป•ng kiแปƒm khรดng ฤ‘รบng vร  cรณ vแบป nhฦฐ lร  "
 "ฤ‘รฃ hแปng"
 
-#: commit-graph.c:1955
+#: commit-graph.c:1954
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cรณ thแปฉ tแปฑ OID khรดng ฤ‘รบng: %s sau %s"
 
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1964 commit-graph.c:1979
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cรณ giรก trแป‹ fanout khรดng ฤ‘รบng: fanout[%d] = %u != "
 "%u"
 
-#: commit-graph.c:1972
+#: commit-graph.c:1971
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "gแบทp lแป—i khi phรขn tรญch lแบงn chuyแปƒn giao tแปซ %s ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao"
@@ -1619,39 +2304,39 @@ msgstr "gแบทp lแป—i khi phรขn tรญch lแบงn chuyแปƒn giao tแปซ %s ฤ‘แป“-thแป‹-cรกc
 msgid "Verifying commits in commit graph"
 msgstr "ฤang thแบฉm tra cรกc lแบงn chuyแปƒn giao trong ฤ‘แป“ thแป‹ lแบงn chuyแปƒn giao"
 
-#: commit-graph.c:2002
+#: commit-graph.c:2003
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "gแบทp lแป—i khi phรขn tรญch lแบงn chuyแปƒn giao %s tแปซ cฦก sแปŸ dแปฏ liแป‡u ฤ‘แป‘i tฦฐแปฃng cho ฤ‘แป“ "
 "thแป‹ lแบงn chuyแปƒn giao"
 
-#: commit-graph.c:2009
+#: commit-graph.c:2010
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "OID cรขy gแป‘c cho lแบงn chuyแปƒn giao %s trong ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao lร  %s != "
 "%s"
 
-#: commit-graph.c:2019
+#: commit-graph.c:2020
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 "danh sรกch cha mแบน ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cho lแบงn chuyแปƒn giao %s lร  quรก dร i"
 
-#: commit-graph.c:2028
+#: commit-graph.c:2029
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "cha mแบน ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cho %s lร  %s != %s"
 
-#: commit-graph.c:2041
+#: commit-graph.c:2042
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 "danh sรกch cha mแบน ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cho lแบงn chuyแปƒn giao %s bแป‹ chแบฅm "
 "dแปฉt quรก sแป›m"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2047
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1659,7 +2344,7 @@ msgstr ""
 "ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cรณ con sแป‘ khรดng lแบงn tแบกo cho lแบงn chuyแปƒn giao %s, "
 "nhฦฐng khรดng phแบฃi sแป‘ khรดng แปŸ chแป— khรกc"
 
-#: commit-graph.c:2050
+#: commit-graph.c:2051
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1667,12 +2352,12 @@ msgstr ""
 "ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cรณ con sแป‘ khรดng phแบฃi khรดng lแบงn tแบกo cho lแบงn chuyแปƒn "
 "giao %s, nhฦฐng sแป‘ khรดng แปŸ chแป— khรกc"
 
-#: commit-graph.c:2065
+#: commit-graph.c:2066
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "tแบกo ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao cho lแบงn chuyแปƒn giao %s lร  %u != %u"
 
-#: commit-graph.c:2071
+#: commit-graph.c:2072
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
@@ -1721,7 +2406,7 @@ msgstr "khรณa khรดng chแปฉa mแป™t phแบงn: %s"
 msgid "key does not contain variable name: %s"
 msgstr "khรณa khรดng chแปฉa bแบฅt kแปณ mแป™t tรชn biแบฟn nร o: %s"
 
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2444
 #, c-format
 msgid "invalid key: %s"
 msgstr "khรณa khรดng ฤ‘รบng: %s"
@@ -1859,7 +2544,7 @@ msgstr "giรก trแป‹ cho %s sai dแบกng: %s"
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "phแบฃi lร  mแป™t trong sแป‘ nothing, matching, simple, upstream hay current"
 
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1518 builtin/pack-objects.c:3541
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "mแปฉc nรฉn gรณi %d khรดng hแปฃp lแป‡"
@@ -1884,111 +2569,105 @@ msgstr "khรดng thแปƒ phรขn giแบฃi ฤ‘iแปƒm xรฉt duyแป‡t โ€œ%sโ€"
 msgid "failed to parse %s"
 msgstr "gแบทp lแป—i khi phรขn tรญch cรบ phรกp %s"
 
-#: config.c:1745
+#: config.c:1743
 msgid "unable to parse command-line config"
 msgstr "khรดng thแปƒ phรขn tรญch cแบฅu hรฌnh dรฒng lแป‡nh"
 
-#: config.c:2094
+#: config.c:2097
 msgid "unknown error occurred while reading the configuration files"
 msgstr "ฤ‘รฃ cรณ lแป—i chฦฐa biแบฟt xแบฃy ra trong khi ฤ‘แปc cรกc tแบญp tin cแบฅu hรฌnh"
 
-#: config.c:2264
+#: config.c:2267
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s khรดng hแปฃp lแป‡: โ€œ%sโ€"
 
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-"khรดng hiแปƒu giรก trแป‹ core.untrackedCache โ€œ%sโ€; dรนng giรก trแป‹ mแบทc ฤ‘แป‹nh โ€œkeepโ€"
-
-#: config.c:2333
+#: config.c:2312
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "giรก trแป‹ splitIndex.maxPercentChange โ€œ%dโ€ phแบฃi nแบฑm giแปฏa 0 vร  100"
 
-#: config.c:2379
+#: config.c:2358
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "khรดng thแปƒ phรขn tรญch โ€œ%sโ€ tแปซ cแบฅu hรฌnh dรฒng lแป‡nh"
 
-#: config.c:2381
+#: config.c:2360
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "sai biแบฟn cแบฅu hรฌnh โ€œ%sโ€ trong tแบญp tin โ€œ%sโ€ tแบกi dรฒng %d"
 
-#: config.c:2462
+#: config.c:2441
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "tรชn cแปงa phแบงn khรดng hแปฃp lแป‡ โ€œ%sโ€"
 
-#: config.c:2494
+#: config.c:2473
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s cรณ ฤ‘a giรก trแป‹"
 
-#: config.c:2523
+#: config.c:2502
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "gแบทp lแป—i khi ghi tแบญp tin cแบฅu hรฌnh โ€œ%sโ€"
 
-#: config.c:2775 config.c:3099
+#: config.c:2754 config.c:3078
 #, c-format
 msgid "could not lock config file %s"
 msgstr "khรดng thแปƒ khรณa tแบญp tin cแบฅu hรฌnh %s"
 
-#: config.c:2786
+#: config.c:2765
 #, c-format
 msgid "opening %s"
 msgstr "ฤ‘ang mแปŸ โ€œ%sโ€"
 
-#: config.c:2821 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "mแบซu khรดng hแปฃp lแป‡: %s"
 
-#: config.c:2846
+#: config.c:2825
 #, c-format
 msgid "invalid config file %s"
 msgstr "tแบญp tin cแบฅu hรฌnh โ€œ%sโ€ khรดng hแปฃp lแป‡"
 
-#: config.c:2859 config.c:3112
+#: config.c:2838 config.c:3091
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat trรชn %s gแบทp lแป—i"
 
-#: config.c:2870
+#: config.c:2849
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "khรดng thแปƒ mmap โ€œ%sโ€"
 
-#: config.c:2879 config.c:3117
+#: config.c:2858 config.c:3096
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod trรชn %s gแบทp lแป—i"
 
-#: config.c:2964 config.c:3214
+#: config.c:2943 config.c:3193
 #, c-format
 msgid "could not write config file %s"
 msgstr "khรดng thแปƒ ghi tแบญp tin cแบฅu hรฌnh โ€œ%sโ€"
 
-#: config.c:2998
+#: config.c:2977
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "khรดng thแปƒ ฤ‘แบทt โ€œ%sโ€ thร nh โ€œ%sโ€"
 
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr "khรดng thแปƒ thรดi ฤ‘แบทt โ€œ%sโ€"
 
-#: config.c:3090
+#: config.c:3069
 #, c-format
 msgid "invalid section name: %s"
 msgstr "tรชn cแปงa phแบงn khรดng hแปฃp lแป‡: %s"
 
-#: config.c:3257
+#: config.c:3236
 #, c-format
 msgid "missing value for '%s'"
 msgstr "thiแบฟu giรก trแป‹ cho cho โ€œ%sโ€"
@@ -2112,7 +2791,7 @@ msgstr "khรดng thแปƒ tรฌm thแบฅy %s (%s)"
 msgid "unknown port %s"
 msgstr "khรดng hiแปƒu cแป•ng %s"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "ฤ‘รฃ khรณa tรชn mรกy lแบก โ€œ%sโ€"
@@ -2127,58 +2806,58 @@ msgstr "ฤ‘รฃ khรณa cแป•ng lแบก โ€œ%sโ€"
 msgid "cannot start proxy %s"
 msgstr "khรดng thแปƒ khแปŸi chแบกy แปงy nhiแป‡m โ€œ%sโ€"
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "chฦฐa chแป‰ ฤ‘แป‹nh ฤ‘ฦฐแปng dแบซn; xem'git help pullโ€ ฤ‘แปƒ biแบฟt cรบ phรกp url hแปฃp lแป‡"
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh biแบฟn thแปƒ โ€œsimpleโ€ khรดng hแป— trแปฃ -4"
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh biแบฟn thแปƒ โ€œsimpleโ€ khรดng hแป— trแปฃ -6"
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh biแบฟn thแปƒ โ€œsimpleโ€ khรดng hแป— trแปฃ ฤ‘แบทt cแป•ng"
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "ฤ‘รฃ khรณa tรชn ฤ‘ฦฐแปng dแบซn lแบก โ€œ%sโ€"
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr "khรดng thแปƒ rแบฝ nhรกnh tiแบฟn trรฌnh con"
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr "ฤang kiแปƒm tra kแบฟt nแป‘i"
 
-#: connected.c:98
+#: connected.c:110
 msgid "Could not run 'git rev-list'"
 msgstr "Khรดng thแปƒ chแบกy โ€œgit rev-listโ€"
 
-#: connected.c:118
+#: connected.c:130
 msgid "failed write to rev-list"
 msgstr "gแบทp lแป—i khi ghi vร o rev-list"
 
-#: connected.c:125
+#: connected.c:137
 msgid "failed to close rev-list's stdin"
 msgstr "gแบทp lแป—i khi ฤ‘รณng ฤ‘แบงu vร o chuแบฉn stdin cแปงa rev-list"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "crlf_action %d khรดng hแปฃp lแป‡"
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF nรชn ฤ‘ฦฐแปฃc thay bแบฑng LF trong %s"
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2187,12 +2866,12 @@ msgstr ""
 "CRLF sแบฝ bแป‹ thay thแบฟ bแบฑng LF trong %s.\n"
 "Tแบญp tin sแบฝ cรณ kiแปƒu xuแป‘ng dรฒng nhฦฐ bแบฃn gแป‘c trong thฦฐ mแปฅc lร m viแป‡c cแปงa bแบกn"
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF nรชn thay bแบฑng CRLF trong %s"
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2201,19 +2880,19 @@ msgstr ""
 "LF sแบฝ bแป‹ thay thแบฟ bแบฑng CRLF trong %s.\n"
 "Tแบญp tin sแบฝ cรณ kiแปƒu xuแป‘ng dรฒng nhฦฐ bแบฃn gแป‘c trong thฦฐ mแปฅc lร m viแป‡c cแปงa bแบกn"
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM bแป‹ cแบฅm trong โ€œ%sโ€ nแบฟu ฤ‘ฦฐแปฃc mรฃ hรณa lร  %s"
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
-"Tแบญp tin โ€œ%sโ€ cรณ chแปฉa kรฝ hiแป‡u thแปฉ tแปฑ byte (BOM). Vui lรฒng dรนng UTF-%s nhฦฐ lร  "
-"bแบฃng mรฃ cรขy lร m viแป‡c."
+"Tแบญp tin โ€œ%sโ€ cรณ chแปฉa kรฝ hiแป‡u thแปฉ tแปฑ byte (BOM). Vui lรฒng dรนng UTF-%.*s nhฦฐ "
+"lร  bแบฃng mรฃ cรขy lร m viแป‡c."
 
 #: convert.c:304
 #, c-format
@@ -2229,50 +2908,50 @@ msgstr ""
 "Tแบญp tin โ€œ%sโ€ cรฒn thiแบฟu kรฝ hiแป‡u thแปฉ tแปฑ byte (BOM). Vui lรฒng dรนng UTF-%sBE hay "
 "UTF-%sLE (cรฒn phแปฅc thuแป™c vร o thแปฉ tแปฑ byte) nhฦฐ lร  bแบฃng mรฃ cรขy lร m viแป‡c."
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "gแบทp lแป—i khi mรฃ hรณa โ€œ%sโ€  tแปซ โ€œ%sโ€ sang โ€œ%sโ€"
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "mรฃ hรณa โ€œ%sโ€ tแปซ %s thร nh %s vร  ngฦฐแปฃc trแปŸ lแบกi khรดng phแบฃi lร  cรนng"
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "khรดng thแปƒ rแบฝ nhรกnh tiแบฟn trรฌnh ฤ‘แปƒ chแบกy bแป™ lแปc bรชn ngoร i โ€œ%sโ€"
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "khรดng thแปƒ cแบฅp ฤ‘แบงu vร o cho bแป™ lแปc bรชn ngoร i โ€œ%sโ€"
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "chแบกy bแป™ lแปc bรชn ngoร i โ€œ%sโ€ gแบทp lแป—i %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "ฤ‘แปc tแปซ bแป™ lแปc bรชn ngoร i โ€œ%sโ€ gแบทp lแป—i"
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "gแบทp lแป—i khi chแบกy bแป™ lแปc bรชn ngoร i โ€œ%sโ€"
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr "gแบทp kiแปƒu bแป™ lแปc thแปซa"
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr "tรชn ฤ‘ฦฐแปng dแบซn quรก dร i cho bแป™ lแปc bรชn ngoร i"
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2281,74 +2960,74 @@ msgstr ""
 "bแป™ lแปc bรชn ngoร i โ€œ%sโ€ khรดng sแบตn sร ng nแปฏa mแบทc dรน khรดng phแบฃi tแบฅt cแบฃ cรกc ฤ‘ฦฐแปng "
 "dแบซn ฤ‘รฃ ฤ‘ฦฐแปฃc lแปc"
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false lร  khรดng phแบฃi bแบฃng-mรฃ-cรขy-lร m-viแป‡c hแปฃp lแป‡"
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: gแบทp lแป—i khi xรณa bแป™ lแปc โ€œ%sโ€"
 
-#: convert.c:1476
+#: convert.c:1489
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: smudge bแป™ lแปc %s gแบทp lแป—i"
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr "แปŸ thแปi tฦฐฦกng lai"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "%<PRIuMAX> giรขy trฦฐแป›c"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "%<PRIuMAX> phรบt trฦฐแป›c"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "%<PRIuMAX> giแป trฦฐแป›c"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "%<PRIuMAX> ngร y trฦฐแป›c"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "%<PRIuMAX> tuแบงn trฦฐแป›c"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "%<PRIuMAX> thรกng trฦฐแป›c"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
 msgstr[0] "%<PRIuMAX> nฤƒm"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "%s, %<PRIuMAX> thรกng trฦฐแป›c"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2384,7 +3063,7 @@ msgstr "ฤรฃ ฤ‘รกnh dแบฅu %d island, xong.\n"
 msgid "failed to read orderfile '%s'"
 msgstr "gแบทp lแป—i khi ฤ‘แปc tแบญp-tin-thแปฉ-tแปฑ โ€œ%sโ€"
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr "ฤang thแปฑc hiแป‡n dรฒ tรฌm ฤ‘แป•i tรชn khรดng chรญnh xรกc"
 
@@ -2450,35 +3129,35 @@ msgstr ""
 "Tรฌm thแบฅy cรกc lแป—i trong biแบฟn cแบฅu hรฌnh โ€œdiff.dirstatโ€:\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "phแบงn mแปm diff แปŸ bรชn ngoร i ฤ‘รฃ chแบฟt, dแปซng tแบกi %s"
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check vร  -s loแบกi tแปซ lแบซn nhau"
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "Cรกc tรนy chแปn -G, -S, vร  --find-object loแบกi tแปซ lแบซn nhau"
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow cแบงn chรญnh xรกc mแป™t ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn"
 
-#: diff.c:4689
+#: diff.c:4676
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "giรก trแป‹ --stat khรดng hแปฃp lแป‡: โ€œ%sโ€"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "tรนy chแปn โ€œ%sโ€ cแบงn mแป™t giรก trแป‹ bแบฑng sแป‘"
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2487,42 +3166,42 @@ msgstr ""
 "Gแบทp lแป—i khi phรขn tรญch ฤ‘แป‘i sแป‘ tรนy chแปn --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "khรดng hiแปƒu lแป›p thay ฤ‘แป•i โ€œ%cโ€ trong --diff-filter=%s"
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "khรดng hiแปƒu giรก trแป‹ sau ws-error-highlight=%.*s"
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "khรดng thแปƒ phรขn giแบฃi โ€œ%sโ€"
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s cแบงn dแบกng <n>/<m>"
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s cแบงn mแป™t kรฝ tแปฑ, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc โ€œ%sโ€"
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "ฤ‘แป‘i sแป‘ --color-moved sai: %s"
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "chแบฟ ฤ‘แป™ โ€œ%sโ€ khรดng hแปฃp lแป‡ trong --color-moved-ws"
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2530,158 +3209,158 @@ msgstr ""
 "tรนy chแปn  diff-algorithm chแบฅp nhแบญn \"myers\", \"minimal\", \"patience\" vร  "
 "\"histogram\""
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr "tham sแป‘ cho %s khรดng hแปฃp lแป‡"
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "gแบทp lแป—i khi phรขn tรญch ฤ‘แป‘i sแป‘ tรนy chแปn --submodule: โ€œ%sโ€"
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "ฤ‘แป‘i sแป‘ --word-diff sai: %s"
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr "Cรกc tรนy chแปn ฤ‘แป‹nh dแบกng khi xuแบฅt cรกc khรกc biแป‡t"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr "tแบกo miแบฟng vรก"
 
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr "chแบทn mแปi kแบฟt xuแบฅt tแปซ diff"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr "tแบกo khรกc biแป‡t vแป›i <n> dรฒng ngแปฏ cแบฃnh"
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr "tแบกo khรกc biแป‡t แปŸ ฤ‘แป‹nh dแบกng thรด"
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr "ฤ‘แป“ng nghฤฉa vแป›i โ€œ-p --rawโ€"
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr "ฤ‘แป“ng nghฤฉa vแป›i โ€œ-p --statโ€"
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr "--stat thuแบญn tiแป‡n cho mรกy ฤ‘แปc"
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr "chแป‰ xuแบฅt nhแปฏng dรฒng cuแป‘i cแปงa --stat"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr "<tham_sแป‘_1,tham_sแป‘_2>โ€ฆ"
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "ฤ‘แบงu ra phรขn phแป‘i cแปงa sแป‘ lฦฐแปฃng thay ฤ‘แป•i tฦฐฦกng ฤ‘แป‘i cho mแป—i thฦฐ mแปฅc con"
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr "ฤ‘แป“ng nghฤฉa vแป›i --dirstat=cumulative"
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "ฤ‘แป“ng nghฤฉa vแป›i --dirstat=files,param1,param2โ€ฆ"
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "cแบฃnh bรกo nแบฟu cรกc thay ฤ‘แป•i ฤ‘ฦฐa ra cรกc bแป™ tแบกo xung ฤ‘แป™t hay lแป—i khoแบฃng trแบฏng"
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "tแป•ng hแปฃp dแบกng xรบc tรญch nhฦฐ lร  tแบกo, ฤ‘แป•i tรชn vร  cรกc thay ฤ‘แป•i chแบฟ ฤ‘แป™"
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr "chแป‰ hiแปƒn thแป‹ tรชn cแปงa cรกc tแบญp tin ฤ‘แป•i"
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr "chแป‰ hiแปƒn thแป‹ tรชn tแบญp tin vร  tรฌnh trแบกng cแปงa cรกc tแบญp tin bแป‹ thay ฤ‘แป•i"
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<rแป™ng>[,<name-width>[,<sแป‘-lฦฐแปฃng>]]"
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr "tแบกo diffstat"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr "<rแป™ng>"
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr "tแบกo diffstat vแป›i ฤ‘แป™ rแป™ng ฤ‘รฃ cho"
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr "tแบกo diffstat vแป›i tรชn ฤ‘แป™ rแป™ng ฤ‘รฃ cho"
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr "tแบกo diffstat vแป›i ฤ‘แป™ rแป™ng ฤ‘แป“ thแป‹ ฤ‘รฃ cho"
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr "<sแป‘_lฦฐแปฃng>"
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr "tแบกo diffstat vแป›i cรกc dรฒng bแป‹ giแป›i hแบกn"
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr "tแบกo tแป•ng hแปฃp xรบc tรญch trong diffstat"
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr "xuแบฅt ra mแป™t khรกc biแป‡t dแบกng nhแป‹ phรขn cรกi mร  cรณ thแปƒ ฤ‘ฦฐแปฃc รกp dแปฅng"
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "hiแปƒn thแป‹ ฤ‘แบงy ฤ‘แปง cรกc tรชn ฤ‘แป‘i tฦฐแปฃng pre- vร  post-image trรชn cรกc dรฒng \"mแปฅc lแปฅc"
 "\""
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr "hiแปƒn thแป‹ thay ฤ‘แป•i ฤ‘ฦฐแปฃc tรด mร u"
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr "<kiแปƒu>"
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
-"tรด sang cรกc lแป—i vแป khoแบฃng trแบฏng trong cรกc dรฒng โ€œcontextโ€, โ€œoldโ€ vร  โ€œnewโ€ "
+"tรด sรกng cรกc lแป—i vแป khoแบฃng trแบฏng trong cรกc dรฒng โ€œcontextโ€, โ€œoldโ€ vร  โ€œnewโ€ "
 "trong khรกc biแป‡t"
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2689,89 +3368,89 @@ msgstr ""
 "khรดng munge tรชn ฤ‘ฦฐแปng dแบซn vร  sแปญ dแปฅng NUL lร m bแป™ phรขn tรกch trฦฐแปng ฤ‘แบงu ra "
 "trong --raw hay --numstat"
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr "<tiแปn_tแป‘>"
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr "hiแปƒn thแป‹ tiแปn tแป‘ nguแป“n ฤ‘รฃ cho thay cho \"a/\""
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "hiแปƒn thแป‹ tiแปn tแป‘ ฤ‘รญch ฤ‘รฃ cho thay cho \"b/\""
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr "treo vร o trฦฐแป›c mแป™t tiแปn tแป‘ bแป• sung cho mแป—i dรฒng kแบฟt xuแบฅt"
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr "ฤ‘แปซng hiแปƒn thแป‹ bแบฅt kแปณ tiแปn tแป‘ nguแป“n hay ฤ‘รญch"
 
-#: diff.c:5371
+#: diff.c:5358
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "hiแปƒn thแป‹ ngแปฏ cแบฃnh giแปฏa cรกc khรบc khรกc biแป‡t khi ฤ‘แบกt ฤ‘แบฟn sแป‘ lฦฐแปฃng dรฒng ฤ‘รฃ chแป‰ "
 "ฤ‘แป‹nh"
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr "<kรฝ_tแปฑ>"
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "chแป‰ ฤ‘แป‹nh mแป™t kรฝ tแปฑ ฤ‘แปƒ biแปƒu thแป‹ mแป™t dรฒng ฤ‘ฦฐแปฃc thรชm mแป›i thay cho โ€œ+โ€"
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "chแป‰ ฤ‘แป‹nh mแป™t kรฝ tแปฑ ฤ‘แปƒ biแปƒu thแป‹ mแป™t dรฒng ฤ‘รฃ cลฉ thay cho โ€œ-โ€"
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "chแป‰ ฤ‘แป‹nh mแป™t kรฝ tแปฑ ฤ‘แปƒ biแปƒu thแป‹ mแป™t ngแปฏ cแบฃnh thay cho โ€œโ€"
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr "Tรนy chแปn khรกc biแป‡t ฤ‘แป•i tรชn"
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "ngแบฏt cรกc thay ฤ‘แป•i ghi lแบกi hoร n thiแป‡n thร nh cแบทp cแปงa xรณa vร  tแบกo"
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr "dรฒ tรฌm cรกc tรชn thay ฤ‘แป•i"
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr "bแป qua preimage (tiแปn แบฃnh??) cho cรกc viแป‡c xรณa"
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr "dรฒ bแบฃn sao"
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr "dรนng cรกc tแบญp tin khรดng bแป‹ chแป‰nh sแปญa nhฦฐ lร  nguแป“n ฤ‘แปƒ tรฌm cรกc bแบฃn sao"
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr "tแบฏt dรฒ tรฌm ฤ‘แป•i tรชn"
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
-msgstr "dung cรกc blob trแป‘ng rแป‘ng nhฦฐ lร  nguแป“n ฤ‘แป•i tรชn"
+msgstr "dรนng cรกc blob trแป‘ng rแป‘ng nhฦฐ lร  nguแป“n ฤ‘แป•i tรชn"
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
 msgstr "tiแบฟp tแปฅc liแป‡t kรช lแป‹ch sแปญ cแปงa mแป™t tแบญp tin ngoร i ฤ‘แป•i tรชn"
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2779,156 +3458,156 @@ msgstr ""
 "ngฤƒn cแบฃn dรฒ tรฌm ฤ‘แป•i tรชn/bแบฃn sao nแบฟu sแป‘ lฦฐแปฃng cแปงa ฤ‘รญch ฤ‘แป•i tรชn/bแบฃn sao vฦฐแปฃt "
 "quรก giแป›i hแบกn ฤ‘ฦฐa ra"
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr "Tรนy chแปn thuแบญt toรกn khรกc biแป‡t"
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr "sแบฃn sinh khรกc biแป‡t รญt nhแบฅt cรณ thแปƒ"
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr "lแป ฤ‘i sแปฑ thay ฤ‘แป•i do khoแบฃng trแบฏng gรขy ra khi so sรกnh cรกc dรฒng"
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr "lแป ฤ‘i sแปฑ thay ฤ‘แป•i do sแป‘ lฦฐแปฃng khoแบฃng trแบฏng gรขy ra"
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr "lแป ฤ‘i sแปฑ thay ฤ‘แป•i do khoแบฃng trแบฏng gรขy ra khi แปŸ cuแป‘i dรฒng EOL"
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr "bแป qua kรฝ tแปฑ vแป ฤ‘แบงu dรฒng tแบกi cuแป‘i dรฒng"
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr "bแป qua cรกc thay ฤ‘แป•i cho toร n bแป™ cรกc dรฒng lร  trแป‘ng"
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "heuristic ฤ‘แปƒ dแป‹ch hแบกn biรชn cแปงa khแป‘i khรกc biแป‡t cho dแป… ฤ‘แปc"
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "tแบกo khรกc biแป‡t sแปญ dung thuแบญt toรกn \"patience diff\""
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "tแบกo khรกc biแป‡t sแปญ dung thuแบญt toรกn \"histogram diff\""
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr "<thuแบญt toรกn>"
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr "chแปn mแป™t thuแบญt toรกn khรกc biแป‡t"
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr "<vฤƒn bแบฃn>"
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "tแบกo khรกc biแป‡t sแปญ dung thuแบญt toรกn \"anchored diff\""
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr "<chแบฟ ฤ‘แป™>"
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
-"hiแปƒn thแป‹ khรกc biแป‡t tแปซ, sแปญ dung <chแบฟ ฤ‘แป™> ฤ‘แปƒ bแป giแป›i hแบกn cรกc tแปซ bแป‹ thay ฤ‘แป•i"
+"hiแปƒn thแป‹ khรกc biแป‡t tแปซ, sแปญ dแปฅng <chแบฟ ฤ‘แป™> ฤ‘แปƒ bแป giแป›i hแบกn cรกc tแปซ bแป‹ thay ฤ‘แป•i"
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr "dรนng <regex> ฤ‘แปƒ quyแบฟt ฤ‘แป‹nh tแปซ lร  cรกi gรฌ"
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "tฦฐฦกng ฤ‘ฦฐฦกng vแป›i --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
 msgstr "cรกc dรฒng di chuyแปƒn cแปงa mรฃ mร  ฤ‘ฦฐแปฃc tรด mร u khรกc nhau"
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
-msgstr "bแป qua khoแบฃng trแบฏng nhฦฐ thแบฟ nร o trong --color-moved"
+msgstr "cรกch bแป qua khoแบฃng trแบฏng trong --color-moved"
 
-#: diff.c:5469
+#: diff.c:5456
 msgid "Other diff options"
 msgstr "Cรกc tรนy chแปn khรกc biแป‡t khรกc"
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
-"khi chแบกy tแปซ thฦฐ mแปฅc con, thแปฑ thi cรกc thay ฤ‘แป•i bรชn ngoร i vร  hiแปƒn thแป‹ cรกc "
+"khi chแบกy tแปซ thฦฐ mแปฅc con, thแปฑc thi cรกc thay ฤ‘แป•i bรชn ngoร i vร  hiแปƒn thแป‹ cรกc "
 "ฤ‘ฦฐแปng dแบซn liรชn quan"
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr "coi mแปi tแบญp tin lร  dแบกng vฤƒn bแบฃn thฦฐแปng"
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
 msgstr "trรกo ฤ‘แป•i hai ฤ‘แบงu vร o, ฤ‘แบฃo ngฦฐแปฃc khรกc biแป‡t"
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "thoรกt vแป›i mรฃ 1 nแบฟu khรดng cรณ khรกc biแป‡t gรฌ, 0 nแบฟu ngฦฐแปฃc lแบกi"
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr "tแบฏt mแปi kแบฟt xuแบฅt cแปงa chฦฐฦกng trรฌnh"
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr "cho phรฉp mแป™ bแป™ hแป— trแปฃ xuแบฅt khรกc biแป‡t แปŸ bรชn ngoร i ฤ‘ฦฐแปฃc phรฉp thแปฑc thi"
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "chแบกy cรกc bแป™ lแปc vฤƒn bแบฃn thรดng thฦฐแปng bรชn ngoร i khi so sรกnh cรกc tแบญp tin nhแป‹ "
 "phรขn"
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr "<khi>"
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr "bแป qua cรกc thay ฤ‘แป•i trong mรด-ฤ‘un-con trong khi tแบกo khรกc biแป‡t"
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr "<ฤ‘แป‹nh dแบกng>"
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr "chi ฤ‘แป‹nh khรกc biแป‡t bao nhiรชu trong cรกc mรด ฤ‘un con ฤ‘ฦฐแปฃc hiแปƒn thแป‹"
 
-#: diff.c:5496
+#: diff.c:5483
 msgid "hide 'git add -N' entries from the index"
 msgstr "แบฉn cรกc mแปฅc โ€œgit add -Nโ€ tแปซ bแบฃng mแปฅc lแปฅc"
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "coi cรกc mแปฅc โ€œgit add -Nโ€ nhฦฐ lร  cรณ thแบญt trong bแบฃng mแปฅc lแปฅc"
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr "<chuแป—i>"
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -2936,7 +3615,7 @@ msgstr ""
 "tรฌm cรกc khรกc biแป‡t cรกi mร  thay ฤ‘แป•i sแป‘ lฦฐแปฃng xแบฃy ra cแปงa cรกc phรกt sinh cแปงa "
 "chuแป—i ฤ‘ฦฐแปฃc chแป‰ ra"
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -2944,23 +3623,23 @@ msgstr ""
 "tรฌm cรกc khรกc biแป‡t cรกi mร  thay ฤ‘แป•i sแป‘ lฦฐแปฃng xแบฃy ra cแปงa cรกc phรกt sinh cแปงa biแปƒu "
 "thแปฉc chรญnh quy ฤ‘ฦฐแปฃc chแป‰ ra"
 
-#: diff.c:5508
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
 msgstr "hiแปƒn thแป‹ tแบฅt cแบฃ cรกc thay ฤ‘แป•i trong mแป™t bแป™ cรกc thay ฤ‘แป•i vแป›i -S hay -G"
 
-#: diff.c:5511
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "coi <chuแป—i> trong -S nhฦฐ lร  biแปƒu thแปฉc chรญnh qui POSIX cรณ mแปŸ rแป™ng"
 
-#: diff.c:5514
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
 msgstr "ฤ‘iแปu khiแปƒn thแปฉ tแปฑ xuรกt hiแป‡n cรกc tแบญp tin trong kแบฟt xuแบฅt"
 
-#: diff.c:5515
+#: diff.c:5502
 msgid "<object-id>"
 msgstr "<mรฃ-sแป‘-ฤ‘แป‘i-tฦฐแปฃng>"
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -2968,33 +3647,33 @@ msgstr ""
 "tรฌm cรกc khรกc biแป‡t cรกi mร  thay ฤ‘แป•i sแป‘ lฦฐแปฃng xแบฃy ra cแปงa cรกc phรกt sinh cแปงa ฤ‘แป‘i "
 "tฦฐแปฃng ฤ‘ฦฐแปฃc chแป‰ ra"
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)โ€ฆ[*]]"
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
 msgstr "chแปn cรกc tแบญp tin theo kiแปƒu khรกc biแป‡t"
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr "<tแบญp_tin>"
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr "Xuแบฅt ra mแป™t tแบญp tin cแปฅ thแปƒ"
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "nhแบญn thแบฅy ฤ‘แป•i tรชn khรดng chรญnh xรกc ฤ‘รฃ bแป‹ bแป qua bแปŸi cรณ quรก nhiแปu tแบญp tin."
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "chแป‰ tรฌm thแบฅy cรกc bแบฃn sao tแปซ ฤ‘ฦฐแปng dแบซn ฤ‘รฃ sแปญa ฤ‘แป•i bแปŸi vรฌ cรณ quรก nhiแปu tแบญp tin."
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3002,43 +3681,62 @@ msgstr ""
 "bแบกn cรณ lแบฝ muแป‘n ฤ‘แบทt biแบฟn %s cแปงa bแบกn thร nh รญt nhแบฅt lร  %d vร  thแปญ lแบกi lแป‡nh lแบงn "
 "nแปฏa."
 
-#: dir.c:537
+#: dir.c:555
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng khแป›p vแป›i bแบฅt kแปณ tแบญp tin nร o mร  git biแบฟt"
 
-#: dir.c:926
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "mแบซu khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn: โ€œ%sโ€"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "mแบซu รขm khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn: โ€œ%sโ€"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "tแบญp tin sparse-checkout cแปงa bแบกn cรณ lแบฝ gแบทp lแป—i: mแบซu '%s' ฤ‘รฃ bแป‹ lแบทp lแบกi"
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "vรด hiแป‡u khแป›p mแบซu nรณn"
+
+#: dir.c:1173
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "khรดng thแปƒ dรนng %s nhฦฐ lร  mแป™t tแบญp tin loแบกi trแปซ"
 
-#: dir.c:1843
+#: dir.c:2144
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "khรดng thแปƒ mแปŸ thฦฐ mแปฅc โ€œ%sโ€"
 
-#: dir.c:2085
+#: dir.c:2479
 msgid "failed to get kernel name and information"
 msgstr "gแบทp lแป—i khi lแบฅy tรชn vร  thรดng tin cแปงa nhรขn"
 
-#: dir.c:2209
+#: dir.c:2603
 msgid "untracked cache is disabled on this system or location"
 msgstr "bแป™ nhแป› tแบกm khรดng theo vแบฟt bแป‹ tแบฏt trรชn hแป‡ thแป‘ng hay vแป‹ trรญ nร y"
 
-#: dir.c:3013
+#: dir.c:3407
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "tแบญp tin ghi bแบฃng mแปฅc lแปฅc bแป‹ hแปng trong kho %s"
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3452 dir.c:3457
 #, c-format
 msgid "could not create directories for %s"
 msgstr "khรดng thแปƒ tแบกo thฦฐ mแปฅc cho %s"
 
-#: dir.c:3092
+#: dir.c:3486
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "khรดng thแปƒ di cฦฐ thฦฐ mแปฅc git tแปซ โ€œ%sโ€ sang โ€œ%sโ€"
+msgstr "khรดng thแปƒ di dแปi thฦฐ mแปฅc git tแปซ โ€œ%sโ€ sang โ€œ%sโ€"
 
 #: editor.c:73
 #, c-format
@@ -3054,12 +3752,12 @@ msgstr "Nแป™i dung lแปc"
 msgid "could not stat file '%s'"
 msgstr "khรดng thแปƒ lแบฅy thแป‘ng kรช tแบญp tin โ€œ%sโ€"
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "ฤ‘ฦฐแปng dแบซn khรดng gian tรชn git \"%s\" sai"
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "khรดng thแปƒ ฤ‘แบทt GIT_DIR thร nh โ€œ%sโ€"
@@ -3069,266 +3767,270 @@ msgstr "khรดng thแปƒ ฤ‘แบทt GIT_DIR thร nh โ€œ%sโ€"
 msgid "too many args to run %s"
 msgstr "quรก nhiแปu tham sแป‘ ฤ‘แปƒ chแบกy %s"
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Mรกy chแปง khรดng cรณ ฤ‘แป‹a chแป‰ URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: cแบงn danh sรกch shallow"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: cแบงn mแป™t gรณi ฤ‘แบฉy sau danh sรกch shallow"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: cแบงn ACK/NAK, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc mแป™t gรณi flush"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: cแบงn ACK/NAK, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc โ€œ%sโ€"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr "khรดng thแปƒ ghi lรชn mรกy phแปฅc vแปฅ"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc cแบงn multi_ack_detailed"
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "dรฒng shallow khรดng hแปฃp lแป‡: %s"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "dรฒng unshallow khรดng hแปฃp lแป‡: %s"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr "khรดng tรฌm thแบฅy ฤ‘แป‘i tฦฐแปฃng: %s"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr "lแป—i trong ฤ‘แป‘i tฦฐแปฃng: %s"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr "khรดng tรฌm shallow nร o: %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "cแบงn shallow/unshallow, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc %s"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr "nhแบญn %s %d - %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr "lแบงn chuyแปƒn giao %s khรดng hแปฃp lแป‡"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr "chแป‹u thua"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr "xong"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "nhแบญn %s (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr "ฤรกnh dแบฅu %s lร  ฤ‘รฃ hoร n thร nh"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ฤ‘รฃ sแบตn cรณ %s (%s)"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: khรดng thแปƒ rแบฝ nhรกnh sideband demultiplexer"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr "lแป—i giao thแปฉc: phแบงn ฤ‘แบงu gรณi bแป‹ sai"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: khรดng thแปƒ rแบฝ nhรกnh %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr "%s gแบทp lแป—i"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr "cรณ lแป—i trong sideband demultiplexer"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Phiรชn bแบฃn mรกy chแปง lร  %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr "Mรกy chแปง hแป— trแปฃ %s"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr "Mรกy chแปง khรดng hแป— trแปฃ mรกy khรกch shallow"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr "Mรกy chแปง khรดng hแป— trแปฃ --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr "Mรกy chแปง khรดng hแป— trแปฃ --shallow-exclude"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr "Mรกy chแปง khรดng hแป— trแปฃ --deepen"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr "khรดng cรณ lแบงn chuyแปƒn giao chung nร o"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch gแบทp lแป—i."
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr "Mรกy chแปง khรดng hแป— trแปฃ yรชu cแบงu shallow"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr "Mรกy chแปง hแป— trแปฃ bแป™ lแปc"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr "khรดng thแปƒ ghi cรกc yรชu cแบงu lรชn mรกy phแปฅc vแปฅ"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "gแบทp lแป—i khi ฤ‘แปc phแบงn ฤ‘แบงu cแปงa ฤ‘oแบกn %s"
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "cแบงn โ€œ%sโ€, nhฦฐng lแบกi nhแบญn โ€œ%sโ€"
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "gแบทp dรฒng khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn: โ€œ%sโ€"
 
-#: fetch-pack.c:1252
+#: fetch-pack.c:1308
 #, c-format
 msgid "error processing acks: %d"
 msgstr "gแบทp lแป—i khi xแปญ lรฝ tรญn hiแป‡u trแบฃ lแปi: %d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr "cแบงn tแบญp tin gรณi ฤ‘แปƒ gแปญi sau โ€œreadyโ€"
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "khรดng cแบงn thรชm phแบงn nร o ฤ‘แปƒ gแปญi sau โ€œreadyโ€"
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "lแป—i xแปญ lรฝ thรดng tin shallow: %d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "cแบงn wanted-ref, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc โ€œ%sโ€"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
-msgstr "khรดng cแบงn wanted-ref: โ€œ%sโ€"
+msgstr "wanted-ref khรดng ฤ‘ฦฐแปฃc mong ฤ‘แปฃi: โ€œ%sโ€"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "lแป—i khi xแปญ lรฝ wanted refs: %d"
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr "khรดng khแป›p phแบงn ฤ‘แบงu mรกy chแปง"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:689
 msgid "remote did not send all necessary objects"
 msgstr "mรกy chแปง ฤ‘รฃ khรดng gแปญi tแบฅt cแบฃ cรกc ฤ‘แป‘i tฦฐแปฃng cแบงn thiแบฟt"
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr "khรดng cรณ mรกy chแปง tham chiแบฟu nร o nhฦฐ %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
 "Mรกy phแปฅc vแปฅ khรดng cho phรฉp yรชu cแบงu cho ฤ‘แป‘i tฦฐแปฃng khรดng ฤ‘ฦฐแปฃc bรกo trฦฐแป›c %s"
 
-#: gpg-interface.c:321
+#: gpg-interface.c:408
 msgid "gpg failed to sign the data"
 msgstr "gpg gแบทp lแป—i khi kรฝ dแปฏ liแป‡u"
 
-#: gpg-interface.c:347
+#: gpg-interface.c:434
 msgid "could not create temporary file"
 msgstr "khรดng thแปƒ tแบกo tแบญp tin tแบกm thแปi"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:437
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "gแบทp lแป—i khi ghi chแปฏ kรฝ ฤ‘รญnh kรจm vร o โ€œ%sโ€"
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "bแป qua mร u khรดng hแปฃp lแป‡ โ€œ%.*sโ€ trong log.graphColors"
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"mแบซu ฤ‘รฃ cho cรณ chแปฉa NULL byte (qua -f <file>). ฤiแปu nร y chแป‰ ฤ‘ฦฐแปฃc hแป— trแปฃ vแป›i -"
+"P dฦฐแป›i PCRE v2"
+
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "โ€œ%sโ€: khรดng thแปƒ ฤ‘แปc %s"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "gแบทp lแป—i khi lแบฅy thแป‘ng kรช vแป โ€œ%sโ€"
 
-#: grep.c:2145
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "โ€œ%sโ€: ฤ‘แปc ngแบฏn"
@@ -3378,7 +4080,7 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Lแป‡nh/bแป™ hแปi แปŸ mแปฉc thแบฅp"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Lแป‡nh/ฤแป“ng bแป™ kho แปŸ mแปฉc thแบฅp"
 
 #: help.c:38
@@ -3467,12 +4169,12 @@ msgstr[0] ""
 msgid "git version [<options>]"
 msgstr "git version [<cรกc tรนy chแปn>]"
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3537,46 +4239,61 @@ msgstr "khรดng cho phรฉp tรชn ฤ‘แป‹nh danh lร  rแป—ng (cho <%s>)"
 msgid "name consists only of disallowed characters: %s"
 msgstr "tรชn chแป‰ ฤ‘ฦฐแปฃc phรฉp bao gแป“m cรกc kรฝ tแปฑ sau: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:635
 #, c-format
 msgid "invalid date format: %s"
 msgstr "ngร y thรกng khรดng hแปฃp lแป‡: %s"
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "mแปฅc โ€œ%sโ€ trong cรขy %s cรณ nรบt cรขy, nhฦฐng khรดng phแบฃi lร  mแป™t cรขy"
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "mแปฅc โ€œ%sโ€ trong cรขy %s cรณ nรบt blob, nhฦฐng khรดng phแบฃi lร  mแป™t blob"
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "khรดng thแปƒ tแบฃi cรขy gแป‘c cho lแบงn chuyแปƒn giao โ€œ%sโ€"
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "khรดng thแปƒ tแป• hแปฃp nhiแปu ฤ‘แบทc tแบฃ kiแปƒu lแปc"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "khรดng thแปƒ truy cแบญp cรกc blob rแบฃi rรกc trong '%s'"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "khรดng thแปƒ phรขn tรญch dแปฏ liแป‡u bแป™ lแปc rแบฃi rรกc trong %s"
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr "cแบงn โ€œtree:<depth>โ€"
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr "viแป‡c hแป— trแปฃ bแป™ lแปc sparse:ฤ‘ฦฐแปng/dแบซn ฤ‘รฃ bแป‹ bแป"
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "ฤ‘แบทc tแบฃ bแป™ lแปc khรดng hแปฃp lแป‡ โ€œ%sโ€"
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "khรดng thแปƒ thay ฤ‘แป•i nhรขn bแบฃn tแปซng phแบงn mรกy chแปง promisor"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "phแบฃi thoรกt char trong sub-filter-spec: '%c'"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "mong ฤ‘แปฃi mแป™t cรกi gรฌ ฤ‘รณ sau khi kแบฟt hแปฃp:"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "khรดng thแปƒ tแป• hแปฃp nhiแปu ฤ‘แบทc tแบฃ kiแปƒu lแปc"
 
 #: lockfile.c:151
 #, c-format
@@ -3606,120 +4323,116 @@ msgstr "Khรดng thแปƒ tแบกo โ€œ%s.lockโ€: %s"
 msgid "failed to read the cache"
 msgstr "gแบทp lแป—i khi ฤ‘แปc bแป™ nhแป› ฤ‘แป‡m"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "khรดng thแปƒ ghi tแบญp tin lฦฐu bแบฃng mแปฅc lแปฅc mแป›i"
 
-#: merge-recursive.c:322
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(commit sai)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "addinfo_cache gแบทp lแป—i ฤ‘แป‘i vแป›i ฤ‘ฦฐแปng dแบซn โ€œ%sโ€; viแป‡c hรฒa trแป™n bแป‹ bรฃi bแป."
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "addinfo_cache gแบทp lแป—i khi lร m mแป›i ฤ‘แป‘i vแป›i ฤ‘ฦฐแปng dแบซn โ€œ%sโ€; viแป‡c hรฒa trแป™n bแป‹ "
 "bรฃi bแป."
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "gแบทp lแป—i khi xรขy dแปฑng cรขy"
-
-#: merge-recursive.c:863
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "gแบทp lแป—i khi tแบกo ฤ‘ฦฐแปng dแบซn โ€œ%sโ€%s"
 
-#: merge-recursive.c:874
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Gแปก bแป %s ฤ‘แปƒ tแบกo chแป— (room) cho thฦฐ mแปฅc con\n"
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr ": cรณ lแบฝ lร  mแป™t xung ฤ‘แป™t D/F?"
 
-#: merge-recursive.c:897
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "tแปซ chแป‘i ฤ‘รณng tแบญp tin khรดng ฤ‘ฦฐแปฃc theo dรตi tแบกi โ€œ%sโ€"
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "khรดng thแปƒ ฤ‘แปc ฤ‘แป‘i tฦฐแปฃng %s โ€œ%sโ€"
 
-#: merge-recursive.c:941
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "mong ฤ‘แปฃi ฤ‘แป‘i tฦฐแปฃng blob cho %s โ€œ%sโ€"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "gแบทp lแป—i khi mแปŸ โ€œ%sโ€: %s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "gแบทp lแป—i khi tแบกo liรชn kแบฟt mแปm (symlink) โ€œ%sโ€: %s"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "khรดng hiแปƒu phแบฃi lร m gรฌ vแป›i %06o %s โ€œ%sโ€"
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Gแบทp lแป—i khi hรฒa trแป™n mรด-ฤ‘un-con โ€œ%sโ€ (khรดng lแบฅy ra ฤ‘ฦฐแปฃc)"
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Gแบทp lแป—i khi hรฒa trแป™n mรด-ฤ‘un-con โ€œ%sโ€ (lแบงn chuyแปƒn giao khรดng hiแป‡n diแป‡n)"
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "Gแบทp lแป—i khi hรฒa trแป™n mรด-ฤ‘un-con โ€œ%sโ€ (lแบงn chuyแปƒn giao khรดng theo sau nแปn-hรฒa-"
 "trแป™n)"
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Chuyแปƒn-tiแบฟp-nhanh mรด-ฤ‘un-con โ€œ%sโ€ ฤ‘แบฟn lแบงn chuyแปƒn giao sau ฤ‘รขy:"
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Chuyแปƒn-tiแบฟp-nhanh mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Gแบทp lแป—i khi hรฒa trแป™n mรด-ฤ‘un-con โ€œ%sโ€ (khรดng tรฌm thแบฅy cรกc lแบงn chuyแปƒn giao "
 "theo sau hรฒa trแป™n)"
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Gแบทp lแป—i khi hรฒa trแป™n mรด-ฤ‘un-con โ€œ%sโ€ (khรดng chuyแปƒn tiแบฟp nhanh ฤ‘ฦฐแปฃc)"
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Tรฌm thแบฅy mแป™t giแบฃi phรกp hรฒa trแป™n cรณ thแปƒ cho mรด-ฤ‘un-con:\n"
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3736,33 +4449,33 @@ msgstr ""
 "\n"
 "cรกi mร  sแบฝ chแบฅp nhแบญn gแปฃi รฝ nร y.\n"
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Gแบทp lแป—i khi hรฒa trแป™n mรด-ฤ‘un-con โ€œ%sโ€ (thแบฅy nhiแปu hรฒa trแป™n ฤ‘a trรนng)"
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "Gแบทp lแป—i khi thแปฑc hiแป‡n trแป™n nแป™i bแป™"
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Khรดng thแปƒ thรชm %s vร o cฦก sแปŸ dแปฏ liแป‡u"
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Tแปฑ-ฤ‘แป™ng-hรฒa-trแป™n %s"
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Lแป—i: tแปซ chแป‘i ฤ‘รณng tแบญp tin khรดng ฤ‘ฦฐแปฃc theo dรตi tแบกi โ€œ%sโ€; thay vร o ฤ‘รณ ghi vร o "
 "%s."
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3771,7 +4484,7 @@ msgstr ""
 "XUNG ฤแป˜T (%s/xรณa): %s bแป‹ xรณa trong %s vร  %s trong %s. Phiรชn bแบฃn %s cแปงa %s "
 "cรฒn lแบกi trong cรขy (tree)."
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3780,7 +4493,7 @@ msgstr ""
 "XUNG ฤแป˜T (%s/xรณa): %s bแป‹ xรณa trong %s vร  %s ฤ‘แบฟn %s trong %s. Phiรชn bแบฃn %s "
 "cแปงa %s cรฒn lแบกi trong cรขy (tree)."
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3789,7 +4502,7 @@ msgstr ""
 "XUNG ฤแป˜T (%s/xรณa): %s bแป‹ xรณa trong %s vร  %s trong %s. Phiรชn bแบฃn %s cแปงa %s "
 "cรฒn lแบกi trong cรขy (tree) tแบกi %s."
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3798,45 +4511,45 @@ msgstr ""
 "XUNG ฤแป˜T (%s/xรณa): %s bแป‹ xรณa trong %s vร  %s ฤ‘แบฟn %s trong %s. Phiรชn bแบฃn %s "
 "cแปงa %s cรฒn lแบกi trong cรขy (tree) tแบกi %s."
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "ฤ‘แป•i tรชn"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "ฤ‘รฃ ฤ‘แป•i tรชn"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Tแปซ chแป‘i ฤ‘รณng tแบญp tin khรดng ฤ‘ฦฐแปฃc theo dรตi tแบกi โ€œ%sโ€"
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Tแปซ chแป‘i ฤ‘รณng tแบญp tin khรดng ฤ‘ฦฐแปฃc theo dรตi tแบกi โ€œ%sโ€, ngay cแบฃ khi nรณ แปŸ trรชn "
 "ฤ‘ฦฐแปng."
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "XUNG ฤแป˜T (ฤ‘แป•i-tรชn/thรชm): ฤแป•i tรชn %s->%s trong %s. %s ฤ‘ฦฐแปฃc thรชm trong %s"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s lร  mแป™t thฦฐ mแปฅc trong %s thay vร o ฤ‘รณ thรชm vร o nhฦฐ lร  %s"
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Tแปซ chแป‘i ฤ‘รณng tแบญp tin khรดng ฤ‘ฦฐแปฃc theo dรตi tแบกi โ€œ%sโ€; thay vร o ฤ‘รณ ฤ‘ang thรชm "
 "thร nh %s"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3845,17 +4558,17 @@ msgstr ""
 "XUNG ฤแป˜T (ฤ‘แป•i-tรชn/ฤ‘แป•i-tรชn): ฤแป•i tรชn \"%s\"->\"%s\" trong nhรกnh \"%s\" ฤ‘แป•i "
 "tรชn \"%s\"->\"%s\" trong \"%s\"%s"
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " (cแบงn giแบฃi quyแบฟt)"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1793
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "XUNG ฤแป˜T (ฤ‘แป•i-tรชn/ฤ‘แป•i-tรชn): ฤแป•i tรชn %s->%s trong %s. ฤแป•i tรชn %s->%s trong %s"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3866,7 +4579,7 @@ msgstr ""
 "vรฌ thฦฐ mแปฅc %s ฤ‘รฃ bแป‹ ฤ‘แป•i tรชn thร nh nhiแปu thฦฐ mแปฅc khรกc, vแป›i khรดng ฤ‘รญch ฤ‘แบฟn "
 "nhแบญn mแป™t phแบงn nhiแปu cแปงa cรกc tแบญp tin."
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3875,7 +4588,7 @@ msgstr ""
 "XUNG ฤแป˜T: (ngแบงm ฤ‘แป•i tรชn thฦฐ mแปฅc): Tแบญp tin/thฦฐ mแปฅc ฤ‘รฃ sแบตn cรณ tแบกi %s theo cรกch "
 "cแปงa cรกc ฤ‘แป•i tรชn thฦฐ mแปฅc ngแบงm ฤ‘แบทt (cรกc) ฤ‘ฦฐแปng dแบซn sau แปŸ ฤ‘รขy: %s."
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3884,7 +4597,7 @@ msgstr ""
 "XUNG ฤแป˜T: (ngแบงm ฤ‘แป•i tรชn thฦฐ mแปฅc): Khรดng thแปƒ รกnh xแบก mแป™t ฤ‘ฦฐแปng dแบซn thร nh %s; "
 "cรกc ฤ‘แป•i tรชn thฦฐ mแปฅc ngแบงm cแป‘ ฤ‘แบทt cรกc ฤ‘ฦฐแปng dแบซn แปŸ ฤ‘รขy: %s"
 
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3893,7 +4606,7 @@ msgstr ""
 "XUNG ฤแป˜T (ฤ‘แป•i-tรชn/ฤ‘แป•i-tรชn): ฤแป•i tรชn thฦฐ mแปฅc %s->%s trong %s. ฤแป•i tรชn thฦฐ mแปฅc "
 "%s->%s trong %s"
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3902,52 +4615,52 @@ msgstr ""
 "CแบขNH BรO: trรกnh รกp dแปฅng %s -> %s ฤ‘แป•i thรชn thร nh %s, bแปŸi vรฌ bแบฃn thรขn %s cลฉng "
 "bแป‹ ฤ‘แป•i tรชn."
 
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
 #, c-format
 msgid "cannot read object %s"
 msgstr "khรดng thแปƒ ฤ‘แปc ฤ‘แป‘i tฦฐแปฃng %s"
 
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
 #, c-format
 msgid "object %s is not a blob"
 msgstr "ฤ‘แป‘i tฦฐแปฃng %s khรดng phแบฃi lร  mแป™t blob"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modify"
 msgstr "sแปญa ฤ‘แป•i"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modified"
 msgstr "ฤ‘รฃ sแปญa"
 
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
 msgid "content"
 msgstr "nแป™i dung"
 
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
 msgid "add/add"
 msgstr "thรชm/thรชm"
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "ฤรฃ bแป qua %s (ฤ‘รฃ cรณ sแบตn lแบงn hรฒa trแป™n nร y)"
 
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:1003
 msgid "submodule"
 msgstr "mรด-ฤ‘un-con"
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "XUNG ฤแป˜T (%s): Xung ฤ‘แป™t hรฒa trแป™n trong %s"
 
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Thay vร o ฤ‘รณ thรชm vร o %s"
 
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -3956,7 +4669,7 @@ msgstr ""
 "ฤฦฐแปng dแบซn ฤ‘รฃ ฤ‘ฦฐแปฃc cแบญp nhแบญt: %s ฤ‘ฦฐแปฃc thรชm vร o trong %s bรชn trong mแป™t thฦฐ mแปฅc "
 "ฤ‘รฃ ฤ‘ฦฐแปฃc ฤ‘แป•i tรชn trong %s; di chuyแปƒn nรณ ฤ‘แบฟn %s."
 
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -3965,7 +4678,7 @@ msgstr ""
 "XUNG ฤแป˜T (vแป‹ trรญ tแป‡p): %s ฤ‘ฦฐแปฃc thรชm vร o trong %s trong mแป™t thฦฐ mแปฅc ฤ‘รฃ ฤ‘ฦฐแปฃc "
 "ฤ‘แป•i tรชn thร nh %s, ฤ‘oรกn lร  nรณ nรชn ฤ‘ฦฐแปฃc di chuyแปƒn ฤ‘แบฟn %s."
 
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -3974,7 +4687,7 @@ msgstr ""
 "ฤฦฐแปng dแบซn ฤ‘รฃ ฤ‘ฦฐแปฃc cแบญp nhแบญt: %s ฤ‘ฦฐแปฃc ฤ‘แป•i tรชn thร nh %s trong %s, bรชn trong mแป™t "
 "thฦฐ mแปฅc ฤ‘รฃ ฤ‘ฦฐแปฃc ฤ‘แป•i tรชn trong %s; di chuyแปƒn nรณ ฤ‘แบฟn %s."
 
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -3983,227 +4696,243 @@ msgstr ""
 "XUNG ฤแป˜T (vแป‹ trรญ tแป‡p): %s ฤ‘ฦฐแปฃc ฤ‘แป•i tรชn thร nh %s trong %s, bรชn trong mแป™t thฦฐ "
 "mแปฅc ฤ‘รฃ ฤ‘ฦฐแปฃc ฤ‘แป•i tรชn thร nh %s, ฤ‘oรกn lร  nรณ nรชn ฤ‘ฦฐแปฃc di chuyแปƒn ฤ‘แบฟn %s."
 
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
 #, c-format
 msgid "Removing %s"
 msgstr "ฤang xรณa %s"
 
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
 msgid "file/directory"
 msgstr "tแบญp-tin/thฦฐ-mแปฅc"
 
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
 msgid "directory/file"
 msgstr "thฦฐ-mแปฅc/tแบญp-tin"
 
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "XUNG ฤแป˜T (%s): แปž ฤ‘รขy khรดng cรณ thฦฐ mแปฅc nร o cรณ tรชn %s trong %s. Thรชm %s nhฦฐ lร  "
 "%s"
 
-#: merge-recursive.c:3347
+#: merge-recursive.c:3371
 #, c-format
 msgid "Adding %s"
 msgstr "Thรชm \"%s\""
 
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "XUNG ฤแป˜T (thรชm/thรชm): Xung ฤ‘แป™t hรฒa trแป™n trong %s"
 
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Cรกc thay ฤ‘แป•i nแป™i bแป™ cแปงa bแบกn vแป›i cรกc tแบญp tin sau ฤ‘รขy sแบฝ bแป‹ ghi ฤ‘รจ bแปŸi lแป‡nh "
-"hรฒa trแป™n:\n"
-"  %s"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
 msgid "Already up to date!"
 msgstr "ฤรฃ cแบญp nhแบญt rแป“i!"
 
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "hรฒa trแป™n cรกc cรขy %s vร  %s gแบทp lแป—i"
 
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
 msgid "Merging:"
 msgstr "ฤang trแป™n:"
 
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "tรฌm thแบฅy %u tแป• tiรชn chung:"
 
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
 msgid "merge returned no commit"
 msgstr "hรฒa trแป™n khรดng trแบฃ vแป lแบงn chuyแปƒn giao nร o"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Cรกc thay ฤ‘แป•i nแป™i bแป™ cแปงa bแบกn vแป›i cรกc tแบญp tin sau ฤ‘รขy sแบฝ bแป‹ ghi ฤ‘รจ bแปŸi lแป‡nh "
+"hรฒa trแป™n:\n"
+"  %s"
+
+#: merge-recursive.c:3756
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Khรดng thแปƒ phรขn tรญch ฤ‘แป‘i tฦฐแปฃng โ€œ%sโ€"
 
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
 msgid "Unable to write index."
 msgstr "Khรดng thแปƒ ghi bแบฃng mแปฅc lแปฅc."
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "tแบญp tin ฤ‘แป“ thแป‹ multi-pack-index %s quรก nhแป"
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "chแปฏ kรฝ multi-pack-index 0x%08x khรดng khแป›p chแปฏ kรฝ 0x%08x"
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "khรดng nhแบญn ra phiรชn bแบฃn %d cแปงa multi-pack-index"
 
-#: midx.c:95
+#: midx.c:94
 #, c-format
 msgid "hash version %u does not match"
 msgstr "phiรชn bแบฃn bฤƒm โ€œ%uโ€ khรดng khแป›p"
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr "khoแบฃng bรน ฤ‘oแบกn khรดng hแปฃp lแป‡ (quรก lแป›n)"
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr "mรฃ mแบฃnh kแบฟt thรบc multi-pack-index xuแบฅt hiแป‡n sแป›m hฦกn bรฌnh thฦฐแปng"
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index thiแบฟu mแบฃnh pack-name cแบงn thiแบฟt"
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index thiแบฟu mแบฃnh OID fanout cแบงn thiแบฟt"
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index thiแบฟu mแบฃnh OID lookup cแบงn thiแบฟt"
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index thiแบฟu mแบฃnh cรกc khoแบฃng bรน ฤ‘แป‘i tฦฐแปฃng cแบงn thiแบฟt"
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "cรกc tรชn gรณi multi-pack-index khรดng ฤ‘รบng thแปฉ tแปฑ: โ€œ%sโ€ trฦฐแป›c โ€œ%sโ€"
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "pack-int-id sai: %u (%u cรกc gรณi tแป•ng)"
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "multi-pack-index lฦฐu trแปฏ mแป™t khoแบฃng bรน 64-bรญt, nhฦฐng off_t lร  quรก nhแป"
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr "lแป—i chuแบฉn bแป‹ tแบญp tin gรณi tแปซ multi-pack-index"
 
-#: midx.c:470
+#: midx.c:472
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "gแบทp lแป—i khi thรชm tแบญp tin gรณi โ€œ%sโ€"
 
-#: midx.c:476
+#: midx.c:478
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "gแบทp lแป—i khi mแปŸ pack-index โ€œ%sโ€"
 
-#: midx.c:536
+#: midx.c:538
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "gแบทp lแป—i khi phรขn bแป• ฤ‘แป‘i tฦฐแปฃng โ€œ%dโ€ trong tแบญp tin gรณi"
 
-#: midx.c:865
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "ฤang thรชm tแบญp tin gรณi tแปซ multi-pack-index"
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "ฤ‘รฃ khรดng thแบฅy tแบญp tin gรณi %s ฤ‘แปƒ mร  xรณa"
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "ฤang ghi cรกc khรบc vร o multi-pack-index"
+
+#: midx.c:1052
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "gแบทp lแป—i khi xรณa multi-pack-index tแบกi %s"
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr "ฤang khรณa cho cรกc gรณi bแป‹ tham chiแบฟu"
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr "fanout cลฉ sai thแปฉ tแปฑ: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
-msgstr "Thแบฉm tra thแปฉ tแปฑ OID trong MIDX"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Thแบฉm tra thแปฉ tแปฑ OID trong multi-pack-index"
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "lookup cลฉ sai thแปฉ tแปฑ: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr "ฤang sแบฏp xแบฟp cรกc ฤ‘แป‘i tฦฐแปฃng theo tแบญp tin gรณi"
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr "ฤang thแบฉm tra cรกc khoแบฃng bรน ฤ‘แป‘i tฦฐแปฃng"
 
-#: midx.c:1160
+#: midx.c:1180
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "gแบทp lแป—i khi tแบฃi mแปฅc gรณi cho oid[%d] = %s"
 
-#: midx.c:1166
+#: midx.c:1186
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "gแบทp lแป—i khi tแบฃi pack-index cho tแบญp tin gรณi %s"
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 "khoแบฃng bรน ฤ‘แป‘i tฦฐแปฃng khรดng ฤ‘รบng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "ฤang ฤ‘แบฟm cรกc ฤ‘แป‘i tฦฐแปฃng ฤ‘ฦฐแปฃc tham chiแบฟu"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "ฤang tรฌm vร  xรณa cรกc gรณi khรดng ฤ‘ฦฐแปฃc tham chiแบฟu"
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr "khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช vแป cรกc ฤ‘แป‘i tฦฐแปฃng gรณi"
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr "khรดng thแปƒ hoร n thiแป‡n cรกc ฤ‘แป‘i tฦฐแปฃng gรณi"
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "khรดng thแปƒ tแบกo tuyแบฟn lazy_dir: %s"
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "khรดng thแปƒ tแบกo tuyแบฟn lazy_name: %s"
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "khรดng thแปƒ gia nhแบญp tuyแบฟn lazy_name: %s"
@@ -4250,32 +4979,32 @@ msgstr "Tแปซ chแป‘i ghi ฤ‘รจ ghi chรบ trong %s (nแบฑm ngoร i refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Giรก trแป‹ %s sai: โ€œ%sโ€"
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "kiแปƒu ฤ‘แป‘i tฦฐแปฃng \"%s\" khรดng hแปฃp lแป‡"
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "ฤ‘แป‘i tฦฐแปฃng %s lร  mแป™t %s, khรดng phแบฃi lร  mแป™t %s"
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "ฤ‘แป‘i tฦฐแปฃng %s cรณ mรฃ kiแปƒu %d chฦฐa biแบฟt"
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "khรดng thแปƒ phรขn tรญch ฤ‘แป‘i tฦฐแปฃng: โ€œ%sโ€"
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr "mรฃ bฤƒm khรดng khแป›p %s"
 
-#: packfile.c:648
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "vแป‹ trรญ tฦฐฦกng ฤ‘แป‘i trฦฐแป›c ฤ‘iแปƒm kแบฟt thรบc cแปงa tแบญp tin gรณi (.idx hแปng ร ?)"
 
@@ -4290,6 +5019,11 @@ msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "vแป‹ trรญ tฦฐฦกng ฤ‘แป‘i vฦฐแปฃt quรก cuแป‘i cแปงa chแป‰ mแปฅc gรณi cho %s (mแปฅc lแปฅc bแป‹ cแบฏt cแปฅt ร ?)"
 
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "khรดng thแปƒ lแบฅy kรญch cแปก cแปงa %s"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4305,7 +5039,7 @@ msgstr "%s lร  xung khแบฏc vแป›i %s"
 msgid "%s : incompatible with something else"
 msgstr "%s : xung khแบฏc vแป›i cรกc cรกi khรกc"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s k nhแบญn giรก trแป‹"
@@ -4315,41 +5049,41 @@ msgstr "%s k nhแบญn giรก trแป‹"
 msgid "%s isn't available"
 msgstr "%s khรดng sแบตn cรณ"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s cแบงn mแป™t giรก trแป‹ dแบกng sแป‘ khรดng รขm vแป›i mแป™t hแบญu tแป‘ tรนy chแปn k/m/g"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "tรนy chแปn chฦฐa rรต rang: %s (nรชn lร  --%s%s hay --%s%s)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr "cรณ phแบฃi รฝ bแบกn lร  โ€œ--%sโ€œ (vแป›i hai dแบฅu gแบกch ngang?)"
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "cรณ phแบฃi รฝ bแบกn lร  โ€œ--%sโ€œ (vแป›i hai dแบฅu gแบกch ngang)?"
 
-#: parse-options.c:859
+#: parse-options.c:857
 #, c-format
 msgid "unknown option `%s'"
 msgstr "khรดng hiแปƒu tรนy chแปn โ€œ%sโ€"
 
-#: parse-options.c:861
+#: parse-options.c:859
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "khรดng hiแปƒu tรนy chแปn โ€œ%cโ€"
 
-#: parse-options.c:863
+#: parse-options.c:861
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "khรดng hiแปƒu tรนy chแปn non-ascii trong chuแป—i: โ€œ%sโ€"
 
-#: parse-options.c:887
+#: parse-options.c:885
 msgid "..."
 msgstr "โ€ฆ"
 
-#: parse-options.c:906
+#: parse-options.c:904
 #, c-format
 msgid "usage: %s"
 msgstr "cรกch dรนng: %s"
@@ -4357,21 +5091,21 @@ msgstr "cรกch dรนng: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:910
 #, c-format
 msgid "   or: %s"
 msgstr "     hoแบทc: %s"
 
-#: parse-options.c:915
+#: parse-options.c:913
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:952
 msgid "-NUM"
 msgstr "-Sแป"
 
-#: parse-options.c:968
+#: parse-options.c:966
 #, c-format
 msgid "alias of --%s"
 msgstr "bรญ danh cแปงa --%s"
@@ -4396,35 +5130,35 @@ msgstr "tรนy chแปn โ€œ%sโ€ cแบงn \"always\", \"auto\", hoแบทc \"never\""
 msgid "malformed object name '%s'"
 msgstr "tรชn ฤ‘แป‘i tฦฐแปฃng dแป‹ hรฌnh โ€œ%sโ€"
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Khรดng thแปƒ lร m %s ฤ‘ฦฐแปฃc ghi bแปŸi nhรณm"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Kรฝ tแปฑ thoรกt chuแป—i โ€œ\\โ€ khรดng ฤ‘ฦฐแปฃc phรฉp lร  kรฝ tแปฑ cuแป‘i trong giรก trแป‹ thuแป™c tรญnh"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Chแป‰ cรณ mแป™t ฤ‘แบทc tแบฃ โ€œattr:โ€ lร  ฤ‘ฦฐแปฃc phรฉp."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "ฤ‘แบทc tแบฃ attr phแบฃi khรดng ฤ‘ฦฐแปฃc ฤ‘แปƒ trแป‘ng"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "tรชn thuแป™c tรญnh khรดng hแปฃp lแป‡ %s"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "cรกc cร i ฤ‘แบทt ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn โ€œglobโ€ vร  โ€œnoglobโ€ toร n cแปฅc lร  xung khแบฏc nhau"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4432,50 +5166,55 @@ msgstr ""
 "cร i ฤ‘แบทt ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn โ€œliteralโ€ toร n cแปฅc lร  xung khแบฏc vแป›i cรกc cร i ฤ‘แบทt ฤ‘แบทc "
 "tแบฃ ฤ‘ฦฐแปng dแบซn toร n cแปฅc khรกc"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "tham sแป‘ khรดng hแปฃp lแป‡ cho โ€œtiแปn tแป‘โ€ mร u nhiแป‡m ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng ฤ‘แบซn"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Sแป‘ mร u nhiแป‡m ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn khรดng hแปฃp lแป‡ โ€œ%.*sโ€ trong โ€œ%sโ€"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Thiแบฟu โ€œ)โ€ tแบกi cuแป‘i cแปงa sแป‘ mร u nhiแป‡m ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn trong โ€œ%sโ€"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Chฦฐa viแบฟt mรฃ cho sแป‘ mร u nhiแป‡m ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn โ€œ%cโ€ trong โ€œ%sโ€"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: โ€œliteralโ€ vร  โ€œglobโ€ xung khแบฏc nhau"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: โ€œ%sโ€ ngoร i mแป™t kho chแปฉa"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: โ€œ%sโ€ ngoร i mแป™t kho chแปฉa tแบกi '%s'"
 
-#: pathspec.c:514
+#: pathspec.c:517
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "โ€œ%sโ€ (mnemonic: โ€œ%cโ€)"
 
-#: pathspec.c:524
+#: pathspec.c:527
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: sแป‘ mแบงu nhiแป‡m ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn chฦฐa ฤ‘ฦฐแปฃc hแป— trแปฃ bแปŸi lแป‡nh nร y: %s"
 
-#: pathspec.c:591
+#: pathspec.c:594
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ vฦฐแปฃt ra ngoร i liรชn kแบฟt mแปm"
 
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "dรฒng ฤ‘ฦฐแปฃc trรญch dแบซn sai: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "khรดng thแปƒ ฤ‘แบฉy dแปฏ liแป‡u cแปงa gรณi lรชn ฤ‘ฤฉa"
@@ -4536,33 +5275,42 @@ msgstr "Lร m mแป›i bแบฃng mแปฅc lแปฅc"
 msgid "unable to create threaded lstat: %s"
 msgstr "khรดng thแปƒ tแบกo tuyแบฟn trรฌnh lstat: %s"
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr "khรดng thแปƒ phรขn tรญch ฤ‘แป‹nh dแบกng --pretty"
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "Mรกy chแปง khรดng cรณ ฤ‘แป‹a chแป‰ URL"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "tรชn mรกy chแปง hแปฉa hแบนn khรดng thแปƒ bแบฏt ฤ‘แบงu bแบฑng '/': %s"
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช vแป โ€œlogโ€œ"
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr "khรดng thแปƒ ฤ‘แปc kแบฟt xuแบฅt โ€œlogโ€"
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5020
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "khรดng thแปƒ phรขn tรญch lแบงn chuyแปƒn giao โ€œ%sโ€"
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp phแบงn ฤ‘แบงu git โ€œ%.*sโ€"
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr "gแบทp lแป—i khi tแบกo khรกc biแป‡t"
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "khรดng thแปƒ phรขn tรญch nhแบญt kรฝ cho โ€œ%sโ€"
@@ -4603,16 +5351,16 @@ msgstr "khรดng thแปƒ thรชm %s vร o bแบฃng mแปฅc lแปฅc"
 msgid "unable to stat '%s'"
 msgstr "khรดng thแปƒ lแบฅy thแป‘ng kรช โ€œ%sโ€"
 
-#: read-cache.c:1314
+#: read-cache.c:1330
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "%s cรณ vแบป khรดng phแบฃi lร  tแบญp tin vร  cลฉng chแบณng phแบฃi lร  mแป™t thฦฐ mแปฅc"
 
-#: read-cache.c:1499
+#: read-cache.c:1536
 msgid "Refresh index"
 msgstr "Lร m tฦฐฦกi mแป›i bแบฃng mแปฅc lแปฅc"
 
-#: read-cache.c:1613
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4621,7 +5369,7 @@ msgstr ""
 "index.version ฤ‘ฦฐแปฃc ฤ‘แบทt, nhฦฐng giรก trแป‹ cแปงa nรณ lแบกi khรดng hแปฃp lแป‡.\n"
 "Dรนng phiรชn bแบฃn %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4630,150 +5378,161 @@ msgstr ""
 "GIT_INDEX_VERSION ฤ‘ฦฐแปฃc ฤ‘แบทt, nhฦฐng giรก trแป‹ cแปงa nรณ lแบกi khรดng hแปฃp lแป‡.\n"
 "Dรนng phiรชn bแบฃn %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1717
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "chแปฏ kรฝ sai 0x%08x"
 
-#: read-cache.c:1682
+#: read-cache.c:1720
 #, c-format
 msgid "bad index version %d"
 msgstr "phiรชn bแบฃn mแปฅc lแปฅc sai %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1729
 msgid "bad index file sha1 signature"
 msgstr "chแปฏ kรฝ dแบกng sha1 cho tแบญp tin mแปฅc lแปฅc khรดng ฤ‘รบng"
 
-#: read-cache.c:1721
+#: read-cache.c:1759
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "mแปฅc lแปฅc dรนng phแบงn mแปŸ rแป™ng %.4s, cรกi mร  chรบng tรดi khรดng hiแปƒu ฤ‘ฦฐแปฃc"
 
-#: read-cache.c:1723
+#: read-cache.c:1761
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ฤ‘ang lแป ฤ‘i phแบงn mแปŸ rแป™ng %.4s"
 
-#: read-cache.c:1760
+#: read-cache.c:1798
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "khรดng hiแปƒu ฤ‘แป‹nh dแบกng mแปฅc lแปฅc 0x%08x"
 
-#: read-cache.c:1776
+#: read-cache.c:1814
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "trฦฐแปng tรชn sai sแบกng trong mแปฅc lแปฅc, gแบงn ฤ‘ฦฐแปng dแบซn โ€œ%sโ€"
 
-#: read-cache.c:1833
+#: read-cache.c:1871
 msgid "unordered stage entries in index"
 msgstr "cรกc mแปฅc tin stage khรดng ฤ‘รบng thแปฉ tแปฑ trong mแปฅc lแปฅc"
 
-#: read-cache.c:1836
+#: read-cache.c:1874
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "nhiแปu mแปฅc stage cho tแบญp tin hรฒa trแป™n โ€œ%sโ€"
 
-#: read-cache.c:1839
+#: read-cache.c:1877
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "cรกc mแปฅc tin stage khรดng ฤ‘รบng thแปฉ tแปฑ cho โ€œ%sโ€"
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "tแบญp tin ghi bแบฃng mแปฅc lแปฅc bแป‹ hแปng"
 
-#: read-cache.c:2087
+#: read-cache.c:2124
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "khรดng thแปƒ tแบกo tuyแบฟn load_cache_entries: %s"
 
-#: read-cache.c:2100
+#: read-cache.c:2137
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "khรดng thแปƒ gia nhแบญp tuyแบฟn load_cache_entries: %s"
 
-#: read-cache.c:2133
+#: read-cache.c:2170
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: mแปŸ tแบญp tin mแปฅc lแปฅc gแบทp lแป—i"
 
-#: read-cache.c:2137
+#: read-cache.c:2174
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: khรดng thแปƒ lแบฅy thแป‘ng kรช bแบฃng mแปฅc lแปฅc ฤ‘รฃ mแปŸ"
 
-#: read-cache.c:2141
+#: read-cache.c:2178
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: tแบญp tin mแปฅc lแปฅc nhแป hฦกn mong ฤ‘แปฃi"
 
-#: read-cache.c:2145
+#: read-cache.c:2182
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s: khรดng thแปƒ รกnh xแบก tแบญp tin mแปฅc lแปฅc"
 
-#: read-cache.c:2187
+#: read-cache.c:2224
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "khรดng thแปƒ tแบกo tuyแบฟn load_index_extensions: %s"
 
-#: read-cache.c:2214
+#: read-cache.c:2251
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "khรดng thแปƒ gia nhแบญp tuyแบฟn load_index_extensions: %s"
 
-#: read-cache.c:2246
+#: read-cache.c:2283
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "khรดng thแปƒ lร m tฦฐฦกi mแป›i mแปฅc lแปฅc ฤ‘รฃ chia sแบป โ€œ%sโ€"
 
-#: read-cache.c:2293
+#: read-cache.c:2330
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "mแปฅc lแปฅc bแป‹ hแปng, cแบงn %s trong %s, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc %s"
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
 #, c-format
 msgid "could not close '%s'"
 msgstr "khรดng thแปƒ ฤ‘รณng โ€œ%sโ€"
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
 #, c-format
 msgid "could not stat '%s'"
 msgstr "khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช vแป โ€œ%sโ€"
 
-#: read-cache.c:3105
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "khรดng thแปƒ mแปŸ thฦฐ mแปฅc git: %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "khรดng thแปƒ bแป liรชn kแบฟt (unlink): โ€œ%sโ€"
 
-#: read-cache.c:3142
+#: read-cache.c:3179
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "khรดng thแปƒ sแปญa cรกc bรญt phรขn quyแปn trรชn โ€œ%sโ€"
 
-#: read-cache.c:3291
+#: read-cache.c:3328
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: khรดng thแปƒ xรณa bแป stage #0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Bแบกn cรณ thแปƒ sแปญa nรณ bแบฑng โ€œgit rebase --edit-todoโ€ vร  sau ฤ‘รณ chแบกy โ€œgit rebase --"
+"continueโ€.\n"
+"Hoแบทc lร  bแบกn cรณ thแปƒ bรฃi bแป viแป‡c cแบฃi tแป• bแบฑng โ€œgit rebase --abortโ€.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "khรดng nhแบญn ra cร i ฤ‘แบทt %s cho tรนy chแปn rebase.missingCommitsCheck. Nรชn bแป qua."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4819,13 +5578,13 @@ msgstr ""
 "Nhแปฏng dรฒng nร y cรณ thแปƒ ฤ‘แบฃo ngฦฐแปฃc thแปฉ tแปฑ; chรบng chแบกy tแปซ trรชn ฤ‘แป‰nh xuแป‘ng dฦฐแป›i "
 "ฤ‘รกy.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Cแบฃi tแป• %s vร o %s (%d lแป‡nh )"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -4834,7 +5593,7 @@ msgstr ""
 "ฤแปซng xรณa bแบฅt kแปณ dรฒng nร o. Dรนng โ€œdropโ€ mแป™t cรกch rรต rร ng ฤ‘แปƒ xรณa bแป mแป™t lแบงn "
 "chuyแปƒn giao.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4842,7 +5601,7 @@ msgstr ""
 "\n"
 "Nแบฟu bแบกn xรณa bแป mแป™t dรฒng แปŸ ฤ‘รขy thรฌ LแบฆN CHUYแป‚N GIAO ฤร“ Sแบผ MแบคT.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4856,7 +5615,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4866,22 +5625,19 @@ msgstr ""
 "Tuy nhiรชn, nแบฟu bแบกn xรณa bแป mแปi thแปฉ, viแป‡c cแบฃi tแป• sแบฝ bแป‹ bรฃi bแป.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Chรบ รฝ rแบฑng lแบงn chuyแปƒn giao trแป‘ng rแป—ng lร  ghi chรบ"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
 #, c-format
 msgid "could not write '%s'"
 msgstr "khรดng thแปƒ ghi โ€œ%sโ€"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "khรดng thแปƒ chรฉp โ€œ%sโ€ sang โ€œ%sโ€."
+msgid "could not write '%s'."
+msgstr "khรดng thแปƒ ghi โ€œ%sโ€."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4890,7 +5646,7 @@ msgstr ""
 "Cแบฃnh bรกo: mแป™t sแป‘ lแบงn chuyแปƒn giao cรณ lแบฝ ฤ‘รฃ bแป‹ xรณa mแป™t cรกch tรฌnh cแป.\n"
 "Cรกc lแบงn chuyแปƒn giao bแป‹ xรณa (tแปซ mแป›i ฤ‘แบฟn cลฉ):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4908,6 +5664,13 @@ msgstr ""
 "Cรกnh แปฉng xแปญ cรณ thแปƒ lร : ignore, warn, error.\n"
 "\n"
 
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "khรดng thแปƒ ฤ‘แปc โ€œ%sโ€."
+
 #: refs.c:262
 #, c-format
 msgid "%s does not point to a valid object!"
@@ -4918,7 +5681,7 @@ msgstr "โ€œ%sโ€ khรดng chแป‰ ฤ‘แบฟn mแป™t lแบงn chuyแปƒn giao hแปฃp lแป‡ nร o c
 msgid "ignoring dangling symref %s"
 msgstr "ฤ‘ang lแป ฤ‘i tham chiแบฟu mแปm thแปซa %s"
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ฤ‘ang lแป ฤ‘i tham chiแบฟu hแปng %s"
@@ -4943,14 +5706,15 @@ msgstr "tham chiแบฟu โ€œ%sโ€ ฤ‘รฃ cรณ tแปซ trฦฐแป›c rแป“i"
 msgid "unexpected object ID when writing '%s'"
 msgstr "khรดng cแบงn ID ฤ‘แป‘i tฦฐแปฃng khi ghi โ€œ%sโ€"
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "khรดng thแปƒ ghi vร o โ€œ%sโ€"
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "khรดng thแปƒ mแปŸ โ€œ%sโ€ ฤ‘แปƒ ghi"
@@ -4985,37 +5749,37 @@ msgstr "tแปซ chแป‘i cแบญp nhแบญt tham chiแบฟu vแป›i tรชn sai โ€œ%sโ€"
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref bแป‹ lแป—i cho ref โ€œ%sโ€: %s"
 
-#: refs.c:2012
+#: refs.c:2023
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "khรดng cho phรฉp ฤ‘a cแบญp nhแบญt cho tham chiแบฟu โ€œ%sโ€"
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "cแบญp nhแบญt tham chiแบฟu bแป‹ cแบฅm trong mรดi trฦฐแปng kiแปƒm tra"
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "โ€œ%sโ€ sแบตn cรณ; khรดng thแปƒ tแบกo โ€œ%sโ€"
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "khรดng thแปƒ xแปญ lรฝ โ€œ%sโ€ vร  โ€œ%sโ€ cรนng mแป™t lรบc"
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr "khรดng thแปƒ gแปก bแป tham chiแบฟu: %s"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "khรดng thแปƒ xรณa bแป tham chiแบฟu %s: %s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "khรดng thแปƒ xรณa bแป tham chiแบฟu: %s"
@@ -5025,7 +5789,7 @@ msgstr "khรดng thแปƒ xรณa bแป tham chiแบฟu: %s"
 msgid "invalid refspec '%s'"
 msgstr "refspec khรดng hแปฃp lแป‡ โ€œ%sโ€"
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr "ฤ‘รฃ ra ฤ‘i"
 
@@ -5044,122 +5808,122 @@ msgstr "ฤ‘แบฑng sau %d"
 msgid "ahead %d, behind %d"
 msgstr "trฦฐแป›c %d, sau %d"
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "cแบงn ฤ‘แป‹nh dแบกng: %%(color:<color>)"
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "khรดng nhแบญn ra mร u: %%(mร u:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Giรก trแป‹ nguyรชn cแบงn tรชn tham chiแบฟu:lstrip=%s"
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Giรก trแป‹ nguyรชn cแบงn tรชn tham chiแบฟu:rstrip=%s"
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "ฤ‘แป‘i sแป‘ khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn %%(%s): %s"
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) khรดng nhแบญn cรกc ฤ‘แป‘i sแป‘"
 
-#: ref-filter.c:269
+#: ref-filter.c:272
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "tham sแป‘ khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn %%(objectname): %s"
 
-#: ref-filter.c:277
+#: ref-filter.c:280
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) khรดng nhแบญn cรกc ฤ‘แป‘i sแป‘"
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) khรดng nhแบญn cรกc ฤ‘แป‘i sแป‘"
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) khรดng nhแบญn cรกc ฤ‘แป‘i sแป‘"
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "khรดng hiแปƒu tham sแป‘ %%(trailers): %s"
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "cแบงn nแป™i dung mang giรก trแป‹ dฦฐฦกng:lines=%s"
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "ฤ‘แป‘i sแป‘ khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn %%(contents): %s"
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "cแบงn nแป™i dung mang giรก trแป‹ dฦฐฦกng:shot=%s"
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "ฤ‘แป‘i sแป‘ khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn %%(objectname): %s"
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "cแบงn ฤ‘แป‹nh dแบกng: %%(align:<width>,<position>)"
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "vแป‹ trรญ khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn:%s"
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "chiแปu rแป™ng khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn:%s"
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "ฤ‘แป‘i sแป‘ khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn %%(align): %s"
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "cแบงn giรก trแป‹ ฤ‘แป™ rแป™ng dฦฐฦกng vแป›i nguyรชn tแปญ %%(align)"
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "ฤ‘แป‘i sแป‘ khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn %%(if): %s"
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "tรชn trฦฐแปng dแป‹ hรฌnh: %.*s"
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "khรดng hiแปƒu tรชn trฦฐแปng: %.*s"
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
@@ -5167,159 +5931,159 @@ msgstr ""
 "khรดng phแบฃi lร  mแป™t kho git, nhฦฐng trฦฐแปng โ€œ%.*sโ€ yรชu cแบงu truy cแบญp vร o dแปฏ liแป‡u "
 "ฤ‘แป‘i tฦฐแปฃng"
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "ฤ‘แป‹nh dแบกng: nguyรชn tแปญ %%(if) ฤ‘ฦฐแปฃc dรนng mร  khรดng cรณ nguyรชn tแปญ %%(then)"
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "ฤ‘แป‹nh dแบกng: nguyรชn tแปญ %%(then) ฤ‘ฦฐแปฃc dรนng mร  khรดng cรณ nguyรชn tแปญ %%(if)"
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "ฤ‘แป‹nh dแบกng: nguyรชn tแปญ %%(then) ฤ‘ฦฐแปฃc dรนng nhiแปu hฦกn mแป™t lแบงn"
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "ฤ‘แป‹nh dแบกng: nguyรชn tแปญ %%(then) ฤ‘ฦฐแปฃc dรนng sau %%(else)"
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "ฤ‘แป‹nh dแบกng: nguyรชn tแปญ %%(else) ฤ‘ฦฐแปฃc dรนng mร  khรดng cรณ nguyรชn tแปญ %%(if)"
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "ฤ‘แป‹nh dแบกng: nguyรชn tแปญ %%(else) ฤ‘ฦฐแปฃc dรนng mร  khรดng cรณ nguyรชn tแปญ %%(then)"
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "ฤ‘แป‹nh dแบกng: nguyรชn tแปญ %%(else) ฤ‘ฦฐแปฃc dรนng nhiแปu hฦกn mแป™t lแบงn"
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "ฤ‘แป‹nh dแบกng: nguyรชn tแปญ %%(end) ฤ‘ฦฐแปฃc dรนng mร  khรดng cรณ nguyรชn tแปญ tฦฐฦกng แปฉng"
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr "chuแป—i ฤ‘แป‹nh dแบกng dแป‹ hรฌnh %s"
 
-#: ref-filter.c:1485
+#: ref-filter.c:1488
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr "khรดng nhรกnh, ฤ‘ang cแบฃi tแป• %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1491
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr "khรดng nhรกnh, ฤ‘ang cแบฃi tแป• HEAD %s ฤ‘รฃ tรกch rแปi"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr "khรดng nhรกnh, di chuyแปƒn nแปญa bฦฐแป›c ฤ‘ฦฐแปฃc bแบฏt ฤ‘แบงu tแบกi %s"
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr "khรดng nhรกnh"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr "thiแบฟu ฤ‘แป‘i tฦฐแปฃng %s cho %s"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer gแบทp lแป—i trรชn %s cho %s"
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "ฤ‘แป‘i tฦฐแปฃng dแป‹ hรฌnh tแบกi โ€œ%sโ€"
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ฤ‘ang lแป ฤ‘i tham chiแบฟu vแป›i tรชn hแปng %s"
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "ฤ‘แป‹nh dแบกng: thiแบฟu nguyรชn tแปญ %%(end)"
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr "tรนy chแปn โ€œ%sโ€ lร  xung khแบฏc vแป›i tรนy chแปn --merged"
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr "tรนy chแปn โ€œ%sโ€ lร  xung khแบฏc vแป›i tรนy chแปn --no-merged"
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr "tรชn ฤ‘แป‘i tฦฐแปฃng dแป‹ hรฌnh %s"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "tรนy chแปn โ€œ%sโ€ phแบฃi chแป‰ ฤ‘แบฟn mแป™t lแบงn chuyแปƒn giao"
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "cแบฅu hรฌnh viแบฟt tแบฏt mรกy chแปง khรดng thแปƒ bแบฏt ฤ‘แบงu bแบฑng โ€œ/โ€: %s"
 
-#: remote.c:410
+#: remote.c:414
 msgid "more than one receivepack given, using the first"
 msgstr "ฤ‘รฃ ฤ‘ฦฐa ra nhiแปu hฦกn mแป™t gรณi nhแบญn vแป, ฤ‘ang sแปญ dแปฅng cรกi ฤ‘แบงu tiรชn"
 
-#: remote.c:418
+#: remote.c:422
 msgid "more than one uploadpack given, using the first"
 msgstr "ฤ‘รฃ ฤ‘ฦฐa ra nhiแปu hฦกn mแป™t gรณi tแบฃi lรชn, ฤ‘ang sแปญ dแปฅng cรกi ฤ‘แบงu tiรชn"
 
-#: remote.c:608
+#: remote.c:612
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Khรดng thแปƒ lแบฅy vแป cแบฃ %s vร  %s cho %s"
 
-#: remote.c:612
+#: remote.c:616
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s thฦฐแปng theo dรตi %s, khรดng phแบฃi %s"
 
-#: remote.c:616
+#: remote.c:620
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s theo dรตi cแบฃ %s vร  %s"
 
-#: remote.c:684
+#: remote.c:688
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "khรณa โ€œ%sโ€ cแปงa mแบซu k cรณ โ€œ*โ€"
 
-#: remote.c:694
+#: remote.c:698
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "giรก trแป‹ โ€œ%sโ€ cแปงa mแบซu k cรณ โ€œ*โ€"
 
-#: remote.c:1000
+#: remote.c:1004
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "refspec %s nguแป“n khรดng khแป›p bแบฅt kแปณ cรกi gรฌ"
 
-#: remote.c:1005
+#: remote.c:1009
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "refspec %s nguแป“n khแป›p nhiแปu hฦกn mแป™t"
@@ -5328,7 +6092,7 @@ msgstr "refspec %s nguแป“n khแป›p nhiแปu hฦกn mแป™t"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1024
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5353,7 +6117,7 @@ msgstr ""
 "Nแบฟu cแบฃ hai lร  khรดng thแปƒ, thรฌ chรบng tรดi cลฉng chแป‹u thua. Bแบกn phแบฃi dรนng tham "
 "chiแบฟu dแบกng ฤ‘แบงy ฤ‘แปง."
 
-#: remote.c:1040
+#: remote.c:1044
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5364,7 +6128,7 @@ msgstr ""
 "Cรณ phแบฃi รฝ bแบกn lร  mแป™t tแบกo mแป™t nhรกnh mแป›i bแบฑng cรกch ฤ‘แบฉy lรชn\n"
 "โ€œ%s:refs/heads/%sโ€?"
 
-#: remote.c:1045
+#: remote.c:1049
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5375,7 +6139,7 @@ msgstr ""
 "Cรณ phแบฃi รฝ bแบกn lร  mแป™t tแบกo mแป™t thแบป mแป›i bแบฑng cรกch ฤ‘แบฉy lรชn\n"
 "โ€œ%s:refs/tags/%sโ€?"
 
-#: remote.c:1050
+#: remote.c:1054
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5386,7 +6150,7 @@ msgstr ""
 "Cรณ phแบฃi รฝ bแบกn lร  mแป™t tแบกo mแป™t cรขy mแป›i bแบฑng cรกch ฤ‘แบฉy lรชn\n"
 "โ€œ%s:refs/tags/%sโ€?"
 
-#: remote.c:1055
+#: remote.c:1059
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5397,115 +6161,115 @@ msgstr ""
 "Cรณ phแบฃi รฝ bแบกn lร  mแป™t tแบกo mแป™t blob mแป›i bแบฑng cรกch ฤ‘แบฉy lรชn\n"
 "โ€œ%s:refs/tags/%sโ€?"
 
-#: remote.c:1091
+#: remote.c:1095
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "โ€œ%sโ€ khรดng thแปƒ ฤ‘ฦฐแปฃc phรขn giแบฃi thร nh nhรกnh"
 
-#: remote.c:1102
+#: remote.c:1106
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "khรดng thแปƒ xรณa โ€œ%sโ€: tham chiแบฟu trรชn mรกy chแปง khรดng tแป“n tแบกi"
 
-#: remote.c:1114
+#: remote.c:1118
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "dst refspec %s khแป›p nhiแปu hฦกn mแป™t"
 
-#: remote.c:1121
+#: remote.c:1125
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "dst ref %s nhแบญn tแปซ hฦกn mแป™t nguแป“n"
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1628 remote.c:1729
 msgid "HEAD does not point to a branch"
 msgstr "HEAD khรดng chแป‰ ฤ‘แบฟn mแป™t nhรกnh nร o cแบฃ"
 
-#: remote.c:1633
+#: remote.c:1637
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "khรดng cรณ nhรกnh nร o nhฦฐ thแบฟ: โ€œ%sโ€"
 
-#: remote.c:1636
+#: remote.c:1640
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "khรดng cรณ thฦฐแปฃng nguแป“n ฤ‘ฦฐแปฃc cแบฅu hรฌnh cho nhรกnh โ€œ%sโ€"
 
-#: remote.c:1642
+#: remote.c:1646
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 "nhรกnh thฦฐแปฃng nguแป“n โ€œ%sโ€ khรดng ฤ‘ฦฐแปฃc lฦฐu lแบกi nhฦฐ lร  mแป™t nhรกnh theo dรตi mรกy chแปง"
 
-#: remote.c:1657
+#: remote.c:1661
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "ฤ‘แบฉy lรชn ฤ‘รญch โ€œ%sโ€ trรชn mรกy chแปง โ€œ%sโ€ khรดng cรณ nhรกnh theo dรตi nแป™i bแป™"
 
-#: remote.c:1669
+#: remote.c:1673
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "nhรกnh โ€œ%sโ€ khรดng cรณ mรกy chแปง ฤ‘แปƒ ฤ‘แบฉy lรชn"
 
-#: remote.c:1679
+#: remote.c:1683
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "ฤ‘แบฉy refspecs cho โ€œ%sโ€ khรดng bao gแป“m โ€œ%sโ€"
 
-#: remote.c:1692
+#: remote.c:1696
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "ฤ‘แบฉy lรชn mร  khรดng cรณ ฤ‘รญch (push.default lร  โ€œnothingโ€)"
 
-#: remote.c:1714
+#: remote.c:1718
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "khรดng thแปƒ phรขn giแบฃi ฤ‘แบฉy โ€œฤ‘ฦกn giแบฃnโ€ ฤ‘แบฟn mแป™t ฤ‘รญch ฤ‘ฦกn"
 
-#: remote.c:1840
+#: remote.c:1844
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "khรดng thแปƒ tรฌm thแบฅy tham chiแบฟu mรกy chแปง %s"
 
-#: remote.c:1853
+#: remote.c:1857
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* ฤang bแป qua tham chiแบฟu thรบ vแป‹ nแป™i bแป™ โ€œ%sโ€"
 
-#: remote.c:2016
+#: remote.c:2020
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 "Nhรกnh cแปงa bแบกn dแปฑa trรชn cฦก sแปŸ lร  โ€œ%sโ€, nhฦฐng trรชn thฦฐแปฃng nguแป“n khรดng cรฒn.\n"
 
-#: remote.c:2020
+#: remote.c:2024
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "   (dรนng \" git branch --unset-upstream\" ฤ‘แปƒ sแปญa)\n"
 
-#: remote.c:2023
+#: remote.c:2027
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Nhรกnh cแปงa bแบกn ฤ‘รฃ cแบญp nhแบญt vแป›i โ€œ%sโ€.\n"
 
-#: remote.c:2027
+#: remote.c:2031
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Nhรกnh cแปงa bแบกn vร  โ€œ%sโ€ tham chiแบฟu ฤ‘แบฟn cรกc lแบงn chuyแปƒn giao khรกc nhau.\n"
 
-#: remote.c:2030
+#: remote.c:2034
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (dรนng \"%s\" ฤ‘แปƒ biแบฟt thรชm chi tiแบฟt)\n"
 
-#: remote.c:2034
+#: remote.c:2038
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Nhรกnh cแปงa bแบกn ฤ‘แปฉng trฦฐแป›c โ€œ%sโ€ %d lแบงn chuyแปƒn giao.\n"
 
-#: remote.c:2040
+#: remote.c:2044
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (dรนng \"git push\" ฤ‘แปƒ xuแบฅt bแบฃn cรกc lแบงn chuyแปƒn giao nแป™i bแป™ cแปงa bแบกn)\n"
 
-#: remote.c:2043
+#: remote.c:2047
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5514,11 +6278,11 @@ msgstr[0] ""
 "Nhรกnh cแปงa bแบกn ฤ‘แปฉng ฤ‘แบฑng sau โ€œ%sโ€ %d lแบงn chuyแปƒn giao, vร  cรณ thแปƒ ฤ‘ฦฐแปฃc chuyแปƒn-"
 "tiแบฟp-nhanh.\n"
 
-#: remote.c:2051
+#: remote.c:2055
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (dรนng \"git pull\" ฤ‘แปƒ cแบญp nhแบญt nhรกnh nแป™i bแป™ cแปงa bแบกn)\n"
 
-#: remote.c:2054
+#: remote.c:2058
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5531,13 +6295,13 @@ msgstr[0] ""
 "vร  cรณ %d vร  %d lแบงn chuyแปƒn giao khรกc nhau cho tแปซng cรกi,\n"
 "tฦฐฦกng แปฉng vแป›i mแป—i lแบงn.\n"
 
-#: remote.c:2064
+#: remote.c:2068
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (dรนng \"git pull\" ฤ‘แปƒ hรฒa trแป™n nhรกnh trรชn mรกy chแปง vร o trong nhรกnh cแปงa "
 "bแบกn)\n"
 
-#: remote.c:2247
+#: remote.c:2251
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "khรดng thแปƒ phรขn tรญch tรชn ฤ‘แป‘i tฦฐแปฃng mong muแป‘n โ€œ%sโ€"
@@ -5552,7 +6316,7 @@ msgstr "tรชn tham chiแบฟu thay thแบฟ bแป‹ sai: %s"
 msgid "duplicate replace ref: %s"
 msgstr "tham chiแบฟu thay thแบฟ bแป‹ trรนng: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "ฤ‘แป™ sรขu thay thแบฟ quรก cao cho ฤ‘แป‘i tฦฐแปฃng %s"
@@ -5615,8 +6379,8 @@ msgstr "khรดng thแปƒ unlink stray โ€œ%sโ€"
 msgid "Recorded preimage for '%s'"
 msgstr "Preimage ฤ‘รฃ ฤ‘ฦฐแปฃc ghi lแบกi cho โ€œ%sโ€"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "khรดng thแปƒ tแบกo thฦฐ mแปฅc โ€œ%sโ€"
@@ -5650,20 +6414,20 @@ msgstr "Quรชn phรขn giแบฃi cho โ€œ%sโ€\n"
 msgid "unable to open rr-cache directory"
 msgstr "khรดng thแปƒ mแปŸ thฦฐ mแปฅc rr-cache"
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr "nhรกnh hiแป‡n tแบกi cแปงa bแบกn cรณ vแบป nhฦฐ bแป‹ hแปng"
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "nhรกnh hiแป‡n tแบกi cแปงa bแบกn โ€œ%sโ€ khรดng cรณ mแป™t lแบงn chuyแปƒn giao nร o cแบฃ"
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent xung khแบฏc vแป›i --bisect"
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L vแบซn chฦฐa hแป— trแปฃ ฤ‘แป‹nh dแบกng khรกc biแป‡t nร o ngoร i -p vร  -s"
 
@@ -5685,30 +6449,30 @@ msgstr ""
 "Mรณc โ€œ%sโ€ bแป‹ bแป qua bแปŸi vรฌ nรณ khรดng thแปƒ ฤ‘แบทt lร  thแปฑc thi ฤ‘ฦฐแปฃc.\n"
 "Bแบกn cรณ thแปƒ tแบฏt cแบฃnh bรกo nร y bแบฑng โ€œgit config advice.ignoredHook falseโ€œ."
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "gแบทp gรณi flush khรดng cแบงn trong khi ฤ‘แปc tรฌnh trแบกng giแบฃi nรฉn gรณi trรชn mรกy chแปง"
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "khรดng thแปƒ phรขn tรญch tรฌnh trแบกng unpack mรกy chแปง: %s"
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "mรกy chแปง gแบทp lแป—i unpack: %s"
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr "gแบทp lแป—i khi kรฝ chแปฉng thแปฑc ฤ‘แบฉy"
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr "kแบฟt thรบc nhแบญn khรดng hแป— trแปฃ ฤ‘แบฉy --signed"
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5716,47 +6480,47 @@ msgstr ""
 "ฤ‘แปซng gแปญi giแบฅy chแปฉng nhแบญn ฤ‘แบฉy trฦฐแป›c khi kแบฟt thรบc nhแบญn khรดng hแป— trแปฃ ฤ‘แบฉy --"
 "signed"
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr "kแบฟt thรบc nhแบญn khรดng hแป— trแปฃ ฤ‘แบฉy --atomic"
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr "kแบฟt thรบc nhแบญn khรดng hแป— trแปฃ cรกc tรนy chแปn cแปงa lแป‡nh push"
 
-#: sequencer.c:187
+#: sequencer.c:191
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "chแบฟ ฤ‘แป™ dแปn dแบนp ghi chรบ cรกc lแบงn chuyแปƒn giao khรดng hแปฃp lแป‡ โ€œ%sโ€"
 
-#: sequencer.c:292
+#: sequencer.c:296
 #, c-format
 msgid "could not delete '%s'"
 msgstr "khรดng thแปƒ xรณa bแป โ€œ%sโ€"
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "khรดng thแปƒ gแปก bแป โ€œ%sโ€"
 
-#: sequencer.c:321
+#: sequencer.c:325
 msgid "revert"
 msgstr "hoร n nguyรชn"
 
-#: sequencer.c:323
+#: sequencer.c:327
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:329
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:331
 #, c-format
 msgid "unknown action: %d"
 msgstr "khรดng nhแบญn ra thao tรกc: %d"
 
-#: sequencer.c:385
+#: sequencer.c:389
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5764,7 +6528,7 @@ msgstr ""
 "sau khi giแบฃi quyแบฟt cรกc xung ฤ‘แป™t, ฤ‘รกnh dแบฅu ฤ‘ฦฐแปng dแบซn ฤ‘รฃ sแปญa\n"
 "vแป›i lแป‡nh โ€œgit add </cรกc/ฤ‘ฦฐแปng/dแบซn>โ€ hoแบทc โ€œgit rm </cรกc/ฤ‘ฦฐแปng/dแบซn>โ€"
 
-#: sequencer.c:388
+#: sequencer.c:392
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5774,115 +6538,110 @@ msgstr ""
 "vแป›i lแป‡nh โ€œgit add </cรกc/ฤ‘ฦฐแปng/dแบซn>โ€ hoแบทc โ€œgit rm </cรกc/ฤ‘ฦฐแปng/dแบซn>โ€\n"
 "vร  chuyแปƒn giao kแบฟt quแบฃ bแบฑng lแป‡nh โ€œgit commitโ€"
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:405 sequencer.c:2901
 #, c-format
 msgid "could not lock '%s'"
 msgstr "khรดng thแปƒ khรณa โ€œ%sโ€"
 
-#: sequencer.c:408
+#: sequencer.c:412
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "khรดng thแปƒ ghi eol vร o โ€œ%sโ€"
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "gแบทp lแป—i khi hoร n thร nh โ€œ%sโ€"
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
 #, c-format
 msgid "could not read '%s'"
 msgstr "khรดng thแปƒ ฤ‘แปc โ€œ%sโ€"
 
-#: sequencer.c:462
+#: sequencer.c:466
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "cรกc thay ฤ‘แป•i nแป™i bแป™ cแปงa bแบกn cรณ thแปƒ bแป‹ ghi ฤ‘รจ bแปŸi lแป‡nh %s."
 
-#: sequencer.c:466
+#: sequencer.c:470
 msgid "commit your changes or stash them to proceed."
 msgstr "chuyแปƒn giao cรกc thay ฤ‘แป•i cแปงa bแบกn hay tแบกm cแบฅt (stash) chรบng ฤ‘แปƒ xแปญ lรฝ."
 
-#: sequencer.c:498
+#: sequencer.c:502
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: chuyแปƒn-tiแบฟp-nhanh"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Chแบฟ ฤ‘แป™ dแปn dแบนp khรดng hแปฃp lแป‡ %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:635
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Khรดng thแปƒ ghi tแบญp tin lฦฐu bแบฃng mแปฅc lแปฅc mแป›i"
 
-#: sequencer.c:649
+#: sequencer.c:652
 msgid "unable to update cache tree"
 msgstr "khรดng thแปƒ cแบญp nhแบญt cรขy bแป™ nhแป› ฤ‘แป‡m"
 
-#: sequencer.c:663
+#: sequencer.c:666
 msgid "could not resolve HEAD commit"
 msgstr "khรดng thแปƒ phรขn giแบฃi lแบงn chuyแปƒn giao HEAD"
 
-#: sequencer.c:743
+#: sequencer.c:746
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "khรดng cรณ khรณa hiแป‡n diแป‡n trong โ€œ%.*sโ€"
 
-#: sequencer.c:754
+#: sequencer.c:757
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "khรดng thแปƒ giแบฃi trรญch dแบซn giรก trแป‹ cแปงa โ€œ%sโ€"
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "khรดng thแปƒ mแปŸ โ€œ%sโ€ ฤ‘แปƒ ฤ‘แปc"
 
-#: sequencer.c:801
+#: sequencer.c:804
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "โ€œGIT_AUTHOR_NAMEโ€ ฤ‘รฃ sแบตn ฤ‘ฦฐa ra rแป“i"
 
-#: sequencer.c:806
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "โ€œGIT_AUTHOR_EMAILโ€ ฤ‘รฃ sแบตn ฤ‘ฦฐa ra rแป“i"
 
-#: sequencer.c:811
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "โ€œGIT_AUTHOR_DATEโ€ ฤ‘รฃ sแบตn ฤ‘ฦฐa ra rแป“i"
 
-#: sequencer.c:815
+#: sequencer.c:818
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "khรดng hiแปƒu biแบฟn โ€œ%sโ€"
 
-#: sequencer.c:820
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "thiแบฟu โ€œGIT_AUTHOR_NAMEโ€"
 
-#: sequencer.c:822
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "thiแบฟu โ€œGIT_AUTHOR_EMAILโ€"
 
-#: sequencer.c:824
+#: sequencer.c:827
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "thiแบฟu โ€œGIT_AUTHOR_DATEโ€"
 
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "ฤ‘แป‹nh dแบกng ngร y thรกng khรดng hแปฃp lแป‡ โ€œ%sโ€ trong โ€œ%sโ€"
-
-#: sequencer.c:901
+#: sequencer.c:876
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5911,15 +6670,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr "ghi chuyแปƒn giao gแป‘c"
-
-#: sequencer.c:1216
+#: sequencer.c:1148
 msgid "'prepare-commit-msg' hook failed"
 msgstr "mรณc โ€œprepare-commit-msgโ€ bแป‹ lแป—i"
 
-#: sequencer.c:1223
+#: sequencer.c:1154
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5950,7 +6705,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: sequencer.c:1167
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5978,328 +6733,327 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1209
 msgid "couldn't look up newly created commit"
 msgstr "khรดng thแปƒ tรฌm thแบฅy lแบงn chuyแปƒn giao mแป›i hฦกn ฤ‘รฃ ฤ‘ฦฐแปฃc tแบกo"
 
-#: sequencer.c:1280
+#: sequencer.c:1211
 msgid "could not parse newly created commit"
 msgstr ""
 "khรดng thแปƒ phรขn tรญch cรบ phรกp cแปงa ฤ‘แป‘i tฦฐแปฃng chuyแปƒn giao mแป›i hฦกn ฤ‘รฃ ฤ‘ฦฐแปฃc tแบกo"
 
-#: sequencer.c:1326
+#: sequencer.c:1257
 msgid "unable to resolve HEAD after creating commit"
 msgstr "khรดng thแปƒ phรขn giแบฃi HEAD sau khi tแบกo lแบงn chuyแปƒn giao"
 
-#: sequencer.c:1328
+#: sequencer.c:1259
 msgid "detached HEAD"
 msgstr "ฤ‘รฃ rแปi khแปi HEAD"
 
-#: sequencer.c:1332
+#: sequencer.c:1263
 msgid " (root-commit)"
 msgstr " (root-commit)"
 
-#: sequencer.c:1353
+#: sequencer.c:1284
 msgid "could not parse HEAD"
 msgstr "khรดng thแปƒ phรขn tรญch HEAD"
 
-#: sequencer.c:1355
+#: sequencer.c:1286
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s khรดng phแบฃi lร  mแป™t lแบงn chuyแปƒn giao!"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
 msgid "could not parse HEAD commit"
 msgstr "khรดng thแปƒ phรขn tรญch commit (lแบงn chuyแปƒn giao) HEAD"
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1342 sequencer.c:1968
 msgid "unable to parse commit author"
 msgstr "khรดng thแปƒ phรขn tรญch tรกc giแบฃ cแปงa lแบงn chuyแปƒn giao"
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
 msgid "git write-tree failed to write a tree"
 msgstr "lแป‡nh git write-tree gแบทp lแป—i khi ghi mแป™t cรขy"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1386 sequencer.c:1447
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "khรดng thแปƒ ฤ‘แปc phแบงn chรบ thรญch (message) tแปซ โ€œ%sโ€"
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
 msgid "failed to write commit object"
 msgstr "gแบทp lแป—i khi ghi ฤ‘แป‘i tฦฐแปฃng chuyแปƒn giao"
 
-#: sequencer.c:1526
+#: sequencer.c:1474
 #, c-format
 msgid "could not parse commit %s"
 msgstr "khรดng thแปƒ phรขn tรญch lแบงn chuyแปƒn giao %s"
 
-#: sequencer.c:1531
+#: sequencer.c:1479
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "khรดng thแปƒ phรขn tรญch lแบงn chuyแปƒn giao cha mแบน โ€œ%sโ€"
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1562 sequencer.c:1673
 #, c-format
 msgid "unknown command: %d"
 msgstr "khรดng hiแปƒu cรขu lแป‡nh %d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1620 sequencer.c:1645
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "ฤรขy lร  tแป• hแปฃp cแปงa %d lแบงn chuyแปƒn giao."
 
-#: sequencer.c:1672
+#: sequencer.c:1630
 msgid "need a HEAD to fixup"
 msgstr "cแบงn mแป™t HEAD ฤ‘แปƒ sแปญa"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1632 sequencer.c:3212
 msgid "could not read HEAD"
 msgstr "khรดng thแปƒ ฤ‘แปc HEAD"
 
-#: sequencer.c:1676
+#: sequencer.c:1634
 msgid "could not read HEAD's commit message"
 msgstr "khรดng thแปƒ ฤ‘แปc phแบงn chรบ thรญch (message) cแปงa HEAD"
 
-#: sequencer.c:1682
+#: sequencer.c:1640
 #, c-format
 msgid "cannot write '%s'"
 msgstr "khรดng thแปƒ ghi โ€œ%sโ€"
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "ฤรขy lร  chรบ thรญch cho lแบงn chuyแปƒn giao thแปฉ nhแบฅt:"
 
-#: sequencer.c:1697
+#: sequencer.c:1655
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "khรดng thแปƒ ฤ‘แปc phแบงn chรบ thรญch (message) cแปงa %s"
 
-#: sequencer.c:1704
+#: sequencer.c:1662
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "ฤรขy lร  chรบ thรญch cho lแบงn chuyแปƒn giao thแปฉ #%d:"
 
-#: sequencer.c:1710
+#: sequencer.c:1668
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Chรบ thรญch cho lแบงn chuyแปƒn giao thแปฉ #%d sแบฝ bแป‹ bแป qua:"
 
-#: sequencer.c:1798
+#: sequencer.c:1756
 msgid "your index file is unmerged."
 msgstr "tแบญp tin lฦฐu mแปฅc lแปฅc cแปงa bแบกn khรดng ฤ‘ฦฐแปฃc hรฒa trแป™n."
 
-#: sequencer.c:1805
+#: sequencer.c:1763
 msgid "cannot fixup root commit"
 msgstr "khรดng thแปƒ sแปญa chแปฏa lแบงn chuyแปƒn giao gแป‘c"
 
-#: sequencer.c:1824
+#: sequencer.c:1782
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "lแบงn chuyแปƒn giao %s lร  mแป™t lแบงn hรฒa trแป™n nhฦฐng khรดng ฤ‘ฦฐa ra tรนy chแปn -m."
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1790 sequencer.c:1798
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "lแบงn chuyแปƒn giao %s khรดng cรณ cha mแบน %d"
 
-#: sequencer.c:1846
+#: sequencer.c:1804
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "khรดng thแปƒ lแบฅy ghi chรบ lแบงn chuyแปƒn giao cho %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1823
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: khรดng thแปƒ phรขn tรญch lแบงn chuyแปƒn giao mแบน cแปงa %s"
 
-#: sequencer.c:1930
+#: sequencer.c:1888
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "khรดng thแปƒ ฤ‘แป•i tรชn โ€œ%sโ€ thร nh โ€œ%sโ€"
 
-#: sequencer.c:1985
+#: sequencer.c:1943
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "khรดng thแปƒ hoร n nguyรชn %sโ€ฆ %s"
 
-#: sequencer.c:1986
+#: sequencer.c:1944
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "khรดng thแปƒ รกp dแปฅng miแบฟng vรก %sโ€ฆ %s"
 
-#: sequencer.c:2045
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "xรณa %s %s -- vรก nแป™i dung thฦฐแปฃng nguแป“n ฤ‘รฃ cรณ\n"
+
+#: sequencer.c:2018
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: gแบทp lแป—i ฤ‘แปc bแบฃng mแปฅc lแปฅc"
 
-#: sequencer.c:2052
+#: sequencer.c:2025
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: gแบทp lแป—i khi lร m tฦฐฦกi mแป›i bแบฃng mแปฅc lแปฅc"
 
-#: sequencer.c:2128
+#: sequencer.c:2102
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s khรดng nhแบญn cรกc ฤ‘แป‘i sแป‘: โ€œ%sโ€"
 
-#: sequencer.c:2137
+#: sequencer.c:2111
 #, c-format
 msgid "missing arguments for %s"
 msgstr "thiแบฟu ฤ‘แป‘i sแป‘ cho %s"
 
-#: sequencer.c:2174
+#: sequencer.c:2142
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp โ€œ%.*sโ€"
+msgid "could not parse '%s'"
+msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp โ€œ%sโ€"
 
-#: sequencer.c:2228
+#: sequencer.c:2203
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "dรฒng khรดng hแปฃp lแป‡ %d: %.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2214
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "khรดng thแปƒ โ€œ%sโ€ thแปƒ mร  khรดng cรณ lแบงn chuyแปƒn giao kแบฟ trฦฐแป›c"
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "khรดng thแปƒ ฤ‘แปc โ€œ%sโ€."
-
-#: sequencer.c:2323
+#: sequencer.c:2298
 msgid "cancelling a cherry picking in progress"
 msgstr "ฤ‘ang hแปงy bแป thao tรกc cherry pick ฤ‘ang thแปฑc hiแป‡n"
 
-#: sequencer.c:2330
+#: sequencer.c:2305
 msgid "cancelling a revert in progress"
 msgstr "ฤ‘ang hแปงy bแป cรกc thao tรกc hoร n nguyรชn ฤ‘ang thแปฑc hiแป‡n"
 
-#: sequencer.c:2364
+#: sequencer.c:2349
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "vui lรฒng sแปญa lแป—i nร y bแบฑng cรกch dรนng โ€œgit rebase --edit-todoโ€."
 
-#: sequencer.c:2366
+#: sequencer.c:2351
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "bแบฃng chแป‰ thแป‹ khรดng thแปƒ dรนng ฤ‘ฦฐแปฃc: %s"
 
-#: sequencer.c:2371
+#: sequencer.c:2356
 msgid "no commits parsed."
 msgstr "khรดng cรณ lแบงn chuyแปƒn giao nร o ฤ‘ฦฐแปฃc phรขn tรญch."
 
-#: sequencer.c:2382
+#: sequencer.c:2367
 msgid "cannot cherry-pick during a revert."
 msgstr "khรดng thแปƒ cherry-pick trong khi hoร n nguyรชn."
 
-#: sequencer.c:2384
+#: sequencer.c:2369
 msgid "cannot revert during a cherry-pick."
 msgstr "khรดng thแปƒ thแปฑc hiแป‡n viแป‡c hoร n nguyรชn trong khi ฤ‘ang cherry-pick."
 
-#: sequencer.c:2466
+#: sequencer.c:2447
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "giรก trแป‹ cho %s khรดng hแปฃp lแป‡: %s"
 
-#: sequencer.c:2553
+#: sequencer.c:2540
 msgid "unusable squash-onto"
 msgstr "squash-onto khรดng dรนng ฤ‘ฦฐแปฃc"
 
-#: sequencer.c:2569
+#: sequencer.c:2556
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "bแบฃng tรนy chแปn dแป‹ hรฌnh: โ€œ%sโ€"
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2644 sequencer.c:4361
 msgid "empty commit set passed"
 msgstr "lแบงn chuyแปƒn giao trแป‘ng rแป—ng ฤ‘แบทt lร  hแปฃp quy cรกch"
 
-#: sequencer.c:2668
+#: sequencer.c:2660
 msgid "revert is already in progress"
 msgstr "cรณ thao tรกc hoร n nguyรชn ฤ‘ang ฤ‘ฦฐแปฃc thแปฑc hiแป‡n"
 
-#: sequencer.c:2670
+#: sequencer.c:2662
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "hรฃy thแปญ \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2673
+#: sequencer.c:2665
 msgid "cherry-pick is already in progress"
 msgstr "cรณ thao tรกc โ€œcherry-pickโ€ ฤ‘ang ฤ‘ฦฐแปฃc thแปฑc hiแป‡n"
 
-#: sequencer.c:2675
+#: sequencer.c:2667
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "hรฃy thแปญ \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2689
+#: sequencer.c:2681
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "khรดng thแปƒ tแบกo thฦฐ mแปฅc xแบฟp dรฃy โ€œ%sโ€"
 
-#: sequencer.c:2704
+#: sequencer.c:2696
 msgid "could not lock HEAD"
 msgstr "khรดng thแปƒ khรณa HEAD"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2756 sequencer.c:4099
 msgid "no cherry-pick or revert in progress"
 msgstr "khรดng cherry-pick hay hoร n nguyรชn trong tiแบฟn trรฌnh"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2758 sequencer.c:2769
 msgid "cannot resolve HEAD"
 msgstr "khรดng thแปƒ phรขn giแบฃi HEAD"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2760 sequencer.c:2804
 msgid "cannot abort from a branch yet to be born"
 msgstr "khรดng thแปƒ hแปงy bแป tแปซ mแป™t nhรกnh mร  nรณ cรฒn chฦฐa ฤ‘ฦฐแปฃc tแบกo ra"
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2790 builtin/grep.c:724
 #, c-format
 msgid "cannot open '%s'"
 msgstr "khรดng mแปŸ ฤ‘ฦฐแปฃc โ€œ%sโ€"
 
-#: sequencer.c:2800
+#: sequencer.c:2792
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "khรดng thแปƒ ฤ‘แปc โ€œ%sโ€: %s"
 
-#: sequencer.c:2801
+#: sequencer.c:2793
 msgid "unexpected end of file"
 msgstr "gแบทp kแบฟt thรบc tแบญp tin ฤ‘แป™t xuแบฅt"
 
-#: sequencer.c:2807
+#: sequencer.c:2799
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "tแบญp tin HEAD โ€œpre-cherry-pickโ€ ฤ‘รฃ lฦฐu โ€œ%sโ€ bแป‹ hแปng"
 
-#: sequencer.c:2818
+#: sequencer.c:2810
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Bแบกn cรณ lแบฝ ฤ‘รฃ cรณ HEAD ฤ‘รฃ bแป‹ di chuyแปƒn ฤ‘i, Khรดng thแปƒ tua, kiแปƒm tra HEAD cแปงa "
 "bแบกn!"
 
-#: sequencer.c:2859
+#: sequencer.c:2851
 msgid "no revert in progress"
 msgstr "khรดng cรณ tiแบฟn trรฌnh hoร n nguyรชn nร o"
 
-#: sequencer.c:2867
+#: sequencer.c:2859
 msgid "no cherry-pick in progress"
 msgstr "khรดng cรณ cherry-pick ฤ‘ang ฤ‘ฦฐแปฃc thแปฑc hiแป‡n"
 
-#: sequencer.c:2877
+#: sequencer.c:2869
 msgid "failed to skip the commit"
 msgstr "gแบทp lแป—i khi bแป qua ฤ‘แป‘i tฦฐแปฃng chuyแปƒn giao"
 
-#: sequencer.c:2884
+#: sequencer.c:2876
 msgid "there is nothing to skip"
 msgstr "แปŸ ฤ‘รขy khรดng cรณ gรฌ ฤ‘แปƒ mร  bแป qua cแบฃ"
 
-#: sequencer.c:2887
+#: sequencer.c:2879
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6308,21 +7062,21 @@ msgstr ""
 "bแบกn ฤ‘รฃ sแบตn sร ng chuyแปƒn giao chฦฐa?\n"
 "thแปญ \"git %s --continue\""
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3003 sequencer.c:4011
 #, c-format
 msgid "could not update %s"
 msgstr "khรดng thแปƒ cแบญp nhแบญt %s"
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3042 sequencer.c:3991
 msgid "cannot read HEAD"
 msgstr "khรดng thแปƒ ฤ‘แปc HEAD"
 
-#: sequencer.c:3066
+#: sequencer.c:3059
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "khรดng thแปƒ chรฉp โ€œ%sโ€ sang โ€œ%sโ€"
 
-#: sequencer.c:3074
+#: sequencer.c:3067
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6341,27 +7095,22 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3077
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Khรดng thแปƒ รกp dแปฅng %sโ€ฆ %.*s"
 
-#: sequencer.c:3091
+#: sequencer.c:3084
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Khรดng hรฒa trแป™n %.*s"
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "khรดng thแปƒ chรฉp โ€œ%sโ€ sang โ€œ%sโ€"
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "khรดng thแปƒ ฤ‘แปc bแบฃng mแปฅc lแปฅc"
-
-#: sequencer.c:3136
+#: sequencer.c:3129
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6376,11 +7125,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3135
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "vร  tแบกo cรกc thay ฤ‘แป•i bแบฃng mแปฅc lแปฅc vร /hay cรขy lร m viแป‡c\n"
 
-#: sequencer.c:3148
+#: sequencer.c:3141
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6397,76 +7146,72 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3202
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "tรชn nhรฃn dแป‹ hรฌnh: โ€œ%.*sโ€"
 
-#: sequencer.c:3263
+#: sequencer.c:3256
 msgid "writing fake root commit"
 msgstr "ghi lแบงn chuyแปƒn giao gแป‘c giแบฃ"
 
-#: sequencer.c:3268
+#: sequencer.c:3261
 msgid "writing squash-onto"
 msgstr "ฤ‘ang ghi squash-onto"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "gแบทp lแป—i khi tรฌm cรขy cแปงa %s"
 
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "khรดng thแปƒ ghi bแบฃng mแปฅc lแปฅc"
-
-#: sequencer.c:3351
+#: sequencer.c:3344
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "khรดng thแปƒ phรขn giแบฃi โ€œ%sโ€"
 
-#: sequencer.c:3379
+#: sequencer.c:3375
 msgid "cannot merge without a current revision"
 msgstr "khรดng thแปƒ hรฒa trแป™n mร  khรดng cรณ mแป™t ฤ‘iแปƒm xรฉt duyแป‡t hiแป‡n tแบกi"
 
-#: sequencer.c:3401
+#: sequencer.c:3397
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "khรดng thแปƒ phรขn tรญch โ€œ%.*sโ€"
 
-#: sequencer.c:3410
+#: sequencer.c:3406
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "chแบณng cรณ gรฌ ฤ‘แปƒ hรฒa trแป™n: โ€œ%.*sโ€"
 
-#: sequencer.c:3422
+#: sequencer.c:3418
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "hรฒa trแป™n octopus khรดng thแปƒ ฤ‘ฦฐแปฃc thแปฑc thi trรชn ฤ‘แป‰nh cแปงa mแป™t [new root]"
 
-#: sequencer.c:3437
+#: sequencer.c:3434
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "khรดng thแปƒ lแบฅy chรบ thรญch cแปงa lแบงn chuyแปƒn giao cแปงa โ€œ%sโ€"
 
-#: sequencer.c:3590
+#: sequencer.c:3594
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "khรดng thแปƒ ngay cแบฃ khi thแปญ hรฒa trแป™n โ€œ%.*sโ€"
 
-#: sequencer.c:3606
+#: sequencer.c:3610
 msgid "merge: Unable to write new index file"
 msgstr "merge: Khรดng thแปƒ ghi tแบญp tin lฦฐu bแบฃng mแปฅc lแปฅc mแป›i"
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3679 builtin/rebase.c:737
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "ฤรฃ รกp dแปฅng autostash.\n"
 
-#: sequencer.c:3687
+#: sequencer.c:3691
 #, c-format
 msgid "cannot store %s"
 msgstr "khรดng thแปญ lฦฐu โ€œ%sโ€"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6478,31 +7223,26 @@ msgstr ""
 "Bแบกn cรณ thแปƒ chแบกy lแป‡nh \"git stash pop\" hay \"git stash drop\" bแบฅt kแปณ lรบc "
 "nร o.\n"
 
-#: sequencer.c:3751
-#, c-format
-msgid "could not checkout %s"
-msgstr "khรดng thแปƒ lแบฅy ra %s"
-
-#: sequencer.c:3765
+#: sequencer.c:3755
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s khรดng phแบฃi lร  mแป™t OID hแปฃp lแป‡"
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "khรดng thแปƒ tรกch rแปi HEAD"
 
-#: sequencer.c:3785
+#: sequencer.c:3775
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Dแปซng lแบกi แปŸ HEAD\n"
 
-#: sequencer.c:3787
+#: sequencer.c:3777
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Dแปซng lแบกi แปŸ %s\n"
 
-#: sequencer.c:3795
+#: sequencer.c:3785
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6523,48 +7263,48 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3877
+#: sequencer.c:3869
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Dแปซng lแบกi แปŸ %sโ€ฆ  %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:3940
 #, c-format
 msgid "unknown command %d"
 msgstr "khรดng hiแปƒu cรขu lแป‡nh %d"
 
-#: sequencer.c:4003
+#: sequencer.c:3999
 msgid "could not read orig-head"
 msgstr "khรดng thแปƒ ฤ‘แปc orig-head"
 
-#: sequencer.c:4008
+#: sequencer.c:4004
 msgid "could not read 'onto'"
 msgstr "khรดng thแปƒ ฤ‘แปc โ€œontoโ€."
 
-#: sequencer.c:4022
+#: sequencer.c:4018
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "khรดng thแปƒ cแบญp nhแบญt HEAD thร nh %s"
 
-#: sequencer.c:4115
+#: sequencer.c:4111
 msgid "cannot rebase: You have unstaged changes."
 msgstr "khรดng thแปƒ cแบฃi tแป•: Bแบกn cรณ cรกc thay ฤ‘แป•i chฦฐa ฤ‘ฦฐแปฃc ฤ‘ฦฐa lรชn bแป‡ phรณng."
 
-#: sequencer.c:4124
+#: sequencer.c:4120
 msgid "cannot amend non-existing commit"
 msgstr "khรดng thแปƒ tu bแป mแป™t lแบงn chuyแปƒn giao khรดng tแป“n tแบกi"
 
-#: sequencer.c:4126
+#: sequencer.c:4122
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "tแบญp tin khรดng hแปฃp lแป‡: โ€œ%sโ€"
 
-#: sequencer.c:4128
+#: sequencer.c:4124
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "nแป™i dung khรดng hแปฃp lแป‡: โ€œ%sโ€"
 
-#: sequencer.c:4131
+#: sequencer.c:4127
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6574,69 +7314,59 @@ msgstr ""
 "Bแบกn cรณ cรกc thay ฤ‘แป•i chฦฐa chuyแปƒn giao trong thฦฐ mแปฅc lร m viแป‡c. Vui lรฒng\n"
 "chuyแปƒn giao chรบng trฦฐแป›c vร  sau ฤ‘รณ chแบกy lแป‡nh โ€œgit rebase --continueโ€ lแบงn nแปฏa."
 
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4163 sequencer.c:4202
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "khรดng thแปƒ ghi tแบญp tin: โ€œ%sโ€"
 
-#: sequencer.c:4220
+#: sequencer.c:4217
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "khรดng thแปƒ xรณa bแป CHERRY_PICK_HEAD"
 
-#: sequencer.c:4227
+#: sequencer.c:4224
 msgid "could not commit staged changes."
 msgstr "khรดng thแปƒ chuyแปƒn giao cรกc thay ฤ‘แป•i ฤ‘รฃ ฤ‘ฦฐa lรชn bแป‡ phรณng."
 
-#: sequencer.c:4328
+#: sequencer.c:4338
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: khรดng thแปƒ cherry-pick mแป™t %s"
 
-#: sequencer.c:4332
+#: sequencer.c:4342
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ฤ‘iแปƒm xรฉt duyแป‡t sai"
 
-#: sequencer.c:4367
+#: sequencer.c:4377
 msgid "can't revert as initial commit"
 msgstr "khรดng thแปƒ hoร n nguyรชn mแป™t lแบงn chuyแปƒn giao khแปŸi tแบกo"
 
-#: sequencer.c:4810
+#: sequencer.c:4846
 msgid "make_script: unhandled options"
 msgstr "make_script: cรกc tรนy chแปn ฤ‘ฦฐแปฃc khรดng xแปญ lรฝ"
 
-#: sequencer.c:4813
+#: sequencer.c:4849
 msgid "make_script: error preparing revisions"
 msgstr "make_script: lแป—i chuแบฉn bแป‹ ฤ‘iแปƒm hiแป‡u chแป‰nh"
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Bแบกn cรณ thแปƒ sแปญa nรณ bแบฑng โ€œgit rebase --edit-todoโ€ vร  sau ฤ‘รณ chแบกy โ€œgit rebase --"
-"continueโ€.\n"
-"Hoแบทc lร  bแบกn cรณ thแปƒ bรฃi bแป viแป‡c cแบฃi tแป• bแบฑng โ€œgit rebase --abortโ€.\n"
-
 #: sequencer.c:5083 sequencer.c:5100
 msgid "nothing to do"
 msgstr "khรดng cรณ gรฌ ฤ‘แปƒ lร m"
 
-#: sequencer.c:5114
+#: sequencer.c:5119
 msgid "could not skip unnecessary pick commands"
 msgstr "khรดng thแปƒ bแป qua cรกc lแป‡nh cแบญy (pick) khรดng cแบงn thiแบฟt"
 
-#: sequencer.c:5197
+#: sequencer.c:5213
 msgid "the script was already rearranged."
 msgstr "vฤƒn lแป‡nh ฤ‘รฃ sแบตn ฤ‘ฦฐแปฃc sแบฏp ฤ‘แบทt rแป“i."
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "โ€œ%sโ€ แปŸ ngoร i mแป™t kho chแปฉa"
+msgid "'%s' is outside repository at '%s'"
+msgstr "โ€œ%sโ€ ngoร i mแป™t kho chแปฉa tแบกi '%s'"
 
-#: setup.c:173
+#: setup.c:175
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6646,7 +7376,7 @@ msgstr ""
 "Dรนng โ€œgit <lแป‡nh> -- <ฤ‘ฦฐแปng/dแบซn>โ€ฆโ€ ฤ‘แปƒ chแป‰ ฤ‘แป‹nh ฤ‘ฦฐแปng dแบซn mร  nรณ khรดng tแป“n tแบกi "
 "mแป™t cรกch nแป™i bแป™."
 
-#: setup.c:186
+#: setup.c:188
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6658,12 +7388,12 @@ msgstr ""
 "Dรนng โ€œ--โ€ ฤ‘แปƒ ngฤƒn cรกch cรกc ฤ‘ฦฐแปng dแบซn khแปi ฤ‘iแปƒm xem xรฉt, nhฦฐ thแบฟ nร y:\n"
 "โ€œgit <lแป‡nh> [<ฤ‘iแปƒm xem xรฉt>โ€ฆ] -- [<tแบญp tin>โ€ฆ]โ€"
 
-#: setup.c:235
+#: setup.c:254
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "tรนy chแปn โ€œ%sโ€ phแบฃi trฦฐแป›c cรกc ฤ‘แป‘i sแป‘ ฤ‘แบงu tiรชn khรดng cรณ tรนy chแปn"
 
-#: setup.c:254
+#: setup.c:273
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6674,92 +7404,92 @@ msgstr ""
 "Dรนng โ€œ--โ€ ฤ‘แปƒ ngฤƒn cรกch cรกc ฤ‘ฦฐแปng dแบซn khแปi ฤ‘iแปƒm xem xรฉt, nhฦฐ thแบฟ nร y:\n"
 "โ€œgit <lแป‡nh> [<ฤ‘iแปƒm xem xรฉt>โ€ฆ] -- [<tแบญp tin>โ€ฆ]โ€"
 
-#: setup.c:390
+#: setup.c:409
 msgid "unable to set up work tree using invalid config"
 msgstr "khรดng thแปƒ cร i ฤ‘แบทt thฦฐ mแปฅc lร m viแป‡c sแปญ dแปฅng cแบฅu hรฌnh khรดng hแปฃp lแป‡"
 
-#: setup.c:394
+#: setup.c:413
 msgid "this operation must be run in a work tree"
 msgstr "thao tรกc nร y phแบฃi ฤ‘ฦฐแปฃc thแปฑc hiแป‡n trong thฦฐ mแปฅc lร m viแป‡c"
 
-#: setup.c:540
+#: setup.c:559
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Cแบงn phiรชn bแบฃn kho git <= %d, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc %d"
 
-#: setup.c:548
+#: setup.c:567
 msgid "unknown repository extensions found:"
 msgstr "tรฌm thแบฅy phแบงn mแปŸ rแป™ng kho chฦฐa biแบฟt:"
 
-#: setup.c:567
+#: setup.c:586
 #, c-format
 msgid "error opening '%s'"
 msgstr "gแบทp lแป—i khi mแปŸ โ€œ%sโ€"
 
-#: setup.c:569
+#: setup.c:588
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "tแบญp tin .git lร  quรก lแป›n: โ€œ%sโ€"
 
-#: setup.c:571
+#: setup.c:590
 #, c-format
 msgid "error reading %s"
 msgstr "gแบทp lแป—i khi ฤ‘แปc %s"
 
-#: setup.c:573
+#: setup.c:592
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "ฤ‘แป‹nh dแบกng tแบญp tin git khรดng hแปฃp lแป‡: %s"
 
-#: setup.c:575
+#: setup.c:594
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "khรดng cรณ ฤ‘ฦฐแปng dแบซn trong tแบญp tin git: %s"
 
-#: setup.c:577
+#: setup.c:596
 #, c-format
 msgid "not a git repository: %s"
 msgstr "khรดng phแบฃi lร  kho git: %s"
 
-#: setup.c:676
+#: setup.c:695
 #, c-format
 msgid "'$%s' too big"
 msgstr "โ€œ$%sโ€ quรก lแป›n"
 
-#: setup.c:690
+#: setup.c:709
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "khรดng phแบฃi lร  kho git: โ€œ%sโ€"
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:738 setup.c:740 setup.c:771
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "khรดng thแปƒ chdir (chuyแปƒn ฤ‘แป•i thฦฐ mแปฅc) sang โ€œ%sโ€"
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
 msgid "cannot come back to cwd"
 msgstr "khรดng thแปƒ quay lแบกi cwd"
 
-#: setup.c:851
+#: setup.c:870
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "gแบทp lแป—i khi lแบฅy thแป‘ng kรช vแป โ€œ%*s%s%sโ€"
 
-#: setup.c:1083
+#: setup.c:1108
 msgid "Unable to read current working directory"
 msgstr "Khรดng thแปƒ ฤ‘แปc thฦฐ mแปฅc lร m viแป‡c hiแป‡n hร nh"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1117 setup.c:1123
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "khรดng thแปƒ chuyแปƒn sang โ€œ%sโ€"
 
-#: setup.c:1103
+#: setup.c:1128
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "khรดng phแบฃi lร  kho git (hoแบทc bแบฅt kแปณ thฦฐ mแปฅc cha mแบน nร o): %s"
 
-#: setup.c:1109
+#: setup.c:1134
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6769,7 +7499,7 @@ msgstr ""
 "Dแปซng tแบกi biรชn cแปงa hแป‡ thแป‘ng tแบญp tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chฦฐa "
 "ฤ‘แบทt)."
 
-#: setup.c:1220
+#: setup.c:1245
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6778,284 +7508,284 @@ msgstr ""
 "gแบทp vแบฅn ฤ‘แป vแป›i giรก trแป‹ chแบฟ ฤ‘แป™ tแบญp tin core.sharedRepository (0%.3o).\n"
 "ngฦฐแปi sแปŸ hแปฏu tแบญp tin phแบฃi luรดn cรณ quyแปn ฤ‘แปc vร  ghi."
 
-#: setup.c:1264
+#: setup.c:1289
 msgid "open /dev/null or dup failed"
 msgstr "gแบทp lแป—i khi mแปŸ โ€œ/dev/nullโ€ hay dup"
 
-#: setup.c:1279
+#: setup.c:1304
 msgid "fork failed"
 msgstr "gแบทp lแป—i khi rแบฝ nhรกnh tiแบฟn trรฌnh"
 
-#: setup.c:1284
+#: setup.c:1309
 msgid "setsid failed"
 msgstr "setsid gแบทp lแป—i"
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "thฦฐ mแปฅc ฤ‘แป‘i tฦฐแปฃng %s khรดng tแป“n tแบกi; kiแปƒm tra .git/objects/info/alternates"
 
-#: sha1-file.c:504
+#: sha1-file.c:503
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "khรดng thแปƒ thฦฐแปng hรณa ฤ‘ฦฐแปng dแบซn ฤ‘แป‘i tฦฐแปฃng thay thแบฟ: โ€œ%sโ€"
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s: ฤ‘ang bแป qua kho ฤ‘แป‘i tฦฐแปฃng thay thแบฟ, lแป“ng nhau quรก sรขu"
 
-#: sha1-file.c:583
+#: sha1-file.c:582
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "khรดng thแปƒ chuแบฉn hรณa thฦฐ mแปฅc ฤ‘แป‘i tฦฐแปฃng: โ€œ%sโ€"
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 msgid "unable to fdopen alternates lockfile"
 msgstr "khรดng thแปƒ fdopen tแบญp tin khรณa thay thแบฟ"
 
-#: sha1-file.c:644
+#: sha1-file.c:643
 msgid "unable to read alternates file"
 msgstr "khรดng thแปƒ ฤ‘แปc tแบญp tin thay thแบฟ"
 
-#: sha1-file.c:651
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
 msgstr "khรดng thแปƒ di chuyแปƒn tแบญp tin thay thแบฟ vร o chแป—"
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng tแป“n tแบกi"
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "kho tham chiแบฟu โ€œ%sโ€ nhฦฐ lร  lแบฅy ra liรชn kแบฟt vแบซn chฦฐa ฤ‘ฦฐแปฃc hแป— trแปฃ."
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "kho tham chiแบฟu โ€œ%sโ€ khรดng phแบฃi lร  mแป™t kho nแป™i bแป™."
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "kho tham chiแบฟu โ€œ%sโ€ lร  nรดng"
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "kho tham chiแบฟu โ€œ%sโ€ bแป‹ cแบฅy ghรฉp"
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "dรฒng khรดng hแปฃp lแป‡ trong khi phรขn tรญch cรกc tham chiแบฟu thay thแบฟ: %s"
 
-#: sha1-file.c:944
+#: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "ฤ‘ang cแป‘ ฤ‘แปƒ mmap %<PRIuMAX> vฦฐแปฃt quรก giแป›i hแบกn %<PRIuMAX>"
 
-#: sha1-file.c:969
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr "mmap gแบทp lแป—i"
 
-#: sha1-file.c:1133
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr "tแบญp tin ฤ‘แป‘i tฦฐแปฃng %s trแป‘ng rแป—ng"
 
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1263 sha1-file.c:2443
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "ฤ‘แป‘i tฦฐแปฃng mแบฅt hแปng โ€œ%sโ€"
 
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1265 sha1-file.c:2447
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "gแบทp rรกc tแบกi cuแป‘i cแปงa ฤ‘แป‘i tฦฐแปฃng bแป‹ mแบฅt โ€œ%sโ€"
 
-#: sha1-file.c:1301
+#: sha1-file.c:1307
 msgid "invalid object type"
 msgstr "kiแปƒu ฤ‘แป‘i tฦฐแปฃng khรดng hแปฃp lแป‡"
 
-#: sha1-file.c:1385
+#: sha1-file.c:1391
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "khรดng thแปƒ giแบฃi nรฉn phแบงn ฤ‘แบงu gรณi %s vแป›i --allow-unknown-type"
 
-#: sha1-file.c:1388
+#: sha1-file.c:1394
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "khรดng thแปƒ giแบฃi gรณi phแบงn ฤ‘แบงu %s"
 
-#: sha1-file.c:1394
+#: sha1-file.c:1400
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "khรดng thแปƒ phรขn tรญch phแบงn ฤ‘แบงu gรณi %s vแป›i --allow-unknown-type"
 
-#: sha1-file.c:1397
+#: sha1-file.c:1403
 #, c-format
 msgid "unable to parse %s header"
 msgstr "khรดng thแปƒ phรขn tรญch phแบงn ฤ‘แบงu cแปงa โ€œ%sโ€"
 
-#: sha1-file.c:1588
+#: sha1-file.c:1629
 #, c-format
 msgid "failed to read object %s"
 msgstr "gแบทp lแป—i khi ฤ‘แปc ฤ‘แป‘i tฦฐแปฃng โ€œ%sโ€"
 
-#: sha1-file.c:1592
+#: sha1-file.c:1633
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "c%s thay thแบฟ khรดng ฤ‘ฦฐแปฃc tรฌm thแบฅy cho %s"
 
-#: sha1-file.c:1596
+#: sha1-file.c:1637
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "ฤ‘แป‘i tฦฐแปฃng mแบฅt %s (ฤ‘ฦฐแปฃc lฦฐu trong %s) bแป‹ hแปng"
 
-#: sha1-file.c:1600
+#: sha1-file.c:1641
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "ฤ‘แป‘i tฦฐแปฃng ฤ‘รฃ ฤ‘รณng gรณi %s (ฤ‘ฦฐแปฃc lฦฐu trong %s) bแป‹ hแปng"
 
-#: sha1-file.c:1703
+#: sha1-file.c:1746
 #, c-format
 msgid "unable to write file %s"
 msgstr "khรดng thแปƒ ghi tแบญp tin %s"
 
-#: sha1-file.c:1710
+#: sha1-file.c:1753
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "khรดng thแปƒ ฤ‘แบทt quyแปn thร nh โ€œ%sโ€"
 
-#: sha1-file.c:1717
+#: sha1-file.c:1760
 msgid "file write error"
 msgstr "lแป—i ghi tแบญp tin"
 
-#: sha1-file.c:1736
+#: sha1-file.c:1780
 msgid "error when closing loose object file"
 msgstr "gแบทp lแป—i trong khi ฤ‘รณng tแบญp tin ฤ‘แป‘i tฦฐแปฃng"
 
-#: sha1-file.c:1801
+#: sha1-file.c:1845
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "khรดng ฤ‘แปง thแบฉm quyแปn ฤ‘แปƒ thรชm mแป™t ฤ‘แป‘i tฦฐแปฃng vร o cฦก sแปŸ dแปฏ liแป‡u kho chแปฉa %s"
 
-#: sha1-file.c:1803
+#: sha1-file.c:1847
 msgid "unable to create temporary file"
 msgstr "khรดng thแปƒ tแบกo tแบญp tin tแบกm thแปi"
 
-#: sha1-file.c:1827
+#: sha1-file.c:1871
 msgid "unable to write loose object file"
 msgstr "khรดng thแปƒ ghi tแบญp tin ฤ‘แป‘i tฦฐแปฃng ฤ‘รฃ mแบฅt"
 
-#: sha1-file.c:1833
+#: sha1-file.c:1877
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "khรดng thแปƒ xแบฃ nรฉn ฤ‘แป‘i tฦฐแปฃng mแป›i %s (%d)"
 
-#: sha1-file.c:1837
+#: sha1-file.c:1881
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd trรชn ฤ‘แป‘i tฦฐแปฃng %s gแบทp lแป—i (%d)"
 
-#: sha1-file.c:1841
+#: sha1-file.c:1885
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "chฦฐa rรต rร ng baowir dแปฏ liแป‡u nguแป“n ฤ‘แป‘i tฦฐแปฃng khรดng แป•n ฤ‘แป‹nh cho %s"
 
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
 #, c-format
 msgid "failed utime() on %s"
 msgstr "gแบทp lแป—i utime() trรชn โ€œ%sโ€"
 
-#: sha1-file.c:1926
+#: sha1-file.c:1972
 #, c-format
 msgid "cannot read object for %s"
 msgstr "khรดng thแปƒ ฤ‘แปc ฤ‘แป‘i tฦฐแปฃng cho %s"
 
-#: sha1-file.c:1966
+#: sha1-file.c:2011
 msgid "corrupt commit"
 msgstr "lแบงn chuyแปƒn giao sai hแปng"
 
-#: sha1-file.c:1974
+#: sha1-file.c:2019
 msgid "corrupt tag"
 msgstr "thแบป sai hแปng"
 
-#: sha1-file.c:2073
+#: sha1-file.c:2119
 #, c-format
 msgid "read error while indexing %s"
 msgstr "gแบทp lแป—i ฤ‘แปc khi ฤ‘รกnh mแปฅc lแปฅc %s"
 
-#: sha1-file.c:2076
+#: sha1-file.c:2122
 #, c-format
 msgid "short read while indexing %s"
 msgstr "khรดng ฤ‘แปc ngแบฏn khi ฤ‘รกnh mแปฅc lแปฅc %s"
 
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2195 sha1-file.c:2205
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: gแบทp lแป—i khi thรชm vร o cฦก sแปŸ dแปฏ liแป‡u"
 
-#: sha1-file.c:2164
+#: sha1-file.c:2211
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: kiแปƒu tแบญp tin khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ"
 
-#: sha1-file.c:2188
+#: sha1-file.c:2235
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s khรดng phแบฃi lร  mแป™t ฤ‘แป‘i tฦฐแปฃng hแปฃp lแป‡"
 
-#: sha1-file.c:2190
+#: sha1-file.c:2237
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s khรดng phแบฃi lร  mแป™t ฤ‘แป‘i tฦฐแปฃng โ€œ%sโ€ hแปฃp lแป‡"
 
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "khรดng thแปƒ mแปŸ %s"
 
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2454 sha1-file.c:2507
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "mรฃ bฤƒm khรดng khแป›p cho %s (cแบงn %s)"
 
-#: sha1-file.c:2431
+#: sha1-file.c:2478
 #, c-format
 msgid "unable to mmap %s"
 msgstr "khรดng thแปƒ mmap %s"
 
-#: sha1-file.c:2436
+#: sha1-file.c:2483
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "khรดng thแปƒ giแบฃi gรณi phแบงn ฤ‘แบงu cแปงa โ€œ%sโ€"
 
-#: sha1-file.c:2442
+#: sha1-file.c:2489
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "khรดng thแปƒ phรขn tรญch phแบงn ฤ‘แบงu cแปงa โ€œ%sโ€"
 
-#: sha1-file.c:2453
+#: sha1-file.c:2500
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "khรดng thแปƒ giแบฃi gรณi nแป™i dung cแปงa โ€œ%sโ€"
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "tรณm lฦฐแปฃc SHA1 %s chฦฐa rรต rร ng"
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "Cรกc แปฉng cแปญ lร :"
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7079,56 +7809,127 @@ msgstr ""
 "nร y\n"
 "bแบฑng cรกch chแบกy lแป‡nh \"git config advice.objectNameWarning false\""
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "nhแบญt kรฝ cho '%.*s' chแป‰ ฤ‘i lแบกi cho %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "nhแบญt kรฝ cho '%.*s' chแป‰ cรณ %d mแปฅc"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ cรณ แปŸ trรชn ฤ‘ฤฉa, nhฦฐng khรดng trong โ€œ%.*sโ€"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"ฤ‘ฦฐแปng dแบซn '%s' tแป“n tแบกi, nhฦฐng khรดng phแบฃi '%s'\n"
+"gแปฃi รฝ: Cรณ phแบฃi รฝ bแบกn lร  '%.*s:%s' aka '%.*s:./%s'?"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng tแป“n tแบกi trong '%.*s'"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"ฤ‘ฦฐแปng dแบซn '%s' nแบฑm trong chแป‰ mแปฅc, nhฦฐng khรดng phแบฃi แปŸ giai ฤ‘oแบกn %d\n"
+"gแปฃi รฝ: Cรณ phแบฃi รฝ bแบกn lร  ':%d:%s'?"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"ฤ‘ฦฐแปng dแบซn '%s' nแบฑm trong chแป‰ mแปฅc, nhฦฐng khรดng phแบฃi '%s'\n"
+"gแปฃi รฝ: Cรณ phแบฃi รฝ bแบกn lร  ':% d:%s ' aka ':%d:./%s'?"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "ฤ‘ฦฐแปng dแบซn '%s' tแป“n tแบกi trรชn ฤ‘ฤฉa, nhฦฐng khรดng cรณ trong chแป‰ mแปฅc"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng tแป“n tแบกi (khรดng trรชn ฤ‘ฤฉa cลฉng khรดng trong mแปฅc lแปฅc)"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr "cรบ phรกp ฤ‘ฦฐแปng dแบซn tฦฐฦกng ฤ‘แป‘i khรดng thแปƒ thแปƒ dรนng ngoร i cรขy lร m viแป‡c"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "'%.*s' khรดng phแบฃi lร  tรชn ฤ‘แป‘i tฦฐแปฃng hแปฃp lแป‡"
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:837
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:839
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/giรขy"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:847
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:849
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/giรขy"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:856
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/giรขy"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:864
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:866
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/giรขy"
 
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "khรดng thแปƒ sแปญa โ€œ%sโ€"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7159,52 +7960,128 @@ msgstr "trong mรด-ฤ‘un-con khรดng cรณ gรฌ โ€œ%sโ€"
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "ฤแบทc tแบฃ ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ thรฌ แปŸ trong mรด-ฤ‘un-con โ€œ%.*sโ€"
 
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "ฤ‘แป‘i sแป‘ --ignore-submodules sai: %s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Mรด-ฤ‘un-con trong lแบงn chuyแปƒn giao %s tแบกi ฤ‘ฦฐแปng dแบซn: '%s' va chแบกm vแป›i mรด-ฤ‘un-"
+"con cรนng tรชn. Nรชn bแป qua nรณ."
+
 #: submodule.c:910
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 "mแปฅc tin mรด-ฤ‘un-con โ€œ%sโ€ (%s) lร  mแป™t %s, khรดng phแบฃi lร  mแป™t lแบงn chuyแปƒn giao"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Khรดng thแปƒ chแบกy lแป‡nh โ€œgit rev-list <cรกc lแบงn chuyแปƒn giao> --not --remotes -n "
+"1โ€ trong mรด-ฤ‘un-con โ€œ%sโ€"
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "xแปญ lรฝ cho mรด-ฤ‘un-con โ€œ%sโ€ gแบทp lแป—i"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Gแบทp lแป—i khi phรขn giแบฃi HEAD nhฦฐ lร  mแป™t tham chiแบฟu hแปฃp lแป‡."
 
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "ฤแบฉy lรชn mรด-ฤ‘un-con โ€œ%sโ€\n"
+
+#: submodule.c:1161
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "Khรดng thแปƒ truy cแบญp mรด-ฤ‘un-con โ€œ%sโ€"
+msgid "Unable to push submodule '%s'\n"
+msgstr "Khรดng thแปƒ ฤ‘แบฉy lรชn mรด-ฤ‘un-con โ€œ%sโ€\n"
+
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "ฤang lแบฅy vแป mรด-ฤ‘un-con %s%s\n"
+
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Khรดng thแปƒ truy cแบญp mรด-ฤ‘un-con โ€œ%sโ€\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Cรณ lแป—i khi lแบฅy vแป mรด-ฤ‘un-con:\n"
+" โ€œ%sโ€"
 
-#: submodule.c:1651
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "khรดng nhแบญn ra โ€œ%sโ€ lร  mแป™t kho git"
 
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "Khรดng thแปƒ chแบกy โ€œgit status --porcelain=2โ€ trong mรด-ฤ‘un-con โ€œ%sโ€"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "โ€œgit status --porcelain=2โ€ gแบทp lแป—i trong mรด-ฤ‘un-con โ€œ%sโ€"
+
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "khรดng thแปƒ lแบฅy thแป‘ng kรช โ€œgit statusโ€ trong mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "khรดng thแปƒ chแบกy โ€œgit statusโ€ trong mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: submodule.c:1817
+#: submodule.c:1828
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Khรดng thแปƒ ฤ‘แบทt core.worktree trong mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "khรดng thแปƒ ฤ‘แป‡ quy vร o trong mรด-ฤ‘un-con โ€œ%sโ€"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "khรดng thแปƒ ฤ‘แบทt lแบกi mแปฅc lแปฅc cแปงa mรด-ฤ‘un-con"
+
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "mรด-ฤ‘un-con โ€œ%sโ€ cรณ mแปฅc lแปฅc cรฒn bแบฉn"
 
-#: submodule.c:1959
+#: submodule.c:1970
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Mรด-ฤ‘un-con โ€œ%sโ€ khรดng thแปƒ ฤ‘ฦฐแปฃc cแบญp nhแบญt."
 
-#: submodule.c:2007
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "thฦฐ mแปฅc git mรด ฤ‘un con '%s' lร  bรชn trong git DIR '%.*s'"
+
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7212,12 +8089,17 @@ msgstr ""
 "relocate_gitdir cho mรด-ฤ‘un-con โ€œ%sโ€ vแป›i nhiแปu hฦกn mแป™t cรขy lร m viแป‡c lร  chฦฐa "
 "ฤ‘ฦฐแปฃc hแป— trแปฃ"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "khรดng thแปƒ tรฌm kiแบฟm tรชn cho mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: submodule.c:2026
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "tแปซ chแป‘i di chuyแปƒn ' %s ' vร o trong mแป™t thฦฐ mแปฅc git sแบตn cรณ"
+
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7228,42 +8110,37 @@ msgstr ""
 "โ€œ%sโ€ sang\n"
 "โ€œ%sโ€\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "khรดng thแปƒ ฤ‘แป‡ quy vร o trong mรด-ฤ‘un-con โ€œ%sโ€"
-
-#: submodule.c:2153
+#: submodule.c:2209
 msgid "could not start ls-files in .."
 msgstr "khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช vแป ls-files trong .."
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree trแบฃ vแป mรฃ khรดng nhฦฐ mong ฤ‘แปฃi %d"
 
-#: submodule-config.c:232
+#: submodule-config.c:236
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "ฤ‘ang lแป ฤ‘i tรชn mรด-ฤ‘un-con mแบญp mแป: %s"
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "khรดng cho phรฉp giรก trแป‹ รขm แปŸ submodule.fetchJobs"
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 "ฤ‘ang bแป qua โ€œ%sโ€ cรกi mร  cรณ thแปƒ ฤ‘ฦฐแปฃc phiรชn dแป‹ch nhฦฐ lร  mแป™t tรนy chแปn dรฒng "
 "lแป‡nh: %s"
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr "giรก trแป‹ cho %s khรดng hแปฃp lแป‡"
 
-#: submodule-config.c:755
+#: submodule-config.c:765
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Khรดng thแปƒ cแบญp nhแบญt mแปฅc .gitmodules %s"
@@ -7279,7 +8156,7 @@ msgstr "chแบกy lแป‡nh kรฉo theo โ€œ%sโ€ gแบทp lแป—i"
 msgid "unknown value '%s' for key '%s'"
 msgstr "khรดng hiแปƒu giรก trแป‹ โ€œ%sโ€ cho khรณa โ€œ%sโ€"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "nhiแปu hฦกn mแป™t %s"
@@ -7298,7 +8175,7 @@ msgstr "khรดng ฤ‘แปc ฤ‘ฦฐแปฃc tแบญp tin ฤ‘แบงu vร o โ€œ%sโ€"
 msgid "could not read from stdin"
 msgstr "khรดng thแปƒ ฤ‘แปc tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr "khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช vแป %s"
@@ -7327,47 +8204,47 @@ msgstr "khรดng thแปƒ ฤ‘แป•i tรชn tแบญp tin tแบกm thแปi thร nh %s"
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Khรดng thแปƒ ฤ‘แบทt thฦฐแปฃng nguแป“n cแปงa โ€œ%sโ€ thร nh โ€œ%sโ€ cแปงa โ€œ%sโ€\n"
 
-#: transport.c:142
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr "khรดng thแปƒ ฤ‘แปc bรณ โ€œ%sโ€"
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "vแบญn chuyแปƒn: tรนy chแปn ฤ‘แป™ sรขu โ€œ%sโ€ khรดng hแปฃp lแป‡"
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "xem protocol.version trong โ€œgit help configโ€ ฤ‘แปƒ cรณ thรชm thรดng tin"
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr "cรกc tรนy chแปn mรกy chแปง yรชu cแบงu giao thแปฉc phiรชn bแบฃn 2 hoแบทc mแป›i hฦกn"
 
-#: transport.c:625
+#: transport.c:632
 msgid "could not parse transport.color.* config"
 msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp cแบฅu hรฌnh transport.color.*"
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr "viแป‡c hแป— trแปฃ giao thแปฉc v2 chฦฐa ฤ‘ฦฐแปฃc thแปฑc hiแป‡n"
 
-#: transport.c:825
+#: transport.c:831
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "khรดng hiแปƒu giรก trแป‹ cho cho cแบฅu hรฌnh โ€œ%sโ€: %s"
 
-#: transport.c:891
+#: transport.c:897
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "khรดng cho phรฉp phฦฐฦกng thแปฉc vแบญn chuyแปƒn โ€œ%sโ€"
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync khรดng cรฒn ฤ‘ฦฐแปฃc hแป— trแปฃ nแปฏa"
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -7376,7 +8253,7 @@ msgstr ""
 "Cรกc ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con sau ฤ‘รขy cรณ chแปฉa cรกc thay ฤ‘แป•i cรกi mร \n"
 "cรณ thแปƒ ฤ‘ฦฐแปฃc tรฌm thแบฅy trรชn mแปi mรกy phแปฅc vแปฅ:\n"
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -7403,32 +8280,32 @@ msgstr ""
 "ฤ‘แปƒ ฤ‘แบฉy chรบng lรชn mรกy phแปฅc vแปฅ.\n"
 "\n"
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr "Bรฃi bแป."
 
-#: transport.c:1193
+#: transport.c:1201
 msgid "failed to push all needed submodules"
 msgstr "gแบทp lแป—i khi ฤ‘แบฉy dแปฏ liแป‡u cแปงa tแบฅt cแบฃ cรกc mรด-ฤ‘un-con cแบงn thiแบฟt"
 
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:657
 msgid "operation not supported by protocol"
 msgstr "thao tรกc khรดng ฤ‘ฦฐแปฃc gia thแปฉc hแป— trแปฃ"
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 msgid "full write to remote helper failed"
 msgstr "ghi ฤ‘แบงy ฤ‘แปง lรชn bแป™ hแป— trแปฃ mรกy chแปง gแบทp lแป—i"
 
-#: transport-helper.c:134
+#: transport-helper.c:144
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "khรดng thแปƒ tรฌm thแบฅy bแป™ hแป— trแปฃ mรกy chแปง cho โ€œ%sโ€"
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:571
 msgid "can't dup helper output fd"
 msgstr "khรดng thแปƒ nhรขn ฤ‘รดi fd dแบงu ra bแป™ hแป— trแปฃ"
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7437,99 +8314,104 @@ msgstr ""
 "khรดng hiแปƒu capability bแบฏt buแป™c %s; bแป™ hแป— trแปฃ mรกy chแปง nร y gแบงn nhฦฐ chแบฏc chแบฏn "
 "lร  cแบงn phiรชn bแบฃn Git mแป›i hฦกn"
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr "bแป™ hแป— trแปฃ mรกy chแปง nร y cแบงn phแบฃi thแปฑc thi capability ฤ‘แบทc tแบฃ tham chiแบฟu"
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:425
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s said bแบฅt ngแป: โ€œ%sโ€"
 
-#: transport-helper.c:403
+#: transport-helper.c:414
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s cลฉng khรณa %s"
 
-#: transport-helper.c:481
+#: transport-helper.c:493
 msgid "couldn't run fast-import"
 msgstr "khรดng thแปƒ chแบกy fast-import"
 
-#: transport-helper.c:504
+#: transport-helper.c:516
 msgid "error while running fast-import"
 msgstr "gแบทp lแป—i trong khi chแบกy fast-import"
 
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:545 transport-helper.c:1134
 #, c-format
 msgid "could not read ref %s"
 msgstr "khรดng thแปƒ ฤ‘แปc tham chiแบฟu %s"
 
-#: transport-helper.c:578
+#: transport-helper.c:590
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "khรดng hiแปƒu ฤ‘รกp แปฉng ฤ‘แปƒ kแบฟt nแป‘i: %s"
 
-#: transport-helper.c:600
+#: transport-helper.c:612
 msgid "setting remote service path not supported by protocol"
 msgstr "giao thแปฉc nร y khรดng hแป— trแปฃ cร i ฤ‘แบทt ฤ‘ฦฐแปng dแบซn dแป‹ch vแปฅ mรกy chแปง"
 
-#: transport-helper.c:602
+#: transport-helper.c:614
 msgid "invalid remote service path"
 msgstr "ฤ‘ฦฐแปng dแบซn dแป‹ch vแปฅ mรกy chแปง khรดng hแปฃp lแป‡"
 
-#: transport-helper.c:648
+#: transport-helper.c:660
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "khรดng thแปƒ kแบฟt nแป‘i ฤ‘แบฟn dแป‹ch vแปฅ phแปฅ %s"
 
-#: transport-helper.c:720
+#: transport-helper.c:736
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "cแบงn ok/error, nhฦฐng bแป™ hแป— trแปฃ lแบกi nรณi โ€œ%sโ€"
 
-#: transport-helper.c:773
+#: transport-helper.c:789
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "bแป™ hแป— trแปฃ bรกo cรกo rแบฑng khรดng cแบงn tรฌnh trแบกng cแปงa %s"
 
-#: transport-helper.c:834
+#: transport-helper.c:850
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "helper %s khรดng hแป— trแปฃ dry-run"
 
-#: transport-helper.c:837
+#: transport-helper.c:853
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "helper %s khรดng hแป— trแปฃ --signed"
 
-#: transport-helper.c:840
+#: transport-helper.c:856
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "helper %s khรดng hแป— trแปฃ --signed=if-asked"
 
-#: transport-helper.c:847
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "helper %s khรดng hแป— trแปฃ --atomic"
+
+#: transport-helper.c:867
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "helper %s khรดng hแป— trแปฃ โ€œpush-optionโ€"
 
-#: transport-helper.c:945
+#: transport-helper.c:965
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-helper khรดng hแป— trแปฃ push; cแบงn ฤ‘แบทc tแบฃ tham chiแบฟu"
 
-#: transport-helper.c:950
+#: transport-helper.c:970
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "helper %s khรดng hแป— trแปฃ โ€œforceโ€"
 
-#: transport-helper.c:997
+#: transport-helper.c:1017
 msgid "couldn't run fast-export"
 msgstr "khรดng thแปƒ chแบกy fast-export"
 
-#: transport-helper.c:1002
+#: transport-helper.c:1022
 msgid "error while running fast-export"
 msgstr "gแบทp lแป—i trong khi chแบกy fast-export"
 
-#: transport-helper.c:1027
+#: transport-helper.c:1047
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -7539,67 +8421,67 @@ msgstr ""
 "cแบฃ.\n"
 "Tuy nhiรชn bแบกn nรชn chแป‰ ฤ‘แป‹nh mแป™t nhรกnh nhฦฐ โ€œmasterโ€ chแบณng hแบกn.\n"
 
-#: transport-helper.c:1091
+#: transport-helper.c:1120
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "ฤ‘รกp แปฉng sai dแบกng trong danh sรกch tham chiแบฟu: %s"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1272
 #, c-format
 msgid "read(%s) failed"
 msgstr "read(%s) gแบทp lแป—i"
 
-#: transport-helper.c:1271
+#: transport-helper.c:1299
 #, c-format
 msgid "write(%s) failed"
 msgstr "write(%s) gแบทp lแป—i"
 
-#: transport-helper.c:1320
+#: transport-helper.c:1348
 #, c-format
 msgid "%s thread failed"
 msgstr "tuyแบฟn trรฌnh %s gแบทp lแป—i"
 
-#: transport-helper.c:1324
+#: transport-helper.c:1352
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "tuyแบฟn trรฌnh %s gแบทp lแป—i khi gia nhแบญp: %s"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1371 transport-helper.c:1375
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "khรดng thแปƒ khแปŸi chแบกy tuyแบฟn trรฌnh ฤ‘แปƒ sao chรฉp dแปฏ liแป‡u: %s"
 
-#: transport-helper.c:1384
+#: transport-helper.c:1412
 #, c-format
 msgid "%s process failed to wait"
 msgstr "xแปญ lรฝ %s gแบทp lแป—i khi ฤ‘แปฃi"
 
-#: transport-helper.c:1388
+#: transport-helper.c:1416
 #, c-format
 msgid "%s process failed"
 msgstr "xแปญ lรฝ %s gแบทp lแป—i"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1434 transport-helper.c:1443
 msgid "can't start thread for copying data"
 msgstr "khรดng thแปƒ khแปŸi chแบกy tuyแบฟn trรฌnh cho viแป‡c chรฉp dแปฏ liแป‡u"
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "ฤ‘แป‘i tฦฐแปฃng cรขy quรก ngแบฏn"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "chแบฟ ฤ‘แป™ dแป‹ hรฌnh trong ฤ‘แป mแปฅc cรขy"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "tรชn tแบญp tin trแป‘ng rแป—ng trong mแปฅc tin cรขy"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "tแบญp tin cรขy quรก ngแบฏn"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7610,7 +8492,7 @@ msgstr ""
 "%%sVui lรฒng chuyแปƒn giao cรกc thay ฤ‘แป•i hay tแบกm cแบฅt chรบng ฤ‘i trฦฐแป›c khi bแบกn "
 "chuyแปƒn nhรกnh."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7620,7 +8502,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7631,7 +8513,7 @@ msgstr ""
 "%%sVui lรฒng chuyแปƒn giao cรกc thay ฤ‘แป•i hay tแบกm cแบฅt chรบng ฤ‘i trฦฐแป›c khi bแบกn hรฒa "
 "trแป™n."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7641,7 +8523,7 @@ msgstr ""
 "hรฒa trแป™n:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7651,7 +8533,7 @@ msgstr ""
 "%s:\n"
 "%%sVui lรฒng chuyแปƒn giao cรกc thay ฤ‘แป•i hay tแบกm cแบฅt chรบng ฤ‘i trฦฐแป›c khi bแบกn %s."
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7661,7 +8543,7 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7671,7 +8553,7 @@ msgstr ""
 "trong nรณ:\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7681,7 +8563,7 @@ msgstr ""
 "checkout:\n"
 "%%sVui lรฒng di chuyแปƒn hay gแปก bแป chรบng trฦฐแป›c khi bแบกn chuyแปƒn nhรกnh."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7691,7 +8573,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7701,7 +8583,7 @@ msgstr ""
 "trแป™n:\n"
 "%%sVui lรฒng di chuyแปƒn hay gแปก bแป chรบng trฦฐแป›c khi bแบกn hรฒa trแป™n."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7711,7 +8593,7 @@ msgstr ""
 "trแป™n:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7720,7 +8602,7 @@ msgstr ""
 "Cรกc tแบญp tin cรขy lร m viแป‡c chฦฐa ฤ‘ฦฐแปฃc theo dรตi sau ฤ‘รขy sแบฝ bแป‹ gแปก bแป bแปŸi %s:\n"
 "%%sVui lรฒng di chuyแปƒn hay gแปก bแป chรบng trฦฐแป›c khi bแบกn %s."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7729,7 +8611,7 @@ msgstr ""
 "Cรกc tแบญp tin cรขy lร m viแป‡c chฦฐa ฤ‘ฦฐแปฃc theo dรตi sau ฤ‘รขy sแบฝ bแป‹ gแปก bแป bแปŸi %s:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7740,7 +8622,7 @@ msgstr ""
 "checkout:\n"
 "%%sVui lรฒng di chuyแปƒn hay gแปก bแป chรบng trฦฐแป›c khi bแบกn chuyแปƒn nhรกnh."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7751,7 +8633,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7761,7 +8643,7 @@ msgstr ""
 "hรฒa trแป™n:\n"
 "%%sVui lรฒng di chuyแปƒn hay gแปก bแป chรบng trฦฐแป›c khi bแบกn hรฒa trแป™n."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7771,7 +8653,7 @@ msgstr ""
 "hรฒa trแป™n:\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7781,7 +8663,7 @@ msgstr ""
 "%s:\n"
 "%%sVui lรฒng di chuyแปƒn hay gแปก bแป chรบng trฦฐแป›c khi bแบกn %s."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7791,12 +8673,12 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Mแปฅc โ€œ%sโ€ ฤ‘รจ lรชn โ€œ%sโ€. Khรดng thแปƒ buแป™c."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -7805,7 +8687,7 @@ msgstr ""
 "Khรดng thแปƒ cแบญp nhแบญt checkout rแบฃi rรกc: cรกc mแปฅc tin sau ฤ‘รขy chฦฐa cแบญp nhแบญt:\n"
 "%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -7816,7 +8698,7 @@ msgstr ""
 "nhแบญt checkout rแบฃi rรกc:\n"
 "%s"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -7827,7 +8709,7 @@ msgstr ""
 "nhแบญt checkout rแบฃi rรกc:\n"
 "%s"
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -7836,16 +8718,16 @@ msgstr ""
 "Khรดng thแปƒ cแบญp nhแบญt mรด-ฤ‘un-con:\n"
 "%s"
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr "Bรฃi bแป\n"
 
-#: unpack-trees.c:318
+#: unpack-trees.c:317
 msgid "Updating files"
 msgstr "ฤang cแบญp nhแบญt cรกc tแบญp tin"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -7855,6 +8737,10 @@ msgstr ""
 "HOA/thฦฐแปng trรชn mแป™t hแป‡ thแป‘ng tแบญp tin khรดng phรขn biแป‡t HOA/thฦฐแปng)\n"
 "vร  chแป‰ mแป™t tแปซ cรนng mแป™t nhรณm xung ฤ‘แป™t lร  trong cรขy lร m viแป‡c hiแป‡n tแบกi:\n"
 
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "ฤang cแบญp nhแบญt cรกc cแป mแปฅc lแปฅc"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "tรชn lฦฐแปฃc ฤ‘แป“ URL khรดng hแปฃp lแป‡, hoแบทc thiแบฟu hแบญu tแป‘ โ€œ://โ€"
@@ -7884,48 +8770,52 @@ msgstr "tรชn cแป•ng khรดng hแปฃp lแป‡"
 msgid "invalid '..' path segment"
 msgstr "ฤ‘oแบกn ฤ‘ฦฐแปng dแบซn โ€œ..โ€ khรดng hแปฃp lแป‡"
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "ฤang lแบฅy vแป cรกc ฤ‘แป‘i tฦฐแปฃng"
+
+#: worktree.c:259 builtin/am.c:2099
 #, c-format
 msgid "failed to read '%s'"
 msgstr "gแบทp lแป—i khi ฤ‘แปc โ€œ%sโ€"
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "โ€œ%sโ€ tแบกi cรขy lร m viแป‡c chรฌnh khรดng phแบฃi lร  thฦฐ mแปฅc kho"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "tแบญp tin โ€œ%sโ€ khรดng chแปฉa ฤ‘ฦฐแปng dแบซn tuyแป‡t ฤ‘แป‘i ฤ‘แบฟn vแป‹ trรญ cรขy lร m viแป‡c hiแป‡n"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "\"%s\" khรดng tแป“n tแบกi"
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "โ€œ%sโ€ khรดng phแบฃi lร  tแบญp tin .git, mรฃ lแป—i %d"
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "โ€œ%sโ€ khรดng chแป‰ ngฦฐแปฃc ฤ‘แบฟn โ€œ%sโ€"
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "khรดng thแปƒ mแปŸ โ€œ%sโ€ ฤ‘แปƒ ฤ‘แปc vร  ghi"
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr "khรดng thแปƒ truy cแบญp โ€œ%sโ€"
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr "khรดng thแปƒ lแบฅy thฦฐ mแปฅc lร m viแป‡c hiแป‡n hร nh"
 
@@ -8272,83 +9162,91 @@ msgstr ""
 "continue\")"
 
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (dรนng \"git cherry-pick --skip\" ฤ‘แปƒ bแป qua miแบฟng vรก nร y)"
+
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (dรนng \"git cherry-pick --abort\" ฤ‘แปƒ hแปงy bแป thao tรกc cherry-pick)"
 
-#: wt-status.c:1447
+#: wt-status.c:1449
 msgid "Revert currently in progress."
 msgstr "Hoร n nguyรชn hiแป‡n tแบกi ฤ‘ang thแปฑc hiแป‡n."
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Bแบกn hiแป‡n nay ฤ‘ang thแปฑc hiแป‡n thao tรกc hoร n nguyรชn lแบงn chuyแปƒn giao โ€œ%sโ€."
 
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (sแปญa cรกc xung ฤ‘แป™t vร  sau ฤ‘รณ chแบกy lแป‡nh \"git revert --continue\")"
 
-#: wt-status.c:1459
+#: wt-status.c:1461
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (chแบกy lแป‡nh \"git revert --continue\" ฤ‘แปƒ tiแบฟp tแปฅc)"
 
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 "  (khi tแบฅt cแบฃ cรกc xung ฤ‘แป™t ฤ‘รฃ sแปญa xong: chแบกy lแป‡nh \"git revert --continue\")"
 
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (dรนng lแป‡nh \"git revert --skip\" ฤ‘แปƒ bแป qua lแบงn vรก nร y)"
+
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (dรนng \"git revert --abort\" ฤ‘แปƒ hแปงy bแป thao tรกc hoร n nguyรชn)"
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 "Bแบกn hiแป‡n nay ฤ‘ang thแปฑc hiแป‡n thao tรกc di chuyแปƒn nแปญa bฦฐแป›c (bisect), bแบฏt ฤ‘แบงu tแปซ "
 "nhรกnh โ€œ%sโ€."
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr "Bแบกn hiแป‡n tแบกi ฤ‘ang thแปฑc hiแป‡n viแป‡c bisect (di chuyแปƒn nแปญa bฦฐแป›c)."
 
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (dรนng \"git bisect reset\" ฤ‘แปƒ quay trแปŸ lแบกi nhรกnh nguyรชn thแปงy)"
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr "Trรชn nhรกnh "
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr "rebase แปŸ chแบฟ ฤ‘แป™ tฦฐฦกng tรกc ฤ‘ang ฤ‘ฦฐแปฃc thแปฑc hiแป‡n; lรชn trรชn "
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr "rebase ฤ‘ang ฤ‘ฦฐแปฃc thแปฑc hiแป‡n: lรชn trรชn "
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr "Hiแป‡n tแบกi chแบณng แปŸ nhรกnh nร o cแบฃ."
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr "Lแบงn chuyแปƒn giao khแปŸi tแบกo"
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
 msgstr "Vแบซn chฦฐa chuyแปƒn giao"
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr "Nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc theo dรตi"
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr "Nhแปฏng tแบญp tin bแป‹ lแป ฤ‘i"
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8360,32 +9258,32 @@ msgstr ""
 "cรณ lแบฝ lร m nรณ nhanh hฦกn, nhฦฐng bแบกn phแบฃi cแบฉn thแบญn ฤ‘แปซng quรชn mรฌnh phแบฃi\n"
 "tแปฑ thรชm cรกc tแบญp tin mแป›i (xem โ€œgit help statusโ€.."
 
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc theo dรตi khรดng ฤ‘ฦฐแปฃc liแป‡t kรช ra %s"
 
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr " (dรนng tรนy chแปn -u ฤ‘แปƒ hiแปƒn thแป‹ cรกc tแบญp tin chฦฐa ฤ‘ฦฐแปฃc theo dรตi)"
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr "Khรดng cรณ thay ฤ‘แป•i nร o"
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "khรดng cรณ thay ฤ‘แป•i nร o ฤ‘ฦฐแปฃc thรชm vร o ฤ‘แปƒ chuyแปƒn giao (dรนng \"git add\" vร /hoแบทc "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "khรดng cรณ thay ฤ‘แป•i nร o ฤ‘ฦฐแปฃc thรชm vร o ฤ‘แปƒ chuyแปƒn giao\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8394,200 +9292,209 @@ msgstr ""
 "khรดng cรณ gรฌ ฤ‘ฦฐแปฃc thรชm vร o lแบงn chuyแปƒn giao nhฦฐng cรณ nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc "
 "theo dรตi hiแป‡n diแป‡n (dรนng \"git add\" ฤ‘แปƒ ฤ‘ฦฐa vร o theo dรตi)\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "khรดng cรณ gรฌ ฤ‘ฦฐแปฃc thรชm vร o lแบงn chuyแปƒn giao nhฦฐng cรณ nhแปฏng tแบญp tin chฦฐa ฤ‘ฦฐแปฃc "
 "theo dรตi hiแป‡n diแป‡n\n"
 
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "khรดng cรณ gรฌ ฤ‘แปƒ chuyแปƒn giao (tแบกo/sao-chรฉp cรกc tแบญp tin vร  dรนng \"git add\" ฤ‘แปƒ "
 "ฤ‘ฦฐa vร o theo dรตi)\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr "khรดng cรณ gรฌ ฤ‘แปƒ chuyแปƒn giao\n"
 
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "khรดng cรณ gรฌ ฤ‘แปƒ chuyแปƒn giao (dรนng -u xem cรกc tแบญp tin chฦฐa ฤ‘ฦฐแปฃc theo dรตi)\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "khรดng cรณ gรฌ ฤ‘แปƒ chuyแปƒn giao, thฦฐ mแปฅc lร m viแป‡c sแบกch sแบฝ\n"
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr "Vแบซn khรดng thแปฑc hiแป‡n lแป‡nh chuyแปƒn giao nร o "
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr "HEAD (khรดng nhรกnh)"
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr "khรกc"
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr "ฤ‘แบฑng sau "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr "phรญa trฦฐแป›c "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "khรดng thแปƒ %s: Bแบกn cรณ cรกc thay ฤ‘แป•i chฦฐa ฤ‘ฦฐแปฃc ฤ‘ฦฐa lรชn bแป‡ phรณng."
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 "thรชm vร o ฤ‘รณ, bแบฃng mแปฅc lแปฅc cแปงa bแบกn cรณ chแปฉa cรกc thay ฤ‘แป•i chฦฐa ฤ‘ฦฐแปฃc chuyแปƒn giao."
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "khรดng thแปƒ %s: Mแปฅc lแปฅc cแปงa bแบกn cรณ chแปฉa cรกc thay ฤ‘แป•i chฦฐa ฤ‘ฦฐแปฃc chuyแปƒn giao."
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "gแบทp lแป—i khi bแป liรชn kแบฟt (unlink) โ€œ%sโ€"
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<cรกc tรนy chแปn>] [--]  <pathspec>โ€ฆ"
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "trแบกng thรกi lแป‡nh diff khรดng nhฦฐ mong ฤ‘แปฃi %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
 msgid "updating files failed"
 msgstr "cแบญp nhแบญt tแบญp tin gแบทp lแป—i"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "gแปก bแป โ€œ%sโ€\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "ฤฦฐa ra khแปi bแป‡ phรณng cรกc thay ฤ‘แป•i sau khi lร m tฦฐฦกi mแป›i lแบกi bแบฃng mแปฅc lแปฅc:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:266 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr "Khรดng thแปƒ ฤ‘แปc bแบฃng mแปฅc lแปฅc"
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Khรดng thแปƒ mแปŸ โ€œ%sโ€ ฤ‘แปƒ ghi."
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr "Khรดng thแปƒ ghi ra miแบฟng vรก"
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr "gแบทp lแป—i khi sแปญa miแบฟng vรก"
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช vแป โ€œ%sโ€"
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr "Miแบฟng vรก trแป‘ng rแป—ng. Nรชn bแป qua."
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Khรดng thแปƒ รกp dแปฅng miแบฟng vรก โ€œ%sโ€"
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Cรกc ฤ‘ฦฐแปng dแบซn theo sau ฤ‘รขy sแบฝ bแป‹ lแป ฤ‘i bแปŸi mแป™t trong cรกc tแบญp tin .gitignore "
 "cแปงa bแบกn:\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "chแบกy thแปญ"
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr "sแปญa bแบฑng cรกch tฦฐฦกng tรกc"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr "chแปn โ€œhunksโ€ theo kiแปƒu tฦฐฦกng tรกc"
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr "sแปญa diff hiแป‡n nay vร  รกp dแปฅng nรณ"
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr "cho phรฉp thรชm cรกc tแบญp tin bแป‹ bแป qua khรกc"
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr "cแบญp nhแบญt cรกc tแบญp tin ฤ‘ฦฐแปฃc theo dรตi"
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "thฦฐแปng hรณa lแบกi EOL cแปงa cรกc tแบญp tin ฤ‘ฦฐแปฃc theo dรตi (รฝ lร  -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr "chแป‰ ghi lแบกi sแปฑ viแป‡c mร  ฤ‘ฦฐแปng dแบซn sแบฝ ฤ‘ฦฐแปฃc thรชm vร o sau"
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 "thรชm cรกc thay ฤ‘แป•i tแปซ tแบฅt cแบฃ cรกc tแบญp tin cรณ cลฉng nhฦฐ khรดng ฤ‘ฦฐแปฃc theo dรตi dแบฅu "
 "vแบฟt"
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "lแป ฤ‘i cรกc ฤ‘ฦฐแปng dแบซn bแป‹ gแปก bแป trong cรขy thฦฐ mแปฅc lร m viแป‡c (giแป‘ng vแป›i --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr "khรดng thรชm, chแป‰ lร m tฦฐฦกi mแป›i bแบฃng mแปฅc lแปฅc"
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr "chie bแป qua nhแปฏng tแบญp tin mร  nรณ khรดng thแปƒ ฤ‘ฦฐแปฃc thรชm vร o bแปŸi vรฌ gแบทp lแป—i"
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "kiแปƒm tra xem - thแบญm chรญ thiแบฟu - tแบญp tin bแป‹ bแป qua trong quรก trรฌnh chแบกy thแปญ"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "ghi ฤ‘รจ lรชn bรญt thi hร nh cแปงa cรกc tแบญp tin ฤ‘ฦฐแปฃc liแป‡t kรช"
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr "cแบฃnh bรกo khi thรชm mแป™t kho nhรบng"
 
-#: builtin/add.c:326
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "แปฉng dแปฅng chแบกy phรญa sau cho 'git stash -p'"
+
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8618,150 +9525,174 @@ msgstr ""
 "\n"
 "Xem \"git help submodule\" ฤ‘แปƒ biแบฟt thรชm chi tiแบฟt."
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "thรชm cแบงn mแป™t kho git nhรบng: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Sแปญ dแปฅng tรนy chแปn -f nแบฟu bแบกn thแปฑc sแปฑ muแป‘n thรชm chรบng vร o.\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Sแปญ dแปฅng -f nแบฟu bแบกn thแปฑc sแปฑ muแป‘n thรชm chรบng.\n"
+"Tแบฏt thรดng bรกo nร y bแบฑng cรกch chแบกy lแป‡nh\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr "thรชm tแบญp tin gแบทp lแป—i"
 
-#: builtin/add.c:419
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file xung khแบฏc vแป›i --interactive/--patch"
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file xung khแบฏc vแป›i --edit"
+
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr "-A vร  -u xung khแบฏc nhau"
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Tรนy chแปn --ignore-missing chแป‰ cรณ thแปƒ ฤ‘ฦฐแปฃc dรนng cรนng vแป›i --dry-run"
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod tham sแป‘ โ€œ%sโ€ phแบฃi hoแบทc lร  -x hay +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--pathspec-from-file xung khแบฏc vแป›i cรกc tham sแป‘ ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn"
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul cแบงn --pathspec-from-file"
+
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Khรดng cรณ gรฌ ฤ‘ฦฐแปฃc chแป‰ ra, khรดng cรณ gรฌ ฤ‘ฦฐแปฃc thรชm vร o.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Cรณ lแบฝ รฝ bแบกn lร  โ€œgit add .โ€ phแบฃi khรดng?\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"Cรณ lแบฝ bแบกn muแป‘n chแบกy 'git add .'?\n"
+"Tแบฏt thรดng bรกo nร y bแบฑng cรกch chแบกy lแป‡nh\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp vฤƒn lแป‡nh tรกc giแบฃ"
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "โ€œ%sโ€ bแป‹ xรณa bแปŸi mรณc applypatch-msg"
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Dรฒng ฤ‘แบงu vร o dแป‹ hรฌnh: โ€œ%sโ€."
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Gแบทp lแป—i khi sao chรฉp ghi chรบ (note) tแปซ โ€œ%sโ€ tแป›i โ€œ%sโ€"
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "fseek gแบทp lแป—i"
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp โ€œ%sโ€"
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Chแป‰ cรณ mแป™t sรช-ri miแบฟng vรก StGIT ฤ‘ฦฐแปฃc รกp dแปฅng mแป™t lรบc"
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "dแบฅu thแปi gian khรดng hแปฃp lแป‡"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "dรฒng Ngร y thรกng khรดng hแปฃp lแป‡"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "ฤ‘แป™ lแป‡ch mรบi giแป khรดng hแปฃp lแป‡"
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "Dรฒ tรฌm ฤ‘แป‹nh dแบกng miแบฟng vรก gแบทp lแป—i."
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "tแบกo thฦฐ mแปฅc \"%s\" gแบทp lแป—i"
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "Gแบทp lแป—i khi chia nhแป cรกc miแบฟng vรก."
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "khรดng thแปƒ ghi tแบญp tin lฦฐu mแปฅc lแปฅc"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Khi bแบกn ฤ‘รฃ phรขn giแบฃi xong trแปฅc trแบทc nร y, hรฃy chแบกy \"%s --continue\"."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 "Nแบฟu bแบกn muแป‘n bแป qua miแบฟng vรก nร y, hรฃy chแบกy lแป‡nh \"%s --skip\" ฤ‘แปƒ thay thแบฟ."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "ฤแปƒ phแปฅc hแป“i lแบกi nhรกnh gแป‘c vร  dแปซng vรก, hรฃy chแบกy \"%s --abort\"."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Miแบฟng vรก ฤ‘ฦฐแปฃc gแปญi vแป›i format=flowed; khoแบฃng trแป‘ng แปŸ cuแป‘i cแปงa cรกc dรฒng cรณ thแปƒ "
 "bแป‹ mแบฅt."
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "Miแบฟng vรก trแป‘ng rแป—ng."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "dรฒng thแปฅt lแป khรดng hแปฃp lแป‡: %.*s"
+msgid "missing author line in commit %s"
+msgstr "thiแบฟu dรฒng tรกc giแบฃ trong lแบงn chuyแปƒn gia %s"
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "khรดng thแปƒ phรขn tรญch lแบงn chuyแปƒn giao โ€œ%sโ€"
+msgid "invalid ident line: %.*s"
+msgstr "dรฒng thแปฅt lแป khรดng hแปฃp lแป‡: %.*s"
 
-#: builtin/am.c:1496
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "Kho thiแบฟu ฤ‘แป‘i tฦฐแปฃng blob cแบงn thiแบฟt ฤ‘แปƒ trแปŸ vแป trรชn โ€œ3-way mergeโ€."
 
-#: builtin/am.c:1498
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Sแปญ dแปฅng thรดng tin trong bแบฃng mแปฅc lแปฅc ฤ‘แปƒ cแบฅu trรบc lแบกi mแป™t cรขy (tree) cฦก sแปŸโ€ฆ"
 
-#: builtin/am.c:1517
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8769,24 +9700,24 @@ msgstr ""
 "Bแบกn ฤ‘รฃ sแปญa miแบฟng vรก cแปงa mรฌnh bแบฑng cรกch thแปง cรดng ร ?\n"
 "Nรณ khรดng thแปƒ รกp dแปฅng cรกc blob ฤ‘รฃ ฤ‘ฦฐแปฃc ghi lแบกi trong bแบฃng mแปฅc lแปฅc cแปงa nรณ."
 
-#: builtin/am.c:1523
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "ฤang trแปŸ lแบกi ฤ‘แปƒ vรก cฦก sแปŸ vร  โ€œhรฒa trแป™n 3-ฤ‘ฦฐแปngโ€โ€ฆ"
 
-#: builtin/am.c:1549
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "Gแบทp lแป—i khi trแป™n vร o cรกc thay ฤ‘แป•i."
 
-#: builtin/am.c:1581
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "รกp dแปฅng vร o mแป™t lแป‹ch sแปญ trแป‘ng rแป—ng"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "khรดng thแปƒ phแปฅc hแป“i: %s khรดng tแป“n tแบกi."
 
-#: builtin/am.c:1650
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr "Thรขn cแปงa lแบงn chuyแปƒn giao lร :"
 
@@ -8794,37 +9725,41 @@ msgstr "Thรขn cแปงa lแบงn chuyแปƒn giao lร :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "รp dแปฅng? ฤ‘แป“ng รฝ [y]/khรด[n]g/chแป‰nh sแปญa [e]/hiแปƒn thแป‹ miแบฟng [v]รก/chแบฅp nhแบญn tแบฅt "
 "cแบฃ [a]: "
 
-#: builtin/am.c:1710
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "khรดng thแปƒ ghi tแบญp tin lฦฐu mแปฅc lแปฅc"
+
+#: builtin/am.c:1704
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Bแบฃng mแปฅc lแปฅc bแบฉn: khรดng thแปƒ รกp dแปฅng cรกc miแบฟng vรก (bแบฉn: %s)"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1744 builtin/am.c:1812
 #, c-format
 msgid "Applying: %.*s"
 msgstr "รp dแปฅng: %.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1761
 msgid "No changes -- Patch already applied."
 msgstr "Khรดng thay ฤ‘แป•i gรฌ cแบฃ -- Miแบฟng vรก ฤ‘รฃ ฤ‘ฦฐแปฃc รกp dแปฅng rแป“i."
 
-#: builtin/am.c:1773
+#: builtin/am.c:1767
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Gแบทp lแป—i khi vรก tแบกi %s %.*s"
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr "Dรนng โ€œgit am --show-current-patchโ€ ฤ‘แปƒ xem miแบฟng vรก bแป‹ lแป—i"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "Dรนng โ€œgit am --show-current-patch=diffโ€ ฤ‘แปƒ xem miแบฟng vรก bแป‹ lแป—i"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1815
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -8835,7 +9770,7 @@ msgstr ""
 "ฤ‘รฃ sแบตn ฤ‘ฦฐแปฃc ฤ‘ฦฐa vร o vแป›i cรนng nแป™i dung thay ฤ‘แป•i; bแบกn cรณ lแบฝ muแป‘n bแป qua miแบฟng "
 "vรก nร y."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1822
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -8848,17 +9783,17 @@ msgstr ""
 "Bแบกn cรณ lแบฝ muแป‘n chแบกy โ€œgit rmโ€œ trรชn mแป™t tแบญp tin ฤ‘แปƒ chแบฅp nhแบญn \"ฤ‘ฦฐแปฃc xรณa bแปŸi hแป"
 "\" cho nรณ."
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Khรดng thแปƒ phรขn tรญch ฤ‘แป‘i tฦฐแปฃng โ€œ%sโ€."
 
-#: builtin/am.c:1987
+#: builtin/am.c:1981
 msgid "failed to clean index"
 msgstr "gแบทp lแป—i khi dแปn bแบฃng mแปฅc lแปฅc"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2025
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -8866,144 +9801,154 @@ msgstr ""
 "Bแบกn cรณ lแบฝ ฤ‘รฃ cรณ HEAD ฤ‘รฃ bแป‹ di chuyแปƒn ฤ‘i kแปƒ tแปซ lแบงn โ€œamโ€ thแบฅt bแบกi cuแป‘i cรนng.\n"
 "Khรดng thแปƒ chuyแปƒn tแป›i ORIG_HEAD"
 
-#: builtin/am.c:2128
+#: builtin/am.c:2132
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Giรก trแป‹ khรดng hแปฃp lแป‡ cho --patch-format: %s"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Giรก trแป‹ khรดng hแปฃp lแป‡ cho --show-current-patch: %s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s xung khแบฏc vแป›i --show-current-patch=%s"
+
+#: builtin/am.c:2207
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<cรกc tรนy chแปn>] [(<mbox>|<Maildir>)โ€ฆ]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2208
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<cรกc tรนy chแปn>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2214
 msgid "run interactively"
 msgstr "chแบกy kiแปƒu tฦฐฦกng tรกc"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2216
 msgid "historical option -- no-op"
 msgstr "tรนy chแปn lแป‹ch sแปญ -- khรดng-toรกn-tแปญ"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2218
 msgid "allow fall back on 3way merging if needed"
 msgstr "cho phรฉp quay trแปŸ lแบกi ฤ‘แปƒ hรฒa trแป™n kiแปƒu โ€œ3wayโ€ nแบฟu cแบงn"
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
 msgid "be quiet"
 msgstr "im lแบทng"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2221
 msgid "add a Signed-off-by line to the commit message"
 msgstr "thรชm dรฒng Signed-off-by cho ghi chรบ cแปงa lแบงn chuyแปƒn giao"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2224
 msgid "recode into utf8 (default)"
 msgstr "chuyแปƒn mรฃ thร nh utf8 (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2226
 msgid "pass -k flag to git-mailinfo"
 msgstr "chuyแปƒn cแป -k cho git-mailinfo"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2228
 msgid "pass -b flag to git-mailinfo"
 msgstr "chuyแปƒn cแป -b cho git-mailinfo"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2230
 msgid "pass -m flag to git-mailinfo"
 msgstr "chuyแปƒn cแป -m cho git-mailinfo"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2232
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "chuyแปƒn cแป --keep-cr cho git-mailsplit vแป›i ฤ‘แป‹nh dแบกng mbox"
 
-#: builtin/am.c:2192
+#: builtin/am.c:2235
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "ฤ‘แปซng chuyแปƒn cแป --keep-cr cho git-mailsplit khรดng phแปฅ thuแป™c vร o am.keepcr"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2238
 msgid "strip everything before a scissors line"
 msgstr "cแบฏt mแปi thแปฉ trฦฐแป›c dรฒng scissors"
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
 msgid "pass it through git-apply"
 msgstr "chuyแปƒn nรณ qua git-apply"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr "ฤ‘แป‹nh dแบกng"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2264
 msgid "format the patch(es) are in"
 msgstr "ฤ‘แป‹nh dแบกng (cรกc) miแบฟng vรก theo"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2270
 msgid "override error message when patch failure occurs"
 msgstr "ฤ‘รจ lรชn cรกc lแปi nhแบฏn lแป—i khi xแบฃy ra lแป—i vรก nghiรชm trแปng"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2272
 msgid "continue applying patches after resolving a conflict"
 msgstr "tiแบฟp tแปฅc รกp dแปฅng cรกc miแบฟng vรก sau khi giแบฃi quyแบฟt xung ฤ‘แป™t"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2275
 msgid "synonyms for --continue"
 msgstr "ฤ‘แป“ng nghฤฉa vแป›i --continue"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2278
 msgid "skip the current patch"
 msgstr "bแป qua miแบฟng vรก hiแป‡n hร nh"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2281
 msgid "restore the original branch and abort the patching operation."
 msgstr "phแปฅc hแป“i lแบกi nhรกnh gแป‘c vร  loแบกi bแป thao tรกc vรก."
 
-#: builtin/am.c:2241
+#: builtin/am.c:2284
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "bแป qua thao tรกc vรก nhฦฐng vแบซn giแปฏ HEAD chแป‰ ฤ‘แบฟn nรณ."
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
-msgstr "hiแปƒn thแป‹ miแบฟng vรก ฤ‘รฃ ฤ‘ฦฐแปฃc รกp dแปฅng rแป“i."
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "hiแปƒn thแป‹ miแบฟng vรก ฤ‘รฃ ฤ‘ฦฐแปฃc รกp dแปฅng rแป“i"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2293
 msgid "lie about committer date"
 msgstr "nรณi dแป‘i vแป ngร y chuyแปƒn giao"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2295
 msgid "use current timestamp for author date"
 msgstr "dรนng dแบฅu thแปi gian hiแป‡n tแบกi cho ngร y tรกc giแบฃ"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr "mรฃ-sแป‘-khรณa"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
 msgid "GPG-sign commits"
 msgstr "Cรกc lแบงn chuyแปƒn giao kรฝ-GPG"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2301
 msgid "(internal use for git-rebase)"
 msgstr "(dรนng nแป™i bแป™ cho git-rebase)"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2319
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -9011,16 +9956,16 @@ msgstr ""
 "Tรนy chแปn -b/--binary ฤ‘รฃ khรดng dรนng tแปซ lรขu rแป“i, vร \n"
 "nรณ sแบฝ ฤ‘ฦฐแปฃc bแป ฤ‘i. Xin ฤ‘แปซng sแปญ dแปฅng nรณ thรชm nแปฏa."
 
-#: builtin/am.c:2281
+#: builtin/am.c:2326
 msgid "failed to read the index"
 msgstr "gแบทp lแป—i ฤ‘แปc bแบฃng mแปฅc lแปฅc"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2341
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "thฦฐ mแปฅc rebase trฦฐแป›c %s khรดng sแบตn cรณ nhฦฐng mbox lแบกi ฤ‘ฦฐa ra."
 
-#: builtin/am.c:2320
+#: builtin/am.c:2365
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9029,11 +9974,11 @@ msgstr ""
 "Tรฌm thแบฅy thฦฐ mแปฅc lแบกc %s.\n"
 "Dรนng \"git am --abort\" ฤ‘แปƒ loแบกi bแป nรณ ฤ‘i."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2371
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Thao tรกc phรขn giแบฃi khรดng ฤ‘ฦฐแปฃc tiแบฟn hร nh, chรบng ta khรดng phแปฅc hแป“i lแบกi."
 
-#: builtin/am.c:2336
+#: builtin/am.c:2381
 msgid "interactive mode requires patches on the command line"
 msgstr "chแบฟ ฤ‘แป™ tฦฐฦกng tรกc yรชu cแบงu cรณ cรกc miแบฟng vรก trรชn dรฒng lรชnh"
 
@@ -9156,7 +10101,7 @@ msgstr "Chรบng tรดi ฤ‘ang khรดng bisect.\n"
 msgid "'%s' is not a valid commit"
 msgstr "โ€œ%sโ€ khรดng phแบฃi mแป™t lแบงn chuyแปƒn giao hแปฃp lแป‡"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9164,27 +10109,27 @@ msgstr ""
 "khรดng thแปƒ lแบฅy ra HEAD nguyรชn thแปงy cแปงa โ€œ%sโ€. Hรฃy thแปญ โ€œgit bisect reset <lแบงn-"
 "chuyแปƒn-giao>โ€."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "ฤแป‘i sแป‘ bisect_write sai: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "khรดng thแปƒ lแบฅy oid cแปงa ฤ‘iแปƒm xรฉt duyแป‡t โ€œ%sโ€"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "khรดng thแปƒ mแปŸ tแบญp tin โ€œ%sโ€"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Lแป‡nh khรดng hแปฃp lแป‡: bแบกn hiแป‡n ฤ‘ang แปŸ mแป™t bisect %s/%s"
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9193,7 +10138,7 @@ msgstr ""
 "Bแบกn phแบฃi chแป‰ cho tรดi รญt nhแบฅt mแป™t ฤ‘iแปƒm %s vร  mแป™t %s.\n"
 "Bแบกn cรณ thแปƒ sแปญ dแปฅng \"git bisect %s\" vร  \"git bisect %s\" cho cรกi ฤ‘รณ."
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9204,7 +10149,7 @@ msgstr ""
 "Bแบกn sau ฤ‘รณ cแบงn phแบฃi chแป‰ cho tรดi รญt nhแบฅt mแป™t ฤ‘iแปƒm xรฉt duyแป‡t %s vร  mแป™t %s.\n"
 "Bแบกn cรณ thแปƒ sแปญ dแปฅng \"git bisect %s\" vร  \"git bisect %s\" cho chรบng."
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:310
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "chแป‰ thแปฑc hiแป‡n viแป‡c bisect vแป›i mแป™t lแบงn chuyแปƒn giao %s"
@@ -9213,15 +10158,15 @@ msgstr "chแป‰ thแปฑc hiแป‡n viแป‡c bisect vแป›i mแป™t lแบงn chuyแปƒn giao %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr "Bแบกn cรณ chแบฏc chแบฏn chฦฐa [Y/n]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr "chฦฐa ฤ‘แป‹nh nghฤฉa thแปi kแปณ nร o"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:382
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9230,7 +10175,7 @@ msgstr ""
 "Bแบกn hiแป‡n tแบกi ฤ‘ang แปŸ thแปi kแปณ %s cho tรฌnh trแบกng cลฉ\n"
 "vร  %s cho tรฌnh trแบกng mแป›i.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:392
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9239,270 +10184,266 @@ msgstr ""
 "tham sแป‘ khรดng hแปฃp lแป‡ %s cho โ€œgit bisect termsโ€.\n"
 "Cรกc tรนy chแปn hแป— trแปฃ lร : --term-good|--term-old vร  --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:478
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "tรนy chแปn khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn: โ€œ%sโ€"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:482
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "โ€œ%sโ€ khรดng cรณ vแบป nhฦฐ lร  mแป™t ฤ‘iแปƒm xรฉt duyแป‡t hแปฃp lแป‡"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:514
 msgid "bad HEAD - I need a HEAD"
 msgstr "sai HEAD - Tรดi cแบงn mแป™t HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:529
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "lแบฅy ra โ€œ%sโ€ ra gแบทp lแป—i. Hรฃy thแปญ \"git bisect reset <nhรกnh_hแปฃp_lแป‡>\"."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "sแบฝ khรดng di chuyแปƒn nแปญa bฦฐแป›c trรชn cรขy ฤ‘ฦฐแปฃc cg-seek"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:553
 msgid "bad HEAD - strange symbolic ref"
 msgstr "sai HEAD - tham chiแบฟu mแปm kแปณ lแบก"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:577
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "refspec khรดng hแปฃp lแป‡: โ€œ%sโ€"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr "thแปฑc hiแป‡n โ€œgit bisect nextโ€"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "ghi thแปi kแปณ vร o .git/BISECT_TERMS"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr "dแปn dแบนp tรฌnh trแบกng di chuyแปƒn nแปญa bฦฐแป›c"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr "kiแปƒm tra cho ฤ‘iแปƒm xem xรฉt cแบงn dรนng"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:641
 msgid "reset the bisection state"
 msgstr "ฤ‘แบทt lแบกi trแบกng di chuyแปƒn nแปญa bฦฐแป›c"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:643
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "ghi ra tรฌnh trแบกng di chuyแปƒn nแปญa bฦฐแป›c trong BISECT_LOG"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:645
 msgid "check and set terms in a bisection state"
 msgstr "kiแปƒm tra vร  ฤ‘แบทt thแปi ฤ‘iแปƒm trong di chuyแปƒn nแปญa bฦฐแป›c"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:647
 msgid "check whether bad or good terms exist"
 msgstr "kiแปƒm tra xem cรกc thแปi ฤ‘iแปƒm xแบฅu/tแป‘t cรณ tแป“n tแบกi khรดng"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:649
 msgid "print out the bisect terms"
 msgstr "in ra cรกc thแปi ฤ‘iแปƒm di chuyแปƒn nแปญa bฦฐแป›c"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:651
 msgid "start the bisect session"
 msgstr "bแบฏt ฤ‘แบงu phiรชn di chuyแปƒn nแปญa bฦฐแป›c"
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr ""
 "cแบญp nhแบญt BISECT_HEAD thay vรฌ lแบฅy ra (checking out) lแบงn chuyแปƒn giao hiแป‡n hร nh"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:655
 msgid "no log for BISECT_WRITE"
 msgstr "khรดng cรณ nhแบญt kรฝ cho BISECT_WRITE"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms cแบงn hai tham sแป‘"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state khรดng nhแบญn ฤ‘แป‘i sแป‘"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:684
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr ""
 "--bisect-reset requires khรดng nhแบญn ฤ‘แป‘i sแป‘ cลฉng khรดng nhแบญn lแบงn chuyแปƒn giao"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:688
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write cแบงn 4 hoแบทc 5 tham sแป‘"
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:694
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--check-and-set-terms cแบงn 3 tham sแป‘"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:700
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check cแบงn 2 hoแบทc 3 tham sแป‘"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:706
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms cแบงn 0 hoแบทc 1 tham sแป‘"
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<cรกc tรนy chแปn>] [<rev-opts>] [<rev>] [--] <tแบญp-tin>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> ฤ‘ฦฐแปฃc mรด tแบฃ trong tร i liแป‡u git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, c-format
 msgid "expecting a color: %s"
 msgstr "cแบงn mแป™t mร u: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr "phแบฃi kแบฟt thรบc bแบฑng mแป™t mร u"
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "mร u khรดng hแปฃp lแป‡ โ€œ%sโ€ trong color.blame.repeatedLines"
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 msgid "invalid value for blame.coloring"
 msgstr "mร u khรดng hแปฃp lแป‡ cho blame.coloring"
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "khรดng thแปƒ tรฌm thแบฅy ฤ‘iแปƒm xรฉt duyแป‡t %s ฤ‘แปƒ mร  bแป qua"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Hiแปƒn thแป‹ cรกc mแปฅc โ€œblameโ€ nhฦฐ lร  chรบng ta thแบฅy chรบng, tฤƒng dแบงn"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 "Hiแปƒn thแป‹ SHA-1 trแบฏng cho nhแปฏng lแบงn chuyแปƒn giao biรชn giแป›i (Mแบทc ฤ‘แป‹nh: off)"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Khรดng coi cรกc lแบงn chuyแปƒn giao gแป‘c lร  giแป›i hแบกn (Mแบทc ฤ‘แป‹nh: off)"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr "Hiแปƒn thแป‹ thแป‘ng kรช cรดng sแปฉc lร m viแป‡c"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr "ร‰p buแป™c bรกo cรกo tiแบฟn triแปƒn cรดng viแป‡c"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr "Hiแปƒn thแป‹ kแบฟt xuแบฅt ฤ‘iแปƒm sแป‘ cรณ cรกc mแปฅc tin โ€œblameโ€"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr "Hiแปƒn thแป‹ tรชn tแบญp tin gแป‘c (Mแบทc ฤ‘แป‹nh: auto)"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr "Hiแปƒn thแป‹ sแป‘ dรฒng gแป‘c (Mแบทc ฤ‘แป‹nh: off)"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr "Hiแปƒn thแป‹ แปŸ ฤ‘แป‹nh dแบกng ฤ‘รฃ thiแบฟt kแบฟ cho sแปฑ tiรชu dรนng bแบฑng mรกy"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr "Hiแปƒn thแป‹ ฤ‘แป‹nh dแบกng โ€œporcelainโ€ vแป›i thรดng tin chuyแปƒn giao mแป—i dรฒng"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Dรนng cรนng chแบฟ ฤ‘แป™ xuแบฅt ra vแป›i git-annotate (Mแบทc ฤ‘แป‹nh: off)"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr "Hiแปƒn thแป‹ dแบฅu vแบฟt thแปi gian dแบกng thรด (Mแบทc ฤ‘แป‹nh: off)"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Hiแปƒn thแป‹ SHA1 cแปงa lแบงn chuyแปƒn giao dแบกng dร i (Mแบทc ฤ‘แป‹nh: off)"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Khรดng hiแปƒn thแป‹ tรชn tรกc giแบฃ vร  dแบฅu vแบฟt thแปi gian (Mแบทc ฤ‘แป‹nh: off)"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr "Hiแปƒn thแป‹ thฦฐ ฤ‘iแป‡n tแปญ cแปงa tรกc giแบฃ thay vรฌ tรชn (Mแบทc ฤ‘แป‹nh: off)"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr "Bแป qua cรกc khรกc biแป‡t do khoแบฃng trแบฏng gรขy ra"
 
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 msgid "Ignore <rev> when blaming"
-msgstr "bแป qua <rev> khi blame"
+msgstr "Bแป qua <rev> khi blame"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 msgid "Ignore revisions from <file>"
 msgstr "Bแป qua cรกc ฤ‘iแปƒm xรฉt duyแป‡t tแปซ <tแบญp tin>"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr "siรชu dแปฏ liแป‡u dฦฐ thแปซa mร u tแปซ dรฒng trฦฐแป›c khรกc hแบณn"
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr "cรกc dรฒng mร u theo tuแป•i"
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Dรนng mแป™t phแปng ฤ‘oรกn thแปญ nghiแป‡m ฤ‘แปƒ tฤƒng cฦฐแปng cรกc diff"
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr "Tiรชu thแปฅ thรชm nฤƒng tร i nguyรชn mรกy mรณc ฤ‘แปƒ tรฌm kiแบฟm tแป‘t hฦกn nแปฏa"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 "Sแปญ dแปฅng ฤ‘iแปƒm xรฉt duyแป‡t (revision) tแปซ <tแบญp tin> thay vรฌ gแปi โ€œgit-rev-listโ€"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "Sแปญ dแปฅng nแป™i dung cแปงa <tแบญp tin> nhฦฐ lร  แบฃnh cuแป‘i cรนng"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "ฤ‘iแปƒm sแป‘"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr "Tรฌm cรกc bแบฃn sao chรฉp dรฒng trong vร  ngang qua tแบญp tin"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr "Tรฌm cรกc di chuyแปƒn dรฒng trong vร  ngang qua tแบญp tin"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr "Xแปญ lรฝ chแป‰ dรฒng vรนng n,m, tรญnh tแปซ 1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress khรดng ฤ‘ฦฐแปฃc dรนng cรนng vแป›i --incremental hay cรกc ฤ‘แป‹nh dแบกng porcelain"
@@ -9515,17 +10456,17 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "4 nฤƒm, 11 thรกng trฦฐแป›c"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "tแบญp tin %s chแป‰ cรณ %lu dรฒng"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr "Cรกc dรฒng blame"
 
@@ -9734,7 +10675,7 @@ msgstr "cร i ฤ‘แบทt chแบฟ ฤ‘แป™ theo dรตi (xem git-pull(1))"
 msgid "do not use"
 msgstr "khรดng dรนng"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:513
 msgid "upstream"
 msgstr "thฦฐแปฃng nguแป“n"
 
@@ -9743,8 +10684,8 @@ msgid "change the upstream info"
 msgstr "thay ฤ‘แป•i thรดng tin thฦฐแปฃng nguแป“n"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Bแป ฤ‘แบทt thรดng tin thฦฐแปฃng nguแป“n"
+msgid "unset the upstream info"
+msgstr "bแป ฤ‘แบทt thรดng tin thฦฐแปฃng nguแป“n"
 
 #: builtin/branch.c:628
 msgid "use colored output"
@@ -9845,7 +10786,7 @@ msgstr "sแบฏp xแบฟp vร  lแปc lร  phรขn biแป‡t HOA thฦฐแปng"
 msgid "format to use for the output"
 msgstr "ฤ‘แป‹nh dแบกng sแบฝ dรนng cho ฤ‘แบงu ra"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:785
 msgid "HEAD not found below refs/heads!"
 msgstr "Khรดng tรฌm thแบฅy HEAD แปŸ dฦฐแป›i refs/heads!"
 
@@ -9935,20 +10876,65 @@ msgstr ""
 "tรนy chแปn --set-upstream ฤ‘รฃ khรดng cรฒn ฤ‘ฦฐแปฃc hแป— trแปฃ nแปฏa. Vui lรฒng dรนng โ€œ--"
 "trackโ€ hoแบทc โ€œ--set-upstream-toโ€ ฤ‘แปƒ thay thแบฟ."
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr "โ€œ%sโ€ tแป‘t\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<cรกc tรนy chแปn>] <tแบญp_tin> <git-rev-list args>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<cรกc tรนy chแปn>] <tแบญp-tin>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <tแบญp tin> [<tรชn tham chiแบฟu>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <tแบญp tin> [<tรชn tham chiแบฟu>...]"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "khรดng hiแปƒn thแป‹ bแป™ ฤ‘o tiแบฟn trรฌnh"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "hiแปƒn thแป‹ bแป™ ฤ‘o tiแบฟn trรฌnh"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr "hiแปƒn thแป‹ bแป™ ฤ‘o tiแบฟn triแปƒn trong suแป‘t pha ghi ฤ‘แป‘i tฦฐแปฃng"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "tฦฐฦกng tแปฑ --all-progress khi bแป™ ฤ‘o tiแบฟn trรฌnh ฤ‘ฦฐแปฃc xuแบฅt hiแป‡n"
+
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "Cแบงn mแป™t kho chแปฉa ฤ‘แปƒ cรณ thแปƒ tแบกo mแป™t bundle."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "khรดng hiแปƒn thแป‹ chi tiแบฟt bundle (bรณ)"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "โ€œ%sโ€ tแป‘t\n"
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "Cแบงn mแป™t kho chแปฉa ฤ‘แปƒ cรณ thแปƒ giแบฃi nรฉn mแป™t bundle."
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr "chi tiแบฟt; phแบฃi ฤ‘ฦฐแปฃc ฤ‘แบทt trฦฐแป›c mแป™t lแป‡nh-con"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Khรดng hiแปƒu cรขu lแป‡nh con: %s"
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -9956,7 +10942,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <kiแปƒu> | --textconv) | --filters) [--path=<ฤ‘ฦฐแปng/dแบซn>] <ฤ‘แป‘i_tฦฐแปฃng>"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -9964,72 +10950,72 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 msgid "only one batch option may be specified"
 msgstr "chแป‰ mแป™t tรนy chแปn batch ฤ‘ฦฐแปฃc chแป‰ ra"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<kiแปƒu> lร  mแป™t trong sแป‘: blob, tree, commit hoแบทc tag"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr "hiแปƒn thแป‹ kiแปƒu ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr "hiแปƒn thแป‹ kรญch thฦฐแป›c ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr "thoรกt vแป›i 0 khi khรดng cรณ lแป—i"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr "in nแป™i dung ฤ‘แป‘i tฦฐแปฃng dแบกng dแป… ฤ‘แปc"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr "vแป›i ฤ‘แป‘i tฦฐแปฃng blob, chแบกy lแป‡nh textconv trรชn nแป™i dung cแปงa ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr "vแป›i ฤ‘แป‘i tฦฐแปฃng blob, chแบกy lแป‡nh filters trรชn nแป™i dung cแปงa ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:1002
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr "dรนng mแป™t ฤ‘ฦฐแปng dแบซn rรต rร ng cho --textconv/--filters"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "cho phรฉp -s vร  -t ฤ‘แปƒ lร m viแป‡c vแป›i cรกc ฤ‘แป‘i tฦฐแปฃng sai/hแปng"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr "ฤ‘แป‡m kแบฟt xuแบฅt --batch"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "hiแปƒn thแป‹ thรดng tin vร  nแป™i dung cแปงa cรกc ฤ‘แป‘i tฦฐแปฃng lแบฅy tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr "hiแปƒn thแป‹ cรกc thรดng tin vแป ฤ‘แป‘i tฦฐแปฃng fed  tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "theo liรชn kแบฟt mแปm trong-cรขy (ฤ‘ฦฐแปฃc dรนng vแป›i --batch hay --batch-check)"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr "hiแปƒn thแป‹ mแปi ฤ‘แป‘i tฦฐแปฃng vแป›i --batch hay --batch-check"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr "ฤ‘แปซng sแบฏp xแบฟp ฤ‘แบงu ra --batch-all-objects"
 
@@ -10057,8 +11043,8 @@ msgstr "ฤ‘แปc tรชn tแบญp tin tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn"
 msgid "terminate input and output records by a NUL character"
 msgstr "chแบฅm dแปฉt cรกc bแบฃn ghi vร o vร  ra bแบฑng kรฝ tแปฑ NULL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
 msgid "suppress progress reporting"
 msgstr "chแบทn cรกc bรกo cรกo tiแบฟn trรฌnh hoแบกt ฤ‘แป™ng"
 
@@ -10070,27 +11056,27 @@ msgstr "hiแปƒn thแป‹ nhแปฏng ฤ‘ฦฐแปng dแบซn ฤ‘แบงu vร o khรดng khแป›p vแป›i mแบ
 msgid "ignore index when checking"
 msgstr "bแป qua mแปฅc lแปฅc khi kiแปƒm tra"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "khรดng thแปƒ chแป‰ ฤ‘แป‹nh cรกc tรชn ฤ‘ฦฐแปng dแบซn vแป›i --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z chแป‰ hแปฃp lรฝ vแป›i --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "chฦฐa chแป‰ ra ฤ‘ฦฐแปng dแบซn"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet chแป‰ hแปฃp lแป‡ vแป›i tรชn ฤ‘ฦฐแปng dแบซn ฤ‘ฦกn"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "khรดng thแปƒ dรนng cแบฃ hai tรนy chแปn --quiet vร  --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "tรนy-chแปn --non-matching chแป‰ hแปฃp lแป‡ khi dรนng vแป›i --verbose"
 
@@ -10149,9 +11135,9 @@ msgid "write the content to temporary files"
 msgstr "ghi nแป™i dung vร o tแบญp tin tแบกm"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
 msgid "string"
 msgstr "chuแป—i"
 
@@ -10179,96 +11165,96 @@ msgstr "git switch [<cรกc tรนy chแปn>] [<nhรกnh>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<cรกc tรนy chแปn>] [--source=<nhรกnh>] <tแบญp tin>..."
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng cรณ cรกc phiรชn bแบฃn cแปงa chรบng ta"
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng cรณ cรกc phiรชn bแบฃn cแปงa chรบng"
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng cรณ tแบฅt cแบฃ cรกc phiรชn bแบฃn cแบงn thiแบฟt"
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng cรณ cรกc phiรชn bแบฃn cแบงn thiแบฟt"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€: khรดng thแปƒ hรฒa trแป™n"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Khรดng thแปƒ thรชm kแบฟt quแบฃ hรฒa trแป™n cho โ€œ%sโ€"
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "ฤรฃ tแบกo lแบกi %d xung ฤ‘แป™t hรฒa trแป™n"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "ฤรฃ cแบญp nhแบญt ฤ‘ฦฐแปng dแบซn %d tแปซ %s"
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:389
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "ฤรฃ cแบญp nhแบญt ฤ‘ฦฐแปng dแบซn %d tแปซ mแปฅc lแปฅc"
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "khรดng ฤ‘ฦฐแปฃc dรนng โ€œ%sโ€ vแป›i cรกc ฤ‘ฦฐแปng dแบซn cแบญp nhแบญt"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "khรดng ฤ‘ฦฐแปฃc dรนng โ€œ%sโ€ vแป›i %s"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Khรดng thแปƒ cแบญp nhแบญt cรกc ฤ‘ฦฐแปng dแบซn vร  chuyแปƒn ฤ‘แบฟn nhรกnh โ€œ%sโ€ cรนng mแป™t lรบc."
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "khรดng chแป‰ ฤ‘แป‹nh '%s' khรดng '%s'"
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "phแบฃi cรณ โ€œ%sโ€ khi khรดng chแป‰ ฤ‘แป‹nh โ€œ%sโ€"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' hay '%s' khรดng thแปƒ ฤ‘ฦฐแปฃc sแปญ dแปฅng vแป›i %s"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "ฤ‘ฦฐแปng dแบซn โ€œ%sโ€ khรดng ฤ‘ฦฐแปฃc hรฒa trแป™n"
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
 msgid "you need to resolve your current index first"
 msgstr "bแบกn cแบงn phแบฃi giแบฃi quyแบฟt bแบฃng mแปฅc lแปฅc hiแป‡n tแบกi cแปงa bแบกn trฦฐแป›c ฤ‘รฃ"
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:734
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10278,56 +11264,50 @@ msgstr ""
 "sau:\n"
 "%s"
 
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-"cรกc thay ฤ‘แป•i ฤ‘รฃ ฤ‘ฦฐa lรชn bแป‡ phรณng trong cรกc tแบญp tin sau ฤ‘รขy cรณ thแปƒ bแป‹ mแบฅt: %s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:837
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Khรดng thแปƒ thแปฑc hiแป‡n reflog cho โ€œ%sโ€: %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:879
 msgid "HEAD is now at"
 msgstr "HEAD hiแป‡n giแป tแบกi"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:883 builtin/clone.c:717
 msgid "unable to update HEAD"
 msgstr "khรดng thแปƒ cแบญp nhแบญt HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:887
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "ฤแบทt lแบกi nhรกnh โ€œ%sโ€\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "ฤรฃ sแบตn sร ng trรชn โ€œ%sโ€\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:894
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "ฤรฃ chuyแปƒn tแป›i vร  ฤ‘แบทt lแบกi nhรกnh โ€œ%sโ€\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:896 builtin/checkout.c:1320
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "ฤรฃ chuyแปƒn ฤ‘แบฟn nhรกnh mแป›i โ€œ%sโ€\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:898
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "ฤรฃ chuyแปƒn ฤ‘แบฟn nhรกnh โ€œ%sโ€\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:949
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " โ€ฆ vร  nhiแปu hฦกn %d.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:955
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10346,7 +11326,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:974
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10367,28 +11347,19 @@ msgstr[0] ""
 " git branch <tรชn_nhรกnh_mแป›i> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1009
 msgid "internal error in revision walk"
 msgstr "lแป—i nแป™i bแป™ trong khi di chuyแปƒn qua cรกc ฤ‘iแปƒm xรฉt duyแป‡t"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1013
 msgid "Previous HEAD position was"
 msgstr "Vแป‹ trรญ trฦฐแป›c kia cแปงa HEAD lร "
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
 msgid "You are on a branch yet to be born"
 msgstr "Bแบกn tแบกi nhรกnh mร  nรณ chฦฐa hแป ฤ‘ฦฐแปฃc sinh ra"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "chแป‰ cแบงn mแป™t tham chiแบฟu"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "chแป‰ cแบงn mแป™t tham chiแบฟu, nhฦฐng lแบกi ฤ‘ฦฐa ra %d."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1128
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10397,37 +11368,71 @@ msgstr ""
 "โ€œ%sโ€ khรดng thแปƒ lร  cแบฃ tแบญp tin nแป™i bแป™ vร  mแป™t nhรกnh theo dรตi.\n"
 "Vui long dรนng -- (vร  tรนy chแปn thรชm --no-guess) ฤ‘แปƒ trรกnh lแบซn lแป™n"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Nแบฟu รฝ bแบกn lร  lแบฅy ra nhรกnh mรกy chแปง ฤ‘ฦฐแปฃc theo dรตi, vรญ dแปฅ โ€œoriginโ€,\n"
+"bแบกn cรณ thแปƒ lร m nhฦฐ vแบญy bแบฑng cรกch chแป‰ ฤ‘แป‹nh ฤ‘แบงy ฤ‘แปง tรชn vแป›i tรนy chแปn --track:\n"
+"\n"
+"    git checkout --track origin/<tรชn>\n"
+"\n"
+"Nแบฟu bแบกn muแป‘n luรดn lแบฅy ra tแปซ mแป™t <tรชn> mแป™t mรกy chแปง ฦฐa thรญch\n"
+"chฦฐa rรต rร ng, vรญ dแปฅ mรกy chแปง โ€œoriginโ€, cรขn nhแบฏc cร i ฤ‘แบทt\n"
+"checkout.defaultRemote=origin trong cแบฅu hรฌnh cแปงa bแบกn."
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "โ€œ%sโ€ khแป›p vแป›i nhiแปu (%d) nhรกnh mรกy chแปง ฤ‘ฦฐแปฃc theo dรตi"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "chแป‰ cแบงn mแป™t tham chiแบฟu"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "chแป‰ cแบงn mแป™t tham chiแบฟu, nhฦฐng lแบกi ฤ‘ฦฐa ra %d."
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
 #, c-format
 msgid "invalid reference: %s"
 msgstr "tham chiแบฟu khรดng hแปฃp lแป‡: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "tham chiแบฟu khรดng phแบฃi lร  mแป™t cรขy:%s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1334
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "cแบงn mแป™t nhรกnh, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc thแบป โ€œ%sโ€"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1336
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "cแบงn mแป™t nhรกnh, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc nhรกnh mรกy phแปฅc vแปฅ โ€œ%sโ€"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "cแบงn mแป™t nhรกnh, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc โ€œ%sโ€"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1340
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "cแบงn mแป™t nhรกnh, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc โ€œ%sโ€"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1356
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10435,7 +11440,7 @@ msgstr ""
 "khรดng thแปƒ chuyแปƒn nhรกnh trong khi ฤ‘ang hรฒa trแป™n\n"
 "Cรขn nhแบฏc dung \"git merge --quit\" hoแบทc \"git worktree add\"."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1360
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10443,7 +11448,7 @@ msgstr ""
 "khรดng thแปƒ chuyแปƒn nhanh แปŸ giแปฏa mแป™t phiรชn am\n"
 "Cรขn nhแบฏc dรนng \"git am --quit\" hoแบทc \"git worktree add\"."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1364
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10451,7 +11456,7 @@ msgstr ""
 "khรดng thแปƒ chuyแปƒn nhรกnh trong khi cแบฃi tแป•\n"
 "Cรขn nhแบฏc dรนng \"git rebase --quit\" hay \"git worktree add\"."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1368
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10459,7 +11464,7 @@ msgstr ""
 "khรดng thแปƒ chuyแปƒn nhรกnh trong khi  cherry-picking\n"
 "Cรขn nhแบฏc dรนng \"git cherry-pick --quit\" hay \"git worktree add\"."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1372
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10467,143 +11472,148 @@ msgstr ""
 "khรดng thแปƒ chuyแปƒn nhรกnh trong khi hoร n nguyรชn\n"
 "Cรขn nhแบฏc dรนng \"git revert --quit\" hoแบทc \"git worktree add\"."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1376
 msgid "you are switching branch while bisecting"
 msgstr ""
 "bแบกn hiแป‡n tแบกi ฤ‘ang thแปฑc hiแป‡n viแป‡c chuyแปƒn nhรกnh trong khi ฤ‘ang di chuyแปƒn nแปญa "
 "bฦฐแป›c"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1383
 msgid "paths cannot be used with switching branches"
 msgstr "cรกc ฤ‘ฦฐแปng dแบซn khรดng thแปƒ dรนng cรนng vแป›i cรกc nhรกnh chuyแปƒn"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "โ€œ%sโ€ khรดng thแปƒ ฤ‘ฦฐแปฃc sแปญ dแปฅng vแป›i cรกc nhรกnh chuyแปƒn"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "โ€œ%sโ€ khรดng thแปƒ ฤ‘ฦฐแปฃc dรนng vแป›i โ€œ%sโ€"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1411
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "โ€œ%sโ€ khรดng thแปƒ nhแบญn <ฤ‘iแปƒm-ฤ‘แบงu>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1419
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Khรดng thแปƒ chuyแปƒn nhรกnh ฤ‘แบฟn mแป™t thแปฉ khรดng phแบฃi lร  lแบงn chuyแปƒn giao โ€œ%sโ€"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1426
 msgid "missing branch or commit argument"
 msgstr "thiแบฟu tham sแป‘ lร  nhรกnh hoแบทc lแบงn chuyแปƒn giao"
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "รฉp buแป™c bรกo cรกo tiแบฟn triแปƒn cรดng viแป‡c"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1469
 msgid "perform a 3-way merge with the new branch"
 msgstr "thแปฑc hiแป‡n hรฒa trแป™n kiแปƒu 3-way vแป›i nhรกnh mแป›i"
 
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr "kiแปƒu"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1471
 msgid "conflict style (merge or diff3)"
 msgstr "xung ฤ‘แป™t kiแปƒu (hรฒa trแป™n hoแบทc diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1483 builtin/worktree.c:496
 msgid "detach HEAD at named commit"
 msgstr "rแปi bแป HEAD tแบกi lแบงn chuyแปƒn giao theo tรชn"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1484
 msgid "set upstream info for new branch"
 msgstr "ฤ‘แบทt thรดng tin thฦฐแปฃng nguแป“n cho nhรกnh mแป›i"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1486
 msgid "force checkout (throw away local modifications)"
 msgstr "รฉp buแป™c lแบฅy ra (bแป ฤ‘i nhแปฏng thay ฤ‘แป•i nแป™i bแป™)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new-branch"
 msgstr "nhรกnh-mแป›i"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new unparented branch"
 msgstr "nhรกnh khรดng cha mแป›i"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
 msgid "update ignored files (default)"
 msgstr "cแบญp nhแบญt cรกc tแบญp tin bแป‹ bแป qua (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1493
 msgid "do not check if another worktree is holding the given ref"
 msgstr "khรดng kiแปƒm tra nแบฟu cรขy lร m viแป‡c khรกc ฤ‘ang giแปฏ tham chiแบฟu ฤ‘รฃ cho"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1506
 msgid "checkout our version for unmerged files"
 msgstr ""
 "lแบฅy ra (checkout) phiรชn bแบฃn cแปงa chรบng ta cho cรกc tแบญp tin chฦฐa ฤ‘ฦฐแปฃc hรฒa trแป™n"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1509
 msgid "checkout their version for unmerged files"
 msgstr ""
 "lแบฅy ra (checkout) phiรชn bแบฃn cแปงa chรบng hแป cho cรกc tแบญp tin chฦฐa ฤ‘ฦฐแปฃc hรฒa trแป™n"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1513
 msgid "do not limit pathspecs to sparse entries only"
-msgstr "khรดng giแป›i hแบกn ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn thร nh chแป‰ cรกc mแปฅc thฦฐa thแป›t"
+msgstr "khรดng giแป›i hแบกn ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn thร nh chแป‰ cรกc mแปฅc rแบฃi rรกc"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Cรกc tรนy chแปn -b, -B vร  --orphan loแบกi tแปซ lแบซn nhau"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1568
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p vร  --overlay loแบกi tแปซ lแบซn nhau"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1605
 msgid "--track needs a branch name"
 msgstr "--track cแบงn tรชn mแป™t nhรกnh"
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1610
 msgid "missing branch name; try -b"
 msgstr "thiแบฟu tรชn nhรกnh; hรฃy thแปญ -b"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1642
 #, c-format
 msgid "could not resolve %s"
 msgstr "khรดng thแปƒ phรขn giแบฃi โ€œ%sโ€"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "bแบกn phแบฃi chแป‰ ฤ‘แป‹nh cรกc thฦฐ mแปฅc muแป‘n hแป“i phแปฅc"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
 msgid "invalid path specification"
 msgstr "ฤ‘ฦฐแปng dแบซn ฤ‘รฃ cho khรดng hแปฃp lแป‡"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "โ€œ%sโ€ khรดng phแบฃi lร  mแป™t lแบงn chuyแปƒn giao vร  mแป™t nhรกnh'%sโ€ khรดng thแปƒ ฤ‘ฦฐแปฃc tแบกo "
 "tแปซ ฤ‘รณ"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach khรดng nhแบญn mแป™t ฤ‘แป‘i sแป‘ ฤ‘ฦฐแปng dแบซn โ€œ%sโ€"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file xung khแบฏc vแป›i --detach"
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file xung khแบฏc vแป›i --patch"
+
+#: builtin/checkout.c:1692
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10611,95 +11621,69 @@ msgstr ""
 "git checkout: --ours/--theirs, --force vร  --merge lร  xung khแบฏc vแป›i nhau khi\n"
 "checkout bแบฃng mแปฅc lแปฅc (index)."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"โ€œ%sโ€ khแป›p hฦกn mแป™t nhรกnh mรกy chแปง ฤ‘ฦฐแปฃc theo dรตi.\n"
-"Chรบng tรดi tรฌm thแบฅy %d mรกy chแปง vแป›i mแป™t tham chiแบฟu khแป›p. Do ฤ‘รณ chรบng tรดi cแป‘ "
-"ฤ‘แปƒ\n"
-"phรขn giแบฃi tham sแป‘ nhฦฐ lร  mแป™t ฤ‘ฦฐแปng dแบซn, nhฦฐng cลฉng gแบทp lแป—i!\n"
-"\n"
-"Nแบฟu รฝ bแบกn lร  lแบฅy ra nhรกnh mรกy chแปง ฤ‘ฦฐแปฃc theo dรตi, vรญ dแปฅ โ€œoriginโ€,\n"
-"bแบกn cรณ thแปƒ lร m nhฦฐ vแบญy bแบฑng cรกch chแป‰ ฤ‘แป‹nh ฤ‘แบงy ฤ‘แปง tรชn vแป›i tรนy chแปn --track:\n"
-"\n"
-"    git checkout --track origin/<tรชn>\n"
-"\n"
-"Nแบฟu bแบกn muแป‘n luรดn lแบฅy ra tแปซ mแป™t <tรชn> mแป™t nรกy chแปง ฦฐa thรญch\n"
-"chฦฐa rรต rร ng, vรญ dแปฅ mรกy chแปง โ€œoriginโ€, cรขn nhแบฏc cร i ฤ‘แบทt\n"
-"checkout.defaultRemote=origin trong cแบฅu hรฌnh cแปงa bแบกn."
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "bแบกn phแบฃi chแป‰ ฤ‘แป‹nh cรกc thฦฐ mแปฅc muแป‘n hแป“i phแปฅc"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
 msgid "branch"
 msgstr "nhรกnh"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1724
 msgid "create and checkout a new branch"
 msgstr "tแบกo vร  checkout mแป™t nhรกnh mแป›i"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1726
 msgid "create/reset and checkout a branch"
 msgstr "tแบกo/ฤ‘แบทt_lแบกi vร  checkout mแป™t nhรกnh"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1727
 msgid "create reflog for new branch"
 msgstr "tแบกo reflog cho nhรกnh mแป›i"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1729
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "ฤ‘oรกn thแปฉ hai 'git checkout <khรดng-nhรกnh-nร o-nhฦฐ-vแบญy>' (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1730
 msgid "use overlay mode (default)"
 msgstr "dรนng chแบฟ ฤ‘แป™ che phแปง (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1775
 msgid "create and switch to a new branch"
 msgstr "tแบกo vร  chuyแปƒn ฤ‘แบฟn mแป™t nhรกnh mแป›i"
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1777
 msgid "create/reset and switch to a branch"
 msgstr "tแบกo/ฤ‘แบทt_lแบกi vร  chuyแปƒn ฤ‘แบฟn mแป™t nhรกnh"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1779
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "gแปฃi รฝ thแปฉ hai \"git checkout <khรดng-nhรกnh-nร o-nhฦฐ-vแบญy>\""
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1781
 msgid "throw away local modifications"
 msgstr "vแปฉt bแป cรกc sแปญa ฤ‘แป•i ฤ‘แป‹a phฦฐฦกng"
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1813
 msgid "which tree-ish to checkout from"
 msgstr "lแบฅy ra tแปซ tree-ish nร o"
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1815
 msgid "restore the index"
 msgstr "phแปฅc hแป“i bแบฃng mแปฅc lแปฅc"
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1817
 msgid "restore the working tree (default)"
 msgstr "phแปฅc hแป“i cรขy lร m viแป‡c (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1819
 msgid "ignore unmerged entries"
 msgstr "bแป qua nhแปฏng thแปฉ chฦฐa hรฒa trแป™n: %s"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
 msgid "use overlay mode"
 msgstr "dรนng chแบฟ ฤ‘แป™ che phแปง"
 
@@ -10740,7 +11724,7 @@ msgstr "gแบทp lแป—i khi gแปก bแป %s"
 msgid "could not lstat %s\n"
 msgstr "khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช ฤ‘แบงy ฤ‘แปง cแปงa %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10753,7 +11737,7 @@ msgstr ""
 "foo        - chแปn mแปฅc trรชn cฦก sแปŸ tiแปn tแป‘ duy nhแบฅt\n"
 "           - (ฤ‘แปƒ trแป‘ng) khรดng chแปn gรฌ cแบฃ\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10774,38 +11758,33 @@ msgstr ""
 "*          - chแปn tแบฅt\n"
 "           - (ฤ‘แปƒ trแป‘ng) kแบฟt thรบc viแป‡c chแปn\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Hแบฃ (%s)?\n"
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Mแบซu ฤ‘แปƒ lแปc cรกc tแบญp tin ฤ‘แบงu vร o cแบงn lแป ฤ‘i>> "
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "CแบขNH BรO: Khรดng tรฌm thแบฅy cรกc mแปฅc ฤ‘ฦฐแปฃc khแป›p bแปŸi: %s"
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Chแปn mแปฅc muแป‘n xรณa"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Xรณa bแป โ€œ%sโ€ [y/N]? "
 
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Tแบกm biแป‡t.\n"
-
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10823,63 +11802,55 @@ msgstr ""
 "help                - hiแปƒn thแป‹ chรญnh trแปฃ giรบp nร y\n"
 "?                   - trแปฃ giรบp dร nh cho chแปn bแบฑng cรกch nhแบฏc"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Lแป‡nh ***"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Giแป thรฌ sao"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Cรณ muแป‘n gแปก bแป (cรกc) mแปฅc sau ฤ‘รขy khรดng:"
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Khรดng cรฒn tแบญp-tin nร o ฤ‘แปƒ dแปn dแบนp, ฤ‘ang thoรกt ra."
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "khรดng hiแปƒn thแป‹ tรชn cแปงa cรกc tแบญp tin ฤ‘รฃ gแปก bแป"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr "รฉp buแป™c"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "dแปn bแบฑng kiแปƒu tฦฐฦกng tรกc"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "gแปก bแป toร n bแป™ thฦฐ mแปฅc"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "mแบซu"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "thรชm <mแบซu> vร o trong qui tแบฏc bแป qua"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "ฤ‘แป“ng thแปi gแปก bแป cแบฃ cรกc tแบญp tin bแป‹ bแป qua"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "chแป‰ gแปก bแป nhแปฏng tแบญp tin bแป‹ bแป qua"
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x vร  -X khรดng thแปƒ dรนng cรนng nhau"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -10887,7 +11858,7 @@ msgstr ""
 "clean.requireForce ฤ‘ฦฐแปฃc ฤ‘แบทt thร nh true vร  khรดng ฤ‘ฦฐa ra tรนy chแปn -i, -n mร  "
 "cลฉng khรดng -f; tแปซ chแป‘i lแป‡nh dแปn dแบนp (clean)"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -10895,7 +11866,7 @@ msgstr ""
 "clean.requireForce mแบทc ฤ‘แป‹nh ฤ‘ฦฐแปฃc ฤ‘แบทt lร  true vร  khรดng ฤ‘ฦฐa ra tรนy chแปn -i, -n "
 "mร  cลฉng khรดng -f; tแปซ chแป‘i lแป‡nh dแปn dแบนp (clean)"
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<cรกc tรนy chแปn>] [--] <kho> [<t.mแปฅc>]"
 
@@ -10943,18 +11914,18 @@ msgstr "thฦฐ-mแปฅc-mแบซu"
 msgid "directory from which templates will be used"
 msgstr "thฦฐ mแปฅc mร  tแบกi ฤ‘รณ cรกc mแบซu sแบฝ ฤ‘ฦฐแปฃc dรนng"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr "kho tham chiแบฟu"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr "chแป‰ dรนng --reference khi nhรขn bแบฃn"
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
 msgid "name"
 msgstr "tรชn"
 
@@ -10970,8 +11941,8 @@ msgstr "lแบฅy ra <nhรกnh> thay cho HEAD cแปงa mรกy chแปง"
 msgid "path to git-upload-pack on the remote"
 msgstr "ฤ‘ฦฐแปng dแบซn ฤ‘แบฟn git-upload-pack trรชn mรกy chแปง"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
 msgid "depth"
 msgstr "ฤ‘แป™-sรขu"
 
@@ -10979,7 +11950,7 @@ msgstr "ฤ‘แป™-sรขu"
 msgid "create a shallow clone of that depth"
 msgstr "tแบกo bแบฃn sao khรดng ฤ‘แบงy ฤ‘แปง cho mแปฉc sรขu ฤ‘รฃ cho"
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
 msgid "time"
 msgstr "thแปi-gian"
 
@@ -10987,16 +11958,17 @@ msgstr "thแปi-gian"
 msgid "create a shallow clone since a specific time"
 msgstr "tแบกo bแบฃn sao khรดng ฤ‘แบงy ฤ‘แปง tแปซ thแปi ฤ‘iแปƒm ฤ‘รฃ cho"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
 msgid "revision"
 msgstr "ฤ‘iแปƒm xรฉt duyแป‡t"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "lร m sรขu hฦกn lแป‹ch sแปญ cแปงa bแบฃn sao shallow, bแบฑng ฤ‘iแปƒm xรฉt duyแป‡t loแบกi trแปซ"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr "chแป‰ nhรขn bแบฃn mแป™t nhรกnh, HEAD hoแบทc --branch"
 
@@ -11026,23 +11998,23 @@ msgstr "khรณa=giรก_trแป‹"
 msgid "set config inside the new repository"
 msgstr "ฤ‘แบทt cแบฅu hรฌnh bรชn trong mแป™t kho chแปฉa mแป›i"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "ฤ‘แบทc-tแบฃ-mรกy-phแปฅc-vแปฅ"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "tรนy chแปn ฤ‘แปƒ chuyแปƒn giao"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr "chแป‰ dรนng ฤ‘แป‹a chแป‰ IPv4"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr "chแป‰ dรนng ฤ‘แป‹a chแป‰ IPv6"
 
@@ -11050,7 +12022,11 @@ msgstr "chแป‰ dรนng ฤ‘แป‹a chแป‰ IPv6"
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "mแปi mรด-ฤ‘un-con nhรขn bแบฃn sแบฝ dung nhรกnh theo dรตi mรกy chแปง cแปงa chรบng"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr "khแปŸi tแบกo tแบญp tin sparse-checkout ฤ‘แปƒ bao gแป“m chแป‰ cรกc tแบญp tin แปŸ gแป‘c"
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11058,47 +12034,42 @@ msgstr ""
 "Khรดng ฤ‘oรกn ฤ‘ฦฐแปฃc thฦฐ mแปฅc tรชn lร  gรฌ.\n"
 "Vui lรฒng chแป‰ ฤ‘แป‹nh tรชn mแป™t thฦฐ mแปฅc trรชn dรฒng lแป‡nh"
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "thรดng tin: khรดng thแปƒ thรชm thay thแบฟ cho โ€œ%sโ€: %s\n"
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s cรณ tแป“n tแบกi nhฦฐng lแบกi khรดng phแบฃi lร  mแป™t thฦฐ mแปฅc"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "gแบทp lแป—i khi bแบฏt ฤ‘แบงu lแบทp qua โ€œ%sโ€"
 
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "gแบทp lแป—i khi bแป liรชn kแบฟt (unlink) โ€œ%sโ€"
-
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "gแบทp lแป—i khi tแบกo ฤ‘ฦฐแปฃc liรชn kแบฟt mแปm %s"
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "gแบทp lแป—i khi sao chรฉp tแบญp tin vร  โ€œ%sโ€"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "gแบทp lแป—i khi lแบทp qua โ€œ%sโ€"
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr "hoร n tแบฅt.\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11108,95 +12079,99 @@ msgstr ""
 "Bแบกn kiแปƒm tra kแปน xem cรกi gรฌ ฤ‘ฦฐแปฃc lแบฅy ra bแบฑng lแป‡nh โ€œgit statusโ€\n"
 "vร  thแปญ lแบฅy ra vแป›i lแป‡nh 'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Khรดng tรฌm thแบฅy nhรกnh mรกy chแปง %s ฤ‘แปƒ nhรขn bแบฃn (clone)."
 
-#: builtin/clone.c:702
+#: builtin/clone.c:705
 #, c-format
 msgid "unable to update %s"
 msgstr "khรดng thแปƒ cแบญp nhแบญt %s"
 
-#: builtin/clone.c:752
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "gแบทp lแป—i khi khแปŸi tแบกo sparse-checkout"
+
+#: builtin/clone.c:776
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "refers HEAD mรกy chแปง  chแป‰ ฤ‘แบฟn ref khรดng tแป“n tแบกi, khรดng thแปƒ lแบฅy ra.\n"
 
-#: builtin/clone.c:783
+#: builtin/clone.c:807
 msgid "unable to checkout working tree"
 msgstr "khรดng thแปƒ lแบฅy ra (checkout) cรขy lร m viแป‡c"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:862
 msgid "unable to write parameters to config file"
 msgstr "khรดng thแปƒ ghi cรกc tham sแป‘ vร o tแบญp tin cแบฅu hรฌnh"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:925
 msgid "cannot repack to clean up"
 msgstr "khรดng thแปƒ ฤ‘รณng gรณi ฤ‘แปƒ dแปn dแบนp"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:927
 msgid "cannot unlink temporary alternates file"
 msgstr "khรดng thแปƒ bแป liรชn kแบฟt tแบญp tin thay thแบฟ tแบกm thแปi"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
 msgid "Too many arguments."
 msgstr "Cรณ quรก nhiแปu ฤ‘แป‘i sแป‘."
 
-#: builtin/clone.c:942
+#: builtin/clone.c:969
 msgid "You must specify a repository to clone."
 msgstr "Bแบกn phแบฃi chแป‰ ฤ‘แป‹nh mแป™t kho ฤ‘แปƒ mร  nhรขn bแบฃn (clone)."
 
-#: builtin/clone.c:955
+#: builtin/clone.c:982
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "tรนy chแปn --bare vร  --origin %s xung khแบฏc nhau."
 
-#: builtin/clone.c:958
+#: builtin/clone.c:985
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "tรนy chแปn --bare vร  --separate-git-dir xung khแบฏc nhau."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:998
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "kho chแปฉa โ€œ%sโ€ chฦฐa tแป“n tแบกi"
 
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:1004 builtin/fetch.c:1796
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "ฤ‘แป™ sรขu %s khรดng phแบฃi lร  mแป™t sแป‘ nguyรชn dฦฐฦกng"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1014
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "ฤ‘ฦฐแปng dแบซn ฤ‘รญch โ€œ%sโ€ ฤ‘รฃ cรณ tแปซ trฦฐแป›c vร  khรดng phแบฃi lร  mแป™t thฦฐ mแปฅc rแป—ng."
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1024
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "cรขy lร m viแป‡c โ€œ%sโ€ ฤ‘รฃ sแบตn tแป“n tแบกi rแป“i."
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "khรดng thแปƒ tแบกo cรกc thฦฐ mแปฅc dแบซn ฤ‘แบงu cแปงa โ€œ%sโ€"
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1044
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "khรดng thแปƒ tแบกo cรขy thฦฐ mแปฅc lร m viแป‡c dir โ€œ%sโ€"
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1064
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "ฤang nhรขn bแบฃn thร nh kho chแปฉa bare โ€œ%sโ€โ€ฆ\n"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1066
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "ฤang nhรขn bแบฃn thร nh โ€œ%sโ€โ€ฆ\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1090
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11204,41 +12179,41 @@ msgstr ""
 "nhรขn bแบฃn --recursive khรดng tฦฐฦกng thรญch vแป›i cแบฃ hai --reference vร  --reference-"
 "if-able"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1154
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth bแป‹ lแป ฤ‘i khi nhรขn bแบฃn nแป™i bแป™; hรฃy sแปญ dแปฅng file:// ฤ‘แปƒ thay thแบฟ."
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1156
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since bแป‹ lแป ฤ‘i khi nhรขn bแบฃn nแป™i bแป™; hรฃy sแปญ dแปฅng file:// ฤ‘แปƒ thay "
 "thแบฟ."
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1158
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude bแป‹ lแป ฤ‘i khi nhรขn bแบฃn nแป™i bแป™; hรฃy sแปญ dแปฅng file:// ฤ‘แปƒ thay "
 "thแบฟ."
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1160
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "--filter bแป‹ lแป ฤ‘i khi nhรขn bแบฃn nแป™i bแป™; hรฃy sแปญ dแปฅng file:// ฤ‘แปƒ thay thแบฟ."
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1163
 msgid "source repository is shallow, ignoring --local"
 msgstr "kho nguแป“n lร  nรดng, nรชn bแป qua --local"
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1168
 msgid "--local is ignored"
 msgstr "--local bแป‹ lแป ฤ‘i"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1243 builtin/clone.c:1251
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Nhรกnh mรกy chแปง %s khรดng tรฌm thแบฅy trong thฦฐแปฃng nguแป“n %s"
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1254
 msgid "You appear to have cloned an empty repository."
 msgstr "Bแบกn hรฌnh nhฦฐ lร  ฤ‘รฃ nhรขn bแบฃn mแป™t kho trแป‘ng rแป—ng."
 
@@ -11287,7 +12262,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "cha mแบน bแป‹ trรนng lแบทp %s ฤ‘รฃ bแป‹ bแป qua"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, c-format
 msgid "not a valid object name %s"
 msgstr "khรดng phแบฃi lร  tรชn ฤ‘แป‘i tฦฐแปฃng hแปฃp lแป‡ โ€œ%sโ€"
@@ -11315,13 +12290,13 @@ msgstr "cha-mแบน"
 msgid "id of a parent commit object"
 msgstr "mรฃ sแป‘ cแปงa ฤ‘แป‘i tฦฐแปฃng chuyแปƒn giao cha mแบน"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
 #: builtin/tag.c:412
 msgid "message"
 msgstr "chรบ thรญch"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
 msgid "commit message"
 msgstr "chรบ thรญch cแปงa lแบงn chuyแปƒn giao"
 
@@ -11329,8 +12304,8 @@ msgstr "chรบ thรญch cแปงa lแบงn chuyแปƒn giao"
 msgid "read commit log message from file"
 msgstr "ฤ‘แปc chรบ thรญch nhแบญt kรฝ lแบงn chuyแปƒn giao tแปซ tแบญp tin"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "Kรฝ lแบงn chuyแปƒn giao dรนng GPG"
 
@@ -11408,59 +12383,67 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "gแบทp lแป—i khi thรกo dแปก HEAD ฤ‘แป‘i tฦฐแปฃng cรขy"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file vแป›i -a lร  khรดng cรณ รฝ nghฤฉa gรฌ"
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "Khรดng ฤ‘ฦฐแปng dแบซn vแป›i cรกc tรนy chแปn --include/--only khรดng hแปฃp lรฝ."
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr "khรดng thแปƒ tแบกo bแบฃng mแปฅc lแปฅc tแบกm thแปi"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:385
 msgid "interactive add failed"
 msgstr "gแบทp lแป—i khi thรชm bแบฑng cรกch tฦฐฦกng"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:400
 msgid "unable to update temporary index"
 msgstr "khรดng thแปƒ cแบญp nhแบญt bแบฃng mแปฅc lแปฅc tแบกm thแปi"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:402
 msgid "Failed to update main cache tree"
 msgstr "Gแบทp lแป—i khi cแบญp nhแบญt cรขy bแป™ nhแป› ฤ‘แป‡m"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
 msgid "unable to write new_index file"
 msgstr "khรดng thแปƒ ghi tแบญp tin lฦฐu bแบฃng mแปฅc lแปฅc mแป›i (new_index)"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:479
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 "khรดng thแปƒ thแปฑc hiแป‡n viแป‡c chuyแปƒn giao cแปฅc bแป™ trong khi ฤ‘ang ฤ‘ฦฐแปฃc hรฒa trแป™n."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:481
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 "khรดng thแปƒ thแปฑc hiแป‡n viแป‡c chuyแปƒn giao bแป™ phแบญn trong khi ฤ‘ang cherry-pick."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:489
 msgid "cannot read the index"
 msgstr "khรดng ฤ‘แปc ฤ‘ฦฐแปฃc bแบฃng mแปฅc lแปฅc"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:508
 msgid "unable to write temporary index file"
 msgstr "khรดng thแปƒ ghi tแบญp tin lฦฐu bแบฃng mแปฅc lแปฅc tแบกm thแปi"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:606
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "lแบงn chuyแปƒn giao โ€œ%sโ€ thiแบฟu phแบงn tรกc giแบฃ แปŸ ฤ‘แบงu"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:608
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "lแบงn chuyแปƒn giao โ€œ%sโ€ cรณ phแบงn tรกc giแบฃ แปŸ ฤ‘แบงu dแป‹ dแบกng"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:627
 msgid "malformed --author parameter"
 msgstr "ฤ‘แป‘i sแป‘ cho --author bแป‹ dแป‹ hรฌnh"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:680
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11468,38 +12451,38 @@ msgstr ""
 "khรดng thแปƒ chแปn mแป™t kรฝ tแปฑ ghi chรบ cรกi mร  khรดng ฤ‘ฦฐแปฃc dรนng\n"
 "trong phแบงn ghi chรบ hiแป‡n tแบกi"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "khรดng thแปƒ tรฌm kiแบฟm commit (lแบงn chuyแปƒn giao) %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(ฤ‘ang ฤ‘แปc thรดng ฤ‘iแป‡p nhแบญt kรฝ tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:732
 msgid "could not read log from standard input"
 msgstr "khรดng thแปƒ ฤ‘แปc nhแบญt kรฝ tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:736
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "khรดng ฤ‘แปc ฤ‘ฦฐแปฃc tแป‡p nhแบญt kรฝ โ€œ%sโ€"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:767 builtin/commit.c:783
 msgid "could not read SQUASH_MSG"
 msgstr "khรดng thแปƒ ฤ‘แปc SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:774
 msgid "could not read MERGE_MSG"
 msgstr "khรดng thแปƒ ฤ‘แปc MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:834
 msgid "could not write commit template"
 msgstr "khรดng thแปƒ ghi mแบซu chuyแปƒn giao"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:853
 #, c-format
 msgid ""
 "\n"
@@ -11514,7 +12497,7 @@ msgstr ""
 "\t%s\n"
 "vร  thแปญ lแบกi.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:858
 #, c-format
 msgid ""
 "\n"
@@ -11529,7 +12512,7 @@ msgstr ""
 "\t%s\n"
 "vร  thแปญ lแบกi.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:871
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11540,7 +12523,7 @@ msgstr ""
 "bแบฏt ฤ‘แบงu bแบฑng โ€œ%cโ€ sแบฝ ฤ‘ฦฐแปฃc bแป qua, nแบฟu phแบงn chรบ thรญch rแป—ng sแบฝ hแปงy bแป lแบงn "
 "chuyแปƒn giao.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:879
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11552,152 +12535,148 @@ msgstr ""
 "bแบฏt ฤ‘แบงu bแบฑng โ€œ%cโ€ sแบฝ ฤ‘ฦฐแปฃc bแป qua; bแบกn cรณ thแปƒ xรณa chรบng ฤ‘i nแบฟu muแป‘n thแบฟ.\n"
 "Phแบงn chรบ thรญch nร y nแบฟu trแป‘ng rแป—ng sแบฝ hแปงy bแป lแบงn chuyแปƒn giao.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:896
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sTรกc giแบฃ:           %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:904
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sNgร y thรกng:        %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:911
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sNgฦฐแปi chuyแปƒn giao: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:929
 msgid "Cannot read index"
 msgstr "Khรดng ฤ‘แปc ฤ‘ฦฐแปฃc bแบฃng mแปฅc lแปฅc"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "Gแบทp lแป—i khi xรขy dแปฑng cรขy"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Xin hรฃy cung cแบฅp lแปi chรบ giแบฃi hoแบทc lร  dรนng tรนy chแปn -m hoแบทc lร  -F.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author โ€œ%sโ€ khรดng phแบฃi lร  โ€œHแป vร  tรชn <thฦฐ ฤ‘iแป‡n tแปญl>โ€ vร  khรดng khแป›p bแบฅt kแปณ "
 "tรกc giแบฃ nร o sแบตn cรณ"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Chแบฟ ฤ‘แป™ bแป qua khรดng hแปฃp lแป‡ โ€œ%sโ€"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1327
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Chแบฟ ฤ‘แป™ cho cรกc tแบญp tin chฦฐa ฤ‘ฦฐแปฃc theo dรตi khรดng hแปฃp lแป‡ โ€œ%sโ€"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "hai tรนy chแปn -long vร  -z khรดng tฦฐฦกng thรญch vแป›i nhau"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Sแปญ dแปฅng cแบฃ hai tรนy chแปn --reset-author vร  --author khรดng hแปฃp lรฝ"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "Khรดng cรณ gรฌ ฤ‘แปƒ mร  โ€œtu bแป•โ€ cแบฃ."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 "Bแบกn ฤ‘ang แปŸ giแปฏa cแปงa quรก trรฌnh hรฒa trแป™n -- khรดng thแปƒ thแปฑc hiแป‡n viแป‡c โ€œtu bแป•โ€."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 "Bแบกn ฤ‘ang แปŸ giแปฏa cแปงa quรก trรฌnh cherry-pick -- khรดng thแปƒ thแปฑc hiแป‡n viแป‡c โ€œtu "
 "bแป•โ€."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1188
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Cรกc tรนy chแปn --squash vร  --fixup khรดng thแปƒ sแปญ dแปฅng cรนng vแป›i nhau"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1198
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Chแป‰ ฤ‘ฦฐแปฃc dรนng mแป™t trong sแป‘ tรนy chแปn trong sแป‘ -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1200
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "Tรนy chแปn -m khรดng thแปƒ ฤ‘ฦฐแปฃc tแป• hแปฃp cรนng vแป›i -c/-C/-F."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1208
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "--reset-author chแป‰ cรณ thแปƒ ฤ‘ฦฐแปฃc sแปญ dแปฅng vแป›i tรนy chแปn -C, -c hay --amend."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1225
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Chแป‰ mแป™t trong cรกc tรนy chแปn --include/--only/--all/--interactive/--patch ฤ‘ฦฐแปฃc "
 "sแปญ dแปฅng."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "Khรดng ฤ‘ฦฐแปng dแบซn vแป›i cรกc tรนy chแปn --include/--only khรดng hแปฃp lรฝ."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1231
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "cรกc ฤ‘ฦฐแปng dแบซn โ€œ%s โ€ฆโ€ vแป›i tรนy chแปn -a khรดng hแปฃp lรฝ"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1362 builtin/commit.c:1524
 msgid "show status concisely"
 msgstr "hiแปƒn thแป‹ trแบกng thรกi แปŸ dแบกng sรบc tรญch"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1364 builtin/commit.c:1526
 msgid "show branch information"
 msgstr "hiแปƒn thแป‹ thรดng tin nhรกnh"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1366
 msgid "show stash information"
 msgstr "hiแปƒn thแป‹ thรดng tin vแป tแบกm cแบฅt"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1368 builtin/commit.c:1528
 msgid "compute full ahead/behind values"
 msgstr "tรญnh ฤ‘แบงy ฤ‘แปง giรก trแป‹ trฦฐแป›c/sau"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1370
 msgid "version"
 msgstr "phiรชn bแบฃn"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
 msgid "machine-readable output"
 msgstr "kแบฟt xuแบฅt dแบกng mรกy-cรณ-thแปƒ-ฤ‘แปc"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1373 builtin/commit.c:1532
 msgid "show status in long format (default)"
 msgstr "hiแปƒn thแป‹ trแบกng thรกi แปŸ ฤ‘แป‹nh dแบกng dร i (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1376 builtin/commit.c:1535
 msgid "terminate entries with NUL"
 msgstr "chแบฅm dแปฉt cรกc mแปฅc bแบฑng NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
 msgid "mode"
 msgstr "chแบฟ ฤ‘แป™"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1379 builtin/commit.c:1538
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "hiแปƒn thแป‹ cรกc tแบญp tin chฦฐa ฤ‘ฦฐแปฃc theo dรตi  dแบฅu vแบฟt, cรกc chแบฟ ฤ‘แป™ tรนy chแปn:  all, "
 "normal, no. (Mแบทc ฤ‘แป‹nh: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1383
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11705,11 +12684,11 @@ msgstr ""
 "hiแปƒn thแป‹ cรกc tแบญp tin bแป‹ bแป qua, cรกc chแบฟ ฤ‘แป™ tรนy chแปn: traditional, matching, "
 "no. (Mแบทc ฤ‘แป‹nh: traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1385 parse-options.h:192
 msgid "when"
 msgstr "khi"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1386
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11717,176 +12696,176 @@ msgstr ""
 "bแป qua cรกc thay ฤ‘แป•i trong mรด-ฤ‘un-con, tรนy chแปn khi: all, dirty, untracked. "
 "(Mแบทc ฤ‘แป‹nh: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1388
 msgid "list untracked files in columns"
 msgstr "hiแปƒn thแป‹ danh sรกch cรกc tแบญp-tin chฦฐa ฤ‘ฦฐแปฃc theo dรตi trong cรกc cแป™t"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1389
 msgid "do not detect renames"
 msgstr "khรดng dรฒ tรฌm cรกc tรชn thay ฤ‘แป•i"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1391
 msgid "detect renames, optionally set similarity index"
 msgstr "dรฒ cรกc tรชn thay ฤ‘แป•i, tรนy รฝ ฤ‘แบทt mแปฅc lแปฅc tฦฐฦกng tแปฑ"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1411
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Khรดng hแป— trแปก tแป• hแปฃp cรกc tham sแป‘ cรกc tแบญp tin bแป‹ bแป qua vร  khรดng ฤ‘ฦฐแปฃc theo dรตi"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "suppress summary after successful commit"
 msgstr "khรดng hiแปƒn thแป‹ tแป•ng kแบฟt sau khi chuyแปƒn giao thร nh cรดng"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1495
 msgid "show diff in commit message template"
 msgstr "hiแปƒn thแป‹ sแปฑ khรกc biแป‡t trong mแบซu tin nhแบฏn chuyแปƒn giao"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1497
 msgid "Commit message options"
 msgstr "Cรกc tรนy chแปn ghi chรบ commit"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
 msgid "read message from file"
 msgstr "ฤ‘แปc chรบ thรญch tแปซ tแบญp tin"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "author"
 msgstr "tรกc giแบฃ"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "override author for commit"
 msgstr "ghi ฤ‘รจ tรกc giแบฃ cho commit"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1500 builtin/gc.c:538
 msgid "date"
 msgstr "ngร y thรกng"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1500
 msgid "override date for commit"
 msgstr "ghi ฤ‘รจ ngร y thรกng cho lแบงn chuyแปƒn giao"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "lแบงn_chuyแปƒn_giao"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1502
 msgid "reuse and edit message from specified commit"
 msgstr "dรนng lแบกi cรกc ghi chรบ tแปซ lแบงn chuyแปƒn giao ฤ‘รฃ cho nhฦฐng cรณ cho sแปญa chแปฏa"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1503
 msgid "reuse message from specified commit"
 msgstr "dรนng lแบกi cรกc ghi chรบ tแปซ lแบงn chuyแปƒn giao ฤ‘รฃ cho"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1504
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "dรนng ghi chรบ cรณ ฤ‘แป‹nh dแบกng autosquash ฤ‘แปƒ sแปญa chแปฏa lแบงn chuyแปƒn giao ฤ‘รฃ chแป‰ ra"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1505
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "dรนng lแปi nhแบฏn cรณ ฤ‘แป‹nh dแบกng tแปฑ ฤ‘แป™ng nรฉn ฤ‘แปƒ nรฉn lแบกi cรกc lแบงn chuyแปƒn giao ฤ‘รฃ chแป‰ "
 "ra"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1506
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "lแบงn chuyแปƒn giao nhแบญn tรดi lร  tรกc giแบฃ (ฤ‘ฦฐแปฃc dรนng vแป›i tรนy chแปn -C/-c/--amend)"
 
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "(nรชn dรนng) thรชm dรฒng Signed-off-by:"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1508
 msgid "use specified template file"
 msgstr "sแปญ dแปฅng tแบญp tin mแบซu ฤ‘รฃ cho"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1509
 msgid "force edit of commit"
 msgstr "รฉp buแป™c sแปญa lแบงn commit"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1511
 msgid "include status in commit message template"
 msgstr "bao gแป“m cรกc trแบกng thรกi trong mแบซu ghi chรบ chuyแปƒn giao"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1516
 msgid "Commit contents options"
 msgstr "Cรกc tรนy nแป™i dung ghi chรบ commit"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1517
 msgid "commit all changed files"
 msgstr "chuyแปƒn giao tแบฅt cแบฃ cรกc tแบญp tin cรณ thay ฤ‘แป•i"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1518
 msgid "add specified files to index for commit"
 msgstr "thรชm cรกc tแบญp tin ฤ‘รฃ chแป‰ ra vร o bแบฃng mแปฅc lแปฅc ฤ‘แปƒ chuyแปƒn giao"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1519
 msgid "interactively add files"
 msgstr "thรชm cรกc tแบญp-tin bแบฑng tฦฐฦกng tรกc"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1520
 msgid "interactively add changes"
 msgstr "thรชm cรกc thay ฤ‘แป•i bแบฑng tฦฐฦกng tรกc"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1521
 msgid "commit only specified files"
 msgstr "chแป‰ chuyแปƒn giao cรกc tแบญp tin ฤ‘รฃ chแป‰ ra"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1522
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "vรฒng qua mรณc (hook) pre-commit vร  commit-msg"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1523
 msgid "show what would be committed"
 msgstr "hiแปƒn thแป‹ xem cรกi gรฌ cรณ thแปƒ ฤ‘ฦฐแปฃc chuyแปƒn giao"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1536
 msgid "amend previous commit"
 msgstr "โ€œtu bแป•โ€ (amend) lแบงn commit trฦฐแป›c"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1537
 msgid "bypass post-rewrite hook"
 msgstr "vรฒng qua mรณc (hook) post-rewrite"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1544
 msgid "ok to record an empty change"
 msgstr "ok ฤ‘แปƒ ghi lแบกi mแป™t thay ฤ‘แป•i trแป‘ng rแป—ng"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1546
 msgid "ok to record a change with an empty message"
 msgstr "ok ฤ‘แปƒ ghi cรกc thay ฤ‘แป•i vแป›i lแปi nhแบฏn trแป‘ng rแป—ng"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1619
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Tแบญp tin MERGE_HEAD sai hแปng (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
 msgid "could not read MERGE_MODE"
 msgstr "khรดng thแปƒ ฤ‘แปc MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1645
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "khรดng thแปƒ ฤ‘แปc phแบงn chรบ thรญch (message) cแปงa lแบงn chuyแปƒn giao: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Bรฃi bแป viแป‡c chuyแปƒn giao bแปŸi vรฌ phแบงn chรบ thรญch cแปงa nรณ trแป‘ng rแป—ng.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 "ฤang bแป qua viแป‡c chuyแปƒn giao; bแบกn ฤ‘รฃ khรดng biรชn soแบกn phแบงn chรบ thรญch "
 "(message).\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1691
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -11897,84 +12876,83 @@ msgstr ""
 "cรณ bแป‹ ฤ‘แบงy quรก hay quota (hแบกn nghแบกch ฤ‘ฤฉa cแปฉng) bแป‹ vฦฐแปฃt quรก,\n"
 "vร  sau ฤ‘รณ \"git restore --staged :/\" ฤ‘แปƒ khแบฏc phแปฅc."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
-"git commit-graph verify [--object-dir </thฦฐ/mแปฅc/ฤ‘แป‘i/tฦฐแปฃng>] [--shallow]"
+"git commit-graph verify [--object-dir </thฦฐ/mแปฅc/ฤ‘แป‘i/tฦฐแปฃng>] [--shallow] [--"
+"[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
 msgstr ""
 "git commit-graph write [--object-dir </thฦฐ/mแปฅc/ฤ‘แป‘i/tฦฐแปฃng>] [--append|--"
-"split] [--reachable|--stdin-packs|--stdin-commits] <cรกc tรนy chแปn chia tรกch>"
+"split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <cรกc "
+"tรนy chแปn chia tรกch>"
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "khรดng thแปƒ tรฌm thแบฅy thฦฐ mแปฅc ฤ‘แป‘i tฦฐแปฃng khแป›p vแป›i โ€œ%sโ€"
+
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr "tmแปฅc"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
 msgid "The object directory to store the graph"
 msgstr "Thฦฐ mแปฅc ฤ‘แป‘i tฦฐแปฃng ฤ‘แปƒ lฦฐu ฤ‘แป“ thแป‹"
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:71
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 "nแบฟu ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao bแป‹ chia cแบฏt, thรฌ chแป‰ thแบฉm tra tแบญp tin ฤ‘แป‰nh"
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Khรดng thแปƒ mแปŸ ฤ‘แป“ thแป‹ chuyแปƒn giao โ€œ%sโ€"
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:128
 msgid "start walk at all refs"
 msgstr "bแบฏt ฤ‘แบงu di chuyแปƒn tแบกi mแปi tham chiแบฟu"
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:130
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 "quรฉt dรณ cรกc mแปฅc lแปฅc gรณi ฤ‘ฦฐแปฃc liแป‡t kรช bแปŸi ฤ‘แบงu vร o tiรชu chuแบฉn cho cรกc lแบงn "
 "chuyแปƒn giao"
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:132
 msgid "start walk at commits listed by stdin"
 msgstr ""
 "bแบฏt ฤ‘แบงu di chuyแปƒn tแบกi cรกc lแบงn chuyแปƒn giao ฤ‘ฦฐแปฃc liแป‡t kรช bแปŸi ฤ‘แบงu vร o tiรชu chuแบฉn"
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:134
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 "bao gแป“m mแปi lแบงn chuyแปƒn giao ฤ‘รฃ sแบตn cรณ trongฦฐแปi tแบญp tin ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-"
 "giao"
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:137
 msgid "allow writing an incremental commit-graph file"
 msgstr "cho phรฉp ghi mแป™t tแบญp tin ฤ‘แป“ hแปa cรกc lแบงn chuyแปƒn giao lแป›n lรชn"
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 "sแป‘ lฦฐแปฃng tแป‘i ฤ‘a cแปงa cรกc lแบงn chuyแปƒn giao trong mแป™t ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao "
 "chia cแบฏt khรดng-cฦก-sแปŸ"
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:141
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "tแปท lแป‡ tแป‘i ฤ‘a giแปฏa hai mแปฉc cแปงa mแป™t ฤ‘แป“-thแป‹-cรกc-lแบงn-chuyแปƒn-giao chia cแบฏt"
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:159
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 "khรดng thแปƒ sแปญ dแปฅng hฦกn mแป™t --reachable, --stdin-commits, hay --stdin-packs"
@@ -11983,207 +12961,213 @@ msgstr ""
 msgid "git config [<options>]"
 msgstr "git config [<cรกc tรนy chแปn>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "ฤ‘แป‘i sแป‘ khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn --type, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:116
 msgid "only one type at a time"
 msgstr "chแป‰ mแป™t kiแปƒu mแป™t lแบงn"
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr "Vแป‹ trรญ tแบญp tin cแบฅu hรฌnh"
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr "dรนng tแบญp tin cแบฅu hรฌnh toร n cแปฅc"
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr "sแปญ dแปฅng tแบญp tin cแบฅu hรฌnh hแป‡ thแป‘ng"
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr "dรนng tแบญp tin cแบฅu hรฌnh cแปงa kho"
 
-#: builtin/config.c:128
+#: builtin/config.c:129
 msgid "use per-worktree config file"
 msgstr "dรนng tแบญp tin cแบฅu hรฌnh per-worktree"
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr "sแปญ dแปฅng tแบญp tin cแบฅu hรฌnh ฤ‘รฃ cho"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr "ฤ‘แปc cแบฅu hรฌnh tแปซ ฤ‘แป‘i tฦฐแปฃng blob ฤ‘รฃ cho"
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr "Hร nh ฤ‘แป™ng"
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr "lแบฅy giรก-trแป‹: tรชn [value-regex]"
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr "lแบฅy tแบฅt cแบฃ giรก-trแป‹: khรณa [value-regex]"
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "lแบฅy giรก trแป‹ cho regexp: name-regex [value-regex]"
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "lแบฅy ฤ‘แบทc tแบฃ giรก trแป‹ cho URL: phแบงn[.biแบฟn] URL"
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr "thay thแบฟ tแบฅt cแบฃ cรกc biแบฟn khแป›p mแบซu: tรชn giรก-trแป‹ [value_regex]"
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr "thรชm biแบฟn mแป›i: tรชn giรก-trแป‹"
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr "gแปก bแป biแบฟn: tรชn [value-regex]"
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr "gแปก bแป mแปi cรกi khแป›p: tรชn [value-regex]"
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr "ฤ‘แป•i tรชn phแบงn: tรชn-cลฉ tรชn-mแป›i"
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr "gแปก bแป phแบงn: tรชn"
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr "liแป‡t kรช tแบฅt"
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr "mแปŸ mแป™t trรฌnh biรชn soแบกn"
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr "tรฌm cแบฅu hรฌnh mร u sแบฏc: slot [mแบทc ฤ‘แป‹nh]"
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "tรฌm cรกc cร i ฤ‘แบทt vแป mร u sแบฏc: slot [stdout-lร -tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr "Kiแปƒu"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
 msgid "value is given this type"
 msgstr "giรก trแป‹ ฤ‘ฦฐแปฃc ฤ‘ฦฐa kiแปƒu nร y"
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr "giรก trแป‹ lร  \"true\" hoแบทc \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr "giรก trแป‹ แปŸ dแบกng sแป‘ thแบญp phรขn"
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr "giรก trแป‹ lร  --bool hoแบทc --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr "giรก trแป‹ lร  ฤ‘ฦฐแปng dแบซn (tรชn tแบญp tin hay thฦฐ mแปฅc)"
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr "giรก trแป‹ lร  mแป™t ngร y hแบฟt hแบกn"
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr "Khรกc"
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr "chแบฅm dแปฉt giรก trแป‹ vแป›i byte NUL"
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr "chแป‰ hiแปƒn thแป‹ cรกc tรชn biแบฟn"
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr "tรดn trแปng kแปƒ cร  cรกc hฦฐแป›ng trong tรฌm kiแบฟm"
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "hiแปƒn thแป‹ nguyรชn gแป‘c cแปงa cแบฅu hรฌnh (tแบญp tin, ฤ‘แบงu vร o tiรชu chuแบฉn, blob, dรฒng "
 "lแป‡nh)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"hiแปƒn thแป‹ phแบกm vi cแปงa cแบฅu hรฌnh (cรขy lร m viแป‡c, cแปฅc bแป™, toร n cแบงu, hแป‡ thแป‘ng, "
+"lแป‡nh)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
 msgid "value"
 msgstr "giรก trแป‹"
 
-#: builtin/config.c:158
+#: builtin/config.c:160
 msgid "with --get, use default value when missing entry"
 msgstr "vแป›i --get, dรนng giรก trแป‹ mแบทc ฤ‘แป‹nh khi thiแบฟu mแปฅc tin"
 
-#: builtin/config.c:172
+#: builtin/config.c:174
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "sai sแป‘ lฦฐแปฃng tham sแป‘, phแบฃi lร  %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:176
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "sai sแป‘ lฦฐแปฃng tham sแป‘, phแบฃi tแปซ %d ฤ‘แบฟn %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:324
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "mแบซu khรณa khรดng hแปฃp lแป‡: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:360
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "gแบทp lแป—i khi ฤ‘แป‹nh dแบกng giรก trแป‹ cแบฅu hรฌnh mแบทc ฤ‘แป‹nh: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:417
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "khรดng thแปƒ phรขn tรญch mร u โ€œ%sโ€"
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr "khรดng thแปƒ phรขn tรญch giรก trแป‹ mร u mแบทc ฤ‘แป‹nh"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
 msgid "not in a git directory"
 msgstr "khรดng trong thฦฐ mแปฅc git"
 
-#: builtin/config.c:499
+#: builtin/config.c:515
 msgid "writing to stdin is not supported"
 msgstr "viแป‡c ghi ra ฤ‘แบงu ra tiรชu chuแบฉn lร  khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ"
 
-#: builtin/config.c:502
+#: builtin/config.c:518
 msgid "writing config blobs is not supported"
 msgstr "khรดng hแป— trแปฃ ghi cแบฅu hรฌnh cรกc blob"
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12198,23 +13182,23 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:627
 msgid "only one config file at a time"
 msgstr "chแป‰ mแป™t tแบญp tin cแบฅu hรฌnh mแป™t lแบงn"
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr "--local chแป‰ cรณ thแปƒ ฤ‘ฦฐแปฃc dรนng bรชn trong mแป™t kho git"
 
-#: builtin/config.c:619
+#: builtin/config.c:635
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob chแป‰ cรณ thแปƒ ฤ‘ฦฐแปฃc dรนng bรชn trong mแป™t kho git"
 
-#: builtin/config.c:638
+#: builtin/config.c:655
 msgid "$HOME not set"
 msgstr "Chฦฐa ฤ‘แบทt biแบฟn mรดi trฦฐแปng HOME"
 
-#: builtin/config.c:658
+#: builtin/config.c:679
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12224,19 +13208,19 @@ msgstr ""
 "worktreeConfig ฤ‘ฦฐแปฃc bแบญt. Vui lรฒng ฤ‘แปc phแบงn \"CONFIGURATION FILE\"\n"
 "trong \"git help worktree\" ฤ‘แปƒ biแบฟt thรชm chi tiแบฟt"
 
-#: builtin/config.c:688
+#: builtin/config.c:714
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color vร  kiแปƒu biแบฟn lร  khรดng mแบกch lแบกc"
 
-#: builtin/config.c:693
+#: builtin/config.c:719
 msgid "only one action at a time"
 msgstr "chแป‰ mแป™t thao tรกc mแป—i lแบงn"
 
-#: builtin/config.c:706
+#: builtin/config.c:732
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only chแป‰ ฤ‘ฦฐแปฃc รกp dแปฅng cho --list hoแบทc --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:738
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -12244,33 +13228,33 @@ msgstr ""
 "--show-origin chแป‰ ฤ‘ฦฐแปฃc รกp dแปฅng cho --get, --get-all, --get-regexp, hoแบทc --"
 "list"
 
-#: builtin/config.c:718
+#: builtin/config.c:744
 msgid "--default is only applicable to --get"
 msgstr "--default chแป‰ ฤ‘ฦฐแปฃc รกp dแปฅng cho --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:757
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "khรดng thแปƒ ฤ‘แปc tแบญp tin cแบฅu hรฌnh โ€œ%sโ€"
 
-#: builtin/config.c:734
+#: builtin/config.c:760
 msgid "error processing config file(s)"
 msgstr "gแบทp lแป—i khi xแปญ lรฝ cรกc tแบญp tin cแบฅu hรฌnh"
 
-#: builtin/config.c:744
+#: builtin/config.c:770
 msgid "editing stdin is not supported"
 msgstr "sแปญa chแปฏa ฤ‘แบงu ra tiรชu chuแบฉn lร  khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ"
 
-#: builtin/config.c:746
+#: builtin/config.c:772
 msgid "editing blobs is not supported"
 msgstr "viแป‡c sแปญa chแปฏa cรกc blob lร  khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ"
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "khรดng thแปƒ tแบกo tแบญp tin cแบฅu hรฌnh โ€œ%sโ€"
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12279,7 +13263,7 @@ msgstr ""
 "khรดng thแปƒ ghi ฤ‘รจ nhiแปu giรก trแป‹ vแป›i mแป™t giรก trแป‹ ฤ‘ฦกn\n"
 "      Dรนng mแป™t biแปƒu thแปฉc chรญnh quy, --add hay --replace-all ฤ‘แปƒ thay ฤ‘แป•i %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
 #, c-format
 msgid "no such section: %s"
 msgstr "khรดng cรณ ฤ‘oแบกn: %s"
@@ -12292,57 +13276,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "hiแปƒn thแป‹ kรญch cแปก theo ฤ‘แป‹nh dแบกng dร nh cho ngฦฐแปi ฤ‘แปc"
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<cรกc tรนy chแปn>] <commit-ish>*"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<cรกc tรนy chแปn>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr "phรญa trฦฐแป›c"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr "hแบกng nhแบน"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr "cรณ diแป…n giแบฃi"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "thแบป ฤ‘รฃ ฤ‘ฦฐแปฃc ghi chรบ %s khรดng sแบตn ฤ‘แปƒ dรนng"
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "thแบป ฤ‘ฦฐแปฃc chรบ giแบฃi %s khรดng cรณ tรชn nhรบng"
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "thแบป โ€œ%sโ€ ฤ‘รฃ thแปฑc sแปฑ แปŸ ฤ‘รขy โ€œ%sโ€ rแป“i"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "khรดng cรณ thแบป nร o khแป›p chรญnh xรกc vแป›i โ€œ%sโ€"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "Khรดng cรณ tham chiแบฟu hay thแบป khแป›p ฤ‘รบng, ฤ‘ang tรฌm kiแบฟm mรด tแบฃ\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:394
 #, c-format
 msgid "finished search at %s\n"
 msgstr "viแป‡c tรฌm kiแบฟm ฤ‘รฃ kแบฟt thรบc tแบกi %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:421
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12351,7 +13335,7 @@ msgstr ""
 "Khรดng cรณ thแบป ฤ‘ฦฐแปฃc chรบ giแบฃi nร o ฤ‘ฦฐแปฃc mรด tแบฃ lร  โ€œ%sโ€.\n"
 "Tuy nhiรชn, แปŸ ฤ‘รขy cรณ nhแปฏng thแบป khรดng ฤ‘ฦฐแปฃc chรบ giแบฃi: hรฃy thแปญ --tags."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:425
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12360,12 +13344,12 @@ msgstr ""
 "Khรดng cรณ thแบป cรณ thแปƒ mรด tแบฃ โ€œ%sโ€.\n"
 "Hรฃy thแปญ --always, hoแบทc tแบกo mแป™t sแป‘ thแบป."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:455
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "ฤ‘รฃ xuyรชn %lu qua lแบงn chuyแปƒn giao\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:458
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12374,90 +13358,90 @@ msgstr ""
 "tรฌm thแบฅy nhiแปu hฦกn %i thแบป; ฤ‘รฃ liแป‡t kรช %i cรกi gแบงn\n"
 "ฤ‘รขy nhแบฅt bแป ฤ‘i tรฌm kiแบฟm tแบกi %s\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:526
 #, c-format
 msgid "describe %s\n"
 msgstr "mรด tแบฃ %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:529
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Khรดng phแบฃi tรชn ฤ‘แป‘i tฦฐแปฃng %s hแปฃp lแป‡"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:537
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s khรดng phแบฃi lร  mแป™t lแบงn commit cลฉng khรดng phแบฃi blob"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:551
 msgid "find the tag that comes after the commit"
 msgstr "tรฌm cรกc thแบป mร  nรณ ฤ‘แบฟn trฦฐแป›c lแบงn chuyแปƒn giao"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:552
 msgid "debug search strategy on stderr"
 msgstr "chiแบฟn lฦฐแปฃc tรฌm kiแบฟm gแปก lแป—i trรชn ฤ‘แบงu ra lแป—i chuแบฉn stderr"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:553
 msgid "use any ref"
 msgstr "dรนng ref bแบฅt kแปณ"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:554
 msgid "use any tag, even unannotated"
 msgstr "dรนng thแบป bแบฅt kแปณ, cแบฃ khi โ€œunannotatedโ€"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:555
 msgid "always use long format"
 msgstr "luรดn dรนng ฤ‘แป‹nh dแบกng dร i"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:556
 msgid "only follow first parent"
 msgstr "chแป‰ theo cha mแบน ฤ‘แบงu tiรชn"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:559
 msgid "only output exact matches"
 msgstr "chแป‰ xuแบฅt nhแปฏng gรฌ khแป›p chรญnh xรกc"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:561
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "coi nhฦฐ <n> thแบป gแบงn ฤ‘รขy nhแบฅt (mแบทc ฤ‘แป‹nh: 10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:563
 msgid "only consider tags matching <pattern>"
 msgstr "chแป‰ cรขn nhแบฏc ฤ‘แบฟn nhแปฏng thแบป khแป›p vแป›i <mแบซu>"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:565
 msgid "do not consider tags matching <pattern>"
 msgstr "khรดng coi rแบฑng cรกc thแบป khแป›p vแป›i <mแบซu>"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:567 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "hiแปƒn thแป‹ ฤ‘แป‘i tฦฐแปฃng chuyแปƒn giao vแบฏn tแบฏt nhฦฐ lร  fallback"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:568 builtin/describe.c:571
 msgid "mark"
 msgstr "dแบฅu"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:569
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "thรชm <dแบฅu> trรชn cรขy thฦฐ mแปฅc lร m viแป‡c bแบฉn (mแบทc ฤ‘แป‹nh \"-dirty\")"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:572
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "thรชm <dแบฅu> trรชn cรขy thฦฐ mแปฅc lร m viแป‡c bแป‹ hแปng (mแบทc ฤ‘แป‹nh \"-broken\")"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:590
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long lร  xung khแบฏc vแป›i tรนy chแปn --abbrev=0"
 
-#: builtin/describe.c:603
+#: builtin/describe.c:619
 msgid "No names found, cannot describe anything."
 msgstr "Khรดng tรฌm thแบฅy cรกc tรชn, khรดng thแปƒ mรด tแบฃ gรฌ cแบฃ."
 
-#: builtin/describe.c:654
+#: builtin/describe.c:670
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty lร  xung khแบฏc vแป›i cรกc tรนy chแปn commit-ish"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:672
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken lร  xung khแบฏc vแป›i commit-ishes"
 
@@ -12496,27 +13480,27 @@ msgstr ""
 "git difftool [<cรกc tรนy chแปn>] [<lแบงn_chuyแปƒn_giao> [<lแบงn_chuyแปƒn_giao>]] [--] </"
 "ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "gแบทp lแป—i: %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "khรดng thแปƒ ฤ‘แปc liรชn kแบฟt mแปm %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "khรดng ฤ‘แปc ฤ‘ฦฐแปฃc tแบญp tin liรชn kแบฟt mแปm %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "khรดng thแปƒ ฤ‘แปc ฤ‘แป‘i tฦฐแปฃng %s cho liรชn kแบฟt mแปm %s"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -12524,53 +13508,53 @@ msgstr ""
 "cรกc ฤ‘แป‹nh dแบกng diff tแป• hแปฃp(โ€œ-cโ€ vร  โ€œ--ccโ€) chฦฐa ฤ‘ฦฐแปฃc hแป— trแปฃ trong\n"
 "chแบฟ ฤ‘แป™ diff thฦฐ mแปฅc(โ€œ-dโ€ vร  โ€œ--dir-diffโ€)."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "cแบฃ hai tแบญp tin ฤ‘รฃ bแป‹ sแปญa: โ€œ%sโ€ vร  โ€œ%sโ€."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr "cรขy lร m viแป‡c แปŸ bรชn trรกi."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "cรกc tแบญp tin tแบกm ฤ‘รฃ sแบตn cรณ trong โ€œ%sโ€."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr "bแบกn cรณ lแบฝ muแป‘n dแปn dแบนp hay phแปฅc hแป“i แปŸ ฤ‘รขy."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "dรนng โ€œdiff.guitoolโ€œ thay vรฌ dรนng โ€œdiff.toolโ€œ"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr "thแปฑc hiแป‡n mแป™t diff toร n thฦฐ mแปฅc"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr "ฤ‘แปซng nhแบฏc khi khแปŸi chแบกy cรดng cแปฅ diff"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "dรนng liรชn kแบฟt mแปm trong diff-thฦฐ-mแปฅc"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr "cรดng cแปฅ"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "dรนng cรดng cแปฅ diff ฤ‘รฃ cho"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "in ra danh sรกch cรกc cรดng cแปฅ dif cรกi mร  cรณ thแบป dรนng vแป›i โ€œ--toolโ€œ"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12578,31 +13562,31 @@ msgstr ""
 "lร m cho โ€œgit-difftoolโ€ thoรกt khi gแปi cรดng cแปฅ diff trแบฃ vแป mรฃ khรดng phแบฃi sแป‘ "
 "khรดng"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "chแป‰ ฤ‘แป‹nh mแป™t lแป‡nh tรนy รฝ ฤ‘แปƒ xem diff"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr "chuyแปƒn cho โ€œdiffโ€"
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool cแบงn cรขy lร m viแป‡c hoแบทc --no-index"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff xung khแบฏc vแป›i --no-index"
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool vร  --extcmd loแบกi tแปซ lแบซn nhau"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "chฦฐa ฤ‘ฦฐa ra <cรดng_cแปฅ> cho --tool=<cรดng_cแปฅ>"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "chฦฐa ฤ‘ฦฐa ra <lแป‡nh> cho --extcmd=<lแป‡nh>"
 
@@ -12641,160 +13625,184 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr "Lแป—i: khรดng thแปƒ xuแบฅt thแบป lแป“ng nhau trแปซ khi --mark-tags ฤ‘ฦฐแปฃc chแป‰ ฤ‘แป‹nh."
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr "hiแปƒn thแป‹ tiแบฟn triแปƒn sau <n> ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr "chแปn ฤ‘iแปu khiแปƒn cแปงa thแบป ฤ‘รฃ kรฝ"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr "chแปn sแปฑ xแปญ lรฝ cแปงa cรกc thแบป, cรกi mร  ฤ‘รกnh thแบป cรกc ฤ‘แป‘i tฦฐแปฃng ฤ‘ฦฐแปฃc lแปc ra"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "chแปn bแป™ xแปญ lรฝ cho cรกc ghi chรบ cแปงa lแบงn chuyแปƒn giao theo mแป™t bแป™ mรฃ thay thแบฟ"
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
 msgstr "ฤแป• cรกc ฤ‘รกnh dแบฅu nร y vร o tแบญp-tin"
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
 msgstr "Nhแบญp vร o ฤ‘รกnh dแบฅu tแปซ tแบญp tin nร y"
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "Nhแบญp vร o ฤ‘รกnh dแบฅu tแปซ tแบญp tin sแบตn cรณ"
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr "Lร m giแบฃ mแป™t cรกi thแบป khi thแบป bแป‹ thiแบฟu mแป™t cรกi"
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr "Xuแบฅt ra toร n bแป™ cรขy cho mแป—i lแบงn chuyแปƒn giao"
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr "Sแปญ dแปฅng tรญnh nฤƒng done ฤ‘แปƒ chแบฅm dแปฉt luแป“ng dแปฏ liแป‡u"
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr "Bแป qua kแบฟt xuแบฅt cแปงa dแปฏ liแป‡u blob"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr "refspec"
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr "รp dแปฅng refspec cho refs ฤ‘รฃ xuแบฅt"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr "kแบฟt xuแบฅt anonymize"
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 "Cรกc cha mแบน tham chiแบฟu cรกi mร  k trong luแป“ng dแปฏ liแป‡u fast-export bแปŸi mรฃ id ฤ‘แป‘i "
 "tฦฐแปฃng"
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
 msgstr "Hiแปƒn thแป‹ cรกc mรฃ id nguyรชn gแป‘c cแปงa blobs/commits"
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "Gแบฏn nhรฃn thแบป ID dแบฅu"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr "Khรดng thแปƒ chuyแปƒn qua cแบฃ hai --import-marks vร  --import-marks-if-exists"
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<cรกc tรนy chแปn>] [<kho-chแปฉa> [<refspec>โ€ฆ]]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<cรกc tรนy chแปn>] [<nhรณm>"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<cรกc tรนy chแปn>] [(<kho> | <nhรณm>)โ€ฆ]"
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<cรกc tรนy chแปn>]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel khรดng thแปƒ รขm"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
 msgid "fetch from all remotes"
 msgstr "lแบฅy vแป tแปซ tแบฅt cแบฃ cรกc mรกy chแปง"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "ฤ‘แบทt thฦฐแปฃng nguแป“n cho git pull/fetch"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "nแป‘i thรชm vร o .git/FETCH_HEAD thay vรฌ ghi ฤ‘รจ lรชn nรณ"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:190
 msgid "path to upload pack on remote end"
 msgstr "ฤ‘ฦฐแปng dแบซn ฤ‘แบฟn gรณi tแบฃi lรชn trรชn mรกy chแปง cuแป‘i"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr "รฉp buแป™c ghi ฤ‘รจ lรชn tham chiแบฟu nแป™i bแป™"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr "lแบฅy tแปซ nhiแปu mรกy chแปง cรนng lรบc"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:194
 msgid "fetch all tags and associated objects"
 msgstr "lแบฅy tแบฅt cแบฃ cรกc thแบป cรนng vแป›i cรกc ฤ‘แป‘i tฦฐแปฃng liรชn quan ฤ‘แบฟn nรณ"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr "khรดng lแบฅy tแบฅt cแบฃ cรกc thแบป (--no-tags)"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr "sแป‘ lฦฐแปฃng mรด-ฤ‘un-con ฤ‘ฦฐแปฃc lแบฅy ฤ‘แป“ng thแปi"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:197
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "cแบฏt cแปฅt (prune) cรกc nhรกnh โ€œremote-trackingโ€ khรดng cรฒn tแป“n tแบกi trรชn mรกy chแปง "
 "nแปฏa"
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "cแบฏt xรฉm cรกc thแบป nแป™i bแป™ khรดng cรฒn แปŸ mรกy chแปง vร  xรณa cรกc thแบป ฤ‘รฃ thay ฤ‘แป•i"
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
 msgid "on-demand"
 msgstr "khi-cแบงn"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr "ฤ‘iแปu khiแปƒn viแป‡c lแบฅy vแป ฤ‘แป‡ quy trong cรกc mรด-ฤ‘un-con"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:205
 msgid "keep downloaded pack"
 msgstr "giแปฏ lแบกi gรณi ฤ‘รฃ tแบฃi vแป"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr "cho phรฉp cแบญp nhแบญt th.chiแบฟu HEAD"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
 msgid "deepen history of shallow clone"
 msgstr "lร m sรขu hฦกn lแป‹ch sแปญ cแปงa bแบฃn sao"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr "lร m sรขu hฦกn lแป‹ch sแปญ cแปงa kho bแบฃn sao shallow dแปฑa trรชn thแปi gian"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:211
 msgid "convert to a complete repository"
 msgstr "chuyแปƒn ฤ‘แป•i hoร n toร n sang kho git"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr "soแบกn sแบตn cรกi nร y cho kแบฟt xuแบฅt ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -12802,91 +13810,95 @@ msgstr ""
 "mแบทc ฤ‘แป‹nh cho viแป‡c lแบฅy ฤ‘แป‡ quy cรกc mรด-ฤ‘un-con (cรณ mแปฉc ฦฐu tiรชn thแบฅp hฦกn cรกc tแบญp "
 "tin cแบฅu hรฌnh config)"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:214
 msgid "accept refs that update .git/shallow"
 msgstr "chแบฅp nhแบญn tham chiแบฟu cแบญp nhแบญt .git/shallow"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:216
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:217
 msgid "specify fetch refmap"
 msgstr "chแป‰ ra refmap cแบงn lแบฅy vแป"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 "bรกo cรกo rแบฑng chรบng ta chแป‰ cรณ cรกc ฤ‘แป‘i tฦฐแปฃng tiแบฟp cแบญn ฤ‘ฦฐแปฃc tแปซ ฤ‘แป‘i tฦฐแปฃng nร y"
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 msgid "run 'gc --auto' after fetching"
 msgstr "chแบกy 'gc --auto' sau khi lแบฅy vแป"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:226
 msgid "check for forced-updates on all updated branches"
 msgstr "kiแปƒm cho cรกc-cแบญp-nhแบญt-bแบฏt-buแป™c trรชn mแปi nhรกnh ฤ‘รฃ cแบญp nhแบญt"
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "ghi ra ฤ‘แป“ thแป‹ cรกc lแบงn chuyแปƒn giao sau khi lแบฅy vแป"
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr "Khรดng thแปƒ tรฌm thแบฅy mรกy chแปง cho tham chiแบฟu HEAD"
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "phแบงn cแบฅu hรฌnh fetch.output cรณ chแปฉa giรก-trแป‹ khรดng hแปฃp lแป‡ %s"
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr "khรดng tรฌm thแบฅy ฤ‘แป‘i tฦฐแปฃng %s"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr "[ฤ‘รฃ cแบญp nhแบญt]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr "[Bแป‹ tแปซ chแป‘i]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr "khรดng thแปƒ fetch (lแบฅy) vแป nhรกnh hiแป‡n hร nh"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr "[cแบญp nhแบญt thแบป]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr "khรดng thแปƒ cแบญp nhแบญt tham chiแบฟu nแป™i bแป™"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr "nรชn xรณa chแป“ng cรกc thแบป cรณ sแบตn"
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr "[thแบป mแป›i]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr "[nhรกnh mแป›i]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr "[ref (tham chiแบฟu) mแป›i]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr "cฦฐแปกng bแปฉc cแบญp nhแบญt"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr "khรดng-phแบฃi-chuyแปƒn-tiแบฟp-nhanh"
 
-#: builtin/fetch.c:854
+#: builtin/fetch.c:877
 msgid ""
 "Fetch normally indicates which branches had a forced update,\n"
 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -12896,7 +13908,7 @@ msgstr ""
 "nhฦฐng lแปฑa chแปn bแป‹ tแบฏt. ฤแปƒ kรญch hoแบกt lแบกi, sแปญ dแปฅng cแป\n"
 "'--show-forced-updates' hoแบทc chแบกy 'git config fetch.showForcedUpdates true'."
 
-#: builtin/fetch.c:858
+#: builtin/fetch.c:881
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -12909,22 +13921,22 @@ msgstr ""
 "false'\n"
 "ฤ‘แปƒ trรกnh kiแปƒm tra nร y.\n"
 
-#: builtin/fetch.c:888
+#: builtin/fetch.c:920
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s ฤ‘รฃ khรดng gแปญi tแบฅt cแบฃ cรกc ฤ‘แป‘i tฦฐแปฃng cแบงn thiแบฟt\n"
 
-#: builtin/fetch.c:909
+#: builtin/fetch.c:941
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "tแปซ chแป‘i %s bแปŸi vรฌ cรกc gแป‘c nรดng thรฌ khรดng ฤ‘ฦฐแปฃc phรฉp cแบญp nhแบญt"
 
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
 #, c-format
 msgid "From %.*s\n"
 msgstr "Tแปซ %.*s\n"
 
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1037
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -12933,60 +13945,81 @@ msgstr ""
 "mแป™t sแป‘ tham chiแบฟu nแป™i bแป™ khรดng thแปƒ ฤ‘ฦฐแปฃc cแบญp nhแบญt; hรฃy thแปญ chแบกy\n"
 " โ€œgit remote prune %sโ€ ฤ‘แปƒ bแป ฤ‘i nhแปฏng nhรกnh cลฉ, hay bแป‹ xung ฤ‘แป™t"
 
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1134
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sแบฝ trแปŸ thร nh khรดng ฤ‘แบงu (khรดng ฤ‘ฦฐแปฃc quแบฃn lรฝ))"
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1135
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s ฤ‘รฃ trแปŸ thร nh khรดng ฤ‘แบงu (khรดng ฤ‘ฦฐแปฃc quแบฃn lรฝ))"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1167
 msgid "[deleted]"
 msgstr "[ฤ‘รฃ xรณa]"
 
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1168 builtin/remote.c:1112
 msgid "(none)"
 msgstr "(khรดng)"
 
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1191
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 "Tแปซ chแป‘i viแป‡c lแบฅy vร o trong nhรกnh hiแป‡n tแบกi %s cแปงa mแป™t kho chแปฉa khรดng phแบฃi kho "
 "trแบงn (bare)"
 
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1210
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Tรนy chแปn \"%s\" cรณ giรก trแป‹ \"%s\" lร  khรดng hแปฃp lแป‡ cho %s"
 
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1213
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Tรนy chแปn \"%s\" bแป‹ bแป qua vแป›i %s\n"
 
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "phรกt hiแป‡n nhiแปu nhรกnh, khรดng tฦฐฦกng thรญch vแป›i --set-upstream"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "khรดng cร i ฤ‘แบทt thฦฐแปฃng nguแป“n cho mแป™t nhรกnh ฤ‘ฦฐแปฃc theo dรตi trรชn mรกy chแปง"
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "khรดng cร i ฤ‘แบทt thฦฐแปฃng nguแป“n cho mแป™t thแบป nhรกnh trรชn mรกy chแปง"
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "khรดng hiแปƒu kiแปƒu nhรกnh"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"khรดng tรฌm thแบฅy nhรกnh nguแป“n.\n"
+"bแบกn cแบงn phแบฃi chแป‰ ฤ‘แป‹nh chรญnh xรกc mแป™t nhรกnh vแป›i tรนy chแปn --set-upstream."
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
 #, c-format
 msgid "Fetching %s\n"
 msgstr "ฤang lแบฅy โ€œ%sโ€ vแป\n"
 
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Khรดng thแปƒ lแบฅyโ€œ%sโ€ vแป"
 
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr ""
-"--filter chแป‰ cรณ thแปƒ ฤ‘ฦฐแปฃc dรนng vแป›i mรกy chแปง ฤ‘ฦฐแปฃc cแบฅu hรฌnh bแบฑng extensions."
-"partialClone"
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "khรดng thแปƒ lแบฅy โ€œ%sโ€ (mรฃ thoรกt: %d)\n"
 
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1693
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -12994,44 +14027,44 @@ msgstr ""
 "Chฦฐa chแป‰ ra kho chแปฉa mรกy chแปง.  Xin hรฃy chแป‰ ฤ‘แป‹nh hoแบทc lร  URL hoแบทc\n"
 "tรชn mรกy chแปง tแปซ cรกi mร  nhแปฏng ฤ‘iแปƒm xรฉt duyแป‡t mแป›i cรณ thแปƒ ฤ‘ฦฐแปฃc fetch (lแบฅy vแป)."
 
-#: builtin/fetch.c:1593
+#: builtin/fetch.c:1730
 msgid "You need to specify a tag name."
 msgstr "Bแบกn phแบฃi ฤ‘แป‹nh rรต tรชn thแบป."
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1780
 msgid "Negative depth in --deepen is not supported"
 msgstr "Mแปฉc sรขu lร  sแป‘ รขm trong --deepen lร  khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ"
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1782
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "Cรกc tรนy chแปn--deepen vร  --depth loแบกi tแปซ lแบซn nhau"
 
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1787
 msgid "--depth and --unshallow cannot be used together"
 msgstr "tรนy chแปn --depth vร  --unshallow khรดng thแปƒ sแปญ dแปฅng cรนng vแป›i nhau"
 
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1789
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow trรชn kho hoร n chแป‰nh lร  khรดng hแปฃp lรฝ"
 
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1805
 msgid "fetch --all does not take a repository argument"
 msgstr "lแป‡nh lแบฅy vแป \"fetch --all\" khรดng lแบฅy ฤ‘แป‘i sแป‘ kho chแปฉa"
 
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1807
 msgid "fetch --all does not make sense with refspecs"
 msgstr "lแป‡nh lแบฅy vแป \"fetch --all\" khรดng hแปฃp lรฝ vแป›i refspecs"
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1816
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Khรดng cรณ nhรณm mรกy chแปง hay mรกy chแปง nhฦฐ thแบฟ: %s"
 
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1823
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Viแป‡c lแบฅy vแป cแบฃ mแป™t nhรณm vร  chแป‰ ฤ‘แป‹nh refspecs khรดng hแปฃp lรฝ"
 
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1841
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -13046,23 +14079,23 @@ msgstr ""
 "git fmt-merge-msg [-m <chรบ_thรญch>] [--log[=<n>] | --no-log] [--file <tแบญp-"
 "tin>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:671
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "gแบฏn nhแบญt kรฝ vแป›i รญt nhแบฅt <n> mแปฅc tแปซ lแป‡nh โ€œshortlogโ€"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:674
 msgid "alias for --log (deprecated)"
 msgstr "bรญ danh cho --log (khรดng ฤ‘ฦฐแปฃc dรนng)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:677
 msgid "text"
 msgstr "vฤƒn bแบฃn"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:678
 msgid "use <text> as start of message"
 msgstr "dรนng <vฤƒn bแบฃn thฦฐแปng> ฤ‘แปƒ bแบฏt ฤ‘แบงu ghi chรบ"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:679
 msgid "file to read from"
 msgstr "tแบญp tin ฤ‘แปƒ ฤ‘แปc dแปฏ liแป‡u tแปซ ฤ‘รณ"
 
@@ -13128,32 +14161,32 @@ msgstr "chแป‰ hiแปƒn thแป‹ nhแปฏng tham chiแบฟu mร  nรณ chแปฉa lแบงn chuyแปƒn gi
 msgid "print only refs which don't contain the commit"
 msgstr "chแป‰ hiแปƒn thแป‹ nhแปฏng tham chiแบฟu mร  nรณ khรดng chแปฉa lแบงn chuyแปƒn giao"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr "khรดng hiแปƒu"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "lแป—i trong %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "cรณ cแบฃnh bรกo trong %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "liรชn kแบฟt gรฃy tแปซ %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr "kiแปƒu ฤ‘แป‘i tฦฐแปฃng sai trong liรชn kแบฟt"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13162,216 +14195,216 @@ msgstr ""
 "liรชn kแบฟt gรฃy tแปซ %7s %s \n"
 "              tแป›i %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr "thiแบฟu %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr "khรดng tiแบฟp cแบญn ฤ‘ฦฐแปฃc %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, c-format
 msgid "dangling %s %s"
 msgstr "dangling %s %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 msgid "could not create lost-found"
 msgstr "khรดng thแปƒ tแบกo lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr "khรดng thแปƒ hoร n thร nh โ€œ%sโ€"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr "ฤang kiแปƒm tra %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "ฤang kiแปƒm tra kแบฟt nแป‘i (%d ฤ‘แป‘i tฦฐแปฃng)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr "ฤang kiแปƒm tra %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr "cรกc liรชn kแบฟt bแป‹ gแบซy"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr "gแป‘c %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "ฤ‘รฃ ฤ‘รกnh thแบป %s %s (%s) trong %s"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: ฤ‘แป‘i tฦฐแปฃng thiแบฟu hay hแปng"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: mแปฅc reflog khรดng hแปฃp lแป‡ %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "ฤang kiแปƒm tra viแป‡c ฤ‘แป•i tรชn cแปงa โ€œ%sโ€ thร nh โ€œ%sโ€"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: con trแป sha1 khรดng hแปฃp lแป‡ %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: khรดng phแบฃi lร  mแป™t lแบงn chuyแปƒn giao"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr "cแบฃnh bรกo: Khรดng cรณ cรกc tham chiแบฟu mแบทc ฤ‘แป‹nh"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: thiแบฟu ฤ‘แป‘i tฦฐแปฃng hoแบทc hแปng: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: khรดng thแปƒ phรขn tรญch cรบ ฤ‘แป‘i tฦฐแปฃng: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "tแบญp tin sha1 sai: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr "ฤang kiแปƒm tra thฦฐ mแปฅc ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr "ฤang kiแปƒm tra cรกc thฦฐ mแปฅc ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr "ฤang lแบฅy liรชn kแบฟt %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr "%s khรดng hแปฃp lแป‡"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s chแป‰ ฤ‘แบฟn thแปฉ gรฌ ฤ‘รณ xa lแบก (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: HEAD ฤ‘รฃ tรกch rแปi khรดng chแป‰ vร o ฤ‘รขu cแบฃ"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "chรบ รฝ: %s chแป‰ ฤ‘แบฟn mแป™t nhรกnh chฦฐa sinh (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr "ฤang kiแปƒm tra cรขy nhแป› tแบกm"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: con trแป sha1 khรดng hแปฃp lแป‡ trong cache-tree"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr "non-tree trong cache-tree"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<cรกc tรนy chแปn>] [<ฤ‘แป‘i-tฦฐแปฃng>โ€ฆ]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr "hiแปƒn thแป‹ cรกc ฤ‘แป‘i tฦฐแปฃng khรดng thแปƒ ฤ‘แปc ฤ‘ฦฐแปฃc"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr "hiแปƒn thแป‹ cรกc ฤ‘แป‘i tฦฐแปฃng khรดng ฤ‘ฦฐแปฃc quแบฃn lรฝ"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr "bรกo cรกo cรกc thแบป"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr "bรกo cรกo node gแป‘c"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr "tแบกo โ€œindex objects head nodesโ€"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr "tแบกo โ€œreflogs head nodesโ€ (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
 msgstr "cลฉng cรขn nhแบฏc ฤ‘แบฟn cรกc ฤ‘แป‘i tฦฐแปฃng gรณi vร  thay thแบฟ"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr "chแป‰ kiแปƒm tra kแบฟt nแป‘i"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr "cho phรฉp kiแปƒm tra hแบกn chแบฟ hฦกn"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr "ghi cรกc ฤ‘แป‘i tฦฐแปฃng khรดng ฤ‘ฦฐแปฃc quแบฃn lรฝ trong .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr "hiแปƒn thแป‹ quรก trรฌnh"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr "hiแปƒn thแป‹ tรชn chi tiแบฟt cho cรกc ฤ‘แป‘i tฦฐแปฃng ฤ‘แปc ฤ‘ฦฐแปฃc"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "ฤang kiแปƒm tra cรกc ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: thiแบฟu ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "tham sแป‘ khรดng hแปฃp lแป‡: cแบงn sha1, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc โ€œ%sโ€"
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr "git gc [<cรกc tรนy chแปn>]"
 
@@ -13385,17 +14418,17 @@ msgstr "Gแบทp lแป—i khi lแบฅy thรดng tin thแป‘ng kรช vแป tแบญp tin %s: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "gแบทp lแป—i khi phรขn tรญch โ€œ%sโ€ giรก trแป‹ โ€œ%sโ€"
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช vแป โ€œ%sโ€"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr "khรดng thแปƒ ฤ‘แปc โ€œ%sโ€"
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13410,54 +14443,54 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr "xรณa bแป cรกc ฤ‘แป‘i tฦฐแปฃng khรดng ฤ‘ฦฐแปฃc tham chiแบฟu"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr "cแบฉn thแบญn hฦกn nแปฏa (tฤƒng thแปi gian chแบกy)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr "bแบญt chแบฟ ฤ‘แป™ auto-gc"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr "buแป™c gc chแบกy ngay cแบฃ khi cรณ tiแบฟn trรฌnh gc khรกc ฤ‘ang chแบกy"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr "ฤ‘รณng gรณi lแบกi tแบฅt cแบฃ cรกc gรณi khรกc ngoแบกi trแปซ gรณi lแป›n nhแบฅt"
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "gแบทp lแป—i khi phรขn tรญch giรก trแป‹ gc.logexpiry %s"
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "gแบทp lแป—i khi phรขn tรญch giรก trแป‹ prune %s"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Tแปฑ ฤ‘แป™ng ฤ‘รณng gรณi kho chแปฉa trรชn nแปn hแป‡ thแป‘ng ฤ‘แปƒ tแป‘i ฦฐu hรณa hiแป‡u suแบฅt lร m "
 "viแป‡c.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Tแปฑ ฤ‘แป™ng ฤ‘รณng gรณi kho chแปฉa ฤ‘แปƒ tแป‘i ฦฐu hรณa hiแป‡u suแบฅt lร m viแป‡c.\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Xem \"git help gc\" ฤ‘แปƒ cรณ hฦฐแป›ng dแบซn cแปฅ thแปƒ vแป cรกch dแปn dแบนp kho git.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13465,14 +14498,14 @@ msgstr ""
 "gc ฤ‘ang ฤ‘ฦฐแปฃc thแปฑc hiแป‡n trรชn mรกy โ€œ%sโ€ pid %<PRIuMAX> (dรนng --force nแบฟu khรดng "
 "phแบฃi thแบฟ)"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Cรณ quรก nhiแปu ฤ‘แป‘i tฦฐแปฃng tแปฑ do khรดng ฤ‘ฦฐแปฃc dรนng ฤ‘แบฟn; hรฃy chแบกy lแป‡nh โ€œgit pruneโ€ "
 "ฤ‘แปƒ xรณa bแป chรบng ฤ‘i."
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<cรกc tรนy chแปn>] [-e] <mแบซu> [<rev>โ€ฆ] [[--] </ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
 
@@ -13490,259 +14523,259 @@ msgstr "sแป‘ tuyแบฟn ฤ‘รฃ cho khรดng hแปฃp lแป‡ (%d) cho %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "khรดng hแป— trแปฃ ฤ‘a tuyแบฟn, bแป qua %s"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "khรดng thแปƒ ฤ‘แปc cรขy (%s)"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:633
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "khรดng thแปƒ thแปฑc hiแป‡n lแป‡nh grep (lแปc tรฌm) tแปซ ฤ‘แป‘i tฦฐแปฃng thuแป™c kiแปƒu %s"
 
-#: builtin/grep.c:714
+#: builtin/grep.c:704
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "chuyแปƒn ฤ‘แบฟn โ€œ%cโ€ cแบงn mแป™t giรก trแป‹ bแบฑng sแป‘"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:803
 msgid "search in index instead of in the work tree"
 msgstr "tรฌm trong bแบฃng mแปฅc lแปฅc thay vรฌ trong cรขy lร m viแป‡c"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:805
 msgid "find in contents not managed by git"
 msgstr "tรฌm trong nแป™i dung khรดng ฤ‘ฦฐแปฃc quแบฃn lรฝ bแปŸi git"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:807
 msgid "search in both tracked and untracked files"
 msgstr "tรฌm kiแบฟm cรกc tแบญp tin ฤ‘ฦฐแปฃc vร  chฦฐa ฤ‘ฦฐแปฃc theo dรตi dแบฅu vแบฟt"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:809
 msgid "ignore files specified via '.gitignore'"
 msgstr "cรกc tแบญp tin bแป‹ bแป qua ฤ‘ฦฐแปฃc chแป‰ ฤ‘แป‹nh thรดng qua โ€œ.gitignoreโ€"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:811
 msgid "recursively search in each submodule"
 msgstr "tรฌm kiแบฟm ฤ‘แป‡ quy trong tแปซng mรด-ฤ‘un-con"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:814
 msgid "show non-matching lines"
 msgstr "hiแปƒn thแป‹ nhแปฏng dรฒng khรดng khแป›p vแป›i mแบซu"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:816
 msgid "case insensitive matching"
 msgstr "phรขn biแป‡t HOA/thฦฐแปng"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:818
 msgid "match patterns only at word boundaries"
 msgstr "chแป‰ khแป›p mแบซu tแบกi ฤ‘ฦฐแปng ranh giแป›i tแปซ"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:820
 msgid "process binary files as text"
 msgstr "xแปญ lรฝ tแบญp tin nhแป‹ phรขn nhฦฐ lร  dแบกng vฤƒn bแบฃn thฦฐแปng"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:822
 msgid "don't match patterns in binary files"
 msgstr "khรดng khแป›p mแบซu trong cรกc tแบญp tin nhแป‹ phรขn"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:825
 msgid "process binary files with textconv filters"
 msgstr "xแปญ lรฝ tแบญp tin nhแป‹ phรขn vแป›i cรกc bแป™ lแปc โ€œtextconvโ€"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:827
 msgid "search in subdirectories (default)"
 msgstr "tรฌm kiแบฟm trong thฦฐ mแปฅc con (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:829
 msgid "descend at most <depth> levels"
 msgstr "hแบก xuแป‘ng รญt nhแบฅt lร  mแปฉc <sรขu>"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:833
 msgid "use extended POSIX regular expressions"
 msgstr "dรนng biแปƒu thแปฉc chรญnh qui POSIX cรณ mแปŸ rแป™ng"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:836
 msgid "use basic POSIX regular expressions (default)"
 msgstr "sแปญ dแปฅng biแปƒu thแปฉc chรญnh quy kiแปƒu POSIX (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:839
 msgid "interpret patterns as fixed strings"
 msgstr "diแป…n dแป‹ch cรกc mแบซu nhฦฐ lร  chuแป—i cแป‘ ฤ‘แป‹nh"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:842
 msgid "use Perl-compatible regular expressions"
 msgstr "sแปญ dแปฅng biแปƒu thแปฉc chรญnh quy tฦฐฦกng thรญch Perl"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:845
 msgid "show line numbers"
 msgstr "hiแปƒn thแป‹ sแป‘ cแปงa dรฒng"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:846
 msgid "show column number of first match"
 msgstr "hiแปƒn thแป‹ sแป‘ cแป™t cแปงa khแป›p vแป›i mแบซu ฤ‘แบงu tiรชn"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:847
 msgid "don't show filenames"
 msgstr "khรดng hiแปƒn thแป‹ tรชn tแบญp tin"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:848
 msgid "show filenames"
 msgstr "hiแปƒn thแป‹ cรกc tรชn tแบญp tin"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:850
 msgid "show filenames relative to top directory"
 msgstr "hiแปƒn thแป‹ tรชn tแบญp tin tฦฐฦกng ฤ‘แป‘i vแป›i thฦฐ mแปฅc ฤ‘แป‰nh (top)"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:852
 msgid "show only filenames instead of matching lines"
 msgstr "chแป‰ hiแปƒn thแป‹ tรชn tแบญp tin thay vรฌ nhแปฏng dรฒng khแป›p vแป›i mแบซu"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:854
 msgid "synonym for --files-with-matches"
 msgstr "ฤ‘แป“ng nghฤฉa vแป›i --files-with-matches"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:857
 msgid "show only the names of files without match"
 msgstr "chแป‰ hiแปƒn thแป‹ tรชn cho nhแปฏng tแบญp tin khรดng khแป›p vแป›i mแบซu"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:859
 msgid "print NUL after filenames"
 msgstr "thรชm NUL vร o sau tรชn tแบญp tin"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:862
 msgid "show only matching parts of a line"
 msgstr "chแป‰ hiแปƒn thแป‹ nhแปฏng phแบงn khแป›p vแป›i mแบซu cแปงa mแป™t dรฒng"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:864
 msgid "show the number of matches instead of matching lines"
 msgstr "hiแปƒn thแป‹ sแป‘ lฦฐแปฃng khแป›p thay vรฌ nhแปฏng dรฒng khแป›p vแป›i mแบซu"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:865
 msgid "highlight matches"
 msgstr "tรด sรกng phแบงn khแป›p mแบซu"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:867
 msgid "print empty line between matches from different files"
 msgstr "hiแปƒn thแป‹ dรฒng trแป‘ng giแปฏa cรกc lแบงn khแป›p tแปซ cรกc tแบญp tin khรกc biแป‡t"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:869
 msgid "show filename only once above matches from same file"
 msgstr ""
 "hiแปƒn thแป‹ tรชn tแบญp tin mแป™t lแบงn phรญa trรชn cรกc lแบงn khแป›p tแปซ cรนng mแป™t tแบญp tin"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:872
 msgid "show <n> context lines before and after matches"
 msgstr "hiแปƒn thแป‹ <n> dรฒng nแป™i dung phรญa trฦฐแป›c vร  sau cรกc lแบงn khแป›p"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:875
 msgid "show <n> context lines before matches"
 msgstr "hiแปƒn thแป‹ <n> dรฒng nแป™i dung trฦฐแป›c khแป›p"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:877
 msgid "show <n> context lines after matches"
 msgstr "hiแปƒn thแป‹ <n> dรฒng nแป™i dung sau khแป›p"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:879
 msgid "use <n> worker threads"
 msgstr "dรนng <n> tuyแบฟn trรฌnh lร m viแป‡c"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:880
 msgid "shortcut for -C NUM"
 msgstr "dแบกng viแบฟt tแบฏt cแปงa -C Sแป"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:883
 msgid "show a line with the function name before matches"
 msgstr "hiแปƒn thแป‹ dรฒng vรณi tรชn hร m trฦฐแป›c cรกc lแบงn khแป›p"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:885
 msgid "show the surrounding function"
 msgstr "hiแปƒn thแป‹ hร m bao quanh"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:888
 msgid "read patterns from file"
 msgstr "ฤ‘แปc mแบซu tแปซ tแบญp-tin"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:890
 msgid "match <pattern>"
 msgstr "match <mแบซu>"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:892
 msgid "combine patterns specified with -e"
 msgstr "tแป• hแปฃp mแบซu ฤ‘ฦฐแปฃc chแป‰ ra vแป›i tรนy chแปn -e"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:904
 msgid "indicate hit with exit status without output"
 msgstr "ฤ‘ฦฐa ra gแปฃi รฝ vแป›i trแบกng thรกi thoรกt mร  khรดng cรณ kแบฟt xuแบฅt"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:906
 msgid "show only matches from files that match all patterns"
 msgstr "chแป‰ hiแปƒn thแป‹ nhแปฏng cรกi khแป›p tแปซ tแบญp tin mร  nรณ khแป›p toร n bแป™ cรกc mแบซu"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:908
 msgid "show parse tree for grep expression"
 msgstr "hiแปƒn thแป‹ cรขy phรขn tรญch cรบ phรกp cho biแปƒu thแปฉc โ€œgrepโ€ (tรฌm kiแบฟm)"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "pager"
 msgstr "dร n trang"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "show matching files in the pager"
 msgstr "hiแปƒn thแป‹ cรกc tแบญp tin khแป›p trong trang giแบฅy"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:916
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "cho phรฉp gแปi grep(1) (bแป‹ bแป qua bแปŸi lแบงn dแป‹ch nร y)"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:983
 msgid "no pattern given"
 msgstr "chฦฐa chแป‰ ra mแบซu"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1019
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index hay --untracked khรดng ฤ‘ฦฐแปฃc sแปญ dแปฅng cรนng vแป›i revs"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1027
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "khรดng thแปƒ phรขn giแบฃi ฤ‘iแปƒm xรฉt duyแป‡t: %s"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "tรนy chแปn --untracked khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ vแป›i --recurse-submodules"
+
+#: builtin/grep.c:1061
 msgid "invalid option combination, ignoring --threads"
 msgstr "tแป• hแปฃp tรนy chแปn khรดng hแปฃp lแป‡, bแป qua --threads"
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
 msgid "no threads support, ignoring --threads"
 msgstr "khรดng hแป— trแปฃ ฤ‘a tuyแบฟn, bแป qua --threads"
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "sแป‘ tuyแบฟn chแป‰ ra khรดng hแปฃp lแป‡ (%d)"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1101
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager chแป‰ lร m viแป‡c trรชn cรขy-lร m-viแป‡c"
 
-#: builtin/grep.c:1117
-msgid "option not supported with --recurse-submodules"
-msgstr "tรนy chแปn khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ vแป›i --recurse-submodules"
-
-#: builtin/grep.c:1123
+#: builtin/grep.c:1127
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached hay --untracked khรดng ฤ‘ฦฐแปฃc sแปญ dแปฅng vแป›i --no-index"
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1133
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard khรดng thแปƒ sแปญ dแปฅng cho nแป™i dung lฦฐu dแบฅu vแบฟt"
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1141
 msgid "both --cached and trees are given"
 msgstr "cแบฃ hai --cached vร  cรกc cรขy phแบฃi ฤ‘ฦฐแปฃc chแป‰ ra"
 
@@ -13925,11 +14958,11 @@ msgstr "lแป—i ฤ‘แปc แปŸ ฤ‘แบงu vร o"
 msgid "used more bytes than were available"
 msgstr "sแปญ dแปฅng nhiแปu hฦกn sแป‘ lฦฐแปฃng byte mร  nรณ sแบตn cรณ"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
 msgid "pack too large for current definition of off_t"
 msgstr "gรณi quรก lแป›n so vแป›i ฤ‘แป‹nh nghฤฉa hiแป‡n tแบกi cแปงa kiแปƒu off_t"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "gรณi ฤ‘รฃ vฦฐแปฃt quรก cแปก tแป‘i ฤ‘a ฤ‘ฦฐแปฃc phรฉp"
 
@@ -13984,187 +15017,187 @@ msgstr[0] "tแบญp tin gรณi bแป‹ kแบฟt thรบc sแป›m, thiแบฟu %<PRIuMAX> byte"
 msgid "serious inflate inconsistency"
 msgstr "sแปฑ mรขu thuแบซn xแบฃ nรฉn nghiรชm trแปng"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "Sแปฐ VA CHแบ M SHA1 ฤรƒ XแบขY RA VแปšI %s!"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
 #, c-format
 msgid "unable to read %s"
 msgstr "khรดng thแปƒ ฤ‘แปc %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "khรดng thแปƒ ฤ‘แปc thรดng tin ฤ‘แป‘i tฦฐแปฃng sแบตn cรณ %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "khรดng thแปƒ ฤ‘แปc ฤ‘แป‘i tฦฐแปฃng ฤ‘รฃ tแป“n tแบกi %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ฤ‘แป‘i tฦฐแปฃng blob khรดng hแปฃp lแป‡ %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
 msgid "fsck error in packed object"
 msgstr "lแป—i fsck trong ฤ‘แป‘i tฦฐแปฃng ฤ‘รณng gรณi"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Khรดng phแบฃi tแบฅt cแบฃ cรกc ฤ‘แป‘i tฦฐแปฃng con cแปงa %s lร  cรณ thแปƒ vแป›i tแป›i ฤ‘ฦฐแปฃc"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr "gแบทp lแป—i khi รกp dแปฅng delta"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr "ฤang nhแบญn vแป cรกc ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr "Cรกc ฤ‘แป‘i tฦฐแปฃng bแบฃng mแปฅc lแปฅc"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "gรณi bแป‹ sai hแปng (SHA1 khรดng khแป›p)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr "khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช packfile"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr "pack cรณ phแบงn thแปซa แปŸ cuแป‘i"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "lแป™n xแป™n hฦกn cแบฃ ฤ‘iรชn rแป“ khi chแบกy hร m parse_pack_objects()"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr "ฤang phรขn giแบฃi cรกc delta"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "khรดng thแปƒ tแบกo tuyแบฟn: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr "lแป™n xแป™n hฦกn cแบฃ ฤ‘iรชn rแป“"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "ฤ‘แบงy ฤ‘แปง vแป›i %d ฤ‘แป‘i tฦฐแปฃng nแป™i bแป™"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Gแบทp tแป•ng kiแปƒm tra tail khรดng cแบงn cho %s (ฤ‘ฤฉa hแปng?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "gรณi cรณ %d delta chฦฐa ฤ‘ฦฐแปฃc giแบฃi quyแบฟt"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "khรดng thแปƒ xแบฃ nรฉn ฤ‘แป‘i tฦฐแปฃng nแป‘i thรชm (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "ฤ‘แป‘i tฦฐแปฃng nแป™i bแป™ %s bแป‹ hแปng"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "tรชn tแบญp tin tแบญp tin gรณi โ€œ%sโ€ khรดng ฤ‘ฦฐแปฃc kแบฟt thรบc bแบฑng ฤ‘uรดi โ€œ.packโ€"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "khรดng thแปƒ ghi %s tแบญp tin โ€œ%sโ€"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "khรดng thแปƒ ฤ‘รณng tแบญp tin ฤ‘ฦฐแปฃc ghi %s โ€œ%sโ€"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
 msgid "error while closing pack file"
 msgstr "gแบทp lแป—i trong khi ฤ‘รณng tแบญp tin gรณi"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
 msgid "cannot store pack file"
 msgstr "khรดng thแปƒ lฦฐu tแบญp tin gรณi"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
 msgid "cannot store index file"
 msgstr "khรดng thแปƒ lฦฐu trแปฏ tแบญp tin ghi mแปฅc lแปฅc"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "sai pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Khรดng thแปƒ mแปŸ tแบญp tin gรณi ฤ‘รฃ sแบตn cรณ โ€œ%sโ€"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Khรดng thแปƒ mแปŸ tแบญp tin idx cแปงa gรณi cho โ€œ%sโ€"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "khรดng delta: %d ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "chiแปu dร i xรญch = %d: %lu ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
 msgid "Cannot come back to cwd"
 msgstr "Khรดng thแปƒ quay lแบกi cwd"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
 #, c-format
 msgid "bad %s"
 msgstr "%s sai"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin khรดng thแปƒ ฤ‘ฦฐแปฃc dรนng mร  khรดng cรณ --stdin"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
 msgid "--stdin requires a git repository"
 msgstr "--stdin cแบงn mแป™t kho git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
 msgid "--verify with no packfile name given"
 msgstr "dรนng tรนy chแปn --verify mร  khรดng ฤ‘ฦฐa ra tรชn packfile"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "lแป—i fsck trong cรกc ฤ‘แป‘i tฦฐแปฃng gรณi"
 
@@ -14347,121 +15380,126 @@ msgstr "--trailer cรนng vแป›i --only-input khรดng hแปฃp lรฝ"
 msgid "no input file given for in-place editing"
 msgstr "khรดng ฤ‘ฦฐa ra tแบญp tin ฤ‘แบงu vร o ฤ‘แปƒ sแปญa tแบกi-chแป—"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<cรกc tรนy chแปn>] [<vรนng-xem-xรฉt>] [[--] </ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<cรกc tรนy chแปn>] <ฤ‘แป‘i-tฦฐแปฃng>โ€ฆ"
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "tรนy chแปn--decorate khรดng hแปฃp lแป‡: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:174
 msgid "show source"
 msgstr "hiแปƒn thแป‹ mรฃ nguแป“n"
 
-#: builtin/log.c:174
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr "Sแปญ dแปฅng tแบญp tin รกnh xแบก thฦฐ"
 
-#: builtin/log.c:176
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr "chแป‰ tรด sรกng cรกc tham chiแบฟu khแป›p vแป›i <mแบซu>"
 
-#: builtin/log.c:178
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr "khรดng tรด sรกng cรกc tham chiแบฟu khแป›p vแป›i <mแบซu>"
 
-#: builtin/log.c:179
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr "cรกc tรนy chแปn trang trรญ"
 
-#: builtin/log.c:182
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Xแปญ lรฝ chแป‰ dรฒng vรนng n,m trong tแบญp tin, tรญnh tแปซ 1"
 
-#: builtin/log.c:280
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Kแบฟt xuแบฅt cuแป‘i cรนng: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: sai tแบญp tin"
 
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:550 builtin/log.c:645
 #, c-format
 msgid "could not read object %s"
 msgstr "khรดng thแปƒ ฤ‘แปc ฤ‘แป‘i tฦฐแปฃng %s"
 
-#: builtin/log.c:668
+#: builtin/log.c:670
 #, c-format
 msgid "unknown type: %d"
 msgstr "khรดng nhแบญn ra kiแปƒu: %d"
 
-#: builtin/log.c:791
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: bao bแปc khรดng hแปฃp lแป‡ tแปซ chแบฟ ฤ‘แป™ mรด tแบฃ"
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr "format.headers khรดng cรณ giรก trแป‹ cแปฅ thแปƒ"
 
-#: builtin/log.c:908
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr "tรชn cแปงa thฦฐ mแปฅc kแบฟt xuแบฅt quรก dร i"
 
-#: builtin/log.c:924
+#: builtin/log.c:952
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "khรดng thแปƒ mแปŸ tแบญp tin miแบฟng vรก: %s"
 
-#: builtin/log.c:941
+#: builtin/log.c:969
 msgid "need exactly one range"
 msgstr "cแบงn chรญnh xรกc mแป™t vรนng"
 
-#: builtin/log.c:951
+#: builtin/log.c:979
 msgid "not a range"
 msgstr "khรดng phแบฃi lร  mแป™t vรนng"
 
-#: builtin/log.c:1074
+#: builtin/log.c:1143
 msgid "cover letter needs email format"
 msgstr "โ€œcover letterโ€ cแบงn cho ฤ‘แป‹nh dแบกng thฦฐ"
 
-#: builtin/log.c:1080
+#: builtin/log.c:1149
 msgid "failed to create cover-letter file"
 msgstr "gแบทp lแป—i khi tแบกo cรกc tแบญp tin cover-letter"
 
-#: builtin/log.c:1159
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to ฤ‘iรชn rแป“: %s"
 
-#: builtin/log.c:1186
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<cรกc tรนy chแปn>] [<kแปƒ-tแปซ> | <vรนng-xem-xรฉt>]"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1313
 msgid "two output directories?"
 msgstr "hai thฦฐ mแปฅc kแบฟt xuแบฅt?"
 
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, c-format
 msgid "unknown commit %s"
 msgstr "khรดng hiแปƒu lแบงn chuyแปƒn giao %s"
 
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "gแบทp lแป—i khi phรขn giแบฃi โ€œ%sโ€ nhฦฐ lร  mแป™t tham chiแบฟu hแปฃp lแป‡"
 
-#: builtin/log.c:1370
+#: builtin/log.c:1439
 msgid "could not find exact merge base"
 msgstr "khรดng tรฌm thแบฅy nแปn hรฒa trแป™n chรญnh xรกc"
 
-#: builtin/log.c:1374
+#: builtin/log.c:1443
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -14472,271 +15510,279 @@ msgstr ""
 "nhรกnh mรกy chแปง. Hoแบทc lร  bแบกn cรณ thแปƒ chแป‰ ฤ‘แป‹nh lแบงn chuyแปƒn giao nแปn bแบฑng\n"
 "\"--base=<base-commit-id>\" mแป™t cรกch thแปง cรดng"
 
-#: builtin/log.c:1394
+#: builtin/log.c:1463
 msgid "failed to find exact merge base"
 msgstr "gแบทp lแป—i khi tรฌm nแปn hรฒa trแป™n chรญnh xรกc"
 
-#: builtin/log.c:1405
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr "lแบงn chuyแปƒn giao nแปn khรดng lร  tแป• tiรชn cแปงa danh sรกch ฤ‘iแปƒm xรฉt duyแป‡t"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr "lแบงn chuyแปƒn giao nแปn khรดng ฤ‘ฦฐแปฃc trong danh sรกch ฤ‘iแปƒm xรฉt duyแป‡t"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr "khรดng thแปƒ lแบฅy mรฃ miแบฟng vรก"
 
-#: builtin/log.c:1514
+#: builtin/log.c:1583
 msgid "failed to infer range-diff ranges"
 msgstr "gแบทp lแป—i khi suy luแบญn range-diff (vรนng khรกc biแป‡t)"
 
-#: builtin/log.c:1559
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "dรนng [PATCH n/m] ngay cแบฃ vแป›i miแบฟng vรก ฤ‘ฦกn"
 
-#: builtin/log.c:1562
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr "dรนng [Vร] ngay cแบฃ vแป›i cรกc miแบฟng vรก phแปฉc tแบกp"
 
-#: builtin/log.c:1566
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr "hiแปƒn thแป‹ miแบฟng vรก ra ฤ‘แบงu ra chuแบฉn"
 
-#: builtin/log.c:1568
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr "tแบกo bรฌ thฦฐ"
 
-#: builtin/log.c:1570
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr "sแปญ dแปฅng chแป—i dรฃy sแป‘ dแบกng ฤ‘ฦกn giแบฃn cho tรชn tแบญp-tin xuแบฅt ra"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr "sแปญ dแปฅng <sfx> thay cho โ€œ.patchโ€"
 
-#: builtin/log.c:1574
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr "bแบฏt ฤ‘แบงu ฤ‘รกnh sแป‘ miแบฟng vรก tแปซ <n> thay vรฌ 1"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr "ฤ‘รกnh dแบฅu chuแป—i nแป‘i tiแบฟp dแบกng thแปฉ-N re-roll"
 
-#: builtin/log.c:1578
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Dรนng [RFC Vร] thay cho [Vร]"
 
-#: builtin/log.c:1581
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "cover-from-description-mode"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "tแบกo ra cรกc phแบงn cแปงa mแป™t lรก thฦฐ bao gแป“m dแปฑa trรชn mรด tแบฃ cแปงa nhรกnh"
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Dรนng [<tiแปn-tแป‘>] thay cho [Vร]"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr "lฦฐu cรกc tแบญp tin kแบฟt quแบฃ trong <t.mแปฅc>"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr "khรดng strip/add [Vร]"
 
-#: builtin/log.c:1590
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr "khรดng kแบฟt xuแบฅt diff (nhแปฏng khรกc biแป‡t) nhแป‹ phรขn"
 
-#: builtin/log.c:1592
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr "xuแบฅt mแปi mรฃ bฤƒm all-zero trong phแบงn ฤ‘แบงu From"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr "khรดng bao gแป“m miแบฟng vรก khแป›p vแป›i mแป™t lแบงn chuyแปƒn giao thฦฐแปฃng nguแป“n"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr "hiแปƒn thแป‹ ฤ‘แป‹nh dแบกng miแบฟng vรก thay vรฌ mแบทc ฤ‘แป‹nh (miแบฟng vรก + thแป‘ng kรช)"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr "Lแปi nhแบฏn"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1672
 msgid "header"
 msgstr "ฤ‘แบงu ฤ‘แป thฦฐ"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr "thรชm ฤ‘แบงu ฤ‘แป thฦฐ"
 
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr "thฦฐ ฤ‘iแป‡n tแปญ"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr "thรชm To: ฤ‘แบงu ฤ‘แป thฦฐ"
 
-#: builtin/log.c:1603
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr "thรชm Cc: ฤ‘แบงu ฤ‘แป thฦฐ"
 
-#: builtin/log.c:1605
+#: builtin/log.c:1678
 msgid "ident"
 msgstr "thแปฅt lแป"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "ฤ‘แบทt โ€œฤแป‹a chแป‰ gแปญiโ€ thร nh <thแปฅ lแป> (hoแบทc thแปฅt lแป ngฦฐแปi commit nแบฟu bแป quรชn)"
 
-#: builtin/log.c:1608
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr "dรนng thฦฐ ฤ‘แบงu tiรชn ฤ‘แปƒ trแบฃ lแปi <message-id>"
 
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr "ranh giแป›i"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr "ฤ‘รญnh kรจm miแบฟng vรก"
 
-#: builtin/log.c:1614
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr "dรนng miแบฟng vรก lร m nแป™i dung"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr "cho phรฉp luแป“ng lแปi nhแบฏn, kiแปƒu: โ€œshallowโ€, โ€œdeepโ€"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1693
 msgid "signature"
 msgstr "chแปฏ kรฝ"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr "thรชm chแปฏ kรฝ"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr "lแบงn_chuyแปƒn_giao_nแปn"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr "add trฦฐแป›c hแบฟt ฤ‘รฒi hแปi thรดng tin cรขy tแป›i sรช-ri miแบฟng vรก"
 
-#: builtin/log.c:1625
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr "thรชm chแปฏ kรฝ tแปซ mแป™t tแบญp tin"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr "khรดng hiแปƒn thแป‹ cรกc tรชn tแบญp tin cแปงa miแบฟng vรก"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr "hiแปƒn thแป‹ bแป™ ฤ‘o tiแบฟn triแปƒn trong khi tแบกo cรกc miแบฟng vรก"
 
-#: builtin/log.c:1630
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "hiแปƒn thแป‹ cรกc thay ฤ‘แป•i dแปฑa trรชn <rev> trong cรกc chแปฏ bao bแปc hoแบทc miแบฟng vรก ฤ‘ฦกn"
 
-#: builtin/log.c:1633
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "hiแปƒn thแป‹ cรกc thay ฤ‘แป•i dแปฑa trรชn <refspec> trong cรกc chแปฏ bao bแปc hoแบทc miแบฟng vรก "
 "ฤ‘ฦกn"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr "tแปท lแป‡ phแบงn trฤƒm theo cรกi tแบกo lร  weighted"
 
-#: builtin/log.c:1710
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "dรฒng thแปฅt lแป khรดng hแปฃp lแป‡: %s"
 
-#: builtin/log.c:1725
+#: builtin/log.c:1807
 msgid "-n and -k are mutually exclusive"
 msgstr "-n vร   -k loแบกi tแปซ lแบซn nhau"
 
-#: builtin/log.c:1727
+#: builtin/log.c:1809
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc vร  -k xung khแบฏc nhau"
 
-#: builtin/log.c:1735
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr "--name-only khรดng hแปฃp lรฝ"
 
-#: builtin/log.c:1737
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr "--name-status khรดng hแปฃp lรฝ"
 
-#: builtin/log.c:1739
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr "--check khรดng hแปฃp lรฝ"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
 msgstr "ฤ‘แบงu ra chuแบฉn, hay thฦฐ mแปฅc, chแปn cรกi nร o?"
 
-#: builtin/log.c:1860
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff cแบงn --cover-letter hoแบทc vรก ฤ‘ฦกn"
 
-#: builtin/log.c:1864
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1865
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff dแปฑa trรชn v%d:"
 
-#: builtin/log.c:1871
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor yรชu cแบงu --range-diff"
 
-#: builtin/log.c:1875
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff yรชu cแบงu --cover-letter hoแบทc miแบฟng vรก ฤ‘ฦกn"
 
-#: builtin/log.c:1883
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:1884
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff dแปฑa trรชn v%d:"
 
-#: builtin/log.c:1895
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "khรดng thแปƒ ฤ‘แปc tแบญp tin chแปฏ kรฝ โ€œ%sโ€"
 
-#: builtin/log.c:1931
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr "ฤang tแบกo cรกc miแบฟng vรก"
 
-#: builtin/log.c:1975
+#: builtin/log.c:2073
 msgid "failed to create output files"
 msgstr "gแบทp lแป—i khi tแบกo cรกc tแบญp tin kแบฟt xuแบฅt"
 
-#: builtin/log.c:2034
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<thฦฐแปฃng-nguแป“n> [<ฤ‘แบงu> [<giแป›i-hแบกn>]]]"
 
-#: builtin/log.c:2088
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -14865,7 +15911,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "khรดng hiแปƒn thแป‹ URL mรกy chแปง"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
 msgid "exec"
 msgstr "thแปฑc thi"
 
@@ -14950,150 +15996,150 @@ msgstr "git merge --abort"
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:119
 msgid "switch `m' requires a value"
 msgstr "switch โ€œmโ€ yรชu cแบงu mแป™t giรก trแป‹"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "tรนy chแปn โ€œ%sโ€ yรชu cแบงu mแป™t giรก trแป‹"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:188
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Khรดng tรฌm thแบฅy chiแบฟn lฦฐแปฃc hรฒa trแป™n โ€œ%sโ€.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:189
 #, c-format
 msgid "Available strategies are:"
 msgstr "Cรกc chiแบฟn lฦฐแปฃc sแบตn sร ng lร :"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:194
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Cรกc chiแบฟn lฦฐแปฃc tรนy chแป‰nh sแบตn sร ng lร :"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:245 builtin/pull.c:132
 msgid "do not show a diffstat at the end of the merge"
 msgstr "khรดng hiแปƒn thแป‹ thแป‘ng kรช khรกc biแป‡t tแบกi cuแป‘i cแปงa lแบงn hรฒa trแป™n"
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:248 builtin/pull.c:135
 msgid "show a diffstat at the end of the merge"
 msgstr "hiแปƒn thแป‹ thแป‘ng kรช khรกc biแป‡t tแบกi cuแป‘i cแปงa hรฒa trแป™n"
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:249 builtin/pull.c:138
 msgid "(synonym to --stat)"
 msgstr "(ฤ‘แป“ng nghฤฉa vแป›i --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:251 builtin/pull.c:141
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "thรชm (รญt nhแบฅt <n>) mแปฅc tแปซ shortlog cho ghi chรบ chuyแปƒn giao hรฒa trแป™n"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:254 builtin/pull.c:147
 msgid "create a single commit instead of doing a merge"
 msgstr "tแบกo mแป™t lแบงn chuyแปƒn giao ฤ‘ฦฐon thay vรฌ thแปฑc hiแป‡n viแป‡c hรฒa trแป™n"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:256 builtin/pull.c:150
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "thแปฑc hiแป‡n chuyแปƒn giao nแบฟu hรฒa trแป™n thร nh cรดng (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:258 builtin/pull.c:153
 msgid "edit message before committing"
 msgstr "sแปญa chรบ thรญch trฦฐแป›c khi chuyแปƒn giao"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:260
 msgid "allow fast-forward (default)"
 msgstr "cho phรฉp chuyแปƒn-tiแบฟp-nhanh (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:262 builtin/pull.c:160
 msgid "abort if fast-forward is not possible"
 msgstr "bแป qua nแบฟu chuyแปƒn-tiแบฟp-nhanh khรดng thแปƒ ฤ‘ฦฐแปฃc"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:266 builtin/pull.c:163
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "thแบฉm tra xem lแบงn chuyแปƒn giao cรณ tรชn ฤ‘รณ cรณ chแปฏ kรฝ GPG hแปฃp lแป‡ hay khรดng"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
 msgid "strategy"
 msgstr "chiแบฟn lฦฐแปฃc"
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:268 builtin/pull.c:168
 msgid "merge strategy to use"
 msgstr "chiแบฟn lฦฐแปฃc hรฒa trแป™n sแบฝ dรนng"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:171
 msgid "option=value"
 msgstr "tรนy_chแปn=giรก_trแป‹"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option for selected merge strategy"
 msgstr "tรนy chแปn cho chiแบฟn lฦฐแปฃc hรฒa trแป™n ฤ‘รฃ chแปn"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "hรฒa trแป™n ghi chรบ cแปงa lแบงn chuyแปƒn giao (dร nh cho hรฒa trแป™n khรดng-chuyแปƒn-tiแบฟp-"
 "nhanh)"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr "bรฃi bแป quรก trรฌnh hรฒa trแป™n hiแป‡n tแบกi ฤ‘ang thแปฑc hiแป‡n"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort nhฦฐng ฤ‘แปƒ lแบกi bแบฃng mแปฅc lแปฅc vร  cรขy lร m viแป‡c"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr "tiแบฟp tแปฅc quรก trรฌnh hรฒa trแป™n hiแป‡n tแบกi ฤ‘ang thแปฑc hiแป‡n"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:285 builtin/pull.c:179
 msgid "allow merging unrelated histories"
 msgstr "cho phรฉp hรฒa trแป™n lแป‹ch sแปญ khรดng liรชn quan"
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "thแบฉm tra mรณc (hook) commit-msg"
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "vรฒng qua mรณc (hook) pre-merge-commit vร  commit-msg"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:308
 msgid "could not run stash."
 msgstr "khรดng thแปƒ chแบกy stash."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:313
 msgid "stash failed"
 msgstr "lแป‡nh tแบกm cแบฅt gแบทp lแป—i"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:318
 #, c-format
 msgid "not a valid object: %s"
 msgstr "khรดng phแบฃi lร  mแป™t ฤ‘แป‘i tฦฐแปฃng hแปฃp lแป‡: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
 msgid "read-tree failed"
 msgstr "read-tree gแบทp lแป—i"
 
-#: builtin/merge.c:386
+#: builtin/merge.c:387
 msgid " (nothing to squash)"
 msgstr " (khรดng cรณ gรฌ ฤ‘แปƒ squash)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:398
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash commit -- khรดng cแบญp nhแบญt HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:448
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Khรดng cรณ lแปi chรบ thรญch hรฒa trแป™n -- nรชn khรดng cแบญp nhแบญt HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:499
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "โ€œ%sโ€ khรดng chแป‰ ฤ‘แบฟn mแป™t lแบงn chuyแปƒn giao nร o cแบฃ"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:586
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Chuแป—i branch.%s.mergeoptions sai: %s"
@@ -15149,75 +16195,75 @@ msgstr ""
 "Nhแปฏng dรฒng ฤ‘ฦฐแปฃc bแบฏt ฤ‘แบงu bแบฑng โ€œ%cโ€ sแบฝ ฤ‘ฦฐแปฃc bแป qua, vร  nแบฟu phแบงn chรบ\n"
 "thรญch rแป—ng sแบฝ hแปงy bแป lแบงn chuyแปƒn giao.\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:865
 msgid "Empty commit message."
 msgstr "Chรบ thรญch cแปงa lแบงn commit (chuyแปƒn giao) bแป‹ trแป‘ng rแป—ng."
 
-#: builtin/merge.c:872
+#: builtin/merge.c:880
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Tuyแป‡t vแปi.\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:941
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Viแป‡c tแปฑ ฤ‘แป™ng hรฒa trแป™n gแบทp lแป—i; hรฃy sแปญa cรกc xung ฤ‘แป™t sau ฤ‘รณ chuyแปƒn giao kแบฟt "
 "quแบฃ.\n"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:980
 msgid "No current branch."
 msgstr "Khรดng phแบฃi nhรกnh hiแป‡n hร nh."
 
-#: builtin/merge.c:974
+#: builtin/merge.c:982
 msgid "No remote for the current branch."
 msgstr "Khรดng cรณ mรกy chแปง cho nhรกnh hiแป‡n hร nh."
 
-#: builtin/merge.c:976
+#: builtin/merge.c:984
 msgid "No default upstream defined for the current branch."
 msgstr "Khรดng cรณ thฦฐแปฃng nguแป“n mแบทc ฤ‘แป‹nh ฤ‘ฦฐแปฃc ฤ‘แป‹nh nghฤฉa cho nhรกnh hiแป‡n hร nh."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:989
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Khรดng nhรกnh mแบกng theo dรตi cho %s tแปซ %s"
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1046
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Giรก trแป‹ sai โ€œ%sโ€ trong biแบฟn mรดi trฦฐแปng โ€œ%sโ€"
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1149
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "khรดng phแบฃi lร  mแป™t thแปฉ gรฌ ฤ‘รณ mร  chรบng tรดi cรณ thแปƒ hรฒa trแป™n trong %s: %s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1183
 msgid "not something we can merge"
 msgstr "khรดng phแบฃi lร  thแปฉ gรฌ ฤ‘รณ mร  chรบng tรดi cรณ thแปƒ hรฒa trแป™n"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1286
 msgid "--abort expects no arguments"
 msgstr "--abort khรดng nhแบญn cรกc ฤ‘แป‘i sแป‘"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1290
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "แปž ฤ‘รขy khรดng cรณ lแบงn hรฒa trแป™n nร o ฤ‘ฦฐแปฃc hแปงy bแป giแปฏa chแปซng cแบฃ (thiแบฟu MERGE_HEAD)."
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1299
 msgid "--quit expects no arguments"
 msgstr "--quit khรดng nhแบญn cรกc ฤ‘แป‘i sแป‘"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1312
 msgid "--continue expects no arguments"
 msgstr "--continue khรดng nhแบญn ฤ‘แป‘i sแป‘"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1316
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "แปž ฤ‘รขy khรดng cรณ lแบงn hรฒa trแป™n nร o ฤ‘ang ฤ‘ฦฐแปฃc xแปญ lรฝ cแบฃ (thiแบฟu MERGE_HEAD)."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1332
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15225,7 +16271,7 @@ msgstr ""
 "Bแบกn chฦฐa kแบฟt thรบc viแป‡c hรฒa trแป™n (MERGE_HEAD vแบซn tแป“n tแบกi).\n"
 "Hรฃy chuyแปƒn giao cรกc thay ฤ‘แป•i trฦฐแป›c khi bแบกn cรณ thแปƒ hรฒa trแป™n."
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1339
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15233,98 +16279,98 @@ msgstr ""
 "Bแบกn chฦฐa kแบฟt thรบc viแป‡c cherry-pick (CHERRY_PICK_HEAD vแบซn tแป“n tแบกi).\n"
 "Hรฃy chuyแปƒn giao cรกc thay ฤ‘แป•i trฦฐแป›c khi bแบกn cรณ thแปƒ hรฒa trแป™n."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1342
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Bแบกn chฦฐa kแบฟt thรบc viแป‡c cherry-pick (CHERRY_PICK_HEAD vแบซn tแป“n tแบกi)."
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1356
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Bแบกn khรดng thแปƒ kแบฟt hแปฃp --squash vแป›i --no-ff."
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1358
 msgid "You cannot combine --squash with --commit."
 msgstr "Bแบกn khรดng thแปƒ kแบฟt hแปฃp --squash vแป›i --commit."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1374
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Khรดng chแป‰ ra lแบงn chuyแปƒn giao vร  merge.defaultToUpstream chฦฐa ฤ‘ฦฐแปฃc ฤ‘แบทt."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1391
 msgid "Squash commit into empty head not supported yet"
 msgstr "Squash commit vร o mแป™t head trแป‘ng rแป—ng vแบซn chฦฐa ฤ‘ฦฐแปฃc hแป— trแปฃ"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1393
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Chuyแปƒn giao khรดng-chuyแปƒn-tiแบฟp-nhanh khรดng hแปฃp lรฝ แปŸ trong mแป™t head trแป‘ng rแป—ng"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1398
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - khรดng phแบฃi lร  thแปฉ gรฌ ฤ‘รณ mร  chรบng tรดi cรณ thแปƒ hรฒa trแป™n"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1400
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 "Khรดng thแปƒ hรฒa trแป™n mแป™t cรกch ฤ‘รบng ฤ‘แบฏn mแป™t lแบงn chuyแปƒn giao vร o mแป™t head rแป—ng"
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1481
 msgid "refusing to merge unrelated histories"
 msgstr "tแปซ chแป‘i hรฒa trแป™n lแป‹ch sแปญ khรดng liรชn quan"
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1490
 msgid "Already up to date."
 msgstr "ฤรฃ cแบญp nhแบญt rแป“i."
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1500
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "ฤang cแบญp nhแบญt %s..%s\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "ฤang thแปญ hรฒa trแป™n kiแปƒu โ€œtrivial in-indexโ€โ€ฆ\n"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1549
 #, c-format
 msgid "Nope.\n"
 msgstr "Khรดng.\n"
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1574
 msgid "Already up to date. Yeeah!"
 msgstr "ฤรฃ cแบญp nhแบญt rแป“i. Yeeah!"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1580
 msgid "Not possible to fast-forward, aborting."
 msgstr "Thแปฑc hiแป‡n lแป‡nh chuyแปƒn-tiแบฟp-nhanh lร  khรดng thแปƒ ฤ‘ฦฐแปฃc, ฤ‘ang bแป qua."
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1603 builtin/merge.c:1668
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "ฤang tua lแบกi cรขy thร nh thแปi xa xฦฐaโ€ฆ\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1607
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "ฤang thแปญ chiแบฟn lฦฐแปฃc hรฒa trแป™n %sโ€ฆ\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1659
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Khรดng cรณ chiแบฟn lฦฐแปฃc hรฒa trแป™n nร o ฤ‘ฦฐแปฃc nแบฏm giแปฏ (handle) sแปฑ hรฒa trแป™n.\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1661
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Hรฒa trแป™n vแป›i chiแบฟn lฦฐแปฃc %s gแบทp lแป—i.\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1670
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Sแปญ dแปฅng %s ฤ‘แปƒ chuแบฉn bแป‹ giแบฃi quyแบฟt bแบฑng tay.\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1682
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -15411,32 +16457,32 @@ msgstr "khรดng cแบฃnh bรกo vแป cรกc xung ฤ‘แป™t xแบฃy ra"
 msgid "set labels for file1/orig-file/file2"
 msgstr "ฤ‘แบทt nhรฃn cho tแบญp-tin-1/tแบญp-tin-gแป‘c/tแบญp-tin-2"
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "khรดng hiแปƒu tรนy chแปn %s"
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "khรดng thแปƒ phรขn tรญch ฤ‘แป‘i tฦฐแปฃng โ€œ%sโ€"
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "khรดng thแปƒ xแปญ lรฝ nhiแปu hฦกn %d nแปn. Bแป qua %s."
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "khรดng xแปญ lรฝ gรฌ ngoร i hai head hรฒa trแป™n."
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "khรดng thแปƒ phรขn giแบฃi tham chiแบฟu %s"
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "ฤang hรฒa trแป™n %s vแป›i %s\n"
@@ -15459,17 +16505,17 @@ msgstr "cho phรฉp tแบกo nhiแปu hฦกn mแป™t cรขy"
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
-"git multi-pack-index [--object-dir=<thฦฐ/mแปฅc>] (write|verify|expire|repack --"
-"batch-size=<cแปก>)"
+"git multi-pack-index [<cรกc-tรนy-chแปn>] (write|verify|expire|repack --batch-"
+"size=<cแปก>)"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "thฦฐ mแปฅc ฤ‘แป‘i tฦฐแปฃng cรณ chแปฉa mแป™t bแป™ cรกc tแบญp tin gรณi vร  cแบทp pack-index"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15477,15 +16523,15 @@ msgstr ""
 "trong suแป‘t quรก trรฌnh ฤ‘รณng gรณi lแบกi, gom cรกc tแบญp tin gรณi cรณ kรญch cแปก nhแป hฦกn "
 "vร o mแป™t bรณ cรกi mร  lแป›n hฦกn kรญch thฦฐแป›c nร y"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr "cรณ quรก nhiแปu ฤ‘แป‘i sแป‘"
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr "tรนy chแปn --batch-size chแป‰ cho lแป‡nh con 'repack'"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "khรดng hiแปƒu cรขu lแป‡nh con: %s"
@@ -15578,53 +16624,53 @@ msgstr "%s, nguแป“n=%s, ฤ‘รญch=%s"
 msgid "Renaming %s to %s\n"
 msgstr "ฤแป•i tรชn %s thร nh %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "gแบทp lแป—i khi ฤ‘แป•i tรชn โ€œ%sโ€"
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<cรกc tรนy chแปn>] <commit>โ€ฆ"
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<cรกc tรนy chแปn>] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<cรกc tรนy chแปn>] --stdin"
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr "chแป‰ hiแปƒn thแป‹ tรชn (khรดng SHA-1)"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "chแป‰ dรนng cรกc thแบป ฤ‘แปƒ ฤ‘แบทt tรชn cho cรกc lแบงn chuyแปƒn giao"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "chแป‰ sแปญ dแปฅng cรกc tham chiแบฟu khแป›p vแป›i <mแบซu>"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "bแป qua cรกc tham chiแบฟu khแป›p vแป›i <mแบซu>"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr ""
 "liแป‡t kรช tแบฅt cแบฃ cรกc lแบงn chuyแปƒn giao cรณ thแปƒ ฤ‘แปc ฤ‘ฦฐแปฃc tแปซ tแบฅt cแบฃ cรกc tham chiแบฟu"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "ฤ‘แปc tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "cho phรฉp in cรกc tรชn โ€œchฦฐa ฤ‘แป‹nh nghฤฉaโ€ (mแบทc ฤ‘แป‹nh)"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "bรฃi bแป tham chiแบฟu cรกc thแบป trong ฤ‘แบงu vร o (dรนng nแป™i bแป™)"
 
@@ -16022,7 +17068,7 @@ msgstr "cแป‘ gแบฏng gแปก bแป mแป™t note chฦฐa tแปซng tแป“n tแบกi khรดng phแบฃi
 msgid "read object names from the standard input"
 msgstr "ฤ‘แปc tรชn ฤ‘แป‘i tฦฐแปฃng tแปซ thiแบฟt bแป‹ nhแบญp chuแบฉn"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "khรดng gแปก bแป, chแป‰ hiแปƒn thแป‹"
 
@@ -16038,7 +17084,7 @@ msgstr "notes-ref"
 msgid "use notes from <notes-ref>"
 msgstr "dรนng โ€œnotesโ€ tแปซ <notes-ref>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1643
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "khรดng hiแปƒu cรขu lแป‡nh con: %s"
@@ -16057,126 +17103,103 @@ msgstr ""
 "git pack-objects [cรกc tรนy chแปnโ€ฆ] <base-name> [< <danh-sรกch-ref> | < <danh-"
 "sรกch-ฤ‘แป‘i-tฦฐแปฃng>]"
 
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:430
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "CRC cแปงa ฤ‘แป‘i tฦฐแปฃng gรณi sai vแป›i %s"
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:441
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "ฤ‘แป‘i tฦฐแปฃng ฤ‘รฃ ฤ‘รณng gรณi sai hแปng cho %s"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:572
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "dรฒ thแบฅy delta ฤ‘แป‡ quy cho ฤ‘แป‘i tฦฐแปฃng %s"
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "ฤ‘รฃ sแบฏp xแบฟp %u ฤ‘แป‘i tฦฐแปฃng, cแบงn %<PRIu32>"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "tแบญp tin gรณi khรดng hแปฃp lแป‡: %s"
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "khรดng thแปƒ mแปŸ tแบญp tin gรณi ฤ‘แปƒ dรนng lแบกi: %s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "khรดng thแปƒ di chuyแปƒn vแป‹ trรญ ฤ‘แปc trong tแบญp tin gรณi dรนng lแบกi"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "khรดng thแปƒ ฤ‘แปc tแปซ tแบญp tin gรณi dรนng lแบกi"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:972
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "tแบฏt ghi bitmap, cรกc gรณi bแป‹ chia nhแป bแปŸi vรฌ pack.packSizeLimit"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:985
 msgid "Writing objects"
 msgstr "ฤang ghi lแบกi cรกc ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "gแบทp lแป—i khi lแบฅy thรดng tin thแป‘ng kรช vแป %s"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1099
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "ฤ‘รฃ ghi %<PRIu32> ฤ‘แป‘i tฦฐแปฃng trong khi cแบงn %<PRIu32>"
 
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1297
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "tแบฏt ghi bitmap, nhฦฐ vแบญy mแป™t sแป‘ ฤ‘แป‘i tฦฐแปฃng sแบฝ khรดng ฤ‘ฦฐแปฃc ฤ‘รณng gรณi"
 
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1724
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "khoแบฃng bรน cฦก sแปŸ cho delta bแป‹ trร n trong gรณi cho %s"
 
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1733
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "khoแบฃng bรน cฦก sแปŸ cho delta nแบฑm ngoร i phแบกm cho %s"
 
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:2004
 msgid "Counting objects"
 msgstr "ฤang ฤ‘แบฟm cรกc ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/pack-objects.c:2005
-#, c-format
-msgid "unable to get size of %s"
-msgstr "khรดng thแปƒ lแบฅy kรญch cแปก cแปงa %s"
-
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2149
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "khรดng thแปƒ phรขn tรญch phแบงn ฤ‘แบงu ฤ‘แป‘i tฦฐแปฃng cแปงa โ€œ%sโ€"
 
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
 #, c-format
 msgid "object %s cannot be read"
 msgstr "khรดng thแปƒ ฤ‘แปc ฤ‘แป‘i tฦฐแปฃng %s"
 
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "ฤ‘แป‘i tฦฐแปฃng %s khรดng nhแบฅt quรกn vแป chiแปu dร i ฤ‘แป‘i tฦฐแปฃng (%<PRIuMAX> so vแป›i "
 "%<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2259
 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - hแบฟt bแป™ nhแป›"
 
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2574
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Nรฉn delta dรนng tแป›i %d tuyแบฟn trรฌnh"
 
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2713
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "khรดng thแปƒ ฤ‘รณng gรณi cรกc ฤ‘แป‘i tฦฐแปฃng tiแบฟp cแบญn ฤ‘ฦฐแปฃc tแปซ thแบป โ€œ%sโ€"
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2801
 msgid "Compressing objects"
 msgstr "ฤang nรฉn cรกc ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2807
 msgid "inconsistency with delta count"
 msgstr "mรขu thuแบซn vแป›i sแป‘ lฦฐแปฃng delta"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2888
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16185,7 +17208,7 @@ msgstr ""
 "cแบงn ID ฤ‘แป‘i tฦฐแปฃng cแบกnh, nhแบญn ฤ‘ฦฐแปฃc rรกc:\n"
 " %s"
 
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2894
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16194,247 +17217,235 @@ msgstr ""
 "cแบงn ID ฤ‘แป‘i tฦฐแปฃng, nhแบญn ฤ‘ฦฐแปฃc rรกc:\n"
 " %s"
 
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2992
 msgid "invalid value for --missing"
 msgstr "giรก trแป‹ cho --missing khรดng hแปฃp lแป‡"
 
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
 msgid "cannot open pack index"
 msgstr "khรดng thแปƒ mแปŸ mแปฅc lแปฅc cแปงa gรณi"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:3082
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "ฤ‘แป‘i tฦฐแปฃng mแบฅt tแบกi %s khรดng thแปƒ ฤ‘รฃ kiแปƒm tra"
 
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3167
 msgid "unable to force loose object"
 msgstr "khรดng thแปƒ buแป™c mแบฅt ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3260
 #, c-format
 msgid "not a rev '%s'"
 msgstr "khรดng phแบฃi mแป™t rev โ€œ%sโ€"
 
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3263
 #, c-format
 msgid "bad revision '%s'"
 msgstr "ฤ‘iแปƒm xem xรฉt sai โ€œ%sโ€"
 
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3288
 msgid "unable to add recent objects"
 msgstr "khรดng thแปƒ thรชm cรกc ฤ‘แป‘i tฦฐแปฃng mแป›i dรนng"
 
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3341
 #, c-format
 msgid "unsupported index version %s"
 msgstr "phiรชn bแบฃn mแปฅc lแปฅc khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ %s"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "bad index version '%s'"
 msgstr "phiรชn bแบฃn mแปฅc lแปฅc sai โ€œ%sโ€"
 
-#: builtin/pack-objects.c:3248
-msgid "do not show progress meter"
-msgstr "khรดng hiแปƒn thแป‹ bแป™ ฤ‘o tiแบฟn trรฌnh"
-
-#: builtin/pack-objects.c:3250
-msgid "show progress meter"
-msgstr "hiแปƒn thแป‹ bแป™ ฤ‘o tiแบฟn trรฌnh"
-
-#: builtin/pack-objects.c:3252
-msgid "show progress meter during object writing phase"
-msgstr "hiแปƒn thแป‹ bแป™ ฤ‘o tiแบฟn triแปƒn trong suแป‘t pha ghi ฤ‘แป‘i tฦฐแปฃng"
-
-#: builtin/pack-objects.c:3255
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "tฦฐฦกng tแปฑ --all-progress khi bแป™ ฤ‘o tiแบฟn trรฌnh ฤ‘ฦฐแปฃc xuแบฅt hiแป‡n"
-
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3383
 msgid "<version>[,<offset>]"
 msgstr "<phiรชn bแบฃn>[,offset]"
 
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3384
 msgid "write the pack index file in the specified idx format version"
 msgstr "ghi tแบญp tin bแบฃng mแปฅc lแปฅc gรณi (pack) แปŸ phiรชn bแบฃn ฤ‘แป‹nh dแบกng idx ฤ‘รฃ cho"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3387
 msgid "maximum size of each output pack file"
 msgstr "kcรญh thฦฐแป›c tแป‘i ฤ‘a cho tแบญp tin gรณi ฤ‘ฦฐแปฃc tแบกo"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3389
 msgid "ignore borrowed objects from alternate object store"
 msgstr "bแป qua cรกc ฤ‘แป‘i tฦฐแปฃng vay mฦฐแปฃn tแปซ kho ฤ‘แป‘i tฦฐแปฃng thay thแบฟ"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3391
 msgid "ignore packed objects"
 msgstr "bแป qua cรกc ฤ‘แป‘i tฦฐแปฃng ฤ‘รณng gรณi"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3393
 msgid "limit pack window by objects"
 msgstr "giแป›i hแบกn cแปญa sแป• ฤ‘รณng gรณi theo ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3395
 msgid "limit pack window by memory in addition to object limit"
 msgstr "giแป›i hแบกn cแปญa sแป• ฤ‘รณng gรณi theo bแป™ nhแป› cแป™ng thรชm vแป›i giแป›i hแบกn ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3397
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "ฤ‘แป™ dร i tแป‘i ฤ‘a cแปงa chuแป—i mรณc xรญch โ€œdeltaโ€ ฤ‘ฦฐแปฃc phรฉp trong gรณi kแบฟt quแบฃ"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3399
 msgid "reuse existing deltas"
 msgstr "dรนng lแบกi cรกc delta sแบตn cรณ"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3401
 msgid "reuse existing objects"
 msgstr "dรนng lแบกi cรกc ฤ‘แป‘i tฦฐแปฃng sแบตn cรณ"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3403
 msgid "use OFS_DELTA objects"
 msgstr "dรนng cรกc ฤ‘แป‘i tฦฐแปฃng OFS_DELTA"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3405
 msgid "use threads when searching for best delta matches"
 msgstr "sแปญ dแปฅng cรกc tuyแบฟn trรฌnh khi tรฌm kiแบฟm cho cรกc mแบซu khแป›p delta tแป‘t nhแบฅt"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3407
 msgid "do not create an empty pack output"
 msgstr "khรดng thแปƒ tแบกo kแบฟt xuแบฅt gรณi trแป‘ng rแป—ng"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3409
 msgid "read revision arguments from standard input"
 msgstr "ฤ‘แปc tham sแป‘ โ€œrevisionโ€ tแปซ thiแบฟt bแป‹ nhแบญp chuแบฉn"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3411
 msgid "limit the objects to those that are not yet packed"
 msgstr "giแป›i hแบกn cรกc ฤ‘แป‘i tฦฐแปฃng thร nh nhแปฏng cรกi mร  chรบng vแบซn chฦฐa ฤ‘ฦฐแปฃc ฤ‘รณng gรณi"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3414
 msgid "include objects reachable from any reference"
 msgstr "bao gแป“m cรกc ฤ‘แป‘i tฦฐแปฃng cรณ thแปƒ ฤ‘แปc ฤ‘ฦฐแปฃc tแปซ bแบฅt kแปณ tham chiแบฟu nร o"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3417
 msgid "include objects referred by reflog entries"
 msgstr "bao gแป“m cรกc ฤ‘แป‘i tฦฐแปฃng ฤ‘ฦฐแปฃc tham chiแบฟu bแปŸi cรกc mแปฅc reflog"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3420
 msgid "include objects referred to by the index"
 msgstr "bao gแป“m cรกc ฤ‘แป‘i tฦฐแปฃng ฤ‘ฦฐแปฃc tham chiแบฟu bแปŸi mแปฅc lแปฅc"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3423
 msgid "output pack to stdout"
 msgstr "xuแบฅt gรณi ra ฤ‘แบงu ra tiรชu chuแบฉn"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3425
 msgid "include tag objects that refer to objects to be packed"
 msgstr "bao gแป“m cรกc ฤ‘แป‘i tฦฐแปฃng tham chiแบฟu ฤ‘แบฟn cรกc ฤ‘แป‘i tฦฐแปฃng ฤ‘ฦฐแปฃc ฤ‘รณng gรณi"
 
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3427
 msgid "keep unreachable objects"
 msgstr "giแปฏ lแบกi cรกc ฤ‘แป‘i tฦฐแปฃng khรดng thแปƒ ฤ‘แปc ฤ‘ฦฐแปฃc"
 
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3429
 msgid "pack loose unreachable objects"
 msgstr "pack mแบฅt cรกc ฤ‘แป‘i tฦฐแปฃng khรดng thแปƒ ฤ‘แปc ฤ‘ฦฐแปฃc"
 
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3431
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 "xแบฃ nรฉn (gแปก khแปi gรณi) cรกc ฤ‘แป‘i tฦฐแปฃng khรดng thแปƒ ฤ‘แปc ฤ‘ฦฐแปฃc mแป›i hฦกn <thแปi-gian>"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3434
 msgid "use the sparse reachability algorithm"
-msgstr "dung thuแบญt toรกn โ€œsparse reachabilityโ€"
+msgstr "sแปญ dแปฅng thuแบญt toรกn โ€œsparse reachabilityโ€"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3436
 msgid "create thin packs"
 msgstr "tแบกo gรณi nhแบน"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3438
 msgid "create packs suitable for shallow fetches"
 msgstr "tแบกo gรณi ฤ‘แปƒ phรน hแปฃp cho lแบฅy vแป nรดng (shallow)"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3440
 msgid "ignore packs that have companion .keep file"
 msgstr "bแป qua cรกc gรณi mร  nรณ cรณ tแบญp tin .keep ฤ‘i kรจm"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3442
 msgid "ignore this pack"
 msgstr "bแป qua gรณi nร y"
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3444
 msgid "pack compression level"
 msgstr "mแปฉc nรฉn gรณi"
 
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3446
 msgid "do not hide commits by grafts"
 msgstr "khรดng แบฉn cรกc lแบงn chuyแปƒn giao bแปŸi โ€œgraftsโ€"
 
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3448
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "dรนng mแปฅc lแปฅc รกnh xแบก nแบฟu cรณ thแปƒ ฤ‘ฦฐแปฃc ฤ‘แปƒ nรขng cao tแป‘c ฤ‘แป™ ฤ‘แบฟm ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3450
 msgid "write a bitmap index together with the pack index"
 msgstr "ghi mแป™t mแปฅc lแปฅc รกnh xแบก cรนng vแป›i mแปฅc lแปฅc gรณi"
 
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3454
 msgid "write a bitmap index if possible"
 msgstr "ghi mแปฅc lแปฅc รกnh xแบก nแบฟu ฤ‘ฦฐแปฃc"
 
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3458
 msgid "handling for missing objects"
 msgstr "xแปญ lรฝ cho thiแบฟu ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3461
 msgid "do not pack objects in promisor packfiles"
 msgstr "khรดng thแปƒ ฤ‘รณng gรณi cรกc ฤ‘แป‘i tฦฐแปฃng trong cรกc tแบญp tin gรณi hแปฉa hแบนn"
 
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3463
 msgid "respect islands during delta compression"
 msgstr "tรดn trแปng island trong suแป‘t quรก trรฌnh nรฉn โ€œdeltaโ€"
 
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3492
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "mแปฉc sau xรญch delta %d lร  quรก sรขu, buแป™c dรนng %d"
 
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3497
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit lร  quรก cao, รฉp dรนng %d"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3551
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size khรดng thแปƒ ฤ‘ฦฐแปฃc sแปญ dแปฅng ฤ‘แปƒ xรขy dแปฑng mแป™t gรณi ฤ‘แปƒ vแบญn chuyแปƒn"
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3553
 msgid "minimum pack size limit is 1 MiB"
 msgstr "giแป›i hแบกn kรญch thฦฐแป›c tแป‘i thiแปƒu cแปงa gรณi lร  1 MiB"
 
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3558
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin khรดng thแปƒ ฤ‘ฦฐแปฃc dรนng ฤ‘แปƒ xรขy dแปฑng gรณi ฤ‘รกnh mแปฅc lแปฅc ฤ‘ฦฐแปฃc"
 
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3561
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable vร  --unpack-unreachable xung khแบฏc nhau"
 
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3567
 msgid "cannot use --filter without --stdout"
 msgstr "khรดng thแปƒ dรนng tรนy chแปn --filter mร  khรดng cรณ --stdout"
 
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3627
 msgid "Enumerating objects"
 msgstr "ฤรกnh sแป‘ cรกc ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3657
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "Tแป•ng %<PRIu32> (delta %<PRIu32>), dรนng lแบกi %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Tแป•ng %<PRIu32> (delta %<PRIu32>), dรนng lแบกi %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16476,53 +17487,53 @@ msgstr "giแป›i hแบกn giao ฤ‘แบฟn cรกc ฤ‘แป‘i tฦฐแปฃng nแบฑm ngoร i cรกc tแบญp ti
 msgid "cannot prune in a precious-objects repo"
 msgstr "khรดng thแปƒ tแป‰a bแป›t trong mแป™t kho ฤ‘แป‘i_tฦฐแปฃng_vฤฉ_ฤ‘แบกi"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Giรก trแป‹ khรดng hแปฃp lแป‡ %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<cรกc tรนy chแปn>] [<kho-chแปฉa> [<refspec>โ€ฆ]]"
 
-#: builtin/pull.c:141
+#: builtin/pull.c:122
 msgid "control for recursive fetching of submodules"
 msgstr "ฤ‘iแปu khiแปƒn viแป‡c lแบฅy vแป ฤ‘แป‡ quy cแปงa cรกc mรด-ฤ‘un-con"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:126
 msgid "Options related to merging"
 msgstr "Cรกc tรนy chแปn liรชn quan ฤ‘แบฟn hรฒa trแป™n"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:129
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "cรกc thay ฤ‘แป•i hแปฃp nhแบฅt bแบฑng cแบฃi tแป• thay vรฌ hรฒa trแป™n"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "cho phรฉp chuyแปƒn-tiแบฟp-nhanh"
 
-#: builtin/pull.c:185
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "tแปฑ ฤ‘แป™ng stash/stash pop tฦฐแป›c vร  sau tu bแป• (rebase)"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:182
 msgid "Options related to fetching"
 msgstr "Cรกc tรนy chแปn liรชn quan ฤ‘แบฟn lแป‡nh lแบฅy vแป"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:192
 msgid "force overwrite of local branch"
 msgstr "รฉp buแป™c ghi ฤ‘รจ lรชn nhรกnh nแป™i bแป™"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:200
 msgid "number of submodules pulled in parallel"
 msgstr "sแป‘ lฦฐแปฃng mรด-ฤ‘un-con ฤ‘ฦฐแปฃc ฤ‘แบฉy lรชn ฤ‘แป“ng thแปi"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:300
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Giรก trแป‹ khรดng hแปฃp lแป‡ cho pull.ff: %s"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:426
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16530,14 +17541,14 @@ msgstr ""
 "แปž ฤ‘รขy khรดng cรณ แปฉng cแปญ nร o ฤ‘แปƒ cแบฃi tแป• lแบกi trong sแป‘ cรกc tham chiแบฟu mร  bแบกn vแปซa "
 "lแบฅy vแป."
 
-#: builtin/pull.c:435
+#: builtin/pull.c:428
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "แปž ฤ‘รขy khรดng cรณ แปฉng cแปญ nร o ฤ‘แปƒ hรฒa trแป™n trong sแป‘ cรกc tham chiแบฟu mร  bแบกn vแปซa lแบฅy "
 "vแป."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:429
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16546,7 +17557,7 @@ msgstr ""
 "tแปฑ\n"
 "ฤ‘แบกi diแป‡n mร  nรณ lแบกi khรดng khแป›p trรชn ฤ‘iแปƒm cuแป‘i mรกy phแปฅc vแปฅ."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:432
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16558,43 +17569,43 @@ msgstr ""
 "theo mแบทc ฤ‘แป‹nh cho nhรกnh hiแป‡n tแบกi cแปงa bแบกn, bแบกn phแบฃi chแป‰ ฤ‘แป‹nh\n"
 "mแป™t nhรกnh trรชn dรฒng lแป‡nh."
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Hiแป‡n tแบกi bแบกn chแบณng แปŸ nhรกnh nร o cแบฃ."
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Vui lรฒng chแป‰ ฤ‘แป‹nh nhรกnh nร o bแบกn muแป‘n cแบฃi tแป• lแบกi."
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Vui lรฒng chแป‰ ฤ‘แป‹nh nhรกnh nร o bแบกn muแป‘n hรฒa trแป™n vร o."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:442 builtin/pull.c:457
 msgid "See git-pull(1) for details."
 msgstr "Xem git-pull(1) ฤ‘แปƒ biแบฟt thรชm chi tiแบฟt."
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<mรกy chแปง>"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<nhรกnh>"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "แปž ฤ‘รขy khรดng cรณ thรดng tin theo dรตi cho nhรกnh hiแป‡n hร nh."
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Nแบฟu bแบกn muแป‘n theo dรตi thรดng tin cho nhรกnh nร y bแบกn cรณ thแปƒ thแปฑc hiแป‡n bแบฑng lแป‡nh:"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:466
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16603,34 +17614,34 @@ msgstr ""
 "Cรกc ฤ‘แบทc tแบฃ cแบฅu hรฌnh cแปงa bแบกn ฤ‘แปƒ hรฒa trแป™n vแป›i tham chiแบฟu โ€œ%sโ€\n"
 "tแปซ mรกy dแป‹ch vแปฅ, nhฦฐng khรดng cรณ nhรกnh nร o nhฦฐ thแบฟ ฤ‘ฦฐแปฃc lแบฅy vแป."
 
-#: builtin/pull.c:581
+#: builtin/pull.c:576
 #, c-format
 msgid "unable to access commit %s"
 msgstr "khรดng thแปƒ truy cแบญp lแบงn chuyแปƒn giao โ€œ%sโ€"
 
-#: builtin/pull.c:861
+#: builtin/pull.c:857
 msgid "ignoring --verify-signatures for rebase"
 msgstr "bแป qua --verify-signatures khi rebase"
 
-#: builtin/pull.c:916
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "tรนy chแปn --[no-]autostash chแป‰ hแปฃp lแป‡ khi dรนng vแป›i --rebase."
 
-#: builtin/pull.c:924
+#: builtin/pull.c:920
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "ฤang cแบญp nhแบญt mแป™t nhรกnh chฦฐa ฤ‘ฦฐแปฃc sinh ra vแป›i cรกc thay ฤ‘แป•i ฤ‘ฦฐแปฃc thรชm vร o "
 "bแบฃng mแปฅc lแปฅc."
 
-#: builtin/pull.c:928
+#: builtin/pull.c:924
 msgid "pull with rebase"
 msgstr "pull vแป›i rebase"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:925
 msgid "please commit or stash them."
 msgstr "xin hรฃy chuyแปƒn giao hoแบทc tแบกm cแบฅt (stash) chรบng."
 
-#: builtin/pull.c:954
+#: builtin/pull.c:950
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16641,7 +17652,7 @@ msgstr ""
 "ฤ‘ang chuyแปƒn-tiแบฟp-nhanh cรขy lร m viแป‡c cแปงa bแบกn tแปซ\n"
 "lแบงn chuyแปƒn giaot %s."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:956
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16659,15 +17670,15 @@ msgstr ""
 "$ git reset --hard\n"
 "ฤ‘แปƒ khรดi phแปฅc lแบกi."
 
-#: builtin/pull.c:975
+#: builtin/pull.c:971
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Khรดng thแปƒ hรฒa trแป™n nhiแปu nhรกnh vร o trong mแป™t head trแป‘ng rแป—ng."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:975
 msgid "Cannot rebase onto multiple branches."
 msgstr "Khรดng thแปƒ thแปฑc hiแป‡n lแป‡nh rebase (cแบฃi tแป•) trรชn nhiแปu nhรกnh."
 
-#: builtin/pull.c:986
+#: builtin/pull.c:982
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "khรดng thแปƒ cแบฃi tแป• vแป›i cรกc thay ฤ‘แป•i mรด-ฤ‘un-con ฤ‘ฦฐแปฃc ghi lแบกi mแป™t cรกch cแปฅc bแป™"
@@ -16676,15 +17687,15 @@ msgstr ""
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<cรกc tรนy chแปn>] [<kho-chแปฉa> [<refspec>โ€ฆ]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "dรนng tแป‘c kรฝ thแบป khรดng cรณ <thแบป>"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete chแป‰ chแบฅp nhแบญn cรกc tรชn tham chiแบฟu dแบกng thฦฐแปng"
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16693,7 +17704,7 @@ msgstr ""
 "ฤแปƒ chแปn mแป—i tรนy chแปn mแป™t cรกch cแป‘ ฤ‘แป‹nh, xem push.default trong โ€œgit help "
 "configโ€."
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16718,7 +17729,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16733,7 +17744,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<tรชn-cแปงa-nhรกnh-mรกy-chแปง>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16747,12 +17758,12 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Nhรกnh hiแป‡n tแบกi %s cรณ nhiแปu nhรกnh thฦฐแปฃng nguแป“n, tแปซ chแป‘i push."
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -16764,14 +17775,14 @@ msgstr ""
 "nhรกnh hiแป‡n tแบกi โ€œ%sโ€ cแปงa bแบกn, mร  khรดng bรกo cho tรดi biแบฟt lร  cรกi gรฌ ฤ‘ฦฐแปฃc push\n"
 "ฤ‘แปƒ cแบญp nhแบญt nhรกnh mรกy chแปง nร o."
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Bแบกn ฤ‘รฃ khรดng chแป‰ ra mแป™t refspecs nร o ฤ‘แปƒ ฤ‘แบฉy lรชn, vร  push.default lร  \"khรดng "
 "lร  gรฌ cแบฃ\"."
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -16784,7 +17795,7 @@ msgstr ""
 "Xem โ€œNote about fast-forwardsโ€ trong โ€œgit push --helpโ€ ฤ‘แปƒ cรณ thรดng tin chi "
 "tiแบฟt."
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -16798,7 +17809,7 @@ msgstr ""
 "Xem โ€œNote about fast-forwardsโ€ trong โ€œgit push --helpโ€ ฤ‘แปƒ cรณ thรดng tin chi "
 "tiแบฟt."
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -16813,11 +17824,11 @@ msgstr ""
 "Xem โ€œNote about fast-forwardsโ€ trong โ€œgit push --helpโ€ ฤ‘แปƒ cรณ thรดng tin chi "
 "tiแบฟt."
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Viแป‡c cแบญp nhแบญt bแป‹ tแปซ chแป‘i bแปŸi vรฌ thแบป ฤ‘รฃ sแบตn cรณ tแปซ trฦฐแป›c trรชn mรกy chแปง."
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -16829,140 +17840,140 @@ msgstr ""
 "ฤ‘แป‘i tฦฐแปฃng\n"
 "khรดng phแบฃi chuyแปƒn giao, mร  khรดng sแปญ dแปฅng tรนy chแปn โ€œ--forceโ€.\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "ฤang ฤ‘แบฉy lรชn %s\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "gแบทp lแป—i khi ฤ‘แบฉy tแป›i mแป™t sแป‘ tham chiแบฟu ฤ‘แบฟn โ€œ%sโ€"
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "repository (kho) sai โ€œ%sโ€"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"Chฦฐa cแบฅu hรฌnh ฤ‘รญch ฤ‘แปƒ ฤ‘แบฉy lรชn.\n"
-"Hoแบทc lร  chแป‰ ra URL tแปซ dรฒng lแป‡nh hoแบทc lร  cแบฅu hรฌnh mแป™t kho mรกy chแปง sแปญ dแปฅng\n"
-"\n"
-"    git remote add <tรชn> <url>\n"
-"\n"
-"vร  sau ฤ‘รณ ฤ‘แบฉy lรชn sแปญ dแปฅng tรชn mรกy chแปง\n"
-"\n"
-"    git push <tรชn>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr "kho"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "ฤ‘แบฉy tแบฅt cแบฃ cรกc tham chiแบฟu"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "mirror tแบฅt cแบฃ cรกc tham chiแบฟu"
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "xรณa cรกc tham chiแบฟu"
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "ฤ‘แบฉy cรกc thแบป (khรดng dรนng cรนng vแป›i --all hay --mirror)"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "รฉp buแป™c cแบญp nhแบญt"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
 msgstr "<tรชn-tham-chiแบฟu>:<cแบงn>"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr "yรชu cแบงu giรก-trแป‹ cลฉ cแปงa tham chiแบฟu thรฌ lร  giรก-trแป‹ nร y"
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr "ฤ‘iแปu khiแปƒn viแป‡c ฤ‘แบฉy lรชn (push) ฤ‘แป‡ qui cแปงa mรด-ฤ‘un-con"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr "tแบกo gรณi nhแบน"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "chฦฐฦกng trรฌnh nhแบญn gรณi"
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr "ฤ‘แบทt thฦฐแปฃng nguแป“n cho git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
 msgstr "xรฉn tแป‰a nhแปฏng tham chiแบฟu bแป‹ gแปก bแป"
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr "vรฒng qua mรณc tiแปn-ฤ‘แบฉy (pre-push)"
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr "push phแบงn bแป‹ thiแบฟu nhฦฐng cรกc thแบป lแบกi thรญch hแปฃp"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr "kรฝ lแบงn ฤ‘แบฉy dรนng GPG"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr "yรชu cแบงu giao dแป‹ch hแบกt nhรขn bรชn phรญa mรกy chแปง"
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete lร  xung khแบฏc vแป›i cรกc tรนy chแปn --all, --mirror vร  --tags"
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete khรดng hแปฃp lรฝ nแบฟu khรดng cรณ bแบฅt kแปณ tham chiแบฟu nร o"
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "repository (kho) sai โ€œ%sโ€"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"Chฦฐa cแบฅu hรฌnh ฤ‘รญch ฤ‘แปƒ ฤ‘แบฉy lรชn.\n"
+"Hoแบทc lร  chแป‰ ra URL tแปซ dรฒng lแป‡nh hoแบทc lร  cแบฅu hรฌnh mแป™t kho mรกy chแปง sแปญ dแปฅng\n"
+"\n"
+"    git remote add <tรชn> <url>\n"
+"\n"
+"vร  sau ฤ‘รณ ฤ‘แบฉy lรชn sแปญ dแปฅng tรชn mรกy chแปง\n"
+"\n"
+"    git push <tรชn>\n"
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr "--all vร  --tags xung khแบฏc nhau"
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr "--all khรดng thแปƒ ฤ‘ฦฐแปฃc tแป• hแปฃp cรนng vแป›i ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn"
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror vร  --tags xung khแบฏc nhau"
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror khรดng thแปƒ ฤ‘ฦฐแปฃc tแป• hแปฃp cรนng vแป›i ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn"
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr "--all vร  --mirror xung khแบฏc nhau"
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr "cรกc tรนy chแปn push phแบฃi khรดng cรณ kรฝ tแปฑ dรฒng mแป›i"
 
@@ -16979,24 +17990,32 @@ msgstr "git range-diff [<cรกc tรนy chแปn>] <old-tip>โ€ฆ<new-tip>"
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<cรกc tรนy chแปn>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr "Tแปท lแป‡ phแบงn trฤƒm cรกi tแบกo lร  weighted"
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "dรนng mร u diff ฤ‘ฦกn giแบฃn"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "ghi chรบ"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "chuyแปƒn cho โ€œgit logโ€"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr "khรดng cรณ .. trong vรนng: โ€œ%sโ€"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "ฤ‘แป‹nh dแบกng ฤ‘แป‘i sแป‘ ฤ‘ฦกn phแบฃi lร  mแป™t vรนng ฤ‘แป‘i xแปฉng"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "cแบงn hai vรนng lแบงn chuyแปƒn giao"
 
@@ -17080,13 +18099,17 @@ msgstr "gแปก lแป—i โ€œunpack-treesโ€"
 msgid "suppress feedback messages"
 msgstr "khรดng xuแบฅt cรกc thรดng tin phแบฃn hแป“i"
 
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Bแบกn cแบงn phแบฃi giแบฃi quyแบฟt bแบฃng mแปฅc lแปฅc hiแป‡n tแบกi cแปงa bแบกn trฦฐแป›c ฤ‘รฃ"
+
 #: builtin/rebase.c:32
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [cรกc tรนy chแปn] [--exec <lแป‡nh>] [--onto <newbase>] "
-"[<upstream>] [<nhรกnh>]"
+"git rebase [-i] [cรกc tรนy chแปn] [--exec <lแป‡nh>] [--onto <newbase> | --keep-"
+"base] [<upstream>] [<nhรกnh>]]"
 
 #: builtin/rebase.c:34
 msgid ""
@@ -17099,216 +18122,207 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "danh sรกch cแบงn lร m khรดng dรนng ฤ‘ฦฐแปฃc: โ€œ%sโ€"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "khรดng thแปƒ ghi โ€œ%sโ€."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "khรดng HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:292
 #, c-format
 msgid "could not create temporary %s"
 msgstr "khรดng thแปƒ tแบกo %s tแบกm thแปi"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:298
 msgid "could not mark as interactive"
 msgstr "khรดng thแปƒ ฤ‘รกnh dแบฅu lร  tฦฐฦกng tรกc"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:352
 msgid "could not generate todo list"
 msgstr "khรดng thแปƒ tแบกo danh sรกch cแบงn lร m"
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:391
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "lแบงn chuyแปƒn giao cฦก sแป phแบฃi ฤ‘ฦฐแปฃc chแป‰ ฤ‘แป‹nh vแป›i --upstream hoแบทc --onto"
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:461
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<cรกc tรนy chแปn>]"
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "giแปฏ lแบกi cรกc lแบงn chuyแปƒn giao rแป—ng"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(Cลจ) giแปฏ lแบกi cรกc lแบงn chuyแปƒn giao rแป—ng"
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "chแบฅp nhแบญn chuyแปƒn giao mร  khรดng ghi chรบ gรฌ"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:480
 msgid "rebase merge commits"
 msgstr "cแบฃi tแป• cรกc lแบงn chuyแปƒn giao hรฒa trแป™n"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:482
 msgid "keep original branch points of cousins"
 msgstr "giแปฏ cรกc ฤ‘iแปƒm nhรกnh nguyรชn bแบฃn cแปงa cรกc anh em hแป"
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:484
 msgid "move commits that begin with squash!/fixup!"
 msgstr "di chuyแปƒn cรกc lแบงn chuyแปƒn giao bแบฏt ฤ‘แบงu bแบฑng squash!/fixup!"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:485
 msgid "sign commits"
 msgstr "kรฝ cรกc lแบงn chuyแปƒn giao"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:487 builtin/rebase.c:1490
 msgid "display a diffstat of what changed upstream"
 msgstr "hiแปƒn thแป‹ mแป™t diffstat cแปงa nhแปฏng thay ฤ‘แป•i thฦฐแปฃng nguแป“n"
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:489
 msgid "continue rebase"
 msgstr "tiแบฟp tแปฅc cแบฃi tแป•"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:491
 msgid "skip commit"
 msgstr "bแป qua lแบงn chuyแปƒn giao"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:492
 msgid "edit the todo list"
 msgstr "sแปญa danh sรกch cแบงn lร m"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:494
 msgid "show the current patch"
 msgstr "hiแปƒn thแป‹ miแบฟng vรก hiแป‡n hร nh"
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:497
 msgid "shorten commit ids in the todo list"
 msgstr "rรบt ngแบฏn mรฃ chuyแปƒn giao trong danh sรกch cแบงn lร m"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:499
 msgid "expand commit ids in the todo list"
 msgstr "khai triแปƒn mรฃ chuyแปƒn giao trong danh sรกch cแบงn lร m"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:501
 msgid "check the todo list"
 msgstr "kiแปƒm tra danh sรกch cแบงn lร m"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:503
 msgid "rearrange fixup/squash lines"
 msgstr "sแบฏp xแบฟp lแบกi cรกc dรฒng fixup/squash"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:505
 msgid "insert exec commands in todo list"
 msgstr "chรจn cรกc lแป‡nh thแปฑc thi trong danh sรกch cแบงn lร m"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:506
 msgid "onto"
 msgstr "lรชn trรชn"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict-revision"
 msgstr "ฤ‘iแปƒm-xรฉt-duyแป‡t-hแบกn-chแบฟ"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict revision"
 msgstr "ฤ‘iแปƒm xรฉt duyแป‡t hแบกn chแบฟ"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:511
 msgid "squash-onto"
 msgstr "squash-lรชn-trรชn"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:512
 msgid "squash onto"
 msgstr "squash lรชn trรชn"
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:514
 msgid "the upstream commit"
 msgstr "lแบงn chuyแปƒn giao thฦฐแปฃng nguแป“n"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head-name"
 msgstr "tรชn-ฤ‘แบงu"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head name"
 msgstr "tรชn ฤ‘แบงu"
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:521
 msgid "rebase strategy"
 msgstr "chiแบฟn lฦฐแปฃc cแบฃi tแป•"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:522
 msgid "strategy-opts"
 msgstr "tรนy-chแปn-chiแบฟn-lฦฐแปฃc"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:523
 msgid "strategy options"
 msgstr "cรกc tรนy chแปn chiแบฟn lฦฐแปฃc"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:524
 msgid "switch-to"
 msgstr "chuyแปƒn-ฤ‘แบฟn"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:525
 msgid "the branch or commit to checkout"
 msgstr "nhรกnh hay lแบงn chuyแปƒn giao lแบงn lแบฅy ra"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto-name"
 msgstr "onto-name"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto name"
 msgstr "tรชn lรชn trรชn"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "cmd"
 msgstr "lแป‡nh"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "the command to run"
 msgstr "lแป‡nh muแป‘n chแบกy"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:530 builtin/rebase.c:1584
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "lแบญp lแป‹ch lแบกi mแป™t cรกch tแปฑ ฤ‘แป™ng bแบฅt kแปณ โ€œexecโ€œ bแป‹ lแป—i"
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:546
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins khรดng cรณ tรกc dแปฅng khi khรดng cรณ --rebase-merges"
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:562
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s cแบงn mแป™t cแบฃi tแป• kiแปƒu tฦฐฦกng tรกc"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:612
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "khรดng thแปƒ ฤ‘แบทt lแบฅy โ€œontoโ€: โ€œ%sโ€"
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:627
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head khรดng hแปฃp lแป‡: โ€œ%sโ€"
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:652
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ฤ‘ang bแป qua allow_rerere_autoupdate khรดng hแปฃp lแป‡: โ€œ%sโ€"
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:728
 #, c-format
 msgid "Could not read '%s'"
 msgstr "Khรดng thแปƒ ฤ‘แปc โ€œ%sโ€"
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:746
 #, c-format
 msgid "Cannot store %s"
 msgstr "Khรดng thแปƒ lฦฐu โ€œ%sโ€"
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:853
 msgid "could not determine HEAD revision"
 msgstr "khรดng thแปƒ dรฒ tรฌm ฤ‘iแปƒm xรฉt duyแป‡t HEAD"
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17323,7 +18337,7 @@ msgstr ""
 "ฤแปƒ bรฃi bแป vร  quay trแปŸ lแบกi trแบกng thรกi trฦฐแป›c \"git rebase\", chแบกy \"git rebase "
 "--abort\"."
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -17342,7 +18356,16 @@ msgstr ""
 "\n"
 "Kแบฟt quแบฃ lร  git khรดng thแปƒ cแบฃi tแป• lแบกi chรบng."
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"kiแปƒu rแป—ng khรดng ฤ‘ฦฐแปฃc nhแบญn dแบกng '%s'; giรก trแป‹ hแปฃp lแป‡ lร  \"drop\", \"keep\", "
+"vร  \"ask\"."
+
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "%s\n"
@@ -17359,7 +18382,7 @@ msgstr ""
 "    git rebase โ€œ<nhรกnh>โ€\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1417
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17373,128 +18396,137 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<nhรกnh> %s\n"
 "\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1447
 msgid "exec commands cannot contain newlines"
 msgstr "cรกc lแป‡nh thแปฑc thi khรดng thแปƒ chแปฉa cรกc kรฝ tแปฑ dรฒng mแป›i"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1451
 msgid "empty exec command"
 msgstr "lแป‡nh thแปฑc thi trแป‘ng rแป—ng"
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1481
 msgid "rebase onto given branch instead of upstream"
 msgstr "cแบฃi tแป• vร o nhรกnh ฤ‘รฃ cho thay cho thฦฐแปฃng nguแป“n"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr ""
+"sแปญ dแปฅng cรกc cฦก sแปŸ hรฒa trแป™n cแปงa thฦฐแปฃng nguแป“n vร  nhรกnh nhฦฐ lร  cฦก sแปŸ hiแป‡n tแบกi"
+
+#: builtin/rebase.c:1485
 msgid "allow pre-rebase hook to run"
 msgstr "cho phรฉp mรณc (hook) pre-rebase ฤ‘ฦฐแปฃc chแบกy"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1487
 msgid "be quiet. implies --no-stat"
 msgstr "hรฃy im lแบทng. รฝ lร  --no-stat"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1493
 msgid "do not show diffstat of what changed upstream"
 msgstr "ฤ‘แปซng hiแปƒn thแป‹ diffstat cแปงa nhแปฏng thay ฤ‘แป•i thฦฐแปฃng nguแป“n"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1496
 msgid "add a Signed-off-by: line to each commit"
 msgstr "thรชm dรฒng Signed-off-by: cho tแปซng lแบงn chuyแปƒn giao"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
 msgid "passed to 'git am'"
 msgstr "chuyแปƒn cho โ€œgit amโ€"
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
 msgid "passed to 'git apply'"
 msgstr "chuyแปƒn cho โ€œgit applyโ€"
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 "cherry-pick tแบฅt cแบฃ cรกc lแบงn chuyแปƒn giao, ngay cแบฃ khi khรดng cรณ thay ฤ‘แป•i gรฌ"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1515
 msgid "continue"
 msgstr "tiแบฟp tแปฅc"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1518
 msgid "skip current patch and continue"
 msgstr "bแป qua miแบฟng vรก hiแป‡n hร nh vร  tiแบฟp tแปฅc"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1520
 msgid "abort and check out the original branch"
 msgstr "bรฃi bแป vร  lแบฅy ra nhรกnh nguyรชn thแปงy"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1523
 msgid "abort but keep HEAD where it is"
 msgstr "bรฃi bแป nhฦฐng vแบซn vแบซn giแปฏ HEAD chแป‰ ฤ‘แบฟn nรณ"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1524
 msgid "edit the todo list during an interactive rebase"
 msgstr "sแปญa danh sรกch cแบงn lร m trong quรก trรฌnh โ€œrebaseโ€ (cแบฃi tแป•) tฦฐฦกng tรกc"
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1527
 msgid "show the patch file being applied or merged"
 msgstr "hiแปƒn thแป‹ miแบฟng vรก ฤ‘รฃ ฤ‘ฦฐแปฃc รกp dแปฅng hay hรฒa trแป™n"
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "dรนng chiแบฟn lฦฐแปฃc รกp dแปฅng ฤ‘แปƒ cแบฃi tแป•"
+
+#: builtin/rebase.c:1534
 msgid "use merging strategies to rebase"
 msgstr "dรนng chiแบฟn lฦฐแปฃc hรฒa trแป™n ฤ‘แปƒ cแบฃi tแป•"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1538
 msgid "let the user edit the list of commits to rebase"
 msgstr "ฤ‘แปƒ ngฦฐแปi dรนng sแปญa danh sรกch cรกc lแบงn chuyแปƒn giao muแป‘n cแบฃi tแป•"
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1542
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(ฤรƒ Lแบ C HแบฌU) hay thแปญ tแบกo lแบกi cรกc hรฒa trแป™n thay vรฌ bแป qua chรบng"
 
-#: builtin/rebase.c:1455
-msgid "preserve empty commits during rebase"
-msgstr "ngฤƒn cแบฅm cรกc lแบงn chuyแปƒn giao trแป‘ng rแป—ng trong suแป‘t quรก trรฌnh cแบฃi tแป•"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "xแปญ lรฝ cรกc lแบงn chuyแปƒn giao mร  nรณ trแปŸ thร nh trแป‘ng rแป—ng nhฦฐ thแบฟ nร o"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1554
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "di chuyแปƒn cรกc lแบงn chuyแปƒn giao mร  bแบฏt ฤ‘แบงu bแบฑng squash!/fixup! dฦฐแป›i -i"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1560
 msgid "automatically stash/stash pop before and after"
 msgstr "tแปฑ ฤ‘แป™ng stash/stash pop trฦฐแป›c vร  sau"
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1562
 msgid "add exec lines after each commit of the editable list"
 msgstr "thรชm cรกc dรฒng thแปฑc thi sau tแปซng lแบงn chuyแปƒn giao cแปงa danh sรกch sแปญa ฤ‘ฦฐแปฃc"
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1566
 msgid "allow rebasing commits with empty messages"
 msgstr "chแบฅp nhแบญn cแบฃi tแป• cรกc chuyแปƒn giao mร  khรดng ghi chรบ gรฌ"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1570
 msgid "try to rebase merges instead of skipping them"
 msgstr "cแป‘ thแปญ cแบฃi tแป• cรกc hรฒa trแป™n thay vรฌ bแป qua chรบng"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1573
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "dรนng โ€œmerge-base --fork-pointโ€ ฤ‘แปƒ ฤ‘แป‹nh nghฤฉa lแบกi thฦฐแปฃng nguแป“n"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1575
 msgid "use the given merge strategy"
 msgstr "dรนng chiแบฟn lฦฐแปฃc hรฒa trแป™n ฤ‘รฃ cho"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
 msgid "option"
 msgstr "tรนy chแปn"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1578
 msgid "pass the argument through to the merge strategy"
 msgstr "chuyแปƒn thao sแป‘ ฤ‘แบฟn chiแบฟn lฦฐแปฃc hรฒa trแป™n"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1581
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "cแบฃi tแป• tแบฅt cรกc cรกc lแบงn chuyแปƒn giao cho ฤ‘แบฟn root"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1598
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -17502,33 +18534,41 @@ msgstr ""
 "viแป‡c hแป— trแปฃ rebase.useBuiltin ฤ‘รฃ bแป‹ xรณa!\n"
 "Xem mแปฅc tin cแปงa nรณ trong โ€œ git help configโ€ ฤ‘แปƒ biแบฟt chi tiแบฟt."
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1604
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 "Hรฌnh nhฦฐ ฤ‘ang trong quรก trรฌnh thแปฑc hiแป‡n lแป‡nh โ€œgit-amโ€. Khรดng thแปƒ rebase."
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1645
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 "git rebase --preserve-merges ฤ‘รฃ lแบกc hแบญu. Hรฃy dรนng --rebase-merges ฤ‘แปƒ thay "
 "thแบฟ."
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "khรดng thแปƒ kแบฟt hแปฃp โ€œ--keep-baseโ€ vแป›i โ€œ--ontoโ€"
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "khรดng thแปƒ kแบฟt hแปฃp โ€œ--keep-baseโ€ vแป›i โ€œ--rootโ€"
+
+#: builtin/rebase.c:1656
 msgid "No rebase in progress?"
 msgstr "Khรดng cรณ tiแบฟn trรฌnh rebase nร o phแบฃi khรดng?"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1660
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Hร nh ฤ‘แป™ng โ€œ--edit-todoโ€ chแป‰ cรณ thแปƒ dรนng trong quรก trรฌnh โ€œrebaseโ€ (sแปญa lแป‹ch "
 "sแปญ) tฦฐฦกng tรกc."
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1683
 msgid "Cannot read HEAD"
 msgstr "Khรดng thแปƒ ฤ‘แปc HEAD"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1695
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17536,16 +18576,16 @@ msgstr ""
 "Bแบกn phแบฃi sแปญa tแบฅt cแบฃ cรกc lแบงn hรฒa trแป™n xung ฤ‘แป™t vร  sau\n"
 "ฤ‘รณ ฤ‘รกnh dแบฅu chรบng lร  cแบงn xแปญ lรฝ sแปญ dแปฅng lแป‡nh git add"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1714
 msgid "could not discard worktree changes"
 msgstr "khรดng thแปƒ loแบกi bแป cรกc thay ฤ‘แป•i cรขy-lร m-viแป‡c"
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1733
 #, c-format
 msgid "could not move back to %s"
 msgstr "khรดng thแปƒ quay trแปŸ lแบกi %s"
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1778
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17566,173 +18606,164 @@ msgstr ""
 "vร  chแบกy Tร”I lแบงn nแปฏa. Tร”I dแปซng lแบกi trong trฦฐแปng hแปฃp bแบกn vแบซn\n"
 "cรณ mแป™t sแป‘ thแปฉ quรฝ giรก แปŸ ฤ‘รขy.\n"
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1806
 msgid "switch `C' expects a numerical value"
 msgstr "tรนy chแปn โ€œ%cโ€ cแบงn mแป™t giรก trแป‹ bแบฑng sแป‘"
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1847
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Khรดng hiแปƒu chแบฟ ฤ‘แป™: %s"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1869
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy cแบงn --merge hay --interactive"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr "khรดng thแปƒ tแป• hแปฃp cรกc tรนy chแปn รกp dแปฅng vแป›i cรกc tรนy chแปn hรฒa trแป™n"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Khรดng hiแปƒu แปฉng dแปฅng chแบกy phรญa sau lแป‡nh cแบฃi tแป•: %s"
+
+#: builtin/rebase.c:1937
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec cแบงn --exec hay --interactive"
 
-#: builtin/rebase.c:1809
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"khรดng thแปƒ tแป• hแปฃp cรกc tรนy chแปn am vแป›i cรกc tรนy chแปn tฦฐฦกng tรกc hay hรฒa trแป™n"
-
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1957
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "khรดng thแปƒ kแบฟt hแปฃp โ€œ--preserve-mergesโ€ vแป›i โ€œ--rebase-mergesโ€"
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1961
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr "khรดng thแปƒ kแบฟt hแปฃp โ€œ--preserve-mergesโ€ vแป›i โ€œ--reschedule-failed-execโ€"
 
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "khรดng thแปƒ kแบฟt hแปฃp โ€œ--rebase-mergesโ€ vแป›i โ€œ--strategy-optionโ€"
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "khรดng thแปƒ kแบฟt hแปฃp โ€œ--rebase-mergesโ€ vแป›i โ€œ--strategyโ€"
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1985
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "thฦฐแปฃng nguแป“n khรดng hแปฃp lแป‡ โ€œ%sโ€"
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1991
 msgid "Could not create new root commit"
 msgstr "Khรดng thแปƒ tแบกo lแบงn chuyแปƒn giao gแป‘c mแป›i"
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "โ€œ%sโ€: cแบงn chรญnh xรกc mแป™t cฦก sแปŸ hรฒa trแป™n vแป›i nhรกnh"
+
+#: builtin/rebase.c:2020
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "โ€œ%sโ€: cแบงn chรญnh xรกc mแป™t cฦก sแปŸ hรฒa trแป™n"
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:2028
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Khรดng chแป‰ ฤ‘แบฟn mแป™t lแบงn chuyแปƒn giao khรดng hแปฃp lแป‡ โ€œ%sโ€"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:2054
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "nghiรชm trแปng: khรดng cรณ nhรกnh/lแบงn chuyแปƒn giao โ€œ%sโ€ nhฦฐ thแบฟ"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr "Khรดng cรณ tham chiแบฟu nร o nhฦฐ thแบฟ: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2073
 msgid "Could not resolve HEAD to a revision"
 msgstr "Khรดng thแปƒ phรขn giแบฃi lแบงn chuyแปƒn giao HEAD ฤ‘แบฟn mแป™t ฤ‘iแปƒm xรฉt duyแป‡t"
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2111
 msgid "Cannot autostash"
 msgstr "Khรดng thแปƒ autostash"
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2114
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Gแบทp ฤ‘รกp แปฉng stash khรดng cแบงn: โ€œ%sโ€"
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2120
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Khรดng thแปƒ tแบกo thฦฐ mแปฅc cho โ€œ%sโ€"
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2123
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "ฤรฃ tแบกo autostash: %s\n"
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2126
 msgid "could not reset --hard"
 msgstr "khรดng thแปƒ reset --hard"
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD hiแป‡n giแป tแบกi %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2135
 msgid "Please commit or stash them."
 msgstr "Xin hรฃy chuyแปƒn giao hoแบทc tแบกm cแบฅt (stash) chรบng."
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp โ€œ%sโ€"
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2169
 #, c-format
 msgid "could not switch to %s"
 msgstr "khรดng thแปƒ chuyแปƒn ฤ‘แบฟn %s"
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2180
 msgid "HEAD is up to date."
 msgstr "HEAD ฤ‘รฃ cแบญp nhแบญt."
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2182
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Nhรกnh hiแป‡n tแบกi %s ฤ‘รฃ ฤ‘ฦฐแปฃc cแบญp nhแบญt rแป“i.\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2190
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD hiแป‡n ฤ‘รฃ ฤ‘ฦฐแปฃc cแบญp nhแบญt rแป“i, bแป‹ รฉp buแป™c rebase."
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Nhรกnh hiแป‡n tแบกi %s ฤ‘รฃ ฤ‘ฦฐแปฃc cแบญp nhแบญt rแป“i, lแป‡nh rebase รฉp buแป™c.\n"
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2200
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Mรณc (hook) pre-rebase tแปซ chแป‘i rebase."
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2207
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Thay ฤ‘แป•i thร nh %s:\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2210
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Thay ฤ‘แป•i tแปซ %s thร nh %s:\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2235
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Trฦฐแป›c tiรชn, di chuyแปƒn head ฤ‘แปƒ xem lแบกi cรกc cรดng viแป‡c trรชn ฤ‘แป‰nh cแปงa nรณโ€ฆ\n"
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2244
 msgid "Could not detach HEAD"
 msgstr "Khรดng thแปƒ tรกch rแปi HEAD"
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2253
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Chuyแปƒn-tiแบฟp-nhanh %s ฤ‘แบฟn %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <thฦฐ-mแปฅc-git>"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:821
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -17762,7 +18793,7 @@ msgstr ""
 "ฤแปƒ chแบฅm dแปฉt lแปi nhแบฏn nร y vร  vแบซn giแปฏ cรกch แปฉng xแปญ mแบทc ฤ‘แป‹nh, hรฃy ฤ‘แบทt\n"
 "biแบฟn cแบฅu hรฌnh โ€œreceive.denyCurrentBranchโ€ thร nh โ€œrefuseโ€."
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -17813,49 +18844,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <tham_chiแบฟu>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "โ€œ%sโ€ khรดng phแบฃi lร  dแบฅu thแปi gian hแปฃp lแป‡"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "ฤรกnh dแบฅu cรกc ฤ‘แป‘i tฦฐแปฃng tiแบฟp cแบญn ฤ‘ฦฐแปฃcโ€ฆ"
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s chแบณng chแป‰ ฤ‘แบฟn ฤ‘รขu cแบฃ!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr "chฦฐa chแป‰ ra reflog ฤ‘แปƒ xรณa"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr "khรดng phแบฃi mแป™t reflog: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "khรดng reflog cho โ€œ%sโ€"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "ฤ‘แป‹nh dแบกng tham chiแบฟu khรดng hแปฃp lแป‡: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -17863,82 +18894,82 @@ msgstr ""
 "git remote add [-t <nhรกnh>] [-m <master>] [-f] [--tags|--no-tags] [--"
 "mirror=<fetch|push>] <tรชn> <url>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <tรชn-cลฉ> <tรชn-mแป›i>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <tรชn>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <tรชn> (-a | --auto | -d | --delete | <nhรกnh>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <tรชn>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <tรชn>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<nhรณm> | <mรกy-chแปง>)โ€ฆ]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <tรชn> <nhรกnh>โ€ฆ"
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote set-url [--push] [--all] <tรชn>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <tรชn> <url-mแป›i> [<url-cลฉ>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <tรชn> <url-mแป›i>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <tรชn> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<cรกc tรนy chแปn>] <tรชn> <url>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <tรชn> <nhรกnh>โ€ฆ"
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <tรชn> <nhรกnh>โ€ฆ"
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<cรกc tรนy chแปn>] <tรชn>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<cรกc tรนy chแปn>] <tรชn>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<cรกc tรนy chแปn>] [<nhรณm> | <mรกy-chแปง>]โ€ฆ"
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "ฤang cแบญp nhแบญt %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -17946,82 +18977,98 @@ msgstr ""
 "--mirror nguy hiแปƒm vร  khรดng dรนng nแปฏa; xin hรฃy\n"
 "\t sแปญ dแปฅng tรนy chแปn --mirror=fetch hoแบทc --mirror=push ฤ‘แปƒ thay thแบฟ"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "khรดng hiแปƒu tham sแป‘ mรกy bแบฃn sao (mirror): %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "lแบฅy vแป cรกc nhรกnh tแปซ mรกy chแปง"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "nhแบญp vร o tแบฅt cแบฃ cรกc ฤ‘แป‘i tฦฐแปฃng thแบป vร  thร nh phแบงn liรชn quan khi lแบฅy vแป"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "hoแบทc khรดng lแบฅy vแป bแบฅt kแปณ thแบป nร o (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "cรกc nhรกnh ฤ‘แปƒ theo dรตi"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "nhรกnh master"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "ฤ‘แบทt mรกy chแปง (remote) nhฦฐ lร  mแป™t mรกy bแบฃn sao ฤ‘แปƒ push hay fetch tแปซ ฤ‘รณ"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "ฤ‘ang chแป‰ ฤ‘แป‹nh mแป™t nhรกnh master khรดng hแปฃp lรฝ vแป›i tรนy chแปn --mirror"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "chแป‰ ฤ‘แป‹nh nhแปฏng nhรกnh ฤ‘แปƒ theo dรตi chแป‰ hแปฃp lรฝ vแป›i cรกc โ€œfetch mirrorโ€"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr "mรกy chแปง %s ฤ‘รฃ tแป“n tแบกi rแป“i."
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "โ€œ%sโ€ khรดng phแบฃi tรชn mรกy chแปง hแปฃp lแป‡"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Khรดng thแปƒ cร i ฤ‘แบทt nhรกnh master โ€œ%sโ€"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Khรดng thแปƒ lแบฅy รกnh xแบก (map) fetch cho ฤ‘แบทc tแบฃ tham chiแบฟu %s"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "(khแป›p)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "(xรณa)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "khรดng thแปƒ ฤ‘แบทt โ€œ%sโ€"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Cแบฅu hรฌnh %s remote.pushDefault trong:\n"
+"\t%s:%d\n"
+"bรขy giแป tรชn trรชn mรกy chแปง khรดng tแป“n tแบกi '%s'"
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Khรดng cรณ mรกy chแปง nร o nhฦฐ vแบญy: โ€œ%sโ€"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Khรดng thแปƒ ฤ‘แป•i tรชn phแบงn cแปงa cแบฅu hรฌnh tแปซ โ€œ%sโ€ thร nh โ€œ%sโ€"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18032,17 +19079,17 @@ msgstr ""
 "\t%s\n"
 "\tXin hรฃy cแบญp nhแบญt phแบงn cแบฅu hรฌnh mแป™t cรกch thแปง cรดng nแบฟu thแบฅy cแบงn thiแบฟt."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "gแบทp lแป—i khi xรณa โ€œ%sโ€"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr "gแบทp lแป—i khi tแบกo โ€œ%sโ€"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18054,119 +19101,119 @@ msgstr[0] ""
 "ฤ‘i;\n"
 "ฤ‘แปƒ xรณa ฤ‘i, sแปญ dแปฅng:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Khรดng thแปƒ gแปก bแป phแบงn cแบฅu hรฌnh โ€œ%sโ€"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " mแป›i (lแบงn lแบฅy vแป tiแบฟp theo sแบฝ lฦฐu trong remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr " ฤ‘ฦฐแปฃc theo dรตi"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " cลฉ rรญch (dรนng โ€œgit remote pruneโ€ ฤ‘แปƒ gแปก bแป)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge khรดng hแปฃp lแป‡; khรดng thแปƒ cแบฃi tแป• vแป phรญa > 1 nhรกnh"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "thแปฑc hiแป‡n rebase mแป™t cรกch tฦฐฦกng tรกc trรชn mรกy chแปง %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1052
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 "thแปฑc hiแป‡n cแบฃi tแป• (vแป›i cรกc hรฒa trแป™n) mแป™t cรกch tฦฐฦกng tรกc lรชn trรชn mรกy chแปง %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "thแปฑc hiแป‡n rebase trรชn mรกy chแปง %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr " hรฒa trแป™n vแป›i mรกy chแปง %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr "hรฒa trแป™n vแป›i mรกy chแปง %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    vร  vแป›i mรกy chแปง %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr "tแบกo"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr "xรณa"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr "ฤ‘รฃ cแบญp nhแบญt"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr "cรณ-thแปƒ-chuyแปƒn-tiแบฟp-nhanh"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr "dแปฏ liแป‡u nแป™i bแป™ ฤ‘รฃ cลฉ"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s รฉp buแป™c thร nh %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s ฤ‘แบฉy lรชn thร nh %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s รฉp buแป™c thร nh %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s ฤ‘แบฉy lรชn thร nh %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr "khรดng truy vแบฅn cรกc mรกy chแปง"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr "* mรกy chแปง %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL ฤ‘แปƒ lแบฅy vแป: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr "(khรดng cรณ URL)"
 
@@ -18174,190 +19221,181 @@ msgstr "(khรดng cรณ URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL ฤ‘แปƒ ฤ‘แบฉy lรชn: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Nhรกnh HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr "(khรดng yรชu cแบงu)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr "(khรดng hiแปƒu)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  nhรกnh HEAD (HEAD mรกy chแปง chฦฐa rรต rร ng, cรณ lแบฝ lร  mแป™t trong sแป‘ sau):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Nhแปฏng nhรกnh trรชn mรกy chแปง:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr " (trแบกng thรกi khรดng ฤ‘ฦฐแปฃc yรชu cแบงu)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Nhแปฏng nhรกnh nแป™i bแป™ ฤ‘รฃ ฤ‘ฦฐแปฃc cแบฅu hรฌnh cho lแป‡nh โ€œgit pullโ€:"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  refs nแป™i bแป™ sแบฝ ฤ‘ฦฐแปฃc phแบฃn chiแบฟu bแปŸi lแป‡nh โ€œgit pushโ€"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Nhแปฏng tham chiแบฟu nแป™i bแป™ ฤ‘ฦฐแปฃc cแบฅu hรฌnh cho lแป‡nh โ€œgit pushโ€%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "ฤ‘แบทt refs/remotes/<tรชn>/HEAD cho phรน hแปฃp vแป›i mรกy chแปง"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "xรณa refs/remotes/<tรชn>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr "Khรดng thแปƒ xรกc ฤ‘แป‹nh ฤ‘ฦฐแปฃc HEAD mรกy chแปง"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Nhiแปu nhรกnh HEAD mรกy chแปง. Hรฃy chแปn rรต rร ng mแป™t:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr "Khรดng thแปƒ xรณa bแป %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Khรดng phแบฃi lร  tham chiแบฟu hแปฃp lแป‡: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr "Khรดng thแปƒ cร i ฤ‘แบทt %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s sแบฝ trแปŸ thร nh khรดng ฤ‘แบงu (khรดng ฤ‘ฦฐแปฃc quแบฃn lรฝ)!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s ฤ‘รฃ trแปŸ thร nh khรดng ฤ‘แบงu (khรดng ฤ‘ฦฐแปฃc quแบฃn lรฝ)!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr "ฤang xรฉn bแป›t %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [nรชn xรฉn bแป›t] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [ฤ‘รฃ bแป‹ xรฉn] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr "cแบฏt mรกy chแปง sau khi lแบฅy vแป"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Khรดng cรณ mรกy chแปง nร o cรณ tรชn โ€œ%sโ€"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr "thรชm nhรกnh"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr "chฦฐa chแป‰ ra mรกy chแปง nร o"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr "truy vแบฅn ฤ‘แบฉy URL thay vรฌ lแบฅy"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr "trแบฃ vแป mแปi URL"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "khรดng cรณ URL nร o ฤ‘ฦฐแปฃc cแบฅu hรฌnh cho nhรกnh โ€œ%sโ€"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr "ฤ‘แบฉy cรกc โ€œURLโ€ bแบฑng tay"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr "thรชm URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr "xรณa URLs"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete khรดng hแปฃp lรฝ"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Kiแปƒu mแบซu URL cลฉ khรดng hแปฃp lแป‡: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Khรดng tรฌm thแบฅy URL nhฦฐ vแบญy: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr "Sแบฝ khรดng xรณa nhแปฏng ฤ‘แป‹a chแป‰ URL khรดng-push"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "chi tiแบฟt; phแบฃi ฤ‘ฦฐแปฃc ฤ‘แบทt trฦฐแป›c mแป™t lแป‡nh-con"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Khรดng hiแปƒu cรขu lแป‡nh con: %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr "git repack [<cรกc tรนy chแปn>]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18365,115 +19403,115 @@ msgstr ""
 "Gia tฤƒng repack lร  khรดng tฦฐฦกng thรญch vแป›i chแป‰ mแปฅc bitmap. Dรนng\n"
 "--no-write-bitmap-index hay tแบฏt cแบฅu hรฌnh pack.writebitmaps."
 
-#: builtin/repack.c:190
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "khรดng thแปƒ lแบฅy thรดng tin thแป‘ng kรช pack-objects ฤ‘แปƒ mร  ฤ‘รณng gรณi lแบกi cรกc ฤ‘แป‘i "
 "tฦฐแปฃng hแปฉa hแบนn"
 
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: ฤang chแป‰ cแบงn cรกc dรฒng ID ฤ‘แป‘i tฦฐแปฃng dแบกng thแบญp lแปฅc phรขn ฤ‘แบงy dแปง tแปซ pack-"
 "objects."
 
-#: builtin/repack.c:246
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "khรดng thแปƒ hoร n tแบฅt pack-objects ฤ‘แปƒ ฤ‘รณng gรณi cรกc ฤ‘แป‘i tฦฐแปฃng hแปฉa hแบนn"
 
-#: builtin/repack.c:284
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr "ฤ‘รณng gรณi mแปi thแปฉ trong mแป™t gรณi ฤ‘ฦกn"
 
-#: builtin/repack.c:286
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "giแป‘ng vแป›i -a, vร  chแป‰nh sแปญa cรกc ฤ‘แป‘i tฦฐแปฃng khรดng ฤ‘แปc ฤ‘ฦฐแปฃc thiแบฟu sรณt"
 
-#: builtin/repack.c:289
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "xรณa bแป cรกc gรณi dฦฐ thแปซa, vร  chแบกy git-prune-packed"
 
-#: builtin/repack.c:291
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "chuyแปƒn --no-reuse-delta cho git-pack-objects"
 
-#: builtin/repack.c:293
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "chuyแปƒn --no-reuse-object cho git-pack-objects"
 
-#: builtin/repack.c:295
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr "khรดng chแบกy git-update-server-info"
 
-#: builtin/repack.c:298
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr "chuyแปƒn --local cho git-pack-objects"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr "ghi mแปฅc lแปฅc รกnh xแบก"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:310
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "chuyแปƒn --delta-islands cho git-pack-objects"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr "ngร y ฦฐแป›c tรญnh"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr "vแป›i -A, cรกc ฤ‘แป‘i tฦฐแปฃng cลฉ hฦกn khoแบฃng thแปi gian nร y thรฌ khรดng bแป‹ mแบฅt"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr "vแป›i -a, ฤ‘รณng gรณi lแบกi cรกc ฤ‘แป‘i tฦฐแปฃng khรดng thแปƒ ฤ‘แปc ฤ‘ฦฐแปฃc"
 
-#: builtin/repack.c:308
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr "kรญch thฦฐแป›c cแปญa sแป• ฤ‘ฦฐแปฃc dรนng cho nรฉn โ€œdeltaโ€"
 
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:310
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "giแป‘ng nhฦฐ trรชn, nhฦฐng giแป›i hแบกn kรญch thฦฐแป›c bแป™ nhแป› hay vรฌ sแป‘ lฦฐแปฃng"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr "giแป›i hแบกn ฤ‘แป™ sรขu tแป‘i ฤ‘a cแปงa โ€œdeltaโ€"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr "giแป›i hแบกn sแป‘ lฦฐแปฃng tแป‘i ฤ‘a tuyแบฟn trรฌnh"
 
-#: builtin/repack.c:316
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr "kรญch thฦฐแป›c tแป‘i ฤ‘a cho tแปซng tแบญp tin gรณi"
 
-#: builtin/repack.c:318
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr "ฤ‘รณng gรณi lแบกi cรกc ฤ‘แป‘i tฦฐแปฃng trong cรกc gรณi ฤ‘รฃ ฤ‘รกnh dแบฅu bแบฑng .keep"
 
-#: builtin/repack.c:320
+#: builtin/repack.c:328
 msgid "do not repack this pack"
 msgstr "ฤ‘แปซng ฤ‘รณng gรณi lแบกi gรณi nร y"
 
-#: builtin/repack.c:330
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "khรดng thแปƒ xรณa cรกc gรณi trong mแป™t kho ฤ‘แป‘i_tฦฐแปฃng_vฤฉ_ฤ‘แบกi"
 
-#: builtin/repack.c:334
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable vร  -A xung khแบฏc nhau"
 
-#: builtin/repack.c:417
+#: builtin/repack.c:425
 msgid "Nothing new to pack."
 msgstr "Khรดng cรณ gรฌ mแป›i ฤ‘แปƒ mร  ฤ‘รณng gรณi."
 
-#: builtin/repack.c:478
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -18492,7 +19530,7 @@ msgstr ""
 "CแบขNH BรO: nguyรชn gแป‘c cแปงa nรณ cลฉng gแบทp lแป—i.\n"
 "CแบขNH BรO: Vui lรฒng ฤ‘แป•i tรชn chรบng trong %s bแบฑng tay:\n"
 
-#: builtin/repack.c:526
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "gแบทp lแป—i khi gแปก bแป โ€œ%sโ€"
@@ -18600,8 +19638,8 @@ msgstr "khรดng thแปƒ fstat %s"
 msgid "unable to write object to database"
 msgstr "khรดng thแปƒ ghi ฤ‘แป‘i tฦฐแปฃng vร o cฦก sแปŸ dแปฏ liแป‡u"
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "khรดng phแบฃi lร  tรชn ฤ‘แป‘i tฦฐแปฃng hแปฃp lแป‡: โ€œ%sโ€"
@@ -18620,22 +19658,22 @@ msgstr "viแป‡c sแปญa tแบญp tin ฤ‘แป‘i tฦฐแปฃng gแบทp lแป—i"
 msgid "new object is the same as the old one: '%s'"
 msgstr "ฤ‘แป‘i tฦฐแปฃng mแป›i lร  giแป‘ng vแป›i cรกi cลฉ: โ€œ%sโ€"
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "khรดng thแปƒ phรขn tรญch %s nhฦฐ lร  mแป™t lแบงn chuyแปƒn giao"
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "thแบป hรฒa trแป™n sai trong lแบงn chuyแปƒn giao โ€œ%sโ€"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "thแบป hรฒa trแป™n khรดng ฤ‘รบng dแบกng แปŸ lแบงn chuyแปƒn giao โ€œ%sโ€"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18644,31 +19682,31 @@ msgstr ""
 "lแบงn chuyแปƒn giao gแป‘c โ€œ%sโ€ cรณ chแปฉa thแบป hรฒa trแป™n โ€œ%sโ€ cรกi mร  bแป‹ loแบกi bแป; dรนng "
 "tรนy chแปn --edit thay cho --graft"
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "lแบงn chuyแปƒn giao gแป‘c โ€œ%sโ€ cรณ chแปฏ kรฝ GPG"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "chแปฏ kรฝ sแบฝ ฤ‘ฦฐแปฃc bแป ฤ‘i trong lแบงn chuyแปƒn giao thay thแบฟ!"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "khรดng thแปƒ ghi lแบงn chuyแปƒn giao thay thแบฟ cho: โ€œ%sโ€"
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft cho โ€œ%sโ€ khรดng cแบงn thiแบฟt"
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "lแบงn chuyแปƒn giao mแป›i lร  giแป‘ng vแป›i cรกi cลฉ: โ€œ%sโ€"
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18677,71 +19715,71 @@ msgstr ""
 "khรดng thแปƒ chuyแปƒn ฤ‘แป•i cรกc graft sau ฤ‘รขy:\n"
 "%s"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "liแป‡t kรช cรกc refs thay thแบฟ"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "xรณa tham chiแบฟu thay thแบฟ"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "sแปญa ฤ‘แป‘i tฦฐแปฃng sแบตn cรณ"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "thay ฤ‘แป•i cha mแบน cแปงa lแบงn chuyแปƒn giao"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "chuyแปƒn ฤ‘แป•i cรกc tแบญp tin graft sแบตn cรณ"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "thay thแบฟ tham chiแบฟu nแบฟu nรณ ฤ‘รฃ sแบตn cรณ"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "ฤ‘แปซng in ฤ‘แบนp cรกc nแป™i dung cho --edit"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "dรนng ฤ‘แป‹nh dแบกng nร y"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format khรดng thแปƒ ฤ‘ฦฐแปฃc dรนng khi khรดng liแป‡t kรช gรฌ"
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f chแป‰ hแปฃp lรฝ khi ghi mแป™t cรกi thay thแบฟ"
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw chแป‰ hแปฃp lรฝ vแป›i --edit"
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d cแบงn รญt nhแบฅt mแป™t tham sแป‘"
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "sแป‘ ฤ‘แป‘i sแป‘ khรดng ฤ‘รบng"
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e cแบงn chรญnh cรกc lร  mแป™t ฤ‘แป‘i sแป‘"
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-q cแบงn รญt nhแบฅt mแป™t tham sแป‘"
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file khรดng nhแบญn ฤ‘แป‘i sแป‘"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "chแป‰ mแป™t mแบซu ฤ‘ฦฐแปฃc chแป‰ ra vแป›i tรนy chแปn -l"
 
@@ -18770,115 +19808,126 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<tree-ish>] [--] </cรกc/ฤ‘ฦฐแปng/dแบซn>โ€ฆ"
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<tree-ish>] [--] <ฤ‘แบทc/tแบฃ/ฤ‘ฦฐแปng/dแบซn>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<tree-ish>] [--] [</cรกc/ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<tree-ish>] [--] [<ฤ‘แบทc/tแบฃ/ฤ‘ฦฐแปng/dแบซn>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "pha trแป™n"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "mแปm"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "cแปฉng"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "hรฒa trแป™n"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "giแปฏ lแบกi"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr "Bแบกn khรดng cรณ HEAD nร o hแปฃp lแป‡."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr "Gแบทp lแป—i khi tรฌm cรขy cแปงa HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Gแบทp lแป—i khi tรฌm cรขy cแปงa %s."
 
-#: builtin/reset.c:193
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD hiแป‡n giแป tแบกi %s"
+
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Khรดng thแปƒ thแปฑc hiแป‡n mแป™t %s reset แปŸ giแปฏa cแปงa quรก trรฌnh hรฒa trแป™n."
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "lร m viแป‡c แปŸ chแบฟ ฤ‘แป™ im lแบทng, chแป‰ hiแปƒn thแป‹ khi cรณ lแป—i"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr "ฤ‘แบทt lแบกi (reset) HEAD vร  bแบฃng mแปฅc lแปฅc"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr "chแป‰ ฤ‘แบทt lแบกi (reset) HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr "ฤ‘แบทt lแบกi HEAD, bแบฃng mแปฅc lแปฅc vร  cรขy lร m viแป‡c"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr "ฤ‘แบทt lแบกi HEAD nhฦฐng giแปฏ lแบกi cรกc thay ฤ‘แป•i nแป™i bแป™"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr "chแป‰ ghi lแบกi nhแปฏng ฤ‘ฦฐแปng dแบซn thแปฑc sแปฑ sแบฝ ฤ‘ฦฐแปฃc thรชm vร o sau nร y"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Gแบทp lแป—i khi phรขn giแบฃi โ€œ%sโ€ nhฦฐ lร  ฤ‘iแปƒm xรฉt duyแป‡t hแปฃp lแป‡."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Gแบทp lแป—i khi phรขn giแบฃi โ€œ%sโ€ nhฦฐ lร  mแป™t cรขy (tree) hแปฃp lแป‡."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch xung khแบฏc vแป›i --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed vแป›i cรกc ฤ‘ฦฐแปng dแบซn khรดng cรฒn dรนng nแปฏa; hรฃy thay thแบฟ bแบฑng lแป‡nh โ€œgit "
 "reset -- </cรกc/ฤ‘ฦฐแปng/dแบซn>โ€."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Khรดng thแปƒ thแปฑc hiแป‡n lแป‡nh %s reset vแป›i cรกc ฤ‘ฦฐแปng dแบซn."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s reset khรดng ฤ‘ฦฐแปฃc phรฉp trรชn kho thuแบงn"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
 msgstr "-N chแป‰ ฤ‘ฦฐแปฃc dรนng khi cรณ --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr "Nhแปฏng thay ฤ‘แป•i ฤ‘ฦฐแปฃc ฤ‘ฦฐa ra khแปi bแป‡ phรณng sau khi reset:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -18892,35 +19941,30 @@ msgstr ""
 "Bแบกn cรณ thแปƒ sแปญ dแปฅng ฤ‘แปƒ trรกnh viแป‡c nร y. ฤแบทt reset.quiet thร nh true trong\n"
 "cร i ฤ‘แบทt config nแบฟu bแบกn muแป‘n thแปฑc hiแป‡n nรณ nhฦฐ lร  mแบทc ฤ‘แป‹nh.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Khรดng thแปƒ ฤ‘แบทt lแบกi (reset) bแบฃng mแปฅc lแปฅc thร nh ฤ‘iแปƒm xรฉt duyแป‡t โ€œ%sโ€."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr "Khรดng thแปƒ ghi tแบญp tin lฦฐu bแบฃng mแปฅc lแปฅc mแป›i."
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "khรดng thแปƒ tแป• hแปฃp --exclude-promisor-objects vร  --missing"
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "lแปc ฤ‘แป‘i tฦฐแปฃng yรชu cแบงu --objects"
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "giรก trแป‹ sparse khรดng hแปฃp lแป‡ โ€œ%sโ€"
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list khรดng hแป— trแปฃ hiแปƒn thแป‹ cรกc ghi chรบ"
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "khรดng thแปƒ tแป• hแปฃp --use-bitmap-index vแป›i lแปc ฤ‘แป‘i tฦฐแปฃng"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu ฤ‘แบฟm lร  xung khแบฏc vแป›i --objects"
 
 #: builtin/rev-parse.c:408
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -19079,37 +20123,41 @@ msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "nhแปฏng tแบญp tin sau ฤ‘รขy cรณ nhแปฏng thay ฤ‘แป•i nแป™i bแป™:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "khรดng liแป‡t kรช cรกc tแบญp tin ฤ‘รฃ gแปก bแป"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "chแป‰ gแปก bแป tแปซ mแปฅc lแปฅc"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "ghi ฤ‘รจ lรชn kiแปƒm tra cแบญp nhแบญt"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "cho phรฉp gแปก bแป ฤ‘แป‡ qui"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "thoรกt ra vแป›i trแบกng thรกi khรกc khรดng thแบญm chรญ nแบฟu khรดng cรณ gรฌ khแป›p"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Khรดng ฤ‘ฦฐa ra ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn. Tรดi nรชn loแบกi bแป cรกc tแบญp tin nร o?"
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "hรฃy ฤ‘ฦฐa cรกc thay ฤ‘แป•i cแปงa bแบกn vร o .gitmodules hay tแบกm cแบฅt chรบng ฤ‘i ฤ‘แปƒ xแปญ lรฝ"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "khรดng thแปƒ gแปก bแป โ€œ%sโ€ mแป™t cรกch ฤ‘แป‡ qui mร  khรดng cรณ tรนy chแปn -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: khรดng thแปƒ gแปก bแป %s"
@@ -19359,15 +20407,84 @@ msgstr ""
 "hiแปƒn thแป‹ cรกc tham chiแบฟu tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn (stdin) cรกi mร  khรดng แปŸ kho nแป™i "
 "bแป™"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <cรกc-tรนy-chแปn>"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"khรดng thแปƒ phรขn tรญch cรบ phรกp cรขy lร m viแป‡c nร y (tแบญp tin sparse-checkout cรณ lแบฝ "
+"khรดng tแป“n tแบกi)"
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "gแบทp lแป—i khi tแบกo thฦฐ mแปฅc cho tแบญp tin sparse-checkout"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "gแบทp lแป—i khi ฤ‘แบทt cร i ฤ‘แบทt extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "khแปŸi tแบกo sparse-checkout trong chแบฟ ฤ‘แป™ nรณn"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "khแปŸi tแบกo sparse-checkout"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "gแบทp lแป—i khi mแปŸ โ€œ%sโ€"
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "khรดng thแปƒ thฦฐแปng hรณa ฤ‘ฦฐแปng dแบซn โ€œ%sโ€"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <cรกc mแบซu>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "khรดng thแปƒ bแป trรญch dแบซn chuแป—i kiแปƒu C โ€œ%sโ€"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "khรดng thแปƒ tแบฃi cรกc mแบซu sparse-checkout"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "ฤ‘แปc cรกc mแบซu tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "ฤ‘แบทt cรกc mแบซu sparse-checkout"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "tแบฏt sparse-checkout"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "gแบทp lแป—i khi ฤ‘แปc lแบกi thฦฐ mแปฅc lร m viแป‡c"
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<cรกc tรนy chแปn>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<cรกc tรนy chแปn>] <stash>"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
@@ -19375,25 +20492,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <tรชn-nhรกnh> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <lแปi nhแบฏn>]\n"
+"          [--pathspec-from-file=<tแบญp_tin> [--pathspec-file-nul]]\n"
 "          [--] [<ฤ‘แบทc/tแบฃ/ฤ‘ฦฐแปng/dแบซn>โ€ฆ]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19401,187 +20520,197 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<ghi chรบ>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <ghi chรบ>] [-q|--quiet] <commit>"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <lแปi nhแบฏn>]\n"
+"          [--] [<ฤ‘แบทc/tแบฃ/ฤ‘ฦฐแปng/dแบซn>โ€ฆ]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "โ€œ%sโ€ khรดng phแบฃi lร  lแบงn chuyแปƒn giao kiแปƒu-stash (cแบฅt ฤ‘i)"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Chแป‰ ra quรก nhiแปu ฤ‘iแปƒm xรฉt duyแป‡t: %s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr "Khรดng tรฌm thแบฅy cรกc mแปฅc tแบกm cแบฅt (stash) nร o."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "โ€œ%sโ€ khรดng phแบฃi mแป™t tham chiแบฟu hแปฃp lแป‡"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr ""
 "git stash clear vแป›i cรกc tham sแป‘ lร  chฦฐa ฤ‘ฦฐแปฃc thแปฑc hiแป‡n (khรดng nhแบญn ฤ‘แป‘i sแป‘)"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "khรดng thแปƒ รกp dแปฅng mแป™t stash แปŸ giแปฏa cแปงa quรก trรฌnh hรฒa trแป™n"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "khรดng thแปƒ tแบกo diff %s^!."
 
-#: builtin/stash.c:421
+#: builtin/stash.c:422
 msgid "conflicts in index.Try without --index."
 msgstr "xung ฤ‘แป™t trong bแบฃng mแปฅc lแปฅc. Hรฃy thแปญ mร  khรดng dรนng tรนy chแปn --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "khรดng thแปƒ ghi lแบกi cรขy chแป‰ mแปฅc"
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "khรดng thแปƒ phแปฅc hแป“i cรกc tแบญp tin chฦฐa theo dรตi tแปซ mแปฅc cแบฅt ฤ‘i (stash)"
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "ฤang hรฒa trแป™n %s vแป›i %s"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
 msgstr "Bแบฃng mแปฅc lแปฅc ฤ‘รฃ khรดng ฤ‘ฦฐแปฃc bแป stash."
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
 msgid "attempt to recreate the index"
 msgstr "gแบทp lแป—i ฤ‘แปc bแบฃng mแปฅc lแปฅc"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:555
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "ฤรฃ xรณa %s (%s)"
 
-#: builtin/stash.c:552
+#: builtin/stash.c:558
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Khรดng thแปƒ xรณa bแป mแปฅc stash"
 
-#: builtin/stash.c:577
+#: builtin/stash.c:583
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "โ€%sโ€ khรดng phแบฃi tham chiแบฟu ฤ‘แบฟn stash"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr "Cรกc mแปฅc tแบกm cแบฅt (stash) ฤ‘ฦฐแปฃc giแปฏ trong trฦฐแปng hแปฃp bแบกn lแบกi cแบงn nรณ."
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr "Chฦฐa chแป‰ ra tรชn cแปงa nhรกnh"
 
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Khรดng thแปƒ cแบญp nhแบญt %s vแป›i %s"
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
 msgid "stash message"
 msgstr "phแบงn chรบ thรญch cho stash"
 
-#: builtin/stash.c:818
+#: builtin/stash.c:824
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" cแบงn mแป™t ฤ‘แป‘i sแป‘ <lแบงn chuyแปƒn giao>"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr "Chฦฐa cรณ thay ฤ‘แป•i nร o ฤ‘ฦฐแปฃc chแปn"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr "Bแบกn chฦฐa cรฒn cรณ lแบงn chuyแปƒn giao khแปŸi tแบกo"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr "Khรดng thแปƒ ghi lแบกi trแบกng thรกi bแบฃng mแปฅc lแปฅc hiแป‡n hร nh"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr "Khรดng thแปƒ ghi lแบกi cรกc tแบญp tin chฦฐa theo dรตi"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr "Khรดng thแปƒ ghi lแบกi trแบกng thรกi cรขy-lร m-viแป‡c hiแป‡n hร nh"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr "Khรดng thแปƒ ghi lแบกi trแบกng thรกi cรขy lร m viแป‡c hiแป‡n hร nh"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "Khรดng thแปƒ dรนng --patch vร  --include-untracked hay --all cรนng mแป™t lรบc"
 
-#: builtin/stash.c:1285
+#: builtin/stash.c:1298
 msgid "Did you forget to 'git add'?"
 msgstr "Cรณ lแบฝ bแบกn ฤ‘รฃ quรชn โ€œgit add โ€ phแบฃi khรดng?"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr "Khรดng cรณ thay ฤ‘แป•i nแป™i bแป™ nร o ฤ‘ฦฐแปฃc ghi lแบกi"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr "Khรดng thแปƒ khแปŸi tแบกo stash"
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr "Khรดng thแปƒ ghi lแบกi trแบกng thรกi hiแป‡n hร nh"
 
-#: builtin/stash.c:1327
+#: builtin/stash.c:1340
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "ฤรฃ ghi lแบกi thฦฐ mแปฅc lร m viแป‡c vร  trแบกng thรกi mแปฅc lแปฅc %s"
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr "Khรดng thแปƒ gแปก bแป cรกc thay ฤ‘แป•i cรขy-lร m-viแป‡c"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "keep index"
 msgstr "giแปฏ nguyรชn bแบฃng mแปฅc lแปฅc"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash in patch mode"
 msgstr "cแบฅt ฤ‘i แปŸ chแบฟ ฤ‘แป™ miแบฟng vรก"
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1472 builtin/stash.c:1537
 msgid "quiet mode"
 msgstr "chแบฟ ฤ‘แป™ im lแบทng"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1474 builtin/stash.c:1539
 msgid "include untracked files in stash"
 msgstr "bao gแป“m cรกc tแบญp tin khรดng ฤ‘ฦฐแปฃc theo dรตi trong stash"
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1476 builtin/stash.c:1541
 msgid "include ignore files"
 msgstr "bao gแป“m cรกc tแบญp tin bแป‹ bแป qua"
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1600
 #, c-format
 msgid "could not exec %s"
 msgstr "khรดng thแปƒ thแปฑc thi %s"
@@ -19602,40 +20731,40 @@ msgstr "giแปฏ vร  xรณa bแป mแปi dรฒng bแบฏt ฤ‘แบงu bแบฑng kรฝ tแปฑ ghi chรบ"
 msgid "prepend comment character and space to each line"
 msgstr "treo trฦฐแป›c kรฝ tแปฑ ghi chรบ vร  kรฝ tแปฑ khoแบฃng trแบฏng cho tแปซng dรฒng"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Cแบงn tรชn tham chiแบฟu dแบกng ฤ‘แบงy ฤ‘แปง, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote takes khรดng nhแบญn tham sแป‘"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "khรดng thแปƒ cแบฏt bแป mแป™t thร nh phแบงn ra khแปi โ€œ%sโ€ url"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr "ฤ‘iแปƒm neo thay thแบฟ cho cรกc ฤ‘ฦฐแปng dแบซn tฦฐฦกng ฤ‘แป‘i"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=</ฤ‘ฦฐแปng/dแบซn>] [</ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Khรดng tรฌm thแบฅy url cho ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ%sโ€ trong .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "ฤang vร o โ€œ%sโ€\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -19644,7 +20773,7 @@ msgstr ""
 "run_command trแบฃ vแป trแบกng thรกi khรกc khรดng cho %s\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19655,19 +20784,19 @@ msgstr ""
 "con lแป“ng nhau cแปงa %s\n"
 "."
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr "Chแบทn kแบฟt xuแบฅt cแปงa tแปซng lแป‡nh mรด-ฤ‘un-con"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr "ฤแป‡ quy vร o trong cรกc mรด-ฤ‘un-con lแป“ng nhau"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--]  <lแป‡nh>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -19676,56 +20805,56 @@ msgstr ""
 "khรดng thแปƒ tรฌm thแบฅy cแบฅu hรฌnh โ€œ%sโ€. Coi rแบฑng ฤ‘รขy lร  kho thฦฐแปฃng nguแป“n cรณ quyแปn "
 "sแปŸ hแปฏu chรญnh nรณ."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Gแบทp lแป—i khi ฤ‘ฤƒng kรฝ url cho ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Mรด-ฤ‘un-con โ€œ%sโ€ (%s) ฤ‘ฦฐแปฃc ฤ‘ฤƒng kรฝ cho ฤ‘ฦฐแปng dแบซn โ€œ%sโ€\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "cแบฃnh bรกo: chแบฟ ฤ‘แป™ lแป‡nh cแบญp nhแบญt ฤ‘ฦฐแปฃc gแปฃi รฝ cho mรด-ฤ‘un-con โ€œ%sโ€\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Gแบทp lแป—i khi ฤ‘ฤƒng kรฝ chแบฟ ฤ‘แป™ cแบญp nhแบญt cho ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "Chแบทn kแบฟt xuแบฅt cho khแปŸi tแบกo mแป™t mรด-ฤ‘un-con"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<cรกc tรนy chแปn>] [</ฤ‘ฦฐแปng/dแบซn>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "khรดng tรฌm thแบฅy รกnh xแบก (mapping) mรด-ฤ‘un-con trong .gitmodules cho ฤ‘ฦฐแปng dแบซn "
 "โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "khรดng thแปƒ phรขn giแบฃi tham chiแบฟu HEAD bรชn trong mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "gแบทp lแป—i khi ฤ‘แป‡ quy vร o trong mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr "Chแบทn kรฉt xuแบฅt tรฌnh trแบกng mรด-ฤ‘un-con"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -19733,48 +20862,48 @@ msgstr ""
 "Dรนng lแบงn chuyแปƒn giao lฦฐu trong mแปฅc lแปฅc thay cho cรกi ฤ‘ฦฐแปฃc lฦฐu trong HEAD mรด-"
 "ฤ‘un-con"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr "ฤ‘แป‡ quy vร o trong mรด-ฤ‘un-con lแป“ng nhau"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 "git submodule status [--quiet] [--cached] [--recursive] [</ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name </ฤ‘ฦฐแปng/dแบซn>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Url mรด-ฤ‘un-con ฤ‘แป“ng bแป™ hรณa cho โ€œ%sโ€\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "gแบทp lแป—i khi ฤ‘ฤƒng kรฝ url cho ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "gแบทp lแป—i khi lแบฅy mรกy chแปง mแบทc ฤ‘แป‹nh cho mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "gแบทp lแป—i khi cแบญp nhแบญt cho mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr "Chแบทn kแบฟt xuแบฅt cho ฤ‘แป“ng bแป™ url mรด-ฤ‘un-con"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [</ฤ‘ฦฐแปng/dแบซn>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -19783,7 +20912,7 @@ msgstr ""
 "Cรขy lร m viแป‡c mรด-ฤ‘un-con โ€œ%sโ€ cรณ chแปฉa thฦฐ mแปฅc .git (dรนng โ€œrm -rfโ€ nแบฟu bแบกn "
 "thแปฑc sแปฑ muแป‘n gแปก bแป nรณ cรนng vแป›i toร n bแป™ lแป‹ch sแปญ cแปงa chรบng)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -19792,176 +20921,207 @@ msgstr ""
 "Cรขy lร m viแป‡c mรด-ฤ‘un-con โ€œ%sโ€ chแปฉa cรกc thay ฤ‘แป•i nแป™i bแป™; hรฃy dรนng โ€œ-fโ€ ฤ‘แปƒ loแบกi "
 "bแป chรบng ฤ‘i"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "ฤรฃ xรณa thฦฐ mแปฅc โ€œ%sโ€\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Khรดng thแปƒ gแปก bแป cรขy lร m viแป‡c mรด-ฤ‘un-con โ€œ%sโ€\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "khรดng thแปƒ tแบกo thฦฐ mแปฅc mรด-ฤ‘un-con rแป—ng โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Mรด-ฤ‘un-con โ€œ%sโ€ (%s) ฤ‘ฦฐแปฃc ฤ‘ฤƒng kรฝ cho ฤ‘ฦฐแปng dแบซn โ€œ%sโ€\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr "Gแปก bแป cรขy lร m viแป‡c cแปงa mรด-ฤ‘un-con ngay cแบฃ khi nรณ cรณ thay ฤ‘แป•i nแป™i bแป™"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr "Bแป ฤ‘ฤƒng kรฝ tแบฅt cแบฃ cรกc trong mรด-ฤ‘un-con"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--]  [</ฤ‘ฦฐแปng/dแบซn>โ€ฆ]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Dรนng โ€œ--allโ€ nแบฟu bแบกn thแปฑc sแปฑ muแป‘n hแปงy khแปŸi tแบกo mแปi mรด-ฤ‘un-con"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Mแป™t cรกi thay thแบฟ ฤ‘ฦฐแปฃc tรญnh toรกn tแปซ mแป™t thay thแบฟ cแปงa siรชu dแปฑ รกn lร  khรดng hแปฃp "
+"lแป‡.\n"
+"ฤแปƒ cho Git thแปฑc hiแป‡n nhรขn bแบฃn mร  khรดng cรณ cรกi thay thแบฟ nhฦฐ trong trฦฐแปng hแปฃp "
+"nร y, ฤ‘แบทt\n"
+"submodule.alternateErrorStrategy thร nh 'info' hoแบทc, tฦฐฦกng ฤ‘ฦฐฦกng, nhรขn bแบฃn "
+"bแบฑng\n"
+"'--reference-if-able' thay vรฌ dรนng '--reference'."
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "mรด-ฤ‘un-con โ€œ%sโ€ khรดng thแปƒ thรชm thay thแบฟ: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Giรก trแป‹ โ€œ%sโ€ cho submodule.alternateErrorStrategy khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Giรก trแป‹ โ€œ%sโ€ cho submodule.alternateLocation khรดng ฤ‘ฦฐแปฃc thแปซa nhแบญn"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
 msgstr "nhรขn bแบฃn mรด-ฤ‘un-con mแป›i vร o chแป— nร o"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr "tรชn cแปงa mรด-ฤ‘un-con mแป›i"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr "url nฦกi mร  nhรขn bแบฃn mรด-ฤ‘un-con tแปซ ฤ‘รณ"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr "chiแปu sรขu lแป‹ch sแปญ khi tแบกo bแบฃn sao"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr "รฉp buแป™c tiแบฟn trรฌnh nhรขn bแบฃn"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "lร m ฤ‘แบงy ฤ‘แปง dแปฏ liแป‡u cho bแบฃn sao vร o trong mแป™t thฦฐ mแปฅc trแป‘ng rแป—ng"
+
+#: builtin/submodule--helper.c:1424
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=</ฤ‘ฦฐแปng/dแบซn>] [--quiet] [--reference "
-"<kho>] [--name <tรชn>] [--depth <sรขu>] [--url <url>] [</ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
+"<kho>] [--name <tรชn>] [--depth <sรขu>] [--single-branch] [--url <url>] --path "
+"</ฤ‘ฦฐแปng/dแบซn>"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "tแปซ chแป‘i tแบกo/dรนng '%s' trong mแป™t thฦฐ mแปฅc git cแปงa mรด ฤ‘un con"
+
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "viแป‡c sao โ€œ%sโ€ vร o ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ%sโ€ gแบทp lแป—i"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "thฦฐ mแปฅc khรดng trแป‘ng: '%s'"
+
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "khรดng thแปƒ lแบฅy thฦฐ mแปฅc mรด-ฤ‘un-con cho โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Chแบฟ ฤ‘แป™ cแบญp nhแบญt โ€œ%sโ€ khรดng hแปฃp lแป‡ cho ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1516
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Chแบฟ ฤ‘แป™ cแบญp nhแบญt โ€œ%sโ€ khรดng hแปฃp lแป‡ ฤ‘ฦฐแปฃc cแบฅu hรฌnh cho ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "ฤฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ%sโ€ chฦฐa ฤ‘ฦฐแปฃc khแปŸi tแบกo"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Cรณ lแบฝ bแบกn lร  bแบกn muแป‘n dรนng \"update --init\" phแบฃi khรดng?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Bแป qua cรกc mรด-ฤ‘un-con chฦฐa ฤ‘ฦฐแปฃc hรฒa trแป™n %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Bแป qua mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Gแบทp lแป—i khi nhรขn bแบฃn โ€œ%sโ€. Thแปญ lแบกi lแป‹ch trรฌnh"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Gแบทp lแป—i khi nhรขn bแบฃn โ€œ%sโ€ lแบงn thแปฉ hai nรชn bรฃi bแป"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr "ฤ‘ฦฐแปng dแบซn ฤ‘แบฟn cรขy lร m viแป‡c"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "ฤ‘ฦฐแปng dแบซn ฤ‘แบฟn cรขy lร m viแป‡c, chรฉo biรชn giแป›i mรด-ฤ‘un-con lแป“ng nhau"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout hoแบทc khรดng lร m gรฌ cแบฃ"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 "Tแบกo mแป™t bแบฃn sao nรดng ฤ‘ฦฐแปฃc cแบฏt ngแบฏn thร nh sแป‘ lฦฐแปฃng ฤ‘iแปƒm xรฉt duyแป‡t ฤ‘รฃ cho"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr "cรดng viแป‡c ฤ‘แป“ng thแปi"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "nhรขn bแบฃn lแบงn ฤ‘แบงu cรณ nรชn theo khuyแบฟn nghแป‹ lร  nรดng hay khรดng"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr "ฤ‘แปซng in tiแบฟn trรฌnh nhรขn bแบฃn"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr ""
-"git submodule--helper update_clone [--prefix=</ฤ‘ฦฐแปng/dแบซn>] [</ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
+"git submodule--helper update-clone [--prefix=</ฤ‘ฦฐแปng/dแบซn>] [</ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr "giรก trแป‹ cho  tham sแป‘ cแบญp nhแบญt bแป‹ sai"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -19970,50 +21130,50 @@ msgstr ""
 "Nhรกnh mรด-ฤ‘un-con (%s) ฤ‘ฦฐแปฃc cแบฅu hรฌnh kแบฟ thแปซa nhรกnh tแปซ siรชu dแปฑ รกn, nhฦฐng siรชu "
 "dแปฑ รกn lแบกi khรดng trรชn bแบฅt kแปณ nhรกnh nร o"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2117
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "khรดng thแปƒ lแบฅy thแบป quแบฃn kho cho mรด-ฤ‘un-con โ€œ%sโ€"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr "ฤ‘แป‡ quy vร o trong mรด-ฤ‘un-con"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2156
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<cรกc tรนy chแปn>] [</ฤ‘ฦฐแปng/dแบซn>โ€ฆ]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2212
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "chแปn nแบฟu nรณ lร  an toร n ฤ‘แปƒ ghi vร o tแบญp tin .gitmodules"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2215
 msgid "unset the config in the .gitmodules file"
 msgstr "bแป ฤ‘แบทt cแบฅu hรฌnh trong tแบญp tin .gitmodules"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2220
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <tรชn> [<giรก trแป‹>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2221
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <tรชn>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2222
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "hรฃy ฤ‘แบฃm bแบฃo rแบฑng tแบญp tin .gitmodules cรณ trong cรขy lร m viแป‡c"
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s khรดng hแป— trแปฃ --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2297
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "โ€œ%sโ€ khรดng phแบฃi lร  lแป‡nh con submodule--helper hแปฃp lแป‡"
@@ -20268,206 +21428,210 @@ msgstr "thแบป โ€œ%sโ€ ฤ‘รฃ tแป“n tแบกi rแป“i"
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "ฤรฃ cแบญp nhแบญt thแบป โ€œ%sโ€ (trฦฐแป›c lร  %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "ฤang giแบฃi nรฉn cรกc ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "tแบกo thฦฐ mแปฅc \"%s\" gแบทp lแป—i"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "gแบทp lแป—i khi tแบกo tแบญp tin %s"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "gแบทp lแป—i khi xรณa tแบญp tin %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "gแบทp lแป—i khi xรณa thฦฐ mแปฅc %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "ฤang kiแปƒm thแปญ mtime trong โ€œ%sโ€ "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr "thรดng tin thแป‘ng kรช thฦฐ mแปฅc khรดng thay ฤ‘แป•i sau khi thรชm tแบญp tin mแป›i"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr "thรดng tin thแป‘ng kรช thฦฐ mแปฅc khรดng thay ฤ‘แป•i sau khi thรชm thฦฐ mแปฅc mแป›i"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr "thรดng tin thแป‘ng kรช thฦฐ mแปฅc thay ฤ‘แป•i sau khi cแบญp nhแบญt tแบญp tin"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "thรดng tin thแป‘ng kรช thฦฐ mแปฅc thay ฤ‘แป•i sau khi thรชm tแบญp tin mแป›i vร o trong thฦฐ "
 "mแปฅc con"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr "thรดng tin thแป‘ng kรช thฦฐ mแปฅc khรดng thay ฤ‘แป•i sau khi xรณa tแบญp tin"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr "thรดng tin thแป‘ng kรช thฦฐ mแปฅc khรดng thay ฤ‘แป•i sau khi xรณa thฦฐ mแปฅc"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " ฤแป“ng รฝ"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<cรกc tรนy chแปn>] [--] [<tแบญp-tin>โ€ฆ]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "tiแบฟp tแปฅc lร m mแป›i ngay cแบฃ khi bแบฃng mแปฅc lแปฅc cแบงn ฤ‘ฦฐแปฃc cแบญp nhแบญt"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "refresh: lแป ฤ‘i mรด-ฤ‘un-con"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "khรดng bแป qua cรกc tแบญp tin mแป›i tแบกo"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "ฤ‘แปƒ cรกc tแบญp tin thay thแบฟ cรกc thฦฐ mแปฅc vร  โ€œvice-versaโ€"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "thรดng bรกo cรกc tแบญp-tin thiแบฟu trong thฦฐ-mแปฅc lร m viแป‡c"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "lร m tฦฐฦกi mแป›i thแบญm chรญ khi bแบฃng mแปฅc lแปฅc chแปฉa cรกc mแปฅc tin chฦฐa ฤ‘ฦฐแปฃc hรฒa trแป™n"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "lแบฅy lแบกi thรดng tin thแป‘ng kรช"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "giแป‘ng --refresh, nhฦฐng bแป qua cรกc cร i ฤ‘แบทt โ€œassume-unchangedโ€"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<chแบฟ_ฤ‘แป™>,<ฤ‘แป‘i_tฦฐแปฃng>,<ฤ‘ฦฐแปng_dแบซn>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "thรชm cรกc tแบญp tin ฤ‘รฃ chแป‰ ra vร o bแบฃng mแปฅc lแปฅc"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "ฤ‘รกnh dแบฅu cรกc tแบญp tin lร  \"khรดng thay ฤ‘แป•i\""
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "xรณa bรญt assumed-unchanged (giแบฃ ฤ‘แป‹nh lร  khรดng thay ฤ‘แป•i)"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "ฤ‘รกnh dแบฅu cรกc tแบญp tin lร  โ€œchแป‰-ฤ‘แปcโ€"
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "xรณa bรญt skip-worktree"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "ฤ‘แปซng ฤ‘แป™ng vร o cรกc mแปฅc index-only"
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "chแป‰ thรชm vร o bแบฃng mแปฅc lแปฅc; khรดng thรชm nแป™i dung vร o cฦก sแปŸ dแปฏ liแป‡u ฤ‘แป‘i tฦฐแปฃng"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "gแปก bแป cรกc ฤ‘ฦฐแปng dแบซn ฤ‘ฦฐแปฃc ฤ‘แบทt tรชn thแบญm chรญ cแบฃ khi nรณ hiแป‡n diแป‡n trong thฦฐ mแปฅc "
 "lร m viแป‡c"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "vแป›i tรนy chแปn --stdin: cรกc dรฒng ฤ‘แบงu vร o ฤ‘ฦฐแปฃc chแบฅm dแปฉt bแปŸi kรฝ tแปฑ null"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "ฤ‘แปc danh sรกch ฤ‘ฦฐแปng dแบซn cแบงn cแบญp nhแบญt tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "khรดng thแปƒ ฤ‘แปc cรกc mแปฅc tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn vร o bแบฃng mแปฅc lแปฅc"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "phแปฅc hแป“i cรกc trแบกng thรกi #2 vร  #3 cho cรกc ฤ‘ฦฐแปng dแบซn ฤ‘ฦฐแปฃc liแป‡t kรช"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "chแป‰ cแบญp nhแบญt cรกc mแปฅc tin mร  nรณ khรกc biแป‡t so vแป›i HEAD"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "bแป qua cรกc tแบญp-tin thiแบฟu trong thฦฐ-mแปฅc lร m viแป‡c"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "bรกo cรกo cรกc thao tรกc ra thiแบฟt bแป‹ xuแบฅt chuแบฉn"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(cho โ€œporcelainsโ€) quรชn cรกc xung ฤ‘แป™t chฦฐa ฤ‘ฦฐแปฃc giแบฃi quyแบฟt ฤ‘รฃ ghi"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "ghi mแปฅc lแปฅc แปŸ ฤ‘แป‹nh dแบกng nร y"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "bแบญt/tแบฏt chia cแบฏt bแบฃng mแปฅc lแปฅc"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "bแบญt/tแบฏt bแป™ ฤ‘แป‡m khรดng theo vแบฟt"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "kiแปƒm tra xem hแป‡ thแป‘ng tแบญp tin cรณ hแป— trแปฃ ฤ‘แป‡m khรดng theo dรตi hay khรดng"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "bแบญt bแป™ ฤ‘แป‡m khรดng theo vแบฟt mร  khรดng kiแปƒm tra hแป‡ thแป‘ng tแบญp tin"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "ghi ra mแปฅc lแปฅc ngay cแบฃ khi khรดng ฤ‘ฦฐแปฃc ฤ‘รกnh cแป lร  cรณ thay ฤ‘แป•i"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "bแบญt/tแบฏt theo dรตi hแป‡ thแป‘ng tแบญp tin"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "ฤ‘รกnh dแบฅu cรกc tแบญp tin lร  hแปฃp lแป‡ fsmonitor"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "xรณa bรญt hแปฃp lแป‡ fsmonitor"
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20475,7 +21639,7 @@ msgstr ""
 "core.splitIndex ฤ‘ฦฐแปฃc ฤ‘แบทt lร  sai; xรณa bแป hay thay ฤ‘แป•i nรณ, nแบฟu bแบกn thแปฑc sแปฑ "
 "muแป‘n bแบญt chia tรกch mแปฅc lแปฅc"
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20483,7 +21647,7 @@ msgstr ""
 "core.splitIndex ฤ‘ฦฐแปฃc ฤ‘แบทt lร  ฤ‘รบng; xรณa bแป hay thay ฤ‘แป•i nรณ, nแบฟu bแบกn thแปฑc sแปฑ "
 "muแป‘n tแบฏt chia tรกch mแปฅc lแปฅc"
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -20491,11 +21655,11 @@ msgstr ""
 "core.untrackedCache ฤ‘ฦฐแปฃc ฤ‘แบทt lร  ฤ‘รบng; xรณa bแป hay thay ฤ‘แป•i nรณ, nแบฟu bแบกn thแปฑc "
 "sแปฑ muแป‘n tแบฏt bแป™ ฤ‘แป‡m chฦฐa theo dรตi"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Nhแป› ฤ‘แป‡m khรดng theo vแบฟt bแป‹ tแบฏt"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -20503,29 +21667,29 @@ msgstr ""
 "core.untrackedCache ฤ‘ฦฐแปฃc ฤ‘แบทt lร  sai; xรณa bแป hay thay ฤ‘แป•i nรณ, nแบฟu bแบกn thแปฑc sแปฑ "
 "muแป‘n bแบญt bแป™ ฤ‘แป‡m chฦฐa theo dรตi"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Nhแป› ฤ‘แป‡m khรดng theo vแบฟt ฤ‘ฦฐแปฃc bแบญt cho โ€œ%sโ€"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor chฦฐa ฤ‘ฦฐแปฃc ฤ‘แบทt; ฤ‘แบทt nรณ nแบฟu bแบกn thแปฑc sแปฑ muแป‘n bแบญt theo dรตi hแป‡ "
 "thแป‘ng tแบญp tin"
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor ฤ‘ฦฐแปฃc bแบญt"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor ฤ‘รฃ ฤ‘ฦฐแปฃc ฤ‘แบทt; bแป ฤ‘แบทt nรณ nแบฟu bแบกn thแปฑc sแปฑ muแป‘n bแบญt theo dรตi hแป‡ "
 "thแป‘ng tแบญp tin"
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor bแป‹ tแบฏt"
 
@@ -20617,90 +21781,90 @@ msgstr "git verify-tag [-v | --verbose] [--format=<ฤ‘แป‹nh_dแบกng>] <thแบป>โ€ฆ"
 msgid "print tag contents"
 msgstr "hiแปƒn thแป‹ nแป™i dung cแปงa thแบป"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<cรกc tรนy chแปn>] </ฤ‘ฦฐแปng/dแบซn> [<commit-ish>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<cรกc tรนy chแปn>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<cรกc tรนy chแปn>] </ฤ‘ฦฐแปng/dแบซn>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> </ฤ‘ฦฐแปng/dแบซn/mแป›i>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<cรกc tรนy chแปn>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<cรกc tรนy chแปn>] <worktree>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock </ฤ‘ฦฐแปng/dแบซn>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:891
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "gแบทp lแป—i khi xรณa โ€œ%sโ€"
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Gแปก bแป cรขy lร m viแป‡c/%s: khรดng phแบฃi lร  thฦฐ mแปฅc hแปฃp lแป‡"
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Gแปก bแป cรขy lร m viแป‡c/%s: khรดng cรณ tแบญp tin gitdir"
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Gแปก bแป cรขy lร m viแป‡c/%s: khรดng thแปƒ ฤ‘แปc tแบญp tin gitdir (%s)"
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr "Gแปก bแป cรขy lร m viแป‡c/%s: ฤ‘แปc ngแบฏn (cแบงn %<PRIuMAX> byte, ฤ‘แปc %<PRIuMAX>)"
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Gแปก bแป cรขy lร m viแป‡c/%s: tแบญp tin gitdir khรดng hแปฃp lแป‡"
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Gแปก bแป cรขy lร m viแป‡c/%s: tแบญp tin gitdir chแป‰ ฤ‘แบฟn vแป‹ trรญ khรดng tแป“n tแบกi"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr "bรกo cรกo cรกc cรขy lร m viแป‡c ฤ‘รฃ prune"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr "cรกc cรขy lร m viแป‡c hแบฟt hแบกn cลฉ hฦกn khoแบฃng <thแปi gian>"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr "โ€œ%sโ€ ฤ‘รฃ cรณ tแปซ trฦฐแป›c rแป“i"
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:244
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "khรดng thแปƒ thรชm-lแบกi cรขy โ€œ%sโ€"
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:249
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -20709,7 +21873,7 @@ msgstr ""
 "โ€œ%sโ€ bแป‹ mแบฅt nhฦฐng cรขy lร m viแป‡c bแป‹ khรณa;\n"
 "dรนng โ€œadd -f -fโ€ ฤ‘แปƒ ghi ฤ‘รจ, hoแบทc โ€œunlockโ€ vร  โ€œpruneโ€ hay โ€œremoveโ€ ฤ‘แปƒ xรณa"
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:251
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -20718,120 +21882,120 @@ msgstr ""
 "โ€œ%sโ€ bแป‹ mแบฅt nhฦฐng cรขy lร m viแป‡c ฤ‘รฃ ฤ‘ฦฐแปฃc ฤ‘ฤƒng kรฝ;\n"
 "dรนng โ€œadd -fโ€ ฤ‘แปƒ ghi ฤ‘รจ, hoแบทc โ€œpruneโ€ hay โ€œremoveโ€ ฤ‘แปƒ xรณa"
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "khรดng thแปƒ tแบกo thฦฐ mแปฅc cแปงa โ€œ%sโ€"
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:432 builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "ฤang chuแบฉn bแป‹ cรขy lร m viแป‡c (nhรกnh mแป›i โ€œ%sโ€)"
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:434
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "ฤang chuแบฉn bแป‹ cรขy lร m viแป‡c (ฤ‘ang cร i ฤ‘แบทt nhรกnh โ€œ%sโ€, trฦฐแป›c ฤ‘รขy tแบกi %s)"
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:443
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "ฤang chuแบฉn bแป‹ cรขy lร m viแป‡c (ฤ‘ang lแบฅy ra โ€œ%sโ€)"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:449
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "ฤang chuแบฉn bแป‹ cรขy lร m viแป‡c (HEAD ฤ‘รฃ tรกch rแปi โ€œ%sโ€)"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:490
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "lแบฅy ra <nhรกnh> ngay cแบฃ khi nรณ ฤ‘รฃ ฤ‘ฦฐแปฃc lแบฅy ra แปŸ cรขy lร m viแป‡c khรกc"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:493
 msgid "create a new branch"
 msgstr "tแบกo nhรกnh mแป›i"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:495
 msgid "create or reset a branch"
 msgstr "tแบกo hay ฤ‘แบทt lแบกi mแป™t nhรกnh"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:497
 msgid "populate the new working tree"
 msgstr "di chuyแปƒn cรขy lร m viแป‡c mแป›i"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:498
 msgid "keep the new working tree locked"
 msgstr "giแปฏ cรขy lร m viแป‡c mแป›i bแป‹ khรณa"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:501
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "cร i ฤ‘แบทt chแบฟ ฤ‘แป™ theo dรตi (xem git-branch(1))"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:504
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "cรณ khแป›p tรชn tรชn nhรกnh mแป›i vแป›i mแป™t nhรกnh theo dรตi mรกy chแปง"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:512
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "Cรกc tรนy chแปn -b, -B, vร  --detach loแบกi tแปซ lแบซn nhau"
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:573
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track chแป‰ cรณ thแปƒ ฤ‘ฦฐแปฃc dรนng nแบฟu mแป™t nhรกnh mแป›i ฤ‘ฦฐแปฃc tแบกo"
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:673
 msgid "reason for locking"
 msgstr "lรฝ do khรณa"
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "%s khรดng phแบฃi lร  cรขy lร m viแป‡c"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:687 builtin/worktree.c:720
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Cรขy thฦฐ mแปฅc lร m viแป‡c chรญnh khรดng thแปƒ khรณa hay bแป khรณa ฤ‘ฦฐแปฃc"
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:692
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "โ€œ%sโ€ ฤ‘รฃ ฤ‘ฦฐแปฃc khรณa rแป“i, lรฝ do: %s"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:694
 #, c-format
 msgid "'%s' is already locked"
 msgstr "โ€œ%sโ€ ฤ‘รฃ ฤ‘ฦฐแปฃc khรณa rแป“i"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:722
 #, c-format
 msgid "'%s' is not locked"
 msgstr "โ€œ%sโ€ chฦฐa bแป‹ khรณa"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:763
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "cรขy lร m viแป‡c cรณ chแปฉa mรด-ฤ‘un-con khรดng thแปƒ di chuyแปƒn hay xรณa bแป"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:771
 msgid "force move even if worktree is dirty or locked"
 msgstr "รฉp buแป™c ngay cแบฃ khi cรขy lร m viแป‡c ฤ‘ang bแบฉn hay bแป‹ khรณa"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:794 builtin/worktree.c:921
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "โ€œ%sโ€ lร  cรขy lร m viแป‡c chรญnh"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:799
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "khรดng thแปƒ phรกc hแปa ra tรชn ฤ‘รญch ฤ‘แบฟn โ€œ%sโ€"
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:805
 #, c-format
 msgid "target '%s' already exists"
 msgstr "ฤ‘รญch โ€œ%sโ€ ฤ‘รฃ tแป“n tแบกi rแป“i"
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:813
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -20840,7 +22004,7 @@ msgstr ""
 "khรดng thแปƒ di chuyแปƒn mแป™t cรขy-lร m-viแป‡c bแป‹ khรณa, khรณa vรฌ: %s\n"
 "dรนng โ€œmove -f -fโ€ ฤ‘แปƒ ghi ฤ‘รจ hoแบทc mแปŸ khรณa trฦฐแป›c ฤ‘รฃ"
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:815
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -20848,36 +22012,38 @@ msgstr ""
 "khรดng thแปƒ di chuyแปƒn mแป™t cรขy-lร m-viแป‡c bแป‹ khรณa;\n"
 "dรนng โ€œmove -f -fโ€ ฤ‘แปƒ ghi ฤ‘รจ hoแบทc mแปŸ khรณa trฦฐแป›c ฤ‘รฃ"
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:818
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "thแบฉm tra gแบทp lแป—i, khรดng thแปƒ di chuyแปƒn mแป™t cรขy-lร m-viแป‡c: %s"
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:823
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "gแบทp lแป—i khi chuyแปƒn โ€œ%sโ€ sang โ€œ%sโ€"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:871
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "gแบทp lแป—i khi chแบกy โ€œgit statusโ€ vร o โ€œ%sโ€"
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:875
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
-msgstr "โ€œ%sโ€ ฤ‘ang bแบฉn, hรฃy dรนng --force ฤ‘แปƒ xรณa nรณ"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"โ€œ%sโ€ cรณ chแปฉa cรกc tแบญp tin ฤ‘รฃ bแป‹ sแปญa chแปฏa hoแบทc chฦฐa ฤ‘ฦฐแปฃc theo dรตi, hรฃy dรนng --"
+"force ฤ‘แปƒ xรณa nรณ"
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:880
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "gแบทp lแป—i khi chแบกy โ€œgit statusโ€ trong โ€œ%sโ€, mรฃ %d"
 
-#: builtin/worktree.c:911
+#: builtin/worktree.c:903
 msgid "force removal even if worktree is dirty or locked"
 msgstr "รฉp buแป™c di chuyแปƒn thแบญm chรญ cแบฃ khi cรขy lร m viแป‡c ฤ‘ang bแบฉn hay bแป‹ khรณa"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:926
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -20886,7 +22052,7 @@ msgstr ""
 "khรดng thแปƒ xรณa bแป mแป™t cรขy-lร m-viแป‡c bแป‹ khรณa, khรณa vรฌ: %s\n"
 "dรนng โ€œremove -f -fโ€ ฤ‘แปƒ ghi ฤ‘รจ hoแบทc mแปŸ khรณa trฦฐแป›c ฤ‘รฃ"
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:928
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -20894,7 +22060,7 @@ msgstr ""
 "khรดng thแปƒ xรณa bแป mแป™t cรขy-lร m-viแป‡c bแป‹ khรณa;\n"
 "dรนng โ€œremove -f -fโ€ ฤ‘แปƒ ghi ฤ‘รจ hoแบทc mแปŸ khรณa trฦฐแป›c ฤ‘รฃ"
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:931
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "thแบฉm tra gแบทp lแป—i, khรดng thแปƒ gแปก bแป mแป™t cรขy-lร m-viแป‡c: %s"
@@ -20915,6 +22081,22 @@ msgstr "ghi ฤ‘แป‘i tฦฐแปฃng cรขy (tree) cho <tiแปn tแป‘> thฦฐ mแปฅc con"
 msgid "only useful for debugging"
 msgstr "chแป‰ hแปฏu รญch khi cแบงn gแปก lแป—i"
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Cแบงn lแป‡nh 'mark', nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc %s"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Cแบงn lแป‡nh 'to', nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc %s"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+"tรญnh nฤƒng ' %s ' bแป‹ cแบฅm chแป‰ trong ฤ‘แบงu vร o mร  khรดng cรณ --allow-unsafe-features"
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -21028,25 +22210,25 @@ msgstr ""
 "bรญ danh โ€œ%sโ€ thay ฤ‘แป•i biแบฟn mรดi trฦฐแปng.\n"
 "Bแบกn cรณ thแปƒ sแปญ dแปฅng โ€œ!gitโ€ trong ฤ‘แบทt bรญ danh ฤ‘แปƒ lร m viแป‡c nร y"
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr "lร m trแป‘ng bรญ danh cho %s"
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr "ฤ‘แป‡ quy cรกc bรญ danh: %s"
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr "lแป—i ghi nghiรชm trong trรชn ฤ‘แบงu ra tiรชu chuแบฉn"
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr "lแป—i nghiรชm trแปng chฦฐa biแบฟt khi ghi ra ฤ‘แบงu ra tiรชu chuแบฉn"
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr "gแบทp lแป—i khi ฤ‘รณng ฤ‘แบงu ra tiรชu chuแบฉn"
 
@@ -21101,26 +22283,26 @@ msgstr "CURLSSLOPT_NO_REVOKE khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ vแป›i cURL < 7.44.0"
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Cรกc hแบกn chแบฟ giao thแปฉc khรดng ฤ‘ฦฐแปฃc hแป— trแปฃ vแป›i cURL < 7.19.4"
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 "Khรดng hแป— trแปฃ แปฉng dแปฅng SSL chแบกy phรญa sau โ€œ%sโ€. Hแป— trแปฃ แปฉng dแปฅng SSL chแบกy phรญa "
 "sau:"
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "Khรดng thแปƒ ฤ‘แบทt แปฉng dแปฅng chแบกy SSL phรญa sau โ€œ%sโ€: cURL ฤ‘ฦฐแปฃc biรชn dแป‹ch khรดng cรณ "
 "sแปฑ hแป— trแปฃ แปฉng dแปฅng chแบกy phรญa sau SSL"
 
-#: http.c:1096
+#: http.c:1097
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Khรดng thแปƒ ฤ‘แบทt แปฉng dแปฅng chแบกy sau SSL cho โ€œ%sโ€: ฤ‘รฃ ฤ‘แบทt rแป“i"
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21131,149 +22313,160 @@ msgstr ""
 "      hแปi cho: %s\n"
 " chuyแปƒn hฦฐแป›ng: %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "sai trรญch dแบซn trong giรก trแป‹ push-option :โ€œ%sโ€"
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs khรดng hแปฃp lแป‡: ฤ‘รขy cรณ phแบฃi lร  mแป™t kho git?"
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "ฤ‘รกp แปฉng tแปซ mรกy phแปฅc vแปฅ khรดng hแปฃp lแป‡; cแบงn dแป‹ch vแปฅ, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc gรณi "
 "flush"
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "trแบฃ vแป cแปงa mรกy phแปฅc vแปฅ khรดng hแปฃp lแป‡; nhแบญn ฤ‘ฦฐแปฃc %s"
 
-#: remote-curl.c:446
+#: remote-curl.c:455
 #, c-format
 msgid "repository '%s' not found"
 msgstr "khรดng tรฌm thแบฅy kho โ€œ%sโ€"
 
-#: remote-curl.c:450
+#: remote-curl.c:459
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Xรกc thแปฑc gแบทp lแป—i cho โ€œ%sโ€"
 
-#: remote-curl.c:454
+#: remote-curl.c:463
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "khรดng thแปƒ truy cแบญp โ€œ%sโ€: %s"
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr "chuyแปƒn hฦฐแป›ng ฤ‘แบฟn %s"
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "khรดng nรชn cรณ EOF khi khรดng gentle trรชn EOF"
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "khรดng thแปƒ tua lแบกi dแปฏ liแป‡u post rpc - thแปญ tฤƒng http.postBuffer"
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC gแบทp lแป—i; %s"
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 msgid "cannot handle pushes this big"
 msgstr "khรดng thแปƒ xแปญ lรฝ ฤ‘แบฉy cรกi lแป›n nร y"
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "khรดng thแปƒ giแบฃi nรฉn yรชu cแบงu; cรณ lแป—i khi giแบฃi nรฉn cแปงa zlib %d"
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "khรดng thแปƒ giแบฃi nรฉn yรชu cแบงu; cรณ lแป—i แปŸ cuแป‘i %d"
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "ฤ‘แป• vแบญn chuyแปƒn http khรดng hแป— trแปฃ khแบฃ nฤƒng nรดng"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1038
 msgid "fetch failed."
 msgstr "lแบฅy vแป gแบทp lแป—i."
 
-#: remote-curl.c:1076
+#: remote-curl.c:1086
 msgid "cannot fetch by sha1 over smart http"
 msgstr "khรดng thแปƒ lแบฅy vแป bแบฑng sha1 thรดng qua smart http"
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1130 remote-curl.c:1136
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "lแป—i giao thแปฉc: cแบงn sha/ref, nhฦฐng lแบกi nhแบญn ฤ‘ฦฐแปฃc โ€œ%sโ€"
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1148 remote-curl.c:1263
 #, c-format
 msgid "http transport does not support %s"
 msgstr "vแบญn chuyแปƒn http khรดng hแป— trแปฃ %s"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1184
 msgid "git-http-push failed"
 msgstr "git-http-push gแบทp lแป—i"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1369
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: usage: git remote-curl <mรกy chแปง> [<url>]"
 
-#: remote-curl.c:1392
+#: remote-curl.c:1401
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: gแบทp lแป—i khi ฤ‘แปc luแป“ng dแปฏ liแป‡u lแป‡nh tแปซ git"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1408
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: ฤ‘รฃ cแป‘ gแบฏng fetch mร  khรดng cรณ kho nแป™i bแป™"
 
-#: remote-curl.c:1439
+#: remote-curl.c:1448
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: khรดng hiแปƒu lแป‡nh โ€œ%sโ€ tแปซ git"
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr "cรกc_tham_sแป‘"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr "lแปc ฤ‘แป‘i tฦฐแปฃng"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "ngร y hแบฟt hแบกn"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "no-op (tฦฐฦกng thรญch ngฦฐแปฃc)"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "chi tiแบฟt hฦกn nแปฏa"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "im lแบทng hฦกn nแปฏa"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "sแปญ dแปฅng <n> chแปฏ sแป‘ ฤ‘แปƒ hiแปƒn thแป‹ SHA-1s"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "lร m thแบฟ nร o ฤ‘แปƒ cแบฏt bแป khoแบฃng trแบฏng vร  #ghichรบ tแปซ mแบฉu tin nhแบฏn"
 
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "ฤ‘แปc ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn tแปซ tแบญp tin"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"vแป›i --pathspec-from-file, cรกc phแบงn tแปญ ฤ‘แบทc tแบฃ ฤ‘ฦฐแปng dแบซn bแป‹ ngฤƒn cรกch bแปŸi kรฝ "
+"tแปฑ NULL"
+
 #: ref-filter.h:101
 msgid "key"
 msgstr "khรณa"
@@ -21795,162 +22988,170 @@ msgid "Common Git shell script setup code"
 msgstr "Mรฃ cร i ฤ‘แบทt vฤƒn lแป‡nh hแป‡ vแป Git chung"
 
 #: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "KhแปŸi tแบกo vร  sแปญa ฤ‘แป•i sparse-checkout"
+
+#: command-list.h:172
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Tแบกm cแบฅt ฤ‘i cรกc thay ฤ‘แป•i trong mแป™t thฦฐ mแปฅc lร m viแป‡c bแบฉn"
 
-#: command-list.h:172
+#: command-list.h:173
 msgid "Add file contents to the staging area"
 msgstr "Thรชm nแป™i dung tแบญp tin vร o vรนng bแป‡ phรณng"
 
-#: command-list.h:173
+#: command-list.h:174
 msgid "Show the working tree status"
 msgstr "Hiแปƒn thแป‹ trแบกng thรกi cรขy lร m viแป‡c"
 
-#: command-list.h:174
+#: command-list.h:175
 msgid "Remove unnecessary whitespace"
 msgstr "Xรณa bแป cรกc khoแบฃng trแบฏng khรดng cแบงn thiแบฟt"
 
-#: command-list.h:175
+#: command-list.h:176
 msgid "Initialize, update or inspect submodules"
 msgstr "KhแปŸi tแบกo, cแบญp nhแบญt hay ฤ‘iแปu tra cรกc mรด-ฤ‘un-con"
 
-#: command-list.h:176
+#: command-list.h:177
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Thao tรกc hai hฦฐแป›ng giแปฏ hai kho Subversion vร  Git"
 
-#: command-list.h:177
+#: command-list.h:178
 msgid "Switch branches"
 msgstr "Cรกc nhรกnh chuyแปƒn"
 
-#: command-list.h:178
+#: command-list.h:179
 msgid "Read, modify and delete symbolic refs"
 msgstr "ฤแปc, sแปญa vร  xรณa tham chiแบฟu mแปm"
 
-#: command-list.h:179
+#: command-list.h:180
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Tแบกo, liแป‡t kรช, xรณa hay xรกc thแปฑc mแป™t ฤ‘แป‘i tฦฐแปฃng thแบป ฤ‘ฦฐแปฃc kรฝ bแบฑng GPG"
 
-#: command-list.h:180
+#: command-list.h:181
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Tแบกo mแป™t tแบญp tin tแบกm vแป›i nแป™i dung cแปงa blob"
 
-#: command-list.h:181
+#: command-list.h:182
 msgid "Unpack objects from a packed archive"
 msgstr "Gแปก cรกc ฤ‘แป‘i tฦฐแปฃng khแปi mแป™t kho lฦฐu ฤ‘รฃ ฤ‘รณng gรณi"
 
-#: command-list.h:182
+#: command-list.h:183
 msgid "Register file contents in the working tree to the index"
 msgstr "ฤฤƒng kรฝ nแป™i dung tแบญp tin tแปซ cรขy lร m viแป‡c ฤ‘แบฟn bแบฃng mแปฅc lแปฅc"
 
-#: command-list.h:183
+#: command-list.h:184
 msgid "Update the object name stored in a ref safely"
 msgstr "Cแบญp nhแบญt tรชn ฤ‘แป‘i tฦฐแปฃng ฤ‘ฦฐแปฃc lฦฐu trong mแป™t tham chiแบฟu mแป™t cรกch an toร n"
 
-#: command-list.h:184
+#: command-list.h:185
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Cแบญp nhแบญt tแบญp tin thรดng tin phแปฅ trแปฃ ฤ‘แปƒ giรบp ฤ‘แปก cรกc dแป‹ch vแปฅ dumb"
 
-#: command-list.h:185
+#: command-list.h:186
 msgid "Send archive back to git-archive"
 msgstr "Gแปญi trแปŸ lแบกi kho lฦฐu ฤ‘แบฟn git-archive"
 
-#: command-list.h:186
+#: command-list.h:187
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Gแปญi trแปŸ lแบกi cรกc ฤ‘แป‘i tฦฐแปฃng ฤ‘รฃ ฤ‘รณng gรณi cho git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:188
 msgid "Show a Git logical variable"
 msgstr "Hiแปƒn thแป‹ mแป™t biแบฟn Git luแบญn lรฝ"
 
-#: command-list.h:188
+#: command-list.h:189
 msgid "Check the GPG signature of commits"
 msgstr "Kiแปƒm tra kรฝ lแบงn chuyแปƒn giao dรนng GPG"
 
-#: command-list.h:189
+#: command-list.h:190
 msgid "Validate packed Git archive files"
 msgstr "Kiแปƒm tra lแบกi cรกc tแบญp tin kho (lฦฐu trแปฏ, nรฉn) Git ฤ‘รฃ ฤ‘ฦฐแปฃc ฤ‘รณng gรณi"
 
-#: command-list.h:190
+#: command-list.h:191
 msgid "Check the GPG signature of tags"
 msgstr "Kiแปƒm tra chแปฏ kรฝ GPG cแปงa cรกc thแบป"
 
-#: command-list.h:191
+#: command-list.h:192
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Giao diแป‡n Git trรชn nแปn web (แปฉng dแปฅng web chแบกy trรชn kho Git)"
 
-#: command-list.h:192
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Hiแปƒn thแป‹ cรกc nhแบญt kรฝ vแป›i tแปซng lแบงn chuyแปƒn giao khรกc nhau ฤ‘ฦฐa ra"
 
-#: command-list.h:193
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Quแบฃn lรฝ nhiแปu cรขy lร m viแป‡c"
 
-#: command-list.h:194
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Tแบกo mแป™t ฤ‘แป‘i tฦฐแปฃng cรขy tแปซ ฤ‘แบงu vร o tiรชu chuแบฉn stdin hiแป‡n tแบกi"
 
-#: command-list.h:195
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "ฤแป‹nh nghฤฉa cรกc thuแป™c tรญnh cho mแป—i ฤ‘ฦฐแปng dแบซn"
 
-#: command-list.h:196
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Giao diแป‡n dรฒng lแป‡nh Git vร  quy ฦฐแป›c"
 
-#: command-list.h:197
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Hฦฐแป›ng dแบซn Git cฦก bแบฃn cho nhร  phรกt triแปƒn"
 
-#: command-list.h:198
+#: command-list.h:199
 msgid "Git for CVS users"
 msgstr "Git dร nh cho nhแปฏng ngฦฐแปi dรนng CVS"
 
-#: command-list.h:199
+#: command-list.h:200
 msgid "Tweaking diff output"
 msgstr "Chแป‰nh kแบฟt xuแบฅt diff"
 
-#: command-list.h:200
+#: command-list.h:201
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Mแป™t tแบญp hแปฃp lแป‡nh hแปฏu dแปฅng tแป‘i thiแปƒu ฤ‘แปƒ dรนng Git hร ng ngร y"
 
-#: command-list.h:201
+#: command-list.h:202
 msgid "A Git Glossary"
 msgstr "Thuแบญt ngแปฏ chuyรชn mรดn Git"
 
-#: command-list.h:202
+#: command-list.h:203
 msgid "Hooks used by Git"
 msgstr "Cรกc mรณc ฤ‘ฦฐแปฃc sแปญ dแปฅng bแปŸi Git"
 
-#: command-list.h:203
+#: command-list.h:204
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Chแป‰ ฤ‘แป‹nh cรกc tแบญp tin khรดng cแบงn theo dรตi"
 
-#: command-list.h:204
+#: command-list.h:205
 msgid "Defining submodule properties"
 msgstr "ฤแป‹nh nghฤฉa thuแป™c tรญnh mรด-ฤ‘un-con"
 
-#: command-list.h:205
+#: command-list.h:206
 msgid "Git namespaces"
 msgstr "Khรดng gian tรชn Git"
 
-#: command-list.h:206
+#: command-list.h:207
 msgid "Git Repository Layout"
 msgstr "Bแป‘ cแปฅc kho Git"
 
-#: command-list.h:207
+#: command-list.h:208
 msgid "Specifying revisions and ranges for Git"
 msgstr "Chแป‰ ฤ‘แป‹nh ฤ‘iแปƒm xรฉt duyแป‡t vร  vรนng cho Git"
 
-#: command-list.h:208
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "Gแบฏn mแป™t kho chแปฉa vร o trong mแป™t cรกi khรกc"
+
+#: command-list.h:210
 msgid "A tutorial introduction to Git: part two"
 msgstr "Hฦฐแป›ng dแบซn cรกch dรนng Git: phแบงn hai"
 
-#: command-list.h:209
+#: command-list.h:211
 msgid "A tutorial introduction to Git"
 msgstr "Hฦฐแป›ng dแบซn cรกch dรนng Git"
 
-#: command-list.h:210
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr "Tแป•ng quan vแป luแป“ng cรดng viแป‡c khuyแบฟn nghแป‹ nรชn dรนng vแป›i Git"
 
@@ -22077,146 +23278,134 @@ msgstr "ฤang thแปญ hรฒa trแป™n ฤ‘ฦกn giแบฃn vแป›i $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Hรฒa trแป™n ฤ‘ฦกn giแบฃn khรดng lร m viแป‡c, thแปญ hรฒa trแป™n tแปฑ ฤ‘แป™ng."
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Khรดng thแปƒ gแปก bแป bแบฃng mแปฅc lแปฅc tแบกm thแปi (khรดng thแปƒ xแบฃy ra)"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Khรดng thแปƒ cแบญp nhแบญt $ref_stash vแป›i $w_commit"
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "lแป—i: khรดng hiแปƒu tรนy chแปn cho โ€œstash pushโ€: $option"
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "ฤรฃ ghi lแบกi thฦฐ mแปฅc lร m viแป‡c vร  trแบกng thรกi mแปฅc lแปฅc $stash_msg"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "khรดng hiแปƒu tรนy chแปn: $opt"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Chแป‰ ra quรก nhiแปu ฤ‘iแปƒm xรฉt duyแป‡t: $REV"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference khรดng phแบฃi lร  tham chiแบฟu hแปฃp lแป‡"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "โ€œ$argsโ€ khรดng phแบฃi lร  lแบงn chuyแปƒn giao kiแปƒu-stash (cแบฅt ฤ‘i)"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "โ€$argsโ€ khรดng phแบฃi tham chiแบฟu ฤ‘แบฟn stash"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "khรดng thแปƒ lร m tฦฐฦกi mแป›i bแบฃng mแปฅc lแปฅc"
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Khรดng thแปƒ รกp dแปฅng mแป™t stash แปŸ giแปฏa cแปงa quรก trรฌnh hรฒa trแป™n"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr "Xung ฤ‘แป™t trong bแบฃng mแปฅc lแปฅc. Hรฃy thแปญ mร  khรดng dรนng tรนy chแปn --index."
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "Khรดng thแปƒ ghi lแบกi cรขy chแป‰ mแปฅc"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr "Khรดng thแปƒ phแปฅc hแป“i cรกc tแบญp tin chฦฐa theo dรตi tแปซ mแปฅc cแบฅt ฤ‘i (stash)"
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "Khรดng thแปƒ bแป ra khแปi bแป‡ phรณng cรกc tแบญp tin ฤ‘รฃ ฤ‘ฦฐแปฃc sแปญa chแปฏa"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "ฤรฃ xรณa ${REV} ($s)"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Khรดng thแปƒ xรณa bแป mแปฅc stash"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(ฤแปƒ phแปฅc hแป“i lแบกi chรบng hรฃy gรต \"git stash apply\")"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:203
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "ฤฦฐแปng dแบซn tฦฐฦกng ฤ‘แป‘i chแป‰ cรณ thแปƒ dรนng tแปซ thฦฐ mแปฅc แปŸ mแปฉc cao nhแบฅt cแปงa cรขy lร m "
 "viแป‡c"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:213
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 "repo URL: โ€œ$repoโ€ phแบฃi lร  ฤ‘ฦฐแปng dแบซn tuyแป‡t ฤ‘แป‘i hoแบทc lร  bแบฏt ฤ‘แบงu bแบฑng ./|../"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:232
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "โ€$sm_pathโ€ thแปฑc sแปฑ ฤ‘รฃ tแป“n tแบกi แปŸ bแบฃng mแปฅc lแปฅc rแป“i"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:235
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr ""
 "โ€$sm_pathโ€ thแปฑc sแปฑ ฤ‘รฃ tแป“n tแบกi แปŸ bแบฃng mแปฅc lแปฅc rแป“i vร  khรดng phแบฃi lร  mแป™t mรด-ฤ‘un-"
 "con"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:242
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "โ€œ$sm_pathโ€ khรดng cรณ lแบงn chuyแปƒn giao nร o ฤ‘ฦฐแปฃc lแบฅy ra"
 
-#: git-submodule.sh:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"Cรกc ฤ‘ฦฐแปng dแบซn theo sau ฤ‘รขy sแบฝ bแป‹ lแป ฤ‘i bแปŸi mแป™t trong cรกc tแบญp tin .gitignore "
-"cแปงa bแบกn:\n"
-"$sm_path\n"
-"Sแปญ dแปฅng -f nแบฟu bแบกn thแปฑc sแปฑ muแป‘n thรชm nรณ vร o."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:273
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "ฤang thรชm repo cรณ sแบตn tแบกi โ€œ$sm_pathโ€ vร o bแบฃng mแปฅc lแปฅc"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:275
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "โ€$sm_pathโ€ ฤ‘รฃ tแป“n tแบกi tแปซ trฦฐแป›c vร  khรดng phแบฃi lร  mแป™t kho git hแปฃp lแป‡"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:283
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Thฦฐ mแปฅc git cho โ€œ$sm_nameโ€ ฤ‘ฦฐแปฃc tรฌm thแบฅy mแป™t cรกch cแปฅc bแป™ vแป›i cรกc mรกy chแปง:"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:285
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22232,40 +23421,40 @@ msgstr ""
 "hoแบทc lร  bแบกn khรดng chแบฏc chแบฏn ฤ‘iแปu ฤ‘รณ nghฤฉa lร  gรฌ thรฌ chแปn tรชn khรกc vแป›i tรนy "
 "chแปn โ€œ--nameโ€."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:291
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 "Phแปฅc hแป“i sแปฑ hoแบกt ฤ‘แป™ng cแปงa thฦฐ mแปฅc git nแป™i bแป™ cho mรด-ฤ‘un-con โ€œ$sm_nameโ€."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:303
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Khรดng thแปƒ lแบฅy ra mรด-ฤ‘un-con โ€œ$sm_pathโ€"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:308
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Gแบทp lแป—i khi thรชm mรด-ฤ‘un-con โ€œ$sm_pathโ€"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:317
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Gแบทp lแป—i khi ฤ‘ฤƒng kรฝ vแป›i hแป‡ thแป‘ng mรด-ฤ‘un-con โ€œ$sm_pathโ€"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Khรดng tรฌm thแบฅy ฤ‘iแปƒm xรฉt duyแป‡t hiแป‡n hร nh trong ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con "
 "โ€œ$displaypathโ€"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:600
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Khรดng thแปƒ lแบฅy vแป trong ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$sm_pathโ€"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:605
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22274,7 +23463,7 @@ msgstr ""
 "Khรดng thแปƒ tรฌm thแบฅy ฤ‘iแปƒm xรฉt duyแป‡t hiแป‡n hร nh ${remote_name}/${branch} trong "
 "ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$sm_pathโ€"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22283,7 +23472,7 @@ msgstr ""
 "Khรดng thแปƒ lแบฅy vแป trong ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$displaypathโ€; thแปญ lแบฅy vแป trแปฑc "
 "tiแบฟp $sha1:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:629
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22292,74 +23481,74 @@ msgstr ""
 "ฤรฃ lแบฅy vแป tแปซ ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un con โ€œ$displaypathโ€, nhฦฐng nรณ khรดng chแปฉa $sha1. "
 "Lแบฅy vแป theo ฤ‘แป‹nh hฦฐแป›ng cแปงa lแบงn chuyแปƒn giao ฤ‘รณ gแบทp lแป—i."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:636
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Khรดng thแปƒ lแบฅy ra โ€œ$sha1โ€ trong ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$displaypathโ€"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:637
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "ฤฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$displaypathโ€: ฤ‘รฃ checkout โ€œ$sha1โ€"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Khรดng thแปƒ cแบฃi tแป• โ€œ$sha1โ€ trong ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$displaypathโ€"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "ฤฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$displaypathโ€: ฤ‘ฦฐแปฃc rebase vร o trong โ€œ$sha1โ€"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Khรดng thแปƒ hรฒa trแป™n (merge) โ€œ$sha1โ€ trong ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$displaypathโ€"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "ฤฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$displaypathโ€: ฤ‘ฦฐแปฃc hรฒa trแป™n vร o โ€œ$sha1โ€"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:653
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Thแปฑc hiแป‡n khรดng thร nh cรดng lแป‡nh โ€œ$command $sha1โ€ trong ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con "
 "โ€œ$displaypathโ€"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:654
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "ฤฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$displaypathโ€: โ€œ$command $sha1โ€"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:685
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Gแบทp lแป—i khi ฤ‘แป‡ quy vร o trong ฤ‘ฦฐแปng dแบซn mรด-ฤ‘un-con โ€œ$displaypathโ€"
 
-#: git-submodule.sh:830
+#: git-submodule.sh:896
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Tรนy chแปn --cached khรดng thแปƒ dรนng cรนng vแป›i tรนy chแปn --files"
 
-#: git-submodule.sh:882
+#: git-submodule.sh:948
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "chแบฟ ฤ‘แป™ khรดng nhฦฐ mong chแป $mod_dst"
 
-#: git-submodule.sh:902
+#: git-submodule.sh:968
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Cแบฃnh bรกo: $display_name khรดng chแปฉa lแบงn chuyแปƒn giao $sha1_src"
 
-#: git-submodule.sh:905
+#: git-submodule.sh:971
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Cแบฃnh bรกo: $display_name khรดng chแปฉa lแบงn chuyแปƒn giao $sha1_dst"
 
-#: git-submodule.sh:908
+#: git-submodule.sh:974
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
@@ -22682,6 +23871,10 @@ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Cแบฃi tแป• $shortrevisions vร o $shortonto (cรกc lแป‡nh $todocount)"
 
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "Chรบ รฝ rแบฑng lแบงn chuyแปƒn giao trแป‘ng rแป—ng lร  ghi chรบ"
+
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
 msgstr "Khรดng thแปƒ khแปŸi tแบกo cรกc lแบงn chuyแปƒn giao ghi lแบกi"
@@ -22753,77 +23946,18 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Khรดng thแปƒ dรฒ tรฌm ฤ‘ฦฐแปng dแบซn tuyแป‡t ฤ‘แป‘i cแปงa thฦฐ mแปฅc git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "ฤ‘รฃ ฤ‘ฦฐa lรชn bแป‡ phรณng"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "chฦฐa ฤ‘ฦฐa lรชn bแป‡ phรณng"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "nhแป‹ phรขn"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "khรดng cรณ gรฌ"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "khรดng thay ฤ‘แป•i"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "ฤ‘รฃ thรชm %d ฤ‘ฦฐแปng dแบซn\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "ฤ‘รฃ cแบญp nhแบญt %d ฤ‘ฦฐแปng dแบซn\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "ฤ‘รฃ hoร n nguyรชn %d ฤ‘ฦฐแปng dแบซn\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d ฤ‘ฦฐแปng dแบซn ฤ‘รฃ touch (chแบกm)\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Cแบญp nhแบญt"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Hoร n nguyรชn"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "chรบ รฝ: %s giแป ฤ‘รฃ bแป theo dรตi.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Thรชm cรกc cรกi chฦฐa ฤ‘ฦฐแปฃc theo dรตi"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Khรดng cรณ tแบญp tin nร o chฦฐa ฤ‘ฦฐแปฃc theo dรตi.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -22831,7 +23965,7 @@ msgstr ""
 "Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc\n"
 "ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu ฤ‘แปƒ chuyแปƒn lรชn bแป‡ phรณng."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -22839,7 +23973,7 @@ msgstr ""
 "Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc\n"
 "ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu ฤ‘แปƒ tแบกm cแบฅt."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -22847,8 +23981,8 @@ msgstr ""
 "Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc\n"
 "ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu ฤ‘แปƒ bแป chuyแปƒn lรชn bแป‡ phรณng."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -22856,8 +23990,8 @@ msgstr ""
 "Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc\n"
 "ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu ฤ‘แปƒ รกp dแปฅng."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -22865,16 +23999,12 @@ msgstr ""
 "Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc\n"
 "ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu ฤ‘แปƒ loแบกi bแป."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "gแบทp lแป—i khi tแบญp tin sแปญa khรบc ฤ‘แปƒ ghi: %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Chแบฟ ฤ‘แป™ sแปญa khรบc bแบฑng tay -- xem แปŸ ฤ‘รกy ฤ‘แปƒ cรณ hฦฐแป›ng dแบซn sแปญ dแปฅng nhanh.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -22887,36 +24017,12 @@ msgstr ""
 "ฤแปƒ xรณa bแป dรฒng โ€œ%sโ€, xรณa chรบng ฤ‘i.\n"
 "Nhแปฏng dรฒng bแบฏt ฤ‘แบงu bแบฑng %s sแบฝ bแป‹ loแบกi bแป.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"Nแบฟu miแบฟng vรก khรดng ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, bแบกn sแบฝ cรณ mแป™t cฦก hแป™i\n"
-"ฤ‘แปƒ sแปญa lแบงn nแปฏa. Nแบฟu mแปi dรฒng cแปงa khรบc bแป‹ xรณa bแป, thแบฟ thรฌ nhแปฏng\n"
-"sแปญa dแป•i sแบฝ bแป‹ loแบกi bแป, vร  khรบc vแบซn giแปฏ nguyรชn.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "gแบทp lแป—i khi mแปŸ tแบญp tin khรบc ฤ‘แปƒ ฤ‘แปc: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Hunk ฤ‘รฃ sแปญa cแปงa bแบกn khรดng ฤ‘ฦฐแปฃc รกp dแปฅng. Sแปญa lแบกi lแบงn nแปฏa (nรณi \"n\" ฤ‘แปƒ loแบกi "
-"bแป!) [y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -22931,7 +24037,7 @@ msgstr ""
 "d - ฤ‘แปซng ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi trong tแบญp "
 "tin"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -22945,7 +24051,7 @@ msgstr ""
 "a - tแบกm cแบฅt khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
 "d - ฤ‘แปซng tแบกm cแบฅt khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi trong tแบญp tin"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -22961,7 +24067,7 @@ msgstr ""
 "d - ฤ‘แปซng ฤ‘ฦฐa ra khแปi bแป‡ phรณng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi trong "
 "tแบญp tin"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -22975,7 +24081,7 @@ msgstr ""
 "a - รกp dแปฅng khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
 "d - ฤ‘แปซng รกp dแปฅng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -22989,7 +24095,7 @@ msgstr ""
 "a - loแบกi bแป khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
 "d - ฤ‘แปซng loแบกi bแป khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23003,7 +24109,7 @@ msgstr ""
 "a - loแบกi bแป khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
 "d - ฤ‘แปซng loแบกi bแป khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23017,7 +24123,7 @@ msgstr ""
 "a - รกp dแปฅng khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
 "d - ฤ‘แปซng รกp dแปฅng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23031,7 +24137,7 @@ msgstr ""
 "a - รกp dแปฅng khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc sau nร y trong tแบญp tin\n"
 "d - ฤ‘แปซng รกp dแปฅng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o sau nร y trong tแบญp tin"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23053,224 +24159,83 @@ msgstr ""
 "e - sแปญa bแบฑng tay khรบc hiแป‡n hร nh\n"
 "? - in trแปฃ giรบp\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Cรกc khรบc ฤ‘รฃ chแปn khรดng ฤ‘ฦฐแปฃc รกp dแปฅng vร o bแบฃng mแปฅc lแปฅc!\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Vแบซn รกp dแปฅng chรบng cho cรขy lร m viแป‡c? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "ฤรฃ khรดng รกp dแปฅng gรฌ cแบฃ.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "bแป qua nhแปฏng thแปฉ chฦฐa hรฒa trแป™n: %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Chแป‰ cรณ cรกc tแบญp tin nhแป‹ phรขn lร  thay ฤ‘แป•i.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Khรดng cรณ thay ฤ‘แป•i nร o.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Cแบญp nhแบญt miแบฟng vรก"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Thay ฤ‘แป•i chแบฟ ฤ‘แป™ bแป‡ phรณng [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Xรณa khแปi bแป‡ phรณng [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "ฤฦฐa lรชn bแป‡ phรณng khรบc nร y [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Thay ฤ‘แป•i chแบฟ ฤ‘แป™ tแบกm cแบฅt ฤ‘i [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Xรณa tแบกm cแบฅt [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Tแบกm cแบฅt khรบc nร y [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Thay ฤ‘แป•i chแบฟ ฤ‘แป™ bแป ra khแปi bแป‡ phรณng [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Xรณa bแป viแป‡c bแป ra khแปi bแป‡ phรณng [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Bแป ra khแปi bแป‡ phรณng khรบc nร y [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "รp dแปฅng thay ฤ‘แป•i chแบฟ ฤ‘แป™ cho mแปฅc lแปฅc [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "รp dแปฅng viแป‡c xรณa vร o mแปฅc lแปฅc [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "รo dแปฅng khรบc nร y vร o mแปฅc lแปฅc [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Loแบกi bแป cรกc thay ฤ‘แป•i chแบฟ ฤ‘แป™ tแปซ cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Loแบกi bแป viแป‡c xรณa khแปi cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Loแบกi bแป khรบc nร y khแปi cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Loแบกi bแป thay ฤ‘แป•i chแบฟ ฤ‘แป™ tแปซ mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Loแบกi bแป viแป‡c xรณa khแปi mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Loแบกi bแป khรบc nร y khแปi mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "รp dแปฅng thay ฤ‘แป•i chแบฟ ฤ‘แป™ cho mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "รp dแปฅng viแป‡c xรณa vร o mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "รp dแปฅng khรบc nร y vร o mแปฅc lแปฅc vร  cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1468
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "รp dแปฅng thay ฤ‘แป•i chแบฟ ฤ‘แป™ cho cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1469
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "รp dแปฅng viแป‡c xรณa cho cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1470
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "รp dแปฅng khรบc nร y vร o cรขy lร m viแป‡c [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "Khรดng cรฒn khรบc nร o ฤ‘แปƒ mร  nhแบฃy ฤ‘แบฟn\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "nhแบฃy ฤ‘แบฟn khรบc nร o (<ret> ฤ‘แปƒ xem thรชm)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "nhแบฃy ฤ‘แบฟn khรบc nร o? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Sแป‘ khรดng hแปฃp lแป‡: โ€œ%sโ€\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Rแบฅt tiแบฟc, chแป‰ cรณ sแบตn %d khรบc.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "Khรดng cรฒn khรบc nร o ฤ‘แปƒ mร  tรฌm kiแบฟm\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "tรฌm kiแบฟm cho biแปƒu thแปฉc chรญnh quy? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "ฤแป‹nh dแบกng tรฌm kiแบฟm cแปงa biแปƒu thแปฉc chรญnh quy khรดng ฤ‘รบng %s: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
 msgstr "Khรดng thแบฅy khรบc nร o khแป›p mแบซu ฤ‘รฃ cho\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "Khรดng cรณ khรบc kแบฟ trฦฐแป›c\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "Khรดng cรณ khรบc kแบฟ tiแบฟp\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Rแบฅt tiแบฟc, khรดng thแปƒ chia nhแป khรบc nร y\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Chi nhแป thร nh %d khรบc.\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Rแบฅt tiแบฟc, khรดng thแปƒ sแปญa khรบc nร y\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Xem xรฉt lแบกi diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23290,19 +24255,19 @@ msgstr ""
 "add untracked - thรชm nแป™i dung cรกc cรกc tแบญp tin chฦฐa theo dรตi vร  tแบญp hแปฃp cรกc "
 "thay ฤ‘แป•i ฤ‘รฃ ฤ‘แบทt lรชn bแป‡ phรณng\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "thiแบฟu --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "khรดng hiแปƒu chแบฟ ฤ‘แป™ --patch: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "ฤ‘แป‘i sแป‘ khรดng hแปฃp lแป‡ %s, cแบงn --"
@@ -23669,6 +24634,169 @@ msgstr "Bแป qua %s vแป›i hแบญu tแป‘ sao lฦฐu dแปฑ phรฒng โ€œ%sโ€.\n"
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Bแบกn cรณ thแปฑc sแปฑ muแป‘n gแปญi %s? [y|N](cรณ/KHร”NG): "
 
+#, c-format
+#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
+#~ msgstr "Thay ฤ‘แป•i chแบฟ ฤ‘แป™ bแป‡ phรณng [y,n,a,q,d%s,?]? "
+
+#, c-format
+#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
+#~ msgstr "Xรณa khแปi bแป‡ phรณng [y,n,a,q,d%s,?]? "
+
+#, c-format
+#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
+#~ msgstr "ฤฦฐa lรชn bแป‡ phรณng khรบc nร y [y,n,a,q,d%s,?]? "
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for staging.\n"
+#~ msgstr ""
+#~ "Nแบฟu miแบฟng vรก ฤ‘ฦฐแปฃc รกp dแปฅng sแบกch sแบฝ, khรบc ฤ‘รฃ sแปญa sแบฝ ngay lแบญp tแปฉc\n"
+#~ "ฤ‘ฦฐแปฃc ฤ‘รกnh dแบฅu ฤ‘แปƒ chuyแปƒn lรชn bแป‡ phรณng.\n"
+
+#~ msgid ""
+#~ "y - stage this hunk\n"
+#~ "n - do not stage this hunk\n"
+#~ "q - quit; do not stage this hunk or any of the remaining ones\n"
+#~ "a - stage this and all the remaining hunks\n"
+#~ "d - do not stage this hunk nor any of the remaining hunks\n"
+#~ msgstr ""
+#~ "y - ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y\n"
+#~ "n - ฤ‘แปซng ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y\n"
+#~ "q - thoรกt; ฤ‘แปซng ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn "
+#~ "lแบกi\n"
+#~ "a - ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y vร  tแบฅt cแบฃ cรกc khรบc cรฒn lแบกi sau nร y\n"
+#~ "d - ฤ‘แปซng ฤ‘ฦฐa lรชn bแป‡ phรณng khรบc nร y cลฉng nhฦฐ bแบฅt kแปณ cรกi nร o cรฒn lแบกi\n"
+
+#, c-format
+#~ msgid "could not copy '%s' to '%s'."
+#~ msgstr "khรดng thแปƒ chรฉp โ€œ%sโ€ sang โ€œ%sโ€."
+
+#~ msgid "malformed ident line"
+#~ msgstr "thแปฅt ฤ‘แบงu dรฒng dแป‹ hรฌnh"
+
+#~ msgid "corrupted author without date information"
+#~ msgstr "tรกc giแบฃ sai hแปng khรดng cรณ thรดng tin nร y thรกng"
+
+#, c-format
+#~ msgid "could not parse '%.*s'"
+#~ msgstr "khรดng thแปƒ phรขn tรญch cรบ phรกp โ€œ%.*sโ€"
+
+#, c-format
+#~ msgid "could not checkout %s"
+#~ msgstr "khรดng thแปƒ lแบฅy ra %s"
+
+#, c-format
+#~ msgid "filename in tree entry contains backslash: '%s'"
+#~ msgstr "tรชn tแบญp tin trong mแปฅc tin cรขy cรณ chแปฉa kรฝ tแปฑ gแบกch ngฦฐแปฃc: '%s'"
+
+#, c-format
+#~ msgid "Use -f if you really want to add them.\n"
+#~ msgstr "Sแปญ dแปฅng tรนy chแปn -f nแบฟu bแบกn thแปฑc sแปฑ muแป‘n thรชm chรบng vร o.\n"
+
+#, c-format
+#~ msgid "Maybe you wanted to say 'git add .'?\n"
+#~ msgstr "Cรณ lแบฝ รฝ bแบกn lร  โ€œgit add .โ€ phแบฃi khรดng?\n"
+
+#, c-format
+#~ msgid "packfile is invalid: %s"
+#~ msgstr "tแบญp tin gรณi khรดng hแปฃp lแป‡: %s"
+
+#, c-format
+#~ msgid "unable to open packfile for reuse: %s"
+#~ msgstr "khรดng thแปƒ mแปŸ tแบญp tin gรณi ฤ‘แปƒ dรนng lแบกi: %s"
+
+#~ msgid "unable to seek in reused packfile"
+#~ msgstr "khรดng thแปƒ di chuyแปƒn vแป‹ trรญ ฤ‘แปc trong tแบญp tin gรณi dรนng lแบกi"
+
+#~ msgid "unable to read from reused packfile"
+#~ msgstr "khรดng thแปƒ ฤ‘แปc tแปซ tแบญp tin gรณi dรนng lแบกi"
+
+#~ msgid "no HEAD?"
+#~ msgstr "khรดng HEAD?"
+
+#~ msgid "make committer date match author date"
+#~ msgstr "lร m ngร y thรกng chuyแปƒn giao khแป›p vแป›i ngร y cแปงa tรกc giแบฃ"
+
+#~ msgid "ignore author date and use current date"
+#~ msgstr "bแป qua ngร y tรกc giแบฃ vร  sแปญ dแปฅng ngร y thรกng hiแป‡n tแบกi"
+
+#~ msgid "synonym of --reset-author-date"
+#~ msgstr "ฤ‘แป“ng nghฤฉa vแป›i --reset-author-date"
+
+#~ msgid "ignore changes in whitespace"
+#~ msgstr "lแป ฤ‘i sแปฑ thay ฤ‘แป•i do khoแบฃng trแบฏng gรขy ra"
+
+#~ msgid "preserve empty commits during rebase"
+#~ msgstr "ngฤƒn cแบฅm cรกc lแบงn chuyแปƒn giao trแป‘ng rแป—ng trong suแป‘t quรก trรฌnh cแบฃi tแป•"
+
+#~ msgid "cannot combine --use-bitmap-index with object filtering"
+#~ msgstr "khรดng thแปƒ tแป• hแปฃp --use-bitmap-index vแป›i lแปc ฤ‘แป‘i tฦฐแปฃng"
+
+#, sh-format
+#~ msgid ""
+#~ "The following path is ignored by one of your .gitignore files:\n"
+#~ "$sm_path\n"
+#~ "Use -f if you really want to add it."
+#~ msgstr ""
+#~ "Cรกc ฤ‘ฦฐแปng dแบซn theo sau ฤ‘รขy sแบฝ bแป‹ lแป ฤ‘i bแปŸi mแป™t trong cรกc tแบญp tin ."
+#~ "gitignore cแปงa bแบกn:\n"
+#~ "$sm_path\n"
+#~ "Sแปญ dแปฅng -f nแบฟu bแบกn thแปฑc sแปฑ muแป‘n thรชm nรณ vร o."
+
+#, c-format
+#~ msgid "unable to get tree for %s"
+#~ msgstr "khรดng thแปƒ lแบฅy cรขy cho %s"
+
+#~ msgid "Use an experimental heuristic to improve diffs"
+#~ msgstr "Dรนng mแป™t phแปng ฤ‘oรกn thแปญ nghiแป‡m ฤ‘แปƒ tฤƒng cฦฐแปng cรกc diff"
+
+#~ msgid "git commit-graph [--object-dir <objdir>]"
+#~ msgstr "git commit-graph [--object-dir <objdir>]"
+
+#~ msgid "git commit-graph read [--object-dir <objdir>]"
+#~ msgstr "git commit-graph read [--object-dir <objdir>]"
+
+#, c-format
+#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+#~ msgstr ""
+#~ "khรดng hiแปƒu giรก trแป‹ core.untrackedCache โ€œ%sโ€; dรนng giรก trแป‹ mแบทc ฤ‘แป‹nh โ€œkeepโ€"
+
+#~ msgid "cannot change partial clone promisor remote"
+#~ msgstr "khรดng thแปƒ thay ฤ‘แป•i nhรขn bแบฃn tแปซng phแบงn mรกy chแปง promisor"
+
+#~ msgid "error building trees"
+#~ msgstr "gแบทp lแป—i khi xรขy dแปฑng cรขy"
+
+#, c-format
+#~ msgid "invalid date format '%s' in '%s'"
+#~ msgstr "ฤ‘แป‹nh dแบกng ngร y thรกng khรดng hแปฃp lแป‡ โ€œ%sโ€ trong โ€œ%sโ€"
+
+#~ msgid "writing root commit"
+#~ msgstr "ghi chuyแปƒn giao gแป‘c"
+
+#, c-format
+#~ msgid "staged changes in the following files may be lost: %s"
+#~ msgstr ""
+#~ "cรกc thay ฤ‘แป•i ฤ‘รฃ ฤ‘ฦฐa lรชn bแป‡ phรณng trong cรกc tแบญp tin sau ฤ‘รขy cรณ thแปƒ bแป‹ mแบฅt: "
+#~ "%s"
+
+#~ msgid ""
+#~ "--filter can only be used with the remote configured in extensions."
+#~ "partialClone"
+#~ msgstr ""
+#~ "--filter chแป‰ cรณ thแปƒ ฤ‘ฦฐแปฃc dรนng vแป›i mรกy chแปง ฤ‘ฦฐแปฃc cแบฅu hรฌnh bแบฑng extensions."
+#~ "partialClone"
+
+#~ msgid "verify commit-msg hook"
+#~ msgstr "thแบฉm tra mรณc (hook) commit-msg"
+
+#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr "khรดng thแปƒ kแบฟt hแปฃp โ€œ--rebase-mergesโ€ vแป›i โ€œ--strategy-optionโ€"
+
+#, c-format
+#~ msgid "invalid sparse value '%s'"
+#~ msgstr "giรก trแป‹ sparse khรดng hแปฃp lแป‡ โ€œ%sโ€"
+
 #~ msgid ""
 #~ "Fetch normally indicates which branches had a forced update, but that "
 #~ "check has been disabled."
@@ -23739,9 +24867,6 @@ msgstr "Bแบกn cรณ thแปฑc sแปฑ muแป‘n gแปญi %s? [y|N](cรณ/KHร”NG): "
 #~ msgstr ""
 #~ "khรดng thแปƒ ฤ‘ฦฐแปฃc tฦฐฦกng tรกc mร  khรดng cรณ stdin kแบฟt nแป‘i vแป›i mแป™t thiแบฟt bแป‹ cuแป‘i."
 
-#~ msgid "failed to open '%s'"
-#~ msgstr "gแบทp lแป—i khi mแปŸ โ€œ%sโ€"
-
 #~ msgid "failed to stat %s\n"
 #~ msgstr "gแบทp lแป—i khi lแบฅy thรดng tin thแป‘ng kรช vแป %s\n"
 
@@ -24268,9 +25393,6 @@ msgstr "Bแบกn cรณ thแปฑc sแปฑ muแป‘n gแปญi %s? [y|N](cรณ/KHร”NG): "
 #~ msgstr ""
 #~ "Khรดng thแปƒ thแปฑc hiแป‡n viแป‡c cherry-pick trong khi khi ฤ‘ang cherry-pick khรกc."
 
-#~ msgid "Could not parse line %d."
-#~ msgstr "Khรดng phรขn tรญch ฤ‘ฦฐแปฃc dรฒng %d."
-
 #~ msgid "Could not open %s"
 #~ msgstr "Khรดng thแปƒ mแปŸ %s"
 
@@ -24590,9 +25712,6 @@ msgstr "Bแบกn cรณ thแปฑc sแปฑ muแป‘n gแปญi %s? [y|N](cรณ/KHร”NG): "
 #~ msgid "no such user"
 #~ msgstr "khรดng cรณ ngฦฐแปi dรนng nhฦฐ vแบญy"
 
-#~ msgid "Missing author: %s"
-#~ msgstr "Thiแบฟu tรชn tรกc giแบฃ: %s"
-
 #~ msgid "Testing "
 #~ msgstr "ฤang thแปญ"
 
@@ -24645,9 +25764,6 @@ msgstr "Bแบกn cรณ thแปฑc sแปฑ muแป‘n gแปญi %s? [y|N](cรณ/KHร”NG): "
 #~ msgid "option %s does not accept negative form"
 #~ msgstr "tรนy chแปn %s khรดng chแบฅp nhแบญn dแบกng thแปฉc รขm"
 
-#~ msgid "unable to parse value '%s' for option %s"
-#~ msgstr "khรดng thแปƒ phรขn tรญch giรก trแป‹ โ€œ%sโ€ cho tรนy chแปn %s"
-
 #~ msgid "-b and -B are mutually exclusive"
 #~ msgstr "-b vร  -B loแบกi tแปซ lแบซn nhau."
 
diff --git a/third_party/git/po/zh_CN.po b/third_party/git/po/zh_CN.po
index c6bdb3e3005a..5be52589bb71 100644
--- a/third_party/git/po/zh_CN.po
+++ b/third_party/git/po/zh_CN.po
@@ -139,8 +139,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 20:12+0800\n"
-"PO-Revision-Date: 2019-08-13 21:16+0800\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-11 15:38+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"
@@ -149,37 +149,704 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "ๅ—ฏ๏ผˆ%s๏ผ‰๏ผŸ"
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "ไธ่ƒฝ่ฏปๅ–็ดขๅผ•"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "ไบŒ่ฟ›ๅˆถ"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "ๆ— "
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "ๆฒกๆœ‰ไฟฎๆ”น"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "ๆ›ดๆ–ฐ"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "ไธ่ƒฝๆš‚ๅญ˜ '%s'"
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "ไธ่ƒฝๅ†™ๅ…ฅ็ดขๅผ•"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "ๆ›ดๆ–ฐไบ† %d ไธช่ทฏๅพ„\n"
+msgstr[1] "ๆ›ดๆ–ฐไบ† %d ไธช่ทฏๅพ„\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "่ฏดๆ˜Ž๏ผš%s ็Žฐๅทฒๆˆไธบๆœช่ทŸ่ธช็š„ใ€‚\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "ๅฏน่ทฏๅพ„ '%s' ็š„ make_cache_entry ๆ“ไฝœๅคฑ่ดฅ"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "่ฟ˜ๅŽŸ"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "ไธ่ƒฝ่งฃๆž HEAD^{tree}"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "่ฟ˜ๅŽŸไบ† %d ไธช่ทฏๅพ„\n"
+msgstr[1] "่ฟ˜ๅŽŸไบ† %d ไธช่ทฏๅพ„\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "ๆฒกๆœ‰ๆœช่ทŸ่ธช็š„ๆ–‡ไปถใ€‚\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "ๆทปๅŠ ๆœช่ทŸ่ธช็š„"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "ๅขžๅŠ ไบ† %d ไธช่ทฏๅพ„\n"
+msgstr[1] "ๅขžๅŠ ไบ† %d ไธช่ทฏๅพ„\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ๅฟฝ็•ฅๆœชๅˆๅ…ฅ็š„๏ผš%s"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "ๅชๆœ‰ไบŒ่ฟ›ๅˆถๆ–‡ไปถ่ขซไฟฎๆ”นใ€‚\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "ๆฒกๆœ‰ไฟฎๆ”นใ€‚\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "่กฅไธๆ›ดๆ–ฐ"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "ๆฃ€่ง† diff"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "ๆ˜พ็คบๅซๅ˜ๆ›ด็š„่ทฏๅพ„"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr "ๅฐ†ๅทฅไฝœๅŒบ็Šถๆ€ๆทปๅŠ ๅˆฐๆš‚ๅญ˜ๅŒบไฟฎๆ”น้›†ไธญ"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "ๅฐ†ๆš‚ๅญ˜็š„ไฟฎๆ”น้›†ๆขๅคไธบ HEAD ็‰ˆๆœฌ"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr "ๆŒ‘้€‰ๆ•ฐๆฎๅ—ๅนถๆœ‰้€‰ๆ‹ฉๅœฐๆ›ดๆ–ฐ"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "ๆ˜พ็คบ HEAD ๅ’Œ็ดขๅผ•็š„ๅทฎๅผ‚"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "ๅฐ†ๆœช่ทŸ่ธชๆ–‡ไปถ็š„ๅ†…ๅฎนๆทปๅŠ ๅˆฐๆš‚ๅญ˜ๅŒบไฟฎๆ”น้›†ไธญ"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "ๅธฎๅŠฉ๏ผš"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "้€‰ๆ‹ฉไธ€ไธชๆก็›ฎ"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "้€‰ๆ‹ฉไธ€็ณปๅˆ—ๆก็›ฎ"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "้€‰ๆ‹ฉๅคšไธช่Œƒๅ›ด"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "ๅŸบไบŽๅ”ฏไธ€ๅ‰็ผ€้€‰ๆ‹ฉๆก็›ฎ"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "ๅ้€‰ๆŒ‡ๅฎš็š„ๆก็›ฎ"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "้€‰ๆ‹ฉๆ‰€ๆœ‰ๆก็›ฎ"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "๏ผˆ็ฉบ๏ผ‰็ป“ๆŸ้€‰ๆ‹ฉ"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "้€‰ๆ‹ฉไธ€ไธช็ผ–ๅทๆก็›ฎ"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "๏ผˆ็ฉบ๏ผ‰ไธ้€‰ๆ‹ฉไปปไฝ•ๅ†…ๅฎน"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** ๅ‘ฝไปค ***"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "่ฏท้€‰ๆ‹ฉ"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "็ผ“ๅญ˜"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "ๆœช็ผ“ๅญ˜"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "่ทฏๅพ„"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "ไธ่ƒฝๅˆทๆ–ฐ็ดขๅผ•"
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "ๅ†่งใ€‚\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "ๆš‚ๅญ˜ๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "ๆš‚ๅญ˜ๅˆ ้™คๅŠจไฝœ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "ๆš‚ๅญ˜่ฏฅๅ— [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๆญฃ็กฎๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบๆš‚ๅญ˜ใ€‚"
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๆš‚ๅญ˜่ฏฅๅ—\n"
+"n - ไธ่ฆๆš‚ๅญ˜่ฏฅๅ—\n"
+"q - ้€€ๅ‡บใ€‚ไธๆš‚ๅญ˜่ฏฅๅ—ๅŠๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"a - ๆš‚ๅญ˜่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"d - ไธๆš‚ๅญ˜่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "่ดฎ่—ๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "่ดฎ่—ๅˆ ้™คๅŠจไฝœ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "่ดฎ่—่ฏฅๅ— [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๆญฃ็กฎๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบ่ดฎ่—ใ€‚"
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ่ดฎ่—่ฏฅๅ—\n"
+"n - ไธ่ฆ่ดฎ่—่ฏฅๅ—\n"
+"q - ้€€ๅ‡บใ€‚ไธ่ดฎ่—่ฏฅๅ—ๅŠๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"a - ่ดฎ่—่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"d - ไธ่ดฎ่—่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "ๅ–ๆถˆๆš‚ๅญ˜ๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "ๅ–ๆถˆๆš‚ๅญ˜ๅˆ ้™คๅŠจไฝœ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "ๅ–ๆถˆๆš‚ๅญ˜่ฏฅๅ— [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๆญฃ็กฎๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบๆœชๆš‚ๅญ˜ใ€‚"
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅ–ๆถˆๆš‚ๅญ˜่ฏฅๅ—\n"
+"n - ไธ่ฆๅ–ๆถˆๆš‚ๅญ˜่ฏฅๅ—\n"
+"q - ้€€ๅ‡บใ€‚ไธ่ฆๅ–ๆถˆๆš‚ๅญ˜่ฏฅๅ—ๅŠๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"a - ๅ–ๆถˆๆš‚ๅญ˜่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"d - ไธ่ฆๅ–ๆถˆๆš‚ๅญ˜่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ†ๆจกๅผๅ˜ๆ›ดๅบ”็”จๅˆฐ็ดขๅผ• [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ†ๅˆ ้™คๆ“ไฝœๅบ”็”จๅˆฐ็ดขๅผ• [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ†่ฏฅๅ—ๅบ”็”จๅˆฐ็ดขๅผ• [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๆญฃ็กฎๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบๅบ”็”จใ€‚"
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจ็ดขๅผ•ไธญๅบ”็”จ่ฏฅๅ—\n"
+"n - ไธ่ฆๅœจ็ดขๅผ•ไธญๅบ”็”จ่ฏฅๅ—\n"
+"q - ้€€ๅ‡บใ€‚ไธ่ฆๅบ”็”จ่ฏฅๅ—ๅŠๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"a - ๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"d - ไธ่ฆๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "ไปŽๅทฅไฝœๅŒบไธญไธขๅผƒๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "ไปŽๅทฅไฝœๅŒบไธญไธขๅผƒๅˆ ้™คๅŠจไฝœ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "ไปŽๅทฅไฝœๅŒบไธญไธขๅผƒ่ฏฅๅ— [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๆญฃ็กฎๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบไธขๅผƒใ€‚"
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจๅทฅไฝœๅŒบไธญไธขๅผƒ่ฏฅๅ—\n"
+"n - ไธ่ฆๅœจๅทฅไฝœๅŒบไธญไธขๅผƒ่ฏฅๅ—\n"
+"q - ้€€ๅ‡บใ€‚ไธ่ฆไธขๅผƒ่ฏฅๅ—ๅŠๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"a - ไธขๅผƒ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"d - ไธ่ฆไธขๅผƒ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ไปŽ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญไธขๅผƒๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ไปŽ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญไธขๅผƒๅˆ ้™ค [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ไปŽ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญไธขๅผƒ่ฏฅๅ— [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญไธขๅผƒ่ฏฅๅ—\n"
+"n - ไธ่ฆๅœจ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญไธขๅผƒ่ฏฅๅ—\n"
+"q - ้€€ๅ‡บใ€‚ไธ่ฆไธขๅผƒ่ฏฅๅ—ๅŠๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"a - ไธขๅผƒ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"d - ไธ่ฆไธขๅผƒ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ†ๆจกๅผๅ˜ๆ›ดๅบ”็”จๅˆฐ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ†ๅˆ ้™คๆ“ไฝœๅบ”็”จๅˆฐ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ†่ฏฅๅ—ๅบ”็”จๅˆฐ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญๅบ”็”จ่ฏฅๅ—\n"
+"n - ไธ่ฆๅœจ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญๅบ”็”จ่ฏฅๅ—\n"
+"q - ้€€ๅ‡บใ€‚ไธ่ฆๅบ”็”จ่ฏฅๅ—ๅŠๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"a - ๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"d - ไธ่ฆๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจๅทฅไฝœๅŒบไธญๅบ”็”จ่ฏฅๅ—\n"
+"n - ไธ่ฆๅœจๅทฅไฝœๅŒบไธญๅบ”็”จ่ฏฅๅ—\n"
+"q - ้€€ๅ‡บใ€‚ไธ่ฆๅบ”็”จ่ฏฅๅ—ๅŠๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"a - ๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+"d - ไธ่ฆๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "ๆ— ๆณ•่งฃๆžๆ•ฐๆฎๅ—ๅคดไฟกๆฏ '%.*s'"
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "ๆ— ๆณ•่งฃๆžๅฝฉ่‰ฒๆ•ฐๆฎๅ—ๅคดไฟกๆฏ '%.*s'"
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "ไธ่ƒฝ่งฃๆžๅทฎๅผ‚ไฟกๆฏ"
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "ไธ่ƒฝ่งฃๆžๅฝฉ่‰ฒๅทฎๅผ‚ไฟกๆฏ"
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "่ฟ่กŒ '%s' ๅคฑ่ดฅ"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "interactive.diffFilter ็š„่พ“ๅ‡บไธๅŒน้…"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr "ๆ‚จ็š„่ฟ‡ๆปคๅ™จๅฟ…้กปๅœจๅ…ถ่พ“ๅ…ฅๅ’Œ่พ“ๅ‡บ็š„่กŒไน‹้—ดไฟๆŒไธ€ไธ€ๅฏนๅบ”็š„ๅ…ณ็ณปใ€‚"
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"้ข„ๆœŸไธŠไธ‹ๆ–‡่กŒ #%d ไบŽ\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"ๅ—ไธ้‡ๅ ๏ผš\n"
+"%.*s\n"
+"\tไธๆ˜ฏ็ป“ๅฐพไบŽ๏ผš\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "ๆ‰‹ๅŠจๅ—็ผ–่พ‘ๆจกๅผ -- ๆŸฅ็œ‹ๅบ•้ƒจ็š„ๅฟซ้€ŸๆŒ‡ๅ—ใ€‚\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"่ฆๅˆ ้™ค '%c' ๅผ€ๅง‹็š„่กŒ๏ผŒไฝฟๅ…ถๆˆไธบ ' ' ๅผ€ๅง‹็š„่กŒ๏ผˆไธŠไธ‹ๆ–‡๏ผ‰ใ€‚\n"
+"่ฆๅˆ ้™ค '%c' ๅผ€ๅง‹็š„่กŒ๏ผŒๅˆ ้™คๅฎƒไปฌใ€‚\n"
+"ไปฅ %c ๅผ€ๅง‹็š„่กŒๅฐ†่ขซๅˆ ้™คใ€‚\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"ๅฆ‚ๆžœไธ่ƒฝๅนฒๅ‡€ๅœฐๅบ”็”จ๏ผŒๆ‚จๅฐ†ๆœ‰ๆœบไผš้‡ๆ–ฐ็ผ–่พ‘ใ€‚ๅฆ‚ๆžœ่ฏฅๅ—็š„ๅ…จ้ƒจๅ†…ๅฎนๅˆ ้™ค๏ผŒๅˆ™\n"
+"ๆญคๆฌก็ผ–่พ‘่ขซ็ปˆๆญข๏ผŒ่ฏฅๅ—ไธไผš่ขซไฟฎๆ”นใ€‚\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "ๆ— ๆณ•่งฃๆžๆ•ฐๆฎๅ—ๅคดไฟกๆฏ"
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' ๅคฑ่ดฅ"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr "ๆ‚จ็š„็ผ–่พ‘ๅ—ไธ่ƒฝ่ขซๅบ”็”จใ€‚้‡ๆ–ฐ็ผ–่พ‘๏ผˆ้€‰ๆ‹ฉ \"no\" ไธขๅผƒ๏ผ๏ผ‰ [y/n]? "
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "้€‰ไธญ็š„ๅ—ไธ่ƒฝๅบ”็”จๅˆฐ็ดขๅผ•๏ผ"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "ๆ— ่ฎบๅฆ‚ไฝ•้ƒฝ่ฆๅบ”็”จๅˆฐๅทฅไฝœๅŒบไนˆ๏ผŸ"
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "ๆœชๅบ”็”จใ€‚\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - ็ปดๆŒ่ฏฅๅ—ๆœชๅ†ณ็Šถๆ€๏ผŒๆŸฅ็œ‹ไธ‹ไธ€ไธชๆœชๅ†ณๅ—\n"
+"J - ็ปดๆŒ่ฏฅๅ—ๆœชๅ†ณ็Šถๆ€๏ผŒๆŸฅ็œ‹ไธ‹ไธ€ไธชๅ—\n"
+"k - ็ปดๆŒ่ฏฅๅ—ๆœชๅ†ณ็Šถๆ€๏ผŒๆŸฅ็œ‹ไธŠไธ€ไธชๆœชๅ†ณๅ—\n"
+"K - ็ปดๆŒ่ฏฅๅ—ๆœชๅ†ณ็Šถๆ€๏ผŒๆŸฅ็œ‹ไธŠไธ€ไธชๅ—\n"
+"g - ้€‰ๆ‹ฉ่ทณ่ฝฌๅˆฐไธ€ไธชๅ—\n"
+"/ - ๆŸฅๆ‰พๅ’Œ็ป™ๅฎšๆญฃๅˆ™่กจ่พพๅผๅŒน้…็š„ๅ—\n"
+"s - ๆ‹†ๅˆ†ๅฝ“ๅ‰ๅ—ไธบๆ›ดๅฐ็š„ๅ—\n"
+"e - ๆ‰‹ๅŠจ็ผ–่พ‘ๅฝ“ๅ‰ๅ—\n"
+"? - ๆ˜พ็คบๅธฎๅŠฉ\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "ๆฒกๆœ‰ๅ‰ไธ€ไธชๅ—"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "ๆฒกๆœ‰ไธ‹ไธ€ไธชๅ—"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "ๆฒกๆœ‰ๅ…ถๅฎƒๅฏไพ›่ทณ่ฝฌ็š„ๅ—"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "่ทณ่ฝฌๅˆฐๅ“ชไธชๅ—๏ผˆ<ๅ›ž่ฝฆ> ๆŸฅ็œ‹ๆ›ดๅคš๏ผ‰๏ผŸ "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "่ทณ่ฝฌๅˆฐๅ“ชไธชๅ—๏ผŸ"
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "ๆ— ๆ•ˆๆ•ฐๅญ—๏ผš'%s'"
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "ๅฏนไธ่ตท๏ผŒๅชๆœ‰ %d ไธชๅฏ็”จๅ—ใ€‚"
+msgstr[1] "ๅฏนไธ่ตท๏ผŒๅชๆœ‰ %d ไธชๅฏ็”จๅ—ใ€‚"
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "ๆฒกๆœ‰ๅ…ถๅฎƒๅฏไพ›ๆŸฅๆ‰พ็š„ๅ—"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "ไฝฟ็”จๆญฃๅˆ™่กจ่พพๅผๆœ็ดข๏ผŸ"
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "้”™่ฏฏ็š„ๆญฃๅˆ™่กจ่พพๅผ %s๏ผš%s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "ๆฒกๆœ‰ๅ’Œ็ป™ๅฎšๆจกๅผ็›ธๅŒน้…็š„ๅ—"
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "ๅฏนไธ่ตท๏ผŒไธ่ƒฝๆ‹†ๅˆ†่ฟ™ไธชๅ—"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "ๆ‹†ๅˆ†ไธบ %d ๅ—ใ€‚"
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "ๅฏนไธ่ตท๏ผŒไธ่ƒฝ็ผ–่พ‘่ฟ™ไธชๅ—"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "'git apply' ๅคฑ่ดฅ"
+
+#: advice.c:115
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sๆ็คบ๏ผš%.*s%s\n"
 
-#: advice.c:162
+#: advice.c:168
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "ๆ— ๆณ•ๆ‹ฃ้€‰๏ผŒๅ› ไธบๆ‚จๆœ‰ๆœชๅˆๅนถ็š„ๆ–‡ไปถใ€‚"
 
-#: advice.c:164
+#: advice.c:170
 msgid "Committing is not possible because you have unmerged files."
 msgstr "ๆ— ๆณ•ๆไบค๏ผŒๅ› ไธบๆ‚จๆœ‰ๆœชๅˆๅนถ็š„ๆ–‡ไปถใ€‚"
 
-#: advice.c:166
+#: advice.c:172
 msgid "Merging is not possible because you have unmerged files."
 msgstr "ๆ— ๆณ•ๅˆๅนถ๏ผŒๅ› ไธบๆ‚จๆœ‰ๆœชๅˆๅนถ็š„ๆ–‡ไปถใ€‚"
 
-#: advice.c:168
+#: advice.c:174
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "ๆ— ๆณ•ๆ‹‰ๅ–๏ผŒๅ› ไธบๆ‚จๆœ‰ๆœชๅˆๅนถ็š„ๆ–‡ไปถใ€‚"
 
-#: advice.c:170
+#: advice.c:176
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "ๆ— ๆณ•ๅ›ž้€€๏ผŒๅ› ไธบๆ‚จๆœ‰ๆœชๅˆๅนถ็š„ๆ–‡ไปถใ€‚"
 
-#: advice.c:172
+#: advice.c:178
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "ๆ— ๆณ• %s๏ผŒๅ› ไธบๆ‚จๆœ‰ๆœชๅˆๅนถ็š„ๆ–‡ไปถใ€‚"
 
-#: advice.c:180
+#: advice.c:186
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -187,23 +854,23 @@ msgstr ""
 "่ฏทๅœจๅทฅไฝœๅŒบๆ”นๆญฃๆ–‡ไปถ๏ผŒ็„ถๅŽ้…Œๆƒ…ไฝฟ็”จ 'git add/rm <ๆ–‡ไปถ>' ๅ‘ฝไปคๆ ‡่ฎฐ\n"
 "่งฃๅ†ณๆ–นๆกˆๅนถๆไบคใ€‚"
 
-#: advice.c:188
+#: advice.c:194
 msgid "Exiting because of an unresolved conflict."
 msgstr "ๅ› ไธบๅญ˜ๅœจๆœช่งฃๅ†ณ็š„ๅ†ฒ็ช่€Œ้€€ๅ‡บใ€‚"
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:199 builtin/merge.c:1335
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "ๆ‚จๅฐšๆœช็ป“ๆŸๆ‚จ็š„ๅˆๅนถ๏ผˆๅญ˜ๅœจ MERGE_HEAD๏ผ‰ใ€‚"
 
-#: advice.c:195
+#: advice.c:201
 msgid "Please, commit your changes before merging."
 msgstr "่ฏทๅœจๅˆๅนถๅ‰ๅ…ˆๆไบคๆ‚จ็š„ไฟฎๆ”นใ€‚"
 
-#: advice.c:196
+#: advice.c:202
 msgid "Exiting because of unfinished merge."
 msgstr "ๅ› ไธบๅญ˜ๅœจๆœชๅฎŒๆˆ็š„ๅˆๅนถ่€Œ้€€ๅ‡บใ€‚"
 
-#: advice.c:202
+#: advice.c:208
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -325,17 +992,7 @@ msgstr "็ฌฌ %d ่กŒๅŒ…ๅซๆ— ๆ•ˆๆ–‡ไปถๆจกๅผ๏ผš%s"
 msgid "inconsistent header lines %d and %d"
 msgstr "ไธไธ€่‡ด็š„ๆ–‡ไปถๅคด๏ผŒ%d ่กŒๅ’Œ %d ่กŒ"
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount๏ผšๆ„ๅค–็š„่กŒ๏ผš%.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "็ฌฌ %d ่กŒ็š„่กฅไธ็‰‡ๆฎตๆฒกๆœ‰ๅคดไฟกๆฏ๏ผš%.*s"
-
-#: apply.c:1551
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -346,82 +1003,92 @@ msgid_plural ""
 msgstr[0] "ๅฝ“็งป้™ค %d ไธชๅ‰ๅฏผ่ทฏๅพ„ๅŽ git diff ๅคด็ผบไนๆ–‡ไปถๅไฟกๆฏ๏ผˆ็ฌฌ %d ่กŒ๏ผ‰"
 msgstr[1] "ๅฝ“็งป้™ค %d ไธชๅ‰ๅฏผ่ทฏๅพ„ๅŽ git diff ๅคด็ผบไนๆ–‡ไปถๅไฟกๆฏ๏ผˆ็ฌฌ %d ่กŒ๏ผ‰"
 
-#: apply.c:1564
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git diff ็š„ๅคดไฟกๆฏไธญ็ผบไนๆ–‡ไปถๅไฟกๆฏ๏ผˆ็ฌฌ %d ่กŒ๏ผ‰"
 
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount๏ผšๆ„ๅค–็š„่กŒ๏ผš%.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "็ฌฌ %d ่กŒ็š„่กฅไธ็‰‡ๆฎตๆฒกๆœ‰ๅคดไฟกๆฏ๏ผš%.*s"
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "ๆ–ฐๆ–‡ไปถไพ่ต–ๆ—งๅ†…ๅฎน"
 
-#: apply.c:1754
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "ๅˆ ้™ค็š„ๆ–‡ไปถไปๆœ‰ๅ†…ๅฎน"
 
-#: apply.c:1788
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "่กฅไธๅœจ็ฌฌ %d ่กŒๆŸๅ"
 
-#: apply.c:1825
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "ๆ–ฐๆ–‡ไปถ %s ไพ่ต–ๆ—งๅ†…ๅฎน"
 
-#: apply.c:1827
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "ๅˆ ้™ค็š„ๆ–‡ไปถ %s ไปๆœ‰ๅ†…ๅฎน"
 
-#: apply.c:1830
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** ่ญฆๅ‘Š๏ผšๆ–‡ไปถ %s ๆˆไธบ็ฉบๆ–‡ไปถไฝ†ๅนถๆœชๅˆ ้™ค"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "ไบŒ่ฟ›ๅˆถ่กฅไธๅœจ็ฌฌ %d ่กŒๆŸๅ๏ผš%.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ไบŒ่ฟ›ๅˆถ่กฅไธไฝไบŽ็ฌฌ %d ่กŒ"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "่กฅไธๆ–‡ไปถ็š„็ฌฌ %d ่กŒๅชๆœ‰ๅžƒๅœพๆ•ฐๆฎ"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "ๆ— ๆณ•่ฏปๅ–็ฌฆๅท้“พๆŽฅ %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€ๆˆ–่ฏปๅ– %s"
 
-#: apply.c:2925
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "ๆ— ๆ•ˆ็š„่กŒ้ฆ–ๅญ—็ฌฆ๏ผš'%c'"
 
-#: apply.c:3046
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "ๅ— #%d ๆˆๅŠŸๅบ”็”จไบŽ %d๏ผˆๅ็งป %d ่กŒ๏ผ‰"
 msgstr[1] "ๅ— #%d ๆˆๅŠŸๅบ”็”จไบŽ %d๏ผˆๅ็งป %d ่กŒ๏ผ‰"
 
-#: apply.c:3058
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "ไธŠไธ‹ๆ–‡ๅ‡ๅฐ‘ๅˆฐ๏ผˆ%ld/%ld๏ผ‰ไปฅๅœจ็ฌฌ %d ่กŒๅบ”็”จ่กฅไธ็‰‡ๆฎต"
 
-#: apply.c:3064
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -430,451 +1097,437 @@ msgstr ""
 "ๅฝ“ๆŸฅ่ฏข๏ผš\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "็ผบๅคฑ '%s' ็š„ไบŒ่ฟ›ๅˆถ่กฅไธๆ•ฐๆฎ"
 
-#: apply.c:3094
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "ไธ่ƒฝๅๅ‘ๅบ”็”จไธ€ไธช็ผบๅฐ‘ๅˆฐ '%s' ็š„ๅๅ‘ๆ•ฐๆฎๅ—็š„ไบŒ่ฟ›ๅˆถ่กฅไธ"
 
-#: apply.c:3141
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "ไธ่ƒฝๅœจ '%s' ไธŠๅบ”็”จๆฒกๆœ‰ๅฎŒๆ•ด็ดขๅผ•่กŒ็š„ไบŒ่ฟ›ๅˆถ่กฅไธ"
 
-#: apply.c:3151
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "่กฅไธๅบ”็”จๅˆฐ '%s'๏ผˆ%s๏ผ‰๏ผŒไฝ†ๆ˜ฏๅ’Œๅฝ“ๅ‰ๅ†…ๅฎนไธๅŒน้…ใ€‚"
 
-#: apply.c:3159
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "่กฅไธๅบ”็”จๅˆฐ็ฉบๆ–‡ไปถ '%s'๏ผŒไฝ†ๅ…ถๅนถ้ž็ฉบๆ–‡ไปถ"
 
-#: apply.c:3177
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "ๆ— ๆณ•่ฏปๅ– '%2$s' ๅฟ…้œ€็š„็›ฎๆ ‡ๆ–‡ไปถ %1$s"
 
-#: apply.c:3190
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "ไบŒ่ฟ›ๅˆถ่กฅไธๆœชๅบ”็”จๅˆฐ '%s'"
 
-#: apply.c:3196
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "ๅˆฐ '%s' ็š„ไบŒ่ฟ›ๅˆถ่กฅไธไบง็”Ÿไบ†ไธๆญฃ็กฎ็š„็ป“ๆžœ๏ผˆๅบ”ไธบ %s๏ผŒๅดไธบ %s๏ผ‰"
 
-#: apply.c:3217
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "ๆ‰“่กฅไธๅคฑ่ดฅ๏ผš%s:%ld"
 
-#: apply.c:3340
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "ไธ่ƒฝๆฃ€ๅ‡บ %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
 #, c-format
 msgid "failed to read %s"
 msgstr "ๆ— ๆณ•่ฏปๅ– %s"
 
-#: apply.c:3400
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "่ฏปๅ–ไฝไบŽ็ฌฆๅท้“พๆŽฅไธญ็š„ '%s'"
 
-#: apply.c:3429 apply.c:3672
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "่ทฏๅพ„ %s ๅทฒ็ป่ขซ้‡ๅ‘ฝๅ/ๅˆ ้™ค"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s๏ผšไธๅญ˜ๅœจไบŽ็ดขๅผ•ไธญ"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s๏ผšๅ’Œ็ดขๅผ•ไธๅŒน้…"
 
-#: apply.c:3559
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr "ไป“ๅบ“็ผบไนๅฟ…่ฆ็š„ๆ•ฐๆฎๅฏน่ฑกไปฅ่ฟ›่กŒไธ‰ๆ–นๅˆๅนถใ€‚"
 
-#: apply.c:3562
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "ๅ›ž่ฝๅˆฐไธ‰ๆ–นๅˆๅนถ...\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "ๆ— ๆณ•่ฏปๅ– '%s' ็š„ๅฝ“ๅ‰ๅ†…ๅฎน"
 
-#: apply.c:3594
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "ๆ— ๆณ•ๅ›ž่ฝๅˆฐไธ‰ๆ–นๅˆๅนถ...\n"
 
-#: apply.c:3608
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "ๅบ”็”จ่กฅไธๅˆฐ '%s' ๅญ˜ๅœจๅ†ฒ็ชใ€‚\n"
 
-#: apply.c:3613
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "ๆˆๅŠŸๅบ”็”จ่กฅไธๅˆฐ '%s'ใ€‚\n"
 
-#: apply.c:3639
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "็งป้™ค่กฅไธไป็•™ไธ‹ไบ†ๆ–‡ไปถๅ†…ๅฎน"
 
-#: apply.c:3712
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s๏ผš้”™่ฏฏ็ฑปๅž‹"
 
-#: apply.c:3714
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ็š„็ฑปๅž‹ๆ˜ฏ %o๏ผŒๅบ”ไธบ %o"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ๆ— ๆ•ˆ่ทฏๅพ„ '%s'"
 
-#: apply.c:3923
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s๏ผšๅทฒ็ปๅญ˜ๅœจไบŽ็ดขๅผ•ไธญ"
 
-#: apply.c:3926
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s๏ผšๅทฒ็ปๅญ˜ๅœจไบŽๅทฅไฝœๅŒบไธญ"
 
-#: apply.c:3946
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s ็š„ๆ–ฐๆจกๅผ๏ผˆ%1$o๏ผ‰ๅ’Œๆ—งๆจกๅผ๏ผˆ%3$o๏ผ‰ไธๅŒน้…"
 
-#: apply.c:3951
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "%2$s ็š„ๆ–ฐๆจกๅผ๏ผˆ%1$o๏ผ‰ๅ’Œ %4$s ็š„ๆ—งๆจกๅผ๏ผˆ%3$o๏ผ‰ไธๅŒน้…"
 
-#: apply.c:3971
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "ๅ—ๅฝฑๅ“็š„ๆ–‡ไปถ '%s' ไฝไบŽ็ฌฆๅท้“พๆŽฅไธญ"
 
-#: apply.c:3975
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s๏ผš่กฅไธๆœชๅบ”็”จ"
 
-#: apply.c:3990
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅ่กฅไธ %s..."
 
-#: apply.c:4082
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "ๅญๆจก็ป„ %s ็š„ sha1 ไฟกๆฏ็ผบๅคฑๆˆ–ๆ— ๆ•ˆ"
 
-#: apply.c:4089
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s ็š„ๆจกๅผๅ˜ๆ›ด๏ผŒไฝ†ๅฎƒไธๅœจๅฝ“ๅ‰ HEAD ไธญ"
 
-#: apply.c:4092
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 ไฟกๆฏ็ผบๅคฑๆˆ–ๆ— ๆ•ˆ๏ผˆ%s๏ผ‰ใ€‚"
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "ๅฏน่ทฏๅพ„ '%s' ็š„ make_cache_entry ๆ“ไฝœๅคฑ่ดฅ"
-
-#: apply.c:4101
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "ไธ่ƒฝๅœจไธดๆ—ถ็ดขๅผ•ไธญๆทปๅŠ  %s"
 
-#: apply.c:4111
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "ไธ่ƒฝๆŠŠไธดๆ—ถ็ดขๅผ•ๅ†™ๅ…ฅๅˆฐ %s"
 
-#: apply.c:4249
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "ไธ่ƒฝไปŽ็ดขๅผ•ไธญ็งป้™ค %s"
 
-#: apply.c:4283
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "ๅญๆจก็ป„ %s ๆŸๅ็š„่กฅไธ"
 
-#: apply.c:4289
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "ไธ่ƒฝๅฏนๆ–ฐๅปบๆ–‡ไปถ '%s' ่ฐƒ็”จ stat"
 
-#: apply.c:4297
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "ไธ่ƒฝไธบๆ–ฐๅปบๆ–‡ไปถ %s ๅˆ›ๅปบๅŽ็ซฏๅญ˜ๅ‚จ"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "ๆ— ๆณ•ไธบ %s ๆทปๅŠ ็ผ“ๅญ˜ๆก็›ฎ"
 
-#: apply.c:4346
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "ๅ†™ๅ…ฅ '%s' ๅคฑ่ดฅ"
 
-#: apply.c:4350
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr "ๅ…ณ้—ญๆ–‡ไปถ '%s'"
 
-#: apply.c:4420
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "ไธ่ƒฝๅ†™ๆ–‡ไปถ '%s' ๆƒ้™ %o"
 
-#: apply.c:4518
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "ๆˆๅŠŸๅบ”็”จ่กฅไธ %sใ€‚"
 
-#: apply.c:4526
+#: apply.c:4539
 msgid "internal error"
 msgstr "ๅ†…้ƒจ้”™่ฏฏ"
 
-#: apply.c:4529
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "ๅบ”็”จ %%s ไธช่กฅไธ๏ผŒๅ…ถไธญ %d ไธช่ขซๆ‹’็ป..."
 msgstr[1] "ๅบ”็”จ %%s ไธช่กฅไธ๏ผŒๅ…ถไธญ %d ไธช่ขซๆ‹’็ป..."
 
-#: apply.c:4540
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "ๆˆช็Ÿญ .rej ๆ–‡ไปถๅไธบ %.*s.rej"
 
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
 #, c-format
 msgid "cannot open %s"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€ %s"
 
-#: apply.c:4562
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "็ฌฌ #%d ไธช็‰‡ๆฎตๆˆๅŠŸๅบ”็”จใ€‚"
 
-#: apply.c:4566
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "ๆ‹’็ป็ฌฌ #%d ไธช็‰‡ๆฎตใ€‚"
 
-#: apply.c:4676
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "็•ฅ่ฟ‡่กฅไธ '%s'ใ€‚"
 
-#: apply.c:4684
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„่พ“ๅ…ฅ"
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr "ๆ— ๆณ•่ฏปๅ–็ดขๅผ•ๆ–‡ไปถ"
 
-#: apply.c:4859
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€่กฅไธ '%s'๏ผš%s"
 
-#: apply.c:4886
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "ๆŠ‘ๅˆถไธ‹ไปๆœ‰ %d ไธช็ฉบ็™ฝๅญ—็ฌฆ่ฏฏ็”จ"
 msgstr[1] "ๆŠ‘ๅˆถไธ‹ไปๆœ‰ %d ไธช็ฉบ็™ฝๅญ—็ฌฆ่ฏฏ็”จ"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d ่กŒๆ–ฐๅขžไบ†็ฉบ็™ฝๅญ—็ฌฆ่ฏฏ็”จใ€‚"
 msgstr[1] "%d ่กŒๆ–ฐๅขžไบ†็ฉบ็™ฝๅญ—็ฌฆ่ฏฏ็”จใ€‚"
 
-#: apply.c:4900
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "ไฟฎๅค็ฉบ็™ฝ้”™่ฏฏๅŽ๏ผŒๅบ”็”จไบ† %d ่กŒใ€‚"
 msgstr[1] "ไฟฎๅค็ฉบ็™ฝ้”™่ฏฏๅŽ๏ผŒๅบ”็”จไบ† %d ่กŒใ€‚"
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "ๆ— ๆณ•ๅ†™ๅ…ฅๆ–ฐ็ดขๅผ•ๆ–‡ไปถ"
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "่ทฏๅพ„"
-
-#: apply.c:4944
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr "ไธ่ฆๅบ”็”จไธŽ็ป™ๅ‡บ่ทฏๅพ„ๅ‘ๅŒน้…็š„ๅ˜ๆ›ด"
 
-#: apply.c:4947
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr "ๅบ”็”จไธŽ็ป™ๅ‡บ่ทฏๅพ„ๅ‘ๅŒน้…็š„ๅ˜ๆ›ด"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4973 builtin/am.c:2260
 msgid "num"
 msgstr "ๆ•ฐๅญ—"
 
-#: apply.c:4950
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "ไปŽไผ ็ปŸ็š„ diff ่ทฏๅพ„ไธญ็งป้™คๆŒ‡ๅฎšๆ•ฐ้‡็š„ๅ‰ๅฏผๆ–œ็บฟ"
 
-#: apply.c:4953
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr "ๅฟฝ็•ฅ่กฅไธไธญ็š„ๆทปๅŠ ็š„ๆ–‡ไปถ"
 
-#: apply.c:4955
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "ไธๅบ”็”จ่กฅไธ๏ผŒ่€Œๆ˜ฏๆ˜พ็คบ่พ“ๅ…ฅ็š„ๅทฎๅผ‚็ปŸ่ฎก๏ผˆdiffstat๏ผ‰"
 
-#: apply.c:4959
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "ไปฅๅ่ฟ›ๅˆถๆ•ฐๆ˜พ็คบๆทปๅŠ ๅ’Œๅˆ ้™ค็š„่กŒๆ•ฐ"
 
-#: apply.c:4961
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "ไธๅบ”็”จ่กฅไธ๏ผŒ่€Œๆ˜ฏๆ˜พ็คบ่พ“ๅ…ฅ็š„ๆฆ‚่ฆ"
 
-#: apply.c:4963
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "ไธๅบ”็”จ่กฅไธ๏ผŒ่€Œๆ˜ฏๆŸฅ็œ‹่กฅไธๆ˜ฏๅฆๅฏๅบ”็”จ"
 
-#: apply.c:4965
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr "็กฎ่ฎค่กฅไธๅฏไปฅๅบ”็”จๅˆฐๅฝ“ๅ‰็ดขๅผ•"
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "ไฝฟ็”จๅ‘ฝไปค `git add --intent-to-add` ๆ ‡่ฎฐๆ–ฐๅขžๆ–‡ไปถ"
 
-#: apply.c:4969
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr "ๅบ”็”จ่กฅไธ่€Œไธไฟฎๆ”นๅทฅไฝœๅŒบ"
 
-#: apply.c:4971
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr "ๆŽฅๅ—ไฟฎๆ”นๅทฅไฝœๅŒบไน‹ๅค–ๆ–‡ไปถ็š„่กฅไธ"
 
-#: apply.c:4974
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "่ฟ˜ๅบ”็”จๆญค่กฅไธ๏ผˆไธŽ --stat/--summary/--check ้€‰้กนๅŒๆ—ถไฝฟ็”จ๏ผ‰"
 
-#: apply.c:4976
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "ๅฆ‚ๆžœไธ€ไธช่กฅไธไธ่ƒฝๅบ”็”จๅˆ™ๅฐ่ฏ•ไธ‰ๆ–นๅˆๅนถ"
 
-#: apply.c:4978
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr "ๅˆ›ๅปบไธ€ไธชไธดๆ—ถ็ดขๅผ•ๅŸบไบŽๅตŒๅ…ฅ็š„็ดขๅผ•ไฟกๆฏ"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
 msgid "paths are separated with NUL character"
 msgstr "่ทฏๅพ„ไปฅ NUL ๅญ—็ฌฆๅˆ†้š”"
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
 msgstr "็กฎไฟ่‡ณๅฐ‘ๅŒน้… <n> ่กŒไธŠไธ‹ๆ–‡"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
 msgid "action"
 msgstr "ๅŠจไฝœ"
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "ๆฃ€ๆŸฅๆ–ฐๅขžๅ’Œไฟฎๆ”น็š„่กŒไธญ้—ด็š„็ฉบ็™ฝๅญ—็ฌฆๆปฅ็”จ"
 
-#: apply.c:4988 apply.c:4991
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
 msgstr "ๆŸฅๆ‰พไธŠไธ‹ๆ–‡ๆ—ถๅฟฝ็•ฅ็ฉบ็™ฝๅญ—็ฌฆ็š„ๅ˜ๆ›ด"
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr "ๅๅ‘ๅบ”็”จ่กฅไธ"
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "don't expect at least one line of context"
 msgstr "ๆ— ้œ€่‡ณๅฐ‘ไธ€่กŒไธŠไธ‹ๆ–‡"
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "ๅฐ†ๆ‹’็ป็š„่กฅไธ็‰‡ๆฎตไฟๅญ˜ๅœจๅฏนๅบ”็š„ *.rej ๆ–‡ไปถไธญ"
 
-#: apply.c:5000
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr "ๅ…่ฎธ้‡ๅ ็š„่กฅไธ็‰‡ๆฎต"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "ๅ†—้•ฟ่พ“ๅ‡บ"
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "ๅ…่ฎธไธๆญฃ็กฎ็š„ๆ–‡ไปถๆœซๅฐพๆข่กŒ็ฌฆ"
 
-#: apply.c:5006
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr "ไธไฟกไปป่กฅไธ็‰‡ๆฎต็š„ๅคดไฟกๆฏไธญ็š„่กŒๅท"
 
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5032 builtin/am.c:2248
 msgid "root"
 msgstr "ๆ น็›ฎๅฝ•"
 
-#: apply.c:5009
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr "ไธบๆ‰€ๆœ‰ๆ–‡ไปถๅๅ‰ๆทปๅŠ  <ๆ น็›ฎๅฝ•>"
 
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<้€‰้กน>] <ๆ ‘ๆˆ–ๆไบค> [<่ทฏๅพ„>...]"
+msgstr "git archive [<้€‰้กน>] <ๆ ‘ๅฏน่ฑก> [<่ทฏๅพ„>...]"
 
 #: archive.c:15
 msgid "git archive --list"
@@ -884,13 +1537,13 @@ msgstr "git archive --list"
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
-"git archive --remote <ไป“ๅบ“> [--exec <ๅ‘ฝไปค>] [<้€‰้กน>] <ๆ ‘ๆˆ–ๆไบค> [<่ทฏๅพ„>...]"
+"git archive --remote <ไป“ๅบ“> [--exec <ๅ‘ฝไปค>] [<้€‰้กน>] <ๆ ‘ๅฏน่ฑก> [<่ทฏๅพ„>...]"
 
 #: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <ไป“ๅบ“> [--exec <ๅ‘ฝไปค>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "่ทฏๅพ„่ง„ๆ ผ '%s' ๆœชๅŒน้…ไปปไฝ•ๆ–‡ไปถ"
@@ -922,7 +1575,7 @@ msgstr "ๆ ผๅผ"
 msgid "archive format"
 msgstr "ๅฝ’ๆกฃๆ ผๅผ"
 
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1653
 msgid "prefix"
 msgstr "ๅ‰็ผ€"
 
@@ -930,11 +1583,12 @@ msgstr "ๅ‰็ผ€"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "ไธบๅฝ’ๆกฃไธญๆฏไธช่ทฏๅพ„ๅๅŠ ไธŠๅ‰็ผ€"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
 msgid "file"
 msgstr "ๆ–‡ไปถ"
 
@@ -967,7 +1621,7 @@ msgid "list supported archive formats"
 msgstr "ๅˆ—ๅ‡บๆ”ฏๆŒ็š„ๅฝ’ๆกฃๆ ผๅผ"
 
 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr "ไป“ๅบ“"
 
@@ -975,7 +1629,7 @@ msgstr "ไป“ๅบ“"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "ไปŽ่ฟœ็จ‹ไป“ๅบ“๏ผˆ<ไป“ๅบ“>๏ผ‰ๆๅ–ๅฝ’ๆกฃๆ–‡ไปถ"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "ๅ‘ฝไปค"
@@ -1006,66 +1660,66 @@ msgstr "ๆœช็Ÿฅๅฝ’ๆกฃๆ ผๅผ '%s'"
 msgid "Argument not supported for format '%s': -%d"
 msgstr "ๅ‚ๆ•ฐไธๆ”ฏๆŒๆญคๆ ผๅผ '%s'๏ผš-%d"
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:351
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€ๆ•ฐๆฎๅฏน่ฑก %s"
 
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:369
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "ไธๆ”ฏๆŒ็š„ๆ–‡ไปถๆจกๅผ๏ผš0%o (SHA1: %s)"
 
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:359
 #, c-format
 msgid "cannot read %s"
 msgstr "ไธ่ƒฝ่ฏปๅ– %s"
 
-#: archive-tar.c:459
+#: archive-tar.c:465
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "ๆ— ๆณ•ๅฏๅŠจ '%s' ่ฟ‡ๆปคๅ™จ"
 
-#: archive-tar.c:462
+#: archive-tar.c:468
 msgid "unable to redirect descriptor"
 msgstr "ๆ— ๆณ•้‡ๅฎšๅ‘ๆ่ฟฐ็ฌฆ"
 
-#: archive-tar.c:469
+#: archive-tar.c:475
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' ่ฟ‡ๆปคๅ™จๆŠฅๅ‘Šไบ†้”™่ฏฏ"
 
-#: archive-zip.c:314
+#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "่ทฏๅพ„ไธๆ˜ฏๆœ‰ๆ•ˆ็š„ UTF-8๏ผš%s"
 
-#: archive-zip.c:318
+#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "่ทฏๅพ„ๅคช้•ฟ๏ผˆ%d ๅญ—็ฌฆ๏ผŒSHA1๏ผš%s๏ผ‰๏ผš%s"
 
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
 #, c-format
 msgid "deflate error (%d)"
 msgstr "ๅŽ‹็ผฉ้”™่ฏฏ (%d)"
 
-#: archive-zip.c:609
+#: archive-zip.c:615
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "ๅฏนไบŽๆœฌ็ณป็ปŸๆ—ถ้—ดๆˆณๅคชๅคง๏ผš%<PRIuMAX>"
 
-#: attr.c:211
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๅฑžๆ€งๅ"
 
-#: attr.c:368
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "ไธๅ…่ฎธ %s๏ผš%s:%d"
 
-#: attr.c:408
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1083,12 +1737,12 @@ msgstr "ๆ–‡ไปถ '%s' ๅŒ…ๅซ้”™่ฏฏ็š„ๅผ•็”จๆ ผๅผ๏ผš%s"
 msgid "We cannot bisect more!\n"
 msgstr "ๆˆ‘ไปฌๆ— ๆณ•่ฟ›่กŒๆ›ดๅคš็š„ไบŒๅˆ†ๆŸฅๆ‰พ๏ผ\n"
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๆไบคๅ %s"
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1097,7 +1751,7 @@ msgstr ""
 "ๅˆๅนถๅŸบ็บฟ %s ๆ˜ฏๅ็š„ใ€‚\n"
 "่ฟ™ๆ„ๅ‘ณ็€ไป‹ไบŽ %s ๅ’Œ [%s] ไน‹้—ด็š„ bug ๅทฒ็ป่ขซไฟฎๅคใ€‚\n"
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1106,7 +1760,7 @@ msgstr ""
 "ๅˆๅนถๅŸบ็บฟ %s ๆ˜ฏๆ–ฐ็š„ใ€‚\n"
 "ไป‹ไบŽ %s ๅ’Œ [%s] ไน‹้—ด็š„ๅฑžๆ€งๅทฒ็ป่ขซไฟฎๆ”นใ€‚\n"
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1115,7 +1769,7 @@ msgstr ""
 "ๅˆๅนถๅŸบ็บฟ %s ๆ˜ฏ %sใ€‚\n"
 "่ฟ™ๆ„ๅ‘ณ็€็ฌฌไธ€ไธช '%s' ๆไบคไฝไบŽ %s ๅ’Œ [%s] ไน‹้—ดใ€‚\n"
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1126,7 +1780,7 @@ msgstr ""
 "่ฟ™็งๆƒ…ๅ†ตไธ‹ git ไบŒๅˆ†ๆŸฅๆ‰พๆ— ๆณ•ๆญฃๅธธๅทฅไฝœใ€‚\n"
 "ๆ‚จๅฏ่ƒฝๅผ„้”™ไบ† %s ๅ’Œ %s ็‰ˆๆœฌ๏ผŸ\n"
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1137,36 +1791,36 @@ msgstr ""
 "ๆ‰€ไปฅๆˆ‘ไปฌๆ— ๆณ•็กฎ่ฎค็ฌฌไธ€ไธช %s ๆไบคๆ˜ฏๅฆไป‹ไบŽ %s ๅ’Œ %s ไน‹้—ดใ€‚\n"
 "ๆˆ‘ไปฌไปๆ—ง็ปง็ปญใ€‚"
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "ไบŒๅˆ†ๆŸฅๆ‰พไธญ๏ผšๅˆๅนถๅŸบ็บฟๅฟ…้กปๆ˜ฏ็ป่ฟ‡ๆต‹่ฏ•็š„\n"
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr "้œ€่ฆไธ€ไธช %s ็‰ˆๆœฌ"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
 #, c-format
 msgid "could not create file '%s'"
 msgstr "ไธ่ƒฝๅˆ›ๅปบๆ–‡ไปถ '%s'"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
 #, c-format
 msgid "could not read file '%s'"
 msgstr "ไธ่ƒฝ่ฏปๅ–ๆ–‡ไปถ '%s'"
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr "่ฏปๅ–ไบŒๅˆ†ๆŸฅๆ‰พๅผ•็”จๅคฑ่ดฅ"
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s ๅŒๆ—ถไธบ %s ๅ’Œ %s\n"
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1175,7 +1829,7 @@ msgstr ""
 "ๆฒกๆœ‰ๅ‘็Žฐๅฏๆต‹่ฏ•็š„ๆไบคใ€‚\n"
 "ๅฏ่ƒฝๆ‚จๅœจ่ฟ่กŒๆ—ถไฝฟ็”จไบ†้”™่ฏฏ็š„่ทฏๅพ„ๅ‚ๆ•ฐ๏ผŸ\n"
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1185,44 +1839,44 @@ msgstr[1] "๏ผˆๅคงๆฆ‚ %d ๆญฅ๏ผ‰"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "ไบŒๅˆ†ๆŸฅๆ‰พไธญ๏ผšๅœจๆญคไน‹ๅŽ๏ผŒ่ฟ˜ๅ‰ฉ %d ไธช็‰ˆๆœฌๅพ…ๆต‹่ฏ• %s\n"
 msgstr[1] "ไบŒๅˆ†ๆŸฅๆ‰พไธญ๏ผšๅœจๆญคไน‹ๅŽ๏ผŒ่ฟ˜ๅ‰ฉ %d ไธช็‰ˆๆœฌๅพ…ๆต‹่ฏ• %s\n"
 
-#: blame.c:2697
+#: blame.c:2700
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents ๅ’Œ --reverse ไธ่ƒฝๆทท็”จใ€‚"
 
-#: blame.c:2711
+#: blame.c:2714
 msgid "cannot use --contents with final commit object name"
 msgstr "ไธ่ƒฝๅฐ† --contents ๅ’Œๆœ€็ปˆ็š„ๆไบคๅฏน่ฑกๅๅ…ฑ็”จ"
 
-#: blame.c:2732
+#: blame.c:2735
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse ๅ’Œ --first-parent ๅ…ฑ็”จ๏ผŒ้œ€่ฆๆŒ‡ๅฎšๆœ€ๆ–ฐ็š„ๆไบค"
 
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "็‰ˆๆœฌ้ๅŽ†่ฎพ็ฝฎๅคฑ่ดฅ"
 
-#: blame.c:2759
+#: blame.c:2762
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr "--reverse ๅ’Œ --first-parent ๅ…ฑ็”จ๏ผŒ้œ€่ฆ็ฌฌไธ€็ฅ–ๅ…ˆ้“พไธŠ็š„ๆไบค่Œƒๅ›ด"
 
-#: blame.c:2770
+#: blame.c:2773
 #, c-format
 msgid "no such path %s in %s"
 msgstr "ๅœจ %2$s ไธญๆ— ๆญค่ทฏๅพ„ %1$s"
 
-#: blame.c:2781
+#: blame.c:2784
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "ไธ่ƒฝไธบ่ทฏๅพ„ %2$s ่ฏปๅ–ๆ•ฐๆฎๅฏน่ฑก %1$s"
@@ -1370,8 +2024,8 @@ msgstr "'%s' ไธๅƒๆ˜ฏไธ€ไธช v2 ็‰ˆๆœฌ็š„ๅŒ…ๆ–‡ไปถ"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ๅŒ…ๅคด๏ผš%s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
 #, c-format
 msgid "could not open '%s'"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€ '%s'"
@@ -1402,62 +2056,62 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "่ฟ™ไธชๅŒ…้œ€่ฆ่ฟ™ไธชๅผ•็”จ๏ผš"
 msgstr[1] "่ฟ™ไธชๅŒ…้œ€่ฆ %d ไธชๅผ•็”จ๏ผš"
 
-#: bundle.c:272
+#: bundle.c:273
 msgid "unable to dup bundle descriptor"
 msgstr "ๆ— ๆณ•ๅคๅˆถ bundle ๆ่ฟฐ็ฌฆ"
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "ไธ่ƒฝ็”Ÿๆˆ pack-objects ่ฟ›็จ‹"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "pack-objects ็ปˆๆญข"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "rev-list ็ปˆๆญข"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "ๅผ•็”จ '%s' ่ขซ rev-list ้€‰้กนๆŽ’้™ค"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ๅ‚ๆ•ฐ๏ผš%s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "ไธ่ƒฝๅˆ›ๅปบ็ฉบๅŒ…ใ€‚"
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ '%s'"
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "index-pack ็ปˆๆญข"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "ๆ— ๆ•ˆ็š„้ขœ่‰ฒๅ€ผ๏ผš%.*s"
 
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "ไธ่ƒฝ่งฃๆž %s"
 
-#: commit.c:52
+#: commit.c:53
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s ไธๆ˜ฏไธ€ไธชๆไบค๏ผ"
 
-#: commit.c:192
+#: commit.c:193
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -1477,27 +2131,27 @@ msgstr ""
 "่ฎพ็ฝฎ \"git config advice.graftFileDeprecated false\"\n"
 "ๅฏๅ…ณ้—ญๆœฌๆถˆๆฏ"
 
-#: commit.c:1127
+#: commit.c:1153
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "ๆไบค %s ๆœ‰ไธ€ไธช้žๅฏไฟก็š„ๅฃฐ็งฐๆฅ่‡ช %s ็š„ GPG ็ญพๅใ€‚"
 
-#: commit.c:1130
+#: commit.c:1157
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "ๆไบค %s ๆœ‰ไธ€ไธช้”™่ฏฏ็š„ๅฃฐ็งฐๆฅ่‡ช %s ็š„ GPG ็ญพๅใ€‚"
 
-#: commit.c:1133
+#: commit.c:1160
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "ๆไบค %s ๆฒกๆœ‰ GPG ็ญพๅใ€‚"
 
-#: commit.c:1136
+#: commit.c:1163
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "ๆไบค %s ๆœ‰ไธ€ไธชๆฅ่‡ช %s ็š„ๅฅฝ็š„ GPG ็ญพๅใ€‚\n"
 
-#: commit.c:1390
+#: commit.c:1417
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1507,165 +2161,175 @@ msgstr ""
 "ๆ‚จๅฏไปฅ้€š่ฟ‡ไฟฎ่กฅๆไบคๆฅๆ”นๆญฃๆไบค่ฏดๆ˜Ž๏ผŒๆˆ–่€…ๅฐ†้…็ฝฎๅ˜้‡ i18n.commitencoding\n"
 "่ฎพ็ฝฎไธบๆ‚จ้กน็›ฎๆ‰€็”จ็š„ๅญ—็ฌฆ็ผ–็ ใ€‚\n"
 
-#: commit-graph.c:127
+#: commit-graph.c:122
 msgid "commit-graph file is too small"
 msgstr "ๆไบคๅ›พๅฝขๆ–‡ไปถๅคชๅฐ"
 
-#: commit-graph.c:192
+#: commit-graph.c:189
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "ๆไบคๅ›พๅฝข็ญพๅ %X ๅ’Œ็ญพๅ %X ไธๅŒน้…"
 
-#: commit-graph.c:199
+#: commit-graph.c:196
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "ๆไบคๅ›พๅฝข็‰ˆๆœฌ %X ๅ’Œ็‰ˆๆœฌ %X ไธๅŒน้…"
 
-#: commit-graph.c:206
+#: commit-graph.c:203
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "ๆไบคๅ›พๅฝขๅ“ˆๅธŒ็‰ˆๆœฌ %X ๅ’Œ็‰ˆๆœฌ %X ไธๅŒน้…"
 
-#: commit-graph.c:229
+#: commit-graph.c:226
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr "ๆไบคๅ›พๅฝขๅ—ๆŸฅๆ‰พ่กจๆก็›ฎไธขๅคฑ๏ผŒๆ–‡ไปถๅฏ่ƒฝไธๅฎŒๆ•ด"
 
-#: commit-graph.c:240
+#: commit-graph.c:237
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "ๆไบคๅ›พๅฝขไธๆญฃ็กฎ็š„ๅ—ๅ็งป %08x%08x"
 
-#: commit-graph.c:283
+#: commit-graph.c:280
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "ๆไบคๅ›พๅฝขๅ— id %08x ๅ‡บ็Žฐไบ†ๅคšๆฌก"
 
-#: commit-graph.c:347
+#: commit-graph.c:343
 msgid "commit-graph has no base graphs chunk"
 msgstr "ๆไบคๅ›พๅฝขๆฒกๆœ‰ๅŸบ็ก€ๅ›พๅฝขๅ—"
 
-#: commit-graph.c:357
+#: commit-graph.c:353
 msgid "commit-graph chain does not match"
 msgstr "ๆไบคๅ›พๅฝข้“พไธๅŒน้…"
 
-#: commit-graph.c:404
+#: commit-graph.c:401
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "ๆ— ๆ•ˆ็š„ๆไบคๅ›พๅฝข้“พ๏ผš่กŒ '%s' ไธๆ˜ฏไธ€ไธชๅ“ˆๅธŒๅ€ผ"
 
-#: commit-graph.c:430
+#: commit-graph.c:425
 msgid "unable to find all commit-graph files"
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐๆ‰€ๆœ‰ๆไบคๅ›พๅฝขๆ–‡ไปถ"
 
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:558 commit-graph.c:618
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "ๆ— ๆ•ˆ็š„ๆไบคไฝ็ฝฎใ€‚ๆไบคๅ›พๅฝขๅฏ่ƒฝๅทฒๆŸๅ"
 
-#: commit-graph.c:575
+#: commit-graph.c:579
 #, c-format
 msgid "could not find commit %s"
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐๆไบค %s"
 
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "ไธ่ƒฝ่งฃๆžๆไบค %s"
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "ๆ— ๆณ•่Žทๅพ—ๅฏน่ฑก %s ็ฑปๅž‹"
 
-#: commit-graph.c:1034
+#: commit-graph.c:1043
 msgid "Loading known commits in commit graph"
 msgstr "ๆญฃๅœจๅŠ ่ฝฝๆไบคๅ›พไธญ็š„ๅทฒ็Ÿฅๆไบค"
 
-#: commit-graph.c:1051
+#: commit-graph.c:1060
 msgid "Expanding reachable commits in commit graph"
 msgstr "ๆญฃๅœจๆ‰ฉๅฑ•ๆไบคๅ›พไธญ็š„ๅฏ่พพๆไบค"
 
-#: commit-graph.c:1070
+#: commit-graph.c:1079
 msgid "Clearing commit marks in commit graph"
 msgstr "ๆญฃๅœจๆธ…้™คๆไบคๅ›พไธญ็š„ๆไบคๆ ‡่ฎฐ"
 
-#: commit-graph.c:1089
+#: commit-graph.c:1098
 msgid "Computing commit graph generation numbers"
 msgstr "ๆญฃๅœจ่ฎก็ฎ—ๆไบคๅ›พไธ–ไปฃๆ•ฐๅญ—"
 
-#: commit-graph.c:1163
+#: commit-graph.c:1173
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "ๆญฃๅœจ %d ไธชๅŒ…ไธญๆŸฅๆ‰พๆไบคๅ›พ็š„ๆไบค"
 msgstr[1] "ๆญฃๅœจ %d ไธชๅŒ…ไธญๆŸฅๆ‰พๆไบคๅ›พ็š„ๆไบค"
 
-#: commit-graph.c:1176
+#: commit-graph.c:1186
 #, c-format
 msgid "error adding pack %s"
 msgstr "ๆทปๅŠ ๅŒ… %s ๅ‡บ้”™"
 
-#: commit-graph.c:1180
+#: commit-graph.c:1190
 #, c-format
 msgid "error opening index for %s"
 msgstr "ไธบ %s ๆ‰“ๅผ€็ดขๅผ•ๅ‡บ้”™"
 
-#: commit-graph.c:1204
+#: commit-graph.c:1214
 #, c-format
 msgid "Finding commits for commit graph from %d ref"
 msgid_plural "Finding commits for commit graph from %d refs"
 msgstr[0] "ๆญฃๅœจไปŽ %d ไธชๅผ•็”จไธญๆŸฅๆ‰พๆไบคๅ›พ็š„ๆไบค"
 msgstr[1] "ๆญฃๅœจไปŽ %d ไธชๅผ•็”จไธญๆŸฅๆ‰พๆไบคๅ›พ็š„ๆไบค"
 
-#: commit-graph.c:1238
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "ๆ— ๆ•ˆ็š„ๆไบคๅฏน่ฑก ID๏ผš%s"
+
+#: commit-graph.c:1249
 msgid "Finding commits for commit graph among packed objects"
 msgstr "ๆญฃๅœจๆ‰“ๅŒ…ๅฏน่ฑกไธญๆŸฅๆ‰พๆไบคๅ›พ็š„ๆไบค"
 
-#: commit-graph.c:1253
+#: commit-graph.c:1264
 msgid "Counting distinct commits in commit graph"
 msgstr "ๆญฃๅœจ่ฎก็ฎ—ๆไบคๅ›พไธญไธๅŒ็š„ๆไบค"
 
-#: commit-graph.c:1284
+#: commit-graph.c:1294
 msgid "Finding extra edges in commit graph"
 msgstr "ๆญฃๅœจๆŸฅๆ‰พๆไบคๅ›พไธญ้ขๅค–็š„่พน"
 
-#: commit-graph.c:1332
+#: commit-graph.c:1340
 msgid "failed to write correct number of base graph ids"
 msgstr "ๆ— ๆณ•ๅ†™ๅ…ฅๆญฃ็กฎๆ•ฐ้‡็š„ๅŸบ็ก€ๅ›พๅฝข ID"
 
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1373 midx.c:814
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "ไธ่ƒฝไธบ %s ๅˆ›ๅปบๅ…ˆๅฏผ็›ฎๅฝ•"
 
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
 #, c-format
 msgid "unable to create '%s'"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ '%s'"
 
-#: commit-graph.c:1437
+#: commit-graph.c:1445
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "ๆญฃๅœจ็”จ %d ๆญฅๅ†™ๅ‡บๆไบคๅ›พ"
 msgstr[1] "ๆญฃๅœจ็”จ %d ๆญฅๅ†™ๅ‡บๆไบคๅ›พ"
 
-#: commit-graph.c:1478
+#: commit-graph.c:1486
 msgid "unable to open commit-graph chain file"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ๆไบคๅ›พๅฝข้“พๆ–‡ไปถ"
 
-#: commit-graph.c:1490
+#: commit-graph.c:1498
 msgid "failed to rename base commit-graph file"
 msgstr "ๆ— ๆณ•้‡ๅ‘ฝๅๅŸบ็ก€ๆไบคๅ›พๅฝขๆ–‡ไปถ"
 
-#: commit-graph.c:1510
+#: commit-graph.c:1518
 msgid "failed to rename temporary commit-graph file"
 msgstr "ๆ— ๆณ•้‡ๅ‘ฝๅไธดๆ—ถๆไบคๅ›พๅฝขๆ–‡ไปถ"
 
-#: commit-graph.c:1621
+#: commit-graph.c:1631
 msgid "Scanning merged commits"
 msgstr "ๆญฃๅœจๆ‰ซๆๅˆๅนถๆไบค"
 
-#: commit-graph.c:1632
+#: commit-graph.c:1642
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "ๆ„ๅค–็š„้‡ๅคๆไบค ID %s"
 
-#: commit-graph.c:1657
+#: commit-graph.c:1665
 msgid "Merging commit-graph"
 msgstr "ๆญฃๅœจๅˆๅนถๆไบคๅ›พๅฝข"
 
@@ -1678,21 +2342,21 @@ msgstr "ๆไบคๅ›พๆ ผๅผไธ่ƒฝๅ†™ๅ…ฅ %d ไธชๆไบค"
 msgid "too many commits to write graph"
 msgstr "ๆไบคๅคชๅคšไธ่ƒฝ็”ปๅ›พ"
 
-#: commit-graph.c:1945
+#: commit-graph.c:1944
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "ๆไบคๅ›พๆ–‡ไปถ็š„ๆ ก้ชŒ็ ้”™่ฏฏ๏ผŒๅฏ่ƒฝๅทฒ็ปๆŸๅ"
 
-#: commit-graph.c:1955
+#: commit-graph.c:1954
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "ๆไบคๅ›พๅฝข็š„ๅฏน่ฑก ID ้กบๅบไธๆญฃ็กฎ๏ผš%s ็„ถๅŽ %s"
 
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1964 commit-graph.c:1979
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "ๆไบคๅ›พๅฝขๆœ‰ไธๆญฃ็กฎ็š„ๆ‰‡ๅ‡บๅ€ผ๏ผšfanout[%d] = %u != %u"
 
-#: commit-graph.c:1972
+#: commit-graph.c:1971
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "ๆ— ๆณ•ไปŽๆไบคๅ›พๅฝขไธญ่งฃๆžๆไบค %s"
@@ -1701,49 +2365,49 @@ msgstr "ๆ— ๆณ•ไปŽๆไบคๅ›พๅฝขไธญ่งฃๆžๆไบค %s"
 msgid "Verifying commits in commit graph"
 msgstr "ๆญฃๅœจๆ ก้ชŒๆไบคๅ›พไธญ็š„ๆไบค"
 
-#: commit-graph.c:2002
+#: commit-graph.c:2003
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "ๆ— ๆณ•ไปŽๆไบคๅ›พๅฝข็š„ๅฏน่ฑกๅบ“ไธญ่งฃๆžๆไบค %s"
 
-#: commit-graph.c:2009
+#: commit-graph.c:2010
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "ๆไบคๅ›พๅฝขไธญ็š„ๆไบค %s ็š„ๆ นๆ ‘ๅฏน่ฑก ID ๆ˜ฏ %s != %s"
 
-#: commit-graph.c:2019
+#: commit-graph.c:2020
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "ๆไบค %s ็š„ๆไบคๅ›พๅฝข็ˆถๆไบคๅˆ—่กจๅคช้•ฟไบ†"
 
-#: commit-graph.c:2028
+#: commit-graph.c:2029
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s ็š„ๆไบคๅ›พๅฝข็ˆถๆไบคๆ˜ฏ %s != %s"
 
-#: commit-graph.c:2041
+#: commit-graph.c:2042
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "ๆไบค %s ็š„ๆไบคๅ›พๅฝข็ˆถๆไบคๅˆ—่กจ่ฟ‡ๆ—ฉ็ปˆๆญข"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2047
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr "ๆไบคๅ›พๅฝขไธญๆไบค %s ็š„ไธ–ไปฃๅทๆ˜ฏ้›ถ๏ผŒไฝ†ๅ…ถๅฎƒๅœฐๆ–น้ž้›ถ"
 
-#: commit-graph.c:2050
+#: commit-graph.c:2051
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr "ๆไบคๅ›พๅฝขไธญๆไบค %s ็š„ไธ–ไปฃๅท้ž้›ถ๏ผŒไฝ†ๅ…ถๅฎƒๅœฐๆ–นๆ˜ฏ้›ถ"
 
-#: commit-graph.c:2065
+#: commit-graph.c:2066
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "ๆไบคๅ›พๅฝขไธญ็š„ๆไบค %s ็š„ไธ–ไปฃๅทๆ˜ฏ %u != %u"
 
-#: commit-graph.c:2071
+#: commit-graph.c:2072
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr "ๆไบคๅ›พๅฝขไธญๆไบค %s ็š„ๆไบคๆ—ฅๆœŸๆ˜ฏ %<PRIuMAX> != %<PRIuMAX>"
@@ -1790,7 +2454,7 @@ msgstr "้”ฎๅๆฒกๆœ‰ๅŒ…ๅซไธ€ไธชๅฐ่Š‚ๅ็งฐ๏ผš%s"
 msgid "key does not contain variable name: %s"
 msgstr "้”ฎๅๆฒกๆœ‰ๅŒ…ๅซๅ˜้‡ๅ๏ผš%s"
 
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2444
 #, c-format
 msgid "invalid key: %s"
 msgstr "ๆ— ๆ•ˆ้”ฎๅ๏ผš%s"
@@ -1926,7 +2590,7 @@ msgstr "%s ็š„ๅ–ๅ€ผๆ ผๅผ้”™่ฏฏ๏ผš%s"
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "ๅฟ…้กปๆ˜ฏๅ…ถไธญไน‹ไธ€๏ผšnothingใ€matchingใ€simpleใ€upstream ๆˆ– current"
 
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1518 builtin/pack-objects.c:3541
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "้”™่ฏฏ็š„ๆ‰“ๅŒ…ๅŽ‹็ผฉ็บงๅˆซ %d"
@@ -1951,110 +2615,105 @@ msgstr "ไธ่ƒฝ่งฃๆž้…็ฝฎๅฏน่ฑก '%s'"
 msgid "failed to parse %s"
 msgstr "่งฃๆž %s ๅคฑ่ดฅ"
 
-#: config.c:1745
+#: config.c:1743
 msgid "unable to parse command-line config"
 msgstr "ๆ— ๆณ•่งฃๆžๅ‘ฝไปค่กŒไธญ็š„้…็ฝฎ"
 
-#: config.c:2094
+#: config.c:2097
 msgid "unknown error occurred while reading the configuration files"
 msgstr "ๅœจ่ฏปๅ–้…็ฝฎๆ–‡ไปถๆ—ถ้‡ๅˆฐๆœช็Ÿฅ้”™่ฏฏ"
 
-#: config.c:2264
+#: config.c:2267
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "ๆ— ๆ•ˆ %s๏ผš'%s'"
 
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr "ๆœช็Ÿฅ็š„ core.untrackedCache ๅ–ๅ€ผ '%s'๏ผŒไฝฟ็”จ้ป˜่ฎคๅ€ผ 'keep'"
-
-#: config.c:2333
+#: config.c:2312
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange ็š„ๅ–ๅ€ผ '%d' ๅบ”่ฏฅไป‹ไบŽ 0 ๅ’Œ 100 ไน‹้—ด"
 
-#: config.c:2379
+#: config.c:2358
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "ๆ— ๆณ•่งฃๆžๅ‘ฝไปค่กŒ้…็ฝฎไธญ็š„ '%s'"
 
-#: config.c:2381
+#: config.c:2360
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "ๅœจๆ–‡ไปถ '%2$s' ็š„็ฌฌ %3$d ่กŒๅ‘็Žฐ้”™่ฏฏ็š„้…็ฝฎๅ˜้‡ '%1$s'"
 
-#: config.c:2462
+#: config.c:2441
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ๅฐ่Š‚ๅ็งฐ '%s'"
 
-#: config.c:2494
+#: config.c:2473
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s ๆœ‰ๅคšไธชๅ–ๅ€ผ"
 
-#: config.c:2523
+#: config.c:2502
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "ๅ†™ๅ…ฅๆ–ฐ็š„้…็ฝฎๆ–‡ไปถ %s ๅคฑ่ดฅ"
 
-#: config.c:2775 config.c:3099
+#: config.c:2754 config.c:3078
 #, c-format
 msgid "could not lock config file %s"
 msgstr "ไธ่ƒฝ้”ๅฎš้…็ฝฎๆ–‡ไปถ %s"
 
-#: config.c:2786
+#: config.c:2765
 #, c-format
 msgid "opening %s"
 msgstr "ๆ‰“ๅผ€ %s"
 
-#: config.c:2821 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "ๆ— ๆ•ˆๆจกๅผ๏ผš%s"
 
-#: config.c:2846
+#: config.c:2825
 #, c-format
 msgid "invalid config file %s"
 msgstr "ๆ— ๆ•ˆ็š„้…็ฝฎๆ–‡ไปถ %s"
 
-#: config.c:2859 config.c:3112
+#: config.c:2838 config.c:3091
 #, c-format
 msgid "fstat on %s failed"
 msgstr "ๅฏน %s ่ฐƒ็”จ fstat ๅคฑ่ดฅ"
 
-#: config.c:2870
+#: config.c:2849
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "ไธ่ƒฝ mmap '%s'"
 
-#: config.c:2879 config.c:3117
+#: config.c:2858 config.c:3096
 #, c-format
 msgid "chmod on %s failed"
 msgstr "ๅฏน %s ่ฐƒ็”จ chmod ๅคฑ่ดฅ"
 
-#: config.c:2964 config.c:3214
+#: config.c:2943 config.c:3193
 #, c-format
 msgid "could not write config file %s"
 msgstr "ไธ่ƒฝๅ†™ๅ…ฅ้…็ฝฎๆ–‡ไปถ %s"
 
-#: config.c:2998
+#: config.c:2977
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "ไธ่ƒฝ่ฎพ็ฝฎ '%s' ไธบ '%s'"
 
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr "ไธ่ƒฝๅ–ๆถˆ่ฎพ็ฝฎ '%s'"
 
-#: config.c:3090
+#: config.c:3069
 #, c-format
 msgid "invalid section name: %s"
 msgstr "ๆ— ๆ•ˆ็š„ๅฐ่Š‚ๅ็งฐ๏ผš%s"
 
-#: config.c:3257
+#: config.c:3236
 #, c-format
 msgid "missing value for '%s'"
 msgstr "%s ็š„ๅ–ๅ€ผ็ผบๅคฑ"
@@ -2177,7 +2836,7 @@ msgstr "ๆ— ๆณ•ๆŸฅๆ‰พ %s๏ผˆ%s๏ผ‰"
 msgid "unknown port %s"
 msgstr "ๆœช็Ÿฅ็ซฏๅฃ %s"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "ๅทฒ้˜ปๆญขๅฅ‡ๆ€ช็š„ไธปๆœบๅ '%s'"
@@ -2192,58 +2851,58 @@ msgstr "ๅทฒ้˜ปๆญขๅฅ‡ๆ€ช็š„็ซฏๅฃๅท '%s'"
 msgid "cannot start proxy %s"
 msgstr "ไธ่ƒฝๅฏๅŠจไปฃ็† %s"
 
-#: connect.c:924
+#: connect.c:928
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "ๆœชๆŒ‡ๅฎš่ทฏๅพ„๏ผŒๆ‰ง่กŒ 'git help pull' ๆŸฅ็œ‹ๆœ‰ๆ•ˆ็š„ url ่ฏญๆณ•"
 
-#: connect.c:1119
+#: connect.c:1123
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh ๅ˜ไฝ“ 'simple' ไธๆ”ฏๆŒ -4"
 
-#: connect.c:1131
+#: connect.c:1135
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh ๅ˜ไฝ“ 'simple' ไธๆ”ฏๆŒ -6"
 
-#: connect.c:1148
+#: connect.c:1152
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh ๅ˜ไฝ“ 'simple' ไธๆ”ฏๆŒ่ฎพ็ฝฎ็ซฏๅฃ"
 
-#: connect.c:1260
+#: connect.c:1264
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "ๅทฒ้˜ปๆญขๅฅ‡ๆ€ช็š„่ทฏๅพ„ๅ '%s'"
 
-#: connect.c:1307
+#: connect.c:1311
 msgid "unable to fork"
 msgstr "ๆ— ๆณ• fork"
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
 msgid "Checking connectivity"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅ่ฟž้€šๆ€ง"
 
-#: connected.c:98
+#: connected.c:110
 msgid "Could not run 'git rev-list'"
 msgstr "ไธ่ƒฝๆ‰ง่กŒ 'git rev-list'"
 
-#: connected.c:118
+#: connected.c:130
 msgid "failed write to rev-list"
 msgstr "ๅ†™ๅ…ฅ rev-list ๅคฑ่ดฅ"
 
-#: connected.c:125
+#: connected.c:137
 msgid "failed to close rev-list's stdin"
 msgstr "ๅ…ณ้—ญ rev-list ็š„ๆ ‡ๅ‡†่พ“ๅ…ฅๅคฑ่ดฅ"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "้žๆณ•็š„ crlf ๅŠจไฝœ %d"
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "%s ไธญ็š„ CRLF ๅฐ†่ขซ LF ๆ›ฟๆข"
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2252,12 +2911,12 @@ msgstr ""
 "%s ไธญ็š„ CRLF ๅฐ†่ขซ LF ๆ›ฟๆขใ€‚<\n"
 "ๅœจๅทฅไฝœๅŒบไธญ่ฏฅๆ–‡ไปถไปไฟๆŒๅŽŸๆœ‰็š„ๆข่กŒ็ฌฆใ€‚"
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "ๆ–‡ไปถ %s ไธญ็š„ LF ๅฐ†่ขซ CRLF ๆ›ฟๆข"
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2266,17 +2925,18 @@ msgstr ""
 "%s ไธญ็š„ LF ๅฐ†่ขซ CRLF ๆ›ฟๆขใ€‚\n"
 "ๅœจๅทฅไฝœๅŒบไธญ่ฏฅๆ–‡ไปถไปไฟๆŒๅŽŸๆœ‰็š„ๆข่กŒ็ฌฆ"
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "ๅฆ‚ๆžœไฝฟ็”จ %2$s ็ผ–็ ๏ผŒ็ฆๆญขๅœจ '%1$s' ไธญไฝฟ็”จ BOM"
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
-msgstr "ๆ–‡ไปถ '%s' ๅŒ…ๅซไธ€ไธชๅญ—่Š‚้กบๅบๆ ‡่ฎฐ๏ผˆBOM๏ผ‰ใ€‚่ฏทไฝฟ็”จ UTF-%s ไฝœไธบๅทฅไฝœๅŒบ็ผ–็ ใ€‚"
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"ๆ–‡ไปถ '%s' ๅŒ…ๅซไธ€ไธชๅญ—่Š‚้กบๅบๆ ‡่ฎฐ๏ผˆBOM๏ผ‰ใ€‚่ฏทไฝฟ็”จ UTF-%.*s ไฝœไธบๅทฅไฝœๅŒบ็ผ–็ ใ€‚"
 
 #: convert.c:304
 #, c-format
@@ -2292,117 +2952,117 @@ msgstr ""
 "ๆ–‡ไปถ '%s' ็ผบๅคฑไธ€ไธชๅญ—่Š‚้กบๅบๆ ‡่ฎฐ๏ผˆBOM๏ผ‰ใ€‚่ฏทไฝฟ็”จ UTF-%sBE or UTF-%sLE๏ผˆๅ–ๅ†ณไบŽๅญ—"
 "่Š‚ๅบ๏ผ‰ไฝœไธบๅทฅไฝœๅŒบ็ผ–็ ใ€‚"
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "ๆ— ๆณ•ๅฏน '%s' ่ฟ›่กŒไปŽ %s ๅˆฐ %s ็š„็ผ–็ "
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "ๅฐ†'%s' ็š„็ผ–็ ไปŽ %s ๅˆฐ %s ๆฅๅ›ž่ฝฌๆขไธไธ€่‡ด"
 
-#: convert.c:673
+#: convert.c:668
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "ไธ่ƒฝ fork ไปฅๆ‰ง่กŒๅค–้ƒจ่ฟ‡ๆปคๅ™จ '%s'"
 
-#: convert.c:693
+#: convert.c:688
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "ไธ่ƒฝๅฐ†่พ“ๅ…ฅไผ ้€’็ป™ๅค–้ƒจ่ฟ‡ๆปคๅ™จ '%s'"
 
-#: convert.c:700
+#: convert.c:695
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "ๅค–้ƒจ่ฟ‡ๆปคๅ™จ '%s' ๅคฑ่ดฅ็  %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:730 convert.c:733
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "ไปŽๅค–้ƒจ่ฟ‡ๆปคๅ™จ '%s' ่ฏปๅ–ๅคฑ่ดฅ"
 
-#: convert.c:741 convert.c:796
+#: convert.c:736 convert.c:791
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "ๅค–้ƒจ่ฟ‡ๆปคๅ™จ '%s' ๅคฑ่ดฅ"
 
-#: convert.c:844
+#: convert.c:839
 msgid "unexpected filter type"
 msgstr "ๆ„ๅค–็š„่ฟ‡ๆปค็ฑปๅž‹"
 
-#: convert.c:855
+#: convert.c:850
 msgid "path name too long for external filter"
 msgstr "ๅค–้ƒจ่ฟ‡ๆปคๅ™จ็š„่ทฏๅพ„ๅๅคช้•ฟ"
 
-#: convert.c:929
+#: convert.c:924
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr "ๅค–้ƒจ่ฟ‡ๆปคๅ™จ '%s' ไธๅ†ๅฏ็”จ๏ผŒไฝ†ๅนถ้žๆ‰€ๆœ‰่ทฏๅพ„้ƒฝๅทฒ่ฟ‡ๆปค"
 
-#: convert.c:1228
+#: convert.c:1223
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false ไธๆ˜ฏๆœ‰ๆ•ˆ็š„ๅทฅไฝœๅŒบ็ผ–็ "
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1411 convert.c:1445
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s๏ผšclean ่ฟ‡ๆปคๅ™จ '%s' ๅคฑ่ดฅ"
 
-#: convert.c:1476
+#: convert.c:1489
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s๏ผšsmudge ่ฟ‡ๆปคๅ™จ %s ๅคฑ่ดฅ"
 
-#: date.c:137
+#: date.c:138
 msgid "in the future"
 msgstr "ๅœจๅฐ†ๆฅ"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "%<PRIuMAX> ็ง’้’Ÿๅ‰"
 msgstr[1] "%<PRIuMAX> ็ง’้’Ÿๅ‰"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "%<PRIuMAX> ๅˆ†้’Ÿๅ‰"
 msgstr[1] "%<PRIuMAX> ๅˆ†้’Ÿๅ‰"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "%<PRIuMAX> ๅฐๆ—ถๅ‰"
 msgstr[1] "%<PRIuMAX> ๅฐๆ—ถๅ‰"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "%<PRIuMAX> ๅคฉๅ‰"
 msgstr[1] "%<PRIuMAX> ๅคฉๅ‰"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "%<PRIuMAX> ๅ‘จๅ‰"
 msgstr[1] "%<PRIuMAX> ๅ‘จๅ‰"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "%<PRIuMAX> ไธชๆœˆๅ‰"
 msgstr[1] "%<PRIuMAX> ไธชๆœˆๅ‰"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2410,14 +3070,14 @@ msgstr[0] "%<PRIuMAX> ๅนด"
 msgstr[1] "%<PRIuMAX> ๅนด"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "%s %<PRIuMAX> ไธชๆœˆๅ‰"
 msgstr[1] "%s %<PRIuMAX> ไธชๆœˆๅ‰"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2453,7 +3113,7 @@ msgstr "ๅทฒๆ ‡่ฎฐ %d ไธชๆ•ฐๆฎๅฒ›๏ผŒ็ป“ๆŸใ€‚\n"
 msgid "failed to read orderfile '%s'"
 msgstr "่ฏปๅ–ๆŽ’ๅบๆ–‡ไปถ '%s' ๅคฑ่ดฅ"
 
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
 msgid "Performing inexact rename detection"
 msgstr "ๆญฃๅœจ่ฟ›่กŒ้ž็ฒพ็กฎ็š„้‡ๅ‘ฝๅๆŽขๆต‹"
 
@@ -2516,35 +3176,35 @@ msgstr ""
 "ๅ‘็Žฐ้…็ฝฎๅ˜้‡ 'diff.dirstat' ไธญ็š„้”™่ฏฏ๏ผš\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4202
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "ๅค–้ƒจ diff ้€€ๅ‡บ๏ผŒๅœๆญขๅœจ %s"
 
-#: diff.c:4560
+#: diff.c:4547
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-onlyใ€--name-statusใ€--check ๅ’Œ -s ๆ˜ฏไบ’ๆ–ฅ็š„"
 
-#: diff.c:4563
+#: diff.c:4550
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-Gใ€-S ๅ’Œ --find-object ๆ˜ฏไบ’ๆ–ฅ็š„"
 
-#: diff.c:4641
+#: diff.c:4628
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow ๆ˜Ž็กฎ่ฆๆฑ‚ๅช่ทŸไธ€ไธช่ทฏๅพ„่ง„ๆ ผ"
 
-#: diff.c:4689
+#: diff.c:4676
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "ๆ— ๆ•ˆ็š„ --stat ๅ€ผ๏ผš%s"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s ๆœŸๆœ›ไธ€ไธชๆ•ฐๅญ—ๅ€ผ"
 
-#: diff.c:4726
+#: diff.c:4713
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2553,195 +3213,195 @@ msgstr ""
 "ๆ— ๆณ•่งฃๆž --dirstat/-X ้€‰้กน็š„ๅ‚ๆ•ฐ๏ผš\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4798
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "--diff-filter=%2$s ไธญๆœช็Ÿฅ็š„ๅ˜ๆ›ด็ฑป '%1$c'"
 
-#: diff.c:4835
+#: diff.c:4822
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ws-error-highlight=%.*s ไน‹ๅŽๆœช็Ÿฅ็š„ๅ€ผ"
 
-#: diff.c:4849
+#: diff.c:4836
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "ไธ่ƒฝ่งฃๆž '%s'"
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4886 diff.c:4892
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s ๆœŸๆœ› <n>/<m> ๆ ผๅผ"
 
-#: diff.c:4917
+#: diff.c:4904
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s ๆœŸๆœ›ไธ€ไธชๅญ—็ฌฆ๏ผŒๅพ—ๅˆฐ '%s'"
 
-#: diff.c:4938
+#: diff.c:4925
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "ๅ็š„ --color-moved ๅ‚ๆ•ฐ๏ผš%s"
 
-#: diff.c:4957
+#: diff.c:4944
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws ไธญ็š„ๆ— ๆ•ˆๆจกๅผ '%s' "
 
-#: diff.c:4997
+#: diff.c:4984
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 "diff-algorithm ้€‰้กนๆœ‰ \"myers\"ใ€\"minimal\"ใ€\"patience\" ๅ’Œ \"histogram\""
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5020 diff.c:5040
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s ็š„ๅ‚ๆ•ฐๆ— ๆ•ˆ"
 
-#: diff.c:5191
+#: diff.c:5178
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "ๆ— ๆณ•่งฃๆž --submodule ้€‰้กน็š„ๅ‚ๆ•ฐ๏ผš'%s'"
 
-#: diff.c:5247
+#: diff.c:5234
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "ๅ็š„ --word-diff ๅ‚ๆ•ฐ๏ผš%s"
 
-#: diff.c:5270
+#: diff.c:5257
 msgid "Diff output format options"
 msgstr "ๅทฎๅผ‚่พ“ๅ‡บๆ ผๅผๅŒ–้€‰้กน"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5259 diff.c:5265
 msgid "generate patch"
 msgstr "็”Ÿๆˆ่กฅไธ"
 
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5262 builtin/log.c:173
 msgid "suppress diff output"
 msgstr "ไธๆ˜พ็คบๅทฎๅผ‚่พ“ๅ‡บ"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5267 diff.c:5381 diff.c:5388
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5268 diff.c:5271
 msgid "generate diffs with <n> lines context"
 msgstr "็”Ÿๆˆๅซ <n> ่กŒไธŠไธ‹ๆ–‡็š„ๅทฎๅผ‚"
 
-#: diff.c:5286
+#: diff.c:5273
 msgid "generate the diff in raw format"
 msgstr "็”ŸๆˆๅŽŸๅง‹ๆ ผๅผ็š„ๅทฎๅผ‚"
 
-#: diff.c:5289
+#: diff.c:5276
 msgid "synonym for '-p --raw'"
 msgstr "ๅ’Œ '-p --raw' ๅŒไน‰"
 
-#: diff.c:5293
+#: diff.c:5280
 msgid "synonym for '-p --stat'"
 msgstr "ๅ’Œ '-p --stat' ๅŒไน‰"
 
-#: diff.c:5297
+#: diff.c:5284
 msgid "machine friendly --stat"
 msgstr "ๆœบๅ™จๅ‹ๅฅฝ็š„ --stat"
 
-#: diff.c:5300
+#: diff.c:5287
 msgid "output only the last line of --stat"
 msgstr "ๅช่พ“ๅ‡บ --stat ็š„ๆœ€ๅŽไธ€่กŒ"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5289 diff.c:5297
 msgid "<param1,param2>..."
 msgstr "<ๅ‚ๆ•ฐ1,ๅ‚ๆ•ฐ2>..."
 
-#: diff.c:5303
+#: diff.c:5290
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "่พ“ๅ‡บๆฏไธชๅญ็›ฎๅฝ•็›ธๅฏนๅ˜ๆ›ด็š„ๅˆ†ๅธƒ"
 
-#: diff.c:5307
+#: diff.c:5294
 msgid "synonym for --dirstat=cumulative"
 msgstr "ๅ’Œ --dirstat=cumulative ๅŒไน‰"
 
-#: diff.c:5311
+#: diff.c:5298
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "ๆ˜ฏ --dirstat=files,param1,param2... ็š„ๅŒไน‰่ฏ"
 
-#: diff.c:5315
+#: diff.c:5302
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "ๅฆ‚ๆžœๅ˜ๆ›ดไธญๅผ•ๅ…ฅๅ†ฒ็ชๅฎš็•Œ็ฌฆๆˆ–็ฉบ็™ฝ้”™่ฏฏ๏ผŒ็ป™ๅ‡บ่ญฆๅ‘Š"
 
-#: diff.c:5318
+#: diff.c:5305
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "็ฒพ็ฎ€ๆ‘˜่ฆ๏ผŒไพ‹ๅฆ‚ๅˆ›ๅปบใ€้‡ๅ‘ฝๅๅ’Œๆจกๅผๅ˜ๆ›ด"
 
-#: diff.c:5321
+#: diff.c:5308
 msgid "show only names of changed files"
 msgstr "ๅชๆ˜พ็คบๅ˜ๆ›ดๆ–‡ไปถ็š„ๆ–‡ไปถๅ"
 
-#: diff.c:5324
+#: diff.c:5311
 msgid "show only names and status of changed files"
 msgstr "ๅชๆ˜พ็คบๅ˜ๆ›ดๆ–‡ไปถ็š„ๆ–‡ไปถๅๅ’Œ็Šถๆ€"
 
-#: diff.c:5326
+#: diff.c:5313
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<ๅฎฝๅบฆ>[,<ๆ–‡ไปถๅๅฎฝๅบฆ>[,<ๆฌกๆ•ฐ>]]"
 
-#: diff.c:5327
+#: diff.c:5314
 msgid "generate diffstat"
 msgstr "็”Ÿๆˆๅทฎๅผ‚็ปŸ่ฎก๏ผˆdiffstat๏ผ‰"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5316 diff.c:5319 diff.c:5322
 msgid "<width>"
 msgstr "<ๅฎฝๅบฆ>"
 
-#: diff.c:5330
+#: diff.c:5317
 msgid "generate diffstat with a given width"
 msgstr "ไฝฟ็”จ็ป™ๅฎš็š„้•ฟๅบฆ็”Ÿๆˆๅทฎๅผ‚็ปŸ่ฎก"
 
-#: diff.c:5333
+#: diff.c:5320
 msgid "generate diffstat with a given name width"
 msgstr "ไฝฟ็”จ็ป™ๅฎš็š„ๆ–‡ไปถๅ้•ฟๅบฆ็”Ÿๆˆๅทฎๅผ‚็ปŸ่ฎก"
 
-#: diff.c:5336
+#: diff.c:5323
 msgid "generate diffstat with a given graph width"
 msgstr "ไฝฟ็”จ็ป™ๅฎš็š„ๅ›พๅฝข้•ฟๅบฆ็”Ÿๆˆๅทฎๅผ‚็ปŸ่ฎก"
 
-#: diff.c:5338
+#: diff.c:5325
 msgid "<count>"
 msgstr "<ๆฌกๆ•ฐ>"
 
-#: diff.c:5339
+#: diff.c:5326
 msgid "generate diffstat with limited lines"
 msgstr "็”Ÿๆˆๆœ‰้™่กŒๆ•ฐ็š„ๅทฎๅผ‚็ปŸ่ฎก"
 
-#: diff.c:5342
+#: diff.c:5329
 msgid "generate compact summary in diffstat"
 msgstr "็”Ÿๆˆๅทฎๅผ‚็ปŸ่ฎก็š„็ฎ€ๆดๆ‘˜่ฆ"
 
-#: diff.c:5345
+#: diff.c:5332
 msgid "output a binary diff that can be applied"
 msgstr "่พ“ๅ‡บไธ€ไธชๅฏไปฅๅบ”็”จ็š„ไบŒ่ฟ›ๅˆถๅทฎๅผ‚"
 
-#: diff.c:5348
+#: diff.c:5335
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "ๅœจ \"index\" ่กŒๆ˜พ็คบๅฎŒๆ•ด็š„ๅ‰ๅŽๅฏน่ฑกๅ็งฐ"
 
-#: diff.c:5350
+#: diff.c:5337
 msgid "show colored diff"
 msgstr "ๆ˜พ็คบๅธฆ้ขœ่‰ฒ็š„ๅทฎๅผ‚"
 
-#: diff.c:5351
+#: diff.c:5338
 msgid "<kind>"
 msgstr "<็ฑปๅž‹>"
 
-#: diff.c:5352
+#: diff.c:5339
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr "ๅฏนไบŽๅทฎๅผ‚ไธญ็š„ไธŠไธ‹ๆ–‡ใ€ๆ—ง็š„ๅ’Œๆ–ฐ็š„่กŒ๏ผŒๅŠ ไบฎๆ˜พ็คบ้”™่ฏฏ็š„็ฉบ็™ฝๅญ—็ฌฆ"
 
-#: diff.c:5355
+#: diff.c:5342
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2749,334 +3409,353 @@ msgstr ""
 "ๅœจ --raw ๆˆ–่€… --numstat ไธญ๏ผŒไธๅฏน่ทฏๅพ„ๅญ—็ฌฆ่ฝฌ็ ๅนถไฝฟ็”จ NUL ๅญ—็ฌฆๅšไธบ่พ“ๅ‡บๅญ—ๆฎต็š„ๅˆ†้š”"
 "็ฌฆ"
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
 msgid "<prefix>"
 msgstr "<ๅ‰็ผ€>"
 
-#: diff.c:5359
+#: diff.c:5346
 msgid "show the given source prefix instead of \"a/\""
 msgstr "ๆ˜พ็คบ็ป™ๅฎš็š„ๆบๅ‰็ผ€ๅ–ไปฃ \"a/\""
 
-#: diff.c:5362
+#: diff.c:5349
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "ๆ˜พ็คบ็ป™ๅฎš็š„็›ฎๆ ‡ๅ‰็ผ€ๅ–ไปฃ \"b/\""
 
-#: diff.c:5365
+#: diff.c:5352
 msgid "prepend an additional prefix to every line of output"
 msgstr "่พ“ๅ‡บ็š„ๆฏไธ€่กŒ้™„ๅŠ ๅ‰็ผ€"
 
-#: diff.c:5368
+#: diff.c:5355
 msgid "do not show any source or destination prefix"
 msgstr "ไธๆ˜พ็คบไปปไฝ•ๆบๅ’Œ็›ฎๆ ‡ๅ‰็ผ€"
 
-#: diff.c:5371
+#: diff.c:5358
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "ๆ˜พ็คบๆŒ‡ๅฎš่กŒๆ•ฐ็š„ๅทฎๅผ‚ๅ—้—ด็š„ไธŠไธ‹ๆ–‡"
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5362 diff.c:5367 diff.c:5372
 msgid "<char>"
 msgstr "<ๅญ—็ฌฆ>"
 
-#: diff.c:5376
+#: diff.c:5363
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "ๆŒ‡ๅฎšไธ€ไธชๅญ—็ฌฆๅ–ไปฃ '+' ๆฅ่กจ็คบๆ–ฐ็š„ไธ€่กŒ"
 
-#: diff.c:5381
+#: diff.c:5368
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "ๆŒ‡ๅฎšไธ€ไธชๅญ—็ฌฆๅ–ไปฃ '-' ๆฅ่กจ็คบๆ—ง็š„ไธ€่กŒ"
 
-#: diff.c:5386
+#: diff.c:5373
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "ๆŒ‡ๅฎšไธ€ไธชๅญ—็ฌฆๅ–ไปฃ ' ' ๆฅ่กจ็คบไธ€่กŒไธŠไธ‹ๆ–‡"
 
-#: diff.c:5389
+#: diff.c:5376
 msgid "Diff rename options"
 msgstr "ๅทฎๅผ‚้‡ๅ‘ฝๅ้€‰้กน"
 
-#: diff.c:5390
+#: diff.c:5377
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5391
+#: diff.c:5378
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "ๅฐ†ๅฎŒๅ…จ้‡ๅ†™็š„ๅ˜ๆ›ดๆ‰“็ ดไธบๆˆๅฏน็š„ๅˆ ้™คๅ’Œๅˆ›ๅปบ"
 
-#: diff.c:5395
+#: diff.c:5382
 msgid "detect renames"
 msgstr "ๆฃ€ๆต‹้‡ๅ‘ฝๅ"
 
-#: diff.c:5399
+#: diff.c:5386
 msgid "omit the preimage for deletes"
 msgstr "็œ็•ฅๅˆ ้™คๆ“ไฝœ็š„ๅทฎๅผ‚่พ“ๅ‡บ"
 
-#: diff.c:5402
+#: diff.c:5389
 msgid "detect copies"
 msgstr "ๆฃ€ๆต‹ๆ‹ท่ด"
 
-#: diff.c:5406
+#: diff.c:5393
 msgid "use unmodified files as source to find copies"
 msgstr "ไฝฟ็”จๆœชไฟฎๆ”น็š„ๆ–‡ไปถๅšไธบๅ‘็Žฐๆ‹ท่ด็š„ๆบ"
 
-#: diff.c:5408
+#: diff.c:5395
 msgid "disable rename detection"
 msgstr "็ฆ็”จ้‡ๅ‘ฝๅๆŽขๆต‹"
 
-#: diff.c:5411
+#: diff.c:5398
 msgid "use empty blobs as rename source"
 msgstr "ไฝฟ็”จ็ฉบ็š„ๆ•ฐๆฎๅฏน่ฑกๅšไธบ้‡ๅ‘ฝๅ็š„ๆบ"
 
-#: diff.c:5413
+#: diff.c:5400
 msgid "continue listing the history of a file beyond renames"
 msgstr "็ปง็ปญๅˆ—ๅ‡บๆ–‡ไปถ้‡ๅ‘ฝๅไปฅๅค–็š„ๅŽ†ๅฒ่ฎฐๅฝ•"
 
-#: diff.c:5416
+#: diff.c:5403
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr "ๅฆ‚ๆžœ้‡ๅ‘ฝๅ/ๆ‹ท่ด็›ฎๆ ‡่ถ…่ฟ‡็ป™ๅฎš็š„้™ๅˆถ๏ผŒ็ฆๆญข้‡ๅ‘ฝๅ/ๆ‹ท่ดๆฃ€ๆต‹"
 
-#: diff.c:5418
+#: diff.c:5405
 msgid "Diff algorithm options"
 msgstr "ๅทฎๅผ‚็ฎ—ๆณ•้€‰้กน"
 
-#: diff.c:5420
+#: diff.c:5407
 msgid "produce the smallest possible diff"
 msgstr "็”Ÿๆˆๅฐฝๅฏ่ƒฝๅฐ็š„ๅทฎๅผ‚"
 
-#: diff.c:5423
+#: diff.c:5410
 msgid "ignore whitespace when comparing lines"
 msgstr "่กŒๆฏ”่พƒๆ—ถๅฟฝ็•ฅ็ฉบ็™ฝๅญ—็ฌฆ"
 
-#: diff.c:5426
+#: diff.c:5413
 msgid "ignore changes in amount of whitespace"
 msgstr "ๅฟฝ็•ฅ็ฉบ็™ฝๅญ—็ฌฆ็š„ๅ˜ๆ›ด"
 
-#: diff.c:5429
+#: diff.c:5416
 msgid "ignore changes in whitespace at EOL"
 msgstr "ๅฟฝ็•ฅ่กŒๅฐพ็š„็ฉบ็™ฝๅญ—็ฌฆๅ˜ๆ›ด"
 
-#: diff.c:5432
+#: diff.c:5419
 msgid "ignore carrier-return at the end of line"
 msgstr "ๅฟฝ็•ฅ่กŒๅฐพ็š„ๅ›ž่ฝฆ็ฌฆ๏ผˆCR๏ผ‰"
 
-#: diff.c:5435
+#: diff.c:5422
 msgid "ignore changes whose lines are all blank"
 msgstr "ๅฟฝ็•ฅๆ•ด่กŒ้ƒฝๆ˜ฏ็ฉบ็™ฝ็š„ๅ˜ๆ›ด"
 
-#: diff.c:5438
+#: diff.c:5425
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "ๅฏๅ‘ๅผ่ฝฌๆขๅทฎๅผ‚่พน็•Œไปฅไพฟ้˜…่ฏป"
 
-#: diff.c:5441
+#: diff.c:5428
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "ไฝฟ็”จ \"patience diff\" ็ฎ—ๆณ•็”Ÿๆˆๅทฎๅผ‚"
 
-#: diff.c:5445
+#: diff.c:5432
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "ไฝฟ็”จ \"histogram diff\" ็ฎ—ๆณ•็”Ÿๆˆๅทฎๅผ‚"
 
-#: diff.c:5447
+#: diff.c:5434
 msgid "<algorithm>"
 msgstr "<็ฎ—ๆณ•>"
 
-#: diff.c:5448
+#: diff.c:5435
 msgid "choose a diff algorithm"
 msgstr "้€‰ๆ‹ฉไธ€ไธชๅทฎๅผ‚็ฎ—ๆณ•"
 
-#: diff.c:5450
+#: diff.c:5437
 msgid "<text>"
 msgstr "<ๆ–‡ๆœฌ>"
 
-#: diff.c:5451
+#: diff.c:5438
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "ไฝฟ็”จ \"anchored diff\" ็ฎ—ๆณ•็”Ÿๆˆๅทฎๅผ‚"
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5440 diff.c:5449 diff.c:5452
 msgid "<mode>"
 msgstr "<ๆจกๅผ>"
 
-#: diff.c:5454
+#: diff.c:5441
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "ๆ˜พ็คบๅ•่ฏๅทฎๅผ‚๏ผŒไฝฟ็”จ <ๆจกๅผ> ๅˆ†้š”ๅ˜ๆ›ด็š„ๅ•่ฏ"
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5443 diff.c:5446 diff.c:5491
 msgid "<regex>"
 msgstr "<ๆญฃๅˆ™>"
 
-#: diff.c:5457
+#: diff.c:5444
 msgid "use <regex> to decide what a word is"
 msgstr "ไฝฟ็”จ <ๆญฃๅˆ™่กจ่พพๅผ> ็กฎๅฎšไฝ•ไธบไธ€ไธช่ฏ"
 
-#: diff.c:5460
+#: diff.c:5447
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "็›ธๅฝ“ไบŽ --word-diff=color --word-diff-regex=<ๆญฃๅˆ™>"
 
-#: diff.c:5463
+#: diff.c:5450
 msgid "moved lines of code are colored differently"
 msgstr "็งปๅŠจ็š„ไปฃ็ ่กŒ็”จไธๅŒๆ–นๅผ็€่‰ฒ"
 
-#: diff.c:5466
+#: diff.c:5453
 msgid "how white spaces are ignored in --color-moved"
 msgstr "ๅœจ --color-moved ไธ‹ๅฆ‚ไฝ•ๅฟฝ็•ฅ็ฉบ็™ฝๅญ—็ฌฆ"
 
-#: diff.c:5469
+#: diff.c:5456
 msgid "Other diff options"
 msgstr "ๅ…ถๅฎƒๅทฎๅผ‚้€‰้กน"
 
-#: diff.c:5471
+#: diff.c:5458
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr "ๅฝ“ไปŽๅญ็›ฎๅฝ•่ฟ่กŒ๏ผŒๆŽ’้™ค็›ฎๅฝ•ไน‹ๅค–็š„ๅ˜ๆ›ดๅนถๆ˜พ็คบ็›ธๅฏน่ทฏๅพ„"
 
-#: diff.c:5475
+#: diff.c:5462
 msgid "treat all files as text"
 msgstr "ๆŠŠๆ‰€ๆœ‰ๆ–‡ไปถๅฝ“ๅšๆ–‡ๆœฌๅค„็†"
 
-#: diff.c:5477
+#: diff.c:5464
 msgid "swap two inputs, reverse the diff"
 msgstr "ไบคๆขไธคไธช่พ“ๅ…ฅ๏ผŒๅ่ฝฌๅทฎๅผ‚"
 
-#: diff.c:5479
+#: diff.c:5466
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "ๆœ‰ๅทฎๅผ‚ๆ—ถ้€€ๅ‡บ็ ไธบ 1๏ผŒๅฆๅˆ™ไธบ 0"
 
-#: diff.c:5481
+#: diff.c:5468
 msgid "disable all output of the program"
 msgstr "็ฆ็”จๆœฌ็จ‹ๅบ็š„ๆ‰€ๆœ‰่พ“ๅ‡บ"
 
-#: diff.c:5483
+#: diff.c:5470
 msgid "allow an external diff helper to be executed"
 msgstr "ๅ…่ฎธๆ‰ง่กŒไธ€ไธชๅค–็ฝฎ็š„ๅทฎๅผ‚ๅŠฉๆ‰‹"
 
-#: diff.c:5485
+#: diff.c:5472
 msgid "run external text conversion filters when comparing binary files"
 msgstr "ๅฝ“ๆฏ”่พƒไบŒ่ฟ›ๅˆถๆ–‡ไปถๆ—ถ๏ผŒ่ฟ่กŒๅค–้ƒจ็š„ๆ–‡ๆœฌ่ฝฌๆข่ฟ‡ๆปคๅ™จ"
 
-#: diff.c:5487
+#: diff.c:5474
 msgid "<when>"
 msgstr "<ไฝ•ๆ—ถ>"
 
-#: diff.c:5488
+#: diff.c:5475
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ๅœจ็”Ÿๆˆๅทฎๅผ‚ๆ—ถ๏ผŒๅฟฝ็•ฅๅญๆจก็ป„็š„ๆ›ดๆ”น"
 
-#: diff.c:5491
+#: diff.c:5478
 msgid "<format>"
 msgstr "<ๆ ผๅผ>"
 
-#: diff.c:5492
+#: diff.c:5479
 msgid "specify how differences in submodules are shown"
 msgstr "ๆŒ‡ๅฎšๅญๆจก็ป„็š„ๅทฎๅผ‚ๅฆ‚ไฝ•ๆ˜พ็คบ"
 
-#: diff.c:5496
+#: diff.c:5483
 msgid "hide 'git add -N' entries from the index"
 msgstr "้š่—็ดขๅผ•ไธญ 'git add -N' ๆก็›ฎ"
 
-#: diff.c:5499
+#: diff.c:5486
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "ๅฐ†็ดขๅผ•ไธญ 'git add -N' ๆก็›ฎๅฝ“ๅš็œŸๅฎž็š„"
 
-#: diff.c:5501
+#: diff.c:5488
 msgid "<string>"
 msgstr "<ๅญ—็ฌฆไธฒ>"
 
-#: diff.c:5502
+#: diff.c:5489
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "ๆŸฅๆ‰พๆ”นๅ˜ไบ†ๆŒ‡ๅฎšๅญ—็ฌฆไธฒๅ‡บ็Žฐๆฌกๆ•ฐ็š„ๅทฎๅผ‚"
 
-#: diff.c:5505
+#: diff.c:5492
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "ๆŸฅๆ‰พๆ”นๅ˜ๆŒ‡ๅฎšๆญฃๅˆ™ๅŒน้…ๅ‡บ็Žฐๆฌกๆ•ฐ็š„ๅทฎๅผ‚"
 
-#: diff.c:5508
+#: diff.c:5495
 msgid "show all changes in the changeset with -S or -G"
 msgstr "ๆ˜พ็คบไฝฟ็”จ -S ๆˆ– -G ็š„ๅ˜ๆ›ด้›†็š„ๆ‰€ๆœ‰ๅ˜ๆ›ด"
 
-#: diff.c:5511
+#: diff.c:5498
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "ๅฐ† -S ็š„ <string> ๅฝ“ๅšๆ‰ฉๅฑ•็š„ POSIX ๆญฃๅˆ™่กจ่พพๅผ"
 
-#: diff.c:5514
+#: diff.c:5501
 msgid "control the order in which files appear in the output"
 msgstr "ๆŽงๅˆถ่พ“ๅ‡บไธญ็š„ๆ–‡ไปถๆ˜พ็คบ้กบๅบ"
 
-#: diff.c:5515
+#: diff.c:5502
 msgid "<object-id>"
 msgstr "<ๅฏน่ฑก ID>"
 
-#: diff.c:5516
+#: diff.c:5503
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "ๆŸฅๆ‰พๆ”นๅ˜ๆŒ‡ๅฎšๅฏน่ฑกๅ‡บ็Žฐๆฌกๆ•ฐ็š„ๅทฎๅผ‚"
 
-#: diff.c:5518
+#: diff.c:5505
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5519
+#: diff.c:5506
 msgid "select files by diff type"
 msgstr "้€š่ฟ‡ๅทฎๅผ‚็ฑปๅž‹้€‰ๆ‹ฉๆ–‡ไปถ"
 
-#: diff.c:5521
+#: diff.c:5508
 msgid "<file>"
 msgstr "<ๆ–‡ไปถ>"
 
-#: diff.c:5522
+#: diff.c:5509
 msgid "Output to a specific file"
 msgstr "่พ“ๅ‡บๅˆฐไธ€ไธชๆŒ‡ๅฎš็š„ๆ–‡ไปถ"
 
-#: diff.c:6177
+#: diff.c:6164
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "ๅ› ไธบๆ–‡ไปถๅคชๅคš๏ผŒ็•ฅ่ฟ‡ไธไธฅๆ ผ็š„้‡ๅ‘ฝๅๆฃ€ๆŸฅใ€‚"
 
-#: diff.c:6180
+#: diff.c:6167
 msgid "only found copies from modified paths due to too many files."
 msgstr "ๅ› ไธบๆ–‡ไปถๅคชๅคš๏ผŒๅชๅœจไฟฎๆ”น็š„่ทฏๅพ„ไธญๆŸฅๆ‰พๆ‹ท่ดใ€‚"
 
-#: diff.c:6183
+#: diff.c:6170
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "ๆ‚จๅฏ่ƒฝๆƒณ่ฆๅฐ†ๅ˜้‡ %s ่ฎพ็ฝฎไธบ่‡ณๅฐ‘ %d ๅนถๅ†ๆฌกๆ‰ง่กŒๆญคๅ‘ฝไปคใ€‚"
 
-#: dir.c:537
+#: dir.c:555
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "่ทฏๅพ„่ง„ๆ ผ '%s' ๆœชๅŒน้…ไปปไฝ• git ๅทฒ็Ÿฅๆ–‡ไปถ"
 
-#: dir.c:926
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "ๆœช่ฏ†ๅˆซ็š„ๆจกๅผ๏ผš'%s'"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "ๆœช่ฏ†ๅˆซ็š„ๅๅ‘ๆจกๅผ๏ผš'%s'"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "ๆ‚จ็š„ sparse-checkout ๆ–‡ไปถๅฏ่ƒฝๆœ‰้—ฎ้ข˜๏ผš้‡ๅค็š„ๆจกๅผ '%s'"
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "็ฆๆญข cone ๆจกๅผๅŒน้…"
+
+#: dir.c:1173
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "ไธ่ƒฝๅฐ† %s ็”จไฝœๆŽ’้™คๆ–‡ไปถ"
 
-#: dir.c:1843
+#: dir.c:2144
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€็›ฎๅฝ• '%s'"
 
-#: dir.c:2085
+#: dir.c:2479
 msgid "failed to get kernel name and information"
 msgstr "ๆ— ๆณ•่Žทๅพ—ๅ†…ๆ ธๅ็งฐๅ’Œไฟกๆฏ"
 
-#: dir.c:2209
+#: dir.c:2603
 msgid "untracked cache is disabled on this system or location"
 msgstr "็ผ“ๅญ˜ๆœช่ทŸ่ธชๆ–‡ไปถๅœจๆœฌ็ณป็ปŸๆˆ–ไฝ็ฝฎไธญ่ขซ็ฆ็”จ"
 
-#: dir.c:3013
+#: dir.c:3407
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "ไป“ๅบ“ %s ไธญ็š„็ดขๅผ•ๆ–‡ไปถๆŸๅ"
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3452 dir.c:3457
 #, c-format
 msgid "could not create directories for %s"
 msgstr "ไธ่ƒฝไธบ %s ๅˆ›ๅปบ็›ฎๅฝ•"
 
-#: dir.c:3092
+#: dir.c:3486
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "ไธ่ƒฝไปŽ '%s' ่ฟ็งป git ็›ฎๅฝ•ๅˆฐ '%s'"
@@ -3095,12 +3774,12 @@ msgstr "่ฟ‡ๆปคๅ†…ๅฎน"
 msgid "could not stat file '%s'"
 msgstr "ไธ่ƒฝๅฏนๆ–‡ไปถ '%s' ่ฐƒ็”จ stat"
 
-#: environment.c:150
+#: environment.c:149
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "้”™่ฏฏ็š„ git ๅๅญ—็ฉบ้—ด่ทฏๅพ„ \"%s\""
 
-#: environment.c:332
+#: environment.c:331
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "ไธ่ƒฝ่ฎพ็ฝฎ GIT_DIR ไธบ '%s'"
@@ -3110,265 +3789,269 @@ msgstr "ไธ่ƒฝ่ฎพ็ฝฎ GIT_DIR ไธบ '%s'"
 msgid "too many args to run %s"
 msgstr "ๆ‰ง่กŒ %s ็š„ๅ‚ๆ•ฐๅคชๅคš"
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "่ฟœ็จ‹ๆœช่ฎพ็ฝฎ URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack๏ผšๅบ”ไธบ shallow ๅˆ—่กจ"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:153
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack๏ผšๅœจๆต…ๅ…‹้š†ๅˆ—่กจไน‹ๅŽๆœŸๆœ›ไธ€ไธช flush ๅŒ…"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:164
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack๏ผšๆœŸๆœ› ACK/NAK๏ผŒๅดๅพ—ๅˆฐ flush ๅŒ…"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:184
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack๏ผšๅบ”ไธบ ACK/NAK๏ผŒๅดๅพ—ๅˆฐ '%s'"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:195
 msgid "unable to write to remote"
 msgstr "ๆ— ๆณ•ๅ†™ๅˆฐ่ฟœ็จ‹"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:257
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc ้œ€่ฆ multi_ack_detailed"
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1340
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ๆ— ๆ•ˆ็š„ shallow ไฟกๆฏ๏ผš%s"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1346
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ๆ— ๆ•ˆ็š„ unshallow ไฟกๆฏ๏ผš%s"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1348
 #, c-format
 msgid "object not found: %s"
 msgstr "ๅฏน่ฑกๆœชๆ‰พๅˆฐ๏ผš%s"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1351
 #, c-format
 msgid "error in object: %s"
 msgstr "ๅฏน่ฑกไธญๅ‡บ้”™๏ผš%s"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1353
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ๆœชๅ‘็Žฐ shallow๏ผš%s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1357
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "ๅบ”ไธบ shallow/unshallow๏ผŒๅดๅพ—ๅˆฐ %s"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:414
 #, c-format
 msgid "got %s %d %s"
 msgstr "ๅพ—ๅˆฐ %s %d %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:431
 #, c-format
 msgid "invalid commit %s"
 msgstr "ๆ— ๆ•ˆๆไบค %s"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:462
 msgid "giving up"
 msgstr "ๆ”พๅผƒ"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:323
 msgid "done"
 msgstr "ๅฎŒๆˆ"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:487
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "ๅพ—ๅˆฐ %s (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:533
 #, c-format
 msgid "Marking %s as complete"
 msgstr "ๆ ‡่ฎฐ %s ไธบๅฎŒๆˆ"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:754
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ๅทฒ็ปๆœ‰ %s๏ผˆ%s๏ผ‰"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:818
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack๏ผšๆ— ๆณ•ๆดพ็”Ÿ sideband ๅคš่ทฏ่พ“ๅ‡บ"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:826
 msgid "protocol error: bad pack header"
 msgstr "ๅ่ฎฎ้”™่ฏฏ๏ผšๅ็š„ๅŒ…ๅคด"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:900
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack๏ผšๆ— ๆณ•ๆดพ็”Ÿ่ฟ›็จ‹ %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:916
 #, c-format
 msgid "%s failed"
 msgstr "%s ๅคฑ่ดฅ"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:918
 msgid "error in sideband demultiplexer"
 msgstr "sideband ๅคš่ทฏ่พ“ๅ‡บๅ‡บ้”™"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:965
 #, c-format
 msgid "Server version is %.*s"
 msgstr "ๆœๅŠกๅ™จ็‰ˆๆœฌ %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
 #, c-format
 msgid "Server supports %s"
 msgstr "ๆœๅŠกๅ™จๆ”ฏๆŒ %s"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:972
 msgid "Server does not support shallow clients"
 msgstr "ๆœๅŠกๅ™จไธๆ”ฏๆŒ shalllow ๅฎขๆˆท็ซฏ"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1032
 msgid "Server does not support --shallow-since"
 msgstr "ๆœๅŠกๅ™จไธๆ”ฏๆŒ --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1037
 msgid "Server does not support --shallow-exclude"
 msgstr "ๆœๅŠกๅ™จไธๆ”ฏๆŒ --shallow-exclude"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1041
 msgid "Server does not support --deepen"
 msgstr "ๆœๅŠกๅ™จไธๆ”ฏๆŒ --deepen"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1058
 msgid "no common commits"
 msgstr "ๆฒกๆœ‰ๅ…ฑๅŒ็š„ๆไบค"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1070 fetch-pack.c:1536
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack๏ผš่Žทๅ–ๅคฑ่ดฅใ€‚"
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1209
 msgid "Server does not support shallow requests"
 msgstr "ๆœๅŠกๅ™จไธๆ”ฏๆŒ shalllow ่ฏทๆฑ‚"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1216
 msgid "Server supports filter"
 msgstr "ๆœๅŠกๅ™จๆ”ฏๆŒ filter"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1239
 msgid "unable to write request to remote"
 msgstr "ๆ— ๆณ•ๅฐ†่ฏทๆฑ‚ๅ†™ๅˆฐ่ฟœ็จ‹"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1257
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "่ฏปๅ–่Š‚ๆ ‡้ข˜ '%s' ๅ‡บ้”™"
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1263
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "้ข„ๆœŸ '%s'๏ผŒๅพ—ๅˆฐ '%s'"
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1303
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "ๆ„ๅค–็š„็กฎ่ฎค่กŒ๏ผš'%s'"
 
-#: fetch-pack.c:1252
+#: fetch-pack.c:1308
 #, c-format
 msgid "error processing acks: %d"
 msgstr "ๅค„็† ack ๅ‡บ้”™๏ผš%d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1318
 msgid "expected packfile to be sent after 'ready'"
 msgstr "้ข„ๆœŸๅœจ 'ready' ไน‹ๅŽๅ‘้€ packfile"
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1320
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "ๅœจๆฒกๆœ‰ 'ready' ไธๅบ”่ฏฅๅ‘้€ๅ…ถๅฎƒๅฐ่Š‚"
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1362
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "ๅค„็†ๆต…ๅ…‹้š†ไฟกๆฏๅ‡บ้”™๏ผš%d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1409
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "้ข„ๆœŸ wanted-ref๏ผŒๅพ—ๅˆฐ '%s'"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1414
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "ๆ„ๅค–็š„ wanted-ref๏ผš'%s'"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "ๅค„็†่ฆ่Žทๅ–็š„ๅผ•็”จๅ‡บ้”™๏ผš%d"
 
-#: fetch-pack.c:1689
+#: fetch-pack.c:1762
 msgid "no matching remote head"
 msgstr "ๆฒกๆœ‰ๅŒน้…็š„่ฟœ็จ‹ๅˆ†ๆ”ฏ"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1785 builtin/clone.c:689
 msgid "remote did not send all necessary objects"
 msgstr "่ฟœ็จ‹ๆฒกๆœ‰ๅ‘้€ๆ‰€ๆœ‰ๅฟ…้œ€็š„ๅฏน่ฑก"
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:1812
 #, c-format
 msgid "no such remote ref %s"
 msgstr "ๆฒกๆœ‰่ฟ™ๆ ท็š„่ฟœ็จ‹ๅผ•็”จ %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:1815
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "ๆœๅŠกๅ™จไธๅ…่ฎธ่ฏทๆฑ‚ๆœชๅ…ฌๅผ€็š„ๅฏน่ฑก %s"
 
-#: gpg-interface.c:321
+#: gpg-interface.c:408
 msgid "gpg failed to sign the data"
-msgstr "gpg ๆ— ๆณ•ไธบๆ•ฐๆฎ็ญพๅ"
+msgstr "gpg ๆ•ฐๆฎ็ญพๅๅคฑ่ดฅ"
 
-#: gpg-interface.c:347
+#: gpg-interface.c:434
 msgid "could not create temporary file"
 msgstr "ไธ่ƒฝๅˆ›ๅปบไธดๆ—ถๆ–‡ไปถ"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:437
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "ๆ— ๆณ•ๅฐ†ๅˆ†็ฆปๅผ็ญพๅๅ†™ๅ…ฅ '%s'"
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ๅฟฝ็•ฅ log.graphColors ไธญๆ— ๆ•ˆ็š„้ขœ่‰ฒ '%.*s'"
 
-#: grep.c:2117
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"็ป™ๅฎš็š„ๆจกๅผๅŒ…ๅซ NULL ๅญ—็ฌฆ๏ผˆ้€š่ฟ‡ -f <ๆ–‡ไปถ> ๅ‚ๆ•ฐ๏ผ‰ใ€‚ๅชๆœ‰ PCRE v2 ไธ‹็š„ -P ๆ”ฏๆŒๆญค"
+"ๅŠŸ่ƒฝ"
+
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'๏ผšๆ— ๆณ•่ฏปๅ– %s"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "ๅฏน '%s' ่ฐƒ็”จ stat ๅคฑ่ดฅ"
 
-#: grep.c:2145
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'๏ผš่ฏปๅ–ไธๅฎŒๆ•ด"
@@ -3418,7 +4101,7 @@ msgid "Low-level Commands / Interrogators"
 msgstr "ไฝŽ็บงๅ‘ฝไปค/่ฏข้—ฎ่€…"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "ไฝŽ็บงๅ‘ฝไปค/ๅŒๆญฅไป“ๅบ“"
 
 #: help.c:38
@@ -3510,12 +4193,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr "git version [<้€‰้กน>]"
 
-#: help.c:782
+#: help.c:783
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s๏ผš%s - %s"
 
-#: help.c:786
+#: help.c:787
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3582,46 +4265,61 @@ msgstr "ไธๅ…่ฎธ็ฉบ็š„ๅง“ๅ๏ผˆๅฏนไบŽ <%s>๏ผ‰"
 msgid "name consists only of disallowed characters: %s"
 msgstr "ๅง“ๅไธญไป…ๅŒ…ๅซ็ฆ็”จๅญ—็ฌฆ๏ผš%s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:635
 #, c-format
 msgid "invalid date format: %s"
 msgstr "ๆ— ๆ•ˆ็š„ๆ—ฅๆœŸๆ ผๅผ๏ผš%s"
 
-#: list-objects.c:129
+#: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "ๆ ‘ %2$s ไธญ็š„ๆก็›ฎ '%1$s' ๅ…ทๆœ‰ๆ ‘็š„ๅฑžๆ€ง๏ผŒไฝ†ไธๆ˜ฏไธ€ไธชๆ ‘ๅฏน่ฑก"
 
-#: list-objects.c:142
+#: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "ๆ ‘ %2$s ไธญ็š„ๆก็›ฎ '%1$s' ๅ…ทๆœ‰ๆ•ฐๆฎๅฏน่ฑก็š„ๅฑžๆ€ง๏ผŒไฝ†ไธๆ˜ฏไธ€ไธชๆ•ฐๆฎๅฏน่ฑก"
 
-#: list-objects.c:378
+#: list-objects.c:375
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "ๆ— ๆณ•ไธบๆไบค %s ๅŠ ่ฝฝๆ นๆ ‘"
 
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "ไธ่ƒฝๆทท็”จๅคš็ง่ฟ‡ๆปค่ง„ๆ ผ"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "ไธ่ƒฝ่ฎฟ้—ฎ '%s' ไธญ็š„็จ€็–ๆ•ฐๆฎๅฏน่ฑก"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "ๆ— ๆณ•่งฃๆž %s ไธญ็š„็จ€็–่ฟ‡ๆปคๅ™จๆ•ฐๆฎ"
 
 #: list-objects-filter-options.c:58
 msgid "expected 'tree:<depth>'"
 msgstr "ๆœŸๆœ› 'tree:<ๆทฑๅบฆ>'"
 
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
 msgid "sparse:path filters support has been dropped"
 msgstr "sparse:path ่ฟ‡ๆปคๅ™จๆ”ฏๆŒๅทฒ่ขซๅˆ ้™ค"
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "ๆ— ๆ•ˆ็š„่ฟ‡ๆปคๅ™จ่กจ่พพๅผ '%s'"
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "ๆ— ๆณ•ไฟฎๆ”น้ƒจๅˆ†ๅ…‹้š†็š„ promisor ่ฟœ็จ‹ไป“ๅบ“"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "ๅฟ…้กปๅฏน sub-filter-spec ไธญ็š„ๅญ—็ฌฆ่ฟ›่กŒ่ฝฌไน‰๏ผš'%c'"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "ๆœŸๆœ›ๅœจ็ป„ๅˆๅŽๆœ‰ไธ€ไบ›ไธœ่ฅฟ๏ผš"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "ไธ่ƒฝๆทท็”จๅคš็ง่ฟ‡ๆปค่ง„ๆ ผ"
 
 #: lockfile.c:151
 #, c-format
@@ -3650,114 +4348,110 @@ msgstr "ไธ่ƒฝๅˆ›ๅปบ '%s.lock'๏ผš%s"
 msgid "failed to read the cache"
 msgstr "่ฏปๅ–็ผ“ๅญ˜ๅคฑ่ดฅ"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "ๆ— ๆณ•ๅ†™ๆ–ฐ็š„็ดขๅผ•ๆ–‡ไปถ"
 
-#: merge-recursive.c:322
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "๏ผˆๅๆไบค๏ผ‰\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo ๅฏน่ทฏๅพ„ '%s' ๆ‰ง่กŒๅคฑ่ดฅ๏ผŒๅˆๅนถ็ปˆๆญขใ€‚"
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "add_cacheinfo ๆ— ๆณ•ๅˆทๆ–ฐ่ทฏๅพ„ '%s'๏ผŒๅˆๅนถ็ปˆๆญขใ€‚"
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "ๅˆ›ๅปบๆ ‘ๅ‡บ้”™"
-
-#: merge-recursive.c:863
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "ๅˆ›ๅปบ่ทฏๅพ„ '%s'%s ๅคฑ่ดฅ"
 
-#: merge-recursive.c:874
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "ๅˆ ้™ค %s ไปฅไพฟไธบๅญ็›ฎๅฝ•็•™ๅ‡บ็ฉบ้—ด\n"
 
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr "๏ผšๅฏ่ƒฝๆ˜ฏไธ€ไธช็›ฎๅฝ•/ๆ–‡ไปถๅ†ฒ็ช๏ผŸ"
 
-#: merge-recursive.c:897
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "ๆ‹’็ปไธขๅผƒ '%s' ไธญ็š„ๆœช่ทŸ่ธชๆ–‡ไปถ"
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "ไธ่ƒฝ่ฏปๅ–ๅฏน่ฑก %s '%s'"
 
-#: merge-recursive.c:941
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' ๅบ”ไธบๆ•ฐๆฎๅฏน่ฑก"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "ๆ‰“ๅผ€ '%s' ๅคฑ่ดฅ๏ผš%s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "ๅˆ›ๅปบ็ฌฆๅท้“พๆŽฅ '%s' ๅคฑ่ดฅ๏ผš%s"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "ไธ็Ÿฅ้“ๅฆ‚ไฝ•ๅค„็† %06o %s '%s'"
 
-#: merge-recursive.c:1177
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "ๆ— ๆณ•ๅˆๅนถๅญๆจก็ป„ %s ๏ผˆๆฒกๆœ‰ๆฃ€ๅ‡บ๏ผ‰"
 
-#: merge-recursive.c:1184
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "ๆ— ๆณ•ๅˆๅนถๅญๆจก็ป„ %s๏ผˆๆไบคไธๅญ˜ๅœจ๏ผ‰"
 
-#: merge-recursive.c:1191
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "ๆ— ๆณ•ๅˆๅนถๅญๆจก็ป„ %s ๏ผˆๆไบคๆœช่ทŸ้šๅˆๅนถๅŸบ็บฟ๏ผ‰"
 
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "ๅญๆจก็ป„ %s ๅฟซ่ฟ›ๅˆฐๅฆ‚ไธ‹ๆไบค๏ผš"
 
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "ๅฟซ่ฟ›ๅญๆจก็ป„ %s"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr "ๆ— ๆณ•ๅˆๅนถๅญๆจก็ป„ %s ๏ผˆๆฒกๅ‘็Žฐๅˆๅนถ่ทŸ้š็š„ๆไบค๏ผ‰"
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "ๆ— ๆณ•ๅˆๅนถๅญๆจก็ป„ %s๏ผˆ้žๅฟซ่ฟ›๏ผ‰"
 
-#: merge-recursive.c:1242
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "ๆ‰พๅˆฐๅญๆจก็ป„็š„ไธ€ไธชๅฏ่ƒฝ็š„ๅˆๅนถๆ–นๆกˆ๏ผš\n"
 
-#: merge-recursive.c:1245
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3773,31 +4467,31 @@ msgstr ""
 "\n"
 "ไปฅๆŽฅๅ—ๆญคๅปบ่ฎฎใ€‚\n"
 
-#: merge-recursive.c:1254
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "ๆ— ๆณ•ๅˆๅนถๅญๆจก็ป„ %s ๏ผˆๅ‘็Žฐๅคšไธชๅˆๅนถ๏ผ‰"
 
-#: merge-recursive.c:1327
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "ๆ— ๆณ•ๆ‰ง่กŒๅ†…้ƒจๅˆๅนถ"
 
-#: merge-recursive.c:1332
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "ไธ่ƒฝๆทปๅŠ  %s ่‡ณๅฏน่ฑกๅบ“"
 
-#: merge-recursive.c:1364
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "่‡ชๅŠจๅˆๅนถ %s"
 
-#: merge-recursive.c:1387
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "้”™่ฏฏ๏ผšๆ‹’็ปไธขๅคฑๆœช่ทŸ่ธชๆ–‡ไปถ '%s'๏ผŒ่€Œๆ˜ฏๅ†™ๅ…ฅ %sใ€‚"
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3806,7 +4500,7 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆ%1$s/ๅˆ ้™ค๏ผ‰๏ผš%2$s ๅœจ %3$s ไธญ่ขซๅˆ ้™ค๏ผŒๅœจ %5$s ไธญ่ขซ %4$sใ€‚%7$s ็š„ %6$s ็‰ˆ"
 "ๆœฌ่ขซไฟ็•™ใ€‚"
 
-#: merge-recursive.c:1464
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3815,7 +4509,7 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆ%1$s/ๅˆ ้™ค๏ผ‰๏ผš%2$s ๅœจ %3$s ไธญ่ขซๅˆ ้™ค๏ผŒๅœจ %6$s ไธญ็š„ %5$s ่ขซ %4$sใ€‚%8$s ็š„ "
 "%7$s ็‰ˆๆœฌ่ขซไฟ็•™ใ€‚"
 
-#: merge-recursive.c:1471
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3824,7 +4518,7 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆ%1$s/ๅˆ ้™ค๏ผ‰๏ผš%2$s ๅœจ %3$s ไธญ่ขซๅˆ ้™ค๏ผŒๅœจ %5$s ไธญ่ขซ %4$sใ€‚%7$s ็š„ %6$s ็‰ˆ"
 "ๆœฌไฟ็•™ๅœจ %8$s ไธญใ€‚"
 
-#: merge-recursive.c:1476
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3833,40 +4527,40 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆ%1$s/ๅˆ ้™ค๏ผ‰๏ผš%2$s ๅœจ %3$s ไธญ่ขซๅˆ ้™ค๏ผŒๅœจ %6$s ไธญ็š„ %5$s ่ขซ %4$sใ€‚%8$s ็š„ "
 "%7$s ็‰ˆๆœฌไฟ็•™ๅœจ %9$s ไธญใ€‚"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "้‡ๅ‘ฝๅ"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "้‡ๅ‘ฝๅ"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "ๆ‹’็ปไธขๅคฑ่„ๆ–‡ไปถ '%s'"
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "ๆ‹’็ปๅœจ '%s' ๅค„ๅคฑๅŽปๆœช่ทŸ่ธชๆ–‡ไปถ๏ผŒๅณไฝฟๅฎƒๅญ˜ๅœจไบŽ้‡ๅ‘ฝๅไธญใ€‚"
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr "ๅ†ฒ็ช๏ผˆ้‡ๅ‘ฝๅ/ๆทปๅŠ ๏ผ‰๏ผšๅœจ %3$s ไธญ้‡ๅ‘ฝๅ %1$s->%2$sใ€‚ๅœจ %5$s ไธญๆทปๅŠ  %4$s"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s ๆ˜ฏ %s ไธญ็š„ไธ€ไธช็›ฎๅฝ•่€Œไปฅ %s ไธบๅ่ขซๆทปๅŠ "
 
-#: merge-recursive.c:1695
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "ๆ‹’็ปไธขๅคฑๆœช่ทŸ่ธชๆ–‡ไปถ '%s'๏ผŒ่€Œๆ˜ฏๆทปๅŠ ไธบ %s"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3875,18 +4569,18 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆ้‡ๅ‘ฝๅ/้‡ๅ‘ฝๅ๏ผ‰๏ผšๅœจๅˆ†ๆ”ฏ \"%3$s\" ไธญ้‡ๅ‘ฝๅ \"%1$s\"->\"%2$s\"๏ผŒๅœจๅˆ†ๆ”ฏ "
 "\"%6$s\" ไธญ้‡ๅ‘ฝๅ \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr "๏ผˆ็•™ไธ‹ๆœช่งฃๅ†ณ๏ผ‰"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1793
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "ๅ†ฒ็ช๏ผˆ้‡ๅ‘ฝๅ/้‡ๅ‘ฝๅ๏ผ‰๏ผšๅœจ %3$s ไธญ้‡ๅ‘ฝๅ %1$s->%2$s๏ผŒๅœจ %6$s ไธญ้‡ๅ‘ฝๅ %4$s->"
 "%5$s"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3896,7 +4590,7 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆๅˆ†ๅ‰ฒ็š„็›ฎๅฝ•้‡ๅ‘ฝๅ๏ผ‰๏ผšไธๆธ…ๆฅš %s ๅบ”่ฏฅๆ”พๅœจๅ“ช้‡Œ๏ผŒๅ› ไธบ็›ฎๅฝ• %s ่ขซ้‡ๅ‘ฝๅๅˆฐๅคšไธช"
 "ๅ…ถๅฎƒ็›ฎๅฝ•๏ผŒๆฒกๆœ‰็›ฎๅฝ•ๅŒ…ๅซๅคง้ƒจๅˆ†ๆ–‡ไปถใ€‚"
 
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3905,7 +4599,7 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆ้šๅผ็›ฎๅฝ•้‡ๅ‘ฝๅ๏ผ‰๏ผšๅค„ไบŽ้šๅผ็›ฎๅฝ•้‡ๅ‘ฝๅ็š„็Žฐๅญ˜ๆ–‡ไปถ/็›ฎๅฝ• %s๏ผŒๅฐ†ไปฅไธ‹่ทฏๅพ„ๆ”พ"
 "ๅœจ๏ผš%sใ€‚"
 
-#: merge-recursive.c:2077
+#: merge-recursive.c:2098
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3914,7 +4608,7 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆ้šๅผ็›ฎๅฝ•้‡ๅ‘ฝๅ๏ผ‰๏ผšๆ— ๆณ•ๆ˜ ๅฐ„ไธ€ไธชไปฅไธŠ่ทฏๅพ„ๅˆฐ %s๏ผŒ้šๅผ็›ฎๅฝ•้‡ๅ‘ฝๅๅฐ่ฏ•ๅฐ†่ฟ™ไบ›่ทฏ"
 "ๅพ„ๆ”พ็ฝฎไบŽๆญค๏ผš%s"
 
-#: merge-recursive.c:2169
+#: merge-recursive.c:2190
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3923,59 +4617,59 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆ้‡ๅ‘ฝๅ/้‡ๅ‘ฝๅ๏ผ‰๏ผšๅœจ %3$s ไธญ้‡ๅ‘ฝๅ็›ฎๅฝ• %1$s->%2$s๏ผŒๅœจ %6$s ไธญ้‡ๅ‘ฝๅ็›ฎๅฝ• "
 "%4$s->%5$s"
 
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr "่ญฆๅ‘Š๏ผš้ฟๅ…ๅบ”็”จ %s -> %s ็š„้‡ๅ‘ฝๅๅˆฐ %s๏ผŒๅ› ไธบ %s ๆœฌ่บซๅทฒ่ขซ้‡ๅ‘ฝๅใ€‚"
 
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
 #, c-format
 msgid "cannot read object %s"
 msgstr "ไธ่ƒฝ่ฏปๅ–ๅฏน่ฑก %s"
 
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
 #, c-format
 msgid "object %s is not a blob"
 msgstr "ๅฏน่ฑก %s ไธๆ˜ฏไธ€ไธชๆ•ฐๆฎๅฏน่ฑก"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modify"
 msgstr "ไฟฎๆ”น"
 
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
 msgid "modified"
 msgstr "ไฟฎๆ”น"
 
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
 msgid "content"
 msgstr "ๅ†…ๅฎน"
 
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
 msgid "add/add"
 msgstr "ๆทปๅŠ /ๆทปๅŠ "
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "็•ฅ่ฟ‡ %s๏ผˆๅทฒ็ปๅš่ฟ‡็›ธๅŒๅˆๅนถ๏ผ‰"
 
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:1003
 msgid "submodule"
 msgstr "ๅญๆจก็ป„"
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "ๅ†ฒ็ช๏ผˆ%s๏ผ‰๏ผšๅˆๅนถๅ†ฒ็ชไบŽ %s"
 
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
 #, c-format
 msgid "Adding as %s instead"
 msgstr "่€Œๆ˜ฏไปฅ %s ไธบๅๆทปๅŠ "
 
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -3983,7 +4677,7 @@ msgid ""
 msgstr ""
 "่ทฏๅพ„ๅทฒๆ›ดๆ–ฐ๏ผš%s ๆทปๅŠ ๅˆฐ %s๏ผŒไฝไบŽไธ€ไธช่ขซ้‡ๅ‘ฝๅๅˆฐ %s ็š„็›ฎๅฝ•ไธญ๏ผŒๅฐ†ๅ…ถ็งปๅŠจๅˆฐ %sใ€‚"
 
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -3992,7 +4686,7 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆๆ–‡ไปถไฝ็ฝฎ๏ผ‰๏ผš%s ๆทปๅŠ ๅˆฐ %s๏ผŒไฝไบŽไธ€ไธช่ขซ้‡ๅ‘ฝๅไธบ %s ็š„็›ฎๅฝ•ไธญ๏ผŒๅปบ่ฎฎๅฐ†ๅ…ถ็งปๅŠจ"
 "ๅˆฐ %sใ€‚"
 
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4001,7 +4695,7 @@ msgstr ""
 "่ทฏๅพ„ๅทฒๆ›ดๆ–ฐ๏ผš%1$s ้‡ๅ‘ฝๅไธบ %3$s ไธญ็š„ %2$s๏ผŒ่€Œ่ฏฅ็›ฎๅฝ•่ขซ้‡ๅ‘ฝๅๅˆฐ %4$s ไธญ๏ผŒๅฐ†ๅ…ถ็งป"
 "ๅŠจๅˆฐ %5$sใ€‚"
 
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4010,224 +4704,240 @@ msgstr ""
 "ๅ†ฒ็ช๏ผˆๆ–‡ไปถไฝ็ฝฎ๏ผ‰๏ผš%1$s ้‡ๅ‘ฝๅไธบ %3$s ไธญ็š„ %2$s๏ผŒ่€Œ่ฏฅ็›ฎๅฝ•่ขซ้‡ๅ‘ฝๅๅˆฐ %4$s ไธญ๏ผŒ"
 "ๅปบ่ฎฎๅฐ†ๅ…ถ็งปๅŠจๅˆฐ %5$sใ€‚"
 
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
 #, c-format
 msgid "Removing %s"
 msgstr "ๅˆ ้™ค %s"
 
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
 msgid "file/directory"
 msgstr "ๆ–‡ไปถ/็›ฎๅฝ•"
 
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
 msgid "directory/file"
 msgstr "็›ฎๅฝ•/ๆ–‡ไปถ"
 
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "ๅ†ฒ็ช๏ผˆ%1$s๏ผ‰๏ผšๅœจ %3$s ไธญๆœ‰ไธ€ไธชๅไธบ %2$s ็š„็›ฎๅฝ•ใ€‚ไปฅ %5$s ไธบๅๆทปๅŠ  %4$s"
 
-#: merge-recursive.c:3347
+#: merge-recursive.c:3371
 #, c-format
 msgid "Adding %s"
 msgstr "ๆทปๅŠ  %s"
 
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "ๅ†ฒ็ช๏ผˆadd/add๏ผ‰๏ผšๅˆๅนถๅ†ฒ็ชไบŽ %s"
 
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"ๆ‚จๅฏนไธ‹ๅˆ—ๆ–‡ไปถ็š„ๆœฌๅœฐไฟฎๆ”นๅฐ†่ขซๅˆๅนถๆ“ไฝœ่ฆ†็›–๏ผš\n"
-"  %s"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
 msgid "Already up to date!"
 msgstr "ๅทฒ็ปๆ˜ฏๆœ€ๆ–ฐ็š„๏ผ"
 
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "ๆ— ๆณ•ๅˆๅนถๆ ‘ %s ๅ’Œ %s"
 
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
 msgid "Merging:"
 msgstr "ๅˆๅนถ๏ผš"
 
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "ๅ‘็Žฐ %u ไธชๅ…ฑๅŒ็ฅ–ๅ…ˆ๏ผš"
 msgstr[1] "ๅ‘็Žฐ %u ไธชๅ…ฑๅŒ็ฅ–ๅ…ˆ๏ผš"
 
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
 msgid "merge returned no commit"
 msgstr "ๅˆๅนถๆœช่ฟ”ๅ›žๆไบค"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"ๆ‚จๅฏนไธ‹ๅˆ—ๆ–‡ไปถ็š„ๆœฌๅœฐไฟฎๆ”นๅฐ†่ขซๅˆๅนถๆ“ไฝœ่ฆ†็›–๏ผš\n"
+"  %s"
+
+#: merge-recursive.c:3756
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "ไธ่ƒฝ่งฃๆžๅฏน่ฑก '%s'"
 
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
 msgid "Unable to write index."
 msgstr "ไธ่ƒฝๅ†™ๅ…ฅ็ดขๅผ•ใ€‚"
 
-#: midx.c:69
+#: midx.c:68
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "ๅคšๅŒ…็ดขๅผ•ๆ–‡ไปถ %s ๅคชๅฐ"
 
-#: midx.c:85
+#: midx.c:84
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "ๅคšๅŒ…็ดขๅผ•็ญพๅ 0x%08x ๅ’Œ็ญพๅ 0x%08x ไธๅŒน้…"
 
-#: midx.c:90
+#: midx.c:89
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index ็‰ˆๆœฌ %d ไธ่ƒฝ่ขซ่ฏ†ๅˆซ"
 
-#: midx.c:95
+#: midx.c:94
 #, c-format
 msgid "hash version %u does not match"
 msgstr "ๆ•ฃๅˆ—็‰ˆๆœฌ %u ไธๅŒน้…"
 
-#: midx.c:109
+#: midx.c:108
 msgid "invalid chunk offset (too large)"
 msgstr "ๆ— ๆ•ˆ็š„ๅ—ๅ็งป๏ผˆๅคชๅคง๏ผ‰"
 
-#: midx.c:133
+#: midx.c:132
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr "็ปˆๆญขๅคšๅŒ…็ดขๅผ•ๅ— id ๅ‡บ็Žฐๆ—ถ้—ดๆ—ฉไบŽ้ข„ๆœŸ"
 
-#: midx.c:146
+#: midx.c:145
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "ๅคšๅŒ…็ดขๅผ•็ผบๅฐ‘ๅฟ…้œ€็š„ๅŒ…ๅๅ—"
 
-#: midx.c:148
+#: midx.c:147
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "ๅคšๅŒ…็ดขๅผ•็ผบๅฐ‘ๅฟ…้œ€็š„ๅฏน่ฑก ID ๆ‰‡ๅ‡บๅ—"
 
-#: midx.c:150
+#: midx.c:149
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "ๅคšๅŒ…็ดขๅผ•็ผบๅฐ‘ๅฟ…้œ€็š„ๅฏน่ฑก ID ๆŸฅ่ฏขๅ—"
 
-#: midx.c:152
+#: midx.c:151
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "ๅคšๅŒ…็ดขๅผ•็ผบๅฐ‘ๅฟ…้œ€็š„ๅฏน่ฑกๅ็งปๅ—"
 
-#: midx.c:166
+#: midx.c:165
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "ๅคšๅŒ…็ดขๅผ•ๅŒ…ๅๆ— ๅบ๏ผš'%s' ๅœจ '%s' ไน‹ๅ‰"
 
-#: midx.c:211
+#: midx.c:210
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "้”™็š„ pack-int-id๏ผš%u๏ผˆๅ…ฑๆœ‰ %u ไธชๅŒ…๏ผ‰"
 
-#: midx.c:261
+#: midx.c:260
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "ๅคšๅŒ…็ดขๅผ•ๅญ˜ๅ‚จไธ€ไธช64ไฝๅ็งป๏ผŒไฝ†ๆ˜ฏ off_t ๅคชๅฐ"
 
-#: midx.c:289
+#: midx.c:288
 msgid "error preparing packfile from multi-pack-index"
 msgstr "ไปŽๅคšๅŒ…็ดขๅผ•ๅ‡†ๅค‡ packfile ๅ‡บ้”™"
 
-#: midx.c:470
+#: midx.c:472
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "ๆทปๅŠ ๅŒ…ๆ–‡ไปถ '%s' ๅคฑ่ดฅ"
 
-#: midx.c:476
+#: midx.c:478
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "ๆ‰“ๅผ€ๅŒ…็ดขๅผ• '%s' ๅคฑ่ดฅ"
 
-#: midx.c:536
+#: midx.c:538
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "ๅœจๅŒ…ๆ–‡ไปถไธญๅฎšไฝๅฏน่ฑก %d ๅคฑ่ดฅ"
 
-#: midx.c:865
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "ๆทปๅŠ ๅŒ…ๆ–‡ไปถๅˆฐๅคšๅŒ…็ดขๅผ•"
+
+#: midx.c:875
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "ๆฒกๆœ‰็œ‹ๅˆฐ่ฆไธขๅผƒ็š„ๅŒ…ๆ–‡ไปถ %s"
 
-#: midx.c:1036
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "ๅ†™ๅ…ฅๅ—ๅˆฐๅคšๅŒ…็ดขๅผ•"
+
+#: midx.c:1052
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "ๆธ…็†ไฝไบŽ %s ็š„ๅคšๅŒ…็ดขๅผ•ๅคฑ่ดฅ"
 
-#: midx.c:1091
+#: midx.c:1108
 msgid "Looking for referenced packfiles"
 msgstr "ๆญฃๅœจๆŸฅๆ‰พๅผ•็”จ็š„ๅŒ…ๆ–‡ไปถ"
 
-#: midx.c:1106
+#: midx.c:1123
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr "ๅฏน่ฑก ID ๆ‰‡ๅ‡บๆ— ๅบ๏ผšfanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
-msgstr "ๆญฃๅœจๆ ก้ชŒ MIDX ไธญ็š„ๅฏน่ฑก ID ้กบๅบ"
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
+msgstr "ๆ ก้ชŒๅคšๅŒ…็ดขๅผ•ไธญ็š„ OID ้กบๅบ"
 
-#: midx.c:1119
+#: midx.c:1137
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "ๅฏน่ฑก ID ๆŸฅ่ฏขๆ— ๅบ๏ผšoid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1138
+#: midx.c:1157
 msgid "Sorting objects by packfile"
 msgstr "้€š่ฟ‡ๅŒ…ๆ–‡ไปถไธบๅฏน่ฑกๆŽ’ๅบ"
 
-#: midx.c:1144
+#: midx.c:1164
 msgid "Verifying object offsets"
 msgstr "ๆ ก้ชŒๅฏน่ฑกๅ็งป"
 
-#: midx.c:1160
+#: midx.c:1180
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "ไธบ oid[%d] = %s ๅŠ ่ฝฝๅŒ…ๆก็›ฎๅคฑ่ดฅ"
 
-#: midx.c:1166
+#: midx.c:1186
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "ไธบๅŒ…ๆ–‡ไปถ %s ๅŠ ่ฝฝๅŒ…็ดขๅผ•ๅคฑ่ดฅ"
 
-#: midx.c:1175
+#: midx.c:1195
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "oid[%d] = %s ้”™่ฏฏ็š„ๅฏน่ฑกๅ็งป๏ผš%<PRIx64> != %<PRIx64>"
 
-#: midx.c:1350
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "ๆญฃๅœจๅฏนๅผ•็”จๅฏน่ฑก่ฎกๆ•ฐ"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "ๆญฃๅœจๆŸฅๆ‰พๅ’Œๅˆ ้™คๆœชๅผ•็”จ็š„ๅŒ…ๆ–‡ไปถ"
+
+#: midx.c:1388
 msgid "could not start pack-objects"
 msgstr "ไธ่ƒฝๅผ€ๅง‹ pack-objects"
 
-#: midx.c:1369
+#: midx.c:1407
 msgid "could not finish pack-objects"
 msgstr "ไธ่ƒฝ็ป“ๆŸ pack-objects"
 
-#: name-hash.c:532
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ lazy_dir ็บฟ็จ‹๏ผš%s"
 
-#: name-hash.c:554
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ lazy_name ็บฟ็จ‹๏ผš%s"
 
-#: name-hash.c:560
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "ไธ่ƒฝๅŠ ๅ…ฅ lasy_name ็บฟ็จ‹๏ผš%s"
@@ -4271,32 +4981,32 @@ msgstr "ๆ‹’็ปๅ‘ %s๏ผˆๅœจ refs/notes/ ไน‹ๅค–๏ผ‰ๅ†™ๅ…ฅๆณจ่งฃ"
 msgid "Bad %s value: '%s'"
 msgstr "ๅ็š„ %s ๅ€ผ๏ผš'%s'"
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "ๆ— ๆ•ˆ็š„ๅฏน่ฑก็ฑปๅž‹ \"%s\""
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "ๅฏน่ฑก %s ๆ˜ฏไธ€ไธช %s๏ผŒไธๆ˜ฏไธ€ไธช %s"
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "ๅฏน่ฑก %s ๆœ‰ๆœช็Ÿฅ็š„็ฑปๅž‹ id %d"
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "ไธ่ƒฝ่งฃๆžๅฏน่ฑก๏ผš%s"
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr "ๅ“ˆๅธŒๅ€ผไธŽ %s ไธๅŒน้…"
 
-#: packfile.c:648
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "ๅ็งป้‡ๅœจๅŒ…ๆ–‡ไปถ็ป“ๆŸไน‹ๅ‰๏ผˆๆŸๅ็š„ .idx๏ผŸ๏ผ‰"
 
@@ -4310,6 +5020,11 @@ msgstr "ๅ็งป้‡ๅœจ %s ็š„ๅŒ…็ดขๅผ•ๅผ€ๅง‹ไน‹ๅ‰๏ผˆๆŸๅ็š„็ดขๅผ•๏ผŸ๏ผ‰"
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "ๅ็งป้‡่ถŠ่ฟ‡ไบ† %s ็š„ๅŒ…็ดขๅผ•็š„็ป“ๅฐพ๏ผˆ่ขซๆˆชๆ–ญ็š„็ดขๅผ•๏ผŸ๏ผ‰"
 
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "ๆ— ๆณ•ๅพ—ๅˆฐ %s ็š„ๅคงๅฐ"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4325,7 +5040,7 @@ msgstr "%s ไธŽ %s ไธๅ…ผๅฎน"
 msgid "%s : incompatible with something else"
 msgstr "%s๏ผšๅ’Œๅ…ถๅฎƒ็š„ไธๅ…ผๅฎน"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s ไธๅ–ๅ€ผ"
@@ -4335,41 +5050,41 @@ msgstr "%s ไธๅ–ๅ€ผ"
 msgid "%s isn't available"
 msgstr "%s ไธๅฏ็”จ"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s ๆœŸๆœ›ไธ€ไธช้ž่ดŸๆ•ดๆ•ฐๅ’Œไธ€ไธชๅฏ้€‰็š„ k/m/g ๅŽ็ผ€"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "ๆœ‰ๆญงไน‰็š„้€‰้กน๏ผš%s๏ผˆๅฏไปฅๆ˜ฏ --%s%s ๆˆ– --%s%s๏ผ‰"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr "ไฝ ็š„ๆ„ๆ€ๆ˜ฏ `--%s`๏ผˆๆœ‰ไธคไธช็Ÿญ็บฟ๏ผŸ๏ผ‰"
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "ไฝ ็š„ๆ„ๆ€ๆ˜ฏ `--%s`๏ผˆๆœ‰ไธคไธช็Ÿญ็บฟ๏ผ‰๏ผŸ"
 
-#: parse-options.c:859
+#: parse-options.c:857
 #, c-format
 msgid "unknown option `%s'"
 msgstr "ๆœช็Ÿฅ้€‰้กน `%s'"
 
-#: parse-options.c:861
+#: parse-options.c:859
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "ๆœช็Ÿฅๅผ€ๅ…ณ `%c'"
 
-#: parse-options.c:863
+#: parse-options.c:861
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "ๅญ—็ฌฆไธฒไธญๆœช็Ÿฅ็š„้ž ascii ๅญ—็ฌฆ้€‰้กน๏ผš`%s'"
 
-#: parse-options.c:887
+#: parse-options.c:885
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:906
+#: parse-options.c:904
 #, c-format
 msgid "usage: %s"
 msgstr "็”จๆณ•๏ผš%s"
@@ -4377,22 +5092,22 @@ msgstr "็”จๆณ•๏ผš%s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:910
 #, c-format
 msgid "   or: %s"
 msgstr "  ๆˆ–๏ผš%s"
 
 #  ่ฏ‘่€…๏ผšไธบไฟ่ฏๅœจ่พ“ๅ‡บไธญๅฏน้ฝ๏ผŒๆณจๆ„่ฐƒๆ•ดๅฅไธญ็ฉบๆ ผ๏ผ
-#: parse-options.c:915
+#: parse-options.c:913
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:952
 msgid "-NUM"
 msgstr "-ๆ•ฐๅญ—"
 
-#: parse-options.c:968
+#: parse-options.c:966
 #, c-format
 msgid "alias of --%s"
 msgstr "--%s ็š„ๅˆซๅ"
@@ -4417,82 +5132,87 @@ msgstr "้€‰้กน `%s' ๆœŸๆœ› \"always\"ใ€\"auto\" ๆˆ– \"never\""
 msgid "malformed object name '%s'"
 msgstr "ๆ ผๅผ้”™่ฏฏ็š„ๅฏน่ฑกๅ '%s'"
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "ไธ่ƒฝ่ฎพ็ฝฎ %s ไธบ็ป„ๅฏๅ†™"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "่ฝฌไน‰ๅญ—็ฌฆ '\\' ไธ่ƒฝไฝœไธบๅฑžๆ€งๅ€ผ็š„ๆœ€ๅŽไธ€ไธชๅญ—็ฌฆ"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "ๅชๅ…่ฎธไธ€ไธช 'attr:' ่ง„ๆ ผใ€‚"
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "ๅฑžๆ€ง่ง„ๆ ผไธ่ƒฝไธบ็ฉบ"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "ๆ— ๆ•ˆ็š„ๅฑžๆ€งๅ %s"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "ๅ…จๅฑ€็š„ 'glob' ๅ’Œ 'noglob' ่ทฏๅพ„่ง„ๆ ผ่ฎพ็ฝฎไธๅ…ผๅฎน"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr "ๅ…จๅฑ€็š„ 'literal' ่ทฏๅพ„่ง„ๆ ผ่ฎพ็ฝฎๅ’Œๅ…ถๅฎƒ็š„ๅ…จๅฑ€่ทฏๅพ„่ง„ๆ ผ่ฎพ็ฝฎไธๅ…ผๅฎน"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "่ทฏๅพ„่ง„ๆ ผๅŒ…ๅซๆ— ๆ•ˆ็š„็ฅžๅฅ‡ๅ‰็ผ€"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "ๅœจ่ทฏๅพ„่ง„ๆ ผ '%3$s' ไธญๆ— ๆ•ˆ็š„็ฅžๅฅ‡ๅ‰็ผ€ '%2$.*1$s'"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "่ทฏๅพ„่ง„ๆ ผ '%s' ็š„็ฅžๅฅ‡ๅ‰็ผ€็ป“ๅฐพๅฐ‘ไบ†ไธ€ไธช ')'"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "่ทฏๅพ„่ง„ๆ ผ '%2$s' ไธญๅŒ…ๅซๆœชๅฎž็Žฐ็š„็ฅžๅฅ‡ๅ‰็ผ€ '%1$c'"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s๏ผš'literal' ๅ’Œ 'glob' ไธๅ…ผๅฎน"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s๏ผš'%s' ๅœจไป“ๅบ“ไน‹ๅค–"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s๏ผš'%s' ๅœจไฝไบŽ '%s' ็š„ไป“ๅบ“ไน‹ๅค–"
 
-#: pathspec.c:514
+#: pathspec.c:517
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s'๏ผˆๅŠฉ่ฎฐ็ฌฆ๏ผš'%c'๏ผ‰"
 
-#: pathspec.c:524
+#: pathspec.c:527
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s๏ผš่ทฏๅพ„่ง„ๆ ผ็ฅžๅฅ‡ๅ‰็ผ€ไธ่ขซๆญคๅ‘ฝไปคๆ”ฏๆŒ๏ผš%s"
 
-#: pathspec.c:591
+#: pathspec.c:594
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "่ทฏๅพ„่ง„ๆ ผ '%s' ไฝไบŽ็ฌฆๅท้“พๆŽฅไธญ"
 
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "่กŒ่ขซ้”™่ฏฏๅœฐๅผ•็”จ๏ผš%s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "ๆ— ๆณ•ๅ†™ flush ๅŒ…"
@@ -4553,33 +5273,42 @@ msgstr "ๆญฃๅœจๅˆทๆ–ฐ็ดขๅผ•"
 msgid "unable to create threaded lstat: %s"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบ็บฟ็จ‹ lstat๏ผš%s"
 
-#: pretty.c:966
+#: pretty.c:981
 msgid "unable to parse --pretty format"
 msgstr "ไธ่ƒฝ่งฃๆž --pretty ๆ ผๅผ"
 
-#: range-diff.c:70
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "่ฟœ็จ‹ๆœช่ฎพ็ฝฎ URL"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "promisor ่ฟœ็จ‹ๅ็งฐไธ่ƒฝไปฅ '/' ๅผ€ๅง‹๏ผš%s"
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "ไธ่ƒฝๅฏๅŠจ `log`"
 
-#: range-diff.c:72
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr "ไธ่ƒฝ่ฏปๅ– `log` ็š„่พ“ๅ‡บ"
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:96 sequencer.c:5020
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "ไธ่ƒฝ่งฃๆžๆไบค '%s'"
 
-#: range-diff.c:117
+#: range-diff.c:122
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "ๆ— ๆณ•่งฃๆž git ๅคด '%.*s'"
 
-#: range-diff.c:274
+#: range-diff.c:285
 msgid "failed to generate diff"
 msgstr "็”Ÿๆˆ diff ๅคฑ่ดฅ"
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:518 range-diff.c:520
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "ไธ่ƒฝ่งฃๆž '%s' ็š„ๆ—ฅๅฟ—"
@@ -4618,16 +5347,16 @@ msgstr "ๆ— ๆณ•ๅœจ็ดขๅผ•ไธญๆทปๅŠ  '%s'"
 msgid "unable to stat '%s'"
 msgstr "ๆ— ๆณ•ๅฏน %s ๆ‰ง่กŒ stat"
 
-#: read-cache.c:1314
+#: read-cache.c:1330
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' ็œ‹่ตทๆฅๆ—ขๆ˜ฏๆ–‡ไปถๅˆๆ˜ฏ็›ฎๅฝ•"
 
-#: read-cache.c:1499
+#: read-cache.c:1536
 msgid "Refresh index"
 msgstr "ๅˆทๆ–ฐ็ดขๅผ•"
 
-#: read-cache.c:1613
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4636,7 +5365,7 @@ msgstr ""
 "่ฎพ็ฝฎไบ† index.version๏ผŒไฝ†ๆ˜ฏๅ–ๅ€ผๆ— ๆ•ˆใ€‚\n"
 "ไฝฟ็”จ็‰ˆๆœฌ %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4645,150 +5374,160 @@ msgstr ""
 "่ฎพ็ฝฎไบ† GIT_INDEX_VERSION๏ผŒไฝ†ๆ˜ฏๅ–ๅ€ผๆ— ๆ•ˆใ€‚\n"
 "ไฝฟ็”จ็‰ˆๆœฌ %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1717
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "ๅ็š„็ญพๅ 0x%08x"
 
-#: read-cache.c:1682
+#: read-cache.c:1720
 #, c-format
 msgid "bad index version %d"
 msgstr "ๅ็š„็ดขๅผ•็‰ˆๆœฌ %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1729
 msgid "bad index file sha1 signature"
 msgstr "ๅ็š„็ดขๅผ•ๆ–‡ไปถ sha1 ็ญพๅ"
 
-#: read-cache.c:1721
+#: read-cache.c:1759
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "็ดขๅผ•ไฝฟ็”จไธ่ขซๆ”ฏๆŒ็š„ %.4s ๆ‰ฉๅฑ•"
 
 # 	
-#: read-cache.c:1723
+#: read-cache.c:1761
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ๅฟฝ็•ฅ %.4s ๆ‰ฉๅฑ•"
 
-#: read-cache.c:1760
+#: read-cache.c:1798
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "ๆœช็Ÿฅ็š„็ดขๅผ•ๆก็›ฎๆ ผๅผ 0x%08x"
 
-#: read-cache.c:1776
+#: read-cache.c:1814
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "็ดขๅผ•ไธญ้ ่ฟ‘่ทฏๅพ„ '%s' ๆœ‰้”™่ฏฏ็š„ๅ็งฐๅญ—ๆฎต"
 
-#: read-cache.c:1833
+#: read-cache.c:1871
 msgid "unordered stage entries in index"
 msgstr "็ดขๅผ•ไธญๆœ‰ๆœชๆŽ’ๅบ็š„ๆš‚ๅญ˜ๆก็›ฎ"
 
-#: read-cache.c:1836
+#: read-cache.c:1874
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "ๅˆๅนถๆ–‡ไปถ '%s' ๆœ‰ๅคšไธชๆš‚ๅญ˜ๆก็›ฎ"
 
-#: read-cache.c:1839
+#: read-cache.c:1877
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "'%s' ็š„ๆœชๆŽ’ๅบๆš‚ๅญ˜ๆก็›ฎ"
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "็ดขๅผ•ๆ–‡ไปถๆŸๅ"
 
-#: read-cache.c:2087
+#: read-cache.c:2124
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบ load_cache_entries ็บฟ็จ‹๏ผš%s"
 
-#: read-cache.c:2100
+#: read-cache.c:2137
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "ๆ— ๆณ•ๅŠ ๅ…ฅ load_cache_entries ็บฟ็จ‹๏ผš%s"
 
-#: read-cache.c:2133
+#: read-cache.c:2170
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s๏ผšๆ‰“ๅผ€็ดขๅผ•ๆ–‡ไปถๅคฑ่ดฅ"
 
-#: read-cache.c:2137
+#: read-cache.c:2174
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s๏ผšไธ่ƒฝๅฏนๆ‰“ๅผ€็š„็ดขๅผ•ๆ‰ง่กŒ stat ๆ“ไฝœ"
 
-#: read-cache.c:2141
+#: read-cache.c:2178
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s๏ผš็ดขๅผ•ๆ–‡ไปถๆฏ”้ข„ๆœŸ็š„ๅฐ"
 
-#: read-cache.c:2145
+#: read-cache.c:2182
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s๏ผšๆ— ๆณ•ๅฏน็ดขๅผ•ๆ–‡ไปถๆ‰ง่กŒ map ๆ“ไฝœ"
 
-#: read-cache.c:2187
+#: read-cache.c:2224
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบ load_index_extensions ็บฟ็จ‹๏ผš%s"
 
-#: read-cache.c:2214
+#: read-cache.c:2251
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "ๆ— ๆณ•ๅŠ ๅ…ฅ load_index_extensions ็บฟ็จ‹๏ผš%s"
 
-#: read-cache.c:2246
+#: read-cache.c:2283
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "ๆ— ๆณ•ๅˆทๆ–ฐๅ…ฑไบซ็ดขๅผ• '%s'"
 
-#: read-cache.c:2293
+#: read-cache.c:2330
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "ๆŸๅ็š„็ดขๅผ•๏ผŒๆœŸๆœ›ๅœจ %2$s ไธญ็š„ %1$s๏ผŒๅพ—ๅˆฐ %3$s"
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
 #, c-format
 msgid "could not close '%s'"
 msgstr "ไธ่ƒฝๅ…ณ้—ญ '%s'"
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
 #, c-format
 msgid "could not stat '%s'"
 msgstr "ไธ่ƒฝๅฏน '%s' ่ฐƒ็”จ stat"
 
-#: read-cache.c:3105
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€ git ็›ฎๅฝ•๏ผš%s"
 
-#: read-cache.c:3117
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "ๆ— ๆณ•ๅˆ ้™ค๏ผš%s"
 
-#: read-cache.c:3142
+#: read-cache.c:3179
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "ไธ่ƒฝไฟฎๅค '%s' ็š„ๆƒ้™ไฝ"
 
-#: read-cache.c:3291
+#: read-cache.c:3328
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s๏ผšไธ่ƒฝ่ฝๅˆฐๆš‚ๅญ˜ๅŒบ #0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"ๆ‚จๅฏไปฅ็”จ 'git rebase --edit-todo' ไฟฎๆญฃ๏ผŒ็„ถๅŽๆ‰ง่กŒ 'git rebase --continue'ใ€‚\n"
+"ๆˆ–่€…ๆ‚จๅฏไปฅ็”จ 'git rebase --abort' ็ปˆๆญขๅ˜ๅŸบใ€‚\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr "้€‰้กน rebase.missingCommitsCheck ็š„ๅ€ผ %s ๆ— ๆณ•่ฏ†ๅˆซใ€‚ๅทฒๅฟฝ็•ฅใ€‚"
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4828,14 +5567,14 @@ msgstr ""
 "\n"
 "ๅฏไปฅๅฏน่ฟ™ไบ›่กŒ้‡ๆ–ฐๆŽ’ๅบ๏ผŒๅฐ†ไปŽไธŠ่‡ณไธ‹ๆ‰ง่กŒใ€‚\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "ๅ˜ๅŸบ %s ๅˆฐ %s๏ผˆ%d ไธชๆไบค๏ผ‰"
 msgstr[1] "ๅ˜ๅŸบ %s ๅˆฐ %s๏ผˆ%d ไธชๆไบค๏ผ‰"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -4843,7 +5582,7 @@ msgstr ""
 "\n"
 "ไธ่ฆๅˆ ้™คไปปๆ„ไธ€่กŒใ€‚ไฝฟ็”จ 'drop' ๆ˜พๅผๅœฐๅˆ ้™คไธ€ไธชๆไบคใ€‚\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4851,7 +5590,7 @@ msgstr ""
 "\n"
 "ๅฆ‚ๆžœๆ‚จๅœจ่ฟ™้‡Œๅˆ ้™คไธ€่กŒ๏ผŒๅฏนๅบ”็š„ๆไบคๅฐ†ไผšไธขๅคฑใ€‚\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4865,7 +5604,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4875,22 +5614,19 @@ msgstr ""
 "็„ถ่€Œ๏ผŒๅฆ‚ๆžœๆ‚จๅˆ ้™คๅ…จ้ƒจๅ†…ๅฎน๏ผŒๅ˜ๅŸบๆ“ไฝœๅฐ†ไผš็ปˆๆญขใ€‚\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "ๆณจๆ„็ฉบๆไบคๅทฒ่ขซๆณจ้‡ŠๆŽ‰"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
 #, c-format
 msgid "could not write '%s'"
 msgstr "ไธ่ƒฝๅ†™ๅ…ฅ '%s'"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "ไธ่ƒฝๆ‹ท่ด '%s' ่‡ณ '%s'ใ€‚"
+msgid "could not write '%s'."
+msgstr "ไธ่ƒฝๅ†™ๅ…ฅ '%s'ใ€‚"
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4899,7 +5635,7 @@ msgstr ""
 "่ญฆๅ‘Š๏ผšไธ€ไบ›ๆไบคๅฏ่ƒฝ่ขซๆ„ๅค–ไธขๅผƒใ€‚\n"
 "ไธขๅผƒ็š„ๆไบค๏ผˆไปŽๆ–ฐๅˆฐๆ—ง๏ผ‰๏ผš\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4915,6 +5651,13 @@ msgstr ""
 "ๅฏ้€‰ๅ€ผๆœ‰๏ผšignoreใ€warnใ€errorใ€‚\n"
 "\n"
 
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "ไธ่ƒฝ่ฏปๅ– '%s'ใ€‚"
+
 #: refs.c:262
 #, c-format
 msgid "%s does not point to a valid object!"
@@ -4925,7 +5668,7 @@ msgstr "%s ๆฒกๆœ‰ๆŒ‡ๅ‘ไธ€ไธชๆœ‰ๆ•ˆ็š„ๅฏน่ฑก๏ผ"
 msgid "ignoring dangling symref %s"
 msgstr "ๅฟฝ็•ฅๆ‚ฌ็ฉบ็ฌฆๅทๅผ•็”จ %s"
 
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ๅฟฝ็•ฅๆŸๅ็š„ๅผ•็”จ %s"
@@ -4950,14 +5693,15 @@ msgstr "ๅผ•็”จ '%s' ๅทฒ็ปๅญ˜ๅœจ"
 msgid "unexpected object ID when writing '%s'"
 msgstr "ๅ†™ๅ…ฅ '%s' ๆ—ถๆ„ๅค–็š„ๅฏน่ฑก ID"
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "ไธ่ƒฝๅ†™ๅ…ฅ '%s'"
 
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ '%s' ่ฟ›่กŒๅ†™ๅ…ฅ"
@@ -4992,37 +5736,37 @@ msgstr "ๆ‹’็ปๆ›ดๆ–ฐๆœ‰้”™่ฏฏๅ็งฐ '%s' ็š„ๅผ•็”จ"
 msgid "update_ref failed for ref '%s': %s"
 msgstr "ๅฏนๅผ•็”จ '%s' ๆ‰ง่กŒ update_ref ๅคฑ่ดฅ๏ผš%s"
 
-#: refs.c:2012
+#: refs.c:2023
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "ไธๅ…่ฎธๅฏนๅผ•็”จ '%s' ๅคšๆฌกๆ›ดๆ–ฐ"
 
-#: refs.c:2044
+#: refs.c:2055
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "ๅœจ้š”็ฆป็Žฏๅขƒไธญ็ฆๆญขๆ›ดๆ–ฐๅผ•็”จ"
 
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' ๅทฒๅญ˜ๅœจ๏ผŒๆ— ๆณ•ๅˆ›ๅปบ '%s'"
 
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "ๆ— ๆณ•ๅŒๆ—ถๅค„็† '%s' ๅ’Œ '%s'"
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr "ๆ— ๆณ•ๅˆ ้™คๅผ•็”จ %s"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "ๆ— ๆณ•ๅˆ ้™คๅผ•็”จ %s๏ผš%s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "ๆ— ๆณ•ๅˆ ้™คๅผ•็”จ๏ผš%s"
@@ -5032,7 +5776,7 @@ msgstr "ๆ— ๆณ•ๅˆ ้™คๅผ•็”จ๏ผš%s"
 msgid "invalid refspec '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ๅผ•็”จ่กจ่พพๅผ๏ผš'%s'"
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
 msgid "gone"
 msgstr "ไธขๅคฑ"
 
@@ -5051,280 +5795,280 @@ msgstr "่ฝๅŽ %d"
 msgid "ahead %d, behind %d"
 msgstr "้ข†ๅ…ˆ %d๏ผŒ่ฝๅŽ %d"
 
-#: ref-filter.c:162
+#: ref-filter.c:165
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "ๆœŸๆœ›็š„ๆ ผๅผ๏ผš%%(color:<้ขœ่‰ฒ>)"
 
-#: ref-filter.c:164
+#: ref-filter.c:167
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„้ขœ่‰ฒ๏ผš%%(color:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:189
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "ๆœŸๆœ›ๆ•ดๆ•ฐๅ€ผ refname:lstrip=%s"
 
-#: ref-filter.c:190
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "ๆœŸๆœ›ๆ•ดๆ•ฐๅ€ผ refname:rstrip=%s"
 
-#: ref-filter.c:192
+#: ref-filter.c:195
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ %%(%s) ๅ‚ๆ•ฐ๏ผš%s"
 
-#: ref-filter.c:247
+#: ref-filter.c:250
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) ไธๅธฆๅ‚ๆ•ฐ"
 
-#: ref-filter.c:269
+#: ref-filter.c:272
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ %%(objectsize) ๅ‚ๆ•ฐ๏ผš%s"
 
-#: ref-filter.c:277
+#: ref-filter.c:280
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) ไธๅธฆๅ‚ๆ•ฐ"
 
-#: ref-filter.c:289
+#: ref-filter.c:292
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) ไธๅธฆๅ‚ๆ•ฐ"
 
-#: ref-filter.c:298
+#: ref-filter.c:301
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) ไธๅธฆๅ‚ๆ•ฐ"
 
-#: ref-filter.c:320
+#: ref-filter.c:323
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "ๆœช็Ÿฅ็š„ %%(trailers) ๅ‚ๆ•ฐ๏ผš%s"
 
-#: ref-filter.c:349
+#: ref-filter.c:352
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "ๆœŸๆœ›ไธ€ไธชๆญฃๆ•ฐ contents:lines=%s"
 
-#: ref-filter.c:351
+#: ref-filter.c:354
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ %%(contents) ๅ‚ๆ•ฐ๏ผš%s"
 
-#: ref-filter.c:366
+#: ref-filter.c:369
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "ๆœŸๆœ›ไธ€ไธชๆญฃๆ•ฐ objectname:short=%s"
 
-#: ref-filter.c:370
+#: ref-filter.c:373
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ %%(objectname) ๅ‚ๆ•ฐ๏ผš%s"
 
-#: ref-filter.c:400
+#: ref-filter.c:403
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "ๆœŸๆœ›็š„ๆ ผๅผ๏ผš%%(align:<ๅฎฝๅบฆ>,<ไฝ็ฝฎ>)"
 
-#: ref-filter.c:412
+#: ref-filter.c:415
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ไฝ็ฝฎ๏ผš%s"
 
-#: ref-filter.c:419
+#: ref-filter.c:422
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ๅฎฝๅบฆ๏ผš%s"
 
-#: ref-filter.c:428
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ %%(align) ๅ‚ๆ•ฐ๏ผš%s"
 
-#: ref-filter.c:436
+#: ref-filter.c:439
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "ๅ…ƒ็ด  %%(align) ้œ€่ฆไธ€ไธชๆญฃๆ•ฐ็š„ๅฎฝๅบฆ"
 
-#: ref-filter.c:454
+#: ref-filter.c:457
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ %%(if) ๅ‚ๆ•ฐ๏ผš%s"
 
-#: ref-filter.c:556
+#: ref-filter.c:559
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "ๆ ผๅผ้”™่ฏฏ็š„ๅญ—ๆฎตๅ๏ผš%.*s"
 
-#: ref-filter.c:583
+#: ref-filter.c:586
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "ๆœช็Ÿฅ็š„ๅญ—ๆฎตๅ๏ผš%.*s"
 
-#: ref-filter.c:587
+#: ref-filter.c:590
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "ไธๆ˜ฏไธ€ไธช git ไป“ๅบ“๏ผŒไฝ†ๆ˜ฏๅญ—ๆฎต '%.*s' ้œ€่ฆ่ฎฟ้—ฎๅฏน่ฑกๆ•ฐๆฎ"
 
-#: ref-filter.c:711
+#: ref-filter.c:714
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(if) ๅ…ƒ็ด ่€Œๆฒกๆœ‰ %%(then) ๅ…ƒ็ด "
 
-#: ref-filter.c:774
+#: ref-filter.c:777
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(then) ๅ…ƒ็ด ่€Œๆฒกๆœ‰ %%(if) ๅ…ƒ็ด "
 
-#: ref-filter.c:776
+#: ref-filter.c:779
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "ๆ ผๅผ๏ผš%%(then) ๅ…ƒ็ด ็”จไบ†ๅคšๆฌก"
 
-#: ref-filter.c:778
+#: ref-filter.c:781
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "ๆ ผๅผ๏ผš%%(then) ๅ…ƒ็ด ็”จๅœจไบ† %%(else) ไน‹ๅŽ"
 
-#: ref-filter.c:806
+#: ref-filter.c:809
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(else) ๅ…ƒ็ด ่€Œๆฒกๆœ‰ %%(if) ๅ…ƒ็ด "
 
-#: ref-filter.c:808
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(else) ๅ…ƒ็ด ่€Œๆฒกๆœ‰ %%(then) ๅ…ƒ็ด "
 
-#: ref-filter.c:810
+#: ref-filter.c:813
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "ๆ ผๅผ๏ผš%%(else) ๅ…ƒ็ด ็”จไบ†ๅคšๆฌก"
 
-#: ref-filter.c:825
+#: ref-filter.c:828
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(end) ๅ…ƒ็ด ๅดๆฒกๆœ‰ๅฎƒ็š„ๅฏนๅบ”ๅ…ƒ็ด "
 
-#: ref-filter.c:882
+#: ref-filter.c:885
 #, c-format
 msgid "malformed format string %s"
 msgstr "้”™่ฏฏ็š„ๆ ผๅผๅŒ–ๅญ—็ฌฆไธฒ %s"
 
-#: ref-filter.c:1485
+#: ref-filter.c:1488
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr "้žๅˆ†ๆ”ฏ๏ผŒๆญฃๅ˜ๅŸบ %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1491
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr "้žๅˆ†ๆ”ฏ๏ผŒๆญฃๅ˜ๅŸบๅˆ†็ฆปๅคดๆŒ‡้’ˆ %s"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1494
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr "้žๅˆ†ๆ”ฏ๏ผŒไบŒๅˆ†ๆŸฅๆ‰พๅผ€ๅง‹ไบŽ %s"
 
-#: ref-filter.c:1501
+#: ref-filter.c:1504
 msgid "no branch"
 msgstr "้žๅˆ†ๆ”ฏ"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
 #, c-format
 msgid "missing object %s for %s"
 msgstr "็ผบๅคฑ %2$s ็š„ๅฏน่ฑก %1$s"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1550
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer ๅคฑ่ดฅไบŽ %2$s ็š„ %1$s"
 
-#: ref-filter.c:1998
+#: ref-filter.c:2004
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "ๆ ผๅผ้”™่ฏฏ็š„ๅฏน่ฑก '%s'"
 
-#: ref-filter.c:2087
+#: ref-filter.c:2093
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ๅฟฝ็•ฅๅธฆๆœ‰้”™่ฏฏๅ็งฐ %s ็š„ๅผ•็”จ"
 
-#: ref-filter.c:2382
+#: ref-filter.c:2389
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "ๆ ผๅผ๏ผš็ผบๅฐ‘ %%(end) ๅ…ƒ็ด "
 
-#: ref-filter.c:2482
+#: ref-filter.c:2489
 #, c-format
 msgid "option `%s' is incompatible with --merged"
 msgstr "้€‰้กน `%s' ๅ’Œ --merged ไธๅ…ผๅฎน"
 
-#: ref-filter.c:2485
+#: ref-filter.c:2492
 #, c-format
 msgid "option `%s' is incompatible with --no-merged"
 msgstr "้€‰้กน `%s' ๅ’Œ --no-merged ไธๅ…ผๅฎน"
 
-#: ref-filter.c:2495
+#: ref-filter.c:2502
 #, c-format
 msgid "malformed object name %s"
 msgstr "ๆ ผๅผ้”™่ฏฏ็š„ๅฏน่ฑกๅ %s"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2507
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "้€‰้กน `%s' ๅฟ…้กปๆŒ‡ๅ‘ไธ€ไธชๆไบค"
 
-#: remote.c:363
+#: remote.c:366
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "้…็ฝฎ็š„่ฟœ็จ‹็Ÿญๅ็งฐไธ่ƒฝไปฅ '/' ๅผ€ๅง‹๏ผš%s"
 
-#: remote.c:410
+#: remote.c:414
 msgid "more than one receivepack given, using the first"
 msgstr "ๆไพ›ไบ†ไธ€ไธชไปฅไธŠ็š„ receivepack๏ผŒไฝฟ็”จ็ฌฌไธ€ไธช"
 
-#: remote.c:418
+#: remote.c:422
 msgid "more than one uploadpack given, using the first"
 msgstr "ๆไพ›ไบ†ไธ€ไธชไปฅไธŠ็š„ uploadpack๏ผŒไฝฟ็”จ็ฌฌไธ€ไธช"
 
-#: remote.c:608
+#: remote.c:612
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "ไธ่ƒฝๅŒๆ—ถ่Žทๅ– %s ๅ’Œ %s ่‡ณ %s"
 
-#: remote.c:612
+#: remote.c:616
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s ้€šๅธธ่ทŸ่ธช %s๏ผŒ่€Œ้ž %s"
 
-#: remote.c:616
+#: remote.c:620
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s ๅŒๆ—ถ่ทŸ่ธช %s ๅ’Œ %s"
 
-#: remote.c:684
+#: remote.c:688
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "ๆจกๅผ็š„้”ฎ '%s' ๆฒกๆœ‰ '*'"
 
-#: remote.c:694
+#: remote.c:698
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "ๆจกๅผ็š„ๅ€ผ '%s' ๆฒกๆœ‰ '*'"
 
-#: remote.c:1000
+#: remote.c:1004
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "ๆบๅผ•็”จ่กจ่พพๅผ %s ๆฒกๆœ‰ๅŒน้…"
 
-#: remote.c:1005
+#: remote.c:1009
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "ๆบๅผ•็”จ่กจ่พพๅผ %s ๅŒน้…่ถ…่ฟ‡ไธ€ไธช"
@@ -5333,7 +6077,7 @@ msgstr "ๆบๅผ•็”จ่กจ่พพๅผ %s ๅŒน้…่ถ…่ฟ‡ไธ€ไธช"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1020
+#: remote.c:1024
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5355,7 +6099,7 @@ msgstr ""
 "\n"
 "้ƒฝไธ่กŒ๏ผŒๆ‰€ไปฅๆˆ‘ไปฌๅทฒๆ”พๅผƒใ€‚ๆ‚จๅฟ…้กป็ป™ๅ‡บๅฎŒๆ•ด็š„ๅผ•็”จใ€‚"
 
-#: remote.c:1040
+#: remote.c:1044
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5365,7 +6109,7 @@ msgstr ""
 "ๅผ•็”จ่กจ่พพๅผ็š„ <src> ๆ˜ฏไธ€ไธชๆไบคๅฏน่ฑกใ€‚ๆ‚จๆ˜ฏๆƒณๅˆ›ๅปบไธ€ไธชๆ–ฐ็š„ๅˆ†ๆ”ฏ่€Œๅ‘\n"
 "'%s:refs/heads/%s' ๆŽจ้€ไนˆ๏ผŸ"
 
-#: remote.c:1045
+#: remote.c:1049
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5375,7 +6119,7 @@ msgstr ""
 "ๅผ•็”จ่กจ่พพๅผ็š„ <src> ๆ˜ฏไธ€ไธชๆ ‡็ญพๅฏน่ฑกใ€‚ๆ‚จๆ˜ฏๆƒณๅˆ›ๅปบไธ€ไธชๆ–ฐ็š„ๆ ‡็ญพ่€Œๅ‘\n"
 "'%s:refs/tags/%s' ๆŽจ้€ไนˆ๏ผŸ"
 
-#: remote.c:1050
+#: remote.c:1054
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5385,7 +6129,7 @@ msgstr ""
 "ๅผ•็”จ่กจ่พพๅผ็š„ <src> ๆ˜ฏไธ€ไธชๆ ‘ๅฏน่ฑกใ€‚ๆ‚จๆ˜ฏๆƒณไธบ่ฟ™ไธชๆ ‘ๅฏน่ฑกๅˆ›ๅปบๆ ‡็ญพ่€Œๅ‘\n"
 "'%s:refs/tags/%s' ๆŽจ้€ไนˆ๏ผŸ"
 
-#: remote.c:1055
+#: remote.c:1059
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5395,114 +6139,114 @@ msgstr ""
 "ๅผ•็”จ่กจ่พพๅผ็š„ <src> ๆ˜ฏไธ€ไธชๆ•ฐๆฎๅฏน่ฑกใ€‚ๆ‚จๆ˜ฏๆƒณไธบ่ฟ™ไธชๆ•ฐๆฎๅฏน่ฑกๅˆ›ๅปบๆ ‡็ญพ่€Œๅ‘\n"
 "'%s:refs/tags/%s' ๆŽจ้€ไนˆ๏ผŸ"
 
-#: remote.c:1091
+#: remote.c:1095
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s ๆ— ๆณ•่ขซ่งฃๆžไธบๅˆ†ๆ”ฏ"
 
-#: remote.c:1102
+#: remote.c:1106
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "ๆ— ๆณ•ๅˆ ้™ค '%s'๏ผš่ฟœ็จ‹ๅผ•็”จไธๅญ˜ๅœจ"
 
-#: remote.c:1114
+#: remote.c:1118
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "็›ฎๆ ‡ๅผ•็”จ่กจ่พพๅผ %s ๅŒน้…่ถ…่ฟ‡ไธ€ไธช"
 
-#: remote.c:1121
+#: remote.c:1125
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "็›ฎๆ ‡ๅผ•็”จ %s ๆŽฅๆ”ถ่ถ…่ฟ‡ไธ€ไธชๆบ"
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1628 remote.c:1729
 msgid "HEAD does not point to a branch"
 msgstr "HEAD ๆฒกๆœ‰ๆŒ‡ๅ‘ไธ€ไธชๅˆ†ๆ”ฏ"
 
-#: remote.c:1633
+#: remote.c:1637
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "ๆฒกๆœ‰ๆญคๅˆ†ๆ”ฏ๏ผš'%s'"
 
-#: remote.c:1636
+#: remote.c:1640
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "ๅฐšๆœช็ป™ๅˆ†ๆ”ฏ '%s' ่ฎพ็ฝฎไธŠๆธธ"
 
-#: remote.c:1642
+#: remote.c:1646
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "ไธŠๆธธๅˆ†ๆ”ฏ '%s' ๆฒกๆœ‰ๅญ˜ๅ‚จไธบไธ€ไธช่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏ"
 
-#: remote.c:1657
+#: remote.c:1661
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "ๆŽจ้€็›ฎๆ ‡ '%s' ่‡ณ่ฟœ็จ‹ '%s' ๆฒกๆœ‰ๆœฌๅœฐ่ทŸ่ธชๅˆ†ๆ”ฏ"
 
-#: remote.c:1669
+#: remote.c:1673
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "ๅˆ†ๆ”ฏ '%s' ๆฒกๆœ‰่ฎพ็ฝฎ่ฆๆŽจ้€็š„่ฟœ็จ‹ๆœๅŠกๅ™จ"
 
-#: remote.c:1679
+#: remote.c:1683
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "ๅ‘ '%s' ๆŽจ้€ๅผ•็”จ่ง„ๆ ผๆœชๅŒ…ๅซ '%s'"
 
-#: remote.c:1692
+#: remote.c:1696
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "ๆŽจ้€ๆ— ็›ฎๆ ‡๏ผˆpush.default ๆ˜ฏ 'nothing'๏ผ‰"
 
-#: remote.c:1714
+#: remote.c:1718
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "ๆ— ๆณ•่งฃๆž 'simple' ๆŽจ้€่‡ณไธ€ไธชๅ•็‹ฌ็š„็›ฎๆ ‡"
 
-#: remote.c:1840
+#: remote.c:1844
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐ่ฟœ็จ‹ๅผ•็”จ %s"
 
-#: remote.c:1853
+#: remote.c:1857
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* ๅœจๆœฌๅœฐๅฟฝ็•ฅๅฏ็ฌ‘็š„ๅผ•็”จ '%s'"
 
-#: remote.c:2016
+#: remote.c:2020
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "ๆ‚จ็š„ๅˆ†ๆ”ฏๅŸบไบŽ '%s'๏ผŒไฝ†ๆญคไธŠๆธธๅˆ†ๆ”ฏๅทฒ็ปไธๅญ˜ๅœจใ€‚\n"
 
-#: remote.c:2020
+#: remote.c:2024
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  ๏ผˆไฝฟ็”จ \"git branch --unset-upstream\" ๆฅไฟฎๅค๏ผ‰\n"
 
-#: remote.c:2023
+#: remote.c:2027
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "ๆ‚จ็š„ๅˆ†ๆ”ฏไธŽไธŠๆธธๅˆ†ๆ”ฏ '%s' ไธ€่‡ดใ€‚\n"
 
-#: remote.c:2027
+#: remote.c:2031
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "ๆ‚จ็š„ๅˆ†ๆ”ฏๅ’Œ '%s' ๆŒ‡ๅ‘ไธๅŒ็š„ๆไบคใ€‚\n"
 
-#: remote.c:2030
+#: remote.c:2034
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  ๏ผˆไฝฟ็”จ \"%s\" ๆŸฅ็œ‹่ฏฆๆƒ…๏ผ‰\n"
 
-#: remote.c:2034
+#: remote.c:2038
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "ๆ‚จ็š„ๅˆ†ๆ”ฏ้ข†ๅ…ˆ '%s' ๅ…ฑ %d ไธชๆไบคใ€‚\n"
 msgstr[1] "ๆ‚จ็š„ๅˆ†ๆ”ฏ้ข†ๅ…ˆ '%s' ๅ…ฑ %d ไธชๆไบคใ€‚\n"
 
-#: remote.c:2040
+#: remote.c:2044
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  ๏ผˆไฝฟ็”จ \"git push\" ๆฅๅ‘ๅธƒๆ‚จ็š„ๆœฌๅœฐๆไบค๏ผ‰\n"
 
-#: remote.c:2043
+#: remote.c:2047
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5511,11 +6255,11 @@ msgstr[0] "ๆ‚จ็š„ๅˆ†ๆ”ฏ่ฝๅŽ '%s' ๅ…ฑ %d ไธชๆไบค๏ผŒๅนถไธ”ๅฏไปฅๅฟซ่ฟ›ใ€‚\n"
 msgstr[1] "ๆ‚จ็š„ๅˆ†ๆ”ฏ่ฝๅŽ '%s' ๅ…ฑ %d ไธชๆไบค๏ผŒๅนถไธ”ๅฏไปฅๅฟซ่ฟ›ใ€‚\n"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: remote.c:2051
+#: remote.c:2055
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  ๏ผˆไฝฟ็”จ \"git pull\" ๆฅๆ›ดๆ–ฐๆ‚จ็š„ๆœฌๅœฐๅˆ†ๆ”ฏ๏ผ‰\n"
 
-#: remote.c:2054
+#: remote.c:2058
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5531,11 +6275,11 @@ msgstr[1] ""
 "ๅนถไธ”ๅˆ†ๅˆซๆœ‰ %d ๅ’Œ %d ๅค„ไธๅŒ็š„ๆไบคใ€‚\n"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: remote.c:2064
+#: remote.c:2068
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  ๏ผˆไฝฟ็”จ \"git pull\" ๆฅๅˆๅนถ่ฟœ็จ‹ๅˆ†ๆ”ฏ๏ผ‰\n"
 
-#: remote.c:2247
+#: remote.c:2251
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "ๆ— ๆณ•่งฃๆžๆœŸๆœ›็š„ๅฏน่ฑกๅ '%s'"
@@ -5550,7 +6294,7 @@ msgstr "้”™่ฏฏ็š„ๆ›ฟๆขๅผ•็”จๅ็งฐ๏ผš%s"
 msgid "duplicate replace ref: %s"
 msgstr "้‡ๅค็š„ๆ›ฟๆขๅผ•็”จ๏ผš%s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "ๅฏน่ฑก %s ็š„ๆ›ฟๆขๅฑ‚็บงๅคชๆทฑ"
@@ -5613,8 +6357,8 @@ msgstr "ไธ่ƒฝๅˆ ้™ค stray '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "ไธบ '%s' ่ฎฐๅฝ• preimage"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ็›ฎๅฝ• '%s'"
@@ -5648,20 +6392,20 @@ msgstr "ๅฟ˜่ฎฐ '%s' ็š„่งฃๅ†ณๆ–นๆกˆ\n"
 msgid "unable to open rr-cache directory"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€ rr-cache ็›ฎๅฝ•"
 
-#: revision.c:2507
+#: revision.c:2497
 msgid "your current branch appears to be broken"
 msgstr "ๆ‚จ็š„ๅฝ“ๅ‰ๅˆ†ๆ”ฏๅฅฝๅƒ่ขซๆŸๅ"
 
-#: revision.c:2510
+#: revision.c:2500
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "ๆ‚จ็š„ๅฝ“ๅ‰ๅˆ†ๆ”ฏ '%s' ๅฐšๆ— ไปปไฝ•ๆไบค"
 
-#: revision.c:2710
+#: revision.c:2708
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent ไธŽ --bisect ไธๅ…ผๅฎน"
 
-#: revision.c:2714
+#: revision.c:2712
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L ๅฐšไธๆ”ฏๆŒ -p ๅ’Œ -s ไน‹ๅค–็š„ๅทฎๅผ‚ๆ ผๅผ"
 
@@ -5683,75 +6427,75 @@ msgstr ""
 "ๅ› ไธบๆฒกๆœ‰ๅฐ†้’ฉๅญ '%s' ่ฎพ็ฝฎไธบๅฏๆ‰ง่กŒ๏ผŒ้’ฉๅญ่ขซๅฟฝ็•ฅใ€‚ๆ‚จๅฏไปฅ้€š่ฟ‡\n"
 "้…็ฝฎ `git config advice.ignoredHook false` ๆฅๅ…ณ้—ญ่ฟ™ๆก่ญฆๅ‘Šใ€‚"
 
-#: send-pack.c:141
+#: send-pack.c:144
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "่ฏปๅ–่ฟœ็จ‹่งฃๅŒ…็Šถๆ€ๆ—ถๆ”ถๅˆฐๆ„ๅค–็š„ flush ๅŒ…"
 
-#: send-pack.c:143
+#: send-pack.c:146
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "ไธ่ƒฝ่งฃๆž่ฟœ็จ‹่งฃๅŒ…็Šถๆ€๏ผš%s"
 
-#: send-pack.c:145
+#: send-pack.c:148
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "่ฟœ็จ‹่งฃๅŒ…ๅคฑ่ดฅ๏ผš%s"
 
-#: send-pack.c:306
+#: send-pack.c:309
 msgid "failed to sign the push certificate"
 msgstr "ไธบๆŽจ้€่ฏไนฆ็ญพๅๅคฑ่ดฅ"
 
-#: send-pack.c:420
+#: send-pack.c:423
 msgid "the receiving end does not support --signed push"
 msgstr "ๆŽฅๆ”ถ็ซฏไธๆ”ฏๆŒ็ญพๅๆŽจ้€"
 
-#: send-pack.c:422
+#: send-pack.c:425
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr "ๆœชๅ‘้€ๆŽจ้€่ฏไนฆ๏ผŒๅ› ไธบๆŽฅๆ”ถ็ซฏไธๆ”ฏๆŒ็ญพๅๆŽจ้€"
 
-#: send-pack.c:434
+#: send-pack.c:437
 msgid "the receiving end does not support --atomic push"
 msgstr "ๆŽฅๆ”ถ็ซฏไธๆ”ฏๆŒๅŽŸๅญๆŽจ้€"
 
-#: send-pack.c:439
+#: send-pack.c:442
 msgid "the receiving end does not support push options"
 msgstr "ๆŽฅๆ”ถ็ซฏไธๆ”ฏๆŒๆŽจ้€้€‰้กน"
 
-#: sequencer.c:187
+#: sequencer.c:191
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ๆไบคไฟกๆฏๆธ…็†ๆจกๅผ '%s'"
 
-#: sequencer.c:292
+#: sequencer.c:296
 #, c-format
 msgid "could not delete '%s'"
 msgstr "ๆ— ๆณ•ๅˆ ้™ค '%s'"
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "ๆ— ๆณ•ๅˆ ้™ค '%s'"
 
-#: sequencer.c:321
+#: sequencer.c:325
 msgid "revert"
 msgstr "่ฟ˜ๅŽŸ"
 
-#: sequencer.c:323
+#: sequencer.c:327
 msgid "cherry-pick"
 msgstr "ๆ‹ฃ้€‰"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:329
+msgid "rebase"
+msgstr "ๅ˜ๅŸบ"
 
-#: sequencer.c:327
+#: sequencer.c:331
 #, c-format
 msgid "unknown action: %d"
 msgstr "ๆœช็ŸฅๅŠจไฝœ๏ผš%d"
 
-#: sequencer.c:385
+#: sequencer.c:389
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5759,7 +6503,7 @@ msgstr ""
 "ๅ†ฒ็ช่งฃๅ†ณๅฎŒๆฏ•ๅŽ๏ผŒ็”จ 'git add <่ทฏๅพ„>' ๆˆ– 'git rm <่ทฏๅพ„>'\n"
 "ๅ‘ฝไปคๆ ‡่ฎฐไฟฎๆญฃๅŽ็š„ๆ–‡ไปถ"
 
-#: sequencer.c:388
+#: sequencer.c:392
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5768,115 +6512,110 @@ msgstr ""
 "ๅ†ฒ็ช่งฃๅ†ณๅฎŒๆฏ•ๅŽ๏ผŒ็”จ 'git add <่ทฏๅพ„>' ๆˆ– 'git rm <่ทฏๅพ„>'\n"
 "ๅฏนไฟฎๆญฃๅŽ็š„ๆ–‡ไปถๅšๆ ‡่ฎฐ๏ผŒ็„ถๅŽ็”จ 'git commit' ๆไบค"
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:405 sequencer.c:2901
 #, c-format
 msgid "could not lock '%s'"
 msgstr "ไธ่ƒฝ้”ๅฎš '%s'"
 
-#: sequencer.c:408
+#: sequencer.c:412
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "ไธ่ƒฝๅฐ†ๆข่กŒ็ฌฆๅ†™ๅ…ฅ '%s'"
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "ๆ— ๆณ•ๅฎŒๆˆ '%s'"
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
 #, c-format
 msgid "could not read '%s'"
 msgstr "ไธ่ƒฝ่ฏปๅ– '%s'"
 
-#: sequencer.c:462
+#: sequencer.c:466
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "ๆ‚จ็š„ๆœฌๅœฐไฟฎๆ”นๅฐ†่ขซ%s่ฆ†็›–ใ€‚"
 
-#: sequencer.c:466
+#: sequencer.c:470
 msgid "commit your changes or stash them to proceed."
 msgstr "ๆไบคๆ‚จ็š„ไฟฎๆ”นๆˆ–่ดฎ่—ๅŽๅ†็ปง็ปญใ€‚"
 
-#: sequencer.c:498
+#: sequencer.c:502
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s๏ผšๅฟซ่ฟ›"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "ๆ— ๆ•ˆ็š„ๆธ…็†ๆจกๅผ %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:635
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s๏ผšๆ— ๆณ•ๅ†™ๅ…ฅๆ–ฐ็ดขๅผ•ๆ–‡ไปถ"
 
-#: sequencer.c:649
+#: sequencer.c:652
 msgid "unable to update cache tree"
 msgstr "ไธ่ƒฝๆ›ดๆ–ฐ็ผ“ๅญ˜ๆ ‘"
 
-#: sequencer.c:663
+#: sequencer.c:666
 msgid "could not resolve HEAD commit"
 msgstr "ไธ่ƒฝ่งฃๆž HEAD ๆไบค"
 
-#: sequencer.c:743
+#: sequencer.c:746
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "ๅœจ '%.*s' ไธญๆฒกๆœ‰ key"
 
-#: sequencer.c:754
+#: sequencer.c:757
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "ๆ— ๆณ•ไธบ '%s' ็š„ๅ€ผๅŽปๅผ•ๅท"
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ '%s' ่ฟ›่กŒ่ฏปๅ–"
 
-#: sequencer.c:801
+#: sequencer.c:804
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "ๅทฒ็ป็ป™ๅ‡บ 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:806
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "ๅทฒ็ป็ป™ๅ‡บ 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:811
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "ๅทฒ็ป็ป™ๅ‡บ 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:815
+#: sequencer.c:818
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "ๆœช็Ÿฅๅ˜้‡ '%s'"
 
-#: sequencer.c:820
+#: sequencer.c:823
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "็ผบๅฐ‘ 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:822
+#: sequencer.c:825
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "็ผบๅฐ‘ 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:824
+#: sequencer.c:827
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "็ผบๅฐ‘ 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "'%2$s' ไธญๆ— ๆ•ˆ็š„ๆ—ฅๆœŸๆ ผๅผ '%1$s'"
-
-#: sequencer.c:901
+#: sequencer.c:876
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5905,15 +6644,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr "ๅ†™ๆ นๆไบค"
-
-#: sequencer.c:1216
+#: sequencer.c:1148
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' ้’ฉๅญๅคฑ่ดฅ"
 
-#: sequencer.c:1223
+#: sequencer.c:1154
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5937,7 +6672,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: sequencer.c:1167
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5960,326 +6695,325 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1209
 msgid "couldn't look up newly created commit"
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐๆ–ฐๅˆ›ๅปบ็š„ๆไบค"
 
-#: sequencer.c:1280
+#: sequencer.c:1211
 msgid "could not parse newly created commit"
 msgstr "ไธ่ƒฝ่งฃๆžๆ–ฐๅˆ›ๅปบ็š„ๆไบค"
 
-#: sequencer.c:1326
+#: sequencer.c:1257
 msgid "unable to resolve HEAD after creating commit"
 msgstr "ๅˆ›ๅปบๆไบคๅŽ๏ผŒไธ่ƒฝ่งฃๆž HEAD"
 
-#: sequencer.c:1328
+#: sequencer.c:1259
 msgid "detached HEAD"
 msgstr "ๅˆ†็ฆปๅคดๆŒ‡้’ˆ"
 
 #  ่ฏ‘่€…๏ผšไธญๆ–‡ๅญ—็ฌฆไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆ ้™คๅ‰ๅฏผ็ฉบๆ ผ
-#: sequencer.c:1332
+#: sequencer.c:1263
 msgid " (root-commit)"
 msgstr "๏ผˆๆ นๆไบค๏ผ‰"
 
-#: sequencer.c:1353
+#: sequencer.c:1284
 msgid "could not parse HEAD"
 msgstr "ไธ่ƒฝ่งฃๆž HEAD"
 
-#: sequencer.c:1355
+#: sequencer.c:1286
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s ไธๆ˜ฏไธ€ไธชๆไบค๏ผ"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
 msgid "could not parse HEAD commit"
 msgstr "ไธ่ƒฝ่งฃๆž HEAD ๆไบค"
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1342 sequencer.c:1968
 msgid "unable to parse commit author"
 msgstr "ไธ่ƒฝ่งฃๆžๆไบคไฝœ่€…"
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree ๆ— ๆณ•ๅ†™ๅ…ฅๆ ‘ๅฏน่ฑก"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1386 sequencer.c:1447
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "ไธ่ƒฝไปŽ '%s' ่ฏปๅ–ๆไบค่ฏดๆ˜Ž"
 
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
 msgid "failed to write commit object"
 msgstr "ๅ†™ๆไบคๅฏน่ฑกๅคฑ่ดฅ"
 
-#: sequencer.c:1526
+#: sequencer.c:1474
 #, c-format
 msgid "could not parse commit %s"
 msgstr "ไธ่ƒฝ่งฃๆžๆไบค %s"
 
-#: sequencer.c:1531
+#: sequencer.c:1479
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "ไธ่ƒฝ่งฃๆž็ˆถๆไบค %s"
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1562 sequencer.c:1673
 #, c-format
 msgid "unknown command: %d"
 msgstr "ๆœช็Ÿฅๅ‘ฝไปค๏ผš%d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1620 sequencer.c:1645
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "่ฟ™ๆ˜ฏไธ€ไธช %d ไธชๆไบค็š„็ป„ๅˆใ€‚"
 
-#: sequencer.c:1672
+#: sequencer.c:1630
 msgid "need a HEAD to fixup"
 msgstr "้œ€่ฆไธ€ไธช HEAD ๆฅไฟฎๅค"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1632 sequencer.c:3212
 msgid "could not read HEAD"
 msgstr "ไธ่ƒฝ่ฏปๅ– HEAD"
 
-#: sequencer.c:1676
+#: sequencer.c:1634
 msgid "could not read HEAD's commit message"
 msgstr "ไธ่ƒฝ่ฏปๅ– HEAD ็š„ๆไบค่ฏดๆ˜Ž"
 
-#: sequencer.c:1682
+#: sequencer.c:1640
 #, c-format
 msgid "cannot write '%s'"
 msgstr "ไธ่ƒฝๅ†™ '%s'"
 
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "่ฟ™ๆ˜ฏ็ฌฌไธ€ไธชๆไบค่ฏดๆ˜Ž๏ผš"
 
-#: sequencer.c:1697
+#: sequencer.c:1655
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "ไธ่ƒฝ่ฏปๅ– %s ็š„ๆไบค่ฏดๆ˜Ž"
 
-#: sequencer.c:1704
+#: sequencer.c:1662
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "่ฟ™ๆ˜ฏๆไบค่ฏดๆ˜Ž #%d๏ผš"
 
-#: sequencer.c:1710
+#: sequencer.c:1668
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "ๆไบค่ฏดๆ˜Ž #%d ๅฐ†่ขซ่ทณ่ฟ‡๏ผš"
 
-#: sequencer.c:1798
+#: sequencer.c:1756
 msgid "your index file is unmerged."
 msgstr "ๆ‚จ็š„็ดขๅผ•ๆ–‡ไปถๆœชๅฎŒๆˆๅˆๅนถใ€‚"
 
-#: sequencer.c:1805
+#: sequencer.c:1763
 msgid "cannot fixup root commit"
 msgstr "ไธ่ƒฝไฟฎๅคๆ นๆไบค"
 
-#: sequencer.c:1824
+#: sequencer.c:1782
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "ๆไบค %s ๆ˜ฏไธ€ไธชๅˆๅนถๆไบคไฝ†ๆœชๆไพ› -m ้€‰้กนใ€‚"
 
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1790 sequencer.c:1798
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "ๆไบค %s ๆฒกๆœ‰็ฌฌ %d ไธช็ˆถๆไบค"
 
-#: sequencer.c:1846
+#: sequencer.c:1804
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "ไธ่ƒฝๅพ—ๅˆฐ %s ็š„ๆไบค่ฏดๆ˜Ž"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1865
+#: sequencer.c:1823
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s๏ผšไธ่ƒฝ่งฃๆž็ˆถๆไบค %s"
 
-#: sequencer.c:1930
+#: sequencer.c:1888
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "ไธ่ƒฝๅฐ† '%s' ้‡ๅ‘ฝๅไธบ '%s'"
 
-#: sequencer.c:1985
+#: sequencer.c:1943
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "ไธ่ƒฝ่ฟ˜ๅŽŸ %s... %s"
 
-#: sequencer.c:1986
+#: sequencer.c:1944
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "ไธ่ƒฝๅบ”็”จ %s... %s"
 
-#: sequencer.c:2045
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "ไธขๅผƒ %s %s -- ่กฅไธๅ†…ๅฎนๅทฒๅœจไธŠๆธธ\n"
+
+#: sequencer.c:2018
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s๏ผšๆ— ๆณ•่ฏปๅ–็ดขๅผ•"
 
-#: sequencer.c:2052
+#: sequencer.c:2025
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s๏ผšๆ— ๆณ•ๅˆทๆ–ฐ็ดขๅผ•"
 
-#: sequencer.c:2128
+#: sequencer.c:2102
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s ไธๆŽฅๅ—ๅ‚ๆ•ฐ๏ผš'%s'"
 
-#: sequencer.c:2137
+#: sequencer.c:2111
 #, c-format
 msgid "missing arguments for %s"
 msgstr "็ผบๅฐ‘ %s ็š„ๅ‚ๆ•ฐ"
 
-#: sequencer.c:2174
+#: sequencer.c:2142
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "ๆ— ๆณ•่งฃๆž '%.*s'"
+msgid "could not parse '%s'"
+msgstr "ๆ— ๆณ•่งฃๆž '%s'"
 
-#: sequencer.c:2228
+#: sequencer.c:2203
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ๆ— ๆ•ˆ่กŒ %d๏ผš%.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2214
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "ๆฒกๆœ‰็ˆถๆไบค็š„ๆƒ…ๅ†ตไธ‹ไธ่ƒฝ '%s'"
 
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "ไธ่ƒฝ่ฏปๅ– '%s'ใ€‚"
-
-#: sequencer.c:2323
+#: sequencer.c:2298
 msgid "cancelling a cherry picking in progress"
 msgstr "ๆญฃๅœจๅ–ๆถˆไธ€ไธช่ฟ›่กŒไธญ็š„ๆ‹ฃ้€‰"
 
-#: sequencer.c:2330
+#: sequencer.c:2305
 msgid "cancelling a revert in progress"
 msgstr "ๆญฃๅœจๅ–ๆถˆไธ€ไธช่ฟ›่กŒไธญ็š„่ฟ˜ๅŽŸ"
 
-#: sequencer.c:2364
+#: sequencer.c:2349
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "่ฏท็”จ 'git rebase --edit-todo' ๆฅไฟฎๆ”นใ€‚"
 
-#: sequencer.c:2366
+#: sequencer.c:2351
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "ไธๅฏ็”จ็š„ๆŒ‡ไปคๆธ…ๅ•๏ผš'%s'"
 
-#: sequencer.c:2371
+#: sequencer.c:2356
 msgid "no commits parsed."
 msgstr "ๆฒกๆœ‰่งฃๆžๆไบคใ€‚"
 
-#: sequencer.c:2382
+#: sequencer.c:2367
 msgid "cannot cherry-pick during a revert."
 msgstr "ไธ่ƒฝๅœจๅ›ž้€€ไธญๆ‰ง่กŒๆ‹ฃ้€‰ใ€‚"
 
-#: sequencer.c:2384
+#: sequencer.c:2369
 msgid "cannot revert during a cherry-pick."
 msgstr "ไธ่ƒฝๅœจๆ‹ฃ้€‰ไธญๆ‰ง่กŒๅ›ž้€€ใ€‚"
 
-#: sequencer.c:2466
+#: sequencer.c:2447
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s ็š„ๅ€ผๆ— ๆ•ˆ๏ผš%s"
 
-#: sequencer.c:2553
+#: sequencer.c:2540
 msgid "unusable squash-onto"
 msgstr "ไธๅฏ็”จ็š„ squash-onto"
 
-#: sequencer.c:2569
+#: sequencer.c:2556
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "ๆ ผๅผ้”™่ฏฏ็š„้€‰้กนๆธ…ๅ•๏ผš'%s'"
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2644 sequencer.c:4361
 msgid "empty commit set passed"
 msgstr "ๆไพ›ไบ†็ฉบ็š„ๆไบค้›†"
 
-#: sequencer.c:2668
+#: sequencer.c:2660
 msgid "revert is already in progress"
 msgstr "ไธ€ไธช่ฟ˜ๅŽŸๆ“ไฝœๅทฒๅœจ่ฟ›่กŒ"
 
-#: sequencer.c:2670
+#: sequencer.c:2662
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "ๅฐ่ฏ• \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2673
+#: sequencer.c:2665
 msgid "cherry-pick is already in progress"
 msgstr "ๆ‹ฃ้€‰ๆ“ไฝœๅทฒๅœจ่ฟ›่กŒ"
 
-#: sequencer.c:2675
+#: sequencer.c:2667
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "ๅฐ่ฏ• \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2689
+#: sequencer.c:2681
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "ไธ่ƒฝๅˆ›ๅปบๅบๅˆ—็›ฎๅฝ• '%s'"
 
-#: sequencer.c:2704
+#: sequencer.c:2696
 msgid "could not lock HEAD"
 msgstr "ไธ่ƒฝ้”ๅฎš HEAD"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2756 sequencer.c:4099
 msgid "no cherry-pick or revert in progress"
 msgstr "ๆ‹ฃ้€‰ๆˆ–่ฟ˜ๅŽŸๆ“ไฝœๅนถๆœช่ฟ›่กŒ"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2758 sequencer.c:2769
 msgid "cannot resolve HEAD"
 msgstr "ไธ่ƒฝ่งฃๆž HEAD"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2760 sequencer.c:2804
 msgid "cannot abort from a branch yet to be born"
 msgstr "ไธ่ƒฝไปŽๅฐšๆœชๅปบ็ซ‹็š„ๅˆ†ๆ”ฏ็ปˆๆญข"
 
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2790 builtin/grep.c:724
 #, c-format
 msgid "cannot open '%s'"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€ '%s'"
 
-#: sequencer.c:2800
+#: sequencer.c:2792
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "ไธ่ƒฝ่ฏปๅ– '%s'๏ผš%s"
 
-#: sequencer.c:2801
+#: sequencer.c:2793
 msgid "unexpected end of file"
 msgstr "ๆ„ๅค–็š„ๆ–‡ไปถ็ป“ๆŸ"
 
-#: sequencer.c:2807
+#: sequencer.c:2799
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "ไฟๅญ˜ๆ‹ฃ้€‰ๆไบคๅ‰็š„ HEAD ๆ–‡ไปถ '%s' ๆŸๅ"
 
-#: sequencer.c:2818
+#: sequencer.c:2810
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "ๆ‚จๅฅฝๅƒ็งปๅŠจไบ† HEADใ€‚ๆœช่ƒฝๅ›ž้€€๏ผŒๆฃ€ๆŸฅๆ‚จ็š„ HEAD๏ผ"
 
-#: sequencer.c:2859
+#: sequencer.c:2851
 msgid "no revert in progress"
 msgstr "ๆฒกๆœ‰ๆญฃๅœจ่ฟ›่กŒ็š„่ฟ˜ๅŽŸ"
 
-#: sequencer.c:2867
+#: sequencer.c:2859
 msgid "no cherry-pick in progress"
 msgstr "ๆฒกๆœ‰ๆญฃๅœจ่ฟ›่กŒ็š„ๆ‹ฃ้€‰"
 
-#: sequencer.c:2877
+#: sequencer.c:2869
 msgid "failed to skip the commit"
 msgstr "ๆ— ๆณ•่ทณ่ฟ‡่ฟ™ไธชๆไบค"
 
-#: sequencer.c:2884
+#: sequencer.c:2876
 msgid "there is nothing to skip"
 msgstr "ๆฒกๆœ‰่ฆ่ทณ่ฟ‡็š„"
 
-#: sequencer.c:2887
+#: sequencer.c:2879
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6288,21 +7022,21 @@ msgstr ""
 "ๆ‚จๅทฒ็ปๆไบคไบ†ไนˆ๏ผŸ\n"
 "่ฏ•่ฏ• \"git %s --continue\""
 
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:3003 sequencer.c:4011
 #, c-format
 msgid "could not update %s"
 msgstr "ไธ่ƒฝๆ›ดๆ–ฐ %s"
 
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3042 sequencer.c:3991
 msgid "cannot read HEAD"
 msgstr "ไธ่ƒฝ่ฏปๅ– HEAD"
 
-#: sequencer.c:3066
+#: sequencer.c:3059
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "ๆ— ๆณ•ๆ‹ท่ด '%s' ่‡ณ '%s'"
 
-#: sequencer.c:3074
+#: sequencer.c:3067
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6321,28 +7055,23 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3077
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "ไธ่ƒฝๅบ”็”จ %s... %.*s"
 
-#: sequencer.c:3091
+#: sequencer.c:3084
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "ไธ่ƒฝๅˆๅนถ %.*s"
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "ไธ่ƒฝๆ‹ท่ด '%s' ่‡ณ '%s'"
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "ไธ่ƒฝ่ฏปๅ–็ดขๅผ•"
-
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: sequencer.c:3136
+#: sequencer.c:3129
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6357,11 +7086,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3135
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "ๅนถไธ”ไฟฎๆ”น็ดขๅผ•ๅ’Œ/ๆˆ–ๅทฅไฝœๅŒบ\n"
 
-#: sequencer.c:3148
+#: sequencer.c:3141
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6378,76 +7107,72 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3202
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "้žๆณ•็š„ๆ ‡็ญพๅ็งฐ๏ผš'%.*s'"
 
-#: sequencer.c:3263
+#: sequencer.c:3256
 msgid "writing fake root commit"
 msgstr "ๅ†™ไผชๆ นๆไบค"
 
-#: sequencer.c:3268
+#: sequencer.c:3261
 msgid "writing squash-onto"
 msgstr "ๅ†™ๅ…ฅ squash-onto"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐ %s ๆŒ‡ๅ‘็š„ๆ ‘ใ€‚"
 
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "ไธ่ƒฝๅ†™ๅ…ฅ็ดขๅผ•"
-
-#: sequencer.c:3351
+#: sequencer.c:3344
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "ๆ— ๆณ•่งฃๆž '%s'"
 
-#: sequencer.c:3379
+#: sequencer.c:3375
 msgid "cannot merge without a current revision"
 msgstr "ๆฒกๆœ‰ๅฝ“ๅ‰็‰ˆๆœฌไธ่ƒฝๅˆๅนถ"
 
-#: sequencer.c:3401
+#: sequencer.c:3397
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "ๆ— ๆณ•่งฃๆž '%.*s'"
 
-#: sequencer.c:3410
+#: sequencer.c:3406
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "ๆ— ๅฏ็”จๅˆๅนถ๏ผš'%.*s'"
 
-#: sequencer.c:3422
+#: sequencer.c:3418
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "็ซ ้ฑผๅˆๅนถไธ่ƒฝๅœจไธ€ไธชๆ–ฐ็š„ๆ นๆไบคไธŠๆ‰ง่กŒ"
 
-#: sequencer.c:3437
+#: sequencer.c:3434
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "ไธ่ƒฝ่Žทๅ– '%s' ็š„ๆไบค่ฏดๆ˜Ž"
 
-#: sequencer.c:3590
+#: sequencer.c:3594
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "็”š่‡ณไธ่ƒฝๅฐ่ฏ•ๅˆๅนถ '%.*s'"
 
-#: sequencer.c:3606
+#: sequencer.c:3610
 msgid "merge: Unable to write new index file"
 msgstr "ๅˆๅนถ๏ผšๆ— ๆณ•ๅ†™ๅ…ฅๆ–ฐ็ดขๅผ•ๆ–‡ไปถ"
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3679 builtin/rebase.c:737
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "ๅทฒๅบ”็”จ autostashใ€‚\n"
 
-#: sequencer.c:3687
+#: sequencer.c:3691
 #, c-format
 msgid "cannot store %s"
 msgstr "ไธ่ƒฝๅญ˜ๅ‚จ %s"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -6458,31 +7183,26 @@ msgstr ""
 "ๆ‚จ็š„ไฟฎๆ”นๅฎ‰ๅ…จๅœฐไฟๅญ˜ๅœจ่ดฎ่—ๅŒบไธญใ€‚\n"
 "ๆ‚จๅฏไปฅๅœจไปปไฝ•ๆ—ถๅ€™่ฟ่กŒ \"git stash pop\" ๆˆ– \"git stash drop\"ใ€‚\n"
 
-#: sequencer.c:3751
-#, c-format
-msgid "could not checkout %s"
-msgstr "ไธ่ƒฝๆฃ€ๅ‡บ %s"
-
-#: sequencer.c:3765
+#: sequencer.c:3755
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s๏ผšไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๅฏน่ฑก ID"
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "ไธ่ƒฝๅˆ†็ฆปๅคดๆŒ‡้’ˆ"
 
-#: sequencer.c:3785
+#: sequencer.c:3775
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "ๅœๆญขๅœจ HEAD\n"
 
-#: sequencer.c:3787
+#: sequencer.c:3777
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "ๅœๆญขๅœจ %s\n"
 
-#: sequencer.c:3795
+#: sequencer.c:3785
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6502,48 +7222,48 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3877
+#: sequencer.c:3869
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "ๅœๆญขๅœจ %s... %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:3940
 #, c-format
 msgid "unknown command %d"
 msgstr "ๆœช็Ÿฅๅ‘ฝไปค %d"
 
-#: sequencer.c:4003
+#: sequencer.c:3999
 msgid "could not read orig-head"
 msgstr "ไธ่ƒฝ่ฏปๅ– orig-head"
 
-#: sequencer.c:4008
+#: sequencer.c:4004
 msgid "could not read 'onto'"
 msgstr "ไธ่ƒฝ่ฏปๅ– 'onto'"
 
-#: sequencer.c:4022
+#: sequencer.c:4018
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "ไธ่ƒฝๆ›ดๆ–ฐ HEAD ไธบ %s"
 
-#: sequencer.c:4115
+#: sequencer.c:4111
 msgid "cannot rebase: You have unstaged changes."
 msgstr "ไธ่ƒฝๅ˜ๅŸบ๏ผšๆ‚จๆœ‰ๆœชๆš‚ๅญ˜็š„ๅ˜ๆ›ดใ€‚"
 
-#: sequencer.c:4124
+#: sequencer.c:4120
 msgid "cannot amend non-existing commit"
 msgstr "ไธ่ƒฝไฟฎ่กฅไธๅญ˜ๅœจ็š„ๆไบค"
 
-#: sequencer.c:4126
+#: sequencer.c:4122
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "ๆ— ๆ•ˆๆ–‡ไปถ๏ผš'%s'"
 
-#: sequencer.c:4128
+#: sequencer.c:4124
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "ๆ— ๆ•ˆๅ†…ๅฎน๏ผš'%s'"
 
-#: sequencer.c:4131
+#: sequencer.c:4127
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6552,68 +7272,59 @@ msgstr ""
 "\n"
 "ๆ‚จ็š„ๅทฅไฝœๅŒบไธญๆœ‰ๆœชๆไบค็š„ๅ˜ๆ›ดใ€‚่ฏทๅ…ˆๆไบค็„ถๅŽๅ†ๆฌก่ฟ่กŒ 'git rebase --continue'ใ€‚"
 
-#: sequencer.c:4167 sequencer.c:4205
+#: sequencer.c:4163 sequencer.c:4202
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "ไธ่ƒฝๅ†™ๅ…ฅๆ–‡ไปถ๏ผš'%s'"
 
-#: sequencer.c:4220
+#: sequencer.c:4217
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "ไธ่ƒฝๅˆ ้™ค CHERRY_PICK_HEAD"
 
-#: sequencer.c:4227
+#: sequencer.c:4224
 msgid "could not commit staged changes."
 msgstr "ไธ่ƒฝๆไบคๆš‚ๅญ˜็š„ไฟฎๆ”นใ€‚"
 
-#: sequencer.c:4328
+#: sequencer.c:4338
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s๏ผšไธ่ƒฝๆ‹ฃ้€‰ไธ€ไธช%s"
 
-#: sequencer.c:4332
+#: sequencer.c:4342
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s๏ผš้”™่ฏฏ็š„็‰ˆๆœฌ"
 
-#: sequencer.c:4367
+#: sequencer.c:4377
 msgid "can't revert as initial commit"
 msgstr "ไธ่ƒฝไฝœไธบๅˆๅง‹ๆไบคๅ›ž้€€"
 
-#: sequencer.c:4810
+#: sequencer.c:4846
 msgid "make_script: unhandled options"
 msgstr "make_script๏ผšๆœ‰ๆœช่ƒฝๅค„็†็š„้€‰้กน"
 
-#: sequencer.c:4813
+#: sequencer.c:4849
 msgid "make_script: error preparing revisions"
 msgstr "make_script๏ผšๅ‡†ๅค‡็‰ˆๆœฌๆ—ถ้”™่ฏฏ"
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"ๆ‚จๅฏไปฅ็”จ 'git rebase --edit-todo' ไฟฎๆญฃ๏ผŒ็„ถๅŽๆ‰ง่กŒ 'git rebase --continue'ใ€‚\n"
-"ๆˆ–่€…ๆ‚จๅฏไปฅ็”จ 'git rebase --abort' ็ปˆๆญขๅ˜ๅŸบใ€‚\n"
-
 #: sequencer.c:5083 sequencer.c:5100
 msgid "nothing to do"
 msgstr "ๆ— ไบ‹ๅฏๅš"
 
-#: sequencer.c:5114
+#: sequencer.c:5119
 msgid "could not skip unnecessary pick commands"
 msgstr "ๆ— ๆณ•่ทณ่ฟ‡ไธๅฟ…่ฆ็š„ๆ‹ฃ้€‰"
 
-#: sequencer.c:5197
+#: sequencer.c:5213
 msgid "the script was already rearranged."
 msgstr "่„šๆœฌๅทฒ็ป้‡ๆ–ฐ็ผ–ๆŽ’ใ€‚"
 
-#: setup.c:123
+#: setup.c:124
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' ๅœจไป“ๅบ“ไน‹ๅค–"
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' ๅœจไฝไบŽ '%s' ็š„ไป“ๅบ“ไน‹ๅค–"
 
-#: setup.c:173
+#: setup.c:175
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6622,7 +7333,7 @@ msgstr ""
 "%s๏ผšๅทฅไฝœๅŒบไธญๆ— ๆญค่ทฏๅพ„ใ€‚\n"
 "ไฝฟ็”จๅ‘ฝไปค 'git <ๅ‘ฝไปค> -- <่ทฏๅพ„>...' ๆฅๆŒ‡ๅฎšๆœฌๅœฐไธๅญ˜ๅœจ็š„่ทฏๅพ„ใ€‚"
 
-#: setup.c:186
+#: setup.c:188
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6633,12 +7344,12 @@ msgstr ""
 "ไฝฟ็”จ '--' ๆฅๅˆ†้š”็‰ˆๆœฌๅ’Œ่ทฏๅพ„๏ผŒไพ‹ๅฆ‚๏ผš\n"
 "'git <ๅ‘ฝไปค> [<็‰ˆๆœฌ>...] -- [<ๆ–‡ไปถ>...]'"
 
-#: setup.c:235
+#: setup.c:254
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "้€‰้กน '%s' ๅฟ…้กปๅœจๅ…ถไป–้ž้€‰้กนๅ‚ๆ•ฐไน‹ๅ‰"
 
-#: setup.c:254
+#: setup.c:273
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6649,92 +7360,92 @@ msgstr ""
 "ไฝฟ็”จ '--' ๆฅๅˆ†้š”็‰ˆๆœฌๅ’Œ่ทฏๅพ„๏ผŒไพ‹ๅฆ‚๏ผš\n"
 "'git <ๅ‘ฝไปค> [<็‰ˆๆœฌ>...] -- [<ๆ–‡ไปถ>...]'"
 
-#: setup.c:390
+#: setup.c:409
 msgid "unable to set up work tree using invalid config"
 msgstr "ๆ— ๆณ•ไฝฟ็”จๆ— ๆ•ˆ้…็ฝฎๆฅๅˆ›ๅปบๅทฅไฝœๅŒบ"
 
-#: setup.c:394
+#: setup.c:413
 msgid "this operation must be run in a work tree"
 msgstr "่ฏฅๆ“ไฝœๅฟ…้กปๅœจไธ€ไธชๅทฅไฝœๅŒบไธญ่ฟ่กŒ"
 
-#: setup.c:540
+#: setup.c:559
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "ๆœŸๆœ› git ไป“ๅบ“็‰ˆๆœฌ <= %d๏ผŒๅดๅพ—ๅˆฐ %d"
 
-#: setup.c:548
+#: setup.c:567
 msgid "unknown repository extensions found:"
 msgstr "ๅ‘็Žฐๆœช็Ÿฅ็š„ไป“ๅบ“ๆ‰ฉๅฑ•๏ผš"
 
-#: setup.c:567
+#: setup.c:586
 #, c-format
 msgid "error opening '%s'"
 msgstr "ๆ‰“ๅผ€ '%s' ๅ‡บ้”™"
 
-#: setup.c:569
+#: setup.c:588
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "ๆ–‡ไปถๅคชๅคง๏ผŒๆ— ๆณ•ไฝœไธบ .git ๆ–‡ไปถ๏ผš'%s'"
 
-#: setup.c:571
+#: setup.c:590
 #, c-format
 msgid "error reading %s"
 msgstr "่ฏปๅ– %s ๅ‡บ้”™"
 
-#: setup.c:573
+#: setup.c:592
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "ๆ— ๆ•ˆ็š„ gitfile ๆ ผๅผ๏ผš%s"
 
-#: setup.c:575
+#: setup.c:594
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "ๅœจ gitfile ไธญๆฒกๆœ‰่ทฏๅพ„๏ผš%s"
 
-#: setup.c:577
+#: setup.c:596
 #, c-format
 msgid "not a git repository: %s"
 msgstr "ไธๆ˜ฏไธ€ไธช git ไป“ๅบ“๏ผš%s"
 
-#: setup.c:676
+#: setup.c:695
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' ๅคชๅคง"
 
-#: setup.c:690
+#: setup.c:709
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "ไธๆ˜ฏไธ€ไธช git ไป“ๅบ“๏ผš'%s'"
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:738 setup.c:740 setup.c:771
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "ไธ่ƒฝๅˆ‡ๆข็›ฎๅฝ•ๅˆฐ '%s'"
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
 msgid "cannot come back to cwd"
 msgstr "ๆ— ๆณ•่ฟ”ๅ›žๅฝ“ๅ‰ๅทฅไฝœ็›ฎๅฝ•"
 
-#: setup.c:851
+#: setup.c:870
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "่Žทๅ– '%*s%s%s' ็Šถๆ€๏ผˆstat๏ผ‰ๅคฑ่ดฅ"
 
-#: setup.c:1083
+#: setup.c:1108
 msgid "Unable to read current working directory"
 msgstr "ไธ่ƒฝ่ฏปๅ–ๅฝ“ๅ‰ๅทฅไฝœ็›ฎๅฝ•"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1117 setup.c:1123
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "ไธ่ƒฝๅˆ‡ๆขๅˆฐ '%s'"
 
-#: setup.c:1103
+#: setup.c:1128
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "ไธๆ˜ฏไธ€ไธช git ไป“ๅบ“๏ผˆๆˆ–่€…ไปปไฝ•็ˆถ็›ฎๅฝ•๏ผ‰๏ผš%s"
 
-#: setup.c:1109
+#: setup.c:1134
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6743,7 +7454,7 @@ msgstr ""
 "ไธๆ˜ฏไธ€ไธช git ไป“ๅบ“๏ผˆๆˆ–่€…็›ด่‡ณๆŒ‚่ฝฝ็‚น %s ็š„ไปปไฝ•็ˆถ็›ฎๅฝ•๏ผ‰\n"
 "ๅœๆญขๅœจๆ–‡ไปถ็ณป็ปŸ่พน็•Œ๏ผˆๆœช่ฎพ็ฝฎ GIT_DISCOVERY_ACROSS_FILESYSTEM๏ผ‰ใ€‚"
 
-#: setup.c:1220
+#: setup.c:1245
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6752,282 +7463,282 @@ msgstr ""
 "ๅ‚ๆ•ฐ core.sharedRepository ็š„ๆ–‡ไปถๅฑžๆ€งๅ€ผๆœ‰้—ฎ้ข˜๏ผˆ0%.3o๏ผ‰ใ€‚\n"
 "ๆ–‡ไปถๅฑžไธปๅฟ…้กปๅง‹็ปˆๆ‹ฅๆœ‰่ฏปๅ†™ๆƒ้™ใ€‚"
 
-#: setup.c:1264
+#: setup.c:1289
 msgid "open /dev/null or dup failed"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€ๆˆ–่€…ๅคๅˆถ /dev/null"
 
-#: setup.c:1279
+#: setup.c:1304
 msgid "fork failed"
 msgstr "fork ๅคฑ่ดฅ"
 
-#: setup.c:1284
+#: setup.c:1309
 msgid "setsid failed"
 msgstr "setsid ๅคฑ่ดฅ"
 
-#: sha1-file.c:453
+#: sha1-file.c:452
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "ๅฏน่ฑก็›ฎๅฝ• %s ไธๅญ˜ๅœจ๏ผŒๆฃ€ๆŸฅ .git/objects/info/alternates"
 
-#: sha1-file.c:504
+#: sha1-file.c:503
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "ๆ— ๆณ•่ง„่ŒƒๅŒ–ๅค‡็”จๅฏน่ฑก่ทฏๅพ„๏ผš%s"
 
-#: sha1-file.c:576
+#: sha1-file.c:575
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s๏ผšๅฟฝ็•ฅๅค‡็”จๅฏน่ฑกๅบ“๏ผŒๅตŒๅฅ—ๅคชๆทฑ"
 
-#: sha1-file.c:583
+#: sha1-file.c:582
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "ๆ— ๆณ•่ง„่ŒƒๅŒ–ๅฏน่ฑก็›ฎๅฝ•: %s"
 
-#: sha1-file.c:626
+#: sha1-file.c:625
 msgid "unable to fdopen alternates lockfile"
 msgstr "ๆ— ๆณ• fdopen ๆ›ฟๆข้”ๆ–‡ไปถ"
 
-#: sha1-file.c:644
+#: sha1-file.c:643
 msgid "unable to read alternates file"
 msgstr "ๆ— ๆณ•่ฏปๅ–ๆ›ฟไปฃๆ–‡ไปถ"
 
-#: sha1-file.c:651
+#: sha1-file.c:650
 msgid "unable to move new alternates file into place"
 msgstr "ๆ— ๆณ•ๅฐ†ๆ–ฐ็š„ๆ›ฟไปฃๆ–‡ไปถ็งปๅŠจๅˆฐไฝ"
 
-#: sha1-file.c:686
+#: sha1-file.c:685
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "่ทฏๅพ„ '%s' ไธๅญ˜ๅœจ"
 
-#: sha1-file.c:712
+#: sha1-file.c:711
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "ๅฐšไธๆ”ฏๆŒๅฐ†ๅ‚่€ƒไป“ๅบ“ '%s' ไฝœไธบไธ€ไธช้“พๆŽฅๆฃ€ๅ‡บใ€‚"
 
-#: sha1-file.c:718
+#: sha1-file.c:717
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "ๅ‚่€ƒไป“ๅบ“ '%s' ไธๆ˜ฏไธ€ไธชๆœฌๅœฐไป“ๅบ“ใ€‚"
 
-#: sha1-file.c:724
+#: sha1-file.c:723
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "ๅ‚่€ƒไป“ๅบ“ '%s' ๆ˜ฏไธ€ไธชๆต…ๅ…‹้š†"
 
-#: sha1-file.c:732
+#: sha1-file.c:731
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "ๅ‚่€ƒไป“ๅบ“ '%s' ๅทฒ่ขซ็งปๆค"
 
-#: sha1-file.c:792
+#: sha1-file.c:791
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "่งฃๆžๅค‡็”จๅผ•็”จๆ—ถๆ— ๆ•ˆ็š„่กŒ๏ผš%s"
 
-#: sha1-file.c:944
+#: sha1-file.c:943
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "ๅฐ่ฏ• mmap %<PRIuMAX>๏ผŒ่ถ…่ฟ‡ไบ†ๆœ€ๅคงๅ€ผ %<PRIuMAX>"
 
-#: sha1-file.c:969
+#: sha1-file.c:964
 msgid "mmap failed"
 msgstr "mmap ๅคฑ่ดฅ"
 
-#: sha1-file.c:1133
+#: sha1-file.c:1128
 #, c-format
 msgid "object file %s is empty"
 msgstr "ๅฏน่ฑกๆ–‡ไปถ %s ไธบ็ฉบ"
 
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1263 sha1-file.c:2443
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "ๆŸๅ็š„ๆพๆ•ฃๅฏน่ฑก '%s'"
 
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1265 sha1-file.c:2447
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "ๆพๆ•ฃๅฏน่ฑก '%s' ๅŽ้ขๆœ‰ๅžƒๅœพๆ•ฐๆฎ"
 
-#: sha1-file.c:1301
+#: sha1-file.c:1307
 msgid "invalid object type"
 msgstr "ๆ— ๆ•ˆ็š„ๅฏน่ฑก็ฑปๅž‹"
 
-#: sha1-file.c:1385
+#: sha1-file.c:1391
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "ๆ— ๆณ•็”จ --allow-unknown-type ๅ‚ๆ•ฐ่งฃๅผ€ %s ๅคดไฟกๆฏ"
 
-#: sha1-file.c:1388
+#: sha1-file.c:1394
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "ๆ— ๆณ•่งฃๅผ€ %s ๅคด้ƒจ"
 
-#: sha1-file.c:1394
+#: sha1-file.c:1400
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "ๆ— ๆณ•็”จ --allow-unknown-type ๅ‚ๆ•ฐ่งฃๆž %s ๅคดไฟกๆฏ"
 
-#: sha1-file.c:1397
+#: sha1-file.c:1403
 #, c-format
 msgid "unable to parse %s header"
 msgstr "ๆ— ๆณ•่งฃๆž %s ๅคด้ƒจ"
 
-#: sha1-file.c:1588
+#: sha1-file.c:1629
 #, c-format
 msgid "failed to read object %s"
 msgstr "่ฏปๅ–ๅฏน่ฑก %s ๅคฑ่ดฅ"
 
-#: sha1-file.c:1592
+#: sha1-file.c:1633
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "ๆ‰พไธๅˆฐ %2$s ็š„ๆ›ฟไปฃ %1$s"
 
-#: sha1-file.c:1596
+#: sha1-file.c:1637
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "ๆพๆ•ฃๅฏน่ฑก %s๏ผˆไฟๅญ˜ๅœจ %s๏ผ‰ๅทฒๆŸๅ"
 
-#: sha1-file.c:1600
+#: sha1-file.c:1641
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "ๆ‰“ๅŒ…ๅฏน่ฑก %s๏ผˆไฟๅญ˜ๅœจ %s๏ผ‰ๅทฒๆŸๅ"
 
-#: sha1-file.c:1703
+#: sha1-file.c:1746
 #, c-format
 msgid "unable to write file %s"
 msgstr "ๆ— ๆณ•ๅ†™ๆ–‡ไปถ %s"
 
-#: sha1-file.c:1710
+#: sha1-file.c:1753
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "ๆ— ๆณ•ไธบ '%s' ่ฎพ็ฝฎๆƒ้™"
 
-#: sha1-file.c:1717
+#: sha1-file.c:1760
 msgid "file write error"
 msgstr "ๆ–‡ไปถๅ†™้”™่ฏฏ"
 
-#: sha1-file.c:1736
+#: sha1-file.c:1780
 msgid "error when closing loose object file"
 msgstr "ๅ…ณ้—ญๆพๆ•ฃๅฏน่ฑกๆ–‡ไปถๆ—ถๅ‡บ้”™"
 
-#: sha1-file.c:1801
+#: sha1-file.c:1845
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr "ๆƒ้™ไธ่ถณ๏ผŒๆ— ๆณ•ๅœจไป“ๅบ“ๅฏน่ฑกๅบ“ %s ไธญๆทปๅŠ ๅฏน่ฑก"
 
-#: sha1-file.c:1803
+#: sha1-file.c:1847
 msgid "unable to create temporary file"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบไธดๆ—ถๆ–‡ไปถ"
 
-#: sha1-file.c:1827
+#: sha1-file.c:1871
 msgid "unable to write loose object file"
 msgstr "ไธ่ƒฝๅ†™ๆพๆ•ฃๅฏน่ฑกๆ–‡ไปถ"
 
-#: sha1-file.c:1833
+#: sha1-file.c:1877
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "ไธ่ƒฝๅŽ‹็ผฉๆ–ฐๅฏน่ฑก %s๏ผˆ%d๏ผ‰"
 
-#: sha1-file.c:1837
+#: sha1-file.c:1881
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "ๅœจๅฏน่ฑก %s ไธŠ่ฐƒ็”จ deflateEnd ๅคฑ่ดฅ๏ผˆ%d๏ผ‰"
 
-#: sha1-file.c:1841
+#: sha1-file.c:1885
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "่ขซ %s ็š„ไธ็จณๅฎšๅฏน่ฑกๆบๆ•ฐๆฎๆž็ณŠๆถ‚ไบ†"
 
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
 #, c-format
 msgid "failed utime() on %s"
 msgstr "ๅœจ %s ไธŠ่ฐƒ็”จ utime() ๅคฑ่ดฅ"
 
-#: sha1-file.c:1926
+#: sha1-file.c:1972
 #, c-format
 msgid "cannot read object for %s"
 msgstr "ไธ่ƒฝ่ฏปๅ–ๅฏน่ฑก %s"
 
-#: sha1-file.c:1966
+#: sha1-file.c:2011
 msgid "corrupt commit"
 msgstr "ๆŸๅ็š„ๆไบค"
 
-#: sha1-file.c:1974
+#: sha1-file.c:2019
 msgid "corrupt tag"
 msgstr "ๆŸๅ็š„ๆ ‡็ญพ"
 
-#: sha1-file.c:2073
+#: sha1-file.c:2119
 #, c-format
 msgid "read error while indexing %s"
 msgstr "็ดขๅผ• %s ๆ—ถ่ฏปๅ–้”™่ฏฏ"
 
-#: sha1-file.c:2076
+#: sha1-file.c:2122
 #, c-format
 msgid "short read while indexing %s"
 msgstr "็ดขๅผ• %s ๆ—ถ่ฏปๅ…ฅไธๅฎŒๆ•ด"
 
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2195 sha1-file.c:2205
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s๏ผšๆ’ๅ…ฅๆ•ฐๆฎๅบ“ๅคฑ่ดฅ"
 
-#: sha1-file.c:2164
+#: sha1-file.c:2211
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s๏ผšไธๆ”ฏๆŒ็š„ๆ–‡ไปถ็ฑปๅž‹"
 
-#: sha1-file.c:2188
+#: sha1-file.c:2235
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๅฏน่ฑก"
 
-#: sha1-file.c:2190
+#: sha1-file.c:2237
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ '%s' ๅฏน่ฑก"
 
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "ไธ่ƒฝๆ‰“ๅผ€ %s"
 
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2454 sha1-file.c:2507
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "%s ็š„ๅ“ˆๅธŒๅ€ผไธๅŒน้…๏ผˆ้ข„ๆœŸ %s๏ผ‰"
 
-#: sha1-file.c:2431
+#: sha1-file.c:2478
 #, c-format
 msgid "unable to mmap %s"
 msgstr "ไธ่ƒฝ mmap %s"
 
-#: sha1-file.c:2436
+#: sha1-file.c:2483
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "ๆ— ๆณ•่งฃๅŽ‹็ผฉ %s ็š„ๅคด้ƒจ"
 
-#: sha1-file.c:2442
+#: sha1-file.c:2489
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "ๆ— ๆณ•่งฃๆž %s ็š„ๅคด้ƒจ"
 
-#: sha1-file.c:2453
+#: sha1-file.c:2500
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "ๆ— ๆณ•่งฃๅŽ‹็ผฉ %s ็š„ๅ†…ๅฎน"
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "็Ÿญ SHA1 %s ๅญ˜ๅœจๆญงไน‰"
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "ๅ€™้€‰่€…ๆœ‰๏ผš"
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7048,44 +7759,110 @@ msgstr ""
 "ๅผ•็”จ๏ผŒๅฏ่ƒฝ้œ€่ฆๅˆ ้™คๅฎƒไปฌใ€‚่ฟ่กŒ \"git config advice.objectNameWarning\n"
 "false\" ๅ‘ฝไปคๅ…ณ้—ญๆœฌๆถˆๆฏ้€š็Ÿฅใ€‚"
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' ็š„ๆ—ฅๅฟ—ไป…่ƒฝๅ›žๅˆฐ %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' ็š„ๆ—ฅๅฟ—ไป…ๆœ‰ %d ไธชๆก็›ฎ"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "่ทฏๅพ„ '%s' ๅœจ็ฃ็›˜ไธŠ๏ผŒไฝ†ๆ˜ฏไธๅœจ '%.*s' ไธญ"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"่ทฏๅพ„ '%s' ๅญ˜ๅœจ๏ผŒ่€Œ '%s' ไธๅญ˜ๅœจ\n"
+"ๆ็คบ๏ผšๆ‚จ็š„ๆ„ๆ€ๆ˜ฏ '%.*s:%s' ไบฆๅณ '%.*s:./%s'๏ผŸ"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "่ทฏๅพ„ '%s' ไธๅœจ '%.*s' ไธญ"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"่ทฏๅพ„ '%s' ๅœจ็ดขๅผ•ไธญ๏ผŒไฝ†ไธๅœจๆš‚ๅญ˜ๅŒบ %d ไธญ\n"
+"ๆ็คบ๏ผšๆ‚จ็š„ๆ„ๆ€ๆ˜ฏ ':%d:%s'๏ผŸ"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"่ทฏๅพ„ '%s' ๅœจ็ดขๅผ•ไธญ๏ผŒไฝ† '%s' ไธๅœจ\n"
+"ๆ็คบ๏ผšๆ‚จ็š„ๆ„ๆ€ๆ˜ฏ ':%d:%s' ไบฆๅณ ':%d:./%s'๏ผŸ"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "่ทฏๅพ„ '%s' ๅœจ็ฃ็›˜ไธŠ๏ผŒไฝ†ไธๅœจ็ดขๅผ•้‡Œ"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "่ทฏๅพ„ '%s' ไธๅญ˜ๅœจ๏ผˆๆ—ขไธๅœจ็ฃ็›˜ไธŠ๏ผŒไนŸไธๅœจ็ดขๅผ•ไธญ๏ผ‰"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr "ไธ่ƒฝๅœจๅทฅไฝœๅŒบไน‹ๅค–ไฝฟ็”จ็›ธๅฏน่ทฏๅพ„่ฏญๆณ•"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "ๆ— ๆ•ˆ็š„ๅฏน่ฑกๅ '%.*s'ใ€‚"
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:837
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:839
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:847
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:849
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:856
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:864
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7093,13 +7870,18 @@ msgstr[0] "%u ๅญ—่Š‚"
 msgstr[1] "%u ๅญ—่Š‚"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:866
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u ๅญ—่Š‚/็ง’"
 msgstr[1] "%u ๅญ—่Š‚/็ง’"
 
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "ไธ่ƒฝ็ผ–่พ‘ '%s'"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr "ๆ— ๆณ•ไฟฎๆ”นๆœชๅˆๅนถ็š„ .gitmodules๏ผŒๅ…ˆ่งฃๅ†ณๅˆๅนถๅ†ฒ็ช"
@@ -7128,62 +7910,139 @@ msgstr "ไฝไบŽๆœชๆฃ€ๅ‡บ็š„ๅญๆจก็ป„ '%s'"
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "่ทฏๅพ„่ง„ๆ ผ '%s' ๅœจๅญๆจก็ป„ '%.*s' ไธญ"
 
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "ๅ็š„ --ignore-submodules ๅ‚ๆ•ฐ๏ผš%s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr "ๆไบค %s ไธญไฝไบŽ่ทฏๅพ„ '%s' ็š„ๅญๆจก็ป„ๅ’ŒๅŒๅ็š„ๅญๆจก็ป„ๅ†ฒ็ชใ€‚ ่ทณ่ฟ‡ๅฎƒใ€‚"
+
 #: submodule.c:910
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "ๅญๆจก็ป„ๆก็›ฎ '%s'๏ผˆ%s๏ผ‰ๆ˜ฏไธ€ไธช %s๏ผŒไธๆ˜ฏไธ€ไธชๆไบค"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„ %s ไธญๆ‰ง่กŒ 'git rev-list <ๆไบค> --not --remotes -n 1'"
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "ๅค„็†ๅญๆจก็ป„ '%s' ๅคฑ่ดฅ"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "ๆ— ๆณ•ๅฐ† HEAD ่งฃๆžไธบๆœ‰ๆ•ˆๅผ•็”จใ€‚"
 
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "ๆญฃๅœจๆŽจ้€ๅญๆจก็ป„ '%s'\n"
+
+#: submodule.c:1161
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "ๆ— ๆณ•ๆŽจ้€ๅญๆจก็ป„ '%s'\n"
+
+#: submodule.c:1453
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "ๆ— ๆณ•่ฎฟ้—ฎๅญๆจก็ป„ '%s'"
+msgid "Fetching submodule %s%s\n"
+msgstr "ๆญฃๅœจ่Žทๅ–ๅญๆจก็ป„ %s%s\n"
 
-#: submodule.c:1651
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "ๆ— ๆณ•่ฎฟ้—ฎๅญๆจก็ป„ '%s'\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"่Žทๅ–ๅญๆจก็ป„ๆ—ถ็š„้”™่ฏฏ๏ผš\n"
+"%s"
+
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "ๆ— ๆณ•ๅฐ† '%s' ่ฏ†ๅˆซไธบไธ€ไธช git ไป“ๅบ“"
 
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„ %s ไธญๆ‰ง่กŒ 'git status --porcelain=2'"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "ๅœจๅญๆจก็ป„ %s ไธญๆ‰ง่กŒ 'git status --porcelain=2' ๅคฑ่ดฅ"
+
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„ '%s' ไธญๅฏๅŠจ 'git status'"
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„ '%s' ไธญๆ‰ง่กŒ 'git status'"
 
-#: submodule.c:1817
+#: submodule.c:1828
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„ '%s' ไธญๅ–ๆถˆ core.worktree ็š„่ฎพ็ฝฎ"
 
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "ๆ— ๆณ•้€’ๅฝ’่ฟ›ๅญๆจก็ป„่ทฏๅพ„ '%s'"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "ๆ— ๆณ•้‡็ฝฎๅญๆจก็ป„็ดขๅผ•"
+
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "ๅญๆจก็ป„ '%s' ไธญๆœ‰่„็ดขๅผ•"
 
-#: submodule.c:1959
+#: submodule.c:1970
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "ๅญๆจก็ป„ '%s' ๆ— ๆณ•่ขซๆ›ดๆ–ฐใ€‚"
 
-#: submodule.c:2007
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "ๅญๆจก็ป„ git ็›ฎๅฝ• '%s' ไฝไบŽ git ็›ฎๅฝ• '%.*s' ไธญ"
+
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "ไธๆ”ฏๆŒๅฏนๆœ‰ๅคšไธชๅทฅไฝœๅŒบ็š„ๅญๆจก็ป„ '%s' ๆ‰ง่กŒ relocate_gitdir"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "ไธ่ƒฝๆŸฅ่ฏขๅญๆจก็ป„ '%s' ็š„ๅ็งฐ"
 
-#: submodule.c:2026
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "็ฆๆญข็งปๅŠจ '%s' ๅˆฐ็Žฐๅญ˜ git ็›ฎๅฝ•ไธญ"
+
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7194,40 +8053,35 @@ msgstr ""
 "'%s' ่ฟ็งป่‡ณ\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "ๆ— ๆณ•้€’ๅฝ’่ฟ›ๅญๆจก็ป„่ทฏๅพ„ '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2209
 msgid "could not start ls-files in .."
 msgstr "ๆ— ๆณ•ๅœจ .. ไธญๅฏๅŠจ ls-files"
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree ่ฟ”ๅ›žๆœช็Ÿฅ่ฟ”ๅ›žๅ€ผ %d"
 
-#: submodule-config.c:232
+#: submodule-config.c:236
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "ๅฟฝ็•ฅๅฏ็–‘็š„ๅญๆจก็ป„ๅ็งฐ๏ผš%s"
 
-#: submodule-config.c:299
+#: submodule-config.c:303
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "submodule.fetchjobs ไธๅ…่ฎธไธบ่ดŸๅ€ผ"
 
-#: submodule-config.c:397
+#: submodule-config.c:401
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr "ๅฟฝ็•ฅๅฏ่ƒฝ่ขซ่งฃๆžไธบๅ‘ฝไปค่กŒ้€‰้กน็š„ '%s'๏ผš%s"
 
-#: submodule-config.c:486
+#: submodule-config.c:498
 #, c-format
 msgid "invalid value for %s"
 msgstr "%s ็š„ๅ€ผๆ— ๆ•ˆ"
 
-#: submodule-config.c:755
+#: submodule-config.c:765
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "ไธ่ƒฝๆ›ดๆ–ฐ .gitmodules ๆก็›ฎ %s"
@@ -7243,7 +8097,7 @@ msgstr "ๆ‰ง่กŒ trailer ๅ‘ฝไปค '%s' ๅคฑ่ดฅ"
 msgid "unknown value '%s' for key '%s'"
 msgstr "้”ฎ '%2$s' ็š„ๆœช็Ÿฅๅ–ๅ€ผ '%1$s'"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "ๅคšไบŽไธ€ไธช %s"
@@ -7262,7 +8116,7 @@ msgstr "ไธ่ƒฝ่ฏปๅ–่พ“ๅ…ฅๆ–‡ไปถ '%s'"
 msgid "could not read from stdin"
 msgstr "ไธ่ƒฝ่‡ชๆ ‡ๅ‡†่พ“ๅ…ฅ่ฏปๅ–"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
 #, c-format
 msgid "could not stat %s"
 msgstr "ไธ่ƒฝๅฏน %s ่ฐƒ็”จ stat"
@@ -7291,54 +8145,54 @@ msgstr "ไธ่ƒฝ้‡ๅ‘ฝๅไธดๆ—ถๆ–‡ไปถไธบ %s"
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "ๅฐ†่ฆ่ฎพ็ฝฎ '%1$s' ็š„ไธŠๆธธไธบ '%3$s' ็š„ '%2$s'\n"
 
-#: transport.c:142
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr "ๆ— ๆณ•่ฏปๅ– bundle '%s'"
 
-#: transport.c:208
+#: transport.c:214
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "ไผ ่พ“๏ผšๆ— ๆ•ˆ็š„ๆทฑๅบฆ้€‰้กน '%s'"
 
-#: transport.c:259
+#: transport.c:266
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "ๆŸฅ็œ‹ 'git help config' ไธญ็š„ protocol.version ่Žทๅ–ๆ›ดๅคšไฟกๆฏ"
 
-#: transport.c:260
+#: transport.c:267
 msgid "server options require protocol version 2 or later"
 msgstr "ๆœๅŠก็ซฏ้€‰้กน้œ€่ฆ็‰ˆๆœฌ 2 ๅ่ฎฎๆˆ–ๆ›ด้ซ˜"
 
-#: transport.c:625
+#: transport.c:632
 msgid "could not parse transport.color.* config"
 msgstr "ไธ่ƒฝ่งฃๆž transport.color.* ้…็ฝฎ"
 
-#: transport.c:698
+#: transport.c:705
 msgid "support for protocol v2 not implemented yet"
 msgstr "ๅ่ฎฎ v2 ็š„ๆ”ฏๆŒๅฐšๆœชๅฎž็Žฐ"
 
-#: transport.c:825
+#: transport.c:831
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "้…็ฝฎ '%s' ็š„ๅ–ๅ€ผๆœช็Ÿฅ๏ผš%s"
 
-#: transport.c:891
+#: transport.c:897
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "ไผ ่พ“ '%s' ไธๅ…่ฎธ"
 
-#: transport.c:945
+#: transport.c:949
 msgid "git-over-rsync is no longer supported"
 msgstr "ไธๅ†ๆ”ฏๆŒ git-over-rsync"
 
-#: transport.c:1040
+#: transport.c:1044
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "ไธ‹ๅˆ—ๅญๆจก็ป„่ทฏๅพ„ๆ‰€ๅŒ…ๅซ็š„ไฟฎๆ”นๅœจไปปไฝ•่ฟœ็จ‹ๆบไธญ้ƒฝๆ‰พไธๅˆฐ๏ผš\n"
 
-#: transport.c:1044
+#: transport.c:1048
 #, c-format
 msgid ""
 "\n"
@@ -7365,131 +8219,136 @@ msgstr ""
 "ไปฅๆŽจ้€่‡ณ่ฟœ็จ‹ใ€‚\n"
 "\n"
 
-#: transport.c:1052
+#: transport.c:1056
 msgid "Aborting."
 msgstr "ๆญฃๅœจ็ปˆๆญขใ€‚"
 
-#: transport.c:1193
+#: transport.c:1201
 msgid "failed to push all needed submodules"
 msgstr "ไธ่ƒฝๆŽจ้€ๅ…จ้ƒจ้œ€่ฆ็š„ๅญๆจก็ป„"
 
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:657
 msgid "operation not supported by protocol"
 msgstr "ๅ่ฎฎไธๆ”ฏๆŒ่ฏฅๆ“ไฝœ"
 
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
 msgid "full write to remote helper failed"
 msgstr "ๅฎŒๆ•ดๅ†™ๅ…ฅ่ฟœ็จ‹ๅŠฉๆ‰‹ๅคฑ่ดฅ"
 
-#: transport-helper.c:134
+#: transport-helper.c:144
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "ๆ— ๆณ•ไธบ '%s' ๆ‰พๅˆฐ่ฟœ็จ‹ๅŠฉๆ‰‹"
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:571
 msgid "can't dup helper output fd"
 msgstr "ๆ— ๆณ•ๅคๅˆถๅŠฉๆ‰‹่พ“ๅ‡บๆ–‡ไปถๅฅๆŸ„"
 
-#: transport-helper.c:201
+#: transport-helper.c:211
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr "ๆœช็Ÿฅ็š„ๅผบๅˆถ่ƒฝๅŠ› %s๏ผŒ่ฏฅ่ฟœ็จ‹ๅŠฉๆ‰‹ๅฏ่ƒฝ้œ€่ฆๆ–ฐ็‰ˆๆœฌ็š„Git"
 
-#: transport-helper.c:207
+#: transport-helper.c:217
 msgid "this remote helper should implement refspec capability"
 msgstr "่ฟœ็จ‹ๅŠฉๆ‰‹้œ€่ฆๅฎž็Žฐ refspec ่ƒฝๅŠ›"
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:425
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s ๆ„ๅค–ๅœฐ่ฏด๏ผš'%s'"
 
-#: transport-helper.c:403
+#: transport-helper.c:414
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s ไนŸ้”ๅฎšไบ† %s"
 
-#: transport-helper.c:481
+#: transport-helper.c:493
 msgid "couldn't run fast-import"
 msgstr "ไธ่ƒฝๆ‰ง่กŒ fast-import"
 
-#: transport-helper.c:504
+#: transport-helper.c:516
 msgid "error while running fast-import"
 msgstr "ๆ‰ง่กŒ fast-import ๅ‡บ้”™"
 
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:545 transport-helper.c:1134
 #, c-format
 msgid "could not read ref %s"
 msgstr "ๆ— ๆณ•่ฏปๅ–ๅผ•็”จ %s"
 
-#: transport-helper.c:578
+#: transport-helper.c:590
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "่ฟžๆŽฅๆ—ถๆœช็Ÿฅ็š„ๅ“ๅบ”๏ผš%s"
 
-#: transport-helper.c:600
+#: transport-helper.c:612
 msgid "setting remote service path not supported by protocol"
 msgstr "ๅ่ฎฎไธๆ”ฏๆŒ่ฎพ็ฝฎ่ฟœ็จ‹ๆœๅŠก่ทฏๅพ„"
 
-#: transport-helper.c:602
+#: transport-helper.c:614
 msgid "invalid remote service path"
 msgstr "ๆ— ๆ•ˆ็š„่ฟœ็จ‹ๆœๅŠก่ทฏๅพ„"
 
-#: transport-helper.c:648
+#: transport-helper.c:660
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "ไธ่ƒฝ่ฟžๆŽฅๅˆฐๅญๆœๅŠก %s"
 
-#: transport-helper.c:720
+#: transport-helper.c:736
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "้ข„ๆœŸ ok/error๏ผŒๅŠฉๆ‰‹่ฏด '%s'"
 
-#: transport-helper.c:773
+#: transport-helper.c:789
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "ๅŠฉๆ‰‹ๆŠฅๅ‘Š %s ็š„ๆ„ๅค–็Šถๆ€"
 
-#: transport-helper.c:834
+#: transport-helper.c:850
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆŒ dry-run"
 
-#: transport-helper.c:837
+#: transport-helper.c:853
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆŒ --signed"
 
-#: transport-helper.c:840
+#: transport-helper.c:856
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆŒ --signed=if-asked"
 
-#: transport-helper.c:847
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆŒ --atomic"
+
+#: transport-helper.c:867
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆŒ 'push-option'"
 
-#: transport-helper.c:945
+#: transport-helper.c:965
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-heper ไธๆ”ฏๆŒ push๏ผŒ้œ€่ฆๅผ•็”จ่กจ่พพๅผ"
 
-#: transport-helper.c:950
+#: transport-helper.c:970
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆŒ 'force'"
 
-#: transport-helper.c:997
+#: transport-helper.c:1017
 msgid "couldn't run fast-export"
 msgstr "ๆ— ๆณ•ๆ‰ง่กŒ fast-export"
 
-#: transport-helper.c:1002
+#: transport-helper.c:1022
 msgid "error while running fast-export"
 msgstr "ๆ‰ง่กŒ fast-export ๆ—ถๅ‡บ้”™"
 
-#: transport-helper.c:1027
+#: transport-helper.c:1047
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -7498,67 +8357,67 @@ msgstr ""
 "ๆฒกๆœ‰ๅ…ฑๅŒ็š„ๅผ•็”จๅนถไธ”ไนŸๆฒกๆœ‰ๆŒ‡ๅฎš๏ผŒไป€ไนˆไนŸไธไผšๅšใ€‚\n"
 "ๅฏ่ƒฝๆ‚จๅบ”่ฏฅๆŒ‡ๅฎšไธ€ไธชๅˆ†ๆ”ฏๅฆ‚ 'master'ใ€‚\n"
 
-#: transport-helper.c:1091
+#: transport-helper.c:1120
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "ๅผ•็”จๅˆ—่กจไธญๆ ผๅผ้”™่ฏฏ็š„ๅ“ๅบ”๏ผš%s"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1272
 #, c-format
 msgid "read(%s) failed"
 msgstr "่ฏปๅ–๏ผˆ%s๏ผ‰ๅคฑ่ดฅ"
 
-#: transport-helper.c:1271
+#: transport-helper.c:1299
 #, c-format
 msgid "write(%s) failed"
 msgstr "ๅ†™๏ผˆ%s๏ผ‰ๅคฑ่ดฅ"
 
-#: transport-helper.c:1320
+#: transport-helper.c:1348
 #, c-format
 msgid "%s thread failed"
 msgstr "%s ็บฟ็จ‹ๅคฑ่ดฅ"
 
-#: transport-helper.c:1324
+#: transport-helper.c:1352
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s ็บฟ็จ‹็ญ‰ๅพ…ๅคฑ่ดฅ๏ผš%s"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1371 transport-helper.c:1375
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "ไธ่ƒฝๅฏๅŠจ็บฟ็จ‹ๆฅๆ‹ท่ดๆ•ฐๆฎ๏ผš%s"
 
-#: transport-helper.c:1384
+#: transport-helper.c:1412
 #, c-format
 msgid "%s process failed to wait"
 msgstr "%s ่ฟ›็จ‹็ญ‰ๅพ…ๅคฑ่ดฅ"
 
-#: transport-helper.c:1388
+#: transport-helper.c:1416
 #, c-format
 msgid "%s process failed"
 msgstr "%s ่ฟ›็จ‹ๅคฑ่ดฅ"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1434 transport-helper.c:1443
 msgid "can't start thread for copying data"
 msgstr "ไธ่ƒฝๅฏๅŠจ็บฟ็จ‹ๆฅๆ‹ท่ดๆ•ฐๆฎ"
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "ๅคช็Ÿญ็š„ๆ ‘ๅฏน่ฑก"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "ๆ ‘ๅฏน่ฑกไธญ็š„ๆก็›ฎๆจกๅผ้”™่ฏฏ"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "ๆ ‘ๅฏน่ฑกๆก็›ฎไธญ็ฉบ็š„ๆ–‡ไปถๅ"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "ๅคช็Ÿญ็š„ๆ ‘ๆ–‡ไปถ"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7567,7 +8426,7 @@ msgstr ""
 "ๆ‚จๅฏนไธ‹ๅˆ—ๆ–‡ไปถ็š„ๆœฌๅœฐไฟฎๆ”นๅฐ†่ขซๆฃ€ๅ‡บๆ“ไฝœ่ฆ†็›–๏ผš\n"
 "%%s่ฏทๅœจๅˆ‡ๆขๅˆ†ๆ”ฏๅ‰ๆไบคๆˆ–่ดฎ่—ๆ‚จ็š„ไฟฎๆ”นใ€‚"
 
-#: unpack-trees.c:113
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7576,7 +8435,7 @@ msgstr ""
 "ๆ‚จๅฏนไธ‹ๅˆ—ๆ–‡ไปถ็š„ๆœฌๅœฐไฟฎๆ”นๅฐ†่ขซๆฃ€ๅ‡บๆ“ไฝœ่ฆ†็›–๏ผš\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7585,7 +8444,7 @@ msgstr ""
 "ๆ‚จๅฏนไธ‹ๅˆ—ๆ–‡ไปถ็š„ๆœฌๅœฐไฟฎๆ”นๅฐ†่ขซๅˆๅนถๆ“ไฝœ่ฆ†็›–๏ผš\n"
 "%%s่ฏทๅœจๅˆๅนถๅ‰ๆไบคๆˆ–่ดฎ่—ๆ‚จ็š„ไฟฎๆ”นใ€‚"
 
-#: unpack-trees.c:118
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7594,7 +8453,7 @@ msgstr ""
 "ๆ‚จๅฏนไธ‹ๅˆ—ๆ–‡ไปถ็š„ๆœฌๅœฐไฟฎๆ”นๅฐ†่ขซๅˆๅนถๆ“ไฝœ่ฆ†็›–๏ผš\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7603,7 +8462,7 @@ msgstr ""
 "ๆ‚จๅฏนไธ‹ๅˆ—ๆ–‡ไปถ็š„ๆœฌๅœฐไฟฎๆ”นๅฐ†่ขซ %s ่ฆ†็›–๏ผš\n"
 "%%s่ฏทๅœจ %s ไน‹ๅ‰ๆไบคๆˆ–่ดฎ่—ๆ‚จ็š„ไฟฎๆ”นใ€‚"
 
-#: unpack-trees.c:123
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7612,7 +8471,7 @@ msgstr ""
 "ๆ‚จๅฏนไธ‹ๅˆ—ๆ–‡ไปถ็š„ๆœฌๅœฐไฟฎๆ”นๅฐ†่ขซ %s ่ฆ†็›–๏ผš\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7621,7 +8480,7 @@ msgstr ""
 "ๆ›ดๆ–ฐๅฆ‚ไธ‹็›ฎๅฝ•ๅฐ†ไผšไธขๅคฑๅ…ถไธญๆœช่ทŸ่ธช็š„ๆ–‡ไปถ๏ผš\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7630,7 +8489,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบๆฃ€ๅ‡บๆ“ไฝœ่€Œ่ขซๅˆ ้™ค๏ผš\n"
 "%%s่ฏทๅœจๅˆ‡ๆขๅˆ†ๆ”ฏไน‹ๅ‰็งปๅŠจๆˆ–ๅˆ ้™คใ€‚"
 
-#: unpack-trees.c:134
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7639,7 +8498,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบๆฃ€ๅ‡บๆ“ไฝœ่€Œ่ขซๅˆ ้™ค๏ผš\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7648,7 +8507,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบๅˆๅนถๆ“ไฝœ่€Œ่ขซๅˆ ้™ค๏ผš\n"
 "%%s่ฏทๅœจๅˆๅนถๅ‰็งปๅŠจๆˆ–ๅˆ ้™คใ€‚"
 
-#: unpack-trees.c:139
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7657,7 +8516,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบๅˆๅนถๆ“ไฝœ่€Œ่ขซๅˆ ้™ค๏ผš\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7666,7 +8525,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบ %s ๆ“ไฝœ่€Œ่ขซๅˆ ้™ค๏ผš\n"
 "%%s่ฏทๅœจ %s ๅ‰็งปๅŠจๆˆ–ๅˆ ้™คใ€‚"
 
-#: unpack-trees.c:144
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7675,7 +8534,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบ %s ๆ“ไฝœ่€Œ่ขซๅˆ ้™ค๏ผš\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7685,7 +8544,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบๆฃ€ๅ‡บๆ“ไฝœ่€Œ่ขซ่ฆ†็›–๏ผš\n"
 "%%s่ฏทๅœจๅˆ‡ๆขๅˆ†ๆ”ฏๅ‰็งปๅŠจๆˆ–ๅˆ ้™คใ€‚"
 
-#: unpack-trees.c:152
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7695,7 +8554,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบๆฃ€ๅ‡บๆ“ไฝœ่€Œ่ขซ่ฆ†็›–๏ผš\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7704,7 +8563,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบๅˆๅนถๆ“ไฝœ่€Œ่ขซ่ฆ†็›–๏ผš\n"
 "%%s่ฏทๅœจๅˆๅนถๅ‰็งปๅŠจๆˆ–ๅˆ ้™คใ€‚"
 
-#: unpack-trees.c:157
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7713,7 +8572,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบๅˆๅนถๆ“ไฝœ่€Œ่ขซ่ฆ†็›–๏ผš\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7722,7 +8581,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบ %s ๆ“ไฝœ่€Œ่ขซ่ฆ†็›–๏ผš\n"
 "%%s่ฏทๅœจ %s ๅ‰็งปๅŠจๆˆ–ๅˆ ้™คใ€‚"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7731,12 +8590,12 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๅฐ†ไผšๅ› ไธบ %s ๆ“ไฝœ่€Œ่ขซ่ฆ†็›–๏ผš\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:169
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "ๆก็›ฎ '%s' ๅ’Œ '%s' ้‡ๅ ใ€‚ๆ— ๆณ•ๅˆๅนถใ€‚"
 
-#: unpack-trees.c:173
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -7745,7 +8604,7 @@ msgstr ""
 "ๆ— ๆณ•ๆ›ดๆ–ฐ็จ€็–ๆฃ€ๅ‡บ๏ผšๅฆ‚ไธ‹ๆก็›ฎไธๆ˜ฏๆœ€ๆ–ฐ๏ผš\n"
 "%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -7755,7 +8614,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆ–‡ไปถๅฐ†่ขซ็จ€็–ๆฃ€ๅ‡บๆ›ดๆ–ฐๆ‰€่ฆ†็›–๏ผš\n"
 "%s"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -7765,7 +8624,7 @@ msgstr ""
 "ๅทฅไฝœๅŒบไธญไธ‹ๅˆ—ๆ–‡ไปถๅฐ†่ขซ็จ€็–ๆฃ€ๅ‡บๆ›ดๆ–ฐๆ‰€ๅˆ ้™ค๏ผš\n"
 "%s"
 
-#: unpack-trees.c:179
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -7774,16 +8633,16 @@ msgstr ""
 "ๆ— ๆณ•ๆ›ดๆ–ฐๅญๆจก็ป„๏ผš\n"
 "%s"
 
-#: unpack-trees.c:256
+#: unpack-trees.c:255
 #, c-format
 msgid "Aborting\n"
 msgstr "ๆญฃๅœจ็ปˆๆญข\n"
 
-#: unpack-trees.c:318
+#: unpack-trees.c:317
 msgid "Updating files"
 msgstr "ๆญฃๅœจๆ›ดๆ–ฐๆ–‡ไปถ"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:349
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -7792,6 +8651,10 @@ msgstr ""
 "ไปฅไธ‹่ทฏๅพ„ๅ‘็”Ÿ็ขฐๆ’ž๏ผˆๅฆ‚๏ผšๅœจไธๅŒบๅˆ†ๅคงๅฐๅ†™็š„ๆ–‡ไปถ็ณป็ปŸไธŠ็š„ๅŒบๅˆ†ๅคงๅฐๅ†™็š„่ทฏๅพ„๏ผ‰๏ผŒ\n"
 "ๅนถไธ”็ขฐๆ’ž็ป„ไธญๅชๆœ‰ไธ€ไธชๆ–‡ไปถๅญ˜ๅœจๅทฅไฝœๅŒบไธญ๏ผš\n"
 
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "ๆญฃๅœจๆ›ดๆ–ฐ็ดขๅผ•ๆ ‡ๅฟ—"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "ๆ— ๆ•ˆ็š„ URL ๆ–นๆกˆๅ็งฐๆˆ–ไธขๅคฑ '://' ๅŽ็ผ€"
@@ -7821,47 +8684,51 @@ msgstr "ๆ— ๆ•ˆ็š„็ซฏๅฃๅท"
 msgid "invalid '..' path segment"
 msgstr "ๆ— ๆ•ˆ็š„ '..' ่ทฏๅพ„็‰‡ๆฎต"
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "ๆญฃๅœจ่Žทๅ–ๅฏน่ฑก"
+
+#: worktree.c:259 builtin/am.c:2099
 #, c-format
 msgid "failed to read '%s'"
 msgstr "่ฏปๅ– '%s' ๅคฑ่ดฅ"
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "ๅœจไธปๅทฅไฝœๅŒบ็š„ '%s' ไธๆ˜ฏไป“ๅบ“็›ฎๅฝ•"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "ๆ–‡ไปถ '%s' ไธๅŒ…ๅซๅทฅไฝœๅŒบ็š„็ปๅฏน่ทฏๅพ„"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' ไธๅญ˜ๅœจ"
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' ไธๆ˜ฏไธ€ไธช .git ๆ–‡ไปถ๏ผŒ้”™่ฏฏ็  %d"
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' ๆฒกๆœ‰ๆŒ‡ๅ›žๅˆฐ '%s'"
 
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ '%s' ่ฟ›่กŒ่ฏปๅ†™"
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
 #, c-format
 msgid "unable to access '%s'"
 msgstr "ไธ่ƒฝ่ฎฟ้—ฎ '%s'"
 
-#: wrapper.c:632
+#: wrapper.c:596
 msgid "unable to get current working directory"
 msgstr "ไธ่ƒฝ่Žทๅ–ๅฝ“ๅ‰ๅทฅไฝœ็›ฎๅฝ•"
 
@@ -8216,85 +9083,95 @@ msgstr "  ๏ผˆๆ‰€ๆœ‰ๅ†ฒ็ชๅทฒ่งฃๅ†ณ๏ผš่ฟ่กŒ \"git cherry-pick --continue\"๏ผ‰"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
 #: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git cherry-pick --skip\" ่ทณ่ฟ‡ๆญค่กฅไธ๏ผ‰"
+
+#  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
+#: wt-status.c:1439
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  ๏ผˆไฝฟ็”จ \"git cherry-pick --abort\" ไปฅๅ–ๆถˆๆ‹ฃ้€‰ๆ“ไฝœ๏ผ‰"
 
-#: wt-status.c:1447
+#: wt-status.c:1449
 msgid "Revert currently in progress."
 msgstr "่ฟ˜ๅŽŸๆ“ไฝœๆญฃๅœจ่กŒไธญใ€‚"
 
-#: wt-status.c:1450
+#: wt-status.c:1452
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "ๆ‚จๅœจๆ‰ง่กŒๅ่ฝฌๆไบค %s ็š„ๆ“ไฝœใ€‚"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: wt-status.c:1456
+#: wt-status.c:1458
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  ๏ผˆ่งฃๅ†ณๅ†ฒ็ชๅนถๆ‰ง่กŒ \"git revert --continue\"๏ผ‰"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: wt-status.c:1459
+#: wt-status.c:1461
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  ๏ผˆๆ‰ง่กŒ \"git revert --continue\" ไปฅ็ปง็ปญ๏ผ‰"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: wt-status.c:1462
+#: wt-status.c:1464
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  ๏ผˆๆ‰€ๆœ‰ๅ†ฒ็ชๅทฒ่งฃๅ†ณ๏ผšๆ‰ง่กŒ \"git revert --continue\"๏ผ‰"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git revert --skip\" ่ทณ่ฟ‡ๆญค่กฅไธ๏ผ‰"
+
+#  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
+#: wt-status.c:1468
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  ๏ผˆไฝฟ็”จ \"git revert --abort\" ไปฅๅ–ๆถˆๅ่ฝฌๆไบคๆ“ไฝœ๏ผ‰"
 
-#: wt-status.c:1474
+#: wt-status.c:1478
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "ๆ‚จๅœจๆ‰ง่กŒไปŽๅˆ†ๆ”ฏ '%s' ๅผ€ๅง‹็š„ไบŒๅˆ†ๆŸฅๆ‰พๆ“ไฝœใ€‚"
 
-#: wt-status.c:1478
+#: wt-status.c:1482
 msgid "You are currently bisecting."
 msgstr "ๆ‚จๅœจๆ‰ง่กŒไบŒๅˆ†ๆŸฅๆ‰พๆ“ไฝœใ€‚"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: wt-status.c:1481
+#: wt-status.c:1485
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  ๏ผˆไฝฟ็”จ \"git bisect reset\" ไปฅๅ›žๅˆฐๅŽŸๆœ‰ๅˆ†ๆ”ฏ๏ผ‰"
 
-#: wt-status.c:1690
+#: wt-status.c:1694
 msgid "On branch "
 msgstr "ไฝไบŽๅˆ†ๆ”ฏ "
 
-#: wt-status.c:1697
+#: wt-status.c:1701
 msgid "interactive rebase in progress; onto "
 msgstr "ไบคไบ’ๅผๅ˜ๅŸบๆ“ไฝœๆญฃๅœจ่ฟ›่กŒไธญ๏ผ›่‡ณ "
 
-#: wt-status.c:1699
+#: wt-status.c:1703
 msgid "rebase in progress; onto "
 msgstr "ๅ˜ๅŸบๆ“ไฝœๆญฃๅœจ่ฟ›่กŒไธญ๏ผ›่‡ณ "
 
-#: wt-status.c:1709
+#: wt-status.c:1713
 msgid "Not currently on any branch."
 msgstr "ๅฝ“ๅ‰ไธๅœจไปปไฝ•ๅˆ†ๆ”ฏไธŠใ€‚"
 
-#: wt-status.c:1726
+#: wt-status.c:1730
 msgid "Initial commit"
 msgstr "ๅˆๅง‹ๆไบค"
 
-#: wt-status.c:1727
+#: wt-status.c:1731
 msgid "No commits yet"
 msgstr "ๅฐšๆ— ๆไบค"
 
-#: wt-status.c:1741
+#: wt-status.c:1745
 msgid "Untracked files"
 msgstr "ๆœช่ทŸ่ธช็š„ๆ–‡ไปถ"
 
-#: wt-status.c:1743
+#: wt-status.c:1747
 msgid "Ignored files"
 msgstr "ๅฟฝ็•ฅ็š„ๆ–‡ไปถ"
 
-#: wt-status.c:1747
+#: wt-status.c:1751
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8304,221 +9181,230 @@ msgstr ""
 "่€—่ดนไบ† %.2f ็ง’ไปฅๆžšไธพๆœช่ทŸ่ธช็š„ๆ–‡ไปถใ€‚'status -uno' ไนŸ่ฎธ่ƒฝๆ้ซ˜้€Ÿๅบฆ๏ผŒ\n"
 "ไฝ†ๆ‚จ้œ€่ฆๅฐๅฟƒไธ่ฆๅฟ˜ไบ†ๆทปๅŠ ๆ–ฐๆ–‡ไปถ๏ผˆๅ‚่ง 'git help status'๏ผ‰ใ€‚"
 
-#: wt-status.c:1753
+#: wt-status.c:1757
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "ๆœช่ทŸ่ธช็š„ๆ–‡ไปถๆฒกๆœ‰ๅˆ—ๅ‡บ%s"
 
 #  ่ฏ‘่€…๏ผšไธญๆ–‡ๅญ—็ฌฆไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆ ้™คๅ‰ๅฏผ็ฉบๆ ผ
-#: wt-status.c:1755
+#: wt-status.c:1759
 msgid " (use -u option to show untracked files)"
 msgstr "๏ผˆไฝฟ็”จ -u ๅ‚ๆ•ฐๆ˜พ็คบๆœช่ทŸ่ธช็š„ๆ–‡ไปถ๏ผ‰"
 
-#: wt-status.c:1761
+#: wt-status.c:1765
 msgid "No changes"
 msgstr "ๆฒกๆœ‰ไฟฎๆ”น"
 
-#: wt-status.c:1766
+#: wt-status.c:1770
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "ไฟฎๆ”นๅฐšๆœชๅŠ ๅ…ฅๆไบค๏ผˆไฝฟ็”จ \"git add\" ๅ’Œ/ๆˆ– \"git commit -a\"๏ผ‰\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1773
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "ไฟฎๆ”นๅฐšๆœชๅŠ ๅ…ฅๆไบค\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1776
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "ๆไบคไธบ็ฉบ๏ผŒไฝ†ๆ˜ฏๅญ˜ๅœจๅฐšๆœช่ทŸ่ธช็š„ๆ–‡ไปถ๏ผˆไฝฟ็”จ \"git add\" ๅปบ็ซ‹่ทŸ่ธช๏ผ‰\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1779
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "ๆไบคไธบ็ฉบ๏ผŒไฝ†ๆ˜ฏๅญ˜ๅœจๅฐšๆœช่ทŸ่ธช็š„ๆ–‡ไปถ\n"
 
 #  ่ฏ‘่€…๏ผšไธญๆ–‡ๅญ—็ฌฆไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆ ้™คๅ‰ๅฏผ็ฉบๆ ผ
-#: wt-status.c:1778
+#: wt-status.c:1782
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "ๆ— ๆ–‡ไปถ่ฆๆไบค๏ผˆๅˆ›ๅปบ/ๆ‹ท่ดๆ–‡ไปถๅนถไฝฟ็”จ \"git add\" ๅปบ็ซ‹่ทŸ่ธช๏ผ‰\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
 #, c-format
 msgid "nothing to commit\n"
 msgstr "ๆ— ๆ–‡ไปถ่ฆๆไบค\n"
 
 #  ่ฏ‘่€…๏ผšไธญๆ–‡ๅญ—็ฌฆไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆ ้™คๅ‰ๅฏผ็ฉบๆ ผ
-#: wt-status.c:1784
+#: wt-status.c:1788
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "ๆ— ๆ–‡ไปถ่ฆๆไบค๏ผˆไฝฟ็”จ -u ๆ˜พ็คบๆœช่ทŸ่ธช็š„ๆ–‡ไปถ๏ผ‰\n"
 
 #  ่ฏ‘่€…๏ผšไธญๆ–‡ๅญ—็ฌฆไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆ ้™คๅ‰ๅฏผ็ฉบๆ ผ
-#: wt-status.c:1788
+#: wt-status.c:1792
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "ๆ— ๆ–‡ไปถ่ฆๆไบค๏ผŒๅนฒๅ‡€็š„ๅทฅไฝœๅŒบ\n"
 
-#: wt-status.c:1901
+#: wt-status.c:1905
 msgid "No commits yet on "
 msgstr "ๅฐšๆ— ๆไบคๅœจ "
 
-#: wt-status.c:1905
+#: wt-status.c:1909
 msgid "HEAD (no branch)"
 msgstr "HEAD๏ผˆ้žๅˆ†ๆ”ฏ๏ผ‰"
 
-#: wt-status.c:1936
+#: wt-status.c:1940
 msgid "different"
 msgstr "ไธๅŒ"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅฅๅฐพ็ฉบๆ ผ
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
 msgid "behind "
 msgstr "่ฝๅŽ "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
 msgid "ahead "
 msgstr "้ข†ๅ…ˆ "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "ไธ่ƒฝ%s๏ผšๆ‚จๆœ‰ๆœชๆš‚ๅญ˜็š„ๅ˜ๆ›ดใ€‚"
 
-#: wt-status.c:2472
+#: wt-status.c:2476
 msgid "additionally, your index contains uncommitted changes."
 msgstr "ๅฆๅค–๏ผŒๆ‚จ็š„็ดขๅผ•ไธญๅŒ…ๅซๆœชๆไบค็š„ๅ˜ๆ›ดใ€‚"
 
-#: wt-status.c:2474
+#: wt-status.c:2478
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "ไธ่ƒฝ%s๏ผšๆ‚จ็š„็ดขๅผ•ไธญๅŒ…ๅซๆœชๆไบค็š„ๅ˜ๆ›ดใ€‚"
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "ๅˆ ้™ค '%s' ๅคฑ่ดฅ"
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<้€‰้กน>] [--] <่ทฏๅพ„่ง„ๆ ผ>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "ๆ„ๅค–็š„ๅทฎๅผ‚็Šถๆ€ %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
 msgid "updating files failed"
 msgstr "ๆ›ดๆ–ฐๆ–‡ไปถๅคฑ่ดฅ"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "ๅˆ ้™ค '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "ๅˆทๆ–ฐ็ดขๅผ•ไน‹ๅŽๅฐšๆœช่ขซๆš‚ๅญ˜็š„ๅ˜ๆ›ด๏ผš"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:266 builtin/rev-parse.c:899
 msgid "Could not read the index"
 msgstr "ไธ่ƒฝ่ฏปๅ–็ดขๅผ•"
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "ๆ— ๆณ•ไธบๅ†™ๅ…ฅๆ‰“ๅผ€ '%s'ใ€‚"
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr "ไธ่ƒฝ็”Ÿๆˆ่กฅไธ"
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr "็ผ–่พ‘่กฅไธๅคฑ่ดฅ"
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "ไธ่ƒฝๅฏน '%s' ่ฐƒ็”จ stat"
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr "็ฉบ่กฅไธใ€‚ๅผ‚ๅธธ็ปˆๆญขใ€‚"
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "ไธ่ƒฝๅบ”็”จ '%s'"
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "ไธ‹ๅˆ—่ทฏๅพ„ๆ นๆฎๆ‚จ็š„ไธ€ไธช .gitignore ๆ–‡ไปถ่€Œ่ขซๅฟฝ็•ฅ๏ผš\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "ๆผ”ไน "
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr "ไบคไบ’ๅผๆ‹ฃ้€‰"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
 msgid "select hunks interactively"
 msgstr "ไบคไบ’ๅผๆŒ‘้€‰ๆ•ฐๆฎๅ—"
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr "็ผ–่พ‘ๅฝ“ๅ‰ๅทฎๅผ‚ๅนถๅบ”็”จ"
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr "ๅ…่ฎธๆทปๅŠ ๅฟฝ็•ฅ็š„ๆ–‡ไปถ"
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr "ๆ›ดๆ–ฐๅทฒ่ทŸ่ธช็š„ๆ–‡ไปถ"
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "ๅฏนๅทฒ่ทŸ่ธชๆ–‡ไปถ๏ผˆๆš—ๅซ -u๏ผ‰้‡ๆ–ฐๅฝ’ไธ€ๆข่กŒ็ฌฆ"
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr "ๅช่ฎฐๅฝ•๏ผŒ่ฏฅ่ทฏๅพ„็จๅŽๅ†ๆทปๅŠ "
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr "ๆทปๅŠ ๆ‰€ๆœ‰ๆ”นๅ˜็š„ๅทฒ่ทŸ่ธชๆ–‡ไปถๅ’Œๆœช่ทŸ่ธชๆ–‡ไปถ"
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "ๅฟฝ็•ฅๅทฅไฝœๅŒบไธญ็งป้™ค็š„่ทฏๅพ„๏ผˆๅ’Œ --no-all ็›ธๅŒ๏ผ‰"
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr "ไธๆทปๅŠ ๏ผŒๅชๅˆทๆ–ฐ็ดขๅผ•"
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr "่ทณ่ฟ‡ๅ› ๅ‡บ้”™ไธ่ƒฝๆทปๅŠ ็š„ๆ–‡ไปถ"
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "ๆฃ€ๆŸฅๅœจๆผ”ไน ๆจกๅผไธ‹ๆ–‡ไปถ๏ผˆๅณไฝฟไธๅญ˜ๅœจ๏ผ‰ๆ˜ฏๅฆ่ขซๅฟฝ็•ฅ"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "่ฆ†็›–ๅˆ—่กจ้‡Œๆ–‡ไปถ็š„ๅฏๆ‰ง่กŒไฝ"
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr "ๅˆ›ๅปบไธ€ไธชๅตŒๅ…ฅๅผไป“ๅบ“ๆ—ถ็ป™ไบˆ่ญฆๅ‘Š"
 
-#: builtin/add.c:326
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "`git stash -p` ็š„ๅŽ็ซฏ"
+
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8535,9 +9421,8 @@ msgid ""
 "\n"
 "See \"git help submodule\" for more information."
 msgstr ""
-"ๆ‚จๅœจๅฝ“ๅ‰ไป“ๅบ“ไธญๆทปๅŠ ไบ†ๅฆๅค–ไธ€ไธชGitไป“ๅบ“ใ€‚ๅ…‹้š†ๅค–ๅฑ‚็š„ไป“ๅบ“ๅฐ†ไธๅŒ…ๅซๅตŒๅ…ฅไป“ๅบ“็š„ๅ†…ๅฎน๏ผŒๅนถ"
-"ไธ”ไธ็Ÿฅ้“่ฏฅๅฆ‚ไฝ•่Žทๅ–ๅฎƒใ€‚\n"
-"ๅฆ‚ๆžœๆ‚จ่ฆๆทปๅŠ ไธ€ไธชๅญๆจก็ป„๏ผŒไฝฟ็”จ๏ผš\n"
+"ๆ‚จๅœจๅฝ“ๅ‰ไป“ๅบ“ไธญๆทปๅŠ ไบ†ๅฆไธ€ไธชGitไป“ๅบ“ใ€‚ๅ…‹้š†ๅค–ๅฑ‚็š„ไป“ๅบ“ๅฐ†ไธๅŒ…ๅซๅตŒๅ…ฅไป“ๅบ“็š„\n"
+"ๅ†…ๅฎน๏ผŒๅนถไธ”ไธ็Ÿฅ้“่ฏฅๅฆ‚ไฝ•่Žทๅ–ๅฎƒใ€‚ๅฆ‚ๆžœๆ‚จ่ฆๆทปๅŠ ไธ€ไธชๅญๆจก็ป„๏ผŒไฝฟ็”จ๏ผš\n"
 "\n"
 "\tgit submodule add <url> %s\n"
 "\n"
@@ -8547,146 +9432,170 @@ msgstr ""
 "\n"
 "ๅ‚่ง \"git help submodule\" ่Žทๅ–ๆ›ดๅคšไฟกๆฏใ€‚"
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "ๆญฃๅœจๆทปๅŠ ๅตŒๅ…ฅๅผ git ไป“ๅบ“๏ผš%s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "ไฝฟ็”จ -f ๅ‚ๆ•ฐๅฆ‚ๆžœๆ‚จ็กฎๅฎž่ฆๆทปๅŠ ๅฎƒไปฌใ€‚\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"ๅฆ‚ๆžœๆ‚จ็กฎๅฎž่ฆๆทปๅŠ ๅฎƒไปฌ๏ผŒไฝฟ็”จ -f ๅ‚ๆ•ฐใ€‚\n"
+"่ฟ่กŒไธ‹้ข็š„ๅ‘ฝไปคๆฅๅ…ณ้—ญๆœฌๆถˆๆฏ\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr "ๆทปๅŠ ๆ–‡ไปถๅคฑ่ดฅ"
 
-#: builtin/add.c:419
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file ไธŽ --interactive/--patch ไธๅ…ผๅฎน"
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file ไธŽ --edit ไธๅ…ผๅฎน"
+
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr "-A ๅ’Œ -u ้€‰้กนไบ’ๆ–ฅ"
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "้€‰้กน --ignore-missing ๅช่ƒฝๅ’Œ --dry-run ๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "ๅ‚ๆ•ฐ --chmod ๅ–ๅ€ผ '%s' ๅฟ…้กปๆ˜ฏ -x ๆˆ– +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--pathspec-from-file ไธŽ่ทฏๅพ„่กจ่พพๅผๅ‚ๆ•ฐไธๅ…ผๅฎน"
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul ้œ€่ฆ --pathspec-from-file"
+
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "ๆฒกๆœ‰ๆŒ‡ๅฎšๆ–‡ไปถ๏ผŒไนŸๆฒกๆœ‰ๆ–‡ไปถ่ขซๆทปๅŠ ใ€‚\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "ไนŸ่ฎธๆ‚จๆƒณ่ฆๆ‰ง่กŒ 'git add .'๏ผŸ\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"ไนŸ่ฎธๆ‚จๆƒณ่ฆๆ‰ง่กŒ 'git add .'๏ผŸ\n"
+"่ฟ่กŒไธ‹้ข็š„ๅ‘ฝไปคๆฅๅ…ณ้—ญๆœฌๆถˆๆฏ\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "ไธ่ƒฝ่งฃๆžไฝœ่€…่„šๆœฌ"
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' ่ขซ applypatch-msg ้’ฉๅญๅˆ ้™ค"
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "้žๆณ•็š„่พ“ๅ…ฅ่กŒ๏ผš'%s'ใ€‚"
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "ไปŽ '%s' ๆ‹ท่ดๆณจ่งฃๅˆฐ '%s' ๆ—ถๅคฑ่ดฅ"
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "fseek ๅคฑ่ดฅ"
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "ๆ— ๆณ•่งฃๆž่กฅไธ '%s'"
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "ไธ€ๆฌกๅช่ƒฝๆœ‰ไธ€ไธช StGIT ่กฅไธ้˜Ÿๅˆ—่ขซๅบ”็”จ"
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "ๆ— ๆ•ˆ็š„ๆ—ถ้—ดๆˆณ"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "ๆ— ๆ•ˆ็š„ๆ—ฅๆœŸ่กŒ"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "ๆ— ๆ•ˆ็š„ๆ—ถๅŒบๅ็งปๅ€ผ"
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "่กฅไธๆ ผๅผๆŽขๆต‹ๅคฑ่ดฅใ€‚"
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "ๅˆ›ๅปบ็›ฎๅฝ• '%s' ๅคฑ่ดฅ"
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "ๆ‹†ๅˆ†่กฅไธๅคฑ่ดฅใ€‚"
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "ๆ— ๆณ•ๅ†™ๅ…ฅ็ดขๅผ•ๆ–‡ไปถ"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "ๅฝ“ๆ‚จ่งฃๅ†ณ่ฟ™ไธ€้—ฎ้ข˜๏ผŒๆ‰ง่กŒ \"%s --continue\"ใ€‚"
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "ๅฆ‚ๆžœๆ‚จๆƒณ่ฆ่ทณ่ฟ‡่ฟ™ไธ€่กฅไธ๏ผŒๅˆ™ๆ‰ง่กŒ \"%s --skip\"ใ€‚"
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "่‹ฅ่ฆๅคๅŽŸ่‡ณๅŽŸๅง‹ๅˆ†ๆ”ฏๅนถๅœๆญข่กฅไธๆ“ไฝœ๏ผŒๆ‰ง่กŒ \"%s --abort\"ใ€‚"
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr "่กฅไธไฝฟ็”จ format=flowed ๆ ผๅผๅ‘้€๏ผŒ่กŒๅฐพ็š„็ฉบๆ ผๅฏ่ƒฝไผšไธขๅคฑใ€‚"
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "่กฅไธไธบ็ฉบใ€‚"
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "ๆ— ๆ•ˆ็š„่บซไปฝๆ ‡่ฏ†๏ผš%.*s"
+msgid "missing author line in commit %s"
+msgstr "ๅœจๆไบค %s ไธญ็ผบๅคฑไฝœ่€…่กŒ"
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "ไธ่ƒฝ่งฃๆžๆไบค %s"
+msgid "invalid ident line: %.*s"
+msgstr "ๆ— ๆ•ˆ็š„่บซไปฝๆ ‡่ฏ†๏ผš%.*s"
 
-#: builtin/am.c:1496
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "ไป“ๅบ“็ผบไนๅฟ…่ฆ็š„ๆ•ฐๆฎๅฏน่ฑกไปฅ่ฟ›่กŒไธ‰ๆ–นๅˆๅนถใ€‚"
 
-#: builtin/am.c:1498
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr "ไฝฟ็”จ็ดขๅผ•ๆฅ้‡ๅปบไธ€ไธช๏ผˆไธ‰ๆ–นๅˆๅนถ็š„๏ผ‰ๅŸบ็ก€็›ฎๅฝ•ๆ ‘..."
 
-#: builtin/am.c:1517
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8694,24 +9603,24 @@ msgstr ""
 "ๆ‚จๆ˜ฏๅฆๆ›พๆ‰‹ๅŠจ็ผ–่พ‘่ฟ‡ๆ‚จ็š„่กฅไธ๏ผŸ\n"
 "ๆ— ๆณ•ๅบ”็”จ่กฅไธๅˆฐ็ดขๅผ•ไธญ็š„ๆ•ฐๆฎๅฏน่ฑกไธŠใ€‚"
 
-#: builtin/am.c:1523
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "ๅ›ž่ฝๅˆฐๅŸบ็ก€็‰ˆๆœฌไธŠๆ‰“่กฅไธๅŠ่ฟ›่กŒไธ‰ๆ–นๅˆๅนถ..."
 
-#: builtin/am.c:1549
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "ๆ— ๆณ•ๅˆๅนถๅ˜ๆ›ดใ€‚"
 
-#: builtin/am.c:1581
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "ๆญฃๅบ”็”จๅˆฐไธ€ไธช็ฉบๅŽ†ๅฒไธŠ"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "ๆ— ๆณ•็ปง็ปญ๏ผš%s ไธๅญ˜ๅœจใ€‚"
 
-#: builtin/am.c:1650
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr "ๆไบคๅ†…ๅฎนไธบ๏ผš"
 
@@ -8720,35 +9629,39 @@ msgstr "ๆไบคๅ†…ๅฎนไธบ๏ผš"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "ๅบ”็”จ๏ผŸๆ˜ฏ[y]/ๅฆ[n]/็ผ–่พ‘[e]/ๆŸฅ็œ‹่กฅไธ[v]/ๅบ”็”จๆ‰€ๆœ‰[a]๏ผš"
 
-#: builtin/am.c:1710
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "ๆ— ๆณ•ๅ†™ๅ…ฅ็ดขๅผ•ๆ–‡ไปถ"
+
+#: builtin/am.c:1704
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "่„็ดขๅผ•๏ผšไธ่ƒฝๅบ”็”จ่กฅไธ๏ผˆ่„ๆ–‡ไปถ๏ผš%s๏ผ‰"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1744 builtin/am.c:1812
 #, c-format
 msgid "Applying: %.*s"
 msgstr "ๅบ”็”จ๏ผš%.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1761
 msgid "No changes -- Patch already applied."
 msgstr "ๆฒกๆœ‰ๅ˜ๆ›ด โ€”โ€” ่กฅไธๅทฒ็ปๅบ”็”จ่ฟ‡ใ€‚"
 
-#: builtin/am.c:1773
+#: builtin/am.c:1767
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "ๆ‰“่กฅไธๅคฑ่ดฅไบŽ %s %.*s"
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr "็”จ 'git am --show-current-patch' ๅ‘ฝไปคๆŸฅ็œ‹ๅคฑ่ดฅ็š„่กฅไธ"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "็”จ 'git am --show-current-patch=diff' ๅ‘ฝไปคๆŸฅ็œ‹ๅคฑ่ดฅ็š„่กฅไธ"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1815
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -8758,7 +9671,7 @@ msgstr ""
 "ๅฆ‚ๆžœๆฒกๆœ‰ไป€ไนˆ่ฆๆทปๅŠ ๅˆฐๆš‚ๅญ˜ๅŒบ็š„๏ผŒๅˆ™ๅพˆๅฏ่ƒฝๆ˜ฏๅ…ถๅฎƒๆไบคๅทฒ็ปๅผ•ๅ…ฅไบ†็›ธๅŒ็š„ๅ˜ๆ›ดใ€‚\n"
 "ๆ‚จไนŸ่ฎธๆƒณ่ฆ่ทณ่ฟ‡่ฟ™ไธช่กฅไธใ€‚"
 
-#: builtin/am.c:1828
+#: builtin/am.c:1822
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -8769,159 +9682,169 @@ msgstr ""
 "ๆ‚จๅบ”่ฏฅๅฏนๅทฒ็ปๅ†ฒ็ช่งฃๅ†ณ็š„ๆฏไธ€ไธชๆ–‡ไปถๆ‰ง่กŒ 'git add' ๆฅๆ ‡่ฎฐๅทฒ็ปๅฎŒๆˆใ€‚ \n"
 "ไฝ ๅฏไปฅๅฏน \"็”ฑไป–ไปฌๅˆ ้™ค\" ็š„ๆ–‡ไปถๆ‰ง่กŒ `git rm` ๅ‘ฝไปคใ€‚"
 
-#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "ไธ่ƒฝ่งฃๆžๅฏน่ฑก '%s'ใ€‚"
 
-#: builtin/am.c:1987
+#: builtin/am.c:1981
 msgid "failed to clean index"
 msgstr "ๆธ…็ฉบ็ดขๅผ•ๅคฑ่ดฅ"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2025
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "ๆ‚จๅฅฝๅƒๅœจไธŠไธ€ๆฌก 'am' ๅคฑ่ดฅๅŽ็งปๅŠจไบ† HEADใ€‚ๆœชๅ›ž้€€่‡ณ ORIG_HEAD"
 
-#: builtin/am.c:2128
+#: builtin/am.c:2132
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "ๆ— ๆ•ˆ็š„ --patch-format ๅ€ผ๏ผš%s"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "ๆ— ๆ•ˆ็š„ --show-current-patch ๅ€ผ๏ผš%s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s ๅ’Œ --show-current-patch=%s ไธๅ…ผๅฎน"
+
+#: builtin/am.c:2207
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<้€‰้กน>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2208
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<้€‰้กน>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2214
 msgid "run interactively"
 msgstr "ไปฅไบคไบ’ๅผๆ–นๅผ่ฟ่กŒ"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2216
 msgid "historical option -- no-op"
 msgstr "่€็š„ๅ‚ๆ•ฐ โ€”โ€” ๆ— ไฝœ็”จ"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2218
 msgid "allow fall back on 3way merging if needed"
 msgstr "ๅฆ‚ๆžœๅฟ…่ฆ๏ผŒๅ…่ฎธไฝฟ็”จไธ‰ๆ–นๅˆๅนถใ€‚"
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
 msgid "be quiet"
 msgstr "้™้ป˜ๆจกๅผ"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2221
 msgid "add a Signed-off-by line to the commit message"
 msgstr "ๅœจๆไบค่ฏดๆ˜ŽไธญๆทปๅŠ ไธ€ไธช Signed-off-by ็ญพๅ"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2224
 msgid "recode into utf8 (default)"
 msgstr "ไฝฟ็”จ utf8 ๅญ—็ฌฆ้›†๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2226
 msgid "pass -k flag to git-mailinfo"
 msgstr "ๅ‘ git-mailinfo ไผ ้€’ -k ๅ‚ๆ•ฐ"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2228
 msgid "pass -b flag to git-mailinfo"
 msgstr "ๅ‘ git-mailinfo ไผ ้€’ -b ๅ‚ๆ•ฐ"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2230
 msgid "pass -m flag to git-mailinfo"
 msgstr "ๅ‘ git-mailinfo ไผ ้€’ -m ๅ‚ๆ•ฐ"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2232
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "้’ˆๅฏน mbox ๆ ผๅผ๏ผŒๅ‘ git-mailsplit ไผ ้€’ --keep-cr ๅ‚ๆ•ฐ"
 
-#: builtin/am.c:2192
+#: builtin/am.c:2235
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "ไธๅ‘ git-mailsplit ไผ ้€’ --keep-cr ๅ‚ๆ•ฐ๏ผŒ่ฆ†็›– am.keepcr ็š„่ฎพ็ฝฎ"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2238
 msgid "strip everything before a scissors line"
 msgstr "ไธขๅผƒ่ฃๅˆ‡็บฟๅ‰็š„ๆ‰€ๆœ‰ๅ†…ๅฎน"
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
 msgid "pass it through git-apply"
 msgstr "ไผ ้€’็ป™ git-apply"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
 msgid "format"
 msgstr "ๆ ผๅผ"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2264
 msgid "format the patch(es) are in"
 msgstr "่กฅไธ็š„ๆ ผๅผ"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2270
 msgid "override error message when patch failure occurs"
 msgstr "ๆ‰“่กฅไธๅคฑ่ดฅๆ—ถๆ˜พ็คบ็š„้”™่ฏฏไฟกๆฏ"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2272
 msgid "continue applying patches after resolving a conflict"
 msgstr "ๅ†ฒ็ช่งฃๅ†ณๅŽ็ปง็ปญๅบ”็”จ่กฅไธ"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2275
 msgid "synonyms for --continue"
 msgstr "ๅ’Œ --continue ๅŒไน‰"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2278
 msgid "skip the current patch"
 msgstr "่ทณ่ฟ‡ๅฝ“ๅ‰่กฅไธ"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2281
 msgid "restore the original branch and abort the patching operation."
 msgstr "ๆขๅคๅŽŸๅง‹ๅˆ†ๆ”ฏๅนถ็ปˆๆญขๆ‰“่กฅไธๆ“ไฝœใ€‚"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2284
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "็ปˆๆญข่กฅไธๆ“ไฝœไฝ†ไฟๆŒ HEAD ไธๅ˜ใ€‚"
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
-msgstr "ๆ˜พ็คบๆญฃๅœจๅบ”็”จ็š„่กฅไธใ€‚"
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "ๆ˜พ็คบๆญฃๅœจๅบ”็”จ็š„่กฅไธ"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2293
 msgid "lie about committer date"
 msgstr "ๅฐ†ไฝœ่€…ๆ—ฅๆœŸไฝœไธบๆไบคๆ—ฅๆœŸ"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2295
 msgid "use current timestamp for author date"
 msgstr "็”จๅฝ“ๅ‰ๆ—ถ้—ดไฝœไธบไฝœ่€…ๆ—ฅๆœŸ"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
 msgid "GPG-sign commits"
 msgstr "ไฝฟ็”จ GPG ็ญพๅๆไบค"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2301
 msgid "(internal use for git-rebase)"
 msgstr "๏ผˆๅ†…้ƒจไฝฟ็”จ๏ผŒ็”จไบŽ git-rebase๏ผ‰"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2319
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -8929,16 +9852,16 @@ msgstr ""
 "ๅ‚ๆ•ฐ -b/--binary ๅทฒ็ปๅพˆ้•ฟๆ—ถ้—ดไธๅšไปปไฝ•ๅฎž่ดจๆ“ไฝœไบ†๏ผŒๅนถไธ”ๅฐ†่ขซ็งป้™คใ€‚\n"
 "่ฏทไธ่ฆๅ†ไฝฟ็”จๅฎƒไบ†ใ€‚"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2326
 msgid "failed to read the index"
 msgstr "่ฏปๅ–็ดขๅผ•ๅคฑ่ดฅ"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2341
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "ไน‹ๅ‰็š„ๅ˜ๅŸบ็›ฎๅฝ• %s ไป็„ถๅญ˜ๅœจ๏ผŒไฝ†ๅดๆไพ›ไบ† mboxใ€‚"
 
-#: builtin/am.c:2320
+#: builtin/am.c:2365
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -8947,11 +9870,11 @@ msgstr ""
 "ๅ‘็Žฐไบ†้”™่ฏฏ็š„ %s ็›ฎๅฝ•ใ€‚\n"
 "ไฝฟ็”จ \"git am --abort\" ๅˆ ้™คๅฎƒใ€‚"
 
-#: builtin/am.c:2326
+#: builtin/am.c:2371
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "่งฃๅ†ณๆ“ไฝœๆœช่ฟ›่กŒ๏ผŒๆˆ‘ไปฌไธไผš็ปง็ปญใ€‚"
 
-#: builtin/am.c:2336
+#: builtin/am.c:2381
 msgid "interactive mode requires patches on the command line"
 msgstr "ไบคไบ’ๅผๆจกๅผ้œ€่ฆๅ‘ฝไปค่กŒไธŠๆไพ›่กฅไธ"
 
@@ -9073,33 +9996,33 @@ msgstr "ๆˆ‘ไปฌๆฒกๆœ‰ๅœจไบŒๅˆ†ๆŸฅๆ‰พใ€‚\n"
 msgid "'%s' is not a valid commit"
 msgstr "'%s' ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๆไบค"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:172
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr "ไธ่ƒฝๆฃ€ๅ‡บๅŽŸๅง‹ HEAD '%s'ใ€‚ๅฐ่ฏ• 'git bisect reset <ๆไบค>'ใ€‚"
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:216
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "ๅ็š„ bisect_write ๅ‚ๆ•ฐ๏ผš%s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:221
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "ๆ— ๆณ•่Žทๅ–็‰ˆๆœฌ '%s' ็š„ๅฏน่ฑก ID"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:233
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ๆ–‡ไปถ '%s'"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:259
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "ๆ— ๆ•ˆ็š„ๅ‘ฝไปค๏ผšๆ‚จๅฝ“ๅ‰ๆญฃๅค„ไบŽไธ€ไธช %s/%s ไบŒๅˆ†ๆŸฅๆ‰พไธญ"
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:286
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9108,7 +10031,7 @@ msgstr ""
 "ๆ‚จ้œ€่ฆ็ป™ๆˆ‘่‡ณๅฐ‘ไธ€ไธช %s ๅ’Œไธ€ไธช %s ็‰ˆๆœฌใ€‚\n"
 "ไธบๆญคๆ‚จๅฏไปฅ็”จ \"git bisect %s\" ๅ’Œ \"git bisect %s\"ใ€‚"
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:290
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9119,7 +10042,7 @@ msgstr ""
 "็„ถๅŽ้œ€่ฆๆไพ›ๆˆ‘่‡ณๅฐ‘ไธ€ไธช %s ๅ’Œไธ€ไธช %s ็‰ˆๆœฌใ€‚\n"
 "ไธบๆญคๆ‚จๅฏไปฅ็”จ \"git bisect %s\" ๅ’Œ \"git bisect %s\" ๅ‘ฝไปคใ€‚"
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:310
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "ๅœจๅชๆœ‰ไธ€ไธช %s ๆไบค็š„ๆƒ…ๅ†ตไธ‹ไบŒๅˆ†ๆŸฅๆ‰พ"
@@ -9129,22 +10052,22 @@ msgstr "ๅœจๅชๆœ‰ไธ€ไธช %s ๆไบค็š„ๆƒ…ๅ†ตไธ‹ไบŒๅˆ†ๆŸฅๆ‰พ"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr "ๆ‚จ็กฎ่ฎคไนˆ[Y/n]๏ผŸ "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr "ๆœชๅฎšไน‰ๆœฏ่ฏญ"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:382
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr "ๆ‚จๅฝ“ๅ‰้’ˆๅฏนๆ—ง็Šถๆ€็š„ๆœฏ่ฏญๆ˜ฏ %s๏ผŒๅฏนๆ–ฐ็Šถๆ€็š„ๆœฏ่ฏญๆ˜ฏ %sใ€‚\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:392
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9153,266 +10076,262 @@ msgstr ""
 "ๅ‘ฝไปค 'git bisect terms' ็š„ๅ‚ๆ•ฐ %s ๆ— ๆ•ˆใ€‚\n"
 "ๆ”ฏๆŒ็š„้€‰้กนๆœ‰๏ผš--term-good|--term-old ๅ’Œ --term-bad|--term-newใ€‚"
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:478
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "ๆœช่ฏ†ๅˆซ็š„้€‰้กน๏ผš'%s'"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:482
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' ็œ‹่ตทๆฅไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„็‰ˆๆœฌ"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:514
 msgid "bad HEAD - I need a HEAD"
 msgstr "ๅ็š„ HEAD - ๆˆ‘้œ€่ฆไธ€ไธช HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:529
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "ๆฃ€ๅ‡บ '%s' ๅคฑ่ดฅใ€‚ๅฐ่ฏ• 'git bisect start <ๆœ‰ๆ•ˆๅˆ†ๆ”ฏ>'ใ€‚"
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "ไธไผšๅœจๅšไบ† cg-seek ็š„ๆ ‘ไธŠๅšไบŒๅˆ†ๆŸฅๆ‰พ"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:553
 msgid "bad HEAD - strange symbolic ref"
 msgstr "ๅ็š„ HEAD - ๅฅ‡ๆ€ช็š„็ฌฆๅทๅผ•็”จ"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:577
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ๅผ•็”จ๏ผš'%s'"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr "ๆ‰ง่กŒ 'git bisect next'"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "ๅฐ†ๆœฏ่ฏญๅ†™ๅ…ฅ .git/BISECT_TERMS"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr "ๆธ…้™คไบŒๅˆ†ๆŸฅๆ‰พ็Šถๆ€"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr "ๆฃ€ๆŸฅ้ข„ๆœŸ็š„็‰ˆๆœฌ"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:641
 msgid "reset the bisection state"
 msgstr "ๆธ…้™คไบŒๅˆ†ๆŸฅๆ‰พ็Šถๆ€"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:643
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "ๅฐ†ไบŒๅˆ†ๆŸฅๆ‰พ็š„็Šถๆ€ๅ†™ๅ…ฅ BISECT_LOG"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:645
 msgid "check and set terms in a bisection state"
 msgstr "ๅœจไธ€ไธชไบŒๅˆ†ๆŸฅๆ‰พ็Šถๆ€ไธญๆฃ€ๆŸฅๅ’Œ่ฎพ็ฝฎๆœฏ่ฏญ"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:647
 msgid "check whether bad or good terms exist"
 msgstr "ๆฃ€ๆŸฅๅ็š„ๆˆ–ๅฅฝ็š„ๆœฏ่ฏญๆ˜ฏๅฆๅญ˜ๅœจ"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:649
 msgid "print out the bisect terms"
 msgstr "ๆ‰“ๅฐไบŒๅˆ†ๆŸฅๆ‰พๆœฏ่ฏญ"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:651
 msgid "start the bisect session"
 msgstr "ๅฏๅŠจไบŒๅˆ†ๆŸฅๆ‰พ่ฟ‡็จ‹"
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "ๆ›ดๆ–ฐ BISECT_HEAD ่€Œ้žๆฃ€ๅ‡บๅฝ“ๅ‰ๆไบค"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:655
 msgid "no log for BISECT_WRITE"
 msgstr "BISECT_WRITE ๆ— ๆ—ฅๅฟ—"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms ้œ€่ฆไธคไธชๅ‚ๆ•ฐ"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state ไธๅธฆๅ‚ๆ•ฐ"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:684
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset ๆ— ้œ€ๅ‚ๆ•ฐๆˆ–่€…้œ€่ฆไธ€ไธชๆไบค"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:688
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write ้œ€่ฆ 4 ๆˆ– 5 ไธชๅ‚ๆ•ฐ"
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:694
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--check-and-set-terms ้œ€่ฆ 3 ไธชๅ‚ๆ•ฐ"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:700
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check ้œ€่ฆ 2 ๆˆ– 3 ไธชๅ‚ๆ•ฐ"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:706
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms ้œ€่ฆ 0 ๆˆ– 1 ไธชๅ‚ๆ•ฐ"
 
-#: builtin/blame.c:32
+#: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<้€‰้กน>] [<็‰ˆๆœฌ้€‰้กน>] [<็‰ˆๆœฌ>] [--] <ๆ–‡ไปถ>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c:36
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<็‰ˆๆœฌ้€‰้กน> ็š„ๆ–‡ๆกฃ่ฎฐๅฝ•ๅœจ git-rev-list(1) ไธญ"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:409
 #, c-format
 msgid "expecting a color: %s"
 msgstr "ๆœŸๆœ›ไธ€ไธช้ขœ่‰ฒ๏ผš%s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:416
 msgid "must end with a color"
 msgstr "ๅฟ…้กปไปฅไธ€ไธช้ขœ่‰ฒ็ป“ๅฐพ"
 
-#: builtin/blame.c:730
+#: builtin/blame.c:729
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "่ฎพ็ฝฎ color.blame.repeatedLines ไธญ็š„ๆ— ๆ•ˆ้ขœ่‰ฒ '%s'"
 
-#: builtin/blame.c:748
+#: builtin/blame.c:747
 msgid "invalid value for blame.coloring"
 msgstr "่ฎพ็ฝฎ blame.coloring ไธญ็š„ๆ— ๆ•ˆๅ–ๅ€ผ"
 
-#: builtin/blame.c:823
+#: builtin/blame.c:822
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "ไธ่ƒฝๆ‰พๅˆฐ่ฆๅฟฝ็•ฅ็š„็‰ˆๆœฌ %s"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:844
 msgid "Show blame entries as we find them, incrementally"
 msgstr "ๅขž้‡ๅผๅœฐๆ˜พ็คบๅ‘็Žฐ็š„ blame ๆก็›ฎ"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:845
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "่พน็•Œๆไบคๆ˜พ็คบ็ฉบ็š„ SHA-1๏ผˆ้ป˜่ฎค๏ผšๅ…ณ้—ญ๏ผ‰"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:846
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "ไธๆŠŠๆ นๆไบคไฝœไธบ่พน็•Œ๏ผˆ้ป˜่ฎค๏ผšๅ…ณ้—ญ๏ผ‰"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:847
 msgid "Show work cost statistics"
 msgstr "ๆ˜พ็คบๅ‘ฝไปคๆถˆ่€—็ปŸ่ฎก"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:848
 msgid "Force progress reporting"
 msgstr "ๅผบๅˆถ่ฟ›ๅบฆๆ˜พ็คบ"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:849
 msgid "Show output score for blame entries"
 msgstr "ๆ˜พ็คบๅˆคๆ–ญ blame ๆก็›ฎไฝ็งป็š„ๅพ—ๅˆ†่ฏŠๆ–ญไฟกๆฏ"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:850
 msgid "Show original filename (Default: auto)"
 msgstr "ๆ˜พ็คบๅŽŸๅง‹ๆ–‡ไปถๅ๏ผˆ้ป˜่ฎค๏ผš่‡ชๅŠจ๏ผ‰"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:851
 msgid "Show original linenumber (Default: off)"
 msgstr "ๆ˜พ็คบๅŽŸๅง‹็š„่กŒๅท๏ผˆ้ป˜่ฎค๏ผšๅ…ณ้—ญ๏ผ‰"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:852
 msgid "Show in a format designed for machine consumption"
 msgstr "ๆ˜พ็คบไธบไธ€ไธช้€‚ๅˆๆœบๅ™จ่ฏปๅ–็š„ๆ ผๅผ"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:853
 msgid "Show porcelain format with per-line commit information"
 msgstr "ไธบๆฏไธ€่กŒๆ˜พ็คบๆœบๅ™จ้€‚็”จ็š„ๆไบคไฟกๆฏ"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:854
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "ไฝฟ็”จๅ’Œ git-annotate ็›ธๅŒ็š„่พ“ๅ‡บๆจกๅผ๏ผˆ้ป˜่ฎค๏ผšๅ…ณ้—ญ๏ผ‰"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:855
 msgid "Show raw timestamp (Default: off)"
 msgstr "ๆ˜พ็คบๅŽŸๅง‹ๆ—ถ้—ดๆˆณ๏ผˆ้ป˜่ฎค๏ผšๅ…ณ้—ญ๏ผ‰"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:856
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "ๆ˜พ็คบ้•ฟ็š„ SHA1 ๆไบคๅท๏ผˆ้ป˜่ฎค๏ผšๅ…ณ้—ญ๏ผ‰"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:857
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "้š่—ไฝœ่€…ๅๅญ—ๅ’Œๆ—ถ้—ดๆˆณ๏ผˆ้ป˜่ฎค๏ผšๅ…ณ้—ญ๏ผ‰"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:858
 msgid "Show author email instead of name (Default: off)"
 msgstr "ๆ˜พ็คบไฝœ่€…็š„้‚ฎ็ฎฑ่€Œไธๆ˜ฏๅๅญ—๏ผˆ้ป˜่ฎค๏ผšๅ…ณ้—ญ๏ผ‰"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:859
 msgid "Ignore whitespace differences"
 msgstr "ๅฟฝ็•ฅ็ฉบ็™ฝๅทฎๅผ‚"
 
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1702
 msgid "rev"
 msgstr "็‰ˆๆœฌ"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:860
 msgid "Ignore <rev> when blaming"
 msgstr "ๅœจๆ‰ง่กŒ blame ๆ“ไฝœๆ—ถๅฟฝ็•ฅ <็‰ˆๆœฌ>"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:861
 msgid "Ignore revisions from <file>"
 msgstr "ๅฟฝ็•ฅๆฅ่‡ช <ๆ–‡ไปถ> ไธญ็š„็‰ˆๆœฌ"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:862
 msgid "color redundant metadata from previous line differently"
 msgstr "ไฝฟ็”จ้ขœ่‰ฒ้—ด้š”่พ“ๅ‡บไธŽๅ‰ไธ€่กŒไธๅŒ็š„้‡ๅคๅ…ƒไฟกๆฏ"
 
-#: builtin/blame.c:864
+#: builtin/blame.c:863
 msgid "color lines by age"
 msgstr "ไพๆฎๆ—ถ้—ด็€่‰ฒ"
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "ไฝฟ็”จไธ€ไธช่ฏ•้ชŒๆ€ง็š„ๅฏๅ‘ๅผ็ฎ—ๆณ•ๆ”น่ฟ›ๅทฎๅผ‚ๆ˜พ็คบ"
-
-#: builtin/blame.c:873
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr "่Šฑ่ดน้ขๅค–็š„ๅพช็Žฏๆฅๆ‰พๅˆฐๆ›ดๅฅฝ็š„ๅŒน้…"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "ไฝฟ็”จๆฅ่‡ช <ๆ–‡ไปถ> ็š„ไฟฎ่ฎข้›†่€Œไธๆ˜ฏ่ฐƒ็”จ git-rev-list"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "ไฝฟ็”จ <ๆ–‡ไปถ> ็š„ๅ†…ๅฎนไฝœไธบๆœ€็ปˆ็š„ๅ›พ็‰‡"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "ๅพ—ๅˆ†"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr "ๆ‰พๅˆฐๆ–‡ไปถๅ†…ๅŠ่ทจๆ–‡ไปถ็š„่กŒๆ‹ท่ด"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr "ๆ‰พๅˆฐๆ–‡ไปถๅ†…ๅŠ่ทจๆ–‡ไปถ็š„่กŒ็งปๅŠจ"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr "ๅชๅค„็†่กŒ่Œƒๅ›ดๅœจ n ๅ’Œ m ไน‹้—ด็š„๏ผŒไปŽ 1 ๅผ€ๅง‹"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress ไธ่ƒฝๅ’Œ --incremental ๆˆ– --porcelain ๅŒๆ—ถไฝฟ็”จ"
 
@@ -9424,18 +10343,18 @@ msgstr "--progress ไธ่ƒฝๅ’Œ --incremental ๆˆ– --porcelain ๅŒๆ—ถไฝฟ็”จ"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "4 ๅนด 11 ไธชๆœˆๅ‰"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1079
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "ๆ–‡ไปถ %s ๅชๆœ‰ %lu ่กŒ"
 msgstr[1] "ๆ–‡ไปถ %s ๅชๆœ‰ %lu ่กŒ"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1125
 msgid "Blaming lines"
 msgstr "่ฟฝ่ธชไปฃ็ ่กŒ"
 
@@ -9646,7 +10565,7 @@ msgstr "่ฎพ็ฝฎ่ทŸ่ธชๆจกๅผ๏ผˆๅ‚่ง git-pull(1)๏ผ‰"
 msgid "do not use"
 msgstr "ไธ่ฆไฝฟ็”จ"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:513
 msgid "upstream"
 msgstr "ไธŠๆธธ"
 
@@ -9655,7 +10574,7 @@ msgid "change the upstream info"
 msgstr "ๆ”นๅ˜ไธŠๆธธไฟกๆฏ"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
+msgid "unset the upstream info"
 msgstr "ๅ–ๆถˆไธŠๆธธไฟกๆฏ็š„่ฎพ็ฝฎ"
 
 #: builtin/branch.c:628
@@ -9757,7 +10676,7 @@ msgstr "ๆŽ’ๅบๅ’Œ่ฟ‡ๆปคๅฑžไบŽๅคงๅฐๅ†™ไธๆ•ๆ„Ÿ"
 msgid "format to use for the output"
 msgstr "่พ“ๅ‡บๆ ผๅผ"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:785
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD ๆฒกๆœ‰ไฝไบŽ /refs/heads ไน‹ไธ‹๏ผ"
 
@@ -9843,20 +10762,65 @@ msgid ""
 msgstr ""
 "ไธๅ†ๆ”ฏๆŒ้€‰้กน '--set-upstream'ใ€‚่ฏทไฝฟ็”จ '--track' ๆˆ– '--set-upstream-to'ใ€‚"
 
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr "%s ๅฏไปฅ\n"
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<้€‰้กน>] <ๆ–‡ไปถ> <git-rev-list ๅ‚ๆ•ฐ>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<้€‰้กน>] <ๆ–‡ไปถ>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <ๆ–‡ไปถ> [<ๅผ•็”จๅ>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <ๆ–‡ไปถ> [<ๅผ•็”จๅ>...]"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "ไธๆ˜พ็คบ่ฟ›ๅบฆ่กจ"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "ๆ˜พ็คบ่ฟ›ๅบฆ่กจ"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr "ๅœจๅฏน่ฑกๅ†™ๅ…ฅ้˜ถๆฎตๆ˜พ็คบ่ฟ›ๅบฆ่กจ"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "ๅฝ“่ฟ›ๅบฆ่กจๆ˜พ็คบๆ—ถ็ฑปไผผไบŽ --all-progress"
+
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "้œ€่ฆไธ€ไธชไป“ๅบ“ๆฅๅˆ›ๅปบๅŒ…ใ€‚"
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "ไธๆ˜พ็คบ bundle ็ป†่Š‚"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s ๅฏไปฅ\n"
+
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "้œ€่ฆไธ€ไธชไป“ๅบ“ๆฅ่งฃๅŒ…ใ€‚"
 
-#: builtin/cat-file.c:594
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ๅ†—้•ฟ่พ“ๅ‡บ๏ผ›ๅฟ…้กป็ฝฎไบŽๅญๅ‘ฝไปคไน‹ๅ‰"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "ๆœช็Ÿฅๅญๅ‘ฝไปค๏ผš%s"
+
+#: builtin/cat-file.c:595
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -9864,7 +10828,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <็ฑปๅž‹> | --textconv | --filters) [--path=<่ทฏๅพ„>] <ๅฏน่ฑก>"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -9872,71 +10836,71 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
 msgid "only one batch option may be specified"
 msgstr "ๅช่ƒฝๆŒ‡ๅฎšไธ€ไธชๆ‰นๅค„็†้€‰้กน"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<็ฑปๅž‹> ๅฏไปฅๆ˜ฏๅ…ถไธญไน‹ไธ€๏ผšblobใ€treeใ€commitใ€tag"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "show object type"
 msgstr "ๆ˜พ็คบๅฏน่ฑก็ฑปๅž‹"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object size"
 msgstr "ๆ˜พ็คบๅฏน่ฑกๅคงๅฐ"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
 msgid "exit with zero when there's no error"
 msgstr "ๅฝ“ๆฒกๆœ‰้”™่ฏฏๆ—ถ้€€ๅ‡บๅนถ่ฟ”ๅ›ž้›ถ"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "pretty-print object's content"
 msgstr "็พŽ่ง‚ๅœฐๆ‰“ๅฐๅฏน่ฑก็š„ๅ†…ๅฎน"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
 msgid "for blob objects, run textconv on object's content"
 msgstr "ๅฏนไบŽๆ•ฐๆฎๅฏน่ฑก๏ผŒๅฏนๅ…ถๅ†…ๅฎนๅšๆ–‡ๆœฌ่ฝฌๆข"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
 msgid "for blob objects, run filters on object's content"
 msgstr "ๅฏนไบŽๆ•ฐๆฎๅฏน่ฑก๏ผŒๅฏนๅ…ถๅ†…ๅฎนๅš่ฟ‡ๆปค"
 
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:1002
 msgid "blob"
 msgstr "ๆ•ฐๆฎๅฏน่ฑก"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
 msgid "use a specific path for --textconv/--filters"
 msgstr "ๅฏนไบŽ --textconv/--filters ไฝฟ็”จไธ€ไธช็‰นๅฎš็š„่ทฏๅพ„"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "ๅ…่ฎธ -s ๅ’Œ -t ๅฏนๆŸๅ็š„ๅฏน่ฑก็”Ÿๆ•ˆ"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "buffer --batch output"
 msgstr "็ผ“ๅ†ฒ --batch ็š„่พ“ๅ‡บ"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
 msgid "show info and content of objects fed from the standard input"
 msgstr "ๆ˜พ็คบไปŽๆ ‡ๅ‡†่พ“ๅ…ฅๆไพ›็š„ๅฏน่ฑก็š„ไฟกๆฏๅ’Œๅ†…ๅฎน"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
 msgid "show info about objects fed from the standard input"
 msgstr "ๆ˜พ็คบไปŽๆ ‡ๅ‡†่พ“ๅ…ฅๆไพ›็š„ๅฏน่ฑก็š„ไฟกๆฏ"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "่ทŸ้šๆ ‘ๅ†…็ฌฆๅท้“พๆŽฅ๏ผˆๅ’Œ --batch ๆˆ– --batch-check ๅ…ฑ็”จ๏ผ‰"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
 msgid "show all objects with --batch or --batch-check"
 msgstr "ไฝฟ็”จ --batch ๆˆ– --batch-check ๅ‚ๆ•ฐๆ˜พ็คบๆ‰€ๆœ‰ๅฏน่ฑก"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
 msgid "do not order --batch-all-objects output"
 msgstr "ไธ่ฆๅฏน --batch-all-objects ็š„่พ“ๅ‡บๆŽ’ๅบ"
 
@@ -9964,8 +10928,8 @@ msgstr "ไปŽๆ ‡ๅ‡†่พ“ๅ…ฅ่ฏปๅ‡บๆ–‡ไปถๅ"
 msgid "terminate input and output records by a NUL character"
 msgstr "่พ“ๅ…ฅๅ’Œ่พ“ๅ‡บ็š„่ฎฐๅฝ•ไฝฟ็”จ NUL ๅญ—็ฌฆ็ปˆ็ป“"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
 msgid "suppress progress reporting"
 msgstr "ไธๆ˜พ็คบ่ฟ›ๅบฆๆŠฅๅ‘Š"
 
@@ -9977,27 +10941,27 @@ msgstr "ๆ˜พ็คบๆœชๅŒน้…็š„่พ“ๅ…ฅ่ทฏๅพ„"
 msgid "ignore index when checking"
 msgstr "ๆฃ€ๆŸฅๆ—ถๅฟฝ็•ฅ็ดขๅผ•"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "ไธ่ƒฝๅŒๆ—ถๆŒ‡ๅฎš่ทฏๅพ„ๅŠ --stdin ๅ‚ๆ•ฐ"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z ้œ€่ฆๅ’Œ --stdin ๅ‚ๆ•ฐๅ…ฑ็”จๆ‰ๆœ‰ๆ„ไน‰"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "ๆœชๆŒ‡ๅฎš่ทฏๅพ„"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "ๅ‚ๆ•ฐ --quiet ๅชๅœจๆไพ›ไธ€ไธช่ทฏๅพ„ๅๆ—ถๆœ‰ๆ•ˆ"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "ไธ่ƒฝๅŒๆ—ถๆไพ› --quiet ๅ’Œ --verbose ๅ‚ๆ•ฐ"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching ้€‰้กนๅชๅœจไฝฟ็”จ --verbose ๆ—ถๆœ‰ๆ•ˆ"
 
@@ -10055,9 +11019,9 @@ msgid "write the content to temporary files"
 msgstr "ๅฐ†ๅ†…ๅฎนๅ†™ๅ…ฅไธดๆ—ถๆ–‡ไปถ"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
 msgid "string"
 msgstr "ๅญ—็ฌฆไธฒ"
 
@@ -10085,98 +11049,98 @@ msgstr "git switch [<้€‰้กน>] [<ๅˆ†ๆ”ฏ>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<้€‰้กน>] [--source=<ๅˆ†ๆ”ฏ>] <ๆ–‡ไปถ>..."
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:175 builtin/checkout.c:214
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "่ทฏๅพ„ '%s' ๆฒกๆœ‰ๆˆ‘ไปฌ็š„็‰ˆๆœฌ"
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:177 builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "่ทฏๅพ„ '%s' ๆฒกๆœ‰ไป–ไปฌ็š„็‰ˆๆœฌ"
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:193
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "่ทฏๅพ„ '%s' ๆฒกๆœ‰ๅ…จ้ƒจๅฟ…้œ€็š„็‰ˆๆœฌ"
 
-#: builtin/checkout.c:240
+#: builtin/checkout.c:243
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "่ทฏๅพ„ '%s' ๆฒกๆœ‰ๅฟ…้œ€็š„็‰ˆๆœฌ"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'๏ผšๆ— ๆณ•ๅˆๅนถ"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:277
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "ๆ— ๆณ•ไธบ '%s' ๆทปๅŠ ๅˆๅนถ็ป“ๆžœ"
 
-#: builtin/checkout.c:374
+#: builtin/checkout.c:377
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "้‡ๆ–ฐๅˆ›ๅปบไบ† %d ไธชๅˆๅนถๅ†ฒ็ช"
 msgstr[1] "้‡ๆ–ฐๅˆ›ๅปบไบ† %d ไธชๅˆๅนถๅ†ฒ็ช"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:382
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "ไปŽ %2$s ๆ›ดๆ–ฐไบ† %1$d ไธช่ทฏๅพ„"
 msgstr[1] "ไปŽ %2$s ๆ›ดๆ–ฐไบ† %1$d ไธช่ทฏๅพ„"
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:389
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "ไปŽ็ดขๅผ•ๅŒบๆ›ดๆ–ฐไบ† %d ไธช่ทฏๅพ„"
 msgstr[1] "ไปŽ็ดขๅผ•ๅŒบๆ›ดๆ–ฐไบ† %d ไธช่ทฏๅพ„"
 
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' ไธ่ƒฝๅœจๆ›ดๆ–ฐ่ทฏๅพ„ๆ—ถไฝฟ็”จ"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:425 builtin/checkout.c:428
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' ไธ่ƒฝๅ’Œ %s ๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c:432
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "ไธ่ƒฝๅŒๆ—ถๆ›ดๆ–ฐ่ทฏๅพ„ๅนถๅˆ‡ๆขๅˆฐๅˆ†ๆ”ฏ'%s'ใ€‚"
 
-#: builtin/checkout.c:433
+#: builtin/checkout.c:436
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "'%s' ๆˆ– '%s' ้ƒฝๆฒกๆœ‰ๆŒ‡ๅฎš"
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "ๆœชๆŒ‡ๅฎš '%2$s' ๆ—ถ๏ผŒๅฟ…้กปไฝฟ็”จ '%1$s'"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:445 builtin/checkout.c:450
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' ๆˆ– '%s' ไธ่ƒฝๅ’Œ %s ไธ€่ตทไฝฟ็”จ"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:509 builtin/checkout.c:516
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "่ทฏๅพ„ '%s' ๆœชๅˆๅนถ"
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
 msgid "you need to resolve your current index first"
 msgstr "ๆ‚จ้œ€่ฆๅ…ˆ่งฃๅ†ณๅฝ“ๅ‰็ดขๅผ•็š„ๅ†ฒ็ช"
 
-#: builtin/checkout.c:729
+#: builtin/checkout.c:734
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10185,56 +11149,51 @@ msgstr ""
 "ไธ่ƒฝ็ปง็ปญ๏ผŒไธ‹ๅˆ—ๆ–‡ไปถๆœ‰ๆš‚ๅญ˜็š„ไฟฎๆ”น๏ผš\n"
 "%s"
 
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr "ไธ‹ๅˆ—ๆ–‡ไปถๆš‚ๅญ˜็š„ไฟฎๆ”นๅฏ่ƒฝไผšไธขๅคฑ๏ผš%s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:837
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "ไธ่ƒฝๅฏน '%s' ๆ‰ง่กŒ reflog ๆ“ไฝœ๏ผš%s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:879
 msgid "HEAD is now at"
 msgstr "HEAD ็›ฎๅ‰ไฝไบŽ"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:883 builtin/clone.c:717
 msgid "unable to update HEAD"
 msgstr "ไธ่ƒฝๆ›ดๆ–ฐ HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:887
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "้‡็ฝฎๅˆ†ๆ”ฏ '%s'\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "ๅทฒ็ปไฝไบŽ '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:894
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "ๅˆ‡ๆขๅนถ้‡็ฝฎๅˆ†ๆ”ฏ '%s'\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:896 builtin/checkout.c:1320
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "ๅˆ‡ๆขๅˆฐไธ€ไธชๆ–ฐๅˆ†ๆ”ฏ '%s'\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:898
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "ๅˆ‡ๆขๅˆฐๅˆ†ๆ”ฏ '%s'\n"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/checkout.c:945
+#: builtin/checkout.c:949
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... ๅŠๅ…ถๅฎƒ %d ไธชใ€‚\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:955
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10255,7 +11214,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:974
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10282,28 +11241,19 @@ msgstr[1] ""
 " git branch <ๆ–ฐๅˆ†ๆ”ฏๅ> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1009
 msgid "internal error in revision walk"
 msgstr "ๅœจ็‰ˆๆœฌ้ๅŽ†ๆ—ถ้‡ๅˆฐๅ†…้ƒจ้”™่ฏฏ"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1013
 msgid "Previous HEAD position was"
 msgstr "ไน‹ๅ‰็š„ HEAD ไฝ็ฝฎๆ˜ฏ"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
 msgid "You are on a branch yet to be born"
 msgstr "ๆ‚จไฝไบŽไธ€ไธชๅฐšๆœชๅˆๅง‹ๅŒ–็š„ๅˆ†ๆ”ฏ"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "้ข„ๆœŸๅชๆœ‰ไธ€ไธชๅผ•็”จ"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "ๅบ”ๅชๆœ‰ไธ€ไธชๅผ•็”จ๏ผŒๅด็ป™ๅ‡บไบ† %d ไธช"
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1128
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10312,37 +11262,70 @@ msgstr ""
 "'%s' ๆ—ขๅฏไปฅๆ˜ฏไธ€ไธชๆœฌๅœฐๆ–‡ไปถ๏ผŒไนŸๅฏไปฅๆ˜ฏไธ€ไธช่ทŸ่ธชๅˆ†ๆ”ฏใ€‚\n"
 "่ฏทไฝฟ็”จ --๏ผˆๅ’Œๅฏ้€‰็š„ --no-guess๏ผ‰ๆฅๆถˆ้™คๆญงไน‰"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"ๅฆ‚ๆžœๆ‚จๆƒณ่ฆๆฃ€ๅ‡บไธ€ไธช่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏ๏ผŒไพ‹ๅฆ‚ๅœจ 'origin' ไธŠ็š„๏ผŒๆ‚จๅฏไปฅไฝฟ็”จๅˆ†ๆ”ฏ\n"
+"ๅ…จๅๅ’Œ --track ้€‰้กน๏ผš\n"
+"\n"
+"    git checkout --track origin/<ๅ็งฐ>\n"
+"\n"
+"ๅฆ‚ๆžœๆ‚จๆ€ปๆ˜ฏๅ–œๆฌขไฝฟ็”จๆจก็ณŠ็š„็ฎ€็Ÿญๅˆ†ๆ”ฏๅ <ๅ็งฐ>๏ผŒ่€Œไธๅ–œๆฌขๅฆ‚ 'origin' ็š„่ฟœ็จ‹\n"
+"ๅ็งฐ๏ผŒๅฏไปฅๅœจ้…็ฝฎไธญ่ฎพ็ฝฎ checkout.defaultRemote=originใ€‚"
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' ๅŒน้…ๅคšไธช๏ผˆ%d ไธช๏ผ‰่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "ๅชๆœŸๆœ›ไธ€ไธชๅผ•็”จ"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "ๅบ”ๅชๆœ‰ไธ€ไธชๅผ•็”จ๏ผŒๅด็ป™ๅ‡บไบ† %d ไธช"
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
 #, c-format
 msgid "invalid reference: %s"
 msgstr "ๆ— ๆ•ˆๅผ•็”จ๏ผš%s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "ๅผ•็”จไธๆ˜ฏไธ€ไธชๆ ‘๏ผš%s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1334
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "ๆœŸๆœ›ไธ€ไธชๅˆ†ๆ”ฏ๏ผŒๅพ—ๅˆฐๆ ‡็ญพ '%s'"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1336
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "ๆœŸๆœ›ไธ€ไธชๅˆ†ๆ”ฏ๏ผŒๅพ—ๅˆฐ่ฟœ็จ‹ๅˆ†ๆ”ฏ '%s'"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "ๆœŸๆœ›ไธ€ไธชๅˆ†ๆ”ฏ๏ผŒๅพ—ๅˆฐ '%s'"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1340
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "ๆœŸๆœ›ไธ€ไธชๅˆ†ๆ”ฏ๏ผŒๅพ—ๅˆฐๆไบค '%s'"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1356
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10350,7 +11333,7 @@ msgstr ""
 "ไธ่ƒฝๅœจๅˆๅนถๆ—ถๅˆ‡ๆขๅˆ†ๆ”ฏ\n"
 "่€ƒ่™‘ไฝฟ็”จ \"git merge --quit\" ๆˆ– \"git worktree add\"ใ€‚"
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1360
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10358,7 +11341,7 @@ msgstr ""
 "ไธ่ƒฝๅœจไธ€ไธช am ไผš่ฏๆœŸ้—ดๅˆ‡ๆขๅˆ†ๆ”ฏ\n"
 "่€ƒ่™‘ไฝฟ็”จ \"git am --quit\" ๆˆ– \"git worktree add\"ใ€‚"
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1364
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10366,7 +11349,7 @@ msgstr ""
 "ไธ่ƒฝๅœจๅ˜ๅŸบๆ—ถๅˆ‡ๆขๅˆ†ๆ”ฏ\n"
 "่€ƒ่™‘ไฝฟ็”จ \"git rebase --quit\" ๆˆ– \"git worktree add\"ใ€‚"
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1368
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10374,7 +11357,7 @@ msgstr ""
 "ไธ่ƒฝๅœจๆ‹ฃ้€‰ๆ—ถๅˆ‡ๆขๅˆ†ๆ”ฏ\n"
 "่€ƒ่™‘ไฝฟ็”จ \"git cherry-pick --quit\" ๆˆ– \"git worktree add\"ใ€‚"
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1372
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10382,230 +11365,211 @@ msgstr ""
 "ไธ่ƒฝๅœจ่ฟ˜ๅŽŸๆ—ถๅˆ‡ๆขๅˆ†ๆ”ฏ\n"
 "่€ƒ่™‘ไฝฟ็”จ \"git revert --quit\" ๆˆ– \"git worktree add\"ใ€‚"
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1376
 msgid "you are switching branch while bisecting"
 msgstr "ๆ‚จๅœจๆ‰ง่กŒไบŒๅˆ†ๆŸฅๆ‰พๆ—ถๅˆ‡ๆขๅˆ†ๆ”ฏ"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1383
 msgid "paths cannot be used with switching branches"
 msgstr "่ทฏๅพ„ไธ่ƒฝๅ’Œๅˆ‡ๆขๅˆ†ๆ”ฏๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' ไธ่ƒฝๅ’Œๅˆ‡ๆขๅˆ†ๆ”ฏๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' ไธ่ƒฝๅ’Œ '%s' ๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1411
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' ไธๅธฆ <่ตทๅง‹็‚น>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1419
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "ไธ่ƒฝๅˆ‡ๆขๅˆ†ๆ”ฏๅˆฐไธ€ไธช้žๆไบค '%s'"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1426
 msgid "missing branch or commit argument"
 msgstr "็ผบๅฐ‘ๅˆ†ๆ”ฏๆˆ–ๆไบคๅ‚ๆ•ฐ"
 
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "ๅผบๅˆถๆ˜พ็คบ่ฟ›ๅบฆๆŠฅๅ‘Š"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1469
 msgid "perform a 3-way merge with the new branch"
 msgstr "ๅ’Œๆ–ฐ็š„ๅˆ†ๆ”ฏๆ‰ง่กŒไธ‰ๆ–นๅˆๅนถ"
 
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
 msgid "style"
 msgstr "้ฃŽๆ ผ"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1471
 msgid "conflict style (merge or diff3)"
 msgstr "ๅ†ฒ็ช่พ“ๅ‡บ้ฃŽๆ ผ๏ผˆmerge ๆˆ– diff3๏ผ‰"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1483 builtin/worktree.c:496
 msgid "detach HEAD at named commit"
 msgstr "HEAD ไปŽๆŒ‡ๅฎš็š„ๆไบคๅˆ†็ฆป"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1484
 msgid "set upstream info for new branch"
 msgstr "ไธบๆ–ฐ็š„ๅˆ†ๆ”ฏ่ฎพ็ฝฎไธŠๆธธไฟกๆฏ"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1486
 msgid "force checkout (throw away local modifications)"
 msgstr "ๅผบๅˆถๆฃ€ๅ‡บ๏ผˆไธขๅผƒๆœฌๅœฐไฟฎๆ”น๏ผ‰"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new-branch"
 msgstr "ๆ–ฐๅˆ†ๆ”ฏ"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1488
 msgid "new unparented branch"
 msgstr "ๆ–ฐ็š„ๆฒกๆœ‰็ˆถๆไบค็š„ๅˆ†ๆ”ฏ"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
 msgid "update ignored files (default)"
 msgstr "ๆ›ดๆ–ฐๅฟฝ็•ฅ็š„ๆ–‡ไปถ๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1493
 msgid "do not check if another worktree is holding the given ref"
 msgstr "ไธๆฃ€ๆŸฅๆŒ‡ๅฎš็š„ๅผ•็”จๆ˜ฏๅฆ่ขซๅ…ถไป–ๅทฅไฝœๅŒบๆ‰€ๅ ็”จ"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1506
 msgid "checkout our version for unmerged files"
 msgstr "ๅฏนๅฐšๆœชๅˆๅนถ็š„ๆ–‡ไปถๆฃ€ๅ‡บๆˆ‘ไปฌ็š„็‰ˆๆœฌ"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1509
 msgid "checkout their version for unmerged files"
 msgstr "ๅฏนๅฐšๆœชๅˆๅนถ็š„ๆ–‡ไปถๆฃ€ๅ‡บไป–ไปฌ็š„็‰ˆๆœฌ"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1513
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "ๅฏน่ทฏๅพ„ไธๅš็จ€็–ๆฃ€ๅ‡บ็š„้™ๅˆถ"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-bใ€-B ๅ’Œ --orphan ๆ˜ฏไบ’ๆ–ฅ็š„"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1568
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p ๅ’Œ --overlay ไบ’ๆ–ฅ"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1605
 msgid "--track needs a branch name"
 msgstr "--track ้œ€่ฆไธ€ไธชๅˆ†ๆ”ฏๅ"
 
-#: builtin/checkout.c:1578
+#: builtin/checkout.c:1610
 msgid "missing branch name; try -b"
 msgstr "็ผบๅฐ‘ๅˆ†ๆ”ฏๅ๏ผŒๅฐ่ฏ• -b"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1642
 #, c-format
 msgid "could not resolve %s"
 msgstr "ๆ— ๆณ•่งฃๆž %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "ๆ‚จๅฟ…้กปๆŒ‡ๅฎšไธ€ไธช่ฆๆขๅค็š„่ทฏๅพ„"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
 msgid "invalid path specification"
 msgstr "ๆ— ๆ•ˆ็š„่ทฏๅพ„่ง„ๆ ผ"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' ไธๆ˜ฏไธ€ไธชๆไบค๏ผŒไธ่ƒฝๅŸบไบŽๅฎƒๅˆ›ๅปบๅˆ†ๆ”ฏ '%s'"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout๏ผš--detach ไธ่ƒฝๆŽฅๆ”ถ่ทฏๅพ„ๅ‚ๆ•ฐ '%s'"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file ไธŽ --detach ไธๅ…ผๅฎน"
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file ไธŽ --patch ไธๅ…ผๅฎน"
+
+#: builtin/checkout.c:1692
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 "git checkout๏ผšๅœจไปŽ็ดขๅผ•ๆฃ€ๅ‡บๆ—ถ๏ผŒ--ours/--theirsใ€--force ๅ’Œ --merge ไธๅ…ผๅฎนใ€‚"
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' ๅŒน้…ไบ†ไธ€ไธชไปฅไธŠ็š„่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏใ€‚\n"
-"ๆˆ‘ไปฌๅ‘็Žฐ %d ไธช่ฟœ็จ‹ไป“ๅบ“ๅ…ทๆœ‰ๅŒๅๅˆ†ๆ”ฏใ€‚ๆ‰€ไปฅๆˆ‘ไปฌ่ฝฌ่€Œๅฐ่ฏ•ๅฐ†่ฟ™ไธชๅ‚ๆ•ฐ่งฃๆžไธบ\n"
-"่ทฏๅพ„๏ผŒไฝ†ๆ˜ฏไนŸๅคฑ่ดฅไบ†๏ผ\n"
-"\n"
-"ๅฆ‚ๆžœๆ‚จๆƒณ่ฆๆฃ€ๅ‡บไธ€ไธช่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏ๏ผŒไพ‹ๅฆ‚ๅœจ่ฟœ็จ‹ไป“ๅบ“ 'origin' ไธŠ็š„๏ผŒๆ‚จๅฏไปฅ\n"
-"ไฝฟ็”จๅˆ†ๆ”ฏๅ…จๅๅ’Œ --track ้€‰้กน๏ผš\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"ๅฆ‚ๆžœๆ‚จๆ€ปๆ˜ฏๅ–œๆฌขไฝฟ็”จๆจก็ณŠ็š„็ฎ€็Ÿญๅˆ†ๆ”ฏๅ <name>๏ผŒ่€Œไธๅ–œๆฌขๅฆ‚ 'origin' ็š„่ฟœ็จ‹\n"
-"ไป“ๅบ“ๅ๏ผŒๅฏไปฅๅœจ้…็ฝฎไธญ่ฎพ็ฝฎ checkout.defaultRemote=originใ€‚"
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "ๆ‚จๅฟ…้กปๆŒ‡ๅฎšไธ€ไธช่ฆๆขๅค็š„่ทฏๅพ„"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
 msgid "branch"
 msgstr "ๅˆ†ๆ”ฏ"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1724
 msgid "create and checkout a new branch"
 msgstr "ๅˆ›ๅปบๅนถๆฃ€ๅ‡บไธ€ไธชๆ–ฐ็š„ๅˆ†ๆ”ฏ"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1726
 msgid "create/reset and checkout a branch"
 msgstr "ๅˆ›ๅปบ/้‡็ฝฎๅนถๆฃ€ๅ‡บไธ€ไธชๅˆ†ๆ”ฏ"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1727
 msgid "create reflog for new branch"
 msgstr "ไธบๆ–ฐ็š„ๅˆ†ๆ”ฏๅˆ›ๅปบๅผ•็”จๆ—ฅๅฟ—"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1729
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "ไบŒๆฌก็Œœๆต‹ 'git checkout <ๆ— ๆญคๅˆ†ๆ”ฏ>'๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1730
 msgid "use overlay mode (default)"
 msgstr "ไฝฟ็”จๅ ๅŠ ๆจกๅผ๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1775
 msgid "create and switch to a new branch"
 msgstr "ๅˆ›ๅปบๅนถๅˆ‡ๆขไธ€ไธชๆ–ฐๅˆ†ๆ”ฏ"
 
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1777
 msgid "create/reset and switch to a branch"
 msgstr "ๅˆ›ๅปบ/้‡็ฝฎๅนถๅˆ‡ๆขไธ€ไธชๅˆ†ๆ”ฏ"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1779
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "ไบŒๆฌก็Œœๆต‹ 'git switch <ๆ— ๆญคๅˆ†ๆ”ฏ>'"
 
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1781
 msgid "throw away local modifications"
 msgstr "ไธขๅผƒๆœฌๅœฐไฟฎๆ”น"
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1813
 msgid "which tree-ish to checkout from"
 msgstr "่ฆๆฃ€ๅ‡บๅ“ชไธ€ไธชๆ ‘"
 
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1815
 msgid "restore the index"
 msgstr "ๆขๅค็ดขๅผ•"
 
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1817
 msgid "restore the working tree (default)"
 msgstr "ๆขๅคๅทฅไฝœๅŒบ๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1819
 msgid "ignore unmerged entries"
 msgstr "ๅฟฝ็•ฅๆœชๅˆๅนถๆก็›ฎ"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
 msgid "use overlay mode"
 msgstr "ไฝฟ็”จๅ ๅŠ ๆจกๅผ"
 
@@ -10645,7 +11609,7 @@ msgstr "ๅˆ ้™ค %s ๅคฑ่ดฅ"
 msgid "could not lstat %s\n"
 msgstr "ไธ่ƒฝๅฏน %s ่ฐƒ็”จ lstat\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10658,7 +11622,7 @@ msgstr ""
 "foo        - ้€š่ฟ‡ๅ”ฏไธ€ๅ‰็ผ€้€‰ๆ‹ฉไธ€ไธช้€‰้กน\n"
 "           - ๏ผˆ็ฉบ๏ผ‰ไป€ไนˆไนŸไธ้€‰ๆ‹ฉ\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10679,38 +11643,33 @@ msgstr ""
 "*          - ้€‰ๆ‹ฉๆ‰€ๆœ‰้€‰้กน\n"
 "           - ๏ผˆ็ฉบ๏ผ‰็ป“ๆŸ้€‰ๆ‹ฉ\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "ๅ—ฏ๏ผˆ%s๏ผ‰๏ผŸ\n"
 
-#: builtin/clean.c:662
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "่พ“ๅ…ฅๆจก็‰ˆไปฅๆŽ’้™คๆก็›ฎ>> "
 
-#: builtin/clean.c:699
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "่ญฆๅ‘Š๏ผšๆ— ๆณ•ๆ‰พๅˆฐๅ’Œ %s ๅŒน้…็š„ๆก็›ฎ"
 
-#: builtin/clean.c:720
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "้€‰ๆ‹ฉ่ฆๅˆ ้™ค็š„ๆก็›ฎ"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "ๅˆ ้™ค %s [y/N]๏ผŸ"
 
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "ๅ†่งใ€‚\n"
-
-#: builtin/clean.c:794
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10728,78 +11687,70 @@ msgstr ""
 "help                - ๆ˜พ็คบๆœฌๅธฎๅŠฉ\n"
 "?                   - ๆ˜พ็คบๅฆ‚ไฝ•ๅœจๆ็คบ็ฌฆไธ‹้€‰ๆ‹ฉ็š„ๅธฎๅŠฉ"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** ๅ‘ฝไปค ***"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "่ฏท้€‰ๆ‹ฉ"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "ๅฐ†ๅˆ ้™คๅฆ‚ไธ‹ๆก็›ฎ๏ผš"
 msgstr[1] "ๅฐ†ๅˆ ้™คๅฆ‚ไธ‹ๆก็›ฎ๏ผš"
 
-#: builtin/clean.c:846
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "ๆฒกๆœ‰่ฆๆธ…็†็š„ๆ–‡ไปถ๏ผŒ้€€ๅ‡บใ€‚"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "ไธๆ‰“ๅฐๅˆ ้™คๆ–‡ไปถ็š„ๅ็งฐ"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:911
 msgid "force"
 msgstr "ๅผบๅˆถ"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "ไบคไบ’ๅผๆธ…้™ค"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "ๅˆ ้™คๆ•ดไธช็›ฎๅฝ•"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "ๆจกๅผ"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "ๆทปๅŠ  <ๆจกๅผ> ๅˆฐๅฟฝ็•ฅ่ง„ๅˆ™"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "ไนŸๅˆ ้™คๅฟฝ็•ฅ็š„ๆ–‡ไปถ"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "ๅชๅˆ ้™คๅฟฝ็•ฅ็š„ๆ–‡ไปถ"
 
-#: builtin/clean.c:936
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x ๅ’Œ -X ไธ่ƒฝๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 "clean.requireForce ่ฎพ็ฝฎไธบ true ไธ”ๆœชๆไพ› -iใ€-n ๆˆ– -f ้€‰้กน๏ผŒๆ‹’็ปๆ‰ง่กŒๆธ…็†ๅŠจไฝœ"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce ้ป˜่ฎคไธบ true ไธ”ๆœชๆไพ› -iใ€-n ๆˆ– -f ้€‰้กน๏ผŒๆ‹’็ปๆ‰ง่กŒๆธ…็†ๅŠจไฝœ"
 
-#: builtin/clone.c:46
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<้€‰้กน>] [--] <ไป“ๅบ“> [<่ทฏๅพ„>]"
 
@@ -10847,18 +11798,18 @@ msgstr "ๆจกๆฟ็›ฎๅฝ•"
 msgid "directory from which templates will be used"
 msgstr "ๆจกๆฟ็›ฎๅฝ•ๅฐ†่ขซไฝฟ็”จ"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr "ๅ‚่€ƒไป“ๅบ“"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr "ไป…ๅœจๅ…‹้š†ๆ—ถๅ‚่€ƒ --reference ๆŒ‡ๅ‘็š„ๆœฌๅœฐไป“ๅบ“"
 
 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
 msgid "name"
 msgstr "ๅ็งฐ"
 
@@ -10874,8 +11825,8 @@ msgstr "ๆฃ€ๅ‡บ <ๅˆ†ๆ”ฏ> ่€Œไธๆ˜ฏ่ฟœ็จ‹ HEAD"
 msgid "path to git-upload-pack on the remote"
 msgstr "่ฟœ็จ‹ git-upload-pack ่ทฏๅพ„"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
 msgid "depth"
 msgstr "ๆทฑๅบฆ"
 
@@ -10883,7 +11834,7 @@ msgstr "ๆทฑๅบฆ"
 msgid "create a shallow clone of that depth"
 msgstr "ๅˆ›ๅปบไธ€ไธชๆŒ‡ๅฎšๆทฑๅบฆ็š„ๆต…ๅ…‹้š†"
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
 msgid "time"
 msgstr "ๆ—ถ้—ด"
 
@@ -10891,16 +11842,17 @@ msgstr "ๆ—ถ้—ด"
 msgid "create a shallow clone since a specific time"
 msgstr "ไปŽไธ€ไธช็‰นๅฎšๆ—ถ้—ดๅˆ›ๅปบไธ€ไธชๆต…ๅ…‹้š†"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
 msgid "revision"
 msgstr "็‰ˆๆœฌ"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:130 builtin/fetch.c:173
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "ๆทฑๅŒ–ๆต…ๅ…‹้š†็š„ๅŽ†ๅฒ๏ผŒ้™คไบ†็‰นๅฎš็‰ˆๆœฌ"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr "ๅชๅ…‹้š†ไธ€ไธชๅˆ†ๆ”ฏใ€HEAD ๆˆ– --branch"
 
@@ -10928,23 +11880,23 @@ msgstr "key=value"
 msgid "set config inside the new repository"
 msgstr "ๅœจๆ–ฐไป“ๅบ“ไธญ่ฎพ็ฝฎ้…็ฝฎไฟกๆฏ"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "server-specific"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "ไผ ่พ“้€‰้กน"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
 msgid "use IPv4 addresses only"
 msgstr "ๅชไฝฟ็”จ IPv4 ๅœฐๅ€"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
 msgid "use IPv6 addresses only"
 msgstr "ๅชไฝฟ็”จ IPv6 ๅœฐๅ€"
 
@@ -10952,7 +11904,11 @@ msgstr "ๅชไฝฟ็”จ IPv6 ๅœฐๅ€"
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "ไปปไฝ•ๅ…‹้š†็š„ๅญๆจก็ป„ๅฐ†ไฝฟ็”จๅฎƒไปฌ็š„่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏ"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr "ๅˆๅง‹ๅŒ–็จ€็–ๆฃ€ๅ‡บๆ–‡ไปถ๏ผŒๅชๅŒ…ๅซๆ น็›ฎๅฝ•ๆ–‡ไปถ"
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -10960,47 +11916,42 @@ msgstr ""
 "ๆ— ๆณ•็Œœๅˆฐ็›ฎๅฝ•ๅใ€‚\n"
 "่ฏทๅœจๅ‘ฝไปค่กŒๆŒ‡ๅฎšไธ€ไธช็›ฎๅฝ•"
 
-#: builtin/clone.c:338
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: ไธ่ƒฝไธบ '%s' ๆทปๅŠ ไธ€ไธชๅค‡็”จ๏ผš%s\n"
 
-#: builtin/clone.c:411
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s ๅญ˜ๅœจไธ”ไธๆ˜ฏไธ€ไธช็›ฎๅฝ•"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:430
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "ๆ— ๆณ•ๅœจ '%s' ไธŠๅฏๅŠจ่ฟญไปฃๅ™จ"
 
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "ๅˆ ้™ค '%s' ๅคฑ่ดฅ"
-
-#: builtin/clone.c:458
+#: builtin/clone.c:460
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "ๅˆ›ๅปบ้“พๆŽฅ '%s' ๅคฑ่ดฅ"
 
-#: builtin/clone.c:462
+#: builtin/clone.c:464
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "ๆ‹ท่ดๆ–‡ไปถ่‡ณ '%s' ๅคฑ่ดฅ"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:469
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "ๆ— ๆณ•ๅœจ '%s' ไธŠ่ฟญไปฃ"
 
-#: builtin/clone.c:492
+#: builtin/clone.c:494
 #, c-format
 msgid "done.\n"
 msgstr "ๅฎŒๆˆใ€‚\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:508
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11010,130 +11961,134 @@ msgstr ""
 "ๆ‚จๅฏไปฅ้€š่ฟ‡ 'git status' ๆฃ€ๆŸฅๅ“ชไบ›ๅทฒ่ขซๆฃ€ๅ‡บ๏ผŒ็„ถๅŽไฝฟ็”จๅ‘ฝไปค\n"
 "'git restore --source=HEAD :/' ้‡่ฏ•\n"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:585
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "ไธ่ƒฝๅ‘็Žฐ่ฆๅ…‹้š†็š„่ฟœ็จ‹ๅˆ†ๆ”ฏ %sใ€‚"
 
-#: builtin/clone.c:702
+#: builtin/clone.c:705
 #, c-format
 msgid "unable to update %s"
 msgstr "ไธ่ƒฝๆ›ดๆ–ฐ %s"
 
-#: builtin/clone.c:752
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "ๆ— ๆณ•ๅˆๅง‹ๅŒ–็จ€็–ๆฃ€ๅ‡บ"
+
+#: builtin/clone.c:776
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "่ฟœ็จ‹ HEAD ๆŒ‡ๅ‘ไธ€ไธชไธๅญ˜ๅœจ็š„ๅผ•็”จ๏ผŒๆ— ๆณ•ๆฃ€ๅ‡บใ€‚\n"
 
-#: builtin/clone.c:783
+#: builtin/clone.c:807
 msgid "unable to checkout working tree"
 msgstr "ไธ่ƒฝๆฃ€ๅ‡บๅทฅไฝœๅŒบ"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:862
 msgid "unable to write parameters to config file"
 msgstr "ๆ— ๆณ•ๅฐ†ๅ‚ๆ•ฐๅ†™ๅ…ฅ้…็ฝฎๆ–‡ไปถ"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:925
 msgid "cannot repack to clean up"
 msgstr "ๆ— ๆณ•ๆ‰ง่กŒ repack ๆฅๆธ…็†"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:927
 msgid "cannot unlink temporary alternates file"
 msgstr "ๆ— ๆณ•ๅˆ ้™คไธดๆ—ถ็š„ alternates ๆ–‡ไปถ"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
 msgid "Too many arguments."
 msgstr "ๅคชๅคšๅ‚ๆ•ฐใ€‚"
 
-#: builtin/clone.c:942
+#: builtin/clone.c:969
 msgid "You must specify a repository to clone."
 msgstr "ๆ‚จๅฟ…้กปๆŒ‡ๅฎšไธ€ไธชไป“ๅบ“ๆฅๅ…‹้š†ใ€‚"
 
-#: builtin/clone.c:955
+#: builtin/clone.c:982
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare ๅ’Œ --origin %s ้€‰้กนไธๅ…ผๅฎนใ€‚"
 
-#: builtin/clone.c:958
+#: builtin/clone.c:985
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare ๅ’Œ --separate-git-dir ้€‰้กนไธๅ…ผๅฎนใ€‚"
 
-#: builtin/clone.c:971
+#: builtin/clone.c:998
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "ไป“ๅบ“ '%s' ไธๅญ˜ๅœจ"
 
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:1004 builtin/fetch.c:1796
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "ๆทฑๅบฆ %s ไธๆ˜ฏไธ€ไธชๆญฃๆ•ฐ"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1014
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "็›ฎๆ ‡่ทฏๅพ„ '%s' ๅทฒ็ปๅญ˜ๅœจ๏ผŒๅนถไธ”ไธๆ˜ฏไธ€ไธช็ฉบ็›ฎๅฝ•ใ€‚"
 
-#: builtin/clone.c:997
+#: builtin/clone.c:1024
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "ๅทฅไฝœๅŒบ '%s' ๅทฒ็ปๅญ˜ๅœจใ€‚"
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "ไธ่ƒฝไธบ '%s' ๅˆ›ๅปบๅ…ˆๅฏผ็›ฎๅฝ•"
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1044
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "ไธ่ƒฝๅˆ›ๅปบๅทฅไฝœๅŒบ็›ฎๅฝ• '%s'"
 
-#: builtin/clone.c:1037
+#: builtin/clone.c:1064
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "ๅ…‹้š†ๅˆฐ็บฏไป“ๅบ“ '%s'...\n"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1066
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "ๆญฃๅ…‹้š†ๅˆฐ '%s'...\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1090
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive ๅ’Œ --reference ไปฅๅŠ --reference-if-able ไธๅ…ผๅฎน"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1154
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth ๅœจๆœฌๅœฐๅ…‹้š†ๆ—ถ่ขซๅฟฝ็•ฅ๏ผŒ่ฏทๆ”น็”จ file:// ๅ่ฎฎใ€‚"
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1156
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since ๅœจๆœฌๅœฐๅ…‹้š†ๆ—ถ่ขซๅฟฝ็•ฅ๏ผŒ่ฏทๆ”น็”จ file:// ๅ่ฎฎใ€‚"
 
-#: builtin/clone.c:1128
+#: builtin/clone.c:1158
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude ๅœจๆœฌๅœฐๅ…‹้š†ๆ—ถ่ขซๅฟฝ็•ฅ๏ผŒ่ฏทๆ”น็”จ file:// ๅ่ฎฎใ€‚"
 
-#: builtin/clone.c:1130
+#: builtin/clone.c:1160
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter ๅœจๆœฌๅœฐๅ…‹้š†ๆ—ถ่ขซๅฟฝ็•ฅ๏ผŒ่ฏทๆ”น็”จ file:// ๅ่ฎฎใ€‚"
 
-#: builtin/clone.c:1133
+#: builtin/clone.c:1163
 msgid "source repository is shallow, ignoring --local"
 msgstr "ๆบไป“ๅบ“ๆ˜ฏๆต…ๅ…‹้š†๏ผŒๅฟฝ็•ฅ --local"
 
-#: builtin/clone.c:1138
+#: builtin/clone.c:1168
 msgid "--local is ignored"
 msgstr "--local ่ขซๅฟฝ็•ฅ"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1243 builtin/clone.c:1251
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "่ฟœ็จ‹ๅˆ†ๆ”ฏ %s ๅœจไธŠๆธธ %s ๆœชๅ‘็Žฐ"
 
-#: builtin/clone.c:1226
+#: builtin/clone.c:1254
 msgid "You appear to have cloned an empty repository."
 msgstr "ๆ‚จไผผไนŽๅ…‹้š†ไบ†ไธ€ไธช็ฉบไป“ๅบ“ใ€‚"
 
@@ -11182,7 +12137,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "ๅฟฝ็•ฅ้‡ๅค็š„็ˆถๆไบค %s"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
 #, c-format
 msgid "not a valid object name %s"
 msgstr "ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๅฏน่ฑกๅ %s"
@@ -11210,13 +12165,13 @@ msgstr "็ˆถๆไบค"
 msgid "id of a parent commit object"
 msgstr "็ˆถๆไบคๅฏน่ฑก ID"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
 #: builtin/tag.c:412
 msgid "message"
 msgstr "่ฏดๆ˜Ž"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
 msgid "commit message"
 msgstr "ๆไบค่ฏดๆ˜Ž"
 
@@ -11224,8 +12179,8 @@ msgstr "ๆไบค่ฏดๆ˜Ž"
 msgid "read commit log message from file"
 msgstr "ไปŽๆ–‡ไปถไธญ่ฏปๅ–ๆไบค่ฏดๆ˜Ž"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "GPG ๆไบค็ญพๅ"
 
@@ -11297,94 +12252,102 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "่งฃๅŒ… HEAD ๆ ‘ๅฏน่ฑกๅคฑ่ดฅ"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file ๅ’Œ -a ๅœจไธ€่ตทๆฒกๆœ‰ๆ„ไน‰"
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "ๅ‚ๆ•ฐ --include/--only ไธ่ทŸ่ทฏๅพ„ๆฒกๆœ‰ๆ„ไน‰ใ€‚"
+
+#: builtin/commit.c:376
 msgid "unable to create temporary index"
 msgstr "ไธ่ƒฝๅˆ›ๅปบไธดๆ—ถ็ดขๅผ•"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:385
 msgid "interactive add failed"
 msgstr "ไบคไบ’ๅผๆทปๅŠ ๅคฑ่ดฅ"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:400
 msgid "unable to update temporary index"
 msgstr "ๆ— ๆณ•ๆ›ดๆ–ฐไธดๆ—ถ็ดขๅผ•"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:402
 msgid "Failed to update main cache tree"
 msgstr "ไธ่ƒฝๆ›ดๆ–ฐๆ ‘็š„ไธป็ผ“ๅญ˜"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
 msgid "unable to write new_index file"
 msgstr "ๆ— ๆณ•ๅ†™ new_index ๆ–‡ไปถ"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:479
 msgid "cannot do a partial commit during a merge."
 msgstr "ๅœจๅˆๅนถ่ฟ‡็จ‹ไธญไธ่ƒฝๅš้ƒจๅˆ†ๆไบคใ€‚"
 
-#: builtin/commit.c:457
+#: builtin/commit.c:481
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "ๅœจๆ‹ฃ้€‰่ฟ‡็จ‹ไธญไธ่ƒฝๅš้ƒจๅˆ†ๆไบคใ€‚"
 
-#: builtin/commit.c:465
+#: builtin/commit.c:489
 msgid "cannot read the index"
 msgstr "ๆ— ๆณ•่ฏปๅ–็ดขๅผ•"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:508
 msgid "unable to write temporary index file"
 msgstr "ๆ— ๆณ•ๅ†™ไธดๆ—ถ็ดขๅผ•ๆ–‡ไปถ"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:606
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "ๆไบค '%s' ็ผบๅฐ‘ไฝœ่€…ไฟกๆฏ"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:608
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "ๆไบค '%s' ๆœ‰ๆ ผๅผ้”™่ฏฏ็š„ไฝœ่€…ไฟกๆฏ"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:627
 msgid "malformed --author parameter"
 msgstr "ๆ ผๅผ้”™่ฏฏ็š„ --author ๅ‚ๆ•ฐ"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:680
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "ๆ— ๆณ•้€‰ๆ‹ฉไธ€ไธชๆœช่ขซๅฝ“ๅ‰ๆไบค่ฏดๆ˜Žไฝฟ็”จ็š„ๆณจ้‡Šๅญ—็ฌฆ"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "ไธ่ƒฝๆŸฅ่ฏขๆไบค %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "๏ผˆๆญฃไปŽๆ ‡ๅ‡†่พ“ๅ…ฅไธญ่ฏปๅ–ๆ—ฅๅฟ—ไฟกๆฏ๏ผ‰\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:732
 msgid "could not read log from standard input"
 msgstr "ไธ่ƒฝไปŽๆ ‡ๅ‡†่พ“ๅ…ฅไธญ่ฏปๅ–ๆ—ฅๅฟ—ไฟกๆฏ"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:736
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "ไธ่ƒฝ่ฏปๅ–ๆ—ฅๅฟ—ๆ–‡ไปถ '%s'"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:767 builtin/commit.c:783
 msgid "could not read SQUASH_MSG"
 msgstr "ไธ่ƒฝ่ฏปๅ– SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:774
 msgid "could not read MERGE_MSG"
 msgstr "ไธ่ƒฝ่ฏปๅ– MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:834
 msgid "could not write commit template"
 msgstr "ไธ่ƒฝๅ†™ๆไบคๆจก็‰ˆ"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:853
 #, c-format
 msgid ""
 "\n"
@@ -11398,7 +12361,7 @@ msgstr ""
 "\t%s\n"
 "็„ถๅŽ้‡่ฏ•ใ€‚\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:858
 #, c-format
 msgid ""
 "\n"
@@ -11412,7 +12375,7 @@ msgstr ""
 "\t%s\n"
 "็„ถๅŽ้‡่ฏ•ใ€‚\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:871
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11421,7 +12384,7 @@ msgstr ""
 "่ฏทไธบๆ‚จ็š„ๅ˜ๆ›ด่พ“ๅ…ฅๆไบค่ฏดๆ˜Žใ€‚ไปฅ '%c' ๅผ€ๅง‹็š„่กŒๅฐ†่ขซๅฟฝ็•ฅ๏ผŒ่€Œไธ€ไธช็ฉบ็š„ๆไบค\n"
 "่ฏดๆ˜Žๅฐ†ไผš็ปˆๆญขๆไบคใ€‚\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:879
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11432,324 +12395,320 @@ msgstr ""
 "ไนŸๅฏไปฅๅˆ ้™คๅฎƒไปฌใ€‚ไธ€ไธช็ฉบ็š„ๆไบค่ฏดๆ˜Žๅฐ†ไผš็ปˆๆญขๆไบคใ€‚\n"
 
 #  ่ฏ‘่€…๏ผšไธบไฟ่ฏๅœจ่พ“ๅ‡บไธญๅฏน้ฝ๏ผŒๆณจๆ„่ฐƒๆ•ดๅฅไธญ็ฉบๆ ผ๏ผ
-#: builtin/commit.c:872
+#: builtin/commit.c:896
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sไฝœ่€…๏ผš  %.*s <%.*s>"
 
 #  ่ฏ‘่€…๏ผšไธบไฟ่ฏๅœจ่พ“ๅ‡บไธญๅฏน้ฝ๏ผŒๆณจๆ„่ฐƒๆ•ดๅฅไธญ็ฉบๆ ผ๏ผ
-#: builtin/commit.c:880
+#: builtin/commit.c:904
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sๆ—ฅๆœŸ๏ผš  %s"
 
 #  ่ฏ‘่€…๏ผšไธบไฟ่ฏๅœจ่พ“ๅ‡บไธญๅฏน้ฝ๏ผŒๆณจๆ„่ฐƒๆ•ดๅฅไธญ็ฉบๆ ผ๏ผ
-#: builtin/commit.c:887
+#: builtin/commit.c:911
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sๆไบค่€…๏ผš%.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:929
 msgid "Cannot read index"
 msgstr "ๆ— ๆณ•่ฏปๅ–็ดขๅผ•"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบๆ ‘ๅฏน่ฑก"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "่ฏทไฝฟ็”จ -m ๆˆ– -F ้€‰้กนๆไพ›ๆไบค่ฏดๆ˜Žใ€‚\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' ไธๆ˜ฏ 'ๅง“ๅ <้‚ฎ็ฎฑ>' ๆ ผๅผ๏ผŒไธ”ๆœช่ƒฝๅœจ็Žฐๆœ‰ไฝœ่€…ไธญๆ‰พๅˆฐๅŒน้…"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ๅฟฝ็•ฅๆจกๅผ '%s'"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1327
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ๆœช่ฟฝ่ธชๆ–‡ไปถๅ‚ๆ•ฐ '%s'"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "--long ๅ’Œ -z ้€‰้กนไธๅ…ผๅฎน"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "ๅŒๆ—ถไฝฟ็”จ --reset-author ๅ’Œ --author ๆฒกๆœ‰ๆ„ไน‰"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "ๆ‚จๆฒกๆœ‰ๅฏไฟฎ่กฅ็š„ๆไบคใ€‚"
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "ๆ‚จๆญฃๅค„ไบŽไธ€ไธชๅˆๅนถ่ฟ‡็จ‹ไธญ -- ๆ— ๆณ•ไฟฎ่กฅๆไบคใ€‚"
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "ๆ‚จๆญฃๅค„ไบŽไธ€ไธชๆ‹ฃ้€‰่ฟ‡็จ‹ไธญ -- ๆ— ๆณ•ไฟฎ่กฅๆไบคใ€‚"
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1188
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "้€‰้กน --squash ๅ’Œ --fixup ไธ่ƒฝๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1198
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "ๅช่ƒฝ็”จไธ€ไธช -c/-C/-F/--fixup ้€‰้กนใ€‚"
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1200
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "้€‰้กน -m ไธ่ƒฝๅ’Œ -c/-C/-F ๅŒๆ—ถไฝฟ็”จใ€‚"
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1208
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author ๅช่ƒฝๅ’Œ -Cใ€-c ๆˆ– --amend ๅŒๆ—ถไฝฟ็”จใ€‚"
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1225
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "ๅช่ƒฝ็”จไธ€ไธช --include/--only/--all/--interactive/--patch ้€‰้กนใ€‚"
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "ๅ‚ๆ•ฐ --include/--only ไธ่ทŸ่ทฏๅพ„ๆฒกๆœ‰ๆ„ไน‰ใ€‚"
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1231
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "่ทฏๅพ„  '%s ...' ๅ’Œ -a ้€‰้กนๅŒๆ—ถไฝฟ็”จๆฒกๆœ‰ๆ„ไน‰"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1362 builtin/commit.c:1524
 msgid "show status concisely"
 msgstr "ไปฅ็ฎ€ๆด็š„ๆ ผๅผๆ˜พ็คบ็Šถๆ€"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1364 builtin/commit.c:1526
 msgid "show branch information"
 msgstr "ๆ˜พ็คบๅˆ†ๆ”ฏไฟกๆฏ"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1366
 msgid "show stash information"
 msgstr "ๆ˜พ็คบ่ดฎ่—ๅŒบไฟกๆฏ"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1368 builtin/commit.c:1528
 msgid "compute full ahead/behind values"
 msgstr "่ฎก็ฎ—ๅฎŒๆ•ด็š„้ข†ๅ…ˆ/่ฝๅŽๅ€ผ"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1370
 msgid "version"
 msgstr "็‰ˆๆœฌ"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
 msgid "machine-readable output"
 msgstr "ๆœบๅ™จๅฏ่ฏป็š„่พ“ๅ‡บ"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1373 builtin/commit.c:1532
 msgid "show status in long format (default)"
 msgstr "ไปฅ้•ฟๆ ผๅผๆ˜พ็คบ็Šถๆ€๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1376 builtin/commit.c:1535
 msgid "terminate entries with NUL"
 msgstr "ๆก็›ฎไปฅ NUL ๅญ—็ฌฆ็ป“ๅฐพ"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
 msgid "mode"
 msgstr "ๆจกๅผ"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1379 builtin/commit.c:1538
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "ๆ˜พ็คบๆœช่ทŸ่ธช็š„ๆ–‡ไปถ๏ผŒโ€œๆจกๅผโ€็š„ๅฏ้€‰ๅ‚ๆ•ฐ๏ผšallใ€normalใ€noใ€‚๏ผˆ้ป˜่ฎค๏ผšall๏ผ‰"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1383
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 "ๆ˜พ็คบๅทฒๅฟฝ็•ฅ็š„ๆ–‡ไปถ๏ผŒๅฏ้€‰ๆจกๅผ๏ผštraditionalใ€matchingใ€noใ€‚๏ผˆ้ป˜่ฎค๏ผštraditional๏ผ‰"
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1385 parse-options.h:192
 msgid "when"
 msgstr "ไฝ•ๆ—ถ"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1386
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "ๅฟฝ็•ฅๅญๆจก็ป„็š„ๆ›ดๆ”น๏ผŒโ€œไฝ•ๆ—ถโ€็š„ๅฏ้€‰ๅ‚ๆ•ฐ๏ผšallใ€dirtyใ€untrackedใ€‚๏ผˆ้ป˜่ฎค๏ผšall๏ผ‰"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1388
 msgid "list untracked files in columns"
 msgstr "ไปฅๅˆ—็š„ๆ–นๅผๆ˜พ็คบๆœช่ทŸ่ธช็š„ๆ–‡ไปถ"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1389
 msgid "do not detect renames"
 msgstr "ไธๆฃ€ๆต‹้‡ๅ‘ฝๅ"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1391
 msgid "detect renames, optionally set similarity index"
 msgstr "ๆฃ€ๆต‹้‡ๅ‘ฝๅ๏ผŒๅฏไปฅ่ฎพ็ฝฎ็ดขๅผ•็›ธไผผๅบฆ"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1411
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "ไธๆ”ฏๆŒๅทฒๅฟฝ็•ฅๅ’Œๆœช่ทŸ่ธชๆ–‡ไปถๅ‚ๆ•ฐ็š„็ป„ๅˆ"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "suppress summary after successful commit"
 msgstr "ๆไบคๆˆๅŠŸๅŽไธๆ˜พ็คบๆฆ‚่ฟฐไฟกๆฏ"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1495
 msgid "show diff in commit message template"
 msgstr "ๅœจๆไบค่ฏดๆ˜Žๆจกๆฟ้‡Œๆ˜พ็คบๅทฎๅผ‚"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1497
 msgid "Commit message options"
 msgstr "ๆไบค่ฏดๆ˜Ž้€‰้กน"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
 msgid "read message from file"
 msgstr "ไปŽๆ–‡ไปถไธญ่ฏปๅ–ๆไบค่ฏดๆ˜Ž"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "author"
 msgstr "ไฝœ่€…"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1499
 msgid "override author for commit"
 msgstr "ๆไบคๆ—ถ่ฆ†็›–ไฝœ่€…"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1500 builtin/gc.c:538
 msgid "date"
 msgstr "ๆ—ฅๆœŸ"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1500
 msgid "override date for commit"
 msgstr "ๆไบคๆ—ถ่ฆ†็›–ๆ—ฅๆœŸ"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "ๆไบค"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1502
 msgid "reuse and edit message from specified commit"
 msgstr "้‡็”จๅนถ็ผ–่พ‘ๆŒ‡ๅฎšๆไบค็š„ๆไบค่ฏดๆ˜Ž"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1503
 msgid "reuse message from specified commit"
 msgstr "้‡็”จๆŒ‡ๅฎšๆไบค็š„ๆไบค่ฏดๆ˜Ž"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1504
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "ไฝฟ็”จ autosquash ๆ ผๅผ็š„ๆไบค่ฏดๆ˜Ž็”จไปฅไฟฎๆญฃๆŒ‡ๅฎš็š„ๆไบค"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1505
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "ไฝฟ็”จ autosquash ๆ ผๅผ็š„ๆไบค่ฏดๆ˜Ž็”จไปฅๅŽ‹็ผฉ่‡ณๆŒ‡ๅฎš็š„ๆไบค"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1506
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "็Žฐๅœจๅฐ†่ฏฅๆไบค็š„ไฝœ่€…ๆ”นไธบๆˆ‘๏ผˆๅ’Œ -C/-c/--amend ๅ‚ๆ•ฐๅ…ฑ็”จ๏ผ‰"
 
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "ๆทปๅŠ  Signed-off-by: ็ญพๅ"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1508
 msgid "use specified template file"
 msgstr "ไฝฟ็”จๆŒ‡ๅฎš็š„ๆจกๆฟๆ–‡ไปถ"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1509
 msgid "force edit of commit"
 msgstr "ๅผบๅˆถ็ผ–่พ‘ๆไบค"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1511
 msgid "include status in commit message template"
 msgstr "ๅœจๆไบค่ฏดๆ˜Žๆจกๆฟ้‡ŒๅŒ…ๅซ็Šถๆ€ไฟกๆฏ"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1516
 msgid "Commit contents options"
 msgstr "ๆไบคๅ†…ๅฎน้€‰้กน"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1517
 msgid "commit all changed files"
 msgstr "ๆไบคๆ‰€ๆœ‰ๆ”นๅŠจ็š„ๆ–‡ไปถ"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1518
 msgid "add specified files to index for commit"
 msgstr "ๆทปๅŠ ๆŒ‡ๅฎš็š„ๆ–‡ไปถๅˆฐ็ดขๅผ•ๅŒบ็ญ‰ๅพ…ๆไบค"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1519
 msgid "interactively add files"
 msgstr "ไบคไบ’ๅผๆทปๅŠ ๆ–‡ไปถ"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1520
 msgid "interactively add changes"
 msgstr "ไบคไบ’ๅผๆทปๅŠ ๅ˜ๆ›ด"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1521
 msgid "commit only specified files"
 msgstr "ๅชๆไบคๆŒ‡ๅฎš็š„ๆ–‡ไปถ"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1522
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "็ป•่ฟ‡ pre-commit ๅ’Œ commit-msg ้’ฉๅญ"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1523
 msgid "show what would be committed"
 msgstr "ๆ˜พ็คบๅฐ†่ฆๆไบค็š„ๅ†…ๅฎน"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1536
 msgid "amend previous commit"
 msgstr "ไฟฎๆ”นๅ…ˆๅ‰็š„ๆไบค"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1537
 msgid "bypass post-rewrite hook"
 msgstr "็ป•่ฟ‡ post-rewrite ้’ฉๅญ"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1544
 msgid "ok to record an empty change"
 msgstr "ๅ…่ฎธไธ€ไธช็ฉบๆไบค"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1546
 msgid "ok to record a change with an empty message"
 msgstr "ๅ…่ฎธ็ฉบ็š„ๆไบค่ฏดๆ˜Ž"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1619
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "ๆŸๅ็š„ MERGE_HEAD ๆ–‡ไปถ๏ผˆ%s๏ผ‰"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
 msgid "could not read MERGE_MODE"
 msgstr "ไธ่ƒฝ่ฏปๅ– MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1645
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "ไธ่ƒฝ่ฏปๅ–ๆไบค่ฏดๆ˜Ž๏ผš%s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "็ปˆๆญขๆไบคๅ› ไธบๆไบค่ฏดๆ˜Žไธบ็ฉบใ€‚\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "็ปˆๆญขๆไบค๏ผ›ๆ‚จๆœชๆ›ดๆ”นๆฅ่‡ชๆจก็‰ˆ็š„ๆไบค่ฏดๆ˜Žใ€‚\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1691
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -11758,73 +12717,74 @@ msgstr ""
 "ไป“ๅบ“ๅทฒๆ›ดๆ–ฐ๏ผŒไฝ†ๆ— ๆณ•ๅ†™ new_index ๆ–‡ไปถใ€‚ๆฃ€ๆŸฅๆ˜ฏๅฆ็ฃ็›˜ๅทฒๆปกๆˆ–\n"
 "็ฃ็›˜้…้ขๅทฒ่€—ๅฐฝ๏ผŒ็„ถๅŽๆ‰ง่กŒ \"git restore --staged :/\" ๆขๅคใ€‚"
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <ๅฏน่ฑก็›ฎๅฝ•>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <ๅฏน่ฑก็›ฎๅฝ•>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-msgstr "git commit-graph verify [--object-dir <ๅฏน่ฑก็›ฎๅฝ•>] [--shallow]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <ๅฏน่ฑก็›ฎๅฝ•>] [--shallow] [--"
+"[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
-msgstr "git commit-graph write [--object-dir <ๅฏน่ฑก็›ฎๅฝ•>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <ๅฏน่ฑก็›ฎๅฝ•>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
+
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "ๆ— ๆณ•ๆ‰พๅˆฐๅ’Œ %s ๅŒน้…็š„ๅฏน่ฑก็›ฎๅฝ•"
 
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
 msgid "dir"
 msgstr "็›ฎๅฝ•"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
 msgid "The object directory to store the graph"
 msgstr "ไฟๅญ˜ๅ›พๅฝข็š„ๅฏน่ฑก็›ฎๅฝ•"
 
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:71
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "ๅฆ‚ๆžœๆไบคๅ›พๅฝข่ขซๆ‹†ๅˆ†๏ผŒๅช้ชŒ่ฏๅคดไธ€ไธชๆ–‡ไปถ"
 
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ๆไบคๅ›พๅฝข '%s'"
 
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:128
 msgid "start walk at all refs"
 msgstr "ๅผ€ๅง‹้ๅŽ†ๆ‰€ๆœ‰ๅผ•็”จ"
 
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:130
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "ไปŽๆ ‡ๅ‡†่พ“ๅ…ฅไธญ็š„ๅŒ…็ดขๅผ•ๆ–‡ไปถๅˆ—่กจไธญๆ‰ซๆๆไบค"
 
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:132
 msgid "start walk at commits listed by stdin"
 msgstr "ไปŽๆ ‡ๅ‡†่พ“ๅ…ฅไธญ็š„ๆไบคๅผ€ๅง‹ๆ‰ซๆ"
 
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:134
 msgid "include all commits already in the commit-graph file"
 msgstr "ๅŒ…ๅซ commit-graph ๆ–‡ไปถไธญๅทฒๆœ‰ๆ‰€ๆœ‰ๆไบค"
 
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:137
 msgid "allow writing an incremental commit-graph file"
 msgstr "ๅ…่ฎธๅ†™ไธ€ไธชๅขž้‡ๆไบคๅ›พๅฝขๆ–‡ไปถ"
 
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "ๅœจ้žๅŸบๆœฌๆ‹†ๅˆ†ๆไบคๅ›พๅฝขไธญ็š„ๆœ€ๅคงๆไบคๆ•ฐ"
 
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:141
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "ไธ€ไธชๆ‹†ๅˆ†ๆไบคๅ›พๅฝข็š„ไธคไธช็บงๅˆซไน‹้—ด็š„ๆœ€ๅคงๆฏ”็Ž‡"
 
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:159
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "ไธ่ƒฝๅŒๆ—ถไฝฟ็”จ --reachableใ€--stdin-commits ๆˆ– --stdin-packs"
 
@@ -11832,205 +12792,209 @@ msgstr "ไธ่ƒฝๅŒๆ—ถไฝฟ็”จ --reachableใ€--stdin-commits ๆˆ– --stdin-packs"
 msgid "git config [<options>]"
 msgstr "git config [<้€‰้กน>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "ๆœช่ƒฝ่ฏ†ๅˆซ็š„ --type ๅ‚ๆ•ฐ๏ผŒ%s"
 
-#: builtin/config.c:115
+#: builtin/config.c:116
 msgid "only one type at a time"
 msgstr "ไธ€ๆฌกๅช่ƒฝไธ€ไธช็ฑปๅž‹"
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr "้…็ฝฎๆ–‡ไปถไฝ็ฝฎ"
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr "ไฝฟ็”จๅ…จๅฑ€้…็ฝฎๆ–‡ไปถ"
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr "ไฝฟ็”จ็ณป็ปŸ็บง้…็ฝฎๆ–‡ไปถ"
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr "ไฝฟ็”จไป“ๅบ“็บง้…็ฝฎๆ–‡ไปถ"
 
-#: builtin/config.c:128
+#: builtin/config.c:129
 msgid "use per-worktree config file"
 msgstr "ไฝฟ็”จๅทฅไฝœๅŒบ็บงๅˆซ็š„้…็ฝฎๆ–‡ไปถ"
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr "ไฝฟ็”จๆŒ‡ๅฎš็š„้…็ฝฎๆ–‡ไปถ"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr "ๆ•ฐๆฎๅฏน่ฑก ID"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr "ไปŽ็ป™ๅฎš็š„ๆ•ฐๆฎๅฏน่ฑก่ฏปๅ–้…็ฝฎ"
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr "ๆ“ไฝœ"
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr "่Žทๅ–ๅ€ผ๏ผšname [value-regex]"
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr "่Žทๅพ—ๆ‰€ๆœ‰็š„ๅ€ผ๏ผškey [value-regex]"
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "ๆ นๆฎๆญฃๅˆ™่กจ่พพๅผ่Žทๅพ—ๅ€ผ๏ผšname-regex [value-regex]"
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "่Žทๅพ— URL ๅ–ๅ€ผ๏ผšsection[.var] URL"
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr "ๆ›ฟๆขๆ‰€ๆœ‰ๅŒน้…็š„ๅ˜้‡๏ผšname value [value_regex]"
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr "ๆทปๅŠ ไธ€ไธชๆ–ฐ็š„ๅ˜้‡๏ผšname value"
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr "ๅˆ ้™คไธ€ไธชๅ˜้‡๏ผšname [value-regex]"
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr "ๅˆ ้™คๆ‰€ๆœ‰ๅŒน้…้กน๏ผšname [value-regex]"
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr "้‡ๅ‘ฝๅๅฐ่Š‚๏ผšold-name new-name"
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr "ๅˆ ้™คไธ€ไธชๅฐ่Š‚๏ผšname"
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr "ๅˆ—ๅ‡บๆ‰€ๆœ‰"
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr "ๆ‰“ๅผ€ไธ€ไธช็ผ–่พ‘ๅ™จ"
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr "่Žทๅพ—้…็ฝฎ็š„้ขœ่‰ฒ๏ผš้…็ฝฎ [้ป˜่ฎค]"
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "่Žทๅพ—้ขœ่‰ฒ่ฎพ็ฝฎ๏ผš้…็ฝฎ [stdout-is-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr "็ฑปๅž‹"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
 msgid "value is given this type"
 msgstr "ๅ–ๅ€ผไธบ่ฏฅ็ฑปๅž‹"
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr "ๅ€ผๆ˜ฏ \"true\" ๆˆ– \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr "ๅ€ผๆ˜ฏๅ่ฟ›ๅˆถๆ•ฐ"
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr "ๅ€ผๆ˜ฏ --bool or --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr "ๅ€ผๆ˜ฏไธ€ไธช่ทฏๅพ„๏ผˆๆ–‡ไปถๆˆ–็›ฎๅฝ•ๅ๏ผ‰"
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr "ๅ€ผๆ˜ฏไธ€ไธชๅˆฐๆœŸๆ—ฅๆœŸ"
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr "ๅ…ถๅฎƒ"
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr "็ปˆๆญขๅ€ผๆ˜ฏ NUL ๅญ—่Š‚"
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr "ๅชๆ˜พ็คบๅ˜้‡ๅ"
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr "ๆŸฅ่ฏขๆ—ถๅ‚็…ง include ๆŒ‡ไปค้€’ๅฝ’ๆŸฅๆ‰พ"
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "ๆ˜พ็คบ้…็ฝฎ็š„ๆฅๆบ๏ผˆๆ–‡ไปถใ€ๆ ‡ๅ‡†่พ“ๅ…ฅใ€ๆ•ฐๆฎๅฏน่ฑก๏ผŒๆˆ–ๅ‘ฝไปค่กŒ๏ผ‰"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr "ๆ˜พ็คบ้…็ฝฎ็š„ไฝœ็”จๅŸŸ๏ผˆๅทฅไฝœๅŒบใ€ๆœฌๅœฐใ€ๅ…จๅฑ€ใ€็ณป็ปŸใ€ๅ‘ฝไปค๏ผ‰"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
 msgid "value"
 msgstr "ๅ–ๅ€ผ"
 
-#: builtin/config.c:158
+#: builtin/config.c:160
 msgid "with --get, use default value when missing entry"
 msgstr "ไฝฟ็”จ --get ๅ‚ๆ•ฐ๏ผŒๅฝ“็ผบๅฐ‘่ฎพ็ฝฎๆ—ถไฝฟ็”จ้ป˜่ฎคๅ€ผ"
 
-#: builtin/config.c:172
+#: builtin/config.c:174
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "้”™่ฏฏ็š„ๅ‚ๆ•ฐไธชๆ•ฐ๏ผŒๅบ”่ฏฅไธบ %d ไธช"
 
-#: builtin/config.c:174
+#: builtin/config.c:176
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "้”™่ฏฏ็š„ๅ‚ๆ•ฐไธชๆ•ฐ๏ผŒๅบ”่ฏฅไธบไปŽ %d ไธชๅˆฐ %d ไธช"
 
-#: builtin/config.c:308
+#: builtin/config.c:324
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "ๆ— ๆ•ˆ้”ฎๅๆจกๅผ๏ผš%s"
 
-#: builtin/config.c:344
+#: builtin/config.c:360
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "ๆ ผๅผๅŒ–้ป˜่ฎค้…็ฝฎๅ€ผๅคฑ่ดฅ๏ผš%s"
 
-#: builtin/config.c:401
+#: builtin/config.c:417
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "ๆ— ๆณ•่งฃๆž้ขœ่‰ฒ '%s'"
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr "ๆ— ๆณ•่งฃๆž้ป˜่ฎค้ขœ่‰ฒๅ€ผ"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
 msgid "not in a git directory"
 msgstr "ไธๅœจ git ไป“ๅบ“ไธญ"
 
-#: builtin/config.c:499
+#: builtin/config.c:515
 msgid "writing to stdin is not supported"
 msgstr "ไธๆ”ฏๆŒๅ†™ๅˆฐๆ ‡ๅ‡†่พ“ๅ…ฅ"
 
-#: builtin/config.c:502
+#: builtin/config.c:518
 msgid "writing config blobs is not supported"
 msgstr "ไธๆ”ฏๆŒๅ†™ๅˆฐ้…็ฝฎๆ•ฐๆฎๅฏน่ฑก"
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12045,23 +13009,23 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:627
 msgid "only one config file at a time"
 msgstr "ไธ€ๆฌกๅช่ƒฝๆœ‰ไธ€ไธช้…็ฝฎๆ–‡ไปถ"
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr "--local ๅช่ƒฝๅœจไธ€ไธชไป“ๅบ“ๅ†…ไฝฟ็”จ"
 
-#: builtin/config.c:619
+#: builtin/config.c:635
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob ๅช่ƒฝๅœจไธ€ไธชไป“ๅบ“ๅ†…ไฝฟ็”จ"
 
-#: builtin/config.c:638
+#: builtin/config.c:655
 msgid "$HOME not set"
 msgstr "$HOME ๆœช่ฎพ็ฝฎ"
 
-#: builtin/config.c:658
+#: builtin/config.c:679
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12070,51 +13034,51 @@ msgstr ""
 "ไธ่ƒฝๅ’ŒๅคšไธชๅทฅไฝœๅŒบไธ€่ตทไฝฟ็”จ --worktree๏ผŒ้™ค้žๅฏ็”จ worktreeConfig ้…็ฝฎๆ‰ฉๅฑ•ใ€‚\n"
 "่ฏฆๆƒ…่ฏท้˜…่ฏปโ€œgit help worktreeโ€็š„โ€œCONFIGURATION FILEโ€ๅฐ่Š‚"
 
-#: builtin/config.c:688
+#: builtin/config.c:714
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color ๅ’Œๅ˜้‡็ฑปๅž‹ไธๅ…ผๅฎน"
 
-#: builtin/config.c:693
+#: builtin/config.c:719
 msgid "only one action at a time"
 msgstr "ไธ€ๆฌกๅช่ƒฝๆœ‰ไธ€ไธชๅŠจไฝœ"
 
-#: builtin/config.c:706
+#: builtin/config.c:732
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only ไป…้€‚็”จไบŽ --list ๆˆ– --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:738
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr "--show-origin ไป…้€‚็”จไบŽ --getใ€--get-allใ€--get-regexp ๅ’Œ --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:744
 msgid "--default is only applicable to --get"
 msgstr "--default ไป…้€‚็”จไบŽ --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:757
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "ๆ— ๆณ•่ฏปๅ–้…็ฝฎๆ–‡ไปถ '%s'"
 
-#: builtin/config.c:734
+#: builtin/config.c:760
 msgid "error processing config file(s)"
 msgstr "ๅค„็†้…็ฝฎๆ–‡ไปถๅ‡บ้”™"
 
-#: builtin/config.c:744
+#: builtin/config.c:770
 msgid "editing stdin is not supported"
 msgstr "ไธๆ”ฏๆŒ็ผ–่พ‘ๆ ‡ๅ‡†่พ“ๅ…ฅ"
 
-#: builtin/config.c:746
+#: builtin/config.c:772
 msgid "editing blobs is not supported"
 msgstr "ไธๆ”ฏๆŒ็ผ–่พ‘ๆ•ฐๆฎๅฏน่ฑก"
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ้…็ฝฎๆ–‡ไปถ %s"
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12123,7 +13087,7 @@ msgstr ""
 "ๆ— ๆณ•็”จไธ€ไธชๅ€ผ่ฆ†็›–ๅคšไธชๅ€ผ\n"
 "       ไฝฟ็”จไธ€ไธชๆญฃๅˆ™่กจ่พพๅผใ€--add ๆˆ– --replace-all ๆฅไฟฎๆ”น %sใ€‚"
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
 #, c-format
 msgid "no such section: %s"
 msgstr "ๆ— ๆญคๅฐ่Š‚๏ผš%s"
@@ -12136,57 +13100,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "ไปฅ็”จๆˆทๅฏ่ฏป็š„ๆ ผๅผๆ˜พ็คบๅคงๅฐ"
 
-#: builtin/describe.c:27
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<้€‰้กน>] [<ๆไบคๅท>...]"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<้€‰้กน>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "head"
 msgstr "ๅคด"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "lightweight"
 msgstr "่ฝป้‡็บง็š„"
 
-#: builtin/describe.c:63
+#: builtin/describe.c:62
 msgid "annotated"
 msgstr "้™„ๆณจ็š„"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:275
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "้™„ๆณจๆ ‡็ญพ %s ๆ— ๆ•ˆ"
 
-#: builtin/describe.c:277
+#: builtin/describe.c:279
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "้™„ๆณจๆ ‡็ญพ %s ๆฒกๆœ‰ๅตŒๅ…ฅๅ็งฐ"
 
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "ๆ ‡็ญพ '%s' ็š„็กฎๆ˜ฏๅœจ '%s'"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:325
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "ๆฒกๆœ‰ๆ ‡็ญพๅ‡†็กฎๅŒน้… '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:327
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "ๆฒกๆœ‰็ฒพ็กฎๅŒน้…ๅˆฐๅผ•็”จๆˆ–ๆ ‡็ญพ๏ผŒ็ปง็ปญๆœ็ดข่ฟ›่กŒๆ่ฟฐ\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:394
 #, c-format
 msgid "finished search at %s\n"
 msgstr "ๅฎŒๆˆๆœ็ดข %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:421
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12195,7 +13159,7 @@ msgstr ""
 "ๆฒกๆœ‰้™„ๆณจๆ ‡็ญพ่ƒฝๆ่ฟฐ '%s'ใ€‚\n"
 "็„ถ่€Œ๏ผŒๅญ˜ๅœจๆœช้™„ๆณจๆ ‡็ญพ๏ผšๅฐ่ฏ• --tagsใ€‚"
 
-#: builtin/describe.c:409
+#: builtin/describe.c:425
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12204,12 +13168,12 @@ msgstr ""
 "ๆฒกๆœ‰ๆ ‡็ญพ่ƒฝๆ่ฟฐ '%s'ใ€‚\n"
 "ๅฐ่ฏ• --always๏ผŒๆˆ–่€…ๅˆ›ๅปบไธ€ไบ›ๆ ‡็ญพใ€‚"
 
-#: builtin/describe.c:439
+#: builtin/describe.c:455
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "ๅทฒ้ๅŽ† %lu ไธชๆไบค\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:458
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12218,90 +13182,90 @@ msgstr ""
 "ๅ‘็ŽฐๅคšไบŽ %i ไธชๆ ‡็ญพ๏ผŒๅˆ—ๅ‡บๆœ€่ฟ‘็š„ %i ไธช\n"
 "ๅœจ %s ๆ”พๅผƒๆœ็ดข\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:526
 #, c-format
 msgid "describe %s\n"
 msgstr "ๆ่ฟฐ %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:529
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๅฏน่ฑกๅ %s"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:537
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s ๆ—ขไธๆ˜ฏๆไบคไนŸไธๆ˜ฏๆ•ฐๆฎๅฏน่ฑก"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:551
 msgid "find the tag that comes after the commit"
 msgstr "ๅฏปๆ‰พ่ฏฅๆไบคไน‹ๅŽ็š„ๆ ‡็ญพ"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:552
 msgid "debug search strategy on stderr"
 msgstr "ๅœจๆ ‡ๅ‡†้”™่ฏฏไธŠ่ฐƒ่ฏ•ๆœ็ดข็ญ–็•ฅ"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:553
 msgid "use any ref"
 msgstr "ไฝฟ็”จไปปๆ„ๅผ•็”จ"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:554
 msgid "use any tag, even unannotated"
 msgstr "ไฝฟ็”จไปปๆ„ๆ ‡็ญพ๏ผŒๅณไฝฟๆœช้™„ๅธฆๆณจ้‡Š"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:555
 msgid "always use long format"
 msgstr "ๅง‹็ปˆไฝฟ็”จ้•ฟๆไบคๅทๆ ผๅผ"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:556
 msgid "only follow first parent"
 msgstr "ๅช่ทŸ้š็ฌฌไธ€ไธช็ˆถๆไบค"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:559
 msgid "only output exact matches"
 msgstr "ๅช่พ“ๅ‡บ็ฒพ็กฎๅŒน้…"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:561
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "่€ƒ่™‘ๆœ€่ฟ‘ <n> ไธชๆ ‡็ญพ๏ผˆ้ป˜่ฎค๏ผš10๏ผ‰"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:563
 msgid "only consider tags matching <pattern>"
 msgstr "ๅช่€ƒ่™‘ๅŒน้… <ๆจกๅผ> ็š„ๆ ‡็ญพ"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:565
 msgid "do not consider tags matching <pattern>"
 msgstr "ไธ่€ƒ่™‘ๅŒน้… <ๆจกๅผ> ็š„ๆ ‡็ญพ"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:567 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "ๆ˜พ็คบ็ฎ€ๅ†™็š„ๆไบคๅทไฝœไธบๅŽๅค‡"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:568 builtin/describe.c:571
 msgid "mark"
 msgstr "ๆ ‡่ฎฐ"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:569
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "ๅฏนไบŽ่„ๅทฅไฝœๅŒบ๏ผŒ่ฟฝๅŠ  <ๆ ‡่ฎฐ>๏ผˆ้ป˜่ฎค๏ผš\"-dirty\"๏ผ‰"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:572
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "ๅฏนไบŽๆŸๅ็š„ๅทฅไฝœๅŒบ๏ผŒ่ฟฝๅŠ  <ๆ ‡่ฎฐ>๏ผˆ้ป˜่ฎค๏ผš\"-broken\"๏ผ‰"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:590
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long ไธŽ --abbrev=0 ไธๅ…ผๅฎน"
 
-#: builtin/describe.c:603
+#: builtin/describe.c:619
 msgid "No names found, cannot describe anything."
 msgstr "ๆฒกๆœ‰ๅ‘็Žฐๅ็งฐ๏ผŒๆ— ๆณ•ๆ่ฟฐไปปไฝ•ไธœ่ฅฟใ€‚"
 
-#: builtin/describe.c:654
+#: builtin/describe.c:670
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty ไธŽๆไบคๅทไธๅ…ผๅฎน"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:672
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken ไธŽๆไบคๅทไธๅ…ผๅฎน"
 
@@ -12338,27 +13302,27 @@ msgstr "ๆ— ๆณ•ๅค„็†็š„ๅฏน่ฑก '%s'ใ€‚"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<้€‰้กน>] [<ๆไบค> [<ๆไบค>]] [--] [<่ทฏๅพ„>...]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "ๅคฑ่ดฅ๏ผš%d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "ๆ— ๆณ•่ฏปๅ–็ฌฆๅท้“พๆŽฅ %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "ๆ— ๆณ•่ฏปๅ–็ฌฆๅท้“พๆŽฅๆ–‡ไปถ %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "ๆ— ๆณ•่ฏปๅ–็ฌฆๅท้“พๆŽฅ %2$s ๆŒ‡ๅ‘็š„ๅฏน่ฑก %1$s"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -12366,83 +13330,83 @@ msgstr ""
 "ไธๆ”ฏๆŒๅœจ็›ฎๅฝ•ๆฏ”่พƒๆจกๅผ๏ผˆ'-d' ๅ’Œ '--dir-diff'๏ผ‰ไธญ้‡‡็”จ็ป„ๅˆๅทฎๅผ‚ๆ ผๅผ๏ผˆ'-c' ๅ’Œ '--"
 "cc'๏ผ‰ใ€‚"
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:634
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ไธคไธชๆ–‡ไปถ้ƒฝ่ขซไฟฎๆ”น๏ผš'%s' ๅ’Œ '%s'ใ€‚"
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
 msgid "working tree file has been left."
 msgstr "ๅทฅไฝœๅŒบๆ–‡ไปถ่ขซ็•™ไบ†ไธ‹ๆฅใ€‚"
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "ไธดๆ—ถๆ–‡ไปถๅญ˜ๅœจไบŽ '%s'ใ€‚"
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
 msgid "you may want to cleanup or recover these."
 msgstr "ๆ‚จๅฏ่ƒฝๆƒณ่ฆๆธ…็†ๆˆ–่€…ๆขๅคๅฎƒไปฌใ€‚"
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "ไฝฟ็”จ `diff.guitool` ไปฃๆ›ฟ `diff.tool`"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
 msgid "perform a full-directory diff"
 msgstr "ๆ‰ง่กŒไธ€ไธชๅ…จ็›ฎๅฝ•ๅทฎๅผ‚ๆฏ”่พƒ"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
 msgid "do not prompt before launching a diff tool"
 msgstr "ๅฏๅŠจๅทฎๅผ‚ๆฏ”่พƒๅทฅๅ…ทไน‹ๅ‰ไธๆ็คบ"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "ๅœจ dir-diff ๆจกๅผไธญไฝฟ็”จ็ฌฆๅท้“พๆŽฅ"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
 msgid "tool"
 msgstr "ๅทฅๅ…ท"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "ไฝฟ็”จๆŒ‡ๅฎš็š„ๅทฎๅผ‚ๆฏ”่พƒๅทฅๅ…ท"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "ๆ˜พ็คบๅฏไปฅ็”จๅœจ `--tool` ๅ‚ๆ•ฐๅŽ็š„ๅทฎๅผ‚ๅทฅๅ…ทๅˆ—่กจ"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr "ๅฝ“ๆ‰ง่กŒ diff ๅทฅๅ…ท่ฟ”ๅ›ž้ž้›ถ้€€ๅ‡บ็ ๆ—ถ๏ผŒไฝฟ 'git-difftool' ้€€ๅ‡บ"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "ๆŒ‡ๅฎšไธ€ไธช็”จไบŽๆŸฅ็œ‹ๅทฎๅผ‚็š„่‡ชๅฎšไน‰ๅ‘ฝไปค"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
 msgid "passed to `diff`"
 msgstr "ไผ ้€’็ป™ `diff`"
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool ่ฆๆฑ‚ๅทฅไฝœๅŒบๆˆ–่€… --no-index"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff ๅ’Œ --no-index ไธๅ…ผๅฎน"
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--guiใ€--tool ๅ’Œ --extcmd ไบ’ๆ–ฅ"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "ๆฒกๆœ‰ไธบ --tool=<ๅทฅๅ…ท> ๅ‚ๆ•ฐๆไพ› <ๅทฅๅ…ท>"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "ๆฒกๆœ‰ไธบ --extcmd=<ๅ‘ฝไปค> ๅ‚ๆ•ฐๆไพ› <ๅ‘ฝไปค>"
 
@@ -12478,245 +13442,273 @@ msgstr "้€‰้กน `--default' ๅ’Œ `type=ulong` ๆœŸๆœ›ไธ€ไธชๆ— ็ฌฆๅท้•ฟๆ•ดๅž‹๏ผŒไธ
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr "้”™่ฏฏ๏ผš้™ค้žๆŒ‡ๅฎš --mark-tags๏ผŒๅฆๅˆ™ๆ— ๆณ•ๅฏผๅ‡บๅตŒๅฅ—ๆ ‡็ญพใ€‚"
+
+#: builtin/fast-export.c:1152
 msgid "show progress after <n> objects"
 msgstr "ๅœจ <n> ไธชๅฏน่ฑกไน‹ๅŽๆ˜พ็คบ่ฟ›ๅบฆ"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
 msgid "select handling of signed tags"
 msgstr "้€‰ๆ‹ฉๅฆ‚ไฝ•ๅค„็†็ญพๅๆ ‡็ญพ"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
 msgid "select handling of tags that tag filtered objects"
 msgstr "้€‰ๆ‹ฉๅฝ“ๆ ‡็ญพๆŒ‡ๅ‘่ขซ่ฟ‡ๆปคๅฏน่ฑกๆ—ถ่ฏฅๆ ‡็ญพ็š„ๅค„็†ๆ–นๅผ"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "้€‰ๆ‹ฉไฝฟ็”จๅค‡็”จ็ผ–็ ๅค„็†ๆไบค่ฏดๆ˜Ž"
 
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
 msgid "Dump marks to this file"
 msgstr "ๆŠŠๆ ‡่ฎฐๅญ˜ๅ‚จๅˆฐ่ฟ™ไธชๆ–‡ไปถ"
 
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
 msgid "Import marks from this file"
 msgstr "ไปŽ่ฟ™ไธชๆ–‡ไปถๅฏผๅ…ฅๆ ‡่ฎฐ"
 
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "ไปŽ่ฏฅๆ–‡ไปถๅฏผๅ…ฅๆ ‡่ฎฐ๏ผˆๅฆ‚ๆžœๅญ˜ๅœจ็š„่ฏ๏ผ‰"
+
+#: builtin/fast-export.c:1171
 msgid "Fake a tagger when tags lack one"
 msgstr "ๅฝ“ๆ ‡็ญพ็ผบๅฐ‘ๆ ‡่ฎฐ่€…ๅญ—ๆฎตๆ—ถ๏ผŒๅ‡่ฃ…ๆไพ›ไธ€ไธช"
 
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
 msgid "Output full tree for each commit"
 msgstr "ๆฏๆฌกๆไบค้ƒฝ่พ“ๅ‡บๆ•ดไธชๆ ‘"
 
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
 msgid "Use the done feature to terminate the stream"
 msgstr "ไฝฟ็”จ done ๅŠŸ่ƒฝๆฅ็ปˆๆญขๆต"
 
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
 msgid "Skip output of blob data"
 msgstr "่ทณ่ฟ‡ๆ•ฐๆฎๅฏน่ฑก็š„่พ“ๅ‡บ"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1705
 msgid "refspec"
 msgstr "ๅผ•็”จ่ง„ๆ ผ"
 
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
 msgid "Apply refspec to exported refs"
 msgstr "ๅฏนๅฏผๅ‡บ็š„ๅผ•็”จๅบ”็”จๅผ•็”จ่ง„ๆ ผ"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
 msgid "anonymize output"
 msgstr "ๅŒฟๅ่พ“ๅ‡บ"
 
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr "ๅผ•็”จ็ˆถๅฏน่ฑก ID ไธๅœจ fast-export ๆตไธญ"
 
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
 msgid "Show original object ids of blobs/commits"
 msgstr "ๆ˜พ็คบๆ•ฐๆฎๅฏน่ฑก/ๆไบค็š„ๅŽŸๅง‹ๅฏน่ฑก ID"
 
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "ๅฏนๅธฆๆœ‰ๆ ‡่ฎฐ ID ็š„ๆ ‡็ญพๅšๆ ‡่ฎฐ"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr "ไธ่ƒฝๅŒๆ—ถไผ ้€’ๅ‚ๆ•ฐ --import-marks ๅ’Œ --import-marks-if-exists"
+
+#: builtin/fetch.c:34
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<้€‰้กน>] [<ไป“ๅบ“> [<ๅผ•็”จ่ง„ๆ ผ>...]]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<้€‰้กน>] <็ป„>"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<้€‰้กน>] [(<ไป“ๅบ“> | <็ป„>)...]"
 
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<้€‰้กน>]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel ไธ่ƒฝไธบ่ดŸๆ•ฐ"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
 msgid "fetch from all remotes"
 msgstr "ไปŽๆ‰€ๆœ‰็š„่ฟœ็จ‹ๆŠ“ๅ–"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "ไธบ git pull/fetch ่ฎพ็ฝฎไธŠๆธธ"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "่ฟฝๅŠ ๅˆฐ .git/FETCH_HEAD ่€Œไธๆ˜ฏ่ฆ†็›–ๅฎƒ"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:145 builtin/pull.c:190
 msgid "path to upload pack on remote end"
 msgstr "ไธŠไผ ๅŒ…ๅˆฐ่ฟœ็จ‹็š„่ทฏๅพ„"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:146
 msgid "force overwrite of local reference"
 msgstr "ๅผบๅˆถ่ฆ†็›–ๆœฌๅœฐๅผ•็”จ"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:148
 msgid "fetch from multiple remotes"
 msgstr "ไปŽๅคšไธช่ฟœ็จ‹ๆŠ“ๅ–"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:150 builtin/pull.c:194
 msgid "fetch all tags and associated objects"
 msgstr "ๆŠ“ๅ–ๆ‰€ๆœ‰็š„ๆ ‡็ญพๅ’Œๅ…ณ่”ๅฏน่ฑก"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:152
 msgid "do not fetch all tags (--no-tags)"
 msgstr "ไธๆŠ“ๅ–ไปปไฝ•ๆ ‡็ญพ(--no-tags)"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:154
 msgid "number of submodules fetched in parallel"
 msgstr "ๅญๆจก็ป„่Žทๅ–็š„ๅนถๅ‘ๆ•ฐ"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:156 builtin/pull.c:197
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "ๆธ…้™ค่ฟœ็จ‹ๅทฒ็ปไธๅญ˜ๅœจ็š„ๅˆ†ๆ”ฏ็š„่ทŸ่ธชๅˆ†ๆ”ฏ"
 
-#: builtin/fetch.c:142
+#: builtin/fetch.c:158
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "ๆธ…้™ค่ฟœ็จ‹ไธๅญ˜ๅœจ็š„ๆœฌๅœฐๆ ‡็ญพ๏ผŒๅนถไธ”ๆ›ฟๆขๅ˜ๆ›ดๆ ‡็ญพ"
 
 #  ่ฏ‘่€…๏ผšๅฏ้€‰ๅ€ผ๏ผŒไธ่ƒฝ็ฟป่ฏ‘
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:160
 msgid "control recursive fetching of submodules"
 msgstr "ๆŽงๅˆถๅญๆจก็ป„็š„้€’ๅฝ’ๆŠ“ๅ–"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:164 builtin/pull.c:205
 msgid "keep downloaded pack"
 msgstr "ไฟๆŒไธ‹่ฝฝๅŒ…"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:166
 msgid "allow updating of HEAD ref"
 msgstr "ๅ…่ฎธๆ›ดๆ–ฐ HEAD ๅผ•็”จ"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
 msgid "deepen history of shallow clone"
 msgstr "ๆทฑๅŒ–ๆต…ๅ…‹้š†็š„ๅŽ†ๅฒ"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:171
 msgid "deepen history of shallow repository based on time"
 msgstr "ๅŸบไบŽๆ—ถ้—ดๆฅๆทฑๅŒ–ๆต…ๅ…‹้š†็š„ๅŽ†ๅฒ"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:177 builtin/pull.c:211
 msgid "convert to a complete repository"
 msgstr "่ฝฌๆขไธบไธ€ไธชๅฎŒๆ•ด็š„ไป“ๅบ“"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:180
 msgid "prepend this to submodule path output"
 msgstr "ๅœจๅญๆจก็ป„่ทฏๅพ„่พ“ๅ‡บ็š„ๅ‰้ขๅŠ ไธŠๆญค็›ฎๅฝ•"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:183
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "้€’ๅฝ’่Žทๅ–ๅญๆจก็ป„็š„็ผบ็œๅ€ผ๏ผˆๆฏ”้…็ฝฎๆ–‡ไปถไผ˜ๅ…ˆ็บงไฝŽ๏ผ‰"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:187 builtin/pull.c:214
 msgid "accept refs that update .git/shallow"
 msgstr "ๆŽฅๅ—ๆ›ดๆ–ฐ .git/shallow ็š„ๅผ•็”จ"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:188 builtin/pull.c:216
 msgid "refmap"
 msgstr "ๅผ•็”จๆ˜ ๅฐ„"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:217
 msgid "specify fetch refmap"
 msgstr "ๆŒ‡ๅฎš่Žทๅ–ๆ“ไฝœ็š„ๅผ•็”จๆ˜ ๅฐ„"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:196
 msgid "report that we have only objects reachable from this object"
 msgstr "ๆŠฅๅ‘Šๆˆ‘ไปฌๅชๆ‹ฅๆœ‰ไปŽ่ฏฅๅฏน่ฑกๅผ€ๅง‹ๅฏ่พพ็š„ๅฏน่ฑก"
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:199
 msgid "run 'gc --auto' after fetching"
 msgstr "่Žทๅ–ๅŽๆ‰ง่กŒ 'gc --auto'"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:201 builtin/pull.c:226
 msgid "check for forced-updates on all updated branches"
 msgstr "ๅœจๆ‰€ๆœ‰ๆ›ดๆ–ฐๅˆ†ๆ”ฏไธŠๆฃ€ๆŸฅๅผบๅˆถๆ›ดๆ–ฐ"
 
-#: builtin/fetch.c:491
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "ๆŠ“ๅ–ๅŽๅ†™ๆไบคๅ›พ"
+
+#: builtin/fetch.c:513
 msgid "Couldn't find remote ref HEAD"
 msgstr "ๆ— ๆณ•ๅ‘็Žฐ่ฟœ็จ‹ HEAD ๅผ•็”จ"
 
-#: builtin/fetch.c:630
+#: builtin/fetch.c:653
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "้…็ฝฎๅ˜้‡ fetch.output ๅŒ…ๅซๆ— ๆ•ˆๅ€ผ %s"
 
-#: builtin/fetch.c:728
+#: builtin/fetch.c:751
 #, c-format
 msgid "object %s not found"
 msgstr "ๅฏน่ฑก %s ๆœชๅ‘็Žฐ"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:755
 msgid "[up to date]"
 msgstr "[ๆœ€ๆ–ฐ]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
 msgid "[rejected]"
 msgstr "[ๅทฒๆ‹’็ป]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:769
 msgid "can't fetch in current branch"
 msgstr "ๅฝ“ๅ‰ๅˆ†ๆ”ฏไธ‹ไธ่ƒฝๆ‰ง่กŒ่Žทๅ–ๆ“ไฝœ"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:779
 msgid "[tag update]"
 msgstr "[ๆ ‡็ญพๆ›ดๆ–ฐ]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
 msgid "unable to update local ref"
 msgstr "ไธ่ƒฝๆ›ดๆ–ฐๆœฌๅœฐๅผ•็”จ"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:784
 msgid "would clobber existing tag"
 msgstr "ไผš็ ดๅ็Žฐๆœ‰็š„ๆ ‡็ญพ"
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:806
 msgid "[new tag]"
 msgstr "[ๆ–ฐๆ ‡็ญพ]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:809
 msgid "[new branch]"
 msgstr "[ๆ–ฐๅˆ†ๆ”ฏ]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:812
 msgid "[new ref]"
 msgstr "[ๆ–ฐๅผ•็”จ]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:851
 msgid "forced update"
 msgstr "ๅผบๅˆถๆ›ดๆ–ฐ"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:856
 msgid "non-fast-forward"
 msgstr "้žๅฟซ่ฟ›"
 
-#: builtin/fetch.c:854
+#: builtin/fetch.c:877
 msgid ""
 "Fetch normally indicates which branches had a forced update,\n"
 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -12726,7 +13718,7 @@ msgstr ""
 "่ฆ้‡ๆ–ฐๅฏ็”จ๏ผŒ่ฏทไฝฟ็”จ '--show-forced-updates' ้€‰้กนๆˆ–่ฟ่กŒ\n"
 "'git config fetch.showForcedUpdates true'ใ€‚"
 
-#: builtin/fetch.c:858
+#: builtin/fetch.c:881
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -12737,22 +13729,22 @@ msgstr ""
 "่Šฑไบ† %.2f ็ง’ๆฅๆฃ€ๆŸฅๅผบๅˆถๆ›ดๆ–ฐใ€‚ๆ‚จๅฏไปฅไฝฟ็”จ '--no-show-forced-updates'\n"
 "ๆˆ–่ฟ่กŒ 'git config fetch.showForcedUpdates false' ไปฅ้ฟๅ…ๆญค้กนๆฃ€ๆŸฅใ€‚\n"
 
-#: builtin/fetch.c:888
+#: builtin/fetch.c:920
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s ๆœชๅ‘้€ๆ‰€ๆœ‰ๅฟ…้œ€็š„ๅฏน่ฑก\n"
 
-#: builtin/fetch.c:909
+#: builtin/fetch.c:941
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "ๆ‹’็ป %s ๅ› ไธบๆต…ๅ…‹้š†ไธๅ…่ฎธ่ขซๆ›ดๆ–ฐ"
 
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
 #, c-format
 msgid "From %.*s\n"
 msgstr "ๆฅ่‡ช %.*s\n"
 
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1037
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -12762,100 +13754,123 @@ msgstr ""
 " 'git remote prune %s' ๆฅๅˆ ้™คๆ—ง็š„ใ€ๆœ‰ๅ†ฒ็ช็š„ๅˆ†ๆ”ฏ"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1134
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   ๏ผˆ%s ๅฐ†ๆˆไธบๆ‚ฌ็ฉบ็Šถๆ€๏ผ‰"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1135
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   ๏ผˆ%s ๅทฒๆˆไธบๆ‚ฌ็ฉบ็Šถๆ€๏ผ‰"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1167
 msgid "[deleted]"
 msgstr "[ๅทฒๅˆ ้™ค]"
 
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1168 builtin/remote.c:1112
 msgid "(none)"
 msgstr "๏ผˆๆ— ๏ผ‰"
 
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1191
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "ๆ‹’็ป่Žทๅ–ๅˆฐ้ž็บฏไป“ๅบ“็š„ๅฝ“ๅ‰ๅˆ†ๆ”ฏ %s"
 
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1210
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "้€‰้กน \"%s\" ็š„ๅ€ผ \"%s\" ๅฏนไบŽ %s ๆ˜ฏๆ— ๆ•ˆ็š„"
 
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1213
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "้€‰้กน \"%s\" ไธบ %s ๆ‰€ๅฟฝ็•ฅ\n"
 
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "ๆฃ€ๆต‹ๅˆฐๅคšๅˆ†ๆ”ฏ๏ผŒๅ’Œ --set-upstream ไธๅ…ผๅฎน"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "ๆฒกๆœ‰ไธบไธ€ไธช่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏ่ฎพ็ฝฎไธŠๆธธ"
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "ๆฒกๆœ‰ไธบไธ€ไธช่ฟœ็จ‹ๆ ‡็ญพ่ฎพ็ฝฎไธŠๆธธ"
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "ๆœช็Ÿฅ็š„ๅˆ†ๆ”ฏ็ฑปๅž‹"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"ๆœชๅ‘็Žฐๆบๅˆ†ๆ”ฏใ€‚\n"
+"ๆ‚จ้œ€่ฆไฝฟ็”จ --set-upstream ้€‰้กนๆŒ‡ๅฎšไธ€ไธชๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
 #, c-format
 msgid "Fetching %s\n"
 msgstr "ๆญฃๅœจ่Žทๅ– %s\n"
 
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "ไธ่ƒฝ่Žทๅ– %s"
 
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr "ๅชๅฏไปฅๅฐ† --filter ็”จไบŽๅœจ extensions.partialClone ไธญ้…็ฝฎ็š„่ฟœ็จ‹ไป“ๅบ“"
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "ๆ— ๆณ•่Žทๅ– '%s'๏ผˆ้€€ๅ‡บ็ ๏ผš%d๏ผ‰\n"
 
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1693
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
 msgstr "ๆœชๆŒ‡ๅฎš่ฟœ็จ‹ไป“ๅบ“ใ€‚่ฏท้€š่ฟ‡ไธ€ไธช URL ๆˆ–่ฟœ็จ‹ไป“ๅบ“ๅๆŒ‡ๅฎš๏ผŒ็”จไปฅ่Žทๅ–ๆ–ฐๆไบคใ€‚"
 
-#: builtin/fetch.c:1593
+#: builtin/fetch.c:1730
 msgid "You need to specify a tag name."
 msgstr "ๆ‚จ้œ€่ฆๆŒ‡ๅฎšไธ€ไธชๆ ‡็ญพๅ็งฐใ€‚"
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1780
 msgid "Negative depth in --deepen is not supported"
 msgstr "--deepen ไธๆ”ฏๆŒ่ดŸๆ•ฐๆทฑๅบฆ"
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1782
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen ๅ’Œ --depth ๆ˜ฏไบ’ๆ–ฅ็š„"
 
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1787
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth ๅ’Œ --unshallow ไธ่ƒฝๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1789
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "ๅฏนไบŽไธ€ไธชๅฎŒๆ•ด็š„ไป“ๅบ“๏ผŒๅ‚ๆ•ฐ --unshallow ๆฒกๆœ‰ๆ„ไน‰"
 
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1805
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all ไธ่ƒฝๅธฆไธ€ไธชไป“ๅบ“ๅ‚ๆ•ฐ"
 
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1807
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all ๅธฆๅผ•็”จ่ง„ๆ ผๆฒกๆœ‰ไปปไฝ•ๆ„ไน‰"
 
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1816
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "ๆฒกๆœ‰่ฟ™ๆ ท็š„่ฟœ็จ‹ๆˆ–่ฟœ็จ‹็ป„๏ผš%s"
 
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1823
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "่Žทๅ–็ป„ๅนถๆŒ‡ๅฎšๅผ•็”จ่ง„ๆ ผๆฒกๆœ‰ๆ„ไน‰"
 
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1841
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -12866,23 +13881,23 @@ msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr "git fmt-merge-msg [-m <่ฏดๆ˜Ž>] [--log[=<n>] | --no-log] [--file <ๆ–‡ไปถ>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:671
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "ๅ‘ๆไบค่ฏดๆ˜Žไธญๆœ€ๅคšๅคๅˆถๆŒ‡ๅฎšๆก็›ฎ๏ผˆๅˆๅนถ่€Œๆฅ็š„ๆไบค๏ผ‰็š„็ฎ€็Ÿญ่ฏดๆ˜Ž"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:674
 msgid "alias for --log (deprecated)"
 msgstr "ๅ‚ๆ•ฐ --log ็š„ๅˆซๅ๏ผˆๅทฒๅผƒ็”จ๏ผ‰"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:677
 msgid "text"
 msgstr "ๆ–‡ๆœฌ"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:678
 msgid "use <text> as start of message"
 msgstr "ไฝฟ็”จ <ๆ–‡ๆœฌ> ไฝœไธบๆไบค่ฏดๆ˜Ž็š„ๅผ€ๅง‹"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:679
 msgid "file to read from"
 msgstr "ไปŽๆ–‡ไปถไธญ่ฏปๅ–"
 
@@ -12946,32 +13961,32 @@ msgstr "ๅชๆ‰“ๅฐๅŒ…ๅซ่ฏฅๆไบค็š„ๅผ•็”จ"
 msgid "print only refs which don't contain the commit"
 msgstr "ๅชๆ‰“ๅฐไธๅŒ…ๅซ่ฏฅๆไบค็š„ๅผ•็”จ"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
 msgid "unknown"
 msgstr "ๆœช็Ÿฅ"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:100 builtin/fsck.c:120
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "%s %s ้”™่ฏฏ๏ผš%s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:114
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "%s %s ่ญฆๅ‘Š๏ผš%s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:143 builtin/fsck.c:146
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "ๆฅ่‡ช %7s %s ็š„ๆŸๅ็š„้“พๆŽฅ"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:155
 msgid "wrong object type in link"
 msgstr "้“พๆŽฅไธญ้”™่ฏฏ็š„ๅฏน่ฑก็ฑปๅž‹"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:171
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -12980,216 +13995,216 @@ msgstr ""
 "ๆŸๅ็š„้“พๆŽฅๆฅ่‡ชไบŽ %7s %s\n"
 "              ๅˆฐ %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:282
 #, c-format
 msgid "missing %s %s"
 msgstr "็ผบๅคฑ %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:309
 #, c-format
 msgid "unreachable %s %s"
 msgstr "ไธๅฏ่พพ %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:329
 #, c-format
 msgid "dangling %s %s"
 msgstr "ๆ‚ฌ็ฉบ %s %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:339
 msgid "could not create lost-found"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:350
 #, c-format
 msgid "could not finish '%s'"
 msgstr "ไธ่ƒฝๅฎŒๆˆ '%s'"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:367
 #, c-format
 msgid "Checking %s"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅ %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅ่ฟž้€šๆ€ง๏ผˆ%d ไธชๅฏน่ฑก๏ผ‰"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:424
 #, c-format
 msgid "Checking %s %s"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅ %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:429
 msgid "broken links"
 msgstr "ๆŸๅ็š„้“พๆŽฅ"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:438
 #, c-format
 msgid "root %s"
 msgstr "ๆ น %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:446
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "ๆ ‡่ฎฐ %s %s (%s) ไบŽ %s"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:475
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s๏ผšๅฏน่ฑกๆŸๅๆˆ–ไธขๅคฑ"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:500
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s๏ผšๆ— ๆ•ˆ็š„ๅผ•็”จๆ—ฅๅฟ—ๆก็›ฎ %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:514
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅๅผ•็”จๆ—ฅๅฟ— %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:548
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s๏ผšๆ— ๆ•ˆ็š„ sha1 ๆŒ‡้’ˆ %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:555
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s๏ผšไธๆ˜ฏไธ€ไธชๆไบค"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:609
 msgid "notice: No default references"
 msgstr "ๆณจๆ„๏ผšๆ— ้ป˜่ฎคๅผ•็”จ"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s๏ผšๅฏน่ฑกๆŸๅๆˆ–ไธขๅคฑ๏ผš%s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:637
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s๏ผšไธ่ƒฝ่งฃๆžๅฏน่ฑก๏ผš%s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:657
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "ๅ็š„ sha1 ๆ–‡ไปถ๏ผš%s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:672
 msgid "Checking object directory"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅๅฏน่ฑก็›ฎๅฝ•"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:675
 msgid "Checking object directories"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅๅฏน่ฑก็›ฎๅฝ•"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:690
 #, c-format
 msgid "Checking %s link"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅ %s ้“พๆŽฅ"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr "ๆ— ๆ•ˆ็š„ %s"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:702
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s ๆŒ‡ๅ‘ๅฅ‡ๆ€ช็š„ไธœ่ฅฟ๏ผˆ%s๏ผ‰"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:708
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s๏ผšๅˆ†็ฆปๅคดๆŒ‡้’ˆ็š„ๆŒ‡ๅ‘ไธๅญ˜ๅœจ"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:712
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "ๆณจๆ„๏ผš%s ๆŒ‡ๅ‘ไธ€ไธชๅฐšๆœช่ฏž็”Ÿ็š„ๅˆ†ๆ”ฏ๏ผˆ%s๏ผ‰"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:724
 msgid "Checking cache tree"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅ็ผ“ๅญ˜ๆ ‘"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:729
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s๏ผšcache-tree ไธญๆ— ๆ•ˆ็š„ sha1 ๆŒ‡้’ˆ"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:738
 msgid "non-tree in cache-tree"
 msgstr "cache-tree ไธญ้žๆ ‘ๅฏน่ฑก"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:769
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<้€‰้กน>] [<ๅฏน่ฑก>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:775
 msgid "show unreachable objects"
 msgstr "ๆ˜พ็คบไธๅฏ่พพ็š„ๅฏน่ฑก"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:776
 msgid "show dangling objects"
 msgstr "ๆ˜พ็คบๆ‚ฌ็ฉบ็š„ๅฏน่ฑก"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:777
 msgid "report tags"
 msgstr "ๆŠฅๅ‘Šๆ ‡็ญพ"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:778
 msgid "report root nodes"
 msgstr "ๆŠฅๅ‘Šๆ น่Š‚็‚น"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:779
 msgid "make index objects head nodes"
 msgstr "ๅฐ†็ดขๅผ•ไบฆไฝœไธบๆฃ€ๆŸฅ็š„ๅคด่Š‚็‚น"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:780
 msgid "make reflogs head nodes (default)"
 msgstr "ๅฐ†ๅผ•็”จๆ—ฅๅฟ—ไฝœไธบๆฃ€ๆŸฅ็š„ๅคด่Š‚็‚น๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:781
 msgid "also consider packs and alternate objects"
 msgstr "ไนŸ่€ƒ่™‘ๅŒ…ๅ’Œๅค‡็”จๅฏน่ฑก"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:782
 msgid "check only connectivity"
 msgstr "ไป…ๆฃ€ๆŸฅ่ฟž้€šๆ€ง"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:783
 msgid "enable more strict checking"
 msgstr "ๅฏ็”จๆ›ดไธฅๆ ผ็š„ๆฃ€ๆŸฅ"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:785
 msgid "write dangling objects in .git/lost-found"
 msgstr "ๅฐ†ๆ‚ฌ็ฉบๅฏน่ฑกๅ†™ๅ…ฅ .git/lost-found ไธญ"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:132
 msgid "show progress"
 msgstr "ๆ˜พ็คบ่ฟ›ๅบฆ"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:787
 msgid "show verbose names for reachable objects"
 msgstr "ๆ˜พ็คบๅฏ่พพๅฏน่ฑก็š„่ฏฆ็ป†ๅ็งฐ"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:846 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "ๆญฃๅœจๆฃ€ๆŸฅๅฏน่ฑก"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:874
 #, c-format
 msgid "%s: object missing"
 msgstr "%s๏ผšๅฏน่ฑก็ผบๅคฑ"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:885
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ๅ‚ๆ•ฐ๏ผšๆœŸๆœ› sha1๏ผŒๅพ—ๅˆฐ '%s'"
 
-#: builtin/gc.c:34
+#: builtin/gc.c:35
 msgid "git gc [<options>]"
 msgstr "git gc [<้€‰้กน>]"
 
@@ -13203,17 +14218,17 @@ msgstr "ๅฏน %s ่ฐƒ็”จ fstat ๅคฑ่ดฅ๏ผš%s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "ๆ— ๆณ•่งฃๆž '%s' ๅ€ผ '%s'"
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "ไธ่ƒฝๅฏน '%s' ่ฐƒ็”จ stat"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
 #, c-format
 msgid "cannot read '%s'"
 msgstr "ไธ่ƒฝ่ฏปๅ– '%s'"
 
-#: builtin/gc.c:492
+#: builtin/gc.c:491
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13227,64 +14242,64 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:539
 msgid "prune unreferenced objects"
 msgstr "ๆธ…้™คๆœชๅผ•็”จ็š„ๅฏน่ฑก"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:541
 msgid "be more thorough (increased runtime)"
 msgstr "ๆ›ดๅฝปๅบ•๏ผˆๅขžๅŠ ่ฟ่กŒๆ—ถ้—ด๏ผ‰"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:542
 msgid "enable auto-gc mode"
 msgstr "ๅฏ็”จ่‡ชๅŠจๅžƒๅœพๅ›žๆ”ถๆจกๅผ"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:545
 msgid "force running gc even if there may be another gc running"
 msgstr "ๅผบๅˆถๆ‰ง่กŒ gc ๅณไฝฟๅฆๅค–ไธ€ไธช gc ๆญฃๅœจๆ‰ง่กŒ"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:548
 msgid "repack all other packs except the largest pack"
 msgstr "้™คไบ†ๆœ€ๅคง็š„ๅŒ…ไน‹ๅค–๏ผŒๅฏนๆ‰€ๆœ‰ๅ…ถๅฎƒๅŒ…ๆ–‡ไปถ้‡ๆ–ฐๆ‰“ๅŒ…"
 
-#: builtin/gc.c:566
+#: builtin/gc.c:565
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "่งฃๆž gc.logexpiry ็š„ๅ€ผ %s ๅคฑ่ดฅ"
 
-#: builtin/gc.c:577
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "่งฃๆžๆธ…้™คๆœŸ้™ๅ€ผ %s ๅคฑ่ดฅ"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:596
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "่‡ชๅŠจๅœจๅŽๅฐๆ‰ง่กŒไป“ๅบ“ๆ‰“ๅŒ…ไปฅๆฑ‚ๆœ€ไฝณๆ€ง่ƒฝใ€‚\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:598
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "่‡ชๅŠจๆ‰“ๅŒ…ไป“ๅบ“ไปฅๆฑ‚ๆœ€ไฝณๆ€ง่ƒฝใ€‚\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:599
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "ๆ‰‹ๅทฅ็ปดๆŠคๅ‚่ง \"git help gc\"ใ€‚\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:639
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 "ๅทฒ็ปๆœ‰ไธ€ไธช gc ๆญฃ่ฟ่กŒๅœจๆœบๅ™จ '%s' pid %<PRIuMAX>๏ผˆๅฆ‚ๆžœไธๆ˜ฏ๏ผŒไฝฟ็”จ --force๏ผ‰"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:694
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "ๆœ‰ๅคชๅคšไธๅฏ่พพ็š„ๆพๆ•ฃๅฏน่ฑก๏ผŒ่ฟ่กŒ 'git prune' ๅˆ ้™คๅฎƒไปฌใ€‚"
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<้€‰้กน>] [-e] <ๆจกๅผ> [<็‰ˆๆœฌ>...] [[--] <่ทฏๅพ„>...]"
 
@@ -13302,259 +14317,259 @@ msgstr "ไธบ %2$s ่ฎพๅฎš็š„็บฟ็จ‹ๆ•ฐ (%1$d) ๆ— ๆ•ˆ"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "ๆฒกๆœ‰็บฟ็จ‹ๆ”ฏๆŒ๏ผŒๅฟฝ็•ฅ %s"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "ๆ— ๆณ•่ฏปๅ–ๆ ‘๏ผˆ%s๏ผ‰"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:633
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "ๆ— ๆณ•ๆŠ“ๅ–ๆฅ่‡ชไบŽ %s ็ฑปๅž‹็š„ๅฏน่ฑก"
 
-#: builtin/grep.c:714
+#: builtin/grep.c:704
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "ๅผ€ๅ…ณ `%c' ๆœŸๆœ›ไธ€ไธชๆ•ฐๅญ—ๅ€ผ"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:803
 msgid "search in index instead of in the work tree"
 msgstr "ๅœจ็ดขๅผ•ๅŒบๆœ็ดข่€Œไธๆ˜ฏๅœจๅทฅไฝœๅŒบ"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:805
 msgid "find in contents not managed by git"
 msgstr "ๅœจๆœช่ขซ git ็ฎก็†็š„ๅ†…ๅฎนไธญๆŸฅๆ‰พ"
 
 #  ่ฏ‘่€…๏ผšไธญๆ–‡ๅญ—็ฌฆไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆ ้™คๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/grep.c:817
+#: builtin/grep.c:807
 msgid "search in both tracked and untracked files"
 msgstr "ๅœจ่ทŸ่ธชๅ’Œๆœช่ทŸ่ธช็š„ๆ–‡ไปถไธญๆœ็ดข"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:809
 msgid "ignore files specified via '.gitignore'"
 msgstr "ๅฟฝ็•ฅ '.gitignore' ๅŒ…ๅซ็š„ๆ–‡ไปถ"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:811
 msgid "recursively search in each submodule"
 msgstr "ๅœจๆฏไธ€ไธชๅญๆจก็ป„ไธญ้€’ๅฝ’ๆœ็ดข"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:814
 msgid "show non-matching lines"
 msgstr "ๆ˜พ็คบๆœชๅŒน้…็š„่กŒ"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:816
 msgid "case insensitive matching"
 msgstr "ไธๅŒบๅˆ†ๅคงๅฐๅ†™ๅŒน้…"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:818
 msgid "match patterns only at word boundaries"
 msgstr "ๅชๅœจๅ•่ฏ่พน็•ŒๅŒน้…ๆจกๅผ"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:820
 msgid "process binary files as text"
 msgstr "ๆŠŠไบŒ่ฟ›ๅˆถๆ–‡ไปถๅฝ“ๅšๆ–‡ๆœฌๅค„็†"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:822
 msgid "don't match patterns in binary files"
 msgstr "ไธๅœจไบŒ่ฟ›ๅˆถๆ–‡ไปถไธญๅŒน้…ๆจกๅผ"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:825
 msgid "process binary files with textconv filters"
 msgstr "็”จ textconv ่ฟ‡ๆปคๅ™จๅค„็†ไบŒ่ฟ›ๅˆถๆ–‡ไปถ"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:827
 msgid "search in subdirectories (default)"
 msgstr "ๅœจๅญ็›ฎๅฝ•ไธญๅฏปๆ‰พ๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:829
 msgid "descend at most <depth> levels"
 msgstr "ๆœ€ๅคšไปฅๆŒ‡ๅฎš็š„ๆทฑๅบฆๅ‘ไธ‹ๅฏปๆ‰พ"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:833
 msgid "use extended POSIX regular expressions"
 msgstr "ไฝฟ็”จๆ‰ฉๅฑ•็š„ POSIX ๆญฃๅˆ™่กจ่พพๅผ"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:836
 msgid "use basic POSIX regular expressions (default)"
 msgstr "ไฝฟ็”จๅŸบๆœฌ็š„ POSIX ๆญฃๅˆ™่กจ่พพๅผ๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:839
 msgid "interpret patterns as fixed strings"
 msgstr "ๆŠŠๆจกๅผ่งฃๆžไธบๅ›บๅฎš็š„ๅญ—็ฌฆไธฒ"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:842
 msgid "use Perl-compatible regular expressions"
 msgstr "ไฝฟ็”จ Perl ๅ…ผๅฎน็š„ๆญฃๅˆ™่กจ่พพๅผ"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:845
 msgid "show line numbers"
 msgstr "ๆ˜พ็คบ่กŒๅท"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:846
 msgid "show column number of first match"
 msgstr "ๆ˜พ็คบ็ฌฌไธ€ไธชๅŒน้…็š„ๅˆ—ๅท"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:847
 msgid "don't show filenames"
 msgstr "ไธๆ˜พ็คบๆ–‡ไปถๅ"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:848
 msgid "show filenames"
 msgstr "ๆ˜พ็คบๆ–‡ไปถๅ"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:850
 msgid "show filenames relative to top directory"
 msgstr "ๆ˜พ็คบ็›ธๅฏนไบŽ้กถ็บง็›ฎๅฝ•็š„ๆ–‡ไปถๅ"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:852
 msgid "show only filenames instead of matching lines"
 msgstr "ๅชๆ˜พ็คบๆ–‡ไปถๅ่€Œไธๆ˜พ็คบๅŒน้…็š„่กŒ"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:854
 msgid "synonym for --files-with-matches"
 msgstr "ๅ’Œ --files-with-matches ๅŒไน‰"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:857
 msgid "show only the names of files without match"
 msgstr "ๅชๆ˜พ็คบๆœชๅŒน้…็š„ๆ–‡ไปถๅ"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:859
 msgid "print NUL after filenames"
 msgstr "ๅœจๆ–‡ไปถๅๅŽ่พ“ๅ‡บ NUL ๅญ—็ฌฆ"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:862
 msgid "show only matching parts of a line"
 msgstr "ๅชๆ˜พ็คบ่กŒไธญ็š„ๅŒน้…็š„้ƒจๅˆ†"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:864
 msgid "show the number of matches instead of matching lines"
 msgstr "ๆ˜พ็คบๆ€ปๅŒน้…่กŒๆ•ฐ๏ผŒ่€Œไธๆ˜พ็คบๅŒน้…็š„่กŒ"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:865
 msgid "highlight matches"
 msgstr "้ซ˜ไบฎๆ˜พ็คบๅŒน้…้กน"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:867
 msgid "print empty line between matches from different files"
 msgstr "ๅœจไธๅŒๆ–‡ไปถ็š„ๅŒน้…้กนไน‹้—ดๆ‰“ๅฐ็ฉบ่กŒ"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:869
 msgid "show filename only once above matches from same file"
 msgstr "ๅชๅœจๅŒไธ€ๆ–‡ไปถ็š„ๅŒน้…้กน็š„ไธŠ้ขๆ˜พ็คบไธ€ๆฌกๆ–‡ไปถๅ"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:872
 msgid "show <n> context lines before and after matches"
 msgstr "ๆ˜พ็คบๅŒน้…้กนๅ‰ๅŽ็š„ <n> ่กŒไธŠไธ‹ๆ–‡"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:875
 msgid "show <n> context lines before matches"
 msgstr "ๆ˜พ็คบๅŒน้…้กนๅ‰ <n> ่กŒไธŠไธ‹ๆ–‡"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:877
 msgid "show <n> context lines after matches"
 msgstr "ๆ˜พ็คบๅŒน้…้กนๅŽ <n> ่กŒไธŠไธ‹ๆ–‡"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:879
 msgid "use <n> worker threads"
 msgstr "ไฝฟ็”จ <n> ไธชๅทฅไฝœ็บฟ็จ‹"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:880
 msgid "shortcut for -C NUM"
 msgstr "ๅฟซๆท้”ฎ -C ๆ•ฐๅญ—"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:883
 msgid "show a line with the function name before matches"
 msgstr "ๅœจๅŒน้…็š„ๅ‰้ขๆ˜พ็คบไธ€่กŒๅ‡ฝๆ•ฐๅ"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:885
 msgid "show the surrounding function"
 msgstr "ๆ˜พ็คบๆ‰€ๅœจๅ‡ฝๆ•ฐ็š„ๅ‰ๅŽๅ†…ๅฎน"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:888
 msgid "read patterns from file"
 msgstr "ไปŽๆ–‡ไปถ่ฏปๅ–ๆจกๅผ"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:890
 msgid "match <pattern>"
 msgstr "ๅŒน้… <ๆจกๅผ>"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:892
 msgid "combine patterns specified with -e"
 msgstr "็ป„ๅˆ็”จ -e ๅ‚ๆ•ฐ่ฎพๅฎš็š„ๆจกๅผ"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:904
 msgid "indicate hit with exit status without output"
 msgstr "ไธ่พ“ๅ‡บ๏ผŒ่€Œ็”จ้€€ๅ‡บ็ ๆ ‡่ฏ†ๅ‘ฝไธญ็Šถๆ€"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:906
 msgid "show only matches from files that match all patterns"
 msgstr "ๅชๆ˜พ็คบๅŒน้…ๆ‰€ๆœ‰ๆจกๅผ็š„ๆ–‡ไปถไธญ็š„ๅŒน้…"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:908
 msgid "show parse tree for grep expression"
 msgstr "ๆ˜พ็คบ grep ่กจ่พพๅผ็š„่งฃๆžๆ ‘"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "pager"
 msgstr "ๅˆ†้กต"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:912
 msgid "show matching files in the pager"
 msgstr "ๅˆ†้กตๆ˜พ็คบๅŒน้…็š„ๆ–‡ไปถ"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:916
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "ๅ…่ฎธ่ฐƒ็”จ grep(1)๏ผˆๆœฌๆฌกๆž„ๅปบๅฟฝ็•ฅ๏ผ‰"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:983
 msgid "no pattern given"
 msgstr "ๆœชๆไพ›ๅŒน้…ๆจกๅผ"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1019
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index ๆˆ– --untracked ไธ่ƒฝๅ’Œ็‰ˆๆœฌๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1027
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "ไธ่ƒฝ่งฃๆž็‰ˆๆœฌ๏ผš%s"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked ไธๆ”ฏๆŒๅ’Œ --recurse-submodules ๅ…ฑ็”จ"
+
+#: builtin/grep.c:1061
 msgid "invalid option combination, ignoring --threads"
 msgstr "ๆ— ๆ•ˆ็š„้€‰้กน็ป„ๅˆ๏ผŒๅฟฝ็•ฅ --threads"
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
 msgid "no threads support, ignoring --threads"
 msgstr "ๆฒกๆœ‰็บฟ็จ‹ๆ”ฏๆŒ๏ผŒๅฟฝ็•ฅ --threads"
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ๆŒ‡ๅฎš็š„็บฟ็จ‹ๆ•ฐๆ— ๆ•ˆ๏ผˆ%d๏ผ‰"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1101
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager ไป…็”จไบŽๅทฅไฝœๅŒบ"
 
-#: builtin/grep.c:1117
-msgid "option not supported with --recurse-submodules"
-msgstr "้€‰้กนไธๆ”ฏๆŒๅ’Œ --recurse-submodules ๅ…ฑ็”จ"
-
-#: builtin/grep.c:1123
+#: builtin/grep.c:1127
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached ๆˆ– --untracked ไธ่ƒฝไธŽ --no-index ๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1133
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard ไธ่ƒฝ็”จไบŽๅทฒ่ทŸ่ธชๅ†…ๅฎน"
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1141
 msgid "both --cached and trees are given"
 msgstr "ๅŒๆ—ถ็ป™ๅ‡บไบ† --cached ๅ’Œๆ ‘ๅฏน่ฑก"
 
@@ -13738,11 +14753,11 @@ msgstr "่พ“ๅ…ฅไธŠ็š„่ฏป้”™่ฏฏ"
 msgid "used more bytes than were available"
 msgstr "็”จๆŽ‰ไบ†่ถ…่ฟ‡ๅฏ็”จ็š„ๅญ—่Š‚"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
 msgid "pack too large for current definition of off_t"
 msgstr "ๅŒ…ๅคชๅคง่ถ…่ฟ‡ไบ†ๅฝ“ๅ‰ off_t ็š„ๅฎšไน‰"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "ๅŒ…่ถ…่ฟ‡ไบ†ๆœ€ๅคงๅ…่ฎธๅ€ผ"
 
@@ -13798,191 +14813,191 @@ msgstr[1] "ๅŒ…ๆ–‡ไปถ่ฟ‡ๆ—ฉ็ป“ๆŸ๏ผŒ็ผบๅฐ‘ %<PRIuMAX> ๅญ—่Š‚"
 msgid "serious inflate inconsistency"
 msgstr "่งฃๅŽ‹็ผฉไธฅ้‡็š„ไธไธ€่‡ด"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "ๅ‘็Žฐ %s ๅ‡บ็Žฐ SHA1 ๅ†ฒ็ช๏ผ"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
 #, c-format
 msgid "unable to read %s"
 msgstr "ไธ่ƒฝ่ฏป %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "ไธ่ƒฝ่ฏปๅ–็Žฐๅญ˜ๅฏน่ฑกไฟกๆฏ %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "ไธ่ƒฝ่ฏปๅ–็Žฐๅญ˜ๅฏน่ฑก %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ๆ— ๆ•ˆ็š„ๆ•ฐๆฎๅฏน่ฑก %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
 msgid "fsck error in packed object"
 msgstr "ๅฏนๆ‰“ๅŒ…ๅฏน่ฑก fsck ๆฃ€ๆŸฅๅ‡บ้”™"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s ็š„ๆ‰€ๆœ‰ๅญๅฏน่ฑกๅนถ้ž้ƒฝๅฏ่พพ"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr "ๅบ”็”จ delta ๅคฑ่ดฅ"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr "ๆŽฅๆ”ถๅฏน่ฑกไธญ"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr "็ดขๅผ•ๅฏน่ฑกไธญ"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "ๅŒ…ๅ†ฒ็ช๏ผˆSHA1 ไธๅŒน้…๏ผ‰"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr "ไธ่ƒฝๅฏนๅŒ…ๆ–‡ไปถ่ฐƒ็”จ fstat"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr "ๅŒ…็š„็ป“ๅฐพๆœ‰ๅžƒๅœพๆ•ฐๆฎ"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() ไธญ้‡ๅˆฐไธๅฏ็†ๅ–ป็š„้—ฎ้ข˜"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr "ๅค„็† delta ไธญ"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ็บฟ็จ‹๏ผš%s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr "ไธๅฏ็†ๅ–ป"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "ๅฎŒๆˆ %d ไธชๆœฌๅœฐๅฏน่ฑก"
 msgstr[1] "ๅฎŒๆˆ %d ไธชๆœฌๅœฐๅฏน่ฑก"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "ๅฏน %s ็š„ๅฐพ้ƒจๆ ก้ชŒๅ‡บ็Žฐๆ„ๅค–๏ผˆ็ฃ็›˜ๆŸๅ๏ผŸ๏ผ‰"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "ๅŒ…ๆœ‰ %d ไธชๆœช่งฃๅ†ณ็š„ delta"
 msgstr[1] "ๅŒ…ๆœ‰ %d ไธชๆœช่งฃๅ†ณ็š„ delta"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "ไธ่ƒฝๅŽ‹็ผฉ้™„ๅŠ ๅฏน่ฑก๏ผˆ%d๏ผ‰"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "ๆœฌๅœฐๅฏน่ฑก %s ๅทฒๆŸๅ"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "ๅŒ…ๆ–‡ไปถๅ '%s' ๆฒกๆœ‰ไปฅ '.pack' ็ป“ๅฐพ"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "ๆ— ๆณ•ๅ†™ๅ…ฅ %s ๆ–‡ไปถ '%s'"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "ๆ— ๆณ•ๅ…ณ้—ญๅทฒๅ†™ๅ…ฅ็š„ %s ๆ–‡ไปถ '%s'"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
 msgid "error while closing pack file"
 msgstr "ๅ…ณ้—ญๅŒ…ๆ–‡ไปถๆ—ถๅ‡บ้”™"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
 msgid "cannot store pack file"
 msgstr "ๆ— ๆณ•ๅญ˜ๅ‚จๅŒ…ๆ–‡ไปถ"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
 msgid "cannot store index file"
 msgstr "ๆ— ๆณ•ๅญ˜ๅ‚จ็ดขๅผ•ๆ–‡ไปถ"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "ๅ็š„ pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€็Žฐๅญ˜ๅŒ…ๆ–‡ไปถ '%s'"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "ๆ— ๆณ•ไธบ %s ๆ‰“ๅผ€ๅŒ…็ดขๅผ•ๆ–‡ไปถ"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "้ž delta๏ผš%d ไธชๅฏน่ฑก"
 msgstr[1] "้ž delta๏ผš%d ไธชๅฏน่ฑก"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "้“พ้•ฟ = %d: %lu ๅฏน่ฑก"
 msgstr[1] "้“พ้•ฟ = %d: %lu ๅฏน่ฑก"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
 msgid "Cannot come back to cwd"
 msgstr "ๆ— ๆณ•่ฟ”ๅ›žๅฝ“ๅ‰ๅทฅไฝœ็›ฎๅฝ•"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
 #, c-format
 msgid "bad %s"
 msgstr "้”™่ฏฏ้€‰้กน %s"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin ไธ่ƒฝๅ’Œ --stdin ๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
 msgid "--stdin requires a git repository"
 msgstr "--stdin ้œ€่ฆไธ€ไธช git ไป“ๅบ“"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
 msgid "--verify with no packfile name given"
 msgstr "--verify ๆฒกๆœ‰ๆไพ›ๅŒ…ๆ–‡ไปถๅๅ‚ๆ•ฐ"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "ๅœจๆ‰“ๅŒ…ๅฏน่ฑกไธญ fsck ๆฃ€ๆŸฅๅ‡บ้”™"
 
@@ -14163,121 +15178,126 @@ msgstr "--trailer ๅ’Œ --only-input ๅŒๆ—ถไฝฟ็”จๆฒกๆœ‰ๆ„ไน‰"
 msgid "no input file given for in-place editing"
 msgstr "ๆฒกๆœ‰็ป™ๅ‡บ่ฆๅŽŸไฝ็ผ–่พ‘็š„ๆ–‡ไปถ"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<้€‰้กน>] [<็‰ˆๆœฌ่Œƒๅ›ด>] [[--] <่ทฏๅพ„>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<้€‰้กน>] <ๅฏน่ฑก>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "ๆ— ๆ•ˆ็š„ --decorate ้€‰้กน๏ผš%s"
 
-#: builtin/log.c:173
+#: builtin/log.c:174
 msgid "show source"
 msgstr "ๆ˜พ็คบๆบ"
 
-#: builtin/log.c:174
+#: builtin/log.c:175
 msgid "Use mail map file"
 msgstr "ไฝฟ็”จ้‚ฎไปถๆ˜ ๅฐ„ๆ–‡ไปถ"
 
-#: builtin/log.c:176
+#: builtin/log.c:177
 msgid "only decorate refs that match <pattern>"
 msgstr "ๅชไฟฎ้ฅฐไธŽ <ๆจกๅผ> ๅŒน้…็š„ๅผ•็”จ"
 
-#: builtin/log.c:178
+#: builtin/log.c:179
 msgid "do not decorate refs that match <pattern>"
 msgstr "ไธไฟฎ้ฅฐๅ’Œ <ๆจกๅผ> ๅŒน้…็š„ๅผ•็”จ"
 
-#: builtin/log.c:179
+#: builtin/log.c:180
 msgid "decorate options"
 msgstr "ไฟฎ้ฅฐ้€‰้กน"
 
-#: builtin/log.c:182
+#: builtin/log.c:183
 msgid "Process line range n,m in file, counting from 1"
 msgstr "ๅค„็†ๆ–‡ไปถไธญ็ฌฌ n ๅˆฐ m ไน‹้—ด็š„่กŒ๏ผŒไปŽ 1 ๅผ€ๅง‹"
 
-#: builtin/log.c:280
+#: builtin/log.c:281
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "ๆœ€็ปˆ่พ“ๅ‡บ๏ผš%d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:535
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ๆŸๅ็š„ๆ–‡ไปถ"
 
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:550 builtin/log.c:645
 #, c-format
 msgid "could not read object %s"
 msgstr "ไธ่ƒฝ่ฏปๅ–ๅฏน่ฑก %s"
 
-#: builtin/log.c:668
+#: builtin/log.c:670
 #, c-format
 msgid "unknown type: %d"
 msgstr "ๆœช็Ÿฅ็ฑปๅž‹๏ผš%d"
 
-#: builtin/log.c:791
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s๏ผšไปŽๆ่ฟฐ็”Ÿๆˆ้™„ๅ‡ฝ็š„ๆจกๅผๆ— ๆ•ˆ"
+
+#: builtin/log.c:821
 msgid "format.headers without value"
 msgstr "format.headers ๆฒกๆœ‰ๅ€ผ"
 
-#: builtin/log.c:908
+#: builtin/log.c:936
 msgid "name of output directory is too long"
 msgstr "่พ“ๅ‡บ็›ฎๅฝ•ๅๅคช้•ฟ"
 
-#: builtin/log.c:924
+#: builtin/log.c:952
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€่กฅไธๆ–‡ไปถ %s"
 
-#: builtin/log.c:941
+#: builtin/log.c:969
 msgid "need exactly one range"
 msgstr "ๅช้œ€่ฆไธ€ไธช่Œƒๅ›ด"
 
-#: builtin/log.c:951
+#: builtin/log.c:979
 msgid "not a range"
 msgstr "ไธๆ˜ฏไธ€ไธช่Œƒๅ›ด"
 
-#: builtin/log.c:1074
+#: builtin/log.c:1143
 msgid "cover letter needs email format"
 msgstr "้™„ๅ‡ฝ้œ€่ฆ้‚ฎไปถๅœฐๅ€ๆ ผๅผ"
 
-#: builtin/log.c:1080
+#: builtin/log.c:1149
 msgid "failed to create cover-letter file"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบ้™„ๅ‡ฝๆ–‡ไปถ"
 
-#: builtin/log.c:1159
+#: builtin/log.c:1228
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ไธๆญฃๅธธ็š„ in-reply-to๏ผš%s"
 
-#: builtin/log.c:1186
+#: builtin/log.c:1255
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<้€‰้กน>] [<ไปŽ> | <็‰ˆๆœฌ่Œƒๅ›ด>]"
 
-#: builtin/log.c:1244
+#: builtin/log.c:1313
 msgid "two output directories?"
 msgstr "ไธคไธช่พ“ๅ‡บ็›ฎๅฝ•๏ผŸ"
 
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
 #, c-format
 msgid "unknown commit %s"
 msgstr "ๆœช็Ÿฅๆไบค %s"
 
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "ๆ— ๆณ•ๅฐ† '%s' ่งฃๆžไธบไธ€ไธชๆœ‰ๆ•ˆๅผ•็”จ"
 
-#: builtin/log.c:1370
+#: builtin/log.c:1439
 msgid "could not find exact merge base"
 msgstr "ไธ่ƒฝๆ‰พๅˆฐๅ‡†็กฎ็š„ๅˆๅนถๅŸบ็บฟ"
 
-#: builtin/log.c:1374
+#: builtin/log.c:1443
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -14287,267 +15307,275 @@ msgstr ""
 "git branch --set-upstream-to ๆฅ่ทŸ่ธชไธ€ไธช่ฟœ็จ‹ๅˆ†ๆ”ฏใ€‚ๆˆ–่€…ไฝ ๅฏไปฅ้€š่ฟ‡\n"
 "ๅ‚ๆ•ฐ --base=<ๅŸบ็บฟๆไบค> ๆ‰‹ๅŠจๆŒ‡ๅฎšไธ€ไธชๅŸบ็บฟๆไบค"
 
-#: builtin/log.c:1394
+#: builtin/log.c:1463
 msgid "failed to find exact merge base"
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐๅ‡†็กฎ็š„ๅˆๅนถๅŸบ็บฟ"
 
-#: builtin/log.c:1405
+#: builtin/log.c:1474
 msgid "base commit should be the ancestor of revision list"
 msgstr "ๅŸบ็บฟๆไบคๅบ”่ฏฅๆ˜ฏ็‰ˆๆœฌๅˆ—่กจ็š„็ฅ–ๅ…ˆ"
 
-#: builtin/log.c:1409
+#: builtin/log.c:1478
 msgid "base commit shouldn't be in revision list"
 msgstr "ๅŸบ็บฟๆไบคไธๅบ”่ฏฅๅ‡บ็Žฐๅœจ็‰ˆๆœฌๅˆ—่กจไธญ"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1531
 msgid "cannot get patch id"
 msgstr "ๆ— ๆณ•ๅพ—ๅˆฐ่กฅไธ id"
 
-#: builtin/log.c:1514
+#: builtin/log.c:1583
 msgid "failed to infer range-diff ranges"
 msgstr "ๆ— ๆณ•ๆŽจๆ–ญ range-diff ่Œƒๅ›ด"
 
-#: builtin/log.c:1559
+#: builtin/log.c:1629
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "ไฝฟ็”จ [PATCH n/m]๏ผŒๅณไฝฟๅชๆœ‰ไธ€ไธช่กฅไธ"
 
-#: builtin/log.c:1562
+#: builtin/log.c:1632
 msgid "use [PATCH] even with multiple patches"
 msgstr "ไฝฟ็”จ [PATCH]๏ผŒๅณไฝฟๆœ‰ๅคšไธช่กฅไธ"
 
-#: builtin/log.c:1566
+#: builtin/log.c:1636
 msgid "print patches to standard out"
 msgstr "ๆ‰“ๅฐ่กฅไธๅˆฐๆ ‡ๅ‡†่พ“ๅ‡บ"
 
-#: builtin/log.c:1568
+#: builtin/log.c:1638
 msgid "generate a cover letter"
 msgstr "็”Ÿๆˆไธ€ๅฐ้™„ๅ‡ฝ"
 
-#: builtin/log.c:1570
+#: builtin/log.c:1640
 msgid "use simple number sequence for output file names"
 msgstr "ไฝฟ็”จ็ฎ€ๅ•็š„ๆ•ฐๅญ—ๅบๅˆ—ไฝœไธบ่พ“ๅ‡บๆ–‡ไปถๅ"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1641
 msgid "sfx"
 msgstr "ๅŽ็ผ€"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1642
 msgid "use <sfx> instead of '.patch'"
 msgstr "ไฝฟ็”จ <ๅŽ็ผ€> ไปฃๆ›ฟ '.patch'"
 
-#: builtin/log.c:1574
+#: builtin/log.c:1644
 msgid "start numbering patches at <n> instead of 1"
 msgstr "่กฅไธไปฅ <n> ๅผ€ๅง‹็ผ–ๅท๏ผŒ่€Œไธๆ˜ฏ1"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1646
 msgid "mark the series as Nth re-roll"
 msgstr "ๆ ‡่ฎฐ่กฅไธ็ณปๅˆ—ๆ˜ฏ็ฌฌๅ‡ ๆฌก้‡ๅˆถ"
 
-#: builtin/log.c:1578
+#: builtin/log.c:1648
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "ไฝฟ็”จ [RFC PATCH] ไปฃๆ›ฟ [PATCH]"
 
-#: builtin/log.c:1581
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "ไปŽๅˆ†ๆ”ฏๆ่ฟฐ่Žทๅ–้™„ๅ‡ฝ็š„ๆจกๅผ"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "ๅŸบไบŽไธ€ไธชๅˆ†ๆ”ฏๆ่ฟฐ็”Ÿๆˆ้ƒจๅˆ†้™„ๅ‡ฝ"
+
+#: builtin/log.c:1654
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "ไฝฟ็”จ [<ๅ‰็ผ€>] ไปฃๆ›ฟ [PATCH]"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1657
 msgid "store resulting files in <dir>"
 msgstr "ๆŠŠ็ป“ๆžœๆ–‡ไปถๅญ˜ๅ‚จๅœจ <็›ฎๅฝ•>"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1660
 msgid "don't strip/add [PATCH]"
 msgstr "ไธๅˆ ้™ค/ๆทปๅŠ  [PATCH]"
 
-#: builtin/log.c:1590
+#: builtin/log.c:1663
 msgid "don't output binary diffs"
 msgstr "ไธ่พ“ๅ‡บไบŒ่ฟ›ๅˆถๅทฎๅผ‚"
 
-#: builtin/log.c:1592
+#: builtin/log.c:1665
 msgid "output all-zero hash in From header"
 msgstr "ๅœจ From ๅคดไฟกๆฏไธญ่พ“ๅ‡บๅ…จไธบ้›ถ็š„ๅ“ˆๅธŒๅ€ผ"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1667
 msgid "don't include a patch matching a commit upstream"
 msgstr "ไธๅŒ…ๅซๅทฒๅœจไธŠๆธธๆไบคไธญ็š„่กฅไธ"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1669
 msgid "show patch format instead of default (patch + stat)"
 msgstr "ๆ˜พ็คบ็บฏ่กฅไธๆ ผๅผ่€Œ้ž้ป˜่ฎค็š„๏ผˆ่กฅไธ+็Šถๆ€๏ผ‰"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1671
 msgid "Messaging"
 msgstr "้‚ฎไปถๅ‘้€"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1672
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1673
 msgid "add email header"
 msgstr "ๆทปๅŠ ้‚ฎไปถๅคด"
 
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1674 builtin/log.c:1676
 msgid "email"
 msgstr "้‚ฎไปถๅœฐๅ€"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1674
 msgid "add To: header"
 msgstr "ๆทปๅŠ ๆ”ถไปถไบบ"
 
-#: builtin/log.c:1603
+#: builtin/log.c:1676
 msgid "add Cc: header"
 msgstr "ๆทปๅŠ ๆŠ„้€"
 
-#: builtin/log.c:1605
+#: builtin/log.c:1678
 msgid "ident"
 msgstr "ๆ ‡่ฏ†"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1679
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "ๅฐ† From ๅœฐๅ€่ฎพ็ฝฎไธบ <ๆ ‡่ฏ†>๏ผˆๅฆ‚่‹ฅไธๆไพ›๏ผŒๅˆ™็”จๆไบค่€… ID ๅšไธบๅœฐๅ€๏ผ‰"
 
-#: builtin/log.c:1608
+#: builtin/log.c:1681
 msgid "message-id"
 msgstr "้‚ฎไปถๆ ‡่ฏ†"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1682
 msgid "make first mail a reply to <message-id>"
 msgstr "ไฝฟ็ฌฌไธ€ๅฐ้‚ฎไปถไฝœไธบๅฏน <้‚ฎไปถๆ ‡่ฏ†> ็š„ๅ›žๅค"
 
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1683 builtin/log.c:1686
 msgid "boundary"
 msgstr "่พน็•Œ"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1684
 msgid "attach the patch"
 msgstr "้™„ไปถๆ–นๅผๆทปๅŠ ่กฅไธ"
 
-#: builtin/log.c:1614
+#: builtin/log.c:1687
 msgid "inline the patch"
 msgstr "ๅ†…่”ๆ˜พ็คบ่กฅไธ"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1691
 msgid "enable message threading, styles: shallow, deep"
 msgstr "ๅฏ็”จ้‚ฎไปถ็บฟ็ดข๏ผŒ้ฃŽๆ ผ๏ผšๆต…๏ผŒๆทฑ"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1693
 msgid "signature"
 msgstr "็ญพๅ"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1694
 msgid "add a signature"
 msgstr "ๆทปๅŠ ไธ€ไธช็ญพๅ"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1695
 msgid "base-commit"
 msgstr "ๅŸบ็บฟๆไบค"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1696
 msgid "add prerequisite tree info to the patch series"
 msgstr "ไธบ่กฅไธๅˆ—่กจๆทปๅŠ ๅ‰็ฝฎๆ ‘ไฟกๆฏ"
 
-#: builtin/log.c:1625
+#: builtin/log.c:1698
 msgid "add a signature from a file"
 msgstr "ไปŽๆ–‡ไปถๆทปๅŠ ไธ€ไธช็ญพๅ"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1699
 msgid "don't print the patch filenames"
 msgstr "ไธ่ฆๆ‰“ๅฐ่กฅไธๆ–‡ไปถๅ"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1701
 msgid "show progress while generating patches"
 msgstr "ๅœจ็”Ÿๆˆ่กฅไธๆ—ถๆ˜พ็คบ่ฟ›ๅบฆ"
 
-#: builtin/log.c:1630
+#: builtin/log.c:1703
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "ๅœจ้™„ๅ‡ฝๆˆ–ๅ•ไธช่กฅไธไธญๆ˜พ็คบๅ’Œ <rev> ็š„ๅทฎๅผ‚"
 
-#: builtin/log.c:1633
+#: builtin/log.c:1706
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "ๅœจ้™„ๅ‡ฝๆˆ–ๅ•ไธช่กฅไธไธญๆ˜พ็คบๅ’Œ <refspec> ็š„ๅทฎๅผ‚"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1708
 msgid "percentage by which creation is weighted"
 msgstr "ๅˆ›ๅปบๆƒ้‡็š„็™พๅˆ†ๆฏ”"
 
-#: builtin/log.c:1710
+#: builtin/log.c:1792
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ๅŒ…ๅซๆ— ๆ•ˆ็š„่บซไปฝๆ ‡่ฏ†๏ผš%s"
 
-#: builtin/log.c:1725
+#: builtin/log.c:1807
 msgid "-n and -k are mutually exclusive"
 msgstr "-n ๅ’Œ -k ไบ’ๆ–ฅ"
 
-#: builtin/log.c:1727
+#: builtin/log.c:1809
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc ๅ’Œ -k ไบ’ๆ–ฅ"
 
-#: builtin/log.c:1735
+#: builtin/log.c:1817
 msgid "--name-only does not make sense"
 msgstr "--name-only ๆ— ๆ„ไน‰"
 
-#: builtin/log.c:1737
+#: builtin/log.c:1819
 msgid "--name-status does not make sense"
 msgstr "--name-status ๆ— ๆ„ไน‰"
 
-#: builtin/log.c:1739
+#: builtin/log.c:1821
 msgid "--check does not make sense"
 msgstr "--check ๆ— ๆ„ไน‰"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1854
 msgid "standard output, or directory, which one?"
 msgstr "ๆ ‡ๅ‡†่พ“ๅ‡บๆˆ–็›ฎๅฝ•๏ผŒๅ“ชไธ€ไธช๏ผŸ"
 
-#: builtin/log.c:1860
+#: builtin/log.c:1958
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff ้œ€่ฆ --cover-letter ๆˆ–ๅ•ไธ€่กฅไธ"
 
-#: builtin/log.c:1864
+#: builtin/log.c:1962
 msgid "Interdiff:"
 msgstr "็‰ˆๆœฌ้—ดๅทฎๅผ‚๏ผš"
 
-#: builtin/log.c:1865
+#: builtin/log.c:1963
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "ๅฏน v%d ็š„็‰ˆๆœฌๅทฎๅผ‚๏ผš"
 
-#: builtin/log.c:1871
+#: builtin/log.c:1969
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor ้œ€่ฆ --range-diff"
 
-#: builtin/log.c:1875
+#: builtin/log.c:1973
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff ้œ€่ฆ --cover-letter ๆˆ–ๅ•ไธ€่กฅไธ"
 
-#: builtin/log.c:1883
+#: builtin/log.c:1981
 msgid "Range-diff:"
 msgstr "่Œƒๅ›ดๅทฎๅผ‚๏ผš"
 
-#: builtin/log.c:1884
+#: builtin/log.c:1982
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "ๅฏน v%d ็š„่Œƒๅ›ดๅทฎๅผ‚๏ผš"
 
-#: builtin/log.c:1895
+#: builtin/log.c:1993
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "ๆ— ๆณ•่ฏปๅ–็ญพๅๆ–‡ไปถ '%s'"
 
-#: builtin/log.c:1931
+#: builtin/log.c:2029
 msgid "Generating patches"
 msgstr "็”Ÿๆˆ่กฅไธ"
 
-#: builtin/log.c:1975
+#: builtin/log.c:2073
 msgid "failed to create output files"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบ่พ“ๅ‡บๆ–‡ไปถ"
 
-#: builtin/log.c:2034
+#: builtin/log.c:2132
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<ไธŠๆธธ> [<ๅคด> [<้™ๅˆถ>]]]"
 
-#: builtin/log.c:2088
+#: builtin/log.c:2186
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -14647,11 +15675,11 @@ msgstr "ๅฆ‚ๆžœไปปไฝ• <ๆ–‡ไปถ> ้ƒฝไธๅœจ็ดขๅผ•ๅŒบ๏ผŒ่ง†ไธบ้”™่ฏฏ"
 
 #: builtin/ls-files.c:576
 msgid "tree-ish"
-msgstr "ๆ ‘ๆˆ–ๆไบค"
+msgstr "ๆ ‘ๅฏน่ฑก"
 
 #: builtin/ls-files.c:577
 msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "ๅ‡่ฃ…่‡ชไปŽ <ๆ ‘ๆˆ–ๆไบค> ไน‹ๅŽๅˆ ้™ค็š„่ทฏๅพ„ไป็„ถๅญ˜ๅœจ"
+msgstr "ๅ‡่ฃ…่‡ชไปŽ <ๆ ‘ๅฏน่ฑก> ไน‹ๅŽๅˆ ้™ค็š„่ทฏๅพ„ไป็„ถๅญ˜ๅœจ"
 
 #: builtin/ls-files.c:579
 msgid "show debugging data"
@@ -14671,7 +15699,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "ไธๆ‰“ๅฐ่ฟœ็จ‹ URL"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
 msgid "exec"
 msgstr "exec"
 
@@ -14705,7 +15733,7 @@ msgstr "้™คไบ†ๆ˜พ็คบๆŒ‡ๅ‘็š„ๅฏน่ฑกๅค–๏ผŒๆ˜พ็คบๆŒ‡ๅ‘็š„ๅผ•็”จๅ"
 
 #: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<้€‰้กน>] <ๆ ‘ๆˆ–ๆไบค> [<่ทฏๅพ„>...]"
+msgstr "git ls-tree [<้€‰้กน>] <ๆ ‘ๅฏน่ฑก> [<่ทฏๅพ„>...]"
 
 #: builtin/ls-tree.c:128
 msgid "only show trees"
@@ -14756,150 +15784,150 @@ msgstr "git merge --abort"
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:119
 msgid "switch `m' requires a value"
 msgstr "ๅผ€ๅ…ณ `m' ้œ€่ฆไธ€ไธชๅ€ผ"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "้€‰้กน `%s' ้œ€่ฆไธ€ไธชๅ€ผ"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:188
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "ไธ่ƒฝๆ‰พๅˆฐๅˆๅนถ็ญ–็•ฅ '%s'ใ€‚\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:189
 #, c-format
 msgid "Available strategies are:"
 msgstr "ๅฏ็”จ็š„็ญ–็•ฅๆœ‰๏ผš"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:194
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "ๅฏ็”จ็š„่‡ชๅฎšไน‰็ญ–็•ฅๆœ‰๏ผš"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:245 builtin/pull.c:132
 msgid "do not show a diffstat at the end of the merge"
 msgstr "ๅœจๅˆๅนถ็š„ๆœ€ๅŽไธๆ˜พ็คบๅทฎๅผ‚็ปŸ่ฎก"
 
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:248 builtin/pull.c:135
 msgid "show a diffstat at the end of the merge"
 msgstr "ๅœจๅˆๅนถ็š„ๆœ€ๅŽๆ˜พ็คบๅทฎๅผ‚็ปŸ่ฎก"
 
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:249 builtin/pull.c:138
 msgid "(synonym to --stat)"
 msgstr "๏ผˆๅ’Œ --stat ๅŒไน‰๏ผ‰"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:251 builtin/pull.c:141
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "ๅœจๅˆๅนถๆไบคไฟกๆฏไธญๆทปๅŠ ๏ผˆๆœ€ๅคš <n> ๆก๏ผ‰็ฒพ็ฎ€ๆไบค่ฎฐๅฝ•"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:254 builtin/pull.c:147
 msgid "create a single commit instead of doing a merge"
 msgstr "ๅˆ›ๅปบไธ€ไธชๅ•็‹ฌ็š„ๆไบค่€Œไธๆ˜ฏๅšไธ€ๆฌกๅˆๅนถ"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:256 builtin/pull.c:150
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "ๅฆ‚ๆžœๅˆๅนถๆˆๅŠŸ๏ผŒๆ‰ง่กŒไธ€ๆฌกๆไบค๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:258 builtin/pull.c:153
 msgid "edit message before committing"
 msgstr "ๅœจๆไบคๅ‰็ผ–่พ‘ๆไบค่ฏดๆ˜Ž"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:260
 msgid "allow fast-forward (default)"
 msgstr "ๅ…่ฎธๅฟซ่ฟ›๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:262 builtin/pull.c:160
 msgid "abort if fast-forward is not possible"
 msgstr "ๅฆ‚ๆžœไธ่ƒฝๅฟซ่ฟ›ๅฐฑๆ”พๅผƒๅˆๅนถ"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:266 builtin/pull.c:163
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "้ชŒ่ฏๆŒ‡ๅฎš็š„ๆไบคๆ˜ฏๅฆๅŒ…ๅซไธ€ไธชๆœ‰ๆ•ˆ็š„ GPG ็ญพๅ"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
 msgid "strategy"
 msgstr "็ญ–็•ฅ"
 
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:268 builtin/pull.c:168
 msgid "merge strategy to use"
 msgstr "่ฆไฝฟ็”จ็š„ๅˆๅนถ็ญ–็•ฅ"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:171
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option for selected merge strategy"
 msgstr "ๆ‰€้€‰็š„ๅˆๅนถ็ญ–็•ฅ็š„้€‰้กน"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "ๅˆๅนถ็š„ๆไบค่ฏดๆ˜Ž๏ผˆ้’ˆๅฏน้žๅฟซ่ฟ›ๅผๅˆๅนถ๏ผ‰"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr "ๆ”พๅผƒๅฝ“ๅ‰ๆญฃๅœจ่ฟ›่กŒ็š„ๅˆๅนถ"
 
 #
-#: builtin/merge.c:280
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort๏ผŒไฝ†ๆ˜ฏไฟ็•™็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบ"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr "็ปง็ปญๅฝ“ๅ‰ๆญฃๅœจ่ฟ›่กŒ็š„ๅˆๅนถ"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:285 builtin/pull.c:179
 msgid "allow merging unrelated histories"
 msgstr "ๅ…่ฎธๅˆๅนถไธ็›ธๅ…ณ็š„ๅŽ†ๅฒ"
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "ๆ ก้ชŒ commit-msg ้’ฉๅญ"
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "็ป•่ฟ‡ pre-merge-commit ๅ’Œ commit-msg ้’ฉๅญ"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:308
 msgid "could not run stash."
 msgstr "ไธ่ƒฝ่ฟ่กŒ่ดฎ่—ใ€‚"
 
-#: builtin/merge.c:312
+#: builtin/merge.c:313
 msgid "stash failed"
 msgstr "่ดฎ่—ๅคฑ่ดฅ"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:318
 #, c-format
 msgid "not a valid object: %s"
 msgstr "ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆๅฏน่ฑก๏ผš%s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
 msgid "read-tree failed"
 msgstr "่ฏปๅ–ๆ ‘ๅคฑ่ดฅ"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/merge.c:386
+#: builtin/merge.c:387
 msgid " (nothing to squash)"
 msgstr " ๏ผˆๆ— ๅฏๅŽ‹็ผฉ๏ผ‰"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:398
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "ๅŽ‹็ผฉๆไบค -- ๆœชๆ›ดๆ–ฐ HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:448
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "ๆ— ๅˆๅนถไฟกๆฏ -- ๆœชๆ›ดๆ–ฐ HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:499
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' ๆฒกๆœ‰ๆŒ‡ๅ‘ไธ€ไธชๆไบค"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:586
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "ๅ็š„ branch.%s.mergeoptions ๅญ—็ฌฆไธฒ๏ผš%s"
@@ -14949,72 +15977,72 @@ msgid ""
 "the commit.\n"
 msgstr "ไปฅ '%c' ๅผ€ๅง‹็š„่กŒๅฐ†่ขซๅฟฝ็•ฅ๏ผŒ่€Œ็ฉบ็š„ๆไบค่ฏดๆ˜Žๅฐ†็ปˆๆญขๆไบคใ€‚\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:865
 msgid "Empty commit message."
 msgstr "็ฉบๆไบคไฟกๆฏใ€‚"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:880
 #, c-format
 msgid "Wonderful.\n"
 msgstr "ๅคชๆฃ’ไบ†ใ€‚\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:941
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "่‡ชๅŠจๅˆๅนถๅคฑ่ดฅ๏ผŒไฟฎๆญฃๅ†ฒ็ช็„ถๅŽๆไบคไฟฎๆญฃ็š„็ป“ๆžœใ€‚\n"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:980
 msgid "No current branch."
 msgstr "ๆฒกๆœ‰ๅฝ“ๅ‰ๅˆ†ๆ”ฏใ€‚"
 
-#: builtin/merge.c:974
+#: builtin/merge.c:982
 msgid "No remote for the current branch."
 msgstr "ๅฝ“ๅ‰ๅˆ†ๆ”ฏๆฒกๆœ‰ๅฏนๅบ”็š„่ฟœ็จ‹ไป“ๅบ“ใ€‚"
 
-#: builtin/merge.c:976
+#: builtin/merge.c:984
 msgid "No default upstream defined for the current branch."
 msgstr "ๅฝ“ๅ‰ๅˆ†ๆ”ฏๆฒกๆœ‰ๅฎšไน‰้ป˜่ฎค็š„ไธŠๆธธๅˆ†ๆ”ฏใ€‚"
 
-#: builtin/merge.c:981
+#: builtin/merge.c:989
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "ๅฏนไบŽ %s ๆฒกๆœ‰ๆฅ่‡ช %s ็š„่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏ"
 
-#: builtin/merge.c:1038
+#: builtin/merge.c:1046
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "็Žฏๅขƒ '%2$s' ไธญๅญ˜ๅœจๅ็š„ๅ–ๅ€ผ '%1$s'"
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1149
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "ไธ่ƒฝๅœจ %s ไธญๅˆๅนถ๏ผš%s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1183
 msgid "not something we can merge"
 msgstr "ไธ่ƒฝๅˆๅนถ"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1286
 msgid "--abort expects no arguments"
 msgstr "--abort ไธๅธฆๅ‚ๆ•ฐ"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1290
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "ๆฒกๆœ‰่ฆ็ปˆๆญข็š„ๅˆๅนถ๏ผˆMERGE_HEAD ไธขๅคฑ๏ผ‰ใ€‚"
 
-#: builtin/merge.c:1291
+#: builtin/merge.c:1299
 msgid "--quit expects no arguments"
 msgstr "--quit ไธๅธฆๅ‚ๆ•ฐ"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1312
 msgid "--continue expects no arguments"
 msgstr "--continue ไธๅธฆๅ‚ๆ•ฐ"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1316
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "ๆฒกๆœ‰่ฟ›่กŒไธญ็š„ๅˆๅนถ๏ผˆMERGE_HEAD ไธขๅคฑ๏ผ‰ใ€‚"
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1332
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15022,7 +16050,7 @@ msgstr ""
 "ๆ‚จๅฐšๆœช็ป“ๆŸๆ‚จ็š„ๅˆๅนถ๏ผˆๅญ˜ๅœจ MERGE_HEAD๏ผ‰ใ€‚\n"
 "่ฏทๅœจๅˆๅนถๅ‰ๅ…ˆๆไบคๆ‚จ็š„ไฟฎๆ”นใ€‚"
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1339
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15030,96 +16058,96 @@ msgstr ""
 "ๆ‚จๅฐšๆœช็ป“ๆŸๆ‚จ็š„ๆ‹ฃ้€‰๏ผˆๅญ˜ๅœจ CHERRY_PICK_HEAD๏ผ‰ใ€‚\n"
 "่ฏทๅœจๅˆๅนถๅ‰ๅ…ˆๆไบคๆ‚จ็š„ไฟฎๆ”นใ€‚"
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1342
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "ๆ‚จๅฐšๆœช็ป“ๆŸๆ‚จ็š„ๆ‹ฃ้€‰๏ผˆๅญ˜ๅœจ CHERRY_PICK_HEAD๏ผ‰ใ€‚"
 
-#: builtin/merge.c:1348
+#: builtin/merge.c:1356
 msgid "You cannot combine --squash with --no-ff."
 msgstr "ๆ‚จไธ่ƒฝๅฐ† --squash ๅ’Œ --no-ff ็ป„ๅˆไฝฟ็”จใ€‚"
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1358
 msgid "You cannot combine --squash with --commit."
 msgstr "ๆ‚จไธ่ƒฝๅฐ† --squash ๅ’Œ --commit ็ป„ๅˆไฝฟ็”จใ€‚"
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1374
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "ๆœชๆŒ‡ๅฎšๆไบคๅนถไธ” merge.defaultToUpstream ๆœช่ฎพ็ฝฎใ€‚"
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1391
 msgid "Squash commit into empty head not supported yet"
 msgstr "ๅฐšไธๆ”ฏๆŒๅˆฐ็ฉบๅˆ†ๆ”ฏ็š„ๅŽ‹็ผฉๆไบค"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1393
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "ๅˆฐ็ฉบๅˆ†ๆ”ฏ็š„้žๅฟซ่ฟ›ๅผๆไบคๆฒกๆœ‰ๆ„ไน‰"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1398
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - ไธ่ƒฝ่ขซๅˆๅนถ"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1400
 msgid "Can merge only exactly one commit into empty head"
 msgstr "ๅช่ƒฝๅฐ†ไธ€ไธชๆไบคๅˆๅนถๅˆฐ็ฉบๅˆ†ๆ”ฏไธŠ"
 
-#: builtin/merge.c:1471
+#: builtin/merge.c:1481
 msgid "refusing to merge unrelated histories"
 msgstr "ๆ‹’็ปๅˆๅนถๆ— ๅ…ณ็š„ๅŽ†ๅฒ"
 
-#: builtin/merge.c:1480
+#: builtin/merge.c:1490
 msgid "Already up to date."
 msgstr "ๅทฒ็ปๆ˜ฏๆœ€ๆ–ฐ็š„ใ€‚"
 
-#: builtin/merge.c:1490
+#: builtin/merge.c:1500
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "ๆ›ดๆ–ฐ %s..%s\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1542
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "ๅฐ่ฏ•้žๅธธๅฐ็š„็ดขๅผ•ๅ†…ๅˆๅนถ...\n"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1549
 #, c-format
 msgid "Nope.\n"
 msgstr "ๆ— ใ€‚\n"
 
-#: builtin/merge.c:1564
+#: builtin/merge.c:1574
 msgid "Already up to date. Yeeah!"
 msgstr "ๅทฒ็ปๆ˜ฏๆœ€ๆ–ฐ็š„ใ€‚่€ถ๏ผ"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1580
 msgid "Not possible to fast-forward, aborting."
 msgstr "ๆ— ๆณ•ๅฟซ่ฟ›๏ผŒ็ปˆๆญขใ€‚"
 
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1603 builtin/merge.c:1668
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "ๅฐ†ๆ ‘ๅ›žๆปš่‡ณๅŽŸๅง‹็Šถๆ€...\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1607
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "ๅฐ่ฏ•ๅˆๅนถ็ญ–็•ฅ %s...\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1659
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "ๆฒกๆœ‰ๅˆๅนถ็ญ–็•ฅๅค„็†ๆญคๅˆๅนถใ€‚\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1661
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "ไฝฟ็”จ็ญ–็•ฅ %s ๅˆๅนถๅคฑ่ดฅใ€‚\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1670
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "ไฝฟ็”จ %s ไปฅๅ‡†ๅค‡ๆ‰‹ๅทฅ่งฃๅ†ณใ€‚\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1682
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "่‡ชๅŠจๅˆๅนถ่ฟ›ๅฑ•้กบๅˆฉ๏ผŒๆŒ‰่ฆๆฑ‚ๅœจๆไบคๅ‰ๅœๆญข\n"
@@ -15204,33 +16232,33 @@ msgstr "ไธ่ฆ่ญฆๅ‘Šๅ†ฒ็ช"
 msgid "set labels for file1/orig-file/file2"
 msgstr "ไธบ ๆ–‡ไปถ1/ๅˆๅง‹ๆ–‡ไปถ/ๆ–‡ไปถ2 ่ฎพ็ฝฎๆ ‡็ญพ"
 
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "ๆœช็Ÿฅ้€‰้กน %s"
 
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "ไธ่ƒฝ่งฃๆžๅฏน่ฑก '%s'"
 
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "ๆ— ๆณ•ๅค„็† %d ๆกไปฅไธŠ็š„ๅŸบ็บฟใ€‚ๅฟฝ็•ฅ %sใ€‚"
 msgstr[1] "ๆ— ๆณ•ๅค„็† %d ๆกไปฅไธŠ็š„ๅŸบ็บฟใ€‚ๅฟฝ็•ฅ %sใ€‚"
 
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "ไธ่ƒฝๅค„็†ไธคไธชๅคดๅˆๅนถไน‹ๅค–็š„ไปปไฝ•ๆ“ไฝœใ€‚"
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "ๆ— ๆณ•่งฃๆžๅผ•็”จ '%s'"
 
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "ๅˆๅนถ %s ๅ’Œ %s\n"
@@ -15253,31 +16281,31 @@ msgstr "ๅ…่ฎธๅˆ›ๅปบไธ€ไธชไปฅไธŠ็š„ๆ ‘"
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
-"git multi-pack-index [--object-dir=<็›ฎๅฝ•>] (write|verify|expire|repack --"
-"batch-size=<ๅคงๅฐ>)"
+"git multi-pack-index [<้€‰้กน>] (write|verify|expire|repack --batch-size=<ๅคงๅฐ"
+">)"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "ๅŒ…ๅซๆˆๅฏนๅŒ…ๆ–‡ไปถๅ’ŒๅŒ…็ดขๅผ•็š„ๅฏน่ฑก็›ฎๅฝ•"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
 msgstr "ๅœจ repack ๆœŸ้—ด๏ผŒๅฐ†่พƒๅฐๅฐบๅฏธ็š„ๅŒ…ๆ–‡ไปถๆ”ถ้›†ๅˆฐๅคงไบŽๆญคๅคงๅฐ็š„ๆ‰นๆฌกไธญ"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
 msgid "too many arguments"
 msgstr "ๅคชๅคšๅ‚ๆ•ฐ"
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr "--batch-size ้€‰้กนไป…็”จไบŽ 'repack' ๅญๅ‘ฝไปค"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "ๆœช่ฏ†ๅˆซ็š„ๅญๅ‘ฝไปค๏ผš%s"
@@ -15369,52 +16397,52 @@ msgstr "%s๏ผŒๆบ=%s๏ผŒ็›ฎๆ ‡=%s"
 msgid "Renaming %s to %s\n"
 msgstr "้‡ๅ‘ฝๅ %s ่‡ณ %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "้‡ๅ‘ฝๅ '%s' ๅคฑ่ดฅ"
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<้€‰้กน>] <ๆไบค>..."
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<้€‰้กน>] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<้€‰้กน>] --stdin"
 
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr "ๅชๆ‰“ๅฐๅ็งฐ๏ผˆๆ—  SHA-1๏ผ‰"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "ๅชไฝฟ็”จๆ ‡็ญพๆฅๅ‘ฝๅๆไบค"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "ๅชไฝฟ็”จๅ’Œ <ๆจกๅผ> ็›ธๅŒน้…็š„ๅผ•็”จ"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ๅฟฝ็•ฅๅ’Œ <ๆจกๅผ> ็›ธๅŒน้…็š„ๅผ•็”จ"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "ๅˆ—ๅ‡บๅฏไปฅไปŽๆ‰€ๆœ‰ๅผ•็”จ่ฎฟ้—ฎ็š„ๆไบค"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "ไปŽๆ ‡ๅ‡†่พ“ๅ…ฅ่ฏปๅ–"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "ๅ…่ฎธๆ‰“ๅฐ `ๆœชๅฎšไน‰` ็š„ๅ็งฐ๏ผˆ้ป˜่ฎค๏ผ‰"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "ๅๅ‘่งฃๆž่พ“ๅ…ฅไธญ็š„ๆ ‡็ญพ๏ผˆๅ†…้ƒจไฝฟ็”จ๏ผ‰"
 
@@ -15801,7 +16829,7 @@ msgstr "ๅฐ่ฏ•ๅˆ ้™คไธๅญ˜ๅœจ็š„ๆณจ่งฃไธๆ˜ฏไธ€ไธช้”™่ฏฏ"
 msgid "read object names from the standard input"
 msgstr "ไปŽๆ ‡ๅ‡†่พ“ๅ…ฅ่ฏปๅ–ๅฏน่ฑกๅ็งฐ"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "ไธๅˆ ้™ค๏ผŒๅชๆ˜พ็คบ"
 
@@ -15817,7 +16845,7 @@ msgstr "ๆณจ่งฃๅผ•็”จ"
 msgid "use notes from <notes-ref>"
 msgstr "ไปŽ <ๆณจ่งฃๅผ•็”จ> ไฝฟ็”จๆณจ่งฃ"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1643
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "ๆœช็Ÿฅๅญๅ‘ฝไปค๏ผš%s"
@@ -15832,124 +16860,101 @@ msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<้€‰้กน>...] <ๅ‰็ผ€ๅ็งฐ> [< <ๅผ•็”จๅˆ—่กจ> | < <ๅฏน่ฑกๅˆ—่กจ>]"
 
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:430
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s ้”™็š„ๅŒ…ๅฏน่ฑก CRC"
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:441
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s ๆŸๅ็š„ๅŒ…ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:572
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "ๅ‘็Žฐๅฏน่ฑก %s ้€’ๅฝ’ delta"
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "ๆŽ’ๅบไบ† %u ไธชๅฏน่ฑก๏ผŒ้ข„ๆœŸ %<PRIu32> ไธช"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "ๆ— ๆ•ˆ็š„ๅŒ…ๆ–‡ไปถ๏ผš%s"
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "ๆ— ๆณ•ไธบ้‡็”จๆ‰“ๅผ€ๅŒ…ๆ–‡ไปถ๏ผš%s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "ๆ— ๆณ•ๅœจ้‡็”จ็š„ๅŒ…ๆ–‡ไปถไธญๆŸฅๆ‰พ"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "ๆ— ๆณ•่ฏปๅ–็ดขๅผ•ๆ–‡ไปถ"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:972
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "็ฆ็”จ bitmap ๅ†™ๅ…ฅ๏ผŒๅ› ไธบ pack.packSizeLimit ่ฎพ็ฝฎไฝฟๅพ—ๅŒ…่ขซๅˆ‡ๅˆ†ไธบๅคšไธช"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:985
 msgid "Writing objects"
 msgstr "ๅ†™ๅ…ฅๅฏน่ฑกไธญ"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "ๅฏน %s ่ฐƒ็”จ stat ๅคฑ่ดฅ"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1099
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "ๅ†™ๅ…ฅ %<PRIu32> ไธชๅฏน่ฑก่€Œ้ข„ๆœŸ %<PRIu32> ไธช"
 
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1297
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "็ฆ็”จ bitmap ๅ†™ๅ…ฅ๏ผŒๅ› ไธบไธ€ไบ›ๅฏน่ฑกๅฐ†ไธไผš่ขซๆ‰“ๅŒ…"
 
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1724
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s ๅŽ‹็ผฉไธญ delta ๅŸบๅ‡†ๅ็งป่ถŠ็•Œ"
 
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1733
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s ็š„ delta ๅŸบๅ‡†ๅ็งป่ถŠ็•Œ"
 
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:2004
 msgid "Counting objects"
 msgstr "ๅฏน่ฑก่ฎกๆ•ฐไธญ"
 
-#: builtin/pack-objects.c:2005
-#, c-format
-msgid "unable to get size of %s"
-msgstr "ไธ่ƒฝๅพ—ๅˆฐ %s ็š„ๅคงๅฐ"
-
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2149
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "ๆ— ๆณ•่งฃๆžๅฏน่ฑก %s ๅคดไฟกๆฏ"
 
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
 #, c-format
 msgid "object %s cannot be read"
 msgstr "ๅฏน่ฑก %s ๆ— ๆณ•่ฏปๅ–"
 
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "ๅฏน่ฑก %s ไธไธ€่‡ด็š„ๅฏน่ฑก้•ฟๅบฆ๏ผˆ%<PRIuMAX> vs %<PRIuMAX>๏ผ‰"
 
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2259
 msgid "suboptimal pack - out of memory"
 msgstr "ๆฌกไผ˜๏ผˆsuboptimal๏ผ‰ๆ‰“ๅŒ… - ๅ†…ๅญ˜ไธ่ถณ"
 
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2574
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "ไฝฟ็”จ %d ไธช็บฟ็จ‹่ฟ›่กŒๅŽ‹็ผฉ"
 
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2713
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "ๆ— ๆณ•ไธบๆ ‡็ญพ %s ๅŽ‹็ผฉๅฏน่ฑก"
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2801
 msgid "Compressing objects"
 msgstr "ๅŽ‹็ผฉๅฏน่ฑกไธญ"
 
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2807
 msgid "inconsistency with delta count"
 msgstr "ไธไธ€่‡ด็š„ๅทฎๅผ‚่ฎกๆ•ฐ"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2888
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -15958,7 +16963,7 @@ msgstr ""
 "้ข„ๆœŸ่พน็•Œๅฏน่ฑก๏ผˆedge object๏ผ‰ID๏ผŒๅดๅพ—ๅˆฐๅžƒๅœพๆ•ฐๆฎ๏ผš\n"
 " %s"
 
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2894
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -15967,245 +16972,233 @@ msgstr ""
 "้ข„ๆœŸๅฏน่ฑก ID๏ผŒๅดๅพ—ๅˆฐๅžƒๅœพๆ•ฐๆฎ๏ผš\n"
 " %s"
 
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2992
 msgid "invalid value for --missing"
 msgstr "้€‰้กน --missing ็š„ๅ€ผๆ— ๆ•ˆ"
 
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
 msgid "cannot open pack index"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ๅŒ…ๆ–‡ไปถ็ดขๅผ•"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:3082
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "ๆ— ๆณ•ๆฃ€ๆŸฅ %s ๅค„็š„ๆพๆ•ฃๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3167
 msgid "unable to force loose object"
 msgstr "ๆ— ๆณ•ๅผบๅˆถๆพๆ•ฃๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3260
 #, c-format
 msgid "not a rev '%s'"
 msgstr "ไธๆ˜ฏไธ€ไธช็‰ˆๆœฌ '%s'"
 
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3263
 #, c-format
 msgid "bad revision '%s'"
 msgstr "ๅ็š„็‰ˆๆœฌ '%s'"
 
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3288
 msgid "unable to add recent objects"
 msgstr "ๆ— ๆณ•ๆทปๅŠ ๆœ€่ฟ‘็š„ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3341
 #, c-format
 msgid "unsupported index version %s"
 msgstr "ไธๆ”ฏๆŒ็š„็ดขๅผ•็‰ˆๆœฌ %s"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3345
 #, c-format
 msgid "bad index version '%s'"
 msgstr "ๅ็š„็ดขๅผ•็‰ˆๆœฌ '%s'"
 
-#: builtin/pack-objects.c:3248
-msgid "do not show progress meter"
-msgstr "ไธๆ˜พ็คบ่ฟ›ๅบฆ่กจ"
-
-#: builtin/pack-objects.c:3250
-msgid "show progress meter"
-msgstr "ๆ˜พ็คบ่ฟ›ๅบฆ่กจ"
-
-#: builtin/pack-objects.c:3252
-msgid "show progress meter during object writing phase"
-msgstr "ๅœจๅฏน่ฑกๅ†™ๅ…ฅ้˜ถๆฎตๆ˜พ็คบ่ฟ›ๅบฆ่กจ"
-
-#: builtin/pack-objects.c:3255
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "ๅฝ“่ฟ›ๅบฆ่กจๆ˜พ็คบๆ—ถ็ฑปไผผไบŽ --all-progress"
-
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3383
 msgid "<version>[,<offset>]"
 msgstr "<็‰ˆๆœฌ>[,<ๅ็งป>]"
 
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3384
 msgid "write the pack index file in the specified idx format version"
 msgstr "็”จๆŒ‡ๅฎš็š„ idx ๆ ผๅผ็‰ˆๆœฌๆฅๅ†™ๅŒ…็ดขๅผ•ๆ–‡ไปถ"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3387
 msgid "maximum size of each output pack file"
 msgstr "ๆฏไธช่พ“ๅ‡บๅŒ…็š„ๆœ€ๅคงๅฐบๅฏธ"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3389
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ๅฟฝ็•ฅไปŽๅค‡็”จๅฏน่ฑกๅญ˜ๅ‚จ้‡Œๅ€Ÿ็”จๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3391
 msgid "ignore packed objects"
 msgstr "ๅฟฝ็•ฅๅŒ…ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3393
 msgid "limit pack window by objects"
 msgstr "้™ๅˆถๆ‰“ๅŒ…็ช—ๅฃ็š„ๅฏน่ฑกๆ•ฐ"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3395
 msgid "limit pack window by memory in addition to object limit"
 msgstr "้™คๅฏน่ฑกๆ•ฐ้‡้™ๅˆถๅค–่ฎพ็ฝฎๆ‰“ๅŒ…็ช—ๅฃ็š„ๅ†…ๅญ˜้™ๅˆถ"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3397
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "ๆ‰“ๅŒ…ๅ…่ฎธ็š„ delta ้“พ็š„ๆœ€ๅคง้•ฟๅบฆ"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3399
 msgid "reuse existing deltas"
 msgstr "้‡็”จๅทฒๅญ˜ๅœจ็š„ deltas"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3401
 msgid "reuse existing objects"
 msgstr "้‡็”จๅทฒๅญ˜ๅœจ็š„ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3403
 msgid "use OFS_DELTA objects"
 msgstr "ไฝฟ็”จ OFS_DELTA ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3405
 msgid "use threads when searching for best delta matches"
 msgstr "ไฝฟ็”จ็บฟ็จ‹ๆŸฅ่ฏขๆœ€ไฝณ delta ๅŒน้…"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3407
 msgid "do not create an empty pack output"
 msgstr "ไธๅˆ›ๅปบ็ฉบ็š„ๅŒ…่พ“ๅ‡บ"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3409
 msgid "read revision arguments from standard input"
 msgstr "ไปŽๆ ‡ๅ‡†่พ“ๅ…ฅ่ฏปๅ–็‰ˆๆœฌๅทๅ‚ๆ•ฐ"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3411
 msgid "limit the objects to those that are not yet packed"
 msgstr "้™ๅˆถ้‚ฃไบ›ๅฐšๆœชๆ‰“ๅŒ…็š„ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3414
 msgid "include objects reachable from any reference"
 msgstr "ๅŒ…ๆ‹ฌๅฏไปฅไปŽไปปไฝ•ๅผ•็”จ่ฎฟ้—ฎๅˆฐ็š„ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3417
 msgid "include objects referred by reflog entries"
 msgstr "ๅŒ…ๆ‹ฌ่ขซๅผ•็”จๆ—ฅๅฟ—ๅผ•็”จๅˆฐ็š„ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3420
 msgid "include objects referred to by the index"
 msgstr "ๅŒ…ๆ‹ฌ่ขซ็ดขๅผ•ๅผ•็”จๅˆฐ็š„ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3423
 msgid "output pack to stdout"
 msgstr "่พ“ๅ‡บๅŒ…ๅˆฐๆ ‡ๅ‡†่พ“ๅ‡บ"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3425
 msgid "include tag objects that refer to objects to be packed"
 msgstr "ๅŒ…ๆ‹ฌ้‚ฃไบ›ๅผ•็”จไบ†ๅพ…ๆ‰“ๅŒ…ๅฏน่ฑก็š„ๆ ‡็ญพๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3427
 msgid "keep unreachable objects"
 msgstr "็ปดๆŒไธๅฏ่พพ็š„ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3429
 msgid "pack loose unreachable objects"
 msgstr "ๆ‰“ๅŒ…ๆพๆ•ฃ็š„ไธๅฏ่พพๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3431
 msgid "unpack unreachable objects newer than <time>"
 msgstr "ๅฐ†ๆฏ”็ป™ๅฎš <ๆ—ถ้—ด> ๆ–ฐ็š„ๆ— ๆณ•่ฎฟ้—ฎ็š„ๅฏน่ฑก่งฃๅŒ…"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3434
 msgid "use the sparse reachability algorithm"
 msgstr "ไฝฟ็”จ็จ€็–ๅฏ่พพๆ€ง็ฎ—ๆณ•"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3436
 msgid "create thin packs"
 msgstr "ๅˆ›ๅปบ็ฒพ็ฎ€ๅŒ…"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3438
 msgid "create packs suitable for shallow fetches"
 msgstr "ๅˆ›ๅปบ้€‚ๅˆๆต…ๅ…‹้š†ไป“ๅบ“่Žทๅ–็š„ๅŒ…"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3440
 msgid "ignore packs that have companion .keep file"
 msgstr "ๅฟฝ็•ฅ้…ๆœ‰ .keep ๆ–‡ไปถ็š„ๅŒ…"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3442
 msgid "ignore this pack"
 msgstr "ๅฟฝ็•ฅ่ฏฅ pack"
 
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3444
 msgid "pack compression level"
 msgstr "ๆ‰“ๅŒ…ๅŽ‹็ผฉ็บงๅˆซ"
 
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3446
 msgid "do not hide commits by grafts"
 msgstr "ๆ˜พ็คบ่ขซ็งปๆค้š่—็š„ๆไบค"
 
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3448
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "ไฝฟ็”จ bitmap ็ดขๅผ•๏ผˆๅฆ‚ๆžœๆœ‰็š„่ฏ๏ผ‰ไปฅๆ้ซ˜ๅฏน่ฑก่ฎกๆ•ฐๆ—ถ็š„้€Ÿๅบฆ"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3450
 msgid "write a bitmap index together with the pack index"
 msgstr "ๅœจๅปบ็ซ‹ๅŒ…็ดขๅผ•็š„ๅŒๆ—ถๅˆ›ๅปบ bitmap ็ดขๅผ•"
 
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3454
 msgid "write a bitmap index if possible"
 msgstr "ๅฆ‚ๆžœๅฏ่ƒฝ๏ผŒๅ†™ bitmap ็ดขๅผ•"
 
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3458
 msgid "handling for missing objects"
 msgstr "ๅค„็†ไธขๅคฑ็š„ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3461
 msgid "do not pack objects in promisor packfiles"
 msgstr "ไธ่ฆๆ‰“ๅŒ… promisor ๅŒ…ๆ–‡ไปถไธญ็š„ๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3463
 msgid "respect islands during delta compression"
 msgstr "ๅœจๅขž้‡ๅŽ‹็ผฉๆ—ถๅ‚่€ƒๆ•ฐๆฎๅฒ›"
 
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3492
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "ๅขž้‡้“พๆทฑๅบฆ %d ๅคชๆทฑไบ†๏ผŒๅผบๅˆถไธบ %d"
 
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3497
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "้…็ฝฎ pack.deltaCacheLimit ๅคช้ซ˜ไบ†๏ผŒๅผบๅˆถไธบ %d"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3551
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "ไธ่ƒฝไฝฟ็”จ --max-pack-size ๆฅๆž„ๅปบไผ ่พ“็”จ็š„ๅŒ…ๆ–‡ไปถ"
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3553
 msgid "minimum pack size limit is 1 MiB"
 msgstr "ๆœ€ๅฐ็š„ๅŒ…ๆ–‡ไปถๅคงๅฐๆ˜ฏ 1 MiB"
 
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3558
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin ไธ่ƒฝ็”จไบŽๅˆ›ๅปบไธ€ไธชๅฏ็ดขๅผ•ๅŒ…"
 
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3561
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable ๅ’Œ --unpack-unreachable ไธๅ…ผๅฎน"
 
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3567
 msgid "cannot use --filter without --stdout"
 msgstr "ไธ่ƒฝๅœจๆฒกๆœ‰ --stdout ็š„ๆƒ…ๅ†ตไธ‹ไฝฟ็”จ --filter"
 
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3627
 msgid "Enumerating objects"
 msgstr "ๆžšไธพๅฏน่ฑก"
 
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3657
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "ๆ€ปๅ…ฑ %<PRIu32> ๏ผˆๅทฎๅผ‚ %<PRIu32>๏ผ‰๏ผŒๅค็”จ %<PRIu32> ๏ผˆๅทฎๅผ‚ %<PRIu32>๏ผ‰"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"ๆ€ปๅ…ฑ %<PRIu32>๏ผˆๅทฎๅผ‚ %<PRIu32>๏ผ‰๏ผŒๅค็”จ %<PRIu32>๏ผˆๅทฎๅผ‚ %<PRIu32>๏ผ‰๏ผŒๅŒ…ๅค็”จ "
+"%<PRIu32>"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16247,70 +17240,70 @@ msgstr "้™ๅˆถ้ๅŽ† promisor ๅŒ…ไปฅๅค–็š„ๅฏน่ฑก"
 msgid "cannot prune in a precious-objects repo"
 msgstr "ไธ่ƒฝๅœจ็ๅ“ไป“ๅบ“ไธญๆ‰ง่กŒๆธ…็†ๆ“ไฝœ"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "%s ็š„ๅ€ผๆ— ๆ•ˆ๏ผš%s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<้€‰้กน>] [<ไป“ๅบ“> [<ๅผ•็”จ่ง„ๆ ผ>...]]"
 
-#: builtin/pull.c:141
+#: builtin/pull.c:122
 msgid "control for recursive fetching of submodules"
 msgstr "ๆŽงๅˆถๅญๆจก็ป„็š„้€’ๅฝ’่Žทๅ–"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:126
 msgid "Options related to merging"
 msgstr "ๅ’Œๅˆๅนถ็›ธๅ…ณ็š„้€‰้กน"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:129
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "ไฝฟ็”จๅ˜ๅŸบๆ“ไฝœๅ–ไปฃๅˆๅนถๆ“ไฝœไปฅๅˆๅ…ฅไฟฎๆ”น"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "ๅ…่ฎธๅฟซ่ฟ›ๅผ"
 
-#: builtin/pull.c:185
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "ๅ˜ๅŸบๆ“ไฝœๅ‰ๅŽๆ‰ง่กŒ่‡ชๅŠจ่ดฎ่—ๅ’Œๅผนๅ‡บ่ดฎ่—"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:182
 msgid "Options related to fetching"
 msgstr "ๅ’Œ่Žทๅ–็›ธๅ…ณ็š„ๅ‚ๆ•ฐ"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:192
 msgid "force overwrite of local branch"
 msgstr "ๅผบๅˆถ่ฆ†็›–ๆœฌๅœฐๅˆ†ๆ”ฏ"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:200
 msgid "number of submodules pulled in parallel"
 msgstr "ๅนถๅ‘ๆ‹‰ๅ–็š„ๅญๆจก็ป„็š„ๆ•ฐ้‡"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:300
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "pull.ff ็š„ๅ–ๅ€ผๆ— ๆ•ˆ๏ผš%s"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:426
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "ๅœจๆ‚จๅˆšๅˆš่Žทๅ–ๅˆฐ็š„ๅผ•็”จไธญๆฒกๆœ‰ๅ˜ๅŸบๆ“ไฝœ็š„ๅ€™้€‰ใ€‚"
 
-#: builtin/pull.c:435
+#: builtin/pull.c:428
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "ๅœจๆ‚จๅˆšๅˆš่Žทๅ–ๅˆฐ็š„ๅผ•็”จไธญๆฒกๆœ‰ๅˆๅนถๆ“ไฝœ็š„ๅ€™้€‰ใ€‚"
 
-#: builtin/pull.c:436
+#: builtin/pull.c:429
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "้€šๅธธ่ฟ™ๆ„ๅ‘ณ็€ๆ‚จๆไพ›ไบ†ไธ€ไธช้€š้…็ฌฆๅผ•็”จ่ง„ๆ ผไฝ†ๆœช่ƒฝๅ’Œ่ฟœ็ซฏๅŒน้…ใ€‚"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:432
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16320,42 +17313,42 @@ msgstr ""
 "ๆ‚จ่ฆๆฑ‚ไปŽ่ฟœ็จ‹ '%s' ๆ‹‰ๅ–๏ผŒไฝ†ๆ˜ฏๆœชๆŒ‡ๅฎšไธ€ไธชๅˆ†ๆ”ฏใ€‚ๅ› ไธบ่ฟ™ไธๆ˜ฏๅฝ“ๅ‰\n"
 "ๅˆ†ๆ”ฏ้ป˜่ฎค็š„่ฟœ็จ‹ไป“ๅบ“๏ผŒๆ‚จๅฟ…้กปๅœจๅ‘ฝไปค่กŒไธญๆŒ‡ๅฎšไธ€ไธชๅˆ†ๆ”ฏๅใ€‚"
 
-#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "ๆ‚จๅฝ“ๅ‰ไธๅœจไธ€ไธชๅˆ†ๆ”ฏไธŠใ€‚"
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "่ฏทๆŒ‡ๅฎšๆ‚จ่ฆๅ˜ๅŸบๅˆฐๅ“ชไธ€ไธชๅˆ†ๆ”ฏใ€‚"
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "่ฏทๆŒ‡ๅฎšๆ‚จ่ฆๅˆๅนถๅ“ชไธ€ไธชๅˆ†ๆ”ฏใ€‚"
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:442 builtin/pull.c:457
 msgid "See git-pull(1) for details."
 msgstr "่ฏฆ่ง git-pull(1)ใ€‚"
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<่ฟœ็จ‹>"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<ๅˆ†ๆ”ฏ>"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "ๅฝ“ๅ‰ๅˆ†ๆ”ฏๆฒกๆœ‰่ทŸ่ธชไฟกๆฏใ€‚"
 
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "ๅฆ‚ๆžœๆ‚จๆƒณ่ฆไธบๆญคๅˆ†ๆ”ฏๅˆ›ๅปบ่ทŸ่ธชไฟกๆฏ๏ผŒๆ‚จๅฏไปฅๆ‰ง่กŒ๏ผš"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:466
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16364,32 +17357,32 @@ msgstr ""
 "ๆ‚จ็š„้…็ฝฎไธญๆŒ‡ๅฎš่ฆๅˆๅนถ่ฟœ็จ‹็š„ๅผ•็”จ '%s'๏ผŒ\n"
 "ไฝ†ๆ˜ฏๆฒกๆœ‰่Žทๅ–ๅˆฐ่ฟ™ไธชๅผ•็”จใ€‚"
 
-#: builtin/pull.c:581
+#: builtin/pull.c:576
 #, c-format
 msgid "unable to access commit %s"
 msgstr "ๆ— ๆณ•่ฎฟ้—ฎๆไบค %s"
 
-#: builtin/pull.c:861
+#: builtin/pull.c:857
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ไธบๅ˜ๅŸบๆ“ไฝœๅฟฝ็•ฅ --verify-signatures"
 
-#: builtin/pull.c:916
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash ้€‰้กนๅชๅœจไฝฟ็”จ --rebase ๆ—ถๆœ‰ๆ•ˆใ€‚"
 
-#: builtin/pull.c:924
+#: builtin/pull.c:920
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "ๆ›ดๆ–ฐๅฐšๆœช่ฏž็”Ÿ็š„ๅˆ†ๆ”ฏ๏ผŒๅ˜ๆ›ดๆทปๅŠ ่‡ณ็ดขๅผ•ใ€‚"
 
-#: builtin/pull.c:928
+#: builtin/pull.c:924
 msgid "pull with rebase"
 msgstr "ๅ˜ๅŸบๅผๆ‹‰ๅ–"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:925
 msgid "please commit or stash them."
 msgstr "่ฏทๆไบคๆˆ–่ดฎ่—ๅฎƒไปฌใ€‚"
 
-#: builtin/pull.c:954
+#: builtin/pull.c:950
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16399,7 +17392,7 @@ msgstr ""
 "fetch ๆ›ดๆ–ฐไบ†ๅฝ“ๅ‰็š„ๅˆ†ๆ”ฏใ€‚ๅฟซ่ฟ›ๆ‚จ็š„ๅทฅไฝœๅŒบ\n"
 "่‡ณๆไบค %sใ€‚"
 
-#: builtin/pull.c:960
+#: builtin/pull.c:956
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16416,15 +17409,15 @@ msgstr ""
 "$ git reset --hard\n"
 "ๆขๅคไน‹ๅ‰็š„็Šถๆ€ใ€‚"
 
-#: builtin/pull.c:975
+#: builtin/pull.c:971
 msgid "Cannot merge multiple branches into empty head."
 msgstr "ๆ— ๆณ•ๅฐ†ๅคšไธชๅˆ†ๆ”ฏๅˆๅนถๅˆฐ็ฉบๅˆ†ๆ”ฏใ€‚"
 
-#: builtin/pull.c:979
+#: builtin/pull.c:975
 msgid "Cannot rebase onto multiple branches."
 msgstr "ๆ— ๆณ•ๅ˜ๅŸบๅˆฐๅคšไธชๅˆ†ๆ”ฏใ€‚"
 
-#: builtin/pull.c:986
+#: builtin/pull.c:982
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "ๆœฌๅœฐๅญๆจก็ป„ไธญๆœ‰ไฟฎๆ”น๏ผŒๆ— ๆณ•ๅ˜ๅŸบ"
 
@@ -16432,15 +17425,15 @@ msgstr "ๆœฌๅœฐๅญๆจก็ป„ไธญๆœ‰ไฟฎๆ”น๏ผŒๆ— ๆณ•ๅ˜ๅŸบ"
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<้€‰้กน>] [<ไป“ๅบ“> [<ๅผ•็”จ่ง„ๆ ผ>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "ๆ ‡็ญพๅŽ้ขๆœชๆไพ› <ๆ ‡็ญพ> ๅ‚ๆ•ฐ"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete ๅชๆŽฅๅ—็ฎ€ๅ•็š„็›ฎๆ ‡ๅผ•็”จๅ"
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16448,7 +17441,7 @@ msgstr ""
 "\n"
 "ไธบไบ†ๆฐธไน…ๅœฐ้€‰ๆ‹ฉไปปไธ€้€‰้กน๏ผŒๅ‚่ง 'git help config' ไธญ็š„ push.defaultใ€‚"
 
-#: builtin/push.c:170
+#: builtin/push.c:171
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16472,7 +17465,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16486,7 +17479,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<่ฟœ็จ‹ๅˆ†ๆ”ฏๅๅญ—>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16499,12 +17492,12 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "ๅฝ“ๅ‰ๅˆ†ๆ”ฏ %s ๆœ‰ๅคšไธชไธŠๆธธๅˆ†ๆ”ฏ๏ผŒๆ‹’็ปๆŽจ้€ใ€‚"
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -16514,12 +17507,12 @@ msgstr ""
 "ๆ‚จๆญฃๆŽจ้€่‡ณ่ฟœ็จ‹ '%s'๏ผˆๅ…ถๅนถ้žๅฝ“ๅ‰ๅˆ†ๆ”ฏ '%s' ็š„ไธŠๆธธ๏ผ‰๏ผŒ\n"
 "่€Œๆฒกๆœ‰ๅ‘Š่ฏ‰ๆˆ‘่ฆๆŽจ้€ไป€ไนˆใ€ๆ›ดๆ–ฐๅ“ชไธช่ฟœ็จ‹ๅˆ†ๆ”ฏใ€‚"
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr "ๆ‚จๆฒกๆœ‰ไธบๆŽจ้€ๆŒ‡ๅฎšไปปไฝ•ๅผ•็”จ่ง„ๆ ผ๏ผŒๅนถไธ” push.default ไธบ \"nothing\"ใ€‚"
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -16530,7 +17523,7 @@ msgstr ""
 "ๅ†ๆฌกๆŽจ้€ๅ‰๏ผŒๅ…ˆไธŽ่ฟœ็จ‹ๅ˜ๆ›ดๅˆๅนถ๏ผˆๅฆ‚ 'git pull ...'๏ผ‰ใ€‚่ฏฆ่ง\n"
 "'git push --help' ไธญ็š„ 'Note about fast-forwards' ๅฐ่Š‚ใ€‚"
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -16541,7 +17534,7 @@ msgstr ""
 "ๆฃ€ๅ‡บ่ฏฅๅˆ†ๆ”ฏๅนถๆ•ดๅˆ่ฟœ็จ‹ๅ˜ๆ›ด๏ผˆๅฆ‚ 'git pull ...'๏ผ‰๏ผŒ็„ถๅŽๅ†ๆŽจ้€ใ€‚่ฏฆ่ง\n"
 "'git push --help' ไธญ็š„ 'Note about fast-forwards' ๅฐ่Š‚ใ€‚"
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -16554,11 +17547,11 @@ msgstr ""
 "๏ผˆๅฆ‚ 'git pull ...'๏ผ‰ใ€‚\n"
 "่ฏฆ่ง 'git push --help' ไธญ็š„ 'Note about fast-forwards' ๅฐ่Š‚ใ€‚"
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "ๆ›ดๆ–ฐ่ขซๆ‹’็ป๏ผŒๅ› ไธบ่ฏฅๆ ‡็ญพๅœจ่ฟœ็จ‹ๅทฒ็ปๅญ˜ๅœจใ€‚"
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -16567,140 +17560,140 @@ msgstr ""
 "ๅฆ‚ๆžœไธไฝฟ็”จ '--force' ๅ‚ๆ•ฐ๏ผŒๆ‚จไธ่ƒฝๆ›ดๆ–ฐไธ€ไธชๆŒ‡ๅ‘้žๆไบคๅฏน่ฑก็š„่ฟœ็จ‹ๅผ•็”จ๏ผŒ\n"
 "ไนŸไธ่ƒฝๆ›ดๆ–ฐ่ฟœ็จ‹ๅผ•็”จ่ฎฉๅ…ถๆŒ‡ๅ‘ไธ€ไธช้žๆไบคๅฏน่ฑกใ€‚\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:360
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "ๆŽจ้€ๅˆฐ %s\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:367
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "ๆŽจ้€ไธ€ไบ›ๅผ•็”จๅˆฐ '%s' ๅคฑ่ดฅ"
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "ๅ็š„ไป“ๅบ“ '%s'"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"ๆฒกๆœ‰้…็ฝฎๆŽจ้€็›ฎๆ ‡ใ€‚\n"
-"ๆˆ–้€š่ฟ‡ๅ‘ฝไปค่กŒๆŒ‡ๅฎš URL๏ผŒๆˆ–็”จไธ‹้ขๅ‘ฝไปค้…็ฝฎไธ€ไธช่ฟœ็จ‹ไป“ๅบ“\n"
-"\n"
-"    git remote add <ๅ็งฐ> <ๅœฐๅ€>\n"
-"\n"
-"็„ถๅŽไฝฟ็”จ่ฏฅ่ฟœ็จ‹ไป“ๅบ“ๅๆ‰ง่กŒๆŽจ้€\n"
-"\n"
-"    git push <ๅ็งฐ>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:542
 msgid "repository"
 msgstr "ไป“ๅบ“"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "ๆŽจ้€ๆ‰€ๆœ‰ๅผ•็”จ"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "้•œๅƒๆ‰€ๆœ‰ๅผ•็”จ"
 
-#: builtin/push.c:558
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "ๅˆ ้™คๅผ•็”จ"
 
-#: builtin/push.c:559
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "ๆŽจ้€ๆ ‡็ญพ๏ผˆไธ่ƒฝไฝฟ็”จ --all or --mirror๏ผ‰"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "ๅผบๅˆถๆ›ดๆ–ฐ"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:552 builtin/send-pack.c:181
 msgid "<refname>:<expect>"
 msgstr "<ๅผ•็”จๅ>:<ๆœŸๆœ›ๅ€ผ>"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:553 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"
 msgstr "่ฆๆฑ‚ๅผ•็”จๆ—ง็š„ๅ–ๅ€ผไธบ่ฎพๅฎšๅ€ผ"
 
-#: builtin/push.c:568
+#: builtin/push.c:556
 msgid "control recursive pushing of submodules"
 msgstr "ๆŽงๅˆถๅญๆจก็ป„็š„้€’ๅฝ’ๆŽจ้€"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:558 builtin/send-pack.c:175
 msgid "use thin pack"
 msgstr "ไฝฟ็”จ็ฒพ็ฎ€ๆ‰“ๅŒ…"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "ๆŽฅๆ”ถๅŒ…็จ‹ๅบ"
 
-#: builtin/push.c:573
+#: builtin/push.c:561
 msgid "set upstream for git pull/status"
 msgstr "่ฎพ็ฝฎ git pull/status ็š„ไธŠๆธธ"
 
-#: builtin/push.c:576
+#: builtin/push.c:564
 msgid "prune locally removed refs"
 msgstr "ๆธ…้™คๆœฌๅœฐๅˆ ้™ค็š„ๅผ•็”จ"
 
-#: builtin/push.c:578
+#: builtin/push.c:566
 msgid "bypass pre-push hook"
 msgstr "็ป•่ฟ‡ pre-push ้’ฉๅญ"
 
-#: builtin/push.c:579
+#: builtin/push.c:567
 msgid "push missing but relevant tags"
 msgstr "ๆŽจ้€็ผบๅคฑไฝ†ๆœ‰ๅ…ณ็š„ๆ ‡็ญพ"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:570 builtin/send-pack.c:169
 msgid "GPG sign the push"
 msgstr "็”จ GPG ไธบๆŽจ้€็ญพๅ"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:572 builtin/send-pack.c:176
 msgid "request atomic transaction on remote side"
 msgstr "้œ€่ฆ่ฟœ็ซฏๆ”ฏๆŒๅŽŸๅญไบ‹ๅŠก"
 
-#: builtin/push.c:602
+#: builtin/push.c:590
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete ไธŽ --allใ€--mirror ๅŠ --tags ไธๅ…ผๅฎน"
 
-#: builtin/push.c:604
+#: builtin/push.c:592
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete ๆœชๆŽฅไปปไฝ•ๅผ•็”จๆฒกๆœ‰ๆ„ไน‰"
 
-#: builtin/push.c:607
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "ๅ็š„ไป“ๅบ“ '%s'"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"ๆฒกๆœ‰้…็ฝฎๆŽจ้€็›ฎๆ ‡ใ€‚\n"
+"ๆˆ–้€š่ฟ‡ๅ‘ฝไปค่กŒๆŒ‡ๅฎš URL๏ผŒๆˆ–็”จไธ‹้ขๅ‘ฝไปค้…็ฝฎไธ€ไธช่ฟœ็จ‹ไป“ๅบ“\n"
+"\n"
+"    git remote add <ๅ็งฐ> <ๅœฐๅ€>\n"
+"\n"
+"็„ถๅŽไฝฟ็”จ่ฏฅ่ฟœ็จ‹ไป“ๅบ“ๅๆ‰ง่กŒๆŽจ้€\n"
+"\n"
+"    git push <ๅ็งฐ>\n"
+
+#: builtin/push.c:628
 msgid "--all and --tags are incompatible"
 msgstr "--all ๅ’Œ --tags ไธๅ…ผๅฎน"
 
-#: builtin/push.c:609
+#: builtin/push.c:630
 msgid "--all can't be combined with refspecs"
 msgstr "--all ไธ่ƒฝๅ’Œๅผ•็”จ่ง„ๆ ผๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/push.c:613
+#: builtin/push.c:634
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror ๅ’Œ --tags ไธๅ…ผๅฎน"
 
-#: builtin/push.c:615
+#: builtin/push.c:636
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror ไธ่ƒฝๅ’Œๅผ•็”จ่ง„ๆ ผๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/push.c:618
+#: builtin/push.c:639
 msgid "--all and --mirror are incompatible"
 msgstr "--all ๅ’Œ --mirror ไธๅ…ผๅฎน"
 
-#: builtin/push.c:637
+#: builtin/push.c:643
 msgid "push options must not have new line characters"
 msgstr "ๆŽจ้€้€‰้กนไธ่ƒฝๆœ‰ๆข่กŒ็ฌฆ"
 
@@ -16716,24 +17709,32 @@ msgstr "git range-diff [<้€‰้กน>] <old-tip>...<new-tip>"
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<้€‰้กน>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr "ๅˆ›ๅปบๆƒ้‡็š„็™พๅˆ†ๆฏ”"
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "ไฝฟ็”จ็ฎ€ๅ•ๅทฎๅผ‚้ขœ่‰ฒ"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "ๆณจ่งฃ"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "ไผ ้€’็ป™ 'git log'"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr "ๆฒกๆœ‰ๅœจ่Œƒๅ›ดไธญไฝฟ็”จ ..๏ผš'%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "ๅ•ไธชๅ‚ๆ•ฐๆ ผๅผๅฟ…้กปๆ˜ฏๅฏน็งฐ่Œƒๅ›ด๏ผˆๅณๅŒ…ๅซ...๏ผ‰"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "้œ€่ฆไธคไธชๆไบค่Œƒๅ›ด"
 
@@ -16815,12 +17816,17 @@ msgstr "่ฐƒ่ฏ• unpack-trees"
 msgid "suppress feedback messages"
 msgstr "ๆŠ‘ๅˆถๅ้ฆˆไฟกๆฏ"
 
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "ๆ‚จ้œ€่ฆๅ…ˆ่งฃๅ†ณๅฝ“ๅ‰็ดขๅผ•็š„ๅ†ฒ็ช"
+
 #: builtin/rebase.c:32
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [้€‰้กน] [--exec <ๅ‘ฝไปค>] [--onto <ๆ–ฐๅŸบ็บฟ>] [<ไธŠๆธธ>] [<ๅˆ†ๆ”ฏ>]"
+"git rebase [-i] [options] [--exec <ๅ‘ฝไปค>] [--onto <ๆ–ฐๅŸบ็บฟ> | --keep-base] [<"
+"ไธŠๆธธ> [<ๅˆ†ๆ”ฏ>]]"
 
 #: builtin/rebase.c:34
 msgid ""
@@ -16832,216 +17838,207 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "ไธๅฏ็”จ็š„ๅพ…ๅŠžๅˆ—่กจ๏ผš'%s'"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "ไธ่ƒฝๅ†™ๅ…ฅ '%s'ใ€‚"
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "ๆฒกๆœ‰ HEAD๏ผŸ"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:292
 #, c-format
 msgid "could not create temporary %s"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบไธดๆ—ถ็š„ %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:298
 msgid "could not mark as interactive"
 msgstr "ๆ— ๆณ•ๆ ‡่ฎฐไธบไบคไบ’ๅผ"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:352
 msgid "could not generate todo list"
 msgstr "ๆ— ๆณ•็”Ÿๆˆๅพ…ๅŠžๅˆ—่กจ"
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:391
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "ไฝฟ็”จ --upstream ๆˆ– --onto ๅฟ…้กปๆไพ›ไธ€ไธชๅŸบ็บฟๆไบค"
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:461
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<้€‰้กน>]"
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "ไฟๆŒ็ฉบๆไบค"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "๏ผˆๅทฒๅผƒ็”จ๏ผ‰ไฟ็•™็ฉบๆไบค"
 
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "ๅ…่ฎธๆไบค่ฏดๆ˜Žไธบ็ฉบ"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:480
 msgid "rebase merge commits"
 msgstr "ๅฏนๅˆๅนถๆไบคๅ˜ๅŸบ"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:482
 msgid "keep original branch points of cousins"
 msgstr "ไฟๆŒๅ…„ๅผŸๆไบค็š„ๅŽŸๅง‹ๅˆ†ๆ”ฏ็‚น"
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:484
 msgid "move commits that begin with squash!/fixup!"
 msgstr "็งปๅŠจไปฅ squash!/fixup! ๅผ€ๅคด็š„ๆไบค"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:485
 msgid "sign commits"
 msgstr "็ญพๅๆไบค"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:487 builtin/rebase.c:1490
 msgid "display a diffstat of what changed upstream"
 msgstr "ๆ˜พ็คบไธŠๆธธๅ˜ๅŒ–็š„ๅทฎๅผ‚็ปŸ่ฎก"
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:489
 msgid "continue rebase"
 msgstr "็ปง็ปญๅ˜ๅŸบ"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:491
 msgid "skip commit"
 msgstr "่ทณ่ฟ‡ๆไบค"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:492
 msgid "edit the todo list"
 msgstr "ๅ˜ๅŸบๅพ…ๅŠžๅˆ—่กจ"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:494
 msgid "show the current patch"
 msgstr "ๆ˜พ็คบๅฝ“ๅ‰่กฅไธ"
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:497
 msgid "shorten commit ids in the todo list"
 msgstr "็ผฉ็Ÿญๅพ…ๅŠžๅˆ—่กจไธญ็š„ๆไบคๅท"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:499
 msgid "expand commit ids in the todo list"
 msgstr "ๆ‰ฉๅฑ•ๅพ…ๅŠžๅˆ—่กจไธญ็š„ๆไบคๅท"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:501
 msgid "check the todo list"
 msgstr "ๆฃ€ๆŸฅๅพ…ๅŠžๅˆ—่กจ"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:503
 msgid "rearrange fixup/squash lines"
 msgstr "้‡ๆ–ฐๆŽ’ๅˆ— fixup/squash ่กŒ"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:505
 msgid "insert exec commands in todo list"
 msgstr "ๅœจๅพ…ๅŠžๅˆ—่กจไธญๆ’ๅ…ฅ exec ๆ‰ง่กŒๅ‘ฝไปค"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:506
 msgid "onto"
 msgstr "onto"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict-revision"
 msgstr "restrict-revision"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:509
 msgid "restrict revision"
 msgstr "้™ๅˆถ็‰ˆๆœฌ"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:511
 msgid "squash-onto"
 msgstr "squash-onto"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:512
 msgid "squash onto"
 msgstr "squash onto"
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:514
 msgid "the upstream commit"
 msgstr "ไธŠๆธธๆไบค"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head-name"
 msgstr "head-name"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:516
 msgid "head name"
 msgstr "head ๅ็งฐ"
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:521
 msgid "rebase strategy"
 msgstr "ๅ˜ๅŸบ็ญ–็•ฅ"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:522
 msgid "strategy-opts"
 msgstr "strategy-opts"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:523
 msgid "strategy options"
 msgstr "็ญ–็•ฅ้€‰้กน"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:524
 msgid "switch-to"
 msgstr "ๅˆ‡ๆขๅˆฐ"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:525
 msgid "the branch or commit to checkout"
 msgstr "่ฆๆฃ€ๅ‡บ็š„ๅˆ†ๆ”ฏๆˆ–ๆไบค"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto-name"
 msgstr "onto-name"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:526
 msgid "onto name"
 msgstr "onto name"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "cmd"
 msgstr "cmd"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:527
 msgid "the command to run"
 msgstr "่ฆๆ‰ง่กŒ็š„ๅ‘ฝไปค"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:530 builtin/rebase.c:1584
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "่‡ชๅŠจ้‡ๆ–ฐๅฎ‰ๆŽ’ไปปไฝ•ๅคฑ่ดฅ็š„ `exec`"
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:546
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "ไธไฝฟ็”จ --rebase-merges๏ผŒๅˆ™ --[no-]rebase-cousins ๆฒกๆœ‰ๆ•ˆๆžœ"
 
-#: builtin/rebase.c:534
+#: builtin/rebase.c:562
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s ้œ€่ฆไบคไบ’ๅผๅ˜ๅŸบ"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:612
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "ๆ— ๆณ•่Žทๅ– 'onto'๏ผš'%s'"
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:627
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ๅŽŸๅง‹ head๏ผš'%s'"
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:652
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ๅฟฝ็•ฅๆ— ๆ•ˆ็š„ allow_rerere_autoupdate๏ผš'%s'"
 
-#: builtin/rebase.c:702
+#: builtin/rebase.c:728
 #, c-format
 msgid "Could not read '%s'"
 msgstr "ไธ่ƒฝ่ฏปๅ– '%s'"
 
-#: builtin/rebase.c:720
+#: builtin/rebase.c:746
 #, c-format
 msgid "Cannot store %s"
 msgstr "ไธ่ƒฝๅญ˜ๅ‚จ %s"
 
-#: builtin/rebase.c:827
+#: builtin/rebase.c:853
 msgid "could not determine HEAD revision"
 msgstr "ไธ่ƒฝ็กฎๅฎš HEAD ็‰ˆๆœฌ"
 
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17054,7 +18051,7 @@ msgstr ""
 "\"git rebase --skip\" ๅ‘ฝไปค่ทณ่ฟ‡่ฟ™ไธชๆไบคใ€‚ๅฆ‚ๆžœๆƒณ่ฆ็ปˆๆญขๆ‰ง่กŒๅนถๅ›žๅˆฐ\n"
 "\"git rebase\" ๆ‰ง่กŒไน‹ๅ‰็š„็Šถๆ€๏ผŒๆ‰ง่กŒ \"git rebase --abort\"ใ€‚"
 
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -17072,7 +18069,14 @@ msgstr ""
 "\n"
 "ๅ› ๆญค git ๆ— ๆณ•ๅฏนๅ…ถๅ˜ๅŸบใ€‚"
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr "ๆ— ๆณ•่ฏ†ๅˆซ็š„็ฉบ็ฑปๅž‹ '%s'๏ผ›ๆœ‰ๆ•ˆๅ€ผๆœ‰ \"drop\"ใ€\"keep\" ๅ’Œ \"ask\"ใ€‚"
+
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "%s\n"
@@ -17089,7 +18093,7 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1417
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17102,128 +18106,136 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1447
 msgid "exec commands cannot contain newlines"
 msgstr "exec ๅ‘ฝไปคไธ่ƒฝๅŒ…ๅซๆข่กŒ็ฌฆ"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1451
 msgid "empty exec command"
 msgstr "็ฉบ็š„ exec ๅ‘ฝไปค"
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1481
 msgid "rebase onto given branch instead of upstream"
 msgstr "ๅ˜ๅŸบๅˆฐ็ป™ๅฎš็š„ๅˆ†ๆ”ฏ่€Œ้žไธŠๆธธ"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "ไฝฟ็”จไธŠๆธธๅ’Œๅˆ†ๆ”ฏ็š„ๅˆๅนถๅŸบ็บฟๅšไธบๅฝ“ๅ‰ๅŸบ็บฟ"
+
+#: builtin/rebase.c:1485
 msgid "allow pre-rebase hook to run"
 msgstr "ๅ…่ฎธๆ‰ง่กŒ pre-rebase ้’ฉๅญ"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1487
 msgid "be quiet. implies --no-stat"
 msgstr "ๅฎ‰้™ใ€‚ๆš—็คบ --no-stat"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1493
 msgid "do not show diffstat of what changed upstream"
 msgstr "ไธๆ˜พ็คบไธŠๆธธๅ˜ๅŒ–็š„ๅทฎๅผ‚็ปŸ่ฎก"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1496
 msgid "add a Signed-off-by: line to each commit"
 msgstr "ไธบๆฏไธ€ไธชๆไบคๆทปๅŠ ไธ€ไธช Signed-off-by: ็ญพๅ"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
 msgid "passed to 'git am'"
-msgstr "ไผ ้€’็ป™ 'git am'"
+msgstr "ไผ ้€’็ป™ 'git am"
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
 msgid "passed to 'git apply'"
 msgstr "ไผ ้€’็ป™ 'git apply'"
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "ๆ‹ฃ้€‰ๆ‰€ๆœ‰ๆไบค๏ผŒๅณไฝฟๆœชไฟฎๆ”น"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1515
 msgid "continue"
 msgstr "็ปง็ปญ"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1518
 msgid "skip current patch and continue"
 msgstr "่ทณ่ฟ‡ๅฝ“ๅ‰่กฅไธๅนถ็ปง็ปญ"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1520
 msgid "abort and check out the original branch"
 msgstr "็ปˆๆญขๅนถๆฃ€ๅ‡บๅŽŸๆœ‰ๅˆ†ๆ”ฏ"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1523
 msgid "abort but keep HEAD where it is"
 msgstr "็ปˆๆญขไฝ†ไฟๆŒ HEAD ไธๅ˜"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1524
 msgid "edit the todo list during an interactive rebase"
 msgstr "ๅœจไบคไบ’ๅผๅ˜ๅŸบไธญ็ผ–่พ‘ๅพ…ๅŠžๅˆ—่กจ"
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1527
 msgid "show the patch file being applied or merged"
 msgstr "ๆ˜พ็คบๆญฃๅœจๅบ”็”จๆˆ–ๅˆๅนถ็š„่กฅไธๆ–‡ไปถ"
 
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "ไฝฟ็”จๅบ”็”จ็ญ–็•ฅ่ฟ›่กŒๅ˜ๅŸบ"
+
+#: builtin/rebase.c:1534
 msgid "use merging strategies to rebase"
 msgstr "ไฝฟ็”จๅˆๅนถ็ญ–็•ฅ่ฟ›่กŒๅ˜ๅŸบ"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1538
 msgid "let the user edit the list of commits to rebase"
 msgstr "่ฎฉ็”จๆˆท็ผ–่พ‘่ฆๅ˜ๅŸบ็š„ๆไบคๅˆ—่กจ"
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1542
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "๏ผˆๅทฒๅผƒ็”จ๏ผ‰ๅฐ่ฏ•้‡ๅปบๅˆๅนถๆไบค่€Œ้žๅฟฝ็•ฅๅฎƒไปฌ"
 
-#: builtin/rebase.c:1455
-msgid "preserve empty commits during rebase"
-msgstr "ๅ˜ๅŸบๆ—ถไฟ็•™็ฉบๆไบค"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "ๅฆ‚ไฝ•ๅค„็†ๆˆไธบ็ฉบๆไบค็š„ๆไบค"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1554
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "ๅœจ -i ไบคไบ’ๆจกๅผไธ‹๏ผŒ็งปๅŠจไปฅ squash!/fixup! ๅผ€ๅคด็š„ๆไบค"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1560
 msgid "automatically stash/stash pop before and after"
 msgstr "ๅœจๆ“ไฝœๅ‰ๅŽๆ‰ง่กŒ่‡ชๅŠจ่ดฎ่—ๅ’Œๅผนๅ‡บ่ดฎ่—"
 
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1562
 msgid "add exec lines after each commit of the editable list"
 msgstr "ๅฏ็ผ–่พ‘ๅˆ—่กจ็š„ๆฏไธ€ไธชๆไบคไธ‹้ขๅขžๅŠ ไธ€่กŒ exec"
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1566
 msgid "allow rebasing commits with empty messages"
 msgstr "ๅ…่ฎธ้’ˆๅฏน็ฉบๆไบค่ฏดๆ˜Ž็š„ๆไบคๅ˜ๅŸบ"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1570
 msgid "try to rebase merges instead of skipping them"
 msgstr "ๅฐ่ฏ•ๅฏนๅˆๅนถๆไบคๅ˜ๅŸบ่€Œไธๆ˜ฏๅฟฝ็•ฅๅฎƒไปฌ"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1573
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "ไฝฟ็”จ 'merge-base --fork-point' ๆฅไผ˜ๅŒ–ไธŠๆธธ"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1575
 msgid "use the given merge strategy"
 msgstr "ไฝฟ็”จ็ป™ๅฎš็š„ๅˆๅนถ็ญ–็•ฅ"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
 msgid "option"
 msgstr "้€‰้กน"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1578
 msgid "pass the argument through to the merge strategy"
 msgstr "ๅฐ†ๅ‚ๆ•ฐไผ ้€’็ป™ๅˆๅนถ็ญ–็•ฅ"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1581
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "ๅฐ†ๆ‰€ๆœ‰ๅฏ่พพ็š„ๆไบคๅ˜ๅŸบๅˆฐๆ นๆไบค"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1598
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -17231,28 +18243,36 @@ msgstr ""
 "ๅฏน rebase.useBuiltin ็š„ๆ”ฏๆŒๅทฒ่ขซๅˆ ้™ค๏ผ\n"
 "่ฏฆ่ง 'git help config' ไธญ็š„ๆก็›ฎใ€‚"
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1604
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "็œ‹่ตทๆฅ 'git-am' ๆญฃๅœจๆ‰ง่กŒไธญใ€‚ๆ— ๆณ•ๅ˜ๅŸบใ€‚"
 
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1645
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr "git rebase --preserve-merges ่ขซๅผƒ็”จใ€‚็”จ --rebase-merges ไปฃๆ›ฟใ€‚"
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "ไธ่ƒฝๅฐ† '--keep-base' ๅ’Œ '--onto' ็ป„ๅˆไฝฟ็”จ"
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "ไธ่ƒฝๅฐ† '--keep-base' ๅ’Œ '--root' ็ป„ๅˆไฝฟ็”จ"
+
+#: builtin/rebase.c:1656
 msgid "No rebase in progress?"
 msgstr "ๆฒกๆœ‰ๆญฃๅœจ่ฟ›่กŒ็š„ๅ˜ๅŸบ๏ผŸ"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1660
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "ๅŠจไฝœ --edit-todo ๅช่ƒฝ็”จๅœจไบคไบ’ๅผๅ˜ๅŸบ่ฟ‡็จ‹ไธญใ€‚"
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1683
 msgid "Cannot read HEAD"
 msgstr "ไธ่ƒฝ่ฏปๅ– HEAD"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1695
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17260,16 +18280,16 @@ msgstr ""
 "ๆ‚จๅฟ…้กป็ผ–่พ‘ๆ‰€ๆœ‰็š„ๅˆๅนถๅ†ฒ็ช๏ผŒ็„ถๅŽ้€š่ฟ‡ git add\n"
 "ๅ‘ฝไปคๅฐ†ๅฎƒไปฌๆ ‡่ฎฐไธบๅทฒ่งฃๅ†ณ"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1714
 msgid "could not discard worktree changes"
 msgstr "ๆ— ๆณ•ไธขๅผƒๅทฅไฝœๅŒบๅ˜ๆ›ด"
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1733
 #, c-format
 msgid "could not move back to %s"
 msgstr "ๆ— ๆณ•็งปๅ›ž %s"
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1778
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17288,172 +18308,164 @@ msgstr ""
 "\t%s\n"
 "็„ถๅŽๅ†้‡ๆ–ฐๆ‰ง่กŒใ€‚ ไธบ้ฟๅ…ไธขๅคฑ้‡่ฆๆ•ฐๆฎ๏ผŒๆˆ‘ๅทฒ็ปๅœๆญขๅฝ“ๅ‰ๆ“ไฝœใ€‚\n"
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1806
 msgid "switch `C' expects a numerical value"
 msgstr "ๅผ€ๅ…ณ `C' ๆœŸๆœ›ไธ€ไธชๆ•ฐๅญ—ๅ€ผ"
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1847
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "ๆœช็Ÿฅๆจกๅผ๏ผš%s"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1869
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy ้œ€่ฆ --merge ๆˆ– --interactive"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr "ไธ่ƒฝ็ป„ๅˆไฝฟ็”จๅบ”็”จ้€‰้กนๅ’Œๅˆๅนถ้€‰้กน"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "ๆœช็Ÿฅ็š„ๅ˜ๅŸบๅŽ็ซฏ๏ผš%s"
+
+#: builtin/rebase.c:1937
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec ้œ€่ฆ --exec ๆˆ– --interactive"
 
-#: builtin/rebase.c:1809
-msgid "cannot combine am options with either interactive or merge options"
-msgstr "ไธ่ƒฝๅฐ† am ้€‰้กนไธŽไบคไบ’ๆˆ–ๅˆๅนถ้€‰้กนๅŒๆ—ถไฝฟ็”จ"
-
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1957
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "ไธ่ƒฝๅฐ† '--preserve-merges' ๅ’Œ '--rebase-merges' ๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1961
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "้”™่ฏฏ๏ผšไธ่ƒฝๅฐ† '--preserve-merges' ๅ’Œ '--reschedule-failed-exec' ๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "ไธ่ƒฝๅฐ† '--rebase-merges' ๅ’Œ '--strategy-option' ๅŒๆ—ถไฝฟ็”จ"
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "ไธ่ƒฝๅฐ† '--rebase-merges' ๅ’Œ '--strategy' ๅŒๆ—ถไฝฟ็”จ"
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1985
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ไธŠๆธธ '%s'"
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1991
 msgid "Could not create new root commit"
 msgstr "ไธ่ƒฝๅˆ›ๅปบๆ–ฐ็š„ๆ นๆไบค"
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s'๏ผšๅช้œ€่ฆไธŽๅˆ†ๆ”ฏ็š„ไธ€ไธชๅˆๅนถๅŸบ็บฟ"
+
+#: builtin/rebase.c:2020
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s'๏ผšๅช้œ€่ฆไธ€ไธชๅˆๅนถๅŸบ็บฟ"
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:2028
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "ๆฒกๆœ‰ๆŒ‡ๅ‘ไธ€ไธชๆœ‰ๆ•ˆ็š„ๆไบค '%s'"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:2054
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "่‡ดๅ‘ฝ้”™่ฏฏ๏ผšๆ— ๆญคๅˆ†ๆ”ฏ/ๆไบค '%s'"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr "ๆฒกๆœ‰่ฟ™ๆ ท็š„ๅผ•็”จ๏ผš%s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:2073
 msgid "Could not resolve HEAD to a revision"
 msgstr "ๆ— ๆณ•ๅฐ† HEAD ่งฃๆžไธบไธ€ไธช็‰ˆๆœฌ"
 
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2111
 msgid "Cannot autostash"
 msgstr "ๆ— ๆณ• autostash"
 
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2114
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "ๆ„ๅค–็š„ stash ๅ“ๅบ”๏ผš'%s'"
 
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2120
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "ไธ่ƒฝไธบ '%s' ๅˆ›ๅปบ็›ฎๅฝ•"
 
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2123
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "ๅˆ›ๅปบไบ† autostash๏ผš%s\n"
 
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2126
 msgid "could not reset --hard"
 msgstr "ๆ— ๆณ• reset --hard"
 
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD ็ŽฐๅœจไฝไบŽ %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2135
 msgid "Please commit or stash them."
 msgstr "่ฏทๆไบคๆˆ–่ดฎ่—ไฟฎๆ”นใ€‚"
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr "ๆ— ๆณ•่งฃๆž '%s'"
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2169
 #, c-format
 msgid "could not switch to %s"
 msgstr "ๆ— ๆณ•ๅˆ‡ๆขๅˆฐ %s"
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2180
 msgid "HEAD is up to date."
 msgstr "HEAD ๆ˜ฏๆœ€ๆ–ฐ็š„ใ€‚"
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2182
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "ๅฝ“ๅ‰ๅˆ†ๆ”ฏ %s ๆ˜ฏๆœ€ๆ–ฐ็š„ใ€‚\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2190
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD ๆ˜ฏๆœ€ๆ–ฐ็š„๏ผŒๅผบๅˆถๅ˜ๅŸบใ€‚"
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2192
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "ๅฝ“ๅ‰ๅˆ†ๆ”ฏ %s ๆ˜ฏๆœ€ๆ–ฐ็š„๏ผŒๅผบๅˆถๅ˜ๅŸบใ€‚\n"
 
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2200
 msgid "The pre-rebase hook refused to rebase."
 msgstr "pre-rebase ้’ฉๅญๆ‹’็ปไบ†ๅ˜ๅŸบๆ“ไฝœใ€‚"
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2207
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "ๅˆฐ %s ็š„ๅ˜ๆ›ด๏ผš\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2210
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "ไปŽ %s ๅˆฐ %s ็š„ๅ˜ๆ›ด๏ผš\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2235
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr "้ฆ–ๅ…ˆ๏ผŒๅ›ž้€€ๅคดๆŒ‡้’ˆไปฅไพฟๅœจๅ…ถไธŠ้‡ๆ”พๆ‚จ็š„ๅทฅไฝœ...\n"
 
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2244
 msgid "Could not detach HEAD"
 msgstr "ๆ— ๆณ•ๅˆ†็ฆปๅคดๆŒ‡้’ˆ"
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2253
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "ๅฟซ่ฟ› %s ๅˆฐ %sใ€‚\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <ไป“ๅบ“็›ฎๅฝ•>"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:821
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -17479,7 +18491,7 @@ msgstr ""
 "่‹ฅ่ฆๅฑ่”ฝๆญคไฟกๆฏไธ”ไฟๆŒ้ป˜่ฎค่กŒไธบ๏ผŒ่ฎพ็ฝฎ 'receive.denyCurrentBranch'\n"
 "้…็ฝฎๅ˜้‡ไธบ 'refuse'ใ€‚"
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -17528,49 +18540,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <ๅผ•็”จ>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๆ—ถ้—ดๆˆณ"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "ๆญฃๅœจๆ ‡่ฎฐๅฏ่พพๅฏน่ฑก..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s ๆŒ‡ๅ‘ไธๅญ˜ๅœจ๏ผ"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr "ๆœชๆŒ‡ๅฎš่ฆๅˆ ้™ค็š„ๅผ•็”จๆ—ฅๅฟ—"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr "ไธๆ˜ฏไธ€ไธชๅผ•็”จๆ—ฅๅฟ—๏ผš%s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "ๆฒกๆœ‰ '%s' ็š„ๅผ•็”จๆ—ฅๅฟ—"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "ๆ— ๆ•ˆ็š„ๅผ•็”จๆ ผๅผ๏ผš%s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -17578,81 +18590,81 @@ msgstr ""
 "git remote add [-t <ๅˆ†ๆ”ฏ>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <ๅ็งฐ> <ๅœฐๅ€>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <ๆ—งๅ็งฐ> <ๆ–ฐๅ็งฐ>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <ๅ็งฐ>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <ๅ็งฐ> (-a | --auto | -d | --delete | <ๅˆ†ๆ”ฏ>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <ๅ็งฐ>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <ๅ็งฐ>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<็ป„> | <่ฟœ็จ‹>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <ๅ็งฐ> <ๅˆ†ๆ”ฏ>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <ๅ็งฐ>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <ๅ็งฐ> <ๆ–ฐ็š„ๅœฐๅ€> [<ๆ—ง็š„ๅœฐๅ€>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <ๅ็งฐ> <ๆ–ฐ็š„ๅœฐๅ€>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <ๅ็งฐ> <ๅœฐๅ€>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<้€‰้กน>] <ๅ็งฐ> <ๅœฐๅ€>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <ๅ็งฐ> <ๅˆ†ๆ”ฏ>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <ๅ็งฐ> <ๅˆ†ๆ”ฏ>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<้€‰้กน>] <ๅ็งฐ>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<้€‰้กน>] <ๅ็งฐ>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<้€‰้กน>] [<็ป„> | <่ฟœ็จ‹>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "ๆ›ดๆ–ฐ %s ไธญ"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -17660,82 +18672,98 @@ msgstr ""
 "--mirror ้€‰้กนๅฑ้™ฉไธ”่ฟ‡ๆ—ถ๏ผŒ่ฏทไฝฟ็”จ --mirror=fetch\n"
 "\t ๆˆ– --mirror=push"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "ๆœช็Ÿฅ็š„้•œๅƒๅ‚ๆ•ฐ๏ผš%s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "ๆŠ“ๅ–่ฟœ็จ‹็š„ๅˆ†ๆ”ฏ"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "ๆŠ“ๅ–ๆ—ถๅฏผๅ…ฅๆ‰€ๆœ‰็š„ๆ ‡็ญพๅ’Œๅ…ณ่”ๅฏน่ฑก"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "ๆˆ–ไธๆŠ“ๅ–ไปปไฝ•ๆ ‡็ญพ๏ผˆ--no-tags๏ผ‰"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "่ทŸ่ธช็š„ๅˆ†ๆ”ฏ"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "ไธป็บฟๅˆ†ๆ”ฏ"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "ๆŠŠ่ฟœ็จ‹่ฎพ็ฝฎไธบ็”จไปฅๆŽจ้€ๆˆ–ๆŠ“ๅ–็š„้•œๅƒ"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "ๆŒ‡ๅฎšไธ€ไธช master ๅˆ†ๆ”ฏๅนถไฝฟ็”จ --mirror ้€‰้กนๆฒกๆœ‰ๆ„ไน‰"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "ๆŒ‡ๅฎš่ฆ่ทŸ่ธช็š„ๅˆ†ๆ”ฏๅชๅœจไธŽ่Žทๅ–้•œๅƒๅŒๆ—ถไฝฟ็”จๆ‰ๆœ‰ๆ„ไน‰"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr "่ฟœ็จ‹ %s ๅทฒ็ปๅญ˜ๅœจใ€‚"
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„่ฟœ็จ‹ๅ็งฐ"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "ๆ— ๆณ•่ฎพ็ฝฎ master '%s'"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "ๆ— ๆณ•ๅพ—ๅˆฐๅผ•็”จ่ง„ๆ ผ %s ็š„่Žทๅ–ๅˆ—่กจ"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "๏ผˆๅŒน้…๏ผ‰"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "๏ผˆๅˆ ้™ค๏ผ‰"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "ไธ่ƒฝ่ฎพ็ฝฎ '%s'"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"้…็ฝฎ๏ผˆ%s๏ผ‰remote.pushDefault ไฝไบŽ๏ผš\n"
+"\t%s:%d\n"
+"็Žฐๅœจๅœจไธบไธๅญ˜ๅœจ็š„่ฟœ็จ‹ๅ '%s' ๅ‘ฝๅ"
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "ๆฒกๆœ‰ๆญค่ฟœ็จ‹ไป“ๅบ“๏ผš'%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "ไธ่ƒฝ้‡ๅ‘ฝๅ้…็ฝฎๅฐ่Š‚ '%s' ๅˆฐ '%s'"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -17746,17 +18774,17 @@ msgstr ""
 "\t%s\n"
 "\tๅฆ‚ๆžœๅฟ…่ฆ่ฏทๆ‰‹ๅŠจๆ›ดๆ–ฐ้…็ฝฎใ€‚"
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "ๅˆ ้™ค '%s' ๅคฑ่ดฅ"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr "ๅˆ›ๅปบ '%s' ๅคฑ่ดฅ"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -17766,118 +18794,118 @@ msgid_plural ""
 msgstr[0] "ๆณจๆ„๏ผšref/remotes ๅฑ‚็บงไน‹ๅค–็š„ไธ€ไธชๅˆ†ๆ”ฏๆœช่ขซ็งป้™คใ€‚่ฆๅˆ ้™คๅฎƒ๏ผŒไฝฟ็”จ๏ผš"
 msgstr[1] "ๆณจๆ„๏ผšref/remotes ๅฑ‚็บงไน‹ๅค–็š„ไธ€ไบ›ๅˆ†ๆ”ฏๆœช่ขซ็งป้™คใ€‚่ฆๅˆ ้™คๅฎƒไปฌ๏ผŒไฝฟ็”จ๏ผš"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "ไธ่ƒฝ็งป้™ค้…็ฝฎๅฐ่Š‚ '%s'"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " ๆ–ฐ็š„๏ผˆไธ‹ไธ€ๆฌก่Žทๅ–ๅฐ†ๅญ˜ๅ‚จไบŽ remotes/%s๏ผ‰"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr " ๅทฒ่ทŸ่ธช"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " ่ฟ‡ๆ—ถ๏ผˆไฝฟ็”จ 'git remote prune' ๆฅ็งป้™ค๏ผ‰"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "ๆ— ๆ•ˆ็š„ branch.%s.merge๏ผŒไธ่ƒฝๅ˜ๅŸบๅˆฐไธ€ไธชไปฅไธŠ็š„ๅˆ†ๆ”ฏ"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "ไบคไบ’ๅผๅ˜ๅŸบๅˆฐ่ฟœ็จ‹ %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1052
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "ไบคไบ’ๅผๅ˜ๅŸบ๏ผˆๅซๅˆๅนถๆไบค๏ผ‰ๅˆฐ่ฟœ็จ‹ %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "ๅ˜ๅŸบๅˆฐ่ฟœ็จ‹ %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr " ไธŽ่ฟœ็จ‹ %s ๅˆๅนถ"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr "ไธŽ่ฟœ็จ‹ %s ๅˆๅนถ"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    ไปฅๅŠๅ’Œ่ฟœ็จ‹ %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr "ๅˆ›ๅปบ"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr "ๅˆ ้™ค"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr "ๆœ€ๆ–ฐ"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr "ๅฏๅฟซ่ฟ›"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr "ๆœฌๅœฐๅทฒ่ฟ‡ๆ—ถ"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s ๅผบๅˆถๆŽจ้€่‡ณ %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s ๆŽจ้€่‡ณ %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s ๅผบๅˆถๆŽจ้€่‡ณ %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s ๆŽจ้€่‡ณ %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr "ไธๆŸฅ่ฏข่ฟœ็จ‹"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr "* ่ฟœ็จ‹ %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  ่Žทๅ–ๅœฐๅ€๏ผš%s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr "(ๆ—  URL)"
 
@@ -17885,32 +18913,32 @@ msgstr "(ๆ—  URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  ๆŽจ้€ๅœฐๅ€๏ผš%s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD ๅˆ†ๆ”ฏ๏ผš%s"
 
 #  ่ฏ‘่€…๏ผšไธญๆ–‡ๅญ—็ฌฆไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆ ้™คๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr "๏ผˆๆœชๆŸฅ่ฏข๏ผ‰"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr "๏ผˆๆœช็Ÿฅ๏ผ‰"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD ๅˆ†ๆ”ฏ๏ผˆ่ฟœ็จ‹ HEAD ๆจก็ณŠ๏ผŒๅฏ่ƒฝๆ˜ฏไธ‹ๅˆ—ไธญ็š„ไธ€ไธช๏ผ‰๏ผš\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -17918,164 +18946,155 @@ msgstr[0] "  ่ฟœ็จ‹ๅˆ†ๆ”ฏ๏ผš%s"
 msgstr[1] "  ่ฟœ็จ‹ๅˆ†ๆ”ฏ๏ผš%s"
 
 #  ่ฏ‘่€…๏ผšไธญๆ–‡ๅญ—็ฌฆไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆ ้™คๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr "๏ผˆ็Šถๆ€ๆœชๆŸฅ่ฏข๏ผ‰"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  ไธบ 'git pull' ้…็ฝฎ็š„ๆœฌๅœฐๅˆ†ๆ”ฏ๏ผš"
 msgstr[1] "  ไธบ 'git pull' ้…็ฝฎ็š„ๆœฌๅœฐๅˆ†ๆ”ฏ๏ผš"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  ๆœฌๅœฐๅผ•็”จๅฐ†ๅœจ 'git push' ๆ—ถ่ขซ้•œๅƒ"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  ไธบ 'git push' ้…็ฝฎ็š„ๆœฌๅœฐๅผ•็”จ%s๏ผš"
 msgstr[1] "  ไธบ 'git push' ้…็ฝฎ็š„ๆœฌๅœฐๅผ•็”จ%s๏ผš"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "ๆ นๆฎ่ฟœ็จ‹่ฎพ็ฝฎ refs/remotes/<ๅ็งฐ>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "ๅˆ ้™ค refs/remotes/<ๅ็งฐ>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr "ๆ— ๆณ•็กฎๅฎš่ฟœ็จ‹ HEAD"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "ๅคšไธช่ฟœ็จ‹ HEAD ๅˆ†ๆ”ฏใ€‚่ฏทๆ˜Ž็กฎๅœฐ้€‰ๆ‹ฉไธ€ไธช็”จๅ‘ฝไปค๏ผš"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr "ๆ— ๆณ•ๅˆ ้™ค %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆๅผ•็”จ๏ผš%s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr "ไธ่ƒฝ่ฎพ็ฝฎ %s"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s ๅฐ†ๆˆไธบๆ‚ฌ็ฉบ็Šถๆ€๏ผ"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s ๅทฒๆˆไธบๆ‚ฌ็ฉบ็Šถๆ€๏ผ"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr "ไฟฎๅ‰ช %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr "URL๏ผš%s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [ๅฐ†ๅˆ ้™ค] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [ๅทฒๅˆ ้™ค] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr "ๆŠ“ๅ–ๅŽๆธ…้™ค่ฟœ็จ‹"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr "ๆฒกๆœ‰ๆญค่ฟœ็จ‹ '%s'"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr "ๆทปๅŠ ๅˆ†ๆ”ฏ"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr "ๆœชๆŒ‡ๅฎš่ฟœ็จ‹"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr "ๆŸฅ่ฏขๆŽจ้€ URL ๅœฐๅ€๏ผŒ่€Œ้ž่Žทๅ– URL ๅœฐๅ€"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr "่ฟ”ๅ›žๆ‰€ๆœ‰ URL ๅœฐๅ€"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "ๆฒกๆœ‰็ป™่ฟœ็จ‹ไป“ๅบ“ '%s' ่ฎพๅฎš URL"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr "ๆ“ไฝœๆŽจ้€ URLS"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr "ๆทปๅŠ  URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr "ๅˆ ้™ค URLS"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete ๆ— ๆ„ไน‰"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "ๆ— ๆ•ˆ็š„ๆ—ง URL ๅŒน้…ๆจก็‰ˆ๏ผš%s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr "ๆœชๆ‰พๅˆฐๆญค URL๏ผš%s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr "ๅฐ†ไธไผšๅˆ ้™คๆ‰€ๆœ‰้žๆŽจ้€ URL ๅœฐๅ€"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ๅ†—้•ฟ่พ“ๅ‡บ๏ผ›ๅฟ…้กป็ฝฎไบŽๅญๅ‘ฝไปคไน‹ๅ‰"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "ๆœช็Ÿฅๅญๅ‘ฝไปค๏ผš%s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid "git repack [<options>]"
 msgstr "git repack [<้€‰้กน>]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:28
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18083,111 +19102,111 @@ msgstr ""
 "ๅขž้‡ repack ๅ’Œ bitmap ็ดขๅผ•ไธๅ…ผๅฎนใ€‚  ไฝฟ็”จ --no-write-bitmap-index\n"
 "ๆˆ–็ฆ็”จ pack.writebitmaps ้…็ฝฎใ€‚"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:191
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "ๆ— ๆณ•ๅผ€ๅง‹ pack-objects ๆฅ้‡ๆ–ฐๆ‰“ๅŒ… promisor ๅฏน่ฑก"
 
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:416
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr "repack๏ผšๆœŸๆœ›ๆฅ่‡ช pack-objects ็š„ๅฎŒๆ•ดๅๅ…ญ่ฟ›ๅˆถๅฏน่ฑก IDใ€‚"
 
-#: builtin/repack.c:246
+#: builtin/repack.c:254
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "ๆ— ๆณ•ๅฎŒๆˆ pack-objects ๆฅ้‡ๆ–ฐๆ‰“ๅŒ… promisor ๅฏน่ฑก"
 
-#: builtin/repack.c:284
+#: builtin/repack.c:292
 msgid "pack everything in a single pack"
 msgstr "ๆ‰€ๆœ‰ๅ†…ๅฎนๆ‰“ๅŒ…ๅˆฐไธ€ไธชๅŒ…ๆ–‡ไปถไธญ"
 
-#: builtin/repack.c:286
+#: builtin/repack.c:294
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "ๅ’Œ -a ็›ธๅŒ๏ผŒๅนถๅฐ†ไธๅฏ่พพ็š„ๅฏน่ฑก่ฎพไธบๆพๆ•ฃๅฏน่ฑก"
 
-#: builtin/repack.c:289
+#: builtin/repack.c:297
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "ๅˆ ้™คๅคšไฝ™็š„ๅŒ…๏ผŒ่ฟ่กŒ git-prune-packed"
 
-#: builtin/repack.c:291
+#: builtin/repack.c:299
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "ๅ‘ git-pack-objects ไผ ้€’ๅ‚ๆ•ฐ --no-reuse-delta"
 
-#: builtin/repack.c:293
+#: builtin/repack.c:301
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "ๅ‘ git-pack-objects ไผ ้€’ๅ‚ๆ•ฐ --no-reuse-object"
 
-#: builtin/repack.c:295
+#: builtin/repack.c:303
 msgid "do not run git-update-server-info"
 msgstr "ไธ่ฟ่กŒ git-update-server-info"
 
-#: builtin/repack.c:298
+#: builtin/repack.c:306
 msgid "pass --local to git-pack-objects"
 msgstr "ๅ‘ git-pack-objects ไผ ้€’ๅ‚ๆ•ฐ --local"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:308
 msgid "write bitmap index"
 msgstr "ๅ†™ bitmap ็ดขๅผ•"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:310
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "ๅ‘ git-pack-objects ไผ ้€’ๅ‚ๆ•ฐ --delta-islands"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:311
 msgid "approxidate"
 msgstr "่ฟ‘ไผผๆ—ฅๆœŸ"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:312
 msgid "with -A, do not loosen objects older than this"
 msgstr "ไฝฟ็”จ -A๏ผŒไธ่ฆๅฐ†ๆ—ฉไบŽ็ป™ๅฎšๆ—ถ้—ด็š„ๅฏน่ฑก่ฟ‡ๆœŸ"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:314
 msgid "with -a, repack unreachable objects"
 msgstr "ไฝฟ็”จ -a ๏ผŒ้‡ๆ–ฐๅฏนไธๅฏ่พพๅฏน่ฑกๆ‰“ๅŒ…"
 
-#: builtin/repack.c:308
+#: builtin/repack.c:316
 msgid "size of the window used for delta compression"
 msgstr "็”จไบŽๅขž้‡ๅŽ‹็ผฉ็š„็ช—ๅฃๅ€ผ"
 
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:317 builtin/repack.c:323
 msgid "bytes"
 msgstr "ๅญ—่Š‚"
 
-#: builtin/repack.c:310
+#: builtin/repack.c:318
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "ๅ’ŒไธŠ้ข็š„็›ธไผผ๏ผŒไฝ†้™ๅˆถๅ†…ๅญ˜ๅคงๅฐ่€Œ้žๆก็›ฎๆ•ฐ"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:320
 msgid "limits the maximum delta depth"
 msgstr "้™ๅˆถๆœ€ๅคงๅขž้‡ๆทฑๅบฆ"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:322
 msgid "limits the maximum number of threads"
 msgstr "้™ๅˆถๆœ€ๅคง็บฟ็จ‹ๆ•ฐ"
 
-#: builtin/repack.c:316
+#: builtin/repack.c:324
 msgid "maximum size of each packfile"
 msgstr "ๆฏไธชๅŒ…ๆ–‡ไปถ็š„ๆœ€ๅคงๅฐบๅฏธ"
 
-#: builtin/repack.c:318
+#: builtin/repack.c:326
 msgid "repack objects in packs marked with .keep"
 msgstr "ๅฏนๆ ‡่ฎฐไธบ .keep ็š„ๅŒ…ไธญ็š„ๅฏน่ฑก้‡ๆ–ฐๆ‰“ๅŒ…"
 
-#: builtin/repack.c:320
+#: builtin/repack.c:328
 msgid "do not repack this pack"
 msgstr "ไธ่ฆๅฏน่ฏฅๅŒ…ๆ–‡ไปถ้‡ๆ–ฐๆ‰“ๅŒ…"
 
-#: builtin/repack.c:330
+#: builtin/repack.c:338
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "ไธ่ƒฝๅˆ ้™ค็ๅ“ไป“ๅบ“ไธญ็š„ๆ‰“ๅŒ…ๆ–‡ไปถ"
 
-#: builtin/repack.c:334
+#: builtin/repack.c:342
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable ๅ’Œ -A ไธๅ…ผๅฎน"
 
-#: builtin/repack.c:417
+#: builtin/repack.c:425
 msgid "Nothing new to pack."
 msgstr "ๆฒกๆœ‰ๆ–ฐ็š„่ฆๆ‰“ๅŒ…ใ€‚"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -18203,7 +19222,7 @@ msgstr ""
 "่ญฆๅ‘Š๏ผšๅนถไธ”ๅฐ่ฏ•้‡ๅ‘ฝๅๆ”นๅ›žๅŽŸๆœ‰ๆ–‡ไปถๅ็š„ๆ“ไฝœไนŸๅคฑ่ดฅใ€‚\n"
 "่ญฆๅ‘Š๏ผš่ฏทๆ‰‹ๅŠจๅฐ† %s ไธ‹็š„่ฟ™ไบ›ๆ–‡ไปถ้‡ๅ‘ฝๅ๏ผš\n"
 
-#: builtin/repack.c:526
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "ๅˆ ้™ค '%s' ๅคฑ่ดฅ"
@@ -18311,8 +19330,8 @@ msgstr "ๆ— ๆณ•ๅฏน %s ๆ‰ง่กŒ fstat"
 msgid "unable to write object to database"
 msgstr "ๆ— ๆณ•ๅ‘ๆ•ฐๆฎๅบ“ๅ†™ๅ…ฅๅฏน่ฑก"
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๅฏน่ฑกๅ๏ผš'%s'"
@@ -18331,53 +19350,53 @@ msgstr "็ผ–่พ‘ๅฏน่ฑกๆ–‡ไปถๅคฑ่ดฅ"
 msgid "new object is the same as the old one: '%s'"
 msgstr "ๆ–ฐๅฏน่ฑกๅ’Œๆ—งๅฏน่ฑก็›ธๅŒ๏ผš'%s'"
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "ๆ— ๆณ•ๅฐ† %s ่งฃๆžไธบไธ€ไธชๆไบค"
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "ๆไบค '%s' ไธญๅซๆœ‰ๆŸๅ็š„ๅˆๅนถๆ ‡็ญพ"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "ๆไบค '%s' ไธญๅซๆœ‰ๆ ผๅผ้”™่ฏฏ็š„ๅˆๅนถๆ ‡็ญพ"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr "ๅŽŸๅง‹ๆไบค '%s' ๅŒ…ๅซๅทฒ็ปไธขๅผƒ็š„ๅˆๅนถๆ ‡็ญพ '%s'๏ผŒไฝฟ็”จ --edit ไปฃๆ›ฟ --graft"
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "ๅŽŸๅง‹ๆไบค '%s' ไธญๆœ‰ไธ€ไธช gpg ็ญพๅ"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "ๅœจๆ›ฟๆข็š„ๆไบคไธญ็ญพๅๅฐ†่ขซ็งป้™ค๏ผ"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "ไธ่ƒฝไธบ '%s' ๅ†™ๆ›ฟๆขๆไบค"
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "ๅฏน '%s' ็งปๆคๆฒกๆœ‰ๅฟ…่ฆ"
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "ๆ–ฐๆไบคๅ’Œๆ—ง็š„ไธ€ๆ ท๏ผš'%s'"
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18386,71 +19405,71 @@ msgstr ""
 "ไธ่ƒฝ่ฝฌๆขไธ‹ๅˆ—็งปๆค๏ผš\n"
 "%s"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "ๅˆ—ๅ‡บๆ›ฟๆข็š„ๅผ•็”จ"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "ๅˆ ้™คๆ›ฟๆข็š„ๅผ•็”จ"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "็ผ–่พ‘็Žฐๅญ˜็š„ๅฏน่ฑก"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "ไฟฎๆ”นไธ€ไธชๆไบค็š„็ˆถๆไบค"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "่ฝฌๆข็Žฐๅญ˜็š„็งปๆคๆ–‡ไปถ"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "ๅฆ‚ๆžœๅญ˜ๅœจๅˆ™ๆ›ฟๆขๅผ•็”จ"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "ไธ่ฆไธบ --edit ๆ“ไฝœ็พŽ่ง‚ๆ˜พ็คบๅ†…ๅฎน"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "ไฝฟ็”จๆญคๆ ผๅผ"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "ไธๅˆ—ๅ‡บๆ—ถไธ่ƒฝไฝฟ็”จ --format"
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "ๅชๆœ‰ๅ†™ไธ€ไธชๆ›ฟๆขๆ—ถ -f ๆ‰ๆœ‰ๆ„ไน‰"
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw ๅชๆœ‰ๅ’Œ --edit ๅ…ฑ็”จๆ‰ๆœ‰ๆ„ไน‰"
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d ้œ€่ฆ่‡ณๅฐ‘ไธ€ไธชๅ‚ๆ•ฐ"
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "้”™่ฏฏ็š„ๅ‚ๆ•ฐไธชๆ•ฐ"
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e ้œ€่ฆไธ”ไป…้œ€่ฆไธ€ไธชๅ‚ๆ•ฐ"
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g ้œ€่ฆ่‡ณๅฐ‘ไธ€ไธชๅ‚ๆ•ฐ"
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file ไธๅธฆๅ‚ๆ•ฐ"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "ๅช่ƒฝไธบ -l ๆไพ›ไธ€ไธชๆจกๅผ"
 
@@ -18477,116 +19496,126 @@ msgid ""
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<ๆไบค>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<ๆ ‘ๆˆ–ๆไบค>] [--] <่ทฏๅพ„>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<ๆ ‘ๅฏน่ฑก>] [--] <่ทฏๅพ„่กจ่พพๅผ>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<ๆ ‘ๆˆ–ๆไบค>] [--] [<่ทฏๅพ„>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<ๆ ‘ๅฏน่ฑก>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<ๆ ‘ๅฏน่ฑก>] [--] [<่ทฏๅพ„่กจ่พพๅผ>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "ๆททๆ‚"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "่ฝฏๆ€ง"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "็กฌๆ€ง"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "ๅˆๅนถ"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "ไฟๆŒ"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:82
 msgid "You do not have a valid HEAD."
 msgstr "ๆ‚จๆฒกๆœ‰ไธ€ไธชๆœ‰ๆ•ˆ็š„ HEADใ€‚"
 
-#: builtin/reset.c:83
+#: builtin/reset.c:84
 msgid "Failed to find tree of HEAD."
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐ HEAD ๆŒ‡ๅ‘็š„ๆ ‘ใ€‚"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐ %s ๆŒ‡ๅ‘็š„ๆ ‘ใ€‚"
 
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ็ŽฐๅœจไฝไบŽ %s"
+
 #  ่ฏ‘่€…๏ผšๆฑ‰ๅญ—ไน‹้—ดๆ— ็ฉบๆ ผ๏ผŒๆ•…ๅˆ ้™ค%sๅ‰ๅŽ็ฉบๆ ผ
-#: builtin/reset.c:193
+#: builtin/reset.c:194
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "ๅœจๅˆๅนถ่ฟ‡็จ‹ไธญไธ่ƒฝๅš%s้‡็ฝฎๆ“ไฝœใ€‚"
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "ๅฎ‰้™ๆจกๅผ๏ผŒๅชๆŠฅๅ‘Š้”™่ฏฏ"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:296
 msgid "reset HEAD and index"
 msgstr "้‡็ฝฎ HEAD ๅ’Œ็ดขๅผ•"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:297
 msgid "reset only HEAD"
 msgstr "ๅช้‡็ฝฎ HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:299 builtin/reset.c:301
 msgid "reset HEAD, index and working tree"
 msgstr "้‡็ฝฎ HEADใ€็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบ"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:303
 msgid "reset HEAD but keep local changes"
 msgstr "้‡็ฝฎ HEAD ไฝ†ไฟๅญ˜ๆœฌๅœฐๅ˜ๆ›ด"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:309
 msgid "record only the fact that removed paths will be added later"
 msgstr "ๅฐ†ๅˆ ้™ค็š„่ทฏๅพ„ๆ ‡่ฎฐไธบ็จๅŽๆทปๅŠ "
 
-#: builtin/reset.c:326
+#: builtin/reset.c:343
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "ๆ— ๆณ•ๅฐ† '%s' ่งฃๆžไธบไธ€ไธชๆœ‰ๆ•ˆ็š„็‰ˆๆœฌใ€‚"
 
-#: builtin/reset.c:334
+#: builtin/reset.c:351
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "ๆ— ๆณ•ๅฐ† '%s' ่งฃๆžไธบไธ€ไธชๆœ‰ๆ•ˆ็š„ๆ ‘ๅฏน่ฑกใ€‚"
 
-#: builtin/reset.c:343
+#: builtin/reset.c:360
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch ไธŽ --{hardใ€mixedใ€soft} ้€‰้กนไธๅ…ผๅฎน"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:370
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed ๅธฆ่ทฏๅพ„ๅทฒๅผƒ็”จ๏ผŒ่€Œๆ˜ฏ็”จ 'git reset -- <่ทฏๅพ„>'ใ€‚"
 
 #  ่ฏ‘่€…๏ผšๆฑ‰ๅญ—ไน‹้—ดๆ— ็ฉบๆ ผ๏ผŒๆ•…ๅˆ ้™ค%sๅ‰ๅŽ็ฉบๆ ผ
-#: builtin/reset.c:355
+#: builtin/reset.c:372
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "ไธ่ƒฝๅธฆ่ทฏๅพ„่ฟ›่กŒ%s้‡็ฝฎใ€‚"
 
 #  ่ฏ‘่€…๏ผšๆฑ‰ๅญ—ไน‹้—ดๆ— ็ฉบๆ ผ๏ผŒๆ•…ๅˆ ้™ค%sๅ‰ๅŽ็ฉบๆ ผ
-#: builtin/reset.c:370
+#: builtin/reset.c:387
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "ไธ่ƒฝๅฏน็บฏไป“ๅบ“่ฟ›่กŒ%s้‡็ฝฎ"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:391
 msgid "-N can only be used with --mixed"
 msgstr "-N ๅช่ƒฝๅ’Œ --mixed ๅŒๆ—ถไฝฟ็”จ"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:412
 msgid "Unstaged changes after reset:"
 msgstr "้‡็ฝฎๅŽๅ–ๆถˆๆš‚ๅญ˜็š„ๅ˜ๆ›ด๏ผš"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:415
 #, c-format
 msgid ""
 "\n"
@@ -18598,35 +19627,30 @@ msgstr ""
 "้‡็ฝฎๅŽ๏ผŒๆžšไธพๆœชๆš‚ๅญ˜ๅ˜ๆ›ด่Šฑ่ดนไบ† %.2f ็ง’ใ€‚ ๆ‚จๅฏไปฅไฝฟ็”จ '--quiet' ้ฟๅ…ๆญคๆƒ…ๅ†ตใ€‚\n"
 "ๅฐ†้…็ฝฎๅ˜้‡ reset.quiet ่ฎพ็ฝฎไธบ true ๅฏไฝฟๅ…ถๆˆไธบ้ป˜่ฎคๅ€ผใ€‚\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:425
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "ไธ่ƒฝ้‡็ฝฎ็ดขๅผ•ๆ–‡ไปถ่‡ณ็‰ˆๆœฌ '%s'ใ€‚"
 
-#: builtin/reset.c:412
+#: builtin/reset.c:429
 msgid "Could not write new index file."
 msgstr "ไธ่ƒฝๅ†™ๅ…ฅๆ–ฐ็š„็ดขๅผ•ๆ–‡ไปถใ€‚"
 
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "ไธ่ƒฝๅŒๆ—ถไฝฟ็”จ --exclude-promisor-objects ๅ’Œ --missing ้€‰้กน"
 
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "ๅฏน่ฑก่ฟ‡ๆปค้œ€่ฆ --objects"
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "ๆ— ๆ•ˆ็š„็จ€็–ๅ€ผ '%s'"
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list ไธๆ”ฏๆŒๆ˜พ็คบๆณจ่งฃ"
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "ไธ่ƒฝๅฐ† --use-bitmap-index ๅ’Œๅฏน่ฑก่ฟ‡ๆปค็ป„ๅˆไฝฟ็”จ"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "ๆ ‡่ฎฐ่ฎกๆ•ฐๅ’Œ --objects ไธๅ…ผๅฎน"
 
 #: builtin/rev-parse.c:408
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -18786,36 +19810,40 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "ๅฆ‚ไธ‹ๆ–‡ไปถๆœ‰ๆœฌๅœฐไฟฎๆ”น๏ผš"
 msgstr[1] "ๅฆ‚ไธ‹ๆ–‡ไปถๆœ‰ๆœฌๅœฐไฟฎๆ”น๏ผš"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "ไธๅˆ—ๅ‡บๅˆ ้™ค็š„ๆ–‡ไปถ"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "ๅชไปŽ็ดขๅผ•ๅŒบๅˆ ้™ค"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "ๅฟฝ็•ฅๆ–‡ไปถๆ›ดๆ–ฐ็Šถๆ€ๆฃ€ๆŸฅ"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "ๅ…่ฎธ้€’ๅฝ’ๅˆ ้™ค"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "ๅณไฝฟๆฒกๆœ‰ๅŒน้…๏ผŒไนŸไปฅ้›ถ็Šถๆ€้€€ๅ‡บ"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "ๆฒกๆœ‰ๆไพ›่ทฏๅพ„่ง„ๆ ผใ€‚ๆˆ‘ๅบ”่ฏฅๅˆ ้™คๅ“ชไบ›ๆ–‡ไปถ๏ผŸ"
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr "่ฏทๅฐ†ๆ‚จ็š„ไฟฎๆ”นๆš‚ๅญ˜ๅˆฐ .gitmodules ไธญๆˆ–่ดฎ่—ๅŽๅ†็ปง็ปญ"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "ๆœชๆไพ› -r ้€‰้กนไธไผš้€’ๅฝ’ๅˆ ้™ค '%s'"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm๏ผšไธ่ƒฝๅˆ ้™ค %s"
@@ -19061,15 +20089,82 @@ msgstr "ไธๆ‰“ๅฐ็ป“ๆžœๅˆฐๆ ‡ๅ‡†่พ“ๅ‡บ๏ผˆไพ‹ๅฆ‚ไธŽ --verify ๅ‚ๆ•ฐๅ…ฑ็”จ๏ผ‰"
 msgid "show refs from stdin that aren't in local repository"
 msgstr "ๆ˜พ็คบไปŽๆ ‡ๅ‡†่พ“ๅ…ฅไธญ่ฏปๅ…ฅ็š„ไธๅœจๆœฌๅœฐไป“ๅบ“ไธญ็š„ๅผ•็”จ"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <้€‰้กน>"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr "ๆœฌๅทฅไฝœๅŒบไธๆ˜ฏ็จ€็–ๆจกๅผ๏ผˆ็จ€็–ๆฃ€ๅ‡บๆ–‡ไปถๅฏ่ƒฝไธๅญ˜ๅœจ๏ผ‰"
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "ๆ— ๆณ•ไธบ็จ€็–ๆฃ€ๅ‡บๆ–‡ไปถๅˆ›ๅปบ็›ฎๅฝ•"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "ๆ— ๆณ•่ฎพ็ฝฎ extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "ๅˆๅง‹ๅŒ–็จ€็–ๆฃ€ๅ‡บไธบ cone ๆจกๅผ"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "ๅˆๅง‹ๅŒ–็จ€็–ๆฃ€ๅ‡บ"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ '%s'"
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "ๆ— ๆณ•่ง„่ŒƒๅŒ–่ทฏๅพ„ %s"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <ๆจกๅผ>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "ๆ— ๆณ•ไธบ C ่ฏญ่จ€้ฃŽๆ ผ็š„ๅญ—็ฌฆไธฒ '%s' ๅŽปๅผ•ๅท"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "ๆ— ๆณ•ๅŠ ่ฝฝ็Žฐๅญ˜็š„็จ€็–ๆฃ€ๅ‡บๆจกๅผ"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "ไปŽๆ ‡ๅ‡†่พ“ๅ…ฅ่ฏปๅ–ๆจกๅผ"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "่ฎพ็ฝฎ็จ€็–ๆฃ€ๅ‡บๆจกๅผ"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "็ฆ็”จ็จ€็–ๆฃ€ๅ‡บ"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "ๅˆทๆ–ฐๅทฅไฝœ็›ฎๅฝ•ๆ—ถๅ‡บ้”™"
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<้€‰้กน>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<้€‰้กน>] [<stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
@@ -19077,25 +20172,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <ๅˆ†ๆ”ฏๅ> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <ๆถˆๆฏ>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<่ทฏๅพ„่ง„ๆ ผ>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19103,186 +20200,196 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<ๆถˆๆฏ>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <ๆถˆๆฏ>] [-q|--quiet] <ๆไบค>"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <ๆถˆๆฏ>]\n"
+"          [--] [<่ทฏๅพ„่ง„ๆ ผ>...]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' ไธๅƒๆ˜ฏไธ€ไธช่ดฎ่—ๆไบค"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "ๆŒ‡ๅฎšไบ†ๅคชๅคš็š„็‰ˆๆœฌ๏ผš%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162 git-legacy-stash.sh:549
 msgid "No stash entries found."
 msgstr "ๆœชๅ‘็Žฐ่ดฎ่—ๆก็›ฎใ€‚"
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๅผ•็”จๅ"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear ไธๆ”ฏๆŒๅ‚ๆ•ฐ"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "ๆ— ๆณ•ๅœจๅˆๅนถ่ฟ‡็จ‹ๅบ”็”จ่ดฎ่—"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "ๆ— ๆณ•็”Ÿๆˆๅทฎๅผ‚ %s^!."
 
-#: builtin/stash.c:421
+#: builtin/stash.c:422
 msgid "conflicts in index.Try without --index."
 msgstr "็ดขๅผ•ไธญๆœ‰ๅ†ฒ็ชใ€‚ๅฐ่ฏ•ไธ็”จ --indexใ€‚"
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "ไธ่ƒฝไฟๅญ˜็ดขๅผ•ๆ ‘"
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "ๆ— ๆณ•ไปŽ่ดฎ่—ๆก็›ฎไธญๆขๅคๆœช่ทŸ่ธชๆ–‡ไปถ"
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "ๆญฃๅœจๅˆๅนถ %s ๅ’Œ %s"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461 git-legacy-stash.sh:681
 msgid "Index was not unstashed."
 msgstr "็ดขๅผ•ๆœชไปŽ่ดฎ่—ไธญๆขๅคใ€‚"
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
 msgid "attempt to recreate the index"
 msgstr "ๅฐ่ฏ•้‡ๅปบ็ดขๅผ•"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:555
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "ไธขๅผƒไบ† %s๏ผˆ%s๏ผ‰"
 
-#: builtin/stash.c:552
+#: builtin/stash.c:558
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s๏ผšๆ— ๆณ•ไธขๅผƒ่ดฎ่—ๆก็›ฎ"
 
-#: builtin/stash.c:577
+#: builtin/stash.c:583
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' ไธๆ˜ฏไธ€ไธช่ดฎ่—ๅผ•็”จ"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:695
 msgid "The stash entry is kept in case you need it again."
 msgstr "่ดฎ่—ๆก็›ฎ่ขซไฟ็•™ไปฅๅค‡ๆ‚จๅ†ๆฌก้œ€่ฆใ€‚"
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:713
 msgid "No branch name specified"
 msgstr "ๆœชๆŒ‡ๅฎšๅˆ†ๆ”ฏๅ"
 
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "ๆ— ๆณ•็”จ %2$s ๆ›ดๆ–ฐ %1$s"
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
 msgid "stash message"
 msgstr "่ดฎ่—่ฏดๆ˜Ž"
 
-#: builtin/stash.c:818
+#: builtin/stash.c:824
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" ้œ€่ฆไธ€ไธช <ๆไบค> ๅ‚ๆ•ฐ"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
 msgid "No changes selected"
 msgstr "ๆฒกๆœ‰้€‰ๆ‹ฉๅ˜ๆ›ด"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
 msgid "You do not have the initial commit yet"
 msgstr "ๆ‚จๅฐšๆœชๅปบ็ซ‹ๅˆๅง‹ๆไบค"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
 msgid "Cannot save the current index state"
 msgstr "ๆ— ๆณ•ไฟๅญ˜ๅฝ“ๅ‰็ดขๅผ•็Šถๆ€"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
 msgid "Cannot save the untracked files"
 msgstr "ๆ— ๆณ•ไฟๅญ˜ๆœช่ทŸ่ธชๆ–‡ไปถ"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
 msgid "Cannot save the current worktree state"
 msgstr "ๆ— ๆณ•ไฟๅญ˜ๅฝ“ๅ‰ๅทฅไฝœๅŒบ็Šถๆ€"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
 msgid "Cannot record working tree state"
 msgstr "ไธ่ƒฝ่ฎฐๅฝ•ๅทฅไฝœๅŒบ็Šถๆ€"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "ไธ่ƒฝๅŒๆ—ถไฝฟ็”จๅ‚ๆ•ฐ --patch ๅ’Œ --include-untracked ๆˆ– --all"
 
-#: builtin/stash.c:1285
+#: builtin/stash.c:1298
 msgid "Did you forget to 'git add'?"
 msgstr "ๆ‚จๆ˜ฏๅฆๅฟ˜ไบ†ๆ‰ง่กŒ 'git add'๏ผŸ"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
 msgid "No local changes to save"
 msgstr "ๆฒกๆœ‰่ฆไฟๅญ˜็š„ๆœฌๅœฐไฟฎๆ”น"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
 msgid "Cannot initialize stash"
 msgstr "ๆ— ๆณ•ๅˆๅง‹ๅŒ–่ดฎ่—"
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
 msgid "Cannot save the current status"
 msgstr "ๆ— ๆณ•ไฟๅญ˜ๅฝ“ๅ‰็Šถๆ€"
 
-#: builtin/stash.c:1327
+#: builtin/stash.c:1340
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "ไฟๅญ˜ๅทฅไฝœ็›ฎๅฝ•ๅ’Œ็ดขๅผ•็Šถๆ€ %s"
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
 msgid "Cannot remove worktree changes"
 msgstr "ๆ— ๆณ•ๅˆ ้™คๅทฅไฝœๅŒบๅ˜ๆ›ด"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "keep index"
 msgstr "ไฟๆŒ็ดขๅผ•"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash in patch mode"
 msgstr "ไปฅ่กฅไธๆจกๅผ่ดฎ่—"
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1472 builtin/stash.c:1537
 msgid "quiet mode"
 msgstr "้™้ป˜ๆจกๅผ"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1474 builtin/stash.c:1539
 msgid "include untracked files in stash"
 msgstr "่ดฎ่—ไธญๅŒ…ๅซๆœช่ทŸ่ธชๆ–‡ไปถ"
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1476 builtin/stash.c:1541
 msgid "include ignore files"
 msgstr "ๅŒ…ๅซๅฟฝ็•ฅ็š„ๆ–‡ไปถ"
 
-#: builtin/stash.c:1555
+#: builtin/stash.c:1600
 #, c-format
 msgid "could not exec %s"
 msgstr "ไธ่ƒฝๆ‰ง่กŒ %s"
@@ -19303,40 +20410,40 @@ msgstr "่ทณ่ฟ‡ๅ’Œ็งป้™คๆ‰€ๆœ‰็š„ๆณจ้‡Š่กŒ"
 msgid "prepend comment character and space to each line"
 msgstr "ไธบๆฏไธ€่กŒ็š„่กŒ้ฆ–ๆทปๅŠ ๆณจ้‡Š็ฌฆๅ’Œ็ฉบๆ ผ"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "ๆœŸๆœ›ไธ€ไธชๅฎŒๆ•ด็š„ๅผ•็”จๅ็งฐ๏ผŒๅดๅพ—ๅˆฐ %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote ไธๅธฆๅ‚ๆ•ฐ"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "ๆ— ๆณ•ไปŽ url '%s' ๅ‰ฅ็ฆปไธ€ไธช็ป„ไปถ"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr "็›ธๅฏน่ทฏๅพ„็š„ๆ›ฟไปฃ้”š่ฎฐ๏ผˆanchor๏ผ‰"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<่ทฏๅพ„>] [<่ทฏๅพ„>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "ๅœจ .gitmodules ไธญๆœชๆ‰พๅˆฐๅญๆจก็ป„ '%s' ็š„ url"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "่ฟ›ๅ…ฅ '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -19345,7 +20452,7 @@ msgstr ""
 "ๅฏน %s ๆ‰ง่กŒ run_command ่ฟ”ๅ›ž้ž้›ถๅ€ผใ€‚\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19355,119 +20462,119 @@ msgstr ""
 "ๅœจ้€’ๅฝ’ %s ็š„ๅญๆจก็ป„ๆ‰ง่กŒ run_command ๆ—ถ่ฟ”ๅ›ž้ž้›ถๅ€ผใ€‚\n"
 "."
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr "้˜ปๆญข่ฟ›ๅ…ฅๆฏไธ€ไธชๅญๆจก็ป„ๅ‘ฝไปค็š„่พ“ๅ‡บ"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr "้€’ๅฝ’่ฟ›ๅ…ฅๅตŒๅฅ—ๅญๆจก็ป„ไธญ"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ๅ‘ฝไปค>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐ้…็ฝฎ '%s'ใ€‚ๅ‡ๅฎš่ฟ™ไธชไป“ๅบ“ๆ˜ฏๅ…ถ่‡ช่บซ็š„ๅฎ˜ๆ–นไธŠๆธธใ€‚"
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "ๆ— ๆณ•ไธบๅญๆจก็ป„ '%s' ๆณจๅ†Œ url"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "ๅญๆจก็ป„ '%s'๏ผˆ%s๏ผ‰ๅทฒๅฏน่ทฏๅพ„ '%s' ๆณจๅ†Œ\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "่ญฆๅ‘Š๏ผšๅปบ่ฎฎๅญๆจก็ป„ '%s' ไฝฟ็”จๅ‘ฝไปคๆ›ดๆ–ฐๆจกๅผ\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "ๆ— ๆณ•ไธบๅญๆจก็ป„ '%s' ๆณจๅ†Œๆ›ดๆ–ฐๆจกๅผ"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "้˜ปๆญขๅญๆจก็ป„ๅˆๅง‹ๅŒ–็š„่พ“ๅ‡บ"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<้€‰้กน>] [<่ทฏๅพ„>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "ๅœจ .gitmodules ไธญๆฒกๆœ‰ๅ‘็Žฐ่ทฏๅพ„ '%s' ็š„ๅญๆจก็ป„ๆ˜ ๅฐ„"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "ๆ— ๆณ•่งฃๆžๅญๆจก็ป„ '%s' ็š„ HEAD ๅผ•็”จ"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "้€’ๅฝ’ๅญๆจก็ป„ '%s' ๅคฑ่ดฅ"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr "้˜ปๆญขๅญๆจก็ป„็Šถๆ€่พ“ๅ‡บ"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "ไฝฟ็”จๅญ˜ๅ‚จๅœจ็ดขๅผ•ไธญ็š„ๆไบค๏ผŒ่€Œ้žๅญ˜ๅ‚จๅœจๅญๆจก็ป„ HEAD ไธญ็š„ๆไบค"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr "้€’ๅฝ’่ฟ›ๅ…ฅๅตŒๅฅ—ๅญๆจก็ป„ไธญ"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<่ทฏๅพ„>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <่ทฏๅพ„>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "ไธบ '%s' ๅŒๆญฅๅญๆจก็ป„ url\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "ๆ— ๆณ•ไธบๅญๆจก็ป„่ทฏๅพ„ '%s' ๆณจๅ†Œ url"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "ๆ— ๆณ•ๅพ—ๅˆฐๅญๆจก็ป„ '%s' ็š„้ป˜่ฎค่ฟœ็จ‹ๅ…ณ่”"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "ๆ— ๆณ•ไธบๅญๆจก็ป„ '%s' ๆ›ดๆ–ฐ่ฟœ็จ‹ๅ…ณ่”"
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr "้˜ปๆญขๅญๆจก็ป„ url ๅŒๆญฅ็š„่พ“ๅ‡บ"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<่ทฏๅพ„>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -19476,230 +20583,257 @@ msgstr ""
 "ๅญๆจก็ป„ๅทฅไฝœๅŒบ '%s' ๅŒ…ๅซไธ€ไธช .git ็›ฎๅฝ•๏ผˆๅฆ‚ๆžœๆ‚จ็กฎ้œ€ๅˆ ้™คๅฎƒๅŠๅ…ถๅ…จ้ƒจๅŽ†ๅฒ๏ผŒไฝฟ็”จ 'rm "
 "-rf' ๅ‘ฝไปค๏ผ‰"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr "ๅญๆจก็ป„ๅทฅไฝœๅŒบ '%s' ๅŒ…ๅซๆœฌๅœฐไฟฎๆ”น๏ผ›ไฝฟ็”จ '-f' ไธขๅผƒๅฎƒไปฌ"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "ๅทฒๆธ…้™ค็›ฎๅฝ• '%s'\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "ๆ— ๆณ•็งป้™คๅญๆจก็ป„ๅทฅไฝœๅŒบ '%s'\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ็ฉบ็š„ๅญๆจก็ป„็›ฎๅฝ• %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "ๅญๆจก็ป„ '%s'๏ผˆ%s๏ผ‰ๆœชๅฏน่ทฏๅพ„ '%s' ๆณจๅ†Œ\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr "ๅˆ ้™คๅญๆจก็ป„ๅทฅไฝœๅŒบ๏ผŒๅณไฝฟๅŒ…ๅซๆœฌๅœฐไฟฎๆ”น"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr "ๅฐ†ๆ‰€ๆœ‰ๅญๆจก็ป„ๅ–ๆถˆๆณจๅ†Œ"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<่ทฏๅพ„>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "ๅฆ‚ๆžœๆ‚จ็กฎๅฎžๆƒณ่ฆๅฏนๆ‰€ๆœ‰ๅญๆจก็ป„ๆ‰ง่กŒๅ–ๆถˆๅˆๅง‹ๅŒ–๏ผŒ่ฏทไฝฟ็”จ '--all'"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"ไปŽไธ€ไธช็ˆถ้กน็›ฎ็š„ๅค‡็”จไป“ๅบ“ไธญ่ฎก็ฎ—ๅ‡บ็š„ๅค‡็”จไป“ๅบ“ๆ— ๆ•ˆใ€‚\n"
+"ๆญคๅœบๆ™ฏไธ‹๏ผŒ่ฎพ็ฝฎ submodule.alternateErrorStrategy ไธบ 'info'๏ผŒไปฅๅ…่ฎธ\n"
+"Git ไธไฝฟ็”จๅค‡็”จไป“ๅบ“ๅ…‹้š†๏ผŒๆˆ–่€…็ญ‰ๆ•ˆๅœฐไฝฟ็”จ '--reference-if-able' ่€Œ้ž\n"
+"'--reference' ๆฅๅ…‹้š†ใ€‚"
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "ๅญๆจก็ป„ '%s' ไธ่ƒฝๆทปๅŠ ไป“ๅบ“ๅค‡้€‰๏ผš%s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "ไธ่ƒฝ่ฏ†ๅˆซ submodule.alternateErrorStrategy ็š„ๅ–ๅ€ผ '%s'"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "ไธ่ƒฝ่ฏ†ๅˆซ submodule.alternateLocaion ็š„ๅ–ๅ€ผ '%s'"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
 msgstr "ๆ–ฐ็š„ๅญๆจก็ป„ๅฐ†่ฆๅ…‹้š†็š„่ทฏๅพ„"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr "ๆ–ฐๅญๆจก็ป„็š„ๅ็งฐ"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr "ๅ…‹้š†ๅญๆจก็ป„็š„ url ๅœฐๅ€"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr "ๆต…ๅ…‹้š†็š„ๆทฑๅบฆ"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr "ๅผบๅˆถๆ˜พ็คบๅ…‹้š†่ฟ›ๅบฆ"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "ไธๅ…่ฎธๅ…‹้š†ๅˆฐไธ€ไธช้ž็ฉบ็›ฎๅฝ•"
+
+#: builtin/submodule--helper.c:1424
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<่ทฏๅพ„>] [--quiet] [--reference <ไป“ๅบ“>] "
-"[--name <ๅๅญ—>] [--depth <ๆทฑๅบฆ>] --url <url> --path <่ทฏๅพ„>"
+"[--name <ๅๅญ—>] [--depth <ๆทฑๅบฆ>] [--single-branch] --url <url> --path <่ทฏๅพ„>"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "ๆ‹’็ปๅœจๅฆไธ€ไธชๅญๆจก็ป„็š„ git dir ไธญๅˆ›ๅปบ/ไฝฟ็”จ '%s'"
+
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "ๆ— ๆณ•ๅ…‹้š† '%s' ๅˆฐๅญๆจก็ป„่ทฏๅพ„ '%s'"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "็›ฎๅฝ•้ž็ฉบ๏ผš'%s'"
+
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "ๆ— ๆณ•ๅพ—ๅˆฐ '%s' ็š„ๅญๆจก็ป„็›ฎๅฝ•"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "ๅญๆจก็ป„ '%2$s' ็š„ๆ›ดๆ–ฐๆจกๅผ '%1$s' ๆ— ๆ•ˆ"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1516
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr "ไธบๅญๆจก็ป„ '%2$s' ้…็ฝฎ็š„ๆ›ดๆ–ฐๆจกๅผ '%1$s' ๆ— ๆ•ˆ"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "ๅญๆจก็ป„ '%s' ๅฐšๆœชๅˆๅง‹ๅŒ–"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
 msgstr "ไนŸ่ฎธๆ‚จๆƒณ่ฆๆ‰ง่กŒ 'update --init'๏ผŸ"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "็•ฅ่ฟ‡ๆœชๅˆๅนถ็š„ๅญๆจก็ป„ %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "็•ฅ่ฟ‡ๅญๆจก็ป„ '%s'"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "ๅ…‹้š† '%s' ๅคฑ่ดฅใ€‚ๆŒ‰่ฎกๅˆ’้‡่ฏ•"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "็ฌฌไบŒๆฌกๅฐ่ฏ•ๅ…‹้š† '%s' ๅคฑ่ดฅ๏ผŒ้€€ๅ‡บ"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr "ๅˆฐๅทฅไฝœๅŒบ็š„่ทฏๅพ„"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "ๅทฅไฝœๅŒบไธญ็š„่ทฏๅพ„๏ผŒ้€’ๅฝ’ๅตŒๅฅ—ๅญๆจก็ป„"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr "rebaseใ€mergeใ€checkout ๆˆ– none"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "ๅˆ›ๅปบไธ€ไธชๆŒ‡ๅฎšๆทฑๅบฆ็š„ๆต…ๅ…‹้š†"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr "ๅนถๅ‘ไปปๅŠก"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "ๅˆๅง‹ๅ…‹้š†ๆ˜ฏๅฆๅบ”่ฏฅ้ตๅฎˆๆŽจ่็š„ๆต…ๅ…‹้š†้€‰้กน"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr "ไธ่ฆ่พ“ๅ‡บๅ…‹้š†่ฟ›ๅบฆ"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<่ทฏๅพ„>] [<่ทฏๅพ„>...]"
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<่ทฏๅพ„>] [<่ทฏๅพ„>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr "update ๅ‚ๆ•ฐๅ–ๅ€ผ้”™่ฏฏ"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 "the superproject is not on any branch"
 msgstr "ๅญๆจก็ป„๏ผˆ%s๏ผ‰็š„ๅˆ†ๆ”ฏ้…็ฝฎไธบ็ปงๆ‰ฟไธŠ็บง้กน็›ฎ็š„ๅˆ†ๆ”ฏ๏ผŒไฝ†ๆ˜ฏไธŠ็บง้กน็›ฎไธๅœจไปปไฝ•ๅˆ†ๆ”ฏไธŠ"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2117
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "ๆ— ๆณ•่Žทๅพ—ๅญๆจก็ป„ '%s' ็š„ไป“ๅบ“ๅฅๆŸ„"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr "ๅœจๅญๆจก็ป„ไธญ้€’ๅฝ’"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2156
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<้€‰้กน>] [<่ทฏๅพ„>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2212
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "ๆฃ€ๆŸฅๅ†™ๅ…ฅ .gitmodules ๆ–‡ไปถๆ˜ฏๅฆๅฎ‰ๅ…จ"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2215
 msgid "unset the config in the .gitmodules file"
 msgstr "ๅ–ๆถˆ .gitmodules ๆ–‡ไปถไธญ็š„่ฎพ็ฝฎ"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2220
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <ๅ็งฐ> [<ๅ€ผ>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2221
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <ๅ็งฐ>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2222
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "่ฏท็กฎ่ฎค .gitmodules ๆ–‡ไปถๅœจๅทฅไฝœๅŒบ้‡Œ"
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s ไธๆ”ฏๆŒ --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2297
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ submodule--helper ๅญๅ‘ฝไปค"
@@ -19952,214 +21086,218 @@ msgstr "ๆ ‡็ญพ '%s' ๅทฒๅญ˜ๅœจ"
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "ๅทฒๆ›ดๆ–ฐๆ ‡็ญพ '%s'๏ผˆๆ›พไธบ %s๏ผ‰\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "ๅฑ•ๅผ€ๅฏน่ฑกไธญ"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "ๅˆ›ๅปบ็›ฎๅฝ• %s ๅคฑ่ดฅ"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "ๅˆ›ๅปบๆ–‡ไปถ %s ๅคฑ่ดฅ"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "ๅˆ ้™คๆ–‡ไปถ %s ๅคฑ่ดฅ"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "ๅˆ ้™ค็›ฎๅฝ• %s ๅคฑ่ดฅ"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "ๅœจ '%s' ไธญๆต‹่ฏ• mtime "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr "ๆทปๅŠ ไธ€ไธชๆ–ฐๆ–‡ไปถๅŽ๏ผŒ็›ฎๅฝ•็š„็Šถๆ€ไฟกๆฏๆœชๆ”นๅ˜"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr "ๆทปๅŠ ไธ€ไธชๆ–ฐ็›ฎๅฝ•ๅŽ๏ผŒ็›ฎๅฝ•็š„็Šถๆ€ไฟกๆฏๆœชๆ”นๅ˜"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr "ๆ›ดๆ–ฐไธ€ไธชๆ–‡ไปถๅŽ๏ผŒ็›ฎๅฝ•็š„็Šถๆ€ไฟกๆฏ่ขซไฟฎๆ”น"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "ๅœจๅญ็›ฎๅฝ•ไธญๆทปๅŠ ๆ–‡ไปถๅŽ๏ผŒ็›ฎๅฝ•็š„็Šถๆ€ไฟกๆฏ่ขซไฟฎๆ”น"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr "ๅˆ ้™คไธ€ไธชๆ–‡ไปถๅŽ๏ผŒ็›ฎๅฝ•็š„็Šถๆ€ไฟกๆฏๆœชๆ”นๅ˜"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr "ๅˆ ้™คไธ€ไธช็›ฎๅฝ•ๅŽ๏ผŒ็›ฎๅฝ•็š„็Šถๆ€ไฟกๆฏๆœชๆ”นๅ˜"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<้€‰้กน>] [--] [<ๆ–‡ไปถ>...]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "ๅฝ“็ดขๅผ•้œ€่ฆๆ›ดๆ–ฐๆ—ถ็ปง็ปญๅˆทๆ–ฐ"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "ๅˆทๆ–ฐ๏ผšๅฟฝ็•ฅๅญๆจก็ป„"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "ไธๅฟฝ็•ฅๆ–ฐ็š„ๆ–‡ไปถ"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "่ฎฉๆ–‡ไปถๆ›ฟๆข็›ฎๅฝ•๏ผˆๅไน‹ไบฆ็„ถ๏ผ‰"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "้€š็Ÿฅๆ–‡ไปถไปŽๅทฅไฝœๅŒบไธขๅคฑ"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "ๅณไฝฟ็ดขๅผ•ๅŒบๅŒ…ๅซๆœชๅˆๅนถ็š„ๆก็›ฎไนŸๆ‰ง่กŒๅˆทๆ–ฐ"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "ๅˆทๆ–ฐ็ปŸ่ฎกไฟกๆฏ"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "็ฑปไผผไบŽ --refresh๏ผŒไฝ†ๆ˜ฏๅฟฝ็•ฅ assume-unchanged ่ฎพ็ฝฎ"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<ๅญ˜ๅ–ๆจกๅผ>,<ๅฏน่ฑก>,<่ทฏๅพ„>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "ๆทปๅŠ ๆŒ‡ๅฎš็š„ๆก็›ฎๅˆฐ็ดขๅผ•ๅŒบ"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "ๆŠŠๆ–‡ไปถๆ ‡่ฎฐไธบ \"ๆฒกๆœ‰ๅ˜ๆ›ด\""
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "ๆธ…้™ค assumed-unchanged ไฝ"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "ๆŠŠๆ–‡ไปถๆ ‡่ฎฐไธบ \"ไป…็ดขๅผ•\""
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "ๆธ…้™ค skip-worktree ไฝ"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "ไธ่ฆ่งฆ็ขฐไป…็ดขๅผ•ๆก็›ฎ"
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "ๅชๆทปๅŠ ๅˆฐ็ดขๅผ•ๅŒบ๏ผ›ไธๆทปๅŠ ๅฏน่ฑกๅˆฐๅฏน่ฑกๅบ“"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "ๅณไฝฟๅญ˜ๅœจๅทฅไฝœๅŒบ้‡Œ๏ผŒไนŸๅˆ ้™ค่ทฏๅพ„"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "ๆบๅธฆ --stdin๏ผš่พ“ๅ…ฅ็š„่กŒไปฅ null ๅญ—็ฌฆ็ปˆๆญข"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "ไปŽๆ ‡ๅ‡†่พ“ๅ…ฅไธญ่ฏปๅ–้œ€่ฆๆ›ดๆ–ฐ็š„่ทฏๅพ„ๅˆ—่กจ"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "ไปŽๆ ‡ๅ‡†่พ“ๅ…ฅๆทปๅŠ ๆก็›ฎๅˆฐ็ดขๅผ•ๅŒบ"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "ไธบๆŒ‡ๅฎšๆ–‡ไปถ้‡ๆ–ฐ็”Ÿๆˆ็ฌฌ2ๅ’Œ็ฌฌ3ๆš‚ๅญ˜ๅŒบ"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "ๅชๆ›ดๆ–ฐไธŽ HEAD ไธๅŒ็š„ๆก็›ฎ"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ๅฟฝ็•ฅๅทฅไฝœๅŒบไธขๅคฑ็š„ๆ–‡ไปถ"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "ๅœจๆ ‡ๅ‡†่พ“ๅ‡บๆ˜พ็คบๆ“ไฝœ"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) ๅฟ˜่ฎฐไฟๅญ˜็š„ๆœช่งฃๅ†ณ็š„ๅ†ฒ็ช"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "ไปฅ่ฟ™็งๆ ผๅผๅ†™ๅ…ฅ็ดขๅผ•ๅŒบ"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "ๅฏ็”จๆˆ–็ฆ็”จ็ดขๅผ•ๆ‹†ๅˆ†"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "ๅฏ็”จ/็ฆ็”จๅฏนๆœช่ทŸ่ธชๆ–‡ไปถ็š„็ผ“ๅญ˜"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "ๆต‹่ฏ•ๆ–‡ไปถ็ณป็ปŸๆ˜ฏๅฆๆ”ฏๆŒๆœช่ทŸ่ธชๆ–‡ไปถ็ผ“ๅญ˜"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "ๆ— ้œ€ๆฃ€ๆต‹ๆ–‡ไปถ็ณป็ปŸ๏ผŒๅฏ็”จๅฏนๆœช่ทŸ่ธชๆ–‡ไปถ็š„็ผ“ๅญ˜"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "ๅณไฝฟๆฒกๆœ‰่ขซๆ ‡่ฎฐไธบๅทฒๆ›ดๆ”น๏ผŒไนŸ่ฆๅ†™ๅ‡บ็ดขๅผ•"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "ๅฏ็”จๆˆ–็ฆ็”จๆ–‡ไปถ็ณป็ปŸ็›‘ๆŽง"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "ๆ ‡่ฎฐๆ–‡ไปถไธบ fsmonitor ๆœ‰ๆ•ˆ"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "ๆธ…้™ค fsmonitor ๆœ‰ๆ•ˆไฝ"
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 "core.splitIndex ่ขซ่ฎพ็ฝฎไธบ falseใ€‚ๅฆ‚ๆžœๆ‚จ็กฎๅฎž่ฆๅฏ็”จ็ดขๅผ•ๆ‹†ๅˆ†๏ผŒ่ฏทๅˆ ้™คๆˆ–ไฟฎๆ”นๅฎƒใ€‚"
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 "core.splitIndex ่ขซ่ฎพ็ฝฎไธบ trueใ€‚ๅฆ‚ๆžœๆ‚จ็กฎๅฎž่ฆ็ฆ็”จ็ดขๅผ•ๆ‹†ๅˆ†๏ผŒ่ฏทๅˆ ้™คๆˆ–ไฟฎๆ”นๅฎƒใ€‚"
 
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -20167,11 +21305,11 @@ msgstr ""
 "core.untrackedCache ่ขซ่ฎพ็ฝฎไธบ trueใ€‚ๅฆ‚ๆžœๆ‚จ็กฎๅฎž่ฆ็ฆ็”จๆœช่ทŸ่ธชๆ–‡ไปถ็ผ“ๅญ˜๏ผŒ่ฏทๅˆ ้™คๆˆ–ไฟฎ"
 "ๆ”นๅฎƒใ€‚"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "็ผ“ๅญ˜ๆœช่ทŸ่ธชๆ–‡ไปถ่ขซ็ฆ็”จ"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -20179,25 +21317,25 @@ msgstr ""
 "core.untrackedCache ่ขซ่ฎพ็ฝฎไธบ falseใ€‚ๅฆ‚ๆžœๆ‚จ็กฎๅฎž่ฆๅฏ็”จๆœช่ทŸ่ธชๆ–‡ไปถ็ผ“ๅญ˜๏ผŒ่ฏทๅˆ ้™คๆˆ–"
 "ไฟฎๆ”นๅฎƒใ€‚"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "็ผ“ๅญ˜ๆœช่ทŸ่ธชๆ–‡ไปถๅœจ '%s' ๅฏ็”จ"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor ๆœช่ฎพ็ฝฎ๏ผ›ๅฆ‚ๆžœๆƒณ่ฆๅฏ็”จ fsmonitor ่ฏท่ฎพ็ฝฎ่ฏฅ้€‰้กน"
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor ่ขซๅฏ็”จ"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr "core.fsmonitor ๅทฒ่ฎพ็ฝฎ๏ผ›ๅฆ‚ๆžœๆƒณ่ฆ็ฆ็”จ fsmonitor ่ฏท็งป้™ค่ฏฅ้€‰้กน"
 
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor ่ขซ็ฆ็”จ"
 
@@ -20289,90 +21427,90 @@ msgstr "git verify-tag [-v | --verbose] [--format=<ๆ ผๅผ>] <ๆ ‡็ญพ>..."
 msgid "print tag contents"
 msgstr "ๆ‰“ๅฐๆ ‡็ญพๅ†…ๅฎน"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<้€‰้กน>] <่ทฏๅพ„> [<ๆไบค>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<้€‰้กน>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<้€‰้กน>] <่ทฏๅพ„>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <ๅทฅไฝœๅŒบ> <ๆ–ฐ่ทฏๅพ„>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<้€‰้กน>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<้€‰้กน>] <ๅทฅไฝœๅŒบ>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <่ทฏๅพ„>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:891
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "ๅˆ ้™ค '%s' ๅคฑ่ดฅ"
 
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "ๅˆ ้™คๅทฅไฝœๅŒบ/%s๏ผšไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„็›ฎๅฝ•"
 
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "ๅˆ ้™ค worktrees/%s๏ผšgitdir ๆ–‡ไปถไธๅญ˜ๅœจ"
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "ๅˆ ้™ค worktrees/%s๏ผšๆ— ๆณ•่ฏปๅ– gitdir ๆ–‡ไปถ (%s)"
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr "ๅˆ ้™คๅทฅไฝœๆ ‘/%s๏ผš่ฏปๅ–่ฟ‡็Ÿญ๏ผˆๆœŸๆœ› %<PRIuMAX> ๅญ—่Š‚๏ผŒ่ฏปๅ– %<PRIuMAX>๏ผ‰"
 
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "ๅˆ ้™ค worktrees/%s๏ผšๆ— ๆ•ˆ็š„ gitdir ๆ–‡ไปถ"
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "ๅˆ ้™ค worktrees/%s๏ผšgitdir ๆ–‡ไปถ็š„ๆŒ‡ๅ‘ไธๅญ˜ๅœจ"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
 msgid "report pruned working trees"
 msgstr "ๆŠฅๅ‘Šๆธ…้™ค็š„ๅทฅไฝœๅŒบ"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
 msgid "expire working trees older than <time>"
 msgstr "ๅฐ†ๆ—ฉไบŽ <ๆ—ถ้—ด> ็š„ๅทฅไฝœๅŒบ่ฟ‡ๆœŸ"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ๅทฒ็ปๅญ˜ๅœจ"
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:244
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "ๆ— ๆณ•ๅ†ๆฌกๆทปๅŠ ๅทฅไฝœๅŒบ '%s'"
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:249
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -20381,7 +21519,7 @@ msgstr ""
 "'%s' ๆ˜ฏไธ€ไธชไธขๅคฑไฝ†้”ๅฎš็š„ๅทฅไฝœๅŒบ๏ผŒไฝฟ็”จ\n"
 "'add -f -f' ่ฆ†็›–๏ผŒๆˆ– 'unlock' ๅ’Œ 'prune' ๆˆ– 'remove' ๆธ…้™ค"
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:251
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -20390,120 +21528,120 @@ msgstr ""
 "'%s' ๆ˜ฏไธ€ไธชไธขๅคฑไฝ†ๅทฒ็ปๆณจๅ†Œ็š„ๅทฅไฝœๅŒบ๏ผŒไฝฟ็”จ\n"
 "'add -f' ่ฆ†็›–๏ผŒๆˆ– 'prune' ๆˆ– 'remove' ๆธ…้™ค"
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "ไธ่ƒฝๅˆ›ๅปบ็›ฎๅฝ• '%s'"
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:432 builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "ๅ‡†ๅค‡ๅทฅไฝœๅŒบ๏ผˆๆ–ฐๅˆ†ๆ”ฏ '%s'๏ผ‰"
 
-#: builtin/worktree.c:442
+#: builtin/worktree.c:434
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "ๅ‡†ๅค‡ๅทฅไฝœๅŒบ๏ผˆ้‡็ฝฎๅˆ†ๆ”ฏ '%s'๏ผŒไน‹ๅ‰ไธบ %s๏ผ‰"
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:443
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "ๅ‡†ๅค‡ๅทฅไฝœๅŒบ๏ผˆๆฃ€ๅ‡บ '%s'๏ผ‰"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:449
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "ๅ‡†ๅค‡ๅทฅไฝœๅŒบ๏ผˆๅˆ†็ฆปๅคดๆŒ‡้’ˆ %s๏ผ‰"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:490
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "ๆฃ€ๅ‡บ <ๅˆ†ๆ”ฏ>๏ผŒๅณไฝฟๅทฒ็ป่ขซๆฃ€ๅ‡บๅˆฐๅ…ถๅฎƒๅทฅไฝœๅŒบ"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:493
 msgid "create a new branch"
 msgstr "ๅˆ›ๅปบไธ€ไธชๆ–ฐๅˆ†ๆ”ฏ"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:495
 msgid "create or reset a branch"
 msgstr "ๅˆ›ๅปบๆˆ–้‡็ฝฎไธ€ไธชๅˆ†ๆ”ฏ"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:497
 msgid "populate the new working tree"
 msgstr "็”Ÿๆˆๆ–ฐ็š„ๅทฅไฝœๅŒบ"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:498
 msgid "keep the new working tree locked"
 msgstr "้”ๅฎšๆ–ฐๅทฅไฝœๅŒบ"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:501
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "่ฎพ็ฝฎ่ทŸ่ธชๆจกๅผ๏ผˆๅ‚่ง git-branch(1)๏ผ‰"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:504
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "ๅฐ่ฏ•ไธบๆ–ฐๅˆ†ๆ”ฏๅๅŒน้…ไธ€ไธช่ฟœ็จ‹่ทŸ่ธชๅˆ†ๆ”ฏ"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:512
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-bใ€-B ๅ’Œ --detach ๆ˜ฏไบ’ๆ–ฅ็š„"
 
-#: builtin/worktree.c:581
+#: builtin/worktree.c:573
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "ๅช่ƒฝๅœจๅˆ›ๅปบๆ–ฐๅˆ†ๆ”ฏๆ—ถไฝฟ็”จ้€‰้กน --[no-]track "
 
-#: builtin/worktree.c:681
+#: builtin/worktree.c:673
 msgid "reason for locking"
 msgstr "้”ๅฎšๅŽŸๅ› "
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' ไธๆ˜ฏไธ€ไธชๅทฅไฝœๅŒบ"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:687 builtin/worktree.c:720
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "ไธปๅทฅไฝœๅŒบๆ— ๆณ•่ขซๅŠ ้”ๆˆ–่งฃ้”"
 
-#: builtin/worktree.c:700
+#: builtin/worktree.c:692
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ๅทฒ่ขซ้”ๅฎš๏ผŒๅŽŸๅ› ๏ผš%s"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:694
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ๅทฒ่ขซ้”ๅฎš"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:722
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' ๆœช่ขซ้”ๅฎš"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:763
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "ไธ่ƒฝ็งปๅŠจๆˆ–ๅˆ ้™คๅŒ…ๅซๅญๆจก็ป„็š„ๅทฅไฝœๅŒบ"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:771
 msgid "force move even if worktree is dirty or locked"
 msgstr "ๅผบๅˆถ็งปๅŠจ๏ผŒๅณไฝฟๅทฅไฝœๅŒบๆ˜ฏ่„็š„ๆˆ–ๅทฒ้”ๅฎš"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:794 builtin/worktree.c:921
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' ๆ˜ฏไธ€ไธชไธปๅทฅไฝœๅŒบ"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:799
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "ๆ— ๆณ•ไปŽ '%s' ็ฎ—ๅ‡บ็›ฎๆ ‡ๅ็งฐ"
 
-#: builtin/worktree.c:813
+#: builtin/worktree.c:805
 #, c-format
 msgid "target '%s' already exists"
 msgstr "็›ฎๆ ‡ '%s' ๅทฒๅญ˜ๅœจ"
 
-#: builtin/worktree.c:821
+#: builtin/worktree.c:813
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -20512,7 +21650,7 @@ msgstr ""
 "ๆ— ๆณ•็งปๅŠจไธ€ไธช้”ๅฎš็š„ๅทฅไฝœๅŒบ๏ผŒ้”ๅฎšๅŽŸๅ› ๏ผš%s\n"
 "ไฝฟ็”จ 'move -f -f' ่ฆ†็›–ๆˆ–ๅ…ˆ่งฃ้”"
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:815
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -20520,36 +21658,36 @@ msgstr ""
 "ๆ— ๆณ•็งปๅŠจไธ€ไธช้”ๅฎš็š„ๅทฅไฝœๅŒบ๏ผŒ\n"
 "ไฝฟ็”จ 'move -f -f' ่ฆ†็›–ๆˆ–ๅ…ˆ่งฃ้”"
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:818
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "้ชŒ่ฏๅคฑ่ดฅ๏ผŒๆ— ๆณ•็งปๅŠจๅทฅไฝœๅŒบ๏ผš%s"
 
-#: builtin/worktree.c:831
+#: builtin/worktree.c:823
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "็งปๅŠจ '%s' ๅˆฐ '%s' ๅคฑ่ดฅ"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:871
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "ๅœจ '%s' ไธญๆ‰ง่กŒ 'git status' ๅคฑ่ดฅ"
 
-#: builtin/worktree.c:883
+#: builtin/worktree.c:875
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
-msgstr "'%s' ๆ˜ฏ่„็š„๏ผŒไฝฟ็”จ --force ๅˆ ้™ค"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr "'%s' ๅŒ…ๅซไฟฎๆ”นๆˆ–ๆœช่ทŸ่ธช็š„ๆ–‡ไปถ๏ผŒไฝฟ็”จ --force ๅˆ ้™ค"
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:880
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "ๅœจ '%s' ไธญๆ‰ง่กŒ 'git status' ๅคฑ่ดฅ๏ผŒ้€€ๅ‡บ็  %d"
 
-#: builtin/worktree.c:911
+#: builtin/worktree.c:903
 msgid "force removal even if worktree is dirty or locked"
 msgstr "ๅผบๅˆถๅˆ ้™ค๏ผŒๅณไฝฟๅทฅไฝœๅŒบๆ˜ฏ่„็š„ๆˆ–ๅทฒ้”ๅฎš"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:926
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -20558,7 +21696,7 @@ msgstr ""
 "ๆ— ๆณ•ๅˆ ้™คไธ€ไธช้”ๅฎš็š„ๅทฅไฝœๅŒบ๏ผŒ้”ๅฎšๅŽŸๅ› ๏ผš%s\n"
 "ไฝฟ็”จ 'remove -f -f' ่ฆ†็›–ๆˆ–ๅ…ˆ่งฃ้”"
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:928
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -20566,7 +21704,7 @@ msgstr ""
 "ๆ— ๆณ•ๅˆ ้™คไธ€ไธช้”ๅฎš็š„ๅทฅไฝœๅŒบ๏ผŒ\n"
 "ไฝฟ็”จ 'remove -f -f' ่ฆ†็›–ๆˆ–ๅ…ˆ่งฃ้”"
 
-#: builtin/worktree.c:939
+#: builtin/worktree.c:931
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "้ชŒ่ฏๅคฑ่ดฅ๏ผŒๆ— ๆณ•ๅˆ ้™คๅทฅไฝœๅŒบ๏ผš%s"
@@ -20587,6 +21725,21 @@ msgstr "ๅฐ† <ๅ‰็ผ€> ๅญ็›ฎๅฝ•ๅ†…ๅฎนๅ†™ๅˆฐไธ€ไธชๆ ‘ๅฏน่ฑก"
 msgid "only useful for debugging"
 msgstr "ๅชๅฏน่ฐƒ่ฏ•ๆœ‰็”จ"
 
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "้ข„ๆœŸ 'mark' ๅ‘ฝไปค๏ผŒๅพ—ๅˆฐ %s"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "้ข„ๆœŸ 'to' ๅ‘ฝไปค๏ผŒๅพ—ๅˆฐ %s"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "ไธๅธฆ --allow-unsafe-features ็š„่พ“ๅ…ฅไธญ็ฆๆญขไฝฟ็”จๅŠŸ่ƒฝ '%s'"
+
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
@@ -20698,25 +21851,25 @@ msgstr ""
 "ๅˆซๅ '%s' ไฟฎๆ”น็Žฏๅขƒๅ˜้‡ใ€‚ๆ‚จๅฏไปฅไฝฟ็”จๅœจๅˆซๅไธญ\n"
 "ไฝฟ็”จ '!git'"
 
-#: git.c:377
+#: git.c:376
 #, c-format
 msgid "empty alias for %s"
 msgstr "%s ็š„็ฉบๅˆซๅ"
 
-#: git.c:380
+#: git.c:379
 #, c-format
 msgid "recursive alias: %s"
 msgstr "้€’ๅฝ’็š„ๅˆซๅ๏ผš%s"
 
-#: git.c:460
+#: git.c:459
 msgid "write failure on standard output"
 msgstr "ๅœจๆ ‡ๅ‡†่พ“ๅ‡บๅ†™ๅ…ฅๅคฑ่ดฅ"
 
-#: git.c:462
+#: git.c:461
 msgid "unknown write failure on standard output"
 msgstr "ๅˆฐๆ ‡ๅ‡†่พ“ๅ‡บ็š„ๆœช็Ÿฅๅ†™ๅ…ฅ้”™่ฏฏ"
 
-#: git.c:464
+#: git.c:463
 msgid "close failed on standard output"
 msgstr "ๆ ‡ๅ‡†่พ“ๅ‡บๅ…ณ้—ญๅคฑ่ดฅ"
 
@@ -20770,22 +21923,22 @@ msgstr "ไธๆ”ฏๆŒ CURLSSLOPT_NO_REVOKE๏ผŒๅ› ไธบ cURL < 7.44.0"
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "ไธๆ”ฏๆŒๅ่ฎฎ้™ๅˆถ๏ผŒๅ› ไธบ cURL < 7.19.4"
 
-#: http.c:1085
+#: http.c:1086
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "ไธๆ”ฏๆŒ็š„ SSL ๅŽ็ซฏ '%s'ใ€‚ๆ”ฏๆŒ็š„ SSL ๅŽ็ซฏ๏ผš"
 
-#: http.c:1092
+#: http.c:1093
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr "ๆ— ๆณ•่ฎพ็ฝฎ SSL ๅŽ็ซฏไธบ '%s'๏ผšcURL: cURL ๆฒกๆœ‰ไฝฟ็”จ SSL ๅŽ็ซฏๆž„ๅปบ"
 
-#: http.c:1096
+#: http.c:1097
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "ๆ— ๆณ•ๅฐ† SSL ๅŽ็ซฏ่ฎพ็ฝฎไธบ '%s'๏ผšๅทฒ็ป่ฎพ็ฝฎ"
 
-#: http.c:1965
+#: http.c:1966
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -20796,147 +21949,156 @@ msgstr ""
 "     ่ฏทๆฑ‚๏ผš%s\n"
 "   ้‡ๅฎšๅ‘๏ผš%s"
 
-#: remote-curl.c:157
+#: remote-curl.c:166
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "ๅœจ push-option ๅ–ๅ€ผไธญๆ— ๆ•ˆ็š„ๅผ•ๅท๏ผš'%s'"
 
-#: remote-curl.c:254
+#: remote-curl.c:263
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs ๆ— ๆ•ˆ๏ผš่ฟ™ๆ˜ฏไธ€ไธช git ไป“ๅบ“ไนˆ๏ผŸ"
 
-#: remote-curl.c:355
+#: remote-curl.c:364
 msgid "invalid server response; expected service, got flush packet"
 msgstr "ๆ— ๆ•ˆ็š„ๆœๅŠก็ซฏๅ“ๅบ”ใ€‚้ข„ๆœŸๆœๅŠก๏ผŒๅพ—ๅˆฐ flush ๅŒ…"
 
-#: remote-curl.c:386
+#: remote-curl.c:395
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "ๆ— ๆ•ˆ็š„ๆœๅŠก็ซฏๅ“ๅบ”๏ผŒๅพ—ๅˆฐ '%s'"
 
-#: remote-curl.c:446
+#: remote-curl.c:455
 #, c-format
 msgid "repository '%s' not found"
 msgstr "ไป“ๅบ“ '%s' ๆœชๆ‰พๅˆฐ"
 
-#: remote-curl.c:450
+#: remote-curl.c:459
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "'%s' ้‰ดๆƒๅคฑ่ดฅ"
 
-#: remote-curl.c:454
+#: remote-curl.c:463
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "ๆ— ๆณ•่ฎฟ้—ฎ '%s'๏ผš%s"
 
-#: remote-curl.c:460
+#: remote-curl.c:469
 #, c-format
 msgid "redirecting to %s"
 msgstr "้‡ๅฎšๅ‘ๅˆฐ %s"
 
-#: remote-curl.c:584
+#: remote-curl.c:593
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "ๅฝ“ๆฒกๆœ‰่ฎพ็ฝฎๆธฉๅ’Œๅค„็†ๆ–‡ไปถ็ป“ๆŸ็ฌฆ๏ผˆEOF๏ผ‰ๆ—ถ๏ผŒไธๅบ”่ฏฅๆœ‰ๆ–‡ไปถ็ป“ๆŸ็ฌฆ"
 
-#: remote-curl.c:664
+#: remote-curl.c:673
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "ๆ— ๆณ•ๅ€’ๅ›ž rpc post ๆ•ฐๆฎ - ๅฐ่ฏ•ๅขžๅŠ  http.postBuffer"
 
-#: remote-curl.c:724
+#: remote-curl.c:733
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC ๅคฑ่ดฅใ€‚%s"
 
-#: remote-curl.c:764
+#: remote-curl.c:773
 msgid "cannot handle pushes this big"
 msgstr "ไธ่ƒฝๅค„็†่ฟ™ไนˆๅคง็š„ๆŽจ้€"
 
-#: remote-curl.c:879
+#: remote-curl.c:888
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "ไธ่ƒฝๅŽ‹็ผฉ่ฏทๆฑ‚๏ผŒzlib ๅŽ‹็ผฉ้”™่ฏฏ %d"
 
-#: remote-curl.c:883
+#: remote-curl.c:892
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "ไธ่ƒฝๅŽ‹็ผฉ่ฏทๆฑ‚๏ผŒzlib ็ป“ๆŸ้”™่ฏฏ %d"
 
-#: remote-curl.c:1014
+#: remote-curl.c:1023
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "ๅ“‘ http ไผ ่พ“ไธๆ”ฏๆŒ shalllow ่ƒฝๅŠ›"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1038
 msgid "fetch failed."
 msgstr "่Žทๅ–ๅคฑ่ดฅใ€‚"
 
-#: remote-curl.c:1076
+#: remote-curl.c:1086
 msgid "cannot fetch by sha1 over smart http"
 msgstr "ๆ— ๆณ•้€š่ฟ‡ๆ™บ่ƒฝ HTTP ่Žทๅ– sha1"
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1130 remote-curl.c:1136
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "ๅ่ฎฎ้”™่ฏฏ๏ผšๆœŸๆœ› sha/ref๏ผŒๅดๅพ—ๅˆฐ '%s'"
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1148 remote-curl.c:1263
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http ไผ ่พ“ๅ่ฎฎไธๆ”ฏๆŒ %s"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1184
 msgid "git-http-push failed"
 msgstr "git-http-push ๅคฑ่ดฅ"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1369
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl๏ผš็”จๆณ•๏ผšgit remote-curl <่ฟœ็จ‹> [<url>]"
 
-#: remote-curl.c:1392
+#: remote-curl.c:1401
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl๏ผš้”™่ฏฏ่ฏปๅ–ๆฅ่‡ช git ็š„ๅ‘ฝไปคๆต"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1408
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl๏ผšๅฐ่ฏ•ๆฒกๆœ‰ๆœฌๅœฐไป“ๅบ“ไธ‹่Žทๅ–"
 
-#: remote-curl.c:1439
+#: remote-curl.c:1448
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl๏ผšๆœช็Ÿฅ็š„ๆฅ่‡ช git ็š„ๅ‘ฝไปค '%s'"
 
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
 msgid "args"
 msgstr "ๅ‚ๆ•ฐ"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
 msgid "object filtering"
 msgstr "ๅฏน่ฑก่ฟ‡ๆปค"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "ๅˆฐๆœŸๆ—ถ้—ด"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "็ฉบๆ“ไฝœ๏ผˆๅ‘ๅŽๅ…ผๅฎน๏ผ‰"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "ๆ›ดๅŠ ่ฏฆ็ป†"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "ๆ›ดๅŠ ๅฎ‰้™"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "็”จ <n> ไฝๆ•ฐๅญ—ๆ˜พ็คบ SHA-1 ๅ“ˆๅธŒๅ€ผ"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "่ฎพ็ฝฎๅฆ‚ไฝ•ๅˆ ้™คๆไบค่ฏดๆ˜Ž้‡Œ็š„็ฉบๆ ผๅ’Œ#ๆณจ้‡Š"
 
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "ไปŽๆ–‡ไปถ่ฏปๅ–่ทฏๅพ„่กจ่พพๅผ"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "ไฝฟ็”จ --pathspec-from-file๏ผŒ่ทฏๅพ„่กจ่พพๅผ็”จ็ฉบๅญ—็ฌฆๅˆ†้š”"
+
 #: ref-filter.h:101
 msgid "key"
 msgstr "key"
@@ -21443,162 +22605,170 @@ msgid "Common Git shell script setup code"
 msgstr "ๅธธ็”จ็š„ Git shell ่„šๆœฌ่ฎพ็ฝฎไปฃ็ "
 
 #: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "ๅˆๅง‹ๅŒ–ๅŠไฟฎๆ”น็จ€็–ๆฃ€ๅ‡บ"
+
+#: command-list.h:172
 msgid "Stash the changes in a dirty working directory away"
 msgstr "่ดฎ่—่„ๅทฅไฝœๅŒบไธญ็š„ไฟฎๆ”น"
 
-#: command-list.h:172
+#: command-list.h:173
 msgid "Add file contents to the staging area"
 msgstr "ๅฐ†ๆ–‡ไปถๅ†…ๅฎนๆทปๅŠ ๅˆฐ็ดขๅผ•"
 
-#: command-list.h:173
+#: command-list.h:174
 msgid "Show the working tree status"
 msgstr "ๆ˜พ็คบๅทฅไฝœๅŒบ็Šถๆ€"
 
-#: command-list.h:174
+#: command-list.h:175
 msgid "Remove unnecessary whitespace"
 msgstr "ๅˆ ้™คไธๅฟ…่ฆ็š„็ฉบ็™ฝๅญ—็ฌฆ"
 
-#: command-list.h:175
+#: command-list.h:176
 msgid "Initialize, update or inspect submodules"
 msgstr "ๅˆๅง‹ๅŒ–ใ€ๆ›ดๆ–ฐๆˆ–ๆฃ€ๆŸฅๅญๆจก็ป„"
 
-#: command-list.h:176
+#: command-list.h:177
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Subersion ไป“ๅบ“ๅ’Œ Git ไน‹้—ด็š„ๅŒๅ‘ๆ“ไฝœ"
 
-#: command-list.h:177
+#: command-list.h:178
 msgid "Switch branches"
 msgstr "ๅˆ‡ๆขๅˆ†ๆ”ฏ"
 
-#: command-list.h:178
+#: command-list.h:179
 msgid "Read, modify and delete symbolic refs"
 msgstr "่ฏปๅ–ใ€ไฟฎๆ”นๅ’Œๅˆ ้™ค็ฌฆๅทๅผ•็”จ"
 
-#: command-list.h:179
+#: command-list.h:180
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "ๅˆ›ๅปบใ€ๅˆ—ๅ‡บใ€ๅˆ ้™คๆˆ–ๆ ก้ชŒไธ€ไธช GPG ็ญพๅ็š„ๆ ‡็ญพๅฏน่ฑก"
 
-#: command-list.h:180
+#: command-list.h:181
 msgid "Creates a temporary file with a blob's contents"
 msgstr "็”จ blob ๆ•ฐๆฎๅฏน่ฑก็š„ๅ†…ๅฎนๅˆ›ๅปบไธ€ไธชไธดๆ—ถๆ–‡ไปถ"
 
-#: command-list.h:181
+#: command-list.h:182
 msgid "Unpack objects from a packed archive"
 msgstr "ไปŽๆ‰“ๅŒ…ๆ–‡ไปถไธญ่งฃๅŽ‹็ผฉๅฏน่ฑก"
 
-#: command-list.h:182
+#: command-list.h:183
 msgid "Register file contents in the working tree to the index"
 msgstr "ๅฐ†ๅทฅไฝœๅŒบ็š„ๆ–‡ไปถๅ†…ๅฎนๆณจๅ†Œๅˆฐ็ดขๅผ•"
 
-#: command-list.h:183
+#: command-list.h:184
 msgid "Update the object name stored in a ref safely"
 msgstr "ๅฎ‰ๅ…จๅœฐๆ›ดๆ–ฐๅญ˜ๅ‚จไบŽๅผ•็”จไธญ็š„ๅฏน่ฑกๅ็งฐ"
 
-#: command-list.h:184
+#: command-list.h:185
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "ๆ›ดๆ–ฐ่พ…ๅŠฉไฟกๆฏๆ–‡ไปถไปฅๅธฎๅŠฉๅ“‘ๅ่ฎฎๆœๅŠก"
 
-#: command-list.h:185
+#: command-list.h:186
 msgid "Send archive back to git-archive"
 msgstr "ๅฐ†ๅญ˜ๆกฃๅ‘้€ๅ›ž git-archive"
 
-#: command-list.h:186
+#: command-list.h:187
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "ๅฐ†ๅฏน่ฑกๅŽ‹็ผฉๅŒ…ๅ‘้€ๅ›ž git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:188
 msgid "Show a Git logical variable"
 msgstr "ๆ˜พ็คบไธ€ไธชGit้€ป่พ‘ๅ˜้‡"
 
-#: command-list.h:188
+#: command-list.h:189
 msgid "Check the GPG signature of commits"
 msgstr "ๆฃ€ๆŸฅ GPG ๆไบค็ญพๅ"
 
-#: command-list.h:189
+#: command-list.h:190
 msgid "Validate packed Git archive files"
 msgstr "ๆ ก้ชŒๆ‰“ๅŒ…็š„Gitๅญ˜ไป“ๆ–‡ไปถ"
 
-#: command-list.h:190
+#: command-list.h:191
 msgid "Check the GPG signature of tags"
 msgstr "ๆฃ€ๆŸฅๆ ‡็ญพ็š„ GPG ็ญพๅ"
 
-#: command-list.h:191
+#: command-list.h:192
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git web ็•Œ้ข๏ผˆGit ไป“ๅบ“็š„ web ๅ‰็ซฏ๏ผ‰"
 
-#: command-list.h:192
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "ๆ˜พ็คบๆฏไธ€ไธชๆไบคๅผ•ๅ…ฅ็š„ๅทฎๅผ‚ๆ—ฅๅฟ—"
 
-#: command-list.h:193
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "็ฎก็†ๅคšไธชๅทฅไฝœๅŒบ"
 
-#: command-list.h:194
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "ไปŽๅฝ“ๅ‰็ดขๅผ•ๅˆ›ๅปบไธ€ไธชๆ ‘ๅฏน่ฑก"
 
-#: command-list.h:195
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "ๅฎšไน‰่ทฏๅพ„็š„ๅฑžๆ€ง"
 
-#: command-list.h:196
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Git ๅ‘ฝไปค่กŒ็•Œ้ขๅ’Œ็บฆๅฎš"
 
-#: command-list.h:197
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "้ขๅ‘ๅผ€ๅ‘ไบบๅ‘˜็š„ Git ๆ ธๅฟƒๆ•™็จ‹"
 
-#: command-list.h:198
+#: command-list.h:199
 msgid "Git for CVS users"
 msgstr "้€‚ๅˆ CVS ็”จๆˆท็š„ Git ๅธฎๅŠฉ"
 
-#: command-list.h:199
+#: command-list.h:200
 msgid "Tweaking diff output"
 msgstr "่ฐƒๆ•ดๅทฎๅผ‚่พ“ๅ‡บ"
 
-#: command-list.h:200
+#: command-list.h:201
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "ๆฏไธ€ๅคฉ Git ็š„ไธ€็ป„ๆœ‰็”จ็š„ๆœ€ๅฐๅ‘ฝไปค้›†ๅˆ"
 
-#: command-list.h:201
+#: command-list.h:202
 msgid "A Git Glossary"
 msgstr "Git ่ฏๆฑ‡่กจ"
 
-#: command-list.h:202
+#: command-list.h:203
 msgid "Hooks used by Git"
 msgstr "Git ไฝฟ็”จ็š„้’ฉๅญ"
 
-#: command-list.h:203
+#: command-list.h:204
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "ๅฟฝ็•ฅๆŒ‡ๅฎš็š„ๆœช่ทŸ่ธชๆ–‡ไปถ"
 
-#: command-list.h:204
+#: command-list.h:205
 msgid "Defining submodule properties"
 msgstr "ๅฎšไน‰ๅญๆจก็ป„ๅฑžๆ€ง"
 
-#: command-list.h:205
+#: command-list.h:206
 msgid "Git namespaces"
 msgstr "Git ๅๅญ—็ฉบ้—ด"
 
-#: command-list.h:206
+#: command-list.h:207
 msgid "Git Repository Layout"
 msgstr "Git ไป“ๅบ“ๅธƒๅฑ€"
 
-#: command-list.h:207
+#: command-list.h:208
 msgid "Specifying revisions and ranges for Git"
 msgstr "ๆŒ‡ๅฎš Git ็š„็‰ˆๆœฌๅ’Œ็‰ˆๆœฌ่Œƒๅ›ด"
 
-#: command-list.h:208
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "ๅฐ†ไธ€ไธชไป“ๅบ“ๅฎ‰่ฃ…ๅˆฐๅฆๅค–ไธ€ไธชไป“ๅบ“ไธญ"
+
+#: command-list.h:210
 msgid "A tutorial introduction to Git: part two"
 msgstr "ไธ€ไธช Git ๆ•™็จ‹๏ผš็ฌฌไบŒ้ƒจๅˆ†"
 
-#: command-list.h:209
+#: command-list.h:211
 msgid "A tutorial introduction to Git"
 msgstr "ไธ€ไธช Git ๆ•™็จ‹"
 
-#: command-list.h:210
+#: command-list.h:212
 msgid "An overview of recommended workflows with Git"
 msgstr "Git ๆŽจ่็š„ๅทฅไฝœๆตๆฆ‚่งˆ"
 
@@ -21724,139 +22894,128 @@ msgstr "ๅฐ่ฏ•ๅ’Œ $pretty_name ็š„็ฎ€ๅ•ๅˆๅนถ"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "็ฎ€ๅ•ๅˆๅนถๆœช็”Ÿๆ•ˆ๏ผŒๅฐ่ฏ•่‡ชๅŠจๅˆๅนถใ€‚"
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "ๆ— ๆณ•ๅˆ ้™คไธดๆ—ถ็ดขๅผ•๏ผˆไธๅบ”ๅ‘็”Ÿ๏ผ‰"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "ๆ— ๆณ•็”จ $w_commit ๆ›ดๆ–ฐ $ref_stash"
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "้”™่ฏฏ๏ผš'stash push' ็š„ๆœช็Ÿฅ้€‰้กน๏ผš$option"
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "ไฟๅญ˜ๅทฅไฝœ็›ฎๅฝ•ๅ’Œ็ดขๅผ•็Šถๆ€ $stash_msg"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "ๆœช็Ÿฅ้€‰้กน: $opt"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "ๆŒ‡ๅฎšไบ†ๅคชๅคš็š„็‰ˆๆœฌ๏ผš$REV"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ๅผ•็”จ"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' ไธๆ˜ฏ่ดฎ่—ๅผๆไบค"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' ไธๆ˜ฏไธ€ไธช่ดฎ่—ๅผ•็”จ"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "ๆ— ๆณ•ๅˆทๆ–ฐ็ดขๅผ•"
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "ๆ— ๆณ•ๅœจๅˆๅนถ่ฟ‡็จ‹ๅบ”็”จ่ดฎ่—"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr "็ดขๅผ•ไธญๆœ‰ๅ†ฒ็ชใ€‚ๅฐ่ฏ•ไธไฝฟ็”จ --indexใ€‚"
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "ไธ่ƒฝไฟๅญ˜็ดขๅผ•ๆ ‘"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr "ๆ— ๆณ•ไปŽ่ดฎ่—ๆก็›ฎไธญๆขๅคๆœช่ทŸ่ธชๆ–‡ไปถ"
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "ๆ— ๆณ•ๅฐ†ไฟฎๆ”น็š„ๆ–‡ไปถๅ–ๆถˆๆš‚ๅญ˜"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "ไธขๅผƒไบ† ${REV} ($s)"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}๏ผšๆ— ๆณ•ไธขๅผƒ่ดฎ่—ๆก็›ฎ"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "๏ผˆไธบๆขๅคๆ•ฐๆฎ่พ“ๅ…ฅ \"git stash apply\"๏ผ‰"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:203
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "ๅช่ƒฝๅœจๅทฅไฝœๅŒบ็š„้กถ็บง็›ฎๅฝ•ไธญไฝฟ็”จ็›ธๅฏน่ทฏๅพ„"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:213
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "ไป“ๅบ“ URL๏ผš'$repo' ๅฟ…้กปๆ˜ฏ็ปๅฏน่ทฏๅพ„ๆˆ–ไปฅ ./|../ ่ตทๅง‹"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:232
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' ๅทฒ็ปๅญ˜ๅœจไบŽ็ดขๅผ•ไธญ"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:235
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' ๅทฒ็ปๅญ˜ๅœจไบŽ็ดขๅผ•ไธญไธ”ไธๆ˜ฏไธ€ไธชๅญๆจก็ป„"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:242
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "'$sm_path' ๆฒกๆœ‰ๆฃ€ๅ‡บ็š„ๆไบค"
 
-#: git-submodule.sh:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"ไปฅไธ‹่ทฏๅพ„่ขซๆ‚จ็š„ไธ€ไธช .gitignore ๆ–‡ไปถๆ‰€ๅฟฝ็•ฅ๏ผš\n"
-"$sm_path\n"
-"ๅฆ‚ๆžœๆ‚จ็กฎๅฎžๆƒณๆทปๅŠ ๅฎƒ๏ผŒไฝฟ็”จ -f ๅ‚ๆ•ฐใ€‚"
-
-#: git-submodule.sh:268
+#: git-submodule.sh:273
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "ๆทปๅŠ ไฝไบŽ '$sm_path' ็š„็Žฐๅญ˜ไป“ๅบ“ๅˆฐ็ดขๅผ•"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:275
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' ๅทฒๅญ˜ๅœจไธ”ไธๆ˜ฏไธ€ไธชๆœ‰ๆ•ˆ็š„ git ไป“ๅบ“"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:283
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr "ๆœฌๅœฐๅ‘็Žฐ '$sm_name' ็š„ไธ€ไธช git ็›ฎๅฝ•๏ผŒไธŽๅ…ถๅฏนๅบ”็š„่ฟœ็จ‹ไป“ๅบ“๏ผš"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:285
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -21871,51 +23030,51 @@ msgstr ""
 "ไฝฟ็”จ '--force' ้€‰้กนใ€‚ๅฆ‚ๆžœๆœฌๅœฐ git ็›ฎๅฝ•ไธๆ˜ฏๆญฃ็กฎ็š„ไป“ๅบ“\n"
 "ๆˆ–่€…ๆ‚จไธ็กฎๅฎš่ฟ™้‡Œ็š„ๅซไน‰๏ผŒไฝฟ็”จ '--name' ้€‰้กน้€‰ๆ‹ฉๅฆๅค–็š„ๅ็งฐใ€‚"
 
-#: git-submodule.sh:286
+#: git-submodule.sh:291
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "ๆฟ€ๆดปๆœฌๅœฐ git ็›ฎๅฝ•ๅˆฐๅญๆจก็ป„ '$sm_name'ใ€‚"
 
-#: git-submodule.sh:298
+#: git-submodule.sh:303
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "ไธ่ƒฝๆฃ€ๅ‡บๅญๆจก็ป„ '$sm_path'"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:308
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "ๆ— ๆณ•ๆทปๅŠ ๅญๆจก็ป„ '$sm_path'"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:317
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "ๆ— ๆณ•ๆณจๅ†Œๅญๆจก็ป„ '$sm_path'"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:590
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„่ทฏๅพ„ '$displaypath' ไธญๆ‰พๅˆฐๅฝ“ๅ‰็‰ˆๆœฌ"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:600
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„่ทฏๅพ„ '$sm_path' ไธญ่Žทๅ–"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:605
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„่ทฏๅพ„ '$sm_path' ไธญๆ‰พๅˆฐๅฝ“ๅ‰็‰ˆๆœฌ ${remote_name}/${branch}"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
 "$sha1:"
 msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„่ทฏๅพ„ '$displaypath' ไธญ่Žทๅ–๏ผŒๅฐ่ฏ•็›ดๆŽฅ่Žทๅ– $sha1๏ผš"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:629
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -21923,74 +23082,74 @@ msgid ""
 msgstr ""
 "่Žทๅ–ไบ†ๅญๆจก็ป„่ทฏๅพ„ '$displaypath'๏ผŒไฝ†ๆ˜ฏๅฎƒๆฒกๆœ‰ๅŒ…ๅซ $sha1ใ€‚็›ดๆŽฅ่Žทๅ–่ฏฅๆไบคๅคฑ่ดฅใ€‚"
 
-#: git-submodule.sh:619
+#: git-submodule.sh:636
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„่ทฏๅพ„ '$displaypath' ไธญๆฃ€ๅ‡บ '$sha1'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:637
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "ๅญๆจก็ป„่ทฏๅพ„ '$displaypath'๏ผšๆฃ€ๅ‡บ '$sha1'"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "ๆ— ๆณ•ๅœจๅญๆจก็ป„่ทฏๅพ„ '$displaypath' ไธญๅ˜ๅŸบ '$sha1'"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "ๅญๆจก็ป„่ทฏๅพ„ '$displaypath'๏ผšๅ˜ๅŸบ่‡ณ '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "ๆ— ๆณ•ๅˆๅนถ '$sha1' ๅˆฐๅญๆจก็ป„่ทฏๅพ„ '$displaypath' ไธญ"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "ๅญๆจก็ป„่ทฏๅพ„ '$displaypath'๏ผšๅทฒๅˆๅนถๅ…ฅ '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:653
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "ๅœจๅญๆจก็ป„ '$displaypath' ไธญๆ‰ง่กŒ '$command $sha1' ๅคฑ่ดฅ"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:654
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "ๅญๆจก็ป„ '$displaypath'๏ผš'$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:685
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "ๆ— ๆณ•้€’ๅฝ’่ฟ›ๅญๆจก็ป„่ทฏๅพ„ '$displaypath'"
 
-#: git-submodule.sh:830
+#: git-submodule.sh:896
 msgid "The --cached option cannot be used with the --files option"
 msgstr "้€‰้กน --cached ไธ่ƒฝๅ’Œ้€‰้กน --files ๅŒๆ—ถไฝฟ็”จ"
 
-#: git-submodule.sh:882
+#: git-submodule.sh:948
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "ๆ„ๅค–็š„ๆจกๅผ $mod_dst"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: git-submodule.sh:902
+#: git-submodule.sh:968
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  ่ญฆๅ‘Š๏ผš$display_name ๆœชๅŒ…ๅซๆไบค $sha1_src"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: git-submodule.sh:905
+#: git-submodule.sh:971
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  ่ญฆๅ‘Š๏ผš$display_name ๆœชๅŒ…ๅซๆไบค $sha1_dst"
 
 #  ่ฏ‘่€…๏ผšๆณจๆ„ไฟๆŒๅ‰ๅฏผ็ฉบๆ ผ
-#: git-submodule.sh:908
+#: git-submodule.sh:974
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  ่ญฆๅ‘Š๏ผš$display_name ๆœชๅŒ…ๅซๆไบค $sha1_src ๅ’Œ $sha1_dst"
@@ -22301,6 +23460,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "ๅ˜ๅŸบ $shortrevisions ๅˆฐ $shortonto๏ผˆ$todocount ไธชๆไบค๏ผ‰"
 msgstr[1] "ๅ˜ๅŸบ $shortrevisions ๅˆฐ $shortonto๏ผˆ$todocount ไธชๆไบค๏ผ‰"
 
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "ๆณจๆ„็ฉบๆไบคๅทฒ่ขซๆณจ้‡ŠๆŽ‰"
+
 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
 msgid "Could not init rewritten commits"
 msgstr "ไธ่ƒฝๅฏน้‡ๅ†™ๆไบค่ฟ›่กŒๅˆๅง‹ๅŒ–"
@@ -22363,122 +23526,56 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "ไธ่ƒฝ็กฎๅฎš git ็›ฎๅฝ•็š„็ปๅฏน่ทฏๅพ„"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "็ผ“ๅญ˜"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "ๆœช็ผ“ๅญ˜"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "ไบŒ่ฟ›ๅˆถ"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "ๆ— "
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "ๆฒกๆœ‰ไฟฎๆ”น"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "ๅขžๅŠ ไบ† %d ไธช่ทฏๅพ„\n"
-msgstr[1] "ๅขžๅŠ ไบ† %d ไธช่ทฏๅพ„\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "ๆ›ดๆ–ฐไบ† %d ไธช่ทฏๅพ„\n"
-msgstr[1] "ๆ›ดๆ–ฐไบ† %d ไธช่ทฏๅพ„\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "่ฟ˜ๅŽŸไบ† %d ไธช่ทฏๅพ„\n"
-msgstr[1] "่ฟ˜ๅŽŸไบ† %d ไธช่ทฏๅพ„\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "่งฆ็ขฐไบ† %d ไธช่ทฏๅพ„\n"
 msgstr[1] "่งฆ็ขฐไบ† %d ไธช่ทฏๅพ„\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "ๆ›ดๆ–ฐ"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "่ฟ˜ๅŽŸ"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "่ฏดๆ˜Ž๏ผš%s ็Žฐๅทฒๆˆไธบๆœช่ทŸ่ธช็š„ใ€‚\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "ๆทปๅŠ ๆœช่ทŸ่ธช็š„"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "ๆฒกๆœ‰ๆœช่ทŸ่ธช็š„ๆ–‡ไปถใ€‚\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๅนฒๅ‡€ๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบๆš‚ๅญ˜ใ€‚"
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๅนฒๅ‡€ๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบ่ดฎ่—ใ€‚"
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๅนฒๅ‡€ๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบๆœชๆš‚ๅญ˜ใ€‚"
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๅนฒๅ‡€ๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบๅบ”็”จใ€‚"
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr "ๅฆ‚ๆžœ่กฅไธ่ƒฝๅนฒๅ‡€ๅœฐๅบ”็”จ๏ผŒ็ผ–่พ‘ๅ—ๅฐ†็ซ‹ๅณๆ ‡่ฎฐไธบไธขๅผƒใ€‚"
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "ไธบๅ†™ๅ…ฅๆ‰“ๅผ€ๅ—็ผ–่พ‘ๆ–‡ไปถๅคฑ่ดฅ๏ผš%s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "ๆ‰‹ๅŠจๅ—็ผ–่พ‘ๆจกๅผ -- ๆŸฅ็œ‹ๅบ•้ƒจ็š„ๅฟซ้€ŸๆŒ‡ๅ—ใ€‚\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -22491,33 +23588,12 @@ msgstr ""
 "่ฆๅˆ ้™ค '%s' ๅผ€ๅง‹็š„่กŒ๏ผŒๅˆ ้™คๅฎƒไปฌใ€‚\n"
 "ไปฅ %s ๅผ€ๅง‹็š„่กŒๅฐ†่ขซๅˆ ้™คใ€‚\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"ๅฆ‚ๆžœไธ่ƒฝๅนฒๅ‡€ๅœฐๅบ”็”จ๏ผŒๆ‚จๅฐ†ๆœ‰ๆœบไผš้‡ๆ–ฐ็ผ–่พ‘ใ€‚ๅฆ‚ๆžœ่ฏฅๅ—็š„ๅ…จ้ƒจๅ†…ๅฎนๅˆ ้™ค๏ผŒๅˆ™\n"
-"ๆญคๆฌก็ผ–่พ‘่ขซ็ปˆๆญข๏ผŒ่ฏฅๅ—ไธไผš่ขซไฟฎๆ”นใ€‚\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "ๆ— ๆณ•่ฏปๅ–ๅ—็ผ–่พ‘ๆ–‡ไปถ๏ผš%s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr "ๆ‚จ็š„็ผ–่พ‘ๅ—ไธ่ƒฝ่ขซๅบ”็”จใ€‚้‡ๆ–ฐ็ผ–่พ‘๏ผˆ้€‰ๆ‹ฉ \"no\" ไธขๅผƒ๏ผ๏ผ‰ [y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -22531,7 +23607,7 @@ msgstr ""
 "a - ๆš‚ๅญ˜่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
 "d - ไธๆš‚ๅญ˜่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -22545,7 +23621,7 @@ msgstr ""
 "a - ่ดฎ่—่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
 "d - ไธ่ดฎ่—่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -22559,7 +23635,7 @@ msgstr ""
 "a - ไธๆš‚ๅญ˜่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
 "d - ไธ่ฆไธๆš‚ๅญ˜่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -22573,7 +23649,7 @@ msgstr ""
 "a - ๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
 "d - ไธ่ฆๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -22587,7 +23663,7 @@ msgstr ""
 "a - ไธขๅผƒ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
 "d - ไธ่ฆไธขๅผƒ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -22601,7 +23677,7 @@ msgstr ""
 "a - ไธขๅผƒ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
 "d - ไธ่ฆไธขๅผƒ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -22615,7 +23691,7 @@ msgstr ""
 "a - ๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
 "d - ไธ่ฆๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1296
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -22629,7 +23705,7 @@ msgstr ""
 "a - ๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—\n"
 "d - ไธ่ฆๅบ”็”จ่ฏฅๅ—ๅ’Œๆœฌๆ–‡ไปถไธญๅŽ้ข็š„ๅ…จ้ƒจๅ—"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -22651,226 +23727,85 @@ msgstr ""
 "e - ๆ‰‹ๅŠจ็ผ–่พ‘ๅฝ“ๅ‰ๅ—\n"
 "? - ๆ˜พ็คบๅธฎๅŠฉ\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "้€‰ไธญ็š„ๅ—ไธ่ƒฝๅบ”็”จๅˆฐ็ดขๅผ•๏ผ\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "ๆ— ่ฎบๅฆ‚ไฝ•้ƒฝ่ฆๅบ”็”จๅˆฐๅทฅไฝœๅŒบไนˆ๏ผŸ"
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "ๆœชๅบ”็”จใ€‚\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ๅฟฝ็•ฅๆœชๅˆๅ…ฅ็š„๏ผš%s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "ๅชๆœ‰ไบŒ่ฟ›ๅˆถๆ–‡ไปถ่ขซไฟฎๆ”นใ€‚\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "ๆฒกๆœ‰ไฟฎๆ”นใ€‚\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "่กฅไธๆ›ดๆ–ฐ"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "ๆš‚ๅญ˜ๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "ๆš‚ๅญ˜ๅˆ ้™คๅŠจไฝœ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "ๆš‚ๅญ˜่ฏฅๅ— [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "่ดฎ่—ๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "่ดฎ่—ๅˆ ้™คๅŠจไฝœ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "่ดฎ่—่ฏฅๅ— [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "ๅ–ๆถˆๆš‚ๅญ˜ๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "ๅ–ๆถˆๆš‚ๅญ˜ๅˆ ้™คๅŠจไฝœ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "ๅ–ๆถˆๆš‚ๅญ˜่ฏฅๅ— [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "ๅฐ†ๆจกๅผๅ˜ๆ›ดๅบ”็”จๅˆฐ็ดขๅผ• [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "ๅฐ†ๅˆ ้™คๆ“ไฝœๅบ”็”จๅˆฐ็ดขๅผ• [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "ๅฐ†่ฏฅๅ—ๅบ”็”จๅˆฐ็ดขๅผ• [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "ไปŽๅทฅไฝœๅŒบไธญไธขๅผƒๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "ไปŽๅทฅไฝœๅŒบไธญไธขๅผƒๅˆ ้™คๅŠจไฝœ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "ไปŽๅทฅไฝœๅŒบไธญไธขๅผƒ่ฏฅๅ— [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "ไปŽ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญไธขๅผƒๆจกๅผๅ˜ๆ›ด [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "ไปŽ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญไธขๅผƒๅˆ ้™ค [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "ไปŽ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบไธญไธขๅผƒ่ฏฅๅ— [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "ๅฐ†ๆจกๅผๅ˜ๆ›ดๅบ”็”จๅˆฐ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "ๅฐ†ๅˆ ้™คๆ“ไฝœๅบ”็”จๅˆฐ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "ๅฐ†่ฏฅๅ—ๅบ”็”จๅˆฐ็ดขๅผ•ๅ’ŒๅทฅไฝœๅŒบ [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1468
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "ๅฐ†ๆจกๅผๅ˜ๆ›ดๅบ”็”จๅˆฐๅทฅไฝœๅŒบ [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1469
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "ๅฐ†ๅˆ ้™คๆ“ไฝœๅบ”็”จๅˆฐๅทฅไฝœๅŒบ [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1470
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "ๅฐ†่ฏฅๅ—ๅบ”็”จๅˆฐๅทฅไฝœๅŒบ [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "ๆฒกๆœ‰ๅ…ถๅฎƒๅฏไพ›่ทณ่ฝฌ็š„ๅ—\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "่ทณ่ฝฌๅˆฐๅ“ชไธชๅ—๏ผˆ<ๅ›ž่ฝฆ> ๆŸฅ็œ‹ๆ›ดๅคš๏ผ‰๏ผŸ "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "่ทณ่ฝฌๅˆฐๅ“ชไธชๅ—๏ผŸ"
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "ๆ— ๆ•ˆๆ•ฐๅญ—๏ผš'%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "ๅฏนไธ่ตท๏ผŒๅชๆœ‰ %d ไธชๅฏ็”จๅ—ใ€‚\n"
 msgstr[1] "ๅฏนไธ่ตท๏ผŒๅชๆœ‰ %d ไธชๅฏ็”จๅ—ใ€‚\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "ๆฒกๆœ‰ๅ…ถๅฎƒๅฏไพ›ๆŸฅๆ‰พ็š„ๅ—\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "ไฝฟ็”จๆญฃๅˆ™่กจ่พพๅผๆœ็ดข๏ผŸ"
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "้”™่ฏฏ็š„ๆญฃๅˆ™่กจ่พพๅผ %s๏ผš%s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
-msgstr "ๆฒกๆœ‰ๅ’Œ็ป™ๅฎšๆจกๅผ็›ธๅŒน้…็š„ๅฟซ\n"
+msgstr "ๆฒกๆœ‰ๅ’Œ็ป™ๅฎšๆจกๅผ็›ธๅŒน้…็š„ๅ—\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "ๆฒกๆœ‰ๅ‰ไธ€ไธชๅ—\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "ๆฒกๆœ‰ไธ‹ไธ€ไธชๅ—\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "ๅฏนไธ่ตท๏ผŒไธ่ƒฝๆ‹†ๅˆ†่ฟ™ไธชๅ—\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "ๆ‹†ๅˆ†ไธบ %d ๅ—ใ€‚\n"
 msgstr[1] "ๆ‹†ๅˆ†ไธบ %d ๅ—ใ€‚\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "ๅฏนไธ่ตท๏ผŒไธ่ƒฝ็ผ–่พ‘่ฟ™ไธชๅ—\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "ๆฃ€่ง† diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -22887,19 +23822,19 @@ msgstr ""
 "diff          - ๆ˜พ็คบ HEAD ๅ’Œ็ดขๅผ•้—ดๅทฎๅผ‚\n"
 "add untracked - ๆทปๅŠ ๆœช่ทŸ่ธชๆ–‡ไปถ็š„ๅ†…ๅฎน่‡ณๆš‚ๅญ˜ๅˆ—่กจ\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "็ผบๅคฑ --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "ๆœช็Ÿฅ็š„ --patch ๆจกๅผ๏ผš%s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "ๆ— ๆ•ˆ็š„ๅ‚ๆ•ฐ %s๏ผŒๆœŸๆœ›ๆ˜ฏ --"
diff --git a/third_party/git/po/zh_TW.po b/third_party/git/po/zh_TW.po
new file mode 100644
index 000000000000..5efe4966f70f
--- /dev/null
+++ b/third_party/git/po/zh_TW.po
@@ -0,0 +1,24120 @@
+# Chinese (traditional) translations for Git package
+# Git ๅฅ—่ฃ่ปŸ้ซ”็š„็น้ซ”ไธญๆ–‡็ฟป่ญฏใ€‚
+# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
+# Copyright (C) 2019,2020 Yi-Jyun Pan <pan93412@gmail.com>
+# This file is distributed under the same license as the Git package.
+# Contributors (CN):
+#   - Fangyi Zhou <me AT fangyi.io>
+#   - Jiang Xin <worldhello.net AT gmail.com>
+#   - Lian Cheng <rhythm.mail AT gmail.com>
+#   - Ray Chen <oldsharp AT gmail.com>
+#   - Riku <lu.riku AT gmail.com>
+#   - Thynson <lanxingcan AT gmail.com>
+#   - ws3389 <willsmith3389 AT gmail.com>
+#   - Wang Sheng <wangsheng2008love AT 163.com>
+#   - ไพไบ‘ <lilydjwg AT gmail.com>
+#   - Yichao Yu <yyc1992 AT gmail.com>
+#   - Zhuang Ya <zhuangya AT me.com>
+#
+#  Git glossary for Chinese translators
+#
+#   English                          |  Chinese
+#   ---------------------------------+--------------------------------------
+#   3-way merge                      |  ไธ‰ๆ–นๅˆไฝต
+#   abbreviate                       |  ็ฐกๅฏซ๏ผˆ็š„ SHA-1 ๅ€ผ๏ผ‰
+#   alternate object database        |  ๅ‚™็”จ็‰ฉไปถๅบซ
+#   amend                            |  ไฟฎ่ฃœ
+#   ancestor                         |  ็ฅ–ๅ…ˆ๏ผŒ็ฅ–ๅ…ˆๆไบค
+#   annotated tag                    |  ้™„่จปๆจ™็ฑค
+#   bare repository                  |  ็ด”็‰ˆๆœฌๅบซ
+#   bisect                           |  ไบŒๅˆ†ๅฐ‹ๆ‰พ
+#   blob object                      |  ่ณ‡ๆ–™็‰ฉไปถ
+#   branch                           |  ๅˆ†ๆ”ฏ
+#   bundle                           |  ๅŒ…
+#   bypass                           |  ็นž้Ž
+#   cache                            |  ็ดขๅผ•๏ผˆ็š„ๅˆฅ็จฑ๏ผ‰
+#   chain                            |  ๏ผˆๆไบค๏ผ‰้ˆ
+#   changeset                        |  ่ฎŠๆ›ด้›†
+#   checkout                         |  ็ฐฝๅ‡บ
+#   checksum                         |  ๆ ก้ฉ—๏ผŒๆ ก้ฉ—ๅ’Œ
+#   cherry-picking                   |  ๆ€้ธ
+#   clean                            |  ไนพๆทจ๏ผˆ็š„ๅทฅไฝœๅ€๏ผ‰
+#   clone                            |  ่ค‡่ฃฝ
+#   commit                           |  ๆไบค
+#   commit message                   |  ๆไบค่ชชๆ˜Ž
+#   commit object                    |  ๆไบค็‰ฉไปถ
+#   commit-ish (also committish)     |  ๆไบค่™Ÿ
+#   conflict                         |  ่ก็ช
+#   core Git                         |  ๆ ธๅฟƒ Git ๅทฅๅ…ท
+#   cover letter                     |  ้™„ๅ‡ฝ
+#   DAG                              |  ๆœ‰ๅ‘็„ก็’ฐๅœ–
+#   dangling object                  |  ๆ‡ธ็ฉบ็‰ฉไปถ
+#   detached HEAD                    |  ๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™
+#   directory                        |  ็›ฎ้Œ„
+#   dirty                            |  ้ซ’๏ผˆ็š„ๅทฅไฝœๅ€๏ผ‰
+#   dumb HTTP protocol               |  ๅ•ž HTTP ๅ”ๅฎš
+#   evil merge                       |  ๅฃžๅˆไฝต๏ผˆๅˆไฝตๅผ•ๅ…ฅไบ†็ˆถๆไบคๆฒ’ๆœ‰็š„ไฟฎๆ”น๏ผ‰
+#   fast-forward                     |  ๅฟซ่ฝ‰
+#   fetch                            |  ๅ–ๅพ—
+#   file system                      |  ๆช”ๆกˆ็ณป็ตฑ
+#   fork                             |  ่ก็”Ÿ
+#   Git archive                      |  ็‰ˆๆœฌๅบซ๏ผˆๅฐๆ–ผ arch ไฝฟ็”จ่€…๏ผ‰
+#   gitfile                          |  gitfile๏ผˆ็‰ˆๆœฌๅบซ้€ฃ็ตๆช”ๆกˆ๏ผ‰
+#   grafts                           |  ๏ผˆๆไบค๏ผ‰็งปๆค
+#   hash                             |  ้›œๆนŠๅ€ผ
+#   HEAD                             |  HEAD๏ผˆ้–‹้ ญๆŒ‡ๆจ™๏ผŒไบฆๅณ็›ฎๅ‰ๅˆ†ๆ”ฏ๏ผ‰
+#   head                             |  ้ ญใ€ๅˆ†ๆ”ฏ
+#   head ref                         |  ๅˆ†ๆ”ฏ
+#   header                           |  ๆจ™้ ญ่จŠๆฏ
+#   hook                             |  ๆŽ›้‰ค
+#   hunk                             |  ไฟฎ่ฃœๆช”็‰‡ๆฎต
+#   index                            |  ็ดขๅผ•
+#   index entry                      |  ็ดขๅผ•ๆข็›ฎ
+#   loose object                     |  ้ฌ†ๆ•ฃ็‰ฉไปถ
+#   loose refs                       |  ้ฌ†ๆ•ฃๅผ•็”จ
+#   master                           |  master๏ผˆ้ ่จญๅˆ†ๆ”ฏๅ๏ผ‰
+#   merge                            |  ๅˆไฝต
+#   object                           |  ็‰ฉไปถ
+#   object database                  |  ็‰ฉไปถๅบซ
+#   object identifier                |  ็‰ฉไปถ่ญ˜ๅˆฅๅ…ƒ
+#   object name                      |  ็‰ฉไปถๅ็จฑ
+#   object type                      |  ็‰ฉไปถ้กžๅž‹
+#   octopus                          |  ็ซ ้ญšๅผๅˆไฝต๏ผˆๅ…ฉๅˆ†ๆ”ฏไปฅไธŠ็š„ๅˆไฝต๏ผ‰
+#   origin                           |  origin๏ผˆ้ ่จญ็š„้ ็ซฏๅ็จฑ๏ผ‰
+#   pack                             |  ๅŒ…
+#   pack index                       |  ๅŒ…็ดขๅผ•
+#   packfile                         |  ๅŒ…ๆช”ๆกˆ
+#   parent                           |  ็ˆถๆไบค
+#   patch                            |  ไฟฎ่ฃœๆช”
+#   pathspec                         |  ่ทฏๅพ‘่ฆๆ ผ
+#   pattern                          |  ๆจกๅผ
+#   pickaxe                          |  ๆŒ–ๆŽ˜
+#   plumbing                         |  ็ฎกไปถ๏ผˆGit ๅบ•ๅฑคๆ ธๅฟƒๆŒ‡ไปค็š„ๅˆฅ็จฑ๏ผ‰
+#   porcelain                        |  ็“ทไปถ๏ผˆGit ไธŠๅฑคๅฐ่ฃๆŒ‡ไปค็š„ๅˆฅ็จฑ๏ผ‰
+#   precious-objects repo            |  ็ๅ“็‰ˆๆœฌๅบซ
+#   prune                            |  ๆธ…้™ค
+#   pull                             |  ๆ‹‰๏ผŒๆ‹‰ๅ–
+#   push                             |  ๆŽจ๏ผŒๆŽจ้€
+#   reachable                        |  ๅฏไปฅๅ–ๅพ—
+#   rebase                           |  ้‡ๅฎšๅŸบๅบ•
+#   ref                              |  ๅผ•็”จ
+#   reflog                           |  ๅผ•็”จๆ—ฅ่ชŒ
+#   refspec                          |  ๅผ•็”จ่ฆๆ ผ
+#   remote                           |  ้ ็ซฏ๏ผŒ้ ็ซฏ็‰ˆๆœฌๅบซ
+#   remote-tracking branch           |  ้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ
+#   replay                           |  ้‡ๆ”พ
+#   repo                             |  ็‰ˆๆœฌๅบซ
+#   repository                       |  ็‰ˆๆœฌๅบซ
+#   resolve                          |  ๏ผˆ่ก็ช๏ผ‰่งฃๆฑบ
+#   revert                           |  ้‚„ๅŽŸๆไบค
+#   revision                         |  ็‰ˆๆœฌ
+#   rewind                           |  ้‚„ๅŽŸ (Fuzzy)
+#   SCM                              |  ๅŽŸๅง‹็ขผ็ฎก็†๏ผˆๅทฅๅ…ท๏ผ‰
+#   SHA-1                            |  SHA-1๏ผˆๅฎ‰ๅ…จ้›œๆนŠๆผ”็ฎ—ๆณ•1๏ผ‰
+#   shallow repository               |  ๆทบ๏ผˆ่ค‡่ฃฝ๏ผ‰็‰ˆๆœฌๅบซ
+#   signed tag                       |  ็ฐฝๅๆจ™็ฑค
+#   smart HTTP protocol              |  ๆ™บๆ…ง HTTP ๅ”ๅฎš
+#   squash                           |  ๅฃ“็ธฎ
+#   stage                            |  n. ๆšซๅญ˜ๅ€๏ผˆๅณ็ดขๅผ•๏ผ‰; v. ๆšซๅญ˜
+#   stash                            |  n. ๅ„ฒ่—ๅ€; v. ๅ„ฒ่—
+#   submodule                        |  ๅญๆจก็ต„
+#   symref                           |  ็ฌฆ่™Ÿๅผ•็”จ
+#   tag                              |  n. ๆจ™็ฑค; v. ๆ‰“ๆจ™็ฑค
+#   tag object                       |  ๆจ™็ฑค็‰ฉไปถ
+#   tagger                           |  ๆ‰“ๆจ™็ฑค่€…
+#   topic branch                     |  ไธป้กŒๅˆ†ๆ”ฏ
+#   track                            |  ่ฟฝ่นค
+#   trailer                          |  ๅฐพ้ƒจ็ฝฒๅ
+#   tree                             |  ๆจน๏ผˆๅทฅไฝœๅ€ๆˆ–ๆจน็‹€็‰ฉไปถ๏ผ‰
+#   tree object                      |  ๆจน็‹€็‰ฉไปถ
+#   tree-ish (also treeish)          |  ๆจน็‹€็‰ฉไปถ๏ผˆๆˆ–ๅฏไปฅ่งฃๆž็‚บไธ€ๆจน็‹€็‰ฉไปถ๏ผ‰
+#   unmerged index                   |  ๆœชๅˆไฝต็ดขๅผ•
+#   unpack                           |  ่งฃๅŒ…
+#   unreachable object               |  ็„กๆณ•ๅ–ๅพ—็‰ฉไปถ
+#   unstage                          |  ๅ–ๆถˆๆšซๅญ˜
+#   upstream                         |  ไธŠๆธธ
+#   upstream branch                  |  ไธŠๆธธๅˆ†ๆ”ฏ
+#   working tree                     |  ๅทฅไฝœๅ€
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-15 01:48+0800\n"
+"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
+"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-ZhConverter: ็นๅŒ–ๅงฌ dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
+"zhconvert.org\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.3\n"
+
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "ๅ—ฏ๏ผˆ%s๏ผ‰๏ผŸ"
+
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
+msgid "could not read index"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–็ดขๅผ•"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "ไบŒ้€ฒไฝ"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "็„ก"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "ๆฒ’ๆœ‰ไฟฎๆ”น"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "ๆ›ดๆ–ฐ"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "ไธ่ƒฝๆšซๅญ˜ '%s'"
+
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
+msgid "could not write index"
+msgstr "ไธ่ƒฝๅฏซๅ…ฅ็ดขๅผ•"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "ๆ›ดๆ–ฐไบ† %d ๅ€‹่ทฏๅพ‘\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "่ชชๆ˜Ž๏ผš%s ็พๅทฒๆˆ็‚บๆœช่ฟฝ่นค็š„ใ€‚\n"
+
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
+#: builtin/reset.c:144
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "ๅฐ่ทฏๅพ‘ '%s' ็š„ make_cache_entry ๅ‹•ไฝœๅคฑๆ•—"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "้‚„ๅŽŸ"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "ไธ่ƒฝ่งฃๆž HEAD^{ๆจน}"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "้‚„ๅŽŸไบ† %d ๅ€‹่ทฏๅพ‘\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "ๆฒ’ๆœ‰ๆœช่ฟฝ่นค็š„ๆช”ๆกˆใ€‚\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "ๆ–ฐๅขžๆœช่ฟฝ่นค็š„"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "ๅขžๅŠ ไบ† %d ๅ€‹่ทฏๅพ‘\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ๅฟฝ็•ฅๆœชๅˆไฝต๏ผš%s"
+
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "ๅชๆœ‰ไบŒ้€ฒไฝๆช”ๆกˆ่ขซไฟฎๆ”นใ€‚\n"
+
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
+msgid "No changes.\n"
+msgstr "ๆฒ’ๆœ‰ไฟฎๆ”นใ€‚\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1376
+msgid "Patch update"
+msgstr "ไฟฎ่ฃœๆช”ๆ›ดๆ–ฐ"
+
+#: add-interactive.c:974 git-add--interactive.perl:1754
+msgid "Review diff"
+msgstr "ๆชข่ฆ– diff"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "้กฏ็คบๆœ‰่ฎŠๆ›ด็š„่ทฏๅพ‘"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr "ๅŠ ๅ…ฅๅทฅไฝœๅ€็‹€ๆ…‹่‡ณๆšซๅญ˜ๅˆ—่กจ"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "้‚„ๅŽŸไฟฎๆ”น็š„ๆšซๅญ˜้›†่‡ณ HEAD ็‰ˆๆœฌ"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr "ๆŒ‘้ธๅ€ๅกŠไธฆ้ธๆ“‡ๆ€งๆ›ดๆ–ฐ"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "ๆชข่ฆ– HEAD ๅŠ็ดขๅผ•ไน‹้–“็š„ๅทฎ็•ฐ"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "ๅŠ ๅ…ฅๆœช่ฟฝ่นคๆช”ๆกˆ็š„ๅ…งๅฎน่‡ณๆšซๅญ˜ๅˆ—่กจ"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "ๆ็คบ่ชชๆ˜Ž๏ผš"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "้ธๆ“‡ๅ–ฎไธ€้ …็›ฎ"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "้ธๆ“‡้ …็›ฎ็ฏ„ๅœ"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "้ธๆ“‡ๅคšๅ€‹็ฏ„ๅœ"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "ๅŸบๆ–ผๅ”ฏไธ€ๅ‰็ถด้ธๆ“‡้ …็›ฎ"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "ๅ–ๆถˆ้ธๆ“‡ๆŒ‡ๅฎš้ …็›ฎ"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "้ธๆ“‡ๆ‰€ๆœ‰้ …็›ฎ"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "๏ผˆ็ฉบ๏ผ‰ๅฎŒๆˆ้ธๅ–"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "้ธๆ“‡็ทจ่™Ÿ้Ž็š„้ …็›ฎ"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "๏ผˆ็ฉบ๏ผ‰ๅ…จไธ้ธๅ–"
+
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+msgid "*** Commands ***"
+msgstr "*** ๆŒ‡ไปค ***"
+
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+msgid "What now"
+msgstr "่ซ‹้ธๆ“‡"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "ๅฟซๅ–"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "ๆœชๅฟซๅ–"
+
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+msgid "path"
+msgstr "่ทฏๅพ‘"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "็„กๆณ•้‡ๆ–ฐๆ•ด็†็ดขๅผ•"
+
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#, c-format
+msgid "Bye.\n"
+msgstr "ๅ†่ฆ‹ใ€‚\n"
+
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "ๆšซๅญ˜ๆจกๅผ่ฎŠๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "ๆšซๅญ˜ๅˆช้™คๅ‹•ไฝœ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "ๆšซๅญ˜ๆญคๅ€ๅกŠ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅ€ๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๆšซๅญ˜ใ€‚"
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๆšซๅญ˜ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๆšซๅญ˜ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธๆšซๅญ˜ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๆšซๅญ˜ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธๆšซๅญ˜ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "ๅ„ฒ่—ๆจกๅผ่ฎŠๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "ๅ„ฒ่—ๅˆช้™คๅ‹•ไฝœ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "ๅ„ฒ่—ๆญคๅ€ๅกŠ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅ€ๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๅ„ฒ่—ใ€‚"
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅ„ฒ่—ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅ„ฒ่—ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธๅ„ฒ่—ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๅ„ฒ่—ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธๅ„ฒ่—ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "ๅ–ๆถˆๆšซๅญ˜ๆจกๅผ่ฎŠๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "ๅ–ๆถˆๆšซๅญ˜ๅˆช้™คๅ‹•ไฝœ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "ๅ–ๆถˆๆšซๅญ˜ๆญคๅ€ๅกŠ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅ€ๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๆœชๆšซๅญ˜ใ€‚"
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ไธๆšซๅญ˜ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆไธๆšซๅญ˜ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆไธๆšซๅญ˜ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ไธๆšซๅญ˜ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆไธๆšซๅญ˜ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ‡ๆจกๅผ่ฎŠๆ›ดๅฅ—็”จๅˆฐ็ดขๅผ• [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:100 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ‡ๅˆช้™คๅ‹•ไฝœๅฅ—็”จๅˆฐ็ดขๅผ• [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ‡ๆญคๅ€ๅกŠๅฅ—็”จๅˆฐ็ดขๅผ• [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅ€ๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๅฅ—็”จใ€‚"
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจ็ดขๅผ•ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจ็ดขๅผ•ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅพžๅทฅไฝœๅ€ไธญๆจๆฃ„ๆจกๅผ่ฎŠๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅพžๅทฅไฝœๅ€ไธญๆจๆฃ„ๅˆช้™คๅ‹•ไฝœ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅพžๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅ€ๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๆจๆฃ„ใ€‚"
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๆจๆฃ„ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๆจๆฃ„ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๆจๆฃ„ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅพž็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๆจๆฃ„ๆจกๅผ่ฎŠๆ›ด [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅพž็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๆจๆฃ„ๅˆช้™ค [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅพž็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๆจๆฃ„ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๆจๆฃ„ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๆจๆฃ„ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ‡ๆจกๅผ่ฎŠๆ›ดๅฅ—็”จๅˆฐ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ‡ๅˆช้™คๅ‹•ไฝœๅฅ—็”จๅˆฐ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ‡ๆญคๅ€ๅกŠๅฅ—็”จๅˆฐ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ๅœจๅทฅไฝœๅ€ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจๅทฅไฝœๅ€ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+
+#: add-patch.c:318
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "็„กๆณ•่งฃๆžๅ€ๅกŠๆจ™้ ญ '%.*s'"
+
+#: add-patch.c:337 add-patch.c:341
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "็„กๆณ•่งฃๆžไธŠ่‰ฒ้Ž็š„ๅ€ๅกŠๆจ™้ ญ '%.*s'"
+
+#: add-patch.c:395
+msgid "could not parse diff"
+msgstr "็„กๆณ•่งฃๆžๅทฎ็•ฐ (diff)"
+
+#: add-patch.c:414
+msgid "could not parse colored diff"
+msgstr "็„กๆณ•่งฃๆžไธŠ่‰ฒ้Ž็š„ๅทฎ็•ฐ (diff)"
+
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "็„กๆณ•ๅŸท่กŒ '%s'"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "interactive.diffFilter ็š„่ผธๅ‡บไธ็ฌฆ"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr "ๆ‚จ็š„้Žๆฟพๅ™จๅฟ…้ ˆๅœจๅ…ถ่ผธๅ…ฅๅŠ่ผธๅ‡บ่กŒ็ถญๆŒไธ€ๅฐไธ€็š„ๅฐๆ‡‰้—œไฟ‚ใ€‚"
+
+#: add-patch.c:761
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"ๆ‡‰ๆœ‰ไธŠไธ‹ๆ–‡่กŒ #%d ๆ–ผ\n"
+"%.*s"
+
+#: add-patch.c:776
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"ๅ€ๅกŠๆœช้‡็–Š๏ผš\n"
+"%.*s\n"
+"\tไธไปฅไธ‹่ฟฐ็ตๅฐพ๏ผš\n"
+"%.*s"
+
+#: add-patch.c:1052 git-add--interactive.perl:1112
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "ๆ‰‹ๅ‹•ๅ€ๅกŠ็ทจ่ผฏๆจกๅผ -- ๆชข่ฆ–ๅบ•้ƒจ็š„ๅฟซ้€ŸๆŒ‡ๅ—ใ€‚\n"
+
+#: add-patch.c:1056
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"่ฆๅˆช้™ค '%c' ้–‹ๅง‹็š„่กŒ๏ผŒไฝฟๅ…ถๆˆ็‚บ ' ' ้–‹ๅง‹็š„่กŒ๏ผˆไธŠไธ‹ๆ–‡๏ผ‰ใ€‚\n"
+"่ฆๅˆช้™ค '%c' ้–‹ๅง‹็š„่กŒ๏ผŒๅˆช้™คๅฎƒๅ€‘ใ€‚\n"
+"ไปฅ %c ้–‹ๅง‹็š„่กŒๅฐ‡่ขซๅˆช้™คใ€‚\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1070 git-add--interactive.perl:1126
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"ๅฆ‚ๆžœไธ่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒๆ‚จๅฐ‡ๆœ‰ๆฉŸๆœƒ้‡ๆ–ฐ็ทจ่ผฏใ€‚ๅฆ‚ๆžœๆญคๅ€ๅกŠ็š„ๅ…จ้ƒจๅ…งๅฎนๅˆช้™ค๏ผŒๅ‰‡\n"
+"ๆญคๆฌก็ทจ่ผฏ่ขซ็ต‚ๆญข๏ผŒๆญคๅ€ๅกŠไธๆœƒ่ขซไฟฎๆ”นใ€‚\n"
+
+#: add-patch.c:1103
+msgid "could not parse hunk header"
+msgstr "็„กๆณ•่งฃๆžๅ€ๅกŠๆจ™้ ญ"
+
+#: add-patch.c:1148
+msgid "'git apply --cached' failed"
+msgstr "ใ€Œgit apply --cachedใ€ๅคฑๆ•—"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#.
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: add-patch.c:1218 git-add--interactive.perl:1239
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr "ๆ‚จ็š„็ทจ่ผฏๅกŠไธ่ƒฝ่ขซๆ‡‰็”จใ€‚้‡ๆ–ฐ็ทจ่ผฏ๏ผˆ้ธๆ“‡ \"no\" ๆจๆฃ„๏ผ๏ผ‰ [y/n]? "
+
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "้ธๅ–็š„ๅ€ๅกŠไธๆœƒๅฅ—็”จ้€ฒ็ดขๅผ•๏ผ"
+
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "็„ก่ซ–ๅฆ‚ไฝ•้ƒฝ่ฆๅฅ—็”จๅˆฐๅทฅไฝœๅ€ๅ—Ž๏ผŸ"
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "ๆœชๅฅ—็”จใ€‚\n"
+
+#: add-patch.c:1326
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - ็ถญๆŒๆญคๅ€ๅกŠๆœชๆฑบ็‹€ๆ…‹๏ผŒๆชข่ฆ–ไธ‹ไธ€ๅ€‹ๆœชๆฑบๅฎšๅ€ๅกŠ\n"
+"J - ็ถญๆŒๆญคๅ€ๅกŠๆœชๆฑบ็‹€ๆ…‹๏ผŒๆชข่ฆ–ไธ‹ไธ€ๅ€‹ๅ€ๅกŠ\n"
+"k - ็ถญๆŒๆญคๅ€ๅกŠๆœชๆฑบ็‹€ๆ…‹๏ผŒๆชข่ฆ–ไธŠไธ€ๅ€‹ๆœชๆฑบๅฎšๅ€ๅกŠ\n"
+"K - ็ถญๆŒๆญคๅ€ๅกŠๆœชๆฑบ็‹€ๆ…‹๏ผŒๆชข่ฆ–ไธŠไธ€ๅ€‹ๅ€ๅกŠ\n"
+"g - ้ธๆ“‡่ฆ่ทณ่ฝ‰่‡ณ็š„ๅ€ๅกŠ\n"
+"/ - ๅฐ‹ๆ‰พ็ฌฆๅˆๆไพ›ไน‹ๆญฃ่ฆ่กจ็คบๅผ็š„ๅ€ๅกŠ\n"
+"s - ๅˆ†ๅ‰ฒ็›ฎๅ‰ๅ€ๅกŠ็‚บๆ›ดๅฐ็š„ๅ€ๅกŠ\n"
+"e - ๆ‰‹ๅ‹•็ทจ่ผฏ็›ฎๅ‰ๅ€ๅกŠ\n"
+"? - ้กฏ็คบ่ชชๆ˜Ž\n"
+
+#: add-patch.c:1447 add-patch.c:1457
+msgid "No previous hunk"
+msgstr "ๆฒ’ๆœ‰ไธŠไธ€ๅ€‹ๅ€ๅกŠ"
+
+#: add-patch.c:1452 add-patch.c:1462
+msgid "No next hunk"
+msgstr "ๆฒ’ๆœ‰ไธ‹ไธ€ๅ€‹ๅ€ๅกŠ"
+
+#: add-patch.c:1468
+msgid "No other hunks to goto"
+msgstr "ๆฒ’ๆœ‰ๅ…ถๅฎƒๅฏไพ›่ทณ่ฝ‰็š„ๅ€ๅกŠ"
+
+#: add-patch.c:1479 git-add--interactive.perl:1577
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "่ทณ่ฝ‰ๅˆฐๅ“ชๅ€‹ๅ€ๅกŠ๏ผˆ<Enter> ๆชข่ฆ–ๆ›ดๅคš๏ผ‰๏ผŸ "
+
+#: add-patch.c:1480 git-add--interactive.perl:1579
+msgid "go to which hunk? "
+msgstr "่ทณ่ฝ‰ๅˆฐๅ“ชๅ€‹ๅ€ๅกŠ๏ผŸ"
+
+#: add-patch.c:1491
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "็„กๆ•ˆๆ•ธๅญ—๏ผš'%s'"
+
+#: add-patch.c:1496
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "ๅฐไธ่ตท๏ผŒๅชๆœ‰ %d ๅ€‹ๅฏ็”จๅ€ๅกŠใ€‚"
+
+#: add-patch.c:1505
+msgid "No other hunks to search"
+msgstr "ๆฒ’ๆœ‰ๅ…ถๅฎƒๅฏไพ›ๅฐ‹ๆ‰พ็š„ๅ€ๅกŠ"
+
+#: add-patch.c:1511 git-add--interactive.perl:1623
+msgid "search for regex? "
+msgstr "ไฝฟ็”จๆญฃ่ฆ่กจ็คบๅผๆœๅฐ‹๏ผŸ"
+
+#: add-patch.c:1526
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "้Œฏ่ชค็š„ๆญฃ่ฆ่กจ็คบๅผ %s๏ผš%s"
+
+#: add-patch.c:1543
+msgid "No hunk matches the given pattern"
+msgstr "ๆฒ’ๆœ‰ๅ’Œๆไพ›ๆจกๅผ็›ธ็ฌฆๅˆ็š„ๅ€ๅกŠ"
+
+#: add-patch.c:1550
+msgid "Sorry, cannot split this hunk"
+msgstr "ๅฐไธ่ตท๏ผŒไธ่ƒฝๅˆ†ๅ‰ฒ้€™ๅ€‹ๅ€ๅกŠ"
+
+#: add-patch.c:1554
+#, c-format
+msgid "Split into %d hunks."
+msgstr "ๅˆ†ๅ‰ฒ็‚บ %d ๅกŠใ€‚"
+
+#: add-patch.c:1558
+msgid "Sorry, cannot edit this hunk"
+msgstr "ๅฐไธ่ตท๏ผŒไธ่ƒฝ็ทจ่ผฏ้€™ๅ€‹ๅ€ๅกŠ"
+
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "'git apply' ๅคฑๆ•—"
+
+#: advice.c:115
+#, c-format
+msgid "%shint: %.*s%s\n"
+msgstr "%sๆ็คบ๏ผš%.*s%s\n"
+
+#: advice.c:168
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "็„กๆณ•ๆ€้ธ๏ผŒๅ› ็‚บๆ‚จๆœ‰ๆœชๅˆไฝต็š„ๆช”ๆกˆใ€‚"
+
+#: advice.c:170
+msgid "Committing is not possible because you have unmerged files."
+msgstr "็„กๆณ•ๆไบค๏ผŒๅ› ็‚บๆ‚จๆœ‰ๆœชๅˆไฝต็š„ๆช”ๆกˆใ€‚"
+
+#: advice.c:172
+msgid "Merging is not possible because you have unmerged files."
+msgstr "็„กๆณ•ๅˆไฝต๏ผŒๅ› ็‚บๆ‚จๆœ‰ๆœชๅˆไฝต็š„ๆช”ๆกˆใ€‚"
+
+#: advice.c:174
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "็„กๆณ•ๆ‹‰ๅ–๏ผŒๅ› ็‚บๆ‚จๆœ‰ๆœชๅˆไฝต็š„ๆช”ๆกˆใ€‚"
+
+#: advice.c:176
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "็„กๆณ•้‚„ๅŽŸๆไบค๏ผŒๅ› ็‚บๆ‚จๆœ‰ๆœชๅˆไฝต็š„ๆช”ๆกˆใ€‚"
+
+#: advice.c:178
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "็„กๆณ• %s๏ผŒๅ› ็‚บๆ‚จๆœ‰ๆœชๅˆไฝต็š„ๆช”ๆกˆใ€‚"
+
+#: advice.c:186
+msgid ""
+"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution and make a commit."
+msgstr ""
+"่ซ‹ๅœจๅทฅไฝœๅ€ๆ”นๆญฃๆช”ๆกˆ๏ผŒ็„ถๅพŒ้…Œๆƒ…ไฝฟ็”จ 'git add/rm <ๆช”ๆกˆ>' ๆŒ‡ไปคๆจ™่จ˜\n"
+"่งฃๆฑบๆ–นๆกˆไธฆๆไบคใ€‚"
+
+#: advice.c:194
+msgid "Exiting because of an unresolved conflict."
+msgstr "ๅ› ็‚บๅญ˜ๅœจๆœช่งฃๆฑบ็š„่ก็ช่€Œ้›ข้–‹ใ€‚"
+
+#: advice.c:199 builtin/merge.c:1335
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "ๆ‚จๅฐšๆœช็ตๆŸๆ‚จ็š„ๅˆไฝต๏ผˆๅญ˜ๅœจ MERGE_HEAD๏ผ‰ใ€‚"
+
+#: advice.c:201
+msgid "Please, commit your changes before merging."
+msgstr "่ซ‹ๅœจๅˆไฝตๅ‰ๅ…ˆๆไบคๆ‚จ็š„ไฟฎๆ”นใ€‚"
+
+#: advice.c:202
+msgid "Exiting because of unfinished merge."
+msgstr "ๅ› ็‚บๅญ˜ๅœจๆœชๅฎŒๆˆ็š„ๅˆไฝต่€Œ้›ข้–‹ใ€‚"
+
+#: advice.c:208
+#, c-format
+msgid ""
+"Note: switching to '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by switching back to a branch.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+"  git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
+"\n"
+msgstr ""
+"ๆณจๆ„๏ผšๆญฃๅœจๅˆ‡ๆ›ๅˆฐ '%s'ใ€‚\n"
+"\n"
+"ๆ‚จๆญฃ่™•ๆ–ผๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™็‹€ๆ…‹ใ€‚ๆ‚จๅฏไปฅๆชข่ฆ–ใ€ๅšๅฏฆ้ฉ—ๆ€ง็š„ไฟฎๆ”นๅŠๆไบค๏ผŒไธฆไธ”ๆ‚จๅฏไปฅๅœจๅˆ‡"
+"ๆ›\n"
+"ๅ›žไธ€ๅ€‹ๅˆ†ๆ”ฏๆ™‚๏ผŒๆจๆฃ„ๅœจๆญค็‹€ๆ…‹ไธ‹ๆ‰€ๅš็š„ๆไบค่€Œไธๅฐๅˆ†ๆ”ฏ้€ ๆˆๅฝฑ้Ÿฟใ€‚\n"
+"\n"
+"ๅฆ‚ๆžœๆ‚จๆƒณ่ฆ้€้Žๅปบ็ซ‹ๅˆ†ๆ”ฏไพ†ไฟ็•™ๅœจๆญค็‹€ๆ…‹ไธ‹ๆ‰€ๅš็š„ๆไบค๏ผŒๆ‚จๅฏไปฅ้€้Žๅœจ switch ๆŒ‡ไปค\n"
+"ไธญๆ–ฐๅขžๅƒๆ•ธ -c ไพ†ๅฏฆ็พ๏ผˆ็พๅœจๆˆ–็จๅพŒ๏ผ‰ใ€‚ไพ‹ๅฆ‚๏ผš\n"
+"\n"
+"  git switch -c <ๆ–ฐๅˆ†ๆ”ฏๅ>\n"
+"\n"
+"ๆˆ–่€…ๅพฉๅŽŸๆญคๅ‹•ไฝœ๏ผš\n"
+"\n"
+"  git switch -\n"
+"\n"
+"้€้Žๅฐ‡่จญๅฎš่ฎŠๆ•ธ advice.detachedHead ่จญๅฎš็‚บ false ไพ†้—œ้–‰ๆญคๅปบ่ญฐ\n"
+"\n"
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "ๆŒ‡ไปคๅˆ—ไปฅ \\ ็ตๅฐพ"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "ๆœช้–‰ๅˆ็š„ๅผ•่™Ÿ"
+
+#: apply.c:69
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„็ฉบ็™ฝๅญ—ๅ…ƒ้ธ้ … '%s'"
+
+#: apply.c:85
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„็ฉบ็™ฝๅญ—ๅ…ƒๅฟฝ็•ฅ้ธ้ … '%s'"
+
+#: apply.c:135
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject ๅ’Œ --3way ไธ่ƒฝๅŒๆ™‚ไฝฟ็”จใ€‚"
+
+#: apply.c:137
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached ๅ’Œ --3way ไธ่ƒฝๅŒๆ™‚ไฝฟ็”จใ€‚"
+
+#: apply.c:140
+msgid "--3way outside a repository"
+msgstr "--3way ๅœจ็‰ˆๆœฌๅบซไน‹ๅค–"
+
+#: apply.c:151
+msgid "--index outside a repository"
+msgstr "--index ๅœจ็‰ˆๆœฌๅบซไน‹ๅค–"
+
+#: apply.c:154
+msgid "--cached outside a repository"
+msgstr "--cached ๅœจ็‰ˆๆœฌๅบซไน‹ๅค–"
+
+#: apply.c:801
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "็„กๆณ•ๆบ–ๅ‚™ๆ™‚้–“ๆˆณๆญฃ่ฆ่กจ็คบๅผ %s"
+
+#: apply.c:810
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec ่ฟ”ๅ›ž %d๏ผŒ่ผธๅ…ฅ็‚บ๏ผš%s"
+
+#: apply.c:884
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "ไธ่ƒฝๅœจไฟฎ่ฃœๆช”็š„็ฌฌ %d ่กŒๆ‰พๅˆฐๆช”ๆกˆๅ"
+
+#: apply.c:922
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr "git apply๏ผš้Œฏ่ชค็š„ git-diff - ๆ‡‰็‚บ /dev/null๏ผŒไฝ†ๅœจ็ฌฌ %2$d ่กŒๅพ—ๅˆฐ %1$s"
+
+#: apply.c:928
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply๏ผš้Œฏ่ชค็š„ git-diff - ็ฌฌ %d ่กŒไธŠๆ–ฐๆช”ๆกˆๅไธไธ€่‡ด"
+
+#: apply.c:929
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply๏ผš้Œฏ่ชค็š„ git-diff - ็ฌฌ %d ่กŒไธŠ่ˆŠๆช”ๆกˆๅไธไธ€่‡ด"
+
+#: apply.c:934
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply๏ผš้Œฏ่ชค็š„ git-diff - ็ฌฌ %d ่กŒ่™•ๆ‡‰็‚บ /dev/null"
+
+#: apply.c:963
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "็ฌฌ %d ่กŒๅŒ…ๅซ็„กๆ•ˆๆช”ๆกˆๆจกๅผ๏ผš%s"
+
+#: apply.c:1282
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "ไธไธ€่‡ด็š„ๆช”ๆกˆ้ ญ๏ผŒ%d ่กŒๅ’Œ %d ่กŒ"
+
+#: apply.c:1372
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] "็•ถ็งป้™ค %d ๅ€‹ๅ‰ๅฐŽ่ทฏๅพ‘ๅพŒ git diff ้ ญ็ผบไนๆช”ๆกˆๅ่จŠๆฏ๏ผˆ็ฌฌ %d ่กŒ๏ผ‰"
+
+#: apply.c:1385
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "git diff ็š„ๆจ™้ ญ่จŠๆฏไธญ็ผบไนๆช”ๆกˆๅ่จŠๆฏ๏ผˆ็ฌฌ %d ่กŒ๏ผ‰"
+
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount๏ผšๆ„ๅค–็š„่กŒ๏ผš%.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "็ฌฌ %d ่กŒ็š„ไฟฎ่ฃœๆช”็‰‡ๆฎตๆฒ’ๆœ‰ๆจ™้ ญ่จŠๆฏ๏ผš%.*s"
+
+#: apply.c:1753
+msgid "new file depends on old contents"
+msgstr "ๆ–ฐๆช”ๆกˆไพ่ณด่ˆŠๅ…งๅฎน"
+
+#: apply.c:1755
+msgid "deleted file still has contents"
+msgstr "ๅˆช้™ค็š„ๆช”ๆกˆไปๆœ‰ๅ…งๅฎน"
+
+#: apply.c:1789
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "ไฟฎ่ฃœๆช”ๅœจ็ฌฌ %d ่กŒ็™ผ็พๆๅฃž"
+
+#: apply.c:1826
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "ๆ–ฐๆช”ๆกˆ %s ไพ่ณด่ˆŠๅ…งๅฎน"
+
+#: apply.c:1828
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "ๅˆช้™ค็š„ๆช”ๆกˆ %s ไปๆœ‰ๅ…งๅฎน"
+
+#: apply.c:1831
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** ่ญฆๅ‘Š๏ผšๆช”ๆกˆ %s ๆˆ็‚บ็ฉบๆช”ๆกˆไฝ†ไธฆๆœชๅˆช้™ค"
+
+#: apply.c:1978
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "ไบŒ้€ฒไฝไฟฎ่ฃœๆช”ๅœจ็ฌฌ %d ่กŒๆๅฃž๏ผš%.*s"
+
+#: apply.c:2015
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ไบŒ้€ฒไฝไฟฎ่ฃœๆช”ไฝๆ–ผ็ฌฌ %d ่กŒ"
+
+#: apply.c:2177
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "ไฟฎ่ฃœๆช”ๆกˆ็š„็ฌฌ %d ่กŒๅชๆœ‰ๅžƒๅœพ่ณ‡ๆ–™"
+
+#: apply.c:2263
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "็„กๆณ•่ฎ€ๅ–็ฌฆ่™Ÿ้€ฃ็ต %s"
+
+#: apply.c:2267
+#, c-format
+msgid "unable to open or read %s"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿๆˆ–่ฎ€ๅ– %s"
+
+#: apply.c:2936
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "็„กๆ•ˆ็š„่กŒ้ฆ–ๅญ—ๅ…ƒ๏ผš'%c'"
+
+#: apply.c:3057
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "ๅ€ๅกŠ #%d ๆˆๅŠŸๅฅ—็”จๆ–ผ %d๏ผˆไฝ็งป %d ่กŒ๏ผ‰"
+
+#: apply.c:3069
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "ไธŠไธ‹ๆ–‡ๆธ›ๅฐ‘ๅˆฐ๏ผˆ%ld/%ld๏ผ‰ไปฅๅœจ็ฌฌ %d ่กŒๅฅ—็”จไฟฎ่ฃœๆช”็‰‡ๆฎต"
+
+#: apply.c:3075
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"็•ถๆŸฅ่ฉข๏ผš\n"
+"%.*s"
+
+#: apply.c:3097
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "็ผบๅฐ‘ '%s' ็š„ไบŒ้€ฒไฝไฟฎ่ฃœๆช”่ณ‡ๆ–™"
+
+#: apply.c:3105
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr "ไธ่ƒฝๅๅ‘ๅฅ—็”จไธ€ๅ€‹็ผบๅฐ‘ๅˆฐ '%s' ็š„ๅๅ‘่ณ‡ๆ–™ๅ€ๅกŠ็š„ไบŒ้€ฒไฝไฟฎ่ฃœๆช”"
+
+#: apply.c:3152
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr "ไธ่ƒฝๅœจ '%s' ไธŠๅฅ—็”จๆฒ’ๆœ‰ๅฎŒๆ•ด็ดขๅผ•่กŒ็š„ไบŒ้€ฒไฝไฟฎ่ฃœๆช”"
+
+#: apply.c:3163
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "ไฟฎ่ฃœๆช”ๅฅ—็”จๅˆฐ '%s'๏ผˆ%s๏ผ‰๏ผŒไฝ†ๆ˜ฏๅ’Œ็›ฎๅ‰ๅ…งๅฎนไธ็ฌฆๅˆใ€‚"
+
+#: apply.c:3171
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "ไฟฎ่ฃœๆช”ๅฅ—็”จๅˆฐ็ฉบๆช”ๆกˆ '%s'๏ผŒไฝ†ๅ…ถไธฆ้ž็ฉบๆช”ๆกˆ"
+
+#: apply.c:3189
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "็„กๆณ•่ฎ€ๅ– '%2$s' ๅฟ…้œ€็š„็›ฎๆจ™ๆช”ๆกˆ %1$s"
+
+#: apply.c:3202
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "ไบŒ้€ฒไฝไฟฎ่ฃœๆช”ๆœชๅฅ—็”จๅˆฐ '%s'"
+
+#: apply.c:3209
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr "ๅˆฐ '%s' ็š„ไบŒ้€ฒไฝไฟฎ่ฃœๆช”็”ข็”Ÿไบ†ไธๆญฃ็ขบ็š„็ตๆžœ๏ผˆๆ‡‰็‚บ %s๏ผŒๅป็‚บ %s๏ผ‰"
+
+#: apply.c:3230
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "ๆ‰“ไฟฎ่ฃœๆช”ๅคฑๆ•—๏ผš%s:%ld"
+
+#: apply.c:3353
+#, c-format
+msgid "cannot checkout %s"
+msgstr "ไธ่ƒฝ็ฐฝๅ‡บ %s"
+
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#, c-format
+msgid "failed to read %s"
+msgstr "็„กๆณ•่ฎ€ๅ– %s"
+
+#: apply.c:3413
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "่ฎ€ๅ–ไฝๆ–ผ็ฌฆ่™Ÿ้€ฃ็ตไธญ็š„ '%s'"
+
+#: apply.c:3442 apply.c:3685
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "่ทฏๅพ‘ %s ๅทฒ็ถ“่ขซ้‡ๆ–ฐๅ‘ฝๅ/ๅˆช้™ค"
+
+#: apply.c:3528 apply.c:3700
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s๏ผšไธๅญ˜ๅœจๆ–ผ็ดขๅผ•ไธญ"
+
+#: apply.c:3537 apply.c:3708
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s๏ผšๅ’Œ็ดขๅผ•ไธ็ฌฆๅˆ"
+
+#: apply.c:3572
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr "็‰ˆๆœฌๅบซ็ผบไนๅฟ…่ฆ็š„่ณ‡ๆ–™็‰ฉไปถไปฅ้€ฒ่กŒไธ‰ๆ–นๅˆไฝตใ€‚"
+
+#: apply.c:3575
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "ๅ›ž่ฝๅˆฐไธ‰ๆ–นๅˆไฝต...\n"
+
+#: apply.c:3591 apply.c:3595
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "็„กๆณ•่ฎ€ๅ– '%s' ็š„็›ฎๅ‰ๅ…งๅฎน"
+
+#: apply.c:3607
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "็„กๆณ•ๅ›ž่ฝๅˆฐไธ‰ๆ–นๅˆไฝต...\n"
+
+#: apply.c:3621
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "ๅฅ—็”จไฟฎ่ฃœๆช”ๅˆฐ '%s' ๅญ˜ๅœจ่ก็ชใ€‚\n"
+
+#: apply.c:3626
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "ๆˆๅŠŸๅฅ—็”จไฟฎ่ฃœๆช”ๅˆฐ '%s'ใ€‚\n"
+
+#: apply.c:3652
+msgid "removal patch leaves file contents"
+msgstr "็งป้™คไฟฎ่ฃœๆช”ไป็•™ไธ‹ไบ†ๆช”ๆกˆๅ…งๅฎน"
+
+#: apply.c:3725
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s๏ผš้Œฏ่ชค้กžๅž‹"
+
+#: apply.c:3727
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s ็š„้กžๅž‹ๆ˜ฏ %o๏ผŒๆ‡‰็‚บ %o"
+
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
+#, c-format
+msgid "invalid path '%s'"
+msgstr "็„กๆ•ˆ่ทฏๅพ‘ '%s'"
+
+#: apply.c:3936
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s๏ผšๅทฒ็ถ“ๅญ˜ๅœจๆ–ผ็ดขๅผ•ไธญ"
+
+#: apply.c:3939
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s๏ผšๅทฒ็ถ“ๅญ˜ๅœจๆ–ผๅทฅไฝœๅ€ไธญ"
+
+#: apply.c:3959
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "%2$s ็š„ๆ–ฐๆจกๅผ๏ผˆ%1$o๏ผ‰ๅ’Œ่ˆŠๆจกๅผ๏ผˆ%3$o๏ผ‰ไธ็ฌฆๅˆ"
+
+#: apply.c:3964
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "%2$s ็š„ๆ–ฐๆจกๅผ๏ผˆ%1$o๏ผ‰ๅ’Œ %4$s ็š„่ˆŠๆจกๅผ๏ผˆ%3$o๏ผ‰ไธ็ฌฆๅˆ"
+
+#: apply.c:3984
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "ๅ—ๅฝฑ้Ÿฟ็š„ๆช”ๆกˆ '%s' ไฝๆ–ผ็ฌฆ่™Ÿ้€ฃ็ตไธญ"
+
+#: apply.c:3988
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s๏ผšไฟฎ่ฃœๆช”ๆœชๅฅ—็”จ"
+
+#: apply.c:4003
+#, c-format
+msgid "Checking patch %s..."
+msgstr "ๆญฃๅœจๆชขๆŸฅไฟฎ่ฃœๆช” %s..."
+
+#: apply.c:4095
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "ๅญๆจก็ต„ %s ็š„ sha1 ่จŠๆฏ็ผบๅฐ‘ๆˆ–็„กๆ•ˆ"
+
+#: apply.c:4102
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "%s ็š„ๆจกๅผ่ฎŠๆ›ด๏ผŒไฝ†ๅฎƒไธๅœจ็›ฎๅ‰ HEAD ไธญ"
+
+#: apply.c:4105
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1 ่จŠๆฏ็ผบๅฐ‘ๆˆ–็„กๆ•ˆ๏ผˆ%s๏ผ‰ใ€‚"
+
+#: apply.c:4114
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "ไธ่ƒฝๅœจๆšซๆ™‚็ดขๅผ•ไธญๆ–ฐๅขž %s"
+
+#: apply.c:4124
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "ไธ่ƒฝๆŠŠๆšซๆ™‚็ดขๅผ•ๅฏซๅ…ฅๅˆฐ %s"
+
+#: apply.c:4262
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "ไธ่ƒฝๅพž็ดขๅผ•ไธญ็งป้™ค %s"
+
+#: apply.c:4296
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "ๅญๆจก็ต„ %s ๆๅฃž็š„ไฟฎ่ฃœๆช”"
+
+#: apply.c:4302
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "ไธ่ƒฝๅฐๅปบ็ซ‹ๆช”ๆกˆ '%s' ๅ‘ผๅซ stat"
+
+#: apply.c:4310
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "ไธ่ƒฝ็‚บๅปบ็ซ‹ๆช”ๆกˆ %s ๅปบ็ซ‹ๅพŒ็ซฏๅ„ฒๅญ˜"
+
+#: apply.c:4316 apply.c:4461
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "็„กๆณ•็‚บ %s ๆ–ฐๅขžๅฟซๅ–ๆข็›ฎ"
+
+#: apply.c:4359
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "ๅฏซๅ…ฅ '%s' ๅคฑๆ•—"
+
+#: apply.c:4363
+#, c-format
+msgid "closing file '%s'"
+msgstr "้—œ้–‰ๆช”ๆกˆ '%s'"
+
+#: apply.c:4433
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "ไธ่ƒฝๅฏซๅ…ฅๆช”ๆกˆ '%s' ๆฌŠ้™ %o"
+
+#: apply.c:4531
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "ๆˆๅŠŸๅฅ—็”จไฟฎ่ฃœๆช” %sใ€‚"
+
+#: apply.c:4539
+msgid "internal error"
+msgstr "ๅ…ง้ƒจ้Œฏ่ชค"
+
+#: apply.c:4542
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "ๅฅ—็”จ %%s ๅ€‹ไฟฎ่ฃœๆช”๏ผŒๅ…ถไธญ %d ๅ€‹่ขซๆ‹’็ต•..."
+
+#: apply.c:4553
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "ๆˆช็Ÿญ .rej ๆช”ๆกˆๅ็‚บ %.*s.rej"
+
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#, c-format
+msgid "cannot open %s"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ %s"
+
+#: apply.c:4575
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "็ฌฌ #%d ๅ€‹็‰‡ๆฎตๆˆๅŠŸๆ‡‰็”จใ€‚"
+
+#: apply.c:4579
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "ๆ‹’็ต•็ฌฌ #%d ๅ€‹็‰‡ๆฎตใ€‚"
+
+#: apply.c:4698
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "็•ฅ้Žไฟฎ่ฃœๆช” '%s'ใ€‚"
+
+#: apply.c:4706
+msgid "unrecognized input"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„่ผธๅ…ฅ"
+
+#: apply.c:4726
+msgid "unable to read index file"
+msgstr "็„กๆณ•่ฎ€ๅ–็ดขๅผ•ๆช”ๆกˆ"
+
+#: apply.c:4883
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿไฟฎ่ฃœๆช” '%s'๏ผš%s"
+
+#: apply.c:4910
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "ๆŠ‘ๅˆถไธ‹ไปๆœ‰ %d ๅ€‹็ฉบ็™ฝๅญ—ๅ…ƒ่ชค็”จ"
+
+#: apply.c:4916 apply.c:4931
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d ่กŒๆ–ฐๅขžไบ†็ฉบ็™ฝๅญ—ๅ…ƒ่ชค็”จใ€‚"
+
+#: apply.c:4924
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "ไฟฎๅพฉ็ฉบ็™ฝ้Œฏ่ชคๅพŒ๏ผŒๆ‡‰็”จไบ† %d ่กŒใ€‚"
+
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+msgid "Unable to write new index file"
+msgstr "็„กๆณ•ๅฏซๅ…ฅๆ–ฐ็ดขๅผ•ๆช”ๆกˆ"
+
+#: apply.c:4968
+msgid "don't apply changes matching the given path"
+msgstr "ไธ่ฆๆ‡‰็”จ่ˆ‡็ตฆๅ‡บ่ทฏๅพ‘ๅ‘็ฌฆๅˆ็š„่ฎŠๆ›ด"
+
+#: apply.c:4971
+msgid "apply changes matching the given path"
+msgstr "ๆ‡‰็”จ่ˆ‡็ตฆๅ‡บ่ทฏๅพ‘ๅ‘็ฌฆๅˆ็š„่ฎŠๆ›ด"
+
+#: apply.c:4973 builtin/am.c:2260
+msgid "num"
+msgstr "ๆ•ธๅญ—"
+
+#: apply.c:4974
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "ๅพžๅ‚ณ็ตฑ็š„ diff ่ทฏๅพ‘ไธญ็งป้™คๆŒ‡ๅฎšๆ•ธ้‡็š„ๅ‰ๅฐŽๆ–œ็ทš"
+
+#: apply.c:4977
+msgid "ignore additions made by the patch"
+msgstr "ๅฟฝ็•ฅไฟฎ่ฃœๆช”ไธญ็š„ๆ–ฐๅขž็š„ๆช”ๆกˆ"
+
+#: apply.c:4979
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "ไธๅฅ—็”จไฟฎ่ฃœๆช”๏ผŒ่€Œๆ˜ฏ้กฏ็คบ่ผธๅ…ฅ็š„ๅทฎ็•ฐ็ตฑ่จˆ๏ผˆdiffstat๏ผ‰"
+
+#: apply.c:4983
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "ไปฅๅ้€ฒไฝๆ•ธ้กฏ็คบๆ–ฐๅขžๅ’Œๅˆช้™ค็š„่กŒๆ•ธ"
+
+#: apply.c:4985
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "ไธๅฅ—็”จไฟฎ่ฃœๆช”๏ผŒ่€Œๆ˜ฏ้กฏ็คบ่ผธๅ…ฅ็š„ๆฆ‚่ฆ"
+
+#: apply.c:4987
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "ไธๅฅ—็”จไฟฎ่ฃœๆช”๏ผŒ่€Œๆ˜ฏๆชข่ฆ–ไฟฎ่ฃœๆช”ๆ˜ฏๅฆๅฏๆ‡‰็”จ"
+
+#: apply.c:4989
+msgid "make sure the patch is applicable to the current index"
+msgstr "็ขบ่ชไฟฎ่ฃœๆช”ๅฏไปฅๅฅ—็”จๅˆฐ็›ฎๅ‰็ดขๅผ•"
+
+#: apply.c:4991
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "ไฝฟ็”จๆŒ‡ไปค `git add --intent-to-add` ๆจ™่จ˜ๆ–ฐๅขžๆช”ๆกˆ"
+
+#: apply.c:4993
+msgid "apply a patch without touching the working tree"
+msgstr "ๅฅ—็”จไฟฎ่ฃœๆช”่€Œไธไฟฎๆ”นๅทฅไฝœๅ€"
+
+#: apply.c:4995
+msgid "accept a patch that touches outside the working area"
+msgstr "ๆŽฅๅ—ไฟฎๆ”นๅทฅไฝœๅ€ไน‹ๅค–ๆช”ๆกˆ็š„ไฟฎ่ฃœๆช”"
+
+#: apply.c:4998
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "้‚„ๅฅ—็”จๆญคไฟฎ่ฃœๆช”๏ผˆ่ˆ‡ --stat/--summary/--check ้ธ้ …ๅŒๆ™‚ไฝฟ็”จ๏ผ‰"
+
+#: apply.c:5000
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "ๅฆ‚ๆžœไธ€ๅ€‹ไฟฎ่ฃœๆช”ไธ่ƒฝๆ‡‰็”จๅ‰‡ๅ˜—่ฉฆไธ‰ๆ–นๅˆไฝต"
+
+#: apply.c:5002
+msgid "build a temporary index based on embedded index information"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹ๆšซๆ™‚็ดขๅผ•ๅŸบๆ–ผๅตŒๅ…ฅ็š„็ดขๅผ•่จŠๆฏ"
+
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+msgid "paths are separated with NUL character"
+msgstr "่ทฏๅพ‘ไปฅ NUL ๅญ—ๅ…ƒๅˆ†้š”"
+
+#: apply.c:5007
+msgid "ensure at least <n> lines of context match"
+msgstr "็ขบไฟ่‡ณๅฐ‘็ฌฆๅˆ <n> ่กŒไธŠไธ‹ๆ–‡"
+
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+msgid "action"
+msgstr "ๅ‹•ไฝœ"
+
+#: apply.c:5009
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "ๆชขๆŸฅๆ–ฐๅขžๅ’Œไฟฎๆ”น็š„่กŒไธญ้–“็š„็ฉบ็™ฝๅญ—ๅ…ƒๆฟซ็”จ"
+
+#: apply.c:5012 apply.c:5015
+msgid "ignore changes in whitespace when finding context"
+msgstr "ๅฐ‹ๆ‰พไธŠไธ‹ๆ–‡ๆ™‚ๅฟฝ็•ฅ็ฉบ็™ฝๅญ—ๅ…ƒ็š„่ฎŠๆ›ด"
+
+#: apply.c:5018
+msgid "apply the patch in reverse"
+msgstr "ๅๅ‘ๅฅ—็”จไฟฎ่ฃœๆช”"
+
+#: apply.c:5020
+msgid "don't expect at least one line of context"
+msgstr "็„ก้œ€่‡ณๅฐ‘ไธ€่กŒไธŠไธ‹ๆ–‡"
+
+#: apply.c:5022
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "ๅฐ‡ๆ‹’็ต•็š„ไฟฎ่ฃœๆช”็‰‡ๆฎตๅ„ฒๅญ˜ๅœจๅฐๆ‡‰็š„ *.rej ๆช”ๆกˆไธญ"
+
+#: apply.c:5024
+msgid "allow overlapping hunks"
+msgstr "ๅ…่จฑ้‡็–Š็š„ไฟฎ่ฃœๆช”็‰‡ๆฎต"
+
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+msgid "be verbose"
+msgstr "่ฉณ็ดฐ่ผธๅ‡บ"
+
+#: apply.c:5027
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "ๅ…่จฑไธๆญฃ็ขบ็š„ๆช”ๆกˆๆœซๅฐพๆ›่กŒ็ฌฆ่™Ÿ"
+
+#: apply.c:5030
+msgid "do not trust the line counts in the hunk headers"
+msgstr "ไธไฟกไปปไฟฎ่ฃœๆช”็‰‡ๆฎต็š„ๆจ™้ ญ่จŠๆฏไธญ็š„่กŒ่™Ÿ"
+
+#: apply.c:5032 builtin/am.c:2248
+msgid "root"
+msgstr "ๆ น็›ฎ้Œ„"
+
+#: apply.c:5033
+msgid "prepend <root> to all filenames"
+msgstr "็‚บๆ‰€ๆœ‰ๆช”ๆกˆๅๅ‰ๆ–ฐๅขž <ๆ น็›ฎ้Œ„>"
+
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<้ธ้ …>] <ๆจนๆˆ–ๆไบค> [<่ทฏๅพ‘>...]"
+
+#: archive.c:15
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:16
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <็‰ˆๆœฌๅบซ> [--exec <ๆŒ‡ไปค>] [<้ธ้ …>] <ๆจนๆˆ–ๆไบค> [<่ทฏๅพ‘>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <็‰ˆๆœฌๅบซ> [--exec <ๆŒ‡ไปค>] --list"
+
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "่ทฏๅพ‘่ฆๆ ผ '%s' ๆœช็ฌฆๅˆไปปไฝ•ๆช”ๆกˆ"
+
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "็„กๆญคๅผ•็”จ๏ผš%.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ฉไปถๅ๏ผš%s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๆจน็‹€็‰ฉไปถ๏ผš%s"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "็›ฎๅ‰ๅทฅไฝœ็›ฎ้Œ„ๆœช่ขซ่ฟฝ่นค"
+
+#: archive.c:457
+msgid "fmt"
+msgstr "ๆ ผๅผ"
+
+#: archive.c:457
+msgid "archive format"
+msgstr "ๆญธๆช”ๆ ผๅผ"
+
+#: archive.c:458 builtin/log.c:1653
+msgid "prefix"
+msgstr "ๅ‰็ถด"
+
+#: archive.c:459
+msgid "prepend prefix to each pathname in the archive"
+msgstr "็‚บๆญธๆช”ไธญๆฏๅ€‹่ทฏๅพ‘ๅๅŠ ไธŠๅ‰็ถด"
+
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
+msgid "file"
+msgstr "ๆช”ๆกˆ"
+
+#: archive.c:461 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "ๆญธๆช”ๅฏซๅ…ฅๆญคๆช”ๆกˆ"
+
+#: archive.c:463
+msgid "read .gitattributes in working directory"
+msgstr "่ฎ€ๅ–ๅทฅไฝœๅ€ไธญ็š„ .gitattributes"
+
+#: archive.c:464
+msgid "report archived files on stderr"
+msgstr "ๅœจๆจ™ๆบ–้Œฏ่ชคไธŠๅ ฑๅ‘Šๆญธๆช”ๆช”ๆกˆ"
+
+#: archive.c:465
+msgid "store only"
+msgstr "ๅชๅ„ฒๅญ˜"
+
+#: archive.c:466
+msgid "compress faster"
+msgstr "ๅฃ“็ธฎ้€Ÿๅบฆๆ›ดๅฟซ"
+
+#: archive.c:474
+msgid "compress better"
+msgstr "ๅฃ“็ธฎๆ•ˆๆžœๆ›ดๅฅฝ"
+
+#: archive.c:477
+msgid "list supported archive formats"
+msgstr "ๅˆ—ๅ‡บๆ”ฏๆด็š„ๆญธๆช”ๆ ผๅผ"
+
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
+msgid "repo"
+msgstr "็‰ˆๆœฌๅบซ"
+
+#: archive.c:480 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "ๅพž้ ็ซฏ็‰ˆๆœฌๅบซ๏ผˆ<็‰ˆๆœฌๅบซ>๏ผ‰ๆ“ทๅ–ๆญธๆช”ๆช”ๆกˆ"
+
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr "ๆŒ‡ไปค"
+
+#: archive.c:482 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "้ ็ซฏ git-upload-archive ๆŒ‡ไปค็š„่ทฏๅพ‘"
+
+#: archive.c:489
+msgid "Unexpected option --remote"
+msgstr "ๆœช็Ÿฅๅƒๆ•ธ --remote"
+
+#: archive.c:491
+msgid "Option --exec can only be used together with --remote"
+msgstr "้ธ้ … --exec ๅช่ƒฝๅ’Œ --remote ๅŒๆ™‚ไฝฟ็”จ"
+
+#: archive.c:493
+msgid "Unexpected option --output"
+msgstr "ๆœช็Ÿฅๅƒๆ•ธ --output"
+
+#: archive.c:515
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "ๆœช็Ÿฅๆญธๆช”ๆ ผๅผ '%s'"
+
+#: archive.c:522
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "ๅƒๆ•ธไธๆ”ฏๆดๆญคๆ ผๅผ '%s'๏ผš-%d"
+
+#: archive-tar.c:125 archive-zip.c:351
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ่ณ‡ๆ–™็‰ฉไปถ %s"
+
+#: archive-tar.c:266 archive-zip.c:369
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "ไธๆ”ฏๆด็š„ๆช”ๆกˆๆจกๅผ๏ผš0%o (SHA1: %s)"
+
+#: archive-tar.c:293 archive-zip.c:359
+#, c-format
+msgid "cannot read %s"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– %s"
+
+#: archive-tar.c:465
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "็„กๆณ•ๅ•Ÿๅ‹• '%s' ้Žๆฟพๅ™จ"
+
+#: archive-tar.c:468
+msgid "unable to redirect descriptor"
+msgstr "็„กๆณ•้‡ๅฎšๅ‘ๆ่ฟฐ็ฌฆ"
+
+#: archive-tar.c:475
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "'%s' ้Žๆฟพๅ™จๅ ฑๅ‘Šไบ†้Œฏ่ชค"
+
+#: archive-zip.c:319
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "่ทฏๅพ‘ไธๆ˜ฏๆœ‰ๆ•ˆ็š„ UTF-8๏ผš%s"
+
+#: archive-zip.c:323
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "่ทฏๅพ‘ๅคช้•ท๏ผˆ%d ๅญ—ๅ…ƒ๏ผŒSHA1๏ผš%s๏ผ‰๏ผš%s"
+
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#, c-format
+msgid "deflate error (%d)"
+msgstr "ๅฃ“็ธฎ้Œฏ่ชค (%d)"
+
+#: archive-zip.c:615
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "ๅฐๆ–ผๆœฌ็ณป็ตฑๆ™‚้–“ๆˆณๅคชๅคง๏ผš%<PRIuMAX>"
+
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๅฑฌๆ€งๅ"
+
+#: attr.c:369
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "ไธๅ…่จฑ %s๏ผš%s:%d"
+
+#: attr.c:409
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"ๅๅ‘ๆจกๅผๅœจ git attributes ไธญ่ขซๅฟฝ็•ฅ\n"
+"็•ถๅญ—ไธฒ็ขบๅฏฆ่ฆไปฅ้ฉšๅ˜†่™Ÿ้–‹ๅง‹ๆ™‚๏ผŒไฝฟ็”จ '\\!'ใ€‚"
+
+#: bisect.c:468
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "ๆช”ๆกˆ '%s' ๅŒ…ๅซ้Œฏ่ชค็š„ๅผ•็”จๆ ผๅผ๏ผš%s"
+
+#: bisect.c:678
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "ๆˆ‘ๅ€‘็„กๆณ•้€ฒ่กŒๆ›ดๅคš็š„ไบŒๅˆ†ๅฐ‹ๆ‰พ๏ผ\n"
+
+#: bisect.c:745
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๆไบคๅ %s"
+
+#: bisect.c:770
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"ๅˆไฝตๅŸบ็คŽ %s ๆ˜ฏๅฃž็š„ใ€‚\n"
+"้€™ๆ„ๅ‘ณ่‘—ไป‹ๆ–ผ %s ๅ’Œ [%s] ไน‹้–“็š„ bug ๅทฒ็ถ“่ขซไฟฎๅพฉใ€‚\n"
+
+#: bisect.c:775
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"ๅˆไฝตๅŸบ็คŽ %s ๆ˜ฏๆ–ฐ็š„ใ€‚\n"
+"ไป‹ๆ–ผ %s ๅ’Œ [%s] ไน‹้–“็š„ๅฑฌๆ€งๅทฒ็ถ“่ขซไฟฎๆ”นใ€‚\n"
+
+#: bisect.c:780
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"ๅˆไฝตๅŸบ็คŽ %s ๆ˜ฏ %sใ€‚\n"
+"้€™ๆ„ๅ‘ณ่‘—็ฌฌไธ€ๅ€‹ '%s' ๆไบคไฝๆ–ผ %s ๅ’Œ [%s] ไน‹้–“ใ€‚\n"
+
+#: bisect.c:788
+#, c-format
+msgid ""
+"Some %s revs are not ancestors of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"ไธ€ไบ› %s ็‰ˆๆœฌไธๆ˜ฏ %s ็‰ˆๆœฌ็š„็ฅ–ๅ…ˆใ€‚\n"
+"้€™็จฎๆƒ…ๆณไธ‹ git ไบŒๅˆ†ๅฐ‹ๆ‰พ็„กๆณ•ๆญฃๅธธๅทฅไฝœใ€‚\n"
+"ๆ‚จๅฏ่ƒฝๅผ„้Œฏไบ† %s ๅ’Œ %s ็‰ˆๆœฌ๏ผŸ\n"
+
+#: bisect.c:801
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"ไป‹ๆ–ผ %s ๅ’Œ [%s] ็š„ๅˆไฝตๅŸบ็คŽไธ€ๅฎš่ขซๅฟฝ็•ฅไบ†ใ€‚\n"
+"ๆ‰€ไปฅๆˆ‘ๅ€‘็„กๆณ•็ขบ่ช็ฌฌไธ€ๅ€‹ %s ๆไบคๆ˜ฏๅฆไป‹ๆ–ผ %s ๅ’Œ %s ไน‹้–“ใ€‚\n"
+"ๆˆ‘ๅ€‘ไป่ˆŠ็นผ็บŒใ€‚"
+
+#: bisect.c:840
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "ไบŒๅˆ†ๅฐ‹ๆ‰พไธญ๏ผšๅˆไฝตๅŸบ็คŽๅฟ…้ ˆๆ˜ฏ็ถ“้Žๆธฌ่ฉฆ็š„\n"
+
+#: bisect.c:890
+#, c-format
+msgid "a %s revision is needed"
+msgstr "้œ€่ฆไธ€ๅ€‹ %s ็‰ˆๆœฌ"
+
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#, c-format
+msgid "could not create file '%s'"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ๆช”ๆกˆ '%s'"
+
+#: bisect.c:966 builtin/merge.c:149
+#, c-format
+msgid "could not read file '%s'"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–ๆช”ๆกˆ '%s'"
+
+#: bisect.c:997
+msgid "reading bisect refs failed"
+msgstr "่ฎ€ๅ–ไบŒๅˆ†ๅฐ‹ๆ‰พๅผ•็”จๅคฑๆ•—"
+
+#: bisect.c:1019
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s ๅŒๆ™‚็‚บ %s ๅ’Œ %s\n"
+
+#: bisect.c:1028
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"ๆฒ’ๆœ‰็™ผ็พๅฏๆธฌ่ฉฆ็š„ๆไบคใ€‚\n"
+"ๅฏ่ƒฝๆ‚จๅœจๅŸท่กŒๆ™‚ไฝฟ็”จไบ†้Œฏ่ชค็š„่ทฏๅพ‘ๅƒๆ•ธ๏ผŸ\n"
+
+#: bisect.c:1057
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "๏ผˆๅคงๆฆ‚ %d ๆญฅ๏ผ‰"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1063
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "ไบŒๅˆ†ๅฐ‹ๆ‰พไธญ๏ผšๅœจๆญคไน‹ๅพŒ๏ผŒ้‚„ๅ‰ฉ %d ๅ€‹็‰ˆๆœฌๅพ…ๆธฌ่ฉฆ %s\n"
+
+#: blame.c:2700
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents ๅ’Œ --reverse ไธ่ƒฝๆทท็”จใ€‚"
+
+#: blame.c:2714
+msgid "cannot use --contents with final commit object name"
+msgstr "ไธ่ƒฝๅฐ‡ --contents ๅ’Œๆœ€็ต‚็š„ๆไบค็‰ฉไปถๅๅ…ฑ็”จ"
+
+#: blame.c:2735
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr "--reverse ๅ’Œ --first-parent ๅ…ฑ็”จ๏ผŒ้œ€่ฆๆŒ‡ๅฎšๆœ€ๆ–ฐ็š„ๆไบค"
+
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
+#: builtin/shortlog.c:192
+msgid "revision walk setup failed"
+msgstr "็‰ˆๆœฌ้ๆญท่จญๅฎšๅคฑๆ•—"
+
+#: blame.c:2762
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr "--reverse ๅ’Œ --first-parent ๅ…ฑ็”จ๏ผŒ้œ€่ฆ็ฌฌไธ€็ฅ–ๅ…ˆ้ˆไธŠ็š„ๆไบค็ฏ„ๅœ"
+
+#: blame.c:2773
+#, c-format
+msgid "no such path %s in %s"
+msgstr "ๅœจ %2$s ไธญ็„กๆญค่ทฏๅพ‘ %1$s"
+
+#: blame.c:2784
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "ไธ่ƒฝ็‚บ่ทฏๅพ‘ %2$s ่ฎ€ๅ–่ณ‡ๆ–™็‰ฉไปถ %1$s"
+
+#: branch.c:53
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+"\n"
+"ๅœจไฟฎๅพฉ้Œฏ่ชคๅพŒ๏ผŒๆ‚จๅฏไปฅๅ˜—่ฉฆไฟฎๆ”น้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ๏ผŒ้€้ŽๅŸท่กŒๆŒ‡ไปค\n"
+"\"git branch --set-upstream-to=%s%s%s\" ใ€‚"
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "ๆœช่จญๅฎšๅˆ†ๆ”ฏ %s ไฝœ็‚บๅฎƒ่‡ชๅทฑ็š„ไธŠๆธธใ€‚"
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr "ๅˆ†ๆ”ฏ '%1$s' ่จญๅฎš็‚บไฝฟ็”จ้‡ๅฎšๅŸบๅบ•ไพ†่ฟฝ่นคไพ†่‡ช '%3$s' ็š„้ ็ซฏๅˆ†ๆ”ฏ '%2$s'ใ€‚"
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "ๅˆ†ๆ”ฏ '%1$s' ่จญๅฎš็‚บ่ฟฝ่นคไพ†่‡ช '%3$s' ็š„้ ็ซฏๅˆ†ๆ”ฏ '%2$s'ใ€‚"
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "ๅˆ†ๆ”ฏ '%s' ่จญๅฎš็‚บไฝฟ็”จ้‡ๅฎšๅŸบๅบ•ไพ†่ฟฝ่นคๆœฌๆฉŸๅˆ†ๆ”ฏ '%s'ใ€‚"
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "ๅˆ†ๆ”ฏ '%s' ่จญๅฎš็‚บ่ฟฝ่นคๆœฌๆฉŸๅˆ†ๆ”ฏ '%s'ใ€‚"
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "ๅˆ†ๆ”ฏ '%s' ่จญๅฎš็‚บไฝฟ็”จ้‡ๅฎšๅŸบๅบ•ไพ†่ฟฝ่นค้ ็ซฏๅผ•็”จ '%s'ใ€‚"
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "ๅˆ†ๆ”ฏ '%s' ่จญๅฎš็‚บ่ฟฝ่นค้ ็ซฏๅผ•็”จ '%s'ใ€‚"
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr "ๅˆ†ๆ”ฏ '%s' ่จญๅฎš็‚บไฝฟ็”จ้‡ๅฎšๅŸบๅบ•ไพ†่ฟฝ่นคๆœฌๆฉŸๅผ•็”จ '%s'ใ€‚"
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "ๅˆ†ๆ”ฏ '%s' ่จญๅฎš็‚บ่ฟฝ่นคๆœฌๆฉŸๅผ•็”จ '%s'ใ€‚"
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "็„กๆณ•ๅฏซๅ…ฅไธŠๆธธๅˆ†ๆ”ฏ่จญๅฎš"
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "ๆœช่ฟฝ่นค๏ผšๅผ•็”จ %s ๆœ‰ๆญง็พฉ"
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๅˆ†ๆ”ฏๅ็จฑใ€‚"
+
+#: branch.c:208
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "ไธ€ๅ€‹ๅˆ†ๆ”ฏๅ '%s' ๅทฒ็ถ“ๅญ˜ๅœจใ€‚"
+
+#: branch.c:213
+msgid "Cannot force update the current branch."
+msgstr "็„กๆณ•ๅผทๅˆถๆ›ดๆ–ฐ็›ฎๅ‰ๅˆ†ๆ”ฏใ€‚"
+
+#: branch.c:233
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr "็„กๆณ•่จญๅฎš่ฟฝ่นค่จŠๆฏ๏ผ›่ตทๅง‹้ปž '%s' ไธๆ˜ฏไธ€ๅ€‹ๅˆ†ๆ”ฏใ€‚"
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "่ซ‹ๆฑ‚็š„ไธŠๆธธๅˆ†ๆ”ฏ '%s' ไธๅญ˜ๅœจ"
+
+#: branch.c:237
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"ๅฆ‚ๆžœๆ‚จๆญฃ่จˆๅŠƒๅŸบๆ–ผ้ ็ซฏไธ€ๅ€‹็พๅญ˜็š„ไธŠๆธธๅˆ†ๆ”ฏ้–‹ๅง‹ไฝ ็š„ๅทฅไฝœ๏ผŒ\n"
+"ๆ‚จๅฏ่ƒฝ้œ€่ฆๅŸท่กŒ \"git fetch\" ไพ†ๅ–ๅพ—ๅˆ†ๆ”ฏใ€‚\n"
+"\n"
+"ๅฆ‚ๆžœๆ‚จๆญฃ่จˆๅŠƒๆŽจ้€ไธ€ๅ€‹่ƒฝ่ˆ‡ๅฐๆ‡‰้ ็ซฏๅˆ†ๆ”ฏๅปบ็ซ‹่ฟฝ่นค็š„ๆ–ฐ็š„ๆœฌๆฉŸๅˆ†ๆ”ฏ๏ผŒ\n"
+"ๆ‚จๅฏ่ƒฝ้œ€่ฆไฝฟ็”จ \"git push -u\" ๆŽจ้€ๅˆ†ๆ”ฏไธฆ่จญๅฎšๅ’ŒไธŠๆธธ็š„้—œ่ฏใ€‚"
+
+#: branch.c:281
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ฉไปถๅ๏ผš'%s'ใ€‚"
+
+#: branch.c:301
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "ๆญง็พฉ็š„็‰ฉไปถๅ๏ผš'%s'ใ€‚"
+
+#: branch.c:306
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "็„กๆ•ˆ็š„ๅˆ†ๆ”ฏ้ปž๏ผš'%s'ใ€‚"
+
+#: branch.c:364
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' ๅทฒ็ถ“็ฐฝๅ‡บๅˆฐ '%s'"
+
+#: branch.c:387
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "ๅทฅไฝœๅ€ %s ็š„ HEAD ๆŒ‡ๅ‘ๆฒ’ๆœ‰่ขซๆ›ดๆ–ฐ"
+
+#: bundle.c:36
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' ไธๅƒๆ˜ฏไธ€ๅ€‹ v2 ็‰ˆๆœฌ็š„ๅŒ…ๆช”ๆกˆ"
+
+#: bundle.c:64
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ๅŒ…้ ญ๏ผš%s%s (%d)"
+
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
+#, c-format
+msgid "could not open '%s'"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ '%s'"
+
+#: bundle.c:143
+msgid "Repository lacks these prerequisite commits:"
+msgstr "็‰ˆๆœฌๅบซไธญ็ผบๅฐ‘้€™ไบ›ๅฟ…ๅ‚™็š„ๆไบค๏ผš"
+
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "้œ€่ฆ็‰ˆๆœฌๅบซ้ฉ—่ญ‰ไธ€ๅ€‹ๅŒ…"
+
+#: bundle.c:197
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "้€™ๅ€‹ๅŒ…ไธญๅซๆœ‰้€™ %d ๅ€‹ๅผ•็”จ๏ผš"
+
+#: bundle.c:204
+msgid "The bundle records a complete history."
+msgstr "้€™ๅ€‹ๅŒ…่จ˜้Œ„ไธ€ๅ€‹ๅฎŒๆ•ดๆญทๅฒใ€‚"
+
+#: bundle.c:206
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "้€™ๅ€‹ๅŒ…้œ€่ฆ้€™ %d ๅ€‹ๅผ•็”จ๏ผš"
+
+#: bundle.c:273
+msgid "unable to dup bundle descriptor"
+msgstr "็„กๆณ•่ค‡่ฃฝ bundle ๆ่ฟฐ็ฌฆ"
+
+#: bundle.c:280
+msgid "Could not spawn pack-objects"
+msgstr "ไธ่ƒฝ็”Ÿๆˆ pack-objects ้€ฒ็จ‹"
+
+#: bundle.c:291
+msgid "pack-objects died"
+msgstr "pack-objects ็ต‚ๆญข"
+
+#: bundle.c:333
+msgid "rev-list died"
+msgstr "rev-list ็ต‚ๆญข"
+
+#: bundle.c:382
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "ๅผ•็”จ '%s' ่ขซ rev-list ้ธ้ …ๆŽ’้™ค"
+
+#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ๅƒๆ•ธ๏ผš%s"
+
+#: bundle.c:469
+msgid "Refusing to create empty bundle."
+msgstr "ไธ่ƒฝๅปบ็ซ‹็ฉบๅŒ…ใ€‚"
+
+#: bundle.c:479
+#, c-format
+msgid "cannot create '%s'"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ '%s'"
+
+#: bundle.c:504
+msgid "index-pack died"
+msgstr "index-pack ็ต‚ๆญข"
+
+#: color.c:329
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "็„กๆ•ˆ็š„้ก่‰ฒๅ€ผ๏ผš%.*s"
+
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#, c-format
+msgid "could not parse %s"
+msgstr "ไธ่ƒฝ่งฃๆž %s"
+
+#: commit.c:53
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s ไธๆ˜ฏไธ€ๅ€‹ๆไบค๏ผ"
+
+#: commit.c:193
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"ๅฐ <GIT_DIR>/info/grafts ็š„ๆ”ฏๆดๅทฒ่ขซๆฃ„็”จ๏ผŒไธฆๅฐ‡ๅœจ\n"
+"ๆœชไพ†็š„Git็‰ˆๆœฌไธญ่ขซ็งป้™คใ€‚\n"
+"\n"
+"่ซ‹ไฝฟ็”จ \"git replace --convert-graft-file\" ๅฐ‡\n"
+"grafts ่ฝ‰ๆ›็‚บๅ–ไปฃๅผ•็”จใ€‚\n"
+"\n"
+"่จญๅฎš \"git config advice.graftFileDeprecated false\"\n"
+"ๅฏ้—œ้–‰ๆœฌๆถˆๆฏ"
+
+#: commit.c:1153
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "ๆไบค %s ๆœ‰ไธ€ๅ€‹้žๅฏไฟก็š„่ฒ็จฑไพ†่‡ช %s ็š„ GPG ็ฐฝๅใ€‚"
+
+#: commit.c:1157
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "ๆไบค %s ๆœ‰ไธ€ๅ€‹้Œฏ่ชค็š„่ฒ็จฑไพ†่‡ช %s ็š„ GPG ็ฐฝๅใ€‚"
+
+#: commit.c:1160
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "ๆไบค %s ๆฒ’ๆœ‰ GPG ็ฐฝๅใ€‚"
+
+#: commit.c:1163
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "ๆไบค %s ๆœ‰ไธ€ๅ€‹ไพ†่‡ช %s ็š„ๅฅฝ็š„ GPG ็ฐฝๅใ€‚\n"
+
+#: commit.c:1417
+msgid ""
+"Warning: commit message did not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"่ญฆๅ‘Š๏ผšๆไบค่ชชๆ˜Žไธ็ฌฆๅˆ UTF-8 ๅญ—ๅ…ƒ็ทจ็ขผใ€‚\n"
+"ๆ‚จๅฏไปฅ้€้Žไฟฎ่ฃœๆไบคไพ†ๆ”นๆญฃๆไบค่ชชๆ˜Ž๏ผŒๆˆ–่€…ๅฐ‡่จญๅฎš่ฎŠๆ•ธ i18n.commitencoding\n"
+"่จญๅฎš็‚บๆ‚จ้ …็›ฎๆ‰€็”จ็š„ๅญ—ๅ…ƒ็ทจ็ขผใ€‚\n"
+
+#: commit-graph.c:122
+msgid "commit-graph file is too small"
+msgstr "ๆไบคๅœ–ๅฝขๆช”ๆกˆๅคชๅฐ"
+
+#: commit-graph.c:189
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "ๆไบคๅœ–ๅฝข็ฐฝๅ %X ๅ’Œ็ฐฝๅ %X ไธ็ฌฆๅˆ"
+
+#: commit-graph.c:196
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "ๆไบคๅœ–ๅฝข็‰ˆๆœฌ %X ๅ’Œ็‰ˆๆœฌ %X ไธ็ฌฆๅˆ"
+
+#: commit-graph.c:203
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "ๆไบคๅœ–ๅฝข้›œๆนŠ็‰ˆๆœฌ %X ๅ’Œ็‰ˆๆœฌ %X ไธ็ฌฆๅˆ"
+
+#: commit-graph.c:226
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr "ๆไบคๅœ–ๅฝขๅ€ๅกŠๅฐ‹ๆ‰พ่กจๆข็›ฎ้บๅคฑ๏ผŒๆช”ๆกˆๅฏ่ƒฝไธๅฎŒๆ•ด"
+
+#: commit-graph.c:237
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "ๆไบคๅœ–ๅฝขไธๆญฃ็ขบ็š„ๅ€ๅกŠไฝ็งป %08x%08x"
+
+#: commit-graph.c:280
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "ๆไบคๅœ–ๅฝขๅ€ๅกŠ id %08x ๅ‡บ็พไบ†ๅคšๆฌก"
+
+#: commit-graph.c:343
+msgid "commit-graph has no base graphs chunk"
+msgstr "ๆไบคๅœ–ๅฝขๆฒ’ๆœ‰ๅŸบ็คŽๅœ–ๅฝขๅ€ๅกŠ"
+
+#: commit-graph.c:353
+msgid "commit-graph chain does not match"
+msgstr "ๆไบคๅœ–ๅฝข้ˆไธ็ฌฆๅˆ"
+
+#: commit-graph.c:401
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "็„กๆ•ˆ็š„ๆไบคๅœ–ๅฝข้ˆ๏ผš่กŒ '%s' ไธๆ˜ฏไธ€ๅ€‹้›œๆนŠๅ€ผ"
+
+#: commit-graph.c:425
+msgid "unable to find all commit-graph files"
+msgstr "็„กๆณ•ๆ‰พๅˆฐๆ‰€ๆœ‰ๆไบคๅœ–ๅฝขๆช”ๆกˆ"
+
+#: commit-graph.c:558 commit-graph.c:618
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "็„กๆ•ˆ็š„ๆไบคไฝ็ฝฎใ€‚ๆไบคๅœ–ๅฝขๅฏ่ƒฝๅทฒๆๅฃž"
+
+#: commit-graph.c:579
+#, c-format
+msgid "could not find commit %s"
+msgstr "็„กๆณ•ๆ‰พๅˆฐๆไบค %s"
+
+#: commit-graph.c:852 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "ไธ่ƒฝ่งฃๆžๆไบค %s"
+
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "็„กๆณ•็ฒๅพ—็‰ฉไปถ %s ้กžๅž‹"
+
+#: commit-graph.c:1043
+msgid "Loading known commits in commit graph"
+msgstr "ๆญฃๅœจ่ผ‰ๅ…ฅๆไบคๅœ–ไธญ็š„ๅทฒ็Ÿฅๆไบค"
+
+#: commit-graph.c:1060
+msgid "Expanding reachable commits in commit graph"
+msgstr "ๆญฃๅœจๆ“ดๅฑ•ๆไบคๅœ–ไธญ็š„ๅฏไปฅๅ–ๅพ—ๆไบค"
+
+#: commit-graph.c:1079
+msgid "Clearing commit marks in commit graph"
+msgstr "ๆญฃๅœจๆธ…้™คๆไบคๅœ–ไธญ็š„ๆไบคๆจ™่จ˜"
+
+#: commit-graph.c:1098
+msgid "Computing commit graph generation numbers"
+msgstr "ๆญฃๅœจ่จˆ็ฎ—ๆไบคๅœ–ไธ–ไปฃๆ•ธๅญ—"
+
+#: commit-graph.c:1173
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "ๆญฃๅœจ %d ๅ€‹ๅŒ…ไธญๅฐ‹ๆ‰พๆไบคๅœ–็š„ๆไบค"
+
+#: commit-graph.c:1186
+#, c-format
+msgid "error adding pack %s"
+msgstr "ๆ–ฐๅขžๅŒ… %s ็™ผ็”Ÿ้Œฏ่ชค"
+
+#: commit-graph.c:1190
+#, c-format
+msgid "error opening index for %s"
+msgstr "็‚บ %s ้–‹ๅ•Ÿ็ดขๅผ•็™ผ็”Ÿ้Œฏ่ชค"
+
+#: commit-graph.c:1214
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "ๆญฃๅœจๅพž %d ๅ€‹ๅผ•็”จไธญๅฐ‹ๆ‰พๆไบคๅœ–็š„ๆไบค"
+
+#: commit-graph.c:1234
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "็„กๆ•ˆ็š„ๆไบค็‰ฉไปถ ID๏ผš%s"
+
+#: commit-graph.c:1249
+msgid "Finding commits for commit graph among packed objects"
+msgstr "ๆญฃๅœจๆ‰“ๅŒ…็‰ฉไปถไธญๅฐ‹ๆ‰พๆไบคๅœ–็š„ๆไบค"
+
+#: commit-graph.c:1264
+msgid "Counting distinct commits in commit graph"
+msgstr "ๆญฃๅœจ่จˆ็ฎ—ๆไบคๅœ–ไธญไธๅŒ็š„ๆไบค"
+
+#: commit-graph.c:1294
+msgid "Finding extra edges in commit graph"
+msgstr "ๆญฃๅœจๅฐ‹ๆ‰พๆไบคๅœ–ไธญ้กๅค–็š„้‚Š"
+
+#: commit-graph.c:1340
+msgid "failed to write correct number of base graph ids"
+msgstr "็„กๆณ•ๅฏซๅ…ฅๆญฃ็ขบๆ•ธ้‡็š„ๅŸบ็คŽๅœ–ๅฝข ID"
+
+#: commit-graph.c:1373 midx.c:814
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "ไธ่ƒฝ็‚บ %s ๅปบ็ซ‹ๅ…ˆๅฐŽ็›ฎ้Œ„"
+
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
+#, c-format
+msgid "unable to create '%s'"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ '%s'"
+
+#: commit-graph.c:1445
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "ๆญฃๅœจ็”จ %d ๆญฅๅฏซๅ‡บๆไบคๅœ–"
+
+#: commit-graph.c:1486
+msgid "unable to open commit-graph chain file"
+msgstr "็„กๆณ•้–‹ๅ•Ÿๆไบคๅœ–ๅฝข้ˆๆช”ๆกˆ"
+
+#: commit-graph.c:1498
+msgid "failed to rename base commit-graph file"
+msgstr "็„กๆณ•้‡ๆ–ฐๅ‘ฝๅๅŸบ็คŽๆไบคๅœ–ๅฝขๆช”ๆกˆ"
+
+#: commit-graph.c:1518
+msgid "failed to rename temporary commit-graph file"
+msgstr "็„กๆณ•้‡ๆ–ฐๅ‘ฝๅๆšซๆ™‚ๆไบคๅœ–ๅฝขๆช”ๆกˆ"
+
+#: commit-graph.c:1631
+msgid "Scanning merged commits"
+msgstr "ๆญฃๅœจๆŽƒๆๅˆไฝตๆไบค"
+
+#: commit-graph.c:1642
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "ๆ„ๅค–็š„้‡่ค‡ๆไบค ID %s"
+
+#: commit-graph.c:1665
+msgid "Merging commit-graph"
+msgstr "ๆญฃๅœจๅˆไฝตๆไบคๅœ–ๅฝข"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "ๆไบคๅœ–ๆ ผๅผไธ่ƒฝๅฏซๅ…ฅ %d ๅ€‹ๆไบค"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "ๆไบคๅคชๅคšไธ่ƒฝ็•ซๅœ–"
+
+#: commit-graph.c:1944
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "ๆไบคๅœ–ๆช”ๆกˆ็š„็ธฝๅ’ŒๆชขๆŸฅ็ขผ้Œฏ่ชค๏ผŒๅฏ่ƒฝๅทฒ็ถ“ๆๅฃž"
+
+#: commit-graph.c:1954
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "ๆไบคๅœ–ๅฝข็š„็‰ฉไปถ ID ้ †ๅบไธๆญฃ็ขบ๏ผš%s ็„ถๅพŒ %s"
+
+#: commit-graph.c:1964 commit-graph.c:1979
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "ๆไบคๅœ–ๅฝขๆœ‰ไธๆญฃ็ขบ็š„ๆ‰‡ๅ‡บๅ€ผ๏ผšfanout[%d] = %u != %u"
+
+#: commit-graph.c:1971
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "็„กๆณ•ๅพžๆไบคๅœ–ๅฝขไธญ่งฃๆžๆไบค %s"
+
+#: commit-graph.c:1989
+msgid "Verifying commits in commit graph"
+msgstr "ๆญฃๅœจ้ฉ—่ญ‰ๆไบคๅœ–ไธญ็š„ๆไบค"
+
+#: commit-graph.c:2003
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "็„กๆณ•ๅพžๆไบคๅœ–ๅฝข็š„็‰ฉไปถๅบซไธญ่งฃๆžๆไบค %s"
+
+#: commit-graph.c:2010
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "ๆไบคๅœ–ๅฝขไธญ็š„ๆไบค %s ็š„ๆ นๆจน็‹€็‰ฉไปถ ID ๆ˜ฏ %s != %s"
+
+#: commit-graph.c:2020
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "ๆไบค %s ็š„ๆไบคๅœ–ๅฝข็ˆถๆไบคๅˆ—่กจๅคช้•ทไบ†"
+
+#: commit-graph.c:2029
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s ็š„ๆไบคๅœ–ๅฝข็ˆถๆไบคๆ˜ฏ %s != %s"
+
+#: commit-graph.c:2042
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "ๆไบค %s ็š„ๆไบคๅœ–ๅฝข็ˆถๆไบคๅˆ—่กจ้Žๆ—ฉ็ต‚ๆญข"
+
+#: commit-graph.c:2047
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr "ๆไบคๅœ–ๅฝขไธญๆไบค %s ็š„ไธ–ไปฃ่™Ÿๆ˜ฏ้›ถ๏ผŒไฝ†ๅ…ถๅฎƒๅœฐๆ–น้ž้›ถ"
+
+#: commit-graph.c:2051
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr "ๆไบคๅœ–ๅฝขไธญๆไบค %s ็š„ไธ–ไปฃ่™Ÿ้ž้›ถ๏ผŒไฝ†ๅ…ถๅฎƒๅœฐๆ–นๆ˜ฏ้›ถ"
+
+#: commit-graph.c:2066
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "ๆไบคๅœ–ๅฝขไธญ็š„ๆไบค %s ็š„ไธ–ไปฃ่™Ÿๆ˜ฏ %u != %u"
+
+#: commit-graph.c:2072
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "ๆไบคๅœ–ๅฝขไธญๆไบค %s ็š„ๆไบคๆ—ฅๆœŸๆ˜ฏ %<PRIuMAX> != %<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "่จ˜ๆ†ถ้ซ”่€—็›ก"
+
+#: config.c:124
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"่ถ…้Žไบ†ๆœ€ๅคงๅŒ…ๅซๆทฑๅบฆ๏ผˆ%1$d๏ผ‰๏ผŒ็•ถๅพž\n"
+"\t%3$s\n"
+"ๅŒ…ๅซ\n"
+"\t%2$s\n"
+"้€™ๅฏ่ƒฝๆ˜ฏๅ› ็‚บๅพช็’ฐๅŒ…ๅซใ€‚"
+
+#: config.c:140
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "็„กๆณ•ๆ“ดๅฑ•ๅŒ…ๅซ่ทฏๅพ‘ '%s'"
+
+#: config.c:151
+msgid "relative config includes must come from files"
+msgstr "็›ธๅฐ่ทฏๅพ‘็š„่จญๅฎšๆช”ๆกˆๅผ•็”จๅฟ…้ ˆไพ†่‡ชๆ–ผๆช”ๆกˆ"
+
+#: config.c:197
+msgid "relative config include conditionals must come from files"
+msgstr "็›ธๅฐ่ทฏๅพ‘็š„่จญๅฎšๆช”ๆกˆๆขไปถๅผ•็”จๅฟ…้ ˆไพ†่‡ชๆ–ผๆช”ๆกˆ"
+
+#: config.c:376
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "้ตๅๆฒ’ๆœ‰ๅŒ…ๅซไธ€ๅ€‹ๅฐ็ฏ€ๅ็จฑ๏ผš%s"
+
+#: config.c:382
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "้ตๅๆฒ’ๆœ‰ๅŒ…ๅซ่ฎŠๆ•ธๅ๏ผš%s"
+
+#: config.c:406 sequencer.c:2444
+#, c-format
+msgid "invalid key: %s"
+msgstr "็„กๆ•ˆ้ตๅ๏ผš%s"
+
+#: config.c:412
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "็„กๆ•ˆ้ตๅ๏ผˆๆœ‰ๆ›่กŒ็ฌฆ่™Ÿ๏ผ‰๏ผš%s"
+
+#: config.c:448 config.c:460
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "ๅฝ่จญๅฎšๅƒๆ•ธ๏ผš%s"
+
+#: config.c:495
+#, c-format
+msgid "bogus format in %s"
+msgstr "%s ไธญๆ ผๅผ้Œฏ่ชค"
+
+#: config.c:821
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "่ณ‡ๆ–™็‰ฉไปถ %2$s ไธญ้Œฏ่ชค็š„่จญๅฎš่กŒ %1$d"
+
+#: config.c:825
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "ๆช”ๆกˆ %2$s ไธญ้Œฏ่ชค็š„่จญๅฎš่กŒ %1$d"
+
+#: config.c:829
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "ๆจ™ๆบ–่ผธๅ…ฅไธญ้Œฏ่ชค็š„่จญๅฎš่กŒ %d"
+
+#: config.c:833
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "ๅญๆจก็ต„่ณ‡ๆ–™็‰ฉไปถ %2$s ไธญ้Œฏ่ชค็š„่จญๅฎš่กŒ %1$d"
+
+#: config.c:837
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "ๆŒ‡ไปคๅˆ— %2$s ไธญ้Œฏ่ชค็š„่จญๅฎš่กŒ %1$d"
+
+#: config.c:841
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "ๅœจ %2$s ไธญ้Œฏ่ชค็š„่จญๅฎš่กŒ %1$d"
+
+#: config.c:978
+msgid "out of range"
+msgstr "่ถ…ๅ‡บ็ฏ„ๅœ"
+
+#: config.c:978
+msgid "invalid unit"
+msgstr "็„กๆ•ˆ็š„ๅ–ฎไฝ"
+
+#: config.c:979
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "่จญๅฎš่ฎŠๆ•ธ '%2$s' ็š„ๆ•ธๅญ—ๅ–ๅ€ผ '%1$s' ่จญๅฎš้Œฏ่ชค๏ผš%3$s"
+
+#: config.c:998
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "่ณ‡ๆ–™็‰ฉไปถ %3$s ไธญ่จญๅฎš่ฎŠๆ•ธ '%2$s' ้Œฏ่ชค็š„ๅ–ๅ€ผ '%1$s'๏ผš%4$s"
+
+#: config.c:1001
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "ๆช”ๆกˆ %3$s ไธญ่จญๅฎš่ฎŠๆ•ธ '%2$s' ้Œฏ่ชค็š„ๅ–ๅ€ผ '%1$s'๏ผš%4$s"
+
+#: config.c:1004
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "ๆจ™ๆบ–่ผธๅ…ฅไธญ่จญๅฎš่ฎŠๆ•ธ '%2$s' ้Œฏ่ชค็š„ๅ–ๅ€ผ '%1$s'๏ผš%3$s"
+
+#: config.c:1007
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr "ๅญๆจก็ต„่ณ‡ๆ–™ %3$s ไธญ่จญๅฎš่ฎŠๆ•ธ '%2$s' ้Œฏ่ชค็š„ๅ–ๅ€ผ '%1$s'๏ผš%4$s"
+
+#: config.c:1010
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "ๆŒ‡ไปคๅˆ— %3$s ไธญ่จญๅฎš่ฎŠๆ•ธ '%2$s' ้Œฏ่ชค็š„ๅ–ๅ€ผ '%1$s'๏ผš%4$s"
+
+#: config.c:1013
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "ๅœจ %3$s ไธญ่จญๅฎš่ฎŠๆ•ธ '%2$s' ้Œฏ่ชค็š„ๅ–ๅ€ผ '%1$s'๏ผš%4$s"
+
+#: config.c:1108
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "็„กๆณ•ๆ“ดๅฑ•ไฝฟ็”จ่€…็›ฎ้Œ„๏ผš'%s'"
+
+#: config.c:1117
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' ็š„ๅ€ผ '%1$s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๆ™‚้–“ๆˆณ"
+
+#: config.c:1208
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "็ธฎๅฏซ้•ทๅบฆ่ถ…ๅ‡บ็ฏ„ๅœ๏ผš%d"
+
+#: config.c:1222 config.c:1233
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "้Œฏ่ชค็š„ zlib ๅฃ“็ธฎ็ดšๅˆฅ %d"
+
+#: config.c:1325
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar ๆ‡‰่ฉฒๆ˜ฏไธ€ๅ€‹ๅญ—ๅ…ƒ"
+
+#: config.c:1358
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "็„กๆ•ˆ็š„็‰ฉไปถๅปบ็ซ‹ๆจกๅผ๏ผš%s"
+
+#: config.c:1430
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s ็š„ๅ–ๅ€ผๆ ผๅผ้Œฏ่ชค"
+
+#: config.c:1456
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s ็š„ๅ–ๅ€ผๆ ผๅผ้Œฏ่ชค๏ผš%s"
+
+#: config.c:1457
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "ๅฟ…้ ˆๆ˜ฏๅ…ถไธญไน‹ไธ€๏ผšnothingใ€matchingใ€simpleใ€upstream ๆˆ– current"
+
+#: config.c:1518 builtin/pack-objects.c:3541
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "้Œฏ่ชค็š„ๆ‰“ๅŒ…ๅฃ“็ธฎ็ดšๅˆฅ %d"
+
+#: config.c:1639
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "็„กๆณ•ๅพž่ณ‡ๆ–™็‰ฉไปถ '%s' ่ผ‰ๅ…ฅ่จญๅฎš"
+
+#: config.c:1642
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "ๅผ•็”จ '%s' ๆฒ’ๆœ‰ๆŒ‡ๅ‘ไธ€ๅ€‹่ณ‡ๆ–™็‰ฉไปถ"
+
+#: config.c:1659
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "ไธ่ƒฝ่งฃๆž่จญๅฎš็‰ฉไปถ '%s'"
+
+#: config.c:1689
+#, c-format
+msgid "failed to parse %s"
+msgstr "่งฃๆž %s ๅคฑๆ•—"
+
+#: config.c:1743
+msgid "unable to parse command-line config"
+msgstr "็„กๆณ•่งฃๆžๆŒ‡ไปคๅˆ—ไธญ็š„่จญๅฎš"
+
+#: config.c:2097
+msgid "unknown error occurred while reading the configuration files"
+msgstr "ๅœจ่ฎ€ๅ–่จญๅฎšๆช”ๆกˆๆ™‚้‡ๅˆฐๆœช็Ÿฅ้Œฏ่ชค"
+
+#: config.c:2267
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "็„กๆ•ˆ %s๏ผš'%s'"
+
+#: config.c:2312
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "splitIndex.maxPercentChange ็š„ๅ–ๅ€ผ '%d' ๆ‡‰่ฉฒไป‹ๆ–ผ 0 ๅ’Œ 100 ไน‹้–“"
+
+#: config.c:2358
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "็„กๆณ•่งฃๆžๆŒ‡ไปคๅˆ—่จญๅฎšไธญ็š„ '%s'"
+
+#: config.c:2360
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "ๅœจๆช”ๆกˆ '%2$s' ็š„็ฌฌ %3$d ่กŒ็™ผ็พ้Œฏ่ชค็š„่จญๅฎš่ฎŠๆ•ธ '%1$s'"
+
+#: config.c:2441
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "็„กๆ•ˆ็š„ๅฐ็ฏ€ๅ็จฑ '%s'"
+
+#: config.c:2473
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s ๆœ‰ๅคšๅ€‹ๅ–ๅ€ผ"
+
+#: config.c:2502
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "ๅฏซๅ…ฅๆ–ฐ็š„่จญๅฎšๆช”ๆกˆ %s ๅคฑๆ•—"
+
+#: config.c:2754 config.c:3078
+#, c-format
+msgid "could not lock config file %s"
+msgstr "ไธ่ƒฝ้Ž–ๅฎš่จญๅฎšๆช”ๆกˆ %s"
+
+#: config.c:2765
+#, c-format
+msgid "opening %s"
+msgstr "้–‹ๅ•Ÿ %s"
+
+#: config.c:2800 builtin/config.c:344
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "็„กๆ•ˆๆจกๅผ๏ผš%s"
+
+#: config.c:2825
+#, c-format
+msgid "invalid config file %s"
+msgstr "็„กๆ•ˆ็š„่จญๅฎšๆช”ๆกˆ %s"
+
+#: config.c:2838 config.c:3091
+#, c-format
+msgid "fstat on %s failed"
+msgstr "ๅฐ %s ๅ‘ผๅซ fstat ๅคฑๆ•—"
+
+#: config.c:2849
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr "ไธ่ƒฝ mmap '%s'"
+
+#: config.c:2858 config.c:3096
+#, c-format
+msgid "chmod on %s failed"
+msgstr "ๅฐ %s ๅ‘ผๅซ chmod ๅคฑๆ•—"
+
+#: config.c:2943 config.c:3193
+#, c-format
+msgid "could not write config file %s"
+msgstr "ไธ่ƒฝๅฏซๅ…ฅ่จญๅฎšๆช”ๆกˆ %s"
+
+#: config.c:2977
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "ไธ่ƒฝ่จญๅฎš '%s' ็‚บ '%s'"
+
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#, c-format
+msgid "could not unset '%s'"
+msgstr "ไธ่ƒฝๅ–ๆถˆ่จญๅฎš '%s'"
+
+#: config.c:3069
+#, c-format
+msgid "invalid section name: %s"
+msgstr "็„กๆ•ˆ็š„ๅฐ็ฏ€ๅ็จฑ๏ผš%s"
+
+#: config.c:3236
+#, c-format
+msgid "missing value for '%s'"
+msgstr "%s ็š„ๅ–ๅ€ผ็ผบๅฐ‘"
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr "้ ็ซฏๅœจๅˆๅง‹้€ฃ็ทšๆ™‚ๅณๆŽ›ๆ–ท"
+
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"็„กๆณ•่ฎ€ๅ–้ ็ซฏ็‰ˆๆœฌๅบซใ€‚\n"
+"\n"
+"่ซ‹็ขบ่ชๆ‚จๆœ‰ๆญฃ็ขบ็š„ๅญ˜ๅ–ๆฌŠ้™ไธฆไธ”็‰ˆๆœฌๅบซๅญ˜ๅœจใ€‚"
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "ไผบๆœๅ™จไธๆ”ฏๆด '%s'"
+
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "ไผบๆœๅ™จไธๆ”ฏๆด็‰นๆ€ง '%s'"
+
+#: connect.c:114
+msgid "expected flush after capabilities"
+msgstr "ๅœจ่ƒฝๅŠ›ไน‹ๅพŒๆ‡‰็‚บไธ€ๅ€‹ flush ๅŒ…"
+
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "ๅฟฝ็•ฅ็ฌฌไธ€่กŒ '%s' ไน‹ๅพŒ็š„่ƒฝๅŠ›ๆฌ„ไฝ"
+
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "ๅ”ๅฎš้Œฏ่ชค๏ผšๆ„ๅค–็š„ capabilities^{}"
+
+#: connect.c:273
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "ๅ”ๅฎš้Œฏ่ชค๏ผš้ ๆœŸๆทบ่ค‡่ฃฝ sha-1๏ผŒๅปๅพ—ๅˆฐ '%s'"
+
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
+msgstr "ๅฆไธ€็ซฏ็š„็‰ˆๆœฌๅบซไธ่ƒฝๆ˜ฏๆทบ่ค‡่ฃฝ็‰ˆๆœฌๅบซ"
+
+#: connect.c:313
+msgid "invalid packet"
+msgstr "็„กๆ•ˆๅฐๅŒ…"
+
+#: connect.c:333
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "ๅ”ๅฎš้Œฏ่ชค๏ผšๆ„ๅค–็š„ '%s'"
+
+#: connect.c:441
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "็„กๆ•ˆ็š„ ls-refs ๅ›žๆ‡‰๏ผš%s"
+
+#: connect.c:445
+msgid "expected flush after ref listing"
+msgstr "ๅœจๅผ•็”จๅˆ—่กจไน‹ๅพŒๆ‡‰่ฉฒๆœ‰ไธ€ๅ€‹ flush ๅŒ…"
+
+#: connect.c:544
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "ไธๆ”ฏๆด '%s' ๅ”ๅฎš"
+
+#: connect.c:595
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "็„กๆณ•็‚บ socket ่จญๅฎš SO_KEEPALIVE"
+
+#: connect.c:635 connect.c:698
+#, c-format
+msgid "Looking up %s ... "
+msgstr "ๅฐ‹ๆ‰พ %s ..."
+
+#: connect.c:639
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr "็„กๆณ•ๅฐ‹ๆ‰พ %s๏ผˆๅŸ  %s๏ผ‰๏ผˆ%s๏ผ‰"
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:643 connect.c:714
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"ๅฎŒๆˆใ€‚\n"
+"้€ฃ็ทšๅˆฐ %s๏ผˆๅŸ  %s๏ผ‰... "
+
+#: connect.c:665 connect.c:742
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"็„กๆณ•้€ฃ็ทšๅˆฐ %s๏ผš\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:671 connect.c:748
+msgid "done."
+msgstr "ๅฎŒๆˆใ€‚"
+
+#: connect.c:702
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "็„กๆณ•ๅฐ‹ๆ‰พ %s๏ผˆ%s๏ผ‰"
+
+#: connect.c:708
+#, c-format
+msgid "unknown port %s"
+msgstr "ๆœช็ŸฅๅŸ  %s"
+
+#: connect.c:845 connect.c:1175
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "ๅทฒ้˜ปๆญขๅฅ‡ๆ€ช็š„ไธปๆฉŸๅ็จฑ '%s'"
+
+#: connect.c:847
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "ๅทฒ้˜ปๆญขๅฅ‡ๆ€ช็š„ๅŸ ่™Ÿ '%s'"
+
+#: connect.c:857
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "ไธ่ƒฝๅ•Ÿๅ‹•ไปฃ็† %s"
+
+#: connect.c:928
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr "ๆœชๆŒ‡ๅฎš่ทฏๅพ‘๏ผŒๅŸท่กŒ 'git help pull' ๆชข่ฆ–ๆœ‰ๆ•ˆ็š„ url ่ชžๆณ•"
+
+#: connect.c:1123
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh ่ฎŠ้ซ” 'simple' ไธๆ”ฏๆด -4"
+
+#: connect.c:1135
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh ่ฎŠ้ซ” 'simple' ไธๆ”ฏๆด -6"
+
+#: connect.c:1152
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh ่ฎŠ้ซ” 'simple' ไธๆ”ฏๆด่จญๅฎšๅŸ "
+
+#: connect.c:1264
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "ๅทฒ้˜ปๆญขๅฅ‡ๆ€ช็š„่ทฏๅพ‘ๅ '%s'"
+
+#: connect.c:1311
+msgid "unable to fork"
+msgstr "็„กๆณ• fork"
+
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+msgid "Checking connectivity"
+msgstr "ๆญฃๅœจๆชขๆŸฅ้€ฃ้€šๆ€ง"
+
+#: connected.c:110
+msgid "Could not run 'git rev-list'"
+msgstr "ไธ่ƒฝๅŸท่กŒ 'git rev-list'"
+
+#: connected.c:130
+msgid "failed write to rev-list"
+msgstr "ๅฏซๅ…ฅ rev-list ๅคฑๆ•—"
+
+#: connected.c:137
+msgid "failed to close rev-list's stdin"
+msgstr "้—œ้–‰ rev-list ็š„ๆจ™ๆบ–่ผธๅ…ฅๅคฑๆ•—"
+
+#: convert.c:194
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "้žๆณ•็š„ crlf ๅ‹•ไฝœ %d"
+
+#: convert.c:207
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "%s ไธญ็š„ CRLF ๅฐ‡่ขซ LF ๅ–ไปฃ"
+
+#: convert.c:209
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"%s ไธญ็š„ CRLF ๅฐ‡่ขซ LF ๅ–ไปฃใ€‚<\n"
+"ๅœจๅทฅไฝœๅ€ไธญ่ฉฒๆช”ๆกˆไปไฟๆŒๅŽŸๆœ‰็š„ๆ›่กŒ็ฌฆ่™Ÿใ€‚"
+
+#: convert.c:217
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "ๆช”ๆกˆ %s ไธญ็š„ LF ๅฐ‡่ขซ CRLF ๅ–ไปฃ"
+
+#: convert.c:219
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"%s ไธญ็š„ LF ๅฐ‡่ขซ CRLF ๅ–ไปฃใ€‚\n"
+"ๅœจๅทฅไฝœๅ€ไธญ่ฉฒๆช”ๆกˆไปไฟๆŒๅŽŸๆœ‰็š„ๆ›่กŒ็ฌฆ่™Ÿ"
+
+#: convert.c:284
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "ๅฆ‚ๆžœไฝฟ็”จ %2$s ็ทจ็ขผ๏ผŒ็ฆๆญขๅœจ '%1$s' ไธญไฝฟ็”จ BOM"
+
+#: convert.c:291
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr "ๆช”ๆกˆ '%s' ๅŒ…ๅซไฝๅ…ƒ็ต„้ †ๅบๆจ™่จ˜๏ผˆBOM๏ผ‰ใ€‚่ซ‹ไฝฟ็”จ UTF-%.*s ไฝœ็‚บๅทฅไฝœๅ€็ทจ็ขผใ€‚"
+
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "ๅฆ‚ๆžœ็ทจ็ขผ็‚บ %2$s๏ผŒ้œ€่ฆๅœจ '%1$s' ไธญไฝฟ็”จ BOM"
+
+#: convert.c:306
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+"ๆช”ๆกˆ '%s' ็ผบๅฐ‘ไธ€ๅ€‹ไฝๅ…ƒ็ต„้ †ๅบๆจ™่จ˜๏ผˆBOM๏ผ‰ใ€‚่ซ‹ไฝฟ็”จ UTF-%sBE or UTF-%sLE๏ผˆๅ–ๆฑบๆ–ผ"
+"ๅญ—็ฏ€ๅบ๏ผ‰ไฝœ็‚บๅทฅไฝœๅ€็ทจ็ขผใ€‚"
+
+#: convert.c:419 convert.c:490
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "็„กๆณ•ๅฐ '%s' ้€ฒ่กŒๅพž %s ๅˆฐ %s ็š„็ทจ็ขผ"
+
+#: convert.c:462
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "ๅฐ‡'%s' ็š„็ทจ็ขผๅพž %s ๅˆฐ %s ไพ†่ฟด่ฝ‰ๆ›ไธไธ€่‡ด"
+
+#: convert.c:668
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "ไธ่ƒฝ fork ไปฅๅŸท่กŒๅค–้ƒจ้Žๆฟพๅ™จ '%s'"
+
+#: convert.c:688
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "ไธ่ƒฝๅฐ‡่ผธๅ…ฅๅ‚ณ้ž็ตฆๅค–้ƒจ้Žๆฟพๅ™จ '%s'"
+
+#: convert.c:695
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "ๅค–้ƒจ้Žๆฟพๅ™จ '%s' ๅคฑๆ•—็ขผ %d"
+
+#: convert.c:730 convert.c:733
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "ๅพžๅค–้ƒจ้Žๆฟพๅ™จ '%s' ่ฎ€ๅ–ๅคฑๆ•—"
+
+#: convert.c:736 convert.c:791
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "ๅค–้ƒจ้Žๆฟพๅ™จ '%s' ๅคฑๆ•—"
+
+#: convert.c:839
+msgid "unexpected filter type"
+msgstr "ๆ„ๅค–็š„้Žๆฟพ้กžๅž‹"
+
+#: convert.c:850
+msgid "path name too long for external filter"
+msgstr "ๅค–้ƒจ้Žๆฟพๅ™จ็š„่ทฏๅพ‘ๅๅคช้•ท"
+
+#: convert.c:924
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr "ๅค–้ƒจ้Žๆฟพๅ™จ '%s' ไธๅ†ๅฏ็”จ๏ผŒไฝ†ไธฆ้žๆ‰€ๆœ‰่ทฏๅพ‘้ƒฝๅทฒ้Žๆฟพ"
+
+#: convert.c:1223
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false ไธๆ˜ฏๆœ‰ๆ•ˆ็š„ๅทฅไฝœๅ€็ทจ็ขผ"
+
+#: convert.c:1411 convert.c:1445
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s๏ผšclean ้Žๆฟพๅ™จ '%s' ๅคฑๆ•—"
+
+#: convert.c:1489
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s๏ผšsmudge ้Žๆฟพๅ™จ %s ๅคฑๆ•—"
+
+#: date.c:138
+msgid "in the future"
+msgstr "ๅœจๅฐ‡ไพ†"
+
+#: date.c:144
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> ็ง’้˜ๅ‰"
+
+#: date.c:151
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> ๅˆ†้˜ๅ‰"
+
+#: date.c:158
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> ๅฐๆ™‚ๅ‰"
+
+#: date.c:165
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> ๅคฉๅ‰"
+
+#: date.c:171
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> ๅ‘จๅ‰"
+
+#: date.c:178
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> ๅ€‹ๆœˆๅ‰"
+
+#: date.c:189
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> ๅนด"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:192
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s %<PRIuMAX> ๅ€‹ๆœˆๅ‰"
+
+#: date.c:197 date.c:202
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> ๅนดๅ‰"
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr "ๆญฃๅœจๅ‚ณๆ’ญ่ณ‡ๆ–™ๅณถๆจ™่จ˜"
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr "ๅฃž็š„ๆจน็‹€็‰ฉไปถ %s"
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "ๆœช่ƒฝ่ผ‰ๅ…ฅ '%s' ็š„่ณ‡ๆ–™ๅณถๆญฃ่ฆ่กจ็คบๅผ๏ผš%s"
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr "ไพ†่‡ช config ็š„่ณ‡ๆ–™ๅณถๆญฃ่ฆ่กจ็คบๅผๆœ‰ๅคชๅคš็š„ๆ•็ฒ็ต„๏ผˆๆœ€ๅคš %d ๅ€‹๏ผ‰"
+
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "ๅทฒๆจ™่จ˜ %d ๅ€‹่ณ‡ๆ–™ๅณถ๏ผŒ็ตๆŸใ€‚\n"
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "่ฎ€ๅ–ๆŽ’ๅบๆช”ๆกˆ '%s' ๅคฑๆ•—"
+
+#: diffcore-rename.c:543
+msgid "Performing inexact rename detection"
+msgstr "ๆญฃๅœจ้€ฒ่กŒ้ž็ฒพ็ขบ็š„้‡ๆ–ฐๅ‘ฝๅๅตๆธฌ"
+
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<้ธ้ …>] <่ทฏๅพ‘> <่ทฏๅพ‘>"
+
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ git ็‰ˆๆœฌๅบซใ€‚ไฝฟ็”จ --no-index ๆฏ”่ผƒๅทฅไฝœๅ€ไน‹ๅค–็š„ๅ…ฉๅ€‹่ทฏๅพ‘"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: diff.c:155
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  ็„กๆณ•่งฃๆž dirstat ๆˆชๆญข๏ผˆcut-off๏ผ‰็™พๅˆ†ๆฏ” '%s'\n"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: diff.c:160
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  ๆœช็Ÿฅ็š„ dirstat ๅƒๆ•ธ '%s'\n"
+
+#: diff.c:296
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"็งปๅ‹•็š„้ก่‰ฒ่จญๅฎšๅฟ…้ ˆๆ˜ฏ 'no'ใ€'default'ใ€'blocks'ใ€'zebra'ใ€'dimmed_zebra' ๆˆ– "
+"'plain'"
+
+#: diff.c:324
+#, c-format
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"ๆœช็Ÿฅ็š„ color-moved-ws ๆจกๅผ '%s'๏ผŒๅฏ่ƒฝ็š„ๅ–ๅ€ผๆœ‰ 'ignore-space-change'ใ€'ignore-"
+"space-at-eol'ใ€'ignore-all-space'ใ€'allow-indentation-change'"
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr "color-moved-ws๏ผšallow-indentation-change ไธ่ƒฝ่ˆ‡ๅ…ถๅฎƒ็ฉบ็™ฝๅญ—ๅ…ƒๆจกๅผๅ…ฑ็”จ"
+
+#: diff.c:405
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "่จญๅฎš่ฎŠๆ•ธ 'diff.submodule' ๆœช็Ÿฅ็š„ๅ–ๅ€ผ๏ผš'%s'"
+
+#: diff.c:465
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"็™ผ็พ่จญๅฎš่ฎŠๆ•ธ 'diff.dirstat' ไธญ็š„้Œฏ่ชค๏ผš\n"
+"%s"
+
+#: diff.c:4202
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "ๅค–้ƒจ diff ้›ข้–‹๏ผŒๅœๆญขๅœจ %s"
+
+#: diff.c:4547
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-onlyใ€--name-statusใ€--check ๅ’Œ -s ๆ˜ฏไบ’ๆ–ฅ็š„"
+
+#: diff.c:4550
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-Gใ€-S ๅ’Œ --find-object ๆ˜ฏไบ’ๆ–ฅ็š„"
+
+#: diff.c:4628
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow ๆ˜Ž็ขบ่ฆๆฑ‚ๅช่ทŸไธ€ๅ€‹่ทฏๅพ‘่ฆๆ ผ"
+
+#: diff.c:4676
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "็„กๆ•ˆ็š„ --stat ๅ€ผ๏ผš%s"
+
+#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: parse-options.c:197 parse-options.c:201
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s ๆœŸๆœ›ไธ€ๅ€‹ๆ•ธๅญ—ๅ€ผ"
+
+#: diff.c:4713
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"็„กๆณ•่งฃๆž --dirstat/-X ้ธ้ …็š„ๅƒๆ•ธ๏ผš\n"
+"%s"
+
+#: diff.c:4798
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "--diff-filter=%2$s ไธญๆœช็Ÿฅ็š„่ฎŠๆ›ด้กž '%1$c'"
+
+#: diff.c:4822
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "ws-error-highlight=%.*s ไน‹ๅพŒๆœช็Ÿฅ็š„ๅ€ผ"
+
+#: diff.c:4836
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "ไธ่ƒฝ่งฃๆž '%s'"
+
+#: diff.c:4886 diff.c:4892
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s ๆœŸๆœ› <n>/<m> ๆ ผๅผ"
+
+#: diff.c:4904
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s ๆœŸๆœ›ไธ€ๅ€‹ๅญ—ๅ…ƒ๏ผŒๅพ—ๅˆฐ '%s'"
+
+#: diff.c:4925
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "ๅฃž็š„ --color-moved ๅƒๆ•ธ๏ผš%s"
+
+#: diff.c:4944
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "--color-moved-ws ไธญ็š„็„กๆ•ˆๆจกๅผ '%s' "
+
+#: diff.c:4984
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"diff-algorithm ้ธ้ …ๆœ‰ \"myers\"ใ€\"minimal\"ใ€\"patience\" ๅ’Œ \"histogram\""
+
+#: diff.c:5020 diff.c:5040
+#, c-format
+msgid "invalid argument to %s"
+msgstr "%s ็š„ๅƒๆ•ธ็„กๆ•ˆ"
+
+#: diff.c:5178
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "็„กๆณ•่งฃๆž --submodule ้ธ้ …็š„ๅƒๆ•ธ๏ผš'%s'"
+
+#: diff.c:5234
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "ๅฃž็š„ --word-diff ๅƒๆ•ธ๏ผš%s"
+
+#: diff.c:5257
+msgid "Diff output format options"
+msgstr "ๅทฎ็•ฐ่ผธๅ‡บๆ ผๅผๅŒ–้ธ้ …"
+
+#: diff.c:5259 diff.c:5265
+msgid "generate patch"
+msgstr "็”Ÿๆˆไฟฎ่ฃœๆช”"
+
+#: diff.c:5262 builtin/log.c:173
+msgid "suppress diff output"
+msgstr "ไธ้กฏ็คบๅทฎ็•ฐ่ผธๅ‡บ"
+
+#: diff.c:5267 diff.c:5381 diff.c:5388
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5268 diff.c:5271
+msgid "generate diffs with <n> lines context"
+msgstr "็”Ÿๆˆๅซ <n> ่กŒไธŠไธ‹ๆ–‡็š„ๅทฎ็•ฐ"
+
+#: diff.c:5273
+msgid "generate the diff in raw format"
+msgstr "็”ŸๆˆๅŽŸๅง‹ๆ ผๅผ็š„ๅทฎ็•ฐ"
+
+#: diff.c:5276
+msgid "synonym for '-p --raw'"
+msgstr "ๅ’Œ '-p --raw' ๅŒ็พฉ"
+
+#: diff.c:5280
+msgid "synonym for '-p --stat'"
+msgstr "ๅ’Œ '-p --stat' ๅŒ็พฉ"
+
+#: diff.c:5284
+msgid "machine friendly --stat"
+msgstr "ๆฉŸๅ™จๅ‹ๅฅฝ็š„ --stat"
+
+#: diff.c:5287
+msgid "output only the last line of --stat"
+msgstr "ๅช่ผธๅ‡บ --stat ็š„ๆœ€ๅพŒไธ€่กŒ"
+
+#: diff.c:5289 diff.c:5297
+msgid "<param1,param2>..."
+msgstr "<ๅƒๆ•ธ1,ๅƒๆ•ธ2>..."
+
+#: diff.c:5290
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "่ผธๅ‡บๆฏๅ€‹ๅญ็›ฎ้Œ„็›ธๅฐ่ฎŠๆ›ด็š„ๅˆ†ๅธƒ"
+
+#: diff.c:5294
+msgid "synonym for --dirstat=cumulative"
+msgstr "ๅ’Œ --dirstat=cumulative ๅŒ็พฉ"
+
+#: diff.c:5298
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "ๆ˜ฏ --dirstat=files,param1,param2... ็š„ๅŒ็พฉ่ฉž"
+
+#: diff.c:5302
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "ๅฆ‚ๆžœ่ฎŠๆ›ดไธญๅผ•ๅ…ฅ่ก็ชๅฎš็•Œ็ฌฆๆˆ–็ฉบ็™ฝ้Œฏ่ชค๏ผŒ็ตฆๅ‡บ่ญฆๅ‘Š"
+
+#: diff.c:5305
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "็ฒพ็ฐกๆ‘˜่ฆ๏ผŒไพ‹ๅฆ‚ๅปบ็ซ‹ใ€้‡ๆ–ฐๅ‘ฝๅๅ’Œๆจกๅผ่ฎŠๆ›ด"
+
+#: diff.c:5308
+msgid "show only names of changed files"
+msgstr "ๅช้กฏ็คบ่ฎŠๆ›ดๆช”ๆกˆ็š„ๆช”ๆกˆๅ"
+
+#: diff.c:5311
+msgid "show only names and status of changed files"
+msgstr "ๅช้กฏ็คบ่ฎŠๆ›ดๆช”ๆกˆ็š„ๆช”ๆกˆๅๅ’Œ็‹€ๆ…‹"
+
+#: diff.c:5313
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<ๅฏฌๅบฆ>[,<ๆช”ๆกˆๅๅฏฌๅบฆ>[,<ๆฌกๆ•ธ>]]"
+
+#: diff.c:5314
+msgid "generate diffstat"
+msgstr "็”Ÿๆˆๅทฎ็•ฐ็ตฑ่จˆ๏ผˆdiffstat๏ผ‰"
+
+#: diff.c:5316 diff.c:5319 diff.c:5322
+msgid "<width>"
+msgstr "<ๅฏฌๅบฆ>"
+
+#: diff.c:5317
+msgid "generate diffstat with a given width"
+msgstr "ไฝฟ็”จๆไพ›็š„้•ทๅบฆ็”Ÿๆˆๅทฎ็•ฐ็ตฑ่จˆ"
+
+#: diff.c:5320
+msgid "generate diffstat with a given name width"
+msgstr "ไฝฟ็”จๆไพ›็š„ๆช”ๆกˆๅ้•ทๅบฆ็”Ÿๆˆๅทฎ็•ฐ็ตฑ่จˆ"
+
+#: diff.c:5323
+msgid "generate diffstat with a given graph width"
+msgstr "ไฝฟ็”จๆไพ›็š„ๅœ–ๅฝข้•ทๅบฆ็”Ÿๆˆๅทฎ็•ฐ็ตฑ่จˆ"
+
+#: diff.c:5325
+msgid "<count>"
+msgstr "<ๆฌกๆ•ธ>"
+
+#: diff.c:5326
+msgid "generate diffstat with limited lines"
+msgstr "็”Ÿๆˆๆœ‰้™่กŒๆ•ธ็š„ๅทฎ็•ฐ็ตฑ่จˆ"
+
+#: diff.c:5329
+msgid "generate compact summary in diffstat"
+msgstr "็”Ÿๆˆๅทฎ็•ฐ็ตฑ่จˆ็š„็ฐกๆฝ”ๆ‘˜่ฆ"
+
+#: diff.c:5332
+msgid "output a binary diff that can be applied"
+msgstr "่ผธๅ‡บไธ€ๅ€‹ๅฏไปฅๆ‡‰็”จ็š„ไบŒ้€ฒไฝๅทฎ็•ฐ"
+
+#: diff.c:5335
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "ๅœจ \"index\" ่กŒ้กฏ็คบๅฎŒๆ•ด็š„ๅ‰ๅพŒ็‰ฉไปถๅ็จฑ"
+
+#: diff.c:5337
+msgid "show colored diff"
+msgstr "้กฏ็คบๅธถ้ก่‰ฒ็š„ๅทฎ็•ฐ"
+
+#: diff.c:5338
+msgid "<kind>"
+msgstr "<้กžๅž‹>"
+
+#: diff.c:5339
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr "ๅฐๆ–ผๅทฎ็•ฐไธญ็š„ไธŠไธ‹ๆ–‡ใ€่ˆŠ็š„ๅ’Œๆ–ฐ็š„่กŒ๏ผŒๅŠ ไบฎ้กฏ็คบ้Œฏ่ชค็š„็ฉบ็™ฝๅญ—ๅ…ƒ"
+
+#: diff.c:5342
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"ๅœจ --raw ๆˆ–่€… --numstat ไธญ๏ผŒไธๅฐ่ทฏๅพ‘ๅญ—ๅ…ƒ่ฝ‰ๆช”ไธฆไฝฟ็”จ NUL ๅญ—ๅ…ƒๅš็‚บ่ผธๅ‡บๆฌ„ไฝ็š„ๅˆ†้š”"
+"็ฌฆ"
+
+#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+msgid "<prefix>"
+msgstr "<ๅ‰็ถด>"
+
+#: diff.c:5346
+msgid "show the given source prefix instead of \"a/\""
+msgstr "้กฏ็คบๆไพ›็š„ๆบๅ‰็ถดๅ–ไปฃ \"a/\""
+
+#: diff.c:5349
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "้กฏ็คบๆไพ›็š„็›ฎๆจ™ๅ‰็ถดๅ–ไปฃ \"b/\""
+
+#: diff.c:5352
+msgid "prepend an additional prefix to every line of output"
+msgstr "่ผธๅ‡บ็š„ๆฏไธ€่กŒ้™„ๅŠ ๅ‰็ถด"
+
+#: diff.c:5355
+msgid "do not show any source or destination prefix"
+msgstr "ไธ้กฏ็คบไปปไฝ•ๆบๅ’Œ็›ฎๆจ™ๅ‰็ถด"
+
+#: diff.c:5358
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "้กฏ็คบๆŒ‡ๅฎš่กŒๆ•ธ็š„ๅทฎ็•ฐๅ€ๅกŠ้–“็š„ไธŠไธ‹ๆ–‡"
+
+#: diff.c:5362 diff.c:5367 diff.c:5372
+msgid "<char>"
+msgstr "<ๅญ—ๅ…ƒ>"
+
+#: diff.c:5363
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "ๆŒ‡ๅฎšไธ€ๅ€‹ๅญ—ๅ…ƒๅ–ไปฃ '+' ไพ†่กจ็คบๆ–ฐ็š„ไธ€่กŒ"
+
+#: diff.c:5368
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "ๆŒ‡ๅฎšไธ€ๅ€‹ๅญ—ๅ…ƒๅ–ไปฃ '-' ไพ†่กจ็คบ่ˆŠ็š„ไธ€่กŒ"
+
+#: diff.c:5373
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "ๆŒ‡ๅฎšไธ€ๅ€‹ๅญ—ๅ…ƒๅ–ไปฃ ' ' ไพ†่กจ็คบไธ€่กŒไธŠไธ‹ๆ–‡"
+
+#: diff.c:5376
+msgid "Diff rename options"
+msgstr "ๅทฎ็•ฐ้‡ๆ–ฐๅ‘ฝๅ้ธ้ …"
+
+#: diff.c:5377
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5378
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "ๅฐ‡ๅฎŒๅ…จ้‡ๅฏซ็š„่ฎŠๆ›ดๆ‰“็ ด็‚บๆˆๅฐ็š„ๅˆช้™คๅ’Œๅปบ็ซ‹"
+
+#: diff.c:5382
+msgid "detect renames"
+msgstr "ๆชขๆธฌ้‡ๆ–ฐๅ‘ฝๅ"
+
+#: diff.c:5386
+msgid "omit the preimage for deletes"
+msgstr "็œ็•ฅๅˆช้™คๅ‹•ไฝœ็š„ๅทฎ็•ฐ่ผธๅ‡บ"
+
+#: diff.c:5389
+msgid "detect copies"
+msgstr "ๆชขๆธฌ่ค‡่ฃฝ"
+
+#: diff.c:5393
+msgid "use unmodified files as source to find copies"
+msgstr "ไฝฟ็”จๆœชไฟฎๆ”น็š„ๆช”ๆกˆๅš็‚บ็™ผ็พ่ค‡่ฃฝ็š„ๆบ"
+
+#: diff.c:5395
+msgid "disable rename detection"
+msgstr "็ฆ็”จ้‡ๆ–ฐๅ‘ฝๅๅตๆธฌ"
+
+#: diff.c:5398
+msgid "use empty blobs as rename source"
+msgstr "ไฝฟ็”จ็ฉบ็š„่ณ‡ๆ–™็‰ฉไปถๅš็‚บ้‡ๆ–ฐๅ‘ฝๅ็š„ๆบ"
+
+#: diff.c:5400
+msgid "continue listing the history of a file beyond renames"
+msgstr "็นผ็บŒๅˆ—ๅ‡บๆช”ๆกˆ้‡ๆ–ฐๅ‘ฝๅไปฅๅค–็š„ๆญทๅฒ่จ˜้Œ„"
+
+#: diff.c:5403
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr "ๅฆ‚ๆžœ้‡ๆ–ฐๅ‘ฝๅ/่ค‡่ฃฝ็›ฎๆจ™่ถ…้Žๆไพ›็š„้™ๅˆถ๏ผŒ็ฆๆญข้‡ๆ–ฐๅ‘ฝๅ/่ค‡่ฃฝๆชขๆธฌ"
+
+#: diff.c:5405
+msgid "Diff algorithm options"
+msgstr "ๅทฎ็•ฐๆผ”็ฎ—ๆณ•้ธ้ …"
+
+#: diff.c:5407
+msgid "produce the smallest possible diff"
+msgstr "็”Ÿๆˆๅ„˜ๅฏ่ƒฝๅฐ็š„ๅทฎ็•ฐ"
+
+#: diff.c:5410
+msgid "ignore whitespace when comparing lines"
+msgstr "่กŒๆฏ”่ผƒๆ™‚ๅฟฝ็•ฅ็ฉบ็™ฝๅญ—ๅ…ƒ"
+
+#: diff.c:5413
+msgid "ignore changes in amount of whitespace"
+msgstr "ๅฟฝ็•ฅ็ฉบ็™ฝๅญ—ๅ…ƒ็š„่ฎŠๆ›ด"
+
+#: diff.c:5416
+msgid "ignore changes in whitespace at EOL"
+msgstr "ๅฟฝ็•ฅ่กŒๅฐพ็š„็ฉบ็™ฝๅญ—ๅ…ƒ่ฎŠๆ›ด"
+
+#: diff.c:5419
+msgid "ignore carrier-return at the end of line"
+msgstr "ๅฟฝ็•ฅ่กŒๅฐพ็š„Enter็ฌฆ๏ผˆCR๏ผ‰"
+
+#: diff.c:5422
+msgid "ignore changes whose lines are all blank"
+msgstr "ๅฟฝ็•ฅๆ•ด่กŒ้ƒฝๆ˜ฏ็ฉบ็™ฝ็š„่ฎŠๆ›ด"
+
+#: diff.c:5425
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "ๅ•Ÿ็™ผๅผ่ฝ‰ๆ›ๅทฎ็•ฐ้‚Š็•Œไปฅไพฟ้–ฑ่ฎ€"
+
+#: diff.c:5428
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "ไฝฟ็”จ \"patience diff\" ๆผ”็ฎ—ๆณ•็”Ÿๆˆๅทฎ็•ฐ"
+
+#: diff.c:5432
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "ไฝฟ็”จ \"histogram diff\" ๆผ”็ฎ—ๆณ•็”Ÿๆˆๅทฎ็•ฐ"
+
+#: diff.c:5434
+msgid "<algorithm>"
+msgstr "<ๆผ”็ฎ—ๆณ•>"
+
+#: diff.c:5435
+msgid "choose a diff algorithm"
+msgstr "้ธๆ“‡ไธ€ๅ€‹ๅทฎ็•ฐๆผ”็ฎ—ๆณ•"
+
+#: diff.c:5437
+msgid "<text>"
+msgstr "<ๆ–‡ๅญ—>"
+
+#: diff.c:5438
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "ไฝฟ็”จ \"anchored diff\" ๆผ”็ฎ—ๆณ•็”Ÿๆˆๅทฎ็•ฐ"
+
+#: diff.c:5440 diff.c:5449 diff.c:5452
+msgid "<mode>"
+msgstr "<ๆจกๅผ>"
+
+#: diff.c:5441
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "้กฏ็คบๅ–ฎ่ฉžๅทฎ็•ฐ๏ผŒไฝฟ็”จ <ๆจกๅผ> ๅˆ†้š”่ฎŠๆ›ด็š„ๅ–ฎ่ฉž"
+
+#: diff.c:5443 diff.c:5446 diff.c:5491
+msgid "<regex>"
+msgstr "<ๆญฃๅ‰‡>"
+
+#: diff.c:5444
+msgid "use <regex> to decide what a word is"
+msgstr "ไฝฟ็”จ <ๆญฃ่ฆ่กจ็คบๅผ> ็ขบๅฎšไฝ•็‚บไธ€ๅ€‹่ฉž"
+
+#: diff.c:5447
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "็›ธ็•ถๆ–ผ --word-diff=color --word-diff-regex=<ๆญฃๅ‰‡>"
+
+#: diff.c:5450
+msgid "moved lines of code are colored differently"
+msgstr "็งปๅ‹•็š„็จ‹ๅผ็ขผ่กŒ็”จไธๅŒๆ–นๅผ่‘—่‰ฒ"
+
+#: diff.c:5453
+msgid "how white spaces are ignored in --color-moved"
+msgstr "ๅœจ --color-moved ไธ‹ๅฆ‚ไฝ•ๅฟฝ็•ฅ็ฉบ็™ฝๅญ—ๅ…ƒ"
+
+#: diff.c:5456
+msgid "Other diff options"
+msgstr "ๅ…ถๅฎƒๅทฎ็•ฐ้ธ้ …"
+
+#: diff.c:5458
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr "็•ถๅพžๅญ็›ฎ้Œ„ๅŸท่กŒ๏ผŒๆŽ’้™ค็›ฎ้Œ„ไน‹ๅค–็š„่ฎŠๆ›ดไธฆ้กฏ็คบ็›ธๅฐ่ทฏๅพ‘"
+
+#: diff.c:5462
+msgid "treat all files as text"
+msgstr "ๆŠŠๆ‰€ๆœ‰ๆช”ๆกˆ็•ถๅšๆ–‡ๅญ—่™•็†"
+
+#: diff.c:5464
+msgid "swap two inputs, reverse the diff"
+msgstr "ไบคๆ›ๅ…ฉๅ€‹่ผธๅ…ฅ๏ผŒๅ่ฝ‰ๅทฎ็•ฐ"
+
+#: diff.c:5466
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "ๆœ‰ๅทฎ็•ฐๆ™‚้›ข้–‹็ขผ็‚บ 1๏ผŒๅฆๅ‰‡็‚บ 0"
+
+#: diff.c:5468
+msgid "disable all output of the program"
+msgstr "็ฆ็”จๆœฌ็จ‹ๅผ็š„ๆ‰€ๆœ‰่ผธๅ‡บ"
+
+#: diff.c:5470
+msgid "allow an external diff helper to be executed"
+msgstr "ๅ…่จฑๅŸท่กŒไธ€ๅ€‹ๅค–้ƒจ็š„ๅทฎ็•ฐๅŠฉๆ‰‹"
+
+#: diff.c:5472
+msgid "run external text conversion filters when comparing binary files"
+msgstr "็•ถๆฏ”่ผƒไบŒ้€ฒไฝๆช”ๆกˆๆ™‚๏ผŒๅŸท่กŒๅค–้ƒจ็š„ๆ–‡ๅญ—่ฝ‰ๆ›้Žๆฟพๅ™จ"
+
+#: diff.c:5474
+msgid "<when>"
+msgstr "<ไฝ•ๆ™‚>"
+
+#: diff.c:5475
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ๅœจ็”Ÿๆˆๅทฎ็•ฐๆ™‚๏ผŒๅฟฝ็•ฅๅญๆจก็ต„็š„ๆ›ดๆ”น"
+
+#: diff.c:5478
+msgid "<format>"
+msgstr "<ๆ ผๅผ>"
+
+#: diff.c:5479
+msgid "specify how differences in submodules are shown"
+msgstr "ๆŒ‡ๅฎšๅญๆจก็ต„็š„ๅทฎ็•ฐๅฆ‚ไฝ•้กฏ็คบ"
+
+#: diff.c:5483
+msgid "hide 'git add -N' entries from the index"
+msgstr "้šฑ่—็ดขๅผ•ไธญ 'git add -N' ๆข็›ฎ"
+
+#: diff.c:5486
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "ๅฐ‡็ดขๅผ•ไธญ 'git add -N' ๆข็›ฎ็•ถๅš็œŸๅฏฆ็š„"
+
+#: diff.c:5488
+msgid "<string>"
+msgstr "<ๅญ—ไธฒ>"
+
+#: diff.c:5489
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "ๅฐ‹ๆ‰พๆ”น่ฎŠไบ†ๆŒ‡ๅฎšๅญ—ไธฒๅ‡บ็พๆฌกๆ•ธ็š„ๅทฎ็•ฐ"
+
+#: diff.c:5492
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr "ๅฐ‹ๆ‰พๆ”น่ฎŠๆŒ‡ๅฎšๆญฃๅ‰‡็ฌฆๅˆๅ‡บ็พๆฌกๆ•ธ็š„ๅทฎ็•ฐ"
+
+#: diff.c:5495
+msgid "show all changes in the changeset with -S or -G"
+msgstr "้กฏ็คบไฝฟ็”จ -S ๆˆ– -G ็š„่ฎŠๆ›ด้›†็š„ๆ‰€ๆœ‰่ฎŠๆ›ด"
+
+#: diff.c:5498
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "ๅฐ‡ -S ็š„ <string> ็•ถๅšๆ“ดๅฑ•็š„ POSIX ๆญฃ่ฆ่กจ็คบๅผ"
+
+#: diff.c:5501
+msgid "control the order in which files appear in the output"
+msgstr "ๆŽงๅˆถ่ผธๅ‡บไธญ็š„ๆช”ๆกˆ้กฏ็คบ้ †ๅบ"
+
+#: diff.c:5502
+msgid "<object-id>"
+msgstr "<็‰ฉไปถ ID>"
+
+#: diff.c:5503
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "ๅฐ‹ๆ‰พๆ”น่ฎŠๆŒ‡ๅฎš็‰ฉไปถๅ‡บ็พๆฌกๆ•ธ็š„ๅทฎ็•ฐ"
+
+#: diff.c:5505
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5506
+msgid "select files by diff type"
+msgstr "้€้Žๅทฎ็•ฐ้กžๅž‹้ธๆ“‡ๆช”ๆกˆ"
+
+#: diff.c:5508
+msgid "<file>"
+msgstr "<ๆช”ๆกˆ>"
+
+#: diff.c:5509
+msgid "Output to a specific file"
+msgstr "่ผธๅ‡บๅˆฐไธ€ๅ€‹ๆŒ‡ๅฎš็š„ๆช”ๆกˆ"
+
+#: diff.c:6164
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "ๅ› ็‚บๆช”ๆกˆๅคชๅคš๏ผŒ็•ฅ้Žไธๅšดๆ ผ็š„้‡ๆ–ฐๅ‘ฝๅๆชขๆŸฅใ€‚"
+
+#: diff.c:6167
+msgid "only found copies from modified paths due to too many files."
+msgstr "ๅ› ็‚บๆช”ๆกˆๅคชๅคš๏ผŒๅชๅœจไฟฎๆ”น็š„่ทฏๅพ‘ไธญๅฐ‹ๆ‰พ่ค‡่ฃฝใ€‚"
+
+#: diff.c:6170
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "ๆ‚จๅฏ่ƒฝๆƒณ่ฆๅฐ‡่ฎŠๆ•ธ %s ่จญๅฎš็‚บ่‡ณๅฐ‘ %d ไธฆๅ†ๆฌกๅŸท่กŒๆญคๆŒ‡ไปคใ€‚"
+
+#: dir.c:555
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "่ทฏๅพ‘่ฆๆ ผ '%s' ๆœช็ฌฆๅˆไปปไฝ• git ๅทฒ็Ÿฅๆช”ๆกˆ"
+
+#: dir.c:695 dir.c:724 dir.c:737
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "็„กๆณ•่ญ˜ๅˆฅๆจฃๅผ๏ผšใ€Œ%sใ€"
+
+#: dir.c:754 dir.c:768
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "็„กๆณ•่ญ˜ๅˆฅๅๅ‘ๆจกๅผ๏ผšใ€Œ%sใ€"
+
+#: dir.c:786
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "ๆ‚จ็š„็จ€็–็ฐฝๅ‡บๆช”ๆกˆๅฏ่ƒฝๆœ‰ๅ•้กŒ๏ผšใ€Œ%sใ€ๆจฃๅผ้‡่ค‡"
+
+#: dir.c:796
+msgid "disabling cone pattern matching"
+msgstr "ๅœ็”จ cone ๆจฃๅผ็ฌฆๅˆๆจกๅผ"
+
+#: dir.c:1173
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "ไธ่ƒฝๅฐ‡ %s ็”จไฝœๆŽ’้™คๆช”ๆกˆ"
+
+#: dir.c:2144
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ็›ฎ้Œ„ '%s'"
+
+#: dir.c:2479
+msgid "failed to get kernel name and information"
+msgstr "็„กๆณ•็ฒๅพ—ๆ ธๅฟƒๅ็จฑๅ’Œ่จŠๆฏ"
+
+#: dir.c:2603
+msgid "untracked cache is disabled on this system or location"
+msgstr "ๅฟซๅ–ๆœช่ฟฝ่นคๆช”ๆกˆๅœจๆœฌ็ณป็ตฑๆˆ–ไฝ็ฝฎไธญ่ขซ็ฆ็”จ"
+
+#: dir.c:3407
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "็‰ˆๆœฌๅบซ %s ไธญ็š„็ดขๅผ•ๆช”ๆกˆๆๅฃž"
+
+#: dir.c:3452 dir.c:3457
+#, c-format
+msgid "could not create directories for %s"
+msgstr "ไธ่ƒฝ็‚บ %s ๅปบ็ซ‹็›ฎ้Œ„"
+
+#: dir.c:3486
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "ไธ่ƒฝๅพž '%s' ้ท็งป git ็›ฎ้Œ„ๅˆฐ '%s'"
+
+#: editor.c:73
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "ๆ็คบ๏ผš็ญ‰ๅพ…ๆ‚จ็š„็ทจ่ผฏๅ™จ้—œ้–‰ๆช”ๆกˆ...%c"
+
+#: entry.c:178
+msgid "Filtering content"
+msgstr "้Žๆฟพๅ…งๅฎน"
+
+#: entry.c:476
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "ไธ่ƒฝๅฐๆช”ๆกˆ '%s' ๅ‘ผๅซ stat"
+
+#: environment.c:149
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "้Œฏ่ชค็š„ git ๅๅญ—็ฉบ้–“่ทฏๅพ‘ \"%s\""
+
+#: environment.c:331
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr "ไธ่ƒฝ่จญๅฎš GIT_DIR ็‚บ '%s'"
+
+#: exec-cmd.c:363
+#, c-format
+msgid "too many args to run %s"
+msgstr "ๅŸท่กŒ %s ็š„ๅƒๆ•ธๅคชๅคš"
+
+#: fetch-pack.c:150
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack๏ผšๆ‡‰็‚บ shallow ๅˆ—่กจ"
+
+#: fetch-pack.c:153
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack๏ผšๅœจๆทบ่ค‡่ฃฝๅˆ—่กจไน‹ๅพŒๆœŸๆœ›ไธ€ๅ€‹ flush ๅŒ…"
+
+#: fetch-pack.c:164
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack๏ผšๆœŸๆœ› ACK/NAK๏ผŒๅปๅพ—ๅˆฐ flush ๅŒ…"
+
+#: fetch-pack.c:184
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack๏ผšๆ‡‰็‚บ ACK/NAK๏ผŒๅปๅพ—ๅˆฐ '%s'"
+
+#: fetch-pack.c:195
+msgid "unable to write to remote"
+msgstr "็„กๆณ•ๅฏซๅˆฐ้ ็ซฏ"
+
+#: fetch-pack.c:257
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc ้œ€่ฆ multi_ack_detailed"
+
+#: fetch-pack.c:356 fetch-pack.c:1340
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "็„กๆ•ˆ็š„ shallow ่จŠๆฏ๏ผš%s"
+
+#: fetch-pack.c:362 fetch-pack.c:1346
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "็„กๆ•ˆ็š„ unshallow ่จŠๆฏ๏ผš%s"
+
+#: fetch-pack.c:364 fetch-pack.c:1348
+#, c-format
+msgid "object not found: %s"
+msgstr "็‰ฉไปถๆœชๆ‰พๅˆฐ๏ผš%s"
+
+#: fetch-pack.c:367 fetch-pack.c:1351
+#, c-format
+msgid "error in object: %s"
+msgstr "็‰ฉไปถไธญ็™ผ็”Ÿ้Œฏ่ชค๏ผš%s"
+
+#: fetch-pack.c:369 fetch-pack.c:1353
+#, c-format
+msgid "no shallow found: %s"
+msgstr "ๆœช็™ผ็พ shallow๏ผš%s"
+
+#: fetch-pack.c:372 fetch-pack.c:1357
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "ๆ‡‰็‚บ shallow/unshallow๏ผŒๅปๅพ—ๅˆฐ %s"
+
+#: fetch-pack.c:414
+#, c-format
+msgid "got %s %d %s"
+msgstr "ๅพ—ๅˆฐ %s %d %s"
+
+#: fetch-pack.c:431
+#, c-format
+msgid "invalid commit %s"
+msgstr "็„กๆ•ˆๆไบค %s"
+
+#: fetch-pack.c:462
+msgid "giving up"
+msgstr "ๆ”พๆฃ„"
+
+#: fetch-pack.c:475 progress.c:323
+msgid "done"
+msgstr "ๅฎŒๆˆ"
+
+#: fetch-pack.c:487
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "ๅพ—ๅˆฐ %s (%d) %s"
+
+#: fetch-pack.c:533
+#, c-format
+msgid "Marking %s as complete"
+msgstr "ๆจ™่จ˜ %s ็‚บๅฎŒๆˆ"
+
+#: fetch-pack.c:754
+#, c-format
+msgid "already have %s (%s)"
+msgstr "ๅทฒ็ถ“ๆœ‰ %s๏ผˆ%s๏ผ‰"
+
+#: fetch-pack.c:818
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack๏ผš็„กๆณ•่ก็”Ÿ sideband ๅคš่ทฏ่ผธๅ‡บ"
+
+#: fetch-pack.c:826
+msgid "protocol error: bad pack header"
+msgstr "ๅ”ๅฎš้Œฏ่ชค๏ผšๅฃž็š„ๅŒ…้ ญ"
+
+#: fetch-pack.c:900
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack๏ผš็„กๆณ•่ก็”Ÿ้€ฒ็จ‹ %s"
+
+#: fetch-pack.c:916
+#, c-format
+msgid "%s failed"
+msgstr "%s ๅคฑๆ•—"
+
+#: fetch-pack.c:918
+msgid "error in sideband demultiplexer"
+msgstr "sideband ๅคš่ทฏ่ผธๅ‡บ็™ผ็”Ÿ้Œฏ่ชค"
+
+#: fetch-pack.c:965
+#, c-format
+msgid "Server version is %.*s"
+msgstr "ไผบๆœๅ™จ็‰ˆๆœฌ %.*s"
+
+#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
+#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
+#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
+#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#, c-format
+msgid "Server supports %s"
+msgstr "ไผบๆœๅ™จๆ”ฏๆด %s"
+
+#: fetch-pack.c:972
+msgid "Server does not support shallow clients"
+msgstr "ไผบๆœๅ™จไธๆ”ฏๆด shalllow ็”จๆˆถ็ซฏ"
+
+#: fetch-pack.c:1032
+msgid "Server does not support --shallow-since"
+msgstr "ไผบๆœๅ™จไธๆ”ฏๆด --shallow-since"
+
+#: fetch-pack.c:1037
+msgid "Server does not support --shallow-exclude"
+msgstr "ไผบๆœๅ™จไธๆ”ฏๆด --shallow-exclude"
+
+#: fetch-pack.c:1041
+msgid "Server does not support --deepen"
+msgstr "ไผบๆœๅ™จไธๆ”ฏๆด --deepen"
+
+#: fetch-pack.c:1058
+msgid "no common commits"
+msgstr "ๆฒ’ๆœ‰ๅ…ฑๅŒ็š„ๆไบค"
+
+#: fetch-pack.c:1070 fetch-pack.c:1536
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack๏ผšๅ–ๅพ—ๅคฑๆ•—ใ€‚"
+
+#: fetch-pack.c:1209
+msgid "Server does not support shallow requests"
+msgstr "ไผบๆœๅ™จไธๆ”ฏๆด shalllow ่ซ‹ๆฑ‚"
+
+#: fetch-pack.c:1216
+msgid "Server supports filter"
+msgstr "ไผบๆœๅ™จๆ”ฏๆด filter"
+
+#: fetch-pack.c:1239
+msgid "unable to write request to remote"
+msgstr "็„กๆณ•ๅฐ‡่ซ‹ๆฑ‚ๅฏซๅˆฐ้ ็ซฏ"
+
+#: fetch-pack.c:1257
+#, c-format
+msgid "error reading section header '%s'"
+msgstr "่ฎ€ๅ–็ฏ€ๆจ™้กŒ '%s' ็™ผ็”Ÿ้Œฏ่ชค"
+
+#: fetch-pack.c:1263
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "้ ๆœŸ '%s'๏ผŒๅพ—ๅˆฐ '%s'"
+
+#: fetch-pack.c:1303
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "ๆ„ๅค–็š„็ขบ่ช่กŒ๏ผš'%s'"
+
+#: fetch-pack.c:1308
+#, c-format
+msgid "error processing acks: %d"
+msgstr "่™•็† ack ็™ผ็”Ÿ้Œฏ่ชค๏ผš%d"
+
+#: fetch-pack.c:1318
+msgid "expected packfile to be sent after 'ready'"
+msgstr "้ ๆœŸๅœจ 'ready' ไน‹ๅพŒๅ‚ณ้€ packfile"
+
+#: fetch-pack.c:1320
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr "ๅœจๆฒ’ๆœ‰ 'ready' ไธๆ‡‰่ฉฒๅ‚ณ้€ๅ…ถๅฎƒๅฐ็ฏ€"
+
+#: fetch-pack.c:1362
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "่™•็†ๆทบ่ค‡่ฃฝ่จŠๆฏ็™ผ็”Ÿ้Œฏ่ชค๏ผš%d"
+
+#: fetch-pack.c:1409
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "้ ๆœŸ wanted-ref๏ผŒๅพ—ๅˆฐ '%s'"
+
+#: fetch-pack.c:1414
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "ๆ„ๅค–็š„ wanted-ref๏ผš'%s'"
+
+#: fetch-pack.c:1419
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "่™•็†่ฆๅ–ๅพ—็š„ๅผ•็”จ็™ผ็”Ÿ้Œฏ่ชค๏ผš%d"
+
+#: fetch-pack.c:1762
+msgid "no matching remote head"
+msgstr "ๆฒ’ๆœ‰็ฌฆๅˆ็š„้ ็ซฏๅˆ†ๆ”ฏ"
+
+#: fetch-pack.c:1785 builtin/clone.c:689
+msgid "remote did not send all necessary objects"
+msgstr "้ ็ซฏๆฒ’ๆœ‰ๅ‚ณ้€ๆ‰€ๆœ‰ๅฟ…้œ€็š„็‰ฉไปถ"
+
+#: fetch-pack.c:1812
+#, c-format
+msgid "no such remote ref %s"
+msgstr "ๆฒ’ๆœ‰้€™ๆจฃ็š„้ ็ซฏๅผ•็”จ %s"
+
+#: fetch-pack.c:1815
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "ไผบๆœๅ™จไธๅ…่จฑ่ซ‹ๆฑ‚ๆœชๅ…ฌ้–‹็š„็‰ฉไปถ %s"
+
+#: gpg-interface.c:408
+msgid "gpg failed to sign the data"
+msgstr "gpg ็„กๆณ•็‚บ่ณ‡ๆ–™็ฐฝๅ"
+
+#: gpg-interface.c:434
+msgid "could not create temporary file"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ๆšซๅญ˜ๆช”"
+
+#: gpg-interface.c:437
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "็„กๆณ•ๅฐ‡ๅˆ†้›ขๅผ็ฐฝๅๅฏซๅ…ฅ '%s'"
+
+#: graph.c:98
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "ๅฟฝ็•ฅ log.graphColors ไธญ็„กๆ•ˆ็š„้ก่‰ฒ '%.*s'"
+
+#: grep.c:668
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"ๆไพ›็š„ๆจกๅผๅŒ…ๅซ NULL ๅญ—ๅ…ƒ๏ผˆ้€š้Ž -f <ๆช”ๆกˆ> ๅƒๆ•ธ๏ผ‰ใ€‚ๅชๆœ‰ PCRE v2 ไธ‹็š„ -P ๆ”ฏๆดๆญค"
+"ๅŠŸ่ƒฝ"
+
+#: grep.c:2128
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s'๏ผš็„กๆณ•่ฎ€ๅ– %s"
+
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "ๅฐ '%s' ๅ‘ผๅซ stat ๅคฑๆ•—"
+
+#: grep.c:2156
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s'๏ผš่ฎ€ๅ–ไธๅฎŒๆ•ด"
+
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "้–‹ๅง‹ไธ€ๅ€‹ๅทฅไฝœๅ€๏ผˆๅƒ่ฆ‹๏ผšgit help tutorial๏ผ‰"
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "ๅœจ็›ฎๅ‰่ฎŠๆ›ดไธŠๅทฅไฝœ๏ผˆๅƒ่ฆ‹๏ผšgit help everyday๏ผ‰"
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "ๆชขๆŸฅๆญทๅฒๅ’Œ็‹€ๆ…‹๏ผˆๅƒ่ฆ‹๏ผšgit help revisions๏ผ‰"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "ๆ“ดๅฑ•ใ€ๆจ™่จ˜ๅ’Œ่ชฟๆ กๆ‚จ็š„ๆญทๅฒ่จ˜้Œ„"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "ๅ”ๅŒ๏ผˆๅƒ่ฆ‹๏ผšgit help workflows๏ผ‰"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "ไธป่ฆ็š„ไธŠๅฑคๆŒ‡ไปค"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "่ผ”ๅŠฉๆŒ‡ไปค/ๅ‹•ไฝœ่€…"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "่ผ”ๅŠฉๆŒ‡ไปค/่ฉขๅ•่€…"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "่ˆ‡ๅ…ถๅฎƒ็ณป็ตฑไบ’ๅ‹•"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "ไฝŽ็ดšๆŒ‡ไปค/ๅ‹•ไฝœ่€…"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "ไฝŽ็ดšๆŒ‡ไปค/่ฉขๅ•่€…"
+
+#: help.c:37
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "ไฝŽ็ดšๆŒ‡ไปค / ๅŒๆญฅ็‰ˆๆœฌๅบซ"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "ไฝŽ็ดšๆŒ‡ไปค/ๅ…ง้ƒจๅŠฉๆ‰‹"
+
+#: help.c:298
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "ๅœจ '%s' ไธ‹ๅฏ็”จ็š„ git ๆŒ‡ไปค"
+
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "ๅœจ $PATH ่ทฏๅพ‘ไธญ็š„ๅ…ถไป–ๅœฐๆ–นๅฏ็”จ็š„ git ๆŒ‡ไปค"
+
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
+msgstr "้€™ไบ›ๆ˜ฏๅ„็จฎๅ ดๅˆๅธธ่ฆ‹็š„ Git ๆŒ‡ไปค๏ผš"
+
+#: help.c:363 git.c:98
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "ไธๆ”ฏๆด็š„ๆŒ‡ไปคๅˆ—่กจ้กžๅž‹ '%s'"
+
+#: help.c:403
+msgid "The common Git guides are:"
+msgstr "ๆœ€ๅธธ็”จ็š„ Git ๅšฎๅฐŽๆœ‰๏ผš"
+
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "ๅŸท่กŒใ€€'git help <command>' ไพ†ๆชข่ฆ–็‰นๅฎšๅญๆŒ‡ไปค"
+
+#: help.c:517
+msgid "External commands"
+msgstr "ๅค–้ƒจๆŒ‡ไปค"
+
+#: help.c:532
+msgid "Command aliases"
+msgstr "ๆŒ‡ไปคๅˆฅๅ"
+
+#: help.c:596
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' ๅƒๆ˜ฏไธ€ๅ€‹ git ๆŒ‡ไปค๏ผŒไฝ†ๅป็„กๆณ•ๅŸท่กŒใ€‚\n"
+"ๅฏ่ƒฝๆ˜ฏ git-%s ๅ—ๆ๏ผŸ"
+
+#: help.c:655
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "ๅ”‰ๅ‘€๏ผŒๆ‚จ็š„็ณป็ตฑไธญๆœช็™ผ็พ Git ๆŒ‡ไปคใ€‚"
+
+#: help.c:677
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "่ญฆๅ‘Š๏ผšๆ‚จๅŸท่กŒไบ†ไธ€ๅ€‹ไธฆไธๅญ˜ๅœจ็š„ Git ๆŒ‡ไปค '%s'ใ€‚"
+
+#: help.c:682
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "ๅ‡ๅฎšไฝ ๆƒณ่ฆ็š„ๆ˜ฏ '%s' ไธฆ็นผ็บŒใ€‚"
+
+#: help.c:687
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "ๅ‡ๅฎšไฝ ๆƒณ่ฆ็š„ๆ˜ฏ '%2$s'๏ผŒๅœจ %1$0.1f ็ง’้˜ๅพŒ็นผ็บŒใ€‚"
+
+#: help.c:695
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git๏ผš'%s' ไธๆ˜ฏไธ€ๅ€‹ git ๆŒ‡ไปคใ€‚ๅƒ่ฆ‹ 'git --help'ใ€‚"
+
+#: help.c:699
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"ๆœ€้กžไผผ็š„ๆŒ‡ไปคๆœ‰"
+
+#: help.c:714
+msgid "git version [<options>]"
+msgstr "git version [<้ธ้ …>]"
+
+#: help.c:783
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s๏ผš%s - %s"
+
+#: help.c:787
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"ๆ‚จๆŒ‡็š„ๆ˜ฏ้€™ๅ€‹ๅ—Ž๏ผŸ"
+
+#: ident.c:349
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** ่ซ‹ๅ‘Š่จดๆˆ‘ไฝ ๆ˜ฏ่ชฐใ€‚\n"
+"\n"
+"ๅŸท่กŒ\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"ไพ†่จญๅฎšๆ‚จๅธณ่™Ÿ็š„้ ่จญ่บซไปฝๆจ™่จ˜ใ€‚\n"
+"ๅฆ‚ๆžœๅƒ…ๅœจๆœฌ็‰ˆๆœฌๅบซ่จญๅฎš่บซไปฝๆจ™่จ˜๏ผŒๅ‰‡็œ็•ฅ --global ๅƒๆ•ธใ€‚\n"
+
+#: ident.c:379
+msgid "no email was given and auto-detection is disabled"
+msgstr "ๆœชๆไพ›ไฟกไปถไฝๅ€ไธ”่‡ชๅ‹•ๅตๆธฌ่ขซ็ฆ็”จ"
+
+#: ident.c:384
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "็„กๆณ•่‡ชๅ‹•ๅตๆธฌไฟกไปถไฝๅ€๏ผˆๅพ—ๅˆฐ '%s'๏ผ‰"
+
+#: ident.c:401
+msgid "no name was given and auto-detection is disabled"
+msgstr "ๆœชๆไพ›ๅง“ๅไธ”่‡ชๅ‹•ๅตๆธฌ่ขซ็ฆ็”จ"
+
+#: ident.c:407
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "็„กๆณ•่‡ชๅ‹•ๅตๆธฌๅง“ๅ๏ผˆๅพ—ๅˆฐ '%s'๏ผ‰"
+
+#: ident.c:415
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "ไธๅ…่จฑ็ฉบ็š„ๅง“ๅ๏ผˆๅฐๆ–ผ <%s>๏ผ‰"
+
+#: ident.c:421
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "ๅง“ๅไธญๅƒ…ๅŒ…ๅซ็ฆ็”จๅญ—ๅ…ƒ๏ผš%s"
+
+#: ident.c:436 builtin/commit.c:635
+#, c-format
+msgid "invalid date format: %s"
+msgstr "็„กๆ•ˆ็š„ๆ—ฅๆœŸๆ ผๅผ๏ผš%s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "ๆจน %2$s ไธญ็š„ๆข็›ฎ '%1$s' ๅ…ทๆœ‰ๆจน็š„ๅฑฌๆ€ง๏ผŒไฝ†ไธๆ˜ฏไธ€ๅ€‹ๆจน็‹€็‰ฉไปถ"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "ๆจน %2$s ไธญ็š„ๆข็›ฎ '%1$s' ๅ…ทๆœ‰่ณ‡ๆ–™็‰ฉไปถ็š„ๅฑฌๆ€ง๏ผŒไฝ†ไธๆ˜ฏไธ€ๅ€‹่ณ‡ๆ–™็‰ฉไปถ"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "็„กๆณ•็‚บๆไบค %s ่ผ‰ๅ…ฅๆ นๆจน"
+
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "ไธ่ƒฝๅญ˜ๅ– '%s' ไธญ็š„็จ€็–่ณ‡ๆ–™็‰ฉไปถ"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "็„กๆณ•่งฃๆž %s ไธญ็š„็จ€็–้Žๆฟพๅ™จ่ณ‡ๆ–™"
+
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
+msgstr "ๆœŸๆœ› 'tree:<ๆทฑๅบฆ>'"
+
+#: list-objects-filter-options.c:73
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:path ้Žๆฟพๅ™จๆ”ฏๆดๅทฒ่ขซๅˆช้™ค"
+
+#: list-objects-filter-options.c:86
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "็„กๆ•ˆ็š„้Žๆฟพๅ™จ่กจ้”ๅผ '%s'"
+
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "ๅฟ…้ ˆๅฐ sub-filter-spec ไธญ็š„ๅญ—ๅ…ƒ้€ฒ่กŒ่ฝ‰็พฉ๏ผš'%c'"
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr "ๆœŸๆœ›ๅœจ็ต„ๅˆๅพŒๆœ‰ไธ€ไบ›ๆฑ่ฅฟ๏ผš"
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
+msgstr "ไธ่ƒฝๆทท็”จๅคš็จฎ้Žๆฟพ่ฆๆ ผ"
+
+#: lockfile.c:151
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"็„กๆณ•ๅปบ็ซ‹ '%s.lock'๏ผš%sใ€‚\n"
+"\n"
+"ไผผไนŽๅฆๅค–ไธ€ๅ€‹ git ้€ฒ็จ‹ๅœจ้€™ๅ€‹็‰ˆๆœฌๅบซไธญๅŸท่กŒ๏ผŒไพ‹ๅฆ‚๏ผš'git commit' ๆŒ‡ไปคๆ‰“\n"
+"้–‹ไบ†ไธ€ๅ€‹็ทจ่ผฏๅ™จใ€‚่ซ‹็ขบ่ชๆ‰€ๆœ‰้€ฒ็จ‹้ƒฝๅทฒ็ถ“้—œ้–‰็„ถๅพŒ้‡่ฉฆใ€‚ๅฆ‚ๆžœไป็„ถๅ ฑ้Œฏ๏ผŒ\n"
+"ๅฏ่ƒฝไน‹ๅ‰ๆœ‰ไธ€ๅ€‹ git ้€ฒ็จ‹ๅœจ้€™ๅ€‹็‰ˆๆœฌๅบซไธญ็•ฐๅธธ้›ข้–‹๏ผš\n"
+"ๆ‰‹ๅ‹•ๅˆช้™ค้€™ๅ€‹ๆช”ๆกˆๅ†็นผ็บŒใ€‚"
+
+#: lockfile.c:159
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ '%s.lock'๏ผš%s"
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "่ฎ€ๅ–ๅฟซๅ–ๅคฑๆ•—"
+
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "็„กๆณ•ๅฏซๆ–ฐ็š„็ดขๅผ•ๆช”ๆกˆ"
+
+#: merge-recursive.c:356
+msgid "(bad commit)\n"
+msgstr "๏ผˆๅฃžๆไบค๏ผ‰\n"
+
+#: merge-recursive.c:379
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo ๅฐ่ทฏๅพ‘ '%s' ๅŸท่กŒๅคฑๆ•—๏ผŒๅˆไฝต็ต‚ๆญขใ€‚"
+
+#: merge-recursive.c:388
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr "add_cacheinfo ็„กๆณ•้‡ๆ–ฐๆ•ด็†่ทฏๅพ‘ '%s'๏ผŒๅˆไฝต็ต‚ๆญขใ€‚"
+
+#: merge-recursive.c:874
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "ๅปบ็ซ‹่ทฏๅพ‘ '%s'%s ๅคฑๆ•—"
+
+#: merge-recursive.c:885
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "ๅˆช้™ค %s ไปฅไพฟ็‚บๅญ็›ฎ้Œ„็•™ๅ‡บ็ฉบ้–“\n"
+
+#: merge-recursive.c:899 merge-recursive.c:918
+msgid ": perhaps a D/F conflict?"
+msgstr "๏ผšๅฏ่ƒฝๆ˜ฏไธ€ๅ€‹็›ฎ้Œ„/ๆช”ๆกˆ่ก็ช๏ผŸ"
+
+#: merge-recursive.c:908
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "ๆ‹’็ต•ๆจๆฃ„ '%s' ไธญ็š„ๆœช่ฟฝ่นคๆช”ๆกˆ"
+
+#: merge-recursive.c:949 builtin/cat-file.c:41
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–็‰ฉไปถ %s '%s'"
+
+#: merge-recursive.c:954
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' ๆ‡‰็‚บ่ณ‡ๆ–™็‰ฉไปถ"
+
+#: merge-recursive.c:979
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "้–‹ๅ•Ÿ '%s' ๅคฑๆ•—๏ผš%s"
+
+#: merge-recursive.c:990
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "ๅปบ็ซ‹็ฌฆ่™Ÿ้€ฃ็ต '%s' ๅคฑๆ•—๏ผš%s"
+
+#: merge-recursive.c:995
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "ไธ็Ÿฅ้“ๅฆ‚ไฝ•่™•็† %06o %s '%s'"
+
+#: merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "็„กๆณ•ๅˆไฝตๅญๆจก็ต„ %s ๏ผˆๆฒ’ๆœ‰็ฐฝๅ‡บ๏ผ‰"
+
+#: merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "็„กๆณ•ๅˆไฝตๅญๆจก็ต„ %s๏ผˆๆไบคไธๅญ˜ๅœจ๏ผ‰"
+
+#: merge-recursive.c:1205
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "็„กๆณ•ๅˆไฝตๅญๆจก็ต„ %s ๏ผˆๆไบคๆœช่ทŸ้šจๅˆไฝตๅŸบ็คŽ๏ผ‰"
+
+#: merge-recursive.c:1213 merge-recursive.c:1225
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "ๅญๆจก็ต„ %s ๅฟซ่ฝ‰ๅˆฐๅฆ‚ไธ‹ๆไบค๏ผš"
+
+#: merge-recursive.c:1216 merge-recursive.c:1228
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "ๅฟซ่ฝ‰ๅญๆจก็ต„ %s"
+
+#: merge-recursive.c:1251
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr "็„กๆณ•ๅˆไฝตๅญๆจก็ต„ %s ๏ผˆๆฒ’็™ผ็พๅˆไฝต่ทŸ้šจ็š„ๆไบค๏ผ‰"
+
+#: merge-recursive.c:1255
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "็„กๆณ•ๅˆไฝตๅญๆจก็ต„ %s๏ผˆ้žๅฟซ่ฝ‰๏ผ‰"
+
+#: merge-recursive.c:1256
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "ๆ‰พๅˆฐๅญๆจก็ต„็š„ไธ€ๅ€‹ๅฏ่ƒฝ็š„ๅˆไฝตๆ–นๆกˆ๏ผš\n"
+
+#: merge-recursive.c:1259
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"ๅฆ‚ๆžœ้€™ๅ€‹ๆญฃ็ขบ๏ผŒๅฐ‡ๅ…ถๆ–ฐๅขžๅˆฐ็ดขๅผ•๏ผŒไพ‹ๅฆ‚ไฝฟ็”จๆŒ‡ไปค๏ผš\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"ไปฅๆŽฅๅ—ๆญคๅปบ่ญฐใ€‚\n"
+
+#: merge-recursive.c:1268
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "็„กๆณ•ๅˆไฝตๅญๆจก็ต„ %s ๏ผˆ็™ผ็พๅคšๅ€‹ๅˆไฝต๏ผ‰"
+
+#: merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "็„กๆณ•ๅŸท่กŒๅ…ง้ƒจๅˆไฝต"
+
+#: merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "ไธ่ƒฝๆ–ฐๅขž %s ่‡ณ็‰ฉไปถๅบซ"
+
+#: merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "่‡ชๅ‹•ๅˆไฝต %s"
+
+#: merge-recursive.c:1402
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr "้Œฏ่ชค๏ผšๆ‹’็ต•้บๅคฑๆœช่ฟฝ่นคๆช”ๆกˆ '%s'๏ผŒ่€Œๆ˜ฏๅฏซๅ…ฅ %sใ€‚"
+
+#: merge-recursive.c:1474
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"่ก็ช๏ผˆ%1$s/ๅˆช้™ค๏ผ‰๏ผš%2$s ๅœจ %3$s ไธญ่ขซๅˆช้™ค๏ผŒๅœจ %5$s ไธญ่ขซ %4$sใ€‚%7$s ็š„ %6$s ็‰ˆ"
+"ๆœฌ่ขซไฟ็•™ใ€‚"
+
+#: merge-recursive.c:1479
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"่ก็ช๏ผˆ%1$s/ๅˆช้™ค๏ผ‰๏ผš%2$s ๅœจ %3$s ไธญ่ขซๅˆช้™ค๏ผŒๅœจ %6$s ไธญ็š„ %5$s ่ขซ %4$sใ€‚%8$s ็š„ "
+"%7$s ็‰ˆๆœฌ่ขซไฟ็•™ใ€‚"
+
+#: merge-recursive.c:1486
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"่ก็ช๏ผˆ%1$s/ๅˆช้™ค๏ผ‰๏ผš%2$s ๅœจ %3$s ไธญ่ขซๅˆช้™ค๏ผŒๅœจ %5$s ไธญ่ขซ %4$sใ€‚%7$s ็š„ %6$s ็‰ˆ"
+"ๆœฌไฟ็•™ๅœจ %8$s ไธญใ€‚"
+
+#: merge-recursive.c:1491
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
+msgstr ""
+"่ก็ช๏ผˆ%1$s/ๅˆช้™ค๏ผ‰๏ผš%2$s ๅœจ %3$s ไธญ่ขซๅˆช้™ค๏ผŒๅœจ %6$s ไธญ็š„ %5$s ่ขซ %4$sใ€‚%8$s ็š„ "
+"%7$s ็‰ˆๆœฌไฟ็•™ๅœจ %9$s ไธญใ€‚"
+
+#: merge-recursive.c:1526
+msgid "rename"
+msgstr "้‡ๆ–ฐๅ‘ฝๅ"
+
+#: merge-recursive.c:1526
+msgid "renamed"
+msgstr "้‡ๆ–ฐๅ‘ฝๅ"
+
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "ๆ‹’็ต•้บๅคฑ้ซ’ๆช”ๆกˆ '%s'"
+
+#: merge-recursive.c:1587
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "ๆ‹’็ต•ๅœจ '%s' ่™•ๅคฑๅŽปๆœช่ฟฝ่นคๆช”ๆกˆ๏ผŒๅณไฝฟๅฎƒๅญ˜ๅœจๆ–ผ้‡ๆ–ฐๅ‘ฝๅไธญใ€‚"
+
+#: merge-recursive.c:1645
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
+msgstr ""
+"่ก็ช๏ผˆ้‡ๆ–ฐๅ‘ฝๅ/ๆ–ฐๅขž๏ผ‰๏ผšๅœจ %3$s ไธญ้‡ๆ–ฐๅ‘ฝๅ %1$s->%2$sใ€‚ๅœจ %5$s ไธญๆ–ฐๅขž %4$s"
+
+#: merge-recursive.c:1676
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s ๆ˜ฏ %s ไธญ็š„ไธ€ๅ€‹็›ฎ้Œ„่€Œๅทฒ %s ็‚บๅ่ขซๆ–ฐๅขž"
+
+#: merge-recursive.c:1681
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr "ๆ‹’็ต•้บๅคฑๆœช่ฟฝ่นคๆช”ๆกˆ '%s'๏ผŒ่€Œๆ˜ฏๆ–ฐๅขž็‚บ %s"
+
+#: merge-recursive.c:1708
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"่ก็ช๏ผˆ้‡ๆ–ฐๅ‘ฝๅ/้‡ๆ–ฐๅ‘ฝๅ๏ผ‰๏ผšๅœจๅˆ†ๆ”ฏ \"%3$s\" ไธญ้‡ๆ–ฐๅ‘ฝๅ \"%1$s\"->\"%2$s\"๏ผŒๅœจ"
+"ๅˆ†ๆ”ฏ \"%6$s\" ไธญ้‡ๆ–ฐๅ‘ฝๅ \"%4$s\"->\"%5$s\"%7$s"
+
+#: merge-recursive.c:1713
+msgid " (left unresolved)"
+msgstr "๏ผˆ็•™ไธ‹ๆœช่งฃๆฑบ๏ผ‰"
+
+#: merge-recursive.c:1793
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"่ก็ช๏ผˆ้‡ๆ–ฐๅ‘ฝๅ/้‡ๆ–ฐๅ‘ฝๅ๏ผ‰๏ผšๅœจ %3$s ไธญ้‡ๆ–ฐๅ‘ฝๅ %1$s->%2$s๏ผŒๅœจ %6$s ไธญ้‡ๆ–ฐๅ‘ฝๅ "
+"%4$s->%5$s"
+
+#: merge-recursive.c:2056
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"่ก็ช๏ผˆๅˆ†ๅ‰ฒ็š„็›ฎ้Œ„้‡ๆ–ฐๅ‘ฝๅ๏ผ‰๏ผšไธๆธ…ๆฅš %s ๆ‡‰่ฉฒๆ”พๅœจๅ“ช่ฃก๏ผŒๅ› ็‚บ็›ฎ้Œ„ %s ่ขซ้‡ๆ–ฐๅ‘ฝๅๅˆฐ"
+"ๅคšๅ€‹ๅ…ถๅฎƒ็›ฎ้Œ„๏ผŒๆฒ’ๆœ‰็›ฎ้Œ„ๅŒ…ๅซๅคง้ƒจๅˆ†ๆช”ๆกˆใ€‚"
+
+#: merge-recursive.c:2088
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+"่ก็ช๏ผˆ้šฑๅผ็›ฎ้Œ„้‡ๆ–ฐๅ‘ฝๅ๏ผ‰๏ผš่™•ๆ–ผ้šฑๅผ็›ฎ้Œ„้‡ๆ–ฐๅ‘ฝๅ็š„็พๅญ˜ๆช”ๆกˆ/็›ฎ้Œ„ %s๏ผŒๅฐ‡ไปฅไธ‹่ทฏๅพ‘"
+"ๆ”พๅœจ๏ผš%sใ€‚"
+
+#: merge-recursive.c:2098
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+"่ก็ช๏ผˆ้šฑๅผ็›ฎ้Œ„้‡ๆ–ฐๅ‘ฝๅ๏ผ‰๏ผš็„กๆณ•ๆ˜ ๅฐ„ไธ€ๅ€‹ไปฅไธŠ่ทฏๅพ‘ๅˆฐ %s๏ผŒ้šฑๅผ็›ฎ้Œ„้‡ๆ–ฐๅ‘ฝๅๅ˜—่ฉฆๅฐ‡้€™"
+"ไบ›่ทฏๅพ‘ๆ”พ็ฝฎๆ–ผๆญค๏ผš%s"
+
+#: merge-recursive.c:2190
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"่ก็ช๏ผˆ้‡ๆ–ฐๅ‘ฝๅ/้‡ๆ–ฐๅ‘ฝๅ๏ผ‰๏ผšๅœจ %3$s ไธญ้‡ๆ–ฐๅ‘ฝๅ็›ฎ้Œ„ %1$s->%2$s๏ผŒๅœจ %6$s ไธญ้‡ๆ–ฐ"
+"ๅ‘ฝๅ็›ฎ้Œ„ %4$s->%5$s"
+
+#: merge-recursive.c:2435
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr "่ญฆๅ‘Š๏ผš้ฟๅ…ๆ‡‰็”จ %s -> %s ็š„้‡ๆ–ฐๅ‘ฝๅๅˆฐ %s๏ผŒๅ› ็‚บ %s ๆœฌ่บซๅทฒ่ขซ้‡ๆ–ฐๅ‘ฝๅใ€‚"
+
+#: merge-recursive.c:2961
+#, c-format
+msgid "cannot read object %s"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–็‰ฉไปถ %s"
+
+#: merge-recursive.c:2964
+#, c-format
+msgid "object %s is not a blob"
+msgstr "็‰ฉไปถ %s ไธๆ˜ฏไธ€ๅ€‹่ณ‡ๆ–™็‰ฉไปถ"
+
+#: merge-recursive.c:3028
+msgid "modify"
+msgstr "ไฟฎๆ”น"
+
+#: merge-recursive.c:3028
+msgid "modified"
+msgstr "ไฟฎๆ”น"
+
+#: merge-recursive.c:3040
+msgid "content"
+msgstr "ๅ…งๅฎน"
+
+#: merge-recursive.c:3044
+msgid "add/add"
+msgstr "ๆ–ฐๅขž/ๆ–ฐๅขž"
+
+#: merge-recursive.c:3067
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "็•ฅ้Ž %s๏ผˆๅทฒ็ถ“ๅš้Ž็›ธๅŒๅˆไฝต๏ผ‰"
+
+#: merge-recursive.c:3089 git-submodule.sh:1003
+msgid "submodule"
+msgstr "ๅญๆจก็ต„"
+
+#: merge-recursive.c:3090
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "่ก็ช๏ผˆ%s๏ผ‰๏ผšๅˆไฝต่ก็ชๆ–ผ %s"
+
+#: merge-recursive.c:3120
+#, c-format
+msgid "Adding as %s instead"
+msgstr "่€Œๆ˜ฏไปฅ %s ็‚บๅๆ–ฐๅขž"
+
+#: merge-recursive.c:3203
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"่ทฏๅพ‘ๅทฒๆ›ดๆ–ฐ๏ผš%s ๆ–ฐๅขžๅˆฐ %s๏ผŒไฝๆ–ผไธ€ๅ€‹่ขซ้‡ๆ–ฐๅ‘ฝๅๅˆฐ %s ็š„็›ฎ้Œ„ไธญ๏ผŒๅฐ‡ๅ…ถ็งปๅ‹•ๅˆฐ %sใ€‚"
+
+#: merge-recursive.c:3206
+#, c-format
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+"่ก็ช๏ผˆๆช”ๆกˆไฝ็ฝฎ๏ผ‰๏ผš%s ๆ–ฐๅขžๅˆฐ %s๏ผŒไฝๆ–ผไธ€ๅ€‹่ขซ้‡ๆ–ฐๅ‘ฝๅ็‚บ %s ็š„็›ฎ้Œ„ไธญ๏ผŒๅปบ่ญฐๅฐ‡ๅ…ถ็งป"
+"ๅ‹•ๅˆฐ %sใ€‚"
+
+#: merge-recursive.c:3210
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"่ทฏๅพ‘ๅทฒๆ›ดๆ–ฐ๏ผš%1$s ้‡ๆ–ฐๅ‘ฝๅ็‚บ %3$s ไธญ็š„ %2$s๏ผŒ่€Œ่ฉฒ็›ฎ้Œ„่ขซ้‡ๆ–ฐๅ‘ฝๅๅˆฐ %4$s ไธญ๏ผŒๅฐ‡"
+"ๅ…ถ็งปๅ‹•ๅˆฐ %5$sใ€‚"
+
+#: merge-recursive.c:3213
+#, c-format
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+"่ก็ช๏ผˆๆช”ๆกˆไฝ็ฝฎ๏ผ‰๏ผš%1$s ้‡ๆ–ฐๅ‘ฝๅ็‚บ %3$s ไธญ็š„ %2$s๏ผŒ่€Œ่ฉฒ็›ฎ้Œ„่ขซ้‡ๆ–ฐๅ‘ฝๅๅˆฐ %4$s "
+"ไธญ๏ผŒๅปบ่ญฐๅฐ‡ๅ…ถ็งปๅ‹•ๅˆฐ %5$sใ€‚"
+
+#: merge-recursive.c:3327
+#, c-format
+msgid "Removing %s"
+msgstr "ๅˆช้™ค %s"
+
+#: merge-recursive.c:3350
+msgid "file/directory"
+msgstr "ๆช”ๆกˆ/็›ฎ้Œ„"
+
+#: merge-recursive.c:3355
+msgid "directory/file"
+msgstr "็›ฎ้Œ„/ๆช”ๆกˆ"
+
+#: merge-recursive.c:3362
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr "่ก็ช๏ผˆ%1$s๏ผ‰๏ผšๅœจ %3$s ไธญๆœ‰ไธ€ๅ€‹ๅ็‚บ %2$s ็š„็›ฎ้Œ„ใ€‚ไปฅ %5$s ็‚บๅๆ–ฐๅขž %4$s"
+
+#: merge-recursive.c:3371
+#, c-format
+msgid "Adding %s"
+msgstr "ๆ–ฐๅขž %s"
+
+#: merge-recursive.c:3380
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "่ก็ช๏ผˆadd/add๏ผ‰๏ผšๅˆไฝต่ก็ชๆ–ผ %s"
+
+#: merge-recursive.c:3424
+msgid "Already up to date!"
+msgstr "ๅทฒ็ถ“ๆ˜ฏๆœ€ๆ–ฐ็š„๏ผ"
+
+#: merge-recursive.c:3433
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "็„กๆณ•ๅˆไฝตๆจน %s ๅ’Œ %s"
+
+#: merge-recursive.c:3537
+msgid "Merging:"
+msgstr "ๅˆไฝต๏ผš"
+
+#: merge-recursive.c:3550
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "็™ผ็พ %u ๅ€‹ๅ…ฑๅŒ็ฅ–ๅ…ˆ๏ผš"
+
+#: merge-recursive.c:3600
+msgid "merge returned no commit"
+msgstr "ๅˆไฝตๆœช่ฟ”ๅ›žๆไบค"
+
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"ๆ‚จๅฐไธ‹ๅˆ—ๆช”ๆกˆ็š„ๆœฌๆฉŸไฟฎๆ”นๅฐ‡่ขซๅˆไฝตๅ‹•ไฝœ่ฆ†่“‹๏ผš\n"
+"  %s"
+
+#: merge-recursive.c:3756
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "ไธ่ƒฝ่งฃๆž็‰ฉไปถ '%s'"
+
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+msgid "Unable to write index."
+msgstr "ไธ่ƒฝๅฏซๅ…ฅ็ดขๅผ•ใ€‚"
+
+#: midx.c:68
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "ๅคšๅŒ…็ดขๅผ•ๆช”ๆกˆ %s ๅคชๅฐ"
+
+#: midx.c:84
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr "ๅคšๅŒ…็ดขๅผ•็ฐฝๅ 0x%08x ๅ’Œ็ฐฝๅ 0x%08x ไธ็ฌฆๅˆ"
+
+#: midx.c:89
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-pack-index ็‰ˆๆœฌ %d ไธ่ƒฝ่ขซ่ญ˜ๅˆฅ"
+
+#: midx.c:94
+#, c-format
+msgid "hash version %u does not match"
+msgstr "ๆ•ฃๅˆ—็‰ˆๆœฌ %u ไธ็ฌฆๅˆ"
+
+#: midx.c:108
+msgid "invalid chunk offset (too large)"
+msgstr "็„กๆ•ˆ็š„ๅ€ๅกŠไฝ็งป๏ผˆๅคชๅคง๏ผ‰"
+
+#: midx.c:132
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr "็ต‚ๆญขๅคšๅŒ…็ดขๅผ•ๅ€ๅกŠ id ๅ‡บ็พๆ™‚้–“ๆ—ฉๆ–ผ้ ๆœŸ"
+
+#: midx.c:145
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "ๅคšๅŒ…็ดขๅผ•็ผบๅฐ‘ๅฟ…้œ€็š„ๅŒ…ๅๅกŠ"
+
+#: midx.c:147
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "ๅคšๅŒ…็ดขๅผ•็ผบๅฐ‘ๅฟ…้œ€็š„็‰ฉไปถ ID ๆ‰‡ๅ‡บๅกŠ"
+
+#: midx.c:149
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "ๅคšๅŒ…็ดขๅผ•็ผบๅฐ‘ๅฟ…้œ€็š„็‰ฉไปถ ID ๆŸฅ่ฉขๅกŠ"
+
+#: midx.c:151
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "ๅคšๅŒ…็ดขๅผ•็ผบๅฐ‘ๅฟ…้œ€็š„็‰ฉไปถไฝ็งปๅกŠ"
+
+#: midx.c:165
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "ๅคšๅŒ…็ดขๅผ•ๅŒ…ๅ็„กๅบ๏ผš'%s' ๅœจ '%s' ไน‹ๅ‰"
+
+#: midx.c:210
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "้Œฏ็š„ pack-int-id๏ผš%u๏ผˆๅ…ฑๆœ‰ %u ๅ€‹ๅŒ…๏ผ‰"
+
+#: midx.c:260
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr "ๅคšๅŒ…็ดขๅผ•ๅ„ฒๅญ˜ไธ€ๅ€‹64ไฝไฝ็งป๏ผŒไฝ†ๆ˜ฏ off_t ๅคชๅฐ"
+
+#: midx.c:288
+msgid "error preparing packfile from multi-pack-index"
+msgstr "ๅพžๅคšๅŒ…็ดขๅผ•ๆบ–ๅ‚™ packfile ๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
+
+#: midx.c:472
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "ๆ–ฐๅขž packfile '%s' ๅคฑๆ•—"
+
+#: midx.c:478
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "้–‹ๅ•ŸๅŒ…็ดขๅผ• '%s' ๅคฑๆ•—"
+
+#: midx.c:538
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "ๅœจ packfile ไธญๅฎšไฝ็‰ฉไปถ %d ๅคฑๆ•—"
+
+#: midx.c:842
+msgid "Adding packfiles to multi-pack-index"
+msgstr "ๆญฃๅœจๆ–ฐๅขž packfile ่‡ณๅคšๅŒ…็ดขๅผ•"
+
+#: midx.c:875
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "ๆฒ’ๆœ‰็œ‹ๅˆฐ่ฆๆจๆฃ„็š„ๅŒ…ๆช”ๆกˆ %s"
+
+#: midx.c:973
+msgid "Writing chunks to multi-pack-index"
+msgstr "ๅฏซๅ…ฅๅ€ๅกŠ่‡ณๅคšๅŒ…็ดขๅผ•"
+
+#: midx.c:1052
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "ๆธ…็†ไฝๆ–ผ %s ็š„ๅคšๅŒ…็ดขๅผ•ๅคฑๆ•—"
+
+#: midx.c:1108
+msgid "Looking for referenced packfiles"
+msgstr "ๆญฃๅœจๅฐ‹ๆ‰พๅผ•็”จ็š„ packfile"
+
+#: midx.c:1123
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr "็‰ฉไปถ ID ๆ‰‡ๅ‡บ็„กๅบ๏ผšfanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+#: midx.c:1128
+msgid "Verifying OID order in multi-pack-index"
+msgstr "ๆญฃๅœจ้ฉ—่ญ‰ๅคšๅŒ…็ดขๅผ•ไธญ็š„็‰ฉไปถ ID ้ †ๅบ"
+
+#: midx.c:1137
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "็‰ฉไปถ ID ๆŸฅ่ฉข็„กๅบ๏ผšoid[%d] = %s >= %s = oid[%d]"
+
+#: midx.c:1157
+msgid "Sorting objects by packfile"
+msgstr "้€้Ž packfile ็‚บ็‰ฉไปถๆŽ’ๅบ"
+
+#: midx.c:1164
+msgid "Verifying object offsets"
+msgstr "ๆญฃๅœจ้ฉ—่ญ‰็‰ฉไปถไฝ็งป"
+
+#: midx.c:1180
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "็‚บ oid[%d] = %s ่ผ‰ๅ…ฅๅŒ…ๆข็›ฎๅคฑๆ•—"
+
+#: midx.c:1186
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "็‚บ packfile %s ่ผ‰ๅ…ฅๅŒ…็ดขๅผ•ๅคฑๆ•—"
+
+#: midx.c:1195
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "oid[%d] = %s ้Œฏ่ชค็š„็‰ฉไปถไฝ็งป๏ผš%<PRIx64> != %<PRIx64>"
+
+#: midx.c:1220
+msgid "Counting referenced objects"
+msgstr "ๆญฃๅœจ่จˆ็ฎ—ๅผ•็”จ็‰ฉไปถ"
+
+#: midx.c:1230
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "ๆญฃๅœจๅฐ‹ๆ‰พไธฆๅˆช้™คๆฒ’ๆœ‰ๅƒ่€ƒ็š„ packfile"
+
+#: midx.c:1388
+msgid "could not start pack-objects"
+msgstr "ไธ่ƒฝ้–‹ๅง‹ pack-objects"
+
+#: midx.c:1407
+msgid "could not finish pack-objects"
+msgstr "ไธ่ƒฝ็ตๆŸ pack-objects"
+
+#: name-hash.c:537
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ lazy_dir ๅŸท่กŒ็ท’๏ผš%s"
+
+#: name-hash.c:559
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ lazy_name ๅŸท่กŒ็ท’๏ผš%s"
+
+#: name-hash.c:565
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "ไธ่ƒฝๅŠ ๅ…ฅ lasy_name ๅŸท่กŒ็ท’๏ผš%s"
+
+#: notes-merge.c:277
+#, c-format
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
+msgstr ""
+"ๆ‚จ็š„ๅ‰ไธ€ๆฌกๅ‚™่จปๅˆไฝตๅฐšๆœช็ตๆŸ๏ผˆๅญ˜ๅœจ %s๏ผ‰ใ€‚\n"
+"ๅœจ้–‹ๅง‹ไธ€ๅ€‹ๆ–ฐ็š„ๅ‚™่จปๅˆไฝตไน‹ๅ‰๏ผŒ่ซ‹ไฝฟ็”จ 'git notes merge --commit' ๆˆ–่€… 'git "
+"notes merge --abort' ไพ†ๆไบค/็ต‚ๆญขๅ‰ไธ€ๆฌกๅˆไฝตใ€‚"
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "ๆ‚จๅฐšๆœช็ตๆŸๅ‚™่จปๅˆไฝต๏ผˆๅญ˜ๅœจ %s๏ผ‰ใ€‚"
+
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "ไธ่ƒฝๆไบคๆœชๅˆๅง‹ๅŒ–/ๆœชๅผ•็”จ็š„่จป่งฃๆจน"
+
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "ๅฃž็š„ notes.rewriteMode ๅ€ผ๏ผš'%s'"
+
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "ๆ‹’็ต•ๅ‘ %s๏ผˆๅœจ refs/notes/ ไน‹ๅค–๏ผ‰ๅฏซๅ…ฅ่จป่งฃ"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "ๅฃž็š„ %s ๅ€ผ๏ผš'%s'"
+
+#: object.c:53
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "็„กๆ•ˆ็š„็‰ฉไปถ้กžๅž‹ \"%s\""
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "็‰ฉไปถ %s ๆ˜ฏไธ€ๅ€‹ %s๏ผŒไธๆ˜ฏไธ€ๅ€‹ %s"
+
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "็‰ฉไปถ %s ๆœ‰ๆœช็Ÿฅ็š„้กžๅž‹ id %d"
+
+#: object.c:246
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "ไธ่ƒฝ่งฃๆž็‰ฉไปถ๏ผš%s"
+
+#: object.c:266 object.c:278
+#, c-format
+msgid "hash mismatch %s"
+msgstr "้›œๆนŠๅ€ผ่ˆ‡ %s ไธ็ฌฆๅˆ"
+
+#: packfile.c:629
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "ไฝ็งป้‡ๅœจ packfile ็ตๆŸไน‹ๅ‰๏ผˆๆๅฃž็š„ .idx๏ผŸ๏ผ‰"
+
+#: packfile.c:1899
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "ไฝ็งป้‡ๅœจ %s ็š„ๅŒ…็ดขๅผ•้–‹ๅง‹ไน‹ๅ‰๏ผˆๆๅฃž็š„็ดขๅผ•๏ผŸ๏ผ‰"
+
+#: packfile.c:1903
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "ไฝ็งป้‡่ถŠ้Žไบ† %s ็š„ๅŒ…็ดขๅผ•็š„็ตๅฐพ๏ผˆ่ขซๆˆชๆ–ท็š„็ดขๅผ•๏ผŸ๏ผ‰"
+
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "ไธ่ƒฝๅพ—ๅˆฐ %s ็š„ๅคงๅฐ"
+
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s ้œ€่ฆไธ€ๅ€‹ๅ€ผ"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s ่ˆ‡ %s ไธ็›ธๅฎน"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s๏ผšๅ’Œๅ…ถๅฎƒ็š„ไธ็›ธๅฎน"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#, c-format
+msgid "%s takes no value"
+msgstr "%s ไธๅ–ๅ€ผ"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s ไธๅฏ็”จ"
+
+#: parse-options.c:217
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s ๆœŸๆœ›ไธ€ๅ€‹้ž่ฒ ๆ•ดๆ•ธๅ’Œไธ€ๅ€‹ๅฏ้ธ็š„ k/m/g ๅพŒ็ถด"
+
+#: parse-options.c:386
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "ๆœ‰ๆญง็พฉ็š„้ธ้ …๏ผš%s๏ผˆๅฏไปฅๆ˜ฏ --%s%s ๆˆ– --%s%s๏ผ‰"
+
+#: parse-options.c:420 parse-options.c:428
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "ไฝ ็š„ๆ„ๆ€ๆ˜ฏ `--%s`๏ผˆๆœ‰ๅ…ฉๅ€‹็Ÿญ็ทš๏ผ‰ๅ—Ž๏ผŸ"
+
+#: parse-options.c:857
+#, c-format
+msgid "unknown option `%s'"
+msgstr "ๆœช็Ÿฅ้ธ้ … `%s'"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "ๆœช็Ÿฅ้–‹้—œ `%c'"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "ๅญ—ไธฒไธญๆœช็Ÿฅ็š„้ž ascii ๅญ—ๅ…ƒ้ธ้ …๏ผš`%s'"
+
+#: parse-options.c:885
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:904
+#, c-format
+msgid "usage: %s"
+msgstr "็”จๆณ•๏ผš%s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:910
+#, c-format
+msgid "   or: %s"
+msgstr "  ๆˆ–๏ผš%s"
+
+#  ่ญฏ่€…๏ผš็‚บไฟ่ญ‰ๅœจ่ผธๅ‡บไธญๅฐ้ฝŠ๏ผŒๆณจๆ„่ชฟๆ•ดๅฅไธญ็ฉบๆ ผ๏ผ
+#: parse-options.c:913
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+#: parse-options.c:952
+msgid "-NUM"
+msgstr "-ๆ•ธๅญ—"
+
+#: parse-options.c:966
+#, c-format
+msgid "alias of --%s"
+msgstr "--%s ็š„ๅˆฅๅ"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "้ธ้ … `%s' ๆœŸๆœ›ไธ€ๅ€‹ๆ•ธๅญ—ๅ€ผ"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "ๆ ผๅผ้Œฏ่ชค็š„ๅˆฐๆœŸๆ™‚้–“๏ผš'%s'"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "้ธ้ … `%s' ๆœŸๆœ› \"always\"ใ€\"auto\" ๆˆ– \"never\""
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "ๆ ผๅผ้Œฏ่ชค็š„็‰ฉไปถๅ '%s'"
+
+#: path.c:915
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "ไธ่ƒฝ่จญๅฎš %s ็‚บ็ต„ๅฏๅฏซ"
+
+#: pathspec.c:130
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "่ทณ่„ซๅญ—ๅ…ƒ '\\' ไธ่ƒฝไฝœ็‚บๅฑฌๆ€งๅ€ผ็š„ๆœ€ๅพŒไธ€ๅ€‹ๅญ—ๅ…ƒ"
+
+#: pathspec.c:148
+msgid "Only one 'attr:' specification is allowed."
+msgstr "ๅชๅ…่จฑไธ€ๅ€‹ 'attr:' ่ฆๆ ผใ€‚"
+
+#: pathspec.c:151
+msgid "attr spec must not be empty"
+msgstr "ๅฑฌๆ€ง่ฆๆ ผไธ่ƒฝ็‚บ็ฉบ"
+
+#: pathspec.c:194
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "็„กๆ•ˆ็š„ๅฑฌๆ€งๅ %s"
+
+#: pathspec.c:259
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "ๅ…จๅŸŸ็š„ 'glob' ๅ’Œ 'noglob' ่ทฏๅพ‘่ฆๆ ผ่จญๅฎšไธ็›ธๅฎน"
+
+#: pathspec.c:266
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "ๅ…จๅŸŸ็š„ 'literal' ่ทฏๅพ‘่ฆๆ ผ่จญๅฎšๅ’Œๅ…ถๅฎƒ็š„ๅ…จๅŸŸ่ทฏๅพ‘่ฆๆ ผ่จญๅฎšไธ็›ธๅฎน"
+
+#: pathspec.c:306
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "่ทฏๅพ‘่ฆๆ ผๅŒ…ๅซ็„กๆ•ˆ็š„็ฅžๅฅ‡ๅ‰็ถด"
+
+#: pathspec.c:327
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "ๅœจ่ทฏๅพ‘่ฆๆ ผ '%3$s' ไธญ็„กๆ•ˆ็š„็ฅžๅฅ‡ๅ‰็ถด '%2$.*1$s'"
+
+#: pathspec.c:332
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "่ทฏๅพ‘่ฆๆ ผ '%s' ็š„็ฅžๅฅ‡ๅ‰็ถด็ตๅฐพๅฐ‘ไบ†ไธ€ๅ€‹ ')'"
+
+#: pathspec.c:370
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "่ทฏๅพ‘่ฆๆ ผ '%2$s' ไธญๅŒ…ๅซๆœชๅฏฆ็พ็š„็ฅžๅฅ‡ๅ‰็ถด '%1$c'"
+
+#: pathspec.c:429
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s๏ผš'literal' ๅ’Œ 'glob' ไธ็›ธๅฎน"
+
+#: pathspec.c:442
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s๏ผš'%s' ๅœจไฝๆ–ผ '%s' ็š„็‰ˆๆœฌๅบซไน‹ๅค–"
+
+#: pathspec.c:517
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s'๏ผˆๅŠฉ่จ˜็ฌฆ๏ผš'%c'๏ผ‰"
+
+#: pathspec.c:527
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s๏ผš่ทฏๅพ‘่ฆๆ ผ็ฅžๅฅ‡ๅ‰็ถดไธ่ขซๆญคๆŒ‡ไปคๆ”ฏๆด๏ผš%s"
+
+#: pathspec.c:594
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "่ทฏๅพ‘่ฆๆ ผ '%s' ไฝๆ–ผ็ฌฆ่™Ÿ้€ฃ็ตไธญ"
+
+#: pathspec.c:639
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "ๆŸ่กŒไธๆ‡‰่ฉฒ่ขซๆ‹ฌ่™Ÿๆ‹ฌไฝ๏ผš%s"
+
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "็„กๆณ•ๅฏซ flush ๅŒ…"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "็„กๆณ•ๅฏซ delim ๅŒ…"
+
+#: pkt-line.c:106
+msgid "flush packet write failed"
+msgstr "flush ๅŒ…ๅฏซ้Œฏ่ชค"
+
+#: pkt-line.c:146 pkt-line.c:232
+msgid "protocol error: impossibly long line"
+msgstr "ๅ”ๅฎš้Œฏ่ชค๏ผšไธๅฏ่ƒฝ็š„้•ท่กŒ"
+
+#: pkt-line.c:162 pkt-line.c:164
+msgid "packet write with format failed"
+msgstr "ๆ ผๅผๅŒ–ๅŒ…ๅฏซๅ…ฅ้Œฏ่ชค"
+
+#: pkt-line.c:196
+msgid "packet write failed - data exceeds max packet size"
+msgstr "ๅฏซๅฐๅŒ…ๅคฑๆ•—๏ผš่ณ‡ๆ–™่ถ…้Žไบ†ๅŒ…็š„ๆœ€ๅคง้•ทๅบฆ"
+
+#: pkt-line.c:203 pkt-line.c:210
+msgid "packet write failed"
+msgstr "ๅฐๅŒ…ๅฏซๅ…ฅๅคฑๆ•—"
+
+#: pkt-line.c:295
+msgid "read error"
+msgstr "่ฎ€ๅ–้Œฏ่ชค"
+
+#: pkt-line.c:303
+msgid "the remote end hung up unexpectedly"
+msgstr "้ ็ซฏๆ„ๅค–ๆŽ›ๆ–ทไบ†"
+
+#: pkt-line.c:331
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "ๅ”ๅฎš้Œฏ่ชค๏ผš้Œฏ่ชค็š„่กŒ้•ทๅบฆๅญ—ไธฒ๏ผš%.4s"
+
+#: pkt-line.c:341 pkt-line.c:346
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "ๅ”ๅฎš้Œฏ่ชค๏ผš้Œฏ่ชค็š„่กŒ้•ทๅบฆ %d"
+
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "้ ็ซฏ้Œฏ่ชค๏ผš%s"
+
+#: preload-index.c:119
+msgid "Refreshing index"
+msgstr "ๆญฃๅœจ้‡ๆ–ฐๆ•ด็†็ดขๅผ•"
+
+#: preload-index.c:138
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "็„กๆณ•ๅปบ็ซ‹ๅŸท่กŒ็ท’ lstat๏ผš%s"
+
+#: pretty.c:981
+msgid "unable to parse --pretty format"
+msgstr "ไธ่ƒฝ่งฃๆž --pretty ๆ ผๅผ"
+
+#: promisor-remote.c:23
+msgid "Remote with no URL"
+msgstr "้ ็ซฏๆœช่จญๅฎš URL"
+
+#: promisor-remote.c:58
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "promisor ้ ็ซฏๅ็จฑไธ่ƒฝไปฅ '/' ้–‹ๅง‹๏ผš%s"
+
+#: range-diff.c:75
+msgid "could not start `log`"
+msgstr "ไธ่ƒฝๅ•Ÿๅ‹• `log`"
+
+#: range-diff.c:77
+msgid "could not read `log` output"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– `log` ็š„่ผธๅ‡บ"
+
+#: range-diff.c:96 sequencer.c:5020
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "ไธ่ƒฝ่งฃๆžๆไบค '%s'"
+
+#: range-diff.c:122
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "็„กๆณ•่งฃๆž git ้ ญ '%.*s'"
+
+#: range-diff.c:285
+msgid "failed to generate diff"
+msgstr "็”Ÿๆˆ diff ๅคฑๆ•—"
+
+#: range-diff.c:518 range-diff.c:520
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "ไธ่ƒฝ่งฃๆž '%s' ็š„ๆ—ฅ่ชŒ"
+
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "ๅฐ‡ไธๆœƒๆ–ฐๅขžๆช”ๆกˆๅˆฅๅ '%s'๏ผˆ'%s' ๅทฒ็ถ“ๅญ˜ๅœจๆ–ผ็ดขๅผ•ไธญ๏ผ‰"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "ไธ่ƒฝๅœจ็‰ฉไปถ่ณ‡ๆ–™ๅบซไธญๅปบ็ซ‹็ฉบ็š„่ณ‡ๆ–™็‰ฉไปถ"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr "%s๏ผšๅช่ƒฝๆ–ฐๅขžไธ€่ˆฌๆช”ๆกˆใ€็ฌฆ่™Ÿ้€ฃ็ตๆˆ– git ็›ฎ้Œ„"
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' ๆฒ’ๆœ‰็ฐฝๅ‡บไธ€ๅ€‹ๆไบค"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "็„กๆณ•็ดขๅผ•ๆช”ๆกˆ '%s'"
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "็„กๆณ•ๅœจ็ดขๅผ•ไธญๆ–ฐๅขž '%s'"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "็„กๆณ•ๅฐ %s ๅŸท่กŒ stat"
+
+#: read-cache.c:1330
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' ็œ‹่ตทไพ†ๆ—ขๆ˜ฏๆช”ๆกˆๅˆๆ˜ฏ็›ฎ้Œ„"
+
+#: read-cache.c:1536
+msgid "Refresh index"
+msgstr "้‡ๆ–ฐๆ•ด็†็ดขๅผ•"
+
+#: read-cache.c:1651
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"่จญๅฎšไบ† index.version๏ผŒไฝ†ๆ˜ฏๅ–ๅ€ผ็„กๆ•ˆใ€‚\n"
+"ไฝฟ็”จ็‰ˆๆœฌ %i"
+
+#: read-cache.c:1661
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"่จญๅฎšไบ† GIT_INDEX_VERSION๏ผŒไฝ†ๆ˜ฏๅ–ๅ€ผ็„กๆ•ˆใ€‚\n"
+"ไฝฟ็”จ็‰ˆๆœฌ %i"
+
+#: read-cache.c:1717
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "ๅฃž็š„็ฐฝๅ 0x%08x"
+
+#: read-cache.c:1720
+#, c-format
+msgid "bad index version %d"
+msgstr "ๅฃž็š„็ดขๅผ•็‰ˆๆœฌ %d"
+
+#: read-cache.c:1729
+msgid "bad index file sha1 signature"
+msgstr "ๅฃž็š„็ดขๅผ•ๆช”ๆกˆ sha1 ็ฐฝๅ"
+
+#: read-cache.c:1759
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "็ดขๅผ•ไฝฟ็”จไธ่ขซๆ”ฏๆด็š„ %.4s ๆ“ดๅฑ•"
+
+#
+#: read-cache.c:1761
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "ๅฟฝ็•ฅ %.4s ๆ“ดๅฑ•"
+
+#: read-cache.c:1798
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "ๆœช็Ÿฅ็š„็ดขๅผ•ๆข็›ฎๆ ผๅผ 0x%08x"
+
+#: read-cache.c:1814
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "็ดขๅผ•ไธญ้ ่ฟ‘่ทฏๅพ‘ '%s' ๆœ‰้Œฏ่ชค็š„ๅ็จฑๆฌ„ไฝ"
+
+#: read-cache.c:1871
+msgid "unordered stage entries in index"
+msgstr "็ดขๅผ•ไธญๆœ‰ๆœชๆŽ’ๅบ็š„ๆšซๅญ˜ๆข็›ฎ"
+
+#: read-cache.c:1874
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "ๅˆไฝตๆช”ๆกˆ '%s' ๆœ‰ๅคšๅ€‹ๆšซๅญ˜ๆข็›ฎ"
+
+#: read-cache.c:1877
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "'%s' ็š„ๆœชๆŽ’ๅบๆšซๅญ˜ๆข็›ฎ"
+
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
+msgid "index file corrupt"
+msgstr "็ดขๅผ•ๆช”ๆกˆๆๅฃž"
+
+#: read-cache.c:2124
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "็„กๆณ•ๅปบ็ซ‹ load_cache_entries ๅŸท่กŒ็ท’๏ผš%s"
+
+#: read-cache.c:2137
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "็„กๆณ•ๅŠ ๅ…ฅ load_cache_entries ๅŸท่กŒ็ท’๏ผš%s"
+
+#: read-cache.c:2170
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s๏ผš้–‹ๅ•Ÿ็ดขๅผ•ๆช”ๆกˆๅคฑๆ•—"
+
+#: read-cache.c:2174
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s๏ผšไธ่ƒฝๅฐ้–‹ๅ•Ÿ็š„็ดขๅผ•ๅŸท่กŒ stat ๅ‹•ไฝœ"
+
+#: read-cache.c:2178
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s๏ผš็ดขๅผ•ๆช”ๆกˆๆฏ”้ ๆœŸ็š„ๅฐ"
+
+#: read-cache.c:2182
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s๏ผš็„กๆณ•ๅฐ็ดขๅผ•ๆช”ๆกˆๅŸท่กŒ map ๅ‹•ไฝœ"
+
+#: read-cache.c:2224
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "็„กๆณ•ๅปบ็ซ‹ load_index_extensions ๅŸท่กŒ็ท’๏ผš%s"
+
+#: read-cache.c:2251
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "็„กๆณ•ๅŠ ๅ…ฅ load_index_extensions ๅŸท่กŒ็ท’๏ผš%s"
+
+#: read-cache.c:2283
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "็„กๆณ•้‡ๆ–ฐๆ•ด็†ๅ…ฑไบซ็ดขๅผ• '%s'"
+
+#: read-cache.c:2330
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "ๆๅฃž็š„็ดขๅผ•๏ผŒๆœŸๆœ›ๅœจ %2$s ไธญ็š„ %1$s๏ผŒๅพ—ๅˆฐ %3$s"
+
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#, c-format
+msgid "could not close '%s'"
+msgstr "ไธ่ƒฝ้—œ้–‰ '%s'"
+
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#, c-format
+msgid "could not stat '%s'"
+msgstr "ไธ่ƒฝๅฐ '%s' ๅ‘ผๅซ stat"
+
+#: read-cache.c:3142
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ git ็›ฎ้Œ„๏ผš%s"
+
+#: read-cache.c:3154
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "็„กๆณ•ๅˆช้™ค๏ผš%s"
+
+#: read-cache.c:3179
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "ไธ่ƒฝไฟฎๅพฉ '%s' ็š„ๆฌŠ้™ไฝ"
+
+#: read-cache.c:3328
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s๏ผšไธ่ƒฝ่ฝๅˆฐๆšซๅญ˜ๅ€ #0"
+
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"ๆ‚จๅฏไปฅ็”จ 'git rebase --edit-todo' ไฟฎๆญฃ๏ผŒ็„ถๅพŒๅŸท่กŒ 'git rebase --continue'ใ€‚\n"
+"ๆˆ–่€…ๆ‚จๅฏไปฅ็”จ 'git rebase --abort' ็ต‚ๆญข้‡ๅฎšๅŸบๅบ•ใ€‚\n"
+
+#: rebase-interactive.c:33
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "้ธ้ … rebase.missingCommitsCheck ็š„ๅ€ผ %s ็„กๆณ•่ญ˜ๅˆฅใ€‚ๅทฒๅฟฝ็•ฅใ€‚"
+
+#: rebase-interactive.c:42
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       create a merge commit using the original merge commit's\n"
+".       message (or the oneline, if no original merge commit was\n"
+".       specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"ๆŒ‡ไปค:\n"
+"p, pick <ๆไบค> = ไฝฟ็”จๆไบค\n"
+"r, reword <ๆไบค> = ไฝฟ็”จๆไบค๏ผŒไฝ†ไฟฎๆ”นๆไบค่ชชๆ˜Ž\n"
+"e, edit <ๆไบค> = ไฝฟ็”จๆไบค๏ผŒ้€ฒๅ…ฅ shell ไปฅไพฟ้€ฒ่กŒๆไบคไฟฎ่ฃœ\n"
+"s, squash <ๆไบค> = ไฝฟ็”จๆไบค๏ผŒไฝ†่žๅˆๅˆฐๅ‰ไธ€ๅ€‹ๆไบค\n"
+"f, fixup <ๆไบค> = ้กžไผผๆ–ผ \"squash\"๏ผŒไฝ†ๆจๆฃ„ๆไบค่ชชๆ˜Žๆ—ฅ่ชŒ\n"
+"x, exec <ๆŒ‡ไปค> = ไฝฟ็”จ shell ๅŸท่กŒๆŒ‡ไปค๏ผˆๆญค่กŒๅ‰ฉ้ค˜้ƒจๅˆ†๏ผ‰\n"
+"b, break = ๅœจๆญค่™•ๅœๆญข๏ผˆไฝฟ็”จ 'git rebase --continue' ็นผ็บŒ้‡ๅฎšๅŸบๅบ•๏ผ‰\n"
+"d, drop <ๆไบค> = ๅˆช้™คๆไบค\n"
+"l, label <label> = ็‚บ็›ฎๅ‰ HEAD ๆ‰“ไธŠๆจ™่จ˜\n"
+"t, reset <label> = ้‡่จญ HEAD ๅˆฐ่ฉฒๆจ™่จ˜\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       ๅปบ็ซ‹ไธ€ๅ€‹ๅˆไฝตๆไบค๏ผŒไธฆไฝฟ็”จๅŽŸๅง‹็š„ๅˆไฝตๆไบค่ชชๆ˜Ž๏ผˆๅฆ‚ๆžœๆฒ’ๆœ‰ๆŒ‡ๅฎš\n"
+".       ๅŽŸๅง‹ๆไบค๏ผŒไฝฟ็”จๅ‚™่จป้ƒจๅˆ†็š„ oneline ไฝœ็‚บๆไบค่ชชๆ˜Ž๏ผ‰ใ€‚ไฝฟ็”จ\n"
+".       -c <ๆไบค> ๅฏไปฅ็ทจ่ผฏๆไบค่ชชๆ˜Žใ€‚\n"
+"\n"
+"ๅฏไปฅๅฐ้€™ไบ›่กŒ้‡ๆ–ฐๆŽ’ๅบ๏ผŒๅฐ‡ๅพžไธŠ่‡ณไธ‹ๅŸท่กŒใ€‚\n"
+
+#: rebase-interactive.c:63
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "้‡ๅฎšๅŸบๅบ• %s ๅˆฐ %s๏ผˆ%d ๅ€‹ๆไบค๏ผ‰"
+
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"ไธ่ฆๅˆช้™คไปปๆ„ไธ€่กŒใ€‚ไฝฟ็”จ 'drop' ้กฏๅผๅœฐๅˆช้™คไธ€ๅ€‹ๆไบคใ€‚\n"
+
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"ๅฆ‚ๆžœๆ‚จๅœจ้€™่ฃกๅˆช้™คไธ€่กŒ๏ผŒๅฐๆ‡‰็š„ๆไบคๅฐ‡ๆœƒ้บๅคฑใ€‚\n"
+
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"ๆ‚จๆญฃๅœจไฟฎๆ”น้€ฒ่กŒไธญ็š„ไบ’ๅ‹•ๅผ้‡ๅฎšๅŸบๅบ•ๅพ…่พฆๅˆ—่กจใ€‚่‹ฅ่ฆๅœจ็ทจ่ผฏ็ตๆŸๅพŒ็นผ็บŒ้‡ๅฎšๅŸบๅบ•๏ผŒ\n"
+"่ซ‹ๅŸท่กŒ๏ผš\n"
+"    git rebase --continue\n"
+"\n"
+
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"็„ถ่€Œ๏ผŒๅฆ‚ๆžœๆ‚จๅˆช้™คๅ…จ้ƒจๅ…งๅฎน๏ผŒ้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœๅฐ‡ๆœƒ็ต‚ๆญขใ€‚\n"
+"\n"
+
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#, c-format
+msgid "could not write '%s'"
+msgstr "ไธ่ƒฝๅฏซๅ…ฅ '%s'"
+
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
+#, c-format
+msgid "could not write '%s'."
+msgstr "ไธ่ƒฝๅฏซๅ…ฅ '%s'ใ€‚"
+
+#: rebase-interactive.c:193
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"่ญฆๅ‘Š๏ผšไธ€ไบ›ๆไบคๅฏ่ƒฝ่ขซๆ„ๅค–ๆจๆฃ„ใ€‚\n"
+"ๆจๆฃ„็š„ๆไบค๏ผˆๅพžๆ–ฐๅˆฐ่ˆŠ๏ผ‰๏ผš\n"
+
+#: rebase-interactive.c:200
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"็‚บ้ฟๅ…้€™ๆข่จŠๆฏ๏ผŒไฝฟ็”จ \"drop\" ๆŒ‡ไปค้กฏๅผๅœฐๅˆช้™คไธ€ๅ€‹ๆไบคใ€‚\n"
+"\n"
+"ไฝฟ็”จ 'git config rebase.missingCommitsCheck' ไพ†ไฟฎๆ”น่ญฆๅ‘Š็ดšๅˆฅใ€‚\n"
+"ๅฏ้ธๅ€ผๆœ‰๏ผšignoreใ€warnใ€errorใ€‚\n"
+"\n"
+
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "ไธ่ƒฝ่ฎ€ๅ– '%s'ใ€‚"
+
+#: refs.c:262
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s ๆฒ’ๆœ‰ๆŒ‡ๅ‘ไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ฉไปถ๏ผ"
+
+#: refs.c:667
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ๅฟฝ็•ฅๆ‡ธ็ฉบ็ฌฆ่™Ÿๅผ•็”จ %s"
+
+#: refs.c:669 ref-filter.c:2098
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ๅฟฝ็•ฅๆๅฃž็š„ๅผ•็”จ %s"
+
+#: refs.c:804
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "็„กๆณ•็‚บๅฏซๅ…ฅ้–‹ๅ•Ÿ '%s'๏ผš%s"
+
+#: refs.c:814 refs.c:865
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "็„กๆณ•่ฎ€ๅ–ๅผ•็”จ '%s'"
+
+#: refs.c:820
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "ๅผ•็”จ '%s' ๅทฒ็ถ“ๅญ˜ๅœจ"
+
+#: refs.c:825
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "ๅฏซๅ…ฅ '%s' ๆ™‚ๆ„ๅค–็š„็‰ฉไปถ ID"
+
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr "ไธ่ƒฝๅฏซๅ…ฅ '%s'"
+
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "็„กๆณ•้–‹ๅ•Ÿ '%s' ้€ฒ่กŒๅฏซๅ…ฅ"
+
+#: refs.c:867
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "ๅˆช้™ค '%s' ๆ™‚ๆ„ๅค–็š„็‰ฉไปถ ID"
+
+#: refs.c:998
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "ๅผ•็”จ %s ็š„ๆ—ฅ่ชŒๅœจ %s ไน‹ๅพŒๆœ‰็ผบๅฃ"
+
+#: refs.c:1004
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "ๅผ•็”จ %s ็š„ๆ—ฅ่ชŒๆ„ๅค–็ต‚ๆญขๆ–ผ %s "
+
+#: refs.c:1063
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s ็š„ๆ—ฅ่ชŒ็‚บ็ฉบ"
+
+#: refs.c:1155
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "ๆ‹’็ต•ๆ›ดๆ–ฐๆœ‰้Œฏ่ชคๅ็จฑ '%s' ็š„ๅผ•็”จ"
+
+#: refs.c:1231
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "ๅฐๅผ•็”จ '%s' ๅŸท่กŒ update_ref ๅคฑๆ•—๏ผš%s"
+
+#: refs.c:2023
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "ไธๅ…่จฑๅฐๅผ•็”จ '%s' ๅคšๆฌกๆ›ดๆ–ฐ"
+
+#: refs.c:2055
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "ๅœจ้š”้›ข็’ฐๅขƒไธญ็ฆๆญขๆ›ดๆ–ฐๅผ•็”จ"
+
+#: refs.c:2151 refs.c:2181
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' ๅทฒๅญ˜ๅœจ๏ผŒ็„กๆณ•ๅปบ็ซ‹ '%s'"
+
+#: refs.c:2157 refs.c:2192
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "็„กๆณ•ๅŒๆ™‚่™•็† '%s' ๅ’Œ '%s'"
+
+#: refs/files-backend.c:1233
+#, c-format
+msgid "could not remove reference %s"
+msgstr "็„กๆณ•ๅˆช้™คๅผ•็”จ %s"
+
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "็„กๆณ•ๅˆช้™คๅผ•็”จ %s๏ผš%s"
+
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
+#, c-format
+msgid "could not delete references: %s"
+msgstr "็„กๆณ•ๅˆช้™คๅผ•็”จ๏ผš%s"
+
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "็„กๆ•ˆ็š„ๅผ•็”จ่กจ้”ๅผ๏ผš'%s'"
+
+#: ref-filter.c:42 wt-status.c:1938
+msgid "gone"
+msgstr "้บๅคฑ"
+
+#: ref-filter.c:43
+#, c-format
+msgid "ahead %d"
+msgstr "้ ˜ๅ…ˆ %d"
+
+#: ref-filter.c:44
+#, c-format
+msgid "behind %d"
+msgstr "่ฝๅพŒ %d"
+
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "้ ˜ๅ…ˆ %d๏ผŒ่ฝๅพŒ %d"
+
+#: ref-filter.c:165
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "ๆœŸๆœ›็š„ๆ ผๅผ๏ผš%%(color:<้ก่‰ฒ>)"
+
+#: ref-filter.c:167
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„้ก่‰ฒ๏ผš%%(color:%s)"
+
+#: ref-filter.c:189
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "ๆœŸๆœ›ๆ•ดๆ•ธๅ€ผ refname:lstrip=%s"
+
+#: ref-filter.c:193
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "ๆœŸๆœ›ๆ•ดๆ•ธๅ€ผ refname:rstrip=%s"
+
+#: ref-filter.c:195
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ %%(%s) ๅƒๆ•ธ๏ผš%s"
+
+#: ref-filter.c:250
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) ไธๅธถๅƒๆ•ธ"
+
+#: ref-filter.c:272
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ %%(objectsize) ๅƒๆ•ธ๏ผš%s"
+
+#: ref-filter.c:280
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) ไธๅธถๅƒๆ•ธ"
+
+#: ref-filter.c:292
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) ไธๅธถๅƒๆ•ธ"
+
+#: ref-filter.c:301
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) ไธๅธถๅƒๆ•ธ"
+
+#: ref-filter.c:323
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "ๆœช็Ÿฅ็š„ %%(trailers) ๅƒๆ•ธ๏ผš%s"
+
+#: ref-filter.c:352
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "ๆœŸๆœ›ไธ€ๅ€‹ๆญฃๆ•ธ contents:lines=%s"
+
+#: ref-filter.c:354
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ %%(contents) ๅƒๆ•ธ๏ผš%s"
+
+#: ref-filter.c:369
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "ๆœŸๆœ›ไธ€ๅ€‹ๆญฃๆ•ธ objectname:short=%s"
+
+#: ref-filter.c:373
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ %%(objectname) ๅƒๆ•ธ๏ผš%s"
+
+#: ref-filter.c:403
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "ๆœŸๆœ›็š„ๆ ผๅผ๏ผš%%(align:<ๅฏฌๅบฆ>,<ไฝ็ฝฎ>)"
+
+#: ref-filter.c:415
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ไฝ็ฝฎ๏ผš%s"
+
+#: ref-filter.c:422
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ๅฏฌๅบฆ๏ผš%s"
+
+#: ref-filter.c:431
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ %%(align) ๅƒๆ•ธ๏ผš%s"
+
+#: ref-filter.c:439
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "ๅ…ƒ็ด  %%(align) ้œ€่ฆไธ€ๅ€‹ๆญฃๆ•ธ็š„ๅฏฌๅบฆ"
+
+#: ref-filter.c:457
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ %%(if) ๅƒๆ•ธ๏ผš%s"
+
+#: ref-filter.c:559
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "ๆ ผๅผ้Œฏ่ชค็š„ๆฌ„ไฝๅ๏ผš%.*s"
+
+#: ref-filter.c:586
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "ๆœช็Ÿฅ็š„ๆฌ„ไฝๅ๏ผš%.*s"
+
+#: ref-filter.c:590
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ git ็‰ˆๆœฌๅบซ๏ผŒไฝ†ๆ˜ฏๆฌ„ไฝ '%.*s' ้œ€่ฆๅญ˜ๅ–็‰ฉไปถ่ณ‡ๆ–™"
+
+#: ref-filter.c:714
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(if) ๅ…ƒ็ด ่€Œๆฒ’ๆœ‰ %%(then) ๅ…ƒ็ด "
+
+#: ref-filter.c:777
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(then) ๅ…ƒ็ด ่€Œๆฒ’ๆœ‰ %%(if) ๅ…ƒ็ด "
+
+#: ref-filter.c:779
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "ๆ ผๅผ๏ผš%%(then) ๅ…ƒ็ด ็”จไบ†ๅคšๆฌก"
+
+#: ref-filter.c:781
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "ๆ ผๅผ๏ผš%%(then) ๅ…ƒ็ด ็”จๅœจไบ† %%(else) ไน‹ๅพŒ"
+
+#: ref-filter.c:809
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(else) ๅ…ƒ็ด ่€Œๆฒ’ๆœ‰ %%(if) ๅ…ƒ็ด "
+
+#: ref-filter.c:811
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(else) ๅ…ƒ็ด ่€Œๆฒ’ๆœ‰ %%(then) ๅ…ƒ็ด "
+
+#: ref-filter.c:813
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "ๆ ผๅผ๏ผš%%(else) ๅ…ƒ็ด ็”จไบ†ๅคšๆฌก"
+
+#: ref-filter.c:828
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "ๆ ผๅผ๏ผšไฝฟ็”จไบ† %%(end) ๅ…ƒ็ด ๅปๆฒ’ๆœ‰ๅฎƒ็š„ๅฐๆ‡‰ๅ…ƒ็ด "
+
+#: ref-filter.c:885
+#, c-format
+msgid "malformed format string %s"
+msgstr "้Œฏ่ชค็š„ๆ ผๅผๅŒ–ๅญ—ไธฒ %s"
+
+#: ref-filter.c:1488
+#, c-format
+msgid "no branch, rebasing %s"
+msgstr "้žๅˆ†ๆ”ฏ๏ผŒๆญฃ้‡ๅฎšๅŸบๅบ• %s"
+
+#: ref-filter.c:1491
+#, c-format
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "้žๅˆ†ๆ”ฏ๏ผŒๆญฃ้‡ๅฎšๅŸบๅบ•ๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™ %s"
+
+#: ref-filter.c:1494
+#, c-format
+msgid "no branch, bisect started on %s"
+msgstr "้žๅˆ†ๆ”ฏ๏ผŒไบŒๅˆ†ๅฐ‹ๆ‰พ้–‹ๅง‹ๆ–ผ %s"
+
+#: ref-filter.c:1504
+msgid "no branch"
+msgstr "้žๅˆ†ๆ”ฏ"
+
+#: ref-filter.c:1540 ref-filter.c:1749
+#, c-format
+msgid "missing object %s for %s"
+msgstr "็ผบๅฐ‘ %2$s ็š„็‰ฉไปถ %1$s"
+
+#: ref-filter.c:1550
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer ๅคฑๆ•—ๆ–ผ %2$s ็š„ %1$s"
+
+#: ref-filter.c:2004
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "ๆ ผๅผ้Œฏ่ชค็š„็‰ฉไปถ '%s'"
+
+#: ref-filter.c:2093
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ๅฟฝ็•ฅๅธถๆœ‰้Œฏ่ชคๅ็จฑ %s ็š„ๅผ•็”จ"
+
+#: ref-filter.c:2389
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "ๆ ผๅผ๏ผš็ผบๅฐ‘ %%(end) ๅ…ƒ็ด "
+
+#: ref-filter.c:2489
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "้ธ้ … `%s' ๅ’Œ --merged ไธ็›ธๅฎน"
+
+#: ref-filter.c:2492
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "้ธ้ … `%s' ๅ’Œ --no-merged ไธ็›ธๅฎน"
+
+#: ref-filter.c:2502
+#, c-format
+msgid "malformed object name %s"
+msgstr "ๆ ผๅผ้Œฏ่ชค็š„็‰ฉไปถๅ %s"
+
+#: ref-filter.c:2507
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "้ธ้ … `%s' ๅฟ…้ ˆๆŒ‡ๅ‘ไธ€ๅ€‹ๆไบค"
+
+#: remote.c:366
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "่จญๅฎš็š„้ ็ซฏ็Ÿญๅ็จฑไธ่ƒฝไปฅ '/' ้–‹ๅง‹๏ผš%s"
+
+#: remote.c:414
+msgid "more than one receivepack given, using the first"
+msgstr "ๆไพ›ไบ†ไธ€ๅ€‹ไปฅไธŠ็š„ receivepack๏ผŒไฝฟ็”จ็ฌฌไธ€ๅ€‹"
+
+#: remote.c:422
+msgid "more than one uploadpack given, using the first"
+msgstr "ๆไพ›ไบ†ไธ€ๅ€‹ไปฅไธŠ็š„ uploadpack๏ผŒไฝฟ็”จ็ฌฌไธ€ๅ€‹"
+
+#: remote.c:612
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "ไธ่ƒฝๅŒๆ™‚ๅ–ๅพ— %s ๅ’Œ %s ่‡ณ %s"
+
+#: remote.c:616
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s ้€šๅธธ่ฟฝ่นค %s๏ผŒ่€Œ้ž %s"
+
+#: remote.c:620
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s ๅŒๆ™‚่ฟฝ่นค %s ๅ’Œ %s"
+
+#: remote.c:688
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "ๆจกๅผ็š„้ต '%s' ๆฒ’ๆœ‰ '*'"
+
+#: remote.c:698
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "ๆจกๅผ็š„ๅ€ผ '%s' ๆฒ’ๆœ‰ '*'"
+
+#: remote.c:1004
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "ๆบๅผ•็”จ่กจ้”ๅผ %s ๆฒ’ๆœ‰็ฌฆๅˆ"
+
+#: remote.c:1009
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "ๆบๅผ•็”จ่กจ้”ๅผ %s ็ฌฆๅˆ่ถ…้Žไธ€ๅ€‹"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1024
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"ๆ‚จๆไพ›็š„็›ฎๆจ™ไธๆ˜ฏไธ€ๅ€‹ๅฎŒๆ•ด็š„ๅผ•็”จๅ็จฑ๏ผˆๅณไปฅ \"refs/\" ้–‹้ ญ๏ผ‰ใ€‚ๆˆ‘ๅ€‘\n"
+"่ฉฆ่‘—็Œœๆธฌๆ‚จ็š„ๆƒณๆณ•๏ผš\n"
+"\n"
+"- ๅœจ้ ็ซฏๆŸฅ่ฉขๅ’Œ '%s' ็ฌฆๅˆ็š„ๅผ•็”จใ€‚\n"
+"- ๆชขๆŸฅ่ฆๆŽจ้€็š„ <src>๏ผˆ'%s'๏ผ‰ๆ˜ฏไธๆ˜ฏๅœจ \"refs/{heads,tags}/\" ไธญ็š„\n"
+"  ๅผ•็”จใ€‚ๅฆ‚ๆžœๆ˜ฏ๏ผŒๆˆ‘ๅ€‘ๆœƒๅœจๅฐๆ‡‰็š„้ ็ซฏๆ–ฐๅขž refs/{heads,tags}/ ๅ‰็ถดใ€‚\n"
+"\n"
+"้ƒฝไธ่กŒ๏ผŒๆ‰€ไปฅๆˆ‘ๅ€‘ๅทฒๆ”พๆฃ„ใ€‚ๆ‚จๅฟ…้ ˆ็ตฆๅ‡บๅฎŒๆ•ด็š„ๅผ•็”จใ€‚"
+
+#: remote.c:1044
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"ๅผ•็”จ่กจ้”ๅผ็š„ <src> ๆ˜ฏไธ€ๅ€‹ๆไบค็‰ฉไปถใ€‚ๆ‚จๆ˜ฏๆƒณๅปบ็ซ‹ไธ€ๅ€‹ๆ–ฐ็š„ๅˆ†ๆ”ฏ่€Œๅ‘\n"
+"'%s:refs/heads/%s' ๆŽจ้€ๅ—Ž๏ผŸ"
+
+#: remote.c:1049
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"ๅผ•็”จ่กจ้”ๅผ็š„ <src> ๆ˜ฏไธ€ๅ€‹ๆจ™็ฑค็‰ฉไปถใ€‚ๆ‚จๆ˜ฏๆƒณๅปบ็ซ‹ไธ€ๅ€‹ๆ–ฐ็š„ๆจ™็ฑค่€Œๅ‘\n"
+"'%s:refs/tags/%s' ๆŽจ้€ๅ—Ž๏ผŸ"
+
+#: remote.c:1054
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"ๅผ•็”จ่กจ้”ๅผ็š„ <src> ๆ˜ฏไธ€ๅ€‹ๆจน็‹€็‰ฉไปถใ€‚ๆ‚จๆ˜ฏๆƒณ็‚บ้€™ๅ€‹ๆจน็‹€็‰ฉไปถๅปบ็ซ‹ๆจ™็ฑค่€Œๅ‘\n"
+"'%s:refs/tags/%s' ๆŽจ้€ๅ—Ž๏ผŸ"
+
+#: remote.c:1059
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"ๅผ•็”จ่กจ้”ๅผ็š„ <src> ๆ˜ฏไธ€ๅ€‹่ณ‡ๆ–™็‰ฉไปถใ€‚ๆ‚จๆ˜ฏๆƒณ็‚บ้€™ๅ€‹่ณ‡ๆ–™็‰ฉไปถๅปบ็ซ‹ๆจ™็ฑค่€Œๅ‘\n"
+"'%s:refs/tags/%s' ๆŽจ้€ๅ—Ž๏ผŸ"
+
+#: remote.c:1095
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s ็„กๆณ•่ขซ่งฃๆž็‚บๅˆ†ๆ”ฏ"
+
+#: remote.c:1106
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "็„กๆณ•ๅˆช้™ค '%s'๏ผš้ ็ซฏๅผ•็”จไธๅญ˜ๅœจ"
+
+#: remote.c:1118
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "็›ฎๆจ™ๅผ•็”จ่กจ้”ๅผ %s ็ฌฆๅˆ่ถ…้Žไธ€ๅ€‹"
+
+#: remote.c:1125
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "็›ฎๆจ™ๅผ•็”จ %s ๆŽฅๆ”ถ่ถ…้Žไธ€ๅ€‹ๆบ"
+
+#: remote.c:1628 remote.c:1729
+msgid "HEAD does not point to a branch"
+msgstr "HEAD ๆฒ’ๆœ‰ๆŒ‡ๅ‘ไธ€ๅ€‹ๅˆ†ๆ”ฏ"
+
+#: remote.c:1637
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "ๆฒ’ๆœ‰ๆญคๅˆ†ๆ”ฏ๏ผš'%s'"
+
+#: remote.c:1640
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "ๅฐšๆœช็ตฆๅˆ†ๆ”ฏ '%s' ่จญๅฎšไธŠๆธธ"
+
+#: remote.c:1646
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "ไธŠๆธธๅˆ†ๆ”ฏ '%s' ๆฒ’ๆœ‰ๅ„ฒๅญ˜็‚บไธ€ๅ€‹้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ"
+
+#: remote.c:1661
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "ๆŽจ้€็›ฎๆจ™ '%s' ่‡ณ้ ็ซฏ '%s' ๆฒ’ๆœ‰ๆœฌๆฉŸ่ฟฝ่นคๅˆ†ๆ”ฏ"
+
+#: remote.c:1673
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "ๅˆ†ๆ”ฏ '%s' ๆฒ’ๆœ‰่จญๅฎš่ฆๆŽจ้€็š„้ ็ซฏไผบๆœๅ™จ"
+
+#: remote.c:1683
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "ๅ‘ '%s' ๆŽจ้€ๅผ•็”จ่ฆๆ ผๆœชๅŒ…ๅซ '%s'"
+
+#: remote.c:1696
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "ๆŽจ้€็„ก็›ฎๆจ™๏ผˆpush.default ๆ˜ฏ 'nothing'๏ผ‰"
+
+#: remote.c:1718
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "็„กๆณ•่งฃๆž 'simple' ๆŽจ้€่‡ณไธ€ๅ€‹ๅ–ฎ็จ็š„็›ฎๆจ™"
+
+#: remote.c:1844
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "็„กๆณ•ๆ‰พๅˆฐ้ ็ซฏๅผ•็”จ %s"
+
+#: remote.c:1857
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* ๅœจๆœฌๆฉŸๅฟฝ็•ฅๅฏ็ฌ‘็š„ๅผ•็”จ '%s'"
+
+#: remote.c:2020
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "ๆ‚จ็š„ๅˆ†ๆ”ฏๅŸบๆ–ผ '%s'๏ผŒไฝ†ๆญคไธŠๆธธๅˆ†ๆ”ฏๅทฒ็ถ“ไธๅญ˜ๅœจใ€‚\n"
+
+#: remote.c:2024
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  ๏ผˆไฝฟ็”จ \"git branch --unset-upstream\" ไพ†ไฟฎๅพฉ๏ผ‰\n"
+
+#: remote.c:2027
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "ๆ‚จ็š„ๅˆ†ๆ”ฏ่ˆ‡ไธŠๆธธๅˆ†ๆ”ฏ '%s' ไธ€่‡ดใ€‚\n"
+
+#: remote.c:2031
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "ๆ‚จ็š„ๅˆ†ๆ”ฏๅ’Œ '%s' ๆŒ‡ๅ‘ไธๅŒ็š„ๆไบคใ€‚\n"
+
+#: remote.c:2034
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  ๏ผˆไฝฟ็”จ \"%s\" ๆชข่ฆ–่ฉณๆƒ…๏ผ‰\n"
+
+#: remote.c:2038
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "ๆ‚จ็š„ๅˆ†ๆ”ฏ้ ˜ๅ…ˆ '%s' ๅ…ฑ %d ๅ€‹ๆไบคใ€‚\n"
+
+#: remote.c:2044
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  ๏ผˆไฝฟ็”จ \"git push\" ไพ†็™ผๅธƒๆ‚จ็š„ๆœฌๆฉŸๆไบค๏ผ‰\n"
+
+#: remote.c:2047
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "ๆ‚จ็š„ๅˆ†ๆ”ฏ่ฝๅพŒ '%s' ๅ…ฑ %d ๅ€‹ๆไบค๏ผŒไธฆไธ”ๅฏไปฅๅฟซ่ฝ‰ใ€‚\n"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: remote.c:2055
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  ๏ผˆไฝฟ็”จ \"git pull\" ไพ†ๆ›ดๆ–ฐๆ‚จ็š„ๆœฌๆฉŸๅˆ†ๆ”ฏ๏ผ‰\n"
+
+#: remote.c:2058
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"ๆ‚จ็š„ๅˆ†ๆ”ฏๅ’Œ '%s' ๅ‡บ็พไบ†ๅ้›ข๏ผŒ\n"
+"ไธฆไธ”ๅˆ†ๅˆฅๆœ‰ %d ๅ’Œ %d ่™•ไธๅŒ็š„ๆไบคใ€‚\n"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: remote.c:2068
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  ๏ผˆไฝฟ็”จ \"git pull\" ไพ†ๅˆไฝต้ ็ซฏๅˆ†ๆ”ฏ๏ผ‰\n"
+
+#: remote.c:2251
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "็„กๆณ•่งฃๆžๆœŸๆœ›็š„็‰ฉไปถๅ '%s'"
+
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "้Œฏ่ชค็š„ๅ–ไปฃๅผ•็”จๅ็จฑ๏ผš%s"
+
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "้‡่ค‡็š„ๅ–ไปฃๅผ•็”จ๏ผš%s"
+
+#: replace-object.c:82
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "็‰ฉไปถ %s ็š„ๅ–ไปฃๅฑค็ดšๅคชๆทฑ"
+
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
+msgstr "ๆๅฃž็š„ MERGE_RR"
+
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
+msgstr "็„กๆณ•ๅฏซๅ…ฅ rerere ่จ˜้Œ„"
+
+#: rerere.c:495
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "ๅฏซๅ…ฅ '%s' (%s) ๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
+
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "้‡ๆ–ฐๆ•ด็† '%s' ๅคฑๆ•—"
+
+#: rerere.c:503 rerere.c:1039
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "ไธ่ƒฝ่งฃๆž '%s' ไธญ็š„่ก็ชๅกŠ"
+
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "ๅœจ '%s' ไธŠๅ‘ผๅซ utime() ๅคฑๆ•—"
+
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
+msgstr "ๅฏซๅ…ฅ '%s' ๅคฑๆ•—"
+
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "ไฝฟ็”จไน‹ๅ‰็š„่งฃๆฑบๆ–นๆกˆๆšซๅญ˜ '%s'ใ€‚"
+
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "ๅทฒ่จ˜้Œ„ '%s' ็š„่งฃๆฑบๆ–นๆกˆใ€‚"
+
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "ไฝฟ็”จไน‹ๅ‰็š„่งฃๆฑบๆ–นๆกˆ่งฃๆฑบ '%s'ใ€‚"
+
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "ไธ่ƒฝๅˆช้™ค stray '%s'"
+
+#: rerere.c:807
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "็‚บ '%s' ่จ˜้Œ„ preimage"
+
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "ไธ่ƒฝๅปบ็ซ‹็›ฎ้Œ„ '%s'"
+
+#: rerere.c:1057
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "ๆ›ดๆ–ฐ '%s' ไธญ็š„่ก็ช็‹€ๆ…‹ๅคฑๆ•—"
+
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "ๆฒ’ๆœ‰็‚บ '%s' ่จ˜ๆ†ถ็š„่งฃๆฑบๆ–นๆกˆ"
+
+#: rerere.c:1077
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "ไธ่ƒฝๅˆช้™ค '%s'"
+
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "ๅทฒ็‚บ '%s' ๆ›ดๆ–ฐ preimage"
+
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "ๅฟ˜่จ˜ '%s' ็š„่งฃๆฑบๆ–นๆกˆ\n"
+
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ rr-cache ็›ฎ้Œ„"
+
+#: revision.c:2497
+msgid "your current branch appears to be broken"
+msgstr "ๆ‚จ็š„็›ฎๅ‰ๅˆ†ๆ”ฏๅฅฝๅƒ่ขซๆๅฃž"
+
+#: revision.c:2500
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "ๆ‚จ็š„็›ฎๅ‰ๅˆ†ๆ”ฏ '%s' ๅฐš็„กไปปไฝ•ๆไบค"
+
+#: revision.c:2708
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent ่ˆ‡ --bisect ไธ็›ธๅฎน"
+
+#: revision.c:2712
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L ๅฐšไธๆ”ฏๆด -p ๅ’Œ -s ไน‹ๅค–็š„ๅทฎ็•ฐๆ ผๅผ"
+
+#: run-command.c:763
+msgid "open /dev/null failed"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ /dev/null"
+
+#: run-command.c:1269
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ async ๅŸท่กŒ็ท’๏ผš%s"
+
+#: run-command.c:1333
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"ๅ› ็‚บๆฒ’ๆœ‰ๅฐ‡ๆŽ›้‰ค '%s' ่จญๅฎš็‚บๅฏๅŸท่กŒ๏ผŒๆŽ›้‰ค่ขซๅฟฝ็•ฅใ€‚ๆ‚จๅฏไปฅ้€้Ž\n"
+"่จญๅฎš `git config advice.ignoredHook false` ไพ†้—œ้–‰้€™ๆข่ญฆๅ‘Šใ€‚"
+
+#: send-pack.c:144
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "่ฎ€ๅ–้ ็ซฏ่งฃๅŒ…็‹€ๆ…‹ๆ™‚ๆ”ถๅˆฐๆ„ๅค–็š„ flush ๅŒ…"
+
+#: send-pack.c:146
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "ไธ่ƒฝ่งฃๆž้ ็ซฏ่งฃๅŒ…็‹€ๆ…‹๏ผš%s"
+
+#: send-pack.c:148
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "้ ็ซฏ่งฃๅŒ…ๅคฑๆ•—๏ผš%s"
+
+#: send-pack.c:309
+msgid "failed to sign the push certificate"
+msgstr "็‚บๆŽจ้€่ญ‰ๆ›ธ็ฑคๅๅคฑๆ•—"
+
+#: send-pack.c:423
+msgid "the receiving end does not support --signed push"
+msgstr "ๆŽฅๆ”ถ็ซฏไธๆ”ฏๆด็ฐฝๅๆŽจ้€"
+
+#: send-pack.c:425
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr "ๆœชๅ‚ณ้€ๆŽจ้€่ญ‰ๆ›ธ๏ผŒๅ› ็‚บๆŽฅๆ”ถ็ซฏไธๆ”ฏๆด็ฐฝๅๆŽจ้€"
+
+#: send-pack.c:437
+msgid "the receiving end does not support --atomic push"
+msgstr "ๆŽฅๆ”ถ็ซฏไธๆ”ฏๆดๅŽŸๅญๆŽจ้€"
+
+#: send-pack.c:442
+msgid "the receiving end does not support push options"
+msgstr "ๆŽฅๆ”ถ็ซฏไธๆ”ฏๆดๆŽจ้€้ธ้ …"
+
+#: sequencer.c:191
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "็„กๆ•ˆ็š„ๆไบค่จŠๆฏๆธ…็†ๆจกๅผ '%s'"
+
+#: sequencer.c:296
+#, c-format
+msgid "could not delete '%s'"
+msgstr "็„กๆณ•ๅˆช้™ค '%s'"
+
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#, c-format
+msgid "could not remove '%s'"
+msgstr "็„กๆณ•ๅˆช้™ค '%s'"
+
+#: sequencer.c:325
+msgid "revert"
+msgstr "้‚„ๅŽŸ"
+
+#: sequencer.c:327
+msgid "cherry-pick"
+msgstr "ๆ€้ธ"
+
+#: sequencer.c:329
+msgid "rebase"
+msgstr "rebase"
+
+#: sequencer.c:331
+#, c-format
+msgid "unknown action: %d"
+msgstr "ๆœช็Ÿฅๅ‹•ไฝœ๏ผš%d"
+
+#: sequencer.c:389
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"่ก็ช่งฃๆฑบๅฎŒ็•ขๅพŒ๏ผŒ็”จ 'git add <่ทฏๅพ‘>' ๆˆ– 'git rm <่ทฏๅพ‘>'\n"
+"ๆŒ‡ไปคๆจ™่จ˜ไฟฎๆญฃๅพŒ็š„ๆช”ๆกˆ"
+
+#: sequencer.c:392
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'\n"
+"and commit the result with 'git commit'"
+msgstr ""
+"่ก็ช่งฃๆฑบๅฎŒ็•ขๅพŒ๏ผŒ็”จ 'git add <่ทฏๅพ‘>' ๆˆ– 'git rm <่ทฏๅพ‘>'\n"
+"ๅฐไฟฎๆญฃๅพŒ็š„ๆช”ๆกˆๅšๆจ™่จ˜๏ผŒ็„ถๅพŒ็”จ 'git commit' ๆไบค"
+
+#: sequencer.c:405 sequencer.c:2901
+#, c-format
+msgid "could not lock '%s'"
+msgstr "ไธ่ƒฝ้Ž–ๅฎš '%s'"
+
+#: sequencer.c:412
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "ไธ่ƒฝๅฐ‡ๆ›่กŒ็ฌฆ่™Ÿๅฏซๅ…ฅ '%s'"
+
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "็„กๆณ•ๅฎŒๆˆ '%s'"
+
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
+#, c-format
+msgid "could not read '%s'"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– '%s'"
+
+#: sequencer.c:466
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "ๆ‚จ็š„ๆœฌๆฉŸไฟฎๆ”นๅฐ‡่ขซ%s่ฆ†่“‹ใ€‚"
+
+#: sequencer.c:470
+msgid "commit your changes or stash them to proceed."
+msgstr "ๆไบคๆ‚จ็š„ไฟฎๆ”นๆˆ–ๅ„ฒ่—ๅพŒๅ†็นผ็บŒใ€‚"
+
+#: sequencer.c:502
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s๏ผšๅฟซ่ฝ‰"
+
+#: sequencer.c:541 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "็„กๆ•ˆ็š„ๆธ…็†ๆจกๅผ %s"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c:635
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s๏ผš็„กๆณ•ๅฏซๅ…ฅๆ–ฐ็ดขๅผ•ๆช”ๆกˆ"
+
+#: sequencer.c:652
+msgid "unable to update cache tree"
+msgstr "ไธ่ƒฝๆ›ดๆ–ฐๅฟซๅ–ๆจน"
+
+#: sequencer.c:666
+msgid "could not resolve HEAD commit"
+msgstr "ไธ่ƒฝ่งฃๆž HEAD ๆไบค"
+
+#: sequencer.c:746
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "ๅœจ '%.*s' ไธญๆฒ’ๆœ‰ key"
+
+#: sequencer.c:757
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "็„กๆณ•็‚บ '%s' ็š„ๅ€ผๅŽปๅผ•่™Ÿ"
+
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "็„กๆณ•้–‹ๅ•Ÿ '%s' ้€ฒ่กŒ่ฎ€ๅ–"
+
+#: sequencer.c:804
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "ๅทฒ็ถ“็ตฆๅ‡บ 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c:809
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "ๅทฒ็ถ“็ตฆๅ‡บ 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c:814
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "ๅทฒ็ถ“็ตฆๅ‡บ 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c:818
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "ๆœช็Ÿฅ่ฎŠๆ•ธ '%s'"
+
+#: sequencer.c:823
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "็ผบๅฐ‘ 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c:825
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "็ผบๅฐ‘ 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c:827
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "็ผบๅฐ‘ 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c:876
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"ๆ‚จ็š„ๅทฅไฝœๅ€ไธญๅญ˜ๅœจๅทฒๆšซๅญ˜็š„ไฟฎๆ”น\n"
+"ๅฆ‚ๆžœ้€™ไบ›ไฟฎๆ”น้œ€่ฆ่ขซไฝตๅ…ฅๅ‰ไธ€ๅ€‹ๆไบค๏ผŒๅŸท่กŒ๏ผš\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"ๅฆ‚ๆžœ้€™ไบ›ไฟฎๆ”น่ฆๅฝขๆˆไธ€ๅ€‹ๆ–ฐๆไบค๏ผŒๅŸท่กŒ๏ผš\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"็„ก่ซ–ๅ“ช็จฎๆƒ…ๆณ๏ผŒ็•ถๆ‚จๅฎŒๆˆๆไบค๏ผŒ็นผ็บŒๅŸท่กŒ๏ผš\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c:1148
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' ๆŽ›้‰คๅคฑๆ•—"
+
+#: sequencer.c:1154
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"ๆ‚จ็š„ๅง“ๅๅ’Œไฟกไปถไฝๅ€ๅŸบๆ–ผ็™ปๅ…ฅๅ็จฑๅ’ŒไธปๆฉŸๅ็จฑ่‡ชๅ‹•่จญๅฎšใ€‚่ซ‹ๆชขๆŸฅๅฎƒๅ€‘ๆญฃ็ขบ\n"
+"่ˆ‡ๅฆใ€‚ๆ‚จๅฏไปฅๅฐๅ…ถ้€ฒ่กŒ่จญๅฎšไปฅๅ…ๅ†ๅ‡บ็พๆœฌๆ็คบ่จŠๆฏใ€‚ๅŸท่กŒๅฆ‚ไธ‹ๆŒ‡ไปคๅœจ็ทจ่ผฏๅ™จ\n"
+"ไธญ็ทจ่ผฏๆ‚จ็š„่จญๅฎšๆช”ๆกˆ๏ผš\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"่จญๅฎšๅฎŒ็•ขๅพŒ๏ผŒๆ‚จๅฏไปฅ็”จไธ‹้ข็š„ๆŒ‡ไปคไพ†ไฟฎๆญฃๆœฌๆฌกๆไบคๆ‰€ไฝฟ็”จ็š„ไฝฟ็”จ่€…่บซไปฝ๏ผš\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:1167
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"ๆ‚จ็š„ๅง“ๅๅ’Œไฟกไปถไฝๅ€ๅŸบๆ–ผ็™ปๅ…ฅๅ็จฑๅ’ŒไธปๆฉŸๅ็จฑ่‡ชๅ‹•่จญๅฎšใ€‚่ซ‹ๆชขๆŸฅๅฎƒๅ€‘ๆญฃ็ขบ\n"
+"่ˆ‡ๅฆใ€‚ๆ‚จๅฏไปฅๅฐๅ…ถ้€ฒ่กŒ่จญๅฎšไปฅๅ…ๅ†ๅ‡บ็พๆœฌๆ็คบ่จŠๆฏ๏ผš\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"่จญๅฎšๅฎŒ็•ขๅพŒ๏ผŒๆ‚จๅฏไปฅ็”จไธ‹้ข็š„ๆŒ‡ไปคไพ†ไฟฎๆญฃๆœฌๆฌกๆไบคๆ‰€ไฝฟ็”จ็š„ไฝฟ็”จ่€…่บซไปฝ๏ผš\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:1209
+msgid "couldn't look up newly created commit"
+msgstr "็„กๆณ•ๆ‰พๅˆฐๆ–ฐๅปบ็ซ‹็š„ๆไบค"
+
+#: sequencer.c:1211
+msgid "could not parse newly created commit"
+msgstr "ไธ่ƒฝ่งฃๆžๆ–ฐๅปบ็ซ‹็š„ๆไบค"
+
+#: sequencer.c:1257
+msgid "unable to resolve HEAD after creating commit"
+msgstr "ๅปบ็ซ‹ๆไบคๅพŒ๏ผŒไธ่ƒฝ่งฃๆž HEAD"
+
+#: sequencer.c:1259
+msgid "detached HEAD"
+msgstr "ๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™"
+
+#  ่ญฏ่€…๏ผšไธญๆ–‡ๅญ—ไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆช้™คๅ‰ๅฐŽ็ฉบๆ ผ
+#: sequencer.c:1263
+msgid " (root-commit)"
+msgstr " (ๆ นๆไบค)"
+
+#: sequencer.c:1284
+msgid "could not parse HEAD"
+msgstr "ไธ่ƒฝ่งฃๆž HEAD"
+
+#: sequencer.c:1286
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s ไธๆ˜ฏไธ€ๅ€‹ๆไบค๏ผ"
+
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+msgid "could not parse HEAD commit"
+msgstr "ไธ่ƒฝ่งฃๆž HEAD ๆไบค"
+
+#: sequencer.c:1342 sequencer.c:1968
+msgid "unable to parse commit author"
+msgstr "ไธ่ƒฝ่งฃๆžๆไบคไฝœ่€…"
+
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree ็„กๆณ•ๅฏซๅ…ฅๆจน็‹€็‰ฉไปถ"
+
+#: sequencer.c:1386 sequencer.c:1447
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "ไธ่ƒฝๅพž '%s' ่ฎ€ๅ–ๆไบค่ชชๆ˜Ž"
+
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
+msgid "failed to write commit object"
+msgstr "ๅฏซๆไบค็‰ฉไปถๅคฑๆ•—"
+
+#: sequencer.c:1474
+#, c-format
+msgid "could not parse commit %s"
+msgstr "ไธ่ƒฝ่งฃๆžๆไบค %s"
+
+#: sequencer.c:1479
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "ไธ่ƒฝ่งฃๆž็ˆถๆไบค %s"
+
+#: sequencer.c:1562 sequencer.c:1673
+#, c-format
+msgid "unknown command: %d"
+msgstr "ๆœช็ŸฅๆŒ‡ไปค๏ผš%d"
+
+#: sequencer.c:1620 sequencer.c:1645
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "้€™ๆ˜ฏไธ€ๅ€‹ %d ๅ€‹ๆไบค็š„็ต„ๅˆใ€‚"
+
+#: sequencer.c:1630
+msgid "need a HEAD to fixup"
+msgstr "้œ€่ฆไธ€ๅ€‹ HEAD ไพ†ไฟฎๅพฉ"
+
+#: sequencer.c:1632 sequencer.c:3212
+msgid "could not read HEAD"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– HEAD"
+
+#: sequencer.c:1634
+msgid "could not read HEAD's commit message"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– HEAD ็š„ๆไบค่ชชๆ˜Ž"
+
+#: sequencer.c:1640
+#, c-format
+msgid "cannot write '%s'"
+msgstr "ไธ่ƒฝๅฏซ '%s'"
+
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+msgid "This is the 1st commit message:"
+msgstr "้€™ๆ˜ฏ็ฌฌไธ€ๅ€‹ๆไบค่ชชๆ˜Ž๏ผš"
+
+#: sequencer.c:1655
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– %s ็š„ๆไบค่ชชๆ˜Ž"
+
+#: sequencer.c:1662
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "้€™ๆ˜ฏๆไบค่ชชๆ˜Ž #%d๏ผš"
+
+#: sequencer.c:1668
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "ๆไบค่ชชๆ˜Ž #%d ๅฐ‡่ขซ่ทณ้Ž๏ผš"
+
+#: sequencer.c:1756
+msgid "your index file is unmerged."
+msgstr "ๆ‚จ็š„็ดขๅผ•ๆช”ๆกˆๆœชๅฎŒๆˆๅˆไฝตใ€‚"
+
+#: sequencer.c:1763
+msgid "cannot fixup root commit"
+msgstr "ไธ่ƒฝไฟฎๅพฉๆ นๆไบค"
+
+#: sequencer.c:1782
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "ๆไบค %s ๆ˜ฏไธ€ๅ€‹ๅˆไฝตๆไบคไฝ†ๆœชๆไพ› -m ้ธ้ …ใ€‚"
+
+#: sequencer.c:1790 sequencer.c:1798
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "ๆไบค %s ๆฒ’ๆœ‰็ฌฌ %d ๅ€‹็ˆถๆไบค"
+
+#: sequencer.c:1804
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "ไธ่ƒฝๅพ—ๅˆฐ %s ็š„ๆไบค่ชชๆ˜Ž"
+
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1823
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s๏ผšไธ่ƒฝ่งฃๆž็ˆถๆไบค %s"
+
+#: sequencer.c:1888
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "ไธ่ƒฝๅฐ‡ '%s' ้‡ๆ–ฐๅ‘ฝๅ็‚บ '%s'"
+
+#: sequencer.c:1943
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "ไธ่ƒฝ้‚„ๅŽŸ %s... %s"
+
+#: sequencer.c:1944
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "ไธ่ƒฝๆ‡‰็”จ %s... %s"
+
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "ๆ‹‹ๆฃ„ %s %s -- ไฟฎ่ฃœๆช”็š„ๅ…งๅฎนๅทฒๅœจไธŠๆธธ\n"
+
+#: sequencer.c:2018
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s๏ผš็„กๆณ•่ฎ€ๅ–็ดขๅผ•"
+
+#: sequencer.c:2025
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s๏ผš็„กๆณ•้‡ๆ–ฐๆ•ด็†็ดขๅผ•"
+
+#: sequencer.c:2102
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s ไธๆŽฅๅ—ๅƒๆ•ธ๏ผš'%s'"
+
+#: sequencer.c:2111
+#, c-format
+msgid "missing arguments for %s"
+msgstr "็ผบๅฐ‘ %s ็š„ๅƒๆ•ธ"
+
+#: sequencer.c:2142
+#, c-format
+msgid "could not parse '%s'"
+msgstr "็„กๆณ•่งฃๆž '%s'"
+
+#: sequencer.c:2203
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "็„กๆ•ˆ่กŒ %d๏ผš%.*s"
+
+#: sequencer.c:2214
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "ๆฒ’ๆœ‰็ˆถๆไบค็š„ๆƒ…ๆณไธ‹ไธ่ƒฝ '%s'"
+
+#: sequencer.c:2298
+msgid "cancelling a cherry picking in progress"
+msgstr "ๆญฃๅœจๅ–ๆถˆไธ€ๅ€‹้€ฒ่กŒไธญ็š„ๆ€้ธ"
+
+#: sequencer.c:2305
+msgid "cancelling a revert in progress"
+msgstr "ๆญฃๅœจๅ–ๆถˆไธ€ๅ€‹้€ฒ่กŒไธญ็š„้‚„ๅŽŸ"
+
+#: sequencer.c:2349
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "่ซ‹็”จ 'git rebase --edit-todo' ไพ†ไฟฎๆ”นใ€‚"
+
+#: sequencer.c:2351
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "ไธๅฏ็”จ็š„ๆŒ‡ไปคๆธ…ๅ–ฎ๏ผš'%s'"
+
+#: sequencer.c:2356
+msgid "no commits parsed."
+msgstr "ๆฒ’ๆœ‰่งฃๆžๆไบคใ€‚"
+
+#: sequencer.c:2367
+msgid "cannot cherry-pick during a revert."
+msgstr "ไธ่ƒฝๅœจ้‚„ๅŽŸๆไบคไธญๅŸท่กŒๆ€้ธใ€‚"
+
+#: sequencer.c:2369
+msgid "cannot revert during a cherry-pick."
+msgstr "ไธ่ƒฝๅœจๆ€้ธไธญๅŸท่กŒ้‚„ๅŽŸๆไบคใ€‚"
+
+#: sequencer.c:2447
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "%s ็š„ๅ€ผ็„กๆ•ˆ๏ผš%s"
+
+#: sequencer.c:2540
+msgid "unusable squash-onto"
+msgstr "ไธๅฏ็”จ็š„ squash-onto"
+
+#: sequencer.c:2556
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "ๆ ผๅผ้Œฏ่ชค็š„้ธ้ …ๆธ…ๅ–ฎ๏ผš'%s'"
+
+#: sequencer.c:2644 sequencer.c:4361
+msgid "empty commit set passed"
+msgstr "ๆไพ›ไบ†็ฉบ็š„ๆไบค้›†"
+
+#: sequencer.c:2660
+msgid "revert is already in progress"
+msgstr "ไธ€ๅ€‹้‚„ๅŽŸๅ‹•ไฝœๅทฒๅœจ้€ฒ่กŒ"
+
+#: sequencer.c:2662
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "ๅ˜—่ฉฆ \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2665
+msgid "cherry-pick is already in progress"
+msgstr "ๆ€้ธๅ‹•ไฝœๅทฒๅœจ้€ฒ่กŒ"
+
+#: sequencer.c:2667
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "ๅ˜—่ฉฆ \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2681
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ๅบๅˆ—็›ฎ้Œ„ '%s'"
+
+#: sequencer.c:2696
+msgid "could not lock HEAD"
+msgstr "ไธ่ƒฝ้Ž–ๅฎš HEAD"
+
+#: sequencer.c:2756 sequencer.c:4099
+msgid "no cherry-pick or revert in progress"
+msgstr "ๆ€้ธๆˆ–้‚„ๅŽŸๅ‹•ไฝœไธฆๆœช้€ฒ่กŒ"
+
+#: sequencer.c:2758 sequencer.c:2769
+msgid "cannot resolve HEAD"
+msgstr "ไธ่ƒฝ่งฃๆž HEAD"
+
+#: sequencer.c:2760 sequencer.c:2804
+msgid "cannot abort from a branch yet to be born"
+msgstr "ไธ่ƒฝๅพžๅฐšๆœชๅปบ็ซ‹็š„ๅˆ†ๆ”ฏ็ต‚ๆญข"
+
+#: sequencer.c:2790 builtin/grep.c:724
+#, c-format
+msgid "cannot open '%s'"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ '%s'"
+
+#: sequencer.c:2792
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– '%s'๏ผš%s"
+
+#: sequencer.c:2793
+msgid "unexpected end of file"
+msgstr "ๆ„ๅค–็š„ๆช”ๆกˆ็ตๆŸ"
+
+#: sequencer.c:2799
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "ๅ„ฒๅญ˜ๆ€้ธๆไบคๅ‰็š„ HEAD ๆช”ๆกˆ '%s' ๆๅฃž"
+
+#: sequencer.c:2810
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "ๆ‚จๅฅฝๅƒ็งปๅ‹•ไบ† HEADใ€‚ๆœช่ƒฝ้‚„ๅŽŸ๏ผŒๆชขๆŸฅๆ‚จ็š„ HEAD๏ผ"
+
+#: sequencer.c:2851
+msgid "no revert in progress"
+msgstr "ๆฒ’ๆœ‰ๆญฃๅœจ้€ฒ่กŒ็š„้‚„ๅŽŸ"
+
+#: sequencer.c:2859
+msgid "no cherry-pick in progress"
+msgstr "ๆฒ’ๆœ‰ๆญฃๅœจ้€ฒ่กŒ็š„ๆ€้ธ"
+
+#: sequencer.c:2869
+msgid "failed to skip the commit"
+msgstr "็„กๆณ•่ทณ้Ž้€™ๅ€‹ๆไบค"
+
+#: sequencer.c:2876
+msgid "there is nothing to skip"
+msgstr "ๆฒ’ๆœ‰่ฆ่ทณ้Ž็š„"
+
+#: sequencer.c:2879
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"ๆ‚จๅทฒ็ถ“ๆไบคไบ†ๅ—Ž๏ผŸ\n"
+"่ฉฆ่ฉฆ \"git %s --continue\""
+
+#: sequencer.c:3003 sequencer.c:4011
+#, c-format
+msgid "could not update %s"
+msgstr "ไธ่ƒฝๆ›ดๆ–ฐ %s"
+
+#: sequencer.c:3042 sequencer.c:3991
+msgid "cannot read HEAD"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– HEAD"
+
+#: sequencer.c:3059
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "็„กๆณ•่ค‡่ฃฝ '%s' ่‡ณ '%s'"
+
+#: sequencer.c:3067
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"ๆ‚จ็พๅœจๅฏไปฅไฟฎ่ฃœ้€™ๅ€‹ๆไบค๏ผŒไฝฟ็”จ\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"็•ถๆ‚จๅฐ่ฎŠๆ›ดๆ„Ÿๅˆฐๆปฟๆ„๏ผŒๅŸท่กŒ\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c:3077
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "ไธ่ƒฝๆ‡‰็”จ %s... %.*s"
+
+#: sequencer.c:3084
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "ไธ่ƒฝๅˆไฝต %.*s"
+
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "ไธ่ƒฝ่ค‡่ฃฝ '%s' ่‡ณ '%s'"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: sequencer.c:3129
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ๅŸท่กŒๅคฑๆ•—๏ผš%s\n"
+"%sๆ‚จๅฏไปฅๆ”นๆญฃ่ฉฒๅ•้กŒ๏ผŒ็„ถๅพŒๅŸท่กŒ\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3135
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "ไธฆไธ”ไฟฎๆ”น็ดขๅผ•ๅ’Œ/ๆˆ–ๅทฅไฝœๅ€\n"
+
+#: sequencer.c:3141
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ๅŸท่กŒๆˆๅŠŸ๏ผš%s\n"
+"ไฝ†ๆ˜ฏๅœจ็ดขๅผ•ๅ’Œ/ๆˆ–ๅทฅไฝœๅ€ไธญๅญ˜ๅœจ่ฎŠๆ›ด\n"
+"ๆไบคๆˆ–ๅ„ฒ่—ไฟฎๆ”น๏ผŒ็„ถๅพŒๅŸท่กŒ\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3202
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "้žๆณ•็š„ๆจ™็ฑคๅ็จฑ๏ผš'%.*s'"
+
+#: sequencer.c:3256
+msgid "writing fake root commit"
+msgstr "ๅฏซๅฝๆ นๆไบค"
+
+#: sequencer.c:3261
+msgid "writing squash-onto"
+msgstr "ๅฏซๅ…ฅ squash-onto"
+
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "็„กๆณ•ๆ‰พๅˆฐ %s ๆŒ‡ๅ‘็š„ๆจนใ€‚"
+
+#: sequencer.c:3344
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "็„กๆณ•่งฃๆž '%s'"
+
+#: sequencer.c:3375
+msgid "cannot merge without a current revision"
+msgstr "ๆฒ’ๆœ‰็›ฎๅ‰็‰ˆๆœฌไธ่ƒฝๅˆไฝต"
+
+#: sequencer.c:3397
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "็„กๆณ•่งฃๆž '%.*s'"
+
+#: sequencer.c:3406
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "็„กๅฏ็”จๅˆไฝต๏ผš'%.*s'"
+
+#: sequencer.c:3418
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "็ซ ้ญšๅˆไธฆไธ่ƒฝๅœจไธ€ๅ€‹ๆ–ฐ็š„ๆ นๆไบคไธŠๅŸท่กŒ"
+
+#: sequencer.c:3434
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "ไธ่ƒฝๅ–ๅพ— '%s' ็š„ๆไบค่ชชๆ˜Ž"
+
+#: sequencer.c:3594
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "็”š่‡ณไธ่ƒฝๅ˜—่ฉฆๅˆไฝต '%.*s'"
+
+#: sequencer.c:3610
+msgid "merge: Unable to write new index file"
+msgstr "ๅˆไฝต๏ผš็„กๆณ•ๅฏซๅ…ฅๆ–ฐ็ดขๅผ•ๆช”ๆกˆ"
+
+#: sequencer.c:3679 builtin/rebase.c:737
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "ๅทฒๆ‡‰็”จ autostashใ€‚\n"
+
+#: sequencer.c:3691
+#, c-format
+msgid "cannot store %s"
+msgstr "ไธ่ƒฝๅ„ฒๅญ˜ %s"
+
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#, c-format
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"ๆ‡‰็”จ autostash ๅฐŽ่‡ด่ก็ชใ€‚\n"
+"ๆ‚จ็š„ไฟฎๆ”นๅฎ‰ๅ…จๅœฐๅ„ฒๅญ˜ๅœจๅ„ฒ่—ๅ€ไธญใ€‚\n"
+"ๆ‚จๅฏไปฅๅœจไปปไฝ•ๆ™‚ๅ€™ๅŸท่กŒ \"git stash pop\" ๆˆ– \"git stash drop\"ใ€‚\n"
+
+#: sequencer.c:3755
+#, c-format
+msgid "%s: not a valid OID"
+msgstr "%s๏ผšไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ฉไปถ ID"
+
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+msgid "could not detach HEAD"
+msgstr "ไธ่ƒฝๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™"
+
+#: sequencer.c:3775
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "ๅœๆญขๅœจ HEAD\n"
+
+#: sequencer.c:3777
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "ๅœๆญขๅœจ %s\n"
+
+#: sequencer.c:3785
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"็„กๆณ•ๅŸท่กŒๅพ…่พฆๆŒ‡ไปค\n"
+"\n"
+"    %.*s\n"
+"ๅทฒ่ขซ้‡ๆ–ฐๅฎ‰ๆŽ’๏ผŒๅœจ็นผ็บŒไน‹ๅ‰็ทจ่ผฏๆŒ‡ไปค๏ผŒ่ซ‹ๅ…ˆ็ทจ่ผฏๅพ…่พฆๅˆ—่กจ๏ผš\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#: sequencer.c:3869
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "ๅœๆญขๅœจ %s... %.*s\n"
+
+#: sequencer.c:3940
+#, c-format
+msgid "unknown command %d"
+msgstr "ๆœช็ŸฅๆŒ‡ไปค %d"
+
+#: sequencer.c:3999
+msgid "could not read orig-head"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– orig-head"
+
+#: sequencer.c:4004
+msgid "could not read 'onto'"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– 'onto'"
+
+#: sequencer.c:4018
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "ไธ่ƒฝๆ›ดๆ–ฐ HEAD ็‚บ %s"
+
+#: sequencer.c:4111
+msgid "cannot rebase: You have unstaged changes."
+msgstr "ไธ่ƒฝ้‡ๅฎšๅŸบๅบ•๏ผšๆ‚จๆœ‰ๆœชๆšซๅญ˜็š„่ฎŠๆ›ดใ€‚"
+
+#: sequencer.c:4120
+msgid "cannot amend non-existing commit"
+msgstr "ไธ่ƒฝไฟฎ่ฃœไธๅญ˜ๅœจ็š„ๆไบค"
+
+#: sequencer.c:4122
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "็„กๆ•ˆๆช”ๆกˆ๏ผš'%s'"
+
+#: sequencer.c:4124
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "็„กๆ•ˆๅ…งๅฎน๏ผš'%s'"
+
+#: sequencer.c:4127
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"ๆ‚จ็š„ๅทฅไฝœๅ€ไธญๆœ‰ๆœชๆไบค็š„่ฎŠๆ›ดใ€‚่ซ‹ๅ…ˆๆไบค็„ถๅพŒๅ†ๆฌกๅŸท่กŒ 'git rebase --continue'ใ€‚"
+
+#: sequencer.c:4163 sequencer.c:4202
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "ไธ่ƒฝๅฏซๅ…ฅๆช”ๆกˆ๏ผš'%s'"
+
+#: sequencer.c:4217
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "ไธ่ƒฝๅˆช้™ค CHERRY_PICK_HEAD"
+
+#: sequencer.c:4224
+msgid "could not commit staged changes."
+msgstr "ไธ่ƒฝๆไบคๆšซๅญ˜็š„ไฟฎๆ”นใ€‚"
+
+#: sequencer.c:4338
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s๏ผšไธ่ƒฝๆ€้ธไธ€ๅ€‹%s"
+
+#: sequencer.c:4342
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s๏ผš้Œฏ่ชค็š„็‰ˆๆœฌ"
+
+#: sequencer.c:4377
+msgid "can't revert as initial commit"
+msgstr "ไธ่ƒฝไฝœ็‚บๅˆๅง‹ๆไบค้‚„ๅŽŸๆไบค"
+
+#: sequencer.c:4846
+msgid "make_script: unhandled options"
+msgstr "make_script๏ผšๆœ‰ๆœช่ƒฝ่™•็†็š„้ธ้ …"
+
+#: sequencer.c:4849
+msgid "make_script: error preparing revisions"
+msgstr "make_script๏ผšๆบ–ๅ‚™็‰ˆๆœฌๆ™‚้Œฏ่ชค"
+
+#: sequencer.c:5083 sequencer.c:5100
+msgid "nothing to do"
+msgstr "็„กไบ‹ๅฏๅš"
+
+#: sequencer.c:5119
+msgid "could not skip unnecessary pick commands"
+msgstr "็„กๆณ•่ทณ้Žไธๅฟ…่ฆ็š„ๆ€้ธ"
+
+#: sequencer.c:5213
+msgid "the script was already rearranged."
+msgstr "่…ณๆœฌๅทฒ็ถ“้‡ๆ–ฐ็ทจๆŽ’ใ€‚"
+
+#: setup.c:124
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' ๅœจไฝๆ–ผ '%s' ็š„็‰ˆๆœฌๅบซไน‹ๅค–"
+
+#: setup.c:175
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s๏ผšๅทฅไฝœๅ€ไธญ็„กๆญค่ทฏๅพ‘ใ€‚\n"
+"ไฝฟ็”จๆŒ‡ไปค 'git <ๆŒ‡ไปค> -- <่ทฏๅพ‘>...' ไพ†ๆŒ‡ๅฎšๆœฌๆฉŸไธๅญ˜ๅœจ็š„่ทฏๅพ‘ใ€‚"
+
+#: setup.c:188
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"ๆœ‰ๆญง็พฉ็š„ๅƒๆ•ธ '%s'๏ผšๆœช็Ÿฅ็š„็‰ˆๆœฌๆˆ–่ทฏๅพ‘ไธๅญ˜ๅœจๆ–ผๅทฅไฝœๅ€ไธญใ€‚\n"
+"ไฝฟ็”จ '--' ไพ†ๅˆ†้š”็‰ˆๆœฌๅ’Œ่ทฏๅพ‘๏ผŒไพ‹ๅฆ‚๏ผš\n"
+"'git <ๆŒ‡ไปค> [<็‰ˆๆœฌ>...] -- [<ๆช”ๆกˆ>...]'"
+
+#: setup.c:254
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "้ธ้ … '%s' ๅฟ…้ ˆๅœจๅ…ถไป–้ž้ธ้ …ๅƒๆ•ธไน‹ๅ‰"
+
+#: setup.c:273
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"ๆœ‰ๆญง็พฉ็š„ๅƒๆ•ธ '%s'๏ผšๅฏๅŒๆ™‚ๆ˜ฏ็‰ˆๆœฌๅ’Œๆช”ๆกˆ\n"
+"ไฝฟ็”จ '--' ไพ†ๅˆ†้š”็‰ˆๆœฌๅ’Œ่ทฏๅพ‘๏ผŒไพ‹ๅฆ‚๏ผš\n"
+"'git <ๆŒ‡ไปค> [<็‰ˆๆœฌ>...] -- [<ๆช”ๆกˆ>...]'"
+
+#: setup.c:409
+msgid "unable to set up work tree using invalid config"
+msgstr "็„กๆณ•ไฝฟ็”จ็„กๆ•ˆ่จญๅฎšไพ†ๅปบ็ซ‹ๅทฅไฝœๅ€"
+
+#: setup.c:413
+msgid "this operation must be run in a work tree"
+msgstr "่ฉฒๅ‹•ไฝœๅฟ…้ ˆๅœจไธ€ๅ€‹ๅทฅไฝœๅ€ไธญๅŸท่กŒ"
+
+#: setup.c:559
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "ๆœŸๆœ› git ็‰ˆๆœฌๅบซ็‰ˆๆœฌ <= %d๏ผŒๅปๅพ—ๅˆฐ %d"
+
+#: setup.c:567
+msgid "unknown repository extensions found:"
+msgstr "็™ผ็พๆœช็Ÿฅ็š„็‰ˆๆœฌๅบซๆ“ดๅฑ•๏ผš"
+
+#: setup.c:586
+#, c-format
+msgid "error opening '%s'"
+msgstr "้–‹ๅ•Ÿ '%s' ็™ผ็”Ÿ้Œฏ่ชค"
+
+#: setup.c:588
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "ๆช”ๆกˆๅคชๅคง๏ผŒ็„กๆณ•ไฝœ็‚บ .git ๆช”ๆกˆ๏ผš'%s'"
+
+#: setup.c:590
+#, c-format
+msgid "error reading %s"
+msgstr "่ฎ€ๅ– %s ็™ผ็”Ÿ้Œฏ่ชค"
+
+#: setup.c:592
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "็„กๆ•ˆ็š„ gitfile ๆ ผๅผ๏ผš%s"
+
+#: setup.c:594
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "ๅœจ gitfile ไธญๆฒ’ๆœ‰่ทฏๅพ‘๏ผš%s"
+
+#: setup.c:596
+#, c-format
+msgid "not a git repository: %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ git ็‰ˆๆœฌๅบซ๏ผš%s"
+
+#: setup.c:695
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' ๅคชๅคง"
+
+#: setup.c:709
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ git ็‰ˆๆœฌๅบซ๏ผš'%s'"
+
+#: setup.c:738 setup.c:740 setup.c:771
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "ไธ่ƒฝๅˆ‡ๆ›็›ฎ้Œ„ๅˆฐ '%s'"
+
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+msgid "cannot come back to cwd"
+msgstr "็„กๆณ•่ฟ”ๅ›ž็›ฎๅ‰ๅทฅไฝœ็›ฎ้Œ„"
+
+#: setup.c:870
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "ๅ–ๅพ— '%*s%s%s' ็‹€ๆ…‹๏ผˆstat๏ผ‰ๅคฑๆ•—"
+
+#: setup.c:1108
+msgid "Unable to read current working directory"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–็›ฎๅ‰ๅทฅไฝœ็›ฎ้Œ„"
+
+#: setup.c:1117 setup.c:1123
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "ไธ่ƒฝๅˆ‡ๆ›ๅˆฐ '%s'"
+
+#: setup.c:1128
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ git ็‰ˆๆœฌๅบซ๏ผˆๆˆ–่€…ไปปไฝ•็ˆถ็›ฎ้Œ„๏ผ‰๏ผš%s"
+
+#: setup.c:1134
+#, c-format
+msgid ""
+"not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"ไธๆ˜ฏไธ€ๅ€‹ git ็‰ˆๆœฌๅบซ๏ผˆๆˆ–่€…็›ด่‡ณๆŽ›่ผ‰้ปž %s ็š„ไปปไฝ•็ˆถ็›ฎ้Œ„๏ผ‰\n"
+"ๅœๆญขๅœจๆช”ๆกˆ็ณป็ตฑ้‚Š็•Œ๏ผˆๆœช่จญๅฎš GIT_DISCOVERY_ACROSS_FILESYSTEM๏ผ‰ใ€‚"
+
+#: setup.c:1245
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"ๅƒๆ•ธ core.sharedRepository ็š„ๆช”ๆกˆๅฑฌๆ€งๅ€ผๆœ‰ๅ•้กŒ๏ผˆ0%.3o๏ผ‰ใ€‚\n"
+"ๆช”ๆกˆๆ‰€ๆœ‰่€…ๅฟ…้ ˆๅง‹็ต‚ๆ“ๆœ‰่ฎ€ๅฏซๆฌŠ้™ใ€‚"
+
+#: setup.c:1289
+msgid "open /dev/null or dup failed"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿๆˆ–่€…่ค‡่ฃฝ /dev/null"
+
+#: setup.c:1304
+msgid "fork failed"
+msgstr "fork ๅคฑๆ•—"
+
+#: setup.c:1309
+msgid "setsid failed"
+msgstr "setsid ๅคฑๆ•—"
+
+#: sha1-file.c:452
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "็‰ฉไปถ็›ฎ้Œ„ %s ไธๅญ˜ๅœจ๏ผŒๆชขๆŸฅ .git/objects/info/alternates"
+
+#: sha1-file.c:503
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "็„กๆณ•่ฆ็ฏ„ๅŒ–ๅ‚™็”จ็‰ฉไปถ่ทฏๅพ‘๏ผš%s"
+
+#: sha1-file.c:575
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s๏ผšๅฟฝ็•ฅๅ‚™็”จ็‰ฉไปถๅบซ๏ผŒๅตŒๅฅ—ๅคชๆทฑ"
+
+#: sha1-file.c:582
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "็„กๆณ•่ฆ็ฏ„ๅŒ–็‰ฉไปถ็›ฎ้Œ„: %s"
+
+#: sha1-file.c:625
+msgid "unable to fdopen alternates lockfile"
+msgstr "็„กๆณ• fdopen ๅ–ไปฃ้Ž–ๆช”ๆกˆ"
+
+#: sha1-file.c:643
+msgid "unable to read alternates file"
+msgstr "็„กๆณ•่ฎ€ๅ–ๆ›ฟไปฃๆช”ๆกˆ"
+
+#: sha1-file.c:650
+msgid "unable to move new alternates file into place"
+msgstr "็„กๆณ•ๅฐ‡ๆ–ฐ็š„ๆ›ฟไปฃๆช”ๆกˆ็งปๅ‹•ๅˆฐไฝ"
+
+#: sha1-file.c:685
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "่ทฏๅพ‘ '%s' ไธๅญ˜ๅœจ"
+
+#: sha1-file.c:711
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "ๅฐšไธๆ”ฏๆดๅฐ‡ๅƒ่€ƒ็‰ˆๆœฌๅบซ '%s' ไฝœ็‚บไธ€ๅ€‹้€ฃ็ต็ฐฝๅ‡บใ€‚"
+
+#: sha1-file.c:717
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "ๅƒ่€ƒ็‰ˆๆœฌๅบซ '%s' ไธๆ˜ฏไธ€ๅ€‹ๆœฌๆฉŸ็‰ˆๆœฌๅบซใ€‚"
+
+#: sha1-file.c:723
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "ๅƒ่€ƒ็‰ˆๆœฌๅบซ '%s' ๆ˜ฏไธ€ๅ€‹ๆทบ่ค‡่ฃฝ"
+
+#: sha1-file.c:731
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "ๅƒ่€ƒ็‰ˆๆœฌๅบซ '%s' ๅทฒ่ขซ็งปๆค"
+
+#: sha1-file.c:791
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "่งฃๆžๅ‚™็”จๅผ•็”จๆ™‚็„กๆ•ˆ็š„่กŒ๏ผš%s"
+
+#: sha1-file.c:943
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "ๅ˜—่ฉฆ mmap %<PRIuMAX>๏ผŒ่ถ…้Žไบ†ๆœ€ๅคงๅ€ผ %<PRIuMAX>"
+
+#: sha1-file.c:964
+msgid "mmap failed"
+msgstr "mmap ๅคฑๆ•—"
+
+#: sha1-file.c:1128
+#, c-format
+msgid "object file %s is empty"
+msgstr "็‰ฉไปถๆช”ๆกˆ %s ็‚บ็ฉบ"
+
+#: sha1-file.c:1263 sha1-file.c:2443
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "ๆๅฃž็š„้ฌ†ๆ•ฃ็‰ฉไปถ '%s'"
+
+#: sha1-file.c:1265 sha1-file.c:2447
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "้ฌ†ๆ•ฃ็‰ฉไปถ '%s' ๅพŒ้ขๆœ‰ๅžƒๅœพ่ณ‡ๆ–™"
+
+#: sha1-file.c:1307
+msgid "invalid object type"
+msgstr "็„กๆ•ˆ็š„็‰ฉไปถ้กžๅž‹"
+
+#: sha1-file.c:1391
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "็„กๆณ•็”จ --allow-unknown-type ๅƒๆ•ธ่งฃ้–‹ %s ๆจ™้ ญ่จŠๆฏ"
+
+#: sha1-file.c:1394
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "็„กๆณ•่งฃ้–‹ %s ้ ญ้ƒจ"
+
+#: sha1-file.c:1400
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "็„กๆณ•็”จ --allow-unknown-type ๅƒๆ•ธ่งฃๆž %s ๆจ™้ ญ่จŠๆฏ"
+
+#: sha1-file.c:1403
+#, c-format
+msgid "unable to parse %s header"
+msgstr "็„กๆณ•่งฃๆž %s ้ ญ้ƒจ"
+
+#: sha1-file.c:1629
+#, c-format
+msgid "failed to read object %s"
+msgstr "่ฎ€ๅ–็‰ฉไปถ %s ๅคฑๆ•—"
+
+#: sha1-file.c:1633
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "ๆ‰พไธๅˆฐ %2$s ็š„ๆ›ฟไปฃ %1$s"
+
+#: sha1-file.c:1637
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "้ฌ†ๆ•ฃ็‰ฉไปถ %s๏ผˆๅ„ฒๅญ˜ๅœจ %s๏ผ‰ๅทฒๆๅฃž"
+
+#: sha1-file.c:1641
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "ๆ‰“ๅŒ…็‰ฉไปถ %s๏ผˆๅ„ฒๅญ˜ๅœจ %s๏ผ‰ๅทฒๆๅฃž"
+
+#: sha1-file.c:1746
+#, c-format
+msgid "unable to write file %s"
+msgstr "็„กๆณ•ๅฏซๆช”ๆกˆ %s"
+
+#: sha1-file.c:1753
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "็„กๆณ•็‚บ '%s' ่จญๅฎšๆฌŠ้™"
+
+#: sha1-file.c:1760
+msgid "file write error"
+msgstr "ๆช”ๆกˆๅฏซ้Œฏ่ชค"
+
+#: sha1-file.c:1780
+msgid "error when closing loose object file"
+msgstr "้—œ้–‰้ฌ†ๆ•ฃ็‰ฉไปถๆช”ๆกˆๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
+
+#: sha1-file.c:1845
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "ๆฌŠ้™ไธ่ถณ๏ผŒ็„กๆณ•ๅœจ็‰ˆๆœฌๅบซ็‰ฉไปถๅบซ %s ไธญๆ–ฐๅขž็‰ฉไปถ"
+
+#: sha1-file.c:1847
+msgid "unable to create temporary file"
+msgstr "็„กๆณ•ๅปบ็ซ‹ๆšซๅญ˜ๆช”"
+
+#: sha1-file.c:1871
+msgid "unable to write loose object file"
+msgstr "ไธ่ƒฝๅฏซ้ฌ†ๆ•ฃ็‰ฉไปถๆช”ๆกˆ"
+
+#: sha1-file.c:1877
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "ไธ่ƒฝๅฃ“็ธฎๆ–ฐ็‰ฉไปถ %s๏ผˆ%d๏ผ‰"
+
+#: sha1-file.c:1881
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "ๅœจ็‰ฉไปถ %s ไธŠๅ‘ผๅซ deflateEnd ๅคฑๆ•—๏ผˆ%d๏ผ‰"
+
+#: sha1-file.c:1885
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "่ขซ %s ็š„ไธ็ฉฉๅฎš็‰ฉไปถๆบ่ณ‡ๆ–™ๆž็ณŠๅก—ไบ†"
+
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
+#, c-format
+msgid "failed utime() on %s"
+msgstr "ๅœจ %s ไธŠๅ‘ผๅซ utime() ๅคฑๆ•—"
+
+#: sha1-file.c:1972
+#, c-format
+msgid "cannot read object for %s"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–็‰ฉไปถ %s"
+
+#: sha1-file.c:2011
+msgid "corrupt commit"
+msgstr "ๆๅฃž็š„ๆไบค"
+
+#: sha1-file.c:2019
+msgid "corrupt tag"
+msgstr "ๆๅฃž็š„ๆจ™็ฑค"
+
+#: sha1-file.c:2119
+#, c-format
+msgid "read error while indexing %s"
+msgstr "็ดขๅผ• %s ๆ™‚่ฎ€ๅ–้Œฏ่ชค"
+
+#: sha1-file.c:2122
+#, c-format
+msgid "short read while indexing %s"
+msgstr "็ดขๅผ• %s ๆ™‚่ฎ€ๅ…ฅไธๅฎŒๆ•ด"
+
+#: sha1-file.c:2195 sha1-file.c:2205
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s๏ผšๆ’ๅ…ฅ่ณ‡ๆ–™ๅบซๅคฑๆ•—"
+
+#: sha1-file.c:2211
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s๏ผšไธๆ”ฏๆด็š„ๆช”ๆกˆ้กžๅž‹"
+
+#: sha1-file.c:2235
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ฉไปถ"
+
+#: sha1-file.c:2237
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ '%s' ็‰ฉไปถ"
+
+#: sha1-file.c:2264 builtin/index-pack.c:155
+#, c-format
+msgid "unable to open %s"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ %s"
+
+#: sha1-file.c:2454 sha1-file.c:2507
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s ็š„้›œๆนŠๅ€ผไธ็ฌฆๅˆ๏ผˆ้ ๆœŸ %s๏ผ‰"
+
+#: sha1-file.c:2478
+#, c-format
+msgid "unable to mmap %s"
+msgstr "ไธ่ƒฝ mmap %s"
+
+#: sha1-file.c:2483
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "็„กๆณ•่งฃๅฃ“็ธฎ %s ็š„้ ญ้ƒจ"
+
+#: sha1-file.c:2489
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "็„กๆณ•่งฃๆž %s ็š„้ ญ้ƒจ"
+
+#: sha1-file.c:2500
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "็„กๆณ•่งฃๅฃ“็ธฎ %s ็š„ๅ…งๅฎน"
+
+#: sha1-name.c:486
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "็Ÿญ SHA1 %s ๅญ˜ๅœจๆญง็พฉ"
+
+#: sha1-name.c:497
+msgid "The candidates are:"
+msgstr "ๅ€™้ธ่€…ๆœ‰๏ผš"
+
+#: sha1-name.c:796
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git ้€šๅธธไธๆœƒๅปบ็ซ‹ไธ€ๅ€‹ไปฅ40ๅ€‹ๅๅ…ญ้€ฒไฝๅญ—ๅ…ƒ็ตๅฐพ็š„ๅผ•็”จ๏ผŒๅ› ็‚บ็•ถๆ‚จๅชๆไพ›40\n"
+"ๅ€‹ๅๅ…ญ้€ฒไฝๅญ—ๅ…ƒๆ™‚ๅฐ‡่ขซๅฟฝ็•ฅใ€‚้€™ไบ›ๅผ•็”จๅฏ่ƒฝ่ขซ้Œฏ่ชคๅœฐๅปบ็ซ‹ใ€‚ไพ‹ๅฆ‚๏ผš\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"็•ถ \"$br\" ๆŸ็จฎๅŽŸๅ› ็ฉบ็™ฝๆ™‚๏ผŒไธ€ๅ€‹40ไฝๅๅ…ญ้€ฒไฝ็š„ๅผ•็”จๅฐ‡่ขซๅปบ็ซ‹ใ€‚่ซ‹ๆชขๆŸฅ้€™ไบ›\n"
+"ๅผ•็”จ๏ผŒๅฏ่ƒฝ้œ€่ฆๅˆช้™คๅฎƒๅ€‘ใ€‚ๅŸท่กŒ \"git config advice.objectNameWarning\n"
+"false\" ๆŒ‡ไปค้—œ้–‰ๆœฌๆถˆๆฏ้€š็Ÿฅใ€‚"
+
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' ็š„ๆ—ฅ่ชŒๅช่ƒฝๅ›žๅˆฐ %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' ็š„ๆ—ฅ่ชŒๅชๆœ‰ %d ๅ€‹้ …็›ฎ"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "็ฃ็ขŸไธŠๅญ˜ๅœจ '%s' ่ทฏๅพ‘๏ผŒไฝ†ไธๅญ˜ๅœจๆ–ผ '%.*s'"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"'%s' ่ทฏๅพ‘ๅญ˜ๅœจ๏ผŒไฝ†ไธๆ˜ฏ '%s'\n"
+"ๆ็คบ๏ผšไฝ ๅœจ่ชช '%.*s:%s'๏ผŒๅณ '%.*s:./%s' ๅ—Ž๏ผŸ"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "'%s' ่ทฏๅพ‘ไธๅญ˜ๅœจๆ–ผ '%.*s'"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"'%s' ่ทฏๅพ‘ๅœจ็ดขๅผ•๏ผŒไฝ†ไธๅœจ %d ๆšซๅญ˜ๅ€\n"
+"ๆ็คบ๏ผšไฝ ๅœจ่ชช ':%d:%s' ๅ—Ž๏ผŸ"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"'%s' ่ทฏๅพ‘ๅœจ็ดขๅผ•๏ผŒไฝ†ไธๆ˜ฏ '%s'\n"
+"ๆ็คบ๏ผšไฝ ๅœจ่ชช ':%d:%s'๏ผŒๅณ ':%d:%s' ๅ—Ž๏ผŸ"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "็ฃ็ขŸไธŠๅญ˜ๅœจ '%s' ่ทฏๅพ‘๏ผŒไฝ†ไธๅœจ็ดขๅผ•ไธญ"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "'%s' ่ทฏๅพ‘ไธๅญ˜ๅœจ (ๆ—ขไธๅญ˜ๅœจ็ฃ็ขŸ๏ผŒไนŸไธๅญ˜ๅœจ็ดขๅผ•)"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr "็›ธๅฐ่ทฏๅพ‘่ˆ‡ๆณ•ไธ่ƒฝ็”จๅœจๅทฅไฝœๅ€ๅค–"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "'%.*s' ็‰ฉไปถๅ็จฑ็„กๆ•ˆใ€‚"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:837
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:839
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:847
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:849
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:856
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:858
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:864
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u ไฝๅ…ƒ็ต„"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:866
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u ไฝๅ…ƒ็ต„/็ง’"
+
+#: strbuf.c:1164
+#, c-format
+msgid "could not edit '%s'"
+msgstr "็„กๆณ•็ทจ่ผฏ '%s'"
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "็„กๆณ•ไฟฎๆ”นๆœชๅˆไฝต็š„ .gitmodules๏ผŒๅ…ˆ่งฃๆฑบๅˆไฝต่ก็ช"
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "็„กๆณ•ๅœจ .gitmodules ไธญๆ‰พๅˆฐ path=%s ็š„ๅฐ็ฏ€"
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "็„กๆณ•็งป้™ค %s ็š„ .gitmodules ๆข็›ฎ"
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "ๅฐ‡ๆ›ดๆ–ฐๅพŒ .gitmodules ๆ–ฐๅขžๆšซๅญ˜ๅ€ๅคฑๆ•—"
+
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "ไฝๆ–ผๆœช็ฐฝๅ‡บ็š„ๅญๆจก็ต„ '%s'"
+
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "่ทฏๅพ‘่ฆๆ ผ '%s' ๅœจๅญๆจก็ต„ '%.*s' ไธญ"
+
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "็„กๆ•ˆ --ignore-submodules ๅƒๆ•ธ๏ผš%s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr "%s ๆไบคไฝๆ–ผ่ทฏๅพ‘๏ผš'%s' ็š„ๅญๆจก็ต„่ˆ‡ๅŒๅ็š„ๅญๆจก็ต„่ก็ชใ€‚่ทณ้Žใ€‚"
+
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "ๅญๆจก็ต„ๆข็›ฎ '%s'๏ผˆ%s๏ผ‰ๆ˜ฏไธ€ๅ€‹ %s๏ผŒไธๆ˜ฏไธ€ๅ€‹ๆไบค"
+
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr "็„กๆณ•ๅœจ %s ๅญๆจก็ต„ๅŸท่กŒ 'git rev-list <ๆไบค> --not --remotes -n 1' ๅ‘ฝไปค"
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "่™•็† '%s' ๅญๆจก็ต„ๅคฑๆ•—"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "็„กๆณ•ๅฐ‡ HEAD ่งฃๆž็‚บๆœ‰ๆ•ˆๅผ•็”จใ€‚"
+
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "ๆญฃๅœจๆŽจ้€ '%s' ๅญๆจก็ต„\n"
+
+#: submodule.c:1161
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "็„กๆณ•ๆŽจ้€ '%s' ๅญๆจก็ต„\n"
+
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "ๆญฃๅœจๆŠ“ๅ– %s%s ๅญๆจก็ต„\n"
+
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "็„กๆณ•ๅญ˜ๅ–ๅญๆจก็ต„ '%s'\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"ๆŠ“ๅ–ๅญๆจก็ต„ๆ™‚็™ผ็”Ÿ้Œฏ่ชค๏ผš\n"
+"%s"
+
+#: submodule.c:1662
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "็„กๆณ•ๅฐ‡ '%s' ่ญ˜ๅˆฅ็‚บไธ€ๅ€‹ git ็‰ˆๆœฌๅบซ"
+
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "็„กๆณ•ๅœจ %s ๅญๆจก็ต„ๅŸท่กŒ 'git status --porcelain=2'"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "%s ๅญๆจก็ต„ๅŸท่กŒ 'git status --porcelain=2' ๅคฑๆ•—"
+
+#: submodule.c:1800
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "็„กๆณ•ๅœจๅญๆจก็ต„ '%s' ไธญๅ•Ÿๅ‹• 'git status'"
+
+#: submodule.c:1813
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "็„กๆณ•ๅœจๅญๆจก็ต„ '%s' ไธญๅŸท่กŒ 'git status'"
+
+#: submodule.c:1828
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "็„กๆณ•ๅœจๅญๆจก็ต„ '%s' ไธญๅ–ๆถˆ core.worktree ็š„่จญๅฎš"
+
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "็„กๆณ•้ž่ฟดๅญๆจก็ต„่ทฏๅพ‘ '%s'"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "็„กๆณ•้‡่จญๅญๆจก็ต„็š„็ดขๅผ•"
+
+#: submodule.c:1918
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "ๅญๆจก็ต„ '%s' ไธญๆœ‰้ซ’็ดขๅผ•"
+
+#: submodule.c:1970
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "ๅญๆจก็ต„ '%s' ็„กๆณ•่ขซๆ›ดๆ–ฐใ€‚"
+
+#: submodule.c:2038
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "ใ€Œ%sใ€ๅญๆจก็ต„ git ็›ฎ้Œ„ๅœจใ€Œ%.*sใ€git ่ทฏๅพ‘ไธญ"
+
+#: submodule.c:2059
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr "ไธๆ”ฏๆดๅฐๆœ‰ๅคšๅ€‹ๅทฅไฝœๅ€็š„ๅญๆจก็ต„ '%s' ๅŸท่กŒ relocate_gitdir"
+
+#: submodule.c:2071 submodule.c:2130
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "ไธ่ƒฝๆŸฅ่ฉขๅญๆจก็ต„ '%s' ็š„ๅ็จฑ"
+
+#: submodule.c:2075
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "ๆ‹’็ต•็งปๅ‹•ใ€Œ%sใ€่‡ณ็พๅญ˜ git ็›ฎ้Œ„"
+
+#: submodule.c:2082
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"ๅฐ‡ '%s%s' ็š„ git ็›ฎ้Œ„ๅพž\n"
+"'%s' ้ท็งป่‡ณ\n"
+"'%s'\n"
+
+#: submodule.c:2209
+msgid "could not start ls-files in .."
+msgstr "็„กๆณ•ๅœจ .. ไธญๅ•Ÿๅ‹• ls-files"
+
+#: submodule.c:2248
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree ่ฟ”ๅ›žๆœช็Ÿฅ่ฟ”ๅ›žๅ€ผ %d"
+
+#: submodule-config.c:236
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ๅฟฝ็•ฅๅฏ็–‘็š„ๅญๆจก็ต„ๅ็จฑ๏ผš%s"
+
+#: submodule-config.c:303
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs ไธๅ…่จฑ็‚บ่ฒ ๅ€ผ"
+
+#: submodule-config.c:401
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "ๅฟฝ็•ฅๅฏ่ƒฝ่ขซ่งฃๆž็‚บๆŒ‡ไปคๅˆ—้ธ้ …็š„ '%s'๏ผš%s"
+
+#: submodule-config.c:498
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s ็š„ๅ€ผ็„กๆ•ˆ"
+
+#: submodule-config.c:765
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "ไธ่ƒฝๆ›ดๆ–ฐ .gitmodules ๆข็›ฎ %s"
+
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "ๅŸท่กŒ trailer ๆŒ‡ไปค '%s' ๅคฑๆ•—"
+
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "้ต '%2$s' ็š„ๆœช็Ÿฅๅ–ๅ€ผ '%1$s'"
+
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
+#, c-format
+msgid "more than one %s"
+msgstr "ๅคšๆ–ผไธ€ๅ€‹ %s"
+
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "็ฐฝๅ '%.*s' ็š„้ต็‚บ็ฉบ"
+
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–่ผธๅ…ฅๆช”ๆกˆ '%s'"
+
+#: trailer.c:753
+msgid "could not read from stdin"
+msgstr "ไธ่ƒฝ่‡ชๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–"
+
+#: trailer.c:1011 wrapper.c:665
+#, c-format
+msgid "could not stat %s"
+msgstr "ไธ่ƒฝๅฐ %s ๅ‘ผๅซ stat"
+
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "ๆช”ๆกˆ %s ไธๆ˜ฏไธ€ๅ€‹ๆญฃ่ฆๆช”ๆกˆ"
+
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "ๆช”ๆกˆ %s ไฝฟ็”จ่€…ไธๅฏๅฏซ"
+
+#: trailer.c:1027
+msgid "could not open temporary file"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿๆšซๅญ˜ๆช”"
+
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "ไธ่ƒฝ้‡ๆ–ฐๅ‘ฝๅๆšซๅญ˜ๆช”็‚บ %s"
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "ๅฐ‡่ฆ่จญๅฎš '%1$s' ็š„ไธŠๆธธ็‚บ '%3$s' ็š„ '%2$s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "็„กๆณ•่ฎ€ๅ– bundle '%s'"
+
+#: transport.c:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "ๅ‚ณ่ผธ๏ผš็„กๆ•ˆ็š„ๆทฑๅบฆ้ธ้ … '%s'"
+
+#: transport.c:266
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "ๆชข่ฆ– 'git help config' ไธญ็š„ protocol.version ๅ–ๅพ—ๆ›ดๅคš่จŠๆฏ"
+
+#: transport.c:267
+msgid "server options require protocol version 2 or later"
+msgstr "ๆœๅ‹™็ซฏ้ธ้ …้œ€่ฆ็‰ˆๆœฌ 2 ๅ”ๅฎšๆˆ–ๆ›ด้ซ˜"
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr "ไธ่ƒฝ่งฃๆž transport.color.* ่จญๅฎš"
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr "ๅ”ๅฎš v2 ็š„ๆ”ฏๆดๅฐšๆœชๅฏฆ็พ"
+
+#: transport.c:831
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "่จญๅฎš '%s' ็š„ๅ–ๅ€ผๆœช็Ÿฅ๏ผš%s"
+
+#: transport.c:897
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "ๅ‚ณ่ผธ '%s' ไธๅ…่จฑ"
+
+#: transport.c:949
+msgid "git-over-rsync is no longer supported"
+msgstr "ไธๅ†ๆ”ฏๆด git-over-rsync"
+
+#: transport.c:1044
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "ไธ‹ๅˆ—ๅญๆจก็ต„่ทฏๅพ‘ๆ‰€ๅŒ…ๅซ็š„ไฟฎๆ”นๅœจไปปไฝ•้ ็ซฏๆบไธญ้ƒฝๆ‰พไธๅˆฐ๏ผš\n"
+
+#: transport.c:1048
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"่ซ‹ๅ˜—่ฉฆ\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ๆˆ–่€…้€ฒๅ…ฅๅˆฐๅญ็›ฎ้Œ„ๅŸท่กŒ\n"
+"\n"
+"\tgit push\n"
+"\n"
+"ไปฅๆŽจ้€่‡ณ้ ็ซฏใ€‚\n"
+"\n"
+
+#: transport.c:1056
+msgid "Aborting."
+msgstr "ๆญฃๅœจ็ต‚ๆญขใ€‚"
+
+#: transport.c:1201
+msgid "failed to push all needed submodules"
+msgstr "ไธ่ƒฝๆŽจ้€ๅ…จ้ƒจ้œ€่ฆ็š„ๅญๆจก็ต„"
+
+#: transport.c:1345 transport-helper.c:657
+msgid "operation not supported by protocol"
+msgstr "ๅ”ๅฎšไธๆ”ฏๆด่ฉฒๅ‹•ไฝœ"
+
+#: transport-helper.c:61 transport-helper.c:90
+msgid "full write to remote helper failed"
+msgstr "ๅฎŒๆ•ดๅฏซๅ…ฅ้ ็ซฏๅŠฉๆ‰‹ๅคฑๆ•—"
+
+#: transport-helper.c:144
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "็„กๆณ•็‚บ '%s' ๆ‰พๅˆฐ้ ็ซฏๅŠฉๆ‰‹"
+
+#: transport-helper.c:160 transport-helper.c:571
+msgid "can't dup helper output fd"
+msgstr "็„กๆณ•่ค‡่ฃฝๅŠฉๆ‰‹่ผธๅ‡บๆช”ๆกˆๅฅๆŸ„"
+
+#: transport-helper.c:211
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr "ๆœช็Ÿฅ็š„ๅผทๅˆถ่ƒฝๅŠ› %s๏ผŒ่ฉฒ้ ็ซฏๅŠฉๆ‰‹ๅฏ่ƒฝ้œ€่ฆๆ–ฐ็‰ˆๆœฌ็š„Git"
+
+#: transport-helper.c:217
+msgid "this remote helper should implement refspec capability"
+msgstr "้ ็ซฏๅŠฉๆ‰‹้œ€่ฆๅฏฆ็พ refspec ่ƒฝๅŠ›"
+
+#: transport-helper.c:284 transport-helper.c:425
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s ๆ„ๅค–ๅœฐ่ชช๏ผš'%s'"
+
+#: transport-helper.c:414
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s ไนŸ้Ž–ๅฎšไบ† %s"
+
+#: transport-helper.c:493
+msgid "couldn't run fast-import"
+msgstr "ไธ่ƒฝๅŸท่กŒ fast-import"
+
+#: transport-helper.c:516
+msgid "error while running fast-import"
+msgstr "ๅŸท่กŒ fast-import ็™ผ็”Ÿ้Œฏ่ชค"
+
+#: transport-helper.c:545 transport-helper.c:1134
+#, c-format
+msgid "could not read ref %s"
+msgstr "็„กๆณ•่ฎ€ๅ–ๅผ•็”จ %s"
+
+#: transport-helper.c:590
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "้€ฃ็ทšๆ™‚ๆœช็Ÿฅ็š„ๅ›žๆ‡‰๏ผš%s"
+
+#: transport-helper.c:612
+msgid "setting remote service path not supported by protocol"
+msgstr "ๅ”ๅฎšไธๆ”ฏๆด่จญๅฎš้ ็ซฏๆœๅ‹™่ทฏๅพ‘"
+
+#: transport-helper.c:614
+msgid "invalid remote service path"
+msgstr "็„กๆ•ˆ็š„้ ็ซฏๆœๅ‹™่ทฏๅพ‘"
+
+#: transport-helper.c:660
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "ไธ่ƒฝ้€ฃ็ทšๅˆฐๅญๆœๅ‹™ %s"
+
+#: transport-helper.c:736
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "้ ๆœŸ ok/error๏ผŒๅŠฉๆ‰‹่ชช '%s'"
+
+#: transport-helper.c:789
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "ๅŠฉๆ‰‹ๅ ฑๅ‘Š %s ็š„ๆ„ๅค–็‹€ๆ…‹"
+
+#: transport-helper.c:850
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆด dry-run"
+
+#: transport-helper.c:853
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆด --signed"
+
+#: transport-helper.c:856
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆด --signed=if-asked"
+
+#: transport-helper.c:861
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆด --atomic"
+
+#: transport-helper.c:867
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆด 'push-option'"
+
+#: transport-helper.c:965
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-heper ไธๆ”ฏๆด push๏ผŒ้œ€่ฆๅผ•็”จ่กจ้”ๅผ"
+
+#: transport-helper.c:970
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "ๅŠฉๆ‰‹ %s ไธๆ”ฏๆด 'force'"
+
+#: transport-helper.c:1017
+msgid "couldn't run fast-export"
+msgstr "็„กๆณ•ๅŸท่กŒ fast-export"
+
+#: transport-helper.c:1022
+msgid "error while running fast-export"
+msgstr "ๅŸท่กŒ fast-export ๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
+
+#: transport-helper.c:1047
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
+msgstr ""
+"ๆฒ’ๆœ‰ๅ…ฑๅŒ็š„ๅผ•็”จไธฆไธ”ไนŸๆฒ’ๆœ‰ๆŒ‡ๅฎš๏ผŒไป€้บผไนŸไธๆœƒๅšใ€‚\n"
+"ๅฏ่ƒฝๆ‚จๆ‡‰่ฉฒๆŒ‡ๅฎšไธ€ๅ€‹ๅˆ†ๆ”ฏๅฆ‚ 'master'ใ€‚\n"
+
+#: transport-helper.c:1120
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "ๅผ•็”จๅˆ—่กจไธญๆ ผๅผ้Œฏ่ชค็š„ๅ›žๆ‡‰๏ผš%s"
+
+#: transport-helper.c:1272
+#, c-format
+msgid "read(%s) failed"
+msgstr "่ฎ€ๅ–๏ผˆ%s๏ผ‰ๅคฑๆ•—"
+
+#: transport-helper.c:1299
+#, c-format
+msgid "write(%s) failed"
+msgstr "ๅฏซ๏ผˆ%s๏ผ‰ๅคฑๆ•—"
+
+#: transport-helper.c:1348
+#, c-format
+msgid "%s thread failed"
+msgstr "%s ๅŸท่กŒ็ท’ๅคฑๆ•—"
+
+#: transport-helper.c:1352
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s ๅŸท่กŒ็ท’็ญ‰ๅพ…ๅคฑๆ•—๏ผš%s"
+
+#: transport-helper.c:1371 transport-helper.c:1375
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "ไธ่ƒฝๅ•Ÿๅ‹•ๅŸท่กŒ็ท’ไพ†่ค‡่ฃฝ่ณ‡ๆ–™๏ผš%s"
+
+#: transport-helper.c:1412
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s ้€ฒ็จ‹็ญ‰ๅพ…ๅคฑๆ•—"
+
+#: transport-helper.c:1416
+#, c-format
+msgid "%s process failed"
+msgstr "%s ้€ฒ็จ‹ๅคฑๆ•—"
+
+#: transport-helper.c:1434 transport-helper.c:1443
+msgid "can't start thread for copying data"
+msgstr "ไธ่ƒฝๅ•Ÿๅ‹•ๅŸท่กŒ็ท’ไพ†่ค‡่ฃฝ่ณ‡ๆ–™"
+
+#: tree-walk.c:32
+msgid "too-short tree object"
+msgstr "ๅคช็Ÿญ็š„ๆจน็‹€็‰ฉไปถ"
+
+#: tree-walk.c:38
+msgid "malformed mode in tree entry"
+msgstr "ๆจน็‹€็‰ฉไปถไธญ็š„ๆข็›ฎๆจกๅผ้Œฏ่ชค"
+
+#: tree-walk.c:42
+msgid "empty filename in tree entry"
+msgstr "ๆจน็‹€็‰ฉไปถๆข็›ฎไธญ็ฉบ็š„ๆช”ๆกˆๅ"
+
+#: tree-walk.c:117
+msgid "too-short tree file"
+msgstr "ๅคช็Ÿญ็š„ๆจนๆช”ๆกˆ"
+
+#: unpack-trees.c:110
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
+msgstr ""
+"ๆ‚จๅฐไธ‹ๅˆ—ๆช”ๆกˆ็š„ๆœฌๆฉŸไฟฎๆ”นๅฐ‡่ขซ็ฐฝๅ‡บๅ‹•ไฝœ่ฆ†่“‹๏ผš\n"
+"%%s่ซ‹ๅœจๅˆ‡ๆ›ๅˆ†ๆ”ฏๅ‰ๆไบคๆˆ–ๅ„ฒ่—ๆ‚จ็š„ไฟฎๆ”นใ€‚"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"ๆ‚จๅฐไธ‹ๅˆ—ๆช”ๆกˆ็š„ๆœฌๆฉŸไฟฎๆ”นๅฐ‡่ขซ็ฐฝๅ‡บๅ‹•ไฝœ่ฆ†่“‹๏ผš\n"
+"%%s"
+
+#: unpack-trees.c:115
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"ๆ‚จๅฐไธ‹ๅˆ—ๆช”ๆกˆ็š„ๆœฌๆฉŸไฟฎๆ”นๅฐ‡่ขซๅˆไฝตๅ‹•ไฝœ่ฆ†่“‹๏ผš\n"
+"%%s่ซ‹ๅœจๅˆไฝตๅ‰ๆไบคๆˆ–ๅ„ฒ่—ๆ‚จ็š„ไฟฎๆ”นใ€‚"
+
+#: unpack-trees.c:117
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"ๆ‚จๅฐไธ‹ๅˆ—ๆช”ๆกˆ็š„ๆœฌๆฉŸไฟฎๆ”นๅฐ‡่ขซๅˆไฝตๅ‹•ไฝœ่ฆ†่“‹๏ผš\n"
+"%%s"
+
+#: unpack-trees.c:120
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"ๆ‚จๅฐไธ‹ๅˆ—ๆช”ๆกˆ็š„ๆœฌๆฉŸไฟฎๆ”นๅฐ‡่ขซ %s ่ฆ†่“‹๏ผš\n"
+"%%s่ซ‹ๅœจ %s ไน‹ๅ‰ๆไบคๆˆ–ๅ„ฒ่—ๆ‚จ็š„ไฟฎๆ”นใ€‚"
+
+#: unpack-trees.c:122
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"ๆ‚จๅฐไธ‹ๅˆ—ๆช”ๆกˆ็š„ๆœฌๆฉŸไฟฎๆ”นๅฐ‡่ขซ %s ่ฆ†่“‹๏ผš\n"
+"%%s"
+
+#: unpack-trees.c:127
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"ๆ›ดๆ–ฐๅฆ‚ไธ‹็›ฎ้Œ„ๅฐ‡ๆœƒ้บๅคฑๅ…ถไธญๆœช่ฟฝ่นค็š„ๆช”ๆกˆ๏ผš\n"
+"%s"
+
+#: unpack-trees.c:131
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บ็ฐฝๅ‡บๅ‹•ไฝœ่€Œ่ขซๅˆช้™ค๏ผš\n"
+"%%s่ซ‹ๅœจๅˆ‡ๆ›ๅˆ†ๆ”ฏไน‹ๅ‰็งปๅ‹•ๆˆ–ๅˆช้™คใ€‚"
+
+#: unpack-trees.c:133
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บ็ฐฝๅ‡บๅ‹•ไฝœ่€Œ่ขซๅˆช้™ค๏ผš\n"
+"%%s"
+
+#: unpack-trees.c:136
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บๅˆไฝตๅ‹•ไฝœ่€Œ่ขซๅˆช้™ค๏ผš\n"
+"%%s่ซ‹ๅœจๅˆไฝตๅ‰็งปๅ‹•ๆˆ–ๅˆช้™คใ€‚"
+
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บๅˆไฝตๅ‹•ไฝœ่€Œ่ขซๅˆช้™ค๏ผš\n"
+"%%s"
+
+#: unpack-trees.c:141
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บ %s ๅ‹•ไฝœ่€Œ่ขซๅˆช้™ค๏ผš\n"
+"%%s่ซ‹ๅœจ %s ๅ‰็งปๅ‹•ๆˆ–ๅˆช้™คใ€‚"
+
+#: unpack-trees.c:143
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บ %s ๅ‹•ไฝœ่€Œ่ขซๅˆช้™ค๏ผš\n"
+"%%s"
+
+#: unpack-trees.c:149
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บ็ฐฝๅ‡บๅ‹•ไฝœ่€Œ่ขซ่ฆ†่“‹๏ผš\n"
+"%%s่ซ‹ๅœจๅˆ‡ๆ›ๅˆ†ๆ”ฏๅ‰็งปๅ‹•ๆˆ–ๅˆช้™คใ€‚"
+
+#: unpack-trees.c:151
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บ็ฐฝๅ‡บๅ‹•ไฝœ่€Œ่ขซ่ฆ†่“‹๏ผš\n"
+"%%s"
+
+#: unpack-trees.c:154
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บๅˆไฝตๅ‹•ไฝœ่€Œ่ขซ่ฆ†่“‹๏ผš\n"
+"%%s่ซ‹ๅœจๅˆไฝตๅ‰็งปๅ‹•ๆˆ–ๅˆช้™คใ€‚"
+
+#: unpack-trees.c:156
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บๅˆไฝตๅ‹•ไฝœ่€Œ่ขซ่ฆ†่“‹๏ผš\n"
+"%%s"
+
+#: unpack-trees.c:159
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บ %s ๅ‹•ไฝœ่€Œ่ขซ่ฆ†่“‹๏ผš\n"
+"%%s่ซ‹ๅœจ %s ๅ‰็งปๅ‹•ๆˆ–ๅˆช้™คใ€‚"
+
+#: unpack-trees.c:161
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๅฐ‡ๆœƒๅ› ็‚บ %s ๅ‹•ไฝœ่€Œ่ขซ่ฆ†่“‹๏ผš\n"
+"%%s"
+
+#: unpack-trees.c:169
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "ๆข็›ฎ '%s' ๅ’Œ '%s' ้‡็–Šใ€‚็„กๆณ•ๅˆไฝตใ€‚"
+
+#: unpack-trees.c:172
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
+msgstr ""
+"็„กๆณ•ๆ›ดๆ–ฐ็จ€็–็ฐฝๅ‡บ๏ผšๅฆ‚ไธ‹ๆข็›ฎไธๆ˜ฏๆœ€ๆ–ฐ๏ผš\n"
+"%s"
+
+#: unpack-trees.c:174
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆช”ๆกˆๅฐ‡่ขซ็จ€็–็ฐฝๅ‡บๆ›ดๆ–ฐๆ‰€่ฆ†่“‹๏ผš\n"
+"%s"
+
+#: unpack-trees.c:176
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"ๅทฅไฝœๅ€ไธญไธ‹ๅˆ—ๆช”ๆกˆๅฐ‡่ขซ็จ€็–็ฐฝๅ‡บๆ›ดๆ–ฐๆ‰€ๅˆช้™ค๏ผš\n"
+"%s"
+
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"็„กๆณ•ๆ›ดๆ–ฐๅญๆจก็ต„๏ผš\n"
+"%s"
+
+#: unpack-trees.c:255
+#, c-format
+msgid "Aborting\n"
+msgstr "ๆญฃๅœจ็ต‚ๆญข\n"
+
+#: unpack-trees.c:317
+msgid "Updating files"
+msgstr "ๆญฃๅœจๆ›ดๆ–ฐๆช”ๆกˆ"
+
+#: unpack-trees.c:349
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"ไปฅไธ‹่ทฏๅพ‘็™ผ็”Ÿ็ขฐๆ’ž๏ผˆๅฆ‚๏ผšๅœจไธๅ€ๅˆ†ๅคงๅฐๅฏซ็š„ๆช”ๆกˆ็ณป็ตฑไธŠ็š„ๅ€ๅˆ†ๅคงๅฐๅฏซ็š„่ทฏๅพ‘๏ผ‰๏ผŒ\n"
+"ไธฆไธ”็ขฐๆ’ž็ต„ไธญๅชๆœ‰ไธ€ๅ€‹ๆช”ๆกˆๅญ˜ๅœจๅทฅไฝœๅ€ไธญ๏ผš\n"
+
+#: unpack-trees.c:1445
+msgid "Updating index flags"
+msgstr "ๆญฃๅœจๆ›ดๆ–ฐ็ดขๅผ•ๆ——ๆจ™"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "็„กๆ•ˆ็š„ URL ๆ–นๆกˆๅ็จฑๆˆ–้บๅคฑ '://' ๅพŒ็ถด"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "็„กๆ•ˆ็š„ %XX ่ฝ‰็พฉๅบๅˆ—"
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "็ผบๅฐ‘ไธปๆฉŸๅ็จฑไธ” URL ๆ–นๆกˆไธๆ˜ฏ 'file:'"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "ไธ€ๅ€‹ 'file:' URL ไธๆ‡‰่ฉฒๅŒ…ๅซๅŸ ่™Ÿ"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "ไธปๆฉŸๅ็จฑไธญๅŒ…ๅซ็„กๆ•ˆ็š„ๅญ—ๅ…ƒ"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "็„กๆ•ˆ็š„ๅŸ ่™Ÿ"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "็„กๆ•ˆ็š„ '..' ่ทฏๅพ‘็‰‡ๆฎต"
+
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "ๆญฃๅœจๆŠ“ๅ–็‰ฉไปถ"
+
+#: worktree.c:259 builtin/am.c:2099
+#, c-format
+msgid "failed to read '%s'"
+msgstr "่ฎ€ๅ– '%s' ๅคฑๆ•—"
+
+#: worktree.c:305
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "ๅœจไธปๅทฅไฝœๅ€็š„ '%s' ไธๆ˜ฏ็‰ˆๆœฌๅบซ็›ฎ้Œ„"
+
+#: worktree.c:316
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "ๆช”ๆกˆ '%s' ไธๅŒ…ๅซๅทฅไฝœๅ€็š„็ต•ๅฐ่ทฏๅพ‘"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' ไธๅญ˜ๅœจ"
+
+#: worktree.c:334
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ .git ๆช”ๆกˆ๏ผŒ้Œฏ่ชค็ขผ %d"
+
+#: worktree.c:342
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' ๆฒ’ๆœ‰ๆŒ‡ๅ›žๅˆฐ '%s'"
+
+#: wrapper.c:186 wrapper.c:356
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "็„กๆณ•้–‹ๅ•Ÿ '%s' ้€ฒ่กŒ่ฎ€ๅฏซ"
+
+#: wrapper.c:387 wrapper.c:588
+#, c-format
+msgid "unable to access '%s'"
+msgstr "ไธ่ƒฝๅญ˜ๅ– '%s'"
+
+#: wrapper.c:596
+msgid "unable to get current working directory"
+msgstr "ไธ่ƒฝๅ–ๅพ—็›ฎๅ‰ๅทฅไฝœ็›ฎ้Œ„"
+
+#: wt-status.c:158
+msgid "Unmerged paths:"
+msgstr "ๆœชๅˆไฝต็š„่ทฏๅพ‘๏ผš"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:187 wt-status.c:219
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git restore --staged <ๆช”ๆกˆ>...\" ไปฅๅ–ๆถˆๆšซๅญ˜๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git restore --source=%s --staged <ๆช”ๆกˆ>...\" ไปฅๅ–ๆถˆๆšซๅญ˜๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:193 wt-status.c:225
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git rm --cached <ๆช”ๆกˆ>...\" ไปฅๅ–ๆถˆๆšซๅญ˜๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:197
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git add <ๆช”ๆกˆ>...\" ๆจ™่จ˜่งฃๆฑบๆ–นๆกˆ๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:199 wt-status.c:203
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr "  ๏ผˆ้…Œๆƒ…ไฝฟ็”จ \"git add/rm <ๆช”ๆกˆ>...\" ๆจ™่จ˜่งฃๆฑบๆ–นๆกˆ๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:201
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git rm <ๆช”ๆกˆ>...\" ๆจ™่จ˜่งฃๆฑบๆ–นๆกˆ๏ผ‰"
+
+#: wt-status.c:211 wt-status.c:1074
+msgid "Changes to be committed:"
+msgstr "่ฆๆไบค็š„่ฎŠๆ›ด๏ผš"
+
+#: wt-status.c:234 wt-status.c:1083
+msgid "Changes not staged for commit:"
+msgstr "ๅฐšๆœชๆšซๅญ˜ไปฅๅ‚™ๆไบค็š„่ฎŠๆ›ด๏ผš"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:238
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git add <ๆช”ๆกˆ>...\" ๆ›ดๆ–ฐ่ฆๆไบค็š„ๅ…งๅฎน๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:240
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git add/rm <ๆช”ๆกˆ>...\" ๆ›ดๆ–ฐ่ฆๆไบค็š„ๅ…งๅฎน๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:241
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git restore <ๆช”ๆกˆ>...\" ๆจๆฃ„ๅทฅไฝœๅ€็š„ๆ”นๅ‹•๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:243
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr "  ๏ผˆๆไบคๆˆ–ๆจๆฃ„ๅญๆจก็ต„ไธญๆœช่ฟฝ่นคๆˆ–ไฟฎๆ”น็š„ๅ…งๅฎน๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:254
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git %s <ๆช”ๆกˆ>...\" ไปฅๅŒ…ๅซ่ฆๆไบค็š„ๅ…งๅฎน๏ผ‰"
+
+#: wt-status.c:268
+msgid "both deleted:"
+msgstr "้›™ๆ–นๅˆช้™ค๏ผš"
+
+#: wt-status.c:270
+msgid "added by us:"
+msgstr "็”ฑๆˆ‘ๅ€‘ๆ–ฐๅขž๏ผš"
+
+#: wt-status.c:272
+msgid "deleted by them:"
+msgstr "็”ฑไป–ๅ€‘ๅˆช้™ค๏ผš"
+
+#: wt-status.c:274
+msgid "added by them:"
+msgstr "็”ฑไป–ๅ€‘ๆ–ฐๅขž๏ผš"
+
+#: wt-status.c:276
+msgid "deleted by us:"
+msgstr "็”ฑๆˆ‘ๅ€‘ๅˆช้™ค๏ผš"
+
+#: wt-status.c:278
+msgid "both added:"
+msgstr "้›™ๆ–นๆ–ฐๅขž๏ผš"
+
+#: wt-status.c:280
+msgid "both modified:"
+msgstr "้›™ๆ–นไฟฎๆ”น๏ผš"
+
+#: wt-status.c:290
+msgid "new file:"
+msgstr "ๆ–ฐๆช”ๆกˆ๏ผš"
+
+#: wt-status.c:292
+msgid "copied:"
+msgstr "่ค‡่ฃฝ๏ผš"
+
+#: wt-status.c:294
+msgid "deleted:"
+msgstr "ๅˆช้™ค๏ผš"
+
+#: wt-status.c:296
+msgid "modified:"
+msgstr "ไฟฎๆ”น๏ผš"
+
+#: wt-status.c:298
+msgid "renamed:"
+msgstr "้‡ๆ–ฐๅ‘ฝๅ๏ผš"
+
+#: wt-status.c:300
+msgid "typechange:"
+msgstr "้กžๅž‹่ฎŠๆ›ด๏ผš"
+
+#: wt-status.c:302
+msgid "unknown:"
+msgstr "ๆœช็Ÿฅ๏ผš"
+
+#: wt-status.c:304
+msgid "unmerged:"
+msgstr "ๆœชๅˆไฝต๏ผš"
+
+#  ่ญฏ่€…๏ผšๆœซๅฐพๅ…ฉๅ€‹ไฝๅ…ƒ็ต„ๅฏ่ƒฝ่ขซๅˆชๆธ›๏ผŒๅฆ‚ๆžœ็ฟป่ญฏ็‚บไธญๆ–‡ๆจ™้ปžๆœƒๅ‡บ็พๅŠๅ€‹ๆผขๅญ—
+#: wt-status.c:384
+msgid "new commits, "
+msgstr "ๆ–ฐๆไบค, "
+
+#  ่ญฏ่€…๏ผšๆœซๅฐพๅ…ฉๅ€‹ไฝๅ…ƒ็ต„ๅฏ่ƒฝ่ขซๅˆชๆธ›๏ผŒๅฆ‚ๆžœ็ฟป่ญฏ็‚บไธญๆ–‡ๆจ™้ปžๆœƒๅ‡บ็พๅŠๅ€‹ๆผขๅญ—
+#: wt-status.c:386
+msgid "modified content, "
+msgstr "ไฟฎๆ”น็š„ๅ…งๅฎน, "
+
+#  ่ญฏ่€…๏ผšๆœซๅฐพๅ…ฉๅ€‹ไฝๅ…ƒ็ต„ๅฏ่ƒฝ่ขซๅˆชๆธ›๏ผŒๅฆ‚ๆžœ็ฟป่ญฏ็‚บไธญๆ–‡ๆจ™้ปžๆœƒๅ‡บ็พๅŠๅ€‹ๆผขๅญ—
+#: wt-status.c:388
+msgid "untracked content, "
+msgstr "ๆœช่ฟฝ่นค็š„ๅ…งๅฎน, "
+
+#: wt-status.c:906
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "ๆ‚จ็š„ๅ„ฒ่—ๅ€็›ฎๅ‰ๆœ‰ %d ๆข็ด€้Œ„"
+
+#: wt-status.c:938
+msgid "Submodules changed but not updated:"
+msgstr "ๅญๆจก็ต„ๅทฒไฟฎๆ”นไฝ†ๅฐšๆœชๆ›ดๆ–ฐ๏ผš"
+
+#: wt-status.c:940
+msgid "Submodule changes to be committed:"
+msgstr "่ฆๆไบค็š„ๅญๆจก็ต„่ฎŠๆ›ด๏ผš"
+
+#: wt-status.c:1022
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"ไธ่ฆๆ”นๅ‹•ๆˆ–ๅˆช้™คไธŠ้ข็š„ไธ€่กŒใ€‚\n"
+"ๅ…ถไธ‹ๆ‰€ๆœ‰ๅ…งๅฎน้ƒฝๅฐ‡่ขซๅฟฝ็•ฅใ€‚"
+
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"่Šฑไบ† %.2f ็ง’ๆ‰่จˆ็ฎ—ๅ‡บๅˆ†ๆ”ฏ็š„้ ˜ๅ…ˆ/่ฝๅพŒ็ฏ„ๅœใ€‚\n"
+"็‚บ้ฟๅ…๏ผŒๆ‚จๅฏไปฅไฝฟ็”จ '--no-ahead-behind'ใ€‚\n"
+
+#: wt-status.c:1144
+msgid "You have unmerged paths."
+msgstr "ๆ‚จๆœ‰ๅฐšๆœชๅˆไฝต็š„่ทฏๅพ‘ใ€‚"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1147
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  ๏ผˆ่งฃๆฑบ่ก็ชไธฆๅŸท่กŒ \"git commit\"๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1149
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git merge --abort\" ็ต‚ๆญขๅˆไฝต๏ผ‰"
+
+#: wt-status.c:1153
+msgid "All conflicts fixed but you are still merging."
+msgstr "ๆ‰€ๆœ‰่ก็ชๅทฒ่งฃๆฑบไฝ†ๆ‚จไป่™•ๆ–ผๅˆไฝตไธญใ€‚"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1156
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git commit\" ็ตๆŸๅˆไฝต๏ผ‰"
+
+#: wt-status.c:1165
+msgid "You are in the middle of an am session."
+msgstr "ๆ‚จๆญฃ่™•ๆ–ผ am ๅ‹•ไฝœ้Ž็จ‹ไธญใ€‚"
+
+#: wt-status.c:1168
+msgid "The current patch is empty."
+msgstr "็›ฎๅ‰็š„ไฟฎ่ฃœๆช”็‚บ็ฉบใ€‚"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1172
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  ๏ผˆ่งฃๆฑบ่ก็ช๏ผŒ็„ถๅพŒๅŸท่กŒ \"git am --continue\"๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1174
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git am --skip\" ่ทณ้Žๆญคไฟฎ่ฃœๆช”๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1176
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git am --abort\" ๅพฉๅŽŸๅŽŸๆœ‰ๅˆ†ๆ”ฏ๏ผ‰"
+
+#: wt-status.c:1309
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo ้บๅคฑใ€‚"
+
+#: wt-status.c:1311
+msgid "No commands done."
+msgstr "ๆฒ’ๆœ‰ๆŒ‡ไปค่ขซๅŸท่กŒใ€‚"
+
+#: wt-status.c:1314
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "ๆœ€ๅพŒไธ€ๆขๆŒ‡ไปคๅทฒๅฎŒๆˆ๏ผˆ%d ๆขๆŒ‡ไปค่ขซๅŸท่กŒ๏ผ‰๏ผš"
+
+#: wt-status.c:1325
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  ๏ผˆๆ›ดๅคšๅƒ่ฆ‹ๆช”ๆกˆ %s๏ผ‰"
+
+#: wt-status.c:1330
+msgid "No commands remaining."
+msgstr "ๆœชๅ‰ฉไธ‹ไปปไฝ•ๆŒ‡ไปคใ€‚"
+
+#: wt-status.c:1333
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "ๆŽฅไธ‹ไพ†่ฆๅŸท่กŒ็š„ๆŒ‡ไปค๏ผˆๅ‰ฉ้ค˜ %d ๆขๆŒ‡ไปค๏ผ‰๏ผš"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1341
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git rebase --edit-todo\" ไพ†ๆชข่ฆ–ๅ’Œ็ทจ่ผฏ๏ผ‰"
+
+#: wt-status.c:1353
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "ๆ‚จๅœจๅŸท่กŒๅฐ‡ๅˆ†ๆ”ฏ '%s' ้‡ๅฎšๅŸบๅบ•ๅˆฐ '%s' ็š„ๅ‹•ไฝœใ€‚"
+
+#: wt-status.c:1358
+msgid "You are currently rebasing."
+msgstr "ๆ‚จๅœจๅŸท่กŒ้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœใ€‚"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1371
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  ๏ผˆ่งฃๆฑบ่ก็ช๏ผŒ็„ถๅพŒๅŸท่กŒ \"git rebase --continue\"๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1373
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git rebase --skip\" ่ทณ้Žๆญคไฟฎ่ฃœๆช”๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1375
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git rebase --abort\" ไปฅ็ฐฝๅ‡บๅŽŸๆœ‰ๅˆ†ๆ”ฏ๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1382
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  ๏ผˆๆ‰€ๆœ‰่ก็ชๅทฒ่งฃๆฑบ๏ผšๅŸท่กŒ \"git rebase --continue\"๏ผ‰"
+
+#: wt-status.c:1386
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "ๆ‚จๅœจๅŸท่กŒๅฐ‡ๅˆ†ๆ”ฏ '%s' ้‡ๅฎšๅŸบๅบ•ๅˆฐ '%s' ็š„ๅ‹•ไฝœๆ™‚ๅˆ†ๅ‰ฒๆไบคใ€‚"
+
+#: wt-status.c:1391
+msgid "You are currently splitting a commit during a rebase."
+msgstr "ๆ‚จๅœจๅŸท่กŒ้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœๆ™‚ๅˆ†ๅ‰ฒๆไบคใ€‚"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1394
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr "  ๏ผˆไธ€ๆ—ฆๆ‚จๅทฅไฝœ็›ฎ้Œ„ๆไบคไนพๆทจๅพŒ๏ผŒๅŸท่กŒ \"git rebase --continue\"๏ผ‰"
+
+#: wt-status.c:1398
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "ๆ‚จๅœจๅŸท่กŒๅฐ‡ๅˆ†ๆ”ฏ '%s' ้‡ๅฎšๅŸบๅบ•ๅˆฐ '%s' ็š„ๅ‹•ไฝœๆ™‚็ทจ่ผฏๆไบคใ€‚"
+
+#: wt-status.c:1403
+msgid "You are currently editing a commit during a rebase."
+msgstr "ๆ‚จๅœจๅŸท่กŒ้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœๆ™‚็ทจ่ผฏๆไบคใ€‚"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1406
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git commit --amend\" ไฟฎ่ฃœ็›ฎๅ‰ๆไบค๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1408
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr "  ๏ผˆ็•ถๆ‚จๅฐๆ‚จ็š„ไฟฎๆ”นๆปฟๆ„ๅพŒๅŸท่กŒ \"git rebase --continue\"๏ผ‰"
+
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "ๆ€้ธๅ‹•ไฝœๆญฃๅœจ้€ฒ่กŒไธญใ€‚"
+
+#: wt-status.c:1422
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "ๆ‚จๅœจๅŸท่กŒๆ€้ธๆไบค %s ็š„ๅ‹•ไฝœใ€‚"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1429
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  ๏ผˆ่งฃๆฑบ่ก็ชไธฆๅŸท่กŒ \"git cherry-pick --continue\"๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1432
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  ๏ผˆๅŸท่กŒ \"git cherry-pick --continue\" ไปฅ็นผ็บŒ๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1435
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  ๏ผˆๆ‰€ๆœ‰่ก็ชๅทฒ่งฃๆฑบ๏ผšๅŸท่กŒ \"git cherry-pick --continue\"๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1437
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git cherry-pick --skip\" ่ทณ้Žๆญคไฟฎ่ฃœๆช”๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1439
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git cherry-pick --abort\" ไปฅๅ–ๆถˆๆ€้ธๅ‹•ไฝœ๏ผ‰"
+
+#: wt-status.c:1449
+msgid "Revert currently in progress."
+msgstr "้‚„ๅŽŸๅ‹•ไฝœๆญฃๅœจ่กŒไธญใ€‚"
+
+#: wt-status.c:1452
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "ๆ‚จๅœจๅŸท่กŒๅ่ฝ‰ๆไบค %s ็š„ๅ‹•ไฝœใ€‚"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1458
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  ๏ผˆ่งฃๆฑบ่ก็ชไธฆๅŸท่กŒ \"git revert --continue\"๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1461
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  ๏ผˆๅŸท่กŒ \"git revert --continue\" ไปฅ็นผ็บŒ๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1464
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  ๏ผˆๆ‰€ๆœ‰่ก็ชๅทฒ่งฃๆฑบ๏ผšๅŸท่กŒ \"git revert --continue\"๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1466
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git revert --skip\" ่ทณ้Žๆญคไฟฎ่ฃœๆช”๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1468
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git revert --abort\" ไปฅๅ–ๆถˆๅ่ฝ‰ๆไบคๅ‹•ไฝœ๏ผ‰"
+
+#: wt-status.c:1478
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "ๆ‚จๅœจๅŸท่กŒๅพžๅˆ†ๆ”ฏ '%s' ้–‹ๅง‹็š„ไบŒๅˆ†ๅฐ‹ๆ‰พๅ‹•ไฝœใ€‚"
+
+#: wt-status.c:1482
+msgid "You are currently bisecting."
+msgstr "ๆ‚จๅœจๅŸท่กŒไบŒๅˆ†ๅฐ‹ๆ‰พๅ‹•ไฝœใ€‚"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1485
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  ๏ผˆไฝฟ็”จ \"git bisect reset\" ็ฐฝๅ‡บๅŽŸๆœ‰ๅˆ†ๆ”ฏ๏ผ‰"
+
+#: wt-status.c:1694
+msgid "On branch "
+msgstr "ไฝๆ–ผๅˆ†ๆ”ฏ "
+
+#: wt-status.c:1701
+msgid "interactive rebase in progress; onto "
+msgstr "ไบ’ๅ‹•ๅผ้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœๆญฃๅœจ้€ฒ่กŒไธญ๏ผ›่‡ณ "
+
+#: wt-status.c:1703
+msgid "rebase in progress; onto "
+msgstr "้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœๆญฃๅœจ้€ฒ่กŒไธญ๏ผ›่‡ณ "
+
+#: wt-status.c:1713
+msgid "Not currently on any branch."
+msgstr "็›ฎๅ‰ไธๅœจไปปไฝ•ๅˆ†ๆ”ฏไธŠใ€‚"
+
+#: wt-status.c:1730
+msgid "Initial commit"
+msgstr "ๅˆๅง‹ๆไบค"
+
+#: wt-status.c:1731
+msgid "No commits yet"
+msgstr "ๅฐš็„กๆไบค"
+
+#: wt-status.c:1745
+msgid "Untracked files"
+msgstr "ๆœช่ฟฝ่นค็š„ๆช”ๆกˆ"
+
+#: wt-status.c:1747
+msgid "Ignored files"
+msgstr "ๅฟฝ็•ฅ็š„ๆช”ๆกˆ"
+
+#: wt-status.c:1751
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"่€—่ฒปไบ† %.2f ็ง’ไปฅๆžš่ˆ‰ๆœช่ฟฝ่นค็š„ๆช”ๆกˆใ€‚'status -uno' ไนŸ่จฑ่ƒฝๆ้ซ˜้€Ÿๅบฆ๏ผŒ\n"
+"ไฝ†ๆ‚จ้œ€่ฆๅฐๅฟƒไธ่ฆๅฟ˜ไบ†ๆ–ฐๅขžๆ–ฐๆช”ๆกˆ๏ผˆๅƒ่ฆ‹ 'git help status'๏ผ‰ใ€‚"
+
+#: wt-status.c:1757
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "ๆœช่ฟฝ่นค็š„ๆช”ๆกˆๆฒ’ๆœ‰ๅˆ—ๅ‡บ%s"
+
+#  ่ญฏ่€…๏ผšไธญๆ–‡ๅญ—ไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆช้™คๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1759
+msgid " (use -u option to show untracked files)"
+msgstr "๏ผˆไฝฟ็”จ -u ๅƒๆ•ธ้กฏ็คบๆœช่ฟฝ่นค็š„ๆช”ๆกˆ๏ผ‰"
+
+#: wt-status.c:1765
+msgid "No changes"
+msgstr "ๆฒ’ๆœ‰ไฟฎๆ”น"
+
+#: wt-status.c:1770
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "ไฟฎๆ”นๅฐšๆœชๅŠ ๅ…ฅๆไบค๏ผˆไฝฟ็”จ \"git add\" ๅ’Œ/ๆˆ– \"git commit -a\"๏ผ‰\n"
+
+#: wt-status.c:1773
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "ไฟฎๆ”นๅฐšๆœชๅŠ ๅ…ฅๆไบค\n"
+
+#: wt-status.c:1776
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "ๆไบค็‚บ็ฉบ๏ผŒไฝ†ๆ˜ฏๅญ˜ๅœจๅฐšๆœช่ฟฝ่นค็š„ๆช”ๆกˆ๏ผˆไฝฟ็”จ \"git add\" ๅปบ็ซ‹่ฟฝ่นค๏ผ‰\n"
+
+#: wt-status.c:1779
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "ๆไบค็‚บ็ฉบ๏ผŒไฝ†ๆ˜ฏๅญ˜ๅœจๅฐšๆœช่ฟฝ่นค็š„ๆช”ๆกˆ\n"
+
+#  ่ญฏ่€…๏ผšไธญๆ–‡ๅญ—ไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆช้™คๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1782
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "็„กๆช”ๆกˆ่ฆๆไบค๏ผˆๅปบ็ซ‹/่ค‡่ฃฝๆช”ๆกˆไธฆไฝฟ็”จ \"git add\" ๅปบ็ซ‹่ฟฝ่นค๏ผ‰\n"
+
+#: wt-status.c:1785 wt-status.c:1790
+#, c-format
+msgid "nothing to commit\n"
+msgstr "็„กๆช”ๆกˆ่ฆๆไบค\n"
+
+#  ่ญฏ่€…๏ผšไธญๆ–‡ๅญ—ไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆช้™คๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1788
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "็„กๆช”ๆกˆ่ฆๆไบค๏ผˆไฝฟ็”จ -u ้กฏ็คบๆœช่ฟฝ่นค็š„ๆช”ๆกˆ๏ผ‰\n"
+
+#  ่ญฏ่€…๏ผšไธญๆ–‡ๅญ—ไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆช้™คๅ‰ๅฐŽ็ฉบๆ ผ
+#: wt-status.c:1792
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "ๆฒ’ๆœ‰่ฆๆไบค็š„ๆช”ๆกˆ๏ผŒๅทฅไฝœๅ€็‚บไนพๆทจ็‹€ๆ…‹\n"
+
+#: wt-status.c:1905
+msgid "No commits yet on "
+msgstr "ๅฐš็„กๆไบคๅœจ "
+
+#: wt-status.c:1909
+msgid "HEAD (no branch)"
+msgstr "HEAD๏ผˆ้žๅˆ†ๆ”ฏ๏ผ‰"
+
+#: wt-status.c:1940
+msgid "different"
+msgstr "ไธๅŒ"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅฅๅฐพ็ฉบๆ ผ
+#: wt-status.c:1942 wt-status.c:1950
+msgid "behind "
+msgstr "่ฝๅพŒ "
+
+#: wt-status.c:1945 wt-status.c:1948
+msgid "ahead "
+msgstr "้ ˜ๅ…ˆ "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2470
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "ไธ่ƒฝ%s๏ผšๆ‚จๆœ‰ๆœชๆšซๅญ˜็š„่ฎŠๆ›ดใ€‚"
+
+#: wt-status.c:2476
+msgid "additionally, your index contains uncommitted changes."
+msgstr "ๅฆๅค–๏ผŒๆ‚จ็š„็ดขๅผ•ไธญๅŒ…ๅซๆœชๆไบค็š„่ฎŠๆ›ดใ€‚"
+
+#: wt-status.c:2478
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "ไธ่ƒฝ%s๏ผšๆ‚จ็š„็ดขๅผ•ไธญๅŒ…ๅซๆœชๆไบค็š„่ฎŠๆ›ดใ€‚"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "ๅˆช้™ค '%s' ๅคฑๆ•—"
+
+#: builtin/add.c:26
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<้ธ้ …>] [--] <่ทฏๅพ‘่ฆๆ ผ>..."
+
+#: builtin/add.c:88
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "ๆ„ๅค–็š„ๅทฎ็•ฐ็‹€ๆ…‹ %c"
+
+#: builtin/add.c:93 builtin/commit.c:288
+msgid "updating files failed"
+msgstr "ๆ›ดๆ–ฐๆช”ๆกˆๅคฑๆ•—"
+
+#: builtin/add.c:103
+#, c-format
+msgid "remove '%s'\n"
+msgstr "ๅˆช้™ค '%s'\n"
+
+#: builtin/add.c:178
+msgid "Unstaged changes after refreshing the index:"
+msgstr "้‡ๆ–ฐๆ•ด็†็ดขๅผ•ไน‹ๅพŒๅฐšๆœช่ขซๆšซๅญ˜็š„่ฎŠๆ›ด๏ผš"
+
+#: builtin/add.c:266 builtin/rev-parse.c:899
+msgid "Could not read the index"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–็ดขๅผ•"
+
+#: builtin/add.c:277
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "็„กๆณ•็‚บๅฏซๅ…ฅ้–‹ๅ•Ÿ '%s'ใ€‚"
+
+#: builtin/add.c:281
+msgid "Could not write patch"
+msgstr "ไธ่ƒฝ็”Ÿๆˆไฟฎ่ฃœๆช”"
+
+#: builtin/add.c:284
+msgid "editing patch failed"
+msgstr "็ทจ่ผฏไฟฎ่ฃœๆช”ๅคฑๆ•—"
+
+#: builtin/add.c:287
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "ไธ่ƒฝๅฐ '%s' ๅ‘ผๅซ stat"
+
+#: builtin/add.c:289
+msgid "Empty patch. Aborted."
+msgstr "็ฉบไฟฎ่ฃœๆช”ใ€‚็•ฐๅธธ็ต‚ๆญขใ€‚"
+
+#: builtin/add.c:294
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "ไธ่ƒฝๆ‡‰็”จ '%s'"
+
+#: builtin/add.c:302
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "ไธ‹ๅˆ—่ทฏๅพ‘ๆ นๆ“šๆ‚จ็š„ไธ€ๅ€‹ .gitignore ๆช”ๆกˆ่€Œ่ขซๅฟฝ็•ฅ๏ผš\n"
+
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+msgid "dry run"
+msgstr "ๆธฌ่ฉฆๅŸท่กŒ"
+
+#: builtin/add.c:325
+msgid "interactive picking"
+msgstr "ไบ’ๅ‹•ๅผๆ€้ธ"
+
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+msgid "select hunks interactively"
+msgstr "ไบ’ๅ‹•ๅผๆŒ‘้ธ่ณ‡ๆ–™ๅ€ๅกŠ"
+
+#: builtin/add.c:327
+msgid "edit current diff and apply"
+msgstr "็ทจ่ผฏ็›ฎๅ‰ๅทฎ็•ฐไธฆๆ‡‰็”จ"
+
+#: builtin/add.c:328
+msgid "allow adding otherwise ignored files"
+msgstr "ๅ…่จฑๆ–ฐๅขžๅฟฝ็•ฅ็š„ๆช”ๆกˆ"
+
+#: builtin/add.c:329
+msgid "update tracked files"
+msgstr "ๆ›ดๆ–ฐๅทฒ่ฟฝ่นค็š„ๆช”ๆกˆ"
+
+#: builtin/add.c:330
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "ๅฐๅทฒ่ฟฝ่นคๆช”ๆกˆ๏ผˆ้šฑๅซ -u๏ผ‰้‡ๆ–ฐๆญธไธ€ๆ›่กŒ็ฌฆ่™Ÿ"
+
+#: builtin/add.c:331
+msgid "record only the fact that the path will be added later"
+msgstr "ๅช่จ˜้Œ„๏ผŒ่ฉฒ่ทฏๅพ‘็จๅพŒๅ†ๆ–ฐๅขž"
+
+#: builtin/add.c:332
+msgid "add changes from all tracked and untracked files"
+msgstr "ๆ–ฐๅขžๆ‰€ๆœ‰ๆ”น่ฎŠ็š„ๅทฒ่ฟฝ่นคๆช”ๆกˆๅ’Œๆœช่ฟฝ่นคๆช”ๆกˆ"
+
+#: builtin/add.c:335
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "ๅฟฝ็•ฅๅทฅไฝœๅ€ไธญ็งป้™ค็š„่ทฏๅพ‘๏ผˆๅ’Œ --no-all ็›ธๅŒ๏ผ‰"
+
+#: builtin/add.c:337
+msgid "don't add, only refresh the index"
+msgstr "ไธๆ–ฐๅขž๏ผŒๅช้‡ๆ–ฐๆ•ด็†็ดขๅผ•"
+
+#: builtin/add.c:338
+msgid "just skip files which cannot be added because of errors"
+msgstr "่ทณ้Žๅ› ็™ผ็”Ÿ้Œฏ่ชคไธ่ƒฝๆ–ฐๅขž็š„ๆช”ๆกˆ"
+
+#: builtin/add.c:339
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "ๆชขๆŸฅๅœจๆธฌ่ฉฆๅŸท่กŒๆจกๅผไธ‹ๆช”ๆกˆ๏ผˆๅณไฝฟไธๅญ˜ๅœจ๏ผ‰ๆ˜ฏๅฆ่ขซๅฟฝ็•ฅ"
+
+#: builtin/add.c:341 builtin/update-index.c:1004
+msgid "override the executable bit of the listed files"
+msgstr "่ฆ†่“‹ๅˆ—่กจ่ฃกๆช”ๆกˆ็š„ๅฏๅŸท่กŒไฝ"
+
+#: builtin/add.c:343
+msgid "warn when adding an embedded repository"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹ๅตŒๅ…ฅๅผ็‰ˆๆœฌๅบซๆ™‚็ตฆไบˆ่ญฆๅ‘Š"
+
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "`git stash -p` ็š„ๅพŒ็ซฏ"
+
+#: builtin/add.c:363
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"ๆ‚จๅœจ็›ฎๅ‰็‰ˆๆœฌๅบซไธญๆ–ฐๅขžไบ†ๅฆๅค–ไธ€ๅ€‹ Git ็‰ˆๆœฌๅบซใ€‚่ค‡่ฃฝๅค–ๅฑค็š„็‰ˆๆœฌๅบซๅฐ‡ไธๅŒ…ๅซๅตŒๅ…ฅ็‰ˆๆœฌๅบซ"
+"็š„ๅ…งๅฎน๏ผŒไธฆไธ”ไธ็Ÿฅ้“่ฉฒๅฆ‚ไฝ•ๅ–ๅพ—ๅฎƒใ€‚\n"
+"ๅฆ‚ๆžœๆ‚จ่ฆๆ–ฐๅขžไธ€ๅ€‹ๅญๆจก็ต„๏ผŒไฝฟ็”จ๏ผš\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"ๅฆ‚ๆžœๆ‚จไธๅฐๅฟƒๆ–ฐๅขžไบ†้€™ๅ€‹่ทฏๅพ‘๏ผŒๅฏไปฅ็”จไธ‹้ข็š„ๆŒ‡ไปคๅฐ‡ๅ…ถๅพž็ดขๅผ•ไธญๅˆช้™ค๏ผš\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"ๅƒ่ฆ‹ \"git help submodule\" ๅ–ๅพ—ๆ›ดๅคš่จŠๆฏใ€‚"
+
+#: builtin/add.c:391
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "ๆญฃๅœจๆ–ฐๅขžๅตŒๅ…ฅๅผ git ็‰ˆๆœฌๅบซ๏ผš%s"
+
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"ๅฆ‚ๆžœๆ‚จ็œŸ็š„ๆƒณๅŠ ๅ…ฅ๏ผŒ่ซ‹ไฝฟ็”จ -fใ€‚\n"
+"ๅฆ‚่ฆ้—œ้–‰ๆญค่จŠๆฏ๏ผŒ่ซ‹ๅŸท่กŒ\n"
+"\"git config advice.addIgnoredFile false\""
+
+#: builtin/add.c:419
+msgid "adding files failed"
+msgstr "ๆ–ฐๅขžๆช”ๆกˆๅคฑๆ•—"
+
+#: builtin/add.c:447 builtin/commit.c:348
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file ่ˆ‡ --interactive/--patch ไธ็›ธๅฎน"
+
+#: builtin/add.c:464
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file ่ˆ‡ --edit ไธ็›ธๅฎน"
+
+#: builtin/add.c:476
+msgid "-A and -u are mutually incompatible"
+msgstr "-A ๅ’Œ -u ้ธ้ …ไบ’ๆ–ฅ"
+
+#: builtin/add.c:479
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "้ธ้ … --ignore-missing ๅช่ƒฝๅ’Œ --dry-run ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/add.c:483
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "ๅƒๆ•ธ --chmod ๅ–ๅ€ผ '%s' ๅฟ…้ ˆๆ˜ฏ -x ๆˆ– +x"
+
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--pathspec-from-file ่ˆ‡ <่ทฏๅพ‘่ฆๆ ผ> ๅƒๆ•ธไธ็›ธๅฎน"
+
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul ้œ€่ฆ --pathspec-from-file"
+
+#: builtin/add.c:512
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "ๆฒ’ๆœ‰ๆŒ‡ๅฎšๆช”ๆกˆ๏ผŒไนŸๆฒ’ๆœ‰ๆช”ๆกˆ่ขซๆ–ฐๅขžใ€‚\n"
+
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"ๅฏ่ƒฝไฝ ่ฆๅš็š„ๆ˜ฏ 'git add .'๏ผŸ\n"
+"ๅฆ‚่ฆ้—œ้–‰ๆญค่จŠๆฏ๏ผŒ่ซ‹ๅŸท่กŒ\n"
+"\"git config advice.addEmptyPathspec false\""
+
+#: builtin/am.c:352
+msgid "could not parse author script"
+msgstr "ไธ่ƒฝ่งฃๆžไฝœ่€…่…ณๆœฌ"
+
+#: builtin/am.c:436
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' ่ขซ applypatch-msg ๆŽ›้‰คๅˆช้™ค"
+
+#: builtin/am.c:478
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "้žๆณ•็š„่ผธๅ…ฅ่กŒ๏ผš'%s'ใ€‚"
+
+#: builtin/am.c:516
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "ๅพž '%s' ่ค‡่ฃฝ่จป่งฃๅˆฐ '%s' ๆ™‚ๅคฑๆ•—"
+
+#: builtin/am.c:542
+msgid "fseek failed"
+msgstr "fseek ๅคฑๆ•—"
+
+#: builtin/am.c:730
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "็„กๆณ•่งฃๆžไฟฎ่ฃœๆช” '%s'"
+
+#: builtin/am.c:795
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "ไธ€ๆฌกๅช่ƒฝๆœ‰ไธ€ๅ€‹ StGIT ไฟฎ่ฃœๆช”ไฝ‡ๅˆ—่ขซๆ‡‰็”จ"
+
+#: builtin/am.c:843
+msgid "invalid timestamp"
+msgstr "็„กๆ•ˆ็š„ๆ™‚้–“ๆˆณ"
+
+#: builtin/am.c:848 builtin/am.c:860
+msgid "invalid Date line"
+msgstr "็„กๆ•ˆ็š„ๆ—ฅๆœŸ่กŒ"
+
+#: builtin/am.c:855
+msgid "invalid timezone offset"
+msgstr "็„กๆ•ˆ็š„ๆ™‚ๅ€ไฝ็งปๅ€ผ"
+
+#: builtin/am.c:948
+msgid "Patch format detection failed."
+msgstr "ไฟฎ่ฃœๆช”ๆ ผๅผๅตๆธฌๅคฑๆ•—ใ€‚"
+
+#: builtin/am.c:953 builtin/clone.c:409
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "ๅปบ็ซ‹็›ฎ้Œ„ '%s' ๅคฑๆ•—"
+
+#: builtin/am.c:958
+msgid "Failed to split patches."
+msgstr "ๅˆ†ๅ‰ฒไฟฎ่ฃœๆช”ๅคฑๆ•—ใ€‚"
+
+#: builtin/am.c:1089
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "็•ถๆ‚จ่งฃๆฑบ้€™ไธ€ๅ•้กŒ๏ผŒๅŸท่กŒ \"%s --continue\"ใ€‚"
+
+#: builtin/am.c:1090
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "ๅฆ‚ๆžœๆ‚จๆƒณ่ฆ่ทณ้Ž้€™ไธ€ไฟฎ่ฃœๆช”๏ผŒๅ‰‡ๅŸท่กŒ \"%s --skip\"ใ€‚"
+
+#: builtin/am.c:1091
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr "่‹ฅ่ฆๅพฉๅŽŸ่‡ณๅŽŸๅง‹ๅˆ†ๆ”ฏไธฆๅœๆญขไฟฎ่ฃœๆช”ๅ‹•ไฝœ๏ผŒๅŸท่กŒ \"%s --abort\"ใ€‚"
+
+#: builtin/am.c:1174
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr "ไฟฎ่ฃœๆช”ไฝฟ็”จ format=flowed ๆ ผๅผๅ‚ณ้€๏ผŒ่กŒๅฐพ็š„็ฉบๆ ผๅฏ่ƒฝๆœƒ้บๅคฑใ€‚"
+
+#: builtin/am.c:1202
+msgid "Patch is empty."
+msgstr "ไฟฎ่ฃœๆช”็‚บ็ฉบใ€‚"
+
+#: builtin/am.c:1267
+#, c-format
+msgid "missing author line in commit %s"
+msgstr "ๅœจๆไบค %s ไธญ็ผบๅฐ‘ไฝœ่€…่กŒ"
+
+#: builtin/am.c:1270
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "็„กๆ•ˆ็š„่บซไปฝๆจ™่จ˜๏ผš%.*s"
+
+#: builtin/am.c:1489
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "็‰ˆๆœฌๅบซ็ผบไนๅฟ…่ฆ็š„่ณ‡ๆ–™็‰ฉไปถไปฅ้€ฒ่กŒไธ‰ๆ–นๅˆไฝตใ€‚"
+
+#: builtin/am.c:1491
+msgid "Using index info to reconstruct a base tree..."
+msgstr "ไฝฟ็”จ็ดขๅผ•ไพ†้‡ๅปบไธ€ๅ€‹๏ผˆไธ‰ๆ–นๅˆไฝต็š„๏ผ‰ๅŸบ็คŽ็›ฎ้Œ„ๆจน..."
+
+#: builtin/am.c:1510
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"ๆ‚จๆ˜ฏๅฆๆ›พๆ‰‹ๅ‹•็ทจ่ผฏ้Žๆ‚จ็š„ไฟฎ่ฃœๆช”๏ผŸ\n"
+"็„กๆณ•ๅฅ—็”จไฟฎ่ฃœๆช”ๅˆฐ็ดขๅผ•ไธญ็š„่ณ‡ๆ–™็‰ฉไปถไธŠใ€‚"
+
+#: builtin/am.c:1516
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "ๅ›ž่ฝๅˆฐๅŸบ็คŽ็‰ˆๆœฌไธŠๆ‰“ไฟฎ่ฃœๆช”ๅŠ้€ฒ่กŒไธ‰ๆ–นๅˆไฝต..."
+
+#: builtin/am.c:1542
+msgid "Failed to merge in the changes."
+msgstr "็„กๆณ•ๅˆไฝต่ฎŠๆ›ดใ€‚"
+
+#: builtin/am.c:1574
+msgid "applying to an empty history"
+msgstr "ๆญฃๅฅ—็”จๅˆฐไธ€ๅ€‹็ฉบๆญทๅฒไธŠ"
+
+#: builtin/am.c:1621 builtin/am.c:1625
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "็„กๆณ•็นผ็บŒ๏ผš%s ไธๅญ˜ๅœจใ€‚"
+
+#: builtin/am.c:1643
+msgid "Commit Body is:"
+msgstr "ๆไบคๅ…งๅฎน็‚บ๏ผš"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅฅๅฐพ็ฉบๆ ผ
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1653
+#, c-format
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "ๅฅ—็”จ๏ผŸๆ˜ฏ[y]/ๅฆ[n]/็ทจ่ผฏ[e]/ๆชข่ฆ–ไฟฎ่ฃœๆช”[v]/ๆ‡‰็”จๆ‰€ๆœ‰[a]๏ผš"
+
+#: builtin/am.c:1700 builtin/commit.c:398
+msgid "unable to write index file"
+msgstr "็„กๆณ•ๅฏซๅ…ฅ็ดขๅผ•ๆช”ๆกˆ"
+
+#: builtin/am.c:1704
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "้ซ’็ดขๅผ•๏ผšไธ่ƒฝๅฅ—็”จไฟฎ่ฃœๆช”๏ผˆ้ซ’ๆช”ๆกˆ๏ผš%s๏ผ‰"
+
+#: builtin/am.c:1744 builtin/am.c:1812
+#, c-format
+msgid "Applying: %.*s"
+msgstr "ๆ‡‰็”จ๏ผš%.*s"
+
+#: builtin/am.c:1761
+msgid "No changes -- Patch already applied."
+msgstr "ๆฒ’ๆœ‰่ฎŠๆ›ด โ€”โ€” ไฟฎ่ฃœๆช”ๅทฒ็ถ“ๆ‡‰็”จ้Žใ€‚"
+
+#: builtin/am.c:1767
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "ๆ‰“ไฟฎ่ฃœๆช”ๅคฑๆ•—ๆ–ผ %s %.*s"
+
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "็”จ 'git am --show-current-patch=diff' ๅ‘ฝไปคๆชข่ฆ–ๅคฑๆ•—็š„ไฟฎ่ฃœๆช”"
+
+#: builtin/am.c:1815
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"ๆฒ’ๆœ‰่ฎŠๆ›ด โ€”โ€” ๆ‚จๆ˜ฏไธๆ˜ฏๅฟ˜ไบ†ๅŸท่กŒ 'git add'๏ผŸ\n"
+"ๅฆ‚ๆžœๆฒ’ๆœ‰ไป€้บผ่ฆๆ–ฐๅขžๅˆฐๆšซๅญ˜ๅ€็š„๏ผŒๅ‰‡ๅพˆๅฏ่ƒฝๆ˜ฏๅ…ถๅฎƒๆไบคๅทฒ็ถ“ๅผ•ๅ…ฅไบ†็›ธๅŒ็š„่ฎŠๆ›ดใ€‚\n"
+"ๆ‚จไนŸ่จฑๆƒณ่ฆ่ทณ้Ž้€™ๅ€‹ไฟฎ่ฃœๆช”ใ€‚"
+
+#: builtin/am.c:1822
+msgid ""
+"You still have unmerged paths in your index.\n"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
+msgstr ""
+"ๅœจๆ‚จ็š„็ดขๅผ•ไธญไปๅญ˜ๅœจๆœชๅˆไฝต็š„่ทฏๅพ‘ใ€‚\n"
+"ๆ‚จๆ‡‰่ฉฒๅฐๅทฒ็ถ“่ก็ช่งฃๆฑบ็š„ๆฏไธ€ๅ€‹ๆช”ๆกˆๅŸท่กŒ 'git add' ไพ†ๆจ™่จ˜ๅทฒ็ถ“ๅฎŒๆˆใ€‚ \n"
+"ไฝ ๅฏไปฅๅฐ \"็”ฑไป–ๅ€‘ๅˆช้™ค\" ็š„ๆช”ๆกˆๅŸท่กŒ `git rm` ๆŒ‡ไปคใ€‚"
+
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
+#: builtin/reset.c:354
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "ไธ่ƒฝ่งฃๆž็‰ฉไปถ '%s'ใ€‚"
+
+#: builtin/am.c:1981
+msgid "failed to clean index"
+msgstr "ๆธ…็ฉบ็ดขๅผ•ๅคฑๆ•—"
+
+#: builtin/am.c:2025
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr "ๆ‚จๅฅฝๅƒๅœจไธŠไธ€ๆฌก 'am' ๅคฑๆ•—ๅพŒ็งปๅ‹•ไบ† HEADใ€‚ๆœช้‚„ๅŽŸ่‡ณ ORIG_HEAD"
+
+#: builtin/am.c:2132
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "็„กๆ•ˆ็š„ --patch-format ๅ€ผ๏ผš%s"
+
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "็„กๆ•ˆ็š„ --show-current-patch ๅ€ผ๏ผš%s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s ่ˆ‡ --show-current-patch=%s ไธ็›ธๅฎน"
+
+#: builtin/am.c:2207
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<้ธ้ …>] [(<mbox> | <Maildir>)...]"
+
+#: builtin/am.c:2208
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<้ธ้ …>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2214
+msgid "run interactively"
+msgstr "ไปฅไบ’ๅ‹•ๅผๆ–นๅผๅŸท่กŒ"
+
+#: builtin/am.c:2216
+msgid "historical option -- no-op"
+msgstr "่€็š„ๅƒๆ•ธ โ€”โ€” ็„กไฝœ็”จ"
+
+#: builtin/am.c:2218
+msgid "allow fall back on 3way merging if needed"
+msgstr "ๅฆ‚ๆžœๅฟ…่ฆ๏ผŒๅ…่จฑไฝฟ็”จไธ‰ๆ–นๅˆไฝตใ€‚"
+
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
+msgid "be quiet"
+msgstr "้œ้ป˜ๆจกๅผ"
+
+#: builtin/am.c:2221
+msgid "add a Signed-off-by line to the commit message"
+msgstr "ๅœจๆไบค่ชชๆ˜Žไธญๆ–ฐๅขžไธ€ๅ€‹ Signed-off-by ็ฐฝๅ"
+
+#: builtin/am.c:2224
+msgid "recode into utf8 (default)"
+msgstr "ไฝฟ็”จ utf8 ๅญ—ๅ…ƒ้›†๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/am.c:2226
+msgid "pass -k flag to git-mailinfo"
+msgstr "ๅ‘ git-mailinfo ๅ‚ณ้ž -k ๅƒๆ•ธ"
+
+#: builtin/am.c:2228
+msgid "pass -b flag to git-mailinfo"
+msgstr "ๅ‘ git-mailinfo ๅ‚ณ้ž -b ๅƒๆ•ธ"
+
+#: builtin/am.c:2230
+msgid "pass -m flag to git-mailinfo"
+msgstr "ๅ‘ git-mailinfo ๅ‚ณ้ž -m ๅƒๆ•ธ"
+
+#: builtin/am.c:2232
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "้‡ๅฐ mbox ๆ ผๅผ๏ผŒๅ‘ git-mailsplit ๅ‚ณ้ž --keep-cr ๅƒๆ•ธ"
+
+#: builtin/am.c:2235
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr "ไธๅ‘ git-mailsplit ๅ‚ณ้ž --keep-cr ๅƒๆ•ธ๏ผŒ่ฆ†่“‹ am.keepcr ็š„่จญๅฎš"
+
+#: builtin/am.c:2238
+msgid "strip everything before a scissors line"
+msgstr "ๆจๆฃ„่ฃๅˆ‡็ทšๅ‰็š„ๆ‰€ๆœ‰ๅ…งๅฎน"
+
+#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
+#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
+#: builtin/am.c:2267
+msgid "pass it through git-apply"
+msgstr "ๅ‚ณ้ž็ตฆ git-apply"
+
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
+#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+msgid "n"
+msgstr "n"
+
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+msgid "format"
+msgstr "ๆ ผๅผ"
+
+#: builtin/am.c:2264
+msgid "format the patch(es) are in"
+msgstr "ไฟฎ่ฃœๆช”็š„ๆ ผๅผ"
+
+#: builtin/am.c:2270
+msgid "override error message when patch failure occurs"
+msgstr "ๆ‰“ไฟฎ่ฃœๆช”ๅคฑๆ•—ๆ™‚้กฏ็คบ็š„้Œฏ่ชค่จŠๆฏ"
+
+#: builtin/am.c:2272
+msgid "continue applying patches after resolving a conflict"
+msgstr "่ก็ช่งฃๆฑบๅพŒ็นผ็บŒๅฅ—็”จไฟฎ่ฃœๆช”"
+
+#: builtin/am.c:2275
+msgid "synonyms for --continue"
+msgstr "ๅ’Œ --continue ๅŒ็พฉ"
+
+#: builtin/am.c:2278
+msgid "skip the current patch"
+msgstr "่ทณ้Ž็›ฎๅ‰ไฟฎ่ฃœๆช”"
+
+#: builtin/am.c:2281
+msgid "restore the original branch and abort the patching operation."
+msgstr "ๅพฉๅŽŸๅŽŸๅง‹ๅˆ†ๆ”ฏไธฆ็ต‚ๆญขๆ‰“ไฟฎ่ฃœๆช”ๅ‹•ไฝœใ€‚"
+
+#: builtin/am.c:2284
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "็ต‚ๆญขไฟฎ่ฃœๆช”ๅ‹•ไฝœไฝ†ไฟๆŒ HEAD ไธ่ฎŠใ€‚"
+
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "้กฏ็คบๆญฃๅœจๅฅ—็”จ็š„ไฟฎ่ฃœๆช”"
+
+#: builtin/am.c:2293
+msgid "lie about committer date"
+msgstr "ๅฐ‡ไฝœ่€…ๆ—ฅๆœŸไฝœ็‚บๆไบคๆ—ฅๆœŸ"
+
+#: builtin/am.c:2295
+msgid "use current timestamp for author date"
+msgstr "็”จ็›ฎๅ‰ๆ™‚้–“ไฝœ็‚บไฝœ่€…ๆ—ฅๆœŸ"
+
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+msgid "key-id"
+msgstr "key-id"
+
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+msgid "GPG-sign commits"
+msgstr "ไฝฟ็”จ GPG ็ฐฝๅๆไบค"
+
+#: builtin/am.c:2301
+msgid "(internal use for git-rebase)"
+msgstr "๏ผˆๅ…ง้ƒจไฝฟ็”จ๏ผŒ็”จๆ–ผ git-rebase๏ผ‰"
+
+#: builtin/am.c:2319
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
+msgstr ""
+"ๅƒๆ•ธ -b/--binary ๅทฒ็ถ“ๅพˆ้•ทๆ™‚้–“ไธๅšไปปไฝ•ๅฏฆ่ณชๅ‹•ไฝœไบ†๏ผŒไธฆไธ”ๅฐ‡่ขซ็งป้™คใ€‚\n"
+"่ซ‹ไธ่ฆๅ†ไฝฟ็”จๅฎƒไบ†ใ€‚"
+
+#: builtin/am.c:2326
+msgid "failed to read the index"
+msgstr "่ฎ€ๅ–็ดขๅผ•ๅคฑๆ•—"
+
+#: builtin/am.c:2341
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "ไน‹ๅ‰็š„้‡ๅฎšๅŸบๅบ•็›ฎ้Œ„ %s ไป็„ถๅญ˜ๅœจ๏ผŒไฝ†ๅปๆไพ›ไบ† mboxใ€‚"
+
+#: builtin/am.c:2365
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"็™ผ็พไบ†้Œฏ่ชค็š„ %s ็›ฎ้Œ„ใ€‚\n"
+"ไฝฟ็”จ \"git am --abort\" ๅˆช้™คๅฎƒใ€‚"
+
+#: builtin/am.c:2371
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "่งฃๆฑบๅ‹•ไฝœๆœช้€ฒ่กŒ๏ผŒๆˆ‘ๅ€‘ไธๆœƒ็นผ็บŒใ€‚"
+
+#: builtin/am.c:2381
+msgid "interactive mode requires patches on the command line"
+msgstr "ไบ’ๅ‹•ๅผๆจกๅผ้œ€่ฆๆŒ‡ไปคๅˆ—ไธŠๆไพ›ไฟฎ่ฃœๆช”"
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<้ธ้ …>] [<ไฟฎ่ฃœๆช”>...]"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ๆญธๆช”ๆช”ๆกˆ '%s'"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "ไธ่ƒฝ้‡ๅฎšๅ‘่ผธๅ‡บ"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive๏ผšๆœชๆไพ›้ ็ซฏ URL"
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive๏ผšๆœŸๆœ›ๆ˜ฏ ACK/NAK๏ผŒๅปๅพ—ๅˆฐ flush ๅŒ…"
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive๏ผšNACK %s"
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr "git archive๏ผšๅ”ๅฎš้Œฏ่ชค"
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive๏ผšๆ‡‰ๆœ‰ไธ€ๅ€‹ flush ๅŒ…"
+
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <ๅฃž-่ก“่ชž> <ๅฅฝ-่ก“่ชž>"
+
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<ๆไบค>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <็‹€ๆ…‹> <็‰ˆๆœฌ> <ๅฅฝ-่ก“่ชž> <ๅฃž-่ก“่ชž"
+">"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <ๆŒ‡ไปค> <ๅฅฝ-่ก“่ชž> <ๅฃž-่ก“่ชž>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr "git bisect--helper --bisect-next-check <ๅฅฝ-่ก“่ชž> <ๅฃž-่ก“่ชž> [<่ก“่ชž>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<่ก“่ชž> --term-{new,bad}"
+"=<่ก“่ชž>][--no-checkout] [<ๅฃž> [<ๅฅฝ>...]] [--] [<่ทฏๅพ‘>...]"
+
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„่ก“่ชž"
+
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "ไธ่ƒฝไฝฟ็”จๅ…งๅปบๆŒ‡ไปค '%s' ไฝœ็‚บ่ก“่ชž"
+
+#: builtin/bisect--helper.c:100
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "ไธ่ƒฝไฟฎๆ”น่ก“่ชž '%s' ็š„ๅซ็พฉ"
+
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
+msgstr "่ซ‹ไฝฟ็”จๅ…ฉๅ€‹ไธๅŒ็š„่ก“่ชž"
+
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿๆช”ๆกˆ BISECT_TERMS"
+
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "ๆˆ‘ๅ€‘ๆฒ’ๆœ‰ๅœจไบŒๅˆ†ๅฐ‹ๆ‰พใ€‚\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๆไบค"
+
+#: builtin/bisect--helper.c:172
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr "ไธ่ƒฝ็ฐฝๅ‡บๅŽŸๅง‹ HEAD '%s'ใ€‚ๅ˜—่ฉฆ 'git bisect reset <ๆไบค>'ใ€‚"
+
+#: builtin/bisect--helper.c:216
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "ๅฃž็š„ bisect_write ๅƒๆ•ธ๏ผš%s"
+
+#: builtin/bisect--helper.c:221
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "็„กๆณ•ๅ–ๅพ—็‰ˆๆœฌ '%s' ็š„็‰ฉไปถ ID"
+
+#: builtin/bisect--helper.c:233
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "็„กๆณ•้–‹ๅ•Ÿๆช”ๆกˆ '%s'"
+
+#: builtin/bisect--helper.c:259
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "็„กๆ•ˆ็š„ๆŒ‡ไปค๏ผšๆ‚จ็›ฎๅ‰ๆญฃ่™•ๆ–ผไธ€ๅ€‹ %s/%s ไบŒๅˆ†ๅฐ‹ๆ‰พไธญ"
+
+#: builtin/bisect--helper.c:286
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"ๆ‚จ้œ€่ฆ็ตฆๆˆ‘่‡ณๅฐ‘ไธ€ๅ€‹ %s ๅ’Œไธ€ๅ€‹ %s ็‰ˆๆœฌใ€‚\n"
+"็‚บๆญคๆ‚จๅฏไปฅ็”จ \"git bisect %s\" ๅ’Œ \"git bisect %s\"ใ€‚"
+
+#: builtin/bisect--helper.c:290
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"ๆ‚จ้œ€่ฆๅŸท่กŒ \"git bisect start\" ไพ†้–‹ๅง‹ใ€‚\n"
+"็„ถๅพŒ้œ€่ฆๆไพ›ๆˆ‘่‡ณๅฐ‘ไธ€ๅ€‹ %s ๅ’Œไธ€ๅ€‹ %s ็‰ˆๆœฌใ€‚\n"
+"็‚บๆญคๆ‚จๅฏไปฅ็”จ \"git bisect %s\" ๅ’Œ \"git bisect %s\" ๆŒ‡ไปคใ€‚"
+
+#: builtin/bisect--helper.c:310
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "ๅœจๅชๆœ‰ไธ€ๅ€‹ %s ๆไบค็š„ๆƒ…ๆณไธ‹ไบŒๅˆ†ๅฐ‹ๆ‰พ"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅฅๅฐพ็ฉบๆ ผ
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:318
+msgid "Are you sure [Y/n]? "
+msgstr "ๆ‚จ็ขบ่ชๅ—Ž[Y/n]๏ผŸ "
+
+#: builtin/bisect--helper.c:379
+msgid "no terms defined"
+msgstr "ๆœชๅฎš็พฉ่ก“่ชž"
+
+#: builtin/bisect--helper.c:382
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr "ๆ‚จ็›ฎๅ‰้‡ๅฐ่ˆŠ็‹€ๆ…‹็š„่ก“่ชžๆ˜ฏ %s๏ผŒๅฐๆ–ฐ็‹€ๆ…‹็š„่ก“่ชžๆ˜ฏ %sใ€‚\n"
+
+#: builtin/bisect--helper.c:392
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"ๆŒ‡ไปค 'git bisect terms' ็š„ๅƒๆ•ธ %s ็„กๆ•ˆใ€‚\n"
+"ๆ”ฏๆด็š„้ธ้ …ๆœ‰๏ผš--term-good|--term-old ๅ’Œ --term-bad|--term-newใ€‚"
+
+#: builtin/bisect--helper.c:478
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "ๆœช่ญ˜ๅˆฅ็š„้ธ้ …๏ผš'%s'"
+
+#: builtin/bisect--helper.c:482
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' ็œ‹่ตทไพ†ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ˆๆœฌ"
+
+#: builtin/bisect--helper.c:514
+msgid "bad HEAD - I need a HEAD"
+msgstr "ๅฃž็š„ HEAD - ๆˆ‘้œ€่ฆไธ€ๅ€‹ HEAD"
+
+#: builtin/bisect--helper.c:529
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr "็ฐฝๅ‡บ '%s' ๅคฑๆ•—ใ€‚ๅ˜—่ฉฆ 'git bisect start <ๆœ‰ๆ•ˆๅˆ†ๆ”ฏ>'ใ€‚"
+
+#: builtin/bisect--helper.c:550
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "ไธๆœƒๅœจๅšไบ† cg-seek ็š„ๆจนไธŠๅšไบŒๅˆ†ๅฐ‹ๆ‰พ"
+
+#: builtin/bisect--helper.c:553
+msgid "bad HEAD - strange symbolic ref"
+msgstr "ๅฃž็š„ HEAD - ๅฅ‡ๆ€ช็š„็ฌฆ่™Ÿๅผ•็”จ"
+
+#: builtin/bisect--helper.c:577
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "็„กๆ•ˆ็š„ๅผ•็”จ๏ผš'%s'"
+
+#: builtin/bisect--helper.c:633
+msgid "perform 'git bisect next'"
+msgstr "ๅŸท่กŒ 'git bisect next'"
+
+#: builtin/bisect--helper.c:635
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "ๅฐ‡่ก“่ชžๅฏซๅ…ฅ .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:637
+msgid "cleanup the bisection state"
+msgstr "ๆธ…้™คไบŒๅˆ†ๅฐ‹ๆ‰พ็‹€ๆ…‹"
+
+#: builtin/bisect--helper.c:639
+msgid "check for expected revs"
+msgstr "ๆชขๆŸฅ้ ๆœŸ็š„็‰ˆๆœฌ"
+
+#: builtin/bisect--helper.c:641
+msgid "reset the bisection state"
+msgstr "ๆธ…้™คไบŒๅˆ†ๅฐ‹ๆ‰พ็‹€ๆ…‹"
+
+#: builtin/bisect--helper.c:643
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "ๅฐ‡ไบŒๅˆ†ๅฐ‹ๆ‰พ็š„็‹€ๆ…‹ๅฏซๅ…ฅ BISECT_LOG"
+
+#: builtin/bisect--helper.c:645
+msgid "check and set terms in a bisection state"
+msgstr "ๅœจไธ€ๅ€‹ไบŒๅˆ†ๅฐ‹ๆ‰พ็‹€ๆ…‹ไธญๆชขๆŸฅๅ’Œ่จญๅฎš่ก“่ชž"
+
+#: builtin/bisect--helper.c:647
+msgid "check whether bad or good terms exist"
+msgstr "ๆชขๆŸฅๅฃž็š„ๆˆ–ๅฅฝ็š„่ก“่ชžๆ˜ฏๅฆๅญ˜ๅœจ"
+
+#: builtin/bisect--helper.c:649
+msgid "print out the bisect terms"
+msgstr "ๅˆ—ๅฐไบŒๅˆ†ๅฐ‹ๆ‰พ่ก“่ชž"
+
+#: builtin/bisect--helper.c:651
+msgid "start the bisect session"
+msgstr "ๅ•Ÿๅ‹•ไบŒๅˆ†ๅฐ‹ๆ‰พ้Ž็จ‹"
+
+#: builtin/bisect--helper.c:653
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "ๆ›ดๆ–ฐ BISECT_HEAD ่€Œ้ž็ฐฝๅ‡บ็›ฎๅ‰ๆไบค"
+
+#: builtin/bisect--helper.c:655
+msgid "no log for BISECT_WRITE"
+msgstr "BISECT_WRITE ็„กๆ—ฅ่ชŒ"
+
+#: builtin/bisect--helper.c:673
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms ้œ€่ฆๅ…ฉๅ€‹ๅƒๆ•ธ"
+
+#: builtin/bisect--helper.c:677
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state ไธๅธถๅƒๆ•ธ"
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset ็„ก้œ€ๅƒๆ•ธๆˆ–่€…้œ€่ฆไธ€ๅ€‹ๆไบค"
+
+#: builtin/bisect--helper.c:688
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write ้œ€่ฆ 4 ๆˆ– 5 ๅ€‹ๅƒๆ•ธ"
+
+#: builtin/bisect--helper.c:694
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--check-and-set-terms ้œ€่ฆ 3 ๅ€‹ๅƒๆ•ธ"
+
+#: builtin/bisect--helper.c:700
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check ้œ€่ฆ 2 ๆˆ– 3 ๅ€‹ๅƒๆ•ธ"
+
+#: builtin/bisect--helper.c:706
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms ้œ€่ฆ 0 ๆˆ– 1 ๅ€‹ๅƒๆ•ธ"
+
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<้ธ้ …>] [<็‰ˆๆœฌ้ธ้ …>] [<็‰ˆๆœฌ>] [--] <ๆช”ๆกˆ>"
+
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<็‰ˆๆœฌ้ธ้ …> ็š„ๆช”ๆกˆ่จ˜้Œ„ๅœจ git-rev-list(1) ไธญ"
+
+#: builtin/blame.c:409
+#, c-format
+msgid "expecting a color: %s"
+msgstr "ๆœŸๆœ›ไธ€ๅ€‹้ก่‰ฒ๏ผš%s"
+
+#: builtin/blame.c:416
+msgid "must end with a color"
+msgstr "ๅฟ…้ ˆไปฅไธ€ๅ€‹้ก่‰ฒ็ตๅฐพ"
+
+#: builtin/blame.c:729
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "่จญๅฎš color.blame.repeatedLines ไธญ็š„็„กๆ•ˆ้ก่‰ฒ '%s'"
+
+#: builtin/blame.c:747
+msgid "invalid value for blame.coloring"
+msgstr "่จญๅฎš blame.coloring ไธญ็š„็„กๆ•ˆๅ–ๅ€ผ"
+
+#: builtin/blame.c:822
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "ไธ่ƒฝๆ‰พๅˆฐ่ฆๅฟฝ็•ฅ็š„็‰ˆๆœฌ %s"
+
+#: builtin/blame.c:844
+msgid "Show blame entries as we find them, incrementally"
+msgstr "ๅขž้‡ๅผๅœฐ้กฏ็คบ็™ผ็พ็š„ blame ๆข็›ฎ"
+
+#: builtin/blame.c:845
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr "้‚Š็•Œๆไบค้กฏ็คบ็ฉบ็š„ SHA-1๏ผˆ้ ่จญ๏ผš้—œ้–‰๏ผ‰"
+
+#: builtin/blame.c:846
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr "ไธๆŠŠๆ นๆไบคไฝœ็‚บ้‚Š็•Œ๏ผˆ้ ่จญ๏ผš้—œ้–‰๏ผ‰"
+
+#: builtin/blame.c:847
+msgid "Show work cost statistics"
+msgstr "้กฏ็คบๆŒ‡ไปคๆถˆ่€—็ตฑ่จˆ"
+
+#: builtin/blame.c:848
+msgid "Force progress reporting"
+msgstr "ๅผทๅˆถ้€ฒๅบฆ้กฏ็คบ"
+
+#: builtin/blame.c:849
+msgid "Show output score for blame entries"
+msgstr "้กฏ็คบๅˆคๆ–ท blame ๆข็›ฎไฝ็งป็š„ๅพ—ๅˆ†่จบๆ–ท่จŠๆฏ"
+
+#: builtin/blame.c:850
+msgid "Show original filename (Default: auto)"
+msgstr "้กฏ็คบๅŽŸๅง‹ๆช”ๆกˆๅ๏ผˆ้ ่จญ๏ผš่‡ชๅ‹•๏ผ‰"
+
+#: builtin/blame.c:851
+msgid "Show original linenumber (Default: off)"
+msgstr "้กฏ็คบๅŽŸๅง‹็š„่กŒ่™Ÿ๏ผˆ้ ่จญ๏ผš้—œ้–‰๏ผ‰"
+
+#: builtin/blame.c:852
+msgid "Show in a format designed for machine consumption"
+msgstr "้กฏ็คบ็‚บไธ€ๅ€‹้ฉๅˆๆฉŸๅ™จ่ฎ€ๅ–็š„ๆ ผๅผ"
+
+#: builtin/blame.c:853
+msgid "Show porcelain format with per-line commit information"
+msgstr "็‚บๆฏไธ€่กŒ้กฏ็คบๆฉŸๅ™จ้ฉ็”จ็š„ๆไบค่จŠๆฏ"
+
+#: builtin/blame.c:854
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr "ไฝฟ็”จๅ’Œ git-annotate ็›ธๅŒ็š„่ผธๅ‡บๆจกๅผ๏ผˆ้ ่จญ๏ผš้—œ้–‰๏ผ‰"
+
+#: builtin/blame.c:855
+msgid "Show raw timestamp (Default: off)"
+msgstr "้กฏ็คบๅŽŸๅง‹ๆ™‚้–“ๆˆณ๏ผˆ้ ่จญ๏ผš้—œ้–‰๏ผ‰"
+
+#: builtin/blame.c:856
+msgid "Show long commit SHA1 (Default: off)"
+msgstr "้กฏ็คบ้•ท็š„ SHA1 ๆไบค่™Ÿ๏ผˆ้ ่จญ๏ผš้—œ้–‰๏ผ‰"
+
+#: builtin/blame.c:857
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr "้šฑ่—ไฝœ่€…ๅๅญ—ๅ’Œๆ™‚้–“ๆˆณ๏ผˆ้ ่จญ๏ผš้—œ้–‰๏ผ‰"
+
+#: builtin/blame.c:858
+msgid "Show author email instead of name (Default: off)"
+msgstr "้กฏ็คบไฝœ่€…็š„ไฟก็ฎฑ่€Œไธๆ˜ฏๅๅญ—๏ผˆ้ ่จญ๏ผš้—œ้–‰๏ผ‰"
+
+#: builtin/blame.c:859
+msgid "Ignore whitespace differences"
+msgstr "ๅฟฝ็•ฅ็ฉบ็™ฝๅทฎ็•ฐ"
+
+#: builtin/blame.c:860 builtin/log.c:1702
+msgid "rev"
+msgstr "็‰ˆๆœฌ"
+
+#: builtin/blame.c:860
+msgid "Ignore <rev> when blaming"
+msgstr "ๅœจๅŸท่กŒ blame ๅ‹•ไฝœๆ™‚ๅฟฝ็•ฅ <็‰ˆๆœฌ>"
+
+#: builtin/blame.c:861
+msgid "Ignore revisions from <file>"
+msgstr "ๅฟฝ็•ฅไพ†่‡ช <ๆช”ๆกˆ> ไธญ็š„็‰ˆๆœฌ"
+
+#: builtin/blame.c:862
+msgid "color redundant metadata from previous line differently"
+msgstr "ไฝฟ็”จ้ก่‰ฒ้–“้š”่ผธๅ‡บ่ˆ‡ๅ‰ไธ€่กŒไธๅŒ็š„้‡่ค‡ๅ…ƒ่จŠๆฏ"
+
+#: builtin/blame.c:863
+msgid "color lines by age"
+msgstr "ไพๆ“šๆ™‚้–“่‘—่‰ฒ"
+
+#: builtin/blame.c:864
+msgid "Spend extra cycles to find better match"
+msgstr "่Šฑ่ฒป้กๅค–็š„ๅพช็’ฐไพ†ๆ‰พๅˆฐๆ›ดๅฅฝ็š„็ฌฆๅˆ"
+
+#: builtin/blame.c:865
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr "ไฝฟ็”จไพ†่‡ช <ๆช”ๆกˆ> ็š„ไฟฎ่จ‚้›†่€Œไธๆ˜ฏๅ‘ผๅซ git-rev-list"
+
+#: builtin/blame.c:866
+msgid "Use <file>'s contents as the final image"
+msgstr "ไฝฟ็”จ <ๆช”ๆกˆ> ็š„ๅ…งๅฎนไฝœ็‚บๆœ€็ต‚็š„ๅœ–็‰‡"
+
+#: builtin/blame.c:867 builtin/blame.c:868
+msgid "score"
+msgstr "ๅพ—ๅˆ†"
+
+#: builtin/blame.c:867
+msgid "Find line copies within and across files"
+msgstr "ๆ‰พๅˆฐๆช”ๆกˆๅ…งๅŠ่ทจๆช”ๆกˆ็š„่กŒ่ค‡่ฃฝ"
+
+#: builtin/blame.c:868
+msgid "Find line movements within and across files"
+msgstr "ๆ‰พๅˆฐๆช”ๆกˆๅ…งๅŠ่ทจๆช”ๆกˆ็š„่กŒ็งปๅ‹•"
+
+#: builtin/blame.c:869
+msgid "n,m"
+msgstr "n,m"
+
+#: builtin/blame.c:869
+msgid "Process only line range n,m, counting from 1"
+msgstr "ๅช่™•็†่กŒ็ฏ„ๅœๅœจ n ๅ’Œ m ไน‹้–“็š„๏ผŒๅพž 1 ้–‹ๅง‹"
+
+#: builtin/blame.c:921
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress ไธ่ƒฝๅ’Œ --incremental ๆˆ– --porcelain ๅŒๆ™‚ไฝฟ็”จ"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:972
+msgid "4 years, 11 months ago"
+msgstr "4 ๅนด 11 ๅ€‹ๆœˆๅ‰"
+
+#: builtin/blame.c:1079
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "ๆช”ๆกˆ %s ๅชๆœ‰ %lu ่กŒ"
+
+#: builtin/blame.c:1125
+msgid "Blaming lines"
+msgstr "่ฟฝ่นค็จ‹ๅผ็ขผ่กŒ"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<้ธ้ …>] [-r | -a] [--merged | --no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<้ธ้ …>] [-l] [-f] <ๅˆ†ๆ”ฏๅ> [<่ตทๅง‹้ปž>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<้ธ้ …>] [-r] (-d | -D) <ๅˆ†ๆ”ฏๅ>..."
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<้ธ้ …>] (-m | -M) [<่ˆŠๅˆ†ๆ”ฏ>] <ๆ–ฐๅˆ†ๆ”ฏ>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<้ธ้ …>] (-c | -C) [<่€ๅˆ†ๆ”ฏ>] <ๆ–ฐๅˆ†ๆ”ฏ>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<้ธ้ …>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<้ธ้ …>] [-r | -a] [--format]"
+
+#  ่ญฏ่€…๏ผšไฟๆŒๅŽŸๆ›่กŒๆ ผๅผ๏ผŒๅœจ่ผธๅ‡บๆ™‚ %s ็š„ๆ›ฟไปฃๅ…งๅฎนๆœƒ่ฎ“ๅญ—ไธฒ่ฎŠ้•ท
+#: builtin/branch.c:154
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD."
+msgstr ""
+"ๅฐ‡่ฆๅˆช้™ค็š„ๅˆ†ๆ”ฏ '%s' ๅทฒ็ถ“่ขซๅˆไฝตๅˆฐ\n"
+"         '%s'๏ผŒไฝ†ๆœชๅˆไฝตๅˆฐ HEADใ€‚"
+
+#  ่ญฏ่€…๏ผšไฟๆŒๅŽŸๆ›่กŒๆ ผๅผ๏ผŒๅœจ่ผธๅ‡บๆ™‚ %s ็š„ๆ›ฟไปฃๅ…งๅฎนๆœƒ่ฎ“ๅญ—ไธฒ่ฎŠ้•ท
+#: builtin/branch.c:158
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD."
+msgstr ""
+"ไธฆๆœชๅˆช้™คๅˆ†ๆ”ฏ '%s'๏ผŒ ้›–็„ถๅฎƒๅทฒ็ถ“ๅˆไฝตๅˆฐ HEAD๏ผŒ\n"
+"         ็„ถ่€Œๅปๅฐšๆœช่ขซๅˆไฝตๅˆฐๅˆ†ๆ”ฏ '%s' ใ€‚"
+
+#: builtin/branch.c:172
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "็„กๆณ•ๆŸฅ่ฉข '%s' ๆŒ‡ๅ‘็š„ๆไบค็‰ฉไปถ"
+
+#: builtin/branch.c:176
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"ๅˆ†ๆ”ฏ '%s' ๆฒ’ๆœ‰ๅฎŒๅ…จๅˆไฝตใ€‚\n"
+"ๅฆ‚ๆžœๆ‚จ็ขบ่ช่ฆๅˆช้™คๅฎƒ๏ผŒๅŸท่กŒ 'git branch -D %s'ใ€‚"
+
+#: builtin/branch.c:189
+msgid "Update of config-file failed"
+msgstr "ๆ›ดๆ–ฐ่จญๅฎšๆช”ๆกˆๅคฑๆ•—"
+
+#: builtin/branch.c:220
+msgid "cannot use -a with -d"
+msgstr "ไธ่ƒฝๅฐ‡ -a ๅ’Œ -d ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/branch.c:226
+msgid "Couldn't look up commit object for HEAD"
+msgstr "็„กๆณ•ๆŸฅ่ฉข HEAD ๆŒ‡ๅ‘็š„ๆไบค็‰ฉไปถ"
+
+#: builtin/branch.c:240
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "็„กๆณ•ๅˆช้™ค็ฐฝๅ‡บๆ–ผ '%2$s' ็š„ๅˆ†ๆ”ฏ '%1$s'ใ€‚"
+
+#: builtin/branch.c:255
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "ๆœช่ƒฝๆ‰พๅˆฐ้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ '%s'ใ€‚"
+
+#: builtin/branch.c:256
+#, c-format
+msgid "branch '%s' not found."
+msgstr "ๅˆ†ๆ”ฏ '%s' ๆœช็™ผ็พใ€‚"
+
+#: builtin/branch.c:271
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "็„กๆณ•ๅˆช้™ค้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ '%s'"
+
+#: builtin/branch.c:272
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "็„กๆณ•ๅˆช้™คๅˆ†ๆ”ฏ '%s'"
+
+#: builtin/branch.c:279
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "ๅทฒๅˆช้™ค้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ %s๏ผˆๆ›พ็‚บ %s๏ผ‰ใ€‚\n"
+
+#: builtin/branch.c:280
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "ๅทฒๅˆช้™คๅˆ†ๆ”ฏ %s๏ผˆๆ›พ็‚บ %s๏ผ‰ใ€‚\n"
+
+#: builtin/branch.c:429 builtin/tag.c:61
+msgid "unable to parse format string"
+msgstr "ไธ่ƒฝ่งฃๆžๆ ผๅผๅŒ–ๅญ—ไธฒ"
+
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "ไธ่ƒฝ่งฃๆž HEAD ๆไบค"
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) ๆŒ‡ๅ‘ refs/heads/ ไน‹ๅค–"
+
+#: builtin/branch.c:481
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "ๅˆ†ๆ”ฏ %s ๆญฃ่ขซ้‡ๅฎšๅŸบๅบ•ๅˆฐ %s"
+
+#: builtin/branch.c:485
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "ๅˆ†ๆ”ฏ %s ๆญฃ่ขซไบŒๅˆ†ๅฐ‹ๆ‰พๆ–ผ %s"
+
+#: builtin/branch.c:502
+msgid "cannot copy the current branch while not on any."
+msgstr "็„กๆณ•่ค‡่ฃฝ็›ฎๅ‰ๅˆ†ๆ”ฏๅ› ็‚บไธ่™•ๆ–ผไปปไฝ•ๅˆ†ๆ”ฏไธŠใ€‚"
+
+#: builtin/branch.c:504
+msgid "cannot rename the current branch while not on any."
+msgstr "็„กๆณ•้‡ๆ–ฐๅ‘ฝๅ็›ฎๅ‰ๅˆ†ๆ”ฏๅ› ็‚บไธ่™•ๆ–ผไปปไฝ•ๅˆ†ๆ”ฏไธŠใ€‚"
+
+#: builtin/branch.c:515
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "็„กๆ•ˆ็š„ๅˆ†ๆ”ฏๅ๏ผš'%s'"
+
+#: builtin/branch.c:542
+msgid "Branch rename failed"
+msgstr "ๅˆ†ๆ”ฏ้‡ๆ–ฐๅ‘ฝๅๅคฑๆ•—"
+
+#: builtin/branch.c:544
+msgid "Branch copy failed"
+msgstr "ๅˆ†ๆ”ฏ่ค‡่ฃฝๅคฑๆ•—"
+
+#: builtin/branch.c:548
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "ๅทฒ็‚บ้Œฏ่ชคๅ‘ฝๅ็š„ๅˆ†ๆ”ฏ '%s' ๅปบ็ซ‹ไบ†ไธ€ๅ€‹ๅ‰ฏๆœฌ"
+
+#: builtin/branch.c:551
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "ๅทฒๅฐ‡้Œฏ่ชคๅ‘ฝๅ็š„ๅˆ†ๆ”ฏ '%s' ้‡ๆ–ฐๅ‘ฝๅ"
+
+#: builtin/branch.c:557
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "ๅˆ†ๆ”ฏ้‡ๆ–ฐๅ‘ฝๅ็‚บ %s๏ผŒไฝ† HEAD ๆฒ’ๆœ‰ๆ›ดๆ–ฐ๏ผ"
+
+#: builtin/branch.c:566
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "ๅˆ†ๆ”ฏ่ขซ้‡ๆ–ฐๅ‘ฝๅ๏ผŒไฝ†ๆ›ดๆ–ฐ่จญๅฎšๆช”ๆกˆๅคฑๆ•—"
+
+#: builtin/branch.c:568
+msgid "Branch is copied, but update of config-file failed"
+msgstr "ๅˆ†ๆ”ฏๅทฒ่ค‡่ฃฝ๏ผŒไฝ†ๆ›ดๆ–ฐ่จญๅฎšๆช”ๆกˆๅคฑๆ•—"
+
+#: builtin/branch.c:584
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"่ซ‹็ทจ่ผฏๅˆ†ๆ”ฏ็š„ๆ่ฟฐ\n"
+"  %s\n"
+"ไปฅ '%c' ้–‹้ ญ็š„่กŒๅฐ‡่ขซ้Žๆฟพใ€‚\n"
+
+#: builtin/branch.c:618
+msgid "Generic options"
+msgstr "้€š็”จ้ธ้ …"
+
+#: builtin/branch.c:620
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "้กฏ็คบ้›œๆนŠๅ€ผๅ’Œไธป้กŒ๏ผŒ่‹ฅๅƒๆ•ธๅ‡บ็พๅ…ฉๆฌกๅ‰‡้กฏ็คบไธŠๆธธๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:621
+msgid "suppress informational messages"
+msgstr "ไธ้กฏ็คบ่จŠๆฏ"
+
+#: builtin/branch.c:622
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "่จญๅฎš่ฟฝ่นคๆจกๅผ๏ผˆๅƒ่ฆ‹ git-pull(1)๏ผ‰"
+
+#: builtin/branch.c:624
+msgid "do not use"
+msgstr "ไธ่ฆไฝฟ็”จ"
+
+#: builtin/branch.c:626 builtin/rebase.c:513
+msgid "upstream"
+msgstr "ไธŠๆธธ"
+
+#: builtin/branch.c:626
+msgid "change the upstream info"
+msgstr "ๆ”น่ฎŠไธŠๆธธ่จŠๆฏ"
+
+#: builtin/branch.c:627
+msgid "unset the upstream info"
+msgstr "ๅ–ๆถˆไธŠๆธธ่ณ‡่จŠ่จญๅฎš"
+
+#: builtin/branch.c:628
+msgid "use colored output"
+msgstr "ไฝฟ็”จๅฝฉ่‰ฒ่ผธๅ‡บ"
+
+#: builtin/branch.c:629
+msgid "act on remote-tracking branches"
+msgstr "ไฝœ็”จๆ–ผ้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:631 builtin/branch.c:633
+msgid "print only branches that contain the commit"
+msgstr "ๅชๅˆ—ๅฐๅŒ…ๅซ่ฉฒๆไบค็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:632 builtin/branch.c:634
+msgid "print only branches that don't contain the commit"
+msgstr "ๅชๅˆ—ๅฐไธๅŒ…ๅซ่ฉฒๆไบค็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:637
+msgid "Specific git-branch actions:"
+msgstr "ๅ…ท้ซ”็š„ git-branch ๅ‹•ไฝœ๏ผš"
+
+#: builtin/branch.c:638
+msgid "list both remote-tracking and local branches"
+msgstr "ๅˆ—ๅ‡บ้ ็ซฏ่ฟฝ่นคๅŠๆœฌๆฉŸๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:640
+msgid "delete fully merged branch"
+msgstr "ๅˆช้™คๅฎŒๅ…จๅˆไฝต็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:641
+msgid "delete branch (even if not merged)"
+msgstr "ๅˆช้™คๅˆ†ๆ”ฏ๏ผˆๅณไฝฟๆฒ’ๆœ‰ๅˆไฝต๏ผ‰"
+
+#: builtin/branch.c:642
+msgid "move/rename a branch and its reflog"
+msgstr "็งปๅ‹•/้‡ๆ–ฐๅ‘ฝๅไธ€ๅ€‹ๅˆ†ๆ”ฏ๏ผŒไปฅๅŠๅฎƒ็š„ๅผ•็”จๆ—ฅ่ชŒ"
+
+#: builtin/branch.c:643
+msgid "move/rename a branch, even if target exists"
+msgstr "็งปๅ‹•/้‡ๆ–ฐๅ‘ฝๅไธ€ๅ€‹ๅˆ†ๆ”ฏ๏ผŒๅณไฝฟ็›ฎๆจ™ๅทฒๅญ˜ๅœจ"
+
+#: builtin/branch.c:644
+msgid "copy a branch and its reflog"
+msgstr "่ค‡่ฃฝไธ€ๅ€‹ๅˆ†ๆ”ฏๅ’Œๅฎƒ็š„ๅผ•็”จๆ—ฅ่ชŒ"
+
+#: builtin/branch.c:645
+msgid "copy a branch, even if target exists"
+msgstr "่ค‡่ฃฝไธ€ๅ€‹ๅˆ†ๆ”ฏ๏ผŒๅณไฝฟ็›ฎๆจ™ๅทฒๅญ˜ๅœจ"
+
+#: builtin/branch.c:646
+msgid "list branch names"
+msgstr "ๅˆ—ๅ‡บๅˆ†ๆ”ฏๅ"
+
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "้กฏ็คบ็›ฎๅ‰ๅˆ†ๆ”ฏๅ"
+
+#: builtin/branch.c:648
+msgid "create the branch's reflog"
+msgstr "ๅปบ็ซ‹ๅˆ†ๆ”ฏ็š„ๅผ•็”จๆ—ฅ่ชŒ"
+
+#: builtin/branch.c:650
+msgid "edit the description for the branch"
+msgstr "ๆจ™่จ˜ๅˆ†ๆ”ฏ็š„ๆ่ฟฐ"
+
+#: builtin/branch.c:651
+msgid "force creation, move/rename, deletion"
+msgstr "ๅผทๅˆถๅปบ็ซ‹ใ€็งปๅ‹•/้‡ๆ–ฐๅ‘ฝๅใ€ๅˆช้™ค"
+
+#: builtin/branch.c:652
+msgid "print only branches that are merged"
+msgstr "ๅชๅˆ—ๅฐๅทฒ็ถ“ๅˆไฝต็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:653
+msgid "print only branches that are not merged"
+msgstr "ๅชๅˆ—ๅฐๅฐšๆœชๅˆไฝต็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:654
+msgid "list branches in columns"
+msgstr "ไปฅๅˆ—็š„ๆ–นๅผ้กฏ็คบๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:433
+msgid "object"
+msgstr "็‰ฉไปถ"
+
+#: builtin/branch.c:658
+msgid "print only branches of the object"
+msgstr "ๅชๅˆ—ๅฐๆŒ‡ๅ‘่ฉฒ็‰ฉไปถ็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+msgid "sorting and filtering are case insensitive"
+msgstr "ๆŽ’ๅบๅ’Œ้Žๆฟพๅฑฌๆ–ผๅคงๅฐๅฏซไธๆ•ๆ„Ÿ"
+
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "่ผธๅ‡บๆ ผๅผ"
+
+#: builtin/branch.c:684 builtin/clone.c:785
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD ๆฒ’ๆœ‰ไฝๆ–ผ /refs/heads ไน‹ไธ‹๏ผ"
+
+#: builtin/branch.c:708
+msgid "--column and --verbose are incompatible"
+msgstr "--column ๅ’Œ --verbose ไธ็›ธๅฎน"
+
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+msgid "branch name required"
+msgstr "ๅฟ…้ ˆๆไพ›ๅˆ†ๆ”ฏๅ"
+
+#: builtin/branch.c:753
+msgid "Cannot give description to detached HEAD"
+msgstr "ไธ่ƒฝๅ‘ๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™ๆไพ›ๆ่ฟฐ"
+
+#: builtin/branch.c:758
+msgid "cannot edit description of more than one branch"
+msgstr "ไธ่ƒฝ็‚บไธ€ๅ€‹ไปฅไธŠ็š„ๅˆ†ๆ”ฏ็ทจ่ผฏๆ่ฟฐ"
+
+#: builtin/branch.c:765
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "ๅˆ†ๆ”ฏ '%s' ๅฐš็„กๆไบคใ€‚"
+
+#: builtin/branch.c:768
+#, c-format
+msgid "No branch named '%s'."
+msgstr "ๆฒ’ๆœ‰ๅˆ†ๆ”ฏ '%s'ใ€‚"
+
+#: builtin/branch.c:783
+msgid "too many branches for a copy operation"
+msgstr "็‚บ่ค‡่ฃฝๅ‹•ไฝœๆไพ›ไบ†ๅคชๅคš็š„ๅˆ†ๆ”ฏๅ"
+
+#: builtin/branch.c:792
+msgid "too many arguments for a rename operation"
+msgstr "็‚บ้‡ๆ–ฐๅ‘ฝๅๅ‹•ไฝœๆไพ›ไบ†ๅคชๅคš็š„ๅƒๆ•ธ"
+
+#: builtin/branch.c:797
+msgid "too many arguments to set new upstream"
+msgstr "็‚บ่จญๅฎšๆ–ฐไธŠๆธธๆไพ›ไบ†ๅคชๅคš็š„ๅƒๆ•ธ"
+
+#: builtin/branch.c:801
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr "็„กๆณ•่จญๅฎš HEAD ็š„ไธŠๆธธ็‚บ %s๏ผŒๅ› ็‚บ HEAD ๆฒ’ๆœ‰ๆŒ‡ๅ‘ไปปไฝ•ๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/branch.c:804 builtin/branch.c:827
+#, c-format
+msgid "no such branch '%s'"
+msgstr "ๆฒ’ๆœ‰ๆญคๅˆ†ๆ”ฏ '%s'"
+
+#: builtin/branch.c:808
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "ๅˆ†ๆ”ฏ '%s' ไธๅญ˜ๅœจ"
+
+#: builtin/branch.c:821
+msgid "too many arguments to unset upstream"
+msgstr "็‚บๅ–ๆถˆไธŠๆธธ่จญๅฎšๅ‹•ไฝœๆไพ›ไบ†ๅคชๅคš็š„ๅƒๆ•ธ"
+
+#: builtin/branch.c:825
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr "็„กๆณ•ๅ–ๆถˆ HEAD ็š„ไธŠๆธธ่จญๅฎšๅ› ็‚บๅฎƒๆฒ’ๆœ‰ๆŒ‡ๅ‘ไธ€ๅ€‹ๅˆ†ๆ”ฏ"
+
+#: builtin/branch.c:831
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "ๅˆ†ๆ”ฏ '%s' ๆฒ’ๆœ‰ไธŠๆธธ่จŠๆฏ"
+
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
+msgstr ""
+"'git branch' ็š„ -a ๅ’Œ -r ้ธ้ …ไธๅธถไธ€ๅ€‹ๅˆ†ๆ”ฏๅใ€‚\n"
+"ๆ‚จๆ˜ฏๅฆๆƒณ่ฆไฝฟ็”จ๏ผš-a|-r --list <ๆจกๅผ>๏ผŸ"
+
+#: builtin/branch.c:845
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+"ไธๅ†ๆ”ฏๆด้ธ้ … '--set-upstream'ใ€‚่ซ‹ไฝฟ็”จ '--track' ๆˆ– '--set-upstream-to'ใ€‚"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<้ธ้ …>] <ๆช”ๆกˆ> <git-rev-list ๅƒๆ•ธ>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<้ธ้ …>] <ๆช”ๆกˆ>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <ๆช”ๆกˆ> [<ๅƒ่€ƒๅ็จฑ>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <ๆช”ๆกˆ> [<ๅƒ่€ƒๅ็จฑ>...]"
+
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+msgid "do not show progress meter"
+msgstr "ไธ้กฏ็คบ้€ฒๅบฆ่กจ"
+
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+msgid "show progress meter"
+msgstr "้กฏ็คบ้€ฒๅบฆ่กจ"
+
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+msgid "show progress meter during object writing phase"
+msgstr "ๅœจ็‰ฉไปถๅฏซๅ…ฅ้šŽๆฎต้กฏ็คบ้€ฒๅบฆ่กจ"
+
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "็•ถ้€ฒๅบฆ่กจ้กฏ็คบๆ™‚้กžไผผๆ–ผ --all-progress"
+
+#: builtin/bundle.c:93
+msgid "Need a repository to create a bundle."
+msgstr "้œ€่ฆไธ€ๅ€‹็‰ˆๆœฌๅบซไพ†ๅปบ็ซ‹ๅŒ…ใ€‚"
+
+#: builtin/bundle.c:104
+msgid "do not show bundle details"
+msgstr "ไธ้กฏ็คบๅŒ… (bundle) ่ฉณ็ดฐ่ณ‡่จŠ"
+
+#: builtin/bundle.c:119
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s ๅฏไปฅ\n"
+
+#: builtin/bundle.c:160
+msgid "Need a repository to unbundle."
+msgstr "้œ€่ฆไธ€ๅ€‹็‰ˆๆœฌๅบซไพ†่งฃๅŒ…ใ€‚"
+
+#: builtin/bundle.c:168 builtin/remote.c:1686
+msgid "be verbose; must be placed before a subcommand"
+msgstr "่ฉณ็ดฐ่ผธๅ‡บ๏ผ›ๅฟ…้ ˆ็ฝฎๆ–ผๅญๆŒ‡ไปคไน‹ๅ‰"
+
+#: builtin/bundle.c:190 builtin/remote.c:1717
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "ๆœช็ŸฅๅญๆŒ‡ไปค๏ผš%s"
+
+#: builtin/cat-file.c:595
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <้กžๅž‹> | --textconv | --filters) [--path=<่ทฏๅพ‘>] <็‰ฉไปถ>"
+
+#: builtin/cat-file.c:596
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+
+#: builtin/cat-file.c:617
+msgid "only one batch option may be specified"
+msgstr "ๅช่ƒฝๆŒ‡ๅฎšไธ€ๅ€‹ๆ‰นๆฌก่™•็†้ธ้ …"
+
+#: builtin/cat-file.c:635
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<้กžๅž‹> ๅฏไปฅๆ˜ฏๅ…ถไธญไน‹ไธ€๏ผšblobใ€treeใ€commitใ€tag"
+
+#: builtin/cat-file.c:636
+msgid "show object type"
+msgstr "้กฏ็คบ็‰ฉไปถ้กžๅž‹"
+
+#: builtin/cat-file.c:637
+msgid "show object size"
+msgstr "้กฏ็คบ็‰ฉไปถๅคงๅฐ"
+
+#: builtin/cat-file.c:639
+msgid "exit with zero when there's no error"
+msgstr "็•ถๆฒ’ๆœ‰้Œฏ่ชคๆ™‚้›ข้–‹ไธฆ่ฟ”ๅ›ž้›ถ"
+
+#: builtin/cat-file.c:640
+msgid "pretty-print object's content"
+msgstr "็พŽ่ง€ๅœฐๅˆ—ๅฐ็‰ฉไปถ็š„ๅ…งๅฎน"
+
+#: builtin/cat-file.c:642
+msgid "for blob objects, run textconv on object's content"
+msgstr "ๅฐๆ–ผ่ณ‡ๆ–™็‰ฉไปถ๏ผŒๅฐๅ…ถๅ…งๅฎนๅšๆ–‡ๅญ—่ฝ‰ๆ›"
+
+#: builtin/cat-file.c:644
+msgid "for blob objects, run filters on object's content"
+msgstr "ๅฐๆ–ผ่ณ‡ๆ–™็‰ฉไปถ๏ผŒๅฐๅ…ถๅ…งๅฎนๅš้Žๆฟพ"
+
+#: builtin/cat-file.c:645 git-submodule.sh:1002
+msgid "blob"
+msgstr "่ณ‡ๆ–™็‰ฉไปถ"
+
+#: builtin/cat-file.c:646
+msgid "use a specific path for --textconv/--filters"
+msgstr "ๅฐๆ–ผ --textconv/--filters ไฝฟ็”จไธ€ๅ€‹็‰นๅฎš็š„่ทฏๅพ‘"
+
+#: builtin/cat-file.c:648
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "ๅ…่จฑ -s ๅ’Œ -t ๅฐๆๅฃž็š„็‰ฉไปถ็”Ÿๆ•ˆ"
+
+#: builtin/cat-file.c:649
+msgid "buffer --batch output"
+msgstr "็ทฉ่ก --batch ็š„่ผธๅ‡บ"
+
+#: builtin/cat-file.c:651
+msgid "show info and content of objects fed from the standard input"
+msgstr "้กฏ็คบๅพžๆจ™ๆบ–่ผธๅ…ฅๆไพ›็š„็‰ฉไปถ็š„่จŠๆฏๅ’Œๅ…งๅฎน"
+
+#: builtin/cat-file.c:655
+msgid "show info about objects fed from the standard input"
+msgstr "้กฏ็คบๅพžๆจ™ๆบ–่ผธๅ…ฅๆไพ›็š„็‰ฉไปถ็š„่จŠๆฏ"
+
+#: builtin/cat-file.c:659
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr "่ทŸ้šจๆจนๅ…ง็ฌฆ่™Ÿ้€ฃ็ต๏ผˆๅ’Œ --batch ๆˆ– --batch-check ๅ…ฑ็”จ๏ผ‰"
+
+#: builtin/cat-file.c:661
+msgid "show all objects with --batch or --batch-check"
+msgstr "ไฝฟ็”จ --batch ๆˆ– --batch-check ๅƒๆ•ธ้กฏ็คบๆ‰€ๆœ‰็‰ฉไปถ"
+
+#: builtin/cat-file.c:663
+msgid "do not order --batch-all-objects output"
+msgstr "ไธ่ฆๅฐ --batch-all-objects ็š„่ผธๅ‡บๆŽ’ๅบ"
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <ๅฑฌๆ€ง>...] [--] <่ทฏๅพ‘ๅ>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <ๅฑฌๆ€ง>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "ๅ ฑๅ‘Š่จญๅฎšๅœจๆช”ๆกˆไธŠ็š„ๆ‰€ๆœ‰ๅฑฌๆ€ง"
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr "ๅชไฝฟ็”จ็ดขๅผ•ไธญ็š„ .gitattributes"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ‡บๆช”ๆกˆๅ"
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr "่ผธๅ…ฅๅ’Œ่ผธๅ‡บ็š„็ด€้Œ„ไฝฟ็”จ NUL ๅญ—ๅ…ƒ็ต‚็ต"
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
+msgid "suppress progress reporting"
+msgstr "ไธ้กฏ็คบ้€ฒๅบฆๅ ฑๅ‘Š"
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr "้กฏ็คบๆœช็ฌฆๅˆ็š„่ผธๅ…ฅ่ทฏๅพ‘"
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr "ๆชขๆŸฅๆ™‚ๅฟฝ็•ฅ็ดขๅผ•"
+
+#: builtin/check-ignore.c:163
+msgid "cannot specify pathnames with --stdin"
+msgstr "ไธ่ƒฝๅŒๆ™‚ๆŒ‡ๅฎš่ทฏๅพ‘ๅŠ --stdin ๅƒๆ•ธ"
+
+#: builtin/check-ignore.c:166
+msgid "-z only makes sense with --stdin"
+msgstr "-z ้œ€่ฆๅ’Œ --stdin ๅƒๆ•ธๅ…ฑ็”จๆ‰ๆœ‰ๆ„็พฉ"
+
+#: builtin/check-ignore.c:168
+msgid "no path specified"
+msgstr "ๆœชๆŒ‡ๅฎš่ทฏๅพ‘"
+
+#: builtin/check-ignore.c:172
+msgid "--quiet is only valid with a single pathname"
+msgstr "ๅƒๆ•ธ --quiet ๅชๅœจๆไพ›ไธ€ๅ€‹่ทฏๅพ‘ๅๆ™‚ๆœ‰ๆ•ˆ"
+
+#: builtin/check-ignore.c:174
+msgid "cannot have both --quiet and --verbose"
+msgstr "ไธ่ƒฝๅŒๆ™‚ๆไพ› --quiet ๅ’Œ --verbose ๅƒๆ•ธ"
+
+#: builtin/check-ignore.c:177
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching ้ธ้ …ๅชๅœจไฝฟ็”จ --verbose ๆ™‚ๆœ‰ๆ•ˆ"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<้ธ้ …>] <่ฏ็นซไฝๅ€>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "้‚„ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–่ฏ็นซไฝๅ€"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "ไธ่ƒฝ่งฃๆž่ฏ็นซไฝๅ€๏ผš%s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "ๆœชๆŒ‡ๅฎš่ฏ็นซไฝๅ€"
+
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<้ธ้ …>] [--] [<ๆช”ๆกˆ>...]"
+
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
+msgstr "็ดขๅผ•ๅ€ผๆ‡‰่ฉฒๅ–ๅ€ผ 1 ๅˆฐ 3 ๆˆ–่€… all"
+
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
+msgstr "็ฐฝๅ‡บ็ดขๅผ•ๅ€็š„ๆ‰€ๆœ‰ๆช”ๆกˆ"
+
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
+msgstr "ๅผทๅˆถ่ฆ†่“‹็พๆœ‰็š„ๆช”ๆกˆ"
+
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
+msgstr "ๅญ˜ๅœจๆˆ–ไธๅœจ็ดขๅผ•ไธญ็š„ๆช”ๆกˆ้ƒฝๆฒ’ๆœ‰่ญฆๅ‘Š"
+
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
+msgstr "ไธ็ฐฝๅ‡บๆ–ฐๆช”ๆกˆ"
+
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
+msgstr "ๆ›ดๆ–ฐ็ดขๅผ•ไธญๆช”ๆกˆ็š„็‹€ๆ…‹่จŠๆฏ"
+
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–่ทฏๅพ‘ๅˆ—่กจ"
+
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
+msgstr "ๅฐ‡ๅ…งๅฎนๅฏซๅ…ฅๆšซๅญ˜ๆช”"
+
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
+msgid "string"
+msgstr "ๅญ—ไธฒ"
+
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
+msgstr "ๅœจๅปบ็ซ‹ๆช”ๆกˆๆ™‚๏ผŒๅœจๅ‰้ขๅŠ ไธŠ <ๅญ—ไธฒ>"
+
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
+msgstr "ๅพžๆŒ‡ๅฎšๆšซๅญ˜ๅ€ไธญๆ‹ทๅ‡บๆช”ๆกˆ"
+
+#: builtin/checkout.c:31
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<้ธ้ …>] <ๅˆ†ๆ”ฏ>"
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<้ธ้ …>] [<ๅˆ†ๆ”ฏ>] -- <ๆช”ๆกˆ>..."
+
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<้ธ้ …>] [<ๅˆ†ๆ”ฏ>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<้ธ้ …>] [--source=<ๅˆ†ๆ”ฏ>] <ๆช”ๆกˆ>..."
+
+#: builtin/checkout.c:175 builtin/checkout.c:214
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "่ทฏๅพ‘ '%s' ๆฒ’ๆœ‰ๆˆ‘ๅ€‘็š„็‰ˆๆœฌ"
+
+#: builtin/checkout.c:177 builtin/checkout.c:216
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "่ทฏๅพ‘ '%s' ๆฒ’ๆœ‰ไป–ๅ€‘็š„็‰ˆๆœฌ"
+
+#: builtin/checkout.c:193
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "่ทฏๅพ‘ '%s' ๆฒ’ๆœ‰ๅ…จ้ƒจๅฟ…้œ€็š„็‰ˆๆœฌ"
+
+#: builtin/checkout.c:243
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "่ทฏๅพ‘ '%s' ๆฒ’ๆœ‰ๅฟ…้œ€็š„็‰ˆๆœฌ"
+
+#: builtin/checkout.c:261
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "path '%s'๏ผš็„กๆณ•ๅˆไฝต"
+
+#: builtin/checkout.c:277
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "็„กๆณ•็‚บ '%s' ๆ–ฐๅขžๅˆไฝต็ตๆžœ"
+
+#: builtin/checkout.c:377
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "้‡ๆ–ฐๅปบ็ซ‹ไบ† %d ๅ€‹ๅˆไฝต่ก็ช"
+
+#: builtin/checkout.c:382
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "ๅพž %2$s ๆ›ดๆ–ฐไบ† %1$d ๅ€‹่ทฏๅพ‘"
+
+#: builtin/checkout.c:389
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "ๅพž็ดขๅผ•ๅ€ๆ›ดๆ–ฐไบ† %d ๅ€‹่ทฏๅพ‘"
+
+#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
+#: builtin/checkout.c:422
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' ไธ่ƒฝๅœจๆ›ดๆ–ฐ่ทฏๅพ‘ๆ™‚ไฝฟ็”จ"
+
+#: builtin/checkout.c:425 builtin/checkout.c:428
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' ไธ่ƒฝๅ’Œ %s ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/checkout.c:432
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "ไธ่ƒฝๅŒๆ™‚ๆ›ดๆ–ฐ่ทฏๅพ‘ไธฆๅˆ‡ๆ›ๅˆฐๅˆ†ๆ”ฏ'%s'ใ€‚"
+
+#: builtin/checkout.c:436
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "'%s' ๆˆ– '%s' ้ƒฝๆฒ’ๆœ‰ๆŒ‡ๅฎš"
+
+#: builtin/checkout.c:440
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "ๆœชๆŒ‡ๅฎš '%2$s' ๆ™‚๏ผŒๅฟ…้ ˆไฝฟ็”จ '%1$s'"
+
+#: builtin/checkout.c:445 builtin/checkout.c:450
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' ๆˆ– '%s' ไธ่ƒฝๅ’Œ %s ไธ€่ตทไฝฟ็”จ"
+
+#: builtin/checkout.c:509 builtin/checkout.c:516
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "่ทฏๅพ‘ '%s' ๆœชๅˆไฝต"
+
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+msgid "you need to resolve your current index first"
+msgstr "ๆ‚จ้œ€่ฆๅ…ˆ่งฃๆฑบ็›ฎๅ‰็ดขๅผ•็š„่ก็ช"
+
+#: builtin/checkout.c:734
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"ไธ่ƒฝ็นผ็บŒ๏ผŒไธ‹ๅˆ—ๆช”ๆกˆๆœ‰ๆšซๅญ˜็š„ไฟฎๆ”น๏ผš\n"
+"%s"
+
+#: builtin/checkout.c:837
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "ไธ่ƒฝๅฐ '%s' ๅŸท่กŒ reflog ๅ‹•ไฝœ๏ผš%s\n"
+
+#: builtin/checkout.c:879
+msgid "HEAD is now at"
+msgstr "HEAD ็›ฎๅ‰ไฝๆ–ผ"
+
+#: builtin/checkout.c:883 builtin/clone.c:717
+msgid "unable to update HEAD"
+msgstr "ไธ่ƒฝๆ›ดๆ–ฐ HEAD"
+
+#: builtin/checkout.c:887
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "้‡่จญๅˆ†ๆ”ฏ '%s'\n"
+
+#: builtin/checkout.c:890
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "ๅทฒ็ถ“ไฝๆ–ผ '%s'\n"
+
+#: builtin/checkout.c:894
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "ๅˆ‡ๆ›ไธฆ้‡่จญๅˆ†ๆ”ฏ '%s'\n"
+
+#: builtin/checkout.c:896 builtin/checkout.c:1320
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "ๅˆ‡ๆ›ๅˆฐไธ€ๅ€‹ๆ–ฐๅˆ†ๆ”ฏ '%s'\n"
+
+#: builtin/checkout.c:898
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "ๅˆ‡ๆ›ๅˆฐๅˆ†ๆ”ฏ '%s'\n"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/checkout.c:949
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... ๅŠๅ…ถๅฎƒ %d ๅ€‹ใ€‚\n"
+
+#: builtin/checkout.c:955
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"่ญฆๅ‘Š๏ผšๆ‚จๆญฃไธŸไธ‹ %d ๅ€‹ๆไบค๏ผŒๆœชๅ’Œไปปไฝ•ๅˆ†ๆ”ฏ้—œ่ฏ๏ผš\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:974
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"ๅฆ‚ๆžœๆ‚จๆƒณ่ฆ้€้Žๅปบ็ซ‹ๆ–ฐๅˆ†ๆ”ฏๅ„ฒๅญ˜ๅฎƒ๏ผŒ้€™ๅฏ่ƒฝๆ˜ฏไธ€ๅ€‹ๅฅฝๆ™‚ๅ€™ใ€‚\n"
+"ๅฆ‚ไธ‹ๅ‹•ไฝœ๏ผš\n"
+"\n"
+" git branch <ๆ–ฐๅˆ†ๆ”ฏๅ> %s\n"
+"\n"
+
+#: builtin/checkout.c:1009
+msgid "internal error in revision walk"
+msgstr "ๅœจ็‰ˆๆœฌ้ๆญทๆ™‚้‡ๅˆฐๅ…ง้ƒจ้Œฏ่ชค"
+
+#: builtin/checkout.c:1013
+msgid "Previous HEAD position was"
+msgstr "ไน‹ๅ‰็š„ HEAD ไฝ็ฝฎๆ˜ฏ"
+
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
+msgid "You are on a branch yet to be born"
+msgstr "ๆ‚จไฝๆ–ผไธ€ๅ€‹ๅฐšๆœชๅˆๅง‹ๅŒ–็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1128
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"'%s' ๆ—ขๅฏไปฅๆ˜ฏไธ€ๅ€‹ๆœฌๆฉŸๆช”ๆกˆ๏ผŒไนŸๅฏไปฅๆ˜ฏไธ€ๅ€‹่ฟฝ่นคๅˆ†ๆ”ฏใ€‚\n"
+"่ซ‹ไฝฟ็”จ --๏ผˆๅ’Œๅฏ้ธ็š„ --no-guess๏ผ‰ไพ†ๆถˆ้™คๆญง็พฉ"
+
+#: builtin/checkout.c:1135
+msgid ""
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"ๅฆ‚ๆžœๆ‚จๆƒณ่ฆ็ฐฝๅ‡บไธ€ๅ€‹้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ๏ผŒไพ‹ๅฆ‚ 'origin'๏ผŒๆ‚จๅฏไปฅ\n"
+"ไฝฟ็”จ --track ้ธ้ …ๅฏซๅ‡บๅ…จๅ๏ผš\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"ๅฆ‚ๆžœๆ‚จ็ธฝๆ˜ฏๅ–œๆญกไฝฟ็”จๆจก็ณŠ็š„็ฐก็Ÿญๅˆ†ๆ”ฏๅ <name>๏ผŒ่€Œไธๅ–œๆญกๅฆ‚ 'origin' ็š„้ ็ซฏ\n"
+"็‰ˆๆœฌๅบซๅ๏ผŒๅฏไปฅๅœจ่จญๅฎšไธญ่จญๅฎš checkout.defaultRemote=originใ€‚"
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' ็ฌฆๅˆๅคšๅ€‹ (%d) ้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "้ ๆœŸๅชๆœ‰ไธ€ๅ€‹ๅผ•็”จ"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "ๆ‡‰ๅชๆœ‰ไธ€ๅ€‹ๅผ•็”จ๏ผŒๅป็ตฆๅ‡บไบ† %d ๅ€‹"
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#, c-format
+msgid "invalid reference: %s"
+msgstr "็„กๆ•ˆๅผ•็”จ๏ผš%s"
+
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "ๅผ•็”จไธๆ˜ฏไธ€ๅ€‹ๆจน๏ผš%s"
+
+#: builtin/checkout.c:1334
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "ๆœŸๆœ›ไธ€ๅ€‹ๅˆ†ๆ”ฏ๏ผŒๅพ—ๅˆฐๆจ™็ฑค '%s'"
+
+#: builtin/checkout.c:1336
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "ๆœŸๆœ›ไธ€ๅ€‹ๅˆ†ๆ”ฏ๏ผŒๅพ—ๅˆฐ้ ็ซฏๅˆ†ๆ”ฏ '%s'"
+
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "ๆœŸๆœ›ไธ€ๅ€‹ๅˆ†ๆ”ฏ๏ผŒๅพ—ๅˆฐ '%s'"
+
+#: builtin/checkout.c:1340
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "ๆœŸๆœ›ไธ€ๅ€‹ๅˆ†ๆ”ฏ๏ผŒๅพ—ๅˆฐๆไบค '%s'"
+
+#: builtin/checkout.c:1356
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"ไธ่ƒฝๅœจๅˆไฝตๆ™‚ๅˆ‡ๆ›ๅˆ†ๆ”ฏ\n"
+"่€ƒๆ…ฎไฝฟ็”จ \"git merge --quit\" ๆˆ– \"git worktree add\"ใ€‚"
+
+#: builtin/checkout.c:1360
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"ไธ่ƒฝๅœจ am ๅทฅไฝœ้šŽๆฎตๆœŸ้–“ๅˆ‡ๆ›ๅˆ†ๆ”ฏ\n"
+"่€ƒๆ…ฎไฝฟ็”จ \"git am --quit\" ๆˆ– \"git worktree add\"ใ€‚"
+
+#: builtin/checkout.c:1364
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"ไธ่ƒฝๅœจ้‡ๅฎšๅŸบๅบ•ๆ™‚ๅˆ‡ๆ›ๅˆ†ๆ”ฏ\n"
+"่€ƒๆ…ฎไฝฟ็”จ \"git rebase --quit\" ๆˆ– \"git worktree add\"ใ€‚"
+
+#: builtin/checkout.c:1368
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"ไธ่ƒฝๅœจๆ€้ธๆ™‚ๅˆ‡ๆ›ๅˆ†ๆ”ฏ\n"
+"่€ƒๆ…ฎไฝฟ็”จ \"git cherry-pick --quit\" ๆˆ– \"git worktree add\"ใ€‚"
+
+#: builtin/checkout.c:1372
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"ไธ่ƒฝๅœจ้‚„ๅŽŸๆ™‚ๅˆ‡ๆ›ๅˆ†ๆ”ฏ\n"
+"่€ƒๆ…ฎไฝฟ็”จ \"git revert --quit\" ๆˆ– \"git worktree add\"ใ€‚"
+
+#: builtin/checkout.c:1376
+msgid "you are switching branch while bisecting"
+msgstr "ๆ‚จๅœจๅŸท่กŒไบŒๅˆ†ๅฐ‹ๆ‰พๆ™‚ๅˆ‡ๆ›ๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1383
+msgid "paths cannot be used with switching branches"
+msgstr "่ทฏๅพ‘ไธ่ƒฝๅ’Œๅˆ‡ๆ›ๅˆ†ๆ”ฏๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' ไธ่ƒฝๅ’Œๅˆ‡ๆ›ๅˆ†ๆ”ฏๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' ไธ่ƒฝๅ’Œ '%s' ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/checkout.c:1411
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' ไธๅธถ <่ตทๅง‹้ปž>"
+
+#: builtin/checkout.c:1419
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "ไธ่ƒฝๅˆ‡ๆ›ๅˆ†ๆ”ฏๅˆฐไธ€ๅ€‹้žๆไบค '%s'"
+
+#: builtin/checkout.c:1426
+msgid "missing branch or commit argument"
+msgstr "็ผบๅฐ‘ๅˆ†ๆ”ฏๆˆ–ๆไบคๅƒๆ•ธ"
+
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "ๅผทๅˆถ้กฏ็คบ้€ฒๅบฆๅ ฑๅ‘Š"
+
+#: builtin/checkout.c:1469
+msgid "perform a 3-way merge with the new branch"
+msgstr "ๅ’Œๆ–ฐ็š„ๅˆ†ๆ”ฏๅŸท่กŒไธ‰ๆ–นๅˆไฝต"
+
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+msgid "style"
+msgstr "้ขจๆ ผ"
+
+#: builtin/checkout.c:1471
+msgid "conflict style (merge or diff3)"
+msgstr "่ก็ช่ผธๅ‡บ้ขจๆ ผ๏ผˆmerge ๆˆ– diff3๏ผ‰"
+
+#: builtin/checkout.c:1483 builtin/worktree.c:496
+msgid "detach HEAD at named commit"
+msgstr "HEAD ๅพžๆŒ‡ๅฎš็š„ๆไบคๅˆ†้›ข"
+
+#: builtin/checkout.c:1484
+msgid "set upstream info for new branch"
+msgstr "็‚บๆ–ฐ็š„ๅˆ†ๆ”ฏ่จญๅฎšไธŠๆธธ่จŠๆฏ"
+
+#: builtin/checkout.c:1486
+msgid "force checkout (throw away local modifications)"
+msgstr "ๅผทๅˆถ็ฐฝๅ‡บ๏ผˆๆจๆฃ„ๆœฌๆฉŸไฟฎๆ”น๏ผ‰"
+
+#: builtin/checkout.c:1488
+msgid "new-branch"
+msgstr "ๆ–ฐๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1488
+msgid "new unparented branch"
+msgstr "ๆ–ฐ็š„ๆฒ’ๆœ‰็ˆถๆไบค็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1490 builtin/merge.c:289
+msgid "update ignored files (default)"
+msgstr "ๆ›ดๆ–ฐๅฟฝ็•ฅ็š„ๆช”ๆกˆ๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/checkout.c:1493
+msgid "do not check if another worktree is holding the given ref"
+msgstr "ไธๆชขๆŸฅๆŒ‡ๅฎš็š„ๅผ•็”จๆ˜ฏๅฆ่ขซๅ…ถไป–ๅทฅไฝœๅ€ๆ‰€ๅ ็”จ"
+
+#: builtin/checkout.c:1506
+msgid "checkout our version for unmerged files"
+msgstr "ๅฐๅฐšๆœชๅˆไฝต็š„ๆช”ๆกˆ็ฐฝๅ‡บๆˆ‘ๅ€‘็š„็‰ˆๆœฌ"
+
+#: builtin/checkout.c:1509
+msgid "checkout their version for unmerged files"
+msgstr "ๅฐๅฐšๆœชๅˆไฝต็š„ๆช”ๆกˆ็ฐฝๅ‡บไป–ๅ€‘็š„็‰ˆๆœฌ"
+
+#: builtin/checkout.c:1513
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "ๅฐ่ทฏๅพ‘ไธๅš็จ€็–็ฐฝๅ‡บ็š„้™ๅˆถ"
+
+#: builtin/checkout.c:1565
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "-bใ€-B ๅ’Œ --orphan ๆ˜ฏไบ’ๆ–ฅ็š„"
+
+#: builtin/checkout.c:1568
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p ๅ’Œ --overlay ไบ’ๆ–ฅ"
+
+#: builtin/checkout.c:1605
+msgid "--track needs a branch name"
+msgstr "--track ้œ€่ฆไธ€ๅ€‹ๅˆ†ๆ”ฏๅ"
+
+#: builtin/checkout.c:1610
+msgid "missing branch name; try -b"
+msgstr "็ผบๅฐ‘ๅˆ†ๆ”ฏๅ๏ผŒๅ˜—่ฉฆ -b"
+
+#: builtin/checkout.c:1642
+#, c-format
+msgid "could not resolve %s"
+msgstr "็„กๆณ•่งฃๆž %s"
+
+#: builtin/checkout.c:1658
+msgid "invalid path specification"
+msgstr "็„กๆ•ˆ็š„่ทฏๅพ‘่ฆๆ ผ"
+
+#: builtin/checkout.c:1665
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆไบค๏ผŒไธ่ƒฝๅŸบๆ–ผๅฎƒๅปบ็ซ‹ๅˆ†ๆ”ฏ '%s'"
+
+#: builtin/checkout.c:1669
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout๏ผš--detach ไธ่ƒฝๆŽฅๆ”ถ่ทฏๅพ‘ๅƒๆ•ธ '%s'"
+
+#: builtin/checkout.c:1678
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file ่ˆ‡ --detach ไธ็›ธๅฎน"
+
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file ่ˆ‡ --patch ไธ็›ธๅฎน"
+
+#: builtin/checkout.c:1692
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout๏ผšๅœจๅพž็ดขๅผ•็ฐฝๅ‡บๆ™‚๏ผŒ--ours/--theirsใ€--force ๅ’Œ --merge ไธ็›ธๅฎนใ€‚"
+
+#: builtin/checkout.c:1697
+msgid "you must specify path(s) to restore"
+msgstr "ๆ‚จๅฟ…้ ˆๆŒ‡ๅฎšไธ€ๅ€‹่ฆๅพฉๅŽŸ็š„่ทฏๅพ‘"
+
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+msgid "branch"
+msgstr "ๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1724
+msgid "create and checkout a new branch"
+msgstr "ๅปบ็ซ‹ไธฆ็ฐฝๅ‡บไธ€ๅ€‹ๆ–ฐ็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1726
+msgid "create/reset and checkout a branch"
+msgstr "ๅปบ็ซ‹/้‡่จญไธฆ็ฐฝๅ‡บไธ€ๅ€‹ๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1727
+msgid "create reflog for new branch"
+msgstr "็‚บๆ–ฐ็š„ๅˆ†ๆ”ฏๅปบ็ซ‹ๅผ•็”จๆ—ฅ่ชŒ"
+
+#: builtin/checkout.c:1729
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "ไบŒๆฌก็Œœๆธฌ 'git checkout <็„กๆญคๅˆ†ๆ”ฏ>'๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/checkout.c:1730
+msgid "use overlay mode (default)"
+msgstr "ไฝฟ็”จ็–ŠๅŠ ๆจกๅผ๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/checkout.c:1775
+msgid "create and switch to a new branch"
+msgstr "ๅปบ็ซ‹ไธฆๅˆ‡ๆ›ไธ€ๅ€‹ๆ–ฐๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1777
+msgid "create/reset and switch to a branch"
+msgstr "ๅปบ็ซ‹/้‡่จญไธฆๅˆ‡ๆ›ไธ€ๅ€‹ๅˆ†ๆ”ฏ"
+
+#: builtin/checkout.c:1779
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "ไบŒๆฌก็Œœๆธฌ 'git switch <็„กๆญคๅˆ†ๆ”ฏ>'"
+
+#: builtin/checkout.c:1781
+msgid "throw away local modifications"
+msgstr "ๆจๆฃ„ๆœฌๆฉŸไฟฎๆ”น"
+
+#: builtin/checkout.c:1813
+msgid "which tree-ish to checkout from"
+msgstr "่ฆ็ฐฝๅ‡บๅ“ชไธ€ๅ€‹ๆจน"
+
+#: builtin/checkout.c:1815
+msgid "restore the index"
+msgstr "ๅพฉๅŽŸ็ดขๅผ•"
+
+#: builtin/checkout.c:1817
+msgid "restore the working tree (default)"
+msgstr "ๅพฉๅŽŸๅทฅไฝœๅ€๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/checkout.c:1819
+msgid "ignore unmerged entries"
+msgstr "ๅฟฝ็•ฅๆœชๅˆไฝตๆข็›ฎ"
+
+#: builtin/checkout.c:1820
+msgid "use overlay mode"
+msgstr "ไฝฟ็”จ็–ŠๅŠ ๆจกๅผ"
+
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <ๆจกๅผ>] [-x | -X] [--] <่ทฏๅพ‘>..."
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
+msgstr "ๆญฃๅˆช้™ค %s\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
+msgstr "ๅฐ‡ๅˆช้™ค %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "ๅฟฝ็•ฅ็‰ˆๆœฌๅบซ %s\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "ๅฐ‡ๅฟฝ็•ฅ็‰ˆๆœฌๅบซ %s\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
+msgstr "ๅˆช้™ค %s ๅคฑๆ•—"
+
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "ไธ่ƒฝๅฐ %s ๅ‘ผๅซ lstat\n"
+
+#: builtin/clean.c:301 git-add--interactive.perl:595
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a numbered item\n"
+"foo        - select item based on unique prefix\n"
+"           - (empty) select nothing\n"
+msgstr ""
+"ๅ”ๅŠฉ๏ผš\n"
+"1          - ้€้Ž็ทจ่™Ÿ้ธๆ“‡ไธ€ๅ€‹้ธ้ …\n"
+"foo        - ้€้Žๅ”ฏไธ€ๅ‰็ถด้ธๆ“‡ไธ€ๅ€‹้ธ้ …\n"
+"           - ๏ผˆ็ฉบ๏ผ‰ไป€้บผไนŸไธ้ธๆ“‡\n"
+
+#: builtin/clean.c:305 git-add--interactive.perl:604
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a single item\n"
+"3-5        - select a range of items\n"
+"2-3,6-9    - select multiple ranges\n"
+"foo        - select item based on unique prefix\n"
+"-...       - unselect specified items\n"
+"*          - choose all items\n"
+"           - (empty) finish selecting\n"
+msgstr ""
+"ๅ”ๅŠฉ๏ผš\n"
+"1          - ้ธๆ“‡ไธ€ๅ€‹้ธ้ …\n"
+"3-5        - ้ธๆ“‡ไธ€ๅ€‹็ฏ„ๅœๅ…ง็š„ๆ‰€ๆœ‰้ธ้ …\n"
+"2-3,6-9    - ้ธๆ“‡ๅคšๅ€‹็ฏ„ๅœๅ…ง็š„ๆ‰€ๆœ‰้ธ้ …\n"
+"foo        - ้€้Žๅ”ฏไธ€ๅ‰็ถด้ธๆ“‡ไธ€ๅ€‹้ธ้ …\n"
+"-...       - ๅ้ธ็‰นๅฎš็š„้ธ้ …\n"
+"*          - ้ธๆ“‡ๆ‰€ๆœ‰้ธ้ …\n"
+"           - ๏ผˆ็ฉบ๏ผ‰็ตๆŸ้ธๆ“‡\n"
+
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "ๅ—ฏ๏ผˆ%s๏ผ‰๏ผŸ\n"
+
+#: builtin/clean.c:663
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "่ผธๅ…ฅ็ฏ„ๆœฌไปฅๆŽ’้™คๆข็›ฎ>> "
+
+#: builtin/clean.c:700
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "่ญฆๅ‘Š๏ผš็„กๆณ•ๆ‰พๅˆฐๅ’Œ %s ็ฌฆๅˆ็š„ๆข็›ฎ"
+
+#: builtin/clean.c:721
+msgid "Select items to delete"
+msgstr "้ธๆ“‡่ฆๅˆช้™ค็š„ๆข็›ฎ"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:762
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "ๅˆช้™ค %s [y/N]๏ผŸ"
+
+#: builtin/clean.c:795
+msgid ""
+"clean               - start cleaning\n"
+"filter by pattern   - exclude items from deletion\n"
+"select by numbers   - select items to be deleted by numbers\n"
+"ask each            - confirm each deletion (like \"rm -i\")\n"
+"quit                - stop cleaning\n"
+"help                - this screen\n"
+"?                   - help for prompt selection"
+msgstr ""
+"clean               - ้–‹ๅง‹ๆธ…็†\n"
+"filter by pattern   - ้€้Ž็ฏ„ๆœฌๆŽ’้™ค่ฆๅˆช้™ค็š„ๆข็›ฎ\n"
+"select by numbers   - ้€้Žๆ•ธๅญ—้ธๆ“‡่ฆๅˆช้™ค็š„ๆข็›ฎ\n"
+"ask each            - ้‡ๅฐๅˆช้™ค้€ไธ€่ฉขๅ•๏ผˆๅฐฑๅƒ \"rm -i\"๏ผ‰\n"
+"quit                - ๅœๆญขๅˆช้™คไธฆ้›ข้–‹\n"
+"help                - ้กฏ็คบๆœฌๅ”ๅŠฉ\n"
+"?                   - ้กฏ็คบๅฆ‚ไฝ•ๅœจๆ็คบ็ฌฆไธ‹้ธๆ“‡็š„ๅ”ๅŠฉ"
+
+#: builtin/clean.c:831
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "ๅฐ‡ๅˆช้™คๅฆ‚ไธ‹ๆข็›ฎ๏ผš"
+
+#: builtin/clean.c:847
+msgid "No more files to clean, exiting."
+msgstr "ๆฒ’ๆœ‰่ฆๆธ…็†็š„ๆช”ๆกˆ๏ผŒ้›ข้–‹ใ€‚"
+
+#: builtin/clean.c:909
+msgid "do not print names of files removed"
+msgstr "ไธๅˆ—ๅฐๅˆช้™คๆช”ๆกˆ็š„ๅ็จฑ"
+
+#: builtin/clean.c:911
+msgid "force"
+msgstr "ๅผทๅˆถ"
+
+#: builtin/clean.c:912
+msgid "interactive cleaning"
+msgstr "ไบ’ๅ‹•ๅผๆธ…้™ค"
+
+#: builtin/clean.c:914
+msgid "remove whole directories"
+msgstr "ๅˆช้™คๆ•ดๅ€‹็›ฎ้Œ„"
+
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/show-ref.c:179
+msgid "pattern"
+msgstr "ๆจกๅผ"
+
+#: builtin/clean.c:916
+msgid "add <pattern> to ignore rules"
+msgstr "ๆ–ฐๅขž <ๆจกๅผ> ๅˆฐๅฟฝ็•ฅ่ฆๅ‰‡"
+
+#: builtin/clean.c:917
+msgid "remove ignored files, too"
+msgstr "ไนŸๅˆช้™คๅฟฝ็•ฅ็š„ๆช”ๆกˆ"
+
+#: builtin/clean.c:919
+msgid "remove only ignored files"
+msgstr "ๅชๅˆช้™คๅฟฝ็•ฅ็š„ๆช”ๆกˆ"
+
+#: builtin/clean.c:937
+msgid "-x and -X cannot be used together"
+msgstr "-x ๅ’Œ -X ไธ่ƒฝๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/clean.c:941
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce ่จญๅฎš็‚บ true ไธ”ๆœชๆไพ› -iใ€-n ๆˆ– -f ้ธ้ …๏ผŒๆ‹’็ต•ๅŸท่กŒๆธ…็†ๅ‹•ไฝœ"
+
+#: builtin/clean.c:944
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce ้ ่จญ็‚บ true ไธ”ๆœชๆไพ› -iใ€-n ๆˆ– -f ้ธ้ …๏ผŒๆ‹’็ต•ๅŸท่กŒๆธ…็†ๅ‹•ไฝœ"
+
+#: builtin/clone.c:45
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<้ธ้ …>] [--] <็‰ˆๆœฌๅบซ> [<่ทฏๅพ‘>]"
+
+#: builtin/clone.c:93
+msgid "don't create a checkout"
+msgstr "ไธๅปบ็ซ‹ไธ€ๅ€‹็ฐฝๅ‡บ"
+
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+msgid "create a bare repository"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹็ด”็‰ˆๆœฌๅบซ"
+
+#: builtin/clone.c:98
+msgid "create a mirror repository (implies bare)"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹้กๅƒ็‰ˆๆœฌๅบซ๏ผˆไนŸๆ˜ฏ็ด”็‰ˆๆœฌๅบซ๏ผ‰"
+
+#: builtin/clone.c:100
+msgid "to clone from a local repository"
+msgstr "ๅพžๆœฌๆฉŸ็‰ˆๆœฌๅบซ่ค‡่ฃฝ"
+
+#: builtin/clone.c:102
+msgid "don't use local hardlinks, always copy"
+msgstr "ไธไฝฟ็”จๆœฌๆฉŸ็กฌ้€ฃ็ต๏ผŒๅง‹็ต‚่ค‡่ฃฝ"
+
+#: builtin/clone.c:104
+msgid "setup as shared repository"
+msgstr "่จญๅฎš็‚บๅ…ฑไบซ็‰ˆๆœฌๅบซ"
+
+#: builtin/clone.c:107
+msgid "pathspec"
+msgstr "่ทฏๅพ‘่ฆๆ ผ"
+
+#: builtin/clone.c:107
+msgid "initialize submodules in the clone"
+msgstr "ๅœจ่ค‡่ฃฝๆ™‚ๅˆๅง‹ๅŒ–ๅญๆจก็ต„"
+
+#: builtin/clone.c:110
+msgid "number of submodules cloned in parallel"
+msgstr "ไธฆ็™ผ่ค‡่ฃฝ็š„ๅญๆจก็ต„็š„ๆ•ธ้‡"
+
+#: builtin/clone.c:111 builtin/init-db.c:486
+msgid "template-directory"
+msgstr "็ฏ„ๆœฌ็›ฎ้Œ„"
+
+#: builtin/clone.c:112 builtin/init-db.c:487
+msgid "directory from which templates will be used"
+msgstr "็ฏ„ๆœฌ็›ฎ้Œ„ๅฐ‡่ขซไฝฟ็”จ"
+
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
+msgid "reference repository"
+msgstr "ๅƒ่€ƒ็‰ˆๆœฌๅบซ"
+
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
+msgid "use --reference only while cloning"
+msgstr "ๅƒ…ๅœจ่ค‡่ฃฝๆ™‚ๅƒ่€ƒ --reference ๆŒ‡ๅ‘็š„ๆœฌๆฉŸ็‰ˆๆœฌๅบซ"
+
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
+msgid "name"
+msgstr "ๅ็จฑ"
+
+#: builtin/clone.c:120
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "ไฝฟ็”จ <ๅ็จฑ> ่€Œไธๆ˜ฏ 'origin' ๅŽป่ฟฝ่นคไธŠๆธธ"
+
+#: builtin/clone.c:122
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "็ฐฝๅ‡บ <ๅˆ†ๆ”ฏ> ่€Œไธๆ˜ฏ้ ็ซฏ HEAD"
+
+#: builtin/clone.c:124
+msgid "path to git-upload-pack on the remote"
+msgstr "้ ็ซฏ git-upload-pack ่ทฏๅพ‘"
+
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
+msgid "depth"
+msgstr "ๆทฑๅบฆ"
+
+#: builtin/clone.c:126
+msgid "create a shallow clone of that depth"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹ๆŒ‡ๅฎšๆทฑๅบฆ็š„ๆทบ่ค‡่ฃฝ"
+
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+msgid "time"
+msgstr "ๆ™‚้–“"
+
+#: builtin/clone.c:128
+msgid "create a shallow clone since a specific time"
+msgstr "ๅพžไธ€ๅ€‹็‰นๅฎšๆ™‚้–“ๅปบ็ซ‹ไธ€ๅ€‹ๆทบ่ค‡่ฃฝ"
+
+#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
+#: builtin/rebase.c:1480
+msgid "revision"
+msgstr "็‰ˆๆœฌ"
+
+#: builtin/clone.c:130 builtin/fetch.c:173
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "ๆทฑๅŒ–ๆทบ่ค‡่ฃฝ็š„ๆญทๅฒ๏ผŒ้™คไบ†็‰นๅฎš็‰ˆๆœฌ"
+
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
+msgid "clone only one branch, HEAD or --branch"
+msgstr "ๅช่ค‡่ฃฝไธ€ๅ€‹ๅˆ†ๆ”ฏใ€HEAD ๆˆ– --branch"
+
+#: builtin/clone.c:134
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "ไธ่ฆ่ค‡่ฃฝไปปไฝ•ๆจ™็ฑค๏ผŒไธฆไธ”ๅพŒ็บŒๅ–ๅพ—ๅ‹•ไฝœไนŸไธไธ‹่ผ‰ๅฎƒๅ€‘"
+
+#: builtin/clone.c:136
+msgid "any cloned submodules will be shallow"
+msgstr "ๅญๆจก็ต„ๅฐ‡ไปฅๆทบไธ‹่ผ‰ๆจกๅผ่ค‡่ฃฝ"
+
+#: builtin/clone.c:137 builtin/init-db.c:495
+msgid "gitdir"
+msgstr "git็›ฎ้Œ„"
+
+#: builtin/clone.c:138 builtin/init-db.c:496
+msgid "separate git dir from working tree"
+msgstr "git็›ฎ้Œ„ๅ’Œๅทฅไฝœๅ€ๅˆ†้›ข"
+
+#: builtin/clone.c:139
+msgid "key=value"
+msgstr "key=value"
+
+#: builtin/clone.c:140
+msgid "set config inside the new repository"
+msgstr "ๅœจๆ–ฐ็‰ˆๆœฌๅบซไธญ่จญๅฎš่จญๅฎš่จŠๆฏ"
+
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "server-specific"
+
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
+#: builtin/push.c:573 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "ๅ‚ณ่ผธ้ธ้ …"
+
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
+#: builtin/push.c:574
+msgid "use IPv4 addresses only"
+msgstr "ๅชไฝฟ็”จ IPv4 ไฝๅ€"
+
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
+#: builtin/push.c:576
+msgid "use IPv6 addresses only"
+msgstr "ๅชไฝฟ็”จ IPv6 ไฝๅ€"
+
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "ไปปไฝ•่ค‡่ฃฝ็š„ๅญๆจก็ต„ๅฐ‡ไฝฟ็”จๅฎƒๅ€‘็š„้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ"
+
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr "ๅˆๅง‹ๅŒ–็จ€็–็ฐฝๅ‡บๆช”ๆกˆ๏ผŒๅชๅŒ…ๅซๆ น็›ฎ้Œ„ไธญ็š„ๆช”ๆกˆ"
+
+#: builtin/clone.c:287
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"็„กๆณ•็Œœๅˆฐ็›ฎ้Œ„ๅใ€‚\n"
+"่ซ‹ๅœจๆŒ‡ไปคๅˆ—ๆŒ‡ๅฎšไธ€ๅ€‹็›ฎ้Œ„"
+
+#: builtin/clone.c:340
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: ไธ่ƒฝ็‚บ '%s' ๆ–ฐๅขžไธ€ๅ€‹ๅ‚™็”จ๏ผš%s\n"
+
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s ๅญ˜ๅœจไธ”ไธๆ˜ฏไธ€ๅ€‹็›ฎ้Œ„"
+
+#: builtin/clone.c:430
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "็„กๆณ•ๅœจ '%s' ไธŠๅ•Ÿๅ‹•็–Šไปฃๅ™จ"
+
+#: builtin/clone.c:460
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "ๅปบ็ซ‹้€ฃ็ต '%s' ๅคฑๆ•—"
+
+#: builtin/clone.c:464
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "่ค‡่ฃฝๆช”ๆกˆ่‡ณ '%s' ๅคฑๆ•—"
+
+#: builtin/clone.c:469
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "็„กๆณ•ๅœจ '%s' ไธŠ็–Šไปฃ"
+
+#: builtin/clone.c:494
+#, c-format
+msgid "done.\n"
+msgstr "ๅฎŒๆˆใ€‚\n"
+
+#: builtin/clone.c:508
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
+msgstr ""
+"่ค‡่ฃฝๆˆๅŠŸ๏ผŒไฝ†ๆ˜ฏ็ฐฝๅ‡บๅคฑๆ•—ใ€‚\n"
+"ๆ‚จๅฏไปฅ้€้Ž 'git status' ๆชขๆŸฅๅ“ชไบ›ๅทฒ่ขซ็ฐฝๅ‡บ๏ผŒ็„ถๅพŒไฝฟ็”จๆŒ‡ไปค\n"
+"'git restore --source=HEAD :/' ้‡่ฉฆ\n"
+
+#: builtin/clone.c:585
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "ไธ่ƒฝ็™ผ็พ่ฆ่ค‡่ฃฝ็š„้ ็ซฏๅˆ†ๆ”ฏ %sใ€‚"
+
+#: builtin/clone.c:705
+#, c-format
+msgid "unable to update %s"
+msgstr "ไธ่ƒฝๆ›ดๆ–ฐ %s"
+
+#: builtin/clone.c:753
+msgid "failed to initialize sparse-checkout"
+msgstr "็„กๆณ•ๅˆๅง‹ๅŒ–็จ€็–็ฐฝๅ‡บ"
+
+#: builtin/clone.c:776
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "้ ็ซฏ HEAD ๆŒ‡ๅ‘ไธ€ๅ€‹ไธๅญ˜ๅœจ็š„ๅผ•็”จ๏ผŒ็„กๆณ•็ฐฝๅ‡บใ€‚\n"
+
+#: builtin/clone.c:807
+msgid "unable to checkout working tree"
+msgstr "ไธ่ƒฝ็ฐฝๅ‡บๅทฅไฝœๅ€"
+
+#: builtin/clone.c:862
+msgid "unable to write parameters to config file"
+msgstr "็„กๆณ•ๅฐ‡ๅƒๆ•ธๅฏซๅ…ฅ่จญๅฎšๆช”ๆกˆ"
+
+#: builtin/clone.c:925
+msgid "cannot repack to clean up"
+msgstr "็„กๆณ•ๅŸท่กŒ repack ไพ†ๆธ…็†"
+
+#: builtin/clone.c:927
+msgid "cannot unlink temporary alternates file"
+msgstr "็„กๆณ•ๅˆช้™คๆšซๆ™‚็š„ alternates ๆช”ๆกˆ"
+
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
+msgid "Too many arguments."
+msgstr "ๅคชๅคšๅƒๆ•ธใ€‚"
+
+#: builtin/clone.c:969
+msgid "You must specify a repository to clone."
+msgstr "ๆ‚จๅฟ…้ ˆๆŒ‡ๅฎšไธ€ๅ€‹็‰ˆๆœฌๅบซไพ†่ค‡่ฃฝใ€‚"
+
+#: builtin/clone.c:982
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "--bare ๅ’Œ --origin %s ้ธ้ …ไธ็›ธๅฎนใ€‚"
+
+#: builtin/clone.c:985
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare ๅ’Œ --separate-git-dir ้ธ้ …ไธ็›ธๅฎนใ€‚"
+
+#: builtin/clone.c:998
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "็‰ˆๆœฌๅบซ '%s' ไธๅญ˜ๅœจ"
+
+#: builtin/clone.c:1004 builtin/fetch.c:1796
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "ๆทฑๅบฆ %s ไธๆ˜ฏไธ€ๅ€‹ๆญฃๆ•ธ"
+
+#: builtin/clone.c:1014
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "็›ฎๆจ™่ทฏๅพ‘ '%s' ๅทฒ็ถ“ๅญ˜ๅœจ๏ผŒไธฆไธ”ไธๆ˜ฏไธ€ๅ€‹็ฉบ็›ฎ้Œ„ใ€‚"
+
+#: builtin/clone.c:1024
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "ๅทฅไฝœๅ€ '%s' ๅทฒ็ถ“ๅญ˜ๅœจใ€‚"
+
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "ไธ่ƒฝ็‚บ '%s' ๅปบ็ซ‹ๅ…ˆๅฐŽ็›ฎ้Œ„"
+
+#: builtin/clone.c:1044
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ๅทฅไฝœๅ€็›ฎ้Œ„ '%s'"
+
+#: builtin/clone.c:1064
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "่ค‡่ฃฝๅˆฐ็ด”็‰ˆๆœฌๅบซ '%s'...\n"
+
+#: builtin/clone.c:1066
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "ๆญฃ่ค‡่ฃฝๅˆฐ '%s'...\n"
+
+#: builtin/clone.c:1090
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr "clone --recursive ๅ’Œ --reference ไปฅๅŠ --reference-if-able ไธ็›ธๅฎน"
+
+#: builtin/clone.c:1154
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth ๅœจๆœฌๆฉŸ่ค‡่ฃฝๆ™‚่ขซๅฟฝ็•ฅ๏ผŒ่ซ‹ๆ”น็”จ file:// ๅ”ๅฎšใ€‚"
+
+#: builtin/clone.c:1156
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since ๅœจๆœฌๆฉŸ่ค‡่ฃฝๆ™‚่ขซๅฟฝ็•ฅ๏ผŒ่ซ‹ๆ”น็”จ file:// ๅ”ๅฎšใ€‚"
+
+#: builtin/clone.c:1158
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "--shallow-exclude ๅœจๆœฌๆฉŸ่ค‡่ฃฝๆ™‚่ขซๅฟฝ็•ฅ๏ผŒ่ซ‹ๆ”น็”จ file:// ๅ”ๅฎšใ€‚"
+
+#: builtin/clone.c:1160
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter ๅœจๆœฌๆฉŸ่ค‡่ฃฝๆ™‚่ขซๅฟฝ็•ฅ๏ผŒ่ซ‹ๆ”น็”จ file:// ๅ”ๅฎšใ€‚"
+
+#: builtin/clone.c:1163
+msgid "source repository is shallow, ignoring --local"
+msgstr "ๆบ็‰ˆๆœฌๅบซๆ˜ฏๆทบ่ค‡่ฃฝ๏ผŒๅฟฝ็•ฅ --local"
+
+#: builtin/clone.c:1168
+msgid "--local is ignored"
+msgstr "--local ่ขซๅฟฝ็•ฅ"
+
+#: builtin/clone.c:1243 builtin/clone.c:1251
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "้ ็ซฏๅˆ†ๆ”ฏ %s ๅœจไธŠๆธธ %s ๆœช็™ผ็พ"
+
+#: builtin/clone.c:1254
+msgid "You appear to have cloned an empty repository."
+msgstr "ๆ‚จไผผไนŽ่ค‡่ฃฝไบ†ไธ€ๅ€‹็ฉบ็‰ˆๆœฌๅบซใ€‚"
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<้ธ้ …>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "ๅฐ‹ๆ‰พ่จญๅฎš่ฎŠๆ•ธ"
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "่ฆไฝฟ็”จ็š„้…็ฝฎ"
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr "ๆœ€ๅคงๅฏฌๅบฆ"
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr "ๅทฆ้‚Šๆก†็š„ๅกซๅ……็ฉบ้–“"
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr "ๅณ้‚Šๆก†็š„ๅกซๅ……็ฉบ้–“"
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr "ๅ…ฉๅˆ—ไน‹้–“็š„ๅกซๅ……็ฉบ้–“"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command ๅฟ…้ ˆๆ˜ฏ็ฌฌไธ€ๅ€‹ๅƒๆ•ธ"
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <็ˆถๆไบค>)...] [-S[<keyid>]] [(-m <ๆถˆๆฏ>)...] [(-F <ๆช”ๆกˆ"
+">)...] <ๆจน>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "ๅฟฝ็•ฅ้‡่ค‡็š„็ˆถๆไบค %s"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#, c-format
+msgid "not a valid object name %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ฉไปถๅ %s"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree๏ผš็„กๆณ•้–‹ๅ•Ÿ '%s'"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree๏ผš็„กๆณ•่ฎ€ๅ– '%s'"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree๏ผš็„กๆณ•้—œ้–‰ '%s'"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "็ˆถๆไบค"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "็ˆถๆไบค็‰ฉไปถ ID"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
+#: builtin/tag.c:412
+msgid "message"
+msgstr "่ชชๆ˜Ž"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
+msgid "commit message"
+msgstr "ๆไบค่ชชๆ˜Ž"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "ๅพžๆช”ๆกˆไธญ่ฎ€ๅ–ๆไบค่ชชๆ˜Ž"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "GPG ๆไบค็ฐฝๅ"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "ๅฟ…้ ˆ็ฒพ็ขบๅœฐๆไพ›ไธ€ๅ€‹ๆจน"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree๏ผš่ฎ€ๅ–ๅคฑๆ•—"
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<้ธ้ …>] [--] <่ทฏๅพ‘่ฆๆ ผ>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<้ธ้ …>] [--] <่ทฏๅพ‘่ฆๆ ผ>..."
+
+#: builtin/commit.c:51
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+"ๆ‚จ่ฆไฟฎ่ฃœๆœ€่ฟ‘็š„ๆไบค๏ผŒไฝ†้€™้บผๅšๆœƒ่ฎ“ๅฎƒๆˆ็‚บ็ฉบๆไบคใ€‚ๆ‚จๅฏไปฅ้‡่ค‡ๆ‚จ็š„ๆŒ‡ไปคไธฆๅธถไธŠ\n"
+"--allow-empty ้ธ้ …๏ผŒๆˆ–่€…ๆ‚จๅฏ็”จๆŒ‡ไปค \"git reset HEAD^\" ๆ•ดๅ€‹ๅˆช้™ค่ฉฒๆไบคใ€‚\n"
+
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+msgstr ""
+"ไน‹ๅ‰็š„ๆ€้ธๅ‹•ไฝœ็พๅœจๆ˜ฏไธ€ๅ€‹็ฉบๆไบค๏ผŒๅฏ่ƒฝๆ˜ฏ็”ฑ่ก็ช่งฃๆฑบๅฐŽ่‡ด็š„ใ€‚ๅฆ‚ๆžœๆ‚จ็„ก่ซ–ๅฆ‚ไฝ•\n"
+"ไนŸ่ฆๆไบค๏ผŒไฝฟ็”จๆŒ‡ไปค๏ผš\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "ๅฆๅ‰‡๏ผŒ่ซ‹ไฝฟ็”จ 'git cherry-pick --skip'\n"
+
+#: builtin/commit.c:66
+msgid ""
+"and then use:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+msgstr ""
+"็„ถๅพŒไฝฟ็”จ๏ผš\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"ไพ†็นผ็บŒๆ€้ธๅ‰ฉ้ค˜ๆไบคใ€‚ๅฆ‚ๆžœๆ‚จๆƒณ่ทณ้Žๆญคๆไบค๏ผŒไฝฟ็”จ๏ผš\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+
+#: builtin/commit.c:315
+msgid "failed to unpack HEAD tree object"
+msgstr "่งฃๅŒ… HEAD ๆจน็‹€็‰ฉไปถๅคฑๆ•—"
+
+#: builtin/commit.c:351
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file ๅ’Œ -a ๅŒๆ™‚ไฝฟ็”จๆฒ’ๆœ‰ๆ„็พฉ"
+
+#: builtin/commit.c:364
+msgid "No paths with --include/--only does not make sense."
+msgstr "ๅƒๆ•ธ --include/--only ไธ่ทŸ่ทฏๅพ‘ๆฒ’ๆœ‰ๆ„็พฉใ€‚"
+
+#: builtin/commit.c:376
+msgid "unable to create temporary index"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ๆšซๆ™‚็ดขๅผ•"
+
+#: builtin/commit.c:385
+msgid "interactive add failed"
+msgstr "ไบ’ๅ‹•ๅผๆ–ฐๅขžๅคฑๆ•—"
+
+#: builtin/commit.c:400
+msgid "unable to update temporary index"
+msgstr "็„กๆณ•ๆ›ดๆ–ฐๆšซๆ™‚็ดขๅผ•"
+
+#: builtin/commit.c:402
+msgid "Failed to update main cache tree"
+msgstr "ไธ่ƒฝๆ›ดๆ–ฐๆจน็š„ไธปๅฟซๅ–"
+
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+msgid "unable to write new_index file"
+msgstr "็„กๆณ•ๅฏซ new_index ๆช”ๆกˆ"
+
+#: builtin/commit.c:479
+msgid "cannot do a partial commit during a merge."
+msgstr "ๅœจๅˆไฝต้Ž็จ‹ไธญไธ่ƒฝๅš้ƒจๅˆ†ๆไบคใ€‚"
+
+#: builtin/commit.c:481
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "ๅœจๆ€้ธ้Ž็จ‹ไธญไธ่ƒฝๅš้ƒจๅˆ†ๆไบคใ€‚"
+
+#: builtin/commit.c:489
+msgid "cannot read the index"
+msgstr "็„กๆณ•่ฎ€ๅ–็ดขๅผ•"
+
+#: builtin/commit.c:508
+msgid "unable to write temporary index file"
+msgstr "็„กๆณ•ๅฏซๆšซๆ™‚็ดขๅผ•ๆช”ๆกˆ"
+
+#: builtin/commit.c:606
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "ๆไบค '%s' ็ผบๅฐ‘ไฝœ่€…่จŠๆฏ"
+
+#: builtin/commit.c:608
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "ๆไบค '%s' ๆœ‰ๆ ผๅผ้Œฏ่ชค็š„ไฝœ่€…่จŠๆฏ"
+
+#: builtin/commit.c:627
+msgid "malformed --author parameter"
+msgstr "ๆ ผๅผ้Œฏ่ชค็š„ --author ๅƒๆ•ธ"
+
+#: builtin/commit.c:680
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr "็„กๆณ•้ธๆ“‡ไธ€ๅ€‹ๆœช่ขซ็›ฎๅ‰ๆไบค่ชชๆ˜Žไฝฟ็”จ็š„ๅ‚™่จปๅญ—ๅ…ƒ"
+
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "ไธ่ƒฝๆŸฅ่ฉขๆไบค %s"
+
+#: builtin/commit.c:730 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "๏ผˆๆญฃๅพžๆจ™ๆบ–่ผธๅ…ฅไธญ่ฎ€ๅ–ๆ—ฅ่ชŒ่จŠๆฏ๏ผ‰\n"
+
+#: builtin/commit.c:732
+msgid "could not read log from standard input"
+msgstr "ไธ่ƒฝๅพžๆจ™ๆบ–่ผธๅ…ฅไธญ่ฎ€ๅ–ๆ—ฅ่ชŒ่จŠๆฏ"
+
+#: builtin/commit.c:736
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–ๆ—ฅ่ชŒๆช”ๆกˆ '%s'"
+
+#: builtin/commit.c:767 builtin/commit.c:783
+msgid "could not read SQUASH_MSG"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– SQUASH_MSG"
+
+#: builtin/commit.c:774
+msgid "could not read MERGE_MSG"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– MERGE_MSG"
+
+#: builtin/commit.c:834
+msgid "could not write commit template"
+msgstr "ไธ่ƒฝๅฏซๆไบค็ฏ„ๆœฌ"
+
+#: builtin/commit.c:853
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"ไผผไนŽๆ‚จๆญฃๅœจๅšไธ€ๅ€‹ๅˆไฝตๆไบคใ€‚ๅฆ‚ๆžœไธๅฐ๏ผŒ่ซ‹ๅˆช้™คๆช”ๆกˆ\n"
+"\t%s\n"
+"็„ถๅพŒ้‡่ฉฆใ€‚\n"
+
+#: builtin/commit.c:858
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"ไผผไนŽๆ‚จๆญฃๅœจๅšไธ€ๅ€‹ๆ€้ธๆไบคใ€‚ๅฆ‚ๆžœไธๅฐ๏ผŒ่ซ‹ๅˆช้™คๆช”ๆกˆ\n"
+"\t%s\n"
+"็„ถๅพŒ้‡่ฉฆใ€‚\n"
+
+#: builtin/commit.c:871
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"่ซ‹็‚บๆ‚จ็š„่ฎŠๆ›ด่ผธๅ…ฅๆไบค่ชชๆ˜Žใ€‚ไปฅ '%c' ้–‹ๅง‹็š„่กŒๅฐ‡่ขซๅฟฝ็•ฅ๏ผŒ่€Œไธ€ๅ€‹็ฉบ็š„ๆไบค\n"
+"่ชชๆ˜Žๅฐ‡ๆœƒ็ต‚ๆญขๆไบคใ€‚\n"
+
+#: builtin/commit.c:879
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"่ซ‹็‚บๆ‚จ็š„่ฎŠๆ›ด่ผธๅ…ฅๆไบค่ชชๆ˜Žใ€‚ไปฅ '%c' ้–‹ๅง‹็š„่กŒๅฐ‡่ขซไฟ็•™๏ผŒๅฆ‚ๆžœๆ‚จๅŽŸๆ„\n"
+"ไนŸๅฏไปฅๅˆช้™คๅฎƒๅ€‘ใ€‚ไธ€ๅ€‹็ฉบ็š„ๆไบค่ชชๆ˜Žๅฐ‡ๆœƒ็ต‚ๆญขๆไบคใ€‚\n"
+
+#  ่ญฏ่€…๏ผš็‚บไฟ่ญ‰ๅœจ่ผธๅ‡บไธญๅฐ้ฝŠ๏ผŒๆณจๆ„่ชฟๆ•ดๅฅไธญ็ฉบๆ ผ๏ผ
+#: builtin/commit.c:896
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr "%sไฝœ่€…๏ผš  %.*s <%.*s>"
+
+#  ่ญฏ่€…๏ผš็‚บไฟ่ญ‰ๅœจ่ผธๅ‡บไธญๅฐ้ฝŠ๏ผŒๆณจๆ„่ชฟๆ•ดๅฅไธญ็ฉบๆ ผ๏ผ
+#: builtin/commit.c:904
+#, c-format
+msgid "%sDate:      %s"
+msgstr "%sๆ—ฅๆœŸ๏ผš  %s"
+
+#  ่ญฏ่€…๏ผš็‚บไฟ่ญ‰ๅœจ่ผธๅ‡บไธญๅฐ้ฝŠ๏ผŒๆณจๆ„่ชฟๆ•ดๅฅไธญ็ฉบๆ ผ๏ผ
+#: builtin/commit.c:911
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sๆไบค่€…๏ผš%.*s <%.*s>"
+
+#: builtin/commit.c:929
+msgid "Cannot read index"
+msgstr "็„กๆณ•่ฎ€ๅ–็ดขๅผ•"
+
+#: builtin/commit.c:997
+msgid "Error building trees"
+msgstr "็„กๆณ•ๅปบ็ซ‹ๆจน็‹€็‰ฉไปถ"
+
+#: builtin/commit.c:1011 builtin/tag.c:275
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "่ซ‹ไฝฟ็”จ -m ๆˆ– -F ้ธ้ …ๆไพ›ๆไบค่ชชๆ˜Žใ€‚\n"
+
+#: builtin/commit.c:1055
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr "--author '%s' ไธๆ˜ฏ 'ๅง“ๅ <ไฟก็ฎฑ>' ๆ ผๅผ๏ผŒไธ”ๆœช่ƒฝๅœจ็พๆœ‰ไฝœ่€…ไธญๆ‰พๅˆฐ็ฌฆๅˆ"
+
+#: builtin/commit.c:1069
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "็„กๆ•ˆ็š„ๅฟฝ็•ฅๆจกๅผ '%s'"
+
+#: builtin/commit.c:1087 builtin/commit.c:1327
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "็„กๆ•ˆ็š„ๆœช่ฟฝ่นคๆช”ๆกˆๅƒๆ•ธ '%s'"
+
+#: builtin/commit.c:1127
+msgid "--long and -z are incompatible"
+msgstr "--long ๅ’Œ -z ้ธ้ …ไธ็›ธๅฎน"
+
+#: builtin/commit.c:1171
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "ๅŒๆ™‚ไฝฟ็”จ --reset-author ๅ’Œ --author ๆฒ’ๆœ‰ๆ„็พฉ"
+
+#: builtin/commit.c:1180
+msgid "You have nothing to amend."
+msgstr "ๆ‚จๆฒ’ๆœ‰ๅฏไฟฎ่ฃœ็š„ๆไบคใ€‚"
+
+#: builtin/commit.c:1183
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "ๆ‚จๆญฃ่™•ๆ–ผไธ€ๅ€‹ๅˆไฝต้Ž็จ‹ไธญ -- ็„กๆณ•ไฟฎ่ฃœๆไบคใ€‚"
+
+#: builtin/commit.c:1185
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "ๆ‚จๆญฃ่™•ๆ–ผไธ€ๅ€‹ๆ€้ธ้Ž็จ‹ไธญ -- ็„กๆณ•ไฟฎ่ฃœๆไบคใ€‚"
+
+#: builtin/commit.c:1188
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "้ธ้ … --squash ๅ’Œ --fixup ไธ่ƒฝๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/commit.c:1198
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "ๅช่ƒฝ็”จไธ€ๅ€‹ -c/-C/-F/--fixup ้ธ้ …ใ€‚"
+
+#: builtin/commit.c:1200
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "้ธ้ … -m ไธ่ƒฝๅ’Œ -c/-C/-F ๅŒๆ™‚ไฝฟ็”จใ€‚"
+
+#: builtin/commit.c:1208
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author ๅช่ƒฝๅ’Œ -Cใ€-c ๆˆ– --amend ๅŒๆ™‚ไฝฟ็”จใ€‚"
+
+#: builtin/commit.c:1225
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr "ๅช่ƒฝ็”จไธ€ๅ€‹ --include/--only/--all/--interactive/--patch ้ธ้ …ใ€‚"
+
+#: builtin/commit.c:1231
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "่ทฏๅพ‘  '%s ...' ๅ’Œ -a ้ธ้ …ๅŒๆ™‚ไฝฟ็”จๆฒ’ๆœ‰ๆ„็พฉ"
+
+#: builtin/commit.c:1362 builtin/commit.c:1524
+msgid "show status concisely"
+msgstr "ไปฅ็ฐกๆฝ”็š„ๆ ผๅผ้กฏ็คบ็‹€ๆ…‹"
+
+#: builtin/commit.c:1364 builtin/commit.c:1526
+msgid "show branch information"
+msgstr "้กฏ็คบๅˆ†ๆ”ฏ่จŠๆฏ"
+
+#: builtin/commit.c:1366
+msgid "show stash information"
+msgstr "้กฏ็คบๅ„ฒ่—ๅ€่จŠๆฏ"
+
+#: builtin/commit.c:1368 builtin/commit.c:1528
+msgid "compute full ahead/behind values"
+msgstr "่จˆ็ฎ—ๅฎŒๆ•ด็š„้ ˜ๅ…ˆ/่ฝๅพŒๅ€ผ"
+
+#: builtin/commit.c:1370
+msgid "version"
+msgstr "็‰ˆๆœฌ"
+
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
+msgid "machine-readable output"
+msgstr "ๆฉŸๅ™จๅฏ่ฎ€็š„่ผธๅ‡บ"
+
+#: builtin/commit.c:1373 builtin/commit.c:1532
+msgid "show status in long format (default)"
+msgstr "ไปฅ้•ทๆ ผๅผ้กฏ็คบ็‹€ๆ…‹๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/commit.c:1376 builtin/commit.c:1535
+msgid "terminate entries with NUL"
+msgstr "ๆข็›ฎไปฅ NUL ๅญ—ๅ…ƒ็ตๅฐพ"
+
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+msgid "mode"
+msgstr "ๆจกๅผ"
+
+#: builtin/commit.c:1379 builtin/commit.c:1538
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr "้กฏ็คบๆœช่ฟฝ่นค็š„ๆช”ๆกˆ๏ผŒใ€Œๆจกๅผใ€็š„ๅฏ้ธๅƒๆ•ธ๏ผšallใ€normalใ€noใ€‚๏ผˆ้ ่จญ๏ผšall๏ผ‰"
+
+#: builtin/commit.c:1383
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"้กฏ็คบๅทฒๅฟฝ็•ฅ็š„ๆช”ๆกˆ๏ผŒๅฏ้ธๆจกๅผ๏ผštraditionalใ€matchingใ€noใ€‚๏ผˆ้ ่จญ๏ผštraditional๏ผ‰"
+
+#: builtin/commit.c:1385 parse-options.h:192
+msgid "when"
+msgstr "ไฝ•ๆ™‚"
+
+#: builtin/commit.c:1386
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"ๅฟฝ็•ฅๅญๆจก็ต„็š„ๆ›ดๆ”น๏ผŒใ€Œไฝ•ๆ™‚ใ€็š„ๅฏ้ธๅƒๆ•ธ๏ผšallใ€dirtyใ€untrackedใ€‚๏ผˆ้ ่จญ๏ผšall๏ผ‰"
+
+#: builtin/commit.c:1388
+msgid "list untracked files in columns"
+msgstr "ไปฅๅˆ—็š„ๆ–นๅผ้กฏ็คบๆœช่ฟฝ่นค็š„ๆช”ๆกˆ"
+
+#: builtin/commit.c:1389
+msgid "do not detect renames"
+msgstr "ไธๆชขๆธฌ้‡ๆ–ฐๅ‘ฝๅ"
+
+#: builtin/commit.c:1391
+msgid "detect renames, optionally set similarity index"
+msgstr "ๆชขๆธฌ้‡ๆ–ฐๅ‘ฝๅ๏ผŒๅฏไปฅ่จญๅฎš็ดขๅผ•็›ธไผผๅบฆ"
+
+#: builtin/commit.c:1411
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "ไธๆ”ฏๆดๅทฒๅฟฝ็•ฅๅ’Œๆœช่ฟฝ่นคๆช”ๆกˆๅƒๆ•ธ็š„็ต„ๅˆ"
+
+#: builtin/commit.c:1494
+msgid "suppress summary after successful commit"
+msgstr "ๆไบคๆˆๅŠŸๅพŒไธ้กฏ็คบๆฆ‚่ฟฐ่จŠๆฏ"
+
+#: builtin/commit.c:1495
+msgid "show diff in commit message template"
+msgstr "ๅœจๆไบค่ชชๆ˜Ž็ฏ„ๆœฌ่ฃก้กฏ็คบๅทฎ็•ฐ"
+
+#: builtin/commit.c:1497
+msgid "Commit message options"
+msgstr "ๆไบค่ชชๆ˜Ž้ธ้ …"
+
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+msgid "read message from file"
+msgstr "ๅพžๆช”ๆกˆไธญ่ฎ€ๅ–ๆไบค่ชชๆ˜Ž"
+
+#: builtin/commit.c:1499
+msgid "author"
+msgstr "ไฝœ่€…"
+
+#: builtin/commit.c:1499
+msgid "override author for commit"
+msgstr "ๆไบคๆ™‚่ฆ†่“‹ไฝœ่€…"
+
+#: builtin/commit.c:1500 builtin/gc.c:538
+msgid "date"
+msgstr "ๆ—ฅๆœŸ"
+
+#: builtin/commit.c:1500
+msgid "override date for commit"
+msgstr "ๆไบคๆ™‚่ฆ†่“‹ๆ—ฅๆœŸ"
+
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+msgid "commit"
+msgstr "ๆไบค"
+
+#: builtin/commit.c:1502
+msgid "reuse and edit message from specified commit"
+msgstr "้‡็”จไธฆ็ทจ่ผฏๆŒ‡ๅฎšๆไบค็š„ๆไบค่ชชๆ˜Ž"
+
+#: builtin/commit.c:1503
+msgid "reuse message from specified commit"
+msgstr "้‡็”จๆŒ‡ๅฎšๆไบค็š„ๆไบค่ชชๆ˜Ž"
+
+#: builtin/commit.c:1504
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr "ไฝฟ็”จ autosquash ๆ ผๅผ็š„ๆไบค่ชชๆ˜Ž็”จไปฅไฟฎๆญฃๆŒ‡ๅฎš็š„ๆไบค"
+
+#: builtin/commit.c:1505
+msgid "use autosquash formatted message to squash specified commit"
+msgstr "ไฝฟ็”จ autosquash ๆ ผๅผ็š„ๆไบค่ชชๆ˜Ž็”จไปฅๅฃ“็ธฎ่‡ณๆŒ‡ๅฎš็š„ๆไบค"
+
+#: builtin/commit.c:1506
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "็พๅœจๅฐ‡่ฉฒๆไบค็š„ไฝœ่€…ๆ”น็‚บๆˆ‘๏ผˆๅ’Œ -C/-c/--amend ๅƒๆ•ธๅ…ฑ็”จ๏ผ‰"
+
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
+msgid "add Signed-off-by:"
+msgstr "ๆ–ฐๅขž Signed-off-by: ็ฐฝๅ"
+
+#: builtin/commit.c:1508
+msgid "use specified template file"
+msgstr "ไฝฟ็”จๆŒ‡ๅฎš็š„็ฏ„ๆœฌๆช”ๆกˆ"
+
+#: builtin/commit.c:1509
+msgid "force edit of commit"
+msgstr "ๅผทๅˆถ็ทจ่ผฏๆไบค"
+
+#: builtin/commit.c:1511
+msgid "include status in commit message template"
+msgstr "ๅœจๆไบค่ชชๆ˜Ž็ฏ„ๆœฌ่ฃกๅŒ…ๅซ็‹€ๆ…‹่จŠๆฏ"
+
+#: builtin/commit.c:1516
+msgid "Commit contents options"
+msgstr "ๆไบคๅ…งๅฎน้ธ้ …"
+
+#: builtin/commit.c:1517
+msgid "commit all changed files"
+msgstr "ๆไบคๆ‰€ๆœ‰ๆ”นๅ‹•็š„ๆช”ๆกˆ"
+
+#: builtin/commit.c:1518
+msgid "add specified files to index for commit"
+msgstr "ๆ–ฐๅขžๆŒ‡ๅฎš็š„ๆช”ๆกˆๅˆฐ็ดขๅผ•ๅ€็ญ‰ๅพ…ๆไบค"
+
+#: builtin/commit.c:1519
+msgid "interactively add files"
+msgstr "ไบ’ๅ‹•ๅผๆ–ฐๅขžๆช”ๆกˆ"
+
+#: builtin/commit.c:1520
+msgid "interactively add changes"
+msgstr "ไบ’ๅ‹•ๅผๆ–ฐๅขž่ฎŠๆ›ด"
+
+#: builtin/commit.c:1521
+msgid "commit only specified files"
+msgstr "ๅชๆไบคๆŒ‡ๅฎš็š„ๆช”ๆกˆ"
+
+#: builtin/commit.c:1522
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "็นž้Ž pre-commit ๅ’Œ commit-msg ๆŽ›้‰ค"
+
+#: builtin/commit.c:1523
+msgid "show what would be committed"
+msgstr "้กฏ็คบๅฐ‡่ฆๆไบค็š„ๅ…งๅฎน"
+
+#: builtin/commit.c:1536
+msgid "amend previous commit"
+msgstr "ไฟฎๆ”นๅ…ˆๅ‰็š„ๆไบค"
+
+#: builtin/commit.c:1537
+msgid "bypass post-rewrite hook"
+msgstr "็นž้Ž post-rewrite ๆŽ›้‰ค"
+
+#: builtin/commit.c:1544
+msgid "ok to record an empty change"
+msgstr "ๅ…่จฑไธ€ๅ€‹็ฉบๆไบค"
+
+#: builtin/commit.c:1546
+msgid "ok to record a change with an empty message"
+msgstr "ๅ…่จฑ็ฉบ็š„ๆไบค่ชชๆ˜Ž"
+
+#: builtin/commit.c:1619
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "ๆๅฃž็š„ MERGE_HEAD ๆช”ๆกˆ๏ผˆ%s๏ผ‰"
+
+#: builtin/commit.c:1626
+msgid "could not read MERGE_MODE"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– MERGE_MODE"
+
+#: builtin/commit.c:1645
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–ๆไบค่ชชๆ˜Ž๏ผš%s"
+
+#: builtin/commit.c:1652
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "็ต‚ๆญขๆไบคๅ› ็‚บๆไบค่ชชๆ˜Ž็‚บ็ฉบใ€‚\n"
+
+#: builtin/commit.c:1657
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "็ต‚ๆญขๆไบค๏ผ›ๆ‚จๆœชๆ›ดๆ”นไพ†่‡ช็ฏ„ๆœฌ็š„ๆไบค่ชชๆ˜Žใ€‚\n"
+
+#: builtin/commit.c:1691
+msgid ""
+"repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git restore --staged :/\" to recover."
+msgstr ""
+"็‰ˆๆœฌๅบซๅทฒๆ›ดๆ–ฐ๏ผŒไฝ†็„กๆณ•ๅฏซ new_index ๆช”ๆกˆใ€‚ๆชขๆŸฅๆ˜ฏๅฆ็ฃ็ขŸๅทฒๆปฟๆˆ–\n"
+"็ฃ็ขŸ้…้กๅทฒ่€—็›ก๏ผŒ็„ถๅพŒๅŸท่กŒ \"git restore --staged :/\" ๅพฉๅŽŸใ€‚"
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <็‰ฉไปถ็›ฎ้Œ„>] [--shallow] [--"
+"[no-]progress]"
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <็‰ฉไปถ็›ฎ้Œ„>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
+
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "ๆ‰พไธๅˆฐ็ฌฆๅˆ %s ็š„็‰ฉไปถ็›ฎ้Œ„"
+
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
+msgid "dir"
+msgstr "็›ฎ้Œ„"
+
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
+msgid "The object directory to store the graph"
+msgstr "ๅ„ฒๅญ˜ๅœ–ๅฝข็š„็‰ฉไปถ็›ฎ้Œ„"
+
+#: builtin/commit-graph.c:71
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "ๅฆ‚ๆžœๆไบคๅœ–ๅฝข่ขซๅˆ†ๅ‰ฒ๏ผŒๅช้ฉ—่ญ‰้ ญไธ€ๅ€‹ๆช”ๆกˆ"
+
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "็„กๆณ•้–‹ๅ•Ÿๆไบคๅœ–ๅฝข '%s'"
+
+#: builtin/commit-graph.c:128
+msgid "start walk at all refs"
+msgstr "้–‹ๅง‹้ๆญทๆ‰€ๆœ‰ๅผ•็”จ"
+
+#: builtin/commit-graph.c:130
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅไธญ็š„ๅŒ…็ดขๅผ•ๆช”ๆกˆๅˆ—่กจไธญๆŽƒๆๆไบค"
+
+#: builtin/commit-graph.c:132
+msgid "start walk at commits listed by stdin"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅไธญ็š„ๆไบค้–‹ๅง‹ๆŽƒๆ"
+
+#: builtin/commit-graph.c:134
+msgid "include all commits already in the commit-graph file"
+msgstr "ๅŒ…ๅซ commit-graph ๆช”ๆกˆไธญๅทฒๆœ‰ๆ‰€ๆœ‰ๆไบค"
+
+#: builtin/commit-graph.c:137
+msgid "allow writing an incremental commit-graph file"
+msgstr "ๅ…่จฑๅฏซไธ€ๅ€‹ๅขž้‡ๆไบคๅœ–ๅฝขๆช”ๆกˆ"
+
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "ๅœจ้žๅŸบๆœฌๅˆ†ๅ‰ฒๆไบคๅœ–ๅฝขไธญ็š„ๆœ€ๅคงๆไบคๆ•ธ"
+
+#: builtin/commit-graph.c:141
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "ไธ€ๅ€‹ๅˆ†ๅ‰ฒๆไบคๅœ–ๅฝข็š„ๅ…ฉๅ€‹็ดšๅˆฅไน‹้–“็š„ๆœ€ๅคงๆฏ”็Ž‡"
+
+#: builtin/commit-graph.c:159
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "ไธ่ƒฝๅŒๆ™‚ไฝฟ็”จ --reachableใ€--stdin-commits ๆˆ– --stdin-packs"
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<้ธ้ …>]"
+
+#: builtin/config.c:104 builtin/env--helper.c:23
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ --type ๅƒๆ•ธ๏ผŒ%s"
+
+#: builtin/config.c:116
+msgid "only one type at a time"
+msgstr "ไธ€ๆฌกๅช่ƒฝไธ€ๅ€‹้กžๅž‹"
+
+#: builtin/config.c:125
+msgid "Config file location"
+msgstr "่จญๅฎšๆช”ๆกˆไฝ็ฝฎ"
+
+#: builtin/config.c:126
+msgid "use global config file"
+msgstr "ไฝฟ็”จๅ…จๅŸŸ่จญๅฎšๆช”ๆกˆ"
+
+#: builtin/config.c:127
+msgid "use system config file"
+msgstr "ไฝฟ็”จ็ณป็ตฑ็ดš่จญๅฎšๆช”ๆกˆ"
+
+#: builtin/config.c:128
+msgid "use repository config file"
+msgstr "ไฝฟ็”จ็‰ˆๆœฌๅบซ็ดš่จญๅฎšๆช”ๆกˆ"
+
+#: builtin/config.c:129
+msgid "use per-worktree config file"
+msgstr "ไฝฟ็”จๅทฅไฝœๅ€็ดšๅˆฅ็š„่จญๅฎšๆช”ๆกˆ"
+
+#: builtin/config.c:130
+msgid "use given config file"
+msgstr "ไฝฟ็”จๆŒ‡ๅฎš็š„่จญๅฎšๆช”ๆกˆ"
+
+#: builtin/config.c:131
+msgid "blob-id"
+msgstr "่ณ‡ๆ–™็‰ฉไปถ ID"
+
+#: builtin/config.c:131
+msgid "read config from given blob object"
+msgstr "ๅพžๆไพ›็š„่ณ‡ๆ–™็‰ฉไปถ่ฎ€ๅ–่จญๅฎš"
+
+#: builtin/config.c:132
+msgid "Action"
+msgstr "ๅ‹•ไฝœ"
+
+#: builtin/config.c:133
+msgid "get value: name [value-regex]"
+msgstr "ๅ–ๅพ—ๅ€ผ๏ผšname [value-regex]"
+
+#: builtin/config.c:134
+msgid "get all values: key [value-regex]"
+msgstr "็ฒๅพ—ๆ‰€ๆœ‰็š„ๅ€ผ๏ผškey [value-regex]"
+
+#: builtin/config.c:135
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr "ๆ นๆ“šๆญฃ่ฆ่กจ็คบๅผ็ฒๅพ—ๅ€ผ๏ผšname-regex [value-regex]"
+
+#: builtin/config.c:136
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "็ฒๅพ— URL ๅ–ๅ€ผ๏ผšsection[.var] URL"
+
+#: builtin/config.c:137
+msgid "replace all matching variables: name value [value_regex]"
+msgstr "ๅ–ไปฃๆ‰€ๆœ‰็ฌฆๅˆ็š„่ฎŠๆ•ธ๏ผšname value [value_regex]"
+
+#: builtin/config.c:138
+msgid "add a new variable: name value"
+msgstr "ๆ–ฐๅขžไธ€ๅ€‹ๆ–ฐ็š„่ฎŠๆ•ธ๏ผšname value"
+
+#: builtin/config.c:139
+msgid "remove a variable: name [value-regex]"
+msgstr "ๅˆช้™คไธ€ๅ€‹่ฎŠๆ•ธ๏ผšname [value-regex]"
+
+#: builtin/config.c:140
+msgid "remove all matches: name [value-regex]"
+msgstr "ๅˆช้™คๆ‰€ๆœ‰็ฌฆๅˆ้ …๏ผšname [value-regex]"
+
+#: builtin/config.c:141
+msgid "rename section: old-name new-name"
+msgstr "้‡ๆ–ฐๅ‘ฝๅๅฐ็ฏ€๏ผšold-name new-name"
+
+#: builtin/config.c:142
+msgid "remove a section: name"
+msgstr "ๅˆช้™คไธ€ๅ€‹ๅฐ็ฏ€๏ผšname"
+
+#: builtin/config.c:143
+msgid "list all"
+msgstr "ๅ…จ้ƒจๅˆ—ๅ‡บ"
+
+#: builtin/config.c:144
+msgid "open an editor"
+msgstr "้–‹ๅ•Ÿไธ€ๅ€‹็ทจ่ผฏๅ™จ"
+
+#: builtin/config.c:145
+msgid "find the color configured: slot [default]"
+msgstr "็ฒๅพ—่จญๅฎš็š„้ก่‰ฒ๏ผš่จญๅฎš [้ ่จญ]"
+
+#: builtin/config.c:146
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "็ฒๅพ—้ก่‰ฒ่จญๅฎš๏ผš่จญๅฎš [stdout-is-tty]"
+
+#: builtin/config.c:147
+msgid "Type"
+msgstr "้กžๅž‹"
+
+#: builtin/config.c:148 builtin/env--helper.c:38
+msgid "value is given this type"
+msgstr "ๅ–ๅ€ผ็‚บ่ฉฒ้กžๅž‹"
+
+#: builtin/config.c:149
+msgid "value is \"true\" or \"false\""
+msgstr "ๅ€ผๆ˜ฏ \"true\" ๆˆ– \"false\""
+
+#: builtin/config.c:150
+msgid "value is decimal number"
+msgstr "ๅ€ผๆ˜ฏๅ้€ฒไฝๆ•ธ"
+
+#: builtin/config.c:151
+msgid "value is --bool or --int"
+msgstr "ๅ€ผๆ˜ฏ --bool or --int"
+
+#: builtin/config.c:152
+msgid "value is a path (file or directory name)"
+msgstr "ๅ€ผๆ˜ฏไธ€ๅ€‹่ทฏๅพ‘๏ผˆๆช”ๆกˆๆˆ–็›ฎ้Œ„ๅ๏ผ‰"
+
+#: builtin/config.c:153
+msgid "value is an expiry date"
+msgstr "ๅ€ผๆ˜ฏไธ€ๅ€‹ๅˆฐๆœŸๆ—ฅๆœŸ"
+
+#: builtin/config.c:154
+msgid "Other"
+msgstr "ๅ…ถๅฎƒ"
+
+#: builtin/config.c:155
+msgid "terminate values with NUL byte"
+msgstr "็ต‚ๆญขๅ€ผๆ˜ฏ NUL ไฝๅ…ƒ็ต„"
+
+#: builtin/config.c:156
+msgid "show variable names only"
+msgstr "ๅช้กฏ็คบ่ฎŠๆ•ธๅ"
+
+#: builtin/config.c:157
+msgid "respect include directives on lookup"
+msgstr "ๆŸฅ่ฉขๆ™‚ๅƒ็…ง include ๆŒ‡ไปค้ž่ฟดๅฐ‹ๆ‰พ"
+
+#: builtin/config.c:158
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr "้กฏ็คบ่จญๅฎš็š„ไพ†ๆบ๏ผˆๆช”ๆกˆใ€ๆจ™ๆบ–่ผธๅ…ฅใ€่ณ‡ๆ–™็‰ฉไปถ๏ผŒๆˆ–ๆŒ‡ไปคๅˆ—๏ผ‰"
+
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"้กฏ็คบ่จญๅฎšๆช”็š„ไฝœ็”จๅŸŸ (ๅทฅไฝœๅ€ worktreeใ€ๆœฌๆฉŸ localใ€ๅ…จๅŸŸ globalใ€็ณป็ตฑ systemใ€ๆŒ‡"
+"ไปค command)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
+msgid "value"
+msgstr "ๅ–ๅ€ผ"
+
+#: builtin/config.c:160
+msgid "with --get, use default value when missing entry"
+msgstr "ไฝฟ็”จ --get ไฝ†ๆœชๆŒ‡ๅฎšๅƒๆ•ธๆ™‚ๆ‰€ไฝฟ็”จ็š„้ ่จญๅ€ผ"
+
+#: builtin/config.c:174
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "้Œฏ่ชค็š„ๅƒๆ•ธๅ€‹ๆ•ธ๏ผŒๆ‡‰่ฉฒ็‚บ %d ๅ€‹"
+
+#: builtin/config.c:176
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "้Œฏ่ชค็š„ๅƒๆ•ธๅ€‹ๆ•ธ๏ผŒๆ‡‰่ฉฒ็‚บๅพž %d ๅ€‹ๅˆฐ %d ๅ€‹"
+
+#: builtin/config.c:324
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "็„กๆ•ˆ้ตๅๆจกๅผ๏ผš%s"
+
+#: builtin/config.c:360
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "ๆ ผๅผๅŒ–้ ่จญ่จญๅฎšๅ€ผๅคฑๆ•—๏ผš%s"
+
+#: builtin/config.c:417
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "็„กๆณ•่งฃๆž้ก่‰ฒ '%s'"
+
+#: builtin/config.c:459
+msgid "unable to parse default color value"
+msgstr "็„กๆณ•่งฃๆž้ ่จญ้ก่‰ฒๅ€ผ"
+
+#: builtin/config.c:512 builtin/config.c:768
+msgid "not in a git directory"
+msgstr "ไธๅœจ git ็‰ˆๆœฌๅบซไธญ"
+
+#: builtin/config.c:515
+msgid "writing to stdin is not supported"
+msgstr "ไธๆ”ฏๆดๅฏซๅˆฐๆจ™ๆบ–่ผธๅ…ฅ"
+
+#: builtin/config.c:518
+msgid "writing config blobs is not supported"
+msgstr "ไธๆ”ฏๆดๅฏซๅˆฐ่จญๅฎš่ณ‡ๆ–™็‰ฉไปถ"
+
+#: builtin/config.c:603
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:627
+msgid "only one config file at a time"
+msgstr "ไธ€ๆฌกๅช่ƒฝๆœ‰ไธ€ๅ€‹่จญๅฎšๆช”ๆกˆ"
+
+#: builtin/config.c:632
+msgid "--local can only be used inside a git repository"
+msgstr "--local ๅช่ƒฝๅœจไธ€ๅ€‹็‰ˆๆœฌๅบซๅ…งไฝฟ็”จ"
+
+#: builtin/config.c:635
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob ๅช่ƒฝๅœจไธ€ๅ€‹็‰ˆๆœฌๅบซๅ…งไฝฟ็”จ"
+
+#: builtin/config.c:655
+msgid "$HOME not set"
+msgstr "$HOME ๆœช่จญๅฎš"
+
+#: builtin/config.c:679
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
+msgstr ""
+"ไธ่ƒฝๅ’Œๅคšๅ€‹ๅทฅไฝœๅ€ไธ€่ตทไฝฟ็”จ --worktree๏ผŒ้™ค้žๅ•Ÿ็”จ worktreeConfig ่จญๅฎšๆ“ดๅฑ•ใ€‚\n"
+"่ฉณๆƒ…่ซ‹้–ฑ่ฎ€ใ€Œgit help worktreeใ€็š„ใ€ŒCONFIGURATION FILEใ€ๅฐ็ฏ€"
+
+#: builtin/config.c:714
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color ๅ’Œ่ฎŠๆ•ธ้กžๅž‹ไธ็›ธๅฎน"
+
+#: builtin/config.c:719
+msgid "only one action at a time"
+msgstr "ไธ€ๆฌกๅช่ƒฝๆœ‰ไธ€ๅ€‹ๅ‹•ไฝœ"
+
+#: builtin/config.c:732
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only ๅƒ…้ฉ็”จๆ–ผ --list ๆˆ– --get-regexp"
+
+#: builtin/config.c:738
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr "--show-origin ๅƒ…้ฉ็”จๆ–ผ --getใ€--get-allใ€--get-regexp ๅ’Œ --list"
+
+#: builtin/config.c:744
+msgid "--default is only applicable to --get"
+msgstr "--default ๅƒ…้ฉ็”จๆ–ผ --get"
+
+#: builtin/config.c:757
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "็„กๆณ•่ฎ€ๅ–่จญๅฎšๆช”ๆกˆ '%s'"
+
+#: builtin/config.c:760
+msgid "error processing config file(s)"
+msgstr "่™•็†่จญๅฎšๆช”ๆกˆ็™ผ็”Ÿ้Œฏ่ชค"
+
+#: builtin/config.c:770
+msgid "editing stdin is not supported"
+msgstr "ไธๆ”ฏๆด็ทจ่ผฏๆจ™ๆบ–่ผธๅ…ฅ"
+
+#: builtin/config.c:772
+msgid "editing blobs is not supported"
+msgstr "ไธๆ”ฏๆด็ทจ่ผฏ่ณ‡ๆ–™็‰ฉไปถ"
+
+#: builtin/config.c:786
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "ไธ่ƒฝๅปบ็ซ‹่จญๅฎšๆช”ๆกˆ %s"
+
+#: builtin/config.c:799
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"็„กๆณ•็”จไธ€ๅ€‹ๅ€ผ่ฆ†่“‹ๅคšๅ€‹ๅ€ผ\n"
+"       ไฝฟ็”จไธ€ๅ€‹ๆญฃ่ฆ่กจ็คบๅผใ€--add ๆˆ– --replace-all ไพ†ไฟฎๆ”น %sใ€‚"
+
+#: builtin/config.c:873 builtin/config.c:884
+#, c-format
+msgid "no such section: %s"
+msgstr "็„กๆญคๅฐ็ฏ€๏ผš%s"
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr "ไปฅไฝฟ็”จ่€…ๅฏ่ฎ€็š„ๆ ผๅผ้กฏ็คบๅคงๅฐ"
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<้ธ้ …>] [<ๆไบค่™Ÿ>...]"
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<้ธ้ …>] --dirty"
+
+#: builtin/describe.c:62
+msgid "head"
+msgstr "้ ญ"
+
+#: builtin/describe.c:62
+msgid "lightweight"
+msgstr "่ผ•้‡็ดš็š„"
+
+#: builtin/describe.c:62
+msgid "annotated"
+msgstr "้™„่จป็š„"
+
+#: builtin/describe.c:275
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "้™„่จปๆจ™็ฑค %s ็„กๆ•ˆ"
+
+#: builtin/describe.c:279
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "้™„่จปๆจ™็ฑค %s ๆฒ’ๆœ‰ๅตŒๅ…ฅๅ็จฑ"
+
+#: builtin/describe.c:281
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "ๆจ™็ฑค '%s' ็š„็ขบๆ˜ฏๅœจ '%s'"
+
+#: builtin/describe.c:325
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "ๆฒ’ๆœ‰ๆจ™็ฑคๆบ–็ขบ็ฌฆๅˆ '%s'"
+
+#: builtin/describe.c:327
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "ๆฒ’ๆœ‰็ฒพ็ขบ็ฌฆๅˆๅˆฐๅผ•็”จๆˆ–ๆจ™็ฑค๏ผŒ็นผ็บŒๆœๅฐ‹้€ฒ่กŒๆ่ฟฐ\n"
+
+#: builtin/describe.c:394
+#, c-format
+msgid "finished search at %s\n"
+msgstr "ๅฎŒๆˆๆœๅฐ‹ %s\n"
+
+#: builtin/describe.c:421
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"ๆฒ’ๆœ‰้™„่จปๆจ™็ฑค่ƒฝๆ่ฟฐ '%s'ใ€‚\n"
+"็„ถ่€Œ๏ผŒๅญ˜ๅœจๆœช้™„่จปๆจ™็ฑค๏ผšๅ˜—่ฉฆ --tagsใ€‚"
+
+#: builtin/describe.c:425
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"ๆฒ’ๆœ‰ๆจ™็ฑค่ƒฝๆ่ฟฐ '%s'ใ€‚\n"
+"ๅ˜—่ฉฆ --always๏ผŒๆˆ–่€…ๅปบ็ซ‹ไธ€ไบ›ๆจ™็ฑคใ€‚"
+
+#: builtin/describe.c:455
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "ๅทฒ้ๆญท %lu ๅ€‹ๆไบค\n"
+
+#: builtin/describe.c:458
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+"็™ผ็พๅคšๆ–ผ %i ๅ€‹ๆจ™็ฑค๏ผŒๅˆ—ๅ‡บๆœ€่ฟ‘็š„ %i ๅ€‹\n"
+"ๅœจ %s ๆ”พๆฃ„ๆœๅฐ‹\n"
+
+#: builtin/describe.c:526
+#, c-format
+msgid "describe %s\n"
+msgstr "ๆ่ฟฐ %s\n"
+
+#: builtin/describe.c:529
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ฉไปถๅ %s"
+
+#: builtin/describe.c:537
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s ๆ—ขไธๆ˜ฏๆไบคไนŸไธๆ˜ฏ่ณ‡ๆ–™็‰ฉไปถ"
+
+#: builtin/describe.c:551
+msgid "find the tag that comes after the commit"
+msgstr "ๅฐ‹ๆ‰พ่ฉฒๆไบคไน‹ๅพŒ็š„ๆจ™็ฑค"
+
+#: builtin/describe.c:552
+msgid "debug search strategy on stderr"
+msgstr "ๅœจๆจ™ๆบ–้Œฏ่ชคไธŠ้™ค้Œฏๆœๅฐ‹็ญ–็•ฅ"
+
+#: builtin/describe.c:553
+msgid "use any ref"
+msgstr "ไฝฟ็”จไปปๆ„ๅผ•็”จ"
+
+#: builtin/describe.c:554
+msgid "use any tag, even unannotated"
+msgstr "ไฝฟ็”จไปปๆ„ๆจ™็ฑค๏ผŒๅณไฝฟๆœช้™„ๅธถๅ‚™่จป"
+
+#: builtin/describe.c:555
+msgid "always use long format"
+msgstr "ๅง‹็ต‚ไฝฟ็”จ้•ทๆไบค่™Ÿๆ ผๅผ"
+
+#: builtin/describe.c:556
+msgid "only follow first parent"
+msgstr "ๅช่ทŸ้šจ็ฌฌไธ€ๅ€‹็ˆถๆไบค"
+
+#: builtin/describe.c:559
+msgid "only output exact matches"
+msgstr "ๅช่ผธๅ‡บ็ฒพ็ขบ็ฌฆๅˆ"
+
+#: builtin/describe.c:561
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "่€ƒๆ…ฎๆœ€่ฟ‘ <n> ๅ€‹ๆจ™็ฑค๏ผˆ้ ่จญ๏ผš10๏ผ‰"
+
+#: builtin/describe.c:563
+msgid "only consider tags matching <pattern>"
+msgstr "ๅช่€ƒๆ…ฎ็ฌฆๅˆ <ๆจกๅผ> ็š„ๆจ™็ฑค"
+
+#: builtin/describe.c:565
+msgid "do not consider tags matching <pattern>"
+msgstr "ไธ่€ƒๆ…ฎ็ฌฆๅˆ <ๆจกๅผ> ็š„ๆจ™็ฑค"
+
+#: builtin/describe.c:567 builtin/name-rev.c:535
+msgid "show abbreviated commit object as fallback"
+msgstr "้กฏ็คบ็ฐกๅฏซ็š„ๆไบค่™Ÿไฝœ็‚บๅพŒๅ‚™"
+
+#: builtin/describe.c:568 builtin/describe.c:571
+msgid "mark"
+msgstr "ๆจ™่จ˜"
+
+#: builtin/describe.c:569
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "ๅฐๆ–ผ้ซ’ๅทฅไฝœๅ€๏ผŒ่ฟฝๅŠ  <ๆจ™่จ˜>๏ผˆ้ ่จญ๏ผš\"-dirty\"๏ผ‰"
+
+#: builtin/describe.c:572
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "ๅฐๆ–ผๆๅฃž็š„ๅทฅไฝœๅ€๏ผŒ่ฟฝๅŠ  <ๆจ™่จ˜>๏ผˆ้ ่จญ๏ผš\"-broken\"๏ผ‰"
+
+#: builtin/describe.c:590
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long ่ˆ‡ --abbrev=0 ไธ็›ธๅฎน"
+
+#: builtin/describe.c:619
+msgid "No names found, cannot describe anything."
+msgstr "ๆฒ’ๆœ‰็™ผ็พๅ็จฑ๏ผŒ็„กๆณ•ๆ่ฟฐไปปไฝ•ๆฑ่ฅฟใ€‚"
+
+#: builtin/describe.c:670
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty ่ˆ‡ๆไบค่™Ÿไธ็›ธๅฎน"
+
+#: builtin/describe.c:672
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken ่ˆ‡ๆไบค่™Ÿไธ็›ธๅฎน"
+
+#: builtin/diff.c:84
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s'๏ผšไธๆ˜ฏไธ€ๅ€‹ๆญฃ่ฆๆช”ๆกˆๆˆ–็ฌฆ่™Ÿ้€ฃ็ต"
+
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
+msgstr "็„กๆ•ˆ้ธ้ …๏ผš%s"
+
+#: builtin/diff.c:350
+msgid "Not a git repository"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ git ็‰ˆๆœฌๅบซ"
+
+#: builtin/diff.c:394
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "ๆไพ›ไบ†็„กๆ•ˆ็‰ฉไปถ '%s'ใ€‚"
+
+#: builtin/diff.c:403
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "ๆไพ›ไบ†่ถ…้Žๅ…ฉๅ€‹่ณ‡ๆ–™็‰ฉไปถ๏ผš'%s'"
+
+#: builtin/diff.c:408
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "็„กๆณ•่™•็†็š„็‰ฉไปถ '%s'ใ€‚"
+
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<้ธ้ …>] [<ๆไบค> [<ๆไบค>]] [--] [<่ทฏๅพ‘>...]"
+
+#: builtin/difftool.c:260
+#, c-format
+msgid "failed: %d"
+msgstr "ๅคฑๆ•—๏ผš%d"
+
+#: builtin/difftool.c:302
+#, c-format
+msgid "could not read symlink %s"
+msgstr "็„กๆณ•่ฎ€ๅ–็ฌฆ่™Ÿ้€ฃ็ต %s"
+
+#: builtin/difftool.c:304
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "็„กๆณ•่ฎ€ๅ–็ฌฆ่™Ÿ้€ฃ็ตๆช”ๆกˆ %s"
+
+#: builtin/difftool.c:312
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "็„กๆณ•่ฎ€ๅ–็ฌฆ่™Ÿ้€ฃ็ต %2$s ๆŒ‡ๅ‘็š„็‰ฉไปถ %1$s"
+
+#: builtin/difftool.c:413
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+"ไธๆ”ฏๆดๅœจ็›ฎ้Œ„ๆฏ”่ผƒๆจกๅผ๏ผˆ'-d' ๅ’Œ '--dir-diff'๏ผ‰ไธญๆŽก็”จ็ต„ๅˆๅทฎ็•ฐๆ ผๅผ๏ผˆ'-c' ๅ’Œ '--"
+"cc'๏ผ‰ใ€‚"
+
+#: builtin/difftool.c:634
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "ๅ…ฉๅ€‹ๆช”ๆกˆ้ƒฝ่ขซไฟฎๆ”น๏ผš'%s' ๅ’Œ '%s'ใ€‚"
+
+#: builtin/difftool.c:636
+msgid "working tree file has been left."
+msgstr "ๅทฅไฝœๅ€ๆช”ๆกˆ่ขซ็•™ไบ†ไธ‹ไพ†ใ€‚"
+
+#: builtin/difftool.c:647
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "ๆšซๅญ˜ๆช”ๅญ˜ๅœจๆ–ผ '%s'ใ€‚"
+
+#: builtin/difftool.c:648
+msgid "you may want to cleanup or recover these."
+msgstr "ๆ‚จๅฏ่ƒฝๆƒณ่ฆๆธ…็†ๆˆ–่€…ๅพฉๅŽŸๅฎƒๅ€‘ใ€‚"
+
+#: builtin/difftool.c:697
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "ไฝฟ็”จ `diff.guitool` ไปฃๆ›ฟ `diff.tool`"
+
+#: builtin/difftool.c:699
+msgid "perform a full-directory diff"
+msgstr "ๅŸท่กŒไธ€ๅ€‹ๅ…จ็›ฎ้Œ„ๅทฎ็•ฐๆฏ”่ผƒ"
+
+#: builtin/difftool.c:701
+msgid "do not prompt before launching a diff tool"
+msgstr "ๅ•Ÿๅ‹•ๅทฎ็•ฐๆฏ”่ผƒๅทฅๅ…ทไน‹ๅ‰ไธๆ็คบ"
+
+#: builtin/difftool.c:706
+msgid "use symlinks in dir-diff mode"
+msgstr "ๅœจ dir-diff ๆจกๅผไธญไฝฟ็”จ็ฌฆ่™Ÿ้€ฃ็ต"
+
+#: builtin/difftool.c:707
+msgid "tool"
+msgstr "ๅทฅๅ…ท"
+
+#: builtin/difftool.c:708
+msgid "use the specified diff tool"
+msgstr "ไฝฟ็”จๆŒ‡ๅฎš็š„ๅทฎ็•ฐๆฏ”่ผƒๅทฅๅ…ท"
+
+#: builtin/difftool.c:710
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "้กฏ็คบๅฏไปฅ็”จๅœจ `--tool` ๅƒๆ•ธๅพŒ็š„ๅทฎ็•ฐๅทฅๅ…ทๅˆ—่กจ"
+
+#: builtin/difftool.c:713
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr "็•ถๅŸท่กŒ diff ๅทฅๅ…ท่ฟ”ๅ›ž้ž้›ถ้›ข้–‹็ขผๆ™‚๏ผŒไฝฟ 'git-difftool' ้›ข้–‹"
+
+#: builtin/difftool.c:716
+msgid "specify a custom command for viewing diffs"
+msgstr "ๆŒ‡ๅฎšไธ€ๅ€‹็”จๆ–ผๆชข่ฆ–ๅทฎ็•ฐ็š„่‡ช่จ‚ๆŒ‡ไปค"
+
+#: builtin/difftool.c:717
+msgid "passed to `diff`"
+msgstr "ๅ‚ณ้ž็ตฆ `diff`"
+
+#: builtin/difftool.c:732
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool ่ฆๆฑ‚ๅทฅไฝœๅ€ๆˆ–่€… --no-index"
+
+#: builtin/difftool.c:739
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff ๅ’Œ --no-index ไธ็›ธๅฎน"
+
+#: builtin/difftool.c:742
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--guiใ€--tool ๅ’Œ --extcmd ไบ’ๆ–ฅ"
+
+#: builtin/difftool.c:750
+msgid "no <tool> given for --tool=<tool>"
+msgstr "ๆฒ’ๆœ‰็‚บ --tool=<ๅทฅๅ…ท> ๅƒๆ•ธๆไพ› <ๅทฅๅ…ท>"
+
+#: builtin/difftool.c:757
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "ๆฒ’ๆœ‰็‚บ --extcmd=<ๆŒ‡ไปค> ๅƒๆ•ธๆไพ› <ๆŒ‡ไปค>"
+
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <้ธ้ …> <็’ฐๅขƒ่ฎŠๆ•ธ>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "้กžๅž‹"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "git_env_*(...) ็š„้ ่จญๅ€ผ"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "ๅฎ‰้œๆจกๅผ๏ผŒๅชไฝฟ็”จ git_env_*() ็š„ๅ€ผไฝœ็‚บ้›ข้–‹็ขผ"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr "้ธ้ … `--default' ๅ’Œ `type=bool` ๆœŸๆœ›ไธ€ๅ€‹ๅธƒๆž—ๅ€ผ๏ผŒไธๆ˜ฏ `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr "้ธ้ … `--default' ๅ’Œ `type=ulong` ๆœŸๆœ›ไธ€ๅ€‹็„ก็ฌฆ่™Ÿ้•ทๆ•ดๅž‹๏ผŒไธๆ˜ฏ `%s`"
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [rev-list-opts]"
+
+#: builtin/fast-export.c:853
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr "้Œฏ่ชค๏ผš้™ค้žๆŒ‡ๅฎš --mark-tags๏ผŒๅฆๅ‰‡็„กๆณ•ๅŒฏๅ‡บๅตŒๅฅ—ๆจ™็ฑคใ€‚"
+
+#: builtin/fast-export.c:1152
+msgid "show progress after <n> objects"
+msgstr "ๅœจ <n> ๅ€‹็‰ฉไปถไน‹ๅพŒ้กฏ็คบ้€ฒๅบฆ"
+
+#: builtin/fast-export.c:1154
+msgid "select handling of signed tags"
+msgstr "้ธๆ“‡ๅฆ‚ไฝ•่™•็†็ฐฝๅๆจ™็ฑค"
+
+#: builtin/fast-export.c:1157
+msgid "select handling of tags that tag filtered objects"
+msgstr "้ธๆ“‡็•ถๆจ™็ฑคๆŒ‡ๅ‘่ขซ้Žๆฟพ็‰ฉไปถๆ™‚่ฉฒๆจ™็ฑค็š„่™•็†ๆ–นๅผ"
+
+#: builtin/fast-export.c:1160
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "้ธๆ“‡ไฝฟ็”จๅ‚™็”จ็ทจ็ขผ่™•็†ๆไบค่ชชๆ˜Ž"
+
+#: builtin/fast-export.c:1163
+msgid "Dump marks to this file"
+msgstr "ๆŠŠๆจ™่จ˜ๅ„ฒๅญ˜ๅˆฐ้€™ๅ€‹ๆช”ๆกˆ"
+
+#: builtin/fast-export.c:1165
+msgid "Import marks from this file"
+msgstr "ๅพž้€™ๅ€‹ๆช”ๆกˆๅŒฏๅ…ฅๆจ™่จ˜"
+
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr "ๅพž่ฉฒๆช”ๆกˆๅŒฏๅ…ฅๆจ™่จ˜๏ผˆๅฆ‚ๆžœๅญ˜ๅœจ็š„่ฉฑ๏ผ‰"
+
+#: builtin/fast-export.c:1171
+msgid "Fake a tagger when tags lack one"
+msgstr "็•ถๆจ™็ฑค็ผบๅฐ‘ๆจ™่จ˜่€…ๆฌ„ไฝๆ™‚๏ผŒๅ‡่ฃๆไพ›ไธ€ๅ€‹"
+
+#: builtin/fast-export.c:1173
+msgid "Output full tree for each commit"
+msgstr "ๆฏๆฌกๆไบค้ƒฝ่ผธๅ‡บๆ•ดๅ€‹ๆจน"
+
+#: builtin/fast-export.c:1175
+msgid "Use the done feature to terminate the stream"
+msgstr "ไฝฟ็”จ done ๅŠŸ่ƒฝไพ†็ต‚ๆญขๆต"
+
+#: builtin/fast-export.c:1176
+msgid "Skip output of blob data"
+msgstr "่ทณ้Ž่ณ‡ๆ–™็‰ฉไปถ็š„่ผธๅ‡บ"
+
+#: builtin/fast-export.c:1177 builtin/log.c:1705
+msgid "refspec"
+msgstr "ๅผ•็”จ่ฆๆ ผ"
+
+#: builtin/fast-export.c:1178
+msgid "Apply refspec to exported refs"
+msgstr "ๅฐๅŒฏๅ‡บ็š„ๅผ•็”จๆ‡‰็”จๅผ•็”จ่ฆๆ ผ"
+
+#: builtin/fast-export.c:1179
+msgid "anonymize output"
+msgstr "ๅŒฟๅ่ผธๅ‡บ"
+
+#: builtin/fast-export.c:1181
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr "ๅผ•็”จ็ˆถ็‰ฉไปถ ID ไธๅœจ fast-export ๆตไธญ"
+
+#: builtin/fast-export.c:1183
+msgid "Show original object ids of blobs/commits"
+msgstr "้กฏ็คบ่ณ‡ๆ–™็‰ฉไปถ/ๆไบค็š„ๅŽŸๅง‹็‰ฉไปถ ID"
+
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr "ๅฐๅธถๆœ‰ๆจ™่จ˜ ID ็š„ๆจ™็ฑคๅšๆจ™่จ˜"
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr "ไธ่ƒฝๅŒๆ™‚ๅ‚ณ้žๅƒๆ•ธ --import-marks ๅ’Œ --import-marks-if-exists"
+
+#: builtin/fetch.c:34
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<้ธ้ …>] [<็‰ˆๆœฌๅบซ> [<ๅผ•็”จ่ฆๆ ผ>...]]"
+
+#: builtin/fetch.c:35
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<้ธ้ …>] <็ต„>"
+
+#: builtin/fetch.c:36
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<้ธ้ …>] [(<็‰ˆๆœฌๅบซ> | <็ต„>)...]"
+
+#: builtin/fetch.c:37
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<้ธ้ …>]"
+
+#: builtin/fetch.c:116
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel ไธ่ƒฝ็‚บ่ฒ ๆ•ธ"
+
+#: builtin/fetch.c:139 builtin/pull.c:184
+msgid "fetch from all remotes"
+msgstr "ๅพžๆ‰€ๆœ‰็š„้ ็ซฏๆŠ“ๅ–"
+
+#: builtin/fetch.c:141 builtin/pull.c:228
+msgid "set upstream for git pull/fetch"
+msgstr "็‚บ git pull/fetch ่จญๅฎšไธŠๆธธ"
+
+#: builtin/fetch.c:143 builtin/pull.c:187
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "่ฟฝๅŠ ๅˆฐ .git/FETCH_HEAD ่€Œไธๆ˜ฏ่ฆ†่“‹ๅฎƒ"
+
+#: builtin/fetch.c:145 builtin/pull.c:190
+msgid "path to upload pack on remote end"
+msgstr "ไธŠๅ‚ณๅŒ…ๅˆฐ้ ็ซฏ็š„่ทฏๅพ‘"
+
+#: builtin/fetch.c:146
+msgid "force overwrite of local reference"
+msgstr "ๅผทๅˆถ่ฆ†่“‹ๆœฌๆฉŸๅผ•็”จ"
+
+#: builtin/fetch.c:148
+msgid "fetch from multiple remotes"
+msgstr "ๅพžๅคšๅ€‹้ ็ซฏๆŠ“ๅ–"
+
+#: builtin/fetch.c:150 builtin/pull.c:194
+msgid "fetch all tags and associated objects"
+msgstr "ๆŠ“ๅ–ๆ‰€ๆœ‰็š„ๆจ™็ฑคๅ’Œ้—œ่ฏ็‰ฉไปถ"
+
+#: builtin/fetch.c:152
+msgid "do not fetch all tags (--no-tags)"
+msgstr "ไธๆŠ“ๅ–ไปปไฝ•ๆจ™็ฑค(--no-tags)"
+
+#: builtin/fetch.c:154
+msgid "number of submodules fetched in parallel"
+msgstr "ๅญๆจก็ต„ๅ–ๅพ—็š„ไธฆ็™ผๆ•ธ"
+
+#: builtin/fetch.c:156 builtin/pull.c:197
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "ๆธ…้™ค้ ็ซฏๅทฒ็ถ“ไธๅญ˜ๅœจ็š„ๅˆ†ๆ”ฏ็š„่ฟฝ่นคๅˆ†ๆ”ฏ"
+
+#: builtin/fetch.c:158
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr "ๆธ…้™ค้ ็ซฏไธๅญ˜ๅœจ็š„ๆœฌๆฉŸๆจ™็ฑค๏ผŒไธฆไธ”ๅ–ไปฃ่ฎŠๆ›ดๆจ™็ฑค"
+
+#  ่ญฏ่€…๏ผšๅฏ้ธๅ€ผ๏ผŒไธ่ƒฝ็ฟป่ญฏ
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+msgid "on-demand"
+msgstr "on-demand"
+
+#: builtin/fetch.c:160
+msgid "control recursive fetching of submodules"
+msgstr "ๆŽงๅˆถๅญๆจก็ต„็š„้ž่ฟดๆŠ“ๅ–"
+
+#: builtin/fetch.c:164 builtin/pull.c:205
+msgid "keep downloaded pack"
+msgstr "ไฟๆŒไธ‹่ผ‰ๅŒ…"
+
+#: builtin/fetch.c:166
+msgid "allow updating of HEAD ref"
+msgstr "ๅ…่จฑๆ›ดๆ–ฐ HEAD ๅผ•็”จ"
+
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+msgid "deepen history of shallow clone"
+msgstr "ๆทฑๅŒ–ๆทบ่ค‡่ฃฝ็š„ๆญทๅฒ"
+
+#: builtin/fetch.c:171
+msgid "deepen history of shallow repository based on time"
+msgstr "ๅŸบๆ–ผๆ™‚้–“ไพ†ๆทฑๅŒ–ๆทบ่ค‡่ฃฝ็š„ๆญทๅฒ"
+
+#: builtin/fetch.c:177 builtin/pull.c:211
+msgid "convert to a complete repository"
+msgstr "่ฝ‰ๆ›็‚บไธ€ๅ€‹ๅฎŒๆ•ด็š„็‰ˆๆœฌๅบซ"
+
+#: builtin/fetch.c:180
+msgid "prepend this to submodule path output"
+msgstr "ๅœจๅญๆจก็ต„่ทฏๅพ‘่ผธๅ‡บ็š„ๅ‰้ขๅŠ ไธŠๆญค็›ฎ้Œ„"
+
+#: builtin/fetch.c:183
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr "้ž่ฟดๅ–ๅพ—ๅญๆจก็ต„็š„้ ่จญๅ€ผ๏ผˆๆฏ”่จญๅฎšๆช”ๆกˆๅ„ชๅ…ˆๅบฆไฝŽ๏ผ‰"
+
+#: builtin/fetch.c:187 builtin/pull.c:214
+msgid "accept refs that update .git/shallow"
+msgstr "ๆŽฅๅ—ๆ›ดๆ–ฐ .git/shallow ็š„ๅผ•็”จ"
+
+#: builtin/fetch.c:188 builtin/pull.c:216
+msgid "refmap"
+msgstr "ๅผ•็”จๆ˜ ๅฐ„"
+
+#: builtin/fetch.c:189 builtin/pull.c:217
+msgid "specify fetch refmap"
+msgstr "ๆŒ‡ๅฎšๅ–ๅพ—ๅ‹•ไฝœ็š„ๅผ•็”จๆ˜ ๅฐ„"
+
+#: builtin/fetch.c:196
+msgid "report that we have only objects reachable from this object"
+msgstr "ๅ ฑๅ‘Šๆˆ‘ๅ€‘ๅชๆ“ๆœ‰ๅพž่ฉฒ็‰ฉไปถ้–‹ๅง‹ๅฏไปฅๅ–ๅพ—็š„็‰ฉไปถ"
+
+#: builtin/fetch.c:199
+msgid "run 'gc --auto' after fetching"
+msgstr "ๅ–ๅพ—ๅพŒๅŸท่กŒ 'gc --auto'"
+
+#: builtin/fetch.c:201 builtin/pull.c:226
+msgid "check for forced-updates on all updated branches"
+msgstr "ๅœจๆ‰€ๆœ‰ๆ›ดๆ–ฐๅˆ†ๆ”ฏไธŠๆชขๆŸฅๅผทๅˆถๆ›ดๆ–ฐ"
+
+#: builtin/fetch.c:203
+msgid "write the commit-graph after fetching"
+msgstr "ๆŠ“ๅ–ๅพŒๅฏซๅ…ฅๅˆ†ๆ”ฏๅœ–"
+
+#: builtin/fetch.c:513
+msgid "Couldn't find remote ref HEAD"
+msgstr "็„กๆณ•็™ผ็พ้ ็ซฏ HEAD ๅผ•็”จ"
+
+#: builtin/fetch.c:653
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "่จญๅฎš่ฎŠๆ•ธ fetch.output ๅŒ…ๅซ็„กๆ•ˆๅ€ผ %s"
+
+#: builtin/fetch.c:751
+#, c-format
+msgid "object %s not found"
+msgstr "็‰ฉไปถ %s ๆœช็™ผ็พ"
+
+#: builtin/fetch.c:755
+msgid "[up to date]"
+msgstr "[ๆœ€ๆ–ฐ]"
+
+#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+msgid "[rejected]"
+msgstr "[ๅทฒๆ‹’็ต•]"
+
+#: builtin/fetch.c:769
+msgid "can't fetch in current branch"
+msgstr "็›ฎๅ‰ๅˆ†ๆ”ฏไธ‹ไธ่ƒฝๅŸท่กŒๅ–ๅพ—ๅ‹•ไฝœ"
+
+#: builtin/fetch.c:779
+msgid "[tag update]"
+msgstr "[ๆจ™็ฑคๆ›ดๆ–ฐ]"
+
+#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
+#: builtin/fetch.c:851
+msgid "unable to update local ref"
+msgstr "ไธ่ƒฝๆ›ดๆ–ฐๆœฌๆฉŸๅผ•็”จ"
+
+#: builtin/fetch.c:784
+msgid "would clobber existing tag"
+msgstr "ๆœƒ็ ดๅฃž็พๆœ‰็š„ๆจ™็ฑค"
+
+#: builtin/fetch.c:806
+msgid "[new tag]"
+msgstr "[ๆ–ฐๆจ™็ฑค]"
+
+#: builtin/fetch.c:809
+msgid "[new branch]"
+msgstr "[ๆ–ฐๅˆ†ๆ”ฏ]"
+
+#: builtin/fetch.c:812
+msgid "[new ref]"
+msgstr "[ๆ–ฐๅผ•็”จ]"
+
+#: builtin/fetch.c:851
+msgid "forced update"
+msgstr "ๅผทๅˆถๆ›ดๆ–ฐ"
+
+#: builtin/fetch.c:856
+msgid "non-fast-forward"
+msgstr "้žๅฟซ่ฝ‰"
+
+#: builtin/fetch.c:877
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"ๅ–ๅพ—ๅ‹•ไฝœ้€šๅธธ้กฏ็คบๅ“ชไบ›ๅˆ†ๆ”ฏ็™ผ็”Ÿไบ†ๅผทๅˆถๆ›ดๆ–ฐ๏ผŒไฝ†่ฉฒๆชขๆŸฅๅทฒ่ขซ็ฆ็”จใ€‚\n"
+"่ฆ้‡ๆ–ฐๅ•Ÿ็”จ๏ผŒ่ซ‹ไฝฟ็”จ '--show-forced-updates' ้ธ้ …ๆˆ–ๅŸท่กŒ\n"
+"'git config fetch.showForcedUpdates true'ใ€‚"
+
+#: builtin/fetch.c:881
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"่Šฑไบ† %.2f ็ง’ไพ†ๆชขๆŸฅๅผทๅˆถๆ›ดๆ–ฐใ€‚ๆ‚จๅฏไปฅไฝฟ็”จ '--no-show-forced-updates'\n"
+"ๆˆ–ๅŸท่กŒ 'git config fetch.showForcedUpdates false' ไปฅ้ฟๅ…ๆญค้ …ๆชขๆŸฅใ€‚\n"
+
+#: builtin/fetch.c:920
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s ๆœชๅ‚ณ้€ๆ‰€ๆœ‰ๅฟ…้œ€็š„็‰ฉไปถ\n"
+
+#: builtin/fetch.c:941
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "ๆ‹’็ต• %s ๅ› ็‚บๆทบ่ค‡่ฃฝไธๅ…่จฑ่ขซๆ›ดๆ–ฐ"
+
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#, c-format
+msgid "From %.*s\n"
+msgstr "ไพ†่‡ช %.*s\n"
+
+#: builtin/fetch.c:1037
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"ไธ€ไบ›ๆœฌๆฉŸๅผ•็”จไธ่ƒฝ่ขซๆ›ดๆ–ฐ๏ผ›ๅ˜—่ฉฆๅŸท่กŒ\n"
+" 'git remote prune %s' ไพ†ๅˆช้™ค่ˆŠ็š„ใ€ๆœ‰่ก็ช็š„ๅˆ†ๆ”ฏ"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/fetch.c:1134
+#, c-format
+msgid "   (%s will become dangling)"
+msgstr "   ๏ผˆ%s ๅฐ‡ๆˆ็‚บๆ‡ธ็ฉบ็‹€ๆ…‹๏ผ‰"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/fetch.c:1135
+#, c-format
+msgid "   (%s has become dangling)"
+msgstr "   ๏ผˆ%s ๅทฒๆˆ็‚บๆ‡ธ็ฉบ็‹€ๆ…‹๏ผ‰"
+
+#: builtin/fetch.c:1167
+msgid "[deleted]"
+msgstr "[ๅทฒๅˆช้™ค]"
+
+#: builtin/fetch.c:1168 builtin/remote.c:1112
+msgid "(none)"
+msgstr "๏ผˆ็„ก๏ผ‰"
+
+#: builtin/fetch.c:1191
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "ๆ‹’็ต•ๅ–ๅพ—ๅˆฐ้ž็ด”็‰ˆๆœฌๅบซ็š„็›ฎๅ‰ๅˆ†ๆ”ฏ %s"
+
+#: builtin/fetch.c:1210
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "้ธ้ … \"%s\" ็š„ๅ€ผ \"%s\" ๅฐๆ–ผ %s ๆ˜ฏ็„กๆ•ˆ็š„"
+
+#: builtin/fetch.c:1213
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "้ธ้ … \"%s\" ็‚บ %s ๆ‰€ๅฟฝ็•ฅ\n"
+
+#: builtin/fetch.c:1421
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "ๆชขๆธฌๅˆฐๅคšๅˆ†ๆ”ฏ๏ผŒๅ’Œ --set-upstream ไธ็›ธๅฎน"
+
+#: builtin/fetch.c:1436
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "ๆฒ’ๆœ‰็‚บไธ€ๅ€‹้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ่จญๅฎšไธŠๆธธ"
+
+#: builtin/fetch.c:1438
+msgid "not setting upstream for a remote tag"
+msgstr "ๆฒ’ๆœ‰็‚บไธ€ๅ€‹้ ็ซฏๆจ™็ฑค่จญๅฎšไธŠๆธธ"
+
+#: builtin/fetch.c:1440
+msgid "unknown branch type"
+msgstr "ๆœช็Ÿฅ็š„ๅˆ†ๆ”ฏ้กžๅž‹"
+
+#: builtin/fetch.c:1442
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"ๆœช็™ผ็พๆบๅˆ†ๆ”ฏใ€‚\n"
+"ๆ‚จ้œ€่ฆไฝฟ็”จ --set-upstream ้ธ้ …ๆŒ‡ๅฎšไธ€ๅ€‹ๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#, c-format
+msgid "Fetching %s\n"
+msgstr "ๆญฃๅœจๅ–ๅพ— %s\n"
+
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "ไธ่ƒฝๅ–ๅพ— %s"
+
+#: builtin/fetch.c:1590
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "็„กๆณ•ๅ–ๅพ— '%s'๏ผˆ้›ข้–‹็ขผ๏ผš%d๏ผ‰\n"
+
+#: builtin/fetch.c:1693
+msgid ""
+"No remote repository specified.  Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr "ๆœชๆŒ‡ๅฎš้ ็ซฏ็‰ˆๆœฌๅบซใ€‚่ซ‹้€้Žไธ€ๅ€‹ URL ๆˆ–้ ็ซฏ็‰ˆๆœฌๅบซๅๆŒ‡ๅฎš๏ผŒ็”จไปฅๅ–ๅพ—ๆ–ฐๆไบคใ€‚"
+
+#: builtin/fetch.c:1730
+msgid "You need to specify a tag name."
+msgstr "ๆ‚จ้œ€่ฆๆŒ‡ๅฎšไธ€ๅ€‹ๆจ™็ฑคๅ็จฑใ€‚"
+
+#: builtin/fetch.c:1780
+msgid "Negative depth in --deepen is not supported"
+msgstr "--deepen ไธๆ”ฏๆด่ฒ ๆ•ธๆทฑๅบฆ"
+
+#: builtin/fetch.c:1782
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen ๅ’Œ --depth ๆ˜ฏไบ’ๆ–ฅ็š„"
+
+#: builtin/fetch.c:1787
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth ๅ’Œ --unshallow ไธ่ƒฝๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/fetch.c:1789
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "ๅฐๆ–ผไธ€ๅ€‹ๅฎŒๆ•ด็š„็‰ˆๆœฌๅบซ๏ผŒๅƒๆ•ธ --unshallow ๆฒ’ๆœ‰ๆ„็พฉ"
+
+#: builtin/fetch.c:1805
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all ไธ่ƒฝๅธถไธ€ๅ€‹็‰ˆๆœฌๅบซๅƒๆ•ธ"
+
+#: builtin/fetch.c:1807
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all ๅธถๅผ•็”จ่ฆๆ ผๆฒ’ๆœ‰ไปปไฝ•ๆ„็พฉ"
+
+#: builtin/fetch.c:1816
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "ๆฒ’ๆœ‰้€™ๆจฃ็š„้ ็ซฏๆˆ–้ ็ซฏ็ต„๏ผš%s"
+
+#: builtin/fetch.c:1823
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "ๅ–ๅพ—็ต„ไธฆๆŒ‡ๅฎšๅผ•็”จ่ฆๆ ผๆฒ’ๆœ‰ๆ„็พฉ"
+
+#: builtin/fetch.c:1841
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr "ๅชๅฏไปฅๅฐ‡ --filter ็”จๆ–ผๅœจ extensions.partialClone ไธญ่จญๅฎš็š„้ ็ซฏ็‰ˆๆœฌๅบซ"
+
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr "git fmt-merge-msg [-m <่ชชๆ˜Ž>] [--log[=<n>] | --no-log] [--file <ๆช”ๆกˆ>]"
+
+#: builtin/fmt-merge-msg.c:671
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "ๅ‘ๆไบค่ชชๆ˜Žไธญๆœ€ๅคš่ค‡่ฃฝๆŒ‡ๅฎšๆข็›ฎ๏ผˆๅˆไฝต่€Œไพ†็š„ๆไบค๏ผ‰็š„็ฐก็Ÿญ่ชชๆ˜Ž"
+
+#: builtin/fmt-merge-msg.c:674
+msgid "alias for --log (deprecated)"
+msgstr "ๅƒๆ•ธ --log ็š„ๅˆฅๅ๏ผˆๅทฒๆฃ„็”จ๏ผ‰"
+
+#: builtin/fmt-merge-msg.c:677
+msgid "text"
+msgstr "ๆ–‡ๅญ—"
+
+#: builtin/fmt-merge-msg.c:678
+msgid "use <text> as start of message"
+msgstr "ไฝฟ็”จ <ๆ–‡ๅญ—> ไฝœ็‚บๆไบค่ชชๆ˜Ž็š„้–‹ๅง‹"
+
+#: builtin/fmt-merge-msg.c:679
+msgid "file to read from"
+msgstr "ๅพžๆช”ๆกˆไธญ่ฎ€ๅ–"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<้ธ้ …>] [<ๆจกๅผ>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <็‰ฉไปถ>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<ๆไบค>]]"
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<ๆไบค>]] [--no-contains [<ๆไบค>]]"
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr "ๅผ•็”จๅ ไฝ็ฌฆ้ฉ็”จๆ–ผ shells"
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr "ๅผ•็”จๅ ไฝ็ฌฆ้ฉ็”จๆ–ผ perl"
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr "ๅผ•็”จๅ ไฝ็ฌฆ้ฉ็”จๆ–ผ python"
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr "ๅผ•็”จๅ ไฝ็ฌฆ้ฉ็”จๆ–ผ Tcl"
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr "ๅช้กฏ็คบ <n> ๅ€‹็ฌฆๅˆ็š„ๅผ•็”จ"
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
+msgid "respect format colors"
+msgstr "้ต็…งๆ ผๅผไธญ็š„้ก่‰ฒ่ผธๅ‡บ"
+
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
+msgstr "ๅชๅˆ—ๅฐๆŒ‡ๅ‘ๆไพ›็‰ฉไปถ็š„ๅผ•็”จ"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
+msgstr "ๅชๅˆ—ๅฐๅทฒ็ถ“ๅˆไฝต็š„ๅผ•็”จ"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
+msgstr "ๅชๅˆ—ๅฐๆฒ’ๆœ‰ๅˆไฝต็š„ๅผ•็”จ"
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
+msgstr "ๅชๅˆ—ๅฐๅŒ…ๅซ่ฉฒๆไบค็š„ๅผ•็”จ"
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr "ๅชๅˆ—ๅฐไธๅŒ…ๅซ่ฉฒๆไบค็š„ๅผ•็”จ"
+
+#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+msgid "unknown"
+msgstr "ๆœช็Ÿฅ"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:100 builtin/fsck.c:120
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "%s %s ้Œฏ่ชค๏ผš%s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:114
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "%s %s ่ญฆๅ‘Š๏ผš%s"
+
+#: builtin/fsck.c:143 builtin/fsck.c:146
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "ไพ†่‡ช %7s %s ็š„ๆๅฃž็š„้€ฃ็ต"
+
+#: builtin/fsck.c:155
+msgid "wrong object type in link"
+msgstr "้€ฃ็ตไธญ้Œฏ่ชค็š„็‰ฉไปถ้กžๅž‹"
+
+#: builtin/fsck.c:171
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+"ๆๅฃž็š„้€ฃ็ตไพ†่‡ชๆ–ผ %7s %s\n"
+"              ๅˆฐ %7s %s"
+
+#: builtin/fsck.c:282
+#, c-format
+msgid "missing %s %s"
+msgstr "็ผบๅฐ‘ %s %s"
+
+#: builtin/fsck.c:309
+#, c-format
+msgid "unreachable %s %s"
+msgstr "็„กๆณ•ๅ–ๅพ— %s %s"
+
+#: builtin/fsck.c:329
+#, c-format
+msgid "dangling %s %s"
+msgstr "ๆ‡ธ็ฉบ %s %s"
+
+#: builtin/fsck.c:339
+msgid "could not create lost-found"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ lost-found"
+
+#: builtin/fsck.c:350
+#, c-format
+msgid "could not finish '%s'"
+msgstr "ไธ่ƒฝๅฎŒๆˆ '%s'"
+
+#: builtin/fsck.c:367
+#, c-format
+msgid "Checking %s"
+msgstr "ๆญฃๅœจๆชขๆŸฅ %s"
+
+#: builtin/fsck.c:405
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "ๆญฃๅœจๆชขๆŸฅ้€ฃ้€šๆ€ง๏ผˆ%d ๅ€‹็‰ฉไปถ๏ผ‰"
+
+#: builtin/fsck.c:424
+#, c-format
+msgid "Checking %s %s"
+msgstr "ๆญฃๅœจๆชขๆŸฅ %s %s"
+
+#: builtin/fsck.c:429
+msgid "broken links"
+msgstr "ๆๅฃž็š„้€ฃ็ต"
+
+#: builtin/fsck.c:438
+#, c-format
+msgid "root %s"
+msgstr "ๆ น %s"
+
+#: builtin/fsck.c:446
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "ๆจ™่จ˜ %s %s (%s) ๆ–ผ %s"
+
+#: builtin/fsck.c:475
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s๏ผš็‰ฉไปถๆๅฃžๆˆ–้บๅคฑ"
+
+#: builtin/fsck.c:500
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s๏ผš็„กๆ•ˆ็š„ๅผ•็”จๆ—ฅ่ชŒๆข็›ฎ %s"
+
+#: builtin/fsck.c:514
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "ๆญฃๅœจๆชขๆŸฅๅผ•็”จๆ—ฅ่ชŒ %s->%s"
+
+#: builtin/fsck.c:548
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s๏ผš็„กๆ•ˆ็š„ sha1 ๆŒ‡ๆจ™ %s"
+
+#: builtin/fsck.c:555
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s๏ผšไธๆ˜ฏไธ€ๅ€‹ๆไบค"
+
+#: builtin/fsck.c:609
+msgid "notice: No default references"
+msgstr "ๆณจๆ„๏ผš็„ก้ ่จญๅผ•็”จ"
+
+#: builtin/fsck.c:624
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s๏ผš็‰ฉไปถๆๅฃžๆˆ–้บๅคฑ๏ผš%s"
+
+#: builtin/fsck.c:637
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s๏ผšไธ่ƒฝ่งฃๆž็‰ฉไปถ๏ผš%s"
+
+#: builtin/fsck.c:657
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "ๅฃž็š„ sha1 ๆช”ๆกˆ๏ผš%s"
+
+#: builtin/fsck.c:672
+msgid "Checking object directory"
+msgstr "ๆญฃๅœจๆชขๆŸฅ็‰ฉไปถ็›ฎ้Œ„"
+
+#: builtin/fsck.c:675
+msgid "Checking object directories"
+msgstr "ๆญฃๅœจๆชขๆŸฅ็‰ฉไปถ็›ฎ้Œ„"
+
+#: builtin/fsck.c:690
+#, c-format
+msgid "Checking %s link"
+msgstr "ๆญฃๅœจๆชขๆŸฅ %s ้€ฃ็ต"
+
+#: builtin/fsck.c:695 builtin/index-pack.c:843
+#, c-format
+msgid "invalid %s"
+msgstr "็„กๆ•ˆ็š„ %s"
+
+#: builtin/fsck.c:702
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s ๆŒ‡ๅ‘ๅฅ‡ๆ€ช็š„ๆฑ่ฅฟ๏ผˆ%s๏ผ‰"
+
+#: builtin/fsck.c:708
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s๏ผšๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™็š„ๆŒ‡ๅ‘ไธๅญ˜ๅœจ"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "ๆณจๆ„๏ผš%s ๆŒ‡ๅ‘ไธ€ๅ€‹ๅฐšๆœช่ช•็”Ÿ็š„ๅˆ†ๆ”ฏ๏ผˆ%s๏ผ‰"
+
+#: builtin/fsck.c:724
+msgid "Checking cache tree"
+msgstr "ๆญฃๅœจๆชขๆŸฅๅฟซๅ–ๆจน"
+
+#: builtin/fsck.c:729
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s๏ผšcache-tree ไธญ็„กๆ•ˆ็š„ sha1 ๆŒ‡ๆจ™"
+
+#: builtin/fsck.c:738
+msgid "non-tree in cache-tree"
+msgstr "cache-tree ไธญ้žๆจน็‹€็‰ฉไปถ"
+
+#: builtin/fsck.c:769
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<้ธ้ …>] [<็‰ฉไปถ>...]"
+
+#: builtin/fsck.c:775
+msgid "show unreachable objects"
+msgstr "้กฏ็คบ็„กๆณ•ๅ–ๅพ—็š„็‰ฉไปถ"
+
+#: builtin/fsck.c:776
+msgid "show dangling objects"
+msgstr "้กฏ็คบๆ‡ธ็ฉบ็š„็‰ฉไปถ"
+
+#: builtin/fsck.c:777
+msgid "report tags"
+msgstr "ๅ ฑๅ‘Šๆจ™็ฑค"
+
+#: builtin/fsck.c:778
+msgid "report root nodes"
+msgstr "ๅ ฑๅ‘Šๆ น็ฏ€้ปž"
+
+#: builtin/fsck.c:779
+msgid "make index objects head nodes"
+msgstr "ๅฐ‡็ดขๅผ•ไบฆไฝœ็‚บๆชขๆŸฅ็š„้ ญ็ฏ€้ปž"
+
+#: builtin/fsck.c:780
+msgid "make reflogs head nodes (default)"
+msgstr "ๅฐ‡ๅผ•็”จๆ—ฅ่ชŒไฝœ็‚บๆชขๆŸฅ็š„้ ญ็ฏ€้ปž๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/fsck.c:781
+msgid "also consider packs and alternate objects"
+msgstr "ไนŸ่€ƒๆ…ฎๅŒ…ๅ’Œๅ‚™็”จ็‰ฉไปถ"
+
+#: builtin/fsck.c:782
+msgid "check only connectivity"
+msgstr "ๅƒ…ๆชขๆŸฅ้€ฃ้€šๆ€ง"
+
+#: builtin/fsck.c:783
+msgid "enable more strict checking"
+msgstr "ๅ•Ÿ็”จๆ›ดๅšดๆ ผ็š„ๆชขๆŸฅ"
+
+#: builtin/fsck.c:785
+msgid "write dangling objects in .git/lost-found"
+msgstr "ๅฐ‡ๆ‡ธ็ฉบ็‰ฉไปถๅฏซๅ…ฅ .git/lost-found ไธญ"
+
+#: builtin/fsck.c:786 builtin/prune.c:132
+msgid "show progress"
+msgstr "้กฏ็คบ้€ฒๅบฆ"
+
+#: builtin/fsck.c:787
+msgid "show verbose names for reachable objects"
+msgstr "้กฏ็คบๅฏไปฅๅ–ๅพ—็‰ฉไปถ็š„่ฉณ็ดฐๅ็จฑ"
+
+#: builtin/fsck.c:846 builtin/index-pack.c:225
+msgid "Checking objects"
+msgstr "ๆญฃๅœจๆชขๆŸฅ็‰ฉไปถ"
+
+#: builtin/fsck.c:874
+#, c-format
+msgid "%s: object missing"
+msgstr "%s๏ผš็‰ฉไปถ็ผบๅฐ‘"
+
+#: builtin/fsck.c:885
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "็„กๆ•ˆ็š„ๅƒๆ•ธ๏ผšๆœŸๆœ› sha1๏ผŒๅพ—ๅˆฐ '%s'"
+
+#: builtin/gc.c:35
+msgid "git gc [<options>]"
+msgstr "git gc [<้ธ้ …>]"
+
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "ๅฐ %s ๅ‘ผๅซ fstat ๅคฑๆ•—๏ผš%s"
+
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "็„กๆณ•่งฃๆž '%s' ๅ€ผ '%s'"
+
+#: builtin/gc.c:475 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "ไธ่ƒฝๅฐ '%s' ๅ‘ผๅซ stat"
+
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#, c-format
+msgid "cannot read '%s'"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– '%s'"
+
+#: builtin/gc.c:491
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"ๆœ€ๅพŒไธ€ๆฌก gc ๅ‹•ไฝœๅ ฑๅ‘Šๅฆ‚ไธ‹่จŠๆฏใ€‚่ซ‹ๆชขๆŸฅๅŽŸๅ› ไธฆๅˆช้™ค %sใ€‚\n"
+"ๅœจ่ฉฒๆช”ๆกˆ่ขซๅˆช้™คไน‹ๅ‰๏ผŒ่‡ชๅ‹•ๆธ…็†ๅฐ‡ไธๆœƒๅŸท่กŒใ€‚\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:539
+msgid "prune unreferenced objects"
+msgstr "ๆธ…้™คๆœชๅผ•็”จ็š„็‰ฉไปถ"
+
+#: builtin/gc.c:541
+msgid "be more thorough (increased runtime)"
+msgstr "ๆ›ดๅพนๅบ•๏ผˆๅขžๅŠ ๅŸท่กŒๆ™‚้–“๏ผ‰"
+
+#: builtin/gc.c:542
+msgid "enable auto-gc mode"
+msgstr "ๅ•Ÿ็”จ่‡ชๅ‹•ๅžƒๅœพๅ›žๆ”ถๆจกๅผ"
+
+#: builtin/gc.c:545
+msgid "force running gc even if there may be another gc running"
+msgstr "ๅผทๅˆถๅŸท่กŒ gc ๅณไฝฟๅฆๅค–ไธ€ๅ€‹ gc ๆญฃๅœจๅŸท่กŒ"
+
+#: builtin/gc.c:548
+msgid "repack all other packs except the largest pack"
+msgstr "้™คไบ†ๆœ€ๅคง็š„ๅŒ…ไน‹ๅค–๏ผŒๅฐๆ‰€ๆœ‰ๅ…ถๅฎƒๅŒ…ๆช”ๆกˆ้‡ๆ–ฐๆ‰“ๅŒ…"
+
+#: builtin/gc.c:565
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "่งฃๆž gc.logexpiry ็š„ๅ€ผ %s ๅคฑๆ•—"
+
+#: builtin/gc.c:576
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "่งฃๆžๆธ…้™คๆœŸ้™ๅ€ผ %s ๅคฑๆ•—"
+
+#: builtin/gc.c:596
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "่‡ชๅ‹•ๅœจๅพŒๅฐๅŸท่กŒ็‰ˆๆœฌๅบซๆ‰“ๅŒ…ไปฅๆฑ‚ๆœ€ไฝณๆ€ง่ƒฝใ€‚\n"
+
+#: builtin/gc.c:598
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "่‡ชๅ‹•ๆ‰“ๅŒ…็‰ˆๆœฌๅบซไปฅๆฑ‚ๆœ€ไฝณๆ€ง่ƒฝใ€‚\n"
+
+#: builtin/gc.c:599
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "ๆ‰‹ๅ‹•็ถญ่ญทๅƒ่ฆ‹ \"git help gc\"ใ€‚\n"
+
+#: builtin/gc.c:639
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr "gc ๅทฒๅœจใ€Œ%sใ€ๆฉŸๅ™จ pid %<PRIuMAX> ๅŸท่กŒ๏ผˆๅฆ‚ๆžœไธๆ˜ฏ๏ผŒไฝฟ็”จ --force๏ผ‰"
+
+#: builtin/gc.c:694
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr "ๆœ‰ๅคชๅคš็„กๆณ•ๅ–ๅพ—็š„้ฌ†ๆ•ฃ็‰ฉไปถ๏ผŒๅŸท่กŒ 'git prune' ๅˆช้™คๅฎƒๅ€‘ใ€‚"
+
+#: builtin/grep.c:30
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<้ธ้ …>] [-e] <ๆจกๅผ> [<็‰ˆๆœฌ>...] [[--] <่ทฏๅพ‘>...]"
+
+#: builtin/grep.c:225
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep๏ผš็„กๆณ•ๅปบ็ซ‹ๅŸท่กŒ็ท’๏ผš%s"
+
+#: builtin/grep.c:279
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "็‚บ %2$s ่จญๅฎš็š„ๅŸท่กŒ็ท’ๆ•ธ (%1$d) ็„กๆ•ˆ"
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "ๆฒ’ๆœ‰ๅŸท่กŒ็ท’ๆ”ฏๆด๏ผŒๅฟฝ็•ฅ %s"
+
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "็„กๆณ•่ฎ€ๅ–ๆจน๏ผˆ%s๏ผ‰"
+
+#: builtin/grep.c:633
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "็„กๆณ•ๆŠ“ๅ–ไพ†่‡ชๆ–ผ %s ้กžๅž‹็š„็‰ฉไปถ"
+
+#: builtin/grep.c:704
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "้–‹้—œ `%c' ๆœŸๆœ›ไธ€ๅ€‹ๆ•ธๅญ—ๅ€ผ"
+
+#: builtin/grep.c:803
+msgid "search in index instead of in the work tree"
+msgstr "ๅœจ็ดขๅผ•ๅ€ๆœๅฐ‹่€Œไธๆ˜ฏๅœจๅทฅไฝœๅ€"
+
+#: builtin/grep.c:805
+msgid "find in contents not managed by git"
+msgstr "ๅœจๆœช่ขซ git ็ฎก็†็š„ๅ…งๅฎนไธญๅฐ‹ๆ‰พ"
+
+#  ่ญฏ่€…๏ผšไธญๆ–‡ๅญ—ไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆช้™คๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/grep.c:807
+msgid "search in both tracked and untracked files"
+msgstr "ๅœจ่ฟฝ่นคๅ’Œๆœช่ฟฝ่นค็š„ๆช”ๆกˆไธญๆœๅฐ‹"
+
+#: builtin/grep.c:809
+msgid "ignore files specified via '.gitignore'"
+msgstr "ๅฟฝ็•ฅ '.gitignore' ๅŒ…ๅซ็š„ๆช”ๆกˆ"
+
+#: builtin/grep.c:811
+msgid "recursively search in each submodule"
+msgstr "ๅœจๆฏไธ€ๅ€‹ๅญๆจก็ต„ไธญ้ž่ฟดๆœๅฐ‹"
+
+#: builtin/grep.c:814
+msgid "show non-matching lines"
+msgstr "้กฏ็คบๆœช็ฌฆๅˆ็š„่กŒ"
+
+#: builtin/grep.c:816
+msgid "case insensitive matching"
+msgstr "ไธๅ€ๅˆ†ๅคงๅฐๅฏซ็ฌฆๅˆ"
+
+#: builtin/grep.c:818
+msgid "match patterns only at word boundaries"
+msgstr "ๅชๅœจๅ–ฎ่ฉž้‚Š็•Œ็ฌฆๅˆๆจกๅผ"
+
+#: builtin/grep.c:820
+msgid "process binary files as text"
+msgstr "ๆŠŠไบŒ้€ฒไฝๆช”ๆกˆ็•ถๅšๆ–‡ๅญ—่™•็†"
+
+#: builtin/grep.c:822
+msgid "don't match patterns in binary files"
+msgstr "ไธๅœจไบŒ้€ฒไฝๆช”ๆกˆไธญ็ฌฆๅˆๆจกๅผ"
+
+#: builtin/grep.c:825
+msgid "process binary files with textconv filters"
+msgstr "็”จ textconv ้Žๆฟพๅ™จ่™•็†ไบŒ้€ฒไฝๆช”ๆกˆ"
+
+#: builtin/grep.c:827
+msgid "search in subdirectories (default)"
+msgstr "ๅœจๅญ็›ฎ้Œ„ไธญๅฐ‹ๆ‰พ๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/grep.c:829
+msgid "descend at most <depth> levels"
+msgstr "ๆœ€ๅคšไปฅๆŒ‡ๅฎš็š„ๆทฑๅบฆๅ‘ไธ‹ๅฐ‹ๆ‰พ"
+
+#: builtin/grep.c:833
+msgid "use extended POSIX regular expressions"
+msgstr "ไฝฟ็”จๆ“ดๅฑ•็š„ POSIX ๆญฃ่ฆ่กจ็คบๅผ"
+
+#: builtin/grep.c:836
+msgid "use basic POSIX regular expressions (default)"
+msgstr "ไฝฟ็”จๅŸบๆœฌ็š„ POSIX ๆญฃ่ฆ่กจ็คบๅผ๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/grep.c:839
+msgid "interpret patterns as fixed strings"
+msgstr "ๆŠŠๆจกๅผ่งฃๆž็‚บๅ›บๅฎš็š„ๅญ—ไธฒ"
+
+#: builtin/grep.c:842
+msgid "use Perl-compatible regular expressions"
+msgstr "ไฝฟ็”จ Perl ็›ธๅฎน็š„ๆญฃ่ฆ่กจ็คบๅผ"
+
+#: builtin/grep.c:845
+msgid "show line numbers"
+msgstr "้กฏ็คบ่กŒ่™Ÿ"
+
+#: builtin/grep.c:846
+msgid "show column number of first match"
+msgstr "้กฏ็คบ็ฌฌไธ€ๅ€‹็ฌฆๅˆ็š„ๅˆ—่™Ÿ"
+
+#: builtin/grep.c:847
+msgid "don't show filenames"
+msgstr "ไธ้กฏ็คบๆช”ๆกˆๅ"
+
+#: builtin/grep.c:848
+msgid "show filenames"
+msgstr "้กฏ็คบๆช”ๆกˆๅ"
+
+#: builtin/grep.c:850
+msgid "show filenames relative to top directory"
+msgstr "้กฏ็คบ็›ธๅฐๆ–ผ้ ‚็ดš็›ฎ้Œ„็š„ๆช”ๆกˆๅ"
+
+#: builtin/grep.c:852
+msgid "show only filenames instead of matching lines"
+msgstr "ๅช้กฏ็คบๆช”ๆกˆๅ่€Œไธ้กฏ็คบ็ฌฆๅˆ็š„่กŒ"
+
+#: builtin/grep.c:854
+msgid "synonym for --files-with-matches"
+msgstr "ๅ’Œ --files-with-matches ๅŒ็พฉ"
+
+#: builtin/grep.c:857
+msgid "show only the names of files without match"
+msgstr "ๅช้กฏ็คบๆœช็ฌฆๅˆ็š„ๆช”ๆกˆๅ"
+
+#: builtin/grep.c:859
+msgid "print NUL after filenames"
+msgstr "ๅœจๆช”ๆกˆๅๅพŒ่ผธๅ‡บ NUL ๅญ—ๅ…ƒ"
+
+#: builtin/grep.c:862
+msgid "show only matching parts of a line"
+msgstr "ๅช้กฏ็คบ่กŒไธญ็š„็ฌฆๅˆ็š„้ƒจๅˆ†"
+
+#: builtin/grep.c:864
+msgid "show the number of matches instead of matching lines"
+msgstr "้กฏ็คบ็ธฝ็ฌฆๅˆ่กŒๆ•ธ๏ผŒ่€Œไธ้กฏ็คบ็ฌฆๅˆ็š„่กŒ"
+
+#: builtin/grep.c:865
+msgid "highlight matches"
+msgstr "้ซ˜ไบฎ้กฏ็คบ็ฌฆๅˆ้ …"
+
+#: builtin/grep.c:867
+msgid "print empty line between matches from different files"
+msgstr "ๅœจไธๅŒๆช”ๆกˆ็š„็ฌฆๅˆ้ …ไน‹้–“ๅˆ—ๅฐ็ฉบ่กŒ"
+
+#: builtin/grep.c:869
+msgid "show filename only once above matches from same file"
+msgstr "ๅชๅœจๅŒไธ€ๆช”ๆกˆ็š„็ฌฆๅˆ้ …็š„ไธŠ้ข้กฏ็คบไธ€ๆฌกๆช”ๆกˆๅ"
+
+#: builtin/grep.c:872
+msgid "show <n> context lines before and after matches"
+msgstr "้กฏ็คบ็ฌฆๅˆ้ …ๅ‰ๅพŒ็š„ <n> ่กŒไธŠไธ‹ๆ–‡"
+
+#: builtin/grep.c:875
+msgid "show <n> context lines before matches"
+msgstr "้กฏ็คบ็ฌฆๅˆ้ …ๅ‰ <n> ่กŒไธŠไธ‹ๆ–‡"
+
+#: builtin/grep.c:877
+msgid "show <n> context lines after matches"
+msgstr "้กฏ็คบ็ฌฆๅˆ้ …ๅพŒ <n> ่กŒไธŠไธ‹ๆ–‡"
+
+#: builtin/grep.c:879
+msgid "use <n> worker threads"
+msgstr "ไฝฟ็”จ <n> ๅ€‹ๅทฅไฝœๅŸท่กŒ็ท’"
+
+#: builtin/grep.c:880
+msgid "shortcut for -C NUM"
+msgstr "ๅฟซๆท้ต -C ๆ•ธๅญ—"
+
+#: builtin/grep.c:883
+msgid "show a line with the function name before matches"
+msgstr "ๅœจ็ฌฆๅˆ็š„ๅ‰้ข้กฏ็คบไธ€่กŒๅ‡ฝๆ•ธๅ"
+
+#: builtin/grep.c:885
+msgid "show the surrounding function"
+msgstr "้กฏ็คบๆ‰€ๅœจๅ‡ฝๆ•ธ็š„ๅ‰ๅพŒๅ…งๅฎน"
+
+#: builtin/grep.c:888
+msgid "read patterns from file"
+msgstr "ๅพžๆช”ๆกˆ่ฎ€ๅ–ๆจกๅผ"
+
+#: builtin/grep.c:890
+msgid "match <pattern>"
+msgstr "็ฌฆๅˆ <ๆจกๅผ>"
+
+#: builtin/grep.c:892
+msgid "combine patterns specified with -e"
+msgstr "็ต„ๅˆ็”จ -e ๅƒๆ•ธ่จญๅฎš็š„ๆจกๅผ"
+
+#: builtin/grep.c:904
+msgid "indicate hit with exit status without output"
+msgstr "ไธ่ผธๅ‡บ๏ผŒ่€Œ็”จ้›ข้–‹็ขผๆจ™่จ˜ๅ‘ฝไธญ็‹€ๆ…‹"
+
+#: builtin/grep.c:906
+msgid "show only matches from files that match all patterns"
+msgstr "ๅช้กฏ็คบ็ฌฆๅˆๆ‰€ๆœ‰ๆจกๅผ็š„ๆช”ๆกˆไธญ็š„็ฌฆๅˆ"
+
+#: builtin/grep.c:908
+msgid "show parse tree for grep expression"
+msgstr "้กฏ็คบ grep ่กจ้”ๅผ็š„่งฃๆžๆจน"
+
+#: builtin/grep.c:912
+msgid "pager"
+msgstr "ๅˆ†้ "
+
+#: builtin/grep.c:912
+msgid "show matching files in the pager"
+msgstr "ๅˆ†้ ้กฏ็คบ็ฌฆๅˆ็š„ๆช”ๆกˆ"
+
+#: builtin/grep.c:916
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "ๅ…่จฑๅ‘ผๅซ grep(1)๏ผˆๆœฌๆฌกๆง‹ๅปบๅฟฝ็•ฅ๏ผ‰"
+
+#: builtin/grep.c:983
+msgid "no pattern given"
+msgstr "ๆœชๆไพ›็ฌฆๅˆๆจกๅผ"
+
+#: builtin/grep.c:1019
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index ๆˆ– --untracked ไธ่ƒฝๅ’Œ็‰ˆๆœฌๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/grep.c:1027
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "ไธ่ƒฝ่งฃๆž็‰ˆๆœฌ๏ผš%s"
+
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked ไธๆ”ฏๆด่ˆ‡ --recurse-submodules ไธ€่ตทไฝฟ็”จ"
+
+#: builtin/grep.c:1061
+msgid "invalid option combination, ignoring --threads"
+msgstr "็„กๆ•ˆ็š„้ธ้ …็ต„ๅˆ๏ผŒๅฟฝ็•ฅ --threads"
+
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+msgid "no threads support, ignoring --threads"
+msgstr "ๆฒ’ๆœ‰ๅŸท่กŒ็ท’ๆ”ฏๆด๏ผŒๅฟฝ็•ฅ --threads"
+
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "ๆŒ‡ๅฎš็š„ๅŸท่กŒ็ท’ๆ•ธ็„กๆ•ˆ๏ผˆ%d๏ผ‰"
+
+#: builtin/grep.c:1101
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager ๅƒ…็”จๆ–ผๅทฅไฝœๅ€"
+
+#: builtin/grep.c:1127
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached ๆˆ– --untracked ไธ่ƒฝ่ˆ‡ --no-index ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/grep.c:1133
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr "--[no-]exclude-standard ไธ่ƒฝ็”จๆ–ผๅทฒ่ฟฝ่นคๅ…งๅฎน"
+
+#: builtin/grep.c:1141
+msgid "both --cached and trees are given"
+msgstr "ๅŒๆ™‚็ตฆๅ‡บไบ† --cached ๅ’Œๆจน็‹€็‰ฉไปถ"
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <้กžๅž‹>] [-w] [--path=<ๆช”ๆกˆ> | --no-filters] [--stdin] "
+"[--] <ๆช”ๆกˆ>..."
+
+#: builtin/hash-object.c:86
+msgid "git hash-object  --stdin-paths"
+msgstr "git hash-object  --stdin-paths"
+
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr "็‰ฉไปถ้กžๅž‹"
+
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr "ๅฐ‡็‰ฉไปถๅฏซๅ…ฅ็‰ฉไปถ่ณ‡ๆ–™ๅบซ"
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–็‰ฉไปถ"
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr "ๅŽŸๆจฃๅ„ฒๅญ˜ๆช”ๆกˆไธไฝฟ็”จ้Žๆฟพๅ™จ"
+
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr "ๅ…่จฑๅฐไปปๆ„้šจๆฉŸๅžƒๅœพ่ณ‡ๆ–™ๅšๆ•ฃๅˆ—ไพ†ๅปบ็ซ‹ๆๅฃž็š„็‰ฉไปถไปฅไพฟ้™ค้Œฏ Git"
+
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr "่™•็†ๆช”ๆกˆไธฆๅ‡่จญๅ…ถไพ†่‡ชๆ–ผๆญค่ทฏๅพ‘"
+
+#: builtin/help.c:46
+msgid "print all available commands"
+msgstr "ๅˆ—ๅฐๆ‰€ๆœ‰ๅฏ็”จ็š„ๆŒ‡ไปค"
+
+#: builtin/help.c:47
+msgid "exclude guides"
+msgstr "ๆŽ’้™คๅšฎๅฐŽ"
+
+#: builtin/help.c:48
+msgid "print list of useful guides"
+msgstr "้กฏ็คบๆœ‰็”จ็š„ๆŒ‡ๅ—ๅˆ—่กจ"
+
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr "ๅˆ—ๅฐๆ‰€ๆœ‰่จญๅฎš่ฎŠๆ•ธๅ็จฑ"
+
+#: builtin/help.c:51
+msgid "show man page"
+msgstr "้กฏ็คบ man ๆ‰‹ๅ†Š"
+
+#: builtin/help.c:52
+msgid "show manual in web browser"
+msgstr "ๅœจ web ็€่ฆฝๅ™จไธญ้กฏ็คบๆ‰‹ๅ†Š"
+
+#: builtin/help.c:54
+msgid "show info page"
+msgstr "้กฏ็คบ info ๆ‰‹ๅ†Š"
+
+#: builtin/help.c:56
+msgid "print command description"
+msgstr "ๅˆ—ๅฐๆŒ‡ไปคๆ่ฟฐ"
+
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<ๆŒ‡ไปค>]"
+
+#: builtin/help.c:77
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "ๆœช่ƒฝ่ญ˜ๅˆฅ็š„ๅ”ๅŠฉๆ ผๅผ '%s'"
+
+#: builtin/help.c:104
+msgid "Failed to start emacsclient."
+msgstr "็„กๆณ•ๅ•Ÿๅ‹• emacsclientใ€‚"
+
+#: builtin/help.c:117
+msgid "Failed to parse emacsclient version."
+msgstr "็„กๆณ•่งฃๆž emacsclient ็‰ˆๆœฌใ€‚"
+
+#: builtin/help.c:125
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "emacsclient ็‰ˆๆœฌ '%d' ๅคช่€๏ผˆ< 22๏ผ‰ใ€‚"
+
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "ๅŸท่กŒ '%s' ๅคฑๆ•—"
+
+#: builtin/help.c:221
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s'๏ผšไธๆ”ฏๆด็š„ man ๆ‰‹ๅ†Šๆชข่ฆ–ๅ™จ็š„่ทฏๅพ‘ใ€‚\n"
+"่ซ‹ไฝฟ็”จ 'man.<ๅทฅๅ…ท>.cmd'ใ€‚"
+
+#: builtin/help.c:233
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': ๆ”ฏๆด็š„ man ๆ‰‹ๅ†Šๆชข่ฆ–ๅ™จๆŒ‡ไปคใ€‚\n"
+"่ซ‹ไฝฟ็”จ 'man.<ๅทฅๅ…ท>.path'ใ€‚"
+
+#: builtin/help.c:350
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s'๏ผšๆœช็Ÿฅ็š„ man ๆชข่ฆ–ๅ™จใ€‚"
+
+#: builtin/help.c:367
+msgid "no man viewer handled the request"
+msgstr "ๆฒ’ๆœ‰ man ๆชข่ฆ–ๅ™จ่™•็†ๆญค่ซ‹ๆฑ‚"
+
+#: builtin/help.c:375
+msgid "no info viewer handled the request"
+msgstr "ๆฒ’ๆœ‰ info ๆชข่ฆ–ๅ™จ่™•็†ๆญค่ซ‹ๆฑ‚"
+
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' ๆ˜ฏ '%s' ็š„ๅˆฅๅ"
+
+#: builtin/help.c:448 git.c:365
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "ๅฃž็š„ alias.%s ๅญ—ไธฒ๏ผš%s"
+
+#: builtin/help.c:477 builtin/help.c:507
+#, c-format
+msgid "usage: %s%s"
+msgstr "็”จๆณ•๏ผš%s%s"
+
+#: builtin/help.c:491
+msgid "'git help config' for more information"
+msgstr "'git help config' ๅ–ๅพ—ๆ›ดๅคš่จŠๆฏ"
+
+#: builtin/index-pack.c:185
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "%s ็š„็‰ฉไปถ้กžๅž‹ไธ็ฌฆๅˆ"
+
+#: builtin/index-pack.c:205
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "ๆœช่ƒฝๅ–ๅพ—้ ๆœŸ็š„็‰ฉไปถ %s"
+
+#: builtin/index-pack.c:208
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "็‰ฉไปถ %s๏ผšๆ‡‰็‚บ้กžๅž‹ %s๏ผŒๅปๆ˜ฏ %s"
+
+#: builtin/index-pack.c:258
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "็„กๆณ•ๅกซๅ…… %d ไฝๅ…ƒ็ต„"
+
+#: builtin/index-pack.c:268
+msgid "early EOF"
+msgstr "้Žๆ—ฉ็š„ๆช”ๆกˆ็ตๆŸ็ฌฆ๏ผˆEOF๏ผ‰"
+
+#: builtin/index-pack.c:269
+msgid "read error on input"
+msgstr "่ผธๅ…ฅไธŠ็š„่ฎ€้Œฏ่ชค"
+
+#: builtin/index-pack.c:281
+msgid "used more bytes than were available"
+msgstr "็”จๆŽ‰ไบ†่ถ…้Žๅฏ็”จ็š„ไฝๅ…ƒ็ต„"
+
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
+msgid "pack too large for current definition of off_t"
+msgstr "ๅŒ…ๅคชๅคง่ถ…้Žไบ†็›ฎๅ‰ off_t ็š„ๅฎš็พฉ"
+
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "ๅŒ…่ถ…้Žไบ†ๆœ€ๅคงๅ…่จฑๅ€ผ"
+
+#: builtin/index-pack.c:312
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "็„กๆณ•้–‹ๅ•Ÿ packfile '%s'"
+
+#: builtin/index-pack.c:326
+msgid "pack signature mismatch"
+msgstr "ๅŒ…็ฐฝๅไธ็ฌฆๅˆ"
+
+#: builtin/index-pack.c:328
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "ไธๆ”ฏๆดๅŒ…็‰ˆๆœฌ %<PRIu32>"
+
+#: builtin/index-pack.c:346
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "ๅŒ…ไธญๆœ‰้Œฏ่ชค็š„็‰ฉไปถไฝๆ–ผไฝ็งป้‡ %<PRIuMAX>๏ผš%s"
+
+#: builtin/index-pack.c:466
+#, c-format
+msgid "inflate returned %d"
+msgstr "่งฃๅฃ“็ธฎ่ฟ”ๅ›ž %d"
+
+#: builtin/index-pack.c:515
+msgid "offset value overflow for delta base object"
+msgstr "ไฝ็งปๅ€ผ่ฆ†่“‹ไบ† delta ๅŸบๆบ–็‰ฉไปถ"
+
+#: builtin/index-pack.c:523
+msgid "delta base offset is out of bound"
+msgstr "delta ๅŸบๆบ–ไฝ็งป่ถŠ็•Œ"
+
+#: builtin/index-pack.c:531
+#, c-format
+msgid "unknown object type %d"
+msgstr "ๆœช็Ÿฅ็‰ฉไปถ้กžๅž‹ %d"
+
+#: builtin/index-pack.c:562
+msgid "cannot pread pack file"
+msgstr "็„กๆณ•่ฎ€ๅ–ๅŒ…ๆช”ๆกˆ"
+
+#: builtin/index-pack.c:564
+#, c-format
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "ๅŒ…ๆช”ๆกˆ้Žๆ—ฉ็ตๆŸ๏ผŒ็ผบๅฐ‘ %<PRIuMAX> ไฝๅ…ƒ็ต„"
+
+#: builtin/index-pack.c:590
+msgid "serious inflate inconsistency"
+msgstr "่งฃๅฃ“็ธฎๅšด้‡็š„ไธไธ€่‡ด"
+
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "็™ผ็พ %s ๅ‡บ็พ SHA1 ่ก็ช๏ผ"
+
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#, c-format
+msgid "unable to read %s"
+msgstr "ไธ่ƒฝ่ฎ€ %s"
+
+#: builtin/index-pack.c:802
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–็พๅญ˜็‰ฉไปถ่จŠๆฏ %s"
+
+#: builtin/index-pack.c:810
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–็พๅญ˜็‰ฉไปถ %s"
+
+#: builtin/index-pack.c:824
+#, c-format
+msgid "invalid blob object %s"
+msgstr "็„กๆ•ˆ็š„่ณ‡ๆ–™็‰ฉไปถ %s"
+
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
+msgid "fsck error in packed object"
+msgstr "ๅฐๆ‰“ๅŒ…็‰ฉไปถ fsck ๆชขๆŸฅ็™ผ็”Ÿ้Œฏ่ชค"
+
+#: builtin/index-pack.c:848
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "%s ็š„ๆ‰€ๆœ‰ๅญ็‰ฉไปถไธฆ้ž้ƒฝๅฏไปฅๅ–ๅพ—"
+
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
+msgid "failed to apply delta"
+msgstr "ๆ‡‰็”จ delta ๅคฑๆ•—"
+
+#: builtin/index-pack.c:1121
+msgid "Receiving objects"
+msgstr "ๆŽฅๆ”ถ็‰ฉไปถไธญ"
+
+#: builtin/index-pack.c:1121
+msgid "Indexing objects"
+msgstr "็ดขๅผ•็‰ฉไปถไธญ"
+
+#: builtin/index-pack.c:1155
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "ๅŒ…่ก็ช๏ผˆSHA1 ไธ็ฌฆๅˆ๏ผ‰"
+
+#: builtin/index-pack.c:1160
+msgid "cannot fstat packfile"
+msgstr "ไธ่ƒฝๅฐ packfile ๅ‘ผๅซ fstat"
+
+#: builtin/index-pack.c:1163
+msgid "pack has junk at the end"
+msgstr "ๅŒ…็š„็ตๅฐพๆœ‰ๅžƒๅœพ่ณ‡ๆ–™"
+
+#: builtin/index-pack.c:1175
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "parse_pack_objects() ไธญ้‡ๅˆฐไธๅฏ็†ๅ–ป็š„ๅ•้กŒ"
+
+#: builtin/index-pack.c:1198
+msgid "Resolving deltas"
+msgstr "่™•็† delta ไธญ"
+
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ๅŸท่กŒ็ท’๏ผš%s"
+
+#: builtin/index-pack.c:1249
+msgid "confusion beyond insanity"
+msgstr "ไธๅฏ็†ๅ–ป"
+
+#: builtin/index-pack.c:1255
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "ๅฎŒๆˆ %d ๅ€‹ๆœฌๆฉŸ็‰ฉไปถ"
+
+#: builtin/index-pack.c:1267
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "ๅฐ %s ็š„ๅฐพ้ƒจ็ธฝๅ’ŒๆชขๆŸฅๅ‡บ็พๆ„ๅค–๏ผˆ็ฃ็ขŸๆๅฃž๏ผŸ๏ผ‰"
+
+#: builtin/index-pack.c:1271
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "ๅŒ…ๆœ‰ %d ๅ€‹ๆœช่งฃๆฑบ็š„ delta"
+
+#: builtin/index-pack.c:1295
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "ไธ่ƒฝๅฃ“็ธฎ้™„ๅŠ ็‰ฉไปถ๏ผˆ%d๏ผ‰"
+
+#: builtin/index-pack.c:1392
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "ๆœฌๆฉŸ็‰ฉไปถ %s ๅทฒๆๅฃž"
+
+#: builtin/index-pack.c:1406
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "packfile ๅ็จฑ '%s' ๆฒ’ๆœ‰ไปฅ '.pack' ็ตๅฐพ"
+
+#: builtin/index-pack.c:1431
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "็„กๆณ•ๅฏซๅ…ฅ %s ๆช”ๆกˆ '%s'"
+
+#: builtin/index-pack.c:1439
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "็„กๆณ•้—œ้–‰ๅทฒๅฏซๅ…ฅ็š„ %s ๆช”ๆกˆ '%s'"
+
+#: builtin/index-pack.c:1463
+msgid "error while closing pack file"
+msgstr "้—œ้–‰ๅŒ…ๆช”ๆกˆๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
+
+#: builtin/index-pack.c:1477
+msgid "cannot store pack file"
+msgstr "็„กๆณ•ๅ„ฒๅญ˜ๅŒ…ๆช”ๆกˆ"
+
+#: builtin/index-pack.c:1485
+msgid "cannot store index file"
+msgstr "็„กๆณ•ๅ„ฒๅญ˜็ดขๅผ•ๆช”ๆกˆ"
+
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "ๅฃž็š„ pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1597
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "็„กๆณ•้–‹ๅ•Ÿ็พๅญ˜ๅŒ…ๆช”ๆกˆ '%s'"
+
+#: builtin/index-pack.c:1599
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "็„กๆณ•็‚บ %s ้–‹ๅ•ŸๅŒ…็ดขๅผ•ๆช”ๆกˆ"
+
+#: builtin/index-pack.c:1647
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "้ž delta๏ผš%d ๅ€‹็‰ฉไปถ"
+
+#: builtin/index-pack.c:1654
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "้ˆ้•ท = %d: %lu ็‰ฉไปถ"
+
+#: builtin/index-pack.c:1693
+msgid "Cannot come back to cwd"
+msgstr "็„กๆณ•่ฟ”ๅ›ž็›ฎๅ‰ๅทฅไฝœ็›ฎ้Œ„"
+
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#, c-format
+msgid "bad %s"
+msgstr "้Œฏ่ชค้ธ้ … %s"
+
+#: builtin/index-pack.c:1781
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin ไธ่ƒฝๅ’Œ --stdin ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/index-pack.c:1783
+msgid "--stdin requires a git repository"
+msgstr "--stdin ้œ€่ฆไธ€ๅ€‹ git ็‰ˆๆœฌๅบซ"
+
+#: builtin/index-pack.c:1789
+msgid "--verify with no packfile name given"
+msgstr "--verify ๆฒ’ๆœ‰ๆไพ› packfile ๅ็จฑๅƒๆ•ธ"
+
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+msgid "fsck error in pack objects"
+msgstr "ๅœจๆ‰“ๅŒ…็‰ฉไปถไธญ fsck ๆชขๆŸฅ็™ผ็”Ÿ้Œฏ่ชค"
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "ไธ่ƒฝๅฐ็ฏ„ๆœฌ '%s' ๅ‘ผๅซ stat"
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ็›ฎ้Œ„ '%s'"
+
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–้€ฃ็ต '%s'"
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "ไธ่ƒฝ่‡ช '%s' ๅˆฐ '%s' ๅปบ็ซ‹็ฌฆ่™Ÿ้€ฃ็ต"
+
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "ไธ่ƒฝ่ค‡่ฃฝ '%s' ่‡ณ '%s'"
+
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
+msgstr "ๅฟฝ็•ฅ็ฏ„ๆœฌ %s"
+
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
+msgstr "ๆฒ’ๆœ‰ๅœจ %s ไธญๆ‰พๅˆฐ็ฏ„ๆœฌ"
+
+#: builtin/init-db.c:136
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "ๆฒ’ๆœ‰ๅพž '%s' ่ค‡่ฃฝ็ฏ„ๆœฌ๏ผš%s"
+
+#: builtin/init-db.c:334
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "ไธ่ƒฝ่™•็† %d ้กžๅž‹็š„ๆช”ๆกˆ"
+
+#: builtin/init-db.c:337
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "ไธ่ƒฝ็งปๅ‹• %s ่‡ณ %s"
+
+#: builtin/init-db.c:354 builtin/init-db.c:357
+#, c-format
+msgid "%s already exists"
+msgstr "%s ๅทฒ็ถ“ๅญ˜ๅœจ"
+
+#: builtin/init-db.c:413
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "้‡ๆ–ฐๅˆๅง‹ๅŒ–ๅทฒๅญ˜ๅœจ็š„ๅ…ฑไบซ Git ็‰ˆๆœฌๅบซๆ–ผ %s%s\n"
+
+#: builtin/init-db.c:414
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "้‡ๆ–ฐๅˆๅง‹ๅŒ–ๅทฒๅญ˜ๅœจ็š„ Git ็‰ˆๆœฌๅบซๆ–ผ %s%s\n"
+
+#: builtin/init-db.c:418
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "ๅทฒๅˆๅง‹ๅŒ–็ฉบ็š„ๅ…ฑไบซ Git ็‰ˆๆœฌๅบซๆ–ผ %s%s\n"
+
+#: builtin/init-db.c:419
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "ๅทฒๅˆๅง‹ๅŒ–็ฉบ็š„ Git ็‰ˆๆœฌๅบซๆ–ผ %s%s\n"
+
+#: builtin/init-db.c:468
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<็ฏ„ๆœฌ็›ฎ้Œ„>] [--shared[=<ๆฌŠ้™>]] "
+"[<็›ฎ้Œ„>]"
+
+#: builtin/init-db.c:491
+msgid "permissions"
+msgstr "ๆฌŠ้™"
+
+#: builtin/init-db.c:492
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr "ๆŒ‡ๅฎš git ็‰ˆๆœฌๅบซๆ˜ฏๅคšๅ€‹ไฝฟ็”จ่€…ไน‹้–“ๅ…ฑไบซ็š„"
+
+#: builtin/init-db.c:529 builtin/init-db.c:534
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "ไธ่ƒฝๅปบ็ซ‹็›ฎ้Œ„ %s"
+
+#: builtin/init-db.c:538
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "ไธ่ƒฝๅˆ‡ๆ›็›ฎ้Œ„ๅˆฐ %s"
+
+#: builtin/init-db.c:559
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr "ไธๅ…่จฑ %s๏ผˆๆˆ– --work-tree=<็›ฎ้Œ„>๏ผ‰่€Œๆฒ’ๆœ‰ๆŒ‡ๅฎš %s๏ผˆๆˆ– --git-dir=<็›ฎ้Œ„>๏ผ‰"
+
+#: builtin/init-db.c:587
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "ไธ่ƒฝๅญ˜ๅ–ๅทฅไฝœๅ€ '%s'"
+
+#: builtin/interpret-trailers.c:16
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <้ต>[(=|:)<ๅ€ผ"
+">])...] [<ๆช”ๆกˆ>...]"
+
+#: builtin/interpret-trailers.c:95
+msgid "edit files in place"
+msgstr "ๅœจๅŽŸไฝ็ทจ่ผฏๆช”ๆกˆ"
+
+#: builtin/interpret-trailers.c:96
+msgid "trim empty trailers"
+msgstr "ๅˆช้™ค็ฉบ็š„ๅฐพ้ƒจ็ฝฒๅ"
+
+#: builtin/interpret-trailers.c:99
+msgid "where to place the new trailer"
+msgstr "ๅœจๅ“ช่ฃกๆ”พ็ฝฎๆ–ฐ็š„ๅฐพ้ƒจ็ฝฒๅ"
+
+#: builtin/interpret-trailers.c:101
+msgid "action if trailer already exists"
+msgstr "็•ถๅฐพ้ƒจ็ฝฒๅๅทฒ็ถ“ๅญ˜ๅœจๆ™‚ๆ‰€ๆŽกๅ–็š„ๅ‹•ไฝœ"
+
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
+msgstr "็•ถๅฐพ้ƒจ็ฝฒๅ็ผบๅฐ‘ๆ™‚ๆ‰€ๆŽกๅ–็š„ๅ‹•ไฝœ"
+
+#: builtin/interpret-trailers.c:105
+msgid "output only the trailers"
+msgstr "ๅช่ผธๅ‡บๅฐพ้ƒจ็ฝฒๅ"
+
+#: builtin/interpret-trailers.c:106
+msgid "do not apply config rules"
+msgstr "ไธ่ฆๆ‡‰็”จ่จญๅฎš่ฆๅ‰‡"
+
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
+msgstr "้€ฃ็ทš็ฉบ็™ฝๆŠ˜่กŒ็š„ๅ€ผ"
+
+#: builtin/interpret-trailers.c:108
+msgid "set parsing options"
+msgstr "่จญๅฎš่งฃๆž้ธ้ …"
+
+#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
+msgstr "ไธ่ฆๅฐ --- ็‰นๆฎŠ่™•็†"
+
+#: builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "ๅฐพ้ƒจ็ฝฒๅ"
+
+#: builtin/interpret-trailers.c:112
+msgid "trailer(s) to add"
+msgstr "่ฆๆ–ฐๅขž็š„ๅฐพ้ƒจ็ฝฒๅ"
+
+#: builtin/interpret-trailers.c:123
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer ๅ’Œ --only-input ๅŒๆ™‚ไฝฟ็”จๆฒ’ๆœ‰ๆ„็พฉ"
+
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr "ๆฒ’ๆœ‰็ตฆๅ‡บ่ฆๅŽŸไฝ็ทจ่ผฏ็š„ๆช”ๆกˆ"
+
+#: builtin/log.c:56
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<้ธ้ …>] [<็‰ˆๆœฌ็ฏ„ๅœ>] [[--] <่ทฏๅพ‘>...]"
+
+#: builtin/log.c:57
+msgid "git show [<options>] <object>..."
+msgstr "git show [<้ธ้ …>] <็‰ฉไปถ>..."
+
+#: builtin/log.c:110
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "็„กๆ•ˆ็š„ --decorate ้ธ้ …๏ผš%s"
+
+#: builtin/log.c:174
+msgid "show source"
+msgstr "้กฏ็คบๆบ"
+
+#: builtin/log.c:175
+msgid "Use mail map file"
+msgstr "ไฝฟ็”จไฟกไปถๆ˜ ๅฐ„ๆช”ๆกˆ"
+
+#: builtin/log.c:177
+msgid "only decorate refs that match <pattern>"
+msgstr "ๅชไฟฎ้ฃพ่ˆ‡ <ๆจกๅผ> ็ฌฆๅˆ็š„ๅผ•็”จ"
+
+#: builtin/log.c:179
+msgid "do not decorate refs that match <pattern>"
+msgstr "ไธไฟฎ้ฃพๅ’Œ <ๆจกๅผ> ็ฌฆๅˆ็š„ๅผ•็”จ"
+
+#: builtin/log.c:180
+msgid "decorate options"
+msgstr "ไฟฎ้ฃพ้ธ้ …"
+
+#: builtin/log.c:183
+msgid "Process line range n,m in file, counting from 1"
+msgstr "่™•็†ๆช”ๆกˆไธญ็ฌฌ n ๅˆฐ m ไน‹้–“็š„่กŒ๏ผŒๅพž 1 ้–‹ๅง‹"
+
+#: builtin/log.c:281
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "ๆœ€็ต‚่ผธๅ‡บ๏ผš%d %s\n"
+
+#: builtin/log.c:535
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: ๆๅฃž็š„ๆช”ๆกˆ"
+
+#: builtin/log.c:550 builtin/log.c:645
+#, c-format
+msgid "could not read object %s"
+msgstr "ไธ่ƒฝ่ฎ€ๅ–็‰ฉไปถ %s"
+
+#: builtin/log.c:670
+#, c-format
+msgid "unknown type: %d"
+msgstr "ๆœช็Ÿฅ้กžๅž‹๏ผš%d"
+
+#: builtin/log.c:814
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s๏ผšๅพžๆ่ฟฐ็”ข็”Ÿ้™„ๅ‡ฝ็š„ๆจกๅผ็„กๆ•ˆ"
+
+#: builtin/log.c:821
+msgid "format.headers without value"
+msgstr "format.headers ๆฒ’ๆœ‰ๅ€ผ"
+
+#: builtin/log.c:936
+msgid "name of output directory is too long"
+msgstr "่ผธๅ‡บ็›ฎ้Œ„ๅๅคช้•ท"
+
+#: builtin/log.c:952
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "็„กๆณ•้–‹ๅ•Ÿไฟฎ่ฃœๆช”ๆกˆ %s"
+
+#: builtin/log.c:969
+msgid "need exactly one range"
+msgstr "ๅช้œ€่ฆไธ€ๅ€‹็ฏ„ๅœ"
+
+#: builtin/log.c:979
+msgid "not a range"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹็ฏ„ๅœ"
+
+#: builtin/log.c:1143
+msgid "cover letter needs email format"
+msgstr "้™„ๅ‡ฝ้œ€่ฆไฟกไปถไฝๅ€ๆ ผๅผ"
+
+#: builtin/log.c:1149
+msgid "failed to create cover-letter file"
+msgstr "็„กๆณ•ๅปบ็ซ‹้™„ๅ‡ฝๆช”ๆกˆ"
+
+#: builtin/log.c:1228
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "ไธๆญฃๅธธ็š„ in-reply-to๏ผš%s"
+
+#: builtin/log.c:1255
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<้ธ้ …>] [<ๅพž> | <็‰ˆๆœฌ็ฏ„ๅœ>]"
+
+#: builtin/log.c:1313
+msgid "two output directories?"
+msgstr "ๅ…ฉๅ€‹่ผธๅ‡บ็›ฎ้Œ„๏ผŸ"
+
+#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#, c-format
+msgid "unknown commit %s"
+msgstr "ๆœช็Ÿฅๆไบค %s"
+
+#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "็„กๆณ•ๅฐ‡ '%s' ่งฃๆž็‚บไธ€ๅ€‹ๆœ‰ๆ•ˆๅผ•็”จ"
+
+#: builtin/log.c:1439
+msgid "could not find exact merge base"
+msgstr "ไธ่ƒฝๆ‰พๅˆฐๆบ–็ขบ็š„ๅˆไฝตๅŸบ็คŽ"
+
+#: builtin/log.c:1443
+msgid ""
+"failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually"
+msgstr ""
+"็„กๆณ•ๅพ—ๅˆฐไธŠๆธธไฝๅ€๏ผŒๅฆ‚ๆžœไฝ ๆƒณ่‡ชๅ‹•่จ˜้Œ„ๅŸบ็คŽๆไบค๏ผŒ่ซ‹ไฝฟ็”จๆŒ‡ไปค\n"
+"git branch --set-upstream-to ไพ†่ฟฝ่นคไธ€ๅ€‹้ ็ซฏๅˆ†ๆ”ฏใ€‚ๆˆ–่€…ไฝ ๅฏไปฅ้€้Ž\n"
+"ๅƒๆ•ธ --base=<ๅŸบ็คŽๆไบค> ๆ‰‹ๅ‹•ๆŒ‡ๅฎšไธ€ๅ€‹ๅŸบ็คŽๆไบค"
+
+#: builtin/log.c:1463
+msgid "failed to find exact merge base"
+msgstr "็„กๆณ•ๆ‰พๅˆฐๆบ–็ขบ็š„ๅˆไฝตๅŸบ็คŽ"
+
+#: builtin/log.c:1474
+msgid "base commit should be the ancestor of revision list"
+msgstr "ๅŸบ็คŽๆไบคๆ‡‰่ฉฒๆ˜ฏ็‰ˆๆœฌๅˆ—่กจ็š„็ฅ–ๅ…ˆ"
+
+#: builtin/log.c:1478
+msgid "base commit shouldn't be in revision list"
+msgstr "ๅŸบ็คŽๆไบคไธๆ‡‰่ฉฒๅ‡บ็พๅœจ็‰ˆๆœฌๅˆ—่กจไธญ"
+
+#: builtin/log.c:1531
+msgid "cannot get patch id"
+msgstr "็„กๆณ•ๅพ—ๅˆฐไฟฎ่ฃœๆช” id"
+
+#: builtin/log.c:1583
+msgid "failed to infer range-diff ranges"
+msgstr "็„กๆณ•ๆŽจๆ–ท range-diff ็ฏ„ๅœ"
+
+#: builtin/log.c:1629
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "ไฝฟ็”จ [PATCH n/m]๏ผŒๅณไฝฟๅชๆœ‰ไธ€ๅ€‹ไฟฎ่ฃœๆช”"
+
+#: builtin/log.c:1632
+msgid "use [PATCH] even with multiple patches"
+msgstr "ไฝฟ็”จ [PATCH]๏ผŒๅณไฝฟๆœ‰ๅคšๅ€‹ไฟฎ่ฃœๆช”"
+
+#: builtin/log.c:1636
+msgid "print patches to standard out"
+msgstr "ๅˆ—ๅฐไฟฎ่ฃœๆช”ๅˆฐๆจ™ๆบ–่ผธๅ‡บ"
+
+#: builtin/log.c:1638
+msgid "generate a cover letter"
+msgstr "็”Ÿๆˆไธ€ๅฐ้™„ๅ‡ฝ"
+
+#: builtin/log.c:1640
+msgid "use simple number sequence for output file names"
+msgstr "ไฝฟ็”จ็ฐกๅ–ฎ็š„ๆ•ธๅญ—ๅบๅˆ—ไฝœ็‚บ่ผธๅ‡บๆช”ๆกˆๅ"
+
+#: builtin/log.c:1641
+msgid "sfx"
+msgstr "ๅพŒ็ถด"
+
+#: builtin/log.c:1642
+msgid "use <sfx> instead of '.patch'"
+msgstr "ไฝฟ็”จ <ๅพŒ็ถด> ไปฃๆ›ฟ '.patch'"
+
+#: builtin/log.c:1644
+msgid "start numbering patches at <n> instead of 1"
+msgstr "ไฟฎ่ฃœๆช”ไปฅ <n> ้–‹ๅง‹็ทจ่™Ÿ๏ผŒ่€Œไธๆ˜ฏ1"
+
+#: builtin/log.c:1646
+msgid "mark the series as Nth re-roll"
+msgstr "ๆจ™่จ˜ไฟฎ่ฃœๆช”็ณปๅˆ—ๆ˜ฏ็ฌฌๅนพๆฌก้‡่ฃฝ"
+
+#: builtin/log.c:1648
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "ไฝฟ็”จ [RFC PATCH] ไปฃๆ›ฟ [PATCH]"
+
+#: builtin/log.c:1651
+msgid "cover-from-description-mode"
+msgstr "ๅพžๆ่ฟฐ็”ข็”Ÿ้™„ๅ‡ฝ็š„ๆจกๅผ"
+
+#: builtin/log.c:1652
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "ๅŸบๆ–ผๅˆ†ๆ”ฏๆ่ฟฐ็”ข็”Ÿ้ƒจๅˆ†้™„ๅ‡ฝ"
+
+#: builtin/log.c:1654
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "ไฝฟ็”จ [<ๅ‰็ถด>] ไปฃๆ›ฟ [PATCH]"
+
+#: builtin/log.c:1657
+msgid "store resulting files in <dir>"
+msgstr "ๆŠŠ็ตๆžœๆช”ๆกˆๅ„ฒๅญ˜ๅœจ <็›ฎ้Œ„>"
+
+#: builtin/log.c:1660
+msgid "don't strip/add [PATCH]"
+msgstr "ไธๅˆช้™ค/ๆ–ฐๅขž [PATCH]"
+
+#: builtin/log.c:1663
+msgid "don't output binary diffs"
+msgstr "ไธ่ผธๅ‡บไบŒ้€ฒไฝๅทฎ็•ฐ"
+
+#: builtin/log.c:1665
+msgid "output all-zero hash in From header"
+msgstr "ๅœจ From ๆจ™้ ญ่จŠๆฏไธญ่ผธๅ‡บๅ…จ็‚บ้›ถ็š„้›œๆนŠๅ€ผ"
+
+#: builtin/log.c:1667
+msgid "don't include a patch matching a commit upstream"
+msgstr "ไธๅŒ…ๅซๅทฒๅœจไธŠๆธธๆไบคไธญ็š„ไฟฎ่ฃœๆช”"
+
+#: builtin/log.c:1669
+msgid "show patch format instead of default (patch + stat)"
+msgstr "้กฏ็คบ็ด”ไฟฎ่ฃœๆช”ๆ ผๅผ่€Œ้ž้ ่จญ็š„๏ผˆไฟฎ่ฃœๆช”+็‹€ๆ…‹๏ผ‰"
+
+#: builtin/log.c:1671
+msgid "Messaging"
+msgstr "ไฟกไปถๅ‚ณ้€"
+
+#: builtin/log.c:1672
+msgid "header"
+msgstr "header"
+
+#: builtin/log.c:1673
+msgid "add email header"
+msgstr "ๆ–ฐๅขžไฟกไปถ้ ญ"
+
+#: builtin/log.c:1674 builtin/log.c:1676
+msgid "email"
+msgstr "ไฟกไปถไฝๅ€"
+
+#: builtin/log.c:1674
+msgid "add To: header"
+msgstr "ๆ–ฐๅขžๆ”ถไปถไบบ"
+
+#: builtin/log.c:1676
+msgid "add Cc: header"
+msgstr "ๆ–ฐๅขžๆŠ„้€"
+
+#: builtin/log.c:1678
+msgid "ident"
+msgstr "ๆจ™่จ˜"
+
+#: builtin/log.c:1679
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "ๅฐ‡ From ไฝๅ€่จญๅฎš็‚บ <ๆจ™่จ˜>๏ผˆๅฆ‚่‹ฅไธๆไพ›๏ผŒๅ‰‡็”จๆไบค่€… ID ๅš็‚บไฝๅ€๏ผ‰"
+
+#: builtin/log.c:1681
+msgid "message-id"
+msgstr "ไฟกไปถๆจ™่จ˜"
+
+#: builtin/log.c:1682
+msgid "make first mail a reply to <message-id>"
+msgstr "ไฝฟ็ฌฌไธ€ๅฐไฟกไปถไฝœ็‚บๅฐ <ไฟกไปถๆจ™่จ˜> ็š„ๅ›ž่ฆ†"
+
+#: builtin/log.c:1683 builtin/log.c:1686
+msgid "boundary"
+msgstr "้‚Š็•Œ"
+
+#: builtin/log.c:1684
+msgid "attach the patch"
+msgstr "้™„ไปถๆ–นๅผๆ–ฐๅขžไฟฎ่ฃœๆช”"
+
+#: builtin/log.c:1687
+msgid "inline the patch"
+msgstr "ๅ…ง่ฏ้กฏ็คบไฟฎ่ฃœๆช”"
+
+#: builtin/log.c:1691
+msgid "enable message threading, styles: shallow, deep"
+msgstr "ๅ•Ÿ็”จไฟกไปถ็ทš็ดข๏ผŒ้ขจๆ ผ๏ผšๆทบ๏ผŒๆทฑ"
+
+#: builtin/log.c:1693
+msgid "signature"
+msgstr "็ฐฝๅ"
+
+#: builtin/log.c:1694
+msgid "add a signature"
+msgstr "ๆ–ฐๅขžไธ€ๅ€‹็ฐฝๅ"
+
+#: builtin/log.c:1695
+msgid "base-commit"
+msgstr "ๅŸบ็คŽๆไบค"
+
+#: builtin/log.c:1696
+msgid "add prerequisite tree info to the patch series"
+msgstr "็‚บไฟฎ่ฃœๆช”ๅˆ—่กจๆ–ฐๅขžๅ‰็ฝฎๆจน่จŠๆฏ"
+
+#: builtin/log.c:1698
+msgid "add a signature from a file"
+msgstr "ๅพžๆช”ๆกˆๆ–ฐๅขžไธ€ๅ€‹็ฐฝๅ"
+
+#: builtin/log.c:1699
+msgid "don't print the patch filenames"
+msgstr "ไธ่ฆๅˆ—ๅฐไฟฎ่ฃœๆช”ๆช”ๆกˆๅ"
+
+#: builtin/log.c:1701
+msgid "show progress while generating patches"
+msgstr "ๅœจ็”Ÿๆˆไฟฎ่ฃœๆช”ๆ™‚้กฏ็คบ้€ฒๅบฆ"
+
+#: builtin/log.c:1703
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr "ๅœจ้™„ๅ‡ฝๆˆ–ๅ–ฎๅ€‹ไฟฎ่ฃœๆช”ไธญ้กฏ็คบๅ’Œ <rev> ็š„ๅทฎ็•ฐ"
+
+#: builtin/log.c:1706
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr "ๅœจ้™„ๅ‡ฝๆˆ–ๅ–ฎๅ€‹ไฟฎ่ฃœๆช”ไธญ้กฏ็คบๅ’Œ <refspec> ็š„ๅทฎ็•ฐ"
+
+#: builtin/log.c:1708
+msgid "percentage by which creation is weighted"
+msgstr "ๅปบ็ซ‹ๆฌŠ้‡็š„็™พๅˆ†ๆฏ”"
+
+#: builtin/log.c:1792
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "ๅŒ…ๅซ็„กๆ•ˆ็š„่บซไปฝๆจ™่จ˜๏ผš%s"
+
+#: builtin/log.c:1807
+msgid "-n and -k are mutually exclusive"
+msgstr "-n ๅ’Œ -k ไบ’ๆ–ฅ"
+
+#: builtin/log.c:1809
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "--subject-prefix/--rfc ๅ’Œ -k ไบ’ๆ–ฅ"
+
+#: builtin/log.c:1817
+msgid "--name-only does not make sense"
+msgstr "--name-only ็„กๆ„็พฉ"
+
+#: builtin/log.c:1819
+msgid "--name-status does not make sense"
+msgstr "--name-status ็„กๆ„็พฉ"
+
+#: builtin/log.c:1821
+msgid "--check does not make sense"
+msgstr "--check ็„กๆ„็พฉ"
+
+#: builtin/log.c:1854
+msgid "standard output, or directory, which one?"
+msgstr "ๆจ™ๆบ–่ผธๅ‡บๆˆ–็›ฎ้Œ„๏ผŒๅ“ชไธ€ๅ€‹๏ผŸ"
+
+#: builtin/log.c:1958
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff ้œ€่ฆ --cover-letter ๆˆ–ๅ–ฎไธ€ไฟฎ่ฃœๆช”"
+
+#: builtin/log.c:1962
+msgid "Interdiff:"
+msgstr "็‰ˆๆœฌ้–“ๅทฎ็•ฐ๏ผš"
+
+#: builtin/log.c:1963
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr "ๅฐ v%d ็š„็‰ˆๆœฌๅทฎ็•ฐ๏ผš"
+
+#: builtin/log.c:1969
+msgid "--creation-factor requires --range-diff"
+msgstr "--creation-factor ้œ€่ฆ --range-diff"
+
+#: builtin/log.c:1973
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff ้œ€่ฆ --cover-letter ๆˆ–ๅ–ฎไธ€ไฟฎ่ฃœๆช”"
+
+#: builtin/log.c:1981
+msgid "Range-diff:"
+msgstr "็ฏ„ๅœๅทฎ็•ฐ๏ผš"
+
+#: builtin/log.c:1982
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "ๅฐ v%d ็š„็ฏ„ๅœๅทฎ็•ฐ๏ผš"
+
+#: builtin/log.c:1993
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "็„กๆณ•่ฎ€ๅ–็ฐฝๅๆช”ๆกˆ '%s'"
+
+#: builtin/log.c:2029
+msgid "Generating patches"
+msgstr "็”Ÿๆˆไฟฎ่ฃœๆช”"
+
+#: builtin/log.c:2073
+msgid "failed to create output files"
+msgstr "็„กๆณ•ๅปบ็ซ‹่ผธๅ‡บๆช”ๆกˆ"
+
+#: builtin/log.c:2132
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<ไธŠๆธธ> [<้ ญ> [<้™ๅˆถ>]]]"
+
+#: builtin/log.c:2186
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr "ไธ่ƒฝๆ‰พๅˆฐ่ฟฝ่นค็š„้ ็ซฏๅˆ†ๆ”ฏ๏ผŒ่ซ‹ๆ‰‹ๅ‹•ๆŒ‡ๅฎš <ไธŠๆธธ>ใ€‚\n"
+
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<้ธ้ …>] [<ๆช”ๆกˆ>...]"
+
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
+msgstr "็”จๆจ™็ฑคๆจ™่จ˜ๆช”ๆกˆ็š„็‹€ๆ…‹"
+
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "ไฝฟ็”จๅฐๅฏซๅญ—ๆฏ่กจ็คบ 'ๅ‡่จญๆœชๆ”น่ฎŠ็š„' ๆช”ๆกˆ"
+
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "ไฝฟ็”จๅฐๅฏซๅญ—ๆฏ่กจ็คบ 'fsmonitor clean' ๆช”ๆกˆ"
+
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
+msgstr "้กฏ็คบๅฟซๅ–็š„ๆช”ๆกˆ๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
+msgstr "้กฏ็คบๅทฒๅˆช้™ค็š„ๆช”ๆกˆ"
+
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
+msgstr "้กฏ็คบๅทฒไฟฎๆ”น็š„ๆช”ๆกˆ"
+
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
+msgstr "้กฏ็คบๅ…ถๅฎƒๆช”ๆกˆ"
+
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
+msgstr "้กฏ็คบๅฟฝ็•ฅ็š„ๆช”ๆกˆ"
+
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
+msgstr "้กฏ็คบๆšซๅญ˜ๅ€ๅ…งๅฎน็š„็‰ฉไปถๅ็จฑ"
+
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
+msgstr "้กฏ็คบๆช”ๆกˆ็ณป็ตฑ้œ€่ฆๅˆช้™ค็š„ๆช”ๆกˆ"
+
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
+msgstr "ๅช้กฏ็คบใ€Œๅ…ถไป–ใ€็›ฎ้Œ„็š„ๅ็จฑ"
+
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
+msgstr "้กฏ็คบๆช”ๆกˆๆ›่กŒ็ฌฆ่™Ÿๆ ผๅผ"
+
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
+msgstr "ไธ้กฏ็คบ็ฉบ็›ฎ้Œ„"
+
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
+msgstr "้กฏ็คบๆœชๅˆไฝต็š„ๆช”ๆกˆ"
+
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
+msgstr "้กฏ็คบ resolve-undo ่จŠๆฏ"
+
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
+msgstr "็ฌฆๅˆๆŽ’้™คๆช”ๆกˆ็š„ๆจกๅผ"
+
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
+msgstr "ๅพž <ๆช”ๆกˆ> ไธญ่ฎ€ๅ–ๆŽ’้™คๆจกๅผ"
+
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "ๅพž <ๆช”ๆกˆ> ่ฎ€ๅ–้กๅค–็š„ๆฏๅ€‹็›ฎ้Œ„็š„ๆŽ’้™คๆจกๅผ"
+
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
+msgstr "ๆ–ฐๅขžๆจ™ๆบ–็š„ git ๆŽ’้™ค"
+
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
+msgstr "้กฏ็คบ็›ธๅฐๆ–ผ้ ‚็ดš็›ฎ้Œ„็š„ๆช”ๆกˆๅ"
+
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
+msgstr "ๅœจๅญๆจก็ต„ไธญ้ž่ฟด"
+
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "ๅฆ‚ๆžœไปปไฝ• <ๆช”ๆกˆ> ้ƒฝไธๅœจ็ดขๅผ•ๅ€๏ผŒ่ฆ–็‚บ้Œฏ่ชค"
+
+#: builtin/ls-files.c:576
+msgid "tree-ish"
+msgstr "ๆจนๆˆ–ๆไบค"
+
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "ๅ‡่ฃ่‡ชๅพž <ๆจนๆˆ–ๆไบค> ไน‹ๅพŒๅˆช้™ค็š„่ทฏๅพ‘ไป็„ถๅญ˜ๅœจ"
+
+#: builtin/ls-files.c:579
+msgid "show debugging data"
+msgstr "้กฏ็คบ้™ค้Œฏ่ณ‡ๆ–™"
+
+#: builtin/ls-remote.c:9
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"                     [-q | --quiet] [--exit-code] [--get-url]\n"
+"                     [--symref] [<repository> [<refs>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"                     [-q | --quiet] [--exit-code] [--get-url]\n"
+"                     [--symref] [<็‰ˆๆœฌๅบซ> [<ๅผ•็”จ>...]]"
+
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
+msgstr "ไธๅˆ—ๅฐ้ ็ซฏ URL"
+
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+msgid "exec"
+msgstr "exec"
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
+msgstr "้ ็ซฏไธปๆฉŸไธŠ็š„ git-upload-pack ่ทฏๅพ‘"
+
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
+msgstr "ๅƒ…้™ๆ–ผๆจ™็ฑค"
+
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
+msgstr "ๅƒ…้™ๆ–ผๅˆ†ๆ”ฏ"
+
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
+msgstr "ไธ้กฏ็คบๅทฒ่งฃๆž็š„ๆจ™็ฑค"
+
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
+msgstr "ๅƒ่€ƒ url.<base>.insteadOf ่จญๅฎš"
+
+#: builtin/ls-remote.c:72
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "่‹ฅๆœชๆ‰พๅˆฐ็ฌฆๅˆ็š„ๅผ•็”จๅ‰‡ไปฅ้›ข้–‹็ขผ2้›ข้–‹"
+
+#: builtin/ls-remote.c:75
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "้™คไบ†้กฏ็คบๆŒ‡ๅ‘็š„็‰ฉไปถๅค–๏ผŒ้กฏ็คบๆŒ‡ๅ‘็š„ๅผ•็”จๅ"
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<้ธ้ …>] <ๆจนๆˆ–ๆไบค> [<่ทฏๅพ‘>...]"
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "ๅช้กฏ็คบๆจน"
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "้ž่ฟดๅˆฐๅญๆจน"
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "็•ถ้ž่ฟดๆ™‚้กฏ็คบๆจน"
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "ๆข็›ฎไปฅ NUL ๅญ—ๅ…ƒ็ต‚ๆญข"
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "ๅŒ…ๆ‹ฌ็‰ฉไปถๅคงๅฐ"
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "ๅชๅˆ—ๅ‡บๆช”ๆกˆๅ"
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr "ไฝฟ็”จๆช”ๆกˆ็š„ๅ…จ่ทฏๅพ‘"
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "ๅˆ—ๅ‡บๆ•ดๅ€‹ๆจน๏ผ›ไธๅƒ…ๅƒ…็›ฎๅ‰็›ฎ้Œ„๏ผˆ้šฑๅซ --full-name๏ผ‰"
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "็ฉบ็š„ mbox๏ผš'%s'"
+
+#: builtin/merge.c:55
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<้ธ้ …>] [<ๆไบค>...]"
+
+#: builtin/merge.c:56
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:57
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:119
+msgid "switch `m' requires a value"
+msgstr "้–‹้—œ `m' ้œ€่ฆไธ€ๅ€‹ๅ€ผ"
+
+#: builtin/merge.c:142
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "้ธ้ … `%s' ้œ€่ฆไธ€ๅ€‹ๅ€ผ"
+
+#: builtin/merge.c:188
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "ไธ่ƒฝๆ‰พๅˆฐๅˆไฝต็ญ–็•ฅ '%s'ใ€‚\n"
+
+#: builtin/merge.c:189
+#, c-format
+msgid "Available strategies are:"
+msgstr "ๅฏ็”จ็š„็ญ–็•ฅๆœ‰๏ผš"
+
+#: builtin/merge.c:194
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "ๅฏ็”จ็š„่‡ช่จ‚็ญ–็•ฅๆœ‰๏ผš"
+
+#: builtin/merge.c:245 builtin/pull.c:132
+msgid "do not show a diffstat at the end of the merge"
+msgstr "ๅœจๅˆไฝต็š„ๆœ€ๅพŒไธ้กฏ็คบๅทฎ็•ฐ็ตฑ่จˆ"
+
+#: builtin/merge.c:248 builtin/pull.c:135
+msgid "show a diffstat at the end of the merge"
+msgstr "ๅœจๅˆไฝต็š„ๆœ€ๅพŒ้กฏ็คบๅทฎ็•ฐ็ตฑ่จˆ"
+
+#: builtin/merge.c:249 builtin/pull.c:138
+msgid "(synonym to --stat)"
+msgstr "๏ผˆๅ’Œ --stat ๅŒ็พฉ๏ผ‰"
+
+#: builtin/merge.c:251 builtin/pull.c:141
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "ๅœจๅˆไฝตๆไบค่จŠๆฏไธญๆ–ฐๅขž๏ผˆๆœ€ๅคš <n> ๆข๏ผ‰็ฒพ็ฐกๆไบค่จ˜้Œ„"
+
+#: builtin/merge.c:254 builtin/pull.c:147
+msgid "create a single commit instead of doing a merge"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹ๅ–ฎ็จ็š„ๆไบค่€Œไธๆ˜ฏๅšไธ€ๆฌกๅˆไฝต"
+
+#: builtin/merge.c:256 builtin/pull.c:150
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "ๅฆ‚ๆžœๅˆไฝตๆˆๅŠŸ๏ผŒๅŸท่กŒไธ€ๆฌกๆไบค๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/merge.c:258 builtin/pull.c:153
+msgid "edit message before committing"
+msgstr "ๅœจๆไบคๅ‰็ทจ่ผฏๆไบค่ชชๆ˜Ž"
+
+#: builtin/merge.c:260
+msgid "allow fast-forward (default)"
+msgstr "ๅ…่จฑๅฟซ่ฝ‰๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/merge.c:262 builtin/pull.c:160
+msgid "abort if fast-forward is not possible"
+msgstr "ๅฆ‚ๆžœไธ่ƒฝๅฟซ่ฝ‰ๅฐฑๆ”พๆฃ„ๅˆไฝต"
+
+#: builtin/merge.c:266 builtin/pull.c:163
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "้ฉ—่ญ‰ๆŒ‡ๅฎš็š„ๆไบคๆ˜ฏๅฆๅŒ…ๅซไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ GPG ็ฐฝๅ"
+
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
+msgid "strategy"
+msgstr "็ญ–็•ฅ"
+
+#: builtin/merge.c:268 builtin/pull.c:168
+msgid "merge strategy to use"
+msgstr "่ฆไฝฟ็”จ็š„ๅˆไฝต็ญ–็•ฅ"
+
+#: builtin/merge.c:269 builtin/pull.c:171
+msgid "option=value"
+msgstr "option=value"
+
+#: builtin/merge.c:270 builtin/pull.c:172
+msgid "option for selected merge strategy"
+msgstr "ๆ‰€้ธ็š„ๅˆไฝต็ญ–็•ฅ็š„้ธ้ …"
+
+#: builtin/merge.c:272
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "ๅˆไฝต็š„ๆไบค่ชชๆ˜Ž๏ผˆ้‡ๅฐ้žๅฟซ่ฝ‰ๅผๅˆไฝต๏ผ‰"
+
+#: builtin/merge.c:279
+msgid "abort the current in-progress merge"
+msgstr "ๆ”พๆฃ„็›ฎๅ‰ๆญฃๅœจ้€ฒ่กŒ็š„ๅˆไฝต"
+
+#
+#: builtin/merge.c:281
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort๏ผŒไฝ†ๆ˜ฏไฟ็•™็ดขๅผ•ๅ’Œๅทฅไฝœๅ€"
+
+#: builtin/merge.c:283
+msgid "continue the current in-progress merge"
+msgstr "็นผ็บŒ็›ฎๅ‰ๆญฃๅœจ้€ฒ่กŒ็š„ๅˆไฝต"
+
+#: builtin/merge.c:285 builtin/pull.c:179
+msgid "allow merging unrelated histories"
+msgstr "ๅ…่จฑๅˆไธฆไธ็›ธ้—œ็š„ๆญทๅฒ"
+
+#: builtin/merge.c:291
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "็นž้Ž pre-merge-commit ๅ’Œ commit-msg ๆŽ›้‰ค"
+
+#: builtin/merge.c:308
+msgid "could not run stash."
+msgstr "ไธ่ƒฝๅŸท่กŒๅ„ฒ่—ใ€‚"
+
+#: builtin/merge.c:313
+msgid "stash failed"
+msgstr "ๅ„ฒ่—ๅคฑๆ•—"
+
+#: builtin/merge.c:318
+#, c-format
+msgid "not a valid object: %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็‰ฉไปถ๏ผš%s"
+
+#: builtin/merge.c:340 builtin/merge.c:357
+msgid "read-tree failed"
+msgstr "่ฎ€ๅ–ๆจนๅคฑๆ•—"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/merge.c:387
+msgid " (nothing to squash)"
+msgstr " ๏ผˆ็„กๅฏๅฃ“็ธฎ๏ผ‰"
+
+#: builtin/merge.c:398
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "ๅฃ“็ธฎๆไบค -- ๆœชๆ›ดๆ–ฐ HEAD\n"
+
+#: builtin/merge.c:448
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "็„กๅˆไฝต่จŠๆฏ -- ๆœชๆ›ดๆ–ฐ HEAD\n"
+
+#: builtin/merge.c:499
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' ๆฒ’ๆœ‰ๆŒ‡ๅ‘ไธ€ๅ€‹ๆไบค"
+
+#: builtin/merge.c:586
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "ๅฃž็š„ branch.%s.mergeoptions ๅญ—ไธฒ๏ผš%s"
+
+#: builtin/merge.c:708
+msgid "Not handling anything other than two heads merge."
+msgstr "ๆœช่™•็†ๅ…ฉๅ€‹้ ญๅˆไฝตไน‹ๅค–็š„ไปปไฝ•ๅ‹•ไฝœใ€‚"
+
+#: builtin/merge.c:722
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive ็š„ๆœช็Ÿฅ้ธ้ …๏ผš-X%s"
+
+#: builtin/merge.c:737
+#, c-format
+msgid "unable to write %s"
+msgstr "ไธ่ƒฝๅฏซ %s"
+
+#: builtin/merge.c:789
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "ไธ่ƒฝๅพž '%s' ่ฎ€ๅ–"
+
+#: builtin/merge.c:798
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "ๆœชๆไบคๅˆไธฆ๏ผŒไฝฟ็”จ 'git commit' ๅฎŒๆˆๆญคๆฌกๅˆไฝตใ€‚\n"
+
+#: builtin/merge.c:804
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+msgstr ""
+"่ซ‹่ผธๅ…ฅไธ€ๅ€‹ๆไบค่จŠๆฏไปฅ่งฃ้‡‹ๆญคๅˆไฝต็š„ๅฟ…่ฆๆ€ง๏ผŒๅฐคๅ…ถๆ˜ฏๅฐ‡ไธ€ๅ€‹ๆ›ดๆ–ฐๅพŒ็š„ไธŠๆธธๅˆ†ๆ”ฏ\n"
+"ๅˆไฝตๅˆฐไธป้กŒๅˆ†ๆ”ฏใ€‚\n"
+"\n"
+
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "็ฉบ็š„ๆไบค่ชชๆ˜Žๆœƒ็ต‚ๆญขๆไบคใ€‚\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr "ไปฅ '%c' ้–‹ๅง‹็š„่กŒๅฐ‡่ขซๅฟฝ็•ฅ๏ผŒ่€Œ็ฉบ็š„ๆไบค่ชชๆ˜Žๅฐ‡็ต‚ๆญขๆไบคใ€‚\n"
+
+#: builtin/merge.c:865
+msgid "Empty commit message."
+msgstr "็ฉบๆไบค่จŠๆฏใ€‚"
+
+#: builtin/merge.c:880
+#, c-format
+msgid "Wonderful.\n"
+msgstr "ๅคชๆฃ’ไบ†ใ€‚\n"
+
+#: builtin/merge.c:941
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "่‡ชๅ‹•ๅˆไฝตๅคฑๆ•—๏ผŒไฟฎๆญฃ่ก็ช็„ถๅพŒๆไบคไฟฎๆญฃ็š„็ตๆžœใ€‚\n"
+
+#: builtin/merge.c:980
+msgid "No current branch."
+msgstr "ๆฒ’ๆœ‰็›ฎๅ‰ๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/merge.c:982
+msgid "No remote for the current branch."
+msgstr "็›ฎๅ‰ๅˆ†ๆ”ฏๆฒ’ๆœ‰ๅฐๆ‡‰็š„้ ็ซฏ็‰ˆๆœฌๅบซใ€‚"
+
+#: builtin/merge.c:984
+msgid "No default upstream defined for the current branch."
+msgstr "็›ฎๅ‰ๅˆ†ๆ”ฏๆฒ’ๆœ‰ๅฎš็พฉ้ ่จญ็š„ไธŠๆธธๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/merge.c:989
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "ๅฐๆ–ผ %s ๆฒ’ๆœ‰ไพ†่‡ช %s ็š„้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ"
+
+#: builtin/merge.c:1046
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "็’ฐๅขƒ '%2$s' ไธญๅญ˜ๅœจๅฃž็š„ๅ–ๅ€ผ '%1$s'"
+
+#: builtin/merge.c:1149
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "ไธ่ƒฝๅœจ %s ไธญๅˆไฝต๏ผš%s"
+
+#: builtin/merge.c:1183
+msgid "not something we can merge"
+msgstr "ไธ่ƒฝๅˆไฝต"
+
+#: builtin/merge.c:1286
+msgid "--abort expects no arguments"
+msgstr "--abort ไธๅธถๅƒๆ•ธ"
+
+#: builtin/merge.c:1290
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "ๆฒ’ๆœ‰่ฆ็ต‚ๆญข็š„ๅˆไฝต๏ผˆMERGE_HEAD ้บๅคฑ๏ผ‰ใ€‚"
+
+#: builtin/merge.c:1299
+msgid "--quit expects no arguments"
+msgstr "--quit ไธๅธถๅƒๆ•ธ"
+
+#: builtin/merge.c:1312
+msgid "--continue expects no arguments"
+msgstr "--continue ไธๅธถๅƒๆ•ธ"
+
+#: builtin/merge.c:1316
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "ๆฒ’ๆœ‰้€ฒ่กŒไธญ็š„ๅˆไฝต๏ผˆMERGE_HEAD ้บๅคฑ๏ผ‰ใ€‚"
+
+#: builtin/merge.c:1332
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"ๆ‚จๅฐšๆœช็ตๆŸๆ‚จ็š„ๅˆไฝต๏ผˆๅญ˜ๅœจ MERGE_HEAD๏ผ‰ใ€‚\n"
+"่ซ‹ๅœจๅˆไฝตๅ‰ๅ…ˆๆไบคๆ‚จ็š„ไฟฎๆ”นใ€‚"
+
+#: builtin/merge.c:1339
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"ๆ‚จๅฐšๆœช็ตๆŸๆ‚จ็š„ๆ€้ธ๏ผˆๅญ˜ๅœจ CHERRY_PICK_HEAD๏ผ‰ใ€‚\n"
+"่ซ‹ๅœจๅˆไฝตๅ‰ๅ…ˆๆไบคๆ‚จ็š„ไฟฎๆ”นใ€‚"
+
+#: builtin/merge.c:1342
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "ๆ‚จๅฐšๆœช็ตๆŸๆ‚จ็š„ๆ€้ธ๏ผˆๅญ˜ๅœจ CHERRY_PICK_HEAD๏ผ‰ใ€‚"
+
+#: builtin/merge.c:1356
+msgid "You cannot combine --squash with --no-ff."
+msgstr "ๆ‚จไธ่ƒฝๅฐ‡ --squash ๅ’Œ --no-ff ็ต„ๅˆไฝฟ็”จใ€‚"
+
+#: builtin/merge.c:1358
+msgid "You cannot combine --squash with --commit."
+msgstr "ๆ‚จไธ่ƒฝๅฐ‡ --squash ๅ’Œ --commit ็ต„ๅˆไฝฟ็”จใ€‚"
+
+#: builtin/merge.c:1374
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "ๆœชๆŒ‡ๅฎšๆไบคไธฆไธ” merge.defaultToUpstream ๆœช่จญๅฎšใ€‚"
+
+#: builtin/merge.c:1391
+msgid "Squash commit into empty head not supported yet"
+msgstr "ๅฐšไธๆ”ฏๆดๅˆฐ็ฉบๅˆ†ๆ”ฏ็š„ๅฃ“็ธฎๆไบค"
+
+#: builtin/merge.c:1393
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "ๅˆฐ็ฉบๅˆ†ๆ”ฏ็š„้žๅฟซ่ฝ‰ๅผๆไบคๆฒ’ๆœ‰ๆ„็พฉ"
+
+#: builtin/merge.c:1398
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - ไธ่ƒฝ่ขซๅˆไฝต"
+
+#: builtin/merge.c:1400
+msgid "Can merge only exactly one commit into empty head"
+msgstr "ๅช่ƒฝๅฐ‡ไธ€ๅ€‹ๆไบคๅˆไธฆๅˆฐ็ฉบๅˆ†ๆ”ฏไธŠ"
+
+#: builtin/merge.c:1481
+msgid "refusing to merge unrelated histories"
+msgstr "ๆ‹’็ต•ๅˆไฝต็„ก้—œ็š„ๆญทๅฒ"
+
+#: builtin/merge.c:1490
+msgid "Already up to date."
+msgstr "ๅทฒ็ถ“ๆ˜ฏๆœ€ๆ–ฐ็š„ใ€‚"
+
+#: builtin/merge.c:1500
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "ๆ›ดๆ–ฐ %s..%s\n"
+
+#: builtin/merge.c:1542
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "ๅ˜—่ฉฆ้žๅธธๅฐ็š„็ดขๅผ•ๅ…งๅˆไฝต...\n"
+
+#: builtin/merge.c:1549
+#, c-format
+msgid "Nope.\n"
+msgstr "็„กใ€‚\n"
+
+#: builtin/merge.c:1574
+msgid "Already up to date. Yeeah!"
+msgstr "ๅทฒ็ถ“ๆ˜ฏๆœ€ๆ–ฐ็š„ใ€‚่€ถ๏ผ"
+
+#: builtin/merge.c:1580
+msgid "Not possible to fast-forward, aborting."
+msgstr "็„กๆณ•ๅฟซ่ฝ‰๏ผŒ็ต‚ๆญขใ€‚"
+
+#: builtin/merge.c:1603 builtin/merge.c:1668
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "ๅฐ‡ๆจนๅ›žๆปพ่‡ณๅŽŸๅง‹็‹€ๆ…‹...\n"
+
+#: builtin/merge.c:1607
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "ๅ˜—่ฉฆๅˆไฝต็ญ–็•ฅ %s...\n"
+
+#: builtin/merge.c:1659
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "ๆฒ’ๆœ‰ๅˆไฝต็ญ–็•ฅ่™•็†ๆญคๅˆไฝตใ€‚\n"
+
+#: builtin/merge.c:1661
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "ไฝฟ็”จ็ญ–็•ฅ %s ๅˆไฝตๅคฑๆ•—ใ€‚\n"
+
+#: builtin/merge.c:1670
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "ไฝฟ็”จ %s ไปฅๆบ–ๅ‚™ๆ‰‹ๅ‹•่งฃๆฑบใ€‚\n"
+
+#: builtin/merge.c:1682
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "่‡ชๅ‹•ๅˆไฝต้€ฒๅฑ•้ †ๅˆฉ๏ผŒๆŒ‰่ฆๆฑ‚ๅœจๆไบคๅ‰ๅœๆญข\n"
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <ๆไบค> <ๆไบค>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <ๆไบค>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <ๆไบค>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <ๆไบค> <ๆไบค>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <ๅผ•็”จ> [<ๆไบค>]"
+
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
+msgstr "่ผธๅ‡บๆ‰€ๆœ‰ๅ…ฑๅŒ็š„็ฅ–ๅ…ˆ"
+
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
+msgstr "ๅฐ‹ๆ‰พไธ€ๅ€‹ๅคš่ทฏๅˆไฝต็š„็ฅ–ๅ…ˆๆไบค"
+
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
+msgstr "้กฏ็คบไธ่ƒฝ่ขซๅ…ถไป–ๅญ˜ๅ–ๅˆฐ็š„็‰ˆๆœฌ"
+
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
+msgstr "็ฌฌไธ€ๅ€‹ๆ˜ฏๅ…ถไป–็š„็ฅ–ๅ…ˆๆไบคๅ—Ž๏ผŸ"
+
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "ๆ นๆ“š <ๅผ•็”จ> ็š„ๅผ•็”จๆ—ฅ่ชŒๅฐ‹ๆ‰พ <ๆไบค> ็š„่ก็”Ÿ่™•"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<้ธ้ …>] [-L <ๆช”ๆกˆ1> [-L <ๅˆๅง‹> [-L <ๅๅญ—2>]]] <ๆช”ๆกˆ1> <ๅˆๅง‹ๆ–‡"
+"ไปถ> <ๆช”ๆกˆ2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "ๅฐ‡็ตๆžœๅ‚ณ้€ๅˆฐๆจ™ๆบ–่ผธๅ‡บ"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "ไฝฟ็”จๅŸบๆ–ผ diff3 ็š„ๅˆไฝต"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "ๅฆ‚ๆžœ่ก็ช๏ผŒไฝฟ็”จๆˆ‘ๅ€‘็š„็‰ˆๆœฌ"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "ๅฆ‚ๆžœ่ก็ช๏ผŒไฝฟ็”จไป–ๅ€‘็š„็‰ˆๆœฌ"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "ๅฆ‚ๆžœ่ก็ช๏ผŒไฝฟ็”จ่ฏๅˆ็‰ˆๆœฌ"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "ๅฆ‚ๆžœ่ก็ช๏ผŒไฝฟ็”จๆŒ‡ๅฎš้•ทๅบฆ็š„ๆจ™่จ˜"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "ไธ่ฆ่ญฆๅ‘Š่ก็ช"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "็‚บ ๆช”ๆกˆ1/ๅˆๅง‹ๆช”ๆกˆ/ๆช”ๆกˆ2 ่จญๅฎšๆจ™็ฑค"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "ๆœช็Ÿฅ้ธ้ … %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "ไธ่ƒฝ่งฃๆž็‰ฉไปถ '%s'"
+
+#: builtin/merge-recursive.c:57
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "็„กๆณ•่™•็† %d ๆขไปฅไธŠ็š„ๅŸบ็คŽใ€‚ๅฟฝ็•ฅ %sใ€‚"
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "ไธ่ƒฝ่™•็†ๅ…ฉๅ€‹้ ญๅˆไฝตไน‹ๅค–็š„ไปปไฝ•ๅ‹•ไฝœใ€‚"
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "็„กๆณ•่งฃๆžๅผ•็”จ '%s'"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "ๅˆไฝต %s ๅ’Œ %s\n"
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr "่ผธๅ…ฅไปฅ NUL ๅญ—ๅ…ƒ็ต‚ๆญข"
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "ๅ…่จฑ้บๅคฑ็š„็‰ฉไปถ"
+
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr "ๅ…่จฑๅปบ็ซ‹ไธ€ๅ€‹ไปฅไธŠ็š„ๆจน"
+
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
+msgstr ""
+"git multi-pack-index [<้ธ้ …>] (write|verify|expire|repack --batch-size=<ๅคงๅฐ"
+">)"
+
+#: builtin/multi-pack-index.c:26
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr "ๅŒ…ๅซๆˆๅฐ packfile ๅ’ŒๅŒ…็ดขๅผ•็š„็‰ฉไปถ็›ฎ้Œ„"
+
+#: builtin/multi-pack-index.c:29
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr "ๅœจ repack ๆœŸ้–“๏ผŒๅฐ‡่ผƒๅฐๅฐบๅฏธ็š„ๅŒ…ๆช”ๆกˆๆ”ถ้›†ๅˆฐๅคงๆ–ผๆญคๅคงๅฐ็š„ๆ‰นๆฌกไธญ"
+
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+msgid "too many arguments"
+msgstr "ๅคชๅคšๅƒๆ•ธ"
+
+#: builtin/multi-pack-index.c:60
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "--batch-size ้ธ้ …ๅƒ…็”จๆ–ผ 'repack' ๅญๆŒ‡ไปค"
+
+#: builtin/multi-pack-index.c:69
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "ๆœช่ญ˜ๅˆฅ็š„ๅญๆŒ‡ไปค๏ผš%s"
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<้ธ้ …>] <ๆบ>... <็›ฎๆจ™>"
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "็›ฎ้Œ„ %s ๅœจ็ดขๅผ•ไธญไธฆไธ”ไธๆ˜ฏๅญๆจก็ต„๏ผŸ"
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr "่ซ‹ๅฐ‡ๆ‚จ็š„ไฟฎๆ”นๆšซๅญ˜ๅˆฐ .gitmodules ไธญๆˆ–ๅ„ฒ่—ๅพŒๅ†็นผ็บŒ"
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s ๅœจ็ดขๅผ•ไธญ"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "ๅผทๅˆถ็งปๅ‹•/้‡ๆŒ‡ไปค๏ผŒๅณไฝฟ็›ฎๆจ™ๅญ˜ๅœจ"
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "่ทณ้Ž็งปๅ‹•/้‡ๆ–ฐๅ‘ฝๅ้Œฏ่ชค"
+
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "็›ฎๆจ™ '%s' ไธๆ˜ฏไธ€ๅ€‹็›ฎ้Œ„"
+
+#: builtin/mv.c:180
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "ๆชขๆŸฅ '%s' ๅˆฐ '%s' ็š„้‡ๆ–ฐๅ‘ฝๅ\n"
+
+#: builtin/mv.c:184
+msgid "bad source"
+msgstr "ๅฃž็š„ๆบ"
+
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
+msgstr "ไธ่ƒฝๅฐ‡็›ฎ้Œ„็งปๅ‹•ๅˆฐ่‡ช่บซ"
+
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
+msgstr "ไธ่ƒฝๅฐ‡็›ฎ้Œ„็งปๅ‹•ๅˆฐๆช”ๆกˆ"
+
+#: builtin/mv.c:199
+msgid "source directory is empty"
+msgstr "ๆบ็›ฎ้Œ„็‚บ็ฉบ"
+
+#: builtin/mv.c:224
+msgid "not under version control"
+msgstr "ไธๅœจ็‰ˆๆœฌๆŽงๅˆถไน‹ไธ‹"
+
+#: builtin/mv.c:227
+msgid "destination exists"
+msgstr "็›ฎๆจ™ๅทฒๅญ˜ๅœจ"
+
+#: builtin/mv.c:235
+#, c-format
+msgid "overwriting '%s'"
+msgstr "่ฆ†่“‹ '%s'"
+
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
+msgstr "ไธ่ƒฝ่ฆ†่“‹"
+
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
+msgstr "ๅŒไธ€็›ฎๆจ™ๅ…ทๆœ‰ๅคšๅ€‹ๆบ"
+
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
+msgstr "็›ฎๆจ™็›ฎ้Œ„ไธๅญ˜ๅœจ"
+
+#: builtin/mv.c:250
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s๏ผŒๆบ=%s๏ผŒ็›ฎๆจ™=%s"
+
+#: builtin/mv.c:271
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "้‡ๆ–ฐๅ‘ฝๅ %s ่‡ณ %s\n"
+
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "้‡ๆ–ฐๅ‘ฝๅ '%s' ๅคฑๆ•—"
+
+#: builtin/name-rev.c:465
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<้ธ้ …>] <ๆไบค>..."
+
+#: builtin/name-rev.c:466
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<้ธ้ …>] --all"
+
+#: builtin/name-rev.c:467
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<้ธ้ …>] --stdin"
+
+#: builtin/name-rev.c:524
+msgid "print only names (no SHA-1)"
+msgstr "ๅชๅˆ—ๅฐๅ็จฑ๏ผˆ็„ก SHA-1๏ผ‰"
+
+#: builtin/name-rev.c:525
+msgid "only use tags to name the commits"
+msgstr "ๅชไฝฟ็”จๆจ™็ฑคไพ†ๅ‘ฝๅๆไบค"
+
+#: builtin/name-rev.c:527
+msgid "only use refs matching <pattern>"
+msgstr "ๅชไฝฟ็”จๅ’Œ <ๆจกๅผ> ็›ธ็ฌฆๅˆ็š„ๅผ•็”จ"
+
+#: builtin/name-rev.c:529
+msgid "ignore refs matching <pattern>"
+msgstr "ๅฟฝ็•ฅๅ’Œ <ๆจกๅผ> ็›ธ็ฌฆๅˆ็š„ๅผ•็”จ"
+
+#: builtin/name-rev.c:531
+msgid "list all commits reachable from all refs"
+msgstr "ๅˆ—ๅ‡บๅฏไปฅๅพžๆ‰€ๆœ‰ๅผ•็”จๅญ˜ๅ–็š„ๆไบค"
+
+#: builtin/name-rev.c:532
+msgid "read from stdin"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–"
+
+#: builtin/name-rev.c:533
+msgid "allow to print `undefined` names (default)"
+msgstr "ๅ…่จฑๅˆ—ๅฐ `ๆœชๅฎš็พฉ` ็š„ๅ็จฑ๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/name-rev.c:539
+msgid "dereference tags in the input (internal use)"
+msgstr "ๅๅ‘่งฃๆž่ผธๅ…ฅไธญ็š„ๆจ™็ฑค๏ผˆๅ…ง้ƒจไฝฟ็”จ๏ผ‰"
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <่จป่งฃๅผ•็”จ>] [list [<็‰ฉไปถ>]]"
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <่จป่งฃๅผ•็”จ>] add [-f] [--allow-empty] [-m <่ชชๆ˜Ž> | -F <ๆช”ๆกˆ> "
+"| (-c | -C) <็‰ฉไปถ>] [<็‰ฉไปถ>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <่จป่งฃๅผ•็”จ>] copy [-f] <ๆบ็‰ฉไปถ> <็›ฎๆจ™็‰ฉไปถ>"
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <่จป่งฃๅผ•็”จ>] append [--allow-empty] [-m <่ชชๆ˜Ž> | -F <ๆช”ๆกˆ> | "
+"(-c | -C) <็‰ฉไปถ>] [<็‰ฉไปถ>]"
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <่จป่งฃๅผ•็”จ>] edit [--allow-empty] [<็‰ฉไปถ>]"
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <่จป่งฃๅผ•็”จ>] show [<็‰ฉไปถ>]"
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr "git notes [--ref <่จป่งฃๅผ•็”จ>] merge [-v | -q] [-s <็ญ–็•ฅ> ] <่จป่งฃๅผ•็”จ>"
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <่จป่งฃๅผ•็”จ>] remove [<็‰ฉไปถ>...]"
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <่จป่งฃๅผ•็”จ>] prune [-n] [-v]"
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <่จป่งฃๅผ•็”จ>] get-ref"
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<็‰ฉไปถ>]]"
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<้ธ้ …>] [<็‰ฉไปถ>]"
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<้ธ้ …>] <ๆบ็‰ฉไปถ> <็›ฎๆจ™็‰ฉไปถ>"
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<ๆบ็‰ฉไปถ> <็›ฎๆจ™็‰ฉไปถ>]..."
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<้ธ้ …>] [<็‰ฉไปถ>]"
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<็‰ฉไปถ>]"
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr "git notes show [<็‰ฉไปถ>]"
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<้ธ้ …>] <่จป่งฃๅผ•็”จ>"
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<้ธ้ …>]"
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<้ธ้ …>]"
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<็‰ฉไปถ>]"
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<้ธ้ …>]"
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr "็‚บไธ‹้ข็š„็‰ฉไปถๅฏซ/็ทจ่ผฏ่ชชๆ˜Ž๏ผš"
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "ไธ่ƒฝ็‚บ็‰ฉไปถ '%s' ้–‹ๅง‹ 'show'"
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– 'show' ็š„่ผธๅ‡บ"
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "็„กๆณ•็‚บ็‰ฉไปถ '%s' ๅฎŒๆˆ 'show'"
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr "่ซ‹้€้Ž -m ๆˆ– -F ้ธ้ …็‚บ่จป่งฃๆไพ›ๅ…งๅฎน"
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr "ไธ่ƒฝๅฏซ่จป่งฃ็‰ฉไปถ"
+
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr "่จป่งฃๅ…งๅฎน่ขซ็•™ๅœจ %s ไธญ"
+
+#: builtin/notes.c:242 builtin/tag.c:532
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿๆˆ–่ฎ€ๅ– '%s'"
+
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "็„กๆณ•่งฃๆž '%s' ็‚บไธ€ๅ€‹ๆœ‰ๆ•ˆๅผ•็”จใ€‚"
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "่ฎ€ๅ–็‰ฉไปถ '%s' ๅคฑๆ•—ใ€‚"
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "ไธ่ƒฝๅพž้ž่ณ‡ๆ–™็‰ฉไปถ '%s' ไธญ่ฎ€ๅ–่จป่งฃ่ณ‡ๆ–™ใ€‚"
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "ๆ ผๅผ้Œฏ่ชค็š„่ผธๅ…ฅ่กŒ๏ผš'%s'ใ€‚"
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "ๅพž '%s' ่ค‡่ฃฝ่จป่งฃๅˆฐ '%s' ๆ™‚ๅคฑๆ•—"
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "ๆ‹’็ต•ๅ‘ %2$s๏ผˆๅœจ refs/notes/ ไน‹ๅค–๏ผ‰%1$s่จป่งฃ"
+
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+msgid "too many parameters"
+msgstr "ๅƒๆ•ธๅคชๅคš"
+
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr "ๆœช็™ผ็พ็‰ฉไปถ %s ็š„่จป่งฃใ€‚"
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr "่จป่งฃๅ…งๅฎนไฝœ็‚บไธ€ๅ€‹ๅญ—ไธฒ"
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr "่จป่งฃๅ…งๅฎนๅˆฐไธ€ๅ€‹ๆช”ๆกˆไธญ"
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr "้‡็”จๅ’Œ็ทจ่ผฏๆŒ‡ๅฎš็š„่จป่งฃ็‰ฉไปถ"
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr "้‡็”จๆŒ‡ๅฎš็š„่จป่งฃ็‰ฉไปถ"
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr "ๅ…่จฑๅ„ฒๅญ˜็ฉบ็™ฝๅ‚™่จป"
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr "ๅ–ไปฃๅทฒๅญ˜ๅœจ็š„่จป่งฃ"
+
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "ไธ่ƒฝๆ–ฐๅขž่จป่งฃใ€‚็™ผ็พ็‰ฉไปถ %s ๅทฒๅญ˜ๅœจ่จป่งฃใ€‚ไฝฟ็”จ '-f' ่ฆ†่“‹็พๅญ˜่จป่งฃ"
+
+#: builtin/notes.c:463 builtin/notes.c:544
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "่ฆ†่“‹็‰ฉไปถ %s ็พๅญ˜่จป่งฃ\n"
+
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "ๅˆช้™ค็‰ฉไปถ %s ็š„่จป่งฃ\n"
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–็‰ฉไปถ"
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "้‡ๆ–ฐ่ผ‰ๅ…ฅ <ๆŒ‡ไปค> ็š„่จญๅฎš๏ผˆ้šฑๅซ --stdin๏ผ‰"
+
+#: builtin/notes.c:517
+msgid "too few parameters"
+msgstr "ๅƒๆ•ธๅคชๅฐ‘"
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "ไธ่ƒฝ่ค‡่ฃฝ่จป่งฃใ€‚็™ผ็พ็‰ฉไปถ %s ๅทฒๅญ˜ๅœจ่จป่งฃใ€‚ไฝฟ็”จ '-f' ่ฆ†่“‹็พๅญ˜่จป่งฃ"
+
+#: builtin/notes.c:550
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "ๆบ็‰ฉไปถ %s ็ผบๅฐ‘่จป่งฃใ€‚ไธ่ƒฝ่ค‡่ฃฝใ€‚"
+
+#: builtin/notes.c:603
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+msgstr ""
+"ๅญๆŒ‡ไปค 'edit' ็š„้ธ้ … -m/-F/-c/-C ๅทฒๆฃ„็”จใ€‚\n"
+"่ซ‹ๆ›็”จ 'git notes add -f -m/-F/-c/-C'ใ€‚\n"
+
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "ๅˆช้™คๅผ•็”จ NOTES_MERGE_PARTIAL ๅคฑๆ•—"
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "ๅˆช้™คๅผ•็”จ NOTES_MERGE_REF ๅคฑๆ•—"
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "ๅˆช้™ค 'git notes merge' ๅทฅไฝœๅ€ๅคฑๆ•—"
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "่ฎ€ๅ–ๅผ•็”จ NOTES_MERGE_PARTIAL ๅคฑๆ•—"
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "็„กๆณ•ๅพž NOTES_MERGE_PARTIAL ไธญๆ‰พๅˆฐๆไบคใ€‚"
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "็„กๆณ•ๅพž NOTES_MERGE_PARTIAL ไธญ่งฃๆžๆไบคใ€‚"
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "่งฃๆž NOTES_MERGE_REF ๅคฑๆ•—"
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr "็„กๆณ•ๅฎŒๆˆ่จป่งฃๅˆไฝต"
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "ๆœช็Ÿฅ็š„่จป่งฃๅˆไฝต็ญ–็•ฅ %s"
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr "้€š็”จ้ธ้ …"
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr "ๅˆไฝต้ธ้ …"
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr "ไฝฟ็”จๆŒ‡ๅฎš็š„็ญ–็•ฅ่งฃๆฑบ่จป่งฃ่ก็ช (manual/ours/theirs/union/cat_sort_uniq)"
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr "ๆไบคๆœชๅˆไฝต็š„่จป่งฃ"
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "้€้Žๆไบคๆœชๅˆไฝต็š„่จป่งฃไพ†ๅฎŒๆˆ่จป่งฃๅˆไฝต"
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr "ไธญๆญข่จป่งฃๅˆไฝต็š„ๆ–นๆกˆ"
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr "ไธญๆญข่จป่งฃๅˆไฝต"
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "ไธ่ƒฝๆทท็”จ --commitใ€--abort ๆˆ– -s/--strategy"
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr "ๅฟ…้ ˆๆŒ‡ๅฎšไธ€ๅ€‹่จป่งฃๅผ•็”จไพ†ๅˆไฝต"
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "ๆœช็Ÿฅ็š„ -s/--strategy๏ผš%s"
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "ไฝๆ–ผ %2$s ็š„ไธ€ๅ€‹ๅˆฐ %1$s ไธญ็š„่จป่งฃๅˆไฝตๆญฃๅœจๅŸท่กŒไธญ"
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "็„กๆณ•ๅ„ฒๅญ˜้€ฃ็ตๅˆฐ็›ฎๅ‰็š„่จป่งฃๅผ•็”จ๏ผˆ%s๏ผ‰"
+
+#: builtin/notes.c:878
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+"่‡ชๅ‹•ๅˆไฝต่ชชๆ˜Žๅคฑๆ•—ใ€‚ไฟฎๆ”น %s ไธญ็š„่ก็ชไธฆไธ”ไฝฟ็”จๆŒ‡ไปค 'git notes merge --commit' ๆ"
+"ไบค็ตๆžœ๏ผŒๆˆ–่€…ไฝฟ็”จๆŒ‡ไปค 'git notes merge --abort' ็ต‚ๆญขๅˆไฝตใ€‚\n"
+
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "็„กๆณ•่งฃๆž '%s' ็‚บไธ€ๅ€‹ๆœ‰ๆ•ˆๅผ•็”จใ€‚"
+
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "็‰ฉไปถ %s ๆฒ’ๆœ‰่จป่งฃ\n"
+
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr "ๅ˜—่ฉฆๅˆช้™คไธๅญ˜ๅœจ็š„่จป่งฃไธๆ˜ฏไธ€ๅ€‹้Œฏ่ชค"
+
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–็‰ฉไปถๅ็จฑ"
+
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+msgid "do not remove, show only"
+msgstr "ไธๅˆช้™ค๏ผŒๅช้กฏ็คบ"
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr "ๅ ฑๅ‘Šๆธ…้™ค็š„่จป่งฃ"
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr "่จป่งฃๅผ•็”จ"
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr "ๅพž <่จป่งฃๅผ•็”จ> ไฝฟ็”จ่จป่งฃ"
+
+#: builtin/notes.c:1034 builtin/stash.c:1643
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "ๆœช็ŸฅๅญๆŒ‡ไปค๏ผš%s"
+
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects --stdout [<้ธ้ …>...] [< <ๅผ•็”จๅˆ—่กจ> | < <็‰ฉไปถๅˆ—่กจ>]"
+
+#: builtin/pack-objects.c:53
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects [<้ธ้ …>...] <ๅ‰็ถดๅ็จฑ> [< <ๅผ•็”จๅˆ—่กจ> | < <็‰ฉไปถๅˆ—่กจ>]"
+
+#: builtin/pack-objects.c:430
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr "%s ้Œฏ็š„ๅŒ…็‰ฉไปถ CRC"
+
+#: builtin/pack-objects.c:441
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "%s ๆๅฃž็š„ๅŒ…็‰ฉไปถ"
+
+#: builtin/pack-objects.c:572
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr "็™ผ็พ็‰ฉไปถ %s ้ž่ฟด delta"
+
+#: builtin/pack-objects.c:783
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "ๆŽ’ๅบไบ† %u ๅ€‹็‰ฉไปถ๏ผŒ้ ๆœŸ %<PRIu32> ๅ€‹"
+
+#: builtin/pack-objects.c:972
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "็ฆ็”จ bitmap ๅฏซๅ…ฅ๏ผŒๅ› ็‚บ pack.packSizeLimit ่จญๅฎšไฝฟๅพ—ๅŒ…่ขซๅˆ‡ๅˆ†็‚บๅคšๅ€‹"
+
+#: builtin/pack-objects.c:985
+msgid "Writing objects"
+msgstr "ๅฏซๅ…ฅ็‰ฉไปถไธญ"
+
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#, c-format
+msgid "failed to stat %s"
+msgstr "ๅฐ %s ๅ‘ผๅซ stat ๅคฑๆ•—"
+
+#: builtin/pack-objects.c:1099
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "ๅฏซๅ…ฅ %<PRIu32> ๅ€‹็‰ฉไปถ่€Œ้ ๆœŸ %<PRIu32> ๅ€‹"
+
+#: builtin/pack-objects.c:1297
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "็ฆ็”จ bitmap ๅฏซๅ…ฅ๏ผŒๅ› ็‚บไธ€ไบ›็‰ฉไปถๅฐ‡ไธๆœƒ่ขซๆ‰“ๅŒ…"
+
+#: builtin/pack-objects.c:1724
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr "%s ๅฃ“็ธฎไธญ delta ๅŸบๆบ–ไฝ็งป่ถŠ็•Œ"
+
+#: builtin/pack-objects.c:1733
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr "%s ็š„ delta ๅŸบๆบ–ไฝ็งป่ถŠ็•Œ"
+
+#: builtin/pack-objects.c:2004
+msgid "Counting objects"
+msgstr "็‰ฉไปถ่จˆๆ•ธไธญ"
+
+#: builtin/pack-objects.c:2149
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "็„กๆณ•่งฃๆž็‰ฉไปถ %s ๆจ™้ ญ่จŠๆฏ"
+
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
+#, c-format
+msgid "object %s cannot be read"
+msgstr "็‰ฉไปถ %s ็„กๆณ•่ฎ€ๅ–"
+
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr "็‰ฉไปถ %s ไธไธ€่‡ด็š„็‰ฉไปถ้•ทๅบฆ๏ผˆ%<PRIuMAX> vs %<PRIuMAX>๏ผ‰"
+
+#: builtin/pack-objects.c:2259
+msgid "suboptimal pack - out of memory"
+msgstr "ๆฌกๅ„ช๏ผˆsuboptimal๏ผ‰ๆ‰“ๅŒ… - ่จ˜ๆ†ถ้ซ”ไธ่ถณ"
+
+#: builtin/pack-objects.c:2574
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "ไฝฟ็”จ %d ๅ€‹ๅŸท่กŒ็ท’้€ฒ่กŒๅฃ“็ธฎ"
+
+#: builtin/pack-objects.c:2713
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "็„กๆณ•็‚บๆจ™็ฑค %s ๅฃ“็ธฎ็‰ฉไปถ"
+
+#: builtin/pack-objects.c:2801
+msgid "Compressing objects"
+msgstr "ๅฃ“็ธฎ็‰ฉไปถไธญ"
+
+#: builtin/pack-objects.c:2807
+msgid "inconsistency with delta count"
+msgstr "ไธไธ€่‡ด็š„ๅทฎ็•ฐ่จˆๆ•ธ"
+
+#: builtin/pack-objects.c:2888
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"้ ๆœŸ้‚Š็•Œ็‰ฉไปถ๏ผˆedge object๏ผ‰ID๏ผŒๅปๅพ—ๅˆฐๅžƒๅœพ่ณ‡ๆ–™๏ผš\n"
+" %s"
+
+#: builtin/pack-objects.c:2894
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"้ ๆœŸ็‰ฉไปถ ID๏ผŒๅปๅพ—ๅˆฐๅžƒๅœพ่ณ‡ๆ–™๏ผš\n"
+" %s"
+
+#: builtin/pack-objects.c:2992
+msgid "invalid value for --missing"
+msgstr "้ธ้ … --missing ็š„ๅ€ผ็„กๆ•ˆ"
+
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+msgid "cannot open pack index"
+msgstr "็„กๆณ•้–‹ๅ•ŸๅŒ…ๆช”ๆกˆ็ดขๅผ•"
+
+#: builtin/pack-objects.c:3082
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr "็„กๆณ•ๆชขๆŸฅ %s ่™•็š„้ฌ†ๆ•ฃ็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3167
+msgid "unable to force loose object"
+msgstr "็„กๆณ•ๅผทๅˆถ้ฌ†ๆ•ฃ็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3260
+#, c-format
+msgid "not a rev '%s'"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹็‰ˆๆœฌ '%s'"
+
+#: builtin/pack-objects.c:3263
+#, c-format
+msgid "bad revision '%s'"
+msgstr "ๅฃž็š„็‰ˆๆœฌ '%s'"
+
+#: builtin/pack-objects.c:3288
+msgid "unable to add recent objects"
+msgstr "็„กๆณ•ๆ–ฐๅขžๆœ€่ฟ‘็š„็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3341
+#, c-format
+msgid "unsupported index version %s"
+msgstr "ไธๆ”ฏๆด็š„็ดขๅผ•็‰ˆๆœฌ %s"
+
+#: builtin/pack-objects.c:3345
+#, c-format
+msgid "bad index version '%s'"
+msgstr "ๅฃž็š„็ดขๅผ•็‰ˆๆœฌ '%s'"
+
+#: builtin/pack-objects.c:3383
+msgid "<version>[,<offset>]"
+msgstr "<็‰ˆๆœฌ>[,<ไฝ็งป>]"
+
+#: builtin/pack-objects.c:3384
+msgid "write the pack index file in the specified idx format version"
+msgstr "็”จๆŒ‡ๅฎš็š„ idx ๆ ผๅผ็‰ˆๆœฌไพ†ๅฏซๅŒ…็ดขๅผ•ๆช”ๆกˆ"
+
+#: builtin/pack-objects.c:3387
+msgid "maximum size of each output pack file"
+msgstr "ๆฏๅ€‹่ผธๅ‡บๅŒ…็š„ๆœ€ๅคงๅฐบๅฏธ"
+
+#: builtin/pack-objects.c:3389
+msgid "ignore borrowed objects from alternate object store"
+msgstr "ๅฟฝ็•ฅๅพžๅ‚™็”จ็‰ฉไปถๅ„ฒๅญ˜่ฃกๅ€Ÿ็”จ็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3391
+msgid "ignore packed objects"
+msgstr "ๅฟฝ็•ฅๅŒ…็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3393
+msgid "limit pack window by objects"
+msgstr "้™ๅˆถๆ‰“ๅŒ…่ฆ–็ช—็š„็‰ฉไปถๆ•ธ"
+
+#: builtin/pack-objects.c:3395
+msgid "limit pack window by memory in addition to object limit"
+msgstr "้™ค็‰ฉไปถๆ•ธ้‡้™ๅˆถๅค–่จญๅฎšๆ‰“ๅŒ…่ฆ–็ช—็š„่จ˜ๆ†ถ้ซ”้™ๅˆถ"
+
+#: builtin/pack-objects.c:3397
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "ๆ‰“ๅŒ…ๅ…่จฑ็š„ delta ้ˆ็š„ๆœ€ๅคง้•ทๅบฆ"
+
+#: builtin/pack-objects.c:3399
+msgid "reuse existing deltas"
+msgstr "้‡็”จๅทฒๅญ˜ๅœจ็š„ deltas"
+
+#: builtin/pack-objects.c:3401
+msgid "reuse existing objects"
+msgstr "้‡็”จๅทฒๅญ˜ๅœจ็š„็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3403
+msgid "use OFS_DELTA objects"
+msgstr "ไฝฟ็”จ OFS_DELTA ็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3405
+msgid "use threads when searching for best delta matches"
+msgstr "ไฝฟ็”จๅŸท่กŒ็ท’ๆŸฅ่ฉขๆœ€ไฝณ delta ็ฌฆๅˆ"
+
+#: builtin/pack-objects.c:3407
+msgid "do not create an empty pack output"
+msgstr "ไธๅปบ็ซ‹็ฉบ็š„ๅŒ…่ผธๅ‡บ"
+
+#: builtin/pack-objects.c:3409
+msgid "read revision arguments from standard input"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–็‰ˆๆœฌ่™Ÿๅƒๆ•ธ"
+
+#: builtin/pack-objects.c:3411
+msgid "limit the objects to those that are not yet packed"
+msgstr "้™ๅˆถ้‚ฃไบ›ๅฐšๆœชๆ‰“ๅŒ…็š„็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3414
+msgid "include objects reachable from any reference"
+msgstr "ๅŒ…ๆ‹ฌๅฏไปฅๅพžไปปไฝ•ๅผ•็”จๅญ˜ๅ–ๅˆฐ็š„็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3417
+msgid "include objects referred by reflog entries"
+msgstr "ๅŒ…ๆ‹ฌ่ขซๅผ•็”จๆ—ฅ่ชŒๅผ•็”จๅˆฐ็š„็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3420
+msgid "include objects referred to by the index"
+msgstr "ๅŒ…ๆ‹ฌ่ขซ็ดขๅผ•ๅผ•็”จๅˆฐ็š„็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3423
+msgid "output pack to stdout"
+msgstr "่ผธๅ‡บๅŒ…ๅˆฐๆจ™ๆบ–่ผธๅ‡บ"
+
+#: builtin/pack-objects.c:3425
+msgid "include tag objects that refer to objects to be packed"
+msgstr "ๅŒ…ๆ‹ฌ้‚ฃไบ›ๅผ•็”จไบ†ๅพ…ๆ‰“ๅŒ…็‰ฉไปถ็š„ๆจ™็ฑค็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3427
+msgid "keep unreachable objects"
+msgstr "็ถญๆŒ็„กๆณ•ๅ–ๅพ—็š„็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3429
+msgid "pack loose unreachable objects"
+msgstr "ๆ‰“ๅŒ…้ฌ†ๆ•ฃ็š„็„กๆณ•ๅ–ๅพ—็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3431
+msgid "unpack unreachable objects newer than <time>"
+msgstr "ๅฐ‡ๆฏ”ๆไพ› <ๆ™‚้–“> ๆ–ฐ็š„็„กๆณ•ๅญ˜ๅ–็š„็‰ฉไปถ่งฃๅŒ…"
+
+#: builtin/pack-objects.c:3434
+msgid "use the sparse reachability algorithm"
+msgstr "ไฝฟ็”จ็จ€็–ๅฏไปฅๅ–ๅพ—ๆ€งๆผ”็ฎ—ๆณ•"
+
+#: builtin/pack-objects.c:3436
+msgid "create thin packs"
+msgstr "ๅปบ็ซ‹็ฒพ็ฐกๅŒ…"
+
+#: builtin/pack-objects.c:3438
+msgid "create packs suitable for shallow fetches"
+msgstr "ๅปบ็ซ‹้ฉๅˆๆทบ่ค‡่ฃฝ็‰ˆๆœฌๅบซๅ–ๅพ—็š„ๅŒ…"
+
+#: builtin/pack-objects.c:3440
+msgid "ignore packs that have companion .keep file"
+msgstr "ๅฟฝ็•ฅ้…ๆœ‰ .keep ๆช”ๆกˆ็š„ๅŒ…"
+
+#: builtin/pack-objects.c:3442
+msgid "ignore this pack"
+msgstr "ๅฟฝ็•ฅ่ฉฒ pack"
+
+#: builtin/pack-objects.c:3444
+msgid "pack compression level"
+msgstr "ๆ‰“ๅŒ…ๅฃ“็ธฎ็ดšๅˆฅ"
+
+#: builtin/pack-objects.c:3446
+msgid "do not hide commits by grafts"
+msgstr "้กฏ็คบ่ขซ็งปๆค้šฑ่—็š„ๆไบค"
+
+#: builtin/pack-objects.c:3448
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr "ไฝฟ็”จ bitmap ็ดขๅผ•๏ผˆๅฆ‚ๆžœๆœ‰็š„่ฉฑ๏ผ‰ไปฅๆ้ซ˜็‰ฉไปถ่จˆๆ•ธๆ™‚็š„้€Ÿๅบฆ"
+
+#: builtin/pack-objects.c:3450
+msgid "write a bitmap index together with the pack index"
+msgstr "ๅœจๅปบ็ซ‹ๅŒ…็ดขๅผ•็š„ๅŒๆ™‚ๅปบ็ซ‹ bitmap ็ดขๅผ•"
+
+#: builtin/pack-objects.c:3454
+msgid "write a bitmap index if possible"
+msgstr "ๅฆ‚ๆžœๅฏ่ƒฝ๏ผŒๅฏซ bitmap ็ดขๅผ•"
+
+#: builtin/pack-objects.c:3458
+msgid "handling for missing objects"
+msgstr "่™•็†้บๅคฑ็š„็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3461
+msgid "do not pack objects in promisor packfiles"
+msgstr "ไธ่ฆๆ‰“ๅŒ… promisor packfile ไธญ็š„็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3463
+msgid "respect islands during delta compression"
+msgstr "ๅœจๅขž้‡ๅฃ“็ธฎๆ™‚ๅƒ่€ƒ่ณ‡ๆ–™ๅณถ"
+
+#: builtin/pack-objects.c:3492
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "ๅขž้‡้ˆๆทฑๅบฆ %d ๅคชๆทฑไบ†๏ผŒๅผทๅˆถ็‚บ %d"
+
+#: builtin/pack-objects.c:3497
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "่จญๅฎš pack.deltaCacheLimit ๅคช้ซ˜ไบ†๏ผŒๅผทๅˆถ็‚บ %d"
+
+#: builtin/pack-objects.c:3551
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr "ไธ่ƒฝไฝฟ็”จ --max-pack-size ไพ†ๆง‹ๅปบๅ‚ณ่ผธ็”จ็š„ๅŒ…ๆช”ๆกˆ"
+
+#: builtin/pack-objects.c:3553
+msgid "minimum pack size limit is 1 MiB"
+msgstr "ๆœ€ๅฐ็š„ๅŒ…ๆช”ๆกˆๅคงๅฐๆ˜ฏ 1 MiB"
+
+#: builtin/pack-objects.c:3558
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "--thin ไธ่ƒฝ็”จๆ–ผๅปบ็ซ‹ไธ€ๅ€‹ๅฏ็ดขๅผ•ๅŒ…"
+
+#: builtin/pack-objects.c:3561
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable ๅ’Œ --unpack-unreachable ไธ็›ธๅฎน"
+
+#: builtin/pack-objects.c:3567
+msgid "cannot use --filter without --stdout"
+msgstr "ไธ่ƒฝๅœจๆฒ’ๆœ‰ --stdout ็š„ๆƒ…ๆณไธ‹ไฝฟ็”จ --filter"
+
+#: builtin/pack-objects.c:3627
+msgid "Enumerating objects"
+msgstr "ๆžš่ˆ‰็‰ฉไปถ"
+
+#: builtin/pack-objects.c:3657
+#, c-format
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"็ธฝๅ…ฑ %<PRIu32> (ๅทฎ็•ฐ %<PRIu32>)๏ผŒๅพฉ็”จ %<PRIu32> (ๅทฎ็•ฐ %<PRIu32>)๏ผŒ้‡็”จๅŒ… "
+"%<PRIu32>"
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<้ธ้ …>]"
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr "ๆ‰“ๅŒ…ไธ€ๅˆ‡"
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr "ๆธ…้™ค้ฌ†ๆ•ฃ็š„ๅผ•็”จ๏ผˆ้ ่จญ๏ผ‰"
+
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
+msgstr "ๆญฃๅœจๅˆช้™ค้‡่ค‡็‰ฉไปถ"
+
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <ๆ™‚้–“>] [--] [<head>...]"
+
+#: builtin/prune.c:131
+msgid "report pruned objects"
+msgstr "ๅ ฑๅ‘Šๆธ…้™ค็š„็‰ฉไปถ"
+
+#: builtin/prune.c:134
+msgid "expire objects older than <time>"
+msgstr "ไฝฟๆ—ฉๆ–ผๆไพ›ๆ™‚้–“็š„็‰ฉไปถ้ŽๆœŸ"
+
+#: builtin/prune.c:136
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "้™ๅˆถ้ๆญท promisor packfile ไปฅๅค–็š„็‰ฉไปถ"
+
+#: builtin/prune.c:150
+msgid "cannot prune in a precious-objects repo"
+msgstr "ไธ่ƒฝๅœจ็ๅ“็‰ˆๆœฌๅบซไธญๅŸท่กŒๆธ…็†ๅ‹•ไฝœ"
+
+#: builtin/pull.c:45 builtin/pull.c:47
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "%s ็š„ๅ€ผ็„กๆ•ˆ๏ผš%s"
+
+#: builtin/pull.c:67
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<้ธ้ …>] [<็‰ˆๆœฌๅบซ> [<ๅผ•็”จ่ฆๆ ผ>...]]"
+
+#: builtin/pull.c:122
+msgid "control for recursive fetching of submodules"
+msgstr "ๆŽงๅˆถๅญๆจก็ต„็š„้ž่ฟดๅ–ๅพ—"
+
+#: builtin/pull.c:126
+msgid "Options related to merging"
+msgstr "ๅ’Œๅˆไฝต็›ธ้—œ็š„้ธ้ …"
+
+#: builtin/pull.c:129
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "ไฝฟ็”จ้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœๅ–ไปฃๅˆไฝตๅ‹•ไฝœไปฅๅฅ—็”จไฟฎๆ”น"
+
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
+msgid "allow fast-forward"
+msgstr "ๅ…่จฑๅฟซ่ฝ‰ๅผ"
+
+#: builtin/pull.c:166
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœๅ‰ๅพŒๅŸท่กŒ่‡ชๅ‹•ๅ„ฒ่—ๅ’Œๅฝˆๅ‡บๅ„ฒ่—"
+
+#: builtin/pull.c:182
+msgid "Options related to fetching"
+msgstr "ๅ’Œๅ–ๅพ—็›ธ้—œ็š„ๅƒๆ•ธ"
+
+#: builtin/pull.c:192
+msgid "force overwrite of local branch"
+msgstr "ๅผทๅˆถ่ฆ†่“‹ๆœฌๆฉŸๅˆ†ๆ”ฏ"
+
+#: builtin/pull.c:200
+msgid "number of submodules pulled in parallel"
+msgstr "ไธฆ็™ผๆ‹‰ๅ–็š„ๅญๆจก็ต„็š„ๆ•ธ้‡"
+
+#: builtin/pull.c:300
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "pull.ff ็š„ๅ–ๅ€ผ็„กๆ•ˆ๏ผš%s"
+
+#: builtin/pull.c:426
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr "ๅœจๆ‚จๅ‰›ๅ‰›ๅ–ๅพ—ๅˆฐ็š„ๅผ•็”จไธญๆฒ’ๆœ‰้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœ็š„ๅ€™้ธใ€‚"
+
+#: builtin/pull.c:428
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr "ๅœจๆ‚จๅ‰›ๅ‰›ๅ–ๅพ—ๅˆฐ็š„ๅผ•็”จไธญๆฒ’ๆœ‰ๅˆไฝตๅ‹•ไฝœ็š„ๅ€™้ธใ€‚"
+
+#: builtin/pull.c:429
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr "้€šๅธธ้€™ๆ„ๅ‘ณ่‘—ๆ‚จๆไพ›ไบ†ไธ€่ฌ็”จๅญ—ๅ…ƒๅผ•็”จ่ฆๆ ผไฝ†ๆœช่ƒฝๅ’Œ้ ็ซฏ็ฌฆๅˆใ€‚"
+
+#: builtin/pull.c:432
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+"ๆ‚จ่ฆๆฑ‚ๅพž้ ็ซฏ '%s' ๆ‹‰ๅ–๏ผŒไฝ†ๆ˜ฏๆœชๆŒ‡ๅฎšไธ€ๅ€‹ๅˆ†ๆ”ฏใ€‚ๅ› ็‚บ้€™ไธๆ˜ฏ็›ฎๅ‰\n"
+"ๅˆ†ๆ”ฏ้ ่จญ็š„้ ็ซฏ็‰ˆๆœฌๅบซ๏ผŒๆ‚จๅฟ…้ ˆๅœจๆŒ‡ไปคๅˆ—ไธญๆŒ‡ๅฎšไธ€ๅ€‹ๅˆ†ๆ”ฏๅใ€‚"
+
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr "ๆ‚จ็›ฎๅ‰ไธๅœจไธ€ๅ€‹ๅˆ†ๆ”ฏไธŠใ€‚"
+
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr "่ซ‹ๆŒ‡ๅฎšๆ‚จ่ฆ้‡ๅฎšๅŸบๅบ•ๅˆฐๅ“ชไธ€ๅ€‹ๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr "่ซ‹ๆŒ‡ๅฎšๆ‚จ่ฆๅˆไฝตๅ“ชไธ€ๅ€‹ๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/pull.c:442 builtin/pull.c:457
+msgid "See git-pull(1) for details."
+msgstr "่ฉณ่ฆ‹ git-pull(1)ใ€‚"
+
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<้ ็ซฏ>"
+
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<ๅˆ†ๆ”ฏ>"
+
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr "็›ฎๅ‰ๅˆ†ๆ”ฏๆฒ’ๆœ‰่ฟฝ่นค่จŠๆฏใ€‚"
+
+#: builtin/pull.c:461 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "ๅฆ‚ๆžœๆ‚จๆƒณ่ฆ็‚บๆญคๅˆ†ๆ”ฏๅปบ็ซ‹่ฟฝ่นค่จŠๆฏ๏ผŒๆ‚จๅฏไปฅๅŸท่กŒ๏ผš"
+
+#: builtin/pull.c:466
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"ๆ‚จ็š„่จญๅฎšไธญๆŒ‡ๅฎš่ฆๅˆไฝต้ ็ซฏ็š„ๅผ•็”จ '%s'๏ผŒ\n"
+"ไฝ†ๆ˜ฏๆฒ’ๆœ‰ๅ–ๅพ—ๅˆฐ้€™ๅ€‹ๅผ•็”จใ€‚"
+
+#: builtin/pull.c:576
+#, c-format
+msgid "unable to access commit %s"
+msgstr "็„กๆณ•ๅญ˜ๅ–ๆไบค %s"
+
+#: builtin/pull.c:857
+msgid "ignoring --verify-signatures for rebase"
+msgstr "็‚บ้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœๅฟฝ็•ฅ --verify-signatures"
+
+#: builtin/pull.c:912
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash ้ธ้ …ๅชๅœจไฝฟ็”จ --rebase ๆ™‚ๆœ‰ๆ•ˆใ€‚"
+
+#: builtin/pull.c:920
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "ๆ›ดๆ–ฐๅฐšๆœช่ช•็”Ÿ็š„ๅˆ†ๆ”ฏ๏ผŒ่ฎŠๆ›ดๆ–ฐๅขž่‡ณ็ดขๅผ•ใ€‚"
+
+#: builtin/pull.c:924
+msgid "pull with rebase"
+msgstr "้‡ๅฎšๅŸบๅบ•ๅผๆ‹‰ๅ–"
+
+#: builtin/pull.c:925
+msgid "please commit or stash them."
+msgstr "่ซ‹ๆไบคๆˆ–ๅ„ฒ่—ๅฎƒๅ€‘ใ€‚"
+
+#: builtin/pull.c:950
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"fetch ๆ›ดๆ–ฐไบ†็›ฎๅ‰็š„ๅˆ†ๆ”ฏใ€‚ๅฟซ่ฝ‰ๆ‚จ็š„ๅทฅไฝœๅ€\n"
+"่‡ณๆไบค %sใ€‚"
+
+#: builtin/pull.c:956
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"ๆ‚จ็›ฎๅ‰็š„ๅทฅไฝœๅ€็„กๆณ•ๅŸท่กŒๅฟซ่ฝ‰ๅ‹•ไฝœใ€‚\n"
+"้ฆ–ๅ…ˆๅŸท่กŒๅฆ‚ไธ‹ๆŒ‡ไปค๏ผš\n"
+"$ git diff %s\n"
+"ไปฅ็ขบ่ชๆ‰€ๆœ‰ๆœ‰็”จ็š„่ณ‡ๆ–™ๅ‡ๅทฒๅ„ฒๅญ˜ใ€‚็„ถๅพŒๅŸท่กŒไธ‹้ข็š„ๆŒ‡ไปค\n"
+"$ git reset --hard\n"
+"ๅพฉๅŽŸไน‹ๅ‰็š„็‹€ๆ…‹ใ€‚"
+
+#: builtin/pull.c:971
+msgid "Cannot merge multiple branches into empty head."
+msgstr "็„กๆณ•ๅฐ‡ๅคšๅ€‹ๅˆ†ๆ”ฏๅˆไฝตๅˆฐ็ฉบๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/pull.c:975
+msgid "Cannot rebase onto multiple branches."
+msgstr "็„กๆณ•้‡ๅฎšๅŸบๅบ•ๅˆฐๅคšๅ€‹ๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/pull.c:982
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "ๆœฌๆฉŸๅญๆจก็ต„ไธญๆœ‰ไฟฎๆ”น๏ผŒ็„กๆณ•้‡ๅฎšๅŸบๅบ•"
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<้ธ้ …>] [<็‰ˆๆœฌๅบซ> [<ๅผ•็”จ่ฆๆ ผ>...]]"
+
+#: builtin/push.c:112
+msgid "tag shorthand without <tag>"
+msgstr "ๆจ™็ฑคๅพŒ้ขๆœชๆไพ› <ๆจ™็ฑค> ๅƒๆ•ธ"
+
+#: builtin/push.c:122
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete ๅชๆŽฅๅ—็ฐกๅ–ฎ็š„็›ฎๆจ™ๅผ•็”จๅ"
+
+#: builtin/push.c:168
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"็‚บไบ†ๆฐธไน…ๅœฐ้ธๆ“‡ไปปไธ€้ธ้ …๏ผŒๅƒ่ฆ‹ 'git help config' ไธญ็š„ push.defaultใ€‚"
+
+#: builtin/push.c:171
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch.  To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+msgstr ""
+"ๆ‚จ็›ฎๅ‰ๅˆ†ๆ”ฏ็š„ไธŠๆธธๅˆ†ๆ”ฏๅ’Œๆ‚จ็›ฎๅ‰ๅˆ†ๆ”ฏๅไธ็ฌฆๅˆ๏ผŒ็‚บๆŽจ้€ๅˆฐ้ ็ซฏ็š„ไธŠๆธธๅˆ†ๆ”ฏ๏ผŒ\n"
+"ไฝฟ็”จ\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"็‚บๆŽจ้€่‡ณ้ ็ซฏๅŒๅๅˆ†ๆ”ฏ๏ผŒไฝฟ็”จ\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+
+#: builtin/push.c:186
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+"    git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"ๆ‚จ็›ฎๅ‰ไธๅœจไธ€ๅ€‹ๅˆ†ๆ”ฏไธŠใ€‚\n"
+"็พๅœจ็‚บๆŽจ้€็›ฎๅ‰๏ผˆๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™๏ผ‰็š„ๆญทๅฒ๏ผŒไฝฟ็”จ\n"
+"\n"
+"    git push %s HEAD:<้ ็ซฏๅˆ†ๆ”ฏๅๅญ—>\n"
+
+#: builtin/push.c:200
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+msgstr ""
+"็›ฎๅ‰ๅˆ†ๆ”ฏ %s ๆฒ’ๆœ‰ๅฐๆ‡‰็š„ไธŠๆธธๅˆ†ๆ”ฏใ€‚\n"
+"็‚บๆŽจ้€็›ฎๅ‰ๅˆ†ๆ”ฏไธฆๅปบ็ซ‹่ˆ‡้ ็ซฏไธŠๆธธ็š„่ฟฝ่นค๏ผŒไฝฟ็”จ\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+
+#: builtin/push.c:208
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "็›ฎๅ‰ๅˆ†ๆ”ฏ %s ๆœ‰ๅคšๅ€‹ไธŠๆธธๅˆ†ๆ”ฏ๏ผŒๆ‹’็ต•ๆŽจ้€ใ€‚"
+
+#: builtin/push.c:211
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"ๆ‚จๆญฃๆŽจ้€่‡ณ้ ็ซฏ '%s'๏ผˆๅ…ถไธฆ้ž็›ฎๅ‰ๅˆ†ๆ”ฏ '%s' ็š„ไธŠๆธธ๏ผ‰๏ผŒ\n"
+"่€Œๆฒ’ๆœ‰ๅ‘Š่จดๆˆ‘่ฆๆŽจ้€ไป€้บผใ€ๆ›ดๆ–ฐๅ“ชๅ€‹้ ็ซฏๅˆ†ๆ”ฏใ€‚"
+
+#: builtin/push.c:270
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "ๆ‚จๆฒ’ๆœ‰็‚บๆŽจ้€ๆŒ‡ๅฎšไปปไฝ•ๅผ•็”จ่ฆๆ ผ๏ผŒไธฆไธ” push.default ็‚บ \"nothing\"ใ€‚"
+
+#: builtin/push.c:277
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"ๆ›ดๆ–ฐ่ขซๆ‹’็ต•๏ผŒๅ› ็‚บๆ‚จ็›ฎๅ‰ๅˆ†ๆ”ฏ็š„ๆœ€ๆ–ฐๆไบค่ฝๅพŒๆ–ผๅ…ถๅฐๆ‡‰็š„้ ็ซฏๅˆ†ๆ”ฏใ€‚\n"
+"ๅ†ๆฌกๆŽจ้€ๅ‰๏ผŒๅ…ˆ่ˆ‡้ ็ซฏ่ฎŠๆ›ดๅˆไฝต๏ผˆๅฆ‚ 'git pull ...'๏ผ‰ใ€‚่ฉณ่ฆ‹\n"
+"'git push --help' ไธญ็š„ 'Note about fast-forwards' ๅฐ็ฏ€ใ€‚"
+
+#: builtin/push.c:283
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"ๆ›ดๆ–ฐ่ขซๆ‹’็ต•๏ผŒๅ› ็‚บๆŽจ้€็š„ไธ€ๅ€‹ๅˆ†ๆ”ฏ็š„ๆœ€ๆ–ฐๆไบค่ฝๅพŒๆ–ผๅ…ถๅฐๆ‡‰็š„้ ็ซฏๅˆ†ๆ”ฏใ€‚\n"
+"็ฐฝๅ‡บ่ฉฒๅˆ†ๆ”ฏไธฆๆ•ดๅˆ้ ็ซฏ่ฎŠๆ›ด๏ผˆๅฆ‚ 'git pull ...'๏ผ‰๏ผŒ็„ถๅพŒๅ†ๆŽจ้€ใ€‚่ฉณ่ฆ‹\n"
+"'git push --help' ไธญ็š„ 'Note about fast-forwards' ๅฐ็ฏ€ใ€‚"
+
+#: builtin/push.c:289
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"ๅ› ็‚บ้ ็ซฏ็‰ˆๆœฌๅบซๅŒ…ๅซๆ‚จๆœฌๆฉŸๅฐšไธๅญ˜ๅœจ็š„ๆไบค๏ผŒ่€ŒๅฐŽ่‡ดๆ›ดๆ–ฐ่ขซๆ‹’็ต•ใ€‚้€™้€šๅธธๆ˜ฏๅ› ็‚บๅฆๅค–\n"
+"ไธ€ๅ€‹็‰ˆๆœฌๅบซๅทฒๅ‘่ฉฒๅผ•็”จ้€ฒ่กŒไบ†ๆŽจ้€ใ€‚ๅ†ๆฌกๆŽจ้€ๅ‰๏ผŒๆ‚จๅฏ่ƒฝ้œ€่ฆๅ…ˆๆ•ดๅˆ้ ็ซฏ่ฎŠๆ›ด\n"
+"๏ผˆๅฆ‚ 'git pull ...'๏ผ‰ใ€‚\n"
+"่ฉณ่ฆ‹ 'git push --help' ไธญ็š„ 'Note about fast-forwards' ๅฐ็ฏ€ใ€‚"
+
+#: builtin/push.c:296
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "ๆ›ดๆ–ฐ่ขซๆ‹’็ต•๏ผŒๅ› ็‚บ่ฉฒๆจ™็ฑคๅœจ้ ็ซฏๅทฒ็ถ“ๅญ˜ๅœจใ€‚"
+
+#: builtin/push.c:299
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+"ๅฆ‚ๆžœไธไฝฟ็”จ '--force' ๅƒๆ•ธ๏ผŒๆ‚จไธ่ƒฝๆ›ดๆ–ฐไธ€ๅ€‹ๆŒ‡ๅ‘้žๆไบค็‰ฉไปถ็š„้ ็ซฏๅผ•็”จ๏ผŒ\n"
+"ไนŸไธ่ƒฝๆ›ดๆ–ฐ้ ็ซฏๅผ•็”จ่ฎ“ๅ…ถๆŒ‡ๅ‘ไธ€ๅ€‹้žๆไบค็‰ฉไปถใ€‚\n"
+
+#: builtin/push.c:360
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "ๆŽจ้€ๅˆฐ %s\n"
+
+#: builtin/push.c:367
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "ๆŽจ้€ไธ€ไบ›ๅผ•็”จๅˆฐ '%s' ๅคฑๆ•—"
+
+#: builtin/push.c:542
+msgid "repository"
+msgstr "็‰ˆๆœฌๅบซ"
+
+#: builtin/push.c:543 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr "ๆŽจ้€ๆ‰€ๆœ‰ๅผ•็”จ"
+
+#: builtin/push.c:544 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr "้กๅƒๆ‰€ๆœ‰ๅผ•็”จ"
+
+#: builtin/push.c:546
+msgid "delete refs"
+msgstr "ๅˆช้™คๅผ•็”จ"
+
+#: builtin/push.c:547
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "ๆŽจ้€ๆจ™็ฑค๏ผˆไธ่ƒฝไฝฟ็”จ --all or --mirror๏ผ‰"
+
+#: builtin/push.c:550 builtin/send-pack.c:167
+msgid "force updates"
+msgstr "ๅผทๅˆถๆ›ดๆ–ฐ"
+
+#: builtin/push.c:552 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr "<ๅผ•็”จๅ>:<ๆœŸๆœ›ๅ€ผ>"
+
+#: builtin/push.c:553 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr "่ฆๆฑ‚ๅผ•็”จ่ˆŠ็š„ๅ–ๅ€ผ็‚บ่จญๅฎšๅ€ผ"
+
+#: builtin/push.c:556
+msgid "control recursive pushing of submodules"
+msgstr "ๆŽงๅˆถๅญๆจก็ต„็š„้ž่ฟดๆŽจ้€"
+
+#: builtin/push.c:558 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr "ไฝฟ็”จ็ฒพ็ฐกๆ‰“ๅŒ…"
+
+#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr "ๆŽฅๆ”ถๅŒ…็จ‹ๅผ"
+
+#: builtin/push.c:561
+msgid "set upstream for git pull/status"
+msgstr "่จญๅฎš git pull/status ็š„ไธŠๆธธ"
+
+#: builtin/push.c:564
+msgid "prune locally removed refs"
+msgstr "ๆธ…้™คๆœฌๆฉŸๅˆช้™ค็š„ๅผ•็”จ"
+
+#: builtin/push.c:566
+msgid "bypass pre-push hook"
+msgstr "็นž้Ž pre-push ๆŽ›้‰ค"
+
+#: builtin/push.c:567
+msgid "push missing but relevant tags"
+msgstr "ๆŽจ้€็ผบๅฐ‘ไฝ†ๆœ‰้—œ็š„ๆจ™็ฑค"
+
+#: builtin/push.c:570 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr "็”จ GPG ็‚บๆŽจ้€็ฐฝๅ"
+
+#: builtin/push.c:572 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr "้œ€่ฆ้ ็ซฏๆ”ฏๆดๅŽŸๅญไบ‹ๅ‹™"
+
+#: builtin/push.c:590
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete ่ˆ‡ --allใ€--mirror ๅŠ --tags ไธ็›ธๅฎน"
+
+#: builtin/push.c:592
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete ๆœชๆŽฅไปปไฝ•ๅผ•็”จๆฒ’ๆœ‰ๆ„็พฉ"
+
+#: builtin/push.c:612
+#, c-format
+msgid "bad repository '%s'"
+msgstr "ๅฃž็š„็‰ˆๆœฌๅบซ '%s'"
+
+#: builtin/push.c:613
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"ๆฒ’ๆœ‰่จญๅฎšๆŽจ้€็›ฎๆจ™ใ€‚\n"
+"ๆˆ–้€้ŽๆŒ‡ไปคๅˆ—ๆŒ‡ๅฎš URL๏ผŒๆˆ–็”จไธ‹้ขๆŒ‡ไปค่จญๅฎšไธ€ๅ€‹้ ็ซฏ็‰ˆๆœฌๅบซ\n"
+"\n"
+"    git remote add <ๅ็จฑ> <ไฝๅ€>\n"
+"\n"
+"็„ถๅพŒไฝฟ็”จ่ฉฒ้ ็ซฏ็‰ˆๆœฌๅบซๅๅŸท่กŒๆŽจ้€\n"
+"\n"
+"    git push <ๅ็จฑ>\n"
+
+#: builtin/push.c:628
+msgid "--all and --tags are incompatible"
+msgstr "--all ๅ’Œ --tags ไธ็›ธๅฎน"
+
+#: builtin/push.c:630
+msgid "--all can't be combined with refspecs"
+msgstr "--all ไธ่ƒฝๅ’Œๅผ•็”จ่ฆๆ ผๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/push.c:634
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror ๅ’Œ --tags ไธ็›ธๅฎน"
+
+#: builtin/push.c:636
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror ไธ่ƒฝๅ’Œๅผ•็”จ่ฆๆ ผๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/push.c:639
+msgid "--all and --mirror are incompatible"
+msgstr "--all ๅ’Œ --mirror ไธ็›ธๅฎน"
+
+#: builtin/push.c:643
+msgid "push options must not have new line characters"
+msgstr "ๆŽจ้€้ธ้ …ไธ่ƒฝๆœ‰ๆ›่กŒ็ฌฆ่™Ÿ"
+
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr "git range-diff [<้ธ้ …>] <old-base>..<old-tip> <new-base>..<new-tip>"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<้ธ้ …>] <old-tip>...<new-tip>"
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<้ธ้ …>] <base> <old-tip> <new-tip>"
+
+#: builtin/range-diff.c:22
+msgid "Percentage by which creation is weighted"
+msgstr "ๅปบ็ซ‹ๆฌŠ้‡็š„็™พๅˆ†ๆฏ”"
+
+#: builtin/range-diff.c:24
+msgid "use simple diff colors"
+msgstr "ไฝฟ็”จ็ฐกๅ–ฎๅทฎ็•ฐ้ก่‰ฒ"
+
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "่จป่งฃ"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "ๅ‚ณ้ž็ตฆ 'git log'"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr "ๆฒ’ๆœ‰ๅœจ็ฏ„ๅœไธญไฝฟ็”จ ..๏ผš'%s'"
+
+#: builtin/range-diff.c:64
+msgid "single arg format must be symmetric range"
+msgstr "ๅ–ฎๅ€‹ๅƒๆ•ธๆ ผๅผๅฟ…้ ˆๆ˜ฏๅฐ็จฑ็ฏ„ๅœ๏ผˆๅณๅŒ…ๅซ...๏ผ‰"
+
+#: builtin/range-diff.c:79
+msgid "need two commit ranges"
+msgstr "้œ€่ฆๅ…ฉๅ€‹ๆไบค็ฏ„ๅœ"
+
+#: builtin/read-tree.c:41
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<ๅ‰็ถด>) [-"
+"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<ๆช”ๆกˆ>] (--empty | <ๆจน็‹€็‰ฉไปถ1> [<ๆจน็‹€็‰ฉไปถ2> [<ๆจน็‹€็‰ฉไปถ3>]])"
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr "ๅฐ‡็ดขๅผ•็ตๆžœๅฏซๅ…ฅ <ๆช”ๆกˆ>"
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr "ๅชๆ˜ฏๆธ…็ฉบ็ดขๅผ•"
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr "ๅˆไฝต"
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr "่ฎ€ๅ–ไน‹้ค˜ๅ†ๅŸท่กŒไธ€ๅ€‹ๅˆไฝต"
+
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr "ๅฆ‚ๆžœๆฒ’ๆœ‰ๆช”ๆกˆ็ดšๅˆไฝต้œ€่ฆ๏ผŒๅŸท่กŒไธ‰ๆ–นๅˆไฝต"
+
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr "ๅญ˜ๅœจๆ–ฐๅขžๅ’Œๅˆช้™คๆ™‚๏ผŒไนŸๅŸท่กŒไธ‰ๆ–นๅˆไฝต"
+
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr "้กžไผผๆ–ผ -m๏ผŒไฝ†ๆจๆฃ„ๆœชๅˆไฝต็š„ๆข็›ฎ"
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr "<ๅญ็›ฎ้Œ„>/"
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "่ฎ€ๅ–ๆจน็‹€็‰ฉไปถๅˆฐ็ดขๅผ•็š„ <ๅญ็›ฎ้Œ„>/ ไธ‹"
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr "็”จๅˆไฝต็š„็ตๆžœๆ›ดๆ–ฐๅทฅไฝœๅ€"
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "ๅ…่จฑๅฟฝ็•ฅๆช”ๆกˆไธญ่จญๅฎš็š„ๆช”ๆกˆๅฏไปฅ่ขซ่ฆ†่“‹"
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr "ๅˆไฝตๅพŒไธๆชขๆŸฅๅทฅไฝœๅ€"
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr "ไธๆ›ดๆ–ฐ็ดขๅผ•ๅ€ๅ’Œๅทฅไฝœๅ€"
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr "่ทณ้Žๆ‡‰็”จ็จ€็–็ฐฝๅ‡บ้Žๆฟพๅ™จ"
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr "้™ค้Œฏ unpack-trees"
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "ๆŠ‘ๅˆถๅ›ž้ฅ‹่จŠๆฏ"
+
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "ๆ‚จ้œ€่ฆๅ…ˆ่งฃๆฑบ็›ฎๅ‰็ดขๅผ•็š„่ก็ช"
+
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [options] [--exec <ๆŒ‡ไปค>] [--onto <ๆ–ฐๅŸบ็คŽ> | --keep-base] [<"
+"ไธŠๆธธ> [<ๅˆ†ๆ”ฏ>]]"
+
+#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [้ธ้ …] [--exec <ๆŒ‡ไปค>] [--onto <ๆ–ฐๅŸบ็คŽ>] --root [<ๅˆ†ๆ”ฏ>]"
+
+#: builtin/rebase.c:36
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "ไธๅฏ็”จ็š„ๅพ…่พฆๅˆ—่กจ๏ผš'%s'"
+
+#: builtin/rebase.c:292
+#, c-format
+msgid "could not create temporary %s"
+msgstr "็„กๆณ•ๅปบ็ซ‹ๆšซๆ™‚็š„ %s"
+
+#: builtin/rebase.c:298
+msgid "could not mark as interactive"
+msgstr "็„กๆณ•ๆจ™่จ˜็‚บไบ’ๅ‹•ๅผ"
+
+#: builtin/rebase.c:352
+msgid "could not generate todo list"
+msgstr "็„กๆณ•็”Ÿๆˆๅพ…่พฆๅˆ—่กจ"
+
+#: builtin/rebase.c:391
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "ไฝฟ็”จ --upstream ๆˆ– --onto ๅฟ…้ ˆๆไพ›ไธ€ๅ€‹ๅŸบ็คŽๆไบค"
+
+#: builtin/rebase.c:461
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<้ธ้ …>]"
+
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(ๆฃ„็”จ) ไฟๆŒ็ฉบๆไบค"
+
+#: builtin/rebase.c:478 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "ๅ…่จฑๆไบค่ชชๆ˜Ž็‚บ็ฉบ"
+
+#: builtin/rebase.c:480
+msgid "rebase merge commits"
+msgstr "ๅฐๅˆไฝตๆไบค้‡ๅฎšๅŸบๅบ•"
+
+#: builtin/rebase.c:482
+msgid "keep original branch points of cousins"
+msgstr "ไฟๆŒๅ…„ๅผŸๆไบค็š„ๅŽŸๅง‹ๅˆ†ๆ”ฏ้ปž"
+
+#: builtin/rebase.c:484
+msgid "move commits that begin with squash!/fixup!"
+msgstr "็งปๅ‹•ไปฅ squash!/fixup! ้–‹้ ญ็š„ๆไบค"
+
+#: builtin/rebase.c:485
+msgid "sign commits"
+msgstr "็ฐฝๅๆไบค"
+
+#: builtin/rebase.c:487 builtin/rebase.c:1490
+msgid "display a diffstat of what changed upstream"
+msgstr "้กฏ็คบไธŠๆธธ่ฎŠๅŒ–็š„ๅทฎ็•ฐ็ตฑ่จˆ"
+
+#: builtin/rebase.c:489
+msgid "continue rebase"
+msgstr "็นผ็บŒ้‡ๅฎšๅŸบๅบ•"
+
+#: builtin/rebase.c:491
+msgid "skip commit"
+msgstr "่ทณ้Žๆไบค"
+
+#: builtin/rebase.c:492
+msgid "edit the todo list"
+msgstr "้‡ๅฎšๅŸบๅบ•ๅพ…่พฆๅˆ—่กจ"
+
+#: builtin/rebase.c:494
+msgid "show the current patch"
+msgstr "้กฏ็คบ็›ฎๅ‰ไฟฎ่ฃœๆช”"
+
+#: builtin/rebase.c:497
+msgid "shorten commit ids in the todo list"
+msgstr "็ธฎ็Ÿญๅพ…่พฆๅˆ—่กจไธญ็š„ๆไบค่™Ÿ"
+
+#: builtin/rebase.c:499
+msgid "expand commit ids in the todo list"
+msgstr "ๆ“ดๅฑ•ๅพ…่พฆๅˆ—่กจไธญ็š„ๆไบค่™Ÿ"
+
+#: builtin/rebase.c:501
+msgid "check the todo list"
+msgstr "ๆชขๆŸฅๅพ…่พฆๅˆ—่กจ"
+
+#: builtin/rebase.c:503
+msgid "rearrange fixup/squash lines"
+msgstr "้‡ๆ–ฐๆŽ’ๅˆ— fixup/squash ่กŒ"
+
+#: builtin/rebase.c:505
+msgid "insert exec commands in todo list"
+msgstr "ๅœจๅพ…่พฆๅˆ—่กจไธญๆ’ๅ…ฅ exec ๅŸท่กŒๆŒ‡ไปค"
+
+#: builtin/rebase.c:506
+msgid "onto"
+msgstr "onto"
+
+#: builtin/rebase.c:509
+msgid "restrict-revision"
+msgstr "restrict-revision"
+
+#: builtin/rebase.c:509
+msgid "restrict revision"
+msgstr "้™ๅˆถ็‰ˆๆœฌ"
+
+#: builtin/rebase.c:511
+msgid "squash-onto"
+msgstr "squash-onto"
+
+#: builtin/rebase.c:512
+msgid "squash onto"
+msgstr "squash onto"
+
+#: builtin/rebase.c:514
+msgid "the upstream commit"
+msgstr "ไธŠๆธธๆไบค"
+
+#: builtin/rebase.c:516
+msgid "head-name"
+msgstr "head-name"
+
+#: builtin/rebase.c:516
+msgid "head name"
+msgstr "head ๅ็จฑ"
+
+#: builtin/rebase.c:521
+msgid "rebase strategy"
+msgstr "้‡ๅฎšๅŸบๅบ•็ญ–็•ฅ"
+
+#: builtin/rebase.c:522
+msgid "strategy-opts"
+msgstr "strategy-opts"
+
+#: builtin/rebase.c:523
+msgid "strategy options"
+msgstr "็ญ–็•ฅ้ธ้ …"
+
+#: builtin/rebase.c:524
+msgid "switch-to"
+msgstr "ๅˆ‡ๆ›ๅˆฐ"
+
+#: builtin/rebase.c:525
+msgid "the branch or commit to checkout"
+msgstr "่ฆ็ฐฝๅ‡บ็š„ๅˆ†ๆ”ฏๆˆ–ๆไบค"
+
+#: builtin/rebase.c:526
+msgid "onto-name"
+msgstr "onto-name"
+
+#: builtin/rebase.c:526
+msgid "onto name"
+msgstr "onto name"
+
+#: builtin/rebase.c:527
+msgid "cmd"
+msgstr "cmd"
+
+#: builtin/rebase.c:527
+msgid "the command to run"
+msgstr "่ฆๅŸท่กŒ็š„ๆŒ‡ไปค"
+
+#: builtin/rebase.c:530 builtin/rebase.c:1584
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "่‡ชๅ‹•้‡ๆ–ฐๅฎ‰ๆŽ’ไปปไฝ•ๅคฑๆ•—็š„ `exec`"
+
+#: builtin/rebase.c:546
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "ไธไฝฟ็”จ --rebase-merges๏ผŒๅ‰‡ --[no-]rebase-cousins ๆฒ’ๆœ‰ๆ•ˆๆžœ"
+
+#: builtin/rebase.c:562
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr "%s ้œ€่ฆไบ’ๅ‹•ๅผ้‡ๅฎšๅŸบๅบ•"
+
+#: builtin/rebase.c:612
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "็„กๆณ•ๅ–ๅพ— 'onto'๏ผš'%s'"
+
+#: builtin/rebase.c:627
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "็„กๆ•ˆ็š„ๅŽŸๅง‹ head๏ผš'%s'"
+
+#: builtin/rebase.c:652
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr "ๅฟฝ็•ฅ็„กๆ•ˆ็š„ allow_rerere_autoupdate๏ผš'%s'"
+
+#: builtin/rebase.c:728
+#, c-format
+msgid "Could not read '%s'"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– '%s'"
+
+#: builtin/rebase.c:746
+#, c-format
+msgid "Cannot store %s"
+msgstr "ไธ่ƒฝๅ„ฒๅญ˜ %s"
+
+#: builtin/rebase.c:853
+msgid "could not determine HEAD revision"
+msgstr "ไธ่ƒฝ็ขบๅฎš HEAD ็‰ˆๆœฌ"
+
+#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+"ๆ‰‹ๅ‹•่งฃๆฑบๆ‰€ๆœ‰่ก็ช๏ผŒๅŸท่กŒ \"git add/rm <่ก็ช็š„ๆช”ๆกˆ>\" ๆจ™่จ˜\n"
+"่ก็ชๅทฒ่งฃๆฑบ๏ผŒ็„ถๅพŒๅŸท่กŒ \"git rebase --continue\"ใ€‚ๆ‚จไนŸๅฏไปฅๅŸท่กŒ\n"
+"\"git rebase --skip\" ๆŒ‡ไปค่ทณ้Ž้€™ๅ€‹ๆไบคใ€‚ๅฆ‚ๆžœๆƒณ่ฆ็ต‚ๆญขๅŸท่กŒไธฆๅ›žๅˆฐ\n"
+"\"git rebase\" ๅŸท่กŒไน‹ๅ‰็š„็‹€ๆ…‹๏ผŒๅŸท่กŒ \"git rebase --abort\"ใ€‚"
+
+#: builtin/rebase.c:1058
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"ๅœจ็‚บ้‡ๆ”พ้€™ไบ›็‰ˆๆœฌ่€Œๆบ–ๅ‚™ไฟฎ่ฃœๆช”ๆ™‚๏ผŒgit ้‡ๅˆฐไบ†ไธ€ๅ€‹้Œฏ่ชค๏ผš\n"
+"\n"
+"    %s\n"
+"\n"
+"ๅ› ๆญค git ็„กๆณ•ๅฐๅ…ถ้‡ๅฎšๅŸบๅบ•ใ€‚"
+
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr "็„กๆณ•่ญ˜ๅˆฅ็š„ '%s' ็ฉบ้กžๅž‹๏ผ›ๆœ‰ๆ•ˆ็š„ๆ•ธๅ€ผๆœ‰ \"drop\"ใ€\"keep\" ่ทŸ \"ask\"ใ€‚"
+
+#: builtin/rebase.c:1401
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+msgstr ""
+"%s\n"
+"่ซ‹ๆŒ‡ๅฎšๆ‚จ่ฆ้‡ๅฎšๅŸบๅบ•ๅˆฐๅ“ชๅ€‹ๅˆ†ๆ”ฏใ€‚\n"
+"่ฉณ่ฆ‹ git-rebase(1)ใ€‚\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+
+#: builtin/rebase.c:1417
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+"ๅฆ‚ๆžœๆ‚จๆƒณ่ฆ็‚บๆญคๅˆ†ๆ”ฏๅปบ็ซ‹่ฟฝ่นค่จŠๆฏ๏ผŒๆ‚จๅฏไปฅๅŸท่กŒ๏ผš\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+
+#: builtin/rebase.c:1447
+msgid "exec commands cannot contain newlines"
+msgstr "exec ๆŒ‡ไปคไธ่ƒฝๅŒ…ๅซๆ›่กŒ็ฌฆ่™Ÿ"
+
+#: builtin/rebase.c:1451
+msgid "empty exec command"
+msgstr "็ฉบ็š„ exec ๆŒ‡ไปค"
+
+#: builtin/rebase.c:1481
+msgid "rebase onto given branch instead of upstream"
+msgstr "้‡ๅฎšๅŸบๅบ•ๅˆฐๆไพ›็š„ๅˆ†ๆ”ฏ่€Œ้žไธŠๆธธ"
+
+#: builtin/rebase.c:1483
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "ไฝฟ็”จไธŠๆธธๅ’Œๅˆ†ๆ”ฏ็š„ๅˆไฝตๅŸบ็คŽๅš็‚บ็›ฎๅ‰ๅŸบ็คŽ"
+
+#: builtin/rebase.c:1485
+msgid "allow pre-rebase hook to run"
+msgstr "ๅ…่จฑๅŸท่กŒ pre-rebase ๆŽ›้‰ค"
+
+#: builtin/rebase.c:1487
+msgid "be quiet. implies --no-stat"
+msgstr "ๅฎ‰้œใ€‚ๆš—็คบ --no-stat"
+
+#: builtin/rebase.c:1493
+msgid "do not show diffstat of what changed upstream"
+msgstr "ไธ้กฏ็คบไธŠๆธธ่ฎŠๅŒ–็š„ๅทฎ็•ฐ็ตฑ่จˆ"
+
+#: builtin/rebase.c:1496
+msgid "add a Signed-off-by: line to each commit"
+msgstr "็‚บๆฏไธ€ๅ€‹ๆไบคๆ–ฐๅขžไธ€ๅ€‹ Signed-off-by: ็ฐฝๅ"
+
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+msgid "passed to 'git am'"
+msgstr "ๅ‚ณ้ž็ตฆ 'git am'"
+
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
+msgid "passed to 'git apply'"
+msgstr "ๅ‚ณ้ž็ตฆ 'git apply'"
+
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "ๆ€้ธๆ‰€ๆœ‰ๆไบค๏ผŒๅณไฝฟๆœชไฟฎๆ”น"
+
+#: builtin/rebase.c:1515
+msgid "continue"
+msgstr "็นผ็บŒ"
+
+#: builtin/rebase.c:1518
+msgid "skip current patch and continue"
+msgstr "่ทณ้Ž็›ฎๅ‰ไฟฎ่ฃœๆช”ไธฆ็นผ็บŒ"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/rebase.c:1520
+msgid "abort and check out the original branch"
+msgstr "็ต‚ๆญขไธฆ็ฐฝๅ‡บๅŽŸๆœ‰ๅˆ†ๆ”ฏ"
+
+#: builtin/rebase.c:1523
+msgid "abort but keep HEAD where it is"
+msgstr "็ต‚ๆญขไฝ†ไฟๆŒ HEAD ไธ่ฎŠ"
+
+#: builtin/rebase.c:1524
+msgid "edit the todo list during an interactive rebase"
+msgstr "ๅœจไบ’ๅ‹•ๅผ้‡ๅฎšๅŸบๅบ•ไธญ็ทจ่ผฏๅพ…่พฆๅˆ—่กจ"
+
+#: builtin/rebase.c:1527
+msgid "show the patch file being applied or merged"
+msgstr "้กฏ็คบๆญฃๅœจๅฅ—็”จๆˆ–ๅˆไฝต็š„ไฟฎ่ฃœๆช”ๆกˆ"
+
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "ไฝฟ็”จๅฅ—็”จ็ญ–็•ฅ้€ฒ่กŒ้‡ๅฎšๅŸบๅบ•"
+
+#: builtin/rebase.c:1534
+msgid "use merging strategies to rebase"
+msgstr "ไฝฟ็”จๅˆไฝต็ญ–็•ฅ้€ฒ่กŒ้‡ๅฎšๅŸบๅบ•"
+
+#: builtin/rebase.c:1538
+msgid "let the user edit the list of commits to rebase"
+msgstr "่ฎ“ไฝฟ็”จ่€…็ทจ่ผฏ่ฆ้‡ๅฎšๅŸบๅบ•็š„ๆไบคๅˆ—่กจ"
+
+#: builtin/rebase.c:1542
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "๏ผˆๅทฒๆฃ„็”จ๏ผ‰ๅ˜—่ฉฆ้‡ๅปบๅˆไฝตๆไบค่€Œ้žๅฟฝ็•ฅๅฎƒๅ€‘"
+
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "่™•็†็ฉบ็™ฝๆไบค็š„ๆ–นๅผ"
+
+#: builtin/rebase.c:1554
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr "ๅœจ -i ไบ’ๅ‹•ๆจกๅผไธ‹๏ผŒ็งปๅ‹•ไปฅ squash!/fixup! ้–‹้ ญ็š„ๆไบค"
+
+#: builtin/rebase.c:1560
+msgid "automatically stash/stash pop before and after"
+msgstr "ๅœจๅ‹•ไฝœๅ‰ๅพŒๅŸท่กŒ่‡ชๅ‹•ๅ„ฒ่—ๅ’Œๅฝˆๅ‡บๅ„ฒ่—"
+
+#: builtin/rebase.c:1562
+msgid "add exec lines after each commit of the editable list"
+msgstr "ๅฏ็ทจ่ผฏๅˆ—่กจ็š„ๆฏไธ€ๅ€‹ๆไบคไธ‹้ขๅขžๅŠ ไธ€่กŒ exec"
+
+#: builtin/rebase.c:1566
+msgid "allow rebasing commits with empty messages"
+msgstr "ๅ…่จฑ้‡ๅฐ็ฉบๆไบค่ชชๆ˜Ž็š„ๆไบค้‡ๅฎšๅŸบๅบ•"
+
+#: builtin/rebase.c:1570
+msgid "try to rebase merges instead of skipping them"
+msgstr "ๅ˜—่ฉฆๅฐๅˆไฝตๆไบค้‡ๅฎšๅŸบๅบ•่€Œไธๆ˜ฏๅฟฝ็•ฅๅฎƒๅ€‘"
+
+#: builtin/rebase.c:1573
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "ไฝฟ็”จ 'merge-base --fork-point' ไพ†ๆœ€ไฝณๅŒ–ไธŠๆธธ"
+
+#: builtin/rebase.c:1575
+msgid "use the given merge strategy"
+msgstr "ไฝฟ็”จๆไพ›็š„ๅˆไฝต็ญ–็•ฅ"
+
+#: builtin/rebase.c:1577 builtin/revert.c:115
+msgid "option"
+msgstr "้ธ้ …"
+
+#: builtin/rebase.c:1578
+msgid "pass the argument through to the merge strategy"
+msgstr "ๅฐ‡ๅƒๆ•ธๅ‚ณ้ž็ตฆๅˆไฝต็ญ–็•ฅ"
+
+#: builtin/rebase.c:1581
+msgid "rebase all reachable commits up to the root(s)"
+msgstr "ๅฐ‡ๆ‰€ๆœ‰ๅฏไปฅๅ–ๅพ—็š„ๆไบค้‡ๅฎšๅŸบๅบ•ๅˆฐๆ นๆไบค"
+
+#: builtin/rebase.c:1598
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"ๅฐ rebase.useBuiltin ็š„ๆ”ฏๆดๅทฒ่ขซๅˆช้™ค๏ผ\n"
+"่ฉณ่ฆ‹ 'git help config' ไธญ็š„ๆข็›ฎใ€‚"
+
+#: builtin/rebase.c:1604
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "็œ‹่ตทไพ† 'git-am' ๆญฃๅœจๅŸท่กŒไธญใ€‚็„กๆณ•้‡ๅฎšๅŸบๅบ•ใ€‚"
+
+#: builtin/rebase.c:1645
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr "git rebase --preserve-merges ่ขซๆฃ„็”จใ€‚็”จ --rebase-merges ไปฃๆ›ฟใ€‚"
+
+#: builtin/rebase.c:1650
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "ไธ่ƒฝๅฐ‡ '--keep-base' ๅ’Œ '--onto' ็ต„ๅˆไฝฟ็”จ"
+
+#: builtin/rebase.c:1652
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "ไธ่ƒฝๅฐ‡ '--keep-base' ๅ’Œ '--root' ็ต„ๅˆไฝฟ็”จ"
+
+#: builtin/rebase.c:1656
+msgid "No rebase in progress?"
+msgstr "ๆฒ’ๆœ‰ๆญฃๅœจ้€ฒ่กŒ็š„้‡ๅฎšๅŸบๅบ•๏ผŸ"
+
+#: builtin/rebase.c:1660
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr "ๅ‹•ไฝœ --edit-todo ๅช่ƒฝ็”จๅœจไบ’ๅ‹•ๅผ้‡ๅฎšๅŸบๅบ•้Ž็จ‹ไธญใ€‚"
+
+#: builtin/rebase.c:1683
+msgid "Cannot read HEAD"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– HEAD"
+
+#: builtin/rebase.c:1695
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"ๆ‚จๅฟ…้ ˆ็ทจ่ผฏๆ‰€ๆœ‰็š„ๅˆไฝต่ก็ช๏ผŒ็„ถๅพŒ้€้Ž git add\n"
+"ๆŒ‡ไปคๅฐ‡ๅฎƒๅ€‘ๆจ™่จ˜็‚บๅทฒ่งฃๆฑบ"
+
+#: builtin/rebase.c:1714
+msgid "could not discard worktree changes"
+msgstr "็„กๆณ•ๆจๆฃ„ๅทฅไฝœๅ€่ฎŠๆ›ด"
+
+#: builtin/rebase.c:1733
+#, c-format
+msgid "could not move back to %s"
+msgstr "็„กๆณ•็งปๅ›ž %s"
+
+#: builtin/rebase.c:1778
+#, c-format
+msgid ""
+"It seems that there is already a %s directory, and\n"
+"I wonder if you are in the middle of another rebase.  If that is the\n"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+"ไผผไนŽๅทฒๆœ‰ไธ€ๅ€‹ %s ็›ฎ้Œ„๏ผŒๆˆ‘ๆ‡ท็–‘ๆ‚จๆญฃ่™•ๆ–ผๅฆๅค–ไธ€ๅ€‹้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœ้Ž็จ‹ไธญใ€‚\n"
+"ๅฆ‚ๆžœๆ˜ฏ้€™ๆจฃ๏ผŒ่ซ‹ๅŸท่กŒ\n"
+"\t%s\n"
+"ๅฆ‚ๆžœไธๆ˜ฏ้€™ๆจฃ๏ผŒ่ซ‹ๅŸท่กŒ\n"
+"\t%s\n"
+"็„ถๅพŒๅ†้‡ๆ–ฐๅŸท่กŒใ€‚ ็‚บ้ฟๅ…้บๅคฑ้‡่ฆ่ณ‡ๆ–™๏ผŒๆˆ‘ๅทฒ็ถ“ๅœๆญข็›ฎๅ‰ๅ‹•ไฝœใ€‚\n"
+
+#: builtin/rebase.c:1806
+msgid "switch `C' expects a numerical value"
+msgstr "้–‹้—œ `C' ๆœŸๆœ›ไธ€ๅ€‹ๆ•ธๅญ—ๅ€ผ"
+
+#: builtin/rebase.c:1847
+#, c-format
+msgid "Unknown mode: %s"
+msgstr "ๆœช็Ÿฅๆจกๅผ๏ผš%s"
+
+#: builtin/rebase.c:1869
+msgid "--strategy requires --merge or --interactive"
+msgstr "--strategy ้œ€่ฆ --merge ๆˆ– --interactive"
+
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr "ไธ่ƒฝๅฐ‡ apply ๅฅ—็”จ้ธ้ …่ˆ‡ merge ๅˆไฝต้ธ้ …ไธ€่ตทไฝฟ็”จ"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "ๆœช็Ÿฅ rebase ๅพŒ็ซฏ๏ผš%s"
+
+#: builtin/rebase.c:1937
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec ้œ€่ฆ --exec ๆˆ– --interactive"
+
+#: builtin/rebase.c:1957
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "ไธ่ƒฝๅฐ‡ '--preserve-merges' ๅ’Œ '--rebase-merges' ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/rebase.c:1961
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+"้Œฏ่ชค๏ผšไธ่ƒฝๅฐ‡ '--preserve-merges' ๅ’Œ '--reschedule-failed-exec' ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/rebase.c:1985
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "็„กๆ•ˆ็š„ไธŠๆธธ '%s'"
+
+#: builtin/rebase.c:1991
+msgid "Could not create new root commit"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ๆ–ฐ็š„ๆ นๆไบค"
+
+#: builtin/rebase.c:2017
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s'๏ผšๅช้œ€่ฆ่ˆ‡ๅˆ†ๆ”ฏ็š„ไธ€ๅ€‹ๅˆไฝตๅŸบ็คŽ"
+
+#: builtin/rebase.c:2020
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "'%s'๏ผšๅช้œ€่ฆไธ€ๅ€‹ๅˆไฝตๅŸบ็คŽ"
+
+#: builtin/rebase.c:2028
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "ๆฒ’ๆœ‰ๆŒ‡ๅ‘ไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๆไบค '%s'"
+
+#: builtin/rebase.c:2054
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "่‡ดๅ‘ฝ้Œฏ่ชค๏ผš็„กๆญคๅˆ†ๆ”ฏ/ๆไบค '%s'"
+
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
+#, c-format
+msgid "No such ref: %s"
+msgstr "ๆฒ’ๆœ‰้€™ๆจฃ็š„ๅผ•็”จ๏ผš%s"
+
+#: builtin/rebase.c:2073
+msgid "Could not resolve HEAD to a revision"
+msgstr "็„กๆณ•ๅฐ‡ HEAD ่งฃๆž็‚บไธ€ๅ€‹็‰ˆๆœฌ"
+
+#: builtin/rebase.c:2111
+msgid "Cannot autostash"
+msgstr "็„กๆณ• autostash"
+
+#: builtin/rebase.c:2114
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "ๆ„ๅค–็š„ stash ๅ›žๆ‡‰๏ผš'%s'"
+
+#: builtin/rebase.c:2120
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "ไธ่ƒฝ็‚บ '%s' ๅปบ็ซ‹็›ฎ้Œ„"
+
+#: builtin/rebase.c:2123
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "ๅปบ็ซ‹ไบ† autostash๏ผš%s\n"
+
+#: builtin/rebase.c:2126
+msgid "could not reset --hard"
+msgstr "็„กๆณ• reset --hard"
+
+#: builtin/rebase.c:2135
+msgid "Please commit or stash them."
+msgstr "่ซ‹ๆไบคๆˆ–ๅ„ฒ่—ไฟฎๆ”นใ€‚"
+
+#: builtin/rebase.c:2169
+#, c-format
+msgid "could not switch to %s"
+msgstr "็„กๆณ•ๅˆ‡ๆ›ๅˆฐ %s"
+
+#: builtin/rebase.c:2180
+msgid "HEAD is up to date."
+msgstr "HEAD ๆ˜ฏๆœ€ๆ–ฐ็š„ใ€‚"
+
+#: builtin/rebase.c:2182
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "็›ฎๅ‰ๅˆ†ๆ”ฏ %s ๆ˜ฏๆœ€ๆ–ฐ็š„ใ€‚\n"
+
+#: builtin/rebase.c:2190
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD ๆ˜ฏๆœ€ๆ–ฐ็š„๏ผŒๅผทๅˆถ้‡ๅฎšๅŸบๅบ•ใ€‚"
+
+#: builtin/rebase.c:2192
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr "็›ฎๅ‰ๅˆ†ๆ”ฏ %s ๆ˜ฏๆœ€ๆ–ฐ็š„๏ผŒๅผทๅˆถ้‡ๅฎšๅŸบๅบ•ใ€‚\n"
+
+#: builtin/rebase.c:2200
+msgid "The pre-rebase hook refused to rebase."
+msgstr "pre-rebase ๆŽ›้‰คๆ‹’็ต•ไบ†้‡ๅฎšๅŸบๅบ•ๅ‹•ไฝœใ€‚"
+
+#: builtin/rebase.c:2207
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "ๅˆฐ %s ็š„่ฎŠๆ›ด๏ผš\n"
+
+#: builtin/rebase.c:2210
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "ๅพž %s ๅˆฐ %s ็š„่ฎŠๆ›ด๏ผš\n"
+
+#: builtin/rebase.c:2235
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr "้ฆ–ๅ…ˆ๏ผŒ้‚„ๅŽŸ้–‹้ ญๆŒ‡ๆจ™ไปฅไพฟๅœจๅ…ถไธŠ้‡ๆ”พๆ‚จ็š„ๅทฅไฝœ...\n"
+
+#: builtin/rebase.c:2244
+msgid "Could not detach HEAD"
+msgstr "็„กๆณ•ๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™"
+
+#: builtin/rebase.c:2253
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "ๅฟซ่ฝ‰ %s ๅˆฐ %sใ€‚\n"
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <็‰ˆๆœฌๅบซ็›ฎ้Œ„>"
+
+#: builtin/receive-pack.c:821
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+"้ ่จญ็ฆๆญขๆ›ดๆ–ฐ้ž็ด”็‰ˆๆœฌๅบซ็š„็›ฎๅ‰ๅˆ†ๆ”ฏ๏ผŒๅ› ็‚บๆ‚จๆŽจ้€็š„ๅ…งๅฎนๅฐ‡ๅฐŽ่‡ด็ดขๅผ•ๅ’Œๅทฅไฝœๅ€\n"
+"ไธไธ€่‡ด๏ผŒไธฆไธ”ๅฐ‡้œ€่ฆๅŸท่กŒ 'git reset --hard' ๅฐ‡ๅทฅไฝœๅ€็ฌฆๅˆๅˆฐ HEADใ€‚\n"
+"\n"
+"ๆ‚จๅฏไปฅๅœจ้ ็ซฏ็‰ˆๆœฌๅบซไธญ่จญๅฎš 'receive.denyCurrentBranch' ่จญๅฎš่ฎŠๆ•ธ็‚บ\n"
+"'ignore' ๆˆ– 'warn' ไปฅๅ…่จฑๆŽจ้€ๅˆฐ็›ฎๅ‰ๅˆ†ๆ”ฏใ€‚็„ถ่€ŒไธๆŽจ่–ฆ้€™้บผๅš๏ผŒ้™ค้žๆ‚จ\n"
+"็”จๆŸ็จฎๆ–นๅผๅฐ‡ๅ…ถๅทฅไฝœๅ€ๆ›ดๆ–ฐ่‡ณๆ‚จๆŽจ้€็š„็‹€ๆ…‹ใ€‚\n"
+"\n"
+"่‹ฅ่ฆๅฐ้Ž–ๆญค่จŠๆฏไธ”ไฟๆŒ้ ่จญ่กŒ็‚บ๏ผŒ่จญๅฎš 'receive.denyCurrentBranch'\n"
+"่จญๅฎš่ฎŠๆ•ธ็‚บ 'refuse'ใ€‚"
+
+#: builtin/receive-pack.c:841
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+"้ ่จญ็ฆๆญขๅˆช้™ค็›ฎๅ‰ๅˆ†ๆ”ฏ๏ผŒๅ› ็‚บไธ‹ไธ€ๆฌก 'git clone' ๅฐ‡ไธๆœƒ็ฐฝๅ‡บไปปไฝ•ๆช”ๆกˆ๏ผŒ\n"
+"ๅฐŽ่‡ดๅ›ฐๆƒ‘ใ€‚\n"
+"\n"
+"ๆ‚จๅฏไปฅๅœจ้ ็ซฏ็‰ˆๆœฌๅบซไธญ่จญๅฎš 'receive.denyDeleteCurrent' ่จญๅฎš่ฎŠๆ•ธ็‚บ\n"
+"'warn'๏ผˆ้กฏ็คบ่ญฆๅ‘Š่จŠๆฏ๏ผ‰ๆˆ– 'ignore'๏ผˆๅฟฝ็•ฅ่ญฆๅ‘Š่จŠๆฏ๏ผ‰ไปฅๅ…่จฑๅˆช้™ค็›ฎๅ‰ๅˆ†ๆ”ฏใ€‚\n"
+"\n"
+"่‹ฅ่ฆๅฐ้Ž–ๆญค่จŠๆฏ๏ผŒๆ‚จๅฏไปฅ่จญๅฎšๅฎƒ็‚บ 'refuse'ใ€‚"
+
+#: builtin/receive-pack.c:1938
+msgid "quiet"
+msgstr "้œ้ป˜ๆจกๅผ"
+
+#: builtin/receive-pack.c:1952
+msgid "You must specify a directory."
+msgstr "ๆ‚จๅฟ…้ ˆๆŒ‡ๅฎšไธ€ๅ€‹็›ฎ้Œ„ใ€‚"
+
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<ๆ™‚้–“>] [--expire-unreachable=<ๆ™‚้–“>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <ๅผ•"
+"็”จ>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <ๅผ•"
+"็”จ>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <ๅผ•็”จ>"
+
+#: builtin/reflog.c:568 builtin/reflog.c:573
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๆ™‚้–“ๆˆณ"
+
+#: builtin/reflog.c:606
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "ๆญฃๅœจๆจ™่จ˜ๅฏไปฅๅ–ๅพ—็‰ฉไปถ..."
+
+#: builtin/reflog.c:644
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s ๆŒ‡ๅ‘ไธๅญ˜ๅœจ๏ผ"
+
+#: builtin/reflog.c:696
+msgid "no reflog specified to delete"
+msgstr "ๆœชๆŒ‡ๅฎš่ฆๅˆช้™ค็š„ๅผ•็”จๆ—ฅ่ชŒ"
+
+#: builtin/reflog.c:705
+#, c-format
+msgid "not a reflog: %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๅผ•็”จๆ—ฅ่ชŒ๏ผš%s"
+
+#: builtin/reflog.c:710
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "ๆฒ’ๆœ‰ '%s' ็š„ๅผ•็”จๆ—ฅ่ชŒ"
+
+#: builtin/reflog.c:756
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "็„กๆ•ˆ็š„ๅผ•็”จๆ ผๅผ๏ผš%s"
+
+#: builtin/reflog.c:765
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
+#: builtin/remote.c:17
+msgid "git remote [-v | --verbose]"
+msgstr "git remote [-v | --verbose]"
+
+#: builtin/remote.c:18
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <ๅˆ†ๆ”ฏ>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <ๅ็จฑ> <ไฝๅ€>"
+
+#: builtin/remote.c:19 builtin/remote.c:39
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <่ˆŠๅ็จฑ> <ๆ–ฐๅ็จฑ>"
+
+#: builtin/remote.c:20 builtin/remote.c:44
+msgid "git remote remove <name>"
+msgstr "git remote remove <ๅ็จฑ>"
+
+#: builtin/remote.c:21 builtin/remote.c:49
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <ๅ็จฑ> (-a | --auto | -d | --delete | <ๅˆ†ๆ”ฏ>)"
+
+#: builtin/remote.c:22
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <ๅ็จฑ>"
+
+#: builtin/remote.c:23
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <ๅ็จฑ>"
+
+#: builtin/remote.c:24
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr "git remote [-v | --verbose] update [-p | --prune] [(<็ต„> | <้ ็ซฏ>)...]"
+
+#: builtin/remote.c:25
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <ๅ็จฑ> <ๅˆ†ๆ”ฏ>..."
+
+#: builtin/remote.c:26 builtin/remote.c:75
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <ๅ็จฑ>"
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <ๅ็จฑ> <ๆ–ฐ็š„ไฝๅ€> [<่ˆŠ็š„ไฝๅ€>]"
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <ๅ็จฑ> <ๆ–ฐ็š„ไฝๅ€>"
+
+#: builtin/remote.c:29 builtin/remote.c:82
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <ๅ็จฑ> <ไฝๅ€>"
+
+#: builtin/remote.c:34
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<้ธ้ …>] <ๅ็จฑ> <ไฝๅ€>"
+
+#: builtin/remote.c:54
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <ๅ็จฑ> <ๅˆ†ๆ”ฏ>..."
+
+#: builtin/remote.c:55
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <ๅ็จฑ> <ๅˆ†ๆ”ฏ>..."
+
+#: builtin/remote.c:60
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<้ธ้ …>] <ๅ็จฑ>"
+
+#: builtin/remote.c:65
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<้ธ้ …>] <ๅ็จฑ>"
+
+#: builtin/remote.c:70
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<้ธ้ …>] [<็ต„> | <้ ็ซฏ>]..."
+
+#: builtin/remote.c:99
+#, c-format
+msgid "Updating %s"
+msgstr "ๆ›ดๆ–ฐ %s ไธญ"
+
+#: builtin/remote.c:131
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror ้ธ้ …ๅฑ้šชไธ”้Žๆ™‚๏ผŒ่ซ‹ไฝฟ็”จ --mirror=fetch\n"
+"\t ๆˆ– --mirror=push"
+
+#: builtin/remote.c:148
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "ๆœช็Ÿฅ็š„้กๅƒๅƒๆ•ธ๏ผš%s"
+
+#: builtin/remote.c:164
+msgid "fetch the remote branches"
+msgstr "ๆŠ“ๅ–้ ็ซฏ็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/remote.c:166
+msgid "import all tags and associated objects when fetching"
+msgstr "ๆŠ“ๅ–ๆ™‚ๅŒฏๅ…ฅๆ‰€ๆœ‰็š„ๆจ™็ฑคๅ’Œ้—œ่ฏ็‰ฉไปถ"
+
+#: builtin/remote.c:169
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "ๆˆ–ไธๆŠ“ๅ–ไปปไฝ•ๆจ™็ฑค๏ผˆ--no-tags๏ผ‰"
+
+#: builtin/remote.c:171
+msgid "branch(es) to track"
+msgstr "่ฟฝ่นค็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/remote.c:172
+msgid "master branch"
+msgstr "ไธป็ทšๅˆ†ๆ”ฏ"
+
+#: builtin/remote.c:174
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "ๆŠŠ้ ็ซฏ่จญๅฎš็‚บ็”จไปฅๆŽจ้€ๆˆ–ๆŠ“ๅ–็š„้กๅƒ"
+
+#: builtin/remote.c:186
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "ๆŒ‡ๅฎšไธ€ๅ€‹ master ๅˆ†ๆ”ฏไธฆไฝฟ็”จ --mirror ้ธ้ …ๆฒ’ๆœ‰ๆ„็พฉ"
+
+#: builtin/remote.c:188
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr "ๆŒ‡ๅฎš่ฆ่ฟฝ่นค็š„ๅˆ†ๆ”ฏๅชๅœจ่ˆ‡ๅ–ๅพ—้กๅƒๅŒๆ™‚ไฝฟ็”จๆ‰ๆœ‰ๆ„็พฉ"
+
+#: builtin/remote.c:195 builtin/remote.c:696
+#, c-format
+msgid "remote %s already exists."
+msgstr "้ ็ซฏ %s ๅทฒ็ถ“ๅญ˜ๅœจใ€‚"
+
+#: builtin/remote.c:199 builtin/remote.c:700
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„้ ็ซฏๅ็จฑ"
+
+#: builtin/remote.c:239
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "็„กๆณ•่จญๅฎš master '%s'"
+
+#: builtin/remote.c:354
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "็„กๆณ•ๅพ—ๅˆฐๅผ•็”จ่ฆๆ ผ %s ็š„ๅ–ๅพ—ๅˆ—่กจ"
+
+#: builtin/remote.c:453 builtin/remote.c:461
+msgid "(matching)"
+msgstr "๏ผˆ็ฌฆๅˆ๏ผ‰"
+
+#: builtin/remote.c:465
+msgid "(delete)"
+msgstr "๏ผˆๅˆช้™ค๏ผ‰"
+
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "็„กๆณ•่จญๅฎš '%s'"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"ไฝๆ–ผไธ‹่ฟฐไฝ็ฝฎ็š„ %s ่จญๅฎš้ … remote.pushDefault๏ผš\n"
+"\t%s:%d\n"
+"็พๅ‘ฝๅๆˆไธๅญ˜ๅœจ็š„้ ็ซฏๅˆ†ๆ”ฏ '%s'"
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "ๆฒ’ๆœ‰ๆญค้ ็ซฏ็‰ˆๆœฌๅบซ๏ผš'%s'"
+
+#: builtin/remote.c:706
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "ไธ่ƒฝ้‡ๆ–ฐๅ‘ฝๅ่จญๅฎšๅฐ็ฏ€ '%s' ๅˆฐ '%s'"
+
+#: builtin/remote.c:726
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"ๆฒ’ๆœ‰ๆ›ดๆ–ฐ้ž้ ่จญ็š„ๅ–ๅพ—ๅผ•็”จ่ฆๆ ผ\n"
+"\t%s\n"
+"\tๅฆ‚ๆžœๅฟ…่ฆ่ซ‹ๆ‰‹ๅ‹•ๆ›ดๆ–ฐ่จญๅฎšใ€‚"
+
+#: builtin/remote.c:766
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "ๅˆช้™ค '%s' ๅคฑๆ•—"
+
+#: builtin/remote.c:800
+#, c-format
+msgid "creating '%s' failed"
+msgstr "ๅปบ็ซ‹ '%s' ๅคฑๆ•—"
+
+#: builtin/remote.c:876
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] "ๆณจๆ„๏ผšref/remotes ๅฑค็ดšไน‹ๅค–็š„ไธ€ๅ€‹ๅˆ†ๆ”ฏๆœช่ขซ็งป้™คใ€‚่ฆๅˆช้™คๅฎƒ๏ผŒไฝฟ็”จ๏ผš"
+
+#: builtin/remote.c:890
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "ไธ่ƒฝ็งป้™ค่จญๅฎšๅฐ็ฏ€ '%s'"
+
+#: builtin/remote.c:993
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " ๆ–ฐ็š„๏ผˆไธ‹ไธ€ๆฌกๅ–ๅพ—ๅฐ‡ๅ„ฒๅญ˜ๆ–ผ remotes/%s๏ผ‰"
+
+#: builtin/remote.c:996
+msgid " tracked"
+msgstr " ๅทฒ่ฟฝ่นค"
+
+#: builtin/remote.c:998
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " ้Žๆ™‚๏ผˆไฝฟ็”จ 'git remote prune' ไพ†็งป้™ค๏ผ‰"
+
+#: builtin/remote.c:1000
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:1041
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "็„กๆ•ˆ็š„ branch.%s.merge๏ผŒไธ่ƒฝ้‡ๅฎšๅŸบๅบ•ๅˆฐไธ€ๅ€‹ไปฅไธŠ็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/remote.c:1050
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "ไบ’ๅ‹•ๅผ้‡ๅฎšๅŸบๅบ•ๅˆฐ้ ็ซฏ %s"
+
+#: builtin/remote.c:1052
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "ไบ’ๅ‹•ๅผ้‡ๅฎšๅŸบๅบ•๏ผˆๅซๅˆไฝตๆไบค๏ผ‰ๅˆฐ้ ็ซฏ %s"
+
+#: builtin/remote.c:1055
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "้‡ๅฎšๅŸบๅบ•ๅˆฐ้ ็ซฏ %s"
+
+#: builtin/remote.c:1059
+#, c-format
+msgid " merges with remote %s"
+msgstr " ่ˆ‡้ ็ซฏ %s ๅˆไฝต"
+
+#: builtin/remote.c:1062
+#, c-format
+msgid "merges with remote %s"
+msgstr "่ˆ‡้ ็ซฏ %s ๅˆไฝต"
+
+#: builtin/remote.c:1065
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr "%-*s    ไปฅๅŠๅ’Œ้ ็ซฏ %s\n"
+
+#: builtin/remote.c:1108
+msgid "create"
+msgstr "ๅปบ็ซ‹"
+
+#: builtin/remote.c:1111
+msgid "delete"
+msgstr "ๅˆช้™ค"
+
+#: builtin/remote.c:1115
+msgid "up to date"
+msgstr "ๆœ€ๆ–ฐ"
+
+#: builtin/remote.c:1118
+msgid "fast-forwardable"
+msgstr "ๅฏๅฟซ่ฝ‰"
+
+#: builtin/remote.c:1121
+msgid "local out of date"
+msgstr "ๆœฌๆฉŸๅทฒ้Žๆ™‚"
+
+#: builtin/remote.c:1128
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr "    %-*s ๅผทๅˆถๆŽจ้€่‡ณ %-*s (%s)"
+
+#: builtin/remote.c:1131
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr "    %-*s ๆŽจ้€่‡ณ %-*s (%s)"
+
+#: builtin/remote.c:1135
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr "    %-*s ๅผทๅˆถๆŽจ้€่‡ณ %s"
+
+#: builtin/remote.c:1138
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr "    %-*s ๆŽจ้€่‡ณ %s"
+
+#: builtin/remote.c:1206
+msgid "do not query remotes"
+msgstr "ไธๆŸฅ่ฉข้ ็ซฏ"
+
+#: builtin/remote.c:1233
+#, c-format
+msgid "* remote %s"
+msgstr "* ้ ็ซฏ %s"
+
+#: builtin/remote.c:1234
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr "  ๅ–ๅพ—ไฝๅ€๏ผš%s"
+
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+msgid "(no URL)"
+msgstr "(็„ก URL)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1249 builtin/remote.c:1251
+#, c-format
+msgid "  Push  URL: %s"
+msgstr "  ๆŽจ้€ไฝๅ€๏ผš%s"
+
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr "  HEAD ๅˆ†ๆ”ฏ๏ผš%s"
+
+#  ่ญฏ่€…๏ผšไธญๆ–‡ๅญ—ไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆช้™คๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/remote.c:1253
+msgid "(not queried)"
+msgstr "๏ผˆๆœชๆŸฅ่ฉข๏ผ‰"
+
+#: builtin/remote.c:1255
+msgid "(unknown)"
+msgstr "๏ผˆๆœช็Ÿฅ๏ผ‰"
+
+#: builtin/remote.c:1259
+#, c-format
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr "  HEAD ๅˆ†ๆ”ฏ๏ผˆ้ ็ซฏ HEAD ๆจก็ณŠ๏ผŒๅฏ่ƒฝๆ˜ฏไธ‹ๅˆ—ไธญ็š„ไธ€ๅ€‹๏ผ‰๏ผš\n"
+
+#: builtin/remote.c:1271
+#, c-format
+msgid "  Remote branch:%s"
+msgid_plural "  Remote branches:%s"
+msgstr[0] "  ้ ็ซฏๅˆ†ๆ”ฏ๏ผš%s"
+
+#  ่ญฏ่€…๏ผšไธญๆ–‡ๅญ—ไธฒๆ‹ผๆŽฅ๏ผŒๅฏๅˆช้™คๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/remote.c:1274 builtin/remote.c:1300
+msgid " (status not queried)"
+msgstr "๏ผˆ็‹€ๆ…‹ๆœชๆŸฅ่ฉข๏ผ‰"
+
+#: builtin/remote.c:1283
+msgid "  Local branch configured for 'git pull':"
+msgid_plural "  Local branches configured for 'git pull':"
+msgstr[0] "  ็‚บ 'git pull' ่จญๅฎš็š„ๆœฌๆฉŸๅˆ†ๆ”ฏ๏ผš"
+
+#: builtin/remote.c:1291
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr "  ๆœฌๆฉŸๅผ•็”จๅฐ‡ๅœจ 'git push' ๆ™‚่ขซ้กๅƒ"
+
+#: builtin/remote.c:1297
+#, c-format
+msgid "  Local ref configured for 'git push'%s:"
+msgid_plural "  Local refs configured for 'git push'%s:"
+msgstr[0] "  ็‚บ 'git push' ่จญๅฎš็š„ๆœฌๆฉŸๅผ•็”จ%s๏ผš"
+
+#: builtin/remote.c:1318
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "ๆ นๆ“š้ ็ซฏ่จญๅฎš refs/remotes/<ๅ็จฑ>/HEAD"
+
+#: builtin/remote.c:1320
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "ๅˆช้™ค refs/remotes/<ๅ็จฑ>/HEAD"
+
+#: builtin/remote.c:1335
+msgid "Cannot determine remote HEAD"
+msgstr "็„กๆณ•็ขบๅฎš้ ็ซฏ HEAD"
+
+#: builtin/remote.c:1337
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "ๅคšๅ€‹้ ็ซฏ HEAD ๅˆ†ๆ”ฏใ€‚่ซ‹ๆ˜Ž็ขบๅœฐ้ธๆ“‡ไธ€ๅ€‹็”จๆŒ‡ไปค๏ผš"
+
+#: builtin/remote.c:1347
+#, c-format
+msgid "Could not delete %s"
+msgstr "็„กๆณ•ๅˆช้™ค %s"
+
+#: builtin/remote.c:1355
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆๅผ•็”จ๏ผš%s"
+
+#: builtin/remote.c:1357
+#, c-format
+msgid "Could not setup %s"
+msgstr "ไธ่ƒฝ่จญๅฎš %s"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/remote.c:1375
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s ๅฐ‡ๆˆ็‚บๆ‡ธ็ฉบ็‹€ๆ…‹๏ผ"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: builtin/remote.c:1376
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s ๅทฒๆˆ็‚บๆ‡ธ็ฉบ็‹€ๆ…‹๏ผ"
+
+#: builtin/remote.c:1386
+#, c-format
+msgid "Pruning %s"
+msgstr "ไฟฎๅ‰ช %s"
+
+#: builtin/remote.c:1387
+#, c-format
+msgid "URL: %s"
+msgstr "URL๏ผš%s"
+
+#: builtin/remote.c:1403
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [ๅฐ‡ๅˆช้™ค] %s"
+
+#: builtin/remote.c:1406
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [ๅทฒๅˆช้™ค] %s"
+
+#: builtin/remote.c:1451
+msgid "prune remotes after fetching"
+msgstr "ๆŠ“ๅ–ๅพŒๆธ…้™ค้ ็ซฏ"
+
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#, c-format
+msgid "No such remote '%s'"
+msgstr "ๆฒ’ๆœ‰ๆญค้ ็ซฏ '%s'"
+
+#: builtin/remote.c:1530
+msgid "add branch"
+msgstr "ๆ–ฐๅขžๅˆ†ๆ”ฏ"
+
+#: builtin/remote.c:1537
+msgid "no remote specified"
+msgstr "ๆœชๆŒ‡ๅฎš้ ็ซฏ"
+
+#: builtin/remote.c:1554
+msgid "query push URLs rather than fetch URLs"
+msgstr "ๆŸฅ่ฉขๆŽจ้€ URL ไฝๅ€๏ผŒ่€Œ้žๅ–ๅพ— URL ไฝๅ€"
+
+#: builtin/remote.c:1556
+msgid "return all URLs"
+msgstr "่ฟ”ๅ›žๆ‰€ๆœ‰ URL ไฝๅ€"
+
+#: builtin/remote.c:1584
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "ๆฒ’ๆœ‰็ตฆ้ ็ซฏ็‰ˆๆœฌๅบซ '%s' ่จญๅฎš URL"
+
+#: builtin/remote.c:1610
+msgid "manipulate push URLs"
+msgstr "ๅ‹•ไฝœๆŽจ้€ URLS"
+
+#: builtin/remote.c:1612
+msgid "add URL"
+msgstr "ๆ–ฐๅขž URL"
+
+#: builtin/remote.c:1614
+msgid "delete URLs"
+msgstr "ๅˆช้™ค URL"
+
+#: builtin/remote.c:1621
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete ็„กๆ„็พฉ"
+
+#: builtin/remote.c:1660
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "็„กๆ•ˆ็š„่ˆŠ URL ็ฌฆๅˆ็ฏ„ๆœฌ๏ผš%s"
+
+#: builtin/remote.c:1668
+#, c-format
+msgid "No such URL found: %s"
+msgstr "ๆœชๆ‰พๅˆฐๆญค URL๏ผš%s"
+
+#: builtin/remote.c:1670
+msgid "Will not delete all non-push URLs"
+msgstr "ๅฐ‡ไธๆœƒๅˆช้™คๆ‰€ๆœ‰้žๆŽจ้€ URL ไฝๅ€"
+
+#: builtin/repack.c:23
+msgid "git repack [<options>]"
+msgstr "git repack [<้ธ้ …>]"
+
+#: builtin/repack.c:28
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes.  Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+"ๅขž้‡ repack ๅ’Œ bitmap ็ดขๅผ•ไธ็›ธๅฎนใ€‚  ไฝฟ็”จ --no-write-bitmap-index\n"
+"ๆˆ–็ฆ็”จ pack.writebitmaps ่จญๅฎšใ€‚"
+
+#: builtin/repack.c:191
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "็„กๆณ•้–‹ๅง‹ pack-objects ไพ†้‡ๆ–ฐๆ‰“ๅŒ… promisor ็‰ฉไปถ"
+
+#: builtin/repack.c:230 builtin/repack.c:416
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr "repack๏ผšๆœŸๆœ›ไพ†่‡ช pack-objects ็š„ๅฎŒๆ•ดๅๅ…ญ้€ฒไฝ็‰ฉไปถ IDใ€‚"
+
+#: builtin/repack.c:254
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr "็„กๆณ•ๅฎŒๆˆ pack-objects ไพ†้‡ๆ–ฐๆ‰“ๅŒ… promisor ็‰ฉไปถ"
+
+#: builtin/repack.c:292
+msgid "pack everything in a single pack"
+msgstr "ๆ‰€ๆœ‰ๅ…งๅฎนๆ‰“ๅŒ…ๅˆฐไธ€ๅ€‹ๅŒ…ๆช”ๆกˆไธญ"
+
+#: builtin/repack.c:294
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "ๅ’Œ -a ็›ธๅŒ๏ผŒไธฆๅฐ‡็„กๆณ•ๅ–ๅพ—็š„็‰ฉไปถ่จญ็‚บ้ฌ†ๆ•ฃ็‰ฉไปถ"
+
+#: builtin/repack.c:297
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "ๅˆช้™คๅคš้ค˜็š„ๅŒ…๏ผŒๅŸท่กŒ git-prune-packed"
+
+#: builtin/repack.c:299
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "ๅ‘ git-pack-objects ๅ‚ณ้žๅƒๆ•ธ --no-reuse-delta"
+
+#: builtin/repack.c:301
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "ๅ‘ git-pack-objects ๅ‚ณ้žๅƒๆ•ธ --no-reuse-object"
+
+#: builtin/repack.c:303
+msgid "do not run git-update-server-info"
+msgstr "ไธๅŸท่กŒ git-update-server-info"
+
+#: builtin/repack.c:306
+msgid "pass --local to git-pack-objects"
+msgstr "ๅ‘ git-pack-objects ๅ‚ณ้žๅƒๆ•ธ --local"
+
+#: builtin/repack.c:308
+msgid "write bitmap index"
+msgstr "ๅฏซ bitmap ็ดขๅผ•"
+
+#: builtin/repack.c:310
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "ๅ‘ git-pack-objects ๅ‚ณ้žๅƒๆ•ธ --delta-islands"
+
+#: builtin/repack.c:311
+msgid "approxidate"
+msgstr "่ฟ‘ไผผๆ—ฅๆœŸ"
+
+#: builtin/repack.c:312
+msgid "with -A, do not loosen objects older than this"
+msgstr "ไฝฟ็”จ -A๏ผŒไธ่ฆๅฐ‡ๆ—ฉๆ–ผๆไพ›ๆ™‚้–“็š„็‰ฉไปถ้ŽๆœŸ"
+
+#: builtin/repack.c:314
+msgid "with -a, repack unreachable objects"
+msgstr "ไฝฟ็”จ -a ๏ผŒ้‡ๆ–ฐๅฐ็„กๆณ•ๅ–ๅพ—็‰ฉไปถๆ‰“ๅŒ…"
+
+#: builtin/repack.c:316
+msgid "size of the window used for delta compression"
+msgstr "็”จๆ–ผๅขž้‡ๅฃ“็ธฎ็š„่ฆ–็ช—ๅ€ผ"
+
+#: builtin/repack.c:317 builtin/repack.c:323
+msgid "bytes"
+msgstr "ไฝๅ…ƒ็ต„"
+
+#: builtin/repack.c:318
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "ๅ’ŒไธŠ้ข็š„็›ธไผผ๏ผŒไฝ†้™ๅˆถ่จ˜ๆ†ถ้ซ”ๅคงๅฐ่€Œ้žๆข็›ฎๆ•ธ"
+
+#: builtin/repack.c:320
+msgid "limits the maximum delta depth"
+msgstr "้™ๅˆถๆœ€ๅคงๅขž้‡ๆทฑๅบฆ"
+
+#: builtin/repack.c:322
+msgid "limits the maximum number of threads"
+msgstr "้™ๅˆถๆœ€ๅคงๅŸท่กŒ็ท’ๆ•ธ"
+
+#: builtin/repack.c:324
+msgid "maximum size of each packfile"
+msgstr "ๆฏๅ€‹ packfile ็š„ๆœ€ๅคงๅฐบๅฏธ"
+
+#: builtin/repack.c:326
+msgid "repack objects in packs marked with .keep"
+msgstr "ๅฐๆจ™่จ˜็‚บ .keep ็š„ๅŒ…ไธญ็š„็‰ฉไปถ้‡ๆ–ฐๆ‰“ๅŒ…"
+
+#: builtin/repack.c:328
+msgid "do not repack this pack"
+msgstr "ไธ่ฆๅฐ่ฉฒๅŒ…ๆช”ๆกˆ้‡ๆ–ฐๆ‰“ๅŒ…"
+
+#: builtin/repack.c:338
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "ไธ่ƒฝๅˆช้™ค็ๅ“็‰ˆๆœฌๅบซไธญ็š„ๆ‰“ๅŒ…ๆช”ๆกˆ"
+
+#: builtin/repack.c:342
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable ๅ’Œ -A ไธ็›ธๅฎน"
+
+#: builtin/repack.c:425
+msgid "Nothing new to pack."
+msgstr "ๆฒ’ๆœ‰ๆ–ฐ็š„่ฆๆ‰“ๅŒ…ใ€‚"
+
+#: builtin/repack.c:486
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file.  But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+"่ญฆๅ‘Š๏ผš็‚บไบ†ๅฐ‡ๅŒ…ๆช”ๆกˆๅ–ไปฃ็‚บๆ–ฐ็‰ˆๆœฌ๏ผŒไธ€ไบ›ไฝฟ็”จไธญ็š„ๅŒ…ๅทฒ็ถ“\n"
+"่ญฆๅ‘Š๏ผš้€้Žๆ–ฐๅขž old- ๅ‰็ถด็š„ๆ–นๅผ้‡ๆ–ฐๅ‘ฝๅใ€‚ไฝ†ๆ˜ฏๅ‹•ไฝœๅคฑๆ•—๏ผŒ\n"
+"่ญฆๅ‘Š๏ผšไธฆไธ”ๅ˜—่ฉฆ้‡ๆ–ฐๅ‘ฝๅๆ”นๅ›žๅŽŸๆœ‰ๆช”ๆกˆๅ็š„ๅ‹•ไฝœไนŸๅคฑๆ•—ใ€‚\n"
+"่ญฆๅ‘Š๏ผš่ซ‹ๆ‰‹ๅ‹•ๅฐ‡ %s ไธ‹็š„้€™ไบ›ๆช”ๆกˆ้‡ๆ–ฐๅ‘ฝๅ๏ผš\n"
+
+#: builtin/repack.c:534
+#, c-format
+msgid "failed to remove '%s'"
+msgstr "ๅˆช้™ค '%s' ๅคฑๆ•—"
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <็‰ฉไปถ> <ๅ–ไปฃ็‰ฉ>"
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <็‰ฉไปถ>"
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <ๆไบค> [<็ˆถๆไบค>...]"
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --convert-graft-file"
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr "git replace -d <็‰ฉไปถ>..."
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<ๆ ผๅผ>] [-l [<ๆจกๅผ>]]"
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"็„กๆ•ˆ็š„ๅ–ไปฃๆ ผๅผ '%s'\n"
+"ๆœ‰ๆ•ˆ็š„ๆ ผๅผๆœ‰ 'short'ใ€'medium' ๅ’Œ 'long'"
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "ๆœช็™ผ็พๅ–ไปฃๅผ•็”จ '%s'"
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "ๅทฒๅˆช้™คๅ–ไปฃๅผ•็”จ '%s'"
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๅผ•็”จๅ"
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "ๅ–ไปฃๅผ•็”จ '%s' ๅทฒ็ถ“ๅญ˜ๅœจ"
+
+#: builtin/replace.c:178
+#, c-format
+msgid ""
+"Objects must be of the same type.\n"
+"'%s' points to a replaced object of type '%s'\n"
+"while '%s' points to a replacement object of type '%s'."
+msgstr ""
+"็‰ฉไปถๅฟ…้ ˆๅฑฌๆ–ผๅŒไธ€้กžๅž‹ใ€‚\n"
+"'%s' ๆŒ‡ๅ‘ '%s' ้กžๅž‹็š„ๅ–ไปฃ็‰ฉไปถ\n"
+"่€Œ '%s' ๆŒ‡ๅ‘ '%s' ้กžๅž‹็š„ๅ–ไปฃ็‰ฉไปถใ€‚"
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "็„กๆณ•็‚บๅฏซๅ…ฅ้–‹ๅ•Ÿ %s"
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr "cat-file ๅ ฑๅ‘Šๅคฑๆ•—"
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "็„กๆณ•็‚บ่ฎ€ๅ–้–‹ๅ•Ÿ %s"
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr "็„กๆณ•ๅ•Ÿๅ‹• mktree"
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr "็„กๆณ•ๅพž mktree ่ฎ€ๅ–"
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr "mktree ๅ ฑๅ‘Šๅคฑๆ•—"
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr "mktree ๆฒ’ๆœ‰่ฟ”ๅ›žไธ€ๅ€‹็‰ฉไปถๅ"
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr "็„กๆณ•ๅฐ %s ๅŸท่กŒ fstat"
+
+#: builtin/replace.c:303
+msgid "unable to write object to database"
+msgstr "็„กๆณ•ๅ‘่ณ‡ๆ–™ๅบซๅฏซๅ…ฅ็‰ฉไปถ"
+
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr "ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ฉไปถๅ๏ผš'%s'"
+
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "็„กๆณ•ๅพ—ๅˆฐ %s ็š„็‰ฉไปถ้กžๅž‹"
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr "็ทจ่ผฏ็‰ฉไปถๆช”ๆกˆๅคฑๆ•—"
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "ๆ–ฐ็‰ฉไปถๅ’Œ่ˆŠ็‰ฉไปถ็›ธๅŒ๏ผš'%s'"
+
+#: builtin/replace.c:384
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "็„กๆณ•ๅฐ‡ %s ่งฃๆž็‚บไธ€ๅ€‹ๆไบค"
+
+#: builtin/replace.c:416
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "ๆไบค '%s' ไธญๅซๆœ‰ๆๅฃž็š„ๅˆไฝตๆจ™็ฑค"
+
+#: builtin/replace.c:418
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "ๆไบค '%s' ไธญๅซๆœ‰ๆ ผๅผ้Œฏ่ชค็š„ๅˆไฝตๆจ™็ฑค"
+
+#: builtin/replace.c:430
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr "ๅŽŸๅง‹ๆไบค '%s' ๅŒ…ๅซๅทฒ็ถ“ๆจๆฃ„็š„ๅˆไฝตๆจ™็ฑค '%s'๏ผŒไฝฟ็”จ --edit ไปฃๆ›ฟ --graft"
+
+#: builtin/replace.c:469
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr "ๅŽŸๅง‹ๆไบค '%s' ไธญๆœ‰ไธ€ๅ€‹ gpg ็ฐฝๅ"
+
+#: builtin/replace.c:470
+msgid "the signature will be removed in the replacement commit!"
+msgstr "ๅœจๅ–ไปฃ็š„ๆไบคไธญ็ฐฝๅๅฐ‡่ขซ็งป้™ค๏ผ"
+
+#: builtin/replace.c:480
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "ไธ่ƒฝ็‚บ '%s' ๅฏซๅ–ไปฃๆไบค"
+
+#: builtin/replace.c:488
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "ๅฐ '%s' ็งปๆคๆฒ’ๆœ‰ๅฟ…่ฆ"
+
+#: builtin/replace.c:492
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "ๆ–ฐๆไบคๅ’Œ่ˆŠ็š„ไธ€ๆจฃ๏ผš'%s'"
+
+#: builtin/replace.c:527
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"ไธ่ƒฝ่ฝ‰ๆ›ไธ‹ๅˆ—็งปๆค๏ผš\n"
+"%s"
+
+#: builtin/replace.c:548
+msgid "list replace refs"
+msgstr "ๅˆ—ๅ‡บๅ–ไปฃ็š„ๅผ•็”จ"
+
+#: builtin/replace.c:549
+msgid "delete replace refs"
+msgstr "ๅˆช้™คๅ–ไปฃ็š„ๅผ•็”จ"
+
+#: builtin/replace.c:550
+msgid "edit existing object"
+msgstr "็ทจ่ผฏ็พๅญ˜็š„็‰ฉไปถ"
+
+#: builtin/replace.c:551
+msgid "change a commit's parents"
+msgstr "ไฟฎๆ”นไธ€ๅ€‹ๆไบค็š„็ˆถๆไบค"
+
+#: builtin/replace.c:552
+msgid "convert existing graft file"
+msgstr "่ฝ‰ๆ›็พๅญ˜็š„็งปๆคๆช”ๆกˆ"
+
+#: builtin/replace.c:553
+msgid "replace the ref if it exists"
+msgstr "ๅฆ‚ๆžœๅญ˜ๅœจๅ‰‡ๅ–ไปฃๅผ•็”จ"
+
+#: builtin/replace.c:555
+msgid "do not pretty-print contents for --edit"
+msgstr "ไธ่ฆ็‚บ --edit ๅ‹•ไฝœ็พŽ่ง€้กฏ็คบๅ…งๅฎน"
+
+#: builtin/replace.c:556
+msgid "use this format"
+msgstr "ไฝฟ็”จๆญคๆ ผๅผ"
+
+#: builtin/replace.c:569
+msgid "--format cannot be used when not listing"
+msgstr "ไธๅˆ—ๅ‡บๆ™‚ไธ่ƒฝไฝฟ็”จ --format"
+
+#: builtin/replace.c:577
+msgid "-f only makes sense when writing a replacement"
+msgstr "ๅชๆœ‰ๅฏซไธ€ๅ€‹ๅ–ไปฃๆ™‚ -f ๆ‰ๆœ‰ๆ„็พฉ"
+
+#: builtin/replace.c:581
+msgid "--raw only makes sense with --edit"
+msgstr "--raw ๅชๆœ‰ๅ’Œ --edit ๅ…ฑ็”จๆ‰ๆœ‰ๆ„็พฉ"
+
+#: builtin/replace.c:587
+msgid "-d needs at least one argument"
+msgstr "-d ้œ€่ฆ่‡ณๅฐ‘ไธ€ๅ€‹ๅƒๆ•ธ"
+
+#: builtin/replace.c:593
+msgid "bad number of arguments"
+msgstr "้Œฏ่ชค็š„ๅƒๆ•ธๅ€‹ๆ•ธ"
+
+#: builtin/replace.c:599
+msgid "-e needs exactly one argument"
+msgstr "-e ้œ€่ฆไธ”ๅƒ…้œ€่ฆไธ€ๅ€‹ๅƒๆ•ธ"
+
+#: builtin/replace.c:605
+msgid "-g needs at least one argument"
+msgstr "-g ้œ€่ฆ่‡ณๅฐ‘ไธ€ๅ€‹ๅƒๆ•ธ"
+
+#: builtin/replace.c:611
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file ไธๅธถๅƒๆ•ธ"
+
+#: builtin/replace.c:617
+msgid "only one pattern can be given with -l"
+msgstr "ๅช่ƒฝ็‚บ -l ๆไพ›ไธ€ๅ€‹ๆจกๅผ"
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <่ทฏๅพ‘>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
+msgstr "ๅœจ็ดขๅผ•ไธญ่จปๅ†Šไนพๆทจ็š„่งฃๆฑบๆ–นๆกˆ"
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "ๆฒ’ๆœ‰่ทฏๅพ‘็š„ 'git rerere forget' ๅทฒ็ถ“้Žๆ™‚"
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "็„กๆณ•็‚บ '%s' ็”Ÿๆˆๅทฎ็•ฐ"
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<ๆไบค>]"
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<ๆจนๆˆ–ๆไบค>] [--] <่ทฏๅพ‘่ฆๆ ผ>..."
+
+#: builtin/reset.c:34
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<ๆจนๆˆ–ๆไบค>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<ๆจนๆˆ–ๆไบค>] [--] [<่ทฏๅพ‘่ฆๆ ผ>...]"
+
+#: builtin/reset.c:41
+msgid "mixed"
+msgstr "ๆทท้›œ"
+
+#: builtin/reset.c:41
+msgid "soft"
+msgstr "่ปŸๆ€ง"
+
+#: builtin/reset.c:41
+msgid "hard"
+msgstr "็กฌๆ€ง"
+
+#: builtin/reset.c:41
+msgid "merge"
+msgstr "ๅˆไฝต"
+
+#: builtin/reset.c:41
+msgid "keep"
+msgstr "ไฟๆŒ"
+
+#: builtin/reset.c:82
+msgid "You do not have a valid HEAD."
+msgstr "ๆ‚จๆฒ’ๆœ‰ไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ HEADใ€‚"
+
+#: builtin/reset.c:84
+msgid "Failed to find tree of HEAD."
+msgstr "็„กๆณ•ๆ‰พๅˆฐ HEAD ๆŒ‡ๅ‘็š„ๆจนใ€‚"
+
+#: builtin/reset.c:90
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "็„กๆณ•ๆ‰พๅˆฐ %s ๆŒ‡ๅ‘็š„ๆจนใ€‚"
+
+#: builtin/reset.c:115
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ็พๅœจไฝๆ–ผ %s"
+
+#  ่ญฏ่€…๏ผšๆผขๅญ—ไน‹้–“็„ก็ฉบๆ ผ๏ผŒๆ•…ๅˆช้™ค%sๅ‰ๅพŒ็ฉบๆ ผ
+#: builtin/reset.c:194
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "ๅœจๅˆไฝต้Ž็จ‹ไธญไธ่ƒฝๅš%s้‡่จญๅ‹•ไฝœใ€‚"
+
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
+msgid "be quiet, only report errors"
+msgstr "ๅฎ‰้œๆจกๅผ๏ผŒๅชๅ ฑๅ‘Š้Œฏ่ชค"
+
+#: builtin/reset.c:296
+msgid "reset HEAD and index"
+msgstr "้‡่จญ HEAD ๅ’Œ็ดขๅผ•"
+
+#: builtin/reset.c:297
+msgid "reset only HEAD"
+msgstr "ๅช้‡่จญ HEAD"
+
+#: builtin/reset.c:299 builtin/reset.c:301
+msgid "reset HEAD, index and working tree"
+msgstr "้‡่จญ HEADใ€็ดขๅผ•ๅ’Œๅทฅไฝœๅ€"
+
+#: builtin/reset.c:303
+msgid "reset HEAD but keep local changes"
+msgstr "้‡่จญ HEAD ไฝ†ๅ„ฒๅญ˜ๆœฌๆฉŸ่ฎŠๆ›ด"
+
+#: builtin/reset.c:309
+msgid "record only the fact that removed paths will be added later"
+msgstr "ๅฐ‡ๅˆช้™ค็š„่ทฏๅพ‘ๆจ™่จ˜็‚บ็จๅพŒๆ–ฐๅขž"
+
+#: builtin/reset.c:343
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "็„กๆณ•ๅฐ‡ '%s' ่งฃๆž็‚บไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็‰ˆๆœฌใ€‚"
+
+#: builtin/reset.c:351
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "็„กๆณ•ๅฐ‡ '%s' ่งฃๆž็‚บไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๆจน็‹€็‰ฉไปถใ€‚"
+
+#: builtin/reset.c:360
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch ่ˆ‡ --{hardใ€mixedใ€soft} ้ธ้ …ไธ็›ธๅฎน"
+
+#: builtin/reset.c:370
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr "--mixed ๅธถ่ทฏๅพ‘ๅทฒๆฃ„็”จ๏ผŒ่€Œๆ˜ฏ็”จ 'git reset -- <่ทฏๅพ‘>'ใ€‚"
+
+#  ่ญฏ่€…๏ผšๆผขๅญ—ไน‹้–“็„ก็ฉบๆ ผ๏ผŒๆ•…ๅˆช้™ค%sๅ‰ๅพŒ็ฉบๆ ผ
+#: builtin/reset.c:372
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "ไธ่ƒฝๅธถ่ทฏๅพ‘้€ฒ่กŒ%s้‡่จญใ€‚"
+
+#  ่ญฏ่€…๏ผšๆผขๅญ—ไน‹้–“็„ก็ฉบๆ ผ๏ผŒๆ•…ๅˆช้™ค%sๅ‰ๅพŒ็ฉบๆ ผ
+#: builtin/reset.c:387
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "ไธ่ƒฝๅฐ็ด”็‰ˆๆœฌๅบซ้€ฒ่กŒ%s้‡่จญ"
+
+#: builtin/reset.c:391
+msgid "-N can only be used with --mixed"
+msgstr "-N ๅช่ƒฝๅ’Œ --mixed ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/reset.c:412
+msgid "Unstaged changes after reset:"
+msgstr "้‡่จญๅพŒๅ–ๆถˆๆšซๅญ˜็š„่ฎŠๆ›ด๏ผš"
+
+#: builtin/reset.c:415
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset.  You can\n"
+"use '--quiet' to avoid this.  Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+"\n"
+"้‡่จญๅพŒ๏ผŒๆžš่ˆ‰ๆœชๆšซๅญ˜่ฎŠๆ›ด่Šฑ่ฒปไบ† %.2f ็ง’ใ€‚ ๆ‚จๅฏไปฅไฝฟ็”จ '--quiet' ้ฟๅ…ๆญคๆƒ…ๆณใ€‚\n"
+"ๅฐ‡่จญๅฎš่ฎŠๆ•ธ reset.quiet ่จญๅฎš็‚บ true ๅฏไฝฟๅ…ถๆˆ็‚บ้ ่จญๅ€ผใ€‚\n"
+
+#: builtin/reset.c:425
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "ไธ่ƒฝ้‡่จญ็ดขๅผ•ๆช”ๆกˆ่‡ณ็‰ˆๆœฌ '%s'ใ€‚"
+
+#: builtin/reset.c:429
+msgid "Could not write new index file."
+msgstr "ไธ่ƒฝๅฏซๅ…ฅๆ–ฐ็š„็ดขๅผ•ๆช”ๆกˆใ€‚"
+
+#: builtin/rev-list.c:499
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "ไธ่ƒฝๅŒๆ™‚ไฝฟ็”จ --exclude-promisor-objects ๅ’Œ --missing ้ธ้ …"
+
+#: builtin/rev-list.c:560
+msgid "object filtering requires --objects"
+msgstr "็‰ฉไปถ้Žๆฟพ้œ€่ฆ --objects"
+
+#: builtin/rev-list.c:610
+msgid "rev-list does not support display of notes"
+msgstr "rev-list ไธๆ”ฏๆด้กฏ็คบ่จป่งฃ"
+
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "--objects ไธ็›ธๅฎนๆจ™่จ˜่จˆๆ•ธ (marked counting)"
+
+#: builtin/rev-parse.c:408
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<้ธ้ …>] -- [<ๅƒๆ•ธ>...]"
+
+#: builtin/rev-parse.c:413
+msgid "keep the `--` passed as an arg"
+msgstr "ไฟๆŒ `--` ไฝœ็‚บไธ€ๅ€‹ๅƒๆ•ธๅ‚ณ้ž"
+
+#: builtin/rev-parse.c:415
+msgid "stop parsing after the first non-option argument"
+msgstr "้‡ๅˆฐ็ฌฌไธ€ๅ€‹้ž้ธ้ …ๅƒๆ•ธๅพŒๅœๆญข่งฃๆž"
+
+#: builtin/rev-parse.c:418
+msgid "output in stuck long form"
+msgstr "ไปฅๅ›บๅฎš้•ทๆ ผๅผ่ผธๅ‡บ"
+
+#: builtin/rev-parse.c:551
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+"   or: git rev-parse --sq-quote [<arg>...]\n"
+"   or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<้ธ้ …>] -- [<ๅƒๆ•ธ>...]\n"
+"   ๆˆ–่€…๏ผšgit rev-parse --sq-quote [<ๅƒๆ•ธ>...]\n"
+"   ๆˆ–่€…๏ผšgit rev-parse [<้ธ้ …>] [<ๅƒๆ•ธ>...]\n"
+"\n"
+"ๅˆๆฌกไฝฟ็”จๆ™‚ๅŸท่กŒ \"git rev-parse --parseopt -h\" ไพ†็ฒๅพ—ๆ›ดๅคš่จŠๆฏใ€‚"
+
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<้ธ้ …>] <ๆไบค่™Ÿ>..."
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr "git revert <ๅญๆŒ‡ไปค>"
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<้ธ้ …>] <ๆไบค่™Ÿ>..."
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <ๅญๆŒ‡ไปค>"
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "้ธ้ … `%s' ๆœŸๆœ›ไธ€ๅ€‹ๅคงๆ–ผ้›ถ็š„ๆ•ธๅญ—"
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s๏ผš%s ไธ่ƒฝๅ’Œ %s ๅŒๆ™‚ไฝฟ็”จ"
+
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr "็ต‚ๆญขๅ่ฝ‰ๆˆ–ๆ€้ธๅ‹•ไฝœ"
+
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr "็นผ็บŒๅ่ฝ‰ๆˆ–ๆ€้ธๅ‹•ไฝœ"
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr "ๅ–ๆถˆๅ่ฝ‰ๆˆ–ๆ€้ธๅ‹•ไฝœ"
+
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "่ทณ้Ž็›ฎๅ‰ๆไบคไธฆ็นผ็บŒ"
+
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr "ไธ่ฆ่‡ชๅ‹•ๆไบค"
+
+#: builtin/revert.c:108
+msgid "edit the commit message"
+msgstr "็ทจ่ผฏๆไบค่ชชๆ˜Ž"
+
+#: builtin/revert.c:111
+msgid "parent-number"
+msgstr "็ˆถ็ทจ่™Ÿ"
+
+#: builtin/revert.c:112
+msgid "select mainline parent"
+msgstr "้ธๆ“‡ไธปๅนน็ˆถๆไบค็ทจ่™Ÿ"
+
+#: builtin/revert.c:114
+msgid "merge strategy"
+msgstr "ๅˆไฝต็ญ–็•ฅ"
+
+#: builtin/revert.c:116
+msgid "option for merge strategy"
+msgstr "ๅˆไฝต็ญ–็•ฅ็š„้ธ้ …"
+
+#: builtin/revert.c:125
+msgid "append commit name"
+msgstr "่ฟฝๅŠ ๆไบคๅ็จฑ"
+
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
+msgstr "ไฟ็•™ๅˆๅง‹ๅŒ–็š„็ฉบๆไบค"
+
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
+msgstr "ไฟๆŒๅคš้ค˜็š„ใ€็ฉบ็š„ๆไบค"
+
+#: builtin/revert.c:232
+msgid "revert failed"
+msgstr "้‚„ๅŽŸๅคฑๆ•—"
+
+#: builtin/revert.c:245
+msgid "cherry-pick failed"
+msgstr "ๆ€้ธๅคฑๆ•—"
+
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<้ธ้ …>] [--] <ๆช”ๆกˆ>..."
+
+#: builtin/rm.c:207
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] "ๅฆ‚ไธ‹ๆช”ๆกˆๅ…ถๆšซๅญ˜็š„ๅ…งๅฎนๅ’Œๅทฅไฝœๅ€ๅŠ HEAD ไธญ็š„้ƒฝไธไธ€ๆจฃ๏ผš"
+
+#: builtin/rm.c:212
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"๏ผˆไฝฟ็”จ -f ๅผทๅˆถๅˆช้™ค๏ผ‰"
+
+#: builtin/rm.c:216
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "ไธ‹ๅˆ—ๆช”ๆกˆ็ดขๅผ•ไธญๆœ‰่ฎŠๆ›ด"
+
+#: builtin/rm.c:220 builtin/rm.c:229
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"๏ผˆไฝฟ็”จ --cached ไฟ็•™ๆœฌๆฉŸๆช”ๆกˆ๏ผŒๆˆ–็”จ -f ๅผทๅˆถๅˆช้™ค๏ผ‰"
+
+#: builtin/rm.c:226
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "ๅฆ‚ไธ‹ๆช”ๆกˆๆœ‰ๆœฌๆฉŸไฟฎๆ”น๏ผš"
+
+#: builtin/rm.c:243
+msgid "do not list removed files"
+msgstr "ไธๅˆ—ๅ‡บๅˆช้™ค็š„ๆช”ๆกˆ"
+
+#: builtin/rm.c:244
+msgid "only remove from the index"
+msgstr "ๅชๅพž็ดขๅผ•ๅ€ๅˆช้™ค"
+
+#: builtin/rm.c:245
+msgid "override the up-to-date check"
+msgstr "ๅฟฝ็•ฅๆช”ๆกˆๆ›ดๆ–ฐ็‹€ๆ…‹ๆชขๆŸฅ"
+
+#: builtin/rm.c:246
+msgid "allow recursive removal"
+msgstr "ๅ…่จฑ้ž่ฟดๅˆช้™ค"
+
+#: builtin/rm.c:248
+msgid "exit with a zero status even if nothing matched"
+msgstr "ๅณไฝฟๆฒ’ๆœ‰็ฌฆๅˆ๏ผŒไนŸไปฅ้›ถ็‹€ๆ…‹้›ข้–‹"
+
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "ๆฒ’ๆœ‰ๆไพ›่ทฏๅพ‘่ฆๆ ผใ€‚ๆˆ‘่ฉฒ็งป้™คๅ“ชๅ€‹ๆช”ๆกˆ๏ผŸ"
+
+#: builtin/rm.c:305
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr "่ซ‹ๅฐ‡ๆ‚จ็š„ไฟฎๆ”นๆšซๅญ˜ๅˆฐ .gitmodules ไธญๆˆ–ๅ„ฒ่—ๅพŒๅ†็นผ็บŒ"
+
+#: builtin/rm.c:323
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "ๆœชๆไพ› -r ้ธ้ …ไธๆœƒ้ž่ฟดๅˆช้™ค '%s'"
+
+#: builtin/rm.c:362
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm๏ผšไธ่ƒฝๅˆช้™ค %s"
+
+#: builtin/send-pack.c:20
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+"  --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<ไธปๆฉŸ>:]<็›ฎ้Œ„> [<ๅผ•็”จ>...]\n"
+"  --all ๅ’Œๆ˜Ž็ขบ็š„ <ๅผ•็”จ> ไบ’ๆ–ฅใ€‚"
+
+#: builtin/send-pack.c:163
+msgid "remote name"
+msgstr "้ ็ซฏๅ็จฑ"
+
+#: builtin/send-pack.c:177
+msgid "use stateless RPC protocol"
+msgstr "ไฝฟ็”จ็„ก็‹€ๆ…‹็š„ RPC ๅ”ๅฎš"
+
+#: builtin/send-pack.c:178
+msgid "read refs from stdin"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–ๅผ•็”จ"
+
+#: builtin/send-pack.c:179
+msgid "print status from remote helper"
+msgstr "ๅˆ—ๅฐไพ†่‡ช้ ็ซฏ helper ็š„็‹€ๆ…‹"
+
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<้ธ้ …>] [<็‰ˆๆœฌ็ฏ„ๅœ>] [[--] <่ทฏๅพ‘>...]"
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<้ธ้ …>]"
+
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
+msgstr "ๆŒ‰็…งๆไบค่€…ๅˆ†็ต„่€Œไธๆ˜ฏไฝœ่€…"
+
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
+msgstr "ๆ นๆ“šๆฏๅ€‹ไฝœ่€…็š„ๆไบคๆ•ธ้‡ๆŽ’ๅบ"
+
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr "้šฑ่—ๆไบค่ชชๆ˜Ž๏ผŒๅชๆไพ›ๆไบคๆ•ธ้‡"
+
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
+msgstr "้กฏ็คบๆฏๅ€‹ไฝœ่€…็š„้›ปๅญไฟกไปถไฝๅ€"
+
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
+msgstr "ๆŠ˜่กŒ่ผธๅ‡บ"
+
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
+msgstr "็‰ˆๆœฌๅบซๅค–ๅŸท่กŒๆไพ›ไบ†ๅคชๅคš็š„ๅƒๆ•ธ"
+
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<ไฝ•ๆ™‚>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<็‰ˆๆœฌ> | <่ฌ็”จๅญ—ๅ…ƒ>)...]"
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<่ตทๅง‹้ปž>]] [--list] [<ๅผ•็”จ>]"
+
+#: builtin/show-branch.c:395
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "ๅฟฝ็•ฅ %s๏ผŒ็„กๆณ•่™•็† %d ๅ€‹ไปฅไธŠ็š„ๅผ•็”จ"
+
+#: builtin/show-branch.c:548
+#, c-format
+msgid "no matching refs with %s"
+msgstr "ๆฒ’ๆœ‰ๅ’Œ %s ็ฌฆๅˆ็š„ๅผ•็”จ"
+
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
+msgstr "้กฏ็คบ้ ็ซฏ่ฟฝ่นค็š„ๅ’ŒๆœฌๆฉŸ็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
+msgstr "้กฏ็คบ้ ็ซฏ่ฟฝ่นค็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
+msgstr "่‘—่‰ฒ '*!+-' ๅˆฐ็›ธๆ‡‰็š„ๅˆ†ๆ”ฏ"
+
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
+msgstr "้กฏ็คบๅ…ฑๅŒ็ฅ–ๅ…ˆๅพŒ็š„ <n> ๅ€‹ๆไบค"
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr "ๅ’Œ more=-1 ๅŒ็พฉ"
+
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
+msgstr "ไธ้กฏ็คบๅญ—ไธฒๅ‘ฝๅ"
+
+#: builtin/show-branch.c:656
+msgid "include the current branch"
+msgstr "ๅŒ…ๆ‹ฌ็›ฎๅ‰ๅˆ†ๆ”ฏ"
+
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
+msgstr "ไปฅ็‰ฉไปถๅๅญ—ๅ‘ฝๅๆไบค"
+
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
+msgstr "้กฏ็คบๅฏ่ƒฝๅˆไฝต็š„ๅŸบ็คŽ"
+
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
+msgstr "้กฏ็คบๆฒ’ๆœ‰ไปปไฝ•ๅผ•็”จ็š„็š„ๅผ•็”จ"
+
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
+msgstr "ไปฅๆ‹“ๆ’ฒ้ †ๅบ้กฏ็คบๆไบค"
+
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
+msgstr "ๅช้กฏ็คบไธๅœจ็ฌฌไธ€ๅ€‹ๅˆ†ๆ”ฏไธŠ็š„ๆไบค"
+
+#: builtin/show-branch.c:669
+msgid "show merges reachable from only one tip"
+msgstr "้กฏ็คบๅƒ…ไธ€ๅ€‹ๅˆ†ๆ”ฏๅฏๅญ˜ๅ–็š„ๅˆไฝตๆไบค"
+
+#: builtin/show-branch.c:671
+msgid "topologically sort, maintaining date order where possible"
+msgstr "ๆ‹“ๆ’ฒๆ–นๅผๆŽ’ๅบ๏ผŒไธฆๅ„˜ๅฏ่ƒฝๅœฐไฟๆŒๆ—ฅๆœŸ้ †ๅบ"
+
+#: builtin/show-branch.c:674
+msgid "<n>[,<base>]"
+msgstr "<n>[,<base>]"
+
+#: builtin/show-branch.c:675
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr "้กฏ็คบๅพž่ตทๅง‹้ปž้–‹ๅง‹็š„ <n> ๆขๆœ€่ฟ‘็š„ๅผ•็”จๆ—ฅ่ชŒ่จ˜้Œ„"
+
+#: builtin/show-branch.c:711
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr "--reflog ๅ’Œ --allใ€--remotesใ€--independent ๆˆ– --merge-base ไธ็›ธๅฎน"
+
+#: builtin/show-branch.c:735
+msgid "no branches given, and HEAD is not valid"
+msgstr "ๆœชๆไพ›ๅˆ†ๆ”ฏ๏ผŒไธ” HEAD ็„กๆ•ˆ"
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr "้ธ้ … --reflog ้œ€่ฆไธ€ๅ€‹ๅˆ†ๆ”ฏๅ"
+
+#: builtin/show-branch.c:741
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] "ไธ€ๆฌกๅช่ƒฝ้กฏ็คบ %d ๅ€‹ๆข็›ฎใ€‚"
+
+#: builtin/show-branch.c:745
+#, c-format
+msgid "no such ref %s"
+msgstr "็„กๆญคๅผ•็”จ %s"
+
+#: builtin/show-branch.c:831
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "ไธ่ƒฝ่™•็† %d ๅ€‹ไปฅไธŠ็š„็‰ˆๆœฌใ€‚"
+
+#: builtin/show-branch.c:835
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๅผ•็”จใ€‚"
+
+#: builtin/show-branch.c:838
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "ไธ่ƒฝๆ‰พๅˆฐๆไบค %s๏ผˆ%s๏ผ‰"
+
+#: builtin/show-ref.c:12
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<ๆจกๅผ>...]"
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<ๆจกๅผ>]"
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr "ๅช้กฏ็คบๆจ™็ฑค๏ผˆๅฏไปฅๅ’Œ้ ญๅ…ฑ็”จ๏ผ‰"
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr "ๅช้กฏ็คบ้ ญ๏ผˆๅฏไปฅๅ’Œๆจ™็ฑคๅ…ฑ็”จ๏ผ‰"
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+msgstr "ๆ›ดๅšดๆ ผ็š„ๅผ•็”จๆชขๆธฌ๏ผŒ้œ€่ฆ็ฒพ็ขบ็š„ๅผ•็”จ่ทฏๅพ‘"
+
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "้กฏ็คบ HEAD ๅผ•็”จ๏ผŒๅณไฝฟ่ขซ้ŽๆฟพๆŽ‰"
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr "่ฝ‰ๆ›ๆจ™็ฑคๅˆฐ็‰ฉไปถ ID"
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr "ๅช้กฏ็คบไฝฟ็”จ <n> ๅ€‹ๆ•ธๅญ—็š„ SHA1 ้›œๆนŠ"
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "ไธๅˆ—ๅฐ็ตๆžœๅˆฐๆจ™ๆบ–่ผธๅ‡บ๏ผˆไพ‹ๅฆ‚่ˆ‡ --verify ๅƒๆ•ธๅ…ฑ็”จ๏ผ‰"
+
+#: builtin/show-ref.c:179
+msgid "show refs from stdin that aren't in local repository"
+msgstr "้กฏ็คบๅพžๆจ™ๆบ–่ผธๅ…ฅไธญ่ฎ€ๅ…ฅ็š„ไธๅœจๆœฌๆฉŸ็‰ˆๆœฌๅบซไธญ็š„ๅผ•็”จ"
+
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <้ธ้ …>"
+
+#: builtin/sparse-checkout.c:64
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr "้€™ไธๆ˜ฏ็จ€็–ๅทฅไฝœๅ€๏ผˆsparse-checkout ๆช”ๆกˆๅฏ่ƒฝไธๅญ˜ๅœจ๏ผ‰"
+
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "็„กๆณ•ๅปบ็ซ‹็จ€็–็ฐฝๅ‡บๆช”ๆกˆ็š„็›ฎ้Œ„"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "็„กๆณ•่จญๅฎš extensions.worktreeConfig ่จญๅฎš"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "ไปฅ cone ๆจกๅผๅˆๅง‹ๅŒ–็จ€็–็ฐฝๅ‡บ"
+
+#: builtin/sparse-checkout.c:308
+msgid "initialize sparse-checkout"
+msgstr "ๅˆๅง‹ๅŒ–็จ€็–็ฐฝๅ‡บ"
+
+#: builtin/sparse-checkout.c:341
+#, c-format
+msgid "failed to open '%s'"
+msgstr "็„กๆณ•้–‹ๅ•Ÿใ€Œ%sใ€"
+
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "็„กๆณ•ๆจ™ๆบ–ๅŒ–่ทฏๅพ‘ %s"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <ๆจฃๅผ>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "็„กๆณ•ๅŽปๆŽ‰ '%s' C ๆจฃๅผๅญ—ไธฒ็š„ๅผ•่™Ÿ"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "็„กๆณ•่ผ‰ๅ…ฅ็พๅญ˜็š„็จ€็–็ฐฝๅ‡บๆจฃๅผ"
+
+#: builtin/sparse-checkout.c:558
+msgid "read patterns from standard in"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–ๆจฃๅผ"
+
+#: builtin/sparse-checkout.c:564
+msgid "set sparse-checkout patterns"
+msgstr "่จญๅฎš็จ€็–็ฐฝๅ‡บๆจฃๅผ"
+
+#: builtin/sparse-checkout.c:581
+msgid "disable sparse-checkout"
+msgstr "ๅœ็”จ็จ€็–็ฐฝๅ‡บ"
+
+#: builtin/sparse-checkout.c:593
+msgid "error while refreshing working directory"
+msgstr "้‡ๆ–ฐๆ•ด็†ๅทฅไฝœ็›ฎ้Œ„ๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
+
+#: builtin/stash.c:22 builtin/stash.c:38
+msgid "git stash list [<options>]"
+msgstr "git stash list [<้ธ้ …>]"
+
+#: builtin/stash.c:23 builtin/stash.c:43
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<้ธ้ …>] [<stash>]"
+
+#: builtin/stash.c:24 builtin/stash.c:48
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:26 builtin/stash.c:63
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <ๅˆ†ๆ”ฏๅ> [<stash>]"
+
+#: builtin/stash.c:27 builtin/stash.c:68
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <่จŠๆฏ>]\n"
+"          [--pathspec-from-file=<ๆช”ๆกˆ> [--pathspec-file-nul]]\n"
+"          [--] [<่ทฏๅพ‘่ฆๆ ผ>...]]"
+
+#: builtin/stash.c:32 builtin/stash.c:85
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<ๆถˆๆฏ>]"
+
+#: builtin/stash.c:53
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:58
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:73
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <ๆถˆๆฏ>] [-q|--quiet] <ๆไบค>"
+
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <ๆถˆๆฏ>]\n"
+"          [--] [<่ทฏๅพ‘่ฆๆ ผ>...]]"
+
+#: builtin/stash.c:128
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' ไธๅƒๆ˜ฏไธ€ๅ€‹ๅ„ฒ่—ๆไบค"
+
+#: builtin/stash.c:148
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "ๆŒ‡ๅฎšไบ†ๅคชๅคš็š„็‰ˆๆœฌ๏ผš%s"
+
+#: builtin/stash.c:162 git-legacy-stash.sh:549
+msgid "No stash entries found."
+msgstr "ๆœช็™ผ็พๅ„ฒ่—ๆข็›ฎใ€‚"
+
+#: builtin/stash.c:176
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๅผ•็”จๅ"
+
+#: builtin/stash.c:225 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear ไธๆ”ฏๆดๅƒๆ•ธ"
+
+#: builtin/stash.c:404
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "็„กๆณ•ๅœจๅˆไฝต้Ž็จ‹ๅฅ—็”จๅ„ฒ่—"
+
+#: builtin/stash.c:415
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "็„กๆณ•็”Ÿๆˆๅทฎ็•ฐ %s^!."
+
+#: builtin/stash.c:422
+msgid "conflicts in index.Try without --index."
+msgstr "็ดขๅผ•ไธญๆœ‰่ก็ชใ€‚ๅ˜—่ฉฆไธ็”จ --indexใ€‚"
+
+#: builtin/stash.c:428
+msgid "could not save index tree"
+msgstr "ไธ่ƒฝๅ„ฒๅญ˜็ดขๅผ•ๆจน"
+
+#: builtin/stash.c:437
+msgid "could not restore untracked files from stash"
+msgstr "็„กๆณ•ๅพžๅ„ฒ่—ๆข็›ฎไธญๅพฉๅŽŸๆœช่ฟฝ่นคๆช”ๆกˆ"
+
+#: builtin/stash.c:451
+#, c-format
+msgid "Merging %s with %s"
+msgstr "ๆญฃๅœจๅˆไฝต %s ๅ’Œ %s"
+
+#: builtin/stash.c:461 git-legacy-stash.sh:681
+msgid "Index was not unstashed."
+msgstr "็ดขๅผ•ๆœชๅพžๅ„ฒ่—ไธญๅพฉๅŽŸใ€‚"
+
+#: builtin/stash.c:522 builtin/stash.c:621
+msgid "attempt to recreate the index"
+msgstr "ๅ˜—่ฉฆ้‡ๅปบ็ดขๅผ•"
+
+#: builtin/stash.c:555
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "ๆจๆฃ„ไบ† %s๏ผˆ%s๏ผ‰"
+
+#: builtin/stash.c:558
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s๏ผš็„กๆณ•ๆจๆฃ„ๅ„ฒ่—ๆข็›ฎ"
+
+#: builtin/stash.c:583
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๅ„ฒ่—ๅผ•็”จ"
+
+#: builtin/stash.c:633 git-legacy-stash.sh:695
+msgid "The stash entry is kept in case you need it again."
+msgstr "ๅ„ฒ่—ๆข็›ฎ่ขซไฟ็•™ไปฅๅ‚™ๆ‚จๅ†ๆฌก้œ€่ฆใ€‚"
+
+#: builtin/stash.c:656 git-legacy-stash.sh:713
+msgid "No branch name specified"
+msgstr "ๆœชๆŒ‡ๅฎšๅˆ†ๆ”ฏๅ"
+
+#: builtin/stash.c:796 builtin/stash.c:833
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "็„กๆณ•็”จ %2$s ๆ›ดๆ–ฐ %1$s"
+
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+msgid "stash message"
+msgstr "ๅ„ฒ่—่ชชๆ˜Ž"
+
+#: builtin/stash.c:824
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" ้œ€่ฆไธ€ๅ€‹ <ๆไบค> ๅƒๆ•ธ"
+
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
+msgid "No changes selected"
+msgstr "ๆฒ’ๆœ‰้ธๆ“‡่ฎŠๆ›ด"
+
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "ๆ‚จๅฐšๆœชๅปบ็ซ‹ๅˆๅง‹ๆไบค"
+
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "็„กๆณ•ๅ„ฒๅญ˜็›ฎๅ‰็ดขๅผ•็‹€ๆ…‹"
+
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "็„กๆณ•ๅ„ฒๅญ˜ๆœช่ฟฝ่นคๆช”ๆกˆ"
+
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
+#: git-legacy-stash.sh:214
+msgid "Cannot save the current worktree state"
+msgstr "็„กๆณ•ๅ„ฒๅญ˜็›ฎๅ‰ๅทฅไฝœๅ€็‹€ๆ…‹"
+
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
+msgid "Cannot record working tree state"
+msgstr "ไธ่ƒฝ่จ˜้Œ„ๅทฅไฝœๅ€็‹€ๆ…‹"
+
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "ไธ่ƒฝๅŒๆ™‚ไฝฟ็”จๅƒๆ•ธ --patch ๅ’Œ --include-untracked ๆˆ– --all"
+
+#: builtin/stash.c:1298
+msgid "Did you forget to 'git add'?"
+msgstr "ๆ‚จๆ˜ฏๅฆๅฟ˜ไบ†ๅŸท่กŒ 'git add'๏ผŸ"
+
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
+msgid "No local changes to save"
+msgstr "ๆฒ’ๆœ‰่ฆๅ„ฒๅญ˜็š„ๆœฌๆฉŸไฟฎๆ”น"
+
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
+msgid "Cannot initialize stash"
+msgstr "็„กๆณ•ๅˆๅง‹ๅŒ–ๅ„ฒ่—"
+
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
+msgid "Cannot save the current status"
+msgstr "็„กๆณ•ๅ„ฒๅญ˜็›ฎๅ‰็‹€ๆ…‹"
+
+#: builtin/stash.c:1340
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "ๅ„ฒๅญ˜ๅทฅไฝœ็›ฎ้Œ„ๅ’Œ็ดขๅผ•็‹€ๆ…‹ %s"
+
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
+msgid "Cannot remove worktree changes"
+msgstr "็„กๆณ•ๅˆช้™คๅทฅไฝœๅ€่ฎŠๆ›ด"
+
+#: builtin/stash.c:1469 builtin/stash.c:1534
+msgid "keep index"
+msgstr "ไฟๆŒ็ดขๅผ•"
+
+#: builtin/stash.c:1471 builtin/stash.c:1536
+msgid "stash in patch mode"
+msgstr "ไปฅไฟฎ่ฃœๆช”ๆจกๅผๅ„ฒ่—"
+
+#: builtin/stash.c:1472 builtin/stash.c:1537
+msgid "quiet mode"
+msgstr "้œ้ป˜ๆจกๅผ"
+
+#: builtin/stash.c:1474 builtin/stash.c:1539
+msgid "include untracked files in stash"
+msgstr "ๅ„ฒ่—ไธญๅŒ…ๅซๆœช่ฟฝ่นคๆช”ๆกˆ"
+
+#: builtin/stash.c:1476 builtin/stash.c:1541
+msgid "include ignore files"
+msgstr "ๅŒ…ๅซๅฟฝ็•ฅ็š„ๆช”ๆกˆ"
+
+#: builtin/stash.c:1600
+#, c-format
+msgid "could not exec %s"
+msgstr "ไธ่ƒฝๅŸท่กŒ %s"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr "่ทณ้Žๅ’Œ็งป้™คๆ‰€ๆœ‰็š„ๅ‚™่จป่กŒ"
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr "็‚บๆฏไธ€่กŒ็š„่กŒ้ฆ–ๆ–ฐๅขžๅ‚™่จป็ฌฆๅ’Œ็ฉบๆ ผ"
+
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "ๆœŸๆœ›ไธ€ๅ€‹ๅฎŒๆ•ด็š„ๅผ•็”จๅ็จฑ๏ผŒๅปๅพ—ๅˆฐ %s"
+
+#: builtin/submodule--helper.c:64
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote ไธๅธถๅƒๆ•ธ"
+
+#: builtin/submodule--helper.c:102
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "็„กๆณ•ๅพž url '%s' ๅ‰้›ขไธ€ๅ€‹ๅ…ƒไปถ"
+
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+msgid "alternative anchor for relative paths"
+msgstr "็›ธๅฐ่ทฏๅพ‘็š„ๆ›ฟไปฃ้Œจ่จ˜๏ผˆanchor๏ผ‰"
+
+#: builtin/submodule--helper.c:415
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<่ทฏๅพ‘>] [<่ทฏๅพ‘>...]"
+
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "ๅœจ .gitmodules ไธญๆœชๆ‰พๅˆฐๅญๆจก็ต„ '%s' ็š„ url"
+
+#: builtin/submodule--helper.c:524
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "้€ฒๅ…ฅ '%s'\n"
+
+#: builtin/submodule--helper.c:527
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"ๅฐ %s ๅŸท่กŒ run_command ่ฟ”ๅ›ž้ž้›ถๅ€ผใ€‚\n"
+"."
+
+#: builtin/submodule--helper.c:549
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"ๅœจ้ž่ฟด %s ็š„ๅญๆจก็ต„ๅŸท่กŒ run_command ๆ™‚่ฟ”ๅ›ž้ž้›ถๅ€ผใ€‚\n"
+"."
+
+#: builtin/submodule--helper.c:565
+msgid "Suppress output of entering each submodule command"
+msgstr "้˜ปๆญข้€ฒๅ…ฅๆฏไธ€ๅ€‹ๅญๆจก็ต„ๆŒ‡ไปค็š„่ผธๅ‡บ"
+
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
+msgid "Recurse into nested submodules"
+msgstr "้ž่ฟด้€ฒๅ…ฅๅตŒๅฅ—ๅญๆจก็ต„ไธญ"
+
+#: builtin/submodule--helper.c:572
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ๆŒ‡ไปค>"
+
+#: builtin/submodule--helper.c:599
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "็„กๆณ•ๆ‰พๅˆฐ่จญๅฎš '%s'ใ€‚ๅ‡ๅฎš้€™ๅ€‹็‰ˆๆœฌๅบซๆ˜ฏๅ…ถ่‡ช่บซ็š„ๅฎ˜ๆ–นไธŠๆธธใ€‚"
+
+#: builtin/submodule--helper.c:667
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "็„กๆณ•็‚บๅญๆจก็ต„ '%s' ่จปๅ†Š url"
+
+#: builtin/submodule--helper.c:671
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "ๅญๆจก็ต„ '%s'๏ผˆ%s๏ผ‰ๅทฒๅฐ่ทฏๅพ‘ '%s' ่จปๅ†Š\n"
+
+#: builtin/submodule--helper.c:681
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "่ญฆๅ‘Š๏ผšๅปบ่ญฐๅญๆจก็ต„ '%s' ไฝฟ็”จๆŒ‡ไปคๆ›ดๆ–ฐๆจกๅผ\n"
+
+#: builtin/submodule--helper.c:688
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "็„กๆณ•็‚บๅญๆจก็ต„ '%s' ่จปๅ†Šๆ›ดๆ–ฐๆจกๅผ"
+
+#: builtin/submodule--helper.c:710
+msgid "Suppress output for initializing a submodule"
+msgstr "้˜ปๆญขๅญๆจก็ต„ๅˆๅง‹ๅŒ–็š„่ผธๅ‡บ"
+
+#: builtin/submodule--helper.c:715
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<้ธ้ …>] [<่ทฏๅพ‘>]"
+
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "ๅœจ .gitmodules ไธญๆฒ’ๆœ‰็™ผ็พ่ทฏๅพ‘ '%s' ็š„ๅญๆจก็ต„ๆ˜ ๅฐ„"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "็„กๆณ•่งฃๆžๅญๆจก็ต„ '%s' ็š„ HEAD ๅผ•็”จ"
+
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "้ž่ฟดๅญๆจก็ต„ '%s' ๅคฑๆ•—"
+
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
+msgid "Suppress submodule status output"
+msgstr "้˜ปๆญขๅญๆจก็ต„็‹€ๆ…‹่ผธๅ‡บ"
+
+#: builtin/submodule--helper.c:889
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr "ไฝฟ็”จๅ„ฒๅญ˜ๅœจ็ดขๅผ•ไธญ็š„ๆไบค๏ผŒ่€Œ้žๅ„ฒๅญ˜ๅœจๅญๆจก็ต„ HEAD ไธญ็š„ๆไบค"
+
+#: builtin/submodule--helper.c:890
+msgid "recurse into nested submodules"
+msgstr "้ž่ฟด้€ฒๅ…ฅๅตŒๅฅ—ๅญๆจก็ต„ไธญ"
+
+#: builtin/submodule--helper.c:895
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<่ทฏๅพ‘>...]"
+
+#: builtin/submodule--helper.c:919
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <่ทฏๅพ‘>"
+
+#: builtin/submodule--helper.c:983
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "็‚บ '%s' ๅŒๆญฅๅญๆจก็ต„ url\n"
+
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "็„กๆณ•็‚บๅญๆจก็ต„่ทฏๅพ‘ '%s' ่จปๅ†Š url"
+
+#: builtin/submodule--helper.c:1003
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "็„กๆณ•ๅพ—ๅˆฐๅญๆจก็ต„ '%s' ็š„้ ่จญ้ ็ซฏ้—œ่ฏ"
+
+#: builtin/submodule--helper.c:1014
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "็„กๆณ•็‚บๅญๆจก็ต„ '%s' ๆ›ดๆ–ฐ้ ็ซฏ้—œ่ฏ"
+
+#: builtin/submodule--helper.c:1061
+msgid "Suppress output of synchronizing submodule url"
+msgstr "้˜ปๆญขๅญๆจก็ต„ url ๅŒๆญฅ็š„่ผธๅ‡บ"
+
+#: builtin/submodule--helper.c:1068
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<่ทฏๅพ‘>]"
+
+#: builtin/submodule--helper.c:1122
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"ๅญๆจก็ต„ๅทฅไฝœๅ€ '%s' ๅŒ…ๅซไธ€ๅ€‹ .git ็›ฎ้Œ„๏ผˆๅฆ‚ๆžœๆ‚จ็ขบ้œ€ๅˆช้™คๅฎƒๅŠๅ…ถๅ…จ้ƒจๆญทๅฒ๏ผŒไฝฟ็”จ 'rm "
+"-rf' ๆŒ‡ไปค๏ผ‰"
+
+#: builtin/submodule--helper.c:1134
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr "ๅญๆจก็ต„ๅทฅไฝœๅ€ '%s' ๅŒ…ๅซๆœฌๆฉŸไฟฎๆ”น๏ผ›ไฝฟ็”จ '-f' ๆจๆฃ„ๅฎƒๅ€‘"
+
+#: builtin/submodule--helper.c:1142
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "ๅทฒๆธ…้™ค็›ฎ้Œ„ '%s'\n"
+
+#: builtin/submodule--helper.c:1144
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "็„กๆณ•็งป้™คๅญๆจก็ต„ๅทฅไฝœๅ€ '%s'\n"
+
+#: builtin/submodule--helper.c:1155
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "ไธ่ƒฝๅปบ็ซ‹็ฉบ็š„ๅญๆจก็ต„็›ฎ้Œ„ %s"
+
+#: builtin/submodule--helper.c:1171
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "ๅญๆจก็ต„ '%s'๏ผˆ%s๏ผ‰ๆœชๅฐ่ทฏๅพ‘ '%s' ่จปๅ†Š\n"
+
+#: builtin/submodule--helper.c:1200
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr "ๅˆช้™คๅญๆจก็ต„ๅทฅไฝœๅ€๏ผŒๅณไฝฟๅŒ…ๅซๆœฌๆฉŸไฟฎๆ”น"
+
+#: builtin/submodule--helper.c:1201
+msgid "Unregister all submodules"
+msgstr "ๅฐ‡ๆ‰€ๆœ‰ๅญๆจก็ต„ๅ–ๆถˆ่จปๅ†Š"
+
+#: builtin/submodule--helper.c:1206
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<่ทฏๅพ‘>...]]"
+
+#: builtin/submodule--helper.c:1220
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "ๅฆ‚ๆžœๆ‚จ็ขบๅฏฆๆƒณ่ฆๅฐๆ‰€ๆœ‰ๅญๆจก็ต„ๅŸท่กŒๅ–ๆถˆๅˆๅง‹ๅŒ–๏ผŒ่ซ‹ไฝฟ็”จ '--all'"
+
+#: builtin/submodule--helper.c:1289
+msgid ""
+"An alternate computed from a superproject's alternate is invalid.\n"
+"To allow Git to clone without an alternate in such a case, set\n"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"ๅพžไธŠ็ดšๅฐˆๆกˆ็š„ๅ‚™็”จ็‰ˆๆœฌๅบซ่จˆ็ฎ—ๅพ—ๅ‡บ็š„ๅ‚™็”จ็‰ˆๆœฌๅบซ็„กๆ•ˆใ€‚\n"
+"้€™็จฎๆƒ…ๆณไธ‹๏ผŒ่ซ‹่จญๅฎš submodule.alternateErrorStrategy ็‚บ 'info'\n"
+"ไปฅๅ…่จฑ Git ไธ็”จๅ‚™็”จ็‰ˆๆœฌๅบซ่ค‡่ฃฝ๏ผŒไบฆๅฏไฝฟ็”จ็ญ‰ๆ•ˆ็š„ '--reference-if-able'\n"
+"่€Œ้ž '--reference' ่ค‡่ฃฝใ€‚"
+
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "ๅญๆจก็ต„ '%s' ไธ่ƒฝๆ–ฐๅขž็‰ˆๆœฌๅบซๅ‚™้ธ๏ผš%s"
+
+#: builtin/submodule--helper.c:1367
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "ไธ่ƒฝ่ญ˜ๅˆฅ submodule.alternateErrorStrategy ็š„ๅ–ๅ€ผ '%s'"
+
+#: builtin/submodule--helper.c:1374
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "ไธ่ƒฝ่ญ˜ๅˆฅ submodule.alternateLocaion ็š„ๅ–ๅ€ผ '%s'"
+
+#: builtin/submodule--helper.c:1398
+msgid "where the new submodule will be cloned to"
+msgstr "ๆ–ฐ็š„ๅญๆจก็ต„ๅฐ‡่ฆ่ค‡่ฃฝ็š„่ทฏๅพ‘"
+
+#: builtin/submodule--helper.c:1401
+msgid "name of the new submodule"
+msgstr "ๆ–ฐๅญๆจก็ต„็š„ๅ็จฑ"
+
+#: builtin/submodule--helper.c:1404
+msgid "url where to clone the submodule from"
+msgstr "่ค‡่ฃฝๅญๆจก็ต„็š„ url ไฝๅ€"
+
+#: builtin/submodule--helper.c:1412
+msgid "depth for shallow clones"
+msgstr "ๆทบ่ค‡่ฃฝ็š„ๆทฑๅบฆ"
+
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+msgid "force cloning progress"
+msgstr "ๅผทๅˆถ้กฏ็คบ่ค‡่ฃฝ้€ฒๅบฆ"
+
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+msgid "disallow cloning into non-empty directory"
+msgstr "ไธๅ…่จฑ่ค‡่ฃฝ่‡ณ้ž็ฉบ็™ฝ็›ฎ้Œ„"
+
+#: builtin/submodule--helper.c:1424
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<่ทฏๅพ‘>] [--quiet] [--reference <็‰ˆๆœฌๅบซ"
+">] [--name <ๅๅญ—>] [--depth <ๆทฑๅบฆ>] [--single-branch] --url <url> --path <่ทฏ"
+"ๅพ‘>"
+
+#: builtin/submodule--helper.c:1449
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "ๆ‹’็ต•ๅœจๅ…ถไป–ๅญๆจก็ต„็š„ git ่ทฏๅพ‘ๅปบ็ซ‹๏ผไฝฟ็”จใ€Œ%sใ€"
+
+#: builtin/submodule--helper.c:1460
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "็„กๆณ•่ค‡่ฃฝ '%s' ๅˆฐๅญๆจก็ต„่ทฏๅพ‘ '%s'"
+
+#: builtin/submodule--helper.c:1464
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "็›ฎ้Œ„ไธๆ˜ฏ็ฉบ็š„๏ผšใ€Œ%sใ€"
+
+#: builtin/submodule--helper.c:1476
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "็„กๆณ•ๅพ—ๅˆฐ '%s' ็š„ๅญๆจก็ต„็›ฎ้Œ„"
+
+#: builtin/submodule--helper.c:1512
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr "ๅญๆจก็ต„ '%2$s' ็š„ๆ›ดๆ–ฐๆจกๅผ '%1$s' ็„กๆ•ˆ"
+
+#: builtin/submodule--helper.c:1516
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr "็‚บๅญๆจก็ต„ '%2$s' ่จญๅฎš็š„ๆ›ดๆ–ฐๆจกๅผ '%1$s' ็„กๆ•ˆ"
+
+#: builtin/submodule--helper.c:1617
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "ๅญๆจก็ต„ '%s' ๅฐšๆœชๅˆๅง‹ๅŒ–"
+
+#: builtin/submodule--helper.c:1621
+msgid "Maybe you want to use 'update --init'?"
+msgstr "ไนŸ่จฑๆ‚จๆƒณ่ฆๅŸท่กŒ 'update --init'๏ผŸ"
+
+#: builtin/submodule--helper.c:1651
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "็•ฅ้Žๆœชๅˆไฝต็š„ๅญๆจก็ต„ %s"
+
+#: builtin/submodule--helper.c:1680
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "็•ฅ้Žๅญๆจก็ต„ '%s'"
+
+#: builtin/submodule--helper.c:1830
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "่ค‡่ฃฝ '%s' ๅคฑๆ•—ใ€‚ๆŒ‰่จˆๅŠƒ้‡่ฉฆ"
+
+#: builtin/submodule--helper.c:1841
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "็ฌฌไบŒๆฌกๅ˜—่ฉฆ่ค‡่ฃฝ '%s' ๅคฑๆ•—๏ผŒ้›ข้–‹"
+
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
+msgid "path into the working tree"
+msgstr "ๅˆฐๅทฅไฝœๅ€็š„่ทฏๅพ‘"
+
+#: builtin/submodule--helper.c:1906
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "ๅทฅไฝœๅ€ไธญ็š„่ทฏๅพ‘๏ผŒ้ž่ฟดๅตŒๅฅ—ๅญๆจก็ต„"
+
+#: builtin/submodule--helper.c:1910
+msgid "rebase, merge, checkout or none"
+msgstr "rebaseใ€mergeใ€checkout ๆˆ– none"
+
+#: builtin/submodule--helper.c:1916
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹ๆŒ‡ๅฎšๆทฑๅบฆ็š„ๆทบ่ค‡่ฃฝ"
+
+#: builtin/submodule--helper.c:1919
+msgid "parallel jobs"
+msgstr "ไธฆ็™ผไปปๅ‹™"
+
+#: builtin/submodule--helper.c:1921
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "ๅˆๅง‹่ค‡่ฃฝๆ˜ฏๅฆๆ‡‰่ฉฒ้ตๅฎˆๆŽจ่–ฆ็š„ๆทบ่ค‡่ฃฝ้ธ้ …"
+
+#: builtin/submodule--helper.c:1922
+msgid "don't print cloning progress"
+msgstr "ไธ่ฆ่ผธๅ‡บ่ค‡่ฃฝ้€ฒๅบฆ"
+
+#: builtin/submodule--helper.c:1933
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<่ทฏๅพ‘>] [<่ทฏๅพ‘>...]"
+
+#: builtin/submodule--helper.c:1946
+msgid "bad value for update parameter"
+msgstr "update ๅƒๆ•ธๅ–ๅ€ผ้Œฏ่ชค"
+
+#: builtin/submodule--helper.c:1994
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr "ๅญๆจก็ต„๏ผˆ%s๏ผ‰็š„ๅˆ†ๆ”ฏ่จญๅฎš็‚บ็นผๆ‰ฟไธŠ็ดšๅฐˆๆกˆ็š„ๅˆ†ๆ”ฏ๏ผŒไฝ†ๆ˜ฏไธŠ็ดšๅฐˆๆกˆไธๅœจไปปไฝ•ๅˆ†ๆ”ฏไธŠ"
+
+#: builtin/submodule--helper.c:2117
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "็„กๆณ•็ฒๅพ—ๅญๆจก็ต„ '%s' ็š„็‰ˆๆœฌๅบซๅฅๆŸ„"
+
+#: builtin/submodule--helper.c:2150
+msgid "recurse into submodules"
+msgstr "ๅœจๅญๆจก็ต„ไธญ้ž่ฟด"
+
+#: builtin/submodule--helper.c:2156
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<้ธ้ …>] [<่ทฏๅพ‘>...]"
+
+#: builtin/submodule--helper.c:2212
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr "ๆชขๆŸฅๅฏซๅ…ฅ .gitmodules ๆช”ๆกˆๆ˜ฏๅฆๅฎ‰ๅ…จ"
+
+#: builtin/submodule--helper.c:2215
+msgid "unset the config in the .gitmodules file"
+msgstr "ๅ–ๆถˆ .gitmodules ๆช”ๆกˆไธญ็š„่จญๅฎš"
+
+#: builtin/submodule--helper.c:2220
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <ๅ็จฑ> [<ๅ€ผ>]"
+
+#: builtin/submodule--helper.c:2221
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <ๅ็จฑ>"
+
+#: builtin/submodule--helper.c:2222
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr "่ซ‹็ขบ่ช .gitmodules ๆช”ๆกˆๅœจๅทฅไฝœๅ€่ฃก"
+
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s ไธๆ”ฏๆด --super-prefix"
+
+#: builtin/submodule--helper.c:2297
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ submodule--helper ๅญๆŒ‡ไปค"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<้ธ้ …>] <ๅ็จฑ> [<ๅผ•็”จ>]"
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <ๅ็จฑ>"
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "ไธ้กฏ็คบ้ž็ฌฆ่™Ÿ๏ผˆๅˆ†้›ข็š„๏ผ‰ๅผ•็”จ็š„้Œฏ่ชค่จŠๆฏ"
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr "ๅˆช้™ค็ฌฆ่™Ÿๅผ•็”จ"
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "็ธฎ็Ÿญๅผ•็”จ่ผธๅ‡บ"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
+msgstr "ๅŽŸๅ› "
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
+msgstr "ๆ›ดๆ–ฐ็š„ๅŽŸๅ› "
+
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
+msgstr ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <ๆถˆๆฏ> | -F <ๆช”ๆกˆ>]\n"
+"\t\t<ๆจ™็ฑคๅ> [<้ ญ>]"
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <ๆจ™็ฑคๅ>..."
+
+#: builtin/tag.c:28
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr ""
+"git tag -l [-n[<ๆ•ธๅญ—>]] [--contains <ๆไบค>] [--no-contains <ๆไบค>] [--points-"
+"at <็‰ฉไปถ>]\n"
+"\t\t[--format=<ๆ ผๅผ>] [--[no-]merged [<ๆไบค>]] [<ๆจกๅผ>...]"
+
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<ๆ ผๅผ>] <ๆจ™็ฑคๅ>..."
+
+#: builtin/tag.c:89
+#, c-format
+msgid "tag '%s' not found."
+msgstr "ๆœช็™ผ็พๆจ™็ฑค '%s'ใ€‚"
+
+#: builtin/tag.c:105
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "ๅทฒๅˆช้™คๆจ™็ฑค '%s'๏ผˆๆ›พ็‚บ %s๏ผ‰\n"
+
+#: builtin/tag.c:135
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"่ผธๅ…ฅไธ€ๅ€‹ๆจ™็ฑค่ชชๆ˜Ž๏ผš\n"
+"  %s\n"
+"ไปฅ '%c' ้–‹้ ญ็š„่กŒๅฐ‡่ขซๅฟฝ็•ฅใ€‚\n"
+
+#: builtin/tag.c:139
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"่ผธๅ…ฅไธ€ๅ€‹ๆจ™็ฑค่ชชๆ˜Ž๏ผš\n"
+"  %s\n"
+"ไปฅ '%c' ้–‹้ ญ็š„่กŒๅฐ‡่ขซไฟ็•™๏ผŒๅฆ‚ๆžœๆ‚จ้ก˜ๆ„ไนŸๅฏไปฅๅˆช้™คๅฎƒๅ€‘ใ€‚\n"
+
+#: builtin/tag.c:198
+msgid "unable to sign the tag"
+msgstr "็„กๆณ•็ฐฝ็ฝฒๆจ™็ฑค"
+
+#: builtin/tag.c:200
+msgid "unable to write tag file"
+msgstr "็„กๆณ•ๅฏซๆจ™็ฑคๆช”ๆกˆ"
+
+#: builtin/tag.c:216
+#, c-format
+msgid ""
+"You have created a nested tag. The object referred to by your new tag is\n"
+"already a tag. If you meant to tag the object that it points to, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+msgstr ""
+"ๆ‚จๅปบ็ซ‹ไบ†ไธ€ๅ€‹ๅตŒๅฅ—็š„ๆจ™็ฑคใ€‚ๆ‚จ็š„ๆ–ฐๆจ™็ฑคๆŒ‡ๅ‘็š„็‰ฉไปถๅทฒ็ถ“ๆ˜ฏไธ€ๅ€‹ๆจ™็ฑคใ€‚ๅฆ‚ๆžœๆ‚จๆƒณ่ฆ\n"
+"ๅฐๅ…ถๆŒ‡ๅ‘็š„็›ฎๆจ™ๅปบ็ซ‹ๆจ™็ฑค๏ผŒไฝฟ็”จ๏ผš\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:232
+msgid "bad object type."
+msgstr "ๅฃž็š„็‰ฉไปถ้กžๅž‹ใ€‚"
+
+#: builtin/tag.c:284
+msgid "no tag message?"
+msgstr "็„กๆจ™็ฑค่ชชๆ˜Ž๏ผŸ"
+
+#: builtin/tag.c:291
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "ๆจ™็ฑค่ชชๆ˜Ž่ขซไฟ็•™ๅœจ %s\n"
+
+#: builtin/tag.c:402
+msgid "list tag names"
+msgstr "ๅˆ—ๅ‡บๆจ™็ฑคๅ็จฑ"
+
+#: builtin/tag.c:404
+msgid "print <n> lines of each tag message"
+msgstr "ๆฏๅ€‹ๆจ™็ฑค่จŠๆฏๅˆ—ๅฐ <n> ่กŒ"
+
+#: builtin/tag.c:406
+msgid "delete tags"
+msgstr "ๅˆช้™คๆจ™็ฑค"
+
+#: builtin/tag.c:407
+msgid "verify tags"
+msgstr "้ฉ—่ญ‰ๆจ™็ฑค"
+
+#: builtin/tag.c:409
+msgid "Tag creation options"
+msgstr "ๆจ™็ฑคๅปบ็ซ‹้ธ้ …"
+
+#: builtin/tag.c:411
+msgid "annotated tag, needs a message"
+msgstr "้™„่จปๆจ™็ฑค๏ผŒ้œ€่ฆไธ€ๅ€‹่ชชๆ˜Ž"
+
+#: builtin/tag.c:413
+msgid "tag message"
+msgstr "ๆจ™็ฑค่ชชๆ˜Ž"
+
+#: builtin/tag.c:415
+msgid "force edit of tag message"
+msgstr "ๅผทๅˆถ็ทจ่ผฏๆจ™็ฑค่ชชๆ˜Ž"
+
+#: builtin/tag.c:416
+msgid "annotated and GPG-signed tag"
+msgstr "้™„่จปไธฆ้™„ๅŠ  GPG ็ฐฝๅ็š„ๆจ™็ฑค"
+
+#: builtin/tag.c:419
+msgid "use another key to sign the tag"
+msgstr "ไฝฟ็”จๅฆๅค–็š„็ง้‘ฐ็ฐฝๅ่ฉฒๆจ™็ฑค"
+
+#: builtin/tag.c:420
+msgid "replace the tag if exists"
+msgstr "ๅฆ‚ๆžœๅญ˜ๅœจ๏ผŒๅ–ไปฃ็พๆœ‰็š„ๆจ™็ฑค"
+
+#: builtin/tag.c:421 builtin/update-ref.c:369
+msgid "create a reflog"
+msgstr "ๅปบ็ซ‹ๅผ•็”จๆ—ฅ่ชŒ"
+
+#: builtin/tag.c:423
+msgid "Tag listing options"
+msgstr "ๆจ™็ฑคๅˆ—่กจ้ธ้ …"
+
+#: builtin/tag.c:424
+msgid "show tag list in columns"
+msgstr "ไปฅๅˆ—็š„ๆ–นๅผ้กฏ็คบๆจ™็ฑคๅˆ—่กจ"
+
+#: builtin/tag.c:425 builtin/tag.c:427
+msgid "print only tags that contain the commit"
+msgstr "ๅชๅˆ—ๅฐๅŒ…ๅซ่ฉฒๆไบค็š„ๆจ™็ฑค"
+
+#: builtin/tag.c:426 builtin/tag.c:428
+msgid "print only tags that don't contain the commit"
+msgstr "ๅชๅˆ—ๅฐไธๅŒ…ๅซ่ฉฒๆไบค็š„ๆจ™็ฑค"
+
+#: builtin/tag.c:429
+msgid "print only tags that are merged"
+msgstr "ๅชๅˆ—ๅฐๅทฒ็ถ“ๅˆไฝต็š„ๆจ™็ฑค"
+
+#: builtin/tag.c:430
+msgid "print only tags that are not merged"
+msgstr "ๅชๅˆ—ๅฐๅฐšๆœชๅˆไฝต็š„ๆจ™็ฑค"
+
+#: builtin/tag.c:434
+msgid "print only tags of the object"
+msgstr "ๅชๅˆ—ๅฐๆŒ‡ๅ‘่ฉฒ็‰ฉไปถ็š„ๆจ™็ฑค"
+
+#: builtin/tag.c:482
+msgid "--column and -n are incompatible"
+msgstr "--column ๅ’Œ -n ไธ็›ธๅฎน"
+
+#: builtin/tag.c:504
+msgid "-n option is only allowed in list mode"
+msgstr "-n ้ธ้ …ๅชๅ…่จฑ็”จๅœจๅˆ—่กจ้กฏ็คบๆจกๅผ"
+
+#: builtin/tag.c:506
+msgid "--contains option is only allowed in list mode"
+msgstr "--contains ้ธ้ …ๅชๅ…่จฑ็”จๅœจๅˆ—่กจ้กฏ็คบๆจกๅผ"
+
+#: builtin/tag.c:508
+msgid "--no-contains option is only allowed in list mode"
+msgstr "--no-contains ้ธ้ …ๅชๅ…่จฑ็”จๅœจๅˆ—่กจ้กฏ็คบๆจกๅผ"
+
+#: builtin/tag.c:510
+msgid "--points-at option is only allowed in list mode"
+msgstr "--points-at ้ธ้ …ๅชๅ…่จฑ็”จๅœจๅˆ—่กจ้กฏ็คบๆจกๅผ"
+
+#: builtin/tag.c:512
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr "--merged ๅ’Œ --no-merged ้ธ้ …ๅชๅ…่จฑ็”จๅœจๅˆ—่กจ้กฏ็คบๆจกๅผ"
+
+#: builtin/tag.c:523
+msgid "only one -F or -m option is allowed."
+msgstr "ๅชๅ…่จฑไธ€ๅ€‹ -F ๆˆ– -m ้ธ้ …ใ€‚"
+
+#: builtin/tag.c:542
+msgid "too many params"
+msgstr "ๅคชๅคšๅƒๆ•ธ"
+
+#: builtin/tag.c:548
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๆจ™็ฑคๅ็จฑใ€‚"
+
+#: builtin/tag.c:553
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "ๆจ™็ฑค '%s' ๅทฒๅญ˜ๅœจ"
+
+#: builtin/tag.c:584
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "ๅทฒๆ›ดๆ–ฐๆจ™็ฑค '%s'๏ผˆๆ›พ็‚บ %s๏ผ‰\n"
+
+#: builtin/unpack-objects.c:502
+msgid "Unpacking objects"
+msgstr "ๅฑ•้–‹็‰ฉไปถไธญ"
+
+#: builtin/update-index.c:84
+#, c-format
+msgid "failed to create directory %s"
+msgstr "ๅปบ็ซ‹็›ฎ้Œ„ %s ๅคฑๆ•—"
+
+#: builtin/update-index.c:100
+#, c-format
+msgid "failed to create file %s"
+msgstr "ๅปบ็ซ‹ๆช”ๆกˆ %s ๅคฑๆ•—"
+
+#: builtin/update-index.c:108
+#, c-format
+msgid "failed to delete file %s"
+msgstr "ๅˆช้™คๆช”ๆกˆ %s ๅคฑๆ•—"
+
+#: builtin/update-index.c:115 builtin/update-index.c:221
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "ๅˆช้™ค็›ฎ้Œ„ %s ๅคฑๆ•—"
+
+#: builtin/update-index.c:140
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "ๅœจ '%s' ไธญๆธฌ่ฉฆ mtime "
+
+#: builtin/update-index.c:154
+msgid "directory stat info does not change after adding a new file"
+msgstr "ๆ–ฐๅขžไธ€ๅ€‹ๆ–ฐๆช”ๆกˆๅพŒ๏ผŒ็›ฎ้Œ„็š„็‹€ๆ…‹่จŠๆฏๆœชๆ”น่ฎŠ"
+
+#: builtin/update-index.c:167
+msgid "directory stat info does not change after adding a new directory"
+msgstr "ๆ–ฐๅขžไธ€ๅ€‹ๆ–ฐ็›ฎ้Œ„ๅพŒ๏ผŒ็›ฎ้Œ„็š„็‹€ๆ…‹่จŠๆฏๆœชๆ”น่ฎŠ"
+
+#: builtin/update-index.c:180
+msgid "directory stat info changes after updating a file"
+msgstr "ๆ›ดๆ–ฐไธ€ๅ€‹ๆช”ๆกˆๅพŒ๏ผŒ็›ฎ้Œ„็š„็‹€ๆ…‹่จŠๆฏ่ขซไฟฎๆ”น"
+
+#: builtin/update-index.c:191
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr "ๅœจๅญ็›ฎ้Œ„ไธญๆ–ฐๅขžๆช”ๆกˆๅพŒ๏ผŒ็›ฎ้Œ„็š„็‹€ๆ…‹่จŠๆฏ่ขซไฟฎๆ”น"
+
+#: builtin/update-index.c:202
+msgid "directory stat info does not change after deleting a file"
+msgstr "ๅˆช้™คไธ€ๅ€‹ๆช”ๆกˆๅพŒ๏ผŒ็›ฎ้Œ„็š„็‹€ๆ…‹่จŠๆฏๆœชๆ”น่ฎŠ"
+
+#: builtin/update-index.c:215
+msgid "directory stat info does not change after deleting a directory"
+msgstr "ๅˆช้™คไธ€ๅ€‹็›ฎ้Œ„ๅพŒ๏ผŒ็›ฎ้Œ„็š„็‹€ๆ…‹่จŠๆฏๆœชๆ”น่ฎŠ"
+
+#: builtin/update-index.c:222
+msgid " OK"
+msgstr " OK"
+
+#: builtin/update-index.c:591
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<้ธ้ …>] [--] [<ๆช”ๆกˆ>...]"
+
+#: builtin/update-index.c:974
+msgid "continue refresh even when index needs update"
+msgstr "็•ถ็ดขๅผ•้œ€่ฆๆ›ดๆ–ฐๆ™‚็นผ็บŒ้‡ๆ–ฐๆ•ด็†"
+
+#: builtin/update-index.c:977
+msgid "refresh: ignore submodules"
+msgstr "้‡ๆ–ฐๆ•ด็†๏ผšๅฟฝ็•ฅๅญๆจก็ต„"
+
+#: builtin/update-index.c:980
+msgid "do not ignore new files"
+msgstr "ไธๅฟฝ็•ฅๆ–ฐ็š„ๆช”ๆกˆ"
+
+#: builtin/update-index.c:982
+msgid "let files replace directories and vice-versa"
+msgstr "่ฎ“ๆช”ๆกˆๅ–ไปฃ็›ฎ้Œ„๏ผˆๅไน‹ไบฆ็„ถ๏ผ‰"
+
+#: builtin/update-index.c:984
+msgid "notice files missing from worktree"
+msgstr "้€š็Ÿฅๆช”ๆกˆๅพžๅทฅไฝœๅ€้บๅคฑ"
+
+#: builtin/update-index.c:986
+msgid "refresh even if index contains unmerged entries"
+msgstr "ๅณไฝฟ็ดขๅผ•ๅ€ๅŒ…ๅซๆœชๅˆไฝต็š„ๆข็›ฎไนŸๅŸท่กŒ้‡ๆ–ฐๆ•ด็†"
+
+#: builtin/update-index.c:989
+msgid "refresh stat information"
+msgstr "้‡ๆ–ฐๆ•ด็†็ตฑ่จˆ่จŠๆฏ"
+
+#: builtin/update-index.c:993
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "้กžไผผๆ–ผ --refresh๏ผŒไฝ†ๆ˜ฏๅฟฝ็•ฅ assume-unchanged ่จญๅฎš"
+
+#: builtin/update-index.c:997
+msgid "<mode>,<object>,<path>"
+msgstr "<ๅญ˜ๅ–ๆจกๅผ>,<็‰ฉไปถ>,<่ทฏๅพ‘>"
+
+#: builtin/update-index.c:998
+msgid "add the specified entry to the index"
+msgstr "ๆ–ฐๅขžๆŒ‡ๅฎš็š„ๆข็›ฎๅˆฐ็ดขๅผ•ๅ€"
+
+#: builtin/update-index.c:1008
+msgid "mark files as \"not changing\""
+msgstr "ๆŠŠๆช”ๆกˆๆจ™่จ˜็‚บ \"ๆฒ’ๆœ‰่ฎŠๆ›ด\""
+
+#: builtin/update-index.c:1011
+msgid "clear assumed-unchanged bit"
+msgstr "ๆธ…้™ค assumed-unchanged ไฝ"
+
+#: builtin/update-index.c:1014
+msgid "mark files as \"index-only\""
+msgstr "ๆŠŠๆช”ๆกˆๆจ™่จ˜็‚บ \"ๅƒ…็ดขๅผ•\""
+
+#: builtin/update-index.c:1017
+msgid "clear skip-worktree bit"
+msgstr "ๆธ…้™ค skip-worktree ไฝ"
+
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "ไธ่ฆๅปบ็ซ‹ๅชๆœ‰็ดขๅผ•็š„้ …็›ฎ"
+
+#: builtin/update-index.c:1022
+msgid "add to index only; do not add content to object database"
+msgstr "ๅชๆ–ฐๅขžๅˆฐ็ดขๅผ•ๅ€๏ผ›ไธๆ–ฐๅขž็‰ฉไปถๅˆฐ็‰ฉไปถๅบซ"
+
+#: builtin/update-index.c:1024
+msgid "remove named paths even if present in worktree"
+msgstr "ๅณไฝฟๅญ˜ๅœจๅทฅไฝœๅ€่ฃก๏ผŒไนŸๅˆช้™ค่ทฏๅพ‘"
+
+#: builtin/update-index.c:1026
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "ๆ”œๅธถ --stdin๏ผš่ผธๅ…ฅ็š„่กŒไปฅ null ๅญ—ๅ…ƒ็ต‚ๆญข"
+
+#: builtin/update-index.c:1028
+msgid "read list of paths to be updated from standard input"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅไธญ่ฎ€ๅ–้œ€่ฆๆ›ดๆ–ฐ็š„่ทฏๅพ‘ๅˆ—่กจ"
+
+#: builtin/update-index.c:1032
+msgid "add entries from standard input to the index"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅๆ–ฐๅขžๆข็›ฎๅˆฐ็ดขๅผ•ๅ€"
+
+#: builtin/update-index.c:1036
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "็‚บๆŒ‡ๅฎšๆช”ๆกˆ้‡ๆ–ฐ็”Ÿๆˆ็ฌฌ2ๅ’Œ็ฌฌ3ๆšซๅญ˜ๅ€"
+
+#: builtin/update-index.c:1040
+msgid "only update entries that differ from HEAD"
+msgstr "ๅชๆ›ดๆ–ฐ่ˆ‡ HEAD ไธๅŒ็š„ๆข็›ฎ"
+
+#: builtin/update-index.c:1044
+msgid "ignore files missing from worktree"
+msgstr "ๅฟฝ็•ฅๅทฅไฝœๅ€้บๅคฑ็š„ๆช”ๆกˆ"
+
+#: builtin/update-index.c:1047
+msgid "report actions to standard output"
+msgstr "ๅœจๆจ™ๆบ–่ผธๅ‡บ้กฏ็คบๅ‹•ไฝœ"
+
+#: builtin/update-index.c:1049
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(for porcelains) ๅฟ˜่จ˜ๅ„ฒๅญ˜็š„ๆœช่งฃๆฑบ็š„่ก็ช"
+
+#: builtin/update-index.c:1053
+msgid "write index in this format"
+msgstr "ไปฅ้€™็จฎๆ ผๅผๅฏซๅ…ฅ็ดขๅผ•ๅ€"
+
+#: builtin/update-index.c:1055
+msgid "enable or disable split index"
+msgstr "ๅ•Ÿ็”จๆˆ–็ฆ็”จ็ดขๅผ•ๅˆ†ๅ‰ฒ"
+
+#: builtin/update-index.c:1057
+msgid "enable/disable untracked cache"
+msgstr "ๅ•Ÿ็”จ/็ฆ็”จๅฐๆœช่ฟฝ่นคๆช”ๆกˆ็š„ๅฟซๅ–"
+
+#: builtin/update-index.c:1059
+msgid "test if the filesystem supports untracked cache"
+msgstr "ๆธฌ่ฉฆๆช”ๆกˆ็ณป็ตฑๆ˜ฏๅฆๆ”ฏๆดๆœช่ฟฝ่นคๆช”ๆกˆๅฟซๅ–"
+
+#: builtin/update-index.c:1061
+msgid "enable untracked cache without testing the filesystem"
+msgstr "็„ก้œ€ๆชขๆธฌๆช”ๆกˆ็ณป็ตฑ๏ผŒๅ•Ÿ็”จๅฐๆœช่ฟฝ่นคๆช”ๆกˆ็š„ๅฟซๅ–"
+
+#: builtin/update-index.c:1063
+msgid "write out the index even if is not flagged as changed"
+msgstr "ๅณไฝฟๆฒ’ๆœ‰่ขซๆจ™่จ˜็‚บๅทฒๆ›ดๆ”น๏ผŒไนŸ่ฆๅฏซๅ‡บ็ดขๅผ•"
+
+#: builtin/update-index.c:1065
+msgid "enable or disable file system monitor"
+msgstr "ๅ•Ÿ็”จๆˆ–็ฆ็”จๆช”ๆกˆ็ณป็ตฑ็›ฃๆŽง"
+
+#: builtin/update-index.c:1067
+msgid "mark files as fsmonitor valid"
+msgstr "ๆจ™่จ˜ๆช”ๆกˆ็‚บ fsmonitor ๆœ‰ๆ•ˆ"
+
+#: builtin/update-index.c:1070
+msgid "clear fsmonitor valid bit"
+msgstr "ๆธ…้™ค fsmonitor ๆœ‰ๆ•ˆไฝ"
+
+#: builtin/update-index.c:1173
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex ่ขซ่จญๅฎš็‚บ falseใ€‚ๅฆ‚ๆžœๆ‚จ็ขบๅฏฆ่ฆๅ•Ÿ็”จ็ดขๅผ•ๅˆ†ๅ‰ฒ๏ผŒ่ซ‹ๅˆช้™คๆˆ–ไฟฎๆ”นๅฎƒใ€‚"
+
+#: builtin/update-index.c:1182
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex ่ขซ่จญๅฎš็‚บ trueใ€‚ๅฆ‚ๆžœๆ‚จ็ขบๅฏฆ่ฆ็ฆ็”จ็ดขๅผ•ๅˆ†ๅ‰ฒ๏ผŒ่ซ‹ๅˆช้™คๆˆ–ไฟฎๆ”นๅฎƒใ€‚"
+
+#: builtin/update-index.c:1194
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache ่ขซ่จญๅฎš็‚บ trueใ€‚ๅฆ‚ๆžœๆ‚จ็ขบๅฏฆ่ฆ็ฆ็”จๆœช่ฟฝ่นคๆช”ๆกˆๅฟซๅ–๏ผŒ่ซ‹ๅˆช้™คๆˆ–ไฟฎ"
+"ๆ”นๅฎƒใ€‚"
+
+#: builtin/update-index.c:1198
+msgid "Untracked cache disabled"
+msgstr "ๅฟซๅ–ๆœช่ฟฝ่นคๆช”ๆกˆ่ขซ็ฆ็”จ"
+
+#: builtin/update-index.c:1206
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache ่ขซ่จญๅฎš็‚บ falseใ€‚ๅฆ‚ๆžœๆ‚จ็ขบๅฏฆ่ฆๅ•Ÿ็”จๆœช่ฟฝ่นคๆช”ๆกˆๅฟซๅ–๏ผŒ่ซ‹ๅˆช้™คๆˆ–"
+"ไฟฎๆ”นๅฎƒใ€‚"
+
+#: builtin/update-index.c:1210
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "ๅฟซๅ–ๆœช่ฟฝ่นคๆช”ๆกˆๅœจ '%s' ๅ•Ÿ็”จ"
+
+#: builtin/update-index.c:1218
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr "core.fsmonitor ๆœช่จญๅฎš๏ผ›ๅฆ‚ๆžœๆƒณ่ฆๅ•Ÿ็”จ fsmonitor ่ซ‹่จญๅฎš่ฉฒ้ธ้ …"
+
+#: builtin/update-index.c:1222
+msgid "fsmonitor enabled"
+msgstr "fsmonitor ่ขซๅ•Ÿ็”จ"
+
+#: builtin/update-index.c:1225
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr "core.fsmonitor ๅทฒ่จญๅฎš๏ผ›ๅฆ‚ๆžœๆƒณ่ฆ็ฆ็”จ fsmonitor ่ซ‹็งป้™ค่ฉฒ้ธ้ …"
+
+#: builtin/update-index.c:1229
+msgid "fsmonitor disabled"
+msgstr "fsmonitor ่ขซ็ฆ็”จ"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<้ธ้ …>] -d <ๅผ•็”จๅ> [<่ˆŠๅ€ผ>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
+msgstr "git update-ref [<้ธ้ …>]    <ๅผ•็”จๅ> <ๆ–ฐๅ€ผ> [<่ˆŠๅ€ผ>]"
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<้ธ้ …>] --stdin [-z]"
+
+#: builtin/update-ref.c:364
+msgid "delete the reference"
+msgstr "ๅˆช้™คๅผ•็”จ"
+
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
+msgstr "ๆ›ดๆ–ฐ <ๅผ•็”จๅ> ๆœฌ่บซ่€Œไธๆ˜ฏๅฎƒๆŒ‡ๅ‘็š„ๅผ•็”จ"
+
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
+msgstr "ๆจ™ๆบ–่ผธๅ…ฅๆœ‰ไปฅ NUL ๅญ—ๅ…ƒ็ต‚ๆญข็š„ๅƒๆ•ธ"
+
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅ่ฎ€ๅ–ๆ›ดๆ–ฐ"
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr "ๅพž้ ญ้–‹ๅง‹ๆ›ดๆ–ฐๆช”ๆกˆ่จŠๆฏ"
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<้ธ้ …>] <็›ฎ้Œ„>"
+
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "ๅœจไธ€ๆฌกๅ–ฎ็จ็š„่ซ‹ๆฑ‚/ๅ›žๆ‡‰ไน‹ๅพŒ้›ข้–‹"
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr "ๅœจๅˆๅง‹็š„ๅผ•็”จๅปฃๅ‘ŠๅพŒ็ซ‹ๅณ้›ข้–‹"
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "ๅฆ‚ๆžœ <็›ฎ้Œ„> ไธๆ˜ฏไธ€ๅ€‹ Git ็›ฎ้Œ„๏ผŒไธ่ฆๅ˜—่ฉฆ <็›ฎ้Œ„>/.git/"
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "ไธๆดปๅ‹• <n> ็ง’้˜ๅพŒ็ต‚ๆญขๅ‚ณ่ผธ"
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <ๆไบค>..."
+
+#: builtin/verify-commit.c:68
+msgid "print commit contents"
+msgstr "ๅˆ—ๅฐๆไบคๅ…งๅฎน"
+
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr "ๅˆ—ๅฐๅŽŸๅง‹ gpg ็‹€ๆ…‹่ผธๅ‡บ"
+
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <ๅŒ…>..."
+
+#: builtin/verify-pack.c:65
+msgid "verbose"
+msgstr "่ฉณ็ดฐ่ผธๅ‡บ"
+
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
+msgstr "ๅช้กฏ็คบ็ตฑ่จˆ"
+
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<ๆ ผๅผ>] <ๆจ™็ฑค>..."
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr "ๅˆ—ๅฐๆจ™็ฑคๅ…งๅฎน"
+
+#: builtin/worktree.c:17
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<้ธ้ …>] <่ทฏๅพ‘> [<ๆไบค>]"
+
+#: builtin/worktree.c:18
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<้ธ้ …>]"
+
+#: builtin/worktree.c:19
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<้ธ้ …>] <่ทฏๅพ‘>"
+
+#: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <ๅทฅไฝœๅ€> <ๆ–ฐ่ทฏๅพ‘>"
+
+#: builtin/worktree.c:21
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<้ธ้ …>]"
+
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<้ธ้ …>] <ๅทฅไฝœๅ€>"
+
+#: builtin/worktree.c:23
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <่ทฏๅพ‘>"
+
+#: builtin/worktree.c:60 builtin/worktree.c:891
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "ๅˆช้™ค '%s' ๅคฑๆ•—"
+
+#: builtin/worktree.c:79
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr "ๅˆช้™คๅทฅไฝœๅ€/%s๏ผšไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„็›ฎ้Œ„"
+
+#: builtin/worktree.c:85
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr "ๅˆช้™ค worktrees/%s๏ผšgitdir ๆช”ๆกˆไธๅญ˜ๅœจ"
+
+#: builtin/worktree.c:90 builtin/worktree.c:99
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr "ๅˆช้™ค worktrees/%s๏ผš็„กๆณ•่ฎ€ๅ– gitdir ๆช”ๆกˆ (%s)"
+
+#: builtin/worktree.c:109
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "ๅˆช้™คๅทฅไฝœๆจน/%s๏ผš่ฎ€ๅ–้Ž็Ÿญ๏ผˆๆœŸๆœ› %<PRIuMAX> ไฝๅ…ƒ็ต„๏ผŒ่ฎ€ๅ– %<PRIuMAX>๏ผ‰"
+
+#: builtin/worktree.c:117
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr "ๅˆช้™ค worktrees/%s๏ผš็„กๆ•ˆ็š„ gitdir ๆช”ๆกˆ"
+
+#: builtin/worktree.c:126
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr "ๅˆช้™ค worktrees/%s๏ผšgitdir ๆช”ๆกˆ็š„ๆŒ‡ๅ‘ไธๅญ˜ๅœจ"
+
+#: builtin/worktree.c:165
+msgid "report pruned working trees"
+msgstr "ๅ ฑๅ‘Šๆธ…้™ค็š„ๅทฅไฝœๅ€"
+
+#: builtin/worktree.c:167
+msgid "expire working trees older than <time>"
+msgstr "ๅฐ‡ๆ—ฉๆ–ผ <ๆ™‚้–“> ็š„ๅทฅไฝœๅ€้ŽๆœŸ"
+
+#: builtin/worktree.c:234
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' ๅทฒ็ถ“ๅญ˜ๅœจ"
+
+#: builtin/worktree.c:244
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr "็„กๆณ•ๅ†ๆฌกๆ–ฐๅขžๅทฅไฝœๅ€ '%s'"
+
+#: builtin/worktree.c:249
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+"'%s' ๆ˜ฏไธ€ๅ€‹้บๅคฑไฝ†้Ž–ๅฎš็š„ๅทฅไฝœๅ€๏ผŒไฝฟ็”จ\n"
+"'add -f -f' ่ฆ†่“‹๏ผŒๆˆ– 'unlock' ๅ’Œ 'prune' ๆˆ– 'remove' ๆธ…้™ค"
+
+#: builtin/worktree.c:251
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+"'%s' ๆ˜ฏไธ€ๅ€‹้บๅคฑไฝ†ๅทฒ็ถ“่จปๅ†Š็š„ๅทฅไฝœๅ€๏ผŒไฝฟ็”จ\n"
+"'add -f' ่ฆ†่“‹๏ผŒๆˆ– 'prune' ๆˆ– 'remove' ๆธ…้™ค"
+
+#: builtin/worktree.c:301
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "ไธ่ƒฝๅปบ็ซ‹็›ฎ้Œ„ '%s'"
+
+#: builtin/worktree.c:432 builtin/worktree.c:438
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "ๆบ–ๅ‚™ๅทฅไฝœๅ€๏ผˆๆ–ฐๅˆ†ๆ”ฏ '%s'๏ผ‰"
+
+#: builtin/worktree.c:434
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr "ๆบ–ๅ‚™ๅทฅไฝœๅ€๏ผˆ้‡่จญๅˆ†ๆ”ฏ '%s'๏ผŒไน‹ๅ‰็‚บ %s๏ผ‰"
+
+#: builtin/worktree.c:443
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "ๆบ–ๅ‚™ๅทฅไฝœๅ€๏ผˆ็ฐฝๅ‡บ '%s'๏ผ‰"
+
+#: builtin/worktree.c:449
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "ๆบ–ๅ‚™ๅทฅไฝœๅ€๏ผˆๅˆ†้›ข้–‹้ ญๆŒ‡ๆจ™ %s๏ผ‰"
+
+#: builtin/worktree.c:490
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr "็ฐฝๅ‡บ <ๅˆ†ๆ”ฏ>๏ผŒๅณไฝฟๅทฒ็ถ“่ขซ็ฐฝๅ‡บๅˆฐๅ…ถๅฎƒๅทฅไฝœๅ€"
+
+#: builtin/worktree.c:493
+msgid "create a new branch"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹ๆ–ฐๅˆ†ๆ”ฏ"
+
+#: builtin/worktree.c:495
+msgid "create or reset a branch"
+msgstr "ๅปบ็ซ‹ๆˆ–้‡่จญไธ€ๅ€‹ๅˆ†ๆ”ฏ"
+
+#: builtin/worktree.c:497
+msgid "populate the new working tree"
+msgstr "็”Ÿๆˆๆ–ฐ็š„ๅทฅไฝœๅ€"
+
+#: builtin/worktree.c:498
+msgid "keep the new working tree locked"
+msgstr "้Ž–ๅฎšๆ–ฐๅทฅไฝœๅ€"
+
+#: builtin/worktree.c:501
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "่จญๅฎš่ฟฝ่นคๆจกๅผ๏ผˆๅƒ่ฆ‹ git-branch(1)๏ผ‰"
+
+#: builtin/worktree.c:504
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "ๅ˜—่ฉฆ็‚บๆ–ฐๅˆ†ๆ”ฏๅ็ฌฆๅˆไธ€ๅ€‹้ ็ซฏ่ฟฝ่นคๅˆ†ๆ”ฏ"
+
+#: builtin/worktree.c:512
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-bใ€-B ๅ’Œ --detach ๆ˜ฏไบ’ๆ–ฅ็š„"
+
+#: builtin/worktree.c:573
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "ๅช่ƒฝๅœจๅปบ็ซ‹ๆ–ฐๅˆ†ๆ”ฏๆ™‚ไฝฟ็”จ้ธ้ … --[no-]track "
+
+#: builtin/worktree.c:673
+msgid "reason for locking"
+msgstr "้Ž–ๅฎšๅŽŸๅ› "
+
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' ไธๆ˜ฏไธ€ๅ€‹ๅทฅไฝœๅ€"
+
+#: builtin/worktree.c:687 builtin/worktree.c:720
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "ไธปๅทฅไฝœๅ€็„กๆณ•่ขซๅŠ ้Ž–ๆˆ–่งฃ้Ž–"
+
+#: builtin/worktree.c:692
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' ๅทฒ่ขซ้Ž–ๅฎš๏ผŒๅŽŸๅ› ๏ผš%s"
+
+#: builtin/worktree.c:694
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' ๅทฒ่ขซ้Ž–ๅฎš"
+
+#: builtin/worktree.c:722
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' ๆœช่ขซ้Ž–ๅฎš"
+
+#: builtin/worktree.c:763
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "ไธ่ƒฝ็งปๅ‹•ๆˆ–ๅˆช้™คๅŒ…ๅซๅญๆจก็ต„็š„ๅทฅไฝœๅ€"
+
+#: builtin/worktree.c:771
+msgid "force move even if worktree is dirty or locked"
+msgstr "ๅผทๅˆถ็งปๅ‹•๏ผŒๅณไฝฟๅทฅไฝœๅ€ๆ˜ฏ้ซ’็š„ๆˆ–ๅทฒ้Ž–ๅฎš"
+
+#: builtin/worktree.c:794 builtin/worktree.c:921
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' ๆ˜ฏไธ€ๅ€‹ไธปๅทฅไฝœๅ€"
+
+#: builtin/worktree.c:799
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "็„กๆณ•ๅพž '%s' ็ฎ—ๅ‡บ็›ฎๆจ™ๅ็จฑ"
+
+#: builtin/worktree.c:805
+#, c-format
+msgid "target '%s' already exists"
+msgstr "็›ฎๆจ™ '%s' ๅทฒๅญ˜ๅœจ"
+
+#: builtin/worktree.c:813
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"็„กๆณ•็งปๅ‹•ไธ€ๅ€‹้Ž–ๅฎš็š„ๅทฅไฝœๅ€๏ผŒ้Ž–ๅฎšๅŽŸๅ› ๏ผš%s\n"
+"ไฝฟ็”จ 'move -f -f' ่ฆ†่“‹ๆˆ–ๅ…ˆ่งฃ้Ž–"
+
+#: builtin/worktree.c:815
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"็„กๆณ•็งปๅ‹•ไธ€ๅ€‹้Ž–ๅฎš็š„ๅทฅไฝœๅ€๏ผŒ\n"
+"ไฝฟ็”จ 'move -f -f' ่ฆ†่“‹ๆˆ–ๅ…ˆ่งฃ้Ž–"
+
+#: builtin/worktree.c:818
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "้ฉ—่ญ‰ๅคฑๆ•—๏ผŒ็„กๆณ•็งปๅ‹•ๅทฅไฝœๅ€๏ผš%s"
+
+#: builtin/worktree.c:823
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "็งปๅ‹• '%s' ๅˆฐ '%s' ๅคฑๆ•—"
+
+#: builtin/worktree.c:871
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "ๅœจ '%s' ไธญๅŸท่กŒ 'git status' ๅคฑๆ•—"
+
+#: builtin/worktree.c:875
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr "'%s' ๅŒ…ๅซไฟฎๆ”นๆˆ–ๆœช่ฟฝ่นค็š„ๆช”ๆกˆ๏ผŒไฝฟ็”จ --force ๅˆช้™ค"
+
+#: builtin/worktree.c:880
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "ๅœจ '%s' ไธญๅŸท่กŒ 'git status' ๅคฑๆ•—๏ผŒ้›ข้–‹็ขผ %d"
+
+#: builtin/worktree.c:903
+msgid "force removal even if worktree is dirty or locked"
+msgstr "ๅผทๅˆถๅˆช้™ค๏ผŒๅณไฝฟๅทฅไฝœๅ€ๆ˜ฏ้ซ’็š„ๆˆ–ๅทฒ้Ž–ๅฎš"
+
+#: builtin/worktree.c:926
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"็„กๆณ•ๅˆช้™คไธ€ๅ€‹้Ž–ๅฎš็š„ๅทฅไฝœๅ€๏ผŒ้Ž–ๅฎšๅŽŸๅ› ๏ผš%s\n"
+"ไฝฟ็”จ 'remove -f -f' ่ฆ†่“‹ๆˆ–ๅ…ˆ่งฃ้Ž–"
+
+#: builtin/worktree.c:928
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"็„กๆณ•ๅˆช้™คไธ€ๅ€‹้Ž–ๅฎš็š„ๅทฅไฝœๅ€๏ผŒ\n"
+"ไฝฟ็”จ 'remove -f -f' ่ฆ†่“‹ๆˆ–ๅ…ˆ่งฃ้Ž–"
+
+#: builtin/worktree.c:931
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "้ฉ—่ญ‰ๅคฑๆ•—๏ผŒ็„กๆณ•ๅˆช้™คๅทฅไฝœๅ€๏ผš%s"
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<ๅ‰็ถด>/]"
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr "<ๅ‰็ถด>/"
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "ๅฐ‡ <ๅ‰็ถด> ๅญ็›ฎ้Œ„ๅ…งๅฎนๅฏซๅˆฐไธ€ๅ€‹ๆจน็‹€็‰ฉไปถ"
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr "ๅชๅฐ้™ค้Œฏๆœ‰็”จ"
+
+#: fast-import.c:3125
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "้ ๆœŸ 'mark' ๆŒ‡ไปค๏ผŒๅพ—ๅˆฐ %s"
+
+#: fast-import.c:3130
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "้ ๆœŸ 'to' ๆŒ‡ไปค๏ผŒๅพ—ๅˆฐ %s"
+
+#: fast-import.c:3254
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "ๆฒ’ๆœ‰ --allow-unsafe-features ๆ™‚๏ผŒ็ฆๆญขๅœจ่ผธๅ…ฅไธญไฝฟ็”จ '%s' ๅŠŸ่ƒฝ"
+
+#: credential-cache--daemon.c:223
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"ๆ‚จ็š„ socket ็›ฎ้Œ„ๆฌŠ้™้Žๆ–ผๅฏฌ้ฌ†๏ผŒๅ…ถไป–ไฝฟ็”จ่€…ๅฏ่ƒฝๆœƒ่ฎ€ๅ–ๆ‚จๅฟซๅ–็š„่ช่ญ‰่จŠๆฏใ€‚่€ƒๆ…ฎๅŸท"
+"่กŒ๏ผš\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: credential-cache--daemon.c:272
+msgid "print debugging messages to stderr"
+msgstr "้™ค้Œฏ่จŠๆฏ่ผธๅ‡บๅˆฐๆจ™ๆบ–้Œฏ่ชค"
+
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "ๆไบค %s ๆฒ’ๆœ‰ๆจ™่จ˜็‚บๅฏไปฅๅ–ๅพ—"
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr "ๅคชๅคšๆไบคๆจ™่จ˜็‚บๅฏไปฅๅ–ๅพ—"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<้ธ้ …>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "ๅฐ่ƒฝๅŠ›ๅปฃๅ‘Šไน‹ๅพŒ็ซ‹ๅณ้›ข้–‹"
+
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <่ทฏๅพ‘>] [-c <ๅ็จฑ>=<ๅ–ๅ€ผ>]\n"
+"           [--exec-path[=<่ทฏๅพ‘>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<่ทฏๅพ‘>] [--work-tree=<่ทฏๅพ‘>] [--namespace=<ๅ็จฑ>]\n"
+"           <ๆŒ‡ไปค> [<ๅƒๆ•ธ>]"
+
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"ๆŒ‡ไปค 'git help -a' ๅ’Œ 'git help -g' ้กฏ็คบๅฏ็”จ็š„ๅญๆŒ‡ไปคๅ’Œไธ€ไบ›ๆฆ‚ๅฟต่ชชๆ˜Žใ€‚\n"
+"ๆชข่ฆ– 'git help <ๆŒ‡ไปค>' ๆˆ– 'git help <ๆฆ‚ๅฟต>' ไปฅๅ–ๅพ—ๆไพ›ๅญๆŒ‡ไปคๆˆ–ๆฆ‚ๅฟต\n"
+"่ชชๆ˜Žใ€‚\n"
+"ๆœ‰้—œ็ณป็ตฑๆฆ‚่ฟฐ๏ผŒๆชข่ฆ– 'git help git'ใ€‚"
+
+#: git.c:186
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "ๆฒ’ๆœ‰็‚บ --git-dir ๆไพ›็›ฎ้Œ„\n"
+
+#: git.c:200
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "ๆฒ’ๆœ‰็‚บ --namespace ๆไพ›ๅ‘ฝๅ็ฉบ้–“\n"
+
+#: git.c:214
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "ๆฒ’ๆœ‰็‚บ --work-tree ๆไพ›็›ฎ้Œ„\n"
+
+#: git.c:228
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "ๆฒ’ๆœ‰็‚บ --super-prefix ๆไพ›ๅ‰็ถด\n"
+
+#: git.c:250
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "ๆ‡‰็‚บ -c ๆไพ›ไธ€ๅ€‹่จญๅฎšๅญ—ไธฒ\n"
+
+#: git.c:288
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "ๆฒ’ๆœ‰็‚บ -C ๆไพ›็›ฎ้Œ„\n"
+
+#: git.c:314
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "ๆœช็Ÿฅ้ธ้ …๏ผš%s\n"
+
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "ๅœจๆ“ดๅฑ•ๅˆฅๅ '%s' ๆ™‚๏ผš'%s'"
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"ๅˆฅๅ '%s' ไฟฎๆ”น็’ฐๅขƒ่ฎŠๆ•ธใ€‚ๆ‚จๅฏไปฅไฝฟ็”จๅœจๅˆฅๅไธญ\n"
+"ไฝฟ็”จ '!git'"
+
+#: git.c:376
+#, c-format
+msgid "empty alias for %s"
+msgstr "%s ็š„็ฉบๅˆฅๅ"
+
+#: git.c:379
+#, c-format
+msgid "recursive alias: %s"
+msgstr "้ž่ฟด็š„ๅˆฅๅ๏ผš%s"
+
+#: git.c:459
+msgid "write failure on standard output"
+msgstr "ๅœจๆจ™ๆบ–่ผธๅ‡บๅฏซๅ…ฅๅคฑๆ•—"
+
+#: git.c:461
+msgid "unknown write failure on standard output"
+msgstr "ๅˆฐๆจ™ๆบ–่ผธๅ‡บ็š„ๆœช็Ÿฅๅฏซๅ…ฅ้Œฏ่ชค"
+
+#: git.c:463
+msgid "close failed on standard output"
+msgstr "ๆจ™ๆบ–่ผธๅ‡บ้—œ้–‰ๅคฑๆ•—"
+
+#: git.c:793
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "ๆชขๆธฌๅˆฐๅˆฅๅๅพช็’ฐ๏ผš'%s'็š„ๆ“ดๅฑ•ๆœช็ต‚ๆญข๏ผš%s"
+
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "ไธ่ƒฝไฝœ็‚บๅ…งๅปบๆŒ‡ไปค่™•็† %s"
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"็”จๆณ•๏ผš%s\n"
+"\n"
+
+#: git.c:876
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "ๅฑ•้–‹ๅˆฅๅๆŒ‡ไปค '%s' ๅคฑๆ•—๏ผŒ'%s' ไธๆ˜ฏไธ€ๅ€‹ git ๆŒ‡ไปค\n"
+
+#: git.c:888
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "ๅŸท่กŒๆŒ‡ไปค '%s' ๅคฑๆ•—๏ผš%s\n"
+
+#: http.c:378
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "http.postbuffer ็‚บ่ฒ ๅ€ผ๏ผŒ้ ่จญ็‚บ %d"
+
+#: http.c:399
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "ไธๆ”ฏๆดๅง”่จ—ๆŽงๅˆถ๏ผŒๅ› ็‚บ cURL < 7.22.0"
+
+#: http.c:408
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr "ไธๆ”ฏๆดๅ…ฌ้‘ฐๆช”ๆกˆ้Ž–ๅฎš๏ผŒๅ› ็‚บ cURL < 7.44.0"
+
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "ไธๆ”ฏๆด CURLSSLOPT_NO_REVOKE๏ผŒๅ› ็‚บ cURL < 7.44.0"
+
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr "ไธๆ”ฏๆดๅ”ๅฎš้™ๅˆถ๏ผŒๅ› ็‚บ cURL < 7.19.4"
+
+#: http.c:1086
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "ไธๆ”ฏๆด็š„ SSL ๅพŒ็ซฏ '%s'ใ€‚ๆ”ฏๆด็š„ SSL ๅพŒ็ซฏ๏ผš"
+
+#: http.c:1093
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr "็„กๆณ•่จญๅฎš SSL ๅพŒ็ซฏ็‚บ '%s'๏ผšcURL: cURL ๆฒ’ๆœ‰ไฝฟ็”จ SSL ๅพŒ็ซฏๆง‹ๅปบ"
+
+#: http.c:1097
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "็„กๆณ•ๅฐ‡ SSL ๅพŒ็ซฏ่จญๅฎš็‚บ '%s'๏ผšๅทฒ็ถ“่จญๅฎš"
+
+#: http.c:1966
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"ไธ่ƒฝๆ›ดๆ–ฐ้‡ๅฎšๅ‘็š„ url base๏ผš\n"
+"     ่ซ‹ๆฑ‚๏ผš%s\n"
+"   ้‡ๅฎšๅ‘๏ผš%s"
+
+#: remote-curl.c:166
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "ๅœจ push-option ๅ–ๅ€ผไธญ็„กๆ•ˆ็š„ๅผ•่™Ÿ๏ผš'%s'"
+
+#: remote-curl.c:263
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs ็„กๆ•ˆ๏ผš้€™ๆ˜ฏไธ€ๅ€‹ git ็‰ˆๆœฌๅบซๅ—Ž๏ผŸ"
+
+#: remote-curl.c:364
+msgid "invalid server response; expected service, got flush packet"
+msgstr "็„กๆ•ˆ็š„ๆœๅ‹™็ซฏๅ›žๆ‡‰ใ€‚้ ๆœŸๆœๅ‹™๏ผŒๅพ—ๅˆฐ flush ๅŒ…"
+
+#: remote-curl.c:395
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "็„กๆ•ˆ็š„ๆœๅ‹™็ซฏๅ›žๆ‡‰๏ผŒๅพ—ๅˆฐ '%s'"
+
+#: remote-curl.c:455
+#, c-format
+msgid "repository '%s' not found"
+msgstr "็‰ˆๆœฌๅบซ '%s' ๆœชๆ‰พๅˆฐ"
+
+#: remote-curl.c:459
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "'%s' ่บซไปฝ้ฉ—่ญ‰ๅคฑๆ•—"
+
+#: remote-curl.c:463
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "็„กๆณ•ๅญ˜ๅ– '%s'๏ผš%s"
+
+#: remote-curl.c:469
+#, c-format
+msgid "redirecting to %s"
+msgstr "้‡ๅฎšๅ‘ๅˆฐ %s"
+
+#: remote-curl.c:593
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "็•ถๆฒ’ๆœ‰่จญๅฎšๆบซๅ’Œ่™•็†ๆช”ๆกˆ็ตๆŸ็ฌฆ๏ผˆEOF๏ผ‰ๆ™‚๏ผŒไธๆ‡‰่ฉฒๆœ‰ๆช”ๆกˆ็ตๆŸ็ฌฆ"
+
+#: remote-curl.c:673
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr "็„กๆณ•้‚„ๅŽŸ rpc post ่ณ‡ๆ–™ - ๅ˜—่ฉฆๅขžๅŠ  http.postBuffer"
+
+#: remote-curl.c:733
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC ๅคฑๆ•—ใ€‚%s"
+
+#: remote-curl.c:773
+msgid "cannot handle pushes this big"
+msgstr "ไธ่ƒฝ่™•็†้€™้บผๅคง็š„ๆŽจ้€"
+
+#: remote-curl.c:888
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "ไธ่ƒฝๅฃ“็ธฎ่ซ‹ๆฑ‚๏ผŒzlib ๅฃ“็ธฎ้Œฏ่ชค %d"
+
+#: remote-curl.c:892
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "ไธ่ƒฝๅฃ“็ธฎ่ซ‹ๆฑ‚๏ผŒzlib ็ตๆŸ้Œฏ่ชค %d"
+
+#: remote-curl.c:1023
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "ๅ•ž http ๅ‚ณ่ผธไธๆ”ฏๆด shalllow ่ƒฝๅŠ›"
+
+#: remote-curl.c:1038
+msgid "fetch failed."
+msgstr "ๅ–ๅพ—ๅคฑๆ•—ใ€‚"
+
+#: remote-curl.c:1086
+msgid "cannot fetch by sha1 over smart http"
+msgstr "็„กๆณ•้€้Žๆ™บๆ…ง HTTP ๅ–ๅพ— sha1"
+
+#: remote-curl.c:1130 remote-curl.c:1136
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "ๅ”ๅฎš้Œฏ่ชค๏ผšๆœŸๆœ› sha/ref๏ผŒๅปๅพ—ๅˆฐ '%s'"
+
+#: remote-curl.c:1148 remote-curl.c:1263
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http ๅ‚ณ่ผธๅ”ๅฎšไธๆ”ฏๆด %s"
+
+#: remote-curl.c:1184
+msgid "git-http-push failed"
+msgstr "git-http-push ๅคฑๆ•—"
+
+#: remote-curl.c:1369
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl๏ผš็”จๆณ•๏ผšgit remote-curl <้ ็ซฏ> [<url>]"
+
+#: remote-curl.c:1401
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl๏ผš้Œฏ่ชค่ฎ€ๅ–ไพ†่‡ช git ็š„ๆŒ‡ไปคๆต"
+
+#: remote-curl.c:1408
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl๏ผšๅ˜—่ฉฆๆฒ’ๆœ‰ๆœฌๆฉŸ็‰ˆๆœฌๅบซไธ‹ๅ–ๅพ—"
+
+#: remote-curl.c:1448
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl๏ผšๆœช็Ÿฅ็š„ไพ†่‡ช git ็š„ๆŒ‡ไปค '%s'"
+
+#: list-objects-filter-options.h:85
+msgid "args"
+msgstr "ๅƒๆ•ธ"
+
+#: list-objects-filter-options.h:86
+msgid "object filtering"
+msgstr "็‰ฉไปถ้Žๆฟพ"
+
+#: parse-options.h:183
+msgid "expiry-date"
+msgstr "ๅˆฐๆœŸๆ™‚้–“"
+
+#: parse-options.h:197
+msgid "no-op (backward compatibility)"
+msgstr "็ฉบๅ‹•ไฝœ๏ผˆๅ‘ๅพŒ็›ธๅฎน๏ผ‰"
+
+#: parse-options.h:309
+msgid "be more verbose"
+msgstr "ๆ›ดๅŠ ่ฉณ็ดฐ"
+
+#: parse-options.h:311
+msgid "be more quiet"
+msgstr "ๆ›ดๅŠ ๅฎ‰้œ"
+
+#: parse-options.h:317
+msgid "use <n> digits to display SHA-1s"
+msgstr "็”จ <n> ไฝๆ•ธๅญ—้กฏ็คบ SHA-1 ้›œๆนŠๅ€ผ"
+
+#: parse-options.h:336
+msgid "how to strip spaces and #comments from message"
+msgstr "่จญๅฎšๅฆ‚ไฝ•ๅˆช้™คๆไบค่ชชๆ˜Ž่ฃก็š„็ฉบๆ ผๅ’Œ #ๅ‚™่จป"
+
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "ๅพžๆช”ๆกˆ่ฎ€ๅ– <่ทฏๅพ‘่ฆๆ ผ>"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "ๅฆ‚ไฝฟ็”จ --pathspec-from-file๏ผŒๅ‰‡ <่ทฏๅพ‘่ฆๆ ผ> ๅ…ƒไปถๆœƒไฝฟ็”จ NUL ๅญ—ๅ…ƒๅˆ†้š”"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "key"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "ๆŽ’ๅบ็š„ๆฌ„ไฝๅ"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr "ๅฆ‚ๆžœๅฏ่ƒฝ๏ผŒ้‡็”จ่ก็ช่งฃๆฑบๆ›ดๆ–ฐ็ดขๅผ•"
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "้–‹้ ญๆŒ‡ๆจ™ๅˆ†้›ขๆ–ผ "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "้–‹้ ญๆŒ‡ๆจ™ๅˆ†้›ข่‡ช "
+
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr "ๆ–ฐๅขžๆช”ๆกˆๅ…งๅฎน่‡ณ็ดขๅผ•"
+
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "ๅฅ—็”จไฟก็ฎฑๆ ผๅผ็š„็ณปๅˆ—ไฟฎ่ฃœๆช”"
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "ไฝฟ็”จๆไบค่จŠๆฏๅ‚™่จปๆช”ๆกˆ่กŒ"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "ๅฅ—็”จไธ€ๅ€‹ไฟฎ่ฃœๆช”ๅˆฐๆช”ๆกˆๅ’Œ/ๆˆ–็ดขๅผ•ๅ€"
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr "ๅฐ‡ไธ€ๅ€‹ GNU Arch ็‰ˆๆœฌๅบซๅŒฏๅ…ฅๅˆฐ Git"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "ๅŸบๆ–ผๅ‘ฝๅ้Ž็š„ๆจนๅปบ็ซ‹ๆช”ๆกˆๅฐๅญ˜"
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "้€้ŽไบŒๅˆ†ๅฐ‹ๆ‰พๅฎšไฝๅผ•ๅ…ฅ bug ็š„ๆไบค"
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr "้กฏ็คบๆช”ๆกˆๆฏไธ€่กŒๆœ€ๅพŒไฟฎๆ”น็š„็‰ˆๆœฌๅ’Œไฟฎๆ”น่€…"
+
+#: command-list.h:58
+msgid "List, create, or delete branches"
+msgstr "ๅˆ—ๅ‡บใ€ๅปบ็ซ‹ๆˆ–ๅˆช้™คๅˆ†ๆ”ฏ"
+
+#: command-list.h:59
+msgid "Move objects and refs by archive"
+msgstr "้€้Žๆญธๆช”็งปๅ‹•็‰ฉไปถๅ’Œๅผ•็”จ"
+
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
+msgstr "ๆไพ›็‰ˆๆœฌๅบซ็‰ฉไปถ็š„ๅ…งๅฎนใ€้กžๅž‹ๆˆ–ๅคงๅฐ"
+
+#: command-list.h:61
+msgid "Display gitattributes information"
+msgstr "้กฏ็คบ gitattributes ่จŠๆฏ"
+
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
+msgstr "้™ค้Œฏ gitignore / exclude ๆช”ๆกˆ"
+
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
+msgstr "้กฏ็คบ่ฏ็ตกไบบ็š„่ฆ็ฏ„ๅ็จฑๅ’Œ้›ปๅญไฟกไปถ"
+
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
+msgstr "ๅˆ‡ๆ›ๅˆ†ๆ”ฏๆˆ–ๅพฉๅŽŸๅทฅไฝœๅ€ๆช”ๆกˆ"
+
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
+msgstr "ๅพž็ดขๅผ•่ค‡่ฃฝๆช”ๆกˆๅˆฐๅทฅไฝœๅ€"
+
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
+msgstr "็ขบไฟๅผ•็”จๅ็จฑๆ ผๅผๆญฃ็ขบ"
+
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
+msgstr "ๅฐ‹ๆ‰พๅฐšๆœชๅฅ—็”จๅˆฐไธŠๆธธ็š„ๆไบค"
+
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
+msgstr "ๆ‡‰็”จไธ€ไบ›็พๅญ˜ๆไบคๅผ•ๅ…ฅ็š„ไฟฎๆ”น"
+
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
+msgstr "git-commit ็š„ๅœ–ๅฝขๆ›ฟไปฃไป‹้ข"
+
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
+msgstr "ๅพžๅทฅไฝœๅ€ไธญๅˆช้™คๆœช่ฟฝ่นคๆช”ๆกˆ"
+
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
+msgstr "่ค‡่ฃฝ็‰ˆๆœฌๅบซๅˆฐไธ€ๅ€‹ๆ–ฐ็›ฎ้Œ„"
+
+#: command-list.h:72
+msgid "Display data in columns"
+msgstr "ไปฅๅˆ—็š„ๆ–นๅผ้กฏ็คบ่ณ‡ๆ–™"
+
+#: command-list.h:73
+msgid "Record changes to the repository"
+msgstr "่จ˜้Œ„่ฎŠๆ›ดๅˆฐ็‰ˆๆœฌๅบซ"
+
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
+msgstr "ๅฏซๅ…ฅๅ’Œ้ฉ—่ญ‰ Git ๆไบคๅœ–ๆช”ๆกˆ"
+
+#: command-list.h:75
+msgid "Create a new commit object"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹ๆ–ฐ็š„ๆไบค็‰ฉไปถ"
+
+#: command-list.h:76
+msgid "Get and set repository or global options"
+msgstr "ๅ–ๅพ—ๅ’Œ่จญๅฎš็‰ˆๆœฌๅบซๆˆ–่€…ๅ…จๅŸŸ้ธ้ …"
+
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "่จˆ็ฎ—ๆœชๆ‰“ๅŒ…็‰ฉไปถ็š„ๆ•ธ้‡ๅ’Œ็ฃ็ขŸ็ฉบ้–“ๅ ็”จ"
+
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
+msgstr "ๆชข็ดขๅ’Œๅ„ฒๅญ˜ไฝฟ็”จ่€…ๅฏ†็ขผ"
+
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
+msgstr "ๅœจ่จ˜ๆ†ถ้ซ”ไธญๆšซๆ™‚ๅ„ฒๅญ˜ๅฏ†็ขผ็š„ๅŠฉๆ‰‹"
+
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
+msgstr "ๅœจ็ฃ็ขŸๅ„ฒๅญ˜ๅฏ†็ขผ็š„ๅŠฉๆ‰‹"
+
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
+msgstr "ๅฐ‡ไธ€ๅ€‹ๆไบคๅŒฏๅ‡บๅˆฐ CVS ็ฐฝๅ‡บไธญ"
+
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "ๅพžๅฆๅค–ไธ€ๅ€‹ไบบๅ€‘ๆ„›ๆจ็š„่จญๅฎš็ฎก็†็ณป็ตฑไธญๆ‹ฏๆ•‘ไฝ ็š„่ณ‡ๆ–™"
+
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
+msgstr "Git ็š„ไธ€ๅ€‹ CVS ๆœๅ‹™ๆจกๆ“ฌๅ™จ"
+
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
+msgstr "ไธ€ๅ€‹้žๅธธ็ฐกๅ–ฎ็š„ Git ็‰ˆๆœฌๅบซไผบๆœๅ™จ"
+
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
+msgstr "ๅŸบๆ–ผไธ€ๅ€‹็พๅญ˜็š„ๅผ•็”จ็‚บไธ€ๅ€‹็‰ฉไปถ่ตทไธ€ๅ€‹ๅฏ่ฎ€็š„ๅ็จฑ"
+
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "้กฏ็คบๆไบคไน‹้–“ใ€ๆไบคๅ’Œๅทฅไฝœๅ€ไน‹้–“็ญ‰็š„ๅทฎ็•ฐ"
+
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
+msgstr "ๆฏ”่ผƒๅทฅไฝœๅ€ๅ’Œ็ดขๅผ•ๅ€ไธญ็š„ๆช”ๆกˆ"
+
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
+msgstr "ๅฐ‡ไธ€ๅ€‹ๆจนๅ’Œๅทฅไฝœๅ€ๆˆ–็ดขๅผ•ๅšๆฏ”่ผƒ"
+
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr "ๆฏ”่ผƒๅ…ฉๅ€‹ๆจน็‹€็‰ฉไปถ็š„ๆช”ๆกˆๅ…งๅฎนๅ’Œๆจกๅผ"
+
+#: command-list.h:90
+msgid "Show changes using common diff tools"
+msgstr "ไฝฟ็”จๅธธ่ฆ‹็š„ๅทฎ็•ฐๅทฅๅ…ท้กฏ็คบๆ›ดๆ”น"
+
+#: command-list.h:91
+msgid "Git data exporter"
+msgstr "Git ่ณ‡ๆ–™ๅŒฏๅ‡บๅ™จ"
+
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
+msgstr "Git ๅฟซ้€Ÿ่ณ‡ๆ–™ๅŒฏๅ…ฅๅ™จๅพŒ็ซฏ"
+
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
+msgstr "ๅพžๅฆๅค–ไธ€ๅ€‹็‰ˆๆœฌๅบซไธ‹่ผ‰็‰ฉไปถๅ’Œๅผ•็”จ"
+
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
+msgstr "ๅพžๅฆไธ€ๅ€‹็‰ˆๆœฌๅบซๅ–ๅพ—็ผบๅฐ‘็š„็‰ฉไปถ"
+
+#: command-list.h:95
+msgid "Rewrite branches"
+msgstr "้‡ๅฏซๅˆ†ๆ”ฏ"
+
+#: command-list.h:96
+msgid "Produce a merge commit message"
+msgstr "็”Ÿๆˆไธ€ๅ€‹ๅˆไฝตๆไบค่จŠๆฏ"
+
+#: command-list.h:97
+msgid "Output information on each ref"
+msgstr "ๅฐๆฏไธ€ๅ€‹ๅผ•็”จ่ผธๅ‡บ่จŠๆฏ "
+
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
+msgstr "ๆบ–ๅ‚™้›ปๅญไฟกไปถๆไบค็š„ไฟฎ่ฃœๆช”"
+
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "้ฉ—่ญ‰็‰ˆๆœฌๅบซไธญ็‰ฉไปถ็š„้€ฃ้€šๆ€งๅ’Œๆœ‰ๆ•ˆๆ€ง"
+
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "ๆธ…้™คไธๅฟ…่ฆ็š„ๆช”ๆกˆๅ’Œๆœ€ไฝณๅŒ–ๆœฌๆฉŸ็‰ˆๆœฌๅบซ"
+
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "ๅพž git-archive ๅปบ็ซ‹็š„ๆญธๆช”ๆช”ๆกˆไธญๆ“ทๅ–ๆไบค ID"
+
+#: command-list.h:102
+msgid "Print lines matching a pattern"
+msgstr "่ผธๅ‡บๅ’Œๆจกๅผ็ฌฆๅˆ็š„่กŒ"
+
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
+msgstr "ไธ€ๅ€‹ไพฟๆ”œ็š„ Git ๅœ–ๅฝข็”จๆˆถ็ซฏ"
+
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "ๅพžไธ€ๅ€‹ๆช”ๆกˆ่จˆ็ฎ—็‰ฉไปถ ID๏ผŒไธฆๅฏไปฅๅปบ็ซ‹ blob ่ณ‡ๆ–™็‰ฉไปถ"
+
+#: command-list.h:105
+msgid "Display help information about Git"
+msgstr "้กฏ็คบ Git ็š„่ชชๆ˜Ž่จŠๆฏ"
+
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
+msgstr "Git HTTP ๅ”ๅฎš็š„ๆœๅ‹™็ซฏๅฏฆ็พ"
+
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
+msgstr "้€š้Ž HTTP ๅพž้ ็ซฏ Git ็‰ˆๆœฌๅบซไธ‹่ผ‰"
+
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "้€š้Ž HTTP/DAV ๆŽจ้€็‰ฉไปถๅฆไธ€ๅ€‹็‰ˆๆœฌๅบซ"
+
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "ๅพžๆจ™ๆบ–่ผธๅ…ฅๅฐ‡ไธ€็ต„ไฟฎ่ฃœๆช”ๅ‚ณ้€ๅˆฐIMAP่ณ‡ๆ–™ๅคพ"
+
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
+msgstr "ๅพžไธ€ๅ€‹็พๅญ˜็š„ๅŒ…ๅญ˜ๆช”ๆช”ๆกˆๅปบ็ซ‹ๅŒ…็ดขๅผ•"
+
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹็ฉบ็š„ Git ็‰ˆๆœฌๅบซๆˆ–้‡ๆ–ฐๅˆๅง‹ๅŒ–ไธ€ๅ€‹ๅทฒๅญ˜ๅœจ็š„็‰ˆๆœฌๅบซ"
+
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
+msgstr "ๅœจ gitweb ไธญๅณๆ™‚็€่ฆฝๆ‚จ็š„ๅทฅไฝœ็‰ˆๆœฌๅบซ"
+
+#: command-list.h:113
+msgid "Add or parse structured information in commit messages"
+msgstr "ๆ–ฐๅขžๆˆ–่งฃๆžๆไบค่ชชๆ˜Žไธญ็š„็ตๆง‹ๅŒ–่จŠๆฏ"
+
+#: command-list.h:114
+msgid "The Git repository browser"
+msgstr "Git ็‰ˆๆœฌๅบซ็€่ฆฝๅ™จ"
+
+#: command-list.h:115
+msgid "Show commit logs"
+msgstr "้กฏ็คบๆไบคๆ—ฅ่ชŒ"
+
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
+msgstr "้กฏ็คบ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๆช”ๆกˆ็š„่จŠๆฏ"
+
+#: command-list.h:117
+msgid "List references in a remote repository"
+msgstr "้กฏ็คบไธ€ๅ€‹้ ็ซฏ็‰ˆๆœฌๅบซ็š„ๅผ•็”จ"
+
+#: command-list.h:118
+msgid "List the contents of a tree object"
+msgstr "้กฏ็คบไธ€ๅ€‹ๆจน็‹€็‰ฉไปถ็š„ๅ…งๅฎน"
+
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "ๅพžๅ–ฎๅ€‹้›ปๅญไฟกไปถไธญๆ“ทๅ–ไฟฎ่ฃœๆช”ๅ’Œไฝœ่€…่บซไปฝ"
+
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
+msgstr "็ฐกๅ–ฎ็š„ UNIX mbox ไฟก็ฎฑๅˆ‡ๅˆ†็จ‹ๅผ"
+
+#: command-list.h:121
+msgid "Join two or more development histories together"
+msgstr "ๅˆไฝตๅ…ฉๅ€‹ๆˆ–ๆ›ดๅคš้–‹็™ผๆญทๅฒ"
+
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "็‚บไบ†ๅˆไฝตๅฐ‹ๆ‰พๅ„˜ๅฏ่ƒฝๅฅฝ็š„ๅ…ฌๅ…ฑ็ฅ–ๅ…ˆๆไบค"
+
+#: command-list.h:123
+msgid "Run a three-way file merge"
+msgstr "ๅŸท่กŒไธ€ๅ€‹ไธ‰่ทฏๆช”ๆกˆๅˆไฝต"
+
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
+msgstr "ๅฐๆ–ผ้œ€่ฆๅˆไฝต็š„ๆช”ๆกˆๅŸท่กŒๅˆไฝต"
+
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
+msgstr "่ˆ‡ git-merge-index ไธ€่ตทไฝฟ็”จ็š„ๆจ™ๆบ–ๅšฎๅฐŽ็จ‹ๅผ"
+
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr "ๅŸท่กŒๅˆไฝต่ก็ช่งฃๆฑบๅทฅๅ…ทไปฅ่งฃๆฑบๅˆไฝต่ก็ช"
+
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
+msgstr "้กฏ็คบไธ‰่ทฏๅˆไฝต่€Œไธๅ‹•็ดขๅผ•"
+
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
+msgstr "ๅฏซๅ…ฅๅ’Œ้ฉ—่ญ‰ๅคšๅŒ…็ดขๅผ•"
+
+#: command-list.h:129
+msgid "Creates a tag object"
+msgstr "ๅปบ็ซ‹ไธ€ๅ€‹ๆจ™็ฑค็‰ฉไปถ"
+
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "ๅŸบๆ–ผ ls-tree ็š„ๆ ผๅผๅŒ–ๆ–‡ๅญ—ๅปบ็ซ‹ไธ€ๅ€‹ๆจน็‹€็‰ฉไปถ"
+
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "็งปๅ‹•ๆˆ–้‡ๆ–ฐๅ‘ฝๅไธ€ๅ€‹ๆช”ๆกˆใ€็›ฎ้Œ„ๆˆ–็ฌฆ่™Ÿ้€ฃ็ต"
+
+# ๅฐ‹ๆ‰พๆไพ›็‰ˆๆœฌ็š„็ฌฆ่™Ÿๅ็จฑ
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
+msgstr "ๅฐ‹ๆ‰พๆไพ›็‰ˆๆœฌ็š„็ฌฆ่™Ÿๅ็จฑ"
+
+#: command-list.h:133
+msgid "Add or inspect object notes"
+msgstr "ๆ–ฐๅขžๆˆ–ๆชขๆŸฅ็‰ฉไปถๅ‚™่จป"
+
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
+msgstr "ๅŒฏๅ…ฅๅ’Œๆไบคๅˆฐ Perforce ็‰ˆๆœฌๅบซไธญ"
+
+#: command-list.h:135
+msgid "Create a packed archive of objects"
+msgstr "ๅปบ็ซ‹็‰ฉไปถ็š„ๅญ˜ๆช”ๅŒ…"
+
+#: command-list.h:136
+msgid "Find redundant pack files"
+msgstr "ๅฐ‹ๆ‰พๅ†—้ค˜็š„ๅŒ…ๆช”ๆกˆ"
+
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
+msgstr "ๆ‰“ๅŒ…้ ญๅ’Œๆจ™็ฑคไปฅๅฏฆ็พ้ซ˜ๆ•ˆ็š„็‰ˆๆœฌๅบซๅญ˜ๅ–"
+
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
+msgstr "ๅ”ๅŠฉ่งฃๆž้ ็ซฏ็‰ˆๆœฌๅบซๅญ˜ๅ–ๅƒๆ•ธ็š„ไพ‹็จ‹"
+
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
+msgstr "่จˆ็ฎ—ไธ€ๅ€‹ไฟฎ่ฃœๆช”็š„ๅ”ฏไธ€ ID"
+
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
+msgstr "ๅˆช้™ค็‰ฉไปถๅบซไธญๆ‰€ๆœ‰็„กๆณ•ๅ–ๅพ—็‰ฉไปถ"
+
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
+msgstr "ๅˆช้™คๅทฒ็ถ“ๅœจๅŒ…ๆช”ๆกˆไธญ็š„ๅคš้ค˜็‰ฉไปถ"
+
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "ๅ–ๅพ—ไธฆๆ•ดๅˆๅฆๅค–็š„็‰ˆๆœฌๅบซๆˆ–ไธ€ๅ€‹ๆœฌๆฉŸๅˆ†ๆ”ฏ"
+
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
+msgstr "ๆ›ดๆ–ฐ้ ็ซฏๅผ•็”จๅ’Œ็›ธ้—œ็š„็‰ฉไปถ"
+
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "ๅฐ‡ไธ€ๅ€‹ quilt ไฟฎ่ฃœๆช”้›†ๅฅ—็”จๅˆฐ็›ฎๅ‰ๅˆ†ๆ”ฏใ€‚"
+
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "ๆฏ”่ผƒๅ…ฉๅ€‹ๆไบค็ฏ„ๅœ๏ผˆๅฆ‚ไธ€ๅ€‹ๅˆ†ๆ”ฏ็š„ๅ…ฉๅ€‹็‰ˆๆœฌ๏ผ‰"
+
+#: command-list.h:146
+msgid "Reads tree information into the index"
+msgstr "ๅฐ‡ๆจน่จŠๆฏ่ฎ€ๅ–ๅˆฐ็ดขๅผ•"
+
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
+msgstr "ๅœจๅฆไธ€ๅ€‹ๅˆ†ๆ”ฏไธŠ้‡ๆ–ฐๆ‡‰็”จๆไบค"
+
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
+msgstr "ๆŽฅๆ”ถๆŽจ้€ๅˆฐ็‰ˆๆœฌๅบซไธญ็š„็‰ฉไปถ"
+
+#: command-list.h:149
+msgid "Manage reflog information"
+msgstr "็ฎก็† reflog ่จŠๆฏ"
+
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
+msgstr "็ฎก็†ๅทฒ่ฟฝ่นค็‰ˆๆœฌๅบซ"
+
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
+msgstr "ๆ‰“ๅŒ…็‰ˆๆœฌๅบซไธญๆœชๆ‰“ๅŒ…็‰ฉไปถ"
+
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
+msgstr "ๅปบ็ซ‹ใ€ๅˆ—ๅ‡บใ€ๅˆช้™ค็‰ฉไปถๅ–ไปฃๅผ•็”จ"
+
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
+msgstr "็”Ÿๆˆๅพ…ๅฎšๆ›ดๆ”น็š„ๆ‘˜่ฆ"
+
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "้‡็”จ่ก็ชๅˆไฝต็š„่งฃๆฑบๆ–นๆกˆ่จ˜้Œ„"
+
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
+msgstr "้‡่จญ็›ฎๅ‰ HEAD ๅˆฐๆŒ‡ๅฎš็‹€ๆ…‹"
+
+#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "ๅพฉๅŽŸๅทฅไฝœๅ€ๆช”ๆกˆ"
+
+#: command-list.h:157
+msgid "Revert some existing commits"
+msgstr "้‚„ๅŽŸไธ€ไบ›็พๅญ˜ๆไบค"
+
+#: command-list.h:158
+msgid "Lists commit objects in reverse chronological order"
+msgstr "ๆŒ‰ๆ™‚้–“้ †ๅบๅˆ—ๅ‡บๆไบค็‰ฉไปถ"
+
+#: command-list.h:159
+msgid "Pick out and massage parameters"
+msgstr "้ธๅ‡บไธฆ่™•็†ๅƒๆ•ธ"
+
+#: command-list.h:160
+msgid "Remove files from the working tree and from the index"
+msgstr "ๅพžๅทฅไฝœๅ€ๅ’Œ็ดขๅผ•ไธญๅˆช้™คๆช”ๆกˆ"
+
+#: command-list.h:161
+msgid "Send a collection of patches as emails"
+msgstr "้€้Ž้›ปๅญไฟกไปถๅ‚ณ้€ไธ€็ต„ไฟฎ่ฃœๆช”"
+
+#: command-list.h:162
+msgid "Push objects over Git protocol to another repository"
+msgstr "ไฝฟ็”จ Git ๅ”ๅฎšๆŽจ้€็‰ฉไปถๅˆฐๅฆไธ€ๅ€‹็‰ˆๆœฌๅบซ"
+
+#: command-list.h:163
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "ๅชๅ…่จฑ Git SSH ๅญ˜ๅ–็š„ๅ—้™็™ปๅ…ฅshell"
+
+#: command-list.h:164
+msgid "Summarize 'git log' output"
+msgstr "'git log' ่ผธๅ‡บๆ‘˜่ฆ"
+
+#: command-list.h:165
+msgid "Show various types of objects"
+msgstr "้กฏ็คบๅ„็จฎ้กžๅž‹็š„็‰ฉไปถ"
+
+#: command-list.h:166
+msgid "Show branches and their commits"
+msgstr "้กฏ็คบๅˆ†ๆ”ฏๅ’Œๆไบค"
+
+#: command-list.h:167
+msgid "Show packed archive index"
+msgstr "้กฏ็คบๆ‰“ๅŒ…ๆญธๆช”็ดขๅผ•"
+
+#: command-list.h:168
+msgid "List references in a local repository"
+msgstr "้กฏ็คบๆœฌๆฉŸ็‰ˆๆœฌๅบซไธญ็š„ๅผ•็”จ"
+
+#: command-list.h:169
+msgid "Git's i18n setup code for shell scripts"
+msgstr "็‚บ shell ่…ณๆœฌๆบ–ๅ‚™็š„ Git ๅœ‹้š›ๅŒ–่จญๅฎš็จ‹ๅผ็ขผ"
+
+#: command-list.h:170
+msgid "Common Git shell script setup code"
+msgstr "ๅธธ็”จ็š„ Git shell ่…ณๆœฌ่จญๅฎš็จ‹ๅผ็ขผ"
+
+#: command-list.h:171
+msgid "Initialize and modify the sparse-checkout"
+msgstr "ๅˆๅง‹ๅŒ–ไธฆไฟฎๆ”น็จ€็–็ฐฝๅ‡บ"
+
+#: command-list.h:172
+msgid "Stash the changes in a dirty working directory away"
+msgstr "ๅ„ฒ่—้ซ’ๅทฅไฝœๅ€ไธญ็š„ไฟฎๆ”น"
+
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "ๅฐ‡ๆช”ๆกˆๅ…งๅฎนๆ–ฐๅขžๅˆฐ็ดขๅผ•"
+
+#: command-list.h:174
+msgid "Show the working tree status"
+msgstr "้กฏ็คบๅทฅไฝœๅ€็‹€ๆ…‹"
+
+#: command-list.h:175
+msgid "Remove unnecessary whitespace"
+msgstr "ๅˆช้™คไธๅฟ…่ฆ็š„็ฉบ็™ฝๅญ—ๅ…ƒ"
+
+#: command-list.h:176
+msgid "Initialize, update or inspect submodules"
+msgstr "ๅˆๅง‹ๅŒ–ใ€ๆ›ดๆ–ฐๆˆ–ๆชขๆŸฅๅญๆจก็ต„"
+
+#: command-list.h:177
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Subversion ็‰ˆๆœฌๅบซๅ’Œ Git ไน‹้–“็š„้›™ๅ‘ๅ‹•ไฝœ"
+
+#: command-list.h:178
+msgid "Switch branches"
+msgstr "ๅˆ‡ๆ›ๅˆ†ๆ”ฏ"
+
+#: command-list.h:179
+msgid "Read, modify and delete symbolic refs"
+msgstr "่ฎ€ๅ–ใ€ไฟฎๆ”นๅ’Œๅˆช้™ค็ฌฆ่™Ÿๅผ•็”จ"
+
+#: command-list.h:180
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "ๅปบ็ซ‹ใ€ๅˆ—ๅ‡บใ€ๅˆช้™คๆˆ–้ฉ—่ญ‰ไธ€ๅ€‹ GPG ็ฐฝๅ็š„ๆจ™็ฑค็‰ฉไปถ"
+
+#: command-list.h:181
+msgid "Creates a temporary file with a blob's contents"
+msgstr "็”จ blob ่ณ‡ๆ–™็‰ฉไปถ็š„ๅ…งๅฎนๅปบ็ซ‹ไธ€ๅ€‹ๆšซๅญ˜ๆช”"
+
+#: command-list.h:182
+msgid "Unpack objects from a packed archive"
+msgstr "ๅพžๆ‰“ๅŒ…ๆช”ๆกˆไธญ่งฃๅฃ“็ธฎ็‰ฉไปถ"
+
+#: command-list.h:183
+msgid "Register file contents in the working tree to the index"
+msgstr "ๅฐ‡ๅทฅไฝœๅ€็š„ๆช”ๆกˆๅ…งๅฎน่จปๅ†Šๅˆฐ็ดขๅผ•"
+
+#: command-list.h:184
+msgid "Update the object name stored in a ref safely"
+msgstr "ๅฎ‰ๅ…จๅœฐๆ›ดๆ–ฐๅ„ฒๅญ˜ๆ–ผๅผ•็”จไธญ็š„็‰ฉไปถๅ็จฑ"
+
+#: command-list.h:185
+msgid "Update auxiliary info file to help dumb servers"
+msgstr "ๆ›ดๆ–ฐ่ผ”ๅŠฉ่จŠๆฏๆช”ๆกˆไปฅๅ”ๅŠฉๅ•žๅ”ๅฎšๆœๅ‹™"
+
+#: command-list.h:186
+msgid "Send archive back to git-archive"
+msgstr "ๅฐ‡ๅญ˜ๆช”ๅ‚ณ้€ๅ›ž git-archive"
+
+#: command-list.h:187
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "ๅฐ‡็‰ฉไปถๅฃ“็ธฎๅŒ…ๅ‚ณ้€ๅ›ž git-fetch-pack"
+
+#: command-list.h:188
+msgid "Show a Git logical variable"
+msgstr "้กฏ็คบ Git ้‚่ผฏ่ฎŠๆ•ธ"
+
+#: command-list.h:189
+msgid "Check the GPG signature of commits"
+msgstr "ๆชขๆŸฅ GPG ๆไบค็ฐฝๅ"
+
+#: command-list.h:190
+msgid "Validate packed Git archive files"
+msgstr "้ฉ—่ญ‰ๆ‰“ๅŒ…็š„ Git ๅฐๅญ˜ๆช”ๆกˆ"
+
+#: command-list.h:191
+msgid "Check the GPG signature of tags"
+msgstr "ๆชขๆŸฅๆจ™็ฑค็š„ GPG ็ฐฝๅ"
+
+#: command-list.h:192
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web ไป‹้ข๏ผˆGit ็‰ˆๆœฌๅบซ็š„ web ๅ‰็ซฏ๏ผ‰"
+
+#: command-list.h:193
+msgid "Show logs with difference each commit introduces"
+msgstr "้กฏ็คบๆฏไธ€ๅ€‹ๆไบคๅผ•ๅ…ฅ็š„ๅทฎ็•ฐๆ—ฅ่ชŒ"
+
+#: command-list.h:194
+msgid "Manage multiple working trees"
+msgstr "็ฎก็†ๅคšๅ€‹ๅทฅไฝœๅ€"
+
+#: command-list.h:195
+msgid "Create a tree object from the current index"
+msgstr "ๅพž็›ฎๅ‰็ดขๅผ•ๅปบ็ซ‹ไธ€ๅ€‹ๆจน็‹€็‰ฉไปถ"
+
+#: command-list.h:196
+msgid "Defining attributes per path"
+msgstr "ๅฎš็พฉ่ทฏๅพ‘็š„ๅฑฌๆ€ง"
+
+#: command-list.h:197
+msgid "Git command-line interface and conventions"
+msgstr "Git ๆŒ‡ไปคๅˆ—ไป‹้ขๅ’Œ็ด„ๅฎš"
+
+#: command-list.h:198
+msgid "A Git core tutorial for developers"
+msgstr "้ขๅ‘้–‹็™ผไบบๅ“ก็š„ Git ๆ ธๅฟƒๆ•™ๅญธ"
+
+#: command-list.h:199
+msgid "Git for CVS users"
+msgstr "้ฉๅˆ CVS ไฝฟ็”จ่€…็š„ Git ๅ”ๅŠฉ"
+
+#: command-list.h:200
+msgid "Tweaking diff output"
+msgstr "่ชฟๆ•ดๅทฎ็•ฐ่ผธๅ‡บ"
+
+#: command-list.h:201
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "ๆฏไธ€ๅคฉ Git ็š„ไธ€็ต„ๆœ‰็”จ็š„ๆœ€ๅฐๆŒ‡ไปค้›†ๅˆ"
+
+#: command-list.h:202
+msgid "A Git Glossary"
+msgstr "Git ่ฉžๅฝ™่กจ"
+
+#: command-list.h:203
+msgid "Hooks used by Git"
+msgstr "Git ไฝฟ็”จ็š„ๆŽ›้‰ค"
+
+#: command-list.h:204
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "ๅฟฝ็•ฅๆŒ‡ๅฎš็š„ๆœช่ฟฝ่นคๆช”ๆกˆ"
+
+#: command-list.h:205
+msgid "Defining submodule properties"
+msgstr "ๅฎš็พฉๅญๆจก็ต„ๅฑฌๆ€ง"
+
+#: command-list.h:206
+msgid "Git namespaces"
+msgstr "Git ๅๅญ—็ฉบ้–“"
+
+#: command-list.h:207
+msgid "Git Repository Layout"
+msgstr "Git ็‰ˆๆœฌๅบซ้…็ฝฎ"
+
+#: command-list.h:208
+msgid "Specifying revisions and ranges for Git"
+msgstr "ๆŒ‡ๅฎš Git ็š„็‰ˆๆœฌๅ’Œ็‰ˆๆœฌ็ฏ„ๅœ"
+
+#: command-list.h:209
+msgid "Mounting one repository inside another"
+msgstr "ๅœจๆŸๅ€‹็‰ˆๆœฌๅบซๆŽ›่ผ‰ๆŸๅ€‹็‰ˆๆœฌๅบซ"
+
+#: command-list.h:210
+msgid "A tutorial introduction to Git: part two"
+msgstr "ไธ€ๅ€‹ Git ๆ•™ๅญธ๏ผš็ฌฌไบŒ้ƒจๅˆ†"
+
+#: command-list.h:211
+msgid "A tutorial introduction to Git"
+msgstr "ไธ€ๅ€‹ Git ๆ•™ๅญธ"
+
+#: command-list.h:212
+msgid "An overview of recommended workflows with Git"
+msgstr "Git ๆŽจ่–ฆ็š„ๅทฅไฝœๆตๆฆ‚่ฆฝ"
+
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
+msgstr "ๆ‚จ้œ€่ฆๅŸท่กŒ \"git bisect start\" ไพ†้–‹ๅง‹"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅฅๅฐพ็ฉบๆ ผ
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "ๆ‚จๆƒณ่ฎ“ๆˆ‘็‚บๆ‚จ้€™ๆจฃๅšๅ—Ž[Y/n]๏ผŸ "
+
+#: git-bisect.sh:101
+#, sh-format
+msgid "Bad rev input: $arg"
+msgstr "ๅฃž็š„่ผธๅ…ฅ็‰ˆๆœฌ๏ผš$arg"
+
+#: git-bisect.sh:121
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "ๅฃž็š„่ผธๅ…ฅ็‰ˆๆœฌ๏ผš$bisected_head"
+
+#: git-bisect.sh:130
+#, sh-format
+msgid "Bad rev input: $rev"
+msgstr "ๅฃž็š„่ผธๅ…ฅ็‰ˆๆœฌ๏ผš$rev"
+
+#: git-bisect.sh:139
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "'git bisect $TERM_BAD' ๅช่ƒฝๅธถไธ€ๅ€‹ๅƒๆ•ธใ€‚"
+
+#: git-bisect.sh:209
+msgid "No logfile given"
+msgstr "ๆœชๆไพ›ๆ—ฅ่ชŒๆช”ๆกˆ"
+
+#: git-bisect.sh:210
+#, sh-format
+msgid "cannot read $file for replaying"
+msgstr "ไธ่ƒฝ่ฎ€ๅ– $file ไพ†้‡ๆ”พ"
+
+#: git-bisect.sh:232
+msgid "?? what are you talking about?"
+msgstr "?? ๆ‚จๅœจ่ชชไป€้บผ?"
+
+#: git-bisect.sh:241
+msgid "bisect run failed: no command provided."
+msgstr "ไบŒๅˆ†ๅฐ‹ๆ‰พๅŸท่กŒๅคฑๆ•—๏ผšๆฒ’ๆœ‰ๆไพ›ๆŒ‡ไปคใ€‚"
+
+#: git-bisect.sh:246
+#, sh-format
+msgid "running $command"
+msgstr "ๅŸท่กŒ $command"
+
+#: git-bisect.sh:253
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+"ไบŒๅˆ†ๅฐ‹ๆ‰พๅŸท่กŒๅคฑๆ•—๏ผš\n"
+"ๆŒ‡ไปค '$command' ็š„้›ข้–‹็ขผ $res ๅฐๆ–ผ 0 ๆˆ–ๅคงๆ–ผ็ญ‰ๆ–ผ 128"
+
+#: git-bisect.sh:279
+msgid "bisect run cannot continue any more"
+msgstr "ไบŒๅˆ†ๅฐ‹ๆ‰พไธ่ƒฝ็นผ็บŒๅŸท่กŒ"
+
+#: git-bisect.sh:285
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
+msgstr ""
+"ไบŒๅˆ†ๅฐ‹ๆ‰พๅŸท่กŒๅคฑๆ•—๏ผš\n"
+"'bisect_state $state' ้›ข้–‹็ขผ็‚บ $res"
+
+#: git-bisect.sh:292
+msgid "bisect run success"
+msgstr "ไบŒๅˆ†ๅฐ‹ๆ‰พๅŸท่กŒๆˆๅŠŸ"
+
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "ๆˆ‘ๅ€‘ๆฒ’ๆœ‰ๅœจไบŒๅˆ†ๅฐ‹ๆ‰พใ€‚"
+
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr "้Œฏ่ชค๏ผšๆ‚จๅฐไธ‹ๅˆ—ๆช”ๆกˆ็š„ๆœฌๆฉŸไฟฎๆ”นๅฐ‡่ขซๅˆไฝตๅ‹•ไฝœ่ฆ†่“‹"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "่‡ชๅ‹•ๅˆไฝตๆœช็”Ÿๆ•ˆใ€‚"
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "ไธๆ‡‰่ฉฒๅŸท่กŒ็ซ ้ญšๅผๅˆไฝตใ€‚"
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "็„กๆณ•ๆ‰พๅˆฐๅ’Œ $pretty_name ็š„ๅŸบ็คŽๆไบค"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "ๅทฒ็ถ“ๅ’Œ $pretty_name ไฟๆŒไธ€่‡ด"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "ๅฟซ่ฝ‰่‡ณ๏ผš$pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "ๅ˜—่ฉฆๅ’Œ $pretty_name ็š„็ฐกๅ–ฎๅˆไฝต"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "็ฐกๅ–ฎๅˆไฝตๆœช็”Ÿๆ•ˆ๏ผŒๅ˜—่ฉฆ่‡ชๅ‹•ๅˆไฝตใ€‚"
+
+#: git-legacy-stash.sh:221
+msgid "Cannot remove temporary index (can't happen)"
+msgstr "็„กๆณ•ๅˆช้™คๆšซๆ™‚็ดขๅผ•๏ผˆไธๆ‡‰็™ผ็”Ÿ๏ผ‰"
+
+#: git-legacy-stash.sh:272
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "็„กๆณ•็”จ $w_commit ๆ›ดๆ–ฐ $ref_stash"
+
+#: git-legacy-stash.sh:324
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "้Œฏ่ชค๏ผš'stash push' ็š„ๆœช็Ÿฅ้ธ้ …๏ผš$option"
+
+#: git-legacy-stash.sh:356
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "ๅ„ฒๅญ˜ๅทฅไฝœ็›ฎ้Œ„ๅ’Œ็ดขๅผ•็‹€ๆ…‹ $stash_msg"
+
+#: git-legacy-stash.sh:536
+#, sh-format
+msgid "unknown option: $opt"
+msgstr "ๆœช็Ÿฅ้ธ้ …: $opt"
+
+#: git-legacy-stash.sh:556
+#, sh-format
+msgid "Too many revisions specified: $REV"
+msgstr "ๆŒ‡ๅฎšไบ†ๅคชๅคš็š„็‰ˆๆœฌ๏ผš$REV"
+
+#: git-legacy-stash.sh:571
+#, sh-format
+msgid "$reference is not a valid reference"
+msgstr "$reference ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ๅผ•็”จ"
+
+#: git-legacy-stash.sh:599
+#, sh-format
+msgid "'$args' is not a stash-like commit"
+msgstr "'$args' ไธๆ˜ฏๅ„ฒ่—ๅผๆไบค"
+
+#: git-legacy-stash.sh:610
+#, sh-format
+msgid "'$args' is not a stash reference"
+msgstr "'$args' ไธๆ˜ฏไธ€ๅ€‹ๅ„ฒ่—ๅผ•็”จ"
+
+#: git-legacy-stash.sh:618
+msgid "unable to refresh index"
+msgstr "็„กๆณ•้‡ๆ–ฐๆ•ด็†็ดขๅผ•"
+
+#: git-legacy-stash.sh:622
+msgid "Cannot apply a stash in the middle of a merge"
+msgstr "็„กๆณ•ๅœจๅˆไฝต้Ž็จ‹ๅฅ—็”จๅ„ฒ่—"
+
+#: git-legacy-stash.sh:630
+msgid "Conflicts in index. Try without --index."
+msgstr "็ดขๅผ•ไธญๆœ‰่ก็ชใ€‚ๅ˜—่ฉฆไธไฝฟ็”จ --indexใ€‚"
+
+#: git-legacy-stash.sh:632
+msgid "Could not save index tree"
+msgstr "ไธ่ƒฝๅ„ฒๅญ˜็ดขๅผ•ๆจน"
+
+#: git-legacy-stash.sh:641
+msgid "Could not restore untracked files from stash entry"
+msgstr "็„กๆณ•ๅพžๅ„ฒ่—ๆข็›ฎไธญๅพฉๅŽŸๆœช่ฟฝ่นคๆช”ๆกˆ"
+
+#: git-legacy-stash.sh:666
+msgid "Cannot unstage modified files"
+msgstr "็„กๆณ•ๅฐ‡ไฟฎๆ”น็š„ๆช”ๆกˆๅ–ๆถˆๆšซๅญ˜"
+
+#: git-legacy-stash.sh:704
+#, sh-format
+msgid "Dropped ${REV} ($s)"
+msgstr "ๆจๆฃ„ไบ† ${REV} ($s)"
+
+#: git-legacy-stash.sh:705
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
+msgstr "${REV}๏ผš็„กๆณ•ๆจๆฃ„ๅ„ฒ่—ๆข็›ฎ"
+
+#: git-legacy-stash.sh:792
+msgid "(To restore them type \"git stash apply\")"
+msgstr "๏ผˆ็‚บๅพฉๅŽŸ่ณ‡ๆ–™่ผธๅ…ฅ \"git stash apply\"๏ผ‰"
+
+#: git-submodule.sh:203
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "ๅช่ƒฝๅœจๅทฅไฝœๅ€็š„้ ‚็ดš็›ฎ้Œ„ไธญไฝฟ็”จ็›ธๅฐ่ทฏๅพ‘"
+
+#: git-submodule.sh:213
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr "็‰ˆๆœฌๅบซ URL๏ผš'$repo' ๅฟ…้ ˆๆ˜ฏ็ต•ๅฐ่ทฏๅพ‘ๆˆ–ไปฅ ./|../ ่ตทๅง‹"
+
+#: git-submodule.sh:232
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr "'$sm_path' ๅทฒ็ถ“ๅญ˜ๅœจๆ–ผ็ดขๅผ•ไธญ"
+
+#: git-submodule.sh:235
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr "'$sm_path' ๅทฒ็ถ“ๅญ˜ๅœจๆ–ผ็ดขๅผ•ไธญไธ”ไธๆ˜ฏไธ€ๅ€‹ๅญๆจก็ต„"
+
+#: git-submodule.sh:242
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' ๆฒ’ๆœ‰็ฐฝๅ‡บ็š„ๆไบค"
+
+#: git-submodule.sh:273
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
+msgstr "ๆ–ฐๅขžไฝๆ–ผ '$sm_path' ็š„็พๅญ˜็‰ˆๆœฌๅบซๅˆฐ็ดขๅผ•"
+
+#: git-submodule.sh:275
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr "'$sm_path' ๅทฒๅญ˜ๅœจไธ”ไธๆ˜ฏไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ git ็‰ˆๆœฌๅบซ"
+
+#: git-submodule.sh:283
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr "ๆœฌๆฉŸ็™ผ็พ '$sm_name' ็š„ไธ€ๅ€‹ git ็›ฎ้Œ„๏ผŒ่ˆ‡ๅ…ถๅฐๆ‡‰็š„้ ็ซฏ็‰ˆๆœฌๅบซ๏ผš"
+
+#: git-submodule.sh:285
+#, sh-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+"  $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
+msgstr ""
+"ๅฆ‚ๆžœๆ‚จๆƒณ่ฆ้‡็”จ้€™ๅ€‹ๆœฌๆฉŸ git ็›ฎ้Œ„่€Œ้ž้‡ๆ–ฐ่ค‡่ฃฝ่‡ช\n"
+"  $realrepo\n"
+"ไฝฟ็”จ '--force' ้ธ้ …ใ€‚ๅฆ‚ๆžœๆœฌๆฉŸ git ็›ฎ้Œ„ไธๆ˜ฏๆญฃ็ขบ็š„็‰ˆๆœฌๅบซ\n"
+"ๆˆ–่€…ๆ‚จไธ็ขบๅฎš้€™่ฃก็š„ๅซ็พฉ๏ผŒไฝฟ็”จ '--name' ้ธ้ …้ธๆ“‡ๅฆๅค–็š„ๅ็จฑใ€‚"
+
+#: git-submodule.sh:291
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr "ๅ•Ÿๅ‹•ๆœฌๆฉŸ git ็›ฎ้Œ„ๅˆฐๅญๆจก็ต„ '$sm_name'ใ€‚"
+
+#: git-submodule.sh:303
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr "ไธ่ƒฝ็ฐฝๅ‡บๅญๆจก็ต„ '$sm_path'"
+
+#: git-submodule.sh:308
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "็„กๆณ•ๆ–ฐๅขžๅญๆจก็ต„ '$sm_path'"
+
+#: git-submodule.sh:317
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "็„กๆณ•่จปๅ†Šๅญๆจก็ต„ '$sm_path'"
+
+#: git-submodule.sh:590
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "็„กๆณ•ๅœจๅญๆจก็ต„่ทฏๅพ‘ '$displaypath' ไธญๆ‰พๅˆฐ็›ฎๅ‰็‰ˆๆœฌ"
+
+#: git-submodule.sh:600
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr "็„กๆณ•ๅœจๅญๆจก็ต„่ทฏๅพ‘ '$sm_path' ไธญๅ–ๅพ—"
+
+#: git-submodule.sh:605
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr "็„กๆณ•ๅœจๅญๆจก็ต„่ทฏๅพ‘ '$sm_path' ไธญๆ‰พๅˆฐ็›ฎๅ‰็‰ˆๆœฌ ${remote_name}/${branch}"
+
+#: git-submodule.sh:623
+#, sh-format
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr "็„กๆณ•ๅœจๅญๆจก็ต„่ทฏๅพ‘ '$displaypath' ไธญๅ–ๅพ—๏ผŒๅ˜—่ฉฆ็›ดๆŽฅๅ–ๅพ— $sha1๏ผš"
+
+#: git-submodule.sh:629
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"ๅ–ๅพ—ไบ†ๅญๆจก็ต„่ทฏๅพ‘ '$displaypath'๏ผŒไฝ†ๆ˜ฏๅฎƒๆฒ’ๆœ‰ๅŒ…ๅซ $sha1ใ€‚็›ดๆŽฅๅ–ๅพ—่ฉฒๆไบคๅคฑๆ•—ใ€‚"
+
+#: git-submodule.sh:636
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "็„กๆณ•ๅœจๅญๆจก็ต„่ทฏๅพ‘ '$displaypath' ไธญ็ฐฝๅ‡บ '$sha1'"
+
+#: git-submodule.sh:637
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "ๅญๆจก็ต„่ทฏๅพ‘ '$displaypath'๏ผš็ฐฝๅ‡บ '$sha1'"
+
+#: git-submodule.sh:641
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "็„กๆณ•ๅœจๅญๆจก็ต„่ทฏๅพ‘ '$displaypath' ไธญ้‡ๅฎšๅŸบๅบ• '$sha1'"
+
+#: git-submodule.sh:642
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "ๅญๆจก็ต„่ทฏๅพ‘ '$displaypath'๏ผš้‡ๅฎšๅŸบๅบ•่‡ณ '$sha1'"
+
+#: git-submodule.sh:647
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "็„กๆณ•ๅˆไฝต '$sha1' ๅˆฐๅญๆจก็ต„่ทฏๅพ‘ '$displaypath' ไธญ"
+
+#: git-submodule.sh:648
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "ๅญๆจก็ต„่ทฏๅพ‘ '$displaypath'๏ผšๅทฒๅˆไฝตๅ…ฅ '$sha1'"
+
+#: git-submodule.sh:653
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "ๅœจๅญๆจก็ต„ '$displaypath' ไธญๅŸท่กŒ '$command $sha1' ๅคฑๆ•—"
+
+#: git-submodule.sh:654
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "ๅญๆจก็ต„ '$displaypath'๏ผš'$command $sha1'"
+
+#: git-submodule.sh:685
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "็„กๆณ•้ž่ฟด้€ฒๅญๆจก็ต„่ทฏๅพ‘ '$displaypath'"
+
+#: git-submodule.sh:896
+msgid "The --cached option cannot be used with the --files option"
+msgstr "้ธ้ … --cached ไธ่ƒฝๅ’Œ้ธ้ … --files ๅŒๆ™‚ไฝฟ็”จ"
+
+#: git-submodule.sh:948
+#, sh-format
+msgid "unexpected mode $mod_dst"
+msgstr "ๆ„ๅค–็š„ๆจกๅผ $mod_dst"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: git-submodule.sh:968
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commit $sha1_src"
+msgstr "  ่ญฆๅ‘Š๏ผš$display_name ๆœชๅŒ…ๅซๆไบค $sha1_src"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: git-submodule.sh:971
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr "  ่ญฆๅ‘Š๏ผš$display_name ๆœชๅŒ…ๅซๆไบค $sha1_dst"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: git-submodule.sh:974
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr "  ่ญฆๅ‘Š๏ผš$display_name ๆœชๅŒ…ๅซๆไบค $sha1_src ๅ’Œ $sha1_dst"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "่ฉณ่ฆ‹ git-${cmd}(1)ใ€‚"
+
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "ๅทฒๆ‡‰็”จ autostashใ€‚"
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "ไธ่ƒฝๅ„ฒๅญ˜ $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "้‡ๅฎšๅŸบๅบ•ไธญ๏ผˆ$new_count/$total๏ผ‰"
+
+#: git-rebase--preserve-merges.sh:207
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       create a merge commit using the original merge commit's\n"
+".       message (or the oneline, if no original merge commit was\n"
+".       specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"ๆŒ‡ไปค:\n"
+"p, pick <ๆไบค> = ไฝฟ็”จๆไบค\n"
+"r, reword <ๆไบค> = ไฝฟ็”จๆไบค๏ผŒไฝ†ไฟฎๆ”นๆไบค่ชชๆ˜Ž\n"
+"e, edit <ๆไบค> = ไฝฟ็”จๆไบค๏ผŒไฝ†ๅœไธ‹ไพ†ไฟฎ่ฃœ\n"
+"s, squash <ๆไบค> = ไฝฟ็”จๆไบค๏ผŒไฝ†่žๅˆๅˆฐๅ‰ไธ€ๅ€‹ๆไบค\n"
+"f, fixup <ๆไบค> = ้กžไผผๆ–ผ \"squash\"๏ผŒไฝ†ๆจๆฃ„ๆไบค่ชชๆ˜Žๆ—ฅ่ชŒ\n"
+"x, exec <ๆŒ‡ไปค> = ไฝฟ็”จ shell ๅŸท่กŒๆŒ‡ไปค๏ผˆๆญค่กŒๅ‰ฉ้ค˜้ƒจๅˆ†๏ผ‰\n"
+"d, drop <ๆไบค> = ๅˆช้™คๆไบค\n"
+"l, label <ๆจ™็ฑค> = ็‚บ็›ฎๅ‰ HEAD ๆ‰“ไธŠๆจ™็ฑค\n"
+"t, reset <ๆจ™็ฑค> = ้‡่จญ HEAD ๅˆฐ่ฉฒๆจ™็ฑค\n"
+"m, merge [-C <ๆไบค> | -c <ๆไบค>] <ๆจ™็ฑค> [# <oneline>]\n"
+".       ๅปบ็ซ‹ไธ€ๅ€‹ๅˆไฝตๆไบค๏ผŒไธฆไฝฟ็”จๅŽŸๅง‹็š„ๅˆไฝตๆไบค่ชชๆ˜Ž๏ผˆๅฆ‚ๆžœๆฒ’ๆœ‰ๆŒ‡ๅฎš\n"
+".       ๅŽŸๅง‹ๆไบค๏ผŒไฝฟ็”จๅ‚™่จป้ƒจๅˆ†็š„ oneline ไฝœ็‚บๆไบค่ชชๆ˜Ž๏ผ‰ใ€‚ไฝฟ็”จ\n"
+".       -c <ๆไบค> ๅฏไปฅ็ทจ่ผฏๆไบค่ชชๆ˜Žใ€‚\n"
+"\n"
+"ๅฏไปฅๅฐ้€™ไบ›่กŒ้‡ๆ–ฐๆŽ’ๅบ๏ผŒๅฐ‡ๅพžไธŠ่‡ณไธ‹ๅŸท่กŒใ€‚\n"
+
+#: git-rebase--preserve-merges.sh:270
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"ๆ‚จ็พๅœจๅฏไปฅไฟฎ่ฃœ้€™ๅ€‹ๆไบค๏ผŒไฝฟ็”จ\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"็•ถๆ‚จๅฐ่ฎŠๆ›ดๆ„Ÿๅˆฐๆปฟๆ„๏ผŒๅŸท่กŒ\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--preserve-merges.sh:295
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1๏ผšไธๆ˜ฏไธ€ๅ€‹ๅฏไปฅ่ขซๆ€้ธ็š„ๆไบค"
+
+#: git-rebase--preserve-merges.sh:334
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "็„กๆ•ˆ็š„ๆไบคๅ๏ผš$sha1"
+
+#: git-rebase--preserve-merges.sh:364
+msgid "Cannot write current commit's replacement sha1"
+msgstr "ไธ่ƒฝๅฏซๅ…ฅ็›ฎๅ‰ๆไบค็š„ๆ›ฟไปฃ sha1"
+
+#: git-rebase--preserve-merges.sh:415
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "ๅฟซ่ฝ‰ๅˆฐ $sha1"
+
+#: git-rebase--preserve-merges.sh:417
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "ไธ่ƒฝๅฟซ่ฝ‰ๅˆฐ $sha1"
+
+#: git-rebase--preserve-merges.sh:426
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "ไธ่ƒฝ็งปๅ‹• HEAD ๅˆฐ $first_parent"
+
+#: git-rebase--preserve-merges.sh:431
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "ๆ‹’็ต•ๅฃ“็ธฎไธ€ๅ€‹ๅˆไฝต๏ผš$sha1"
+
+#: git-rebase--preserve-merges.sh:449
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "็„กๆณ•้‡ๅšๅˆไฝต $sha1"
+
+#: git-rebase--preserve-merges.sh:458
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "ไธ่ƒฝๆ€้ธ $sha1"
+
+#: git-rebase--preserve-merges.sh:467
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "้€™ๆ˜ฏๆไบค่ชชๆ˜Ž #${n}๏ผš"
+
+#: git-rebase--preserve-merges.sh:472
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "ๆไบค่ชชๆ˜Ž #${n} ๅฐ‡่ขซ่ทณ้Ž๏ผš"
+
+#: git-rebase--preserve-merges.sh:483
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "้€™ๆ˜ฏไธ€ๅ€‹ $count ๅ€‹ๆไบค็š„็ต„ๅˆใ€‚"
+
+#: git-rebase--preserve-merges.sh:492
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "ไธ่ƒฝๅฏซๅ…ฅ $fixup_msg"
+
+#: git-rebase--preserve-merges.sh:495
+msgid "This is a combination of 2 commits."
+msgstr "้€™ๆ˜ฏไธ€ๅ€‹ 2 ๅ€‹ๆไบค็š„็ต„ๅˆใ€‚"
+
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "ไธ่ƒฝๆ‡‰็”จ $sha1... $rest"
+
+#: git-rebase--preserve-merges.sh:611
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"ไธ่ƒฝๅœจๆˆๅŠŸๆ€้ธ $sha1... $rest ไน‹ๅพŒไฟฎ่ฃœๆไบค\n"
+"้€™้€šๅธธๆ˜ฏๅ› ็‚บ็ฉบ็š„ๆไบค่ชชๆ˜Ž๏ผŒๆˆ–่€… pre-commit ๆŽ›้‰คๅŸท่กŒๅคฑๆ•—ใ€‚ๅฆ‚ๆžœๆ˜ฏ pre-commit\n"
+"ๆŽ›้‰คๅŸท่กŒๅคฑๆ•—๏ผŒไฝ ๅฏ่ƒฝ้œ€่ฆๅœจ้‡ๅฏซๆไบค่ชชๆ˜Žๅ‰่งฃๆฑบ้€™ๅ€‹ๅ•้กŒใ€‚"
+
+#: git-rebase--preserve-merges.sh:626
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "ๅœๆญขๅœจ $sha1_abbrev... $rest"
+
+#: git-rebase--preserve-merges.sh:641
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "ๆฒ’ๆœ‰็ˆถๆไบค็š„ๆƒ…ๆณไธ‹ไธ่ƒฝ '$squash_style'"
+
+#: git-rebase--preserve-merges.sh:683
+#, sh-format
+msgid "Executing: $rest"
+msgstr "ๅŸท่กŒ๏ผš$rest"
+
+#: git-rebase--preserve-merges.sh:691
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "ๅŸท่กŒๅคฑๆ•—๏ผš$rest"
+
+#: git-rebase--preserve-merges.sh:693
+msgid "and made changes to the index and/or the working tree"
+msgstr "ไธฆไธ”ไฟฎๆ”น็ดขๅผ•ๅ’Œ/ๆˆ–ๅทฅไฝœๅ€"
+
+#  ่ญฏ่€…๏ผš่ซ‹็ถญๆŒๅ‰ๅฐŽ็ฉบๆ ผ
+#: git-rebase--preserve-merges.sh:695
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"ๆ‚จๅฏไปฅ่งฃๆฑบ้€™ๅ€‹ๅ•้กŒ๏ผŒ็„ถๅพŒๅŸท่กŒ\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--preserve-merges.sh:708
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"ๅŸท่กŒๆˆๅŠŸ๏ผš$rest\n"
+"ไฝ†ๆ˜ฏๅœจ็ดขๅผ•ๅ’Œ/ๆˆ–ๅทฅไฝœๅ€ไธญๅญ˜ๅœจ่ฎŠๆ›ดใ€‚ๆไบคๆˆ–ๅ„ฒ่—ไฟฎๆ”น๏ผŒ็„ถๅพŒๅŸท่กŒ\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--preserve-merges.sh:719
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "ๆœช็ŸฅๆŒ‡ไปค๏ผš$command $sha1 $rest"
+
+#: git-rebase--preserve-merges.sh:720
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "่ฆไฟฎๆ”น่ซ‹ไฝฟ็”จๆŒ‡ไปค 'git rebase --edit-todo'ใ€‚"
+
+#: git-rebase--preserve-merges.sh:755
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "ๆˆๅŠŸ้‡ๅฎšๅŸบๅบ•ไธฆๆ›ดๆ–ฐ $head_nameใ€‚"
+
+#: git-rebase--preserve-merges.sh:812
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "ไธ่ƒฝๅˆช้™ค CHERRY_PICK_HEAD"
+
+#: git-rebase--preserve-merges.sh:817
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"ๆ‚จๅทฒๆšซๅญ˜ไบ†ๅทฅไฝœๅ€็š„ไฟฎๆ”นใ€‚ๅฆ‚ๆžœ้€™ไบ›ไฟฎๆ”น่ฆๅฃ“็ธฎๅˆฐๅ‰ไธ€ๅ€‹ๆไบค๏ผŒๅŸท่กŒ๏ผš\n"
+"\n"
+"  git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"ๅฆ‚ๆžœ้€™ไบ›่ฎŠๆ›ด่ฆๅฝขๆˆไธ€ๅ€‹ๆ–ฐๆไบค๏ผŒๅŸท่กŒ๏ผš\n"
+"\n"
+"  git commit $gpg_sign_opt_quoted\n"
+"\n"
+"็„ก่ซ–ๅ“ช็จฎๆƒ…ๆณ๏ผŒ็•ถๆ‚จๅฎŒๆˆๆไบค๏ผŒ็นผ็บŒๅŸท่กŒ๏ผš\n"
+"\n"
+"  git rebase --continue\n"
+
+#: git-rebase--preserve-merges.sh:834
+msgid "Error trying to find the author identity to amend commit"
+msgstr "ๅœจไฟฎ่ฃœๆไบคไธญๅฐ‹ๆ‰พไฝœ่€…่จŠๆฏๆ™‚้‡ๅˆฐ้Œฏ่ชค"
+
+#: git-rebase--preserve-merges.sh:839
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"ๆ‚จ็š„ๅทฅไฝœๅ€ไธญๆœ‰ๆœชๆไบค็š„่ฎŠๆ›ดใ€‚่ซ‹ๅ…ˆๆไบค็„ถๅพŒๅ†ๆฌกๅŸท่กŒ 'git rebase --continue'ใ€‚"
+
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
+msgid "Could not commit staged changes."
+msgstr "ไธ่ƒฝๆไบคๆšซๅญ˜็š„ไฟฎๆ”นใ€‚"
+
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
+msgid "Could not execute editor"
+msgstr "็„กๆณ•ๅŸท่กŒ็ทจ่ผฏๅ™จ"
+
+#: git-rebase--preserve-merges.sh:900
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "ไธ่ƒฝ็ฐฝๅ‡บ $switch_to"
+
+#: git-rebase--preserve-merges.sh:907
+msgid "No HEAD?"
+msgstr "ๆฒ’ๆœ‰ HEAD๏ผŸ"
+
+#: git-rebase--preserve-merges.sh:908
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "ไธ่ƒฝๅปบ็ซ‹ๆšซๆ™‚ $state_dir"
+
+#: git-rebase--preserve-merges.sh:911
+msgid "Could not mark as interactive"
+msgstr "ไธ่ƒฝๆจ™่จ˜็‚บไบ’ๅ‹•ๅผ"
+
+#: git-rebase--preserve-merges.sh:943
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "้‡ๅฎšๅŸบๅบ• $shortrevisions ๅˆฐ $shortonto๏ผˆ$todocount ๅ€‹ๆไบค๏ผ‰"
+
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "ๆณจๆ„็ฉบๆไบคๅทฒ่ขซๅ‚™่จปๆŽ‰"
+
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
+msgid "Could not init rewritten commits"
+msgstr "ไธ่ƒฝๅฐ้‡ๅฏซๆไบค้€ฒ่กŒๅˆๅง‹ๅŒ–"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "็”จๆณ•๏ผš$dashless $USAGE"
+
+#: git-sh-setup.sh:191
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "ไธ่ƒฝๅˆ‡ๆ›็›ฎ้Œ„ๅˆฐ $cdup๏ผŒๅทฅไฝœๅ€็š„้ ‚็ดš็›ฎ้Œ„"
+
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "่‡ดๅ‘ฝ้Œฏ่ชค๏ผš$program_name ไธ่ƒฝๅœจๆฒ’ๆœ‰ๅทฅไฝœๅ€็š„ๆƒ…ๆณไธ‹ไฝฟ็”จ"
+
+#: git-sh-setup.sh:221
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "ไธ่ƒฝ้‡ๅฎšๅŸบๅบ•๏ผšๆ‚จๆœ‰ๆœชๆšซๅญ˜็š„่ฎŠๆ›ดใ€‚"
+
+#: git-sh-setup.sh:224
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "ไธ่ƒฝ้‡ๅฏซๅˆ†ๆ”ฏ๏ผšๆ‚จๆœ‰ๆœชๆšซๅญ˜็š„่ฎŠๆ›ดใ€‚"
+
+#: git-sh-setup.sh:227
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "็„กๆณ•้€้Ž้‡ๅฎšๅŸบๅบ•ๆ–นๅผๆ‹‰ๅ–๏ผšๆ‚จๆœ‰ๆœชๆšซๅญ˜็š„่ฎŠๆ›ดใ€‚"
+
+#: git-sh-setup.sh:230
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "ไธ่ƒฝ $action๏ผšๆ‚จๆœ‰ๆœชๆšซๅญ˜็š„่ฎŠๆ›ดใ€‚"
+
+#: git-sh-setup.sh:243
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr "ไธ่ƒฝ้‡ๅฎšๅŸบๅบ•๏ผšๆ‚จ็š„็ดขๅผ•ไธญๅŒ…ๅซๆœชๆไบค็š„่ฎŠๆ›ดใ€‚"
+
+#: git-sh-setup.sh:246
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr "็„กๆณ•้€้Ž้‡ๅฎšๅŸบๅบ•ๆ–นๅผๆ‹‰ๅ–๏ผšๆ‚จ็š„็ดขๅผ•ไธญๅŒ…ๅซๆœชๆไบค็š„่ฎŠๆ›ดใ€‚"
+
+#: git-sh-setup.sh:249
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "ไธ่ƒฝ $action๏ผšๆ‚จ็š„็ดขๅผ•ไธญๅŒ…ๅซๆœชๆไบค็š„่ฎŠๆ›ดใ€‚"
+
+#: git-sh-setup.sh:253
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "่€Œไธ”ๆ‚จ็š„็ดขๅผ•ไธญๅŒ…ๅซๆœชๆไบค็š„่ฎŠๆ›ดใ€‚"
+
+#: git-sh-setup.sh:373
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "ๆ‚จ้œ€่ฆๅœจๅทฅไฝœๅ€็š„้ ‚็ดš็›ฎ้Œ„ไธญๅŸท่กŒ้€™ๅ€‹ๆŒ‡ไปคใ€‚"
+
+#: git-sh-setup.sh:378
+msgid "Unable to determine absolute path of git directory"
+msgstr "ไธ่ƒฝ็ขบๅฎš git ็›ฎ้Œ„็š„็ต•ๅฐ่ทฏๅพ‘"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:212
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%12s %12s %s"
+
+#: git-add--interactive.perl:634
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "ๅปบ็ซ‹ไบ† %d ๅ€‹่ทฏๅพ‘\n"
+
+#: git-add--interactive.perl:1053
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๆšซๅญ˜ใ€‚"
+
+#: git-add--interactive.perl:1056
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๅ„ฒ่—ใ€‚"
+
+#: git-add--interactive.perl:1059
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๆœชๆšซๅญ˜ใ€‚"
+
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๆ‡‰็”จใ€‚"
+
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr "ๅฆ‚ๆžœไฟฎ่ฃœๆช”่ƒฝไนพๆทจๅœฐๅฅ—็”จ๏ผŒ็ทจ่ผฏๅกŠๅฐ‡็ซ‹ๅณๆจ™่จ˜็‚บๆจๆฃ„ใ€‚"
+
+#: git-add--interactive.perl:1111
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "็‚บๅฏซๅ…ฅ้–‹ๅ•Ÿๅ€ๅกŠ็ทจ่ผฏๆช”ๆกˆๅคฑๆ•—๏ผš%s"
+
+#: git-add--interactive.perl:1118
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"่ฆๅˆช้™ค '%s' ้–‹ๅง‹็š„่กŒ๏ผŒไฝฟๅ…ถๆˆ็‚บ ' ' ้–‹ๅง‹็š„่กŒ๏ผˆไธŠไธ‹ๆ–‡๏ผ‰ใ€‚\n"
+"่ฆๅˆช้™ค '%s' ้–‹ๅง‹็š„่กŒ๏ผŒๅˆช้™คๅฎƒๅ€‘ใ€‚\n"
+"ไปฅ %s ้–‹ๅง‹็š„่กŒๅฐ‡่ขซๅˆช้™คใ€‚\n"
+
+#: git-add--interactive.perl:1140
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "็„กๆณ•่ฎ€ๅ–ๅ€ๅกŠ็ทจ่ผฏๆช”ๆกˆ๏ผš%s"
+
+#: git-add--interactive.perl:1248
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - ๆšซๅญ˜ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๆšซๅญ˜ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธๆšซๅญ˜ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๆšซๅญ˜ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธๆšซๅญ˜ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ"
+
+#: git-add--interactive.perl:1254
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - ๅ„ฒ่—ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅ„ฒ่—ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธๅ„ฒ่—ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๅ„ฒ่—ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธๅ„ฒ่—ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ"
+
+#: git-add--interactive.perl:1260
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - ไธๆšซๅญ˜ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆไธๆšซๅญ˜ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆไธๆšซๅญ˜ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ไธๆšซๅญ˜ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆไธๆšซๅญ˜ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ"
+
+#: git-add--interactive.perl:1266
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - ๅœจ็ดขๅผ•ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจ็ดขๅผ•ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ"
+
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - ๅœจๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๆจๆฃ„ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๆจๆฃ„ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๆจๆฃ„ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ"
+
+#: git-add--interactive.perl:1278
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - ๅœจ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๆจๆฃ„ๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๆจๆฃ„ๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๆจๆฃ„ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๆจๆฃ„ๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ"
+
+#: git-add--interactive.perl:1284
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - ๅœจ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจ็ดขๅผ•ๅ’Œๅทฅไฝœๅ€ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ"
+
+#: git-add--interactive.perl:1296
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - ๅœจๅทฅไฝœๅ€ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"n - ไธ่ฆๅœจๅทฅไฝœๅ€ไธญๅฅ—็”จๆญคๅ€ๅกŠ\n"
+"q - ้›ข้–‹ใ€‚ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅŠๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"a - ๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ\n"
+"d - ไธ่ฆๅฅ—็”จๆญคๅ€ๅกŠๅ’Œๆœฌๆช”ๆกˆไธญๅพŒ้ข็š„ๅ…จ้ƒจๅ€ๅกŠ"
+
+#: git-add--interactive.perl:1311
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - ้ธๆ“‡่ทณ่ฝ‰ๅˆฐไธ€ๅ€‹ๅ€ๅกŠ\n"
+"/ - ๅฐ‹ๆ‰พๅ’Œๆไพ›ๆญฃ่ฆ่กจ็คบๅผ็ฌฆๅˆ็š„ๅ€ๅกŠ\n"
+"j - ็ถญๆŒๆญคๅ€ๅกŠๆœชๆฑบ็‹€ๆ…‹๏ผŒๆชข่ฆ–ไธ‹ไธ€ๅ€‹ๆœชๆฑบๅฎšๅ€ๅกŠ\n"
+"J - ็ถญๆŒๆญคๅ€ๅกŠๆœชๆฑบ็‹€ๆ…‹๏ผŒๆชข่ฆ–ไธ‹ไธ€ๅ€‹ๅ€ๅกŠ\n"
+"k - ็ถญๆŒๆญคๅ€ๅกŠๆœชๆฑบ็‹€ๆ…‹๏ผŒๆชข่ฆ–ไธŠไธ€ๅ€‹ๆœชๆฑบๅฎšๅ€ๅกŠ\n"
+"K - ็ถญๆŒๆญคๅ€ๅกŠๆœชๆฑบ็‹€ๆ…‹๏ผŒๆชข่ฆ–ไธŠไธ€ๅ€‹ๅ€ๅกŠ\n"
+"s - ๅˆ†ๅ‰ฒ็›ฎๅ‰ๅ€ๅกŠ็‚บๆ›ดๅฐ็š„ๅ€ๅกŠ\n"
+"e - ๆ‰‹ๅ‹•็ทจ่ผฏ็›ฎๅ‰ๅ€ๅกŠ\n"
+"? - ้กฏ็คบ่ชชๆ˜Ž\n"
+
+#: git-add--interactive.perl:1342
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "้ธไธญ็š„ๅ€ๅกŠไธ่ƒฝๅฅ—็”จๅˆฐ็ดขๅผ•๏ผ\n"
+
+#: git-add--interactive.perl:1357
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "ๅฟฝ็•ฅๆœชๅฅ—็”จ็š„๏ผš%s\n"
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ‡ๆจกๅผ่ฎŠๆ›ดๅฅ—็”จๅˆฐๅทฅไฝœๅ€ [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1469
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ‡ๅˆช้™คๅ‹•ไฝœๅฅ—็”จๅˆฐๅทฅไฝœๅ€ [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1470
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "ๅฐ‡ๆญคๅ€ๅกŠๅฅ—็”จๅˆฐๅทฅไฝœๅ€ [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1570
+msgid "No other hunks to goto\n"
+msgstr "ๆฒ’ๆœ‰ๅ…ถๅฎƒๅฏไพ›่ทณ่ฝ‰็š„ๅ€ๅกŠ\n"
+
+#: git-add--interactive.perl:1588
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "็„กๆ•ˆๆ•ธๅญ—๏ผš'%s'\n"
+
+#: git-add--interactive.perl:1593
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] "ๅฐไธ่ตท๏ผŒๅชๆœ‰ %d ๅ€‹ๅฏ็”จๅ€ๅกŠใ€‚\n"
+
+#: git-add--interactive.perl:1619
+msgid "No other hunks to search\n"
+msgstr "ๆฒ’ๆœ‰ๅ…ถๅฎƒๅฏไพ›ๅฐ‹ๆ‰พ็š„ๅ€ๅกŠ\n"
+
+#: git-add--interactive.perl:1636
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "้Œฏ่ชค็š„ๆญฃ่ฆ่กจ็คบๅผ %s๏ผš%s\n"
+
+#: git-add--interactive.perl:1646
+msgid "No hunk matches the given pattern\n"
+msgstr "ๆฒ’ๆœ‰ๅ’Œๆไพ›ๆจกๅผ็›ธ็ฌฆๅˆ็š„ๅ€ๅกŠ\n"
+
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+msgid "No previous hunk\n"
+msgstr "ๆฒ’ๆœ‰ๅ‰ไธ€ๅ€‹ๅ€ๅกŠ\n"
+
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+msgid "No next hunk\n"
+msgstr "ๆฒ’ๆœ‰ไธ‹ไธ€ๅ€‹ๅ€ๅกŠ\n"
+
+#: git-add--interactive.perl:1692
+msgid "Sorry, cannot split this hunk\n"
+msgstr "ๅฐไธ่ตท๏ผŒไธ่ƒฝๅˆ†ๅ‰ฒ้€™ๅ€‹ๅ€ๅกŠ\n"
+
+#: git-add--interactive.perl:1698
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "ๅˆ†ๅ‰ฒ็‚บ %d ๅกŠใ€‚\n"
+
+#: git-add--interactive.perl:1708
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "ๅฐไธ่ตท๏ผŒไธ่ƒฝ็ทจ่ผฏ้€™ๅ€‹ๅ€ๅกŠ\n"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1773
+msgid ""
+"status        - show paths with changes\n"
+"update        - add working tree state to the staged set of changes\n"
+"revert        - revert staged set of changes back to the HEAD version\n"
+"patch         - pick hunks and update selectively\n"
+"diff          - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status        - ้กฏ็คบๅซ่ฎŠๆ›ด็š„่ทฏๅพ‘\n"
+"update        - ๆ–ฐๅขžๅทฅไฝœๅ€็‹€ๆ…‹่‡ณๆšซๅญ˜ๅˆ—่กจ\n"
+"revert        - ้‚„ๅŽŸไฟฎๆ”น็š„ๆšซๅญ˜้›†่‡ณ HEAD ็‰ˆๆœฌ\n"
+"patch         - ๆŒ‘้ธๅ€ๅกŠไธฆไธ”ๆœ‰้ธๆ“‡ๅœฐๆ›ดๆ–ฐ\n"
+"diff          - ้กฏ็คบ HEAD ๅ’Œ็ดขๅผ•้–“ๅทฎ็•ฐ\n"
+"add untracked - ๆ–ฐๅขžๆœช่ฟฝ่นคๆช”ๆกˆ็š„ๅ…งๅฎน่‡ณๆšซๅญ˜ๅˆ—่กจ\n"
+
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+msgid "missing --"
+msgstr "็ผบๅฐ‘ --"
+
+#: git-add--interactive.perl:1821
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "ๆœช็Ÿฅ็š„ --patch ๆจกๅผ๏ผš%s"
+
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "็„กๆ•ˆ็š„ๅƒๆ•ธ %s๏ผŒๆœŸๆœ›ๆ˜ฏ --"
+
+#: git-send-email.perl:138
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr "ๆœฌๆฉŸๆ™‚้–“ๅ’Œ GMT ๆœ‰ไธๅˆฐไธ€ๅˆ†้˜้–“้š”\n"
+
+#: git-send-email.perl:145 git-send-email.perl:151
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "ๆœฌๆฉŸๆ™‚้–“ไฝ็งป้‡ๅคงๆ–ผ็ญ‰ๆ–ผ 24 ๅฐๆ™‚\n"
+
+#: git-send-email.perl:223 git-send-email.perl:229
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "็ทจ่ผฏๅ™จ้žๆญฃๅธธ้›ข้–‹๏ผŒ็ต‚ๆญขๆ‰€ๆœ‰ๅ‹•ไฝœ"
+
+#: git-send-email.perl:310
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr "'%s' ๅŒ…ๅซๆ‚จๆญฃๅœจ็ทจๅฏซ็š„ไธ€ๅ€‹ไธญ้–“็‰ˆๆœฌ็š„ไฟกไปถใ€‚\n"
+
+#: git-send-email.perl:315
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' ๅŒ…ๅซ็ทจ่ผฏ็š„ไฟกไปถใ€‚\n"
+
+#: git-send-email.perl:408
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases ๅ’Œๅ…ถๅฎƒ้ธ้ …ไธ็›ธๅฎน\n"
+
+#: git-send-email.perl:481 git-send-email.perl:683
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "ไธ่ƒฝๅœจ็‰ˆๆœฌๅบซไน‹ๅค–ๅŸท่กŒ git format-patch\n"
+
+#: git-send-email.perl:484
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr "`batch-size` ๅ’Œ `relogin` ๅฟ…้ ˆๅŒๆ™‚ๅฎš็พฉ๏ผˆ้€้ŽๆŒ‡ไปคๅˆ—ๆˆ–่€…่จญๅฎš้ธ้ …๏ผ‰\n"
+
+#: git-send-email.perl:497
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "ๆœช็Ÿฅ็š„ --suppress-cc ๆฌ„ไฝ๏ผš'%s'\n"
+
+#: git-send-email.perl:528
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "ๆœช็Ÿฅ็š„ --confirm ่จญๅฎš๏ผš'%s'\n"
+
+#: git-send-email.perl:556
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "่ญฆๅ‘Š๏ผšไธๆ”ฏๆดๅธถๅผ•่™Ÿ็š„ sendmail ๅˆฅๅ๏ผš%s\n"
+
+#: git-send-email.perl:558
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "่ญฆๅ‘Š๏ผšไธๆ”ฏๆด `:include:`๏ผš%s\n"
+
+#: git-send-email.perl:560
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "่ญฆๅ‘Š๏ผšไธๆ”ฏๆด `/file` ๆˆ– `|pipe` ้‡ๅฎšๅ‘๏ผš%s\n"
+
+#: git-send-email.perl:565
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "่ญฆๅ‘Š๏ผšไธ่ƒฝ่ญ˜ๅˆฅ็š„ sendmail ่กŒ๏ผš%s\n"
+
+#: git-send-email.perl:649
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"ๅญ˜ๅœจๆช”ๆกˆ '%s' ไฝ†ๆ˜ฏๅฎƒไนŸๅฏ่ƒฝๆ˜ฏไธ€ๅ€‹็”จๆ–ผ็”ข็”Ÿไฟฎ่ฃœๆช”ๅˆ—่กจ็š„ๆไบค็ฏ„ๅœใ€‚่ซ‹็”จๅฆ‚ไธ‹ๆ–นๆณ•ๆถˆ"
+"้™คๆญง็พฉ๏ผš\n"
+"\n"
+"    * ๅฆ‚ๆžœๅซ็พฉ็‚บไธ€ๅ€‹ๆช”ๆกˆ๏ผŒไฝฟ็”จ \"./%s\"๏ผŒๆˆ–่€…\n"
+"    * ๅฆ‚ๆžœๅซ็พฉ็‚บไธ€ๅ€‹็ฏ„ๅœ๏ผŒไฝฟ็”จ --format-patch ้ธ้ …ใ€‚\n"
+
+#: git-send-email.perl:670
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "็„กๆณ•้–‹ๅ•Ÿ็›ฎ้Œ„ %s: %s"
+
+#: git-send-email.perl:694
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"่‡ดๅ‘ฝ้Œฏ่ชค๏ผš%s๏ผš%s\n"
+"่ญฆๅ‘Š๏ผšไฟฎ่ฃœๆช”ๆœช่ƒฝๅ‚ณ้€\n"
+
+#: git-send-email.perl:705
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"ๆœชๆŒ‡ๅฎšไฟฎ่ฃœๆช”ๆกˆ๏ผ\n"
+"\n"
+
+#: git-send-email.perl:718
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "ๅœจ %s ไธญๆฒ’ๆœ‰ๆจ™้กŒ่กŒ๏ผŸ"
+
+#: git-send-email.perl:728
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "็‚บๅฏซๅ…ฅ้–‹ๅ•Ÿ %s ๅคฑๆ•—: %s"
+
+#: git-send-email.perl:739
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"ไปฅ \"GIT:\" ้–‹้ ญ็š„่กŒๅฐ‡่ขซๅˆช้™คใ€‚\n"
+"่€ƒๆ…ฎๅŒ…ๅซไธ€ๅ€‹ๆ•ด้ซ”็š„ๅทฎ็•ฐ็ตฑ่จˆๆˆ–่€…ๆ‚จๆญฃๅœจๅฏซ็š„ไฟฎ่ฃœๆช”็š„็›ฎ้Œ„ใ€‚\n"
+"\n"
+"ๅฆ‚ๆžœๆ‚จไธๆƒณๅ‚ณ้€ๆ‘˜่ฆ๏ผŒๆธ…้™คๅ…งๅฎนใ€‚\n"
+
+#: git-send-email.perl:763
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "็„กๆณ•้–‹ๅ•Ÿ %s: %s"
+
+#: git-send-email.perl:780
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "็„กๆณ•้–‹ๅ•Ÿ %s.final: %s"
+
+#: git-send-email.perl:823
+msgid "Summary email is empty, skipping it\n"
+msgstr "ๆ‘˜่ฆไฟกไปถ็‚บ็ฉบ๏ผŒ่ทณ้Ž\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:858
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "ๆ‚จ็ขบ่ช่ฆไฝฟ็”จ <%s> [y/N]๏ผŸ"
+
+#: git-send-email.perl:913
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr "ๅฆ‚ไธ‹ๆช”ๆกˆๅซ 8bit ๅ…งๅฎน๏ผŒไฝ†ๆฒ’ๆœ‰่ฒๆ˜Žไธ€ๅ€‹ Content-Transfer-Encodingใ€‚\n"
+
+#: git-send-email.perl:918
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "่ฆ่ฒๆ˜Ž 8bit ็‚บไป€้บผๆจฃ็š„็ทจ็ขผๆ ผๅผ [UTF-8]๏ผŸ"
+
+#: git-send-email.perl:926
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+"ๆ‹’็ต•ๅ‚ณ้€๏ผŒๅ› ็‚บไฟฎ่ฃœๆช”\n"
+"\t%s\n"
+"ๅŒ…ๅซ็ฏ„ๆœฌๆจ™้กŒ '*** SUBJECT HERE ***'ใ€‚ๅฆ‚ๆžœ็ขบๅฏฆๆƒณ่ฆๅ‚ณ้€๏ผŒไฝฟ็”จๅƒๆ•ธ --forceใ€‚\n"
+
+#: git-send-email.perl:945
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "ไฟกไปถๅฐ‡่ฆๅ‚ณ้€็ตฆ่ชฐ๏ผŸ"
+
+#: git-send-email.perl:963
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "่‡ดๅ‘ฝ้Œฏ่ชค๏ผšๅˆฅๅ '%s' ๆ“ดๅฑ•็‚บๅฎƒ่‡ชๅทฑ\n"
+
+#: git-send-email.perl:975
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr "Message-ID ่ขซ็”จไฝœ็ฌฌไธ€ๅฐไฟกไปถ็š„ In-Reply-To ๏ผŸ"
+
+#: git-send-email.perl:1033 git-send-email.perl:1041
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "้Œฏ่ชค๏ผšไธ่ƒฝๅพž %s ไธญๆ“ทๅ–ไธ€ๅ€‹ๆœ‰ๆ•ˆ็š„ไฟกไปถไฝๅ€\n"
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1045
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "ๅฆ‚ไฝ•่™•็†้€™ๅ€‹ไฝๅ€๏ผŸ([q]uit|[d]rop|[e]dit)๏ผš"
+
+#: git-send-email.perl:1362
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "CA ่ทฏๅพ‘ \"%s\" ไธๅญ˜ๅœจ"
+
+#: git-send-email.perl:1445
+msgid ""
+"    The Cc list above has been expanded by additional\n"
+"    addresses found in the patch commit message. By default\n"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+"    ไปฅไธŠ็š„ๆŠ„้€ๅˆ—่กจ๏ผˆCc๏ผ‰ๅทฒ็ถ“็”จไฟฎ่ฃœๆช”ๆไบค่จŠๆฏไธญ็™ผ็พ็š„ไฝๅ€้€ฒ่กŒ\n"
+"    ไบ†ๆ“ดๅฑ•ใ€‚้ ่จญ send-email ๆœƒ็ตฆๅ‡บๆ็คบใ€‚้€™ๅ€‹่กŒ็‚บๅฏไปฅ้€้Ž\n"
+"    sendemail.confirm ่จญๅฎš่จญๅฎšใ€‚\n"
+"\n"
+"    ๆ›ดๅคš่จŠๆฏ๏ผŒๅŸท่กŒ 'git send-email --help'ใ€‚\n"
+"    ่ฆไฟๆŒ็›ฎๅ‰่กŒ็‚บ๏ผŒไฝ†ไธ้กฏ็คบๆญค่จŠๆฏ๏ผŒๅŸท่กŒ 'git config --global\n"
+"    sendemail.confirm auto'ใ€‚\n"
+"\n"
+
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1460
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr "ๅ‚ณ้€้€™ๅฐไฟกไปถ๏ผŸ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+
+#: git-send-email.perl:1463
+msgid "Send this email reply required"
+msgstr "ๅ‚ณ้€่ฆๆฑ‚็š„ไฟกไปถๅ›žๅพฉ"
+
+#: git-send-email.perl:1491
+msgid "The required SMTP server is not properly defined."
+msgstr "่ฆๆฑ‚็š„ SMTP ไผบๆœๅ™จๆœช่ขซๆญฃ็ขบๅฎš็พฉใ€‚"
+
+#: git-send-email.perl:1538
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "ไผบๆœๅ™จไธๆ”ฏๆด STARTTLS๏ผ%s"
+
+#: git-send-email.perl:1543 git-send-email.perl:1547
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS ๅคฑๆ•—๏ผ%s"
+
+#: git-send-email.perl:1556
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr "็„กๆณ•ๆญฃ็ขบๅœฐๅˆๅง‹ๅŒ– SMTPใ€‚ๆชขๆŸฅ่จญๅฎšไธฆไฝฟ็”จ --smtp-debugใ€‚"
+
+#: git-send-email.perl:1574
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "็„กๆณ•ๅ‚ณ้€ %s\n"
+
+#: git-send-email.perl:1577
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "ๆธฌ่ฉฆๅŸท่กŒๅ‚ณ้€ %s\n"
+
+#: git-send-email.perl:1577
+#, perl-format
+msgid "Sent %s\n"
+msgstr "ๆญฃๅ‚ณ้€ %s\n"
+
+#: git-send-email.perl:1579
+msgid "Dry-OK. Log says:\n"
+msgstr "ๆธฌ่ฉฆๅŸท่กŒๆˆๅŠŸใ€‚ๆ—ฅ่ชŒ่ชช๏ผš\n"
+
+#: git-send-email.perl:1579
+msgid "OK. Log says:\n"
+msgstr "OKใ€‚ๆ—ฅ่ชŒ่ชช๏ผš\n"
+
+#: git-send-email.perl:1591
+msgid "Result: "
+msgstr "็ตๆžœ๏ผš"
+
+#: git-send-email.perl:1594
+msgid "Result: OK\n"
+msgstr "็ตๆžœ๏ผšOK\n"
+
+#: git-send-email.perl:1612
+#, perl-format
+msgid "can't open file %s"
+msgstr "็„กๆณ•้–‹ๅ•Ÿๆช”ๆกˆ %s"
+
+#: git-send-email.perl:1659 git-send-email.perl:1679
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) ๆ–ฐๅขž cc๏ผš%s ่‡ช่กŒ '%s'\n"
+
+#: git-send-email.perl:1665
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) ๆ–ฐๅขž to๏ผš%s ่‡ช่กŒ '%s'\n"
+
+#: git-send-email.perl:1718
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non-mbox) ๆ–ฐๅขž cc๏ผš%s ่‡ช่กŒ '%s'\n"
+
+#: git-send-email.perl:1753
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(body) ๆ–ฐๅขž cc: %s ่‡ช่กŒ '%s'\n"
+
+#: git-send-email.perl:1864
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) ไธ่ƒฝๅŸท่กŒ '%s'"
+
+#: git-send-email.perl:1871
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) ๆ–ฐๅขž %s: %s ่‡ช๏ผš'%s'\n"
+
+#: git-send-email.perl:1875
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) ็„กๆณ•้—œ้–‰็ฎก้“่‡ณ '%s'"
+
+#: git-send-email.perl:1905
+msgid "cannot send message as 7bit"
+msgstr "ไธ่ƒฝไปฅ 7bit ๅฝขๅผๅ‚ณ้€่จŠๆฏ"
+
+#: git-send-email.perl:1913
+msgid "invalid transfer encoding"
+msgstr "็„กๆ•ˆ็š„ๅ‚ณ้€็ทจ็ขผ"
+
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "ไธ่ƒฝ้–‹ๅ•Ÿ %s๏ผš%s\n"
+
+#: git-send-email.perl:1957
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "%s๏ผšไฟฎ่ฃœๆช”ๅŒ…ๅซไธ€ๅ€‹่ถ…้Ž 998 ๅญ—ๅ…ƒ็š„่กŒ"
+
+#: git-send-email.perl:1974
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr "็•ฅ้Ž %s ๅซๅ‚™ไปฝๅพŒ็ถด '%s'ใ€‚\n"
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:1978
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "ๆ‚จ็œŸ็š„่ฆๅ‚ณ้€ %s๏ผŸ[y|N]๏ผš"
diff --git a/third_party/git/pretty.c b/third_party/git/pretty.c
index e4ed14effe1a..28afc701b6a4 100644
--- a/third_party/git/pretty.c
+++ b/third_party/git/pretty.c
@@ -20,6 +20,7 @@ static struct cmt_fmt_map {
 	int is_tformat;
 	int expand_tabs_in_log;
 	int is_alias;
+	enum date_mode_type default_date_mode_type;
 	const char *user_format;
 } *commit_formats;
 static size_t builtin_formats_len;
@@ -97,7 +98,9 @@ static void setup_commit_formats(void)
 		{ "mboxrd",	CMIT_FMT_MBOXRD,	0,	0 },
 		{ "fuller",	CMIT_FMT_FULLER,	0,	8 },
 		{ "full",	CMIT_FMT_FULL,		0,	8 },
-		{ "oneline",	CMIT_FMT_ONELINE,	1,	0 }
+		{ "oneline",	CMIT_FMT_ONELINE,	1,	0 },
+		{ "reference",	CMIT_FMT_USERFORMAT,	1,	0,
+			0, DATE_SHORT, "%C(auto)%h (%s, %ad)" },
 		/*
 		 * Please update $__git_log_pretty_formats in
 		 * git-completion.bash when you add new formats.
@@ -181,6 +184,8 @@ void get_commit_format(const char *arg, struct rev_info *rev)
 	rev->commit_format = commit_format->format;
 	rev->use_terminator = commit_format->is_tformat;
 	rev->expand_tabs_in_log_default = commit_format->expand_tabs_in_log;
+	if (!rev->date_mode_explicit && commit_format->default_date_mode_type)
+		rev->date_mode.type = commit_format->default_date_mode_type;
 	if (commit_format->format == CMIT_FMT_USERFORMAT) {
 		save_user_format(rev, commit_format->user_format,
 				 commit_format->is_tformat);
@@ -696,7 +701,7 @@ static size_t format_person_part(struct strbuf *sb, char part,
 	mail = s.mail_begin;
 	maillen = s.mail_end - s.mail_begin;
 
-	if (part == 'N' || part == 'E') /* mailmap lookup */
+	if (part == 'N' || part == 'E' || part == 'L') /* mailmap lookup */
 		mailmap_name(&mail, &maillen, &name, &namelen);
 	if (part == 'n' || part == 'N') {	/* name */
 		strbuf_add(sb, name, namelen);
@@ -706,6 +711,13 @@ static size_t format_person_part(struct strbuf *sb, char part,
 		strbuf_add(sb, mail, maillen);
 		return placeholder_len;
 	}
+	if (part == 'l' || part == 'L') {	/* local-part */
+		const char *at = memchr(mail, '@', maillen);
+		if (at)
+			maillen = at - mail;
+		strbuf_add(sb, mail, maillen);
+		return placeholder_len;
+	}
 
 	if (!s.date_begin)
 		goto skip;
@@ -731,6 +743,9 @@ static size_t format_person_part(struct strbuf *sb, char part,
 	case 'I':	/* date, ISO 8601 strict */
 		strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601_STRICT)));
 		return placeholder_len;
+	case 's':
+		strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(SHORT)));
+		return placeholder_len;
 	}
 
 skip:
@@ -1239,11 +1254,9 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		strbuf_addstr(sb, get_revision_mark(NULL, commit));
 		return 1;
 	case 'd':
-		load_ref_decorations(NULL, DECORATE_SHORT_REFS);
 		format_decorations(sb, commit, c->auto_color);
 		return 1;
 	case 'D':
-		load_ref_decorations(NULL, DECORATE_SHORT_REFS);
 		format_decorations_extended(sb, commit, c->auto_color, "", ", ", "");
 		return 1;
 	case 'S':		/* tag/branch like --source */
@@ -1298,9 +1311,18 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		case '?':
 			switch (c->signature_check.result) {
 			case 'G':
+				switch (c->signature_check.trust_level) {
+				case TRUST_UNDEFINED:
+				case TRUST_NEVER:
+					strbuf_addch(sb, 'U');
+					break;
+				default:
+					strbuf_addch(sb, 'G');
+					break;
+				}
+				break;
 			case 'B':
 			case 'E':
-			case 'U':
 			case 'N':
 			case 'X':
 			case 'Y':
@@ -1324,6 +1346,25 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 			if (c->signature_check.primary_key_fingerprint)
 				strbuf_addstr(sb, c->signature_check.primary_key_fingerprint);
 			break;
+		case 'T':
+			switch (c->signature_check.trust_level) {
+			case TRUST_UNDEFINED:
+				strbuf_addstr(sb, "undefined");
+				break;
+			case TRUST_NEVER:
+				strbuf_addstr(sb, "never");
+				break;
+			case TRUST_MARGINAL:
+				strbuf_addstr(sb, "marginal");
+				break;
+			case TRUST_FULLY:
+				strbuf_addstr(sb, "fully");
+				break;
+			case TRUST_ULTIMATE:
+				strbuf_addstr(sb, "ultimate");
+				break;
+			}
+			break;
 		default:
 			return 0;
 		}
@@ -1568,9 +1609,9 @@ static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
 			strbuf_setlen(sb, sb->len - 1);
 	} else if (orig_len != sb->len) {
 		if (magic == ADD_LF_BEFORE_NON_EMPTY)
-			strbuf_insert(sb, orig_len, "\n", 1);
+			strbuf_insertstr(sb, orig_len, "\n");
 		else if (magic == ADD_SP_BEFORE_NON_EMPTY)
-			strbuf_insert(sb, orig_len, " ", 1);
+			strbuf_insertstr(sb, orig_len, " ");
 	}
 	return consumed + 1;
 }
@@ -1612,14 +1653,14 @@ void repo_format_commit_message(struct repository *r,
 				const char *format, struct strbuf *sb,
 				const struct pretty_print_context *pretty_ctx)
 {
-	struct format_commit_context context;
+	struct format_commit_context context = {
+		.commit = commit,
+		.pretty_ctx = pretty_ctx,
+		.wrap_start = sb->len
+	};
 	const char *output_enc = pretty_ctx->output_encoding;
 	const char *utf8 = "UTF-8";
 
-	memset(&context, 0, sizeof(context));
-	context.commit = commit;
-	context.pretty_ctx = pretty_ctx;
-	context.wrap_start = sb->len;
 	/*
 	 * convert a commit message to UTF-8 first
 	 * as far as 'format_commit_item' assumes it in UTF-8
diff --git a/third_party/git/progress.c b/third_party/git/progress.c
index 277db8afa26d..19805ac6461b 100644
--- a/third_party/git/progress.c
+++ b/third_party/git/progress.c
@@ -14,6 +14,7 @@
 #include "strbuf.h"
 #include "trace.h"
 #include "utf8.h"
+#include "config.h"
 
 #define TP_IDX_MAX      8
 
@@ -45,6 +46,19 @@ struct progress {
 
 static volatile sig_atomic_t progress_update;
 
+/*
+ * These are only intended for testing the progress output, i.e. exclusively
+ * for 'test-tool progress'.
+ */
+int progress_testing;
+uint64_t progress_test_ns = 0;
+void progress_test_force_update(void); /* To silence -Wmissing-prototypes */
+void progress_test_force_update(void)
+{
+	progress_update = 1;
+}
+
+
 static void progress_interval(int signum)
 {
 	progress_update = 1;
@@ -55,6 +69,9 @@ static void set_progress_signal(void)
 	struct sigaction sa;
 	struct itimerval v;
 
+	if (progress_testing)
+		return;
+
 	progress_update = 0;
 
 	memset(&sa, 0, sizeof(sa));
@@ -72,6 +89,10 @@ static void set_progress_signal(void)
 static void clear_progress_signal(void)
 {
 	struct itimerval v = {{0,},};
+
+	if (progress_testing)
+		return;
+
 	setitimer(ITIMER_REAL, &v, NULL);
 	signal(SIGALRM, SIG_IGN);
 	progress_update = 0;
@@ -88,6 +109,7 @@ static void display(struct progress *progress, uint64_t n, const char *done)
 	const char *tp;
 	struct strbuf *counters_sb = &progress->counters_sb;
 	int show_update = 0;
+	int last_count_len = counters_sb->len;
 
 	if (progress->delay && (!progress_update || --progress->delay))
 		return;
@@ -115,21 +137,27 @@ static void display(struct progress *progress, uint64_t n, const char *done)
 	if (show_update) {
 		if (is_foreground_fd(fileno(stderr)) || done) {
 			const char *eol = done ? done : "\r";
+			size_t clear_len = counters_sb->len < last_count_len ?
+					last_count_len - counters_sb->len + 1 :
+					0;
+			/* The "+ 2" accounts for the ": ". */
+			size_t progress_line_len = progress->title_len +
+						counters_sb->len + 2;
+			int cols = term_columns();
 
-			term_clear_line();
 			if (progress->split) {
-				fprintf(stderr, "  %s%s", counters_sb->buf,
-					eol);
-			} else if (!done &&
-				   /* The "+ 2" accounts for the ": ". */
-				   term_columns() < progress->title_len +
-						    counters_sb->len + 2) {
-				fprintf(stderr, "%s:\n  %s%s",
-					progress->title, counters_sb->buf, eol);
+				fprintf(stderr, "  %s%*s", counters_sb->buf,
+					(int) clear_len, eol);
+			} else if (!done && cols < progress_line_len) {
+				clear_len = progress->title_len + 1 < cols ?
+					    cols - progress->title_len - 1 : 0;
+				fprintf(stderr, "%s:%*s\n  %s%s",
+					progress->title, (int) clear_len, "",
+					counters_sb->buf, eol);
 				progress->split = 1;
 			} else {
-				fprintf(stderr, "%s: %s%s", progress->title,
-					counters_sb->buf, eol);
+				fprintf(stderr, "%s: %s%*s", progress->title,
+					counters_sb->buf, (int) clear_len, eol);
 			}
 			fflush(stderr);
 		}
@@ -147,6 +175,14 @@ static void throughput_string(struct strbuf *buf, uint64_t total,
 	strbuf_humanise_rate(buf, rate * 1024);
 }
 
+static uint64_t progress_getnanotime(struct progress *progress)
+{
+	if (progress_testing)
+		return progress->start_ns + progress_test_ns;
+	else
+		return getnanotime();
+}
+
 void display_throughput(struct progress *progress, uint64_t total)
 {
 	struct throughput *tp;
@@ -157,7 +193,7 @@ void display_throughput(struct progress *progress, uint64_t total)
 		return;
 	tp = progress->throughput;
 
-	now_ns = getnanotime();
+	now_ns = progress_getnanotime(progress);
 
 	if (!tp) {
 		progress->throughput = tp = xcalloc(1, sizeof(*tp));
@@ -232,9 +268,19 @@ static struct progress *start_progress_delay(const char *title, uint64_t total,
 	return progress;
 }
 
+static int get_default_delay(void)
+{
+	static int delay_in_secs = -1;
+
+	if (delay_in_secs < 0)
+		delay_in_secs = git_env_ulong("GIT_PROGRESS_DELAY", 2);
+
+	return delay_in_secs;
+}
+
 struct progress *start_delayed_progress(const char *title, uint64_t total)
 {
-	return start_progress_delay(title, total, 2, 0);
+	return start_progress_delay(title, total, get_default_delay(), 0);
 }
 
 struct progress *start_progress(const char *title, uint64_t total)
@@ -259,7 +305,7 @@ struct progress *start_sparse_progress(const char *title, uint64_t total)
 struct progress *start_delayed_sparse_progress(const char *title,
 					       uint64_t total)
 {
-	return start_progress_delay(title, total, 2, 1);
+	return start_progress_delay(title, total, get_default_delay(), 1);
 }
 
 static void finish_if_sparse(struct progress *progress)
@@ -289,7 +335,7 @@ void stop_progress_msg(struct progress **p_progress, const char *msg)
 		struct throughput *tp = progress->throughput;
 
 		if (tp) {
-			uint64_t now_ns = getnanotime();
+			uint64_t now_ns = progress_getnanotime(progress);
 			unsigned int misecs, rate;
 			misecs = ((now_ns - progress->start_ns) * 4398) >> 32;
 			rate = tp->curr_total / (misecs ? misecs : 1);
diff --git a/third_party/git/promisor-remote.c b/third_party/git/promisor-remote.c
new file mode 100644
index 000000000000..9f338c945faf
--- /dev/null
+++ b/third_party/git/promisor-remote.c
@@ -0,0 +1,265 @@
+#include "cache.h"
+#include "object-store.h"
+#include "promisor-remote.h"
+#include "config.h"
+#include "transport.h"
+
+static char *repository_format_partial_clone;
+static const char *core_partial_clone_filter_default;
+
+void set_repository_format_partial_clone(char *partial_clone)
+{
+	repository_format_partial_clone = xstrdup_or_null(partial_clone);
+}
+
+static int fetch_refs(const char *remote_name, struct ref *ref)
+{
+	struct remote *remote;
+	struct transport *transport;
+	int res;
+
+	remote = remote_get(remote_name);
+	if (!remote->url[0])
+		die(_("Remote with no URL"));
+	transport = transport_get(remote, remote->url[0]);
+
+	transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
+	transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1");
+	res = transport_fetch_refs(transport, ref);
+
+	return res;
+}
+
+static int fetch_objects(const char *remote_name,
+			 const struct object_id *oids,
+			 int oid_nr)
+{
+	struct ref *ref = NULL;
+	int i;
+
+	for (i = 0; i < oid_nr; i++) {
+		struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i]));
+		oidcpy(&new_ref->old_oid, &oids[i]);
+		new_ref->exact_oid = 1;
+		new_ref->next = ref;
+		ref = new_ref;
+	}
+	return fetch_refs(remote_name, ref);
+}
+
+static struct promisor_remote *promisors;
+static struct promisor_remote **promisors_tail = &promisors;
+
+static struct promisor_remote *promisor_remote_new(const char *remote_name)
+{
+	struct promisor_remote *r;
+
+	if (*remote_name == '/') {
+		warning(_("promisor remote name cannot begin with '/': %s"),
+			remote_name);
+		return NULL;
+	}
+
+	FLEX_ALLOC_STR(r, name, remote_name);
+
+	*promisors_tail = r;
+	promisors_tail = &r->next;
+
+	return r;
+}
+
+static struct promisor_remote *promisor_remote_lookup(const char *remote_name,
+						      struct promisor_remote **previous)
+{
+	struct promisor_remote *r, *p;
+
+	for (p = NULL, r = promisors; r; p = r, r = r->next)
+		if (!strcmp(r->name, remote_name)) {
+			if (previous)
+				*previous = p;
+			return r;
+		}
+
+	return NULL;
+}
+
+static void promisor_remote_move_to_tail(struct promisor_remote *r,
+					 struct promisor_remote *previous)
+{
+	if (r->next == NULL)
+		return;
+
+	if (previous)
+		previous->next = r->next;
+	else
+		promisors = r->next ? r->next : r;
+	r->next = NULL;
+	*promisors_tail = r;
+	promisors_tail = &r->next;
+}
+
+static int promisor_remote_config(const char *var, const char *value, void *data)
+{
+	const char *name;
+	int namelen;
+	const char *subkey;
+
+	if (!strcmp(var, "core.partialclonefilter"))
+		return git_config_string(&core_partial_clone_filter_default,
+					 var, value);
+
+	if (parse_config_key(var, "remote", &name, &namelen, &subkey) < 0)
+		return 0;
+
+	if (!strcmp(subkey, "promisor")) {
+		char *remote_name;
+
+		if (!git_config_bool(var, value))
+			return 0;
+
+		remote_name = xmemdupz(name, namelen);
+
+		if (!promisor_remote_lookup(remote_name, NULL))
+			promisor_remote_new(remote_name);
+
+		free(remote_name);
+		return 0;
+	}
+	if (!strcmp(subkey, "partialclonefilter")) {
+		struct promisor_remote *r;
+		char *remote_name = xmemdupz(name, namelen);
+
+		r = promisor_remote_lookup(remote_name, NULL);
+		if (!r)
+			r = promisor_remote_new(remote_name);
+
+		free(remote_name);
+
+		if (!r)
+			return 0;
+
+		return git_config_string(&r->partial_clone_filter, var, value);
+	}
+
+	return 0;
+}
+
+static int initialized;
+
+static void promisor_remote_init(void)
+{
+	if (initialized)
+		return;
+	initialized = 1;
+
+	git_config(promisor_remote_config, NULL);
+
+	if (repository_format_partial_clone) {
+		struct promisor_remote *o, *previous;
+
+		o = promisor_remote_lookup(repository_format_partial_clone,
+					   &previous);
+		if (o)
+			promisor_remote_move_to_tail(o, previous);
+		else
+			promisor_remote_new(repository_format_partial_clone);
+	}
+}
+
+static void promisor_remote_clear(void)
+{
+	while (promisors) {
+		struct promisor_remote *r = promisors;
+		promisors = promisors->next;
+		free(r);
+	}
+
+	promisors_tail = &promisors;
+}
+
+void promisor_remote_reinit(void)
+{
+	initialized = 0;
+	promisor_remote_clear();
+	promisor_remote_init();
+}
+
+struct promisor_remote *promisor_remote_find(const char *remote_name)
+{
+	promisor_remote_init();
+
+	if (!remote_name)
+		return promisors;
+
+	return promisor_remote_lookup(remote_name, NULL);
+}
+
+int has_promisor_remote(void)
+{
+	return !!promisor_remote_find(NULL);
+}
+
+static int remove_fetched_oids(struct repository *repo,
+			       struct object_id **oids,
+			       int oid_nr, int to_free)
+{
+	int i, remaining_nr = 0;
+	int *remaining = xcalloc(oid_nr, sizeof(*remaining));
+	struct object_id *old_oids = *oids;
+	struct object_id *new_oids;
+
+	for (i = 0; i < oid_nr; i++)
+		if (oid_object_info_extended(repo, &old_oids[i], NULL,
+					     OBJECT_INFO_SKIP_FETCH_OBJECT)) {
+			remaining[i] = 1;
+			remaining_nr++;
+		}
+
+	if (remaining_nr) {
+		int j = 0;
+		new_oids = xcalloc(remaining_nr, sizeof(*new_oids));
+		for (i = 0; i < oid_nr; i++)
+			if (remaining[i])
+				oidcpy(&new_oids[j++], &old_oids[i]);
+		*oids = new_oids;
+		if (to_free)
+			free(old_oids);
+	}
+
+	free(remaining);
+
+	return remaining_nr;
+}
+
+int promisor_remote_get_direct(struct repository *repo,
+			       const struct object_id *oids,
+			       int oid_nr)
+{
+	struct promisor_remote *r;
+	struct object_id *remaining_oids = (struct object_id *)oids;
+	int remaining_nr = oid_nr;
+	int to_free = 0;
+	int res = -1;
+
+	promisor_remote_init();
+
+	for (r = promisors; r; r = r->next) {
+		if (fetch_objects(r->name, remaining_oids, remaining_nr) < 0) {
+			if (remaining_nr == 1)
+				continue;
+			remaining_nr = remove_fetched_oids(repo, &remaining_oids,
+							 remaining_nr, to_free);
+			if (remaining_nr) {
+				to_free = 1;
+				continue;
+			}
+		}
+		res = 0;
+		break;
+	}
+
+	if (to_free)
+		free(remaining_oids);
+
+	return res;
+}
diff --git a/third_party/git/promisor-remote.h b/third_party/git/promisor-remote.h
new file mode 100644
index 000000000000..737bac3a330e
--- /dev/null
+++ b/third_party/git/promisor-remote.h
@@ -0,0 +1,33 @@
+#ifndef PROMISOR_REMOTE_H
+#define PROMISOR_REMOTE_H
+
+#include "repository.h"
+
+struct object_id;
+
+/*
+ * Promisor remote linked list
+ *
+ * Information in its fields come from remote.XXX config entries or
+ * from extensions.partialclone or core.partialclonefilter.
+ */
+struct promisor_remote {
+	struct promisor_remote *next;
+	const char *partial_clone_filter;
+	const char name[FLEX_ARRAY];
+};
+
+void promisor_remote_reinit(void);
+struct promisor_remote *promisor_remote_find(const char *remote_name);
+int has_promisor_remote(void);
+int promisor_remote_get_direct(struct repository *repo,
+			       const struct object_id *oids,
+			       int oid_nr);
+
+/*
+ * This should be used only once from setup.c to set the value we got
+ * from the extensions.partialclone config option.
+ */
+void set_repository_format_partial_clone(char *partial_clone);
+
+#endif /* PROMISOR_REMOTE_H */
diff --git a/third_party/git/protocol.c b/third_party/git/protocol.c
index 9741f057505d..803bef5c87e0 100644
--- a/third_party/git/protocol.c
+++ b/third_party/git/protocol.c
@@ -17,9 +17,8 @@ static enum protocol_version parse_protocol_version(const char *value)
 enum protocol_version get_protocol_version_config(void)
 {
 	const char *value;
-	enum protocol_version retval = protocol_v0;
 	const char *git_test_k = "GIT_TEST_PROTOCOL_VERSION";
-	const char *git_test_v = getenv(git_test_k);
+	const char *git_test_v;
 
 	if (!git_config_get_string_const("protocol.version", &value)) {
 		enum protocol_version version = parse_protocol_version(value);
@@ -28,19 +27,19 @@ enum protocol_version get_protocol_version_config(void)
 			die("unknown value for config 'protocol.version': %s",
 			    value);
 
-		retval = version;
+		return version;
 	}
 
+	git_test_v = getenv(git_test_k);
 	if (git_test_v && *git_test_v) {
 		enum protocol_version env = parse_protocol_version(git_test_v);
 
 		if (env == protocol_unknown_version)
 			die("unknown value for %s: %s", git_test_k, git_test_v);
-		if (retval < env)
-			retval = env;
+		return env;
 	}
 
-	return retval;
+	return protocol_v2;
 }
 
 enum protocol_version determine_protocol_version_server(void)
diff --git a/third_party/git/quote.c b/third_party/git/quote.c
index 7f2aa6faa43f..bcc0dbc50d9b 100644
--- a/third_party/git/quote.c
+++ b/third_party/git/quote.c
@@ -48,8 +48,14 @@ void sq_quote_buf_pretty(struct strbuf *dst, const char *src)
 	static const char ok_punct[] = "+,-./:=@_^";
 	const char *p;
 
+	/* Avoid losing a zero-length string by adding '' */
+	if (!*src) {
+		strbuf_addstr(dst, "''");
+		return;
+	}
+
 	for (p = src; *p; p++) {
-		if (!isalpha(*p) && !isdigit(*p) && !strchr(ok_punct, *p)) {
+		if (!isalnum(*p) && !strchr(ok_punct, *p)) {
 			sq_quote_buf(dst, src);
 			return;
 		}
@@ -84,12 +90,28 @@ void sq_quote_argv(struct strbuf *dst, const char **argv)
 	}
 }
 
+/*
+ * Legacy function to append each argv value, quoted as necessasry,
+ * with whitespace before each value.  This results in a leading
+ * space in the result.
+ */
 void sq_quote_argv_pretty(struct strbuf *dst, const char **argv)
 {
+	if (argv[0])
+		strbuf_addch(dst, ' ');
+	sq_append_quote_argv_pretty(dst, argv);
+}
+
+/*
+ * Append each argv value, quoted as necessary, with whitespace between them.
+ */
+void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv)
+{
 	int i;
 
 	for (i = 0; argv[i]; i++) {
-		strbuf_addch(dst, ' ');
+		if (i > 0)
+			strbuf_addch(dst, ' ');
 		sq_quote_buf_pretty(dst, argv[i]);
 	}
 }
diff --git a/third_party/git/quote.h b/third_party/git/quote.h
index fb08dc085cca..ca8ee3144a6a 100644
--- a/third_party/git/quote.h
+++ b/third_party/git/quote.h
@@ -40,6 +40,7 @@ void sq_quotef(struct strbuf *, const char *fmt, ...);
  */
 void sq_quote_buf_pretty(struct strbuf *, const char *src);
 void sq_quote_argv_pretty(struct strbuf *, const char **argv);
+void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv);
 
 /* This unwraps what sq_quote() produces in place, but returns
  * NULL if the input does not look like what sq_quote would have
diff --git a/third_party/git/range-diff.c b/third_party/git/range-diff.c
index ba1e9a4265a6..f745567cf671 100644
--- a/third_party/git/range-diff.c
+++ b/third_party/git/range-diff.c
@@ -40,7 +40,8 @@ static size_t find_end_of_line(char *buffer, unsigned long size)
  * Reads the patches into a string list, with the `util` field being populated
  * as struct object_id (will need to be free()d).
  */
-static int read_patches(const char *range, struct string_list *list)
+static int read_patches(const char *range, struct string_list *list,
+			const struct argv_array *other_arg)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 	struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT;
@@ -52,6 +53,7 @@ static int read_patches(const char *range, struct string_list *list)
 
 	argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
 			"--reverse", "--date-order", "--decorate=no",
+			"--no-prefix",
 			/*
 			 * Choose indicators that are not used anywhere
 			 * else in diffs, but still look reasonable
@@ -60,8 +62,11 @@ static int read_patches(const char *range, struct string_list *list)
 			"--output-indicator-new=>",
 			"--output-indicator-old=<",
 			"--output-indicator-context=#",
-			"--no-abbrev-commit", range,
+			"--no-abbrev-commit",
 			NULL);
+	if (other_arg)
+		argv_array_pushv(&cp.args, other_arg->argv);
+	argv_array_push(&cp.args, range);
 	cp.out = -1;
 	cp.no_stdin = 1;
 	cp.git_cmd = 1;
@@ -111,7 +116,7 @@ static int read_patches(const char *range, struct string_list *list)
 			if (!util->diff_offset)
 				util->diff_offset = buf.len;
 			line[len - 1] = '\n';
-			len = parse_git_diff_header(&root, &linenr, 1, line,
+			len = parse_git_diff_header(&root, &linenr, 0, line,
 						    len, size, &patch);
 			if (len < 0)
 				die(_("could not parse git header '%.*s'"), (int)len, line);
@@ -143,6 +148,12 @@ static int read_patches(const char *range, struct string_list *list)
 				strbuf_addstr(&buf, line);
 				strbuf_addstr(&buf, "\n\n");
 				strbuf_addstr(&buf, " ## Commit message ##\n");
+			} else if (starts_with(line, "Notes") &&
+				   line[strlen(line) - 1] == ':') {
+				strbuf_addstr(&buf, "\n\n");
+				/* strip the trailing colon */
+				strbuf_addf(&buf, " ## %.*s ##\n",
+					    (int)(strlen(line) - 1), line);
 			} else if (starts_with(line, "    ")) {
 				p = line + len - 2;
 				while (isspace(*p) && p >= line)
@@ -217,8 +228,8 @@ static void find_exact_matches(struct string_list *a, struct string_list *b)
 		util->i = i;
 		util->patch = a->items[i].string;
 		util->diff = util->patch + util->diff_offset;
-		hashmap_entry_init(util, strhash(util->diff));
-		hashmap_add(&map, util);
+		hashmap_entry_init(&util->e, strhash(util->diff));
+		hashmap_add(&map, &util->e);
 	}
 
 	/* Now try to find exact matches in b */
@@ -228,8 +239,8 @@ static void find_exact_matches(struct string_list *a, struct string_list *b)
 		util->i = i;
 		util->patch = b->items[i].string;
 		util->diff = util->patch + util->diff_offset;
-		hashmap_entry_init(util, strhash(util->diff));
-		other = hashmap_remove(&map, util, NULL);
+		hashmap_entry_init(&util->e, strhash(util->diff));
+		other = hashmap_remove_entry(&map, util, e, NULL);
 		if (other) {
 			if (other->matching >= 0)
 				BUG("already assigned!");
@@ -239,7 +250,7 @@ static void find_exact_matches(struct string_list *a, struct string_list *b)
 		}
 	}
 
-	hashmap_free(&map, 0);
+	hashmap_free(&map);
 }
 
 static void diffsize_consume(void *data, char *line, unsigned long len)
@@ -495,16 +506,17 @@ static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
 
 int show_range_diff(const char *range1, const char *range2,
 		    int creation_factor, int dual_color,
-		    struct diff_options *diffopt)
+		    const struct diff_options *diffopt,
+		    const struct argv_array *other_arg)
 {
 	int res = 0;
 
 	struct string_list branch1 = STRING_LIST_INIT_DUP;
 	struct string_list branch2 = STRING_LIST_INIT_DUP;
 
-	if (read_patches(range1, &branch1))
+	if (read_patches(range1, &branch1, other_arg))
 		res = error(_("could not parse log for '%s'"), range1);
-	if (!res && read_patches(range2, &branch2))
+	if (!res && read_patches(range2, &branch2, other_arg))
 		res = error(_("could not parse log for '%s'"), range2);
 
 	if (!res) {
diff --git a/third_party/git/range-diff.h b/third_party/git/range-diff.h
index 08a50b6e98fc..e11976dc81ba 100644
--- a/third_party/git/range-diff.h
+++ b/third_party/git/range-diff.h
@@ -2,16 +2,18 @@
 #define RANGE_DIFF_H
 
 #include "diff.h"
+#include "argv-array.h"
 
 #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
 
 /*
- * Compare series of commmits in RANGE1 and RANGE2, and emit to the
+ * Compare series of commits in RANGE1 and RANGE2, and emit to the
  * standard output.  NULL can be passed to DIFFOPT to use the built-in
  * default.
  */
 int show_range_diff(const char *range1, const char *range2,
 		    int creation_factor, int dual_color,
-		    struct diff_options *diffopt);
+		    const struct diff_options *diffopt,
+		    const struct argv_array *other_arg);
 
 #endif
diff --git a/third_party/git/reachable.c b/third_party/git/reachable.c
index 8f50235b28ed..77a60c70a5db 100644
--- a/third_party/git/reachable.c
+++ b/third_party/git/reachable.c
@@ -223,9 +223,9 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
 	cp.progress = progress;
 	cp.count = 0;
 
-	bitmap_git = prepare_bitmap_walk(revs);
+	bitmap_git = prepare_bitmap_walk(revs, NULL);
 	if (bitmap_git) {
-		traverse_bitmap_commit_list(bitmap_git, mark_object_seen);
+		traverse_bitmap_commit_list(bitmap_git, revs, mark_object_seen);
 		free_bitmap_index(bitmap_git);
 		return;
 	}
diff --git a/third_party/git/read-cache.c b/third_party/git/read-cache.c
index 52ffa8a3139f..aa427c5c170f 100644
--- a/third_party/git/read-cache.c
+++ b/third_party/git/read-cache.c
@@ -959,11 +959,14 @@ static int verify_dotfile(const char *rest, unsigned mode)
 
 int verify_path(const char *path, unsigned mode)
 {
-	char c;
+	char c = 0;
 
 	if (has_dos_drive_prefix(path))
 		return 0;
 
+	if (!is_valid_path(path))
+		return 0;
+
 	goto inside;
 	for (;;) {
 		if (!c)
@@ -971,6 +974,7 @@ int verify_path(const char *path, unsigned mode)
 		if (is_dir_sep(c)) {
 inside:
 			if (protect_hfs) {
+
 				if (is_hfs_dotgit(path))
 					return 0;
 				if (S_ISLNK(mode)) {
@@ -979,6 +983,10 @@ inside:
 				}
 			}
 			if (protect_ntfs) {
+#ifdef GIT_WINDOWS_NATIVE
+				if (c == '\\')
+					return 0;
+#endif
 				if (is_ntfs_dotgit(path))
 					return 0;
 				if (S_ISLNK(mode)) {
@@ -991,7 +999,15 @@ inside:
 			if ((c == '.' && !verify_dotfile(path, mode)) ||
 			    is_dir_sep(c) || c == '\0')
 				return 0;
+		} else if (c == '\\' && protect_ntfs) {
+			if (is_ntfs_dotgit(path))
+				return 0;
+			if (S_ISLNK(mode)) {
+				if (is_ntfs_dotgitmodules(path))
+					return 0;
+			}
 		}
+
 		c = *path++;
 	}
 }
@@ -1276,7 +1292,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
 	 */
 	if (istate->cache_nr > 0 &&
 		strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0)
-		pos = -istate->cache_nr - 1;
+		pos = index_pos_to_insert_pos(istate->cache_nr);
 	else
 		pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
 
@@ -1472,6 +1488,27 @@ static void show_file(const char * fmt, const char * name, int in_porcelain,
 	printf(fmt, name);
 }
 
+int repo_refresh_and_write_index(struct repository *repo,
+				 unsigned int refresh_flags,
+				 unsigned int write_flags,
+				 int gentle,
+				 const struct pathspec *pathspec,
+				 char *seen, const char *header_msg)
+{
+	struct lock_file lock_file = LOCK_INIT;
+	int fd, ret = 0;
+
+	fd = repo_hold_locked_index(repo, &lock_file, 0);
+	if (!gentle && fd < 0)
+		return -1;
+	if (refresh_index(repo->index, refresh_flags, pathspec, seen, header_msg))
+		ret = 1;
+	if (0 <= fd && write_locked_index(repo->index, &lock_file, COMMIT_LOCK | write_flags))
+		ret = -1;
+	return ret;
+}
+
+
 int refresh_index(struct index_state *istate, unsigned int flags,
 		  const struct pathspec *pathspec,
 		  char *seen, const char *header_msg)
@@ -1599,16 +1636,17 @@ struct cache_entry *refresh_cache_entry(struct index_state *istate,
 
 #define INDEX_FORMAT_DEFAULT 3
 
-static unsigned int get_index_format_default(void)
+static unsigned int get_index_format_default(struct repository *r)
 {
 	char *envversion = getenv("GIT_INDEX_VERSION");
 	char *endp;
-	int value;
 	unsigned int version = INDEX_FORMAT_DEFAULT;
 
 	if (!envversion) {
-		if (!git_config_get_int("index.version", &value))
-			version = value;
+		prepare_repo_settings(r);
+
+		if (r->settings.index_version >= 0)
+			version = r->settings.index_version;
 		if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
 			warning(_("index.version set, but the value is invalid.\n"
 				  "Using version %i"), INDEX_FORMAT_DEFAULT);
@@ -1768,7 +1806,7 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool,
 		const unsigned char *cp = (const unsigned char *)name;
 		size_t strip_len, previous_len;
 
-		/* If we're at the begining of a block, ignore the previous name */
+		/* If we're at the beginning of a block, ignore the previous name */
 		strip_len = decode_varint(&cp);
 		if (previous_ce) {
 			previous_len = previous_ce->ce_namelen;
@@ -1844,18 +1882,17 @@ static void check_ce_order(struct index_state *istate)
 
 static void tweak_untracked_cache(struct index_state *istate)
 {
-	switch (git_config_get_untracked_cache()) {
-	case -1: /* keep: do nothing */
-		break;
-	case 0: /* false */
+	struct repository *r = the_repository;
+
+	prepare_repo_settings(r);
+
+	if (r->settings.core_untracked_cache  == UNTRACKED_CACHE_REMOVE) {
 		remove_untracked_cache(istate);
-		break;
-	case 1: /* true */
-		add_untracked_cache(istate);
-		break;
-	default: /* unknown value: do nothing */
-		break;
+		return;
 	}
+
+	if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
+		add_untracked_cache(istate);
 }
 
 static void tweak_split_index(struct index_state *istate)
@@ -1894,7 +1931,7 @@ static size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
 	/*
 	 * Account for potential alignment differences.
 	 */
-	per_entry += align_padding_size(sizeof(struct cache_entry), -sizeof(struct ondisk_cache_entry));
+	per_entry += align_padding_size(per_entry, 0);
 	return ondisk_size + entries * per_entry;
 }
 
@@ -2765,7 +2802,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 	}
 
 	if (!istate->version) {
-		istate->version = get_index_format_default();
+		istate->version = get_index_format_default(the_repository);
 		if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
 			init_split_index(istate);
 	}
diff --git a/third_party/git/rebase-interactive.c b/third_party/git/rebase-interactive.c
index aa18ae82b724..762853bc7e07 100644
--- a/third_party/git/rebase-interactive.c
+++ b/third_party/git/rebase-interactive.c
@@ -5,6 +5,13 @@
 #include "strbuf.h"
 #include "commit-slab.h"
 #include "config.h"
+#include "dir.h"
+
+static const char edit_todo_list_advice[] =
+N_("You can fix this with 'git rebase --edit-todo' "
+"and then run 'git rebase --continue'.\n"
+"Or you can abort the rebase with 'git rebase"
+" --abort'.\n");
 
 enum missing_commit_check_level {
 	MISSING_COMMIT_CHECK_IGNORE = 0,
@@ -28,7 +35,7 @@ static enum missing_commit_check_level get_missing_commit_check_level(void)
 	return MISSING_COMMIT_CHECK_IGNORE;
 }
 
-void append_todo_help(unsigned keep_empty, int command_count,
+void append_todo_help(int command_count,
 		      const char *shortrevisions, const char *shortonto,
 		      struct strbuf *buf)
 {
@@ -80,33 +87,33 @@ void append_todo_help(unsigned keep_empty, int command_count,
 			"the rebase will be aborted.\n\n");
 
 	strbuf_add_commented_lines(buf, msg, strlen(msg));
-
-	if (!keep_empty) {
-		msg = _("Note that empty commits are commented out");
-		strbuf_add_commented_lines(buf, msg, strlen(msg));
-	}
 }
 
 int edit_todo_list(struct repository *r, struct todo_list *todo_list,
 		   struct todo_list *new_todo, const char *shortrevisions,
 		   const char *shortonto, unsigned flags)
 {
-	const char *todo_file = rebase_path_todo();
+	const char *todo_file = rebase_path_todo(),
+		*todo_backup = rebase_path_todo_backup();
 	unsigned initial = shortrevisions && shortonto;
+	int incorrect = 0;
 
 	/* If the user is editing the todo list, we first try to parse
 	 * it.  If there is an error, we do not return, because the user
 	 * might want to fix it in the first place. */
 	if (!initial)
-		todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list);
+		incorrect = todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list) |
+			file_exists(rebase_path_dropped());
 
 	if (todo_list_write_to_file(r, todo_list, todo_file, shortrevisions, shortonto,
 				    -1, flags | TODO_LIST_SHORTEN_IDS | TODO_LIST_APPEND_TODO_HELP))
 		return error_errno(_("could not write '%s'"), todo_file);
 
-	if (initial && copy_file(rebase_path_todo_backup(), todo_file, 0666))
-		return error(_("could not copy '%s' to '%s'."), todo_file,
-			     rebase_path_todo_backup());
+	if (!incorrect &&
+	    todo_list_write_to_file(r, todo_list, todo_backup,
+				    shortrevisions, shortonto, -1,
+				    (flags | TODO_LIST_APPEND_TODO_HELP) & ~TODO_LIST_SHORTEN_IDS) < 0)
+		return error(_("could not write '%s'."), rebase_path_todo_backup());
 
 	if (launch_sequence_editor(todo_file, &new_todo->buf, NULL))
 		return -2;
@@ -115,10 +122,23 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list,
 	if (initial && new_todo->buf.len == 0)
 		return -3;
 
-	/* For the initial edit, the todo list gets parsed in
-	 * complete_action(). */
-	if (!initial)
-		return todo_list_parse_insn_buffer(r, new_todo->buf.buf, new_todo);
+	if (todo_list_parse_insn_buffer(r, new_todo->buf.buf, new_todo)) {
+		fprintf(stderr, _(edit_todo_list_advice));
+		return -4;
+	}
+
+	if (incorrect) {
+		if (todo_list_check_against_backup(r, new_todo)) {
+			write_file(rebase_path_dropped(), "%s", "");
+			return -4;
+		}
+
+		if (incorrect > 0)
+			unlink(rebase_path_dropped());
+	} else if (todo_list_check(todo_list, new_todo)) {
+		write_file(rebase_path_dropped(), "%s", "");
+		return -4;
+	}
 
 	return 0;
 }
@@ -183,7 +203,52 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo)
 		"the level of warnings.\n"
 		"The possible behaviours are: ignore, warn, error.\n\n"));
 
+	fprintf(stderr, _(edit_todo_list_advice));
+
 leave_check:
 	clear_commit_seen(&commit_seen);
 	return res;
 }
+
+int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_list)
+{
+	struct todo_list backup = TODO_LIST_INIT;
+	int res = 0;
+
+	if (strbuf_read_file(&backup.buf, rebase_path_todo_backup(), 0) > 0) {
+		todo_list_parse_insn_buffer(r, backup.buf.buf, &backup);
+		res = todo_list_check(&backup, todo_list);
+	}
+
+	todo_list_release(&backup);
+	return res;
+}
+
+int check_todo_list_from_file(struct repository *r)
+{
+	struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT;
+	int res = 0;
+
+	if (strbuf_read_file(&new_todo.buf, rebase_path_todo(), 0) < 0) {
+		res = error(_("could not read '%s'."), rebase_path_todo());
+		goto out;
+	}
+
+	if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0) {
+		res = error(_("could not read '%s'."), rebase_path_todo_backup());
+		goto out;
+	}
+
+	res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo);
+	if (!res)
+		res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
+	if (res)
+		fprintf(stderr, _(edit_todo_list_advice));
+	if (!res)
+		res = todo_list_check(&old_todo, &new_todo);
+out:
+	todo_list_release(&old_todo);
+	todo_list_release(&new_todo);
+
+	return res;
+}
diff --git a/third_party/git/rebase-interactive.h b/third_party/git/rebase-interactive.h
index 44dbb06311a8..dc2cf0ee122c 100644
--- a/third_party/git/rebase-interactive.h
+++ b/third_party/git/rebase-interactive.h
@@ -5,12 +5,17 @@ struct strbuf;
 struct repository;
 struct todo_list;
 
-void append_todo_help(unsigned keep_empty, int command_count,
+void append_todo_help(int command_count,
 		      const char *shortrevisions, const char *shortonto,
 		      struct strbuf *buf);
 int edit_todo_list(struct repository *r, struct todo_list *todo_list,
 		   struct todo_list *new_todo, const char *shortrevisions,
 		   const char *shortonto, unsigned flags);
+
 int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
+int todo_list_check_against_backup(struct repository *r,
+				   struct todo_list *todo_list);
+
+int check_todo_list_from_file(struct repository *r);
 
 #endif
diff --git a/third_party/git/rebase.c b/third_party/git/rebase.c
new file mode 100644
index 000000000000..f8137d859b51
--- /dev/null
+++ b/third_party/git/rebase.c
@@ -0,0 +1,35 @@
+#include "rebase.h"
+#include "config.h"
+
+/*
+ * Parses textual value for pull.rebase, branch.<name>.rebase, etc.
+ * Unrecognised value yields REBASE_INVALID, which traditionally is
+ * treated the same way as REBASE_FALSE.
+ *
+ * The callers that care if (any) rebase is requested should say
+ *   if (REBASE_TRUE <= rebase_parse_value(string))
+ *
+ * The callers that want to differenciate an unrecognised value and
+ * false can do so by treating _INVALID and _FALSE differently.
+ */
+enum rebase_type rebase_parse_value(const char *value)
+{
+	int v = git_parse_maybe_bool(value);
+
+	if (!v)
+		return REBASE_FALSE;
+	else if (v > 0)
+		return REBASE_TRUE;
+	else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
+		return REBASE_PRESERVE;
+	else if (!strcmp(value, "merges") || !strcmp(value, "m"))
+		return REBASE_MERGES;
+	else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
+		return REBASE_INTERACTIVE;
+	/*
+	 * Please update _git_config() in git-completion.bash when you
+	 * add new rebase modes.
+	 */
+
+	return REBASE_INVALID;
+}
diff --git a/third_party/git/rebase.h b/third_party/git/rebase.h
new file mode 100644
index 000000000000..cc723d474895
--- /dev/null
+++ b/third_party/git/rebase.h
@@ -0,0 +1,15 @@
+#ifndef REBASE_H
+#define REBASE_H
+
+enum rebase_type {
+	REBASE_INVALID = -1,
+	REBASE_FALSE = 0,
+	REBASE_TRUE,
+	REBASE_PRESERVE,
+	REBASE_MERGES,
+	REBASE_INTERACTIVE
+};
+
+enum rebase_type rebase_parse_value(const char *value);
+
+#endif /* REBASE */
diff --git a/third_party/git/ref-filter.c b/third_party/git/ref-filter.c
index f27cfc8c3e35..b1812cb69a17 100644
--- a/third_party/git/ref-filter.c
+++ b/third_party/git/ref-filter.c
@@ -79,17 +79,20 @@ static struct expand_data {
 } oi, oi_deref;
 
 struct ref_to_worktree_entry {
-	struct hashmap_entry ent; /* must be the first member! */
+	struct hashmap_entry ent;
 	struct worktree *wt; /* key is wt->head_ref */
 };
 
 static int ref_to_worktree_map_cmpfnc(const void *unused_lookupdata,
-				      const void *existing_hashmap_entry_to_test,
-				      const void *key,
+				      const struct hashmap_entry *eptr,
+				      const struct hashmap_entry *kptr,
 				      const void *keydata_aka_refname)
 {
-	const struct ref_to_worktree_entry *e = existing_hashmap_entry_to_test;
-	const struct ref_to_worktree_entry *k = key;
+	const struct ref_to_worktree_entry *e, *k;
+
+	e = container_of(eptr, const struct ref_to_worktree_entry, ent);
+	k = container_of(kptr, const struct ref_to_worktree_entry, ent);
+
 	return strcmp(e->wt->head_ref,
 		keydata_aka_refname ? keydata_aka_refname : k->wt->head_ref);
 }
@@ -276,9 +279,9 @@ static int deltabase_atom_parser(const struct ref_format *format, struct used_at
 	if (arg)
 		return strbuf_addf_ret(err, -1, _("%%(deltabase) does not take arguments"));
 	if (*atom->name == '*')
-		oi_deref.info.delta_base_sha1 = oi_deref.delta_base_oid.hash;
+		oi_deref.info.delta_base_oid = &oi_deref.delta_base_oid;
 	else
-		oi.info.delta_base_sha1 = oi.delta_base_oid.hash;
+		oi.info.delta_base_oid = &oi.delta_base_oid;
 	return 0;
 }
 
@@ -1028,7 +1031,7 @@ static const char *copy_name(const char *buf)
 		if (!strncmp(cp, " <", 2))
 			return xmemdupz(buf, cp - buf);
 	}
-	return "";
+	return xstrdup("");
 }
 
 static const char *copy_email(const char *buf)
@@ -1036,10 +1039,10 @@ static const char *copy_email(const char *buf)
 	const char *email = strchr(buf, '<');
 	const char *eoemail;
 	if (!email)
-		return "";
+		return xstrdup("");
 	eoemail = strchr(email, '>');
 	if (!eoemail)
-		return "";
+		return xstrdup("");
 	return xmemdupz(email, eoemail + 1 - email);
 }
 
@@ -1456,12 +1459,10 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
 			remote_for_branch(branch, &explicit);
 		*s = xstrdup(explicit ? remote : "");
 	} else if (atom->u.remote_ref.option == RR_REMOTE_REF) {
-		int explicit;
 		const char *merge;
 
-		merge = remote_ref_for_branch(branch, atom->u.remote_ref.push,
-					      &explicit);
-		*s = xstrdup(explicit ? merge : "");
+		merge = remote_ref_for_branch(branch, atom->u.remote_ref.push);
+		*s = xstrdup(merge ? merge : "");
 	} else
 		BUG("unhandled RR_* enum");
 }
@@ -1565,9 +1566,10 @@ static void populate_worktree_map(struct hashmap *map, struct worktree **worktre
 			struct ref_to_worktree_entry *entry;
 			entry = xmalloc(sizeof(*entry));
 			entry->wt = worktrees[i];
-			hashmap_entry_init(entry, strhash(worktrees[i]->head_ref));
+			hashmap_entry_init(&entry->ent,
+					strhash(worktrees[i]->head_ref));
 
-			hashmap_add(map, entry);
+			hashmap_add(map, &entry->ent);
 		}
 	}
 }
@@ -1584,18 +1586,20 @@ static void lazy_init_worktree_map(void)
 
 static char *get_worktree_path(const struct used_atom *atom, const struct ref_array_item *ref)
 {
-	struct hashmap_entry entry;
+	struct hashmap_entry entry, *e;
 	struct ref_to_worktree_entry *lookup_result;
 
 	lazy_init_worktree_map();
 
 	hashmap_entry_init(&entry, strhash(ref->refname));
-	lookup_result = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname);
+	e = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname);
 
-	if (lookup_result)
-		return xstrdup(lookup_result->wt->path);
-	else
+	if (!e)
 		return xstrdup("");
+
+	lookup_result = container_of(e, struct ref_to_worktree_entry, ent);
+
+	return xstrdup(lookup_result->wt->path);
 }
 
 /*
@@ -1766,7 +1770,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 	 * If it is a tag object, see if we use a value that derefs
 	 * the object, and if we do grab the object it refers to.
 	 */
-	oi_deref.oid = ((struct tag *)obj)->tagged->oid;
+	oi_deref.oid = *get_tagged_oid((struct tag *)obj);
 
 	/*
 	 * NEEDSWORK: This derefs tag only once, which
@@ -1997,7 +2001,7 @@ static const struct object_id *match_points_at(struct oid_array *points_at,
 	if (!obj)
 		die(_("malformed object at '%s'"), refname);
 	if (obj->type == OBJ_TAG)
-		tagged_oid = &((struct tag *)obj)->tagged->oid;
+		tagged_oid = get_tagged_oid((struct tag *)obj);
 	if (tagged_oid && oid_array_lookup(points_at, tagged_oid) >= 0)
 		return tagged_oid;
 	return NULL;
@@ -2166,7 +2170,8 @@ void ref_array_clear(struct ref_array *array)
 	used_atom_cnt = 0;
 
 	if (ref_to_worktree_map.worktrees) {
-		hashmap_free(&(ref_to_worktree_map.map), 1);
+		hashmap_free_entries(&(ref_to_worktree_map.map),
+					struct ref_to_worktree_entry, ent);
 		free_worktrees(ref_to_worktree_map.worktrees);
 		ref_to_worktree_map.worktrees = NULL;
 	}
diff --git a/third_party/git/refs.c b/third_party/git/refs.c
index cd297ee4bdbe..1ab0bb54d3d7 100644
--- a/third_party/git/refs.c
+++ b/third_party/git/refs.c
@@ -1772,7 +1772,7 @@ int resolve_gitlink_ref(const char *submodule, const char *refname,
 
 struct ref_store_hash_entry
 {
-	struct hashmap_entry ent; /* must be the first member! */
+	struct hashmap_entry ent;
 
 	struct ref_store *refs;
 
@@ -1781,11 +1781,16 @@ struct ref_store_hash_entry
 };
 
 static int ref_store_hash_cmp(const void *unused_cmp_data,
-			      const void *entry, const void *entry_or_key,
+			      const struct hashmap_entry *eptr,
+			      const struct hashmap_entry *entry_or_key,
 			      const void *keydata)
 {
-	const struct ref_store_hash_entry *e1 = entry, *e2 = entry_or_key;
-	const char *name = keydata ? keydata : e2->name;
+	const struct ref_store_hash_entry *e1, *e2;
+	const char *name;
+
+	e1 = container_of(eptr, const struct ref_store_hash_entry, ent);
+	e2 = container_of(entry_or_key, const struct ref_store_hash_entry, ent);
+	name = keydata ? keydata : e2->name;
 
 	return strcmp(e1->name, name);
 }
@@ -1796,7 +1801,7 @@ static struct ref_store_hash_entry *alloc_ref_store_hash_entry(
 	struct ref_store_hash_entry *entry;
 
 	FLEX_ALLOC_STR(entry, name, name);
-	hashmap_entry_init(entry, strhash(name));
+	hashmap_entry_init(&entry->ent, strhash(name));
 	entry->refs = refs;
 	return entry;
 }
@@ -1815,12 +1820,15 @@ static struct ref_store *lookup_ref_store_map(struct hashmap *map,
 					      const char *name)
 {
 	struct ref_store_hash_entry *entry;
+	unsigned int hash;
 
 	if (!map->tablesize)
 		/* It's initialized on demand in register_ref_store(). */
 		return NULL;
 
-	entry = hashmap_get_from_hash(map, strhash(name), name);
+	hash = strhash(name);
+	entry = hashmap_get_entry_from_hash(map, hash, name,
+					struct ref_store_hash_entry, ent);
 	return entry ? entry->refs : NULL;
 }
 
@@ -1863,10 +1871,13 @@ static void register_ref_store_map(struct hashmap *map,
 				   struct ref_store *refs,
 				   const char *name)
 {
+	struct ref_store_hash_entry *entry;
+
 	if (!map->tablesize)
 		hashmap_init(map, ref_store_hash_cmp, NULL, 0);
 
-	if (hashmap_put(map, alloc_ref_store_hash_entry(name, refs)))
+	entry = alloc_ref_store_hash_entry(name, refs);
+	if (hashmap_put(map, &entry->ent))
 		BUG("%s ref_store '%s' initialized twice", type, name);
 }
 
diff --git a/third_party/git/refs.h b/third_party/git/refs.h
index 730d05ad91a6..545029c6d805 100644
--- a/third_party/git/refs.h
+++ b/third_party/git/refs.h
@@ -310,19 +310,35 @@ int refs_for_each_branch_ref(struct ref_store *refs,
 int refs_for_each_remote_ref(struct ref_store *refs,
 			     each_ref_fn fn, void *cb_data);
 
+/* just iterates the head ref. */
 int head_ref(each_ref_fn fn, void *cb_data);
+
+/* iterates all refs. */
 int for_each_ref(each_ref_fn fn, void *cb_data);
+
+/**
+ * iterates all refs which have a defined prefix and strips that prefix from
+ * the passed variable refname.
+ */
 int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
+
 int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
 			     each_ref_fn fn, void *cb_data,
 			     unsigned int broken);
 int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
 			unsigned int broken);
+
+/**
+ * iterate refs from the respective area.
+ */
 int for_each_tag_ref(each_ref_fn fn, void *cb_data);
 int for_each_branch_ref(each_ref_fn fn, void *cb_data);
 int for_each_remote_ref(each_ref_fn fn, void *cb_data);
 int for_each_replace_ref(struct repository *r, each_repo_ref_fn fn, void *cb_data);
+
+/* iterates all refs that match the specified glob pattern. */
 int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
+
 int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
 			 const char *prefix, void *cb_data);
 
@@ -791,6 +807,41 @@ int reflog_expire(const char *refname, const struct object_id *oid,
 int ref_storage_backend_exists(const char *name);
 
 struct ref_store *get_main_ref_store(struct repository *r);
+
+/**
+ * Submodules
+ * ----------
+ *
+ * If you want to iterate the refs of a submodule you first need to add the
+ * submodules object database. You can do this by a code-snippet like
+ * this:
+ *
+ * 	const char *path = "path/to/submodule"
+ * 	if (add_submodule_odb(path))
+ * 		die("Error submodule '%s' not populated.", path);
+ *
+ * `add_submodule_odb()` will return zero on success. If you
+ * do not do this you will get an error for each ref that it does not point
+ * to a valid object.
+ *
+ * Note: As a side-effect of this you cannot safely assume that all
+ * objects you lookup are available in superproject. All submodule objects
+ * will be available the same way as the superprojects objects.
+ *
+ * Example:
+ * --------
+ *
+ * ----
+ * static int handle_remote_ref(const char *refname,
+ * 		const unsigned char *sha1, int flags, void *cb_data)
+ * {
+ * 	struct strbuf *output = cb_data;
+ * 	strbuf_addf(output, "%s\n", refname);
+ * 	return 0;
+ * }
+ *
+ */
+
 /*
  * Return the ref_store instance for the specified submodule. For the
  * main repository, use submodule==NULL; such a call cannot fail. For
diff --git a/third_party/git/refs/files-backend.c b/third_party/git/refs/files-backend.c
index d60767ab739f..561c33ac8a97 100644
--- a/third_party/git/refs/files-backend.c
+++ b/third_party/git/refs/files-backend.c
@@ -465,8 +465,7 @@ stat_ref:
 	close(fd);
 	strbuf_rtrim(&sb_contents);
 	buf = sb_contents.buf;
-	if (starts_with(buf, "ref:")) {
-		buf += 4;
+	if (skip_prefix(buf, "ref:", &buf)) {
 		while (isspace(*buf))
 			buf++;
 
@@ -1327,7 +1326,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 {
 	struct files_ref_store *refs =
 		files_downcast(ref_store, REF_STORE_WRITE, "rename_ref");
-	struct object_id oid, orig_oid;
+	struct object_id orig_oid;
 	int flag = 0, logmoved = 0;
 	struct ref_lock *lock;
 	struct stat loginfo;
@@ -1395,7 +1394,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 	 */
 	if (!copy && !refs_read_ref_full(&refs->base, newrefname,
 				RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
-				&oid, NULL) &&
+				NULL, NULL) &&
 	    refs_delete_ref(&refs->base, NULL, newrefname,
 			    NULL, REF_NO_DEREF)) {
 		if (errno == EISDIR) {
diff --git a/third_party/git/refs/packed-backend.c b/third_party/git/refs/packed-backend.c
index c01c7f5901a6..4458a0f69ccb 100644
--- a/third_party/git/refs/packed-backend.c
+++ b/third_party/git/refs/packed-backend.c
@@ -1012,14 +1012,23 @@ int packed_refs_lock(struct ref_store *ref_store, int flags, struct strbuf *err)
 	}
 
 	/*
-	 * Now that we hold the `packed-refs` lock, make sure that our
-	 * snapshot matches the current version of the file. Normally
-	 * `get_snapshot()` does that for us, but that function
-	 * assumes that when the file is locked, any existing snapshot
-	 * is still valid. We've just locked the file, but it might
-	 * have changed the moment *before* we locked it.
+	 * There is a stat-validity problem might cause `update-ref -d`
+	 * lost the newly commit of a ref, because a new `packed-refs`
+	 * file might has the same on-disk file attributes such as
+	 * timestamp, file size and inode value, but has a changed
+	 * ref value.
+	 *
+	 * This could happen with a very small chance when
+	 * `update-ref -d` is called and at the same time another
+	 * `pack-refs --all` process is running.
+	 *
+	 * Now that we hold the `packed-refs` lock, it is important
+	 * to make sure we could read the latest version of
+	 * `packed-refs` file no matter we have just mmap it or not.
+	 * So what need to do is clear the snapshot if we hold it
+	 * already.
 	 */
-	validate_snapshot(refs);
+	clear_snapshot(refs);
 
 	/*
 	 * Now make sure that the packed-refs file as it exists in the
diff --git a/third_party/git/refs/refs-internal.h b/third_party/git/refs/refs-internal.h
index f2d8c0123a77..ff2436c0fb70 100644
--- a/third_party/git/refs/refs-internal.h
+++ b/third_party/git/refs/refs-internal.h
@@ -262,7 +262,7 @@ int refs_rename_ref_available(struct ref_store *refs,
  * after calling ref_iterator_advance() again or calling
  * ref_iterator_abort(), you must make a copy. When the iteration has
  * been exhausted, ref_iterator_advance() releases any resources
- * assocated with the iteration, frees the ref_iterator object, and
+ * associated with the iteration, frees the ref_iterator object, and
  * returns ITER_DONE. If you want to abort the iteration early, call
  * ref_iterator_abort(), which also frees the ref_iterator object and
  * any associated resources. If there was an internal error advancing
diff --git a/third_party/git/refspec.h b/third_party/git/refspec.h
index 9b6e64a824e4..3f2bd4aaa5e0 100644
--- a/third_party/git/refspec.h
+++ b/third_party/git/refspec.h
@@ -20,6 +20,22 @@ struct refspec_item {
 #define REFSPEC_INIT_FETCH { .fetch = REFSPEC_FETCH }
 #define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH }
 
+/**
+ * A struct refspec holds the parsed interpretation of a refspec.  If it will
+ * force updates (starts with a '+'), force is true.  If it is a pattern
+ * (sides end with '*') pattern is true.  src and dest are the two sides
+ * (including '*' characters if present); if there is only one side, it is src,
+ * and dst is NULL; if sides exist but are empty (i.e., the refspec either
+ * starts or ends with ':'), the corresponding side is "".
+ *
+ * An array of strings can be parsed into an array of struct refspecs using
+ * parse_fetch_refspec() or parse_push_refspec().
+ *
+ * remote_find_tracking(), given a remote and a struct refspec with either src
+ * or dst filled out, will fill out the other such that the result is in the
+ * "fetch" specification for the remote (note that this evaluates patterns and
+ * returns a single result).
+ */
 struct refspec {
 	struct refspec_item *items;
 	int alloc;
diff --git a/third_party/git/remote-curl.c b/third_party/git/remote-curl.c
index 051f26629d7b..e4cd3218447f 100644
--- a/third_party/git/remote-curl.c
+++ b/third_party/git/remote-curl.c
@@ -40,7 +40,8 @@ struct options {
 		push_cert : 2,
 		deepen_relative : 1,
 		from_promisor : 1,
-		no_dependents : 1;
+		no_dependents : 1,
+		atomic : 1;
 };
 static struct options options;
 static struct string_list cas_options = STRING_LIST_INIT_DUP;
@@ -148,6 +149,14 @@ static int set_option(const char *name, const char *value)
 		else
 			return -1;
 		return 0;
+	} else if (!strcmp(name, "atomic")) {
+		if (!strcmp(value, "true"))
+			options.atomic = 1;
+		else if (!strcmp(value, "false"))
+			options.atomic = 0;
+		else
+			return -1;
+		return 0;
 	} else if (!strcmp(name, "push-option")) {
 		if (*value != '"')
 			string_list_append(&options.push_options, value);
@@ -1017,6 +1026,7 @@ static int fetch_dumb(int nr_heads, struct ref **to_fetch)
 
 	walker = get_http_walker(url.buf);
 	walker->get_verbosely = options.verbosity >= 3;
+	walker->get_progress = options.progress;
 	walker->get_recover = 0;
 	ret = walker_fetch(walker, nr_heads, targets, NULL, NULL);
 	walker_free(walker);
@@ -1154,7 +1164,7 @@ static void parse_fetch(struct strbuf *buf)
 	strbuf_reset(buf);
 }
 
-static int push_dav(int nr_spec, char **specs)
+static int push_dav(int nr_spec, const char **specs)
 {
 	struct child_process child = CHILD_PROCESS_INIT;
 	size_t i;
@@ -1175,7 +1185,7 @@ static int push_dav(int nr_spec, char **specs)
 	return 0;
 }
 
-static int push_git(struct discovery *heads, int nr_spec, char **specs)
+static int push_git(struct discovery *heads, int nr_spec, const char **specs)
 {
 	struct rpc_state rpc;
 	int i, err;
@@ -1196,6 +1206,8 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs)
 		argv_array_push(&args, "--signed=yes");
 	else if (options.push_cert == SEND_PACK_PUSH_CERT_IF_ASKED)
 		argv_array_push(&args, "--signed=if-asked");
+	if (options.atomic)
+		argv_array_push(&args, "--atomic");
 	if (options.verbosity == 0)
 		argv_array_push(&args, "--quiet");
 	else if (options.verbosity > 1)
@@ -1225,7 +1237,7 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs)
 	return err;
 }
 
-static int push(int nr_spec, char **specs)
+static int push(int nr_spec, const char **specs)
 {
 	struct discovery *heads = discover_refs("git-receive-pack", 1);
 	int ret;
@@ -1240,14 +1252,13 @@ static int push(int nr_spec, char **specs)
 
 static void parse_push(struct strbuf *buf)
 {
-	char **specs = NULL;
-	int alloc_spec = 0, nr_spec = 0, i, ret;
+	struct argv_array specs = ARGV_ARRAY_INIT;
+	int ret;
 
 	do {
-		if (starts_with(buf->buf, "push ")) {
-			ALLOC_GROW(specs, nr_spec + 1, alloc_spec);
-			specs[nr_spec++] = xstrdup(buf->buf + 5);
-		}
+		const char *arg;
+		if (skip_prefix(buf->buf, "push ", &arg))
+			argv_array_push(&specs, arg);
 		else
 			die(_("http transport does not support %s"), buf->buf);
 
@@ -1258,7 +1269,7 @@ static void parse_push(struct strbuf *buf)
 			break;
 	} while (1);
 
-	ret = push(nr_spec, specs);
+	ret = push(specs.argc, specs.argv);
 	printf("\n");
 	fflush(stdout);
 
@@ -1266,9 +1277,7 @@ static void parse_push(struct strbuf *buf)
 		exit(128); /* error already reported */
 
  free_specs:
-	for (i = 0; i < nr_spec; i++)
-		free(specs[i]);
-	free(specs);
+	argv_array_clear(&specs);
 }
 
 static int stateless_connect(const char *service_name)
diff --git a/third_party/git/remote.c b/third_party/git/remote.c
index e50f7602eda5..c43196ec06c5 100644
--- a/third_party/git/remote.c
+++ b/third_party/git/remote.c
@@ -111,14 +111,16 @@ struct remotes_hash_key {
 };
 
 static int remotes_hash_cmp(const void *unused_cmp_data,
-			    const void *entry,
-			    const void *entry_or_key,
+			    const struct hashmap_entry *eptr,
+			    const struct hashmap_entry *entry_or_key,
 			    const void *keydata)
 {
-	const struct remote *a = entry;
-	const struct remote *b = entry_or_key;
+	const struct remote *a, *b;
 	const struct remotes_hash_key *key = keydata;
 
+	a = container_of(eptr, const struct remote, ent);
+	b = container_of(entry_or_key, const struct remote, ent);
+
 	if (key)
 		return strncmp(a->name, key->str, key->len) || a->name[key->len];
 	else
@@ -135,7 +137,7 @@ static struct remote *make_remote(const char *name, int len)
 {
 	struct remote *ret, *replaced;
 	struct remotes_hash_key lookup;
-	struct hashmap_entry lookup_entry;
+	struct hashmap_entry lookup_entry, *e;
 
 	if (!len)
 		len = strlen(name);
@@ -145,8 +147,9 @@ static struct remote *make_remote(const char *name, int len)
 	lookup.len = len;
 	hashmap_entry_init(&lookup_entry, memhash(name, len));
 
-	if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL)
-		return ret;
+	e = hashmap_get(&remotes_hash, &lookup_entry, &lookup);
+	if (e)
+		return container_of(e, struct remote, ent);
 
 	ret = xcalloc(1, sizeof(struct remote));
 	ret->prune = -1;  /* unspecified */
@@ -158,8 +161,8 @@ static struct remote *make_remote(const char *name, int len)
 	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
 	remotes[remotes_nr++] = ret;
 
-	hashmap_entry_init(ret, lookup_entry.hash);
-	replaced = hashmap_put(&remotes_hash, ret);
+	hashmap_entry_init(&ret->ent, lookup_entry.hash);
+	replaced = hashmap_put_entry(&remotes_hash, ret, ent);
 	assert(replaced == NULL);  /* no previous entry overwritten */
 	return ret;
 }
@@ -366,7 +369,8 @@ static int handle_config(const char *key, const char *value, void *cb)
 	}
 	remote = make_remote(name, namelen);
 	remote->origin = REMOTE_CONFIG;
-	if (current_config_scope() == CONFIG_SCOPE_REPO)
+	if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
+	current_config_scope() == CONFIG_SCOPE_WORKTREE)
 		remote->configured_in_repo = 1;
 	if (!strcmp(subkey, "mirror"))
 		remote->mirror = git_config_bool(key, value);
@@ -512,14 +516,11 @@ const char *pushremote_for_branch(struct branch *branch, int *explicit)
 	return remote_for_branch(branch, explicit);
 }
 
-const char *remote_ref_for_branch(struct branch *branch, int for_push,
-				  int *explicit)
+const char *remote_ref_for_branch(struct branch *branch, int for_push)
 {
 	if (branch) {
 		if (!for_push) {
 			if (branch->merge_nr) {
-				if (explicit)
-					*explicit = 1;
 				return branch->merge_name[0];
 			}
 		} else {
@@ -530,15 +531,11 @@ const char *remote_ref_for_branch(struct branch *branch, int for_push,
 			if (remote && remote->push.nr &&
 			    (dst = apply_refspecs(&remote->push,
 						  branch->refname))) {
-				if (explicit)
-					*explicit = 1;
 				return dst;
 			}
 		}
 	}
-	if (explicit)
-		*explicit = 0;
-	return "";
+	return NULL;
 }
 
 static struct remote *remote_get_1(const char *name,
diff --git a/third_party/git/remote.h b/third_party/git/remote.h
index 83e885672ba9..11d8719b5877 100644
--- a/third_party/git/remote.h
+++ b/third_party/git/remote.h
@@ -6,6 +6,14 @@
 #include "hashmap.h"
 #include "refspec.h"
 
+/**
+ * The API gives access to the configuration related to remotes. It handles
+ * all three configuration mechanisms historically and currently used by Git,
+ * and presents the information in a uniform fashion. Note that the code also
+ * handles plain URLs without any configuration, giving them just the default
+ * information.
+ */
+
 enum {
 	REMOTE_UNCONFIGURED = 0,
 	REMOTE_CONFIG,
@@ -14,18 +22,24 @@ enum {
 };
 
 struct remote {
-	struct hashmap_entry ent;  /* must be first */
+	struct hashmap_entry ent;
 
+	/* The user's nickname for the remote */
 	const char *name;
+
 	int origin, configured_in_repo;
 
 	const char *foreign_vcs;
 
+	/* An array of all of the url_nr URLs configured for the remote */
 	const char **url;
+
 	int url_nr;
 	int url_alloc;
 
+	/* An array of all of the pushurl_nr push URLs configured for the remote */
 	const char **pushurl;
+
 	int pushurl_nr;
 	int pushurl_alloc;
 
@@ -34,32 +48,47 @@ struct remote {
 	struct refspec fetch;
 
 	/*
+	 * The setting for whether to fetch tags (as a separate rule from the
+	 * configured refspecs);
 	 * -1 to never fetch tags
 	 * 0 to auto-follow tags on heuristic (default)
 	 * 1 to always auto-follow tags
 	 * 2 to always fetch tags
 	 */
 	int fetch_tags;
+
 	int skip_default_update;
 	int mirror;
 	int prune;
 	int prune_tags;
 
+	/**
+	 * The configured helper programs to run on the remote side, for
+	 * Git-native protocols.
+	 */
 	const char *receivepack;
 	const char *uploadpack;
 
-	/*
-	 * for curl remotes only
-	 */
+	/* The proxy to use for curl (http, https, ftp, etc.) URLs. */
 	char *http_proxy;
+
+	/* The method used for authenticating against `http_proxy`. */
 	char *http_proxy_authmethod;
 };
 
+/**
+ * struct remotes can be found by name with remote_get().
+ * remote_get(NULL) will return the default remote, given the current branch
+ * and configuration.
+ */
 struct remote *remote_get(const char *name);
+
 struct remote *pushremote_get(const char *name);
 int remote_is_configured(struct remote *remote, int in_repo);
 
 typedef int each_remote_fn(struct remote *remote, void *priv);
+
+/* iterate through struct remotes */
 int for_each_remote(each_remote_fn fn, void *priv);
 
 int remote_has_url(struct remote *remote, const char *url);
@@ -194,16 +223,36 @@ struct ref *get_remote_ref(const struct ref *remote_refs, const char *name);
  */
 int remote_find_tracking(struct remote *remote, struct refspec_item *refspec);
 
+/**
+ * struct branch holds the configuration for a branch. It can be looked up with
+ * branch_get(name) for "refs/heads/{name}", or with branch_get(NULL) for HEAD.
+ */
 struct branch {
+
+	/* The short name of the branch. */
 	const char *name;
+
+	/* The full path for the branch ref. */
 	const char *refname;
 
+	/* The name of the remote listed in the configuration. */
 	const char *remote_name;
+
 	const char *pushremote_name;
 
+	/* An array of the "merge" lines in the configuration. */
 	const char **merge_name;
+
+	/**
+	 * An array of the struct refspecs used for the merge lines. That is,
+	 * merge[i]->dst is a local tracking ref which should be merged into this
+	 * branch by default.
+	 */
 	struct refspec_item **merge;
+
+	/* The number of merge configurations */
 	int merge_nr;
+
 	int merge_alloc;
 
 	const char *push_tracking_ref;
@@ -212,10 +261,11 @@ struct branch {
 struct branch *branch_get(const char *name);
 const char *remote_for_branch(struct branch *branch, int *explicit);
 const char *pushremote_for_branch(struct branch *branch, int *explicit);
-const char *remote_ref_for_branch(struct branch *branch, int for_push,
-				  int *explicit);
+const char *remote_ref_for_branch(struct branch *branch, int for_push);
 
+/* returns true if the given branch has merge configuration given. */
 int branch_has_merge_config(struct branch *branch);
+
 int branch_merge_matches(struct branch *, int n, const char *);
 
 /**
diff --git a/third_party/git/replace-object.c b/third_party/git/replace-object.c
index e295e8794310..7bd9aba6ee6c 100644
--- a/third_party/git/replace-object.c
+++ b/third_party/git/replace-object.c
@@ -34,14 +34,23 @@ static int register_replace_ref(struct repository *r,
 
 void prepare_replace_object(struct repository *r)
 {
-	if (r->objects->replace_map)
+	if (r->objects->replace_map_initialized)
 		return;
 
+	pthread_mutex_lock(&r->objects->replace_mutex);
+	if (r->objects->replace_map_initialized) {
+		pthread_mutex_unlock(&r->objects->replace_mutex);
+		return;
+	}
+
 	r->objects->replace_map =
 		xmalloc(sizeof(*r->objects->replace_map));
 	oidmap_init(r->objects->replace_map, 0);
 
 	for_each_replace_ref(r, register_replace_ref, NULL);
+	r->objects->replace_map_initialized = 1;
+
+	pthread_mutex_unlock(&r->objects->replace_mutex);
 }
 
 /* We allow "recursive" replacement. Only within reason, though */
diff --git a/third_party/git/replace-object.h b/third_party/git/replace-object.h
index 04ed7a85a240..3fbc32eb7b7e 100644
--- a/third_party/git/replace-object.h
+++ b/third_party/git/replace-object.h
@@ -24,12 +24,17 @@ const struct object_id *do_lookup_replace_object(struct repository *r,
  * name (replaced recursively, if necessary).  The return value is
  * either sha1 or a pointer to a permanently-allocated value.  When
  * object replacement is suppressed, always return sha1.
+ *
+ * Note: some thread debuggers might point a data race on the
+ * replace_map_initialized reading in this function. However, we know there's no
+ * problem in the value being updated by one thread right after another one read
+ * it here (and it should be written to only once, anyway).
  */
 static inline const struct object_id *lookup_replace_object(struct repository *r,
 							    const struct object_id *oid)
 {
 	if (!read_replace_refs ||
-	    (r->objects->replace_map &&
+	    (r->objects->replace_map_initialized &&
 	     r->objects->replace_map->map.tablesize == 0))
 		return oid;
 	return do_lookup_replace_object(r, oid);
diff --git a/third_party/git/repo-settings.c b/third_party/git/repo-settings.c
new file mode 100644
index 000000000000..a703e407a3f0
--- /dev/null
+++ b/third_party/git/repo-settings.c
@@ -0,0 +1,68 @@
+#include "cache.h"
+#include "config.h"
+#include "repository.h"
+
+#define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
+
+void prepare_repo_settings(struct repository *r)
+{
+	int value;
+	char *strval;
+
+	if (r->settings.initialized)
+		return;
+
+	/* Defaults */
+	memset(&r->settings, -1, sizeof(r->settings));
+
+	if (!repo_config_get_bool(r, "core.commitgraph", &value))
+		r->settings.core_commit_graph = value;
+	if (!repo_config_get_bool(r, "gc.writecommitgraph", &value))
+		r->settings.gc_write_commit_graph = value;
+	UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1);
+	UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1);
+
+	if (!repo_config_get_int(r, "index.version", &value))
+		r->settings.index_version = value;
+	if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) {
+		if (value == 0)
+			r->settings.core_untracked_cache = UNTRACKED_CACHE_REMOVE;
+		else
+			r->settings.core_untracked_cache = UNTRACKED_CACHE_WRITE;
+	} else if (!repo_config_get_string(r, "core.untrackedcache", &strval)) {
+		if (!strcasecmp(strval, "keep"))
+			r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+
+		free(strval);
+	}
+
+	if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) {
+		if (!strcasecmp(strval, "skipping"))
+			r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
+		else
+			r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
+	}
+
+	if (!repo_config_get_bool(r, "pack.usesparse", &value))
+		r->settings.pack_use_sparse = value;
+	if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) {
+		UPDATE_DEFAULT_BOOL(r->settings.index_version, 4);
+		UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE);
+	}
+	if (!repo_config_get_bool(r, "fetch.writecommitgraph", &value))
+		r->settings.fetch_write_commit_graph = value;
+	if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
+		UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
+		UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
+		UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 1);
+	}
+	UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0);
+
+	/* Hack for test programs like test-dump-untracked-cache */
+	if (ignore_untracked_cache_config)
+		r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+	else
+		UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_KEEP);
+
+	UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_DEFAULT);
+}
diff --git a/third_party/git/repository.c b/third_party/git/repository.c
index 682c239fe3ed..a4174ddb0629 100644
--- a/third_party/git/repository.c
+++ b/third_party/git/repository.c
@@ -200,9 +200,9 @@ int repo_submodule_init(struct repository *subrepo,
 
 	if (repo_init(subrepo, gitdir.buf, worktree.buf)) {
 		/*
-		 * If initilization fails then it may be due to the submodule
+		 * If initialization fails then it may be due to the submodule
 		 * not being populated in the superproject's worktree.  Instead
-		 * we can try to initilize the submodule by finding it's gitdir
+		 * we can try to initialize the submodule by finding it's gitdir
 		 * in the superproject's 'modules' directory.  In this case the
 		 * submodule would not have a worktree.
 		 */
diff --git a/third_party/git/repository.h b/third_party/git/repository.h
index 4fb6a5885f79..040057dea6f4 100644
--- a/third_party/git/repository.h
+++ b/third_party/git/repository.h
@@ -11,6 +11,34 @@ struct pathspec;
 struct raw_object_store;
 struct submodule_cache;
 
+enum untracked_cache_setting {
+	UNTRACKED_CACHE_UNSET = -1,
+	UNTRACKED_CACHE_REMOVE = 0,
+	UNTRACKED_CACHE_KEEP = 1,
+	UNTRACKED_CACHE_WRITE = 2
+};
+
+enum fetch_negotiation_setting {
+	FETCH_NEGOTIATION_UNSET = -1,
+	FETCH_NEGOTIATION_NONE = 0,
+	FETCH_NEGOTIATION_DEFAULT = 1,
+	FETCH_NEGOTIATION_SKIPPING = 2,
+};
+
+struct repo_settings {
+	int initialized;
+
+	int core_commit_graph;
+	int gc_write_commit_graph;
+	int fetch_write_commit_graph;
+
+	int index_version;
+	enum untracked_cache_setting core_untracked_cache;
+
+	int pack_use_sparse;
+	enum fetch_negotiation_setting fetch_negotiation_algorithm;
+};
+
 struct repository {
 	/* Environment */
 	/*
@@ -72,6 +100,8 @@ struct repository {
 	 */
 	char *submodule_prefix;
 
+	struct repo_settings settings;
+
 	/* Subsystems */
 	/*
 	 * Repository's config which contains key-value pairs from the usual
@@ -95,6 +125,9 @@ struct repository {
 	/* A unique-id for tracing purposes. */
 	int trace2_repo_id;
 
+	/* True if commit-graph has been disabled within this process. */
+	int commit_graph_disabled;
+
 	/* Configurations */
 
 	/* Indicate if a repository has a different 'commondir' from 'gitdir' */
@@ -139,7 +172,7 @@ void repo_clear(struct repository *repo);
  * be allocated if needed.
  *
  * Return the number of index entries in the populated index or a value less
- * than zero if an error occured.  If the repository's index has already been
+ * than zero if an error occurred.  If the repository's index has already been
  * populated then the number of entries will simply be returned.
  */
 int repo_read_index(struct repository *repo);
@@ -157,5 +190,6 @@ int repo_read_index_unmerged(struct repository *);
  */
 void repo_update_index_if_able(struct repository *, struct lock_file *);
 
+void prepare_repo_settings(struct repository *r);
 
 #endif /* REPOSITORY_H */
diff --git a/third_party/git/rerere.c b/third_party/git/rerere.c
index 17abb47321f1..9281131a9f10 100644
--- a/third_party/git/rerere.c
+++ b/third_party/git/rerere.c
@@ -52,7 +52,7 @@ static void free_rerere_id(struct string_list_item *item)
 
 static const char *rerere_id_hex(const struct rerere_id *id)
 {
-	return sha1_to_hex(id->collection->hash);
+	return hash_to_hex(id->collection->hash);
 }
 
 static void fit_variant(struct rerere_dir *rr_dir, int variant)
@@ -115,7 +115,7 @@ static int is_rr_file(const char *name, const char *filename, int *variant)
 static void scan_rerere_dir(struct rerere_dir *rr_dir)
 {
 	struct dirent *de;
-	DIR *dir = opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir->hash)));
+	DIR *dir = opendir(git_path("rr-cache/%s", hash_to_hex(rr_dir->hash)));
 
 	if (!dir)
 		return;
@@ -186,9 +186,9 @@ static struct rerere_id *new_rerere_id_hex(char *hex)
 	return id;
 }
 
-static struct rerere_id *new_rerere_id(unsigned char *sha1)
+static struct rerere_id *new_rerere_id(unsigned char *hash)
 {
-	return new_rerere_id_hex(sha1_to_hex(sha1));
+	return new_rerere_id_hex(hash_to_hex(hash));
 }
 
 /*
@@ -431,7 +431,7 @@ static int handle_conflict(struct strbuf *out, struct rerere_io *io,
  * and NUL concatenated together.
  *
  * Return 1 if conflict hunks are found, 0 if there are no conflict
- * hunks and -1 if an error occured.
+ * hunks and -1 if an error occurred.
  */
 static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size)
 {
diff --git a/third_party/git/revision.c b/third_party/git/revision.c
index 07412297f024..8136929e2362 100644
--- a/third_party/git/revision.c
+++ b/third_party/git/revision.c
@@ -28,6 +28,7 @@
 #include "commit-graph.h"
 #include "prio-queue.h"
 #include "hashmap.h"
+#include "utf8.h"
 
 volatile show_early_output_fn_t show_early_output;
 
@@ -107,30 +108,34 @@ struct path_and_oids_entry {
 };
 
 static int path_and_oids_cmp(const void *hashmap_cmp_fn_data,
-			     const struct path_and_oids_entry *e1,
-			     const struct path_and_oids_entry *e2,
+			     const struct hashmap_entry *eptr,
+			     const struct hashmap_entry *entry_or_key,
 			     const void *keydata)
 {
+	const struct path_and_oids_entry *e1, *e2;
+
+	e1 = container_of(eptr, const struct path_and_oids_entry, ent);
+	e2 = container_of(entry_or_key, const struct path_and_oids_entry, ent);
+
 	return strcmp(e1->path, e2->path);
 }
 
 static void paths_and_oids_init(struct hashmap *map)
 {
-	hashmap_init(map, (hashmap_cmp_fn) path_and_oids_cmp, NULL, 0);
+	hashmap_init(map, path_and_oids_cmp, NULL, 0);
 }
 
 static void paths_and_oids_clear(struct hashmap *map)
 {
 	struct hashmap_iter iter;
 	struct path_and_oids_entry *entry;
-	hashmap_iter_init(map, &iter);
 
-	while ((entry = (struct path_and_oids_entry *)hashmap_iter_next(&iter))) {
+	hashmap_for_each_entry(map, &iter, entry, ent /* member name */) {
 		oidset_clear(&entry->trees);
 		free(entry->path);
 	}
 
-	hashmap_free(map, 1);
+	hashmap_free_entries(map, struct path_and_oids_entry, ent);
 }
 
 static void paths_and_oids_insert(struct hashmap *map,
@@ -141,18 +146,19 @@ static void paths_and_oids_insert(struct hashmap *map,
 	struct path_and_oids_entry key;
 	struct path_and_oids_entry *entry;
 
-	hashmap_entry_init(&key, hash);
+	hashmap_entry_init(&key.ent, hash);
 
 	/* use a shallow copy for the lookup */
 	key.path = (char *)path;
 	oidset_init(&key.trees, 0);
 
-	if (!(entry = (struct path_and_oids_entry *)hashmap_get(map, &key, NULL))) {
+	entry = hashmap_get_entry(map, &key, ent, NULL);
+	if (!entry) {
 		entry = xcalloc(1, sizeof(struct path_and_oids_entry));
-		hashmap_entry_init(entry, hash);
+		hashmap_entry_init(&entry->ent, hash);
 		entry->path = xstrdup(key.path);
 		oidset_init(&entry->trees, 16);
-		hashmap_put(map, entry);
+		hashmap_put(map, &entry->ent);
 	}
 
 	oidset_insert(&entry->trees, oid);
@@ -235,8 +241,7 @@ void mark_trees_uninteresting_sparse(struct repository *r,
 		add_children_by_path(r, tree, &map);
 	}
 
-	hashmap_iter_init(&map, &map_iter);
-	while ((entry = hashmap_iter_next(&map_iter)))
+	hashmap_for_each_entry(&map, &map_iter, entry, ent /* member name */)
 		mark_trees_uninteresting_sparse(r, &entry->trees);
 
 	paths_and_oids_clear(&map);
@@ -404,9 +409,7 @@ static struct commit *handle_commit(struct rev_info *revs,
 		struct tag *tag = (struct tag *) object;
 		if (revs->tag_objects && !(flags & UNINTERESTING))
 			add_pending_object(revs, object, tag->tag);
-		if (!tag->tagged)
-			die("bad tag");
-		object = parse_object(revs->repo, &tag->tagged->oid);
+		object = parse_object(revs->repo, get_tagged_oid(tag));
 		if (!object) {
 			if (revs->ignore_missing_links || (flags & UNINTERESTING))
 				return NULL;
@@ -1665,7 +1668,7 @@ void repo_init_revisions(struct repository *r,
 		revs->diffopt.prefix_length = strlen(prefix);
 	}
 
-	revs->notes_opt.use_default_notes = -1;
+	init_display_notes(&revs->notes_opt);
 }
 
 static void add_pending_commit_list(struct rev_info *revs,
@@ -2063,7 +2066,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->simplify_by_decoration = 1;
 		revs->limited = 1;
 		revs->prune = 1;
-		load_ref_decorations(NULL, DECORATE_SHORT_REFS);
 	} else if (!strcmp(arg, "--date-order")) {
 		revs->sort_order = REV_SORT_BY_COMMIT_DATE;
 		revs->topo_order = 1;
@@ -2201,9 +2203,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 			die("'%s': not a non-negative integer", arg);
 		revs->expand_tabs_in_log = val;
 	} else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
-		revs->show_notes = 1;
+		enable_default_display_notes(&revs->notes_opt, &revs->show_notes);
 		revs->show_notes_given = 1;
-		revs->notes_opt.use_default_notes = 1;
 	} else if (!strcmp(arg, "--show-signature")) {
 		revs->show_signature = 1;
 	} else if (!strcmp(arg, "--no-show-signature")) {
@@ -2218,25 +2219,14 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->track_first_time = 1;
 	} else if (skip_prefix(arg, "--show-notes=", &optarg) ||
 		   skip_prefix(arg, "--notes=", &optarg)) {
-		struct strbuf buf = STRBUF_INIT;
-		revs->show_notes = 1;
-		revs->show_notes_given = 1;
 		if (starts_with(arg, "--show-notes=") &&
 		    revs->notes_opt.use_default_notes < 0)
 			revs->notes_opt.use_default_notes = 1;
-		strbuf_addstr(&buf, optarg);
-		expand_notes_ref(&buf);
-		string_list_append(&revs->notes_opt.extra_notes_refs,
-				   strbuf_detach(&buf, NULL));
+		enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg);
+		revs->show_notes_given = 1;
 	} else if (!strcmp(arg, "--no-notes")) {
-		revs->show_notes = 0;
+		disable_display_notes(&revs->notes_opt, &revs->show_notes);
 		revs->show_notes_given = 1;
-		revs->notes_opt.use_default_notes = -1;
-		/* we have been strdup'ing ourselves, so trick
-		 * string_list into free()ing strings */
-		revs->notes_opt.extra_notes_refs.strdup_strings = 1;
-		string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
-		revs->notes_opt.extra_notes_refs.strdup_strings = 0;
 	} else if (!strcmp(arg, "--standard-notes")) {
 		revs->show_notes_given = 1;
 		revs->notes_opt.use_default_notes = 1;
@@ -2523,6 +2513,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt;
 	struct argv_array prune_data = ARGV_ARRAY_INIT;
 	const char *submodule = NULL;
+	int seen_end_of_options = 0;
 
 	if (opt)
 		submodule = opt->submodule;
@@ -2552,7 +2543,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 		revarg_opt |= REVARG_CANNOT_BE_FILENAME;
 	for (left = i = 1; i < argc; i++) {
 		const char *arg = argv[i];
-		if (*arg == '-') {
+		if (!seen_end_of_options && *arg == '-') {
 			int opts;
 
 			opts = handle_revision_pseudo_opt(submodule,
@@ -2574,6 +2565,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 				continue;
 			}
 
+			if (!strcmp(arg, "--end-of-options")) {
+				seen_end_of_options = 1;
+				continue;
+			}
+
 			opts = handle_revision_opt(revs, argc - i, argv + i,
 						   &left, argv, opt);
 			if (opts > 0) {
@@ -2684,6 +2680,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 
 	grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
 				 &revs->grep_filter);
+	if (!is_encoding_utf8(get_log_output_encoding()))
+		revs->grep_filter.ignore_locale = 1;
 	compile_grep_patterns(&revs->grep_filter);
 
 	if (revs->reverse && revs->reflog_info)
@@ -3088,7 +3086,7 @@ static void set_children(struct rev_info *revs)
 
 void reset_revision_walk(void)
 {
-	clear_object_flags(SEEN | ADDED | SHOWN);
+	clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE);
 }
 
 static int mark_uninteresting(const struct object_id *oid,
@@ -3201,10 +3199,26 @@ static void compute_indegrees_to_depth(struct rev_info *revs,
 		indegree_walk_step(revs);
 }
 
+static void reset_topo_walk(struct rev_info *revs)
+{
+	struct topo_walk_info *info = revs->topo_walk_info;
+
+	clear_prio_queue(&info->explore_queue);
+	clear_prio_queue(&info->indegree_queue);
+	clear_prio_queue(&info->topo_queue);
+	clear_indegree_slab(&info->indegree);
+	clear_author_date_slab(&info->author_date);
+
+	FREE_AND_NULL(revs->topo_walk_info);
+}
+
 static void init_topo_walk(struct rev_info *revs)
 {
 	struct topo_walk_info *info;
 	struct commit_list *list;
+	if (revs->topo_walk_info)
+		reset_topo_walk(revs);
+
 	revs->topo_walk_info = xmalloc(sizeof(struct topo_walk_info));
 	info = revs->topo_walk_info;
 	memset(info, 0, sizeof(struct topo_walk_info));
@@ -3934,7 +3948,7 @@ struct commit *get_revision(struct rev_info *revs)
 	return c;
 }
 
-char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
+const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
 {
 	if (commit->object.flags & BOUNDARY)
 		return "-";
@@ -3956,7 +3970,7 @@ char *get_revision_mark(const struct rev_info *revs, const struct commit *commit
 
 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
 {
-	char *mark = get_revision_mark(revs, commit);
+	const char *mark = get_revision_mark(revs, commit);
 	if (!strlen(mark))
 		return;
 	fputs(mark, stdout);
diff --git a/third_party/git/revision.h b/third_party/git/revision.h
index 4134dc6029c4..475f048fb611 100644
--- a/third_party/git/revision.h
+++ b/third_party/git/revision.h
@@ -9,6 +9,19 @@
 #include "diff.h"
 #include "commit-slab-decl.h"
 
+/**
+ * The revision walking API offers functions to build a list of revisions
+ * and then iterate over that list.
+ *
+ * Calling sequence
+ * ----------------
+ *
+ * The walking API has a given calling sequence: first you need to initialize
+ * a rev_info structure, then add revisions to control what kind of revision
+ * list do you want to get, finally you can iterate over the revision list.
+ *
+ */
+
 /* Remember to update object flag allocation in object.h */
 #define SEEN		(1u<<0)
 #define UNINTERESTING   (1u<<1)
@@ -177,10 +190,10 @@ struct rev_info {
 			always_show_header:1;
 
 	/* Format info */
+	int		show_notes;
 	unsigned int	shown_one:1,
 			shown_dashes:1,
 			show_merge:1,
-			show_notes:1,
 			show_notes_given:1,
 			show_signature:1,
 			pretty_given:1,
@@ -306,11 +319,29 @@ struct setup_revision_opt {
 #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
 #define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
 #endif
+
+/**
+ * Initialize a rev_info structure with default values. The third parameter may
+ * be NULL or can be prefix path, and then the `.prefix` variable will be set
+ * to it. This is typically the first function you want to call when you want
+ * to deal with a revision list. After calling this function, you are free to
+ * customize options, like set `.ignore_merges` to 0 if you don't want to
+ * ignore merges, and so on.
+ */
 void repo_init_revisions(struct repository *r,
 			 struct rev_info *revs,
 			 const char *prefix);
+
+/**
+ * Parse revision information, filling in the `rev_info` structure, and
+ * removing the used arguments from the argument list. Returns the number
+ * of arguments left that weren't recognized, which are also moved to the
+ * head of the argument list. The last parameter is used in case no
+ * parameter given by the first two arguments.
+ */
 int setup_revisions(int argc, const char **argv, struct rev_info *revs,
 		    struct setup_revision_opt *);
+
 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 			const struct option *options,
 			const char * const usagestr[]);
@@ -319,11 +350,28 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 int handle_revision_arg(const char *arg, struct rev_info *revs,
 			int flags, unsigned revarg_opt);
 
+/**
+ * Reset the flags used by the revision walking api. You can use this to do
+ * multiple sequential revision walks.
+ */
 void reset_revision_walk(void);
+
+/**
+ * Prepares the rev_info structure for a walk. You should check if it returns
+ * any error (non-zero return code) and if it does not, you can start using
+ * get_revision() to do the iteration.
+ */
 int prepare_revision_walk(struct rev_info *revs);
+
+/**
+ * Takes a pointer to a `rev_info` structure and iterates over it, returning a
+ * `struct commit *` each time you call it. The end of the revision list is
+ * indicated by returning a NULL pointer.
+ */
 struct commit *get_revision(struct rev_info *revs);
-char *get_revision_mark(const struct rev_info *revs,
-			const struct commit *commit);
+
+const char *get_revision_mark(const struct rev_info *revs,
+			      const struct commit *commit);
 void put_revision_mark(const struct rev_info *revs,
 		       const struct commit *commit);
 
@@ -333,8 +381,19 @@ void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees)
 
 void show_object_with_name(FILE *, struct object *, const char *);
 
+/**
+ * This function can be used if you want to add commit objects as revision
+ * information. You can use the `UNINTERESTING` object flag to indicate if
+ * you want to include or exclude the given commit (and commits reachable
+ * from the given commit) from the revision list.
+ *
+ * NOTE: If you have the commits as a string list then you probably want to
+ * use setup_revisions(), instead of parsing each string and using this
+ * function.
+ */
 void add_pending_object(struct rev_info *revs,
 			struct object *obj, const char *name);
+
 void add_pending_oid(struct rev_info *revs,
 		     const char *name, const struct object_id *oid,
 		     unsigned int flags);
diff --git a/third_party/git/run-command.c b/third_party/git/run-command.c
index 3449db319b95..f5e1149f9b39 100644
--- a/third_party/git/run-command.c
+++ b/third_party/git/run-command.c
@@ -213,8 +213,9 @@ static char *locate_in_PATH(const char *file)
 static int exists_in_PATH(const char *file)
 {
 	char *r = locate_in_PATH(file);
+	int found = r != NULL;
 	free(r);
-	return r != NULL;
+	return found;
 }
 
 int sane_execvp(const char *file, char * const argv[])
@@ -412,8 +413,7 @@ static int prepare_cmd(struct argv_array *out, const struct child_process *cmd)
 	argv_array_push(out, SHELL_PATH);
 
 	if (cmd->git_cmd) {
-		argv_array_push(out, "git");
-		argv_array_pushv(out, cmd->argv);
+		prepare_git_cmd(out, cmd->argv);
 	} else if (cmd->use_shell) {
 		prepare_shell_cmd(out, cmd->argv);
 	} else {
diff --git a/third_party/git/run-command.h b/third_party/git/run-command.h
index f769e03f018f..0f3cc73ab672 100644
--- a/third_party/git/run-command.h
+++ b/third_party/git/run-command.h
@@ -5,8 +5,60 @@
 
 #include "argv-array.h"
 
+/**
+ * The run-command API offers a versatile tool to run sub-processes with
+ * redirected input and output as well as with a modified environment
+ * and an alternate current directory.
+ *
+ * A similar API offers the capability to run a function asynchronously,
+ * which is primarily used to capture the output that the function
+ * produces in the caller in order to process it.
+ */
+
+
+/**
+ * This describes the arguments, redirections, and environment of a
+ * command to run in a sub-process.
+ *
+ * The caller:
+ *
+ * 1. allocates and clears (using child_process_init() or
+ *    CHILD_PROCESS_INIT) a struct child_process variable;
+ * 2. initializes the members;
+ * 3. calls start_command();
+ * 4. processes the data;
+ * 5. closes file descriptors (if necessary; see below);
+ * 6. calls finish_command().
+ *
+ * Special forms of redirection are available by setting these members
+ * to 1:
+ *
+ *  .no_stdin, .no_stdout, .no_stderr: The respective channel is
+ *		redirected to /dev/null.
+ *
+ *	.stdout_to_stderr: stdout of the child is redirected to its
+ *		stderr. This happens after stderr is itself redirected.
+ *		So stdout will follow stderr to wherever it is
+ *		redirected.
+ */
 struct child_process {
+
+	/**
+	 * The .argv member is set up as an array of string pointers (NULL
+	 * terminated), of which .argv[0] is the program name to run (usually
+	 * without a path). If the command to run is a git command, set argv[0] to
+	 * the command name without the 'git-' prefix and set .git_cmd = 1.
+	 *
+	 * Note that the ownership of the memory pointed to by .argv stays with the
+	 * caller, but it should survive until `finish_command` completes. If the
+	 * .argv member is NULL, `start_command` will point it at the .args
+	 * `argv_array` (so you may use one or the other, but you must use exactly
+	 * one). The memory in .args will be cleaned up automatically during
+	 * `finish_command` (or during `start_command` when it is unsuccessful).
+	 *
+	 */
 	const char **argv;
+
 	struct argv_array args;
 	struct argv_array env_array;
 	pid_t pid;
@@ -18,8 +70,8 @@ struct child_process {
 
 	/*
 	 * Using .in, .out, .err:
-	 * - Specify 0 for no redirections (child inherits stdin, stdout,
-	 *   stderr from parent).
+	 * - Specify 0 for no redirections. No new file descriptor is allocated.
+	 * (child inherits stdin, stdout, stderr from parent).
 	 * - Specify -1 to have a pipe allocated as follows:
 	 *     .in: returns the writable pipe end; parent writes to it,
 	 *          the readable pipe end becomes child's stdin
@@ -37,13 +89,43 @@ struct child_process {
 	int in;
 	int out;
 	int err;
+
+	/**
+	 * To specify a new initial working directory for the sub-process,
+	 * specify it in the .dir member.
+	 */
 	const char *dir;
+
+	/**
+	 * To modify the environment of the sub-process, specify an array of
+	 * string pointers (NULL terminated) in .env:
+	 *
+	 * - If the string is of the form "VAR=value", i.e. it contains '='
+	 *   the variable is added to the child process's environment.
+	 *
+	 * - If the string does not contain '=', it names an environment
+	 *   variable that will be removed from the child process's environment.
+	 *
+	 * If the .env member is NULL, `start_command` will point it at the
+	 * .env_array `argv_array` (so you may use one or the other, but not both).
+	 * The memory in .env_array will be cleaned up automatically during
+	 * `finish_command` (or during `start_command` when it is unsuccessful).
+	 */
 	const char *const *env;
+
 	unsigned no_stdin:1;
 	unsigned no_stdout:1;
 	unsigned no_stderr:1;
 	unsigned git_cmd:1; /* if this is to be git sub-command */
+
+	/**
+	 * If the program cannot be found, the functions return -1 and set
+	 * errno to ENOENT. Normally, an error message is printed, but if
+	 * .silent_exec_failure is set to 1, no message is printed for this
+	 * special error condition.
+	 */
 	unsigned silent_exec_failure:1;
+
 	unsigned stdout_to_stderr:1;
 	unsigned use_shell:1;
 	unsigned clean_on_exit:1;
@@ -53,13 +135,63 @@ struct child_process {
 };
 
 #define CHILD_PROCESS_INIT { NULL, ARGV_ARRAY_INIT, ARGV_ARRAY_INIT }
+
+/**
+ * The functions: child_process_init, start_command, finish_command,
+ * run_command, run_command_v_opt, run_command_v_opt_cd_env, child_process_clear
+ * do the following:
+ *
+ * - If a system call failed, errno is set and -1 is returned. A diagnostic
+ *   is printed.
+ *
+ * - If the program was not found, then -1 is returned and errno is set to
+ *   ENOENT; a diagnostic is printed only if .silent_exec_failure is 0.
+ *
+ * - Otherwise, the program is run. If it terminates regularly, its exit
+ *   code is returned. No diagnostic is printed, even if the exit code is
+ *   non-zero.
+ *
+ * - If the program terminated due to a signal, then the return value is the
+ *   signal number + 128, ie. the same value that a POSIX shell's $? would
+ *   report.  A diagnostic is printed.
+ *
+ */
+
+/**
+ * Initialize a struct child_process variable.
+ */
 void child_process_init(struct child_process *);
+
+/**
+ * Release the memory associated with the struct child_process.
+ * Most users of the run-command API don't need to call this
+ * function explicitly because `start_command` invokes it on
+ * failure and `finish_command` calls it automatically already.
+ */
 void child_process_clear(struct child_process *);
+
 int is_executable(const char *name);
 
+/**
+ * Start a sub-process. Takes a pointer to a `struct child_process`
+ * that specifies the details and returns pipe FDs (if requested).
+ * See below for details.
+ */
 int start_command(struct child_process *);
+
+/**
+ * Wait for the completion of a sub-process that was started with
+ * start_command().
+ */
 int finish_command(struct child_process *);
+
 int finish_command_in_signal(struct child_process *);
+
+/**
+ * A convenience function that encapsulates a sequence of
+ * start_command() followed by finish_command(). Takes a pointer
+ * to a `struct child_process` that specifies the details.
+ */
 int run_command(struct child_process *);
 
 /*
@@ -68,6 +200,20 @@ int run_command(struct child_process *);
  * overwritten by further calls to find_hook and run_hook_*.
  */
 const char *find_hook(const char *name);
+
+/**
+ * Run a hook.
+ * The first argument is a pathname to an index file, or NULL
+ * if the hook uses the default index file or no index is needed.
+ * The second argument is the name of the hook.
+ * The further arguments correspond to the hook arguments.
+ * The last argument has to be NULL to terminate the arguments list.
+ * If the hook does not exist or is not executable, the return
+ * value will be zero.
+ * If it is executable, the hook will be executed and the exit
+ * status of the hook is returned.
+ * On execution, .stdout_to_stderr and .no_stdin will be set.
+ */
 LAST_ARG_MUST_BE_NULL
 int run_hook_le(const char *const *env, const char *name, ...);
 int run_hook_ve(const char *const *env, const char *name, va_list args);
@@ -78,6 +224,18 @@ int run_hook_ve(const char *const *env, const char *name, va_list args);
 #define RUN_SILENT_EXEC_FAILURE 8
 #define RUN_USING_SHELL 16
 #define RUN_CLEAN_ON_EXIT 32
+
+/**
+ * Convenience functions that encapsulate a sequence of
+ * start_command() followed by finish_command(). The argument argv
+ * specifies the program and its arguments. The argument opt is zero
+ * or more of the flags `RUN_COMMAND_NO_STDIN`, `RUN_GIT_CMD`,
+ * `RUN_COMMAND_STDOUT_TO_STDERR`, or `RUN_SILENT_EXEC_FAILURE`
+ * that correspond to the members .no_stdin, .git_cmd,
+ * .stdout_to_stderr, .silent_exec_failure of `struct child_process`.
+ * The argument dir corresponds the member .dir. The argument env
+ * corresponds to the member .env.
+ */
 int run_command_v_opt(const char **argv, int opt);
 int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class);
 /*
@@ -125,15 +283,84 @@ static inline int capture_command(struct child_process *cmd,
  * It is expected that no synchronization and mutual exclusion between
  * the caller and the feed function is necessary so that the function
  * can run in a thread without interfering with the caller.
+ *
+ * The caller:
+ *
+ * 1. allocates and clears (memset(&asy, 0, sizeof(asy));) a
+ *    struct async variable;
+ * 2. initializes .proc and .data;
+ * 3. calls start_async();
+ * 4. processes communicates with proc through .in and .out;
+ * 5. closes .in and .out;
+ * 6. calls finish_async().
+ *
+ * There are serious restrictions on what the asynchronous function can do
+ * because this facility is implemented by a thread in the same address
+ * space on most platforms (when pthreads is available), but by a pipe to
+ * a forked process otherwise:
+ *
+ * - It cannot change the program's state (global variables, environment,
+ *   etc.) in a way that the caller notices; in other words, .in and .out
+ *   are the only communication channels to the caller.
+ *
+ * - It must not change the program's state that the caller of the
+ *   facility also uses.
+ *
  */
 struct async {
-	/*
-	 * proc reads from in; closes it before return
-	 * proc writes to out; closes it before return
-	 * returns 0 on success, non-zero on failure
+
+	/**
+	 * The function pointer in .proc has the following signature:
+	 *
+	 *	int proc(int in, int out, void *data);
+	 *
+	 * - in, out specifies a set of file descriptors to which the function
+	 *  must read/write the data that it needs/produces.  The function
+	 *  *must* close these descriptors before it returns.  A descriptor
+	 *  may be -1 if the caller did not configure a descriptor for that
+	 *  direction.
+	 *
+	 * - data is the value that the caller has specified in the .data member
+	 *  of struct async.
+	 *
+	 * - The return value of the function is 0 on success and non-zero
+	 *  on failure. If the function indicates failure, finish_async() will
+	 *  report failure as well.
+	 *
 	 */
 	int (*proc)(int in, int out, void *data);
+
 	void *data;
+
+	/**
+	 * The members .in, .out are used to provide a set of fd's for
+	 * communication between the caller and the callee as follows:
+	 *
+	 * - Specify 0 to have no file descriptor passed.  The callee will
+	 *   receive -1 in the corresponding argument.
+	 *
+	 * - Specify < 0 to have a pipe allocated; start_async() replaces
+	 *   with the pipe FD in the following way:
+	 *
+	 * 	.in: Returns the writable pipe end into which the caller
+	 * 	writes; the readable end of the pipe becomes the function's
+	 * 	in argument.
+	 *
+	 * 	.out: Returns the readable pipe end from which the caller
+	 * 	reads; the writable end of the pipe becomes the function's
+	 * 	out argument.
+	 *
+	 *   The caller of start_async() must close the returned FDs after it
+	 *   has completed reading from/writing from them.
+	 *
+	 * - Specify a file descriptor > 0 to be used by the function:
+	 *
+	 * 	.in: The FD must be readable; it becomes the function's in.
+	 * 	.out: The FD must be writable; it becomes the function's out.
+	 *
+	 *   The specified FD is closed by start_async(), even if it fails to
+	 *   run the function.
+	 */
 	int in;		/* caller writes here and closes it */
 	int out;	/* caller reads from here and closes it */
 #ifdef NO_PTHREADS
@@ -146,8 +373,19 @@ struct async {
 	int isolate_sigpipe;
 };
 
+/**
+ * Run a function asynchronously. Takes a pointer to a `struct
+ * async` that specifies the details and returns a set of pipe FDs
+ * for communication with the function. See below for details.
+ */
 int start_async(struct async *async);
+
+/**
+ * Wait for the completion of an asynchronous function that was
+ * started with start_async().
+ */
 int finish_async(struct async *async);
+
 int in_async(void);
 int async_with_fork(void);
 void check_pipe(int err);
diff --git a/third_party/git/send-pack.c b/third_party/git/send-pack.c
index 6dc16c321163..0407841ae87a 100644
--- a/third_party/git/send-pack.c
+++ b/third_party/git/send-pack.c
@@ -40,7 +40,10 @@ int option_parse_push_signed(const struct option *opt,
 
 static void feed_object(const struct object_id *oid, FILE *fh, int negative)
 {
-	if (negative && !has_object_file(oid))
+	if (negative &&
+	    !has_object_file_with_flags(oid,
+					OBJECT_INFO_SKIP_FETCH_OBJECT |
+					OBJECT_INFO_QUICK))
 		return;
 
 	if (negative)
@@ -564,8 +567,6 @@ int send_pack(struct send_pack_args *args,
 
 	if (need_pack_data && cmds_sent) {
 		if (pack_objects(out, remote_refs, extra_have, args) < 0) {
-			for (ref = remote_refs; ref; ref = ref->next)
-				ref->status = REF_STATUS_NONE;
 			if (args->stateless_rpc)
 				close(out);
 			if (git_connection_is_socket(conn))
@@ -573,10 +574,12 @@ int send_pack(struct send_pack_args *args,
 
 			/*
 			 * Do not even bother with the return value; we know we
-			 * are failing, and just want the error() side effects.
+			 * are failing, and just want the error() side effects,
+			 * as well as marking refs with their remote status (if
+			 * we get one).
 			 */
 			if (status_report)
-				receive_unpack_status(&reader);
+				receive_status(&reader, remote_refs);
 
 			if (use_sideband) {
 				close(demux.out);
diff --git a/third_party/git/sequencer.c b/third_party/git/sequencer.c
index 34ebf8ed94ad..e528225e787f 100644
--- a/third_party/git/sequencer.c
+++ b/third_party/git/sequencer.c
@@ -57,6 +57,8 @@ static GIT_PATH_FUNC(rebase_path, "rebase-merge")
 GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo")
 GIT_PATH_FUNC(rebase_path_todo_backup, "rebase-merge/git-rebase-todo.backup")
 
+GIT_PATH_FUNC(rebase_path_dropped, "rebase-merge/dropped")
+
 /*
  * The rebase command lines that have already been processed. A line
  * is moved here when it is first handled, before any associated user
@@ -131,7 +133,7 @@ static GIT_PATH_FUNC(rebase_path_rewritten_pending,
 	"rebase-merge/rewritten-pending")
 
 /*
- * The path of the file containig the OID of the "squash onto" commit, i.e.
+ * The path of the file containing the OID of the "squash onto" commit, i.e.
  * the dummy commit used for `reset [new root]`.
  */
 static GIT_PATH_FUNC(rebase_path_squash_onto, "rebase-merge/squash-onto")
@@ -158,6 +160,8 @@ static GIT_PATH_FUNC(rebase_path_strategy, "rebase-merge/strategy")
 static GIT_PATH_FUNC(rebase_path_strategy_opts, "rebase-merge/strategy_opts")
 static GIT_PATH_FUNC(rebase_path_allow_rerere_autoupdate, "rebase-merge/allow_rerere_autoupdate")
 static GIT_PATH_FUNC(rebase_path_reschedule_failed_exec, "rebase-merge/reschedule-failed-exec")
+static GIT_PATH_FUNC(rebase_path_drop_redundant_commits, "rebase-merge/drop_redundant_commits")
+static GIT_PATH_FUNC(rebase_path_keep_redundant_commits, "rebase-merge/keep_redundant_commits")
 
 static int git_sequencer_config(const char *k, const char *v, void *cb)
 {
@@ -288,7 +292,7 @@ int sequencer_remove_state(struct replay_opts *opts)
 			char *eol = strchr(p, '\n');
 			if (eol)
 				*eol = '\0';
-			if (delete_ref("(rebase -i) cleanup", p, NULL, 0) < 0) {
+			if (delete_ref("(rebase) cleanup", p, NULL, 0) < 0) {
 				warning(_("could not delete '%s'"), p);
 				ret = -1;
 			}
@@ -322,7 +326,7 @@ static const char *action_name(const struct replay_opts *opts)
 	case REPLAY_PICK:
 		return N_("cherry-pick");
 	case REPLAY_INTERACTIVE_REBASE:
-		return N_("rebase -i");
+		return N_("rebase");
 	}
 	die(_("unknown action: %d"), opts->action);
 }
@@ -586,9 +590,9 @@ static int do_recursive_merge(struct repository *r,
 			      struct replay_opts *opts)
 {
 	struct merge_options o;
-	struct tree *result, *next_tree, *base_tree, *head_tree;
+	struct tree *next_tree, *base_tree, *head_tree;
 	int clean;
-	char **xopt;
+	int i;
 	struct lock_file index_lock = LOCK_INIT;
 
 	if (repo_hold_locked_index(r, &index_lock, LOCK_REPORT_ON_ERROR) < 0)
@@ -608,16 +612,15 @@ static int do_recursive_merge(struct repository *r,
 	next_tree = next ? get_commit_tree(next) : empty_tree(r);
 	base_tree = base ? get_commit_tree(base) : empty_tree(r);
 
-	for (xopt = opts->xopts; xopt != opts->xopts + opts->xopts_nr; xopt++)
-		parse_merge_opt(&o, *xopt);
+	for (i = 0; i < opts->xopts_nr; i++)
+		parse_merge_opt(&o, opts->xopts[i]);
 
 	clean = merge_trees(&o,
 			    head_tree,
-			    next_tree, base_tree, &result);
+			    next_tree, base_tree);
 	if (is_rebase_i(opts) && clean <= 0)
 		fputs(o.obuf.buf, stdout);
 	strbuf_release(&o.obuf);
-	diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
 	if (clean < 0) {
 		rollback_lock_file(&index_lock);
 		return clean;
@@ -627,7 +630,7 @@ static int do_recursive_merge(struct repository *r,
 			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		/*
 		 * TRANSLATORS: %s will be "revert", "cherry-pick" or
-		 * "rebase -i".
+		 * "rebase".
 		 */
 		return error(_("%s: Unable to write new index file"),
 			_(action_name(opts)));
@@ -869,34 +872,6 @@ static char *get_author(const char *message)
 	return NULL;
 }
 
-/* Read author-script and return an ident line (author <email> timestamp) */
-static const char *read_author_ident(struct strbuf *buf)
-{
-	struct strbuf out = STRBUF_INIT;
-	char *name, *email, *date;
-
-	if (read_author_script(rebase_path_author_script(),
-			       &name, &email, &date, 0))
-		return NULL;
-
-	/* validate date since fmt_ident() will die() on bad value */
-	if (parse_date(date, &out)){
-		warning(_("invalid date format '%s' in '%s'"),
-			date, rebase_path_author_script());
-		strbuf_release(&out);
-		return NULL;
-	}
-
-	strbuf_reset(&out);
-	strbuf_addstr(&out, fmt_ident(name, email, WANT_AUTHOR_IDENT, date, 0));
-	strbuf_swap(buf, &out);
-	strbuf_release(&out);
-	free(name);
-	free(email);
-	free(date);
-	return buf->buf;
-}
-
 static const char staged_changes_advice[] =
 N_("you have staged changes in your working tree\n"
 "If these changes are meant to be squashed into the previous commit, run:\n"
@@ -954,47 +929,6 @@ static int run_git_commit(struct repository *r,
 {
 	struct child_process cmd = CHILD_PROCESS_INIT;
 
-	if ((flags & CREATE_ROOT_COMMIT) && !(flags & AMEND_MSG)) {
-		struct strbuf msg = STRBUF_INIT, script = STRBUF_INIT;
-		const char *author = NULL;
-		struct object_id root_commit, *cache_tree_oid;
-		int res = 0;
-
-		if (is_rebase_i(opts)) {
-			author = read_author_ident(&script);
-			if (!author) {
-				strbuf_release(&script);
-				return -1;
-			}
-		}
-
-		if (!defmsg)
-			BUG("root commit without message");
-
-		if (!(cache_tree_oid = get_cache_tree_oid(r->index)))
-			res = -1;
-
-		if (!res)
-			res = strbuf_read_file(&msg, defmsg, 0);
-
-		if (res <= 0)
-			res = error_errno(_("could not read '%s'"), defmsg);
-		else
-			res = commit_tree(msg.buf, msg.len, cache_tree_oid,
-					  NULL, &root_commit, author,
-					  opts->gpg_sign);
-
-		strbuf_release(&msg);
-		strbuf_release(&script);
-		if (!res) {
-			update_ref(NULL, "CHERRY_PICK_HEAD", &root_commit, NULL,
-				   REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR);
-			res = update_ref(NULL, "HEAD", &root_commit, NULL, 0,
-					 UPDATE_REFS_MSG_ON_ERR);
-		}
-		return res < 0 ? error(_("writing root commit")) : 0;
-	}
-
 	cmd.git_cmd = 1;
 
 	if (is_rebase_i(opts) && read_env_script(&cmd.env_array)) {
@@ -1196,25 +1130,22 @@ static int run_prepare_commit_msg_hook(struct repository *r,
 				       struct strbuf *msg,
 				       const char *commit)
 {
-	struct argv_array hook_env = ARGV_ARRAY_INIT;
-	int ret;
-	const char *name;
+	int ret = 0;
+	const char *name, *arg1 = NULL, *arg2 = NULL;
 
 	name = git_path_commit_editmsg();
 	if (write_message(msg->buf, msg->len, name, 0))
 		return -1;
 
-	argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", r->index_file);
-	argv_array_push(&hook_env, "GIT_EDITOR=:");
-	if (commit)
-		ret = run_hook_le(hook_env.argv, "prepare-commit-msg", name,
-				  "commit", commit, NULL);
-	else
-		ret = run_hook_le(hook_env.argv, "prepare-commit-msg", name,
-				  "message", NULL);
-	if (ret)
+	if (commit) {
+		arg1 = "commit";
+		arg2 = commit;
+	} else {
+		arg1 = "message";
+	}
+	if (run_commit_hook(0, r->index_file, "prepare-commit-msg", name,
+			    arg1, arg2, NULL))
 		ret = error(_("'prepare-commit-msg' hook failed"));
-	argv_array_clear(&hook_env);
 
 	return ret;
 }
@@ -1378,7 +1309,7 @@ static int try_to_commit(struct repository *r,
 			 struct object_id *oid)
 {
 	struct object_id tree;
-	struct commit *current_head;
+	struct commit *current_head = NULL;
 	struct commit_list *parents = NULL;
 	struct commit_extra_header *extra = NULL;
 	struct strbuf err = STRBUF_INIT;
@@ -1413,7 +1344,8 @@ static int try_to_commit(struct repository *r,
 		}
 		parents = copy_commit_list(current_head->parents);
 		extra = read_commit_extra_headers(current_head, exclude_gpgsig);
-	} else if (current_head) {
+	} else if (current_head &&
+		   (!(flags & CREATE_ROOT_COMMIT) || (flags & AMEND_MSG))) {
 		commit_list_insert(current_head, &parents);
 	}
 
@@ -1422,11 +1354,27 @@ static int try_to_commit(struct repository *r,
 		goto out;
 	}
 
-	if (!(flags & ALLOW_EMPTY) && oideq(current_head ?
-					    get_commit_tree_oid(current_head) :
-					    the_hash_algo->empty_tree, &tree)) {
-		res = 1; /* run 'git commit' to display error message */
-		goto out;
+	if (!(flags & ALLOW_EMPTY)) {
+		struct commit *first_parent = current_head;
+
+		if (flags & AMEND_MSG) {
+			if (current_head->parents) {
+				first_parent = current_head->parents->item;
+				if (repo_parse_commit(r, first_parent)) {
+					res = error(_("could not parse HEAD commit"));
+					goto out;
+				}
+			} else {
+				first_parent = NULL;
+			}
+		}
+		if (oideq(first_parent
+			  ? get_commit_tree_oid(first_parent)
+			  : the_hash_algo->empty_tree,
+			  &tree)) {
+			res = 1; /* run 'git commit' to display error message */
+			goto out;
+		}
 	}
 
 	if (find_hook("prepare-commit-msg")) {
@@ -1472,6 +1420,7 @@ static int try_to_commit(struct repository *r,
 		goto out;
 	}
 
+	run_commit_hook(0, r->index_file, "post-commit", NULL);
 	if (flags & AMEND_MSG)
 		commit_post_rewrite(r, current_head, oid);
 
@@ -1490,8 +1439,7 @@ static int do_commit(struct repository *r,
 {
 	int res = 1;
 
-	if (!(flags & EDIT_MSG) && !(flags & VERIFY_MSG) &&
-	    !(flags & CREATE_ROOT_COMMIT)) {
+	if (!(flags & EDIT_MSG) && !(flags & VERIFY_MSG)) {
 		struct object_id oid;
 		struct strbuf sb = STRBUF_INIT;
 
@@ -1539,23 +1487,30 @@ static int is_original_commit_empty(struct commit *commit)
 }
 
 /*
- * Do we run "git commit" with "--allow-empty"?
+ * Should empty commits be allowed?  Return status:
+ *    <0: Error in is_index_unchanged(r) or is_original_commit_empty(commit)
+ *     0: Halt on empty commit
+ *     1: Allow empty commit
+ *     2: Drop empty commit
  */
 static int allow_empty(struct repository *r,
 		       struct replay_opts *opts,
 		       struct commit *commit)
 {
-	int index_unchanged, empty_commit;
+	int index_unchanged, originally_empty;
 
 	/*
-	 * Three cases:
+	 * Four cases:
 	 *
 	 * (1) we do not allow empty at all and error out.
 	 *
-	 * (2) we allow ones that were initially empty, but
-	 * forbid the ones that become empty;
+	 * (2) we allow ones that were initially empty, and
+	 *     just drop the ones that become empty
 	 *
-	 * (3) we allow both.
+	 * (3) we allow ones that were initially empty, but
+	 *     halt for the ones that become empty;
+	 *
+	 * (4) we allow both.
 	 */
 	if (!opts->allow_empty)
 		return 0; /* let "git commit" barf as necessary */
@@ -1569,13 +1524,15 @@ static int allow_empty(struct repository *r,
 	if (opts->keep_redundant_commits)
 		return 1;
 
-	empty_commit = is_original_commit_empty(commit);
-	if (empty_commit < 0)
-		return empty_commit;
-	if (!empty_commit)
-		return 0;
-	else
+	originally_empty = is_original_commit_empty(commit);
+	if (originally_empty < 0)
+		return originally_empty;
+	if (originally_empty)
 		return 1;
+	else if (opts->drop_redundant_commits)
+		return 2;
+	else
+		return 0;
 }
 
 static struct {
@@ -1646,6 +1603,7 @@ static int update_squash_messages(struct repository *r,
 	struct strbuf buf = STRBUF_INIT;
 	int res;
 	const char *message, *body;
+	const char *encoding = get_commit_output_encoding();
 
 	if (opts->current_fixup_count > 0) {
 		struct strbuf header = STRBUF_INIT;
@@ -1672,7 +1630,7 @@ static int update_squash_messages(struct repository *r,
 			return error(_("need a HEAD to fixup"));
 		if (!(head_commit = lookup_commit_reference(r, &head)))
 			return error(_("could not read HEAD"));
-		if (!(head_message = get_commit_buffer(head_commit, NULL)))
+		if (!(head_message = logmsg_reencode(head_commit, NULL, encoding)))
 			return error(_("could not read HEAD's commit message"));
 
 		find_commit_subject(head_message, &body);
@@ -1693,7 +1651,7 @@ static int update_squash_messages(struct repository *r,
 		unuse_commit_buffer(head_commit, head_message);
 	}
 
-	if (!(message = get_commit_buffer(commit, NULL)))
+	if (!(message = logmsg_reencode(commit, NULL, encoding)))
 		return error(_("could not read commit message of %s"),
 			     oid_to_hex(&commit->object.oid));
 	find_commit_subject(message, &body);
@@ -1775,7 +1733,7 @@ static int do_pick_commit(struct repository *r,
 			  enum todo_command command,
 			  struct commit *commit,
 			  struct replay_opts *opts,
-			  int final_fixup)
+			  int final_fixup, int *check_todo)
 {
 	unsigned int flags = opts->edit ? EDIT_MSG : 0;
 	const char *msg_file = opts->edit ? NULL : git_path_merge_msg(r);
@@ -1785,7 +1743,7 @@ static int do_pick_commit(struct repository *r,
 	char *author = NULL;
 	struct commit_message msg = { NULL, NULL, NULL, NULL };
 	struct strbuf msgbuf = STRBUF_INIT;
-	int res, unborn = 0, allow;
+	int res, unborn = 0, reword = 0, allow, drop_commit;
 
 	if (opts->no_commit) {
 		/*
@@ -1855,7 +1813,7 @@ static int do_pick_commit(struct repository *r,
 			opts);
 		if (res || command != TODO_REWORD)
 			goto leave;
-		flags |= EDIT_MSG | AMEND_MSG | VERIFY_MSG;
+		reword = 1;
 		msg_file = NULL;
 		goto fast_forward_edit;
 	}
@@ -1913,7 +1871,7 @@ static int do_pick_commit(struct repository *r,
 	}
 
 	if (command == TODO_REWORD)
-		flags |= EDIT_MSG | VERIFY_MSG;
+		reword = 1;
 	else if (is_fixup(command)) {
 		if (update_squash_messages(r, command, commit, opts))
 			return -1;
@@ -1990,20 +1948,37 @@ static int do_pick_commit(struct repository *r,
 		goto leave;
 	}
 
+	drop_commit = 0;
 	allow = allow_empty(r, opts, commit);
 	if (allow < 0) {
 		res = allow;
 		goto leave;
-	} else if (allow)
+	} else if (allow == 1) {
 		flags |= ALLOW_EMPTY;
-	if (!opts->no_commit) {
-fast_forward_edit:
+	} else if (allow == 2) {
+		drop_commit = 1;
+		unlink(git_path_cherry_pick_head(r));
+		unlink(git_path_merge_msg(r));
+		fprintf(stderr,
+			_("dropping %s %s -- patch contents already upstream\n"),
+			oid_to_hex(&commit->object.oid), msg.subject);
+	} /* else allow == 0 and there's nothing special to do */
+	if (!opts->no_commit && !drop_commit) {
 		if (author || command == TODO_REVERT || (flags & AMEND_MSG))
 			res = do_commit(r, msg_file, author, opts, flags);
 		else
 			res = error(_("unable to parse commit author"));
+		*check_todo = !!(flags & EDIT_MSG);
+		if (!res && reword) {
+fast_forward_edit:
+			res = run_git_commit(r, NULL, opts, EDIT_MSG |
+					     VERIFY_MSG | AMEND_MSG |
+					     (flags & ALLOW_EMPTY));
+			*check_todo = 1;
+		}
 	}
 
+
 	if (!res && final_fixup) {
 		unlink(rebase_path_fixup_msg());
 		unlink(rebase_path_squash_msg());
@@ -2070,6 +2045,7 @@ void todo_list_release(struct todo_list *todo_list)
 static struct todo_item *append_new_todo(struct todo_list *todo_list)
 {
 	ALLOC_GROW(todo_list->items, todo_list->nr + 1, todo_list->alloc);
+	todo_list->total_nr++;
 	return todo_list->items + todo_list->nr++;
 }
 
@@ -2164,6 +2140,8 @@ static int parse_insn_line(struct repository *r, struct todo_item *item,
 	saved = *end_of_object_name;
 	*end_of_object_name = '\0';
 	status = get_oid(bol, &commit_oid);
+	if (status < 0)
+		error(_("could not parse '%s'"), bol); /* return later */
 	*end_of_object_name = saved;
 
 	bol = end_of_object_name + strspn(end_of_object_name, " \t");
@@ -2171,11 +2149,10 @@ static int parse_insn_line(struct repository *r, struct todo_item *item,
 	item->arg_len = (int)(eol - bol);
 
 	if (status < 0)
-		return error(_("could not parse '%.*s'"),
-			     (int)(end_of_object_name - bol), bol);
+		return status;
 
 	item->commit = lookup_commit_reference(r, &commit_oid);
-	return !item->commit;
+	return item->commit ? 0 : -1;
 }
 
 int sequencer_get_last_command(struct repository *r, enum replay_action *action)
@@ -2341,6 +2318,16 @@ void sequencer_post_commit_cleanup(struct repository *r, int verbose)
 	sequencer_remove_state(&opts);
 }
 
+static void todo_list_write_total_nr(struct todo_list *todo_list)
+{
+	FILE *f = fopen_or_warn(rebase_path_msgtotal(), "w");
+
+	if (f) {
+		fprintf(f, "%d\n", todo_list->total_nr);
+		fclose(f);
+	}
+}
+
 static int read_populate_todo(struct repository *r,
 			      struct todo_list *todo_list,
 			      struct replay_opts *opts)
@@ -2386,7 +2373,6 @@ static int read_populate_todo(struct repository *r,
 
 	if (is_rebase_i(opts)) {
 		struct todo_list done = TODO_LIST_INIT;
-		FILE *f = fopen_or_warn(rebase_path_msgtotal(), "w");
 
 		if (strbuf_read_file(&done.buf, rebase_path_done(), 0) > 0 &&
 		    !todo_list_parse_insn_buffer(r, done.buf.buf, &done))
@@ -2398,10 +2384,7 @@ static int read_populate_todo(struct repository *r,
 			+ count_commands(todo_list);
 		todo_list_release(&done);
 
-		if (f) {
-			fprintf(f, "%d\n", todo_list->total_nr);
-			fclose(f);
-		}
+		todo_list_write_total_nr(todo_list);
 	}
 
 	return 0;
@@ -2535,6 +2518,12 @@ static int read_populate_opts(struct replay_opts *opts)
 		if (file_exists(rebase_path_reschedule_failed_exec()))
 			opts->reschedule_failed_exec = 1;
 
+		if (file_exists(rebase_path_drop_redundant_commits()))
+			opts->drop_redundant_commits = 1;
+
+		if (file_exists(rebase_path_keep_redundant_commits()))
+			opts->keep_redundant_commits = 1;
+
 		read_strategy_opts(opts, &buf);
 		strbuf_release(&buf);
 
@@ -2586,8 +2575,6 @@ static void write_strategy_opts(struct replay_opts *opts)
 int write_basic_state(struct replay_opts *opts, const char *head_name,
 		      struct commit *onto, const char *orig_head)
 {
-	const char *quiet = getenv("GIT_QUIET");
-
 	if (head_name)
 		write_file(rebase_path_head_name(), "%s\n", head_name);
 	if (onto)
@@ -2596,8 +2583,8 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,
 	if (orig_head)
 		write_file(rebase_path_orig_head(), "%s\n", orig_head);
 
-	if (quiet)
-		write_file(rebase_path_quiet(), "%s\n", quiet);
+	if (opts->quiet)
+		write_file(rebase_path_quiet(), "%s", "");
 	if (opts->verbose)
 		write_file(rebase_path_verbose(), "%s", "");
 	if (opts->strategy)
@@ -2614,6 +2601,10 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,
 		write_file(rebase_path_gpg_sign_opt(), "-S%s\n", opts->gpg_sign);
 	if (opts->signoff)
 		write_file(rebase_path_signoff(), "--signoff\n");
+	if (opts->drop_redundant_commits)
+		write_file(rebase_path_drop_redundant_commits(), "%s", "");
+	if (opts->keep_redundant_commits)
+		write_file(rebase_path_keep_redundant_commits(), "%s", "");
 	if (opts->reschedule_failed_exec)
 		write_file(rebase_path_reschedule_failed_exec(), "%s", "");
 
@@ -2626,14 +2617,17 @@ static int walk_revs_populate_todo(struct todo_list *todo_list,
 	enum todo_command command = opts->action == REPLAY_PICK ?
 		TODO_PICK : TODO_REVERT;
 	const char *command_string = todo_command_info[command].str;
+	const char *encoding;
 	struct commit *commit;
 
 	if (prepare_revs(opts))
 		return -1;
 
+	encoding = get_log_output_encoding();
+
 	while ((commit = get_revision(opts->revs))) {
 		struct todo_item *item = append_new_todo(todo_list);
-		const char *commit_buffer = get_commit_buffer(commit, NULL);
+		const char *commit_buffer = logmsg_reencode(commit, NULL, encoding);
 		const char *subject;
 		int subject_len;
 
@@ -3030,7 +3024,8 @@ static int make_patch(struct repository *r,
 
 	strbuf_addf(&buf, "%s/message", get_dir(opts));
 	if (!file_exists(buf.buf)) {
-		const char *commit_buffer = get_commit_buffer(commit, NULL);
+		const char *encoding = get_commit_output_encoding();
+		const char *commit_buffer = logmsg_reencode(commit, NULL, encoding);
 		find_commit_subject(commit_buffer, &subject);
 		res |= write_message(subject, strlen(subject), buf.buf, 1);
 		unuse_commit_buffer(commit, commit_buffer);
@@ -3209,7 +3204,7 @@ static int do_label(struct repository *r, const char *name, int len)
 		return error(_("illegal label name: '%.*s'"), len, name);
 
 	strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
-	strbuf_addf(&msg, "rebase -i (label) '%.*s'", len, name);
+	strbuf_addf(&msg, "rebase (label) '%.*s'", len, name);
 
 	transaction = ref_store_transaction_begin(refs, &err);
 	if (!transaction) {
@@ -3364,6 +3359,9 @@ static int do_merge(struct repository *r,
 	struct commit *head_commit, *merge_commit, *i;
 	struct commit_list *bases, *j, *reversed = NULL;
 	struct commit_list *to_merge = NULL, **tail = &to_merge;
+	const char *strategy = !opts->xopts_nr &&
+		(!opts->strategy || !strcmp(opts->strategy, "recursive")) ?
+		NULL : opts->strategy;
 	struct merge_options o;
 	int merge_arg_len, oneline_offset, can_fast_forward, ret, k;
 	static struct lock_file lock;
@@ -3429,7 +3427,8 @@ static int do_merge(struct repository *r,
 	}
 
 	if (commit) {
-		const char *message = get_commit_buffer(commit, NULL);
+		const char *encoding = get_commit_output_encoding();
+		const char *message = logmsg_reencode(commit, NULL, encoding);
 		const char *body;
 		int len;
 
@@ -3516,7 +3515,7 @@ static int do_merge(struct repository *r,
 		goto leave_merge;
 	}
 
-	if (to_merge->next) {
+	if (strategy || to_merge->next) {
 		/* Octopus merge */
 		struct child_process cmd = CHILD_PROCESS_INIT;
 
@@ -3530,7 +3529,14 @@ static int do_merge(struct repository *r,
 		cmd.git_cmd = 1;
 		argv_array_push(&cmd.args, "merge");
 		argv_array_push(&cmd.args, "-s");
-		argv_array_push(&cmd.args, "octopus");
+		if (!strategy)
+			argv_array_push(&cmd.args, "octopus");
+		else {
+			argv_array_push(&cmd.args, strategy);
+			for (k = 0; k < opts->xopts_nr; k++)
+				argv_array_pushf(&cmd.args,
+						 "-X%s", opts->xopts[k]);
+		}
 		argv_array_push(&cmd.args, "--no-edit");
 		argv_array_push(&cmd.args, "--no-ff");
 		argv_array_push(&cmd.args, "--no-log");
@@ -3568,7 +3574,7 @@ static int do_merge(struct repository *r,
 		goto leave_merge;
 	}
 
-	write_message(oid_to_hex(&merge_commit->object.oid), GIT_SHA1_HEXSZ,
+	write_message(oid_to_hex(&merge_commit->object.oid), the_hash_algo->hexsz,
 		      git_path_merge_head(r), 0);
 	write_message("no-ff", 5, git_path_merge_mode(r), 0);
 
@@ -3740,20 +3746,6 @@ static int run_git_checkout(struct repository *r, struct replay_opts *opts,
 	return ret;
 }
 
-int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts,
-				 const char *commit)
-{
-	const char *action;
-
-	if (commit && *commit) {
-		action = reflog_message(opts, "start", "checkout %s", commit);
-		if (run_git_checkout(r, opts, commit, action))
-			return error(_("could not checkout %s"), commit);
-	}
-
-	return 0;
-}
-
 static int checkout_onto(struct repository *r, struct replay_opts *opts,
 			 const char *onto_name, const struct object_id *onto,
 			 const char *orig_head)
@@ -3818,6 +3810,7 @@ static int pick_commits(struct repository *r,
 	while (todo_list->current < todo_list->nr) {
 		struct todo_item *item = todo_list->items + todo_list->current;
 		const char *arg = todo_item_get_arg(todo_list, item);
+		int check_todo = 0;
 
 		if (save_todo(todo_list, opts))
 			return -1;
@@ -3856,7 +3849,8 @@ static int pick_commits(struct repository *r,
 					command_to_string(item->command), NULL),
 					1);
 			res = do_pick_commit(r, item->command, item->commit,
-					opts, is_final_fixup(todo_list));
+					     opts, is_final_fixup(todo_list),
+					     &check_todo);
 			if (is_rebase_i(opts) && res < 0) {
 				/* Reschedule */
 				advise(_(rescheduled_advice),
@@ -3913,7 +3907,6 @@ static int pick_commits(struct repository *r,
 		} else if (item->command == TODO_EXEC) {
 			char *end_of_arg = (char *)(arg + item->arg_len);
 			int saved = *end_of_arg;
-			struct stat st;
 
 			if (!opts->verbose)
 				term_clear_line();
@@ -3924,17 +3917,8 @@ static int pick_commits(struct repository *r,
 			if (res) {
 				if (opts->reschedule_failed_exec)
 					reschedule = 1;
-			} else if (stat(get_todo_path(opts), &st))
-				res = error_errno(_("could not stat '%s'"),
-						  get_todo_path(opts));
-			else if (match_stat_data(&todo_list->stat, &st)) {
-				/* Reread the todo file if it has changed. */
-				todo_list_release(todo_list);
-				if (read_populate_todo(r, todo_list, opts))
-					res = -1; /* message was printed */
-				/* `current` will be incremented below */
-				todo_list->current = -1;
 			}
+			check_todo = 1;
 		} else if (item->command == TODO_LABEL) {
 			if ((res = do_label(r, arg, item->arg_len)))
 				reschedule = 1;
@@ -3970,6 +3954,20 @@ static int pick_commits(struct repository *r,
 							item->commit,
 							arg, item->arg_len,
 							opts, res, 0);
+		} else if (is_rebase_i(opts) && check_todo && !res) {
+			struct stat st;
+
+			if (stat(get_todo_path(opts), &st)) {
+				res = error_errno(_("could not stat '%s'"),
+						  get_todo_path(opts));
+			} else if (match_stat_data(&todo_list->stat, &st)) {
+				/* Reread the todo file if it has changed. */
+				todo_list_release(todo_list);
+				if (read_populate_todo(r, todo_list, opts))
+					res = -1; /* message was printed */
+				/* `current` will be incremented below */
+				todo_list->current = -1;
+			}
 		}
 
 		todo_list->current++;
@@ -4197,9 +4195,10 @@ static int commit_staged_changes(struct repository *r,
 				 */
 				struct commit *commit;
 				const char *path = rebase_path_squash_msg();
+				const char *encoding = get_commit_output_encoding();
 
 				if (parse_head(r, &commit) ||
-				    !(p = get_commit_buffer(commit, NULL)) ||
+				    !(p = logmsg_reencode(commit, NULL, encoding)) ||
 				    write_message(p, strlen(p), path, 0)) {
 					unuse_commit_buffer(commit, p);
 					return error(_("could not write file: "
@@ -4256,8 +4255,18 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
 	if (is_rebase_i(opts)) {
 		if ((res = read_populate_todo(r, &todo_list, opts)))
 			goto release_todo_list;
-		if (commit_staged_changes(r, opts, &todo_list))
-			return -1;
+
+		if (file_exists(rebase_path_dropped())) {
+			if ((res = todo_list_check_against_backup(r, &todo_list)))
+				goto release_todo_list;
+
+			unlink(rebase_path_dropped());
+		}
+
+		if (commit_staged_changes(r, opts, &todo_list)) {
+			res = -1;
+			goto release_todo_list;
+		}
 	} else if (!file_exists(get_todo_path(opts)))
 		return continue_single_pick(r);
 	else if ((res = read_populate_todo(r, &todo_list, opts)))
@@ -4296,9 +4305,12 @@ static int single_pick(struct repository *r,
 		       struct commit *cmit,
 		       struct replay_opts *opts)
 {
+	int check_todo;
+
 	setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
 	return do_pick_commit(r, opts->action == REPLAY_PICK ?
-		TODO_PICK : TODO_REVERT, cmit, opts, 0);
+			      TODO_PICK : TODO_REVERT, cmit, opts, 0,
+			      &check_todo);
 }
 
 int sequencer_pick_revisions(struct repository *r,
@@ -4440,9 +4452,14 @@ struct labels_entry {
 	char label[FLEX_ARRAY];
 };
 
-static int labels_cmp(const void *fndata, const struct labels_entry *a,
-		      const struct labels_entry *b, const void *key)
+static int labels_cmp(const void *fndata, const struct hashmap_entry *eptr,
+		      const struct hashmap_entry *entry_or_key, const void *key)
 {
+	const struct labels_entry *a, *b;
+
+	a = container_of(eptr, const struct labels_entry, entry);
+	b = container_of(entry_or_key, const struct labels_entry, entry);
+
 	return key ? strcmp(a->label, key) : strcmp(a->label, b->label);
 }
 
@@ -4463,7 +4480,6 @@ static const char *label_oid(struct object_id *oid, const char *label,
 	struct labels_entry *labels_entry;
 	struct string_entry *string_entry;
 	struct object_id dummy;
-	size_t len;
 	int i;
 
 	string_entry = oidmap_get(&state->commit2label, oid);
@@ -4483,11 +4499,11 @@ static const char *label_oid(struct object_id *oid, const char *label,
 	 * abbreviation for any uninteresting commit's names that does not
 	 * clash with any other label.
 	 */
+	strbuf_reset(&state->buf);
 	if (!label) {
 		char *p;
 
-		strbuf_reset(&state->buf);
-		strbuf_grow(&state->buf, GIT_SHA1_HEXSZ);
+		strbuf_grow(&state->buf, GIT_MAX_HEXSZ);
 		label = p = state->buf.buf;
 
 		find_unique_abbrev_r(p, oid, default_abbrev);
@@ -4500,7 +4516,7 @@ static const char *label_oid(struct object_id *oid, const char *label,
 			size_t i = strlen(p) + 1;
 
 			oid_to_hex_r(p, oid);
-			for (; i < GIT_SHA1_HEXSZ; i++) {
+			for (; i < the_hash_algo->hexsz; i++) {
 				char save = p[i];
 				p[i] = '\0';
 				if (!hashmap_get_from_hash(&state->labels,
@@ -4509,37 +4525,60 @@ static const char *label_oid(struct object_id *oid, const char *label,
 				p[i] = save;
 			}
 		}
-	} else if (((len = strlen(label)) == the_hash_algo->hexsz &&
-		    !get_oid_hex(label, &dummy)) ||
-		   (len == 1 && *label == '#') ||
-		   hashmap_get_from_hash(&state->labels,
-					 strihash(label), label)) {
+	} else {
+		struct strbuf *buf = &state->buf;
+
 		/*
-		 * If the label already exists, or if the label is a valid full
-		 * OID, or the label is a '#' (which we use as a separator
-		 * between merge heads and oneline), we append a dash and a
-		 * number to make it unique.
+		 * Sanitize labels by replacing non-alpha-numeric characters
+		 * (including white-space ones) by dashes, as they might be
+		 * illegal in file names (and hence in ref names).
+		 *
+		 * Note that we retain non-ASCII UTF-8 characters (identified
+		 * via the most significant bit). They should be all acceptable
+		 * in file names. We do not validate the UTF-8 here, that's not
+		 * the job of this function.
 		 */
-		struct strbuf *buf = &state->buf;
+		for (; *label; label++)
+			if ((*label & 0x80) || isalnum(*label))
+				strbuf_addch(buf, *label);
+			/* avoid leading dash and double-dashes */
+			else if (buf->len && buf->buf[buf->len - 1] != '-')
+				strbuf_addch(buf, '-');
+		if (!buf->len) {
+			strbuf_addstr(buf, "rev-");
+			strbuf_add_unique_abbrev(buf, oid, default_abbrev);
+		}
+		label = buf->buf;
 
-		strbuf_reset(buf);
-		strbuf_add(buf, label, len);
+		if ((buf->len == the_hash_algo->hexsz &&
+		     !get_oid_hex(label, &dummy)) ||
+		    (buf->len == 1 && *label == '#') ||
+		    hashmap_get_from_hash(&state->labels,
+					  strihash(label), label)) {
+			/*
+			 * If the label already exists, or if the label is a
+			 * valid full OID, or the label is a '#' (which we use
+			 * as a separator between merge heads and oneline), we
+			 * append a dash and a number to make it unique.
+			 */
+			size_t len = buf->len;
 
-		for (i = 2; ; i++) {
-			strbuf_setlen(buf, len);
-			strbuf_addf(buf, "-%d", i);
-			if (!hashmap_get_from_hash(&state->labels,
-						   strihash(buf->buf),
-						   buf->buf))
-				break;
-		}
+			for (i = 2; ; i++) {
+				strbuf_setlen(buf, len);
+				strbuf_addf(buf, "-%d", i);
+				if (!hashmap_get_from_hash(&state->labels,
+							   strihash(buf->buf),
+							   buf->buf))
+					break;
+			}
 
-		label = buf->buf;
+			label = buf->buf;
+		}
 	}
 
 	FLEX_ALLOC_STR(labels_entry, label, label);
-	hashmap_entry_init(labels_entry, strihash(label));
-	hashmap_add(&state->labels, labels_entry);
+	hashmap_entry_init(&labels_entry->entry, strihash(label));
+	hashmap_add(&state->labels, &labels_entry->entry);
 
 	FLEX_ALLOC_STR(string_entry, string, label);
 	oidcpy(&string_entry->entry.oid, oid);
@@ -4552,8 +4591,8 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 				   struct rev_info *revs, struct strbuf *out,
 				   unsigned flags)
 {
-	int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
 	int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS;
+	int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO;
 	struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT;
 	struct strbuf label = STRBUF_INIT;
 	struct commit_list *commits = NULL, **tail = &commits, *iter;
@@ -4573,14 +4612,19 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 
 	oidmap_init(&commit2todo, 0);
 	oidmap_init(&state.commit2label, 0);
-	hashmap_init(&state.labels, (hashmap_cmp_fn) labels_cmp, NULL, 0);
+	hashmap_init(&state.labels, labels_cmp, NULL, 0);
 	strbuf_init(&state.buf, 32);
 
 	if (revs->cmdline.nr && (revs->cmdline.rev[0].flags & BOTTOM)) {
+		struct labels_entry *onto_label_entry;
 		struct object_id *oid = &revs->cmdline.rev[0].item->oid;
 		FLEX_ALLOC_STR(entry, string, "onto");
 		oidcpy(&entry->entry.oid, oid);
 		oidmap_put(&state.commit2label, entry);
+
+		FLEX_ALLOC_STR(onto_label_entry, label, "onto");
+		hashmap_entry_init(&onto_label_entry->entry, strihash("onto"));
+		hashmap_add(&state.labels, &onto_label_entry->entry);
 	}
 
 	/*
@@ -4609,8 +4653,6 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 		if (!to_merge) {
 			/* non-merge commit: easy case */
 			strbuf_reset(&buf);
-			if (!keep_empty && is_empty)
-				strbuf_addf(&buf, "%c ", comment_line_char);
 			strbuf_addf(&buf, "%s %s %s", cmd_pick,
 				    oid_to_hex(&commit->object.oid),
 				    oneline.buf);
@@ -4635,10 +4677,6 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 		else
 			strbuf_addbuf(&label, &oneline);
 
-		for (p1 = label.buf; *p1; p1++)
-			if (isspace(*p1))
-				*(char *)p1 = '-';
-
 		strbuf_reset(&buf);
 		strbuf_addf(&buf, "%s -C %s",
 			    cmd_merge, oid_to_hex(&commit->object.oid));
@@ -4681,7 +4719,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 				label_oid(oid, "branch-point", &state);
 		}
 
-		/* Add HEAD as implict "tip of branch" */
+		/* Add HEAD as implicit "tip of branch" */
 		if (!iter->next)
 			tips_tail = &commit_list_insert(iter->item,
 							tips_tail)->next;
@@ -4720,7 +4758,8 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 
 		if (!commit)
 			strbuf_addf(out, "%s %s\n", cmd_reset,
-				    rebase_cousins ? "onto" : "[new root]");
+				    rebase_cousins || root_with_onto ?
+				    "onto" : "[new root]");
 		else {
 			const char *to = NULL;
 
@@ -4767,7 +4806,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 
 	oidmap_free(&commit2todo, 1);
 	oidmap_free(&state.commit2label, 1);
-	hashmap_free(&state.labels, 1);
+	hashmap_free_entries(&state.labels, struct labels_entry, entry);
 	strbuf_release(&state.buf);
 
 	return 0;
@@ -4780,7 +4819,6 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 	struct pretty_print_context pp = {0};
 	struct rev_info revs;
 	struct commit *commit;
-	int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
 	const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick";
 	int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
 
@@ -4816,12 +4854,10 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 		return make_script_with_merges(&pp, &revs, out, flags);
 
 	while ((commit = get_revision(&revs))) {
-		int is_empty  = is_original_commit_empty(commit);
+		int is_empty = is_original_commit_empty(commit);
 
 		if (!is_empty && (commit->object.flags & PATCHSAME))
 			continue;
-		if (!keep_empty && is_empty)
-			strbuf_addf(out, "%c ", comment_line_char);
 		strbuf_addf(out, "%s %s ", insn,
 			    oid_to_hex(&commit->object.oid));
 		pretty_print_commit(&pp, commit, out);
@@ -4862,7 +4898,7 @@ void todo_list_add_exec_commands(struct todo_list *todo_list,
 	 * are considered part of the pick, so we insert the commands *after*
 	 * those chains if there are any.
 	 *
-	 * As we insert the exec commands immediatly after rearranging
+	 * As we insert the exec commands immediately after rearranging
 	 * any fixups and before the user edits the list, a fixup chain
 	 * can never contain comments (any comments are empty picks that
 	 * have been commented out because the user did not specify
@@ -4958,7 +4994,7 @@ int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
 
 	todo_list_to_strbuf(r, todo_list, &buf, num, flags);
 	if (flags & TODO_LIST_APPEND_TODO_HELP)
-		append_todo_help(flags & TODO_LIST_KEEP_EMPTY, count_commands(todo_list),
+		append_todo_help(count_commands(todo_list),
 				 shortrevisions, shortonto, &buf);
 
 	res = write_message(buf.buf, buf.len, file, 0);
@@ -4967,41 +5003,6 @@ int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
 	return res;
 }
 
-static const char edit_todo_list_advice[] =
-N_("You can fix this with 'git rebase --edit-todo' "
-"and then run 'git rebase --continue'.\n"
-"Or you can abort the rebase with 'git rebase"
-" --abort'.\n");
-
-int check_todo_list_from_file(struct repository *r)
-{
-	struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT;
-	int res = 0;
-
-	if (strbuf_read_file_or_whine(&new_todo.buf, rebase_path_todo()) < 0) {
-		res = -1;
-		goto out;
-	}
-
-	if (strbuf_read_file_or_whine(&old_todo.buf, rebase_path_todo_backup()) < 0) {
-		res = -1;
-		goto out;
-	}
-
-	res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo);
-	if (!res)
-		res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
-	if (!res)
-		res = todo_list_check(&old_todo, &new_todo);
-	if (res)
-		fprintf(stderr, _(edit_todo_list_advice));
-out:
-	todo_list_release(&old_todo);
-	todo_list_release(&new_todo);
-
-	return res;
-}
-
 /* skip picking commits whose parents are unchanged */
 static int skip_unnecessary_picks(struct repository *r,
 				  struct todo_list *todo_list,
@@ -5041,6 +5042,7 @@ static int skip_unnecessary_picks(struct repository *r,
 		MOVE_ARRAY(todo_list->items, todo_list->items + i, todo_list->nr - i);
 		todo_list->nr -= i;
 		todo_list->current = 0;
+		todo_list->done_nr += i;
 
 		if (is_fixup(peek_command(todo_list, 0)))
 			record_in_rewritten(base_oid, peek_command(todo_list, 0));
@@ -5057,7 +5059,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
 {
 	const char *shortonto, *todo_file = rebase_path_todo();
 	struct todo_list new_todo = TODO_LIST_INIT;
-	struct strbuf *buf = &todo_list->buf;
+	struct strbuf *buf = &todo_list->buf, buf2 = STRBUF_INIT;
 	struct object_id oid = onto->object.oid;
 	int res;
 
@@ -5098,17 +5100,22 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
 		todo_list_release(&new_todo);
 
 		return error(_("nothing to do"));
-	}
-
-	if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) ||
-	    todo_list_check(todo_list, &new_todo)) {
-		fprintf(stderr, _(edit_todo_list_advice));
+	} else if (res == -4) {
 		checkout_onto(r, opts, onto_name, &onto->object.oid, orig_head);
 		todo_list_release(&new_todo);
 
 		return -1;
 	}
 
+	/* Expand the commit IDs */
+	todo_list_to_strbuf(r, &new_todo, &buf2, -1, 0);
+	strbuf_swap(&new_todo.buf, &buf2);
+	strbuf_release(&buf2);
+	new_todo.total_nr -= new_todo.nr;
+	if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) < 0)
+		BUG("invalid todo list after expanding IDs:\n%s",
+		    new_todo.buf.buf);
+
 	if (opts->allow_ff && skip_unnecessary_picks(r, &new_todo, &oid)) {
 		todo_list_release(&new_todo);
 		return error(_("could not skip unnecessary pick commands"));
@@ -5120,15 +5127,21 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
 		return error_errno(_("could not write '%s'"), todo_file);
 	}
 
-	todo_list_release(&new_todo);
+	res = -1;
 
 	if (checkout_onto(r, opts, onto_name, &oid, orig_head))
-		return -1;
+		goto cleanup;
 
 	if (require_clean_work_tree(r, "rebase", "", 1, 1))
-		return -1;
+		goto cleanup;
 
-	return sequencer_continue(r, opts);
+	todo_list_write_total_nr(&new_todo);
+	res = pick_commits(r, &new_todo, opts);
+
+cleanup:
+	todo_list_release(&new_todo);
+
+	return res;
 }
 
 struct subject2item_entry {
@@ -5138,9 +5151,15 @@ struct subject2item_entry {
 };
 
 static int subject2item_cmp(const void *fndata,
-			    const struct subject2item_entry *a,
-			    const struct subject2item_entry *b, const void *key)
+			    const struct hashmap_entry *eptr,
+			    const struct hashmap_entry *entry_or_key,
+			    const void *key)
 {
+	const struct subject2item_entry *a, *b;
+
+	a = container_of(eptr, const struct subject2item_entry, entry);
+	b = container_of(entry_or_key, const struct subject2item_entry, entry);
+
 	return key ? strcmp(a->subject, key) : strcmp(a->subject, b->subject);
 }
 
@@ -5173,8 +5192,7 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
 	 * In that case, last[i] will indicate the index of the latest item to
 	 * be moved to appear after the i'th.
 	 */
-	hashmap_init(&subject2item, (hashmap_cmp_fn) subject2item_cmp,
-		     NULL, todo_list->nr);
+	hashmap_init(&subject2item, subject2item_cmp, NULL, todo_list->nr);
 	ALLOC_ARRAY(next, todo_list->nr);
 	ALLOC_ARRAY(tail, todo_list->nr);
 	ALLOC_ARRAY(subjects, todo_list->nr);
@@ -5200,7 +5218,7 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
 		*commit_todo_item_at(&commit_todo, item->commit) = item;
 
 		parse_commit(item->commit);
-		commit_buffer = get_commit_buffer(item->commit, NULL);
+		commit_buffer = logmsg_reencode(item->commit, NULL, "UTF-8");
 		find_commit_subject(commit_buffer, &subject);
 		format_subject(&buf, subject, " ");
 		subject = subjects[i] = strbuf_detach(&buf, &subject_len);
@@ -5217,8 +5235,11 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
 					break;
 			}
 
-			if ((entry = hashmap_get_from_hash(&subject2item,
-							   strhash(p), p)))
+			entry = hashmap_get_entry_from_hash(&subject2item,
+						strhash(p), p,
+						struct subject2item_entry,
+						entry);
+			if (entry)
 				/* found by title */
 				i2 = entry->i;
 			else if (!strchr(p, ' ') &&
@@ -5252,8 +5273,9 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
 						strhash(subject), subject)) {
 			FLEX_ALLOC_MEM(entry, subject, subject, subject_len);
 			entry->i = i;
-			hashmap_entry_init(entry, strhash(entry->subject));
-			hashmap_put(&subject2item, entry);
+			hashmap_entry_init(&entry->entry,
+					strhash(entry->subject));
+			hashmap_put(&subject2item, &entry->entry);
 		}
 	}
 
@@ -5287,7 +5309,7 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
 	for (i = 0; i < todo_list->nr; i++)
 		free(subjects[i]);
 	free(subjects);
-	hashmap_free(&subject2item, 1);
+	hashmap_free_entries(&subject2item, struct subject2item_entry, entry);
 
 	clear_commit_todo_item(&commit_todo);
 
diff --git a/third_party/git/sequencer.h b/third_party/git/sequencer.h
index 6704acbb9c93..718a07426dae 100644
--- a/third_party/git/sequencer.h
+++ b/third_party/git/sequencer.h
@@ -11,6 +11,7 @@ const char *git_path_commit_editmsg(void);
 const char *git_path_seq_dir(void);
 const char *rebase_path_todo(void);
 const char *rebase_path_todo_backup(void);
+const char *rebase_path_dropped(void);
 
 #define APPEND_SIGNOFF_DEDUP (1u << 0)
 
@@ -39,6 +40,7 @@ struct replay_opts {
 	int allow_rerere_auto;
 	int allow_empty;
 	int allow_empty_message;
+	int drop_redundant_commits;
 	int keep_redundant_commits;
 	int verbose;
 	int quiet;
@@ -132,7 +134,7 @@ int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
 int sequencer_skip(struct repository *repo, struct replay_opts *opts);
 int sequencer_remove_state(struct replay_opts *opts);
 
-#define TODO_LIST_KEEP_EMPTY (1U << 0)
+/* #define TODO_LIST_KEEP_EMPTY (1U << 0) */ /* No longer used */
 #define TODO_LIST_SHORTEN_IDS (1U << 1)
 #define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
 #define TODO_LIST_REBASE_MERGES (1U << 3)
@@ -143,13 +145,18 @@ int sequencer_remove_state(struct replay_opts *opts);
  */
 #define TODO_LIST_REBASE_COUSINS (1U << 4)
 #define TODO_LIST_APPEND_TODO_HELP (1U << 5)
+/*
+ * When generating a script that rebases merges with `--root` *and* with
+ * `--onto`, we do not want to re-generate the root commits.
+ */
+#define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
+
 
 int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 			  const char **argv, unsigned flags);
 
 void todo_list_add_exec_commands(struct todo_list *todo_list,
 				 struct string_list *commands);
-int check_todo_list_from_file(struct repository *r);
 int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
 		    const char *shortrevisions, const char *onto_name,
 		    struct commit *onto, const char *orig_head, struct string_list *commands,
@@ -184,9 +191,6 @@ void commit_post_rewrite(struct repository *r,
 			 const struct commit *current_head,
 			 const struct object_id *new_head);
 
-int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts,
-				 const char *commit);
-
 #define SUMMARY_INITIAL_COMMIT   (1 << 0)
 #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
 void print_commit_summary(struct repository *repo,
@@ -196,11 +200,10 @@ void print_commit_summary(struct repository *repo,
 
 int read_author_script(const char *path, char **name, char **email, char **date,
 		       int allow_missing);
-#endif
-
 void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
 int write_basic_state(struct replay_opts *opts, const char *head_name,
 		      struct commit *onto, const char *orig_head);
 void sequencer_post_commit_cleanup(struct repository *r, int verbose);
 int sequencer_get_last_command(struct repository* r,
 			       enum replay_action *action);
+#endif /* SEQUENCER_H */
diff --git a/third_party/git/server-info.c b/third_party/git/server-info.c
index 4d8199b1d916..bae2cdfd5127 100644
--- a/third_party/git/server-info.c
+++ b/third_party/git/server-info.c
@@ -93,7 +93,7 @@ static int update_info_file(char *path,
 		uic.old_fp = fopen_or_warn(path, "r");
 
 	/*
-	 * uic_printf will compare incremental comparison aginst old_fp
+	 * uic_printf will compare incremental comparison against old_fp
 	 * and mark uic as stale if needed
 	 */
 	ret = generate(&uic);
diff --git a/third_party/git/setup.c b/third_party/git/setup.c
index 8dcb4631f7d3..5ea9285a128c 100644
--- a/third_party/git/setup.c
+++ b/third_party/git/setup.c
@@ -4,6 +4,7 @@
 #include "dir.h"
 #include "string-list.h"
 #include "chdir-notify.h"
+#include "promisor-remote.h"
 
 static int inside_git_dir = -1;
 static int inside_work_tree = -1;
@@ -119,8 +120,13 @@ char *prefix_path_gently(const char *prefix, int len,
 char *prefix_path(const char *prefix, int len, const char *path)
 {
 	char *r = prefix_path_gently(prefix, len, NULL, path);
-	if (!r)
-		die(_("'%s' is outside repository"), path);
+	if (!r) {
+		const char *hint_path = get_git_work_tree();
+		if (!hint_path)
+			hint_path = get_git_dir();
+		die(_("'%s' is outside repository at '%s'"), path,
+		    absolute_path(hint_path));
+	}
 	return r;
 }
 
@@ -196,9 +202,26 @@ static void NORETURN die_verify_filename(struct repository *r,
  */
 static int looks_like_pathspec(const char *arg)
 {
-	/* anything with a wildcard character */
-	if (!no_wildcard(arg))
-		return 1;
+	const char *p;
+	int escaped = 0;
+
+	/*
+	 * Wildcard characters imply the user is looking to match pathspecs
+	 * that aren't in the filesystem. Note that this doesn't include
+	 * backslash even though it's a glob special; by itself it doesn't
+	 * cause any increase in the match. Likewise ignore backslash-escaped
+	 * wildcard characters.
+	 */
+	for (p = arg; *p; p++) {
+		if (escaped) {
+			escaped = 0;
+		} else if (is_glob_special(*p)) {
+			if (*p == '\\')
+				escaped = 1;
+			else
+				return 1;
+		}
+	}
 
 	/* long-form pathspec magic */
 	if (starts_with(arg, ":("))
@@ -478,7 +501,7 @@ static int check_repository_format_gently(const char *gitdir, struct repository_
 	}
 
 	repository_format_precious_objects = candidate->precious_objects;
-	repository_format_partial_clone = xstrdup_or_null(candidate->partial_clone);
+	set_repository_format_partial_clone(candidate->partial_clone);
 	repository_format_worktree_config = candidate->worktree_config;
 	string_list_clear(&candidate->unknown_extensions, 0);
 
@@ -797,7 +820,7 @@ static const char *setup_discovered_git_dir(const char *gitdir,
 		set_git_dir(gitdir);
 	inside_git_dir = 0;
 	inside_work_tree = 1;
-	if (offset == cwd->len)
+	if (offset >= cwd->len)
 		return NULL;
 
 	/* Make "offset" point past the '/' (already the case for root dirs) */
@@ -919,7 +942,7 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
 	const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);
 	struct string_list ceiling_dirs = STRING_LIST_INIT_DUP;
 	const char *gitdirenv;
-	int ceil_offset = -1, min_offset = has_dos_drive_prefix(dir->buf) ? 3 : 1;
+	int ceil_offset = -1, min_offset = offset_1st_component(dir->buf);
 	dev_t current_device = 0;
 	int one_filesystem = 1;
 
@@ -947,6 +970,12 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
 	if (ceil_offset < 0)
 		ceil_offset = min_offset - 2;
 
+	if (min_offset && min_offset == dir->len &&
+	    !is_dir_sep(dir->buf[min_offset - 1])) {
+		strbuf_addch(dir, '/');
+		min_offset++;
+	}
+
 	/*
 	 * Test in the following order (relative to the dir):
 	 * - .git (file containing "gitdir: <path>")
diff --git a/third_party/git/sha1-array.c b/third_party/git/sha1-array.c
index d922e94e3fc5..3eeadfede94b 100644
--- a/third_party/git/sha1-array.c
+++ b/third_party/git/sha1-array.c
@@ -48,7 +48,7 @@ int oid_array_for_each(struct oid_array *array,
 {
 	int i;
 
-	/* No oid_array_sort() here! See the api-oid-array.txt docs! */
+	/* No oid_array_sort() here! See sha1-array.h */
 
 	for (i = 0; i < array->nr; i++) {
 		int ret = fn(array->oid + i, data);
diff --git a/third_party/git/sha1-array.h b/third_party/git/sha1-array.h
index 55d016c4bf7b..dc1bca9c9aea 100644
--- a/third_party/git/sha1-array.h
+++ b/third_party/git/sha1-array.h
@@ -1,6 +1,52 @@
 #ifndef SHA1_ARRAY_H
 #define SHA1_ARRAY_H
 
+/**
+ * The API provides storage and manipulation of sets of object identifiers.
+ * The emphasis is on storage and processing efficiency, making them suitable
+ * for large lists. Note that the ordering of items is not preserved over some
+ * operations.
+ *
+ * Examples
+ * --------
+ * -----------------------------------------
+ * int print_callback(const struct object_id *oid,
+ * 		    void *data)
+ * {
+ * 	printf("%s\n", oid_to_hex(oid));
+ * 	return 0; // always continue
+ * }
+ *
+ * void some_func(void)
+ * {
+ *     struct sha1_array hashes = OID_ARRAY_INIT;
+ *     struct object_id oid;
+ *
+ *     // Read objects into our set
+ *     while (read_object_from_stdin(oid.hash))
+ *         oid_array_append(&hashes, &oid);
+ *
+ *     // Check if some objects are in our set
+ *     while (read_object_from_stdin(oid.hash)) {
+ *         if (oid_array_lookup(&hashes, &oid) >= 0)
+ *             printf("it's in there!\n");
+ *
+ *          // Print the unique set of objects. We could also have
+ *          // avoided adding duplicate objects in the first place,
+ *          // but we would end up re-sorting the array repeatedly.
+ *          // Instead, this will sort once and then skip duplicates
+ *          // in linear time.
+ *
+ *         oid_array_for_each_unique(&hashes, print_callback, NULL);
+ *     }
+ */
+
+/**
+ * A single array of object IDs. This should be initialized by assignment from
+ * `OID_ARRAY_INIT`. The `oid` member contains the actual data. The `nr` member
+ * contains the number of items in the set. The `alloc` and `sorted` members
+ * are used internally, and should not be needed by API callers.
+ */
 struct oid_array {
 	struct object_id *oid;
 	int nr;
@@ -10,18 +56,52 @@ struct oid_array {
 
 #define OID_ARRAY_INIT { NULL, 0, 0, 0 }
 
+/**
+ * Add an item to the set. The object ID will be placed at the end of the array
+ * (but note that some operations below may lose this ordering).
+ */
 void oid_array_append(struct oid_array *array, const struct object_id *oid);
+
+/**
+ * Perform a binary search of the array for a specific object ID. If found,
+ * returns the offset (in number of elements) of the object ID. If not found,
+ * returns a negative integer. If the array is not sorted, this function has
+ * the side effect of sorting it.
+ */
 int oid_array_lookup(struct oid_array *array, const struct object_id *oid);
+
+/**
+ * Free all memory associated with the array and return it to the initial,
+ * empty state.
+ */
 void oid_array_clear(struct oid_array *array);
 
 typedef int (*for_each_oid_fn)(const struct object_id *oid,
 			       void *data);
+/**
+ * Iterate over each element of the list, executing the callback function for
+ * each one. Does not sort the list, so any custom hash order is retained.
+ * If the callback returns a non-zero value, the iteration ends immediately
+ * and the callback's return is propagated; otherwise, 0 is returned.
+ */
 int oid_array_for_each(struct oid_array *array,
 		       for_each_oid_fn fn,
 		       void *data);
+
+/**
+ * Iterate over each unique element of the list in sorted order, but otherwise
+ * behave like `oid_array_for_each`. If the array is not sorted, this function
+ * has the side effect of sorting it.
+ */
 int oid_array_for_each_unique(struct oid_array *array,
 			      for_each_oid_fn fn,
 			      void *data);
+
+/**
+ * Apply the callback function `want` to each entry in the array, retaining
+ * only the entries for which the function returns true. Preserve the order
+ * of the entries that are retained.
+ */
 void oid_array_filter(struct oid_array *array,
 		      for_each_oid_fn want,
 		      void *cbdata);
diff --git a/third_party/git/sha1-file.c b/third_party/git/sha1-file.c
index 487ea35d2d39..616886799e59 100644
--- a/third_party/git/sha1-file.c
+++ b/third_party/git/sha1-file.c
@@ -30,8 +30,8 @@
 #include "mergesort.h"
 #include "quote.h"
 #include "packfile.h"
-#include "fetch-object.h"
 #include "object-store.h"
+#include "promisor-remote.h"
 
 /* The maximum size for an object header. */
 #define MAX_HEADER_LEN 32
@@ -55,7 +55,6 @@
 	"\x6f\xe1\x41\xf7\x74\x91\x20\xa3\x03\x72" \
 	"\x18\x13"
 
-const unsigned char null_sha1[GIT_MAX_RAWSZ];
 const struct object_id null_oid;
 static const struct object_id empty_tree_oid = {
 	EMPTY_TREE_SHA1_BIN_LITERAL
@@ -952,12 +951,8 @@ void *xmmap_gently(void *start, size_t length,
 
 	mmap_limit_check(length);
 	ret = mmap(start, length, prot, flags, fd, offset);
-	if (ret == MAP_FAILED) {
-		if (!length)
-			return NULL;
-		release_pack_memory(length);
-		ret = mmap(start, length, prot, flags, fd, offset);
-	}
+	if (ret == MAP_FAILED && !length)
+		ret = NULL;
 	return ret;
 }
 
@@ -976,8 +971,8 @@ void *xmmap(void *start, size_t length,
  * With "map" == NULL, try reading the object named with "oid" using
  * the streaming interface and rehash it to do the same.
  */
-int check_object_signature(const struct object_id *oid, void *map,
-			   unsigned long size, const char *type)
+int check_object_signature(struct repository *r, const struct object_id *oid,
+			   void *map, unsigned long size, const char *type)
 {
 	struct object_id real_oid;
 	enum object_type obj_type;
@@ -987,11 +982,11 @@ int check_object_signature(const struct object_id *oid, void *map,
 	int hdrlen;
 
 	if (map) {
-		hash_object_file(map, size, type, &real_oid);
+		hash_object_file(r->hash_algo, map, size, type, &real_oid);
 		return !oideq(oid, &real_oid) ? -1 : 0;
 	}
 
-	st = open_istream(oid, &obj_type, &size, NULL);
+	st = open_istream(r, oid, &obj_type, &size, NULL);
 	if (!st)
 		return -1;
 
@@ -999,8 +994,8 @@ int check_object_signature(const struct object_id *oid, void *map,
 	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(obj_type), (uintmax_t)size) + 1;
 
 	/* Sha1.. */
-	the_hash_algo->init_fn(&c);
-	the_hash_algo->update_fn(&c, hdr, hdrlen);
+	r->hash_algo->init_fn(&c);
+	r->hash_algo->update_fn(&c, hdr, hdrlen);
 	for (;;) {
 		char buf[1024 * 16];
 		ssize_t readlen = read_istream(st, buf, sizeof(buf));
@@ -1011,9 +1006,9 @@ int check_object_signature(const struct object_id *oid, void *map,
 		}
 		if (!readlen)
 			break;
-		the_hash_algo->update_fn(&c, buf, readlen);
+		r->hash_algo->update_fn(&c, buf, readlen);
 	}
-	the_hash_algo->final_fn(real_oid.hash, &c);
+	r->hash_algo->final_fn(real_oid.hash, &c);
 	close_istream(st);
 	return !oideq(oid, &real_oid) ? -1 : 0;
 }
@@ -1152,6 +1147,8 @@ static int unpack_loose_short_header(git_zstream *stream,
 				     unsigned char *map, unsigned long mapsize,
 				     void *buffer, unsigned long bufsiz)
 {
+	int ret;
+
 	/* Get the data stream */
 	memset(stream, 0, sizeof(*stream));
 	stream->next_in = map;
@@ -1160,7 +1157,11 @@ static int unpack_loose_short_header(git_zstream *stream,
 	stream->avail_out = bufsiz;
 
 	git_inflate_init(stream);
-	return git_inflate(stream, 0);
+	obj_read_unlock();
+	ret = git_inflate(stream, 0);
+	obj_read_lock();
+
+	return ret;
 }
 
 int unpack_loose_header(git_zstream *stream,
@@ -1205,7 +1206,9 @@ static int unpack_loose_header_to_strbuf(git_zstream *stream, unsigned char *map
 	stream->avail_out = bufsiz;
 
 	do {
+		obj_read_unlock();
 		status = git_inflate(stream, 0);
+		obj_read_lock();
 		strbuf_add(header, buffer, stream->next_out - (unsigned char *)buffer);
 		if (memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer))
 			return 0;
@@ -1245,8 +1248,11 @@ static void *unpack_loose_rest(git_zstream *stream,
 		 */
 		stream->next_out = buf + bytes;
 		stream->avail_out = size - bytes;
-		while (status == Z_OK)
+		while (status == Z_OK) {
+			obj_read_unlock();
 			status = git_inflate(stream, Z_FINISH);
+			obj_read_lock();
+		}
 	}
 	if (status == Z_STREAM_END && !stream->avail_in) {
 		git_inflate_end(stream);
@@ -1348,8 +1354,8 @@ static int loose_object_info(struct repository *r,
 	struct strbuf hdrbuf = STRBUF_INIT;
 	unsigned long size_scratch;
 
-	if (oi->delta_base_sha1)
-		hashclr(oi->delta_base_sha1);
+	if (oi->delta_base_oid)
+		oidclr(oi->delta_base_oid);
 
 	/*
 	 * If we don't care about type or size, then we don't
@@ -1416,17 +1422,41 @@ static int loose_object_info(struct repository *r,
 	return (status < 0) ? status : 0;
 }
 
+int obj_read_use_lock = 0;
+pthread_mutex_t obj_read_mutex;
+
+void enable_obj_read_lock(void)
+{
+	if (obj_read_use_lock)
+		return;
+
+	obj_read_use_lock = 1;
+	init_recursive_mutex(&obj_read_mutex);
+}
+
+void disable_obj_read_lock(void)
+{
+	if (!obj_read_use_lock)
+		return;
+
+	obj_read_use_lock = 0;
+	pthread_mutex_destroy(&obj_read_mutex);
+}
+
 int fetch_if_missing = 1;
 
-int oid_object_info_extended(struct repository *r, const struct object_id *oid,
-			     struct object_info *oi, unsigned flags)
+static int do_oid_object_info_extended(struct repository *r,
+				       const struct object_id *oid,
+				       struct object_info *oi, unsigned flags)
 {
 	static struct object_info blank_oi = OBJECT_INFO_INIT;
+	struct cached_object *co;
 	struct pack_entry e;
 	int rtype;
 	const struct object_id *real = oid;
 	int already_retried = 0;
 
+
 	if (flags & OBJECT_INFO_LOOKUP_REPLACE)
 		real = lookup_replace_object(r, oid);
 
@@ -1436,24 +1466,22 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
 	if (!oi)
 		oi = &blank_oi;
 
-	if (!(flags & OBJECT_INFO_SKIP_CACHED)) {
-		struct cached_object *co = find_cached_object(real);
-		if (co) {
-			if (oi->typep)
-				*(oi->typep) = co->type;
-			if (oi->sizep)
-				*(oi->sizep) = co->size;
-			if (oi->disk_sizep)
-				*(oi->disk_sizep) = 0;
-			if (oi->delta_base_sha1)
-				hashclr(oi->delta_base_sha1);
-			if (oi->type_name)
-				strbuf_addstr(oi->type_name, type_name(co->type));
-			if (oi->contentp)
-				*oi->contentp = xmemdupz(co->buf, co->size);
-			oi->whence = OI_CACHED;
-			return 0;
-		}
+	co = find_cached_object(real);
+	if (co) {
+		if (oi->typep)
+			*(oi->typep) = co->type;
+		if (oi->sizep)
+			*(oi->sizep) = co->size;
+		if (oi->disk_sizep)
+			*(oi->disk_sizep) = 0;
+		if (oi->delta_base_oid)
+			oidclr(oi->delta_base_oid);
+		if (oi->type_name)
+			strbuf_addstr(oi->type_name, type_name(co->type));
+		if (oi->contentp)
+			*oi->contentp = xmemdupz(co->buf, co->size);
+		oi->whence = OI_CACHED;
+		return 0;
 	}
 
 	while (1) {
@@ -1475,16 +1503,17 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
 		}
 
 		/* Check if it is a missing object */
-		if (fetch_if_missing && repository_format_partial_clone &&
+		if (fetch_if_missing && has_promisor_remote() &&
 		    !already_retried && r == the_repository &&
 		    !(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) {
 			/*
-			 * TODO Investigate having fetch_object() return
-			 * TODO error/success and stopping the music here.
-			 * TODO Pass a repository struct through fetch_object,
-			 * such that arbitrary repositories work.
+			 * TODO Investigate checking promisor_remote_get_direct()
+			 * TODO return value and stopping on error here.
+			 * TODO Pass a repository struct through
+			 * promisor_remote_get_direct(), such that arbitrary
+			 * repositories work.
 			 */
-			fetch_objects(repository_format_partial_clone, real, 1);
+			promisor_remote_get_direct(r, real, 1);
 			already_retried = 1;
 			continue;
 		}
@@ -1501,7 +1530,7 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
 	rtype = packed_object_info(r, e.p, e.offset, oi);
 	if (rtype < 0) {
 		mark_bad_packed_object(e.p, real->hash);
-		return oid_object_info_extended(r, real, oi, 0);
+		return do_oid_object_info_extended(r, real, oi, 0);
 	} else if (oi->whence == OI_PACKED) {
 		oi->u.packed.offset = e.offset;
 		oi->u.packed.pack = e.p;
@@ -1512,6 +1541,17 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
 	return 0;
 }
 
+int oid_object_info_extended(struct repository *r, const struct object_id *oid,
+			     struct object_info *oi, unsigned flags)
+{
+	int ret;
+	obj_read_lock();
+	ret = do_oid_object_info_extended(r, oid, oi, flags);
+	obj_read_unlock();
+	return ret;
+}
+
+
 /* returns enum object_type or negative */
 int oid_object_info(struct repository *r,
 		    const struct object_id *oid,
@@ -1548,7 +1588,7 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type,
 {
 	struct cached_object *co;
 
-	hash_object_file(buf, len, type_name(type), oid);
+	hash_object_file(the_hash_algo, buf, len, type_name(type), oid);
 	if (has_object_file(oid) || find_cached_object(oid))
 		return 0;
 	ALLOC_GROW(cached_objects, cached_object_nr + 1, cached_object_alloc);
@@ -1584,6 +1624,7 @@ void *read_object_file_extended(struct repository *r,
 	if (data)
 		return data;
 
+	obj_read_lock();
 	if (errno && errno != ENOENT)
 		die_errno(_("failed to read object %s"), oid_to_hex(oid));
 
@@ -1599,6 +1640,7 @@ void *read_object_file_extended(struct repository *r,
 	if ((p = has_packed_and_bad(r, repl->hash)) != NULL)
 		die(_("packed object %s (stored in %s) is corrupt"),
 		    oid_to_hex(repl), p->pack_name);
+	obj_read_unlock();
 
 	return NULL;
 }
@@ -1652,7 +1694,8 @@ void *read_object_with_reference(struct repository *r,
 	}
 }
 
-static void write_object_file_prepare(const void *buf, unsigned long len,
+static void write_object_file_prepare(const struct git_hash_algo *algo,
+				      const void *buf, unsigned long len,
 				      const char *type, struct object_id *oid,
 				      char *hdr, int *hdrlen)
 {
@@ -1662,10 +1705,10 @@ static void write_object_file_prepare(const void *buf, unsigned long len,
 	*hdrlen = xsnprintf(hdr, *hdrlen, "%s %"PRIuMAX , type, (uintmax_t)len)+1;
 
 	/* Sha1.. */
-	the_hash_algo->init_fn(&c);
-	the_hash_algo->update_fn(&c, hdr, *hdrlen);
-	the_hash_algo->update_fn(&c, buf, len);
-	the_hash_algo->final_fn(oid->hash, &c);
+	algo->init_fn(&c);
+	algo->update_fn(&c, hdr, *hdrlen);
+	algo->update_fn(&c, buf, len);
+	algo->final_fn(oid->hash, &c);
 }
 
 /*
@@ -1718,12 +1761,13 @@ static int write_buffer(int fd, const void *buf, size_t len)
 	return 0;
 }
 
-int hash_object_file(const void *buf, unsigned long len, const char *type,
+int hash_object_file(const struct git_hash_algo *algo, const void *buf,
+		     unsigned long len, const char *type,
 		     struct object_id *oid)
 {
 	char hdr[MAX_HEADER_LEN];
 	int hdrlen = sizeof(hdr);
-	write_object_file_prepare(buf, len, type, oid, hdr, &hdrlen);
+	write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen);
 	return 0;
 }
 
@@ -1881,7 +1925,8 @@ int write_object_file(const void *buf, unsigned long len, const char *type,
 	/* Normally if we have it in the pack then we do not bother writing
 	 * it out into .git/objects/??/?{38} file.
 	 */
-	write_object_file_prepare(buf, len, type, oid, hdr, &hdrlen);
+	write_object_file_prepare(the_hash_algo, buf, len, type, oid, hdr,
+				  &hdrlen);
 	if (freshen_packed_object(oid) || freshen_loose_object(oid))
 		return 0;
 	return write_loose_object(oid, hdr, hdrlen, buf, len, 0);
@@ -1897,7 +1942,8 @@ int hash_object_file_literally(const void *buf, unsigned long len,
 	/* type string, SP, %lu of the length plus NUL must fit this */
 	hdrlen = strlen(type) + MAX_HEADER_LEN;
 	header = xmalloc(hdrlen);
-	write_object_file_prepare(buf, len, type, oid, header, &hdrlen);
+	write_object_file_prepare(the_hash_algo, buf, len, type, oid, header,
+				  &hdrlen);
 
 	if (!(flags & HASH_WRITE_OBJECT))
 		goto cleanup;
@@ -1936,8 +1982,7 @@ int repo_has_object_file_with_flags(struct repository *r,
 {
 	if (!startup_info->have_repository)
 		return 0;
-	return oid_object_info_extended(r, oid, NULL,
-					flags | OBJECT_INFO_SKIP_CACHED) >= 0;
+	return oid_object_info_extended(r, oid, NULL, flags) >= 0;
 }
 
 int repo_has_object_file(struct repository *r,
@@ -2008,7 +2053,8 @@ static int index_mem(struct index_state *istate,
 	if (write_object)
 		ret = write_object_file(buf, size, type_name(type), oid);
 	else
-		ret = hash_object_file(buf, size, type_name(type), oid);
+		ret = hash_object_file(the_hash_algo, buf, size,
+				       type_name(type), oid);
 	if (re_allocated)
 		free(buf);
 	return ret;
@@ -2034,8 +2080,8 @@ static int index_stream_convert_blob(struct index_state *istate,
 		ret = write_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB),
 					oid);
 	else
-		ret = hash_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB),
-				       oid);
+		ret = hash_object_file(the_hash_algo, sbuf.buf, sbuf.len,
+				       type_name(OBJ_BLOB), oid);
 	strbuf_release(&sbuf);
 	return ret;
 }
@@ -2153,7 +2199,8 @@ int index_path(struct index_state *istate, struct object_id *oid,
 		if (strbuf_readlink(&sb, path, st->st_size))
 			return error_errno("readlink(\"%s\")", path);
 		if (!(flags & HASH_WRITE_OBJECT))
-			hash_object_file(sb.buf, sb.len, blob_type, oid);
+			hash_object_file(the_hash_algo, sb.buf, sb.len,
+					 blob_type, oid);
 		else if (write_object_file(sb.buf, sb.len, blob_type, oid))
 			rc = error(_("%s: failed to insert into database"), path);
 		strbuf_release(&sb);
@@ -2454,8 +2501,9 @@ int read_loose_object(const char *path,
 			git_inflate_end(&stream);
 			goto out;
 		}
-		if (check_object_signature(expected_oid, *contents,
-					 *size, type_name(*type))) {
+		if (check_object_signature(the_repository, expected_oid,
+					   *contents, *size,
+					   type_name(*type))) {
 			error(_("hash mismatch for %s (expected %s)"), path,
 			      oid_to_hex(expected_oid));
 			free(*contents);
diff --git a/third_party/git/sha1-lookup.c b/third_party/git/sha1-lookup.c
index 796ab68da83c..29185844ecd4 100644
--- a/third_party/git/sha1-lookup.c
+++ b/third_party/git/sha1-lookup.c
@@ -50,7 +50,7 @@ static uint32_t take2(const unsigned char *sha1)
  * The sha1 of element i (between 0 and nr - 1) should be returned
  * by "fn(i, table)".
  */
-int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
+int sha1_pos(const unsigned char *hash, void *table, size_t nr,
 	     sha1_access_fn fn)
 {
 	size_t hi = nr;
@@ -63,14 +63,14 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
 	if (nr != 1) {
 		size_t lov, hiv, miv, ofs;
 
-		for (ofs = 0; ofs < 18; ofs += 2) {
+		for (ofs = 0; ofs < the_hash_algo->rawsz - 2; ofs += 2) {
 			lov = take2(fn(0, table) + ofs);
 			hiv = take2(fn(nr - 1, table) + ofs);
-			miv = take2(sha1 + ofs);
+			miv = take2(hash + ofs);
 			if (miv < lov)
 				return -1;
 			if (hiv < miv)
-				return -1 - nr;
+				return index_pos_to_insert_pos(nr);
 			if (lov != hiv) {
 				/*
 				 * At this point miv could be equal
@@ -88,7 +88,7 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
 
 	do {
 		int cmp;
-		cmp = hashcmp(fn(mi, table), sha1);
+		cmp = hashcmp(fn(mi, table), hash);
 		if (!cmp)
 			return mi;
 		if (cmp > 0)
@@ -97,7 +97,7 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
 			lo = mi + 1;
 		mi = lo + (hi - lo) / 2;
 	} while (lo < hi);
-	return -lo-1;
+	return index_pos_to_insert_pos(lo);
 }
 
 int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
diff --git a/third_party/git/sha1-name.c b/third_party/git/sha1-name.c
index 2989e27b717a..5bb006e5a9e0 100644
--- a/third_party/git/sha1-name.c
+++ b/third_party/git/sha1-name.c
@@ -155,7 +155,6 @@ static void unique_in_pack(struct packed_git *p,
 			   struct disambiguate_state *ds)
 {
 	uint32_t num, i, first = 0;
-	const struct object_id *current = NULL;
 
 	if (p->multi_pack_index)
 		return;
@@ -173,10 +172,10 @@ static void unique_in_pack(struct packed_git *p,
 	 */
 	for (i = first; i < num && !ds->ambiguous; i++) {
 		struct object_id oid;
-		current = nth_packed_object_oid(&oid, p, i);
-		if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash))
+		nth_packed_object_id(&oid, p, i);
+		if (!match_sha(ds->len, ds->bin_pfx.hash, oid.hash))
 			break;
-		update_candidates(ds, current);
+		update_candidates(ds, &oid);
 	}
 }
 
@@ -403,9 +402,9 @@ static int repo_collect_ambiguous(struct repository *r,
 	return collect_ambiguous(oid, data);
 }
 
-static struct repository *sort_ambiguous_repo;
-static int sort_ambiguous(const void *a, const void *b)
+static int sort_ambiguous(const void *a, const void *b, void *ctx)
 {
+	struct repository *sort_ambiguous_repo = ctx;
 	int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);
 	int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);
 	int a_type_sort;
@@ -434,10 +433,7 @@ static int sort_ambiguous(const void *a, const void *b)
 
 static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a)
 {
-	/* mutex will be needed if this code is to be made thread safe */
-	sort_ambiguous_repo = r;
-	QSORT(a->oid, a->nr, sort_ambiguous);
-	sort_ambiguous_repo = NULL;
+	QSORT_S(a->oid, a->nr, sort_ambiguous, r);
 }
 
 static enum get_oid_result get_short_oid(struct repository *r,
@@ -646,14 +642,14 @@ static void find_abbrev_len_for_pack(struct packed_git *p,
 	 */
 	mad->init_len = 0;
 	if (!match) {
-		if (nth_packed_object_oid(&oid, p, first))
+		if (!nth_packed_object_id(&oid, p, first))
 			extend_abbrev_len(&oid, mad);
 	} else if (first < num - 1) {
-		if (nth_packed_object_oid(&oid, p, first + 1))
+		if (!nth_packed_object_id(&oid, p, first + 1))
 			extend_abbrev_len(&oid, mad);
 	}
 	if (first > 0) {
-		if (nth_packed_object_oid(&oid, p, first - 1))
+		if (!nth_packed_object_id(&oid, p, first - 1))
 			extend_abbrev_len(&oid, mad);
 	}
 	mad->init_len = mad->cur_len;
@@ -911,26 +907,21 @@ static int get_oid_basic(struct repository *r, const char *str, int len,
 				real_ref, flags, at_time, nth, oid, NULL,
 				&co_time, &co_tz, &co_cnt)) {
 			if (!len) {
-				if (starts_with(real_ref, "refs/heads/")) {
-					str = real_ref + 11;
-					len = strlen(real_ref + 11);
-				} else {
-					/* detached HEAD */
+				if (!skip_prefix(real_ref, "refs/heads/", &str))
 					str = "HEAD";
-					len = 4;
-				}
+				len = strlen(str);
 			}
 			if (at_time) {
 				if (!(flags & GET_OID_QUIETLY)) {
-					warning("Log for '%.*s' only goes "
-						"back to %s.", len, str,
+					warning(_("log for '%.*s' only goes back to %s"),
+						len, str,
 						show_date(co_time, co_tz, DATE_MODE(RFC2822)));
 				}
 			} else {
 				if (flags & GET_OID_QUIETLY) {
 					exit(128);
 				}
-				die("Log for '%.*s' only has %d entries.",
+				die(_("log for '%.*s' only has %d entries"),
 				    len, str, co_cnt);
 			}
 		}
@@ -1163,13 +1154,22 @@ static enum get_oid_result get_oid_1(struct repository *r,
 	}
 
 	if (has_suffix) {
-		int num = 0;
+		unsigned int num = 0;
 		int len1 = cp - name;
 		cp++;
-		while (cp < name + len)
-			num = num * 10 + *cp++ - '0';
+		while (cp < name + len) {
+			unsigned int digit = *cp++ - '0';
+			if (unsigned_mult_overflows(num, 10))
+				return MISSING_OBJECT;
+			num *= 10;
+			if (unsigned_add_overflows(num, digit))
+				return MISSING_OBJECT;
+			num += digit;
+		}
 		if (!num && len1 == len - 1)
 			num = 1;
+		else if (num > INT_MAX)
+			return MISSING_OBJECT;
 		if (has_suffix == '^')
 			return get_parent(r, name, len1, oid, num);
 		/* else if (has_suffix == '~') -- goes without saying */
@@ -1289,7 +1289,7 @@ static int get_oid_oneline(struct repository *r,
 
 struct grab_nth_branch_switch_cbdata {
 	int remaining;
-	struct strbuf buf;
+	struct strbuf *sb;
 };
 
 static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid,
@@ -1307,8 +1307,8 @@ static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid
 		return 0;
 	if (--(cb->remaining) == 0) {
 		len = target - match;
-		strbuf_reset(&cb->buf);
-		strbuf_add(&cb->buf, match, len);
+		strbuf_reset(cb->sb);
+		strbuf_add(cb->sb, match, len);
 		return 1; /* we are done */
 	}
 	return 0;
@@ -1341,18 +1341,15 @@ static int interpret_nth_prior_checkout(struct repository *r,
 	if (nth <= 0)
 		return -1;
 	cb.remaining = nth;
-	strbuf_init(&cb.buf, 20);
+	cb.sb = buf;
 
 	retval = refs_for_each_reflog_ent_reverse(get_main_ref_store(r),
 			"HEAD", grab_nth_branch_switch, &cb);
 	if (0 < retval) {
-		strbuf_reset(buf);
-		strbuf_addbuf(buf, &cb.buf);
 		retval = brace - name + 1;
 	} else
 		retval = 0;
 
-	strbuf_release(&cb.buf);
 	return retval;
 }
 
@@ -1689,14 +1686,14 @@ static void diagnose_invalid_oid_path(struct repository *r,
 		prefix = "";
 
 	if (file_exists(filename))
-		die("Path '%s' exists on disk, but not in '%.*s'.",
+		die(_("path '%s' exists on disk, but not in '%.*s'"),
 		    filename, object_name_len, object_name);
 	if (is_missing_file_error(errno)) {
 		char *fullname = xstrfmt("%s%s", prefix, filename);
 
 		if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
-			die("Path '%s' exists, but not '%s'.\n"
-			    "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
+			die(_("path '%s' exists, but not '%s'\n"
+			    "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
 			    fullname,
 			    filename,
 			    object_name_len, object_name,
@@ -1704,7 +1701,7 @@ static void diagnose_invalid_oid_path(struct repository *r,
 			    object_name_len, object_name,
 			    filename);
 		}
-		die("Path '%s' does not exist in '%.*s'",
+		die(_("path '%s' does not exist in '%.*s'"),
 		    filename, object_name_len, object_name);
 	}
 }
@@ -1732,8 +1729,8 @@ static void diagnose_invalid_index_path(struct repository *r,
 		ce = istate->cache[pos];
 		if (ce_namelen(ce) == namelen &&
 		    !memcmp(ce->name, filename, namelen))
-			die("Path '%s' is in the index, but not at stage %d.\n"
-			    "Did you mean ':%d:%s'?",
+			die(_("path '%s' is in the index, but not at stage %d\n"
+			    "hint: Did you mean ':%d:%s'?"),
 			    filename, stage,
 			    ce_stage(ce), filename);
 	}
@@ -1748,17 +1745,17 @@ static void diagnose_invalid_index_path(struct repository *r,
 		ce = istate->cache[pos];
 		if (ce_namelen(ce) == fullname.len &&
 		    !memcmp(ce->name, fullname.buf, fullname.len))
-			die("Path '%s' is in the index, but not '%s'.\n"
-			    "Did you mean ':%d:%s' aka ':%d:./%s'?",
+			die(_("path '%s' is in the index, but not '%s'\n"
+			    "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
 			    fullname.buf, filename,
 			    ce_stage(ce), fullname.buf,
 			    ce_stage(ce), filename);
 	}
 
 	if (repo_file_exists(r, filename))
-		die("Path '%s' exists on disk, but not in the index.", filename);
+		die(_("path '%s' exists on disk, but not in the index"), filename);
 	if (is_missing_file_error(errno))
-		die("Path '%s' does not exist (neither on disk nor in the index).",
+		die(_("path '%s' does not exist (neither on disk nor in the index)"),
 		    filename);
 
 	strbuf_release(&fullname);
@@ -1771,7 +1768,7 @@ static char *resolve_relative_path(struct repository *r, const char *rel)
 		return NULL;
 
 	if (r != the_repository || !is_inside_work_tree())
-		die("relative path syntax can't be used outside working tree.");
+		die(_("relative path syntax can't be used outside working tree"));
 
 	/* die() inside prefix_path() if resolved path is outside worktree */
 	return prefix_path(startup_info->prefix,
@@ -1909,7 +1906,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
 			return ret;
 		} else {
 			if (only_to_die)
-				die("Invalid object name '%.*s'.", len, name);
+				die(_("invalid object name '%.*s'."), len, name);
 		}
 	}
 	return ret;
diff --git a/third_party/git/sha1dc/sha1.c b/third_party/git/sha1dc/sha1.c
index 9d3cf81d4d71..dede2cbddf94 100644
--- a/third_party/git/sha1dc/sha1.c
+++ b/third_party/git/sha1dc/sha1.c
@@ -72,7 +72,7 @@
 /* Not under GCC-alike or glibc */
 #elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN)
 /*
- * *BSD and newlib (embeded linux, cygwin, etc).
+ * *BSD and newlib (embedded linux, cygwin, etc).
  * the defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN) part prevents
  * this condition from matching with Solaris/sparc.
  * (Solaris defines only one endian macro)
@@ -98,7 +98,7 @@
 /*
  * Defines Big Endian on a whitelist of OSs that are known to be Big
  * Endian-only. See
- * https://public-inbox.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/
+ * https://lore.kernel.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/
  */
 #define SHA1DC_BIGENDIAN
 
diff --git a/third_party/git/sha1dc_git.c b/third_party/git/sha1dc_git.c
index e0cc9d988c70..5c300e812e0a 100644
--- a/third_party/git/sha1dc_git.c
+++ b/third_party/git/sha1dc_git.c
@@ -19,7 +19,7 @@ void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)
 	if (!SHA1DCFinal(hash, ctx))
 		return;
 	die("SHA-1 appears to be part of a collision attack: %s",
-	    sha1_to_hex(hash));
+	    hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1]));
 }
 
 /*
diff --git a/third_party/git/shallow.c b/third_party/git/shallow.c
index 5fa2b15d3705..7fd04afed19a 100644
--- a/third_party/git/shallow.c
+++ b/third_party/git/shallow.c
@@ -12,10 +12,7 @@
 #include "diff.h"
 #include "revision.h"
 #include "commit-slab.h"
-#include "revision.h"
 #include "list-objects.h"
-#include "commit-slab.h"
-#include "repository.h"
 #include "commit-reach.h"
 
 void set_alternate_shallow_file(struct repository *r, const char *path, int override)
@@ -156,6 +153,8 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
 	for (i = 0; i < depths.slab_count; i++) {
 		int j;
 
+		if (!depths.slab[i])
+			continue;
 		for (j = 0; j < depths.slab_size; j++)
 			free(depths.slab[i][j]);
 	}
diff --git a/third_party/git/shell.c b/third_party/git/shell.c
index 40084a30130e..54cca7439de6 100644
--- a/third_party/git/shell.c
+++ b/third_party/git/shell.c
@@ -16,10 +16,10 @@ static int do_generic_cmd(const char *me, char *arg)
 	setup_path();
 	if (!arg || !(arg = sq_dequote(arg)) || *arg == '-')
 		die("bad argument");
-	if (!starts_with(me, "git-"))
+	if (!skip_prefix(me, "git-", &me))
 		die("bad command");
 
-	my_argv[0] = me + 4;
+	my_argv[0] = me;
 	my_argv[1] = arg;
 	my_argv[2] = NULL;
 
diff --git a/third_party/git/sigchain.h b/third_party/git/sigchain.h
index 138b20f54b40..8e6bada8928c 100644
--- a/third_party/git/sigchain.h
+++ b/third_party/git/sigchain.h
@@ -1,12 +1,57 @@
 #ifndef SIGCHAIN_H
 #define SIGCHAIN_H
 
+/**
+ * Code often wants to set a signal handler to clean up temporary files or
+ * other work-in-progress when we die unexpectedly. For multiple pieces of
+ * code to do this without conflicting, each piece of code must remember
+ * the old value of the handler and restore it either when:
+ *
+ *   1. The work-in-progress is finished, and the handler is no longer
+ *      necessary. The handler should revert to the original behavior
+ *      (either another handler, SIG_DFL, or SIG_IGN).
+ *
+ *   2. The signal is received. We should then do our cleanup, then chain
+ *      to the next handler (or die if it is SIG_DFL).
+ *
+ * Sigchain is a tiny library for keeping a stack of handlers. Your handler
+ * and installation code should look something like:
+ *
+ * ------------------------------------------
+ *   void clean_foo_on_signal(int sig)
+ *   {
+ * 	  clean_foo();
+ * 	  sigchain_pop(sig);
+ * 	  raise(sig);
+ *   }
+ *
+ *   void other_func()
+ *   {
+ * 	  sigchain_push_common(clean_foo_on_signal);
+ * 	  mess_up_foo();
+ * 	  clean_foo();
+ *   }
+ * ------------------------------------------
+ *
+ */
+
+/**
+ * Handlers are given the typedef of sigchain_fun. This is the same type
+ * that is given to signal() or sigaction(). It is perfectly reasonable to
+ * push SIG_DFL or SIG_IGN onto the stack.
+ */
 typedef void (*sigchain_fun)(int);
 
+/* You can sigchain_push and sigchain_pop individual signals. */
 int sigchain_push(int sig, sigchain_fun f);
 int sigchain_pop(int sig);
 
+/**
+ * push the handler onto the stack for the common signals:
+ * SIGINT, SIGHUP, SIGTERM, SIGQUIT and SIGPIPE.
+ */
 void sigchain_push_common(sigchain_fun f);
+
 void sigchain_pop_common(void);
 
 #endif /* SIGCHAIN_H */
diff --git a/third_party/git/compat/qsort.c b/third_party/git/stable-qsort.c
index 7d071afb7053..6cbaf39f7b6c 100644
--- a/third_party/git/compat/qsort.c
+++ b/third_party/git/stable-qsort.c
@@ -1,4 +1,4 @@
-#include "../git-compat-util.h"
+#include "git-compat-util.h"
 
 /*
  * A merge sort implementation, simplified from the qsort implementation
@@ -44,8 +44,8 @@ static void msort_with_tmp(void *b, size_t n, size_t s,
 	memcpy(b, t, (n - n2) * s);
 }
 
-void git_qsort(void *b, size_t n, size_t s,
-	       int (*cmp)(const void *, const void *))
+void git_stable_qsort(void *b, size_t n, size_t s,
+		      int (*cmp)(const void *, const void *))
 {
 	const size_t size = st_mult(n, s);
 	char buf[1024];
diff --git a/third_party/git/strbuf.c b/third_party/git/strbuf.c
index d30f91685888..bb0065ccaf5b 100644
--- a/third_party/git/strbuf.c
+++ b/third_party/git/strbuf.c
@@ -479,6 +479,21 @@ void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src)
 	}
 }
 
+#define URL_UNSAFE_CHARS " <>\"%{}|\\^`:/?#[]@!$&'()*+,;="
+
+void strbuf_add_percentencode(struct strbuf *dst, const char *src)
+{
+	size_t i, len = strlen(src);
+
+	for (i = 0; i < len; i++) {
+		unsigned char ch = src[i];
+		if (ch <= 0x1F || ch >= 0x7F || strchr(URL_UNSAFE_CHARS, ch))
+			strbuf_addf(dst, "%%%02X", (unsigned char)ch);
+		else
+			strbuf_addch(dst, ch);
+	}
+}
+
 size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f)
 {
 	size_t res;
@@ -774,8 +789,10 @@ void strbuf_addstr_xml_quoted(struct strbuf *buf, const char *s)
 	}
 }
 
-static int is_rfc3986_reserved(char ch)
+int is_rfc3986_reserved_or_unreserved(char ch)
 {
+	if (is_rfc3986_unreserved(ch))
+		return 1;
 	switch (ch) {
 		case '!': case '*': case '\'': case '(': case ')': case ';':
 		case ':': case '@': case '&': case '=': case '+': case '$':
@@ -785,20 +802,19 @@ static int is_rfc3986_reserved(char ch)
 	return 0;
 }
 
-static int is_rfc3986_unreserved(char ch)
+int is_rfc3986_unreserved(char ch)
 {
 	return isalnum(ch) ||
 		ch == '-' || ch == '_' || ch == '.' || ch == '~';
 }
 
 static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
-				 int reserved)
+				 char_predicate allow_unencoded_fn)
 {
 	strbuf_grow(sb, len);
 	while (len--) {
 		char ch = *s++;
-		if (is_rfc3986_unreserved(ch) ||
-		    (!reserved && is_rfc3986_reserved(ch)))
+		if (allow_unencoded_fn(ch))
 			strbuf_addch(sb, ch);
 		else
 			strbuf_addf(sb, "%%%02x", (unsigned char)ch);
@@ -806,9 +822,9 @@ static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
 }
 
 void strbuf_addstr_urlencode(struct strbuf *sb, const char *s,
-			     int reserved)
+			     char_predicate allow_unencoded_fn)
 {
-	strbuf_add_urlencode(sb, s, strlen(s), reserved);
+	strbuf_add_urlencode(sb, s, strlen(s), allow_unencoded_fn);
 }
 
 static void strbuf_humanise(struct strbuf *buf, off_t bytes,
@@ -1124,3 +1140,31 @@ int strbuf_normalize_path(struct strbuf *src)
 	strbuf_release(&dst);
 	return 0;
 }
+
+int strbuf_edit_interactively(struct strbuf *buffer, const char *path,
+			      const char *const *env)
+{
+	char *path2 = NULL;
+	int fd, res = 0;
+
+	if (!is_absolute_path(path))
+		path = path2 = xstrdup(git_path("%s", path));
+
+	fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+	if (fd < 0)
+		res = error_errno(_("could not open '%s' for writing"), path);
+	else if (write_in_full(fd, buffer->buf, buffer->len) < 0) {
+		res = error_errno(_("could not write to '%s'"), path);
+		close(fd);
+	} else if (close(fd) < 0)
+		res = error_errno(_("could not close '%s'"), path);
+	else {
+		strbuf_reset(buffer);
+		if (launch_editor(path, buffer, env) < 0)
+			res = error_errno(_("could not edit '%s'"), path);
+		unlink(path);
+	}
+
+	free(path2);
+	return res;
+}
diff --git a/third_party/git/strbuf.h b/third_party/git/strbuf.h
index f62278a0be59..ce8e49c0b2a1 100644
--- a/third_party/git/strbuf.h
+++ b/third_party/git/strbuf.h
@@ -245,6 +245,18 @@ void strbuf_addchars(struct strbuf *sb, int c, size_t n);
 void strbuf_insert(struct strbuf *sb, size_t pos, const void *, size_t);
 
 /**
+ * Insert a NUL-terminated string to the given position of the buffer.
+ * The remaining contents will be shifted, not overwritten.  It's an
+ * inline function to allow the compiler to resolve strlen() calls on
+ * constants at compile time.
+ */
+static inline void strbuf_insertstr(struct strbuf *sb, size_t pos,
+				    const char *s)
+{
+	strbuf_insert(sb, pos, s, strlen(s));
+}
+
+/**
  * Insert data to the given position of the buffer giving a printf format
  * string. The contents will be shifted, not overwritten.
  */
@@ -367,6 +379,12 @@ size_t strbuf_expand_dict_cb(struct strbuf *sb,
 void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src);
 
 /**
+ * Append the contents of a string to a strbuf, percent-encoding any characters
+ * that are needed to be encoded for a URL.
+ */
+void strbuf_add_percentencode(struct strbuf *dst, const char *src);
+
+/**
  * Append the given byte size as a human-readable string (i.e. 12.23 KiB,
  * 3.50 MiB).
  */
@@ -621,6 +639,17 @@ int launch_editor(const char *path, struct strbuf *buffer,
 int launch_sequence_editor(const char *path, struct strbuf *buffer,
 			   const char *const *env);
 
+/*
+ * In contrast to `launch_editor()`, this function writes out the contents
+ * of the specified file first, then clears the `buffer`, then launches
+ * the editor and reads back in the file contents into the `buffer`.
+ * Finally, it deletes the temporary file.
+ *
+ * If `path` is relative, it refers to a file in the `.git` directory.
+ */
+int strbuf_edit_interactively(struct strbuf *buffer, const char *path,
+			      const char *const *env);
+
 void strbuf_add_lines(struct strbuf *sb,
 		      const char *prefix,
 		      const char *buf,
@@ -672,8 +701,13 @@ void strbuf_branchname(struct strbuf *sb, const char *name,
  */
 int strbuf_check_branch_ref(struct strbuf *sb, const char *name);
 
+typedef int (*char_predicate)(char ch);
+
+int is_rfc3986_unreserved(char ch);
+int is_rfc3986_reserved_or_unreserved(char ch);
+
 void strbuf_addstr_urlencode(struct strbuf *sb, const char *name,
-			     int reserved);
+			     char_predicate allow_unencoded_fn);
 
 __attribute__((format (printf,1,2)))
 int printf_ln(const char *fmt, ...);
diff --git a/third_party/git/streaming.c b/third_party/git/streaming.c
index fcd63032192f..800f07a52cc8 100644
--- a/third_party/git/streaming.c
+++ b/third_party/git/streaming.c
@@ -16,6 +16,7 @@ enum input_source {
 };
 
 typedef int (*open_istream_fn)(struct git_istream *,
+			       struct repository *,
 			       struct object_info *,
 			       const struct object_id *,
 			       enum object_type *);
@@ -29,8 +30,8 @@ struct stream_vtbl {
 
 #define open_method_decl(name) \
 	int open_istream_ ##name \
-	(struct git_istream *st, struct object_info *oi, \
-	 const struct object_id *oid, \
+	(struct git_istream *st, struct repository *r, \
+	 struct object_info *oi, const struct object_id *oid, \
 	 enum object_type *type)
 
 #define close_method_decl(name) \
@@ -108,7 +109,8 @@ ssize_t read_istream(struct git_istream *st, void *buf, size_t sz)
 	return st->vtbl->read(st, buf, sz);
 }
 
-static enum input_source istream_source(const struct object_id *oid,
+static enum input_source istream_source(struct repository *r,
+					const struct object_id *oid,
 					enum object_type *type,
 					struct object_info *oi)
 {
@@ -117,7 +119,7 @@ static enum input_source istream_source(const struct object_id *oid,
 
 	oi->typep = type;
 	oi->sizep = &size;
-	status = oid_object_info_extended(the_repository, oid, oi, 0);
+	status = oid_object_info_extended(r, oid, oi, 0);
 	if (status < 0)
 		return stream_error;
 
@@ -133,22 +135,23 @@ static enum input_source istream_source(const struct object_id *oid,
 	}
 }
 
-struct git_istream *open_istream(const struct object_id *oid,
+struct git_istream *open_istream(struct repository *r,
+				 const struct object_id *oid,
 				 enum object_type *type,
 				 unsigned long *size,
 				 struct stream_filter *filter)
 {
 	struct git_istream *st;
 	struct object_info oi = OBJECT_INFO_INIT;
-	const struct object_id *real = lookup_replace_object(the_repository, oid);
-	enum input_source src = istream_source(real, type, &oi);
+	const struct object_id *real = lookup_replace_object(r, oid);
+	enum input_source src = istream_source(r, real, type, &oi);
 
 	if (src < 0)
 		return NULL;
 
 	st = xmalloc(sizeof(*st));
-	if (open_istream_tbl[src](st, &oi, real, type)) {
-		if (open_istream_incore(st, &oi, real, type)) {
+	if (open_istream_tbl[src](st, r, &oi, real, type)) {
+		if (open_istream_incore(st, r, &oi, real, type)) {
 			free(st);
 			return NULL;
 		}
@@ -338,8 +341,7 @@ static struct stream_vtbl loose_vtbl = {
 
 static open_method_decl(loose)
 {
-	st->u.loose.mapped = map_loose_object(the_repository,
-					      oid, &st->u.loose.mapsize);
+	st->u.loose.mapped = map_loose_object(r, oid, &st->u.loose.mapsize);
 	if (!st->u.loose.mapped)
 		return -1;
 	if ((unpack_loose_header(&st->z,
@@ -499,7 +501,7 @@ static struct stream_vtbl incore_vtbl = {
 
 static open_method_decl(incore)
 {
-	st->u.incore.buf = read_object_file_extended(the_repository, oid, type, &st->size, 0);
+	st->u.incore.buf = read_object_file_extended(r, oid, type, &st->size, 0);
 	st->u.incore.read_ptr = 0;
 	st->vtbl = &incore_vtbl;
 
@@ -520,7 +522,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter
 	ssize_t kept = 0;
 	int result = -1;
 
-	st = open_istream(oid, &type, &sz, filter);
+	st = open_istream(the_repository, oid, &type, &sz, filter);
 	if (!st) {
 		if (filter)
 			free_stream_filter(filter);
diff --git a/third_party/git/streaming.h b/third_party/git/streaming.h
index f465a3cd311e..5e4e6acfd0dc 100644
--- a/third_party/git/streaming.h
+++ b/third_party/git/streaming.h
@@ -8,7 +8,9 @@
 /* opaque */
 struct git_istream;
 
-struct git_istream *open_istream(const struct object_id *, enum object_type *, unsigned long *, struct stream_filter *);
+struct git_istream *open_istream(struct repository *, const struct object_id *,
+				 enum object_type *, unsigned long *,
+				 struct stream_filter *);
 int close_istream(struct git_istream *);
 ssize_t read_istream(struct git_istream *, void *, size_t);
 
diff --git a/third_party/git/string-list.h b/third_party/git/string-list.h
index f964399949ce..6c5d274126ac 100644
--- a/third_party/git/string-list.h
+++ b/third_party/git/string-list.h
@@ -4,7 +4,8 @@
 /**
  * The string_list API offers a data structure and functions to handle
  * sorted and unsorted arrays of strings.  A "sorted" list is one whose
- * entries are sorted by string value in `strcmp()` order.
+ * entries are sorted by string value in the order specified by the `cmp`
+ * member (`strcmp()` by default).
  *
  * The caller:
  *
@@ -179,7 +180,7 @@ void string_list_remove(struct string_list *list, const char *string,
 
 /**
  * Check if the given string is part of a sorted list. If it is part of the list,
- * return the coresponding string_list_item, NULL otherwise.
+ * return the corresponding string_list_item, NULL otherwise.
  */
 struct string_list_item *string_list_lookup(struct string_list *list, const char *string);
 
@@ -209,7 +210,8 @@ struct string_list_item *string_list_append(struct string_list *list, const char
 struct string_list_item *string_list_append_nodup(struct string_list *list, char *string);
 
 /**
- * Sort the list's entries by string value in `strcmp()` order.
+ * Sort the list's entries by string value in order specified by list->cmp
+ * (strcmp() if list->cmp is NULL).
  */
 void string_list_sort(struct string_list *list);
 
diff --git a/third_party/git/sub-process.c b/third_party/git/sub-process.c
index 3f4af935557c..1b1af9dcbd95 100644
--- a/third_party/git/sub-process.c
+++ b/third_party/git/sub-process.c
@@ -6,12 +6,14 @@
 #include "pkt-line.h"
 
 int cmd2process_cmp(const void *unused_cmp_data,
-		    const void *entry,
-		    const void *entry_or_key,
+		    const struct hashmap_entry *eptr,
+		    const struct hashmap_entry *entry_or_key,
 		    const void *unused_keydata)
 {
-	const struct subprocess_entry *e1 = entry;
-	const struct subprocess_entry *e2 = entry_or_key;
+	const struct subprocess_entry *e1, *e2;
+
+	e1 = container_of(eptr, const struct subprocess_entry, ent);
+	e2 = container_of(entry_or_key, const struct subprocess_entry, ent);
 
 	return strcmp(e1->cmd, e2->cmd);
 }
@@ -20,9 +22,9 @@ struct subprocess_entry *subprocess_find_entry(struct hashmap *hashmap, const ch
 {
 	struct subprocess_entry key;
 
-	hashmap_entry_init(&key, strhash(cmd));
+	hashmap_entry_init(&key.ent, strhash(cmd));
 	key.cmd = cmd;
-	return hashmap_get(hashmap, &key, NULL);
+	return hashmap_get_entry(hashmap, &key, ent, NULL);
 }
 
 int subprocess_read_status(int fd, struct strbuf *status)
@@ -58,7 +60,7 @@ void subprocess_stop(struct hashmap *hashmap, struct subprocess_entry *entry)
 	kill(entry->process.pid, SIGTERM);
 	finish_command(&entry->process);
 
-	hashmap_remove(hashmap, entry, NULL);
+	hashmap_remove(hashmap, &entry->ent, NULL);
 }
 
 static void subprocess_exit_handler(struct child_process *process)
@@ -96,7 +98,7 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co
 		return err;
 	}
 
-	hashmap_entry_init(entry, strhash(cmd));
+	hashmap_entry_init(&entry->ent, strhash(cmd));
 
 	err = startfn(entry);
 	if (err) {
@@ -105,7 +107,7 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co
 		return err;
 	}
 
-	hashmap_add(hashmap, entry);
+	hashmap_add(hashmap, &entry->ent);
 	return 0;
 }
 
diff --git a/third_party/git/sub-process.h b/third_party/git/sub-process.h
index 5c182fad9853..e85f21fa1a7c 100644
--- a/third_party/git/sub-process.h
+++ b/third_party/git/sub-process.h
@@ -24,7 +24,7 @@
 
 /* Members should not be accessed directly. */
 struct subprocess_entry {
-	struct hashmap_entry ent; /* must be the first member! */
+	struct hashmap_entry ent;
 	const char *cmd;
 	struct child_process process;
 };
@@ -43,8 +43,8 @@ struct subprocess_capability {
 
 /* Function to test two subprocess hashmap entries for equality. */
 int cmd2process_cmp(const void *unused_cmp_data,
-		    const void *e1,
-		    const void *e2,
+		    const struct hashmap_entry *e,
+		    const struct hashmap_entry *entry_or_key,
 		    const void *unused_keydata);
 
 /*
diff --git a/third_party/git/submodule-config.c b/third_party/git/submodule-config.c
index 4264ee216f49..4d1c92d5826d 100644
--- a/third_party/git/submodule-config.c
+++ b/third_party/git/submodule-config.c
@@ -38,24 +38,28 @@ enum lookup_type {
 };
 
 static int config_path_cmp(const void *unused_cmp_data,
-			   const void *entry,
-			   const void *entry_or_key,
+			   const struct hashmap_entry *eptr,
+			   const struct hashmap_entry *entry_or_key,
 			   const void *unused_keydata)
 {
-	const struct submodule_entry *a = entry;
-	const struct submodule_entry *b = entry_or_key;
+	const struct submodule_entry *a, *b;
+
+	a = container_of(eptr, const struct submodule_entry, ent);
+	b = container_of(entry_or_key, const struct submodule_entry, ent);
 
 	return strcmp(a->config->path, b->config->path) ||
 	       !oideq(&a->config->gitmodules_oid, &b->config->gitmodules_oid);
 }
 
 static int config_name_cmp(const void *unused_cmp_data,
-			   const void *entry,
-			   const void *entry_or_key,
+			   const struct hashmap_entry *eptr,
+			   const struct hashmap_entry *entry_or_key,
 			   const void *unused_keydata)
 {
-	const struct submodule_entry *a = entry;
-	const struct submodule_entry *b = entry_or_key;
+	const struct submodule_entry *a, *b;
+
+	a = container_of(eptr, const struct submodule_entry, ent);
+	b = container_of(entry_or_key, const struct submodule_entry, ent);
 
 	return strcmp(a->config->name, b->config->name) ||
 	       !oideq(&a->config->gitmodules_oid, &b->config->gitmodules_oid);
@@ -95,12 +99,12 @@ static void submodule_cache_clear(struct submodule_cache *cache)
 	 * allocation of struct submodule entries. Each is allocated by
 	 * their .gitmodules blob sha1 and submodule name.
 	 */
-	hashmap_iter_init(&cache->for_name, &iter);
-	while ((entry = hashmap_iter_next(&iter)))
+	hashmap_for_each_entry(&cache->for_name, &iter, entry,
+				ent /* member name */)
 		free_one_config(entry);
 
-	hashmap_free(&cache->for_path, 1);
-	hashmap_free(&cache->for_name, 1);
+	hashmap_free_entries(&cache->for_path, struct submodule_entry, ent);
+	hashmap_free_entries(&cache->for_name, struct submodule_entry, ent);
 	cache->initialized = 0;
 	cache->gitmodules_read = 0;
 }
@@ -123,9 +127,9 @@ static void cache_put_path(struct submodule_cache *cache,
 	unsigned int hash = hash_oid_string(&submodule->gitmodules_oid,
 					    submodule->path);
 	struct submodule_entry *e = xmalloc(sizeof(*e));
-	hashmap_entry_init(e, hash);
+	hashmap_entry_init(&e->ent, hash);
 	e->config = submodule;
-	hashmap_put(&cache->for_path, e);
+	hashmap_put(&cache->for_path, &e->ent);
 }
 
 static void cache_remove_path(struct submodule_cache *cache,
@@ -135,9 +139,9 @@ static void cache_remove_path(struct submodule_cache *cache,
 					    submodule->path);
 	struct submodule_entry e;
 	struct submodule_entry *removed;
-	hashmap_entry_init(&e, hash);
+	hashmap_entry_init(&e.ent, hash);
 	e.config = submodule;
-	removed = hashmap_remove(&cache->for_path, &e, NULL);
+	removed = hashmap_remove_entry(&cache->for_path, &e, ent, NULL);
 	free(removed);
 }
 
@@ -147,9 +151,9 @@ static void cache_add(struct submodule_cache *cache,
 	unsigned int hash = hash_oid_string(&submodule->gitmodules_oid,
 					    submodule->name);
 	struct submodule_entry *e = xmalloc(sizeof(*e));
-	hashmap_entry_init(e, hash);
+	hashmap_entry_init(&e->ent, hash);
 	e->config = submodule;
-	hashmap_add(&cache->for_name, e);
+	hashmap_add(&cache->for_name, &e->ent);
 }
 
 static const struct submodule *cache_lookup_path(struct submodule_cache *cache,
@@ -163,10 +167,10 @@ static const struct submodule *cache_lookup_path(struct submodule_cache *cache,
 	oidcpy(&key_config.gitmodules_oid, gitmodules_oid);
 	key_config.path = path;
 
-	hashmap_entry_init(&key, hash);
+	hashmap_entry_init(&key.ent, hash);
 	key.config = &key_config;
 
-	entry = hashmap_get(&cache->for_path, &key, NULL);
+	entry = hashmap_get_entry(&cache->for_path, &key, ent, NULL);
 	if (entry)
 		return entry->config;
 	return NULL;
@@ -183,10 +187,10 @@ static struct submodule *cache_lookup_name(struct submodule_cache *cache,
 	oidcpy(&key_config.gitmodules_oid, gitmodules_oid);
 	key_config.name = name;
 
-	hashmap_entry_init(&key, hash);
+	hashmap_entry_init(&key.ent, hash);
 	key.config = &key_config;
 
-	entry = hashmap_get(&cache->for_name, &key, NULL);
+	entry = hashmap_get_entry(&cache->for_name, &key, ent, NULL);
 	if (entry)
 		return entry->config;
 	return NULL;
@@ -405,6 +409,13 @@ struct parse_config_parameter {
 	int overwrite;
 };
 
+/*
+ * Parse a config item from .gitmodules.
+ *
+ * This does not handle submodule-related configuration from the main
+ * config store (.git/config, etc).  Callers are responsible for
+ * checking for overrides in the main config store when appropriate.
+ */
 static int parse_config(const char *var, const char *value, void *data)
 {
 	struct parse_config_parameter *me = data;
@@ -482,8 +493,9 @@ static int parse_config(const char *var, const char *value, void *data)
 			warn_multiple_config(me->treeish_name, submodule->name,
 					     "update");
 		else if (parse_submodule_update_strategy(value,
-			 &submodule->update_strategy) < 0)
-				die(_("invalid value for %s"), var);
+			 &submodule->update_strategy) < 0 ||
+			 submodule->update_strategy.type == SM_UPDATE_COMMAND)
+			die(_("invalid value for %s"), var);
 	} else if (!strcmp(item.buf, "shallow")) {
 		if (!me->overwrite && submodule->recommend_shallow != -1)
 			warn_multiple_config(me->treeish_name, submodule->name,
@@ -550,7 +562,9 @@ static const struct submodule *config_from(struct submodule_cache *cache,
 		struct hashmap_iter iter;
 		struct submodule_entry *entry;
 
-		entry = hashmap_iter_first(&cache->for_name, &iter);
+		entry = hashmap_iter_first_entry(&cache->for_name, &iter,
+						struct submodule_entry,
+						ent /* member name */);
 		if (!entry)
 			return NULL;
 		return entry->config;
@@ -612,7 +626,7 @@ static void submodule_cache_check_init(struct repository *repo)
 
 /*
  * Note: This function is private for a reason, the '.gitmodules' file should
- * not be used as as a mechanism to retrieve arbitrary configuration stored in
+ * not be used as a mechanism to retrieve arbitrary configuration stored in
  * the repository.
  *
  * Runs the provided config function on the '.gitmodules' file found in the
@@ -621,7 +635,9 @@ static void submodule_cache_check_init(struct repository *repo)
 static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void *data)
 {
 	if (repo->worktree) {
-		struct git_config_source config_source = { 0 };
+		struct git_config_source config_source = {
+			0, .scope = CONFIG_SCOPE_SUBMODULE
+		};
 		const struct config_options opts = { 0 };
 		struct object_id oid;
 		char *file;
@@ -660,10 +676,13 @@ static int gitmodules_cb(const char *var, const char *value, void *data)
 	return parse_config(var, value, &parameter);
 }
 
-void repo_read_gitmodules(struct repository *repo)
+void repo_read_gitmodules(struct repository *repo, int skip_if_read)
 {
 	submodule_cache_check_init(repo);
 
+	if (repo->submodule_cache->gitmodules_read && skip_if_read)
+		return;
+
 	if (repo_read_index(repo) < 0)
 		return;
 
@@ -689,20 +708,11 @@ void gitmodules_config_oid(const struct object_id *commit_oid)
 	the_repository->submodule_cache->gitmodules_read = 1;
 }
 
-static void gitmodules_read_check(struct repository *repo)
-{
-	submodule_cache_check_init(repo);
-
-	/* read the repo's .gitmodules file if it hasn't been already */
-	if (!repo->submodule_cache->gitmodules_read)
-		repo_read_gitmodules(repo);
-}
-
 const struct submodule *submodule_from_name(struct repository *r,
 					    const struct object_id *treeish_name,
 		const char *name)
 {
-	gitmodules_read_check(r);
+	repo_read_gitmodules(r, 1);
 	return config_from(r->submodule_cache, treeish_name, name, lookup_name);
 }
 
@@ -710,7 +720,7 @@ const struct submodule *submodule_from_path(struct repository *r,
 					    const struct object_id *treeish_name,
 		const char *path)
 {
-	gitmodules_read_check(r);
+	repo_read_gitmodules(r, 1);
 	return config_from(r->submodule_cache, treeish_name, path, lookup_path);
 }
 
diff --git a/third_party/git/submodule-config.h b/third_party/git/submodule-config.h
index 1b4e2da658dc..c11e22cf509a 100644
--- a/third_party/git/submodule-config.h
+++ b/third_party/git/submodule-config.h
@@ -7,9 +7,31 @@
 #include "submodule.h"
 #include "strbuf.h"
 
+/**
+ * The submodule config cache API allows to read submodule
+ * configurations/information from specified revisions. Internally
+ * information is lazily read into a cache that is used to avoid
+ * unnecessary parsing of the same .gitmodules files. Lookups can be done by
+ * submodule path or name.
+ *
+ * Usage
+ * -----
+ *
+ * The caller can look up information about submodules by using the
+ * `submodule_from_path()` or `submodule_from_name()` functions. They return
+ * a `struct submodule` which contains the values. The API automatically
+ * initializes and allocates the needed infrastructure on-demand. If the
+ * caller does only want to lookup values from revisions the initialization
+ * can be skipped.
+ *
+ * If the internal cache might grow too big or when the caller is done with
+ * the API, all internally cached values can be freed with submodule_free().
+ *
+ */
+
 /*
  * Submodule entry containing the information about a certain submodule
- * in a certain revision.
+ * in a certain revision. It is returned by the lookup functions.
  */
 struct submodule {
 	const char *path;
@@ -39,15 +61,29 @@ int option_fetch_parse_recurse_submodules(const struct option *opt,
 					  const char *arg, int unset);
 int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
 int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
-void repo_read_gitmodules(struct repository *repo);
+void repo_read_gitmodules(struct repository *repo, int skip_if_read);
 void gitmodules_config_oid(const struct object_id *commit_oid);
+
+/**
+ * Same as submodule_from_path but lookup by name.
+ */
 const struct submodule *submodule_from_name(struct repository *r,
 					    const struct object_id *commit_or_tree,
 					    const char *name);
+
+/**
+ * Given a tree-ish in the superproject and a path, return the submodule that
+ * is bound at the path in the named tree.
+ */
 const struct submodule *submodule_from_path(struct repository *r,
 					    const struct object_id *commit_or_tree,
 					    const char *path);
+
+/**
+ * Use these to free the internally cached values.
+ */
 void submodule_free(struct repository *r);
+
 int print_config_from_gitmodules(struct repository *repo, const char *key);
 int config_set_in_gitmodules_file_gently(const char *key, const char *value);
 
diff --git a/third_party/git/submodule.c b/third_party/git/submodule.c
index 0f199c51378d..31f391d7d254 100644
--- a/third_party/git/submodule.c
+++ b/third_party/git/submodule.c
@@ -82,7 +82,7 @@ int is_staging_gitmodules_ok(struct index_state *istate)
 	if ((pos >= 0) && (pos < istate->cache_nr)) {
 		struct stat st;
 		if (lstat(GITMODULES_FILE, &st) == 0 &&
-		    ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
+		    ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
 			return 0;
 	}
 
@@ -431,7 +431,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
 	else if (!strcmp(arg, "dirty"))
 		diffopt->flags.ignore_dirty_submodules = 1;
 	else if (strcmp(arg, "none"))
-		die("bad --ignore-submodules argument: %s", arg);
+		die(_("bad --ignore-submodules argument: %s"), arg);
 	/*
 	 * Please update _git_status() in git-completion.bash when you
 	 * add new options
@@ -812,9 +812,9 @@ static void collect_changed_submodules_cb(struct diff_queue_struct *q,
 				submodule = submodule_from_name(me->repo,
 								commit_oid, name);
 			if (submodule) {
-				warning("Submodule in commit %s at path: "
+				warning(_("Submodule in commit %s at path: "
 					"'%s' collides with a submodule named "
-					"the same. Skipping it.",
+					"the same. Skipping it."),
 					oid_to_hex(commit_oid), p->two->path);
 				name = NULL;
 			}
@@ -844,7 +844,7 @@ static void collect_changed_submodules(struct repository *r,
 	repo_init_revisions(r, &rev, NULL);
 	setup_revisions(argv->argc, argv->argv, &rev, NULL);
 	if (prepare_revision_walk(&rev))
-		die("revision walk setup failed");
+		die(_("revision walk setup failed"));
 
 	while ((commit = get_revision(&rev))) {
 		struct rev_info diff_rev;
@@ -992,7 +992,7 @@ static int submodule_needs_pushing(struct repository *r,
 		cp.out = -1;
 		cp.dir = path;
 		if (start_command(&cp))
-			die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
+			die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
 					path);
 		if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
 			needs_pushing = 1;
@@ -1115,7 +1115,7 @@ static void submodule_push_check(const char *path, const char *head,
 	 * child process.
 	 */
 	if (run_command(&cp))
-		die("process for submodule '%s' failed", path);
+		die(_("process for submodule '%s' failed"), path);
 }
 
 int push_unpushed_submodules(struct repository *r,
@@ -1155,10 +1155,10 @@ int push_unpushed_submodules(struct repository *r,
 	/* Actually push the submodules */
 	for (i = 0; i < needs_pushing.nr; i++) {
 		const char *path = needs_pushing.items[i].string;
-		fprintf(stderr, "Pushing submodule '%s'\n", path);
+		fprintf(stderr, _("Pushing submodule '%s'\n"), path);
 		if (!push_submodule(path, remote, rs,
 				    push_options, dry_run)) {
-			fprintf(stderr, "Unable to push submodule '%s'\n", path);
+			fprintf(stderr, _("Unable to push submodule '%s'\n"), path);
 			ret = 0;
 		}
 	}
@@ -1280,10 +1280,12 @@ struct submodule_parallel_fetch {
 	/* Pending fetches by OIDs */
 	struct fetch_task **oid_fetch_tasks;
 	int oid_fetch_tasks_nr, oid_fetch_tasks_alloc;
+
+	struct strbuf submodules_with_errors;
 };
 #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0, \
 		  STRING_LIST_INIT_DUP, \
-		  NULL, 0, 0}
+		  NULL, 0, 0, STRBUF_INIT}
 
 static int get_fetch_recurse_config(const struct submodule *submodule,
 				    struct submodule_parallel_fetch *spf)
@@ -1448,7 +1450,7 @@ static int get_next_submodule(struct child_process *cp,
 			prepare_submodule_repo_env_in_gitdir(&cp->env_array);
 			cp->git_cmd = 1;
 			if (!spf->quiet)
-				strbuf_addf(err, "Fetching submodule %s%s\n",
+				strbuf_addf(err, _("Fetching submodule %s%s\n"),
 					    spf->prefix, ce->name);
 			argv_array_init(&cp->args);
 			argv_array_pushv(&cp->args, spf->args.argv);
@@ -1478,7 +1480,7 @@ static int get_next_submodule(struct child_process *cp,
 			    !is_empty_dir(ce->name)) {
 				spf->result = 1;
 				strbuf_addf(err,
-					    _("Could not access submodule '%s'"),
+					    _("Could not access submodule '%s'\n"),
 					    ce->name);
 			}
 		}
@@ -1547,7 +1549,10 @@ static int fetch_finish(int retvalue, struct strbuf *err,
 	struct string_list_item *it;
 	struct oid_array *commits;
 
-	if (retvalue)
+	if (!task || !task->sub)
+		BUG("callback cookie bogus");
+
+	if (retvalue) {
 		/*
 		 * NEEDSWORK: This indicates that the overall fetch
 		 * failed, even though there may be a subsequent fetch
@@ -1557,8 +1562,9 @@ static int fetch_finish(int retvalue, struct strbuf *err,
 		 */
 		spf->result = 1;
 
-	if (!task || !task->sub)
-		BUG("callback cookie bogus");
+		strbuf_addf(&spf->submodules_with_errors, "\t%s\n",
+			    task->sub->name);
+	}
 
 	/* Is this the second time we process this submodule? */
 	if (task->commits)
@@ -1610,7 +1616,7 @@ int fetch_populated_submodules(struct repository *r,
 		goto out;
 
 	if (repo_read_index(r) < 0)
-		die("index file corrupt");
+		die(_("index file corrupt"));
 
 	argv_array_push(&spf.args, "fetch");
 	for (i = 0; i < options->argc; i++)
@@ -1627,6 +1633,11 @@ int fetch_populated_submodules(struct repository *r,
 				   &spf,
 				   "submodule", "parallel/fetch");
 
+	if (spf.submodules_with_errors.len > 0)
+		fprintf(stderr, _("Errors during submodule fetch:\n%s"),
+			spf.submodules_with_errors.buf);
+
+
 	argv_array_clear(&spf.args);
 out:
 	free_submodules_oids(&spf.changed_submodule_names);
@@ -1665,7 +1676,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 	cp.out = -1;
 	cp.dir = path;
 	if (start_command(&cp))
-		die("Could not run 'git status --porcelain=2' in submodule %s", path);
+		die(_("Could not run 'git status --porcelain=2' in submodule %s"), path);
 
 	fp = xfdopen(cp.out, "r");
 	while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
@@ -1706,7 +1717,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 	fclose(fp);
 
 	if (finish_command(&cp) && !ignore_cp_exit_code)
-		die("'git status --porcelain=2' failed in submodule %s", path);
+		die(_("'git status --porcelain=2' failed in submodule %s"), path);
 
 	strbuf_release(&buf);
 	return dirty_submodule;
@@ -1811,7 +1822,7 @@ out:
 void submodule_unset_core_worktree(const struct submodule *sub)
 {
 	char *config_path = xstrfmt("%s/modules/%s/config",
-				    get_git_common_dir(), sub->name);
+				    get_git_dir(), sub->name);
 
 	if (git_config_set_in_file_gently(config_path, "core.worktree", NULL))
 		warning(_("Could not unset core.worktree setting in submodule '%s'"),
@@ -1841,7 +1852,7 @@ static int submodule_has_dirty_index(const struct submodule *sub)
 	cp.no_stdout = 1;
 	cp.dir = sub->path;
 	if (start_command(&cp))
-		die("could not recurse into submodule '%s'", sub->path);
+		die(_("could not recurse into submodule '%s'"), sub->path);
 
 	return finish_command(&cp);
 }
@@ -1862,7 +1873,7 @@ static void submodule_reset_index(const char *path)
 	argv_array_push(&cp.args, empty_tree_oid_hex());
 
 	if (run_command(&cp))
-		die("could not reset submodule index");
+		die(_("could not reset submodule index"));
 }
 
 /**
@@ -1914,7 +1925,7 @@ int submodule_move_head(const char *path,
 					ABSORB_GITDIR_RECURSE_SUBMODULES);
 		} else {
 			char *gitdir = xstrfmt("%s/modules/%s",
-				    get_git_common_dir(), sub->name);
+				    get_git_dir(), sub->name);
 			connect_work_tree_and_git_dir(path, gitdir, 0);
 			free(gitdir);
 
@@ -1924,7 +1935,7 @@ int submodule_move_head(const char *path,
 
 		if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
 			char *gitdir = xstrfmt("%s/modules/%s",
-				    get_git_common_dir(), sub->name);
+				    get_git_dir(), sub->name);
 			connect_work_tree_and_git_dir(path, gitdir, 1);
 			free(gitdir);
 		}
@@ -1993,6 +2004,47 @@ out:
 	return ret;
 }
 
+int validate_submodule_git_dir(char *git_dir, const char *submodule_name)
+{
+	size_t len = strlen(git_dir), suffix_len = strlen(submodule_name);
+	char *p;
+	int ret = 0;
+
+	if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' ||
+	    strcmp(p, submodule_name))
+		BUG("submodule name '%s' not a suffix of git dir '%s'",
+		    submodule_name, git_dir);
+
+	/*
+	 * We prevent the contents of sibling submodules' git directories to
+	 * clash.
+	 *
+	 * Example: having a submodule named `hippo` and another one named
+	 * `hippo/hooks` would result in the git directories
+	 * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively,
+	 * but the latter directory is already designated to contain the hooks
+	 * of the former.
+	 */
+	for (; *p; p++) {
+		if (is_dir_sep(*p)) {
+			char c = *p;
+
+			*p = '\0';
+			if (is_git_directory(git_dir))
+				ret = -1;
+			*p = c;
+
+			if (ret < 0)
+				return error(_("submodule git dir '%s' is "
+					       "inside git dir '%.*s'"),
+					     git_dir,
+					     (int)(p - git_dir), git_dir);
+		}
+	}
+
+	return 0;
+}
+
 /*
  * Embeds a single submodules git directory into the superprojects git dir,
  * non recursively.
@@ -2000,7 +2052,7 @@ out:
 static void relocate_single_git_dir_into_superproject(const char *path)
 {
 	char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
-	const char *new_git_dir;
+	char *new_git_dir;
 	const struct submodule *sub;
 
 	if (submodule_uses_worktrees(path))
@@ -2018,10 +2070,14 @@ static void relocate_single_git_dir_into_superproject(const char *path)
 	if (!sub)
 		die(_("could not lookup name for submodule '%s'"), path);
 
-	new_git_dir = git_path("modules/%s", sub->name);
+	new_git_dir = git_pathdup("modules/%s", sub->name);
+	if (validate_submodule_git_dir(new_git_dir, sub->name) < 0)
+		die(_("refusing to move '%s' into an existing git dir"),
+		    real_old_git_dir);
 	if (safe_create_leading_directories_const(new_git_dir) < 0)
 		die(_("could not create directory '%s'"), new_git_dir);
 	real_new_git_dir = real_pathdup(new_git_dir, 1);
+	free(new_git_dir);
 
 	fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
 		get_super_prefix_or_empty(), path,
diff --git a/third_party/git/submodule.h b/third_party/git/submodule.h
index 8072e6d6ddfd..c81ec1a9b6c8 100644
--- a/third_party/git/submodule.h
+++ b/third_party/git/submodule.h
@@ -124,6 +124,11 @@ int push_unpushed_submodules(struct repository *r,
  */
 int submodule_to_gitdir(struct strbuf *buf, const char *submodule);
 
+/*
+ * Make sure that no submodule's git dir is nested in a sibling submodule's.
+ */
+int validate_submodule_git_dir(char *git_dir, const char *submodule_name);
+
 #define SUBMODULE_MOVE_HEAD_DRY_RUN (1<<0)
 #define SUBMODULE_MOVE_HEAD_FORCE   (1<<1)
 int submodule_move_head(const char *path,
diff --git a/third_party/git/t/README b/third_party/git/t/README
index 60d5b77bccd9..9afd61e3ca0d 100644
--- a/third_party/git/t/README
+++ b/third_party/git/t/README
@@ -352,8 +352,8 @@ details.
 GIT_TEST_SPLIT_INDEX=<boolean> forces split-index mode on the whole
 test suite. Accept any boolean values that are accepted by git-config.
 
-GIT_TEST_PROTOCOL_VERSION=<n>, when set, overrides the
-'protocol.version' setting to n if it is less than n.
+GIT_TEST_PROTOCOL_VERSION=<n>, when set, makes 'protocol.version'
+default to n.
 
 GIT_TEST_FULL_IN_PACK_ARRAY=<boolean> exercises the uncommon
 pack-objects code path where there are more than 1024 packs even if
@@ -397,6 +397,10 @@ GIT_TEST_STASH_USE_BUILTIN=<boolean>, when false, disables the
 built-in version of git-stash. See 'stash.useBuiltin' in
 git-config(1).
 
+GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the
+built-in version of git add -i. See 'add.interactive.useBuiltin' in
+git-config(1).
+
 GIT_TEST_INDEX_THREADS=<n> enables exercising the multi-threaded loading
 of the index for the whole test suite by bypassing the default number of
 cache entries and thread minimums. Setting this to 1 will make the
@@ -978,6 +982,15 @@ library for your script to use.
    output to the downstream---unlike the real version, it generates
    only up to 99 lines.
 
+ - test_bool_env <env-variable-name> <default-value>
+
+   Given the name of an environment variable with a bool value,
+   normalize its value to a 0 (true) or 1 (false or empty string)
+   return code.  Return with code corresponding to the given default
+   value if the variable is unset.
+   Abort the test script if either the value of the variable or the
+   default are not valid bool values.
+
 
 Prerequisites
 -------------
diff --git a/third_party/git/t/check-non-portable-shell.pl b/third_party/git/t/check-non-portable-shell.pl
index 38bfeebd881a..fd3303552bec 100755
--- a/third_party/git/t/check-non-portable-shell.pl
+++ b/third_party/git/t/check-non-portable-shell.pl
@@ -46,7 +46,7 @@ while (<>) {
 	/(?:\$\(seq|^\s*seq\b)/ and err 'seq is not portable (use test_seq)';
 	/\bgrep\b.*--file\b/ and err 'grep --file FILE is not portable (use grep -f FILE)';
 	/\bexport\s+[A-Za-z0-9_]*=/ and err '"export FOO=bar" is not portable (use FOO=bar && export FOO)';
-	/^\s*([A-Z0-9_]+=(\w+|(["']).*?\3)\s+)+(\w+)/ and exists($func{$4}) and
+	/^\s*([A-Z0-9_]+=(\w*|(["']).*?\3)\s+)+(\w+)/ and exists($func{$4}) and
 		err '"FOO=bar shell_func" assignment extends beyond "shell_func"';
 	$line = '';
 	# this resets our $. for each file
diff --git a/third_party/git/t/gitweb-lib.sh b/third_party/git/t/gitweb-lib.sh
index 006d2a8152dc..1f32ca66ea51 100644
--- a/third_party/git/t/gitweb-lib.sh
+++ b/third_party/git/t/gitweb-lib.sh
@@ -58,10 +58,11 @@ gitweb_run () {
 	GATEWAY_INTERFACE='CGI/1.1'
 	HTTP_ACCEPT='*/*'
 	REQUEST_METHOD='GET'
-	QUERY_STRING=""$1""
-	PATH_INFO=""$2""
+	QUERY_STRING=$1
+	PATH_INFO=$2
+	REQUEST_URI=/gitweb.cgi$PATH_INFO
 	export GATEWAY_INTERFACE HTTP_ACCEPT REQUEST_METHOD \
-		QUERY_STRING PATH_INFO
+		QUERY_STRING PATH_INFO REQUEST_URI
 
 	GITWEB_CONFIG=$(pwd)/gitweb_config.perl
 	export GITWEB_CONFIG
diff --git a/third_party/git/t/helper/.gitignore b/third_party/git/t/helper/.gitignore
index 2bad28af9241..48c7bb0bbb1d 100644
--- a/third_party/git/t/helper/.gitignore
+++ b/third_party/git/t/helper/.gitignore
@@ -1,5 +1,4 @@
-*
-!*.sh
-!*.[ch]
-!*.gitignore
-
+/test-tool
+/test-fake-ssh
+/test-line-buffer
+/test-svn-fe
diff --git a/third_party/git/t/helper/test-config.c b/third_party/git/t/helper/test-config.c
index 214003d5b2f9..234c722b485e 100644
--- a/third_party/git/t/helper/test-config.c
+++ b/third_party/git/t/helper/test-config.c
@@ -37,21 +37,6 @@
  *
  */
 
-static const char *scope_name(enum config_scope scope)
-{
-	switch (scope) {
-	case CONFIG_SCOPE_SYSTEM:
-		return "system";
-	case CONFIG_SCOPE_GLOBAL:
-		return "global";
-	case CONFIG_SCOPE_REPO:
-		return "repo";
-	case CONFIG_SCOPE_CMDLINE:
-		return "cmdline";
-	default:
-		return "unknown";
-	}
-}
 static int iterate_cb(const char *var, const char *value, void *data)
 {
 	static int nr;
@@ -63,7 +48,8 @@ static int iterate_cb(const char *var, const char *value, void *data)
 	printf("value=%s\n", value ? value : "(null)");
 	printf("origin=%s\n", current_config_origin_type());
 	printf("name=%s\n", current_config_name());
-	printf("scope=%s\n", scope_name(current_config_scope()));
+	printf("lno=%d\n", current_config_line());
+	printf("scope=%s\n", config_scope_name(current_config_scope()));
 
 	return 0;
 }
diff --git a/third_party/git/t/helper/test-date.c b/third_party/git/t/helper/test-date.c
index 585347ea487a..099eff4f0fc8 100644
--- a/third_party/git/t/helper/test-date.c
+++ b/third_party/git/t/helper/test-date.c
@@ -12,13 +12,13 @@ static const char *usage_msg = "\n"
 "  test-tool date is64bit\n"
 "  test-tool date time_t-is64bit\n";
 
-static void show_relative_dates(const char **argv, struct timeval *now)
+static void show_relative_dates(const char **argv)
 {
 	struct strbuf buf = STRBUF_INIT;
 
 	for (; *argv; argv++) {
 		time_t t = atoi(*argv);
-		show_date_relative(t, now, &buf);
+		show_date_relative(t, &buf);
 		printf("%s -> %s\n", *argv, buf.buf);
 	}
 	strbuf_release(&buf);
@@ -74,20 +74,20 @@ static void parse_dates(const char **argv)
 	strbuf_release(&result);
 }
 
-static void parse_approxidate(const char **argv, struct timeval *now)
+static void parse_approxidate(const char **argv)
 {
 	for (; *argv; argv++) {
 		timestamp_t t;
-		t = approxidate_relative(*argv, now);
+		t = approxidate_relative(*argv);
 		printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(ISO8601)));
 	}
 }
 
-static void parse_approx_timestamp(const char **argv, struct timeval *now)
+static void parse_approx_timestamp(const char **argv)
 {
 	for (; *argv; argv++) {
 		timestamp_t t;
-		t = approxidate_relative(*argv, now);
+		t = approxidate_relative(*argv);
 		printf("%s -> %"PRItime"\n", *argv, t);
 	}
 }
@@ -103,22 +103,13 @@ static void getnanos(const char **argv)
 
 int cmd__date(int argc, const char **argv)
 {
-	struct timeval now;
 	const char *x;
 
-	x = getenv("GIT_TEST_DATE_NOW");
-	if (x) {
-		now.tv_sec = atoi(x);
-		now.tv_usec = 0;
-	}
-	else
-		gettimeofday(&now, NULL);
-
 	argv++;
 	if (!*argv)
 		usage(usage_msg);
 	if (!strcmp(*argv, "relative"))
-		show_relative_dates(argv+1, &now);
+		show_relative_dates(argv+1);
 	else if (!strcmp(*argv, "human"))
 		show_human_dates(argv+1);
 	else if (skip_prefix(*argv, "show:", &x))
@@ -126,9 +117,9 @@ int cmd__date(int argc, const char **argv)
 	else if (!strcmp(*argv, "parse"))
 		parse_dates(argv+1);
 	else if (!strcmp(*argv, "approxidate"))
-		parse_approxidate(argv+1, &now);
+		parse_approxidate(argv+1);
 	else if (!strcmp(*argv, "timestamp"))
-		parse_approx_timestamp(argv+1, &now);
+		parse_approx_timestamp(argv+1);
 	else if (!strcmp(*argv, "getnanos"))
 		getnanos(argv+1);
 	else if (!strcmp(*argv, "is64bit"))
diff --git a/third_party/git/t/helper/test-drop-caches.c b/third_party/git/t/helper/test-drop-caches.c
index f65e301f9ddc..7b4278462bb7 100644
--- a/third_party/git/t/helper/test-drop-caches.c
+++ b/third_party/git/t/helper/test-drop-caches.c
@@ -8,18 +8,21 @@ static int cmd_sync(void)
 {
 	char Buffer[MAX_PATH];
 	DWORD dwRet;
-	char szVolumeAccessPath[] = "\\\\.\\X:";
+	char szVolumeAccessPath[] = "\\\\.\\XXXX:";
 	HANDLE hVolWrite;
-	int success = 0;
+	int success = 0, dos_drive_prefix;
 
 	dwRet = GetCurrentDirectory(MAX_PATH, Buffer);
 	if ((0 == dwRet) || (dwRet > MAX_PATH))
 		return error("Error getting current directory");
 
-	if (!has_dos_drive_prefix(Buffer))
+	dos_drive_prefix = has_dos_drive_prefix(Buffer);
+	if (!dos_drive_prefix)
 		return error("'%s': invalid drive letter", Buffer);
 
-	szVolumeAccessPath[4] = Buffer[0];
+	memcpy(szVolumeAccessPath, Buffer, dos_drive_prefix);
+	szVolumeAccessPath[dos_drive_prefix] = '\0';
+
 	hVolWrite = CreateFile(szVolumeAccessPath, GENERIC_READ | GENERIC_WRITE,
 		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
 	if (INVALID_HANDLE_VALUE == hVolWrite)
diff --git a/third_party/git/t/helper/test-dump-fsmonitor.c b/third_party/git/t/helper/test-dump-fsmonitor.c
index 2786f47088e9..975f0ac89051 100644
--- a/third_party/git/t/helper/test-dump-fsmonitor.c
+++ b/third_party/git/t/helper/test-dump-fsmonitor.c
@@ -13,7 +13,7 @@ int cmd__dump_fsmonitor(int ac, const char **av)
 		printf("no fsmonitor\n");
 		return 0;
 	}
-	printf("fsmonitor last update %"PRIuMAX"\n", (uintmax_t)istate->fsmonitor_last_update);
+	printf("fsmonitor last update %s\n", istate->fsmonitor_last_update);
 
 	for (i = 0; i < istate->cache_nr; i++)
 		printf((istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) ? "+" : "-");
diff --git a/third_party/git/t/helper/test-hashmap.c b/third_party/git/t/helper/test-hashmap.c
index aaf17b0ddf9e..f38706216f44 100644
--- a/third_party/git/t/helper/test-hashmap.c
+++ b/third_party/git/t/helper/test-hashmap.c
@@ -5,6 +5,7 @@
 
 struct test_entry
 {
+	int padding; /* hashmap entry no longer needs to be the first member */
 	struct hashmap_entry ent;
 	/* key and value as two \0-terminated strings */
 	char key[FLEX_ARRAY];
@@ -16,15 +17,17 @@ static const char *get_value(const struct test_entry *e)
 }
 
 static int test_entry_cmp(const void *cmp_data,
-			  const void *entry,
-			  const void *entry_or_key,
+			  const struct hashmap_entry *eptr,
+			  const struct hashmap_entry *entry_or_key,
 			  const void *keydata)
 {
 	const int ignore_case = cmp_data ? *((int *)cmp_data) : 0;
-	const struct test_entry *e1 = entry;
-	const struct test_entry *e2 = entry_or_key;
+	const struct test_entry *e1, *e2;
 	const char *key = keydata;
 
+	e1 = container_of(eptr, const struct test_entry, ent);
+	e2 = container_of(entry_or_key, const struct test_entry, ent);
+
 	if (ignore_case)
 		return strcasecmp(e1->key, key ? key : e2->key);
 	else
@@ -37,7 +40,7 @@ static struct test_entry *alloc_test_entry(unsigned int hash,
 	size_t klen = strlen(key);
 	size_t vlen = strlen(value);
 	struct test_entry *entry = xmalloc(st_add4(sizeof(*entry), klen, vlen, 2));
-	hashmap_entry_init(entry, hash);
+	hashmap_entry_init(&entry->ent, hash);
 	memcpy(entry->key, key, klen + 1);
 	memcpy(entry->key + klen + 1, value, vlen + 1);
 	return entry;
@@ -103,11 +106,11 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
 
 			/* add entries */
 			for (i = 0; i < TEST_SIZE; i++) {
-				hashmap_entry_init(entries[i], hashes[i]);
-				hashmap_add(&map, entries[i]);
+				hashmap_entry_init(&entries[i]->ent, hashes[i]);
+				hashmap_add(&map, &entries[i]->ent);
 			}
 
-			hashmap_free(&map, 0);
+			hashmap_free(&map);
 		}
 	} else {
 		/* test map lookups */
@@ -116,8 +119,8 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
 		/* fill the map (sparsely if specified) */
 		j = (method & TEST_SPARSE) ? TEST_SIZE / 10 : TEST_SIZE;
 		for (i = 0; i < j; i++) {
-			hashmap_entry_init(entries[i], hashes[i]);
-			hashmap_add(&map, entries[i]);
+			hashmap_entry_init(&entries[i]->ent, hashes[i]);
+			hashmap_add(&map, &entries[i]->ent);
 		}
 
 		for (j = 0; j < rounds; j++) {
@@ -127,7 +130,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
 			}
 		}
 
-		hashmap_free(&map, 0);
+		hashmap_free(&map);
 	}
 }
 
@@ -179,7 +182,7 @@ int cmd__hashmap(int argc, const char **argv)
 			entry = alloc_test_entry(hash, p1, p2);
 
 			/* add to hashmap */
-			hashmap_add(&map, entry);
+			hashmap_add(&map, &entry->ent);
 
 		} else if (!strcmp("put", cmd) && p1 && p2) {
 
@@ -187,43 +190,44 @@ int cmd__hashmap(int argc, const char **argv)
 			entry = alloc_test_entry(hash, p1, p2);
 
 			/* add / replace entry */
-			entry = hashmap_put(&map, entry);
+			entry = hashmap_put_entry(&map, entry, ent);
 
 			/* print and free replaced entry, if any */
 			puts(entry ? get_value(entry) : "NULL");
 			free(entry);
 
 		} else if (!strcmp("get", cmd) && p1) {
-
 			/* lookup entry in hashmap */
-			entry = hashmap_get_from_hash(&map, hash, p1);
+			entry = hashmap_get_entry_from_hash(&map, hash, p1,
+							struct test_entry, ent);
 
 			/* print result */
 			if (!entry)
 				puts("NULL");
-			while (entry) {
+			hashmap_for_each_entry_from(&map, entry, ent)
 				puts(get_value(entry));
-				entry = hashmap_get_next(&map, entry);
-			}
 
 		} else if (!strcmp("remove", cmd) && p1) {
 
 			/* setup static key */
 			struct hashmap_entry key;
+			struct hashmap_entry *rm;
 			hashmap_entry_init(&key, hash);
 
 			/* remove entry from hashmap */
-			entry = hashmap_remove(&map, &key, p1);
+			rm = hashmap_remove(&map, &key, p1);
+			entry = rm ? container_of(rm, struct test_entry, ent)
+					: NULL;
 
 			/* print result and free entry*/
 			puts(entry ? get_value(entry) : "NULL");
 			free(entry);
 
 		} else if (!strcmp("iterate", cmd)) {
-
 			struct hashmap_iter iter;
-			hashmap_iter_init(&map, &iter);
-			while ((entry = hashmap_iter_next(&iter)))
+
+			hashmap_for_each_entry(&map, &iter, entry,
+						ent /* member name */)
 				printf("%s %s\n", entry->key, get_value(entry));
 
 		} else if (!strcmp("size", cmd)) {
@@ -258,6 +262,6 @@ int cmd__hashmap(int argc, const char **argv)
 	}
 
 	strbuf_release(&line);
-	hashmap_free(&map, 1);
+	hashmap_free_entries(&map, struct test_entry, ent);
 	return 0;
 }
diff --git a/third_party/git/t/helper/test-lazy-init-name-hash.c b/third_party/git/t/helper/test-lazy-init-name-hash.c
index b99a37080d93..cd1b4c9736ef 100644
--- a/third_party/git/t/helper/test-lazy-init-name-hash.c
+++ b/third_party/git/t/helper/test-lazy-init-name-hash.c
@@ -41,17 +41,13 @@ static void dump_run(void)
 			die("non-threaded code path used");
 	}
 
-	dir = hashmap_iter_first(&the_index.dir_hash, &iter_dir);
-	while (dir) {
+	hashmap_for_each_entry(&the_index.dir_hash, &iter_dir, dir,
+				ent /* member name */)
 		printf("dir %08x %7d %s\n", dir->ent.hash, dir->nr, dir->name);
-		dir = hashmap_iter_next(&iter_dir);
-	}
 
-	ce = hashmap_iter_first(&the_index.name_hash, &iter_cache);
-	while (ce) {
+	hashmap_for_each_entry(&the_index.name_hash, &iter_cache, ce,
+				ent /* member name */)
 		printf("name %08x %s\n", ce->ent.hash, ce->name);
-		ce = hashmap_iter_next(&iter_cache);
-	}
 
 	discard_cache();
 }
diff --git a/third_party/git/t/helper/test-parse-options.c b/third_party/git/t/helper/test-parse-options.c
index af82db06ac59..2051ce57db73 100644
--- a/third_party/git/t/helper/test-parse-options.c
+++ b/third_party/git/t/helper/test-parse-options.c
@@ -121,6 +121,8 @@ int cmd__parse_options(int argc, const char **argv)
 		OPT_INTEGER('j', NULL, &integer, "get a integer, too"),
 		OPT_MAGNITUDE('m', "magnitude", &magnitude, "get a magnitude"),
 		OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23),
+		OPT_CMDMODE(0, "mode1", &integer, "set integer to 1 (cmdmode option)", 1),
+		OPT_CMDMODE(0, "mode2", &integer, "set integer to 2 (cmdmode option)", 2),
 		OPT_CALLBACK('L', "length", &integer, "str",
 			"get length of <str>", length_callback),
 		OPT_FILENAME('F', "file", &file, "set file to <file>"),
diff --git a/third_party/git/t/helper/test-parse-pathspec-file.c b/third_party/git/t/helper/test-parse-pathspec-file.c
new file mode 100644
index 000000000000..02f4ccfd2a2d
--- /dev/null
+++ b/third_party/git/t/helper/test-parse-pathspec-file.c
@@ -0,0 +1,33 @@
+#include "test-tool.h"
+#include "parse-options.h"
+#include "pathspec.h"
+#include "gettext.h"
+
+int cmd__parse_pathspec_file(int argc, const char **argv)
+{
+	struct pathspec pathspec;
+	const char *pathspec_from_file = 0;
+	int pathspec_file_nul = 0, i;
+
+	static const char *const usage[] = {
+		"test-tool parse-pathspec-file --pathspec-from-file [--pathspec-file-nul]",
+		NULL
+	};
+
+	struct option options[] = {
+		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
+		OPT_END()
+	};
+
+	parse_options(argc, argv, 0, options, usage, 0);
+
+	parse_pathspec_file(&pathspec, 0, 0, 0, pathspec_from_file,
+			    pathspec_file_nul);
+
+	for (i = 0; i < pathspec.nr; i++)
+		printf("%s\n", pathspec.items[i].original);
+
+	clear_pathspec(&pathspec);
+	return 0;
+}
diff --git a/third_party/git/t/helper/test-path-utils.c b/third_party/git/t/helper/test-path-utils.c
index 5d543ad21f89..409034cf4eef 100644
--- a/third_party/git/t/helper/test-path-utils.c
+++ b/third_party/git/t/helper/test-path-utils.c
@@ -185,6 +185,99 @@ static int cmp_by_st_size(const void *a, const void *b)
 	return x > y ? -1 : (x < y ? +1 : 0);
 }
 
+/*
+ * A very simple, reproducible pseudo-random generator. Copied from
+ * `test-genrandom.c`.
+ */
+static uint64_t my_random_value = 1234;
+
+static uint64_t my_random(void)
+{
+	my_random_value = my_random_value * 1103515245 + 12345;
+	return my_random_value;
+}
+
+/*
+ * A fast approximation of the square root, without requiring math.h.
+ *
+ * It uses Newton's method to approximate the solution of 0 = x^2 - value.
+ */
+static double my_sqrt(double value)
+{
+	const double epsilon = 1e-6;
+	double x = value;
+
+	if (value == 0)
+		return 0;
+
+	for (;;) {
+		double delta = (value / x - x) / 2;
+		if (delta < epsilon && delta > -epsilon)
+			return x + delta;
+		x += delta;
+	}
+}
+
+static int protect_ntfs_hfs_benchmark(int argc, const char **argv)
+{
+	size_t i, j, nr, min_len = 3, max_len = 20;
+	char **names;
+	int repetitions = 15, file_mode = 0100644;
+	uint64_t begin, end;
+	double m[3][2], v[3][2];
+	uint64_t cumul;
+	double cumul2;
+
+	if (argc > 1 && !strcmp(argv[1], "--with-symlink-mode")) {
+		file_mode = 0120000;
+		argc--;
+		argv++;
+	}
+
+	nr = argc > 1 ? strtoul(argv[1], NULL, 0) : 1000000;
+	ALLOC_ARRAY(names, nr);
+
+	if (argc > 2) {
+		min_len = strtoul(argv[2], NULL, 0);
+		if (argc > 3)
+			max_len = strtoul(argv[3], NULL, 0);
+		if (min_len > max_len)
+			die("min_len > max_len");
+	}
+
+	for (i = 0; i < nr; i++) {
+		size_t len = min_len + (my_random() % (max_len + 1 - min_len));
+
+		names[i] = xmallocz(len);
+		while (len > 0)
+			names[i][--len] = (char)(' ' + (my_random() % ('\x7f' - ' ')));
+	}
+
+	for (protect_ntfs = 0; protect_ntfs < 2; protect_ntfs++)
+		for (protect_hfs = 0; protect_hfs < 2; protect_hfs++) {
+			cumul = 0;
+			cumul2 = 0;
+			for (i = 0; i < repetitions; i++) {
+				begin = getnanotime();
+				for (j = 0; j < nr; j++)
+					verify_path(names[j], file_mode);
+				end = getnanotime();
+				printf("protect_ntfs = %d, protect_hfs = %d: %lfms\n", protect_ntfs, protect_hfs, (end-begin) / (double)1e6);
+				cumul += end - begin;
+				cumul2 += (end - begin) * (end - begin);
+			}
+			m[protect_ntfs][protect_hfs] = cumul / (double)repetitions;
+			v[protect_ntfs][protect_hfs] = my_sqrt(cumul2 / (double)repetitions - m[protect_ntfs][protect_hfs] * m[protect_ntfs][protect_hfs]);
+			printf("mean: %lfms, stddev: %lfms\n", m[protect_ntfs][protect_hfs] / (double)1e6, v[protect_ntfs][protect_hfs] / (double)1e6);
+		}
+
+	for (protect_ntfs = 0; protect_ntfs < 2; protect_ntfs++)
+		for (protect_hfs = 0; protect_hfs < 2; protect_hfs++)
+			printf("ntfs=%d/hfs=%d: %lf%% slower\n", protect_ntfs, protect_hfs, (m[protect_ntfs][protect_hfs] - m[0][0]) * 100 / m[0][0]);
+
+	return 0;
+}
+
 int cmd__path_utils(int argc, const char **argv)
 {
 	if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) {
@@ -355,6 +448,26 @@ int cmd__path_utils(int argc, const char **argv)
 		return !!res;
 	}
 
+	if (argc > 1 && !strcmp(argv[1], "protect_ntfs_hfs"))
+		return !!protect_ntfs_hfs_benchmark(argc - 1, argv + 1);
+
+	if (argc > 1 && !strcmp(argv[1], "is_valid_path")) {
+		int res = 0, expect = 1, i;
+
+		for (i = 2; i < argc; i++)
+			if (!strcmp("--not", argv[i]))
+				expect = 0;
+			else if (expect != is_valid_path(argv[i]))
+				res = error("'%s' is%s a valid path",
+					    argv[i], expect ? " not" : "");
+			else
+				fprintf(stderr,
+					"'%s' is%s a valid path\n",
+					argv[i], expect ? "" : " not");
+
+		return !!res;
+	}
+
 	fprintf(stderr, "%s: unknown function name: %s\n", argv[0],
 		argv[1] ? argv[1] : "(there was none)");
 	return 1;
diff --git a/third_party/git/t/helper/test-progress.c b/third_party/git/t/helper/test-progress.c
new file mode 100644
index 000000000000..42b96cb103c6
--- /dev/null
+++ b/third_party/git/t/helper/test-progress.c
@@ -0,0 +1,81 @@
+/*
+ * A test helper to exercise the progress display.
+ *
+ * Reads instructions from standard input, one instruction per line:
+ *
+ *   "progress <items>" - Call display_progress() with the given item count
+ *                        as parameter.
+ *   "throughput <bytes> <millis> - Call display_throughput() with the given
+ *                                  byte count as parameter.  The 'millis'
+ *                                  specify the time elapsed since the
+ *                                  start_progress() call.
+ *   "update" - Set the 'progress_update' flag.
+ *
+ * See 't0500-progress-display.sh' for examples.
+ */
+#include "test-tool.h"
+#include "gettext.h"
+#include "parse-options.h"
+#include "progress.h"
+#include "strbuf.h"
+
+/*
+ * These are defined in 'progress.c', but are not exposed in 'progress.h',
+ * because they are exclusively for testing.
+ */
+extern int progress_testing;
+extern uint64_t progress_test_ns;
+void progress_test_force_update(void);
+
+int cmd__progress(int argc, const char **argv)
+{
+	int total = 0;
+	const char *title;
+	struct strbuf line = STRBUF_INIT;
+	struct progress *progress;
+
+	const char *usage[] = {
+		"test-tool progress [--total=<n>] <progress-title>",
+		NULL
+	};
+	struct option options[] = {
+		OPT_INTEGER(0, "total", &total, "total number of items"),
+		OPT_END(),
+	};
+
+	argc = parse_options(argc, argv, NULL, options, usage, 0);
+	if (argc != 1)
+		die("need a title for the progress output");
+	title = argv[0];
+
+	progress_testing = 1;
+	progress = start_progress(title, total);
+	while (strbuf_getline(&line, stdin) != EOF) {
+		char *end;
+
+		if (skip_prefix(line.buf, "progress ", (const char **) &end)) {
+			uint64_t item_count = strtoull(end, &end, 10);
+			if (*end != '\0')
+				die("invalid input: '%s'\n", line.buf);
+			display_progress(progress, item_count);
+		} else if (skip_prefix(line.buf, "throughput ",
+				       (const char **) &end)) {
+			uint64_t byte_count, test_ms;
+
+			byte_count = strtoull(end, &end, 10);
+			if (*end != ' ')
+				die("invalid input: '%s'\n", line.buf);
+			test_ms = strtoull(end + 1, &end, 10);
+			if (*end != '\0')
+				die("invalid input: '%s'\n", line.buf);
+			progress_test_ns = test_ms * 1000 * 1000;
+			display_throughput(progress, byte_count);
+		} else if (!strcmp(line.buf, "update"))
+			progress_test_force_update();
+		else
+			die("invalid input: '%s'\n", line.buf);
+	}
+	stop_progress(&progress);
+
+	return 0;
+}
diff --git a/third_party/git/t/helper/test-read-cache.c b/third_party/git/t/helper/test-read-cache.c
index 7e79b555de80..244977a29bdf 100644
--- a/third_party/git/t/helper/test-read-cache.c
+++ b/third_party/git/t/helper/test-read-cache.c
@@ -4,11 +4,10 @@
 
 int cmd__read_cache(int argc, const char **argv)
 {
-	int i, cnt = 1, namelen;
+	int i, cnt = 1;
 	const char *name = NULL;
 
 	if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) {
-		namelen = strlen(name);
 		argc--;
 		argv++;
 	}
@@ -24,7 +23,7 @@ int cmd__read_cache(int argc, const char **argv)
 
 			refresh_index(&the_index, REFRESH_QUIET,
 				      NULL, NULL, NULL);
-			pos = index_name_pos(&the_index, name, namelen);
+			pos = index_name_pos(&the_index, name, strlen(name));
 			if (pos < 0)
 				die("%s not in index", name);
 			printf("%s is%s up to date\n", name,
diff --git a/third_party/git/t/helper/test-read-graph.c b/third_party/git/t/helper/test-read-graph.c
new file mode 100644
index 000000000000..f8a461767ca4
--- /dev/null
+++ b/third_party/git/t/helper/test-read-graph.c
@@ -0,0 +1,53 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "commit-graph.h"
+#include "repository.h"
+#include "object-store.h"
+
+int cmd__read_graph(int argc, const char **argv)
+{
+	struct commit_graph *graph = NULL;
+	char *graph_name;
+	int open_ok;
+	int fd;
+	struct stat st;
+	struct object_directory *odb;
+
+	setup_git_directory();
+	odb = the_repository->objects->odb;
+
+	graph_name = get_commit_graph_filename(odb);
+
+	open_ok = open_commit_graph(graph_name, &fd, &st);
+	if (!open_ok)
+		die_errno(_("Could not open commit-graph '%s'"), graph_name);
+
+	graph = load_commit_graph_one_fd_st(fd, &st, odb);
+	if (!graph)
+		return 1;
+
+	FREE_AND_NULL(graph_name);
+
+	printf("header: %08x %d %d %d %d\n",
+		ntohl(*(uint32_t*)graph->data),
+		*(unsigned char*)(graph->data + 4),
+		*(unsigned char*)(graph->data + 5),
+		*(unsigned char*)(graph->data + 6),
+		*(unsigned char*)(graph->data + 7));
+	printf("num_commits: %u\n", graph->num_commits);
+	printf("chunks:");
+
+	if (graph->chunk_oid_fanout)
+		printf(" oid_fanout");
+	if (graph->chunk_oid_lookup)
+		printf(" oid_lookup");
+	if (graph->chunk_commit_data)
+		printf(" commit_metadata");
+	if (graph->chunk_extra_edges)
+		printf(" extra_edges");
+	printf("\n");
+
+	UNLEAK(graph);
+
+	return 0;
+}
diff --git a/third_party/git/t/helper/test-run-command.c b/third_party/git/t/helper/test-run-command.c
index 2cc93bb69c52..1646aa25d82f 100644
--- a/third_party/git/t/helper/test-run-command.c
+++ b/third_party/git/t/helper/test-run-command.c
@@ -10,11 +10,16 @@
 
 #include "test-tool.h"
 #include "git-compat-util.h"
+#include "cache.h"
 #include "run-command.h"
 #include "argv-array.h"
 #include "strbuf.h"
-#include <string.h>
-#include <errno.h>
+#include "parse-options.h"
+#include "string-list.h"
+#include "thread-utils.h"
+#include "wildmatch.h"
+#include "gettext.h"
+#include "parse-options.h"
 
 static int number_callbacks;
 static int parallel_next(struct child_process *cp,
@@ -50,11 +55,337 @@ static int task_finished(int result,
 	return 1;
 }
 
+struct testsuite {
+	struct string_list tests, failed;
+	int next;
+	int quiet, immediate, verbose, verbose_log, trace, write_junit_xml;
+};
+#define TESTSUITE_INIT \
+	{ STRING_LIST_INIT_DUP, STRING_LIST_INIT_DUP, -1, 0, 0, 0, 0, 0, 0 }
+
+static int next_test(struct child_process *cp, struct strbuf *err, void *cb,
+		     void **task_cb)
+{
+	struct testsuite *suite = cb;
+	const char *test;
+	if (suite->next >= suite->tests.nr)
+		return 0;
+
+	test = suite->tests.items[suite->next++].string;
+	argv_array_pushl(&cp->args, "sh", test, NULL);
+	if (suite->quiet)
+		argv_array_push(&cp->args, "--quiet");
+	if (suite->immediate)
+		argv_array_push(&cp->args, "-i");
+	if (suite->verbose)
+		argv_array_push(&cp->args, "-v");
+	if (suite->verbose_log)
+		argv_array_push(&cp->args, "-V");
+	if (suite->trace)
+		argv_array_push(&cp->args, "-x");
+	if (suite->write_junit_xml)
+		argv_array_push(&cp->args, "--write-junit-xml");
+
+	strbuf_addf(err, "Output of '%s':\n", test);
+	*task_cb = (void *)test;
+
+	return 1;
+}
+
+static int test_finished(int result, struct strbuf *err, void *cb,
+			 void *task_cb)
+{
+	struct testsuite *suite = cb;
+	const char *name = (const char *)task_cb;
+
+	if (result)
+		string_list_append(&suite->failed, name);
+
+	strbuf_addf(err, "%s: '%s'\n", result ? "FAIL" : "SUCCESS", name);
+
+	return 0;
+}
+
+static int test_failed(struct strbuf *out, void *cb, void *task_cb)
+{
+	struct testsuite *suite = cb;
+	const char *name = (const char *)task_cb;
+
+	string_list_append(&suite->failed, name);
+	strbuf_addf(out, "FAILED TO START: '%s'\n", name);
+
+	return 0;
+}
+
+static const char * const testsuite_usage[] = {
+	"test-run-command testsuite [<options>] [<pattern>...]",
+	NULL
+};
+
+static int testsuite(int argc, const char **argv)
+{
+	struct testsuite suite = TESTSUITE_INIT;
+	int max_jobs = 1, i, ret;
+	DIR *dir;
+	struct dirent *d;
+	struct option options[] = {
+		OPT_BOOL('i', "immediate", &suite.immediate,
+			 "stop at first failed test case(s)"),
+		OPT_INTEGER('j', "jobs", &max_jobs, "run <N> jobs in parallel"),
+		OPT_BOOL('q', "quiet", &suite.quiet, "be terse"),
+		OPT_BOOL('v', "verbose", &suite.verbose, "be verbose"),
+		OPT_BOOL('V', "verbose-log", &suite.verbose_log,
+			 "be verbose, redirected to a file"),
+		OPT_BOOL('x', "trace", &suite.trace, "trace shell commands"),
+		OPT_BOOL(0, "write-junit-xml", &suite.write_junit_xml,
+			 "write JUnit-style XML files"),
+		OPT_END()
+	};
+
+	memset(&suite, 0, sizeof(suite));
+	suite.tests.strdup_strings = suite.failed.strdup_strings = 1;
+
+	argc = parse_options(argc, argv, NULL, options,
+			testsuite_usage, PARSE_OPT_STOP_AT_NON_OPTION);
+
+	if (max_jobs <= 0)
+		max_jobs = online_cpus();
+
+	dir = opendir(".");
+	if (!dir)
+		die("Could not open the current directory");
+	while ((d = readdir(dir))) {
+		const char *p = d->d_name;
+
+		if (*p != 't' || !isdigit(p[1]) || !isdigit(p[2]) ||
+		    !isdigit(p[3]) || !isdigit(p[4]) || p[5] != '-' ||
+		    !ends_with(p, ".sh"))
+			continue;
+
+		/* No pattern: match all */
+		if (!argc) {
+			string_list_append(&suite.tests, p);
+			continue;
+		}
+
+		for (i = 0; i < argc; i++)
+			if (!wildmatch(argv[i], p, 0)) {
+				string_list_append(&suite.tests, p);
+				break;
+			}
+	}
+	closedir(dir);
+
+	if (!suite.tests.nr)
+		die("No tests match!");
+	if (max_jobs > suite.tests.nr)
+		max_jobs = suite.tests.nr;
+
+	fprintf(stderr, "Running %d tests (%d at a time)\n",
+		suite.tests.nr, max_jobs);
+
+	ret = run_processes_parallel(max_jobs, next_test, test_failed,
+				     test_finished, &suite);
+
+	if (suite.failed.nr > 0) {
+		ret = 1;
+		fprintf(stderr, "%d tests failed:\n\n", suite.failed.nr);
+		for (i = 0; i < suite.failed.nr; i++)
+			fprintf(stderr, "\t%s\n", suite.failed.items[i].string);
+	}
+
+	string_list_clear(&suite.tests, 0);
+	string_list_clear(&suite.failed, 0);
+
+	return !!ret;
+}
+
+static uint64_t my_random_next = 1234;
+
+static uint64_t my_random(void)
+{
+	uint64_t res = my_random_next;
+	my_random_next = my_random_next * 1103515245 + 12345;
+	return res;
+}
+
+static int quote_stress_test(int argc, const char **argv)
+{
+	/*
+	 * We are running a quote-stress test.
+	 * spawn a subprocess that runs quote-stress with a
+	 * special option that echoes back the arguments that
+	 * were passed in.
+	 */
+	char special[] = ".?*\\^_\"'`{}()[]<>@~&+:;$%"; // \t\r\n\a";
+	int i, j, k, trials = 100, skip = 0, msys2 = 0;
+	struct strbuf out = STRBUF_INIT;
+	struct argv_array args = ARGV_ARRAY_INIT;
+	struct option options[] = {
+		OPT_INTEGER('n', "trials", &trials, "Number of trials"),
+		OPT_INTEGER('s', "skip", &skip, "Skip <n> trials"),
+		OPT_BOOL('m', "msys2", &msys2, "Test quoting for MSYS2's sh"),
+		OPT_END()
+	};
+	const char * const usage[] = {
+		"test-tool run-command quote-stress-test <options>",
+		NULL
+	};
+
+	argc = parse_options(argc, argv, NULL, options, usage, 0);
+
+	setenv("MSYS_NO_PATHCONV", "1", 0);
+
+	for (i = 0; i < trials; i++) {
+		struct child_process cp = CHILD_PROCESS_INIT;
+		size_t arg_count, arg_offset;
+		int ret = 0;
+
+		argv_array_clear(&args);
+		if (msys2)
+			argv_array_pushl(&args, "sh", "-c",
+					 "printf %s\\\\0 \"$@\"", "skip", NULL);
+		else
+			argv_array_pushl(&args, "test-tool", "run-command",
+					 "quote-echo", NULL);
+		arg_offset = args.argc;
+
+		if (argc > 0) {
+			trials = 1;
+			arg_count = argc;
+			for (j = 0; j < arg_count; j++)
+				argv_array_push(&args, argv[j]);
+		} else {
+			arg_count = 1 + (my_random() % 5);
+			for (j = 0; j < arg_count; j++) {
+				char buf[20];
+				size_t min_len = 1;
+				size_t arg_len = min_len +
+					(my_random() % (ARRAY_SIZE(buf) - min_len));
+
+				for (k = 0; k < arg_len; k++)
+					buf[k] = special[my_random() %
+						ARRAY_SIZE(special)];
+				buf[arg_len] = '\0';
+
+				argv_array_push(&args, buf);
+			}
+		}
+
+		if (i < skip)
+			continue;
+
+		cp.argv = args.argv;
+		strbuf_reset(&out);
+		if (pipe_command(&cp, NULL, 0, &out, 0, NULL, 0) < 0)
+			return error("Failed to spawn child process");
+
+		for (j = 0, k = 0; j < arg_count; j++) {
+			const char *arg = args.argv[j + arg_offset];
+
+			if (strcmp(arg, out.buf + k))
+				ret = error("incorrectly quoted arg: '%s', "
+					    "echoed back as '%s'",
+					     arg, out.buf + k);
+			k += strlen(out.buf + k) + 1;
+		}
+
+		if (k != out.len)
+			ret = error("got %d bytes, but consumed only %d",
+				     (int)out.len, (int)k);
+
+		if (ret) {
+			fprintf(stderr, "Trial #%d failed. Arguments:\n", i);
+			for (j = 0; j < arg_count; j++)
+				fprintf(stderr, "arg #%d: '%s'\n",
+					(int)j, args.argv[j + arg_offset]);
+
+			strbuf_release(&out);
+			argv_array_clear(&args);
+
+			return ret;
+		}
+
+		if (i && (i % 100) == 0)
+			fprintf(stderr, "Trials completed: %d\n", (int)i);
+	}
+
+	strbuf_release(&out);
+	argv_array_clear(&args);
+
+	return 0;
+}
+
+static int quote_echo(int argc, const char **argv)
+{
+	while (argc > 1) {
+		fwrite(argv[1], strlen(argv[1]), 1, stdout);
+		fputc('\0', stdout);
+		argv++;
+		argc--;
+	}
+
+	return 0;
+}
+
+static int inherit_handle(const char *argv0)
+{
+	struct child_process cp = CHILD_PROCESS_INIT;
+	char path[PATH_MAX];
+	int tmp;
+
+	/* First, open an inheritable handle */
+	xsnprintf(path, sizeof(path), "out-XXXXXX");
+	tmp = xmkstemp(path);
+
+	argv_array_pushl(&cp.args,
+			 "test-tool", argv0, "inherited-handle-child", NULL);
+	cp.in = -1;
+	cp.no_stdout = cp.no_stderr = 1;
+	if (start_command(&cp) < 0)
+		die("Could not start child process");
+
+	/* Then close it, and try to delete it. */
+	close(tmp);
+	if (unlink(path))
+		die("Could not delete '%s'", path);
+
+	if (close(cp.in) < 0 || finish_command(&cp) < 0)
+		die("Child did not finish");
+
+	return 0;
+}
+
+static int inherit_handle_child(void)
+{
+	struct strbuf buf = STRBUF_INIT;
+
+	if (strbuf_read(&buf, 0, 0) < 0)
+		die("Could not read stdin");
+	printf("Received %s\n", buf.buf);
+	strbuf_release(&buf);
+
+	return 0;
+}
+
 int cmd__run_command(int argc, const char **argv)
 {
 	struct child_process proc = CHILD_PROCESS_INIT;
 	int jobs;
 
+	if (argc > 1 && !strcmp(argv[1], "testsuite"))
+		exit(testsuite(argc - 1, argv + 1));
+	if (!strcmp(argv[1], "inherited-handle"))
+		exit(inherit_handle(argv[0]));
+	if (!strcmp(argv[1], "inherited-handle-child"))
+		exit(inherit_handle_child());
+
+	if (argc >= 2 && !strcmp(argv[1], "quote-stress-test"))
+		return !!quote_stress_test(argc - 1, argv + 1);
+
+	if (argc >= 2 && !strcmp(argv[1], "quote-echo"))
+		return !!quote_echo(argc - 1, argv + 1);
+
 	if (argc < 3)
 		return 1;
 	while (!strcmp(argv[1], "env")) {
diff --git a/third_party/git/t/helper/test-tool.c b/third_party/git/t/helper/test-tool.c
index ce7e89028c4a..c9a232d23897 100644
--- a/third_party/git/t/helper/test-tool.c
+++ b/third_party/git/t/helper/test-tool.c
@@ -39,11 +39,14 @@ static struct test_cmd cmds[] = {
 	{ "oidmap", cmd__oidmap },
 	{ "online-cpus", cmd__online_cpus },
 	{ "parse-options", cmd__parse_options },
+	{ "parse-pathspec-file", cmd__parse_pathspec_file },
 	{ "path-utils", cmd__path_utils },
 	{ "pkt-line", cmd__pkt_line },
 	{ "prio-queue", cmd__prio_queue },
+	{ "progress", cmd__progress },
 	{ "reach", cmd__reach },
 	{ "read-cache", cmd__read_cache },
+	{ "read-graph", cmd__read_graph },
 	{ "read-midx", cmd__read_midx },
 	{ "ref-store", cmd__ref_store },
 	{ "regex", cmd__regex },
diff --git a/third_party/git/t/helper/test-tool.h b/third_party/git/t/helper/test-tool.h
index f805bb39ae9e..c8549fd87f23 100644
--- a/third_party/git/t/helper/test-tool.h
+++ b/third_party/git/t/helper/test-tool.h
@@ -29,11 +29,14 @@ int cmd__mktemp(int argc, const char **argv);
 int cmd__oidmap(int argc, const char **argv);
 int cmd__online_cpus(int argc, const char **argv);
 int cmd__parse_options(int argc, const char **argv);
+int cmd__parse_pathspec_file(int argc, const char** argv);
 int cmd__path_utils(int argc, const char **argv);
 int cmd__pkt_line(int argc, const char **argv);
 int cmd__prio_queue(int argc, const char **argv);
+int cmd__progress(int argc, const char **argv);
 int cmd__reach(int argc, const char **argv);
 int cmd__read_cache(int argc, const char **argv);
+int cmd__read_graph(int argc, const char **argv);
 int cmd__read_midx(int argc, const char **argv);
 int cmd__ref_store(int argc, const char **argv);
 int cmd__regex(int argc, const char **argv);
diff --git a/third_party/git/t/helper/test-windows-named-pipe.c b/third_party/git/t/helper/test-windows-named-pipe.c
index b4b752b01aaf..ae52183e6344 100644
--- a/third_party/git/t/helper/test-windows-named-pipe.c
+++ b/third_party/git/t/helper/test-windows-named-pipe.c
@@ -19,7 +19,7 @@ int cmd__windows_named_pipe(int argc, const char **argv)
 	if (argc < 2)
 		goto print_usage;
 	filename = argv[1];
-	if (strchr(filename, '/') || strchr(filename, '\\'))
+	if (strpbrk(filename, "/\\"))
 		goto print_usage;
 	strbuf_addf(&pathname, "//./pipe/%s", filename);
 
diff --git a/third_party/git/t/lib-bash.sh b/third_party/git/t/lib-bash.sh
index 2be955fafba6..b0b6060929ce 100644
--- a/third_party/git/t/lib-bash.sh
+++ b/third_party/git/t/lib-bash.sh
@@ -2,10 +2,12 @@
 # to run under Bash; primarily intended for tests of the completion
 # script.
 
-if test -n "$BASH" && test -z "$POSIXLY_CORRECT"; then
+if test -n "$BASH" && test -z "$POSIXLY_CORRECT"
+then
 	# we are in full-on bash mode
 	true
-elif type bash >/dev/null 2>&1; then
+elif type bash >/dev/null 2>&1
+then
 	# execute in full-on bash mode
 	unset POSIXLY_CORRECT
 	exec bash "$0" "$@"
diff --git a/third_party/git/t/lib-credential.sh b/third_party/git/t/lib-credential.sh
index 937b831ea675..bb88cc01087b 100755
--- a/third_party/git/t/lib-credential.sh
+++ b/third_party/git/t/lib-credential.sh
@@ -19,7 +19,7 @@ check() {
 		false
 	fi &&
 	test_cmp expect-stdout stdout &&
-	test_cmp expect-stderr stderr
+	test_i18ncmp expect-stderr stderr
 }
 
 read_chunk() {
diff --git a/third_party/git/t/lib-git-daemon.sh b/third_party/git/t/lib-git-daemon.sh
index fb8f8870801e..e62569222b55 100644
--- a/third_party/git/t/lib-git-daemon.sh
+++ b/third_party/git/t/lib-git-daemon.sh
@@ -15,7 +15,7 @@
 #
 #	test_done
 
-if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON
+if ! test_bool_env GIT_TEST_GIT_DAEMON true
 then
 	skip_all="git-daemon testing disabled (unset GIT_TEST_GIT_DAEMON to enable)"
 	test_done
diff --git a/third_party/git/t/lib-git-p4.sh b/third_party/git/t/lib-git-p4.sh
index 547b9f88e123..5aff2abe8b54 100644
--- a/third_party/git/t/lib-git-p4.sh
+++ b/third_party/git/t/lib-git-p4.sh
@@ -175,7 +175,7 @@ stop_and_cleanup_p4d () {
 
 cleanup_git () {
 	retry_until_success rm -r "$git"
-	test_must_fail test -d "$git" &&
+	test_path_is_missing "$git" &&
 	retry_until_success mkdir "$git"
 }
 
diff --git a/third_party/git/t/lib-git-svn.sh b/third_party/git/t/lib-git-svn.sh
index 5d4ae629e14e..7d248e658806 100644
--- a/third_party/git/t/lib-git-svn.sh
+++ b/third_party/git/t/lib-git-svn.sh
@@ -69,7 +69,7 @@ svn_cmd () {
 maybe_start_httpd () {
 	loc=${1-svn}
 
-	if git env--helper --type=bool --default=false --exit-code GIT_TEST_HTTPD
+	if test_bool_env GIT_TEST_SVN_HTTPD false
 	then
 		. "$TEST_DIRECTORY"/lib-httpd.sh
 		LIB_HTTPD_SVN="$loc"
@@ -104,7 +104,7 @@ EOF
 }
 
 require_svnserve () {
-	if ! git env--helper --type=bool --default=false --exit-code GIT_TEST_SVNSERVE
+	if ! test_bool_env GIT_TEST_SVNSERVE false
 	then
 		skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
 		test_done
diff --git a/third_party/git/t/lib-httpd.sh b/third_party/git/t/lib-httpd.sh
index 0d985758c6dd..1449ee95e9ea 100644
--- a/third_party/git/t/lib-httpd.sh
+++ b/third_party/git/t/lib-httpd.sh
@@ -41,7 +41,7 @@ then
 	test_done
 fi
 
-if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_HTTPD
+if ! test_bool_env GIT_TEST_HTTPD true
 then
 	skip_all="Network testing disabled (unset GIT_TEST_HTTPD to enable)"
 	test_done
@@ -132,7 +132,7 @@ prepare_httpd() {
 	install_script broken-smart-http.sh
 	install_script error-smart-http.sh
 	install_script error.sh
-	install_script apply-one-time-sed.sh
+	install_script apply-one-time-perl.sh
 
 	ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules"
 
diff --git a/third_party/git/t/lib-httpd/apache.conf b/third_party/git/t/lib-httpd/apache.conf
index 5c1c86c193ab..994e5290d63b 100644
--- a/third_party/git/t/lib-httpd/apache.conf
+++ b/third_party/git/t/lib-httpd/apache.conf
@@ -113,7 +113,7 @@ Alias /auth/dumb/ www/auth/dumb/
 	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
 	SetEnv GIT_HTTP_EXPORT_ALL
 </LocationMatch>
-<LocationMatch /one_time_sed/>
+<LocationMatch /one_time_perl/>
 	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
 	SetEnv GIT_HTTP_EXPORT_ALL
 </LocationMatch>
@@ -122,7 +122,7 @@ ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
 ScriptAlias /broken_smart/ broken-smart-http.sh/
 ScriptAlias /error_smart/ error-smart-http.sh/
 ScriptAlias /error/ error.sh/
-ScriptAliasMatch /one_time_sed/(.*) apply-one-time-sed.sh/$1
+ScriptAliasMatch /one_time_perl/(.*) apply-one-time-perl.sh/$1
 <Directory ${GIT_EXEC_PATH}>
 	Options FollowSymlinks
 </Directory>
@@ -135,7 +135,7 @@ ScriptAliasMatch /one_time_sed/(.*) apply-one-time-sed.sh/$1
 <Files error.sh>
   Options ExecCGI
 </Files>
-<Files apply-one-time-sed.sh>
+<Files apply-one-time-perl.sh>
 	Options ExecCGI
 </Files>
 <Files ${GIT_EXEC_PATH}/git-http-backend>
diff --git a/third_party/git/t/lib-httpd/apply-one-time-perl.sh b/third_party/git/t/lib-httpd/apply-one-time-perl.sh
new file mode 100644
index 000000000000..09a0abdff7c4
--- /dev/null
+++ b/third_party/git/t/lib-httpd/apply-one-time-perl.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# If "one-time-perl" exists in $HTTPD_ROOT_PATH, run perl on the HTTP response,
+# using the contents of "one-time-perl" as the perl command to be run. If the
+# response was modified as a result, delete "one-time-perl" so that subsequent
+# HTTP responses are no longer modified.
+#
+# This can be used to simulate the effects of the repository changing in
+# between HTTP request-response pairs.
+if test -f one-time-perl
+then
+	LC_ALL=C
+	export LC_ALL
+
+	"$GIT_EXEC_PATH/git-http-backend" >out
+	perl -pe "$(cat one-time-perl)" out >out_modified
+
+	if cmp -s out out_modified
+	then
+		cat out
+	else
+		cat out_modified
+		rm one-time-perl
+	fi
+else
+	"$GIT_EXEC_PATH/git-http-backend"
+fi
diff --git a/third_party/git/t/lib-httpd/apply-one-time-sed.sh b/third_party/git/t/lib-httpd/apply-one-time-sed.sh
deleted file mode 100644
index fcef72892547..000000000000
--- a/third_party/git/t/lib-httpd/apply-one-time-sed.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# If "one-time-sed" exists in $HTTPD_ROOT_PATH, run sed on the HTTP response,
-# using the contents of "one-time-sed" as the sed command to be run. If the
-# response was modified as a result, delete "one-time-sed" so that subsequent
-# HTTP responses are no longer modified.
-#
-# This can be used to simulate the effects of the repository changing in
-# between HTTP request-response pairs.
-if [ -e one-time-sed ]; then
-	"$GIT_EXEC_PATH/git-http-backend" >out
-	sed "$(cat one-time-sed)" <out >out_modified
-
-	if diff out out_modified >/dev/null; then
-		cat out
-	else
-		cat out_modified
-		rm one-time-sed
-	fi
-else
-	"$GIT_EXEC_PATH/git-http-backend"
-fi
diff --git a/third_party/git/t/lib-log-graph.sh b/third_party/git/t/lib-log-graph.sh
new file mode 100755
index 000000000000..1184cceef262
--- /dev/null
+++ b/third_party/git/t/lib-log-graph.sh
@@ -0,0 +1,28 @@
+# Helps shared by the test scripts for comparing log graphs.
+
+sanitize_log_output () {
+	sed -e 's/ *$//' \
+	    -e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \
+	    -e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \
+	    -e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \
+	    -e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \
+	    -e 's/index [0-9a-f]*\.\.[0-9a-f]*/index BEFORE..AFTER/'
+}
+
+lib_test_cmp_graph () {
+	git log --graph "$@" >output &&
+	sed 's/ *$//' >output.sanitized <output &&
+	test_i18ncmp expect output.sanitized
+}
+
+lib_test_cmp_short_graph () {
+	git log --graph --pretty=short "$@" >output &&
+	sanitize_log_output >output.sanitized <output &&
+	test_i18ncmp expect output.sanitized
+}
+
+lib_test_cmp_colored_graph () {
+	git log --graph --color=always "$@" >output.colors.raw &&
+	test_decode_color <output.colors.raw | sed "s/ *\$//" >output.colors &&
+	test_cmp expect.colors output.colors
+}
diff --git a/third_party/git/t/lib-pack.sh b/third_party/git/t/lib-pack.sh
index c4d907a450a7..f3463170b39f 100644
--- a/third_party/git/t/lib-pack.sh
+++ b/third_party/git/t/lib-pack.sh
@@ -35,9 +35,11 @@ pack_header () {
 # have hardcoded some well-known objects. See the case statements below for the
 # complete list.
 pack_obj () {
+	test_oid_init
+
 	case "$1" in
 	# empty blob
-	e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
+	$EMPTY_BLOB)
 		case "$2" in
 		'')
 			printf '\060\170\234\003\0\0\0\0\1'
@@ -47,7 +49,7 @@ pack_obj () {
 		;;
 
 	# blob containing "\7\76"
-	e68fe8129b546b101aee9510c5328e7f21ca1d18)
+	$(test_oid packlib_7_76))
 		case "$2" in
 		'')
 			printf '\062\170\234\143\267\3\0\0\116\0\106'
@@ -59,11 +61,18 @@ pack_obj () {
 			printf '\234\143\142\142\142\267\003\0\0\151\0\114'
 			return
 			;;
+		37c8e2c15bb22b912e59b43fd51a4f7e9465ed0b5084c5a1411d991cbe630683)
+			printf '\165\67\310\342\301\133\262\53\221\56\131' &&
+			printf '\264\77\325\32\117\176\224\145\355\13\120' &&
+			printf '\204\305\241\101\35\231\34\276\143\6\203\170' &&
+			printf '\234\143\142\142\142\267\003\0\0\151\0\114'
+			return
+			;;
 		esac
 		;;
 
 	# blob containing "\7\0"
-	01d7713666f4de822776c7622c10f1b07de280dc)
+	$(test_oid packlib_7_0))
 		case "$2" in
 		'')
 			printf '\062\170\234\143\147\0\0\0\20\0\10'
@@ -75,6 +84,13 @@ pack_obj () {
 			printf '\143\142\142\142\147\0\0\0\53\0\16'
 			return
 			;;
+		5d8e6fc40f2dab00e6983a48523fe57e621f46434cb58dbd4422fba03380d886)
+			printf '\165\135\216\157\304\17\55\253\0\346\230\72' &&
+			printf '\110\122\77\345\176\142\37\106\103\114\265' &&
+			printf '\215\275\104\42\373\240\63\200\330\206\170\234' &&
+			printf '\143\142\142\142\147\0\0\0\53\0\16'
+			return
+			;;
 		esac
 		;;
 	esac
@@ -86,7 +102,7 @@ pack_obj () {
 	then
 		echo "$1" | git pack-objects --stdout >pack_obj.tmp &&
 		size=$(wc -c <pack_obj.tmp) &&
-		dd if=pack_obj.tmp bs=1 count=$((size - 20 - 12)) skip=12 &&
+		dd if=pack_obj.tmp bs=1 count=$((size - $(test_oid rawsz) - 12)) skip=12 &&
 		rm -f pack_obj.tmp
 		return
 	fi
@@ -97,7 +113,8 @@ pack_obj () {
 
 # Compute and append pack trailer to "$1"
 pack_trailer () {
-	test-tool sha1 -b <"$1" >trailer.tmp &&
+	test_oid_init &&
+	test-tool $(test_oid algo) -b <"$1" >trailer.tmp &&
 	cat trailer.tmp >>"$1" &&
 	rm -f trailer.tmp
 }
@@ -108,3 +125,11 @@ pack_trailer () {
 clear_packs () {
 	rm -f .git/objects/pack/*
 }
+
+test_oid_cache <<-EOF
+packlib_7_0 sha1:01d7713666f4de822776c7622c10f1b07de280dc
+packlib_7_0 sha256:37c8e2c15bb22b912e59b43fd51a4f7e9465ed0b5084c5a1411d991cbe630683
+
+packlib_7_76 sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18
+packlib_7_76 sha256:5d8e6fc40f2dab00e6983a48523fe57e621f46434cb58dbd4422fba03380d886
+EOF
diff --git a/third_party/git/t/lib-rebase.sh b/third_party/git/t/lib-rebase.sh
index 7ea30e50068b..b72c051f4761 100644
--- a/third_party/git/t/lib-rebase.sh
+++ b/third_party/git/t/lib-rebase.sh
@@ -44,10 +44,10 @@ set_fake_editor () {
 	rm -f "$1"
 	echo 'rebase -i script before editing:'
 	cat "$1".tmp
-	action=pick
+	action=\&
 	for line in $FAKE_LINES; do
 		case $line in
-		pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d)
+		pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|r|merge|m)
 			action="$line";;
 		exec_*|x_*|break|b)
 			echo "$line" | sed 's/_/ /g' >> "$1";;
@@ -58,11 +58,12 @@ set_fake_editor () {
 		bad)
 			action="badcmd";;
 		fakesha)
+			test \& != "$action" || action=pick
 			echo "$action XXXXXXX False commit" >> "$1"
 			action=pick;;
 		*)
-			sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
-			action=pick;;
+			sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1"
+			action=\&;;
 		esac
 	done
 	echo 'rebase -i script after editing:'
@@ -118,3 +119,31 @@ make_empty () {
 	git commit --allow-empty -m "$1" &&
 	git tag "$1"
 }
+
+# Call this (inside test_expect_success) at the end of a test file to
+# check that no tests have changed editor related environment
+# variables or config settings
+test_editor_unchanged () {
+	# We're only interested in exported variables hence 'sh -c'
+	sh -c 'cat >actual <<-EOF
+	EDITOR=$EDITOR
+	FAKE_COMMIT_AMEND=$FAKE_COMMIT_AMEND
+	FAKE_COMMIT_MESSAGE=$FAKE_COMMIT_MESSAGE
+	FAKE_LINES=$FAKE_LINES
+	GIT_EDITOR=$GIT_EDITOR
+	GIT_SEQUENCE_EDITOR=$GIT_SEQUENCE_EDITOR
+	core.editor=$(git config core.editor)
+	sequence.editor=$(git config sequence.editor)
+	EOF'
+	cat >expect <<-\EOF
+	EDITOR=:
+	FAKE_COMMIT_AMEND=
+	FAKE_COMMIT_MESSAGE=
+	FAKE_LINES=
+	GIT_EDITOR=
+	GIT_SEQUENCE_EDITOR=
+	core.editor=
+	sequence.editor=
+	EOF
+	test_cmp expect actual
+}
diff --git a/third_party/git/t/oid-info/hash-info b/third_party/git/t/oid-info/hash-info
index ccdbfdf9743d..d0736dd1a00d 100644
--- a/third_party/git/t/oid-info/hash-info
+++ b/third_party/git/t/oid-info/hash-info
@@ -6,3 +6,12 @@ hexsz sha256:64
 
 zero sha1:0000000000000000000000000000000000000000
 zero sha256:0000000000000000000000000000000000000000000000000000000000000000
+
+algo sha1:sha1
+algo sha256:sha256
+
+empty_blob sha1:e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+empty_blob sha256:473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813
+
+empty_tree sha1:4b825dc642cb6eb9a060e54bf8d69288fbee4904
+empty_tree sha256:6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321
diff --git a/third_party/git/t/perf/aggregate.perl b/third_party/git/t/perf/aggregate.perl
index 66554d216122..14e4cda287d7 100755
--- a/third_party/git/t/perf/aggregate.perl
+++ b/third_party/git/t/perf/aggregate.perl
@@ -4,7 +4,6 @@ use lib '../../perl/build/lib';
 use strict;
 use warnings;
 use Getopt::Long;
-use Git;
 use Cwd qw(realpath);
 
 sub get_times {
@@ -85,6 +84,11 @@ sub format_size {
 	return $out;
 }
 
+sub sane_backticks {
+	open(my $fh, '-|', @_);
+	return <$fh>;
+}
+
 my (@dirs, %dirnames, %dirabbrevs, %prefixes, @tests,
     $codespeed, $sortby, $subsection, $reponame);
 
@@ -102,7 +106,8 @@ while (scalar @ARGV) {
 	my $prefix = '';
 	last if -f $arg or $arg eq "--";
 	if (! -d $arg) {
-		my $rev = Git::command_oneline(qw(rev-parse --verify), $arg);
+		my $rev = sane_backticks(qw(git rev-parse --verify), $arg);
+		chomp $rev;
 		$dir = "build/".$rev;
 	} elsif ($arg eq '.') {
 		$dir = '.';
@@ -219,13 +224,7 @@ sub print_default_results {
 		for my $i (0..$#dirs) {
 			my $d = $dirs[$i];
 			my $base = "$resultsdir/$prefixes{$d}$t";
-			$times{$prefixes{$d}.$t} = [];
-			foreach my $type (qw(times size)) {
-				if (-e "$base.$type") {
-					$times{$prefixes{$d}.$t} = [get_times("$base.$type")];
-					last;
-				}
-			}
+			$times{$prefixes{$d}.$t} = [get_times("$base.result")];
 			my ($r,$u,$s) = @{$times{$prefixes{$d}.$t}};
 			my $w = length format_times($r,$u,$s,$firstr);
 			$colwidth[$i] = $w if $w > $colwidth[$i];
@@ -267,7 +266,7 @@ sub print_sorted_results {
 		my ($prevr, $prevu, $prevs, $prevrev);
 		for my $i (0..$#dirs) {
 			my $d = $dirs[$i];
-			my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times");
+			my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result");
 			if ($i > 0 and defined $r and defined $prevr and $prevr > 0) {
 				my $percent = 100.0 * ($r - $prevr) / $prevr;
 				push @evolutions, { "percent"  => $percent,
@@ -327,7 +326,7 @@ sub print_codespeed_results {
 			my $commitid = $prefixes{$d};
 			$commitid =~ s/^build_//;
 			$commitid =~ s/\.$//;
-			my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times");
+			my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result");
 
 			my %vals = (
 				"commitid" => $commitid,
diff --git a/third_party/git/t/perf/bisect_regression b/third_party/git/t/perf/bisect_regression
index a94d9955d012..ce47e1662a92 100755
--- a/third_party/git/t/perf/bisect_regression
+++ b/third_party/git/t/perf/bisect_regression
@@ -51,7 +51,7 @@ oldtime=$(echo "$oldtime" | sed -e 's/^\([0-9]\+\.[0-9]\+\).*$/\1/')
 newtime=$(echo "$newtime" | sed -e 's/^\([0-9]\+\.[0-9]\+\).*$/\1/')
 
 test $(echo "$newtime" "$oldtime" | awk '{ print ($1 > $2) }') = 1 ||
-	die "New time '$newtime' shoud be greater than old time '$oldtime'"
+	die "New time '$newtime' should be greater than old time '$oldtime'"
 
 tmpdir=$(mktemp -d -t bisect_regression_XXXXXX) || die "Failed to create temp directory"
 echo "$oldtime" >"$tmpdir/oldtime" || die "Failed to write to '$tmpdir/oldtime'"
diff --git a/third_party/git/t/perf/p5303-many-packs.sh b/third_party/git/t/perf/p5303-many-packs.sh
index 377985194116..7ee791669a15 100755
--- a/third_party/git/t/perf/p5303-many-packs.sh
+++ b/third_party/git/t/perf/p5303-many-packs.sh
@@ -77,6 +77,7 @@ do
 	# actual pack generation, without smudging the on-disk setup
 	# between trials.
 	test_perf "repack ($nr_packs)" '
+		GIT_TEST_FULL_IN_PACK_ARRAY=1 \
 		git pack-objects --keep-true-parents \
 		  --honor-pack-keep --non-empty --all \
 		  --reflog --indexed-objects --delta-base-offset \
@@ -84,4 +85,22 @@ do
 	'
 done
 
+# Measure pack loading with 10,000 packs.
+test_expect_success 'generate lots of packs' '
+	for i in $(test_seq 10000); do
+		echo "blob"
+		echo "data <<EOF"
+		echo "blob $i"
+		echo "EOF"
+		echo "checkpoint"
+	done |
+	git -c fastimport.unpackLimit=0 fast-import
+'
+
+# The purpose of this test is to evaluate load time for a large number
+# of packs while doing as little other work as possible.
+test_perf "load 10,000 packs" '
+	git rev-parse --verify "HEAD^{commit}"
+'
+
 test_done
diff --git a/third_party/git/t/perf/p5310-pack-bitmaps.sh b/third_party/git/t/perf/p5310-pack-bitmaps.sh
index 6a3a42531b05..7743f4f4c9ff 100755
--- a/third_party/git/t/perf/p5310-pack-bitmaps.sh
+++ b/third_party/git/t/perf/p5310-pack-bitmaps.sh
@@ -39,6 +39,28 @@ test_perf 'pack to file (bitmap)' '
 	git pack-objects --use-bitmap-index --all pack1b </dev/null >/dev/null
 '
 
+test_perf 'rev-list (commits)' '
+	git rev-list --all --use-bitmap-index >/dev/null
+'
+
+test_perf 'rev-list (objects)' '
+	git rev-list --all --use-bitmap-index --objects >/dev/null
+'
+
+test_perf 'rev-list count with blob:none' '
+	git rev-list --use-bitmap-index --count --objects --all \
+		--filter=blob:none >/dev/null
+'
+
+test_perf 'rev-list count with blob:limit=1k' '
+	git rev-list --use-bitmap-index --count --objects --all \
+		--filter=blob:limit=1k >/dev/null
+'
+
+test_perf 'simulated partial clone' '
+	git pack-objects --stdout --all --filter=blob:none </dev/null >/dev/null
+'
+
 test_expect_success 'create partial bitmap state' '
 	# pick a commit to represent the repo tip in the past
 	cutoff=$(git rev-list HEAD~100 -1) &&
diff --git a/third_party/git/t/perf/p5600-clone-reference.sh b/third_party/git/t/perf/p5601-clone-reference.sh
index 68fed663479d..68fed663479d 100755
--- a/third_party/git/t/perf/p5600-clone-reference.sh
+++ b/third_party/git/t/perf/p5601-clone-reference.sh
diff --git a/third_party/git/t/perf/perf-lib.sh b/third_party/git/t/perf/perf-lib.sh
index b58a43ea4364..13e389367a4e 100644
--- a/third_party/git/t/perf/perf-lib.sh
+++ b/third_party/git/t/perf/perf-lib.sh
@@ -214,7 +214,7 @@ test_perf_ () {
 	else
 		test_ok_ "$1"
 	fi
-	"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times
+	"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result
 }
 
 test_perf () {
@@ -223,7 +223,7 @@ test_perf () {
 
 test_size_ () {
 	say >&3 "running: $2"
-	if test_eval_ "$2" 3>"$base".size; then
+	if test_eval_ "$2" 3>"$base".result; then
 		test_ok_ "$1"
 	else
 		test_failure_ "$@"
diff --git a/third_party/git/t/t0000-basic.sh b/third_party/git/t/t0000-basic.sh
index 9ca0818cbe4c..3e440c078d57 100755
--- a/third_party/git/t/t0000-basic.sh
+++ b/third_party/git/t/t0000-basic.sh
@@ -20,9 +20,9 @@ modification *should* take notice and update the test vectors here.
 
 . ./test-lib.sh
 
-try_local_x () {
-	local x="local" &&
-	echo "$x"
+try_local_xy () {
+	local x="local" y="alsolocal" &&
+	echo "$x $y"
 }
 
 # Check whether the shell supports the "local" keyword. "local" is not
@@ -35,11 +35,12 @@ try_local_x () {
 # relying on "local".
 test_expect_success 'verify that the running shell supports "local"' '
 	x="notlocal" &&
-	echo "local" >expected1 &&
-	try_local_x >actual1 &&
+	y="alsonotlocal" &&
+	echo "local alsolocal" >expected1 &&
+	try_local_xy >actual1 &&
 	test_cmp expected1 actual1 &&
-	echo "notlocal" >expected2 &&
-	echo "$x" >actual2 &&
+	echo "notlocal alsonotlocal" >expected2 &&
+	echo "$x $y" >actual2 &&
 	test_cmp expected2 actual2
 '
 
@@ -126,7 +127,7 @@ check_sub_test_lib_test () {
 
 check_sub_test_lib_test_err () {
 	name="$1" # stdin is the expected output from the test
-	# expected error output is in descriptior 3
+	# expected error output is in descriptor 3
 	(
 		cd "$name" &&
 		sed -e 's/^> //' -e 's/Z$//' >expect.out &&
@@ -154,7 +155,7 @@ test_expect_success 'pretend we have a fully passing test suite' "
 "
 
 test_expect_success 'pretend we have a partially passing test suite' "
-	test_must_fail run_sub_test_lib_test \
+	run_sub_test_lib_test_err \
 		partial-pass '2/3 tests passing' <<-\\EOF &&
 	test_expect_success 'passing test #1' 'true'
 	test_expect_success 'failing test #2' 'false'
@@ -218,7 +219,7 @@ test_expect_success 'pretend we have fixed one of two known breakages (run in su
 "
 
 test_expect_success 'pretend we have a pass, fail, and known breakage' "
-	test_must_fail run_sub_test_lib_test \
+	run_sub_test_lib_test_err \
 		mixed-results1 'mixed results #1' <<-\\EOF &&
 	test_expect_success 'passing test' 'true'
 	test_expect_success 'failing test' 'false'
@@ -237,7 +238,7 @@ test_expect_success 'pretend we have a pass, fail, and known breakage' "
 "
 
 test_expect_success 'pretend we have a mix of all possible results' "
-	test_must_fail run_sub_test_lib_test \
+	run_sub_test_lib_test_err \
 		mixed-results2 'mixed results #2' <<-\\EOF &&
 	test_expect_success 'passing test' 'true'
 	test_expect_success 'passing test' 'true'
@@ -273,24 +274,24 @@ test_expect_success 'pretend we have a mix of all possible results' "
 "
 
 test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
-	test_must_fail run_sub_test_lib_test \
-		test-verbose "test verbose" --verbose <<-\EOF &&
+	run_sub_test_lib_test_err \
+		t1234-verbose "test verbose" --verbose <<-\EOF &&
 	test_expect_success "passing test" true
 	test_expect_success "test with output" "echo foo"
 	test_expect_success "failing test" false
 	test_done
 	EOF
-	mv test-verbose/out test-verbose/out+ &&
-	grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out &&
-	check_sub_test_lib_test test-verbose <<-\EOF
-	> expecting success: true
+	mv t1234-verbose/out t1234-verbose/out+ &&
+	grep -v "^Initialized empty" t1234-verbose/out+ >t1234-verbose/out &&
+	check_sub_test_lib_test t1234-verbose <<-\EOF
+	> expecting success of 1234.1 '\''passing test'\'': true
 	> ok 1 - passing test
 	> Z
-	> expecting success: echo foo
+	> expecting success of 1234.2 '\''test with output'\'': echo foo
 	> foo
 	> ok 2 - test with output
 	> Z
-	> expecting success: false
+	> expecting success of 1234.3 '\''failing test'\'': false
 	> not ok 3 - failing test
 	> #	false
 	> Z
@@ -300,18 +301,18 @@ test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
 '
 
 test_expect_success 'test --verbose-only' '
-	test_must_fail run_sub_test_lib_test \
-		test-verbose-only-2 "test verbose-only=2" \
+	run_sub_test_lib_test_err \
+		t2345-verbose-only-2 "test verbose-only=2" \
 		--verbose-only=2 <<-\EOF &&
 	test_expect_success "passing test" true
 	test_expect_success "test with output" "echo foo"
 	test_expect_success "failing test" false
 	test_done
 	EOF
-	check_sub_test_lib_test test-verbose-only-2 <<-\EOF
+	check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF
 	> ok 1 - passing test
 	> Z
-	> expecting success: echo foo
+	> expecting success of 2345.2 '\''test with output'\'': echo foo
 	> foo
 	> ok 2 - test with output
 	> Z
@@ -391,6 +392,44 @@ test_expect_success 'GIT_SKIP_TESTS sh pattern' "
 	)
 "
 
+test_expect_success 'GIT_SKIP_TESTS entire suite' "
+	(
+		GIT_SKIP_TESTS='git' && export GIT_SKIP_TESTS &&
+		run_sub_test_lib_test git-skip-tests-entire-suite \
+			'GIT_SKIP_TESTS entire suite' <<-\\EOF &&
+		for i in 1 2 3
+		do
+			test_expect_success \"passing test #\$i\" 'true'
+		done
+		test_done
+		EOF
+		check_sub_test_lib_test git-skip-tests-entire-suite <<-\\EOF
+		> 1..0 # SKIP skip all tests in git
+		EOF
+	)
+"
+
+test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' "
+	(
+		GIT_SKIP_TESTS='notgit' && export GIT_SKIP_TESTS &&
+		run_sub_test_lib_test git-skip-tests-unmatched-suite \
+			'GIT_SKIP_TESTS does not skip unmatched suite' <<-\\EOF &&
+		for i in 1 2 3
+		do
+			test_expect_success \"passing test #\$i\" 'true'
+		done
+		test_done
+		EOF
+		check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\\EOF
+		> ok 1 - passing test #1
+		> ok 2 - passing test #2
+		> ok 3 - passing test #3
+		> # passed all 3 test(s)
+		> 1..3
+		EOF
+	)
+"
+
 test_expect_success '--run basic' "
 	run_sub_test_lib_test run-basic \
 		'--run basic' --run='1 3 5' <<-\\EOF &&
@@ -795,7 +834,7 @@ then
 fi
 
 test_expect_success 'tests clean up even on failures' "
-	test_must_fail run_sub_test_lib_test \
+	run_sub_test_lib_test_err \
 		failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF &&
 	test_expect_success 'tests clean up even after a failure' '
 		touch clean-after-failure &&
@@ -824,7 +863,7 @@ test_expect_success 'tests clean up even on failures' "
 "
 
 test_expect_success 'test_atexit is run' "
-	test_must_fail run_sub_test_lib_test \
+	run_sub_test_lib_test_err \
 		atexit-cleanup 'Run atexit commands' -i <<-\\EOF &&
 	test_expect_success 'tests clean up even after a failure' '
 		> ../../clean-atexit &&
@@ -878,6 +917,40 @@ test_expect_success 'test_oid can look up data for SHA-256' '
 	test "$hexsz" -eq 64
 '
 
+test_expect_success 'test_bool_env' '
+	(
+		sane_unset envvar &&
+
+		test_bool_env envvar true &&
+		! test_bool_env envvar false &&
+
+		envvar= &&
+		export envvar &&
+		! test_bool_env envvar true &&
+		! test_bool_env envvar false &&
+
+		envvar=true &&
+		test_bool_env envvar true &&
+		test_bool_env envvar false &&
+
+		envvar=false &&
+		! test_bool_env envvar true &&
+		! test_bool_env envvar false &&
+
+		envvar=invalid &&
+		# When encountering an invalid bool value, test_bool_env
+		# prints its error message to the original stderr of the
+		# test script, hence the redirection of fd 7, and aborts
+		# with "exit 1", hence the subshell.
+		! ( test_bool_env envvar true ) 7>err &&
+		grep "error: test_bool_env requires bool values" err &&
+
+		envvar=true &&
+		! ( test_bool_env envvar invalid ) 7>err &&
+		grep "error: test_bool_env requires bool values" err
+	)
+'
+
 ################################################################
 # Basics of the basics
 
diff --git a/third_party/git/t/t0003-attributes.sh b/third_party/git/t/t0003-attributes.sh
index 71e63d8b509d..b660593c20f8 100755
--- a/third_party/git/t/t0003-attributes.sh
+++ b/third_party/git/t/t0003-attributes.sh
@@ -5,19 +5,16 @@ test_description=gitattributes
 . ./test-lib.sh
 
 attr_check () {
-	path="$1" expect="$2"
+	path="$1" expect="$2" git_opts="$3" &&
 
-	git $3 check-attr test -- "$path" >actual 2>err &&
-	echo "$path: test: $2" >expect &&
+	git $git_opts check-attr test -- "$path" >actual 2>err &&
+	echo "$path: test: $expect" >expect &&
 	test_cmp expect actual &&
-	test_line_count = 0 err
+	test_must_be_empty err
 }
 
 attr_check_quote () {
-
-	path="$1"
-	quoted_path="$2"
-	expect="$3"
+	path="$1" quoted_path="$2" expect="$3" &&
 
 	git check-attr test -- "$path" >actual &&
 	echo "\"$quoted_path\": test: $expect" >expect &&
@@ -27,7 +24,7 @@ attr_check_quote () {
 
 test_expect_success 'open-quoted pathname' '
 	echo "\"a test=a" >.gitattributes &&
-	test_must_fail attr_check a a
+	attr_check a unspecified
 '
 
 
@@ -112,20 +109,20 @@ test_expect_success 'attribute test' '
 
 test_expect_success 'attribute matching is case sensitive when core.ignorecase=0' '
 
-	test_must_fail attr_check F f "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/F f "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/c/F f "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/G a/g "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/B/g a/b/g "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/b/G a/b/g "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/b/H a/b/h "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/b/D/g "a/b/d/*" "-c core.ignorecase=0" &&
-	test_must_fail attr_check oNoFf unset "-c core.ignorecase=0" &&
-	test_must_fail attr_check oFfOn set "-c core.ignorecase=0" &&
+	attr_check F unspecified "-c core.ignorecase=0" &&
+	attr_check a/F unspecified "-c core.ignorecase=0" &&
+	attr_check a/c/F unspecified "-c core.ignorecase=0" &&
+	attr_check a/G unspecified "-c core.ignorecase=0" &&
+	attr_check a/B/g a/g "-c core.ignorecase=0" &&
+	attr_check a/b/G unspecified "-c core.ignorecase=0" &&
+	attr_check a/b/H unspecified "-c core.ignorecase=0" &&
+	attr_check a/b/D/g a/g "-c core.ignorecase=0" &&
+	attr_check oNoFf unspecified "-c core.ignorecase=0" &&
+	attr_check oFfOn unspecified "-c core.ignorecase=0" &&
 	attr_check NO unspecified "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/b/D/NO "a/b/d/*" "-c core.ignorecase=0" &&
+	attr_check a/b/D/NO unspecified "-c core.ignorecase=0" &&
 	attr_check a/b/d/YES a/b/d/* "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/E/f "A/e/F" "-c core.ignorecase=0"
+	attr_check a/E/f f "-c core.ignorecase=0"
 
 '
 
@@ -149,8 +146,8 @@ test_expect_success 'attribute matching is case insensitive when core.ignorecase
 '
 
 test_expect_success CASE_INSENSITIVE_FS 'additional case insensitivity tests' '
-	test_must_fail attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=0" &&
-	test_must_fail attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=0" &&
+	attr_check a/B/D/g a/g "-c core.ignorecase=0" &&
+	attr_check A/B/D/NO unspecified "-c core.ignorecase=0" &&
 	attr_check A/b/h a/b/h "-c core.ignorecase=1" &&
 	attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=1" &&
 	attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=1"
@@ -244,7 +241,7 @@ EOF
 	git check-attr foo -- "a/b/f" >>actual 2>>err &&
 	git check-attr foo -- "a/b/c/f" >>actual 2>>err &&
 	test_cmp expect actual &&
-	test_line_count = 0 err
+	test_must_be_empty err
 '
 
 test_expect_success '"**" with no slashes test' '
@@ -265,7 +262,7 @@ EOF
 	git check-attr foo -- "a/b/f" >>actual 2>>err &&
 	git check-attr foo -- "a/b/c/f" >>actual 2>>err &&
 	test_cmp expect actual &&
-	test_line_count = 0 err
+	test_must_be_empty err
 '
 
 test_expect_success 'using --git-dir and --work-tree' '
diff --git a/third_party/git/t/t0008-ignores.sh b/third_party/git/t/t0008-ignores.sh
index 1744cee5e996..370a389e5c5c 100755
--- a/third_party/git/t/t0008-ignores.sh
+++ b/third_party/git/t/t0008-ignores.sh
@@ -424,9 +424,24 @@ test_expect_success 'local ignore inside a sub-directory with --verbose' '
 	)
 '
 
-test_expect_success_multi 'nested include' \
-	'a/b/.gitignore:8:!on*	a/b/one' '
-	test_check_ignore "a/b/one"
+test_expect_success 'nested include of negated pattern' '
+	expect "" &&
+	test_check_ignore "a/b/one" 1
+'
+
+test_expect_success 'nested include of negated pattern with -q' '
+	expect "" &&
+	test_check_ignore "-q a/b/one" 1
+'
+
+test_expect_success 'nested include of negated pattern with -v' '
+	expect "a/b/.gitignore:8:!on*	a/b/one" &&
+	test_check_ignore "-v a/b/one" 0
+'
+
+test_expect_success 'nested include of negated pattern with -v -n' '
+	expect "a/b/.gitignore:8:!on*	a/b/one" &&
+	test_check_ignore "-v -n a/b/one" 0
 '
 
 ############################################################################
@@ -460,7 +475,6 @@ test_expect_success 'cd to ignored sub-directory' '
 	expect_from_stdin <<-\EOF &&
 		foo
 		twoooo
-		../one
 		seven
 		../../one
 	EOF
@@ -543,7 +557,6 @@ test_expect_success 'global ignore' '
 		globalthree
 		a/globalthree
 		a/per-repo
-		globaltwo
 	EOF
 	test_check_ignore "globalone per-repo globalthree a/globalthree a/per-repo not-ignored globaltwo"
 '
@@ -586,17 +599,7 @@ EOF
 cat <<-\EOF >expected-default
 	one
 	a/one
-	a/b/on
-	a/b/one
-	a/b/one one
-	a/b/one two
-	"a/b/one\"three"
-	a/b/two
 	a/b/twooo
-	globaltwo
-	a/globaltwo
-	a/b/globaltwo
-	b/globaltwo
 EOF
 cat <<-EOF >expected-verbose
 	.gitignore:1:one	one
@@ -696,8 +699,12 @@ cat <<-EOF >expected-all
 	$global_excludes:2:!globaltwo	../b/globaltwo
 	::	c/not-ignored
 EOF
+cat <<-EOF >expected-default
+../one
+one
+b/twooo
+EOF
 grep -v '^::	' expected-all >expected-verbose
-sed -e 's/.*	//' expected-verbose >expected-default
 
 broken_c_unquote stdin >stdin0
 
diff --git a/third_party/git/t/t0014-alias.sh b/third_party/git/t/t0014-alias.sh
index a070e645d7fb..8d3d9144c06d 100755
--- a/third_party/git/t/t0014-alias.sh
+++ b/third_party/git/t/t0014-alias.sh
@@ -37,4 +37,11 @@ test_expect_success 'looping aliases - internal execution' '
 #	test_i18ngrep "^fatal: alias loop detected: expansion of" output
 #'
 
+test_expect_success 'run-command formats empty args properly' '
+    test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw &&
+    sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual &&
+    echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect &&
+    test_cmp expect actual
+'
+
 test_done
diff --git a/third_party/git/t/t0020-crlf.sh b/third_party/git/t/t0020-crlf.sh
index 854da0ae16f8..b63ba62e5db4 100755
--- a/third_party/git/t/t0020-crlf.sh
+++ b/third_party/git/t/t0020-crlf.sh
@@ -159,8 +159,8 @@ test_expect_success 'checkout with autocrlf=input' '
 	rm -f tmp one dir/two three &&
 	git config core.autocrlf input &&
 	git read-tree --reset -u HEAD &&
-	test_must_fail has_cr one &&
-	test_must_fail has_cr dir/two &&
+	! has_cr one &&
+	! has_cr dir/two &&
 	git update-index -- one dir/two &&
 	test "$one" = $(git hash-object --stdin <one) &&
 	test "$two" = $(git hash-object --stdin <dir/two) &&
@@ -237,9 +237,9 @@ test_expect_success '.gitattributes says two is binary' '
 	git config core.autocrlf true &&
 	git read-tree --reset -u HEAD &&
 
-	test_must_fail has_cr dir/two &&
+	! has_cr dir/two &&
 	verbose has_cr one &&
-	test_must_fail has_cr three
+	! has_cr three
 '
 
 test_expect_success '.gitattributes says two is input' '
@@ -248,7 +248,7 @@ test_expect_success '.gitattributes says two is input' '
 	echo "two crlf=input" >.gitattributes &&
 	git read-tree --reset -u HEAD &&
 
-	test_must_fail has_cr dir/two
+	! has_cr dir/two
 '
 
 test_expect_success '.gitattributes says two and three are text' '
@@ -270,7 +270,7 @@ test_expect_success 'in-tree .gitattributes (1)' '
 	rm -rf tmp one dir .gitattributes patch.file three &&
 	git read-tree --reset -u HEAD &&
 
-	test_must_fail has_cr one &&
+	! has_cr one &&
 	verbose has_cr three
 '
 
@@ -280,7 +280,7 @@ test_expect_success 'in-tree .gitattributes (2)' '
 	git read-tree --reset HEAD &&
 	git checkout-index -f -q -u -a &&
 
-	test_must_fail has_cr one &&
+	! has_cr one &&
 	verbose has_cr three
 '
 
@@ -291,7 +291,7 @@ test_expect_success 'in-tree .gitattributes (3)' '
 	git checkout-index -u .gitattributes &&
 	git checkout-index -u one dir/two three &&
 
-	test_must_fail has_cr one &&
+	! has_cr one &&
 	verbose has_cr three
 '
 
@@ -302,7 +302,7 @@ test_expect_success 'in-tree .gitattributes (4)' '
 	git checkout-index -u one dir/two three &&
 	git checkout-index -u .gitattributes &&
 
-	test_must_fail has_cr one &&
+	! has_cr one &&
 	verbose has_cr three
 '
 
diff --git a/third_party/git/t/t0021-conversion.sh b/third_party/git/t/t0021-conversion.sh
index e10f5f787fca..dc664da551a3 100755
--- a/third_party/git/t/t0021-conversion.sh
+++ b/third_party/git/t/t0021-conversion.sh
@@ -35,7 +35,7 @@ filter_git () {
 # Compare two files and ensure that `clean` and `smudge` respectively are
 # called at least once if specified in the `expect` file. The actual
 # invocation count is not relevant because their number can vary.
-# c.f. http://public-inbox.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
+# c.f. http://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
 test_cmp_count () {
 	expect=$1
 	actual=$2
@@ -50,7 +50,7 @@ test_cmp_count () {
 
 # Compare two files but exclude all `clean` invocations because Git can
 # call `clean` zero or more times.
-# c.f. http://public-inbox.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
+# c.f. http://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
 test_cmp_exclude_clean () {
 	expect=$1
 	actual=$2
@@ -390,6 +390,9 @@ test_expect_success PERL 'required process filter should filter data' '
 		EOF
 		test_cmp_exclude_clean expected.log debug.log &&
 
+		# Make sure that the file appears dirty, so checkout below has to
+		# run the configured filter.
+		touch test.r &&
 		filter_git checkout --quiet --no-progress empty-branch &&
 		cat >expected.log <<-EOF &&
 			START
@@ -792,7 +795,6 @@ test_expect_success PERL 'missing file in delayed checkout' '
 
 	rm -rf repo-cloned &&
 	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
-	cat git-stderr.log &&
 	grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log
 '
 
diff --git a/third_party/git/t/t0027-auto-crlf.sh b/third_party/git/t/t0027-auto-crlf.sh
index 959b6da44900..9fcd56fab373 100755
--- a/third_party/git/t/t0027-auto-crlf.sh
+++ b/third_party/git/t/t0027-auto-crlf.sh
@@ -215,7 +215,7 @@ stats_ascii () {
 }
 
 
-# contruct the attr/ returned by git ls-files --eol
+# construct the attr/ returned by git ls-files --eol
 # Take none (=empty), one or two args
 # convert.c: eol=XX overrides text=auto
 attr_ascii () {
diff --git a/third_party/git/t/t0028-working-tree-encoding.sh b/third_party/git/t/t0028-working-tree-encoding.sh
index 1090e650edb7..bfc4fb9af5f2 100755
--- a/third_party/git/t/t0028-working-tree-encoding.sh
+++ b/third_party/git/t/t0028-working-tree-encoding.sh
@@ -17,7 +17,7 @@ test_lazy_prereq NO_UTF32_BOM '
 write_utf16 () {
 	if test_have_prereq NO_UTF16_BOM
 	then
-		printf '\xfe\xff'
+		printf '\376\377'
 	fi &&
 	iconv -f UTF-8 -t UTF-16
 }
@@ -25,7 +25,7 @@ write_utf16 () {
 write_utf32 () {
 	if test_have_prereq NO_UTF32_BOM
 	then
-		printf '\x00\x00\xfe\xff'
+		printf '\0\0\376\377'
 	fi &&
 	iconv -f UTF-8 -t UTF-32
 }
@@ -40,7 +40,7 @@ test_expect_success 'setup test files' '
 	printf "$text" | write_utf16 >test.utf16.raw &&
 	printf "$text" | write_utf32 >test.utf32.raw &&
 	printf "\377\376"                         >test.utf16lebom.raw &&
-	printf "$text" | iconv -f UTF-8 -t UTF-32LE >>test.utf16lebom.raw &&
+	printf "$text" | iconv -f UTF-8 -t UTF-16LE >>test.utf16lebom.raw &&
 
 	# Line ending tests
 	printf "one\ntwo\nthree\n" >lf.utf8.raw &&
@@ -280,4 +280,43 @@ test_expect_success ICONV_SHIFT_JIS 'check roundtrip encoding' '
 	git reset
 '
 
+# $1: checkout encoding
+# $2: test string
+# $3: binary test string in checkout encoding
+test_commit_utf8_checkout_other () {
+	encoding="$1"
+	orig_string="$2"
+	expect_bytes="$3"
+
+	test_expect_success "Commit UTF-8, checkout $encoding" '
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	'
+}
+
+test_commit_utf8_checkout_other "UTF-8"        "Test ะขะตัั‚" "\124\145\163\164\040\320\242\320\265\321\201\321\202"
+test_commit_utf8_checkout_other "UTF-16LE"     "Test ะขะตัั‚" "\124\000\145\000\163\000\164\000\040\000\042\004\065\004\101\004\102\004"
+test_commit_utf8_checkout_other "UTF-16BE"     "Test ะขะตัั‚" "\000\124\000\145\000\163\000\164\000\040\004\042\004\065\004\101\004\102"
+test_commit_utf8_checkout_other "UTF-16LE-BOM" "Test ะขะตัั‚" "\377\376\124\000\145\000\163\000\164\000\040\000\042\004\065\004\101\004\102\004"
+test_commit_utf8_checkout_other "UTF-16BE-BOM" "Test ะขะตัั‚" "\376\377\000\124\000\145\000\163\000\164\000\040\004\042\004\065\004\101\004\102"
+test_commit_utf8_checkout_other "UTF-32LE"     "Test ะขะตัั‚" "\124\000\000\000\145\000\000\000\163\000\000\000\164\000\000\000\040\000\000\000\042\004\000\000\065\004\000\000\101\004\000\000\102\004\000\000"
+test_commit_utf8_checkout_other "UTF-32BE"     "Test ะขะตัั‚" "\000\000\000\124\000\000\000\145\000\000\000\163\000\000\000\164\000\000\000\040\000\000\004\042\000\000\004\065\000\000\004\101\000\000\004\102"
+
 test_done
diff --git a/third_party/git/t/t0040-parse-options.sh b/third_party/git/t/t0040-parse-options.sh
index cebc77fab0b2..3483b72db42a 100755
--- a/third_party/git/t/t0040-parse-options.sh
+++ b/third_party/git/t/t0040-parse-options.sh
@@ -23,6 +23,8 @@ usage: test-tool parse-options <options>
     -j <n>                get a integer, too
     -m, --magnitude <n>   get a magnitude
     --set23               set integer to 23
+    --mode1               set integer to 1 (cmdmode option)
+    --mode2               set integer to 2 (cmdmode option)
     -L, --length <str>    get length of <str>
     -F, --file <file>     set file to <file>
 
@@ -242,7 +244,7 @@ test_expect_success 'Alias options do not contribute to abbreviation' '
 '
 
 cat >typo.err <<\EOF
-error: did you mean `--boolean` (with two dashes ?)
+error: did you mean `--boolean` (with two dashes)?
 EOF
 
 test_expect_success 'detect possible typos' '
@@ -252,7 +254,7 @@ test_expect_success 'detect possible typos' '
 '
 
 cat >typo.err <<\EOF
-error: did you mean `--ambiguous` (with two dashes ?)
+error: did you mean `--ambiguous` (with two dashes)?
 EOF
 
 test_expect_success 'detect possible typos' '
@@ -324,6 +326,22 @@ test_expect_success 'OPT_NEGBIT() works' '
 	test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4
 '
 
+test_expect_success 'OPT_CMDMODE() works' '
+	test-tool parse-options --expect="integer: 1" --mode1
+'
+
+test_expect_success 'OPT_CMDMODE() detects incompatibility' '
+	test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_i18ngrep "incompatible with --mode" output.err
+'
+
+test_expect_success 'OPT_CMDMODE() detects incompatibility with something else' '
+	test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_i18ngrep "incompatible with something else" output.err
+'
+
 test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '
 	test-tool parse-options --expect="boolean: 6" + + + + + +
 '
@@ -399,4 +417,11 @@ test_expect_success 'GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works' '
 		test-tool parse-options --ye
 '
 
+test_expect_success '--end-of-options treats remainder as args' '
+	test-tool parse-options \
+	    --expect="verbose: -1" \
+	    --expect="arg 00: --verbose" \
+	    --end-of-options --verbose
+'
+
 test_done
diff --git a/third_party/git/t/t0050-filesystem.sh b/third_party/git/t/t0050-filesystem.sh
index 192c94eccd13..608673fb775d 100755
--- a/third_party/git/t/t0050-filesystem.sh
+++ b/third_party/git/t/t0050-filesystem.sh
@@ -131,4 +131,24 @@ $test_unicode 'merge (silent unicode normalization)' '
 	git merge topic
 '
 
+test_expect_success CASE_INSENSITIVE_FS 'checkout with no pathspec and a case insensitive fs' '
+	git init repo &&
+	(
+		cd repo &&
+
+		>Gitweb &&
+		git add Gitweb &&
+		git commit -m "add Gitweb" &&
+
+		git checkout --orphan todo &&
+		git reset --hard &&
+		mkdir -p gitweb/subdir &&
+		>gitweb/subdir/file &&
+		git add gitweb &&
+		git commit -m "add gitweb/subdir/file" &&
+
+		git checkout master
+	)
+'
+
 test_done
diff --git a/third_party/git/t/t0060-path-utils.sh b/third_party/git/t/t0060-path-utils.sh
index c7b53e494ba4..2ea2d00c39a6 100755
--- a/third_party/git/t/t0060-path-utils.sh
+++ b/third_party/git/t/t0060-path-utils.sh
@@ -165,6 +165,15 @@ test_expect_success 'absolute path rejects the empty string' '
 	test_must_fail test-tool path-utils absolute_path ""
 '
 
+test_expect_success MINGW '<drive-letter>:\\abc is an absolute path' '
+	for letter in : \" C Z 1 รค
+	do
+		path=$letter:\\abc &&
+		absolute="$(test-tool path-utils absolute_path "$path")" &&
+		test "$path" = "$absolute" || return 1
+	done
+'
+
 test_expect_success 'real path rejects the empty string' '
 	test_must_fail test-tool path-utils real_path ""
 '
@@ -285,9 +294,13 @@ test_git_path GIT_OBJECT_DIRECTORY=foo objects/foo foo/foo
 test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2
 test_expect_success 'setup common repository' 'git --git-dir=bar init'
 test_git_path GIT_COMMON_DIR=bar index                    .git/index
+test_git_path GIT_COMMON_DIR=bar index.lock               .git/index.lock
 test_git_path GIT_COMMON_DIR=bar HEAD                     .git/HEAD
 test_git_path GIT_COMMON_DIR=bar logs/HEAD                .git/logs/HEAD
+test_git_path GIT_COMMON_DIR=bar logs/HEAD.lock           .git/logs/HEAD.lock
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisect/foo     .git/logs/refs/bisect/foo
+test_git_path GIT_COMMON_DIR=bar logs/refs                bar/logs/refs
+test_git_path GIT_COMMON_DIR=bar logs/refs/               bar/logs/refs/
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisec/foo      bar/logs/refs/bisec/foo
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisec          bar/logs/refs/bisec
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisectfoo      bar/logs/refs/bisectfoo
@@ -423,6 +436,9 @@ test_expect_success 'match .gitmodules' '
 		~1000000 \
 		~9999999 \
 		\
+		.gitmodules:\$DATA \
+		"gitmod~4 . :\$DATA" \
+		\
 		--not \
 		".gitmodules x"  \
 		".gitmodules .x" \
@@ -447,7 +463,34 @@ test_expect_success 'match .gitmodules' '
 		\
 		GI7EB~1 \
 		GI7EB~01 \
-		GI7EB~1X
+		GI7EB~1X \
+		\
+		.gitmodules,:\$DATA
+'
+
+test_expect_success MINGW 'is_valid_path() on Windows' '
+	test-tool path-utils is_valid_path \
+		win32 \
+		"win32 x" \
+		../hello.txt \
+		C:\\git \
+		comm \
+		conout.c \
+		lptN \
+		\
+		--not \
+		"win32 "  \
+		"win32 /x "  \
+		"win32."  \
+		"win32 . ." \
+		.../hello.txt \
+		colon:test \
+		"AUX.c" \
+		"abc/conOut\$  .xyz/test" \
+		lpt8 \
+		"lpt*" \
+		Nul \
+		"PRN./abc"
 '
 
 test_done
diff --git a/third_party/git/t/t0061-run-command.sh b/third_party/git/t/t0061-run-command.sh
index 015fac8b5d07..7d599675e35a 100755
--- a/third_party/git/t/t0061-run-command.sh
+++ b/third_party/git/t/t0061-run-command.sh
@@ -12,6 +12,10 @@ cat >hello-script <<-EOF
 	cat hello-script
 EOF
 
+test_expect_success MINGW 'subprocess inherits only std handles' '
+	test-tool run-command inherited-handle
+'
+
 test_expect_success 'start_command reports ENOENT (slash)' '
 	test-tool run-command start-command-ENOENT ./does-not-exist 2>err &&
 	test_i18ngrep "\./does-not-exist" err
@@ -210,10 +214,23 @@ test_expect_success MINGW 'verify curlies are quoted properly' '
 	test_cmp expect actual
 '
 
-test_expect_success MINGW 'can spawn with argv[0] containing spaces' '
-	cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" ./ &&
-	test_must_fail "$PWD/test-fake-ssh$X" 2>err &&
-	grep TRASH_DIRECTORY err
+test_expect_success MINGW 'can spawn .bat with argv[0] containing spaces' '
+	bat="$TRASH_DIRECTORY/bat with spaces in name.bat" &&
+
+	# Every .bat invocation will log its arguments to file "out"
+	rm -f out &&
+	echo "echo %* >>out" >"$bat" &&
+
+	# Ask git to invoke .bat; clone will fail due to fake SSH helper
+	test_must_fail env GIT_SSH="$bat" git clone myhost:src ssh-clone &&
+
+	# Spawning .bat can fail if there are two quoted cmd.exe arguments.
+	# .bat itself is first (due to spaces in name), so just one more is
+	# needed to verify. GIT_SSH will invoke .bat multiple times:
+	# 1) -G myhost
+	# 2) myhost "git-upload-pack src"
+	# First invocation will always succeed. Test the second one.
+	grep "git-upload-pack" out
 '
 
 test_done
diff --git a/third_party/git/t/t0067-parse_pathspec_file.sh b/third_party/git/t/t0067-parse_pathspec_file.sh
new file mode 100755
index 000000000000..7bab49f361a9
--- /dev/null
+++ b/third_party/git/t/t0067-parse_pathspec_file.sh
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+test_description='Test parse_pathspec_file()'
+
+. ./test-lib.sh
+
+test_expect_success 'one item from stdin' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	echo fileA.t |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'one item from file' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	echo fileA.t >list &&
+	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'NUL delimiters' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" |
+	test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'LF delimiters' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\nfileB.t\n" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'no trailing delimiter' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\nfileB.t" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'CRLF delimiters' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\r\nfileB.t\r\n" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'quotes' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success '--pathspec-file-nul takes quotes literally' '
+	# Note: there is an extra newline because --pathspec-file-nul takes
+	# input \n literally, too
+	cat >expect <<-\EOF &&
+	"file\101.t"
+
+	EOF
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test-tool parse-pathspec-file --pathspec-from-file=list --pathspec-file-nul >actual &&
+
+	test_cmp expect actual
+'
+
+test_done
diff --git a/third_party/git/t/t0090-cache-tree.sh b/third_party/git/t/t0090-cache-tree.sh
index ce9a4a5f324b..5a633690bffc 100755
--- a/third_party/git/t/t0090-cache-tree.sh
+++ b/third_party/git/t/t0090-cache-tree.sh
@@ -21,9 +21,10 @@ generate_expected_cache_tree_rec () {
 	parent="$2" &&
 	# ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
 	# We want to count only foo because it's the only direct child
-	subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) &&
+	git ls-files >files &&
+	subtrees=$(grep / files|cut -d / -f 1|uniq) &&
 	subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 != "" {++c} END {print c}') &&
-	entries=$(git ls-files|wc -l) &&
+	entries=$(wc -l <files) &&
 	printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
 	for subtree in $subtrees
 	do
diff --git a/third_party/git/t/t0211-trace2-perf.sh b/third_party/git/t/t0211-trace2-perf.sh
index 2c3ad6e8c186..6ee8ee3b6729 100755
--- a/third_party/git/t/t0211-trace2-perf.sh
+++ b/third_party/git/t/t0211-trace2-perf.sh
@@ -130,11 +130,11 @@ test_expect_success 'perf stream, child processes' '
 		d0|main|version|||||$V
 		d0|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 004child test-tool trace2 001return 0
 		d0|main|cmd_name|||||trace2 (trace2)
-		d0|main|child_start||_T_ABS_|||[ch0] class:? argv: test-tool trace2 004child test-tool trace2 001return 0
+		d0|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 004child test-tool trace2 001return 0]
 		d1|main|version|||||$V
 		d1|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 001return 0
 		d1|main|cmd_name|||||trace2 (trace2/trace2)
-		d1|main|child_start||_T_ABS_|||[ch0] class:? argv: test-tool trace2 001return 0
+		d1|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 001return 0]
 		d2|main|version|||||$V
 		d2|main|start||_T_ABS_|||_EXE_ trace2 001return 0
 		d2|main|cmd_name|||||trace2 (trace2/trace2/trace2)
diff --git a/third_party/git/t/t0212-trace2-event.sh b/third_party/git/t/t0212-trace2-event.sh
index ff5b9cc72966..7065a1b9373b 100755
--- a/third_party/git/t/t0212-trace2-event.sh
+++ b/third_party/git/t/t0212-trace2-event.sh
@@ -265,4 +265,23 @@ test_expect_success JSON_PP 'using global config, event stream, error event' '
 	test_cmp expect actual
 '
 
+test_expect_success 'discard traces when there are too many files' '
+	mkdir trace_target_dir &&
+	test_when_finished "rm -r trace_target_dir" &&
+	(
+		GIT_TRACE2_MAX_FILES=5 &&
+		export GIT_TRACE2_MAX_FILES &&
+		cd trace_target_dir &&
+		test_seq $GIT_TRACE2_MAX_FILES >../expected_filenames.txt &&
+		xargs touch <../expected_filenames.txt &&
+		cd .. &&
+		GIT_TRACE2_EVENT="$(pwd)/trace_target_dir" test-tool trace2 001return 0
+	) &&
+	echo git-trace2-discard >>expected_filenames.txt &&
+	ls trace_target_dir >ls_output.txt &&
+	test_cmp expected_filenames.txt ls_output.txt &&
+	head -n1 trace_target_dir/git-trace2-discard | grep \"event\":\"version\" &&
+	head -n2 trace_target_dir/git-trace2-discard | tail -n1 | grep \"event\":\"too_many_files\"
+'
+
 test_done
diff --git a/third_party/git/t/t0300-credentials.sh b/third_party/git/t/t0300-credentials.sh
index 82eaaea0f495..5555a1524f1d 100755
--- a/third_party/git/t/t0300-credentials.sh
+++ b/third_party/git/t/t0300-credentials.sh
@@ -22,6 +22,11 @@ test_expect_success 'setup helper scripts' '
 	exit 0
 	EOF
 
+	write_script git-credential-quit <<-\EOF &&
+	. ./dump
+	echo quit=1
+	EOF
+
 	write_script git-credential-verbatim <<-\EOF &&
 	user=$1; shift
 	pass=$1; shift
@@ -35,43 +40,71 @@ test_expect_success 'setup helper scripts' '
 
 test_expect_success 'credential_fill invokes helper' '
 	check fill "verbatim foo bar" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	EOF
 '
 
 test_expect_success 'credential_fill invokes multiple helpers' '
 	check fill useless "verbatim foo bar" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
 	useless: get
+	useless: protocol=http
+	useless: host=example.com
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	EOF
 '
 
 test_expect_success 'credential_fill stops when we get a full response' '
 	check fill "verbatim one two" "verbatim three four" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=one
 	password=two
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	EOF
 '
 
 test_expect_success 'credential_fill continues through partial response' '
 	check fill "verbatim one \"\"" "verbatim two three" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=two
 	password=three
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=one
 	EOF
 '
@@ -97,14 +130,20 @@ test_expect_success 'credential_fill passes along metadata' '
 
 test_expect_success 'credential_approve calls all helpers' '
 	check approve useless "verbatim one two" <<-\EOF
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
 	--
 	useless: store
+	useless: protocol=http
+	useless: host=example.com
 	useless: username=foo
 	useless: password=bar
 	verbatim: store
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=foo
 	verbatim: password=bar
 	EOF
@@ -112,6 +151,8 @@ test_expect_success 'credential_approve calls all helpers' '
 
 test_expect_success 'do not bother storing password-less credential' '
 	check approve useless <<-\EOF
+	protocol=http
+	host=example.com
 	username=foo
 	--
 	--
@@ -121,14 +162,20 @@ test_expect_success 'do not bother storing password-less credential' '
 
 test_expect_success 'credential_reject calls all helpers' '
 	check reject useless "verbatim one two" <<-\EOF
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
 	--
 	useless: erase
+	useless: protocol=http
+	useless: host=example.com
 	useless: username=foo
 	useless: password=bar
 	verbatim: erase
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=foo
 	verbatim: password=bar
 	EOF
@@ -136,33 +183,49 @@ test_expect_success 'credential_reject calls all helpers' '
 
 test_expect_success 'usernames can be preserved' '
 	check fill "verbatim \"\" three" <<-\EOF
+	protocol=http
+	host=example.com
 	username=one
 	--
+	protocol=http
+	host=example.com
 	username=one
 	password=three
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=one
 	EOF
 '
 
 test_expect_success 'usernames can be overridden' '
 	check fill "verbatim two three" <<-\EOF
+	protocol=http
+	host=example.com
 	username=one
 	--
+	protocol=http
+	host=example.com
 	username=two
 	password=three
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=one
 	EOF
 '
 
 test_expect_success 'do not bother completing already-full credential' '
 	check fill "verbatim three four" <<-\EOF
+	protocol=http
+	host=example.com
 	username=one
 	password=two
 	--
+	protocol=http
+	host=example.com
 	username=one
 	password=two
 	--
@@ -174,23 +237,31 @@ test_expect_success 'do not bother completing already-full credential' '
 # askpass helper is run, we know the internal getpass is working.
 test_expect_success 'empty helper list falls back to internal getpass' '
 	check fill <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=askpass-username
 	password=askpass-password
 	--
-	askpass: Username:
-	askpass: Password:
+	askpass: Username for '\''http://example.com'\'':
+	askpass: Password for '\''http://askpass-username@example.com'\'':
 	EOF
 '
 
 test_expect_success 'internal getpass does not ask for known username' '
 	check fill <<-\EOF
+	protocol=http
+	host=example.com
 	username=foo
 	--
+	protocol=http
+	host=example.com
 	username=foo
 	password=askpass-password
 	--
-	askpass: Password:
+	askpass: Password for '\''http://foo@example.com'\'':
 	EOF
 '
 
@@ -202,7 +273,11 @@ HELPER="!f() {
 test_expect_success 'respect configured credentials' '
 	test_config credential.helper "$HELPER" &&
 	check fill <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
@@ -240,6 +315,57 @@ test_expect_success 'do not match configured credential' '
 	EOF
 '
 
+test_expect_success 'match multiple configured helpers' '
+	test_config credential.helper "verbatim \"\" \"\"" &&
+	test_config credential.https://example.com.helper "$HELPER" &&
+	check fill <<-\EOF
+	protocol=https
+	host=example.com
+	path=repo.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	EOF
+'
+
+test_expect_success 'match multiple configured helpers with URLs' '
+	test_config credential.https://example.com/repo.git.helper "verbatim \"\" \"\"" &&
+	test_config credential.https://example.com.helper "$HELPER" &&
+	check fill <<-\EOF
+	protocol=https
+	host=example.com
+	path=repo.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	EOF
+'
+
+test_expect_success 'match percent-encoded values' '
+	test_config credential.https://example.com/%2566.git.helper "$HELPER" &&
+	check fill <<-\EOF
+	url=https://example.com/%2566.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	EOF
+'
+
 test_expect_success 'pull username from config' '
 	test_config credential.https://example.com.username foo &&
 	check fill <<-\EOF
@@ -255,6 +381,63 @@ test_expect_success 'pull username from config' '
 	EOF
 '
 
+test_expect_success 'honors username from URL over helper (URL)' '
+	test_config credential.https://example.com.username bob &&
+	test_config credential.https://example.com.helper "verbatim \"\" bar" &&
+	check fill <<-\EOF
+	url=https://alice@example.com
+	--
+	protocol=https
+	host=example.com
+	username=alice
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	verbatim: username=alice
+	EOF
+'
+
+test_expect_success 'honors username from URL over helper (components)' '
+	test_config credential.https://example.com.username bob &&
+	test_config credential.https://example.com.helper "verbatim \"\" bar" &&
+	check fill <<-\EOF
+	protocol=https
+	host=example.com
+	username=alice
+	--
+	protocol=https
+	host=example.com
+	username=alice
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	verbatim: username=alice
+	EOF
+'
+
+test_expect_success 'last matching username wins' '
+	test_config credential.https://example.com/path.git.username bob &&
+	test_config credential.https://example.com.username alice &&
+	test_config credential.https://example.com.helper "verbatim \"\" bar" &&
+	check fill <<-\EOF
+	url=https://example.com/path.git
+	--
+	protocol=https
+	host=example.com
+	username=alice
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	verbatim: username=alice
+	EOF
+'
+
 test_expect_success 'http paths can be part of context' '
 	check fill "verbatim foo bar" <<-\EOF &&
 	protocol=https
@@ -289,23 +472,107 @@ test_expect_success 'http paths can be part of context' '
 	EOF
 '
 
+test_expect_success 'context uses urlmatch' '
+	test_config "credential.https://*.org.useHttpPath" true &&
+	check fill "verbatim foo bar" <<-\EOF
+	protocol=https
+	host=example.org
+	path=foo.git
+	--
+	protocol=https
+	host=example.org
+	path=foo.git
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.org
+	verbatim: path=foo.git
+	EOF
+'
+
 test_expect_success 'helpers can abort the process' '
 	test_must_fail git \
-		-c credential.helper="!f() { echo quit=1; }; f" \
+		-c credential.helper=quit \
 		-c credential.helper="verbatim foo bar" \
-		credential fill >stdout &&
-	test_must_be_empty stdout
+		credential fill >stdout 2>stderr <<-\EOF &&
+	protocol=http
+	host=example.com
+	EOF
+	test_must_be_empty stdout &&
+	cat >expect <<-\EOF &&
+	quit: get
+	quit: protocol=http
+	quit: host=example.com
+	fatal: credential helper '\''quit'\'' told us to quit
+	EOF
+	test_i18ncmp expect stderr
 '
 
 test_expect_success 'empty helper spec resets helper list' '
 	test_config credential.helper "verbatim file file" &&
 	check fill "" "verbatim cmdline cmdline" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=cmdline
 	password=cmdline
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
+	EOF
+'
+
+test_expect_success 'url parser rejects embedded newlines' '
+	test_must_fail git credential fill 2>stderr <<-\EOF &&
+	url=https://one.example.com?%0ahost=two.example.com/
+	EOF
+	cat >expect <<-\EOF &&
+	warning: url contains a newline in its host component: https://one.example.com?%0ahost=two.example.com/
+	fatal: credential url cannot be parsed: https://one.example.com?%0ahost=two.example.com/
+	EOF
+	test_i18ncmp expect stderr
+'
+
+test_expect_success 'host-less URLs are parsed as empty host' '
+	check fill "verbatim foo bar" <<-\EOF
+	url=cert:///path/to/cert.pem
+	--
+	protocol=cert
+	host=
+	path=path/to/cert.pem
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=cert
+	verbatim: host=
+	verbatim: path=path/to/cert.pem
+	EOF
+'
+
+test_expect_success 'credential system refuses to work with missing host' '
+	test_must_fail git credential fill 2>stderr <<-\EOF &&
+	protocol=http
+	EOF
+	cat >expect <<-\EOF &&
+	fatal: refusing to work with credential missing host field
+	EOF
+	test_i18ncmp expect stderr
+'
+
+test_expect_success 'credential system refuses to work with missing protocol' '
+	test_must_fail git credential fill 2>stderr <<-\EOF &&
+	host=example.com
+	EOF
+	cat >expect <<-\EOF &&
+	fatal: refusing to work with credential missing protocol field
 	EOF
+	test_i18ncmp expect stderr
 '
 
 test_done
diff --git a/third_party/git/t/t0410-partial-clone.sh b/third_party/git/t/t0410-partial-clone.sh
index 5bd892f2f7a9..a3988bd4b8c8 100755
--- a/third_party/git/t/t0410-partial-clone.sh
+++ b/third_party/git/t/t0410-partial-clone.sh
@@ -26,7 +26,7 @@ promise_and_delete () {
 test_expect_success 'extensions.partialclone without filter' '
 	test_create_repo server &&
 	git clone --filter="blob:none" "file://$(pwd)/server" client &&
-	git -C client config --unset core.partialclonefilter &&
+	git -C client config --unset remote.origin.partialclonefilter &&
 	git -C client fetch origin
 '
 
@@ -166,8 +166,9 @@ test_expect_success 'fetching of missing objects' '
 	# associated packfile contains the object
 	ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
 	test_line_count = 1 promisorlist &&
-	IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
-	git verify-pack --verbose "$IDX" | grep "$HASH"
+	IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+	git verify-pack --verbose "$IDX" >out &&
+	grep "$HASH" out
 '
 
 test_expect_success 'fetching of missing objects works with ref-in-want enabled' '
@@ -182,8 +183,55 @@ test_expect_success 'fetching of missing objects works with ref-in-want enabled'
 	grep "git< fetch=.*ref-in-want" trace
 '
 
+test_expect_success 'fetching of missing objects from another promisor remote' '
+	git clone "file://$(pwd)/server" server2 &&
+	test_commit -C server2 bar &&
+	git -C server2 repack -a -d --write-bitmap-index &&
+	HASH2=$(git -C server2 rev-parse bar) &&
+
+	git -C repo remote add server2 "file://$(pwd)/server2" &&
+	git -C repo config remote.server2.promisor true &&
+	git -C repo cat-file -p "$HASH2" &&
+
+	git -C repo fetch server2 &&
+	rm -rf repo/.git/objects/* &&
+	git -C repo cat-file -p "$HASH2" &&
+
+	# Ensure that the .promisor file is written, and check that its
+	# associated packfile contains the object
+	ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+	test_line_count = 1 promisorlist &&
+	IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+	git verify-pack --verbose "$IDX" >out &&
+	grep "$HASH2" out
+'
+
+test_expect_success 'fetching of missing objects configures a promisor remote' '
+	git clone "file://$(pwd)/server" server3 &&
+	test_commit -C server3 baz &&
+	git -C server3 repack -a -d --write-bitmap-index &&
+	HASH3=$(git -C server3 rev-parse baz) &&
+	git -C server3 config uploadpack.allowfilter 1 &&
+
+	rm repo/.git/objects/pack/pack-*.promisor &&
+
+	git -C repo remote add server3 "file://$(pwd)/server3" &&
+	git -C repo fetch --filter="blob:none" server3 $HASH3 &&
+
+	test_cmp_config -C repo true remote.server3.promisor &&
+
+	# Ensure that the .promisor file is written, and check that its
+	# associated packfile contains the object
+	ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+	test_line_count = 1 promisorlist &&
+	IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+	git verify-pack --verbose "$IDX" >out &&
+	grep "$HASH3" out
+'
+
 test_expect_success 'fetching of missing blobs works' '
-	rm -rf server repo &&
+	rm -rf server server2 repo &&
+	rm -rf server server3 repo &&
 	test_create_repo server &&
 	test_commit -C server foo &&
 	git -C server repack -a -d --write-bitmap-index &&
@@ -234,7 +282,7 @@ test_expect_success 'rev-list stops traversal at missing and promised commit' '
 
 	git -C repo config core.repositoryformatversion 1 &&
 	git -C repo config extensions.partialclone "arbitrary string" &&
-	GIT_TEST_COMMIT_GRAPH=0 git -C repo rev-list --exclude-promisor-objects --objects bar >out &&
+	GIT_TEST_COMMIT_GRAPH=0 git -C repo -c core.commitGraph=false rev-list --exclude-promisor-objects --objects bar >out &&
 	grep $(git -C repo rev-parse bar) out &&
 	! grep $FOO out
 '
@@ -381,6 +429,19 @@ test_expect_success 'rev-list dies for missing objects on cmd line' '
 	done
 '
 
+test_expect_success 'single promisor remote can be re-initialized gracefully' '
+	# ensure one promisor is in the promisors list
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_create_repo other &&
+	git -C repo remote add foo "file://$(pwd)/other" &&
+	git -C repo config remote.foo.promisor true &&
+	git -C repo config extensions.partialclone foo &&
+
+	# reinitialize the promisors list
+	git -C repo fetch --filter=blob:none foo
+'
+
 test_expect_success 'gc repacks promisor objects separately from non-promisor objects' '
 	rm -rf repo &&
 	test_create_repo repo &&
@@ -492,6 +553,20 @@ test_expect_success 'gc stops traversal when a missing but promised object is re
 	! grep "$TREE_HASH" out
 '
 
+test_expect_success 'do not fetch when checking existence of tree we construct ourselves' '
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo base &&
+	test_commit -C repo side1 &&
+	git -C repo checkout base &&
+	test_commit -C repo side2 &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+
+	git -C repo cherry-pick side1
+'
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
@@ -514,8 +589,12 @@ test_expect_success 'fetching of missing objects from an HTTP server' '
 	# associated packfile contains the object
 	ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
 	test_line_count = 1 promisorlist &&
-	IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
-	git verify-pack --verbose "$IDX" | grep "$HASH"
+	IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+	git verify-pack --verbose "$IDX" >out &&
+	grep "$HASH" out
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/third_party/git/t/t0500-progress-display.sh b/third_party/git/t/t0500-progress-display.sh
new file mode 100755
index 000000000000..d2d088d9a0c3
--- /dev/null
+++ b/third_party/git/t/t0500-progress-display.sh
@@ -0,0 +1,286 @@
+#!/bin/sh
+
+test_description='progress display'
+
+. ./test-lib.sh
+
+show_cr () {
+	tr '\015' Q | sed -e "s/Q/<CR>\\$LF/g"
+}
+
+test_expect_success 'simple progress display' '
+	cat >expect <<-\EOF &&
+	Working hard: 1<CR>
+	Working hard: 2<CR>
+	Working hard: 5<CR>
+	Working hard: 5, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	update
+	progress 1
+	update
+	progress 2
+	progress 3
+	progress 4
+	update
+	progress 5
+	EOF
+	test-tool progress "Working hard" <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_expect_success 'progress display with total' '
+	cat >expect <<-\EOF &&
+	Working hard:  33% (1/3)<CR>
+	Working hard:  66% (2/3)<CR>
+	Working hard: 100% (3/3)<CR>
+	Working hard: 100% (3/3), done.
+	EOF
+
+	cat >in <<-\EOF &&
+	progress 1
+	progress 2
+	progress 3
+	EOF
+	test-tool progress --total=3 "Working hard" <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_expect_success 'progress display breaks long lines #1' '
+	sed -e "s/Z$//" >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6:   0% (100/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:   1% (1000/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:                   Z
+   10% (10000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	progress 100
+	progress 1000
+	progress 10000
+	progress 100000
+	EOF
+	test-tool progress --total=100000 \
+		"Working hard.......2.........3.........4.........5.........6" \
+		<in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_expect_success 'progress display breaks long lines #2' '
+	# Note: we do not need that many spaces after the title to cover up
+	# the last line before breaking the progress line.
+	sed -e "s/Z$//" >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6:   0% (1/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:   0% (2/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:                   Z
+   10% (10000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	update
+	progress 1
+	update
+	progress 2
+	progress 10000
+	progress 100000
+	EOF
+	test-tool progress --total=100000 \
+		"Working hard.......2.........3.........4.........5.........6" \
+		<in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_expect_success 'progress display breaks long lines #3 - even the first is too long' '
+	# Note: we do not actually need any spaces at the end of the title
+	# line, because there is no previous progress line to cover up.
+	sed -e "s/Z$//" >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6:                   Z
+   25% (25000/100000)<CR>
+   50% (50000/100000)<CR>
+   75% (75000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	progress 25000
+	progress 50000
+	progress 75000
+	progress 100000
+	EOF
+	test-tool progress --total=100000 \
+		"Working hard.......2.........3.........4.........5.........6" \
+		<in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_expect_success 'progress display breaks long lines #4 - title line matches terminal width' '
+	cat >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6.........7.........:
+   25% (25000/100000)<CR>
+   50% (50000/100000)<CR>
+   75% (75000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	progress 25000
+	progress 50000
+	progress 75000
+	progress 100000
+	EOF
+	test-tool progress --total=100000 \
+		"Working hard.......2.........3.........4.........5.........6.........7........." \
+		<in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+# Progress counter goes backwards, this should not happen in practice.
+test_expect_success 'progress shortens - crazy caller' '
+	cat >expect <<-\EOF &&
+	Working hard:  10% (100/1000)<CR>
+	Working hard:  20% (200/1000)<CR>
+	Working hard:   0% (1/1000)  <CR>
+	Working hard: 100% (1000/1000)<CR>
+	Working hard: 100% (1000/1000), done.
+	EOF
+
+	cat >in <<-\EOF &&
+	progress 100
+	progress 200
+	progress 1
+	progress 1000
+	EOF
+	test-tool progress --total=1000 "Working hard" <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_expect_success 'progress display with throughput' '
+	cat >expect <<-\EOF &&
+	Working hard: 10<CR>
+	Working hard: 20, 200.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 30, 300.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 40, 400.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 40, 400.00 KiB | 100.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	throughput 102400 1000
+	update
+	progress 10
+	throughput 204800 2000
+	update
+	progress 20
+	throughput 307200 3000
+	update
+	progress 30
+	throughput 409600 4000
+	update
+	progress 40
+	EOF
+	test-tool progress "Working hard" <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_expect_success 'progress display with throughput and total' '
+	cat >expect <<-\EOF &&
+	Working hard:  25% (10/40)<CR>
+	Working hard:  50% (20/40), 200.00 KiB | 100.00 KiB/s<CR>
+	Working hard:  75% (30/40), 300.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	throughput 102400 1000
+	progress 10
+	throughput 204800 2000
+	progress 20
+	throughput 307200 3000
+	progress 30
+	throughput 409600 4000
+	progress 40
+	EOF
+	test-tool progress --total=40 "Working hard" <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_expect_success 'cover up after throughput shortens' '
+	cat >expect <<-\EOF &&
+	Working hard: 1<CR>
+	Working hard: 2, 800.00 KiB | 400.00 KiB/s<CR>
+	Working hard: 3, 1.17 MiB | 400.00 KiB/s  <CR>
+	Working hard: 4, 1.56 MiB | 400.00 KiB/s<CR>
+	Working hard: 4, 1.56 MiB | 400.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	throughput 409600 1000
+	update
+	progress 1
+	throughput 819200 2000
+	update
+	progress 2
+	throughput 1228800 3000
+	update
+	progress 3
+	throughput 1638400 4000
+	update
+	progress 4
+	EOF
+	test-tool progress "Working hard" <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_expect_success 'cover up after throughput shortens a lot' '
+	cat >expect <<-\EOF &&
+	Working hard: 1<CR>
+	Working hard: 2, 1000.00 KiB | 1000.00 KiB/s<CR>
+	Working hard: 3, 3.00 MiB | 1.50 MiB/s      <CR>
+	Working hard: 3, 3.00 MiB | 1024.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	throughput 1 1000
+	update
+	progress 1
+	throughput 1024000 2000
+	update
+	progress 2
+	throughput 3145728 3000
+	update
+	progress 3
+	EOF
+	test-tool progress "Working hard" <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_i18ncmp expect out
+'
+
+test_done
diff --git a/third_party/git/t/t1011-read-tree-sparse-checkout.sh b/third_party/git/t/t1011-read-tree-sparse-checkout.sh
index ba71b159ba8c..eb44bafb5937 100755
--- a/third_party/git/t/t1011-read-tree-sparse-checkout.sh
+++ b/third_party/git/t/t1011-read-tree-sparse-checkout.sh
@@ -215,7 +215,6 @@ test_expect_success 'read-tree adds to worktree, dirty case' '
 '
 
 test_expect_success 'index removal and worktree narrowing at the same time' '
-	>empty &&
 	echo init.t >.git/info/sparse-checkout &&
 	echo sub/added >>.git/info/sparse-checkout &&
 	git checkout -f top &&
@@ -223,7 +222,7 @@ test_expect_success 'index removal and worktree narrowing at the same time' '
 	git checkout removed &&
 	git ls-files sub/added >result &&
 	test ! -f sub/added &&
-	test_cmp empty result
+	test_must_be_empty result
 '
 
 test_expect_success 'read-tree --reset removes outside worktree' '
diff --git a/third_party/git/t/t1014-read-tree-confusing.sh b/third_party/git/t/t1014-read-tree-confusing.sh
index 2f5a25d50386..da3376b3bb27 100755
--- a/third_party/git/t/t1014-read-tree-confusing.sh
+++ b/third_party/git/t/t1014-read-tree-confusing.sh
@@ -49,6 +49,7 @@ git~1
 .git.SPACE .git.{space}
 .\\\\.GIT\\\\foobar backslashes
 .git\\\\foobar backslashes2
+.git...:alternate-stream
 EOF
 
 test_expect_success 'utf-8 paths allowed with core.protectHFS off' '
diff --git a/third_party/git/t/t1050-large.sh b/third_party/git/t/t1050-large.sh
index dcb4dbba673e..184b479a2111 100755
--- a/third_party/git/t/t1050-large.sh
+++ b/third_party/git/t/t1050-large.sh
@@ -53,7 +53,8 @@ test_expect_success 'add a large file or two' '
 	for p in .git/objects/pack/pack-*.pack
 	do
 		count=$(( $count + 1 ))
-		if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
+		if test_path_is_file "$p" &&
+		   idx=${p%.pack}.idx && test_path_is_file "$idx"
 		then
 			continue
 		fi
@@ -65,7 +66,7 @@ test_expect_success 'add a large file or two' '
 	test $cnt = 2 &&
 	for l in .git/objects/??/??????????????????????????????????????
 	do
-		test -f "$l" || continue
+		test_path_is_file "$l" || continue
 		bad=t
 	done &&
 	test -z "$bad" &&
@@ -76,7 +77,8 @@ test_expect_success 'add a large file or two' '
 	for p in .git/objects/pack/pack-*.pack
 	do
 		count=$(( $count + 1 ))
-		if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
+		if test_path_is_file "$p" &&
+		   idx=${p%.pack}.idx && test_path_is_file "$idx"
 		then
 			continue
 		fi
@@ -111,7 +113,7 @@ test_expect_success 'packsize limit' '
 		count=0 &&
 		for pi in .git/objects/pack/pack-*.idx
 		do
-			test -f "$pi" && count=$(( $count + 1 ))
+			test_path_is_file "$pi" && count=$(( $count + 1 ))
 		done &&
 		test $count = 2 &&
 
@@ -194,15 +196,15 @@ test_expect_success 'pack-objects with large loose object' '
 	test_cmp huge actual
 '
 
-test_expect_success 'tar achiving' '
+test_expect_success 'tar archiving' '
 	git archive --format=tar HEAD >/dev/null
 '
 
-test_expect_success 'zip achiving, store only' '
+test_expect_success 'zip archiving, store only' '
 	git archive --format=zip -0 HEAD >/dev/null
 '
 
-test_expect_success 'zip achiving, deflate' '
+test_expect_success 'zip archiving, deflate' '
 	git archive --format=zip HEAD >/dev/null
 '
 
diff --git a/third_party/git/t/t1091-sparse-checkout-builtin.sh b/third_party/git/t/t1091-sparse-checkout-builtin.sh
new file mode 100755
index 000000000000..44a91205d600
--- /dev/null
+++ b/third_party/git/t/t1091-sparse-checkout-builtin.sh
@@ -0,0 +1,524 @@
+#!/bin/sh
+
+test_description='sparse checkout builtin tests'
+
+. ./test-lib.sh
+
+list_files() {
+	# Do not replace this with 'ls "$1"', as "ls" with BSD-lineage
+	# enables "-A" by default for root and ends up including ".git" and
+	# such in its output. (Note, though, that running the test suite as
+	# root is generally not recommended.)
+	(cd "$1" && printf '%s\n' *)
+}
+
+check_files() {
+	list_files "$1" >actual &&
+	shift &&
+	printf "%s\n" $@ >expect &&
+	test_cmp expect actual
+}
+
+test_expect_success 'setup' '
+	git init repo &&
+	(
+		cd repo &&
+		echo "initial" >a &&
+		mkdir folder1 folder2 deep &&
+		mkdir deep/deeper1 deep/deeper2 &&
+		mkdir deep/deeper1/deepest &&
+		cp a folder1 &&
+		cp a folder2 &&
+		cp a deep &&
+		cp a deep/deeper1 &&
+		cp a deep/deeper2 &&
+		cp a deep/deeper1/deepest &&
+		git add . &&
+		git commit -m "initial commit"
+	)
+'
+
+test_expect_success 'git sparse-checkout list (empty)' '
+	git -C repo sparse-checkout list >list 2>err &&
+	test_must_be_empty list &&
+	test_i18ngrep "this worktree is not sparse (sparse-checkout file may not exist)" err
+'
+
+test_expect_success 'git sparse-checkout list (populated)' '
+	test_when_finished rm -f repo/.git/info/sparse-checkout &&
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/folder1/*
+	/deep/
+	**/a
+	!*bin*
+	EOF
+	cp repo/.git/info/sparse-checkout expect &&
+	git -C repo sparse-checkout list >list &&
+	test_cmp expect list
+'
+
+test_expect_success 'git sparse-checkout init' '
+	git -C repo sparse-checkout init &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	test_cmp_config -C repo true core.sparsecheckout &&
+	check_files repo a
+'
+
+test_expect_success 'git sparse-checkout list after init' '
+	git -C repo sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'init with existing sparse-checkout' '
+	echo "*folder*" >> repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout init &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	*folder*
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1 folder2
+'
+
+test_expect_success 'clone --sparse' '
+	git clone --sparse "file://$(pwd)/repo" clone &&
+	git -C clone sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect actual &&
+	check_files clone a
+'
+
+test_expect_success 'set enables config' '
+	git init empty-config &&
+	(
+		cd empty-config &&
+		test_commit test file &&
+		test_path_is_missing .git/config.worktree &&
+		test_must_fail git sparse-checkout set nothing &&
+		test_path_is_file .git/config.worktree &&
+		test_must_fail git config core.sparseCheckout &&
+		git sparse-checkout set "/*" &&
+		test_cmp_config true core.sparseCheckout
+	)
+'
+
+test_expect_success 'set sparse-checkout using builtin' '
+	git -C repo sparse-checkout set "/*" "!/*/" "*folder*" &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	*folder*
+	EOF
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1 folder2
+'
+
+test_expect_success 'set sparse-checkout using --stdin' '
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/folder1/
+	/folder2/
+	EOF
+	git -C repo sparse-checkout set --stdin <expect &&
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo "a folder1 folder2"
+'
+
+test_expect_success 'add to sparse-checkout' '
+	cat repo/.git/info/sparse-checkout >expect &&
+	cat >add <<-\EOF &&
+	pattern1
+	/folder1/
+	pattern2
+	EOF
+	cat add >>expect &&
+	git -C repo sparse-checkout add --stdin <add &&
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo "a folder1 folder2"
+'
+
+test_expect_success 'cone mode: match patterns' '
+	git -C repo config --worktree core.sparseCheckoutCone true &&
+	rm -rf repo/a repo/folder1 repo/folder2 &&
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_i18ngrep ! "disabling cone patterns" err &&
+	git -C repo reset --hard &&
+	check_files repo a folder1 folder2
+'
+
+test_expect_success 'cone mode: warn on bad pattern' '
+	test_when_finished mv sparse-checkout repo/.git/info/ &&
+	cp repo/.git/info/sparse-checkout . &&
+	echo "!/deep/deeper/*" >>repo/.git/info/sparse-checkout &&
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_i18ngrep "unrecognized negative pattern" err
+'
+
+test_expect_success 'sparse-checkout disable' '
+	test_when_finished rm -rf repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout disable &&
+	test_path_is_file repo/.git/info/sparse-checkout &&
+	git -C repo config --list >config &&
+	test_must_fail git config core.sparseCheckout &&
+	check_files repo a deep folder1 folder2
+'
+
+test_expect_success 'cone mode: init and set' '
+	git -C repo sparse-checkout init --cone &&
+	git -C repo config --list >config &&
+	test_i18ngrep "core.sparsecheckoutcone=true" config &&
+	list_files repo >dir  &&
+	echo a >expect &&
+	test_cmp expect dir &&
+	git -C repo sparse-checkout set deep/deeper1/deepest/ 2>err &&
+	test_must_be_empty err &&
+	check_files repo a deep &&
+	check_files repo/deep a deeper1 &&
+	check_files repo/deep/deeper1 a deepest &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	!/deep/deeper1/*/
+	/deep/deeper1/deepest/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout set --stdin 2>err <<-\EOF &&
+	folder1
+	folder2
+	EOF
+	test_must_be_empty err &&
+	check_files repo a folder1 folder2
+'
+
+test_expect_success 'cone mode: list' '
+	cat >expect <<-\EOF &&
+	folder1
+	folder2
+	EOF
+	git -C repo sparse-checkout set --stdin <expect &&
+	git -C repo sparse-checkout list >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp expect actual
+'
+
+test_expect_success 'cone mode: set with nested folders' '
+	git -C repo sparse-checkout set deep deep/deeper1/deepest 2>err &&
+	test_line_count = 0 err &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	EOF
+	test_cmp repo/.git/info/sparse-checkout expect
+'
+
+test_expect_success 'cone mode: add independent path' '
+	git -C repo sparse-checkout set deep/deeper1 &&
+	git -C repo sparse-checkout add folder1 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	/folder1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep folder1
+'
+
+test_expect_success 'cone mode: add sibling path' '
+	git -C repo sparse-checkout set deep/deeper1 &&
+	git -C repo sparse-checkout add deep/deeper2 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	/deep/deeper2/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep
+'
+
+test_expect_success 'cone mode: add parent path' '
+	git -C repo sparse-checkout set deep/deeper1 folder1 &&
+	git -C repo sparse-checkout add deep &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	/folder1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep folder1
+'
+
+test_expect_success 'revert to old sparse-checkout on bad update' '
+	test_when_finished git -C repo reset --hard &&
+	git -C repo sparse-checkout set deep &&
+	echo update >repo/deep/deeper2/a &&
+	cp repo/.git/info/sparse-checkout expect &&
+	test_must_fail git -C repo sparse-checkout set deep/deeper1 2>err &&
+	test_i18ngrep "cannot set sparse-checkout patterns" err &&
+	test_cmp repo/.git/info/sparse-checkout expect &&
+	check_files repo/deep a deeper1 deeper2
+'
+
+test_expect_success 'revert to old sparse-checkout on empty update' '
+	git init empty-test &&
+	(
+		echo >file &&
+		git add file &&
+		git commit -m "test" &&
+		test_must_fail git sparse-checkout set nothing 2>err &&
+		test_i18ngrep "Sparse checkout leaves no entry on working directory" err &&
+		test_i18ngrep ! ".git/index.lock" err &&
+		git sparse-checkout set file
+	)
+'
+
+test_expect_success 'fail when lock is taken' '
+	test_when_finished rm -rf repo/.git/info/sparse-checkout.lock &&
+	touch repo/.git/info/sparse-checkout.lock &&
+	test_must_fail git -C repo sparse-checkout set deep 2>err &&
+	test_i18ngrep "Unable to create .*\.lock" err
+'
+
+test_expect_success '.gitignore should not warn about cone mode' '
+	git -C repo config --worktree core.sparseCheckoutCone true &&
+	echo "**/bin/*" >repo/.gitignore &&
+	git -C repo reset --hard 2>err &&
+	test_i18ngrep ! "disabling cone patterns" err
+'
+
+test_expect_success 'sparse-checkout (init|set|disable) fails with dirty status' '
+	git clone repo dirty &&
+	echo dirty >dirty/folder1/a &&
+	test_must_fail git -C dirty sparse-checkout init &&
+	test_must_fail git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
+	test_must_fail git -C dirty sparse-checkout disable &&
+	git -C dirty reset --hard &&
+	git -C dirty sparse-checkout init &&
+	git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
+	git -C dirty sparse-checkout disable
+'
+
+test_expect_success 'cone mode: set with core.ignoreCase=true' '
+	git -C repo sparse-checkout init --cone &&
+	git -C repo -c core.ignoreCase=true sparse-checkout set folder1 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/folder1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1
+'
+
+test_expect_success 'interaction with submodules' '
+	git clone repo super &&
+	(
+		cd super &&
+		mkdir modules &&
+		git submodule add ../repo modules/child &&
+		git add . &&
+		git commit -m "add submodule" &&
+		git sparse-checkout init --cone &&
+		git sparse-checkout set folder1
+	) &&
+	check_files super a folder1 modules &&
+	check_files super/modules/child a deep folder1 folder2
+'
+
+test_expect_success 'different sparse-checkouts with worktrees' '
+	git -C repo worktree add --detach ../worktree &&
+	check_files worktree "a deep folder1 folder2" &&
+	git -C worktree sparse-checkout init --cone &&
+	git -C repo sparse-checkout set folder1 &&
+	git -C worktree sparse-checkout set deep/deeper1 &&
+	check_files repo a folder1 &&
+	check_files worktree a deep
+'
+
+test_expect_success 'set using filename keeps file on-disk' '
+	git -C repo sparse-checkout set a deep &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/a/
+	/deep/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep
+'
+
+check_read_tree_errors () {
+	REPO=$1
+	FILES=$2
+	ERRORS=$3
+	git -C $REPO -c core.sparseCheckoutCone=false read-tree -mu HEAD 2>err &&
+	test_must_be_empty err &&
+	check_files $REPO "$FILES" &&
+	git -C $REPO read-tree -mu HEAD 2>err &&
+	if test -z "$ERRORS"
+	then
+		test_must_be_empty err
+	else
+		test_i18ngrep "$ERRORS" err
+	fi &&
+	check_files $REPO $FILES
+}
+
+test_expect_success 'pattern-checks: /A/**' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/folder1/**
+	EOF
+	check_read_tree_errors repo "a folder1" "disabling cone pattern matching"
+'
+
+test_expect_success 'pattern-checks: /A/**/B/' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/deep/**/deepest
+	EOF
+	check_read_tree_errors repo "a deep" "disabling cone pattern matching" &&
+	check_files repo/deep "deeper1" &&
+	check_files repo/deep/deeper1 "deepest"
+'
+
+test_expect_success 'pattern-checks: too short' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/
+	EOF
+	check_read_tree_errors repo "a" "disabling cone pattern matching"
+'
+test_expect_success 'pattern-checks: not too short' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/b/
+	EOF
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_must_be_empty err &&
+	check_files repo a
+'
+
+test_expect_success 'pattern-checks: trailing "*"' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/a*
+	EOF
+	check_read_tree_errors repo "a" "disabling cone pattern matching"
+'
+
+test_expect_success 'pattern-checks: starting "*"' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	*eep/
+	EOF
+	check_read_tree_errors repo "a deep" "disabling cone pattern matching"
+'
+
+test_expect_success 'pattern-checks: contained glob characters' '
+	for c in "[a]" "\\" "?" "*"
+	do
+		cat >repo/.git/info/sparse-checkout <<-EOF &&
+		/*
+		!/*/
+		something$c-else/
+		EOF
+		check_read_tree_errors repo "a" "disabling cone pattern matching"
+	done
+'
+
+test_expect_success BSLASHPSPEC 'pattern-checks: escaped characters' '
+	git clone repo escaped &&
+	TREEOID=$(git -C escaped rev-parse HEAD:folder1) &&
+	NEWTREE=$(git -C escaped mktree <<-EOF
+	$(git -C escaped ls-tree HEAD)
+	040000 tree $TREEOID	zbad\\dir
+	040000 tree $TREEOID	zdoes*exist
+	040000 tree $TREEOID	zglob[!a]?
+	EOF
+	) &&
+	COMMIT=$(git -C escaped commit-tree $NEWTREE -p HEAD) &&
+	git -C escaped reset --hard $COMMIT &&
+	check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? &&
+	git -C escaped sparse-checkout init --cone &&
+	git -C escaped sparse-checkout set zbad\\dir/bogus "zdoes*not*exist" "zdoes*exist" "zglob[!a]?" &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/zbad\\dir/
+	!/zbad\\dir/*/
+	/zbad\\dir/bogus/
+	/zdoes\*exist/
+	/zdoes\*not\*exist/
+	/zglob\[!a]\?/
+	EOF
+	test_cmp expect escaped/.git/info/sparse-checkout &&
+	check_read_tree_errors escaped "a zbad\\dir zdoes*exist zglob[!a]?" &&
+	git -C escaped ls-tree -d --name-only HEAD >list-expect &&
+	git -C escaped sparse-checkout set --stdin <list-expect &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	/folder1/
+	/folder2/
+	/zbad\\dir/
+	/zdoes\*exist/
+	/zglob\[!a]\?/
+	EOF
+	test_cmp expect escaped/.git/info/sparse-checkout &&
+	check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? &&
+	git -C escaped sparse-checkout list >list-actual &&
+	test_cmp list-expect list-actual
+'
+
+test_expect_success MINGW 'cone mode replaces backslashes with slashes' '
+	git -C repo sparse-checkout set deep\\deeper1 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep &&
+	check_files repo/deep a deeper1
+'
+
+test_done
diff --git a/third_party/git/t/t1300-config.sh b/third_party/git/t/t1300-config.sh
index 428177c390db..97ebfe1f9d5c 100755
--- a/third_party/git/t/t1300-config.sh
+++ b/third_party/git/t/t1300-config.sh
@@ -1191,47 +1191,47 @@ test_expect_success 'old-fashioned settings are case insensitive' '
 	test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V.A]
-		r = value1
+	[V.A]
+	r = value1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V.A]
-		Qr = value2
+	[V.A]
+	Qr = value2
 	EOF
 	git config -f testConfig_actual "v.a.r" value2 &&
 	test_cmp testConfig_expect testConfig_actual &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V.A]
-		r = value1
+	[V.A]
+	r = value1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V.A]
-		QR = value2
+	[V.A]
+	QR = value2
 	EOF
 	git config -f testConfig_actual "V.a.R" value2 &&
 	test_cmp testConfig_expect testConfig_actual &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V.A]
-		r = value1
+	[V.A]
+	r = value1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V.A]
-		r = value1
-		Qr = value2
+	[V.A]
+	r = value1
+	Qr = value2
 	EOF
 	git config -f testConfig_actual "V.A.r" value2 &&
 	test_cmp testConfig_expect testConfig_actual &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V.A]
-		r = value1
+	[V.A]
+	r = value1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V.A]
-		r = value1
-		Qr = value2
+	[V.A]
+	r = value1
+	Qr = value2
 	EOF
 	git config -f testConfig_actual "v.A.r" value2 &&
 	test_cmp testConfig_expect testConfig_actual
@@ -1241,26 +1241,26 @@ test_expect_success 'setting different case sensitive subsections ' '
 	test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V "A"]
-		R = v1
-		[K "E"]
-		Y = v1
-		[a "b"]
-		c = v1
-		[d "e"]
-		f = v1
+	[V "A"]
+	R = v1
+	[K "E"]
+	Y = v1
+	[a "b"]
+	c = v1
+	[d "e"]
+	f = v1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V "A"]
-		Qr = v2
-		[K "E"]
-		Qy = v2
-		[a "b"]
-		Qc = v2
-		[d "e"]
-		f = v1
-		[d "E"]
-		Qf = v2
+	[V "A"]
+	Qr = v2
+	[K "E"]
+	Qy = v2
+	[a "b"]
+	Qc = v2
+	[d "e"]
+	f = v1
+	[d "E"]
+	Qf = v2
 	EOF
 	# exact match
 	git config -f testConfig_actual a.b.c v2 &&
@@ -1294,26 +1294,25 @@ test_expect_success 'git -c is not confused by empty environment' '
 	GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list
 '
 
-sq="'"
 test_expect_success 'detect bogus GIT_CONFIG_PARAMETERS' '
 	cat >expect <<-\EOF &&
 	env.one one
 	env.two two
 	EOF
-	GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq} ${sq}env.two=two${sq}" \
+	GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ} ${SQ}env.two=two${SQ}" \
 		git config --get-regexp "env.*" >actual &&
 	test_cmp expect actual &&
 
 	cat >expect <<-EOF &&
-	env.one one${sq}
+	env.one one${SQ}
 	env.two two
 	EOF
-	GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq$sq$sq ${sq}env.two=two${sq}" \
+	GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ}\\$SQ$SQ$SQ ${SQ}env.two=two${SQ}" \
 		git config --get-regexp "env.*" >actual &&
 	test_cmp expect actual &&
 
 	test_must_fail env \
-		GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq ${sq}env.two=two${sq}" \
+		GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ}\\$SQ ${SQ}env.two=two${SQ}" \
 		git config --get-regexp "env.*"
 '
 
@@ -1409,6 +1408,8 @@ test_expect_success 'urlmatch favors more specific URLs' '
 		cookieFile = /tmp/wildcard.txt
 	[http "https://*.example.com/wildcardwithsubdomain"]
 		cookieFile = /tmp/wildcardwithsubdomain.txt
+	[http "https://*.example.*"]
+		cookieFile = /tmp/multiwildcard.txt
 	[http "https://trailing.example.com"]
 		cookieFile = /tmp/trailing.txt
 	[http "https://user@*.example.com/"]
@@ -1455,6 +1456,10 @@ test_expect_success 'urlmatch favors more specific URLs' '
 
 	echo http.cookiefile /tmp/sub.txt >expect &&
 	git config --get-urlmatch HTTP https://user@sub.example.com >actual &&
+	test_cmp expect actual &&
+
+	echo http.cookiefile /tmp/multiwildcard.txt >expect &&
+	git config --get-urlmatch HTTP https://wildcard.example.org >actual &&
 	test_cmp expect actual
 '
 
@@ -1623,40 +1628,40 @@ test_expect_success 'set up --show-origin tests' '
 	INCLUDE_DIR="$HOME/include" &&
 	mkdir -p "$INCLUDE_DIR" &&
 	cat >"$INCLUDE_DIR"/absolute.include <<-\EOF &&
-		[user]
-			absolute = include
+	[user]
+		absolute = include
 	EOF
 	cat >"$INCLUDE_DIR"/relative.include <<-\EOF &&
-		[user]
-			relative = include
+	[user]
+		relative = include
 	EOF
 	cat >"$HOME"/.gitconfig <<-EOF &&
-		[user]
-			global = true
-			override = global
-		[include]
-			path = "$INCLUDE_DIR/absolute.include"
+	[user]
+		global = true
+		override = global
+	[include]
+		path = "$INCLUDE_DIR/absolute.include"
 	EOF
 	cat >.git/config <<-\EOF
-		[user]
-			local = true
-			override = local
-		[include]
-			path = ../include/relative.include
+	[user]
+		local = true
+		override = local
+	[include]
+		path = ../include/relative.include
 	EOF
 '
 
 test_expect_success '--show-origin with --list' '
 	cat >expect <<-EOF &&
-		file:$HOME/.gitconfig	user.global=true
-		file:$HOME/.gitconfig	user.override=global
-		file:$HOME/.gitconfig	include.path=$INCLUDE_DIR/absolute.include
-		file:$INCLUDE_DIR/absolute.include	user.absolute=include
-		file:.git/config	user.local=true
-		file:.git/config	user.override=local
-		file:.git/config	include.path=../include/relative.include
-		file:.git/../include/relative.include	user.relative=include
-		command line:	user.cmdline=true
+	file:$HOME/.gitconfig	user.global=true
+	file:$HOME/.gitconfig	user.override=global
+	file:$HOME/.gitconfig	include.path=$INCLUDE_DIR/absolute.include
+	file:$INCLUDE_DIR/absolute.include	user.absolute=include
+	file:.git/config	user.local=true
+	file:.git/config	user.override=local
+	file:.git/config	include.path=../include/relative.include
+	file:.git/../include/relative.include	user.relative=include
+	command line:	user.cmdline=true
 	EOF
 	git -c user.cmdline=true config --list --show-origin >output &&
 	test_cmp expect output
@@ -1664,16 +1669,16 @@ test_expect_success '--show-origin with --list' '
 
 test_expect_success '--show-origin with --list --null' '
 	cat >expect <<-EOF &&
-		file:$HOME/.gitconfigQuser.global
-		trueQfile:$HOME/.gitconfigQuser.override
-		globalQfile:$HOME/.gitconfigQinclude.path
-		$INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute
-		includeQfile:.git/configQuser.local
-		trueQfile:.git/configQuser.override
-		localQfile:.git/configQinclude.path
-		../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
-		includeQcommand line:Quser.cmdline
-		trueQ
+	file:$HOME/.gitconfigQuser.global
+	trueQfile:$HOME/.gitconfigQuser.override
+	globalQfile:$HOME/.gitconfigQinclude.path
+	$INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute
+	includeQfile:.git/configQuser.local
+	trueQfile:.git/configQuser.override
+	localQfile:.git/configQinclude.path
+	../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
+	includeQcommand line:Quser.cmdline
+	trueQ
 	EOF
 	git -c user.cmdline=true config --null --list --show-origin >output.raw &&
 	nul_to_q <output.raw >output &&
@@ -1685,9 +1690,9 @@ test_expect_success '--show-origin with --list --null' '
 
 test_expect_success '--show-origin with single file' '
 	cat >expect <<-\EOF &&
-		file:.git/config	user.local=true
-		file:.git/config	user.override=local
-		file:.git/config	include.path=../include/relative.include
+	file:.git/config	user.local=true
+	file:.git/config	user.override=local
+	file:.git/config	include.path=../include/relative.include
 	EOF
 	git config --local --list --show-origin >output &&
 	test_cmp expect output
@@ -1695,8 +1700,8 @@ test_expect_success '--show-origin with single file' '
 
 test_expect_success '--show-origin with --get-regexp' '
 	cat >expect <<-EOF &&
-		file:$HOME/.gitconfig	user.global true
-		file:.git/config	user.local true
+	file:$HOME/.gitconfig	user.global true
+	file:.git/config	user.local true
 	EOF
 	git config --show-origin --get-regexp "user\.[g|l].*" >output &&
 	test_cmp expect output
@@ -1704,31 +1709,36 @@ test_expect_success '--show-origin with --get-regexp' '
 
 test_expect_success '--show-origin getting a single key' '
 	cat >expect <<-\EOF &&
-		file:.git/config	local
+	file:.git/config	local
 	EOF
 	git config --show-origin user.override >output &&
 	test_cmp expect output
 '
 
 test_expect_success 'set up custom config file' '
-	CUSTOM_CONFIG_FILE="file\" (dq) and spaces.conf" &&
+	CUSTOM_CONFIG_FILE="custom.conf" &&
 	cat >"$CUSTOM_CONFIG_FILE" <<-\EOF
-		[user]
-			custom = true
+	[user]
+		custom = true
 	EOF
 '
 
+test_expect_success !MINGW 'set up custom config file with special name characters' '
+	WEIRDLY_NAMED_FILE="file\" (dq) and spaces.conf" &&
+	cp "$CUSTOM_CONFIG_FILE" "$WEIRDLY_NAMED_FILE"
+'
+
 test_expect_success !MINGW '--show-origin escape special file name characters' '
 	cat >expect <<-\EOF &&
-		file:"file\" (dq) and spaces.conf"	user.custom=true
+	file:"file\" (dq) and spaces.conf"	user.custom=true
 	EOF
-	git config --file "$CUSTOM_CONFIG_FILE" --show-origin --list >output &&
+	git config --file "$WEIRDLY_NAMED_FILE" --show-origin --list >output &&
 	test_cmp expect output
 '
 
 test_expect_success '--show-origin stdin' '
 	cat >expect <<-\EOF &&
-		standard input:	user.custom=true
+	standard input:	user.custom=true
 	EOF
 	git config --file - --show-origin --list <"$CUSTOM_CONFIG_FILE" >output &&
 	test_cmp expect output
@@ -1736,11 +1746,11 @@ test_expect_success '--show-origin stdin' '
 
 test_expect_success '--show-origin stdin with file include' '
 	cat >"$INCLUDE_DIR"/stdin.include <<-EOF &&
-		[user]
-			stdin = include
+	[user]
+		stdin = include
 	EOF
 	cat >expect <<-EOF &&
-		file:$INCLUDE_DIR/stdin.include	include
+	file:$INCLUDE_DIR/stdin.include	include
 	EOF
 	echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" |
 	git config --show-origin --includes --file - user.stdin >output &&
@@ -1748,18 +1758,18 @@ test_expect_success '--show-origin stdin with file include' '
 	test_cmp expect output
 '
 
-test_expect_success !MINGW '--show-origin blob' '
+test_expect_success '--show-origin blob' '
 	blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") &&
 	cat >expect <<-EOF &&
-		blob:$blob	user.custom=true
+	blob:$blob	user.custom=true
 	EOF
 	git config --blob=$blob --show-origin --list >output &&
 	test_cmp expect output
 '
 
-test_expect_success !MINGW '--show-origin blob ref' '
+test_expect_success '--show-origin blob ref' '
 	cat >expect <<-\EOF &&
-		blob:"master:file\" (dq) and spaces.conf"	user.custom=true
+	blob:master:custom.conf	user.custom=true
 	EOF
 	git add "$CUSTOM_CONFIG_FILE" &&
 	git commit -m "new config file" &&
@@ -1767,6 +1777,65 @@ test_expect_success !MINGW '--show-origin blob ref' '
 	test_cmp expect output
 '
 
+test_expect_success '--show-scope with --list' '
+	cat >expect <<-EOF &&
+	global	user.global=true
+	global	user.override=global
+	global	include.path=$INCLUDE_DIR/absolute.include
+	global	user.absolute=include
+	local	user.local=true
+	local	user.override=local
+	local	include.path=../include/relative.include
+	local	user.relative=include
+	command	user.cmdline=true
+	EOF
+	git -c user.cmdline=true config --list --show-scope >output &&
+	test_cmp expect output
+'
+
+test_expect_success !MINGW '--show-scope with --blob' '
+	blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") &&
+	cat >expect <<-EOF &&
+	command	user.custom=true
+	EOF
+	git config --blob=$blob --show-scope --list >output &&
+	test_cmp expect output
+'
+
+test_expect_success '--show-scope with --local' '
+	cat >expect <<-\EOF &&
+	local	user.local=true
+	local	user.override=local
+	local	include.path=../include/relative.include
+	EOF
+	git config --local --list --show-scope >output &&
+	test_cmp expect output
+'
+
+test_expect_success '--show-scope getting a single value' '
+	cat >expect <<-\EOF &&
+	local	true
+	EOF
+	git config --show-scope --get user.local >output &&
+	test_cmp expect output
+'
+
+test_expect_success '--show-scope with --show-origin' '
+	cat >expect <<-EOF &&
+	global	file:$HOME/.gitconfig	user.global=true
+	global	file:$HOME/.gitconfig	user.override=global
+	global	file:$HOME/.gitconfig	include.path=$INCLUDE_DIR/absolute.include
+	global	file:$INCLUDE_DIR/absolute.include	user.absolute=include
+	local	file:.git/config	user.local=true
+	local	file:.git/config	user.override=local
+	local	file:.git/config	include.path=../include/relative.include
+	local	file:.git/../include/relative.include	user.relative=include
+	command	command line:	user.cmdline=true
+	EOF
+	git -c user.cmdline=true config --list --show-origin --show-scope >output &&
+	test_cmp expect output
+'
+
 test_expect_success '--local requires a repo' '
 	# we expect 128 to ensure that we do not simply
 	# fail to find anything and return code "1"
diff --git a/third_party/git/t/t1305-config-include.sh b/third_party/git/t/t1305-config-include.sh
index d20b4d150d42..f1e1b289f989 100755
--- a/third_party/git/t/t1305-config-include.sh
+++ b/third_party/git/t/t1305-config-include.sh
@@ -63,7 +63,7 @@ test_expect_success 'listing includes option and expansion' '
 	test.one=1
 	EOF
 	git config --list >actual.full &&
-	grep -v ^core actual.full >actual &&
+	grep -v -e ^core -e ^extensions actual.full >actual &&
 	test_cmp expect actual
 '
 
diff --git a/third_party/git/t/t1306-xdg-files.sh b/third_party/git/t/t1306-xdg-files.sh
index 21e139a313be..dd87b43be1a6 100755
--- a/third_party/git/t/t1306-xdg-files.sh
+++ b/third_party/git/t/t1306-xdg-files.sh
@@ -153,7 +153,7 @@ test_expect_success 'Checking attributes in both XDG and local attributes files'
 
 
 test_expect_success 'Checking attributes in a non-XDG global attributes file' '
-	test_might_fail rm .gitattributes &&
+	rm -f .gitattributes &&
 	echo "f attr_f=test" >"$HOME"/my_gitattributes &&
 	git config core.attributesfile "$HOME"/my_gitattributes &&
 	echo "f: attr_f: test" >expected &&
@@ -165,7 +165,7 @@ test_expect_success 'Checking attributes in a non-XDG global attributes file' '
 test_expect_success 'write: xdg file exists and ~/.gitconfig doesn'\''t' '
 	mkdir -p "$HOME"/.config/git &&
 	>"$HOME"/.config/git/config &&
-	test_might_fail rm "$HOME"/.gitconfig &&
+	rm -f "$HOME"/.gitconfig &&
 	git config --global user.name "write_config" &&
 	echo "[user]" >expected &&
 	echo "	name = write_config" >>expected &&
@@ -183,8 +183,8 @@ test_expect_success 'write: xdg file exists and ~/.gitconfig exists' '
 
 
 test_expect_success 'write: ~/.config/git/ exists and config file doesn'\''t' '
-	test_might_fail rm "$HOME"/.gitconfig &&
-	test_might_fail rm "$HOME"/.config/git/config &&
+	rm -f "$HOME"/.gitconfig &&
+	rm -f "$HOME"/.config/git/config &&
 	git config --global user.name "write_gitconfig" &&
 	echo "[user]" >expected &&
 	echo "	name = write_gitconfig" >>expected &&
diff --git a/third_party/git/t/t1307-config-blob.sh b/third_party/git/t/t1307-config-blob.sh
index 37dc689d8c98..002e6d3388e2 100755
--- a/third_party/git/t/t1307-config-blob.sh
+++ b/third_party/git/t/t1307-config-blob.sh
@@ -74,7 +74,7 @@ test_expect_success 'can parse blob ending with CR' '
 '
 
 test_expect_success 'config --blob outside of a repository is an error' '
-	test_must_fail nongit git config --blob=foo --list
+	nongit test_must_fail git config --blob=foo --list
 '
 
 test_done
diff --git a/third_party/git/t/t1308-config-set.sh b/third_party/git/t/t1308-config-set.sh
index d0a2727b850a..3a527e3a8438 100755
--- a/third_party/git/t/t1308-config-set.sh
+++ b/third_party/git/t/t1308-config-set.sh
@@ -166,14 +166,14 @@ test_expect_success 'find value with highest priority from a configset' '
 '
 
 test_expect_success 'find value_list for a key from a configset' '
-	cat >except <<-\EOF &&
+	cat >expect <<-\EOF &&
+	lama
+	ball
 	sam
 	bat
 	hask
-	lama
-	ball
 	EOF
-	test-tool config configset_get_value case.baz config2 .git/config >actual &&
+	test-tool config configset_get_value_multi case.baz config2 .git/config >actual &&
 	test_cmp expect actual
 '
 
@@ -238,8 +238,8 @@ test_expect_success 'error on modifying repo config without repo' '
 
 cmdline_config="'foo.bar=from-cmdline'"
 test_expect_success 'iteration shows correct origins' '
-	echo "[foo]bar = from-repo" >.git/config &&
-	echo "[foo]bar = from-home" >.gitconfig &&
+	printf "[ignore]\n\tthis = please\n[foo]bar = from-repo\n" >.git/config &&
+	printf "[foo]\n\tbar = from-home\n" >.gitconfig &&
 	if test_have_prereq MINGW
 	then
 		# Use Windows path (i.e. *not* $HOME)
@@ -253,19 +253,29 @@ test_expect_success 'iteration shows correct origins' '
 	value=from-home
 	origin=file
 	name=$HOME_GITCONFIG
+	lno=2
 	scope=global
 
+	key=ignore.this
+	value=please
+	origin=file
+	name=.git/config
+	lno=2
+	scope=local
+
 	key=foo.bar
 	value=from-repo
 	origin=file
 	name=.git/config
-	scope=repo
+	lno=3
+	scope=local
 
 	key=foo.bar
 	value=from-cmdline
 	origin=command line
 	name=
-	scope=cmdline
+	lno=-1
+	scope=command
 	EOF
 	GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
 	test_cmp expect actual
diff --git a/third_party/git/t/t1309-early-config.sh b/third_party/git/t/t1309-early-config.sh
index 0c37e7180d1c..ebb8e1aecbf4 100755
--- a/third_party/git/t/t1309-early-config.sh
+++ b/third_party/git/t/t1309-early-config.sh
@@ -29,7 +29,7 @@ test_expect_success 'ceiling' '
 		cd sub &&
 		test-tool config read_early_config early.config
 	) >output &&
-	test -z "$(cat output)"
+	test_must_be_empty output
 '
 
 test_expect_success 'ceiling #2' '
@@ -91,7 +91,12 @@ test_expect_failure 'ignore .git/ with invalid config' '
 
 test_expect_success 'early config and onbranch' '
 	echo "[broken" >broken &&
-	test_with_config "[includeif \"onbranch:refs/heads/master\"]path=../broken"
+	test_with_config "[includeif \"onbranch:master\"]path=../broken"
+'
+
+test_expect_success 'onbranch config outside of git repo' '
+	test_config_global includeIf.onbranch:master.path non-existent &&
+	nongit git help
 '
 
 test_done
diff --git a/third_party/git/t/t1400-update-ref.sh b/third_party/git/t/t1400-update-ref.sh
index 1fbd94040818..a6224ef65fe9 100755
--- a/third_party/git/t/t1400-update-ref.sh
+++ b/third_party/git/t/t1400-update-ref.sh
@@ -344,14 +344,16 @@ test_expect_success "verifying $m's log (logged by config)" '
 	test_cmp expect .git/logs/$m
 '
 
-git update-ref $m $D
-cat >.git/logs/$m <<EOF
-$Z $C $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500
-$C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500
-$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500
-$F $Z $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500
-$Z $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500
-EOF
+test_expect_success 'set up for querying the reflog' '
+	git update-ref $m $D &&
+	cat >.git/logs/$m <<-EOF
+	$Z $C $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500
+	$C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500
+	$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500
+	$F $Z $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500
+	$Z $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500
+	EOF
+'
 
 ed="Thu, 26 May 2005 18:32:00 -0500"
 gd="Thu, 26 May 2005 18:33:00 -0500"
@@ -359,55 +361,67 @@ ld="Thu, 26 May 2005 18:43:00 -0500"
 test_expect_success 'Query "master@{May 25 2005}" (before history)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify "master@{May 25 2005}" >o 2>e &&
-	test $C = $(cat o) &&
-	test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	echo "warning: log for '\''master'\'' only goes back to $ed" >expect &&
+	test_i18ncmp expect e
 '
 test_expect_success 'Query master@{2005-05-25} (before history)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify master@{2005-05-25} >o 2>e &&
-	test $C = $(cat o) &&
-	test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	echo "warning: log for '\''master'\'' only goes back to $ed" >expect &&
+	test_i18ncmp expect e
 '
 test_expect_success 'Query "master@{May 26 2005 23:31:59}" (1 second before history)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify "master@{May 26 2005 23:31:59}" >o 2>e &&
-	test $C = $(cat o) &&
-	test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	echo "warning: log for '\''master'\'' only goes back to $ed" >expect &&
+	test_i18ncmp expect e
 '
 test_expect_success 'Query "master@{May 26 2005 23:32:00}" (exactly history start)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify "master@{May 26 2005 23:32:00}" >o 2>e &&
-	test $C = $(cat o) &&
-	test "" = "$(cat e)"
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 '
 test_expect_success 'Query "master@{May 26 2005 23:32:30}" (first non-creation change)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify "master@{May 26 2005 23:32:30}" >o 2>e &&
-	test $A = $(cat o) &&
-	test "" = "$(cat e)"
+	echo "$A" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 '
 test_expect_success 'Query "master@{2005-05-26 23:33:01}" (middle of history with gap)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e &&
-	test $B = $(cat o) &&
+	echo "$B" >expect &&
+	test_cmp expect o &&
 	test_i18ngrep -F "warning: log for ref $m has gap after $gd" e
 '
 test_expect_success 'Query "master@{2005-05-26 23:38:00}" (middle of history)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify "master@{2005-05-26 23:38:00}" >o 2>e &&
-	test $Z = $(cat o) &&
-	test "" = "$(cat e)"
+	echo "$Z" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 '
 test_expect_success 'Query "master@{2005-05-26 23:43:00}" (exact end of history)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify "master@{2005-05-26 23:43:00}" >o 2>e &&
-	test $E = $(cat o) &&
-	test "" = "$(cat e)"
+	echo "$E" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 '
 test_expect_success 'Query "master@{2005-05-28}" (past end of history)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify "master@{2005-05-28}" >o 2>e &&
-	test $D = $(cat o) &&
+	echo "$D" >expect &&
+	test_cmp expect o &&
 	test_i18ngrep -F "warning: log for ref $m unexpectedly ended on $ld" e
 '
 
diff --git a/third_party/git/t/t1404-update-ref-errors.sh b/third_party/git/t/t1404-update-ref-errors.sh
index 970c5c36b9b5..2d142e5535e5 100755
--- a/third_party/git/t/t1404-update-ref-errors.sh
+++ b/third_party/git/t/t1404-update-ref-errors.sh
@@ -32,8 +32,6 @@ test_update_rejected () {
 	test_cmp unchanged actual
 }
 
-Q="'"
-
 # Test adding and deleting D/F-conflicting references in a single
 # transaction.
 df_test() {
@@ -93,7 +91,7 @@ df_test() {
 		delname="$delref"
 	fi &&
 	cat >expected-err <<-EOF &&
-	fatal: cannot lock ref $Q$addname$Q: $Q$delref$Q exists; cannot create $Q$addref$Q
+	fatal: cannot lock ref $SQ$addname$SQ: $SQ$delref$SQ exists; cannot create $SQ$addref$SQ
 	EOF
 	$pack &&
 	if $add_del
@@ -123,7 +121,7 @@ test_expect_success 'existing loose ref is a simple prefix of new' '
 
 	prefix=refs/1l &&
 	test_update_rejected "a c e" false "b c/x d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
 
 '
 
@@ -131,7 +129,7 @@ test_expect_success 'existing packed ref is a simple prefix of new' '
 
 	prefix=refs/1p &&
 	test_update_rejected "a c e" true "b c/x d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
 
 '
 
@@ -139,7 +137,7 @@ test_expect_success 'existing loose ref is a deeper prefix of new' '
 
 	prefix=refs/2l &&
 	test_update_rejected "a c e" false "b c/x/y d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
 
 '
 
@@ -147,7 +145,7 @@ test_expect_success 'existing packed ref is a deeper prefix of new' '
 
 	prefix=refs/2p &&
 	test_update_rejected "a c e" true "b c/x/y d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
 
 '
 
@@ -155,7 +153,7 @@ test_expect_success 'new ref is a simple prefix of existing loose' '
 
 	prefix=refs/3l &&
 	test_update_rejected "a c/x e" false "b c d" \
-		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+		"$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
 
 '
 
@@ -163,7 +161,7 @@ test_expect_success 'new ref is a simple prefix of existing packed' '
 
 	prefix=refs/3p &&
 	test_update_rejected "a c/x e" true "b c d" \
-		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+		"$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
 
 '
 
@@ -171,7 +169,7 @@ test_expect_success 'new ref is a deeper prefix of existing loose' '
 
 	prefix=refs/4l &&
 	test_update_rejected "a c/x/y e" false "b c d" \
-		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+		"$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
 
 '
 
@@ -179,7 +177,7 @@ test_expect_success 'new ref is a deeper prefix of existing packed' '
 
 	prefix=refs/4p &&
 	test_update_rejected "a c/x/y e" true "b c d" \
-		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+		"$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
 
 '
 
@@ -187,7 +185,7 @@ test_expect_success 'one new ref is a simple prefix of another' '
 
 	prefix=refs/5 &&
 	test_update_rejected "a e" false "b c c/x d" \
-		"cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
+		"cannot process $SQ$prefix/c$SQ and $SQ$prefix/c/x$SQ at the same time"
 
 '
 
@@ -334,7 +332,7 @@ test_expect_success 'D/F conflict prevents indirect delete long packed + indirec
 test_expect_success 'missing old value blocks update' '
 	prefix=refs/missing-update &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
 	EOF
 	printf "%s\n" "update $prefix/foo $E $D" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -345,7 +343,7 @@ test_expect_success 'incorrect old value blocks update' '
 	prefix=refs/incorrect-update &&
 	git update-ref $prefix/foo $C &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
 	EOF
 	printf "%s\n" "update $prefix/foo $E $D" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -356,7 +354,7 @@ test_expect_success 'existing old value blocks create' '
 	prefix=refs/existing-create &&
 	git update-ref $prefix/foo $C &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: reference already exists
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: reference already exists
 	EOF
 	printf "%s\n" "create $prefix/foo $E" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -367,7 +365,7 @@ test_expect_success 'incorrect old value blocks delete' '
 	prefix=refs/incorrect-delete &&
 	git update-ref $prefix/foo $C &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
 	EOF
 	printf "%s\n" "delete $prefix/foo $D" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -378,7 +376,7 @@ test_expect_success 'missing old value blocks indirect update' '
 	prefix=refs/missing-indirect-update &&
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
 	EOF
 	printf "%s\n" "update $prefix/symref $E $D" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -390,7 +388,7 @@ test_expect_success 'incorrect old value blocks indirect update' '
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	git update-ref $prefix/foo $C &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
 	EOF
 	printf "%s\n" "update $prefix/symref $E $D" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -402,7 +400,7 @@ test_expect_success 'existing old value blocks indirect create' '
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	git update-ref $prefix/foo $C &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
 	EOF
 	printf "%s\n" "create $prefix/symref $E" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -414,7 +412,7 @@ test_expect_success 'incorrect old value blocks indirect delete' '
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	git update-ref $prefix/foo $C &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
 	EOF
 	printf "%s\n" "delete $prefix/symref $D" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -425,7 +423,7 @@ test_expect_success 'missing old value blocks indirect no-deref update' '
 	prefix=refs/missing-noderef-update &&
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: reference is missing but expected $D
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: reference is missing but expected $D
 	EOF
 	printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -437,7 +435,7 @@ test_expect_success 'incorrect old value blocks indirect no-deref update' '
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	git update-ref $prefix/foo $C &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
 	EOF
 	printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -449,7 +447,7 @@ test_expect_success 'existing old value blocks indirect no-deref create' '
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	git update-ref $prefix/foo $C &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
 	EOF
 	printf "%s\n" "option no-deref" "create $prefix/symref $E" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -461,7 +459,7 @@ test_expect_success 'incorrect old value blocks indirect no-deref delete' '
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	git update-ref $prefix/foo $C &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
 	EOF
 	printf "%s\n" "option no-deref" "delete $prefix/symref $D" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -474,13 +472,13 @@ test_expect_success 'non-empty directory blocks create' '
 	: >.git/$prefix/foo/bar/baz.lock &&
 	test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
 	EOF
 	printf "%s\n" "update $prefix/foo $C" |
 	test_must_fail git update-ref --stdin 2>output.err &&
 	test_cmp expected output.err &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
 	EOF
 	printf "%s\n" "update $prefix/foo $D $C" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -493,13 +491,13 @@ test_expect_success 'broken reference blocks create' '
 	echo "gobbledigook" >.git/$prefix/foo &&
 	test_when_finished "rm -f .git/$prefix/foo" &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
 	EOF
 	printf "%s\n" "update $prefix/foo $C" |
 	test_must_fail git update-ref --stdin 2>output.err &&
 	test_cmp expected output.err &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
 	EOF
 	printf "%s\n" "update $prefix/foo $D $C" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -513,13 +511,13 @@ test_expect_success 'non-empty directory blocks indirect create' '
 	: >.git/$prefix/foo/bar/baz.lock &&
 	test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
 	EOF
 	printf "%s\n" "update $prefix/symref $C" |
 	test_must_fail git update-ref --stdin 2>output.err &&
 	test_cmp expected output.err &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
 	EOF
 	printf "%s\n" "update $prefix/symref $D $C" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -532,13 +530,13 @@ test_expect_success 'broken reference blocks indirect create' '
 	echo "gobbledigook" >.git/$prefix/foo &&
 	test_when_finished "rm -f .git/$prefix/foo" &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
 	EOF
 	printf "%s\n" "update $prefix/symref $C" |
 	test_must_fail git update-ref --stdin 2>output.err &&
 	test_cmp expected output.err &&
 	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
 	EOF
 	printf "%s\n" "update $prefix/symref $D $C" |
 	test_must_fail git update-ref --stdin 2>output.err &&
@@ -614,7 +612,7 @@ test_expect_success 'delete fails cleanly if packed-refs file is locked' '
 	test_when_finished "rm -f .git/packed-refs.lock" &&
 	test_must_fail git update-ref -d $prefix/foo >out 2>err &&
 	git for-each-ref $prefix >actual &&
-	test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: " err &&
+	test_i18ngrep "Unable to create $SQ.*packed-refs.lock$SQ: " err &&
 	test_cmp unchanged actual
 '
 
diff --git a/third_party/git/t/t1406-submodule-ref-store.sh b/third_party/git/t/t1406-submodule-ref-store.sh
index d199d872fb19..36b7ef504687 100755
--- a/third_party/git/t/t1406-submodule-ref-store.sh
+++ b/third_party/git/t/t1406-submodule-ref-store.sh
@@ -75,7 +75,7 @@ test_expect_success 'for_each_reflog()' '
 '
 
 test_expect_success 'for_each_reflog_ent()' '
-	$RUN for-each-reflog-ent HEAD >actual && cat actual &&
+	$RUN for-each-reflog-ent HEAD >actual &&
 	head -n1 actual | grep first &&
 	tail -n2 actual | head -n1 | grep master.to.new
 '
diff --git a/third_party/git/t/t1409-avoid-packing-refs.sh b/third_party/git/t/t1409-avoid-packing-refs.sh
index e5cb8a252dd1..be12fb63506e 100755
--- a/third_party/git/t/t1409-avoid-packing-refs.sh
+++ b/third_party/git/t/t1409-avoid-packing-refs.sh
@@ -8,7 +8,7 @@ test_description='avoid rewriting packed-refs unnecessarily'
 # shouldn't upset readers, and it should be omitted if the file is
 # ever rewritten.
 mark_packed_refs () {
-	sed -e "s/^\(#.*\)/\1 t1409 /" <.git/packed-refs >.git/packed-refs.new &&
+	sed -e "s/^\(#.*\)/\1 t1409 /" .git/packed-refs >.git/packed-refs.new &&
 	mv .git/packed-refs.new .git/packed-refs
 }
 
@@ -27,15 +27,15 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'do not create packed-refs file gratuitously' '
-	test_must_fail test -f .git/packed-refs &&
+	test_path_is_missing .git/packed-refs &&
 	git update-ref refs/heads/foo $A &&
-	test_must_fail test -f .git/packed-refs &&
+	test_path_is_missing .git/packed-refs &&
 	git update-ref refs/heads/foo $B &&
-	test_must_fail test -f .git/packed-refs &&
+	test_path_is_missing .git/packed-refs &&
 	git update-ref refs/heads/foo $C $B &&
-	test_must_fail test -f .git/packed-refs &&
+	test_path_is_missing .git/packed-refs &&
 	git update-ref -d refs/heads/foo &&
-	test_must_fail test -f .git/packed-refs
+	test_path_is_missing .git/packed-refs
 '
 
 test_expect_success 'check that marking the packed-refs file works' '
@@ -46,7 +46,7 @@ test_expect_success 'check that marking the packed-refs file works' '
 	git for-each-ref >actual &&
 	test_cmp expected actual &&
 	git pack-refs --all &&
-	test_must_fail check_packed_refs_marked &&
+	! check_packed_refs_marked &&
 	git for-each-ref >actual2 &&
 	test_cmp expected actual2
 '
@@ -80,7 +80,7 @@ test_expect_success 'touch packed-refs on delete of packed' '
 	git pack-refs --all &&
 	mark_packed_refs &&
 	git update-ref -d refs/heads/packed-delete &&
-	test_must_fail check_packed_refs_marked
+	! check_packed_refs_marked
 '
 
 test_expect_success 'leave packed-refs untouched on update of loose' '
diff --git a/third_party/git/t/t1410-reflog.sh b/third_party/git/t/t1410-reflog.sh
index 82950c02825c..76d9b744a64b 100755
--- a/third_party/git/t/t1410-reflog.sh
+++ b/third_party/git/t/t1410-reflog.sh
@@ -195,7 +195,7 @@ test_expect_success 'delete' '
 
 	git reflog delete master@{1} &&
 	git reflog show master > output &&
-	test $(($master_entry_count - 1)) = $(wc -l < output) &&
+	test_line_count = $(($master_entry_count - 1)) output &&
 	test $HEAD_entry_count = $(git reflog | wc -l) &&
 	! grep ox < output &&
 
@@ -209,7 +209,7 @@ test_expect_success 'delete' '
 
 	git reflog delete master@{07.04.2005.15:15:00.-0700} &&
 	git reflog show master > output &&
-	test $(($master_entry_count - 1)) = $(wc -l < output) &&
+	test_line_count = $(($master_entry_count - 1)) output &&
 	! grep dragon < output
 
 '
diff --git a/third_party/git/t/t1414-reflog-walk.sh b/third_party/git/t/t1414-reflog-walk.sh
index feb1efd8ff99..1181a9fb28e3 100755
--- a/third_party/git/t/t1414-reflog-walk.sh
+++ b/third_party/git/t/t1414-reflog-walk.sh
@@ -18,10 +18,9 @@ do_walk () {
 	git log -g --format="%gd %gs" "$@"
 }
 
-sq="'"
 test_expect_success 'set up expected reflog' '
 	cat >expect.all <<-EOF
-	HEAD@{0} commit (merge): Merge branch ${sq}master${sq} into side
+	HEAD@{0} commit (merge): Merge branch ${SQ}master${SQ} into side
 	HEAD@{1} commit: three
 	HEAD@{2} checkout: moving from master to side
 	HEAD@{3} commit: two
diff --git a/third_party/git/t/t1450-fsck.sh b/third_party/git/t/t1450-fsck.sh
index b36e0528d07b..d09eff503c65 100755
--- a/third_party/git/t/t1450-fsck.sh
+++ b/third_party/git/t/t1450-fsck.sh
@@ -70,7 +70,6 @@ test_expect_success 'object with bad sha1' '
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 
 	test_must_fail git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "$sha.*corrupt" out
 '
 
@@ -78,7 +77,6 @@ test_expect_success 'branch pointing to non-commit' '
 	git rev-parse HEAD^{tree} >.git/refs/heads/invalid &&
 	test_when_finished "git update-ref -d refs/heads/invalid" &&
 	test_must_fail git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "not a commit" out
 '
 
@@ -88,7 +86,6 @@ test_expect_success 'HEAD link pointing at a funny object' '
 	echo $ZERO_OID >.git/HEAD &&
 	# avoid corrupt/broken HEAD from interfering with repo discovery
 	test_must_fail env GIT_DIR=.git git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "detached HEAD points" out
 '
 
@@ -98,7 +95,6 @@ test_expect_success 'HEAD link pointing at a funny place' '
 	echo "ref: refs/funny/place" >.git/HEAD &&
 	# avoid corrupt/broken HEAD from interfering with repo discovery
 	test_must_fail env GIT_DIR=.git git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "HEAD points to something strange" out
 '
 
@@ -145,7 +141,6 @@ test_expect_success 'email without @ is okay' '
 	git update-ref refs/heads/bogus "$new" &&
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 	git fsck 2>out &&
-	cat out &&
 	! grep "commit $new" out
 '
 
@@ -157,7 +152,6 @@ test_expect_success 'email with embedded > is not okay' '
 	git update-ref refs/heads/bogus "$new" &&
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 	test_must_fail git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "error in commit $new" out
 '
 
@@ -169,7 +163,6 @@ test_expect_success 'missing < email delimiter is reported nicely' '
 	git update-ref refs/heads/bogus "$new" &&
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 	test_must_fail git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "error in commit $new.* - bad name" out
 '
 
@@ -181,7 +174,6 @@ test_expect_success 'missing email is reported nicely' '
 	git update-ref refs/heads/bogus "$new" &&
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 	test_must_fail git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "error in commit $new.* - missing email" out
 '
 
@@ -193,7 +185,6 @@ test_expect_success '> in name is reported' '
 	git update-ref refs/heads/bogus "$new" &&
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 	test_must_fail git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "error in commit $new" out
 '
 
@@ -207,7 +198,6 @@ test_expect_success 'integer overflow in timestamps is reported' '
 	git update-ref refs/heads/bogus "$new" &&
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 	test_must_fail git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "error in commit $new.*integer overflow" out
 '
 
@@ -219,7 +209,6 @@ test_expect_success 'commit with NUL in header' '
 	git update-ref refs/heads/bogus "$new" &&
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 	test_must_fail git fsck 2>out &&
-	cat out &&
 	test_i18ngrep "error in commit $new.*unterminated header: NUL at offset" out
 '
 
@@ -297,7 +286,6 @@ test_expect_success 'tag pointing to nonexistent' '
 	echo $tag >.git/refs/tags/invalid &&
 	test_when_finished "git update-ref -d refs/tags/invalid" &&
 	test_must_fail git fsck --tags >out &&
-	cat out &&
 	test_i18ngrep "broken link" out
 '
 
@@ -378,7 +366,6 @@ test_expect_success 'tag with NUL in header' '
 	echo $tag >.git/refs/tags/wrong &&
 	test_when_finished "git update-ref -d refs/tags/wrong" &&
 	test_must_fail git fsck --tags 2>out &&
-	cat out &&
 	test_i18ngrep "error in tag $tag.*unterminated header: NUL at offset" out
 '
 
@@ -409,7 +396,6 @@ test_expect_success 'rev-list --verify-objects with bad sha1' '
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 
 	test_might_fail git rev-list --verify-objects refs/heads/bogus >/dev/null 2>out &&
-	cat out &&
 	test_i18ngrep -q "error: hash mismatch $(dirname $new)$(test_oid ff_2)" out
 '
 
@@ -433,7 +419,6 @@ test_expect_success 'fsck notices blob entry pointing to null sha1' '
 	 sha=$(printf "100644 file$_bz$_bzoid" |
 	       git hash-object -w --stdin -t tree) &&
 	  git fsck 2>out &&
-	  cat out &&
 	  test_i18ngrep "warning.*null sha1" out
 	)
 '
@@ -444,7 +429,6 @@ test_expect_success 'fsck notices submodule entry pointing to null sha1' '
 	 sha=$(printf "160000 submodule$_bz$_bzoid" |
 	       git hash-object -w --stdin -t tree) &&
 	  git fsck 2>out &&
-	  cat out &&
 	  test_i18ngrep "warning.*null sha1" out
 	)
 '
@@ -456,6 +440,7 @@ while read name path pretty; do
 		(
 			git init $name-$type &&
 			cd $name-$type &&
+			git config core.protectNTFS false &&
 			echo content >file &&
 			git add file &&
 			git commit -m base &&
@@ -465,7 +450,6 @@ while read name path pretty; do
 			printf "$mode $type %s\t%s" "$value" "$path" >bad &&
 			bad_tree=$(git mktree <bad) &&
 			git fsck 2>out &&
-			cat out &&
 			test_i18ngrep "warning.*tree $bad_tree" out
 		)'
 	done <<-\EOF
@@ -632,7 +616,7 @@ test_expect_success 'fsck --name-objects' '
 		remove_object $(git rev-parse julius:caesar.t) &&
 		test_must_fail git fsck --name-objects >out &&
 		tree=$(git rev-parse --verify julius:) &&
-		test_i18ngrep -E "$tree \((refs/heads/master|HEAD)@\{[0-9]*\}:" out
+		test_i18ngrep "$tree (refs/tags/julius:" out
 	)
 '
 
diff --git a/third_party/git/t/t1500-rev-parse.sh b/third_party/git/t/t1500-rev-parse.sh
index 01abee533ded..603019b54167 100755
--- a/third_party/git/t/t1500-rev-parse.sh
+++ b/third_party/git/t/t1500-rev-parse.sh
@@ -59,6 +59,7 @@ test_rev_parse () {
 ROOT=$(pwd)
 
 test_expect_success 'setup' '
+	test_oid_init &&
 	mkdir -p sub/dir work &&
 	cp -R .git repo.git
 '
@@ -131,6 +132,30 @@ test_expect_success 'rev-parse --is-shallow-repository in non-shallow repo' '
 	test_cmp expect actual
 '
 
+test_expect_success 'rev-parse --show-object-format in repo' '
+	echo "$(test_oid algo)" >expect &&
+	git rev-parse --show-object-format >actual &&
+	test_cmp expect actual &&
+	git rev-parse --show-object-format=storage >actual &&
+	test_cmp expect actual &&
+	git rev-parse --show-object-format=input >actual &&
+	test_cmp expect actual &&
+	git rev-parse --show-object-format=output >actual &&
+	test_cmp expect actual &&
+	test_must_fail git rev-parse --show-object-format=squeamish-ossifrage 2>err &&
+	grep "unknown mode for --show-object-format: squeamish-ossifrage" err
+'
+
+test_expect_success '--show-toplevel from subdir of working tree' '
+	pwd >expect &&
+	git -C sub/dir rev-parse --show-toplevel >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--show-toplevel from inside .git' '
+	test_must_fail git -C .git rev-parse --show-toplevel
+'
+
 test_expect_success 'showing the superproject correctly' '
 	git rev-parse --show-superproject-working-tree >out &&
 	test_must_be_empty out &&
diff --git a/third_party/git/t/t1501-work-tree.sh b/third_party/git/t/t1501-work-tree.sh
index 3498d3d55e9e..b75558040ffd 100755
--- a/third_party/git/t/t1501-work-tree.sh
+++ b/third_party/git/t/t1501-work-tree.sh
@@ -350,7 +350,7 @@ test_expect_success 'Multi-worktree setup' '
 	mkdir work &&
 	mkdir -p repo.git/repos/foo &&
 	cp repo.git/HEAD repo.git/index repo.git/repos/foo &&
-	test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo &&
+	{ cp repo.git/sharedindex.* repo.git/repos/foo || :; } &&
 	sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE
 '
 
diff --git a/third_party/git/t/t1506-rev-parse-diagnosis.sh b/third_party/git/t/t1506-rev-parse-diagnosis.sh
index 4ee009da666f..52edcbdcc327 100755
--- a/third_party/git/t/t1506-rev-parse-diagnosis.sh
+++ b/third_party/git/t/t1506-rev-parse-diagnosis.sh
@@ -8,12 +8,11 @@ exec </dev/null
 
 test_did_you_mean ()
 {
-	sq="'" &&
 	cat >expected <<-EOF &&
-	fatal: Path '$2$3' $4, but not ${5:-$sq$3$sq}.
-	Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}?
+	fatal: path '$2$3' $4, but not ${5:-$SQ$3$SQ}
+	hint: Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}?
 	EOF
-	test_cmp expected error
+	test_i18ncmp expected error
 }
 
 HASH_file=
@@ -104,66 +103,66 @@ test_expect_success 'correct relative file objects (6)' '
 
 test_expect_success 'incorrect revision id' '
 	test_must_fail git rev-parse foobar:file.txt 2>error &&
-	grep "Invalid object name '"'"'foobar'"'"'." error &&
-	test_must_fail git rev-parse foobar 2> error &&
+	test_i18ngrep "invalid object name .foobar." error &&
+	test_must_fail git rev-parse foobar 2>error &&
 	test_i18ngrep "unknown revision or path not in the working tree." error
 '
 
 test_expect_success 'incorrect file in sha1:path' '
-	test_must_fail git rev-parse HEAD:nothing.txt 2> error &&
-	grep "fatal: Path '"'"'nothing.txt'"'"' does not exist in '"'"'HEAD'"'"'" error &&
-	test_must_fail git rev-parse HEAD:index-only.txt 2> error &&
-	grep "fatal: Path '"'"'index-only.txt'"'"' exists on disk, but not in '"'"'HEAD'"'"'." error &&
+	test_must_fail git rev-parse HEAD:nothing.txt 2>error &&
+	test_i18ngrep "path .nothing.txt. does not exist in .HEAD." error &&
+	test_must_fail git rev-parse HEAD:index-only.txt 2>error &&
+	test_i18ngrep "path .index-only.txt. exists on disk, but not in .HEAD." error &&
 	(cd subdir &&
-	 test_must_fail git rev-parse HEAD:file2.txt 2> error &&
+	 test_must_fail git rev-parse HEAD:file2.txt 2>error &&
 	 test_did_you_mean HEAD subdir/ file2.txt exists )
 '
 
 test_expect_success 'incorrect file in :path and :N:path' '
-	test_must_fail git rev-parse :nothing.txt 2> error &&
-	grep "fatal: Path '"'"'nothing.txt'"'"' does not exist (neither on disk nor in the index)." error &&
-	test_must_fail git rev-parse :1:nothing.txt 2> error &&
-	grep "Path '"'"'nothing.txt'"'"' does not exist (neither on disk nor in the index)." error &&
-	test_must_fail git rev-parse :1:file.txt 2> error &&
+	test_must_fail git rev-parse :nothing.txt 2>error &&
+	test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
+	test_must_fail git rev-parse :1:nothing.txt 2>error &&
+	test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
+	test_must_fail git rev-parse :1:file.txt 2>error &&
 	test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
 	(cd subdir &&
-	 test_must_fail git rev-parse :1:file.txt 2> error &&
+	 test_must_fail git rev-parse :1:file.txt 2>error &&
 	 test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
-	 test_must_fail git rev-parse :file2.txt 2> error &&
+	 test_must_fail git rev-parse :file2.txt 2>error &&
 	 test_did_you_mean ":0" subdir/ file2.txt "is in the index" &&
-	 test_must_fail git rev-parse :2:file2.txt 2> error &&
+	 test_must_fail git rev-parse :2:file2.txt 2>error &&
 	 test_did_you_mean :0 subdir/ file2.txt "is in the index") &&
-	test_must_fail git rev-parse :disk-only.txt 2> error &&
-	grep "fatal: Path '"'"'disk-only.txt'"'"' exists on disk, but not in the index." error
+	test_must_fail git rev-parse :disk-only.txt 2>error &&
+	test_i18ngrep "path .disk-only.txt. exists on disk, but not in the index" error
 '
 
 test_expect_success 'invalid @{n} reference' '
 	test_must_fail git rev-parse master@{99999} >output 2>error &&
-	test -z "$(cat output)" &&
-	grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error  &&
+	test_must_be_empty output &&
+	test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error  &&
 	test_must_fail git rev-parse --verify master@{99999} >output 2>error &&
-	test -z "$(cat output)" &&
-	grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error
+	test_must_be_empty output &&
+	test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error
 '
 
 test_expect_success 'relative path not found' '
 	(
 		cd subdir &&
 		test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error &&
-		grep subdir/nonexistent.txt error
+		test_i18ngrep subdir/nonexistent.txt error
 	)
 '
 
 test_expect_success 'relative path outside worktree' '
 	test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
-	test -z "$(cat output)" &&
+	test_must_be_empty output &&
 	test_i18ngrep "outside repository" error
 '
 
 test_expect_success 'relative path when cwd is outside worktree' '
 	test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error &&
-	test -z "$(cat output)" &&
-	grep "relative path syntax can.t be used outside working tree." error
+	test_must_be_empty output &&
+	test_i18ngrep "relative path syntax can.t be used outside working tree" error
 '
 
 test_expect_success '<commit>:file correctly diagnosed after a pathname' '
@@ -215,4 +214,26 @@ test_expect_success 'arg before dashdash must be a revision (ambiguous)' '
 	test_cmp expect actual
 '
 
+test_expect_success 'reject Nth parent if N is too high' '
+	test_must_fail git rev-parse HEAD^100000000000000000000000000000000
+'
+
+test_expect_success 'reject Nth ancestor if N is too high' '
+	test_must_fail git rev-parse HEAD~100000000000000000000000000000000
+'
+
+test_expect_success 'pathspecs with wildcards are not ambiguous' '
+	echo "*.c" >expect &&
+	git rev-parse "*.c" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'backslash does not trigger wildcard rule' '
+	test_must_fail git rev-parse "foo\\bar"
+'
+
+test_expect_success 'escaped char does not trigger wildcard rule' '
+	test_must_fail git rev-parse "foo\\*bar"
+'
+
 test_done
diff --git a/third_party/git/t/t1507-rev-parse-upstream.sh b/third_party/git/t/t1507-rev-parse-upstream.sh
index fa3e4996418d..dfc0d96d8a8a 100755
--- a/third_party/git/t/t1507-rev-parse-upstream.sh
+++ b/third_party/git/t/t1507-rev-parse-upstream.sh
@@ -28,16 +28,9 @@ test_expect_success 'setup' '
 	)
 '
 
-sq="'"
-
-full_name () {
-	(cd clone &&
-	 git rev-parse --symbolic-full-name "$@")
-}
-
 commit_subject () {
 	(cd clone &&
-	 git show -s --pretty=format:%s "$@")
+	 git show -s --pretty=tformat:%s "$@")
 }
 
 error_message () {
@@ -46,63 +39,78 @@ error_message () {
 }
 
 test_expect_success '@{upstream} resolves to correct full name' '
-	test refs/remotes/origin/master = "$(full_name @{upstream})" &&
-	test refs/remotes/origin/master = "$(full_name @{UPSTREAM})" &&
-	test refs/remotes/origin/master = "$(full_name @{UpSTReam})"
+	echo refs/remotes/origin/master >expect &&
+	git -C clone rev-parse --symbolic-full-name @{upstream} >actual &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name @{UPSTREAM} >actual &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name @{UpSTReam} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success '@{u} resolves to correct full name' '
-	test refs/remotes/origin/master = "$(full_name @{u})" &&
-	test refs/remotes/origin/master = "$(full_name @{U})"
+	echo refs/remotes/origin/master >expect &&
+	git -C clone rev-parse --symbolic-full-name @{u} >actual &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name @{U} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'my-side@{upstream} resolves to correct full name' '
-	test refs/remotes/origin/side = "$(full_name my-side@{u})"
+	echo refs/remotes/origin/side >expect &&
+	git -C clone rev-parse --symbolic-full-name my-side@{u} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'upstream of branch with @ in middle' '
-	full_name fun@ny@{u} >actual &&
+	git -C clone rev-parse --symbolic-full-name fun@ny@{u} >actual &&
 	echo refs/remotes/origin/side >expect &&
 	test_cmp expect actual &&
-	full_name fun@ny@{U} >actual &&
+	git -C clone rev-parse --symbolic-full-name fun@ny@{U} >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'upstream of branch with @ at start' '
-	full_name @funny@{u} >actual &&
+	git -C clone rev-parse --symbolic-full-name @funny@{u} >actual &&
 	echo refs/remotes/origin/side >expect &&
 	test_cmp expect actual
 '
 
 test_expect_success 'upstream of branch with @ at end' '
-	full_name funny@@{u} >actual &&
+	git -C clone rev-parse --symbolic-full-name funny@@{u} >actual &&
 	echo refs/remotes/origin/side >expect &&
 	test_cmp expect actual
 '
 
 test_expect_success 'refs/heads/my-side@{upstream} does not resolve to my-side{upstream}' '
-	test_must_fail full_name refs/heads/my-side@{upstream}
+	test_must_fail git -C clone rev-parse --symbolic-full-name refs/heads/my-side@{upstream}
 '
 
 test_expect_success 'my-side@{u} resolves to correct commit' '
 	git checkout side &&
 	test_commit 5 &&
 	(cd clone && git fetch) &&
-	test 2 = "$(commit_subject my-side)" &&
-	test 5 = "$(commit_subject my-side@{u})"
+	echo 2 >expect &&
+	commit_subject my-side >actual &&
+	test_cmp expect actual &&
+	echo 5 >expect &&
+	commit_subject my-side@{u} >actual
 '
 
 test_expect_success 'not-tracking@{u} fails' '
-	test_must_fail full_name non-tracking@{u} &&
+	test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u} &&
 	(cd clone && git checkout --no-track -b non-tracking) &&
-	test_must_fail full_name non-tracking@{u}
+	test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u}
 '
 
 test_expect_success '<branch>@{u}@{1} resolves correctly' '
 	test_commit 6 &&
 	(cd clone && git fetch) &&
-	test 5 = $(commit_subject my-side@{u}@{1}) &&
-	test 5 = $(commit_subject my-side@{U}@{1})
+	echo 5 >expect &&
+	commit_subject my-side@{u}@{1} >actual &&
+	test_cmp expect actual &&
+	commit_subject my-side@{U}@{1} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success '@{u} without specifying branch fails on a detached HEAD' '
@@ -129,7 +137,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
 	git branch -t new my-side@{u} &&
 	git merge -s ours new@{u} &&
 	git show -s --pretty=tformat:%s >actual &&
-	echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect &&
+	echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
 	test_cmp expect actual
 )
 '
@@ -151,12 +159,14 @@ test_expect_success 'checkout other@{u}' '
 '
 
 test_expect_success 'branch@{u} works when tracking a local branch' '
-	test refs/heads/master = "$(full_name local-master@{u})"
+	echo refs/heads/master >expect &&
+	git -C clone rev-parse --symbolic-full-name local-master@{u} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'branch@{u} error message when no upstream' '
 	cat >expect <<-EOF &&
-	fatal: no upstream configured for branch ${sq}non-tracking${sq}
+	fatal: no upstream configured for branch ${SQ}non-tracking${SQ}
 	EOF
 	error_message non-tracking@{u} &&
 	test_i18ncmp expect error
@@ -164,7 +174,7 @@ test_expect_success 'branch@{u} error message when no upstream' '
 
 test_expect_success '@{u} error message when no upstream' '
 	cat >expect <<-EOF &&
-	fatal: no upstream configured for branch ${sq}master${sq}
+	fatal: no upstream configured for branch ${SQ}master${SQ}
 	EOF
 	test_must_fail git rev-parse --verify @{u} 2>actual &&
 	test_i18ncmp expect actual
@@ -172,7 +182,7 @@ test_expect_success '@{u} error message when no upstream' '
 
 test_expect_success 'branch@{u} error message with misspelt branch' '
 	cat >expect <<-EOF &&
-	fatal: no such branch: ${sq}no-such-branch${sq}
+	fatal: no such branch: ${SQ}no-such-branch${SQ}
 	EOF
 	error_message no-such-branch@{u} &&
 	test_i18ncmp expect error
@@ -189,7 +199,7 @@ test_expect_success '@{u} error message when not on a branch' '
 
 test_expect_success 'branch@{u} error message if upstream branch not fetched' '
 	cat >expect <<-EOF &&
-	fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch
+	fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch
 	EOF
 	error_message bad-upstream@{u} &&
 	test_i18ncmp expect error
@@ -205,35 +215,37 @@ test_expect_success 'pull works when tracking a local branch' '
 
 # makes sense if the previous one succeeded
 test_expect_success '@{u} works when tracking a local branch' '
-	test refs/heads/master = "$(full_name @{u})"
+	echo refs/heads/master >expect &&
+	git -C clone rev-parse --symbolic-full-name @{u} >actual &&
+	test_cmp expect actual
 '
 
-commit=$(git rev-parse HEAD)
-cat >expect <<EOF
-commit $commit
-Reflog: master@{0} (C O Mitter <committer@example.com>)
-Reflog message: branch: Created from HEAD
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    3
-EOF
 test_expect_success 'log -g other@{u}' '
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	commit $commit
+	Reflog: master@{0} (C O Mitter <committer@example.com>)
+	Reflog message: branch: Created from HEAD
+	Author: A U Thor <author@example.com>
+	Date:   Thu Apr 7 15:15:13 2005 -0700
+
+	    3
+	EOF
 	git log -1 -g other@{u} >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<EOF
-commit $commit
-Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
-Reflog message: branch: Created from HEAD
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    3
-EOF
-
 test_expect_success 'log -g other@{u}@{now}' '
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	commit $commit
+	Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
+	Reflog message: branch: Created from HEAD
+	Author: A U Thor <author@example.com>
+	Date:   Thu Apr 7 15:15:13 2005 -0700
+
+	    3
+	EOF
 	git log -1 -g other@{u}@{now} >actual &&
 	test_cmp expect actual
 '
diff --git a/third_party/git/t/t1512-rev-parse-disambiguation.sh b/third_party/git/t/t1512-rev-parse-disambiguation.sh
index c19fb500cb22..18fa6cf40d37 100755
--- a/third_party/git/t/t1512-rev-parse-disambiguation.sh
+++ b/third_party/git/t/t1512-rev-parse-disambiguation.sh
@@ -282,7 +282,7 @@ test_expect_success 'rev-parse --disambiguate' '
 	# commits created by commit-tree in earlier tests share a
 	# different prefix.
 	git rev-parse --disambiguate=000000000 >actual &&
-	test $(wc -l <actual) = 16 &&
+	test_line_count = 16 actual &&
 	test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
 '
 
@@ -339,7 +339,7 @@ test_expect_success C_LOCALE_OUTPUT 'ambiguity hints' '
 test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' '
 	test_must_fail git rev-parse 000000000^{commit} 2>stderr &&
 	grep ^hint: stderr >hints &&
-	# 5 commits, 1 tag (which is a commitish), plus intro line
+	# 5 commits, 1 tag (which is a committish), plus intro line
 	test_line_count = 7 hints
 '
 
diff --git a/third_party/git/t/t1600-index.sh b/third_party/git/t/t1600-index.sh
index 42962ed7d46f..b7c31aa86a11 100755
--- a/third_party/git/t/t1600-index.sh
+++ b/third_party/git/t/t1600-index.sh
@@ -59,17 +59,42 @@ test_expect_success 'out of bounds index.version issues warning' '
 	)
 '
 
-test_expect_success 'GIT_INDEX_VERSION takes precedence over config' '
+test_index_version () {
+	INDEX_VERSION_CONFIG=$1 &&
+	FEATURE_MANY_FILES=$2 &&
+	ENV_VAR_VERSION=$3
+	EXPECTED_OUTPUT_VERSION=$4 &&
 	(
 		rm -f .git/index &&
-		GIT_INDEX_VERSION=4 &&
-		export GIT_INDEX_VERSION &&
-		git config --add index.version 2 &&
+		rm -f .git/config &&
+		if test "$INDEX_VERSION_CONFIG" -ne 0
+		then
+			git config --add index.version $INDEX_VERSION_CONFIG
+		fi &&
+		git config --add feature.manyFiles $FEATURE_MANY_FILES
+		if test "$ENV_VAR_VERSION" -ne 0
+		then
+			GIT_INDEX_VERSION=$ENV_VAR_VERSION &&
+			export GIT_INDEX_VERSION
+		else
+			unset GIT_INDEX_VERSION
+		fi &&
 		git add a 2>&1 &&
-		echo 4 >expect &&
+		echo $EXPECTED_OUTPUT_VERSION >expect &&
 		test-tool index-version <.git/index >actual &&
 		test_cmp expect actual
 	)
+}
+
+test_expect_success 'index version config precedence' '
+	test_index_version 0 false 0 2 &&
+	test_index_version 2 false 0 2 &&
+	test_index_version 3 false 0 2 &&
+	test_index_version 4 false 0 4 &&
+	test_index_version 2 false 4 4 &&
+	test_index_version 2 true 0 2 &&
+	test_index_version 0 true 0 4 &&
+	test_index_version 0 true 2 2
 '
 
 test_done
diff --git a/third_party/git/t/t2018-checkout-branch.sh b/third_party/git/t/t2018-checkout-branch.sh
index 822381dd9df6..bbca7ef8da6d 100755
--- a/third_party/git/t/t2018-checkout-branch.sh
+++ b/third_party/git/t/t2018-checkout-branch.sh
@@ -1,50 +1,76 @@
 #!/bin/sh
 
-test_description='checkout '
+test_description='checkout'
 
 . ./test-lib.sh
 
-# Arguments: <branch> <sha> [<checkout options>]
+# Arguments: [!] <branch> <oid> [<checkout options>]
 #
 # Runs "git checkout" to switch to <branch>, testing that
 #
 #   1) we are on the specified branch, <branch>;
-#   2) HEAD is <sha>; if <sha> is not specified, the old HEAD is used.
+#   2) HEAD is <oid>; if <oid> is not specified, the old HEAD is used.
 #
 # If <checkout options> is not specified, "git checkout" is run with -b.
-do_checkout() {
+#
+# If the first argument is `!`, "git checkout" is expected to fail when
+# it is run.
+do_checkout () {
+	should_fail= &&
+	if test "x$1" = "x!"
+	then
+		should_fail=yes &&
+		shift
+	fi &&
 	exp_branch=$1 &&
 	exp_ref="refs/heads/$exp_branch" &&
 
-	# if <sha> is not specified, use HEAD.
-	exp_sha=${2:-$(git rev-parse --verify HEAD)} &&
+	# if <oid> is not specified, use HEAD.
+	exp_oid=${2:-$(git rev-parse --verify HEAD)} &&
 
 	# default options for git checkout: -b
-	if [ -z "$3" ]; then
+	if test -z "$3"
+	then
 		opts="-b"
 	else
 		opts="$3"
 	fi
 
-	git checkout $opts $exp_branch $exp_sha &&
+	if test -n "$should_fail"
+	then
+		test_must_fail git checkout $opts $exp_branch $exp_oid
+	else
+		git checkout $opts $exp_branch $exp_oid &&
+		echo "$exp_ref" >ref.expect &&
+		git rev-parse --symbolic-full-name HEAD >ref.actual &&
+		test_cmp ref.expect ref.actual &&
+		echo "$exp_oid" >oid.expect &&
+		git rev-parse --verify HEAD >oid.actual &&
+		test_cmp oid.expect oid.actual
+	fi
+}
 
-	test $exp_ref = $(git rev-parse --symbolic-full-name HEAD) &&
-	test $exp_sha = $(git rev-parse --verify HEAD)
+test_dirty_unmergeable () {
+	test_expect_code 1 git diff --exit-code
 }
 
-test_dirty_unmergeable() {
-	! git diff --exit-code >/dev/null
+test_dirty_unmergeable_discards_changes () {
+	git diff --exit-code
 }
 
-setup_dirty_unmergeable() {
+setup_dirty_unmergeable () {
 	echo >>file1 change2
 }
 
-test_dirty_mergeable() {
-	! git diff --cached --exit-code >/dev/null
+test_dirty_mergeable () {
+	test_expect_code 1 git diff --cached --exit-code
+}
+
+test_dirty_mergeable_discards_changes () {
+	git diff --cached --exit-code
 }
 
-setup_dirty_mergeable() {
+setup_dirty_mergeable () {
 	echo >file2 file2 &&
 	git add file2
 }
@@ -82,7 +108,7 @@ test_expect_success 'checkout -b to a new branch, set to an explicit ref' '
 
 test_expect_success 'checkout -b to a new branch with unmergeable changes fails' '
 	setup_dirty_unmergeable &&
-	test_must_fail do_checkout branch2 $HEAD1 &&
+	do_checkout ! branch2 $HEAD1 &&
 	test_dirty_unmergeable
 '
 
@@ -93,7 +119,7 @@ test_expect_success 'checkout -f -b to a new branch with unmergeable changes dis
 
 	# still dirty and on branch1
 	do_checkout branch2 $HEAD1 "-f -b" &&
-	test_must_fail test_dirty_unmergeable
+	test_dirty_unmergeable_discards_changes
 '
 
 test_expect_success 'checkout -b to a new branch preserves mergeable changes' '
@@ -111,12 +137,12 @@ test_expect_success 'checkout -f -b to a new branch with mergeable changes disca
 	test_when_finished git reset --hard HEAD &&
 	setup_dirty_mergeable &&
 	do_checkout branch2 $HEAD1 "-f -b" &&
-	test_must_fail test_dirty_mergeable
+	test_dirty_mergeable_discards_changes
 '
 
 test_expect_success 'checkout -b to an existing branch fails' '
 	test_when_finished git reset --hard HEAD &&
-	test_must_fail do_checkout branch2 $HEAD2
+	do_checkout ! branch2 $HEAD2
 '
 
 test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
@@ -140,7 +166,8 @@ test_expect_success 'checkout -B to a merge base' '
 '
 
 test_expect_success 'checkout -B to an existing branch from detached HEAD resets branch to HEAD' '
-	git checkout $(git rev-parse --verify HEAD) &&
+	head=$(git rev-parse --verify HEAD) &&
+	git checkout "$head" &&
 
 	do_checkout branch2 "" -B
 '
@@ -155,14 +182,14 @@ test_expect_success 'checkout -B to an existing branch with unmergeable changes
 	git checkout branch1 &&
 
 	setup_dirty_unmergeable &&
-	test_must_fail do_checkout branch2 $HEAD1 -B &&
+	do_checkout ! branch2 $HEAD1 -B &&
 	test_dirty_unmergeable
 '
 
 test_expect_success 'checkout -f -B to an existing branch with unmergeable changes discards changes' '
 	# still dirty and on branch1
 	do_checkout branch2 $HEAD1 "-f -B" &&
-	test_must_fail test_dirty_unmergeable
+	test_dirty_unmergeable_discards_changes
 '
 
 test_expect_success 'checkout -B to an existing branch preserves mergeable changes' '
@@ -179,7 +206,7 @@ test_expect_success 'checkout -f -B to an existing branch with mergeable changes
 
 	setup_dirty_mergeable &&
 	do_checkout branch2 $HEAD1 "-f -B" &&
-	test_must_fail test_dirty_mergeable
+	test_dirty_mergeable_discards_changes
 '
 
 test_expect_success 'checkout -b <describe>' '
diff --git a/third_party/git/t/t2022-checkout-paths.sh b/third_party/git/t/t2022-checkout-paths.sh
index fc3eb43b8909..6844afafc0eb 100755
--- a/third_party/git/t/t2022-checkout-paths.sh
+++ b/third_party/git/t/t2022-checkout-paths.sh
@@ -78,4 +78,15 @@ test_expect_success 'do not touch files that are already up-to-date' '
 	test_cmp expect actual
 '
 
+test_expect_success 'checkout HEAD adds deleted intent-to-add file back to index' '
+	echo "nonempty" >nonempty &&
+	>empty &&
+	git add nonempty empty &&
+	git commit -m "create files to be deleted" &&
+	git rm --cached nonempty empty &&
+	git add -N nonempty empty &&
+	git checkout HEAD nonempty empty &&
+	git diff --cached --exit-code
+'
+
 test_done
diff --git a/third_party/git/t/t2024-checkout-dwim.sh b/third_party/git/t/t2024-checkout-dwim.sh
index fa0718c730c3..accfa9aa4bd8 100755
--- a/third_party/git/t/t2024-checkout-dwim.sh
+++ b/third_party/git/t/t2024-checkout-dwim.sh
@@ -37,7 +37,9 @@ test_expect_success 'setup' '
 		git checkout -b foo &&
 		test_commit a_foo &&
 		git checkout -b bar &&
-		test_commit a_bar
+		test_commit a_bar &&
+		git checkout -b ambiguous_branch_and_file &&
+		test_commit a_ambiguous_branch_and_file
 	) &&
 	git init repo_b &&
 	(
@@ -46,7 +48,9 @@ test_expect_success 'setup' '
 		git checkout -b foo &&
 		test_commit b_foo &&
 		git checkout -b baz &&
-		test_commit b_baz
+		test_commit b_baz &&
+		git checkout -b ambiguous_branch_and_file &&
+		test_commit b_ambiguous_branch_and_file
 	) &&
 	git remote add repo_a repo_a &&
 	git remote add repo_b repo_b &&
@@ -75,6 +79,26 @@ test_expect_success 'checkout of branch from multiple remotes fails #1' '
 	test_branch master
 '
 
+test_expect_success 'when arg matches multiple remotes, do not fallback to interpreting as pathspec' '
+	# create a file with name matching remote branch name
+	git checkout -b t_ambiguous_branch_and_file &&
+	>ambiguous_branch_and_file &&
+	git add ambiguous_branch_and_file &&
+	git commit -m "ambiguous_branch_and_file" &&
+
+	# modify file to verify that it will not be touched by checkout
+	test_when_finished "git checkout -- ambiguous_branch_and_file" &&
+	echo "file contents" >ambiguous_branch_and_file &&
+	cp ambiguous_branch_and_file expect &&
+
+	test_must_fail git checkout ambiguous_branch_and_file 2>err &&
+
+	test_i18ngrep "matched multiple (2) remote tracking branches" err &&
+
+	# file must not be altered
+	test_cmp expect ambiguous_branch_and_file
+'
+
 test_expect_success 'checkout of branch from multiple remotes fails with advice' '
 	git checkout -B master &&
 	test_might_fail git branch -D foo &&
diff --git a/third_party/git/t/t2026-checkout-pathspec-file.sh b/third_party/git/t/t2026-checkout-pathspec-file.sh
new file mode 100755
index 000000000000..43d31d794853
--- /dev/null
+++ b/third_party/git/t/t2026-checkout-pathspec-file.sh
@@ -0,0 +1,163 @@
+#!/bin/sh
+
+test_description='checkout --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	test_commit file0 &&
+
+	echo 1 >fileA.t &&
+	echo 1 >fileB.t &&
+	echo 1 >fileC.t &&
+	echo 1 >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 1" &&
+
+	echo 2 >fileA.t &&
+	echo 2 >fileB.t &&
+	echo 2 >fileC.t &&
+	echo 2 >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 2" &&
+
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	echo fileA.t | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git checkout --pathspec-from-file=list HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git checkout --pathspec-from-file=- --pathspec-file-nul HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git checkout --pathspec-from-file=list HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git checkout --pathspec-from-file=list --pathspec-file-nul HEAD^1
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileB.t
+	M  fileC.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+
+	test_must_fail git checkout --pathspec-from-file=list --detach 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --detach" err &&
+
+	test_must_fail git checkout --pathspec-from-file=list --patch 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+
+	test_must_fail git checkout --pathspec-from-file=list -- fileA.t 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+
+	test_must_fail git checkout --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err
+'
+
+test_done
diff --git a/third_party/git/t/t2070-restore.sh b/third_party/git/t/t2070-restore.sh
index 2650df196670..076d0df7fc06 100755
--- a/third_party/git/t/t2070-restore.sh
+++ b/third_party/git/t/t2070-restore.sh
@@ -95,4 +95,32 @@ test_expect_success 'restore --ignore-unmerged ignores unmerged entries' '
 	)
 '
 
+test_expect_success 'restore --staged adds deleted intent-to-add file back to index' '
+	echo "nonempty" >nonempty &&
+	>empty &&
+	git add nonempty empty &&
+	git commit -m "create files to be deleted" &&
+	git rm --cached nonempty empty &&
+	git add -N nonempty empty &&
+	git restore --staged nonempty empty &&
+	git diff --cached --exit-code
+'
+
+test_expect_success 'restore --staged invalidates cache tree for deletions' '
+	test_when_finished git reset --hard &&
+	>new1 &&
+	>new2 &&
+	git add new1 new2 &&
+
+	# It is important to commit and then reset here, so that the index
+	# contains a valid cache-tree for the "both" tree.
+	git commit -m both &&
+	git reset --soft HEAD^ &&
+
+	git restore --staged new1 &&
+	git commit -m "just new2" &&
+	git rev-parse HEAD:new2 &&
+	test_must_fail git rev-parse HEAD:new1
+'
+
 test_done
diff --git a/third_party/git/t/t2072-restore-pathspec-file.sh b/third_party/git/t/t2072-restore-pathspec-file.sh
new file mode 100755
index 000000000000..0d47946e8a9b
--- /dev/null
+++ b/third_party/git/t/t2072-restore-pathspec-file.sh
@@ -0,0 +1,164 @@
+#!/bin/sh
+
+test_description='restore --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	test_commit file0 &&
+
+	echo 1 >fileA.t &&
+	echo 1 >fileB.t &&
+	echo 1 >fileC.t &&
+	echo 1 >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 1" &&
+
+	echo 2 >fileA.t &&
+	echo 2 >fileB.t &&
+	echo 2 >fileC.t &&
+	echo 2 >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 2" &&
+
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileB.t
+	 M fileC.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
+
+	test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+
+	test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+
+	test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+
+	test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err &&
+	test_i18ngrep -e "you must specify path(s) to restore" err
+'
+
+test_done
diff --git a/third_party/git/t/t2107-update-index-basic.sh b/third_party/git/t/t2107-update-index-basic.sh
index 2242cd098ec4..a30b7ca6bc90 100755
--- a/third_party/git/t/t2107-update-index-basic.sh
+++ b/third_party/git/t/t2107-update-index-basic.sh
@@ -9,7 +9,6 @@ Tests for command-line parsing and basic operation.
 
 test_expect_success 'update-index --nonsense fails' '
 	test_must_fail git update-index --nonsense 2>msg &&
-	cat msg &&
 	test -s msg
 '
 
diff --git a/third_party/git/t/t2400-worktree-add.sh b/third_party/git/t/t2400-worktree-add.sh
index e819ba741ec9..5a7495474aa8 100755
--- a/third_party/git/t/t2400-worktree-add.sh
+++ b/third_party/git/t/t2400-worktree-add.sh
@@ -438,7 +438,7 @@ test_expect_success 'git worktree add does not match remote' '
 		cd foo &&
 		test_must_fail git config "branch.foo.remote" &&
 		test_must_fail git config "branch.foo.merge" &&
-		! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
 	)
 '
 
@@ -483,7 +483,7 @@ test_expect_success 'git worktree --no-guess-remote option overrides config' '
 		cd foo &&
 		test_must_fail git config "branch.foo.remote" &&
 		test_must_fail git config "branch.foo.merge" &&
-		! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
 	)
 '
 
@@ -570,6 +570,15 @@ test_expect_success '"add" an existing locked but missing worktree' '
 	git worktree add --force --force --detach gnoo
 '
 
+test_expect_success '"add" not tripped up by magic worktree matching"' '
+	# if worktree "sub1/bar" exists, "git worktree add bar" in distinct
+	# directory `sub2` should not mistakenly complain that `bar` is an
+	# already-registered worktree
+	mkdir sub1 sub2 &&
+	git -C sub1 --git-dir=../.git worktree add --detach bozo &&
+	git -C sub2 --git-dir=../.git worktree add --detach bozo
+'
+
 test_expect_success FUNNYNAMES 'sanitize generated worktree name' '
 	git worktree add --detach ".  weird*..?.lock.lock" &&
 	test -d .git/worktrees/---weird-.-
@@ -587,4 +596,28 @@ test_expect_success '"add" should not fail because of another bad worktree' '
 	)
 '
 
+test_expect_success '"add" with uninitialized submodule, with submodule.recurse unset' '
+	test_create_repo submodule &&
+	test_commit -C submodule first &&
+	test_create_repo project &&
+	git -C project submodule add ../submodule &&
+	git -C project add submodule &&
+	test_tick &&
+	git -C project commit -m add_sub &&
+	git clone project project-clone &&
+	git -C project-clone worktree add ../project-2
+'
+test_expect_success '"add" with uninitialized submodule, with submodule.recurse set' '
+	git -C project-clone -c submodule.recurse worktree add ../project-3
+'
+
+test_expect_success '"add" with initialized submodule, with submodule.recurse unset' '
+	git -C project-clone submodule update --init &&
+	git -C project-clone worktree add ../project-4
+'
+
+test_expect_success '"add" with initialized submodule, with submodule.recurse set' '
+	git -C project-clone -c submodule.recurse worktree add ../project-5
+'
+
 test_done
diff --git a/third_party/git/t/t2402-worktree-list.sh b/third_party/git/t/t2402-worktree-list.sh
index bb6fb9b12cb7..69ffe865b439 100755
--- a/third_party/git/t/t2402-worktree-list.sh
+++ b/third_party/git/t/t2402-worktree-list.sh
@@ -151,4 +151,10 @@ test_expect_success 'linked worktrees are sorted' '
 	test_cmp expected sorted/main/actual
 '
 
+test_expect_success 'worktree path when called in .git directory' '
+	git worktree list >list1&&
+	git -C .git worktree list >list2 &&
+	test_cmp list1 list2
+'
+
 test_done
diff --git a/third_party/git/t/t2405-worktree-submodule.sh b/third_party/git/t/t2405-worktree-submodule.sh
new file mode 100755
index 000000000000..e1b2bfd87e0d
--- /dev/null
+++ b/third_party/git/t/t2405-worktree-submodule.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+test_description='Combination of submodules and multiple worktrees'
+
+. ./test-lib.sh
+
+base_path=$(pwd -P)
+
+test_expect_success 'setup: create origin repos'  '
+	git init origin/sub &&
+	test_commit -C origin/sub file1 &&
+	git init origin/main &&
+	test_commit -C origin/main first &&
+	git -C origin/main submodule add ../sub &&
+	git -C origin/main commit -m "add sub" &&
+	test_commit -C origin/sub "file1 updated" file1 file1updated file1updated &&
+	git -C origin/main/sub pull &&
+	git -C origin/main add sub &&
+	git -C origin/main commit -m "sub updated"
+'
+
+test_expect_success 'setup: clone superproject to create main worktree' '
+	git clone --recursive "$base_path/origin/main" main
+'
+
+rev1_hash_main=$(git --git-dir=origin/main/.git show --pretty=format:%h -q "HEAD~1")
+rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1")
+
+test_expect_success 'add superproject worktree' '
+	git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
+'
+
+test_expect_failure 'submodule is checked out just after worktree add' '
+	git -C worktree diff --submodule master"^!" >out &&
+	grep "file1 updated" out
+'
+
+test_expect_success 'add superproject worktree and initialize submodules' '
+	git -C main worktree add "$base_path/worktree-submodule-update" "$rev1_hash_main" &&
+	git -C worktree-submodule-update submodule update
+'
+
+test_expect_success 'submodule is checked out just after submodule update in linked worktree' '
+	git -C worktree-submodule-update diff --submodule master"^!" >out &&
+	grep "file1 updated" out
+'
+
+test_expect_success 'add superproject worktree and manually add submodule worktree' '
+	git -C main worktree add "$base_path/linked_submodule" "$rev1_hash_main" &&
+	git -C main/sub worktree add "$base_path/linked_submodule/sub" "$rev1_hash_sub"
+'
+
+test_expect_success 'submodule is checked out after manually adding submodule worktree' '
+	git -C linked_submodule diff --submodule master"^!" >out &&
+	grep "file1 updated" out
+'
+
+test_expect_success 'checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree' '
+	git -C main worktree add "$base_path/checkout-recurse" --detach  &&
+	git -C checkout-recurse submodule update --init &&
+	echo "gitdir: ../../main/.git/worktrees/checkout-recurse/modules/sub" >expect-gitfile &&
+	cat checkout-recurse/sub/.git >actual-gitfile &&
+	test_cmp expect-gitfile actual-gitfile &&
+	git -C main/sub rev-parse HEAD >expect-head-main &&
+	git -C checkout-recurse checkout --recurse-submodules HEAD~1 &&
+	cat checkout-recurse/sub/.git >actual-gitfile &&
+	git -C main/sub rev-parse HEAD >actual-head-main &&
+	test_cmp expect-gitfile actual-gitfile &&
+	test_cmp expect-head-main actual-head-main
+'
+
+test_expect_success 'core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config' '
+	echo "../../../sub" >expect-main &&
+	git -C main/sub config --get core.worktree >actual-main &&
+	test_cmp expect-main actual-main &&
+	echo "../../../../../../checkout-recurse/sub" >expect-linked &&
+	git -C checkout-recurse/sub config --get core.worktree >actual-linked &&
+	test_cmp expect-linked actual-linked &&
+	git -C checkout-recurse checkout --recurse-submodules first &&
+	test_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config &&
+	test_must_be_empty linked-config &&
+	git -C main/sub config --get core.worktree >actual-main &&
+	test_cmp expect-main actual-main
+'
+
+test_expect_success 'unsetting core.worktree does not prevent running commands directly against the submodule repository' '
+	git -C main/.git/worktrees/checkout-recurse/modules/sub log
+'
+
+test_done
diff --git a/third_party/git/t/t3005-ls-files-relative.sh b/third_party/git/t/t3005-ls-files-relative.sh
index 209b4c7cd8c6..2ec69a8a266f 100755
--- a/third_party/git/t/t3005-ls-files-relative.sh
+++ b/third_party/git/t/t3005-ls-files-relative.sh
@@ -7,10 +7,6 @@ This test runs git ls-files with various relative path arguments.
 
 . ./test-lib.sh
 
-new_line='
-'
-sq=\'
-
 test_expect_success 'prepare' '
 	: >never-mind-me &&
 	git add never-mind-me &&
@@ -44,9 +40,9 @@ test_expect_success 'ls-files -c' '
 		cd top/sub &&
 		for f in ../y*
 		do
-			echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
+			echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
 		done >expect.err &&
-		echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
+		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
 		ls ../x* >expect.out &&
 		test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
 		test_cmp expect.out actual.out &&
@@ -59,9 +55,9 @@ test_expect_success 'ls-files -o' '
 		cd top/sub &&
 		for f in ../x*
 		do
-			echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
+			echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
 		done >expect.err &&
-		echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
+		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
 		ls ../y* >expect.out &&
 		test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
 		test_cmp expect.out actual.out &&
diff --git a/third_party/git/t/t3007-ls-files-recurse-submodules.sh b/third_party/git/t/t3007-ls-files-recurse-submodules.sh
index 318b5bce7ebe..4a0800071379 100755
--- a/third_party/git/t/t3007-ls-files-recurse-submodules.sh
+++ b/third_party/git/t/t3007-ls-files-recurse-submodules.sh
@@ -130,7 +130,6 @@ test_expect_success '--recurse-submodules and pathspecs setup' '
 
 	git ls-files --recurse-submodules >actual &&
 	test_cmp expect actual &&
-	cat actual &&
 	git ls-files --recurse-submodules "*" >actual &&
 	test_cmp expect actual
 '
diff --git a/third_party/git/t/t3008-ls-files-lazy-init-name-hash.sh b/third_party/git/t/t3008-ls-files-lazy-init-name-hash.sh
index 64f047332b51..85f370495876 100755
--- a/third_party/git/t/t3008-ls-files-lazy-init-name-hash.sh
+++ b/third_party/git/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -4,7 +4,7 @@ test_description='Test the lazy init name hash with various folder structures'
 
 . ./test-lib.sh
 
-if test 1 -eq $($GIT_BUILD_DIR/t/helper/test-tool online-cpus)
+if test 1 -eq $(test-tool online-cpus)
 then
 	skip_all='skipping lazy-init tests, single cpu'
 	test_done
diff --git a/third_party/git/t/t3011-common-prefixes-and-directory-traversal.sh b/third_party/git/t/t3011-common-prefixes-and-directory-traversal.sh
new file mode 100755
index 000000000000..3da5b2b6e795
--- /dev/null
+++ b/third_party/git/t/t3011-common-prefixes-and-directory-traversal.sh
@@ -0,0 +1,209 @@
+#!/bin/sh
+
+test_description='directory traversal handling, especially with common prefixes'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	test_commit hello &&
+
+	>empty &&
+	mkdir untracked_dir &&
+	>untracked_dir/empty &&
+	git init untracked_repo &&
+	>untracked_repo/empty &&
+
+	cat <<-EOF >.gitignore &&
+	ignored
+	an_ignored_dir/
+	EOF
+	mkdir an_ignored_dir &&
+	mkdir an_untracked_dir &&
+	>an_ignored_dir/ignored &&
+	>an_ignored_dir/untracked &&
+	>an_untracked_dir/ignored &&
+	>an_untracked_dir/untracked
+'
+
+test_expect_success 'git ls-files -o shows the right entries' '
+	cat <<-EOF >expect &&
+	.gitignore
+	actual
+	an_ignored_dir/ignored
+	an_ignored_dir/untracked
+	an_untracked_dir/ignored
+	an_untracked_dir/untracked
+	empty
+	expect
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --exclude-standard shows the right entries' '
+	cat <<-EOF >expect &&
+	.gitignore
+	actual
+	an_untracked_dir/untracked
+	empty
+	expect
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o --exclude-standard >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_dir recurses' '
+	echo untracked_dir/empty >expect &&
+	git ls-files -o untracked_dir >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_dir/ recurses' '
+	echo untracked_dir/empty >expect &&
+	git ls-files -o untracked_dir/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --directory untracked_dir does not recurse' '
+	echo untracked_dir/ >expect &&
+	git ls-files -o --directory untracked_dir >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --directory untracked_dir/ does not recurse' '
+	echo untracked_dir/ >expect &&
+	git ls-files -o --directory untracked_dir/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_repo does not recurse' '
+	echo untracked_repo/ >expect &&
+	git ls-files -o untracked_repo >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_repo/ does not recurse' '
+	echo untracked_repo/ >expect &&
+	git ls-files -o untracked_repo/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_dir untracked_repo recurses into untracked_dir only' '
+	cat <<-EOF >expect &&
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o untracked_dir untracked_repo >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_dir/ untracked_repo/ recurses into untracked_dir only' '
+	cat <<-EOF >expect &&
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o untracked_dir/ untracked_repo/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --directory untracked_dir untracked_repo does not recurse' '
+	cat <<-EOF >expect &&
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory untracked_dir untracked_repo >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --directory untracked_dir/ untracked_repo/ does not recurse' '
+	cat <<-EOF >expect &&
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory untracked_dir/ untracked_repo/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o .git shows nothing' '
+	git ls-files -o .git >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success 'git ls-files -o .git/ shows nothing' '
+	git ls-files -o .git/ >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success FUNNYNAMES 'git ls-files -o untracked_* recurses appropriately' '
+	mkdir "untracked_*" &&
+	>"untracked_*/empty" &&
+
+	cat <<-EOF >expect &&
+	untracked_*/empty
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o "untracked_*" >actual &&
+	test_cmp expect actual
+'
+
+# It turns out fill_directory returns the right paths, but ls-files' post-call
+# filtering in show_dir_entry() via calling dir_path_match() which ends up
+# in git_fnmatch() has logic for PATHSPEC_ONESTAR that assumes the pathspec
+# must match the full path; it doesn't check it for matching a leading
+# directory.
+test_expect_failure FUNNYNAMES 'git ls-files -o untracked_*/ recurses appropriately' '
+	cat <<-EOF >expect &&
+	untracked_*/empty
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o "untracked_*/" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success FUNNYNAMES 'git ls-files -o --directory untracked_* does not recurse' '
+	cat <<-EOF >expect &&
+	untracked_*/
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory "untracked_*" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success FUNNYNAMES 'git ls-files -o --directory untracked_*/ does not recurse' '
+	cat <<-EOF >expect &&
+	untracked_*/
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory "untracked_*/" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o consistent between one or two dirs' '
+	git ls-files -o --exclude-standard an_ignored_dir/ an_untracked_dir/ >tmp &&
+	! grep ^an_ignored_dir/ tmp >expect &&
+	git ls-files -o --exclude-standard an_ignored_dir/ >actual &&
+	test_cmp expect actual
+'
+
+# ls-files doesn't have a way to request showing both untracked and ignored
+# files at the same time, so use `git status --ignored`
+test_expect_success 'git status --ignored shows same files under dir with or without pathspec' '
+	cat <<-EOF >expect &&
+	?? an_untracked_dir/
+	!! an_untracked_dir/ignored
+	EOF
+	git status --porcelain --ignored >output &&
+	grep an_untracked_dir output >expect &&
+	git status --porcelain --ignored an_untracked_dir/ >actual &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/third_party/git/t/t3030-merge-recursive.sh b/third_party/git/t/t3030-merge-recursive.sh
index ff641b348a1b..d48d211a9540 100755
--- a/third_party/git/t/t3030-merge-recursive.sh
+++ b/third_party/git/t/t3030-merge-recursive.sh
@@ -452,6 +452,34 @@ test_expect_success 'merge-recursive d/f conflict result' '
 
 '
 
+test_expect_success SYMLINKS 'dir in working tree with symlink ancestor does not produce d/f conflict' '
+	git init sym &&
+	(
+		cd sym &&
+		ln -s . foo &&
+		mkdir bar &&
+		>bar/file &&
+		git add foo bar/file &&
+		git commit -m "foo symlink" &&
+
+		git checkout -b branch1 &&
+		git commit --allow-empty -m "empty commit" &&
+
+		git checkout master &&
+		git rm foo &&
+		mkdir foo &&
+		>foo/bar &&
+		git add foo/bar &&
+		git commit -m "replace foo symlink with real foo dir and foo/bar file" &&
+
+		git checkout branch1 &&
+
+		git cherry-pick master &&
+		test_path_is_dir foo &&
+		test_path_is_file foo/bar
+	)
+'
+
 test_expect_success 'reset and 3-way merge' '
 
 	git reset --hard "$c2" &&
@@ -576,7 +604,7 @@ test_expect_success 'merge removes empty directories' '
 	git commit -mremoved-d/e &&
 	git checkout master &&
 	git merge -s recursive rm &&
-	test_must_fail test -d d
+	test_path_is_missing d
 '
 
 test_expect_success 'merge-recursive simple w/submodule' '
@@ -667,15 +695,22 @@ test_expect_success 'merging with triple rename across D/F conflict' '
 test_expect_success 'merge-recursive remembers the names of all base trees' '
 	git reset --hard HEAD &&
 
+	# make the index match $c1 so that merge-recursive below does not
+	# fail early
+	git diff --binary HEAD $c1 -- | git apply --cached &&
+
 	# more trees than static slots used by oid_to_hex()
 	for commit in $c0 $c2 $c4 $c5 $c6 $c7
 	do
 		git rev-parse "$commit^{tree}"
 	done >trees &&
 
-	# ignore the return code -- it only fails because the input is weird
+	# ignore the return code; it only fails because the input is weird...
 	test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&
 
+	# ...but make sure it fails in the expected way
+	test_i18ngrep CONFLICT.*rename/rename out &&
+
 	# merge-recursive prints in reverse order, but we do not care
 	sort <trees >expect &&
 	sed -n "s/^virtual //p" out | sort >actual &&
diff --git a/third_party/git/t/t3035-merge-sparse.sh b/third_party/git/t/t3035-merge-sparse.sh
index c4b4a94324a2..74562e123566 100755
--- a/third_party/git/t/t3035-merge-sparse.sh
+++ b/third_party/git/t/t3035-merge-sparse.sh
@@ -28,7 +28,7 @@ test_expect_success 'setup' '
 	git config core.sparseCheckout true &&
 	echo "/checked-out" >.git/info/sparse-checkout &&
 	git reset --hard &&
-	! git merge theirs
+	test_must_fail git merge theirs
 '
 
 test_expect_success 'reset --hard works after the conflict' '
@@ -42,7 +42,7 @@ test_expect_success 'is reset properly' '
 '
 
 test_expect_success 'setup: conflict back' '
-	! git merge theirs
+	test_must_fail git merge theirs
 '
 
 test_expect_success 'Merge abort works after the conflict' '
diff --git a/third_party/git/t/t3060-ls-files-with-tree.sh b/third_party/git/t/t3060-ls-files-with-tree.sh
index 44f378ce41d2..52ed665fcd2d 100755
--- a/third_party/git/t/t3060-ls-files-with-tree.sh
+++ b/third_party/git/t/t3060-ls-files-with-tree.sh
@@ -47,7 +47,7 @@ test_expect_success setup '
 	git add .
 '
 
-test_expect_success 'git -ls-files --with-tree should succeed from subdir' '
+test_expect_success 'git ls-files --with-tree should succeed from subdir' '
 	# We have to run from a sub-directory to trigger prune_path
 	# Then we finally get to run our --with-tree test
 	(
@@ -57,7 +57,7 @@ test_expect_success 'git -ls-files --with-tree should succeed from subdir' '
 '
 
 test_expect_success \
-    'git -ls-files --with-tree should add entries from named tree.' \
+    'git ls-files --with-tree should add entries from named tree.' \
     'test_cmp expected output'
 
 test_done
diff --git a/third_party/git/t/t3201-branch-contains.sh b/third_party/git/t/t3201-branch-contains.sh
index 0ea4fc46949d..40251c9f8f68 100755
--- a/third_party/git/t/t3201-branch-contains.sh
+++ b/third_party/git/t/t3201-branch-contains.sh
@@ -192,10 +192,10 @@ test_expect_success 'branch --merged with --verbose' '
 	EOF
 	test_cmp expect actual &&
 	git branch --verbose --merged topic >actual &&
-	cat >expect <<-\EOF &&
-	  master c77a0a9 second on master
-	* topic  2c939f4 [ahead 1] foo
-	  zzz    c77a0a9 second on master
+	cat >expect <<-EOF &&
+	  master $(git rev-parse --short master) second on master
+	* topic  $(git rev-parse --short topic ) [ahead 1] foo
+	  zzz    $(git rev-parse --short zzz   ) second on master
 	EOF
 	test_i18ncmp expect actual
 '
diff --git a/third_party/git/t/t3206-range-diff.sh b/third_party/git/t/t3206-range-diff.sh
index ec548654ce1c..bd808f87ed5b 100755
--- a/third_party/git/t/t3206-range-diff.sh
+++ b/third_party/git/t/t3206-range-diff.sh
@@ -8,97 +8,212 @@ test_description='range-diff tests'
 # harm than good.  We need some real history.
 
 test_expect_success 'setup' '
-	git fast-import < "$TEST_DIRECTORY"/t3206/history.export
+	git fast-import <"$TEST_DIRECTORY"/t3206/history.export &&
+	test_oid_cache <<-\EOF
+	# topic
+	t1 sha1:4de457d
+	t2 sha1:fccce22
+	t3 sha1:147e64e
+	t4 sha1:a63e992
+	t1 sha256:b89f8b9
+	t2 sha256:5f12aad
+	t3 sha256:ea8b273
+	t4 sha256:14b7336
+
+	# unmodified
+	u1 sha1:35b9b25
+	u2 sha1:de345ab
+	u3 sha1:9af6654
+	u4 sha1:2901f77
+	u1 sha256:e3731be
+	u2 sha256:14fadf8
+	u3 sha256:736c4bc
+	u4 sha256:673e77d
+
+	# reordered
+	r1 sha1:aca177a
+	r2 sha1:14ad629
+	r3 sha1:ee58208
+	r4 sha1:307b27a
+	r1 sha256:f59d3aa
+	r2 sha256:fb261a8
+	r3 sha256:cb2649b
+	r4 sha256:958577e
+
+	# removed (deleted)
+	d1 sha1:7657159
+	d2 sha1:43d84d3
+	d3 sha1:a740396
+	d1 sha256:e312513
+	d2 sha256:eb19258
+	d3 sha256:1ccb3c1
+
+	# added
+	a1 sha1:2716022
+	a2 sha1:b62accd
+	a3 sha1:df46cfa
+	a4 sha1:3e64548
+	a5 sha1:12b4063
+	a1 sha256:d724f4d
+	a2 sha256:1de7762
+	a3 sha256:e159431
+	a4 sha256:b3e483c
+	a5 sha256:90866a7
+
+	# rebased
+	b1 sha1:cc9c443
+	b2 sha1:c5d9641
+	b3 sha1:28cc2b6
+	b4 sha1:5628ab7
+	b5 sha1:a31b12e
+	b1 sha256:a1a8717
+	b2 sha256:20a5862
+	b3 sha256:587172a
+	b4 sha256:2721c5d
+	b5 sha256:7b57864
+
+	# changed
+	c1 sha1:a4b3333
+	c2 sha1:f51d370
+	c3 sha1:0559556
+	c4 sha1:d966c5c
+	c1 sha256:f8c2b9d
+	c2 sha256:3fb6318
+	c3 sha256:168ab68
+	c4 sha256:3526539
+
+	# changed-message
+	m1 sha1:f686024
+	m2 sha1:4ab067d
+	m3 sha1:b9cb956
+	m4 sha1:8add5f1
+	m1 sha256:31e6281
+	m2 sha256:a06bf1b
+	m3 sha256:82dc654
+	m4 sha256:48470c5
+
+	# renamed
+	n1 sha1:f258d75
+	n2 sha1:017b62d
+	n3 sha1:3ce7af6
+	n4 sha1:1e6226b
+	n1 sha256:ad52114
+	n2 sha256:3b54c8f
+	n3 sha256:3b0a644
+	n4 sha256:e461653
+
+	# mode change
+	o1 sha1:4d39cb3
+	o2 sha1:26c107f
+	o3 sha1:4c1e0f5
+	o1 sha256:d0dd598
+	o2 sha256:c4a279e
+	o3 sha256:78459d7
+
+	# added and removed
+	s1 sha1:096b1ba
+	s2 sha1:d92e698
+	s3 sha1:9a1db4d
+	s4 sha1:fea3b5c
+	s1 sha256:a7f9134
+	s2 sha256:b4c2580
+	s3 sha256:1d62aa2
+	s4 sha256:48160e8
+
+	# Empty delimiter (included so lines match neatly)
+	__ sha1:-------
+	__ sha256:-------
+	EOF
 '
 
 test_expect_success 'simple A..B A..C (unmodified)' '
 	git range-diff --no-color master..topic master..unmodified \
 		>actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  35b9b25 s/5/A/
-	2:  fccce22 = 2:  de345ab s/4/A/
-	3:  147e64e = 3:  9af6654 s/11/B/
-	4:  a63e992 = 4:  2901f77 s/12/B/
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'simple B...C (unmodified)' '
 	git range-diff --no-color topic...unmodified >actual &&
-	# same "expected" as above
-	test_cmp expected actual
+	# same "expect" as above
+	test_cmp expect actual
 '
 
 test_expect_success 'simple A B C (unmodified)' '
 	git range-diff --no-color master topic unmodified >actual &&
-	# same "expected" as above
-	test_cmp expected actual
+	# same "expect" as above
+	test_cmp expect actual
 '
 
 test_expect_success 'trivial reordering' '
 	git range-diff --no-color master topic reordered >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  aca177a s/5/A/
-	3:  147e64e = 2:  14ad629 s/11/B/
-	4:  a63e992 = 3:  ee58208 s/12/B/
-	2:  fccce22 = 4:  307b27a s/4/A/
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid r1) s/5/A/
+	3:  $(test_oid t3) = 2:  $(test_oid r2) s/11/B/
+	4:  $(test_oid t4) = 3:  $(test_oid r3) s/12/B/
+	2:  $(test_oid t2) = 4:  $(test_oid r4) s/4/A/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'removed a commit' '
 	git range-diff --no-color master topic removed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  7657159 s/5/A/
-	2:  fccce22 < -:  ------- s/4/A/
-	3:  147e64e = 2:  43d84d3 s/11/B/
-	4:  a63e992 = 3:  a740396 s/12/B/
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid d1) s/5/A/
+	2:  $(test_oid t2) < -:  $(test_oid __) s/4/A/
+	3:  $(test_oid t3) = 2:  $(test_oid d2) s/11/B/
+	4:  $(test_oid t4) = 3:  $(test_oid d3) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'added a commit' '
 	git range-diff --no-color master topic added >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  2716022 s/5/A/
-	2:  fccce22 = 2:  b62accd s/4/A/
-	-:  ------- > 3:  df46cfa s/6/A/
-	3:  147e64e = 4:  3e64548 s/11/B/
-	4:  a63e992 = 5:  12b4063 s/12/B/
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid a1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid a2) s/4/A/
+	-:  $(test_oid __) > 3:  $(test_oid a3) s/6/A/
+	3:  $(test_oid t3) = 4:  $(test_oid a4) s/11/B/
+	4:  $(test_oid t4) = 5:  $(test_oid a5) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'new base, A B C' '
 	git range-diff --no-color master topic rebased >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  cc9c443 s/5/A/
-	2:  fccce22 = 2:  c5d9641 s/4/A/
-	3:  147e64e = 3:  28cc2b6 s/11/B/
-	4:  a63e992 = 4:  5628ab7 s/12/B/
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid b1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid b2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid b3) s/11/B/
+	4:  $(test_oid t4) = 4:  $(test_oid b4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'new base, B...C' '
 	# this syntax includes the commits from master!
 	git range-diff --no-color topic...rebased >actual &&
-	cat >expected <<-EOF &&
-	-:  ------- > 1:  a31b12e unrelated
-	1:  4de457d = 2:  cc9c443 s/5/A/
-	2:  fccce22 = 3:  c5d9641 s/4/A/
-	3:  147e64e = 4:  28cc2b6 s/11/B/
-	4:  a63e992 = 5:  5628ab7 s/12/B/
+	cat >expect <<-EOF &&
+	-:  $(test_oid __) > 1:  $(test_oid b5) unrelated
+	1:  $(test_oid t1) = 2:  $(test_oid b1) s/5/A/
+	2:  $(test_oid t2) = 3:  $(test_oid b2) s/4/A/
+	3:  $(test_oid t3) = 4:  $(test_oid b3) s/11/B/
+	4:  $(test_oid t4) = 5:  $(test_oid b4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'changed commit' '
 	git range-diff --no-color topic...changed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  a4b3333 s/5/A/
-	2:  fccce22 = 2:  f51d370 s/4/A/
-	3:  147e64e ! 3:  0559556 s/11/B/
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
+	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
 	    @@ file: A
 	      9
 	      10
@@ -108,7 +223,7 @@ test_expect_success 'changed commit' '
 	      12
 	      13
 	      14
-	4:  a63e992 ! 4:  d966c5c s/12/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
 	    @@ file
 	     @@ file: A
 	      9
@@ -119,45 +234,45 @@ test_expect_success 'changed commit' '
 	     +B
 	      13
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'changed commit with --no-patch diff option' '
 	git range-diff --no-color --no-patch topic...changed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  a4b3333 s/5/A/
-	2:  fccce22 = 2:  f51d370 s/4/A/
-	3:  147e64e ! 3:  0559556 s/11/B/
-	4:  a63e992 ! 4:  d966c5c s/12/B/
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
+	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'changed commit with --stat diff option' '
 	git range-diff --no-color --stat topic...changed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  a4b3333 s/5/A/
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
 	     a => b | 0
 	     1 file changed, 0 insertions(+), 0 deletions(-)
-	2:  fccce22 = 2:  f51d370 s/4/A/
+	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
 	     a => b | 0
 	     1 file changed, 0 insertions(+), 0 deletions(-)
-	3:  147e64e ! 3:  0559556 s/11/B/
+	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
 	     a => b | 0
 	     1 file changed, 0 insertions(+), 0 deletions(-)
-	4:  a63e992 ! 4:  d966c5c s/12/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
 	     a => b | 0
 	     1 file changed, 0 insertions(+), 0 deletions(-)
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'changed commit with sm config' '
 	git range-diff --no-color --submodule=log topic...changed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  a4b3333 s/5/A/
-	2:  fccce22 = 2:  f51d370 s/4/A/
-	3:  147e64e ! 3:  0559556 s/11/B/
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
+	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
 	    @@ file: A
 	      9
 	      10
@@ -167,7 +282,7 @@ test_expect_success 'changed commit with sm config' '
 	      12
 	      13
 	      14
-	4:  a63e992 ! 4:  d966c5c s/12/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
 	    @@ file
 	     @@ file: A
 	      9
@@ -178,14 +293,14 @@ test_expect_success 'changed commit with sm config' '
 	     +B
 	      13
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'renamed file' '
 	git range-diff --no-color --submodule=log topic...renamed-file >actual &&
-	sed s/Z/\ /g >expected <<-EOF &&
-	1:  4de457d = 1:  f258d75 s/5/A/
-	2:  fccce22 ! 2:  017b62d s/4/A/
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid n1) s/5/A/
+	2:  $(test_oid t2) ! 2:  $(test_oid n2) s/4/A/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -198,7 +313,7 @@ test_expect_success 'renamed file' '
 	    Z@@
 	    Z 1
 	    Z 2
-	3:  147e64e ! 3:  3ce7af6 s/11/B/
+	3:  $(test_oid t3) ! 3:  $(test_oid n3) s/11/B/
 	    @@ Metadata
 	    Z ## Commit message ##
 	    Z    s/11/B/
@@ -210,7 +325,7 @@ test_expect_success 'renamed file' '
 	    Z 8
 	    Z 9
 	    Z 10
-	4:  a63e992 ! 4:  1e6226b s/12/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid n4) s/12/B/
 	    @@ Metadata
 	    Z ## Commit message ##
 	    Z    s/12/B/
@@ -223,14 +338,54 @@ test_expect_success 'renamed file' '
 	    Z 10
 	    Z B
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
+'
+
+test_expect_success 'file with mode only change' '
+	git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t2) ! 1:  $(test_oid o1) s/4/A/
+	    @@ Metadata
+	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+	    Z
+	    Z ## Commit message ##
+	    -    s/4/A/
+	    +    s/4/A/ + add other-file
+	    Z
+	    Z ## file ##
+	    Z@@
+	    @@ file
+	    Z A
+	    Z 6
+	    Z 7
+	    +
+	    + ## other-file (new) ##
+	2:  $(test_oid t3) ! 2:  $(test_oid o2) s/11/B/
+	    @@ Metadata
+	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+	    Z
+	    Z ## Commit message ##
+	    -    s/11/B/
+	    +    s/11/B/ + mode change other-file
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	    @@ file: A
+	    Z 12
+	    Z 13
+	    Z 14
+	    +
+	    + ## other-file (mode change 100644 => 100755) ##
+	3:  $(test_oid t4) = 3:  $(test_oid o3) s/12/B/
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'file added and later removed' '
 	git range-diff --no-color --submodule=log topic...added-removed >actual &&
-	sed s/Z/\ /g >expected <<-EOF &&
-	1:  4de457d = 1:  096b1ba s/5/A/
-	2:  fccce22 ! 2:  d92e698 s/4/A/
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid s1) s/5/A/
+	2:  $(test_oid t2) ! 2:  $(test_oid s2) s/4/A/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -246,7 +401,7 @@ test_expect_success 'file added and later removed' '
 	    Z 7
 	    +
 	    + ## new-file (new) ##
-	3:  147e64e ! 3:  9a1db4d s/11/B/
+	3:  $(test_oid t3) ! 3:  $(test_oid s3) s/11/B/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -262,9 +417,9 @@ test_expect_success 'file added and later removed' '
 	    Z 14
 	    +
 	    + ## new-file (deleted) ##
-	4:  a63e992 = 4:  fea3b5c s/12/B/
+	4:  $(test_oid t4) = 4:  $(test_oid s4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'no commits on one side' '
@@ -274,9 +429,9 @@ test_expect_success 'no commits on one side' '
 
 test_expect_success 'changed message' '
 	git range-diff --no-color topic...changed-message >actual &&
-	sed s/Z/\ /g >expected <<-EOF &&
-	1:  4de457d = 1:  f686024 s/5/A/
-	2:  fccce22 ! 2:  4ab067d s/4/A/
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid m1) s/5/A/
+	2:  $(test_oid t2) ! 2:  $(test_oid m2) s/4/A/
 	    @@ Metadata
 	    Z ## Commit message ##
 	    Z    s/4/A/
@@ -286,16 +441,16 @@ test_expect_success 'changed message' '
 	    Z ## file ##
 	    Z@@
 	    Z 1
-	3:  147e64e = 3:  b9cb956 s/11/B/
-	4:  a63e992 = 4:  8add5f1 s/12/B/
+	3:  $(test_oid t3) = 3:  $(test_oid m3) s/11/B/
+	4:  $(test_oid t4) = 4:  $(test_oid m4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'dual-coloring' '
-	sed -e "s|^:||" >expect <<-\EOF &&
-	:<YELLOW>1:  a4b3333 = 1:  f686024 s/5/A/<RESET>
-	:<RED>2:  f51d370 <RESET><YELLOW>!<RESET><GREEN> 2:  4ab067d<RESET><YELLOW> s/4/A/<RESET>
+	sed -e "s|^:||" >expect <<-EOF &&
+	:<YELLOW>1:  $(test_oid c1) = 1:  $(test_oid m1) s/5/A/<RESET>
+	:<RED>2:  $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2:  $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET>
 	:    <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET>
 	:      ## Commit message ##<RESET>
 	:         s/4/A/<RESET>
@@ -305,7 +460,7 @@ test_expect_success 'dual-coloring' '
 	:      ## file ##<RESET>
 	:    <CYAN> @@<RESET>
 	:      1<RESET>
-	:<RED>3:  0559556 <RESET><YELLOW>!<RESET><GREEN> 3:  b9cb956<RESET><YELLOW> s/11/B/<RESET>
+	:<RED>3:  $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3:  $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET>
 	:    <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET>
 	:      9<RESET>
 	:      10<RESET>
@@ -315,7 +470,7 @@ test_expect_success 'dual-coloring' '
 	:      12<RESET>
 	:      13<RESET>
 	:      14<RESET>
-	:<RED>4:  d966c5c <RESET><YELLOW>!<RESET><GREEN> 4:  8add5f1<RESET><YELLOW> s/12/B/<RESET>
+	:<RED>4:  $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4:  $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET>
 	:    <REVERSE><CYAN>@@<RESET> <RESET>file<RESET>
 	:    <CYAN> @@ file: A<RESET>
 	:      9<RESET>
@@ -354,4 +509,206 @@ test_expect_success 'format-patch --range-diff as commentary' '
 	grep "> 1: .* new message" 0001-*
 '
 
+test_expect_success 'range-diff overrides diff.noprefix internally' '
+	git -c diff.noprefix=true range-diff HEAD^...
+'
+
+test_expect_success 'range-diff compares notes by default' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git range-diff --no-color master..topic master..unmodified \
+		>actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes ##
+	    -    topic note
+	    +    unmodified note
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'range-diff with --no-notes' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git range-diff --no-color --no-notes master..topic master..unmodified \
+		>actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'range-diff with multiple --notes' '
+	git notes --ref=note1 add -m "topic note1" topic &&
+	git notes --ref=note1 add -m "unmodified note1" unmodified &&
+	test_when_finished git notes --ref=note1 remove topic unmodified &&
+	git notes --ref=note2 add -m "topic note2" topic &&
+	git notes --ref=note2 add -m "unmodified note2" unmodified &&
+	test_when_finished git notes --ref=note2 remove topic unmodified &&
+	git range-diff --no-color --notes=note1 --notes=note2 master..topic master..unmodified \
+		>actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes (note1) ##
+	    -    topic note1
+	    +    unmodified note1
+	    Z
+	    Z
+	    Z ## Notes (note2) ##
+	    -    topic note2
+	    +    unmodified note2
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'format-patch --range-diff does not compare notes by default' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git format-patch --cover-letter --range-diff=$prev \
+		master..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "= 4: .* s/12/B" 0000-* &&
+	! grep "Notes" 0000-* &&
+	! grep "note" 0000-*
+'
+
+test_expect_success 'format-patch --range-diff with --no-notes' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git format-patch --no-notes --cover-letter --range-diff=$prev \
+		master..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "= 4: .* s/12/B" 0000-* &&
+	! grep "Notes" 0000-* &&
+	! grep "note" 0000-*
+'
+
+test_expect_success 'format-patch --range-diff with --notes' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git format-patch --notes --cover-letter --range-diff=$prev \
+		master..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "! 4: .* s/12/B" 0000-* &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes ##
+	    -    topic note
+	    +    unmodified note
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'format-patch --range-diff with format.notes config' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	test_config format.notes true &&
+	git format-patch --cover-letter --range-diff=$prev \
+		master..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "! 4: .* s/12/B" 0000-* &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes ##
+	    -    topic note
+	    +    unmodified note
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'format-patch --range-diff with multiple notes' '
+	git notes --ref=note1 add -m "topic note1" topic &&
+	git notes --ref=note1 add -m "unmodified note1" unmodified &&
+	test_when_finished git notes --ref=note1 remove topic unmodified &&
+	git notes --ref=note2 add -m "topic note2" topic &&
+	git notes --ref=note2 add -m "unmodified note2" unmodified &&
+	test_when_finished git notes --ref=note2 remove topic unmodified &&
+	git format-patch --notes=note1 --notes=note2 --cover-letter --range-diff=$prev \
+		master..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "! 4: .* s/12/B" 0000-* &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes (note1) ##
+	    -    topic note1
+	    +    unmodified note1
+	    Z
+	    Z
+	    Z ## Notes (note2) ##
+	    -    topic note2
+	    +    unmodified note2
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/third_party/git/t/t3206/history.export b/third_party/git/t/t3206/history.export
index 7bb381496227..4c808e5b3b8d 100644
--- a/third_party/git/t/t3206/history.export
+++ b/third_party/git/t/t3206/history.export
@@ -55,7 +55,7 @@ A
 19
 20
 
-commit refs/heads/topic
+commit refs/heads/mode-only-change
 mark :4
 author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
 committer Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
@@ -678,3 +678,32 @@ s/12/B/
 from :55
 M 100644 :9 renamed-file
 
+commit refs/heads/mode-only-change
+mark :57
+author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1570473767 +0100
+data 24
+s/4/A/ + add other-file
+from :4
+M 100644 :5 file
+M 100644 :49 other-file
+
+commit refs/heads/mode-only-change
+mark :58
+author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1570473768 +0100
+data 33
+s/11/B/ + mode change other-file
+from :57
+M 100644 :7 file
+M 100755 :49 other-file
+
+commit refs/heads/mode-only-change
+mark :59
+author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1570473768 +0100
+data 8
+s/12/B/
+from :58
+M 100644 :9 file
+
diff --git a/third_party/git/t/t3210-pack-refs.sh b/third_party/git/t/t3210-pack-refs.sh
index 9ea5fa4fd246..f41b2afb9964 100755
--- a/third_party/git/t/t3210-pack-refs.sh
+++ b/third_party/git/t/t3210-pack-refs.sh
@@ -240,7 +240,7 @@ test_expect_success 'retry acquiring packed-refs.lock' '
 
 test_expect_success SYMLINKS 'pack symlinked packed-refs' '
 	# First make sure that symlinking works when reading:
-	git update-ref refs/heads/loosy refs/heads/master &&
+	git update-ref refs/heads/lossy refs/heads/master &&
 	git for-each-ref >all-refs-before &&
 	mv .git/packed-refs .git/my-deviant-packed-refs &&
 	ln -s my-deviant-packed-refs .git/packed-refs &&
diff --git a/third_party/git/t/t3301-notes.sh b/third_party/git/t/t3301-notes.sh
index 704bbc65419c..8f4330300707 100755
--- a/third_party/git/t/t3301-notes.sh
+++ b/third_party/git/t/t3301-notes.sh
@@ -54,7 +54,9 @@ test_expect_success 'create notes' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b4" = "$(git notes show)" &&
+	echo b4 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
@@ -66,8 +68,9 @@ test_expect_success 'show notes entry with %N' '
 '
 
 test_expect_success 'create reflog entry' '
+	ref=$(git rev-parse --short refs/notes/commits) &&
 	cat <<-EOF >expect &&
-		a1d8fa6 refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\''
+		$ref refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\''
 	EOF
 	git reflog show refs/notes/commits >actual &&
 	test_cmp expect actual
@@ -78,14 +81,21 @@ test_expect_success 'edit existing notes' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b3" = "$(git notes show)" &&
+	echo b3 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
 
 test_expect_success 'show notes from treeish' '
-	test "b3" = "$(git notes --ref commits^{tree} show)" &&
-	test "b4" = "$(git notes --ref commits@{1} show)"
+	echo b3 >expect &&
+	git notes --ref commits^{tree} show >actual &&
+	test_cmp expect actual &&
+
+	echo b4 >expect &&
+	git notes --ref commits@{1} show >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'cannot edit notes from non-ref' '
@@ -98,7 +108,9 @@ test_expect_success 'cannot "git notes add -m" where notes already exists' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b3" = "$(git notes show)" &&
+	echo b3 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
@@ -108,7 +120,9 @@ test_expect_success 'can overwrite existing note with "git notes add -f -m"' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b1" = "$(git notes show)" &&
+	echo b1 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
@@ -118,7 +132,9 @@ test_expect_success 'add w/no options on existing note morphs into edit' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b2" = "$(git notes show)" &&
+	echo b2 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
@@ -128,14 +144,17 @@ test_expect_success 'can overwrite existing note with "git notes add -f"' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b1" = "$(git notes show)" &&
+	echo b1 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
 
 test_expect_success 'show notes' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:14:13 2005 -0700
 
@@ -144,7 +163,8 @@ test_expect_success 'show notes' '
 		Notes:
 		${indent}b1
 	EOF
-	! (git cat-file commit HEAD | grep b1) &&
+	git cat-file commit HEAD >commits &&
+	! grep b1 commits &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -152,8 +172,9 @@ test_expect_success 'show notes' '
 test_expect_success 'show multi-line notes' '
 	test_commit 3rd &&
 	MSG="b3${LF}c3c3c3c3${LF}d3d3d3" git notes add &&
+	commit=$(git rev-parse HEAD) &&
 	cat >expect-multiline <<-EOF &&
-		commit d07d62e5208f22eb5695e7eb47667dc8b9860290
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:15:13 2005 -0700
 
@@ -174,8 +195,9 @@ test_expect_success 'show -F notes' '
 	test_commit 4th &&
 	echo "xyzzy" >note5 &&
 	git notes add -F note5 &&
+	commit=$(git rev-parse HEAD) &&
 	cat >expect-F <<-EOF &&
-		commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:16:13 2005 -0700
 
@@ -198,10 +220,13 @@ test_expect_success 'Re-adding -F notes without -f fails' '
 '
 
 test_expect_success 'git log --pretty=raw does not show notes' '
+	commit=$(git rev-parse HEAD) &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	parent=$(git rev-parse HEAD^) &&
 	cat >expect <<-EOF &&
-		commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
-		tree 05ac65288c4c4b3b709a020ae94b2ece2f2201ae
-		parent d07d62e5208f22eb5695e7eb47667dc8b9860290
+		commit $commit
+		tree $tree
+		parent $parent
 		author A U Thor <author@example.com> 1112912173 -0700
 		committer C O Mitter <committer@example.com> 1112912173 -0700
 
@@ -291,8 +316,9 @@ test_expect_success 'git log --no-notes resets ref list' '
 test_expect_success 'show -m notes' '
 	test_commit 5th &&
 	git notes add -m spam -m "foo${LF}bar${LF}baz" &&
+	commit=$(git rev-parse HEAD) &&
 	cat >expect-m <<-EOF &&
-		commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:17:13 2005 -0700
 
@@ -313,8 +339,9 @@ test_expect_success 'show -m notes' '
 
 test_expect_success 'remove note with add -f -F /dev/null' '
 	git notes add -f -F /dev/null &&
+	commit=$(git rev-parse HEAD) &&
 	cat >expect-rm-F <<-EOF &&
-		commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:17:13 2005 -0700
 
@@ -356,14 +383,16 @@ test_expect_success 'create note with combination of -m and -F' '
 test_expect_success 'remove note with "git notes remove"' '
 	git notes remove HEAD^ &&
 	git notes remove &&
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
 	cat >expect-rm-remove <<-EOF &&
-		commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:17:13 2005 -0700
 
 		${indent}5th
 
-		commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+		commit $parent
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:16:13 2005 -0700
 
@@ -459,9 +488,13 @@ test_expect_success 'removing with --stdin --ignore-missing' '
 '
 
 test_expect_success 'list notes with "git notes list"' '
-	cat >expect <<-EOF &&
-		c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-		c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290
+	commit_2=$(git rev-parse 2nd) &&
+	commit_3=$(git rev-parse 3rd) &&
+	note_2=$(git rev-parse refs/notes/commits:$commit_2) &&
+	note_3=$(git rev-parse refs/notes/commits:$commit_3) &&
+	sort -t" " -k2 >expect <<-EOF &&
+		$note_2 $commit_2
+		$note_3 $commit_3
 	EOF
 	git notes list >actual &&
 	test_cmp expect actual
@@ -473,9 +506,7 @@ test_expect_success 'list notes with "git notes"' '
 '
 
 test_expect_success 'list specific note with "git notes list <object>"' '
-	cat >expect <<-EOF &&
-		c18dc024e14f08d18d14eea0d747ff692d66d6a3
-	EOF
+	git rev-parse refs/notes/commits:$commit_3 >expect &&
 	git notes list HEAD^^ >actual &&
 	test_cmp expect actual
 '
@@ -498,10 +529,12 @@ test_expect_success 'append to existing note with "git notes append"' '
 '
 
 test_expect_success '"git notes list" does not expand to "git notes list HEAD"' '
-	cat >expect_list <<-EOF &&
-		c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-		4b6ad22357cc8a1296720574b8d2fbc22fab0671 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-		c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290
+	commit_5=$(git rev-parse 5th) &&
+	note_5=$(git rev-parse refs/notes/commits:$commit_5) &&
+	sort -t" " -k2 >expect_list <<-EOF &&
+		$note_2 $commit_2
+		$note_3 $commit_3
+		$note_5 $commit_5
 	EOF
 	git notes list >actual &&
 	test_cmp expect_list actual
@@ -531,8 +564,9 @@ test_expect_success 'appending empty string to non-existing note does not create
 test_expect_success 'create other note on a different notes ref (setup)' '
 	test_commit 6th &&
 	GIT_NOTES_REF="refs/notes/other" git notes add -m "other note" &&
+	commit=$(git rev-parse HEAD) &&
 	cat >expect-not-other <<-EOF &&
-		commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:18:13 2005 -0700
 
@@ -569,8 +603,10 @@ test_expect_success 'Do not show note when core.notesRef is overridden' '
 '
 
 test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' '
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
 	cat >expect-both <<-EOF &&
-		commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:18:13 2005 -0700
 
@@ -582,7 +618,7 @@ test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' '
 		Notes (other):
 		${indent}other note
 
-		commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+		commit $parent
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:17:13 2005 -0700
 
@@ -616,8 +652,9 @@ test_expect_success 'notes.displayRef can be given more than once' '
 '
 
 test_expect_success 'notes.displayRef respects order' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect-both-reversed <<-EOF &&
-		commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:18:13 2005 -0700
 
@@ -642,14 +679,16 @@ test_expect_success 'GIT_NOTES_DISPLAY_REF works' '
 '
 
 test_expect_success 'GIT_NOTES_DISPLAY_REF overrides config' '
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
 	cat >expect-none <<-EOF &&
-		commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:18:13 2005 -0700
 
 		${indent}6th
 
-		commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+		commit $parent
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:17:13 2005 -0700
 
@@ -666,8 +705,9 @@ test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' '
 '
 
 test_expect_success '--no-standard-notes' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect-commits <<-EOF &&
-		commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:18:13 2005 -0700
 
@@ -700,7 +740,8 @@ test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' '
 	git notes show HEAD: >actual &&
 	test_cmp expect actual &&
 	echo "Note on a blob" >expect &&
-	filename=$(git ls-tree --name-only HEAD | head -n1) &&
+	git ls-tree --name-only HEAD >files &&
+	filename=$(head -n1 files) &&
 	git notes add -m "Note on a blob" HEAD:$filename &&
 	git notes show HEAD:$filename >actual &&
 	test_cmp expect actual &&
@@ -712,8 +753,10 @@ test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' '
 '
 
 test_expect_success 'create note from other note with "git notes add -C"' '
+	test_commit 7th &&
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit fb01e0ca8c33b6cc0c6451dde747f97df567cb5c
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:19:13 2005 -0700
 
@@ -722,11 +765,13 @@ test_expect_success 'create note from other note with "git notes add -C"' '
 		Notes:
 		${indent}order test
 	EOF
-	test_commit 7th &&
-	git notes add -C $(git notes list HEAD^) &&
+	note=$(git notes list HEAD^) &&
+	git notes add -C $note &&
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'create note from non-existing note with "git notes add -C" fails' '
@@ -744,8 +789,9 @@ test_expect_success 'create note from non-blob with "git notes add -C" fails' '
 '
 
 test_expect_success 'create note from blob with "git notes add -C" reuses blob id' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:20:13 2005 -0700
 
@@ -754,16 +800,19 @@ test_expect_success 'create note from blob with "git notes add -C" reuses blob i
 		Notes:
 		${indent}This is a blob object
 	EOF
-	blob=$(echo "This is a blob object" | git hash-object -w --stdin) &&
-	git notes add -C $blob &&
+	echo "This is a blob object" | git hash-object -w --stdin >blob &&
+	git notes add -C $(cat blob) &&
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$blob"
+	git notes list HEAD >actual &&
+	test_cmp blob actual
 '
 
 test_expect_success 'create note from other note with "git notes add -c"' '
+	test_commit 9th &&
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 2e0db4bc649e174d667a1cde19e725cf897a5bd2
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:21:13 2005 -0700
 
@@ -772,8 +821,8 @@ test_expect_success 'create note from other note with "git notes add -c"' '
 		Notes:
 		${indent}yet another note
 	EOF
-	test_commit 9th &&
-	MSG="yet another note" git notes add -c $(git notes list HEAD^^) &&
+	note=$(git notes list HEAD^^) &&
+	MSG="yet another note" git notes add -c $note &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -785,8 +834,9 @@ test_expect_success 'create note from non-existing note with "git notes add -c"
 '
 
 test_expect_success 'append to note from other note with "git notes append -C"' '
+	commit=$(git rev-parse HEAD^) &&
 	cat >expect <<-EOF &&
-		commit 2e0db4bc649e174d667a1cde19e725cf897a5bd2
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:21:13 2005 -0700
 
@@ -797,14 +847,16 @@ test_expect_success 'append to note from other note with "git notes append -C"'
 		${indent}
 		${indent}yet another note
 	EOF
-	git notes append -C $(git notes list HEAD^) HEAD^ &&
+	note=$(git notes list HEAD^) &&
+	git notes append -C $note HEAD^ &&
 	git log -1 HEAD^ >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'create note from other note with "git notes append -c"' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:22:13 2005 -0700
 
@@ -813,14 +865,16 @@ test_expect_success 'create note from other note with "git notes append -c"' '
 		Notes:
 		${indent}other note
 	EOF
-	MSG="other note" git notes append -c $(git notes list HEAD^) &&
+	note=$(git notes list HEAD^) &&
+	MSG="other note" git notes append -c $note &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'append to note from other note with "git notes append -c"' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:22:13 2005 -0700
 
@@ -831,14 +885,37 @@ test_expect_success 'append to note from other note with "git notes append -c"'
 		${indent}
 		${indent}yet another note
 	EOF
-	MSG="yet another note" git notes append -c $(git notes list HEAD) &&
+	note=$(git notes list HEAD) &&
+	MSG="yet another note" git notes append -c $note &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'copy note with "git notes copy"' '
+	commit=$(git rev-parse 4th) &&
 	cat >expect <<-EOF &&
-		commit a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:16:13 2005 -0700
+
+		${indent}4th
+
+		Notes:
+		${indent}This is a blob object
+	EOF
+	git notes copy 8th 4th &&
+	git log 3rd..4th >actual &&
+	test_cmp expect actual &&
+	git notes list 4th >expect &&
+	git notes list 8th >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'copy note with "git notes copy" with default' '
+	test_commit 11th &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:23:13 2005 -0700
 
@@ -849,23 +926,59 @@ test_expect_success 'copy note with "git notes copy"' '
 		${indent}
 		${indent}yet another note
 	EOF
-	test_commit 11th &&
-	git notes copy HEAD^ HEAD &&
+	git notes copy HEAD^ &&
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'prevent overwrite with "git notes copy"' '
 	test_must_fail git notes copy HEAD~2 HEAD &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
+
+		${indent}11th
+
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'allow overwrite with "git notes copy -f"' '
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
+
+		${indent}11th
+
+		Notes:
+		${indent}This is a blob object
+	EOF
+	git notes copy -f HEAD~3 HEAD &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~3 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'allow overwrite with "git notes copy -f" with default' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:23:13 2005 -0700
 
@@ -876,10 +989,12 @@ test_expect_success 'allow overwrite with "git notes copy -f"' '
 		${indent}
 		${indent}yet another note
 	EOF
-	git notes copy -f HEAD~2 HEAD &&
+	git notes copy -f HEAD~2 &&
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD~2)"
+	git notes list HEAD~2 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'cannot copy note from object without notes' '
@@ -889,8 +1004,10 @@ test_expect_success 'cannot copy note from object without notes' '
 '
 
 test_expect_success 'git notes copy --stdin' '
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
 	cat >expect <<-EOF &&
-		commit e871aa61182b1d95d0a6fb75445d891722863b6b
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:25:13 2005 -0700
 
@@ -901,7 +1018,7 @@ test_expect_success 'git notes copy --stdin' '
 		${indent}
 		${indent}yet another note
 
-		commit 65e263ded02ae4e8839bc151095113737579dc12
+		commit $parent
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:24:13 2005 -0700
 
@@ -912,41 +1029,57 @@ test_expect_success 'git notes copy --stdin' '
 		${indent}
 		${indent}yet another note
 	EOF
-	(echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
-	echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
-	git notes copy --stdin &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --stdin <copy &&
 	git log -2 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD~2)" &&
-	test "$(git notes list HEAD^)" = "$(git notes list HEAD~3)"
+	git notes list HEAD~2 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~3 >expect &&
+	git notes list HEAD^ >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
+	test_commit 14th &&
+	test_commit 15th &&
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
 	cat >expect <<-EOF &&
-		commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:27:13 2005 -0700
 
 		${indent}15th
 
-		commit 07c85d77059393ed0154b8c96906547a59dfcddd
+		commit $parent
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:26:13 2005 -0700
 
 		${indent}14th
 	EOF
-	test_commit 14th &&
-	test_commit 15th &&
-	(echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
-	echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -2 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (enabled)' '
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
 	cat >expect <<-EOF &&
-		commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:27:13 2005 -0700
 
@@ -957,7 +1090,7 @@ test_expect_success 'git notes copy --for-rewrite (enabled)' '
 		${indent}
 		${indent}yet another note
 
-		commit 07c85d77059393ed0154b8c96906547a59dfcddd
+		commit $parent
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:26:13 2005 -0700
 
@@ -970,24 +1103,31 @@ test_expect_success 'git notes copy --for-rewrite (enabled)' '
 	EOF
 	test_config notes.rewriteMode overwrite &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	(echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
-	echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -2 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (disabled)' '
 	test_config notes.rewrite.bar false &&
-	echo $(git rev-parse HEAD~3) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=bar &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=bar <copy &&
 	git log -2 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (overwrite)' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:27:13 2005 -0700
 
@@ -999,8 +1139,10 @@ test_expect_success 'git notes copy --for-rewrite (overwrite)' '
 	git notes add -f -m"a fresh note" HEAD^ &&
 	test_config notes.rewriteMode overwrite &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1008,15 +1150,18 @@ test_expect_success 'git notes copy --for-rewrite (overwrite)' '
 test_expect_success 'git notes copy --for-rewrite (ignore)' '
 	test_config notes.rewriteMode ignore &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (append)' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:27:13 2005 -0700
 
@@ -1030,15 +1175,18 @@ test_expect_success 'git notes copy --for-rewrite (append)' '
 	git notes add -f -m"another fresh note" HEAD^ &&
 	test_config notes.rewriteMode concatenate &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (append two to one)' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:27:13 2005 -0700
 
@@ -1057,9 +1205,13 @@ test_expect_success 'git notes copy --for-rewrite (append two to one)' '
 	git notes add -f -m"append 2" HEAD^^ &&
 	test_config notes.rewriteMode concatenate &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	(echo $(git rev-parse HEAD^) $(git rev-parse HEAD) &&
-	echo $(git rev-parse HEAD^^) $(git rev-parse HEAD)) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD^^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1068,15 +1220,18 @@ test_expect_success 'git notes copy --for-rewrite (append empty)' '
 	git notes remove HEAD^ &&
 	test_config notes.rewriteMode concatenate &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'GIT_NOTES_REWRITE_MODE works' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:27:13 2005 -0700
 
@@ -1088,15 +1243,18 @@ test_expect_success 'GIT_NOTES_REWRITE_MODE works' '
 	test_config notes.rewriteMode concatenate &&
 	test_config notes.rewriteRef "refs/notes/*" &&
 	git notes add -f -m"replacement note 1" HEAD^ &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'GIT_NOTES_REWRITE_REF works' '
+	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-		commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+		commit $commit
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:27:13 2005 -0700
 
@@ -1108,9 +1266,11 @@ test_expect_success 'GIT_NOTES_REWRITE_REF works' '
 	git notes add -f -m"replacement note 2" HEAD^ &&
 	test_config notes.rewriteMode overwrite &&
 	test_unconfig notes.rewriteRef &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
 	GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
-		git notes copy --for-rewrite=foo &&
+		git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1119,41 +1279,55 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
 	git notes add -f -m"replacement note 3" HEAD^ &&
 	test_config notes.rewriteMode overwrite &&
 	test_config notes.rewriteRef refs/notes/other &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
 	GIT_NOTES_REWRITE_REF=refs/notes/commits \
-		git notes copy --for-rewrite=foo &&
+		git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	grep "replacement note 3" actual
 '
 
 test_expect_success 'git notes copy diagnoses too many or too few parameters' '
-	test_must_fail git notes copy &&
-	test_must_fail git notes copy one two three
+	test_must_fail git notes copy 2>error &&
+	test_i18ngrep "too few parameters" error &&
+	test_must_fail git notes copy one two three 2>error &&
+	test_i18ngrep "too many parameters" error
 '
 
 test_expect_success 'git notes get-ref expands refs/heads/master to refs/notes/refs/heads/master' '
 	test_unconfig core.notesRef &&
 	sane_unset GIT_NOTES_REF &&
-	test "$(git notes --ref=refs/heads/master get-ref)" = "refs/notes/refs/heads/master"
+	echo refs/notes/refs/heads/master >expect &&
+	git notes --ref=refs/heads/master get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (no overrides)' '
 	test_unconfig core.notesRef &&
 	sane_unset GIT_NOTES_REF &&
-	test "$(git notes get-ref)" = "refs/notes/commits"
+	echo refs/notes/commits >expect &&
+	git notes get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (core.notesRef)' '
 	test_config core.notesRef refs/notes/foo &&
-	test "$(git notes get-ref)" = "refs/notes/foo"
+	echo refs/notes/foo >expect &&
+	git notes get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (GIT_NOTES_REF)' '
-	test "$(GIT_NOTES_REF=refs/notes/bar git notes get-ref)" = "refs/notes/bar"
+	echo refs/notes/bar >expect &&
+	GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (--ref)' '
-	test "$(GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref)" = "refs/notes/baz"
+	echo refs/notes/baz >expect &&
+	GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'setup testing of empty notes' '
diff --git a/third_party/git/t/t3305-notes-fanout.sh b/third_party/git/t/t3305-notes-fanout.sh
index 54460beec469..3b4753e1b479 100755
--- a/third_party/git/t/t3305-notes-fanout.sh
+++ b/third_party/git/t/t3305-notes-fanout.sh
@@ -4,6 +4,38 @@ test_description='Test that adding/removing many notes triggers automatic fanout
 
 . ./test-lib.sh
 
+path_has_fanout() {
+	path=$1 &&
+	fanout=$2 &&
+	after_last_slash=$((40 - $fanout * 2)) &&
+	echo $path | grep -q "^\([0-9a-f]\{2\}/\)\{$fanout\}[0-9a-f]\{$after_last_slash\}$"
+}
+
+touched_one_note_with_fanout() {
+	notes_commit=$1 &&
+	modification=$2 &&  # 'A' for addition, 'D' for deletion
+	fanout=$3 &&
+	diff=$(git diff-tree --no-commit-id --name-status --root -r $notes_commit) &&
+	path=$(echo $diff | sed -e "s/^$modification[\t ]//") &&
+	path_has_fanout "$path" $fanout;
+}
+
+all_notes_have_fanout() {
+	notes_commit=$1 &&
+	fanout=$2 &&
+	git ls-tree -r --name-only $notes_commit 2>/dev/null |
+	while read path
+	do
+		path_has_fanout $path $fanout || return 1
+	done
+}
+
+test_expect_success 'tweak test environment' '
+	git checkout -b nondeterminism &&
+	test_commit A &&
+	git checkout --orphan with_notes;
+'
+
 test_expect_success 'creating many notes with git-notes' '
 	num_notes=300 &&
 	i=0 &&
@@ -20,7 +52,7 @@ test_expect_success 'creating many notes with git-notes' '
 
 test_expect_success 'many notes created correctly with git-notes' '
 	git log | grep "^    " > output &&
-	i=300 &&
+	i=$num_notes &&
 	while test $i -gt 0
 	do
 		echo "    commit #$i" &&
@@ -30,39 +62,46 @@ test_expect_success 'many notes created correctly with git-notes' '
 	test_cmp expect output
 '
 
-test_expect_success 'many notes created with git-notes triggers fanout' '
-	# Expect entire notes tree to have a fanout == 1
-	git ls-tree -r --name-only refs/notes/commits |
-	while read path
+test_expect_success 'stable fanout 0 is followed by stable fanout 1' '
+	i=$num_notes &&
+	fanout=0 &&
+	while test $i -gt 0
 	do
-		case "$path" in
-		??/??????????????????????????????????????)
-			: true
-			;;
-		*)
-			echo "Invalid path \"$path\"" &&
-			return 1
-			;;
-		esac
-	done
+		i=$(($i - 1)) &&
+		if touched_one_note_with_fanout refs/notes/commits~$i A $fanout
+		then
+			continue
+		elif test $fanout -eq 0
+		then
+			fanout=1 &&
+			if all_notes_have_fanout refs/notes/commits~$i $fanout
+			then
+				echo "Fanout 0 -> 1 at refs/notes/commits~$i" &&
+				continue
+			fi
+		fi &&
+		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
+		git ls-tree -r --name-only refs/notes/commits~$i &&
+		return 1
+	done &&
+	all_notes_have_fanout refs/notes/commits 1
 '
 
 test_expect_success 'deleting most notes with git-notes' '
-	num_notes=250 &&
+	remove_notes=285 &&
 	i=0 &&
 	git rev-list HEAD |
-	while test $i -lt $num_notes && read sha1
+	while test $i -lt $remove_notes && read sha1
 	do
 		i=$(($i + 1)) &&
 		test_tick &&
-		git notes remove "$sha1" ||
-		exit 1
+		git notes remove "$sha1" 2>/dev/null || return 1
 	done
 '
 
 test_expect_success 'most notes deleted correctly with git-notes' '
-	git log HEAD~250 | grep "^    " > output &&
-	i=50 &&
+	git log HEAD~$remove_notes | grep "^    " > output &&
+	i=$(($num_notes - $remove_notes)) &&
 	while test $i -gt 0
 	do
 		echo "    commit #$i" &&
@@ -72,21 +111,29 @@ test_expect_success 'most notes deleted correctly with git-notes' '
 	test_cmp expect output
 '
 
-test_expect_success 'deleting most notes triggers fanout consolidation' '
-	# Expect entire notes tree to have a fanout == 0
-	git ls-tree -r --name-only refs/notes/commits |
-	while read path
+test_expect_success 'stable fanout 1 is followed by stable fanout 0' '
+	i=$remove_notes &&
+	fanout=1 &&
+	while test $i -gt 0
 	do
-		case "$path" in
-		????????????????????????????????????????)
-			: true
-			;;
-		*)
-			echo "Invalid path \"$path\"" &&
-			return 1
-			;;
-		esac
-	done
+		i=$(($i - 1)) &&
+		if touched_one_note_with_fanout refs/notes/commits~$i D $fanout
+		then
+			continue
+		elif test $fanout -eq 1
+		then
+			fanout=0 &&
+			if all_notes_have_fanout refs/notes/commits~$i $fanout
+			then
+				echo "Fanout 1 -> 0 at refs/notes/commits~$i" &&
+				continue
+			fi
+		fi &&
+		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
+		git ls-tree -r --name-only refs/notes/commits~$i &&
+		return 1
+	done &&
+	all_notes_have_fanout refs/notes/commits 0
 '
 
 test_done
diff --git a/third_party/git/t/t3306-notes-prune.sh b/third_party/git/t/t3306-notes-prune.sh
index 61748088ebcb..8f4102ff9e44 100755
--- a/third_party/git/t/t3306-notes-prune.sh
+++ b/third_party/git/t/t3306-notes-prune.sh
@@ -11,23 +11,26 @@ test_expect_success 'setup: create a few commits with notes' '
 	test_tick &&
 	git commit -m 1st &&
 	git notes add -m "Note #1" &&
+	first=$(git rev-parse HEAD) &&
 	: > file2 &&
 	git add file2 &&
 	test_tick &&
 	git commit -m 2nd &&
 	git notes add -m "Note #2" &&
+	second=$(git rev-parse HEAD) &&
 	: > file3 &&
 	git add file3 &&
 	test_tick &&
 	git commit -m 3rd &&
-	COMMIT_FILE=.git/objects/5e/e1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
+	third=$(git rev-parse HEAD) &&
+	COMMIT_FILE=$(echo $third | sed "s!^..!.git/objects/&/!") &&
 	test -f $COMMIT_FILE &&
 	test-tool chmtime =+0 $COMMIT_FILE &&
 	git notes add -m "Note #3"
 '
 
 cat > expect <<END_OF_LOG
-commit 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
+commit $third
 Author: A U Thor <author@example.com>
 Date:   Thu Apr 7 15:15:13 2005 -0700
 
@@ -36,7 +39,7 @@ Date:   Thu Apr 7 15:15:13 2005 -0700
 Notes:
     Note #3
 
-commit 08341ad9e94faa089d60fd3f523affb25c6da189
+commit $second
 Author: A U Thor <author@example.com>
 Date:   Thu Apr 7 15:14:13 2005 -0700
 
@@ -45,7 +48,7 @@ Date:   Thu Apr 7 15:14:13 2005 -0700
 Notes:
     Note #2
 
-commit ab5f302035f2e7aaf04265f08b42034c23256e1f
+commit $first
 Author: A U Thor <author@example.com>
 Date:   Thu Apr 7 15:13:13 2005 -0700
 
@@ -70,16 +73,16 @@ test_expect_success 'remove some commits' '
 
 test_expect_success 'verify that commits are gone' '
 
-	test_must_fail git cat-file -p 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
-	git cat-file -p 08341ad9e94faa089d60fd3f523affb25c6da189 &&
-	git cat-file -p ab5f302035f2e7aaf04265f08b42034c23256e1f
+	test_must_fail git cat-file -p $third &&
+	git cat-file -p $second &&
+	git cat-file -p $first
 '
 
 test_expect_success 'verify that notes are still present' '
 
-	git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
-	git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
-	git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+	git notes show $third &&
+	git notes show $second &&
+	git notes show $first
 '
 
 test_expect_success 'prune -n does not remove notes' '
@@ -90,13 +93,10 @@ test_expect_success 'prune -n does not remove notes' '
 	test_cmp expect actual
 '
 
-cat > expect <<EOF
-5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
-EOF
 
 test_expect_success 'prune -n lists prunable notes' '
 
-
+	echo $third >expect &&
 	git notes prune -n > actual &&
 	test_cmp expect actual
 '
@@ -109,9 +109,9 @@ test_expect_success 'prune notes' '
 
 test_expect_success 'verify that notes are gone' '
 
-	test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
-	git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
-	git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+	test_must_fail git notes show $third &&
+	git notes show $second &&
+	git notes show $first
 '
 
 test_expect_success 'remove some commits' '
@@ -121,21 +121,18 @@ test_expect_success 'remove some commits' '
 	git gc --prune=now
 '
 
-cat > expect <<EOF
-08341ad9e94faa089d60fd3f523affb25c6da189
-EOF
-
 test_expect_success 'prune -v notes' '
 
+	echo $second >expect &&
 	git notes prune -v > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'verify that notes are gone' '
 
-	test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
-	test_must_fail git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
-	git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+	test_must_fail git notes show $third &&
+	test_must_fail git notes show $second &&
+	git notes show $first
 '
 
 test_done
diff --git a/third_party/git/t/t3308-notes-merge.sh b/third_party/git/t/t3308-notes-merge.sh
index d60588ec8f00..790e292966b2 100755
--- a/third_party/git/t/t3308-notes-merge.sh
+++ b/third_party/git/t/t3308-notes-merge.sh
@@ -20,7 +20,34 @@ test_expect_success setup '
 	git notes add -m "Notes on 3rd commit" 3rd &&
 	git notes add -m "Notes on 4th commit" 4th &&
 	# Copy notes to remote-notes
-	git fetch . refs/notes/*:refs/remote-notes/origin/*
+	git fetch . refs/notes/*:refs/remote-notes/origin/* &&
+
+	test_oid_init &&
+	test_oid_cache <<-EOF
+	hash4a sha1:5e93d24084d32e1cb61f7070505b9d2530cca987
+	hash3a sha1:8366731eeee53787d2bdf8fc1eff7d94757e8da0
+	hash2a sha1:eede89064cd42441590d6afec6c37b321ada3389
+	hash1a sha1:daa55ffad6cb99bf64226532147ffcaf5ce8bdd1
+	hash5b sha1:0f2efbd00262f2fd41dfae33df8765618eeacd99
+	hash4b sha1:dec2502dac3ea161543f71930044deff93fa945c
+	hash3b sha1:4069cdb399fd45463ec6eef8e051a16a03592d91
+	hash2c sha1:d000d30e6ddcfce3a8122c403226a2ce2fd04d9d
+	hash1c sha1:43add6bd0c8c0bc871ac7991e0f5573cfba27804
+	hash4d sha1:1f257a3a90328557c452f0817d6cc50c89d315d4
+	hash3d sha1:05a4927951bcef347f51486575b878b2b60137f2
+
+	hash4a sha256:eef876be1d32ac2e2e42240e0429325cec116e55e88cb2969899fac695aa762f
+	hash3a sha256:cf7cd1bc091d7ba4166a86df864110e42087cd893a5ae96bc50d637e0290939d
+	hash2a sha256:21ddde7ebce2c285213898cb04deca0fd3209610cf7aaf8222e4e2f45262fae2
+	hash1a sha256:f9fe0eda16c6027732ed9d4295689a03abd16f893be69b3dcbf4037ddb191921
+	hash5b sha256:20046f2244577797a9e3d3f790ea9eca4d8a6bafb2a5570bcb0e03aa02ce100b
+	hash4b sha256:f90563d134c61a95bb88afbd45d48ccc9e919c62aa6fbfcd483302b3e4d8dbcb
+	hash3b sha256:988f2aca9f2d87e93e6a73197c2bb99560cc44a2f92d18653968f956f01221e0
+	hash2c sha256:84153b777b4d42827a756c6578dcdb59d8ae5d1360b874fb37c430150c825c26
+	hash1c sha256:9beb2bc4eef72e4c4087be168a20573e34d993d9ab1883055f23e322afa06567
+	hash4d sha256:32de39dc06e679a7abb2d4a55ede7709b3124340a4a90aa305971b1c72ac319d
+	hash3d sha256:fa73b20e41cbb7541c4c81d1535016131dbfbeb05bf6a71f6115e9cad31c7af5
+	EOF
 '
 
 commit_sha1=$(git rev-parse 1st^{commit})
@@ -40,10 +67,10 @@ verify_notes () {
 }
 
 cat <<EOF | sort >expect_notes_x
-5e93d24084d32e1cb61f7070505b9d2530cca987 $commit_sha4
-8366731eeee53787d2bdf8fc1eff7d94757e8da0 $commit_sha3
-eede89064cd42441590d6afec6c37b321ada3389 $commit_sha2
-daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1
+$(test_oid hash4a) $commit_sha4
+$(test_oid hash3a) $commit_sha3
+$(test_oid hash2a) $commit_sha2
+$(test_oid hash1a) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
@@ -126,10 +153,10 @@ test_expect_success 'merge previous notes commit (y^ => y) => No-op' '
 '
 
 cat <<EOF | sort >expect_notes_y
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-dec2502dac3ea161543f71930044deff93fa945c $commit_sha4
-4069cdb399fd45463ec6eef8e051a16a03592d91 $commit_sha3
-daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4b) $commit_sha4
+$(test_oid hash3b) $commit_sha3
+$(test_oid hash1a) $commit_sha1
 EOF
 
 cat >expect_log_y <<EOF
@@ -193,11 +220,11 @@ test_expect_success 'merge empty notes ref (z => y)' '
 '
 
 cat <<EOF | sort >expect_notes_y
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-dec2502dac3ea161543f71930044deff93fa945c $commit_sha4
-4069cdb399fd45463ec6eef8e051a16a03592d91 $commit_sha3
-d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2
-43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4b) $commit_sha4
+$(test_oid hash3b) $commit_sha3
+$(test_oid hash2c) $commit_sha2
+$(test_oid hash1c) $commit_sha1
 EOF
 
 cat >expect_log_y <<EOF
@@ -231,9 +258,9 @@ test_expect_success 'change notes on other notes ref (y)' '
 '
 
 cat <<EOF | sort >expect_notes_x
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4
-daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4d) $commit_sha4
+$(test_oid hash1a) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
@@ -262,10 +289,10 @@ test_expect_success 'change notes on notes ref (x)' '
 '
 
 cat <<EOF | sort >expect_notes_x
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4
-d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2
-43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4d) $commit_sha4
+$(test_oid hash2c) $commit_sha2
+$(test_oid hash1c) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
@@ -296,8 +323,8 @@ test_expect_success 'merge y into x => Non-conflicting 3-way merge' '
 '
 
 cat <<EOF | sort >expect_notes_w
-05a4927951bcef347f51486575b878b2b60137f2 $commit_sha3
-d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2
+$(test_oid hash3d) $commit_sha3
+$(test_oid hash2c) $commit_sha2
 EOF
 
 cat >expect_log_w <<EOF
@@ -326,11 +353,11 @@ test_expect_success 'create notes on new, separate notes ref (w)' '
 '
 
 cat <<EOF | sort >expect_notes_x
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4
-05a4927951bcef347f51486575b878b2b60137f2 $commit_sha3
-d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2
-43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4d) $commit_sha4
+$(test_oid hash3d) $commit_sha3
+$(test_oid hash2c) $commit_sha2
+$(test_oid hash1c) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
diff --git a/third_party/git/t/t3309-notes-merge-auto-resolve.sh b/third_party/git/t/t3309-notes-merge-auto-resolve.sh
index 14c2adf970d7..141d3e4ca4dc 100755
--- a/third_party/git/t/t3309-notes-merge-auto-resolve.sh
+++ b/third_party/git/t/t3309-notes-merge-auto-resolve.sh
@@ -23,7 +23,67 @@ test_expect_success 'setup commits' '
 	test_commit 12th &&
 	test_commit 13th &&
 	test_commit 14th &&
-	test_commit 15th
+	test_commit 15th &&
+
+	test_oid_cache <<-EOF
+	hash15a sha1:457a85d6c814ea208550f15fcc48f804ac8dc023
+	hash14a sha1:b0c95b954301d69da2bc3723f4cb1680d355937c
+	hash13a sha1:5d30216a129eeffa97d9694ffe8c74317a560315
+	hash12a sha1:dd161bc149470fd890dd4ab52a4cbd79bbd18c36
+	hash11a sha1:7abbc45126d680336fb24294f013a7cdfa3ed545
+	hash10a sha1:b8d03e173f67f6505a76f6e00cf93440200dd9be
+	hash09a sha1:20c613c835011c48a5abe29170a2402ca6354910
+	hash08a sha1:a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6
+	hash07a sha1:897003322b53bc6ca098e9324ee508362347e734
+	hash06a sha1:11d97fdebfa5ceee540a3da07bce6fa0222bc082
+	hash15b sha1:68b8630d25516028bed862719855b3d6768d7833
+	hash14b sha1:5de7ea7ad4f47e7ff91989fb82234634730f75df
+	hash13b sha1:3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc
+	hash12b sha1:a66055fa82f7a03fe0c02a6aba3287a85abf7c62
+	hash05b sha1:154508c7a0bcad82b6fe4b472bc4c26b3bf0825b
+	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
+	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
+	hash15c sha1:9b4b2c61f0615412da3c10f98ff85b57c04ec765
+	hash11c sha1:7e3c53503a3db8dd996cb62e37c66e070b44b54d
+	hash08c sha1:851e1638784a884c7dd26c5d41f3340f6387413a
+	hash05c sha1:99fc34adfc400b95c67b013115e37e31aa9a6d23
+	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
+	hash15d sha1:7c4e546efd0fe939f876beb262ece02797880b54
+	hash05d sha1:6c841cc36ea496027290967ca96bd2bef54dbb47
+	hash15e sha1:d682107b8bf7a7aea1e537a8d5cb6a12b60135f1
+	hash05e sha1:357b6ca14c7afd59b7f8b8aaaa6b8b723771135b
+	hash15f sha1:6be90240b5f54594203e25d9f2f64b7567175aee
+	hash05f sha1:660311d7f78dc53db12ac373a43fca7465381a7e
+
+	hash15a sha256:45b1558e5c1b75f570010fa48aaa67bb2289fcd431b34ad81cb4c8b95f4f872a
+	hash14a sha256:6e7af179ea4dd28afdc83ae6912ba0098cdeff764b26a8b750b157dd81749092
+	hash13a sha256:7353089961baf555388e1bac68c67c8ea94b08ccbd97532201cf7f6790703052
+	hash12a sha256:5863e4521689ee1879ceab3b38d39e93ab5b51ec70aaf6a96ad388fbdedfa25e
+	hash11a sha256:82a0ec0338b4ecf8b44304badf4ad38d7469dc41827f38d7ba6c42e3bae3ee98
+	hash10a sha256:e84f2564e92de9792c93b8d197262c735d7ccb1de6025cef8759af8f6c3308eb
+	hash09a sha256:4dd07764bcec696f195c0ea71ae89e174876403af1637e4642b8f4453fd23028
+	hash08a sha256:02132c4546cd88a1d0aa5854dd55da120927f7904ba16afe36fe03e91a622067
+	hash07a sha256:369baf7d00c6720efdc10273493555f943051f84a4706fb24caeb353fa4789db
+	hash06a sha256:52d32c10353583b2d96a5849b1f1f43c8018e76f3e8ef1b0d46eb5cff7cdefaf
+	hash15b sha256:345e6660b345fa174738a31a7a59423c394bdf414804e200bc510c65d971ae96
+	hash14b sha256:7653a6596021c52e405cba979eea15a729993e7102b9a61ba4667e34f0ead4a1
+	hash13b sha256:0f202a0b6b9690de2349c173dfd766a37e82744f61c14f1c389306f1d69f470b
+	hash12b sha256:eb00f219c026136ea6535b16ff8ec3efa510e6bf50098ca041e1a2a1d4b79840
+	hash05b sha256:993b2290cd0c24c27c849d99f1904f3b590f77af0f539932734ad05679ac5a2f
+	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
+	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
+	hash15c sha256:62316660a22bf97857dc4a16709ec4d93a224e8c9f37d661ef91751e1f4c4166
+	hash11c sha256:51c3763de9b08309370adc5036d58debb331980e73097902957c444602551daa
+	hash08c sha256:22cf1fa29599898a7218c51135d66ed85d22aad584f77db3305dedce4c3d4798
+	hash05c sha256:2508fd86db980f0508893a1c1571bdf3b2ee113dc25ddb1a3a2fb94bd6cd0d58
+	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
+	hash15d sha256:667acb4e2d5f8df15e5aea4506dfd16d25bc7feca70fdb0d965a7222f983bb88
+	hash05d sha256:09e6b5a6fe666c4a027674b6611a254b7d2528cd211c6b5288d1b4db6c741dfa
+	hash15e sha256:e8cbf52f6fcadc6de3c7761e64a89e9fe38d19a03d3e28ef6ca8596d93fc4f3a
+	hash05e sha256:cdb1e19f7ba1539f95af51a57edeb88a7ecc97d3c2f52da8c4c86af308595607
+	hash15f sha256:29c14cb92da448a923963b8a43994268b19c2e57913de73f3667421fd2c0eeec
+	hash05f sha256:14a6e641b2c0a9f398ebac6b4d34afa5efea4c52d2631382f45f8f662266903b
+	EOF
 '
 
 commit_sha1=$(git rev-parse 1st^{commit})
@@ -68,16 +128,16 @@ test_expect_success 'setup merge base (x)' '
 '
 
 cat <<EOF | sort >expect_notes_x
-457a85d6c814ea208550f15fcc48f804ac8dc023 $commit_sha15
-b0c95b954301d69da2bc3723f4cb1680d355937c $commit_sha14
-5d30216a129eeffa97d9694ffe8c74317a560315 $commit_sha13
-dd161bc149470fd890dd4ab52a4cbd79bbd18c36 $commit_sha12
-7abbc45126d680336fb24294f013a7cdfa3ed545 $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-20c613c835011c48a5abe29170a2402ca6354910 $commit_sha9
-a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6 $commit_sha8
-897003322b53bc6ca098e9324ee508362347e734 $commit_sha7
-11d97fdebfa5ceee540a3da07bce6fa0222bc082 $commit_sha6
+$(test_oid hash15a) $commit_sha15
+$(test_oid hash14a) $commit_sha14
+$(test_oid hash13a) $commit_sha13
+$(test_oid hash12a) $commit_sha12
+$(test_oid hash11a) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash09a) $commit_sha9
+$(test_oid hash08a) $commit_sha8
+$(test_oid hash07a) $commit_sha7
+$(test_oid hash06a) $commit_sha6
 EOF
 
 cat >expect_log_x <<EOF
@@ -141,16 +201,16 @@ test_expect_success 'setup local branch (y)' '
 '
 
 cat <<EOF | sort >expect_notes_y
-68b8630d25516028bed862719855b3d6768d7833 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7abbc45126d680336fb24294f013a7cdfa3ed545 $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-20c613c835011c48a5abe29170a2402ca6354910 $commit_sha9
-154508c7a0bcad82b6fe4b472bc4c26b3bf0825b $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
+$(test_oid hash15b) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11a) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash09a) $commit_sha9
+$(test_oid hash05b) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
 EOF
 
 cat >expect_log_y <<EOF
@@ -214,16 +274,16 @@ test_expect_success 'setup remote branch (z)' '
 '
 
 cat <<EOF | sort >expect_notes_z
-9b4b2c61f0615412da3c10f98ff85b57c04ec765 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-5d30216a129eeffa97d9694ffe8c74317a560315 $commit_sha13
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-897003322b53bc6ca098e9324ee508362347e734 $commit_sha7
-99fc34adfc400b95c67b013115e37e31aa9a6d23 $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15c) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13a) $commit_sha13
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash07a) $commit_sha7
+$(test_oid hash05c) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_z <<EOF
@@ -306,16 +366,16 @@ test_expect_success 'merge z into y with invalid configuration option => Fail/No
 '
 
 cat <<EOF | sort >expect_notes_ours
-68b8630d25516028bed862719855b3d6768d7833 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-154508c7a0bcad82b6fe4b472bc4c26b3bf0825b $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15b) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash05b) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_ours <<EOF
@@ -395,16 +455,16 @@ test_expect_success 'reset to pre-merge state (y)' '
 '
 
 cat <<EOF | sort >expect_notes_theirs
-9b4b2c61f0615412da3c10f98ff85b57c04ec765 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-99fc34adfc400b95c67b013115e37e31aa9a6d23 $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15c) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash05c) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_theirs <<EOF
@@ -473,17 +533,17 @@ test_expect_success 'reset to pre-merge state (y)' '
 '
 
 cat <<EOF | sort >expect_notes_union
-7c4e546efd0fe939f876beb262ece02797880b54 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-6c841cc36ea496027290967ca96bd2bef54dbb47 $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15d) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash05d) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_union <<EOF
@@ -574,17 +634,17 @@ test_expect_success 'merge z into y with "manual" per-ref only checks specific r
 '
 
 cat <<EOF | sort >expect_notes_union2
-d682107b8bf7a7aea1e537a8d5cb6a12b60135f1 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-357b6ca14c7afd59b7f8b8aaaa6b8b723771135b $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15e) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash05e) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_union2 <<EOF
@@ -648,17 +708,17 @@ test_expect_success 'reset to pre-merge state (z)' '
 '
 
 cat <<EOF | sort >expect_notes_cat_sort_uniq
-6be90240b5f54594203e25d9f2f64b7567175aee $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-660311d7f78dc53db12ac373a43fca7465381a7e $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15f) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash05f) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_cat_sort_uniq <<EOF
diff --git a/third_party/git/t/t3310-notes-merge-manual-resolve.sh b/third_party/git/t/t3310-notes-merge-manual-resolve.sh
index 2dea846e259d..d3d72e25fe4b 100755
--- a/third_party/git/t/t3310-notes-merge-manual-resolve.sh
+++ b/third_party/git/t/t3310-notes-merge-manual-resolve.sh
@@ -13,7 +13,39 @@ test_expect_success 'setup commits' '
 	test_commit 2nd &&
 	test_commit 3rd &&
 	test_commit 4th &&
-	test_commit 5th
+	test_commit 5th &&
+
+	test_oid_cache <<-EOF
+	hash04a sha1:6e8e3febca3c2bb896704335cc4d0c34cb2f8715
+	hash03a sha1:e5388c10860456ee60673025345fe2e153eb8cf8
+	hash02a sha1:ceefa674873670e7ecd131814d909723cce2b669
+	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
+	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
+	hash01b sha1:b0a6021ec006d07e80e9b20ec9b444cbd9d560d3
+	hash04c sha1:cff59c793c20bb49a4e01bc06fb06bad642e0d54
+	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
+	hash01c sha1:0a81da8956346e19bcb27a906f04af327e03e31b
+	hash04d sha1:00494adecf2d9635a02fa431308d67993f853968
+	hash01e sha1:f75d1df88cbfe4258d49852f26cfc83f2ad4494b
+	hash04f sha1:021faa20e931fb48986ffc6282b4bb05553ac946
+	hash01f sha1:0a59e787e6d688aa6309e56e8c1b89431a0fc1c1
+	hash05g sha1:304dfb4325cf243025b9957486eb605a9b51c199
+
+	hash04a	sha256:f18a935e65866345098b3b754071dbf9f3aa3520eb27a7b036b278c5e2f1ed7e
+	hash03a	sha256:713035dc94067a64e5fa6e4e1821b7c3bde49a77c7cb3f80eaadefa1ca41b3d2
+	hash02a	sha256:f160a67e048b6fa75bec3952184154045076692cf5dccd3da21e3fd34b7a3f0f
+	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
+	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
+	hash01b sha256:da96cf778c15d0a2bb76f98b2a62f6c9c01730fa7030e8f08ef0191048e7d620
+	hash04c sha256:cb615d2def4b834d5f55b2351df97dc92bee4f5009d285201427f349081c8aca
+	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
+	hash01c sha256:5b87237ac1fbae0246256fed9f9a1f077c4140fb7e6444925f8dbfa5ae406cd8
+	hash04d sha256:eeddc9f9f6cb3d6b39b861659853f10891dc373e0b6eecb09e03e39b6ce64714
+	hash01e sha256:108f521b1a74c2e6d0b52a4eda87e09162bf847f7d190cfce496ee1af0b29a5a
+	hash04f sha256:901acda0454502b3bbd281f130c419e6c8de78afcf72a8def8d45ad31462bce4
+	hash01f sha256:a2d99d1b8bf23c8af7d9d91368454adc110dfd5cc068a4cebb486ee8f5a1e16c
+	hash05g sha256:4fef015b01da8efe929a68e3bb9b8fbad81f53995f097befe8ebc93f12ab98ec
+	EOF
 '
 
 commit_sha1=$(git rev-parse 1st^{commit})
@@ -32,10 +64,16 @@ verify_notes () {
 	test_cmp "expect_log_$notes_ref" "output_log_$notes_ref"
 }
 
+notes_merge_files_gone () {
+	# No .git/NOTES_MERGE_* files left
+	{ ls .git/NOTES_MERGE_* >output || :; } &&
+	test_must_be_empty output
+}
+
 cat <<EOF | sort >expect_notes_x
-6e8e3febca3c2bb896704335cc4d0c34cb2f8715 $commit_sha4
-e5388c10860456ee60673025345fe2e153eb8cf8 $commit_sha3
-ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2
+$(test_oid hash04a) $commit_sha4
+$(test_oid hash03a) $commit_sha3
+$(test_oid hash02a) $commit_sha2
 EOF
 
 cat >expect_log_x <<EOF
@@ -63,9 +101,9 @@ test_expect_success 'setup merge base (x)' '
 '
 
 cat <<EOF | sort >expect_notes_y
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-b0a6021ec006d07e80e9b20ec9b444cbd9d560d3 $commit_sha1
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash01b) $commit_sha1
 EOF
 
 cat >expect_log_y <<EOF
@@ -95,9 +133,9 @@ test_expect_success 'setup local branch (y)' '
 '
 
 cat <<EOF | sort >expect_notes_z
-cff59c793c20bb49a4e01bc06fb06bad642e0d54 $commit_sha4
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
-0a81da8956346e19bcb27a906f04af327e03e31b $commit_sha1
+$(test_oid hash04c) $commit_sha4
+$(test_oid hash02c) $commit_sha2
+$(test_oid hash01c) $commit_sha1
 EOF
 
 cat >expect_log_z <<EOF
@@ -193,9 +231,9 @@ test_expect_success 'merge z into m (== y) with default ("manual") resolver => C
 '
 
 cat <<EOF | sort >expect_notes_z
-00494adecf2d9635a02fa431308d67993f853968 $commit_sha4
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
-0a81da8956346e19bcb27a906f04af327e03e31b $commit_sha1
+$(test_oid hash04d) $commit_sha4
+$(test_oid hash02c) $commit_sha2
+$(test_oid hash01c) $commit_sha1
 EOF
 
 cat >expect_log_z <<EOF
@@ -231,8 +269,8 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish
 # Setup non-conflicting merge between x and new notes ref w
 
 cat <<EOF | sort >expect_notes_w
-ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2
-f75d1df88cbfe4258d49852f26cfc83f2ad4494b $commit_sha1
+$(test_oid hash02a) $commit_sha2
+$(test_oid hash01e) $commit_sha1
 EOF
 
 cat >expect_log_w <<EOF
@@ -258,10 +296,10 @@ test_expect_success 'setup unrelated notes ref (w)' '
 '
 
 cat <<EOF | sort >expect_notes_w
-6e8e3febca3c2bb896704335cc4d0c34cb2f8715 $commit_sha4
-e5388c10860456ee60673025345fe2e153eb8cf8 $commit_sha3
-ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2
-f75d1df88cbfe4258d49852f26cfc83f2ad4494b $commit_sha1
+$(test_oid hash04a) $commit_sha4
+$(test_oid hash03a) $commit_sha3
+$(test_oid hash02a) $commit_sha2
+$(test_oid hash01e) $commit_sha1
 EOF
 
 cat >expect_log_w <<EOF
@@ -291,10 +329,10 @@ test_expect_success 'can do merge without conflicts even if previous merge is un
 '
 
 cat <<EOF | sort >expect_notes_m
-021faa20e931fb48986ffc6282b4bb05553ac946 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
-0a59e787e6d688aa6309e56e8c1b89431a0fc1c1 $commit_sha1
+$(test_oid hash04f) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
+$(test_oid hash01f) $commit_sha1
 EOF
 
 cat >expect_log_m <<EOF
@@ -335,9 +373,7 @@ EOF
 y and z notes on 4th commit
 EOF
 	git notes merge --commit &&
-	# No .git/NOTES_MERGE_* files left
-	test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
-	test_must_be_empty output &&
+	notes_merge_files_gone &&
 	# Merge commit has pre-merge y and pre-merge z as parents
 	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
 	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
@@ -397,9 +433,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
 
 test_expect_success 'abort notes merge' '
 	git notes merge --abort &&
-	# No .git/NOTES_MERGE_* files left
-	test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
-	test_must_be_empty output &&
+	notes_merge_files_gone &&
 	# m has not moved (still == y)
 	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)" &&
 	# Verify that other notes refs has not changed (w, x, y and z)
@@ -430,9 +464,9 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
 '
 
 cat <<EOF | sort >expect_notes_m
-304dfb4325cf243025b9957486eb605a9b51c199 $commit_sha5
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
-0a59e787e6d688aa6309e56e8c1b89431a0fc1c1 $commit_sha1
+$(test_oid hash05g) $commit_sha5
+$(test_oid hash02c) $commit_sha2
+$(test_oid hash01f) $commit_sha1
 EOF
 
 cat >expect_log_m <<EOF
@@ -464,9 +498,7 @@ EOF
 	echo "new note on 5th commit" > .git/NOTES_MERGE_WORKTREE/$commit_sha5 &&
 	# Finalize merge
 	git notes merge --commit &&
-	# No .git/NOTES_MERGE_* files left
-	test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
-	test_must_be_empty output &&
+	notes_merge_files_gone &&
 	# Merge commit has pre-merge y and pre-merge z as parents
 	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
 	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
@@ -553,9 +585,7 @@ EOF
 
 test_expect_success 'resolve situation by aborting the notes merge' '
 	git notes merge --abort &&
-	# No .git/NOTES_MERGE_* files left
-	test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
-	test_must_be_empty output &&
+	notes_merge_files_gone &&
 	# m has not moved (still == w)
 	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
 	# Verify that other notes refs has not changed (w, x, y and z)
diff --git a/third_party/git/t/t3311-notes-merge-fanout.sh b/third_party/git/t/t3311-notes-merge-fanout.sh
index 37151a3adc39..5b675417e9bb 100755
--- a/third_party/git/t/t3311-notes-merge-fanout.sh
+++ b/third_party/git/t/t3311-notes-merge-fanout.sh
@@ -29,15 +29,10 @@ verify_fanout () {
 	git ls-tree -r --name-only "refs/notes/$notes_ref" |
 	while read path
 	do
-		case "$path" in
-		??/??????????????????????????????????????)
-			: true
-			;;
-		*)
+		echo "$path" | grep "^../[0-9a-f]*$" || {
 			echo "Invalid path \"$path\"" &&
-			return 1
-			;;
-		esac
+			return 1;
+		}
 	done
 }
 
@@ -48,15 +43,10 @@ verify_no_fanout () {
 	git ls-tree -r --name-only "refs/notes/$notes_ref" |
 	while read path
 	do
-		case "$path" in
-		????????????????????????????????????????)
-			: true
-			;;
-		*)
+		echo "$path" | grep -v "^../.*" || {
 			echo "Invalid path \"$path\"" &&
-			return 1
-			;;
-		esac
+			return 1;
+		}
 	done
 }
 
@@ -67,7 +57,27 @@ test_expect_success 'setup a few initial commits with notes (notes ref: x)' '
 	do
 		test_commit "commit$i" >/dev/null &&
 		git notes add -m "notes for commit$i" || return 1
-	done
+	done &&
+
+	git log --format=oneline &&
+
+	test_oid_cache <<-EOF
+	hash05a sha1:aed91155c7a72c2188e781fdf40e0f3761b299db
+	hash04a sha1:99fab268f9d7ee7b011e091a436c78def8eeee69
+	hash03a sha1:953c20ae26c7aa0b428c20693fe38bc687f9d1a9
+	hash02a sha1:6358796131b8916eaa2dde6902642942a1cb37e1
+	hash01a sha1:b02d459c32f0e68f2fe0981033bb34f38776ba47
+	hash03b sha1:9f506ee70e20379d7f78204c77b334f43d77410d
+	hash02b sha1:23a47d6ea7d589895faf800752054818e1e7627b
+
+	hash05a sha256:3aae5d26619d96dba93795f66325716e4cbc486884f95a6adee8fb0615a76d12
+	hash04a sha256:07e43dd3d89fe634d3252e253b426aacc7285a995dcdbcf94ac284060a1122cf
+	hash03a sha256:26fb52eaa7f4866bf735254587be7b31209ec10e525912ffd8e8ba549ba892ff
+	hash02a sha256:b57ebdf23634e750dcbc4b9a37991d70f90830d568a0e4529ce9de0a3f8d605c
+	hash01a sha256:377903b1572bd5117087a5518fcb1011b5053cccbc59e3c7c823a8615204173b
+	hash03b sha256:04e7b392fda7c185bfa17c9179b56db732edc2dc2b3bf887308dcaabb717270d
+	hash02b sha256:66099aaaec49a485ed990acadd9a9b81232ea592079964113d8f581ff69ef50b
+	EOF
 '
 
 commit_sha1=$(git rev-parse commit1^{commit})
@@ -77,11 +87,11 @@ commit_sha4=$(git rev-parse commit4^{commit})
 commit_sha5=$(git rev-parse commit5^{commit})
 
 cat <<EOF | sort >expect_notes_x
-aed91155c7a72c2188e781fdf40e0f3761b299db $commit_sha5
-99fab268f9d7ee7b011e091a436c78def8eeee69 $commit_sha4
-953c20ae26c7aa0b428c20693fe38bc687f9d1a9 $commit_sha3
-6358796131b8916eaa2dde6902642942a1cb37e1 $commit_sha2
-b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1
+$(test_oid hash05a) $commit_sha5
+$(test_oid hash04a) $commit_sha4
+$(test_oid hash03a) $commit_sha3
+$(test_oid hash02a) $commit_sha2
+$(test_oid hash01a) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
@@ -145,9 +155,9 @@ test_expect_success 'Fast-forward merge (y => x)' '
 '
 
 cat <<EOF | sort >expect_notes_z
-9f506ee70e20379d7f78204c77b334f43d77410d $commit_sha3
-23a47d6ea7d589895faf800752054818e1e7627b $commit_sha2
-b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02b) $commit_sha2
+$(test_oid hash01a) $commit_sha1
 EOF
 
 cat >expect_log_z <<EOF
diff --git a/third_party/git/t/t3400-rebase.sh b/third_party/git/t/t3400-rebase.sh
index 80b23fd3269c..40d297599584 100755
--- a/third_party/git/t/t3400-rebase.sh
+++ b/third_party/git/t/t3400-rebase.sh
@@ -64,7 +64,7 @@ test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' '
 	pre="$(git rev-parse --verify HEAD)" &&
 	git rebase master &&
 	test_cmp_rev "$pre" ORIG_HEAD &&
-	! test_cmp_rev "$pre" HEAD
+	test_cmp_rev ! "$pre" HEAD
 '
 
 test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
@@ -143,11 +143,11 @@ test_expect_success 'setup: recover' '
 
 test_expect_success 'Show verbose error when HEAD could not be detached' '
 	>B &&
+	test_when_finished "rm -f B" &&
 	test_must_fail git rebase topic 2>output.err >output.out &&
 	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
 	test_i18ngrep B output.err
 '
-rm -f B
 
 test_expect_success 'fail when upstream arg is missing and not on branch' '
 	git checkout topic &&
@@ -159,19 +159,43 @@ test_expect_success 'fail when upstream arg is missing and not configured' '
 	test_must_fail git rebase
 '
 
-test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' '
+test_expect_success 'rebase works with format.useAutoBase' '
+	test_config format.useAutoBase true &&
+	git checkout topic &&
+	git rebase master
+'
+
+test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--merge)' '
 	git checkout -b default-base master &&
 	git checkout -b default topic &&
 	git config branch.default.remote . &&
 	git config branch.default.merge refs/heads/default-base &&
-	git rebase &&
+	git rebase --merge &&
 	git rev-parse --verify default-base >expect &&
 	git rev-parse default~1 >actual &&
 	test_cmp expect actual &&
 	git checkout default-base &&
 	git reset --hard HEAD^ &&
 	git checkout default &&
-	git rebase &&
+	git rebase --merge &&
+	git rev-parse --verify default-base >expect &&
+	git rev-parse default~1 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--apply)' '
+	git checkout -B default-base master &&
+	git checkout -B default topic &&
+	git config branch.default.remote . &&
+	git config branch.default.merge refs/heads/default-base &&
+	git rebase --apply &&
+	git rev-parse --verify default-base >expect &&
+	git rev-parse default~1 >actual &&
+	test_cmp expect actual &&
+	git checkout default-base &&
+	git reset --hard HEAD^ &&
+	git checkout default &&
+	git rebase --apply &&
 	git rev-parse --verify default-base >expect &&
 	git rev-parse default~1 >actual &&
 	test_cmp expect actual
@@ -200,9 +224,15 @@ test_expect_success 'cherry-picked commits and fork-point work together' '
 	test_cmp expect D
 '
 
-test_expect_success 'rebase -q is quiet' '
+test_expect_success 'rebase --apply -q is quiet' '
 	git checkout -b quiet topic &&
-	git rebase -q master >output.out 2>&1 &&
+	git rebase --apply -q master >output.out 2>&1 &&
+	test_must_be_empty output.out
+'
+
+test_expect_success 'rebase --merge -q is quiet' '
+	git checkout -B quiet topic &&
+	git rebase --merge -q master >output.out 2>&1 &&
 	test_must_be_empty output.out
 '
 
@@ -285,7 +315,7 @@ EOF
 	test_cmp From_.msg out
 '
 
-test_expect_success 'rebase --am and --show-current-patch' '
+test_expect_success 'rebase --apply and --show-current-patch' '
 	test_create_repo conflict-apply &&
 	(
 		cd conflict-apply &&
@@ -295,12 +325,48 @@ test_expect_success 'rebase --am and --show-current-patch' '
 		echo two >>init.t &&
 		git commit -a -m two &&
 		git tag two &&
-		test_must_fail git rebase --onto init HEAD^ &&
+		test_must_fail git rebase --apply -f --onto init HEAD^ &&
 		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
 		grep "show.*$(git rev-parse two)" stderr
 	)
 '
 
+test_expect_success 'rebase --apply and .gitattributes' '
+	test_create_repo attributes &&
+	(
+		cd attributes &&
+		test_commit init &&
+		git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
+		git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&
+
+		test_commit second &&
+		git checkout -b test HEAD^ &&
+
+		echo "*.txt filter=test" >.gitattributes &&
+		git add .gitattributes &&
+		test_commit third &&
+
+		echo "This text is smudged." >a.txt &&
+		git add a.txt &&
+		test_commit fourth &&
+
+		git checkout -b removal HEAD^ &&
+		git rm .gitattributes &&
+		git add -u &&
+		test_commit fifth &&
+		git cherry-pick test &&
+
+		git checkout test &&
+		git rebase master &&
+		grep "smudged" a.txt &&
+
+		git checkout removal &&
+		git reset --hard &&
+		git rebase master &&
+		grep "clean" a.txt
+	)
+'
+
 test_expect_success 'rebase--merge.sh and --show-current-patch' '
 	test_create_repo conflict-merge &&
 	(
@@ -335,4 +401,22 @@ test_expect_success 'rebase -c rebase.useBuiltin=false warning' '
 	test_must_be_empty err
 '
 
+test_expect_success 'switch to branch checked out here' '
+	git checkout master &&
+	git rebase master master
+'
+
+test_expect_success 'switch to branch not checked out' '
+	git checkout master &&
+	git branch other &&
+	git rebase master other
+'
+
+test_expect_success 'refuse to switch to branch checked out elsewhere' '
+	git checkout master &&
+	git worktree add wt &&
+	test_must_fail git -C wt rebase master master 2>err &&
+	test_i18ngrep "already checked out" err
+'
+
 test_done
diff --git a/third_party/git/t/t3401-rebase-and-am-rename.sh b/third_party/git/t/t3401-rebase-and-am-rename.sh
index a0b9438b2286..f18bae945075 100755
--- a/third_party/git/t/t3401-rebase-and-am-rename.sh
+++ b/third_party/git/t/t3401-rebase-and-am-rename.sh
@@ -52,13 +52,13 @@ test_expect_success 'rebase --interactive: directory rename detected' '
 	)
 '
 
-test_expect_failure 'rebase (am): directory rename detected' '
+test_expect_failure 'rebase --apply: directory rename detected' '
 	(
 		cd dir-rename &&
 
 		git checkout B^0 &&
 
-		git -c merge.directoryRenames=true rebase A &&
+		git -c merge.directoryRenames=true rebase --apply A &&
 
 		git ls-files -s >out &&
 		test_line_count = 5 out &&
diff --git a/third_party/git/t/t3403-rebase-skip.sh b/third_party/git/t/t3403-rebase-skip.sh
index 1f5122b632fb..ee8a8dba5286 100755
--- a/third_party/git/t/t3403-rebase-skip.sh
+++ b/third_party/git/t/t3403-rebase-skip.sh
@@ -7,6 +7,8 @@ test_description='git rebase --merge --skip tests'
 
 . ./test-lib.sh
 
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
 # we assume the default git am -3 --skip strategy is tested independently
 # and always works :)
 
@@ -20,6 +22,13 @@ test_expect_success setup '
 	git commit -a -m "hello world" &&
 	echo goodbye >> hello &&
 	git commit -a -m "goodbye" &&
+	git tag goodbye &&
+
+	git checkout --detach &&
+	git checkout HEAD^ . &&
+	test_tick &&
+	git commit -m reverted-goodbye &&
+	git tag reverted-goodbye &&
 
 	git checkout -f skip-reference &&
 	echo moo > hello &&
@@ -76,4 +85,27 @@ test_expect_success 'moved back to branch correctly' '
 
 test_debug 'gitk --all & sleep 1'
 
+test_expect_success 'fixup that empties commit fails' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 2" git rebase -i \
+			goodbye^ reverted-goodbye
+	)
+'
+
+test_expect_success 'squash that empties commit fails' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 squash 2" git rebase -i \
+			goodbye^ reverted-goodbye
+	)
+'
+
+# Must be the last test in this file
+test_expect_success '$EDITOR and friends are unchanged' '
+	test_editor_unchanged
+'
+
 test_done
diff --git a/third_party/git/t/t3404-rebase-interactive.sh b/third_party/git/t/t3404-rebase-interactive.sh
index 461dd539ffd4..c5ce3ab760ea 100755
--- a/third_party/git/t/t3404-rebase-interactive.sh
+++ b/third_party/git/t/t3404-rebase-interactive.sh
@@ -29,9 +29,6 @@ Initial setup:
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
-# WARNING: Modifications to the initial repository can change the SHA ID used
-# in the expect2 file for the 'stop on conflicting pick' test.
-
 test_expect_success 'setup' '
 	test_commit A file1 &&
 	test_commit B file1 &&
@@ -75,12 +72,16 @@ test_expect_success 'rebase --keep-empty' '
 	test_line_count = 6 actual
 '
 
-test_expect_success 'rebase -i with empty HEAD' '
+test_expect_success 'rebase -i with empty todo list' '
 	cat >expect <<-\EOF &&
 	error: nothing to do
 	EOF
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="#" \
+			git rebase -i HEAD^ >output 2>&1
+	) &&
+	tail -n 1 output >actual &&  # Ignore output about changing todo list
 	test_i18ncmp expect actual
 '
 
@@ -139,8 +140,11 @@ test_expect_success 'rebase -i sets work tree properly' '
 
 test_expect_success 'rebase -i with the exec command checks tree cleanness' '
 	git checkout master &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" \
+			git rebase -i HEAD^
+	) &&
 	test_cmp_rev master^ HEAD &&
 	git reset --hard &&
 	git rebase --continue
@@ -155,8 +159,6 @@ test_expect_success 'rebase -x with empty command fails' '
 	test_i18ncmp expected actual
 '
 
-LF='
-'
 test_expect_success 'rebase -x with newline in command fails' '
 	test_when_finished "git rebase --abort ||:" &&
 	test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
@@ -168,9 +170,11 @@ test_expect_success 'rebase -x with newline in command fails' '
 test_expect_success 'rebase -i with exec of inexistent command' '
 	git checkout master &&
 	test_when_finished "git rebase --abort" &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
-	git rebase -i HEAD^ >actual 2>&1 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
+			git rebase -i HEAD^ >actual 2>&1
+	) &&
 	! grep "Maybe git-rebase is broken" actual
 '
 
@@ -181,7 +185,6 @@ test_expect_success 'implicit interactive rebase does not invoke sequence editor
 
 test_expect_success 'no changes are a nop' '
 	git checkout branch2 &&
-	set_fake_editor &&
 	git rebase -i F &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
 	test $(git rev-parse I) = $(git rev-parse HEAD)
@@ -191,7 +194,6 @@ test_expect_success 'test the [branch] option' '
 	git checkout -b dead-end &&
 	git rm file6 &&
 	git commit -m "stop here" &&
-	set_fake_editor &&
 	git rebase -i F branch2 &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
 	test $(git rev-parse I) = $(git rev-parse branch2) &&
@@ -200,7 +202,6 @@ test_expect_success 'test the [branch] option' '
 
 test_expect_success 'test --onto <branch>' '
 	git checkout -b test-onto branch2 &&
-	set_fake_editor &&
 	git rebase -i --onto branch1 F &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
 	test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
@@ -210,7 +211,6 @@ test_expect_success 'test --onto <branch>' '
 test_expect_success 'rebase on top of a non-conflicting commit' '
 	git checkout branch1 &&
 	git tag original-branch1 &&
-	set_fake_editor &&
 	git rebase -i branch2 &&
 	test file6 = $(git diff --name-only original-branch1) &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
@@ -223,38 +223,42 @@ test_expect_success 'reflog for the branch shows state before rebase' '
 '
 
 test_expect_success 'reflog for the branch shows correct finish message' '
-	printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \
+	printf "rebase (finish): refs/heads/branch1 onto %s\n" \
 		"$(git rev-parse branch2)" >expected &&
 	git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'exchange two commits' '
-	set_fake_editor &&
-	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2
+	) &&
 	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test G = $(git cat-file commit HEAD | sed -ne \$p)
+	test G = $(git cat-file commit HEAD | sed -ne \$p) &&
+	blob1=$(git rev-parse --short HEAD^:file1) &&
+	blob2=$(git rev-parse --short HEAD:file1) &&
+	commit=$(git rev-parse --short HEAD)
 '
 
 test_expect_success 'stop on conflicting pick' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	diff --git a/file1 b/file1
-	index f70f10e..fd79235 100644
+	index $blob1..$blob2 100644
 	--- a/file1
 	+++ b/file1
 	@@ -1 +1 @@
 	-A
 	+G
 	EOF
-	cat >expect2 <<-\EOF &&
+	cat >expect2 <<-EOF &&
 	<<<<<<< HEAD
 	D
 	=======
 	G
-	>>>>>>> 5d18e54... G
+	>>>>>>> $commit... G
 	EOF
 	git tag new-branch1 &&
-	set_fake_editor &&
 	test_must_fail git rebase -i master &&
 	test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
 	test_cmp expect .git/rebase-merge/patch &&
@@ -283,7 +287,6 @@ test_expect_success 'abort' '
 test_expect_success 'abort with error when new base cannot be checked out' '
 	git rm --cached file1 &&
 	git commit -m "remove file in base" &&
-	set_fake_editor &&
 	test_must_fail git rebase -i master > output 2>&1 &&
 	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
 		output &&
@@ -298,7 +301,6 @@ test_expect_success 'retain authorship' '
 	test_tick &&
 	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
 	git tag twerp &&
-	set_fake_editor &&
 	git rebase -i --onto master HEAD^ &&
 	git show HEAD | grep "^Author: Twerp Snog"
 '
@@ -316,7 +318,6 @@ test_expect_success 'retain authorship w/ conflicts' '
 	test_commit b conflict b conflict-b &&
 	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
 
-	set_fake_editor &&
 	test_must_fail git rebase -i conflict-a &&
 	echo resolved >conflict &&
 	git add conflict &&
@@ -332,9 +333,11 @@ test_expect_success 'squash' '
 	test_tick &&
 	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
 	echo "******************************" &&
-	set_fake_editor &&
-	FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
-		git rebase -i --onto master HEAD~2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
+			git rebase -i --onto master HEAD~2
+	) &&
 	test B = $(cat file7) &&
 	test $(git rev-parse HEAD^) = $(git rev-parse master)
 '
@@ -345,7 +348,6 @@ test_expect_success 'retain authorship when squashing' '
 
 test_expect_success REBASE_P '-p handles "no changes" gracefully' '
 	HEAD=$(git rev-parse HEAD) &&
-	set_fake_editor &&
 	git rebase -i -p HEAD^ &&
 	git update-index --refresh &&
 	git diff-files --quiet &&
@@ -355,8 +357,10 @@ test_expect_success REBASE_P '-p handles "no changes" gracefully' '
 
 test_expect_failure REBASE_P 'exchange two commits with -p' '
 	git checkout H &&
-	set_fake_editor &&
-	FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i -p HEAD~2
+	) &&
 	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 	test G = $(git cat-file commit HEAD | sed -ne \$p)
 '
@@ -390,7 +394,6 @@ test_expect_success REBASE_P 'preserve merges with -p' '
 	git commit -m M file1 &&
 	git checkout -b to-be-rebased &&
 	test_tick &&
-	set_fake_editor &&
 	git rebase -i -p --onto branch1 master &&
 	git update-index --refresh &&
 	git diff-files --quiet &&
@@ -405,8 +408,10 @@ test_expect_success REBASE_P 'preserve merges with -p' '
 '
 
 test_expect_success REBASE_P 'edit ancestor with -p' '
-	set_fake_editor &&
-	FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3
+	) &&
 	echo 2 > unrelated-file &&
 	test_tick &&
 	git commit -m L2-modified --amend unrelated-file &&
@@ -420,11 +425,13 @@ test_expect_success REBASE_P 'edit ancestor with -p' '
 test_expect_success '--continue tries to commit' '
 	git reset --hard D &&
 	test_tick &&
-	set_fake_editor &&
-	test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
-	echo resolved > file1 &&
-	git add file1 &&
-	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
+	(
+		set_fake_editor &&
+		test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
+		echo resolved > file1 &&
+		git add file1 &&
+		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
+	) &&
 	test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
 	git show HEAD | grep chouette
 '
@@ -432,7 +439,6 @@ test_expect_success '--continue tries to commit' '
 test_expect_success 'verbose flag is heeded, even after --continue' '
 	git reset --hard master@{1} &&
 	test_tick &&
-	set_fake_editor &&
 	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
 	echo resolved > file1 &&
 	git add file1 &&
@@ -442,10 +448,13 @@ test_expect_success 'verbose flag is heeded, even after --continue' '
 
 test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="1 squash 2 squash 3 squash 4" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 1 = $(git show | grep ONCE | wc -l)
 '
@@ -453,9 +462,12 @@ test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '
 test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' '
 	git checkout -b multi-fixup E &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="NEVER" \
+			FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
+			git rebase -i $base
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 0 = $(git show | grep NEVER | wc -l) &&
 	git checkout @{-1} &&
@@ -465,12 +477,15 @@ test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' '
 test_expect_success 'commit message used after conflict' '
 	git checkout -b conflict-fixup conflict-branch &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base &&
-	echo three > conflict &&
-	git add conflict &&
-	FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
-		git rebase --continue &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" \
+			git rebase -i $base &&
+		echo three > conflict &&
+		git add conflict &&
+		FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
+			git rebase --continue
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 1 = $(git show | grep ONCE | wc -l) &&
 	git checkout @{-1} &&
@@ -480,12 +495,15 @@ test_expect_success 'commit message used after conflict' '
 test_expect_success 'commit message retained after conflict' '
 	git checkout -b conflict-squash conflict-branch &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base &&
-	echo three > conflict &&
-	git add conflict &&
-	FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
-		git rebase --continue &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 3 squash 4" \
+			git rebase -i $base &&
+		echo three > conflict &&
+		git add conflict &&
+		FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
+			git rebase --continue
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 2 = $(git show | grep TWICE | wc -l) &&
 	git checkout @{-1} &&
@@ -502,10 +520,13 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa
 	EOF
 	git checkout -b squash-fixup E &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
 	git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
 	test_cmp expect-squash-fixup actual-squash-fixup &&
 	git cat-file commit HEAD@{2} |
@@ -519,10 +540,13 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa
 test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '
 	git checkout -b skip-comments E &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 1 = $(git show | grep ONCE | wc -l) &&
 	git checkout @{-1} &&
@@ -532,10 +556,13 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '
 test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' '
 	git checkout -b skip-blank-lines E &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 1 = $(git show | grep ONCE | wc -l) &&
 	git checkout @{-1} &&
@@ -545,17 +572,21 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' '
 test_expect_success 'squash works as expected' '
 	git checkout -b squash-works no-conflict-branch &&
 	one=$(git rev-parse HEAD~3) &&
-	set_fake_editor &&
-	FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 \
-		git rebase -i HEAD~3 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 git rebase -i HEAD~3
+	) &&
 	test $one = $(git rev-parse HEAD~2)
 '
 
 test_expect_success 'interrupted squash works as expected' '
 	git checkout -b interrupted-squash conflict-branch &&
 	one=$(git rev-parse HEAD~3) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 squash 3 2" \
+			git rebase -i HEAD~3
+	) &&
 	test_write_lines one two four > conflict &&
 	git add conflict &&
 	test_must_fail git rebase --continue &&
@@ -568,8 +599,11 @@ test_expect_success 'interrupted squash works as expected' '
 test_expect_success 'interrupted squash works as expected (case 2)' '
 	git checkout -b interrupted-squash2 conflict-branch &&
 	one=$(git rev-parse HEAD~3) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="3 squash 1 2" \
+			git rebase -i HEAD~3
+	) &&
 	test_write_lines one four > conflict &&
 	git add conflict &&
 	test_must_fail git rebase --continue &&
@@ -589,11 +623,13 @@ test_expect_success '--continue tries to commit, even for "edit"' '
 	git commit -m "unrelated change" &&
 	parent=$(git rev-parse HEAD^) &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	echo edited > file7 &&
-	git add file7 &&
-	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo edited > file7 &&
+		git add file7 &&
+		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
+	) &&
 	test edited = $(git show HEAD:file7) &&
 	git show HEAD | grep chouette &&
 	test $parent = $(git rev-parse HEAD^)
@@ -602,34 +638,41 @@ test_expect_success '--continue tries to commit, even for "edit"' '
 test_expect_success 'aborted --continue does not squash commits after "edit"' '
 	old=$(git rev-parse HEAD) &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	echo "edited again" > file7 &&
-	git add file7 &&
-	test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo "edited again" > file7 &&
+		git add file7 &&
+		test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue
+	) &&
 	test $old = $(git rev-parse HEAD) &&
 	git rebase --abort
 '
 
 test_expect_success 'auto-amend only edited commits after "edit"' '
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	echo "edited again" > file7 &&
-	git add file7 &&
-	FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
-	echo "and again" > file7 &&
-	git add file7 &&
-	test_tick &&
-	test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo "edited again" > file7 &&
+		git add file7 &&
+		FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
+		echo "and again" > file7 &&
+		git add file7 &&
+		test_tick &&
+		test_must_fail env FAKE_COMMIT_MESSAGE="and again" \
+			git rebase --continue
+	) &&
 	git rebase --abort
 '
 
 test_expect_success 'clean error after failed "exec"' '
 	test_tick &&
 	test_when_finished "git rebase --abort || :" &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^
+	) &&
 	echo "edited again" > file7 &&
 	git add file7 &&
 	test_must_fail git rebase --continue 2>error &&
@@ -640,8 +683,10 @@ test_expect_success 'rebase a detached HEAD' '
 	grandparent=$(git rev-parse HEAD~2) &&
 	git checkout $(git rev-parse HEAD) &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2
+	) &&
 	test $grandparent = $(git rev-parse HEAD~2)
 '
 
@@ -656,9 +701,10 @@ test_expect_success 'rebase a commit violating pre-commit' '
 	test_must_fail git commit -m doesnt-verify file1 &&
 	git commit -m doesnt-verify --no-verify file1 &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES=2 git rebase -i HEAD~2
-
+	(
+		set_fake_editor &&
+		FAKE_LINES=2 git rebase -i HEAD~2
+	)
 '
 
 test_expect_success 'rebase with a file named HEAD in worktree' '
@@ -678,8 +724,10 @@ test_expect_success 'rebase with a file named HEAD in worktree' '
 		git commit -m "Add body"
 	) &&
 
-	set_fake_editor &&
-	FAKE_LINES="1 squash 2" git rebase -i @{-1} &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2" git rebase -i @{-1}
+	) &&
 	test "$(git show -s --pretty=format:%an)" = "Squashed Away"
 
 '
@@ -690,7 +738,6 @@ test_expect_success 'do "noop" when there is nothing to cherry-pick' '
 	GIT_EDITOR=: git commit --amend \
 		--author="Somebody else <somebody@else.com>" &&
 	test $(git rev-parse branch3) != $(git rev-parse branch4) &&
-	set_fake_editor &&
 	git rebase -i branch3 &&
 	test $(git rev-parse branch3) = $(git rev-parse branch4)
 
@@ -715,13 +762,14 @@ test_expect_success 'submodule rebase setup' '
 		git commit -a -m "submodule second"
 	) &&
 	test_tick &&
-	set_fake_editor &&
 	git commit -a -m "Three changes submodule"
 '
 
 test_expect_success 'submodule rebase -i' '
-	set_fake_editor &&
-	FAKE_LINES="1 squash 2 3" git rebase -i A
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2 3" git rebase -i A
+	)
 '
 
 test_expect_success 'submodule conflict setup' '
@@ -738,7 +786,6 @@ test_expect_success 'submodule conflict setup' '
 '
 
 test_expect_success 'rebase -i continue with only submodule staged' '
-	set_fake_editor &&
 	test_must_fail git rebase -i submodule-base &&
 	git add sub &&
 	git rebase --continue &&
@@ -748,7 +795,6 @@ test_expect_success 'rebase -i continue with only submodule staged' '
 test_expect_success 'rebase -i continue with unstaged submodule' '
 	git checkout submodule-topic &&
 	git reset --hard &&
-	set_fake_editor &&
 	test_must_fail git rebase -i submodule-base &&
 	git reset &&
 	git rebase --continue &&
@@ -761,7 +807,6 @@ test_expect_success 'avoid unnecessary reset' '
 	test-tool chmtime =123456789 file3 &&
 	git update-index --refresh &&
 	HEAD=$(git rev-parse HEAD) &&
-	set_fake_editor &&
 	git rebase -i HEAD~4 &&
 	test $HEAD = $(git rev-parse HEAD) &&
 	MTIME=$(test-tool chmtime --get file3) &&
@@ -770,16 +815,22 @@ test_expect_success 'avoid unnecessary reset' '
 
 test_expect_success 'reword' '
 	git checkout -b reword-branch master &&
-	set_fake_editor &&
-	FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A &&
-	git show HEAD | grep "E changed" &&
-	test $(git rev-parse master) != $(git rev-parse HEAD) &&
-	test $(git rev-parse master^) = $(git rev-parse HEAD^) &&
-	FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A &&
-	git show HEAD^ | grep "D changed" &&
-	FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A &&
-	git show HEAD~3 | grep "B changed" &&
-	FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \
+			git rebase -i A &&
+		git show HEAD | grep "E changed" &&
+		test $(git rev-parse master) != $(git rev-parse HEAD) &&
+		test $(git rev-parse master^) = $(git rev-parse HEAD^) &&
+		FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \
+			git rebase -i A &&
+		git show HEAD^ | grep "D changed" &&
+		FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \
+			git rebase -i A &&
+		git show HEAD~3 | grep "B changed" &&
+		FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \
+			git rebase -i A
+	) &&
 	git show HEAD~2 | grep "C changed"
 '
 
@@ -790,7 +841,6 @@ test_expect_success 'rebase -i can copy notes' '
 	test_commit n2 &&
 	test_commit n3 &&
 	git notes add -m"a note" n3 &&
-	set_fake_editor &&
 	git rebase -i --onto n1 n2 &&
 	test "a note" = "$(git notes show HEAD)"
 '
@@ -803,8 +853,11 @@ test_expect_success 'rebase -i can copy notes over a fixup' '
 	EOF
 	git reset --hard n3 &&
 	git notes add -m"an earlier note" n2 &&
-	set_fake_editor &&
-	GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" git rebase -i n1 &&
+	(
+		set_fake_editor &&
+		GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" \
+			git rebase -i n1
+	) &&
 	git notes show > output &&
 	test_cmp expect output
 '
@@ -813,8 +866,10 @@ test_expect_success 'rebase while detaching HEAD' '
 	git symbolic-ref HEAD &&
 	grandparent=$(git rev-parse HEAD~2) &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0
+	) &&
 	test $grandparent = $(git rev-parse HEAD~2) &&
 	test_must_fail git symbolic-ref HEAD
 '
@@ -823,7 +878,6 @@ test_tick # Ensure that the rebased commits get a different timestamp.
 test_expect_success 'always cherry-pick with --no-ff' '
 	git checkout no-ff-branch &&
 	git tag original-no-ff-branch &&
-	set_fake_editor &&
 	git rebase -i --no-ff A &&
 	for p in 0 1 2
 	do
@@ -855,8 +909,10 @@ test_expect_success 'set up commits with funny messages' '
 test_expect_success 'rebase-i history with funny messages' '
 	git rev-list A..funny >expect &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="1 2 3 4" git rebase -i A &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i A
+	) &&
 	git rev-list A.. >actual &&
 	test_cmp expect actual
 '
@@ -870,9 +926,9 @@ test_expect_success 'prepare for rebase -i --exec' '
 '
 
 test_expect_success 'running "git rebase -i --exec git show HEAD"' '
-	set_fake_editor &&
-	git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 		export FAKE_LINES &&
 		git rebase -i HEAD~2 >expect
@@ -883,9 +939,9 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' '
 
 test_expect_success 'running "git rebase --exec git show HEAD -i"' '
 	git reset --hard execute &&
-	set_fake_editor &&
-	git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 		export FAKE_LINES &&
 		git rebase -i HEAD~2 >expect
@@ -896,9 +952,9 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' '
 
 test_expect_success 'running "git rebase -ix git show HEAD"' '
 	git reset --hard execute &&
-	set_fake_editor &&
-	git rebase -ix "git show HEAD" HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase -ix "git show HEAD" HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 		export FAKE_LINES &&
 		git rebase -i HEAD~2 >expect
@@ -910,9 +966,9 @@ test_expect_success 'running "git rebase -ix git show HEAD"' '
 
 test_expect_success 'rebase -ix with several <CMD>' '
 	git reset --hard execute &&
-	set_fake_editor &&
-	git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
 		export FAKE_LINES &&
 		git rebase -i HEAD~2 >expect
@@ -923,9 +979,9 @@ test_expect_success 'rebase -ix with several <CMD>' '
 
 test_expect_success 'rebase -ix with several instances of --exec' '
 	git reset --hard execute &&
-	set_fake_editor &&
-	git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
 				exec_git_show_HEAD exec_pwd" &&
 		export FAKE_LINES &&
@@ -944,13 +1000,11 @@ test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' '
 	echo bis >bis.txt &&
 	git add bis.txt &&
 	git commit -m "fixup! two_exec" &&
-	set_fake_editor &&
-	(
-		git checkout -b autosquash_actual &&
-		git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual
-	) &&
+	git checkout -b autosquash_actual &&
+	git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual &&
 	git checkout autosquash &&
 	(
+		set_fake_editor &&
 		git checkout -b autosquash_expected &&
 		FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 		export FAKE_LINES &&
@@ -971,7 +1025,6 @@ test_expect_success 'rebase --exec works without -i ' '
 
 test_expect_success 'rebase -i --exec without <CMD>' '
 	git reset --hard execute &&
-	set_fake_editor &&
 	test_must_fail git rebase -i --exec 2>actual &&
 	test_i18ngrep "requires a value" actual &&
 	git checkout master
@@ -979,8 +1032,10 @@ test_expect_success 'rebase -i --exec without <CMD>' '
 
 test_expect_success 'rebase -i --root re-order and drop commits' '
 	git checkout E &&
-	set_fake_editor &&
-	FAKE_LINES="3 1 2 5" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="3 1 2 5" git rebase -i --root
+	) &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test B = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 	test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
@@ -993,39 +1048,59 @@ test_expect_success 'rebase -i --root retain root commit author and message' '
 	echo B >file7 &&
 	git add file7 &&
 	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
-	set_fake_editor &&
-	FAKE_LINES="2" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2" git rebase -i --root
+	) &&
 	git cat-file commit HEAD | grep -q "^author Twerp Snog" &&
 	git cat-file commit HEAD | grep -q "^different author$"
 '
 
 test_expect_success 'rebase -i --root temporary sentinel commit' '
 	git checkout B &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="2" git rebase -i --root &&
-	git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="2" git rebase -i --root
+	) &&
+	git cat-file commit HEAD | grep "^tree $EMPTY_TREE" &&
 	git rebase --abort
 '
 
 test_expect_success 'rebase -i --root fixup root commit' '
 	git checkout B &&
-	set_fake_editor &&
-	FAKE_LINES="1 fixup 2" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 fixup 2" git rebase -i --root
+	) &&
 	test A = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test B = $(git show HEAD:file1) &&
 	test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
 '
 
-test_expect_success 'rebase -i --root reword root commit' '
+test_expect_success 'rebase -i --root reword original root commit' '
 	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b reword-root-branch master &&
-	set_fake_editor &&
-	FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
-	git rebase -i --root &&
+	git checkout -b reword-original-root-branch master &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
+			git rebase -i --root
+	) &&
 	git show HEAD^ | grep "A changed" &&
 	test -z "$(git show -s --format=%p HEAD^)"
 '
 
+test_expect_success 'rebase -i --root reword new root commit' '
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b reword-now-root-branch master &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \
+		git rebase -i --root
+	) &&
+	git show HEAD^ | grep "C changed" &&
+	test -z "$(git show -s --format=%p HEAD^)"
+'
+
 test_expect_success 'rebase -i --root when root has untracked file conflict' '
 	test_when_finished "reset_rebase" &&
 	git checkout -b failing-root-pick A &&
@@ -1033,8 +1108,10 @@ test_expect_success 'rebase -i --root when root has untracked file conflict' '
 	git rm file1 &&
 	git commit -m "remove file 1 add file 2" &&
 	echo z >file1 &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 2" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2" git rebase -i --root
+	) &&
 	rm file1 &&
 	git rebase --continue &&
 	test "$(git log -1 --format=%B)" = "remove file 1 add file 2" &&
@@ -1044,32 +1121,38 @@ test_expect_success 'rebase -i --root when root has untracked file conflict' '
 test_expect_success 'rebase -i --root reword root when root has untracked file conflict' '
 	test_when_finished "reset_rebase" &&
 	echo z>file1 &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="reword 1 2" \
-		FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root &&
-	rm file1 &&
-	FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="reword 1 2" \
+			FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root &&
+		rm file1 &&
+		FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue
+	) &&
 	test "$(git log -1 --format=%B HEAD^)" = "Reworded A" &&
 	test "$(git rev-list --count HEAD)" = 2
 '
 
 test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '
-	git checkout reword-root-branch &&
+	git checkout reword-original-root-branch &&
 	git reset --hard &&
 	git checkout conflict-branch &&
-	set_fake_editor &&
-	test_must_fail git rebase --onto HEAD~2 HEAD~ &&
-	test_must_fail git rebase --edit-todo &&
+	(
+		set_fake_editor &&
+		test_must_fail git rebase -f --apply --onto HEAD~2 HEAD~ &&
+		test_must_fail git rebase --edit-todo
+	) &&
 	git rebase --abort
 '
 
 test_expect_success 'rebase --edit-todo can be used to modify todo' '
 	git reset --hard &&
 	git checkout no-conflict-branch^0 &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
-	FAKE_LINES="2 1" git rebase --edit-todo &&
-	git rebase --continue &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
+		FAKE_LINES="2 1" git rebase --edit-todo &&
+		git rebase --continue
+	) &&
 	test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 	test L = $(git cat-file commit HEAD | sed -ne \$p)
 '
@@ -1077,13 +1160,12 @@ test_expect_success 'rebase --edit-todo can be used to modify todo' '
 test_expect_success 'rebase -i produces readable reflog' '
 	git reset --hard &&
 	git branch -f branch-reflog-test H &&
-	set_fake_editor &&
 	git rebase -i --onto I F branch-reflog-test &&
 	cat >expect <<-\EOF &&
-	rebase -i (finish): returning to refs/heads/branch-reflog-test
-	rebase -i (pick): H
-	rebase -i (pick): G
-	rebase -i (start): checkout I
+	rebase (finish): returning to refs/heads/branch-reflog-test
+	rebase (pick): H
+	rebase (pick): G
+	rebase (start): checkout I
 	EOF
 	git reflog -n4 HEAD |
 	sed "s/[^:]*: //" >actual &&
@@ -1098,8 +1180,10 @@ test_expect_success 'rebase -i respects core.commentchar' '
 	sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
 	mv "$1.tmp" "$1"
 	EOF
-	test_set_editor "$(pwd)/remove-all-but-first.sh" &&
-	git rebase -i B &&
+	(
+		test_set_editor "$(pwd)/remove-all-but-first.sh" &&
+		git rebase -i B
+	) &&
 	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 '
 
@@ -1108,9 +1192,11 @@ test_expect_success 'rebase -i respects core.commentchar=auto' '
 	write_script copy-edit-script.sh <<-\EOF &&
 	cp "$1" edit-script
 	EOF
-	test_set_editor "$(pwd)/copy-edit-script.sh" &&
 	test_when_finished "git rebase --abort || :" &&
-	git rebase -i HEAD^ &&
+	(
+		test_set_editor "$(pwd)/copy-edit-script.sh" &&
+		git rebase -i HEAD^
+	) &&
 	test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)"
 '
 
@@ -1145,8 +1231,11 @@ test_expect_success 'interrupted rebase -i with --strategy and -X' '
 	echo five >conflict &&
 	echo Z >file1 &&
 	git commit -a -m "one file conflict" &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive -Xours conflict-branch &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive \
+			-Xours conflict-branch
+	) &&
 	git rebase --continue &&
 	test $(git show conflict-branch:conflict) = $(cat conflict) &&
 	test $(cat file1) = Z
@@ -1161,7 +1250,7 @@ test_expect_success 'rebase -i error on commits with \ in message' '
 	test_expect_code 1 grep  "	emp" error
 '
 
-test_expect_success 'short SHA-1 setup' '
+test_expect_success SHA1 'short SHA-1 setup' '
 	test_when_finished "git checkout master" &&
 	git checkout --orphan collide &&
 	git rm -rf . &&
@@ -1173,22 +1262,37 @@ test_expect_success 'short SHA-1 setup' '
 	)
 '
 
-test_expect_success 'short SHA-1 collide' '
+test_expect_success SHA1 'short SHA-1 collide' '
 	test_when_finished "reset_rebase && git checkout master" &&
 	git checkout collide &&
+	colliding_sha1=6bcda37 &&
+	test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" &&
 	(
-	unset test_tick &&
-	test_tick &&
-	set_fake_editor &&
-	FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
-	FAKE_LINES="reword 1 2" git rebase -i HEAD~2
-	)
+		unset test_tick &&
+		test_tick &&
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
+		FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 &&
+		test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" &&
+		grep "^pick $colliding_sha1 " \
+			.git/rebase-merge/git-rebase-todo.tmp &&
+		grep "^pick [0-9a-f]\{40\}" \
+			.git/rebase-merge/git-rebase-todo &&
+		grep "^pick [0-9a-f]\{40\}" \
+			.git/rebase-merge/git-rebase-todo.backup &&
+		git rebase --continue
+	) &&
+	collide2="$(git rev-parse HEAD~1 | cut -c 1-4)" &&
+	collide3="$(git rev-parse collide3 | cut -c 1-4)" &&
+	test "$collide2" = "$collide3"
 '
 
 test_expect_success 'respect core.abbrev' '
 	git config core.abbrev 12 &&
-	set_cat_todo_editor &&
-	test_must_fail git rebase -i HEAD~4 >todo-list &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i HEAD~4 >todo-list
+	) &&
 	test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
 '
 
@@ -1196,16 +1300,20 @@ test_expect_success 'todo count' '
 	write_script dump-raw.sh <<-\EOF &&
 		cat "$1"
 	EOF
-	test_set_editor "$(pwd)/dump-raw.sh" &&
-	git rebase -i HEAD~4 >actual &&
+	(
+		test_set_editor "$(pwd)/dump-raw.sh" &&
+		git rebase -i HEAD~4 >actual
+	) &&
 	test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual
 '
 
 test_expect_success 'rebase -i commits that overwrite untracked files (pick)' '
 	git checkout --force branch2 &&
 	git clean -f &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 2" git rebase -i A &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i A
+	) &&
 	test_cmp_rev HEAD F &&
 	test_path_is_missing file6 &&
 	>file6 &&
@@ -1220,8 +1328,10 @@ test_expect_success 'rebase -i commits that overwrite untracked files (squash)'
 	git checkout --force branch2 &&
 	git clean -f &&
 	git tag original-branch2 &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 squash 2" git rebase -i A &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 squash 2" git rebase -i A
+	) &&
 	test_cmp_rev HEAD F &&
 	test_path_is_missing file6 &&
 	>file6 &&
@@ -1236,8 +1346,10 @@ test_expect_success 'rebase -i commits that overwrite untracked files (squash)'
 test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' '
 	git checkout --force branch2 &&
 	git clean -f &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 2" git rebase -i --no-ff A &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i --no-ff A
+	) &&
 	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
 	test_path_is_missing file6 &&
 	>file6 &&
@@ -1260,8 +1372,10 @@ test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' '
 	git tag seq-onto &&
 	git reset --hard HEAD~2 &&
 	git cherry-pick seq-onto &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES= git rebase -i seq-onto &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES= git rebase -i seq-onto
+	) &&
 	test -d .git/rebase-merge &&
 	git rebase --continue &&
 	git diff --exit-code seq-onto &&
@@ -1280,8 +1394,10 @@ rebase_setup_and_clean () {
 
 test_expect_success 'drop' '
 	rebase_setup_and_clean drop-test &&
-	set_fake_editor &&
-	FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root
+	) &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 	test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
@@ -1290,9 +1406,10 @@ test_expect_success 'drop' '
 test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' '
 	test_config rebase.missingCommitsCheck ignore &&
 	rebase_setup_and_clean missing-commit &&
-	set_fake_editor &&
-	FAKE_LINES="1 2 3 4" \
-		git rebase -i --root 2>actual &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual
+	) &&
 	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test_i18ngrep \
 		"Successfully rebased and updated refs/heads/missing-commit" \
@@ -1308,9 +1425,10 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
 	EOF
 	test_config rebase.missingCommitsCheck warn &&
 	rebase_setup_and_clean missing-commit &&
-	set_fake_editor &&
-	FAKE_LINES="1 2 3 4" \
-		git rebase -i --root 2>actual.2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
+	) &&
 	head -n4 actual.2 >actual &&
 	test_i18ncmp expect actual &&
 	test D = $(git cat-file commit HEAD | sed -ne \$p)
@@ -1332,19 +1450,141 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
 	EOF
 	test_config rebase.missingCommitsCheck error &&
 	rebase_setup_and_clean missing-commit &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 2 4" \
-		git rebase -i --root 2>actual &&
-	test_i18ncmp expect actual &&
-	cp .git/rebase-merge/git-rebase-todo.backup \
-		.git/rebase-merge/git-rebase-todo &&
-	FAKE_LINES="1 2 drop 3 4 drop 5" \
-		git rebase --edit-todo &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 4" \
+			git rebase -i --root 2>actual &&
+		test_i18ncmp expect actual &&
+		cp .git/rebase-merge/git-rebase-todo.backup \
+			.git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo
+	) &&
 	git rebase --continue &&
 	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 '
 
+test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = ignore' '
+	test_config rebase.missingCommitsCheck ignore &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="break 1 2 3 4 5" git rebase -i --root &&
+		FAKE_LINES="1 2 3 4" git rebase --edit-todo &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_i18ngrep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
+'
+
+test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = warn' '
+	cat >expect <<-EOF &&
+	error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 master~4)
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 master~4)
+	To avoid this message, use "drop" to explicitly remove a commit.
+	EOF
+	head -n4 expect >expect.2 &&
+	tail -n1 expect >>expect.2 &&
+	tail -n4 expect.2 >expect.3 &&
+	test_config rebase.missingCommitsCheck warn &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
+			git rebase -i --root &&
+		cp .git/rebase-merge/git-rebase-todo.backup orig &&
+		FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
+		head -n6 actual.2 >actual &&
+		test_i18ncmp expect actual &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
+		head -n4 actual.2 >actual &&
+		test_i18ncmp expect.3 actual &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_i18ngrep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
+'
+
+test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = error' '
+	cat >expect <<-EOF &&
+	error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 master~4)
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 master~4)
+	To avoid this message, use "drop" to explicitly remove a commit.
+
+	Use '\''git config rebase.missingCommitsCheck'\'' to change the level of warnings.
+	The possible behaviours are: ignore, warn, error.
+
+	You can fix this with '\''git rebase --edit-todo'\'' and then run '\''git rebase --continue'\''.
+	Or you can abort the rebase with '\''git rebase --abort'\''.
+	EOF
+	tail -n11 expect >expect.2 &&
+	head -n3 expect.2 >expect.3 &&
+	tail -n7 expect.2 >>expect.3 &&
+	test_config rebase.missingCommitsCheck error &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
+			git rebase -i --root &&
+		cp .git/rebase-merge/git-rebase-todo.backup orig &&
+		test_must_fail env FAKE_LINES="2 3 4" \
+			git rebase --edit-todo 2>actual &&
+		test_i18ncmp expect actual &&
+		test_must_fail git rebase --continue 2>actual &&
+		test_i18ncmp expect.2 actual &&
+		test_must_fail git rebase --edit-todo &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		test_must_fail env FAKE_LINES="1 2 3 4" \
+			git rebase --edit-todo 2>actual &&
+		test_i18ncmp expect.3 actual &&
+		test_must_fail git rebase --continue 2>actual &&
+		test_i18ncmp expect.3 actual &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_i18ngrep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
+'
+
+test_expect_success 'rebase.missingCommitsCheck = error after resolving conflicts' '
+	test_config rebase.missingCommitsCheck error &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="drop 1 break 2 3 4" git rebase -i A E
+	) &&
+	git rebase --edit-todo &&
+	test_must_fail git rebase --continue &&
+	echo x >file1 &&
+	git add file1 &&
+	git rebase --continue
+'
+
+test_expect_success 'rebase.missingCommitsCheck = error when editing for a second time' '
+	test_config rebase.missingCommitsCheck error &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 break 2 3" git rebase -i A D &&
+		cp .git/rebase-merge/git-rebase-todo todo &&
+		test_must_fail env FAKE_LINES=2 git rebase --edit-todo &&
+		GIT_SEQUENCE_EDITOR="cp todo" git rebase --edit-todo &&
+		git rebase --continue
+	)
+'
+
 test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and exec' '
 	rebase_setup_and_clean abbrevcmd &&
 	test_commit "first" file1.txt "first line" first &&
@@ -1360,21 +1600,27 @@ test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and e
 	x git show HEAD
 	EOF
 	git checkout abbrevcmd &&
-	set_cat_todo_editor &&
 	test_config rebase.abbreviateCommands true &&
-	test_must_fail git rebase -i --exec "git show HEAD" \
-		--autosquash master >actual &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --exec "git show HEAD" \
+			--autosquash master >actual
+	) &&
 	test_cmp expected actual
 '
 
 test_expect_success 'static check of bad command' '
 	rebase_setup_and_clean bad-cmd &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
 		git rebase -i --root 2>actual &&
-	test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" actual &&
-	test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
-	FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo &&
+		test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" \
+				actual &&
+		test_i18ngrep "You can fix this with .git rebase --edit-todo.." \
+				actual &&
+		FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo
+	) &&
 	git rebase --continue &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test C = $(git cat-file commit HEAD^ | sed -ne \$p)
@@ -1390,19 +1636,24 @@ test_expect_success 'tabs and spaces are accepted in the todolist' '
 	) >"$1.new"
 	mv "$1.new" "$1"
 	EOF
-	test_set_editor "$(pwd)/add-indent.sh" &&
-	git rebase -i HEAD^^^ &&
+	(
+		test_set_editor "$(pwd)/add-indent.sh" &&
+		git rebase -i HEAD^^^
+	) &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p)
 '
 
 test_expect_success 'static check of bad SHA-1' '
 	rebase_setup_and_clean bad-sha &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
-		git rebase -i --root 2>actual &&
-	test_i18ngrep "edit XXXXXXX False commit" actual &&
-	test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
-	FAKE_LINES="1 2 4 5 6" git rebase --edit-todo &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
+			git rebase -i --root 2>actual &&
+			test_i18ngrep "edit XXXXXXX False commit" actual &&
+			test_i18ngrep "You can fix this with .git rebase --edit-todo.." \
+					actual &&
+		FAKE_LINES="1 2 4 5 6" git rebase --edit-todo
+	) &&
 	git rebase --continue &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p)
 '
@@ -1419,42 +1670,73 @@ test_expect_success 'editor saves as CR/LF' '
 	)
 '
 
-SQ="'"
 test_expect_success 'rebase -i --gpg-sign=<key-id>' '
 	test_when_finished "test_might_fail git rebase --abort" &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
-		>out 2>err &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
+			HEAD^ >out 2>err
+	) &&
 	test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
 '
 
 test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' '
 	test_when_finished "test_might_fail git rebase --abort" &&
 	test_config commit.gpgsign true &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
-		>out 2>err &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
+			HEAD^ >out 2>err
+	) &&
 	test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
 '
 
 test_expect_success 'valid author header after --root swap' '
 	rebase_setup_and_clean author-header no-conflict-branch &&
-	set_fake_editor &&
 	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
 	git cat-file commit HEAD | grep ^author >expected &&
-	FAKE_LINES="5 1" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="5 1" git rebase -i --root
+	) &&
 	git cat-file commit HEAD^ | grep ^author >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'valid author header when author contains single quote' '
 	rebase_setup_and_clean author-header no-conflict-branch &&
-	set_fake_editor &&
 	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
 	git cat-file commit HEAD | grep ^author >expected &&
-	FAKE_LINES="2" git rebase -i HEAD~2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2" git rebase -i HEAD~2
+	) &&
 	git cat-file commit HEAD | grep ^author >actual &&
 	test_cmp expected actual
 '
 
+test_expect_success 'post-commit hook is called' '
+	test_when_finished "rm -f .git/hooks/post-commit" &&
+	>actual &&
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/post-commit <<-\EOS &&
+	git rev-parse HEAD >>actual
+	EOS
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E &&
+		echo x>file3 &&
+		git add file3 &&
+		FAKE_COMMIT_MESSAGE=edited git rebase --continue
+	) &&
+	git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \
+		>expect &&
+	test_cmp expect actual
+'
+
+# This must be the last test in this file
+test_expect_success '$EDITOR and friends are unchanged' '
+	test_editor_unchanged
+'
+
 test_done
diff --git a/third_party/git/t/t3406-rebase-message.sh b/third_party/git/t/t3406-rebase-message.sh
index b393e1e9fee8..61b76f330198 100755
--- a/third_party/git/t/t3406-rebase-message.sh
+++ b/third_party/git/t/t3406-rebase-message.sh
@@ -18,32 +18,29 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'rebase -m' '
-	git rebase -m master >report &&
-	>expect &&
-	sed -n -e "/^Already applied: /p" \
-		-e "/^Committed: /p" report >actual &&
-	test_cmp expect actual
+	git rebase -m master >actual &&
+	test_must_be_empty actual
 '
 
 test_expect_success 'rebase against master twice' '
-	git rebase master >out &&
+	git rebase --apply master >out &&
 	test_i18ngrep "Current branch topic is up to date" out
 '
 
 test_expect_success 'rebase against master twice with --force' '
-	git rebase --force-rebase master >out &&
+	git rebase --force-rebase --apply master >out &&
 	test_i18ngrep "Current branch topic is up to date, rebase forced" out
 '
 
 test_expect_success 'rebase against master twice from another branch' '
 	git checkout topic^ &&
-	git rebase master topic >out &&
+	git rebase --apply master topic >out &&
 	test_i18ngrep "Current branch topic is up to date" out
 '
 
 test_expect_success 'rebase fast-forward to master' '
 	git checkout topic^ &&
-	git rebase topic >out &&
+	git rebase --apply topic >out &&
 	test_i18ngrep "Fast-forwarded HEAD to topic" out
 '
 
@@ -92,7 +89,7 @@ test_expect_success 'GIT_REFLOG_ACTION' '
 	git checkout -b reflog-topic start &&
 	test_commit reflog-to-rebase &&
 
-	git rebase reflog-onto &&
+	git rebase --apply reflog-onto &&
 	git log -g --format=%gs -3 >actual &&
 	cat >expect <<-\EOF &&
 	rebase finished: returning to refs/heads/reflog-topic
@@ -102,7 +99,7 @@ test_expect_success 'GIT_REFLOG_ACTION' '
 	test_cmp expect actual &&
 
 	git checkout -b reflog-prefix reflog-to-rebase &&
-	GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto &&
+	GIT_REFLOG_ACTION=change-the-reflog git rebase --apply reflog-onto &&
 	git log -g --format=%gs -3 >actual &&
 	cat >expect <<-\EOF &&
 	rebase finished: returning to refs/heads/reflog-prefix
diff --git a/third_party/git/t/t3407-rebase-abort.sh b/third_party/git/t/t3407-rebase-abort.sh
index 910f21828434..97efea0f5697 100755
--- a/third_party/git/t/t3407-rebase-abort.sh
+++ b/third_party/git/t/t3407-rebase-abort.sh
@@ -96,14 +96,14 @@ testrebase() {
 	'
 }
 
-testrebase "" .git/rebase-apply
+testrebase " --apply" .git/rebase-apply
 testrebase " --merge" .git/rebase-merge
 
-test_expect_success 'rebase --quit' '
+test_expect_success 'rebase --apply --quit' '
 	cd "$work_dir" &&
 	# Clean up the state from the previous one
 	git reset --hard pre-rebase &&
-	test_must_fail git rebase master &&
+	test_must_fail git rebase --apply master &&
 	test_path_is_dir .git/rebase-apply &&
 	head_before=$(git rev-parse HEAD) &&
 	git rebase --quit &&
diff --git a/third_party/git/t/t3415-rebase-autosquash.sh b/third_party/git/t/t3415-rebase-autosquash.sh
index 22d218698e95..093de9005b76 100755
--- a/third_party/git/t/t3415-rebase-autosquash.sh
+++ b/third_party/git/t/t3415-rebase-autosquash.sh
@@ -25,6 +25,13 @@ test_expect_success setup '
 '
 
 test_auto_fixup () {
+	no_squash= &&
+	if test "x$1" = 'x!'
+	then
+		no_squash=true
+		shift
+	fi &&
+
 	git reset --hard base &&
 	echo 1 >file1 &&
 	git add -u &&
@@ -35,10 +42,19 @@ test_auto_fixup () {
 	test_tick &&
 	git rebase $2 -i HEAD^^^ &&
 	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code $1 &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD^ | grep first | wc -l)
+	if test -n "$no_squash"
+	then
+		test_line_count = 4 actual
+	else
+		test_line_count = 3 actual &&
+		git diff --exit-code $1 &&
+		echo 1 >expect &&
+		git cat-file blob HEAD^:file1 >actual &&
+		test_cmp expect actual &&
+		git cat-file commit HEAD^ >commit &&
+		grep first commit >actual &&
+		test_line_count = 1 actual
+	fi
 }
 
 test_expect_success 'auto fixup (option)' '
@@ -48,12 +64,19 @@ test_expect_success 'auto fixup (option)' '
 test_expect_success 'auto fixup (config)' '
 	git config rebase.autosquash true &&
 	test_auto_fixup final-fixup-config-true &&
-	test_must_fail test_auto_fixup fixup-config-true-no --no-autosquash &&
+	test_auto_fixup ! fixup-config-true-no --no-autosquash &&
 	git config rebase.autosquash false &&
-	test_must_fail test_auto_fixup final-fixup-config-false
+	test_auto_fixup ! final-fixup-config-false
 '
 
 test_auto_squash () {
+	no_squash= &&
+	if test "x$1" = 'x!'
+	then
+		no_squash=true
+		shift
+	fi &&
+
 	git reset --hard base &&
 	echo 1 >file1 &&
 	git add -u &&
@@ -64,10 +87,19 @@ test_auto_squash () {
 	test_tick &&
 	git rebase $2 -i HEAD^^^ &&
 	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code $1 &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 2 = $(git cat-file commit HEAD^ | grep first | wc -l)
+	if test -n "$no_squash"
+	then
+		test_line_count = 4 actual
+	else
+		test_line_count = 3 actual &&
+		git diff --exit-code $1 &&
+		echo 1 >expect &&
+		git cat-file blob HEAD^:file1 >actual &&
+		test_cmp expect actual &&
+		git cat-file commit HEAD^ >commit &&
+		grep first commit >actual &&
+		test_line_count = 2 actual
+	fi
 }
 
 test_expect_success 'auto squash (option)' '
@@ -77,9 +109,9 @@ test_expect_success 'auto squash (option)' '
 test_expect_success 'auto squash (config)' '
 	git config rebase.autosquash true &&
 	test_auto_squash final-squash-config-true &&
-	test_must_fail test_auto_squash squash-config-true-no --no-autosquash &&
+	test_auto_squash ! squash-config-true-no --no-autosquash &&
 	git config rebase.autosquash false &&
-	test_must_fail test_auto_squash final-squash-config-false
+	test_auto_squash ! final-squash-config-false
 '
 
 test_expect_success 'misspelled auto squash' '
@@ -94,7 +126,8 @@ test_expect_success 'misspelled auto squash' '
 	git log --oneline >actual &&
 	test_line_count = 4 actual &&
 	git diff --exit-code final-missquash &&
-	test 0 = $(git rev-list final-missquash...HEAD | wc -l)
+	git rev-list final-missquash...HEAD >list &&
+	test_must_be_empty list
 '
 
 test_expect_success 'auto squash that matches 2 commits' '
@@ -113,9 +146,15 @@ test_expect_success 'auto squash that matches 2 commits' '
 	git log --oneline >actual &&
 	test_line_count = 4 actual &&
 	git diff --exit-code final-multisquash &&
-	test 1 = "$(git cat-file blob HEAD^^:file1)" &&
-	test 2 = $(git cat-file commit HEAD^^ | grep first | wc -l) &&
-	test 1 = $(git cat-file commit HEAD | grep first | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^^ >commit &&
+	grep first commit >actual &&
+	test_line_count = 2 actual &&
+	git cat-file commit HEAD >commit &&
+	grep first commit >actual &&
+	test_line_count = 1 actual
 '
 
 test_expect_success 'auto squash that matches a commit after the squash' '
@@ -134,25 +173,38 @@ test_expect_success 'auto squash that matches a commit after the squash' '
 	git log --oneline >actual &&
 	test_line_count = 5 actual &&
 	git diff --exit-code final-presquash &&
-	test 0 = "$(git cat-file blob HEAD^^:file1)" &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD | grep third | wc -l) &&
-	test 1 = $(git cat-file commit HEAD^ | grep third | wc -l)
+	echo 0 >expect &&
+	git cat-file blob HEAD^^:file1 >actual &&
+	test_cmp expect actual &&
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD >commit &&
+	grep third commit >actual &&
+	test_line_count = 1 actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep third commit >actual &&
+	test_line_count = 1 actual
 '
 test_expect_success 'auto squash that matches a sha1' '
 	git reset --hard base &&
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! $(git rev-parse --short HEAD^)" &&
+	oid=$(git rev-parse --short HEAD^) &&
+	git commit -m "squash! $oid" &&
 	git tag final-shasquash &&
 	test_tick &&
 	git rebase --autosquash -i HEAD^^^ &&
 	git log --oneline >actual &&
 	test_line_count = 3 actual &&
 	git diff --exit-code final-shasquash &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep squash commit >actual &&
+	test_line_count = 1 actual
 '
 
 test_expect_success 'auto squash that matches longer sha1' '
@@ -160,15 +212,20 @@ test_expect_success 'auto squash that matches longer sha1' '
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! $(git rev-parse --short=11 HEAD^)" &&
+	oid=$(git rev-parse --short=11 HEAD^) &&
+	git commit -m "squash! $oid" &&
 	git tag final-longshasquash &&
 	test_tick &&
 	git rebase --autosquash -i HEAD^^^ &&
 	git log --oneline >actual &&
 	test_line_count = 3 actual &&
 	git diff --exit-code final-longshasquash &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep squash commit >actual &&
+	test_line_count = 1 actual
 '
 
 test_auto_commit_flags () {
@@ -183,8 +240,12 @@ test_auto_commit_flags () {
 	git log --oneline >actual &&
 	test_line_count = 3 actual &&
 	git diff --exit-code final-commit-$1 &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test $2 = $(git cat-file commit HEAD^ | grep first | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep first commit >actual &&
+	test_line_count = $2 actual
 }
 
 test_expect_success 'use commit --fixup' '
@@ -210,11 +271,15 @@ test_auto_fixup_fixup () {
 	(
 		set_cat_todo_editor &&
 		test_must_fail git rebase --autosquash -i HEAD^^^^ >actual &&
+		head=$(git rev-parse --short HEAD) &&
+		parent1=$(git rev-parse --short HEAD^) &&
+		parent2=$(git rev-parse --short HEAD^^) &&
+		parent3=$(git rev-parse --short HEAD^^^) &&
 		cat >expected <<-EOF &&
-		pick $(git rev-parse --short HEAD^^^) first commit
-		$1 $(git rev-parse --short HEAD^) $1! first
-		$1 $(git rev-parse --short HEAD) $1! $2! first
-		pick $(git rev-parse --short HEAD^^) second commit
+		pick $parent3 first commit
+		$1 $parent1 $1! first
+		$1 $head $1! $2! first
+		pick $parent2 second commit
 		EOF
 		test_cmp expected actual
 	) &&
@@ -222,13 +287,17 @@ test_auto_fixup_fixup () {
 	git log --oneline >actual &&
 	test_line_count = 3 actual
 	git diff --exit-code "final-$1-$2" &&
-	test 2 = "$(git cat-file blob HEAD^:file1)" &&
+	echo 2 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep first commit >actual &&
 	if test "$1" = "fixup"
 	then
-		test 1 = $(git cat-file commit HEAD^ | grep first | wc -l)
+		test_line_count = 1 actual
 	elif test "$1" = "squash"
 	then
-		test 3 = $(git cat-file commit HEAD^ | grep first | wc -l)
+		test_line_count = 3 actual
 	else
 		false
 	fi
@@ -256,19 +325,25 @@ test_expect_success C_LOCALE_OUTPUT 'autosquash with custom inst format' '
 	echo 2 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! $(git rev-parse --short HEAD^)" &&
+	oid=$(git rev-parse --short HEAD^) &&
+	git commit -m "squash! $oid" &&
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! $(git log -n 1 --format=%s HEAD~2)" &&
+	subject=$(git log -n 1 --format=%s HEAD~2) &&
+	git commit -m "squash! $subject" &&
 	git tag final-squash-instFmt &&
 	test_tick &&
 	git rebase --autosquash -i HEAD~4 &&
 	git log --oneline >actual &&
 	test_line_count = 3 actual &&
 	git diff --exit-code final-squash-instFmt &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep squash commit >actual &&
+	test_line_count = 2 actual
 '
 
 test_expect_success 'autosquash with empty custom instructionFormat' '
diff --git a/third_party/git/t/t3416-rebase-onto-threedots.sh b/third_party/git/t/t3416-rebase-onto-threedots.sh
index ddf2f6485383..9c2548423bce 100755
--- a/third_party/git/t/t3416-rebase-onto-threedots.sh
+++ b/third_party/git/t/t3416-rebase-onto-threedots.sh
@@ -99,7 +99,64 @@ test_expect_success 'rebase -i --onto master...side' '
 	git checkout side &&
 	git reset --hard K &&
 
+	set_fake_editor &&
 	test_must_fail git rebase -i --onto master...side J
 '
 
+test_expect_success 'rebase --keep-base --onto incompatible' '
+	test_must_fail git rebase --keep-base --onto master...
+'
+
+test_expect_success 'rebase --keep-base --root incompatible' '
+	test_must_fail git rebase --keep-base --root
+'
+
+test_expect_success 'rebase --keep-base master from topic' '
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	git rebase --keep-base master &&
+	git rev-parse C >base.expect &&
+	git merge-base master HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --keep-base master from side' '
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	test_must_fail git rebase --keep-base master
+'
+
+test_expect_success 'rebase -i --keep-base master from topic' '
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	set_fake_editor &&
+	EXPECT_COUNT=2 git rebase -i --keep-base master &&
+	git rev-parse C >base.expect &&
+	git merge-base master HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase -i --keep-base master from side' '
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	set_fake_editor &&
+	test_must_fail git rebase -i --keep-base master
+'
+
 test_done
diff --git a/third_party/git/t/t3418-rebase-continue.sh b/third_party/git/t/t3418-rebase-continue.sh
index 4eff14dae532..7a2da972fd37 100755
--- a/third_party/git/t/t3418-rebase-continue.sh
+++ b/third_party/git/t/t3418-rebase-continue.sh
@@ -120,6 +120,20 @@ test_expect_success REBASE_P 'rebase passes merge strategy options correctly' '
 	git rebase --continue
 '
 
+test_expect_success 'rebase -r passes merge strategy options correctly' '
+	rm -fr .git/rebase-* &&
+	git reset --hard commit-new-file-F3-on-topic-branch &&
+	test_commit merge-theirs &&
+	git reset --hard HEAD^ &&
+	test_commit some-other-commit &&
+	test_tick &&
+	git merge --no-ff merge-theirs &&
+	FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \
+		-s recursive --strategy-option=theirs HEAD~2 &&
+	test_commit force-change-ours &&
+	git rebase --continue
+'
+
 test_expect_success '--skip after failed fixup cleans commit message' '
 	test_when_finished "test_might_fail git rebase --abort" &&
 	git checkout -b with-conflicting-fixup &&
diff --git a/third_party/git/t/t3419-rebase-patch-id.sh b/third_party/git/t/t3419-rebase-patch-id.sh
index 49f548cdb93d..d93458377690 100755
--- a/third_party/git/t/t3419-rebase-patch-id.sh
+++ b/third_party/git/t/t3419-rebase-patch-id.sh
@@ -80,7 +80,8 @@ do_tests () {
 		git commit -q -m "change big file again" &&
 		git checkout -q other^{} &&
 		git rebase master &&
-		test_must_fail test -n "$(git rev-list master...HEAD~)"
+		git rev-list master...HEAD~ >revs &&
+		test_must_be_empty revs
 	'
 
 	test_expect_success $pr 'do not drop patch' '
@@ -90,7 +91,7 @@ do_tests () {
 		git commit -q -m squashed &&
 		git checkout -q other^{} &&
 		test_must_fail git rebase squashed &&
-		rm -rf .git/rebase-apply
+		git rebase --quit
 	'
 }
 
diff --git a/third_party/git/t/t3420-rebase-autostash.sh b/third_party/git/t/t3420-rebase-autostash.sh
index b8f4d0346723..b97ea6236394 100755
--- a/third_party/git/t/t3420-rebase-autostash.sh
+++ b/third_party/git/t/t3420-rebase-autostash.sh
@@ -34,10 +34,9 @@ test_expect_success setup '
 	remove_progress_re="$(printf "s/.*\\r//")"
 '
 
-create_expected_success_am () {
+create_expected_success_apply () {
 	cat >expected <<-EOF
 	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
-	HEAD is now at $(git rev-parse --short feature-branch) third commit
 	First, rewinding head to replay your work on top of it...
 	Applying: second commit
 	Applying: third commit
@@ -45,19 +44,17 @@ create_expected_success_am () {
 	EOF
 }
 
-create_expected_success_interactive () {
+create_expected_success_merge () {
 	q_to_cr >expected <<-EOF
 	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
-	HEAD is now at $(git rev-parse --short feature-branch) third commit
 	Applied autostash.
 	Successfully rebased and updated refs/heads/rebased-feature-branch.
 	EOF
 }
 
-create_expected_failure_am () {
+create_expected_failure_apply () {
 	cat >expected <<-EOF
 	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
-	HEAD is now at $(git rev-parse --short feature-branch) third commit
 	First, rewinding head to replay your work on top of it...
 	Applying: second commit
 	Applying: third commit
@@ -67,10 +64,9 @@ create_expected_failure_am () {
 	EOF
 }
 
-create_expected_failure_interactive () {
+create_expected_failure_merge () {
 	cat >expected <<-EOF
 	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
-	HEAD is now at $(git rev-parse --short feature-branch) third commit
 	Applying autostash resulted in conflicts.
 	Your changes are safe in the stash.
 	You can run "git stash pop" or "git stash drop" at any time.
@@ -105,9 +101,9 @@ testrebase () {
 
 	test_expect_success "rebase$type --autostash: check output" '
 		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		if test ${suffix} = "merge"; then
-			suffix=interactive
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
 		fi &&
 		create_expected_success_$suffix &&
 		sed "$remove_progress_re" <actual >actual2 &&
@@ -206,9 +202,9 @@ testrebase () {
 
 	test_expect_success "rebase$type: check output with conflicting stash" '
 		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		if test ${suffix} = "merge"; then
-			suffix=interactive
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
 		fi &&
 		create_expected_failure_$suffix &&
 		sed "$remove_progress_re" <actual >actual2 &&
@@ -238,7 +234,7 @@ test_expect_success "rebase: noop rebase" '
 	git checkout feature-branch
 '
 
-testrebase "" .git/rebase-apply
+testrebase " --apply" .git/rebase-apply
 testrebase " --merge" .git/rebase-merge
 testrebase " --interactive" .git/rebase-merge
 
@@ -306,4 +302,12 @@ test_expect_success 'branch is left alone when possible' '
 	test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)"
 '
 
+test_expect_success 'never change active branch' '
+	git checkout -b not-the-feature-branch unrelated-onto-branch &&
+	test_when_finished "git reset --hard && git checkout master" &&
+	echo changed >file0 &&
+	git rebase --autostash not-the-feature-branch feature-branch &&
+	test_cmp_rev not-the-feature-branch unrelated-onto-branch
+'
+
 test_done
diff --git a/third_party/git/t/t3421-rebase-topology-linear.sh b/third_party/git/t/t3421-rebase-topology-linear.sh
index 7274dca40b1c..cf8dfd6c203b 100755
--- a/third_party/git/t/t3421-rebase-topology-linear.sh
+++ b/third_party/git/t/t3421-rebase-topology-linear.sh
@@ -26,11 +26,21 @@ test_run_rebase () {
 		test_linear_range 'd e' c..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase success -p
 
+test_expect_success 'setup branches and remote tracking' '
+	git tag -l >tags &&
+	for tag in $(cat tags)
+	do
+		git branch branch-$tag $tag || return 1
+	done &&
+	git remote add origin "file://$PWD" &&
+	git fetch origin
+'
+
 test_run_rebase () {
 	result=$1
 	shift
@@ -40,7 +50,7 @@ test_run_rebase () {
 		test_cmp_rev e HEAD
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase success -p
@@ -51,12 +61,13 @@ test_run_rebase () {
 	test_expect_$result "rebase $* -f rewrites even if upstream is an ancestor" "
 		reset_rebase &&
 		git rebase $* -f b e &&
-		! test_cmp_rev e HEAD &&
+		test_cmp_rev ! e HEAD &&
 		test_cmp_rev b HEAD~2 &&
 		test_linear_range 'd e' b..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
+test_run_rebase success --fork-point
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase failure -p
@@ -64,13 +75,31 @@ test_have_prereq !REBASE_P || test_run_rebase failure -p
 test_run_rebase () {
 	result=$1
 	shift
+	test_expect_$result "rebase $* -f rewrites even if remote upstream is an ancestor" "
+		reset_rebase &&
+		git rebase $* -f branch-b branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
+		test_cmp_rev branch-b HEAD~2 &&
+		test_linear_range 'd e' branch-b..
+	"
+}
+test_run_rebase success --apply
+test_run_rebase success --fork-point
+test_run_rebase success -m
+test_run_rebase success -i
+test_have_prereq !REBASE_P || test_run_rebase success -p
+
+test_run_rebase () {
+	result=$1
+	shift
 	test_expect_$result "rebase $* fast-forwards from ancestor of upstream" "
 		reset_rebase &&
 		git rebase $* e b &&
 		test_cmp_rev e HEAD
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
+test_run_rebase success --fork-point
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase success -p
@@ -110,7 +139,7 @@ test_run_rebase () {
 		test_linear_range 'd i' h..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase success -p
@@ -125,7 +154,7 @@ test_run_rebase () {
 		test_linear_range 'd' h..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase success -p
@@ -140,7 +169,7 @@ test_run_rebase () {
 		test_linear_range 'd i' f..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase success -p
@@ -155,7 +184,7 @@ test_run_rebase () {
 		test_linear_range 'd gp i' h..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase success -p
@@ -176,17 +205,17 @@ test_expect_success 'setup of linear history for empty commit tests' '
 test_run_rebase () {
 	result=$1
 	shift
-	test_expect_$result "rebase $* drops empty commit" "
+	test_expect_$result "rebase $* keeps begin-empty commits" "
 		reset_rebase &&
-		git rebase $* c l &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd l' c..
+		git rebase $* j l &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'j d k l' c..
 	"
 }
-test_run_rebase success ''
+test_run_rebase failure --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
+test_have_prereq !REBASE_P || test_run_rebase failure -p
 
 test_run_rebase () {
 	result=$1
@@ -198,10 +227,10 @@ test_run_rebase () {
 		test_linear_range 'd k l' c..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
+test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -213,10 +242,10 @@ test_run_rebase () {
 		test_linear_range 'd k l' j..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
+test_have_prereq !REBASE_P || test_run_rebase success -p
 test_run_rebase success --rebase-merges
 
 #       m
@@ -253,7 +282,7 @@ test_run_rebase () {
 		test_linear_range 'x y' c..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase success -p
@@ -268,7 +297,7 @@ test_run_rebase () {
 		test_linear_range 'x y' c..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase failure -p
@@ -283,7 +312,7 @@ test_run_rebase () {
 		test_linear_range 'x y' m..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase success -p
@@ -299,7 +328,7 @@ test_run_rebase () {
 	"
 }
 
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase failure -p
@@ -314,7 +343,7 @@ test_run_rebase () {
 		test_linear_range 'x y' m..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 test_have_prereq !REBASE_P || test_run_rebase failure -p
@@ -339,7 +368,7 @@ test_run_rebase () {
 	test_expect_$result "rebase $* -f --root on linear history causes re-write" "
 		reset_rebase &&
 		git rebase $* -f --root c &&
-		! test_cmp_rev a HEAD~2 &&
+		test_cmp_rev ! a HEAD~2 &&
 		test_linear_range 'a b c' HEAD
 	"
 }
diff --git a/third_party/git/t/t3422-rebase-incompatible-options.sh b/third_party/git/t/t3422-rebase-incompatible-options.sh
index a5868ea152f9..50e7960702da 100755
--- a/third_party/git/t/t3422-rebase-incompatible-options.sh
+++ b/third_party/git/t/t3422-rebase-incompatible-options.sh
@@ -76,14 +76,4 @@ test_expect_success REBASE_P \
 	test_must_fail git rebase --preserve-merges --rebase-merges A
 '
 
-test_expect_success '--rebase-merges incompatible with --strategy' '
-	git checkout B^0 &&
-	test_must_fail git rebase --rebase-merges -s resolve A
-'
-
-test_expect_success '--rebase-merges incompatible with --strategy-option' '
-	git checkout B^0 &&
-	test_must_fail git rebase --rebase-merges -Xignore-space-change A
-'
-
 test_done
diff --git a/third_party/git/t/t3424-rebase-empty.sh b/third_party/git/t/t3424-rebase-empty.sh
new file mode 100755
index 000000000000..e1e30517ea64
--- /dev/null
+++ b/third_party/git/t/t3424-rebase-empty.sh
@@ -0,0 +1,134 @@
+#!/bin/sh
+
+test_description='git rebase of commits that start or become empty'
+
+. ./test-lib.sh
+
+test_expect_success 'setup test repository' '
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
+	test_write_lines A B C D E F G H I J >letters &&
+	git add numbers letters &&
+	git commit -m A &&
+
+	git branch upstream &&
+	git branch localmods &&
+
+	git checkout upstream &&
+	test_write_lines A B C D E >letters &&
+	git add letters &&
+	git commit -m B &&
+
+	test_write_lines 1 2 3 4 five 6 7 8 9 ten >numbers &&
+	git add numbers &&
+	git commit -m C &&
+
+	git checkout localmods &&
+	test_write_lines 1 2 3 4 five 6 7 8 9 10 >numbers &&
+	git add numbers &&
+	git commit -m C2 &&
+
+	git commit --allow-empty -m D &&
+
+	test_write_lines A B C D E >letters &&
+	git add letters &&
+	git commit -m "Five letters ought to be enough for anybody"
+'
+
+test_expect_failure 'rebase (apply-backend)' '
+	test_when_finished "git rebase --abort" &&
+	git checkout -B testing localmods &&
+	# rebase (--apply) should not drop commits that start empty
+	git rebase --apply upstream &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=drop' '
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=drop upstream &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge uses default of --empty=drop' '
+	git checkout -B testing localmods &&
+	git rebase --merge upstream &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=keep' '
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=keep upstream &&
+
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=ask' '
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --merge --empty=ask upstream &&
+
+	git rebase --skip &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --interactive --empty=drop' '
+	git checkout -B testing localmods &&
+	git rebase --interactive --empty=drop upstream &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --interactive --empty=keep' '
+	git checkout -B testing localmods &&
+	git rebase --interactive --empty=keep upstream &&
+
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --interactive --empty=ask' '
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --interactive --empty=ask upstream &&
+
+	git rebase --skip &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --interactive uses default of --empty=ask' '
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --interactive upstream &&
+
+	git rebase --skip &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge does not leave state laying around' '
+	git checkout -B testing localmods~2 &&
+	git rebase --merge upstream &&
+
+	test_path_is_missing .git/CHERRY_PICK_HEAD &&
+	test_path_is_missing .git/MERGE_MSG
+'
+
+test_done
diff --git a/third_party/git/t/t3425-rebase-topology-merges.sh b/third_party/git/t/t3425-rebase-topology-merges.sh
index fd8efe84fe8f..e42faa44e74f 100755
--- a/third_party/git/t/t3425-rebase-topology-merges.sh
+++ b/third_party/git/t/t3425-rebase-topology-merges.sh
@@ -54,7 +54,7 @@ test_run_rebase () {
 		test_linear_range 'n o' e..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 
@@ -70,7 +70,7 @@ test_run_rebase () {
 		test_linear_range "\'"$expected"\'" d..
 	"
 }
-test_run_rebase success 'n o e' ''
+test_run_rebase success 'n o e' --apply
 test_run_rebase success 'n o e' -m
 test_run_rebase success 'n o e' -i
 
@@ -86,7 +86,7 @@ test_run_rebase () {
 		test_linear_range "\'"$expected"\'" c..
 	"
 }
-test_run_rebase success 'd n o e' ''
+test_run_rebase success 'd n o e' --apply
 test_run_rebase success 'd n o e' -m
 test_run_rebase success 'd n o e' -i
 
@@ -102,7 +102,7 @@ test_run_rebase () {
 		test_linear_range "\'"$expected"\'" c..
 	"
 }
-test_run_rebase success 'd n o e' ''
+test_run_rebase success 'd n o e' --apply
 test_run_rebase success 'd n o e' -m
 test_run_rebase success 'd n o e' -i
 
diff --git a/third_party/git/t/t3427-rebase-subtree.sh b/third_party/git/t/t3427-rebase-subtree.sh
index d8640522a086..79e43a370bac 100755
--- a/third_party/git/t/t3427-rebase-subtree.sh
+++ b/third_party/git/t/t3427-rebase-subtree.sh
@@ -11,113 +11,99 @@ commit_message() {
 	git log --pretty=format:%s -1 "$1"
 }
 
+# There are a few bugs in the rebase with regards to the subtree strategy, and
+# this test script tries to document them.  First, the following commit history
+# is generated (the onelines are shown, time flows from left to right):
+#
+# master1 - master2 - master3
+#                             \
+# README ---------------------- Add subproject master - master4 - files_subtree/master5
+#
+# Where the merge moves the files master[123].t into the subdirectory
+# files_subtree/ and master4 as well as files_subtree/master5 add files to that
+# directory directly.
+#
+# Then, in subsequent test cases, `git filter-branch` is used to distill just
+# the commits that touch files_subtree/. To give it a final pre-rebase touch,
+# an empty commit is added on top. The pre-rebase commit history looks like
+# this:
+#
+# Add subproject master - master4 - files_subtree/master5 - Empty commit
+#
+# where the root commit adds three files: master1.t, master2.t and master3.t.
+#
+# This commit history is then rebased onto `master3` with the
+# `-Xsubtree=files_subtree` option in three different ways:
+#
+# 1. using `--preserve-merges`
+# 2. using `--preserve-merges` and --keep-empty
+# 3. without specifying a rebase backend
+
 test_expect_success 'setup' '
 	test_commit README &&
-	mkdir files &&
-	(
-		cd files &&
-		git init &&
-		test_commit master1 &&
-		test_commit master2 &&
-		test_commit master3
-	) &&
-	git fetch files master &&
-	git branch files-master FETCH_HEAD &&
-	git read-tree --prefix=files_subtree files-master &&
-	git checkout -- files_subtree &&
-	tree=$(git write-tree) &&
-	head=$(git rev-parse HEAD) &&
-	rev=$(git rev-parse --verify files-master^0) &&
-	commit=$(git commit-tree -p $head -p $rev -m "Add subproject master" $tree) &&
-	git update-ref HEAD $commit &&
-	(
-		cd files_subtree &&
-		test_commit master4
-	) &&
-	test_commit files_subtree/master5
-'
 
-# FAILURE: Does not preserve master4.
-test_expect_failure REBASE_P \
-	'Rebase -Xsubtree --preserve-merges --onto commit 4' '
-	reset_rebase &&
-	git checkout -b rebase-preserve-merges-4 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master4"
+	git init files &&
+	test_commit -C files master1 &&
+	test_commit -C files master2 &&
+	test_commit -C files master3 &&
+
+	: perform subtree merge into files_subtree/ &&
+	git fetch files refs/heads/master:refs/heads/files-master &&
+	git merge -s ours --no-commit --allow-unrelated-histories \
+		files-master &&
+	git read-tree --prefix=files_subtree -u files-master &&
+	git commit -m "Add subproject master" &&
+
+	: add two extra commits to rebase &&
+	test_commit -C files_subtree master4 &&
+	test_commit files_subtree/master5 &&
+
+	git checkout -b to-rebase &&
+	git fast-export --no-data HEAD -- files_subtree/ |
+		sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" |
+		git fast-import --force --quiet &&
+	git reset --hard &&
+	git commit -m "Empty commit" --allow-empty
 '
 
-# FAILURE: Does not preserve master5.
-test_expect_failure REBASE_P \
-	'Rebase -Xsubtree --preserve-merges --onto commit 5' '
+# FAILURE: Does not preserve master4.
+test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
 	reset_rebase &&
-	git checkout -b rebase-preserve-merges-5 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
+	git checkout -b rebase-preserve-merges to-rebase &&
 	git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
+	verbose test "$(commit_message HEAD~)" = "master4" &&
 	verbose test "$(commit_message HEAD)" = "files_subtree/master5"
 '
 
 # FAILURE: Does not preserve master4.
-test_expect_failure REBASE_P \
-	'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' '
-	reset_rebase &&
-	git checkout -b rebase-keep-empty-4 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
-	verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
-'
-
-# FAILURE: Does not preserve master5.
-test_expect_failure REBASE_P \
-	'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' '
-	reset_rebase &&
-	git checkout -b rebase-keep-empty-5 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
-'
-
-# FAILURE: Does not preserve Empty.
-test_expect_failure REBASE_P \
-	'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' '
+test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
 	reset_rebase &&
-	git checkout -b rebase-keep-empty-empty master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
+	git checkout -b rebase-keep-empty to-rebase &&
 	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
+	verbose test "$(commit_message HEAD~2)" = "master4" &&
+	verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
 	verbose test "$(commit_message HEAD)" = "Empty commit"
 '
 
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto commit 4' '
+test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
 	reset_rebase &&
-	git checkout -b rebase-onto-4 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --onto files-master master &&
-	verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
+	git checkout -b rebase-onto to-rebase &&
+	test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master &&
+	: first pick results in no changes &&
+	git rebase --skip &&
+	verbose test "$(commit_message HEAD~2)" = "master4" &&
+	verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+	verbose test "$(commit_message HEAD)" = "Empty commit"
 '
 
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto commit 5' '
-	reset_rebase &&
-	git checkout -b rebase-onto-5 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --onto files-master master &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
-'
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto empty commit' '
+test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' '
 	reset_rebase &&
-	git checkout -b rebase-onto-empty master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --onto files-master master &&
+	git checkout -b rebase-merges-onto to-rebase &&
+	test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root &&
+	: first pick results in no changes &&
+	git rebase --skip &&
+	verbose test "$(commit_message HEAD~2)" = "master4" &&
+	verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
 	verbose test "$(commit_message HEAD)" = "Empty commit"
 '
 
diff --git a/third_party/git/t/t3429-rebase-edit-todo.sh b/third_party/git/t/t3429-rebase-edit-todo.sh
index 76f6d306eaf3..7024d49ae7b9 100755
--- a/third_party/git/t/t3429-rebase-edit-todo.sh
+++ b/third_party/git/t/t3429-rebase-edit-todo.sh
@@ -3,15 +3,21 @@
 test_description='rebase should reread the todo file if an exec modifies it'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
+test_expect_success 'setup' '
+	test_commit first file &&
+	test_commit second file &&
+	test_commit third file
+'
 
 test_expect_success 'rebase exec modifies rebase-todo' '
-	test_commit initial &&
 	todo=.git/rebase-merge/git-rebase-todo &&
 	git rebase HEAD -x "echo exec touch F >>$todo" &&
 	test -e F
 '
 
-test_expect_success SHA1 'loose object cache vs re-reading todo list' '
+test_expect_success 'loose object cache vs re-reading todo list' '
 	GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
 	export GIT_REBASE_TODO &&
 	write_script append-todo.sh <<-\EOS &&
@@ -33,4 +39,47 @@ test_expect_success SHA1 'loose object cache vs re-reading todo list' '
 	git rebase HEAD -x "./append-todo.sh 5 6"
 '
 
+test_expect_success 'todo is re-read after reword and squash' '
+	write_script reword-editor.sh <<-\EOS &&
+	GIT_SEQUENCE_EDITOR="echo \"exec echo $(cat file) >>actual\" >>" \
+		git rebase --edit-todo
+	EOS
+
+	test_write_lines first third >expected &&
+	set_fake_editor &&
+	GIT_SEQUENCE_EDITOR="$EDITOR" FAKE_LINES="reword 1 squash 2 fixup 3" \
+		GIT_EDITOR=./reword-editor.sh git rebase -i --root third &&
+	test_cmp expected actual
+'
+
+test_expect_success 're-reading todo doesnt interfere with revert --edit' '
+	git reset --hard third &&
+
+	git revert --edit third second &&
+
+	cat >expect <<-\EOF &&
+	Revert "second"
+	Revert "third"
+	third
+	second
+	first
+	EOF
+	git log --format="%s" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 're-reading todo doesnt interfere with cherry-pick --edit' '
+	git reset --hard first &&
+
+	git cherry-pick --edit second third &&
+
+	cat >expect <<-\EOF &&
+	third
+	second
+	first
+	EOF
+	git log --format="%s" >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/third_party/git/t/t3430-rebase-merges.sh b/third_party/git/t/t3430-rebase-merges.sh
index 7b6c4847ad6b..a1bc3e20016b 100755
--- a/third_party/git/t/t3430-rebase-merges.sh
+++ b/third_party/git/t/t3430-rebase-merges.sh
@@ -20,12 +20,11 @@ Initial setup:
 '
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
+. "$TEST_DIRECTORY"/lib-log-graph.sh
 
 test_cmp_graph () {
 	cat >expect &&
-	git log --graph --boundary --format=%s "$@" >output &&
-	sed "s/ *$//" <output >output.trimmed &&
-	test_cmp expect output.trimmed
+	lib_test_cmp_graph --boundary --format=%s "$@"
 }
 
 test_expect_success 'setup' '
@@ -37,20 +36,27 @@ test_expect_success 'setup' '
 	test_commit A &&
 	git checkout -b first &&
 	test_commit B &&
+	b=$(git rev-parse --short HEAD) &&
 	git checkout master &&
 	test_commit C &&
+	c=$(git rev-parse --short HEAD) &&
 	test_commit D &&
+	d=$(git rev-parse --short HEAD) &&
 	git merge --no-commit B &&
 	test_tick &&
 	git commit -m E &&
 	git tag -m E E &&
+	e=$(git rev-parse --short HEAD) &&
 	git checkout -b second C &&
 	test_commit F &&
+	f=$(git rev-parse --short HEAD) &&
 	test_commit G &&
+	g=$(git rev-parse --short HEAD) &&
 	git checkout master &&
 	git merge --no-commit G &&
 	test_tick &&
 	git commit -m H &&
+	h=$(git rev-parse --short HEAD) &&
 	git tag -m H H &&
 	git checkout A &&
 	test_commit conflicting-G G.t
@@ -93,24 +99,24 @@ test_expect_success 'create completely different structure' '
 '
 
 test_expect_success 'generate correct todo list' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	label onto
 
 	reset onto
-	pick d9df450 B
+	pick $b B
 	label E
 
 	reset onto
-	pick 5dee784 C
+	pick $c C
 	label branch-point
-	pick ca2c861 F
-	pick 088b00a G
+	pick $f F
+	pick $g G
 	label H
 
 	reset branch-point # C
-	pick 12bd07b D
-	merge -C 2051b56 E # E
-	merge -C 233d48a H # H
+	pick $d D
+	merge -C $e E # E
+	merge -C $h H # H
 
 	EOF
 
@@ -151,7 +157,6 @@ test_expect_success 'failed `merge -C` writes patch (may be rescheduled, too)' '
 	test_path_is_file .git/rebase-merge/patch
 '
 
-SQ="'"
 test_expect_success 'failed `merge <branch>` does not crash' '
 	test_when_finished "test_might_fail git rebase --abort" &&
 	git checkout conflicting-G &&
@@ -340,7 +345,7 @@ test_expect_success 'A root commit can be a cousin, treat it that way' '
 	git merge --allow-unrelated-histories khnum &&
 	test_tick &&
 	git rebase -f -r HEAD^ &&
-	! test_cmp_rev HEAD^2 khnum &&
+	test_cmp_rev ! HEAD^2 khnum &&
 	test_cmp_graph HEAD^.. <<-\EOF &&
 	*   Merge branch '\''khnum'\'' into asherah
 	|\
@@ -402,7 +407,7 @@ test_expect_success 'octopus merges' '
 	| | * three
 	| * | two
 	| |/
-	* | one
+	* / one
 	|/
 	o before-octopus
 	EOF
@@ -441,4 +446,52 @@ test_expect_success '--continue after resolving conflicts after a merge' '
 	test_path_is_missing .git/MERGE_HEAD
 '
 
+test_expect_success '--rebase-merges with strategies' '
+	git checkout -b with-a-strategy F &&
+	test_tick &&
+	git merge -m "Merge conflicting-G" conflicting-G &&
+
+	: first, test with a merge strategy option &&
+	git rebase -ir -Xtheirs G &&
+	echo conflicting-G >expect &&
+	test_cmp expect G.t &&
+
+	: now, try with a merge strategy other than recursive &&
+	git reset --hard @{1} &&
+	write_script git-merge-override <<-\EOF &&
+	echo overridden$1 >>G.t
+	git add G.t
+	EOF
+	PATH="$PWD:$PATH" git rebase -ir -s override -Xxopt G &&
+	test_write_lines G overridden--xopt >expect &&
+	test_cmp expect G.t
+'
+
+test_expect_success '--rebase-merges with commit that can generate bad characters for filename' '
+	git checkout -b colon-in-label E &&
+	git merge -m "colon: this should work" G &&
+	git rebase --rebase-merges --force-rebase E
+'
+
+test_expect_success '--rebase-merges with message matched with onto label' '
+	git checkout -b onto-label E &&
+	git merge -m onto G &&
+	git rebase --rebase-merges --force-rebase E &&
+	test_cmp_graph <<-\EOF
+	*   onto
+	|\
+	| * G
+	| * F
+	* |   E
+	|\ \
+	| * | B
+	* | | D
+	| |/
+	|/|
+	* | C
+	|/
+	* A
+	EOF
+'
+
 test_done
diff --git a/third_party/git/t/t3431-rebase-fork-point.sh b/third_party/git/t/t3431-rebase-fork-point.sh
new file mode 100755
index 000000000000..78851b9a2ae8
--- /dev/null
+++ b/third_party/git/t/t3431-rebase-fork-point.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Denton Liu
+#
+
+test_description='git rebase --fork-point test'
+
+. ./test-lib.sh
+
+# A---B---D---E    (master)
+#      \
+#       C*---F---G (side)
+#
+# C was formerly part of master but master was rewound to remove C
+#
+test_expect_success setup '
+	test_commit A &&
+	test_commit B &&
+	test_commit C &&
+	git branch -t side &&
+	git reset --hard HEAD^ &&
+	test_commit D &&
+	test_commit E &&
+	git checkout side &&
+	test_commit F &&
+	test_commit G
+'
+
+test_rebase () {
+	expected="$1" &&
+	shift &&
+	test_expect_success "git rebase $*" "
+		git checkout master &&
+		git reset --hard E &&
+		git checkout side &&
+		git reset --hard G &&
+		git rebase $* &&
+		test_write_lines $expected >expect &&
+		git log --pretty=%s >actual &&
+		test_cmp expect actual
+	"
+}
+
+test_rebase 'G F E D B A'
+test_rebase 'G F D B A' --onto D
+test_rebase 'G F B A' --keep-base
+test_rebase 'G F C E D B A' --no-fork-point
+test_rebase 'G F C D B A' --no-fork-point --onto D
+test_rebase 'G F C B A' --no-fork-point --keep-base
+test_rebase 'G F E D B A' --fork-point refs/heads/master
+test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
+test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
+test_rebase 'G F C E D B A' refs/heads/master
+test_rebase 'G F C D B A' --onto D refs/heads/master
+test_rebase 'G F C B A' --keep-base refs/heads/master
+
+test_done
diff --git a/third_party/git/t/t3432-rebase-fast-forward.sh b/third_party/git/t/t3432-rebase-fast-forward.sh
new file mode 100755
index 000000000000..6c9d4a137581
--- /dev/null
+++ b/third_party/git/t/t3432-rebase-fast-forward.sh
@@ -0,0 +1,123 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Denton Liu
+#
+
+test_description='ensure rebase fast-forwards commits when possible'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+	test_commit A &&
+	test_commit B &&
+	test_commit C &&
+	test_commit D &&
+	git checkout -t -b side
+'
+
+test_rebase_same_head () {
+	status_n="$1" &&
+	shift &&
+	what_n="$1" &&
+	shift &&
+	cmp_n="$1" &&
+	shift &&
+	status_f="$1" &&
+	shift &&
+	what_f="$1" &&
+	shift &&
+	cmp_f="$1" &&
+	shift &&
+	test_rebase_same_head_ $status_n $what_n $cmp_n " --apply" "$*" &&
+	test_rebase_same_head_ $status_f $what_f $cmp_f " --apply --no-ff" "$*"
+	test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" &&
+	test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*"
+}
+
+test_rebase_same_head_ () {
+	status="$1" &&
+	shift &&
+	what="$1" &&
+	shift &&
+	cmp="$1" &&
+	shift &&
+	flag="$1"
+	shift &&
+	test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" "
+		oldhead=\$(git rev-parse HEAD) &&
+		test_when_finished 'git reset --hard \$oldhead' &&
+		cp .git/logs/HEAD expect &&
+		git rebase$flag $* >stdout &&
+		if test $what = work
+		then
+			old=\$(wc -l <expect) &&
+			test_line_count '-gt' \$old .git/logs/HEAD
+		elif test $what = noop
+		then
+			test_cmp expect .git/logs/HEAD
+		fi &&
+		newhead=\$(git rev-parse HEAD) &&
+		if test $cmp = same
+		then
+			test_cmp_rev \$oldhead \$newhead
+		elif test $cmp = diff
+		then
+			test_cmp_rev ! \$oldhead \$newhead
+		fi
+	"
+}
+
+changes='no changes'
+test_rebase_same_head success noop same success work same
+test_rebase_same_head success noop same success work same master
+test_rebase_same_head success noop same success work diff --onto B B
+test_rebase_same_head success noop same success work diff --onto B... B
+test_rebase_same_head success noop same success work same --onto master... master
+test_rebase_same_head success noop same success work same --keep-base master
+test_rebase_same_head success noop same success work same --keep-base
+test_rebase_same_head success noop same success work same --no-fork-point
+test_rebase_same_head success noop same success work same --keep-base --no-fork-point
+test_rebase_same_head success noop same success work same --fork-point master
+test_rebase_same_head success noop same success work diff --fork-point --onto B B
+test_rebase_same_head success noop same success work diff --fork-point --onto B... B
+test_rebase_same_head success noop same success work same --fork-point --onto master... master
+test_rebase_same_head success noop same success work same --keep-base --keep-base master
+
+test_expect_success 'add work same to side' '
+	test_commit E
+'
+
+changes='our changes'
+test_rebase_same_head success noop same success work same
+test_rebase_same_head success noop same success work same master
+test_rebase_same_head success noop same success work diff --onto B B
+test_rebase_same_head success noop same success work diff --onto B... B
+test_rebase_same_head success noop same success work same --onto master... master
+test_rebase_same_head success noop same success work same --keep-base master
+test_rebase_same_head success noop same success work same --keep-base
+test_rebase_same_head success noop same success work same --no-fork-point
+test_rebase_same_head success noop same success work same --keep-base --no-fork-point
+test_rebase_same_head success noop same success work same --fork-point master
+test_rebase_same_head success noop same success work diff --fork-point --onto B B
+test_rebase_same_head success noop same success work diff --fork-point --onto B... B
+test_rebase_same_head success noop same success work same --fork-point --onto master... master
+test_rebase_same_head success noop same success work same --fork-point --keep-base master
+
+test_expect_success 'add work same to upstream' '
+	git checkout master &&
+	test_commit F &&
+	git checkout side
+'
+
+changes='our and their changes'
+test_rebase_same_head success noop same success work diff --onto B B
+test_rebase_same_head success noop same success work diff --onto B... B
+test_rebase_same_head success noop same success work diff --onto master... master
+test_rebase_same_head success noop same success work diff --keep-base master
+test_rebase_same_head success noop same success work diff --keep-base
+test_rebase_same_head failure work same success work diff --fork-point --onto B B
+test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+test_rebase_same_head success noop same success work diff --fork-point --onto master... master
+test_rebase_same_head success noop same success work diff --fork-point --keep-base master
+
+test_done
diff --git a/third_party/git/t/t3433-rebase-across-mode-change.sh b/third_party/git/t/t3433-rebase-across-mode-change.sh
new file mode 100755
index 000000000000..05df964670f4
--- /dev/null
+++ b/third_party/git/t/t3433-rebase-across-mode-change.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+test_description='git rebase across mode change'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	mkdir DS &&
+	>DS/whatever &&
+	git add DS &&
+	git commit -m base &&
+
+	git branch side1 &&
+	git branch side2 &&
+
+	git checkout side1 &&
+	git rm -rf DS &&
+	test_ln_s_add unrelated DS &&
+	git commit -m side1 &&
+
+	git checkout side2 &&
+	>unrelated &&
+	git add unrelated &&
+	git commit -m commit1 &&
+
+	echo >>unrelated &&
+	git commit -am commit2
+'
+
+test_expect_success 'rebase changes with the apply backend' '
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b apply-backend side2 &&
+	git rebase side1
+'
+
+test_expect_success 'rebase changes with the merge backend' '
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b merge-backend side2 &&
+	git rebase -m side1
+'
+
+test_expect_success 'rebase changes with the merge backend with a delay' '
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b merge-delay-backend side2 &&
+	git rebase -m --exec "sleep 1" side1
+'
+
+test_done
diff --git a/third_party/git/t/t3434-rebase-i18n.sh b/third_party/git/t/t3434-rebase-i18n.sh
new file mode 100755
index 000000000000..c7c835cde9b2
--- /dev/null
+++ b/third_party/git/t/t3434-rebase-i18n.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Doan Tran Cong Danh
+#
+
+test_description='rebase with changing encoding
+
+Initial setup:
+
+1 - 2              master
+ \
+  3 - 4            first
+   \
+    5 - 6          second
+'
+
+. ./test-lib.sh
+
+compare_msg () {
+	iconv -f "$2" -t "$3" "$TEST_DIRECTORY/t3434/$1" >expect &&
+	git cat-file commit HEAD >raw &&
+	sed "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success setup '
+	test_commit one &&
+	git branch first &&
+	test_commit two &&
+	git switch first &&
+	test_commit three &&
+	git branch second &&
+	test_commit four &&
+	git switch second &&
+	test_commit five &&
+	test_commit six
+'
+
+test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' '
+	git switch -c merge-eucJP-UTF-8 first &&
+	git config i18n.commitencoding eucJP &&
+	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
+	git config i18n.commitencoding UTF-8 &&
+	git rebase --rebase-merges master &&
+	compare_msg eucJP.txt eucJP UTF-8
+'
+
+test_expect_success 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' '
+	git switch -c merge-eucJP-ISO-2022-JP first &&
+	git config i18n.commitencoding eucJP &&
+	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
+	git config i18n.commitencoding ISO-2022-JP &&
+	git rebase --rebase-merges master &&
+	compare_msg eucJP.txt eucJP ISO-2022-JP
+'
+
+test_rebase_continue_update_encode () {
+	old=$1
+	new=$2
+	msgfile=$3
+	test_expect_success "rebase --continue update from $old to $new" '
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m master &&
+		test -f .git/rebase-merge/message &&
+		git stripspace <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	'
+}
+
+test_rebase_continue_update_encode ISO-8859-1 UTF-8 ISO8859-1.txt
+test_rebase_continue_update_encode eucJP UTF-8 eucJP.txt
+test_rebase_continue_update_encode eucJP ISO-2022-JP eucJP.txt
+
+test_done
diff --git a/third_party/git/t/t3434/ISO8859-1.txt b/third_party/git/t/t3434/ISO8859-1.txt
new file mode 100644
index 000000000000..7cbef0ee6f43
--- /dev/null
+++ b/third_party/git/t/t3434/ISO8859-1.txt
@@ -0,0 +1,3 @@
+ฤหัฯึ
+
+มb็d่fg
diff --git a/third_party/git/t/t3434/eucJP.txt b/third_party/git/t/t3434/eucJP.txt
new file mode 100644
index 000000000000..546f2aac01b6
--- /dev/null
+++ b/third_party/git/t/t3434/eucJP.txt
@@ -0,0 +1,4 @@
+คฯค์คาคคี
+
+คทคฦคคค๋คฮคฌกขคคค๋คฮควกฃ
+฿ภษอคค์คืค๊คค์คคำคฐค๊คํคุกฃ
diff --git a/third_party/git/t/t3501-revert-cherry-pick.sh b/third_party/git/t/t3501-revert-cherry-pick.sh
index d1c68af8c50e..7c1da21df149 100755
--- a/third_party/git/t/t3501-revert-cherry-pick.sh
+++ b/third_party/git/t/t3501-revert-cherry-pick.sh
@@ -106,7 +106,7 @@ test_expect_success 'cherry-pick on unborn branch' '
 	rm -rf * &&
 	git cherry-pick initial &&
 	git diff --quiet initial &&
-	! test_cmp_rev initial HEAD
+	test_cmp_rev ! initial HEAD
 '
 
 test_expect_success 'cherry-pick "-" to pick from previous branch' '
@@ -150,7 +150,7 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
 	test_tick &&
 	git commit -m renamed &&
 	echo modified >renamed &&
-	git cherry-pick refs/heads/unrelated >out &&
+	git cherry-pick refs/heads/unrelated &&
 	test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
 	grep -q "^modified$" renamed
 '
diff --git a/third_party/git/t/t3504-cherry-pick-rerere.sh b/third_party/git/t/t3504-cherry-pick-rerere.sh
index a267b2d144df..80a0d0870653 100755
--- a/third_party/git/t/t3504-cherry-pick-rerere.sh
+++ b/third_party/git/t/t3504-cherry-pick-rerere.sh
@@ -94,8 +94,10 @@ test_expect_success 'cherry-pick --rerere-autoupdate more than once' '
 
 test_expect_success 'cherry-pick conflict without rerere' '
 	test_config rerere.enabled false &&
-	test_must_fail git cherry-pick master &&
-	test_must_fail test_cmp expect foo
+	test_must_fail git cherry-pick foo-master &&
+	grep ===== foo &&
+	grep foo-dev foo &&
+	grep foo-master foo
 '
 
 test_done
diff --git a/third_party/git/t/t3506-cherry-pick-ff.sh b/third_party/git/t/t3506-cherry-pick-ff.sh
index 127dd0082ff8..9d5adbc130b1 100755
--- a/third_party/git/t/t3506-cherry-pick-ff.sh
+++ b/third_party/git/t/t3506-cherry-pick-ff.sh
@@ -16,7 +16,11 @@ test_expect_success setup '
 	git add file1 &&
 	test_tick &&
 	git commit -m "second" &&
-	git tag second
+	git tag second &&
+	test_oid_cache <<-EOF
+	cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1
+	cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d
+	EOF
 '
 
 test_expect_success 'cherry-pick using --ff fast forwards' '
@@ -102,7 +106,7 @@ test_expect_success 'cherry pick a root commit with --ff' '
 	git add file2 &&
 	git commit --amend -m "file2" &&
 	git cherry-pick --ff first &&
-	test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1"
+	test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)"
 '
 
 test_expect_success 'cherry-pick --ff on unborn branch' '
diff --git a/third_party/git/t/t3507-cherry-pick-conflict.sh b/third_party/git/t/t3507-cherry-pick-conflict.sh
index 9b9b4ca8d4f2..9bd482ce3b89 100755
--- a/third_party/git/t/t3507-cherry-pick-conflict.sh
+++ b/third_party/git/t/t3507-cherry-pick-conflict.sh
@@ -168,7 +168,7 @@ test_expect_success 'successful final commit clears cherry-pick state' '
 	echo resolved >foo &&
 	test_path_is_file .git/sequencer/todo &&
 	git commit -a &&
-	test_must_fail test_path_exists .git/sequencer
+	test_path_is_missing .git/sequencer
 '
 
 test_expect_success 'reset after final pick clears cherry-pick state' '
@@ -178,7 +178,7 @@ test_expect_success 'reset after final pick clears cherry-pick state' '
 	echo resolved >foo &&
 	test_path_is_file .git/sequencer/todo &&
 	git reset &&
-	test_must_fail test_path_exists .git/sequencer
+	test_path_is_missing .git/sequencer
 '
 
 test_expect_success 'failed cherry-pick produces dirty index' '
@@ -381,23 +381,23 @@ test_expect_success 'failed commit does not clear REVERT_HEAD' '
 '
 
 test_expect_success 'successful final commit clears revert state' '
-       pristine_detach picked-signed &&
+	pristine_detach picked-signed &&
 
-       test_must_fail git revert picked-signed base &&
-       echo resolved >foo &&
-       test_path_is_file .git/sequencer/todo &&
-       git commit -a &&
-       test_must_fail test_path_exists .git/sequencer
+	test_must_fail git revert picked-signed base &&
+	echo resolved >foo &&
+	test_path_is_file .git/sequencer/todo &&
+	git commit -a &&
+	test_path_is_missing .git/sequencer
 '
 
 test_expect_success 'reset after final pick clears revert state' '
-       pristine_detach picked-signed &&
+	pristine_detach picked-signed &&
 
-       test_must_fail git revert picked-signed base &&
-       echo resolved >foo &&
-       test_path_is_file .git/sequencer/todo &&
-       git reset &&
-       test_must_fail test_path_exists .git/sequencer
+	test_must_fail git revert picked-signed base &&
+	echo resolved >foo &&
+	test_path_is_file .git/sequencer/todo &&
+	git reset &&
+	test_path_is_missing .git/sequencer
 '
 
 test_expect_success 'revert conflict, diff3 -m style' '
diff --git a/third_party/git/t/t3508-cherry-pick-many-commits.sh b/third_party/git/t/t3508-cherry-pick-many-commits.sh
index b457333e1865..23070a7b73ca 100755
--- a/third_party/git/t/t3508-cherry-pick-many-commits.sh
+++ b/third_party/git/t/t3508-cherry-pick-many-commits.sh
@@ -5,7 +5,7 @@ test_description='test cherry-picking many commits'
 . ./test-lib.sh
 
 check_head_differs_from() {
-	! test_cmp_rev HEAD "$1"
+	test_cmp_rev ! HEAD "$1"
 }
 
 check_head_equals() {
diff --git a/third_party/git/t/t3600-rm.sh b/third_party/git/t/t3600-rm.sh
index 66282a720ee8..f2c0168941ad 100755
--- a/third_party/git/t/t3600-rm.sh
+++ b/third_party/git/t/t3600-rm.sh
@@ -113,9 +113,10 @@ test_expect_success '"rm" command printed' '
 	echo frotz >test-file &&
 	git add test-file &&
 	git commit -m "add file for rm test" &&
-	git rm test-file >rm-output &&
-	test $(grep "^rm " rm-output | wc -l) = 1 &&
-	rm -f test-file rm-output &&
+	git rm test-file >rm-output.raw &&
+	grep "^rm " rm-output.raw >rm-output &&
+	test_line_count = 1 rm-output &&
+	rm -f test-file rm-output.raw rm-output &&
 	git commit -m "remove file from rm test"
 '
 
@@ -240,14 +241,17 @@ test_expect_success 'refresh index before checking if it is up-to-date' '
 '
 
 test_expect_success 'choking "git rm" should not let it die with cruft' '
+	test_oid_init &&
 	git reset -q --hard &&
 	test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
 	i=0 &&
+	hash=$(test_oid deadbeef) &&
 	while test $i -lt 12000
 	do
-		echo "100644 1234567890123456789012345678901234567890 0	some-file-$i"
+		echo "100644 $hash 0	some-file-$i"
 		i=$(( $i + 1 ))
 	done | git update-index --index-info &&
+	# git command is intentionally placed upstream of pipe to induce SIGPIPE
 	git rm -n "some-file-*" | : &&
 	test_path_is_missing .git/index.lock
 '
@@ -301,7 +305,8 @@ EOF
 
 test_expect_success 'rm removes empty submodules from work tree' '
 	mkdir submod &&
-	git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod &&
+	hash=$(git rev-parse HEAD) &&
+	git update-index --add --cacheinfo 160000 "$hash" submod &&
 	git config -f .gitmodules submodule.sub.url ./. &&
 	git config -f .gitmodules submodule.sub.path submod &&
 	git submodule init &&
@@ -420,6 +425,13 @@ test_expect_success 'rm will error out on a modified .gitmodules file unless sta
 	git status -s -uno >actual &&
 	test_cmp expect actual
 '
+test_expect_success 'rm will not error out on .gitmodules file with zero stat data' '
+	git reset --hard &&
+	git submodule update &&
+	git read-tree HEAD &&
+	git rm submod &&
+	test_path_is_missing submod
+'
 
 test_expect_success 'rm issues a warning when section is not found in .gitmodules' '
 	git reset --hard &&
@@ -620,7 +632,8 @@ test_expect_success 'setup subsubmodule' '
 	git submodule update &&
 	(
 		cd submod &&
-		git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
+		hash=$(git rev-parse HEAD) &&
+		git update-index --add --cacheinfo 160000 "$hash" subsubmod &&
 		git config -f .gitmodules submodule.sub.url ../. &&
 		git config -f .gitmodules submodule.sub.path subsubmod &&
 		git submodule init &&
diff --git a/third_party/git/t/t3601-rm-pathspec-file.sh b/third_party/git/t/t3601-rm-pathspec-file.sh
new file mode 100755
index 000000000000..7de21f8bcff1
--- /dev/null
+++ b/third_party/git/t/t3601-rm-pathspec-file.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+test_description='rm --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files" &&
+
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success 'simplest' '
+	restore_checkpoint &&
+
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	EOF
+
+	echo fileA.t | git rm --pathspec-from-file=- &&
+	verify_expect
+'
+
+test_expect_success '--pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	D  fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
+	verify_expect
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	cat >expect <<-\EOF &&
+	D  fileB.t
+	D  fileC.t
+	EOF
+
+	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+
+	test_must_fail git rm --pathspec-from-file=list -- fileA.t 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+
+	test_must_fail git rm --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+
+	>empty_list &&
+	test_must_fail git rm --pathspec-from-file=empty_list 2>err &&
+	test_i18ngrep -e "No pathspec was given. Which files should I remove?" err
+'
+
+test_done
diff --git a/third_party/git/t/t3700-add.sh b/third_party/git/t/t3700-add.sh
index c325167b9031..88bc799807f7 100755
--- a/third_party/git/t/t3700-add.sh
+++ b/third_party/git/t/t3700-add.sh
@@ -326,7 +326,9 @@ test_expect_success 'git add --dry-run of an existing file output' "
 cat >expect.err <<\EOF
 The following paths are ignored by one of your .gitignore files:
 ignored-file
-Use -f if you really want to add them.
+hint: Use -f if you really want to add them.
+hint: Turn this message off by running
+hint: "git config advice.addIgnoredFile false"
 EOF
 cat >expect.out <<\EOF
 add 'track-this'
diff --git a/third_party/git/t/t3701-add-interactive.sh b/third_party/git/t/t3701-add-interactive.sh
index 69991a3168f3..5bae6e50f1f3 100755
--- a/third_party/git/t/t3701-add-interactive.sh
+++ b/third_party/git/t/t3701-add-interactive.sh
@@ -23,6 +23,17 @@ diff_cmp () {
 	test_cmp "$1.filtered" "$2.filtered"
 }
 
+# This function uses a trick to manipulate the interactive add to use color:
+# the `want_color()` function special-cases the situation where a pager was
+# spawned and Git now wants to output colored text: to detect that situation,
+# the environment variable `GIT_PAGER_IN_USE` is set. However, color is
+# suppressed despite that environment variable if the `TERM` variable
+# indicates a dumb terminal, so we set that variable, too.
+
+force_color () {
+	env GIT_PAGER_IN_USE=true TERM=vt100 "$@"
+}
+
 test_expect_success 'setup (initial)' '
 	echo content >file &&
 	git add file &&
@@ -57,6 +68,15 @@ test_expect_success 'revert works (initial)' '
 	! grep . output
 '
 
+test_expect_success 'add untracked (multiple)' '
+	test_when_finished "git reset && rm [1-9]" &&
+	touch $(test_seq 9) &&
+	test_write_lines a "2-5 8-" | git add -i -- [1-9] &&
+	test_write_lines 2 3 4 5 8 9 >expected &&
+	git ls-files [1-9] >output &&
+	test_cmp expected output
+'
+
 test_expect_success 'setup (commit)' '
 	echo baseline >file &&
 	git add file &&
@@ -94,7 +114,6 @@ test_expect_success 'revert works (commit)' '
 	grep "unchanged *+3/-0 file" output
 '
 
-
 test_expect_success 'setup expected' '
 	cat >expected <<-\EOF
 	EOF
@@ -263,6 +282,35 @@ test_expect_success FILEMODE 'stage mode and hunk' '
 
 # end of tests disabled when filemode is not usable
 
+test_expect_success 'different prompts for mode change/deleted' '
+	git reset --hard &&
+	>file &&
+	>deleted &&
+	git add --chmod=+x file deleted &&
+	echo changed >file &&
+	rm deleted &&
+	test_write_lines n n n |
+	git -c core.filemode=true add -p >actual &&
+	sed -n "s/^\(([0-9/]*) Stage .*?\).*/\1/p" actual >actual.filtered &&
+	cat >expect <<-\EOF &&
+	(1/1) Stage deletion [y,n,q,a,d,?]?
+	(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,?]?
+	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]?
+	EOF
+	test_cmp expect actual.filtered
+'
+
+test_expect_success 'correct message when there is nothing to do' '
+	git reset --hard &&
+	git add -p 2>err &&
+	test_i18ngrep "No changes" err &&
+	printf "\\0123" >binary &&
+	git add binary &&
+	printf "\\0abc" >binary &&
+	git add -p 2>err &&
+	test_i18ngrep "Only binary files changed" err
+'
+
 test_expect_success 'setup again' '
 	git reset --hard &&
 	test_chmod +x file &&
@@ -314,7 +362,7 @@ test_expect_success C_LOCALE_OUTPUT 'add first line works' '
 	git commit -am "clear local changes" &&
 	git apply patch &&
 	printf "%s\n" s y y | git add -p file 2>error |
-		sed -n -e "s/^Stage this hunk[^@]*\(@@ .*\)/\1/" \
+		sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \
 		       -e "/^[-+@ \\\\]"/p  >output &&
 	test_must_be_empty error &&
 	git diff --cached >diff &&
@@ -374,6 +422,36 @@ test_expect_success 'split hunk setup' '
 	test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
 '
 
+test_expect_success 'goto hunk' '
+	test_when_finished "git reset" &&
+	tr _ " " >expect <<-EOF &&
+	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? + 1:  -1,2 +1,3          +15
+	_ 2:  -2,4 +3,8          +21
+	go to which hunk? @@ -1,2 +1,3 @@
+	_10
+	+15
+	_20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_
+	EOF
+	test_write_lines s y g 1 | git add -p >actual &&
+	tail -n 7 <actual >actual.trimmed &&
+	test_cmp expect actual.trimmed
+'
+
+test_expect_success 'navigate to hunk via regex' '
+	test_when_finished "git reset" &&
+	tr _ " " >expect <<-EOF &&
+	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? @@ -1,2 +1,3 @@
+	_10
+	+15
+	_20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_
+	EOF
+	test_write_lines s y /1,2 | git add -p >actual &&
+	tail -n 5 <actual >actual.trimmed &&
+	test_cmp expect actual.trimmed
+'
+
 test_expect_success 'split hunk "add -p (edit)"' '
 	# Split, say Edit and do nothing.  Then:
 	#
@@ -403,6 +481,40 @@ test_expect_failure 'split hunk "add -p (no, yes, edit)"' '
 	! grep "^+31" actual
 '
 
+test_expect_success 'split hunk with incomplete line at end' '
+	git reset --hard &&
+	printf "missing LF" >>test &&
+	git add test &&
+	test_write_lines before 10 20 30 40 50 60 70 >test &&
+	git grep --cached missing &&
+	test_write_lines s n y q | git add -p &&
+	test_must_fail git grep --cached missing &&
+	git grep before &&
+	test_must_fail git grep --cached before
+'
+
+test_expect_failure 'edit, adding lines to the first hunk' '
+	test_write_lines 10 11 20 30 40 50 51 60 >test &&
+	git reset &&
+	tr _ " " >patch <<-EOF &&
+	@@ -1,5 +1,6 @@
+	_10
+	+11
+	+12
+	_20
+	+21
+	+22
+	_30
+	EOF
+	# test sequence is s(plit), e(dit), n(o)
+	# q n q q is there to make sure we exit at the end.
+	printf "%s\n" s e n   q n q q |
+	EDITOR=./fake_editor.sh git add -p 2>error &&
+	test_must_be_empty error &&
+	git diff --cached >actual &&
+	grep "^+22" actual
+'
+
 test_expect_success 'patch mode ignores unmerged entries' '
 	git reset --hard &&
 	test_commit conflict &&
@@ -429,35 +541,61 @@ test_expect_success 'patch mode ignores unmerged entries' '
 	diff_cmp expected diff
 '
 
-test_expect_success TTY 'diffs can be colorized' '
+test_expect_success 'diffs can be colorized' '
 	git reset --hard &&
 
 	echo content >test &&
-	printf y | test_terminal git add -p >output 2>&1 &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
 
 	# We do not want to depend on the exact coloring scheme
 	# git uses for diffs, so just check that we saw some kind of color.
 	grep "$(printf "\\033")" output
 '
 
-test_expect_success TTY 'diffFilter filters diff' '
+test_expect_success 'colorized diffs respect diff.wsErrorHighlight' '
+	git reset --hard &&
+
+	echo "old " >test &&
+	git add test &&
+	echo "new " >test &&
+
+	printf y >y &&
+	force_color git -c diff.wsErrorHighlight=all add -p >output.raw 2>&1 <y &&
+	test_decode_color <output.raw >output &&
+	grep "old<" output
+'
+
+test_expect_success 'diffFilter filters diff' '
 	git reset --hard &&
 
 	echo content >test &&
 	test_config interactive.diffFilter "sed s/^/foo:/" &&
-	printf y | test_terminal git add -p >output 2>&1 &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
 
 	# avoid depending on the exact coloring or content of the prompts,
 	# and just make sure we saw our diff prefixed
 	grep foo:.*content output
 '
 
-test_expect_success TTY 'detect bogus diffFilter output' '
+test_expect_success 'detect bogus diffFilter output' '
 	git reset --hard &&
 
 	echo content >test &&
-	test_config interactive.diffFilter "echo too-short" &&
-	printf y | test_must_fail test_terminal git add -p
+	test_config interactive.diffFilter "sed 1d" &&
+	printf y >y &&
+	test_must_fail force_color git add -p <y
+'
+
+test_expect_success 'diff.algorithm is passed to `git diff-files`' '
+	git reset --hard &&
+
+	>file &&
+	git add file &&
+	echo changed >file &&
+	test_must_fail git -c diff.algorithm=bogus add -p 2>err &&
+	test_i18ngrep "error: option diff-algorithm accepts " err
 '
 
 test_expect_success 'patch-mode via -i prompts for files' '
@@ -647,4 +785,29 @@ test_expect_success 'checkout -p works with pathological context lines' '
 	test_write_lines a b a b a a b a b a >expect &&
 	test_cmp expect a
 '
+
+test_expect_success 'show help from add--helper' '
+	git reset --hard &&
+	cat >expect <<-EOF &&
+
+	<BOLD>*** Commands ***<RESET>
+	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
+	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
+	<BOLD;BLUE>What now<RESET>> <BOLD;RED>status        - show paths with changes<RESET>
+	<BOLD;RED>update        - add working tree state to the staged set of changes<RESET>
+	<BOLD;RED>revert        - revert staged set of changes back to the HEAD version<RESET>
+	<BOLD;RED>patch         - pick hunks and update selectively<RESET>
+	<BOLD;RED>diff          - view diff between HEAD and index<RESET>
+	<BOLD;RED>add untracked - add contents of untracked files to the staged set of changes<RESET>
+	<BOLD>*** Commands ***<RESET>
+	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
+	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
+	<BOLD;BLUE>What now<RESET>>$SP
+	Bye.
+	EOF
+	test_write_lines h | force_color git add -i >actual.colored &&
+	test_decode_color <actual.colored >actual &&
+	test_i18ncmp expect actual
+'
+
 test_done
diff --git a/third_party/git/t/t3704-add-pathspec-file.sh b/third_party/git/t/t3704-add-pathspec-file.sh
new file mode 100755
index 000000000000..9e35c1fbca68
--- /dev/null
+++ b/third_party/git/t/t3704-add-pathspec-file.sh
@@ -0,0 +1,159 @@
+#!/bin/sh
+
+test_description='add --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	test_commit file0 &&
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t
+'
+
+restore_checkpoint () {
+	git reset
+}
+
+verify_expect () {
+	git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	echo fileA.t | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git add --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git add --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileB.t
+	A  fileC.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
+
+	test_must_fail git add --pathspec-from-file=list --interactive 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+
+	test_must_fail git add --pathspec-from-file=list --patch 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+
+	test_must_fail git add --pathspec-from-file=list --edit 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --edit" err &&
+
+	test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+
+	test_must_fail git add --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+
+	# This case succeeds, but still prints to stderr
+	git add --pathspec-from-file=empty_list 2>err &&
+	test_i18ngrep -e "Nothing specified, nothing added." err
+'
+
+test_done
diff --git a/third_party/git/t/t3800-mktag.sh b/third_party/git/t/t3800-mktag.sh
index 8eb47942e2d7..64dcc5ec289e 100755
--- a/third_party/git/t/t3800-mktag.sh
+++ b/third_party/git/t/t3800-mktag.sh
@@ -23,6 +23,7 @@ check_verify_failure () {
 # first create a commit, so we have a valid object/type
 # for the tag.
 test_expect_success 'setup' '
+	test_oid_init &&
 	echo Hello >A &&
 	git update-index --add A &&
 	git commit -m "Initial commit" &&
@@ -69,28 +70,28 @@ check_verify_failure '"object" line SHA1 check' '^error: char7: .*SHA1 hash$'
 #  4. type line label check
 
 cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
 xxxx tag
 tag mytag
 tagger . <> 0 +0000
 
 EOF
 
-check_verify_failure '"type" line label check' '^error: char47: .*"\\ntype "$'
+check_verify_failure '"type" line label check' '^error: char.*: .*"\\ntype "$'
 
 ############################################################
 #  5. type line eol check
 
-echo "object 779e9b33986b1c2670fff52c5067603117b3e895" >tag.sig
+echo "object $head" >tag.sig
 printf "type tagsssssssssssssssssssssssssssssss" >>tag.sig
 
-check_verify_failure '"type" line eol check' '^error: char48: .*"\\n"$'
+check_verify_failure '"type" line eol check' '^error: char.*: .*"\\n"$'
 
 ############################################################
 #  6. tag line label check #1
 
 cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
 type tag
 xxx mytag
 tagger . <> 0 +0000
@@ -98,37 +99,37 @@ tagger . <> 0 +0000
 EOF
 
 check_verify_failure '"tag" line label check #1' \
-	'^error: char57: no "tag " found$'
+	'^error: char.*: no "tag " found$'
 
 ############################################################
 #  7. tag line label check #2
 
 cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
 type taggggggggggggggggggggggggggggggg
 tag
 EOF
 
 check_verify_failure '"tag" line label check #2' \
-	'^error: char87: no "tag " found$'
+	'^error: char.*: no "tag " found$'
 
 ############################################################
 #  8. type line type-name length check
 
 cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
 type taggggggggggggggggggggggggggggggg
 tag mytag
 EOF
 
 check_verify_failure '"type" line type-name length check' \
-	'^error: char53: type too long$'
+	'^error: char.*: type too long$'
 
 ############################################################
 #  9. verify object (SHA1/type) check
 
 cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $(test_oid deadbeef)
 type tagggg
 tag mytag
 tagger . <> 0 +0000
@@ -150,7 +151,7 @@ tagger . <> 0 +0000
 EOF
 
 check_verify_failure 'verify tag-name check' \
-	'^error: char67: could not verify tag name$'
+	'^error: char.*: could not verify tag name$'
 
 ############################################################
 # 11. tagger line label check #1
@@ -164,7 +165,7 @@ This is filler
 EOF
 
 check_verify_failure '"tagger" line label check #1' \
-	'^error: char70: could not find "tagger "$'
+	'^error: char.*: could not find "tagger "$'
 
 ############################################################
 # 12. tagger line label check #2
@@ -179,7 +180,7 @@ This is filler
 EOF
 
 check_verify_failure '"tagger" line label check #2' \
-	'^error: char70: could not find "tagger "$'
+	'^error: char.*: could not find "tagger "$'
 
 ############################################################
 # 13. disallow missing tag author name
@@ -194,7 +195,7 @@ This is filler
 EOF
 
 check_verify_failure 'disallow missing tag author name' \
-	'^error: char77: missing tagger name$'
+	'^error: char.*: missing tagger name$'
 
 ############################################################
 # 14. disallow missing tag author name
@@ -209,7 +210,7 @@ tagger T A Gger <
 EOF
 
 check_verify_failure 'disallow malformed tagger' \
-	'^error: char77: malformed tagger field$'
+	'^error: char.*: malformed tagger field$'
 
 ############################################################
 # 15. allow empty tag email
@@ -238,7 +239,7 @@ tagger T A Gger <tag ger@example.com> 0 +0000
 EOF
 
 check_verify_failure 'disallow spaces in tag email' \
-	'^error: char77: malformed tagger field$'
+	'^error: char.*: malformed tagger field$'
 
 ############################################################
 # 17. disallow missing tag timestamp
@@ -252,7 +253,7 @@ tagger T A Gger <tagger@example.com>__
 EOF
 
 check_verify_failure 'disallow missing tag timestamp' \
-	'^error: char107: missing tag timestamp$'
+	'^error: char.*: missing tag timestamp$'
 
 ############################################################
 # 18. detect invalid tag timestamp1
@@ -266,7 +267,7 @@ tagger T A Gger <tagger@example.com> Tue Mar 25 15:47:44 2008
 EOF
 
 check_verify_failure 'detect invalid tag timestamp1' \
-	'^error: char107: missing tag timestamp$'
+	'^error: char.*: missing tag timestamp$'
 
 ############################################################
 # 19. detect invalid tag timestamp2
@@ -280,7 +281,7 @@ tagger T A Gger <tagger@example.com> 2008-03-31T12:20:15-0500
 EOF
 
 check_verify_failure 'detect invalid tag timestamp2' \
-	'^error: char111: malformed tag timestamp$'
+	'^error: char.*: malformed tag timestamp$'
 
 ############################################################
 # 20. detect invalid tag timezone1
@@ -294,7 +295,7 @@ tagger T A Gger <tagger@example.com> 1206478233 GMT
 EOF
 
 check_verify_failure 'detect invalid tag timezone1' \
-	'^error: char118: malformed tag timezone$'
+	'^error: char.*: malformed tag timezone$'
 
 ############################################################
 # 21. detect invalid tag timezone2
@@ -308,7 +309,7 @@ tagger T A Gger <tagger@example.com> 1206478233 +  30
 EOF
 
 check_verify_failure 'detect invalid tag timezone2' \
-	'^error: char118: malformed tag timezone$'
+	'^error: char.*: malformed tag timezone$'
 
 ############################################################
 # 22. detect invalid tag timezone3
@@ -322,7 +323,7 @@ tagger T A Gger <tagger@example.com> 1206478233 -1430
 EOF
 
 check_verify_failure 'detect invalid tag timezone3' \
-	'^error: char118: malformed tag timezone$'
+	'^error: char.*: malformed tag timezone$'
 
 ############################################################
 # 23. detect invalid header entry
@@ -337,7 +338,7 @@ this line should not be here
 EOF
 
 check_verify_failure 'detect invalid header entry' \
-	'^error: char124: trailing garbage in tag header$'
+	'^error: char.*: trailing garbage in tag header$'
 
 ############################################################
 # 24. create valid tag
diff --git a/third_party/git/t/t3900-i18n-commit.sh b/third_party/git/t/t3900-i18n-commit.sh
index b92ff9597728..d277a9f4b721 100755
--- a/third_party/git/t/t3900-i18n-commit.sh
+++ b/third_party/git/t/t3900-i18n-commit.sh
@@ -204,4 +204,41 @@ test_commit_autosquash_flags eucJP fixup
 
 test_commit_autosquash_flags ISO-2022-JP squash
 
+test_commit_autosquash_multi_encoding () {
+	flag=$1
+	old=$2
+	new=$3
+	msg=$4
+	test_expect_success "commit --$flag into $old from $new" '
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		if test $flag = squash; then
+			subject="$(head -1 expect)" &&
+			printf "\nsquash! %s\n" "$subject" >>expect
+		fi &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
+	'
+}
+
+test_commit_autosquash_multi_encoding fixup UTF-8 ISO-8859-1 1-UTF-8.txt
+test_commit_autosquash_multi_encoding squash ISO-8859-1 UTF-8 ISO8859-1.txt
+test_commit_autosquash_multi_encoding squash eucJP ISO-2022-JP eucJP.txt
+test_commit_autosquash_multi_encoding fixup ISO-2022-JP UTF-8 ISO-2022-JP.txt
+
 test_done
diff --git a/third_party/git/t/t3903-stash.sh b/third_party/git/t/t3903-stash.sh
index b8e337893f3e..3ad23e2502be 100755
--- a/third_party/git/t/t3903-stash.sh
+++ b/third_party/git/t/t3903-stash.sh
@@ -7,6 +7,18 @@ test_description='Test git stash'
 
 . ./test-lib.sh
 
+diff_cmp () {
+	for i in "$1" "$2"
+	do
+		sed -e 's/^index 0000000\.\.[0-9a-f]*/index 0000000..1234567/' \
+		-e 's/^index [0-9a-f]*\.\.[0-9a-f]*/index 1234567..89abcde/' \
+		-e 's/^index [0-9a-f]*,[0-9a-f]*\.\.[0-9a-f]*/index 1234567,7654321..89abcde/' \
+		"$i" >"$i.compare" || return 1
+	done &&
+	test_cmp "$1.compare" "$2.compare" &&
+	rm -f "$1.compare" "$2.compare"
+}
+
 test_expect_success 'stash some dirty working directory' '
 	echo 1 >file &&
 	git add file &&
@@ -36,7 +48,7 @@ EOF
 test_expect_success 'parents of stash' '
 	test $(git rev-parse stash^) = $(git rev-parse HEAD) &&
 	git diff stash^2..stash >output &&
-	test_cmp expect output
+	diff_cmp expect output
 '
 
 test_expect_success 'applying bogus stash does nothing' '
@@ -210,13 +222,13 @@ test_expect_success 'stash branch' '
 	test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
 	test $(git rev-parse HEAD) = $(git rev-parse master^) &&
 	git diff --cached >output &&
-	test_cmp expect output &&
+	diff_cmp expect output &&
 	git diff >output &&
-	test_cmp expect1 output &&
+	diff_cmp expect1 output &&
 	git add file &&
 	git commit -m alternate\ second &&
 	git diff master..stashbranch >output &&
-	test_cmp output expect2 &&
+	diff_cmp output expect2 &&
 	test 0 = $(git stash list | wc -l)
 '
 
@@ -232,8 +244,11 @@ test_expect_success 'save -q is quiet' '
 	test_must_be_empty output.out
 '
 
-test_expect_success 'pop -q is quiet' '
+test_expect_success 'pop -q works and is quiet' '
 	git stash pop -q >output.out 2>&1 &&
+	echo bar >expect &&
+	git show :file >actual &&
+	test_cmp expect actual &&
 	test_must_be_empty output.out
 '
 
@@ -242,6 +257,8 @@ test_expect_success 'pop -q --index works and is quiet' '
 	git add file &&
 	git stash save --quiet &&
 	git stash pop -q --index >output.out 2>&1 &&
+	git diff-files file2 >file2.diff &&
+	test_must_be_empty file2.diff &&
 	test foo = "$(git show :file)" &&
 	test_must_be_empty output.out
 '
@@ -268,6 +285,11 @@ test_expect_success 'stash --no-keep-index' '
 	test bar,bar2 = $(cat file),$(cat file2)
 '
 
+test_expect_success 'dont assume push with non-option args' '
+	test_must_fail git stash -q drop 2>err &&
+	test_i18ngrep -e "subcommand wasn'\''t specified; '\''push'\'' can'\''t be assumed due to unexpected token '\''drop'\''" err
+'
+
 test_expect_success 'stash --invalid-option' '
 	echo bar5 >file &&
 	echo bar6 >file2 &&
@@ -577,7 +599,7 @@ test_expect_success 'stash show -p - stashes on stack, stash-like argument' '
 	+bar
 	EOF
 	git stash show -p ${STASH_ID} >actual &&
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'stash show - no stashes on stack, stash-like argument' '
@@ -609,7 +631,7 @@ test_expect_success 'stash show -p - no stashes on stack, stash-like argument' '
 	+foo
 	EOF
 	git stash show -p ${STASH_ID} >actual &&
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'stash show --patience shows diff' '
@@ -627,7 +649,7 @@ test_expect_success 'stash show --patience shows diff' '
 	+foo
 	EOF
 	git stash show --patience ${STASH_ID} >actual &&
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'drop: fail early if specified stash is not a stash ref' '
@@ -791,7 +813,7 @@ test_expect_success 'stash where working directory contains "HEAD" file' '
 	git diff-index --cached --quiet HEAD &&
 	test "$(git rev-parse stash^)" = "$(git rev-parse HEAD)" &&
 	git diff stash^..stash >output &&
-	test_cmp expect output
+	diff_cmp expect output
 '
 
 test_expect_success 'store called with invalid commit' '
@@ -847,7 +869,7 @@ test_expect_success 'stash list implies --first-parent -m' '
 	+working
 	EOF
 	git stash list --format=%gd -p >actual &&
-	test_cmp expect actual
+	diff_cmp expect actual
 '
 
 test_expect_success 'stash list --cc shows combined diff' '
@@ -864,7 +886,7 @@ test_expect_success 'stash list --cc shows combined diff' '
 	++working
 	EOF
 	git stash list --format=%gd -p --cc >actual &&
-	test_cmp expect actual
+	diff_cmp expect actual
 '
 
 test_expect_success 'stash is not confused by partial renames' '
@@ -1241,4 +1263,31 @@ test_expect_success 'stash --keep-index with file deleted in index does not resu
 	test_path_is_missing to-remove
 '
 
+test_expect_success 'stash apply should succeed with unmodified file' '
+	echo base >file &&
+	git add file &&
+	git commit -m base &&
+
+	# now stash a modification
+	echo modified >file &&
+	git stash &&
+
+	# make the file stat dirty
+	cp file other &&
+	mv other file &&
+
+	git stash apply
+'
+
+test_expect_success 'stash handles skip-worktree entries nicely' '
+	test_commit A &&
+	echo changed >A.t &&
+	git add A.t &&
+	git update-index --skip-worktree A.t &&
+	rm A.t &&
+	git stash &&
+
+	git rev-parse --verify refs/stash:A.t
+'
+
 test_done
diff --git a/third_party/git/t/t3905-stash-include-untracked.sh b/third_party/git/t/t3905-stash-include-untracked.sh
index 29ca76f2fbea..f075c7f1f316 100755
--- a/third_party/git/t/t3905-stash-include-untracked.sh
+++ b/third_party/git/t/t3905-stash-include-untracked.sh
@@ -277,8 +277,8 @@ test_expect_success 'stash -u -- <ignored> leaves ignored file alone' '
 	test_path_is_file ignored.d/bar
 '
 
-test_expect_success 'stash -u -- <non-existant> shows no changes when there are none' '
-	git stash push -u -- non-existant >actual &&
+test_expect_success 'stash -u -- <non-existent> shows no changes when there are none' '
+	git stash push -u -- non-existent >actual &&
 	echo "No local changes to save" >expect &&
 	test_i18ncmp expect actual
 '
diff --git a/third_party/git/t/t3906-stash-submodule.sh b/third_party/git/t/t3906-stash-submodule.sh
index d7219d6f8f18..b93d1d74da7b 100755
--- a/third_party/git/t/t3906-stash-submodule.sh
+++ b/third_party/git/t/t3906-stash-submodule.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='stash apply can handle submodules'
+test_description='stash can handle submodules'
 
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
@@ -21,4 +21,44 @@ KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
 test_submodule_switch "git_stash"
 
+setup_basic () {
+	test_when_finished "rm -rf main sub" &&
+	git init sub &&
+	(
+		cd sub &&
+		test_commit sub_file
+	) &&
+	git init main &&
+	(
+		cd main &&
+		git submodule add ../sub &&
+		test_commit main_file
+	)
+}
+
+test_expect_success 'stash push with submodule.recurse=true preserves dirty submodule worktree' '
+	setup_basic &&
+	(
+		cd main &&
+		git config submodule.recurse true &&
+		echo "x" >main_file.t &&
+		echo "y" >sub/sub_file.t &&
+		git stash push &&
+		test_must_fail git -C sub diff --quiet
+	)
+'
+
+test_expect_success 'stash push and pop with submodule.recurse=true preserves dirty submodule worktree' '
+	setup_basic &&
+	(
+		cd main &&
+		git config submodule.recurse true &&
+		echo "x" >main_file.t &&
+		echo "y" >sub/sub_file.t &&
+		git stash push &&
+		git stash pop &&
+		test_must_fail git -C sub diff --quiet
+	)
+'
+
 test_done
diff --git a/third_party/git/t/t3908-stash-in-worktree.sh b/third_party/git/t/t3908-stash-in-worktree.sh
new file mode 100755
index 000000000000..2b2b366ef94b
--- /dev/null
+++ b/third_party/git/t/t3908-stash-in-worktree.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Johannes E Schindelin
+#
+
+test_description='Test git stash in a worktree'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	test_commit initial &&
+	git worktree add wt &&
+	test_commit -C wt in-worktree
+'
+
+test_expect_success 'apply in subdirectory' '
+	mkdir wt/subdir &&
+	(
+		cd wt/subdir &&
+		echo modified >../initial.t &&
+		git stash &&
+		git stash apply >out
+	) &&
+	grep "\.\.\/initial\.t" wt/subdir/out
+'
+
+test_done
diff --git a/third_party/git/t/t3909-stash-pathspec-file.sh b/third_party/git/t/t3909-stash-pathspec-file.sh
new file mode 100755
index 000000000000..55e050cfd4db
--- /dev/null
+++ b/third_party/git/t/t3909-stash-pathspec-file.sh
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+test_description='stash --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	>fileA.t &&
+	>fileB.t &&
+	>fileC.t &&
+	>fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "Files" &&
+
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git stash show --name-status >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success 'simplest' '
+	restore_checkpoint &&
+
+	# More files are written to make sure that git didnt ignore
+	# --pathspec-from-file, stashing everything
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+
+	cat >expect <<-\EOF &&
+	M	fileA.t
+	EOF
+
+	echo fileA.t | git stash push --pathspec-from-file=- &&
+	verify_expect
+'
+
+test_expect_success '--pathspec-file-nul' '
+	restore_checkpoint &&
+
+	# More files are written to make sure that git didnt ignore
+	# --pathspec-from-file, stashing everything
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+
+	cat >expect <<-\EOF &&
+	M	fileA.t
+	M	fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" | git stash push --pathspec-from-file=- --pathspec-file-nul &&
+	verify_expect
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	# More files are written to make sure that git didnt ignore
+	# --pathspec-from-file, stashing everything
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+
+	cat >expect <<-\EOF &&
+	M	fileB.t
+	M	fileC.t
+	EOF
+
+	printf "fileB.t\nfileC.t\n" | git stash push --pathspec-from-file=- &&
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo A >fileA.t &&
+	echo fileA.t >list &&
+
+	test_must_fail git stash push --pathspec-from-file=list --patch 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+
+	test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+
+	test_must_fail git stash push --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err
+'
+
+test_done
diff --git a/third_party/git/t/t4000-diff-format.sh b/third_party/git/t/t4000-diff-format.sh
index 8de36b7d1222..e5116a76a1cc 100755
--- a/third_party/git/t/t4000-diff-format.sh
+++ b/third_party/git/t/t4000-diff-format.sh
@@ -78,7 +78,7 @@ test_expect_success 'git diff-files --no-patch --patch shows the patch' '
 
 test_expect_success 'git diff-files --no-patch --patch-with-raw shows the patch and raw data' '
 	git diff-files --no-patch --patch-with-raw >actual &&
-	grep -q "^:100644 100755 .* 0000000000000000000000000000000000000000 M	path0\$" actual &&
+	grep -q "^:100644 100755 .* $ZERO_OID M	path0\$" actual &&
 	tail -n +4 actual >actual-patch &&
 	compare_diff_patch expected actual-patch
 '
diff --git a/third_party/git/t/t4002-diff-basic.sh b/third_party/git/t/t4002-diff-basic.sh
index 3a6c21e8251b..cbcdd104647b 100755
--- a/third_party/git/t/t4002-diff-basic.sh
+++ b/third_party/git/t/t4002-diff-basic.sh
@@ -7,123 +7,272 @@ test_description='Test diff raw-output.
 
 '
 . ./test-lib.sh
+
 . "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
 
-cat >.test-plain-OA <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 ccba72ad3888a3520b39efcf780b9ee64167535d A	AA
-:000000 100644 0000000000000000000000000000000000000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 A	AN
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D	DD
-:000000 040000 0000000000000000000000000000000000000000 6d50f65d3bdab91c63444294d38f08aeff328e42 A	DF
-:100644 000000 141c1f1642328e4bc46a7d801a71da392e66791e 0000000000000000000000000000000000000000 D	DM
-:100644 000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 0000000000000000000000000000000000000000 D	DN
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A	LL
-:100644 100644 03f24c8c4700babccfd28b654e7e8eac402ad6cd 103d9f89b50b9aad03054b579be5e7aa665f2d57 M	MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 M	MM
-:100644 100644 bd084b0c27c7b6cc34f11d6d0509a29be3caf970 a716d58de4a570e0038f5c307bd8db34daea021f M	MN
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M	SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 4c86f9a85fbc5e6804ee2e17a797538fbe785bca M	TT
-:040000 040000 7d670fdcdb9929f6c7dac196ff78689cd1c566a1 5e5f22072bb39f6e12cf663a57cb634c76eefb49 M	Z
+test_oid_init
+
+test_oid_cache <<\EOF
+aa_1 sha1:ccba72ad3888a3520b39efcf780b9ee64167535d
+aa_1 sha256:9febfbf18197819b2735c45291f138525d2476d59470f98239647544586ba403
+
+aa_2 sha1:6aa2b5335b16431a0ef71e5c0a28be69183cf6a2
+aa_2 sha256:6eaa3437de83f145a4aaa6ba355303075ade547b128ec6a2cd00a81ff7ce7a56
+
+an_1 sha1:7e426fb079479fd67f6d81f984e4ec649a44bc25
+an_1 sha256:8f92a0bec99e399a38e3bd0e1bf19fbf121e0160efb29b857df79d439f1c4536
+
+dd_1 sha1:bcc68ef997017466d5c9094bcf7692295f588c9a
+dd_1 sha256:07e17428b00639b85485d2b01083d219e2f3e3ba8579e9ca44e9cc8dd554d952
+
+df_1 sha1:6d50f65d3bdab91c63444294d38f08aeff328e42
+df_1 sha256:e367cecc27e9bf5451b1c65828cb21938d36a5f8e39c1b03ad6509cc36bb8e9d
+
+df_2 sha1:71420ab81e254145d26d6fc0cddee64c1acd4787
+df_2 sha256:0f0a86d10347ff6921d03a3c954679f3f1d14fa3d5cd82f57b32c09755f3a47d
+
+dfd1 sha1:68a6d8b91da11045cf4aa3a5ab9f2a781c701249
+dfd1 sha256:f3bd3265b02b6978ce86490d8ad026c573639c974b3de1d9faf30d8d5a77d3d5
+
+dm_1 sha1:141c1f1642328e4bc46a7d801a71da392e66791e
+dm_1 sha256:c89f8656e7b94e21ee5fbaf0e2149bbf783c51edbe2ce110349cac13059ee7ed
+
+dm_2 sha1:3c4d8de5fbad08572bab8e10eef8dbb264cf0231
+dm_2 sha256:83a572e37e0c94086294dae2cecc43d9131afd6f6c906e495c78972230b54988
+
+dn_1 sha1:35abde1506ddf806572ff4d407bd06885d0f8ee9
+dn_1 sha256:775d5852582070e620be63327bfa515fab8f71c7ac3e4f0c3cd6267b4377ba28
+
+ll_2 sha1:1d41122ebdd7a640f29d3c9cc4f9d70094374762
+ll_2 sha256:7917b4948a883cfed0a77d3d5a625dc8577d6ddcc3c6c3bbc56c4d4226a2246d
+
+md_1 sha1:03f24c8c4700babccfd28b654e7e8eac402ad6cd
+md_1 sha256:fc9f30369b978595ad685ba11ca9a17de0af16d79cd4b629975f4f1590033902
+
+md_2 sha1:103d9f89b50b9aad03054b579be5e7aa665f2d57
+md_2 sha256:fc78ec75275628762fe520479a6b2398dec295ce7aabcb1d15e5963c7b4e9317
+
+mm_1 sha1:b258508afb7ceb449981bd9d63d2d3e971bf8d34
+mm_1 sha256:a4b7847d228e900e3000285e240c20fd96f9dd41ce1445305f6eada126d4a04a
+
+mm_2 sha1:b431b272d829ff3aa4d1a5085f4394ab4d3305b6
+mm_2 sha256:3f8b83ea36aacf689bcf1a1290a9a8ed341564d32682ea6f76fea9a979186782
+
+mm_3 sha1:19989d4559aae417fedee240ccf2ba315ea4dc2b
+mm_3 sha256:71b3bfc5747ac033fff9ea0ab39ee453a3af2969890e75d6ef547b87544e2681
+
+mn_1 sha1:bd084b0c27c7b6cc34f11d6d0509a29be3caf970
+mn_1 sha256:47a67450583d7a329eb01a7c4ba644945af72c0ed2c7c95eb5a00d6e46d4d483
+
+mn_2 sha1:a716d58de4a570e0038f5c307bd8db34daea021f
+mn_2 sha256:f95104c1ebe27acb84bac25a7be98c71f6b8d3054b21f357a5be0c524ad97e08
+
+nm_1 sha1:c8f25781e8f1792e3e40b74225e20553041b5226
+nm_1 sha256:09baddc7afaa62e62e152c23c9c3ab94bf15a3894031e227e9be7fe68e1f4e49
+
+nm_2 sha1:cdb9a8c3da571502ac30225e9c17beccb8387983
+nm_2 sha256:58b5227956ac2d2a08d0efa513c0ae37430948b16791ea3869a1308dbf05536d
+
+na_1 sha1:15885881ea69115351c09b38371f0348a3fb8c67
+na_1 sha256:18e4fdd1670cd7968ee23d35bfd29e5418d56fb190c840094c1c57ceee0aad8f
+
+nd_1 sha1:a4e179e4291e5536a5e1c82e091052772d2c5a93
+nd_1 sha256:07dac9b01d00956ea0c65bd993d7de4864aeef2ed3cbb1255d9f1d949fcd6df6
+
+ss_1 sha1:40c959f984c8b89a2b02520d17f00d717f024397
+ss_1 sha256:50fc1b5df74d9910db2f9270993484235f15b69b75b01bcfb53e059289d14af9
+
+ss_2 sha1:2ac547ae9614a00d1b28275de608131f7a0e259f
+ss_2 sha256:a90f02e6044f1497d13db587d22ab12f90150a7d1e084afcf96065fab35ae2bc
+
+tt_1 sha1:4ac13458899ab908ef3b1128fa378daefc88d356
+tt_1 sha256:c53113c7dd5060e86b5b251428bd058f6726f66273c6a24bff1c61a04f498dd3
+
+tt_2 sha1:4c86f9a85fbc5e6804ee2e17a797538fbe785bca
+tt_2 sha256:0775f2a296129a7cf2862b46bc0e88c14d593f2773a3e3fb1c5193db6f5a7e77
+
+tt_3 sha1:c4e4a12231b9fa79a0053cb6077fcb21bb5b135a
+tt_3 sha256:47860f93cdd211f96443e0560f21c57ab6c2f4b0ac27ff03651a352e53fe8484
+
+z__1 sha1:7d670fdcdb9929f6c7dac196ff78689cd1c566a1
+z__1 sha256:44d0f37aff5e51cfcfdd1134c93a6419bcca7b9964f792ffcd5f9b4fcba1ee63
+
+z__2 sha1:5e5f22072bb39f6e12cf663a57cb634c76eefb49
+z__2 sha256:d29de162113190fed104eb5f010820cef4e315f89b9326e8497f7219fb737894
+
+z__3 sha1:1ba523955d5160681af65cb776411f574c1e8155
+z__3 sha256:07422d772b07794ab4369a5648e617719f89c2d2212cbeab05d97214b6471636
+
+zaa1 sha1:8acb8e9750e3f644bf323fcf3d338849db106c77
+zaa1 sha256:e79b029282c8abec2d9f3f7faceaf2a1405e02d1f368e66450ae66cf5b68d1f4
+
+zaa2 sha1:6c0b99286d0bce551ac4a7b3dff8b706edff3715
+zaa2 sha256:c82bd78c3e69ea1796e6b1a7a3ba45bb106c50e819296475b862123d3f5cc5a0
+
+zan1 sha1:087494262084cefee7ed484d20c8dc0580791272
+zan1 sha256:4b159eb3804d05599023dd074f771d06d02870f4ab24a7165add8ac3d703b8d3
+
+zdd1 sha1:879007efae624d2b1307214b24a956f0a8d686a8
+zdd1 sha256:eecfdd4d8092dd0363fb6d4548b54c6afc8982c3ed9b34e393f1d6a921d8eaa3
+
+zdm1 sha1:9b541b2275c06e3a7b13f28badf5294e2ae63df4
+zdm1 sha256:ab136e88e19a843c4bf7713d2090d5a2186ba16a6a80dacc12eeddd256a8e556
+
+zdm2 sha1:d77371d15817fcaa57eeec27f770c505ba974ec1
+zdm2 sha256:1c1a5f57363f46a15d95ce8527b3c2c158d88d16853b4acbf81bd20fd2c89a46
+
+zdn1 sha1:beb5d38c55283d280685ea21a0e50cfcc0ca064a
+zdn1 sha256:0f0eca66183617b0aa5ad74b256540329f841470922ca6760263c996d825eb18
+
+zmd1 sha1:d41fda41b7ec4de46b43cb7ea42a45001ae393d5
+zmd1 sha256:1ed32d481852eddf31a0ce12652a0ad14bf5b7a842667b5dbb0b50f35bf1c80a
+
+zmd2 sha1:a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9
+zmd2 sha256:b238da211b404f8917df2d9c6f7030535e904b2186131007a3c292ec6902f933
+
+zmm1 sha1:4ca22bae2527d3d9e1676498a0fba3b355bd1278
+zmm1 sha256:072b1d85b5f34fabc99dfa46008c5418df68302d3e317430006f49b32d244226
+
+zmm2 sha1:61422ba9c2c873416061a88cd40a59a35b576474
+zmm2 sha256:81dd5d2b3c5cda16fef552256aed4e2ea0802a8450a08f308a92142112ff6dda
+
+zmm3 sha1:697aad7715a1e7306ca76290a3dd4208fbaeddfa
+zmm3 sha256:8b10fab49e9be3414aa5e9a93d0e46f9569053440138a7c19a5eb5536d8e95bf
+
+zmn1 sha1:b16d7b25b869f2beb124efa53467d8a1550ad694
+zmn1 sha256:609e4f75d1295e844c826feeba213acb0b6cfc609adfe8ff705b19e3829ae3e9
+
+zmn2 sha1:a5c544c21cfcb07eb80a4d89a5b7d1570002edfd
+zmn2 sha256:d6d03edf2dc1a3b267a8205de5f41a2ff4b03def8c7ae02052b543fb09d589fc
+
+zna1 sha1:d12979c22fff69c59ca9409e7a8fe3ee25eaee80
+zna1 sha256:b37b80e789e8ea32aa323f004628f02013f632124b0282c7fe00a127d3c64c3c
+
+znd1 sha1:a18393c636b98e9bd7296b8b437ea4992b72440c
+znd1 sha256:af92a22eee8c38410a0c9d2b5135a10aeb052cbc7cf675541ed9a67bfcaf7cf9
+
+znm1 sha1:3fdbe17fd013303a2e981e1ca1c6cd6e72789087
+znm1 sha256:f75aeaa0c11e76918e381c105f0752932c6150e941fec565d24fa31098a13dc1
+
+znm2 sha1:7e09d6a3a14bd630913e8c75693cea32157b606d
+znm2 sha256:938d73cfbaa1c902a84fb5b3afd9736aa0590367fb9bd59c6c4d072ce70fcd6d
+EOF
+
+cat >.test-plain-OA <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_1) A	AA
+:000000 100644 $(test_oid zero) $(test_oid an_1) A	AN
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D	DD
+:000000 040000 $(test_oid zero) $(test_oid df_1) A	DF
+:100644 000000 $(test_oid dm_1) $(test_oid zero) D	DM
+:100644 000000 $(test_oid dn_1) $(test_oid zero) D	DN
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A	LL
+:100644 100644 $(test_oid md_1) $(test_oid md_2) M	MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_2) M	MM
+:100644 100644 $(test_oid mn_1) $(test_oid mn_2) M	MN
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M	SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_2) M	TT
+:040000 040000 $(test_oid z__1) $(test_oid z__2) M	Z
 EOF
 
-cat >.test-recursive-OA <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 ccba72ad3888a3520b39efcf780b9ee64167535d A	AA
-:000000 100644 0000000000000000000000000000000000000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 A	AN
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D	DD
-:000000 100644 0000000000000000000000000000000000000000 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 A	DF/DF
-:100644 000000 141c1f1642328e4bc46a7d801a71da392e66791e 0000000000000000000000000000000000000000 D	DM
-:100644 000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 0000000000000000000000000000000000000000 D	DN
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A	LL
-:100644 100644 03f24c8c4700babccfd28b654e7e8eac402ad6cd 103d9f89b50b9aad03054b579be5e7aa665f2d57 M	MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 M	MM
-:100644 100644 bd084b0c27c7b6cc34f11d6d0509a29be3caf970 a716d58de4a570e0038f5c307bd8db34daea021f M	MN
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M	SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 4c86f9a85fbc5e6804ee2e17a797538fbe785bca M	TT
-:000000 100644 0000000000000000000000000000000000000000 8acb8e9750e3f644bf323fcf3d338849db106c77 A	Z/AA
-:000000 100644 0000000000000000000000000000000000000000 087494262084cefee7ed484d20c8dc0580791272 A	Z/AN
-:100644 000000 879007efae624d2b1307214b24a956f0a8d686a8 0000000000000000000000000000000000000000 D	Z/DD
-:100644 000000 9b541b2275c06e3a7b13f28badf5294e2ae63df4 0000000000000000000000000000000000000000 D	Z/DM
-:100644 000000 beb5d38c55283d280685ea21a0e50cfcc0ca064a 0000000000000000000000000000000000000000 D	Z/DN
-:100644 100644 d41fda41b7ec4de46b43cb7ea42a45001ae393d5 a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 M	Z/MD
-:100644 100644 4ca22bae2527d3d9e1676498a0fba3b355bd1278 61422ba9c2c873416061a88cd40a59a35b576474 M	Z/MM
-:100644 100644 b16d7b25b869f2beb124efa53467d8a1550ad694 a5c544c21cfcb07eb80a4d89a5b7d1570002edfd M	Z/MN
+cat >.test-recursive-OA <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_1) A	AA
+:000000 100644 $(test_oid zero) $(test_oid an_1) A	AN
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D	DD
+:000000 100644 $(test_oid zero) $(test_oid dfd1) A	DF/DF
+:100644 000000 $(test_oid dm_1) $(test_oid zero) D	DM
+:100644 000000 $(test_oid dn_1) $(test_oid zero) D	DN
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A	LL
+:100644 100644 $(test_oid md_1) $(test_oid md_2) M	MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_2) M	MM
+:100644 100644 $(test_oid mn_1) $(test_oid mn_2) M	MN
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M	SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_2) M	TT
+:000000 100644 $(test_oid zero) $(test_oid zaa1) A	Z/AA
+:000000 100644 $(test_oid zero) $(test_oid zan1) A	Z/AN
+:100644 000000 $(test_oid zdd1) $(test_oid zero) D	Z/DD
+:100644 000000 $(test_oid zdm1) $(test_oid zero) D	Z/DM
+:100644 000000 $(test_oid zdn1) $(test_oid zero) D	Z/DN
+:100644 100644 $(test_oid zmd1) $(test_oid zmd2) M	Z/MD
+:100644 100644 $(test_oid zmm1) $(test_oid zmm2) M	Z/MM
+:100644 100644 $(test_oid zmn1) $(test_oid zmn2) M	Z/MN
 EOF
-cat >.test-plain-OB <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 A	AA
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D	DD
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A	DF
-:100644 100644 141c1f1642328e4bc46a7d801a71da392e66791e 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 M	DM
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A	LL
-:100644 000000 03f24c8c4700babccfd28b654e7e8eac402ad6cd 0000000000000000000000000000000000000000 D	MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 19989d4559aae417fedee240ccf2ba315ea4dc2b M	MM
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A	NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D	ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M	NM
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M	SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M	TT
-:040000 040000 7d670fdcdb9929f6c7dac196ff78689cd1c566a1 1ba523955d5160681af65cb776411f574c1e8155 M	Z
+cat >.test-plain-OB <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_2) A	AA
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D	DD
+:000000 100644 $(test_oid zero) $(test_oid df_2) A	DF
+:100644 100644 $(test_oid dm_1) $(test_oid dm_2) M	DM
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A	LL
+:100644 000000 $(test_oid md_1) $(test_oid zero) D	MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_3) M	MM
+:000000 100644 $(test_oid zero) $(test_oid na_1) A	NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D	ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M	NM
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M	SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_3) M	TT
+:040000 040000 $(test_oid z__1) $(test_oid z__3) M	Z
 EOF
-cat >.test-recursive-OB <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 A	AA
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D	DD
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A	DF
-:100644 100644 141c1f1642328e4bc46a7d801a71da392e66791e 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 M	DM
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A	LL
-:100644 000000 03f24c8c4700babccfd28b654e7e8eac402ad6cd 0000000000000000000000000000000000000000 D	MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 19989d4559aae417fedee240ccf2ba315ea4dc2b M	MM
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A	NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D	ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M	NM
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M	SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M	TT
-:000000 100644 0000000000000000000000000000000000000000 6c0b99286d0bce551ac4a7b3dff8b706edff3715 A	Z/AA
-:100644 000000 879007efae624d2b1307214b24a956f0a8d686a8 0000000000000000000000000000000000000000 D	Z/DD
-:100644 100644 9b541b2275c06e3a7b13f28badf5294e2ae63df4 d77371d15817fcaa57eeec27f770c505ba974ec1 M	Z/DM
-:100644 000000 d41fda41b7ec4de46b43cb7ea42a45001ae393d5 0000000000000000000000000000000000000000 D	Z/MD
-:100644 100644 4ca22bae2527d3d9e1676498a0fba3b355bd1278 697aad7715a1e7306ca76290a3dd4208fbaeddfa M	Z/MM
-:000000 100644 0000000000000000000000000000000000000000 d12979c22fff69c59ca9409e7a8fe3ee25eaee80 A	Z/NA
-:100644 000000 a18393c636b98e9bd7296b8b437ea4992b72440c 0000000000000000000000000000000000000000 D	Z/ND
-:100644 100644 3fdbe17fd013303a2e981e1ca1c6cd6e72789087 7e09d6a3a14bd630913e8c75693cea32157b606d M	Z/NM
+cat >.test-recursive-OB <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_2) A	AA
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D	DD
+:000000 100644 $(test_oid zero) $(test_oid df_2) A	DF
+:100644 100644 $(test_oid dm_1) $(test_oid dm_2) M	DM
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A	LL
+:100644 000000 $(test_oid md_1) $(test_oid zero) D	MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_3) M	MM
+:000000 100644 $(test_oid zero) $(test_oid na_1) A	NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D	ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M	NM
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M	SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_3) M	TT
+:000000 100644 $(test_oid zero) $(test_oid zaa2) A	Z/AA
+:100644 000000 $(test_oid zdd1) $(test_oid zero) D	Z/DD
+:100644 100644 $(test_oid zdm1) $(test_oid zdm2) M	Z/DM
+:100644 000000 $(test_oid zmd1) $(test_oid zero) D	Z/MD
+:100644 100644 $(test_oid zmm1) $(test_oid zmm3) M	Z/MM
+:000000 100644 $(test_oid zero) $(test_oid zna1) A	Z/NA
+:100644 000000 $(test_oid znd1) $(test_oid zero) D	Z/ND
+:100644 100644 $(test_oid znm1) $(test_oid znm2) M	Z/NM
 EOF
-cat >.test-plain-AB <<\EOF
-:100644 100644 ccba72ad3888a3520b39efcf780b9ee64167535d 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 M	AA
-:100644 000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 0000000000000000000000000000000000000000 D	AN
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A	DF
-:040000 000000 6d50f65d3bdab91c63444294d38f08aeff328e42 0000000000000000000000000000000000000000 D	DF
-:000000 100644 0000000000000000000000000000000000000000 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 A	DM
-:000000 100644 0000000000000000000000000000000000000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 A	DN
-:100644 000000 103d9f89b50b9aad03054b579be5e7aa665f2d57 0000000000000000000000000000000000000000 D	MD
-:100644 100644 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 19989d4559aae417fedee240ccf2ba315ea4dc2b M	MM
-:100644 100644 a716d58de4a570e0038f5c307bd8db34daea021f bd084b0c27c7b6cc34f11d6d0509a29be3caf970 M	MN
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A	NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D	ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M	NM
-:100644 100644 4c86f9a85fbc5e6804ee2e17a797538fbe785bca c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M	TT
-:040000 040000 5e5f22072bb39f6e12cf663a57cb634c76eefb49 1ba523955d5160681af65cb776411f574c1e8155 M	Z
+cat >.test-plain-AB <<EOF
+:100644 100644 $(test_oid aa_1) $(test_oid aa_2) M	AA
+:100644 000000 $(test_oid an_1) $(test_oid zero) D	AN
+:000000 100644 $(test_oid zero) $(test_oid df_2) A	DF
+:040000 000000 $(test_oid df_1) $(test_oid zero) D	DF
+:000000 100644 $(test_oid zero) $(test_oid dm_2) A	DM
+:000000 100644 $(test_oid zero) $(test_oid dn_1) A	DN
+:100644 000000 $(test_oid md_2) $(test_oid zero) D	MD
+:100644 100644 $(test_oid mm_2) $(test_oid mm_3) M	MM
+:100644 100644 $(test_oid mn_2) $(test_oid mn_1) M	MN
+:000000 100644 $(test_oid zero) $(test_oid na_1) A	NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D	ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M	NM
+:100644 100644 $(test_oid tt_2) $(test_oid tt_3) M	TT
+:040000 040000 $(test_oid z__2) $(test_oid z__3) M	Z
 EOF
-cat >.test-recursive-AB <<\EOF
-:100644 100644 ccba72ad3888a3520b39efcf780b9ee64167535d 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 M	AA
-:100644 000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 0000000000000000000000000000000000000000 D	AN
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A	DF
-:100644 000000 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 0000000000000000000000000000000000000000 D	DF/DF
-:000000 100644 0000000000000000000000000000000000000000 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 A	DM
-:000000 100644 0000000000000000000000000000000000000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 A	DN
-:100644 000000 103d9f89b50b9aad03054b579be5e7aa665f2d57 0000000000000000000000000000000000000000 D	MD
-:100644 100644 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 19989d4559aae417fedee240ccf2ba315ea4dc2b M	MM
-:100644 100644 a716d58de4a570e0038f5c307bd8db34daea021f bd084b0c27c7b6cc34f11d6d0509a29be3caf970 M	MN
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A	NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D	ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M	NM
-:100644 100644 4c86f9a85fbc5e6804ee2e17a797538fbe785bca c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M	TT
-:100644 100644 8acb8e9750e3f644bf323fcf3d338849db106c77 6c0b99286d0bce551ac4a7b3dff8b706edff3715 M	Z/AA
-:100644 000000 087494262084cefee7ed484d20c8dc0580791272 0000000000000000000000000000000000000000 D	Z/AN
-:000000 100644 0000000000000000000000000000000000000000 d77371d15817fcaa57eeec27f770c505ba974ec1 A	Z/DM
-:000000 100644 0000000000000000000000000000000000000000 beb5d38c55283d280685ea21a0e50cfcc0ca064a A	Z/DN
-:100644 000000 a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 0000000000000000000000000000000000000000 D	Z/MD
-:100644 100644 61422ba9c2c873416061a88cd40a59a35b576474 697aad7715a1e7306ca76290a3dd4208fbaeddfa M	Z/MM
-:100644 100644 a5c544c21cfcb07eb80a4d89a5b7d1570002edfd b16d7b25b869f2beb124efa53467d8a1550ad694 M	Z/MN
-:000000 100644 0000000000000000000000000000000000000000 d12979c22fff69c59ca9409e7a8fe3ee25eaee80 A	Z/NA
-:100644 000000 a18393c636b98e9bd7296b8b437ea4992b72440c 0000000000000000000000000000000000000000 D	Z/ND
-:100644 100644 3fdbe17fd013303a2e981e1ca1c6cd6e72789087 7e09d6a3a14bd630913e8c75693cea32157b606d M	Z/NM
+cat >.test-recursive-AB <<EOF
+:100644 100644 $(test_oid aa_1) $(test_oid aa_2) M	AA
+:100644 000000 $(test_oid an_1) $(test_oid zero) D	AN
+:000000 100644 $(test_oid zero) $(test_oid df_2) A	DF
+:100644 000000 $(test_oid dfd1) $(test_oid zero) D	DF/DF
+:000000 100644 $(test_oid zero) $(test_oid dm_2) A	DM
+:000000 100644 $(test_oid zero) $(test_oid dn_1) A	DN
+:100644 000000 $(test_oid md_2) $(test_oid zero) D	MD
+:100644 100644 $(test_oid mm_2) $(test_oid mm_3) M	MM
+:100644 100644 $(test_oid mn_2) $(test_oid mn_1) M	MN
+:000000 100644 $(test_oid zero) $(test_oid na_1) A	NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D	ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M	NM
+:100644 100644 $(test_oid tt_2) $(test_oid tt_3) M	TT
+:100644 100644 $(test_oid zaa1) $(test_oid zaa2) M	Z/AA
+:100644 000000 $(test_oid zan1) $(test_oid zero) D	Z/AN
+:000000 100644 $(test_oid zero) $(test_oid zdm2) A	Z/DM
+:000000 100644 $(test_oid zero) $(test_oid zdn1) A	Z/DN
+:100644 000000 $(test_oid zmd2) $(test_oid zero) D	Z/MD
+:100644 100644 $(test_oid zmm2) $(test_oid zmm3) M	Z/MM
+:100644 100644 $(test_oid zmn2) $(test_oid zmn1) M	Z/MN
+:000000 100644 $(test_oid zero) $(test_oid zna1) A	Z/NA
+:100644 000000 $(test_oid znd1) $(test_oid zero) D	Z/ND
+:100644 100644 $(test_oid znm1) $(test_oid znm2) M	Z/NM
 EOF
 
 cmp_diff_files_output () {
diff --git a/third_party/git/t/t4009-diff-rename-4.sh b/third_party/git/t/t4009-diff-rename-4.sh
index 3641fd84d686..b63bdf031f51 100755
--- a/third_party/git/t/t4009-diff-rename-4.sh
+++ b/third_party/git/t/t4009-diff-rename-4.sh
@@ -14,6 +14,7 @@ test_expect_success \
     'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
      echo frotz >rezrov &&
     git update-index --add COPYING rezrov &&
+    orig=$(git hash-object COPYING) &&
     tree=$(git write-tree) &&
     echo $tree'
 
@@ -22,6 +23,8 @@ test_expect_success \
     'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
     sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
     rm -f COPYING &&
+    c1=$(git hash-object COPYING.1) &&
+    c2=$(git hash-object COPYING.2) &&
     git update-index --add --remove COPYING COPYING.?'
 
 # tree has COPYING and rezrov.  work tree has COPYING.1 and COPYING.2,
@@ -31,11 +34,11 @@ test_expect_success \
 
 git diff-index -z -C $tree >current
 
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
+cat >expected <<EOF
+:100644 100644 $orig $c1 C1234
 COPYING
 COPYING.1
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 R1234
+:100644 100644 $orig $c2 R1234
 COPYING
 COPYING.2
 EOF
@@ -57,10 +60,10 @@ test_expect_success \
 # about rezrov.
 
 git diff-index -z -C $tree >current
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M
+cat >expected <<EOF
+:100644 100644 $orig $c2 M
 COPYING
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
+:100644 100644 $orig $c1 C1234
 COPYING
 COPYING.1
 EOF
@@ -82,8 +85,8 @@ test_expect_success \
      git update-index --add --remove COPYING COPYING.1'
 
 git diff-index -z -C --find-copies-harder $tree >current
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
+cat >expected <<EOF
+:100644 100644 $orig $c1 C1234
 COPYING
 COPYING.1
 EOF
diff --git a/third_party/git/t/t4010-diff-pathspec.sh b/third_party/git/t/t4010-diff-pathspec.sh
index 281f8fad0c71..e5ca359edfa6 100755
--- a/third_party/git/t/t4010-diff-pathspec.sh
+++ b/third_party/git/t/t4010-diff-pathspec.sh
@@ -17,11 +17,15 @@ test_expect_success \
     'echo frotz >file0 &&
      mkdir path1 &&
      echo rezrov >path1/file1 &&
+     before0=$(git hash-object file0) &&
+     before1=$(git hash-object path1/file1) &&
      git update-index --add file0 path1/file1 &&
      tree=$(git write-tree) &&
      echo "$tree" &&
      echo nitfol >file0 &&
      echo yomin >path1/file1 &&
+     after0=$(git hash-object file0) &&
+     after1=$(git hash-object path1/file1) &&
      git update-index file0 path1/file1'
 
 cat >expected <<\EOF
@@ -31,32 +35,32 @@ test_expect_success \
     'git diff-index --cached $tree -- path >current &&
      compare_diff_raw current expected'
 
-cat >expected <<\EOF
-:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M	path1/file1
+cat >expected <<EOF
+:100644 100644 $before1 $after1 M	path1/file1
 EOF
 test_expect_success \
     'limit to path1 should show path1/file1' \
     'git diff-index --cached $tree -- path1 >current &&
      compare_diff_raw current expected'
 
-cat >expected <<\EOF
-:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M	path1/file1
+cat >expected <<EOF
+:100644 100644 $before1 $after1 M	path1/file1
 EOF
 test_expect_success \
     'limit to path1/ should show path1/file1' \
     'git diff-index --cached $tree -- path1/ >current &&
      compare_diff_raw current expected'
 
-cat >expected <<\EOF
-:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M	path1/file1
+cat >expected <<EOF
+:100644 100644 $before1 $after1 M	path1/file1
 EOF
 test_expect_success \
     '"*file1" should show path1/file1' \
     'git diff-index --cached $tree -- "*file1" >current &&
      compare_diff_raw current expected'
 
-cat >expected <<\EOF
-:100644 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df dca6b92303befc93086aa025d90a5facd7eb2812 M	file0
+cat >expected <<EOF
+:100644 100644 $before0 $after0 M	file0
 EOF
 test_expect_success \
     'limit to file0 should show file0' \
diff --git a/third_party/git/t/t4011-diff-symlink.sh b/third_party/git/t/t4011-diff-symlink.sh
index 5ae19b987d65..717034bb50b5 100755
--- a/third_party/git/t/t4011-diff-symlink.sh
+++ b/third_party/git/t/t4011-diff-symlink.sh
@@ -9,11 +9,24 @@ test_description='Test diff of symlinks.
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
+# Print the short OID of a symlink with the given name.
+symlink_oid () {
+	local oid=$(printf "%s" "$1" | git hash-object --stdin) &&
+	git rev-parse --short "$oid"
+}
+
+# Print the short OID of the given file.
+short_oid () {
+	local oid=$(git hash-object "$1") &&
+	git rev-parse --short "$oid"
+}
+
 test_expect_success 'diff new symlink and file' '
-	cat >expected <<-\EOF &&
+	symlink=$(symlink_oid xyzzy) &&
+	cat >expected <<-EOF &&
 	diff --git a/frotz b/frotz
 	new file mode 120000
-	index 0000000..7c465af
+	index 0000000..$symlink
 	--- /dev/null
 	+++ b/frotz
 	@@ -0,0 +1 @@
@@ -21,7 +34,7 @@ test_expect_success 'diff new symlink and file' '
 	\ No newline at end of file
 	diff --git a/nitfol b/nitfol
 	new file mode 100644
-	index 0000000..7c465af
+	index 0000000..$symlink
 	--- /dev/null
 	+++ b/nitfol
 	@@ -0,0 +1 @@
@@ -46,10 +59,10 @@ test_expect_success 'diff unchanged symlink and file'  '
 '
 
 test_expect_success 'diff removed symlink and file' '
-	cat >expected <<-\EOF &&
+	cat >expected <<-EOF &&
 	diff --git a/frotz b/frotz
 	deleted file mode 120000
-	index 7c465af..0000000
+	index $symlink..0000000
 	--- a/frotz
 	+++ /dev/null
 	@@ -1 +0,0 @@
@@ -57,7 +70,7 @@ test_expect_success 'diff removed symlink and file' '
 	\ No newline at end of file
 	diff --git a/nitfol b/nitfol
 	deleted file mode 100644
-	index 7c465af..0000000
+	index $symlink..0000000
 	--- a/nitfol
 	+++ /dev/null
 	@@ -1 +0,0 @@
@@ -90,9 +103,10 @@ test_expect_success 'diff identical, but newly created symlink and file' '
 '
 
 test_expect_success 'diff different symlink and file' '
-	cat >expected <<-\EOF &&
+	new=$(symlink_oid yxyyz) &&
+	cat >expected <<-EOF &&
 	diff --git a/frotz b/frotz
-	index 7c465af..df1db54 120000
+	index $symlink..$new 120000
 	--- a/frotz
 	+++ b/frotz
 	@@ -1 +1 @@
@@ -101,7 +115,7 @@ test_expect_success 'diff different symlink and file' '
 	+yxyyz
 	\ No newline at end of file
 	diff --git a/nitfol b/nitfol
-	index 7c465af..df1db54 100644
+	index $symlink..$new 100644
 	--- a/nitfol
 	+++ b/nitfol
 	@@ -1 +1 @@
@@ -137,14 +151,16 @@ test_expect_success SYMLINKS 'setup symlinks with attributes' '
 '
 
 test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' '
-	cat >expect <<-\EOF &&
+	file=$(short_oid file.bin) &&
+	link=$(symlink_oid file.bin) &&
+	cat >expect <<-EOF &&
 	diff --git a/file.bin b/file.bin
 	new file mode 100644
-	index 0000000..d95f3ad
+	index 0000000..$file
 	Binary files /dev/null and b/file.bin differ
 	diff --git a/link.bin b/link.bin
 	new file mode 120000
-	index 0000000..dce41ec
+	index 0000000..$link
 	--- /dev/null
 	+++ b/link.bin
 	@@ -0,0 +1 @@
diff --git a/third_party/git/t/t4013-diff-various.sh b/third_party/git/t/t4013-diff-various.sh
index a9054d2db116..dde3f11fec36 100755
--- a/third_party/git/t/t4013-diff-various.sh
+++ b/third_party/git/t/t4013-diff-various.sh
@@ -7,9 +7,6 @@ test_description='Various diff formatting options'
 
 . ./test-lib.sh
 
-LF='
-'
-
 test_expect_success setup '
 
 	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
@@ -123,6 +120,30 @@ test_expect_success setup '
 +*++ [initial] Initial
 EOF
 
+process_diffs () {
+	_x04="[0-9a-f][0-9a-f][0-9a-f][0-9a-f]" &&
+	_x07="$_x05[0-9a-f][0-9a-f]" &&
+	sed -e "s/$OID_REGEX/$ZERO_OID/g" \
+	    -e "s/From $_x40 /From $ZERO_OID /" \
+	    -e "s/from $_x40)/from $ZERO_OID)/" \
+	    -e "s/commit $_x40\$/commit $ZERO_OID/" \
+	    -e "s/commit $_x40 (/commit $ZERO_OID (/" \
+	    -e "s/$_x40 $_x40 $_x40/$ZERO_OID $ZERO_OID $ZERO_OID/" \
+	    -e "s/$_x40 $_x40 /$ZERO_OID $ZERO_OID /" \
+	    -e "s/^$_x40 $_x40$/$ZERO_OID $ZERO_OID/" \
+	    -e "s/^$_x40 /$ZERO_OID /" \
+	    -e "s/^$_x40$/$ZERO_OID/" \
+	    -e "s/$_x07\.\.$_x07/fffffff..fffffff/g" \
+	    -e "s/$_x07,$_x07\.\.$_x07/fffffff,fffffff..fffffff/g" \
+	    -e "s/$_x07 $_x07 $_x07/fffffff fffffff fffffff/g" \
+	    -e "s/$_x07 $_x07 /fffffff fffffff /g" \
+	    -e "s/Merge: $_x07 $_x07/Merge: fffffff fffffff/g" \
+	    -e "s/$_x07\.\.\./fffffff.../g" \
+	    -e "s/ $_x04\.\.\./ ffff.../g" \
+	    -e "s/ $_x04/ ffff/g" \
+	    "$1"
+}
+
 V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
 while read magic cmd
 do
@@ -161,13 +182,15 @@ do
 		} >"$actual" &&
 		if test -f "$expect"
 		then
+			process_diffs "$actual" >actual &&
+			process_diffs "$expect" >expect &&
 			case $cmd in
 			*format-patch* | *-stat*)
-				test_i18ncmp "$expect" "$actual";;
+				test_i18ncmp expect actual;;
 			*)
-				test_cmp "$expect" "$actual";;
+				test_cmp expect actual;;
 			esac &&
-			rm -f "$actual"
+			rm -f "$actual" actual expect
 		else
 			# this is to help developing new tests.
 			cp "$actual" "$expect"
@@ -386,16 +409,22 @@ test_expect_success 'log -S requires an argument' '
 test_expect_success 'diff --cached on unborn branch' '
 	echo ref: refs/heads/unborn >.git/HEAD &&
 	git diff --cached >result &&
-	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result
+	process_diffs result >actual &&
+	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&
+	test_cmp expected actual
 '
 
 test_expect_success 'diff --cached -- file on unborn branch' '
 	git diff --cached -- file0 >result &&
-	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
+	process_diffs result >actual &&
+	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected &&
+	test_cmp expected actual
 '
 test_expect_success 'diff --line-prefix with spaces' '
 	git diff --line-prefix="| | | " --cached -- file0 >result &&
-	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" result
+	process_diffs result >actual &&
+	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected &&
+	test_cmp expected actual
 '
 
 test_expect_success 'diff-tree --stdin with log formatting' '
diff --git a/third_party/git/t/t4014-format-patch.sh b/third_party/git/t/t4014-format-patch.sh
index ca7debf1d4c0..b653dd7d4452 100755
--- a/third_party/git/t/t4014-format-patch.sh
+++ b/third_party/git/t/t4014-format-patch.sh
@@ -9,7 +9,6 @@ test_description='various format-patch tests'
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success setup '
-
 	for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
 	cat file >elif &&
 	git add file elif &&
@@ -34,7 +33,8 @@ test_expect_success setup '
 	git commit -m "Side changes #3 with \\n backslash-n in it." &&
 
 	git checkout master &&
-	git diff-tree -p C2 | git apply --index &&
+	git diff-tree -p C2 >patch &&
+	git apply --index <patch &&
 	test_tick &&
 	git commit -m "Master accepts moral equivalent of #2" &&
 
@@ -59,33 +59,28 @@ test_expect_success setup '
 	git checkout master
 '
 
-test_expect_success "format-patch --ignore-if-in-upstream" '
-
+test_expect_success 'format-patch --ignore-if-in-upstream' '
 	git format-patch --stdout master..side >patch0 &&
-	cnt=$(grep "^From " patch0 | wc -l) &&
-	test $cnt = 3
-
+	grep "^From " patch0 >from0 &&
+	test_line_count = 3 from0
 '
 
-test_expect_success "format-patch --ignore-if-in-upstream" '
-
+test_expect_success 'format-patch --ignore-if-in-upstream' '
 	git format-patch --stdout \
 		--ignore-if-in-upstream master..side >patch1 &&
-	cnt=$(grep "^From " patch1 | wc -l) &&
-	test $cnt = 2
-
+	grep "^From " patch1 >from1 &&
+	test_line_count = 2 from1
 '
 
-test_expect_success "format-patch --ignore-if-in-upstream handles tags" '
+test_expect_success 'format-patch --ignore-if-in-upstream handles tags' '
 	git tag -a v1 -m tag side &&
 	git tag -a v2 -m tag master &&
 	git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
-	cnt=$(grep "^From " patch1 | wc -l) &&
-	test $cnt = 2
+	grep "^From " patch1 >from1 &&
+	test_line_count = 2 from1
 '
 
 test_expect_success "format-patch doesn't consider merge commits" '
-
 	git checkout -b slave master &&
 	echo "Another line" >>file &&
 	test_tick &&
@@ -96,148 +91,138 @@ test_expect_success "format-patch doesn't consider merge commits" '
 	git checkout -b merger master &&
 	test_tick &&
 	git merge --no-ff slave &&
-	cnt=$(git format-patch -3 --stdout | grep "^From " | wc -l) &&
-	test $cnt = 3
+	git format-patch -3 --stdout >patch &&
+	grep "^From " patch >from &&
+	test_line_count = 3 from
 '
 
-test_expect_success "format-patch result applies" '
-
+test_expect_success 'format-patch result applies' '
 	git checkout -b rebuild-0 master &&
 	git am -3 patch0 &&
-	cnt=$(git rev-list master.. | wc -l) &&
-	test $cnt = 2
+	git rev-list master.. >list &&
+	test_line_count = 2 list
 '
 
-test_expect_success "format-patch --ignore-if-in-upstream result applies" '
-
+test_expect_success 'format-patch --ignore-if-in-upstream result applies' '
 	git checkout -b rebuild-1 master &&
 	git am -3 patch1 &&
-	cnt=$(git rev-list master.. | wc -l) &&
-	test $cnt = 2
+	git rev-list master.. >list &&
+	test_line_count = 2 list
 '
 
 test_expect_success 'commit did not screw up the log message' '
-
-	git cat-file commit side | grep "^Side .* with .* backslash-n"
-
+	git cat-file commit side >actual &&
+	grep "^Side .* with .* backslash-n" actual
 '
 
 test_expect_success 'format-patch did not screw up the log message' '
-
 	grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
 	grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
-
 '
 
 test_expect_success 'replay did not screw up the log message' '
-
-	git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
-
+	git cat-file commit rebuild-1 >actual &&
+	grep "^Side .* with .* backslash-n" actual
 '
 
 test_expect_success 'extra headers' '
-
 	git config format.headers "To: R E Cipient <rcipient@example.com>
 " &&
 	git config --add format.headers "Cc: S E Cipient <scipient@example.com>
 " &&
-	git format-patch --stdout master..side > patch2 &&
-	sed -e "/^\$/q" patch2 > hdrs2 &&
+	git format-patch --stdout master..side >patch2 &&
+	sed -e "/^\$/q" patch2 >hdrs2 &&
 	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
 	grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2
-
 '
 
 test_expect_success 'extra headers without newlines' '
-
 	git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
 	git config --add format.headers "Cc: S E Cipient <scipient@example.com>" &&
 	git format-patch --stdout master..side >patch3 &&
-	sed -e "/^\$/q" patch3 > hdrs3 &&
+	sed -e "/^\$/q" patch3 >hdrs3 &&
 	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
 	grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
-
 '
 
 test_expect_success 'extra headers with multiple To:s' '
-
 	git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
 	git config --add format.headers "To: S E Cipient <scipient@example.com>" &&
-	git format-patch --stdout master..side > patch4 &&
-	sed -e "/^\$/q" patch4 > hdrs4 &&
+	git format-patch --stdout master..side >patch4 &&
+	sed -e "/^\$/q" patch4 >hdrs4 &&
 	grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
 	grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
 '
 
 test_expect_success 'additional command line cc (ascii)' '
-
 	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
-	git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
-	grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
-	grep "^ *S E Cipient <scipient@example.com>\$" patch5
+	git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+	sed -e "/^\$/q" patch5 >hdrs5 &&
+	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
+	grep "^ *S E Cipient <scipient@example.com>\$" hdrs5
 '
 
 test_expect_failure 'additional command line cc (rfc822)' '
-
 	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
-	git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
-	grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
-	grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" patch5
+	git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+	sed -e "/^\$/q" patch5 >hdrs5 &&
+	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
+	grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" hdrs5
 '
 
 test_expect_success 'command line headers' '
-
 	git config --unset-all format.headers &&
-	git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch6 &&
-	grep "^Cc: R E Cipient <rcipient@example.com>\$" patch6
+	git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side >patch6 &&
+	sed -e "/^\$/q" patch6 >hdrs6 &&
+	grep "^Cc: R E Cipient <rcipient@example.com>\$" hdrs6
 '
 
 test_expect_success 'configuration headers and command line headers' '
-
 	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
-	git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch7 &&
-	grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch7 &&
-	grep "^ *S E Cipient <scipient@example.com>\$" patch7
+	git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side >patch7 &&
+	sed -e "/^\$/q" patch7 >hdrs7 &&
+	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs7 &&
+	grep "^ *S E Cipient <scipient@example.com>\$" hdrs7
 '
 
 test_expect_success 'command line To: header (ascii)' '
-
 	git config --unset-all format.headers &&
-	git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
-	grep "^To: R E Cipient <rcipient@example.com>\$" patch8
+	git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+	sed -e "/^\$/q" patch8 >hdrs8 &&
+	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs8
 '
 
 test_expect_failure 'command line To: header (rfc822)' '
-
-	git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
-	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch8
+	git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+	sed -e "/^\$/q" patch8 >hdrs8 &&
+	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs8
 '
 
 test_expect_failure 'command line To: header (rfc2047)' '
-
-	git format-patch --to="R ร„ Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
-	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch8
+	git format-patch --to="R ร„ Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+	sed -e "/^\$/q" patch8 >hdrs8 &&
+	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs8
 '
 
 test_expect_success 'configuration To: header (ascii)' '
-
 	git config format.to "R E Cipient <rcipient@example.com>" &&
-	git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
-	grep "^To: R E Cipient <rcipient@example.com>\$" patch9
+	git format-patch --stdout master..side >patch9 &&
+	sed -e "/^\$/q" patch9 >hdrs9 &&
+	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs9
 '
 
 test_expect_failure 'configuration To: header (rfc822)' '
-
 	git config format.to "R. E. Cipient <rcipient@example.com>" &&
-	git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
-	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9
+	git format-patch --stdout master..side >patch9 &&
+	sed -e "/^\$/q" patch9 >hdrs9 &&
+	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs9
 '
 
 test_expect_failure 'configuration To: header (rfc2047)' '
-
 	git config format.to "R ร„ Cipient <rcipient@example.com>" &&
-	git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
-	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch9
+	git format-patch --stdout master..side >patch9 &&
+	sed -e "/^\$/q" patch9 >hdrs9 &&
+	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs9
 '
 
 # check_patch <patch>: Verify that <patch> looks like a half-sane
@@ -249,89 +234,79 @@ check_patch () {
 }
 
 test_expect_success 'format.from=false' '
-
-	git -c format.from=false format-patch --stdout master..side |
-	sed -e "/^\$/q" >patch &&
+	git -c format.from=false format-patch --stdout master..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
 	check_patch patch &&
-	! grep "^From: C O Mitter <committer@example.com>\$" patch
+	! grep "^From: C O Mitter <committer@example.com>\$" hdrs
 '
 
 test_expect_success 'format.from=true' '
-
-	git -c format.from=true format-patch --stdout master..side |
-	sed -e "/^\$/q" >patch &&
-	check_patch patch &&
-	grep "^From: C O Mitter <committer@example.com>\$" patch
+	git -c format.from=true format-patch --stdout master..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
+	check_patch hdrs &&
+	grep "^From: C O Mitter <committer@example.com>\$" hdrs
 '
 
 test_expect_success 'format.from with address' '
-
-	git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side |
-	sed -e "/^\$/q" >patch &&
-	check_patch patch &&
-	grep "^From: F R Om <from@example.com>\$" patch
+	git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
+	check_patch hdrs &&
+	grep "^From: F R Om <from@example.com>\$" hdrs
 '
 
 test_expect_success '--no-from overrides format.from' '
-
-	git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side |
-	sed -e "/^\$/q" >patch &&
-	check_patch patch &&
-	! grep "^From: F R Om <from@example.com>\$" patch
+	git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
+	check_patch hdrs &&
+	! grep "^From: F R Om <from@example.com>\$" hdrs
 '
 
 test_expect_success '--from overrides format.from' '
-
-	git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side |
-	sed -e "/^\$/q" >patch &&
-	check_patch patch &&
-	! grep "^From: F R Om <from@example.com>\$" patch
+	git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
+	check_patch hdrs &&
+	! grep "^From: F R Om <from@example.com>\$" hdrs
 '
 
 test_expect_success '--no-to overrides config.to' '
-
 	git config --replace-all format.to \
 		"R E Cipient <rcipient@example.com>" &&
-	git format-patch --no-to --stdout master..side |
-	sed -e "/^\$/q" >patch10 &&
-	check_patch patch10 &&
-	! grep "^To: R E Cipient <rcipient@example.com>\$" patch10
+	git format-patch --no-to --stdout master..side >patch10 &&
+	sed -e "/^\$/q" patch10 >hdrs10 &&
+	check_patch hdrs10 &&
+	! grep "^To: R E Cipient <rcipient@example.com>\$" hdrs10
 '
 
 test_expect_success '--no-to and --to replaces config.to' '
-
 	git config --replace-all format.to \
 		"Someone <someone@out.there>" &&
 	git format-patch --no-to --to="Someone Else <else@out.there>" \
-		--stdout master..side |
-	sed -e "/^\$/q" >patch11 &&
-	check_patch patch11 &&
-	! grep "^To: Someone <someone@out.there>\$" patch11 &&
-	grep "^To: Someone Else <else@out.there>\$" patch11
+		--stdout master..side >patch11 &&
+	sed -e "/^\$/q" patch11 >hdrs11 &&
+	check_patch hdrs11 &&
+	! grep "^To: Someone <someone@out.there>\$" hdrs11 &&
+	grep "^To: Someone Else <else@out.there>\$" hdrs11
 '
 
 test_expect_success '--no-cc overrides config.cc' '
-
 	git config --replace-all format.cc \
 		"C E Cipient <rcipient@example.com>" &&
-	git format-patch --no-cc --stdout master..side |
-	sed -e "/^\$/q" >patch12 &&
-	check_patch patch12 &&
-	! grep "^Cc: C E Cipient <rcipient@example.com>\$" patch12
+	git format-patch --no-cc --stdout master..side >patch12 &&
+	sed -e "/^\$/q" patch12 >hdrs12 &&
+	check_patch hdrs12 &&
+	! grep "^Cc: C E Cipient <rcipient@example.com>\$" hdrs12
 '
 
 test_expect_success '--no-add-header overrides config.headers' '
-
 	git config --replace-all format.headers \
 		"Header1: B E Cipient <rcipient@example.com>" &&
-	git format-patch --no-add-header --stdout master..side |
-	sed -e "/^\$/q" >patch13 &&
-	check_patch patch13 &&
-	! grep "^Header1: B E Cipient <rcipient@example.com>\$" patch13
+	git format-patch --no-add-header --stdout master..side >patch13 &&
+	sed -e "/^\$/q" patch13 >hdrs13 &&
+	check_patch hdrs13 &&
+	! grep "^Header1: B E Cipient <rcipient@example.com>\$" hdrs13
 '
 
 test_expect_success 'multiple files' '
-
 	rm -rf patches/ &&
 	git checkout side &&
 	git format-patch -o patches/ master &&
@@ -357,7 +332,7 @@ test_expect_success 'reroll count (-v)' '
 check_threading () {
 	expect="$1" &&
 	shift &&
-	(git format-patch --stdout "$@"; echo $? > status.out) |
+	git format-patch --stdout "$@" >patch &&
 	# Prints everything between the Message-ID and In-Reply-To,
 	# and replaces all Message-ID-lookalikes by a sequence number
 	perl -ne '
@@ -372,12 +347,11 @@ check_threading () {
 			print;
 		}
 		print "---\n" if /^From /i;
-	' > actual &&
-	test 0 = "$(cat status.out)" &&
+	' <patch >actual &&
 	test_cmp "$expect" actual
 }
 
-cat >> expect.no-threading <<EOF
+cat >>expect.no-threading <<EOF
 ---
 ---
 ---
@@ -388,7 +362,7 @@ test_expect_success 'no threading' '
 	check_threading expect.no-threading master
 '
 
-cat > expect.thread <<EOF
+cat >expect.thread <<EOF
 ---
 Message-Id: <0>
 ---
@@ -405,7 +379,7 @@ test_expect_success 'thread' '
 	check_threading expect.thread --thread master
 '
 
-cat > expect.in-reply-to <<EOF
+cat >expect.in-reply-to <<EOF
 ---
 Message-Id: <0>
 In-Reply-To: <1>
@@ -425,7 +399,7 @@ test_expect_success 'thread in-reply-to' '
 		--thread master
 '
 
-cat > expect.cover-letter <<EOF
+cat >expect.cover-letter <<EOF
 ---
 Message-Id: <0>
 ---
@@ -446,7 +420,7 @@ test_expect_success 'thread cover-letter' '
 	check_threading expect.cover-letter --cover-letter --thread master
 '
 
-cat > expect.cl-irt <<EOF
+cat >expect.cl-irt <<EOF
 ---
 Message-Id: <0>
 In-Reply-To: <1>
@@ -478,7 +452,7 @@ test_expect_success 'thread explicit shallow' '
 		--in-reply-to="<test.message>" --thread=shallow master
 '
 
-cat > expect.deep <<EOF
+cat >expect.deep <<EOF
 ---
 Message-Id: <0>
 ---
@@ -496,7 +470,7 @@ test_expect_success 'thread deep' '
 	check_threading expect.deep --thread=deep master
 '
 
-cat > expect.deep-irt <<EOF
+cat >expect.deep-irt <<EOF
 ---
 Message-Id: <0>
 In-Reply-To: <1>
@@ -519,7 +493,7 @@ test_expect_success 'thread deep in-reply-to' '
 		--in-reply-to="<test.message>" master
 '
 
-cat > expect.deep-cl <<EOF
+cat >expect.deep-cl <<EOF
 ---
 Message-Id: <0>
 ---
@@ -543,7 +517,7 @@ test_expect_success 'thread deep cover-letter' '
 	check_threading expect.deep-cl --cover-letter --thread=deep master
 '
 
-cat > expect.deep-cl-irt <<EOF
+cat >expect.deep-cl-irt <<EOF
 ---
 Message-Id: <0>
 In-Reply-To: <1>
@@ -594,7 +568,6 @@ test_expect_success 'thread config + --no-thread' '
 '
 
 test_expect_success 'excessive subject' '
-
 	rm -rf patches/ &&
 	git checkout side &&
 	before=$(git hash-object file) &&
@@ -622,10 +595,9 @@ test_expect_success 'cover-letter inherits diff options' '
 	! grep "file => foo .* 0 *\$" 0000-cover-letter.patch &&
 	git format-patch --cover-letter -1 -M &&
 	grep "file => foo .* 0 *\$" 0000-cover-letter.patch
-
 '
 
-cat > expect << EOF
+cat >expect <<EOF
   This is an excessively long subject line for a message due to the
     habit some projects have of not having a short, one-line subject at
     the start of the commit message, but rather sticking a whole
@@ -636,14 +608,12 @@ cat > expect << EOF
 EOF
 
 test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
-
 	git format-patch --cover-letter -2 &&
-	sed -e "1,/A U Thor/d" -e "/^\$/q" < 0000-cover-letter.patch > output &&
+	sed -e "1,/A U Thor/d" -e "/^\$/q" 0000-cover-letter.patch >output &&
 	test_cmp expect output
-
 '
 
-cat > expect << EOF
+cat >expect <<EOF
 index $before..$after 100644
 --- a/file
 +++ b/file
@@ -656,16 +626,14 @@ index $before..$after 100644
 EOF
 
 test_expect_success 'format-patch respects -U' '
-
 	git format-patch -U4 -2 &&
 	sed -e "1,/^diff/d" -e "/^+5/q" \
 		<0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \
 		>output &&
 	test_cmp expect output
-
 '
 
-cat > expect << EOF
+cat >expect <<EOF
 
 diff --git a/file b/file
 index $before..$after 100644
@@ -679,11 +647,9 @@ index $before..$after 100644
 EOF
 
 test_expect_success 'format-patch -p suppresses stat' '
-
 	git format-patch -p -2 &&
-	sed -e "1,/^\$/d" -e "/^+5/q" < 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch > output &&
+	sed -e "1,/^\$/d" -e "/^+5/q" 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch >output &&
 	test_cmp expect output
-
 '
 
 test_expect_success 'format-patch from a subdirectory (1)' '
@@ -736,7 +702,7 @@ test_expect_success 'format-patch from a subdirectory (3)' '
 '
 
 test_expect_success 'format-patch --in-reply-to' '
-	git format-patch -1 --stdout --in-reply-to "baz@foo.bar" > patch8 &&
+	git format-patch -1 --stdout --in-reply-to "baz@foo.bar" >patch8 &&
 	grep "^In-Reply-To: <baz@foo.bar>" patch8 &&
 	grep "^References: <baz@foo.bar>" patch8
 '
@@ -827,21 +793,56 @@ test_expect_success 'format-patch with multiple notes refs' '
 	! grep "this is note 2" out
 '
 
-echo "fatal: --name-only does not make sense" > expect.name-only
-echo "fatal: --name-status does not make sense" > expect.name-status
-echo "fatal: --check does not make sense" > expect.check
+test_expect_success 'format-patch with multiple notes refs in config' '
+	test_when_finished "test_unconfig format.notes" &&
+
+	git notes --ref note1 add -m "this is note 1" HEAD &&
+	test_when_finished git notes --ref note1 remove HEAD &&
+	git notes --ref note2 add -m "this is note 2" HEAD &&
+	test_when_finished git notes --ref note2 remove HEAD &&
+
+	git config format.notes note1 &&
+	git format-patch -1 --stdout >out &&
+	grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git config format.notes note2 &&
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	grep "this is note 2" out &&
+	git config --add format.notes note1 &&
+	git format-patch -1 --stdout >out &&
+	grep "this is note 1" out &&
+	grep "this is note 2" out &&
+
+	git config --replace-all format.notes note1 &&
+	git config --add format.notes false &&
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git config --add format.notes note2 &&
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	grep "this is note 2" out
+'
+
+echo "fatal: --name-only does not make sense" >expect.name-only
+echo "fatal: --name-status does not make sense" >expect.name-status
+echo "fatal: --check does not make sense" >expect.check
 
 test_expect_success 'options no longer allowed for format-patch' '
-	test_must_fail git format-patch --name-only 2> output &&
+	test_must_fail git format-patch --name-only 2>output &&
 	test_i18ncmp expect.name-only output &&
-	test_must_fail git format-patch --name-status 2> output &&
+	test_must_fail git format-patch --name-status 2>output &&
 	test_i18ncmp expect.name-status output &&
-	test_must_fail git format-patch --check 2> output &&
-	test_i18ncmp expect.check output'
+	test_must_fail git format-patch --check 2>output &&
+	test_i18ncmp expect.check output
+'
 
 test_expect_success 'format-patch --numstat should produce a patch' '
-	git format-patch --numstat --stdout master..side > output &&
-	test 5 = $(grep "^diff --git a/" output | wc -l)'
+	git format-patch --numstat --stdout master..side >output &&
+	grep "^diff --git a/" output >diff &&
+	test_line_count = 5 diff
+'
 
 test_expect_success 'format-patch -- <path>' '
 	git format-patch master..side -- file 2>error &&
@@ -852,20 +853,25 @@ test_expect_success 'format-patch --ignore-if-in-upstream HEAD' '
 	git format-patch --ignore-if-in-upstream HEAD
 '
 
-git_version="$(git --version | sed "s/.* //")"
+test_expect_success 'get git version' '
+	git_version=$(git --version) &&
+	git_version=${git_version##* }
+'
 
 signature() {
 	printf "%s\n%s\n\n" "-- " "${1:-$git_version}"
 }
 
 test_expect_success 'format-patch default signature' '
-	git format-patch --stdout -1 | tail -n 3 >output &&
+	git format-patch --stdout -1 >patch &&
+	tail -n 3 patch >output &&
 	signature >expect &&
 	test_cmp expect output
 '
 
 test_expect_success 'format-patch --signature' '
-	git format-patch --stdout --signature="my sig" -1 | tail -n 3 >output &&
+	git format-patch --stdout --signature="my sig" -1 >patch &&
+	tail -n 3 patch >output &&
 	signature "my sig" >expect &&
 	test_cmp expect output
 '
@@ -897,8 +903,8 @@ test_expect_success 'format-patch --signature --cover-letter' '
 	git config --unset-all format.signature &&
 	git format-patch --stdout --signature="my sig" --cover-letter \
 		-1 >output &&
-	grep "my sig" output &&
-	test 2 = $(grep "my sig" output | wc -l)
+	grep "my sig" output >sig &&
+	test_line_count = 2 sig
 '
 
 test_expect_success 'format.signature="" suppresses signatures' '
@@ -935,7 +941,7 @@ test_expect_success 'prepare mail-signature input' '
 test_expect_success '--signature-file=file works' '
 	git format-patch --stdout --signature-file=mail-signature -1 >output &&
 	check_patch output &&
-	sed -e "1,/^-- \$/d" <output >actual &&
+	sed -e "1,/^-- \$/d" output >actual &&
 	{
 		cat mail-signature && echo
 	} >expect &&
@@ -946,7 +952,7 @@ test_expect_success 'format.signaturefile works' '
 	test_config format.signaturefile mail-signature &&
 	git format-patch --stdout -1 >output &&
 	check_patch output &&
-	sed -e "1,/^-- \$/d" <output >actual &&
+	sed -e "1,/^-- \$/d" output >actual &&
 	{
 		cat mail-signature && echo
 	} >expect &&
@@ -968,7 +974,7 @@ test_expect_success '--signature-file overrides format.signaturefile' '
 	git format-patch --stdout \
 			--signature-file=other-mail-signature -1 >output &&
 	check_patch output &&
-	sed -e "1,/^-- \$/d" <output >actual &&
+	sed -e "1,/^-- \$/d" output >actual &&
 	{
 		cat other-mail-signature && echo
 	} >expect &&
@@ -1037,7 +1043,7 @@ test_expect_success 'format-patch wraps extremely long subject (ascii)' '
 	git add file &&
 	git commit -m "$M512" &&
 	git format-patch --stdout -1 >patch &&
-	sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
+	sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
 	test_cmp expect subject
 '
 
@@ -1076,7 +1082,7 @@ test_expect_success 'format-patch wraps extremely long subject (rfc2047)' '
 	git add file &&
 	git commit -m "$M512" &&
 	git format-patch --stdout -1 >patch &&
-	sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
+	sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
 	test_cmp expect subject
 '
 
@@ -1085,7 +1091,7 @@ check_author() {
 	git add file &&
 	GIT_AUTHOR_NAME=$1 git commit -m author-check &&
 	git format-patch --stdout -1 >patch &&
-	sed -n "/^From: /p; /^ /p; /^$/q" <patch >actual &&
+	sed -n "/^From: /p; /^ /p; /^$/q" patch >actual &&
 	test_cmp expect actual
 }
 
@@ -1205,7 +1211,7 @@ test_expect_success '--from=ident replaces author' '
 	From: A U Thor <author@example.com>
 
 	EOF
-	sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
+	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
 	test_cmp expect patch.head
 '
 
@@ -1217,7 +1223,7 @@ test_expect_success '--from uses committer ident' '
 	From: A U Thor <author@example.com>
 
 	EOF
-	sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
+	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
 	test_cmp expect patch.head
 '
 
@@ -1227,7 +1233,7 @@ test_expect_success '--from omits redundant in-body header' '
 	From: A U Thor <author@example.com>
 
 	EOF
-	sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
+	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
 	test_cmp expect patch.head
 '
 
@@ -1242,7 +1248,7 @@ test_expect_success 'in-body headers trigger content encoding' '
 	From: รฉxรถtรฌc <author@example.com>
 
 	EOF
-	sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" <patch >patch.head &&
+	sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" patch >patch.head &&
 	test_cmp expect patch.head
 '
 
@@ -1256,283 +1262,283 @@ append_signoff()
 
 test_expect_success 'signoff: commit with no body' '
 	append_signoff </dev/null >actual &&
-	cat <<\EOF | sed "s/EOL$//" >expected &&
-4:Subject: [PATCH] EOL
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	cat <<-\EOF | sed "s/EOL$//" >expect &&
+	4:Subject: [PATCH] EOL
+	8:
+	9:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: commit with only subject' '
 	echo subject | append_signoff >actual &&
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: commit with only subject that does not end with NL' '
 	printf subject | append_signoff >actual &&
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: no existing signoffs' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-body
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	body
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: no existing signoffs and no trailing NL' '
 	printf "subject\n\nbody" | append_signoff >actual &&
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: some random signoff' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-body
+	body
 
-Signed-off-by: my@house
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: my@house
-12:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	Signed-off-by: my@house
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: my@house
+	12:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: misc conforming footer elements' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-body
+	body
 
-Signed-off-by: my@house
-(cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
-Tested-by: Some One <someone@example.com>
-Bug: 1234
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: my@house
-15:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	Signed-off-by: my@house
+	(cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
+	Tested-by: Some One <someone@example.com>
+	Bug: 1234
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: my@house
+	15:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: some random signoff-alike' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-body
-Fooled-by-me: my@house
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-11:
-12:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	body
+	Fooled-by-me: my@house
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	11:
+	12:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: not really a signoff' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-I want to mention about Signed-off-by: here.
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:I want to mention about Signed-off-by: here.
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	I want to mention about Signed-off-by: here.
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:I want to mention about Signed-off-by: here.
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: not really a signoff (2)' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-My unfortunate
-Signed-off-by: example happens to be wrapped here.
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:Signed-off-by: example happens to be wrapped here.
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	My unfortunate
+	Signed-off-by: example happens to be wrapped here.
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:Signed-off-by: example happens to be wrapped here.
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: valid S-o-b paragraph in the middle' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-Signed-off-by: my@house
-Signed-off-by: your@house
+	Signed-off-by: my@house
+	Signed-off-by: your@house
 
-A lot of houses.
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: my@house
-10:Signed-off-by: your@house
-11:
-13:
-14:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	A lot of houses.
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:Signed-off-by: my@house
+	10:Signed-off-by: your@house
+	11:
+	13:
+	14:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: the same signoff at the end' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-body
+	body
 
-Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: the same signoff at the end, no trailing NL' '
 	printf "subject\n\nSigned-off-by: C O Mitter <committer@example.com>" |
 		append_signoff >actual &&
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: the same signoff NOT at the end' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-body
+	body
 
-Signed-off-by: C O Mitter <committer@example.com>
-Signed-off-by: my@house
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-12:Signed-off-by: my@house
-EOF
-	test_cmp expected actual
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: my@house
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	12:Signed-off-by: my@house
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: tolerate garbage in conforming footer' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-body
+	body
 
-Tested-by: my@house
-Some Trash
-Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-13:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	Tested-by: my@house
+	Some Trash
+	Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	13:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: respect trailer config' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-Myfooter: x
-Some Trash
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-11:
-12:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual &&
+	Myfooter: x
+	Some Trash
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	11:
+	12:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual &&
 
 	test_config trailer.Myfooter.ifexists add &&
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-Myfooter: x
-Some Trash
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	Myfooter: x
+	Some Trash
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'signoff: footer begins with non-signoff without @ sign' '
-	append_signoff <<\EOF >actual &&
-subject
+	append_signoff <<-\EOF >actual &&
+	subject
 
-body
+	body
 
-Reviewed-id: Noone
-Tested-by: my@house
-Change-id: Ideadbeef
-Signed-off-by: C O Mitter <committer@example.com>
-Bug: 1234
-EOF
-	cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-14:Signed-off-by: C O Mitter <committer@example.com>
-EOF
-	test_cmp expected actual
+	Reviewed-id: Noone
+	Tested-by: my@house
+	Change-id: Ideadbeef
+	Signed-off-by: C O Mitter <committer@example.com>
+	Bug: 1234
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	14:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success 'format patch ignores color.ui' '
@@ -1543,46 +1549,218 @@ test_expect_success 'format patch ignores color.ui' '
 	test_cmp expect actual
 '
 
+test_expect_success 'cover letter with invalid --cover-from-description and config' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_must_fail git format-patch --cover-letter --cover-from-description garbage master &&
+	test_config format.coverFromDescription garbage &&
+	test_must_fail git format-patch --cover-letter master
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = default' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription default &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter master >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description default' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description default master >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = none' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription none &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter master >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	! grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description none' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description none master >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	! grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = message' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription message &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter master >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description message' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description message master >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = subject' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription subject &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter master >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description subject' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description subject master >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = auto (short subject line)' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription auto &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter master >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description auto (short subject line)' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description auto master >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = auto (long subject line)' '
+	test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects
+
+body" &&
+	test_config format.coverFromDescription auto &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter master >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description auto (long subject line)' '
+	test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description auto master >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with command-line --cover-from-description overrides config' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription none &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description subject master >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
 test_expect_success 'cover letter using branch description (1)' '
 	git checkout rebuild-1 &&
 	test_config branch.rebuild-1.description hello &&
 	git format-patch --stdout --cover-letter master >actual &&
-	grep hello actual >/dev/null
+	grep hello actual
 '
 
 test_expect_success 'cover letter using branch description (2)' '
 	git checkout rebuild-1 &&
 	test_config branch.rebuild-1.description hello &&
 	git format-patch --stdout --cover-letter rebuild-1~2..rebuild-1 >actual &&
-	grep hello actual >/dev/null
+	grep hello actual
 '
 
 test_expect_success 'cover letter using branch description (3)' '
 	git checkout rebuild-1 &&
 	test_config branch.rebuild-1.description hello &&
 	git format-patch --stdout --cover-letter ^master rebuild-1 >actual &&
-	grep hello actual >/dev/null
+	grep hello actual
 '
 
 test_expect_success 'cover letter using branch description (4)' '
 	git checkout rebuild-1 &&
 	test_config branch.rebuild-1.description hello &&
 	git format-patch --stdout --cover-letter master.. >actual &&
-	grep hello actual >/dev/null
+	grep hello actual
 '
 
 test_expect_success 'cover letter using branch description (5)' '
 	git checkout rebuild-1 &&
 	test_config branch.rebuild-1.description hello &&
 	git format-patch --stdout --cover-letter -2 HEAD >actual &&
-	grep hello actual >/dev/null
+	grep hello actual
 '
 
 test_expect_success 'cover letter using branch description (6)' '
 	git checkout rebuild-1 &&
 	test_config branch.rebuild-1.description hello &&
 	git format-patch --stdout --cover-letter -2 >actual &&
-	grep hello actual >/dev/null
+	grep hello actual
 '
 
 test_expect_success 'cover letter with nothing' '
@@ -1632,11 +1810,39 @@ test_expect_success 'From line has expected format' '
 	test_cmp from filtered
 '
 
+test_expect_success 'format-patch -o with no leading directories' '
+	rm -fr patches &&
+	git format-patch -o patches master..side &&
+	count=$(git rev-list --count master..side) &&
+	ls patches >list &&
+	test_line_count = $count list
+'
+
+test_expect_success 'format-patch -o with leading existing directories' '
+	rm -rf existing-dir &&
+	mkdir existing-dir &&
+	git format-patch -o existing-dir/patches master..side &&
+	count=$(git rev-list --count master..side) &&
+	ls existing-dir/patches >list &&
+	test_line_count = $count list
+'
+
+test_expect_success 'format-patch -o with leading non-existing directories' '
+	rm -rf non-existing-dir &&
+	git format-patch -o non-existing-dir/patches master..side &&
+	count=$(git rev-list --count master..side) &&
+	test_path_is_dir non-existing-dir &&
+	ls non-existing-dir/patches >list &&
+	test_line_count = $count list
+'
+
 test_expect_success 'format-patch format.outputDirectory option' '
 	test_config format.outputDirectory patches &&
 	rm -fr patches &&
 	git format-patch master..side &&
-	test $(git rev-list master..side | wc -l) -eq $(ls patches | wc -l)
+	count=$(git rev-list --count master..side) &&
+	ls patches >list &&
+	test_line_count = $count list
 '
 
 test_expect_success 'format-patch -o overrides format.outputDirectory' '
@@ -1649,20 +1855,41 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' '
 
 test_expect_success 'format-patch --base' '
 	git checkout patchid &&
-	git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual1 &&
-	git format-patch --stdout --base=HEAD~3 HEAD~.. | tail -n 7 >actual2 &&
-	echo >expected &&
-	echo "base-commit: $(git rev-parse HEAD~3)" >>expected &&
-	echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected &&
-	echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected &&
-	signature >> expected &&
-	test_cmp expected actual1 &&
-	test_cmp expected actual2 &&
+
+	git format-patch --stdout --base=HEAD~3 -1 >patch &&
+	tail -n 7 patch >actual1 &&
+
+	git format-patch --stdout --base=HEAD~3 HEAD~.. >patch &&
+	tail -n 7 patch >actual2 &&
+
+	echo >expect &&
+	git rev-parse HEAD~3 >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >>expect &&
+
+	git show --patch HEAD~2 >patch &&
+	git patch-id --stable <patch >patch.id.raw &&
+	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
+
+	git show --patch HEAD~1 >patch &&
+	git patch-id --stable <patch >patch.id.raw &&
+	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
+
+	signature >>expect &&
+	test_cmp expect actual1 &&
+	test_cmp expect actual2 &&
+
 	echo >fail &&
-	echo "base-commit: $(git rev-parse HEAD~3)" >>fail &&
-	echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --unstable | awk "{print \$1}")" >>fail &&
-	echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --unstable | awk "{print \$1}")" >>fail &&
-	signature >> fail &&
+	echo "base-commit: $(cat commit-id-base)" >>fail &&
+
+	git show --patch HEAD~2 >patch &&
+	git patch-id --unstable <patch >patch.id.raw &&
+	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
+
+	git show --patch HEAD~1 >patch &&
+	git patch-id --unstable <patch >patch.id.raw &&
+	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
+
+	signature >>fail &&
 	! test_cmp fail actual1 &&
 	! test_cmp fail actual2
 '
@@ -1672,8 +1899,9 @@ test_expect_success 'format-patch --base errors out when base commit is in revis
 	test_must_fail git format-patch --base=HEAD~1 -2 &&
 	git format-patch --stdout --base=HEAD~2 -2 >patch &&
 	grep "^base-commit:" patch >actual &&
-	echo "base-commit: $(git rev-parse HEAD~2)" >expected &&
-	test_cmp expected actual
+	git rev-parse HEAD~2 >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 '
 
 test_expect_success 'format-patch --base errors out when base commit is not ancestor of revision list' '
@@ -1699,8 +1927,8 @@ test_expect_success 'format-patch --base errors out when base commit is not ance
 	test_must_fail git format-patch --base=$(cat commit-id-Z) -3 &&
 	git format-patch --stdout --base=$(cat commit-id-base) -3 >patch &&
 	grep "^base-commit:" patch >actual &&
-	echo "base-commit: $(cat commit-id-base)" >expected &&
-	test_cmp expected actual
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 '
 
 test_expect_success 'format-patch --base=auto' '
@@ -1711,8 +1939,9 @@ test_expect_success 'format-patch --base=auto' '
 	test_commit N2 &&
 	git format-patch --stdout --base=auto -2 >patch &&
 	grep "^base-commit:" patch >actual &&
-	echo "base-commit: $(git rev-parse upstream)" >expected &&
-	test_cmp expected actual
+	git rev-parse upstream >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 '
 
 test_expect_success 'format-patch errors out when history involves criss-cross' '
@@ -1742,23 +1971,29 @@ test_expect_success 'format-patch errors out when history involves criss-cross'
 	test_must_fail 	git format-patch --base=auto -1
 '
 
-test_expect_success 'format-patch format.useAutoBaseoption' '
-	test_when_finished "git config --unset format.useAutoBase" &&
+test_expect_success 'format-patch format.useAutoBase option' '
 	git checkout local &&
-	git config format.useAutoBase true &&
+	test_config format.useAutoBase true &&
 	git format-patch --stdout -1 >patch &&
 	grep "^base-commit:" patch >actual &&
-	echo "base-commit: $(git rev-parse upstream)" >expected &&
-	test_cmp expected actual
+	git rev-parse upstream >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 '
 
 test_expect_success 'format-patch --base overrides format.useAutoBase' '
-	test_when_finished "git config --unset format.useAutoBase" &&
-	git config format.useAutoBase true &&
+	test_config format.useAutoBase true &&
 	git format-patch --stdout --base=HEAD~1 -1 >patch &&
 	grep "^base-commit:" patch >actual &&
-	echo "base-commit: $(git rev-parse HEAD~1)" >expected &&
-	test_cmp expected actual
+	git rev-parse HEAD~1 >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'format-patch --no-base overrides format.useAutoBase' '
+	test_config format.useAutoBase true &&
+	git format-patch --stdout --no-base -1 >patch &&
+	! grep "^base-commit:" patch
 '
 
 test_expect_success 'format-patch --base with --attach' '
@@ -1833,7 +2068,7 @@ test_expect_success 'interdiff: cover-letter' '
 	git format-patch --cover-letter --interdiff=boop~2 -1 boop &&
 	test_i18ngrep "^Interdiff:$" 0000-cover-letter.patch &&
 	test_i18ngrep ! "^Interdiff:$" 0001-fleep.patch &&
-	sed "1,/^@@ /d; /^-- $/q" <0000-cover-letter.patch >actual &&
+	sed "1,/^@@ /d; /^-- $/q" 0000-cover-letter.patch >actual &&
 	test_cmp expect actual
 '
 
@@ -1849,7 +2084,7 @@ test_expect_success 'interdiff: solo-patch' '
 	EOF
 	git format-patch --interdiff=boop~2 -1 boop &&
 	test_i18ngrep "^Interdiff:$" 0001-fleep.patch &&
-	sed "1,/^  @@ /d; /^$/q" <0001-fleep.patch >actual &&
+	sed "1,/^  @@ /d; /^$/q" 0001-fleep.patch >actual &&
 	test_cmp expect actual
 '
 
diff --git a/third_party/git/t/t4015-diff-whitespace.sh b/third_party/git/t/t4015-diff-whitespace.sh
index 6b087df3dcbd..88d3026894f8 100755
--- a/third_party/git/t/t4015-diff-whitespace.sh
+++ b/third_party/git/t/t4015-diff-whitespace.sh
@@ -16,6 +16,8 @@ test_expect_success "Ray Lehtiniemi's example" '
 	} while (0);
 	EOF
 	git update-index --add x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 
 	cat <<-\EOF >x &&
 	do
@@ -24,10 +26,12 @@ test_expect_success "Ray Lehtiniemi's example" '
 	}
 	while (0);
 	EOF
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-	cat <<-\EOF >expect &&
+	cat <<-EOF >expect &&
 	diff --git a/x b/x
-	index adf3937..6edc172 100644
+	index $before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,3 +1,5 @@
@@ -61,6 +65,8 @@ test_expect_success 'another test, without options' '
 	EOF
 
 	git update-index x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 
 	tr "_" " " <<-\EOF >x &&
 	_	whitespace at beginning
@@ -70,10 +76,12 @@ test_expect_success 'another test, without options' '
 	unchanged line
 	CR at end
 	EOF
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-	tr "Q_" "\015 " <<-\EOF >expect &&
+	tr "Q_" "\015 " <<-EOF >expect &&
 	diff --git a/x b/x
-	index d99af23..22d9f73 100644
+	index $before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,6 +1,6 @@
@@ -108,9 +116,9 @@ test_expect_success 'another test, without options' '
 	git diff -w --ignore-cr-at-eol >out &&
 	test_must_be_empty out &&
 
-	tr "Q_" "\015 " <<-\EOF >expect &&
+	tr "Q_" "\015 " <<-EOF >expect &&
 	diff --git a/x b/x
-	index d99af23..22d9f73 100644
+	index $before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,6 +1,6 @@
@@ -132,9 +140,9 @@ test_expect_success 'another test, without options' '
 	git diff -b --ignore-cr-at-eol >out &&
 	test_cmp expect out &&
 
-	tr "Q_" "\015 " <<-\EOF >expect &&
+	tr "Q_" "\015 " <<-EOF >expect &&
 	diff --git a/x b/x
-	index d99af23..22d9f73 100644
+	index $before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,6 +1,6 @@
@@ -154,9 +162,9 @@ test_expect_success 'another test, without options' '
 	git diff --ignore-space-at-eol --ignore-cr-at-eol >out &&
 	test_cmp expect out &&
 
-	tr "Q_" "\015 " <<-\EOF >expect &&
+	tr "Q_" "\015 " <<-EOF >expect &&
 	diff --git a/x b/x
-	index_d99af23..22d9f73 100644
+	index_$before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,6 +1,6 @@
@@ -522,13 +530,15 @@ test_expect_success 'ignore-blank-lines: mix changes and blank lines' '
 test_expect_success 'check mixed spaces and tabs in indent' '
 	# This is indented with SP HT SP.
 	echo " 	 foo();" >x &&
-	git diff --check | grep "space before tab in indent"
+	test_must_fail git diff --check >check &&
+	grep "space before tab in indent" check
 '
 
 test_expect_success 'check mixed tabs and spaces in indent' '
 	# This is indented with HT SP HT.
 	echo "	 	foo();" >x &&
-	git diff --check | grep "space before tab in indent"
+	test_must_fail git diff --check >check &&
+	grep "space before tab in indent" check
 '
 
 test_expect_success 'check with no whitespace errors' '
@@ -749,20 +759,23 @@ test_expect_success 'check tab-in-indent excluded from wildcard whitespace attri
 test_expect_success 'line numbers in --check output are correct' '
 	echo "" >x &&
 	echo "foo(); " >>x &&
-	git diff --check | grep "x:2:"
+	test_must_fail git diff --check >check &&
+	grep "x:2:" check
 '
 
 test_expect_success 'checkdiff detects new trailing blank lines (1)' '
 	echo "foo();" >x &&
 	echo "" >>x &&
-	git diff --check | grep "new blank line"
+	test_must_fail git diff --check >check &&
+	grep "new blank line" check
 '
 
 test_expect_success 'checkdiff detects new trailing blank lines (2)' '
-	{ echo a; echo b; echo; echo; } >x &&
+	test_write_lines a b "" "" >x &&
 	git add x &&
-	{ echo a; echo; echo; echo; echo; } >x &&
-	git diff --check | grep "new blank line"
+	test_write_lines a "" "" "" "" >x &&
+	test_must_fail git diff --check >check &&
+	grep "new blank line" check
 '
 
 test_expect_success 'checkdiff allows new blank lines' '
@@ -786,23 +799,27 @@ test_expect_success 'whitespace-only changes not reported' '
 	test_must_be_empty actual
 '
 
-cat <<EOF >expect
-diff --git a/x b/z
-similarity index NUM%
-rename from x
-rename to z
-index 380c32a..a97b785 100644
-EOF
 test_expect_success 'whitespace-only changes reported across renames' '
 	git reset --hard &&
 	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
 	git add x &&
+	hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$hash_x") &&
 	git commit -m "base" &&
 	sed -e "5s/^/ /" x >z &&
 	git rm x &&
 	git add z &&
-	git diff -w -M --cached |
-	sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" >actual &&
+	hash_z=$(git hash-object z) &&
+	after=$(git rev-parse --short "$hash_z") &&
+	git diff -w -M --cached >actual.raw &&
+	sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" actual.raw >actual &&
+	cat <<-EOF >expect &&
+	diff --git a/x b/z
+	similarity index NUM%
+	rename from x
+	rename to z
+	index $before..$after 100644
+	EOF
 	test_cmp expect actual
 '
 
@@ -834,7 +851,8 @@ test_expect_success 'combined diff with autocrlf conversion' '
 	git config core.autocrlf true &&
 	test_must_fail git merge master &&
 
-	git diff | sed -e "1,/^@@@/d" >actual &&
+	git diff >actual.raw &&
+	sed -e "1,/^@@@/d" actual.raw >actual &&
 	! grep "^-" actual
 
 '
@@ -858,13 +876,18 @@ test_expect_success 'diff that introduces a line with only tabs' '
 	git config core.whitespace blank-at-eol &&
 	git reset --hard &&
 	echo "test" >x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 	git commit -m "initial" x &&
 	echo "{NTN}" | tr "NT" "\n\t" >>x &&
-	git diff --color | test_decode_color >current &&
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
+	git diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 
-	cat >expected <<-\EOF &&
+	cat >expected <<-EOF &&
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index 9daeafb..2874b91 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1 +1,4 @@<RESET>
@@ -883,19 +906,23 @@ test_expect_success 'diff that introduces and removes ws breakages' '
 		echo "0. blank-at-eol " &&
 		echo "1. blank-at-eol "
 	} >x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 	git commit -a --allow-empty -m preimage &&
 	{
 		echo "0. blank-at-eol " &&
 		echo "1. still-blank-at-eol " &&
 		echo "2. and a new line "
 	} >x &&
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-	git diff --color |
-	test_decode_color >current &&
+	git diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 
-	cat >expected <<-\EOF &&
+	cat >expected <<-EOF &&
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index d0233a2..700886e 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1,2 +1,3 @@<RESET>
@@ -915,16 +942,20 @@ test_expect_success 'ws-error-highlight test setup' '
 		echo "0. blank-at-eol " &&
 		echo "1. blank-at-eol "
 	} >x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 	git commit -a --allow-empty -m preimage &&
 	{
 		echo "0. blank-at-eol " &&
 		echo "1. still-blank-at-eol " &&
 		echo "2. and a new line "
 	} >x &&
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-	cat >expect.default-old <<-\EOF &&
+	cat >expect.default-old <<-EOF &&
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index d0233a2..700886e 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1,2 +1,3 @@<RESET>
@@ -934,9 +965,9 @@ test_expect_success 'ws-error-highlight test setup' '
 	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
 	EOF
 
-	cat >expect.all <<-\EOF &&
+	cat >expect.all <<-EOF &&
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index d0233a2..700886e 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1,2 +1,3 @@<RESET>
@@ -946,9 +977,9 @@ test_expect_success 'ws-error-highlight test setup' '
 	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
 	EOF
 
-	cat >expect.none <<-\EOF
+	cat >expect.none <<-EOF
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index d0233a2..700886e 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1,2 +1,3 @@<RESET>
@@ -962,32 +993,32 @@ test_expect_success 'ws-error-highlight test setup' '
 
 test_expect_success 'test --ws-error-highlight option' '
 
-	git diff --color --ws-error-highlight=default,old |
-	test_decode_color >current &&
+	git diff --color --ws-error-highlight=default,old >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.default-old current &&
 
-	git diff --color --ws-error-highlight=all |
-	test_decode_color >current &&
+	git diff --color --ws-error-highlight=all >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.all current &&
 
-	git diff --color --ws-error-highlight=none |
-	test_decode_color >current &&
+	git diff --color --ws-error-highlight=none >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.none current
 
 '
 
 test_expect_success 'test diff.wsErrorHighlight config' '
 
-	git -c diff.wsErrorHighlight=default,old diff --color |
-	test_decode_color >current &&
+	git -c diff.wsErrorHighlight=default,old diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.default-old current &&
 
-	git -c diff.wsErrorHighlight=all diff --color |
-	test_decode_color >current &&
+	git -c diff.wsErrorHighlight=all diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.all current &&
 
-	git -c diff.wsErrorHighlight=none diff --color |
-	test_decode_color >current &&
+	git -c diff.wsErrorHighlight=none diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.none current
 
 '
@@ -995,18 +1026,18 @@ test_expect_success 'test diff.wsErrorHighlight config' '
 test_expect_success 'option overrides diff.wsErrorHighlight' '
 
 	git -c diff.wsErrorHighlight=none \
-		diff --color --ws-error-highlight=default,old |
-	test_decode_color >current &&
+		diff --color --ws-error-highlight=default,old >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.default-old current &&
 
 	git -c diff.wsErrorHighlight=default \
-		diff --color --ws-error-highlight=all |
-	test_decode_color >current &&
+		diff --color --ws-error-highlight=all >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.all current &&
 
 	git -c diff.wsErrorHighlight=all \
-		diff --color --ws-error-highlight=none |
-	test_decode_color >current &&
+		diff --color --ws-error-highlight=none >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.none current
 
 '
@@ -1022,14 +1053,16 @@ test_expect_success 'detect moved code, complete file' '
 	EOF
 	git add test.c &&
 	git commit -m "add main function" &&
+	file=$(git rev-parse --short HEAD:test.c) &&
 	git mv test.c main.c &&
 	test_config color.diff.oldMoved "normal red" &&
 	test_config color.diff.newMoved "normal green" &&
-	git diff HEAD --color-moved=zebra --color --no-renames | test_decode_color >actual &&
-	cat >expected <<-\EOF &&
+	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat >expected <<-EOF &&
 	<BOLD>diff --git a/main.c b/main.c<RESET>
 	<BOLD>new file mode 100644<RESET>
-	<BOLD>index 0000000..a986c57<RESET>
+	<BOLD>index 0000000..$file<RESET>
 	<BOLD>--- /dev/null<RESET>
 	<BOLD>+++ b/main.c<RESET>
 	<CYAN>@@ -0,0 +1,5 @@<RESET>
@@ -1040,7 +1073,7 @@ test_expect_success 'detect moved code, complete file' '
 	<BGREEN>+<RESET><BGREEN>}<RESET>
 	<BOLD>diff --git a/test.c b/test.c<RESET>
 	<BOLD>deleted file mode 100644<RESET>
-	<BOLD>index a986c57..0000000<RESET>
+	<BOLD>index $file..0000000<RESET>
 	<BOLD>--- a/test.c<RESET>
 	<BOLD>+++ /dev/null<RESET>
 	<CYAN>@@ -1,5 +0,0 @@<RESET>
@@ -1094,6 +1127,8 @@ test_expect_success 'detect malicious moved code, inside file' '
 	EOF
 	git add main.c test.c &&
 	git commit -m "add main and test file" &&
+	before_main=$(git rev-parse --short HEAD:main.c) &&
+	before_test=$(git rev-parse --short HEAD:test.c) &&
 	cat <<-\EOF >main.c &&
 		#include<stdio.h>
 		int stuff()
@@ -1126,10 +1161,15 @@ test_expect_success 'detect malicious moved code, inside file' '
 			bar();
 		}
 	EOF
-	git diff HEAD --no-renames --color-moved=zebra --color | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
+	hash_main=$(git hash-object main.c) &&
+	after_main=$(git rev-parse --short "$hash_main") &&
+	hash_test=$(git hash-object test.c) &&
+	after_test=$(git rev-parse --short "$hash_test") &&
+	git diff HEAD --no-renames --color-moved=zebra --color >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat <<-EOF >expected &&
 	<BOLD>diff --git a/main.c b/main.c<RESET>
-	<BOLD>index 27a619c..7cf9336 100644<RESET>
+	<BOLD>index $before_main..$after_main 100644<RESET>
 	<BOLD>--- a/main.c<RESET>
 	<BOLD>+++ b/main.c<RESET>
 	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
@@ -1147,7 +1187,7 @@ test_expect_success 'detect malicious moved code, inside file' '
 	 {<RESET>
 	 foo();<RESET>
 	<BOLD>diff --git a/test.c b/test.c<RESET>
-	<BOLD>index 1dc1d85..2bedec9 100644<RESET>
+	<BOLD>index $before_test..$after_test 100644<RESET>
 	<BOLD>--- a/test.c<RESET>
 	<BOLD>+++ b/test.c<RESET>
 	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
@@ -1175,10 +1215,11 @@ test_expect_success 'plain moved code, inside file' '
 	test_config color.diff.oldMovedAlternative "blue" &&
 	test_config color.diff.newMovedAlternative "yellow" &&
 	# needs previous test as setup
-	git diff HEAD --no-renames --color-moved=plain --color | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
+	git diff HEAD --no-renames --color-moved=plain --color >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat <<-EOF >expected &&
 	<BOLD>diff --git a/main.c b/main.c<RESET>
-	<BOLD>index 27a619c..7cf9336 100644<RESET>
+	<BOLD>index $before_main..$after_main 100644<RESET>
 	<BOLD>--- a/main.c<RESET>
 	<BOLD>+++ b/main.c<RESET>
 	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
@@ -1196,7 +1237,7 @@ test_expect_success 'plain moved code, inside file' '
 	 {<RESET>
 	 foo();<RESET>
 	<BOLD>diff --git a/test.c b/test.c<RESET>
-	<BOLD>index 1dc1d85..2bedec9 100644<RESET>
+	<BOLD>index $before_test..$after_test 100644<RESET>
 	<BOLD>--- a/test.c<RESET>
 	<BOLD>+++ b/test.c<RESET>
 	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
@@ -1754,7 +1795,8 @@ test_expect_success 'move detection with submodules' '
 	! grep BRED decoded_actual &&
 
 	# nor did we mess with it another way
-	git diff --submodule=diff --color | test_decode_color >expect &&
+	git diff --submodule=diff --color >expect.raw &&
+	test_decode_color <expect.raw >expect &&
 	test_cmp expect decoded_actual &&
 	rm -rf bananas &&
 	git submodule deinit bananas
@@ -2008,11 +2050,6 @@ test_expect_success 'compare mixed whitespace delta across moved blocks' '
 	test_cmp expected actual
 '
 
-# Note that the "6" in the expected hunk header below is funny, since we only
-# show 5 lines (the missing one was blank and thus ignored). This is how
-# --ignore-blank-lines behaves even without --function-context, and this test
-# is just checking the interaction of the two features. Don't take it as an
-# endorsement of that output.
 test_expect_success 'combine --ignore-blank-lines with --function-context' '
 	test_write_lines 1 "" 2 3 4 5 >a &&
 	test_write_lines 1    2 3 4   >b &&
@@ -2022,6 +2059,7 @@ test_expect_success 'combine --ignore-blank-lines with --function-context' '
 	cat <<-\EOF >expect &&
 	@@ -1,6 +1,4 @@
 	 1
+	-
 	 2
 	 3
 	 4
@@ -2030,4 +2068,27 @@ test_expect_success 'combine --ignore-blank-lines with --function-context' '
 	test_cmp expect actual
 '
 
+test_expect_success 'combine --ignore-blank-lines with --function-context 2' '
+	test_write_lines    a b c "" function 1 2 3 4 5 "" 6 7 8 9 >a &&
+	test_write_lines "" a b c "" function 1 2 3 4 5    6 7 8   >b &&
+	test_must_fail git diff --no-index \
+		--ignore-blank-lines --function-context a b >actual.raw &&
+	sed -n "/@@/,\$p" <actual.raw >actual &&
+	cat <<-\EOF >expect &&
+	@@ -5,11 +6,9 @@ c
+	 function
+	 1
+	 2
+	 3
+	 4
+	 5
+	-
+	 6
+	 7
+	 8
+	-9
+	EOF
+	test_cmp expect actual
+'
+
 test_done
diff --git a/third_party/git/t/t4018-diff-funcname.sh b/third_party/git/t/t4018-diff-funcname.sh
index 9261d6d3a000..02255a08bf17 100755
--- a/third_party/git/t/t4018-diff-funcname.sh
+++ b/third_party/git/t/t4018-diff-funcname.sh
@@ -31,6 +31,8 @@ diffpatterns="
 	cpp
 	csharp
 	css
+	dts
+	elixir
 	fortran
 	fountain
 	golang
@@ -104,7 +106,6 @@ do
 		result=success
 	fi
 	test_expect_$result "hunk header: $i" "
-		test_when_finished 'cat actual' &&	# for debugging only
 		git diff -U1 $i >actual &&
 		grep '@@ .* @@.*RIGHT' actual
 	"
diff --git a/third_party/git/t/t4018/dts-labels b/third_party/git/t/t4018/dts-labels
new file mode 100644
index 000000000000..b21ef8737bb8
--- /dev/null
+++ b/third_party/git/t/t4018/dts-labels
@@ -0,0 +1,9 @@
+/ {
+	label_1: node1@ff00 {
+		label2: RIGHT {
+			vendor,some-property;
+
+			ChangeMe = <0x45-30>;
+		};
+	};
+};
diff --git a/third_party/git/t/t4018/dts-node-unitless b/third_party/git/t/t4018/dts-node-unitless
new file mode 100644
index 000000000000..c5287d91416e
--- /dev/null
+++ b/third_party/git/t/t4018/dts-node-unitless
@@ -0,0 +1,8 @@
+/ {
+	label_1: node1 {
+		RIGHT {
+			prop-array = <1>, <4>;
+			ChangeMe = <0xffeedd00>;
+		};
+	};
+};
diff --git a/third_party/git/t/t4018/dts-nodes b/third_party/git/t/t4018/dts-nodes
new file mode 100644
index 000000000000..5a4334bb1645
--- /dev/null
+++ b/third_party/git/t/t4018/dts-nodes
@@ -0,0 +1,8 @@
+/ {
+	label_1: node1@ff00 {
+		RIGHT@deadf00,4000 {
+			#size-cells = <1>;
+			ChangeMe = <0xffeedd00>;
+		};
+	};
+};
diff --git a/third_party/git/t/t4018/dts-nodes-boolean-prop b/third_party/git/t/t4018/dts-nodes-boolean-prop
new file mode 100644
index 000000000000..afc6b5b404e4
--- /dev/null
+++ b/third_party/git/t/t4018/dts-nodes-boolean-prop
@@ -0,0 +1,9 @@
+/ {
+	label_1: node1@ff00 {
+		RIGHT@deadf00,4000 {
+			boolean-prop1;
+
+			ChangeMe;
+		};
+	};
+};
diff --git a/third_party/git/t/t4018/dts-nodes-comment1 b/third_party/git/t/t4018/dts-nodes-comment1
new file mode 100644
index 000000000000..559dfce9b308
--- /dev/null
+++ b/third_party/git/t/t4018/dts-nodes-comment1
@@ -0,0 +1,8 @@
+/ {
+	label_1: node1@ff00 {
+		RIGHT@deadf00,4000 /* &a comment */ {
+			#size-cells = <1>;
+			ChangeMe = <0xffeedd00>;
+		};
+	};
+};
diff --git a/third_party/git/t/t4018/dts-nodes-comment2 b/third_party/git/t/t4018/dts-nodes-comment2
new file mode 100644
index 000000000000..27e9718b31cf
--- /dev/null
+++ b/third_party/git/t/t4018/dts-nodes-comment2
@@ -0,0 +1,8 @@
+/ {
+	label_1: node1@ff00 {
+		RIGHT@deadf00,4000 { /* a trailing comment */ 
+			#size-cells = <1>;
+			ChangeMe = <0xffeedd00>;
+		};
+	};
+};
diff --git a/third_party/git/t/t4018/dts-nodes-multiline-prop b/third_party/git/t/t4018/dts-nodes-multiline-prop
new file mode 100644
index 000000000000..072d58b69dc2
--- /dev/null
+++ b/third_party/git/t/t4018/dts-nodes-multiline-prop
@@ -0,0 +1,13 @@
+/ {
+	label_1: node1@ff00 {
+		RIGHT@deadf00,4000 {
+			multilineprop = <3>,
+					<4>,
+					<5>,
+					<6>,
+					<7>;
+
+			ChangeMe = <0xffeedd00>;
+		};
+	};
+};
diff --git a/third_party/git/t/t4018/dts-reference b/third_party/git/t/t4018/dts-reference
new file mode 100644
index 000000000000..8f0c87d8637f
--- /dev/null
+++ b/third_party/git/t/t4018/dts-reference
@@ -0,0 +1,9 @@
+&label_1 {
+	TEST = <455>;
+};
+
+&RIGHT {
+	vendor,some-property;
+
+	ChangeMe = <0x45-30>;
+};
diff --git a/third_party/git/t/t4018/dts-root b/third_party/git/t/t4018/dts-root
new file mode 100644
index 000000000000..4353b8220c91
--- /dev/null
+++ b/third_party/git/t/t4018/dts-root
@@ -0,0 +1,5 @@
+/ { RIGHT /* Technically just supposed to be a slash and brace */
+	#size-cells = <1>;
+
+	ChangeMe = <0xffeedd00>;
+};
diff --git a/third_party/git/t/t4018/dts-root-comment b/third_party/git/t/t4018/dts-root-comment
new file mode 100644
index 000000000000..333a625c7007
--- /dev/null
+++ b/third_party/git/t/t4018/dts-root-comment
@@ -0,0 +1,8 @@
+/ { RIGHT /* Technically just supposed to be a slash and brace */
+	#size-cells = <1>;
+
+	/* This comment should be ignored */
+
+	some-property = <40+2>;
+	ChangeMe = <0xffeedd00>;
+};
diff --git a/third_party/git/t/t4018/elixir-do-not-pick-end b/third_party/git/t/t4018/elixir-do-not-pick-end
new file mode 100644
index 000000000000..fae08ba7e8cb
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-do-not-pick-end
@@ -0,0 +1,5 @@
+defmodule RIGHT do
+end
+#
+#
+# ChangeMe; do not pick up 'end' line
diff --git a/third_party/git/t/t4018/elixir-ex-unit-test b/third_party/git/t/t4018/elixir-ex-unit-test
new file mode 100644
index 000000000000..0560a2b69718
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-ex-unit-test
@@ -0,0 +1,6 @@
+defmodule Test do
+  test "RIGHT" do
+    assert true == true
+    assert ChangeMe
+  end
+end
diff --git a/third_party/git/t/t4018/elixir-function b/third_party/git/t/t4018/elixir-function
new file mode 100644
index 000000000000..d452f495a7e0
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-function
@@ -0,0 +1,5 @@
+def function(RIGHT, arg) do
+  # comment
+  # comment
+  ChangeMe
+end
diff --git a/third_party/git/t/t4018/elixir-macro b/third_party/git/t/t4018/elixir-macro
new file mode 100644
index 000000000000..4f925e9ad463
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-macro
@@ -0,0 +1,5 @@
+defmacro foo(RIGHT) do
+  # Code
+  # Code
+  ChangeMe
+end
diff --git a/third_party/git/t/t4018/elixir-module b/third_party/git/t/t4018/elixir-module
new file mode 100644
index 000000000000..91a4e7aa2000
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-module
@@ -0,0 +1,9 @@
+defmodule RIGHT do
+  @moduledoc """
+  Foo bar
+  """
+
+  def ChangeMe(a) where is_map(a) do
+    a
+  end
+end
diff --git a/third_party/git/t/t4018/elixir-module-func b/third_party/git/t/t4018/elixir-module-func
new file mode 100644
index 000000000000..c9910d067513
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-module-func
@@ -0,0 +1,8 @@
+defmodule Foo do
+  def fun(RIGHT) do
+     # Code
+     # Code
+     # Code
+     ChangeMe
+  end
+end
diff --git a/third_party/git/t/t4018/elixir-nested-module b/third_party/git/t/t4018/elixir-nested-module
new file mode 100644
index 000000000000..771ebc5c42a9
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-nested-module
@@ -0,0 +1,9 @@
+defmodule MyApp.RIGHT do
+  @moduledoc """
+  Foo bar
+  """
+
+  def ChangeMe(a) where is_map(a) do
+    a
+  end
+end
diff --git a/third_party/git/t/t4018/elixir-private-function b/third_party/git/t/t4018/elixir-private-function
new file mode 100644
index 000000000000..1aabe33b7a9a
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-private-function
@@ -0,0 +1,5 @@
+defp function(RIGHT, arg) do
+  # comment
+  # comment
+  ChangeMe
+end
diff --git a/third_party/git/t/t4018/elixir-protocol b/third_party/git/t/t4018/elixir-protocol
new file mode 100644
index 000000000000..7d9173691e32
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-protocol
@@ -0,0 +1,6 @@
+defprotocol RIGHT do
+  @doc """
+  Calculates the size (and not the length!) of a data structure
+  """
+  def size(data, ChangeMe)
+end
diff --git a/third_party/git/t/t4018/elixir-protocol-implementation b/third_party/git/t/t4018/elixir-protocol-implementation
new file mode 100644
index 000000000000..f9234bbfc489
--- /dev/null
+++ b/third_party/git/t/t4018/elixir-protocol-implementation
@@ -0,0 +1,5 @@
+defimpl RIGHT do
+  # Docs
+  # Docs
+  def foo(ChangeMe), do: :ok
+end
diff --git a/third_party/git/t/t4018/python-async-def b/third_party/git/t/t4018/python-async-def
new file mode 100644
index 000000000000..87640e03d213
--- /dev/null
+++ b/third_party/git/t/t4018/python-async-def
@@ -0,0 +1,4 @@
+async def RIGHT(pi: int = 3.14):
+    while True:
+        break
+    return ChangeMe()
diff --git a/third_party/git/t/t4018/python-class b/third_party/git/t/t4018/python-class
new file mode 100644
index 000000000000..ba9e741430f2
--- /dev/null
+++ b/third_party/git/t/t4018/python-class
@@ -0,0 +1,4 @@
+class RIGHT(int, str):
+    # comment
+    # another comment
+    # ChangeMe
diff --git a/third_party/git/t/t4018/python-def b/third_party/git/t/t4018/python-def
new file mode 100644
index 000000000000..e50b31b0ad5e
--- /dev/null
+++ b/third_party/git/t/t4018/python-def
@@ -0,0 +1,4 @@
+def RIGHT(pi: int = 3.14):
+    while True:
+        break
+    return ChangeMe()
diff --git a/third_party/git/t/t4018/python-indented-async-def b/third_party/git/t/t4018/python-indented-async-def
new file mode 100644
index 000000000000..f5d03258af4d
--- /dev/null
+++ b/third_party/git/t/t4018/python-indented-async-def
@@ -0,0 +1,7 @@
+class Foo:
+    async def RIGHT(self, x: int):
+        return [
+            1,
+            2,
+            ChangeMe,
+        ]
diff --git a/third_party/git/t/t4018/python-indented-class b/third_party/git/t/t4018/python-indented-class
new file mode 100644
index 000000000000..19b4f35c4ca1
--- /dev/null
+++ b/third_party/git/t/t4018/python-indented-class
@@ -0,0 +1,5 @@
+if TYPE_CHECKING:
+    class RIGHT:
+        # comment
+        # another comment
+        # ChangeMe
diff --git a/third_party/git/t/t4018/python-indented-def b/third_party/git/t/t4018/python-indented-def
new file mode 100644
index 000000000000..208fbadd2be6
--- /dev/null
+++ b/third_party/git/t/t4018/python-indented-def
@@ -0,0 +1,7 @@
+class Foo:
+    def RIGHT(self, x: int):
+        return [
+            1,
+            2,
+            ChangeMe,
+        ]
diff --git a/third_party/git/t/t4026-color.sh b/third_party/git/t/t4026-color.sh
index 671e951ee549..c0b642c1ab03 100755
--- a/third_party/git/t/t4026-color.sh
+++ b/third_party/git/t/t4026-color.sh
@@ -30,6 +30,14 @@ test_expect_success 'attribute before color name' '
 	color "bold red" "[1;31m"
 '
 
+test_expect_success 'aixterm bright fg color' '
+	color "brightred" "[91m"
+'
+
+test_expect_success 'aixterm bright bg color' '
+	color "green brightblue" "[32;104m"
+'
+
 test_expect_success 'color name before attribute' '
 	color "red bold" "[1;31m"
 '
@@ -74,6 +82,10 @@ test_expect_success '0-7 are aliases for basic ANSI color names' '
 	color "0 7" "[30;47m"
 '
 
+test_expect_success '8-15 are aliases for aixterm color names' '
+	color "12 13" "[94;105m"
+'
+
 test_expect_success '256 colors' '
 	color "254 bold 255" "[1;38;5;254;48;5;255m"
 '
diff --git a/third_party/git/t/t4027-diff-submodule.sh b/third_party/git/t/t4027-diff-submodule.sh
index 9aa8e2b39b45..e29deaf4a509 100755
--- a/third_party/git/t/t4027-diff-submodule.sh
+++ b/third_party/git/t/t4027-diff-submodule.sh
@@ -6,6 +6,7 @@ test_description='difference in submodules'
 . "$TEST_DIRECTORY"/diff-lib.sh
 
 test_expect_success setup '
+	test_oid_init &&
 	test_tick &&
 	test_create_repo sub &&
 	(
@@ -36,7 +37,8 @@ test_expect_success setup '
 '
 
 test_expect_success 'git diff --raw HEAD' '
-	git diff --raw --abbrev=40 HEAD >actual &&
+	hexsz=$(test_oid hexsz) &&
+	git diff --raw --abbrev=$hexsz HEAD >actual &&
 	test_cmp expect actual
 '
 
@@ -245,23 +247,21 @@ test_expect_success 'git diff (empty submodule dir)' '
 '
 
 test_expect_success 'conflicted submodule setup' '
-
-	# 39 efs
-	c=fffffffffffffffffffffffffffffffffffffff &&
+	c=$(test_oid ff_1) &&
 	(
 		echo "000000 $ZERO_OID 0	sub" &&
 		echo "160000 1$c 1	sub" &&
 		echo "160000 2$c 2	sub" &&
 		echo "160000 3$c 3	sub"
 	) | git update-index --index-info &&
-	echo >expect.nosub '\''diff --cc sub
+	echo >expect.nosub "diff --cc sub
 index 2ffffff,3ffffff..0000000
 --- a/sub
 +++ b/sub
 @@@ -1,1 -1,1 +1,1 @@@
-- Subproject commit 2fffffffffffffffffffffffffffffffffffffff
- -Subproject commit 3fffffffffffffffffffffffffffffffffffffff
-++Subproject commit 0000000000000000000000000000000000000000'\'' &&
+- Subproject commit 2$c
+ -Subproject commit 3$c
+++Subproject commit $ZERO_OID" &&
 
 	hh=$(git rev-parse HEAD) &&
 	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
diff --git a/third_party/git/t/t4034-diff-words.sh b/third_party/git/t/t4034-diff-words.sh
index 912df91226f2..fb145aa173ee 100755
--- a/third_party/git/t/t4034-diff-words.sh
+++ b/third_party/git/t/t4034-diff-words.sh
@@ -19,9 +19,11 @@ cat >post.simple <<-\EOF
 
 	aeff = aeff * ( aaa )
 EOF
-cat >expect.letter-runs-are-words <<-\EOF
+pre=$(git rev-parse --short $(git hash-object pre.simple))
+post=$(git rev-parse --short $(git hash-object post.simple))
+cat >expect.letter-runs-are-words <<-EOF
 	<BOLD>diff --git a/pre b/post<RESET>
-	<BOLD>index 330b04f..5ed8eff 100644<RESET>
+	<BOLD>index $pre..$post 100644<RESET>
 	<BOLD>--- a/pre<RESET>
 	<BOLD>+++ b/post<RESET>
 	<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -33,9 +35,9 @@ cat >expect.letter-runs-are-words <<-\EOF
 
 	<GREEN>aeff = aeff * ( aaa<RESET> )
 EOF
-cat >expect.non-whitespace-is-word <<-\EOF
+cat >expect.non-whitespace-is-word <<-EOF
 	<BOLD>diff --git a/pre b/post<RESET>
-	<BOLD>index 330b04f..5ed8eff 100644<RESET>
+	<BOLD>index $pre..$post 100644<RESET>
 	<BOLD>--- a/pre<RESET>
 	<BOLD>+++ b/post<RESET>
 	<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -49,9 +51,12 @@ cat >expect.non-whitespace-is-word <<-\EOF
 EOF
 
 word_diff () {
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
 	test_must_fail git diff --no-index "$@" pre post >output &&
 	test_decode_color <output >output.decrypted &&
-	test_cmp expect output.decrypted
+	sed -e "2s/index [^ ]*/index $pre..$post/" expect >expected
+	test_cmp expected output.decrypted
 }
 
 test_language_driver () {
@@ -77,9 +82,9 @@ test_expect_success 'set up pre and post with runs of whitespace' '
 '
 
 test_expect_success 'word diff with runs of whitespace' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -97,9 +102,9 @@ test_expect_success 'word diff with runs of whitespace' '
 '
 
 test_expect_success '--word-diff=porcelain' '
-	sed 's/#.*$//' >expect <<-\EOF &&
+	sed 's/#.*$//' >expect <<-EOF &&
 		diff --git a/pre b/post
-		index 330b04f..5ed8eff 100644
+		index $pre..$post 100644
 		--- a/pre
 		+++ b/post
 		@@ -1,3 +1,7 @@
@@ -121,9 +126,9 @@ test_expect_success '--word-diff=porcelain' '
 '
 
 test_expect_success '--word-diff=plain' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		diff --git a/pre b/post
-		index 330b04f..5ed8eff 100644
+		index $pre..$post 100644
 		--- a/pre
 		+++ b/post
 		@@ -1,3 +1,7 @@
@@ -140,9 +145,9 @@ test_expect_success '--word-diff=plain' '
 '
 
 test_expect_success '--word-diff=plain --color' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -158,9 +163,9 @@ test_expect_success '--word-diff=plain --color' '
 '
 
 test_expect_success 'word diff without context' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1 +1 @@<RESET>
@@ -207,9 +212,9 @@ test_expect_success 'command-line overrides config' '
 '
 
 test_expect_success 'command-line overrides config: --word-diff-regex' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -234,9 +239,9 @@ test_expect_success 'setup: remove diff driver regex' '
 '
 
 test_expect_success 'use configured regex' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -254,9 +259,11 @@ test_expect_success 'use configured regex' '
 test_expect_success 'test parsing words for newline' '
 	echo "aaa (aaa)" >pre &&
 	echo "aaa (aaa) aaa" >post &&
-	cat >expect <<-\EOF &&
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index c29453b..be22f37 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1 +1 @@<RESET>
@@ -268,9 +275,11 @@ test_expect_success 'test parsing words for newline' '
 test_expect_success 'test when words are only removed at the end' '
 	echo "(:" >pre &&
 	echo "(" >post &&
-	cat >expect <<-\EOF &&
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 289cb9d..2d06f37 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1 +1 @@<RESET>
@@ -282,9 +291,11 @@ test_expect_success 'test when words are only removed at the end' '
 test_expect_success '--word-diff=none' '
 	echo "(:" >pre &&
 	echo "(" >post &&
-	cat >expect <<-\EOF &&
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
 		diff --git a/pre b/post
-		index 289cb9d..2d06f37 100644
+		index $pre..$post 100644
 		--- a/pre
 		+++ b/post
 		@@ -1 +1 @@
@@ -303,6 +314,7 @@ test_language_driver bibtex
 test_language_driver cpp
 test_language_driver csharp
 test_language_driver css
+test_language_driver dts
 test_language_driver fortran
 test_language_driver html
 test_language_driver java
@@ -316,16 +328,6 @@ test_language_driver ruby
 test_language_driver tex
 
 test_expect_success 'word-diff with diff.sbe' '
-	cat >expect <<-\EOF &&
-	diff --git a/pre b/post
-	index a1a53b5..bc8fe6d 100644
-	--- a/pre
-	+++ b/post
-	@@ -1,3 +1,3 @@
-	a
-
-	[-b-]{+c+}
-	EOF
 	cat >pre <<-\EOF &&
 	a
 
@@ -336,21 +338,35 @@ test_expect_success 'word-diff with diff.sbe' '
 
 	c
 	EOF
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
+	diff --git a/pre b/post
+	index $pre..$post 100644
+	--- a/pre
+	+++ b/post
+	@@ -1,3 +1,3 @@
+	a
+
+	[-b-]{+c+}
+	EOF
 	test_config diff.suppress-blank-empty true &&
 	word_diff --word-diff=plain
 '
 
 test_expect_success 'word-diff with no newline at EOF' '
-	cat >expect <<-\EOF &&
+	printf "%s" "a a a a a" >pre &&
+	printf "%s" "a a ab a a" >post &&
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
 	diff --git a/pre b/post
-	index 7bf316e..3dd0303 100644
+	index $pre..$post 100644
 	--- a/pre
 	+++ b/post
 	@@ -1 +1 @@
 	a a [-a-]{+ab+} a a
 	EOF
-	printf "%s" "a a a a a" >pre &&
-	printf "%s" "a a ab a a" >post &&
 	word_diff --word-diff=plain
 '
 
diff --git a/third_party/git/t/t4034/dts/expect b/third_party/git/t/t4034/dts/expect
new file mode 100644
index 000000000000..560fc9918476
--- /dev/null
+++ b/third_party/git/t/t4034/dts/expect
@@ -0,0 +1,37 @@
+<BOLD>diff --git a/pre b/post<RESET>
+<BOLD>index b6a9051..7803aee 100644<RESET>
+<BOLD>--- a/pre<RESET>
+<BOLD>+++ b/post<RESET>
+<CYAN>@@ -1,32 +1,32 @@<RESET>
+/ {<RESET>
+	<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>: <RED>node<RESET><GREEN>new-node<RESET>@<RED>f00<RESET><GREEN>eeda<RESET> {
+		compatible = "<RED>mydev<RESET><GREEN>vendor,compat<RESET>";
+		string-prop = <RED>start<RESET><GREEN>end<RESET>: "hello <RED>world!<RESET><GREEN>world?<RESET>" <RED>end<RESET><GREEN>start<RESET>: ;
+		<RED>#size-cells<RESET><GREEN>#address-cells<RESET> = <<RED>0+0<RESET><GREEN>0+40<RESET>>;
+		reg = <<RED>0xf00<RESET><GREEN>0xeeda<RESET>>;
+		prop = <<GREEN>(<RESET>1<GREEN>)<RESET>>;
+		prop = <<GREEN>(<RESET>-1e10<GREEN>)<RESET>>;
+		prop = <(!<RED>3<RESET><GREEN>1<RESET>)>;
+		prop = <(~<RED>3<RESET><GREEN>1<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>/<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>%<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3+4<RESET><GREEN>1+2<RESET>)>;
+		prop = <(<RED>3-4<RESET><GREEN>1-2<RESET>)>;
+		prop = /bits/ <RED>64<RESET><GREEN>32<RESET> <(<RED>3<RESET><GREEN>1<RESET><<<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>>><RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>^<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>|<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>&&<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>3<RESET><GREEN>1<RESET>||<RED>4<RESET><GREEN>2<RESET>)>;
+		prop = <(<RED>4?5<RESET><GREEN>1?2<RESET>:3)>;
+		list = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>, <0 0 0 <RED>0<RESET><GREEN>1<RESET>>;
+	};<RESET>
+
+	&<RED>phandle<RESET><GREEN>phandle2<RESET> {
+		<RED>pre-phandle<RESET><GREEN>prop_handle<RESET> = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>;
+	};<RESET>
+};<RESET>
diff --git a/third_party/git/t/t4034/dts/post b/third_party/git/t/t4034/dts/post
new file mode 100644
index 000000000000..7803aee28093
--- /dev/null
+++ b/third_party/git/t/t4034/dts/post
@@ -0,0 +1,32 @@
+/ {
+	HANDLE_2: new-node@eeda {
+		compatible = "vendor,compat";
+		string-prop = end: "hello world?" start: ;
+		#address-cells = <0+40>;
+		reg = <0xeeda>;
+		prop = <(1)>;
+		prop = <(-1e10)>;
+		prop = <(!1)>;
+		prop = <(~1)>;
+		prop = <(1*2)>;
+		prop = <(1&2)>;
+		prop = <(1*2)>;
+		prop = <(1/2)>;
+		prop = <(1%2)>;
+		prop = <(1+2)>;
+		prop = <(1-2)>;
+		prop = /bits/ 32 <(1<<2)>;
+		prop = <(1>>2)>;
+		prop = <(1&2)>;
+		prop = <(1^2)>;
+		prop = <(1|2)>;
+		prop = <(1&&2)>;
+		prop = <(1||2)>;
+		prop = <(1?2:3)>;
+		list = <&HANDLE_2>, <0 0 0 1>;
+	};
+
+	&phandle2 {
+		prop_handle = <&HANDLE_2>;
+	};
+};
diff --git a/third_party/git/t/t4034/dts/pre b/third_party/git/t/t4034/dts/pre
new file mode 100644
index 000000000000..b6a905113c22
--- /dev/null
+++ b/third_party/git/t/t4034/dts/pre
@@ -0,0 +1,32 @@
+/ {
+	this_handle: node@f00 {
+		compatible = "mydev";
+		string-prop = start: "hello world!" end: ;
+		#size-cells = <0+0>;
+		reg = <0xf00>;
+		prop = <1>;
+		prop = <-1e10>;
+		prop = <(!3)>;
+		prop = <(~3)>;
+		prop = <(3*4)>;
+		prop = <(3&4)>;
+		prop = <(3*4)>;
+		prop = <(3/4)>;
+		prop = <(3%4)>;
+		prop = <(3+4)>;
+		prop = <(3-4)>;
+		prop = /bits/ 64 <(3<<4)>;
+		prop = <(3>>4)>;
+		prop = <(3&4)>;
+		prop = <(3^4)>;
+		prop = <(3|4)>;
+		prop = <(3&&4)>;
+		prop = <(3||4)>;
+		prop = <(4?5:3)>;
+		list = <&this_handle>, <0 0 0 0>;
+	};
+
+	&phandle {
+		pre-phandle = <&this_handle>;
+	};
+};
diff --git a/third_party/git/t/t4038-diff-combined.sh b/third_party/git/t/t4038-diff-combined.sh
index d4afe125548b..94680836ceb5 100755
--- a/third_party/git/t/t4038-diff-combined.sh
+++ b/third_party/git/t/t4038-diff-combined.sh
@@ -354,7 +354,7 @@ test_expect_failure 'combine diff coalesce three parents' '
 '
 
 # Test for a bug reported at
-# https://public-inbox.org/git/20130515143508.GO25742@login.drsnuggles.stderr.nl/
+# https://lore.kernel.org/git/20130515143508.GO25742@login.drsnuggles.stderr.nl/
 # where a delete lines were missing from combined diff output when they
 # occurred exactly before the context lines of a later change.
 test_expect_success 'combine diff missing delete bug' '
@@ -440,11 +440,13 @@ test_expect_success 'setup for --combined-all-paths' '
 	git branch side2c &&
 	git checkout side1c &&
 	test_seq 1 10 >filename-side1c &&
+	side1cf=$(git hash-object filename-side1c) &&
 	git add filename-side1c &&
 	git commit -m with &&
 	git checkout side2c &&
 	test_seq 1 9 >filename-side2c &&
 	echo ten >>filename-side2c &&
+	side2cf=$(git hash-object filename-side2c) &&
 	git add filename-side2c &&
 	git commit -m iam &&
 	git checkout -b mergery side1c &&
@@ -452,13 +454,14 @@ test_expect_success 'setup for --combined-all-paths' '
 	git rm filename-side1c &&
 	echo eleven >>filename-side2c &&
 	git mv filename-side2c filename-merged &&
+	mergedf=$(git hash-object filename-merged) &&
 	git add filename-merged &&
 	git commit
 '
 
 test_expect_success '--combined-all-paths and --raw' '
-	cat <<-\EOF >expect &&
-	::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR	filename-side1c	filename-side2c	filename-merged
+	cat <<-EOF >expect &&
+	::100644 100644 100644 $side1cf $side2cf $mergedf RR	filename-side1c	filename-side2c	filename-merged
 	EOF
 	git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
 	sed 1d <actual.tmp >actual &&
@@ -482,11 +485,13 @@ test_expect_success FUNNYNAMES 'setup for --combined-all-paths with funny names'
 	git checkout side1d &&
 	test_seq 1 10 >"$(printf "file\twith\ttabs")" &&
 	git add file* &&
+	side1df=$(git hash-object *tabs) &&
 	git commit -m with &&
 	git checkout side2d &&
 	test_seq 1 9 >"$(printf "i\tam\ttabbed")" &&
 	echo ten >>"$(printf "i\tam\ttabbed")" &&
 	git add *tabbed &&
+	side2df=$(git hash-object *tabbed) &&
 	git commit -m iam &&
 	git checkout -b funny-names-mergery side1d &&
 	git merge --no-commit side2d &&
@@ -494,12 +499,14 @@ test_expect_success FUNNYNAMES 'setup for --combined-all-paths with funny names'
 	echo eleven >>"$(printf "i\tam\ttabbed")" &&
 	git mv "$(printf "i\tam\ttabbed")" "$(printf "fickle\tnaming")" &&
 	git add fickle* &&
-	git commit
+	headf=$(git hash-object fickle*) &&
+	git commit &&
+	head=$(git rev-parse HEAD)
 '
 
 test_expect_success FUNNYNAMES '--combined-all-paths and --raw and funny names' '
-	cat <<-\EOF >expect &&
-	::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR	"file\twith\ttabs"	"i\tam\ttabbed"	"fickle\tnaming"
+	cat <<-EOF >expect &&
+	::100644 100644 100644 $side1df $side2df $headf RR	"file\twith\ttabs"	"i\tam\ttabbed"	"fickle\tnaming"
 	EOF
 	git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
 	sed 1d <actual.tmp >actual &&
@@ -507,9 +514,9 @@ test_expect_success FUNNYNAMES '--combined-all-paths and --raw and funny names'
 '
 
 test_expect_success FUNNYNAMES '--combined-all-paths and --raw -and -z and funny names' '
-	printf "aaf8087c3cbd4db8e185a2d074cf27c53cfb75d7\0::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect &&
+	printf "$head\0::100644 100644 100644 $side1df $side2df $headf RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect &&
 	git diff-tree -c -M --raw --combined-all-paths -z HEAD >actual &&
-	test_cmp -a expect actual
+	test_cmp expect actual
 '
 
 test_expect_success FUNNYNAMES '--combined-all-paths and --cc and funny names' '
diff --git a/third_party/git/t/t4039-diff-assume-unchanged.sh b/third_party/git/t/t4039-diff-assume-unchanged.sh
index 53ac44b0f003..0eb0314a8b35 100755
--- a/third_party/git/t/t4039-diff-assume-unchanged.sh
+++ b/third_party/git/t/t4039-diff-assume-unchanged.sh
@@ -12,6 +12,7 @@ test_expect_success 'setup' '
 	git commit -m zero &&
 	echo one > one &&
 	echo two > two &&
+	blob=$(git hash-object one) &&
 	git add one two &&
 	git commit -m onetwo &&
 	git update-index --assume-unchanged one &&
@@ -20,7 +21,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'diff-index does not examine assume-unchanged entries' '
-	git diff-index HEAD^ -- one | grep -q 5626abf0f72e58d7a153368ba57db4c673c0e171
+	git diff-index HEAD^ -- one | grep -q $blob
 '
 
 test_expect_success 'diff-files does not examine assume-unchanged entries' '
diff --git a/third_party/git/t/t4041-diff-submodule-option.sh b/third_party/git/t/t4041-diff-submodule-option.sh
index 619bf970983e..f85213658560 100755
--- a/third_party/git/t/t4041-diff-submodule-option.sh
+++ b/third_party/git/t/t4041-diff-submodule-option.sh
@@ -284,7 +284,7 @@ test_expect_success 'submodule contains untracked content (all ignored)' '
 	test_must_be_empty actual
 '
 
-test_expect_success 'submodule contains untracked and modifed content' '
+test_expect_success 'submodule contains untracked and modified content' '
 	echo new > sm1/foo6 &&
 	git diff-index -p --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -294,7 +294,7 @@ test_expect_success 'submodule contains untracked and modifed content' '
 	test_cmp expected actual
 '
 
-test_expect_success 'submodule contains untracked and modifed content (untracked ignored)' '
+test_expect_success 'submodule contains untracked and modified content (untracked ignored)' '
 	echo new > sm1/foo6 &&
 	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -303,19 +303,19 @@ test_expect_success 'submodule contains untracked and modifed content (untracked
 	test_cmp expected actual
 '
 
-test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' '
+test_expect_success 'submodule contains untracked and modified content (dirty ignored)' '
 	echo new > sm1/foo6 &&
 	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
 	test_must_be_empty actual
 '
 
-test_expect_success 'submodule contains untracked and modifed content (all ignored)' '
+test_expect_success 'submodule contains untracked and modified content (all ignored)' '
 	echo new > sm1/foo6 &&
 	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
 	test_must_be_empty actual
 '
 
-test_expect_success 'submodule contains modifed content' '
+test_expect_success 'submodule contains modified content' '
 	rm -f sm1/new-file &&
 	git diff-index -p --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -369,7 +369,7 @@ test_expect_success 'modified submodule contains untracked content (all ignored)
 	test_must_be_empty actual
 '
 
-test_expect_success 'modified submodule contains untracked and modifed content' '
+test_expect_success 'modified submodule contains untracked and modified content' '
 	echo modification >> sm1/foo6 &&
 	git diff-index -p --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -381,7 +381,7 @@ test_expect_success 'modified submodule contains untracked and modifed content'
 	test_cmp expected actual
 '
 
-test_expect_success 'modified submodule contains untracked and modifed content (untracked ignored)' '
+test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' '
 	echo modification >> sm1/foo6 &&
 	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -392,7 +392,7 @@ test_expect_success 'modified submodule contains untracked and modifed content (
 	test_cmp expected actual
 '
 
-test_expect_success 'modified submodule contains untracked and modifed content (dirty ignored)' '
+test_expect_success 'modified submodule contains untracked and modified content (dirty ignored)' '
 	echo modification >> sm1/foo6 &&
 	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -402,13 +402,13 @@ test_expect_success 'modified submodule contains untracked and modifed content (
 	test_cmp expected actual
 '
 
-test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' '
+test_expect_success 'modified submodule contains untracked and modified content (all ignored)' '
 	echo modification >> sm1/foo6 &&
 	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
 	test_must_be_empty actual
 '
 
-test_expect_success 'modified submodule contains modifed content' '
+test_expect_success 'modified submodule contains modified content' '
 	rm -f sm1/new-file &&
 	git diff-index -p --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
diff --git a/third_party/git/t/t4044-diff-index-unique-abbrev.sh b/third_party/git/t/t4044-diff-index-unique-abbrev.sh
index 647905e01fb9..4701796d10e1 100755
--- a/third_party/git/t/t4044-diff-index-unique-abbrev.sh
+++ b/third_party/git/t/t4044-diff-index-unique-abbrev.sh
@@ -3,34 +3,48 @@
 test_description='test unique sha1 abbreviation on "index from..to" line'
 . ./test-lib.sh
 
-if ! test_have_prereq SHA1
-then
-       skip_all='not using SHA-1 for objects'
-       test_done
-fi
-
-cat >expect_initial <<EOF
-100644 blob 51d2738463ea4ca66f8691c91e33ce64b7d41bb1	foo
-EOF
+test_expect_success 'setup' '
+	test_oid_cache <<-EOF &&
+	val1 sha1:4827
+	val1 sha256:5664
 
-cat >expect_update <<EOF
-100644 blob 51d2738efb4ad8a1e40bed839ab8e116f0a15e47	foo
-EOF
+	val2 sha1:11742
+	val2 sha256:10625
 
-test_expect_success 'setup' '
-	echo 4827 > foo &&
+	hash1 sha1:51d2738463ea4ca66f8691c91e33ce64b7d41bb1
+	hash1 sha256:ae31dfff0af93b2c62b0098a039b38569c43b0a7e97b873000ca42d128f27350
+
+	hasht1 sha1:51d27384
+	hasht1 sha256:ae31dfff
+
+	hash2 sha1:51d2738efb4ad8a1e40bed839ab8e116f0a15e47
+	hash2 sha256:ae31dffada88a46fd5f53c7ed5aa25a7a8951f1d5e88456c317c8d5484d263e5
+
+	hasht2 sha1:51d2738e
+	hasht2 sha256:ae31dffa
+	EOF
+
+	cat >expect_initial <<-EOF &&
+	100644 blob $(test_oid hash1)	foo
+	EOF
+
+	cat >expect_update <<-EOF &&
+	100644 blob $(test_oid hash2)	foo
+	EOF
+
+	echo "$(test_oid val1)" > foo &&
 	git add foo &&
 	git commit -m "initial" &&
 	git cat-file -p HEAD: > actual &&
 	test_cmp expect_initial actual &&
-	echo 11742 > foo &&
+	echo "$(test_oid val2)" > foo &&
 	git commit -a -m "update" &&
 	git cat-file -p HEAD: > actual &&
 	test_cmp expect_update actual
 '
 
 cat >expect <<EOF
-index 51d27384..51d2738e 100644
+index $(test_oid hasht1)..$(test_oid hasht2) 100644
 EOF
 
 test_expect_success 'diff does not produce ambiguous index line' '
diff --git a/third_party/git/t/t4045-diff-relative.sh b/third_party/git/t/t4045-diff-relative.sh
index 36f8ed8a8187..258808708e10 100755
--- a/third_party/git/t/t4045-diff-relative.sh
+++ b/third_party/git/t/t4045-diff-relative.sh
@@ -70,7 +70,7 @@ check_raw () {
 	expect=$1
 	shift
 	cat >expected <<-EOF
-	:000000 100644 0000000000000000000000000000000000000000 $blob A	$expect
+	:000000 100644 $ZERO_OID $blob A	$expect
 	EOF
 	test_expect_success "--raw $*" "
 		git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual &&
diff --git a/third_party/git/t/t4048-diff-combined-binary.sh b/third_party/git/t/t4048-diff-combined-binary.sh
index 87a8949500bb..7f9ad9fa3d1f 100755
--- a/third_party/git/t/t4048-diff-combined-binary.sh
+++ b/third_party/git/t/t4048-diff-combined-binary.sh
@@ -9,24 +9,27 @@ test_expect_success 'setup binary merge conflict' '
 	git commit -m one &&
 	echo twoQ2 | q_to_nul >binary &&
 	git commit -a -m two &&
+	two=$(git rev-parse --short HEAD:binary) &&
 	git checkout -b branch-binary HEAD^ &&
 	echo threeQ3 | q_to_nul >binary &&
 	git commit -a -m three &&
+	three=$(git rev-parse --short HEAD:binary) &&
 	test_must_fail git merge master &&
 	echo resolvedQhooray | q_to_nul >binary &&
-	git commit -a -m resolved
+	git commit -a -m resolved &&
+	res=$(git rev-parse --short HEAD:binary)
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --git a/binary b/binary
-index 7ea6ded..9563691 100644
+index $three..$res 100644
 Binary files a/binary and b/binary differ
 resolved
 
 diff --git a/binary b/binary
-index 6197570..9563691 100644
+index $two..$res 100644
 Binary files a/binary and b/binary differ
 EOF
 test_expect_success 'diff -m indicates binary-ness' '
@@ -34,11 +37,11 @@ test_expect_success 'diff -m indicates binary-ness' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --combined binary
-index 7ea6ded,6197570..9563691
+index $three,$two..$res
 Binary files differ
 EOF
 test_expect_success 'diff -c indicates binary-ness' '
@@ -46,11 +49,11 @@ test_expect_success 'diff -c indicates binary-ness' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --cc binary
-index 7ea6ded,6197570..9563691
+index $three,$two..$res
 Binary files differ
 EOF
 test_expect_success 'diff --cc indicates binary-ness' '
@@ -62,23 +65,26 @@ test_expect_success 'setup non-binary with binary attribute' '
 	git checkout master &&
 	test_commit one text &&
 	test_commit two text &&
+	two=$(git rev-parse --short HEAD:text) &&
 	git checkout -b branch-text HEAD^ &&
 	test_commit three text &&
+	three=$(git rev-parse --short HEAD:text) &&
 	test_must_fail git merge master &&
 	test_commit resolved text &&
+	res=$(git rev-parse --short HEAD:text) &&
 	echo text -diff >.gitattributes
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --git a/text b/text
-index 2bdf67a..2ab19ae 100644
+index $three..$res 100644
 Binary files a/text and b/text differ
 resolved
 
 diff --git a/text b/text
-index f719efd..2ab19ae 100644
+index $two..$res 100644
 Binary files a/text and b/text differ
 EOF
 test_expect_success 'diff -m respects binary attribute' '
@@ -86,11 +92,11 @@ test_expect_success 'diff -m respects binary attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --combined text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 Binary files differ
 EOF
 test_expect_success 'diff -c respects binary attribute' '
@@ -98,11 +104,11 @@ test_expect_success 'diff -c respects binary attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --cc text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 Binary files differ
 EOF
 test_expect_success 'diff --cc respects binary attribute' '
@@ -115,11 +121,11 @@ test_expect_success 'setup textconv attribute' '
 	git config diff.upcase.textconv "tr a-z A-Z <"
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --git a/text b/text
-index 2bdf67a..2ab19ae 100644
+index $three..$res 100644
 --- a/text
 +++ b/text
 @@ -1 +1 @@
@@ -128,7 +134,7 @@ index 2bdf67a..2ab19ae 100644
 resolved
 
 diff --git a/text b/text
-index f719efd..2ab19ae 100644
+index $two..$res 100644
 --- a/text
 +++ b/text
 @@ -1 +1 @@
@@ -140,11 +146,11 @@ test_expect_success 'diff -m respects textconv attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --combined text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 --- a/text
 +++ b/text
 @@@ -1,1 -1,1 +1,1 @@@
@@ -157,11 +163,11 @@ test_expect_success 'diff -c respects textconv attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --cc text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 --- a/text
 +++ b/text
 @@@ -1,1 -1,1 +1,1 @@@
@@ -174,9 +180,9 @@ test_expect_success 'diff --cc respects textconv attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 diff --combined text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 --- a/text
 +++ b/text
 @@@ -1,1 -1,1 +1,1 @@@
@@ -190,9 +196,9 @@ test_expect_success 'diff-tree plumbing does not respect textconv' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 diff --cc text
-index 2bdf67a,f719efd..0000000
+index $three,$two..0000000
 --- a/text
 +++ b/text
 @@@ -1,1 -1,1 +1,5 @@@
diff --git a/third_party/git/t/t4054-diff-bogus-tree.sh b/third_party/git/t/t4054-diff-bogus-tree.sh
index fcae82fffa7f..8c95f152b23b 100755
--- a/third_party/git/t/t4054-diff-bogus-tree.sh
+++ b/third_party/git/t/t4054-diff-bogus-tree.sh
@@ -4,8 +4,9 @@ test_description='test diff with a bogus tree containing the null sha1'
 . ./test-lib.sh
 
 test_expect_success 'create bogus tree' '
+	name=$(echo $ZERO_OID | sed -e "s/00/Q/g") &&
 	bogus_tree=$(
-		printf "100644 fooQQQQQQQQQQQQQQQQQQQQQ" |
+		printf "100644 fooQ$name" |
 		q_to_nul |
 		git hash-object -w --stdin -t tree
 	)
diff --git a/third_party/git/t/t4057-diff-combined-paths.sh b/third_party/git/t/t4057-diff-combined-paths.sh
index dff36b77ec88..4f4b541658a1 100755
--- a/third_party/git/t/t4057-diff-combined-paths.sh
+++ b/third_party/git/t/t4057-diff-combined-paths.sh
@@ -33,7 +33,7 @@ test_expect_success 'trivial merge - combine-diff empty' '
 '
 
 
-test_expect_success 'only one trully conflicting path' '
+test_expect_success 'only one truly conflicting path' '
 	git checkout side &&
 	for i in $(test_seq 2 9)
 	do
diff --git a/third_party/git/t/t4060-diff-submodule-option-diff-format.sh b/third_party/git/t/t4060-diff-submodule-option-diff-format.sh
index 9dcb69df5c36..fc8229c7260b 100755
--- a/third_party/git/t/t4060-diff-submodule-option-diff-format.sh
+++ b/third_party/git/t/t4060-diff-submodule-option-diff-format.sh
@@ -42,6 +42,17 @@ commit_file () {
 	git commit "$@" -m "Commit $*" >/dev/null
 }
 
+diff_cmp () {
+       for i in "$1" "$2"
+       do
+		sed -e 's/^index 0000000\.\.[0-9a-f]*/index 0000000..1234567/' \
+		-e 's/^index [0-9a-f]*\.\.[0-9a-f]*/index 1234567..89abcde/' \
+		"$i" >"$i.compare" || return 1
+       done &&
+       test_cmp "$1.compare" "$2.compare" &&
+       rm -f "$1.compare" "$2.compare"
+}
+
 test_expect_success 'setup repository' '
 	test_create_repo sm1 &&
 	add_file . foo &&
@@ -69,7 +80,7 @@ test_expect_success 'added submodule' '
 	@@ -0,0 +1 @@
 	+foo2
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'added submodule, set diff.submodule' '
@@ -93,7 +104,7 @@ test_expect_success 'added submodule, set diff.submodule' '
 	@@ -0,0 +1 @@
 	+foo2
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success '--submodule=short overrides diff.submodule' '
@@ -109,7 +120,7 @@ test_expect_success '--submodule=short overrides diff.submodule' '
 	@@ -0,0 +1 @@
 	+Subproject commit $fullhead1
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'diff.submodule does not affect plumbing' '
@@ -124,7 +135,7 @@ test_expect_success 'diff.submodule does not affect plumbing' '
 	@@ -0,0 +1 @@
 	+Subproject commit $fullhead1
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm1 &&
@@ -142,7 +153,7 @@ test_expect_success 'modified submodule(forward)' '
 	@@ -0,0 +1 @@
 	+foo3
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule(forward)' '
@@ -157,7 +168,7 @@ test_expect_success 'modified submodule(forward)' '
 	@@ -0,0 +1 @@
 	+foo3
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule(forward) --submodule' '
@@ -166,7 +177,7 @@ test_expect_success 'modified submodule(forward) --submodule' '
 	Submodule sm1 $head1..$head2:
 	  > Add foo3 ($added foo3)
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 fullhead2=$(cd sm1; git rev-parse --verify HEAD)
@@ -181,7 +192,7 @@ test_expect_success 'modified submodule(forward) --submodule=short' '
 	-Subproject commit $fullhead1
 	+Subproject commit $fullhead2
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm1 &&
@@ -210,7 +221,7 @@ test_expect_success 'modified submodule(backward)' '
 	@@ -1 +0,0 @@
 	-foo3
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 head4=$(add_file sm1 foo4 foo5)
@@ -247,7 +258,7 @@ test_expect_success 'modified submodule(backward and forward)' '
 	@@ -0,0 +1 @@
 	+foo5
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm1 &&
@@ -291,7 +302,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' '
 	@@ -0,0 +1 @@
 	+sm1
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'typechanged submodule(submodule->blob)' '
@@ -327,7 +338,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' '
 	@@ -0,0 +1 @@
 	+foo5
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 rm -rf sm1 &&
@@ -344,7 +355,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' '
 	@@ -0,0 +1 @@
 	+sm1
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 rm -f sm1 &&
@@ -356,7 +367,7 @@ test_expect_success 'nonexistent commit' '
 	cat >expected <<-EOF &&
 	Submodule sm1 $head4...$head6 (commits not present)
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file
@@ -386,11 +397,12 @@ test_expect_success 'typechanged submodule(blob->submodule)' '
 	@@ -0,0 +1 @@
 	+foo7
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm1 &&
 test_expect_success 'submodule is up to date' '
+	head7=$(git -C sm1 rev-parse --short --verify HEAD) &&
 	git diff-index -p --submodule=diff HEAD >actual &&
 	test_must_be_empty actual
 '
@@ -401,7 +413,7 @@ test_expect_success 'submodule contains untracked content' '
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'submodule contains untracked content (untracked ignored)' '
@@ -433,7 +445,7 @@ test_expect_success 'submodule contains untracked and modified content' '
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 # NOT OK
@@ -450,7 +462,7 @@ test_expect_success 'submodule contains untracked and modified content (untracke
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'submodule contains untracked and modified content (dirty ignored)' '
@@ -478,7 +490,7 @@ test_expect_success 'submodule contains modified content' '
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 (cd sm1; git commit -mchange foo6 >/dev/null) &&
@@ -486,7 +498,7 @@ head8=$(cd sm1; git rev-parse --short --verify HEAD) &&
 test_expect_success 'submodule is modified' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9..$head8:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -495,7 +507,7 @@ test_expect_success 'submodule is modified' '
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked content' '
@@ -503,7 +515,7 @@ test_expect_success 'modified submodule contains untracked content' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
-	Submodule sm1 17243c9..$head8:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -512,13 +524,13 @@ test_expect_success 'modified submodule contains untracked content' '
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked content (untracked ignored)' '
 	git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9..$head8:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -527,13 +539,13 @@ test_expect_success 'modified submodule contains untracked content (untracked ig
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked content (dirty ignored)' '
 	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -542,7 +554,7 @@ test_expect_success 'modified submodule contains untracked content (dirty ignore
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked content (all ignored)' '
@@ -556,7 +568,7 @@ test_expect_success 'modified submodule contains untracked and modified content'
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
 	Submodule sm1 contains modified content
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..dfda541 100644
 	--- a/sm1/foo6
@@ -566,7 +578,7 @@ test_expect_success 'modified submodule contains untracked and modified content'
 	+new
 	+modification
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' '
@@ -574,7 +586,7 @@ test_expect_success 'modified submodule contains untracked and modified content
 	git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains modified content
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..e20e2d9 100644
 	--- a/sm1/foo6
@@ -585,14 +597,14 @@ test_expect_success 'modified submodule contains untracked and modified content
 	+modification
 	+modification
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked and modified content (dirty ignored)' '
 	echo modification >> sm1/foo6 &&
 	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -601,7 +613,7 @@ test_expect_success 'modified submodule contains untracked and modified content
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked and modified content (all ignored)' '
@@ -616,7 +628,7 @@ test_expect_success 'modified submodule contains modified content' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains modified content
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..ac466ca 100644
 	--- a/sm1/foo6
@@ -629,29 +641,29 @@ test_expect_success 'modified submodule contains modified content' '
 	+modification
 	+modification
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 rm -rf sm1
 test_expect_success 'deleted submodule' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9...0000000 (submodule deleted)
+	Submodule sm1 $head7...0000000 (submodule deleted)
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'create second submodule' '
 	test_create_repo sm2 &&
-	head7=$(add_file sm2 foo8 foo9) &&
+	head9=$(add_file sm2 foo8 foo9) &&
 	git add sm2
 '
 
 test_expect_success 'multiple submodules' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9...0000000 (submodule deleted)
-	Submodule sm2 0000000...a5a65c9 (new submodule)
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
 	new file mode 100644
 	index 0000000..db9916b
@@ -667,13 +679,13 @@ test_expect_success 'multiple submodules' '
 	@@ -0,0 +1 @@
 	+foo9
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'path filter' '
 	git diff-index -p --submodule=diff HEAD sm2 >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm2 0000000...a5a65c9 (new submodule)
+	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
 	new file mode 100644
 	index 0000000..db9916b
@@ -689,15 +701,15 @@ test_expect_success 'path filter' '
 	@@ -0,0 +1 @@
 	+foo9
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm2
 test_expect_success 'given commit' '
 	git diff-index -p --submodule=diff HEAD^ >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9...0000000 (submodule deleted)
-	Submodule sm2 0000000...a5a65c9 (new submodule)
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
 	new file mode 100644
 	index 0000000..db9916b
@@ -713,7 +725,7 @@ test_expect_success 'given commit' '
 	@@ -0,0 +1 @@
 	+foo9
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'setup .git file for sm2' '
@@ -726,8 +738,8 @@ test_expect_success 'setup .git file for sm2' '
 test_expect_success 'diff --submodule=diff with .git file' '
 	git diff --submodule=diff HEAD^ >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9...0000000 (submodule deleted)
-	Submodule sm2 0000000...a5a65c9 (new submodule)
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
 	new file mode 100644
 	index 0000000..db9916b
@@ -743,25 +755,27 @@ test_expect_success 'diff --submodule=diff with .git file' '
 	@@ -0,0 +1 @@
 	+foo9
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'setup nested submodule' '
 	git submodule add -f ./sm2 &&
 	git commit -a -m "add sm2" &&
 	git -C sm2 submodule add ../sm2 nested &&
-	git -C sm2 commit -a -m "nested sub"
+	git -C sm2 commit -a -m "nested sub" &&
+	head10=$(git -C sm2 rev-parse --short --verify HEAD)
 '
 
 test_expect_success 'move nested submodule HEAD' '
 	echo "nested content" >sm2/nested/file &&
 	git -C sm2/nested add file &&
-	git -C sm2/nested commit --allow-empty -m "new HEAD"
+	git -C sm2/nested commit --allow-empty -m "new HEAD" &&
+	head11=$(git -C sm2/nested rev-parse --short --verify HEAD)
 '
 
 test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' '
 	cat >expected <<-EOF &&
-	Submodule nested a5a65c9..b55928c:
+	Submodule nested $head9..$head11:
 	diff --git a/nested/file b/nested/file
 	new file mode 100644
 	index 0000000..ca281f5
@@ -772,13 +786,13 @@ test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' '
 	EOF
 	git -C sm2 diff --submodule=diff >actual 2>err &&
 	test_must_be_empty err &&
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'diff --submodule=diff recurses into nested submodules' '
 	cat >expected <<-EOF &&
 	Submodule sm2 contains modified content
-	Submodule sm2 a5a65c9..280969a:
+	Submodule sm2 $head9..$head10:
 	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
 	new file mode 100644
 	index 0000000..3a816b8
@@ -788,7 +802,7 @@ test_expect_success 'diff --submodule=diff recurses into nested submodules' '
 	+[submodule "nested"]
 	+	path = nested
 	+	url = ../sm2
-	Submodule nested 0000000...b55928c (new submodule)
+	Submodule nested 0000000...$head11 (new submodule)
 	diff --git a/sm2/nested/file b/sm2/nested/file
 	new file mode 100644
 	index 0000000..ca281f5
@@ -813,7 +827,7 @@ test_expect_success 'diff --submodule=diff recurses into nested submodules' '
 	EOF
 	git diff --submodule=diff >actual 2>err &&
 	test_must_be_empty err &&
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_done
diff --git a/third_party/git/t/t4066-diff-emit-delay.sh b/third_party/git/t/t4066-diff-emit-delay.sh
index 5df6b5e64e0e..6331f63b127c 100755
--- a/third_party/git/t/t4066-diff-emit-delay.sh
+++ b/third_party/git/t/t4066-diff-emit-delay.sh
@@ -18,7 +18,7 @@ test_expect_success 'set up history with a merge' '
 '
 
 test_expect_success 'log --cc -p --stat --color-moved' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	commit D
 	---
 	 D.t | 1 +
@@ -26,7 +26,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
 
 	diff --git a/D.t b/D.t
 	new file mode 100644
-	index 0000000..1784810
+	index 0000000..$(git rev-parse --short D:D.t)
 	--- /dev/null
 	+++ b/D.t
 	@@ -0,0 +1 @@
@@ -42,7 +42,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
 
 	diff --git a/C.t b/C.t
 	new file mode 100644
-	index 0000000..3cc58df
+	index 0000000..$(git rev-parse --short C:C.t)
 	--- /dev/null
 	+++ b/C.t
 	@@ -0,0 +1 @@
@@ -54,7 +54,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
 
 	diff --git a/B.t b/B.t
 	new file mode 100644
-	index 0000000..223b783
+	index 0000000..$(git rev-parse --short B:B.t)
 	--- /dev/null
 	+++ b/B.t
 	@@ -0,0 +1 @@
@@ -66,7 +66,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
 
 	diff --git a/A.t b/A.t
 	new file mode 100644
-	index 0000000..f70f10e
+	index 0000000..$(git rev-parse --short A:A.t)
 	--- /dev/null
 	+++ b/A.t
 	@@ -0,0 +1 @@
diff --git a/third_party/git/t/t4067-diff-partial-clone.sh b/third_party/git/t/t4067-diff-partial-clone.sh
index 90c8fb290175..4831ad35e614 100755
--- a/third_party/git/t/t4067-diff-partial-clone.sh
+++ b/third_party/git/t/t4067-diff-partial-clone.sh
@@ -75,6 +75,37 @@ test_expect_success 'diff skips same-OID blobs' '
 	! grep "want $(cat hash-b)" trace
 '
 
+test_expect_success 'when fetching missing objects, diff skips GITLINKs' '
+	test_when_finished "rm -rf sub server client trace" &&
+
+	test_create_repo sub &&
+	test_commit -C sub first &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	git -C server add a &&
+	git -C server submodule add "file://$(pwd)/sub" &&
+	git -C server commit -m x &&
+
+	test_commit -C server/sub second &&
+	echo another-a >server/a &&
+	git -C server add a sub &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	echo a | git hash-object --stdin >hash-old-a &&
+	echo another-a | git hash-object --stdin >hash-new-a &&
+
+	# Ensure that a and another-a are fetched, and check (by successful
+	# execution of the diff) that no invalid OIDs are sent.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "want $(cat hash-old-a)" trace &&
+	grep "want $(cat hash-new-a)" trace
+'
+
 test_expect_success 'diff with rename detection batches blobs' '
 	test_when_finished "rm -rf server client trace" &&
 
diff --git a/third_party/git/t/t4100/t-apply-1.patch b/third_party/git/t/t4100/t-apply-1.patch
index 90ab54f0f586..43394f828561 100644
--- a/third_party/git/t/t4100/t-apply-1.patch
+++ b/third_party/git/t/t4100/t-apply-1.patch
@@ -75,8 +75,8 @@ diff --git a/Documentation/git.txt b/Documentation/git.txt
 +link:git-ssh-pull.html[git-ssh-pull]::
  	Pulls from a remote repository over ssh connection
  
- Interogators:
-@@ -156,8 +156,8 @@ Interogators:
+ Interrogators:
+@@ -156,8 +156,8 @@ Interrogators:
  link:git-diff-helper.html[git-diff-helper]::
  	Generates patch format output for git-diff-*
  
diff --git a/third_party/git/t/t4100/t-apply-3.patch b/third_party/git/t/t4100/t-apply-3.patch
index 90cdbaa5bb62..cac172e7791d 100644
--- a/third_party/git/t/t4100/t-apply-3.patch
+++ b/third_party/git/t/t4100/t-apply-3.patch
@@ -211,7 +211,7 @@ dissimilarity index 82%
 -
 -		/* If this is an exact directory match, we may have
 -		 * directory files following this path. Match on them.
--		 * Otherwise, we're at a pach subcomponent, and we need
+-		 * Otherwise, we're at a patch subcomponent, and we need
 -		 * to try to match again.
 -		 */
 -		if (mtype == 0)
diff --git a/third_party/git/t/t4100/t-apply-5.patch b/third_party/git/t/t4100/t-apply-5.patch
index 5f6ddc105950..57ec79d8879a 100644
--- a/third_party/git/t/t4100/t-apply-5.patch
+++ b/third_party/git/t/t4100/t-apply-5.patch
@@ -185,8 +185,8 @@ diff a/Documentation/git.txt b/Documentation/git.txt
 +link:git-ssh-pull.html[git-ssh-pull]::
  	Pulls from a remote repository over ssh connection
  
- Interogators:
-@@ -156,8 +156,8 @@ Interogators:
+ Interrogators:
+@@ -156,8 +156,8 @@ Interrogators:
  link:git-diff-helper.html[git-diff-helper]::
  	Generates patch format output for git-diff-*
  
diff --git a/third_party/git/t/t4100/t-apply-7.patch b/third_party/git/t/t4100/t-apply-7.patch
index 07c6589e74fa..fa2430510864 100644
--- a/third_party/git/t/t4100/t-apply-7.patch
+++ b/third_party/git/t/t4100/t-apply-7.patch
@@ -335,7 +335,7 @@ diff a/ls-tree.c b/ls-tree.c
  
 -		/* If this is an exact directory match, we may have
 -		 * directory files following this path. Match on them.
--		 * Otherwise, we're at a pach subcomponent, and we need
+-		 * Otherwise, we're at a patch subcomponent, and we need
 -		 * to try to match again.
 +	if (e->directory) {
 +		/* If this is a directory, we have the following cases:
diff --git a/third_party/git/t/t4108-apply-threeway.sh b/third_party/git/t/t4108-apply-threeway.sh
index fa5d4efb89dc..d7349ced6be0 100755
--- a/third_party/git/t/t4108-apply-threeway.sh
+++ b/third_party/git/t/t4108-apply-threeway.sh
@@ -4,23 +4,17 @@ test_description='git apply --3way'
 
 . ./test-lib.sh
 
-create_file () {
-	for i
-	do
-		echo "$i"
-	done
-}
-
-sanitize_conflicted_diff () {
+print_sanitized_conflicted_diff () {
+	git diff HEAD >diff.raw &&
 	sed -e '
 		/^index /d
-		s/^\(+[<>][<>][<>][<>]*\) .*/\1/
-	'
+		s/^\(+[<>|][<>|][<>|][<>|]*\) .*/\1/
+	' diff.raw
 }
 
 test_expect_success setup '
 	test_tick &&
-	create_file >one 1 2 3 4 5 6 7 &&
+	test_write_lines 1 2 3 4 5 6 7 >one &&
 	cat one >two &&
 	git add one two &&
 	git commit -m initial &&
@@ -28,13 +22,13 @@ test_expect_success setup '
 	git branch side &&
 
 	test_tick &&
-	create_file >one 1 two 3 4 5 six 7 &&
-	create_file >two 1 two 3 4 5 6 7 &&
+	test_write_lines 1 two 3 4 5 six 7 >one &&
+	test_write_lines 1 two 3 4 5 6 7 >two &&
 	git commit -a -m master &&
 
 	git checkout side &&
-	create_file >one 1 2 3 4 five 6 7 &&
-	create_file >two 1 2 3 4 five 6 7 &&
+	test_write_lines 1 2 3 4 five 6 7 >one &&
+	test_write_lines 1 2 3 4 five 6 7 >two &&
 	git commit -a -m side &&
 
 	git checkout master
@@ -52,7 +46,7 @@ test_expect_success 'apply without --3way' '
 	git diff-index --exit-code --cached HEAD
 '
 
-test_expect_success 'apply with --3way' '
+test_apply_with_3way () {
 	# Merging side should be similar to applying this patch
 	git diff ...side >P.diff &&
 
@@ -61,22 +55,31 @@ test_expect_success 'apply with --3way' '
 	git checkout master^0 &&
 	test_must_fail git merge --no-commit side &&
 	git ls-files -s >expect.ls &&
-	git diff HEAD | sanitize_conflicted_diff >expect.diff &&
+	print_sanitized_conflicted_diff >expect.diff &&
 
 	# should fail to apply
 	git reset --hard &&
 	git checkout master^0 &&
 	test_must_fail git apply --index --3way P.diff &&
 	git ls-files -s >actual.ls &&
-	git diff HEAD | sanitize_conflicted_diff >actual.diff &&
+	print_sanitized_conflicted_diff >actual.diff &&
 
 	# The result should resemble the corresponding merge
 	test_cmp expect.ls actual.ls &&
 	test_cmp expect.diff actual.diff
+}
+
+test_expect_success 'apply with --3way' '
+	test_apply_with_3way
+'
+
+test_expect_success 'apply with --3way with merge.conflictStyle = diff3' '
+	test_config merge.conflictStyle diff3 &&
+	test_apply_with_3way
 '
 
 test_expect_success 'apply with --3way with rerere enabled' '
-	git config rerere.enabled true &&
+	test_config rerere.enabled true &&
 
 	# Merging side should be similar to applying this patch
 	git diff ...side >P.diff &&
@@ -87,7 +90,7 @@ test_expect_success 'apply with --3way with rerere enabled' '
 	test_must_fail git merge --no-commit side &&
 
 	# Manually resolve and record the resolution
-	create_file 1 two 3 4 five six 7 >one &&
+	test_write_lines 1 two 3 4 five six 7 >one &&
 	git rerere &&
 	cat one >expect &&
 
@@ -104,14 +107,14 @@ test_expect_success 'apply -3 with add/add conflict setup' '
 	git reset --hard &&
 
 	git checkout -b adder &&
-	create_file 1 2 3 4 5 6 7 >three &&
-	create_file 1 2 3 4 5 6 7 >four &&
+	test_write_lines 1 2 3 4 5 6 7 >three &&
+	test_write_lines 1 2 3 4 5 6 7 >four &&
 	git add three four &&
 	git commit -m "add three and four" &&
 
 	git checkout -b another adder^ &&
-	create_file 1 2 3 4 5 6 7 >three &&
-	create_file 1 2 3 four 5 6 7 >four &&
+	test_write_lines 1 2 3 4 5 6 7 >three &&
+	test_write_lines 1 2 3 four 5 6 7 >four &&
 	git add three four &&
 	git commit -m "add three and four" &&
 
@@ -121,7 +124,7 @@ test_expect_success 'apply -3 with add/add conflict setup' '
 	git checkout adder^0 &&
 	test_must_fail git merge --no-commit another &&
 	git ls-files -s >expect.ls &&
-	git diff HEAD | sanitize_conflicted_diff >expect.diff
+	print_sanitized_conflicted_diff >expect.diff
 '
 
 test_expect_success 'apply -3 with add/add conflict' '
@@ -131,7 +134,7 @@ test_expect_success 'apply -3 with add/add conflict' '
 	test_must_fail git apply --index --3way P.diff &&
 	# ... and leave conflicts in the index and in the working tree
 	git ls-files -s >actual.ls &&
-	git diff HEAD | sanitize_conflicted_diff >actual.diff &&
+	print_sanitized_conflicted_diff >actual.diff &&
 
 	# The result should resemble the corresponding merge
 	test_cmp expect.ls actual.ls &&
diff --git a/third_party/git/t/t4117-apply-reject.sh b/third_party/git/t/t4117-apply-reject.sh
index f7de6f077a6e..0ee93fe845af 100755
--- a/third_party/git/t/t4117-apply-reject.sh
+++ b/third_party/git/t/t4117-apply-reject.sh
@@ -74,7 +74,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
 	test_must_fail git apply --reject patch.1 &&
 	test_cmp expected file1 &&
 
-	cat file1.rej &&
+	test_path_is_file file1.rej &&
 	test_path_is_missing file2.rej
 '
 
@@ -87,7 +87,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
 	test_path_is_missing file1 &&
 	test_cmp expected file2 &&
 
-	cat file2.rej &&
+	test_path_is_file file2.rej &&
 	test_path_is_missing file1.rej
 
 '
@@ -101,7 +101,7 @@ test_expect_success 'the same test with --verbose' '
 	test_path_is_missing file1 &&
 	test_cmp expected file2 &&
 
-	cat file2.rej &&
+	test_path_is_file file2.rej &&
 	test_path_is_missing file1.rej
 
 '
diff --git a/third_party/git/t/t4124-apply-ws-rule.sh b/third_party/git/t/t4124-apply-ws-rule.sh
index ff51e9e78914..971a5a7512ac 100755
--- a/third_party/git/t/t4124-apply-ws-rule.sh
+++ b/third_party/git/t/t4124-apply-ws-rule.sh
@@ -35,9 +35,15 @@ prepare_test_file () {
 }
 
 apply_patch () {
+	cmd_prefix= &&
+	if test "x$1" = 'x!'
+	then
+		cmd_prefix=test_must_fail &&
+		shift
+	fi &&
 	>target &&
 	sed -e "s|\([ab]\)/file|\1/target|" <patch |
-	git apply "$@"
+	$cmd_prefix git apply "$@"
 }
 
 test_fix () {
@@ -99,7 +105,7 @@ test_expect_success 'whitespace=warn, default rule' '
 
 test_expect_success 'whitespace=error-all, default rule' '
 
-	test_must_fail apply_patch --whitespace=error-all &&
+	apply_patch ! --whitespace=error-all &&
 	test_must_be_empty target
 
 '
diff --git a/third_party/git/t/t4134-apply-submodule.sh b/third_party/git/t/t4134-apply-submodule.sh
index 0043930ca6ab..99ed4cc54676 100755
--- a/third_party/git/t/t4134-apply-submodule.sh
+++ b/third_party/git/t/t4134-apply-submodule.sh
@@ -8,6 +8,7 @@ test_description='git apply submodule tests'
 . ./test-lib.sh
 
 test_expect_success setup '
+	test_oid_init &&
 	cat > create-sm.patch <<EOF &&
 diff --git a/dir/sm b/dir/sm
 new file mode 160000
@@ -15,7 +16,7 @@ index 0000000..0123456
 --- /dev/null
 +++ b/dir/sm
 @@ -0,0 +1 @@
-+Subproject commit 0123456789abcdef0123456789abcdef01234567
++Subproject commit $(test_oid numeric)
 EOF
 	cat > remove-sm.patch <<EOF
 diff --git a/dir/sm b/dir/sm
@@ -24,7 +25,7 @@ index 0123456..0000000
 --- a/dir/sm
 +++ /dev/null
 @@ -1 +0,0 @@
--Subproject commit 0123456789abcdef0123456789abcdef01234567
+-Subproject commit $(test_oid numeric)
 EOF
 '
 
diff --git a/third_party/git/t/t4138-apply-ws-expansion.sh b/third_party/git/t/t4138-apply-ws-expansion.sh
index 3b636a63a3ef..b19faeb67a3c 100755
--- a/third_party/git/t/t4138-apply-ws-expansion.sh
+++ b/third_party/git/t/t4138-apply-ws-expansion.sh
@@ -17,8 +17,8 @@ test_expect_success setup '
 	printf "\t%s\n" 1 2 3 >after &&
 	printf "%64s\n" a b c >>after &&
 	printf "\t%s\n" 4 5 6 >>after &&
-	git diff --no-index before after |
-		sed -e "s/before/test-1/" -e "s/after/test-1/" >patch1.patch &&
+	test_expect_code 1 git diff --no-index before after >patch1.patch.raw &&
+	sed -e "s/before/test-1/" -e "s/after/test-1/" patch1.patch.raw >patch1.patch &&
 	printf "%64s\n" 1 2 3 4 5 6 >test-1 &&
 	printf "%64s\n" 1 2 3 a b c 4 5 6 >expect-1 &&
 
@@ -33,8 +33,8 @@ test_expect_success setup '
 		x=$(( $x + 1 ))
 	done &&
 	printf "\t%s\n" d e f >>after &&
-	git diff --no-index before after |
-		sed -e "s/before/test-2/" -e "s/after/test-2/" >patch2.patch &&
+	test_expect_code 1 git diff --no-index before after >patch2.patch.raw &&
+	sed -e "s/before/test-2/" -e "s/after/test-2/" patch2.patch.raw >patch2.patch &&
 	printf "%64s\n" a b c d e f >test-2 &&
 	printf "%64s\n" a b c >expect-2 &&
 	x=1 &&
@@ -56,8 +56,8 @@ test_expect_success setup '
 		x=$(( $x + 1 ))
 	done &&
 	printf "\t%s\n" d e f >>after &&
-	git diff --no-index before after |
-	sed -e "s/before/test-3/" -e "s/after/test-3/" >patch3.patch &&
+	test_expect_code 1 git diff --no-index before after >patch3.patch.raw &&
+	sed -e "s/before/test-3/" -e "s/after/test-3/" patch3.patch.raw >patch3.patch &&
 	printf "%64s\n" a b c d e f >test-3 &&
 	printf "%64s\n" a b c >expect-3 &&
 	x=0 &&
@@ -84,8 +84,8 @@ test_expect_success setup '
 		printf "\t%02d\n" $x >>after
 		x=$(( $x + 1 ))
 	done &&
-	git diff --no-index before after |
-	sed -e "s/before/test-4/" -e "s/after/test-4/" >patch4.patch &&
+	test_expect_code 1 git diff --no-index before after >patch4.patch.raw &&
+	sed -e "s/before/test-4/" -e "s/after/test-4/" patch4.patch.raw >patch4.patch &&
 	>test-4 &&
 	x=0 &&
 	while test $x -lt 50
diff --git a/third_party/git/t/t4150-am.sh b/third_party/git/t/t4150-am.sh
index 3f7f750cc8d7..cb4527145726 100755
--- a/third_party/git/t/t4150-am.sh
+++ b/third_party/git/t/t4150-am.sh
@@ -666,6 +666,26 @@ test_expect_success 'am --show-current-patch' '
 	test_cmp .git/rebase-apply/0001 actual.patch
 '
 
+test_expect_success 'am --show-current-patch=raw' '
+	git am --show-current-patch=raw >actual.patch &&
+	test_cmp .git/rebase-apply/0001 actual.patch
+'
+
+test_expect_success 'am --show-current-patch=diff' '
+	git am --show-current-patch=diff >actual.patch &&
+	test_cmp .git/rebase-apply/patch actual.patch
+'
+
+test_expect_success 'am accepts repeated --show-current-patch' '
+	git am --show-current-patch --show-current-patch=raw >actual.patch &&
+	test_cmp .git/rebase-apply/0001 actual.patch
+'
+
+test_expect_success 'am detects incompatible --show-current-patch' '
+	test_must_fail git am --show-current-patch=raw --show-current-patch=diff &&
+	test_must_fail git am --show-current-patch --show-current-patch=diff
+'
+
 test_expect_success 'am --skip works' '
 	echo goodbye >expected &&
 	git am --skip &&
@@ -1061,4 +1081,56 @@ test_expect_success 'am --quit keeps HEAD where it is' '
 	test_cmp expected actual
 '
 
+test_expect_success 'am and .gitattibutes' '
+	test_create_repo attributes &&
+	(
+		cd attributes &&
+		test_commit init &&
+		git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
+		git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&
+
+		test_commit second &&
+		git checkout -b test HEAD^ &&
+
+		echo "*.txt filter=test conflict-marker-size=10" >.gitattributes &&
+		git add .gitattributes &&
+		test_commit third &&
+
+		echo "This text is smudged." >a.txt &&
+		git add a.txt &&
+		test_commit fourth &&
+
+		git checkout -b removal HEAD^ &&
+		git rm .gitattributes &&
+		git add -u &&
+		test_commit fifth &&
+		git cherry-pick test &&
+
+		git checkout -b conflict third &&
+		echo "This text is different." >a.txt &&
+		git add a.txt &&
+		test_commit sixth &&
+
+		git checkout test &&
+		git format-patch --stdout master..HEAD >patches &&
+		git reset --hard master &&
+		git am patches &&
+		grep "smudged" a.txt &&
+
+		git checkout removal &&
+		git reset --hard &&
+		git format-patch --stdout master..HEAD >patches &&
+		git reset --hard master &&
+		git am patches &&
+		grep "clean" a.txt &&
+
+		git checkout conflict &&
+		git reset --hard &&
+		git format-patch --stdout master..HEAD >patches &&
+		git reset --hard fourth &&
+		test_must_fail git am -3 patches &&
+		grep "<<<<<<<<<<" a.txt
+	)
+'
+
 test_done
diff --git a/third_party/git/t/t4200-rerere.sh b/third_party/git/t/t4200-rerere.sh
index 55b7750ade1c..831d424c4720 100755
--- a/third_party/git/t/t4200-rerere.sh
+++ b/third_party/git/t/t4200-rerere.sh
@@ -25,6 +25,7 @@ test_description='git rerere
 . ./test-lib.sh
 
 test_expect_success 'setup' '
+	test_oid_init &&
 	cat >a1 <<-\EOF &&
 	Some title
 	==========
@@ -210,7 +211,7 @@ test_expect_success 'set up for garbage collection tests' '
 	echo Hello >$rr/preimage &&
 	echo World >$rr/postimage &&
 
-	sha2=4000000000000000000000000000000000000000 &&
+	sha2=$(test_oid deadbeef) &&
 	rr2=.git/rr-cache/$sha2 &&
 	mkdir $rr2 &&
 	echo Hello >$rr2/preimage &&
diff --git a/third_party/git/t/t4202-log.sh b/third_party/git/t/t4202-log.sh
index c20209324c8e..0f766ba65f59 100755
--- a/third_party/git/t/t4202-log.sh
+++ b/third_party/git/t/t4202-log.sh
@@ -5,6 +5,11 @@ test_description='git log'
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 . "$TEST_DIRECTORY/lib-terminal.sh"
+. "$TEST_DIRECTORY/lib-log-graph.sh"
+
+test_cmp_graph () {
+	lib_test_cmp_graph --format=%s "$@"
+}
 
 test_expect_success setup '
 
@@ -87,12 +92,12 @@ test_expect_success 'format %w(,1,2)' '
 '
 
 cat > expect << EOF
-804a787 sixth
-394ef78 fifth
-5d31159 fourth
-2fbe8c0 third
-f7dab8e second
-3a2fdcb initial
+$(git rev-parse --short :/sixth  ) sixth
+$(git rev-parse --short :/fifth  ) fifth
+$(git rev-parse --short :/fourth ) fourth
+$(git rev-parse --short :/third  ) third
+$(git rev-parse --short :/second ) second
+$(git rev-parse --short :/initial) initial
 EOF
 test_expect_success 'oneline' '
 
@@ -173,43 +178,45 @@ test_expect_success 'git config log.follow is overridden by --no-follow' '
 	verbose test "$actual" = "$expect"
 '
 
+# Note that these commits are intentionally listed out of order.
+last_three="$(git rev-parse :/fourth :/sixth :/fifth)"
 cat > expect << EOF
-804a787 sixth
-394ef78 fifth
-5d31159 fourth
+$(git rev-parse --short :/sixth ) sixth
+$(git rev-parse --short :/fifth ) fifth
+$(git rev-parse --short :/fourth) fourth
 EOF
 test_expect_success 'git log --no-walk <commits> sorts by commit time' '
-	git log --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
+	git log --no-walk --oneline $last_three > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git log --no-walk=sorted <commits> sorts by commit time' '
-	git log --no-walk=sorted --oneline 5d31159 804a787 394ef78 > actual &&
+	git log --no-walk=sorted --oneline $last_three > actual &&
 	test_cmp expect actual
 '
 
 cat > expect << EOF
-=== 804a787 sixth
-=== 394ef78 fifth
-=== 5d31159 fourth
+=== $(git rev-parse --short :/sixth ) sixth
+=== $(git rev-parse --short :/fifth ) fifth
+=== $(git rev-parse --short :/fourth) fourth
 EOF
 test_expect_success 'git log --line-prefix="=== " --no-walk <commits> sorts by commit time' '
-	git log --line-prefix="=== " --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
+	git log --line-prefix="=== " --no-walk --oneline $last_three > actual &&
 	test_cmp expect actual
 '
 
 cat > expect << EOF
-5d31159 fourth
-804a787 sixth
-394ef78 fifth
+$(git rev-parse --short :/fourth) fourth
+$(git rev-parse --short :/sixth ) sixth
+$(git rev-parse --short :/fifth ) fifth
 EOF
 test_expect_success 'git log --no-walk=unsorted <commits> leaves list of commits as given' '
-	git log --no-walk=unsorted --oneline 5d31159 804a787 394ef78 > actual &&
+	git log --no-walk=unsorted --oneline $last_three > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git show <commits> leaves list of commits as given' '
-	git show --oneline -s 5d31159 804a787 394ef78 > actual &&
+	git show --oneline -s $last_three > actual &&
 	test_cmp expect actual
 '
 
@@ -450,8 +457,7 @@ cat > expect <<EOF
 EOF
 
 test_expect_success 'simple log --graph' '
-	git log --graph --pretty=tformat:%s >actual &&
-	test_cmp expect actual
+	test_cmp_graph
 '
 
 cat > expect <<EOF
@@ -465,8 +471,7 @@ cat > expect <<EOF
 EOF
 
 test_expect_success 'simple log --graph --line-prefix="123 "' '
-	git log --graph --line-prefix="123 " --pretty=tformat:%s >actual &&
-	test_cmp expect actual
+	test_cmp_graph --line-prefix="123 "
 '
 
 test_expect_success 'set up merge history' '
@@ -493,9 +498,7 @@ cat > expect <<\EOF
 EOF
 
 test_expect_success 'log --graph with merge' '
-	git log --graph --date-order --pretty=tformat:%s |
-		sed "s/ *\$//" >actual &&
-	test_cmp expect actual
+	test_cmp_graph --date-order
 '
 
 cat > expect <<\EOF
@@ -514,9 +517,7 @@ cat > expect <<\EOF
 EOF
 
 test_expect_success 'log --graph --line-prefix="| | | " with merge' '
-	git log --line-prefix="| | | " --graph --date-order --pretty=tformat:%s |
-		sed "s/ *\$//" >actual &&
-	test_cmp expect actual
+	test_cmp_graph --line-prefix="| | | " --date-order
 '
 
 cat > expect.colors <<\EOF
@@ -536,9 +537,7 @@ EOF
 
 test_expect_success 'log --graph with merge with log.graphColors' '
 	test_config log.graphColors " blue,invalid-color, cyan, red  , " &&
-	git log --color=always --graph --date-order --pretty=tformat:%s |
-		test_decode_color | sed "s/ *\$//" >actual &&
-	test_cmp expect.colors actual
+	lib_test_cmp_colored_graph --date-order --format=%s
 '
 
 test_expect_success 'log --raw --graph -m with merge' '
@@ -667,16 +666,14 @@ cat > expect <<\EOF
 * | | fifth
 * | | fourth
 |/ /
-* | third
+* / third
 |/
 * second
 * initial
 EOF
 
 test_expect_success 'log --graph with merge' '
-	git log --graph --date-order --pretty=tformat:%s |
-		sed "s/ *\$//" >actual &&
-	test_cmp expect actual
+	test_cmp_graph --date-order
 '
 
 test_expect_success 'log.decorate configuration' '
@@ -837,6 +834,21 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' '
 	test_cmp expect.decorate actual
 '
 
+test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
+	cat >expect.decorate <<-\EOF &&
+	Merge-tag-reach (HEAD -> master)
+	reach (tag: reach, reach)
+	seventh (tag: seventh)
+	Merge-branch-tangle
+	Merge-branch-side-early-part-into-tangle (tangle)
+	tangle-a (tag: tangle-a)
+	EOF
+	git log -n6 --decorate=short --pretty="tformat:%f%d" \
+		--decorate-refs-exclude="*octopus*" \
+		--simplify-by-decoration >actual &&
+	test_cmp expect.decorate actual
+'
+
 test_expect_success 'log.decorate config parsing' '
 	git log --oneline --decorate=full >expect.full &&
 	git log --oneline --decorate=short >expect.short &&
@@ -942,7 +954,7 @@ cat >expect <<\EOF
 | |
 | | diff --git a/reach.t b/reach.t
 | | new file mode 100644
-| | index 0000000..10c9591
+| | index BEFORE..AFTER
 | | --- /dev/null
 | | +++ b/reach.t
 | | @@ -0,0 +1 @@
@@ -965,7 +977,7 @@ cat >expect <<\EOF
 | | |
 | | |   diff --git a/octopus-b.t b/octopus-b.t
 | | |   new file mode 100644
-| | |   index 0000000..d5fcad0
+| | |   index BEFORE..AFTER
 | | |   --- /dev/null
 | | |   +++ b/octopus-b.t
 | | |   @@ -0,0 +1 @@
@@ -981,7 +993,7 @@ cat >expect <<\EOF
 | |
 | |   diff --git a/octopus-a.t b/octopus-a.t
 | |   new file mode 100644
-| |   index 0000000..11ee015
+| |   index BEFORE..AFTER
 | |   --- /dev/null
 | |   +++ b/octopus-a.t
 | |   @@ -0,0 +1 @@
@@ -997,7 +1009,7 @@ cat >expect <<\EOF
 |
 |   diff --git a/seventh.t b/seventh.t
 |   new file mode 100644
-|   index 0000000..9744ffc
+|   index BEFORE..AFTER
 |   --- /dev/null
 |   +++ b/seventh.t
 |   @@ -0,0 +1 @@
@@ -1031,7 +1043,7 @@ cat >expect <<\EOF
 | | | |
 | | | | diff --git a/tangle-a b/tangle-a
 | | | | new file mode 100644
-| | | | index 0000000..7898192
+| | | | index BEFORE..AFTER
 | | | | --- /dev/null
 | | | | +++ b/tangle-a
 | | | | @@ -0,0 +1 @@
@@ -1053,7 +1065,7 @@ cat >expect <<\EOF
 | | | |
 | | | |   diff --git a/2 b/2
 | | | |   new file mode 100644
-| | | |   index 0000000..0cfbf08
+| | | |   index BEFORE..AFTER
 | | | |   --- /dev/null
 | | | |   +++ b/2
 | | | |   @@ -0,0 +1 @@
@@ -1069,7 +1081,7 @@ cat >expect <<\EOF
 | | | |
 | | | | diff --git a/1 b/1
 | | | | new file mode 100644
-| | | | index 0000000..d00491f
+| | | | index BEFORE..AFTER
 | | | | --- /dev/null
 | | | | +++ b/1
 | | | | @@ -0,0 +1 @@
@@ -1085,7 +1097,7 @@ cat >expect <<\EOF
 | | | |
 | | | | diff --git a/one b/one
 | | | | new file mode 100644
-| | | | index 0000000..9a33383
+| | | | index BEFORE..AFTER
 | | | | --- /dev/null
 | | | | +++ b/one
 | | | | @@ -0,0 +1 @@
@@ -1101,7 +1113,7 @@ cat >expect <<\EOF
 | | |
 | | |   diff --git a/a/two b/a/two
 | | |   deleted file mode 100644
-| | |   index 9245af5..0000000
+| | |   index BEFORE..AFTER
 | | |   --- a/a/two
 | | |   +++ /dev/null
 | | |   @@ -1 +0,0 @@
@@ -1117,7 +1129,7 @@ cat >expect <<\EOF
 | | |
 | | | diff --git a/a/two b/a/two
 | | | new file mode 100644
-| | | index 0000000..9245af5
+| | | index BEFORE..AFTER
 | | | --- /dev/null
 | | | +++ b/a/two
 | | | @@ -0,0 +1 @@
@@ -1133,7 +1145,7 @@ cat >expect <<\EOF
 | |
 | |   diff --git a/ein b/ein
 | |   new file mode 100644
-| |   index 0000000..9d7e69f
+| |   index BEFORE..AFTER
 | |   --- /dev/null
 | |   +++ b/ein
 | |   @@ -0,0 +1 @@
@@ -1150,14 +1162,14 @@ cat >expect <<\EOF
 |
 |   diff --git a/ichi b/ichi
 |   new file mode 100644
-|   index 0000000..9d7e69f
+|   index BEFORE..AFTER
 |   --- /dev/null
 |   +++ b/ichi
 |   @@ -0,0 +1 @@
 |   +ichi
 |   diff --git a/one b/one
 |   deleted file mode 100644
-|   index 9d7e69f..0000000
+|   index BEFORE..AFTER
 |   --- a/one
 |   +++ /dev/null
 |   @@ -1 +0,0 @@
@@ -1172,7 +1184,7 @@ cat >expect <<\EOF
 |  1 file changed, 1 insertion(+), 1 deletion(-)
 |
 | diff --git a/one b/one
-| index 5626abf..9d7e69f 100644
+| index BEFORE..AFTER 100644
 | --- a/one
 | +++ b/one
 | @@ -1 +1 @@
@@ -1189,30 +1201,15 @@ cat >expect <<\EOF
 
   diff --git a/one b/one
   new file mode 100644
-  index 0000000..5626abf
+  index BEFORE..AFTER
   --- /dev/null
   +++ b/one
   @@ -0,0 +1 @@
   +one
 EOF
 
-sanitize_output () {
-	sed -e 's/ *$//' \
-	    -e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \
-	    -e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \
-	    -e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \
-	    -e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \
-	    -e 's/, 0 deletions(-)//' \
-	    -e 's/, 0 insertions(+)//' \
-	    -e 's/ 1 files changed, / 1 file changed, /' \
-	    -e 's/, 1 deletions(-)/, 1 deletion(-)/' \
-	    -e 's/, 1 insertions(+)/, 1 insertion(+)/'
-}
-
 test_expect_success 'log --graph with diff and stats' '
-	git log --no-renames --graph --pretty=short --stat -p >actual &&
-	sanitize_output >actual.sanitized <actual &&
-	test_i18ncmp expect actual.sanitized
+	lib_test_cmp_short_graph --no-renames --stat -p
 '
 
 cat >expect <<\EOF
@@ -1232,7 +1229,7 @@ cat >expect <<\EOF
 *** | |
 *** | | diff --git a/reach.t b/reach.t
 *** | | new file mode 100644
-*** | | index 0000000..10c9591
+*** | | index BEFORE..AFTER
 *** | | --- /dev/null
 *** | | +++ b/reach.t
 *** | | @@ -0,0 +1 @@
@@ -1255,7 +1252,7 @@ cat >expect <<\EOF
 *** | | |
 *** | | |   diff --git a/octopus-b.t b/octopus-b.t
 *** | | |   new file mode 100644
-*** | | |   index 0000000..d5fcad0
+*** | | |   index BEFORE..AFTER
 *** | | |   --- /dev/null
 *** | | |   +++ b/octopus-b.t
 *** | | |   @@ -0,0 +1 @@
@@ -1271,7 +1268,7 @@ cat >expect <<\EOF
 *** | |
 *** | |   diff --git a/octopus-a.t b/octopus-a.t
 *** | |   new file mode 100644
-*** | |   index 0000000..11ee015
+*** | |   index BEFORE..AFTER
 *** | |   --- /dev/null
 *** | |   +++ b/octopus-a.t
 *** | |   @@ -0,0 +1 @@
@@ -1287,7 +1284,7 @@ cat >expect <<\EOF
 *** |
 *** |   diff --git a/seventh.t b/seventh.t
 *** |   new file mode 100644
-*** |   index 0000000..9744ffc
+*** |   index BEFORE..AFTER
 *** |   --- /dev/null
 *** |   +++ b/seventh.t
 *** |   @@ -0,0 +1 @@
@@ -1321,7 +1318,7 @@ cat >expect <<\EOF
 *** | | | |
 *** | | | | diff --git a/tangle-a b/tangle-a
 *** | | | | new file mode 100644
-*** | | | | index 0000000..7898192
+*** | | | | index BEFORE..AFTER
 *** | | | | --- /dev/null
 *** | | | | +++ b/tangle-a
 *** | | | | @@ -0,0 +1 @@
@@ -1343,7 +1340,7 @@ cat >expect <<\EOF
 *** | | | |
 *** | | | |   diff --git a/2 b/2
 *** | | | |   new file mode 100644
-*** | | | |   index 0000000..0cfbf08
+*** | | | |   index BEFORE..AFTER
 *** | | | |   --- /dev/null
 *** | | | |   +++ b/2
 *** | | | |   @@ -0,0 +1 @@
@@ -1359,7 +1356,7 @@ cat >expect <<\EOF
 *** | | | |
 *** | | | | diff --git a/1 b/1
 *** | | | | new file mode 100644
-*** | | | | index 0000000..d00491f
+*** | | | | index BEFORE..AFTER
 *** | | | | --- /dev/null
 *** | | | | +++ b/1
 *** | | | | @@ -0,0 +1 @@
@@ -1375,7 +1372,7 @@ cat >expect <<\EOF
 *** | | | |
 *** | | | | diff --git a/one b/one
 *** | | | | new file mode 100644
-*** | | | | index 0000000..9a33383
+*** | | | | index BEFORE..AFTER
 *** | | | | --- /dev/null
 *** | | | | +++ b/one
 *** | | | | @@ -0,0 +1 @@
@@ -1391,7 +1388,7 @@ cat >expect <<\EOF
 *** | | |
 *** | | |   diff --git a/a/two b/a/two
 *** | | |   deleted file mode 100644
-*** | | |   index 9245af5..0000000
+*** | | |   index BEFORE..AFTER
 *** | | |   --- a/a/two
 *** | | |   +++ /dev/null
 *** | | |   @@ -1 +0,0 @@
@@ -1407,7 +1404,7 @@ cat >expect <<\EOF
 *** | | |
 *** | | | diff --git a/a/two b/a/two
 *** | | | new file mode 100644
-*** | | | index 0000000..9245af5
+*** | | | index BEFORE..AFTER
 *** | | | --- /dev/null
 *** | | | +++ b/a/two
 *** | | | @@ -0,0 +1 @@
@@ -1423,7 +1420,7 @@ cat >expect <<\EOF
 *** | |
 *** | |   diff --git a/ein b/ein
 *** | |   new file mode 100644
-*** | |   index 0000000..9d7e69f
+*** | |   index BEFORE..AFTER
 *** | |   --- /dev/null
 *** | |   +++ b/ein
 *** | |   @@ -0,0 +1 @@
@@ -1440,14 +1437,14 @@ cat >expect <<\EOF
 *** |
 *** |   diff --git a/ichi b/ichi
 *** |   new file mode 100644
-*** |   index 0000000..9d7e69f
+*** |   index BEFORE..AFTER
 *** |   --- /dev/null
 *** |   +++ b/ichi
 *** |   @@ -0,0 +1 @@
 *** |   +ichi
 *** |   diff --git a/one b/one
 *** |   deleted file mode 100644
-*** |   index 9d7e69f..0000000
+*** |   index BEFORE..AFTER
 *** |   --- a/one
 *** |   +++ /dev/null
 *** |   @@ -1 +0,0 @@
@@ -1462,7 +1459,7 @@ cat >expect <<\EOF
 *** |  1 file changed, 1 insertion(+), 1 deletion(-)
 *** |
 *** | diff --git a/one b/one
-*** | index 5626abf..9d7e69f 100644
+*** | index BEFORE..AFTER 100644
 *** | --- a/one
 *** | +++ b/one
 *** | @@ -1 +1 @@
@@ -1479,7 +1476,7 @@ cat >expect <<\EOF
 ***
 ***   diff --git a/one b/one
 ***   new file mode 100644
-***   index 0000000..5626abf
+***   index BEFORE..AFTER
 ***   --- /dev/null
 ***   +++ b/one
 ***   @@ -0,0 +1 @@
@@ -1487,9 +1484,7 @@ cat >expect <<\EOF
 EOF
 
 test_expect_success 'log --line-prefix="*** " --graph with diff and stats' '
-	git log --line-prefix="*** " --no-renames --graph --pretty=short --stat -p >actual &&
-	sanitize_output >actual.sanitized <actual &&
-	test_i18ncmp expect actual.sanitized
+	lib_test_cmp_short_graph --line-prefix="*** " --no-renames --stat -p
 '
 
 cat >expect <<-\EOF
@@ -1511,9 +1506,7 @@ cat >expect <<-\EOF
 EOF
 
 test_expect_success 'log --graph with --name-status' '
-	git log --graph --format=%s --name-status tangle..reach >actual &&
-	sanitize_output <actual >actual.sanitized &&
-	test_cmp expect actual.sanitized
+	test_cmp_graph --name-status tangle..reach
 '
 
 cat >expect <<-\EOF
@@ -1535,9 +1528,7 @@ cat >expect <<-\EOF
 EOF
 
 test_expect_success 'log --graph with --name-only' '
-	git log --graph --format=%s --name-only tangle..reach >actual &&
-	sanitize_output <actual >actual.sanitized &&
-	test_cmp expect actual.sanitized
+	test_cmp_graph --name-only tangle..reach
 '
 
 test_expect_success 'dotdot is a parent directory' '
@@ -1555,6 +1546,14 @@ test_expect_success GPG 'setup signed branch' '
 	git commit -S -m signed_commit
 '
 
+test_expect_success GPG 'setup signed branch with subkey' '
+	test_when_finished "git reset --hard && git checkout master" &&
+	git checkout -b signed-subkey master &&
+	echo foo >foo &&
+	git add foo &&
+	git commit -SB7227189 -m signed_commit
+'
+
 test_expect_success GPGSM 'setup signed branch x509' '
 	test_when_finished "git reset --hard && git checkout master" &&
 	git checkout -b signed-x509 master &&
@@ -1565,6 +1564,18 @@ test_expect_success GPGSM 'setup signed branch x509' '
 	git commit -S -m signed_commit
 '
 
+test_expect_success GPGSM 'log x509 fingerprint' '
+	echo "F8BF62E0693D0694816377099909C779FA23FD65 | " >expect &&
+	git log -n1 --format="%GF | %GP" signed-x509 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success GPGSM 'log OpenPGP fingerprint' '
+	echo "D4BE22311AD3131E5EDA29A461092E85B7227189" > expect &&
+	git log -n1 --format="%GP" signed-subkey >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success GPG 'log --graph --show-signature' '
 	git log --graph --show-signature -n1 signed >actual &&
 	grep "^| gpg: Signature made" actual &&
@@ -1596,6 +1607,26 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
 	grep "^| | gpg: Good signature" actual
 '
 
+test_expect_success GPG 'log --graph --show-signature for merged tag in shallow clone' '
+	test_when_finished "git reset --hard && git checkout master" &&
+	git checkout -b plain-shallow master &&
+	echo aaa >bar &&
+	git add bar &&
+	git commit -m bar_commit &&
+	git checkout --detach master &&
+	echo bbb >baz &&
+	git add baz &&
+	git commit -m baz_commit &&
+	git tag -s -m signed_tag_msg signed_tag_shallow &&
+	hash=$(git rev-parse HEAD) &&
+	git checkout plain-shallow &&
+	git merge --no-ff -m msg signed_tag_shallow &&
+	git clone --depth 1 --no-local . shallow &&
+	test_when_finished "rm -rf shallow" &&
+	git -C shallow log --graph --show-signature -n1 plain-shallow >actual &&
+	grep "tag signed_tag_shallow names a non-parent $hash" actual
+'
+
 test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
 	test_when_finished "git reset --hard && git checkout master" &&
 	test_config gpg.format x509 &&
@@ -1674,10 +1705,10 @@ test_expect_success 'set up --source tests' '
 '
 
 test_expect_success 'log --source paints branch names' '
-	cat >expect <<-\EOF &&
-	09e12a9	source-b three
-	8e393e1	source-a two
-	1ac6c77	source-b one
+	cat >expect <<-EOF &&
+	$(git rev-parse --short :/three)	source-b three
+	$(git rev-parse --short :/two  )	source-a two
+	$(git rev-parse --short :/one  )	source-b one
 	EOF
 	git log --oneline --source source-a source-b >actual &&
 	test_cmp expect actual
@@ -1685,19 +1716,19 @@ test_expect_success 'log --source paints branch names' '
 
 test_expect_success 'log --source paints tag names' '
 	git tag -m tagged source-tag &&
-	cat >expect <<-\EOF &&
-	09e12a9	source-tag three
-	8e393e1	source-a two
-	1ac6c77	source-tag one
+	cat >expect <<-EOF &&
+	$(git rev-parse --short :/three)	source-tag three
+	$(git rev-parse --short :/two  )	source-a two
+	$(git rev-parse --short :/one  )	source-tag one
 	EOF
 	git log --oneline --source source-tag source-a >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'log --source paints symmetric ranges' '
-	cat >expect <<-\EOF &&
-	09e12a9	source-b three
-	8e393e1	source-a two
+	cat >expect <<-EOF &&
+	$(git rev-parse --short :/three)	source-b three
+	$(git rev-parse --short :/two  )	source-a two
 	EOF
 	git log --oneline --source source-a...source-b >actual &&
 	test_cmp expect actual
@@ -1707,4 +1738,11 @@ test_expect_success '--exclude-promisor-objects does not BUG-crash' '
 	test_must_fail git log --exclude-promisor-objects source-a
 '
 
+test_expect_success 'log --end-of-options' '
+       git update-ref refs/heads/--source HEAD &&
+       git log --end-of-options --source >actual &&
+       git log >expect &&
+       test_cmp expect actual
+'
+
 test_done
diff --git a/third_party/git/t/t4203-mailmap.sh b/third_party/git/t/t4203-mailmap.sh
index 918ada69eb96..586c3a86b1d2 100755
--- a/third_party/git/t/t4203-mailmap.sh
+++ b/third_party/git/t/t4203-mailmap.sh
@@ -13,8 +13,8 @@ fuzz_blame () {
 }
 
 test_expect_success setup '
-	cat >contacts <<-\EOF &&
-	A U Thor <author@example.com>
+	cat >contacts <<- EOF &&
+	$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 	nick1 <bugs@company.xx>
 	EOF
 
@@ -33,19 +33,19 @@ test_expect_success 'check-mailmap no arguments' '
 '
 
 test_expect_success 'check-mailmap arguments' '
-	cat >expect <<-\EOF &&
-	A U Thor <author@example.com>
+	cat >expect <<- EOF &&
+	$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 	nick1 <bugs@company.xx>
 	EOF
 	git check-mailmap \
-		"A U Thor <author@example.com>" \
+		"$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" \
 		"nick1 <bugs@company.xx>" >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'check-mailmap --stdin' '
-	cat >expect <<-\EOF &&
-	A U Thor <author@example.com>
+	cat >expect <<- EOF &&
+	$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 	nick1 <bugs@company.xx>
 	EOF
 	git check-mailmap --stdin <contacts >actual &&
@@ -66,8 +66,8 @@ test_expect_success 'check-mailmap bogus contact' '
 	test_must_fail git check-mailmap bogus
 '
 
-cat >expect <<\EOF
-A U Thor (1):
+cat >expect << EOF
+$GIT_AUTHOR_NAME (1):
       initial
 
 nick1 (1):
@@ -90,7 +90,7 @@ nick1 (1):
 EOF
 
 test_expect_success 'default .mailmap' '
-	echo "Repo Guy <author@example.com>" > .mailmap &&
+	echo "Repo Guy <$GIT_AUTHOR_EMAIL>" > .mailmap &&
 	git shortlog HEAD >actual &&
 	test_cmp expect actual
 '
@@ -122,7 +122,7 @@ Internal Guy (1):
 
 EOF
 test_expect_success 'mailmap.file override' '
-	echo "External Guy <author@example.com>" >> internal_mailmap/.mailmap &&
+	echo "External Guy <$GIT_AUTHOR_EMAIL>" >> internal_mailmap/.mailmap &&
 	git config mailmap.file internal_mailmap/.mailmap &&
 	git shortlog HEAD >actual &&
 	test_cmp expect actual
@@ -178,8 +178,8 @@ test_expect_success 'name entry after email entry, case-insensitive' '
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-A U Thor (1):
+cat >expect << EOF
+$GIT_AUTHOR_NAME (1):
       initial
 
 nick1 (1):
@@ -195,18 +195,18 @@ test_expect_success 'No mailmap files, but configured' '
 test_expect_success 'setup mailmap blob tests' '
 	git checkout -b map &&
 	test_when_finished "git checkout master" &&
-	cat >just-bugs <<-\EOF &&
+	cat >just-bugs <<- EOF &&
 	Blob Guy <bugs@company.xx>
 	EOF
-	cat >both <<-\EOF &&
-	Blob Guy <author@example.com>
+	cat >both <<- EOF &&
+	Blob Guy <$GIT_AUTHOR_EMAIL>
 	Blob Guy <bugs@company.xx>
 	EOF
-	printf "Tricky Guy <author@example.com>" >no-newline &&
+	printf "Tricky Guy <$GIT_AUTHOR_EMAIL>" >no-newline &&
 	git add just-bugs both no-newline &&
 	git commit -m "my mailmaps" &&
-	echo "Repo Guy <author@example.com>" >.mailmap &&
-	echo "Internal Guy <author@example.com>" >internal.map
+	echo "Repo Guy <$GIT_AUTHOR_EMAIL>" >.mailmap &&
+	echo "Internal Guy <$GIT_AUTHOR_EMAIL>" >internal.map
 '
 
 test_expect_success 'mailmap.blob set' '
@@ -266,12 +266,12 @@ test_expect_success 'mailmap.blob defaults to off in non-bare repo' '
 	git init non-bare &&
 	(
 		cd non-bare &&
-		test_commit one .mailmap "Fake Name <author@example.com>" &&
+		test_commit one .mailmap "Fake Name <$GIT_AUTHOR_EMAIL>" &&
 		echo "     1	Fake Name" >expect &&
 		git shortlog -ns HEAD >actual &&
 		test_cmp expect actual &&
 		rm .mailmap &&
-		echo "     1	A U Thor" >expect &&
+		echo "     1	$GIT_AUTHOR_NAME" >expect &&
 		git shortlog -ns HEAD >actual &&
 		test_cmp expect actual
 	)
@@ -305,26 +305,26 @@ test_expect_success 'cleanup after mailmap.blob tests' '
 '
 
 test_expect_success 'single-character name' '
-	echo "     1	A <author@example.com>" >expect &&
+	echo "     1	A <$GIT_AUTHOR_EMAIL>" >expect &&
 	echo "     1	nick1 <bugs@company.xx>" >>expect &&
-	echo "A <author@example.com>" >.mailmap &&
+	echo "A <$GIT_AUTHOR_EMAIL>" >.mailmap &&
 	test_when_finished "rm .mailmap" &&
 	git shortlog -es HEAD >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'preserve canonical email case' '
-	echo "     1	A U Thor <AUTHOR@example.com>" >expect &&
+	echo "     1	$GIT_AUTHOR_NAME <AUTHOR@example.com>" >expect &&
 	echo "     1	nick1 <bugs@company.xx>" >>expect &&
-	echo "<AUTHOR@example.com> <author@example.com>" >.mailmap &&
+	echo "<AUTHOR@example.com> <$GIT_AUTHOR_EMAIL>" >.mailmap &&
 	test_when_finished "rm .mailmap" &&
 	git shortlog -es HEAD >actual &&
 	test_cmp expect actual
 '
 
 # Extended mailmap configurations should give us the following output for shortlog
-cat >expect <<\EOF
-A U Thor <author@example.com> (1):
+cat >expect << EOF
+$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> (1):
       initial
 
 CTO <cto@company.xx> (1):
@@ -370,7 +370,7 @@ test_expect_success 'Shortlog output (complex mapping)' '
 	git commit --author "CTO <cto@coompany.xx>" -m seventh &&
 
 	mkdir -p internal_mailmap &&
-	echo "Committed <committer@example.com>" > internal_mailmap/.mailmap &&
+	echo "Committed <$GIT_COMMITTER_EMAIL>" > internal_mailmap/.mailmap &&
 	echo "<cto@company.xx>                       <cto@coompany.xx>" >> internal_mailmap/.mailmap &&
 	echo "Some Dude <some@dude.xx>         nick1 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
 	echo "Other Author <other@author.xx>   nick2 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
@@ -384,27 +384,27 @@ test_expect_success 'Shortlog output (complex mapping)' '
 '
 
 # git log with --pretty format which uses the name and email mailmap placemarkers
-cat >expect <<\EOF
+cat >expect << EOF
 Author CTO <cto@coompany.xx> maps to CTO <cto@company.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
 Author claus <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
 Author santa <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
 Author nick2 <nick2@company.xx> maps to Other Author <other@author.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
 Author nick2 <bugs@company.xx> maps to Other Author <other@author.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
 Author nick1 <bugs@company.xx> maps to Some Dude <some@dude.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
-Author A U Thor <author@example.com> maps to A U Thor <author@example.com>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+Author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> maps to $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 EOF
 
 test_expect_success 'Log output (complex mapping)' '
@@ -412,14 +412,42 @@ test_expect_success 'Log output (complex mapping)' '
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
+cat >expect << EOF
+Author email cto@coompany.xx has local-part cto
+Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+Author email me@company.xx has local-part me
+Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+Author email me@company.xx has local-part me
+Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+Author email nick2@company.xx has local-part nick2
+Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+Author email bugs@company.xx has local-part bugs
+Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+Author email bugs@company.xx has local-part bugs
+Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+Author email author@example.com has local-part author
+Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+EOF
+
+test_expect_success 'Log output (local-part email address)' '
+	git log --pretty=format:"Author email %ae has local-part %al%nCommitter email %ce has local-part %cl%n" >actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
 Author: CTO <cto@company.xx>
 Author: Santa Claus <santa.claus@northpole.xx>
 Author: Santa Claus <santa.claus@northpole.xx>
 Author: Other Author <other@author.xx>
 Author: Other Author <other@author.xx>
 Author: Some Dude <some@dude.xx>
-Author: A U Thor <author@example.com>
+Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 EOF
 
 test_expect_success 'Log output with --use-mailmap' '
@@ -427,14 +455,14 @@ test_expect_success 'Log output with --use-mailmap' '
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
+cat >expect << EOF
 Author: CTO <cto@company.xx>
 Author: Santa Claus <santa.claus@northpole.xx>
 Author: Santa Claus <santa.claus@northpole.xx>
 Author: Other Author <other@author.xx>
 Author: Other Author <other@author.xx>
 Author: Some Dude <some@dude.xx>
-Author: A U Thor <author@example.com>
+Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 EOF
 
 test_expect_success 'Log output with log.mailmap' '
@@ -443,28 +471,28 @@ test_expect_success 'Log output with log.mailmap' '
 '
 
 test_expect_success 'log.mailmap=false disables mailmap' '
-	cat >expect <<-\EOF &&
+	cat >expect <<- EOF &&
 	Author: CTO <cto@coompany.xx>
 	Author: claus <me@company.xx>
 	Author: santa <me@company.xx>
 	Author: nick2 <nick2@company.xx>
 	Author: nick2 <bugs@company.xx>
 	Author: nick1 <bugs@company.xx>
-	Author: A U Thor <author@example.com>
+	Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 	EOF
 	git -c log.mailmap=False log | grep Author > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success '--no-use-mailmap disables mailmap' '
-	cat >expect <<-\EOF &&
+	cat >expect <<- EOF &&
 	Author: CTO <cto@coompany.xx>
 	Author: claus <me@company.xx>
 	Author: santa <me@company.xx>
 	Author: nick2 <nick2@company.xx>
 	Author: nick2 <bugs@company.xx>
 	Author: nick1 <bugs@company.xx>
-	Author: A U Thor <author@example.com>
+	Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 	EOF
 	git log --no-use-mailmap | grep Author > actual &&
 	test_cmp expect actual
@@ -500,8 +528,8 @@ test_expect_success 'Only grep replaced author with --use-mailmap' '
 '
 
 # git blame
-cat >expect <<\EOF
-^OBJI (A U Thor     DATE 1) one
+cat >expect <<EOF
+^OBJI ($GIT_AUTHOR_NAME     DATE 1) one
 OBJID (Some Dude    DATE 2) two
 OBJID (Other Author DATE 3) three
 OBJID (Other Author DATE 4) four
diff --git a/third_party/git/t/t4204-patch-id.sh b/third_party/git/t/t4204-patch-id.sh
index 0288c17ec60b..8ff8bd84c75e 100755
--- a/third_party/git/t/t4204-patch-id.sh
+++ b/third_party/git/t/t4204-patch-id.sh
@@ -25,7 +25,7 @@ test_expect_success 'setup' '
 
 test_expect_success 'patch-id output is well-formed' '
 	git log -p -1 | git patch-id >output &&
-	grep "^[a-f0-9]\{40\} $(git rev-parse HEAD)$" output
+	grep "^$OID_REGEX $(git rev-parse HEAD)$" output
 '
 
 #calculate patch id. Make sure output is not empty.
diff --git a/third_party/git/t/t4205-log-pretty-formats.sh b/third_party/git/t/t4205-log-pretty-formats.sh
index f42a69faa2fd..204c149d5a49 100755
--- a/third_party/git/t/t4205-log-pretty-formats.sh
+++ b/third_party/git/t/t4205-log-pretty-formats.sh
@@ -134,6 +134,36 @@ test_expect_failure C_LOCALE_OUTPUT 'NUL termination with --stat' '
 	test_cmp expected actual
 '
 
+for p in short medium full fuller email raw
+do
+	test_expect_success "NUL termination with --reflog --pretty=$p" '
+		revs="$(git rev-list --reflog)" &&
+		for r in $revs
+		do
+			git show -s "$r" --pretty="$p" &&
+			printf "\0" || return 1
+		done >expect &&
+		{
+			git log -z --reflog --pretty="$p" &&
+			printf "\0"
+		} >actual &&
+		test_cmp expect actual
+	'
+done
+
+test_expect_success 'NUL termination with --reflog --pretty=oneline' '
+	revs="$(git rev-list --reflog)" &&
+	for r in $revs
+	do
+		git show -s --pretty=oneline "$r" >raw &&
+		cat raw | lf_to_nul || exit 1
+	done >expect &&
+	# the trailing NUL is already produced so we do not need to
+	# output another one
+	git log -z --pretty=oneline --reflog >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'setup more commits' '
 	test_commit "message one" one one message-one &&
 	test_commit "message two" two two message-two &&
@@ -503,6 +533,12 @@ test_expect_success 'ISO and ISO-strict date formats display the same values' '
 	test_cmp expected actual
 '
 
+test_expect_success 'short date' '
+	git log --format=%ad%n%cd --date=short >expected &&
+	git log --format=%as%n%cs >actual &&
+	test_cmp expected actual
+'
+
 # get new digests (with no abbreviations)
 test_expect_success 'set up log decoration tests' '
 	head1=$(git rev-parse --verify HEAD~0) &&
@@ -640,7 +676,7 @@ test_expect_success 'pretty format %(trailers:key=foo) multiple keys' '
 	test_cmp expect actual
 '
 
-test_expect_success '%(trailers:key=nonexistant) becomes empty' '
+test_expect_success '%(trailers:key=nonexistent) becomes empty' '
 	git log --no-walk --pretty="x%(trailers:key=Nacked-by)x" >actual &&
 	echo "xx" >expect &&
 	test_cmp expect actual
@@ -788,4 +824,47 @@ test_expect_success '%S in git log --format works with other placeholders (part
 	test_cmp expect actual
 '
 
+test_expect_success 'log --pretty=reference' '
+	git log --pretty="tformat:%h (%s, %as)" >expect &&
+	git log --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference with log.date is overridden by short date' '
+	git log --pretty="tformat:%h (%s, %as)" >expect &&
+	test_config log.date rfc &&
+	git log --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference with explicit date overrides short date' '
+	git log --date=rfc --pretty="tformat:%h (%s, %ad)" >expect &&
+	git log --date=rfc --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference is never unabbreviated' '
+	git log --pretty="tformat:%h (%s, %as)" >expect &&
+	git log --no-abbrev-commit --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference is never decorated' '
+	git log --pretty="tformat:%h (%s, %as)" >expect &&
+	git log --decorate=short --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference does not output reflog info' '
+	git log --walk-reflogs --pretty="tformat:%h (%s, %as)" >expect &&
+	git log --walk-reflogs --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference is colored appropriately' '
+	git log --color=always --pretty="tformat:%C(auto)%h (%s, %as)" >expect &&
+	git log --color=always --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/third_party/git/t/t4210-log-i18n.sh b/third_party/git/t/t4210-log-i18n.sh
index 7c519436ef3d..c3792081e627 100755
--- a/third_party/git/t/t4210-log-i18n.sh
+++ b/third_party/git/t/t4210-log-i18n.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 
 test_description='test log with i18n features'
-. ./test-lib.sh
+. ./lib-gettext.sh
 
 # two forms of รฉ
 utf8_e=$(printf '\303\251')
 latin1_e=$(printf '\351')
 
+# invalid UTF-8
+invalid_e=$(printf '\303\50)') # ")" at end to close opening "("
+
 test_expect_success 'create commits in different encodings' '
 	test_tick &&
 	cat >msg <<-EOF &&
@@ -48,9 +51,43 @@ test_expect_success !MINGW 'log --grep does not find non-reencoded values (utf8)
 	test_must_be_empty actual
 '
 
-test_expect_success 'log --grep does not find non-reencoded values (latin1)' '
+test_expect_success !MINGW 'log --grep does not find non-reencoded values (latin1)' '
 	git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
 	test_must_be_empty actual
 '
 
+for engine in fixed basic extended perl
+do
+	prereq=
+	if test $engine = "perl"
+	then
+		prereq="PCRE"
+	else
+		prereq=""
+	fi
+	force_regex=
+	if test $engine != "fixed"
+	then
+	    force_regex=.*
+	fi
+	test_expect_success !MINGW,!REGEX_ILLSEQ,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
+		cat >expect <<-\EOF &&
+		latin1
+		utf8
+		EOF
+		LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$latin1_e\" >actual &&
+		test_cmp expect actual
+	"
+
+	test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
+		LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$utf8_e\" >actual &&
+		test_must_be_empty actual
+	"
+
+	test_expect_success !MINGW,!REGEX_ILLSEQ,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)" "
+		LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$invalid_e\" >actual &&
+		test_must_be_empty actual
+	"
+done
+
 test_done
diff --git a/third_party/git/t/t4211-line-log.sh b/third_party/git/t/t4211-line-log.sh
index 1db7bd0f59b4..cda58186c2d2 100755
--- a/third_party/git/t/t4211-line-log.sh
+++ b/third_party/git/t/t4211-line-log.sh
@@ -4,6 +4,7 @@ test_description='test log -L'
 . ./test-lib.sh
 
 test_expect_success 'setup (import history)' '
+	test_oid_init &&
 	git fast-import < "$TEST_DIRECTORY"/t4211/history.export &&
 	git reset --hard
 '
@@ -11,7 +12,7 @@ test_expect_success 'setup (import history)' '
 canned_test_1 () {
 	test_expect_$1 "$2" "
 		git log $2 >actual &&
-		test_cmp \"\$TEST_DIRECTORY\"/t4211/expect.$3 actual
+		test_cmp \"\$TEST_DIRECTORY\"/t4211/$(test_oid algo)/expect.$3 actual
 	"
 }
 
@@ -132,4 +133,86 @@ test_expect_success '--raw is forbidden' '
 	test_must_fail git log -L1,24:b.c --raw
 '
 
+test_expect_success 'setup for checking fancy rename following' '
+	git checkout --orphan moves-start &&
+	git reset --hard &&
+
+	printf "%s\n"    12 13 14 15      b c d e   >file-1 &&
+	printf "%s\n"    22 23 24 25      B C D E   >file-2 &&
+	git add file-1 file-2 &&
+	test_tick &&
+	git commit -m "Add file-1 and file-2" &&
+	oid_add_f1_f2=$(git rev-parse --short HEAD) &&
+
+	git checkout -b moves-main &&
+	printf "%s\n" 11 12 13 14 15      b c d e   >file-1 &&
+	git commit -a -m "Modify file-1 on main" &&
+	oid_mod_f1_main=$(git rev-parse --short HEAD) &&
+
+	printf "%s\n" 21 22 23 24 25      B C D E   >file-2 &&
+	git commit -a -m "Modify file-2 on main #1" &&
+	oid_mod_f2_main_1=$(git rev-parse --short HEAD) &&
+
+	git mv file-1 renamed-1 &&
+	git commit -m "Rename file-1 to renamed-1 on main" &&
+
+	printf "%s\n" 11 12 13 14 15      b c d e f >renamed-1 &&
+	git commit -a -m "Modify renamed-1 on main" &&
+	oid_mod_r1_main=$(git rev-parse --short HEAD) &&
+
+	printf "%s\n" 21 22 23 24 25      B C D E F >file-2 &&
+	git commit -a -m "Modify file-2 on main #2" &&
+	oid_mod_f2_main_2=$(git rev-parse --short HEAD) &&
+
+	git checkout -b moves-side moves-start &&
+	printf "%s\n"    12 13 14 15 16   b c d e   >file-1 &&
+	git commit -a -m "Modify file-1 on side #1" &&
+	oid_mod_f1_side_1=$(git rev-parse --short HEAD) &&
+
+	printf "%s\n"    22 23 24 25 26   B C D E   >file-2 &&
+	git commit -a -m "Modify file-2 on side" &&
+	oid_mod_f2_side=$(git rev-parse --short HEAD) &&
+
+	git mv file-2 renamed-2 &&
+	git commit -m "Rename file-2 to renamed-2 on side" &&
+
+	printf "%s\n"    12 13 14 15 16 a b c d e   >file-1 &&
+	git commit -a -m "Modify file-1 on side #2" &&
+	oid_mod_f1_side_2=$(git rev-parse --short HEAD) &&
+
+	printf "%s\n"    22 23 24 25 26 A B C D E   >renamed-2 &&
+	git commit -a -m "Modify renamed-2 on side" &&
+	oid_mod_r2_side=$(git rev-parse --short HEAD) &&
+
+	git checkout moves-main &&
+	git merge moves-side &&
+	oid_merge=$(git rev-parse --short HEAD)
+'
+
+test_expect_success 'fancy rename following #1' '
+	cat >expect <<-EOF &&
+	$oid_merge Merge branch '\''moves-side'\'' into moves-main
+	$oid_mod_f1_side_2 Modify file-1 on side #2
+	$oid_mod_f1_side_1 Modify file-1 on side #1
+	$oid_mod_r1_main Modify renamed-1 on main
+	$oid_mod_f1_main Modify file-1 on main
+	$oid_add_f1_f2 Add file-1 and file-2
+	EOF
+	git log -L1:renamed-1 --oneline --no-patch >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'fancy rename following #2' '
+	cat >expect <<-EOF &&
+	$oid_merge Merge branch '\''moves-side'\'' into moves-main
+	$oid_mod_r2_side Modify renamed-2 on side
+	$oid_mod_f2_side Modify file-2 on side
+	$oid_mod_f2_main_2 Modify file-2 on main #2
+	$oid_mod_f2_main_1 Modify file-2 on main #1
+	$oid_add_f1_f2 Add file-1 and file-2
+	EOF
+	git log -L1:renamed-2 --oneline --no-patch >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/third_party/git/t/t4211/expect.beginning-of-file b/third_party/git/t/t4211/sha1/expect.beginning-of-file
index 91b405489892..91b405489892 100644
--- a/third_party/git/t/t4211/expect.beginning-of-file
+++ b/third_party/git/t/t4211/sha1/expect.beginning-of-file
diff --git a/third_party/git/t/t4211/expect.end-of-file b/third_party/git/t/t4211/sha1/expect.end-of-file
index bd25bb2f591f..bd25bb2f591f 100644
--- a/third_party/git/t/t4211/expect.end-of-file
+++ b/third_party/git/t/t4211/sha1/expect.end-of-file
diff --git a/third_party/git/t/t4211/expect.move-support-f b/third_party/git/t/t4211/sha1/expect.move-support-f
index c905e01bc25c..c905e01bc25c 100644
--- a/third_party/git/t/t4211/expect.move-support-f
+++ b/third_party/git/t/t4211/sha1/expect.move-support-f
diff --git a/third_party/git/t/t4211/expect.multiple b/third_party/git/t/t4211/sha1/expect.multiple
index 76ad5b598cb8..76ad5b598cb8 100644
--- a/third_party/git/t/t4211/expect.multiple
+++ b/third_party/git/t/t4211/sha1/expect.multiple
diff --git a/third_party/git/t/t4211/expect.multiple-overlapping b/third_party/git/t/t4211/sha1/expect.multiple-overlapping
index d930b6eec4c4..d930b6eec4c4 100644
--- a/third_party/git/t/t4211/expect.multiple-overlapping
+++ b/third_party/git/t/t4211/sha1/expect.multiple-overlapping
diff --git a/third_party/git/t/t4211/expect.multiple-superset b/third_party/git/t/t4211/sha1/expect.multiple-superset
index d930b6eec4c4..d930b6eec4c4 100644
--- a/third_party/git/t/t4211/expect.multiple-superset
+++ b/third_party/git/t/t4211/sha1/expect.multiple-superset
diff --git a/third_party/git/t/t4211/expect.parallel-change-f-to-main b/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main
index 052def8074da..052def8074da 100644
--- a/third_party/git/t/t4211/expect.parallel-change-f-to-main
+++ b/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main
diff --git a/third_party/git/t/t4211/expect.simple-f b/third_party/git/t/t4211/sha1/expect.simple-f
index a1f5bc49c879..a1f5bc49c879 100644
--- a/third_party/git/t/t4211/expect.simple-f
+++ b/third_party/git/t/t4211/sha1/expect.simple-f
diff --git a/third_party/git/t/t4211/expect.simple-f-to-main b/third_party/git/t/t4211/sha1/expect.simple-f-to-main
index a475768710b5..a475768710b5 100644
--- a/third_party/git/t/t4211/expect.simple-f-to-main
+++ b/third_party/git/t/t4211/sha1/expect.simple-f-to-main
diff --git a/third_party/git/t/t4211/expect.simple-main b/third_party/git/t/t4211/sha1/expect.simple-main
index 39ce39bebed7..39ce39bebed7 100644
--- a/third_party/git/t/t4211/expect.simple-main
+++ b/third_party/git/t/t4211/sha1/expect.simple-main
diff --git a/third_party/git/t/t4211/expect.simple-main-to-end b/third_party/git/t/t4211/sha1/expect.simple-main-to-end
index 8480bd9cc45b..8480bd9cc45b 100644
--- a/third_party/git/t/t4211/expect.simple-main-to-end
+++ b/third_party/git/t/t4211/sha1/expect.simple-main-to-end
diff --git a/third_party/git/t/t4211/expect.two-ranges b/third_party/git/t/t4211/sha1/expect.two-ranges
index 6109aa0dcee7..6109aa0dcee7 100644
--- a/third_party/git/t/t4211/expect.two-ranges
+++ b/third_party/git/t/t4211/sha1/expect.two-ranges
diff --git a/third_party/git/t/t4211/expect.vanishes-early b/third_party/git/t/t4211/sha1/expect.vanishes-early
index 1f7cd0694149..1f7cd0694149 100644
--- a/third_party/git/t/t4211/expect.vanishes-early
+++ b/third_party/git/t/t4211/sha1/expect.vanishes-early
diff --git a/third_party/git/t/t4211/sha256/expect.beginning-of-file b/third_party/git/t/t4211/sha256/expect.beginning-of-file
new file mode 100644
index 000000000000..5adfdfc1a120
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.beginning-of-file
@@ -0,0 +1,43 @@
+commit 62a40b38fa4f00800004aee81ef287b7201317594ebcb990f38cbe493b01d200
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
+
+    change at very beginning
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,3 +1,3 @@
+ #include <stdio.h>
+ 
+-int f(int x)
++long f(long x)
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +1,3 @@
++#include <stdio.h>
++
++int f(int x)
diff --git a/third_party/git/t/t4211/sha256/expect.end-of-file b/third_party/git/t/t4211/sha256/expect.end-of-file
new file mode 100644
index 000000000000..03ab5c1784e2
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.end-of-file
@@ -0,0 +1,62 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -20,3 +20,5 @@
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -20,3 +20,3 @@
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -19,3 +19,3 @@
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +18,3 @@
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/third_party/git/t/t4211/sha256/expect.move-support-f b/third_party/git/t/t4211/sha256/expect.move-support-f
new file mode 100644
index 000000000000..223b4ed2a0cf
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.move-support-f
@@ -0,0 +1,80 @@
+commit 4f7a58195a92c400e28a2354328587f1ff14fb77f5cf894536f17ccbc72931b9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:49:50 2013 +0100
+
+    another simple change
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -4,9 +4,9 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+-		x >>= 1;
++		x /= 2;
+ 		s++;
+ 	}
+ 	return s;
+ }
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,9 +3,9 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,8 +3,9 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,8 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
diff --git a/third_party/git/t/t4211/sha256/expect.multiple b/third_party/git/t/t4211/sha256/expect.multiple
new file mode 100644
index 000000000000..ca00409b9a39
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.multiple
@@ -0,0 +1,104 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,7 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,9 +3,9 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+@@ -17,5 +17,5 @@
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,8 +3,9 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,8 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
diff --git a/third_party/git/t/t4211/sha256/expect.multiple-overlapping b/third_party/git/t/t4211/sha256/expect.multiple-overlapping
new file mode 100644
index 000000000000..9015a45a256f
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.multiple-overlapping
@@ -0,0 +1,187 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,19 +4,21 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,19 +4,19 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,19 +3,19 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,19 +3,19 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,18 +3,19 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,18 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/third_party/git/t/t4211/sha256/expect.multiple-superset b/third_party/git/t/t4211/sha256/expect.multiple-superset
new file mode 100644
index 000000000000..9015a45a256f
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.multiple-superset
@@ -0,0 +1,187 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,19 +4,21 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,19 +4,19 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,19 +3,19 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,19 +3,19 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,18 +3,19 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,18 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/third_party/git/t/t4211/sha256/expect.parallel-change-f-to-main b/third_party/git/t/t4211/sha256/expect.parallel-change-f-to-main
new file mode 100644
index 000000000000..e68f8928ea70
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.parallel-change-f-to-main
@@ -0,0 +1,160 @@
+commit 98117c2059b76c36995748fb97b02542aef477fe26379e94c18fd70f7790bc67
+Merge: b511694 4f7a581
+Author: Thomas Rast <trast@inf.ethz.ch>
+Date:   Fri Apr 12 16:16:24 2013 +0200
+
+    Merge across the rename
+
+
+commit 4f7a58195a92c400e28a2354328587f1ff14fb77f5cf894536f17ccbc72931b9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:49:50 2013 +0100
+
+    another simple change
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -4,14 +4,14 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+-		x >>= 1;
++		x /= 2;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+
+commit b511694f5337663fbd697622993a5f8e1099eca84be4df313f2b3ee94a098b42
+Author: Thomas Rast <trast@inf.ethz.ch>
+Date:   Fri Apr 12 16:15:57 2013 +0200
+
+    change on another line of history while rename happens
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,14 +4,14 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * This is only an example!
++ * This is only a short example!
+  */
+ 
+
+commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,14 +3,14 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,14 +3,14 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,13 +3,14 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,13 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
diff --git a/third_party/git/t/t4211/sha256/expect.simple-f b/third_party/git/t/t4211/sha256/expect.simple-f
new file mode 100644
index 000000000000..65508d7c0bc6
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.simple-f
@@ -0,0 +1,59 @@
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,9 +3,9 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,8 +3,9 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,8 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
diff --git a/third_party/git/t/t4211/sha256/expect.simple-f-to-main b/third_party/git/t/t4211/sha256/expect.simple-f-to-main
new file mode 100644
index 000000000000..77b721c196b1
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.simple-f-to-main
@@ -0,0 +1,100 @@
+commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,14 +3,14 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,14 +3,14 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,13 +3,14 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,13 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
diff --git a/third_party/git/t/t4211/sha256/expect.simple-main b/third_party/git/t/t4211/sha256/expect.simple-main
new file mode 100644
index 000000000000..d20708c9f9a0
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.simple-main
@@ -0,0 +1,68 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -17,5 +17,5 @@
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +16,5 @@
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/third_party/git/t/t4211/sha256/expect.simple-main-to-end b/third_party/git/t/t4211/sha256/expect.simple-main-to-end
new file mode 100644
index 000000000000..617cdf34819e
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.simple-main-to-end
@@ -0,0 +1,70 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,7 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -17,5 +17,5 @@
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +16,5 @@
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/third_party/git/t/t4211/sha256/expect.two-ranges b/third_party/git/t/t4211/sha256/expect.two-ranges
new file mode 100644
index 000000000000..af57c8b99783
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.two-ranges
@@ -0,0 +1,102 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,9 +3,9 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+@@ -17,5 +17,5 @@
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,8 +3,9 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,8 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
diff --git a/third_party/git/t/t4211/sha256/expect.vanishes-early b/third_party/git/t/t4211/sha256/expect.vanishes-early
new file mode 100644
index 000000000000..11ec9bdecfcc
--- /dev/null
+++ b/third_party/git/t/t4211/sha256/expect.vanishes-early
@@ -0,0 +1,39 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -22,1 +24,1 @@
+-}
+\ No newline at end of file
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -22,1 +22,1 @@
+-}
++}
+\ No newline at end of file
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +20,1 @@
++}
diff --git a/third_party/git/t/t4213-log-tabexpand.sh b/third_party/git/t/t4213-log-tabexpand.sh
index 7f90f58c03e6..53a4af324495 100755
--- a/third_party/git/t/t4213-log-tabexpand.sh
+++ b/third_party/git/t/t4213-log-tabexpand.sh
@@ -36,7 +36,7 @@ count_expand ()
 	esac
 
 	# Prefix the output with the command line arguments, and
-	# replace SP with a dot both in the expecte and actual output
+	# replace SP with a dot both in the expected and actual output
 	# so that test_cmp would show the difference together with the
 	# breakage in a way easier to consume by the debugging user.
 	{
diff --git a/third_party/git/t/t4214-log-graph-octopus.sh b/third_party/git/t/t4214-log-graph-octopus.sh
index dab96c89aa8a..a08032509840 100755
--- a/third_party/git/t/t4214-log-graph-octopus.sh
+++ b/third_party/git/t/t4214-log-graph-octopus.sh
@@ -3,82 +3,86 @@
 test_description='git log --graph of skewed left octopus merge.'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-log-graph.sh
+
+test_cmp_graph () {
+	cat >expect &&
+	lib_test_cmp_graph --color=never --date-order --format=%s "$@"
+}
+
+test_cmp_colored_graph () {
+	lib_test_cmp_colored_graph --date-order --format=%s "$@"
+}
 
 test_expect_success 'set up merge history' '
-	cat >expect.uncolored <<-\EOF &&
+	test_commit initial &&
+	for i in 1 2 3 4 ; do
+		git checkout master -b $i || return $?
+		# Make tag name different from branch name, to avoid
+		# ambiguity error when calling checkout.
+		test_commit $i $i $i tag$i || return $?
+	done &&
+	git checkout 1 -b merge &&
+	test_merge octopus-merge 1 2 3 4 &&
+	test_commit after-merge &&
+	git checkout 1 -b L &&
+	test_commit left &&
+	git checkout 4 -b crossover &&
+	test_commit after-4 &&
+	git checkout initial -b more-L &&
+	test_commit after-initial
+'
+
+test_expect_success 'log --graph with tricky octopus merge, no color' '
+	test_cmp_graph left octopus-merge <<-\EOF
 	* left
-	| *---.   octopus-merge
-	| |\ \ \
-	|/ / / /
+	| *-.   octopus-merge
+	|/|\ \
 	| | | * 4
 	| | * | 3
 	| | |/
-	| * | 2
+	| * / 2
 	| |/
-	* | 1
+	* / 1
 	|/
 	* initial
 	EOF
+'
+
+test_expect_success 'log --graph with tricky octopus merge with colors' '
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
 	cat >expect.colors <<-\EOF &&
 	* left
-	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<RED>|<RESET> <RED>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
-	<RED>|<RESET><RED>/<RESET> <YELLOW>/<RESET> <BLUE>/<RESET> <MAGENTA>/<RESET>
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET>
 	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
 	<RED>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
 	<RED>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	<RED>|<RESET> * <MAGENTA>|<RESET> 2
+	<RED>|<RESET> * <MAGENTA>/<RESET> 2
 	<RED>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* <MAGENTA>|<RESET> 1
+	* <MAGENTA>/<RESET> 1
 	<MAGENTA>|<RESET><MAGENTA>/<RESET>
 	* initial
 	EOF
-	test_commit initial &&
-	for i in 1 2 3 4 ; do
-		git checkout master -b $i || return $?
-		# Make tag name different from branch name, to avoid
-		# ambiguity error when calling checkout.
-		test_commit $i $i $i tag$i || return $?
-	done &&
-	git checkout 1 -b merge &&
-	test_tick &&
-	git merge -m octopus-merge 1 2 3 4 &&
-	git checkout 1 -b L &&
-	test_commit left
-'
-
-test_expect_success 'log --graph with tricky octopus merge with colors' '
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	git log --color=always --graph --date-order --pretty=tformat:%s --all >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
-'
-
-test_expect_success 'log --graph with tricky octopus merge, no color' '
-	git log --color=never --graph --date-order --pretty=tformat:%s --all >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
+	test_cmp_colored_graph left octopus-merge
 '
 
 # Repeat the previous two tests with "normal" octopus merge (i.e.,
 # without the first parent skewing to the "left" branch column).
 
 test_expect_success 'log --graph with normal octopus merge, no color' '
-	cat >expect.uncolored <<-\EOF &&
+	test_cmp_graph octopus-merge <<-\EOF
 	*---.   octopus-merge
 	|\ \ \
 	| | | * 4
 	| | * | 3
 	| | |/
-	| * | 2
+	| * / 2
 	| |/
-	* | 1
+	* / 1
 	|/
 	* initial
 	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
 '
 
 test_expect_success 'log --graph with normal octopus merge with colors' '
@@ -88,15 +92,256 @@ test_expect_success 'log --graph with normal octopus merge with colors' '
 	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 4
 	<RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 3
 	<RED>|<RESET> <GREEN>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	<RED>|<RESET> * <BLUE>|<RESET> 2
+	<RED>|<RESET> * <BLUE>/<RESET> 2
 	<RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	* <BLUE>|<RESET> 1
+	* <BLUE>/<RESET> 1
 	<BLUE>|<RESET><BLUE>/<RESET>
 	* initial
 	EOF
 	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	git log --color=always --graph --date-order --pretty=tformat:%s merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	test_cmp_colored_graph octopus-merge
 '
+
+test_expect_success 'log --graph with normal octopus merge and child, no color' '
+	test_cmp_graph after-merge <<-\EOF
+	* after-merge
+	*---.   octopus-merge
+	|\ \ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
+'
+
+test_expect_success 'log --graph with normal octopus and child merge with colors' '
+	cat >expect.colors <<-\EOF &&
+	* after-merge
+	*<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
+	<GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
+	<GREEN>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
+	<GREEN>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	<GREEN>|<RESET> * <MAGENTA>/<RESET> 2
+	<GREEN>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* <MAGENTA>/<RESET> 1
+	<MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* initial
+	EOF
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	test_cmp_colored_graph after-merge
+'
+
+test_expect_success 'log --graph with tricky octopus merge and its child, no color' '
+	test_cmp_graph left after-merge <<-\EOF
+	* left
+	| * after-merge
+	| *-.   octopus-merge
+	|/|\ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
+'
+
+test_expect_success 'log --graph with tricky octopus merge and its child with colors' '
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* left
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
+	<RED>|<RESET><RED>/<RESET><BLUE>|<RESET><MAGENTA>\<RESET> <CYAN>\<RESET>
+	<RED>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
+	<RED>|<RESET> <BLUE>|<RESET> * <CYAN>|<RESET> 3
+	<RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
+	<RED>|<RESET> * <CYAN>/<RESET> 2
+	<RED>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
+	* <CYAN>/<RESET> 1
+	<CYAN>|<RESET><CYAN>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph left after-merge
+'
+
+test_expect_success 'log --graph with crossover in octopus merge, no color' '
+	test_cmp_graph after-4 octopus-merge <<-\EOF
+	* after-4
+	| *---.   octopus-merge
+	| |\ \ \
+	| |_|_|/
+	|/| | |
+	* | | | 4
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+'
+
+test_expect_success 'log --graph with crossover in octopus merge with colors' '
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-4
+	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
+	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <RED>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
+	* <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> 4
+	<MAGENTA>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
+	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>_<RESET><YELLOW>|<RESET><MAGENTA>/<RESET>
+	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
+	<MAGENTA>|<RESET> <GREEN>|<RESET> * 2
+	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>/<RESET>
+	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET>
+	<MAGENTA>|<RESET> * 1
+	<MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-4 octopus-merge
+'
+
+test_expect_success 'log --graph with crossover in octopus merge and its child, no color' '
+	test_cmp_graph after-4 after-merge <<-\EOF
+	* after-4
+	| * after-merge
+	| *---.   octopus-merge
+	| |\ \ \
+	| |_|_|/
+	|/| | |
+	* | | | 4
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+'
+
+test_expect_success 'log --graph with crossover in octopus merge and its child with colors' '
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-4
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
+	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <RED>\<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
+	* <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> 4
+	<CYAN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
+	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>_<RESET><BLUE>|<RESET><CYAN>/<RESET>
+	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
+	<CYAN>|<RESET> <YELLOW>|<RESET> * 2
+	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>/<RESET>
+	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET>
+	<CYAN>|<RESET> * 1
+	<CYAN>|<RESET><CYAN>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-4 after-merge
+'
+
+test_expect_success 'log --graph with unrelated commit and octopus tip, no color' '
+	test_cmp_graph after-initial octopus-merge <<-\EOF
+	* after-initial
+	| *---.   octopus-merge
+	| |\ \ \
+	| | | | * 4
+	| |_|_|/
+	|/| | |
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+'
+
+test_expect_success 'log --graph with unrelated commit and octopus tip with colors' '
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-initial
+	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> * 2
+	<RED>|<RESET> <GREEN>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET>
+	<RED>|<RESET> * 1
+	<RED>|<RESET><RED>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-initial octopus-merge
+'
+
+test_expect_success 'log --graph with unrelated commit and octopus child, no color' '
+	test_cmp_graph after-initial after-merge <<-\EOF
+	* after-initial
+	| * after-merge
+	| *---.   octopus-merge
+	| |\ \ \
+	| | | | * 4
+	| |_|_|/
+	|/| | |
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+'
+
+test_expect_success 'log --graph with unrelated commit and octopus child with colors' '
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-initial
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
+	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <CYAN>\<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> * 2
+	<RED>|<RESET> <YELLOW>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET>
+	<RED>|<RESET> * 1
+	<RED>|<RESET><RED>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-initial after-merge
+'
+
 test_done
diff --git a/third_party/git/t/t4215-log-skewed-merges.sh b/third_party/git/t/t4215-log-skewed-merges.sh
new file mode 100755
index 000000000000..28d0779a8c59
--- /dev/null
+++ b/third_party/git/t/t4215-log-skewed-merges.sh
@@ -0,0 +1,373 @@
+#!/bin/sh
+
+test_description='git log --graph of skewed merges'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-log-graph.sh
+
+check_graph () {
+	cat >expect &&
+	lib_test_cmp_graph --format=%s "$@"
+}
+
+test_expect_success 'log --graph with merge fusing with its left and right neighbors' '
+	git checkout --orphan _p &&
+	test_commit A &&
+	test_commit B &&
+	git checkout -b _q @^ && test_commit C &&
+	git checkout -b _r @^ && test_commit D &&
+	git checkout _p && git merge --no-ff _q _r -m E &&
+	git checkout _r && test_commit F &&
+	git checkout _p && git merge --no-ff _r -m G &&
+	git checkout @^^ && git merge --no-ff _p -m H &&
+
+	check_graph <<-\EOF
+	*   H
+	|\
+	| *   G
+	| |\
+	| | * F
+	| * | E
+	|/|\|
+	| | * D
+	| * | C
+	| |/
+	* / B
+	|/
+	* A
+	EOF
+'
+
+test_expect_success 'log --graph with left-skewed merge' '
+	git checkout --orphan 0_p && test_commit 0_A &&
+	git checkout -b 0_q 0_p && test_commit 0_B &&
+	git checkout -b 0_r 0_p &&
+	test_commit 0_C &&
+	test_commit 0_D &&
+	git checkout -b 0_s 0_p && test_commit 0_E &&
+	git checkout -b 0_t 0_p && git merge --no-ff 0_r^ 0_s -m 0_F &&
+	git checkout 0_p && git merge --no-ff 0_s -m 0_G &&
+	git checkout @^ && git merge --no-ff 0_q 0_r 0_t 0_p -m 0_H &&
+
+	check_graph <<-\EOF
+	*-----.   0_H
+	|\ \ \ \
+	| | | | * 0_G
+	| |_|_|/|
+	|/| | | |
+	| | | * | 0_F
+	| |_|/|\|
+	|/| | | |
+	| | | | * 0_E
+	| |_|_|/
+	|/| | |
+	| | * | 0_D
+	| | |/
+	| | * 0_C
+	| |/
+	|/|
+	| * 0_B
+	|/
+	* 0_A
+	EOF
+'
+
+test_expect_success 'log --graph with nested left-skewed merge' '
+	git checkout --orphan 1_p &&
+	test_commit 1_A &&
+	test_commit 1_B &&
+	test_commit 1_C &&
+	git checkout -b 1_q @^ && test_commit 1_D &&
+	git checkout 1_p && git merge --no-ff 1_q -m 1_E &&
+	git checkout -b 1_r @~3 && test_commit 1_F &&
+	git checkout 1_p && git merge --no-ff 1_r -m 1_G &&
+	git checkout @^^ && git merge --no-ff 1_p -m 1_H &&
+
+	check_graph <<-\EOF
+	*   1_H
+	|\
+	| *   1_G
+	| |\
+	| | * 1_F
+	| * | 1_E
+	|/| |
+	| * | 1_D
+	* | | 1_C
+	|/ /
+	* / 1_B
+	|/
+	* 1_A
+	EOF
+'
+
+test_expect_success 'log --graph with nested left-skewed merge following normal merge' '
+	git checkout --orphan 2_p &&
+	test_commit 2_A &&
+	test_commit 2_B &&
+	test_commit 2_C &&
+	git checkout -b 2_q @^^ &&
+	test_commit 2_D &&
+	test_commit 2_E &&
+	git checkout -b 2_r @^ && test_commit 2_F &&
+	git checkout 2_q &&
+	git merge --no-ff 2_r -m 2_G &&
+	git merge --no-ff 2_p^ -m 2_H &&
+	git checkout -b 2_s @^^ && git merge --no-ff 2_q -m 2_J &&
+	git checkout 2_p && git merge --no-ff 2_s -m 2_K &&
+
+	check_graph <<-\EOF
+	*   2_K
+	|\
+	| *   2_J
+	| |\
+	| | *   2_H
+	| | |\
+	| | * | 2_G
+	| |/| |
+	| | * | 2_F
+	| * | | 2_E
+	| |/ /
+	| * | 2_D
+	* | | 2_C
+	| |/
+	|/|
+	* | 2_B
+	|/
+	* 2_A
+	EOF
+'
+
+test_expect_success 'log --graph with nested right-skewed merge following left-skewed merge' '
+	git checkout --orphan 3_p &&
+	test_commit 3_A &&
+	git checkout -b 3_q &&
+	test_commit 3_B &&
+	test_commit 3_C &&
+	git checkout -b 3_r @^ &&
+	test_commit 3_D &&
+	git checkout 3_q && git merge --no-ff 3_r -m 3_E &&
+	git checkout 3_p && git merge --no-ff 3_q -m 3_F &&
+	git checkout 3_r && test_commit 3_G &&
+	git checkout 3_p && git merge --no-ff 3_r -m 3_H &&
+	git checkout @^^ && git merge --no-ff 3_p -m 3_J &&
+
+	check_graph <<-\EOF
+	*   3_J
+	|\
+	| *   3_H
+	| |\
+	| | * 3_G
+	| * | 3_F
+	|/| |
+	| * | 3_E
+	| |\|
+	| | * 3_D
+	| * | 3_C
+	| |/
+	| * 3_B
+	|/
+	* 3_A
+	EOF
+'
+
+test_expect_success 'log --graph with right-skewed merge following a left-skewed one' '
+	git checkout --orphan 4_p &&
+	test_commit 4_A &&
+	test_commit 4_B &&
+	test_commit 4_C &&
+	git checkout -b 4_q @^^ && test_commit 4_D &&
+	git checkout -b 4_r 4_p^ && git merge --no-ff 4_q -m 4_E &&
+	git checkout -b 4_s 4_p^^ &&
+	git merge --no-ff 4_r -m 4_F &&
+	git merge --no-ff 4_p -m 4_G &&
+	git checkout @^^ && git merge --no-ff 4_s -m 4_H &&
+
+	check_graph --date-order <<-\EOF
+	*   4_H
+	|\
+	| *   4_G
+	| |\
+	| * | 4_F
+	|/| |
+	| * |   4_E
+	| |\ \
+	| | * | 4_D
+	| |/ /
+	|/| |
+	| | * 4_C
+	| |/
+	| * 4_B
+	|/
+	* 4_A
+	EOF
+'
+
+test_expect_success 'log --graph with octopus merge with column joining its penultimate parent' '
+	git checkout --orphan 5_p &&
+	test_commit 5_A &&
+	git branch 5_q &&
+	git branch 5_r &&
+	test_commit 5_B &&
+	git checkout 5_q && test_commit 5_C &&
+	git checkout 5_r && test_commit 5_D &&
+	git checkout 5_p &&
+	git merge --no-ff 5_q 5_r -m 5_E &&
+	git checkout 5_q && test_commit 5_F &&
+	git checkout -b 5_s 5_p^ &&
+	git merge --no-ff 5_p 5_q -m 5_G &&
+	git checkout 5_r &&
+	git merge --no-ff 5_s -m 5_H &&
+
+	check_graph <<-\EOF
+	*   5_H
+	|\
+	| *-.   5_G
+	| |\ \
+	| | | * 5_F
+	| | * |   5_E
+	| |/|\ \
+	| |_|/ /
+	|/| | /
+	| | |/
+	* | | 5_D
+	| | * 5_C
+	| |/
+	|/|
+	| * 5_B
+	|/
+	* 5_A
+	EOF
+'
+
+test_expect_success 'log --graph with multiple tips' '
+	git checkout --orphan 6_1 &&
+	test_commit 6_A &&
+	git branch 6_2 &&
+	git branch 6_4 &&
+	test_commit 6_B &&
+	git branch 6_3 &&
+	test_commit 6_C &&
+	git checkout 6_2 && test_commit 6_D &&
+	git checkout 6_3 && test_commit 6_E &&
+	git checkout -b 6_5 6_1 &&
+	git merge --no-ff 6_2 -m 6_F &&
+	git checkout 6_4 && test_commit 6_G &&
+	git checkout 6_3 &&
+	git merge --no-ff 6_4 -m 6_H &&
+	git checkout 6_1 &&
+	git merge --no-ff 6_2 -m 6_I &&
+
+	check_graph 6_1 6_3 6_5 <<-\EOF
+	*   6_I
+	|\
+	| | *   6_H
+	| | |\
+	| | | * 6_G
+	| | * | 6_E
+	| | | | * 6_F
+	| |_|_|/|
+	|/| | |/
+	| | |/|
+	| |/| |
+	| * | | 6_D
+	| | |/
+	| |/|
+	* | | 6_C
+	| |/
+	|/|
+	* | 6_B
+	|/
+	* 6_A
+	EOF
+'
+
+test_expect_success 'log --graph with multiple tips and colors' '
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	*   6_I
+	<RED>|<RESET><GREEN>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> *   6_H
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 6_G
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 6_F
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET><GREEN>|<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET><GREEN>/<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET><GREEN>/<RESET><BLUE>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET><GREEN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 6_E
+	<RED>|<RESET> * <CYAN>|<RESET> <BLUE>|<RESET> 6_D
+	<RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><BLUE>/<RESET>
+	<RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET><CYAN>|<RESET>
+	* <BLUE>|<RESET> <CYAN>|<RESET> 6_C
+	<CYAN>|<RESET> <BLUE>|<RESET><CYAN>/<RESET>
+	<CYAN>|<RESET><CYAN>/<RESET><BLUE>|<RESET>
+	* <BLUE>|<RESET> 6_B
+	<BLUE>|<RESET><BLUE>/<RESET>
+	* 6_A
+	EOF
+	lib_test_cmp_colored_graph --date-order --pretty=tformat:%s 6_1 6_3 6_5
+'
+
+test_expect_success 'log --graph with multiple tips' '
+	git checkout --orphan 7_1 &&
+	test_commit 7_A &&
+	test_commit 7_B &&
+	test_commit 7_C &&
+	git checkout -b 7_2 7_1~2 &&
+	test_commit 7_D &&
+	test_commit 7_E &&
+	git checkout -b 7_3 7_1~1 &&
+	test_commit 7_F &&
+	test_commit 7_G &&
+	git checkout -b 7_4 7_2~1 &&
+	test_commit 7_H &&
+	git checkout -b 7_5 7_1~2 &&
+	test_commit 7_I &&
+	git checkout -b 7_6 7_3~1 &&
+	test_commit 7_J &&
+	git checkout -b M_1 7_1 &&
+	git merge --no-ff 7_2 -m 7_M1 &&
+	git checkout -b M_3 7_3 &&
+	git merge --no-ff 7_4 -m 7_M2 &&
+	git checkout -b M_5 7_5 &&
+	git merge --no-ff 7_6 -m 7_M3 &&
+	git checkout -b M_7 7_1 &&
+	git merge --no-ff 7_2 7_3 -m 7_M4 &&
+
+	check_graph M_1 M_3 M_5 M_7 <<-\EOF
+	*   7_M1
+	|\
+	| | *   7_M2
+	| | |\
+	| | | * 7_H
+	| | | | *   7_M3
+	| | | | |\
+	| | | | | * 7_J
+	| | | | * | 7_I
+	| | | | | | *   7_M4
+	| |_|_|_|_|/|\
+	|/| | | | |/ /
+	| | |_|_|/| /
+	| |/| | | |/
+	| | | |_|/|
+	| | |/| | |
+	| | * | | | 7_G
+	| | | |_|/
+	| | |/| |
+	| | * | | 7_F
+	| * | | | 7_E
+	| | |/ /
+	| |/| |
+	| * | | 7_D
+	| | |/
+	| |/|
+	* | | 7_C
+	| |/
+	|/|
+	* | 7_B
+	|/
+	* 7_A
+	EOF
+'
+
+test_done
diff --git a/third_party/git/t/t4256-am-format-flowed.sh b/third_party/git/t/t4256-am-format-flowed.sh
index 6340310e9afb..2369c4e17ad8 100755
--- a/third_party/git/t/t4256-am-format-flowed.sh
+++ b/third_party/git/t/t4256-am-format-flowed.sh
@@ -11,7 +11,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'am with format=flowed' '
-	git am <"$TEST_DIRECTORY/t4256/1/patch" >stdout 2>stderr &&
+	git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr &&
 	test_i18ngrep "warning: Patch sent with format=flowed" stderr &&
 	test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c
 '
diff --git a/third_party/git/t/t4300-merge-tree.sh b/third_party/git/t/t4300-merge-tree.sh
index d87cc7d9efde..e59601e5fe9b 100755
--- a/third_party/git/t/t4300-merge-tree.sh
+++ b/third_party/git/t/t4300-merge-tree.sh
@@ -11,16 +11,16 @@ test_expect_success setup '
 '
 
 test_expect_success 'file add A, !B' '
-	cat >expected <<\EXPECTED &&
+	git reset --hard initial &&
+	test_commit "add-a-not-b" "ONE" "AAA" &&
+	git merge-tree initial initial add-a-not-b >actual &&
+	cat >expected <<EXPECTED &&
 added in remote
-  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  their  100644 $(git rev-parse HEAD:ONE) ONE
 @@ -0,0 +1 @@
 +AAA
 EXPECTED
 
-	git reset --hard initial &&
-	test_commit "add-a-not-b" "ONE" "AAA" &&
-	git merge-tree initial initial add-a-not-b >actual &&
 	test_cmp expected actual
 '
 
@@ -41,10 +41,15 @@ test_expect_success 'file add A, B (same)' '
 '
 
 test_expect_success 'file add A, B (different)' '
-	cat >expected <<\EXPECTED &&
+	git reset --hard initial &&
+	test_commit "add-a-b-diff-A" "ONE" "AAA" &&
+	git reset --hard initial &&
+	test_commit "add-a-b-diff-B" "ONE" "BBB" &&
+	git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&
+	cat >expected <<EXPECTED &&
 added in both
-  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
+  our    100644 $(git rev-parse add-a-b-diff-A:ONE) ONE
+  their  100644 $(git rev-parse add-a-b-diff-B:ONE) ONE
 @@ -1 +1,5 @@
 +<<<<<<< .our
  AAA
@@ -53,11 +58,6 @@ added in both
 +>>>>>>> .their
 EXPECTED
 
-	git reset --hard initial &&
-	test_commit "add-a-b-diff-A" "ONE" "AAA" &&
-	git reset --hard initial &&
-	test_commit "add-a-b-diff-B" "ONE" "BBB" &&
-	git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&
 	test_cmp expected actual
 '
 
@@ -69,18 +69,18 @@ test_expect_success 'file change A, !B' '
 '
 
 test_expect_success 'file change !A, B' '
-	cat >expected <<\EXPECTED &&
+	git reset --hard initial &&
+	test_commit "change-not-a-b" "initial-file" "BBB" &&
+	git merge-tree initial initial change-not-a-b >actual &&
+	cat >expected <<EXPECTED &&
 merged
-  result 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
-  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+  result 100644 $(git rev-parse change-a-not-b:initial-file) initial-file
+  our    100644 $(git rev-parse initial:initial-file       ) initial-file
 @@ -1 +1 @@
 -initial
 +BBB
 EXPECTED
 
-	git reset --hard initial &&
-	test_commit "change-not-a-b" "initial-file" "BBB" &&
-	git merge-tree initial initial change-not-a-b >actual &&
 	test_cmp expected actual
 '
 
@@ -94,11 +94,16 @@ test_expect_success 'file change A, B (same)' '
 '
 
 test_expect_success 'file change A, B (different)' '
-	cat >expected <<\EXPECTED &&
+	git reset --hard initial &&
+	test_commit "change-a-b-diff-A" "initial-file" "AAA" &&
+	git reset --hard initial &&
+	test_commit "change-a-b-diff-B" "initial-file" "BBB" &&
+	git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&
+	cat >expected <<EXPECTED &&
 changed in both
-  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
-  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d initial-file
-  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
+  base   100644 $(git rev-parse initial:initial-file          ) initial-file
+  our    100644 $(git rev-parse change-a-b-diff-A:initial-file) initial-file
+  their  100644 $(git rev-parse change-a-b-diff-B:initial-file) initial-file
 @@ -1 +1,5 @@
 +<<<<<<< .our
  AAA
@@ -107,34 +112,10 @@ changed in both
 +>>>>>>> .their
 EXPECTED
 
-	git reset --hard initial &&
-	test_commit "change-a-b-diff-A" "initial-file" "AAA" &&
-	git reset --hard initial &&
-	test_commit "change-a-b-diff-B" "initial-file" "BBB" &&
-	git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'file change A, B (mixed)' '
-	cat >expected <<\EXPECTED &&
-changed in both
-  base   100644 f4f1f998c7776568c4ff38f516d77fef9399b5a7 ONE
-  our    100644 af14c2c3475337c73759d561ef70b59e5c731176 ONE
-  their  100644 372d761493f524d44d59bd24700c3bdf914c973c ONE
-@@ -7,7 +7,11 @@
- AAA
- AAA
- AAA
-+<<<<<<< .our
- BBB
-+=======
-+CCC
-+>>>>>>> .their
- AAA
- AAA
- AAA
-EXPECTED
-
 	git reset --hard initial &&
 	test_commit "change-a-b-mix-base" "ONE" "
 AAA
@@ -159,6 +140,26 @@ AAA" &&
 		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/CCC/;}" <ONE)" &&
 	git merge-tree change-a-b-mix-base change-a-b-mix-A change-a-b-mix-B \
 		>actual &&
+
+	cat >expected <<EXPECTED &&
+changed in both
+  base   100644 $(git rev-parse change-a-b-mix-base:ONE) ONE
+  our    100644 $(git rev-parse change-a-b-mix-A:ONE   ) ONE
+  their  100644 $(git rev-parse change-a-b-mix-B:ONE   ) ONE
+@@ -7,7 +7,11 @@
+ AAA
+ AAA
+ AAA
++<<<<<<< .our
+ BBB
++=======
++CCC
++>>>>>>> .their
+ AAA
+ AAA
+ AAA
+EXPECTED
+
 	test_cmp expected actual
 '
 
@@ -173,20 +174,20 @@ test_expect_success 'file remove A, !B' '
 '
 
 test_expect_success 'file remove !A, B' '
-	cat >expected <<\EXPECTED &&
-removed in remote
-  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-@@ -1 +0,0 @@
--AAA
-EXPECTED
-
 	git reset --hard initial &&
 	test_commit "rm-not-a-b-base" "ONE" "AAA" &&
 	git rm ONE &&
 	git commit -m "rm-not-a-b" &&
 	git tag "rm-not-a-b" &&
 	git merge-tree rm-a-not-b-base rm-a-not-b-base rm-a-not-b >actual &&
+	cat >expected <<EXPECTED &&
+removed in remote
+  base   100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
+  our    100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
+@@ -1 +0,0 @@
+-AAA
+EXPECTED
+
 	test_cmp expected actual
 '
 
@@ -201,14 +202,6 @@ test_expect_success 'file remove A, B (same)' '
 '
 
 test_expect_success 'file change A, remove B' '
-	cat >expected <<\EXPECTED &&
-removed in remote
-  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  our    100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
-@@ -1 +0,0 @@
--BBB
-EXPECTED
-
 	git reset --hard initial &&
 	test_commit "change-a-rm-b-base" "ONE" "AAA" &&
 	test_commit "change-a-rm-b-A" "ONE" "BBB" &&
@@ -218,16 +211,18 @@ EXPECTED
 	git tag "change-a-rm-b-B" &&
 	git merge-tree change-a-rm-b-base change-a-rm-b-A change-a-rm-b-B \
 		>actual &&
+	cat >expected <<EXPECTED &&
+removed in remote
+  base   100644 $(git rev-parse change-a-rm-b-base:ONE) ONE
+  our    100644 $(git rev-parse change-a-rm-b-A:ONE   ) ONE
+@@ -1 +0,0 @@
+-BBB
+EXPECTED
+
 	test_cmp expected actual
 '
 
 test_expect_success 'file remove A, change B' '
-	cat >expected <<\EXPECTED &&
-removed in local
-  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
-EXPECTED
-
 	git reset --hard initial &&
 	test_commit "rm-a-change-b-base" "ONE" "AAA" &&
 
@@ -238,6 +233,11 @@ EXPECTED
 	test_commit "rm-a-change-b-B" "ONE" "BBB" &&
 	git merge-tree rm-a-change-b-base rm-a-change-b-A rm-a-change-b-B \
 		>actual &&
+	cat >expected <<EXPECTED &&
+removed in local
+  base   100644 $(git rev-parse rm-a-change-b-base:ONE) ONE
+  their  100644 $(git rev-parse rm-a-change-b-B:ONE   ) ONE
+EXPECTED
 	test_cmp expected actual
 '
 
@@ -250,10 +250,17 @@ test_expect_success 'tree add A, B (same)' '
 '
 
 test_expect_success 'tree add A, B (different)' '
-	cat >expect <<-\EOF &&
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A &&
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B &&
+	git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual &&
+	cat >expect <<-EOF &&
 	added in both
-	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
-	  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 sub/file
+	  our    100644 $(git rev-parse add-tree-a-b-A:sub/file) sub/file
+	  their  100644 $(git rev-parse add-tree-a-b-B:sub/file) sub/file
 	@@ -1 +1,5 @@
 	+<<<<<<< .our
 	 AAA
@@ -261,24 +268,10 @@ test_expect_success 'tree add A, B (different)' '
 	+BBB
 	+>>>>>>> .their
 	EOF
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A &&
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B &&
-	git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'tree unchanged A, removed B' '
-	cat >expect <<-\EOF &&
-	removed in remote
-	  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
-	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
-	@@ -1 +0,0 @@
-	-AAA
-	EOF
 	git reset --hard initial &&
 	mkdir sub &&
 	test_commit "add sub/file" "sub/file" "AAA" tree-remove-b-initial &&
@@ -287,6 +280,13 @@ test_expect_success 'tree unchanged A, removed B' '
 	git commit -m "remove sub/file" &&
 	git tag tree-remove-b-B &&
 	git merge-tree tree-remove-b-initial tree-remove-b-initial tree-remove-b-B >actual &&
+	cat >expect <<-EOF &&
+	removed in remote
+	  base   100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
+	  our    100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
+	@@ -1 +0,0 @@
+	-AAA
+	EOF
 	test_cmp expect actual
 '
 
@@ -296,14 +296,14 @@ test_expect_success 'turn file to tree' '
 	mkdir initial-file &&
 	test_commit "turn-file-to-tree" "initial-file/ONE" "CCC" &&
 	git merge-tree initial initial turn-file-to-tree >actual &&
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	added in remote
-	  their  100644 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 initial-file/ONE
+	  their  100644 $(git rev-parse turn-file-to-tree:initial-file/ONE) initial-file/ONE
 	@@ -0,0 +1 @@
 	+CCC
 	removed in remote
-	  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
-	  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+	  base   100644 $(git rev-parse initial:initial-file) initial-file
+	  our    100644 $(git rev-parse initial:initial-file) initial-file
 	@@ -1 +0,0 @@
 	-initial
 	EOF
@@ -318,14 +318,14 @@ test_expect_success 'turn tree to file' '
 	rm -fr dir &&
 	test_commit "make-file" "dir" "CCC" &&
 	git merge-tree add-tree add-another-tree make-file >actual &&
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	removed in remote
-	  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path
-	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path
+	  base   100644 $(git rev-parse add-tree:dir/path) dir/path
+	  our    100644 $(git rev-parse add-tree:dir/path) dir/path
 	@@ -1 +0,0 @@
 	-AAA
 	added in remote
-	  their  100644 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 dir
+	  their  100644 $(git rev-parse make-file:dir) dir
 	@@ -0,0 +1 @@
 	+CCC
 	EOF
diff --git a/third_party/git/t/t5004-archive-corner-cases.sh b/third_party/git/t/t5004-archive-corner-cases.sh
index 271eb5a1fdfb..3e7b23cb32c5 100755
--- a/third_party/git/t/t5004-archive-corner-cases.sh
+++ b/third_party/git/t/t5004-archive-corner-cases.sh
@@ -204,4 +204,23 @@ test_expect_success EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO \
 	grep $size big.lst
 '
 
+build_tree() {
+	perl -e '
+		my $hash = $ARGV[0];
+		foreach my $order (2..6) {
+			$first = 10 ** $order;
+			foreach my $i (-13..-9) {
+				my $name = "a" x ($first + $i);
+				print "100644 blob $hash\t$name\n"
+			}
+		}
+	' "$1"
+}
+
+test_expect_success 'tar archive with long paths' '
+	blob=$(echo foo | git hash-object -w --stdin) &&
+	tree=$(build_tree $blob | git mktree) &&
+	git archive -o long_paths.tar $tree
+'
+
 test_done
diff --git a/third_party/git/t/t5100-mailinfo.sh b/third_party/git/t/t5100-mailinfo.sh
index 9690dcad4fd5..147e616533cf 100755
--- a/third_party/git/t/t5100-mailinfo.sh
+++ b/third_party/git/t/t5100-mailinfo.sh
@@ -213,4 +213,19 @@ test_expect_failure 'mailinfo -b separated double [PATCH]' '
 	test z"$subj" = z"Subject: [other] message"
 '
 
+test_expect_success 'mailinfo handles unusual header whitespace' '
+	git mailinfo /dev/null /dev/null >actual <<-\EOF &&
+	From:Real Name <user@example.com>
+	Subject:    extra spaces
+	EOF
+
+	cat >expect <<-\EOF &&
+	Author: Real Name
+	Email: user@example.com
+	Subject: extra spaces
+
+	EOF
+	test_cmp expect actual
+'
+
 test_done
diff --git a/third_party/git/t/t5150-request-pull.sh b/third_party/git/t/t5150-request-pull.sh
index 852dcd913f1e..c1811ea0f412 100755
--- a/third_party/git/t/t5150-request-pull.sh
+++ b/third_party/git/t/t5150-request-pull.sh
@@ -4,6 +4,12 @@ test_description='Test workflows involving pull request.'
 
 . ./test-lib.sh
 
+if ! test_have_prereq PERL
+then
+	skip_all='skipping request-pull tests, perl not available'
+	test_done
+fi
+
 test_expect_success 'setup' '
 
 	git init --bare upstream.git &&
@@ -144,7 +150,6 @@ test_expect_success 'pull request after push' '
 		git request-pull initial origin master:for-upstream >../request
 	) &&
 	sed -nf read-request.sed <request >digest &&
-	cat digest &&
 	{
 		read task &&
 		read repository &&
@@ -173,7 +178,6 @@ test_expect_success 'request asks HEAD to be pulled' '
 		git request-pull initial "$downstream_url" >../request
 	) &&
 	sed -nf read-request.sed <request >digest &&
-	cat digest &&
 	{
 		read task &&
 		read repository &&
diff --git a/third_party/git/t/t5302-pack-index.sh b/third_party/git/t/t5302-pack-index.sh
index 91d51b35f917..ad07f2f7fc26 100755
--- a/third_party/git/t/t5302-pack-index.sh
+++ b/third_party/git/t/t5302-pack-index.sh
@@ -6,9 +6,10 @@
 test_description='pack index with 64-bit offsets and object CRC'
 . ./test-lib.sh
 
-test_expect_success \
-    'setup' \
-    'rm -rf .git &&
+test_expect_success 'setup' '
+     test_oid_init &&
+     rawsz=$(test_oid rawsz) &&
+     rm -rf .git &&
      git init &&
      git config pack.threads 1 &&
      i=1 &&
@@ -32,7 +33,8 @@ test_expect_success \
 	 echo $tree &&
 	 git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
      } >obj-list &&
-     git update-ref HEAD $commit'
+     git update-ref HEAD $commit
+'
 
 test_expect_success \
     'pack-objects with index version 1' \
@@ -157,10 +159,11 @@ test_expect_success \
      offs_101=$(index_obj_offset 1.idx $sha1_101) &&
      nr_099=$(index_obj_nr 1.idx $sha1_099) &&
      chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
+     recordsz=$((rawsz + 4)) &&
      dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
         if=".git/objects/pack/pack-${pack1}.idx" \
-        skip=$((4 + 256 * 4 + $nr_099 * 24)) \
-        bs=1 count=20 conv=notrunc &&
+        skip=$((4 + 256 * 4 + $nr_099 * recordsz)) \
+        bs=1 count=$rawsz conv=notrunc &&
      git cat-file blob $sha1_101 > file_101_foo1'
 
 test_expect_success \
@@ -200,8 +203,8 @@ test_expect_success \
      chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
      dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
         if=".git/objects/pack/pack-${pack1}.idx" \
-        skip=$((8 + 256 * 4 + $nr_099 * 20)) \
-        bs=1 count=20 conv=notrunc &&
+        skip=$((8 + 256 * 4 + $nr_099 * rawsz)) \
+        bs=1 count=$rawsz conv=notrunc &&
      git cat-file blob $sha1_101 > file_101_foo2'
 
 test_expect_success \
@@ -226,7 +229,7 @@ test_expect_success \
      nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
      chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
      printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
-        bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * 20 + $nr * 4)) &&
+        bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) &&
      ( while read obj
        do git cat-file -p $obj >/dev/null || exit 1
        done <obj-list ) &&
diff --git a/third_party/git/t/t5307-pack-missing-commit.sh b/third_party/git/t/t5307-pack-missing-commit.sh
index dacb440b2750..f4338abb78a8 100755
--- a/third_party/git/t/t5307-pack-missing-commit.sh
+++ b/third_party/git/t/t5307-pack-missing-commit.sh
@@ -24,11 +24,11 @@ test_expect_success 'check corruption' '
 '
 
 test_expect_success 'rev-list notices corruption (1)' '
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list HEAD
+	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list HEAD
 '
 
 test_expect_success 'rev-list notices corruption (2)' '
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --objects HEAD
+	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --objects HEAD
 '
 
 test_expect_success 'pack-objects notices corruption' '
diff --git a/third_party/git/t/t5309-pack-delta-cycles.sh b/third_party/git/t/t5309-pack-delta-cycles.sh
index 491556dad979..55b787630fcb 100755
--- a/third_party/git/t/t5309-pack-delta-cycles.sh
+++ b/third_party/git/t/t5309-pack-delta-cycles.sh
@@ -4,15 +4,9 @@ test_description='test index-pack handling of delta cycles in packfiles'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-pack.sh
 
-if ! test_have_prereq SHA1
-then
-       skip_all='not using SHA-1 for objects'
-       test_done
-fi
-
 # Two similar-ish objects that we have computed deltas between.
-A=01d7713666f4de822776c7622c10f1b07de280dc
-B=e68fe8129b546b101aee9510c5328e7f21ca1d18
+A=$(test_oid packlib_7_0)
+B=$(test_oid packlib_7_76)
 
 # double-check our hand-constucted packs
 test_expect_success 'index-pack works with a single delta (A->B)' '
@@ -62,13 +56,13 @@ test_expect_success 'index-pack detects REF_DELTA cycles' '
 	test_must_fail git index-pack --fix-thin --stdin <cycle.pack
 '
 
-test_expect_failure 'failover to an object in another pack' '
+test_expect_success 'failover to an object in another pack' '
 	clear_packs &&
 	git index-pack --stdin <ab.pack &&
-	git index-pack --stdin --fix-thin <cycle.pack
+	test_must_fail git index-pack --stdin --fix-thin <cycle.pack
 '
 
-test_expect_failure 'failover to a duplicate object in the same pack' '
+test_expect_success 'failover to a duplicate object in the same pack' '
 	clear_packs &&
 	{
 		pack_header 3 &&
@@ -77,7 +71,7 @@ test_expect_failure 'failover to a duplicate object in the same pack' '
 		pack_obj $A
 	} >recoverable.pack &&
 	pack_trailer recoverable.pack &&
-	git index-pack --fix-thin --stdin <recoverable.pack
+	test_must_fail git index-pack --fix-thin --stdin <recoverable.pack
 '
 
 test_done
diff --git a/third_party/git/t/t5310-pack-bitmaps.sh b/third_party/git/t/t5310-pack-bitmaps.sh
index 6640329ebf60..8318781d2bbf 100755
--- a/third_party/git/t/t5310-pack-bitmaps.sh
+++ b/third_party/git/t/t5310-pack-bitmaps.sh
@@ -74,16 +74,24 @@ rev_list_tests() {
 		test_cmp expect actual
 	'
 
-	test_expect_success "enumerate --objects ($state)" '
-		git rev-list --objects --use-bitmap-index HEAD >tmp &&
-		cut -d" " -f1 <tmp >tmp2 &&
-		sort <tmp2 >actual &&
-		git rev-list --objects HEAD >tmp &&
-		cut -d" " -f1 <tmp >tmp2 &&
-		sort <tmp2 >expect &&
+	test_expect_success "counting objects via bitmap ($state)" '
+		git rev-list --count --objects HEAD >expect &&
+		git rev-list --use-bitmap-index --count --objects HEAD >actual &&
 		test_cmp expect actual
 	'
 
+	test_expect_success "enumerate commits ($state)" '
+		git rev-list --use-bitmap-index HEAD >actual &&
+		git rev-list HEAD >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	'
+
+	test_expect_success "enumerate --objects ($state)" '
+		git rev-list --objects --use-bitmap-index HEAD >actual &&
+		git rev-list --objects HEAD >expect &&
+		test_bitmap_traversal expect actual
+	'
+
 	test_expect_success "bitmap --objects handles non-commit objects ($state)" '
 		git rev-list --objects --use-bitmap-index HEAD tagged-blob >actual &&
 		grep $blob actual
@@ -99,6 +107,20 @@ test_expect_success 'clone from bitmapped repository' '
 	test_cmp expect actual
 '
 
+test_expect_success 'partial clone from bitmapped repository' '
+	test_config uploadpack.allowfilter true &&
+	git clone --no-local --bare --filter=blob:none . partial-clone.git &&
+	(
+		cd partial-clone.git &&
+		pack=$(echo objects/pack/*.pack) &&
+		git verify-pack -v "$pack" >have &&
+		awk "/blob/ { print \$1 }" <have >blobs &&
+		# we expect this single blob because of the direct ref
+		git rev-parse refs/tags/tagged-blob >expect &&
+		test_cmp expect blobs
+	)
+'
+
 test_expect_success 'setup further non-bitmapped commits' '
 	test_commit_bulk --id=further 10
 '
diff --git a/third_party/git/t/t5313-pack-bounds-checks.sh b/third_party/git/t/t5313-pack-bounds-checks.sh
index f1708d415e55..2a4557efc2d6 100755
--- a/third_party/git/t/t5313-pack-bounds-checks.sh
+++ b/third_party/git/t/t5313-pack-bounds-checks.sh
@@ -38,16 +38,27 @@ munge () {
 # for the initial, and another ofs(4*nr) past that for the extended.
 #
 ofs_table () {
-	echo $((4 + 4 + 4*256 + 20*$1 + 4*$1))
+	echo $((4 + 4 + 4*256 + $(test_oid rawsz)*$1 + 4*$1))
 }
 extended_table () {
 	echo $(($(ofs_table "$1") + 4*$1))
 }
 
+test_expect_success 'setup' '
+	test_oid_init &&
+	test_oid_cache <<-EOF
+	oid000 sha1:1485
+	oid000 sha256:4222
+
+	oidfff sha1:74
+	oidfff sha256:1350
+	EOF
+'
+
 test_expect_success 'set up base packfile and variables' '
 	# the hash of this content starts with ff, which
 	# makes some later computations much simpler
-	echo 74 >file &&
+	echo $(test_oid oidfff) >file &&
 	git add file &&
 	git commit -m base &&
 	git repack -ad &&
@@ -140,10 +151,10 @@ test_expect_success 'bogus offset inside v2 extended table' '
 	# an extended table (if the first object were larger than 2^31).
 	#
 	# Note that the value is important here. We want $object as
-	# the second entry in sorted-sha1 order. The sha1 of 1485 starts
+	# the second entry in sorted-hash order. The hash of this object starts
 	# with "000", which sorts before that of $object (which starts
 	# with "fff").
-	second=$(echo 1485 | git hash-object -w --stdin) &&
+	second=$(test_oid oid000 | git hash-object -w --stdin) &&
 	do_pack "$object $second" --index-version=2 &&
 
 	# We have to make extra room for the table, so we cannot
diff --git a/third_party/git/t/t5314-pack-cycle-detection.sh b/third_party/git/t/t5314-pack-cycle-detection.sh
index e525466de098..0aec8619e22d 100755
--- a/third_party/git/t/t5314-pack-cycle-detection.sh
+++ b/third_party/git/t/t5314-pack-cycle-detection.sh
@@ -53,7 +53,7 @@ immediately after the lookup for "dummy".
 
 
 
-# Create a pack containing the the tree $1 and blob $1:file, with
+# Create a pack containing the tree $1 and blob $1:file, with
 # the latter stored as a delta against $2:file.
 #
 # We convince pack-objects to make the delta in the direction of our choosing
diff --git a/third_party/git/t/t5317-pack-objects-filter-objects.sh b/third_party/git/t/t5317-pack-objects-filter-objects.sh
index 2d2f5d0229ce..dc0446574b3f 100755
--- a/third_party/git/t/t5317-pack-objects-filter-objects.sh
+++ b/third_party/git/t/t5317-pack-objects-filter-objects.sh
@@ -45,12 +45,7 @@ test_expect_success 'verify blob:none packfile has no blobs' '
 	git -C r1 index-pack ../filter.pack &&
 
 	git -C r1 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	awk -f print_1.awk |
-	sort >observed &&
-
-	nr=$(wc -l <observed) &&
-	test 0 -eq $nr
+	! grep blob verify_result
 '
 
 test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '
@@ -72,7 +67,8 @@ test_expect_success 'get an error for missing tree object' '
 	echo foo >r5/foo &&
 	git -C r5 add foo &&
 	git -C r5 commit -m "foo" &&
-	del=$(git -C r5 rev-parse HEAD^{tree} | sed "s|..|&/|") &&
+	git -C r5 rev-parse HEAD^{tree} >tree &&
+	del=$(sed "s|..|&/|" tree) &&
 	rm r5/.git/objects/$del &&
 	test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
 	HEAD
@@ -148,12 +144,7 @@ test_expect_success 'verify blob:limit=500 omits all blobs' '
 	git -C r2 index-pack ../filter.pack &&
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	awk -f print_1.awk |
-	sort >observed &&
-
-	nr=$(wc -l <observed) &&
-	test 0 -eq $nr
+	! grep blob verify_result
 '
 
 test_expect_success 'verify blob:limit=1000' '
@@ -163,12 +154,7 @@ test_expect_success 'verify blob:limit=1000' '
 	git -C r2 index-pack ../filter.pack &&
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	awk -f print_1.awk |
-	sort >observed &&
-
-	nr=$(wc -l <observed) &&
-	test 0 -eq $nr
+	! grep blob verify_result
 '
 
 test_expect_success 'verify blob:limit=1001' '
@@ -230,10 +216,9 @@ test_expect_success 'verify explicitly specifying oversized blob in input' '
 	awk -f print_2.awk ls_files_result |
 	sort >expected &&
 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
-	HEAD
-	$(git -C r2 rev-parse HEAD:large.10000)
-	EOF
+	echo HEAD >objects &&
+	git -C r2 rev-parse HEAD:large.10000 >>objects &&
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack &&
 	git -C r2 index-pack ../filter.pack &&
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
@@ -377,7 +362,8 @@ test_expect_success 'verify sparse:oid=OID' '
 	awk -f print_2.awk ls_files_result |
 	sort >expected &&
 
-	oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
+	git -C r4 ls-files -s pattern >staged &&
+	oid=$(awk -f print_2.awk staged) &&
 	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
 	HEAD
 	EOF
diff --git a/third_party/git/t/t5318-commit-graph.sh b/third_party/git/t/t5318-commit-graph.sh
index 22cb9d664304..9bf920ae1716 100755
--- a/third_party/git/t/t5318-commit-graph.sh
+++ b/third_party/git/t/t5318-commit-graph.sh
@@ -19,15 +19,14 @@ test_expect_success 'verify graph with no graph file' '
 
 test_expect_success 'write graph with no packs' '
 	cd "$TRASH_DIRECTORY/full" &&
-	git commit-graph write --object-dir . &&
-	test_path_is_missing info/commit-graph
+	git commit-graph write --object-dir $objdir &&
+	test_path_is_missing $objdir/info/commit-graph
 '
 
-test_expect_success 'close with correct error on bad input' '
+test_expect_success 'exit with correct error on bad input to --stdin-packs' '
 	cd "$TRASH_DIRECTORY/full" &&
 	echo doesnotexist >in &&
-	{ git commit-graph write --stdin-packs <in 2>stderr; ret=$?; } &&
-	test "$ret" = 1 &&
+	test_expect_code 1 git commit-graph write --stdin-packs <in 2>stderr &&
 	test_i18ngrep "error adding pack" stderr
 '
 
@@ -41,6 +40,15 @@ test_expect_success 'create commits and repack' '
 	git repack
 '
 
+test_expect_success 'exit with correct error on bad input to --stdin-commits' '
+	cd "$TRASH_DIRECTORY/full" &&
+	echo HEAD | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
+	test_i18ngrep "invalid commit object id" stderr &&
+	# valid tree OID, but not a commit OID
+	git rev-parse HEAD^{tree} | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
+	test_i18ngrep "invalid commit object id" stderr
+'
+
 graph_git_two_modes() {
 	git -c core.commitGraph=true $1 >output
 	git -c core.commitGraph=false $1 >expect
@@ -77,7 +85,7 @@ graph_read_expect() {
 	num_commits: $1
 	chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL
 	EOF
-	git commit-graph read >output &&
+	test-tool read-graph >output &&
 	test_cmp expect output
 }
 
@@ -116,6 +124,42 @@ test_expect_success 'Add more commits' '
 	git repack
 '
 
+test_expect_success 'commit-graph write progress off for redirected stderr' '
+	cd "$TRASH_DIRECTORY/full" &&
+	git commit-graph write 2>err &&
+	test_line_count = 0 err
+'
+
+test_expect_success 'commit-graph write force progress on for stderr' '
+	cd "$TRASH_DIRECTORY/full" &&
+	GIT_PROGRESS_DELAY=0 git commit-graph write --progress 2>err &&
+	test_file_not_empty err
+'
+
+test_expect_success 'commit-graph write with the --no-progress option' '
+	cd "$TRASH_DIRECTORY/full" &&
+	git commit-graph write --no-progress 2>err &&
+	test_line_count = 0 err
+'
+
+test_expect_success 'commit-graph verify progress off for redirected stderr' '
+	cd "$TRASH_DIRECTORY/full" &&
+	git commit-graph verify 2>err &&
+	test_line_count = 0 err
+'
+
+test_expect_success 'commit-graph verify force progress on for stderr' '
+	cd "$TRASH_DIRECTORY/full" &&
+	GIT_PROGRESS_DELAY=0 git commit-graph verify --progress 2>err &&
+	test_file_not_empty err
+'
+
+test_expect_success 'commit-graph verify with the --no-progress option' '
+	cd "$TRASH_DIRECTORY/full" &&
+	git commit-graph verify --no-progress 2>err &&
+	test_line_count = 0 err
+'
+
 # Current graph structure:
 #
 #   __M3___
@@ -437,7 +481,7 @@ test_expect_success 'detect bad version' '
 '
 
 test_expect_success 'detect bad hash version' '
-	corrupt_graph_and_verify $GRAPH_BYTE_HASH "\02" \
+	corrupt_graph_and_verify $GRAPH_BYTE_HASH "\03" \
 		"hash version"
 '
 
@@ -577,4 +621,47 @@ test_expect_success 'get_commit_tree_in_graph works for non-the_repository' '
 	test_cmp expect actual
 '
 
+test_expect_success 'corrupt commit-graph write (broken parent)' '
+	rm -rf repo &&
+	git init repo &&
+	(
+		cd repo &&
+		empty="$(git mktree </dev/null)" &&
+		cat >broken <<-EOF &&
+		tree $empty
+		parent $ZERO_OID
+		author whatever <whatever@example.com> 1234 -0000
+		committer whatever <whatever@example.com> 1234 -0000
+
+		broken commit
+		EOF
+		broken="$(git hash-object -w -t commit --literally broken)" &&
+		git commit-tree -p "$broken" -m "good commit" "$empty" >good &&
+		test_must_fail git commit-graph write --stdin-commits \
+			<good 2>test_err &&
+		test_i18ngrep "unable to parse commit" test_err
+	)
+'
+
+test_expect_success 'corrupt commit-graph write (missing tree)' '
+	rm -rf repo &&
+	git init repo &&
+	(
+		cd repo &&
+		tree="$(git mktree </dev/null)" &&
+		cat >broken <<-EOF &&
+		parent $ZERO_OID
+		author whatever <whatever@example.com> 1234 -0000
+		committer whatever <whatever@example.com> 1234 -0000
+
+		broken commit
+		EOF
+		broken="$(git hash-object -w -t commit --literally broken)" &&
+		git commit-tree -p "$broken" -m "good" "$tree" >good &&
+		test_must_fail git commit-graph write --stdin-commits \
+			<good 2>test_err &&
+		test_i18ngrep "unable to parse commit" test_err
+	)
+'
+
 test_done
diff --git a/third_party/git/t/t5319-multi-pack-index.sh b/third_party/git/t/t5319-multi-pack-index.sh
index c72ca0439993..43a7a66c9d1b 100755
--- a/third_party/git/t/t5319-multi-pack-index.sh
+++ b/third_party/git/t/t5319-multi-pack-index.sh
@@ -28,6 +28,20 @@ midx_read_expect () {
 	test_cmp expect actual
 }
 
+test_expect_success 'setup' '
+	test_oid_init &&
+	test_oid_cache <<-EOF
+	idxoff sha1:2999
+	idxoff sha256:3739
+
+	packnameoff sha1:652
+	packnameoff sha256:940
+
+	fanoutoff sha1:1
+	fanoutoff sha256:3
+	EOF
+'
+
 test_expect_success 'write midx with no packs' '
 	test_when_finished rm -f pack/multi-pack-index &&
 	git multi-pack-index --object-dir=. write &&
@@ -147,6 +161,21 @@ test_expect_success 'write midx with two packs' '
 
 compare_results_with_midx "two packs"
 
+test_expect_success 'write progress off for redirected stderr' '
+	git multi-pack-index --object-dir=$objdir write 2>err &&
+	test_line_count = 0 err
+'
+
+test_expect_success 'write force progress on for stderr' '
+	git multi-pack-index --object-dir=$objdir --progress write 2>err &&
+	test_file_not_empty err
+'
+
+test_expect_success 'write with the --no-progress option' '
+	git multi-pack-index --object-dir=$objdir --no-progress write 2>err &&
+	test_line_count = 0 err
+'
+
 test_expect_success 'add more packs' '
 	for j in $(test_seq 11 20)
 	do
@@ -169,6 +198,21 @@ test_expect_success 'verify multi-pack-index success' '
 	git multi-pack-index verify --object-dir=$objdir
 '
 
+test_expect_success 'verify progress off for redirected stderr' '
+	git multi-pack-index verify --object-dir=$objdir 2>err &&
+	test_line_count = 0 err
+'
+
+test_expect_success 'verify force progress on for stderr' '
+	git multi-pack-index verify --object-dir=$objdir --progress 2>err &&
+	test_file_not_empty err
+'
+
+test_expect_success 'verify with the --no-progress option' '
+	git multi-pack-index verify --object-dir=$objdir --no-progress 2>err &&
+	test_line_count = 0 err
+'
+
 # usage: corrupt_midx_and_verify <pos> <data> <objdir> <string>
 corrupt_midx_and_verify() {
 	POS=$1 &&
@@ -195,7 +239,7 @@ test_expect_success 'verify bad signature' '
 		"multi-pack-index signature"
 '
 
-HASH_LEN=20
+HASH_LEN=$(test_oid rawsz)
 NUM_OBJECTS=74
 MIDX_BYTE_VERSION=4
 MIDX_BYTE_OID_VERSION=5
@@ -208,9 +252,9 @@ MIDX_CHUNK_LOOKUP_WIDTH=12
 MIDX_OFFSET_PACKNAMES=$(($MIDX_HEADER_SIZE + \
 			 $MIDX_NUM_CHUNKS * $MIDX_CHUNK_LOOKUP_WIDTH))
 MIDX_BYTE_PACKNAME_ORDER=$(($MIDX_OFFSET_PACKNAMES + 2))
-MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + 652))
+MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + $(test_oid packnameoff)))
 MIDX_OID_FANOUT_WIDTH=4
-MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + 1))
+MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + $(test_oid fanoutoff)))
 MIDX_OFFSET_OID_LOOKUP=$(($MIDX_OFFSET_OID_FANOUT + 256 * $MIDX_OID_FANOUT_WIDTH))
 MIDX_BYTE_OID_LOOKUP=$(($MIDX_OFFSET_OID_LOOKUP + 16 * $HASH_LEN))
 MIDX_OFFSET_OBJECT_OFFSETS=$(($MIDX_OFFSET_OID_LOOKUP + $NUM_OBJECTS * $HASH_LEN))
@@ -274,16 +318,31 @@ test_expect_success 'verify incorrect pack-int-id' '
 '
 
 test_expect_success 'verify incorrect offset' '
-	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
+	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \
 		"incorrect object offset"
 '
 
 test_expect_success 'git-fsck incorrect offset' '
-	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
+	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \
 		"incorrect object offset" \
 		"git -c core.multipackindex=true fsck"
 '
 
+test_expect_success 'repack progress off for redirected stderr' '
+	git multi-pack-index --object-dir=$objdir repack 2>err &&
+	test_line_count = 0 err
+'
+
+test_expect_success 'repack force progress on for stderr' '
+	git multi-pack-index --object-dir=$objdir --progress repack 2>err &&
+	test_file_not_empty err
+'
+
+test_expect_success 'repack with the --no-progress option' '
+	git multi-pack-index --object-dir=$objdir --no-progress repack 2>err &&
+	test_line_count = 0 err
+'
+
 test_expect_success 'repack removes multi-pack-index' '
 	test_path_is_file $objdir/pack/multi-pack-index &&
 	GIT_TEST_MULTI_PACK_INDEX=0 git repack -adf &&
@@ -342,7 +401,7 @@ test_expect_success 'force some 64-bit offsets with pack-objects' '
 	pack64=$(git pack-objects --index-version=2,0x40 objects64/pack/test-64 <obj-list) &&
 	idx64=objects64/pack/test-64-$pack64.idx &&
 	chmod u+w $idx64 &&
-	corrupt_data $idx64 2999 "\02" &&
+	corrupt_data $idx64 $(test_oid idxoff) "\02" &&
 	midx64=$(git multi-pack-index --object-dir=objects64 write) &&
 	midx_read_expect 1 63 5 objects64 " large-offsets"
 '
@@ -413,6 +472,30 @@ test_expect_success 'expire does not remove any packs' '
 	)
 '
 
+test_expect_success 'expire progress off for redirected stderr' '
+	(
+		cd dup &&
+		git multi-pack-index expire 2>err &&
+		test_line_count = 0 err
+	)
+'
+
+test_expect_success 'expire force progress on for stderr' '
+	(
+		cd dup &&
+		git multi-pack-index --progress expire 2>err &&
+		test_file_not_empty err
+	)
+'
+
+test_expect_success 'expire with the --no-progress option' '
+	(
+		cd dup &&
+		git multi-pack-index --no-progress expire 2>err &&
+		test_line_count = 0 err
+	)
+'
+
 test_expect_success 'expire removes unreferenced packs' '
 	(
 		cd dup &&
diff --git a/third_party/git/t/t5321-pack-large-objects.sh b/third_party/git/t/t5321-pack-large-objects.sh
index a75eab87d361..8a56d98a0e88 100755
--- a/third_party/git/t/t5321-pack-large-objects.sh
+++ b/third_party/git/t/t5321-pack-large-objects.sh
@@ -10,8 +10,8 @@ test_description='git pack-object with "large" deltas
 . "$TEST_DIRECTORY"/lib-pack.sh
 
 # Two similar-ish objects that we have computed deltas between.
-A=01d7713666f4de822776c7622c10f1b07de280dc
-B=e68fe8129b546b101aee9510c5328e7f21ca1d18
+A=$(test_oid packlib_7_0)
+B=$(test_oid packlib_7_76)
 
 test_expect_success 'setup' '
 	clear_packs &&
diff --git a/third_party/git/t/t5324-split-commit-graph.sh b/third_party/git/t/t5324-split-commit-graph.sh
index 99f4ef4c19df..53b2e6b4555d 100755
--- a/third_party/git/t/t5324-split-commit-graph.sh
+++ b/third_party/git/t/t5324-split-commit-graph.sh
@@ -8,9 +8,17 @@ GIT_TEST_COMMIT_GRAPH=0
 test_expect_success 'setup repo' '
 	git init &&
 	git config core.commitGraph true &&
+	git config gc.writeCommitGraph false &&
 	infodir=".git/objects/info" &&
 	graphdir="$infodir/commit-graphs" &&
-	test_oid_init
+	test_oid_init &&
+	test_oid_cache <<-EOM
+	shallow sha1:1760
+	shallow sha256:2064
+
+	base sha1:1376
+	base sha256:1496
+	EOM
 '
 
 graph_read_expect() {
@@ -24,7 +32,7 @@ graph_read_expect() {
 	num_commits: $1
 	chunks: oid_fanout oid_lookup commit_metadata
 	EOF
-	git commit-graph read >output &&
+	test-tool read-graph >output &&
 	test_cmp expect output
 }
 
@@ -247,7 +255,7 @@ test_expect_success 'verify hashes along chain, even in shallow' '
 		cd verify &&
 		git commit-graph verify &&
 		base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
-		corrupt_file "$base_file" 1760 "\01" &&
+		corrupt_file "$base_file" $(test_oid shallow) "\01" &&
 		test_must_fail git commit-graph verify --shallow 2>test_err &&
 		grep -v "^+" test_err >err &&
 		test_i18ngrep "incorrect checksum" err
@@ -274,7 +282,7 @@ test_expect_success 'warn on base graph chunk incorrect' '
 		cd base-chunk &&
 		git commit-graph verify &&
 		base_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
-		corrupt_file "$base_file" 1376 "\01" &&
+		corrupt_file "$base_file" $(test_oid base) "\01" &&
 		git commit-graph verify --shallow 2>test_err &&
 		grep -v "^+" test_err >err &&
 		test_i18ngrep "commit-graph chain does not match" err
@@ -319,7 +327,7 @@ test_expect_success 'add octopus merge' '
 	git merge commits/3 commits/4 &&
 	git branch merge/octopus &&
 	git commit-graph write --reachable --split &&
-	git commit-graph verify 2>err &&
+	git commit-graph verify --progress 2>err &&
 	test_line_count = 3 err &&
 	test_i18ngrep ! warning err &&
 	test_line_count = 3 $graphdir/commit-graph-chain
@@ -334,6 +342,7 @@ test_expect_success 'split across alternate where alternate is not split' '
 	git clone --no-hardlinks . alt-split &&
 	(
 		cd alt-split &&
+		rm -f .git/objects/info/commit-graph &&
 		echo "$(pwd)"/../.git/objects >.git/objects/info/alternates &&
 		test_commit 18 &&
 		git commit-graph write --reachable --split &&
diff --git a/third_party/git/t/t5400-send-pack.sh b/third_party/git/t/t5400-send-pack.sh
index 571d620aedba..b84618c925fe 100755
--- a/third_party/git/t/t5400-send-pack.sh
+++ b/third_party/git/t/t5400-send-pack.sh
@@ -288,7 +288,7 @@ test_expect_success 'receive-pack de-dupes .have lines' '
 	$shared .have
 	EOF
 
-	GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION= \
+	GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \
 	    git push \
 		--receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
 		fork HEAD:foo &&
diff --git a/third_party/git/t/t5407-post-rewrite-hook.sh b/third_party/git/t/t5407-post-rewrite-hook.sh
index 7344253bfbbc..80750a817e95 100755
--- a/third_party/git/t/t5407-post-rewrite-hook.sh
+++ b/third_party/git/t/t5407-post-rewrite-hook.sh
@@ -53,10 +53,10 @@ test_expect_success 'git commit --amend --no-post-rewrite' '
 	test ! -f post-rewrite.data
 '
 
-test_expect_success 'git rebase' '
+test_expect_success 'git rebase --apply' '
 	git reset --hard D &&
 	clear_hook_input &&
-	test_must_fail git rebase --onto A B &&
+	test_must_fail git rebase --apply --onto A B &&
 	echo C > foo &&
 	git add foo &&
 	git rebase --continue &&
@@ -68,10 +68,10 @@ test_expect_success 'git rebase' '
 	verify_hook_input
 '
 
-test_expect_success 'git rebase --skip' '
+test_expect_success 'git rebase --apply --skip' '
 	git reset --hard D &&
 	clear_hook_input &&
-	test_must_fail git rebase --onto A B &&
+	test_must_fail git rebase --apply --onto A B &&
 	test_must_fail git rebase --skip &&
 	echo D > foo &&
 	git add foo &&
@@ -84,10 +84,10 @@ test_expect_success 'git rebase --skip' '
 	verify_hook_input
 '
 
-test_expect_success 'git rebase --skip the last one' '
+test_expect_success 'git rebase --apply --skip the last one' '
 	git reset --hard F &&
 	clear_hook_input &&
-	test_must_fail git rebase --onto D A &&
+	test_must_fail git rebase --apply --onto D A &&
 	git rebase --skip &&
 	echo rebase >expected.args &&
 	cat >expected.data <<-EOF &&
@@ -128,7 +128,7 @@ test_expect_success 'git rebase -m --skip' '
 	verify_hook_input
 '
 
-test_expect_success 'git rebase with implicit use of interactive backend' '
+test_expect_success 'git rebase with implicit use of merge backend' '
 	git reset --hard D &&
 	clear_hook_input &&
 	test_must_fail git rebase --keep-empty --onto A B &&
@@ -143,7 +143,7 @@ test_expect_success 'git rebase with implicit use of interactive backend' '
 	verify_hook_input
 '
 
-test_expect_success 'git rebase --skip with implicit use of interactive backend' '
+test_expect_success 'git rebase --skip with implicit use of merge backend' '
 	git reset --hard D &&
 	clear_hook_input &&
 	test_must_fail git rebase --keep-empty --onto A B &&
diff --git a/third_party/git/t/t5409-colorize-remote-messages.sh b/third_party/git/t/t5409-colorize-remote-messages.sh
index 2a8c44966185..5d8f401d8ece 100755
--- a/third_party/git/t/t5409-colorize-remote-messages.sh
+++ b/third_party/git/t/t5409-colorize-remote-messages.sh
@@ -56,14 +56,13 @@ test_expect_success 'short line' '
 
 test_expect_success 'case-insensitive' '
 	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output &&
-	cat output &&
 	test_decode_color <output >decoded &&
 	grep "<BOLD;RED>error<RESET>: error" decoded &&
 	grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded
 '
 
 test_expect_success 'leading space' '
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&        cat output &&
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&
 	test_decode_color <output >decoded &&
 	grep "  <BOLD;RED>error<RESET>: leading space" decoded
 '
diff --git a/third_party/git/t/t5500-fetch-pack.sh b/third_party/git/t/t5500-fetch-pack.sh
index 1c71c0ec770c..baa1a99f45f8 100755
--- a/third_party/git/t/t5500-fetch-pack.sh
+++ b/third_party/git/t/t5500-fetch-pack.sh
@@ -440,11 +440,12 @@ test_expect_success 'setup tests for the --stdin parameter' '
 '
 
 test_expect_success 'setup fetch refs from cmdline v[12]' '
+	cp -r client client0 &&
 	cp -r client client1 &&
 	cp -r client client2
 '
 
-for version in '' 1 2
+for version in '' 0 1 2
 do
 	test_expect_success "protocol.version=$version fetch refs from cmdline" "
 		(
@@ -638,7 +639,7 @@ test_expect_success 'fetch-pack cannot fetch a raw sha1 that is not advertised a
 	git init client &&
 	# Some protocol versions (e.g. 2) support fetching
 	# unadvertised objects, so restrict this test to v0.
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION= git -C client fetch-pack ../server \
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C client fetch-pack ../server \
 		$(git -C server rev-parse refs/heads/master^) 2>err &&
 	test_i18ngrep "Server does not allow request for unadvertised object" err
 '
@@ -708,13 +709,22 @@ do
 	# file with scheme
 	for p in file
 	do
-		test_expect_success "fetch-pack --diag-url $p://$h/$r" '
+		test_expect_success !MINGW "fetch-pack --diag-url $p://$h/$r" '
 			check_prot_path $p://$h/$r $p "/$r"
 		'
+		test_expect_success MINGW "fetch-pack --diag-url $p://$h/$r" '
+			check_prot_path $p://$h/$r $p "//$h/$r"
+		'
+		test_expect_success MINGW "fetch-pack --diag-url $p:///$r" '
+			check_prot_path $p:///$r $p "/$r"
+		'
 		# No "/~" -> "~" conversion for file
-		test_expect_success "fetch-pack --diag-url $p://$h/~$r" '
+		test_expect_success !MINGW "fetch-pack --diag-url $p://$h/~$r" '
 			check_prot_path $p://$h/~$r $p "/~$r"
 		'
+		test_expect_success MINGW "fetch-pack --diag-url $p://$h/~$r" '
+			check_prot_path $p://$h/~$r $p "//$h/~$r"
+		'
 	done
 	# file without scheme
 	for h in nohost nohost:12 [::1] [::1]:23 [ [:aa
@@ -783,6 +793,44 @@ test_expect_success 'clone shallow since selects no commits' '
 	)
 '
 
+# A few subtle things about the request in this test:
+#
+#  - the server must have commit-graphs present and enabled
+#
+#  - the history is such that our want/have share a common ancestor ("base"
+#    here)
+#
+#  - we send only a single have, which is fewer than a normal client would
+#    send. This ensures that we don't parse "base" up front with
+#    parse_object(), but rather traverse to it as a parent while deciding if we
+#    can stop the "have" negotiation, and call parse_commit(). The former
+#    sees the actual object data and so always loads the three oid, whereas the
+#    latter will try to load it lazily.
+#
+#  - we must use protocol v2, because it handles the "have" negotiation before
+#    processing the shallow directives
+#
+test_expect_success 'shallow since with commit graph and already-seen commit' '
+	test_create_repo shallow-since-graph &&
+	(
+	cd shallow-since-graph &&
+	test_commit base &&
+	test_commit master &&
+	git checkout -b other HEAD^ &&
+	test_commit other &&
+	git commit-graph write --reachable &&
+	git config core.commitGraph true &&
+
+	GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
+	0012command=fetch
+	00010013deepen-since 1
+	0032want $(git rev-parse other)
+	0032have $(git rev-parse master)
+	0000
+	EOF
+	)
+'
+
 test_expect_success 'shallow clone exclude tag two' '
 	test_create_repo shallow-exclude &&
 	(
@@ -870,7 +918,10 @@ test_expect_success 'filtering by size' '
 	git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
 
 	# Ensure that object is not inadvertently fetched
-	test_must_fail git -C client cat-file -e $(git hash-object server/one.t)
+	commit=$(git -C server rev-parse HEAD) &&
+	blob=$(git hash-object server/one.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	! grep "$blob" oids
 '
 
 test_expect_success 'filtering by size has no effect if support for it is not advertised' '
@@ -882,7 +933,10 @@ test_expect_success 'filtering by size has no effect if support for it is not ad
 	git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
 
 	# Ensure that object is fetched
-	git -C client cat-file -e $(git hash-object server/one.t) &&
+	commit=$(git -C server rev-parse HEAD) &&
+	blob=$(git hash-object server/one.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	grep "$blob" oids &&
 
 	test_i18ngrep "filtering not recognized by server" err
 '
@@ -904,9 +958,11 @@ fetch_filter_blob_limit_zero () {
 	git -C client fetch --filter=blob:limit=0 origin HEAD:somewhere &&
 
 	# Ensure that commit is fetched, but blob is not
-	test_config -C client extensions.partialclone "arbitrary string" &&
-	git -C client cat-file -e $(git -C "$SERVER" rev-parse two) &&
-	test_must_fail git -C client cat-file -e $(git hash-object "$SERVER/two.t")
+	commit=$(git -C "$SERVER" rev-parse two) &&
+	blob=$(git hash-object server/two.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	grep "$commit" oids &&
+	! grep "$blob" oids
 }
 
 test_expect_success 'fetch with --filter=blob:limit=0' '
@@ -920,4 +976,7 @@ test_expect_success 'fetch with --filter=blob:limit=0 and HTTP' '
 	fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/third_party/git/t/t5504-fetch-receive-strict.sh b/third_party/git/t/t5504-fetch-receive-strict.sh
index fdfe179b1188..645b4c78d356 100755
--- a/third_party/git/t/t5504-fetch-receive-strict.sh
+++ b/third_party/git/t/t5504-fetch-receive-strict.sh
@@ -4,6 +4,7 @@ test_description='fetch/receive strict mode'
 . ./test-lib.sh
 
 test_expect_success 'setup and inject "corrupt or missing" object' '
+	test_oid_init &&
 	echo hello >greetings &&
 	git add greetings &&
 	git commit -m greetings &&
@@ -144,11 +145,11 @@ test_expect_success 'fsck with no skipList input' '
 
 test_expect_success 'setup sorted and unsorted skipLists' '
 	cat >SKIP.unsorted <<-EOF &&
-	0000000000000000000000000000000000000004
-	0000000000000000000000000000000000000002
+	$(test_oid 004)
+	$(test_oid 002)
 	$commit
-	0000000000000000000000000000000000000001
-	0000000000000000000000000000000000000003
+	$(test_oid 001)
+	$(test_oid 003)
 	EOF
 	sort SKIP.unsorted >SKIP.sorted
 '
@@ -172,14 +173,14 @@ test_expect_success 'fsck with invalid or bogus skipList input' '
 test_expect_success 'fsck with other accepted skipList input (comments & empty lines)' '
 	cat >SKIP.with-comment <<-EOF &&
 	# Some bad commit
-	0000000000000000000000000000000000000001
+	$(test_oid 001)
 	EOF
 	test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
 	test_i18ngrep "missingEmail" err-with-comment &&
 	cat >SKIP.with-empty-line <<-EOF &&
-	0000000000000000000000000000000000000001
+	$(test_oid 001)
 
-	0000000000000000000000000000000000000002
+	$(test_oid 002)
 	EOF
 	test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
 	test_i18ngrep "missingEmail" err-with-empty-line
@@ -204,7 +205,7 @@ test_expect_success 'fsck with exhaustive accepted skipList input (various types
 	echo " # Comment after whitespace" >>SKIP.exhaustive &&
 	echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive &&
 	echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive &&
-	echo "  0000000000000000000000000000000000000001" >>SKIP.exhaustive &&
+	echo "  $(test_oid 001)" >>SKIP.exhaustive &&
 	git -c fsck.skipList=SKIP.exhaustive fsck 2>err &&
 	test_must_be_empty err
 '
diff --git a/third_party/git/t/t5505-remote.sh b/third_party/git/t/t5505-remote.sh
index 883b32efa024..dda81b7d07a2 100755
--- a/third_party/git/t/t5505-remote.sh
+++ b/third_party/git/t/t5505-remote.sh
@@ -734,15 +734,53 @@ test_expect_success 'reject adding remote with an invalid name' '
 # the last two ones check if the config is updated.
 
 test_expect_success 'rename a remote' '
+	test_config_global remote.pushDefault origin &&
 	git clone one four &&
 	(
 		cd four &&
+		git config branch.master.pushRemote origin &&
 		git remote rename origin upstream &&
 		test -z "$(git for-each-ref refs/remotes/origin)" &&
 		test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
 		test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
 		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
-		test "$(git config branch.master.remote)" = "upstream"
+		test "$(git config branch.master.remote)" = "upstream" &&
+		test "$(git config branch.master.pushRemote)" = "upstream" &&
+		test "$(git config --global remote.pushDefault)" = "origin"
+	)
+'
+
+test_expect_success 'rename a remote renames repo remote.pushDefault' '
+	git clone one four.1 &&
+	(
+		cd four.1 &&
+		git config remote.pushDefault origin &&
+		git remote rename origin upstream &&
+		test "$(git config --local remote.pushDefault)" = "upstream"
+	)
+'
+
+test_expect_success 'rename a remote renames repo remote.pushDefault but ignores global' '
+	test_config_global remote.pushDefault other &&
+	git clone one four.2 &&
+	(
+		cd four.2 &&
+		git config remote.pushDefault origin &&
+		git remote rename origin upstream &&
+		test "$(git config --global remote.pushDefault)" = "other" &&
+		test "$(git config --local remote.pushDefault)" = "upstream"
+	)
+'
+
+test_expect_success 'rename a remote renames repo remote.pushDefault but keeps global' '
+	test_config_global remote.pushDefault origin &&
+	git clone one four.3 &&
+	(
+		cd four.3 &&
+		git config remote.pushDefault origin &&
+		git remote rename origin upstream &&
+		test "$(git config --global remote.pushDefault)" = "origin" &&
+		test "$(git config --local remote.pushDefault)" = "upstream"
 	)
 '
 
@@ -784,6 +822,54 @@ test_expect_success 'rename succeeds with existing remote.<target>.prune' '
 	git -C four.four remote rename origin upstream
 '
 
+test_expect_success 'remove a remote' '
+	test_config_global remote.pushDefault origin &&
+	git clone one four.five &&
+	(
+		cd four.five &&
+		git config branch.master.pushRemote origin &&
+		git remote remove origin &&
+		test -z "$(git for-each-ref refs/remotes/origin)" &&
+		test_must_fail git config branch.master.remote &&
+		test_must_fail git config branch.master.pushRemote &&
+		test "$(git config --global remote.pushDefault)" = "origin"
+	)
+'
+
+test_expect_success 'remove a remote removes repo remote.pushDefault' '
+	git clone one four.five.1 &&
+	(
+		cd four.five.1 &&
+		git config remote.pushDefault origin &&
+		git remote remove origin &&
+		test_must_fail git config --local remote.pushDefault
+	)
+'
+
+test_expect_success 'remove a remote removes repo remote.pushDefault but ignores global' '
+	test_config_global remote.pushDefault other &&
+	git clone one four.five.2 &&
+	(
+		cd four.five.2 &&
+		git config remote.pushDefault origin &&
+		git remote remove origin &&
+		test "$(git config --global remote.pushDefault)" = "other" &&
+		test_must_fail git config --local remote.pushDefault
+	)
+'
+
+test_expect_success 'remove a remote removes repo remote.pushDefault but keeps global' '
+	test_config_global remote.pushDefault origin &&
+	git clone one four.five.3 &&
+	(
+		cd four.five.3 &&
+		git config remote.pushDefault origin &&
+		git remote remove origin &&
+		test "$(git config --global remote.pushDefault)" = "origin" &&
+		test_must_fail git config --local remote.pushDefault
+	)
+'
+
 cat >remotes_origin <<EOF
 URL: $(pwd)/one
 Push: refs/heads/master:refs/heads/upstream
diff --git a/third_party/git/t/t5509-fetch-push-namespaces.sh b/third_party/git/t/t5509-fetch-push-namespaces.sh
index 75cbfcc392c8..a67f792adf4a 100755
--- a/third_party/git/t/t5509-fetch-push-namespaces.sh
+++ b/third_party/git/t/t5509-fetch-push-namespaces.sh
@@ -20,7 +20,7 @@ test_expect_success setup '
 	) &&
 	commit0=$(cd original && git rev-parse HEAD^) &&
 	commit1=$(cd original && git rev-parse HEAD) &&
-	git init pushee &&
+	git init --bare pushee &&
 	git init puller
 '
 
@@ -152,4 +152,15 @@ test_expect_success 'clone chooses correct HEAD (v2)' '
 	test_cmp expect actual
 '
 
+test_expect_success 'denyCurrentBranch and unborn branch with ref namespace' '
+	(
+		cd original &&
+		git init unborn &&
+		git remote add unborn-namespaced "ext::git --namespace=namespace %s unborn" &&
+		test_must_fail git push unborn-namespaced HEAD:master &&
+		git -C unborn config receive.denyCurrentBranch updateInstead &&
+		git push unborn-namespaced HEAD:master
+	)
+'
+
 test_done
diff --git a/third_party/git/t/t5510-fetch.sh b/third_party/git/t/t5510-fetch.sh
index 139f7106f781..a66dbe0bde0d 100755
--- a/third_party/git/t/t5510-fetch.sh
+++ b/third_party/git/t/t5510-fetch.sh
@@ -11,7 +11,7 @@ D=$(pwd)
 
 test_bundle_object_count () {
 	git verify-pack -v "$1" >verify.out &&
-	test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
+	test "$2" = $(grep "^$OID_REGEX " verify.out | wc -l)
 }
 
 convert_bundle_to_pack () {
@@ -174,6 +174,30 @@ test_expect_success 'fetch --prune --tags with refspec prunes based on refspec'
 	git rev-parse sometag
 '
 
+test_expect_success '--refmap="" ignores configured refspec' '
+	cd "$TRASH_DIRECTORY" &&
+	git clone "$D" remote-refs &&
+	git -C remote-refs rev-parse remotes/origin/master >old &&
+	git -C remote-refs update-ref refs/remotes/origin/master master~1 &&
+	git -C remote-refs rev-parse remotes/origin/master >new &&
+	git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
+	git -C remote-refs rev-parse remotes/origin/master >actual &&
+	test_cmp new actual &&
+	git -C remote-refs fetch origin &&
+	git -C remote-refs rev-parse remotes/origin/master >actual &&
+	test_cmp old actual
+'
+
+test_expect_success '--refmap="" and --prune' '
+	git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch master &&
+	git -C remote-refs update-ref refs/hidden/foo/otherbranch master &&
+	git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
+	git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
+	test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
+	git -C remote-refs fetch --prune origin &&
+	test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch
+'
+
 test_expect_success 'fetch tags when there is no tags' '
 
     cd "$D" &&
@@ -261,9 +285,10 @@ test_expect_success 'create bundle 1' '
 '
 
 test_expect_success 'header of bundle looks right' '
+	head -n 4 "$D"/bundle1 &&
 	head -n 1 "$D"/bundle1 | grep "^#" &&
-	head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
-	head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
+	head -n 2 "$D"/bundle1 | grep "^-$OID_REGEX " &&
+	head -n 3 "$D"/bundle1 | grep "^$OID_REGEX " &&
 	head -n 4 "$D"/bundle1 | grep "^$"
 '
 
@@ -289,7 +314,7 @@ test_expect_success 'bundle 1 has only 3 files ' '
 test_expect_success 'unbundle 2' '
 	cd "$D/bundle" &&
 	git fetch ../bundle2 master:master &&
-	test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
+	test "tip" = "$(git log -1 --pretty=oneline master | cut -d" " -f2)"
 '
 
 test_expect_success 'bundle does not prerequisite objects' '
@@ -354,7 +379,6 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge
 # the strange name is: a\!'b
 test_expect_success 'quoting of a strangely named repo' '
 	test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
-	cat result &&
 	grep "fatal: '\''a\\\\!'\''b'\''" result
 '
 
@@ -570,6 +594,35 @@ test_expect_success 'LHS of refspec follows ref disambiguation rules' '
 	)
 '
 
+test_expect_success 'fetch.writeCommitGraph' '
+	git clone three write &&
+	(
+		cd three &&
+		test_commit new
+	) &&
+	(
+		cd write &&
+		git -c fetch.writeCommitGraph fetch origin &&
+		test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
+	)
+'
+
+test_expect_success 'fetch.writeCommitGraph with submodules' '
+	git clone dups super &&
+	(
+		cd super &&
+		git submodule add "file://$TRASH_DIRECTORY/three" &&
+		git commit -m "add submodule"
+	) &&
+	git clone "super" super-clone &&
+	(
+		cd super-clone &&
+		rm -rf .git/objects/info &&
+		git -c fetch.writeCommitGraph=true fetch origin &&
+		test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
+	)
+'
+
 # configured prune tests
 
 set_config_tristate () {
@@ -902,6 +955,29 @@ test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
 	test_cmp expect actual
 '
 
+test_expect_success '--no-show-forced-updates' '
+	mkdir forced-updates &&
+	(
+		cd forced-updates &&
+		git init &&
+		test_commit 1 &&
+		test_commit 2
+	) &&
+	git clone forced-updates forced-update-clone &&
+	git clone forced-updates no-forced-update-clone &&
+	git -C forced-updates reset --hard HEAD~1 &&
+	(
+		cd forced-update-clone &&
+		git fetch --show-forced-updates origin 2>output &&
+		test_i18ngrep "(forced update)" output
+	) &&
+	(
+		cd no-forced-update-clone &&
+		git fetch --no-show-forced-updates origin 2>output &&
+		test_i18ngrep ! "(forced update)" output
+	)
+'
+
 setup_negotiation_tip () {
 	SERVER="$1"
 	URL="$2"
@@ -978,27 +1054,7 @@ test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protoc
 	check_negotiation_tip
 '
 
-test_expect_success '--no-show-forced-updates' '
-	mkdir forced-updates &&
-	(
-		cd forced-updates &&
-		git init &&
-		test_commit 1 &&
-		test_commit 2
-	) &&
-	git clone forced-updates forced-update-clone &&
-	git clone forced-updates no-forced-update-clone &&
-	git -C forced-updates reset --hard HEAD~1 &&
-	(
-		cd forced-update-clone &&
-		git fetch --show-forced-updates origin 2>output &&
-		test_i18ngrep "(forced update)" output
-	) &&
-	(
-		cd no-forced-update-clone &&
-		git fetch --no-show-forced-updates origin 2>output &&
-		! test_i18ngrep "(forced update)" output
-	)
-'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
 
 test_done
diff --git a/third_party/git/t/t5512-ls-remote.sh b/third_party/git/t/t5512-ls-remote.sh
index 43e1d8d4d2a4..04b35402c7aa 100755
--- a/third_party/git/t/t5512-ls-remote.sh
+++ b/third_party/git/t/t5512-ls-remote.sh
@@ -225,49 +225,50 @@ test_expect_success 'ls-remote --symref' '
 	EOF
 	# Protocol v2 supports sending symrefs for refs other than HEAD, so use
 	# protocol v0 here.
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'ls-remote with filtered symref (refname)' '
-	cat >expect <<-\EOF &&
+	rev=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
 	ref: refs/heads/master	HEAD
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	HEAD
+	$rev	HEAD
 	EOF
 	# Protocol v2 supports sending symrefs for refs other than HEAD, so use
 	# protocol v0 here.
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . HEAD >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref . HEAD >actual &&
 	test_cmp expect actual
 '
 
 test_expect_failure 'ls-remote with filtered symref (--heads)' '
 	git symbolic-ref refs/heads/foo refs/tags/mark &&
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	ref: refs/tags/mark	refs/heads/foo
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
+	$rev	refs/heads/foo
+	$rev	refs/heads/master
 	EOF
 	# Protocol v2 supports sending symrefs for refs other than HEAD, so use
 	# protocol v0 here.
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref --heads . >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'ls-remote --symref omits filtered-out matches' '
-	cat >expect <<-\EOF &&
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
+	cat >expect <<-EOF &&
+	$rev	refs/heads/foo
+	$rev	refs/heads/master
 	EOF
 	# Protocol v2 supports sending symrefs for refs other than HEAD, so use
 	# protocol v0 here.
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref --heads . >actual &&
 	test_cmp expect actual &&
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . "refs/heads/*" >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref . "refs/heads/*" >actual &&
 	test_cmp expect actual
 '
 
 test_lazy_prereq GIT_DAEMON '
-	git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON
+	test_bool_env GIT_TEST_GIT_DAEMON true
 '
 
 # This test spawns a daemon, so run it only if the user would be OK with
diff --git a/third_party/git/t/t5514-fetch-multiple.sh b/third_party/git/t/t5514-fetch-multiple.sh
index 5426d4b5abb4..de8e2f15319b 100755
--- a/third_party/git/t/t5514-fetch-multiple.sh
+++ b/third_party/git/t/t5514-fetch-multiple.sh
@@ -183,4 +183,15 @@ test_expect_success 'git fetch --all --tags' '
 	test_cmp expect test8/output
 '
 
+test_expect_success 'parallel' '
+	git remote add one ./bogus1 &&
+	git remote add two ./bogus2 &&
+
+	test_must_fail env GIT_TRACE="$PWD/trace" \
+		git fetch --jobs=2 --multiple one two 2>err &&
+	grep "preparing to run up to 2 tasks" trace &&
+	test_i18ngrep "could not fetch .one.*128" err &&
+	test_i18ngrep "could not fetch .two.*128" err
+'
+
 test_done
diff --git a/third_party/git/t/t5515-fetch-merge-logic.sh b/third_party/git/t/t5515-fetch-merge-logic.sh
index e55d8474efb6..9d6a46ff56c9 100755
--- a/third_party/git/t/t5515-fetch-merge-logic.sh
+++ b/third_party/git/t/t5515-fetch-merge-logic.sh
@@ -8,18 +8,60 @@ test_description='Merge logic in fetch'
 
 # NEEDSWORK: If the overspecification of the expected result is reduced, we
 # might be able to run this test in all protocol versions.
-GIT_TEST_PROTOCOL_VERSION=
+GIT_TEST_PROTOCOL_VERSION=0
+export GIT_TEST_PROTOCOL_VERSION
 
 . ./test-lib.sh
 
-LF='
-'
+build_script () {
+	script="$1" &&
+	for i in one three_file master master2 one_tree three two two2 three2
+	do
+		echo "s/$(test_oid --hash=sha1 "$i")/$(test_oid "$i")/g" >>"$script"
+	done
+}
+
+convert_expected () {
+	file="$1" &&
+	script="$2" &&
+	sed -f "$script" "$file" >"$file.tmp" &&
+	mv "$file.tmp" "$file"
+}
 
 test_expect_success setup '
 	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
 	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
+	test_oid_cache <<-EOF &&
+	one sha1:8e32a6d901327a23ef831511badce7bf3bf46689
+	one sha256:8739546433ab1ac72ee93088dce611210effee072b2b586ceac6dde43ebec9ce
+
+	three_file sha1:0e3b14047d3ee365f4f2a1b673db059c3972589c
+	three_file sha256:bc4447d50c07497a8bfe6eef817f2364ecca9d471452e43b52756cc1a908bd32
+
+	master sha1:6c9dec2b923228c9ff994c6cfe4ae16c12408dc5
+	master sha256:8521c3072461fcfe8f32d67f95cc6e6b832a2db2fa29769ffc788bce85ebcd75
+
+	one_tree sha1:22feea448b023a2d864ef94b013735af34d238ba
+	one_tree sha256:6e4743f4ef2356b881dda5e91f5c7cdffe870faf350bf7b312f80a20935f5d83
+
+	three sha1:c61a82b60967180544e3c19f819ddbd0c9f89899
+	three sha256:0cc6d1eda617ded715170786e31ba4e2d0185404ec5a3508dd0d73b324860c6a
+
+	two sha1:525b7fb068d59950d185a8779dc957c77eed73ba
+	two sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db
+
+	master2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f
+	master2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0
+
+	two2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
+	two2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4
+
+	three2 sha1:0567da4d5edd2ff4bb292a465ba9e64dcad9536b
+	three2 sha256:cceb3e8eca364fa9a0a39a1efbebecacc664af86cbbd8070571f5faeb5f0e8c3
+	EOF
+
 	echo >file original &&
 	git add file &&
 	git commit -a -m One &&
@@ -89,7 +131,8 @@ test_expect_success setup '
 		git config branch.br-$remote-octopus.remote $remote &&
 		git config branch.br-$remote-octopus.merge refs/heads/one &&
 		git config --add branch.br-$remote-octopus.merge two
-	done
+	done &&
+	build_script sed_script
 '
 
 # Merge logic depends on branch properties and Pull: or .fetch lines
@@ -140,6 +183,10 @@ do
 	actual_r="$pfx-refs.$test"
 
 	test_expect_success "$cmd" '
+		cp "$expect_f" expect_f &&
+		convert_expected expect_f sed_script &&
+		cp "$expect_r" expect_r &&
+		convert_expected expect_r sed_script &&
 		{
 			echo "# $cmd"
 			set x $cmd; shift
@@ -155,18 +202,18 @@ do
 			cat .git/FETCH_HEAD
 		} >"$actual_f" &&
 		git show-ref >"$actual_r" &&
-		if test -f "$expect_f"
+		if test -f "expect_f"
 		then
-			test_cmp "$expect_f" "$actual_f" &&
+			test_cmp "expect_f" "$actual_f" &&
 			rm -f "$actual_f"
 		else
 			# this is to help developing new tests.
 			cp "$actual_f" "$expect_f"
 			false
 		fi &&
-		if test -f "$expect_r"
+		if test -f "expect_r"
 		then
-			test_cmp "$expect_r" "$actual_r" &&
+			test_cmp "expect_r" "$actual_r" &&
 			rm -f "$actual_r"
 		else
 			# this is to help developing new tests.
diff --git a/third_party/git/t/t5516-fetch-push.sh b/third_party/git/t/t5516-fetch-push.sh
index c81ca360ac4a..9ff041a093e7 100755
--- a/third_party/git/t/t5516-fetch-push.sh
+++ b/third_party/git/t/t5516-fetch-push.sh
@@ -1151,7 +1151,7 @@ test_expect_success 'fetch exact SHA1' '
 		# unadvertised objects, so restrict this test to v0.
 
 		# fetching the hidden object should fail by default
-		test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 			git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
 		test_i18ngrep "Server does not allow request for unadvertised object" err &&
 		test_must_fail git rev-parse --verify refs/heads/copy &&
@@ -1210,7 +1210,7 @@ do
 			cd shallow &&
 			# Some protocol versions (e.g. 2) support fetching
 			# unadvertised objects, so restrict this test to v0.
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 				git fetch --depth=1 ../testrepo/.git $SHA1 &&
 			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
 			git fetch --depth=1 ../testrepo/.git $SHA1 &&
@@ -1241,9 +1241,9 @@ do
 			cd shallow &&
 			# Some protocol versions (e.g. 2) support fetching
 			# unadvertised objects, so restrict this test to v0.
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 				git fetch ../testrepo/.git $SHA1_3 &&
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 				git fetch ../testrepo/.git $SHA1_1 &&
 			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
 			git fetch ../testrepo/.git $SHA1_1 &&
@@ -1251,7 +1251,7 @@ do
 			test_must_fail git cat-file commit $SHA1_2 &&
 			git fetch ../testrepo/.git $SHA1_2 &&
 			git cat-file commit $SHA1_2 &&
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 				git fetch ../testrepo/.git $SHA1_3 2>err &&
 			test_i18ngrep "remote error:.*not our ref.*$SHA1_3\$" err
 		)
@@ -1291,7 +1291,7 @@ test_expect_success 'peeled advertisements are not considered ref tips' '
 	git -C testrepo commit --allow-empty -m two &&
 	git -C testrepo tag -m foo mytag HEAD^ &&
 	oid=$(git -C testrepo rev-parse mytag^{commit}) &&
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 		git fetch testrepo $oid 2>err &&
 	test_i18ngrep "Server does not allow request for unadvertised object" err
 '
@@ -1712,4 +1712,15 @@ test_expect_success 'updateInstead with push-to-checkout hook' '
 	)
 '
 
+test_expect_success 'denyCurrentBranch and worktrees' '
+	git worktree add new-wt &&
+	git clone . cloned &&
+	test_commit -C cloned first &&
+	test_config receive.denyCurrentBranch refuse &&
+	test_must_fail git -C cloned push origin HEAD:new-wt &&
+	test_config receive.denyCurrentBranch updateInstead &&
+	git -C cloned push origin HEAD:new-wt &&
+	test_must_fail git -C cloned push --delete origin new-wt
+'
+
 test_done
diff --git a/third_party/git/t/t5517-push-mirror.sh b/third_party/git/t/t5517-push-mirror.sh
index c05a661400c1..e4edd56404fe 100755
--- a/third_party/git/t/t5517-push-mirror.sh
+++ b/third_party/git/t/t5517-push-mirror.sh
@@ -265,4 +265,14 @@ test_expect_success 'remote.foo.mirror=no has no effect' '
 
 '
 
+test_expect_success 'push to mirrored repository with refspec fails' '
+	mk_repo_pair &&
+	(
+		cd master &&
+		echo one >foo && git add foo && git commit -m one &&
+		git config --add remote.up.mirror true &&
+		test_must_fail git push up master
+	)
+'
+
 test_done
diff --git a/third_party/git/t/t5520-pull.sh b/third_party/git/t/t5520-pull.sh
index cf4cc32fd0eb..2f86fca0428c 100755
--- a/third_party/git/t/t5520-pull.sh
+++ b/third_party/git/t/t5520-pull.sh
@@ -5,7 +5,7 @@ test_description='pulling into void'
 . ./test-lib.sh
 
 modify () {
-	sed -e "$1" <"$2" >"$2.x" &&
+	sed -e "$1" "$2" >"$2.x" &&
 	mv "$2.x" "$2"
 }
 
@@ -15,8 +15,10 @@ test_pull_autostash () {
 	git add new_file &&
 	git pull "$@" . copy &&
 	test_cmp_rev HEAD^ copy &&
-	test "$(cat new_file)" = dirty &&
-	test "$(cat file)" = "modified again"
+	echo dirty >expect &&
+	test_cmp expect new_file &&
+	echo "modified again" >expect &&
+	test_cmp expect file
 }
 
 test_pull_autostash_fail () {
@@ -39,8 +41,8 @@ test_expect_success 'pulling into void' '
 		cd cloned &&
 		git pull ..
 	) &&
-	test -f file &&
-	test -f cloned/file &&
+	test_path_is_file file &&
+	test_path_is_file cloned/file &&
 	test_cmp file cloned/file
 '
 
@@ -50,8 +52,8 @@ test_expect_success 'pulling into void using master:master' '
 		cd cloned-uho &&
 		git pull .. master:master
 	) &&
-	test -f file &&
-	test -f cloned-uho/file &&
+	test_path_is_file file &&
+	test_path_is_file cloned-uho/file &&
 	test_cmp file cloned-uho/file
 '
 
@@ -99,7 +101,7 @@ test_expect_success 'pulling into void must not create an octopus' '
 	(
 		cd cloned-octopus &&
 		test_must_fail git pull .. master master &&
-		! test -f file
+		test_path_is_missing file
 	)
 '
 
@@ -110,9 +112,11 @@ test_expect_success 'test . as a remote' '
 	echo updated >file &&
 	git commit -a -m updated &&
 	git checkout copy &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	git pull &&
-	test "$(cat file)" = updated &&
+	echo updated >expect &&
+	test_cmp expect file &&
 	git reflog -1 >reflog.actual &&
 	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
 	echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
@@ -125,9 +129,11 @@ test_expect_success 'the default remote . should not break explicit pull' '
 	git commit -a -m modified &&
 	git checkout copy &&
 	git reset --hard HEAD^ &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	git pull . second &&
-	test "$(cat file)" = modified &&
+	echo modified >expect &&
+	test_cmp expect file &&
 	git reflog -1 >reflog.actual &&
 	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
 	echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected &&
@@ -137,10 +143,11 @@ test_expect_success 'the default remote . should not break explicit pull' '
 test_expect_success 'fail if wildcard spec does not match any refs' '
 	git checkout -b test copy^ &&
 	test_when_finished "git checkout -f copy && git branch -D test" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
 	test_i18ngrep "no candidates for merging" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if no branches specified with non-default remote' '
@@ -148,11 +155,12 @@ test_expect_success 'fail if no branches specified with non-default remote' '
 	test_when_finished "git remote remove test_remote" &&
 	git checkout -b test copy^ &&
 	test_when_finished "git checkout -f copy && git branch -D test" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_config branch.test.remote origin &&
 	test_must_fail git pull test_remote 2>err &&
 	test_i18ngrep "specify a branch on the command line" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if not on a branch' '
@@ -160,10 +168,11 @@ test_expect_success 'fail if not on a branch' '
 	test_when_finished "git remote remove origin" &&
 	git checkout HEAD^ &&
 	test_when_finished "git checkout -f copy" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull 2>err &&
 	test_i18ngrep "not currently on a branch" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if no configuration for current branch' '
@@ -172,10 +181,11 @@ test_expect_success 'fail if no configuration for current branch' '
 	git checkout -b test copy^ &&
 	test_when_finished "git checkout -f copy && git branch -D test" &&
 	test_config branch.test.remote test_remote &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull 2>err &&
 	test_i18ngrep "no tracking information" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'pull --all: fail if no configuration for current branch' '
@@ -184,10 +194,11 @@ test_expect_success 'pull --all: fail if no configuration for current branch' '
 	git checkout -b test copy^ &&
 	test_when_finished "git checkout -f copy && git branch -D test" &&
 	test_config branch.test.remote test_remote &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull --all 2>err &&
 	test_i18ngrep "There is no tracking information" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if upstream branch does not exist' '
@@ -195,26 +206,31 @@ test_expect_success 'fail if upstream branch does not exist' '
 	test_when_finished "git checkout -f copy && git branch -D test" &&
 	test_config branch.test.remote . &&
 	test_config branch.test.merge refs/heads/nonexisting &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull 2>err &&
 	test_i18ngrep "no such ref was fetched" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if the index has unresolved entries' '
 	git checkout -b third second^ &&
 	test_when_finished "git checkout -f copy && git branch -D third" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_commit modified2 file &&
-	test -z "$(git ls-files -u)" &&
+	git ls-files -u >unmerged &&
+	test_must_be_empty unmerged &&
 	test_must_fail git pull . second &&
-	test -n "$(git ls-files -u)" &&
+	git ls-files -u >unmerged &&
+	test_file_not_empty unmerged &&
 	cp file expected &&
 	test_must_fail git pull . second 2>err &&
 	test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
 	test_cmp expected file &&
 	git add file &&
-	test -z "$(git ls-files -u)" &&
+	git ls-files -u >unmerged &&
+	test_must_be_empty unmerged &&
 	test_must_fail git pull . second 2>err &&
 	test_i18ngrep "You have not concluded your merge" err &&
 	test_cmp expected file
@@ -223,47 +239,66 @@ test_expect_success 'fail if the index has unresolved entries' '
 test_expect_success 'fast-forwards working tree if branch head is updated' '
 	git checkout -b third second^ &&
 	test_when_finished "git checkout -f copy && git branch -D third" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	git pull . second:third 2>err &&
 	test_i18ngrep "fetch updated the current branch head" err &&
-	test "$(cat file)" = modified &&
-	test "$(git rev-parse third)" = "$(git rev-parse second)"
+	echo modified >expect &&
+	test_cmp expect file &&
+	test_cmp_rev third second
 '
 
 test_expect_success 'fast-forward fails with conflicting work tree' '
 	git checkout -b third second^ &&
 	test_when_finished "git checkout -f copy && git branch -D third" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	echo conflict >file &&
 	test_must_fail git pull . second:third 2>err &&
 	test_i18ngrep "Cannot fast-forward your working tree" err &&
-	test "$(cat file)" = conflict &&
-	test "$(git rev-parse third)" = "$(git rev-parse second)"
+	echo conflict >expect &&
+	test_cmp expect file &&
+	test_cmp_rev third second
 '
 
 test_expect_success '--rebase' '
 	git branch to-rebase &&
-	echo modified again > file &&
+	echo modified again >file &&
 	git commit -m file file &&
 	git checkout to-rebase &&
-	echo new > file2 &&
+	echo new >file2 &&
 	git add file2 &&
 	git commit -m "new file" &&
 	git tag before-rebase &&
 	git pull --rebase . copy &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual
 '
 
-test_expect_success '--rebase fast forward' '
+test_expect_success '--rebase (merge) fast forward' '
 	git reset --hard before-rebase &&
 	git checkout -b ff &&
 	echo another modification >file &&
 	git commit -m third file &&
 
 	git checkout to-rebase &&
-	git pull --rebase . ff &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse ff)" &&
+	git -c rebase.backend=merge pull --rebase . ff &&
+	test_cmp_rev HEAD ff &&
+
+	# The above only validates the result.  Did we actually bypass rebase?
+	git reflog -1 >reflog.actual &&
+	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
+	echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
+	test_cmp reflog.expected reflog.fuzzy
+'
+
+test_expect_success '--rebase (am) fast forward' '
+	git reset --hard before-rebase &&
+
+	git -c rebase.backend=apply pull --rebase . ff &&
+	test_cmp_rev HEAD ff &&
 
 	# The above only validates the result.  Did we actually bypass rebase?
 	git reflog -1 >reflog.actual &&
@@ -287,7 +322,7 @@ test_expect_success '--rebase --autostash fast forward' '
 	git checkout behind &&
 	echo dirty >file &&
 	git pull --rebase --autostash . to-rebase-ff &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse to-rebase-ff)"
+	test_cmp_rev HEAD to-rebase-ff
 '
 
 test_expect_success '--rebase with conflicts shows advice' '
@@ -305,7 +340,7 @@ test_expect_success '--rebase with conflicts shows advice' '
 	test_tick &&
 	git commit -m "Create conflict" seq.txt &&
 	test_must_fail git pull --rebase . seq 2>err >out &&
-	test_i18ngrep "Resolve all conflicts manually" out
+	test_i18ngrep "Resolve all conflicts manually" err
 '
 
 test_expect_success 'failed --rebase shows advice' '
@@ -319,15 +354,17 @@ test_expect_success 'failed --rebase shows advice' '
 	git checkout -f -b fails-to-rebase HEAD^ &&
 	test_commit v2-without-cr file "2" file2-lf &&
 	test_must_fail git pull --rebase . diverging 2>err >out &&
-	test_i18ngrep "Resolve all conflicts manually" out
+	test_i18ngrep "Resolve all conflicts manually" err
 '
 
 test_expect_success '--rebase fails with multiple branches' '
 	git reset --hard before-rebase &&
 	test_must_fail git pull --rebase . copy master 2>err &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" &&
+	test_cmp_rev HEAD before-rebase &&
 	test_i18ngrep "Cannot rebase onto multiple branches" err &&
-	test modified = "$(git show HEAD:file)"
+	echo modified >expect &&
+	git show HEAD:file >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
@@ -377,8 +414,10 @@ test_expect_success 'pull.rebase' '
 	git reset --hard before-rebase &&
 	test_config pull.rebase true &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'pull --autostash & pull.rebase=true' '
@@ -395,8 +434,10 @@ test_expect_success 'branch.to-rebase.rebase' '
 	git reset --hard before-rebase &&
 	test_config branch.to-rebase.rebase true &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
@@ -404,23 +445,29 @@ test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
 	test_config pull.rebase true &&
 	test_config branch.to-rebase.rebase false &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
+	test_cmp_rev ! HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual
 '
 
-test_expect_success "pull --rebase warns on --verify-signatures" '
+test_expect_success 'pull --rebase warns on --verify-signatures' '
 	git reset --hard before-rebase &&
 	git pull --rebase --verify-signatures . copy 2>err &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)" &&
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual &&
 	test_i18ngrep "ignoring --verify-signatures for rebase" err
 '
 
-test_expect_success "pull --rebase does not warn on --no-verify-signatures" '
+test_expect_success 'pull --rebase does not warn on --no-verify-signatures' '
 	git reset --hard before-rebase &&
 	git pull --rebase --no-verify-signatures . copy 2>err &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)" &&
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual &&
 	test_i18ngrep ! "verify-signatures" err
 '
 
@@ -440,25 +487,31 @@ test_expect_success 'pull.rebase=false create a new merge commit' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase false &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^1 before-preserve-rebase &&
+	test_cmp_rev HEAD^2 copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'pull.rebase=true flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase true &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^^ copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase 1 &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^^ copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success REBASE_P \
@@ -466,8 +519,8 @@ test_expect_success REBASE_P \
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase preserve &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
+	test_cmp_rev HEAD^^ copy &&
+	test_cmp_rev HEAD^2 keep-merge
 '
 
 test_expect_success 'pull.rebase=interactive' '
@@ -478,7 +531,8 @@ test_expect_success 'pull.rebase=interactive' '
 	test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
 	test_when_finished "test_might_fail git rebase --abort" &&
 	test_must_fail git pull --rebase=interactive . copy &&
-	test "I was here" = "$(cat fake.out)"
+	echo "I was here" >expect &&
+	test_cmp expect fake.out
 '
 
 test_expect_success 'pull --rebase=i' '
@@ -489,30 +543,35 @@ test_expect_success 'pull --rebase=i' '
 	test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
 	test_when_finished "test_might_fail git rebase --abort" &&
 	test_must_fail git pull --rebase=i . copy &&
-	test "I was here, too" = "$(cat fake.out)"
+	echo "I was here, too" >expect &&
+	test_cmp expect fake.out
 '
 
 test_expect_success 'pull.rebase=invalid fails' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase invalid &&
-	! git pull . copy
+	test_must_fail git pull . copy
 '
 
 test_expect_success '--rebase=false create a new merge commit' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase true &&
 	git pull --rebase=false . copy &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^1 before-preserve-rebase &&
+	test_cmp_rev HEAD^2 copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success '--rebase=true rebases and flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase preserve &&
 	git pull --rebase=true . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^^ copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success REBASE_P \
@@ -520,58 +579,62 @@ test_expect_success REBASE_P \
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase true &&
 	git pull --rebase=preserve . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
+	test_cmp_rev HEAD^^ copy &&
+	test_cmp_rev HEAD^2 keep-merge
 '
 
 test_expect_success '--rebase=invalid fails' '
 	git reset --hard before-preserve-rebase &&
-	! git pull --rebase=invalid . copy
+	test_must_fail git pull --rebase=invalid . copy
 '
 
 test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase preserve &&
 	git pull --rebase . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^^ copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success '--rebase with rebased upstream' '
-
 	git remote add -f me . &&
 	git checkout copy &&
 	git tag copy-orig &&
 	git reset --hard HEAD^ &&
-	echo conflicting modification > file &&
+	echo conflicting modification >file &&
 	git commit -m conflict file &&
 	git checkout to-rebase &&
-	echo file > file2 &&
+	echo file >file2 &&
 	git commit -m to-rebase file2 &&
 	git tag to-rebase-orig &&
 	git pull --rebase me copy &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
-
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 '
 
 test_expect_success '--rebase -f with rebased upstream' '
 	test_when_finished "test_might_fail git rebase --abort" &&
 	git reset --hard to-rebase-orig &&
 	git pull --rebase -f me copy &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 '
 
 test_expect_success '--rebase with rebased default upstream' '
-
 	git update-ref refs/remotes/me/copy copy-orig &&
 	git checkout --track -b to-rebase2 me/copy &&
 	git reset --hard to-rebase-orig &&
 	git pull --rebase &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
-
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 '
 
 test_expect_success 'rebased upstream + fetch + pull --rebase' '
@@ -582,13 +645,14 @@ test_expect_success 'rebased upstream + fetch + pull --rebase' '
 	git reset --hard to-rebase-orig &&
 	git fetch &&
 	git pull --rebase &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 
 '
 
 test_expect_success 'pull --rebase dies early with dirty working directory' '
-
 	git checkout to-rebase &&
 	git update-ref refs/remotes/me/copy copy^ &&
 	COPY="$(git rev-parse --verify me/copy)" &&
@@ -596,23 +660,23 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '
 	test_config branch.to-rebase.remote me &&
 	test_config branch.to-rebase.merge refs/heads/copy &&
 	test_config branch.to-rebase.rebase true &&
-	echo dirty >> file &&
+	echo dirty >>file &&
 	git add file &&
 	test_must_fail git pull &&
-	test "$COPY" = "$(git rev-parse --verify me/copy)" &&
+	test_cmp_rev "$COPY" me/copy &&
 	git checkout HEAD -- file &&
 	git pull &&
-	test "$COPY" != "$(git rev-parse --verify me/copy)"
-
+	test_cmp_rev ! "$COPY" me/copy
 '
 
 test_expect_success 'pull --rebase works on branch yet to be born' '
 	git rev-parse master >expect &&
 	mkdir empty_repo &&
-	(cd empty_repo &&
-	 git init &&
-	 git pull --rebase .. master &&
-	 git rev-parse HEAD >../actual
+	(
+		cd empty_repo &&
+		git init &&
+		git pull --rebase .. master &&
+		git rev-parse HEAD >../actual
 	) &&
 	test_cmp expect actual
 '
@@ -624,10 +688,14 @@ test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
 		cd empty_repo2 &&
 		echo staged-file >staged-file &&
 		git add staged-file &&
-		test "$(git ls-files)" = staged-file &&
+		echo staged-file >expect &&
+		git ls-files >actual &&
+		test_cmp expect actual &&
 		test_must_fail git pull --rebase .. master 2>err &&
-		test "$(git ls-files)" = staged-file &&
-		test "$(git show :staged-file)" = staged-file &&
+		git ls-files >actual &&
+		test_cmp expect actual &&
+		git show :staged-file >actual &&
+		test_cmp expect actual &&
 		test_i18ngrep "unborn branch with changes added to the index" err
 	)
 '
@@ -638,7 +706,8 @@ test_expect_success 'pull --rebase fails on corrupt HEAD' '
 	(
 		cd corrupt &&
 		test_commit one &&
-		obj=$(git rev-parse --verify HEAD | sed "s#^..#&/#") &&
+		git rev-parse --verify HEAD >head &&
+		obj=$(sed "s#^..#&/#" head) &&
 		rm -f .git/objects/$obj &&
 		test_must_fail git pull --rebase
 	)
@@ -646,66 +715,79 @@ test_expect_success 'pull --rebase fails on corrupt HEAD' '
 
 test_expect_success 'setup for detecting upstreamed changes' '
 	mkdir src &&
-	(cd src &&
-	 git init &&
-	 printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
-	 git add stuff &&
-	 git commit -m "Initial revision"
+	(
+		cd src &&
+		git init &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
+		git add stuff &&
+		git commit -m "Initial revision"
 	) &&
 	git clone src dst &&
-	(cd src &&
-	 modify s/5/43/ stuff &&
-	 git commit -a -m "5->43" &&
-	 modify s/6/42/ stuff &&
-	 git commit -a -m "Make it bigger"
+	(
+		cd src &&
+		modify s/5/43/ stuff &&
+		git commit -a -m "5->43" &&
+		modify s/6/42/ stuff &&
+		git commit -a -m "Make it bigger"
 	) &&
-	(cd dst &&
-	 modify s/5/43/ stuff &&
-	 git commit -a -m "Independent discovery of 5->43"
+	(
+		cd dst &&
+		modify s/5/43/ stuff &&
+		git commit -a -m "Independent discovery of 5->43"
 	)
 '
 
 test_expect_success 'git pull --rebase detects upstreamed changes' '
-	(cd dst &&
-	 git pull --rebase &&
-	 test -z "$(git ls-files -u)"
+	(
+		cd dst &&
+		git pull --rebase &&
+		git ls-files -u >untracked &&
+		test_must_be_empty untracked
 	)
 '
 
 test_expect_success 'setup for avoiding reapplying old patches' '
-	(cd dst &&
-	 test_might_fail git rebase --abort &&
-	 git reset --hard origin/master
+	(
+		cd dst &&
+		test_might_fail git rebase --abort &&
+		git reset --hard origin/master
 	) &&
 	git clone --bare src src-replace.git &&
 	rm -rf src &&
 	mv src-replace.git src &&
-	(cd dst &&
-	 modify s/2/22/ stuff &&
-	 git commit -a -m "Change 2" &&
-	 modify s/3/33/ stuff &&
-	 git commit -a -m "Change 3" &&
-	 modify s/4/44/ stuff &&
-	 git commit -a -m "Change 4" &&
-	 git push &&
-
-	 modify s/44/55/ stuff &&
-	 git commit --amend -a -m "Modified Change 4"
+	(
+		cd dst &&
+		modify s/2/22/ stuff &&
+		git commit -a -m "Change 2" &&
+		modify s/3/33/ stuff &&
+		git commit -a -m "Change 3" &&
+		modify s/4/44/ stuff &&
+		git commit -a -m "Change 4" &&
+		git push &&
+
+		modify s/44/55/ stuff &&
+		git commit --amend -a -m "Modified Change 4"
 	)
 '
 
 test_expect_success 'git pull --rebase does not reapply old patches' '
-	(cd dst &&
-	 test_must_fail git pull --rebase &&
-	 test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
+	(
+		cd dst &&
+		test_must_fail git pull --rebase &&
+		cat .git/rebase-merge/done .git/rebase-merge/git-rebase-todo >work &&
+		grep -v -e \# -e ^$ work >patches &&
+		test_line_count = 1 patches &&
+		rm -f work
 	)
 '
 
 test_expect_success 'git pull --rebase against local branch' '
 	git checkout -b copy2 to-rebase-orig &&
 	git pull --rebase . to-rebase &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 '
 
 test_done
diff --git a/third_party/git/t/t5528-push-default.sh b/third_party/git/t/t5528-push-default.sh
index 44309566f134..4d1e0c363ea1 100755
--- a/third_party/git/t/t5528-push-default.sh
+++ b/third_party/git/t/t5528-push-default.sh
@@ -163,7 +163,7 @@ test_pushdefault_workflow success current master
 # update parent1's foo (which is our upstream)
 test_pushdefault_workflow success upstream foo
 
-# upsream is foo which is not the name of the current branch
+# upstream is foo which is not the name of the current branch
 test_pushdefault_workflow failure simple master
 
 # master and foo are updated
diff --git a/third_party/git/t/t5530-upload-pack-error.sh b/third_party/git/t/t5530-upload-pack-error.sh
index a1d3031d40dc..4ce9a9f70411 100755
--- a/third_party/git/t/t5530-upload-pack-error.sh
+++ b/third_party/git/t/t5530-upload-pack-error.sh
@@ -14,7 +14,7 @@ corrupt_repo () {
 }
 
 test_expect_success 'setup and corrupt repository' '
-
+	test_oid_init &&
 	echo file >file &&
 	git add file &&
 	git rev-parse :file &&
@@ -31,9 +31,10 @@ test_expect_success 'fsck fails' '
 '
 
 test_expect_success 'upload-pack fails due to error in pack-objects packing' '
-
-	printf "0032want %s\n00000009done\n0000" \
-		$(git rev-parse HEAD) >input &&
+	head=$(git rev-parse HEAD) &&
+	hexsz=$(test_oid hexsz) &&
+	printf "%04xwant %s\n00000009done\n0000" \
+		$(($hexsz + 10)) $head >input &&
 	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
 	test_i18ngrep "unable to read" output.err &&
 	test_i18ngrep "pack-objects died" output.err
@@ -51,16 +52,17 @@ test_expect_success 'fsck fails' '
 '
 test_expect_success 'upload-pack fails due to error in rev-list' '
 
-	printf "0032want %s\n0034shallow %s00000009done\n0000" \
-		$(git rev-parse HEAD) $(git rev-parse HEAD^) >input &&
+	printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \
+		$(($hexsz + 10)) $(git rev-parse HEAD) \
+		$(($hexsz + 12)) $(git rev-parse HEAD^) >input &&
 	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
 	grep "bad tree object" output.err
 '
 
 test_expect_success 'upload-pack fails due to bad want (no object)' '
 
-	printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
-		"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input &&
+	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
+		$(($hexsz + 29)) $(test_oid deadbeef) >input &&
 	test_must_fail git upload-pack . <input >output 2>output.err &&
 	grep "not our ref" output.err &&
 	grep "ERR" output &&
@@ -70,8 +72,8 @@ test_expect_success 'upload-pack fails due to bad want (no object)' '
 test_expect_success 'upload-pack fails due to bad want (not tip)' '
 
 	oid=$(echo an object we have | git hash-object -w --stdin) &&
-	printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
-		"$oid" >input &&
+	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
+		$(($hexsz + 29)) "$oid" >input &&
 	test_must_fail git upload-pack . <input >output 2>output.err &&
 	grep "not our ref" output.err &&
 	grep "ERR" output &&
@@ -80,8 +82,8 @@ test_expect_success 'upload-pack fails due to bad want (not tip)' '
 
 test_expect_success 'upload-pack fails due to error in pack-objects enumeration' '
 
-	printf "0032want %s\n00000009done\n0000" \
-		$(git rev-parse HEAD) >input &&
+	printf "%04xwant %s\n00000009done\n0000" \
+		$((hexsz + 10)) $(git rev-parse HEAD) >input &&
 	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
 	grep "bad tree object" output.err &&
 	grep "pack-objects died" output.err
diff --git a/third_party/git/t/t5535-fetch-push-symref.sh b/third_party/git/t/t5535-fetch-push-symref.sh
index 8ed58d27f243..e8f6d233ffb8 100755
--- a/third_party/git/t/t5535-fetch-push-symref.sh
+++ b/third_party/git/t/t5535-fetch-push-symref.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='avoiding conflicting update thru symref aliasing'
+test_description='avoiding conflicting update through symref aliasing'
 
 . ./test-lib.sh
 
diff --git a/third_party/git/t/t5537-fetch-shallow.sh b/third_party/git/t/t5537-fetch-shallow.sh
index 66f0b64d3927..4f681dbbe11c 100755
--- a/third_party/git/t/t5537-fetch-shallow.sh
+++ b/third_party/git/t/t5537-fetch-shallow.sh
@@ -15,7 +15,11 @@ test_expect_success 'setup' '
 	commit 2 &&
 	commit 3 &&
 	commit 4 &&
-	git config --global transfer.fsckObjects true
+	git config --global transfer.fsckObjects true &&
+	test_oid_cache <<-EOF
+	perl sha1:s/0034shallow %s/0036unshallow %s/
+	perl sha256:s/004cshallow %s/004eunshallow %s/
+	EOF
 '
 
 test_expect_success 'setup shallow clone' '
@@ -233,26 +237,29 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f
 	git -C "$REPO" config protocol.version 2 &&
 	git -C client config protocol.version 2 &&
 
-	git -C client fetch --depth=2 "$HTTPD_URL/one_time_sed/repo" master:a_branch &&
+	git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/repo" master:a_branch &&
 
 	# Craft a situation in which the server sends back an unshallow request
 	# with an empty packfile. This is done by refetching with a shorter
 	# depth (to ensure that the packfile is empty), and overwriting the
 	# shallow line in the response with the unshallow line we want.
-	printf "s/0034shallow %s/0036unshallow %s/" \
+	printf "$(test_oid perl)" \
 	       "$(git -C "$REPO" rev-parse HEAD)" \
 	       "$(git -C "$REPO" rev-parse HEAD^)" \
-	       >"$HTTPD_ROOT_PATH/one-time-sed" &&
+	       >"$HTTPD_ROOT_PATH/one-time-perl" &&
 	test_must_fail env GIT_TEST_SIDEBAND_ALL=0 git -C client \
-		fetch --depth=1 "$HTTPD_URL/one_time_sed/repo" \
+		fetch --depth=1 "$HTTPD_URL/one_time_perl/repo" \
 		master:a_branch &&
 
-	# Ensure that the one-time-sed script was used.
-	! test -e "$HTTPD_ROOT_PATH/one-time-sed" &&
+	# Ensure that the one-time-perl script was used.
+	! test -e "$HTTPD_ROOT_PATH/one-time-perl" &&
 
 	# Ensure that the resulting repo is consistent, despite our failure to
 	# fetch.
 	git -C client fsck
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/third_party/git/t/t5539-fetch-http-shallow.sh b/third_party/git/t/t5539-fetch-http-shallow.sh
index b4ad81f00635..c0d02dee893f 100755
--- a/third_party/git/t/t5539-fetch-http-shallow.sh
+++ b/third_party/git/t/t5539-fetch-http-shallow.sh
@@ -69,7 +69,7 @@ test_expect_success 'no shallow lines after receiving ACK ready' '
 		test_commit new-too &&
 		# NEEDSWORK: If the overspecification of the expected result is reduced, we
 		# might be able to run this test in all protocol versions.
-		GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" GIT_TEST_PROTOCOL_VERSION= \
+		GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" GIT_TEST_PROTOCOL_VERSION=0 \
 			git fetch --depth=2 &&
 		grep "fetch-pack< ACK .* ready" ../trace &&
 		! grep "fetch-pack> done" ../trace
diff --git a/third_party/git/t/t5540-http-push-webdav.sh b/third_party/git/t/t5540-http-push-webdav.sh
index a094fd5e7133..d476c335098e 100755
--- a/third_party/git/t/t5540-http-push-webdav.sh
+++ b/third_party/git/t/t5540-http-push-webdav.sh
@@ -134,15 +134,13 @@ test_expect_success 'MKCOL sends directory names with trailing slashes' '
 
 x1="[0-9a-f]"
 x2="$x1$x1"
-x5="$x1$x1$x1$x1$x1"
-x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"
-x40="$x38$x2"
+xtrunc=$(echo $OID_REGEX | sed -e "s/\[0-9a-f\]\[0-9a-f\]//")
 
 test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '
 	sed \
 		-e "s/PUT /OP /" \
 		-e "s/MOVE /OP /" \
-	    -e "s|/objects/$x2/${x38}_$x40|WANTED_PATH_REQUEST|" \
+	    -e "s|/objects/$x2/${xtrunc}_$OID_REGEX|WANTED_PATH_REQUEST|" \
 		"$HTTPD_ROOT_PATH"/access.log |
 	grep -e "\"OP .*WANTED_PATH_REQUEST HTTP/[.0-9]*\" 20[0-9] "
 
diff --git a/third_party/git/t/t5541-http-push-smart.sh b/third_party/git/t/t5541-http-push-smart.sh
index b86ddb60f2ea..23be8ce92d67 100755
--- a/third_party/git/t/t5541-http-push-smart.sh
+++ b/third_party/git/t/t5541-http-push-smart.sh
@@ -49,7 +49,7 @@ test_expect_success 'no empty path components' '
 
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		check_access_log exp
 	fi
@@ -135,7 +135,7 @@ EOF
 test_expect_success 'used receive-pack service' '
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		check_access_log exp
 	fi
@@ -184,11 +184,12 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat
 	test_config -C "$d" http.receivepack true &&
 	up="$HTTPD_URL"/smart/atomic-branches.git &&
 
-	# Tell "$up" about two branches for now
+	# Tell "$up" about three branches for now
 	test_commit atomic1 &&
 	test_commit atomic2 &&
 	git branch collateral &&
-	git push "$up" master collateral &&
+	git branch other &&
+	git push "$up" master collateral other &&
 
 	# collateral is a valid push, but should be failed by atomic push
 	git checkout collateral &&
@@ -226,6 +227,41 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat
 	grep "^ ! .*rejected.* collateral -> collateral .*atomic push failed" output
 '
 
+test_expect_success 'push --atomic fails on server-side errors' '
+	# Use previously set up repository
+	d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git &&
+	test_config -C "$d" http.receivepack true &&
+	up="$HTTPD_URL"/smart/atomic-branches.git &&
+
+	# break ref updates for other on the remote site
+	mkdir "$d/refs/heads/other.lock" &&
+
+	# add the new commit to other
+	git branch -f other collateral &&
+
+	# --atomic should cause entire push to be rejected
+	test_must_fail git push --atomic "$up" atomic other 2>output  &&
+
+	# the new branch should not have been created upstream
+	test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
+
+	# upstream should still reflect atomic2, the last thing we pushed
+	# successfully
+	git rev-parse atomic2 >expected &&
+	# ...to other.
+	git -C "$d" rev-parse refs/heads/other >actual &&
+	test_cmp expected actual &&
+
+	# the new branch should not have been created upstream
+	test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
+
+	# the failed refs should be indicated to the user
+	grep "^ ! .*rejected.* other -> other .*atomic transaction failed" output &&
+
+	# the collateral failure refs should be indicated to the user
+	grep "^ ! .*rejected.* atomic -> atomic .*atomic transaction failed" output
+'
+
 test_expect_success 'push --all can push to empty repo' '
 	d=$HTTPD_DOCUMENT_ROOT_PATH/empty-all.git &&
 	git init --bare "$d" &&
@@ -262,7 +298,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' '
 	cd "$ROOT_PATH"/test_repo_clone &&
 	test_commit noisy &&
 	test_terminal git push >output 2>&1 &&
-	test_i18ngrep "Writing objects" output
+	test_i18ngrep "^Writing objects" output
 '
 
 test_expect_success TTY 'push --quiet silences status and progress' '
@@ -277,7 +313,7 @@ test_expect_success TTY 'push --no-progress silences progress but not status' '
 	test_commit no-progress &&
 	test_terminal git push --no-progress >output 2>&1 &&
 	test_i18ngrep "^To http" output &&
-	test_i18ngrep ! "Writing objects" output
+	test_i18ngrep ! "^Writing objects" output
 '
 
 test_expect_success 'push --progress shows progress to non-tty' '
@@ -285,7 +321,7 @@ test_expect_success 'push --progress shows progress to non-tty' '
 	test_commit progress &&
 	git push --progress >output 2>&1 &&
 	test_i18ngrep "^To http" output &&
-	test_i18ngrep "Writing objects" output
+	test_i18ngrep "^Writing objects" output
 '
 
 test_expect_success 'http push gives sane defaults to reflog' '
diff --git a/third_party/git/t/t5545-push-options.sh b/third_party/git/t/t5545-push-options.sh
index 6d1d59c9b1af..38e6f7340e74 100755
--- a/third_party/git/t/t5545-push-options.sh
+++ b/third_party/git/t/t5545-push-options.sh
@@ -115,7 +115,7 @@ test_expect_success 'push options and submodules' '
 
 	git -C parent submodule add ../upstream workbench &&
 	git -C parent/workbench remote add up ../../upstream &&
-	git -C parent commit -m "add submoule" &&
+	git -C parent commit -m "add submodule" &&
 
 	test_commit -C parent/workbench two &&
 	git -C parent add workbench &&
@@ -278,4 +278,7 @@ test_expect_success 'push options keep quoted characters intact (http)' '
 	test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/third_party/git/t/t5550-http-fetch-dumb.sh b/third_party/git/t/t5550-http-fetch-dumb.sh
index b811d89cfd6d..ea2688bde59c 100755
--- a/third_party/git/t/t5550-http-fetch-dumb.sh
+++ b/third_party/git/t/t5550-http-fetch-dumb.sh
@@ -321,11 +321,17 @@ test_expect_success 'git client does not send an empty Accept-Language' '
 '
 
 test_expect_success 'remote-http complains cleanly about malformed urls' '
-	# do not actually issue "list" or other commands, as we do not
-	# want to rely on what curl would actually do with such a broken
-	# URL. This is just about making sure we do not segfault during
-	# initialization.
-	test_must_fail git remote-http http::/example.com/repo.git
+	test_must_fail git remote-http http::/example.com/repo.git 2>stderr &&
+	test_i18ngrep "url has no scheme" stderr
+'
+
+# NEEDSWORK: Writing commands to git-remote-curl can race against the latter
+# erroring out, producing SIGPIPE. Remove "ok=sigpipe" once transport-helper has
+# learned to handle early remote helper failures more cleanly.
+test_expect_success 'remote-http complains cleanly about empty scheme' '
+	test_must_fail ok=sigpipe git ls-remote \
+		http::${HTTPD_URL#http}/dumb/repo.git 2>stderr &&
+	test_i18ngrep "url has no scheme" stderr
 '
 
 test_expect_success 'redirects can be forbidden/allowed' '
diff --git a/third_party/git/t/t5551-http-fetch-smart.sh b/third_party/git/t/t5551-http-fetch-smart.sh
index e38e54386795..6788aefaceb8 100755
--- a/third_party/git/t/t5551-http-fetch-smart.sh
+++ b/third_party/git/t/t5551-http-fetch-smart.sh
@@ -43,7 +43,7 @@ test_expect_success 'clone http repository' '
 	< Cache-Control: no-cache, max-age=0, must-revalidate
 	< Content-Type: application/x-git-upload-pack-result
 	EOF
-	GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION= \
+	GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION=0 \
 		git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
 	test_cmp file clone/file &&
 	tr '\''\015'\'' Q <err |
@@ -84,7 +84,7 @@ test_expect_success 'clone http repository' '
 
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		sed -e "s/^> Accept-Encoding: .*/> Accept-Encoding: ENCODINGS/" \
 				actual >actual.smudged &&
@@ -113,7 +113,7 @@ test_expect_success 'used upload-pack service' '
 
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		check_access_log exp
 	fi
@@ -241,7 +241,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set
 
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		tail -3 cookies.txt | sort >cookies_tail.txt &&
 		test_cmp expect_cookies.txt cookies_tail.txt
@@ -336,7 +336,7 @@ test_expect_success 'test allowreachablesha1inwant with unreachable' '
 	git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" &&
 	# Some protocol versions (e.g. 2) support fetching
 	# unadvertised objects, so restrict this test to v0.
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 		git -C test_reachable.git fetch origin "$(git rev-parse HEAD)"
 '
 
@@ -358,7 +358,7 @@ test_expect_success 'test allowanysha1inwant with unreachable' '
 	git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" &&
 	# Some protocol versions (e.g. 2) support fetching
 	# unadvertised objects, so restrict this test to v0.
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 		git -C test_reachable.git fetch origin "$(git rev-parse HEAD)" &&
 
 	git -C "$server" config uploadpack.allowanysha1inwant 1 &&
diff --git a/third_party/git/t/t5552-skipping-fetch-negotiator.sh b/third_party/git/t/t5552-skipping-fetch-negotiator.sh
index 8a14be51a132..156c70404083 100755
--- a/third_party/git/t/t5552-skipping-fetch-negotiator.sh
+++ b/third_party/git/t/t5552-skipping-fetch-negotiator.sh
@@ -60,29 +60,6 @@ test_expect_success 'commits with no parents are sent regardless of skip distanc
 	have_not_sent c6 c4 c3
 '
 
-test_expect_success 'unknown fetch.negotiationAlgorithm values error out' '
-	rm -rf server client trace &&
-	git init server &&
-	test_commit -C server to_fetch &&
-
-	git init client &&
-	test_commit -C client on_client &&
-	git -C client checkout on_client &&
-
-	test_config -C client fetch.negotiationAlgorithm invalid &&
-	test_must_fail git -C client fetch "$(pwd)/server" 2>err &&
-	test_i18ngrep "unknown fetch negotiation algorithm" err &&
-
-	# Explicit "default" value
-	test_config -C client fetch.negotiationAlgorithm default &&
-	git -C client -c fetch.negotiationAlgorithm=default fetch "$(pwd)/server" &&
-
-	# Implementation detail: If there is nothing to fetch, we will not error out
-	test_config -C client fetch.negotiationAlgorithm invalid &&
-	git -C client fetch "$(pwd)/server" 2>err &&
-	test_i18ngrep ! "unknown fetch negotiation algorithm" err
-'
-
 test_expect_success 'when two skips collide, favor the larger one' '
 	rm -rf server client trace &&
 	git init server &&
@@ -130,7 +107,11 @@ test_expect_success 'use ref advertisement to filter out commits' '
 
 	# The ref advertisement itself is filtered when protocol v2 is used, so
 	# use v0.
-	GIT_TEST_PROTOCOL_VERSION= trace_fetch client origin to_fetch &&
+	(
+		GIT_TEST_PROTOCOL_VERSION=0 &&
+		export GIT_TEST_PROTOCOL_VERSION &&
+		trace_fetch client origin to_fetch
+	) &&
 	have_sent c5 c4^ c2side &&
 	have_not_sent c4 c4^^ c4^^^
 '
@@ -192,7 +173,17 @@ test_expect_success 'do not send "have" with ancestors of commits that server AC
 	test_commit -C server commit-on-b1 &&
 
 	test_config -C client fetch.negotiationalgorithm skipping &&
-	trace_fetch client "$(pwd)/server" to_fetch &&
+
+	# NEEDSWORK: The number of "have"s sent depends on whether the transport
+	# is stateful. If the overspecification of the result were reduced, this
+	# test could be used for both stateful and stateless transports.
+	(
+		# Force protocol v0, in which local transport is stateful (in
+		# protocol v2 it is stateless).
+		GIT_TEST_PROTOCOL_VERSION=0 &&
+		export GIT_TEST_PROTOCOL_VERSION &&
+		trace_fetch client "$(pwd)/server" to_fetch
+	) &&
 	grep "  fetch" trace &&
 
 	# fetch-pack sends 2 requests each containing 16 "have" lines before
diff --git a/third_party/git/t/t5553-set-upstream.sh b/third_party/git/t/t5553-set-upstream.sh
new file mode 100755
index 000000000000..81975ad8f9eb
--- /dev/null
+++ b/third_party/git/t/t5553-set-upstream.sh
@@ -0,0 +1,178 @@
+#!/bin/sh
+
+test_description='"git fetch/pull --set-upstream" basic tests.'
+. ./test-lib.sh
+
+check_config () {
+	printf "%s\n" "$2" "$3" >"expect.$1" &&
+	{
+		git config "branch.$1.remote" && git config "branch.$1.merge"
+	} >"actual.$1" &&
+	test_cmp "expect.$1" "actual.$1"
+}
+
+check_config_missing () {
+	test_expect_code 1 git config "branch.$1.remote" &&
+	test_expect_code 1 git config "branch.$1.merge"
+}
+
+clear_config () {
+	for branch in "$@"; do
+		test_might_fail git config --unset-all "branch.$branch.remote"
+		test_might_fail git config --unset-all "branch.$branch.merge"
+	done
+}
+
+ensure_fresh_upstream () {
+	rm -rf parent && git init --bare parent
+}
+
+test_expect_success 'setup bare parent fetch' '
+	ensure_fresh_upstream &&
+	git remote add upstream parent
+'
+
+test_expect_success 'setup commit on master and other fetch' '
+	test_commit one &&
+	git push upstream master &&
+	git checkout -b other &&
+	test_commit two &&
+	git push upstream other
+'
+
+# tests for fetch --set-upstream
+
+test_expect_success 'fetch --set-upstream does not set upstream w/o branch' '
+	clear_config master other &&
+	git checkout master &&
+	git fetch --set-upstream upstream &&
+	check_config_missing master &&
+	check_config_missing other
+'
+
+test_expect_success 'fetch --set-upstream upstream master sets branch master but not other' '
+	clear_config master other &&
+	git fetch --set-upstream upstream master &&
+	check_config master upstream refs/heads/master &&
+	check_config_missing other
+'
+
+test_expect_success 'fetch --set-upstream upstream other sets branch other' '
+	clear_config master other &&
+	git fetch --set-upstream upstream other &&
+	check_config master upstream refs/heads/other &&
+	check_config_missing other
+'
+
+test_expect_success 'fetch --set-upstream master:other does not set the branch other2' '
+	clear_config other2 &&
+	git fetch --set-upstream upstream master:other2 &&
+	check_config_missing other2
+'
+
+test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url' '
+	# master explicitly not cleared, we check that it is not touched from previous value
+	clear_config other other2 &&
+	test_must_fail git fetch --set-upstream http://nosuchdomain.example.com &&
+	check_config master upstream refs/heads/other &&
+	check_config_missing other &&
+	check_config_missing other2
+'
+
+test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' '
+	clear_config other other2 &&
+	url="file://'"$PWD"'" &&
+	git fetch --set-upstream "$url" &&
+	check_config master "$url" HEAD &&
+	check_config_missing other &&
+	check_config_missing other2
+'
+
+# tests for pull --set-upstream
+
+test_expect_success 'setup bare parent pull' '
+	git remote rm upstream &&
+	ensure_fresh_upstream &&
+	git remote add upstream parent
+'
+
+test_expect_success 'setup commit on master and other pull' '
+	test_commit three &&
+	git push --tags upstream master &&
+	test_commit four &&
+	git push upstream other
+'
+
+test_expect_success 'pull --set-upstream upstream master sets branch master but not other' '
+	clear_config master other &&
+	git pull --set-upstream upstream master &&
+	check_config master upstream refs/heads/master &&
+	check_config_missing other
+'
+
+test_expect_success 'pull --set-upstream master:other2 does not set the branch other2' '
+	clear_config other2 &&
+	git pull --set-upstream upstream master:other2 &&
+	check_config_missing other2
+'
+
+test_expect_success 'pull --set-upstream upstream other sets branch master' '
+	clear_config master other &&
+	git pull --set-upstream upstream other &&
+	check_config master upstream refs/heads/other &&
+	check_config_missing other
+'
+
+test_expect_success 'pull --set-upstream upstream tag does not set the tag' '
+	clear_config three &&
+	git pull --tags --set-upstream upstream three &&
+	check_config_missing three
+'
+
+test_expect_success 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url' '
+	# master explicitly not cleared, we check that it is not touched from previous value
+	clear_config other other2 three &&
+	test_must_fail git pull --set-upstream http://nosuchdomain.example.com &&
+	check_config master upstream refs/heads/other &&
+	check_config_missing other &&
+	check_config_missing other2 &&
+	check_config_missing three
+'
+
+test_expect_success 'pull --set-upstream upstream HEAD sets branch HEAD' '
+	clear_config master other &&
+	git pull --set-upstream upstream HEAD &&
+	check_config master upstream HEAD &&
+	git checkout other &&
+	git pull --set-upstream upstream HEAD &&
+	check_config other upstream HEAD
+'
+
+test_expect_success 'pull --set-upstream upstream with more than one branch does nothing' '
+	clear_config master three &&
+	git pull --set-upstream upstream master three &&
+	check_config_missing master &&
+	check_config_missing three
+'
+
+test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' '
+	clear_config master other other2 &&
+	git checkout master &&
+	url="file://'"$PWD"'" &&
+	git pull --set-upstream "$url" &&
+	check_config master "$url" HEAD &&
+	check_config_missing other &&
+	check_config_missing other2
+'
+
+test_expect_success 'pull --set-upstream with valid URL and branch sets branch' '
+	clear_config master other other2 &&
+	git checkout master &&
+	url="file://'"$PWD"'" &&
+	git pull --set-upstream "$url" master &&
+	check_config master "$url" refs/heads/master &&
+	check_config_missing other &&
+	check_config_missing other2
+'
+
+test_done
diff --git a/third_party/git/t/t5562-http-backend-content-length.sh b/third_party/git/t/t5562-http-backend-content-length.sh
index f0f425b2cf57..4a110b307ee5 100755
--- a/third_party/git/t/t5562-http-backend-content-length.sh
+++ b/third_party/git/t/t5562-http-backend-content-length.sh
@@ -59,7 +59,7 @@ test_expect_success 'setup' '
 	printf done | packetize >>fetch_body &&
 	test_copy_bytes 10 <fetch_body >fetch_body.trunc &&
 	hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) &&
-	printf "%s %s refs/heads/newbranch\\0report-status\\n" "$_z40" "$hash_next" | packetize >push_body &&
+	printf "%s %s refs/heads/newbranch\\0report-status\\n" "$ZERO_OID" "$hash_next" | packetize >push_body &&
 	printf 0000 >>push_body &&
 	echo "$hash_next" | git pack-objects --stdout >>push_body &&
 	test_copy_bytes 10 <push_body >push_body.trunc &&
diff --git a/third_party/git/t/t5573-pull-verify-signatures.sh b/third_party/git/t/t5573-pull-verify-signatures.sh
index 3e9876e19713..a53dd8550d0b 100755
--- a/third_party/git/t/t5573-pull-verify-signatures.sh
+++ b/third_party/git/t/t5573-pull-verify-signatures.sh
@@ -60,6 +60,27 @@ test_expect_success GPG 'pull commit with untrusted signature with --verify-sign
 	test_i18ngrep "has an untrusted GPG signature" pullerror
 '
 
+test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel ultimate &&
+	test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel marginal &&
+	test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel undefined &&
+	git pull --ff-only --verify-signatures untrusted >pulloutput &&
+	test_i18ngrep "has a good GPG signature" pulloutput
+'
+
 test_expect_success GPG 'pull signed commit with --verify-signatures' '
 	test_when_finished "git reset --hard && git checkout initial" &&
 	git pull --verify-signatures signed >pulloutput &&
@@ -79,10 +100,53 @@ test_expect_success GPG 'pull commit with bad signature with --no-verify-signatu
 '
 
 test_expect_success GPG 'pull unsigned commit into unborn branch' '
+	test_when_finished "rm -rf empty-repo" &&
 	git init empty-repo &&
 	test_must_fail \
 		git -C empty-repo pull --verify-signatures ..  2>pullerror &&
 	test_i18ngrep "does not have a GPG signature" pullerror
 '
 
+test_expect_success GPG 'pull commit into unborn branch with bad signature and --verify-signatures' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_must_fail \
+		git -C empty-repo pull --ff-only --verify-signatures ../bad 2>pullerror &&
+	test_i18ngrep "has a bad GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_must_fail \
+		git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_config_global gpg.minTrustLevel ultimate &&
+	test_must_fail \
+		git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_config_global gpg.minTrustLevel marginal &&
+	test_must_fail \
+		git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_config_global gpg.minTrustLevel undefined &&
+	git -C empty-repo pull --ff-only --verify-signatures ../untrusted >pulloutput &&
+	test_i18ngrep "has a good GPG signature" pulloutput
+'
+
 test_done
diff --git a/third_party/git/t/t5580-clone-push-unc.sh b/third_party/git/t/t5580-unc-paths.sh
index b3c8a92450bc..cf768b3a2790 100755
--- a/third_party/git/t/t5580-clone-push-unc.sh
+++ b/third_party/git/t/t5580-unc-paths.sh
@@ -40,11 +40,23 @@ test_expect_success clone '
 	git clone "file://$UNCPATH" clone
 '
 
+test_expect_success 'clone without file://' '
+	git clone "$UNCPATH" clone-without-file
+'
+
 test_expect_success 'clone with backslashed path' '
 	BACKSLASHED="$(echo "$UNCPATH" | tr / \\\\)" &&
 	git clone "$BACKSLASHED" backslashed
 '
 
+test_expect_success fetch '
+	git init to-fetch &&
+	(
+		cd to-fetch &&
+		git fetch "$UNCPATH" master
+	)
+'
+
 test_expect_success push '
 	(
 		cd clone &&
@@ -58,7 +70,7 @@ test_expect_success push '
 
 test_expect_success MINGW 'remote nick cannot contain backslashes' '
 	BACKSLASHED="$(winpwd | tr / \\\\)" &&
-	git ls-remote "$BACKSLASHED" >out 2>err &&
+	git ls-remote "$BACKSLASHED" 2>err &&
 	test_i18ngrep ! "unable to access" err
 '
 
diff --git a/third_party/git/t/t5601-clone.sh b/third_party/git/t/t5601-clone.sh
index 37d76808d4a7..84ea2a3eb707 100755
--- a/third_party/git/t/t5601-clone.sh
+++ b/third_party/git/t/t5601-clone.sh
@@ -434,7 +434,6 @@ test_expect_success 'double quoted plink.exe in GIT_SSH_COMMAND' '
 	expect_ssh "-v -P 123" myhost src
 '
 
-SQ="'"
 test_expect_success 'single quoted plink.exe in GIT_SSH_COMMAND' '
 	copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" &&
 	GIT_SSH_COMMAND="$SQ$TRASH_DIRECTORY/plink.exe$SQ -v" \
@@ -636,10 +635,10 @@ partial_clone_server () {
 	rm -rf "$SERVER" client &&
 	test_create_repo "$SERVER" &&
 	test_commit -C "$SERVER" one &&
-	HASH1=$(git hash-object "$SERVER/one.t") &&
+	HASH1=$(git -C "$SERVER" hash-object one.t) &&
 	git -C "$SERVER" revert HEAD &&
 	test_commit -C "$SERVER" two &&
-	HASH2=$(git hash-object "$SERVER/two.t") &&
+	HASH2=$(git -C "$SERVER" hash-object two.t) &&
 	test_config -C "$SERVER" uploadpack.allowfilter 1 &&
 	test_config -C "$SERVER" uploadpack.allowanysha1inwant 1
 }
@@ -654,7 +653,8 @@ partial_clone () {
 	git -C client fsck &&
 
 	# Ensure that unneeded blobs are not inadvertently fetched.
-	test_config -C client extensions.partialclone "not a remote" &&
+	test_config -C client remote.origin.promisor "false" &&
+	git -C client config --unset remote.origin.partialclonefilter &&
 	test_must_fail git -C client cat-file -e "$HASH1" &&
 
 	# But this blob was fetched, because clone performs an initial checkout
@@ -739,4 +739,7 @@ test_expect_success 'partial clone using HTTP' '
 	partial_clone "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/third_party/git/t/t5604-clone-reference.sh b/third_party/git/t/t5604-clone-reference.sh
index 4894237ab805..0c74b4e21a3e 100755
--- a/third_party/git/t/t5604-clone-reference.sh
+++ b/third_party/git/t/t5604-clone-reference.sh
@@ -326,15 +326,16 @@ test_expect_success SYMLINKS 'clone repo with symlinked or unknown files at obje
 	for raw in $(ls T*.raw)
 	do
 		sed -e "s!/../!/Y/!; s![0-9a-f]\{38,\}!Z!" -e "/commit-graph/d" \
-		    -e "/multi-pack-index/d" <$raw >$raw.de-sha || return 1
+		    -e "/multi-pack-index/d" <$raw >$raw.de-sha-1 &&
+		sort $raw.de-sha-1 >$raw.de-sha || return 1
 	done &&
 
 	cat >expected-files <<-EOF &&
 	./Y/Z
 	./Y/Z
+	./Y/Z
 	./a-loose-dir/Z
 	./an-object
-	./Y/Z
 	./info/packs
 	./pack/pack-Z.idx
 	./pack/pack-Z.pack
diff --git a/third_party/git/t/t5607-clone-bundle.sh b/third_party/git/t/t5607-clone-bundle.sh
index 2a0fb15cf175..9108ff6fbd6f 100755
--- a/third_party/git/t/t5607-clone-bundle.sh
+++ b/third_party/git/t/t5607-clone-bundle.sh
@@ -64,7 +64,7 @@ test_expect_success 'ridiculously long subject in boundary' '
 	test -s heads &&
 	git fetch long-subject-bundle.bdl &&
 	sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary &&
-	grep "^-[0-9a-f]\\{40\\} " boundary
+	grep "^-$OID_REGEX " boundary
 '
 
 test_expect_success 'prerequisites with an empty commit message' '
@@ -83,4 +83,15 @@ test_expect_success 'failed bundle creation does not leave cruft' '
 	test_path_is_missing fail.bundle.lock
 '
 
+test_expect_success 'fetch SHA-1 from bundle' '
+	test_create_repo foo &&
+	test_commit -C foo x &&
+	git -C foo bundle create tip.bundle -1 master &&
+	git -C foo rev-parse HEAD >hash &&
+
+	# Exercise to ensure that fetching a SHA-1 from a bundle works with no
+	# errors
+	git fetch --no-tags foo/tip.bundle "$(cat hash)"
+'
+
 test_done
diff --git a/third_party/git/t/t5608-clone-2gb.sh b/third_party/git/t/t5608-clone-2gb.sh
index 2c6bc07344cc..eee084288841 100755
--- a/third_party/git/t/t5608-clone-2gb.sh
+++ b/third_party/git/t/t5608-clone-2gb.sh
@@ -3,7 +3,7 @@
 test_description='Test cloning a repository larger than 2 gigabyte'
 . ./test-lib.sh
 
-if test -z "$GIT_TEST_CLONE_2GB"
+if ! test_bool_env GIT_TEST_CLONE_2GB false
 then
 	say 'Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t'
 else
diff --git a/third_party/git/t/t5616-partial-clone.sh b/third_party/git/t/t5616-partial-clone.sh
index b91ef548f86b..77bb91e97692 100755
--- a/third_party/git/t/t5616-partial-clone.sh
+++ b/third_party/git/t/t5616-partial-clone.sh
@@ -42,8 +42,16 @@ test_expect_success 'do partial clone 1' '
 
 	test_cmp expect_1.oids observed.oids &&
 	test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
-	test "$(git -C pc1 config --local extensions.partialclone)" = "origin" &&
-	test "$(git -C pc1 config --local core.partialclonefilter)" = "blob:none"
+	test "$(git -C pc1 config --local remote.origin.promisor)" = "true" &&
+	test "$(git -C pc1 config --local remote.origin.partialclonefilter)" = "blob:none"
+'
+
+test_expect_success 'verify that .promisor file contains refs fetched' '
+	ls pc1/.git/objects/pack/pack-*.promisor >promisorlist &&
+	test_line_count = 1 promisorlist &&
+	git -C srv.bare rev-list HEAD >headhash &&
+	grep "$(cat headhash) HEAD" $(cat promisorlist) &&
+	grep "$(cat headhash) refs/heads/master" $(cat promisorlist)
 '
 
 # checkout master to force dynamic object fetch of blobs at HEAD.
@@ -208,6 +216,25 @@ test_expect_success 'use fsck before and after manually fetching a missing subtr
 	test_cmp unique_types.expected unique_types.observed
 '
 
+test_expect_success 'implicitly construct combine: filter with repeated flags' '
+	GIT_TRACE=$(pwd)/trace git clone --bare \
+		--filter=blob:none --filter=tree:1 \
+		"file://$(pwd)/srv.bare" pc2 &&
+	grep "trace:.* git pack-objects .*--filter=combine:blob:none+tree:1" \
+		trace &&
+	git -C pc2 rev-list --objects --missing=allow-any HEAD >objects &&
+
+	# We should have gotten some root trees.
+	grep " $" objects &&
+	# Should not have gotten any non-root trees or blobs.
+	! grep " ." objects &&
+
+	xargs -n 1 git -C pc2 cat-file -t <objects >types &&
+	sort -u types >unique_types.actual &&
+	test_write_lines commit tree >unique_types.expected &&
+	test_cmp unique_types.expected unique_types.actual
+'
+
 test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' '
 	rm -rf src dst &&
 	git init src &&
@@ -241,6 +268,153 @@ test_expect_success 'fetch what is specified on CLI even if already promised' '
 	! grep "?$(cat blob)" missing_after
 '
 
+test_expect_success 'setup src repo for sparse filter' '
+	git init sparse-src &&
+	git -C sparse-src config --local uploadpack.allowfilter 1 &&
+	git -C sparse-src config --local uploadpack.allowanysha1inwant 1 &&
+	test_commit -C sparse-src one &&
+	test_commit -C sparse-src two &&
+	echo /one.t >sparse-src/only-one &&
+	git -C sparse-src add . &&
+	git -C sparse-src commit -m "add sparse checkout files"
+'
+
+test_expect_success 'partial clone with sparse filter succeeds' '
+	rm -rf dst.git &&
+	git clone --no-local --bare \
+		  --filter=sparse:oid=master:only-one \
+		  sparse-src dst.git &&
+	(
+		cd dst.git &&
+		git rev-list --objects --missing=print HEAD >out &&
+		grep "^$(git rev-parse HEAD:one.t)" out &&
+		grep "^?$(git rev-parse HEAD:two.t)" out
+	)
+'
+
+test_expect_success 'partial clone with unresolvable sparse filter fails cleanly' '
+	rm -rf dst.git &&
+	test_must_fail git clone --no-local --bare \
+				 --filter=sparse:oid=master:no-such-name \
+				 sparse-src dst.git 2>err &&
+	test_i18ngrep "unable to access sparse blob in .master:no-such-name" err &&
+	test_must_fail git clone --no-local --bare \
+				 --filter=sparse:oid=master \
+				 sparse-src dst.git 2>err &&
+	test_i18ngrep "unable to parse sparse filter data in" err
+'
+
+setup_triangle () {
+	rm -rf big-blob.txt server client promisor-remote &&
+
+	printf "line %d\n" $(test_seq 1 100) >big-blob.txt &&
+
+	# Create a server with 2 commits: a commit with a big tree and a child
+	# commit with an incremental change. Also, create a partial clone
+	# client that only contains the first commit.
+	git init server &&
+	git -C server config --local uploadpack.allowfilter 1 &&
+	for i in $(test_seq 1 100)
+	do
+		echo "make the tree big" >server/file$i &&
+		git -C server add file$i
+	done &&
+	git -C server commit -m "initial" &&
+	git clone --bare --filter=tree:0 "file://$(pwd)/server" client &&
+	echo another line >>server/file1 &&
+	git -C server commit -am "incremental change" &&
+
+	# Create a promisor remote that only contains the tree and blob from
+	# the first commit.
+	git init promisor-remote &&
+	git -C server config --local uploadpack.allowanysha1inwant 1 &&
+	TREE_HASH=$(git -C server rev-parse HEAD~1^{tree}) &&
+	git -C promisor-remote fetch --keep "file://$(pwd)/server" "$TREE_HASH" &&
+	git -C promisor-remote count-objects -v >object-count &&
+	test_i18ngrep "count: 0" object-count &&
+	test_i18ngrep "in-pack: 2" object-count &&
+
+	# Set it as the promisor remote of client. Thus, whenever
+	# the client lazy fetches, the lazy fetch will succeed only if it is
+	# for this tree or blob.
+	test_commit -C promisor-remote one && # so that ref advertisement is not empty
+	git -C promisor-remote config --local uploadpack.allowanysha1inwant 1 &&
+	git -C client remote set-url origin "file://$(pwd)/promisor-remote"
+}
+
+# NEEDSWORK: The tests beginning with "fetch lazy-fetches" below only
+# test that "fetch" avoid fetching trees and blobs, but not commits or
+# tags. Revisit this if Git is ever taught to support partial clones
+# with commits and/or tags filtered out.
+
+test_expect_success 'fetch lazy-fetches only to resolve deltas' '
+	setup_triangle &&
+
+	# Exercise to make sure it works. Git will not fetch anything from the
+	# promisor remote other than for the big tree (because it needs to
+	# resolve the delta).
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
+		fetch "file://$(pwd)/server" master &&
+
+	# Verify the assumption that the client needed to fetch the delta base
+	# to resolve the delta.
+	git -C server rev-parse HEAD~1^{tree} >hash &&
+	grep "want $(cat hash)" trace
+'
+
+test_expect_success 'fetch lazy-fetches only to resolve deltas, protocol v2' '
+	setup_triangle &&
+
+	git -C server config --local protocol.version 2 &&
+	git -C client config --local protocol.version 2 &&
+	git -C promisor-remote config --local protocol.version 2 &&
+
+	# Exercise to make sure it works. Git will not fetch anything from the
+	# promisor remote other than for the big blob (because it needs to
+	# resolve the delta).
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
+		fetch "file://$(pwd)/server" master &&
+
+	# Verify that protocol version 2 was used.
+	grep "fetch< version 2" trace &&
+
+	# Verify the assumption that the client needed to fetch the delta base
+	# to resolve the delta.
+	git -C server rev-parse HEAD~1^{tree} >hash &&
+	grep "want $(cat hash)" trace
+'
+
+# The following two tests must be in this order, or else
+# the first will not fail. It is important that the srv.bare
+# repository did not have tags during clone, but has tags
+# in the fetch.
+
+test_expect_failure 'verify fetch succeeds when asking for new tags' '
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" tag-test &&
+	for i in I J K
+	do
+		test_commit -C src $i &&
+		git -C src branch $i || return 1
+	done &&
+	git -C srv.bare fetch --tags origin +refs/heads/*:refs/heads/* &&
+	git -C tag-test -c protocol.version=2 fetch --tags origin
+'
+
+test_expect_success 'verify fetch downloads only one pack when updating refs' '
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" pack-test &&
+	ls pack-test/.git/objects/pack/*pack >pack-list &&
+	test_line_count = 2 pack-list &&
+	for i in A B C
+	do
+		test_commit -C src $i &&
+		git -C src branch $i || return 1
+	done &&
+	git -C srv.bare fetch origin +refs/heads/*:refs/heads/* &&
+	git -C pack-test fetch origin &&
+	ls pack-test/.git/objects/pack/*pack >pack-list &&
+	test_line_count = 3 pack-list
+'
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
@@ -255,14 +429,18 @@ intersperse () {
 	sed 's/\(..\)/'$1'\1/g'
 }
 
-# Create a one-time-sed command to replace the existing packfile with $1.
+# Create a one-time-perl command to replace the existing packfile with $1.
 replace_packfile () {
 	# The protocol requires that the packfile be sent in sideband 1, hence
 	# the extra \x01 byte at the beginning.
-	printf "1,/packfile/!c %04x\\\\x01%s0000" \
-		"$(($(wc -c <$1) + 5))" \
-		"$(hex_unpack <$1 | intersperse '\\x')" \
-		>"$HTTPD_ROOT_PATH/one-time-sed"
+	cp $1 "$HTTPD_ROOT_PATH/one-time-pack" &&
+	echo 'if (/packfile/) {
+		print;
+		my $length = -s "one-time-pack";
+		printf "%04x\x01", $length + 5;
+		print `cat one-time-pack` . "0000";
+		last
+	}' >"$HTTPD_ROOT_PATH/one-time-perl"
 }
 
 test_expect_success 'upon cloning, check that all refs point to objects' '
@@ -286,16 +464,16 @@ test_expect_success 'upon cloning, check that all refs point to objects' '
 	# \x01 byte at the beginning.
 	replace_packfile incomplete.pack &&
 
-	# Use protocol v2 because the sed command looks for the "packfile"
+	# Use protocol v2 because the perl command looks for the "packfile"
 	# section header.
 	test_config -C "$SERVER" protocol.version 2 &&
 	test_must_fail git -c protocol.version=2 clone \
-		--filter=blob:none $HTTPD_URL/one_time_sed/server repo 2>err &&
+		--filter=blob:none $HTTPD_URL/one_time_perl/server repo 2>err &&
 
 	test_i18ngrep "did not send all necessary objects" err &&
 
-	# Ensure that the one-time-sed script was used.
-	! test -e "$HTTPD_ROOT_PATH/one-time-sed"
+	# Ensure that the one-time-perl script was used.
+	! test -e "$HTTPD_ROOT_PATH/one-time-perl"
 '
 
 test_expect_success 'when partial cloning, tolerate server not sending target of tag' '
@@ -326,17 +504,17 @@ test_expect_success 'when partial cloning, tolerate server not sending target of
 	# \x01 byte at the beginning.
 	replace_packfile incomplete.pack &&
 
-	# Use protocol v2 because the sed command looks for the "packfile"
+	# Use protocol v2 because the perl command looks for the "packfile"
 	# section header.
 	test_config -C "$SERVER" protocol.version 2 &&
 
 	# Exercise to make sure it works.
 	git -c protocol.version=2 clone \
-		--filter=blob:none $HTTPD_URL/one_time_sed/server repo 2> err &&
+		--filter=blob:none $HTTPD_URL/one_time_perl/server repo 2> err &&
 	! grep "missing object referenced by" err &&
 
-	# Ensure that the one-time-sed script was used.
-	! test -e "$HTTPD_ROOT_PATH/one-time-sed"
+	# Ensure that the one-time-perl script was used.
+	! test -e "$HTTPD_ROOT_PATH/one-time-perl"
 '
 
 test_expect_success 'tolerate server sending REF_DELTA against missing promisor objects' '
@@ -359,7 +537,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor
 
 	# Clone. The client has deltabase_have but not deltabase_missing.
 	git -c protocol.version=2 clone --no-checkout \
-		--filter=blob:none $HTTPD_URL/one_time_sed/server repo &&
+		--filter=blob:none $HTTPD_URL/one_time_perl/server repo &&
 	git -C repo hash-object -w -- "$SERVER/have.txt" &&
 
 	# Sanity check to ensure that the client does not have
@@ -400,7 +578,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor
 
 	replace_packfile thin.pack &&
 
-	# Use protocol v2 because the sed command looks for the "packfile"
+	# Use protocol v2 because the perl command looks for the "packfile"
 	# section header.
 	test_config -C "$SERVER" protocol.version 2 &&
 
@@ -413,8 +591,11 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor
 	grep "want $(cat deltabase_missing)" trace &&
 	! grep "want $(cat deltabase_have)" trace &&
 
-	# Ensure that the one-time-sed script was used.
-	! test -e "$HTTPD_ROOT_PATH/one-time-sed"
+	# Ensure that the one-time-perl script was used.
+	! test -e "$HTTPD_ROOT_PATH/one-time-perl"
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/third_party/git/t/t5617-clone-submodules-remote.sh b/third_party/git/t/t5617-clone-submodules-remote.sh
index 37fcce9c40c9..1a041df10bee 100755
--- a/third_party/git/t/t5617-clone-submodules-remote.sh
+++ b/third_party/git/t/t5617-clone-submodules-remote.sh
@@ -14,7 +14,8 @@ test_expect_success 'setup' '
 		cd sub &&
 		git init &&
 		test_commit subcommit1 &&
-		git tag sub_when_added_to_super
+		git tag sub_when_added_to_super &&
+		git branch other
 	) &&
 	git submodule add "file://$pwd/sub" sub &&
 	git commit -m "add submodule" &&
@@ -51,4 +52,14 @@ test_expect_success 'check the default is --no-remote-submodules' '
 	)
 '
 
+test_expect_success 'clone with --single-branch' '
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
+	(
+		cd super_clone/sub &&
+		git rev-parse --verify origin/master &&
+		test_must_fail git rev-parse --verify origin/other
+	)
+'
+
 test_done
diff --git a/third_party/git/t/t5700-protocol-v1.sh b/third_party/git/t/t5700-protocol-v1.sh
index 7c9511c593c1..022901b9eb6f 100755
--- a/third_party/git/t/t5700-protocol-v1.sh
+++ b/third_party/git/t/t5700-protocol-v1.sh
@@ -5,7 +5,8 @@ test_description='test git wire-protocol transition'
 TEST_NO_CREATE_REPO=1
 
 # This is a protocol-specific test.
-GIT_TEST_PROTOCOL_VERSION=
+GIT_TEST_PROTOCOL_VERSION=0
+export GIT_TEST_PROTOCOL_VERSION
 
 . ./test-lib.sh
 
@@ -292,4 +293,7 @@ test_expect_success 'push with http:// using protocol v1' '
 	grep "git< version 1" log
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/third_party/git/t/t5702-protocol-v2.sh b/third_party/git/t/t5702-protocol-v2.sh
index 011b81d4fc27..5039e66dc47c 100755
--- a/third_party/git/t/t5702-protocol-v2.sh
+++ b/third_party/git/t/t5702-protocol-v2.sh
@@ -32,7 +32,7 @@ test_expect_success 'list refs with git:// using protocol v2' '
 	test_cmp expect actual
 '
 
-test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' '
+test_expect_success 'ref advertisement is filtered with ls-remote using protocol v2' '
 	test_when_finished "rm -f log" &&
 
 	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
@@ -154,7 +154,7 @@ test_expect_success 'list refs with file:// using protocol v2' '
 	test_cmp expect actual
 '
 
-test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' '
+test_expect_success 'ref advertisement is filtered with ls-remote using protocol v2' '
 	test_when_finished "rm -f log" &&
 
 	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
@@ -225,7 +225,7 @@ test_expect_success 'fetch with file:// using protocol v2' '
 	grep "fetch< version 2" log
 '
 
-test_expect_success 'ref advertisment is filtered during fetch using protocol v2' '
+test_expect_success 'ref advertisement is filtered during fetch using protocol v2' '
 	test_when_finished "rm -f log" &&
 
 	test_commit -C file_parent three &&
@@ -631,6 +631,19 @@ test_expect_success 'fetch with http:// using protocol v2' '
 	grep "git< version 2" log
 '
 
+test_expect_success 'fetch with http:// by hash without tag following with protocol v2 does not list refs' '
+	test_when_finished "rm -f log" &&
+
+	test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two_a &&
+	git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" rev-parse two_a >two_a_hash &&
+
+	GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
+		fetch --no-tags origin $(cat two_a_hash) &&
+
+	grep "fetch< version 2" log &&
+	! grep "fetch> command=ls-refs" log
+'
+
 test_expect_success 'fetch from namespaced repo respects namespaces' '
 	test_when_finished "rm -f log" &&
 
@@ -652,6 +665,18 @@ test_expect_success 'fetch from namespaced repo respects namespaces' '
 	test_cmp expect actual
 '
 
+test_expect_success 'ls-remote with v2 http sends only one POST' '
+	test_when_finished "rm -f log" &&
+
+	git ls-remote "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" >expect &&
+	GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \
+		ls-remote "$HTTPD_URL/smart/http_parent" >actual &&
+	test_cmp expect actual &&
+
+	grep "Send header: POST" log >posts &&
+	test_line_count = 1 posts
+'
+
 test_expect_success 'push with http:// and a config of v2 does not request v2' '
 	test_when_finished "rm -f log" &&
 	# Till v2 for push is designed, make sure that if a client has
@@ -669,9 +694,9 @@ test_expect_success 'push with http:// and a config of v2 does not request v2' '
 	git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect &&
 	test_cmp expect actual &&
 
-	# Client didnt request to use protocol v2
+	# Client did not request to use protocol v2
 	! grep "Git-Protocol: version=2" log &&
-	# Server didnt respond using protocol v2
+	# Server did not respond using protocol v2
 	! grep "git< version 2" log
 '
 
@@ -687,11 +712,11 @@ test_expect_success 'when server sends "ready", expect DELIM' '
 
 	# After "ready" in the acknowledgments section, pretend that a FLUSH
 	# (0000) was sent instead of a DELIM (0001).
-	printf "/ready/,$ s/0001/0000/" \
-		>"$HTTPD_ROOT_PATH/one-time-sed" &&
+	printf "\$ready = 1 if /ready/; \$ready && s/0001/0000/" \
+		>"$HTTPD_ROOT_PATH/one-time-perl" &&
 
 	test_must_fail git -C http_child -c protocol.version=2 \
-		fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err &&
+		fetch "$HTTPD_URL/one_time_perl/http_parent" 2> err &&
 	test_i18ngrep "expected packfile to be sent after .ready." err
 '
 
@@ -712,15 +737,18 @@ test_expect_success 'when server does not send "ready", expect FLUSH' '
 
 	# After the acknowledgments section, pretend that a DELIM
 	# (0001) was sent instead of a FLUSH (0000).
-	printf "/acknowledgments/,$ s/0000/0001/" \
-		>"$HTTPD_ROOT_PATH/one-time-sed" &&
+	printf "\$ack = 1 if /acknowledgments/; \$ack && s/0000/0001/" \
+		>"$HTTPD_ROOT_PATH/one-time-perl" &&
 
 	test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" git -C http_child \
 		-c protocol.version=2 \
-		fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err &&
+		fetch "$HTTPD_URL/one_time_perl/http_parent" 2> err &&
 	grep "fetch< .*acknowledgments" log &&
 	! grep "fetch< .*ready" log &&
 	test_i18ngrep "expected no other sections to be sent after no .ready." err
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/third_party/git/t/t5703-upload-pack-ref-in-want.sh b/third_party/git/t/t5703-upload-pack-ref-in-want.sh
index de4b6106ef4a..7fba3063bf91 100755
--- a/third_party/git/t/t5703-upload-pack-ref-in-want.sh
+++ b/third_party/git/t/t5703-upload-pack-ref-in-want.sh
@@ -18,14 +18,16 @@ get_actual_commits () {
 		p
 		}' <out | test-tool pkt-line unpack-sideband >o.pack &&
 	git index-pack o.pack &&
-	git verify-pack -v o.idx | grep commit | cut -c-40 | sort >actual_commits
+	git verify-pack -v o.idx >objs &&
+	grep commit objs | cut -d" " -f1 | sort >actual_commits
 }
 
 check_output () {
 	get_actual_refs &&
 	test_cmp expected_refs actual_refs &&
 	get_actual_commits &&
-	test_cmp expected_commits actual_commits
+	sort expected_commits >sorted_commits &&
+	test_cmp sorted_commits actual_commits
 }
 
 # c(o/foo) d(o/bar)
@@ -35,6 +37,7 @@ check_output () {
 #             \ | /
 #               a
 test_expect_success 'setup repository' '
+	test_oid_init &&
 	test_commit a &&
 	git checkout -b o/foo &&
 	test_commit b &&
@@ -75,17 +78,19 @@ test_expect_success 'invalid want-ref line' '
 '
 
 test_expect_success 'basic want-ref' '
+	oid=$(git rev-parse f) &&
 	cat >expected_refs <<-EOF &&
-	$(git rev-parse f) refs/heads/master
+	$oid refs/heads/master
 	EOF
-	git rev-parse f | sort >expected_commits &&
+	git rev-parse f >expected_commits &&
 
+	oid=$(git rev-parse a) &&
 	test-tool pkt-line pack >in <<-EOF &&
 	command=fetch
 	0001
 	no-progress
 	want-ref refs/heads/master
-	have $(git rev-parse a)
+	have $oid
 	done
 	0000
 	EOF
@@ -95,19 +100,22 @@ test_expect_success 'basic want-ref' '
 '
 
 test_expect_success 'multiple want-ref lines' '
+	oid_c=$(git rev-parse c) &&
+	oid_d=$(git rev-parse d) &&
 	cat >expected_refs <<-EOF &&
-	$(git rev-parse c) refs/heads/o/foo
-	$(git rev-parse d) refs/heads/o/bar
+	$oid_c refs/heads/o/foo
+	$oid_d refs/heads/o/bar
 	EOF
-	git rev-parse c d | sort >expected_commits &&
+	git rev-parse c d >expected_commits &&
 
+	oid=$(git rev-parse b) &&
 	test-tool pkt-line pack >in <<-EOF &&
 	command=fetch
 	0001
 	no-progress
 	want-ref refs/heads/o/foo
 	want-ref refs/heads/o/bar
-	have $(git rev-parse b)
+	have $oid
 	done
 	0000
 	EOF
@@ -117,10 +125,11 @@ test_expect_success 'multiple want-ref lines' '
 '
 
 test_expect_success 'mix want and want-ref' '
+	oid=$(git rev-parse f) &&
 	cat >expected_refs <<-EOF &&
-	$(git rev-parse f) refs/heads/master
+	$oid refs/heads/master
 	EOF
-	git rev-parse e f | sort >expected_commits &&
+	git rev-parse e f >expected_commits &&
 
 	test-tool pkt-line pack >in <<-EOF &&
 	command=fetch
@@ -138,17 +147,19 @@ test_expect_success 'mix want and want-ref' '
 '
 
 test_expect_success 'want-ref with ref we already have commit for' '
+	oid=$(git rev-parse c) &&
 	cat >expected_refs <<-EOF &&
-	$(git rev-parse c) refs/heads/o/foo
+	$oid refs/heads/o/foo
 	EOF
 	>expected_commits &&
 
+	oid=$(git rev-parse c) &&
 	test-tool pkt-line pack >in <<-EOF &&
 	command=fetch
 	0001
 	no-progress
 	want-ref refs/heads/o/foo
-	have $(git rev-parse c)
+	have $oid
 	done
 	0000
 	EOF
@@ -157,106 +168,6 @@ test_expect_success 'want-ref with ref we already have commit for' '
 	check_output
 '
 
-. "$TEST_DIRECTORY"/lib-httpd.sh
-start_httpd
-
-REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo"
-LOCAL_PRISTINE="$(pwd)/local_pristine"
-
-test_expect_success 'setup repos for change-while-negotiating test' '
-	(
-		git init "$REPO" &&
-		cd "$REPO" &&
-		>.git/git-daemon-export-ok &&
-		test_commit m1 &&
-		git tag -d m1 &&
-
-		# Local repo with many commits (so that negotiation will take
-		# more than 1 request/response pair)
-		git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" &&
-		cd "$LOCAL_PRISTINE" &&
-		git checkout -b side &&
-		test_commit_bulk --id=s 33 &&
-
-		# Add novel commits to upstream
-		git checkout master &&
-		cd "$REPO" &&
-		test_commit m2 &&
-		test_commit m3 &&
-		git tag -d m2 m3
-	) &&
-	git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_sed/repo" &&
-	git -C "$LOCAL_PRISTINE" config protocol.version 2
-'
-
-inconsistency () {
-	# Simulate that the server initially reports $2 as the ref
-	# corresponding to $1, and after that, $1 as the ref corresponding to
-	# $1. This corresponds to the real-life situation where the server's
-	# repository appears to change during negotiation, for example, when
-	# different servers in a load-balancing arrangement serve (stateless)
-	# RPCs during a single negotiation.
-	printf "s/%s/%s/" \
-	       $(git -C "$REPO" rev-parse $1 | tr -d "\n") \
-	       $(git -C "$REPO" rev-parse $2 | tr -d "\n") \
-	       >"$HTTPD_ROOT_PATH/one-time-sed"
-}
-
-test_expect_success 'server is initially ahead - no ref in want' '
-	git -C "$REPO" config uploadpack.allowRefInWant false &&
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	inconsistency master 1234567890123456789012345678901234567890 &&
-	test_must_fail git -C local fetch 2>err &&
-	test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
-'
-
-test_expect_success 'server is initially ahead - ref in want' '
-	git -C "$REPO" config uploadpack.allowRefInWant true &&
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	inconsistency master 1234567890123456789012345678901234567890 &&
-	git -C local fetch &&
-
-	git -C "$REPO" rev-parse --verify master >expected &&
-	git -C local rev-parse --verify refs/remotes/origin/master >actual &&
-	test_cmp expected actual
-'
-
-test_expect_success 'server is initially behind - no ref in want' '
-	git -C "$REPO" config uploadpack.allowRefInWant false &&
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	inconsistency master "master^" &&
-	git -C local fetch &&
-
-	git -C "$REPO" rev-parse --verify "master^" >expected &&
-	git -C local rev-parse --verify refs/remotes/origin/master >actual &&
-	test_cmp expected actual
-'
-
-test_expect_success 'server is initially behind - ref in want' '
-	git -C "$REPO" config uploadpack.allowRefInWant true &&
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	inconsistency master "master^" &&
-	git -C local fetch &&
-
-	git -C "$REPO" rev-parse --verify "master" >expected &&
-	git -C local rev-parse --verify refs/remotes/origin/master >actual &&
-	test_cmp expected actual
-'
-
-test_expect_success 'server loses a ref - ref in want' '
-	git -C "$REPO" config uploadpack.allowRefInWant true &&
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
-	test_must_fail git -C local fetch 2>err &&
-
-	test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
-'
-
 REPO="$(pwd)/repo"
 LOCAL_PRISTINE="$(pwd)/local_pristine"
 
@@ -311,13 +222,14 @@ test_expect_success 'fetching with exact OID' '
 
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
+	oid=$(git -C "$REPO" rev-parse d) &&
 	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
-		$(git -C "$REPO" rev-parse d):refs/heads/actual &&
+		"$oid":refs/heads/actual &&
 
 	git -C "$REPO" rev-parse "d" >expected &&
 	git -C local rev-parse refs/heads/actual >actual &&
 	test_cmp expected actual &&
-	grep "want $(git -C "$REPO" rev-parse d)" log
+	grep "want $oid" log
 '
 
 test_expect_success 'fetching multiple refs' '
@@ -339,13 +251,14 @@ test_expect_success 'fetching ref and exact OID' '
 
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
+	oid=$(git -C "$REPO" rev-parse b) &&
 	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
-		master $(git -C "$REPO" rev-parse b):refs/heads/actual &&
+		master "$oid":refs/heads/actual &&
 
 	git -C "$REPO" rev-parse "master" "b" >expected &&
 	git -C local rev-parse refs/remotes/origin/master refs/heads/actual >actual &&
 	test_cmp expected actual &&
-	grep "want $(git -C "$REPO" rev-parse b)" log &&
+	grep "want $oid" log &&
 	grep "want-ref refs/heads/master" log
 '
 
@@ -372,4 +285,107 @@ test_expect_success 'fetching with wildcard that matches multiple refs' '
 	grep "want-ref refs/heads/o/bar" log
 '
 
+. "$TEST_DIRECTORY"/lib-httpd.sh
+start_httpd
+
+REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo"
+LOCAL_PRISTINE="$(pwd)/local_pristine"
+
+test_expect_success 'setup repos for change-while-negotiating test' '
+	(
+		git init "$REPO" &&
+		cd "$REPO" &&
+		>.git/git-daemon-export-ok &&
+		test_commit m1 &&
+		git tag -d m1 &&
+
+		# Local repo with many commits (so that negotiation will take
+		# more than 1 request/response pair)
+		rm -rf "$LOCAL_PRISTINE" &&
+		git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" &&
+		cd "$LOCAL_PRISTINE" &&
+		git checkout -b side &&
+		test_commit_bulk --id=s 33 &&
+
+		# Add novel commits to upstream
+		git checkout master &&
+		cd "$REPO" &&
+		test_commit m2 &&
+		test_commit m3 &&
+		git tag -d m2 m3
+	) &&
+	git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_perl/repo" &&
+	git -C "$LOCAL_PRISTINE" config protocol.version 2
+'
+
+inconsistency () {
+	# Simulate that the server initially reports $2 as the ref
+	# corresponding to $1, and after that, $1 as the ref corresponding to
+	# $1. This corresponds to the real-life situation where the server's
+	# repository appears to change during negotiation, for example, when
+	# different servers in a load-balancing arrangement serve (stateless)
+	# RPCs during a single negotiation.
+	oid1=$(git -C "$REPO" rev-parse $1) &&
+	oid2=$(git -C "$REPO" rev-parse $2) &&
+	echo "s/$oid1/$oid2/" >"$HTTPD_ROOT_PATH/one-time-perl"
+}
+
+test_expect_success 'server is initially ahead - no ref in want' '
+	git -C "$REPO" config uploadpack.allowRefInWant false &&
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	inconsistency master $(test_oid numeric) &&
+	test_must_fail git -C local fetch 2>err &&
+	test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
+'
+
+test_expect_success 'server is initially ahead - ref in want' '
+	git -C "$REPO" config uploadpack.allowRefInWant true &&
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	inconsistency master $(test_oid numeric) &&
+	git -C local fetch &&
+
+	git -C "$REPO" rev-parse --verify master >expected &&
+	git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'server is initially behind - no ref in want' '
+	git -C "$REPO" config uploadpack.allowRefInWant false &&
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	inconsistency master "master^" &&
+	git -C local fetch &&
+
+	git -C "$REPO" rev-parse --verify "master^" >expected &&
+	git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'server is initially behind - ref in want' '
+	git -C "$REPO" config uploadpack.allowRefInWant true &&
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	inconsistency master "master^" &&
+	git -C local fetch &&
+
+	git -C "$REPO" rev-parse --verify "master" >expected &&
+	git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'server loses a ref - ref in want' '
+	git -C "$REPO" config uploadpack.allowRefInWant true &&
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
+	test_must_fail git -C local fetch 2>err &&
+
+	test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
+'
+
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/third_party/git/t/t5801-remote-helpers.sh b/third_party/git/t/t5801-remote-helpers.sh
index 2d6c4a281edb..121e5c6edb0a 100755
--- a/third_party/git/t/t5801-remote-helpers.sh
+++ b/third_party/git/t/t5801-remote-helpers.sh
@@ -247,7 +247,6 @@ clean_mark () {
 test_expect_success 'proper failure checks for fetching' '
 	(cd local &&
 	test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error &&
-	cat error &&
 	test_i18ngrep -q "error while running fast-import" error
 	)
 '
diff --git a/third_party/git/t/t6000-rev-list-misc.sh b/third_party/git/t/t6000-rev-list-misc.sh
index 52a9e38d66f3..3dc1ad8f7199 100755
--- a/third_party/git/t/t6000-rev-list-misc.sh
+++ b/third_party/git/t/t6000-rev-list-misc.sh
@@ -104,13 +104,16 @@ test_expect_success 'rev-list can show index objects' '
 	#   - we do not show the root tree; since we updated the index, it
 	#     does not have a valid cache tree
 	#
-	cat >expect <<-\EOF &&
-	8e4020bb5a8d8c873b25de15933e75cc0fc275df one
-	d9d3a7417b9605cfd88ee6306b28dadc29e6ab08 only-in-index
-	9200b628cf9dc883a85a7abc8d6e6730baee589c two
-	EOF
 	echo only-in-index >only-in-index &&
 	test_when_finished "git reset --hard" &&
+	rev1=$(git rev-parse HEAD:one) &&
+	rev2=$(git rev-parse HEAD:two) &&
+	revi=$(git hash-object only-in-index) &&
+	cat >expect <<-EOF &&
+	$rev1 one
+	$revi only-in-index
+	$rev2 two
+	EOF
 	git add only-in-index &&
 	git rev-list --objects --indexed-objects >actual &&
 	test_cmp expect actual
@@ -140,4 +143,24 @@ test_expect_success '--header shows a NUL after each commit' '
 	test_cmp expect actual
 '
 
+test_expect_success 'rev-list --end-of-options' '
+	git update-ref refs/heads/--output=yikes HEAD &&
+	git rev-list --end-of-options --output=yikes >actual &&
+	test_path_is_missing yikes &&
+	git rev-list HEAD >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rev-list --count' '
+	count=$(git rev-list --count HEAD) &&
+	git rev-list HEAD >actual &&
+	test_line_count = $count actual
+'
+
+test_expect_success 'rev-list --count --objects' '
+	count=$(git rev-list --count --objects HEAD) &&
+	git rev-list --objects HEAD >actual &&
+	test_line_count = $count actual
+'
+
 test_done
diff --git a/third_party/git/t/t6006-rev-list-format.sh b/third_party/git/t/t6006-rev-list-format.sh
index da113d975b16..7e82e43a634a 100755
--- a/third_party/git/t/t6006-rev-list-format.sh
+++ b/third_party/git/t/t6006-rev-list-format.sh
@@ -32,6 +32,7 @@ changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t $test_encoding)
 truncate_count=20
 
 test_expect_success 'setup' '
+	test_oid_init &&
 	: >foo &&
 	git add foo &&
 	git config i18n.commitEncoding $test_encoding &&
@@ -109,31 +110,35 @@ commit $head1
 EOF
 
 # we don't test relative here
-test_format author %an%n%ae%n%ad%n%aD%n%at <<EOF
+test_format author %an%n%ae%n%al%n%ad%n%aD%n%at <<EOF
 commit $head2
-A U Thor
-author@example.com
+$GIT_AUTHOR_NAME
+$GIT_AUTHOR_EMAIL
+$TEST_AUTHOR_LOCALNAME
 Thu Apr 7 15:13:13 2005 -0700
 Thu, 7 Apr 2005 15:13:13 -0700
 1112911993
 commit $head1
-A U Thor
-author@example.com
+$GIT_AUTHOR_NAME
+$GIT_AUTHOR_EMAIL
+$TEST_AUTHOR_LOCALNAME
 Thu Apr 7 15:13:13 2005 -0700
 Thu, 7 Apr 2005 15:13:13 -0700
 1112911993
 EOF
 
-test_format committer %cn%n%ce%n%cd%n%cD%n%ct <<EOF
+test_format committer %cn%n%ce%n%cl%n%cd%n%cD%n%ct <<EOF
 commit $head2
-C O Mitter
-committer@example.com
+$GIT_COMMITTER_NAME
+$GIT_COMMITTER_EMAIL
+$TEST_COMMITTER_LOCALNAME
 Thu Apr 7 15:13:13 2005 -0700
 Thu, 7 Apr 2005 15:13:13 -0700
 1112911993
 commit $head1
-C O Mitter
-committer@example.com
+$GIT_COMMITTER_NAME
+$GIT_COMMITTER_EMAIL
+$TEST_COMMITTER_LOCALNAME
 Thu Apr 7 15:13:13 2005 -0700
 Thu, 7 Apr 2005 15:13:13 -0700
 1112911993
@@ -410,7 +415,7 @@ test_expect_success 'empty email' '
 	test_tick &&
 	C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
 	A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
-	verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700"
+	verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
 '
 
 test_expect_success 'del LF before empty (1)' '
@@ -459,9 +464,10 @@ test_expect_success '--abbrev' '
 '
 
 test_expect_success '%H is not affected by --abbrev-commit' '
+	expected=$(($(test_oid hexsz) + 1)) &&
 	git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
 	len=$(wc -c <actual) &&
-	test $len = 41
+	test $len = $expected
 '
 
 test_expect_success '%h is not affected by --abbrev-commit' '
@@ -495,15 +501,14 @@ test_expect_success '%gd shortens ref name' '
 '
 
 test_expect_success 'reflog identity' '
-	echo "C O Mitter:committer@example.com" >expect &&
+	echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect &&
 	git log -g -1 --format="%gn:%ge" >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'oneline with empty message' '
-	git commit -m "dummy" --allow-empty &&
-	git commit -m "dummy" --allow-empty &&
-	git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. &&
+	git commit --allow-empty --cleanup=verbatim -m "$LF" &&
+	git commit --allow-empty --allow-empty-message &&
 	git rev-list --oneline HEAD >test.txt &&
 	test_line_count = 5 test.txt &&
 	git rev-list --oneline --graph HEAD >testg.txt &&
diff --git a/third_party/git/t/t6011-rev-list-with-bad-commit.sh b/third_party/git/t/t6011-rev-list-with-bad-commit.sh
index 545b461e51d4..bad02cf5b83d 100755
--- a/third_party/git/t/t6011-rev-list-with-bad-commit.sh
+++ b/third_party/git/t/t6011-rev-list-with-bad-commit.sh
@@ -42,7 +42,7 @@ test_expect_success 'corrupt second commit object' \
    '
 
 test_expect_success 'rev-list should fail' '
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --all > /dev/null
+	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --all > /dev/null
 '
 
 test_expect_success 'git repack _MUST_ fail' \
diff --git a/third_party/git/t/t6016-rev-list-graph-simplify-history.sh b/third_party/git/t/t6016-rev-list-graph-simplify-history.sh
index f7181d1d6a14..f5e6e92f5b30 100755
--- a/third_party/git/t/t6016-rev-list-graph-simplify-history.sh
+++ b/third_party/git/t/t6016-rev-list-graph-simplify-history.sh
@@ -67,11 +67,10 @@ test_expect_success '--graph --all' '
 	echo "| * $C4" >> expected &&
 	echo "| * $C3" >> expected &&
 	echo "* | $A5" >> expected &&
-	echo "| |     " >> expected &&
-	echo "|  \\    " >> expected &&
-	echo "*-. \\   $A4" >> expected &&
-	echo "|\\ \\ \\  " >> expected &&
-	echo "| | |/  " >> expected &&
+	echo "| |   " >> expected &&
+	echo "|  \\  " >> expected &&
+	echo "*-. | $A4" >> expected &&
+	echo "|\\ \\| " >> expected &&
 	echo "| | * $C2" >> expected &&
 	echo "| | * $C1" >> expected &&
 	echo "| * | $B2" >> expected &&
@@ -97,11 +96,10 @@ test_expect_success '--graph --simplify-by-decoration' '
 	echo "| * $C4" >> expected &&
 	echo "| * $C3" >> expected &&
 	echo "* | $A5" >> expected &&
-	echo "| |     " >> expected &&
-	echo "|  \\    " >> expected &&
-	echo "*-. \\   $A4" >> expected &&
-	echo "|\\ \\ \\  " >> expected &&
-	echo "| | |/  " >> expected &&
+	echo "| |   " >> expected &&
+	echo "|  \\  " >> expected &&
+	echo "*-. | $A4" >> expected &&
+	echo "|\\ \\| " >> expected &&
 	echo "| | * $C2" >> expected &&
 	echo "| | * $C1" >> expected &&
 	echo "| * | $B2" >> expected &&
@@ -131,9 +129,8 @@ test_expect_success '--graph --simplify-by-decoration prune branch B' '
 	echo "| * $C4" >> expected &&
 	echo "| * $C3" >> expected &&
 	echo "* | $A5" >> expected &&
-	echo "* |   $A4" >> expected &&
-	echo "|\\ \\  " >> expected &&
-	echo "| |/  " >> expected &&
+	echo "* | $A4" >> expected &&
+	echo "|\\| " >> expected &&
 	echo "| * $C2" >> expected &&
 	echo "| * $C1" >> expected &&
 	echo "* | $A3" >> expected &&
@@ -151,9 +148,8 @@ test_expect_success '--graph --full-history -- bar.txt' '
 	echo "|\\  " >> expected &&
 	echo "| * $C4" >> expected &&
 	echo "* | $A5" >> expected &&
-	echo "* |   $A4" >> expected &&
-	echo "|\\ \\  " >> expected &&
-	echo "| |/  " >> expected &&
+	echo "* | $A4" >> expected &&
+	echo "|\\| " >> expected &&
 	echo "* | $A3" >> expected &&
 	echo "|/  " >> expected &&
 	echo "* $A2" >> expected &&
@@ -255,7 +251,7 @@ test_expect_success '--graph --boundary ^C3' '
 	echo "* | | | $A3" >> expected &&
 	echo "o | | | $A2" >> expected &&
 	echo "|/ / /  " >> expected &&
-	echo "o | | $A1" >> expected &&
+	echo "o / / $A1" >> expected &&
 	echo " / /  " >> expected &&
 	echo "| o $C3" >> expected &&
 	echo "|/  " >> expected &&
diff --git a/third_party/git/t/t6019-rev-list-ancestry-path.sh b/third_party/git/t/t6019-rev-list-ancestry-path.sh
index beadaf6cca05..353f84313f33 100755
--- a/third_party/git/t/t6019-rev-list-ancestry-path.sh
+++ b/third_party/git/t/t6019-rev-list-ancestry-path.sh
@@ -143,14 +143,14 @@ test_expect_success 'setup criss-cross' '
 test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' '
 	(cd criss-cross &&
 	 git rev-list --ancestry-path xcb..xbc > actual &&
-	 test -z "$(cat actual)")
+	 test_must_be_empty actual)
 '
 
 # no commits in repository descend from cb
 test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' '
 	(cd criss-cross &&
 	 git rev-list --ancestry-path --all ^xcb > actual &&
-	 test -z "$(cat actual)")
+	 test_must_be_empty actual)
 '
 
 test_done
diff --git a/third_party/git/t/t6020-merge-df.sh b/third_party/git/t/t6020-merge-df.sh
index 46b506b3b7b6..400a4cd13928 100755
--- a/third_party/git/t/t6020-merge-df.sh
+++ b/third_party/git/t/t6020-merge-df.sh
@@ -83,9 +83,9 @@ test_expect_success 'modify/delete + directory/file conflict' '
 	test 4 -eq $(git ls-files -u | wc -l) &&
 	test 1 -eq $(git ls-files -o | wc -l) &&
 
-	test -f letters/file &&
-	test -f letters.txt &&
-	test -f letters~modify
+	test_path_is_file letters/file &&
+	test_path_is_file letters.txt &&
+	test_path_is_file letters~modify
 '
 
 test_expect_success 'modify/delete + directory/file conflict; other way' '
@@ -99,9 +99,52 @@ test_expect_success 'modify/delete + directory/file conflict; other way' '
 	test 4 -eq $(git ls-files -u | wc -l) &&
 	test 1 -eq $(git ls-files -o | wc -l) &&
 
-	test -f letters/file &&
-	test -f letters.txt &&
-	test -f letters~HEAD
+	test_path_is_file letters/file &&
+	test_path_is_file letters.txt &&
+	test_path_is_file letters~HEAD
+'
+
+test_expect_success 'Simple merge in repo with interesting pathnames' '
+	# Simple lexicographic ordering of files and directories would be:
+	#     foo
+	#     foo/bar
+	#     foo/bar-2
+	#     foo/bar/baz
+	#     foo/bar-2/baz
+	# The fact that foo/bar-2 appears between foo/bar and foo/bar/baz
+	# can trip up some codepaths, and is the point of this test.
+	test_create_repo name-ordering &&
+	(
+		cd name-ordering &&
+
+		mkdir -p foo/bar &&
+		mkdir -p foo/bar-2 &&
+		>foo/bar/baz &&
+		>foo/bar-2/baz &&
+		git add . &&
+		git commit -m initial &&
+
+		git branch main &&
+		git branch other &&
+
+		git checkout other &&
+		echo other >foo/bar-2/baz &&
+		git add -u &&
+		git commit -m other &&
+
+		git checkout main &&
+		echo main >foo/bar/baz &&
+		git add -u &&
+		git commit -m main &&
+
+		git merge other &&
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git rev-parse :0:foo/bar/baz :0:foo/bar-2/baz >actual &&
+		git rev-parse HEAD~1:foo/bar/baz other:foo/bar-2/baz >expect &&
+		test_cmp expect actual
+	)
+
 '
 
 test_done
diff --git a/third_party/git/t/t6021-merge-criss-cross.sh b/third_party/git/t/t6021-merge-criss-cross.sh
index 213deecab1e8..9d5e992878fa 100755
--- a/third_party/git/t/t6021-merge-criss-cross.sh
+++ b/third_party/git/t/t6021-merge-criss-cross.sh
@@ -3,94 +3,65 @@
 # Copyright (c) 2005 Fredrik Kuivinen
 #
 
-# See http://marc.info/?l=git&m=111463358500362&w=2 for a
+# See https://lore.kernel.org/git/Pine.LNX.4.44.0504271254120.4678-100000@wax.eds.org/ for a
 # nice description of what this is about.
 
 
 test_description='Test criss-cross merge'
 . ./test-lib.sh
 
-test_expect_success 'prepare repository' \
-'echo "1
-2
-3
-4
-5
-6
-7
-8
-9" > file &&
-git add file &&
-git commit -m "Initial commit" file &&
-git branch A &&
-git branch B &&
-git checkout A &&
-echo "1
-2
-3
-4
-5
-6
-7
-8 changed in B8, branch A
-9" > file &&
-git commit -m "B8" file &&
-git checkout B &&
-echo "1
-2
-3 changed in C3, branch B
-4
-5
-6
-7
-8
-9
-" > file &&
-git commit -m "C3" file &&
-git branch C3 &&
-git merge -m "pre E3 merge" A &&
-echo "1
-2
-3 changed in E3, branch B. New file size
-4
-5
-6
-7
-8 changed in B8, branch A
-9
-" > file &&
-git commit -m "E3" file &&
-git checkout A &&
-git merge -m "pre D8 merge" C3 &&
-echo "1
-2
-3 changed in C3, branch B
-4
-5
-6
-7
-8 changed in D8, branch A. New file size 2
-9" > file &&
-git commit -m D8 file'
-
-test_expect_success 'Criss-cross merge' 'git merge -m "final merge" B'
-
-cat > file-expect <<EOF
-1
-2
-3 changed in E3, branch B. New file size
-4
-5
-6
-7
-8 changed in D8, branch A. New file size 2
-9
-EOF
-
-test_expect_success 'Criss-cross merge result' 'cmp file file-expect'
-
-test_expect_success 'Criss-cross merge fails (-s resolve)' \
-'git reset --hard A^ &&
-test_must_fail git merge -s resolve -m "final merge" B'
+test_expect_success 'prepare repository' '
+	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
+	git add file &&
+	git commit -m "Initial commit" file &&
+
+	git branch A &&
+	git branch B &&
+	git checkout A &&
+
+	test_write_lines 1 2 3 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
+	git commit -m "B8" file &&
+	git checkout B &&
+
+	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 8 9 >file &&
+	git commit -m "C3" file &&
+	git branch C3 &&
+
+	git merge -m "pre E3 merge" A &&
+
+	test_write_lines 1 2 "3 changed in E3, branch B. New file size" 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
+	git commit -m "E3" file &&
+
+	git checkout A &&
+	git merge -m "pre D8 merge" C3 &&
+	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 "8 changed in D8, branch A. New file size 2" 9 >file &&
+
+	git commit -m D8 file
+'
+
+test_expect_success 'Criss-cross merge' '
+	git merge -m "final merge" B
+'
+
+test_expect_success 'Criss-cross merge result' '
+	cat <<-\EOF >file-expect &&
+	1
+	2
+	3 changed in E3, branch B. New file size
+	4
+	5
+	6
+	7
+	8 changed in D8, branch A. New file size 2
+	9
+	EOF
+
+	test_cmp file-expect file
+'
+
+test_expect_success 'Criss-cross merge fails (-s resolve)' '
+	git reset --hard A^ &&
+	test_must_fail git merge -s resolve -m "final merge" B
+'
 
 test_done
diff --git a/third_party/git/t/t6022-merge-rename.sh b/third_party/git/t/t6022-merge-rename.sh
index 53cc9b2ffbdb..bbbba3dcbf0d 100755
--- a/third_party/git/t/t6022-merge-rename.sh
+++ b/third_party/git/t/t6022-merge-rename.sh
@@ -8,94 +8,94 @@ modify () {
 	mv "$2.x" "$2"
 }
 
-test_expect_success setup \
-'
-cat >A <<\EOF &&
-a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-c cccccccccccccccccccccccccccccccccccccccccccccccc
-d dddddddddddddddddddddddddddddddddddddddddddddddd
-e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-f ffffffffffffffffffffffffffffffffffffffffffffffff
-g gggggggggggggggggggggggggggggggggggggggggggggggg
-h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-l llllllllllllllllllllllllllllllllllllllllllllllll
-m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-o oooooooooooooooooooooooooooooooooooooooooooooooo
-EOF
-
-cat >M <<\EOF &&
-A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
-H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
-I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
-L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
-O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-EOF
-
-git add A M &&
-git commit -m "initial has A and M" &&
-git branch white &&
-git branch red &&
-git branch blue &&
-git branch yellow &&
-git branch change &&
-git branch change+rename &&
-
-sed -e "/^g /s/.*/g : master changes a line/" <A >A+ &&
-mv A+ A &&
-git commit -a -m "master updates A" &&
-
-git checkout yellow &&
-rm -f M &&
-git commit -a -m "yellow removes M" &&
-
-git checkout white &&
-sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A B M N &&
-git commit -m "white renames A->B, M->N" &&
-
-git checkout red &&
-sed -e "/^g /s/.*/g : red changes a line/" <A >B &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A B M N &&
-git commit -m "red renames A->B, M->N" &&
-
-git checkout blue &&
-sed -e "/^g /s/.*/g : blue changes a line/" <A >C &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A C M N &&
-git commit -m "blue renames A->C, M->N" &&
-
-git checkout change &&
-sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
-mv A+ A &&
-git commit -q -a -m "changed" &&
-
-git checkout change+rename &&
-sed -e "/^g /s/.*/g : changed line/" <A >B &&
-rm A &&
-git update-index --add B &&
-git commit -q -a -m "changed and renamed" &&
-
-git checkout master'
+test_expect_success 'setup' '
+	cat >A <<-\EOF &&
+	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	c cccccccccccccccccccccccccccccccccccccccccccccccc
+	d dddddddddddddddddddddddddddddddddddddddddddddddd
+	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+	f ffffffffffffffffffffffffffffffffffffffffffffffff
+	g gggggggggggggggggggggggggggggggggggggggggggggggg
+	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+	l llllllllllllllllllllllllllllllllllllllllllllllll
+	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+	o oooooooooooooooooooooooooooooooooooooooooooooooo
+	EOF
+
+	cat >M <<-\EOF &&
+	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
+	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
+	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
+	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+	EOF
+
+	git add A M &&
+	git commit -m "initial has A and M" &&
+	git branch white &&
+	git branch red &&
+	git branch blue &&
+	git branch yellow &&
+	git branch change &&
+	git branch change+rename &&
+
+	sed -e "/^g /s/.*/g : master changes a line/" <A >A+ &&
+	mv A+ A &&
+	git commit -a -m "master updates A" &&
+
+	git checkout yellow &&
+	rm -f M &&
+	git commit -a -m "yellow removes M" &&
+
+	git checkout white &&
+	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "white renames A->B, M->N" &&
+
+	git checkout red &&
+	sed -e "/^g /s/.*/g : red changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "red renames A->B, M->N" &&
+
+	git checkout blue &&
+	sed -e "/^g /s/.*/g : blue changes a line/" <A >C &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A C M N &&
+	git commit -m "blue renames A->C, M->N" &&
+
+	git checkout change &&
+	sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
+	mv A+ A &&
+	git commit -q -a -m "changed" &&
+
+	git checkout change+rename &&
+	sed -e "/^g /s/.*/g : changed line/" <A >B &&
+	rm A &&
+	git update-index --add B &&
+	git commit -q -a -m "changed and renamed" &&
+
+	git checkout master
+'
 
 test_expect_success 'pull renaming branch into unrenaming one' \
 '
@@ -242,12 +242,24 @@ test_expect_success 'merge of identical changes in a renamed file' '
 	rm -f A M N &&
 	git reset --hard &&
 	git checkout change+rename &&
+
+	test-tool chmtime --get -3600 B >old-mtime &&
 	GIT_MERGE_VERBOSITY=3 git merge change >out &&
-	test_i18ngrep "^Skipped B" out &&
+
+	test-tool chmtime --get B >new-mtime &&
+	test_cmp old-mtime new-mtime &&
+
 	git reset --hard HEAD^ &&
 	git checkout change &&
+
+	# A will be renamed to B; we check mtimes and file presence
+	test_path_is_missing B &&
+	test-tool chmtime --get -3600 A >old-mtime &&
 	GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
-	test_i18ngrep ! "^Skipped B" out
+
+	test_path_is_missing A &&
+	test-tool chmtime --get B >new-mtime &&
+	test $(cat old-mtime) -lt $(cat new-mtime)
 '
 
 test_expect_success 'setup for rename + d/f conflicts' '
@@ -288,14 +300,15 @@ test_expect_success 'setup for rename + d/f conflicts' '
 	git commit -m "Conflicting change"
 '
 
-printf "1\n2\n3\n4\n5555\n6\n7\n8\n9\n10\n11\n" >expected
-
 test_expect_success 'Rename+D/F conflict; renamed file merges + dir not in way' '
 	git reset --hard &&
 	git checkout -q renamed-file-has-no-conflicts^0 &&
+
 	git merge --strategy=recursive dir-not-in-way &&
+
 	git diff --quiet &&
-	test -f dir &&
+	test_path_is_file dir &&
+	test_write_lines 1 2 3 4 5555 6 7 8 9 10 11 >expected &&
 	test_cmp expected dir
 '
 
@@ -315,8 +328,8 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' '
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir/file-in-the-way &&
-	test -f dir~HEAD &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~HEAD &&
 	test_cmp expected dir~HEAD
 '
 
@@ -337,29 +350,11 @@ test_expect_success 'Same as previous, but merged other way' '
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir/file-in-the-way &&
-	test -f dir~renamed-file-has-no-conflicts &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~renamed-file-has-no-conflicts &&
 	test_cmp expected dir~renamed-file-has-no-conflicts
 '
 
-cat >expected <<\EOF &&
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-<<<<<<< HEAD:dir
-12
-=======
-11
->>>>>>> dir-not-in-way:sub/file
-EOF
-
 test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in way' '
 	git reset --hard &&
 	rm -rf dir~* &&
@@ -372,7 +367,24 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir &&
+	test_path_is_file dir &&
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	9
+	10
+	<<<<<<< HEAD:dir
+	12
+	=======
+	11
+	>>>>>>> dir-not-in-way:sub/file
+	EOF
 	test_cmp expected dir
 '
 
@@ -391,29 +403,11 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge and dir in t
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir/file-in-the-way &&
-	test -f dir~HEAD &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~HEAD &&
 	test_cmp expected dir~HEAD
 '
 
-cat >expected <<\EOF &&
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-<<<<<<< HEAD:sub/file
-11
-=======
-12
->>>>>>> renamed-file-has-conflicts:dir
-EOF
-
 test_expect_success 'Same as previous, but merged other way' '
 	git reset --hard &&
 	rm -rf dir~* &&
@@ -427,8 +421,25 @@ test_expect_success 'Same as previous, but merged other way' '
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir/file-in-the-way &&
-	test -f dir~renamed-file-has-conflicts &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~renamed-file-has-conflicts &&
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	9
+	10
+	<<<<<<< HEAD:sub/file
+	11
+	=======
+	12
+	>>>>>>> renamed-file-has-conflicts:dir
+	EOF
 	test_cmp expected dir~renamed-file-has-conflicts
 '
 
@@ -464,9 +475,9 @@ test_expect_success 'both rename source and destination involved in D/F conflict
 
 	test_must_fail git diff --quiet &&
 
-	test -f destdir/foo &&
-	test -f one &&
-	test -f destdir~HEAD &&
+	test_path_is_file destdir/foo &&
+	test_path_is_file one &&
+	test_path_is_file destdir~HEAD &&
 	test "stuff" = "$(cat destdir~HEAD)"
 '
 
@@ -507,9 +518,9 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked
 
 	test 4 -eq $(find . | grep -v .git | wc -l) &&
 
-	test -d one &&
-	test -f one~rename-two &&
-	test -f two &&
+	test_path_is_dir one &&
+	test_path_is_file one~rename-two &&
+	test_path_is_file two &&
 	test "other" = $(cat one~rename-two) &&
 	test "stuff" = $(cat two)
 '
@@ -527,8 +538,8 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean sta
 
 	test 3 -eq $(find . | grep -v .git | wc -l) &&
 
-	test -f one &&
-	test -f two &&
+	test_path_is_file one &&
+	test_path_is_file two &&
 	test "other" = $(cat one) &&
 	test "stuff" = $(cat two)
 '
@@ -568,11 +579,11 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
 	test 1 -eq "$(git ls-files -u original | wc -l)" &&
 	test 2 -eq "$(git ls-files -o | wc -l)" &&
 
-	test -f one/file &&
-	test -f two/file &&
-	test -f one~HEAD &&
-	test -f two~second-rename &&
-	! test -f original
+	test_path_is_file one/file &&
+	test_path_is_file two/file &&
+	test_path_is_file one~HEAD &&
+	test_path_is_file two~second-rename &&
+	test_path_is_missing original
 '
 
 test_expect_success 'setup rename one file to two; directories moving out of the way' '
@@ -607,9 +618,9 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
 	test 1 -eq "$(git ls-files -u original | wc -l)" &&
 	test 0 -eq "$(git ls-files -o | wc -l)" &&
 
-	test -f one &&
-	test -f two &&
-	! test -f original
+	test_path_is_file one &&
+	test_path_is_file two &&
+	test_path_is_missing original
 '
 
 test_expect_success 'setup avoid unnecessary update, normal rename' '
@@ -635,7 +646,7 @@ test_expect_success 'setup avoid unnecessary update, normal rename' '
 
 test_expect_success 'avoid unnecessary update, normal rename' '
 	git checkout -q avoid-unnecessary-update-1^0 &&
-	test-tool chmtime --get =1000000000 rename >expect &&
+	test-tool chmtime --get -3600 rename >expect &&
 	git merge merge-branch-1 &&
 	test-tool chmtime --get rename >actual &&
 	test_cmp expect actual # "rename" should have stayed intact
@@ -667,7 +678,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic
 
 test_expect_success 'avoid unnecessary update, with D/F conflict' '
 	git checkout -q avoid-unnecessary-update-2^0 &&
-	test-tool chmtime --get =1000000000 df >expect &&
+	test-tool chmtime --get -3600 df >expect &&
 	git merge merge-branch-2 &&
 	test-tool chmtime --get df >actual &&
 	test_cmp expect actual # "df" should have stayed intact
@@ -698,7 +709,7 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' '
 
 test_expect_success 'avoid unnecessary update, dir->(file,nothing)' '
 	git checkout -q master^0 &&
-	test-tool chmtime --get =1000000000 df >expect &&
+	test-tool chmtime --get -3600 df >expect &&
 	git merge side &&
 	test-tool chmtime --get df >actual &&
 	test_cmp expect actual # "df" should have stayed intact
@@ -727,7 +738,7 @@ test_expect_success 'setup avoid unnecessary update, modify/delete' '
 
 test_expect_success 'avoid unnecessary update, modify/delete' '
 	git checkout -q master^0 &&
-	test-tool chmtime --get =1000000000 file >expect &&
+	test-tool chmtime --get -3600 file >expect &&
 	test_must_fail git merge side &&
 	test-tool chmtime --get file >actual &&
 	test_cmp expect actual # "file" should have stayed intact
@@ -755,7 +766,7 @@ test_expect_success 'setup avoid unnecessary update, rename/add-dest' '
 
 test_expect_success 'avoid unnecessary update, rename/add-dest' '
 	git checkout -q master^0 &&
-	test-tool chmtime --get =1000000000 newfile >expect &&
+	test-tool chmtime --get -3600 newfile >expect &&
 	git merge side &&
 	test-tool chmtime --get newfile >actual &&
 	test_cmp expect actual # "file" should have stayed intact
@@ -810,48 +821,48 @@ test_expect_success 'setup for use of extended merge markers' '
 	git commit -mC
 '
 
-cat >expected <<\EOF &&
-1
-2
-3
-4
-5
-6
-7
-8
-<<<<<<< HEAD:renamed_file
-9
-=======
-8.5
->>>>>>> master^0:original_file
-EOF
-
 test_expect_success 'merge master into rename has correct extended markers' '
 	git checkout rename^0 &&
 	test_must_fail git merge -s recursive master^0 &&
+
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	<<<<<<< HEAD:renamed_file
+	9
+	=======
+	8.5
+	>>>>>>> master^0:original_file
+	EOF
 	test_cmp expected renamed_file
 '
 
-cat >expected <<\EOF &&
-1
-2
-3
-4
-5
-6
-7
-8
-<<<<<<< HEAD:original_file
-8.5
-=======
-9
->>>>>>> rename^0:renamed_file
-EOF
-
 test_expect_success 'merge rename into master has correct extended markers' '
 	git reset --hard &&
 	git checkout master^0 &&
 	test_must_fail git merge -s recursive rename^0 &&
+
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	<<<<<<< HEAD:original_file
+	8.5
+	=======
+	9
+	>>>>>>> rename^0:renamed_file
+	EOF
 	test_cmp expected renamed_file
 '
 
diff --git a/third_party/git/t/t6023-merge-file.sh b/third_party/git/t/t6023-merge-file.sh
index 51ee887a7763..2f421d967abe 100755
--- a/third_party/git/t/t6023-merge-file.sh
+++ b/third_party/git/t/t6023-merge-file.sh
@@ -3,56 +3,59 @@
 test_description='RCS merge replacement: merge-file'
 . ./test-lib.sh
 
-cat > orig.txt << EOF
-Dominus regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-EOF
-
-cat > new1.txt << EOF
-Dominus regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-
-cat > new2.txt << EOF
-Dominus regit me, et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-EOF
-
-cat > new3.txt << EOF
-DOMINUS regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-EOF
-
-cat > new4.txt << EOF
-Dominus regit me, et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-EOF
-printf "propter nomen suum." >> new4.txt
+test_expect_success 'setup' '
+	cat >orig.txt <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	EOF
+
+	cat >new1.txt <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	cat >new2.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	EOF
+
+	cat >new3.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	EOF
+
+	cat >new4.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	EOF
+
+	printf "propter nomen suum." >>new4.txt
+'
 
 test_expect_success 'merge with no changes' '
 	cp orig.txt test.txt &&
@@ -60,9 +63,10 @@ test_expect_success 'merge with no changes' '
 	test_cmp test.txt orig.txt
 '
 
-cp new1.txt test.txt
-test_expect_success "merge without conflict" \
-	"git merge-file test.txt orig.txt new2.txt"
+test_expect_success "merge without conflict" '
+	cp new1.txt test.txt &&
+	git merge-file test.txt orig.txt new2.txt
+'
 
 test_expect_success 'works in subdirectory' '
 	mkdir dir &&
@@ -73,151 +77,176 @@ test_expect_success 'works in subdirectory' '
 	test_path_is_missing a.txt
 '
 
-cp new1.txt test.txt
-test_expect_success "merge without conflict (--quiet)" \
-	"git merge-file --quiet test.txt orig.txt new2.txt"
-
-cp new1.txt test2.txt
-test_expect_failure "merge without conflict (missing LF at EOF)" \
-	"git merge-file test2.txt orig.txt new4.txt"
-
-test_expect_failure "merge result added missing LF" \
-	"test_cmp test.txt test2.txt"
-
-cp new4.txt test3.txt
-test_expect_success "merge without conflict (missing LF at EOF, away from change in the other file)" \
-	"git merge-file --quiet test3.txt new2.txt new3.txt"
-
-cat > expect.txt << EOF
-DOMINUS regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-EOF
-printf "propter nomen suum." >> expect.txt
-
-test_expect_success "merge does not add LF away of change" \
-	"test_cmp expect.txt test3.txt"
-
-cp test.txt backup.txt
-test_expect_success "merge with conflicts" \
-	"test_must_fail git merge-file test.txt orig.txt new3.txt"
-
-cat > expect.txt << EOF
-<<<<<<< test.txt
-Dominus regit me, et nihil mihi deerit.
-=======
-DOMINUS regit me,
-et nihil mihi deerit.
->>>>>>> new3.txt
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-
-test_expect_success "expected conflict markers" "test_cmp expect.txt test.txt"
-
-cp backup.txt test.txt
-
-cat > expect.txt << EOF
-Dominus regit me, et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-test_expect_success "merge conflicting with --ours" \
-	"git merge-file --ours test.txt orig.txt new3.txt && test_cmp expect.txt test.txt"
-cp backup.txt test.txt
-
-cat > expect.txt << EOF
-DOMINUS regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-test_expect_success "merge conflicting with --theirs" \
-	"git merge-file --theirs test.txt orig.txt new3.txt && test_cmp expect.txt test.txt"
-cp backup.txt test.txt
-
-cat > expect.txt << EOF
-Dominus regit me, et nihil mihi deerit.
-DOMINUS regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-test_expect_success "merge conflicting with --union" \
-	"git merge-file --union test.txt orig.txt new3.txt && test_cmp expect.txt test.txt"
-cp backup.txt test.txt
-
-test_expect_success "merge with conflicts, using -L" \
-	"test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt"
-
-cat > expect.txt << EOF
-<<<<<<< 1
-Dominus regit me, et nihil mihi deerit.
-=======
-DOMINUS regit me,
-et nihil mihi deerit.
->>>>>>> new3.txt
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-
-test_expect_success "expected conflict markers, with -L" \
-	"test_cmp expect.txt test.txt"
-
-sed "s/ tu / TU /" < new1.txt > new5.txt
-test_expect_success "conflict in removed tail" \
-	"test_must_fail git merge-file -p orig.txt new1.txt new5.txt > out"
-
-cat > expect << EOF
-Dominus regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-<<<<<<< orig.txt
-=======
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam TU mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
->>>>>>> new5.txt
-EOF
-
-test_expect_success "expected conflict markers" "test_cmp expect out"
+test_expect_success "merge without conflict (--quiet)" '
+	cp new1.txt test.txt &&
+	git merge-file --quiet test.txt orig.txt new2.txt
+'
+
+test_expect_failure "merge without conflict (missing LF at EOF)" '
+	cp new1.txt test2.txt &&
+	git merge-file test2.txt orig.txt new4.txt
+'
+
+test_expect_failure "merge result added missing LF" '
+	test_cmp test.txt test2.txt
+'
+
+test_expect_success "merge without conflict (missing LF at EOF, away from change in the other file)" '
+	cp new4.txt test3.txt &&
+	git merge-file --quiet test3.txt new2.txt new3.txt
+'
+
+test_expect_success "merge does not add LF away of change" '
+	cat >expect.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	EOF
+	printf "propter nomen suum." >>expect.txt &&
+
+	test_cmp expect.txt test3.txt
+'
+
+test_expect_success "merge with conflicts" '
+	cp test.txt backup.txt &&
+	test_must_fail git merge-file test.txt orig.txt new3.txt
+'
+
+test_expect_success "expected conflict markers" '
+	cat >expect.txt <<-\EOF &&
+	<<<<<<< test.txt
+	Dominus regit me, et nihil mihi deerit.
+	=======
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	>>>>>>> new3.txt
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "merge conflicting with --ours" '
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --ours test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "merge conflicting with --theirs" '
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --theirs test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "merge conflicting with --union" '
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --union test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "merge with conflicts, using -L" '
+	cp backup.txt test.txt &&
+
+	test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt
+'
+
+test_expect_success "expected conflict markers, with -L" '
+	cat >expect.txt <<-\EOF &&
+	<<<<<<< 1
+	Dominus regit me, et nihil mihi deerit.
+	=======
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	>>>>>>> new3.txt
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "conflict in removed tail" '
+	sed "s/ tu / TU /" <new1.txt >new5.txt &&
+	test_must_fail git merge-file -p orig.txt new1.txt new5.txt >out
+'
+
+test_expect_success "expected conflict markers" '
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	<<<<<<< orig.txt
+	=======
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	>>>>>>> new5.txt
+	EOF
+
+	test_cmp expect out
+'
 
 test_expect_success 'binary files cannot be merged' '
 	test_must_fail git merge-file -p \
@@ -225,59 +254,55 @@ test_expect_success 'binary files cannot be merged' '
 	grep "Cannot merge binary files" merge.err
 '
 
-sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" < new5.txt > new6.txt
-sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" < new5.txt > new7.txt
-
 test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' '
+	sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" <new5.txt >new6.txt &&
+	sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" <new5.txt >new7.txt &&
 
 	test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output &&
-	test 1 = $(grep ======= < output | wc -l)
-
+	test 1 = $(grep ======= <output | wc -l)
 '
 
-sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit;/"< new6.txt | tr '%' '\012' > new8.txt
-sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit --/" < new7.txt | tr '%' '\012' > new9.txt
-
 test_expect_success 'ZEALOUS_ALNUM' '
+	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit;/" <new6.txt | tr % "\012" >new8.txt &&
+	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit --/" <new7.txt | tr % "\012" >new9.txt &&
 
 	test_must_fail git merge-file -p \
-		new8.txt new5.txt new9.txt > merge.out &&
-	test 1 = $(grep ======= < merge.out | wc -l)
-
+		new8.txt new5.txt new9.txt >merge.out &&
+	test 1 = $(grep ======= <merge.out | wc -l)
 '
 
-cat >expect <<\EOF
-Dominus regit me,
-<<<<<<< new8.txt
-et nihil mihi deerit;
+test_expect_success '"diff3 -m" style output (1)' '
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	<<<<<<< new8.txt
+	et nihil mihi deerit;
 
 
 
 
-In loco pascuae ibi me collocavit;
-super aquam refectionis educavit me.
-||||||| new5.txt
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-=======
-et nihil mihi deerit,
+	In loco pascuae ibi me collocavit;
+	super aquam refectionis educavit me.
+	||||||| new5.txt
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	=======
+	et nihil mihi deerit,
 
 
 
 
-In loco pascuae ibi me collocavit --
-super aquam refectionis educavit me,
->>>>>>> new9.txt
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam TU mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
+	In loco pascuae ibi me collocavit --
+	super aquam refectionis educavit me,
+	>>>>>>> new9.txt
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
 
-test_expect_success '"diff3 -m" style output (1)' '
 	test_must_fail git merge-file -p --diff3 \
 		new8.txt new5.txt new9.txt >actual &&
 	test_cmp expect actual
@@ -290,61 +315,64 @@ test_expect_success '"diff3 -m" style output (2)' '
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-Dominus regit me,
-<<<<<<<<<< new8.txt
-et nihil mihi deerit;
+test_expect_success 'marker size' '
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	<<<<<<<<<< new8.txt
+	et nihil mihi deerit;
 
 
 
 
-In loco pascuae ibi me collocavit;
-super aquam refectionis educavit me.
-|||||||||| new5.txt
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-==========
-et nihil mihi deerit,
+	In loco pascuae ibi me collocavit;
+	super aquam refectionis educavit me.
+	|||||||||| new5.txt
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	==========
+	et nihil mihi deerit,
 
 
 
 
-In loco pascuae ibi me collocavit --
-super aquam refectionis educavit me,
->>>>>>>>>> new9.txt
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam TU mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
+	In loco pascuae ibi me collocavit --
+	super aquam refectionis educavit me,
+	>>>>>>>>>> new9.txt
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
 
-test_expect_success 'marker size' '
 	test_must_fail git merge-file -p --marker-size=10 \
 		new8.txt new5.txt new9.txt >actual &&
 	test_cmp expect actual
 '
 
-printf "line1\nline2\nline3" >nolf-orig.txt
-printf "line1\nline2\nline3x" >nolf-diff1.txt
-printf "line1\nline2\nline3y" >nolf-diff2.txt
+test_expect_success 'conflict at EOF without LF resolved by --ours' '
+	printf "line1\nline2\nline3" >nolf-orig.txt &&
+	printf "line1\nline2\nline3x" >nolf-diff1.txt &&
+	printf "line1\nline2\nline3y" >nolf-diff2.txt &&
 
-test_expect_success 'conflict at EOF without LF resolved by --ours' \
-	'git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	 printf "line1\nline2\nline3x" >expect.txt &&
-	 test_cmp expect.txt output.txt'
+	git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3x" >expect.txt &&
+	test_cmp expect.txt output.txt
+'
 
-test_expect_success 'conflict at EOF without LF resolved by --theirs' \
-	'git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	 printf "line1\nline2\nline3y" >expect.txt &&
-	 test_cmp expect.txt output.txt'
+test_expect_success 'conflict at EOF without LF resolved by --theirs' '
+	git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3y" >expect.txt &&
+	test_cmp expect.txt output.txt
+'
 
-test_expect_success 'conflict at EOF without LF resolved by --union' \
-	'git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	 printf "line1\nline2\nline3x\nline3y" >expect.txt &&
-	 test_cmp expect.txt output.txt'
+test_expect_success 'conflict at EOF without LF resolved by --union' '
+	git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3x\nline3y" >expect.txt &&
+	test_cmp expect.txt output.txt
+'
 
 test_expect_success 'conflict sections match existing line endings' '
 	printf "1\\r\\n2\\r\\n3" >crlf-orig.txt &&
diff --git a/third_party/git/t/t6024-recursive-merge.sh b/third_party/git/t/t6024-recursive-merge.sh
index 27c7de90ce64..332cfc53fd88 100755
--- a/third_party/git/t/t6024-recursive-merge.sh
+++ b/third_party/git/t/t6024-recursive-merge.sh
@@ -14,85 +14,95 @@ test_description='Test merge without common ancestors'
 GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
 export GIT_COMMITTER_DATE
 
-test_expect_success "setup tests" '
-echo 1 > a1 &&
-git add a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
-
-git checkout -b A master &&
-echo A > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
-
-git checkout -b B master &&
-echo B > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
-
-git checkout -b D A &&
-git rev-parse B > .git/MERGE_HEAD &&
-echo D > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
-
-git symbolic-ref HEAD refs/heads/other &&
-echo 2 > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
-
-git checkout -b C &&
-echo C > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
-
-git checkout -b E C &&
-git rev-parse B > .git/MERGE_HEAD &&
-echo E > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
-
-git checkout -b G E &&
-git rev-parse A > .git/MERGE_HEAD &&
-echo G > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
-
-git checkout -b F D &&
-git rev-parse C > .git/MERGE_HEAD &&
-echo F > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
+test_expect_success 'setup tests' '
+	echo 1 >a1 &&
+	git add a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
+
+	git checkout -b A master &&
+	echo A >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
+
+	git checkout -b B master &&
+	echo B >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
+
+	git checkout -b D A &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo D >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
+
+	git symbolic-ref HEAD refs/heads/other &&
+	echo 2 >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
+
+	git checkout -b C &&
+	echo C >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
+
+	git checkout -b E C &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo E >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
+
+	git checkout -b G E &&
+	git rev-parse A >.git/MERGE_HEAD &&
+	echo G >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
+
+	git checkout -b F D &&
+	git rev-parse C >.git/MERGE_HEAD &&
+	echo F >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F &&
+
+	test_oid_cache <<-EOF
+	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
+	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
+	EOF
 '
 
 test_expect_success 'combined merge conflicts' '
 	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G
 '
 
-cat > expect << EOF
-<<<<<<< HEAD
-F
-=======
-G
->>>>>>> G
-EOF
+test_expect_success 'result contains a conflict' '
+	cat >expect <<-\EOF &&
+	<<<<<<< HEAD
+	F
+	=======
+	G
+	>>>>>>> G
+	EOF
 
-test_expect_success "result contains a conflict" "test_cmp expect a1"
+	test_cmp expect a1
+'
+
+test_expect_success 'virtual trees were processed' '
+	git ls-files --stage >out &&
 
-git ls-files --stage > out
-cat > expect << EOF
-100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1	a1
-100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2	a1
-100644 fd7923529855d0b274795ae3349c5e0438333979 3	a1
-EOF
+	cat >expect <<-EOF &&
+	100644 $(test_oid idxstage1) 1	a1
+	100644 $(git rev-parse F:a1) 2	a1
+	100644 $(git rev-parse G:a1) 3	a1
+	EOF
 
-test_expect_success "virtual trees were processed" "test_cmp expect out"
+	test_cmp expect out
+'
 
 test_expect_success 'refuse to merge binary files' '
 	git reset --hard &&
-	printf "\0" > binary-file &&
+	printf "\0" >binary-file &&
 	git add binary-file &&
 	git commit -m binary &&
 	git checkout G &&
-	printf "\0\0" > binary-file &&
+	printf "\0\0" >binary-file &&
 	git add binary-file &&
 	git commit -m binary2 &&
-	test_must_fail git merge F > merge.out 2> merge.err &&
+	test_must_fail git merge F >merge.out 2>merge.err &&
 	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err
 '
 
@@ -116,7 +126,6 @@ test_expect_success 'mark rename/delete as unmerged' '
 	test 1 = $(git ls-files --unmerged | wc -l) &&
 	test_must_fail git rev-parse --verify :2:a2 &&
 	git rev-parse --verify :3:a2
-
 '
 
 test_done
diff --git a/third_party/git/t/t6025-merge-symlinks.sh b/third_party/git/t/t6025-merge-symlinks.sh
index 433c4de08f0c..6c0a90d044c5 100755
--- a/third_party/git/t/t6025-merge-symlinks.sh
+++ b/third_party/git/t/t6025-merge-symlinks.sh
@@ -10,52 +10,53 @@ if core.symlinks is false.'
 
 . ./test-lib.sh
 
-test_expect_success \
-'setup' '
-git config core.symlinks false &&
-> file &&
-git add file &&
-git commit -m initial &&
-git branch b-symlink &&
-git branch b-file &&
-l=$(printf file | git hash-object -t blob -w --stdin) &&
-echo "120000 $l	symlink" | git update-index --index-info &&
-git commit -m master &&
-git checkout b-symlink &&
-l=$(printf file-different | git hash-object -t blob -w --stdin) &&
-echo "120000 $l	symlink" | git update-index --index-info &&
-git commit -m b-symlink &&
-git checkout b-file &&
-echo plain-file > symlink &&
-git add symlink &&
-git commit -m b-file'
-
-test_expect_success \
-'merge master into b-symlink, which has a different symbolic link' '
-git checkout b-symlink &&
-test_must_fail git merge master'
-
-test_expect_success \
-'the merge result must be a file' '
-test -f symlink'
-
-test_expect_success \
-'merge master into b-file, which has a file instead of a symbolic link' '
-git reset --hard && git checkout b-file &&
-test_must_fail git merge master'
-
-test_expect_success \
-'the merge result must be a file' '
-test -f symlink'
-
-test_expect_success \
-'merge b-file, which has a file instead of a symbolic link, into master' '
-git reset --hard &&
-git checkout master &&
-test_must_fail git merge b-file'
-
-test_expect_success \
-'the merge result must be a file' '
-test -f symlink'
+test_expect_success 'setup' '
+	git config core.symlinks false &&
+	>file &&
+	git add file &&
+	git commit -m initial &&
+	git branch b-symlink &&
+	git branch b-file &&
+	l=$(printf file | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m master &&
+	git checkout b-symlink &&
+	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m b-symlink &&
+	git checkout b-file &&
+	echo plain-file >symlink &&
+	git add symlink &&
+	git commit -m b-file
+'
+
+test_expect_success 'merge master into b-symlink, which has a different symbolic link' '
+	git checkout b-symlink &&
+	test_must_fail git merge master
+'
+
+test_expect_success 'the merge result must be a file' '
+	test_path_is_file symlink
+'
+
+test_expect_success 'merge master into b-file, which has a file instead of a symbolic link' '
+	git reset --hard &&
+	git checkout b-file &&
+	test_must_fail git merge master
+'
+
+test_expect_success 'the merge result must be a file' '
+	test_path_is_file symlink
+'
+
+test_expect_success 'merge b-file, which has a file instead of a symbolic link, into master' '
+	git reset --hard &&
+	git checkout master &&
+	test_must_fail git merge b-file
+'
+
+test_expect_success 'the merge result must be a file' '
+	test_path_is_file symlink
+'
 
 test_done
diff --git a/third_party/git/t/t6026-merge-attr.sh b/third_party/git/t/t6026-merge-attr.sh
index 8f9b48a4937b..5900358ce9c0 100755
--- a/third_party/git/t/t6026-merge-attr.sh
+++ b/third_party/git/t/t6026-merge-attr.sh
@@ -32,7 +32,29 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m Side &&
 
-	git tag anchor
+	git tag anchor &&
+
+	cat >./custom-merge <<-\EOF &&
+	#!/bin/sh
+
+	orig="$1" ours="$2" theirs="$3" exit="$4" path=$5
+	(
+		echo "orig is $orig"
+		echo "ours is $ours"
+		echo "theirs is $theirs"
+		echo "path is $path"
+		echo "=== orig ==="
+		cat "$orig"
+		echo "=== ours ==="
+		cat "$ours"
+		echo "=== theirs ==="
+		cat "$theirs"
+	) >"$ours+"
+	cat "$ours+" >"$ours"
+	rm -f "$ours+"
+	exit "$exit"
+	EOF
+	chmod +x ./custom-merge
 '
 
 test_expect_success merge '
@@ -82,28 +104,6 @@ test_expect_success 'retry the merge with longer context' '
 	grep "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" actual
 '
 
-cat >./custom-merge <<\EOF
-#!/bin/sh
-
-orig="$1" ours="$2" theirs="$3" exit="$4" path=$5
-(
-	echo "orig is $orig"
-	echo "ours is $ours"
-	echo "theirs is $theirs"
-	echo "path is $path"
-	echo "=== orig ==="
-	cat "$orig"
-	echo "=== ours ==="
-	cat "$ours"
-	echo "=== theirs ==="
-	cat "$theirs"
-) >"$ours+"
-cat "$ours+" >"$ours"
-rm -f "$ours+"
-exit "$exit"
-EOF
-chmod +x ./custom-merge
-
 test_expect_success 'custom merge backend' '
 
 	echo "* merge=union" >.gitattributes &&
diff --git a/third_party/git/t/t6030-bisect-porcelain.sh b/third_party/git/t/t6030-bisect-porcelain.sh
index bdc42e9440cb..821a0c88cf02 100755
--- a/third_party/git/t/t6030-bisect-porcelain.sh
+++ b/third_party/git/t/t6030-bisect-porcelain.sh
@@ -482,7 +482,7 @@ test_expect_success 'optimized merge base checks' '
 	git bisect good > my_bisect_log2.txt &&
 	test -f ".git/BISECT_ANCESTORS_OK" &&
 	test "$HASH6" = $(git rev-parse --verify HEAD) &&
-	git bisect bad > my_bisect_log3.txt &&
+	git bisect bad &&
 	git bisect good "$A_HASH" > my_bisect_log4.txt &&
 	test_i18ngrep "merge base must be tested" my_bisect_log4.txt &&
 	test_must_fail test -f ".git/BISECT_ANCESTORS_OK"
diff --git a/third_party/git/t/t6034-merge-rename-nocruft.sh b/third_party/git/t/t6034-merge-rename-nocruft.sh
index 89871aa5b044..a25e7304604e 100755
--- a/third_party/git/t/t6034-merge-rename-nocruft.sh
+++ b/third_party/git/t/t6034-merge-rename-nocruft.sh
@@ -3,74 +3,73 @@
 test_description='Merge-recursive merging renames'
 . ./test-lib.sh
 
-test_expect_success setup \
-'
-cat >A <<\EOF &&
-a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-c cccccccccccccccccccccccccccccccccccccccccccccccc
-d dddddddddddddddddddddddddddddddddddddddddddddddd
-e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-f ffffffffffffffffffffffffffffffffffffffffffffffff
-g gggggggggggggggggggggggggggggggggggggggggggggggg
-h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-l llllllllllllllllllllllllllllllllllllllllllllllll
-m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-o oooooooooooooooooooooooooooooooooooooooooooooooo
-EOF
+test_expect_success 'setup' '
+	cat >A <<-\EOF &&
+	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	c cccccccccccccccccccccccccccccccccccccccccccccccc
+	d dddddddddddddddddddddddddddddddddddddddddddddddd
+	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+	f ffffffffffffffffffffffffffffffffffffffffffffffff
+	g gggggggggggggggggggggggggggggggggggggggggggggggg
+	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+	l llllllllllllllllllllllllllllllllllllllllllllllll
+	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+	o oooooooooooooooooooooooooooooooooooooooooooooooo
+	EOF
 
-cat >M <<\EOF &&
-A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
-H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
-I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
-L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
-O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-EOF
+	cat >M <<-\EOF &&
+	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
+	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
+	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
+	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+	EOF
 
-git add A M &&
-git commit -m "initial has A and M" &&
-git branch white &&
-git branch red &&
-git branch blue &&
+	git add A M &&
+	git commit -m "initial has A and M" &&
+	git branch white &&
+	git branch red &&
+	git branch blue &&
 
-git checkout white &&
-sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A B M N &&
-git commit -m "white renames A->B, M->N" &&
+	git checkout white &&
+	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "white renames A->B, M->N" &&
 
-git checkout red &&
-echo created by red >R &&
-git update-index --add R &&
-git commit -m "red creates R" &&
+	git checkout red &&
+	echo created by red >R &&
+	git update-index --add R &&
+	git commit -m "red creates R" &&
 
-git checkout blue &&
-sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
-rm -f A &&
-mv B A &&
-git update-index A &&
-git commit -m "blue modify A" &&
+	git checkout blue &&
+	sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
+	rm -f A &&
+	mv B A &&
+	git update-index A &&
+	git commit -m "blue modify A" &&
 
-git checkout master'
+	git checkout master
+'
 
 # This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae
-test_expect_success 'merge white into red (A->B,M->N)' \
-'
+test_expect_success 'merge white into red (A->B,M->N)' '
 	git checkout -b red-white red &&
 	git merge white &&
 	git write-tree &&
@@ -82,8 +81,7 @@ test_expect_success 'merge white into red (A->B,M->N)' \
 '
 
 # This test broke in 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9
-test_expect_success 'merge blue into white (A->B, mod A, A untracked)' \
-'
+test_expect_success 'merge blue into white (A->B, mod A, A untracked)' '
 	git checkout -b white-blue white &&
 	echo dirty >A &&
 	git merge blue &&
diff --git a/third_party/git/t/t6035-merge-dir-to-symlink.sh b/third_party/git/t/t6035-merge-dir-to-symlink.sh
index 9324ea441621..2eddcc7664e8 100755
--- a/third_party/git/t/t6035-merge-dir-to-symlink.sh
+++ b/third_party/git/t/t6035-merge-dir-to-symlink.sh
@@ -31,19 +31,19 @@ test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
 	git rm --cached a/b &&
 	git commit -m "untracked symlink remains" &&
 	git checkout -f start^0 &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'checkout should not have deleted a/b-2/c/d' '
 	git checkout HEAD^0 &&
 	git reset --hard master &&
 	 git checkout start^0 &&
-	 test -f a/b-2/c/d
+	 test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'setup for merge test' '
 	git reset --hard &&
-	test -f a/b-2/c/d &&
+	test_path_is_file a/b-2/c/d &&
 	echo x > a/x &&
 	git add a/x &&
 	git commit -m x &&
@@ -54,7 +54,7 @@ test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolv
 	git reset --hard &&
 	git checkout baseline^0 &&
 	git merge -s resolve master &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -65,7 +65,7 @@ test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recurs
 	git reset --hard &&
 	git checkout baseline^0 &&
 	git merge -s recursive master &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -76,7 +76,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolv
 	git reset --hard &&
 	git checkout master^0 &&
 	git merge -s resolve baseline^0 &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -87,7 +87,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recurs
 	git reset --hard &&
 	git checkout master^0 &&
 	git merge -s recursive baseline^0 &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -99,8 +99,8 @@ test_expect_failure 'do not lose untracked in merge (resolve)' '
 	git checkout baseline^0 &&
 	>a/b/c/e &&
 	test_must_fail git merge -s resolve master &&
-	test -f a/b/c/e &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b/c/e &&
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'do not lose untracked in merge (recursive)' '
@@ -108,8 +108,8 @@ test_expect_success 'do not lose untracked in merge (recursive)' '
 	git checkout baseline^0 &&
 	>a/b/c/e &&
 	test_must_fail git merge -s recursive master &&
-	test -f a/b/c/e &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b/c/e &&
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'do not lose modifications in merge (resolve)' '
@@ -140,7 +140,7 @@ test_expect_success 'merge should not have D/F conflicts (resolve)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	git merge -s resolve test2 &&
-	test -f a/b/c/d
+	test_path_is_file a/b/c/d
 '
 
 test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
@@ -151,7 +151,7 @@ test_expect_success 'merge should not have D/F conflicts (recursive)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	git merge -s recursive test2 &&
-	test -f a/b/c/d
+	test_path_is_file a/b/c/d
 '
 
 test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
@@ -162,7 +162,7 @@ test_expect_success 'merge should not have F/D conflicts (recursive)' '
 	git reset --hard &&
 	git checkout -b foo test2 &&
 	git merge -s recursive baseline^0 &&
-	test -f a/b/c/d
+	test_path_is_file a/b/c/d
 '
 
 test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
diff --git a/third_party/git/t/t6036-recursive-corner-cases.sh b/third_party/git/t/t6036-recursive-corner-cases.sh
index d23b948f27f1..b3bf46261786 100755
--- a/third_party/git/t/t6036-recursive-corner-cases.sh
+++ b/third_party/git/t/t6036-recursive-corner-cases.sh
@@ -60,9 +60,9 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '
 		test_must_fail git merge -s recursive R2^0 &&
 
 		git ls-files -s >out &&
-		test_line_count = 2 out &&
+		test_line_count = 5 out &&
 		git ls-files -u >out &&
-		test_line_count = 2 out &&
+		test_line_count = 3 out &&
 		git ls-files -o >out &&
 		test_line_count = 1 out &&
 
@@ -133,9 +133,9 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'
 		test_must_fail git merge -s recursive R2^0 &&
 
 		git ls-files -s >out &&
-		test_line_count = 2 out &&
+		test_line_count = 5 out &&
 		git ls-files -u >out &&
-		test_line_count = 2 out &&
+		test_line_count = 3 out &&
 		git ls-files -o >out &&
 		test_line_count = 1 out &&
 
@@ -218,8 +218,18 @@ test_expect_success 'git detects differently handled merges conflict' '
 		git ls-files -o >out &&
 		test_line_count = 1 out &&
 
-		git rev-parse >expect       \
-			C:new_a  D:new_a  E:new_a &&
+		git cat-file -p C:new_a >ours &&
+		git cat-file -p C:a >theirs &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "Temporary merge branch 1" \
+			-L "" \
+			-L "Temporary merge branch 2" \
+			ours empty theirs &&
+		sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked &&
+		git hash-object ours-tweaked >expect &&
+		git rev-parse >>expect      \
+				  D:new_a  E:new_a &&
 		git rev-parse   >actual     \
 			:1:new_a :2:new_a :3:new_a &&
 		test_cmp expect actual &&
@@ -257,7 +267,8 @@ test_expect_success 'git detects differently handled merges conflict, swapped' '
 		ctime=$(git log --no-walk --date=raw --format=%cd C | awk "{print \$1}") &&
 		newctime=$(($btime+1)) &&
 		git fast-export --no-data --all | sed -e s/$ctime/$newctime/ | git fast-import --force --quiet &&
-		# End of differences; rest is copy-paste of last test
+		# End of most differences; rest is copy-paste of last test,
+		# other than swapping C:a and C:new_a due to order switch
 
 		git checkout D^0 &&
 		test_must_fail git merge -s recursive E^0 &&
@@ -269,8 +280,18 @@ test_expect_success 'git detects differently handled merges conflict, swapped' '
 		git ls-files -o >out &&
 		test_line_count = 1 out &&
 
-		git rev-parse >expect       \
-			C:new_a  D:new_a  E:new_a &&
+		git cat-file -p C:a >ours &&
+		git cat-file -p C:new_a >theirs &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "Temporary merge branch 1" \
+			-L "" \
+			-L "Temporary merge branch 2" \
+			ours empty theirs &&
+		sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked &&
+		git hash-object ours-tweaked >expect &&
+		git rev-parse >>expect      \
+				  D:new_a  E:new_a &&
 		git rev-parse   >actual     \
 			:1:new_a :2:new_a :3:new_a &&
 		test_cmp expect actual &&
@@ -1532,7 +1553,7 @@ test_expect_success 'setup nested conflicts' '
 		mv -f b_R1 b &&
 		mv -f a_R1 a &&
 		git add b a &&
-		test_tick && git commit -m "verson R1 of files" &&
+		test_tick && git commit -m "version R1 of files" &&
 		git tag R1 &&
 
 		# Create first merge on left side
@@ -1562,6 +1583,7 @@ test_expect_success 'check nested conflicts' '
 		cd nested_conflicts &&
 
 		git clean -f &&
+		MASTER=$(git rev-parse --short master) &&
 		git checkout L2^0 &&
 
 		# Merge must fail; there is a conflict
@@ -1582,7 +1604,7 @@ test_expect_success 'check nested conflicts' '
 		git cat-file -p R1:a >theirs &&
 		test_must_fail git merge-file --diff3 \
 			-L "Temporary merge branch 1" \
-			-L "merged common ancestors"  \
+			-L "$MASTER"  \
 			-L "Temporary merge branch 2" \
 			ours  \
 			base  \
@@ -1594,7 +1616,7 @@ test_expect_success 'check nested conflicts' '
 		git cat-file -p R1:b >theirs &&
 		test_must_fail git merge-file --diff3 \
 			-L "Temporary merge branch 1" \
-			-L "merged common ancestors"  \
+			-L "$MASTER"  \
 			-L "Temporary merge branch 2" \
 			ours  \
 			base  \
@@ -1695,7 +1717,7 @@ test_expect_success 'setup virtual merge base with nested conflicts' '
 		git checkout R &&
 		echo right >>content &&
 		git add content &&
-		test_tick && git commit -m "verson R1 of content" &&
+		test_tick && git commit -m "version R1 of content" &&
 		git tag R1 &&
 
 		# Create L2
@@ -1732,6 +1754,7 @@ test_expect_success 'check virtual merge base with nested conflicts' '
 	(
 		cd virtual_merge_base_has_nested_conflicts &&
 
+		MASTER=$(git rev-parse --short master) &&
 		git checkout L3^0 &&
 
 		# Merge must fail; there is a conflict
@@ -1760,7 +1783,7 @@ test_expect_success 'check virtual merge base with nested conflicts' '
 		cp left merged-once &&
 		test_must_fail git merge-file --diff3 \
 			-L "Temporary merge branch 1" \
-			-L "merged common ancestors"  \
+			-L "$MASTER"  \
 			-L "Temporary merge branch 2" \
 			merged-once \
 			base        \
diff --git a/third_party/git/t/t6042-merge-rename-corner-cases.sh b/third_party/git/t/t6042-merge-rename-corner-cases.sh
index c5b57f40c3d1..b047cf1c1c37 100755
--- a/third_party/git/t/t6042-merge-rename-corner-cases.sh
+++ b/third_party/git/t/t6042-merge-rename-corner-cases.sh
@@ -5,7 +5,7 @@ test_description="recursive merge corner cases w/ renames but not criss-crosses"
 
 . ./test-lib.sh
 
-test_expect_success 'setup rename/delete + untracked file' '
+test_setup_rename_delete_untracked () {
 	test_create_repo rename-delete-untracked &&
 	(
 		cd rename-delete-untracked &&
@@ -29,9 +29,10 @@ test_expect_success 'setup rename/delete + untracked file' '
 		git commit -m track-people-instead-of-objects &&
 		echo "Myyy PRECIOUSSS" >ring
 	)
-'
+}
 
 test_expect_success "Does git preserve Gollum's precious artifact?" '
+	test_setup_rename_delete_untracked &&
 	(
 		cd rename-delete-untracked &&
 
@@ -49,7 +50,7 @@ test_expect_success "Does git preserve Gollum's precious artifact?" '
 #
 # We should be able to merge B & C cleanly
 
-test_expect_success 'setup rename/modify/add-source conflict' '
+test_setup_rename_modify_add_source () {
 	test_create_repo rename-modify-add-source &&
 	(
 		cd rename-modify-add-source &&
@@ -70,9 +71,10 @@ test_expect_success 'setup rename/modify/add-source conflict' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_failure 'rename/modify/add-source conflict resolvable' '
+	test_setup_rename_modify_add_source &&
 	(
 		cd rename-modify-add-source &&
 
@@ -88,7 +90,7 @@ test_expect_failure 'rename/modify/add-source conflict resolvable' '
 	)
 '
 
-test_expect_success 'setup resolvable conflict missed if rename missed' '
+test_setup_break_detection_1 () {
 	test_create_repo break-detection-1 &&
 	(
 		cd break-detection-1 &&
@@ -110,9 +112,10 @@ test_expect_success 'setup resolvable conflict missed if rename missed' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_failure 'conflict caused if rename not detected' '
+	test_setup_break_detection_1 &&
 	(
 		cd break-detection-1 &&
 
@@ -135,7 +138,7 @@ test_expect_failure 'conflict caused if rename not detected' '
 	)
 '
 
-test_expect_success 'setup conflict resolved wrong if rename missed' '
+test_setup_break_detection_2 () {
 	test_create_repo break-detection-2 &&
 	(
 		cd break-detection-2 &&
@@ -160,9 +163,10 @@ test_expect_success 'setup conflict resolved wrong if rename missed' '
 		git add a &&
 		git commit -m E
 	)
-'
+}
 
 test_expect_failure 'missed conflict if rename not detected' '
+	test_setup_break_detection_2 &&
 	(
 		cd break-detection-2 &&
 
@@ -182,7 +186,7 @@ test_expect_failure 'missed conflict if rename not detected' '
 #   Commit B: rename a->b
 #   Commit C: rename a->b, add unrelated a
 
-test_expect_success 'setup undetected rename/add-source causes data loss' '
+test_setup_break_detection_3 () {
 	test_create_repo break-detection-3 &&
 	(
 		cd break-detection-3 &&
@@ -202,9 +206,10 @@ test_expect_success 'setup undetected rename/add-source causes data loss' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_failure 'detect rename/add-source and preserve all data' '
+	test_setup_break_detection_3 &&
 	(
 		cd break-detection-3 &&
 
@@ -231,6 +236,7 @@ test_expect_failure 'detect rename/add-source and preserve all data' '
 '
 
 test_expect_failure 'detect rename/add-source and preserve all data, merge other way' '
+	test_setup_break_detection_3 &&
 	(
 		cd break-detection-3 &&
 
@@ -256,10 +262,10 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other
 	)
 '
 
-test_expect_success 'setup content merge + rename/directory conflict' '
-	test_create_repo rename-directory-1 &&
+test_setup_rename_directory () {
+	test_create_repo rename-directory-$1 &&
 	(
-		cd rename-directory-1 &&
+		cd rename-directory-$1 &&
 
 		printf "1\n2\n3\n4\n5\n6\n" >file &&
 		git add file &&
@@ -290,11 +296,12 @@ test_expect_success 'setup content merge + rename/directory conflict' '
 		test_tick &&
 		git commit -m left
 	)
-'
+}
 
 test_expect_success 'rename/directory conflict + clean content merge' '
+	test_setup_rename_directory 1a &&
 	(
-		cd rename-directory-1 &&
+		cd rename-directory-1a &&
 
 		git checkout left-clean^0 &&
 
@@ -320,8 +327,9 @@ test_expect_success 'rename/directory conflict + clean content merge' '
 '
 
 test_expect_success 'rename/directory conflict + content merge conflict' '
+	test_setup_rename_directory 1b &&
 	(
-		cd rename-directory-1 &&
+		cd rename-directory-1b &&
 
 		git reset --hard &&
 		git clean -fdqx &&
@@ -358,7 +366,7 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
 	)
 '
 
-test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' '
+test_setup_rename_directory_2 () {
 	test_create_repo rename-directory-2 &&
 	(
 		cd rename-directory-2 &&
@@ -385,9 +393,10 @@ test_expect_success 'setup content merge + rename/directory conflict w/ disappea
 		test_tick &&
 		git commit -m left
 	)
-'
+}
 
 test_expect_success 'disappearing dir in rename/directory conflict handled' '
+	test_setup_rename_directory_2 &&
 	(
 		cd rename-directory-2 &&
 
@@ -416,10 +425,10 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '
 #   Commit A: rename a->b, modifying b too
 #   Commit B: modify a, add different b
 
-test_expect_success 'setup rename-with-content-merge vs. add' '
-	test_create_repo rename-with-content-merge-and-add &&
+test_setup_rename_with_content_merge_and_add () {
+	test_create_repo rename-with-content-merge-and-add-$1 &&
 	(
-		cd rename-with-content-merge-and-add &&
+		cd rename-with-content-merge-and-add-$1 &&
 
 		test_seq 1 5 >a &&
 		git add a &&
@@ -438,11 +447,12 @@ test_expect_success 'setup rename-with-content-merge vs. add' '
 		git add a b &&
 		git commit -m B
 	)
-'
+}
 
 test_expect_success 'handle rename-with-content-merge vs. add' '
+	test_setup_rename_with_content_merge_and_add AB &&
 	(
-		cd rename-with-content-merge-and-add &&
+		cd rename-with-content-merge-and-add-AB &&
 
 		git checkout A^0 &&
 
@@ -483,8 +493,9 @@ test_expect_success 'handle rename-with-content-merge vs. add' '
 '
 
 test_expect_success 'handle rename-with-content-merge vs. add, merge other way' '
+	test_setup_rename_with_content_merge_and_add BA &&
 	(
-		cd rename-with-content-merge-and-add &&
+		cd rename-with-content-merge-and-add-BA &&
 
 		git reset --hard &&
 		git clean -fdx &&
@@ -539,7 +550,7 @@ test_expect_success 'handle rename-with-content-merge vs. add, merge other way'
 #   * The working copy should have two files, both of form c~<unique>; does it?
 #   * Nothing else should be present.  Is anything?
 
-test_expect_success 'setup rename/rename (2to1) + modify/modify' '
+test_setup_rename_rename_2to1 () {
 	test_create_repo rename-rename-2to1 &&
 	(
 		cd rename-rename-2to1 &&
@@ -562,9 +573,10 @@ test_expect_success 'setup rename/rename (2to1) + modify/modify' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_success 'handle rename/rename (2to1) conflict correctly' '
+	test_setup_rename_rename_2to1 &&
 	(
 		cd rename-rename-2to1 &&
 
@@ -610,7 +622,7 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
 #   Commit A: new file: a
 #   Commit B: rename a->b
 #   Commit C: rename a->c
-test_expect_success 'setup simple rename/rename (1to2) conflict' '
+test_setup_rename_rename_1to2 () {
 	test_create_repo rename-rename-1to2 &&
 	(
 		cd rename-rename-1to2 &&
@@ -631,9 +643,10 @@ test_expect_success 'setup simple rename/rename (1to2) conflict' '
 		test_tick &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_success 'merge has correct working tree contents' '
+	test_setup_rename_rename_1to2 &&
 	(
 		cd rename-rename-1to2 &&
 
@@ -667,7 +680,7 @@ test_expect_success 'merge has correct working tree contents' '
 #
 # Merging of B & C should NOT be clean; there's a rename/rename conflict
 
-test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
+test_setup_rename_rename_1to2_add_source_1 () {
 	test_create_repo rename-rename-1to2-add-source-1 &&
 	(
 		cd rename-rename-1to2-add-source-1 &&
@@ -687,9 +700,10 @@ test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' '
+	test_setup_rename_rename_1to2_add_source_1 &&
 	(
 		cd rename-rename-1to2-add-source-1 &&
 
@@ -714,7 +728,7 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'
 	)
 '
 
-test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
+test_setup_rename_rename_1to2_add_source_2 () {
 	test_create_repo rename-rename-1to2-add-source-2 &&
 	(
 		cd rename-rename-1to2-add-source-2 &&
@@ -737,9 +751,10 @@ test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
 		test_tick &&
 		git commit -m two
 	)
-'
+}
 
 test_expect_failure 'rename/rename/add-source still tracks new a file' '
+	test_setup_rename_rename_1to2_add_source_2 &&
 	(
 		cd rename-rename-1to2-add-source-2 &&
 
@@ -759,7 +774,7 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' '
 	)
 '
 
-test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
+test_setup_rename_rename_1to2_add_dest () {
 	test_create_repo rename-rename-1to2-add-dest &&
 	(
 		cd rename-rename-1to2-add-dest &&
@@ -784,9 +799,10 @@ test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
 		test_tick &&
 		git commit -m two
 	)
-'
+}
 
 test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
+	test_setup_rename_rename_1to2_add_dest &&
 	(
 		cd rename-rename-1to2-add-dest &&
 
@@ -838,7 +854,7 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
 #   Commit B: rename foo->bar
 #   Expected: CONFLICT (rename/add/delete), two-way merged bar
 
-test_expect_success 'rad-setup: rename/add/delete conflict' '
+test_setup_rad () {
 	test_create_repo rad &&
 	(
 		cd rad &&
@@ -860,9 +876,10 @@ test_expect_success 'rad-setup: rename/add/delete conflict' '
 		git mv foo bar &&
 		git commit -m "rename foo to bar"
 	)
-'
+}
 
 test_expect_failure 'rad-check: rename/add/delete conflict' '
+	test_setup_rad &&
 	(
 		cd rad &&
 
@@ -904,7 +921,7 @@ test_expect_failure 'rad-check: rename/add/delete conflict' '
 #   Commit B: rename bar->baz, rm foo
 #   Expected: CONFLICT (rename/rename/delete/delete), two-way merged baz
 
-test_expect_success 'rrdd-setup: rename/rename(2to1)/delete/delete conflict' '
+test_setup_rrdd () {
 	test_create_repo rrdd &&
 	(
 		cd rrdd &&
@@ -927,9 +944,10 @@ test_expect_success 'rrdd-setup: rename/rename(2to1)/delete/delete conflict' '
 		git rm foo &&
 		git commit -m "Rename bar, remove foo"
 	)
-'
+}
 
 test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
+	test_setup_rrdd &&
 	(
 		cd rrdd &&
 
@@ -973,7 +991,7 @@ test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
 #   Expected: six CONFLICT(rename/rename) messages, each path in two of the
 #             multi-way merged contents found in two, four, six
 
-test_expect_success 'mod6-setup: chains of rename/rename(1to2) and rename/rename(2to1)' '
+test_setup_mod6 () {
 	test_create_repo mod6 &&
 	(
 		cd mod6 &&
@@ -1009,9 +1027,10 @@ test_expect_success 'mod6-setup: chains of rename/rename(1to2) and rename/rename
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
 test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename(2to1)' '
+	test_setup_mod6 &&
 	(
 		cd mod6 &&
 
@@ -1108,7 +1127,8 @@ test_conflicts_with_adds_and_renames() {
 	#      files.  Is it present?
 	#   4) There should not be any three~* files in the working
 	#      tree
-	test_expect_success "setup simple $sideL/$sideR conflict" '
+	test_setup_collision_conflict () {
+	#test_expect_success "setup simple $sideL/$sideR conflict" '
 		test_create_repo simple_${sideL}_${sideR} &&
 		(
 			cd simple_${sideL}_${sideR} &&
@@ -1185,9 +1205,11 @@ test_conflicts_with_adds_and_renames() {
 			fi &&
 			test_tick && git commit -m R
 		)
-	'
+	#'
+	}
 
 	test_expect_success "check simple $sideL/$sideR conflict" '
+		test_setup_collision_conflict &&
 		(
 			cd simple_${sideL}_${sideR} &&
 
@@ -1254,7 +1276,7 @@ test_conflicts_with_adds_and_renames add    add
 #
 #   So, we have four different conflicting files that all end up at path
 #   'three'.
-test_expect_success 'setup nested conflicts from rename/rename(2to1)' '
+test_setup_nested_conflicts_from_rename_rename () {
 	test_create_repo nested_conflicts_from_rename_rename &&
 	(
 		cd nested_conflicts_from_rename_rename &&
@@ -1305,9 +1327,10 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' '
 		git add one three &&
 		test_tick && git commit -m german
 	)
-'
+}
 
 test_expect_success 'check nested conflicts from rename/rename(2to1)' '
+	test_setup_nested_conflicts_from_rename_rename &&
 	(
 		cd nested_conflicts_from_rename_rename &&
 
diff --git a/third_party/git/t/t6043-merge-rename-directories.sh b/third_party/git/t/t6043-merge-rename-directories.sh
index c966147d5d73..83792c5ef1f5 100755
--- a/third_party/git/t/t6043-merge-rename-directories.sh
+++ b/third_party/git/t/t6043-merge-rename-directories.sh
@@ -38,7 +38,7 @@ test_description="recursive merge with directory renames"
 #   Commit B: z/{b,c,d,e/f}
 #   Expected: y/{b,c,d,e/f}
 
-test_expect_success '1a-setup: Simple directory rename detection' '
+test_setup_1a () {
 	test_create_repo 1a &&
 	(
 		cd 1a &&
@@ -67,9 +67,10 @@ test_expect_success '1a-setup: Simple directory rename detection' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1a-check: Simple directory rename detection' '
+test_expect_success '1a: Simple directory rename detection' '
+	test_setup_1a &&
 	(
 		cd 1a &&
 
@@ -103,7 +104,7 @@ test_expect_success '1a-check: Simple directory rename detection' '
 #   Commit B: y/{b,c,d}
 #   Expected: y/{b,c,d,e}
 
-test_expect_success '1b-setup: Merge a directory with another' '
+test_setup_1b () {
 	test_create_repo 1b &&
 	(
 		cd 1b &&
@@ -134,9 +135,10 @@ test_expect_success '1b-setup: Merge a directory with another' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1b-check: Merge a directory with another' '
+test_expect_success '1b: Merge a directory with another' '
+	test_setup_1b &&
 	(
 		cd 1b &&
 
@@ -165,7 +167,7 @@ test_expect_success '1b-check: Merge a directory with another' '
 #   Commit B: z/{b,c,d}
 #   Expected: y/{b,c,d}  (because x/d -> z/d -> y/d)
 
-test_expect_success '1c-setup: Transitive renaming' '
+test_setup_1c () {
 	test_create_repo 1c &&
 	(
 		cd 1c &&
@@ -193,9 +195,10 @@ test_expect_success '1c-setup: Transitive renaming' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1c-check: Transitive renaming' '
+test_expect_success '1c: Transitive renaming' '
+	test_setup_1c &&
 	(
 		cd 1c &&
 
@@ -227,7 +230,7 @@ test_expect_success '1c-check: Transitive renaming' '
 #   Note: y/m & z/n should definitely move into x.  By the same token, both
 #         y/wham_1 & z/wham_2 should too...giving us a conflict.
 
-test_expect_success '1d-setup: Directory renames cause a rename/rename(2to1) conflict' '
+test_setup_1d () {
 	test_create_repo 1d &&
 	(
 		cd 1d &&
@@ -262,9 +265,10 @@ test_expect_success '1d-setup: Directory renames cause a rename/rename(2to1) con
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1d-check: Directory renames cause a rename/rename(2to1) conflict' '
+test_expect_success '1d: Directory renames cause a rename/rename(2to1) conflict' '
+	test_setup_1d &&
 	(
 		cd 1d &&
 
@@ -313,7 +317,7 @@ test_expect_success '1d-check: Directory renames cause a rename/rename(2to1) con
 #   Commit B: z/{oldb,oldc,d}
 #   Expected: y/{newb,newc,d}
 
-test_expect_success '1e-setup: Renamed directory, with all files being renamed too' '
+test_setup_1e () {
 	test_create_repo 1e &&
 	(
 		cd 1e &&
@@ -342,9 +346,10 @@ test_expect_success '1e-setup: Renamed directory, with all files being renamed t
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1e-check: Renamed directory, with all files being renamed too' '
+test_expect_success '1e: Renamed directory, with all files being renamed too' '
+	test_setup_1e &&
 	(
 		cd 1e &&
 
@@ -371,7 +376,7 @@ test_expect_success '1e-check: Renamed directory, with all files being renamed t
 #   Commit B: y/{b,c}, x/{d,e,f}
 #   Expected: y/{b,c}, x/{d,e,f,g}
 
-test_expect_success '1f-setup: Split a directory into two other directories' '
+test_setup_1f () {
 	test_create_repo 1f &&
 	(
 		cd 1f &&
@@ -408,9 +413,10 @@ test_expect_success '1f-setup: Split a directory into two other directories' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1f-check: Split a directory into two other directories' '
+test_expect_success '1f: Split a directory into two other directories' '
+	test_setup_1f &&
 	(
 		cd 1f &&
 
@@ -459,7 +465,7 @@ test_expect_success '1f-check: Split a directory into two other directories' '
 #   Commit A: y/b, w/c
 #   Commit B: z/{b,c,d}
 #   Expected: y/b, w/c, z/d, with warning about z/ -> (y/ vs. w/) conflict
-test_expect_success '2a-setup: Directory split into two on one side, with equal numbers of paths' '
+test_setup_2a () {
 	test_create_repo 2a &&
 	(
 		cd 2a &&
@@ -489,9 +495,10 @@ test_expect_success '2a-setup: Directory split into two on one side, with equal
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2a-check: Directory split into two on one side, with equal numbers of paths' '
+test_expect_success '2a: Directory split into two on one side, with equal numbers of paths' '
+	test_setup_2a &&
 	(
 		cd 2a &&
 
@@ -520,7 +527,7 @@ test_expect_success '2a-check: Directory split into two on one side, with equal
 #   Commit A: y/b, w/c
 #   Commit B: z/{b,c}, x/d
 #   Expected: y/b, w/c, x/d; No warning about z/ -> (y/ vs. w/) conflict
-test_expect_success '2b-setup: Directory split into two on one side, with equal numbers of paths' '
+test_setup_2b () {
 	test_create_repo 2b &&
 	(
 		cd 2b &&
@@ -551,9 +558,10 @@ test_expect_success '2b-setup: Directory split into two on one side, with equal
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2b-check: Directory split into two on one side, with equal numbers of paths' '
+test_expect_success '2b: Directory split into two on one side, with equal numbers of paths' '
+	test_setup_2b &&
 	(
 		cd 2b &&
 
@@ -601,7 +609,7 @@ test_expect_success '2b-check: Directory split into two on one side, with equal
 #   Commit A: z/{b,c,d} (no change)
 #   Commit B: y/{b,c}, x/d
 #   Expected: y/{b,c}, x/d
-test_expect_success '3a-setup: Avoid implicit rename if involved as source on other side' '
+test_setup_3a () {
 	test_create_repo 3a &&
 	(
 		cd 3a &&
@@ -632,9 +640,10 @@ test_expect_success '3a-setup: Avoid implicit rename if involved as source on ot
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '3a-check: Avoid implicit rename if involved as source on other side' '
+test_expect_success '3a: Avoid implicit rename if involved as source on other side' '
+	test_setup_3a &&
 	(
 		cd 3a &&
 
@@ -664,7 +673,7 @@ test_expect_success '3a-check: Avoid implicit rename if involved as source on ot
 #         get it involved in directory rename detection.  If it were, we might
 #         end up with CONFLICT:(z/d -> y/d vs. x/d vs. w/d), i.e. a
 #         rename/rename/rename(1to3) conflict, which is just weird.
-test_expect_success '3b-setup: Avoid implicit rename if involved as source on current side' '
+test_setup_3b () {
 	test_create_repo 3b &&
 	(
 		cd 3b &&
@@ -697,9 +706,10 @@ test_expect_success '3b-setup: Avoid implicit rename if involved as source on cu
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '3b-check: Avoid implicit rename if involved as source on current side' '
+test_expect_success '3b: Avoid implicit rename if involved as source on current side' '
+	test_setup_3b &&
 	(
 		cd 3b &&
 
@@ -744,7 +754,7 @@ test_expect_success '3b-check: Avoid implicit rename if involved as source on cu
 #
 # What if we were to attempt to do directory rename detection when someone
 # "mostly" moved a directory but still left some files around, or,
-# equivalently, fully renamed a directory in one commmit and then recreated
+# equivalently, fully renamed a directory in one commit and then recreated
 # that directory in a later commit adding some new files and then tried to
 # merge?
 #
@@ -786,7 +796,7 @@ test_expect_success '3b-check: Avoid implicit rename if involved as source on cu
 #   Expected: y/{b,c,d}, z/{e,f}
 #   NOTE: Even though most files from z moved to y, we don't want f to follow.
 
-test_expect_success '4a-setup: Directory split, with original directory still present' '
+test_setup_4a () {
 	test_create_repo 4a &&
 	(
 		cd 4a &&
@@ -818,9 +828,10 @@ test_expect_success '4a-setup: Directory split, with original directory still pr
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '4a-check: Directory split, with original directory still present' '
+test_expect_success '4a: Directory split, with original directory still present' '
+	test_setup_4a &&
 	(
 		cd 4a &&
 
@@ -874,7 +885,7 @@ test_expect_success '4a-check: Directory split, with original directory still pr
 #         of history, giving us no way to represent this conflict in the
 #         index.
 
-test_expect_success '5a-setup: Merge directories, other side adds files to original and target' '
+test_setup_5a () {
 	test_create_repo 5a &&
 	(
 		cd 5a &&
@@ -907,9 +918,10 @@ test_expect_success '5a-setup: Merge directories, other side adds files to origi
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '5a-check: Merge directories, other side adds files to original and target' '
+test_expect_success '5a: Merge directories, other side adds files to original and target' '
+	test_setup_5a &&
 	(
 		cd 5a &&
 
@@ -941,14 +953,14 @@ test_expect_success '5a-check: Merge directories, other side adds files to origi
 #   Commit B: z/{b,c,d_1,e}, y/d_3
 #   Expected: y/{b,c,e}, CONFLICT(add/add: y/d_2 vs. y/d_3)
 #   NOTE: If z/d_1 in commit B were to be involved in dir rename detection, as
-#         we normaly would since z/ is being renamed to y/, then this would be
+#         we normally would since z/ is being renamed to y/, then this would be
 #         a rename/delete (z/d_1 -> y/d_1 vs. deleted) AND an add/add/add
 #         conflict of y/d_1 vs. y/d_2 vs. y/d_3.  Add/add/add is not
 #         representable in the index, so the existence of y/d_3 needs to
 #         cause us to bail on directory rename detection for that path, falling
 #         back to git behavior without the directory rename detection.
 
-test_expect_success '5b-setup: Rename/delete in order to get add/add/add conflict' '
+test_setup_5b () {
 	test_create_repo 5b &&
 	(
 		cd 5b &&
@@ -981,9 +993,10 @@ test_expect_success '5b-setup: Rename/delete in order to get add/add/add conflic
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '5b-check: Rename/delete in order to get add/add/add conflict' '
+test_expect_success '5b: Rename/delete in order to get add/add/add conflict' '
+	test_setup_5b &&
 	(
 		cd 5b &&
 
@@ -1024,7 +1037,7 @@ test_expect_success '5b-check: Rename/delete in order to get add/add/add conflic
 #             y/d are y/d_2 and y/d_4.  We still do the move from z/e to y/e,
 #             though, because it doesn't have anything in the way.
 
-test_expect_success '5c-setup: Transitive rename would cause rename/rename/rename/add/add/add' '
+test_setup_5c () {
 	test_create_repo 5c &&
 	(
 		cd 5c &&
@@ -1061,9 +1074,10 @@ test_expect_success '5c-setup: Transitive rename would cause rename/rename/renam
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '5c-check: Transitive rename would cause rename/rename/rename/add/add/add' '
+test_expect_success '5c: Transitive rename would cause rename/rename/rename/add/add/add' '
+	test_setup_5c &&
 	(
 		cd 5c &&
 
@@ -1113,7 +1127,7 @@ test_expect_success '5c-check: Transitive rename would cause rename/rename/renam
 #         detection for z/d_2, but that doesn't prevent us from applying the
 #         directory rename detection for z/f -> y/f.
 
-test_expect_success '5d-setup: Directory/file/file conflict due to directory rename' '
+test_setup_5d () {
 	test_create_repo 5d &&
 	(
 		cd 5d &&
@@ -1145,9 +1159,10 @@ test_expect_success '5d-setup: Directory/file/file conflict due to directory ren
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '5d-check: Directory/file/file conflict due to directory rename' '
+test_expect_success '5d: Directory/file/file conflict due to directory rename' '
+	test_setup_5d &&
 	(
 		cd 5d &&
 
@@ -1205,7 +1220,7 @@ test_expect_success '5d-check: Directory/file/file conflict due to directory ren
 #         them under y/ doesn't accidentally catch z/d and make it look like
 #         it is also involved in a rename/delete conflict.
 
-test_expect_success '6a-setup: Tricky rename/delete' '
+test_setup_6a () {
 	test_create_repo 6a &&
 	(
 		cd 6a &&
@@ -1235,9 +1250,10 @@ test_expect_success '6a-setup: Tricky rename/delete' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6a-check: Tricky rename/delete' '
+test_expect_success '6a: Tricky rename/delete' '
+	test_setup_6a &&
 	(
 		cd 6a &&
 
@@ -1271,7 +1287,7 @@ test_expect_success '6a-check: Tricky rename/delete' '
 #         but B did that rename and still decided to put the file into z/,
 #         so we probably shouldn't apply directory rename detection for it.
 
-test_expect_success '6b-setup: Same rename done on both sides' '
+test_setup_6b () {
 	test_create_repo 6b &&
 	(
 		cd 6b &&
@@ -1300,9 +1316,10 @@ test_expect_success '6b-setup: Same rename done on both sides' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6b-check: Same rename done on both sides' '
+test_expect_success '6b: Same rename done on both sides' '
+	test_setup_6b &&
 	(
 		cd 6b &&
 
@@ -1334,7 +1351,7 @@ test_expect_success '6b-check: Same rename done on both sides' '
 #   NOTE: Seems obvious, but just checking that the implementation doesn't
 #         "accidentally detect a rename" and give us y/{b,c,d}.
 
-test_expect_success '6c-setup: Rename only done on same side' '
+test_setup_6c () {
 	test_create_repo 6c &&
 	(
 		cd 6c &&
@@ -1362,9 +1379,10 @@ test_expect_success '6c-setup: Rename only done on same side' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6c-check: Rename only done on same side' '
+test_expect_success '6c: Rename only done on same side' '
+	test_setup_6c &&
 	(
 		cd 6c &&
 
@@ -1396,7 +1414,7 @@ test_expect_success '6c-check: Rename only done on same side' '
 #   NOTE: Again, this seems obvious but just checking that the implementation
 #         doesn't "accidentally detect a rename" and give us y/{b,c,d}.
 
-test_expect_success '6d-setup: We do not always want transitive renaming' '
+test_setup_6d () {
 	test_create_repo 6d &&
 	(
 		cd 6d &&
@@ -1424,9 +1442,10 @@ test_expect_success '6d-setup: We do not always want transitive renaming' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6d-check: We do not always want transitive renaming' '
+test_expect_success '6d: We do not always want transitive renaming' '
+	test_setup_6d &&
 	(
 		cd 6d &&
 
@@ -1458,7 +1477,7 @@ test_expect_success '6d-check: We do not always want transitive renaming' '
 #         doesn't "accidentally detect a rename" and give us y/{b,c} +
 #         add/add conflict on y/d_1 vs y/d_2.
 
-test_expect_success '6e-setup: Add/add from one side' '
+test_setup_6e () {
 	test_create_repo 6e &&
 	(
 		cd 6e &&
@@ -1487,9 +1506,10 @@ test_expect_success '6e-setup: Add/add from one side' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6e-check: Add/add from one side' '
+test_expect_success '6e: Add/add from one side' '
+	test_setup_6e &&
 	(
 		cd 6e &&
 
@@ -1552,7 +1572,7 @@ test_expect_success '6e-check: Add/add from one side' '
 #   Expected: y/d, CONFLICT(rename/rename for both z/b and z/c)
 #   NOTE: There's a rename of z/ here, y/ has more renames, so z/d -> y/d.
 
-test_expect_success '7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' '
+test_setup_7a () {
 	test_create_repo 7a &&
 	(
 		cd 7a &&
@@ -1583,9 +1603,10 @@ test_expect_success '7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' '
+test_expect_success '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' '
+	test_setup_7a &&
 	(
 		cd 7a &&
 
@@ -1623,7 +1644,7 @@ test_expect_success '7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS
 #   Commit B: z/{b,c,d_1},        w/d_2
 #   Expected: y/{b,c}, CONFLICT(rename/rename(2to1): x/d_1, w/d_2 -> y_d)
 
-test_expect_success '7b-setup: rename/rename(2to1), but only due to transitive rename' '
+test_setup_7b () {
 	test_create_repo 7b &&
 	(
 		cd 7b &&
@@ -1655,9 +1676,10 @@ test_expect_success '7b-setup: rename/rename(2to1), but only due to transitive r
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7b-check: rename/rename(2to1), but only due to transitive rename' '
+test_expect_success '7b: rename/rename(2to1), but only due to transitive rename' '
+	test_setup_7b &&
 	(
 		cd 7b &&
 
@@ -1702,7 +1724,7 @@ test_expect_success '7b-check: rename/rename(2to1), but only due to transitive r
 #         neither CONFLICT(x/d -> w/d vs. z/d)
 #         nor CONFLiCT x/d -> w/d vs. y/d vs. z/d)
 
-test_expect_success '7c-setup: rename/rename(1to...2or3); transitive rename may add complexity' '
+test_setup_7c () {
 	test_create_repo 7c &&
 	(
 		cd 7c &&
@@ -1732,9 +1754,10 @@ test_expect_success '7c-setup: rename/rename(1to...2or3); transitive rename may
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7c-check: rename/rename(1to...2or3); transitive rename may add complexity' '
+test_expect_success '7c: rename/rename(1to...2or3); transitive rename may add complexity' '
+	test_setup_7c &&
 	(
 		cd 7c &&
 
@@ -1766,7 +1789,7 @@ test_expect_success '7c-check: rename/rename(1to...2or3); transitive rename may
 #   Expected: y/{b,c}, CONFLICT(delete x/d vs rename to y/d)
 #   NOTE: z->y so NOT CONFLICT(delete x/d vs rename to z/d)
 
-test_expect_success '7d-setup: transitive rename involved in rename/delete; how is it reported?' '
+test_setup_7d () {
 	test_create_repo 7d &&
 	(
 		cd 7d &&
@@ -1796,9 +1819,10 @@ test_expect_success '7d-setup: transitive rename involved in rename/delete; how
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7d-check: transitive rename involved in rename/delete; how is it reported?' '
+test_expect_success '7d: transitive rename involved in rename/delete; how is it reported?' '
+	test_setup_7d &&
 	(
 		cd 7d &&
 
@@ -1851,7 +1875,7 @@ test_expect_success '7d-check: transitive rename involved in rename/delete; how
 #         see testcases 9c and 9d for further discussion of this issue and
 #         how it's resolved.
 
-test_expect_success '7e-setup: transitive rename in rename/delete AND dirs in the way' '
+test_setup_7e () {
 	test_create_repo 7e &&
 	(
 		cd 7e &&
@@ -1886,9 +1910,10 @@ test_expect_success '7e-setup: transitive rename in rename/delete AND dirs in th
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7e-check: transitive rename in rename/delete AND dirs in the way' '
+test_expect_success '7e: transitive rename in rename/delete AND dirs in the way' '
+	test_setup_7e &&
 	(
 		cd 7e &&
 
@@ -1945,7 +1970,7 @@ test_expect_success '7e-check: transitive rename in rename/delete AND dirs in th
 # simple rule from section 5 prevents me from handling this as optimally as
 # we potentially could.
 
-test_expect_success '8a-setup: Dual-directory rename, one into the others way' '
+test_setup_8a () {
 	test_create_repo 8a &&
 	(
 		cd 8a &&
@@ -1977,9 +2002,10 @@ test_expect_success '8a-setup: Dual-directory rename, one into the others way' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8a-check: Dual-directory rename, one into the others way' '
+test_expect_success '8a: Dual-directory rename, one into the others way' '
+	test_setup_8a &&
 	(
 		cd 8a &&
 
@@ -2023,7 +2049,7 @@ test_expect_success '8a-check: Dual-directory rename, one into the others way' '
 # making us fall back to pre-directory-rename-detection behavior for both
 # e_1 and e_2.
 
-test_expect_success '8b-setup: Dual-directory rename, one into the others way, with conflicting filenames' '
+test_setup_8b () {
 	test_create_repo 8b &&
 	(
 		cd 8b &&
@@ -2055,9 +2081,10 @@ test_expect_success '8b-setup: Dual-directory rename, one into the others way, w
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8b-check: Dual-directory rename, one into the others way, with conflicting filenames' '
+test_expect_success '8b: Dual-directory rename, one into the others way, with conflicting filenames' '
+	test_setup_8b &&
 	(
 		cd 8b &&
 
@@ -2089,14 +2116,14 @@ test_expect_success '8b-check: Dual-directory rename, one into the others way, w
 #
 #   Note: It could easily be argued that the correct resolution here is
 #         y/{b,c,e}, CONFLICT(rename/delete: z/d -> y/d vs deleted)
-#         and that the modifed version of d should be present in y/ after
+#         and that the modified version of d should be present in y/ after
 #         the merge, just marked as conflicted.  Indeed, I previously did
 #         argue that.  But applying directory renames to the side of
 #         history where a file is merely modified results in spurious
 #         rename/rename(1to2) conflicts -- see testcase 9h.  See also
 #         notes in 8d.
 
-test_expect_success '8c-setup: modify/delete or rename+modify/delete?' '
+test_setup_8c () {
 	test_create_repo 8c &&
 	(
 		cd 8c &&
@@ -2127,9 +2154,10 @@ test_expect_success '8c-setup: modify/delete or rename+modify/delete?' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8c-check: modify/delete or rename+modify/delete' '
+test_expect_success '8c: modify/delete or rename+modify/delete' '
+	test_setup_8c &&
 	(
 		cd 8c &&
 
@@ -2175,7 +2203,7 @@ test_expect_success '8c-check: modify/delete or rename+modify/delete' '
 #   during merging are supposed to be about opposite sides doing things
 #   differently.
 
-test_expect_success '8d-setup: rename/delete...or not?' '
+test_setup_8d () {
 	test_create_repo 8d &&
 	(
 		cd 8d &&
@@ -2204,9 +2232,10 @@ test_expect_success '8d-setup: rename/delete...or not?' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8d-check: rename/delete...or not?' '
+test_expect_success '8d: rename/delete...or not?' '
+	test_setup_8d &&
 	(
 		cd 8d &&
 
@@ -2250,7 +2279,7 @@ test_expect_success '8d-check: rename/delete...or not?' '
 #        about the ramifications of doing that, I didn't know how to rule out
 #        that opening other weird edge and corner cases so I just punted.
 
-test_expect_success '8e-setup: Both sides rename, one side adds to original directory' '
+test_setup_8e () {
 	test_create_repo 8e &&
 	(
 		cd 8e &&
@@ -2279,9 +2308,10 @@ test_expect_success '8e-setup: Both sides rename, one side adds to original dire
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8e-check: Both sides rename, one side adds to original directory' '
+test_expect_success '8e: Both sides rename, one side adds to original directory' '
+	test_setup_8e &&
 	(
 		cd 8e &&
 
@@ -2333,7 +2363,7 @@ test_expect_success '8e-check: Both sides rename, one side adds to original dire
 #         of which one had the most paths going to it.  A naive implementation
 #         of that could take the new file in commit B at z/i to x/w/i or x/i.
 
-test_expect_success '9a-setup: Inner renamed directory within outer renamed directory' '
+test_setup_9a () {
 	test_create_repo 9a &&
 	(
 		cd 9a &&
@@ -2366,9 +2396,10 @@ test_expect_success '9a-setup: Inner renamed directory within outer renamed dire
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9a-check: Inner renamed directory within outer renamed directory' '
+test_expect_success '9a: Inner renamed directory within outer renamed directory' '
+	test_setup_9a &&
 	(
 		cd 9a &&
 
@@ -2404,7 +2435,7 @@ test_expect_success '9a-check: Inner renamed directory within outer renamed dire
 #   Commit B: z/{b,c,d_3}
 #   Expected: y/{b,c,d_merged}
 
-test_expect_success '9b-setup: Transitive rename with content merge' '
+test_setup_9b () {
 	test_create_repo 9b &&
 	(
 		cd 9b &&
@@ -2436,9 +2467,10 @@ test_expect_success '9b-setup: Transitive rename with content merge' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9b-check: Transitive rename with content merge' '
+test_expect_success '9b: Transitive rename with content merge' '
+	test_setup_9b &&
 	(
 		cd 9b &&
 
@@ -2491,7 +2523,7 @@ test_expect_success '9b-check: Transitive rename with content merge' '
 #         away, then ignore that particular rename from the other side of
 #         history for any implicit directory renames.
 
-test_expect_success '9c-setup: Doubly transitive rename?' '
+test_setup_9c () {
 	test_create_repo 9c &&
 	(
 		cd 9c &&
@@ -2526,9 +2558,10 @@ test_expect_success '9c-setup: Doubly transitive rename?' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9c-check: Doubly transitive rename?' '
+test_expect_success '9c: Doubly transitive rename?' '
+	test_setup_9c &&
 	(
 		cd 9c &&
 
@@ -2579,7 +2612,7 @@ test_expect_success '9c-check: Doubly transitive rename?' '
 #   simple rules that are consistent with what we need for all the other
 #   testcases and simplifies things for the user.
 
-test_expect_success '9d-setup: N-way transitive rename?' '
+test_setup_9d () {
 	test_create_repo 9d &&
 	(
 		cd 9d &&
@@ -2614,9 +2647,10 @@ test_expect_success '9d-setup: N-way transitive rename?' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9d-check: N-way transitive rename?' '
+test_expect_success '9d: N-way transitive rename?' '
+	test_setup_9d &&
 	(
 		cd 9d &&
 
@@ -2653,7 +2687,7 @@ test_expect_success '9d-check: N-way transitive rename?' '
 #   Expected: combined/{a,b,c,d,e,f,g,h,i,j,k,l}, CONFLICT(Nto1) warnings,
 #             dir1/yo, dir2/yo, dir3/yo, dirN/yo
 
-test_expect_success '9e-setup: N-to-1 whammo' '
+test_setup_9e () {
 	test_create_repo 9e &&
 	(
 		cd 9e &&
@@ -2696,9 +2730,10 @@ test_expect_success '9e-setup: N-to-1 whammo' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success C_LOCALE_OUTPUT '9e-check: N-to-1 whammo' '
+test_expect_success C_LOCALE_OUTPUT '9e: N-to-1 whammo' '
+	test_setup_9e &&
 	(
 		cd 9e &&
 
@@ -2745,7 +2780,7 @@ test_expect_success C_LOCALE_OUTPUT '9e-check: N-to-1 whammo' '
 #   Commit B: goal/{a,b}/$more_files, goal/c
 #   Expected: priority/{a,b}/$more_files, priority/c
 
-test_expect_success '9f-setup: Renamed directory that only contained immediate subdirs' '
+test_setup_9f () {
 	test_create_repo 9f &&
 	(
 		cd 9f &&
@@ -2774,9 +2809,10 @@ test_expect_success '9f-setup: Renamed directory that only contained immediate s
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9f-check: Renamed directory that only contained immediate subdirs' '
+test_expect_success '9f: Renamed directory that only contained immediate subdirs' '
+	test_setup_9f &&
 	(
 		cd 9f &&
 
@@ -2809,7 +2845,7 @@ test_expect_success '9f-check: Renamed directory that only contained immediate s
 #   Commit B: goal/{a,b}/$more_files, goal/c
 #   Expected: priority/{alpha,bravo}/$more_files, priority/c
 
-test_expect_success '9g-setup: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
+test_setup_9g () {
 	test_create_repo 9g &&
 	(
 		cd 9g &&
@@ -2841,9 +2877,9 @@ test_expect_success '9g-setup: Renamed directory that only contained immediate s
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_failure '9g-check: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
+test_expect_failure '9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
 	(
 		cd 9g &&
 
@@ -2877,7 +2913,7 @@ test_expect_failure '9g-check: Renamed directory that only contained immediate s
 #   Expected: y/{b,c}, x/d_2
 #   NOTE: If we applied the z/ -> y/ rename to z/d, then we'd end up with
 #         a rename/rename(1to2) conflict (z/d -> y/d vs. x/d)
-test_expect_success '9h-setup: Avoid dir rename on merely modified path' '
+test_setup_9h () {
 	test_create_repo 9h &&
 	(
 		cd 9h &&
@@ -2910,9 +2946,10 @@ test_expect_success '9h-setup: Avoid dir rename on merely modified path' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9h-check: Avoid dir rename on merely modified path' '
+test_expect_success '9h: Avoid dir rename on merely modified path' '
+	test_setup_9h &&
 	(
 		cd 9h &&
 
@@ -2957,7 +2994,7 @@ test_expect_success '9h-check: Avoid dir rename on merely modified path' '
 #   Expected: Aborted Merge +
 #       ERROR_MSG(untracked working tree files would be overwritten by merge)
 
-test_expect_success '10a-setup: Overwrite untracked with normal rename/delete' '
+test_setup_10a () {
 	test_create_repo 10a &&
 	(
 		cd 10a &&
@@ -2983,9 +3020,10 @@ test_expect_success '10a-setup: Overwrite untracked with normal rename/delete' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '10a-check: Overwrite untracked with normal rename/delete' '
+test_expect_success '10a: Overwrite untracked with normal rename/delete' '
+	test_setup_10a &&
 	(
 		cd 10a &&
 
@@ -3021,7 +3059,7 @@ test_expect_success '10a-check: Overwrite untracked with normal rename/delete' '
 #             z/c_1 -> z/d_1 rename recorded at stage 3 for y/d +
 #       ERROR_MSG(refusing to lose untracked file at 'y/d')
 
-test_expect_success '10b-setup: Overwrite untracked with dir rename + delete' '
+test_setup_10b () {
 	test_create_repo 10b &&
 	(
 		cd 10b &&
@@ -3050,9 +3088,10 @@ test_expect_success '10b-setup: Overwrite untracked with dir rename + delete' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '10b-check: Overwrite untracked with dir rename + delete' '
+test_expect_success '10b: Overwrite untracked with dir rename + delete' '
+	test_setup_10b &&
 	(
 		cd 10b &&
 
@@ -3098,10 +3137,10 @@ test_expect_success '10b-check: Overwrite untracked with dir rename + delete' '
 #             y/c~B^0 +
 #             ERROR_MSG(Refusing to lose untracked file at y/c)
 
-test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2)' '
-	test_create_repo 10c &&
+test_setup_10c () {
+	test_create_repo 10c_$1 &&
 	(
-		cd 10c &&
+		cd 10c_$1 &&
 
 		mkdir z x &&
 		echo a >z/a &&
@@ -3128,11 +3167,12 @@ test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2)
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)' '
+test_expect_success '10c1: Overwrite untracked with dir rename/rename(1to2)' '
+	test_setup_10c 1 &&
 	(
-		cd 10c &&
+		cd 10c_1 &&
 
 		git checkout A^0 &&
 		echo important >y/c &&
@@ -3163,9 +3203,10 @@ test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)
 	)
 '
 
-test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2), other direction' '
+test_expect_success '10c2: Overwrite untracked with dir rename/rename(1to2), other direction' '
+	test_setup_10c 2 &&
 	(
-		cd 10c &&
+		cd 10c_2 &&
 
 		git reset --hard &&
 		git clean -fdqx &&
@@ -3208,7 +3249,7 @@ test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)
 #             CONFLICT(rename/rename) z/c_1 vs x/f_2 -> y/wham
 #             ERROR_MSG(Refusing to lose untracked file at y/wham)
 
-test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' '
+test_setup_10d () {
 	test_create_repo 10d &&
 	(
 		cd 10d &&
@@ -3240,9 +3281,10 @@ test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' '
+test_expect_success '10d: Delete untracked with dir rename/rename(2to1)' '
+	test_setup_10d &&
 	(
 		cd 10d &&
 
@@ -3290,7 +3332,7 @@ test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' '
 #   Commit B: z/{a,b,c}
 #   Expected: y/{a,b,c} + untracked z/c
 
-test_expect_success '10e-setup: Does git complain about untracked file that is not really in the way?' '
+test_setup_10e () {
 	test_create_repo 10e &&
 	(
 		cd 10e &&
@@ -3317,9 +3359,9 @@ test_expect_success '10e-setup: Does git complain about untracked file that is n
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_failure '10e-check: Does git complain about untracked file that is not really in the way?' '
+test_expect_failure '10e: Does git complain about untracked file that is not really in the way?' '
 	(
 		cd 10e &&
 
@@ -3371,7 +3413,7 @@ test_expect_failure '10e-check: Does git complain about untracked file that is n
 #             z/c~HEAD with contents of B:z/b_v2,
 #             z/c with uncommitted mods on top of A:z/c_v1
 
-test_expect_success '11a-setup: Avoid losing dirty contents with simple rename' '
+test_setup_11a () {
 	test_create_repo 11a &&
 	(
 		cd 11a &&
@@ -3398,9 +3440,10 @@ test_expect_success '11a-setup: Avoid losing dirty contents with simple rename'
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11a-check: Avoid losing dirty contents with simple rename' '
+test_expect_success '11a: Avoid losing dirty contents with simple rename' '
+	test_setup_11a &&
 	(
 		cd 11a &&
 
@@ -3441,7 +3484,7 @@ test_expect_success '11a-check: Avoid losing dirty contents with simple rename'
 #             ERROR_MSG(Refusing to lose dirty file at z/c)
 
 
-test_expect_success '11b-setup: Avoid losing dirty file involved in directory rename' '
+test_setup_11b () {
 	test_create_repo 11b &&
 	(
 		cd 11b &&
@@ -3470,9 +3513,10 @@ test_expect_success '11b-setup: Avoid losing dirty file involved in directory re
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11b-check: Avoid losing dirty file involved in directory rename' '
+test_expect_success '11b: Avoid losing dirty file involved in directory rename' '
+	test_setup_11b &&
 	(
 		cd 11b &&
 
@@ -3515,7 +3559,7 @@ test_expect_success '11b-check: Avoid losing dirty file involved in directory re
 #   Expected: Abort_msg("following files would be overwritten by merge") +
 #             y/c left untouched (still has uncommitted mods)
 
-test_expect_success '11c-setup: Avoid losing not-uptodate with rename + D/F conflict' '
+test_setup_11c () {
 	test_create_repo 11c &&
 	(
 		cd 11c &&
@@ -3545,9 +3589,10 @@ test_expect_success '11c-setup: Avoid losing not-uptodate with rename + D/F conf
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11c-check: Avoid losing not-uptodate with rename + D/F conflict' '
+test_expect_success '11c: Avoid losing not-uptodate with rename + D/F conflict' '
+	test_setup_11c &&
 	(
 		cd 11c &&
 
@@ -3581,7 +3626,7 @@ test_expect_success '11c-check: Avoid losing not-uptodate with rename + D/F conf
 #             Warning_Msg("Refusing to lose dirty file at z/c) +
 #             y/{a,c~HEAD,c/d}, x/b, now-untracked z/c_v1 with uncommitted mods
 
-test_expect_success '11d-setup: Avoid losing not-uptodate with rename + D/F conflict' '
+test_setup_11d () {
 	test_create_repo 11d &&
 	(
 		cd 11d &&
@@ -3612,9 +3657,10 @@ test_expect_success '11d-setup: Avoid losing not-uptodate with rename + D/F conf
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conflict' '
+test_expect_success '11d: Avoid losing not-uptodate with rename + D/F conflict' '
+	test_setup_11d &&
 	(
 		cd 11d &&
 
@@ -3659,7 +3705,7 @@ test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conf
 #             y/c~HEAD has A:y/c_2 contents
 #             y/c has dirty file from before merge
 
-test_expect_success '11e-setup: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
+test_setup_11e () {
 	test_create_repo 11e &&
 	(
 		cd 11e &&
@@ -3691,9 +3737,10 @@ test_expect_success '11e-setup: Avoid deleting not-uptodate with dir rename/rena
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
+test_expect_success '11e: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
+	test_setup_11e &&
 	(
 		cd 11e &&
 
@@ -3744,7 +3791,7 @@ test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rena
 #             CONFLICT(rename/rename) x/c vs x/d -> y/wham
 #             ERROR_MSG(Refusing to lose dirty file at y/wham)
 
-test_expect_success '11f-setup: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
+test_setup_11f () {
 	test_create_repo 11f &&
 	(
 		cd 11f &&
@@ -3773,9 +3820,10 @@ test_expect_success '11f-setup: Avoid deleting not-uptodate with dir rename/rena
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
+test_expect_success '11f: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
+	test_setup_11f &&
 	(
 		cd 11f &&
 
@@ -3832,7 +3880,7 @@ test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rena
 #   Commit B: node1/{leaf1,leaf2,leaf5}, node2/{leaf3,leaf4,leaf6}
 #   Expected: node1/{leaf1,leaf2,leaf5,node2/{leaf3,leaf4,leaf6}}
 
-test_expect_success '12a-setup: Moving one directory hierarchy into another' '
+test_setup_12a () {
 	test_create_repo 12a &&
 	(
 		cd 12a &&
@@ -3862,9 +3910,10 @@ test_expect_success '12a-setup: Moving one directory hierarchy into another' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '12a-check: Moving one directory hierarchy into another' '
+test_expect_success '12a: Moving one directory hierarchy into another' '
+	test_setup_12a &&
 	(
 		cd 12a &&
 
@@ -3910,7 +3959,7 @@ test_expect_success '12a-check: Moving one directory hierarchy into another' '
 #         To which, I can do no more than shrug my shoulders and say that
 #         even simple rules give weird results when given weird inputs.
 
-test_expect_success '12b-setup: Moving two directory hierarchies into each other' '
+test_setup_12b () {
 	test_create_repo 12b &&
 	(
 		cd 12b &&
@@ -3938,9 +3987,10 @@ test_expect_success '12b-setup: Moving two directory hierarchies into each other
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '12b-check: Moving two directory hierarchies into each other' '
+test_expect_success '12b: Moving two directory hierarchies into each other' '
+	test_setup_12b &&
 	(
 		cd 12b &&
 
@@ -3976,7 +4026,7 @@ test_expect_success '12b-check: Moving two directory hierarchies into each other
 #   NOTE: This is *exactly* like 12c, except that every path is modified on
 #         each side of the merge.
 
-test_expect_success '12c-setup: Moving one directory hierarchy into another w/ content merge' '
+test_setup_12c () {
 	test_create_repo 12c &&
 	(
 		cd 12c &&
@@ -4008,9 +4058,10 @@ test_expect_success '12c-setup: Moving one directory hierarchy into another w/ c
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '12c-check: Moving one directory hierarchy into another w/ content merge' '
+test_expect_success '12c: Moving one directory hierarchy into another w/ content merge' '
+	test_setup_12c &&
 	(
 		cd 12c &&
 
@@ -4051,6 +4102,122 @@ test_expect_success '12c-check: Moving one directory hierarchy into another w/ c
 	)
 '
 
+# Testcase 12d, Rename/merge of subdirectory into the root
+#   Commit O: a/b/subdir/foo
+#   Commit A: subdir/foo
+#   Commit B: a/b/subdir/foo, a/b/bar
+#   Expected: subdir/foo, bar
+
+test_setup_12d () {
+	test_create_repo 12d &&
+	(
+		cd 12d &&
+
+		mkdir -p a/b/subdir &&
+		test_commit a/b/subdir/foo &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir subdir &&
+		git mv a/b/subdir/foo.t subdir/foo.t &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_commit a/b/bar
+	)
+}
+
+test_expect_success '12d: Rename/merge subdir into the root, variant 1' '
+	test_setup_12d &&
+	(
+		cd 12d &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			HEAD:subdir/foo.t   HEAD:bar.t &&
+		git rev-parse >expect \
+			O:a/b/subdir/foo.t  B:a/b/bar.t &&
+		test_cmp expect actual &&
+
+		git hash-object bar.t >actual &&
+		git rev-parse B:a/b/bar.t >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:a/b/subdir/foo.t &&
+		test_must_fail git rev-parse HEAD:a/b/bar.t &&
+		test_path_is_missing a/ &&
+		test_path_is_file bar.t
+	)
+'
+
+# Testcase 12e, Rename/merge of subdirectory into the root
+#   Commit O: a/b/foo
+#   Commit A: foo
+#   Commit B: a/b/foo, a/b/bar
+#   Expected: foo, bar
+
+test_setup_12e () {
+	test_create_repo 12e &&
+	(
+		cd 12e &&
+
+		mkdir -p a/b &&
+		test_commit a/b/foo &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir subdir &&
+		git mv a/b/foo.t foo.t &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_commit a/b/bar
+	)
+}
+
+test_expect_success '12e: Rename/merge subdir into the root, variant 2' '
+	test_setup_12e &&
+	(
+		cd 12e &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			HEAD:foo.t   HEAD:bar.t &&
+		git rev-parse >expect \
+			O:a/b/foo.t  B:a/b/bar.t &&
+		test_cmp expect actual &&
+
+		git hash-object bar.t >actual &&
+		git rev-parse B:a/b/bar.t >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:a/b/foo.t &&
+		test_must_fail git rev-parse HEAD:a/b/bar.t &&
+		test_path_is_missing a/ &&
+		test_path_is_file bar.t
+	)
+'
+
 ###########################################################################
 # SECTION 13: Checking informational and conflict messages
 #
@@ -4068,10 +4235,10 @@ test_expect_success '12c-check: Moving one directory hierarchy into another w/ c
 #   Commit B: z/{b,c,d,e/f}
 #   Expected: y/{b,c,d,e/f}, with notices/conflicts for both y/d and y/e/f
 
-test_expect_success '13a-setup: messages for newly added files' '
-	test_create_repo 13a &&
+test_setup_13a () {
+	test_create_repo 13a_$1 &&
 	(
-		cd 13a &&
+		cd 13a_$1 &&
 
 		mkdir z &&
 		echo b >z/b &&
@@ -4097,11 +4264,12 @@ test_expect_success '13a-setup: messages for newly added files' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '13a-check(conflict): messages for newly added files' '
+test_expect_success '13a(conflict): messages for newly added files' '
+	test_setup_13a conflict &&
 	(
-		cd 13a &&
+		cd 13a_conflict &&
 
 		git checkout A^0 &&
 
@@ -4121,9 +4289,10 @@ test_expect_success '13a-check(conflict): messages for newly added files' '
 	)
 '
 
-test_expect_success '13a-check(info): messages for newly added files' '
+test_expect_success '13a(info): messages for newly added files' '
+	test_setup_13a info &&
 	(
-		cd 13a &&
+		cd 13a_info &&
 
 		git reset --hard &&
 		git checkout A^0 &&
@@ -4153,10 +4322,10 @@ test_expect_success '13a-check(info): messages for newly added files' '
 #   Expected: y/{b,c,d_merged}, with two conflict messages for y/d,
 #             one about content, and one about file location
 
-test_expect_success '13b-setup: messages for transitive rename with conflicted content' '
-	test_create_repo 13b &&
+test_setup_13b () {
+	test_create_repo 13b_$1 &&
 	(
-		cd 13b &&
+		cd 13b_$1 &&
 
 		mkdir x &&
 		mkdir z &&
@@ -4185,11 +4354,12 @@ test_expect_success '13b-setup: messages for transitive rename with conflicted c
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '13b-check(conflict): messages for transitive rename with conflicted content' '
+test_expect_success '13b(conflict): messages for transitive rename with conflicted content' '
+	test_setup_13b conflict &&
 	(
-		cd 13b &&
+		cd 13b_conflict &&
 
 		git checkout A^0 &&
 
@@ -4207,9 +4377,10 @@ test_expect_success '13b-check(conflict): messages for transitive rename with co
 	)
 '
 
-test_expect_success '13b-check(info): messages for transitive rename with conflicted content' '
+test_expect_success '13b(info): messages for transitive rename with conflicted content' '
+	test_setup_13b info &&
 	(
-		cd 13b &&
+		cd 13b_info &&
 
 		git reset --hard &&
 		git checkout A^0 &&
@@ -4238,10 +4409,10 @@ test_expect_success '13b-check(info): messages for transitive rename with confli
 #             d and B had full knowledge, but that's a slippery slope as
 #             shown in testcase 13d.
 
-test_expect_success '13c-setup: messages for rename/rename(1to1) via transitive rename' '
-	test_create_repo 13c &&
+test_setup_13c () {
+	test_create_repo 13c_$1 &&
 	(
-		cd 13c &&
+		cd 13c_$1 &&
 
 		mkdir x &&
 		mkdir z &&
@@ -4269,11 +4440,12 @@ test_expect_success '13c-setup: messages for rename/rename(1to1) via transitive
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '13c-check(conflict): messages for rename/rename(1to1) via transitive rename' '
+test_expect_success '13c(conflict): messages for rename/rename(1to1) via transitive rename' '
+	test_setup_13c conflict &&
 	(
-		cd 13c &&
+		cd 13c_conflict &&
 
 		git checkout A^0 &&
 
@@ -4290,9 +4462,10 @@ test_expect_success '13c-check(conflict): messages for rename/rename(1to1) via t
 	)
 '
 
-test_expect_success '13c-check(info): messages for rename/rename(1to1) via transitive rename' '
+test_expect_success '13c(info): messages for rename/rename(1to1) via transitive rename' '
+	test_setup_13c info &&
 	(
-		cd 13c &&
+		cd 13c_info &&
 
 		git reset --hard &&
 		git checkout A^0 &&
@@ -4324,10 +4497,10 @@ test_expect_success '13c-check(info): messages for rename/rename(1to1) via trans
 #               * B renames a/y to c/y, and A renames c/->d/ => a/y -> d/y
 #               No conflict in where a/y ends up, so put it in d/y.
 
-test_expect_success '13d-setup: messages for rename/rename(1to1) via dual transitive rename' '
-	test_create_repo 13d &&
+test_setup_13d () {
+	test_create_repo 13d_$1 &&
 	(
-		cd 13d &&
+		cd 13d_$1 &&
 
 		mkdir a &&
 		mkdir b &&
@@ -4356,11 +4529,12 @@ test_expect_success '13d-setup: messages for rename/rename(1to1) via dual transi
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '13d-check(conflict): messages for rename/rename(1to1) via dual transitive rename' '
+test_expect_success '13d(conflict): messages for rename/rename(1to1) via dual transitive rename' '
+	test_setup_13d conflict &&
 	(
-		cd 13d &&
+		cd 13d_conflict &&
 
 		git checkout A^0 &&
 
@@ -4380,9 +4554,10 @@ test_expect_success '13d-check(conflict): messages for rename/rename(1to1) via d
 	)
 '
 
-test_expect_success '13d-check(info): messages for rename/rename(1to1) via dual transitive rename' '
+test_expect_success '13d(info): messages for rename/rename(1to1) via dual transitive rename' '
+	test_setup_13d info &&
 	(
-		cd 13d &&
+		cd 13d_info &&
 
 		git reset --hard &&
 		git checkout A^0 &&
@@ -4448,7 +4623,7 @@ test_expect_success '13d-check(info): messages for rename/rename(1to1) via dual
 #          in the outer merge for this special kind of setup, but it at
 #          least avoids hitting a BUG().
 #
-test_expect_success '13e-setup: directory rename detection in recursive case' '
+test_setup_13e () {
 	test_create_repo 13e &&
 	(
 		cd 13e &&
@@ -4493,9 +4668,10 @@ test_expect_success '13e-setup: directory rename detection in recursive case' '
 		test_tick &&
 		git commit -m "D"
 	)
-'
+}
 
-test_expect_success '13e-check: directory rename detection in recursive case' '
+test_expect_success '13e: directory rename detection in recursive case' '
+	test_setup_13e &&
 	(
 		cd 13e &&
 
diff --git a/third_party/git/t/t6046-merge-skip-unneeded-updates.sh b/third_party/git/t/t6046-merge-skip-unneeded-updates.sh
index 3a47623ed316..1ddc9e6626b8 100755
--- a/third_party/git/t/t6046-merge-skip-unneeded-updates.sh
+++ b/third_party/git/t/t6046-merge-skip-unneeded-updates.sh
@@ -36,10 +36,10 @@ test_description="merge cases"
 #   Commit B: b_3
 #   Expected: b_2
 
-test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' '
-	test_create_repo 1a &&
+test_setup_1a () {
+	test_create_repo 1a_$1 &&
 	(
-		cd 1a &&
+		cd 1a_$1 &&
 
 		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
 		git add b &&
@@ -62,26 +62,24 @@ test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1a-check-L: Modify(A)/Modify(B), change on B subset of A' '
-	test_when_finished "git -C 1a reset --hard" &&
-	test_when_finished "git -C 1a clean -fd" &&
+test_expect_success '1a-L: Modify(A)/Modify(B), change on B subset of A' '
+	test_setup_1a L &&
 	(
-		cd 1a &&
+		cd 1a_L &&
 
 		git checkout A^0 &&
 
-		test-tool chmtime =31337 b &&
-		test-tool chmtime -v +0 b >expected-mtime &&
+		test-tool chmtime --get -3600 b >old-mtime &&
 
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep "Skipped b" out &&
 		test_must_be_empty err &&
 
-		test-tool chmtime -v +0 b >actual-mtime &&
-		test_cmp expected-mtime actual-mtime &&
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
@@ -96,17 +94,20 @@ test_expect_success '1a-check-L: Modify(A)/Modify(B), change on B subset of A' '
 	)
 '
 
-test_expect_success '1a-check-R: Modify(A)/Modify(B), change on B subset of A' '
-	test_when_finished "git -C 1a reset --hard" &&
-	test_when_finished "git -C 1a clean -fd" &&
+test_expect_success '1a-R: Modify(A)/Modify(B), change on B subset of A' '
+	test_setup_1a R &&
 	(
-		cd 1a &&
+		cd 1a_R &&
 
 		git checkout B^0 &&
 
+		test-tool chmtime --get -3600 b >old-mtime &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep "Auto-merging b" out &&
+		# Make sure b WAS updated
+		test-tool chmtime --get b >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
 		test_must_be_empty err &&
 
 		git ls-files -s >index_files &&
@@ -133,10 +134,10 @@ test_expect_success '1a-check-R: Modify(A)/Modify(B), change on B subset of A' '
 #   Commit B: c_1
 #   Expected: c_2
 
-test_expect_success '2a-setup: Modify(A)/rename(B)' '
-	test_create_repo 2a &&
+test_setup_2a () {
+	test_create_repo 2a_$1 &&
 	(
-		cd 2a &&
+		cd 2a_$1 &&
 
 		test_seq 1 10 >b &&
 		git add b &&
@@ -158,20 +159,19 @@ test_expect_success '2a-setup: Modify(A)/rename(B)' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2a-check-L: Modify/rename, merge into modify side' '
-	test_when_finished "git -C 2a reset --hard" &&
-	test_when_finished "git -C 2a clean -fd" &&
+test_expect_success '2a-L: Modify/rename, merge into modify side' '
+	test_setup_2a L &&
 	(
-		cd 2a &&
+		cd 2a_L &&
 
 		git checkout A^0 &&
 
+		test_path_is_missing c &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped c" out &&
-		test_must_be_empty err &&
+		test_path_is_file c &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
@@ -189,17 +189,20 @@ test_expect_success '2a-check-L: Modify/rename, merge into modify side' '
 	)
 '
 
-test_expect_success '2a-check-R: Modify/rename, merge into rename side' '
-	test_when_finished "git -C 2a reset --hard" &&
-	test_when_finished "git -C 2a clean -fd" &&
+test_expect_success '2a-R: Modify/rename, merge into rename side' '
+	test_setup_2a R &&
 	(
-		cd 2a &&
+		cd 2a_R &&
 
 		git checkout B^0 &&
 
+		test-tool chmtime --get -3600 c >old-mtime &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped c" out &&
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
 		test_must_be_empty err &&
 
 		git ls-files -s >index_files &&
@@ -224,10 +227,10 @@ test_expect_success '2a-check-R: Modify/rename, merge into rename side' '
 #   Commit B: b_3
 #   Expected: c_2
 
-test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' '
-	test_create_repo 2b &&
+test_setup_2b () {
+	test_create_repo 2b_$1 &&
 	(
-		cd 2b &&
+		cd 2b_$1 &&
 
 		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
 		git add b &&
@@ -251,26 +254,23 @@ test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2b-check-L: Rename+Mod(A)/Mod(B), B mods subset of A' '
-	test_when_finished "git -C 2b reset --hard" &&
-	test_when_finished "git -C 2b clean -fd" &&
+test_expect_success '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A' '
+	test_setup_2b L &&
 	(
-		cd 2b &&
+		cd 2b_L &&
 
 		git checkout A^0 &&
 
-		test-tool chmtime =31337 c &&
-		test-tool chmtime -v +0 c >expected-mtime &&
-
+		test-tool chmtime --get -3600 c >old-mtime &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep "Skipped c" out &&
 		test_must_be_empty err &&
 
-		test-tool chmtime -v +0 c >actual-mtime &&
-		test_cmp expected-mtime actual-mtime &&
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
@@ -288,17 +288,19 @@ test_expect_success '2b-check-L: Rename+Mod(A)/Mod(B), B mods subset of A' '
 	)
 '
 
-test_expect_success '2b-check-R: Rename+Mod(A)/Mod(B), B mods subset of A' '
-	test_when_finished "git -C 2b reset --hard" &&
-	test_when_finished "git -C 2b clean -fd" &&
+test_expect_success '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A' '
+	test_setup_2b R &&
 	(
-		cd 2b &&
+		cd 2b_R &&
 
 		git checkout B^0 &&
 
+		test_path_is_missing c &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep "Auto-merging c" out &&
+		# Make sure c now present (and thus was updated)
+		test_path_is_file c &&
+
 		test_must_be_empty err &&
 
 		git ls-files -s >index_files &&
@@ -332,7 +334,7 @@ test_expect_success '2b-check-R: Rename+Mod(A)/Mod(B), B mods subset of A' '
 #         skip the update, then we're in trouble.  This test verifies we do
 #         not make that particular mistake.
 
-test_expect_success '2c-setup: Modify b & add c VS rename b->c' '
+test_setup_2c () {
 	test_create_repo 2c &&
 	(
 		cd 2c &&
@@ -358,21 +360,26 @@ test_expect_success '2c-setup: Modify b & add c VS rename b->c' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2c-check: Modify b & add c VS rename b->c' '
+test_expect_success '2c: Modify b & add c VS rename b->c' '
+	test_setup_2c &&
 	(
 		cd 2c &&
 
 		git checkout A^0 &&
 
+		test-tool chmtime --get -3600 c >old-mtime &&
 		GIT_MERGE_VERBOSITY=3 &&
 		export GIT_MERGE_VERBOSITY &&
 		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
 		test_i18ngrep "CONFLICT (rename/add): Rename b->c" out &&
-		test_i18ngrep ! "Skipped c" out &&
-		test_must_be_empty err
+		test_must_be_empty err &&
+
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime)
 
 		# FIXME: rename/add conflicts are horribly broken right now;
 		# when I get back to my patch series fixing it and
@@ -428,10 +435,10 @@ test_expect_success '2c-check: Modify b & add c VS rename b->c' '
 #   Commit B: bq_1, bar/whatever
 #   Expected: bar/{bq_2, whatever}
 
-test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_create_repo 3a &&
+test_setup_3a () {
+	test_create_repo 3a_$1 &&
 	(
-		cd 3a &&
+		cd 3a_$1 &&
 
 		mkdir foo &&
 		test_seq 1 10 >bq &&
@@ -456,21 +463,22 @@ test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_when_finished "git -C 3a reset --hard" &&
-	test_when_finished "git -C 3a clean -fd" &&
+test_expect_success '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+	test_setup_3a L &&
 	(
-		cd 3a &&
+		cd 3a_L &&
 
 		git checkout A^0 &&
 
+		test_path_is_missing bar/bq &&
 		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped bar/bq" out &&
 		test_must_be_empty err &&
 
+		test_path_is_file bar/bq &&
+
 		git ls-files -s >index_files &&
 		test_line_count = 2 index_files &&
 
@@ -487,19 +495,20 @@ test_expect_success '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 	)
 '
 
-test_expect_success '3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_when_finished "git -C 3a reset --hard" &&
-	test_when_finished "git -C 3a clean -fd" &&
+test_expect_success '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+	test_setup_3a R &&
 	(
-		cd 3a &&
+		cd 3a_R &&
 
 		git checkout B^0 &&
 
+		test_path_is_missing bar/bq &&
 		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped bar/bq" out &&
 		test_must_be_empty err &&
 
+		test_path_is_file bar/bq &&
+
 		git ls-files -s >index_files &&
 		test_line_count = 2 index_files &&
 
@@ -522,10 +531,10 @@ test_expect_success '3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 #   Commit B: bq_2, bar/whatever
 #   Expected: bar/{bq_2, whatever}
 
-test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_create_repo 3b &&
+test_setup_3b () {
+	test_create_repo 3b_$1 &&
 	(
-		cd 3b &&
+		cd 3b_$1 &&
 
 		mkdir foo &&
 		test_seq 1 10 >bq &&
@@ -550,21 +559,22 @@ test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_when_finished "git -C 3b reset --hard" &&
-	test_when_finished "git -C 3b clean -fd" &&
+test_expect_success '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+	test_setup_3b L &&
 	(
-		cd 3b &&
+		cd 3b_L &&
 
 		git checkout A^0 &&
 
+		test_path_is_missing bar/bq &&
 		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped bar/bq" out &&
 		test_must_be_empty err &&
 
+		test_path_is_file bar/bq &&
+
 		git ls-files -s >index_files &&
 		test_line_count = 2 index_files &&
 
@@ -581,19 +591,20 @@ test_expect_success '3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 	)
 '
 
-test_expect_success '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_when_finished "git -C 3b reset --hard" &&
-	test_when_finished "git -C 3b clean -fd" &&
+test_expect_success '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+	test_setup_3b R &&
 	(
-		cd 3b &&
+		cd 3b_R &&
 
 		git checkout B^0 &&
 
+		test_path_is_missing bar/bq &&
 		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped bar/bq" out &&
 		test_must_be_empty err &&
 
+		test_path_is_file bar/bq &&
+
 		git ls-files -s >index_files &&
 		test_line_count = 2 index_files &&
 
@@ -621,7 +632,7 @@ test_expect_success '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 #   Working copy: b_4
 #   Expected: b_2 for merge, b_4 in working copy
 
-test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods present' '
+test_setup_4a () {
 	test_create_repo 4a &&
 	(
 		cd 4a &&
@@ -647,7 +658,7 @@ test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
 # NOTE: For as long as we continue using unpack_trees() without index_only
 #   set to true, it will error out on a case like this claiming the the locally
@@ -655,25 +666,23 @@ test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods
 #   correct requires doing the merge in-memory first, then realizing that no
 #   updates to the file are necessary, and thus that we can just leave the path
 #   alone.
-test_expect_failure '4a-check: Change on A, change on B subset of A, dirty mods present' '
-	test_when_finished "git -C 4a reset --hard" &&
-	test_when_finished "git -C 4a clean -fd" &&
+test_expect_failure '4a: Change on A, change on B subset of A, dirty mods present' '
+	test_setup_4a &&
 	(
 		cd 4a &&
 
 		git checkout A^0 &&
 		echo "File rewritten" >b &&
 
-		test-tool chmtime =31337 b &&
-		test-tool chmtime -v +0 b >expected-mtime &&
+		test-tool chmtime --get -3600 b >old-mtime &&
 
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep "Skipped b" out &&
 		test_must_be_empty err &&
 
-		test-tool chmtime -v +0 b >actual-mtime &&
-		test_cmp expected-mtime actual-mtime &&
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
@@ -695,7 +704,7 @@ test_expect_failure '4a-check: Change on A, change on B subset of A, dirty mods
 #   Working copy: c_4
 #   Expected: c_2
 
-test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' '
+test_setup_4b () {
 	test_create_repo 4b &&
 	(
 		cd 4b &&
@@ -722,27 +731,25 @@ test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, di
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '4b-check: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' '
-	test_when_finished "git -C 4b reset --hard" &&
-	test_when_finished "git -C 4b clean -fd" &&
+test_expect_success '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' '
+	test_setup_4b &&
 	(
 		cd 4b &&
 
 		git checkout A^0 &&
 		echo "File rewritten" >c &&
 
-		test-tool chmtime =31337 c &&
-		test-tool chmtime -v +0 c >expected-mtime &&
+		test-tool chmtime --get -3600 c >old-mtime &&
 
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep "Skipped c" out &&
 		test_must_be_empty err &&
 
-		test-tool chmtime -v +0 c >actual-mtime &&
-		test_cmp expected-mtime actual-mtime &&
+		# Make sure c was NOT updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
diff --git a/third_party/git/t/t6047-diff3-conflict-markers.sh b/third_party/git/t/t6047-diff3-conflict-markers.sh
new file mode 100755
index 000000000000..f4655bb358ff
--- /dev/null
+++ b/third_party/git/t/t6047-diff3-conflict-markers.sh
@@ -0,0 +1,211 @@
+#!/bin/sh
+
+test_description='recursive merge diff3 style conflict markers'
+
+. ./test-lib.sh
+
+# Setup:
+#          L1
+#            \
+#             ?
+#            /
+#          R1
+#
+# Where:
+#   L1 and R1 both have a file named 'content' but have no common history
+#
+
+test_expect_success 'setup no merge base' '
+	test_create_repo no_merge_base &&
+	(
+		cd no_merge_base &&
+
+		git checkout -b L &&
+		test_commit A content A &&
+
+		git checkout --orphan R &&
+		test_commit B content B
+	)
+'
+
+test_expect_success 'check no merge base' '
+	(
+		cd no_merge_base &&
+
+		git checkout L^0 &&
+
+		test_must_fail git -c merge.conflictstyle=diff3 merge --allow-unrelated-histories -s recursive R^0 &&
+
+		grep "|||||| empty tree" content
+	)
+'
+
+# Setup:
+#          L1
+#         /  \
+#   master    ?
+#         \  /
+#          R1
+#
+# Where:
+#   L1 and R1 have modified the same file ('content') in conflicting ways
+#
+
+test_expect_success 'setup unique merge base' '
+	test_create_repo unique_merge_base &&
+	(
+		cd unique_merge_base &&
+
+		test_commit base content "1
+2
+3
+4
+5
+" &&
+
+		git branch L &&
+		git branch R &&
+
+		git checkout L &&
+		test_commit L content "1
+2
+3
+4
+5
+7" &&
+
+		git checkout R &&
+		git rm content &&
+		test_commit R renamed "1
+2
+3
+4
+5
+six"
+	)
+'
+
+test_expect_success 'check unique merge base' '
+	(
+		cd unique_merge_base &&
+
+		git checkout L^0 &&
+		MASTER=$(git rev-parse --short master) &&
+
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
+
+		grep "|||||| $MASTER:content" renamed
+	)
+'
+
+# Setup:
+#          L1---L2--L3
+#         /  \ /      \
+#   master    X1       ?
+#         \  / \      /
+#          R1---R2--R3
+#
+# Where:
+#   commits L1 and R1 have modified the same file in non-conflicting ways
+#   X1 is an auto-generated merge-base used when merging L1 and R1
+#   commits L2 and R2 are merges of R1 and L1 into L1 and R1, respectively
+#   commits L3 and R3 both modify 'content' in conflicting ways
+#
+
+test_expect_success 'setup multiple merge bases' '
+	test_create_repo multiple_merge_bases &&
+	(
+		cd multiple_merge_bases &&
+
+		test_commit initial content "1
+2
+3
+4
+5" &&
+
+		git branch L &&
+		git branch R &&
+
+		# Create L1
+		git checkout L &&
+		test_commit L1 content "0
+1
+2
+3
+4
+5" &&
+
+		# Create R1
+		git checkout R &&
+		test_commit R1 content "1
+2
+3
+4
+5
+6" &&
+
+		# Create L2
+		git checkout L &&
+		git merge R1 &&
+
+		# Create R2
+		git checkout R &&
+		git merge L1 &&
+
+		# Create L3
+		git checkout L &&
+		test_commit L3 content "0
+1
+2
+3
+4
+5
+A" &&
+
+		# Create R3
+		git checkout R &&
+		git rm content &&
+		test_commit R3 renamed "0
+2
+3
+4
+5
+six"
+	)
+'
+
+test_expect_success 'check multiple merge bases' '
+	(
+		cd multiple_merge_bases &&
+
+		git checkout L^0 &&
+
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
+
+		grep "|||||| merged common ancestors:content" renamed
+	)
+'
+
+test_expect_success 'rebase --merge describes parent of commit being picked' '
+	test_create_repo rebase &&
+	(
+		cd rebase &&
+		test_commit base file &&
+		test_commit master file &&
+		git checkout -b side HEAD^ &&
+		test_commit side file &&
+		test_must_fail git -c merge.conflictstyle=diff3 rebase --merge master &&
+		grep "||||||| parent of" file
+	)
+'
+
+test_expect_success 'rebase --apply describes fake ancestor base' '
+	(
+		cd rebase &&
+		git rebase --abort &&
+		test_must_fail git -c merge.conflictstyle=diff3 rebase --apply master &&
+		grep "||||||| constructed merge base" file
+	)
+'
+
+test_done
diff --git a/third_party/git/t/t6102-rev-list-unexpected-objects.sh b/third_party/git/t/t6102-rev-list-unexpected-objects.sh
index 28611c978e6c..52cde097dd5c 100755
--- a/third_party/git/t/t6102-rev-list-unexpected-objects.sh
+++ b/third_party/git/t/t6102-rev-list-unexpected-objects.sh
@@ -52,7 +52,7 @@ test_expect_success 'traverse unexpected non-commit parent (lone)' '
 '
 
 test_expect_success 'traverse unexpected non-commit parent (seen)' '
-	test_must_fail git rev-list --objects $commit $broken_commit \
+	test_must_fail git rev-list --objects $blob $broken_commit \
 		>output 2>&1 &&
 	test_i18ngrep "not a commit" output
 '
diff --git a/third_party/git/t/t6112-rev-list-filters-objects.sh b/third_party/git/t/t6112-rev-list-filters-objects.sh
index acd7f5ab80d9..de0e5a5d3646 100755
--- a/third_party/git/t/t6112-rev-list-filters-objects.sh
+++ b/third_party/git/t/t6112-rev-list-filters-objects.sh
@@ -278,7 +278,19 @@ test_expect_success 'verify skipping tree iteration when not collecting omits' '
 	test_line_count = 2 actual &&
 
 	# Make sure no other trees were considered besides the root.
-	! grep "Skipping contents of tree [^.]" filter_trace
+	! grep "Skipping contents of tree [^.]" filter_trace &&
+
+	# Try this again with "combine:". If both sub-filters are skipping
+	# trees, the composite filter should also skip trees. This is not
+	# important unless the user does combine:tree:X+tree:Y or another filter
+	# besides "tree:" is implemented in the future which can skip trees.
+	GIT_TRACE=1 git -C r3 rev-list \
+		--objects --filter=combine:tree:1+tree:3 HEAD 2>filter_trace &&
+
+	# Only skip the dir1/ tree, which is shared between the two commits.
+	grep "Skipping contents of tree " filter_trace >actual &&
+	test_write_lines "Skipping contents of tree dir1/..." >expected &&
+	test_cmp expected actual
 '
 
 # Test tree:# filters.
@@ -330,6 +342,148 @@ test_expect_success 'verify tree:3 includes everything expected' '
 	test_line_count = 10 actual
 '
 
+test_expect_success 'combine:... for a simple combination' '
+	git -C r3 rev-list --objects --filter=combine:tree:2+blob:none HEAD \
+		>actual &&
+
+	expect_has HEAD "" &&
+	expect_has HEAD~1 "" &&
+	expect_has HEAD dir1 &&
+
+	# There are also 2 commit objects
+	test_line_count = 5 actual &&
+
+	cp actual expected &&
+
+	# Try again using repeated --filter - this is equivalent to a manual
+	# combine with "combine:...+..."
+	git -C r3 rev-list --objects --filter=combine:tree:2 \
+		--filter=blob:none HEAD >actual &&
+
+	test_cmp expected actual
+'
+
+test_expect_success 'combine:... with URL encoding' '
+	git -C r3 rev-list --objects \
+		--filter=combine:tree%3a2+blob:%6Eon%65 HEAD >actual &&
+
+	expect_has HEAD "" &&
+	expect_has HEAD~1 "" &&
+	expect_has HEAD dir1 &&
+
+	# There are also 2 commit objects
+	test_line_count = 5 actual
+'
+
+expect_invalid_filter_spec () {
+	spec="$1" &&
+	err="$2" &&
+
+	test_must_fail git -C r3 rev-list --objects --filter="$spec" HEAD \
+		>actual 2>actual_stderr &&
+	test_must_be_empty actual &&
+	test_i18ngrep "$err" actual_stderr
+}
+
+test_expect_success 'combine:... while URL-encoding things that should not be' '
+	expect_invalid_filter_spec combine%3Atree:2+blob:none \
+		"invalid filter-spec"
+'
+
+test_expect_success 'combine: with nothing after the :' '
+	expect_invalid_filter_spec combine: "expected something after combine:"
+'
+
+test_expect_success 'parse error in first sub-filter in combine:' '
+	expect_invalid_filter_spec combine:tree:asdf+blob:none \
+		"expected .tree:<depth>."
+'
+
+test_expect_success 'combine:... with non-encoded reserved chars' '
+	expect_invalid_filter_spec combine:tree:2+sparse:@xyz \
+		"must escape char in sub-filter-spec: .@." &&
+	expect_invalid_filter_spec combine:tree:2+sparse:\` \
+		"must escape char in sub-filter-spec: .\`." &&
+	expect_invalid_filter_spec combine:tree:2+sparse:~abc \
+		"must escape char in sub-filter-spec: .\~."
+'
+
+test_expect_success 'validate err msg for "combine:<valid-filter>+"' '
+	expect_invalid_filter_spec combine:tree:2+ "expected .tree:<depth>."
+'
+
+test_expect_success 'combine:... with edge-case hex digits: Ff Aa 0 9' '
+	git -C r3 rev-list --objects --filter="combine:tree:2+bl%6Fb:n%6fne" \
+		HEAD >actual &&
+	test_line_count = 5 actual &&
+	git -C r3 rev-list --objects --filter="combine:tree%3A2+blob%3anone" \
+		HEAD >actual &&
+	test_line_count = 5 actual &&
+	git -C r3 rev-list --objects --filter="combine:tree:%30" HEAD >actual &&
+	test_line_count = 2 actual &&
+	git -C r3 rev-list --objects --filter="combine:tree:%39+blob:none" \
+		HEAD >actual &&
+	test_line_count = 5 actual
+'
+
+test_expect_success 'add sparse pattern blobs whose paths have reserved chars' '
+	cp r3/pattern r3/pattern1+renamed% &&
+	cp r3/pattern "r3/p;at%ter+n" &&
+	cp r3/pattern r3/^~pattern &&
+	git -C r3 add pattern1+renamed% "p;at%ter+n" ^~pattern &&
+	git -C r3 commit -m "add sparse pattern files with reserved chars"
+'
+
+test_expect_success 'combine:... with more than two sub-filters' '
+	git -C r3 rev-list --objects \
+		--filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern \
+		HEAD >actual &&
+
+	expect_has HEAD "" &&
+	expect_has HEAD~1 "" &&
+	expect_has HEAD~2 "" &&
+	expect_has HEAD dir1 &&
+	expect_has HEAD dir1/sparse1 &&
+	expect_has HEAD dir1/sparse2 &&
+
+	# Should also have 3 commits
+	test_line_count = 9 actual &&
+
+	# Try again, this time making sure the last sub-filter is only
+	# URL-decoded once.
+	cp actual expect &&
+
+	git -C r3 rev-list --objects \
+		--filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern1%2brenamed%25 \
+		HEAD >actual &&
+	test_cmp expect actual &&
+
+	# Use the same composite filter again, but with a pattern file name that
+	# requires encoding multiple characters, and use implicit filter
+	# combining.
+	test_when_finished "rm -f trace1" &&
+	GIT_TRACE=$(pwd)/trace1 git -C r3 rev-list --objects \
+		--filter=tree:3 --filter=blob:limit=40 \
+		--filter=sparse:oid="master:p;at%ter+n" \
+		HEAD >actual &&
+
+	test_cmp expect actual &&
+	grep "Add to combine filter-spec: sparse:oid=master:p%3bat%25ter%2bn" \
+		trace1 &&
+
+	# Repeat the above test, but this time, the characters to encode are in
+	# the LHS of the combined filter.
+	test_when_finished "rm -f trace2" &&
+	GIT_TRACE=$(pwd)/trace2 git -C r3 rev-list --objects \
+		--filter=sparse:oid=master:^~pattern \
+		--filter=tree:3 --filter=blob:limit=40 \
+		HEAD >actual &&
+
+	test_cmp expect actual &&
+	grep "Add to combine filter-spec: sparse:oid=master:%5e%7epattern" \
+		trace2
+'
+
 # Test provisional omit collection logic with a repo that has objects appearing
 # at multiple depths - first deeper than the filter's threshold, then shallow.
 
@@ -373,6 +527,37 @@ test_expect_success 'verify skipping tree iteration when collecting omits' '
 	test_cmp expect actual
 '
 
+test_expect_success 'setup r5' '
+	git init r5 &&
+	mkdir -p r5/subdir &&
+
+	echo 1     >r5/short-root          &&
+	echo 12345 >r5/long-root           &&
+	echo a     >r5/subdir/short-subdir &&
+	echo abcde >r5/subdir/long-subdir  &&
+
+	git -C r5 add short-root long-root subdir &&
+	git -C r5 commit -m "commit msg"
+'
+
+test_expect_success 'verify collecting omits in combined: filter' '
+	# Note that this test guards against the naive implementation of simply
+	# giving both filters the same "omits" set and expecting it to
+	# automatically merge them.
+	git -C r5 rev-list --objects --quiet --filter-print-omitted \
+		--filter=combine:tree:2+blob:limit=3 HEAD >actual &&
+
+	# Expect 0 trees/commits, 3 blobs omitted (all blobs except short-root)
+	omitted_1=$(echo 12345 | git hash-object --stdin) &&
+	omitted_2=$(echo a     | git hash-object --stdin) &&
+	omitted_3=$(echo abcde | git hash-object --stdin) &&
+
+	grep ~$omitted_1 actual &&
+	grep ~$omitted_2 actual &&
+	grep ~$omitted_3 actual &&
+	test_line_count = 3 actual
+'
+
 # Test tree:<depth> where a tree is iterated to twice - once where a subentry is
 # too deep to be included, and again where the blob inside it is shallow enough
 # to be included. This makes sure we don't use LOFR_MARK_SEEN incorrectly (we
@@ -441,11 +626,4 @@ test_expect_success 'expand blob limit in protocol' '
 	grep "blob:limit=1024" trace
 '
 
-test_expect_success 'expand tree depth limit in protocol' '
-	GIT_TRACE_PACKET="$(pwd)/tree_trace" git -c protocol.version=2 clone \
-		--filter=tree:0k "file://$(pwd)/r2" tree &&
-	! grep "tree:0k" tree_trace &&
-	grep "tree:0" tree_trace
-'
-
 test_done
diff --git a/third_party/git/t/t6113-rev-list-bitmap-filters.sh b/third_party/git/t/t6113-rev-list-bitmap-filters.sh
new file mode 100755
index 000000000000..145603f12457
--- /dev/null
+++ b/third_party/git/t/t6113-rev-list-bitmap-filters.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+test_description='rev-list combining bitmaps and filters'
+. ./test-lib.sh
+
+test_expect_success 'set up bitmapped repo' '
+	# one commit will have bitmaps, the other will not
+	test_commit one &&
+	test_commit much-larger-blob-one &&
+	git repack -adb &&
+	test_commit two &&
+	test_commit much-larger-blob-two
+'
+
+test_expect_success 'filters fallback to non-bitmap traversal' '
+	# use a path-based filter, since they are inherently incompatible with
+	# bitmaps (i.e., this test will never get confused by later code to
+	# combine the features)
+	filter=$(echo "!one" | git hash-object -w --stdin) &&
+	git rev-list --objects --filter=sparse:oid=$filter HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=sparse:oid=$filter HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'blob:none filter' '
+	git rev-list --objects --filter=blob:none HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:none HEAD >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'blob:none filter with specified blob' '
+	git rev-list --objects --filter=blob:none HEAD HEAD:two.t >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:none HEAD HEAD:two.t >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'blob:limit filter' '
+	git rev-list --objects --filter=blob:limit=5 HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:limit=5 HEAD >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'blob:limit filter with specified blob' '
+	git rev-list --objects --filter=blob:limit=5 \
+		     HEAD HEAD:much-larger-blob-two.t >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:limit=5 \
+		     HEAD HEAD:much-larger-blob-two.t >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_done
diff --git a/third_party/git/t/t6120-describe.sh b/third_party/git/t/t6120-describe.sh
index 2b883d817403..34502e3a5054 100755
--- a/third_party/git/t/t6120-describe.sh
+++ b/third_party/git/t/t6120-describe.sh
@@ -1,28 +1,27 @@
 #!/bin/sh
 
-test_description='test describe
+test_description='test describe'
+
+#  o---o-----o----o----o-------o----x
+#       \   D,R   e           /
+#        \---o-------------o-'
+#         \  B            /
+#          `-o----o----o-'
+#                 A    c
+#
+# First parent of a merge commit is on the same line, second parent below.
 
-                       B
-        .--------------o----o----o----x
-       /                   /    /
- o----o----o----o----o----.    /
-       \        A    c        /
-        .------------o---o---o
-                   D,R   e
-'
 . ./test-lib.sh
 
 check_describe () {
 	expect="$1"
 	shift
-	R=$(git describe "$@" 2>err.actual)
-	S=$?
-	cat err.actual >&3
-	test_expect_success "describe $*" '
-	test $S = 0 &&
+	describe_opts="$@"
+	test_expect_success "describe $describe_opts" '
+	R=$(git describe $describe_opts 2>err.actual) &&
 	case "$R" in
 	$expect)	echo happy ;;
-	*)	echo "Oops - $R is not $expect";
+	*)	echo "Oops - $R is not $expect" &&
 		false ;;
 	esac
 	'
@@ -382,7 +381,7 @@ test_expect_success 'describe tag object' '
 	test_i18ngrep "fatal: test-blob-1 is neither a commit nor blob" actual
 '
 
-test_expect_failure ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
+test_expect_success ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
 	i=1 &&
 	while test $i -lt 8000
 	do
@@ -424,4 +423,111 @@ test_expect_success 'describe complains about missing object' '
 	test_must_fail git describe $ZERO_OID
 '
 
+test_expect_success 'name-rev a rev shortly after epoch' '
+	test_when_finished "git checkout master" &&
+
+	git checkout --orphan no-timestamp-underflow &&
+	# Any date closer to epoch than the CUTOFF_DATE_SLOP constant
+	# in builtin/name-rev.c.
+	GIT_COMMITTER_DATE="@1234 +0000" \
+	git commit -m "committer date shortly after epoch" &&
+	old_commit_oid=$(git rev-parse HEAD) &&
+
+	echo "$old_commit_oid no-timestamp-underflow" >expect &&
+	git name-rev $old_commit_oid >actual &&
+	test_cmp expect actual
+'
+
+# A--------------master
+#  \            /
+#   \----------M2
+#    \        /
+#     \---M1-C
+#      \ /
+#       B
+test_expect_success 'name-rev covers all conditions while looking at parents' '
+	git init repo &&
+	(
+		cd repo &&
+
+		echo A >file &&
+		git add file &&
+		git commit -m A &&
+		A=$(git rev-parse HEAD) &&
+
+		git checkout --detach &&
+		echo B >file &&
+		git commit -m B file &&
+		B=$(git rev-parse HEAD) &&
+
+		git checkout $A &&
+		git merge --no-ff $B &&  # M1
+
+		echo C >file &&
+		git commit -m C file &&
+
+		git checkout $A &&
+		git merge --no-ff HEAD@{1} && # M2
+
+		git checkout master &&
+		git merge --no-ff HEAD@{1} &&
+
+		echo "$B master^2^2~1^2" >expect &&
+		git name-rev $B >actual &&
+
+		test_cmp expect actual
+	)
+'
+
+#               B
+#               o
+#                \
+#  o-----o---o----x
+#        A
+#
+test_expect_success 'describe commits with disjoint bases' '
+	git init disjoint1 &&
+	(
+		cd disjoint1 &&
+
+		echo o >> file && git add file && git commit -m o &&
+		echo A >> file && git add file && git commit -m A &&
+		git tag A -a -m A &&
+		echo o >> file && git add file && git commit -m o &&
+
+		git checkout --orphan branch && rm file &&
+		echo B > file2 && git add file2 && git commit -m B &&
+		git tag B -a -m B &&
+		git merge --no-ff --allow-unrelated-histories master -m x &&
+
+		check_describe "A-3-*" HEAD
+	)
+'
+
+#           B
+#   o---o---o------------.
+#                         \
+#                  o---o---x
+#                  A
+#
+test_expect_success 'describe commits with disjoint bases 2' '
+	git init disjoint2 &&
+	(
+		cd disjoint2 &&
+
+		echo A >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:00" git commit -m A &&
+		git tag A -a -m A &&
+		echo o >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:01" git commit -m o &&
+
+		git checkout --orphan branch &&
+		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:00" git commit -m o &&
+		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o &&
+		echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B &&
+		git tag B -a -m B &&
+		git merge --no-ff --allow-unrelated-histories master -m x &&
+
+		check_describe "B-3-*" HEAD
+	)
+'
+
 test_done
diff --git a/third_party/git/t/t6130-pathspec-noglob.sh b/third_party/git/t/t6130-pathspec-noglob.sh
index 37760233a560..ba7902c9cdcd 100755
--- a/third_party/git/t/t6130-pathspec-noglob.sh
+++ b/third_party/git/t/t6130-pathspec-noglob.sh
@@ -10,6 +10,7 @@ test_expect_success 'create commits with glob characters' '
 	# the name "f*" in the worktree, because it is not allowed
 	# on Windows (the tests below do not depend on the presence
 	# of the file in the worktree)
+	git config core.protectNTFS false &&
 	git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
 	test_tick &&
 	git commit -m star &&
diff --git a/third_party/git/t/t6136-pathspec-in-bare.sh b/third_party/git/t/t6136-pathspec-in-bare.sh
new file mode 100755
index 000000000000..b117251366dd
--- /dev/null
+++ b/third_party/git/t/t6136-pathspec-in-bare.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+test_description='diagnosing out-of-scope pathspec'
+
+. ./test-lib.sh
+
+test_expect_success 'setup a bare and non-bare repository' '
+	test_commit file1 &&
+	git clone --bare . bare
+'
+
+test_expect_success 'log and ls-files in a bare repository' '
+	(
+		cd bare &&
+		test_must_fail git log -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_i18ngrep "outside repository" err &&
+
+		test_must_fail git ls-files -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_i18ngrep "outside repository" err
+	)
+'
+
+test_expect_success 'log and ls-files in .git directory' '
+	(
+		cd .git &&
+		test_must_fail git log -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_i18ngrep "outside repository" err &&
+
+		test_must_fail git ls-files -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_i18ngrep "outside repository" err
+	)
+'
+
+test_done
diff --git a/third_party/git/t/t6300-for-each-ref.sh b/third_party/git/t/t6300-for-each-ref.sh
index ab69aa176d14..9c910ce74673 100755
--- a/third_party/git/t/t6300-for-each-ref.sh
+++ b/third_party/git/t/t6300-for-each-ref.sh
@@ -526,6 +526,25 @@ test_expect_success 'Check ambiguous head and tag refs II (loose)' '
 	test_cmp expected actual
 '
 
+test_expect_success 'create tag without tagger' '
+	git tag -a -m "Broken tag" taggerless &&
+	git tag -f taggerless $(git cat-file tag taggerless |
+		sed -e "/^tagger /d" |
+		git hash-object --stdin -w -t tag)
+'
+
+test_atom refs/tags/taggerless type 'commit'
+test_atom refs/tags/taggerless tag 'taggerless'
+test_atom refs/tags/taggerless tagger ''
+test_atom refs/tags/taggerless taggername ''
+test_atom refs/tags/taggerless taggeremail ''
+test_atom refs/tags/taggerless taggerdate ''
+test_atom refs/tags/taggerless committer ''
+test_atom refs/tags/taggerless committername ''
+test_atom refs/tags/taggerless committeremail ''
+test_atom refs/tags/taggerless committerdate ''
+test_atom refs/tags/taggerless subject 'Broken tag'
+
 test_expect_success 'an unusual tag with an incomplete line' '
 
 	git tag -m "bogo" bogo &&
diff --git a/third_party/git/t/t6500-gc.sh b/third_party/git/t/t6500-gc.sh
index c0f04dc6b0e1..0a69a6711768 100755
--- a/third_party/git/t/t6500-gc.sh
+++ b/third_party/git/t/t6500-gc.sh
@@ -103,14 +103,14 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre
 '
 
 test_expect_success 'gc --no-quiet' '
-	git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+	GIT_PROGRESS_DELAY=0 git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
 	test_must_be_empty stdout &&
-	test_line_count = 1 stderr &&
 	test_i18ngrep "Computing commit graph generation numbers" stderr
 '
 
 test_expect_success TTY 'with TTY: gc --no-quiet' '
-	test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
 	test_must_be_empty stdout &&
 	test_i18ngrep "Enumerating objects" stderr &&
 	test_i18ngrep "Computing commit graph generation numbers" stderr
diff --git a/third_party/git/t/t6501-freshen-objects.sh b/third_party/git/t/t6501-freshen-objects.sh
index 033871ee5f35..f30b4849b64e 100755
--- a/third_party/git/t/t6501-freshen-objects.sh
+++ b/third_party/git/t/t6501-freshen-objects.sh
@@ -137,7 +137,7 @@ test_expect_success 'do not complain about existing broken links (commit)' '
 	some message
 	EOF
 	commit=$(git hash-object -t commit -w broken-commit) &&
-	git gc 2>stderr &&
+	git gc -q 2>stderr &&
 	verbose git cat-file -e $commit &&
 	test_must_be_empty stderr
 '
@@ -147,7 +147,7 @@ test_expect_success 'do not complain about existing broken links (tree)' '
 	100644 blob 0000000000000000000000000000000000000003	foo
 	EOF
 	tree=$(git mktree --missing <broken-tree) &&
-	git gc 2>stderr &&
+	git gc -q 2>stderr &&
 	git cat-file -e $tree &&
 	test_must_be_empty stderr
 '
@@ -162,7 +162,7 @@ test_expect_success 'do not complain about existing broken links (tag)' '
 	this is a broken tag
 	EOF
 	tag=$(git hash-object -t tag -w broken-tag) &&
-	git gc 2>stderr &&
+	git gc -q 2>stderr &&
 	git cat-file -e $tag &&
 	test_must_be_empty stderr
 '
diff --git a/third_party/git/t/t7004-tag.sh b/third_party/git/t/t7004-tag.sh
index 80eb13d94e2a..6db92bd3ba62 100755
--- a/third_party/git/t/t7004-tag.sh
+++ b/third_party/git/t/t7004-tag.sh
@@ -227,10 +227,10 @@ test_expect_success \
 test_expect_success \
 	'trying to delete two tags, existing and not, should fail in the 2nd' '
 	tag_exists mytag &&
-	! tag_exists myhead &&
-	test_must_fail git tag -d mytag anothertag &&
+	! tag_exists nonexistingtag &&
+	test_must_fail git tag -d mytag nonexistingtag &&
 	! tag_exists mytag &&
-	! tag_exists myhead
+	! tag_exists nonexistingtag
 '
 
 test_expect_success 'trying to delete an already deleted tag should fail' \
@@ -517,7 +517,6 @@ test_expect_success \
 test_expect_success \
 	'trying to create tags giving both -m or -F options should fail' '
 	echo "message file 1" >msgfile1 &&
-	echo "message file 2" >msgfile2 &&
 	! tag_exists msgtag &&
 	test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&
 	! tag_exists msgtag &&
@@ -1420,7 +1419,7 @@ test_expect_success \
 get_tag_header reuse $commit commit $time >expect
 echo "An annotation to be reused" >> expect
 test_expect_success \
-	'overwriting an annoted tag should use its previous body' '
+	'overwriting an annotated tag should use its previous body' '
 	git tag -a -m "An annotation to be reused" reuse &&
 	GIT_EDITOR=true git tag -f -a reuse &&
 	get_tag_msg reuse >actual &&
diff --git a/third_party/git/t/t7009-filter-branch-null-sha1.sh b/third_party/git/t/t7008-filter-branch-null-sha1.sh
index 9ba9f24ad2fb..9ba9f24ad2fb 100755
--- a/third_party/git/t/t7009-filter-branch-null-sha1.sh
+++ b/third_party/git/t/t7008-filter-branch-null-sha1.sh
diff --git a/third_party/git/t/t7012-skip-worktree-writing.sh b/third_party/git/t/t7012-skip-worktree-writing.sh
index 9d1abe50eff6..7476781979c3 100755
--- a/third_party/git/t/t7012-skip-worktree-writing.sh
+++ b/third_party/git/t/t7012-skip-worktree-writing.sh
@@ -134,6 +134,21 @@ test_expect_success 'git-clean, dirty case' '
 	test_i18ncmp expected result
 '
 
+test_expect_success '--ignore-skip-worktree-entries leaves worktree alone' '
+	test_commit keep-me &&
+	git update-index --skip-worktree keep-me.t &&
+	rm keep-me.t &&
+
+	: ignoring the worktree &&
+	git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
+	git diff-index --cached --exit-code HEAD &&
+
+	: not ignoring the worktree, a deletion is staged &&
+	git update-index --remove keep-me.t &&
+	test_must_fail git diff-index --cached --exit-code HEAD \
+		--diff-filter=D -- keep-me.t
+'
+
 #TODO test_expect_failure 'git-apply adds file' false
 #TODO test_expect_failure 'git-apply updates file' false
 #TODO test_expect_failure 'git-apply removes file' false
diff --git a/third_party/git/t/t7030-verify-tag.sh b/third_party/git/t/t7030-verify-tag.sh
index 041e319e79aa..5c5bc32ccb13 100755
--- a/third_party/git/t/t7030-verify-tag.sh
+++ b/third_party/git/t/t7030-verify-tag.sh
@@ -44,8 +44,8 @@ test_expect_success GPG 'create signed tags' '
 test_expect_success GPGSM 'create signed tags x509 ' '
 	test_config gpg.format x509 &&
 	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
-	echo 9 >file && test_tick && git commit -a -m "nineth gpgsm-signed" &&
-	git tag -s -m nineth nineth-signed-x509
+	echo 9 >file && test_tick && git commit -a -m "ninth gpgsm-signed" &&
+	git tag -s -m ninth ninth-signed-x509
 '
 
 test_expect_success GPG 'verify and show signatures' '
@@ -80,10 +80,34 @@ test_expect_success GPG 'verify and show signatures' '
 '
 
 test_expect_success GPGSM 'verify and show signatures x509' '
-	git verify-tag nineth-signed-x509 2>actual &&
+	git verify-tag ninth-signed-x509 2>actual &&
 	grep "Good signature from" actual &&
 	! grep "BAD signature from" actual &&
-	echo nineth-signed-x509 OK
+	echo ninth-signed-x509 OK
+'
+
+test_expect_success GPGSM 'verify and show signatures x509 with low minTrustLevel' '
+	test_config gpg.minTrustLevel undefined &&
+	git verify-tag ninth-signed-x509 2>actual &&
+	grep "Good signature from" actual &&
+	! grep "BAD signature from" actual &&
+	echo ninth-signed-x509 OK
+'
+
+test_expect_success GPGSM 'verify and show signatures x509 with matching minTrustLevel' '
+	test_config gpg.minTrustLevel fully &&
+	git verify-tag ninth-signed-x509 2>actual &&
+	grep "Good signature from" actual &&
+	! grep "BAD signature from" actual &&
+	echo ninth-signed-x509 OK
+'
+
+test_expect_success GPGSM 'verify and show signatures x509 with high minTrustLevel' '
+	test_config gpg.minTrustLevel ultimate &&
+	test_must_fail git verify-tag ninth-signed-x509 2>actual &&
+	grep "Good signature from" actual &&
+	! grep "BAD signature from" actual &&
+	echo ninth-signed-x509 OK
 '
 
 test_expect_success GPG 'detect fudged signature' '
@@ -127,10 +151,10 @@ test_expect_success GPG 'verify signatures with --raw' '
 '
 
 test_expect_success GPGSM 'verify signatures with --raw x509' '
-	git verify-tag --raw nineth-signed-x509 2>actual &&
+	git verify-tag --raw ninth-signed-x509 2>actual &&
 	grep "GOODSIG" actual &&
 	! grep "BADSIG" actual &&
-	echo nineth-signed-x509 OK
+	echo ninth-signed-x509 OK
 '
 
 test_expect_success GPG 'verify multiple tags' '
@@ -147,7 +171,7 @@ test_expect_success GPG 'verify multiple tags' '
 '
 
 test_expect_success GPGSM 'verify multiple tags x509' '
-	tags="seventh-signed nineth-signed-x509" &&
+	tags="seventh-signed ninth-signed-x509" &&
 	for i in $tags
 	do
 		git verify-tag -v --raw $i || return 1
diff --git a/third_party/git/t/t7061-wtstatus-ignore.sh b/third_party/git/t/t7061-wtstatus-ignore.sh
index 0c394cf995cb..e4cf5484f97a 100755
--- a/third_party/git/t/t7061-wtstatus-ignore.sh
+++ b/third_party/git/t/t7061-wtstatus-ignore.sh
@@ -43,11 +43,16 @@ test_expect_success 'status untracked directory with --ignored -u' '
 	test_cmp expected actual
 '
 cat >expected <<\EOF
-?? untracked/uncommitted
+?? untracked/
 !! untracked/ignored
 EOF
 
-test_expect_success 'status prefixed untracked directory with --ignored' '
+test_expect_success 'status of untracked directory with --ignored works with or without prefix' '
+	git status --porcelain --ignored >tmp &&
+	grep untracked/ tmp >actual &&
+	rm tmp &&
+	test_cmp expected actual &&
+
 	git status --porcelain --ignored untracked/ >actual &&
 	test_cmp expected actual
 '
diff --git a/third_party/git/t/t7105-reset-patch.sh b/third_party/git/t/t7105-reset-patch.sh
index bd10a96727c5..fc2a6cf5c7a4 100755
--- a/third_party/git/t/t7105-reset-patch.sh
+++ b/third_party/git/t/t7105-reset-patch.sh
@@ -38,6 +38,27 @@ test_expect_success PERL 'git reset -p HEAD^' '
 	test_i18ngrep "Apply" output
 '
 
+test_expect_success PERL 'git reset -p HEAD^^{tree}' '
+	test_write_lines n y | git reset -p HEAD^^{tree} >output &&
+	verify_state dir/foo work parent &&
+	verify_saved_state bar &&
+	test_i18ngrep "Apply" output
+'
+
+test_expect_success PERL 'git reset -p HEAD^:dir/foo (blob fails)' '
+	set_and_save_state dir/foo work work &&
+	test_must_fail git reset -p HEAD^:dir/foo &&
+	verify_saved_state dir/foo &&
+	verify_saved_state bar
+'
+
+test_expect_success PERL 'git reset -p aaaaaaaa (unknown fails)' '
+	set_and_save_state dir/foo work work &&
+	test_must_fail git reset -p aaaaaaaa &&
+	verify_saved_state dir/foo &&
+	verify_saved_state bar
+'
+
 # The idea in the rest is that bar sorts first, so we always say 'y'
 # first and if the path limiter fails it'll apply to bar instead of
 # dir/foo.  There's always an extra 'n' to reject edits to dir/foo in
diff --git a/third_party/git/t/t7107-reset-pathspec-file.sh b/third_party/git/t/t7107-reset-pathspec-file.sh
new file mode 100755
index 000000000000..cad3a9de9efc
--- /dev/null
+++ b/third_party/git/t/t7107-reset-pathspec-file.sh
@@ -0,0 +1,173 @@
+#!/bin/sh
+
+test_description='reset --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+	git add . &&
+	git commit --include . -m "Commit" &&
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git status --porcelain -- fileA.t fileB.t fileC.t fileD.t >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	git rm fileA.t &&
+	echo fileA.t | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	git rm fileA.t &&
+	echo fileA.t >list &&
+	git reset --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git rm fileA.t &&
+	git reset --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	# Note: "git reset" has not yet learned to fail on wrong pathspecs
+	git reset --pathspec-from-file=list --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	test_must_fail verify_expect
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t fileC.t fileD.t &&
+	printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	 D fileB.t
+	 D fileC.t
+	D  fileD.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	git rm fileA.t &&
+
+	test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+
+	test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+
+	test_must_fail git reset --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+
+	test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
+	test_i18ngrep -e "fatal: Cannot do soft reset with paths" err &&
+
+	test_must_fail git reset --hard --pathspec-from-file=list 2>err &&
+	test_i18ngrep -e "fatal: Cannot do hard reset with paths" err
+'
+
+test_done
diff --git a/third_party/git/t/t7300-clean.sh b/third_party/git/t/t7300-clean.sh
index a2c45d1902ac..cb5e34d94c3a 100755
--- a/third_party/git/t/t7300-clean.sh
+++ b/third_party/git/t/t7300-clean.sh
@@ -117,6 +117,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' '
 	would_clean=$(
 		cd docs &&
 		git clean -n ../src |
+		grep part3 |
 		sed -n -e "s|^Would remove ||p"
 	) &&
 	verbose test "$would_clean" = ../src/part3.c
@@ -129,6 +130,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' '
 	would_clean=$(
 		cd docs &&
 		git clean -n "$(pwd)/../src" |
+		grep part3 |
 		sed -n -e "s|^Would remove ||p"
 	) &&
 	verbose test "$would_clean" = ../src/part3.c
@@ -547,7 +549,7 @@ test_expect_failure 'nested (non-empty) bare repositories should be cleaned even
 	test_path_is_missing strange_bare
 '
 
-test_expect_success 'giving path in nested git work tree will remove it' '
+test_expect_success 'giving path in nested git work tree will NOT remove it' '
 	rm -fr repo &&
 	mkdir repo &&
 	(
@@ -559,7 +561,7 @@ test_expect_success 'giving path in nested git work tree will remove it' '
 	git clean -f -d repo/bar/baz &&
 	test_path_is_file repo/.git/HEAD &&
 	test_path_is_dir repo/bar/ &&
-	test_path_is_missing repo/bar/baz
+	test_path_is_file repo/bar/baz/hello.world
 '
 
 test_expect_success 'giving path to nested .git will not remove it' '
@@ -577,7 +579,7 @@ test_expect_success 'giving path to nested .git will not remove it' '
 	test_path_is_dir untracked/
 '
 
-test_expect_success 'giving path to nested .git/ will remove contents' '
+test_expect_success 'giving path to nested .git/ will NOT remove contents' '
 	rm -fr repo untracked &&
 	mkdir repo untracked &&
 	(
@@ -587,7 +589,7 @@ test_expect_success 'giving path to nested .git/ will remove contents' '
 	) &&
 	git clean -f -d repo/.git/ &&
 	test_path_is_dir repo/.git &&
-	test_dir_is_empty repo/.git &&
+	test_path_is_file repo/.git/HEAD &&
 	test_path_is_dir untracked/
 '
 
@@ -669,6 +671,60 @@ test_expect_success 'git clean -d skips untracked dirs containing ignored files'
 	test_path_is_missing foo/b/bb
 '
 
+test_expect_success 'git clean -d skips nested repo containing ignored files' '
+	test_when_finished "rm -rf nested-repo-with-ignored-file" &&
+
+	git init nested-repo-with-ignored-file &&
+	(
+		cd nested-repo-with-ignored-file &&
+		>file &&
+		git add file &&
+		git commit -m Initial &&
+
+		# This file is ignored by a .gitignore rule in the outer repo
+		# added in the previous test.
+		>ignoreme
+	) &&
+
+	git clean -fd &&
+
+	test_path_is_file nested-repo-with-ignored-file/.git/index &&
+	test_path_is_file nested-repo-with-ignored-file/ignoreme &&
+	test_path_is_file nested-repo-with-ignored-file/file
+'
+
+test_expect_success 'git clean handles being told what to clean' '
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -f */ut &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
+'
+
+test_expect_success 'git clean handles being told what to clean, with -d' '
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -ffd */ut &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
+'
+
+test_expect_success 'git clean works if a glob is passed without -d' '
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -f "*ut" &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
+'
+
+test_expect_success 'git clean works if a glob is passed with -d' '
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -ffd "*ut" &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
+'
+
 test_expect_success MINGW 'handle clean & core.longpaths = false nicely' '
 	test_config core.longpaths false &&
 	a50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
@@ -681,4 +737,13 @@ test_expect_success MINGW 'handle clean & core.longpaths = false nicely' '
 	test_i18ngrep "too long" .git/err
 '
 
+test_expect_success 'clean untracked paths by pathspec' '
+	git init untracked &&
+	mkdir untracked/dir &&
+	echo >untracked/dir/file.txt &&
+	git -C untracked clean -f dir/file.txt &&
+	ls untracked/dir >actual &&
+	test_must_be_empty actual
+'
+
 test_done
diff --git a/third_party/git/t/t7400-submodule-basic.sh b/third_party/git/t/t7400-submodule-basic.sh
index a208cb26e1df..e3e2aab3b0a1 100755
--- a/third_party/git/t/t7400-submodule-basic.sh
+++ b/third_party/git/t/t7400-submodule-basic.sh
@@ -55,6 +55,21 @@ test_expect_success 'add aborts on repository with no commits' '
 	test_i18ncmp expect actual
 '
 
+test_expect_success 'status should ignore inner git repo when not added' '
+	rm -fr inner &&
+	mkdir inner &&
+	(
+		cd inner &&
+		git init &&
+		>t &&
+		git add t &&
+		git commit -m "initial"
+	) &&
+	test_must_fail git submodule status inner 2>output.err &&
+	rm -fr inner &&
+	test_i18ngrep "^error: .*did not match any file(s) known to git" output.err
+'
+
 test_expect_success 'setup - repository in init subdirectory' '
 	mkdir init &&
 	(
@@ -156,9 +171,11 @@ test_expect_success 'submodule add to .gitignored path fails' '
 	(
 		cd addtest-ignore &&
 		cat <<-\EOF >expect &&
-		The following path is ignored by one of your .gitignore files:
+		The following paths are ignored by one of your .gitignore files:
 		submod
-		Use -f if you really want to add it.
+		hint: Use -f if you really want to add them.
+		hint: Turn this message off by running
+		hint: "git config advice.addIgnoredFile false"
 		EOF
 		# Does not use test_commit due to the ignore
 		echo "*" > .gitignore &&
@@ -191,6 +208,17 @@ test_expect_success 'submodule add to reconfigure existing submodule with --forc
 	)
 '
 
+test_expect_success 'submodule add relays add --dry-run stderr' '
+	test_when_finished "rm -rf addtest/.git/index.lock" &&
+	(
+		cd addtest &&
+		: >.git/index.lock &&
+		! git submodule add "$submodurl" sub-while-locked 2>output.err &&
+		test_i18ngrep "^fatal: .*index\.lock" output.err &&
+		test_path_is_missing sub-while-locked
+	)
+'
+
 test_expect_success 'submodule add --branch' '
 	echo "refs/heads/initial" >expect-head &&
 	cat <<-\EOF >expect-heads &&
@@ -356,6 +384,28 @@ test_expect_success 'status should only print one line' '
 	test_line_count = 1 lines
 '
 
+test_expect_success 'status from subdirectory should have the same SHA1' '
+	test_when_finished "rmdir addtest/subdir" &&
+	(
+		cd addtest &&
+		mkdir subdir &&
+		git submodule status >output &&
+		awk "{print \$1}" <output >expect &&
+		cd subdir &&
+		git submodule status >../output &&
+		awk "{print \$1}" <../output >../actual &&
+		test_cmp ../expect ../actual &&
+		git -C ../submod checkout HEAD^ &&
+		git submodule status >../output &&
+		awk "{print \$1}" <../output >../actual2 &&
+		cd .. &&
+		git submodule status >output &&
+		awk "{print \$1}" <output >expect2 &&
+		test_cmp expect2 actual2 &&
+		! test_cmp actual actual2
+	)
+'
+
 test_expect_success 'setup - fetch commit name from submodule' '
 	rev1=$(cd .subrepo && git rev-parse HEAD) &&
 	printf "rev1: %s\n" "$rev1" &&
@@ -377,6 +427,14 @@ test_expect_success 'init should register submodule url in .git/config' '
 	test_cmp expect url
 '
 
+test_expect_success 'status should still be "missing" after initializing' '
+	rm -fr init &&
+	mkdir init &&
+	git submodule status >lines &&
+	rm -fr init &&
+	grep "^-$rev1" lines
+'
+
 test_failure_with_unknown_submodule () {
 	test_must_fail git submodule $1 no-such-submodule 2>output.err &&
 	test_i18ngrep "^error: .*no-such-submodule" output.err
@@ -527,7 +585,6 @@ test_expect_success 'update --init' '
 	test_must_fail git config submodule.example.url &&
 
 	git submodule update init 2> update.out &&
-	cat update.out &&
 	test_i18ngrep "not initialized" update.out &&
 	test_must_fail git rev-parse --resolve-git-dir init/.git &&
 
@@ -545,7 +602,6 @@ test_expect_success 'update --init from subdirectory' '
 	(
 		cd sub &&
 		git submodule update ../init 2>update.out &&
-		cat update.out &&
 		test_i18ngrep "not initialized" update.out &&
 		test_must_fail git rev-parse --resolve-git-dir ../init/.git &&
 
diff --git a/third_party/git/t/t7406-submodule-update.sh b/third_party/git/t/t7406-submodule-update.sh
index c973278300a5..4fb447a143e6 100755
--- a/third_party/git/t/t7406-submodule-update.sh
+++ b/third_party/git/t/t7406-submodule-update.sh
@@ -158,7 +158,6 @@ test_expect_success 'submodule update --init from and of subdirectory' '
 	test_i18ncmp expect2 actual2
 '
 
-apos="'";
 test_expect_success 'submodule update does not fetch already present commits' '
 	(cd submodule &&
 	  echo line3 >> file &&
@@ -168,7 +167,7 @@ test_expect_success 'submodule update does not fetch already present commits' '
 	) &&
 	(cd super/submodule &&
 	  head=$(git rev-parse --verify HEAD) &&
-	  echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected &&
+	  echo "Submodule path ${SQ}submodule$SQ: checked out $SQ$head$SQ" > ../../expected &&
 	  git reset --hard HEAD~1
 	) &&
 	(cd super &&
@@ -407,12 +406,26 @@ test_expect_success 'submodule update - command in .git/config' '
 	)
 '
 
-test_expect_success 'submodule update - command in .gitmodules is ignored' '
+test_expect_success 'submodule update - command in .gitmodules is rejected' '
 	test_when_finished "git -C super reset --hard HEAD^" &&
 	git -C super config -f .gitmodules submodule.submodule.update "!false" &&
 	git -C super commit -a -m "add command to .gitmodules file" &&
 	git -C super/submodule reset --hard $submodulesha1^ &&
-	git -C super submodule update submodule
+	test_must_fail git -C super submodule update submodule
+'
+
+test_expect_success 'fsck detects command in .gitmodules' '
+	git init command-in-gitmodules &&
+	(
+		cd command-in-gitmodules &&
+		git submodule add ../submodule submodule &&
+		test_commit adding-submodule &&
+
+		git config -f .gitmodules submodule.submodule.update "!false" &&
+		git add .gitmodules &&
+		test_commit configuring-update &&
+		test_must_fail git fsck
+	)
 '
 
 cat << EOF >expect
@@ -481,6 +494,9 @@ test_expect_success 'recursive submodule update - command in .git/config catches
 '
 
 test_expect_success 'submodule init does not copy command into .git/config' '
+	test_when_finished "git -C super update-index --force-remove submodule1" &&
+	test_when_finished git config -f super/.gitmodules \
+		--remove-section submodule.submodule1 &&
 	(cd super &&
 	 git ls-files -s submodule >out &&
 	 H=$(cut -d" " -f2 out) &&
@@ -489,10 +505,9 @@ test_expect_success 'submodule init does not copy command into .git/config' '
 	 git config -f .gitmodules submodule.submodule1.path submodule1 &&
 	 git config -f .gitmodules submodule.submodule1.url ../submodule &&
 	 git config -f .gitmodules submodule.submodule1.update !false &&
-	 git submodule init submodule1 &&
-	 echo "none" >expect &&
-	 git config submodule.submodule1.update >actual &&
-	 test_cmp expect actual
+	 test_must_fail git submodule init submodule1 &&
+	 test_expect_code 1 git config submodule.submodule1.update >actual &&
+	 test_must_be_empty actual
 	)
 '
 
@@ -945,7 +960,7 @@ test_expect_success 'submodule update clone shallow submodule outside of depth'
 		mv -f .gitmodules.tmp .gitmodules &&
 		# Some protocol versions (e.g. 2) support fetching
 		# unadvertised objects, so restrict this test to v0.
-		test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 			git submodule update --init --depth=1 2>actual &&
 		test_i18ngrep "Direct fetching of that commit failed." actual &&
 		git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
diff --git a/third_party/git/t/t7410-submodule-checkout-to.sh b/third_party/git/t/t7410-submodule-checkout-to.sh
deleted file mode 100755
index f1b492ebc46a..000000000000
--- a/third_party/git/t/t7410-submodule-checkout-to.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-test_description='Combination of submodules and multiple workdirs'
-
-. ./test-lib.sh
-
-base_path=$(pwd -P)
-
-test_expect_success 'setup: make origin'  '
-	mkdir -p origin/sub &&
-	(
-		cd origin/sub && git init &&
-		echo file1 >file1 &&
-		git add file1 &&
-		git commit -m file1
-	) &&
-	mkdir -p origin/main &&
-	(
-		cd origin/main && git init &&
-		git submodule add ../sub &&
-		git commit -m "add sub"
-	) &&
-	(
-		cd origin/sub &&
-		echo file1updated >file1 &&
-		git add file1 &&
-		git commit -m "file1 updated"
-	) &&
-	git -C origin/main/sub pull &&
-	(
-		cd origin/main &&
-		git add sub &&
-		git commit -m "sub updated"
-	)
-'
-
-test_expect_success 'setup: clone' '
-	mkdir clone &&
-	git -C clone clone --recursive "$base_path/origin/main"
-'
-
-rev1_hash_main=$(git --git-dir=origin/main/.git show --pretty=format:%h -q "HEAD~1")
-rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1")
-
-test_expect_success 'checkout main' '
-	mkdir default_checkout &&
-	git -C clone/main worktree add "$base_path/default_checkout/main" "$rev1_hash_main"
-'
-
-test_expect_failure 'can see submodule diffs just after checkout' '
-	git -C default_checkout/main diff --submodule master"^!" >out &&
-	grep "file1 updated" out
-'
-
-test_expect_success 'checkout main and initialize independent clones' '
-	mkdir fully_cloned_submodule &&
-	git -C clone/main worktree add "$base_path/fully_cloned_submodule/main" "$rev1_hash_main" &&
-	git -C fully_cloned_submodule/main submodule update
-'
-
-test_expect_success 'can see submodule diffs after independent cloning' '
-	git -C fully_cloned_submodule/main diff --submodule master"^!" >out &&
-	grep "file1 updated" out
-'
-
-test_expect_success 'checkout sub manually' '
-	mkdir linked_submodule &&
-	git -C clone/main worktree add "$base_path/linked_submodule/main" "$rev1_hash_main" &&
-	git -C clone/main/sub worktree add "$base_path/linked_submodule/main/sub" "$rev1_hash_sub"
-'
-
-test_expect_success 'can see submodule diffs after manual checkout of linked submodule' '
-	git -C linked_submodule/main diff --submodule master"^!" >out &&
-	grep "file1 updated" out
-'
-
-test_done
diff --git a/third_party/git/t/t7415-submodule-names.sh b/third_party/git/t/t7415-submodule-names.sh
index 49a37efe9c1d..f70368bc2e9d 100755
--- a/third_party/git/t/t7415-submodule-names.sh
+++ b/third_party/git/t/t7415-submodule-names.sh
@@ -191,4 +191,61 @@ test_expect_success 'fsck detects corrupt .gitmodules' '
 	)
 '
 
+test_expect_success MINGW 'prevent git~1 squatting on Windows' '
+	git init squatting &&
+	(
+		cd squatting &&
+		mkdir a &&
+		touch a/..git &&
+		git add a/..git &&
+		test_tick &&
+		git commit -m initial &&
+
+		modules="$(test_write_lines \
+			"[submodule \"b.\"]" "url = ." "path = c" \
+			"[submodule \"b\"]" "url = ." "path = d\\\\a" |
+			git hash-object -w --stdin)" &&
+		rev="$(git rev-parse --verify HEAD)" &&
+		hash="$(echo x | git hash-object -w --stdin)" &&
+		test_must_fail git update-index --add \
+			--cacheinfo 160000,$rev,d\\a 2>err &&
+		test_i18ngrep "Invalid path" err &&
+		git -c core.protectNTFS=false update-index --add \
+			--cacheinfo 100644,$modules,.gitmodules \
+			--cacheinfo 160000,$rev,c \
+			--cacheinfo 160000,$rev,d\\a \
+			--cacheinfo 100644,$hash,d./a/x \
+			--cacheinfo 100644,$hash,d./a/..git &&
+		test_tick &&
+		git -c core.protectNTFS=false commit -m "module"
+	) &&
+	test_must_fail git -c core.protectNTFS=false \
+		clone --recurse-submodules squatting squatting-clone 2>err &&
+	test_i18ngrep -e "directory not empty" -e "not an empty directory" err &&
+	! grep gitdir squatting-clone/d/a/git~2
+'
+
+test_expect_success 'git dirs of sibling submodules must not be nested' '
+	git init nested &&
+	test_commit -C nested nested &&
+	(
+		cd nested &&
+		cat >.gitmodules <<-EOF &&
+		[submodule "hippo"]
+			url = .
+			path = thing1
+		[submodule "hippo/hooks"]
+			url = .
+			path = thing2
+		EOF
+		git clone . thing1 &&
+		git clone . thing2 &&
+		git add .gitmodules thing1 thing2 &&
+		test_tick &&
+		git commit -m nested
+	) &&
+	test_must_fail git clone --recurse-submodules nested clone 2>err &&
+	test_i18ngrep "is inside git dir" err
+'
+
 test_done
diff --git a/third_party/git/t/t7416-submodule-dash-url.sh b/third_party/git/t/t7416-submodule-dash-url.sh
index 1cd2c1c1ea2d..eec96e0ba9e3 100755
--- a/third_party/git/t/t7416-submodule-dash-url.sh
+++ b/third_party/git/t/t7416-submodule-dash-url.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='check handling of .gitmodule url with dash'
+test_description='check handling of disallowed .gitmodule urls'
 . ./test-lib.sh
 
 test_expect_success 'create submodule with protected dash in url' '
@@ -46,4 +46,159 @@ test_expect_success 'fsck rejects unprotected dash' '
 	grep gitmodulesUrl err
 '
 
+test_expect_success 'trailing backslash is handled correctly' '
+	git init testmodule &&
+	test_commit -C testmodule c &&
+	git submodule add ./testmodule &&
+	: ensure that the name ends in a double backslash &&
+	sed -e "s|\\(submodule \"testmodule\\)\"|\\1\\\\\\\\\"|" \
+		-e "s|url = .*|url = \" --should-not-be-an-option\"|" \
+		<.gitmodules >.new &&
+	mv .new .gitmodules &&
+	git commit -am "Add testmodule" &&
+	test_must_fail git clone --verbose --recurse-submodules . dolly 2>err &&
+	test_i18ngrep ! "unknown option" err
+'
+
+test_expect_success 'fsck rejects missing URL scheme' '
+	git checkout --orphan missing-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http::one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with missing URL scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects relative URL resolving to missing scheme' '
+	git checkout --orphan relative-missing-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "..\\../.\\../:one.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with relative URL that strips off scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects empty URL scheme' '
+	git checkout --orphan empty-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http::://one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with empty URL scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects relative URL resolving to empty scheme' '
+	git checkout --orphan relative-empty-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = ../../../:://one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "relative gitmodules URL resolving to empty scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects empty hostname' '
+	git checkout --orphan empty-host &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http:///one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with extra slashes" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects relative url that produced empty hostname' '
+	git checkout --orphan messy-relative &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = ../../..//one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules abusing relative_path" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck permits embedded newline with unrecognized scheme' '
+	git checkout --orphan newscheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "data://acjbkd%0akajfdickajkd"
+	EOF
+	git add .gitmodules &&
+	git commit -m "gitmodules with unrecognized scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	git push dst HEAD
+'
+
+test_expect_success 'fsck rejects embedded newline in url' '
+	# create an orphan branch to avoid existing .gitmodules objects
+	git checkout --orphan newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+	url = "https://one.example.com?%0ahost=two.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "gitmodules with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects embedded newline in relative url' '
+	git checkout --orphan relative-newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "./%0ahost=two.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "relative url with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
 test_done
diff --git a/third_party/git/t/t7417-submodule-path-url.sh b/third_party/git/t/t7417-submodule-path-url.sh
index 756af8c4d6fb..f7e7e94d7b6c 100755
--- a/third_party/git/t/t7417-submodule-path-url.sh
+++ b/third_party/git/t/t7417-submodule-path-url.sh
@@ -25,4 +25,21 @@ test_expect_success 'fsck rejects unprotected dash' '
 	grep gitmodulesPath err
 '
 
+test_expect_success MINGW 'submodule paths disallows trailing spaces' '
+	git init super &&
+	test_must_fail git -C super submodule add ../upstream "sub " &&
+
+	: add "sub", then rename "sub" to "sub ", the hard way &&
+	git -C super submodule add ../upstream sub &&
+	tree=$(git -C super write-tree) &&
+	git -C super ls-tree $tree >tree &&
+	sed "s/sub/sub /" <tree >tree.new &&
+	tree=$(git -C super mktree <tree.new) &&
+	commit=$(echo with space | git -C super commit-tree $tree) &&
+	git -C super update-ref refs/heads/master $commit &&
+
+	test_must_fail git clone --recurse-submodules super dst 2>err &&
+	test_i18ngrep "sub " err
+'
+
 test_done
diff --git a/third_party/git/t/t7419-submodule-set-branch.sh b/third_party/git/t/t7419-submodule-set-branch.sh
index c4b370ea8533..fd25f786a365 100755
--- a/third_party/git/t/t7419-submodule-set-branch.sh
+++ b/third_party/git/t/t7419-submodule-set-branch.sh
@@ -34,7 +34,7 @@ test_expect_success 'submodule config cache setup' '
 
 test_expect_success 'ensure submodule branch is unset' '
 	(cd super &&
-		test_must_fail grep branch .gitmodules
+		! grep branch .gitmodules
 	)
 '
 
@@ -54,7 +54,7 @@ test_expect_success 'test submodule set-branch --branch' '
 test_expect_success 'test submodule set-branch --default' '
 	(cd super &&
 		git submodule set-branch --default submodule &&
-		test_must_fail grep branch .gitmodules &&
+		! grep branch .gitmodules &&
 		git submodule update --remote &&
 		cat <<-\EOF >expect &&
 		a
@@ -80,7 +80,7 @@ test_expect_success 'test submodule set-branch -b' '
 test_expect_success 'test submodule set-branch -d' '
 	(cd super &&
 		git submodule set-branch -d submodule &&
-		test_must_fail grep branch .gitmodules &&
+		! grep branch .gitmodules &&
 		git submodule update --remote &&
 		cat <<-\EOF >expect &&
 		a
diff --git a/third_party/git/t/t7420-submodule-set-url.sh b/third_party/git/t/t7420-submodule-set-url.sh
new file mode 100755
index 000000000000..ef0cb6e8e185
--- /dev/null
+++ b/third_party/git/t/t7420-submodule-set-url.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Denton Liu
+#
+
+test_description='Test submodules set-url subcommand
+
+This test verifies that the set-url subcommand of git-submodule is working
+as expected.
+'
+
+TEST_NO_CREATE_REPO=1
+. ./test-lib.sh
+
+test_expect_success 'submodule config cache setup' '
+	mkdir submodule &&
+	(
+		cd submodule &&
+		git init &&
+		echo a >file &&
+		git add file &&
+		git commit -ma
+	) &&
+	mkdir super &&
+	(
+		cd super &&
+		git init &&
+		git submodule add ../submodule &&
+		git commit -m "add submodule"
+	)
+'
+
+test_expect_success 'test submodule set-url' '
+	# add a commit and move the submodule (change the url)
+	(
+		cd submodule &&
+		echo b >>file &&
+		git add file &&
+		git commit -mb
+	) &&
+	mv submodule newsubmodule &&
+
+	git -C newsubmodule show >expect &&
+	(
+		cd super &&
+		test_must_fail git submodule update --remote &&
+		git submodule set-url submodule ../newsubmodule &&
+		grep -F "url = ../newsubmodule" .gitmodules &&
+		git submodule update --remote
+	) &&
+	git -C super/submodule show >actual &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/third_party/git/t/t7500-commit-template-squash-signoff.sh b/third_party/git/t/t7500-commit-template-squash-signoff.sh
index 46a5cd4b7395..6d19ece05dd3 100755
--- a/third_party/git/t/t7500-commit-template-squash-signoff.sh
+++ b/third_party/git/t/t7500-commit-template-squash-signoff.sh
@@ -382,4 +382,13 @@ test_expect_success 'check commit with unstaged rename and copy' '
 	)
 '
 
+test_expect_success 'commit without staging files fails and displays hints' '
+	echo "initial" >file &&
+	git add file &&
+	git commit -m initial &&
+	echo "changes" >>file &&
+	test_must_fail git commit -m update >actual &&
+	test_i18ngrep "no changes added to commit (use \"git add\" and/or \"git commit -a\")" actual
+'
+
 test_done
diff --git a/third_party/git/t/t7501-commit-basic-functionality.sh b/third_party/git/t/t7501-commit-basic-functionality.sh
index f1349af56edd..110b4bf459bf 100755
--- a/third_party/git/t/t7501-commit-basic-functionality.sh
+++ b/third_party/git/t/t7501-commit-basic-functionality.sh
@@ -150,7 +150,7 @@ test_expect_success 'setup: commit message from file' '
 test_expect_success 'amend commit' '
 	cat >editor <<-\EOF &&
 	#!/bin/sh
-	sed -e "s/a file/an amend commit/g" < "$1" > "$1-"
+	sed -e "s/a file/an amend commit/g" <"$1" >"$1-"
 	mv "$1-" "$1"
 	EOF
 	chmod 755 editor &&
@@ -263,7 +263,7 @@ test_expect_success 'using message from other commit' '
 test_expect_success 'editing message from other commit' '
 	cat >editor <<-\EOF &&
 	#!/bin/sh
-	sed -e "s/amend/older/g"  < "$1" > "$1-"
+	sed -e "s/amend/older/g"  <"$1" >"$1-"
 	mv "$1-" "$1"
 	EOF
 	chmod 755 editor &&
@@ -285,9 +285,8 @@ test_expect_success 'overriding author from command line' '
 '
 
 test_expect_success PERL 'interactive add' '
-	echo 7 |
-	git commit --interactive |
-	grep "What now"
+	echo 7 | test_must_fail git commit --interactive >out &&
+	grep "What now" out
 '
 
 test_expect_success PERL "commit --interactive doesn't change index if editor aborts" '
@@ -362,12 +361,12 @@ test_expect_success 'amend commit to fix author' '
 	oldtick=$GIT_AUTHOR_DATE &&
 	test_tick &&
 	git reset --hard &&
-	git cat-file -p HEAD |
+	git cat-file -p HEAD >commit &&
 	sed -e "s/author.*/author $author $oldtick/" \
-		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
-		expected &&
+		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
+		commit >expected &&
 	git commit --amend --author="$author" &&
-	git cat-file -p HEAD > current &&
+	git cat-file -p HEAD >current &&
 	test_cmp expected current
 
 '
@@ -377,12 +376,12 @@ test_expect_success 'amend commit to fix date' '
 	test_tick &&
 	newtick=$GIT_AUTHOR_DATE &&
 	git reset --hard &&
-	git cat-file -p HEAD |
+	git cat-file -p HEAD >commit &&
 	sed -e "s/author.*/author $author $newtick/" \
-		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
-		expected &&
+		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
+		commit >expected &&
 	git commit --amend --date="$newtick" &&
-	git cat-file -p HEAD > current &&
+	git cat-file -p HEAD >current &&
 	test_cmp expected current
 
 '
@@ -409,12 +408,13 @@ test_expect_success 'sign off (1)' '
 	echo 1 >positive &&
 	git add positive &&
 	git commit -s -m "thank you" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo thank you &&
 		echo &&
-		git var GIT_COMMITTER_IDENT |
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
 	) >expected &&
 	test_cmp expected actual
 
@@ -428,13 +428,14 @@ test_expect_success 'sign off (2)' '
 	git commit -s -m "thank you
 
 $existing" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo thank you &&
 		echo &&
 		echo $existing &&
-		git var GIT_COMMITTER_IDENT |
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
 	) >expected &&
 	test_cmp expected actual
 
@@ -448,13 +449,14 @@ test_expect_success 'signoff gap' '
 	git commit -s -m "welcome
 
 $alt" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo welcome &&
 		echo &&
 		echo $alt &&
-		git var GIT_COMMITTER_IDENT |
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
 	) >expected &&
 	test_cmp expected actual
 '
@@ -468,15 +470,16 @@ test_expect_success 'signoff gap 2' '
 
 We have now
 $alt" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo welcome &&
 		echo &&
 		echo We have now &&
 		echo $alt &&
 		echo &&
-		git var GIT_COMMITTER_IDENT |
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
 	) >expected &&
 	test_cmp expected actual
 '
@@ -489,7 +492,8 @@ test_expect_success 'signoff respects trailer config' '
 
 non-trailer line
 Myfooter: x" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo subject &&
 		echo &&
@@ -506,7 +510,8 @@ Myfooter: x" &&
 
 non-trailer line
 Myfooter: x" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo subject &&
 		echo &&
@@ -538,7 +543,8 @@ test_expect_success 'multiple -m' '
 	>negative &&
 	git add negative &&
 	git commit -m "one" -m "two" -m "three" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo one &&
 		echo &&
@@ -555,23 +561,25 @@ test_expect_success 'amend commit to fix author' '
 	oldtick=$GIT_AUTHOR_DATE &&
 	test_tick &&
 	git reset --hard &&
-	git cat-file -p HEAD |
+	git cat-file -p HEAD >commit &&
 	sed -e "s/author.*/author $author $oldtick/" \
-		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
-		expected &&
+		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
+		commit >expected &&
 	git commit --amend --author="$author" &&
-	git cat-file -p HEAD > current &&
+	git cat-file -p HEAD >current &&
 	test_cmp expected current
 
 '
 
 test_expect_success 'git commit <file> with dirty index' '
-	echo tacocat > elif &&
-	echo tehlulz > chz &&
+	echo tacocat >elif &&
+	echo tehlulz >chz &&
 	git add chz &&
 	git commit elif -m "tacocat is a palindrome" &&
-	git show --stat | grep elif &&
-	git diff --cached | grep chz
+	git show --stat >stat &&
+	grep elif stat &&
+	git diff --cached >diff &&
+	grep chz diff
 '
 
 test_expect_success 'same tree (single parent)' '
@@ -584,7 +592,8 @@ test_expect_success 'same tree (single parent)' '
 test_expect_success 'same tree (single parent) --allow-empty' '
 
 	git commit --allow-empty -m "forced empty" &&
-	git cat-file commit HEAD | grep forced
+	git cat-file commit HEAD >commit &&
+	grep forced commit
 
 '
 
diff --git a/third_party/git/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh b/third_party/git/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
new file mode 100755
index 000000000000..b3485450a205
--- /dev/null
+++ b/third_party/git/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
@@ -0,0 +1,281 @@
+#!/bin/sh
+
+test_description='pre-commit and pre-merge-commit hooks'
+
+. ./test-lib.sh
+
+HOOKDIR="$(git rev-parse --git-dir)/hooks"
+PRECOMMIT="$HOOKDIR/pre-commit"
+PREMERGE="$HOOKDIR/pre-merge-commit"
+
+# Prepare sample scripts that write their $0 to actual_hooks
+test_expect_success 'sample script setup' '
+	mkdir -p "$HOOKDIR" &&
+	write_script "$HOOKDIR/success.sample" <<-\EOF &&
+	echo $0 >>actual_hooks
+	exit 0
+	EOF
+	write_script "$HOOKDIR/fail.sample" <<-\EOF &&
+	echo $0 >>actual_hooks
+	exit 1
+	EOF
+	write_script "$HOOKDIR/non-exec.sample" <<-\EOF &&
+	echo $0 >>actual_hooks
+	exit 1
+	EOF
+	chmod -x "$HOOKDIR/non-exec.sample" &&
+	write_script "$HOOKDIR/require-prefix.sample" <<-\EOF &&
+	echo $0 >>actual_hooks
+	test $GIT_PREFIX = "success/"
+	EOF
+	write_script "$HOOKDIR/check-author.sample" <<-\EOF
+	echo $0 >>actual_hooks
+	test "$GIT_AUTHOR_NAME" = "New Author" &&
+	test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
+	EOF
+'
+
+test_expect_success 'root commit' '
+	echo "root" >file &&
+	git add file &&
+	git commit -m "zeroth" &&
+	git checkout -b side &&
+	echo "foo" >foo &&
+	git add foo &&
+	git commit -m "make it non-ff" &&
+	git branch side-orig side &&
+	git checkout master
+'
+
+test_expect_success 'setup conflicting branches' '
+	test_when_finished "git checkout master" &&
+	git checkout -b conflicting-a master &&
+	echo a >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-a &&
+	git checkout -b conflicting-b master &&
+	echo b >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-b
+'
+
+test_expect_success 'with no hook' '
+	test_when_finished "rm -f actual_hooks" &&
+	echo "foo" >file &&
+	git add file &&
+	git commit -m "first" &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with no hook (merge)' '
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge master" master &&
+	git checkout master &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success '--no-verify with no hook' '
+	test_when_finished "rm -f actual_hooks" &&
+	echo "bar" >file &&
+	git add file &&
+	git commit --no-verify -m "bar" &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success '--no-verify with no hook (merge)' '
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge master" master &&
+	git checkout master &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with succeeding hook' '
+	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
+	cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+	echo "$PRECOMMIT" >expected_hooks &&
+	echo "more" >>file &&
+	git add file &&
+	git commit -m "more" &&
+	test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'with succeeding hook (merge)' '
+	test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
+	cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+	echo "$PREMERGE" >expected_hooks &&
+	git checkout side &&
+	git merge -m "merge master" master &&
+	git checkout master &&
+	test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'automatic merge fails; both hooks are available' '
+	test_when_finished "rm -f \"$PREMERGE\" \"$PRECOMMIT\"" &&
+	test_when_finished "rm -f expected_hooks actual_hooks" &&
+	test_when_finished "git checkout master" &&
+	cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+	cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+
+	git checkout conflicting-a &&
+	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
+	test_path_is_missing actual_hooks &&
+
+	echo "$PRECOMMIT" >expected_hooks &&
+	echo a+b >conflicting &&
+	git add conflicting &&
+	git commit -m "resolve conflict" &&
+	test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success '--no-verify with succeeding hook' '
+	test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+	cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+	echo "even more" >>file &&
+	git add file &&
+	git commit --no-verify -m "even more" &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success '--no-verify with succeeding hook (merge)' '
+	test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+	cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge master" master &&
+	git checkout master &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with failing hook' '
+	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
+	cp "$HOOKDIR/fail.sample" "$PRECOMMIT" &&
+	echo "$PRECOMMIT" >expected_hooks &&
+	echo "another" >>file &&
+	git add file &&
+	test_must_fail git commit -m "another" &&
+	test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success '--no-verify with failing hook' '
+	test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+	cp "$HOOKDIR/fail.sample" "$PRECOMMIT" &&
+	echo "stuff" >>file &&
+	git add file &&
+	git commit --no-verify -m "stuff" &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with failing hook (merge)' '
+	test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
+	cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
+	echo "$PREMERGE" >expected_hooks &&
+	git checkout side &&
+	test_must_fail git merge -m "merge master" master &&
+	git checkout master &&
+	test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success '--no-verify with failing hook (merge)' '
+	test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+	cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge master" master &&
+	git checkout master &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM 'with non-executable hook' '
+	test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+	cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" &&
+	echo "content" >>file &&
+	git add file &&
+	git commit -m "content" &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM '--no-verify with non-executable hook' '
+	test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+	cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" &&
+	echo "more content" >>file &&
+	git add file &&
+	git commit --no-verify -m "more content" &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM 'with non-executable hook (merge)' '
+	test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+	cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge master" master &&
+	git checkout master &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM '--no-verify with non-executable hook (merge)' '
+	test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+	cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge master" master &&
+	git checkout master &&
+	test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with hook requiring GIT_PREFIX' '
+	test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks success" &&
+	cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" &&
+	echo "$PRECOMMIT" >expected_hooks &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir success &&
+	(
+		cd success &&
+		git commit -m "hook requires GIT_PREFIX = success/"
+	) &&
+	test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'with failing hook requiring GIT_PREFIX' '
+	test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks fail" &&
+	cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" &&
+	echo "$PRECOMMIT" >expected_hooks &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir fail &&
+	(
+		cd fail &&
+		test_must_fail git commit -m "hook must fail"
+	) &&
+	git checkout -- file &&
+	test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'check the author in hook' '
+	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
+	cp "$HOOKDIR/check-author.sample" "$PRECOMMIT" &&
+	cat >expected_hooks <<-EOF &&
+	$PRECOMMIT
+	$PRECOMMIT
+	$PRECOMMIT
+	EOF
+	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
+	(
+		GIT_AUTHOR_NAME="New Author" &&
+		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
+		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+		git commit --allow-empty -m "by new.author via env" &&
+		git show -s
+	) &&
+	git commit --author="New Author <newauthor@example.com>" \
+		--allow-empty -m "by new.author via command line" &&
+	git show -s &&
+	test_cmp expected_hooks actual_hooks
+'
+
+test_done
diff --git a/third_party/git/t/t7503-pre-commit-hook.sh b/third_party/git/t/t7503-pre-commit-hook.sh
deleted file mode 100755
index 984889b39d3f..000000000000
--- a/third_party/git/t/t7503-pre-commit-hook.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh
-
-test_description='pre-commit hook'
-
-. ./test-lib.sh
-
-test_expect_success 'with no hook' '
-
-	echo "foo" > file &&
-	git add file &&
-	git commit -m "first"
-
-'
-
-test_expect_success '--no-verify with no hook' '
-
-	echo "bar" > file &&
-	git add file &&
-	git commit --no-verify -m "bar"
-
-'
-
-# now install hook that always succeeds
-HOOKDIR="$(git rev-parse --git-dir)/hooks"
-HOOK="$HOOKDIR/pre-commit"
-mkdir -p "$HOOKDIR"
-cat > "$HOOK" <<EOF
-#!/bin/sh
-exit 0
-EOF
-chmod +x "$HOOK"
-
-test_expect_success 'with succeeding hook' '
-
-	echo "more" >> file &&
-	git add file &&
-	git commit -m "more"
-
-'
-
-test_expect_success '--no-verify with succeeding hook' '
-
-	echo "even more" >> file &&
-	git add file &&
-	git commit --no-verify -m "even more"
-
-'
-
-# now a hook that fails
-cat > "$HOOK" <<EOF
-#!/bin/sh
-exit 1
-EOF
-
-test_expect_success 'with failing hook' '
-
-	echo "another" >> file &&
-	git add file &&
-	test_must_fail git commit -m "another"
-
-'
-
-test_expect_success '--no-verify with failing hook' '
-
-	echo "stuff" >> file &&
-	git add file &&
-	git commit --no-verify -m "stuff"
-
-'
-
-chmod -x "$HOOK"
-test_expect_success POSIXPERM 'with non-executable hook' '
-
-	echo "content" >> file &&
-	git add file &&
-	git commit -m "content"
-
-'
-
-test_expect_success POSIXPERM '--no-verify with non-executable hook' '
-
-	echo "more content" >> file &&
-	git add file &&
-	git commit --no-verify -m "more content"
-
-'
-chmod +x "$HOOK"
-
-# a hook that checks $GIT_PREFIX and succeeds inside the
-# success/ subdirectory only
-cat > "$HOOK" <<EOF
-#!/bin/sh
-test \$GIT_PREFIX = success/
-EOF
-
-test_expect_success 'with hook requiring GIT_PREFIX' '
-
-	echo "more content" >> file &&
-	git add file &&
-	mkdir success &&
-	(
-		cd success &&
-		git commit -m "hook requires GIT_PREFIX = success/"
-	) &&
-	rmdir success
-'
-
-test_expect_success 'with failing hook requiring GIT_PREFIX' '
-
-	echo "more content" >> file &&
-	git add file &&
-	mkdir fail &&
-	(
-		cd fail &&
-		test_must_fail git commit -m "hook must fail"
-	) &&
-	rmdir fail &&
-	git checkout -- file
-'
-
-test_expect_success 'check the author in hook' '
-	write_script "$HOOK" <<-\EOF &&
-	test "$GIT_AUTHOR_NAME" = "New Author" &&
-	test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
-	EOF
-	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
-	(
-		GIT_AUTHOR_NAME="New Author" &&
-		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
-		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
-		git commit --allow-empty -m "by new.author via env" &&
-		git show -s
-	) &&
-	git commit --author="New Author <newauthor@example.com>" \
-		--allow-empty -m "by new.author via command line" &&
-	git show -s
-'
-
-test_done
diff --git a/third_party/git/t/t7505-prepare-commit-msg-hook.sh b/third_party/git/t/t7505-prepare-commit-msg-hook.sh
index ba8bd1b51497..94f85cdf8317 100755
--- a/third_party/git/t/t7505-prepare-commit-msg-hook.sh
+++ b/third_party/git/t/t7505-prepare-commit-msg-hook.sh
@@ -241,13 +241,7 @@ test_rebase () {
 			git add b &&
 			git rebase --continue
 		) &&
-		if test "$mode" = -p # reword amended after pick
-		then
-			n=18
-		else
-			n=17
-		fi &&
-		git log --pretty=%s -g -n$n HEAD@{1} >actual &&
+		git log --pretty=%s -g -n18 HEAD@{1} >actual &&
 		test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual
 	'
 }
diff --git a/third_party/git/t/t7505/expected-rebase-i b/third_party/git/t/t7505/expected-rebase-i
index c514bdbb9422..93bada596e25 100644
--- a/third_party/git/t/t7505/expected-rebase-i
+++ b/third_party/git/t/t7505/expected-rebase-i
@@ -7,7 +7,8 @@ message (no editor) [edit rebase-10]
 message [fixup rebase-9]
 message (no editor) [fixup rebase-8]
 message (no editor) [squash rebase-7]
-message [reword rebase-6]
+HEAD [reword rebase-6]
+message (no editor) [reword rebase-6]
 message [squash rebase-5]
 message (no editor) [fixup rebase-4]
 message (no editor) [pick rebase-3]
diff --git a/third_party/git/t/t7508-status.sh b/third_party/git/t/t7508-status.sh
index 4e676cdce8d6..482ce3510edd 100755
--- a/third_party/git/t/t7508-status.sh
+++ b/third_party/git/t/t7508-status.sh
@@ -1571,7 +1571,7 @@ test_expect_success '"status.showStash=true" weaker than "--no-show-stash"' '
 	test_cmp expected_without_stash actual
 '
 
-test_expect_success 'no additionnal info if no stash entries' '
+test_expect_success 'no additional info if no stash entries' '
 	git stash clear &&
 	git -c status.showStash=true status >actual &&
 	test_cmp expected_without_stash actual
diff --git a/third_party/git/t/t7510-signed-commit.sh b/third_party/git/t/t7510-signed-commit.sh
index 682b23a06818..0c06d22a0079 100755
--- a/third_party/git/t/t7510-signed-commit.sh
+++ b/third_party/git/t/t7510-signed-commit.sh
@@ -109,6 +109,21 @@ test_expect_success GPG 'verify-commit exits success on untrusted signature' '
 	grep "not certified" actual
 '
 
+test_expect_success GPG 'verify-commit exits success with matching minTrustLevel' '
+	test_config gpg.minTrustLevel ultimate &&
+	git verify-commit sixth-signed
+'
+
+test_expect_success GPG 'verify-commit exits success with low minTrustLevel' '
+	test_config gpg.minTrustLevel fully &&
+	git verify-commit sixth-signed
+'
+
+test_expect_success GPG 'verify-commit exits failure with high minTrustLevel' '
+	test_config gpg.minTrustLevel ultimate &&
+	test_must_fail git verify-commit eighth-signed-alt
+'
+
 test_expect_success GPG 'verify signatures with --raw' '
 	(
 		for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
@@ -219,6 +234,30 @@ test_expect_success GPG 'show untrusted signature with custom format' '
 	test_cmp expect actual
 '
 
+test_expect_success GPG 'show untrusted signature with undefined trust level' '
+	cat >expect <<-\EOF &&
+	undefined
+	65A0EEA02E30CAD7
+	Eris Discordia <discord@example.net>
+	F8364A59E07FFE9F4D63005A65A0EEA02E30CAD7
+	D4BE22311AD3131E5EDA29A461092E85B7227189
+	EOF
+	git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success GPG 'show untrusted signature with ultimate trust level' '
+	cat >expect <<-\EOF &&
+	ultimate
+	13B6F51ECDDE430D
+	C O Mitter <committer@example.com>
+	73D758744BE721698EC54E8713B6F51ECDDE430D
+	73D758744BE721698EC54E8713B6F51ECDDE430D
+	EOF
+	git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success GPG 'show unknown signature with custom format' '
 	cat >expect <<-\EOF &&
 	E
diff --git a/third_party/git/t/t7512-status-help.sh b/third_party/git/t/t7512-status-help.sh
index e01c285cbf8f..29518e0949bf 100755
--- a/third_party/git/t/t7512-status-help.sh
+++ b/third_party/git/t/t7512-status-help.sh
@@ -71,10 +71,10 @@ test_expect_success 'prepare for rebase conflicts' '
 '
 
 
-test_expect_success 'status when rebase in progress before resolving conflicts' '
+test_expect_success 'status when rebase --apply in progress before resolving conflicts' '
 	test_when_finished "git rebase --abort" &&
 	ONTO=$(git rev-parse --short HEAD^^) &&
-	test_must_fail git rebase HEAD^ --onto HEAD^^ &&
+	test_must_fail git rebase --apply HEAD^ --onto HEAD^^ &&
 	cat >expected <<EOF &&
 rebase in progress; onto $ONTO
 You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''.
@@ -94,11 +94,11 @@ EOF
 '
 
 
-test_expect_success 'status when rebase in progress before rebase --continue' '
+test_expect_success 'status when rebase --apply in progress before rebase --continue' '
 	git reset --hard rebase_conflicts &&
 	test_when_finished "git rebase --abort" &&
 	ONTO=$(git rev-parse --short HEAD^^) &&
-	test_must_fail git rebase HEAD^ --onto HEAD^^ &&
+	test_must_fail git rebase --apply HEAD^ --onto HEAD^^ &&
 	echo three >main.txt &&
 	git add main.txt &&
 	cat >expected <<EOF &&
@@ -688,7 +688,7 @@ EOF
 '
 
 
-test_expect_success 'status when rebase conflicts with statushints disabled' '
+test_expect_success 'status when rebase --apply conflicts with statushints disabled' '
 	git reset --hard master &&
 	git checkout -b statushints_disabled &&
 	test_when_finished "git config --local advice.statushints true" &&
@@ -698,7 +698,7 @@ test_expect_success 'status when rebase conflicts with statushints disabled' '
 	test_commit three_statushints main.txt three &&
 	test_when_finished "git rebase --abort" &&
 	ONTO=$(git rev-parse --short HEAD^^) &&
-	test_must_fail git rebase HEAD^ --onto HEAD^^ &&
+	test_must_fail git rebase --apply HEAD^ --onto HEAD^^ &&
 	cat >expected <<EOF &&
 rebase in progress; onto $ONTO
 You are currently rebasing branch '\''statushints_disabled'\'' on '\''$ONTO'\''.
@@ -733,6 +733,7 @@ test_expect_success 'status when cherry-picking before resolving conflicts' '
 On branch cherry_branch
 You are currently cherry-picking commit $TO_CHERRY_PICK.
   (fix conflicts and run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
 Unmerged paths:
@@ -757,6 +758,7 @@ test_expect_success 'status when cherry-picking after resolving conflicts' '
 On branch cherry_branch
 You are currently cherry-picking commit $TO_CHERRY_PICK.
   (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
 Changes to be committed:
@@ -778,6 +780,7 @@ test_expect_success 'status when cherry-picking after committing conflict resolu
 On branch cherry_branch
 Cherry-pick currently in progress.
   (run "git cherry-pick --continue" to continue)
+  (use "git cherry-pick --skip" to skip this patch)
   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
 nothing to commit (use -u to show untracked files)
@@ -835,6 +838,7 @@ test_expect_success 'status while reverting commit (conflicts)' '
 On branch master
 You are currently reverting commit $TO_REVERT.
   (fix conflicts and run "git revert --continue")
+  (use "git revert --skip" to skip this patch)
   (use "git revert --abort" to cancel the revert operation)
 
 Unmerged paths:
@@ -855,6 +859,7 @@ test_expect_success 'status while reverting commit (conflicts resolved)' '
 On branch master
 You are currently reverting commit $TO_REVERT.
   (all conflicts fixed: run "git revert --continue")
+  (use "git revert --skip" to skip this patch)
   (use "git revert --abort" to cancel the revert operation)
 
 Changes to be committed:
@@ -887,6 +892,7 @@ test_expect_success 'status while reverting after committing conflict resolution
 On branch master
 Revert currently in progress.
   (run "git revert --continue" to continue)
+  (use "git revert --skip" to skip this patch)
   (use "git revert --abort" to cancel the revert operation)
 
 nothing to commit (use -u to show untracked files)
diff --git a/third_party/git/t/t7513-interpret-trailers.sh b/third_party/git/t/t7513-interpret-trailers.sh
index f19202b50989..6602790b5f4c 100755
--- a/third_party/git/t/t7513-interpret-trailers.sh
+++ b/third_party/git/t/t7513-interpret-trailers.sh
@@ -1234,7 +1234,7 @@ test_expect_success 'with simple command' '
 	test_cmp expected actual
 '
 
-test_expect_success 'with command using commiter information' '
+test_expect_success 'with command using committer information' '
 	git config trailer.sign.ifExists "addIfDifferent" &&
 	git config trailer.sign.command "echo \"\$GIT_COMMITTER_NAME <\$GIT_COMMITTER_EMAIL>\"" &&
 	cat complex_message_body >expected &&
diff --git a/third_party/git/t/t7519-status-fsmonitor.sh b/third_party/git/t/t7519-status-fsmonitor.sh
index 81a375fa0ff9..fbfdcca00077 100755
--- a/third_party/git/t/t7519-status-fsmonitor.sh
+++ b/third_party/git/t/t7519-status-fsmonitor.sh
@@ -32,11 +32,12 @@ write_integration_script () {
 		echo "$0: exactly 2 arguments expected"
 		exit 2
 	fi
-	if test "$1" != 1
+	if test "$1" != 2
 	then
 		echo "Unsupported core.fsmonitor hook version." >&2
 		exit 1
 	fi
+	printf "last_update_token\0"
 	printf "untracked\0"
 	printf "dir1/untracked\0"
 	printf "dir2/untracked\0"
@@ -106,6 +107,9 @@ EOF
 
 # test that "update-index --fsmonitor-valid" sets the fsmonitor valid bit
 test_expect_success 'update-index --fsmonitor-valid" sets the fsmonitor valid bit' '
+	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+		printf "last_update_token\0"
+	EOF
 	git update-index --fsmonitor &&
 	git update-index --fsmonitor-valid dir1/modified &&
 	git update-index --fsmonitor-valid dir2/modified &&
@@ -164,6 +168,9 @@ EOF
 
 # test that newly added files are marked valid
 test_expect_success 'newly added files are marked valid' '
+	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+		printf "last_update_token\0"
+	EOF
 	git add new &&
 	git add dir1/new &&
 	git add dir2/new &&
@@ -203,6 +210,7 @@ EOF
 # test that *only* files returned by the integration script get flagged as invalid
 test_expect_success '*only* files returned by the integration script get flagged as invalid' '
 	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+	printf "last_update_token\0"
 	printf "dir1/modified\0"
 	EOF
 	clean_repo &&
@@ -218,11 +226,12 @@ test_expect_success '*only* files returned by the integration script get flagged
 # Ensure commands that call refresh_index() to move the index back in time
 # properly invalidate the fsmonitor cache
 test_expect_success 'refresh_index() invalidates fsmonitor cache' '
-	write_script .git/hooks/fsmonitor-test<<-\EOF &&
-	EOF
 	clean_repo &&
 	dirty_repo &&
+	write_integration_script &&
 	git add . &&
+	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+	EOF
 	git commit -m "to reset" &&
 	git reset HEAD~1 &&
 	git status >actual &&
@@ -271,6 +280,7 @@ do
 		# (if enabled) files unless it is told about them.
 		test_expect_success "status doesn't detect unreported modifications" '
 			write_script .git/hooks/fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
 			:>marker
 			EOF
 			clean_repo &&
@@ -294,7 +304,7 @@ do
 	done
 done
 
-# test that splitting the index dosn't interfere
+# test that splitting the index doesn't interfere
 test_expect_success 'splitting the index results in the same state' '
 	write_integration_script &&
 	dirty_repo &&
@@ -354,4 +364,23 @@ test_expect_success 'discard_index() also discards fsmonitor info' '
 	test_cmp expect actual
 '
 
+# Test unstaging entries that:
+#  - Are not flagged with CE_FSMONITOR_VALID
+#  - Have a position in the index >= the number of entries present in the index
+#    after unstaging.
+test_expect_success 'status succeeds after staging/unstaging' '
+	test_create_repo fsmonitor-stage-unstage &&
+	(
+		cd fsmonitor-stage-unstage &&
+		test_commit initial &&
+		git update-index --fsmonitor &&
+		removed=$(test_seq 1 100 | sed "s/^/z/") &&
+		touch $removed &&
+		git add $removed &&
+		git config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-env" &&
+		FSMONITOR_LIST="$removed" git restore -S $removed &&
+		FSMONITOR_LIST="$removed" git status
+	)
+'
+
 test_done
diff --git a/third_party/git/t/t7519/fsmonitor-all b/third_party/git/t/t7519/fsmonitor-all
index 691bc94dc2c8..94ab66bd3d86 100755
--- a/third_party/git/t/t7519/fsmonitor-all
+++ b/third_party/git/t/t7519/fsmonitor-all
@@ -17,7 +17,6 @@ fi
 
 if test "$1" != 1
 then
-	echo "Unsupported core.fsmonitor hook version." >&2
 	exit 1
 fi
 
diff --git a/third_party/git/t/t7519/fsmonitor-all-v2 b/third_party/git/t/t7519/fsmonitor-all-v2
new file mode 100755
index 000000000000..061907e88b65
--- /dev/null
+++ b/third_party/git/t/t7519/fsmonitor-all-v2
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+#
+# An test hook script to integrate with git to test fsmonitor.
+#
+# The hook is passed a version (currently 2) and since token
+# formatted as a string and outputs to stdout all files that have been
+# modified since the given time. Paths must be relative to the root of
+# the working tree and separated by a single NUL.
+#
+#echo "$0 $*" >&2
+my ($version, $last_update_token) = @ARGV;
+
+if ($version ne 2) {
+	print "Unsupported query-fsmonitor hook version '$version'.\n";
+	exit 1;
+}
+
+print "last_update_token\0/\0"
diff --git a/third_party/git/t/t7519/fsmonitor-env b/third_party/git/t/t7519/fsmonitor-env
new file mode 100755
index 000000000000..8f1f7ab164e1
--- /dev/null
+++ b/third_party/git/t/t7519/fsmonitor-env
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An test hook script to integrate with git to test fsmonitor.
+#
+# The hook is passed a version (currently 1) and a time in nanoseconds
+# formatted as a string and outputs to stdout all files that have been
+# modified since the given time. Paths must be relative to the root of
+# the working tree and separated by a single NUL.
+#
+#echo "$0 $*" >&2
+
+if test "$#" -ne 2
+then
+	echo "$0: exactly 2 arguments expected" >&2
+	exit 2
+fi
+
+if test "$1" != 1
+then
+	echo "Unsupported core.fsmonitor hook version." >&2
+	exit 1
+fi
+
+printf '%s\n' $FSMONITOR_LIST
diff --git a/third_party/git/t/t7519/fsmonitor-watchman b/third_party/git/t/t7519/fsmonitor-watchman
index 5514edcf68be..264b9daf834e 100755
--- a/third_party/git/t/t7519/fsmonitor-watchman
+++ b/third_party/git/t/t7519/fsmonitor-watchman
@@ -23,10 +23,10 @@ my ($version, $time) = @ARGV;
 
 if ($version == 1) {
 	# convert nanoseconds to seconds
-	$time = int $time / 1000000000;
+	# subtract one second to make sure watchman will return all changes
+	$time = int ($time / 1000000000) - 1;
 } else {
-	die "Unsupported query-fsmonitor hook version '$version'.\n" .
-	    "Falling back to scanning...\n";
+	exit 1;
 }
 
 my $git_work_tree;
@@ -54,18 +54,12 @@ sub launch_watchman {
 	#
 	# To accomplish this, we're using the "since" generator to use the
 	# recency index to select candidate nodes and "fields" to limit the
-	# output to file names only. Then we're using the "expression" term to
-	# further constrain the results.
-	#
-	# The category of transient files that we want to ignore will have a
-	# creation clock (cclock) newer than $time_t value and will also not
-	# currently exist.
+	# output to file names only.
 
 	my $query = <<"	END";
 		["query", "$git_work_tree", {
 			"since": $time,
-			"fields": ["name"],
-			"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
+			"fields": ["name"]
 		}]
 	END
 	
diff --git a/third_party/git/t/t7519/fsmonitor-watchman-v2 b/third_party/git/t/t7519/fsmonitor-watchman-v2
new file mode 100755
index 000000000000..14ed0aa42de0
--- /dev/null
+++ b/third_party/git/t/t7519/fsmonitor-watchman-v2
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
+	my $query = <<"	END";
+		["query", "$git_work_tree", {
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
+		}]
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}
diff --git a/third_party/git/t/t7526-commit-pathspec-file.sh b/third_party/git/t/t7526-commit-pathspec-file.sh
new file mode 100755
index 000000000000..5fbe47ebcd02
--- /dev/null
+++ b/third_party/git/t/t7526-commit-pathspec-file.sh
@@ -0,0 +1,164 @@
+#!/bin/sh
+
+test_description='commit --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	test_commit file0 &&
+	git tag checkpoint &&
+
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t
+'
+
+restore_checkpoint () {
+	git reset --soft checkpoint
+}
+
+verify_expect () {
+	git diff-tree --no-commit-id --name-status -r HEAD >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	echo fileA.t | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git commit --pathspec-from-file=list -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git commit --pathspec-from-file=- --pathspec-file-nul -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git commit --pathspec-from-file=list -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git commit --pathspec-from-file=list --pathspec-file-nul -m "Commit"
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileB.t
+	A	fileC.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
+
+	test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+
+	test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+
+	test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&
+	test_i18ngrep -e "--pathspec-from-file with -a does not make sense" err &&
+
+	test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+
+	test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+
+	test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err &&
+	test_i18ngrep -e "No paths with --include/--only does not make sense." err &&
+
+	test_must_fail git commit --pathspec-from-file=empty_list --only -m "Commit" 2>err &&
+	test_i18ngrep -e "No paths with --include/--only does not make sense." err
+'
+
+test_done
diff --git a/third_party/git/t/t7612-merge-verify-signatures.sh b/third_party/git/t/t7612-merge-verify-signatures.sh
index d99218a725c5..a426f3a89aa7 100755
--- a/third_party/git/t/t7612-merge-verify-signatures.sh
+++ b/third_party/git/t/t7612-merge-verify-signatures.sh
@@ -66,6 +66,20 @@ test_expect_success GPG 'merge commit with untrusted signature with verification
 	test_i18ngrep "has an untrusted GPG signature" mergeerror
 '
 
+test_expect_success GPG 'merge commit with untrusted signature with verification and high minTrustLevel' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel marginal &&
+	test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
+	test_i18ngrep "has an untrusted GPG signature" mergeerror
+'
+
+test_expect_success GPG 'merge commit with untrusted signature with verification and low minTrustLevel' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel undefined &&
+	git merge --ff-only --verify-signatures side-untrusted >mergeoutput &&
+	test_i18ngrep "has a good GPG signature" mergeoutput
+'
+
 test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true' '
 	test_when_finished "git reset --hard && git checkout initial" &&
 	test_config merge.verifySignatures true &&
@@ -73,6 +87,14 @@ test_expect_success GPG 'merge commit with untrusted signature with merge.verify
 	test_i18ngrep "has an untrusted GPG signature" mergeerror
 '
 
+test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config merge.verifySignatures true &&
+	test_config gpg.minTrustLevel marginal &&
+	test_must_fail git merge --ff-only side-untrusted 2>mergeerror &&
+	test_i18ngrep "has an untrusted GPG signature" mergeerror
+'
+
 test_expect_success GPG 'merge signed commit with verification' '
 	test_when_finished "git reset --hard && git checkout initial" &&
 	git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput &&
diff --git a/third_party/git/t/t7700-repack.sh b/third_party/git/t/t7700-repack.sh
index 4e855bc21b45..25b235c06303 100755
--- a/third_party/git/t/t7700-repack.sh
+++ b/third_party/git/t/t7700-repack.sh
@@ -4,129 +4,104 @@ test_description='git repack works correctly'
 
 . ./test-lib.sh
 
-commit_and_pack() {
-	test_commit "$@" >/dev/null &&
-	SHA1=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) &&
-	echo pack-${SHA1}.pack
+commit_and_pack () {
+	test_commit "$@" 1>&2 &&
+	incrpackid=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) &&
+	echo pack-${incrpackid}.pack
+}
+
+test_no_missing_in_packs () {
+	myidx=$(ls -1 .git/objects/pack/*.idx) &&
+	test_path_is_file "$myidx" &&
+	git verify-pack -v alt_objects/pack/*.idx >orig.raw &&
+	sed -n -e "s/^\($OID_REGEX\).*/\1/p" orig.raw | sort >orig &&
+	git verify-pack -v $myidx >dest.raw &&
+	cut -d" " -f1 dest.raw | sort >dest &&
+	comm -23 orig dest >missing &&
+	test_must_be_empty missing
+}
+
+# we expect $packid and $oid to be defined
+test_has_duplicate_object () {
+	want_duplicate_object="$1"
+	found_duplicate_object=false
+	for p in .git/objects/pack/*.idx
+	do
+		idx=$(basename $p)
+		test "pack-$packid.idx" = "$idx" && continue
+		git verify-pack -v $p >packlist || return $?
+		if grep "^$oid" packlist
+		then
+			found_duplicate_object=true
+			echo "DUPLICATE OBJECT FOUND"
+			break
+		fi
+	done &&
+	test "$want_duplicate_object" = "$found_duplicate_object"
 }
 
 test_expect_success 'objects in packs marked .keep are not repacked' '
-	echo content1 > file1 &&
-	echo content2 > file2 &&
+	echo content1 >file1 &&
+	echo content2 >file2 &&
 	git add . &&
 	test_tick &&
 	git commit -m initial_commit &&
 	# Create two packs
 	# The first pack will contain all of the objects except one
-	git rev-list --objects --all | grep -v file2 |
-		git pack-objects pack > /dev/null &&
+	git rev-list --objects --all >objs &&
+	grep -v file2 objs | git pack-objects pack &&
 	# The second pack will contain the excluded object
-	packsha1=$(git rev-list --objects --all | grep file2 |
-		git pack-objects pack) &&
-	>pack-$packsha1.keep &&
-	objsha1=$(git verify-pack -v pack-$packsha1.idx | head -n 1 |
-		sed -e "s/^\([0-9a-f]\{40\}\).*/\1/") &&
+	packid=$(grep file2 objs | git pack-objects pack) &&
+	>pack-$packid.keep &&
+	git verify-pack -v pack-$packid.idx >packlist &&
+	oid=$(head -n 1 packlist | sed -e "s/^\($OID_REGEX\).*/\1/") &&
 	mv pack-* .git/objects/pack/ &&
 	git repack -A -d -l &&
 	git prune-packed &&
-	for p in .git/objects/pack/*.idx; do
-		idx=$(basename $p)
-		test "pack-$packsha1.idx" = "$idx" && continue
-		if git verify-pack -v $p | egrep "^$objsha1"; then
-			found_duplicate_object=1
-			echo "DUPLICATE OBJECT FOUND"
-			break
-		fi
-	done &&
-	test -z "$found_duplicate_object"
+	test_has_duplicate_object false
 '
 
 test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' '
-	# build on $objsha1, $packsha1, and .keep state from previous
+	# build on $oid, $packid, and .keep state from previous
 	git repack -Adbl &&
-	test_when_finished "found_duplicate_object=" &&
-	for p in .git/objects/pack/*.idx; do
-		idx=$(basename $p)
-		test "pack-$packsha1.idx" = "$idx" && continue
-		if git verify-pack -v $p | egrep "^$objsha1"; then
-			found_duplicate_object=1
-			echo "DUPLICATE OBJECT FOUND"
-			break
-		fi
-	done &&
-	test "$found_duplicate_object" = 1
+	test_has_duplicate_object true
 '
 
 test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
-	# build on $objsha1, $packsha1, and .keep state from previous
+	# build on $oid, $packid, and .keep state from previous
 	git -c repack.writebitmaps=true repack -Adl &&
-	test_when_finished "found_duplicate_object=" &&
-	for p in .git/objects/pack/*.idx; do
-		idx=$(basename $p)
-		test "pack-$packsha1.idx" = "$idx" && continue
-		if git verify-pack -v $p | egrep "^$objsha1"; then
-			found_duplicate_object=1
-			echo "DUPLICATE OBJECT FOUND"
-			break
-		fi
-	done &&
-	test "$found_duplicate_object" = 1
+	test_has_duplicate_object true
 '
 
 test_expect_success 'loose objects in alternate ODB are not repacked' '
 	mkdir alt_objects &&
-	echo $(pwd)/alt_objects > .git/objects/info/alternates &&
-	echo content3 > file3 &&
-	objsha1=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
+	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
+	echo content3 >file3 &&
+	oid=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
 	git add file3 &&
 	test_tick &&
 	git commit -m commit_file3 &&
 	git repack -a -d -l &&
 	git prune-packed &&
-	for p in .git/objects/pack/*.idx; do
-		if git verify-pack -v $p | egrep "^$objsha1"; then
-			found_duplicate_object=1
-			echo "DUPLICATE OBJECT FOUND"
-			break
-		fi
-	done &&
-	test -z "$found_duplicate_object"
+	test_has_duplicate_object false
 '
 
 test_expect_success 'packed obs in alt ODB are repacked even when local repo is packless' '
 	mkdir alt_objects/pack &&
 	mv .git/objects/pack/* alt_objects/pack &&
 	git repack -a &&
-	myidx=$(ls -1 .git/objects/pack/*.idx) &&
-	test -f "$myidx" &&
-	for p in alt_objects/pack/*.idx; do
-		git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
-	done | while read sha1 rest; do
-		if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
-			echo "Missing object in local pack: $sha1"
-			return 1
-		fi
-	done
+	test_no_missing_in_packs
 '
 
 test_expect_success 'packed obs in alt ODB are repacked when local repo has packs' '
 	rm -f .git/objects/pack/* &&
-	echo new_content >> file1 &&
+	echo new_content >>file1 &&
 	git add file1 &&
 	test_tick &&
 	git commit -m more_content &&
 	git repack &&
 	git repack -a -d &&
-	myidx=$(ls -1 .git/objects/pack/*.idx) &&
-	test -f "$myidx" &&
-	for p in alt_objects/pack/*.idx; do
-		git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
-	done | while read sha1 rest; do
-		if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
-			echo "Missing object in local pack: $sha1"
-			return 1
-		fi
-	done
+	test_no_missing_in_packs
 '
 
 test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
@@ -134,7 +109,7 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
 	for p in alt_objects/pack/*.pack
 	do
 		base_name=$(basename $p .pack) &&
-		if test -f alt_objects/pack/$base_name.keep
+		if test_path_is_file alt_objects/pack/$base_name.keep
 		then
 			rm alt_objects/pack/$base_name.keep
 		else
@@ -142,22 +117,13 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
 		fi
 	done &&
 	git repack -a -d &&
-	myidx=$(ls -1 .git/objects/pack/*.idx) &&
-	test -f "$myidx" &&
-	for p in alt_objects/pack/*.idx; do
-		git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
-	done | while read sha1 rest; do
-		if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
-			echo "Missing object in local pack: $sha1"
-			return 1
-		fi
-	done
+	test_no_missing_in_packs
 '
 
 test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
 	rm -f alt_objects/pack/*.keep &&
 	mv .git/objects/pack/* alt_objects/pack/ &&
-	csha1=$(git rev-parse HEAD^{commit}) &&
+	coid=$(git rev-parse HEAD^{commit}) &&
 	git reset --hard HEAD^ &&
 	test_tick &&
 	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
@@ -167,15 +133,15 @@ test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
 	    --unpack-unreachable </dev/null pack &&
 	rm -f .git/objects/pack/* &&
 	mv pack-* .git/objects/pack/ &&
-	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		egrep "^$csha1 " | sort | uniq | wc -l) &&
-	echo > .git/objects/info/alternates &&
-	test_must_fail git show $csha1
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " packlist &&
+	echo >.git/objects/info/alternates &&
+	test_must_fail git show $coid
 '
 
 test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' '
-	echo $(pwd)/alt_objects > .git/objects/info/alternates &&
-	echo "$csha1" | git pack-objects --non-empty --all --reflog pack &&
+	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
+	echo "$coid" | git pack-objects --non-empty --all --reflog pack &&
 	rm -f .git/objects/pack/* &&
 	mv pack-* .git/objects/pack/ &&
 	# The pack-objects call on the next line is equivalent to
@@ -184,10 +150,10 @@ test_expect_success 'local packed unreachable obs that exist in alternate ODB ar
 	    --unpack-unreachable </dev/null pack &&
 	rm -f .git/objects/pack/* &&
 	mv pack-* .git/objects/pack/ &&
-	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		egrep "^$csha1 " | sort | uniq | wc -l) &&
-	echo > .git/objects/info/alternates &&
-	test_must_fail git show $csha1
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " &&
+	echo >.git/objects/info/alternates &&
+	test_must_fail git show $coid
 '
 
 test_expect_success 'objects made unreachable by grafts only are kept' '
@@ -196,7 +162,7 @@ test_expect_success 'objects made unreachable by grafts only are kept' '
 	H0=$(git rev-parse HEAD) &&
 	H1=$(git rev-parse HEAD^) &&
 	H2=$(git rev-parse HEAD^^) &&
-	echo "$H0 $H2" > .git/info/grafts &&
+	echo "$H0 $H2" >.git/info/grafts &&
 	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
 	git repack -a -d &&
 	git cat-file -t $H1
@@ -235,7 +201,7 @@ test_expect_success 'incremental repack does not complain' '
 
 test_expect_success 'bitmaps can be disabled on bare repos' '
 	git -c repack.writeBitmaps=false -C bare.git repack -ad &&
-	bitmap=$(ls bare.git/objects/pack/*.bitmap 2>/dev/null || :) &&
+	bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
 	test -z "$bitmap"
 '
 
diff --git a/third_party/git/t/t7800-difftool.sh b/third_party/git/t/t7800-difftool.sh
index 6bac9ed180e7..29b92907e2ad 100755
--- a/third_party/git/t/t7800-difftool.sh
+++ b/third_party/git/t/t7800-difftool.sh
@@ -125,15 +125,14 @@ test_expect_success 'difftool stops on error with --trust-exit-code' '
 	test_when_finished "rm -f for-diff .git/fail-right-file" &&
 	test_when_finished "git reset -- for-diff" &&
 	write_script .git/fail-right-file <<-\EOF &&
-	echo "$2"
+	echo failed
 	exit 1
 	EOF
 	>for-diff &&
 	git add for-diff &&
-	echo file >expect &&
 	test_must_fail git difftool -y --trust-exit-code \
 		--extcmd .git/fail-right-file branch >actual &&
-	test_cmp expect actual
+	test_line_count = 1 actual
 '
 
 test_expect_success 'difftool honors exit status if command not found' '
diff --git a/third_party/git/t/t7811-grep-open.sh b/third_party/git/t/t7811-grep-open.sh
index d1ebfd88c7a9..a98785da7955 100755
--- a/third_party/git/t/t7811-grep-open.sh
+++ b/third_party/git/t/t7811-grep-open.sh
@@ -113,7 +113,6 @@ test_expect_success 'modified file' '
 	subdir/grep.c
 	unrelated
 	EOF
-	>empty &&
 
 	echo "enum grep_pat_token" >unrelated &&
 	test_when_finished "git checkout HEAD unrelated" &&
diff --git a/third_party/git/t/t7812-grep-icase-non-ascii.sh b/third_party/git/t/t7812-grep-icase-non-ascii.sh
index 0c685d35986e..03dba6685ab7 100755
--- a/third_party/git/t/t7812-grep-icase-non-ascii.sh
+++ b/third_party/git/t/t7812-grep-icase-non-ascii.sh
@@ -53,4 +53,35 @@ test_expect_success REGEX_LOCALE 'pickaxe -i on non-ascii' '
 	test_cmp expected actual
 '
 
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: setup invalid UTF-8 data' '
+	printf "\\200\\n" >invalid-0x80 &&
+	echo "รฆvar" >expected &&
+	cat expected >>invalid-0x80 &&
+	git add invalid-0x80
+'
+
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data' '
+	git grep -h "var" invalid-0x80 >actual &&
+	test_cmp expected actual &&
+	git grep -h "(*NO_JIT)var" invalid-0x80 >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data' '
+	git grep -h "รฆ" invalid-0x80 >actual &&
+	test_cmp expected actual &&
+	git grep -h "(*NO_JIT)รฆ" invalid-0x80 >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
+	test_might_fail git grep -hi "ร†" invalid-0x80 >actual &&
+	if test -s actual
+	then
+	    test_cmp expected actual
+	fi &&
+	test_must_fail git grep -hi "(*NO_JIT)ร†" invalid-0x80 >actual &&
+	! test_cmp expected actual
+'
+
 test_done
diff --git a/third_party/git/t/t7814-grep-recurse-submodules.sh b/third_party/git/t/t7814-grep-recurse-submodules.sh
index a11366b4cee4..828cb3ba5818 100755
--- a/third_party/git/t/t7814-grep-recurse-submodules.sh
+++ b/third_party/git/t/t7814-grep-recurse-submodules.sh
@@ -345,7 +345,16 @@ test_incompatible_with_recurse_submodules ()
 }
 
 test_incompatible_with_recurse_submodules --untracked
-test_incompatible_with_recurse_submodules --no-index
+
+test_expect_success 'grep --recurse-submodules --no-index ignores --recurse-submodules' '
+	git grep --recurse-submodules --no-index -e "^(.|.)[\d]" >actual &&
+	cat >expect <<-\EOF &&
+	a:(1|2)d(3|4)
+	submodule/a:(1|2)d(3|4)
+	submodule/sub/a:(1|2)d(3|4)
+	EOF
+	test_cmp expect actual
+'
 
 test_expect_success 'grep --recurse-submodules should pass the pattern type along' '
 	# Fixed
@@ -408,4 +417,25 @@ test_expect_success 'grep --recurse-submodules with submodules without .gitmodul
 	test_cmp expect actual
 '
 
+reset_and_clean () {
+	git reset --hard &&
+	git clean -fd &&
+	git submodule foreach --recursive 'git reset --hard' &&
+	git submodule foreach --recursive 'git clean -fd'
+}
+
+test_expect_success 'grep --recurse-submodules without --cached considers worktree modifications' '
+	reset_and_clean &&
+	echo "A modified line in submodule" >>submodule/a &&
+	echo "submodule/a:A modified line in submodule" >expect &&
+	git grep --recurse-submodules "A modified line in submodule" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'grep --recurse-submodules with --cached ignores worktree modifications' '
+	reset_and_clean &&
+	echo "A modified line in submodule" >>submodule/a &&
+	test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
+	test_must_be_empty actual
+'
 test_done
diff --git a/third_party/git/t/t7008-grep-binary.sh b/third_party/git/t/t7815-grep-binary.sh
index 2d87c49b7539..90ebb64f46eb 100755
--- a/third_party/git/t/t7008-grep-binary.sh
+++ b/third_party/git/t/t7815-grep-binary.sh
@@ -4,41 +4,6 @@ test_description='git grep in binary files'
 
 . ./test-lib.sh
 
-nul_match () {
-	matches=$1
-	flags=$2
-	pattern=$3
-	pattern_human=$(echo "$pattern" | sed 's/Q/<NUL>/g')
-
-	if test "$matches" = 1
-	then
-		test_expect_success "git grep -f f $flags '$pattern_human' a" "
-			printf '$pattern' | q_to_nul >f &&
-			git grep -f f $flags a
-		"
-	elif test "$matches" = 0
-	then
-		test_expect_success "git grep -f f $flags '$pattern_human' a" "
-			printf '$pattern' | q_to_nul >f &&
-			test_must_fail git grep -f f $flags a
-		"
-	elif test "$matches" = T1
-	then
-		test_expect_failure "git grep -f f $flags '$pattern_human' a" "
-			printf '$pattern' | q_to_nul >f &&
-			git grep -f f $flags a
-		"
-	elif test "$matches" = T0
-	then
-		test_expect_failure "git grep -f f $flags '$pattern_human' a" "
-			printf '$pattern' | q_to_nul >f &&
-			test_must_fail git grep -f f $flags a
-		"
-	else
-		test_expect_success "PANIC: Test framework error. Unknown matches value $matches" 'false'
-	fi
-}
-
 test_expect_success 'setup' "
 	echo 'binaryQfileQm[*]cQ*รฆQรฐ' | q_to_nul >a &&
 	git add a &&
@@ -102,72 +67,6 @@ test_expect_failure 'git grep .fi a' '
 	git grep .fi a
 '
 
-nul_match 1 '-F' 'yQf'
-nul_match 0 '-F' 'yQx'
-nul_match 1 '-Fi' 'YQf'
-nul_match 0 '-Fi' 'YQx'
-nul_match 1 '' 'yQf'
-nul_match 0 '' 'yQx'
-nul_match 1 '' 'รฆQรฐ'
-nul_match 1 '-F' 'eQm[*]c'
-nul_match 1 '-Fi' 'EQM[*]C'
-
-# Regex patterns that would match but shouldn't with -F
-nul_match 0 '-F' 'yQ[f]'
-nul_match 0 '-F' '[y]Qf'
-nul_match 0 '-Fi' 'YQ[F]'
-nul_match 0 '-Fi' '[Y]QF'
-nul_match 0 '-F' 'รฆQ[รฐ]'
-nul_match 0 '-F' '[รฆ]Qรฐ'
-nul_match 0 '-Fi' 'ร†Q[ร]'
-nul_match 0 '-Fi' '[ร†]Qร'
-
-# kwset is disabled on -i & non-ASCII. No way to match non-ASCII \0
-# patterns case-insensitively.
-nul_match T1 '-i' 'ร†Qร'
-
-# \0 implicitly disables regexes. This is an undocumented internal
-# limitation.
-nul_match T1 '' 'yQ[f]'
-nul_match T1 '' '[y]Qf'
-nul_match T1 '-i' 'YQ[F]'
-nul_match T1 '-i' '[Y]Qf'
-nul_match T1 '' 'รฆQ[รฐ]'
-nul_match T1 '' '[รฆ]Qรฐ'
-nul_match T1 '-i' 'ร†Q[ร]'
-
-# ... because of \0 implicitly disabling regexes regexes that
-# should/shouldn't match don't do the right thing.
-nul_match T1 '' 'eQm.*cQ'
-nul_match T1 '-i' 'EQM.*cQ'
-nul_match T0 '' 'eQm[*]c'
-nul_match T0 '-i' 'EQM[*]C'
-
-# Due to the REG_STARTEND extension when kwset() is disabled on -i &
-# non-ASCII the string will be matched in its entirety, but the
-# pattern will be cut off at the first \0.
-nul_match 0 '-i' 'NOMATCHQรฐ'
-nul_match T0 '-i' '[ร†]QNOMATCH'
-nul_match T0 '-i' '[รฆ]QNOMATCH'
-# Matches, but for the wrong reasons, just stops at [รฆ]
-nul_match 1 '-i' '[ร†]Qรฐ'
-nul_match 1 '-i' '[รฆ]Qรฐ'
-
-# Ensure that the matcher doesn't regress to something that stops at
-# \0
-nul_match 0 '-F' 'yQ[f]'
-nul_match 0 '-Fi' 'YQ[F]'
-nul_match 0 '' 'yQNOMATCH'
-nul_match 0 '' 'QNOMATCH'
-nul_match 0 '-i' 'YQNOMATCH'
-nul_match 0 '-i' 'QNOMATCH'
-nul_match 0 '-F' 'รฆQ[รฐ]'
-nul_match 0 '-Fi' 'ร†Q[ร]'
-nul_match 0 '' 'yQNร“MATCH'
-nul_match 0 '' 'QNร“MATCH'
-nul_match 0 '-i' 'YQNร“MATCH'
-nul_match 0 '-i' 'QNร“MATCH'
-
 test_expect_success 'grep respects binary diff attribute' '
 	echo text >t &&
 	git add t &&
diff --git a/third_party/git/t/t7816-grep-binary-pattern.sh b/third_party/git/t/t7816-grep-binary-pattern.sh
new file mode 100755
index 000000000000..60bab291e49c
--- /dev/null
+++ b/third_party/git/t/t7816-grep-binary-pattern.sh
@@ -0,0 +1,127 @@
+#!/bin/sh
+
+test_description='git grep with a binary pattern files'
+
+. ./lib-gettext.sh
+
+nul_match_internal () {
+	matches=$1
+	prereqs=$2
+	lc_all=$3
+	extra_flags=$4
+	flags=$5
+	pattern=$6
+	pattern_human=$(echo "$pattern" | sed 's/Q/<NUL>/g')
+
+	if test "$matches" = 1
+	then
+		test_expect_success $prereqs "LC_ALL='$lc_all' git grep $extra_flags -f f $flags '$pattern_human' a" "
+			printf '$pattern' | q_to_nul >f &&
+			LC_ALL='$lc_all' git grep $extra_flags -f f $flags a
+		"
+	elif test "$matches" = 0
+	then
+		test_expect_success $prereqs "LC_ALL='$lc_all' git grep $extra_flags -f f $flags '$pattern_human' a" "
+			>stderr &&
+			printf '$pattern' | q_to_nul >f &&
+			test_must_fail env LC_ALL=\"$lc_all\" git grep $extra_flags -f f $flags a 2>stderr &&
+			test_i18ngrep ! 'This is only supported with -P under PCRE v2' stderr
+		"
+	elif test "$matches" = P
+	then
+		test_expect_success $prereqs "error, PCRE v2 only: LC_ALL='$lc_all' git grep -f f $flags '$pattern_human' a" "
+			>stderr &&
+			printf '$pattern' | q_to_nul >f &&
+			test_must_fail env LC_ALL=\"$lc_all\" git grep -f f $flags a 2>stderr &&
+			test_i18ngrep 'This is only supported with -P under PCRE v2' stderr
+		"
+	else
+		test_expect_success "PANIC: Test framework error. Unknown matches value $matches" 'false'
+	fi
+}
+
+nul_match () {
+	matches=$1
+	matches_pcre2=$2
+	matches_pcre2_locale=$3
+	flags=$4
+	pattern=$5
+	pattern_human=$(echo "$pattern" | sed 's/Q/<NUL>/g')
+
+	nul_match_internal "$matches" "" "C" "" "$flags" "$pattern"
+	nul_match_internal "$matches_pcre2" "LIBPCRE2" "C" "-P" "$flags" "$pattern"
+	nul_match_internal "$matches_pcre2_locale" "LIBPCRE2,GETTEXT_LOCALE" "$is_IS_locale" "-P" "$flags" "$pattern"
+}
+
+test_expect_success 'setup' "
+	echo 'binaryQfileQm[*]cQ*รฆQรฐ' | q_to_nul >a &&
+	git add a &&
+	git commit -m.
+"
+
+# Simple fixed-string matching that can use kwset (no -i && non-ASCII)
+nul_match P P P '-F' 'yQf'
+nul_match P P P '-F' 'yQx'
+nul_match P P P '-Fi' 'YQf'
+nul_match P P P '-Fi' 'YQx'
+nul_match P P 1 '' 'yQf'
+nul_match P P 0 '' 'yQx'
+nul_match P P 1 '' 'รฆQรฐ'
+nul_match P P P '-F' 'eQm[*]c'
+nul_match P P P '-Fi' 'EQM[*]C'
+
+# Regex patterns that would match but shouldn't with -F
+nul_match P P P '-F' 'yQ[f]'
+nul_match P P P '-F' '[y]Qf'
+nul_match P P P '-Fi' 'YQ[F]'
+nul_match P P P '-Fi' '[Y]QF'
+nul_match P P P '-F' 'รฆQ[รฐ]'
+nul_match P P P '-F' '[รฆ]Qรฐ'
+
+# The -F kwset codepath can't handle -i && non-ASCII...
+nul_match P 1 1 '-i' '[รฆ]Qรฐ'
+
+# ...PCRE v2 only matches non-ASCII with -i casefolding under UTF-8
+# semantics
+nul_match P P P '-Fi' 'ร†Q[ร]'
+nul_match P 0 1 '-i'  'ร†Q[ร]'
+nul_match P 0 1 '-i'  '[ร†]Qร'
+nul_match P 0 1 '-i' '[ร†]Qรฐ'
+nul_match P 0 1 '-i' 'ร†Qร'
+
+# \0 in regexes can only work with -P & PCRE v2
+nul_match P P 1 '' 'yQ[f]'
+nul_match P P 1 '' '[y]Qf'
+nul_match P P 1 '-i' 'YQ[F]'
+nul_match P P 1 '-i' '[Y]Qf'
+nul_match P P 1 '' 'รฆQ[รฐ]'
+nul_match P P 1 '' '[รฆ]Qรฐ'
+nul_match P P 1 '-i' 'ร†Q[ร]'
+nul_match P P 1 '' 'eQm.*cQ'
+nul_match P P 1 '-i' 'EQM.*cQ'
+nul_match P P 0 '' 'eQm[*]c'
+nul_match P P 0 '-i' 'EQM[*]C'
+
+# Assert that we're using REG_STARTEND and the pattern doesn't match
+# just because it's cut off at the first \0.
+nul_match P P 0 '-i' 'NOMATCHQรฐ'
+nul_match P P 0 '-i' '[ร†]QNOMATCH'
+nul_match P P 0 '-i' '[รฆ]QNOMATCH'
+
+# Ensure that the matcher doesn't regress to something that stops at
+# \0
+nul_match P P P '-F' 'yQ[f]'
+nul_match P P P '-Fi' 'YQ[F]'
+nul_match P P 0 '' 'yQNOMATCH'
+nul_match P P 0 '' 'QNOMATCH'
+nul_match P P 0 '-i' 'YQNOMATCH'
+nul_match P P 0 '-i' 'QNOMATCH'
+nul_match P P P '-F' 'รฆQ[รฐ]'
+nul_match P P P '-Fi' 'ร†Q[ร]'
+nul_match P P 1 '-i' 'ร†Q[ร]'
+nul_match P P 0 '' 'yQNร“MATCH'
+nul_match P P 0 '' 'QNร“MATCH'
+nul_match P P 0 '-i' 'YQNร“MATCH'
+nul_match P P 0 '-i' 'QNร“MATCH'
+
+test_done
diff --git a/third_party/git/t/t8003-blame-corner-cases.sh b/third_party/git/t/t8003-blame-corner-cases.sh
index 1c5fb1d1f8c9..9130b887d2cc 100755
--- a/third_party/git/t/t8003-blame-corner-cases.sh
+++ b/third_party/git/t/t8003-blame-corner-cases.sh
@@ -173,7 +173,6 @@ test_expect_success 'blame during cherry-pick with file rename conflict' '
 	git show HEAD@{1}:rodent > rodent &&
 	git add rodent &&
 	git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
-	cat current &&
 	cat >expected <<-\EOF &&
 	mouse-Initial
 	mouse-Second
diff --git a/third_party/git/t/t9001-send-email.sh b/third_party/git/t/t9001-send-email.sh
index 997f90b42b3e..90f61c340095 100755
--- a/third_party/git/t/t9001-send-email.sh
+++ b/third_party/git/t/t9001-send-email.sh
@@ -1194,8 +1194,8 @@ test_expect_success $PREREQ 'in-reply-to but no threading' '
 		--to=nobody@example.com \
 		--in-reply-to="<in-reply-id@example.com>" \
 		--no-thread \
-		$patches |
-	grep "In-Reply-To: <in-reply-id@example.com>"
+		$patches >out &&
+	grep "In-Reply-To: <in-reply-id@example.com>" out
 '
 
 test_expect_success $PREREQ 'no in-reply-to and no threading' '
@@ -1260,7 +1260,7 @@ test_expect_success $PREREQ 'sendemail.identity: --no-identity clears previous i
 	grep "To: default@example.com" stdout
 '
 
-test_expect_success $PREREQ 'sendemail.identity: bool identity variable existance overrides' '
+test_expect_success $PREREQ 'sendemail.identity: bool identity variable existence overrides' '
 	git -c sendemail.identity=cloud \
 		-c sendemail.xmailer=true \
 		-c sendemail.cloud.xmailer=false \
@@ -2066,7 +2066,7 @@ test_expect_success $PREREQ 'leading and trailing whitespaces are removed' '
 	TO1=$(echo "QTo 1 <to1@example.com>" | q_to_tab) &&
 	TO2=$(echo "QZto2" | qz_to_tab_space) &&
 	CC1=$(echo "cc1" | append_cr) &&
-	BCC1=$(echo "Q bcc1@example.com Q" | q_to_nul) &&
+	BCC1=$(echo " bcc1@example.com Q" | q_to_nul) &&
 	git send-email \
 	--dry-run \
 	--from="	Example <from@example.com>" \
diff --git a/third_party/git/t/t9010-svn-fe.sh b/third_party/git/t/t9010-svn-fe.sh
index 0b20b07e6898..c90fdc5c8940 100755
--- a/third_party/git/t/t9010-svn-fe.sh
+++ b/third_party/git/t/t9010-svn-fe.sh
@@ -53,8 +53,6 @@ text_no_props () {
 	printf "%s\n" "$text"
 }
 
->empty
-
 test_expect_success 'empty dump' '
 	reinit_git &&
 	echo "SVN-fs-dump-format-version: 2" >input &&
@@ -208,7 +206,7 @@ test_expect_failure 'timestamp and empty file' '
 	test_cmp expect.date actual.date &&
 	test_cmp expect.files actual.files &&
 	git checkout HEAD empty-file &&
-	test_cmp empty file
+	test_must_be_empty file
 '
 
 test_expect_success 'directory with files' '
diff --git a/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh b/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh
index dbe8deac0d2f..aec45bca3b7b 100755
--- a/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh
+++ b/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh
@@ -92,7 +92,8 @@ test_expect_success 'multiple dcommit from git svn will not clobber svn' "
 
 
 test_expect_success 'check that rebase really failed' '
-	test -d .git/rebase-apply
+	git status >output &&
+	grep currently.rebasing output
 '
 
 test_expect_success 'resolve, continue the rebase and dcommit' "
diff --git a/third_party/git/t/t9116-git-svn-log.sh b/third_party/git/t/t9116-git-svn-log.sh
index 45773ee560da..0a9f1ef366db 100755
--- a/third_party/git/t/t9116-git-svn-log.sh
+++ b/third_party/git/t/t9116-git-svn-log.sh
@@ -43,14 +43,18 @@ test_expect_success 'setup repository and import' '
 
 test_expect_success 'run log' "
 	git reset --hard origin/a &&
-	git svn log -r2 origin/trunk | grep ^r2 &&
-	git svn log -r4 origin/trunk | grep ^r4 &&
-	git svn log -r3 | grep ^r3
+	git svn log -r2 origin/trunk >out &&
+	grep ^r2 out &&
+	git svn log -r4 origin/trunk >out &&
+	grep ^r4 out &&
+	git svn log -r3 >out &&
+	grep ^r3 out
 	"
 
 test_expect_success 'run log against a from trunk' "
 	git reset --hard origin/trunk &&
-	git svn log -r3 origin/a | grep ^r3
+	git svn log -r3 origin/a >out &&
+	grep ^r3 out
 	"
 
 printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4
diff --git a/third_party/git/t/t9300-fast-import.sh b/third_party/git/t/t9300-fast-import.sh
index 141b7fa35e74..3e41c58a1368 100755
--- a/third_party/git/t/t9300-fast-import.sh
+++ b/third_party/git/t/t9300-fast-import.sh
@@ -85,6 +85,36 @@ test_expect_success 'A: create pack from stdin' '
 	An annotated tag that annotates a blob.
 	EOF
 
+	tag to-be-deleted
+	from :3
+	data <<EOF
+	Another annotated tag that annotates a blob.
+	EOF
+
+	reset refs/tags/to-be-deleted
+	from 0000000000000000000000000000000000000000
+
+	tag nested
+	mark :6
+	from :4
+	data <<EOF
+	Tag of our lovely commit
+	EOF
+
+	reset refs/tags/nested
+	from 0000000000000000000000000000000000000000
+
+	tag nested
+	mark :7
+	from :6
+	data <<EOF
+	Tag of tag of our lovely commit
+	EOF
+
+	alias
+	mark :8
+	to :5
+
 	INPUT_END
 	git fast-import --export-marks=marks.out <input &&
 	git whatchanged master
@@ -157,12 +187,19 @@ test_expect_success 'A: verify tag/series-A-blob' '
 	test_cmp expect actual
 '
 
+test_expect_success 'A: verify tag deletion is successful' '
+	test_must_fail git rev-parse --verify refs/tags/to-be-deleted
+'
+
 test_expect_success 'A: verify marks output' '
 	cat >expect <<-EOF &&
 	:2 $(git rev-parse --verify master:file2)
 	:3 $(git rev-parse --verify master:file3)
 	:4 $(git rev-parse --verify master:file4)
 	:5 $(git rev-parse --verify master^0)
+	:6 $(git cat-file tag nested | grep object | cut -d" " -f 2)
+	:7 $(git rev-parse --verify nested)
+	:8 $(git rev-parse --verify master^0)
 	EOF
 	test_cmp expect marks.out
 '
@@ -1010,7 +1047,6 @@ test_expect_success 'M: rename root to subdirectory' '
 	EOF
 	git fast-import <input &&
 	git diff-tree -M -r M4^ M4 >actual &&
-	cat actual &&
 	compare_diff_raw expect actual
 '
 
@@ -2106,12 +2142,27 @@ test_expect_success 'R: abort on receiving feature after data command' '
 	test_must_fail git fast-import <input
 '
 
+test_expect_success 'R: import-marks features forbidden by default' '
+	>git.marks &&
+	echo "feature import-marks=git.marks" >input &&
+	test_must_fail git fast-import <input &&
+	echo "feature import-marks-if-exists=git.marks" >input &&
+	test_must_fail git fast-import <input
+'
+
 test_expect_success 'R: only one import-marks feature allowed per stream' '
+	>git.marks &&
+	>git2.marks &&
 	cat >input <<-EOF &&
 	feature import-marks=git.marks
 	feature import-marks=git2.marks
 	EOF
 
+	test_must_fail git fast-import --allow-unsafe-features <input
+'
+
+test_expect_success 'R: export-marks feature forbidden by default' '
+	echo "feature export-marks=git.marks" >input &&
 	test_must_fail git fast-import <input
 '
 
@@ -2125,19 +2176,29 @@ test_expect_success 'R: export-marks feature results in a marks file being creat
 
 	EOF
 
-	cat input | git fast-import &&
+	git fast-import --allow-unsafe-features <input &&
 	grep :1 git.marks
 '
 
 test_expect_success 'R: export-marks options can be overridden by commandline options' '
-	cat input | git fast-import --export-marks=other.marks &&
-	grep :1 other.marks
+	cat >input <<-\EOF &&
+	feature export-marks=feature-sub/git.marks
+	blob
+	mark :1
+	data 3
+	hi
+
+	EOF
+	git fast-import --allow-unsafe-features \
+			--export-marks=cmdline-sub/other.marks <input &&
+	grep :1 cmdline-sub/other.marks &&
+	test_path_is_missing feature-sub
 '
 
 test_expect_success 'R: catch typo in marks file name' '
 	test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null &&
 	echo "feature import-marks=nonexistent.marks" |
-	test_must_fail git fast-import
+	test_must_fail git fast-import --allow-unsafe-features
 '
 
 test_expect_success 'R: import and output marks can be the same file' '
@@ -2192,7 +2253,8 @@ test_expect_success 'R: --import-marks-if-exists' '
 test_expect_success 'R: feature import-marks-if-exists' '
 	rm -f io.marks &&
 
-	git fast-import --export-marks=io.marks <<-\EOF &&
+	git fast-import --export-marks=io.marks \
+			--allow-unsafe-features <<-\EOF &&
 	feature import-marks-if-exists=not_io.marks
 	EOF
 	test_must_be_empty io.marks &&
@@ -2203,7 +2265,8 @@ test_expect_success 'R: feature import-marks-if-exists' '
 	echo ":1 $blob" >expect &&
 	echo ":2 $blob" >>expect &&
 
-	git fast-import --export-marks=io.marks <<-\EOF &&
+	git fast-import --export-marks=io.marks \
+			--allow-unsafe-features <<-\EOF &&
 	feature import-marks-if-exists=io.marks
 	blob
 	mark :2
@@ -2216,7 +2279,8 @@ test_expect_success 'R: feature import-marks-if-exists' '
 	echo ":3 $blob" >>expect &&
 
 	git fast-import --import-marks=io.marks \
-			--export-marks=io.marks <<-\EOF &&
+			--export-marks=io.marks \
+			--allow-unsafe-features <<-\EOF &&
 	feature import-marks-if-exists=not_io.marks
 	blob
 	mark :3
@@ -2227,7 +2291,8 @@ test_expect_success 'R: feature import-marks-if-exists' '
 	test_cmp expect io.marks &&
 
 	git fast-import --import-marks-if-exists=not_io.marks \
-			--export-marks=io.marks <<-\EOF &&
+			--export-marks=io.marks \
+			--allow-unsafe-features <<-\EOF &&
 	feature import-marks-if-exists=io.marks
 	EOF
 	test_must_be_empty io.marks
@@ -2239,7 +2304,7 @@ test_expect_success 'R: import to output marks works without any content' '
 	feature export-marks=marks.new
 	EOF
 
-	cat input | git fast-import &&
+	git fast-import --allow-unsafe-features <input &&
 	test_cmp marks.out marks.new
 '
 
@@ -2249,7 +2314,7 @@ test_expect_success 'R: import marks prefers commandline marks file over the str
 	feature export-marks=marks.new
 	EOF
 
-	cat input | git fast-import --import-marks=marks.out &&
+	git fast-import --import-marks=marks.out --allow-unsafe-features <input &&
 	test_cmp marks.out marks.new
 '
 
@@ -2262,7 +2327,8 @@ test_expect_success 'R: multiple --import-marks= should be honoured' '
 
 	head -n2 marks.out > one.marks &&
 	tail -n +3 marks.out > two.marks &&
-	git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
+	git fast-import --import-marks=one.marks --import-marks=two.marks \
+		--allow-unsafe-features <input &&
 	test_cmp marks.out combined.marks
 '
 
@@ -2275,7 +2341,7 @@ test_expect_success 'R: feature relative-marks should be honoured' '
 
 	mkdir -p .git/info/fast-import/ &&
 	cp marks.new .git/info/fast-import/relative.in &&
-	git fast-import <input &&
+	git fast-import --allow-unsafe-features <input &&
 	test_cmp marks.new .git/info/fast-import/relative.out
 '
 
@@ -2287,7 +2353,7 @@ test_expect_success 'R: feature no-relative-marks should be honoured' '
 	feature export-marks=non-relative.out
 	EOF
 
-	git fast-import <input &&
+	git fast-import --allow-unsafe-features <input &&
 	test_cmp marks.new non-relative.out
 '
 
@@ -2440,9 +2506,6 @@ test_expect_success PIPE 'R: copy using cat-file' '
 	echo $expect_id blob $expect_len >expect.response &&
 
 	rm -f blobs &&
-	cat >frontend <<-\FRONTEND_END &&
-	#!/bin/sh
-	FRONTEND_END
 
 	mkfifo blobs &&
 	(
@@ -2557,7 +2620,7 @@ test_expect_success 'R: quiet option results in no stats being output' '
 
 	EOF
 
-	cat input | git fast-import 2> output &&
+	git fast-import 2>output <input &&
 	test_must_be_empty output
 '
 
@@ -2781,7 +2844,6 @@ test_expect_success 'S: filemodify with garbage after mark must fail' '
 	COMMIT
 	M 100644 :403x hello.c
 	EOF
-	cat err &&
 	test_i18ngrep "space after mark" err
 '
 
@@ -2798,7 +2860,6 @@ test_expect_success 'S: filemodify with garbage after inline must fail' '
 	inline
 	BLOB
 	EOF
-	cat err &&
 	test_i18ngrep "nvalid dataref" err
 '
 
@@ -2812,7 +2873,6 @@ test_expect_success 'S: filemodify with garbage after sha1 must fail' '
 	COMMIT
 	M 100644 ${sha1}x hello.c
 	EOF
-	cat err &&
 	test_i18ngrep "space after SHA1" err
 '
 
@@ -2828,7 +2888,6 @@ test_expect_success 'S: notemodify with garbage after mark dataref must fail' '
 	COMMIT
 	N :202x :302
 	EOF
-	cat err &&
 	test_i18ngrep "space after mark" err
 '
 
@@ -2844,7 +2903,6 @@ test_expect_success 'S: notemodify with garbage after inline dataref must fail'
 	note blob
 	BLOB
 	EOF
-	cat err &&
 	test_i18ngrep "nvalid dataref" err
 '
 
@@ -2858,7 +2916,6 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '
 	COMMIT
 	N ${sha1}x :302
 	EOF
-	cat err &&
 	test_i18ngrep "space after SHA1" err
 '
 
@@ -2874,7 +2931,6 @@ test_expect_success 'S: notemodify with garbage after mark commit-ish must fail'
 	COMMIT
 	N :202 :302x
 	EOF
-	cat err &&
 	test_i18ngrep "after mark" err
 '
 
@@ -2908,7 +2964,6 @@ test_expect_success 'S: from with garbage after mark must fail' '
 	EOF
 
 	# now evaluate the error
-	cat err &&
 	test_i18ngrep "after mark" err
 '
 
@@ -2928,7 +2983,6 @@ test_expect_success 'S: merge with garbage after mark must fail' '
 	merge :303x
 	M 100644 :403 hello.c
 	EOF
-	cat err &&
 	test_i18ngrep "after mark" err
 '
 
@@ -2944,7 +2998,6 @@ test_expect_success 'S: tag with garbage after mark must fail' '
 	tag S
 	TAG
 	EOF
-	cat err &&
 	test_i18ngrep "after mark" err
 '
 
@@ -2955,7 +3008,6 @@ test_expect_success 'S: cat-blob with garbage after mark must fail' '
 	test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
 	cat-blob :403x
 	EOF
-	cat err &&
 	test_i18ngrep "after mark" err
 '
 
@@ -2966,7 +3018,6 @@ test_expect_success 'S: ls with garbage after mark must fail' '
 	test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
 	ls :302x hello.c
 	EOF
-	cat err &&
 	test_i18ngrep "space after mark" err
 '
 
@@ -2975,7 +3026,6 @@ test_expect_success 'S: ls with garbage after sha1 must fail' '
 	test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
 	ls ${sha1}x hello.c
 	EOF
-	cat err &&
 	test_i18ngrep "space after tree-ish" err
 '
 
@@ -3140,13 +3190,22 @@ background_import_then_checkpoint () {
 	exec 9<>V.output
 	rm V.output
 
-	git fast-import $options <&8 >&9 &
-	echo $! >V.pid
+	(
+		git fast-import $options <&8 >&9 &
+		echo $! >&9
+		wait $!
+		echo >&2 "background fast-import terminated too early with exit code $?"
+		# Un-block the read loop in the main shell process.
+		echo >&9 UNEXPECTED
+	) &
+	sh_pid=$!
+	read fi_pid <&9
 	# We don't mind if fast-import has already died by the time the test
 	# ends.
 	test_when_finished "
 		exec 8>&-; exec 9>&-;
-		kill $(cat V.pid) && wait $(cat V.pid)
+		kill $sh_pid && wait $sh_pid
+		kill $fi_pid && wait $fi_pid
 		true"
 
 	# Start in the background to ensure we adhere strictly to (blocking)
@@ -3166,6 +3225,9 @@ background_import_then_checkpoint () {
 		then
 			error=0
 			break
+		elif test "$output" = "UNEXPECTED"
+		then
+			break
 		fi
 		# otherwise ignore cruft
 		echo >&2 "cruft: $output"
@@ -3178,7 +3240,7 @@ background_import_then_checkpoint () {
 }
 
 background_import_still_running () {
-	if ! kill -0 "$(cat V.pid)"
+	if ! kill -0 "$fi_pid"
 	then
 		echo >&2 "background fast-import terminated too early"
 		false
diff --git a/third_party/git/t/t9301-fast-import-notes.sh b/third_party/git/t/t9301-fast-import-notes.sh
index dadc70b7d570..ca223dca9888 100755
--- a/third_party/git/t/t9301-fast-import-notes.sh
+++ b/third_party/git/t/t9301-fast-import-notes.sh
@@ -275,7 +275,7 @@ $whitespace
     third note for first commit
 EXPECT_END
 
-test_expect_success 'add concatentation notes with M command' '
+test_expect_success 'add concatenation notes with M command' '
 
 	git fast-import <input &&
 	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
diff --git a/third_party/git/t/t9350-fast-export.sh b/third_party/git/t/t9350-fast-export.sh
index b4004e05c2a7..690c90fb8290 100755
--- a/third_party/git/t/t9350-fast-export.sh
+++ b/third_party/git/t/t9350-fast-export.sh
@@ -53,6 +53,33 @@ test_expect_success 'fast-export | fast-import' '
 
 '
 
+test_expect_success 'fast-export ^muss^{commit} muss' '
+	git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
+	cat >expected <<-EOF &&
+	tag muss
+	from $(git rev-parse --verify muss^{commit})
+	$(git cat-file tag muss | grep tagger)
+	data 9
+	valentin
+
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'fast-export --mark-tags ^muss^{commit} muss' '
+	git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
+	cat >expected <<-EOF &&
+	tag muss
+	mark :1
+	from $(git rev-parse --verify muss^{commit})
+	$(git cat-file tag muss | grep tagger)
+	data 9
+	valentin
+
+	EOF
+	test_cmp expected actual
+'
+
 test_expect_success 'fast-export master~2..master' '
 
 	git fast-export master~2..master >actual &&
@@ -513,10 +540,41 @@ test_expect_success 'tree_tag'        '
 '
 
 # NEEDSWORK: not just check return status, but validate the output
+# Note that these tests DO NOTHING other than print a warning that
+# they are omitting the one tag we asked them to export (because the
+# tags resolve to a tree).  They exist just to make sure we do not
+# abort but instead just warn.
 test_expect_success 'tree_tag-obj'    'git fast-export tree_tag-obj'
 test_expect_success 'tag-obj_tag'     'git fast-export tag-obj_tag'
 test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
 
+test_expect_success 'handling tags of blobs' '
+	git tag -a -m "Tag of a blob" blobtag $(git rev-parse master:file) &&
+	git fast-export blobtag >actual &&
+	cat >expect <<-EOF &&
+	blob
+	mark :1
+	data 9
+	die Luft
+
+	tag blobtag
+	from :1
+	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 14
+	Tag of a blob
+
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'handling nested tags' '
+	git tag -a -m "This is a nested tag" nested muss &&
+	git fast-export --mark-tags nested >output &&
+	grep "^from $ZERO_OID$" output &&
+	grep "^tag nested$" output >tag_lines &&
+	test_line_count = 2 tag_lines
+'
+
 test_expect_success 'directory becomes symlink'        '
 	git init dirtosymlink &&
 	git init result &&
@@ -542,9 +600,10 @@ test_expect_success 'directory becomes symlink'        '
 
 test_expect_success 'fast-export quotes pathnames' '
 	git init crazy-paths &&
+	test_config -C crazy-paths core.protectNTFS false &&
 	(cd crazy-paths &&
 	 blob=$(echo foo | git hash-object -w --stdin) &&
-	 git update-index --add \
+	 git -c core.protectNTFS=false update-index --add \
 		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
 		--cacheinfo 100644 $blob "path with \"quote\"" \
 		--cacheinfo 100644 $blob "path with \\backslash" \
@@ -567,17 +626,15 @@ test_expect_success 'fast-export quotes pathnames' '
 '
 
 test_expect_success 'test bidirectionality' '
-	>marks-cur &&
-	>marks-new &&
 	git init marks-test &&
-	git fast-export --export-marks=marks-cur --import-marks=marks-cur --branches | \
-	git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks=marks-new &&
+	git fast-export --export-marks=marks-cur --import-marks-if-exists=marks-cur --branches | \
+	git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks-if-exists=marks-new &&
 	(cd marks-test &&
 	git reset --hard &&
 	echo Wohlauf > file &&
 	git commit -a -m "back in time") &&
-	git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks=marks-new --branches | \
-	git fast-import --export-marks=marks-cur --import-marks=marks-cur
+	git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks-if-exists=marks-new --branches | \
+	git fast-import --export-marks=marks-cur --import-marks-if-exists=marks-cur
 '
 
 cat > expected << EOF
diff --git a/third_party/git/t/t9502-gitweb-standalone-parse-output.sh b/third_party/git/t/t9502-gitweb-standalone-parse-output.sh
index 0796a438bc77..e38cbc97d38e 100755
--- a/third_party/git/t/t9502-gitweb-standalone-parse-output.sh
+++ b/third_party/git/t/t9502-gitweb-standalone-parse-output.sh
@@ -188,8 +188,8 @@ test_expect_success 'forks: project_index lists all projects (incl. forks)' '
 '
 
 xss() {
-	echo >&2 "Checking $1..." &&
-	gitweb_run "$1" &&
+	echo >&2 "Checking $*..." &&
+	gitweb_run "$@" &&
 	if grep "$TAG" gitweb.body; then
 		echo >&2 "xss: $TAG should have been quoted in output"
 		return 1
@@ -200,7 +200,8 @@ xss() {
 test_expect_success 'xss checks' '
 	TAG="<magic-xss-tag>" &&
 	xss "a=rss&p=$TAG" &&
-	xss "a=rss&p=foo.git&f=$TAG"
+	xss "a=rss&p=foo.git&f=$TAG" &&
+	xss "" "$TAG+"
 '
 
 test_done
diff --git a/third_party/git/t/t9800-git-p4-basic.sh b/third_party/git/t/t9800-git-p4-basic.sh
index 5856563068c7..c98c1dfc2308 100755
--- a/third_party/git/t/t9800-git-p4-basic.sh
+++ b/third_party/git/t/t9800-git-p4-basic.sh
@@ -202,7 +202,6 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
 		export PATH &&
 		test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
 	) &&
-	cat errs &&
 	test_i18ngrep ! Traceback errs
 '
 
diff --git a/third_party/git/t/t9809-git-p4-client-view.sh b/third_party/git/t/t9809-git-p4-client-view.sh
index 3cff1fce1b74..9c9710d8c7b8 100755
--- a/third_party/git/t/t9809-git-p4-client-view.sh
+++ b/third_party/git/t/t9809-git-p4-client-view.sh
@@ -407,7 +407,7 @@ test_expect_success 'reinit depot' '
 '
 
 #
-# What happens when two files of the same name are overlayed together?
+# What happens when two files of the same name are overlaid together?
 # The last-listed file should take preference.
 #
 # //depot
diff --git a/third_party/git/t/t9810-git-p4-rcs.sh b/third_party/git/t/t9810-git-p4-rcs.sh
index 57b533dc6fba..e3836888ec8b 100755
--- a/third_party/git/t/t9810-git-p4-rcs.sh
+++ b/third_party/git/t/t9810-git-p4-rcs.sh
@@ -294,7 +294,6 @@ test_expect_success 'cope with rcs keyword file deletion' '
 		echo "\$Revision\$" >kwdelfile.c &&
 		p4 add -t ktext kwdelfile.c &&
 		p4 submit -d "Add file to be deleted" &&
-		cat kwdelfile.c &&
 		grep 1 kwdelfile.c
 	) &&
 	git p4 clone --dest="$git" //depot &&
diff --git a/third_party/git/t/t9902-completion.sh b/third_party/git/t/t9902-completion.sh
index 75512c340366..5505e5aa249e 100755
--- a/third_party/git/t/t9902-completion.sh
+++ b/third_party/git/t/t9902-completion.sh
@@ -28,10 +28,10 @@ complete ()
 #
 # (2) A test makes sure that common subcommands are included in the
 #     completion for "git <TAB>", and a plumbing is excluded.  "add",
-#     "filter-branch" and "ls-files" are listed for this.
+#     "rebase" and "ls-files" are listed for this.
 
-GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr filter-branch ls-files'
-GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout filter-branch'
+GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr rebase ls-files'
+GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout rebase'
 
 . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash"
 
@@ -378,7 +378,7 @@ test_expect_success '__gitdir - finds repo' '
 '
 
 
-test_expect_success '__gitdir - returns error when cant find repo' '
+test_expect_success '__gitdir - returns error when cannot find repo' '
 	(
 		__git_dir="non-existing" &&
 		test_must_fail __gitdir >"$actual"
@@ -945,7 +945,7 @@ test_expect_success 'setup for filtering matching refs' '
 	rm -f .git/FETCH_HEAD
 '
 
-test_expect_success '__git_refs - dont filter refs unless told so' '
+test_expect_success '__git_refs - do not filter refs unless told so' '
 	cat >expected <<-EOF &&
 	HEAD
 	master
@@ -1257,7 +1257,7 @@ test_path_completion ()
 		# In the following tests calling this function we only
 		# care about how __git_complete_index_file() deals with
 		# unusual characters in path names.  By requesting only
-		# untracked files we dont have to bother adding any
+		# untracked files we do not have to bother adding any
 		# paths to the index in those tests.
 		__git_complete_index_file --others &&
 		print_comp
@@ -1363,6 +1363,63 @@ test_expect_success 'teardown after path completion tests' '
 	       BS\\dir '$'separators\034in\035dir''
 '
 
+test_expect_success '__git_find_on_cmdline - single match' '
+	echo list >expect &&
+	(
+		words=(git command --opt list) &&
+		cword=${#words[@]} &&
+		__git_find_on_cmdline "add list remove" >actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success '__git_find_on_cmdline - multiple matches' '
+	echo remove >expect &&
+	(
+		words=(git command -o --opt remove list add) &&
+		cword=${#words[@]} &&
+		__git_find_on_cmdline "add list remove" >actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success '__git_find_on_cmdline - no match' '
+	(
+		words=(git command --opt branch) &&
+		cword=${#words[@]} &&
+		__git_find_on_cmdline "add list remove" >actual
+	) &&
+	test_must_be_empty actual
+'
+
+test_expect_success '__git_find_on_cmdline - single match with index' '
+	echo "3 list" >expect &&
+	(
+		words=(git command --opt list) &&
+		cword=${#words[@]} &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success '__git_find_on_cmdline - multiple matches with index' '
+	echo "4 remove" >expect &&
+	(
+		words=(git command -o --opt remove list add) &&
+		cword=${#words[@]} &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success '__git_find_on_cmdline - no match with index' '
+	(
+		words=(git command --opt branch) &&
+		cword=${#words[@]} &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_must_be_empty actual
+'
 
 test_expect_success '__git_get_config_variables' '
 	cat >expect <<-EOF &&
@@ -1392,12 +1449,12 @@ test_expect_success 'basic' '
 	# built-in
 	grep -q "^add \$" out &&
 	# script
-	grep -q "^filter-branch \$" out &&
+	grep -q "^rebase \$" out &&
 	# plumbing
 	! grep -q "^ls-files \$" out &&
 
-	run_completion "git f" &&
-	! grep -q -v "^f" out
+	run_completion "git r" &&
+	! grep -q -v "^r" out
 '
 
 test_expect_success 'double dash "git" itself' '
@@ -1438,6 +1495,8 @@ test_expect_success 'double dash "git checkout"' '
 	--no-guess Z
 	--no-... Z
 	--overlay Z
+	--pathspec-file-nul Z
+	--pathspec-from-file=Z
 	EOF
 '
 
@@ -1548,7 +1607,10 @@ test_expect_success 'complete tree filename with metacharacters' '
 '
 
 test_expect_success PERL 'send-email' '
-	test_completion "git send-email --cov" "--cover-letter " &&
+	test_completion "git send-email --cov" <<-\EOF &&
+	--cover-from-description=Z
+	--cover-letter Z
+	EOF
 	test_completion "git send-email ma" "master "
 '
 
@@ -1698,6 +1760,69 @@ do
 	'
 done
 
+test_expect_success 'git config - section' '
+	test_completion "git config br" <<-\EOF
+	branch.Z
+	browser.Z
+	EOF
+'
+
+test_expect_success 'git config - variable name' '
+	test_completion "git config log.d" <<-\EOF
+	log.date Z
+	log.decorate Z
+	EOF
+'
+
+test_expect_success 'git config - value' '
+	test_completion "git config color.pager " <<-\EOF
+	false Z
+	true Z
+	EOF
+'
+
+test_expect_success 'git -c - section' '
+	test_completion "git -c br" <<-\EOF
+	branch.Z
+	browser.Z
+	EOF
+'
+
+test_expect_success 'git -c - variable name' '
+	test_completion "git -c log.d" <<-\EOF
+	log.date=Z
+	log.decorate=Z
+	EOF
+'
+
+test_expect_success 'git -c - value' '
+	test_completion "git -c color.pager=" <<-\EOF
+	false Z
+	true Z
+	EOF
+'
+
+test_expect_success 'git clone --config= - section' '
+	test_completion "git clone --config=br" <<-\EOF
+	branch.Z
+	browser.Z
+	EOF
+'
+
+test_expect_success 'git clone --config= - variable name' '
+	test_completion "git clone --config=log.d" <<-\EOF
+	log.date=Z
+	log.decorate=Z
+	EOF
+'
+
+test_expect_success 'git clone --config= - value' '
+	test_completion "git clone --config=color.pager=" <<-\EOF
+	false Z
+	true Z
+	EOF
+'
+
 test_expect_success 'sourcing the completion script clears cached commands' '
 	__git_compute_all_commands &&
 	verbose test -n "$__git_all_commands" &&
diff --git a/third_party/git/t/t9903-bash-prompt.sh b/third_party/git/t/t9903-bash-prompt.sh
index 88bc733ad691..ab5da2cabc40 100755
--- a/third_party/git/t/t9903-bash-prompt.sh
+++ b/third_party/git/t/t9903-bash-prompt.sh
@@ -163,7 +163,7 @@ test_expect_success 'prompt - inside bare repository' '
 '
 
 test_expect_success 'prompt - interactive rebase' '
-	printf " (b1|REBASE-i 2/3)" >expected &&
+	printf " (b1|REBASE 2/3)" >expected &&
 	write_script fake_editor.sh <<-\EOF &&
 		echo "exec echo" >"$1"
 		echo "edit $(git log -1 --format="%h")" >>"$1"
@@ -180,7 +180,7 @@ test_expect_success 'prompt - interactive rebase' '
 '
 
 test_expect_success 'prompt - rebase merge' '
-	printf " (b2|REBASE-i 1/3)" >expected &&
+	printf " (b2|REBASE 1/3)" >expected &&
 	git checkout b2 &&
 	test_when_finished "git checkout master" &&
 	test_must_fail git rebase --merge b1 b2 &&
@@ -189,11 +189,11 @@ test_expect_success 'prompt - rebase merge' '
 	test_cmp expected "$actual"
 '
 
-test_expect_success 'prompt - rebase' '
+test_expect_success 'prompt - rebase am' '
 	printf " (b2|REBASE 1/3)" >expected &&
 	git checkout b2 &&
 	test_when_finished "git checkout master" &&
-	test_must_fail git rebase b1 b2 &&
+	test_must_fail git rebase --apply b1 b2 &&
 	test_when_finished "git rebase --abort" &&
 	__git_ps1 >"$actual" &&
 	test_cmp expected "$actual"
diff --git a/third_party/git/t/test-lib-functions.sh b/third_party/git/t/test-lib-functions.sh
index e0b3f28d3a96..352c213d52e2 100644
--- a/third_party/git/t/test-lib-functions.sh
+++ b/third_party/git/t/test-lib-functions.sh
@@ -228,9 +228,11 @@ test_commit () {
 # can be a tag pointing to the commit-to-merge.
 
 test_merge () {
+	label="$1" &&
+	shift &&
 	test_tick &&
-	git merge -m "$1" "$2" &&
-	git tag "$1"
+	git merge -m "$label" "$@" &&
+	git tag "$label"
 }
 
 # Efficiently create <nr> commits, each with a unique number (from 1 to <nr>
@@ -306,7 +308,7 @@ test_commit_bulk () {
 	total=$1
 
 	add_from=
-	if git -C "$indir" rev-parse --verify "$ref"
+	if git -C "$indir" rev-parse --quiet --verify "$ref"
 	then
 		add_from=t
 	fi
@@ -580,7 +582,7 @@ test_expect_failure () {
 	export test_prereq
 	if ! test_skip "$@"
 	then
-		say >&3 "checking known breakage: $2"
+		say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2"
 		if test_run_ "$2" expecting_failure
 		then
 			test_known_broken_ok_ "$1"
@@ -600,7 +602,7 @@ test_expect_success () {
 	export test_prereq
 	if ! test_skip "$@"
 	then
-		say >&3 "expecting success: $2"
+		say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2"
 		if test_run_ "$2"
 		then
 			test_ok_ "$1"
@@ -1010,19 +1012,30 @@ test_must_be_empty () {
 	fi
 }
 
-# Tests that its two parameters refer to the same revision
+# Tests that its two parameters refer to the same revision, or if '!' is
+# provided first, that its other two parameters refer to different
+# revisions.
 test_cmp_rev () {
+	local op='=' wrong_result=different
+
+	if test $# -ge 1 && test "x$1" = 'x!'
+	then
+	    op='!='
+	    wrong_result='the same'
+	    shift
+	fi
 	if test $# != 2
 	then
 		error "bug in the test script: test_cmp_rev requires two revisions, but got $#"
 	else
 		local r1 r2
 		r1=$(git rev-parse --verify "$1") &&
-		r2=$(git rev-parse --verify "$2") &&
-		if test "$r1" != "$r2"
+		r2=$(git rev-parse --verify "$2") || return 1
+
+		if ! test "$r1" "$op" "$r2"
 		then
 			cat >&4 <<-EOF
-			error: two revisions point to different objects:
+			error: two revisions point to $wrong_result objects:
 			  '$1': $r1
 			  '$2': $r2
 			EOF
@@ -1173,6 +1186,34 @@ perl () {
 	command "$PERL_PATH" "$@" 2>&7
 } 7>&2 2>&4
 
+# Given the name of an environment variable with a bool value, normalize
+# its value to a 0 (true) or 1 (false or empty string) return code.
+#
+#   test_bool_env GIT_TEST_HTTPD <default-value>
+#
+# Return with code corresponding to the given default value if the variable
+# is unset.
+# Abort the test script if either the value of the variable or the default
+# are not valid bool values.
+
+test_bool_env () {
+	if test $# != 2
+	then
+		BUG "test_bool_env requires two parameters (variable name and default value)"
+	fi
+
+	git env--helper --type=bool --default="$2" --exit-code "$1"
+	ret=$?
+	case $ret in
+	0|1)	# unset or valid bool value
+		;;
+	*)	# invalid bool value or something unexpected
+		error >&7 "test_bool_env requires bool values both for \$$1 and for the default fallback"
+		;;
+	esac
+	return $ret
+}
+
 # Exit the test suite, either by skipping all remaining tests or by
 # exiting with an error. If our prerequisite variable $1 falls back
 # on a default assume we were opportunistically trying to set up some
@@ -1181,7 +1222,7 @@ perl () {
 # The error/skip message should be given by $2.
 #
 test_skip_or_die () {
-	if ! git env--helper --type=bool --default=false --exit-code $1
+	if ! test_bool_env "$1" false
 	then
 		skip_all=$2
 		test_done
@@ -1475,3 +1516,30 @@ test_set_port () {
 	port=$(($port + ${GIT_TEST_STRESS_JOB_NR:-0}))
 	eval $var=$port
 }
+
+# Compare a file containing rev-list bitmap traversal output to its non-bitmap
+# counterpart. You can't just use test_cmp for this, because the two produce
+# subtly different output:
+#
+#   - regular output is in traversal order, whereas bitmap is split by type,
+#     with non-packed objects at the end
+#
+#   - regular output has a space and the pathname appended to non-commit
+#     objects; bitmap output omits this
+#
+# This function normalizes and compares the two. The second file should
+# always be the bitmap output.
+test_bitmap_traversal () {
+	if test "$1" = "--no-confirm-bitmaps"
+	then
+		shift
+	elif cmp "$1" "$2"
+	then
+		echo >&2 "identical raw outputs; are you sure bitmaps were used?"
+		return 1
+	fi &&
+	cut -d' ' -f1 "$1" | sort >"$1.normalized" &&
+	sort "$2" >"$2.normalized" &&
+	test_cmp "$1.normalized" "$2.normalized" &&
+	rm -f "$1.normalized" "$2.normalized"
+}
diff --git a/third_party/git/t/test-lib.sh b/third_party/git/t/test-lib.sh
index 30b07e310f59..0ea1e5a05edd 100644
--- a/third_party/git/t/test-lib.sh
+++ b/third_party/git/t/test-lib.sh
@@ -212,6 +212,8 @@ fi
 
 TEST_STRESS_JOB_SFX="${GIT_TEST_STRESS_JOB_NR:+.stress-$GIT_TEST_STRESS_JOB_NR}"
 TEST_NAME="$(basename "$0" .sh)"
+TEST_NUMBER="${TEST_NAME%%-*}"
+TEST_NUMBER="${TEST_NUMBER#t}"
 TEST_RESULTS_DIR="$TEST_OUTPUT_DIRECTORY/test-results"
 TEST_RESULTS_BASE="$TEST_RESULTS_DIR/$TEST_NAME$TEST_STRESS_JOB_SFX"
 TRASH_DIRECTORY="trash directory.$TEST_NAME$TEST_STRESS_JOB_SFX"
@@ -402,9 +404,13 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
 unset XDG_CACHE_HOME
 unset XDG_CONFIG_HOME
 unset GITPERLLIB
-GIT_AUTHOR_EMAIL=author@example.com
+TEST_AUTHOR_LOCALNAME=author
+TEST_AUTHOR_DOMAIN=example.com
+GIT_AUTHOR_EMAIL=${TEST_AUTHOR_LOCALNAME}@${TEST_AUTHOR_DOMAIN}
 GIT_AUTHOR_NAME='A U Thor'
-GIT_COMMITTER_EMAIL=committer@example.com
+TEST_COMMITTER_LOCALNAME=committer
+TEST_COMMITTER_DOMAIN=example.com
+GIT_COMMITTER_EMAIL=${TEST_COMMITTER_LOCALNAME}@${TEST_COMMITTER_DOMAIN}
 GIT_COMMITTER_NAME='C O Mitter'
 GIT_MERGE_VERBOSITY=5
 GIT_MERGE_AUTOEDIT=no
@@ -507,6 +513,9 @@ EMPTY_BLOB=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
 LF='
 '
 
+# Single quote
+SQ=\'
+
 # UTF-8 ZERO WIDTH NON-JOINER, which HFS+ ignores
 # when case-folding filenames
 u200c=$(printf '\342\200\214')
@@ -567,6 +576,7 @@ export TERM
 
 error () {
 	say_color error "error: $*"
+	finalize_junit_xml
 	GIT_EXIT_OK=t
 	exit 1
 }
@@ -695,7 +705,7 @@ test_failure_ () {
 	say_color error "not ok $test_count - $1"
 	shift
 	printf '%s\n' "$*" | sed -e 's/^/#	/'
-	test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }
+	test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; }
 }
 
 test_known_broken_ok_ () {
@@ -994,6 +1004,12 @@ test_skip () {
 		to_skip=t
 		skipped_reason="GIT_SKIP_TESTS"
 	fi
+	if test -z "$to_skip" && test -n "$run_list" &&
+	   ! match_test_selector_list '--run' $test_count "$run_list"
+	then
+		to_skip=t
+		skipped_reason="--run"
+	fi
 	if test -z "$to_skip" && test -n "$test_prereq" &&
 	   ! test_have_prereq "$test_prereq"
 	then
@@ -1006,12 +1022,6 @@ test_skip () {
 		fi
 		skipped_reason="missing $missing_prereq${of_prereq}"
 	fi
-	if test -z "$to_skip" && test -n "$run_list" &&
-		! match_test_selector_list '--run' $test_count "$run_list"
-	then
-		to_skip=t
-		skipped_reason="--run"
-	fi
 
 	case "$to_skip" in
 	t)
@@ -1063,6 +1073,26 @@ write_junit_xml_testcase () {
 	junit_have_testcase=t
 }
 
+finalize_junit_xml () {
+	if test -n "$write_junit_xml" && test -n "$junit_xml_path"
+	then
+		test -n "$junit_have_testcase" || {
+			junit_start=$(test-tool date getnanos)
+			write_junit_xml_testcase "all tests skipped"
+		}
+
+		# adjust the overall time
+		junit_time=$(test-tool date getnanos $junit_suite_start)
+		sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \
+			-e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
+			<"$junit_xml_path" >"$junit_xml_path.new"
+		mv "$junit_xml_path.new" "$junit_xml_path"
+
+		write_junit_xml "  </testsuite>" "</testsuites>"
+		write_junit_xml=
+	fi
+}
+
 test_atexit_cleanup=:
 test_atexit_handler () {
 	# In a succeeding test script 'test_atexit_handler' is invoked
@@ -1085,21 +1115,7 @@ test_done () {
 	# removed, so the commands can access pidfiles and socket files.
 	test_atexit_handler
 
-	if test -n "$write_junit_xml" && test -n "$junit_xml_path"
-	then
-		test -n "$junit_have_testcase" || {
-			junit_start=$(test-tool date getnanos)
-			write_junit_xml_testcase "all tests skipped"
-		}
-
-		# adjust the overall time
-		junit_time=$(test-tool date getnanos $junit_suite_start)
-		sed "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
-			<"$junit_xml_path" >"$junit_xml_path.new"
-		mv "$junit_xml_path.new" "$junit_xml_path"
-
-		write_junit_xml "  </testsuite>" "</testsuites>"
-	fi
+	finalize_junit_xml
 
 	if test -z "$HARNESS_ACTIVE"
 	then
@@ -1391,23 +1407,23 @@ yes () {
 # The GIT_TEST_FAIL_PREREQS code hooks into test_set_prereq(), and
 # thus needs to be set up really early, and set an internal variable
 # for convenience so the hot test_set_prereq() codepath doesn't need
-# to call "git env--helper". Only do that work if needed by seeing if
-# GIT_TEST_FAIL_PREREQS is set at all.
+# to call "git env--helper" (via test_bool_env). Only do that work
+# if needed by seeing if GIT_TEST_FAIL_PREREQS is set at all.
 GIT_TEST_FAIL_PREREQS_INTERNAL=
 if test -n "$GIT_TEST_FAIL_PREREQS"
 then
-	if git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS
+	if test_bool_env GIT_TEST_FAIL_PREREQS false
 	then
 		GIT_TEST_FAIL_PREREQS_INTERNAL=true
 		test_set_prereq FAIL_PREREQS
 	fi
 else
 	test_lazy_prereq FAIL_PREREQS '
-		git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS
+		test_bool_env GIT_TEST_FAIL_PREREQS false
 	'
 fi
 
-# Fix some commands on Windows
+# Fix some commands on Windows, and other OS-specific things
 uname_s=$(uname -s)
 case $uname_s in
 *MINGW*)
@@ -1438,6 +1454,12 @@ case $uname_s in
 	test_set_prereq SED_STRIPS_CR
 	test_set_prereq GREP_STRIPS_CR
 	;;
+FreeBSD)
+	test_set_prereq REGEX_ILLSEQ
+	test_set_prereq POSIXPERM
+	test_set_prereq BSLASHPSPEC
+	test_set_prereq EXECKEEPSPID
+	;;
 *)
 	test_set_prereq POSIXPERM
 	test_set_prereq BSLASHPSPEC
@@ -1462,7 +1484,7 @@ then
 fi
 
 test_lazy_prereq C_LOCALE_OUTPUT '
-	! git env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON
+	! test_bool_env GIT_TEST_GETTEXT_POISON false
 '
 
 if test -z "$GIT_TEST_CHECK_CACHE_TREE"
diff --git a/third_party/git/tag.c b/third_party/git/tag.c
index 5db870edb9e6..71b544467efa 100644
--- a/third_party/git/tag.c
+++ b/third_party/git/tag.c
@@ -141,7 +141,16 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u
 
 	if (item->object.parsed)
 		return 0;
-	item->object.parsed = 1;
+
+	if (item->tag) {
+		/*
+		 * Presumably left over from a previous failed parse;
+		 * clear it out in preparation for re-parsing (we'll probably
+		 * hit the same error, which lets us tell our current caller
+		 * about the problem).
+		 */
+		FREE_AND_NULL(item->tag);
+	}
 
 	if (size < the_hash_algo->hexsz + 24)
 		return -1;
@@ -167,10 +176,15 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u
 	} else if (!strcmp(type, tag_type)) {
 		item->tagged = (struct object *)lookup_tag(r, &oid);
 	} else {
-		error("Unknown type %s", type);
-		item->tagged = NULL;
+		return error("unknown tag type '%s' in %s",
+			     type, oid_to_hex(&item->object.oid));
 	}
 
+	if (!item->tagged)
+		return error("bad tag pointer to %s in %s",
+			     oid_to_hex(&oid),
+			     oid_to_hex(&item->object.oid));
+
 	if (bufptr + 4 < tail && starts_with(bufptr, "tag "))
 		; 		/* good */
 	else
@@ -187,6 +201,7 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u
 	else
 		item->date = 0;
 
+	item->object.parsed = 1;
 	return 0;
 }
 
@@ -212,3 +227,10 @@ int parse_tag(struct tag *item)
 	free(data);
 	return ret;
 }
+
+struct object_id *get_tagged_oid(struct tag *tag)
+{
+	if (!tag->tagged)
+		die("bad tag");
+	return &tag->tagged->oid;
+}
diff --git a/third_party/git/tag.h b/third_party/git/tag.h
index 03265fbfe294..3ce8e7219244 100644
--- a/third_party/git/tag.h
+++ b/third_party/git/tag.h
@@ -19,5 +19,6 @@ struct object *deref_tag(struct repository *r, struct object *, const char *, in
 struct object *deref_tag_noverify(struct object *);
 int gpg_verify_tag(const struct object_id *oid,
 		   const char *name_to_report, unsigned flags);
+struct object_id *get_tagged_oid(struct tag *tag);
 
 #endif /* TAG_H */
diff --git a/third_party/git/tar.h b/third_party/git/tar.h
index 3467705e9b0e..6b258c4d4a3f 100644
--- a/third_party/git/tar.h
+++ b/third_party/git/tar.h
@@ -1,3 +1,6 @@
+#ifndef TAR_H
+#define TAR_H
+
 #define TYPEFLAG_AUTO		'\0'
 #define TYPEFLAG_REG		'0'
 #define TYPEFLAG_LNK		'2'
@@ -23,3 +26,5 @@ struct ustar_header {
 	char devminor[8];	/* 337 */
 	char prefix[155];	/* 345 */
 };
+
+#endif /* TAR_H */
diff --git a/third_party/git/templates/hooks--fsmonitor-watchman.sample b/third_party/git/templates/hooks--fsmonitor-watchman.sample
index e673bb3980f3..14ed0aa42de0 100755
--- a/third_party/git/templates/hooks--fsmonitor-watchman.sample
+++ b/third_party/git/templates/hooks--fsmonitor-watchman.sample
@@ -8,107 +8,166 @@ use IPC::Open2;
 # (https://facebook.github.io/watchman/) with git to speed up detecting
 # new and modified files.
 #
-# The hook is passed a version (currently 1) and a time in nanoseconds
-# formatted as a string and outputs to stdout all files that have been
-# modified since the given time. Paths must be relative to the root of
-# the working tree and separated by a single NUL.
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
 #
 # To enable this hook, rename this file to "query-watchman" and set
 # 'git config core.fsmonitor .git/hooks/query-watchman'
 #
-my ($version, $time) = @ARGV;
+my ($version, $last_update_token) = @ARGV;
 
-# Check the hook interface version
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
 
-if ($version == 1) {
-	# convert nanoseconds to seconds
-	$time = int $time / 1000000000;
-} else {
+# Check the hook interface version
+if ($version ne 2) {
 	die "Unsupported query-fsmonitor hook version '$version'.\n" .
 	    "Falling back to scanning...\n";
 }
 
-my $git_work_tree;
-if ($^O =~ 'msys' || $^O =~ 'cygwin') {
-	$git_work_tree = Win32::GetCwd();
-	$git_work_tree =~ tr/\\/\//;
-} else {
-	require Cwd;
-	$git_work_tree = Cwd::cwd();
-}
+my $git_work_tree = get_working_dir();
 
 my $retry = 1;
 
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
 launch_watchman();
 
 sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
 
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
 	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
-	    or die "open2() failed: $!\n" .
-	    "Falling back to scanning...\n";
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
 
 	# In the query expression below we're asking for names of files that
-	# changed since $time but were not transient (ie created after
-	# $time but no longer exist).
+	# changed since $last_update_token but not from the .git folder.
 	#
 	# To accomplish this, we're using the "since" generator to use the
 	# recency index to select candidate nodes and "fields" to limit the
 	# output to file names only. Then we're using the "expression" term to
 	# further constrain the results.
-	#
-	# The category of transient files that we want to ignore will have a
-	# creation clock (cclock) newer than $time_t value and will also not
-	# currently exist.
-
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
 	my $query = <<"	END";
 		["query", "$git_work_tree", {
-			"since": $time,
+			"since": $last_update_token,
 			"fields": ["name"],
-			"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
+			"expression": ["not", ["dirname", ".git"]]
 		}]
 	END
 
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
 	print CHLD_IN $query;
 	close CHLD_IN;
 	my $response = do {local $/; <CHLD_OUT>};
 
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
 	die "Watchman: command returned no output.\n" .
-	    "Falling back to scanning...\n" if $response eq "";
+	"Falling back to scanning...\n" if $response eq "";
 	die "Watchman: command returned invalid output: $response\n" .
-	    "Falling back to scanning...\n" unless $response =~ /^\{/;
-
-	my $json_pkg;
-	eval {
-		require JSON::XS;
-		$json_pkg = "JSON::XS";
-		1;
-	} or do {
-		require JSON::PP;
-		$json_pkg = "JSON::PP";
-	};
-
-	my $o = $json_pkg->new->utf8->decode($response);
-
-	if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
-		print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
 		$retry--;
-		qx/watchman watch "$git_work_tree"/;
+		my $response = qx/watchman watch "$git_work_tree"/;
 		die "Failed to make watchman watch '$git_work_tree'.\n" .
 		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
 
 		# Watchman will always return all files on the first query so
 		# return the fast "everything is dirty" flag to git and do the
 		# Watchman query just to get it over with now so we won't pay
 		# the cost in git to look up each individual file.
-		print "/\0";
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
 		eval { launch_watchman() };
-		exit 0;
+		return 0;
 	}
 
-	die "Watchman: $o->{error}.\n" .
-	    "Falling back to scanning...\n" if $o->{error};
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
 
-	binmode STDOUT, ":utf8";
-	local $, = "\0";
-	print @{$o->{files}};
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
 }
diff --git a/third_party/git/templates/hooks--pre-commit.sample b/third_party/git/templates/hooks--pre-commit.sample
index 6a756416384c..e144712c85c0 100755
--- a/third_party/git/templates/hooks--pre-commit.sample
+++ b/third_party/git/templates/hooks--pre-commit.sample
@@ -16,7 +16,7 @@ else
 fi
 
 # If you want to allow non-ASCII filenames set this variable to true.
-allownonascii=$(git config --bool hooks.allownonascii)
+allownonascii=$(git config --type=bool hooks.allownonascii)
 
 # Redirect output to stderr.
 exec 1>&2
diff --git a/third_party/git/templates/hooks--pre-merge-commit.sample b/third_party/git/templates/hooks--pre-merge-commit.sample
new file mode 100755
index 000000000000..399eab1924e3
--- /dev/null
+++ b/third_party/git/templates/hooks--pre-merge-commit.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+        exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/third_party/git/templates/hooks--update.sample b/third_party/git/templates/hooks--update.sample
index 80ba94135cc3..5014c4b31cb9 100755
--- a/third_party/git/templates/hooks--update.sample
+++ b/third_party/git/templates/hooks--update.sample
@@ -43,11 +43,11 @@ if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
 fi
 
 # --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
 
 # check for no description
 projectdesc=$(sed -e '1q' "$GIT_DIR/description")
diff --git a/third_party/git/trace.c b/third_party/git/trace.c
index fa4a2e7120e4..b3ef0e627f8c 100644
--- a/third_party/git/trace.c
+++ b/third_party/git/trace.c
@@ -88,8 +88,6 @@ static int prepare_trace_line(const char *file, int line,
 	if (!trace_want(key))
 		return 0;
 
-	set_try_to_free_routine(NULL);	/* is never reset */
-
 	/* unit tests may want to disable additional trace output */
 	if (trace_want(&trace_bare))
 		return 1;
diff --git a/third_party/git/trace.h b/third_party/git/trace.h
index 9fa3e7a59407..9826618b331a 100644
--- a/third_party/git/trace.h
+++ b/third_party/git/trace.h
@@ -4,6 +4,82 @@
 #include "git-compat-util.h"
 #include "strbuf.h"
 
+/**
+ * The trace API can be used to print debug messages to stderr or a file. Trace
+ * code is inactive unless explicitly enabled by setting `GIT_TRACE*` environment
+ * variables.
+ *
+ * The trace implementation automatically adds `timestamp file:line ... \n` to
+ * all trace messages. E.g.:
+ *
+ * ------------
+ * 23:59:59.123456 git.c:312               trace: built-in: git 'foo'
+ * 00:00:00.000001 builtin/foo.c:99        foo: some message
+ * ------------
+ *
+ * Bugs & Caveats
+ * --------------
+ *
+ * GIT_TRACE_* environment variables can be used to tell Git to show
+ * trace output to its standard error stream. Git can often spawn a pager
+ * internally to run its subcommand and send its standard output and
+ * standard error to it.
+ *
+ * Because GIT_TRACE_PERFORMANCE trace is generated only at the very end
+ * of the program with atexit(), which happens after the pager exits, it
+ * would not work well if you send its log to the standard error output
+ * and let Git spawn the pager at the same time.
+ *
+ * As a work around, you can for example use '--no-pager', or set
+ * GIT_TRACE_PERFORMANCE to another file descriptor which is redirected
+ * to stderr, or set GIT_TRACE_PERFORMANCE to a file specified by its
+ * absolute path.
+ *
+ * For example instead of the following command which by default may not
+ * print any performance information:
+ *
+ * ------------
+ * GIT_TRACE_PERFORMANCE=2 git log -1
+ * ------------
+ *
+ * you may want to use:
+ *
+ * ------------
+ * GIT_TRACE_PERFORMANCE=2 git --no-pager log -1
+ * ------------
+ *
+ * or:
+ *
+ * ------------
+ * GIT_TRACE_PERFORMANCE=3 3>&2 git log -1
+ * ------------
+ *
+ * or:
+ *
+ * ------------
+ * GIT_TRACE_PERFORMANCE=/path/to/log/file git log -1
+ * ------------
+ *
+ */
+
+/**
+ * Defines a trace key (or category). The default (for API functions that
+ * don't take a key) is `GIT_TRACE`.
+ *
+ * E.g. to define a trace key controlled by environment variable `GIT_TRACE_FOO`:
+ *
+ * ------------
+ * static struct trace_key trace_foo = TRACE_KEY_INIT(FOO);
+ *
+ * static void trace_print_foo(const char *message)
+ * {
+ * 	trace_printf_key(&trace_foo, "%s", message);
+ * }
+ * ------------
+ *
+ * Note: don't use `const` as the trace implementation stores internal state in
+ * the `trace_key` structure.
+ */
 struct trace_key {
 	const char * const key;
 	int fd;
@@ -18,31 +94,84 @@ extern struct trace_key trace_perf_key;
 extern struct trace_key trace_setup_key;
 
 void trace_repo_setup(const char *prefix);
+
+/**
+ * Checks whether the trace key is enabled. Used to prevent expensive
+ * string formatting before calling one of the printing APIs.
+ */
 int trace_want(struct trace_key *key);
+
+/**
+ * Disables tracing for the specified key, even if the environment variable
+ * was set.
+ */
 void trace_disable(struct trace_key *key);
+
+/**
+ * Returns nanoseconds since the epoch (01/01/1970), typically used
+ * for performance measurements.
+ * Currently there are high precision timer implementations for Linux (using
+ * `clock_gettime(CLOCK_MONOTONIC)`) and Windows (`QueryPerformanceCounter`).
+ * Other platforms use `gettimeofday` as time source.
+ */
 uint64_t getnanotime(void);
+
 void trace_command_performance(const char **argv);
 void trace_verbatim(struct trace_key *key, const void *buf, unsigned len);
 uint64_t trace_performance_enter(void);
 
 #ifndef HAVE_VARIADIC_MACROS
 
+/**
+ * Prints a formatted message, similar to printf.
+ */
 __attribute__((format (printf, 1, 2)))
 void trace_printf(const char *format, ...);
 
 __attribute__((format (printf, 2, 3)))
 void trace_printf_key(struct trace_key *key, const char *format, ...);
 
+/**
+ * Prints a formatted message, followed by a quoted list of arguments.
+ */
 __attribute__((format (printf, 2, 3)))
 void trace_argv_printf(const char **argv, const char *format, ...);
 
+/**
+ * Prints the strbuf, without additional formatting (i.e. doesn't
+ * choke on `%` or even `\0`).
+ */
 void trace_strbuf(struct trace_key *key, const struct strbuf *data);
 
-/* Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled. */
+/**
+ * Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled.
+ *
+ * Example:
+ * ------------
+ * uint64_t t = 0;
+ * for (;;) {
+ * 	// ignore
+ * t -= getnanotime();
+ * // code section to measure
+ * t += getnanotime();
+ * // ignore
+ * }
+ * trace_performance(t, "frotz");
+ * ------------
+ */
 __attribute__((format (printf, 2, 3)))
 void trace_performance(uint64_t nanos, const char *format, ...);
 
-/* Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled. */
+/**
+ * Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled.
+ *
+ * Example:
+ * ------------
+ * uint64_t start = getnanotime();
+ * // code section to measure
+ * trace_performance_since(start, "foobar");
+ * ------------
+ */
 __attribute__((format (printf, 2, 3)))
 void trace_performance_since(uint64_t start, const char *format, ...);
 
diff --git a/third_party/git/trace2.h b/third_party/git/trace2.h
index 050bf3c8c19d..e5e81c05332f 100644
--- a/third_party/git/trace2.h
+++ b/third_party/git/trace2.h
@@ -1,6 +1,40 @@
 #ifndef TRACE2_H
 #define TRACE2_H
 
+/**
+ * The Trace2 API can be used to print debug, performance, and telemetry
+ * information to stderr or a file.  The Trace2 feature is inactive unless
+ * explicitly enabled by enabling one or more Trace2 Targets.
+ *
+ * The Trace2 API is intended to replace the existing (Trace1)
+ * printf-style tracing provided by the existing `GIT_TRACE` and
+ * `GIT_TRACE_PERFORMANCE` facilities.  During initial implementation,
+ * Trace2 and Trace1 may operate in parallel.
+ *
+ * The Trace2 API defines a set of high-level messages with known fields,
+ * such as (`start`: `argv`) and (`exit`: {`exit-code`, `elapsed-time`}).
+ *
+ * Trace2 instrumentation throughout the Git code base sends Trace2
+ * messages to the enabled Trace2 Targets.  Targets transform these
+ * messages content into purpose-specific formats and write events to
+ * their data streams.  In this manner, the Trace2 API can drive
+ * many different types of analysis.
+ *
+ * Targets are defined using a VTable allowing easy extension to other
+ * formats in the future.  This might be used to define a binary format,
+ * for example.
+ *
+ * Trace2 is controlled using `trace2.*` config values in the system and
+ * global config files and `GIT_TRACE2*` environment variables.  Trace2 does
+ * not read from repo local or worktree config files or respect `-c`
+ * command line config settings.
+ *
+ * For more info about: trace2 targets, conventions for public functions and
+ * macros, trace2 target formats and examples on trace2 API usage refer to
+ * Documentation/technical/api-trace2.txt
+ *
+ */
+
 struct child_process;
 struct repository;
 struct json_writer;
@@ -39,7 +73,12 @@ void trace2_initialize_clock(void);
 /*
  * Initialize TRACE2 tracing facility if any of the builtin TRACE2
  * targets are enabled in the system config or the environment.
- * Emits a 'version' event.
+ * This includes setting up the Trace2 thread local storage (TLS).
+ * Emits a 'version' message containing the version of git
+ * and the Trace2 protocol.
+ *
+ * This function should be called from `main()` as early as possible in
+ * the life of the process after essential process initialization.
  *
  * Cleanup/Termination is handled automatically by a registered
  * atexit() routine.
@@ -49,7 +88,7 @@ void trace2_initialize_fl(const char *file, int line);
 #define trace2_initialize() trace2_initialize_fl(__FILE__, __LINE__)
 
 /*
- * Return true if trace2 is enabled.
+ * Return 1 if trace2 is enabled (at least one target is active).
  */
 int trace2_is_enabled(void);
 
@@ -114,7 +153,8 @@ void trace2_cmd_mode_fl(const char *file, int line, const char *mode);
 #define trace2_cmd_mode(sv) trace2_cmd_mode_fl(__FILE__, __LINE__, (sv))
 
 /*
- * Emit an 'alias' expansion event.
+ * Emits an "alias" message containing the alias used and the argument
+ * expansion.
  */
 void trace2_cmd_alias_fl(const char *file, int line, const char *alias,
 			 const char **argv);
@@ -123,7 +163,7 @@ void trace2_cmd_alias_fl(const char *file, int line, const char *alias,
 	trace2_cmd_alias_fl(__FILE__, __LINE__, (alias), (argv))
 
 /*
- * Emit one or more 'def_param' events for "interesting" configuration
+ * Emit one or more 'def_param' events for "important" configuration
  * settings.
  *
  * Use the TR2_SYSENV_CFG_PARAM setting to register a comma-separated
@@ -144,7 +184,7 @@ void trace2_cmd_list_config_fl(const char *file, int line);
 
 /*
  * Emit a "def_param" event for the given config key/value pair IF
- * we consider the key to be "interesting".
+ * we consider the key to be "important".
  *
  * Use this for new/updated config settings created/updated after
  * trace2_cmd_list_config() is called.
@@ -155,20 +195,34 @@ void trace2_cmd_set_config_fl(const char *file, int line, const char *key,
 #define trace2_cmd_set_config(k, v) \
 	trace2_cmd_set_config_fl(__FILE__, __LINE__, (k), (v))
 
-/*
- * Emit a 'child_start' event prior to spawning a child process.
+/**
+ * Emits a "child_start" message containing the "child-id",
+ * "child-argv", and "child-classification".
  *
  * Before calling optionally set "cmd->trace2_child_class" to a string
  * describing the type of the child process.  For example, "editor" or
  * "pager".
+ *
+ * This function assigns a unique "child-id" to `cmd->trace2_child_id`.
+ * This field is used later during the "child_exit" message to associate
+ * it with the "child_start" message.
+ *
+ * This function should be called before spawning the child process.
  */
 void trace2_child_start_fl(const char *file, int line,
 			   struct child_process *cmd);
 
 #define trace2_child_start(cmd) trace2_child_start_fl(__FILE__, __LINE__, (cmd))
 
-/*
- * Emit a 'child_exit' event after the child process completes.
+/**
+ * Emits a "child_exit" message containing the "child-id",
+ * the child's elapsed time and exit-code.
+ *
+ * The reported elapsed time includes the process creation overhead and
+ * time spend waiting for it to exit, so it may be slightly longer than
+ * the time reported by the child itself.
+ *
+ * This function should be called after reaping the child process.
  */
 void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
 			  int child_exit_code);
@@ -176,21 +230,22 @@ void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
 #define trace2_child_exit(cmd, code) \
 	trace2_child_exit_fl(__FILE__, __LINE__, (cmd), (code))
 
-/*
+/**
  * Emit an 'exec' event prior to calling one of exec(), execv(),
  * execvp(), and etc.  On Unix-derived systems, this will be the
  * last event emitted for the current process, unless the exec
  * fails.  On Windows, exec() behaves like 'child_start' and a
  * waitpid(), so additional events may be emitted.
  *
- * Returns the "exec_id".
+ * Returns a unique "exec-id".  This value is used later
+ * if the exec() fails and a "exec-result" message is necessary.
  */
 int trace2_exec_fl(const char *file, int line, const char *exe,
 		   const char **argv);
 
 #define trace2_exec(exe, argv) trace2_exec_fl(__FILE__, __LINE__, (exe), (argv))
 
-/*
+/**
  * Emit an 'exec_result' when possible.  On Unix-derived systems,
  * this should be called after exec() returns (which only happens
  * when there is an error starting the new process).  On Windows,
@@ -226,11 +281,12 @@ void trace2_thread_exit_fl(const char *file, int line);
 #define trace2_thread_exit() trace2_thread_exit_fl(__FILE__, __LINE__)
 
 /*
- * Emit a 'param' event.
+ * Emits a "def_param" message containing a key/value pair.
  *
- * Write a "<param> = <value>" pair describing some aspect of the
- * run such as an important configuration setting or command line
- * option that significantly changes command behavior.
+ * This message is intended to report some global aspect of the current
+ * command, such as a configuration setting or command line switch that
+ * significantly affects program performance or behavior, such as
+ * `core.abbrev`, `status.showUntrackedFiles`, or `--no-ahead-behind`.
  */
 void trace2_def_param_fl(const char *file, int line, const char *param,
 			 const char *value);
@@ -243,18 +299,35 @@ void trace2_def_param_fl(const char *file, int line, const char *param,
  * a trace2-repo-id to be used in subsequent activity events.
  *
  * Emits a 'worktree' event for this repo instance.
+ *
+ * Region and data messages may refer to this repo-id.
+ *
+ * The main/top-level repository will have repo-id value 1 (aka "r1").
+ *
+ * The repo-id field is in anticipation of future in-proc submodule
+ * repositories.
  */
 void trace2_def_repo_fl(const char *file, int line, struct repository *repo);
 
 #define trace2_def_repo(repo) trace2_def_repo_fl(__FILE__, __LINE__, repo)
 
-/*
+/**
  * Emit a 'region_enter' event for <category>.<label> with optional
  * repo-id and printf message.
  *
- * Enter a new nesting level on the current thread and remember the
- * current time.  This controls the indenting of all subsequent events
- * on this thread.
+ * This function pushes a new region nesting stack level on the current
+ * thread and starts a clock for the new stack frame.
+ *
+ * The `category` field is an arbitrary category name used to classify
+ * regions by feature area, such as "status" or "index".  At this time
+ * it is only just printed along with the rest of the message.  It may
+ * be used in the future to filter messages.
+ *
+ * The `label` field is an arbitrary label used to describe the activity
+ * being started, such as "read_recursive" or "do_read_index".
+ *
+ * The `repo` field, if set, will be used to get the "repo-id", so that
+ * recursive oerations can be attributed to the correct repository.
  */
 void trace2_region_enter_fl(const char *file, int line, const char *category,
 			    const char *label, const struct repository *repo, ...);
@@ -289,12 +362,17 @@ void trace2_region_enter_printf(const char *category, const char *label,
 /* clang-format on */
 #endif
 
-/*
+/**
  * Emit a 'region_leave' event for <category>.<label> with optional
  * repo-id and printf message.
  *
  * Leave current nesting level and report the elapsed time spent
  * in this nesting level.
+ *
+ * The `category`, `label`, and `repo` fields are the same as
+ * trace2_region_enter_fl. The `category` and `label` do not
+ * need to match the corresponding "region_enter" message,
+ * but it makes the data stream easier to understand.
  */
 void trace2_region_leave_fl(const char *file, int line, const char *category,
 			    const char *label, const struct repository *repo, ...);
@@ -329,10 +407,12 @@ void trace2_region_leave_printf(const char *category, const char *label,
 /* clang-format on */
 #endif
 
-/*
+/**
  * Emit a key-value pair 'data' event of the form <category>.<key> = <value>.
  * This event implicitly contains information about thread, nesting region,
  * and optional repo-id.
+ * This could be used to print the number of files in a directory during
+ * a multi-threaded recursive tree walk.
  *
  * On event-based TRACE2 targets, this generates a 'data' event suitable
  * for post-processing.  On printf-based TRACE2 targets, this is converted
diff --git a/third_party/git/trace2/tr2_dst.c b/third_party/git/trace2/tr2_dst.c
index 5dda0ca1cdb5..ae052a07fe2e 100644
--- a/third_party/git/trace2/tr2_dst.c
+++ b/third_party/git/trace2/tr2_dst.c
@@ -8,6 +8,19 @@
  */
 #define MAX_AUTO_ATTEMPTS 10
 
+/*
+ * Sentinel file used to detect when we should discard new traces to avoid
+ * writing too many trace files to a directory.
+ */
+#define DISCARD_SENTINEL_NAME "git-trace2-discard"
+
+/*
+ * When set to zero, disables directory file count checks. Otherwise, controls
+ * how many files we can write to a directory before entering discard mode.
+ * This can be overridden via the TR2_SYSENV_MAX_FILES setting.
+ */
+static int tr2env_max_files = 0;
+
 static int tr2_dst_want_warning(void)
 {
 	static int tr2env_dst_debug = -1;
@@ -32,9 +45,75 @@ void tr2_dst_trace_disable(struct tr2_dst *dst)
 	dst->need_close = 0;
 }
 
+/*
+ * Check to make sure we're not overloading the target directory with too many
+ * files. First get the threshold (if present) from the config or envvar. If
+ * it's zero or unset, disable this check. Next check for the presence of a
+ * sentinel file, then check file count.
+ *
+ * Returns 0 if tracing should proceed as normal. Returns 1 if the sentinel file
+ * already exists, which means tracing should be disabled. Returns -1 if there
+ * are too many files but there was no sentinel file, which means we have
+ * created and should write traces to the sentinel file.
+ *
+ * We expect that some trace processing system is gradually collecting files
+ * from the target directory; after it removes the sentinel file we'll start
+ * writing traces again.
+ */
+static int tr2_dst_too_many_files(struct tr2_dst *dst, const char *tgt_prefix)
+{
+	int file_count = 0, max_files = 0, ret = 0;
+	const char *max_files_var;
+	DIR *dirp;
+	struct strbuf path = STRBUF_INIT, sentinel_path = STRBUF_INIT;
+	struct stat statbuf;
+
+	/* Get the config or envvar and decide if we should continue this check */
+	max_files_var = tr2_sysenv_get(TR2_SYSENV_MAX_FILES);
+	if (max_files_var && *max_files_var && ((max_files = atoi(max_files_var)) >= 0))
+		tr2env_max_files = max_files;
+
+	if (!tr2env_max_files) {
+		ret = 0;
+		goto cleanup;
+	}
+
+	strbuf_addstr(&path, tgt_prefix);
+	if (!is_dir_sep(path.buf[path.len - 1])) {
+		strbuf_addch(&path, '/');
+	}
+
+	/* check sentinel */
+	strbuf_addbuf(&sentinel_path, &path);
+	strbuf_addstr(&sentinel_path, DISCARD_SENTINEL_NAME);
+	if (!stat(sentinel_path.buf, &statbuf)) {
+		ret = 1;
+		goto cleanup;
+	}
+
+	/* check file count */
+	dirp = opendir(path.buf);
+	while (file_count < tr2env_max_files && dirp && readdir(dirp))
+		file_count++;
+	if (dirp)
+		closedir(dirp);
+
+	if (file_count >= tr2env_max_files) {
+		dst->too_many_files = 1;
+		dst->fd = open(sentinel_path.buf, O_WRONLY | O_CREAT | O_EXCL, 0666);
+		ret = -1;
+		goto cleanup;
+	}
+
+cleanup:
+	strbuf_release(&path);
+	strbuf_release(&sentinel_path);
+	return ret;
+}
+
 static int tr2_dst_try_auto_path(struct tr2_dst *dst, const char *tgt_prefix)
 {
-	int fd;
+	int too_many_files;
 	const char *last_slash, *sid = tr2_sid_get();
 	struct strbuf path = STRBUF_INIT;
 	size_t base_path_len;
@@ -50,18 +129,29 @@ static int tr2_dst_try_auto_path(struct tr2_dst *dst, const char *tgt_prefix)
 	strbuf_addstr(&path, sid);
 	base_path_len = path.len;
 
-	for (attempt_count = 0; attempt_count < MAX_AUTO_ATTEMPTS; attempt_count++) {
-		if (attempt_count > 0) {
-			strbuf_setlen(&path, base_path_len);
-			strbuf_addf(&path, ".%d", attempt_count);
+	too_many_files = tr2_dst_too_many_files(dst, tgt_prefix);
+	if (!too_many_files) {
+		for (attempt_count = 0; attempt_count < MAX_AUTO_ATTEMPTS; attempt_count++) {
+			if (attempt_count > 0) {
+				strbuf_setlen(&path, base_path_len);
+				strbuf_addf(&path, ".%d", attempt_count);
+			}
+
+			dst->fd = open(path.buf, O_WRONLY | O_CREAT | O_EXCL, 0666);
+			if (dst->fd != -1)
+				break;
 		}
-
-		fd = open(path.buf, O_WRONLY | O_CREAT | O_EXCL, 0666);
-		if (fd != -1)
-			break;
+	} else if (too_many_files == 1) {
+		strbuf_release(&path);
+		if (tr2_dst_want_warning())
+			warning("trace2: not opening %s trace file due to too "
+				"many files in target directory %s",
+				tr2_sysenv_display_name(dst->sysenv_var),
+				tgt_prefix);
+		return 0;
 	}
 
-	if (fd == -1) {
+	if (dst->fd == -1) {
 		if (tr2_dst_want_warning())
 			warning("trace2: could not open '%.*s' for '%s' tracing: %s",
 				(int) base_path_len, path.buf,
@@ -75,7 +165,6 @@ static int tr2_dst_try_auto_path(struct tr2_dst *dst, const char *tgt_prefix)
 
 	strbuf_release(&path);
 
-	dst->fd = fd;
 	dst->need_close = 1;
 	dst->initialized = 1;
 
@@ -215,13 +304,8 @@ connected:
 static void tr2_dst_malformed_warning(struct tr2_dst *dst,
 				      const char *tgt_value)
 {
-	struct strbuf buf = STRBUF_INIT;
-
-	strbuf_addf(&buf, "trace2: unknown value for '%s': '%s'",
-		    tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
-	warning("%s", buf.buf);
-
-	strbuf_release(&buf);
+	warning("trace2: unknown value for '%s': '%s'",
+		tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
 }
 
 int tr2_dst_get_trace_fd(struct tr2_dst *dst)
diff --git a/third_party/git/trace2/tr2_dst.h b/third_party/git/trace2/tr2_dst.h
index 3adf3bac139b..b1a8c144e073 100644
--- a/third_party/git/trace2/tr2_dst.h
+++ b/third_party/git/trace2/tr2_dst.h
@@ -9,6 +9,7 @@ struct tr2_dst {
 	int fd;
 	unsigned int initialized : 1;
 	unsigned int need_close : 1;
+	unsigned int too_many_files : 1;
 };
 
 /*
diff --git a/third_party/git/trace2/tr2_sid.c b/third_party/git/trace2/tr2_sid.c
index 6948fd41086f..dc6e75ef1315 100644
--- a/third_party/git/trace2/tr2_sid.c
+++ b/third_party/git/trace2/tr2_sid.c
@@ -19,7 +19,7 @@ static int tr2sid_nr_git_parents;
  *    "H<first_8_chars_of_sha1_of_hostname>"
  *    "Localhost" when no hostname.
  *
- * where <process> is a 9 character string containing the least signifcant
+ * where <process> is a 9 character string containing the least significant
  * 32 bits in the process-id.
  *    "P<pid>"
  * (This is an abribrary choice.  On most systems pid_t is a 32 bit value,
diff --git a/third_party/git/trace2/tr2_sysenv.c b/third_party/git/trace2/tr2_sysenv.c
index 5958cfc424b5..3c3792eca2e2 100644
--- a/third_party/git/trace2/tr2_sysenv.c
+++ b/third_party/git/trace2/tr2_sysenv.c
@@ -49,6 +49,9 @@ static struct tr2_sysenv_entry tr2_sysenv_settings[] = {
 				       "trace2.perftarget" },
 	[TR2_SYSENV_PERF_BRIEF]    = { "GIT_TRACE2_PERF_BRIEF",
 				       "trace2.perfbrief" },
+
+	[TR2_SYSENV_MAX_FILES]     = { "GIT_TRACE2_MAX_FILES",
+				       "trace2.maxfiles" },
 };
 /* clang-format on */
 
diff --git a/third_party/git/trace2/tr2_sysenv.h b/third_party/git/trace2/tr2_sysenv.h
index 8dd82a7a56bb..d4364a7b85a5 100644
--- a/third_party/git/trace2/tr2_sysenv.h
+++ b/third_party/git/trace2/tr2_sysenv.h
@@ -24,6 +24,8 @@ enum tr2_sysenv_variable {
 	TR2_SYSENV_PERF,
 	TR2_SYSENV_PERF_BRIEF,
 
+	TR2_SYSENV_MAX_FILES,
+
 	TR2_SYSENV_MUST_BE_LAST
 };
 
diff --git a/third_party/git/trace2/tr2_tgt_event.c b/third_party/git/trace2/tr2_tgt_event.c
index c2852d1bd2bd..6353e8ad9156 100644
--- a/third_party/git/trace2/tr2_tgt_event.c
+++ b/third_party/git/trace2/tr2_tgt_event.c
@@ -10,16 +10,17 @@
 #include "trace2/tr2_tgt.h"
 #include "trace2/tr2_tls.h"
 
-static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0 };
+static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0, 0 };
 
 /*
- * The version number of the JSON data generated by the EVENT target
- * in this source file.  Update this if you make a significant change
- * to the JSON fields or message structure.  You probably do not need
- * to update this if you just add another call to one of the existing
- * TRACE2 API methods.
+ * The version number of the JSON data generated by the EVENT target in this
+ * source file. The version should be incremented if new event types are added,
+ * if existing fields are removed, or if there are significant changes in
+ * interpretation of existing events or fields. Smaller changes, such as adding
+ * a new field to an existing event, do not require an increment to the EVENT
+ * format version.
  */
-#define TR2_EVENT_VERSION "1"
+#define TR2_EVENT_VERSION "2"
 
 /*
  * Region nesting limit for messages written to the event target.
@@ -107,6 +108,19 @@ static void event_fmt_prepare(const char *event_name, const char *file,
 		jw_object_intmax(jw, "repo", repo->trace2_repo_id);
 }
 
+static void fn_too_many_files_fl(const char *file, int line)
+{
+	const char *event_name = "too_many_files";
+	struct json_writer jw = JSON_WRITER_INIT;
+
+	jw_object_begin(&jw, 0);
+	event_fmt_prepare(event_name, file, line, NULL, &jw);
+	jw_end(&jw);
+
+	tr2_dst_write_line(&tr2dst_event, &jw.json);
+	jw_release(&jw);
+}
+
 static void fn_version_fl(const char *file, int line)
 {
 	const char *event_name = "version";
@@ -120,6 +134,9 @@ static void fn_version_fl(const char *file, int line)
 
 	tr2_dst_write_line(&tr2dst_event, &jw.json);
 	jw_release(&jw);
+
+	if (tr2dst_event.too_many_files)
+		fn_too_many_files_fl(file, line);
 }
 
 static void fn_start_fl(const char *file, int line,
@@ -205,11 +222,6 @@ static void maybe_add_string_va(struct json_writer *jw, const char *field_name,
 		strbuf_release(&buf);
 		return;
 	}
-
-	if (fmt && *fmt) {
-		jw_object_string(jw, field_name, fmt);
-		return;
-	}
 }
 
 static void fn_error_va_fl(const char *file, int line, const char *fmt,
diff --git a/third_party/git/trace2/tr2_tgt_normal.c b/third_party/git/trace2/tr2_tgt_normal.c
index 00b116d797c8..31b602c171fc 100644
--- a/third_party/git/trace2/tr2_tgt_normal.c
+++ b/third_party/git/trace2/tr2_tgt_normal.c
@@ -9,7 +9,7 @@
 #include "trace2/tr2_tgt.h"
 #include "trace2/tr2_tls.h"
 
-static struct tr2_dst tr2dst_normal = { TR2_SYSENV_NORMAL, 0, 0, 0 };
+static struct tr2_dst tr2dst_normal = { TR2_SYSENV_NORMAL, 0, 0, 0, 0 };
 
 /*
  * Use the TR2_SYSENV_NORMAL_BRIEF setting to omit the "<time> <file>:<line>"
@@ -87,7 +87,7 @@ static void fn_start_fl(const char *file, int line,
 	struct strbuf buf_payload = STRBUF_INIT;
 
 	strbuf_addstr(&buf_payload, "start ");
-	sq_quote_argv_pretty(&buf_payload, argv);
+	sq_append_quote_argv_pretty(&buf_payload, argv);
 	normal_io_write_fl(file, line, &buf_payload);
 	strbuf_release(&buf_payload);
 }
@@ -135,11 +135,6 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
 		va_end(copy_ap);
 		return;
 	}
-
-	if (fmt && *fmt) {
-		strbuf_addstr(buf, fmt);
-		return;
-	}
 }
 
 static void fn_error_va_fl(const char *file, int line, const char *fmt,
@@ -147,8 +142,11 @@ static void fn_error_va_fl(const char *file, int line, const char *fmt,
 {
 	struct strbuf buf_payload = STRBUF_INIT;
 
-	strbuf_addstr(&buf_payload, "error ");
-	maybe_append_string_va(&buf_payload, fmt, ap);
+	strbuf_addstr(&buf_payload, "error");
+	if (fmt && *fmt) {
+		strbuf_addch(&buf_payload, ' ');
+		maybe_append_string_va(&buf_payload, fmt, ap);
+	}
 	normal_io_write_fl(file, line, &buf_payload);
 	strbuf_release(&buf_payload);
 }
@@ -188,8 +186,8 @@ static void fn_alias_fl(const char *file, int line, const char *alias,
 {
 	struct strbuf buf_payload = STRBUF_INIT;
 
-	strbuf_addf(&buf_payload, "alias %s ->", alias);
-	sq_quote_argv_pretty(&buf_payload, argv);
+	strbuf_addf(&buf_payload, "alias %s -> ", alias);
+	sq_append_quote_argv_pretty(&buf_payload, argv);
 	normal_io_write_fl(file, line, &buf_payload);
 	strbuf_release(&buf_payload);
 }
@@ -200,12 +198,12 @@ static void fn_child_start_fl(const char *file, int line,
 {
 	struct strbuf buf_payload = STRBUF_INIT;
 
-	strbuf_addf(&buf_payload, "child_start[%d] ", cmd->trace2_child_id);
+	strbuf_addf(&buf_payload, "child_start[%d]", cmd->trace2_child_id);
 
 	if (cmd->dir) {
-		strbuf_addstr(&buf_payload, " cd");
+		strbuf_addstr(&buf_payload, " cd ");
 		sq_quote_buf_pretty(&buf_payload, cmd->dir);
-		strbuf_addstr(&buf_payload, "; ");
+		strbuf_addstr(&buf_payload, ";");
 	}
 
 	/*
@@ -213,9 +211,10 @@ static void fn_child_start_fl(const char *file, int line,
 	 * See trace_add_env() in run-command.c as used by original trace.c
 	 */
 
+	strbuf_addch(&buf_payload, ' ');
 	if (cmd->git_cmd)
-		strbuf_addstr(&buf_payload, "git");
-	sq_quote_argv_pretty(&buf_payload, cmd->argv);
+		strbuf_addstr(&buf_payload, "git ");
+	sq_append_quote_argv_pretty(&buf_payload, cmd->argv);
 
 	normal_io_write_fl(file, line, &buf_payload);
 	strbuf_release(&buf_payload);
@@ -240,9 +239,11 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
 	struct strbuf buf_payload = STRBUF_INIT;
 
 	strbuf_addf(&buf_payload, "exec[%d] ", exec_id);
-	if (exe)
+	if (exe) {
 		strbuf_addstr(&buf_payload, exe);
-	sq_quote_argv_pretty(&buf_payload, argv);
+		strbuf_addch(&buf_payload, ' ');
+	}
+	sq_append_quote_argv_pretty(&buf_payload, argv);
 	normal_io_write_fl(file, line, &buf_payload);
 	strbuf_release(&buf_payload);
 }
diff --git a/third_party/git/trace2/tr2_tgt_perf.c b/third_party/git/trace2/tr2_tgt_perf.c
index ea0cbbe13ee0..a8018f18cc87 100644
--- a/third_party/git/trace2/tr2_tgt_perf.c
+++ b/third_party/git/trace2/tr2_tgt_perf.c
@@ -11,7 +11,7 @@
 #include "trace2/tr2_tgt.h"
 #include "trace2/tr2_tls.h"
 
-static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0 };
+static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0, 0 };
 
 /*
  * Use TR2_SYSENV_PERF_BRIEF to omit the "<time> <file>:<line>"
@@ -21,17 +21,14 @@ static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0 };
  */
 static int tr2env_perf_be_brief;
 
-#define TR2FMT_PERF_FL_WIDTH (50)
+#define TR2FMT_PERF_FL_WIDTH (28)
 #define TR2FMT_PERF_MAX_EVENT_NAME (12)
-#define TR2FMT_PERF_REPO_WIDTH (4)
-#define TR2FMT_PERF_CATEGORY_WIDTH (10)
+#define TR2FMT_PERF_REPO_WIDTH (3)
+#define TR2FMT_PERF_CATEGORY_WIDTH (12)
 
-#define TR2_DOTS_BUFFER_SIZE (100)
 #define TR2_INDENT (2)
 #define TR2_INDENT_LENGTH(ctx) (((ctx)->nr_open_regions - 1) * TR2_INDENT)
 
-static struct strbuf dots = STRBUF_INIT;
-
 static int fn_init(void)
 {
 	int want = tr2_dst_trace_want(&tr2dst_perf);
@@ -41,8 +38,6 @@ static int fn_init(void)
 	if (!want)
 		return want;
 
-	strbuf_addchars(&dots, '.', TR2_DOTS_BUFFER_SIZE);
-
 	brief = tr2_sysenv_get(TR2_SYSENV_PERF_BRIEF);
 	if (brief && *brief &&
 	    ((want_brief = git_parse_maybe_bool(brief)) != -1))
@@ -54,8 +49,6 @@ static int fn_init(void)
 static void fn_term(void)
 {
 	tr2_dst_trace_disable(&tr2dst_perf);
-
-	strbuf_release(&dots);
 }
 
 /*
@@ -79,17 +72,36 @@ static void perf_fmt_prepare(const char *event_name,
 
 	if (!tr2env_perf_be_brief) {
 		struct tr2_tbuf tb_now;
+		size_t fl_end_col;
 
 		tr2_tbuf_local_time(&tb_now);
 		strbuf_addstr(buf, tb_now.buf);
 		strbuf_addch(buf, ' ');
 
-		if (file && *file)
-			strbuf_addf(buf, "%s:%d ", file, line);
-		while (buf->len < TR2FMT_PERF_FL_WIDTH)
+		fl_end_col = buf->len + TR2FMT_PERF_FL_WIDTH;
+
+		if (file && *file) {
+			struct strbuf buf_fl = STRBUF_INIT;
+
+			strbuf_addf(&buf_fl, "%s:%d", file, line);
+
+			if (buf_fl.len <= TR2FMT_PERF_FL_WIDTH)
+				strbuf_addbuf(buf, &buf_fl);
+			else {
+				size_t avail = TR2FMT_PERF_FL_WIDTH - 3;
+				strbuf_addstr(buf, "...");
+				strbuf_add(buf,
+					   &buf_fl.buf[buf_fl.len - avail],
+					   avail);
+			}
+
+			strbuf_release(&buf_fl);
+		}
+
+		while (buf->len < fl_end_col)
 			strbuf_addch(buf, ' ');
 
-		strbuf_addstr(buf, "| ");
+		strbuf_addstr(buf, " | ");
 	}
 
 	strbuf_addf(buf, "d%d | ", tr2_sid_depth());
@@ -102,7 +114,7 @@ static void perf_fmt_prepare(const char *event_name,
 		strbuf_addf(buf, "r%d ", repo->trace2_repo_id);
 	while (buf->len < len)
 		strbuf_addch(buf, ' ');
-	strbuf_addstr(buf, "| ");
+	strbuf_addstr(buf, " | ");
 
 	if (p_us_elapsed_absolute)
 		strbuf_addf(buf, "%9.6f | ",
@@ -116,17 +128,11 @@ static void perf_fmt_prepare(const char *event_name,
 	else
 		strbuf_addf(buf, "%9s | ", " ");
 
-	strbuf_addf(buf, "%-*s | ", TR2FMT_PERF_CATEGORY_WIDTH,
-		    (category ? category : ""));
+	strbuf_addf(buf, "%-*.*s | ", TR2FMT_PERF_CATEGORY_WIDTH,
+		    TR2FMT_PERF_CATEGORY_WIDTH, (category ? category : ""));
 
-	if (ctx->nr_open_regions > 0) {
-		int len_indent = TR2_INDENT_LENGTH(ctx);
-		while (len_indent > dots.len) {
-			strbuf_addbuf(buf, &dots);
-			len_indent -= dots.len;
-		}
-		strbuf_addf(buf, "%.*s", len_indent, dots.buf);
-	}
+	if (ctx->nr_open_regions > 0)
+		strbuf_addchars(buf, '.', TR2_INDENT_LENGTH(ctx));
 }
 
 static void perf_io_write_fl(const char *file, int line, const char *event_name,
@@ -165,7 +171,7 @@ static void fn_start_fl(const char *file, int line,
 	const char *event_name = "start";
 	struct strbuf buf_payload = STRBUF_INIT;
 
-	sq_quote_argv_pretty(&buf_payload, argv);
+	sq_append_quote_argv_pretty(&buf_payload, argv);
 
 	perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
 			 NULL, NULL, &buf_payload);
@@ -220,11 +226,6 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
 		va_end(copy_ap);
 		return;
 	}
-
-	if (fmt && *fmt) {
-		strbuf_addstr(buf, fmt);
-		return;
-	}
 }
 
 static void fn_error_va_fl(const char *file, int line, const char *fmt,
@@ -285,8 +286,9 @@ static void fn_alias_fl(const char *file, int line, const char *alias,
 	const char *event_name = "alias";
 	struct strbuf buf_payload = STRBUF_INIT;
 
-	strbuf_addf(&buf_payload, "alias:%s argv:", alias);
-	sq_quote_argv_pretty(&buf_payload, argv);
+	strbuf_addf(&buf_payload, "alias:%s argv:[", alias);
+	sq_append_quote_argv_pretty(&buf_payload, argv);
+	strbuf_addch(&buf_payload, ']');
 
 	perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
 			 &buf_payload);
@@ -315,10 +317,14 @@ static void fn_child_start_fl(const char *file, int line,
 		sq_quote_buf_pretty(&buf_payload, cmd->dir);
 	}
 
-	strbuf_addstr(&buf_payload, " argv:");
-	if (cmd->git_cmd)
-		strbuf_addstr(&buf_payload, " git");
-	sq_quote_argv_pretty(&buf_payload, cmd->argv);
+	strbuf_addstr(&buf_payload, " argv:[");
+	if (cmd->git_cmd) {
+		strbuf_addstr(&buf_payload, "git");
+		if (cmd->argv[0])
+			strbuf_addch(&buf_payload, ' ');
+	}
+	sq_append_quote_argv_pretty(&buf_payload, cmd->argv);
+	strbuf_addch(&buf_payload, ']');
 
 	perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
 			 NULL, NULL, &buf_payload);
@@ -369,10 +375,14 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
 	struct strbuf buf_payload = STRBUF_INIT;
 
 	strbuf_addf(&buf_payload, "id:%d ", exec_id);
-	strbuf_addstr(&buf_payload, "argv:");
-	if (exe)
-		strbuf_addf(&buf_payload, " %s", exe);
-	sq_quote_argv_pretty(&buf_payload, argv);
+	strbuf_addstr(&buf_payload, "argv:[");
+	if (exe) {
+		strbuf_addstr(&buf_payload, exe);
+		if (argv[0])
+			strbuf_addch(&buf_payload, ' ');
+	}
+	sq_append_quote_argv_pretty(&buf_payload, argv);
+	strbuf_addch(&buf_payload, ']');
 
 	perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
 			 NULL, NULL, &buf_payload);
@@ -433,8 +443,11 @@ static void fn_region_enter_printf_va_fl(const char *file, int line,
 	struct strbuf buf_payload = STRBUF_INIT;
 
 	if (label)
-		strbuf_addf(&buf_payload, "label:%s ", label);
-	maybe_append_string_va(&buf_payload, fmt, ap);
+		strbuf_addf(&buf_payload, "label:%s", label);
+	if (fmt && *fmt) {
+		strbuf_addch(&buf_payload, ' ');
+		maybe_append_string_va(&buf_payload, fmt, ap);
+	}
 
 	perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
 			 NULL, category, &buf_payload);
@@ -450,8 +463,11 @@ static void fn_region_leave_printf_va_fl(
 	struct strbuf buf_payload = STRBUF_INIT;
 
 	if (label)
-		strbuf_addf(&buf_payload, "label:%s ", label);
-	maybe_append_string_va(&buf_payload, fmt, ap);
+		strbuf_addf(&buf_payload, "label:%s", label);
+	if (fmt && *fmt) {
+		strbuf_addch(&buf_payload, ' ' );
+		maybe_append_string_va(&buf_payload, fmt, ap);
+	}
 
 	perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
 			 &us_elapsed_region, category, &buf_payload);
diff --git a/third_party/git/transport-helper.c b/third_party/git/transport-helper.c
index 6b05a88faf59..20a7185ec40e 100644
--- a/third_party/git/transport-helper.c
+++ b/third_party/git/transport-helper.c
@@ -33,6 +33,16 @@ struct helper_data {
 		check_connectivity : 1,
 		no_disconnect_req : 1,
 		no_private_update : 1;
+
+	/*
+	 * As an optimization, the transport code may invoke fetch before
+	 * get_refs_list. If this happens, and if the transport helper doesn't
+	 * support connect or stateless_connect, we need to invoke
+	 * get_refs_list ourselves if we haven't already done so. Keep track of
+	 * whether we have invoked get_refs_list.
+	 */
+	unsigned get_refs_list_called : 1;
+
 	char *export_marks;
 	char *import_marks;
 	/* These go from remote name (as in "list") to private name */
@@ -394,11 +404,12 @@ static int fetch_with_fetch(struct transport *transport,
 	sendline(data, &buf);
 
 	while (1) {
+		const char *name;
+
 		if (recvline(data, &buf))
 			exit(128);
 
-		if (starts_with(buf.buf, "lock ")) {
-			const char *name = buf.buf + 5;
+		if (skip_prefix(buf.buf, "lock ", &name)) {
 			if (transport->pack_lockfile)
 				warning(_("%s also locked %s"), data->name, name);
 			else
@@ -425,6 +436,7 @@ static int get_importer(struct transport *transport, struct child_process *fasti
 	child_process_init(fastimport);
 	fastimport->in = xdup(helper->out);
 	argv_array_push(&fastimport->args, "fast-import");
+	argv_array_push(&fastimport->args, "--allow-unsafe-features");
 	argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet");
 
 	if (data->bidi_import) {
@@ -652,17 +664,25 @@ static int connect_helper(struct transport *transport, const char *name,
 	return 0;
 }
 
+static struct ref *get_refs_list_using_list(struct transport *transport,
+					    int for_push);
+
 static int fetch(struct transport *transport,
 		 int nr_heads, struct ref **to_fetch)
 {
 	struct helper_data *data = transport->data;
 	int i, count;
 
+	get_helper(transport);
+
 	if (process_connect(transport, 0)) {
 		do_take_over(transport);
 		return transport->vtable->fetch(transport, nr_heads, to_fetch);
 	}
 
+	if (!data->get_refs_list_called)
+		get_refs_list_using_list(transport, 0);
+
 	count = 0;
 	for (i = 0; i < nr_heads; i++)
 		if (!(to_fetch[i]->status & REF_STATUS_UPTODATE))
@@ -682,13 +702,9 @@ static int fetch(struct transport *transport,
 		set_helper_option(transport, "update-shallow", "true");
 
 	if (data->transport_options.filter_options.choice) {
-		struct strbuf expanded_filter_spec = STRBUF_INIT;
-		expand_list_objects_filter_spec(
-			&data->transport_options.filter_options,
-			&expanded_filter_spec);
-		set_helper_option(transport, "filter",
-				  expanded_filter_spec.buf);
-		strbuf_release(&expanded_filter_spec);
+		const char *spec = expand_list_objects_filter_spec(
+			&data->transport_options.filter_options);
+		set_helper_option(transport, "filter", spec);
 	}
 
 	if (data->transport_options.negotiation_tips)
@@ -840,6 +856,10 @@ static void set_common_push_options(struct transport *transport,
 			die(_("helper %s does not support --signed=if-asked"), name);
 	}
 
+	if (flags & TRANSPORT_PUSH_ATOMIC)
+		if (set_helper_option(transport, TRANS_OPT_ATOMIC, "true") != 0)
+			die(_("helper %s does not support --atomic"), name);
+
 	if (flags & TRANSPORT_PUSH_OPTIONS) {
 		struct string_list_item *item;
 		for_each_string_list_item(item, transport->push_options)
@@ -1059,6 +1079,19 @@ static int has_attribute(const char *attrs, const char *attr)
 static struct ref *get_refs_list(struct transport *transport, int for_push,
 				 const struct argv_array *ref_prefixes)
 {
+	get_helper(transport);
+
+	if (process_connect(transport, for_push)) {
+		do_take_over(transport);
+		return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
+	}
+
+	return get_refs_list_using_list(transport, for_push);
+}
+
+static struct ref *get_refs_list_using_list(struct transport *transport,
+					    int for_push)
+{
 	struct helper_data *data = transport->data;
 	struct child_process *helper;
 	struct ref *ret = NULL;
@@ -1066,13 +1099,9 @@ static struct ref *get_refs_list(struct transport *transport, int for_push,
 	struct ref *posn;
 	struct strbuf buf = STRBUF_INIT;
 
+	data->get_refs_list_called = 1;
 	helper = get_helper(transport);
 
-	if (process_connect(transport, for_push)) {
-		do_take_over(transport);
-		return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
-	}
-
 	if (data->push && for_push)
 		write_str_in_full(helper->in, "list for-push\n");
 	else
@@ -1119,7 +1148,6 @@ static struct ref *get_refs_list(struct transport *transport, int for_push,
 }
 
 static struct transport_vtable vtable = {
-	0,
 	set_helper_option,
 	get_refs_list,
 	fetch,
diff --git a/third_party/git/transport-internal.h b/third_party/git/transport-internal.h
index 004bee5e368f..1cde6258a73b 100644
--- a/third_party/git/transport-internal.h
+++ b/third_party/git/transport-internal.h
@@ -7,12 +7,6 @@ struct argv_array;
 
 struct transport_vtable {
 	/**
-	 * This transport supports the fetch() function being called
-	 * without get_refs_list() first being called.
-	 */
-	unsigned fetch_without_list : 1;
-
-	/**
 	 * Returns 0 if successful, positive if the option is not
 	 * recognized or is inapplicable, and negative if the option
 	 * is applicable but the value is invalid.
diff --git a/third_party/git/transport.c b/third_party/git/transport.c
index 778c60bf573a..1fdc7dac1a62 100644
--- a/third_party/git/transport.c
+++ b/third_party/git/transport.c
@@ -122,6 +122,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
 struct bundle_transport_data {
 	int fd;
 	struct bundle_header header;
+	unsigned get_refs_from_bundle_called : 1;
 };
 
 static struct ref *get_refs_from_bundle(struct transport *transport,
@@ -135,6 +136,8 @@ static struct ref *get_refs_from_bundle(struct transport *transport,
 	if (for_push)
 		return NULL;
 
+	data->get_refs_from_bundle_called = 1;
+
 	if (data->fd > 0)
 		close(data->fd);
 	data->fd = read_bundle_header(transport->url, &data->header);
@@ -154,6 +157,9 @@ static int fetch_refs_from_bundle(struct transport *transport,
 			       int nr_heads, struct ref **to_fetch)
 {
 	struct bundle_transport_data *data = transport->data;
+
+	if (!data->get_refs_from_bundle_called)
+		get_refs_from_bundle(transport, 0, NULL);
 	return unbundle(the_repository, &data->header, data->fd,
 			transport->progress ? BUNDLE_VERBOSE : 0);
 }
@@ -224,6 +230,7 @@ static int set_git_option(struct git_transport_options *opts,
 		opts->no_dependents = !!value;
 		return 0;
 	} else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) {
+		list_objects_filter_die_if_populated(&opts->filter_options);
 		parse_list_objects_filter(&opts->filter_options, value);
 		return 0;
 	}
@@ -730,7 +737,7 @@ static int disconnect_git(struct transport *transport)
 {
 	struct git_transport_data *data = transport->data;
 	if (data->conn) {
-		if (data->got_remote_heads)
+		if (data->got_remote_heads && !transport->stateless_rpc)
 			packet_flush(data->fd[1]);
 		close(data->fd[0]);
 		close(data->fd[1]);
@@ -742,7 +749,6 @@ static int disconnect_git(struct transport *transport)
 }
 
 static struct transport_vtable taken_over_vtable = {
-	1,
 	NULL,
 	get_refs_via_connect,
 	fetch_refs_via_pack,
@@ -892,7 +898,6 @@ void transport_check_allowed(const char *type)
 }
 
 static struct transport_vtable bundle_vtable = {
-	0,
 	NULL,
 	get_refs_from_bundle,
 	fetch_refs_from_bundle,
@@ -902,7 +907,6 @@ static struct transport_vtable bundle_vtable = {
 };
 
 static struct transport_vtable builtin_smart_vtable = {
-	1,
 	NULL,
 	get_refs_via_connect,
 	fetch_refs_via_pack,
@@ -1141,8 +1145,10 @@ int transport_push(struct repository *r,
 
 		refspec_ref_prefixes(rs, &ref_prefixes);
 
+		trace2_region_enter("transport_push", "get_refs_list", r);
 		remote_refs = transport->vtable->get_refs_list(transport, 1,
 							       &ref_prefixes);
+		trace2_region_leave("transport_push", "get_refs_list", r);
 
 		argv_array_clear(&ref_prefixes);
 
@@ -1178,6 +1184,7 @@ int transport_push(struct repository *r,
 			struct ref *ref = remote_refs;
 			struct oid_array commits = OID_ARRAY_INIT;
 
+			trace2_region_enter("transport_push", "push_submodules", r);
 			for (; ref; ref = ref->next)
 				if (!is_null_oid(&ref->new_oid))
 					oid_array_append(&commits,
@@ -1190,9 +1197,11 @@ int transport_push(struct repository *r,
 						      transport->push_options,
 						      pretend)) {
 				oid_array_clear(&commits);
+				trace2_region_leave("transport_push", "push_submodules", r);
 				die(_("failed to push all needed submodules"));
 			}
 			oid_array_clear(&commits);
+			trace2_region_leave("transport_push", "push_submodules", r);
 		}
 
 		if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) ||
@@ -1203,6 +1212,7 @@ int transport_push(struct repository *r,
 			struct string_list needs_pushing = STRING_LIST_INIT_DUP;
 			struct oid_array commits = OID_ARRAY_INIT;
 
+			trace2_region_enter("transport_push", "check_submodules", r);
 			for (; ref; ref = ref->next)
 				if (!is_null_oid(&ref->new_oid))
 					oid_array_append(&commits,
@@ -1213,15 +1223,19 @@ int transport_push(struct repository *r,
 						     transport->remote->name,
 						     &needs_pushing)) {
 				oid_array_clear(&commits);
+				trace2_region_leave("transport_push", "check_submodules", r);
 				die_with_unpushed_submodules(&needs_pushing);
 			}
 			string_list_clear(&needs_pushing, 0);
 			oid_array_clear(&commits);
+			trace2_region_leave("transport_push", "check_submodules", r);
 		}
 
-		if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY))
+		if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) {
+			trace2_region_enter("transport_push", "push_refs", r);
 			push_ret = transport->vtable->push_refs(transport, remote_refs, flags);
-		else
+			trace2_region_leave("transport_push", "push_refs", r);
+		} else
 			push_ret = 0;
 		err = push_had_errors(remote_refs);
 		ret = push_ret | err;
@@ -1285,15 +1299,6 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs)
 	struct ref **heads = NULL;
 	struct ref *rm;
 
-	if (!transport->vtable->fetch_without_list)
-		/*
-		 * Some transports (e.g. the built-in bundle transport and the
-		 * transport helper interface) do not work when fetching is
-		 * done immediately after transport creation. List the remote
-		 * refs anyway (if not already listed) as a workaround.
-		 */
-		transport_get_remote_refs(transport, NULL);
-
 	for (rm = refs; rm; rm = rm->next) {
 		nr_refs++;
 		if (rm->peer_ref &&
diff --git a/third_party/git/transport.h b/third_party/git/transport.h
index 0b5f7806f625..e0131daab987 100644
--- a/third_party/git/transport.h
+++ b/third_party/git/transport.h
@@ -208,6 +208,9 @@ void transport_check_allowed(const char *type);
 /* Filter objects for partial clone and fetch */
 #define TRANS_OPT_LIST_OBJECTS_FILTER "filter"
 
+/* Request atomic (all-or-nothing) updates when pushing */
+#define TRANS_OPT_ATOMIC "atomic"
+
 /**
  * Returns 0 if the option was used, non-zero otherwise. Prints a
  * message to stderr if the option is not used.
diff --git a/third_party/git/tree-walk.c b/third_party/git/tree-walk.c
index c20b62f49e47..bb0ad34c5457 100644
--- a/third_party/git/tree-walk.c
+++ b/third_party/git/tree-walk.c
@@ -1,6 +1,5 @@
 #include "cache.h"
 #include "tree-walk.h"
-#include "unpack-trees.h"
 #include "dir.h"
 #include "object-store.h"
 #include "tree.h"
@@ -170,40 +169,61 @@ int tree_entry_gently(struct tree_desc *desc, struct name_entry *entry)
 
 void setup_traverse_info(struct traverse_info *info, const char *base)
 {
-	int pathlen = strlen(base);
+	size_t pathlen = strlen(base);
 	static struct traverse_info dummy;
 
 	memset(info, 0, sizeof(*info));
 	if (pathlen && base[pathlen-1] == '/')
 		pathlen--;
 	info->pathlen = pathlen ? pathlen + 1 : 0;
-	info->name.path = base;
-	info->name.pathlen = pathlen;
-	if (pathlen) {
-		hashcpy(info->name.oid.hash, (const unsigned char *)base + pathlen + 1);
+	info->name = base;
+	info->namelen = pathlen;
+	if (pathlen)
 		info->prev = &dummy;
-	}
 }
 
-char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n)
+char *make_traverse_path(char *path, size_t pathlen,
+			 const struct traverse_info *info,
+			 const char *name, size_t namelen)
 {
-	int len = tree_entry_len(n);
-	int pathlen = info->pathlen;
+	/* Always points to the end of the name we're about to add */
+	size_t pos = st_add(info->pathlen, namelen);
+
+	if (pos >= pathlen)
+		BUG("too small buffer passed to make_traverse_path");
 
-	path[pathlen + len] = 0;
+	path[pos] = 0;
 	for (;;) {
-		memcpy(path + pathlen, n->path, len);
-		if (!pathlen)
+		if (pos < namelen)
+			BUG("traverse_info pathlen does not match strings");
+		pos -= namelen;
+		memcpy(path + pos, name, namelen);
+
+		if (!pos)
 			break;
-		path[--pathlen] = '/';
-		n = &info->name;
-		len = tree_entry_len(n);
+		path[--pos] = '/';
+
+		if (!info)
+			BUG("traverse_info ran out of list items");
+		name = info->name;
+		namelen = info->namelen;
 		info = info->prev;
-		pathlen -= len;
 	}
 	return path;
 }
 
+void strbuf_make_traverse_path(struct strbuf *out,
+			       const struct traverse_info *info,
+			       const char *name, size_t namelen)
+{
+	size_t len = traverse_path_len(info, namelen);
+
+	strbuf_grow(out, len);
+	make_traverse_path(out->buf + out->len, out->alloc - out->len,
+			   info, name, namelen);
+	strbuf_setlen(out, out->len + len);
+}
+
 struct tree_desc_skip {
 	struct tree_desc_skip *prev;
 	const void *ptr;
@@ -389,24 +409,28 @@ int traverse_trees(struct index_state *istate,
 		   struct traverse_info *info)
 {
 	int error = 0;
-	struct name_entry *entry = xmalloc(n*sizeof(*entry));
+	struct name_entry entry[MAX_TRAVERSE_TREES];
 	int i;
-	struct tree_desc_x *tx = xcalloc(n, sizeof(*tx));
+	struct tree_desc_x tx[ARRAY_SIZE(entry)];
 	struct strbuf base = STRBUF_INIT;
 	int interesting = 1;
 	char *traverse_path;
 
-	for (i = 0; i < n; i++)
+	if (n >= ARRAY_SIZE(entry))
+		BUG("traverse_trees() called with too many trees (%d)", n);
+
+	for (i = 0; i < n; i++) {
 		tx[i].d = t[i];
+		tx[i].skip = NULL;
+	}
 
 	if (info->prev) {
-		strbuf_grow(&base, info->pathlen);
-		make_traverse_path(base.buf, info->prev, &info->name);
-		base.buf[info->pathlen-1] = '/';
-		strbuf_setlen(&base, info->pathlen);
-		traverse_path = xstrndup(base.buf, info->pathlen);
+		strbuf_make_traverse_path(&base, info->prev,
+					  info->name, info->namelen);
+		strbuf_addch(&base, '/');
+		traverse_path = xstrndup(base.buf, base.len);
 	} else {
-		traverse_path = xstrndup(info->name.path, info->pathlen);
+		traverse_path = xstrndup(info->name, info->pathlen);
 	}
 	info->traverse_path = traverse_path;
 	for (;;) {
@@ -486,10 +510,8 @@ int traverse_trees(struct index_state *istate,
 			if (mask & (1ul << i))
 				update_extended_entry(tx + i, entry + i);
 	}
-	free(entry);
 	for (i = 0; i < n; i++)
 		free_extended_entry(tx + i);
-	free(tx);
 	free(traverse_path);
 	info->traverse_path = NULL;
 	strbuf_release(&base);
@@ -1104,7 +1126,7 @@ match_wildcards:
 		 * later on.
 		 * max_depth is ignored but we may consider support it
 		 * in future, see
-		 * https://public-inbox.org/git/7vmxo5l2g4.fsf@alter.siamese.dyndns.org/
+		 * https://lore.kernel.org/git/7vmxo5l2g4.fsf@alter.siamese.dyndns.org/
 		 */
 		if (ps->recursive && S_ISDIR(entry->mode))
 			return entry_interesting;
diff --git a/third_party/git/tree-walk.h b/third_party/git/tree-walk.h
index 2a5db29e8f19..a5058469e9b3 100644
--- a/third_party/git/tree-walk.h
+++ b/third_party/git/tree-walk.h
@@ -3,6 +3,15 @@
 
 #include "cache.h"
 
+#define MAX_TRAVERSE_TREES 8
+
+/**
+ * The tree walking API is used to traverse and inspect trees.
+ */
+
+/**
+ * An entry in a tree. Each entry has a sha1 identifier, pathname, and mode.
+ */
 struct name_entry {
 	struct object_id oid;
 	const char *path;
@@ -10,12 +19,29 @@ struct name_entry {
 	unsigned int mode;
 };
 
+/**
+ * A semi-opaque data structure used to maintain the current state of the walk.
+ */
 struct tree_desc {
+	/*
+	 * pointer into the memory representation of the tree. It always
+	 * points at the current entry being visited.
+	 */
 	const void *buffer;
+
+	/* points to the current entry being visited. */
 	struct name_entry entry;
+
+	/* counts the number of bytes left in the `buffer`. */
 	unsigned int size;
 };
 
+/**
+ * Decode the entry currently being visited (the one pointed to by
+ * `tree_desc's` `entry` member) and return the sha1 of the entry. The
+ * `pathp` and `modep` arguments are set to the entry's pathname and mode
+ * respectively.
+ */
 static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned short *modep)
 {
 	*pathp = desc->entry.path;
@@ -23,6 +49,11 @@ static inline const struct object_id *tree_entry_extract(struct tree_desc *desc,
 	return &desc->entry.oid;
 }
 
+/**
+ * Calculate the length of a tree entry's pathname. This utilizes the
+ * memory structure of a tree entry to avoid the overhead of using a
+ * generic strlen().
+ */
 static inline int tree_entry_len(const struct name_entry *ne)
 {
 	return ne->pathlen;
@@ -33,48 +64,145 @@ static inline int tree_entry_len(const struct name_entry *ne)
  * corrupt tree entry rather than dying,
  */
 
+/**
+ * Walk to the next entry in a tree. This is commonly used in conjunction
+ * with `tree_entry_extract` to inspect the current entry.
+ */
 void update_tree_entry(struct tree_desc *);
+
 int update_tree_entry_gently(struct tree_desc *);
+
+/**
+ * Initialize a `tree_desc` and decode its first entry. The buffer and
+ * size parameters are assumed to be the same as the buffer and size
+ * members of `struct tree`.
+ */
 void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
+
 int init_tree_desc_gently(struct tree_desc *desc, const void *buf, unsigned long size);
 
 /*
- * Helper function that does both tree_entry_extract() and update_tree_entry()
- * and returns true for success
+ * Visit the next entry in a tree. Returns 1 when there are more entries
+ * left to visit and 0 when all entries have been visited. This is
+ * commonly used in the test of a while loop.
  */
 int tree_entry(struct tree_desc *, struct name_entry *);
+
 int tree_entry_gently(struct tree_desc *, struct name_entry *);
 
+/**
+ * Initialize a `tree_desc` and decode its first entry given the
+ * object ID of a tree. Returns the `buffer` member if the latter
+ * is a valid tree identifier and NULL otherwise.
+ */
 void *fill_tree_descriptor(struct repository *r,
 			   struct tree_desc *desc,
 			   const struct object_id *oid);
 
 struct traverse_info;
 typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
+
+/**
+ * Traverse `n` number of trees in parallel. The `fn` callback member of
+ * `traverse_info` is called once for each tree entry.
+ */
 int traverse_trees(struct index_state *istate, int n, struct tree_desc *t, struct traverse_info *info);
 
 enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r, struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned short *mode);
 
+/**
+ * A structure used to maintain the state of a traversal.
+ */
 struct traverse_info {
 	const char *traverse_path;
+
+	/*
+	 * points to the traverse_info which was used to descend into the
+	 * current tree. If this is the top-level tree `prev` will point to
+	 * a dummy traverse_info.
+	 */
 	struct traverse_info *prev;
-	struct name_entry name;
-	int pathlen;
+
+	/* is the entry for the current tree (if the tree is a subtree). */
+	const char *name;
+
+	size_t namelen;
+	unsigned mode;
+
+	/* is the length of the full path for the current tree. */
+	size_t pathlen;
+
 	struct pathspec *pathspec;
 
+	/* can be used by callbacks to maintain directory-file conflicts. */
 	unsigned long df_conflicts;
+
+	/* a callback called for each entry in the tree.
+	 *
+	 * The arguments passed to the traverse callback are as follows:
+	 *
+	 * - `n` counts the number of trees being traversed.
+	 *
+	 * - `mask` has its nth bit set if something exists in the nth entry.
+	 *
+	 * - `dirmask` has its nth bit set if the nth tree's entry is a directory.
+	 *
+	 * - `entry` is an array of size `n` where the nth entry is from the nth tree.
+	 *
+	 * - `info` maintains the state of the traversal.
+	 *
+	 * Returning a negative value will terminate the traversal. Otherwise the
+	 * return value is treated as an update mask. If the nth bit is set the nth tree
+	 * will be updated and if the bit is not set the nth tree entry will be the
+	 * same in the next callback invocation.
+	 */
 	traverse_callback_t fn;
+
+	/* can be anything the `fn` callback would want to use. */
 	void *data;
+
+	/* tells whether to stop at the first error or not. */
 	int show_all_errors;
 };
 
+/**
+ * Find an entry in a tree given a pathname and the sha1 of a tree to
+ * search. Returns 0 if the entry is found and -1 otherwise. The third
+ * and fourth parameters are set to the entry's sha1 and mode respectively.
+ */
 int get_tree_entry(struct repository *, const struct object_id *, const char *, struct object_id *, unsigned short *);
-char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
+
+/**
+ * Generate the full pathname of a tree entry based from the root of the
+ * traversal. For example, if the traversal has recursed into another
+ * tree named "bar" the pathname of an entry "baz" in the "bar"
+ * tree would be "bar/baz".
+ */
+char *make_traverse_path(char *path, size_t pathlen, const struct traverse_info *info,
+			 const char *name, size_t namelen);
+
+/**
+ * Convenience wrapper to `make_traverse_path` into a strbuf.
+ */
+void strbuf_make_traverse_path(struct strbuf *out,
+			       const struct traverse_info *info,
+			       const char *name, size_t namelen);
+
+/**
+ * Initialize a `traverse_info` given the pathname of the tree to start
+ * traversing from.
+ */
 void setup_traverse_info(struct traverse_info *info, const char *base);
 
-static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n)
+/**
+ * Calculate the length of a pathname returned by `make_traverse_path`.
+ * This utilizes the memory structure of a tree entry to avoid the
+ * overhead of using a generic strlen().
+ */
+static inline size_t traverse_path_len(const struct traverse_info *info,
+				       size_t namelen)
 {
-	return info->pathlen + tree_entry_len(n);
+	return st_add(info->pathlen, namelen);
 }
 
 /* in general, positive means "kind of interesting" */
diff --git a/third_party/git/tree.c b/third_party/git/tree.c
index 4720945e6a68..1466bcc6a8cf 100644
--- a/third_party/git/tree.c
+++ b/third_party/git/tree.c
@@ -244,19 +244,7 @@ void free_tree_buffer(struct tree *tree)
 
 struct tree *parse_tree_indirect(const struct object_id *oid)
 {
-	struct object *obj = parse_object(the_repository, oid);
-	do {
-		if (!obj)
-			return NULL;
-		if (obj->type == OBJ_TREE)
-			return (struct tree *) obj;
-		else if (obj->type == OBJ_COMMIT)
-			obj = &(get_commit_tree(((struct commit *)obj))->object);
-		else if (obj->type == OBJ_TAG)
-			obj = ((struct tag *) obj)->tagged;
-		else
-			return NULL;
-		if (!obj->parsed)
-			parse_object(the_repository, &obj->oid);
-	} while (1);
+	struct repository *r = the_repository;
+	struct object *obj = parse_object(r, oid);
+	return (struct tree *)repo_peel_to_type(r, NULL, 0, obj, OBJ_TREE);
 }
diff --git a/third_party/git/unicode-width.h b/third_party/git/unicode-width.h
index c9d027625d1f..b50e686bae0a 100644
--- a/third_party/git/unicode-width.h
+++ b/third_party/git/unicode-width.h
@@ -59,7 +59,7 @@ static const struct interval zero_width[] = {
 { 0x0B3F, 0x0B3F },
 { 0x0B41, 0x0B44 },
 { 0x0B4D, 0x0B4D },
-{ 0x0B56, 0x0B56 },
+{ 0x0B55, 0x0B56 },
 { 0x0B62, 0x0B63 },
 { 0x0B82, 0x0B82 },
 { 0x0BC0, 0x0BC0 },
@@ -82,6 +82,7 @@ static const struct interval zero_width[] = {
 { 0x0D41, 0x0D44 },
 { 0x0D4D, 0x0D4D },
 { 0x0D62, 0x0D63 },
+{ 0x0D81, 0x0D81 },
 { 0x0DCA, 0x0DCA },
 { 0x0DD2, 0x0DD4 },
 { 0x0DD6, 0x0DD6 },
@@ -139,7 +140,7 @@ static const struct interval zero_width[] = {
 { 0x1A65, 0x1A6C },
 { 0x1A73, 0x1A7C },
 { 0x1A7F, 0x1A7F },
-{ 0x1AB0, 0x1ABE },
+{ 0x1AB0, 0x1AC0 },
 { 0x1B00, 0x1B03 },
 { 0x1B34, 0x1B34 },
 { 0x1B36, 0x1B3A },
@@ -182,6 +183,7 @@ static const struct interval zero_width[] = {
 { 0xA806, 0xA806 },
 { 0xA80B, 0xA80B },
 { 0xA825, 0xA826 },
+{ 0xA82C, 0xA82C },
 { 0xA8C4, 0xA8C5 },
 { 0xA8E0, 0xA8F1 },
 { 0xA8FF, 0xA8FF },
@@ -223,6 +225,7 @@ static const struct interval zero_width[] = {
 { 0x10A3F, 0x10A3F },
 { 0x10AE5, 0x10AE6 },
 { 0x10D24, 0x10D27 },
+{ 0x10EAB, 0x10EAC },
 { 0x10F46, 0x10F50 },
 { 0x11001, 0x11001 },
 { 0x11038, 0x11046 },
@@ -238,6 +241,7 @@ static const struct interval zero_width[] = {
 { 0x11180, 0x11181 },
 { 0x111B6, 0x111BE },
 { 0x111C9, 0x111CC },
+{ 0x111CF, 0x111CF },
 { 0x1122F, 0x11231 },
 { 0x11234, 0x11234 },
 { 0x11236, 0x11237 },
@@ -273,6 +277,9 @@ static const struct interval zero_width[] = {
 { 0x11727, 0x1172B },
 { 0x1182F, 0x11837 },
 { 0x11839, 0x1183A },
+{ 0x1193B, 0x1193C },
+{ 0x1193E, 0x1193E },
+{ 0x11943, 0x11943 },
 { 0x119D4, 0x119D7 },
 { 0x119DA, 0x119DB },
 { 0x119E0, 0x119E0 },
@@ -305,6 +312,7 @@ static const struct interval zero_width[] = {
 { 0x16B30, 0x16B36 },
 { 0x16F4F, 0x16F4F },
 { 0x16F8F, 0x16F92 },
+{ 0x16FE4, 0x16FE4 },
 { 0x1BC9D, 0x1BC9E },
 { 0x1BCA0, 0x1BCA3 },
 { 0x1D167, 0x1D169 },
@@ -376,8 +384,7 @@ static const struct interval double_width[] = {
 { 0x3099, 0x30FF },
 { 0x3105, 0x312F },
 { 0x3131, 0x318E },
-{ 0x3190, 0x31BA },
-{ 0x31C0, 0x31E3 },
+{ 0x3190, 0x31E3 },
 { 0x31F0, 0x321E },
 { 0x3220, 0x3247 },
 { 0x3250, 0x4DBF },
@@ -392,9 +399,11 @@ static const struct interval double_width[] = {
 { 0xFE68, 0xFE6B },
 { 0xFF01, 0xFF60 },
 { 0xFFE0, 0xFFE6 },
-{ 0x16FE0, 0x16FE3 },
+{ 0x16FE0, 0x16FE4 },
+{ 0x16FF0, 0x16FF1 },
 { 0x17000, 0x187F7 },
-{ 0x18800, 0x18AF2 },
+{ 0x18800, 0x18CD5 },
+{ 0x18D00, 0x18D08 },
 { 0x1B000, 0x1B11E },
 { 0x1B150, 0x1B152 },
 { 0x1B164, 0x1B167 },
@@ -429,20 +438,22 @@ static const struct interval double_width[] = {
 { 0x1F680, 0x1F6C5 },
 { 0x1F6CC, 0x1F6CC },
 { 0x1F6D0, 0x1F6D2 },
-{ 0x1F6D5, 0x1F6D5 },
+{ 0x1F6D5, 0x1F6D7 },
 { 0x1F6EB, 0x1F6EC },
-{ 0x1F6F4, 0x1F6FA },
+{ 0x1F6F4, 0x1F6FC },
 { 0x1F7E0, 0x1F7EB },
-{ 0x1F90D, 0x1F971 },
-{ 0x1F973, 0x1F976 },
-{ 0x1F97A, 0x1F9A2 },
-{ 0x1F9A5, 0x1F9AA },
-{ 0x1F9AE, 0x1F9CA },
+{ 0x1F90C, 0x1F93A },
+{ 0x1F93C, 0x1F945 },
+{ 0x1F947, 0x1F978 },
+{ 0x1F97A, 0x1F9CB },
 { 0x1F9CD, 0x1F9FF },
-{ 0x1FA70, 0x1FA73 },
+{ 0x1FA70, 0x1FA74 },
 { 0x1FA78, 0x1FA7A },
-{ 0x1FA80, 0x1FA82 },
-{ 0x1FA90, 0x1FA95 },
+{ 0x1FA80, 0x1FA86 },
+{ 0x1FA90, 0x1FAA8 },
+{ 0x1FAB0, 0x1FAB6 },
+{ 0x1FAC0, 0x1FAC2 },
+{ 0x1FAD0, 0x1FAD6 },
 { 0x20000, 0x2FFFD },
 { 0x30000, 0x3FFFD }
 };
diff --git a/third_party/git/unpack-trees.c b/third_party/git/unpack-trees.c
index 62276d4fef5f..1ecdab330408 100644
--- a/third_party/git/unpack-trees.c
+++ b/third_party/git/unpack-trees.c
@@ -11,12 +11,11 @@
 #include "refs.h"
 #include "attr.h"
 #include "split-index.h"
-#include "dir.h"
 #include "submodule.h"
 #include "submodule-config.h"
 #include "fsmonitor.h"
 #include "object-store.h"
-#include "fetch-object.h"
+#include "promisor-remote.h"
 
 /*
  * Error messages expected by scripts out of plumbing commands such as
@@ -276,9 +275,9 @@ static int check_submodule_move_head(const struct cache_entry *ce,
 }
 
 /*
- * Preform the loading of the repository's gitmodules file.  This function is
+ * Perform the loading of the repository's gitmodules file.  This function is
  * used by 'check_update()' to perform loading of the gitmodules file in two
- * differnt situations:
+ * different situations:
  * (1) before removing entries from the working tree if the gitmodules file has
  *     been marked for removal.  This situation is specified by 'state' == NULL.
  * (2) before checking out entries to the working tree if the gitmodules file
@@ -292,11 +291,11 @@ static void load_gitmodules_file(struct index_state *index,
 	if (pos >= 0) {
 		struct cache_entry *ce = index->cache[pos];
 		if (!state && ce->ce_flags & CE_WT_REMOVE) {
-			repo_read_gitmodules(the_repository);
+			repo_read_gitmodules(the_repository, 0);
 		} else if (state && (ce->ce_flags & CE_UPDATE)) {
 			submodule_free(the_repository);
 			checkout_entry(ce, state, NULL, NULL);
-			repo_read_gitmodules(the_repository);
+			repo_read_gitmodules(the_repository, 0);
 		}
 	}
 }
@@ -373,15 +372,20 @@ static int check_updates(struct unpack_trees_options *o)
 	state.refresh_cache = 1;
 	state.istate = index;
 
+	if (!o->update || o->dry_run) {
+		remove_marked_cache_entries(index, 0);
+		trace_performance_leave("check_updates");
+		return 0;
+	}
+
 	if (o->clone)
 		setup_collided_checkout_detection(&state, index);
 
 	progress = get_progress(o);
 
-	if (o->update)
-		git_attr_set_direction(GIT_ATTR_CHECKOUT);
+	git_attr_set_direction(GIT_ATTR_CHECKOUT);
 
-	if (should_update_submodules() && o->update && !o->dry_run)
+	if (should_update_submodules())
 		load_gitmodules_file(index, NULL);
 
 	for (i = 0; i < index->cache_nr; i++) {
@@ -389,18 +393,18 @@ static int check_updates(struct unpack_trees_options *o)
 
 		if (ce->ce_flags & CE_WT_REMOVE) {
 			display_progress(progress, ++cnt);
-			if (o->update && !o->dry_run)
-				unlink_entry(ce);
+			unlink_entry(ce);
 		}
 	}
+
 	remove_marked_cache_entries(index, 0);
 	remove_scheduled_dirs();
 
-	if (should_update_submodules() && o->update && !o->dry_run)
+	if (should_update_submodules())
 		load_gitmodules_file(index, &state);
 
 	enable_delayed_checkout(&state);
-	if (repository_format_partial_clone && o->update && !o->dry_run) {
+	if (has_promisor_remote()) {
 		/*
 		 * Prefetch the objects that are to be checked out in the loop
 		 * below.
@@ -419,8 +423,8 @@ static int check_updates(struct unpack_trees_options *o)
 			oid_array_append(&to_fetch, &ce->oid);
 		}
 		if (to_fetch.nr)
-			fetch_objects(repository_format_partial_clone,
-				      to_fetch.oid, to_fetch.nr);
+			promisor_remote_get_direct(the_repository,
+						   to_fetch.oid, to_fetch.nr);
 		oid_array_clear(&to_fetch);
 	}
 	for (i = 0; i < index->cache_nr; i++) {
@@ -432,15 +436,12 @@ static int check_updates(struct unpack_trees_options *o)
 				    ce->name);
 			display_progress(progress, ++cnt);
 			ce->ce_flags &= ~CE_UPDATE;
-			if (o->update && !o->dry_run) {
-				errs |= checkout_entry(ce, &state, NULL, NULL);
-			}
+			errs |= checkout_entry(ce, &state, NULL, NULL);
 		}
 	}
 	stop_progress(&progress);
 	errs |= finish_delayed_checkout(&state, NULL);
-	if (o->update)
-		git_attr_set_direction(GIT_ATTR_CHECKIN);
+	git_attr_set_direction(GIT_ATTR_CHECKIN);
 
 	if (o->clone)
 		report_collided_checkout(index);
@@ -632,7 +633,7 @@ static int unpack_index_entry(struct cache_entry *ce,
 	return ret;
 }
 
-static int find_cache_pos(struct traverse_info *, const struct name_entry *);
+static int find_cache_pos(struct traverse_info *, const char *p, size_t len);
 
 static void restore_cache_bottom(struct traverse_info *info, int bottom)
 {
@@ -651,7 +652,7 @@ static int switch_cache_bottom(struct traverse_info *info)
 	if (o->diff_index_cached)
 		return 0;
 	ret = o->cache_bottom;
-	pos = find_cache_pos(info->prev, &info->name);
+	pos = find_cache_pos(info->prev, info->name, info->namelen);
 
 	if (pos < -1)
 		o->cache_bottom = -2 - pos;
@@ -686,21 +687,21 @@ static int index_pos_by_traverse_info(struct name_entry *names,
 				      struct traverse_info *info)
 {
 	struct unpack_trees_options *o = info->data;
-	int len = traverse_path_len(info, names);
-	char *name = xmalloc(len + 1 /* slash */ + 1 /* NUL */);
+	struct strbuf name = STRBUF_INIT;
 	int pos;
 
-	make_traverse_path(name, info, names);
-	name[len++] = '/';
-	name[len] = '\0';
-	pos = index_name_pos(o->src_index, name, len);
+	strbuf_make_traverse_path(&name, info, names->path, names->pathlen);
+	strbuf_addch(&name, '/');
+	pos = index_name_pos(o->src_index, name.buf, name.len);
 	if (pos >= 0)
 		BUG("This is a directory and should not exist in index");
 	pos = -pos - 1;
-	if (!starts_with(o->src_index->cache[pos]->name, name) ||
-	    (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name)))
-		BUG("pos must point at the first entry in this directory");
-	free(name);
+	if (pos >= o->src_index->cache_nr ||
+	    !starts_with(o->src_index->cache[pos]->name, name.buf) ||
+	    (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf)))
+		BUG("pos %d doesn't point to the first entry of %s in index",
+		    pos, name.buf);
+	strbuf_release(&name);
 	return pos;
 }
 
@@ -811,8 +812,10 @@ static int traverse_trees_recursive(int n, unsigned long dirmask,
 	newinfo = *info;
 	newinfo.prev = info;
 	newinfo.pathspec = info->pathspec;
-	newinfo.name = *p;
-	newinfo.pathlen += tree_entry_len(p) + 1;
+	newinfo.name = p->path;
+	newinfo.namelen = p->pathlen;
+	newinfo.mode = p->mode;
+	newinfo.pathlen = st_add3(newinfo.pathlen, tree_entry_len(p), 1);
 	newinfo.df_conflicts |= df_conflicts;
 
 	/*
@@ -863,14 +866,18 @@ static int traverse_trees_recursive(int n, unsigned long dirmask,
  * itself - the caller needs to do the final check for the cache
  * entry having more data at the end!
  */
-static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
+static int do_compare_entry_piecewise(const struct cache_entry *ce,
+				      const struct traverse_info *info,
+				      const char *name, size_t namelen,
+				      unsigned mode)
 {
-	int len, pathlen, ce_len;
+	int pathlen, ce_len;
 	const char *ce_name;
 
 	if (info->prev) {
 		int cmp = do_compare_entry_piecewise(ce, info->prev,
-						     &info->name);
+						     info->name, info->namelen,
+						     info->mode);
 		if (cmp)
 			return cmp;
 	}
@@ -884,15 +891,15 @@ static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct
 	ce_len -= pathlen;
 	ce_name = ce->name + pathlen;
 
-	len = tree_entry_len(n);
-	return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
+	return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
 }
 
 static int do_compare_entry(const struct cache_entry *ce,
 			    const struct traverse_info *info,
-			    const struct name_entry *n)
+			    const char *name, size_t namelen,
+			    unsigned mode)
 {
-	int len, pathlen, ce_len;
+	int pathlen, ce_len;
 	const char *ce_name;
 	int cmp;
 
@@ -902,7 +909,7 @@ static int do_compare_entry(const struct cache_entry *ce,
 	 * it is quicker to use the precomputed version.
 	 */
 	if (!info->traverse_path)
-		return do_compare_entry_piecewise(ce, info, n);
+		return do_compare_entry_piecewise(ce, info, name, namelen, mode);
 
 	cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
 	if (cmp)
@@ -917,13 +924,12 @@ static int do_compare_entry(const struct cache_entry *ce,
 	ce_len -= pathlen;
 	ce_name = ce->name + pathlen;
 
-	len = tree_entry_len(n);
-	return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
+	return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
 }
 
 static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
 {
-	int cmp = do_compare_entry(ce, info, n);
+	int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode);
 	if (cmp)
 		return cmp;
 
@@ -931,7 +937,7 @@ static int compare_entry(const struct cache_entry *ce, const struct traverse_inf
 	 * Even if the beginning compared identically, the ce should
 	 * compare as bigger than a directory leading up to it!
 	 */
-	return ce_namelen(ce) > traverse_path_len(info, n);
+	return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n));
 }
 
 static int ce_in_traverse_path(const struct cache_entry *ce,
@@ -939,7 +945,8 @@ static int ce_in_traverse_path(const struct cache_entry *ce,
 {
 	if (!info->prev)
 		return 1;
-	if (do_compare_entry(ce, info->prev, &info->name))
+	if (do_compare_entry(ce, info->prev,
+			     info->name, info->namelen, info->mode))
 		return 0;
 	/*
 	 * If ce (blob) is the same name as the path (which is a tree
@@ -954,7 +961,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info,
 	struct index_state *istate,
 	int is_transient)
 {
-	int len = traverse_path_len(info, n);
+	size_t len = traverse_path_len(info, tree_entry_len(n));
 	struct cache_entry *ce =
 		is_transient ?
 		make_empty_transient_cache_entry(len) :
@@ -964,7 +971,8 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info,
 	ce->ce_flags = create_ce_flags(stage);
 	ce->ce_namelen = len;
 	oidcpy(&ce->oid, &n->oid);
-	make_traverse_path(ce->name, info, n);
+	/* len+1 because the cache_entry allocates space for NUL */
+	make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen);
 
 	return ce;
 }
@@ -1057,13 +1065,12 @@ static int unpack_failed(struct unpack_trees_options *o, const char *message)
  * the directory.
  */
 static int find_cache_pos(struct traverse_info *info,
-			  const struct name_entry *p)
+			  const char *p, size_t p_len)
 {
 	int pos;
 	struct unpack_trees_options *o = info->data;
 	struct index_state *index = o->src_index;
 	int pfxlen = info->pathlen;
-	int p_len = tree_entry_len(p);
 
 	for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
 		const struct cache_entry *ce = index->cache[pos];
@@ -1099,7 +1106,7 @@ static int find_cache_pos(struct traverse_info *info,
 			ce_len = ce_slash - ce_name;
 		else
 			ce_len = ce_namelen(ce) - pfxlen;
-		cmp = name_compare(p->path, p_len, ce_name, ce_len);
+		cmp = name_compare(p, p_len, ce_name, ce_len);
 		/*
 		 * Exact match; if we have a directory we need to
 		 * delay returning it.
@@ -1114,7 +1121,7 @@ static int find_cache_pos(struct traverse_info *info,
 		 * E.g.  ce_name == "t-i", and p->path == "t"; we may
 		 * have "t/a" in the index.
 		 */
-		if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
+		if (p_len < ce_len && !memcmp(ce_name, p, p_len) &&
 		    ce_name[p_len] < '/')
 			continue; /* keep looking */
 		break;
@@ -1125,7 +1132,7 @@ static int find_cache_pos(struct traverse_info *info,
 static struct cache_entry *find_cache_entry(struct traverse_info *info,
 					    const struct name_entry *p)
 {
-	int pos = find_cache_pos(info, p);
+	int pos = find_cache_pos(info, p->path, p->pathlen);
 	struct unpack_trees_options *o = info->data;
 
 	if (0 <= pos)
@@ -1138,10 +1145,10 @@ static void debug_path(struct traverse_info *info)
 {
 	if (info->prev) {
 		debug_path(info->prev);
-		if (*info->prev->name.path)
+		if (*info->prev->name)
 			putchar('/');
 	}
-	printf("%s", info->name.path);
+	printf("%s", info->name);
 }
 
 static void debug_name_entry(int i, struct name_entry *n)
@@ -1265,7 +1272,9 @@ static int clear_ce_flags_1(struct index_state *istate,
 			    struct cache_entry **cache, int nr,
 			    struct strbuf *prefix,
 			    int select_mask, int clear_mask,
-			    struct exclude_list *el, int defval);
+			    struct pattern_list *pl,
+			    enum pattern_match_result default_match,
+			    int progress_nr);
 
 /* Whole directory matching */
 static int clear_ce_flags_dir(struct index_state *istate,
@@ -1273,19 +1282,24 @@ static int clear_ce_flags_dir(struct index_state *istate,
 			      struct strbuf *prefix,
 			      char *basename,
 			      int select_mask, int clear_mask,
-			      struct exclude_list *el, int defval)
+			      struct pattern_list *pl,
+			      enum pattern_match_result default_match,
+			      int progress_nr)
 {
 	struct cache_entry **cache_end;
 	int dtype = DT_DIR;
-	int ret = is_excluded_from_list(prefix->buf, prefix->len,
-					basename, &dtype, el, istate);
 	int rc;
+	enum pattern_match_result ret, orig_ret;
+	orig_ret = path_matches_pattern_list(prefix->buf, prefix->len,
+					     basename, &dtype, pl, istate);
 
 	strbuf_addch(prefix, '/');
 
 	/* If undecided, use matching result of parent dir in defval */
-	if (ret < 0)
-		ret = defval;
+	if (orig_ret == UNDECIDED)
+		ret = default_match;
+	else
+		ret = orig_ret;
 
 	for (cache_end = cache; cache_end != cache + nr; cache_end++) {
 		struct cache_entry *ce = *cache_end;
@@ -1293,24 +1307,31 @@ static int clear_ce_flags_dir(struct index_state *istate,
 			break;
 	}
 
-	/*
-	 * TODO: check el, if there are no patterns that may conflict
-	 * with ret (iow, we know in advance the incl/excl
-	 * decision for the entire directory), clear flag here without
-	 * calling clear_ce_flags_1(). That function will call
-	 * the expensive is_excluded_from_list() on every entry.
-	 */
-	rc = clear_ce_flags_1(istate, cache, cache_end - cache,
-			      prefix,
-			      select_mask, clear_mask,
-			      el, ret);
+	if (pl->use_cone_patterns && orig_ret == MATCHED_RECURSIVE) {
+		struct cache_entry **ce = cache;
+		rc = cache_end - cache;
+
+		while (ce < cache_end) {
+			(*ce)->ce_flags &= ~clear_mask;
+			ce++;
+		}
+	} else if (pl->use_cone_patterns && orig_ret == NOT_MATCHED) {
+		rc = cache_end - cache;
+	} else {
+		rc = clear_ce_flags_1(istate, cache, cache_end - cache,
+				      prefix,
+				      select_mask, clear_mask,
+				      pl, ret,
+				      progress_nr);
+	}
+
 	strbuf_setlen(prefix, prefix->len - 1);
 	return rc;
 }
 
 /*
  * Traverse the index, find every entry that matches according to
- * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
+ * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the
  * number of traversed entries.
  *
  * If select_mask is non-zero, only entries whose ce_flags has on of
@@ -1327,9 +1348,11 @@ static int clear_ce_flags_1(struct index_state *istate,
 			    struct cache_entry **cache, int nr,
 			    struct strbuf *prefix,
 			    int select_mask, int clear_mask,
-			    struct exclude_list *el, int defval)
+			    struct pattern_list *pl,
+			    enum pattern_match_result default_match,
+			    int progress_nr)
 {
-	struct cache_entry **cache_end = cache + nr;
+	struct cache_entry **cache_end = nr ? cache + nr : cache;
 
 	/*
 	 * Process all entries that have the given prefix and meet
@@ -1338,10 +1361,14 @@ static int clear_ce_flags_1(struct index_state *istate,
 	while(cache != cache_end) {
 		struct cache_entry *ce = *cache;
 		const char *name, *slash;
-		int len, dtype, ret;
+		int len, dtype;
+		enum pattern_match_result ret;
+
+		display_progress(istate->progress, progress_nr);
 
 		if (select_mask && !(ce->ce_flags & select_mask)) {
 			cache++;
+			progress_nr++;
 			continue;
 		}
 
@@ -1362,58 +1389,84 @@ static int clear_ce_flags_1(struct index_state *istate,
 						       prefix,
 						       prefix->buf + prefix->len - len,
 						       select_mask, clear_mask,
-						       el, defval);
+						       pl, default_match,
+						       progress_nr);
 
 			/* clear_c_f_dir eats a whole dir already? */
 			if (processed) {
 				cache += processed;
+				progress_nr += processed;
 				strbuf_setlen(prefix, prefix->len - len);
 				continue;
 			}
 
 			strbuf_addch(prefix, '/');
-			cache += clear_ce_flags_1(istate, cache, cache_end - cache,
-						  prefix,
-						  select_mask, clear_mask, el, defval);
+			processed = clear_ce_flags_1(istate, cache, cache_end - cache,
+						     prefix,
+						     select_mask, clear_mask, pl,
+						     default_match, progress_nr);
+
+			cache += processed;
+			progress_nr += processed;
+
 			strbuf_setlen(prefix, prefix->len - len - 1);
 			continue;
 		}
 
 		/* Non-directory */
 		dtype = ce_to_dtype(ce);
-		ret = is_excluded_from_list(ce->name, ce_namelen(ce),
-					    name, &dtype, el, istate);
-		if (ret < 0)
-			ret = defval;
-		if (ret > 0)
+		ret = path_matches_pattern_list(ce->name,
+						ce_namelen(ce),
+						name, &dtype, pl, istate);
+		if (ret == UNDECIDED)
+			ret = default_match;
+		if (ret == MATCHED || ret == MATCHED_RECURSIVE)
 			ce->ce_flags &= ~clear_mask;
 		cache++;
+		progress_nr++;
 	}
+
+	display_progress(istate->progress, progress_nr);
 	return nr - (cache_end - cache);
 }
 
 static int clear_ce_flags(struct index_state *istate,
 			  int select_mask, int clear_mask,
-			  struct exclude_list *el)
+			  struct pattern_list *pl,
+			  int show_progress)
 {
 	static struct strbuf prefix = STRBUF_INIT;
+	char label[100];
+	int rval;
 
 	strbuf_reset(&prefix);
-
-	return clear_ce_flags_1(istate,
+	if (show_progress)
+		istate->progress = start_delayed_progress(
+					_("Updating index flags"),
+					istate->cache_nr);
+
+	xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)",
+		  (unsigned long)select_mask, (unsigned long)clear_mask);
+	trace2_region_enter("unpack_trees", label, the_repository);
+	rval = clear_ce_flags_1(istate,
 				istate->cache,
 				istate->cache_nr,
 				&prefix,
 				select_mask, clear_mask,
-				el, 0);
+				pl, 0, 0);
+	trace2_region_leave("unpack_trees", label, the_repository);
+
+	stop_progress(&istate->progress);
+	return rval;
 }
 
 /*
  * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
  */
-static void mark_new_skip_worktree(struct exclude_list *el,
+static void mark_new_skip_worktree(struct pattern_list *pl,
 				   struct index_state *istate,
-				   int select_flag, int skip_wt_flag)
+				   int select_flag, int skip_wt_flag,
+				   int show_progress)
 {
 	int i;
 
@@ -1437,7 +1490,7 @@ static void mark_new_skip_worktree(struct exclude_list *el,
 	 * 2. Widen worktree according to sparse-checkout file.
 	 * Matched entries will have skip_wt_flag cleared (i.e. "in")
 	 */
-	clear_ce_flags(istate, select_flag, skip_wt_flag, el);
+	clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress);
 }
 
 static int verify_absent(const struct cache_entry *,
@@ -1453,21 +1506,22 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 {
 	int i, ret;
 	static struct cache_entry *dfc;
-	struct exclude_list el;
+	struct pattern_list pl;
 
 	if (len > MAX_UNPACK_TREES)
 		die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
 
 	trace_performance_enter();
-	memset(&el, 0, sizeof(el));
+	memset(&pl, 0, sizeof(pl));
 	if (!core_apply_sparse_checkout || !o->update)
 		o->skip_sparse_checkout = 1;
-	if (!o->skip_sparse_checkout) {
+	if (!o->skip_sparse_checkout && !o->pl) {
 		char *sparse = git_pathdup("info/sparse-checkout");
-		if (add_excludes_from_file_to_list(sparse, "", 0, &el, NULL) < 0)
+		pl.use_cone_patterns = core_sparse_checkout_cone;
+		if (add_patterns_from_file_to_list(sparse, "", 0, &pl, NULL) < 0)
 			o->skip_sparse_checkout = 1;
 		else
-			o->el = &el;
+			o->pl = &pl;
 		free(sparse);
 	}
 
@@ -1494,11 +1548,15 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 	o->merge_size = len;
 	mark_all_ce_unused(o->src_index);
 
+	if (o->src_index->fsmonitor_last_update)
+		o->result.fsmonitor_last_update = o->src_index->fsmonitor_last_update;
+
 	/*
 	 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
 	 */
 	if (!o->skip_sparse_checkout)
-		mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
+		mark_new_skip_worktree(o->pl, o->src_index, 0,
+				       CE_NEW_SKIP_WORKTREE, o->verbose_update);
 
 	if (!dfc)
 		dfc = xcalloc(1, cache_entry_size(0));
@@ -1563,7 +1621,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 		 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
 		 * so apply_sparse_checkout() won't attempt to remove it from worktree
 		 */
-		mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
+		mark_new_skip_worktree(o->pl, &o->result,
+				       CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE,
+				       o->verbose_update);
 
 		ret = 0;
 		for (i = 0; i < o->result.cache_nr; i++) {
@@ -1631,7 +1691,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 
 done:
 	trace_performance_leave("unpack_trees");
-	clear_exclude_list(&el);
+	if (!o->keep_pattern_list)
+		clear_pattern_list(&pl);
 	return ret;
 
 return_failed:
@@ -2050,7 +2111,8 @@ static int merged_entry(const struct cache_entry *ce,
 		invalidate_ce_path(old, o);
 	}
 
-	do_add_entry(o, merge, update, CE_STAGEMASK);
+	if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0)
+		return -1;
 	return 1;
 }
 
@@ -2374,7 +2436,8 @@ int oneway_merge(const struct cache_entry * const *src,
 
 	if (old && same(old, a)) {
 		int update = 0;
-		if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
+		if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old) &&
+			!(old->ce_flags & CE_FSMONITOR_VALID)) {
 			struct stat st;
 			if (lstat(old->name, &st) ||
 			    ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
diff --git a/third_party/git/unpack-trees.h b/third_party/git/unpack-trees.h
index d344d7d29694..ae1557fb8046 100644
--- a/third_party/git/unpack-trees.h
+++ b/third_party/git/unpack-trees.h
@@ -6,11 +6,11 @@
 #include "string-list.h"
 #include "tree-walk.h"
 
-#define MAX_UNPACK_TREES 8
+#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES
 
 struct cache_entry;
 struct unpack_trees_options;
-struct exclude_list;
+struct pattern_list;
 
 typedef int (*merge_fn_t)(const struct cache_entry * const *src,
 		struct unpack_trees_options *options);
@@ -59,7 +59,8 @@ struct unpack_trees_options {
 		     quiet,
 		     exiting_early,
 		     show_all_errors,
-		     dry_run;
+		     dry_run,
+		     keep_pattern_list;
 	const char *prefix;
 	int cache_bottom;
 	struct dir_struct *dir;
@@ -83,7 +84,7 @@ struct unpack_trees_options {
 	struct index_state *src_index;
 	struct index_state result;
 
-	struct exclude_list *el; /* for internal use */
+	struct pattern_list *pl; /* for internal use */
 };
 
 int unpack_trees(unsigned n, struct tree_desc *t,
diff --git a/third_party/git/upload-pack.c b/third_party/git/upload-pack.c
index 222cd3ad8960..c53249cac19a 100644
--- a/third_party/git/upload-pack.c
+++ b/third_party/git/upload-pack.c
@@ -140,18 +140,17 @@ static void create_pack_file(const struct object_array *have_obj,
 		argv_array_push(&pack_objects.args, "--delta-base-offset");
 	if (use_include_tag)
 		argv_array_push(&pack_objects.args, "--include-tag");
-	if (filter_options.filter_spec) {
-		struct strbuf expanded_filter_spec = STRBUF_INIT;
-		expand_list_objects_filter_spec(&filter_options,
-						&expanded_filter_spec);
+	if (filter_options.choice) {
+		const char *spec =
+			expand_list_objects_filter_spec(&filter_options);
 		if (pack_objects.use_shell) {
 			struct strbuf buf = STRBUF_INIT;
-			sq_quote_buf(&buf, expanded_filter_spec.buf);
+			sq_quote_buf(&buf, spec);
 			argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
 			strbuf_release(&buf);
 		} else {
 			argv_array_pushf(&pack_objects.args, "--filter=%s",
-					 expanded_filter_spec.buf);
+					 spec);
 		}
 	}
 
@@ -722,7 +721,7 @@ static void deepen_by_rev_list(struct packet_writer *writer, int ac,
 {
 	struct commit_list *result;
 
-	close_commit_graph(the_repository->objects);
+	disable_commit_graph(the_repository);
 	result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
 	send_shallow(writer, result);
 	free_commit_list(result);
@@ -884,6 +883,7 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
 		if (skip_prefix(reader->line, "filter ", &arg)) {
 			if (!filter_capability_requested)
 				die("git upload-pack: filtering capability not negotiated");
+			list_objects_filter_die_if_populated(&filter_options);
 			parse_list_objects_filter(&filter_options, arg);
 			continue;
 		}
@@ -1073,7 +1073,8 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
 		precomposed_unicode = git_config_bool(var, value);
 	}
 
-	if (current_config_scope() != CONFIG_SCOPE_REPO) {
+	if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
+	current_config_scope() != CONFIG_SCOPE_WORKTREE) {
 		if (!strcmp("uploadpack.packobjectshook", var))
 			return git_config_string(&pack_objects_hook, var, value);
 	}
@@ -1305,6 +1306,7 @@ static void process_args(struct packet_reader *request,
 		}
 
 		if (allow_filter && skip_prefix(arg, "filter ", &p)) {
+			list_objects_filter_die_if_populated(&filter_options);
 			parse_list_objects_filter(&filter_options, p);
 			continue;
 		}
diff --git a/third_party/git/url.c b/third_party/git/url.c
index 1b8ef78ceab0..e04bd60b6bea 100644
--- a/third_party/git/url.c
+++ b/third_party/git/url.c
@@ -5,7 +5,7 @@ int is_urlschemechar(int first_flag, int ch)
 {
 	/*
 	 * The set of valid URL schemes, as per STD66 (RFC3986) is
-	 * '[A-Za-z][A-Za-z0-9+.-]*'. But use sightly looser check
+	 * '[A-Za-z][A-Za-z0-9+.-]*'. But use slightly looser check
 	 * of '[A-Za-z0-9][A-Za-z0-9+.-]*' because earlier version
 	 * of check used '[A-Za-z0-9]+' so not to break any remote
 	 * helpers.
@@ -86,6 +86,12 @@ char *url_decode_mem(const char *url, int len)
 	return url_decode_internal(&url, len, NULL, &out, 0);
 }
 
+char *url_percent_decode(const char *encoded)
+{
+	struct strbuf out = STRBUF_INIT;
+	return url_decode_internal(&encoded, strlen(encoded), NULL, &out, 0);
+}
+
 char *url_decode_parameter_name(const char **query)
 {
 	struct strbuf out = STRBUF_INIT;
diff --git a/third_party/git/url.h b/third_party/git/url.h
index 00b7d58c33e3..2a27c3427763 100644
--- a/third_party/git/url.h
+++ b/third_party/git/url.h
@@ -7,6 +7,14 @@ int is_url(const char *url);
 int is_urlschemechar(int first_flag, int ch);
 char *url_decode(const char *url);
 char *url_decode_mem(const char *url, int len);
+
+/*
+ * Similar to the url_decode_{,mem} methods above, but doesn't assume there
+ * is a scheme followed by a : at the start of the string. Instead, %-sequences
+ * before any : are also parsed.
+ */
+char *url_percent_decode(const char *encoded);
+
 char *url_decode_parameter_name(const char **query);
 char *url_decode_parameter_value(const char **query);
 
diff --git a/third_party/git/urlmatch.c b/third_party/git/urlmatch.c
index 3e42bd750485..29272a5c4f4d 100644
--- a/third_party/git/urlmatch.c
+++ b/third_party/git/urlmatch.c
@@ -557,6 +557,8 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
 	const char *key, *dot;
 	struct strbuf synthkey = STRBUF_INIT;
 	int retval;
+	int (*select_fn)(const struct urlmatch_item *a, const struct urlmatch_item *b) =
+		collect->select_fn ? collect->select_fn : cmp_matches;
 
 	if (!skip_prefix(var, collect->section, &key) || *(key++) != '.') {
 		if (collect->cascade_fn)
@@ -587,7 +589,7 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
 	if (!item->util) {
 		item->util = xcalloc(1, sizeof(matched));
 	} else {
-		if (cmp_matches(&matched, item->util) < 0)
+		if (select_fn(&matched, item->util) < 0)
 			 /*
 			  * Our match is worse than the old one,
 			  * we cannot use it.
diff --git a/third_party/git/urlmatch.h b/third_party/git/urlmatch.h
index eed5f292354c..2407520731f9 100644
--- a/third_party/git/urlmatch.h
+++ b/third_party/git/urlmatch.h
@@ -50,6 +50,15 @@ struct urlmatch_config {
 	void *cb;
 	int (*collect_fn)(const char *var, const char *value, void *cb);
 	int (*cascade_fn)(const char *var, const char *value, void *cb);
+	/*
+	 * Compare the two matches, the one just discovered and the existing
+	 * best match and return a negative value if the found item is to be
+	 * rejected or a non-negative value if it is to be accepted.  If this
+	 * field is set to NULL, use the default comparison technique, which
+	 * checks to ses if found is better (according to the urlmatch
+	 * specificity rules) than existing.
+	 */
+	int (*select_fn)(const struct urlmatch_item *found, const struct urlmatch_item *existing);
 };
 
 int urlmatch_config_entry(const char *var, const char *value, void *cb);
diff --git a/third_party/git/usage.c b/third_party/git/usage.c
index 2fdb20086bd6..58fb5fff5f24 100644
--- a/third_party/git/usage.c
+++ b/third_party/git/usage.c
@@ -9,14 +9,26 @@
 void vreportf(const char *prefix, const char *err, va_list params)
 {
 	char msg[4096];
-	char *p;
+	char *p, *pend = msg + sizeof(msg);
+	size_t prefix_len = strlen(prefix);
 
-	vsnprintf(msg, sizeof(msg), err, params);
-	for (p = msg; *p; p++) {
+	if (sizeof(msg) <= prefix_len) {
+		fprintf(stderr, "BUG!!! too long a prefix '%s'\n", prefix);
+		abort();
+	}
+	memcpy(msg, prefix, prefix_len);
+	p = msg + prefix_len;
+	if (vsnprintf(p, pend - p, err, params) < 0)
+		*p = '\0'; /* vsnprintf() failed, clip at prefix */
+
+	for (; p != pend - 1 && *p; p++) {
 		if (iscntrl(*p) && *p != '\t' && *p != '\n')
 			*p = '?';
 	}
-	fprintf(stderr, "%s%s\n", prefix, msg);
+
+	*(p++) = '\n'; /* we no longer need a NUL */
+	fflush(stderr);
+	write_in_full(2, msg, p - msg);
 }
 
 static NORETURN void usage_builtin(const char *err, va_list params)
diff --git a/third_party/git/userdiff.c b/third_party/git/userdiff.c
index e74a6d402255..efbe05e5a5b6 100644
--- a/third_party/git/userdiff.c
+++ b/third_party/git/userdiff.c
@@ -23,6 +23,28 @@ IPATTERN("ada",
 	 "[a-zA-Z][a-zA-Z0-9_]*"
 	 "|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?"
 	 "|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
+PATTERNS("dts",
+	 "!;\n"
+	 "!=\n"
+	 /* lines beginning with a word optionally preceded by '&' or the root */
+	 "^[ \t]*((/[ \t]*\\{|&?[a-zA-Z_]).*)",
+	 /* -- */
+	 /* Property names and math operators */
+	 "[a-zA-Z0-9,._+?#-]+"
+	 "|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"),
+PATTERNS("elixir",
+	 "^[ \t]*((def(macro|module|impl|protocol|p)?|test)[ \t].*)$",
+	 /* -- */
+	 /* Atoms, names, and module attributes */
+	 "[@:]?[a-zA-Z0-9@_?!]+"
+	 /* Numbers with specific base */
+	 "|[-+]?0[xob][0-9a-fA-F]+"
+	 /* Numbers */
+	 "|[-+]?[0-9][0-9_.]*([eE][-+]?[0-9_]+)?"
+	 /* Operators and atoms that represent them */
+	 "|:?(\\+\\+|--|\\.\\.|~~~|<>|\\^\\^\\^|<?\\|>|<<<?|>?>>|<<?~|~>?>|<~>|<=|>=|===?|!==?|=~|&&&?|\\|\\|\\|?|=>|<-|\\\\\\\\|->)"
+	 /* Not real operators, but should be grouped */
+	 "|:?%[A-Za-z0-9_.]\\{\\}?"),
 IPATTERN("fortran",
 	 "!^([C*]|[ \t]*!)\n"
 	 "!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n"
@@ -124,7 +146,7 @@ PATTERNS("php",
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
 	 "|[-+*/<>%&^|=!.]=|--|\\+\\+|<<=?|>>=?|===|&&|\\|\\||::|->"),
-PATTERNS("python", "^[ \t]*((class|def)[ \t].*)$",
+PATTERNS("python", "^[ \t]*((class|(async[ \t]+)?def)[ \t].*)$",
 	 /* -- */
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?"
diff --git a/third_party/git/utf8.c b/third_party/git/utf8.c
index 3b42fadffd7c..5b39361ada0b 100644
--- a/third_party/git/utf8.c
+++ b/third_party/git/utf8.c
@@ -95,13 +95,11 @@ static int git_wcwidth(ucs_char_t ch)
 		return -1;
 
 	/* binary search in table of non-spacing characters */
-	if (bisearch(ch, zero_width, sizeof(zero_width)
-				/ sizeof(struct interval) - 1))
+	if (bisearch(ch, zero_width, ARRAY_SIZE(zero_width) - 1))
 		return 0;
 
 	/* binary search in table of double width characters */
-	if (bisearch(ch, double_width, sizeof(double_width)
-				/ sizeof(struct interval) - 1))
+	if (bisearch(ch, double_width, ARRAY_SIZE(double_width) - 1))
 		return 2;
 
 	return 1;
@@ -413,11 +411,10 @@ out:
  */
 static int same_utf_encoding(const char *src, const char *dst)
 {
-	if (istarts_with(src, "utf") && istarts_with(dst, "utf")) {
-		/* src[3] or dst[3] might be '\0' */
-		int i = (src[3] == '-' ? 4 : 3);
-		int j = (dst[3] == '-' ? 4 : 3);
-		return !strcasecmp(src+i, dst+j);
+	if (skip_iprefix(src, "utf", &src) && skip_iprefix(dst, "utf", &dst)) {
+		skip_prefix(src, "-", &src);
+		skip_prefix(dst, "-", &dst);
+		return !strcasecmp(src, dst);
 	}
 	return 0;
 }
diff --git a/third_party/git/walker.c b/third_party/git/walker.c
index 06cd2bd5691a..4984bf8b3d66 100644
--- a/third_party/git/walker.c
+++ b/third_party/git/walker.c
@@ -8,6 +8,7 @@
 #include "tag.h"
 #include "blob.h"
 #include "refs.h"
+#include "progress.h"
 
 static struct object_id current_commit_oid;
 
@@ -162,6 +163,11 @@ static int process(struct walker *walker, struct object *obj)
 static int loop(struct walker *walker)
 {
 	struct object_list *elem;
+	struct progress *progress = NULL;
+	uint64_t nr = 0;
+
+	if (walker->get_progress)
+		progress = start_delayed_progress(_("Fetching objects"), 0);
 
 	while (process_queue) {
 		struct object *obj = process_queue->item;
@@ -176,15 +182,20 @@ static int loop(struct walker *walker)
 		 */
 		if (! (obj->flags & TO_SCAN)) {
 			if (walker->fetch(walker, obj->oid.hash)) {
+				stop_progress(&progress);
 				report_missing(obj);
 				return -1;
 			}
 		}
 		if (!obj->type)
 			parse_object(the_repository, &obj->oid);
-		if (process_object(walker, obj))
+		if (process_object(walker, obj)) {
+			stop_progress(&progress);
 			return -1;
+		}
+		display_progress(progress, ++nr);
 	}
+	stop_progress(&progress);
 	return 0;
 }
 
@@ -261,12 +272,14 @@ int walker_fetch(struct walker *walker, int targets, char **target,
 	struct strbuf refname = STRBUF_INIT;
 	struct strbuf err = STRBUF_INIT;
 	struct ref_transaction *transaction = NULL;
-	struct object_id *oids = xmalloc(targets * sizeof(struct object_id));
+	struct object_id *oids;
 	char *msg = NULL;
 	int i, ret = -1;
 
 	save_commit_buffer = 0;
 
+	ALLOC_ARRAY(oids, targets);
+
 	if (write_ref) {
 		transaction = ref_transaction_begin(&err);
 		if (!transaction) {
diff --git a/third_party/git/walker.h b/third_party/git/walker.h
index 6d8ae00e5b99..d40b016bab87 100644
--- a/third_party/git/walker.h
+++ b/third_party/git/walker.h
@@ -10,6 +10,7 @@ struct walker {
 	int (*fetch)(struct walker *, unsigned char *sha1);
 	void (*cleanup)(struct walker *);
 	int get_verbosely;
+	int get_progress;
 	int get_recover;
 
 	int corrupt_object_found;
diff --git a/third_party/git/worktree.c b/third_party/git/worktree.c
index 5b4793caa34e..eba4fd3a0381 100644
--- a/third_party/git/worktree.c
+++ b/third_party/git/worktree.c
@@ -47,15 +47,13 @@ static void add_head_info(struct worktree *wt)
 static struct worktree *get_main_worktree(void)
 {
 	struct worktree *worktree = NULL;
-	struct strbuf path = STRBUF_INIT;
 	struct strbuf worktree_path = STRBUF_INIT;
 
 	strbuf_add_absolute_path(&worktree_path, get_git_common_dir());
+	strbuf_strip_suffix(&worktree_path, "/.");
 	if (!strbuf_strip_suffix(&worktree_path, "/.git"))
 		strbuf_strip_suffix(&worktree_path, "/.");
 
-	strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
-
 	worktree = xcalloc(1, sizeof(*worktree));
 	worktree->path = strbuf_detach(&worktree_path, NULL);
 	/*
@@ -69,7 +67,6 @@ static struct worktree *get_main_worktree(void)
 		is_bare_repository();
 	add_head_info(worktree);
 
-	strbuf_release(&path);
 	strbuf_release(&worktree_path);
 	return worktree;
 }
@@ -215,7 +212,6 @@ struct worktree *find_worktree(struct worktree **list,
 			       const char *arg)
 {
 	struct worktree *wt;
-	char *path;
 	char *to_free = NULL;
 
 	if ((wt = find_worktree_by_suffix(list, arg)))
@@ -223,11 +219,17 @@ struct worktree *find_worktree(struct worktree **list,
 
 	if (prefix)
 		arg = to_free = prefix_filename(prefix, arg);
-	path = real_pathdup(arg, 0);
-	if (!path) {
-		free(to_free);
+	wt = find_worktree_by_path(list, arg);
+	free(to_free);
+	return wt;
+}
+
+struct worktree *find_worktree_by_path(struct worktree **list, const char *p)
+{
+	char *path = real_pathdup(p, 0);
+
+	if (!path)
 		return NULL;
-	}
 	for (; *list; list++) {
 		const char *wt_path = real_path_if_valid((*list)->path);
 
@@ -235,7 +237,6 @@ struct worktree *find_worktree(struct worktree **list,
 			break;
 	}
 	free(path);
-	free(to_free);
 	return *list;
 }
 
diff --git a/third_party/git/worktree.h b/third_party/git/worktree.h
index caecc7a281cc..d242a6e71c03 100644
--- a/third_party/git/worktree.h
+++ b/third_party/git/worktree.h
@@ -44,14 +44,30 @@ int submodule_uses_worktrees(const char *path);
 const char *get_worktree_git_dir(const struct worktree *wt);
 
 /*
- * Search a worktree that can be unambiguously identified by
- * "arg". "prefix" must not be NULL.
+ * Search for the worktree identified unambiguously by `arg` -- typically
+ * supplied by the user via the command-line -- which may be a pathname or some
+ * shorthand uniquely identifying a worktree, thus making it convenient for the
+ * user to specify a worktree with minimal typing. For instance, if the last
+ * component (say, "foo") of a worktree's pathname is unique among worktrees
+ * (say, "work/foo" and "work/bar"), it can be used to identify the worktree
+ * unambiguously.
+ *
+ * `prefix` should be the `prefix` handed to top-level Git commands along with
+ * `argc` and `argv`.
+ *
+ * Return the worktree identified by `arg`, or NULL if not found.
  */
 struct worktree *find_worktree(struct worktree **list,
 			       const char *prefix,
 			       const char *arg);
 
 /*
+ * Return the worktree corresponding to `path`, or NULL if no such worktree
+ * exists.
+ */
+struct worktree *find_worktree_by_path(struct worktree **, const char *path);
+
+/*
  * Return true if the given worktree is the main one.
  */
 int is_main_worktree(const struct worktree *wt);
diff --git a/third_party/git/wrapper.c b/third_party/git/wrapper.c
index 1e45ab7b9274..e1eaef2e1641 100644
--- a/third_party/git/wrapper.c
+++ b/third_party/git/wrapper.c
@@ -4,12 +4,6 @@
 #include "cache.h"
 #include "config.h"
 
-static void do_nothing(size_t size)
-{
-}
-
-static void (*try_to_free_routine)(size_t size) = do_nothing;
-
 static int memory_limit_check(size_t size, int gentle)
 {
 	static size_t limit = 0;
@@ -30,24 +24,11 @@ static int memory_limit_check(size_t size, int gentle)
 	return 0;
 }
 
-try_to_free_t set_try_to_free_routine(try_to_free_t routine)
-{
-	try_to_free_t old = try_to_free_routine;
-	if (!routine)
-		routine = do_nothing;
-	try_to_free_routine = routine;
-	return old;
-}
-
 char *xstrdup(const char *str)
 {
 	char *ret = strdup(str);
-	if (!ret) {
-		try_to_free_routine(strlen(str) + 1);
-		ret = strdup(str);
-		if (!ret)
-			die("Out of memory, strdup failed");
-	}
+	if (!ret)
+		die("Out of memory, strdup failed");
 	return ret;
 }
 
@@ -61,19 +42,13 @@ static void *do_xmalloc(size_t size, int gentle)
 	if (!ret && !size)
 		ret = malloc(1);
 	if (!ret) {
-		try_to_free_routine(size);
-		ret = malloc(size);
-		if (!ret && !size)
-			ret = malloc(1);
-		if (!ret) {
-			if (!gentle)
-				die("Out of memory, malloc failed (tried to allocate %lu bytes)",
-				    (unsigned long)size);
-			else {
-				error("Out of memory, malloc failed (tried to allocate %lu bytes)",
-				      (unsigned long)size);
-				return NULL;
-			}
+		if (!gentle)
+			die("Out of memory, malloc failed (tried to allocate %lu bytes)",
+			    (unsigned long)size);
+		else {
+			error("Out of memory, malloc failed (tried to allocate %lu bytes)",
+			      (unsigned long)size);
+			return NULL;
 		}
 	}
 #ifdef XMALLOC_POISON
@@ -138,14 +113,8 @@ void *xrealloc(void *ptr, size_t size)
 	ret = realloc(ptr, size);
 	if (!ret && !size)
 		ret = realloc(ptr, 1);
-	if (!ret) {
-		try_to_free_routine(size);
-		ret = realloc(ptr, size);
-		if (!ret && !size)
-			ret = realloc(ptr, 1);
-		if (!ret)
-			die("Out of memory, realloc failed");
-	}
+	if (!ret)
+		die("Out of memory, realloc failed");
 	return ret;
 }
 
@@ -160,14 +129,8 @@ void *xcalloc(size_t nmemb, size_t size)
 	ret = calloc(nmemb, size);
 	if (!ret && (!nmemb || !size))
 		ret = calloc(1, 1);
-	if (!ret) {
-		try_to_free_routine(nmemb * size);
-		ret = calloc(nmemb, size);
-		if (!ret && (!nmemb || !size))
-			ret = calloc(1, 1);
-		if (!ret)
-			die("Out of memory, calloc failed");
-	}
+	if (!ret)
+		die("Out of memory, calloc failed");
 	return ret;
 }
 
@@ -478,7 +441,9 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 		"abcdefghijklmnopqrstuvwxyz"
 		"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 		"0123456789";
-	static const int num_letters = 62;
+	static const int num_letters = ARRAY_SIZE(letters) - 1;
+	static const char x_pattern[] = "XXXXXX";
+	static const int num_x = ARRAY_SIZE(x_pattern) - 1;
 	uint64_t value;
 	struct timeval tv;
 	char *filename_template;
@@ -487,12 +452,12 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 
 	len = strlen(pattern);
 
-	if (len < 6 + suffix_len) {
+	if (len < num_x + suffix_len) {
 		errno = EINVAL;
 		return -1;
 	}
 
-	if (strncmp(&pattern[len - 6 - suffix_len], "XXXXXX", 6)) {
+	if (strncmp(&pattern[len - num_x - suffix_len], x_pattern, num_x)) {
 		errno = EINVAL;
 		return -1;
 	}
@@ -503,16 +468,15 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 	 */
 	gettimeofday(&tv, NULL);
 	value = ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
-	filename_template = &pattern[len - 6 - suffix_len];
+	filename_template = &pattern[len - num_x - suffix_len];
 	for (count = 0; count < TMP_MAX; ++count) {
 		uint64_t v = value;
+		int i;
 		/* Fill in the random bits. */
-		filename_template[0] = letters[v % num_letters]; v /= num_letters;
-		filename_template[1] = letters[v % num_letters]; v /= num_letters;
-		filename_template[2] = letters[v % num_letters]; v /= num_letters;
-		filename_template[3] = letters[v % num_letters]; v /= num_letters;
-		filename_template[4] = letters[v % num_letters]; v /= num_letters;
-		filename_template[5] = letters[v % num_letters]; v /= num_letters;
+		for (i = 0; i < num_x; i++) {
+			filename_template[i] = letters[v % num_letters];
+			v /= num_letters;
+		}
 
 		fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode);
 		if (fd >= 0)
diff --git a/third_party/git/wt-status.c b/third_party/git/wt-status.c
index 9f6c65a58097..cc6f94504d9f 100644
--- a/third_party/git/wt-status.c
+++ b/third_party/git/wt-status.c
@@ -1434,6 +1434,8 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
 			status_printf_ln(s, color,
 				_("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
 		status_printf_ln(s, color,
+			_("  (use \"git cherry-pick --skip\" to skip this patch)"));
+		status_printf_ln(s, color,
 			_("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
 	}
 	wt_longstatus_print_trailer(s);
@@ -1461,6 +1463,8 @@ static void show_revert_in_progress(struct wt_status *s,
 			status_printf_ln(s, color,
 				_("  (all conflicts fixed: run \"git revert --continue\")"));
 		status_printf_ln(s, color,
+			_("  (use \"git revert --skip\" to skip this patch)"));
+		status_printf_ln(s, color,
 			_("  (use \"git revert --abort\" to cancel the revert operation)"));
 	}
 	wt_longstatus_print_trailer(s);
@@ -2025,7 +2029,7 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
 	char eol = s->null_termination ? '\0' : '\n';
 
 	fprintf(s->fp, "# branch.oid %s%c",
-			(s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)),
+			(s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
 			eol);
 
 	if (!s->branch)
diff --git a/third_party/git/wt-status.h b/third_party/git/wt-status.h
index 77dad5b92048..71c3f25f43de 100644
--- a/third_party/git/wt-status.h
+++ b/third_party/git/wt-status.h
@@ -116,7 +116,7 @@ struct wt_status {
 	int rename_limit;
 	enum wt_status_format status_format;
 	struct wt_status_state state;
-	unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */
+	struct object_id oid_commit; /* when not Initial */
 
 	/* These are computed during processing of the individual sections */
 	int committable;
diff --git a/third_party/git/xdiff-interface.c b/third_party/git/xdiff-interface.c
index 8509f9ea223a..4d20069302b2 100644
--- a/third_party/git/xdiff-interface.c
+++ b/third_party/git/xdiff-interface.c
@@ -84,8 +84,8 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b)
 {
 	const int blk = 1024;
 	long trimmed = 0, recovered = 0;
-	char *ap = a->ptr + a->size;
-	char *bp = b->ptr + b->size;
+	char *ap = a->size ? a->ptr + a->size : a->ptr;
+	char *bp = b->size ? b->ptr + b->size : b->ptr;
 	long smaller = (a->size < b->size) ? a->size : b->size;
 
 	while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
@@ -250,9 +250,13 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
 	ALLOC_ARRAY(regs->array, regs->nr);
 	for (i = 0; i < regs->nr; i++) {
 		struct ff_reg *reg = regs->array + i;
-		const char *ep = strchr(value, '\n'), *expression;
+		const char *ep, *expression;
 		char *buffer = NULL;
 
+		if (!value)
+			BUG("mismatch between line count and parsing");
+		ep = strchr(value, '\n');
+
 		reg->negate = (*value == '!');
 		if (reg->negate && i == regs->nr - 1)
 			die("Last expression must not be negated: %s", value);
@@ -265,7 +269,7 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
 		if (regcomp(&reg->re, expression, cflags))
 			die("Invalid regexp to look for hunk header: %s", expression);
 		free(buffer);
-		value = ep + 1;
+		value = ep ? ep + 1 : NULL;
 	}
 }
 
diff --git a/third_party/git/xdiff-interface.h b/third_party/git/xdiff-interface.h
index ede4246bbd33..93df26900c2b 100644
--- a/third_party/git/xdiff-interface.h
+++ b/third_party/git/xdiff-interface.h
@@ -44,7 +44,7 @@ void discard_hunk_line(void *priv,
  * Compare the strings l1 with l2 which are of size s1 and s2 respectively.
  * Returns 1 if the strings are deemed equal, 0 otherwise.
  * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
- * are treated for the comparision.
+ * are treated for the comparison.
  */
 int xdiff_compare_lines(const char *l1, long s1,
 			const char *l2, long s2, long flags);
diff --git a/third_party/git/xdiff/xdiffi.c b/third_party/git/xdiff/xdiffi.c
index 1f1f4a3c7808..bd035139f954 100644
--- a/third_party/git/xdiff/xdiffi.c
+++ b/third_party/git/xdiff/xdiffi.c
@@ -38,9 +38,9 @@ typedef struct s_xdpsplit {
  * Basically considers a "box" (off1, off2, lim1, lim2) and scan from both
  * the forward diagonal starting from (off1, off2) and the backward diagonal
  * starting from (lim1, lim2). If the K values on the same diagonal crosses
- * returns the furthest point of reach. We might end up having to expensive
- * cases using this algorithm is full, so a little bit of heuristic is needed
- * to cut the search and to return a suboptimal point.
+ * returns the furthest point of reach. We might encounter expensive edge cases
+ * using this algorithm, so a little bit of heuristic is needed to cut the
+ * search and to return a suboptimal point.
  */
 static long xdl_split(unsigned long const *ha1, long off1, long lim1,
 		      unsigned long const *ha2, long off2, long lim2,
@@ -63,11 +63,13 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
 		int got_snake = 0;
 
 		/*
-		 * We need to extent the diagonal "domain" by one. If the next
+		 * We need to extend the diagonal "domain" by one. If the next
 		 * values exits the box boundaries we need to change it in the
-		 * opposite direction because (max - min) must be a power of two.
+		 * opposite direction because (max - min) must be a power of
+		 * two.
+		 *
 		 * Also we initialize the external K value to -1 so that we can
-		 * avoid extra conditions check inside the core loop.
+		 * avoid extra conditions in the check inside the core loop.
 		 */
 		if (fmin > dmin)
 			kvdf[--fmin - 1] = -1;
@@ -98,11 +100,13 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
 		}
 
 		/*
-		 * We need to extent the diagonal "domain" by one. If the next
+		 * We need to extend the diagonal "domain" by one. If the next
 		 * values exits the box boundaries we need to change it in the
-		 * opposite direction because (max - min) must be a power of two.
+		 * opposite direction because (max - min) must be a power of
+		 * two.
+		 *
 		 * Also we initialize the external K value to -1 so that we can
-		 * avoid extra conditions check inside the core loop.
+		 * avoid extra conditions in the check inside the core loop.
 		 */
 		if (bmin > dmin)
 			kvdb[--bmin - 1] = XDL_LINE_MAX;
@@ -138,7 +142,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
 		/*
 		 * If the edit cost is above the heuristic trigger and if
 		 * we got a good snake, we sample current diagonals to see
-		 * if some of the, have reached an "interesting" path. Our
+		 * if some of them have reached an "interesting" path. Our
 		 * measure is a function of the distance from the diagonal
 		 * corner (i1 + i2) penalized with the distance from the
 		 * mid diagonal itself. If this value is above the current
@@ -196,8 +200,9 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
 		}
 
 		/*
-		 * Enough is enough. We spent too much time here and now we collect
-		 * the furthest reaching path using the (i1 + i2) measure.
+		 * Enough is enough. We spent too much time here and now we
+		 * collect the furthest reaching path using the (i1 + i2)
+		 * measure.
 		 */
 		if (ec >= xenv->mxcost) {
 			long fbest, fbest1, bbest, bbest1;
@@ -244,9 +249,9 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
 
 
 /*
- * Rule: "Divide et Impera". Recursively split the box in sub-boxes by calling
- * the box splitting function. Note that the real job (marking changed lines)
- * is done in the two boundary reaching checks.
+ * Rule: "Divide et Impera" (divide & conquer). Recursively split the box in
+ * sub-boxes by calling the box splitting function. Note that the real job
+ * (marking changed lines) is done in the two boundary reaching checks.
  */
 int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1,
 		 diffdata_t *dd2, long off2, long lim2,
@@ -323,7 +328,9 @@ int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 	}
 
 	/*
-	 * Allocate and setup K vectors to be used by the differential algorithm.
+	 * Allocate and setup K vectors to be used by the differential
+	 * algorithm.
+	 *
 	 * One is to store the forward path and one to store the backward path.
 	 */
 	ndiags = xe->xdf1.nreff + xe->xdf2.nreff + 3;
@@ -394,8 +401,8 @@ static int recs_match(xrecord_t *rec1, xrecord_t *rec2, long flags)
 /*
  * If a line is indented more than this, get_indent() just returns this value.
  * This avoids having to do absurd amounts of work for data that are not
- * human-readable text, and also ensures that the output of get_indent fits within
- * an int.
+ * human-readable text, and also ensures that the output of get_indent fits
+ * within an int.
  */
 #define MAX_INDENT 200
 
@@ -429,9 +436,9 @@ static int get_indent(xrecord_t *rec)
 }
 
 /*
- * If more than this number of consecutive blank rows are found, just return this
- * value. This avoids requiring O(N^2) work for pathological cases, and also
- * ensures that the output of score_split fits in an int.
+ * If more than this number of consecutive blank rows are found, just return
+ * this value. This avoids requiring O(N^2) work for pathological cases, and
+ * also ensures that the output of score_split fits in an int.
  */
 #define MAX_BLANKS 20
 
@@ -443,8 +450,8 @@ struct split_measurement {
 	int end_of_file;
 
 	/*
-	 * How much is the line immediately following the split indented (or -1 if
-	 * the line is blank):
+	 * How much is the line immediately following the split indented (or -1
+	 * if the line is blank):
 	 */
 	int indent;
 
@@ -454,8 +461,8 @@ struct split_measurement {
 	int pre_blank;
 
 	/*
-	 * How much is the nearest non-blank line above the split indented (or -1
-	 * if there is no such line)?
+	 * How much is the nearest non-blank line above the split indented (or
+	 * -1 if there is no such line)?
 	 */
 	int pre_indent;
 
@@ -581,13 +588,13 @@ static void measure_split(const xdfile_t *xdf, long split,
 
 /*
  * Compute a badness score for the hypothetical split whose measurements are
- * stored in m. The weight factors were determined empirically using the tools and
- * corpus described in
+ * stored in m. The weight factors were determined empirically using the tools
+ * and corpus described in
  *
  *     https://github.com/mhagger/diff-slider-tools
  *
- * Also see that project if you want to improve the weights based on, for example,
- * a larger or more diverse corpus.
+ * Also see that project if you want to improve the weights based on, for
+ * example, a larger or more diverse corpus.
  */
 static void score_add_split(const struct split_measurement *m, struct split_score *s)
 {
@@ -809,13 +816,16 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 	group_init(xdfo, &go);
 
 	while (1) {
-		/* If the group is empty in the to-be-compacted file, skip it: */
+		/*
+		 * If the group is empty in the to-be-compacted file, skip it:
+		 */
 		if (g.end == g.start)
 			goto next;
 
 		/*
 		 * Now shift the change up and then down as far as possible in
-		 * each direction. If it bumps into any other changes, merge them.
+		 * each direction. If it bumps into any other changes, merge
+		 * them.
 		 */
 		do {
 			groupsize = g.end - g.start;
@@ -858,17 +868,17 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 		 * If the group can be shifted, then we can possibly use this
 		 * freedom to produce a more intuitive diff.
 		 *
-		 * The group is currently shifted as far down as possible, so the
-		 * heuristics below only have to handle upwards shifts.
+		 * The group is currently shifted as far down as possible, so
+		 * the heuristics below only have to handle upwards shifts.
 		 */
 
 		if (g.end == earliest_end) {
 			/* no shifting was possible */
 		} else if (end_matching_other != -1) {
 			/*
-			 * Move the possibly merged group of changes back to line
-			 * up with the last group of changes from the other file
-			 * that it can align with.
+			 * Move the possibly merged group of changes back to
+			 * line up with the last group of changes from the
+			 * other file that it can align with.
 			 */
 			while (go.end == go.start) {
 				if (group_slide_up(xdf, &g, flags))
@@ -879,14 +889,15 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 		} else if (flags & XDF_INDENT_HEURISTIC) {
 			/*
 			 * Indent heuristic: a group of pure add/delete lines
-			 * implies two splits, one between the end of the "before"
-			 * context and the start of the group, and another between
-			 * the end of the group and the beginning of the "after"
-			 * context. Some splits are aesthetically better and some
-			 * are worse. We compute a badness "score" for each split,
-			 * and add the scores for the two splits to define a
-			 * "score" for each position that the group can be shifted
-			 * to. Then we pick the shift with the lowest score.
+			 * implies two splits, one between the end of the
+			 * "before" context and the start of the group, and
+			 * another between the end of the group and the
+			 * beginning of the "after" context. Some splits are
+			 * aesthetically better and some are worse. We compute
+			 * a badness "score" for each split, and add the scores
+			 * for the two splits to define a "score" for each
+			 * position that the group can be shifted to. Then we
+			 * pick the shift with the lowest score.
 			 */
 			long shift, best_shift = -1;
 			struct split_score best_score;
diff --git a/third_party/git/xdiff/xemit.c b/third_party/git/xdiff/xemit.c
index 30713ae9a98e..9d7d6c508749 100644
--- a/third_party/git/xdiff/xemit.c
+++ b/third_party/git/xdiff/xemit.c
@@ -172,10 +172,12 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 	struct func_line func_line = { 0 };
 
 	for (xch = xscr; xch; xch = xche->next) {
+		xdchange_t *xchp = xch;
 		xche = xdl_get_hunk(&xch, xecfg);
 		if (!xch)
 			break;
 
+pre_context_calculation:
 		s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);
 		s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
 
@@ -212,6 +214,21 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 			if (fs1 < s1) {
 				s2 = XDL_MAX(s2 - (s1 - fs1), 0);
 				s1 = fs1;
+
+				/*
+				 * Did we extend context upwards into an
+				 * ignored change?
+				 */
+				while (xchp != xch &&
+				       xchp->i1 + xchp->chg1 <= s1 &&
+				       xchp->i2 + xchp->chg2 <= s2)
+					xchp = xchp->next;
+
+				/* If so, show it after all. */
+				if (xchp != xch) {
+					xch = xchp;
+					goto pre_context_calculation;
+				}
 			}
 		}